From fe4d6edbdc831d26c2bae8f284661874be072d95 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Sat, 21 Jun 2025 14:18:54 +0200
Subject: [PATCH 001/337] refactor: album picker modal (#19383)

Co-authored-by: Jason Rasmussen <jason@rasm.me>
---
 i18n/en.json                                  |  1 -
 .../actions/add-to-album-action.svelte        | 38 ++++---------
 .../photos-page/actions/add-to-album.svelte   | 40 +++-----------
 .../AlbumPickerModal.svelte}                  | 55 ++++++++++++-------
 web/src/lib/utils/asset-utils.ts              | 46 +---------------
 5 files changed, 55 insertions(+), 125 deletions(-)
 rename web/src/lib/{components/shared-components/album-selection/album-selection-modal.svelte => modals/AlbumPickerModal.svelte} (78%)

diff --git a/i18n/en.json b/i18n/en.json
index fafa137f4d..d61116f2a6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -464,7 +464,6 @@
   "assets": "Assets",
   "assets_added_count": "Added {count, plural, one {# asset} other {# assets}}",
   "assets_added_to_album_count": "Added {count, plural, one {# asset} other {# assets}} to the album",
-  "assets_added_to_name_count": "Added {count, plural, one {# asset} other {# assets}} to {hasName, select, true {<b>{name}</b>} other {new album}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} cannot be added to the album",
   "assets_count": "{count, plural, one {# asset} other {# assets}}",
   "assets_deleted_permanently": "{count} asset(s) deleted permanently",
diff --git a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
index 0fbd1c8529..8fe765ab2d 100644
--- a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
   import { shortcut } from '$lib/actions/shortcut';
   import type { OnAction } from '$lib/components/asset-viewer/actions/action';
-  import AlbumSelectionModal from '$lib/components/shared-components/album-selection/album-selection-modal.svelte';
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
-  import Portal from '$lib/components/shared-components/portal/portal.svelte';
   import { AssetAction } from '$lib/constants';
-  import { addAssetsToAlbum, addAssetsToNewAlbum } from '$lib/utils/asset-utils';
+  import { modalManager } from '$lib/managers/modal-manager.svelte';
+  import AlbumPickerModal from '$lib/modals/AlbumPickerModal.svelte';
+  import { addAssetsToAlbum } from '$lib/utils/asset-utils';
   import { toTimelineAsset } from '$lib/utils/timeline-util';
-  import type { AlbumResponseDto, AssetResponseDto } from '@immich/sdk';
+  import type { AssetResponseDto } from '@immich/sdk';
   import { mdiImageAlbum, mdiShareVariantOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
@@ -19,40 +19,22 @@
 
   let { asset, onAction, shared = false }: Props = $props();
 
-  let showSelectionModal = $state(false);
+  const onClick = async () => {
+    const album = await modalManager.show(AlbumPickerModal, { shared });
 
-  const handleAddToNewAlbum = async (albumName: string) => {
-    showSelectionModal = false;
-    const album = await addAssetsToNewAlbum(albumName, [asset.id]);
-    if (album) {
-      onAction({ type: AssetAction.ADD_TO_ALBUM, asset: toTimelineAsset(asset), album });
+    if (!album) {
+      return;
     }
-  };
 
-  const handleAddToAlbum = async (album: AlbumResponseDto) => {
-    showSelectionModal = false;
     await addAssetsToAlbum(album.id, [asset.id]);
     onAction({ type: AssetAction.ADD_TO_ALBUM, asset: toTimelineAsset(asset), album });
   };
 </script>
 
-<svelte:document
-  use:shortcut={{ shortcut: { key: 'l', shift: shared }, onShortcut: () => (showSelectionModal = true) }}
-/>
+<svelte:document use:shortcut={{ shortcut: { key: 'l', shift: shared }, onShortcut: onClick }} />
 
 <MenuOption
   icon={shared ? mdiShareVariantOutline : mdiImageAlbum}
   text={shared ? $t('add_to_shared_album') : $t('add_to_album')}
-  onClick={() => (showSelectionModal = true)}
+  {onClick}
 />
-
-{#if showSelectionModal}
-  <Portal target="body">
-    <AlbumSelectionModal
-      {shared}
-      onNewAlbum={handleAddToNewAlbum}
-      onAlbumClick={handleAddToAlbum}
-      onClose={() => (showSelectionModal = false)}
-    />
-  </Portal>
-{/if}
diff --git a/web/src/lib/components/photos-page/actions/add-to-album.svelte b/web/src/lib/components/photos-page/actions/add-to-album.svelte
index 1918dc6c20..c00fd2e1c9 100644
--- a/web/src/lib/components/photos-page/actions/add-to-album.svelte
+++ b/web/src/lib/components/photos-page/actions/add-to-album.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-  import AlbumSelectionModal from '$lib/components/shared-components/album-selection/album-selection-modal.svelte';
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
-  import { addAssetsToAlbum, addAssetsToNewAlbum } from '$lib/utils/asset-utils';
-  import type { AlbumResponseDto } from '@immich/sdk';
-  import { getAssetControlContext } from '../asset-select-control-bar.svelte';
+  import { modalManager } from '$lib/managers/modal-manager.svelte';
+  import AlbumPickerModal from '$lib/modals/AlbumPickerModal.svelte';
+  import type { OnAddToAlbum } from '$lib/utils/actions';
+  import { addAssetsToAlbum } from '$lib/utils/asset-utils';
   import { mdiImageAlbum, mdiShareVariantOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
-  import type { OnAddToAlbum } from '$lib/utils/actions';
+  import { getAssetControlContext } from '../asset-select-control-bar.svelte';
 
   interface Props {
     shared?: boolean;
@@ -15,46 +15,24 @@
 
   let { shared = false, onAddToAlbum = () => {} }: Props = $props();
 
-  let showAlbumPicker = $state(false);
-
   const { getAssets } = getAssetControlContext();
 
-  const handleHideAlbumPicker = () => {
-    showAlbumPicker = false;
-  };
+  const onClick = async () => {
+    const album = await modalManager.show(AlbumPickerModal, { shared });
 
-  const handleAddToNewAlbum = async (albumName: string) => {
-    showAlbumPicker = false;
-
-    const assetIds = [...getAssets()].map((asset) => asset.id);
-    const album = await addAssetsToNewAlbum(albumName, assetIds);
     if (!album) {
       return;
     }
 
-    onAddToAlbum(assetIds, album.id);
-  };
-
-  const handleAddToAlbum = async (album: AlbumResponseDto) => {
-    showAlbumPicker = false;
-    const assetIds = [...getAssets()].map((asset) => asset.id);
+    const assetIds = [...getAssets()].map(({ id }) => id);
     await addAssetsToAlbum(album.id, assetIds);
     onAddToAlbum(assetIds, album.id);
   };
 </script>
 
 <MenuOption
-  onClick={() => (showAlbumPicker = true)}
+  {onClick}
   text={shared ? $t('add_to_shared_album') : $t('add_to_album')}
   icon={shared ? mdiShareVariantOutline : mdiImageAlbum}
   shortcut={{ key: 'l', shift: shared }}
 />
-
-{#if showAlbumPicker}
-  <AlbumSelectionModal
-    {shared}
-    onNewAlbum={handleAddToNewAlbum}
-    onAlbumClick={handleAddToAlbum}
-    onClose={handleHideAlbumPicker}
-  />
-{/if}
diff --git a/web/src/lib/components/shared-components/album-selection/album-selection-modal.svelte b/web/src/lib/modals/AlbumPickerModal.svelte
similarity index 78%
rename from web/src/lib/components/shared-components/album-selection/album-selection-modal.svelte
rename to web/src/lib/modals/AlbumPickerModal.svelte
index ab763546af..3e16e03b80 100644
--- a/web/src/lib/components/shared-components/album-selection/album-selection-modal.svelte
+++ b/web/src/lib/modals/AlbumPickerModal.svelte
@@ -6,12 +6,12 @@
     isSelectableRowType,
   } from '$lib/components/shared-components/album-selection/album-selection-utils';
   import { albumViewSettings } from '$lib/stores/preferences.store';
-  import { type AlbumResponseDto, getAllAlbums } from '@immich/sdk';
+  import { type AlbumResponseDto, createAlbum, getAllAlbums } from '@immich/sdk';
   import { Modal, ModalBody } from '@immich/ui';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
-  import AlbumListItem from '../../asset-viewer/album-list-item.svelte';
-  import NewAlbumListItem from './new-album-list-item.svelte';
+  import AlbumListItem from '../components/asset-viewer/album-list-item.svelte';
+  import NewAlbumListItem from '../components/shared-components/album-selection/new-album-list-item.svelte';
 
   let albums: AlbumResponseDto[] = $state([]);
   let recentAlbums: AlbumResponseDto[] = $state([]);
@@ -20,13 +20,11 @@
   let selectedRowIndex: number = $state(-1);
 
   interface Props {
-    onNewAlbum: (search: string) => void;
-    onAlbumClick: (album: AlbumResponseDto) => void;
     shared: boolean;
-    onClose: () => void;
+    onClose: (album?: AlbumResponseDto) => void;
   }
 
-  let { onNewAlbum, onAlbumClick, shared, onClose }: Props = $props();
+  let { shared, onClose }: Props = $props();
 
   onMount(async () => {
     albums = await getAllAlbums({ shared: shared || undefined });
@@ -38,7 +36,34 @@
   const albumModalRows = $derived(rowConverter.toModalRows(search, recentAlbums, albums, selectedRowIndex));
   const selectableRowCount = $derived(albumModalRows.filter((row) => isSelectableRowType(row.type)).length);
 
-  const onkeydown = (e: KeyboardEvent) => {
+  const onNewAlbum = async (name: string) => {
+    const album = await createAlbum({ createAlbumDto: { albumName: name } });
+    onClose(album);
+  };
+
+  const onEnter = async () => {
+    const item = albumModalRows.find(({ selected }) => selected);
+    if (!item) {
+      return;
+    }
+
+    switch (item.type) {
+      case AlbumModalRowType.NEW_ALBUM: {
+        await onNewAlbum(search);
+        break;
+      }
+      case AlbumModalRowType.ALBUM_ITEM: {
+        if (item.album) {
+          onClose(item.album);
+        }
+        break;
+      }
+    }
+
+    selectedRowIndex = -1;
+  };
+
+  const onkeydown = async (e: KeyboardEvent) => {
     switch (e.key) {
       case 'ArrowUp': {
         e.preventDefault();
@@ -60,15 +85,7 @@
       }
       case 'Enter': {
         e.preventDefault();
-        const selectedRow = albumModalRows.find((row) => row.selected);
-        if (selectedRow) {
-          if (selectedRow.type === AlbumModalRowType.NEW_ALBUM) {
-            onNewAlbum(search);
-          } else if (selectedRow.type === AlbumModalRowType.ALBUM_ITEM && selectedRow.album) {
-            onAlbumClick(selectedRow.album);
-          }
-          selectedRowIndex = -1;
-        }
+        await onEnter();
         break;
       }
       default: {
@@ -76,8 +93,6 @@
       }
     }
   };
-
-  const handleAlbumClick = (album: AlbumResponseDto) => () => onAlbumClick(album);
 </script>
 
 <Modal title={shared ? $t('add_to_shared_album') : $t('add_to_album')} {onClose} size="small">
@@ -119,7 +134,7 @@
                 album={row.album}
                 selected={row.selected || false}
                 searchQuery={search}
-                onAlbumClick={handleAlbumClick(row.album)}
+                onAlbumClick={() => onClose(row.album)}
               />
             {/if}
           {/each}
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index 9c22b9a8f3..0083343709 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -1,6 +1,4 @@
 import { goto } from '$app/navigation';
-import FormatBoldMessage from '$lib/components/i18n/format-bold-message.svelte';
-import type { InterpolationValues } from '$lib/components/i18n/format-message';
 import { notificationController, NotificationType } from '$lib/components/shared-components/notification/notification';
 import { AppRoute } from '$lib/constants';
 import { authManager } from '$lib/managers/auth-manager.svelte';
@@ -12,7 +10,6 @@ import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
 import { isSelectingAllAssets } from '$lib/stores/assets-store.svelte';
 import { preferences } from '$lib/stores/user.store';
 import { downloadRequest, withError } from '$lib/utils';
-import { createAlbum } from '$lib/utils/album-utils';
 import { getByteUnitString } from '$lib/utils/byte-units';
 import { getFormatter } from '$lib/utils/i18n';
 import { navigate } from '$lib/utils/navigation';
@@ -39,7 +36,7 @@ import {
   type UserResponseDto,
 } from '@immich/sdk';
 import { DateTime } from 'luxon';
-import { t, type Translations } from 'svelte-i18n';
+import { t } from 'svelte-i18n';
 import { get } from 'svelte/store';
 import { handleError } from './handle-error';
 
@@ -122,47 +119,6 @@ export const removeTag = async ({
   return assetIds;
 };
 
-export const addAssetsToNewAlbum = async (albumName: string, assetIds: string[]) => {
-  const album = await createAlbum(albumName, assetIds);
-  if (!album) {
-    return;
-  }
-  const $t = get(t);
-  // for reasons beyond me <ComponentProps<typeof FormatBoldMessage>> doesn't work, even though it's (afaik) exactly this object
-  if (album.assets.length === 0) {
-    notificationController.show({
-      type: NotificationType.Info,
-      timeout: 5000,
-      message: $t('assets_cannot_be_added_to_album_count', { values: { count: assetIds.length } }),
-      button: {
-        text: $t('view_album'),
-        onClick() {
-          return goto(`${AppRoute.ALBUMS}/${album.id}`);
-        },
-      },
-    });
-  } else {
-    notificationController.show<{ key: Translations; values: InterpolationValues }>({
-      type: NotificationType.Info,
-      timeout: 5000,
-      component: {
-        type: FormatBoldMessage,
-        props: {
-          key: 'assets_added_to_name_count',
-          values: { count: album.assets.length, name: albumName, hasName: !!albumName },
-        },
-      },
-      button: {
-        text: $t('view_album'),
-        onClick() {
-          return goto(`${AppRoute.ALBUMS}/${album.id}`);
-        },
-      },
-    });
-  }
-  return album;
-};
-
 export const downloadAlbum = async (album: AlbumResponseDto) => {
   await downloadArchive(`${album.albumName}.zip`, {
     albumId: album.id,

From 698d3004b49d31c28acd05f387691663205aa461 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Sat, 21 Jun 2025 14:28:21 +0200
Subject: [PATCH 002/337] refactor: tag create/update modal (#19389)

refactor: tag modals
---
 web/src/lib/modals/TagCreateModal.svelte      |  66 ++++++++++
 web/src/lib/modals/TagEditModal.svelte        |  58 +++++++++
 .../[[assetId=id]]/+page.svelte               | 119 ++----------------
 3 files changed, 137 insertions(+), 106 deletions(-)
 create mode 100644 web/src/lib/modals/TagCreateModal.svelte
 create mode 100644 web/src/lib/modals/TagEditModal.svelte

diff --git a/web/src/lib/modals/TagCreateModal.svelte b/web/src/lib/modals/TagCreateModal.svelte
new file mode 100644
index 0000000000..0b2e99bede
--- /dev/null
+++ b/web/src/lib/modals/TagCreateModal.svelte
@@ -0,0 +1,66 @@
+<script lang="ts">
+  import {
+    notificationController,
+    NotificationType,
+  } from '$lib/components/shared-components/notification/notification';
+  import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
+  import { SettingInputFieldType } from '$lib/constants';
+  import type { TreeNode } from '$lib/utils/tree-utils';
+  import { upsertTags, type TagResponseDto } from '@immich/sdk';
+  import { Button, HStack, Modal, ModalBody, ModalFooter } from '@immich/ui';
+  import { mdiTag } from '@mdi/js';
+  import { t } from 'svelte-i18n';
+
+  type Props = {
+    onClose: (tag?: TagResponseDto) => void;
+    baseTag?: TreeNode;
+  };
+
+  const { onClose, baseTag }: Props = $props();
+
+  let tagValue = $state(baseTag?.value ? `${baseTag.value}/` : '');
+
+  const createTag = async () => {
+    const [tag] = await upsertTags({ tagUpsertDto: { tags: [tagValue] } });
+
+    if (!tag) {
+      return;
+    }
+
+    notificationController.show({
+      message: $t('tag_created', { values: { tag: tag.value } }),
+      type: NotificationType.Info,
+    });
+
+    onClose(tag);
+  };
+</script>
+
+<Modal size="small" title={$t('create_tag')} icon={mdiTag} {onClose}>
+  <ModalBody>
+    <div class="text-immich-primary dark:text-immich-dark-primary">
+      <p class="text-sm dark:text-immich-dark-fg">
+        {$t('create_tag_description')}
+      </p>
+    </div>
+
+    <form onsubmit={createTag} autocomplete="off" id="create-tag-form">
+      <div class="my-4 flex flex-col gap-2">
+        <SettingInputField
+          inputType={SettingInputFieldType.TEXT}
+          label={$t('tag').toUpperCase()}
+          bind:value={tagValue}
+          required={true}
+          autofocus={true}
+        />
+      </div>
+    </form>
+  </ModalBody>
+
+  <ModalFooter>
+    <HStack fullWidth>
+      <Button color="secondary" fullWidth shape="round" onclick={() => onClose()}>{$t('cancel')}</Button>
+      <Button type="submit" fullWidth shape="round" form="create-tag-form">{$t('create')}</Button>
+    </HStack>
+  </ModalFooter>
+</Modal>
diff --git a/web/src/lib/modals/TagEditModal.svelte b/web/src/lib/modals/TagEditModal.svelte
new file mode 100644
index 0000000000..5f952872e2
--- /dev/null
+++ b/web/src/lib/modals/TagEditModal.svelte
@@ -0,0 +1,58 @@
+<script lang="ts">
+  import {
+    notificationController,
+    NotificationType,
+  } from '$lib/components/shared-components/notification/notification';
+  import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
+  import { SettingInputFieldType } from '$lib/constants';
+  import type { TreeNode } from '$lib/utils/tree-utils';
+  import { updateTag, type TagResponseDto } from '@immich/sdk';
+  import { Button, HStack, Modal, ModalBody, ModalFooter } from '@immich/ui';
+  import { mdiTag } from '@mdi/js';
+  import { t } from 'svelte-i18n';
+
+  type Props = {
+    tag: TreeNode;
+    onClose: (updatedTag?: TagResponseDto) => void;
+  };
+
+  const { tag, onClose }: Props = $props();
+
+  let tagColor = $state(tag.color ?? '');
+
+  const handleEdit = async () => {
+    if (!tag.id) {
+      return;
+    }
+
+    const updatedTag = await updateTag({ id: tag.id, tagUpdateDto: { color: tagColor } });
+
+    notificationController.show({
+      message: $t('tag_updated', { values: { tag: tag.value } }),
+      type: NotificationType.Info,
+    });
+
+    onClose(updatedTag);
+  };
+</script>
+
+<Modal title={$t('edit_tag')} icon={mdiTag} {onClose}>
+  <ModalBody>
+    <form onsubmit={handleEdit} autocomplete="off" id="edit-tag-form">
+      <div class="my-4 flex flex-col gap-2">
+        <SettingInputField
+          inputType={SettingInputFieldType.COLOR}
+          label={$t('color').toUpperCase()}
+          bind:value={tagColor}
+        />
+      </div>
+    </form>
+  </ModalBody>
+
+  <ModalFooter>
+    <HStack fullWidth>
+      <Button color="secondary" fullWidth shape="round" onclick={() => onClose()}>{$t('cancel')}</Button>
+      <Button type="submit" fullWidth shape="round" form="edit-tag-form">{$t('save')}</Button>
+    </HStack>
+  </ModalFooter>
+</Modal>
diff --git a/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte
index c3f50b8f85..503ea72d54 100644
--- a/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -3,22 +3,19 @@
   import SkipLink from '$lib/components/elements/buttons/skip-link.svelte';
   import UserPageLayout, { headerId } from '$lib/components/layouts/user-page-layout.svelte';
   import AssetGrid from '$lib/components/photos-page/asset-grid.svelte';
-  import {
-    notificationController,
-    NotificationType,
-  } from '$lib/components/shared-components/notification/notification';
-  import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
   import Breadcrumbs from '$lib/components/shared-components/tree/breadcrumbs.svelte';
   import TreeItemThumbnails from '$lib/components/shared-components/tree/tree-item-thumbnails.svelte';
   import TreeItems from '$lib/components/shared-components/tree/tree-items.svelte';
   import Sidebar from '$lib/components/sidebar/sidebar.svelte';
-  import { AppRoute, AssetAction, QueryParameter, SettingInputFieldType } from '$lib/constants';
+  import { AppRoute, AssetAction, QueryParameter } from '$lib/constants';
   import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
+  import TagCreateModal from '$lib/modals/TagCreateModal.svelte';
+  import TagEditModal from '$lib/modals/TagEditModal.svelte';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { joinPaths, TreeNode } from '$lib/utils/tree-utils';
-  import { deleteTag, getAllTags, updateTag, upsertTags, type TagResponseDto } from '@immich/sdk';
-  import { Button, HStack, Modal, ModalBody, ModalFooter, Text } from '@immich/ui';
+  import { deleteTag, getAllTags, type TagResponseDto } from '@immich/sdk';
+  import { Button, HStack, Text } from '@immich/ui';
   import { mdiPencil, mdiPlus, mdiTag, mdiTagMultiple, mdiTrashCanOutline } from '@mdi/js';
   import { onDestroy } from 'svelte';
   import { t } from 'svelte-i18n';
@@ -50,49 +47,18 @@
 
   const navigateToView = (path: string) => goto(getLink(path));
 
-  let isNewOpen = $state(false);
-  let newTagValue = $state('');
-  const handleCreate = () => {
-    newTagValue = tag ? tag.value + '/' : '';
-    isNewOpen = true;
+  const handleCreate = async () => {
+    await modalManager.show(TagCreateModal, { baseTag: tag });
+    tags = await getAllTags();
   };
 
-  let isEditOpen = $state(false);
-  let newTagColor = $state('');
-  const handleEdit = () => {
-    newTagColor = tag?.color ?? '';
-    isEditOpen = true;
-  };
-
-  const handleCancel = () => {
-    isNewOpen = false;
-    isEditOpen = false;
-  };
-
-  const handleSubmit = async () => {
-    if (tag && isEditOpen && newTagColor) {
-      await updateTag({ id: tag.id!, tagUpdateDto: { color: newTagColor } });
-
-      notificationController.show({
-        message: $t('tag_updated', { values: { tag: tag.value } }),
-        type: NotificationType.Info,
-      });
-
-      tags = await getAllTags();
-      isEditOpen = false;
+  const handleEdit = async () => {
+    if (!tag) {
+      return;
     }
 
-    if (isNewOpen && newTagValue) {
-      const [newTag] = await upsertTags({ tagUpsertDto: { tags: [newTagValue] } });
-
-      notificationController.show({
-        message: $t('tag_created', { values: { tag: newTag.value } }),
-        type: NotificationType.Info,
-      });
-
-      tags = await getAllTags();
-      isNewOpen = false;
-    }
+    await modalManager.show(TagEditModal, { tag });
+    tags = await getAllTags();
   };
 
   const handleDelete = async () => {
@@ -116,11 +82,6 @@
     // navigate to parent
     await navigateToView(tag.parent ? tag.parent.path : '');
   };
-
-  const onsubmit = async (event: Event) => {
-    event.preventDefault();
-    await handleSubmit();
-  };
 </script>
 
 <UserPageLayout title={data.meta.title}>
@@ -167,57 +128,3 @@
     {/if}
   </section>
 </UserPageLayout>
-
-{#if isNewOpen}
-  <Modal size="small" title={$t('create_tag')} icon={mdiTag} onClose={handleCancel}>
-    <ModalBody>
-      <div class="text-immich-primary dark:text-immich-dark-primary">
-        <p class="text-sm dark:text-immich-dark-fg">
-          {$t('create_tag_description')}
-        </p>
-      </div>
-
-      <form {onsubmit} autocomplete="off" id="create-tag-form">
-        <div class="my-4 flex flex-col gap-2">
-          <SettingInputField
-            inputType={SettingInputFieldType.TEXT}
-            label={$t('tag').toUpperCase()}
-            bind:value={newTagValue}
-            required={true}
-            autofocus={true}
-          />
-        </div>
-      </form>
-    </ModalBody>
-
-    <ModalFooter>
-      <HStack fullWidth>
-        <Button color="secondary" fullWidth shape="round" onclick={() => handleCancel()}>{$t('cancel')}</Button>
-        <Button type="submit" fullWidth shape="round" form="create-tag-form">{$t('create')}</Button>
-      </HStack>
-    </ModalFooter>
-  </Modal>
-{/if}
-
-{#if isEditOpen}
-  <Modal title={$t('edit_tag')} icon={mdiTag} onClose={handleCancel}>
-    <ModalBody>
-      <form {onsubmit} autocomplete="off" id="edit-tag-form">
-        <div class="my-4 flex flex-col gap-2">
-          <SettingInputField
-            inputType={SettingInputFieldType.COLOR}
-            label={$t('color').toUpperCase()}
-            bind:value={newTagColor}
-          />
-        </div>
-      </form>
-    </ModalBody>
-
-    <ModalFooter>
-      <HStack fullWidth>
-        <Button color="secondary" fullWidth shape="round" onclick={() => handleCancel()}>{$t('cancel')}</Button>
-        <Button type="submit" fullWidth shape="round" form="edit-tag-form">{$t('save')}</Button>
-      </HStack>
-    </ModalFooter>
-  </Modal>
-{/if}

From 4c2ad44303d96fe2363bd67a4b55116a4063195c Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 13:14:14 -0500
Subject: [PATCH 003/337] refactor(mobile): folder_api.interface.dart (#19342)

---
 mobile/lib/interfaces/folder_api.interface.dart    | 6 ------
 mobile/lib/repositories/folder_api.repository.dart | 6 +-----
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 mobile/lib/interfaces/folder_api.interface.dart

diff --git a/mobile/lib/interfaces/folder_api.interface.dart b/mobile/lib/interfaces/folder_api.interface.dart
deleted file mode 100644
index 68c1652e21..0000000000
--- a/mobile/lib/interfaces/folder_api.interface.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-abstract interface class IFolderApiRepository {
-  Future<List<String>> getAllUniquePaths();
-  Future<List<Asset>> getAssetsForPath(String? path);
-}
diff --git a/mobile/lib/repositories/folder_api.repository.dart b/mobile/lib/repositories/folder_api.repository.dart
index bd7b035157..9fcb57ae21 100644
--- a/mobile/lib/repositories/folder_api.repository.dart
+++ b/mobile/lib/repositories/folder_api.repository.dart
@@ -1,6 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/interfaces/folder_api.interface.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/api.repository.dart';
 import 'package:logging/logging.dart';
@@ -12,14 +11,12 @@ final folderApiRepositoryProvider = Provider(
   ),
 );
 
-class FolderApiRepository extends ApiRepository
-    implements IFolderApiRepository {
+class FolderApiRepository extends ApiRepository {
   final ViewApi _api;
   final Logger _log = Logger("FolderApiRepository");
 
   FolderApiRepository(this._api);
 
-  @override
   Future<List<String>> getAllUniquePaths() async {
     try {
       final list = await _api.getUniqueOriginalPaths();
@@ -30,7 +27,6 @@ class FolderApiRepository extends ApiRepository
     }
   }
 
-  @override
   Future<List<Asset>> getAssetsForPath(String? path) async {
     try {
       final list = await _api.getAssetsByOriginalPath(path ?? '/');

From b606d4fe73a82fc914e9be3e9fc508c04f9bef6f Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 13:35:30 -0500
Subject: [PATCH 004/337] refactor(mobile): local_file_manager.interface.dart
 (#19340)

---
 .../local_files_manager.interface.dart        |  5 ----
 .../local_files_manager.repository.dart       | 24 +++++++++----------
 .../local_files_manager.service.dart}         | 13 ++++++----
 mobile/lib/services/sync.service.dart         |  3 +--
 mobile/test/repository.mocks.dart             |  4 ++--
 5 files changed, 24 insertions(+), 25 deletions(-)
 delete mode 100644 mobile/lib/interfaces/local_files_manager.interface.dart
 rename mobile/lib/{utils/local_files_manager.dart => services/local_files_manager.service.dart} (69%)

diff --git a/mobile/lib/interfaces/local_files_manager.interface.dart b/mobile/lib/interfaces/local_files_manager.interface.dart
deleted file mode 100644
index 07274b7e29..0000000000
--- a/mobile/lib/interfaces/local_files_manager.interface.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-abstract interface class ILocalFilesManager {
-  Future<bool> moveToTrash(List<String> mediaUrls);
-  Future<bool> restoreFromTrash(String fileName, int type);
-  Future<bool> requestManageMediaPermission();
-}
diff --git a/mobile/lib/repositories/local_files_manager.repository.dart b/mobile/lib/repositories/local_files_manager.repository.dart
index c2e234d14d..4e99f5d6ef 100644
--- a/mobile/lib/repositories/local_files_manager.repository.dart
+++ b/mobile/lib/repositories/local_files_manager.repository.dart
@@ -1,25 +1,25 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/interfaces/local_files_manager.interface.dart';
-import 'package:immich_mobile/utils/local_files_manager.dart';
+import 'package:immich_mobile/services/local_files_manager.service.dart';
 
-final localFilesManagerRepositoryProvider =
-    Provider((ref) => const LocalFilesManagerRepository());
+final localFilesManagerRepositoryProvider = Provider(
+  (ref) =>
+      LocalFilesManagerRepository(ref.watch(localFileManagerServiceProvider)),
+);
 
-class LocalFilesManagerRepository implements ILocalFilesManager {
-  const LocalFilesManagerRepository();
+class LocalFilesManagerRepository {
+  LocalFilesManagerRepository(this._service);
+
+  final LocalFilesManagerService _service;
 
-  @override
   Future<bool> moveToTrash(List<String> mediaUrls) async {
-    return await LocalFilesManager.moveToTrash(mediaUrls);
+    return await _service.moveToTrash(mediaUrls);
   }
 
-  @override
   Future<bool> restoreFromTrash(String fileName, int type) async {
-    return await LocalFilesManager.restoreFromTrash(fileName, type);
+    return await _service.restoreFromTrash(fileName, type);
   }
 
-  @override
   Future<bool> requestManageMediaPermission() async {
-    return await LocalFilesManager.requestManageMediaPermission();
+    return await _service.requestManageMediaPermission();
   }
 }
diff --git a/mobile/lib/utils/local_files_manager.dart b/mobile/lib/services/local_files_manager.service.dart
similarity index 69%
rename from mobile/lib/utils/local_files_manager.dart
rename to mobile/lib/services/local_files_manager.service.dart
index a4cf41a6e6..3d5f7a217d 100644
--- a/mobile/lib/utils/local_files_manager.dart
+++ b/mobile/lib/services/local_files_manager.service.dart
@@ -1,11 +1,16 @@
 import 'package:flutter/services.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:logging/logging.dart';
 
-abstract final class LocalFilesManager {
+final localFileManagerServiceProvider = Provider<LocalFilesManagerService>(
+  (ref) => LocalFilesManagerService(),
+);
+
+class LocalFilesManagerService {
   static final Logger _logger = Logger('LocalFilesManager');
   static const MethodChannel _channel = MethodChannel('file_trash');
 
-  static Future<bool> moveToTrash(List<String> mediaUrls) async {
+  Future<bool> moveToTrash(List<String> mediaUrls) async {
     try {
       return await _channel
           .invokeMethod('moveToTrash', {'mediaUrls': mediaUrls});
@@ -15,7 +20,7 @@ abstract final class LocalFilesManager {
     }
   }
 
-  static Future<bool> restoreFromTrash(String fileName, int type) async {
+  Future<bool> restoreFromTrash(String fileName, int type) async {
     try {
       return await _channel.invokeMethod(
         'restoreFromTrash',
@@ -27,7 +32,7 @@ abstract final class LocalFilesManager {
     }
   }
 
-  static Future<bool> requestManageMediaPermission() async {
+  Future<bool> requestManageMediaPermission() async {
     try {
       return await _channel.invokeMethod('requestManageMediaPermission');
     } catch (e, s) {
diff --git a/mobile/lib/services/sync.service.dart b/mobile/lib/services/sync.service.dart
index 5013411599..6f47463242 100644
--- a/mobile/lib/services/sync.service.dart
+++ b/mobile/lib/services/sync.service.dart
@@ -16,7 +16,6 @@ import 'package:immich_mobile/infrastructure/repositories/user_api.repository.da
 import 'package:immich_mobile/interfaces/album.interface.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/etag.interface.dart';
-import 'package:immich_mobile/interfaces/local_files_manager.interface.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -74,7 +73,7 @@ class SyncService {
   final AsyncMutex _lock = AsyncMutex();
   final Logger _log = Logger('SyncService');
   final AppSettingsService _appSettingsService;
-  final ILocalFilesManager _localFilesManager;
+  final LocalFilesManagerRepository _localFilesManager;
 
   SyncService(
     this._hashService,
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index 638b08c1ea..b66bec1f24 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -8,11 +8,11 @@ import 'package:immich_mobile/interfaces/auth_api.interface.dart';
 import 'package:immich_mobile/interfaces/backup_album.interface.dart';
 import 'package:immich_mobile/interfaces/etag.interface.dart';
 import 'package:immich_mobile/interfaces/file_media.interface.dart';
-import 'package:immich_mobile/interfaces/local_files_manager.interface.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
 import 'package:immich_mobile/repositories/partner.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockAlbumRepository extends Mock implements IAlbumRepository {}
@@ -47,4 +47,4 @@ class MockPartnerRepository extends Mock implements PartnerRepository {}
 class MockPartnerApiRepository extends Mock implements PartnerApiRepository {}
 
 class MockLocalFilesManagerRepository extends Mock
-    implements ILocalFilesManager {}
+    implements LocalFilesManagerRepository {}

From c10b795e99a0ca63788d1b60bc4a58ed37b41708 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 14:24:59 -0500
Subject: [PATCH 005/337] refactor(mobile): file_media.interface.dart (#19343)

* refactor(mobile): file_media.interface.dart

* merge main
---
 .../lib/interfaces/file_media.interface.dart  | 36 -------------------
 .../lib/providers/backup/backup.provider.dart |  3 +-
 .../repositories/file_media.repository.dart   | 10 +-----
 mobile/lib/services/backup.service.dart       |  3 +-
 .../services/backup_verification.service.dart |  5 ++-
 mobile/lib/services/download.service.dart     |  3 +-
 mobile/test/repository.mocks.dart             |  4 +--
 7 files changed, 8 insertions(+), 56 deletions(-)
 delete mode 100644 mobile/lib/interfaces/file_media.interface.dart

diff --git a/mobile/lib/interfaces/file_media.interface.dart b/mobile/lib/interfaces/file_media.interface.dart
deleted file mode 100644
index ea01819dc3..0000000000
--- a/mobile/lib/interfaces/file_media.interface.dart
+++ /dev/null
@@ -1,36 +0,0 @@
-import 'dart:io';
-import 'dart:typed_data';
-
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-abstract interface class IFileMediaRepository {
-  Future<Asset?> saveImage(
-    Uint8List data, {
-    required String title,
-    String? relativePath,
-  });
-
-  Future<Asset?> saveImageWithFile(
-    String filePath, {
-    String? title,
-    String? relativePath,
-  });
-
-  Future<Asset?> saveVideo(
-    File file, {
-    required String title,
-    String? relativePath,
-  });
-
-  Future<Asset?> saveLivePhoto({
-    required File image,
-    required File video,
-    required String title,
-  });
-
-  Future<void> clearFileCache();
-
-  Future<void> enableBackgroundAccess();
-
-  Future<void> requestExtendedPermissions();
-}
diff --git a/mobile/lib/providers/backup/backup.provider.dart b/mobile/lib/providers/backup/backup.provider.dart
index 479a3e0bb5..16d4a58bd6 100644
--- a/mobile/lib/providers/backup/backup.provider.dart
+++ b/mobile/lib/providers/backup/backup.provider.dart
@@ -10,7 +10,6 @@ import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/interfaces/backup_album.interface.dart';
-import 'package:immich_mobile/interfaces/file_media.interface.dart';
 import 'package:immich_mobile/models/auth/auth_state.model.dart';
 import 'package:immich_mobile/models/backup/available_album.model.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
@@ -108,7 +107,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
   final BackgroundService _backgroundService;
   final GalleryPermissionNotifier _galleryPermissionNotifier;
   final AlbumMediaRepository _albumMediaRepository;
-  final IFileMediaRepository _fileMediaRepository;
+  final FileMediaRepository _fileMediaRepository;
   final BackupAlbumService _backupAlbumService;
   final Ref ref;
 
diff --git a/mobile/lib/repositories/file_media.repository.dart b/mobile/lib/repositories/file_media.repository.dart
index 15f7a51e15..6b0237dcdb 100644
--- a/mobile/lib/repositories/file_media.repository.dart
+++ b/mobile/lib/repositories/file_media.repository.dart
@@ -3,14 +3,12 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/interfaces/file_media.interface.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:photo_manager/photo_manager.dart' hide AssetType;
 
 final fileMediaRepositoryProvider = Provider((ref) => FileMediaRepository());
 
-class FileMediaRepository implements IFileMediaRepository {
-  @override
+class FileMediaRepository {
   Future<Asset?> saveImage(
     Uint8List data, {
     required String title,
@@ -25,7 +23,6 @@ class FileMediaRepository implements IFileMediaRepository {
     return AssetMediaRepository.toAsset(entity);
   }
 
-  @override
   Future<Asset?> saveImageWithFile(
     String filePath, {
     String? title,
@@ -39,7 +36,6 @@ class FileMediaRepository implements IFileMediaRepository {
     return AssetMediaRepository.toAsset(entity);
   }
 
-  @override
   Future<Asset?> saveLivePhoto({
     required File image,
     required File video,
@@ -53,7 +49,6 @@ class FileMediaRepository implements IFileMediaRepository {
     return AssetMediaRepository.toAsset(entity);
   }
 
-  @override
   Future<Asset?> saveVideo(
     File file, {
     required String title,
@@ -67,14 +62,11 @@ class FileMediaRepository implements IFileMediaRepository {
     return AssetMediaRepository.toAsset(entity);
   }
 
-  @override
   Future<void> clearFileCache() => PhotoManager.clearFileCache();
 
-  @override
   Future<void> enableBackgroundAccess() =>
       PhotoManager.setIgnorePermissionCheck(true);
 
-  @override
   Future<void> requestExtendedPermissions() =>
       PhotoManager.requestPermissionExtend();
 }
diff --git a/mobile/lib/services/backup.service.dart b/mobile/lib/services/backup.service.dart
index d394b4773c..50add6cdb2 100644
--- a/mobile/lib/services/backup.service.dart
+++ b/mobile/lib/services/backup.service.dart
@@ -13,7 +13,6 @@ import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/asset_media.interface.dart';
-import 'package:immich_mobile/interfaces/file_media.interface.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
 import 'package:immich_mobile/models/backup/error_upload_asset.model.dart';
@@ -52,7 +51,7 @@ class BackupService {
   final AppSettingsService _appSetting;
   final AlbumService _albumService;
   final AlbumMediaRepository _albumMediaRepository;
-  final IFileMediaRepository _fileMediaRepository;
+  final FileMediaRepository _fileMediaRepository;
   final IAssetRepository _assetRepository;
   final IAssetMediaRepository _assetMediaRepository;
 
diff --git a/mobile/lib/services/backup_verification.service.dart b/mobile/lib/services/backup_verification.service.dart
index 408ac51d74..4de5b127b6 100644
--- a/mobile/lib/services/backup_verification.service.dart
+++ b/mobile/lib/services/backup_verification.service.dart
@@ -13,7 +13,6 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
-import 'package:immich_mobile/interfaces/file_media.interface.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
@@ -25,7 +24,7 @@ import 'package:immich_mobile/utils/diff.dart';
 /// Finds duplicates originating from missing EXIF information
 class BackupVerificationService {
   final UserService _userService;
-  final IFileMediaRepository _fileMediaRepository;
+  final FileMediaRepository _fileMediaRepository;
   final IAssetRepository _assetRepository;
   final IExifInfoRepository _exifInfoRepository;
 
@@ -123,7 +122,7 @@ class BackupVerificationService {
       String auth,
       String endpoint,
       RootIsolateToken rootIsolateToken,
-      IFileMediaRepository fileMediaRepository,
+      FileMediaRepository fileMediaRepository,
     }) tuple,
   ) async {
     assert(tuple.deleteCandidates.length == tuple.originals.length);
diff --git a/mobile/lib/services/download.service.dart b/mobile/lib/services/download.service.dart
index d8120a384c..98f1765d04 100644
--- a/mobile/lib/services/download.service.dart
+++ b/mobile/lib/services/download.service.dart
@@ -6,7 +6,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/interfaces/file_media.interface.dart';
 import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/repositories/download.repository.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
@@ -23,7 +22,7 @@ final downloadServiceProvider = Provider(
 
 class DownloadService {
   final DownloadRepository _downloadRepository;
-  final IFileMediaRepository _fileMediaRepository;
+  final FileMediaRepository _fileMediaRepository;
   final Logger _log = Logger("DownloadService");
   void Function(TaskStatusUpdate)? onImageDownloadStatus;
   void Function(TaskStatusUpdate)? onVideoDownloadStatus;
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index b66bec1f24..28c6f3f5b0 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -7,12 +7,12 @@ import 'package:immich_mobile/interfaces/auth.interface.dart';
 import 'package:immich_mobile/interfaces/auth_api.interface.dart';
 import 'package:immich_mobile/interfaces/backup_album.interface.dart';
 import 'package:immich_mobile/interfaces/etag.interface.dart';
-import 'package:immich_mobile/interfaces/file_media.interface.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
 import 'package:immich_mobile/repositories/partner.repository.dart';
 import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
+import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockAlbumRepository extends Mock implements IAlbumRepository {}
@@ -34,7 +34,7 @@ class MockAssetApiRepository extends Mock implements IAssetApiRepository {}
 
 class MockAssetMediaRepository extends Mock implements IAssetMediaRepository {}
 
-class MockFileMediaRepository extends Mock implements IFileMediaRepository {}
+class MockFileMediaRepository extends Mock implements FileMediaRepository {}
 
 class MockAlbumApiRepository extends Mock implements AlbumApiRepository {}
 

From 6a5597b36b97e3b7b9b1cd63e709b14a95092768 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 16:46:38 -0500
Subject: [PATCH 006/337] refactor(mobile): etag.interface.dart (#19344)

* refactor(mobile): etag.interface.dart

* merge main
---
 mobile/lib/interfaces/etag.interface.dart    | 16 ----------------
 mobile/lib/repositories/etag.repository.dart |  9 +--------
 mobile/lib/services/asset.service.dart       |  3 +--
 mobile/lib/services/etag.service.dart        |  3 +--
 mobile/lib/services/sync.service.dart        |  3 +--
 mobile/test/repository.mocks.dart            |  4 ++--
 6 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 mobile/lib/interfaces/etag.interface.dart

diff --git a/mobile/lib/interfaces/etag.interface.dart b/mobile/lib/interfaces/etag.interface.dart
deleted file mode 100644
index 8b4b5806c9..0000000000
--- a/mobile/lib/interfaces/etag.interface.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'package:immich_mobile/entities/etag.entity.dart';
-import 'package:immich_mobile/interfaces/database.interface.dart';
-
-abstract interface class IETagRepository implements IDatabaseRepository {
-  Future<ETag?> get(String id);
-
-  Future<ETag?> getById(String id);
-
-  Future<List<String>> getAllIds();
-
-  Future<void> upsertAll(List<ETag> etags);
-
-  Future<void> deleteByIds(List<String> ids);
-
-  Future<void> clearTable();
-}
diff --git a/mobile/lib/repositories/etag.repository.dart b/mobile/lib/repositories/etag.repository.dart
index e8e0624a89..2bf76218de 100644
--- a/mobile/lib/repositories/etag.repository.dart
+++ b/mobile/lib/repositories/etag.repository.dart
@@ -1,6 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/etag.entity.dart';
-import 'package:immich_mobile/interfaces/etag.interface.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/repositories/database.repository.dart';
 import 'package:isar/isar.dart';
@@ -8,26 +7,20 @@ import 'package:isar/isar.dart';
 final etagRepositoryProvider =
     Provider((ref) => ETagRepository(ref.watch(dbProvider)));
 
-class ETagRepository extends DatabaseRepository implements IETagRepository {
+class ETagRepository extends DatabaseRepository {
   ETagRepository(super.db);
 
-  @override
   Future<List<String>> getAllIds() => db.eTags.where().idProperty().findAll();
 
-  @override
   Future<ETag?> get(String id) => db.eTags.getById(id);
 
-  @override
   Future<void> upsertAll(List<ETag> etags) => txn(() => db.eTags.putAll(etags));
 
-  @override
   Future<void> deleteByIds(List<String> ids) =>
       txn(() => db.eTags.deleteAllById(ids));
 
-  @override
   Future<ETag?> getById(String id) => db.eTags.getById(id);
 
-  @override
   Future<void> clearTable() async {
     await txn(() async {
       await db.eTags.clear();
diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart
index e57edde55e..782a11912e 100644
--- a/mobile/lib/services/asset.service.dart
+++ b/mobile/lib/services/asset.service.dart
@@ -14,7 +14,6 @@ import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/interfaces/asset_media.interface.dart';
 import 'package:immich_mobile/interfaces/backup_album.interface.dart';
-import 'package:immich_mobile/interfaces/etag.interface.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
@@ -54,7 +53,7 @@ class AssetService {
   final IAssetRepository _assetRepository;
   final IExifInfoRepository _exifInfoRepository;
   final IsarUserRepository _isarUserRepository;
-  final IETagRepository _etagRepository;
+  final ETagRepository _etagRepository;
   final IBackupAlbumRepository _backupRepository;
   final ApiService _apiService;
   final SyncService _syncService;
diff --git a/mobile/lib/services/etag.service.dart b/mobile/lib/services/etag.service.dart
index 6dd8a76bb3..1808e32485 100644
--- a/mobile/lib/services/etag.service.dart
+++ b/mobile/lib/services/etag.service.dart
@@ -1,12 +1,11 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/interfaces/etag.interface.dart';
 import 'package:immich_mobile/repositories/etag.repository.dart';
 
 final etagServiceProvider =
     Provider((ref) => ETagService(ref.watch(etagRepositoryProvider)));
 
 class ETagService {
-  final IETagRepository _eTagRepository;
+  final ETagRepository _eTagRepository;
 
   ETagService(this._eTagRepository);
 
diff --git a/mobile/lib/services/sync.service.dart b/mobile/lib/services/sync.service.dart
index 6f47463242..4f8910c609 100644
--- a/mobile/lib/services/sync.service.dart
+++ b/mobile/lib/services/sync.service.dart
@@ -15,7 +15,6 @@ import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
 import 'package:immich_mobile/interfaces/album.interface.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
-import 'package:immich_mobile/interfaces/etag.interface.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -67,7 +66,7 @@ class SyncService {
   final IsarUserRepository _isarUserRepository;
   final UserService _userService;
   final PartnerRepository _partnerRepository;
-  final IETagRepository _eTagRepository;
+  final ETagRepository _eTagRepository;
   final PartnerApiRepository _partnerApiRepository;
   final UserApiRepository _userApiRepository;
   final AsyncMutex _lock = AsyncMutex();
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index 28c6f3f5b0..cf0909b5dc 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -6,11 +6,11 @@ import 'package:immich_mobile/interfaces/asset_media.interface.dart';
 import 'package:immich_mobile/interfaces/auth.interface.dart';
 import 'package:immich_mobile/interfaces/auth_api.interface.dart';
 import 'package:immich_mobile/interfaces/backup_album.interface.dart';
-import 'package:immich_mobile/interfaces/etag.interface.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
 import 'package:immich_mobile/repositories/partner.repository.dart';
+import 'package:immich_mobile/repositories/etag.repository.dart';
 import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:mocktail/mocktail.dart';
@@ -23,7 +23,7 @@ class MockBackupRepository extends Mock implements IBackupAlbumRepository {}
 
 class MockExifInfoRepository extends Mock implements IExifInfoRepository {}
 
-class MockETagRepository extends Mock implements IETagRepository {}
+class MockETagRepository extends Mock implements ETagRepository {}
 
 class MockAlbumMediaRepository extends Mock implements AlbumMediaRepository {}
 

From 9b047d30e4a20587e6ab5a8ccf402d1333d8d910 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 16:58:02 -0500
Subject: [PATCH 007/337] refactor(mobile): backup_album.interface.dart
 (#19348)

---
 .../lib/interfaces/backup_album.interface.dart   | 16 ----------------
 mobile/lib/providers/backup/backup.provider.dart |  2 +-
 mobile/lib/repositories/backup.repository.dart   | 11 +++--------
 mobile/lib/services/album.service.dart           |  3 +--
 mobile/lib/services/asset.service.dart           |  3 +--
 mobile/lib/services/background.service.dart      |  1 -
 mobile/lib/services/backup_album.service.dart    |  3 +--
 mobile/test/repository.mocks.dart                |  7 +++----
 8 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 mobile/lib/interfaces/backup_album.interface.dart

diff --git a/mobile/lib/interfaces/backup_album.interface.dart b/mobile/lib/interfaces/backup_album.interface.dart
deleted file mode 100644
index f98adb6821..0000000000
--- a/mobile/lib/interfaces/backup_album.interface.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'package:immich_mobile/entities/backup_album.entity.dart';
-import 'package:immich_mobile/interfaces/database.interface.dart';
-
-abstract interface class IBackupAlbumRepository implements IDatabaseRepository {
-  Future<List<BackupAlbum>> getAll({BackupAlbumSort? sort});
-
-  Future<List<String>> getIdsBySelection(BackupSelection backup);
-
-  Future<List<BackupAlbum>> getAllBySelection(BackupSelection backup);
-
-  Future<void> updateAll(List<BackupAlbum> backupAlbums);
-
-  Future<void> deleteAll(List<int> ids);
-}
-
-enum BackupAlbumSort { id }
diff --git a/mobile/lib/providers/backup/backup.provider.dart b/mobile/lib/providers/backup/backup.provider.dart
index 16d4a58bd6..69246398ed 100644
--- a/mobile/lib/providers/backup/backup.provider.dart
+++ b/mobile/lib/providers/backup/backup.provider.dart
@@ -9,7 +9,6 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/interfaces/backup_album.interface.dart';
 import 'package:immich_mobile/models/auth/auth_state.model.dart';
 import 'package:immich_mobile/models/backup/available_album.model.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
@@ -23,6 +22,7 @@ import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/backup/error_backup_list.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
+import 'package:immich_mobile/repositories/backup.repository.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/services/background.service.dart';
 import 'package:immich_mobile/services/backup.service.dart';
diff --git a/mobile/lib/repositories/backup.repository.dart b/mobile/lib/repositories/backup.repository.dart
index f7f3051f46..836dde22c5 100644
--- a/mobile/lib/repositories/backup.repository.dart
+++ b/mobile/lib/repositories/backup.repository.dart
@@ -1,18 +1,17 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
-import 'package:immich_mobile/interfaces/backup_album.interface.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/repositories/database.repository.dart';
 import 'package:isar/isar.dart';
 
+enum BackupAlbumSort { id }
+
 final backupAlbumRepositoryProvider =
     Provider((ref) => BackupAlbumRepository(ref.watch(dbProvider)));
 
-class BackupAlbumRepository extends DatabaseRepository
-    implements IBackupAlbumRepository {
+class BackupAlbumRepository extends DatabaseRepository {
   BackupAlbumRepository(super.db);
 
-  @override
   Future<List<BackupAlbum>> getAll({BackupAlbumSort? sort}) {
     final baseQuery = db.backupAlbums.where();
     final QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> query =
@@ -23,19 +22,15 @@ class BackupAlbumRepository extends DatabaseRepository
     return query.findAll();
   }
 
-  @override
   Future<List<String>> getIdsBySelection(BackupSelection backup) =>
       db.backupAlbums.filter().selectionEqualTo(backup).idProperty().findAll();
 
-  @override
   Future<List<BackupAlbum>> getAllBySelection(BackupSelection backup) =>
       db.backupAlbums.filter().selectionEqualTo(backup).findAll();
 
-  @override
   Future<void> deleteAll(List<int> ids) =>
       txn(() => db.backupAlbums.deleteAll(ids));
 
-  @override
   Future<void> updateAll(List<BackupAlbum> backupAlbums) =>
       txn(() => db.backupAlbums.putAll(backupAlbums));
 }
diff --git a/mobile/lib/services/album.service.dart b/mobile/lib/services/album.service.dart
index bf67f1c24c..9fc578fcff 100644
--- a/mobile/lib/services/album.service.dart
+++ b/mobile/lib/services/album.service.dart
@@ -15,7 +15,6 @@ import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
     as entity;
 import 'package:immich_mobile/interfaces/album.interface.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
-import 'package:immich_mobile/interfaces/backup_album.interface.dart';
 import 'package:immich_mobile/models/albums/album_add_asset_response.model.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -48,7 +47,7 @@ class AlbumService {
   final EntityService _entityService;
   final IAlbumRepository _albumRepository;
   final IAssetRepository _assetRepository;
-  final IBackupAlbumRepository _backupAlbumRepository;
+  final BackupAlbumRepository _backupAlbumRepository;
   final AlbumMediaRepository _albumMediaRepository;
   final AlbumApiRepository _albumApiRepository;
   final Logger _log = Logger('AlbumService');
diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart
index 782a11912e..c4cb884ed4 100644
--- a/mobile/lib/services/asset.service.dart
+++ b/mobile/lib/services/asset.service.dart
@@ -13,7 +13,6 @@ import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/interfaces/asset_media.interface.dart';
-import 'package:immich_mobile/interfaces/backup_album.interface.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
@@ -54,7 +53,7 @@ class AssetService {
   final IExifInfoRepository _exifInfoRepository;
   final IsarUserRepository _isarUserRepository;
   final ETagRepository _etagRepository;
-  final IBackupAlbumRepository _backupRepository;
+  final BackupAlbumRepository _backupRepository;
   final ApiService _apiService;
   final SyncService _syncService;
   final BackupService _backupService;
diff --git a/mobile/lib/services/background.service.dart b/mobile/lib/services/background.service.dart
index 4c4a9b1cff..97acf2941f 100644
--- a/mobile/lib/services/background.service.dart
+++ b/mobile/lib/services/background.service.dart
@@ -14,7 +14,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/interfaces/backup_album.interface.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
 import 'package:immich_mobile/models/backup/error_upload_asset.model.dart';
diff --git a/mobile/lib/services/backup_album.service.dart b/mobile/lib/services/backup_album.service.dart
index 8030d66937..0de7748a9c 100644
--- a/mobile/lib/services/backup_album.service.dart
+++ b/mobile/lib/services/backup_album.service.dart
@@ -1,6 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
-import 'package:immich_mobile/interfaces/backup_album.interface.dart';
 import 'package:immich_mobile/repositories/backup.repository.dart';
 
 final backupAlbumServiceProvider = Provider<BackupAlbumService>((ref) {
@@ -8,7 +7,7 @@ final backupAlbumServiceProvider = Provider<BackupAlbumService>((ref) {
 });
 
 class BackupAlbumService {
-  final IBackupAlbumRepository _backupAlbumRepository;
+  final BackupAlbumRepository _backupAlbumRepository;
 
   BackupAlbumService(this._backupAlbumRepository);
 
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index cf0909b5dc..efbd909713 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -5,7 +5,6 @@ import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/interfaces/asset_media.interface.dart';
 import 'package:immich_mobile/interfaces/auth.interface.dart';
 import 'package:immich_mobile/interfaces/auth_api.interface.dart';
-import 'package:immich_mobile/interfaces/backup_album.interface.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
@@ -13,13 +12,14 @@ import 'package:immich_mobile/repositories/partner.repository.dart';
 import 'package:immich_mobile/repositories/etag.repository.dart';
 import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
+import 'package:immich_mobile/repositories/backup.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockAlbumRepository extends Mock implements IAlbumRepository {}
 
 class MockAssetRepository extends Mock implements IAssetRepository {}
 
-class MockBackupRepository extends Mock implements IBackupAlbumRepository {}
+class MockBackupRepository extends Mock implements BackupAlbumRepository {}
 
 class MockExifInfoRepository extends Mock implements IExifInfoRepository {}
 
@@ -27,8 +27,7 @@ class MockETagRepository extends Mock implements ETagRepository {}
 
 class MockAlbumMediaRepository extends Mock implements AlbumMediaRepository {}
 
-class MockBackupAlbumRepository extends Mock
-    implements IBackupAlbumRepository {}
+class MockBackupAlbumRepository extends Mock implements BackupAlbumRepository {}
 
 class MockAssetApiRepository extends Mock implements IAssetApiRepository {}
 

From af30d976688380f8e097ddd4fde84c7339ab6414 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 17:09:12 -0500
Subject: [PATCH 008/337] refactor(mobile): auth.interface.dart (#19349)

---
 mobile/lib/interfaces/auth.interface.dart    | 11 -----------
 mobile/lib/repositories/auth.repository.dart | 16 ++++------------
 mobile/lib/services/auth.service.dart        |  3 +--
 mobile/test/repository.mocks.dart            |  4 ++--
 4 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 mobile/lib/interfaces/auth.interface.dart

diff --git a/mobile/lib/interfaces/auth.interface.dart b/mobile/lib/interfaces/auth.interface.dart
deleted file mode 100644
index 57088f4569..0000000000
--- a/mobile/lib/interfaces/auth.interface.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-import 'package:immich_mobile/interfaces/database.interface.dart';
-import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
-
-abstract interface class IAuthRepository implements IDatabaseRepository {
-  Future<void> clearLocalData();
-  String getAccessToken();
-  bool getEndpointSwitchingFeature();
-  String? getPreferredWifiName();
-  String? getLocalEndpoint();
-  List<AuxilaryEndpoint> getExternalEndpointList();
-}
diff --git a/mobile/lib/repositories/auth.repository.dart b/mobile/lib/repositories/auth.repository.dart
index 01d2684faf..c1163b8639 100644
--- a/mobile/lib/repositories/auth.repository.dart
+++ b/mobile/lib/repositories/auth.repository.dart
@@ -10,23 +10,20 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/interfaces/auth.interface.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/repositories/database.repository.dart';
 
-final authRepositoryProvider = Provider<IAuthRepository>(
-  (ref) =>
-      AuthRepository(ref.watch(dbProvider), drift: ref.watch(driftProvider)),
+final authRepositoryProvider = Provider<AuthRepository>(
+  (ref) => AuthRepository(ref.watch(dbProvider), ref.watch(driftProvider)),
 );
 
-class AuthRepository extends DatabaseRepository implements IAuthRepository {
+class AuthRepository extends DatabaseRepository {
   final Drift _drift;
 
-  AuthRepository(super.db, {required Drift drift}) : _drift = drift;
+  AuthRepository(super.db, this._drift);
 
-  @override
   Future<void> clearLocalData() {
     return db.writeTxn(() {
       return Future.wait([
@@ -41,27 +38,22 @@ class AuthRepository extends DatabaseRepository implements IAuthRepository {
     });
   }
 
-  @override
   String getAccessToken() {
     return Store.get(StoreKey.accessToken);
   }
 
-  @override
   bool getEndpointSwitchingFeature() {
     return Store.tryGet(StoreKey.autoEndpointSwitching) ?? false;
   }
 
-  @override
   String? getPreferredWifiName() {
     return Store.tryGet(StoreKey.preferredWifiName);
   }
 
-  @override
   String? getLocalEndpoint() {
     return Store.tryGet(StoreKey.localEndpoint);
   }
 
-  @override
   List<AuxilaryEndpoint> getExternalEndpointList() {
     final jsonString = Store.tryGet(StoreKey.externalEndpointList);
 
diff --git a/mobile/lib/services/auth.service.dart b/mobile/lib/services/auth.service.dart
index 41709b714c..6fda76e137 100644
--- a/mobile/lib/services/auth.service.dart
+++ b/mobile/lib/services/auth.service.dart
@@ -5,7 +5,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/interfaces/auth.interface.dart';
 import 'package:immich_mobile/interfaces/auth_api.interface.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
@@ -30,7 +29,7 @@ final authServiceProvider = Provider(
 
 class AuthService {
   final IAuthApiRepository _authApiRepository;
-  final IAuthRepository _authRepository;
+  final AuthRepository _authRepository;
   final ApiService _apiService;
   final NetworkService _networkService;
   final BackgroundSyncManager _backgroundSyncManager;
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index efbd909713..0760f7bc7c 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -3,7 +3,6 @@ import 'package:immich_mobile/interfaces/album.interface.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/interfaces/asset_media.interface.dart';
-import 'package:immich_mobile/interfaces/auth.interface.dart';
 import 'package:immich_mobile/interfaces/auth_api.interface.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
@@ -13,6 +12,7 @@ import 'package:immich_mobile/repositories/etag.repository.dart';
 import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/repositories/backup.repository.dart';
+import 'package:immich_mobile/repositories/auth.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockAlbumRepository extends Mock implements IAlbumRepository {}
@@ -39,7 +39,7 @@ class MockAlbumApiRepository extends Mock implements AlbumApiRepository {}
 
 class MockAuthApiRepository extends Mock implements IAuthApiRepository {}
 
-class MockAuthRepository extends Mock implements IAuthRepository {}
+class MockAuthRepository extends Mock implements AuthRepository {}
 
 class MockPartnerRepository extends Mock implements PartnerRepository {}
 

From 69b13310264bc305b1d16e02929e5a4e52e2de51 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 17:20:58 -0500
Subject: [PATCH 009/337] refactor(mobile): auth_api.interface.dart (#19350)

---
 mobile/lib/interfaces/auth_api.interface.dart    | 14 --------------
 mobile/lib/repositories/auth_api.repository.dart |  9 +--------
 mobile/lib/services/auth.service.dart            |  3 +--
 mobile/test/repository.mocks.dart                |  4 ++--
 4 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 mobile/lib/interfaces/auth_api.interface.dart

diff --git a/mobile/lib/interfaces/auth_api.interface.dart b/mobile/lib/interfaces/auth_api.interface.dart
deleted file mode 100644
index bb9a8b5a2c..0000000000
--- a/mobile/lib/interfaces/auth_api.interface.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'package:immich_mobile/models/auth/login_response.model.dart';
-
-abstract interface class IAuthApiRepository {
-  Future<LoginResponse> login(String email, String password);
-
-  Future<void> logout();
-
-  Future<void> changePassword(String newPassword);
-
-  Future<bool> unlockPinCode(String pinCode);
-  Future<void> lockPinCode();
-
-  Future<void> setupPinCode(String pinCode);
-}
diff --git a/mobile/lib/repositories/auth_api.repository.dart b/mobile/lib/repositories/auth_api.repository.dart
index 4015ffd7bc..4b68867506 100644
--- a/mobile/lib/repositories/auth_api.repository.dart
+++ b/mobile/lib/repositories/auth_api.repository.dart
@@ -1,5 +1,4 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/interfaces/auth_api.interface.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/api.repository.dart';
@@ -9,12 +8,11 @@ import 'package:openapi/api.dart';
 final authApiRepositoryProvider =
     Provider((ref) => AuthApiRepository(ref.watch(apiServiceProvider)));
 
-class AuthApiRepository extends ApiRepository implements IAuthApiRepository {
+class AuthApiRepository extends ApiRepository {
   final ApiService _apiService;
 
   AuthApiRepository(this._apiService);
 
-  @override
   Future<void> changePassword(String newPassword) async {
     await _apiService.usersApi.updateMyUser(
       UserUpdateMeDto(
@@ -23,7 +21,6 @@ class AuthApiRepository extends ApiRepository implements IAuthApiRepository {
     );
   }
 
-  @override
   Future<LoginResponse> login(String email, String password) async {
     final loginResponseDto = await checkNull(
       _apiService.authenticationApi.login(
@@ -37,7 +34,6 @@ class AuthApiRepository extends ApiRepository implements IAuthApiRepository {
     return _mapLoginReponse(loginResponseDto);
   }
 
-  @override
   Future<void> logout() async {
     await _apiService.authenticationApi
         .logout()
@@ -56,7 +52,6 @@ class AuthApiRepository extends ApiRepository implements IAuthApiRepository {
     );
   }
 
-  @override
   Future<bool> unlockPinCode(String pinCode) async {
     try {
       await _apiService.authenticationApi
@@ -67,13 +62,11 @@ class AuthApiRepository extends ApiRepository implements IAuthApiRepository {
     }
   }
 
-  @override
   Future<void> setupPinCode(String pinCode) {
     return _apiService.authenticationApi
         .setupPinCode(PinCodeSetupDto(pinCode: pinCode));
   }
 
-  @override
   Future<void> lockPinCode() {
     return _apiService.authenticationApi.lockAuthSession();
   }
diff --git a/mobile/lib/services/auth.service.dart b/mobile/lib/services/auth.service.dart
index 6fda76e137..0eec253ee1 100644
--- a/mobile/lib/services/auth.service.dart
+++ b/mobile/lib/services/auth.service.dart
@@ -5,7 +5,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/interfaces/auth_api.interface.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
@@ -28,7 +27,7 @@ final authServiceProvider = Provider(
 );
 
 class AuthService {
-  final IAuthApiRepository _authApiRepository;
+  final AuthApiRepository _authApiRepository;
   final AuthRepository _authRepository;
   final ApiService _apiService;
   final NetworkService _networkService;
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index 0760f7bc7c..70876d8a3b 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -3,7 +3,6 @@ import 'package:immich_mobile/interfaces/album.interface.dart';
 import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/interfaces/asset_media.interface.dart';
-import 'package:immich_mobile/interfaces/auth_api.interface.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
@@ -13,6 +12,7 @@ import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/repositories/backup.repository.dart';
 import 'package:immich_mobile/repositories/auth.repository.dart';
+import 'package:immich_mobile/repositories/auth_api.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockAlbumRepository extends Mock implements IAlbumRepository {}
@@ -37,7 +37,7 @@ class MockFileMediaRepository extends Mock implements FileMediaRepository {}
 
 class MockAlbumApiRepository extends Mock implements AlbumApiRepository {}
 
-class MockAuthApiRepository extends Mock implements IAuthApiRepository {}
+class MockAuthApiRepository extends Mock implements AuthApiRepository {}
 
 class MockAuthRepository extends Mock implements AuthRepository {}
 

From 366539bc4c8b460f78f55eae20f28a1a5bac7ad5 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 17:41:02 -0500
Subject: [PATCH 010/337] refactor(mobile): asset.interface.dart (#19351)

* refactor(mobile): asset.interface.dart

* refactor(mobile): asset.interface.dart
---
 mobile/lib/interfaces/asset.interface.dart    | 68 -------------------
 mobile/lib/repositories/asset.repository.dart | 25 +------
 mobile/lib/services/album.service.dart        |  3 +-
 mobile/lib/services/asset.service.dart        |  3 +-
 mobile/lib/services/backup.service.dart       |  3 +-
 .../services/backup_verification.service.dart |  3 +-
 mobile/lib/services/entity.service.dart       |  3 +-
 mobile/lib/services/memory.service.dart       |  3 +-
 mobile/lib/services/person.service.dart       |  3 +-
 mobile/lib/services/search.service.dart       |  3 +-
 mobile/lib/services/stack.service.dart        |  3 +-
 mobile/lib/services/sync.service.dart         |  3 +-
 mobile/lib/services/trash.service.dart        |  3 +-
 .../modules/shared/sync_service_test.dart     |  6 +-
 mobile/test/repository.mocks.dart             |  4 +-
 15 files changed, 20 insertions(+), 116 deletions(-)
 delete mode 100644 mobile/lib/interfaces/asset.interface.dart

diff --git a/mobile/lib/interfaces/asset.interface.dart b/mobile/lib/interfaces/asset.interface.dart
deleted file mode 100644
index ca9e9d64fb..0000000000
--- a/mobile/lib/interfaces/asset.interface.dart
+++ /dev/null
@@ -1,68 +0,0 @@
-import 'package:immich_mobile/entities/album.entity.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/interfaces/database.interface.dart';
-
-abstract interface class IAssetRepository implements IDatabaseRepository {
-  Future<Asset?> getByRemoteId(String id);
-
-  Future<Asset?> getByOwnerIdChecksum(int ownerId, String checksum);
-
-  Future<List<Asset>> getAllByRemoteId(
-    Iterable<String> ids, {
-    AssetState? state,
-  });
-
-  Future<List<Asset?>> getAllByOwnerIdChecksum(
-    List<int> ids,
-    List<String> checksums,
-  );
-
-  Future<List<Asset>> getAll({
-    required String ownerId,
-    AssetState? state,
-    AssetSort? sortBy,
-    int? limit,
-  });
-
-  Future<List<Asset>> getAllLocal();
-
-  Future<List<Asset>> getByAlbum(
-    Album album, {
-    Iterable<String> notOwnedBy = const [],
-    String? ownerId,
-    AssetState? state,
-    AssetSort? sortBy,
-  });
-
-  Future<Asset> update(Asset asset);
-
-  Future<List<Asset>> updateAll(List<Asset> assets);
-
-  Future<void> deleteAllByRemoteId(List<String> ids, {AssetState? state});
-
-  Future<void> deleteByIds(List<int> ids);
-
-  Future<List<Asset>> getMatches({
-    required List<Asset> assets,
-    required String ownerId,
-    AssetState? state,
-    int limit = 100,
-  });
-
-  Future<void> upsertDuplicatedAssets(Iterable<String> duplicatedAssets);
-
-  Future<List<String>> getAllDuplicatedAssetIds();
-
-  Future<List<Asset>> getStackAssets(String stackId);
-
-  Future<void> clearTable();
-
-  Stream<Asset?> watchAsset(int id, {bool fireImmediately = false});
-
-  Future<List<Asset>> getTrashAssets(String userId);
-
-  Future<List<Asset>> getRecentlyTakenAssets(String userId);
-  Future<List<Asset>> getMotionAssets(String userId);
-}
-
-enum AssetSort { checksum, ownerIdChecksum }
diff --git a/mobile/lib/repositories/asset.repository.dart b/mobile/lib/repositories/asset.repository.dart
index c6f8539167..4437ddfcff 100644
--- a/mobile/lib/repositories/asset.repository.dart
+++ b/mobile/lib/repositories/asset.repository.dart
@@ -4,19 +4,19 @@ import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/duplicated_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/repositories/database.repository.dart';
 import 'package:immich_mobile/utils/hash.dart';
 import 'package:isar/isar.dart';
 
+enum AssetSort { checksum, ownerIdChecksum }
+
 final assetRepositoryProvider =
     Provider((ref) => AssetRepository(ref.watch(dbProvider)));
 
-class AssetRepository extends DatabaseRepository implements IAssetRepository {
+class AssetRepository extends DatabaseRepository {
   AssetRepository(super.db);
 
-  @override
   Future<List<Asset>> getByAlbum(
     Album album, {
     Iterable<String> notOwnedBy = const [],
@@ -54,16 +54,13 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
     return sortedQuery.findAll();
   }
 
-  @override
   Future<void> deleteByIds(List<int> ids) => txn(() async {
         await db.assets.deleteAll(ids);
         await db.exifInfos.deleteAll(ids);
       });
 
-  @override
   Future<Asset?> getByRemoteId(String id) => db.assets.getByRemoteId(id);
 
-  @override
   Future<List<Asset>> getAllByRemoteId(
     Iterable<String> ids, {
     AssetState? state,
@@ -88,7 +85,6 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
     };
   }
 
-  @override
   Future<List<Asset>> getAll({
     required String ownerId,
     AssetState? state,
@@ -127,13 +123,11 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
     return limit == null ? query.findAll() : query.limit(limit).findAll();
   }
 
-  @override
   Future<List<Asset>> updateAll(List<Asset> assets) async {
     await txn(() => db.assets.putAll(assets));
     return assets;
   }
 
-  @override
   Future<List<Asset>> getMatches({
     required List<Asset> assets,
     required String ownerId,
@@ -154,42 +148,34 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
     return _getMatchesImpl(query, fastHash(ownerId), assets, limit);
   }
 
-  @override
   Future<Asset> update(Asset asset) async {
     await txn(() => asset.put(db));
     return asset;
   }
 
-  @override
   Future<void> upsertDuplicatedAssets(Iterable<String> duplicatedAssets) => txn(
         () => db.duplicatedAssets
             .putAll(duplicatedAssets.map(DuplicatedAsset.new).toList()),
       );
 
-  @override
   Future<List<String>> getAllDuplicatedAssetIds() =>
       db.duplicatedAssets.where().idProperty().findAll();
 
-  @override
   Future<Asset?> getByOwnerIdChecksum(int ownerId, String checksum) =>
       db.assets.getByOwnerIdChecksum(ownerId, checksum);
 
-  @override
   Future<List<Asset?>> getAllByOwnerIdChecksum(
     List<int> ownerIds,
     List<String> checksums,
   ) =>
       db.assets.getAllByOwnerIdChecksum(ownerIds, checksums);
 
-  @override
   Future<List<Asset>> getAllLocal() =>
       db.assets.where().localIdIsNotNull().findAll();
 
-  @override
   Future<void> deleteAllByRemoteId(List<String> ids, {AssetState? state}) =>
       txn(() => _getAllByRemoteIdImpl(ids, state).deleteAll());
 
-  @override
   Future<List<Asset>> getStackAssets(String stackId) {
     return db.assets
         .filter()
@@ -202,19 +188,16 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
         .findAll();
   }
 
-  @override
   Future<void> clearTable() async {
     await txn(() async {
       await db.assets.clear();
     });
   }
 
-  @override
   Stream<Asset?> watchAsset(int id, {bool fireImmediately = false}) {
     return db.assets.watchObject(id, fireImmediately: fireImmediately);
   }
 
-  @override
   Future<List<Asset>> getTrashAssets(String userId) {
     return db.assets
         .where()
@@ -225,7 +208,6 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
         .findAll();
   }
 
-  @override
   Future<List<Asset>> getRecentlyTakenAssets(String userId) {
     return db.assets
         .where()
@@ -236,7 +218,6 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository {
         .findAll();
   }
 
-  @override
   Future<List<Asset>> getMotionAssets(String userId) {
     return db.assets
         .where()
diff --git a/mobile/lib/services/album.service.dart b/mobile/lib/services/album.service.dart
index 9fc578fcff..beeb21aa96 100644
--- a/mobile/lib/services/album.service.dart
+++ b/mobile/lib/services/album.service.dart
@@ -14,7 +14,6 @@ import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
     as entity;
 import 'package:immich_mobile/interfaces/album.interface.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/models/albums/album_add_asset_response.model.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -46,7 +45,7 @@ class AlbumService {
   final UserService _userService;
   final EntityService _entityService;
   final IAlbumRepository _albumRepository;
-  final IAssetRepository _assetRepository;
+  final AssetRepository _assetRepository;
   final BackupAlbumRepository _backupAlbumRepository;
   final AlbumMediaRepository _albumMediaRepository;
   final AlbumApiRepository _albumApiRepository;
diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart
index c4cb884ed4..0500fb8924 100644
--- a/mobile/lib/services/asset.service.dart
+++ b/mobile/lib/services/asset.service.dart
@@ -10,7 +10,6 @@ import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/interfaces/asset_media.interface.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
@@ -49,7 +48,7 @@ final assetServiceProvider = Provider(
 
 class AssetService {
   final IAssetApiRepository _assetApiRepository;
-  final IAssetRepository _assetRepository;
+  final AssetRepository _assetRepository;
   final IExifInfoRepository _exifInfoRepository;
   final IsarUserRepository _isarUserRepository;
   final ETagRepository _etagRepository;
diff --git a/mobile/lib/services/backup.service.dart b/mobile/lib/services/backup.service.dart
index 50add6cdb2..e07f9b4580 100644
--- a/mobile/lib/services/backup.service.dart
+++ b/mobile/lib/services/backup.service.dart
@@ -11,7 +11,6 @@ import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/asset_media.interface.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
@@ -52,7 +51,7 @@ class BackupService {
   final AlbumService _albumService;
   final AlbumMediaRepository _albumMediaRepository;
   final FileMediaRepository _fileMediaRepository;
-  final IAssetRepository _assetRepository;
+  final AssetRepository _assetRepository;
   final IAssetMediaRepository _assetMediaRepository;
 
   BackupService(
diff --git a/mobile/lib/services/backup_verification.service.dart b/mobile/lib/services/backup_verification.service.dart
index 4de5b127b6..5e3ec667da 100644
--- a/mobile/lib/services/backup_verification.service.dart
+++ b/mobile/lib/services/backup_verification.service.dart
@@ -12,7 +12,6 @@ import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
@@ -25,7 +24,7 @@ import 'package:immich_mobile/utils/diff.dart';
 class BackupVerificationService {
   final UserService _userService;
   final FileMediaRepository _fileMediaRepository;
-  final IAssetRepository _assetRepository;
+  final AssetRepository _assetRepository;
   final IExifInfoRepository _exifInfoRepository;
 
   const BackupVerificationService(
diff --git a/mobile/lib/services/entity.service.dart b/mobile/lib/services/entity.service.dart
index 5837a6853c..91598dcd13 100644
--- a/mobile/lib/services/entity.service.dart
+++ b/mobile/lib/services/entity.service.dart
@@ -2,12 +2,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
 
 class EntityService {
-  final IAssetRepository _assetRepository;
+  final AssetRepository _assetRepository;
   final IsarUserRepository _isarUserRepository;
   EntityService(
     this._assetRepository,
diff --git a/mobile/lib/services/memory.service.dart b/mobile/lib/services/memory.service.dart
index ab0e685778..6e9d017c7a 100644
--- a/mobile/lib/services/memory.service.dart
+++ b/mobile/lib/services/memory.service.dart
@@ -1,6 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/models/memories/memory.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
@@ -18,7 +17,7 @@ class MemoryService {
   final log = Logger("MemoryService");
 
   final ApiService _apiService;
-  final IAssetRepository _assetRepository;
+  final AssetRepository _assetRepository;
 
   MemoryService(this._apiService, this._assetRepository);
 
diff --git a/mobile/lib/services/person.service.dart b/mobile/lib/services/person.service.dart
index c329187241..62bf101505 100644
--- a/mobile/lib/services/person.service.dart
+++ b/mobile/lib/services/person.service.dart
@@ -1,7 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
@@ -22,7 +21,7 @@ class PersonService {
   final Logger _log = Logger("PersonService");
   final PersonApiRepository _personApiRepository;
   final IAssetApiRepository _assetApiRepository;
-  final IAssetRepository _assetRepository;
+  final AssetRepository _assetRepository;
 
   PersonService(
     this._personApiRepository,
diff --git a/mobile/lib/services/search.service.dart b/mobile/lib/services/search.service.dart
index bcf67889c0..5d3b08aaed 100644
--- a/mobile/lib/services/search.service.dart
+++ b/mobile/lib/services/search.service.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/string_extensions.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/models/search/search_result.model.dart';
@@ -20,7 +19,7 @@ final searchServiceProvider = Provider(
 
 class SearchService {
   final ApiService _apiService;
-  final IAssetRepository _assetRepository;
+  final AssetRepository _assetRepository;
 
   final _log = Logger("SearchService");
   SearchService(this._apiService, this._assetRepository);
diff --git a/mobile/lib/services/stack.service.dart b/mobile/lib/services/stack.service.dart
index 1ca56ff279..963169411e 100644
--- a/mobile/lib/services/stack.service.dart
+++ b/mobile/lib/services/stack.service.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
@@ -11,7 +10,7 @@ class StackService {
   StackService(this._api, this._assetRepository);
 
   final ApiService _api;
-  final IAssetRepository _assetRepository;
+  final AssetRepository _assetRepository;
 
   Future<StackResponseDto?> getStack(String stackId) async {
     try {
diff --git a/mobile/lib/services/sync.service.dart b/mobile/lib/services/sync.service.dart
index 4f8910c609..ac780817d3 100644
--- a/mobile/lib/services/sync.service.dart
+++ b/mobile/lib/services/sync.service.dart
@@ -14,7 +14,6 @@ import 'package:immich_mobile/extensions/collection_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
 import 'package:immich_mobile/interfaces/album.interface.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -61,7 +60,7 @@ class SyncService {
   final AlbumMediaRepository _albumMediaRepository;
   final AlbumApiRepository _albumApiRepository;
   final IAlbumRepository _albumRepository;
-  final IAssetRepository _assetRepository;
+  final AssetRepository _assetRepository;
   final IExifInfoRepository _exifInfoRepository;
   final IsarUserRepository _isarUserRepository;
   final UserService _userService;
diff --git a/mobile/lib/services/trash.service.dart b/mobile/lib/services/trash.service.dart
index 478ad65db0..6cd7dfc641 100644
--- a/mobile/lib/services/trash.service.dart
+++ b/mobile/lib/services/trash.service.dart
@@ -1,7 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
@@ -18,7 +17,7 @@ final trashServiceProvider = Provider<TrashService>((ref) {
 
 class TrashService {
   final ApiService _apiService;
-  final IAssetRepository _assetRepository;
+  final AssetRepository _assetRepository;
   final UserService _userService;
 
   const TrashService(
diff --git a/mobile/test/modules/shared/sync_service_test.dart b/mobile/test/modules/shared/sync_service_test.dart
index f2da3ff4fc..a78f65af67 100644
--- a/mobile/test/modules/shared/sync_service_test.dart
+++ b/mobile/test/modules/shared/sync_service_test.dart
@@ -10,8 +10,8 @@ import 'package:immich_mobile/entities/etag.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
+import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/services/sync.service.dart';
 import 'package:mocktail/mocktail.dart';
 
@@ -240,7 +240,9 @@ void main() {
           [initialAssets[1].remoteId!, initialAssets[2].remoteId!],
           state: AssetState.remote,
         ),
-      ).thenAnswer((_) async {});
+      ).thenAnswer((_) async {
+        return;
+      });
       when(
         () => assetRepository
             .getAllByRemoteId(["2-1", "1-1"], state: AssetState.merged),
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index 70876d8a3b..752fd3de6d 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -1,6 +1,5 @@
 import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/interfaces/album.interface.dart';
-import 'package:immich_mobile/interfaces/asset.interface.dart';
 import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/interfaces/asset_media.interface.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
@@ -13,11 +12,12 @@ import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/repositories/backup.repository.dart';
 import 'package:immich_mobile/repositories/auth.repository.dart';
 import 'package:immich_mobile/repositories/auth_api.repository.dart';
+import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockAlbumRepository extends Mock implements IAlbumRepository {}
 
-class MockAssetRepository extends Mock implements IAssetRepository {}
+class MockAssetRepository extends Mock implements AssetRepository {}
 
 class MockBackupRepository extends Mock implements BackupAlbumRepository {}
 

From 484311e9bbbf96e97e5f26b960f06d7c9d343966 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 17:47:16 -0500
Subject: [PATCH 011/337] refactor(mobile): asset-media.interface.dart (#19352)

* refactor(mobile): asset-media.interface.dart

* refactor(mobile): asset-media.interface.dart

* refactor: asset media repo

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/interfaces/asset_media.interface.dart    | 10 ----------
 mobile/lib/repositories/asset_media.repository.dart |  6 +-----
 mobile/lib/services/asset.service.dart              |  3 +--
 mobile/lib/services/backup.service.dart             |  3 +--
 mobile/test/repository.mocks.dart                   |  4 ++--
 5 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 mobile/lib/interfaces/asset_media.interface.dart

diff --git a/mobile/lib/interfaces/asset_media.interface.dart b/mobile/lib/interfaces/asset_media.interface.dart
deleted file mode 100644
index 2606d5c23c..0000000000
--- a/mobile/lib/interfaces/asset_media.interface.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-abstract interface class IAssetMediaRepository {
-  Future<List<String>> deleteAll(List<String> ids);
-
-  Future<Asset?> get(String id);
-
-  /// Obtaining the correct original filename of the asset
-  Future<String?> getOriginalFilename(String id);
-}
diff --git a/mobile/lib/repositories/asset_media.repository.dart b/mobile/lib/repositories/asset_media.repository.dart
index 7df26455cd..0a415b95e2 100644
--- a/mobile/lib/repositories/asset_media.repository.dart
+++ b/mobile/lib/repositories/asset_media.repository.dart
@@ -3,18 +3,15 @@ import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/interfaces/asset_media.interface.dart';
 import 'package:immich_mobile/utils/hash.dart';
 import 'package:photo_manager/photo_manager.dart' hide AssetType;
 
 final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository());
 
-class AssetMediaRepository implements IAssetMediaRepository {
-  @override
+class AssetMediaRepository {
   Future<List<String>> deleteAll(List<String> ids) =>
       PhotoManager.editor.deleteWithIds(ids);
 
-  @override
   Future<Asset?> get(String id) async {
     final entity = await AssetEntity.fromId(id);
     return toAsset(entity);
@@ -47,7 +44,6 @@ class AssetMediaRepository implements IAssetMediaRepository {
     return asset;
   }
 
-  @override
   Future<String?> getOriginalFilename(String id) async {
     final entity = await AssetEntity.fromId(id);
 
diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart
index 0500fb8924..b4bb8dad78 100644
--- a/mobile/lib/services/asset.service.dart
+++ b/mobile/lib/services/asset.service.dart
@@ -11,7 +11,6 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/interfaces/asset_api.interface.dart';
-import 'package:immich_mobile/interfaces/asset_media.interface.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
@@ -58,7 +57,7 @@ class AssetService {
   final BackupService _backupService;
   final AlbumService _albumService;
   final UserService _userService;
-  final IAssetMediaRepository _assetMediaRepository;
+  final AssetMediaRepository _assetMediaRepository;
   final log = Logger('AssetService');
 
   AssetService(
diff --git a/mobile/lib/services/backup.service.dart b/mobile/lib/services/backup.service.dart
index e07f9b4580..370b64398d 100644
--- a/mobile/lib/services/backup.service.dart
+++ b/mobile/lib/services/backup.service.dart
@@ -11,7 +11,6 @@ import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/interfaces/asset_media.interface.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
 import 'package:immich_mobile/models/backup/error_upload_asset.model.dart';
@@ -52,7 +51,7 @@ class BackupService {
   final AlbumMediaRepository _albumMediaRepository;
   final FileMediaRepository _fileMediaRepository;
   final AssetRepository _assetRepository;
-  final IAssetMediaRepository _assetMediaRepository;
+  final AssetMediaRepository _assetMediaRepository;
 
   BackupService(
     this._apiService,
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index 752fd3de6d..94c3b34aa3 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -1,7 +1,6 @@
 import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/interfaces/album.interface.dart';
 import 'package:immich_mobile/interfaces/asset_api.interface.dart';
-import 'package:immich_mobile/interfaces/asset_media.interface.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
@@ -13,6 +12,7 @@ import 'package:immich_mobile/repositories/backup.repository.dart';
 import 'package:immich_mobile/repositories/auth.repository.dart';
 import 'package:immich_mobile/repositories/auth_api.repository.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockAlbumRepository extends Mock implements IAlbumRepository {}
@@ -31,7 +31,7 @@ class MockBackupAlbumRepository extends Mock implements BackupAlbumRepository {}
 
 class MockAssetApiRepository extends Mock implements IAssetApiRepository {}
 
-class MockAssetMediaRepository extends Mock implements IAssetMediaRepository {}
+class MockAssetMediaRepository extends Mock implements AssetMediaRepository {}
 
 class MockFileMediaRepository extends Mock implements FileMediaRepository {}
 

From 2b03802e9cd8dec6fafc5b8044cf57b4eb9415ee Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 18:06:38 -0500
Subject: [PATCH 012/337] refactor(mobile): asset_api.interface.dart (#19353)

---
 .../lib/interfaces/asset_api.interface.dart   | 26 -------------------
 .../repositories/asset_api.repository.dart    |  7 +----
 mobile/lib/services/asset.service.dart        |  3 +--
 mobile/lib/services/person.service.dart       |  3 +--
 mobile/test/repository.mocks.dart             |  4 +--
 5 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 mobile/lib/interfaces/asset_api.interface.dart

diff --git a/mobile/lib/interfaces/asset_api.interface.dart b/mobile/lib/interfaces/asset_api.interface.dart
deleted file mode 100644
index 71ee993a6b..0000000000
--- a/mobile/lib/interfaces/asset_api.interface.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-abstract interface class IAssetApiRepository {
-  // Future<Asset> get(String id);
-
-  // Future<List<Asset>> getAll();
-
-  // Future<Asset> create(Asset asset);
-
-  Future<Asset> update(
-    String id, {
-    String? description,
-  });
-
-  // Future<void> delete(String id);
-
-  Future<List<Asset>> search({List<String> personIds = const []});
-
-  Future<void> updateVisibility(
-    List<String> list,
-    AssetVisibilityEnum visibility,
-  );
-
-  Future<String?> getAssetMIMEType(String id);
-}
diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dart
index f82df4b774..510715c199 100644
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -1,7 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/api.repository.dart';
 import 'package:openapi/api.dart';
@@ -13,13 +12,12 @@ final assetApiRepositoryProvider = Provider(
   ),
 );
 
-class AssetApiRepository extends ApiRepository implements IAssetApiRepository {
+class AssetApiRepository extends ApiRepository {
   final AssetsApi _api;
   final SearchApi _searchApi;
 
   AssetApiRepository(this._api, this._searchApi);
 
-  @override
   Future<Asset> update(String id, {String? description}) async {
     final response = await checkNull(
       _api.updateAsset(id, UpdateAssetDto(description: description)),
@@ -27,7 +25,6 @@ class AssetApiRepository extends ApiRepository implements IAssetApiRepository {
     return Asset.remote(response);
   }
 
-  @override
   Future<List<Asset>> search({List<String> personIds = const []}) async {
     // TODO this always fetches all assets, change API and usage to actually do pagination
     final List<Asset> result = [];
@@ -50,7 +47,6 @@ class AssetApiRepository extends ApiRepository implements IAssetApiRepository {
     return result;
   }
 
-  @override
   Future<void> updateVisibility(
     List<String> ids,
     AssetVisibilityEnum visibility,
@@ -73,7 +69,6 @@ class AssetApiRepository extends ApiRepository implements IAssetApiRepository {
     }
   }
 
-  @override
   Future<String?> getAssetMIMEType(String assetId) async {
     final response = await checkNull(_api.getAssetInfo(assetId));
 
diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart
index b4bb8dad78..cd582b94ac 100644
--- a/mobile/lib/services/asset.service.dart
+++ b/mobile/lib/services/asset.service.dart
@@ -10,7 +10,6 @@ import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
-import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
@@ -46,7 +45,7 @@ final assetServiceProvider = Provider(
 );
 
 class AssetService {
-  final IAssetApiRepository _assetApiRepository;
+  final AssetApiRepository _assetApiRepository;
   final AssetRepository _assetRepository;
   final IExifInfoRepository _exifInfoRepository;
   final IsarUserRepository _isarUserRepository;
diff --git a/mobile/lib/services/person.service.dart b/mobile/lib/services/person.service.dart
index 62bf101505..a591ad4f27 100644
--- a/mobile/lib/services/person.service.dart
+++ b/mobile/lib/services/person.service.dart
@@ -1,7 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:immich_mobile/repositories/person_api.repository.dart';
@@ -20,7 +19,7 @@ PersonService personService(Ref ref) => PersonService(
 class PersonService {
   final Logger _log = Logger("PersonService");
   final PersonApiRepository _personApiRepository;
-  final IAssetApiRepository _assetApiRepository;
+  final AssetApiRepository _assetApiRepository;
   final AssetRepository _assetRepository;
 
   PersonService(
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index 94c3b34aa3..6ab8bb2836 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -1,6 +1,5 @@
 import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/interfaces/album.interface.dart';
-import 'package:immich_mobile/interfaces/asset_api.interface.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
@@ -13,6 +12,7 @@ import 'package:immich_mobile/repositories/auth.repository.dart';
 import 'package:immich_mobile/repositories/auth_api.repository.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockAlbumRepository extends Mock implements IAlbumRepository {}
@@ -29,7 +29,7 @@ class MockAlbumMediaRepository extends Mock implements AlbumMediaRepository {}
 
 class MockBackupAlbumRepository extends Mock implements BackupAlbumRepository {}
 
-class MockAssetApiRepository extends Mock implements IAssetApiRepository {}
+class MockAssetApiRepository extends Mock implements AssetApiRepository {}
 
 class MockAssetMediaRepository extends Mock implements AssetMediaRepository {}
 

From 81eb98d4e5310be3f3b0f380060281c400baaac1 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 18:32:06 -0500
Subject: [PATCH 013/337] refactor(mobile): album.interface.dart (#19354)

---
 mobile/lib/interfaces/album.interface.dart    | 55 -------------------
 mobile/lib/repositories/album.repository.dart | 23 +-------
 mobile/lib/services/album.service.dart        |  3 +-
 mobile/lib/services/sync.service.dart         |  3 +-
 mobile/test/repository.mocks.dart             |  4 +-
 5 files changed, 7 insertions(+), 81 deletions(-)
 delete mode 100644 mobile/lib/interfaces/album.interface.dart

diff --git a/mobile/lib/interfaces/album.interface.dart b/mobile/lib/interfaces/album.interface.dart
deleted file mode 100644
index c1696eda80..0000000000
--- a/mobile/lib/interfaces/album.interface.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/entities/album.entity.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/interfaces/database.interface.dart';
-import 'package:immich_mobile/models/albums/album_search.model.dart';
-
-abstract interface class IAlbumRepository implements IDatabaseRepository {
-  Future<Album> create(Album album);
-
-  Future<Album?> get(int id);
-
-  Future<Album?> getByName(
-    String name, {
-    bool? shared,
-    bool? remote,
-    bool? owner,
-  });
-
-  Future<List<Album>> getAll({
-    bool? shared,
-    bool? remote,
-    int? ownerId,
-    AlbumSort? sortBy,
-  });
-
-  Future<Album> update(Album album);
-
-  Future<void> delete(int albumId);
-
-  Future<void> deleteAllLocal();
-
-  Future<int> count({bool? local});
-
-  Future<void> addUsers(Album album, List<UserDto> users);
-
-  Future<void> removeUsers(Album album, List<UserDto> users);
-
-  Future<void> addAssets(Album album, List<Asset> assets);
-
-  Future<void> removeAssets(Album album, List<Asset> assets);
-
-  Future<Album> recalculateMetadata(Album album);
-
-  Future<List<Album>> search(String searchTerm, QuickFilterMode filterMode);
-
-  Stream<List<Album>> watchRemoteAlbums();
-
-  Stream<List<Album>> watchLocalAlbums();
-
-  Stream<Album?> watchAlbum(int id);
-
-  Future<void> clearTable();
-}
-
-enum AlbumSort { remoteId, localId }
diff --git a/mobile/lib/repositories/album.repository.dart b/mobile/lib/repositories/album.repository.dart
index 8c50c54382..b555f918b4 100644
--- a/mobile/lib/repositories/album.repository.dart
+++ b/mobile/lib/repositories/album.repository.dart
@@ -6,20 +6,20 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
     as entity;
-import 'package:immich_mobile/interfaces/album.interface.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/repositories/database.repository.dart';
 import 'package:immich_mobile/utils/hash.dart';
 import 'package:isar/isar.dart';
 
+enum AlbumSort { remoteId, localId }
+
 final albumRepositoryProvider =
     Provider((ref) => AlbumRepository(ref.watch(dbProvider)));
 
-class AlbumRepository extends DatabaseRepository implements IAlbumRepository {
+class AlbumRepository extends DatabaseRepository {
   AlbumRepository(super.db);
 
-  @override
   Future<int> count({bool? local}) {
     final baseQuery = db.albums.where();
     final QueryBuilder<Album, Album, QAfterWhereClause> query = switch (local) {
@@ -30,10 +30,8 @@ class AlbumRepository extends DatabaseRepository implements IAlbumRepository {
     return query.count();
   }
 
-  @override
   Future<Album> create(Album album) => txn(() => db.albums.store(album));
 
-  @override
   Future<Album?> getByName(
     String name, {
     bool? shared,
@@ -58,13 +56,10 @@ class AlbumRepository extends DatabaseRepository implements IAlbumRepository {
     return query.findFirst();
   }
 
-  @override
   Future<Album> update(Album album) => txn(() => db.albums.store(album));
 
-  @override
   Future<void> delete(int albumId) => txn(() => db.albums.delete(albumId));
 
-  @override
   Future<List<Album>> getAll({
     bool? shared,
     bool? remote,
@@ -96,23 +91,18 @@ class AlbumRepository extends DatabaseRepository implements IAlbumRepository {
     return query.findAll();
   }
 
-  @override
   Future<Album?> get(int id) => db.albums.get(id);
 
-  @override
   Future<void> removeUsers(Album album, List<UserDto> users) => txn(
         () => album.sharedUsers.update(unlink: users.map(entity.User.fromDto)),
       );
 
-  @override
   Future<void> addAssets(Album album, List<Asset> assets) =>
       txn(() => album.assets.update(link: assets));
 
-  @override
   Future<void> removeAssets(Album album, List<Asset> assets) =>
       txn(() => album.assets.update(unlink: assets));
 
-  @override
   Future<Album> recalculateMetadata(Album album) async {
     album.startDate = await album.assets.filter().fileCreatedAtProperty().min();
     album.endDate = await album.assets.filter().fileCreatedAtProperty().max();
@@ -121,15 +111,12 @@ class AlbumRepository extends DatabaseRepository implements IAlbumRepository {
     return album;
   }
 
-  @override
   Future<void> addUsers(Album album, List<UserDto> users) =>
       txn(() => album.sharedUsers.update(link: users.map(entity.User.fromDto)));
 
-  @override
   Future<void> deleteAllLocal() =>
       txn(() => db.albums.where().localIdIsNotNull().deleteAll());
 
-  @override
   Future<List<Album>> search(
     String searchTerm,
     QuickFilterMode filterMode,
@@ -152,24 +139,20 @@ class AlbumRepository extends DatabaseRepository implements IAlbumRepository {
     return await query.findAll();
   }
 
-  @override
   Future<void> clearTable() async {
     await txn(() async {
       await db.albums.clear();
     });
   }
 
-  @override
   Stream<List<Album>> watchRemoteAlbums() {
     return db.albums.where().remoteIdIsNotNull().watch();
   }
 
-  @override
   Stream<List<Album>> watchLocalAlbums() {
     return db.albums.where().localIdIsNotNull().watch();
   }
 
-  @override
   Stream<Album?> watchAlbum(int id) {
     return db.albums.watchObject(id, fireImmediately: true);
   }
diff --git a/mobile/lib/services/album.service.dart b/mobile/lib/services/album.service.dart
index beeb21aa96..cc1f56f579 100644
--- a/mobile/lib/services/album.service.dart
+++ b/mobile/lib/services/album.service.dart
@@ -13,7 +13,6 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
     as entity;
-import 'package:immich_mobile/interfaces/album.interface.dart';
 import 'package:immich_mobile/models/albums/album_add_asset_response.model.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -44,7 +43,7 @@ class AlbumService {
   final SyncService _syncService;
   final UserService _userService;
   final EntityService _entityService;
-  final IAlbumRepository _albumRepository;
+  final AlbumRepository _albumRepository;
   final AssetRepository _assetRepository;
   final BackupAlbumRepository _backupAlbumRepository;
   final AlbumMediaRepository _albumMediaRepository;
diff --git a/mobile/lib/services/sync.service.dart b/mobile/lib/services/sync.service.dart
index ac780817d3..cdf7340958 100644
--- a/mobile/lib/services/sync.service.dart
+++ b/mobile/lib/services/sync.service.dart
@@ -13,7 +13,6 @@ import 'package:immich_mobile/entities/etag.entity.dart';
 import 'package:immich_mobile/extensions/collection_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
-import 'package:immich_mobile/interfaces/album.interface.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -59,7 +58,7 @@ class SyncService {
   final EntityService _entityService;
   final AlbumMediaRepository _albumMediaRepository;
   final AlbumApiRepository _albumApiRepository;
-  final IAlbumRepository _albumRepository;
+  final AlbumRepository _albumRepository;
   final AssetRepository _assetRepository;
   final IExifInfoRepository _exifInfoRepository;
   final IsarUserRepository _isarUserRepository;
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index 6ab8bb2836..e0a12e97cf 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -1,5 +1,4 @@
 import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
-import 'package:immich_mobile/interfaces/album.interface.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
@@ -12,10 +11,11 @@ import 'package:immich_mobile/repositories/auth.repository.dart';
 import 'package:immich_mobile/repositories/auth_api.repository.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/repositories/album.repository.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
-class MockAlbumRepository extends Mock implements IAlbumRepository {}
+class MockAlbumRepository extends Mock implements AlbumRepository {}
 
 class MockAssetRepository extends Mock implements AssetRepository {}
 

From ce8c80dad04bf2ac0feb8c7fc8f6136801fe0aad Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 21 Jun 2025 21:56:49 -0500
Subject: [PATCH 014/337] refactor(mobile): cast_destination.interface.dart
 (#19346)

---
 .../cast_destination_service.interface.dart   | 27 -------------------
 mobile/lib/providers/cast.provider.dart       |  3 +--
 mobile/lib/services/gcast.service.dart        | 22 ++++-----------
 3 files changed, 6 insertions(+), 46 deletions(-)
 delete mode 100644 mobile/lib/interfaces/cast_destination_service.interface.dart

diff --git a/mobile/lib/interfaces/cast_destination_service.interface.dart b/mobile/lib/interfaces/cast_destination_service.interface.dart
deleted file mode 100644
index add8ad7c51..0000000000
--- a/mobile/lib/interfaces/cast_destination_service.interface.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/models/cast/cast_manager_state.dart';
-
-abstract interface class ICastDestinationService {
-  Future<bool> initialize();
-  CastDestinationType getType();
-
-  void Function(bool)? onConnectionState;
-
-  void Function(Duration)? onCurrentTime;
-  void Function(Duration)? onDuration;
-
-  void Function(String)? onReceiverName;
-  void Function(CastState)? onCastState;
-
-  Future<void> connect(dynamic device);
-
-  void loadMedia(Asset asset, bool reload);
-
-  void play();
-  void pause();
-  void seekTo(Duration position);
-  void stop();
-  Future<void> disconnect();
-
-  Future<List<(String, CastDestinationType, dynamic)>> getDevices();
-}
diff --git a/mobile/lib/providers/cast.provider.dart b/mobile/lib/providers/cast.provider.dart
index c80789d2e0..f70bdad9dc 100644
--- a/mobile/lib/providers/cast.provider.dart
+++ b/mobile/lib/providers/cast.provider.dart
@@ -1,6 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/interfaces/cast_destination_service.interface.dart';
 import 'package:immich_mobile/models/cast/cast_manager_state.dart';
 import 'package:immich_mobile/services/gcast.service.dart';
 
@@ -10,7 +9,7 @@ final castProvider = StateNotifierProvider<CastNotifier, CastManagerState>(
 
 class CastNotifier extends StateNotifier<CastManagerState> {
   // more cast providers can be added here (ie Fcast)
-  final ICastDestinationService _gCastService;
+  final GCastService _gCastService;
 
   List<(String, CastDestinationType, dynamic)> discovered = List.empty();
 
diff --git a/mobile/lib/services/gcast.service.dart b/mobile/lib/services/gcast.service.dart
index 60c94c712c..5a8c27b0db 100644
--- a/mobile/lib/services/gcast.service.dart
+++ b/mobile/lib/services/gcast.service.dart
@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:cast/session.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/interfaces/cast_destination_service.interface.dart';
 import 'package:immich_mobile/models/cast/cast_manager_state.dart';
 import 'package:immich_mobile/models/sessions/session_create_response.model.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
@@ -21,7 +20,7 @@ final gCastServiceProvider = Provider(
   ),
 );
 
-class GCastService implements ICastDestinationService {
+class GCastService {
   final GCastRepository _gCastRepository;
   final SessionsAPIRepository _sessionsApiService;
   final AssetApiRepository _assetApiRepository;
@@ -32,15 +31,14 @@ class GCastService implements ICastDestinationService {
   int? _sessionId;
   Timer? _mediaStatusPollingTimer;
 
-  @override
   void Function(bool)? onConnectionState;
-  @override
+
   void Function(Duration)? onCurrentTime;
-  @override
+
   void Function(Duration)? onDuration;
-  @override
+
   void Function(String)? onReceiverName;
-  @override
+
   void Function(CastState)? onCastState;
 
   GCastService(
@@ -120,25 +118,21 @@ class GCastService implements ICastDestinationService {
     }
   }
 
-  @override
   Future<void> connect(dynamic device) async {
     await _gCastRepository.connect(device);
 
     onReceiverName?.call(device.extras["fn"] ?? "Google Cast");
   }
 
-  @override
   CastDestinationType getType() {
     return CastDestinationType.googleCast;
   }
 
-  @override
   Future<bool> initialize() async {
     // there is nothing blocking us from using Google Cast that we can check for
     return true;
   }
 
-  @override
   Future<void> disconnect() async {
     onReceiverName?.call("");
     currentAssetId = null;
@@ -162,7 +156,6 @@ class GCastService implements ICastDestinationService {
     return bufferedExpiration.isAfter(DateTime.now());
   }
 
-  @override
   void loadMedia(Asset asset, bool reload) async {
     if (!isConnected) {
       return;
@@ -234,7 +227,6 @@ class GCastService implements ICastDestinationService {
     }
   }
 
-  @override
   void play() {
     _gCastRepository.sendMessage(CastSession.kNamespaceMedia, {
       "type": "PLAY",
@@ -242,7 +234,6 @@ class GCastService implements ICastDestinationService {
     });
   }
 
-  @override
   void pause() {
     _gCastRepository.sendMessage(CastSession.kNamespaceMedia, {
       "type": "PAUSE",
@@ -250,7 +241,6 @@ class GCastService implements ICastDestinationService {
     });
   }
 
-  @override
   void seekTo(Duration position) {
     _gCastRepository.sendMessage(CastSession.kNamespaceMedia, {
       "type": "SEEK",
@@ -259,7 +249,6 @@ class GCastService implements ICastDestinationService {
     });
   }
 
-  @override
   void stop() {
     _gCastRepository.sendMessage(CastSession.kNamespaceMedia, {
       "type": "STOP",
@@ -273,7 +262,6 @@ class GCastService implements ICastDestinationService {
   // 0x01 is display capability bitmask
   bool isDisplay(int ca) => (ca & 0x01) != 0;
 
-  @override
   Future<List<(String, CastDestinationType, dynamic)>> getDevices() async {
     final dests = await _gCastRepository.listDestinations();
 

From 90aa0dc14d401c48391cfd0fd31ee55d90f50e8b Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Sun, 22 Jun 2025 23:06:45 +0800
Subject: [PATCH 015/337] fix(web): map cluster (#19433)

---
 web/src/lib/components/shared-components/map/map.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/lib/components/shared-components/map/map.svelte b/web/src/lib/components/shared-components/map/map.svelte
index a7bb5cbdf9..06c754f0dc 100644
--- a/web/src/lib/components/shared-components/map/map.svelte
+++ b/web/src/lib/components/shared-components/map/map.svelte
@@ -315,7 +315,7 @@
         features: mapMarkers?.map((marker) => asFeature(marker)) ?? [],
       }}
       id="geojson"
-      cluster={{ radius: 35, maxZoom: 17 }}
+      cluster={{ radius: 35, maxZoom: 18 }}
     >
       <MarkerLayer
         applyToClusters

From a18c6fa910391e96f4c12662f39fe1d3fd683ea6 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Sun, 22 Jun 2025 16:01:30 -0700
Subject: [PATCH 016/337] chore: fix undeclared dependencies (#19440)

* chore: fix undeclared dependencies

* Add express/multer

---------

Co-authored-by: Min Idzelis <min123@gmail.com>
---
 server/package-lock.json | 3579 ++++++++++++++++++++++----------------
 server/package.json      |   19 +
 2 files changed, 2093 insertions(+), 1505 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index 3a37538223..34999e5eba 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -19,15 +19,25 @@
         "@nestjs/schedule": "^5.0.0",
         "@nestjs/swagger": "^11.0.2",
         "@nestjs/websockets": "^11.0.4",
+        "@opentelemetry/api": "^1.9.0",
         "@opentelemetry/auto-instrumentations-node": "^0.59.0",
         "@opentelemetry/context-async-hooks": "^2.0.0",
         "@opentelemetry/exporter-prometheus": "^0.201.0",
+        "@opentelemetry/instrumentation-http": "^0.202.0",
+        "@opentelemetry/instrumentation-ioredis": "^0.50.0",
+        "@opentelemetry/instrumentation-nestjs-core": "^0.48.0",
+        "@opentelemetry/instrumentation-pg": "^0.54.0",
+        "@opentelemetry/resources": "^2.0.1",
+        "@opentelemetry/sdk-metrics": "^2.0.1",
         "@opentelemetry/sdk-node": "^0.201.0",
+        "@opentelemetry/semantic-conventions": "^1.34.0",
         "@react-email/components": "^0.0.41",
+        "@react-email/render": "^1.1.2",
         "@socket.io/redis-adapter": "^8.3.0",
         "archiver": "^7.0.0",
         "async-lock": "^1.4.0",
         "bcrypt": "^6.0.0",
+        "body-parser": "^2.2.0",
         "bullmq": "^5.51.0",
         "chokidar": "^3.5.3",
         "class-transformer": "^0.5.1",
@@ -35,6 +45,7 @@
         "compression": "^1.8.0",
         "cookie": "^1.0.2",
         "cookie-parser": "^1.4.7",
+        "cron": "^3.5.0",
         "exiftool-vendored": "^28.3.1",
         "fast-glob": "^3.3.2",
         "fluent-ffmpeg": "^2.1.2",
@@ -55,7 +66,9 @@
         "nodemailer": "^7.0.0",
         "openid-client": "^6.3.3",
         "pg": "^8.11.3",
+        "pg-connection-string": "^2.9.1",
         "picomatch": "^4.0.2",
+        "postgres": "3.4.5",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
         "react-email": "^4.0.0",
@@ -66,6 +79,7 @@
         "semver": "^7.6.2",
         "sharp": "^0.34.2",
         "sirv": "^3.0.0",
+        "socket.io": "^4.8.1",
         "tailwindcss-preset-email": "^1.3.2",
         "thumbhash": "^0.1.1",
         "typeorm": "^0.3.17",
@@ -84,12 +98,14 @@
         "@types/archiver": "^6.0.0",
         "@types/async-lock": "^1.4.2",
         "@types/bcrypt": "^5.0.0",
+        "@types/body-parser": "^1.19.6",
         "@types/compression": "^1.7.5",
         "@types/cookie-parser": "^1.4.8",
         "@types/express": "^5.0.0",
         "@types/fluent-ffmpeg": "^2.1.21",
         "@types/js-yaml": "^4.0.9",
         "@types/lodash": "^4.14.197",
+        "@types/luxon": "^3.6.2",
         "@types/mock-fs": "^4.13.1",
         "@types/multer": "^1.4.7",
         "@types/node": "^22.15.31",
@@ -101,6 +117,7 @@
         "@types/semver": "^7.5.8",
         "@types/supertest": "^6.0.0",
         "@types/ua-parser-js": "^0.7.36",
+        "@types/validator": "^13.15.2",
         "@vitest/coverage-v8": "^3.0.0",
         "eslint": "^9.14.0",
         "eslint-config-prettier": "^10.0.0",
@@ -157,13 +174,13 @@
       }
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "19.2.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.2.6.tgz",
-      "integrity": "sha512-YTAxNnT++5eflx19OUHmOWu597/TbTel+QARiZCv1xQw99+X8DCKKOUXtqBRd53CAHlREDI33Rn/JLY3NYgMLQ==",
+      "version": "19.2.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.2.8.tgz",
+      "integrity": "sha512-QsmFuYdAyeCyg9WF/AJBhFXDUfCwmDFTEbsv5t5KPSP6slhk0GoLNZApniiFytU2siRlSxVNpve2uATyYuAYkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "19.2.6",
+        "@angular-devkit/core": "19.2.8",
         "jsonc-parser": "3.3.1",
         "magic-string": "0.30.17",
         "ora": "5.4.1",
@@ -226,25 +243,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/schematics-cli/node_modules/@angular-devkit/schematics": {
-      "version": "19.2.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.2.8.tgz",
-      "integrity": "sha512-QsmFuYdAyeCyg9WF/AJBhFXDUfCwmDFTEbsv5t5KPSP6slhk0GoLNZApniiFytU2siRlSxVNpve2uATyYuAYkQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@angular-devkit/core": "19.2.8",
-        "jsonc-parser": "3.3.1",
-        "magic-string": "0.30.17",
-        "ora": "5.4.1",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
     "node_modules/@angular-devkit/schematics-cli/node_modules/@inquirer/prompts": {
       "version": "7.3.2",
       "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.3.2.tgz",
@@ -354,9 +352,9 @@
       }
     },
     "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
-      "version": "19.2.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.6.tgz",
-      "integrity": "sha512-WFgiYhrDMq83UNaGRAneIM7CYYdBozD+yYA9BjoU8AgBLKtrvn6S8ZcjKAk5heoHtY/u8pEb0mwDTz9gxFmJZQ==",
+      "version": "19.2.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.8.tgz",
+      "integrity": "sha512-kcxUHKf5Hi98r4gAvMP3ntJV8wuQ3/i6wuU9RcMP0UKUt2Rer5Ryis3MPqT92jvVVwg6lhrLIhXsFuWJMiYjXQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -460,9 +458,9 @@
       }
     },
     "node_modules/@asamuzakjp/css-color": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.4.tgz",
-      "integrity": "sha512-SeuBV4rnjpFNjI8HSgKUwteuFdkHwkboq31HWzznuqgySQir+jSTczoWVVL4jvOjKjuH80fMDG0Fvg1Sb+OJsA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz",
+      "integrity": "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -473,35 +471,34 @@
         "lru-cache": "^10.4.3"
       }
     },
-    "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/@babel/code-frame": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.27.1",
         "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/code-frame/node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
+    },
     "node_modules/@babel/generator": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz",
-      "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==",
+      "version": "7.27.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.5.tgz",
+      "integrity": "sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.27.0",
-        "@babel/types": "^7.27.0",
+        "@babel/parser": "^7.27.5",
+        "@babel/types": "^7.27.3",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -529,9 +526,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.3.tgz",
-      "integrity": "sha512-xyYxRj6+tLNDTWi0KCBcZ9V7yg3/lwL9DWh9Uwh/RIVlIfFidggcgxKX3GCXwCiswwcGRawBKbEg2LG/Y8eJhw==",
+      "version": "7.27.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.5.tgz",
+      "integrity": "sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==",
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.27.3"
@@ -544,30 +541,30 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
-      "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/parser": "^7.27.0",
-        "@babel/types": "^7.27.0"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz",
-      "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==",
+      "version": "7.27.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.4.tgz",
+      "integrity": "sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.27.0",
-        "@babel/parser": "^7.27.0",
-        "@babel/template": "^7.27.0",
-        "@babel/types": "^7.27.0",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.27.3",
+        "@babel/parser": "^7.27.4",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.27.3",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -585,9 +582,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.3.tgz",
-      "integrity": "sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==",
+      "version": "7.27.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.6.tgz",
+      "integrity": "sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -646,9 +643,9 @@
       }
     },
     "node_modules/@csstools/css-calc": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.3.tgz",
-      "integrity": "sha512-XBG3talrhid44BY1x3MHzUx/aTG8+x/Zi57M4aTKK9RFB4aLlF3TTSzfzn8nWVHWL3FgAXAxmupmDd6VWww+pw==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
+      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
       "dev": true,
       "funding": [
         {
@@ -665,14 +662,14 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.9.tgz",
-      "integrity": "sha512-wILs5Zk7BU86UArYBJTPy/FMPPKVKHMj1ycCEyf3VUptol0JNRLFU/BZsJ4aiIHJEbSLiizzRrw8Pc1uAEDrXw==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.10.tgz",
+      "integrity": "sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==",
       "dev": true,
       "funding": [
         {
@@ -687,20 +684,20 @@
       "license": "MIT",
       "dependencies": {
         "@csstools/color-helpers": "^5.0.2",
-        "@csstools/css-calc": "^2.1.3"
+        "@csstools/css-calc": "^2.1.4"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz",
-      "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
       "dev": true,
       "funding": [
         {
@@ -717,13 +714,13 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz",
-      "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
       "dev": true,
       "funding": [
         {
@@ -1193,9 +1190,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
+      "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1208,9 +1205,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz",
-      "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
+      "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1268,9 +1265,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
-      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
+      "version": "9.29.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
+      "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1291,19 +1288,32 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
-      "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.2.tgz",
+      "integrity": "sha512-4SaFZCNfJqvk/kenHpI8xvN42DMaoycy4PzKc5otHxRswww1kAt82OlBuwRVLofCACCTZEcla2Ydxv8scMXaTg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.14.0",
+        "@eslint/core": "^0.15.0",
         "levn": "^0.4.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.0.tgz",
+      "integrity": "sha512-b7ePw78tEWWkpgZCDYkbqDOP8dmM6qe+AOC6iuJqlq1R/0ahMAeH3qynpnqKFGkMltrp44ohV4ubGyvLX28tzw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@golevelup/nestjs-discovery": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@golevelup/nestjs-discovery/-/nestjs-discovery-4.0.3.tgz",
@@ -1318,9 +1328,9 @@
       }
     },
     "node_modules/@grpc/grpc-js": {
-      "version": "1.13.3",
-      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.3.tgz",
-      "integrity": "sha512-FTXHdOoPbZrBjlVLHuKbDZnsTxXv2BlHF57xw6LuThXacXvtkahEPED0CKMk6obZDf65Hv4k3z62eyPNpvinIg==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.4.tgz",
+      "integrity": "sha512-GsFaMXCkMqkKIvwCQjCrwH+GHbPKBjhwo/8ZuUkWHqbI73Kky9I+pQltrlT0+MWpedCoosda53lgjYfyEPgxBg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@grpc/proto-loader": "^0.7.13",
@@ -1331,9 +1341,9 @@
       }
     },
     "node_modules/@grpc/proto-loader": {
-      "version": "0.7.13",
-      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz",
-      "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==",
+      "version": "0.7.15",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.15.tgz",
+      "integrity": "sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "lodash.camelcase": "^4.3.0",
@@ -1401,9 +1411,9 @@
       }
     },
     "node_modules/@humanwhocodes/retry": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
-      "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+      "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1811,15 +1821,15 @@
       }
     },
     "node_modules/@inquirer/checkbox": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.1.5.tgz",
-      "integrity": "sha512-swPczVU+at65xa5uPfNP9u3qx/alNwiaykiI/ExpsmMSQW55trmZcwhYWzw/7fj+n6Q8z1eENvR7vFfq9oPSAQ==",
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.1.8.tgz",
+      "integrity": "sha512-d/QAsnwuHX2OPolxvYcgSj7A9DO9H6gVOy2DvBTx+P2LH2iRTo/RSGV3iwCzW024nP9hw98KIuDmdyhZQj1UQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.10",
-        "@inquirer/figures": "^1.0.11",
-        "@inquirer/type": "^3.0.6",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/figures": "^1.0.12",
+        "@inquirer/type": "^3.0.7",
         "ansi-escapes": "^4.3.2",
         "yoctocolors-cjs": "^2.1.2"
       },
@@ -1836,14 +1846,14 @@
       }
     },
     "node_modules/@inquirer/confirm": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.9.tgz",
-      "integrity": "sha512-NgQCnHqFTjF7Ys2fsqK2WtnA8X1kHyInyG+nMIuHowVTIgIuS10T4AznI/PvbqSpJqjCUqNBlKGh1v3bwLFL4w==",
+      "version": "5.1.12",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.12.tgz",
+      "integrity": "sha512-dpq+ielV9/bqgXRUbNH//KsY6WEw9DrGPmipkpmgC1Y46cwuBTNx7PXFWTjc3MQ+urcc0QxoVHcMI0FW4Ok0hg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.10",
-        "@inquirer/type": "^3.0.6"
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7"
       },
       "engines": {
         "node": ">=18"
@@ -1858,14 +1868,14 @@
       }
     },
     "node_modules/@inquirer/core": {
-      "version": "10.1.10",
-      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.10.tgz",
-      "integrity": "sha512-roDaKeY1PYY0aCqhRmXihrHjoSW2A00pV3Ke5fTpMCkzcGF64R8e0lw3dK+eLEHwS4vB5RnW1wuQmvzoRul8Mw==",
+      "version": "10.1.13",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.13.tgz",
+      "integrity": "sha512-1viSxebkYN2nJULlzCxES6G9/stgHSepZ9LqqfdIGPHj5OHhiBUXVS0a6R0bEC2A+VL4D9w6QB66ebCr6HGllA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/figures": "^1.0.11",
-        "@inquirer/type": "^3.0.6",
+        "@inquirer/figures": "^1.0.12",
+        "@inquirer/type": "^3.0.7",
         "ansi-escapes": "^4.3.2",
         "cli-width": "^4.1.0",
         "mute-stream": "^2.0.0",
@@ -1886,14 +1896,14 @@
       }
     },
     "node_modules/@inquirer/editor": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.10.tgz",
-      "integrity": "sha512-5GVWJ+qeI6BzR6TIInLP9SXhWCEcvgFQYmcRG6d6RIlhFjM5TyG18paTGBgRYyEouvCmzeco47x9zX9tQEofkw==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.13.tgz",
+      "integrity": "sha512-WbicD9SUQt/K8O5Vyk9iC2ojq5RHoCLK6itpp2fHsWe44VxxcA9z3GTWlvjSTGmMQpZr+lbVmrxdHcumJoLbMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.10",
-        "@inquirer/type": "^3.0.6",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7",
         "external-editor": "^3.1.0"
       },
       "engines": {
@@ -1909,14 +1919,14 @@
       }
     },
     "node_modules/@inquirer/expand": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.12.tgz",
-      "integrity": "sha512-jV8QoZE1fC0vPe6TnsOfig+qwu7Iza1pkXoUJ3SroRagrt2hxiL+RbM432YAihNR7m7XnU0HWl/WQ35RIGmXHw==",
+      "version": "4.0.15",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.15.tgz",
+      "integrity": "sha512-4Y+pbr/U9Qcvf+N/goHzPEXiHH8680lM3Dr3Y9h9FFw4gHS+zVpbj8LfbKWIb/jayIB4aSO4pWiBTrBYWkvi5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.10",
-        "@inquirer/type": "^3.0.6",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
@@ -1932,9 +1942,9 @@
       }
     },
     "node_modules/@inquirer/figures": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.11.tgz",
-      "integrity": "sha512-eOg92lvrn/aRUqbxRyvpEWnrvRuTYRifixHkYVpJiygTgVSBIHDqLh0SrMQXkafvULg3ck11V7xvR+zcgvpHFw==",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.12.tgz",
+      "integrity": "sha512-MJttijd8rMFcKJC8NYmprWr6hD3r9Gd9qUC0XwPNwoEPWSMVJwA2MlXxF+nhZZNMY+HXsWa+o7KY2emWYIn0jQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1942,14 +1952,14 @@
       }
     },
     "node_modules/@inquirer/input": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.9.tgz",
-      "integrity": "sha512-mshNG24Ij5KqsQtOZMgj5TwEjIf+F2HOESk6bjMwGWgcH5UBe8UoljwzNFHqdMbGYbgAf6v2wU/X9CAdKJzgOA==",
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.12.tgz",
+      "integrity": "sha512-xJ6PFZpDjC+tC1P8ImGprgcsrzQRsUh9aH3IZixm1lAZFK49UGHxM3ltFfuInN2kPYNfyoPRh+tU4ftsjPLKqQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.10",
-        "@inquirer/type": "^3.0.6"
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7"
       },
       "engines": {
         "node": ">=18"
@@ -1964,14 +1974,14 @@
       }
     },
     "node_modules/@inquirer/number": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.12.tgz",
-      "integrity": "sha512-7HRFHxbPCA4e4jMxTQglHJwP+v/kpFsCf2szzfBHy98Wlc3L08HL76UDiA87TOdX5fwj2HMOLWqRWv9Pnn+Z5Q==",
+      "version": "3.0.15",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.15.tgz",
+      "integrity": "sha512-xWg+iYfqdhRiM55MvqiTCleHzszpoigUpN5+t1OMcRkJrUrw7va3AzXaxvS+Ak7Gny0j2mFSTv2JJj8sMtbV2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.10",
-        "@inquirer/type": "^3.0.6"
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7"
       },
       "engines": {
         "node": ">=18"
@@ -1986,14 +1996,14 @@
       }
     },
     "node_modules/@inquirer/password": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.12.tgz",
-      "integrity": "sha512-FlOB0zvuELPEbnBYiPaOdJIaDzb2PmJ7ghi/SVwIHDDSQ2K4opGBkF+5kXOg6ucrtSUQdLhVVY5tycH0j0l+0g==",
+      "version": "4.0.15",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.15.tgz",
+      "integrity": "sha512-75CT2p43DGEnfGTaqFpbDC2p2EEMrq0S+IRrf9iJvYreMy5mAWj087+mdKyLHapUEPLjN10mNvABpGbk8Wdraw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.10",
-        "@inquirer/type": "^3.0.6",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7",
         "ansi-escapes": "^4.3.2"
       },
       "engines": {
@@ -2039,14 +2049,14 @@
       }
     },
     "node_modules/@inquirer/rawlist": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.12.tgz",
-      "integrity": "sha512-wNPJZy8Oc7RyGISPxp9/MpTOqX8lr0r+lCCWm7hQra+MDtYRgINv1hxw7R+vKP71Bu/3LszabxOodfV/uTfsaA==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.1.3.tgz",
+      "integrity": "sha512-7XrV//6kwYumNDSsvJIPeAqa8+p7GJh7H5kRuxirct2cgOcSWwwNGoXDRgpNFbY/MG2vQ4ccIWCi8+IXXyFMZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.10",
-        "@inquirer/type": "^3.0.6",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/type": "^3.0.7",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
@@ -2062,15 +2072,15 @@
       }
     },
     "node_modules/@inquirer/search": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.12.tgz",
-      "integrity": "sha512-H/kDJA3kNlnNIjB8YsaXoQI0Qccgf0Na14K1h8ExWhNmUg2E941dyFPrZeugihEa9AZNW5NdsD/NcvUME83OPQ==",
+      "version": "3.0.15",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.15.tgz",
+      "integrity": "sha512-YBMwPxYBrADqyvP4nNItpwkBnGGglAvCLVW8u4pRmmvOsHUtCAUIMbUrLX5B3tFL1/WsLGdQ2HNzkqswMs5Uaw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.10",
-        "@inquirer/figures": "^1.0.11",
-        "@inquirer/type": "^3.0.6",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/figures": "^1.0.12",
+        "@inquirer/type": "^3.0.7",
         "yoctocolors-cjs": "^2.1.2"
       },
       "engines": {
@@ -2086,15 +2096,15 @@
       }
     },
     "node_modules/@inquirer/select": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.1.1.tgz",
-      "integrity": "sha512-IUXzzTKVdiVNMA+2yUvPxWsSgOG4kfX93jOM4Zb5FgujeInotv5SPIJVeXQ+fO4xu7tW8VowFhdG5JRmmCyQ1Q==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.2.3.tgz",
+      "integrity": "sha512-OAGhXU0Cvh0PhLz9xTF/kx6g6x+sP+PcyTiLvCrewI99P3BBeexD+VbuwkNDvqGkk3y2h5ZiWLeRP7BFlhkUDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.10",
-        "@inquirer/figures": "^1.0.11",
-        "@inquirer/type": "^3.0.6",
+        "@inquirer/core": "^10.1.13",
+        "@inquirer/figures": "^1.0.12",
+        "@inquirer/type": "^3.0.7",
         "ansi-escapes": "^4.3.2",
         "yoctocolors-cjs": "^2.1.2"
       },
@@ -2111,9 +2121,9 @@
       }
     },
     "node_modules/@inquirer/type": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.6.tgz",
-      "integrity": "sha512-/mKVCtVpyBu3IDarv0G+59KC4stsD5mDsGpYh+GKs1NZT88Jh52+cuoA1AtLk2Q0r/quNl+1cSUyLRHBFeD0XA==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.7.tgz",
+      "integrity": "sha512-PfunHQcjwnju84L+ycmcMKB/pTPIngjUJvfnRhKY6FKPuYXlM4aQCb/nIdTFR6BEhMjFvngzvng/vBAJMZpLSA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2134,6 +2144,27 @@
       "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==",
       "license": "MIT"
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -2325,6 +2356,62 @@
         "node-pre-gyp": "bin/node-pre-gyp"
       }
     },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@mapbox/node-pre-gyp/node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -2347,6 +2434,112 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@mapbox/node-pre-gyp/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -2364,12 +2557,89 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/@microsoft/tsdoc": {
       "version": "0.15.1",
       "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.15.1.tgz",
       "integrity": "sha512-4aErSrCR/On/e5G2hDP0wjooqDdauzEbIq8hIkIe5pXV0rtWJZvdCEKL0ykZxex+IxIwBp0eGeV48hQN07dXtw==",
       "license": "MIT"
     },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
+      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
+      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
+      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
+      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
@@ -2383,6 +2653,19 @@
         "linux"
       ]
     },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
+      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@nestjs/bull-shared": {
       "version": "11.0.2",
       "resolved": "https://registry.npmjs.org/@nestjs/bull-shared/-/bull-shared-11.0.2.tgz",
@@ -2485,25 +2768,6 @@
         }
       }
     },
-    "node_modules/@nestjs/cli/node_modules/@angular-devkit/schematics": {
-      "version": "19.2.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.2.8.tgz",
-      "integrity": "sha512-QsmFuYdAyeCyg9WF/AJBhFXDUfCwmDFTEbsv5t5KPSP6slhk0GoLNZApniiFytU2siRlSxVNpve2uATyYuAYkQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@angular-devkit/core": "19.2.8",
-        "jsonc-parser": "3.3.1",
-        "magic-string": "0.30.17",
-        "ora": "5.4.1",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
     "node_modules/@nestjs/cli/node_modules/ajv": {
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
@@ -2579,12 +2843,12 @@
       }
     },
     "node_modules/@nestjs/common": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-11.1.1.tgz",
-      "integrity": "sha512-crzp+1qeZ5EGL0nFTPy9NrVMAaUWewV5AwtQyv6SQ9yQPXwRl9W9hm1pt0nAtUu5QbYMbSuo7lYcF81EjM+nCA==",
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-11.1.3.tgz",
+      "integrity": "sha512-ogEK+GriWodIwCw6buQ1rpcH4Kx+G7YQ9EwuPySI3rS05pSdtQ++UhucjusSI9apNidv+QURBztJkRecwwJQXg==",
       "license": "MIT",
       "dependencies": {
-        "file-type": "20.5.0",
+        "file-type": "21.0.0",
         "iterare": "1.2.1",
         "load-esm": "1.0.2",
         "tslib": "2.8.1",
@@ -2610,9 +2874,9 @@
       }
     },
     "node_modules/@nestjs/core": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-11.1.1.tgz",
-      "integrity": "sha512-UFoUAgLKFT+RwHTANJdr0dF7p0qS9QjkaUPjg8aafnjM/qxxxrUVDB49nVvyMlk+Hr1+vvcNaOHbWWQBxoZcHA==",
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-11.1.3.tgz",
+      "integrity": "sha512-5lTni0TCh8x7bXETRD57pQFnKnEg1T6M+VLE7wAmyQRIecKQU+2inRGZD+A4v2DC1I04eA0WffP0GKLxjOKlzw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -2684,14 +2948,14 @@
       }
     },
     "node_modules/@nestjs/platform-express": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-11.1.1.tgz",
-      "integrity": "sha512-IUxk380qnUtz0PCRQ5i+o9UHlGMrFzGPIJxDwyt3JZZwx2AngOlcEcm5e+7YeJQEr2QYX2QyC4tUQg0zde+D7A==",
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-11.1.3.tgz",
+      "integrity": "sha512-hEDNMlaPiBO72fxxX/CuRQL3MEhKRc/sIYGVoXjrnw6hTxZdezvvM6A95UaLsYknfmcZZa/CdG1SMBZOu9agHQ==",
       "license": "MIT",
       "dependencies": {
         "cors": "2.8.5",
         "express": "5.1.0",
-        "multer": "1.4.5-lts.2",
+        "multer": "2.0.1",
         "path-to-regexp": "8.2.0",
         "tslib": "2.8.1"
       },
@@ -2705,9 +2969,9 @@
       }
     },
     "node_modules/@nestjs/platform-socket.io": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/@nestjs/platform-socket.io/-/platform-socket.io-11.1.1.tgz",
-      "integrity": "sha512-Bsc8ouysUFasWiO8RKEvppqYM5LNkHfbyIJQTy3V6+PUdYhblkvmOq8QtjuHpv6DiBI4siUcxACx/90/CdXLkQ==",
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/@nestjs/platform-socket.io/-/platform-socket.io-11.1.3.tgz",
+      "integrity": "sha512-jQ+ccprmh3kKolBp+bb97zoaS3vKaiyeNqyctGqV4CSG8P6mXSaaUObWxAsw6Jdgn5YQAVEBWJ6FhvF4s6QZbg==",
       "license": "MIT",
       "dependencies": {
         "socket.io": "4.8.1",
@@ -2781,6 +3045,25 @@
         }
       }
     },
+    "node_modules/@nestjs/schematics/node_modules/@angular-devkit/schematics": {
+      "version": "19.2.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.2.6.tgz",
+      "integrity": "sha512-YTAxNnT++5eflx19OUHmOWu597/TbTel+QARiZCv1xQw99+X8DCKKOUXtqBRd53CAHlREDI33Rn/JLY3NYgMLQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@angular-devkit/core": "19.2.6",
+        "jsonc-parser": "3.3.1",
+        "magic-string": "0.30.17",
+        "ora": "5.4.1",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
     "node_modules/@nestjs/schematics/node_modules/ajv": {
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
@@ -2893,9 +3176,9 @@
       }
     },
     "node_modules/@nestjs/testing": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/@nestjs/testing/-/testing-11.1.1.tgz",
-      "integrity": "sha512-stzm8YrLDGAijHYQw+8Z9dD6lGdvahL0hIjGVZ/0KBxLZht0/rvRjgV31UK+DUqXaF7yhJTw9ryrPaITxI1J6A==",
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/@nestjs/testing/-/testing-11.1.3.tgz",
+      "integrity": "sha512-CeXG6/eEqgFIkPkmU00y18Dd3DLOIDFhPItzJK1SWckKo6IhcnfoRJzGx75bmuvUMjb51j6An96S/+MJ2ty9jA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2921,9 +3204,9 @@
       }
     },
     "node_modules/@nestjs/websockets": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/@nestjs/websockets/-/websockets-11.1.1.tgz",
-      "integrity": "sha512-gxwQoGx5bW5IvparzrX1UOGXz87eqY0fK5Y6yb14z6tSSubQTciNjCDm5osDEkRyRCG6ZB0F+eXF6dRUjwTlBQ==",
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/@nestjs/websockets/-/websockets-11.1.3.tgz",
+      "integrity": "sha512-IjhWKfRf0D247JxYIEs8USblJJbcxUsKJpzbCPaZ7TrVy4LrpG3IRQDlSTOw599TRIYP5ixyH9C0+v5DyaI9uA==",
       "license": "MIT",
       "dependencies": {
         "iterare": "1.2.1",
@@ -2944,15 +3227,15 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.3.3.tgz",
-      "integrity": "sha512-OdiMrzCl2Xi0VTjiQQUK0Xh7bJHnOuET2s+3V+Y40WJBAXrJeGA3f+I8MZJ/YQ3mVGi5XGR1L66oFlgqXhQ4Vw==",
+      "version": "15.3.4",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.3.4.tgz",
+      "integrity": "sha512-ZkdYzBseS6UjYzz6ylVKPOK+//zLWvD6Ta+vpoye8cW11AjiQjGYVibF0xuvT4L0iJfAPfZLFidaEzAOywyOAQ==",
       "license": "MIT"
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.3.3.tgz",
-      "integrity": "sha512-WRJERLuH+O3oYB4yZNVahSVFmtxRNjNF1I1c34tYMoJb0Pve+7/RaLAJJizyYiFhjYNGHRAE1Ri2Fd23zgDqhg==",
+      "version": "15.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.3.4.tgz",
+      "integrity": "sha512-z0qIYTONmPRbwHWvpyrFXJd5F9YWLCsw3Sjrzj2ZvMYy9NPQMPZ1NjOJh4ojr4oQzcGYwgJKfidzehaNa1BpEg==",
       "cpu": [
         "arm64"
       ],
@@ -2966,9 +3249,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.3.3.tgz",
-      "integrity": "sha512-XHdzH/yBc55lu78k/XwtuFR/ZXUTcflpRXcsu0nKmF45U96jt1tsOZhVrn5YH+paw66zOANpOnFQ9i6/j+UYvw==",
+      "version": "15.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.3.4.tgz",
+      "integrity": "sha512-Z0FYJM8lritw5Wq+vpHYuCIzIlEMjewG2aRkc3Hi2rcbULknYL/xqfpBL23jQnCSrDUGAo/AEv0Z+s2bff9Zkw==",
       "cpu": [
         "x64"
       ],
@@ -2982,9 +3265,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.3.3.tgz",
-      "integrity": "sha512-VZ3sYL2LXB8znNGcjhocikEkag/8xiLgnvQts41tq6i+wql63SMS1Q6N8RVXHw5pEUjiof+II3HkDd7GFcgkzw==",
+      "version": "15.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.3.4.tgz",
+      "integrity": "sha512-l8ZQOCCg7adwmsnFm8m5q9eIPAHdaB2F3cxhufYtVo84pymwKuWfpYTKcUiFcutJdp9xGHC+F1Uq3xnFU1B/7g==",
       "cpu": [
         "arm64"
       ],
@@ -2998,9 +3281,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.3.3.tgz",
-      "integrity": "sha512-h6Y1fLU4RWAp1HPNJWDYBQ+e3G7sLckyBXhmH9ajn8l/RSMnhbuPBV/fXmy3muMcVwoJdHL+UtzRzs0nXOf9SA==",
+      "version": "15.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.3.4.tgz",
+      "integrity": "sha512-wFyZ7X470YJQtpKot4xCY3gpdn8lE9nTlldG07/kJYexCUpX1piX+MBfZdvulo+t1yADFVEuzFfVHfklfEx8kw==",
       "cpu": [
         "arm64"
       ],
@@ -3014,9 +3297,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.3.3.tgz",
-      "integrity": "sha512-jJ8HRiF3N8Zw6hGlytCj5BiHyG/K+fnTKVDEKvUCyiQ/0r5tgwO7OgaRiOjjRoIx2vwLR+Rz8hQoPrnmFbJdfw==",
+      "version": "15.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.3.4.tgz",
+      "integrity": "sha512-gEbH9rv9o7I12qPyvZNVTyP/PWKqOp8clvnoYZQiX800KkqsaJZuOXkWgMa7ANCCh/oEN2ZQheh3yH8/kWPSEg==",
       "cpu": [
         "x64"
       ],
@@ -3030,9 +3313,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.3.3.tgz",
-      "integrity": "sha512-HrUcTr4N+RgiiGn3jjeT6Oo208UT/7BuTr7K0mdKRBtTbT4v9zJqCDKO97DUqqoBK1qyzP1RwvrWTvU6EPh/Cw==",
+      "version": "15.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.3.4.tgz",
+      "integrity": "sha512-Cf8sr0ufuC/nu/yQ76AnarbSAXcwG/wj+1xFPNbyNo8ltA6kw5d5YqO8kQuwVIxk13SBdtgXrNyom3ZosHAy4A==",
       "cpu": [
         "x64"
       ],
@@ -3046,9 +3329,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.3.3.tgz",
-      "integrity": "sha512-SxorONgi6K7ZUysMtRF3mIeHC5aA3IQLmKFQzU0OuhuUYwpOBc1ypaLJLP5Bf3M9k53KUUUj4vTPwzGvl/NwlQ==",
+      "version": "15.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.3.4.tgz",
+      "integrity": "sha512-ay5+qADDN3rwRbRpEhTOreOn1OyJIXS60tg9WMYTWCy3fB6rGoyjLVxc4dR9PYjEdR2iDYsaF5h03NA+XuYPQQ==",
       "cpu": [
         "arm64"
       ],
@@ -3062,9 +3345,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.3.3.tgz",
-      "integrity": "sha512-4QZG6F8enl9/S2+yIiOiju0iCTFd93d8VC1q9LZS4p/Xuk81W2QDjCFeoogmrWWkAD59z8ZxepBQap2dKS5ruw==",
+      "version": "15.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.3.4.tgz",
+      "integrity": "sha512-4kDt31Bc9DGyYs41FTL1/kNpDeHyha2TC0j5sRRoKCyrhNcfZ/nRQkAUlF27mETwm8QyHqIjHJitfcza2Iykfg==",
       "cpu": [
         "x64"
       ],
@@ -3142,37 +3425,6 @@
         "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/@npmcli/agent/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@npmcli/agent/node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@npmcli/agent/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/@npmcli/fs": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
@@ -3287,6 +3539,143 @@
         "@opentelemetry/core": "^2.0.0"
       }
     },
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@opentelemetry/instrumentation-http": {
+      "version": "0.201.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.201.1.tgz",
+      "integrity": "sha512-xhkL/eOntScSLS8C2/LHKZ9Z9MEyGB9Yil7lF3JV0+YBeLXHQUIw2xPD7T0qw0DnqlrN8c/gi8hb5BEXZcyHRg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "2.0.1",
+        "@opentelemetry/instrumentation": "0.201.1",
+        "@opentelemetry/semantic-conventions": "^1.29.0",
+        "forwarded-parse": "2.1.2"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@opentelemetry/instrumentation-ioredis": {
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.49.0.tgz",
+      "integrity": "sha512-CcbA9ylntqK7/lo7NUD/I+Uj6xcIiFFk1O2RnY23MugJunqZIFufvYkdh1mdG2bvBKdIVvA2nkVVt1Igw0uw1A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/redis-common": "^0.37.0",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@opentelemetry/instrumentation-nestjs-core": {
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.47.0.tgz",
+      "integrity": "sha512-xTtWbqdvlxRfhYidLEq0XvQUGqqgT4Fom21nxJ7XYvOoUJ4KNOxFBnfGW9RcXtFHDkux6rIjNP5CiPCYMZ007g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/semantic-conventions": "^1.30.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@opentelemetry/instrumentation-pg": {
+      "version": "0.53.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.53.0.tgz",
+      "integrity": "sha512-riWbJvSviTAsjeuq8fn7Y7+CXEYf3sGR18WfLeM7GgSnptTOur1++SLTN7XogqiwP3LFFQ0GLoYe+hxVOEyEpw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "^2.0.0",
+        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/semantic-conventions": "^1.27.0",
+        "@opentelemetry/sql-common": "^0.41.0",
+        "@types/pg": "8.6.1",
+        "@types/pg-pool": "2.0.6"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@types/pg": {
+      "version": "8.6.1",
+      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.6.1.tgz",
+      "integrity": "sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "pg-protocol": "*",
+        "pg-types": "^2.2.0"
+      }
+    },
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/pg-types": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
+      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+      "license": "MIT",
+      "dependencies": {
+        "pg-int8": "1.0.1",
+        "postgres-array": "~2.0.0",
+        "postgres-bytea": "~1.0.0",
+        "postgres-date": "~1.0.4",
+        "postgres-interval": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/postgres-bytea": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/postgres-date": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/postgres-interval": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@opentelemetry/context-async-hooks": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-2.0.1.tgz",
@@ -3826,13 +4215,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-http": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.201.1.tgz",
-      "integrity": "sha512-xhkL/eOntScSLS8C2/LHKZ9Z9MEyGB9Yil7lF3JV0+YBeLXHQUIw2xPD7T0qw0DnqlrN8c/gi8hb5BEXZcyHRg==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.202.0.tgz",
+      "integrity": "sha512-oX+jyY2KBg4/nVH3vZhSWDbhywkHgE0fq3YinhUBx0jv+YUWC2UKA7qLkxr/CSzfKsFi/Km0NKV+llH17yYGKw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/instrumentation": "0.201.1",
+        "@opentelemetry/instrumentation": "0.202.0",
         "@opentelemetry/semantic-conventions": "^1.29.0",
         "forwarded-parse": "2.1.2"
       },
@@ -3843,13 +4232,42 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-ioredis": {
-      "version": "0.49.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.49.0.tgz",
-      "integrity": "sha512-CcbA9ylntqK7/lo7NUD/I+Uj6xcIiFFk1O2RnY23MugJunqZIFufvYkdh1mdG2bvBKdIVvA2nkVVt1Igw0uw1A==",
+    "node_modules/@opentelemetry/instrumentation-http/node_modules/@opentelemetry/api-logs": {
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.202.0.tgz",
+      "integrity": "sha512-fTBjMqKCfotFWfLzaKyhjLvyEyq5vDKTTFfBmx21btv3gvy8Lq6N5Dh2OzqeuN4DjtpSvNT1uNVfg08eD2Rfxw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-http/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.202.0.tgz",
+      "integrity": "sha512-Uz3BxZWPgDwgHM2+vCKEQRh0R8WKrd/q6Tus1vThRClhlPO39Dyz7mDrOr6KuqGXAlBQ1e5Tnymzri4RMZNaWA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.202.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-ioredis": {
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.50.0.tgz",
+      "integrity": "sha512-f2e+3xPxMRdlt1rjZpRhxuqrfumlWe3NX0Y+W857RBBV11HhbeZZaYbO5MMaxV3xBZv4dwPSGx96GjExUWY0WA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/redis-common": "^0.37.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
@@ -3860,6 +4278,35 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-ioredis/node_modules/@opentelemetry/api-logs": {
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.202.0.tgz",
+      "integrity": "sha512-fTBjMqKCfotFWfLzaKyhjLvyEyq5vDKTTFfBmx21btv3gvy8Lq6N5Dh2OzqeuN4DjtpSvNT1uNVfg08eD2Rfxw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-ioredis/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.202.0.tgz",
+      "integrity": "sha512-Uz3BxZWPgDwgHM2+vCKEQRh0R8WKrd/q6Tus1vThRClhlPO39Dyz7mDrOr6KuqGXAlBQ1e5Tnymzri4RMZNaWA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.202.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-kafkajs": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.10.0.tgz",
@@ -4009,12 +4456,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-nestjs-core": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.47.0.tgz",
-      "integrity": "sha512-xTtWbqdvlxRfhYidLEq0XvQUGqqgT4Fom21nxJ7XYvOoUJ4KNOxFBnfGW9RcXtFHDkux6rIjNP5CiPCYMZ007g==",
+      "version": "0.48.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.48.0.tgz",
+      "integrity": "sha512-ytK4ABSkWcD9vyMU8GpinvodAGaRxBFuxybP/m7sgLtEboXMJjdWnEHb7lH/CX1ICiVKRXWdYg9npdu6yBCW5Q==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.30.0"
       },
       "engines": {
@@ -4024,6 +4471,35 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-nestjs-core/node_modules/@opentelemetry/api-logs": {
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.202.0.tgz",
+      "integrity": "sha512-fTBjMqKCfotFWfLzaKyhjLvyEyq5vDKTTFfBmx21btv3gvy8Lq6N5Dh2OzqeuN4DjtpSvNT1uNVfg08eD2Rfxw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-nestjs-core/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.202.0.tgz",
+      "integrity": "sha512-Uz3BxZWPgDwgHM2+vCKEQRh0R8WKrd/q6Tus1vThRClhlPO39Dyz7mDrOr6KuqGXAlBQ1e5Tnymzri4RMZNaWA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.202.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-net": {
       "version": "0.45.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-net/-/instrumentation-net-0.45.0.tgz",
@@ -4058,16 +4534,16 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-pg": {
-      "version": "0.53.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.53.0.tgz",
-      "integrity": "sha512-riWbJvSviTAsjeuq8fn7Y7+CXEYf3sGR18WfLeM7GgSnptTOur1++SLTN7XogqiwP3LFFQ0GLoYe+hxVOEyEpw==",
+      "version": "0.54.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.54.0.tgz",
+      "integrity": "sha512-KQnEGwm65p1zFZGjKGw+oMilGcR4l1q3qgRmETO7ySEfMddH3t6jwlbqmcjO3N3bVcPkYgjioGVQGvdpvz7O1w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@opentelemetry/sql-common": "^0.41.0",
-        "@types/pg": "8.6.1",
+        "@types/pg": "8.15.1",
         "@types/pg-pool": "2.0.6"
       },
       "engines": {
@@ -4077,6 +4553,35 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-pg/node_modules/@opentelemetry/api-logs": {
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.202.0.tgz",
+      "integrity": "sha512-fTBjMqKCfotFWfLzaKyhjLvyEyq5vDKTTFfBmx21btv3gvy8Lq6N5Dh2OzqeuN4DjtpSvNT1uNVfg08eD2Rfxw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-pg/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.202.0.tgz",
+      "integrity": "sha512-Uz3BxZWPgDwgHM2+vCKEQRh0R8WKrd/q6Tus1vThRClhlPO39Dyz7mDrOr6KuqGXAlBQ1e5Tnymzri4RMZNaWA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.202.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-pino": {
       "version": "0.48.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pino/-/instrumentation-pino-0.48.0.tgz",
@@ -4297,9 +4802,9 @@
       }
     },
     "node_modules/@opentelemetry/propagation-utils": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/propagation-utils/-/propagation-utils-0.31.1.tgz",
-      "integrity": "sha512-YLNt7SWy4HZwI9d+4+OevQs2Gmof27TkjR3v029UGw8zFOcyONyIQhHHx7doyRbrLpWZtUc91cnCA4mKhArCXw==",
+      "version": "0.31.2",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/propagation-utils/-/propagation-utils-0.31.2.tgz",
+      "integrity": "sha512-FlJzdZ0cQY8qqOsJ/A+L/t05LvZtnsMq6vbamunVMYRi9TAy+xq37t+nT/dx3dKJ/2k409jDj9eA0Yhj9RtTug==",
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4348,9 +4853,9 @@
       }
     },
     "node_modules/@opentelemetry/resource-detector-alibaba-cloud": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-alibaba-cloud/-/resource-detector-alibaba-cloud-0.31.1.tgz",
-      "integrity": "sha512-RPitvB5oHZsECnK7xtUAFdyBXRdtJbY0eEzQPBrLMQv4l/FN4pETijqv6LcKBbn6tevaoBU2bqOGnVoL4uX4Tg==",
+      "version": "0.31.2",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-alibaba-cloud/-/resource-detector-alibaba-cloud-0.31.2.tgz",
+      "integrity": "sha512-Itp6duMXkAIQzmDHIf1kc6Llj/fa0BxilaELp0K6Fp9y+b0ex9LksNAQfTDFPHNine7tFoXauvvHbJFXIB6mqw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
@@ -4365,9 +4870,9 @@
       }
     },
     "node_modules/@opentelemetry/resource-detector-aws": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-aws/-/resource-detector-aws-2.1.0.tgz",
-      "integrity": "sha512-7QG5wQXMiHseKIyU69m8vfZgLhrxFx48DdyaQEYj6GXjE/Xrv1nS3bUwhICjb6+4NorB9+1pFCvJ/4S01CCCjQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-aws/-/resource-detector-aws-2.2.0.tgz",
+      "integrity": "sha512-6k7//RWAv4U1PeZhv0Too0Sv7sp7/A6s6g9h5ZYauPcroh2t4gOmkQSspSLYCynn34YZwn3FGbuaMwTDjHEJig==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
@@ -4399,9 +4904,9 @@
       }
     },
     "node_modules/@opentelemetry/resource-detector-container": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-container/-/resource-detector-container-0.7.1.tgz",
-      "integrity": "sha512-I2vXgdA8mhIlAktIp7NovicalqKPaas9APH5wQxIzMK6jPjZmwS5x0MBW+sTsaFM4pnOf/Md9enoDnnR5CLq5A==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-container/-/resource-detector-container-0.7.2.tgz",
+      "integrity": "sha512-St3Krrbpvq7k0UoUNlm7Z4Xqf9HdS9R5yPslwl/WPaZpj/Bf/54WZTPmNQat+93Ey6PTX0ISKg26DfcjPemUhg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
@@ -4553,9 +5058,9 @@
       }
     },
     "node_modules/@opentelemetry/semantic-conventions": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.32.0.tgz",
-      "integrity": "sha512-s0OpmpQFSfMrmedAn9Lhg4KWJELHCU6uU9dtIJ28N8UGhf9Y55im5X8fEzwhwDwiSqN+ZPSNrDJF7ivf/AuRPQ==",
+      "version": "1.34.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.34.0.tgz",
+      "integrity": "sha512-aKcOkyrorBGlajjRdVoJWHTxfxO1vCNHLJVlSDaRHDIdjU+pX8IYQPvPDkYiujKLbRnWU+1TBwEt0QRgSm4SGA==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=14"
@@ -4603,9 +5108,9 @@
       }
     },
     "node_modules/@pkgr/core": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.4.tgz",
-      "integrity": "sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw==",
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.7.tgz",
+      "integrity": "sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4966,9 +5471,9 @@
       }
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
-      "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.2.0.tgz",
+      "integrity": "sha512-qWJ2ZTbmumwiLFomfzTyt5Kng4hwPi9rwCYN4SHb6eaRU1KNO4ccxINHr/VhH4GgPlt1XfSTLX2LBTme8ne4Zw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4988,10 +5493,227 @@
         }
       }
     },
+    "node_modules/@rollup/pluginutils/node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz",
+      "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz",
+      "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz",
+      "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz",
+      "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz",
+      "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz",
+      "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz",
+      "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz",
+      "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz",
+      "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz",
+      "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz",
+      "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz",
+      "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz",
+      "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz",
+      "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz",
+      "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.0.tgz",
-      "integrity": "sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz",
+      "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==",
       "cpu": [
         "x64"
       ],
@@ -5003,9 +5725,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.0.tgz",
-      "integrity": "sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz",
+      "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==",
       "cpu": [
         "x64"
       ],
@@ -5016,6 +5738,48 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz",
+      "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz",
+      "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz",
+      "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@scarf/scarf": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.4.0.tgz",
@@ -5083,15 +5847,15 @@
       "license": "MIT"
     },
     "node_modules/@swc/core": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.11.29.tgz",
-      "integrity": "sha512-g4mThMIpWbNhV8G2rWp5a5/Igv8/2UFRJx2yImrLGMgrDDYZIopqZ/z0jZxDgqNA1QDx93rpwNF7jGsxVWcMlA==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.12.5.tgz",
+      "integrity": "sha512-KxA0PHHIuUBmQ/Oi+xFpVzILj2Oo37sTtftCbyowQlyx5YOknEOw1kLpas5hMcpznXgFyAWbpK71xQps4INPgA==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@swc/counter": "^0.1.3",
-        "@swc/types": "^0.1.21"
+        "@swc/types": "^0.1.23"
       },
       "engines": {
         "node": ">=10"
@@ -5101,16 +5865,16 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.11.29",
-        "@swc/core-darwin-x64": "1.11.29",
-        "@swc/core-linux-arm-gnueabihf": "1.11.29",
-        "@swc/core-linux-arm64-gnu": "1.11.29",
-        "@swc/core-linux-arm64-musl": "1.11.29",
-        "@swc/core-linux-x64-gnu": "1.11.29",
-        "@swc/core-linux-x64-musl": "1.11.29",
-        "@swc/core-win32-arm64-msvc": "1.11.29",
-        "@swc/core-win32-ia32-msvc": "1.11.29",
-        "@swc/core-win32-x64-msvc": "1.11.29"
+        "@swc/core-darwin-arm64": "1.12.5",
+        "@swc/core-darwin-x64": "1.12.5",
+        "@swc/core-linux-arm-gnueabihf": "1.12.5",
+        "@swc/core-linux-arm64-gnu": "1.12.5",
+        "@swc/core-linux-arm64-musl": "1.12.5",
+        "@swc/core-linux-x64-gnu": "1.12.5",
+        "@swc/core-linux-x64-musl": "1.12.5",
+        "@swc/core-win32-arm64-msvc": "1.12.5",
+        "@swc/core-win32-ia32-msvc": "1.12.5",
+        "@swc/core-win32-x64-msvc": "1.12.5"
       },
       "peerDependencies": {
         "@swc/helpers": ">=0.5.17"
@@ -5122,9 +5886,9 @@
       }
     },
     "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.11.29.tgz",
-      "integrity": "sha512-whsCX7URzbuS5aET58c75Dloby3Gtj/ITk2vc4WW6pSDQKSPDuONsIcZ7B2ng8oz0K6ttbi4p3H/PNPQLJ4maQ==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.12.5.tgz",
+      "integrity": "sha512-3WF+naP/qkt5flrTfJr+p07b522JcixKvIivM7FgvllA6LjJxf+pheoILrTS8IwrNAK/XtHfKWYcGY+3eaA4mA==",
       "cpu": [
         "arm64"
       ],
@@ -5139,9 +5903,9 @@
       }
     },
     "node_modules/@swc/core-darwin-x64": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.11.29.tgz",
-      "integrity": "sha512-S3eTo/KYFk+76cWJRgX30hylN5XkSmjYtCBnM4jPLYn7L6zWYEPajsFLmruQEiTEDUg0gBEWLMNyUeghtswouw==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.12.5.tgz",
+      "integrity": "sha512-GCcD3dft8YN7unTBcW02Fx41jXp2MNQHCjx5ceWSEYOGvn7vBSUp7k7LkfTxGN5Ftxb9a1mxhPq8r4rD2u/aPw==",
       "cpu": [
         "x64"
       ],
@@ -5156,9 +5920,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.11.29.tgz",
-      "integrity": "sha512-o9gdshbzkUMG6azldHdmKklcfrcMx+a23d/2qHQHPDLUPAN+Trd+sDQUYArK5Fcm7TlpG4sczz95ghN0DMkM7g==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.12.5.tgz",
+      "integrity": "sha512-jWlzP/Y4+wbE/EJM+WGIDQsklLFV3g5LmbYTBgrY4+5nb517P31mkBzf5y2knfNWPrL7HzNu0578j3Zi2E6Iig==",
       "cpu": [
         "arm"
       ],
@@ -5173,9 +5937,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.11.29.tgz",
-      "integrity": "sha512-sLoaciOgUKQF1KX9T6hPGzvhOQaJn+3DHy4LOHeXhQqvBgr+7QcZ+hl4uixPKTzxk6hy6Hb0QOvQEdBAAR1gXw==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.12.5.tgz",
+      "integrity": "sha512-GkzgIUz+2r6J6Tn3hb7/4ByaWHRrRZt4vuN9BLAd+y65m2Bt0vlEpPtWhrB/TVe4hEkFR+W5PDETLEbUT4i0tQ==",
       "cpu": [
         "arm64"
       ],
@@ -5190,9 +5954,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.11.29.tgz",
-      "integrity": "sha512-PwjB10BC0N+Ce7RU/L23eYch6lXFHz7r3NFavIcwDNa/AAqywfxyxh13OeRy+P0cg7NDpWEETWspXeI4Ek8otw==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.12.5.tgz",
+      "integrity": "sha512-g0AJ7QmZPj3Uw+C5pDa48LAUG7JBgQmB0mN5cW+s2mjaFKT0mTSxYALtx/MDZwJExDPo0yJV8kSbFO1tvFPyhg==",
       "cpu": [
         "arm64"
       ],
@@ -5207,9 +5971,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.11.29.tgz",
-      "integrity": "sha512-i62vBVoPaVe9A3mc6gJG07n0/e7FVeAvdD9uzZTtGLiuIfVfIBta8EMquzvf+POLycSk79Z6lRhGPZPJPYiQaA==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.12.5.tgz",
+      "integrity": "sha512-PeYoSziNy+iNiBHPtAsO84bzBne/mbCsG5ijYkAhS1GVsDgohClorUvRXXhcUZoX2gr8TfSI9WLHo30K+DKiHg==",
       "cpu": [
         "x64"
       ],
@@ -5224,9 +5988,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.11.29.tgz",
-      "integrity": "sha512-YER0XU1xqFdK0hKkfSVX1YIyCvMDI7K07GIpefPvcfyNGs38AXKhb2byySDjbVxkdl4dycaxxhRyhQ2gKSlsFQ==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.12.5.tgz",
+      "integrity": "sha512-EJrfCCIyuV5LLmYgKtIMwtgsnjVesdFe0IgQzEKs9OfB6cL6g7WO9conn8BkGX8jphVa7jChKxShDGkreWWDzA==",
       "cpu": [
         "x64"
       ],
@@ -5241,9 +6005,9 @@
       }
     },
     "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.11.29.tgz",
-      "integrity": "sha512-po+WHw+k9g6FAg5IJ+sMwtA/fIUL3zPQ4m/uJgONBATCVnDDkyW6dBA49uHNVtSEvjvhuD8DVWdFP847YTcITw==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.12.5.tgz",
+      "integrity": "sha512-FnwT7fxkJJMgsfiDoZKEVGyCzrPFbzpflFAAoTCUCu3MaHw6mW55o/MAAfofvJ1iIcEpec4o93OilsmKtpyO5Q==",
       "cpu": [
         "arm64"
       ],
@@ -5258,9 +6022,9 @@
       }
     },
     "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.11.29.tgz",
-      "integrity": "sha512-h+NjOrbqdRBYr5ItmStmQt6x3tnhqgwbj9YxdGPepbTDamFv7vFnhZR0YfB3jz3UKJ8H3uGJ65Zw1VsC+xpFkg==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.12.5.tgz",
+      "integrity": "sha512-jW6l4KFt9mIXSpGseE6BQOEFmbIeXeShDuWgldEJXKeXf/uPs8wrqv80XBIUwVpK0ZbmJwPQ0waGVj8UM3th2Q==",
       "cpu": [
         "ia32"
       ],
@@ -5275,9 +6039,9 @@
       }
     },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.11.29",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.11.29.tgz",
-      "integrity": "sha512-Q8cs2BDV9wqDvqobkXOYdC+pLUSEpX/KvI0Dgfun1F+LzuLotRFuDhrvkU9ETJA6OnD2+Fn/ieHgloiKA/Mn/g==",
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.12.5.tgz",
+      "integrity": "sha512-AZszwuEjlz1tSNLQRm3T5OZJ5eebxjJlDQnnzXJmg0B7DJMRoaAe1HTLOmejxjFK6yWr7fh+pSeCw2PgQLxgqA==",
       "cpu": [
         "x64"
       ],
@@ -5310,9 +6074,9 @@
       }
     },
     "node_modules/@swc/types": {
-      "version": "0.1.21",
-      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.21.tgz",
-      "integrity": "sha512-2YEtj5HJVbKivud9N4bpPBAyZhj4S2Ipe5LkUG94alTpr7in/GU/EARgPAd3BwU+YOmFVJC2+kjqhGRi3r0ZpQ==",
+      "version": "0.1.23",
+      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.23.tgz",
+      "integrity": "sha512-u1iIVZV9Q0jxY+yM2vw/hZGDNudsN85bBpTqzAQ9rzkxW9D+e3aEM4Han+ow518gSewkXgjmEK0BD79ZcNVgPw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -5320,23 +6084,23 @@
       }
     },
     "node_modules/@testcontainers/postgresql": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/@testcontainers/postgresql/-/postgresql-11.0.2.tgz",
-      "integrity": "sha512-Z7ZrFRAien1W1NlYxCK3PP0zUk468UHwtJubJRmktDPHTE6DLITmn+U565I7roMk66NjN3eWhly1zoUM48PtmA==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/@testcontainers/postgresql/-/postgresql-11.0.3.tgz",
+      "integrity": "sha512-nMq0lBLguZecp9JDV4J8nlPWwxOQ4XiXUIGkV5Lvj1CMdVqbqQJe4eVrNHVC3rIM/w8nadNp5ecEoxnwkhG33w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "testcontainers": "^11.0.2"
+        "testcontainers": "^11.0.3"
       }
     },
     "node_modules/@testcontainers/redis": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/@testcontainers/redis/-/redis-11.0.2.tgz",
-      "integrity": "sha512-hLaTvjv74HtAWZFz2U/GJc5cYCIyB37TR3yCBjtBZ+dp3wZ0gc1PtsKs6qMw4fOfUVPzFm1f1pj32DF55F1+KQ==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/@testcontainers/redis/-/redis-11.0.3.tgz",
+      "integrity": "sha512-0TTXdnzvH55nMc7wj5s+3e/h29M5EEZ7cQAoCR16ZzQgzcLlXFTCIzSi02EkSZYrxayaToXrBdWCc6skisFzZw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "testcontainers": "^11.0.2"
+        "testcontainers": "^11.0.3"
       }
     },
     "node_modules/@tokenizer/inflate": {
@@ -5440,9 +6204,9 @@
       }
     },
     "node_modules/@types/body-parser": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
-      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
+      "version": "1.19.6",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
+      "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5459,10 +6223,20 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/chai": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.2.tgz",
+      "integrity": "sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/deep-eql": "*"
+      }
+    },
     "node_modules/@types/compression": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@types/compression/-/compression-1.8.0.tgz",
-      "integrity": "sha512-g4vmPIwbTii9dX1HVioHbOolubEaf4re4vDxuzpKrzz9uI7uarBExi9begX0cXyIB85jXZ5X2A/v8rsHZxSAPw==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@types/compression/-/compression-1.8.1.tgz",
+      "integrity": "sha512-kCFuWS0ebDbmxs0AXYn6e2r2nrGAb5KwQhknjSPSPgJcGd8+HVSILlUyFhGqML2gk39HcG7D1ydW9/qpYkN00Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5480,9 +6254,9 @@
       }
     },
     "node_modules/@types/cookie-parser": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.8.tgz",
-      "integrity": "sha512-l37JqFrOJ9yQfRQkljb41l0xVphc7kg5JTjjr+pLRZ0IyZ49V4BQ8vbF4Ut2C2e+WH4al3xD3ZwYwIUfnbT4NQ==",
+      "version": "1.4.9",
+      "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.9.tgz",
+      "integrity": "sha512-tGZiZ2Gtc4m3wIdLkZ8mkj1T6CEHb35+VApbL2T14Dew8HA7c+04dmKqsKRNC+8RJPm16JEK0tFSwdZqubfc4g==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -5497,14 +6271,21 @@
       "license": "MIT"
     },
     "node_modules/@types/cors": {
-      "version": "2.8.17",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
-      "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
+      "version": "2.8.19",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz",
+      "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
+    "node_modules/@types/deep-eql": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
+      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/docker-modem": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/docker-modem/-/docker-modem-3.0.6.tgz",
@@ -5517,9 +6298,9 @@
       }
     },
     "node_modules/@types/dockerode": {
-      "version": "3.3.40",
-      "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.40.tgz",
-      "integrity": "sha512-O1ckSFYbcYv/KcnAHMLCnKQYY8/5+6CRzpsOPcQIePHRX2jG4Gmz8uXPMCXIxTGN9OYkE5eox/L67l2sGY1UYg==",
+      "version": "3.3.41",
+      "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.41.tgz",
+      "integrity": "sha512-5kOi6bcnEjqfJ68ZNV/bBvSMLNIucc0XbRmBO4hg5OoFCoP99eSRcbMysjkzV7ZxQEmmc/zMnv4A7odwuKFzDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5551,16 +6332,16 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/express": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.2.tgz",
-      "integrity": "sha512-BtjL3ZwbCQriyb0DGw+Rt12qAXPiBTPs815lsUvtt1Grk0vLRMZNMUZ741d5rjk+UQOxfDiBZ3dxpX00vSkK3g==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.3.tgz",
+      "integrity": "sha512-wGA0NX93b19/dZC1J18tKWVIYWyyF2ZjT9vin/NRu0qzzvfVzWjs04iq2rQ3H65vCTQYlRqs3YHfY7zjdV+9Kw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5599,16 +6380,16 @@
       "license": "MIT"
     },
     "node_modules/@types/http-errors": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
-      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
+      "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/inquirer": {
-      "version": "8.2.10",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.10.tgz",
-      "integrity": "sha512-IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA==",
+      "version": "8.2.11",
+      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.11.tgz",
+      "integrity": "sha512-15UboTvxb9SOaPG7CcXZ9dkv8lNqfiAwuh/5WxJDLjmElBt9tbx1/FDsEnJddUBKvN4mlPKvr8FyO1rAmBanzg==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -5631,16 +6412,16 @@
       "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.17",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.17.tgz",
-      "integrity": "sha512-RRVJ+J3J+WmyOTqnz3PiBLA501eKwXl2noseKOrNo/6+XEHjTAxO4xHvxQB6QuNm+s4WRbn6rSiap8+EA+ykFQ==",
+      "version": "4.17.18",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.18.tgz",
+      "integrity": "sha512-KJ65INaxqxmU6EoCiJmRPZC9H9RVWCRd349tXM2M3O5NA7cY6YL7c0bHAHQ93NOfTObEQ004kd2QVHs/r0+m4g==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/luxon": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz",
-      "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.2.tgz",
+      "integrity": "sha512-R/BdP7OxEMc44l2Ex5lSXHoIXTB2JLNa3y2QISIbr58U/YcsffyQrYW//hZSdrfxrjRZj3GcUoxMPGdO8gSYuw==",
       "license": "MIT"
     },
     "node_modules/@types/memcached": {
@@ -5677,9 +6458,9 @@
       }
     },
     "node_modules/@types/multer": {
-      "version": "1.4.12",
-      "resolved": "https://registry.npmjs.org/@types/multer/-/multer-1.4.12.tgz",
-      "integrity": "sha512-pQ2hoqvXiJt2FP9WQVLPRO+AmiIm/ZYkavPlIQnx282u4ZrVdztx0pkh3jjpQt0Kz+YI0YhSG264y08UJKoUQg==",
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/@types/multer/-/multer-1.4.13.tgz",
+      "integrity": "sha512-bhhdtPw7JqCiEfC9Jimx5LqX9BDIPJEh2q/fQ4bqbBPtyEZYr3cvF22NwG0DmPZNYA0CAf2CnqDB4KIGGpJcaw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5734,14 +6515,14 @@
       }
     },
     "node_modules/@types/pg": {
-      "version": "8.6.1",
-      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.6.1.tgz",
-      "integrity": "sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==",
+      "version": "8.15.1",
+      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.15.1.tgz",
+      "integrity": "sha512-YKHrkGWBX5+ivzvOQ66I0fdqsQTsvxqM0AGP2i0XrVZ9DP5VA/deEbTf7VuLPGpY7fJB9uGbkZ6KjVhuHcrTkQ==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "pg-protocol": "*",
-        "pg-types": "^2.2.0"
+        "pg-types": "^4.0.1"
       }
     },
     "node_modules/@types/pg-pool": {
@@ -5771,9 +6552,9 @@
       }
     },
     "node_modules/@types/qs": {
-      "version": "6.9.18",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
-      "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -5785,9 +6566,9 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "19.1.5",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.5.tgz",
-      "integrity": "sha512-piErsCVVbpMMT2r7wbawdZsq4xMvIAhQuac2gedQHysu1TZYEigE6pnFfgZT+/jQnrRuF5r+SHzuehFjfRjr4g==",
+      "version": "19.1.8",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.8.tgz",
+      "integrity": "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5822,9 +6603,9 @@
       "license": "MIT"
     },
     "node_modules/@types/send": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
-      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+      "version": "0.17.5",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
+      "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5833,9 +6614,9 @@
       }
     },
     "node_modules/@types/serve-static": {
-      "version": "1.15.7",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
-      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
+      "version": "1.15.8",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz",
+      "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5871,9 +6652,9 @@
       }
     },
     "node_modules/@types/ssh2/node_modules/@types/node": {
-      "version": "18.19.86",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.86.tgz",
-      "integrity": "sha512-fifKayi175wLyKyc5qUfyENhQ1dCNI1UNjp653d8kuYcPQN5JhX3dGuP/XmvPTg/xRBn1VTLpbmi+H/Mr7tLfQ==",
+      "version": "18.19.112",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.112.tgz",
+      "integrity": "sha512-i+Vukt9POdS/MBI7YrrkkI5fMfwFtOjphSmt4WXYLfwqsfr6z/HdCx7LqT9M7JktGob8WNgj8nFB4TbGNE4Cog==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5938,23 +6719,23 @@
       "license": "MIT"
     },
     "node_modules/@types/validator": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.15.0.tgz",
-      "integrity": "sha512-nh7nrWhLr6CBq9ldtw0wx+z9wKnnv/uTVLA9g/3/TcOYxbpOSZE+MhKPmWqU+K0NvThjhv12uD8MuqijB0WzEA==",
+      "version": "13.15.2",
+      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.15.2.tgz",
+      "integrity": "sha512-y7pa/oEJJ4iGYBxOpfAKn5b9+xuihvzDVnC/OSvlVnGxVg0pOqmjiMafiJ1KVNQEaPZf9HsEp5icEwGg8uIe5Q==",
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
-      "integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
+      "version": "8.34.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.34.1.tgz",
+      "integrity": "sha512-STXcN6ebF6li4PxwNeFnqF8/2BNDvBupf2OPx2yWNzr6mKNGF7q49VM00Pz5FaomJyqvbXpY6PhO+T9w139YEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/type-utils": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.34.1",
+        "@typescript-eslint/type-utils": "8.34.1",
+        "@typescript-eslint/utils": "8.34.1",
+        "@typescript-eslint/visitor-keys": "8.34.1",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -5968,15 +6749,15 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "@typescript-eslint/parser": "^8.34.1",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
-      "integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5984,16 +6765,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
-      "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
+      "version": "8.34.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.34.1.tgz",
+      "integrity": "sha512-4O3idHxhyzjClSMJ0a29AcoK0+YwnEqzI6oz3vlRf3xw0zbzt15MzXwItOlnr5nIth6zlY2RENLsOPvhyrKAQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.34.1",
+        "@typescript-eslint/types": "8.34.1",
+        "@typescript-eslint/typescript-estree": "8.34.1",
+        "@typescript-eslint/visitor-keys": "8.34.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6008,15 +6789,37 @@
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
-      "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.34.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.34.1.tgz",
+      "integrity": "sha512-nuHlOmFZfuRwLJKDGQOVc0xnQrAmuq1Mj/ISou5044y1ajGNp2BNliIqp7F2LPQ5sForz8lempMFCovfeS1XoA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1"
+        "@typescript-eslint/tsconfig-utils": "^8.34.1",
+        "@typescript-eslint/types": "^8.34.1",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.34.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.34.1.tgz",
+      "integrity": "sha512-beu6o6QY4hJAgL1E8RaXNC071G4Kso2MGmJskCFQhRhg8VOH/FDbC8soP8NHN7e/Hdphwp8G8cE6OBzC8o41ZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.34.1",
+        "@typescript-eslint/visitor-keys": "8.34.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6026,15 +6829,32 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.34.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.34.1.tgz",
+      "integrity": "sha512-K4Sjdo4/xF9NEeA2khOb7Y5nY6NSXBnod87uniVYW9kHP+hNlDV8trUSFeynA2uxWam4gIWgWoygPrv9VMWrYg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
-      "integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
+      "version": "8.34.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.34.1.tgz",
+      "integrity": "sha512-Tv7tCCr6e5m8hP4+xFugcrwTOucB8lshffJ6zf1mF1TbU67R+ntCc6DzLNKM+s/uzDyv8gLq7tufaAhIBYeV8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
+        "@typescript-eslint/typescript-estree": "8.34.1",
+        "@typescript-eslint/utils": "8.34.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -6051,9 +6871,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
-      "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
+      "version": "8.34.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.34.1.tgz",
+      "integrity": "sha512-rjLVbmE7HR18kDsjNIZQHxmv9RZwlgzavryL5Lnj2ujIRTeXlKtILHgRNmQ3j4daw7zd+mQgy+uyt6Zo6I0IGA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6065,14 +6885,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
-      "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
+      "version": "8.34.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.34.1.tgz",
+      "integrity": "sha512-rjCNqqYPuMUF5ODD+hWBNmOitjBWghkGKJg6hiCHzUvXRy6rK22Jd3rwbP2Xi+R7oYVvIKhokHVhH41BxPV5mA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/project-service": "8.34.1",
+        "@typescript-eslint/tsconfig-utils": "8.34.1",
+        "@typescript-eslint/types": "8.34.1",
+        "@typescript-eslint/visitor-keys": "8.34.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -6092,9 +6914,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6118,16 +6940,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
-      "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
+      "version": "8.34.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.34.1.tgz",
+      "integrity": "sha512-mqOwUdZ3KjtGk7xJJnLbHxTuWVn3GO2WZZuM+Slhkun4+qthLdXx32C8xIXbO1kfCECb3jIs3eoxK3eryk7aoQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1"
+        "@typescript-eslint/scope-manager": "8.34.1",
+        "@typescript-eslint/types": "8.34.1",
+        "@typescript-eslint/typescript-estree": "8.34.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6142,14 +6964,14 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
-      "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
+      "version": "8.34.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.34.1.tgz",
+      "integrity": "sha512-xoh5rJ+tgsRKoXnkBPFRLZ7rjKM0AfVbC68UZ/ECXoDbfggb9RbEySN359acY1vS3qZ0jVTVWzbtfapwm5ztxw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "eslint-visitor-keys": "^4.2.0"
+        "@typescript-eslint/types": "8.34.1",
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6160,15 +6982,16 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.1.4.tgz",
-      "integrity": "sha512-G4p6OtioySL+hPV7Y6JHlhpsODbJzt1ndwHAFkyk6vVjpK03PFsKnauZIzcd0PrK4zAbc5lc+jeZ+eNGiMA+iw==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.2.4.tgz",
+      "integrity": "sha512-EyF9SXU6kS5Ku/U82E259WSnvg6c8KTjppUncuNdm5QHpe17mwREHnjDzozC8x9MZ0xfBUFSaLkRv4TMA75ALQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
         "@bcoe/v8-coverage": "^1.0.2",
-        "debug": "^4.4.0",
+        "ast-v8-to-istanbul": "^0.3.3",
+        "debug": "^4.4.1",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
         "istanbul-lib-source-maps": "^5.0.6",
@@ -6183,8 +7006,8 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "3.1.4",
-        "vitest": "3.1.4"
+        "@vitest/browser": "3.2.4",
+        "vitest": "3.2.4"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -6193,14 +7016,15 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz",
-      "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
+      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.1.4",
-        "@vitest/utils": "3.1.4",
+        "@types/chai": "^5.2.2",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
         "chai": "^5.2.0",
         "tinyrainbow": "^2.0.0"
       },
@@ -6209,13 +7033,13 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz",
-      "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
+      "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.1.4",
+        "@vitest/spy": "3.2.4",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.17"
       },
@@ -6224,7 +7048,7 @@
       },
       "peerDependencies": {
         "msw": "^2.4.9",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "peerDependenciesMeta": {
         "msw": {
@@ -6235,20 +7059,10 @@
         }
       }
     },
-    "node_modules/@vitest/mocker/node_modules/estree-walker": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
-      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0"
-      }
-    },
     "node_modules/@vitest/pretty-format": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz",
-      "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
+      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6259,27 +7073,28 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz",
-      "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz",
+      "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "3.1.4",
-        "pathe": "^2.0.3"
+        "@vitest/utils": "3.2.4",
+        "pathe": "^2.0.3",
+        "strip-literal": "^3.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz",
-      "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz",
+      "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
+        "@vitest/pretty-format": "3.2.4",
         "magic-string": "^0.30.17",
         "pathe": "^2.0.3"
       },
@@ -6288,27 +7103,27 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz",
-      "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
+      "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tinyspy": "^3.0.2"
+        "tinyspy": "^4.0.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz",
-      "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
+      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
-        "loupe": "^3.1.3",
+        "@vitest/pretty-format": "3.2.4",
+        "loupe": "^3.1.4",
         "tinyrainbow": "^2.0.0"
       },
       "funding": {
@@ -6498,11 +7313,14 @@
       "license": "BSD-2-Clause"
     },
     "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz",
+      "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==",
       "dev": true,
-      "license": "ISC"
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
     },
     "node_modules/abort-controller": {
       "version": "3.0.0",
@@ -6529,10 +7347,19 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/accepts/node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -6561,16 +7388,12 @@
       }
     },
     "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
       "license": "MIT",
-      "dependencies": {
-        "debug": "4"
-      },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 14"
       }
     },
     "node_modules/ajv": {
@@ -6794,9 +7617,9 @@
       }
     },
     "node_modules/archiver-utils/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -6837,12 +7660,6 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/archiver-utils/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "license": "ISC"
-    },
     "node_modules/archiver-utils/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -6957,6 +7774,18 @@
         "node": ">=12"
       }
     },
+    "node_modules/ast-v8-to-istanbul": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.3.tgz",
+      "integrity": "sha512-MuXMrSLVVoA6sYN/6Hke18vMzrT4TZNbZIj/hvh0fnYFpO+/kFXcLIaiPwXXWaQUPg4yJD8fj+lfJ7/1EBconw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "estree-walker": "^3.0.3",
+        "js-tokens": "^9.0.1"
+      }
+    },
     "node_modules/async": {
       "version": "3.2.6",
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
@@ -7005,9 +7834,9 @@
       "optional": true
     },
     "node_modules/bare-fs": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.2.tgz",
-      "integrity": "sha512-8wSeOia5B7LwD4+h465y73KOdj5QHsbbuoUfPBi+pXgFJIPuG7SsiOdJuijWMyfid49eD+WivpfY7KT8gbAzBA==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.5.tgz",
+      "integrity": "sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==",
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
@@ -7136,9 +7965,9 @@
       }
     },
     "node_modules/bignumber.js": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.2.1.tgz",
-      "integrity": "sha512-+NzaKgOUvInq9TIUZ1+DRspzf/HApkCwD4btfuasFTdrfnOxqx853TgDpMolp+uv4RpRp7bPcEU2zKr9+fRmyw==",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.0.tgz",
+      "integrity": "sha512-EM7aMFTXbptt/wZdMlBv2t8IViwQL+h6SLHosp8Yf0dqJMTnY6iL32opnAB6kAdL0SZPuvcAzFr31o0c/R3/RA==",
       "license": "MIT",
       "engines": {
         "node": "*"
@@ -7202,9 +8031,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7225,9 +8054,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+      "version": "4.25.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
+      "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
       "dev": true,
       "funding": [
         {
@@ -7245,10 +8074,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001688",
-        "electron-to-chromium": "^1.5.73",
+        "caniuse-lite": "^1.0.30001718",
+        "electron-to-chromium": "^1.5.160",
         "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.1"
+        "update-browserslist-db": "^1.1.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -7320,9 +8149,9 @@
       }
     },
     "node_modules/bullmq": {
-      "version": "5.53.0",
-      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.53.0.tgz",
-      "integrity": "sha512-AbzcwR+9GdgrenolOC9kApF+TkUKZpUCMiFbXgRYw9ivWhOfLCqKeajIptM7NdwhY7cpXgv+QpbweUuQZUxkyA==",
+      "version": "5.56.0",
+      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.56.0.tgz",
+      "integrity": "sha512-j5ct2tdc9M8PKcjhJw+euO24BsO1wXBAkNGXYI1R1qvh7FvRldZ5wtLixLWqQ4/crafj0Vrwi+y1kXFXMwBJFA==",
       "license": "MIT",
       "dependencies": {
         "cron-parser": "^4.9.0",
@@ -7399,38 +8228,15 @@
       }
     },
     "node_modules/cacache/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/cacache/node_modules/chownr": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
-      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/cacache/node_modules/fs-minipass": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/cacache/node_modules/glob": {
       "version": "10.4.5",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
@@ -7468,13 +8274,6 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/cacache/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/cacache/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -7491,35 +8290,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/cacache/node_modules/minizlib": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
-      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^7.1.2"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/cacache/node_modules/mkdirp": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mkdirp": "dist/cjs/src/bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/cacache/node_modules/path-scurry": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
@@ -7537,34 +8307,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/cacache/node_modules/tar": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
-      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@isaacs/fs-minipass": "^4.0.0",
-        "chownr": "^3.0.0",
-        "minipass": "^7.1.2",
-        "minizlib": "^3.0.1",
-        "mkdirp": "^3.0.1",
-        "yallist": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/cacache/node_modules/yallist": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
-      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/call-bind": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
@@ -7633,9 +8375,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001713",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz",
-      "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
+      "version": "1.0.30001724",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001724.tgz",
+      "integrity": "sha512-WqJo7p0TbHDOythNTqYujmaJTvtYRZrjpP8TCvH6Vb9CYJerJNKamKzIWOM4BkQatWj9H2lYulpdAQNBe7QhNA==",
       "funding": [
         {
           "type": "opencollective",
@@ -7726,13 +8468,13 @@
       }
     },
     "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/chrome-trace-event": {
@@ -8093,15 +8835,6 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
-    "node_modules/compression/node_modules/negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -8220,13 +8953,13 @@
       "license": "MIT"
     },
     "node_modules/core-js-compat": {
-      "version": "3.41.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.41.0.tgz",
-      "integrity": "sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==",
+      "version": "3.43.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.43.0.tgz",
+      "integrity": "sha512-2GML2ZsCc5LR7hZYz4AXmjQw8zuy2T//2QntwdnpuYI7jteT6GVYJL7F6C2C57R7gSYrcqVW3lAALefdbhBLDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.4"
+        "browserslist": "^4.25.0"
       },
       "funding": {
         "type": "opencollective",
@@ -8340,6 +9073,12 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/cron/node_modules/@types/luxon": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz",
+      "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==",
+      "license": "MIT"
+    },
     "node_modules/cron/node_modules/luxon": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
@@ -8377,13 +9116,13 @@
       }
     },
     "node_modules/cssstyle": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.1.tgz",
-      "integrity": "sha512-ZgW+Jgdd7i52AaLYCriF8Mxqft0gD/R9i9wi6RWBhs1pqdPEzPjym7rvRKi397WmQFf3SlyUsszhw+VVCbx79Q==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.5.0.tgz",
+      "integrity": "sha512-/7gw8TGrvH/0g564EnhgFZogTMVe+lifpB7LWU+PEsiq5o83TUXR3fDbzTRXOJhoJwck5IS9ez3Em5LNMMO2aw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@asamuzakjp/css-color": "^3.1.2",
+        "@asamuzakjp/css-color": "^3.2.0",
         "rrweb-cssom": "^0.8.0"
       },
       "engines": {
@@ -8411,43 +9150,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/data-urls/node_modules/tr46": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
-      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "punycode": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/data-urls/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
-      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "^5.1.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/dayjs": {
       "version": "1.11.13",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
@@ -8455,9 +9157,9 @@
       "license": "MIT"
     },
     "node_modules/debounce": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/debounce/-/debounce-2.0.0.tgz",
-      "integrity": "sha512-xRetU6gL1VJbs85Mc4FoEGSjQxzpdxRyFhe3lmWFyy2EzydIcD4xzUvRJMD+NPDfMwKNhxa3PvsIOU32luIWeA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-2.2.0.tgz",
+      "integrity": "sha512-Xks6RUDLZFdz8LIdR6q0MTH44k7FikOmnh5xkSjMig6ch45afc8sjTjRQf3P6ax8dMgcQrYO/AR2RGWURrruqw==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -8747,9 +9449,9 @@
       }
     },
     "node_modules/dockerode/node_modules/tar-fs": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz",
-      "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
+      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8884,9 +9586,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.137.tgz",
-      "integrity": "sha512-/QSJaU2JyIuTbbABAo/crOs+SuAZLS+fVVS10PVrIT9hrRkmZl8Hb0xPSkKRUUWHQtYzXHpQUW3Dy5hwMzGZkA==",
+      "version": "1.5.171",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.171.tgz",
+      "integrity": "sha512-scWpzXEJEMrGJa4Y6m/tVotb0WuvNmasv3wWVzUAeCgKU0ToFOhUW6Z+xWnRQANMYGxN4ngJXIThgBJOqzVPCQ==",
       "dev": true,
       "license": "ISC"
     },
@@ -8916,9 +9618,9 @@
       }
     },
     "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9023,6 +9725,27 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/engine.io/node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/enhanced-resolve": {
       "version": "5.18.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
@@ -9195,19 +9918,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
-      "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
+      "version": "9.29.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
+      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.0",
+        "@eslint/config-array": "^0.20.1",
         "@eslint/config-helpers": "^0.2.1",
         "@eslint/core": "^0.14.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.27.0",
+        "@eslint/js": "9.29.0",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -9219,9 +9942,9 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -9272,14 +9995,14 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.0.tgz",
-      "integrity": "sha512-BvQOvUhkVQM1i63iMETK9Hjud9QhqBnbtT1Zc642p9ynzBuCe5pybkOnvqZIBypXmMlsGcnU4HZ8sCTPfpAexA==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.0.tgz",
+      "integrity": "sha512-8qsOYwkkGrahrgoUv76NZi23koqXOGiiEzXMrT8Q7VcYaUISR+5MorIUxfWqYXN0fN/31WbSrxCxFkVQ43wwrA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0",
-        "synckit": "^0.11.0"
+        "synckit": "^0.11.7"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -9365,9 +10088,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -9382,9 +10105,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -9408,15 +10131,15 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9476,11 +10199,14 @@
       }
     },
     "node_modules/estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
     },
     "node_modules/esutils": {
       "version": "2.0.3",
@@ -9542,6 +10268,16 @@
         "exiftool-vendored.pl": "13.0.1"
       }
     },
+    "node_modules/exiftool-vendored.exe": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/exiftool-vendored.exe/-/exiftool-vendored.exe-13.0.0.tgz",
+      "integrity": "sha512-4zAMuFGgxZkOoyQIzZMHv1HlvgyJK3AkNqjAgm8A8V0UmOZO7yv3pH49cDV1OduzFJqgs6yQ6eG4OGydhKtxlg==",
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/exiftool-vendored.pl": {
       "version": "13.0.1",
       "resolved": "https://registry.npmjs.org/exiftool-vendored.pl/-/exiftool-vendored.pl-13.0.1.tgz",
@@ -9744,9 +10480,9 @@
       }
     },
     "node_modules/fdir": {
-      "version": "6.4.4",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
-      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -9811,18 +10547,18 @@
       }
     },
     "node_modules/file-type": {
-      "version": "20.5.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-20.5.0.tgz",
-      "integrity": "sha512-BfHZtG/l9iMm4Ecianu7P8HRD2tBHLtjXinm4X62XBOYzi7CYA7jyqfJzOvXHqzVrVPYqBo2/GvbARMaaJkKVg==",
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-21.0.0.tgz",
+      "integrity": "sha512-ek5xNX2YBYlXhiUXui3D/BXa3LdqPmoLJ7rqEx2bKJ7EAUEfmXgW0Das7Dc6Nr9MvqaOnIqiPV0mZk/r/UpNAg==",
       "license": "MIT",
       "dependencies": {
-        "@tokenizer/inflate": "^0.2.6",
-        "strtok3": "^10.2.0",
+        "@tokenizer/inflate": "^0.2.7",
+        "strtok3": "^10.2.2",
         "token-types": "^6.0.0",
         "uint8array-extras": "^1.4.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/file-type?sponsor=1"
@@ -9922,6 +10658,7 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.3.tgz",
       "integrity": "sha512-Be3narBNt2s6bsaqP6Jzq91heDgOEaDCJAXcE3qcma/EJBSy5FB4cvO31XBInuAuKBx8Kptf8dkhjK0IOru39Q==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
       "license": "MIT",
       "dependencies": {
         "async": "^0.2.9",
@@ -10023,14 +10760,15 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
+      "integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -10123,29 +10861,16 @@
       }
     },
     "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
+      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "minipass": "^3.0.0"
+        "minipass": "^7.0.3"
       },
       "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/fs-monkey": {
@@ -10162,6 +10887,20 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -10239,28 +10978,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/gaxios/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/gaxios/node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/gcp-metadata": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz",
@@ -10422,22 +11139,13 @@
       "dev": true,
       "license": "BSD-2-Clause"
     },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/glob/node_modules/minimatch": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
-      "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
+      "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
         "node": "20 || >=22"
@@ -10447,9 +11155,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.1.0.tgz",
-      "integrity": "sha512-aibexHNbb/jiUSObBgpHLj+sIuUmJnYcgXBlrfsiDZ9rt4aF2TFRbyLgZ2iFQuVZ1K5Mx3FVkbKRSgKrbK3K2g==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
+      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10664,9 +11372,9 @@
       }
     },
     "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
       "dev": true,
       "license": "BSD-2-Clause"
     },
@@ -10686,6 +11394,15 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/http-proxy-agent": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
@@ -10700,28 +11417,17 @@
         "node": ">= 14"
       }
     },
-    "node_modules/http-proxy-agent/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "license": "MIT",
       "dependencies": {
-        "agent-base": "6",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/i18n-iso-countries": {
@@ -10795,9 +11501,9 @@
       }
     },
     "node_modules/import-in-the-middle": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.13.1.tgz",
-      "integrity": "sha512-k2V9wNm9B+ysuelDTHjI9d5KPc4l8zAZTGqj+pcynvWkypZd857ryzN8jNC7Pg2YZXNMJcHRPpaDyCBbNyVRpA==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.14.2.tgz",
+      "integrity": "sha512-5tCuY9BV8ujfOpwtAGgsTx9CGUapcFMEEyByLv1B+v2+6DhAcw+Zr0nhQT7uwaZ7DiourxFEscghOR8e1aPLQw==",
       "license": "Apache-2.0",
       "dependencies": {
         "acorn": "^8.14.0",
@@ -11186,22 +11892,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/make-dir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/istanbul-lib-source-maps": {
       "version": "5.0.6",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
@@ -11241,9 +11931,9 @@
       }
     },
     "node_modules/jackspeak": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.0.tgz",
-      "integrity": "sha512-9DDdhb5j6cpeitCbvLO7n7J4IxnbM6hoF6O1g4HQ5TfhvvKN8ywDM7668ZhMHRqVmxqhps/F6syWK2KcPxYlkw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz",
+      "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
@@ -11297,18 +11987,19 @@
       }
     },
     "node_modules/jose": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-6.0.10.tgz",
-      "integrity": "sha512-skIAxZqcMkOrSwjJvplIPYrlXGpxTPnro2/QWTDCxAdWQrSTV5/KqspMWmi5WAx5+ULswASJiZ0a+1B/Lxt9cw==",
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-6.0.11.tgz",
+      "integrity": "sha512-QxG7EaliDARm1O1S8BGakqncGT9s25bKL1WSf6/oa17Tkqwi8D2ZNglqCF+DsYF88/rV66Q/Q2mFAy697E1DUg==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/panva"
       }
     },
     "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/js-yaml": {
@@ -11370,89 +12061,6 @@
         }
       }
     },
-    "node_modules/jsdom/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/jsdom/node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/jsdom/node_modules/tr46": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
-      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "punycode": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/jsdom/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jsdom/node_modules/whatwg-url": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
-      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "^5.1.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/jsdom/node_modules/ws": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
-      "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/jsesc": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
@@ -11495,14 +12103,14 @@
       "license": "MIT"
     },
     "node_modules/json-stable-stringify": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.1.tgz",
-      "integrity": "sha512-Lp6HbbBgosLmJbjx0pBLbgvx68FaFU1sdkmBuckmhhJ88kL13OA51CDtR2yJB50eCNMH9wRqtQNNiAqQH4YXnA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz",
+      "integrity": "sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
+        "call-bound": "^1.0.4",
         "isarray": "^2.0.5",
         "jsonify": "^0.0.1",
         "object-keys": "^1.1.1"
@@ -11675,9 +12283,9 @@
       }
     },
     "node_modules/libphonenumber-js": {
-      "version": "1.12.6",
-      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.6.tgz",
-      "integrity": "sha512-PJiS4ETaUfCOFLpmtKzAbqZQjCCKVu2OhTV4SVNNE7c2nu/dACvtCqj4L0i/KWNnIgRv7yrILvBj5Lonv5Ncxw==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.9.tgz",
+      "integrity": "sha512-VWwAdNeJgN7jFOD+wN4qx83DTPMVPPAUyx9/TUkBXKLiNkuWWk6anV0439tgdtwaJDrEdqkvdN22iA6J4bUCZg==",
       "license": "MIT"
     },
     "node_modules/lilconfig": {
@@ -11802,26 +12410,23 @@
       }
     },
     "node_modules/long": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/long/-/long-5.3.1.tgz",
-      "integrity": "sha512-ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz",
+      "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
       "license": "Apache-2.0"
     },
     "node_modules/loupe": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
-      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.4.tgz",
+      "integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/lru-cache": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz",
-      "integrity": "sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==",
-      "license": "ISC",
-      "engines": {
-        "node": "20 || >=22"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "license": "ISC"
     },
     "node_modules/luxon": {
       "version": "3.6.1",
@@ -11855,31 +12460,21 @@
       }
     },
     "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "semver": "^6.0.0"
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/make-fetch-happen": {
       "version": "14.0.3",
       "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz",
@@ -11903,6 +12498,16 @@
         "node": "^18.17.0 || >=20.5.0"
       }
     },
+    "node_modules/make-fetch-happen/node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/marked": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/marked/-/marked-7.0.4.tgz",
@@ -12148,19 +12753,6 @@
         "encoding": "^0.1.13"
       }
     },
-    "node_modules/minipass-fetch/node_modules/minizlib": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
-      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^7.1.2"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
     "node_modules/minipass-flush": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
@@ -12187,6 +12779,13 @@
         "node": ">=8"
       }
     },
+    "node_modules/minipass-flush/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/minipass-pipeline": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
@@ -12213,6 +12812,13 @@
         "node": ">=8"
       }
     },
+    "node_modules/minipass-pipeline/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/minipass-sized": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
@@ -12239,31 +12845,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/minipass-sized/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
+      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
+        "minipass": "^7.1.2"
       },
       "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "node": ">= 18"
       }
     },
     "node_modules/mkdirp": {
@@ -12305,9 +12904,9 @@
       }
     },
     "node_modules/module-details-from-path": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz",
-      "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.4.tgz",
+      "integrity": "sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==",
       "license": "MIT"
     },
     "node_modules/moo": {
@@ -12333,9 +12932,9 @@
       "license": "MIT"
     },
     "node_modules/msgpackr": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.2.tgz",
-      "integrity": "sha512-F9UngXRlPyWCDEASDpTf6c9uNhGPTqnTeLVt7bN+bU1eajoR/8V9ys2BRaV5C/e5ihE6sJ9uPIKaYt6bFuO32g==",
+      "version": "1.11.4",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.4.tgz",
+      "integrity": "sha512-uaff7RG9VIC4jacFW9xzL3jc0iM32DNHe4jYVycBcjUePT/Klnfj7pqtWJt9khvDFizmjN2TlYniYmSS2LIaZg==",
       "license": "MIT",
       "optionalDependencies": {
         "msgpackr-extract": "^3.0.2"
@@ -12364,44 +12963,23 @@
       }
     },
     "node_modules/multer": {
-      "version": "1.4.5-lts.2",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.2.tgz",
-      "integrity": "sha512-VzGiVigcG9zUAoCNU+xShztrlr1auZOlurXynNvO9GiWD1/mTBbUljOKY+qMeazBqXgRnjzeEgJI/wyjJUHg9A==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
+      "integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
       "license": "MIT",
       "dependencies": {
         "append-field": "^1.0.0",
-        "busboy": "^1.0.0",
-        "concat-stream": "^1.5.2",
-        "mkdirp": "^0.5.4",
+        "busboy": "^1.6.0",
+        "concat-stream": "^2.0.0",
+        "mkdirp": "^0.5.6",
         "object-assign": "^4.1.1",
-        "type-is": "^1.6.4",
-        "xtend": "^4.0.0"
+        "type-is": "^1.6.18",
+        "xtend": "^4.0.2"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 10.16.0"
       }
     },
-    "node_modules/multer/node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "engines": [
-        "node >= 0.8"
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/multer/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "license": "MIT"
-    },
     "node_modules/multer/node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -12432,36 +13010,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/multer/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/multer/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "license": "MIT"
-    },
-    "node_modules/multer/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/multer/node_modules/type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -12561,9 +13109,9 @@
       "license": "MIT"
     },
     "node_modules/negotiator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
-      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -12657,12 +13205,12 @@
       }
     },
     "node_modules/next": {
-      "version": "15.3.3",
-      "resolved": "https://registry.npmjs.org/next/-/next-15.3.3.tgz",
-      "integrity": "sha512-JqNj29hHNmCLtNvd090SyRbXJiivQ+58XjCcrC50Crb5g5u2zi7Y2YivbsEfzk6AtVI80akdOQbaMZwWB1Hthw==",
+      "version": "15.3.4",
+      "resolved": "https://registry.npmjs.org/next/-/next-15.3.4.tgz",
+      "integrity": "sha512-mHKd50C+mCjam/gcnwqL1T1vPx/XQNFlXqFIVdgQdVAFY9iIQtY0IfaVflEYzKiqjeA7B0cYYMaCrmAYFjs4rA==",
       "license": "MIT",
       "dependencies": {
-        "@next/env": "15.3.3",
+        "@next/env": "15.3.4",
         "@swc/counter": "0.1.3",
         "@swc/helpers": "0.5.15",
         "busboy": "1.6.0",
@@ -12677,14 +13225,14 @@
         "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "15.3.3",
-        "@next/swc-darwin-x64": "15.3.3",
-        "@next/swc-linux-arm64-gnu": "15.3.3",
-        "@next/swc-linux-arm64-musl": "15.3.3",
-        "@next/swc-linux-x64-gnu": "15.3.3",
-        "@next/swc-linux-x64-musl": "15.3.3",
-        "@next/swc-win32-arm64-msvc": "15.3.3",
-        "@next/swc-win32-x64-msvc": "15.3.3",
+        "@next/swc-darwin-arm64": "15.3.4",
+        "@next/swc-darwin-x64": "15.3.4",
+        "@next/swc-linux-arm64-gnu": "15.3.4",
+        "@next/swc-linux-arm64-musl": "15.3.4",
+        "@next/swc-linux-x64-gnu": "15.3.4",
+        "@next/swc-linux-x64-musl": "15.3.4",
+        "@next/swc-win32-arm64-msvc": "15.3.4",
+        "@next/swc-win32-x64-msvc": "15.3.4",
         "sharp": "^0.34.1"
       },
       "peerDependencies": {
@@ -12726,9 +13274,9 @@
       "license": "MIT"
     },
     "node_modules/node-addon-api": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.1.tgz",
-      "integrity": "sha512-lytcDEdxKjGJPTLEfW4mYMigRezMlyJY8W4wxJK8zE533Jlb8L8dRuObJFWg2P+AuOIxoCgKF+2Oq4d4Zd0OUA==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.4.0.tgz",
+      "integrity": "sha512-D9DI/gXHvVmjHS08SVch0Em8G5S1P+QWtU31appcKT/8wFSPRcdHadIFSAntdMMVM5zz+/DL+bL/gz3UDppqtg==",
       "license": "MIT",
       "engines": {
         "node": "^18 || ^20 || >= 21"
@@ -12764,6 +13312,28 @@
         }
       }
     },
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT"
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/node-gyp": {
       "version": "11.2.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.2.0.tgz",
@@ -12815,26 +13385,6 @@
         "node-gyp-build-optional-packages-test": "build-test.js"
       }
     },
-    "node_modules/node-gyp/node_modules/abbrev": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz",
-      "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/chownr": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
-      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/node-gyp/node_modules/isexe": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
@@ -12845,69 +13395,6 @@
         "node": ">=16"
       }
     },
-    "node_modules/node-gyp/node_modules/minizlib": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
-      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^7.1.2"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/node-gyp/node_modules/mkdirp": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mkdirp": "dist/cjs/src/bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/node-gyp/node_modules/nopt": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz",
-      "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "abbrev": "^3.0.0"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/tar": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
-      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@isaacs/fs-minipass": "^4.0.0",
-        "chownr": "^3.0.0",
-        "minipass": "^7.1.2",
-        "minizlib": "^3.0.1",
-        "mkdirp": "^3.0.1",
-        "yallist": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/node-gyp/node_modules/which": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
@@ -12924,16 +13411,6 @@
         "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/node-gyp/node_modules/yallist": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
-      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/node-releases": {
       "version": "2.0.19",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
@@ -12951,19 +13428,19 @@
       }
     },
     "node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz",
+      "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "abbrev": "1"
+        "abbrev": "^3.0.0"
       },
       "bin": {
         "nopt": "bin/nopt.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/normalize-path": {
@@ -13003,9 +13480,9 @@
       "license": "MIT"
     },
     "node_modules/oauth4webapi": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/oauth4webapi/-/oauth4webapi-3.5.1.tgz",
-      "integrity": "sha512-txg/jZQwcbaF7PMJgY7aoxc9QuCxHVFMiEkDIJ60DwDz3PbtXPQnrzo+3X4IRYGChIwWLabRBRpf1k9hO9+xrQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/oauth4webapi/-/oauth4webapi-3.5.3.tgz",
+      "integrity": "sha512-2bnHosmBLAQpXNBLOvaJMyMkr4Yya5ohE5Q9jqyxiN+aa7GFCzvDN1RRRMrp0NkfqRR2MTaQNkcSUCCjILD9oQ==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/panva"
@@ -13057,6 +13534,12 @@
       "integrity": "sha512-42CPE9AhahZRsMNslczq0ctAEtqk8Eka26QofnqC346BZdHDySk3LWka23LI7ULIw11NmltpiLagIq8gBozxTw==",
       "license": "MIT"
     },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "license": "MIT"
+    },
     "node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
@@ -13120,13 +13603,13 @@
       }
     },
     "node_modules/openid-client": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-6.5.0.tgz",
-      "integrity": "sha512-fAfYaTnOYE2kQCqEJGX9KDObW2aw7IQy4jWpU/+3D3WoCFLbix5Hg6qIPQ6Js9r7f8jDUmsnnguRNCSw4wU/IQ==",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-6.6.1.tgz",
+      "integrity": "sha512-GmqoICGMI3IyFFjhvXxad8of4QWk2D0tm4vdJkldGm9nw7J3p1f7LPLWgGeFuKuw8HjDVe8Dd8QLGBe0NFvSSg==",
       "license": "MIT",
       "dependencies": {
-        "jose": "^6.0.10",
-        "oauth4webapi": "^3.5.1"
+        "jose": "^6.0.11",
+        "oauth4webapi": "^3.5.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/panva"
@@ -13304,9 +13787,9 @@
       }
     },
     "node_modules/parse5/node_modules/entities": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz",
-      "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -13488,6 +13971,15 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz",
+      "integrity": "sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==",
+      "license": "ISC",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/path-source": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/path-source/-/path-source-0.1.3.tgz",
@@ -13555,36 +14047,23 @@
         "url": "https://ko-fi.com/killymxi"
       }
     },
-    "node_modules/peek-readable": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-7.0.0.tgz",
-      "integrity": "sha512-nri2TO5JE3/mRryik9LlHFT53cgHfRK0Lt0BAZQXku/AW3E6XLt2GaY8siWi7dvW/m1z0ecn+J+bpDa9ZN3IsQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
-      }
-    },
     "node_modules/pg": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.0.tgz",
-      "integrity": "sha512-7SKfdvP8CTNXjMUzfcVTaI+TDzBEeaUnVwiVGZQD1Hh33Kpev7liQba9uLd4CfN8r9mCVsD0JIpq03+Unpz+kg==",
+      "version": "8.16.2",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.2.tgz",
+      "integrity": "sha512-OtLWF0mKLmpxelOt9BqVq83QV6bTfsS0XLegIeAKqKjurRnRKie1Dc1iL89MugmSLhftxw6NNCyZhm1yQFLMEQ==",
       "license": "MIT",
       "dependencies": {
-        "pg-connection-string": "^2.9.0",
-        "pg-pool": "^3.10.0",
-        "pg-protocol": "^1.10.0",
+        "pg-connection-string": "^2.9.1",
+        "pg-pool": "^3.10.1",
+        "pg-protocol": "^1.10.2",
         "pg-types": "2.2.0",
         "pgpass": "1.0.5"
       },
       "engines": {
-        "node": ">= 8.0.0"
+        "node": ">= 16.0.0"
       },
       "optionalDependencies": {
-        "pg-cloudflare": "^1.2.5"
+        "pg-cloudflare": "^1.2.6"
       },
       "peerDependencies": {
         "pg-native": ">=3.0.1"
@@ -13596,16 +14075,16 @@
       }
     },
     "node_modules/pg-cloudflare": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.5.tgz",
-      "integrity": "sha512-OOX22Vt0vOSRrdoUPKJ8Wi2OpE/o/h9T8X1s4qSkCedbNah9ei2W2765be8iMVxQUsvgT7zIAT2eIa9fs5+vtg==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.6.tgz",
+      "integrity": "sha512-uxmJAnmIgmYgnSFzgOf2cqGQBzwnRYcrEgXuFjJNEkpedEIPBSEzxY7ph4uA9k1mI+l/GR0HjPNS6FKNZe8SBQ==",
       "license": "MIT",
       "optional": true
     },
     "node_modules/pg-connection-string": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.0.tgz",
-      "integrity": "sha512-P2DEBKuvh5RClafLngkAuGe9OUlFV7ebu8w1kmaaOgPcpJd1RIFh7otETfI6hAR8YupOLFTY7nuvvIn7PLciUQ==",
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz",
+      "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==",
       "license": "MIT"
     },
     "node_modules/pg-int8": {
@@ -13617,22 +14096,49 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/pg-numeric": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pg-numeric/-/pg-numeric-1.0.2.tgz",
+      "integrity": "sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/pg-pool": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.0.tgz",
-      "integrity": "sha512-DzZ26On4sQ0KmqnO34muPcmKbhrjmyiO4lCCR0VwEd7MjmiKf5NTg/6+apUEu0NF7ESa37CGzFxH513CoUmWnA==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz",
+      "integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==",
       "license": "MIT",
       "peerDependencies": {
         "pg": ">=8.0"
       }
     },
     "node_modules/pg-protocol": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.0.tgz",
-      "integrity": "sha512-IpdytjudNuLv8nhlHs/UrVBhU0e78J0oIS/0AVdTbWxSOkFUVdsHC/NrorO6nXsQNDTT1kzDSOMJubBQviX18Q==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.2.tgz",
+      "integrity": "sha512-Ci7jy8PbaWxfsck2dwZdERcDG2A0MG8JoQILs+uZNjABFuBuItAZCWUNz8sXRDMoui24rJw7WlXqgpMdBSN/vQ==",
       "license": "MIT"
     },
     "node_modules/pg-types": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-4.0.2.tgz",
+      "integrity": "sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng==",
+      "license": "MIT",
+      "dependencies": {
+        "pg-int8": "1.0.1",
+        "pg-numeric": "1.0.2",
+        "postgres-array": "~3.0.1",
+        "postgres-bytea": "~3.0.0",
+        "postgres-date": "~2.1.0",
+        "postgres-interval": "^3.0.0",
+        "postgres-range": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/pg/node_modules/pg-types": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
       "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
@@ -13648,6 +14154,45 @@
         "node": ">=4"
       }
     },
+    "node_modules/pg/node_modules/postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pg/node_modules/postgres-bytea": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pg/node_modules/postgres-date": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pg/node_modules/postgres-interval": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/pgpass": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
@@ -13878,7 +14423,6 @@
       "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.5.tgz",
       "integrity": "sha512-cDWgoah1Gez9rN3H4165peY9qfpEo+SA61oQv65O3cRUE1pOEoJWwddwcqKE8XZYjbblOJlYDlLV4h67HrEVDg==",
       "license": "Unlicense",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -13888,44 +14432,50 @@
       }
     },
     "node_modules/postgres-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
-      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-3.0.4.tgz",
+      "integrity": "sha512-nAUSGfSDGOaOAEGwqsRY27GPOea7CNipJPOA7lPbdEpx5Kg3qzdP0AaWC5MlhTWV9s4hFX39nomVZ+C4tnGOJQ==",
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
       }
     },
     "node_modules/postgres-bytea": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
-      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-3.0.0.tgz",
+      "integrity": "sha512-CNd4jim9RFPkObHSjVHlVrxoVQXz7quwNFpz7RY1okNNme49+sVyiTvTRobiLV548Hx/hb1BG+iE7h9493WzFw==",
       "license": "MIT",
+      "dependencies": {
+        "obuf": "~1.1.2"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 6"
       }
     },
     "node_modules/postgres-date": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
-      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-2.1.0.tgz",
+      "integrity": "sha512-K7Juri8gtgXVcDfZttFKVmhglp7epKb1K4pgrkLxehjqkrgPhfG6OO8LHLkfaqkbpjNRnra018XwAr1yQFWGcA==",
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
       }
     },
     "node_modules/postgres-interval": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
-      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-3.0.0.tgz",
+      "integrity": "sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw==",
       "license": "MIT",
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
       }
     },
+    "node_modules/postgres-range": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/postgres-range/-/postgres-range-1.1.4.tgz",
+      "integrity": "sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==",
+      "license": "MIT"
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -14079,9 +14629,9 @@
       }
     },
     "node_modules/protobufjs": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
-      "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.3.tgz",
+      "integrity": "sha512-sildjKwVqOI2kmFDiXQ6aEB0fjYTafpEvIBs8tOR8qI4spuL9OPROLVu2qZqi/xgCfsHIwVqlaF8JBjWFHnKbw==",
       "hasInstallScript": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -14122,9 +14672,9 @@
       }
     },
     "node_modules/pump": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
-      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14565,9 +15115,9 @@
       }
     },
     "node_modules/readdir-glob/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -14842,13 +15392,13 @@
       "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.0.tgz",
-      "integrity": "sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz",
+      "integrity": "sha512-qHcdEzLCiktQIfwBq420pn2dP+30uzqYxv9ETm91wdt2R9AFcWfjNAmje4NWlnCIQ5RMTzVf0ZyisOKqHR6RwA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.7"
+        "@types/estree": "1.0.8"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -14858,26 +15408,26 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.40.0",
-        "@rollup/rollup-android-arm64": "4.40.0",
-        "@rollup/rollup-darwin-arm64": "4.40.0",
-        "@rollup/rollup-darwin-x64": "4.40.0",
-        "@rollup/rollup-freebsd-arm64": "4.40.0",
-        "@rollup/rollup-freebsd-x64": "4.40.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.40.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.40.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.40.0",
-        "@rollup/rollup-linux-arm64-musl": "4.40.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.40.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.40.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.40.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.40.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.40.0",
-        "@rollup/rollup-linux-x64-gnu": "4.40.0",
-        "@rollup/rollup-linux-x64-musl": "4.40.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.40.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.40.0",
-        "@rollup/rollup-win32-x64-msvc": "4.40.0",
+        "@rollup/rollup-android-arm-eabi": "4.44.0",
+        "@rollup/rollup-android-arm64": "4.44.0",
+        "@rollup/rollup-darwin-arm64": "4.44.0",
+        "@rollup/rollup-darwin-x64": "4.44.0",
+        "@rollup/rollup-freebsd-arm64": "4.44.0",
+        "@rollup/rollup-freebsd-x64": "4.44.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.44.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.44.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.44.0",
+        "@rollup/rollup-linux-arm64-musl": "4.44.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.44.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.44.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.44.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.44.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.44.0",
+        "@rollup/rollup-linux-x64-gnu": "4.44.0",
+        "@rollup/rollup-linux-x64-musl": "4.44.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.44.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.44.0",
+        "@rollup/rollup-win32-x64-msvc": "4.44.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -15431,6 +15981,27 @@
         }
       }
     },
+    "node_modules/socket.io-adapter/node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/socket.io-parser": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
@@ -15522,9 +16093,9 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
-      "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.5.tgz",
+      "integrity": "sha512-iF+tNDQla22geJdTyJB1wM/qrX9DMRwWrciEPwWLPRWAUEM8sQiyxgckLxWT1f7+9VabJS0jTGGr4QgBuvi6Ww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15551,16 +16122,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/socks-proxy-agent/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -15614,9 +16175,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/sql-formatter": {
-      "version": "15.6.2",
-      "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.6.2.tgz",
-      "integrity": "sha512-ZjqOfJGuB97UeHzTJoTbadlM0h9ynehtSTHNUbGfXR4HZ4rCIoD2oIW91W+A5oE76k8hl0Uz5GD8Sx3Pt9Xa3w==",
+      "version": "15.6.5",
+      "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.6.5.tgz",
+      "integrity": "sha512-fr4TyM1udCSrOHOmouotwUi8dxIDhSLpYNmPePGFVzxq8/i8jd828IapE49QXG7Gzkswxo5WwdAGnYX4YpKoTg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15628,9 +16189,9 @@
       }
     },
     "node_modules/sql-highlight": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/sql-highlight/-/sql-highlight-6.0.0.tgz",
-      "integrity": "sha512-+fLpbAbWkQ+d0JEchJT/NrRRXbYRNbG15gFpANx73EwxQB1PRjj+k/OI0GTU0J63g8ikGkJECQp9z8XEJZvPRw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/sql-highlight/-/sql-highlight-6.1.0.tgz",
+      "integrity": "sha512-ed7OK4e9ywpE7pgRMkMQmZDPKSVdm0oX5IEtZiKnFucSF0zu6c80GZBe38UqHuVhTWJ9xsKgSMjCG2bml86KvA==",
       "funding": [
         "https://github.com/scriptcoded/sql-highlight?sponsor=1",
         {
@@ -15710,9 +16271,9 @@
       "license": "MIT"
     },
     "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -15752,9 +16313,9 @@
       }
     },
     "node_modules/streamx": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz",
-      "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==",
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.1.tgz",
+      "integrity": "sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==",
       "license": "MIT",
       "dependencies": {
         "fast-fifo": "^1.3.2",
@@ -15920,14 +16481,26 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/strtok3": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-10.2.2.tgz",
-      "integrity": "sha512-Xt18+h4s7Z8xyZ0tmBoRmzxcop97R4BAh+dXouUDCYn+Em+1P3qpkUfI5ueWLT8ynC5hZ+q4iPEmGG1urvQGBg==",
+    "node_modules/strip-literal": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz",
+      "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@tokenizer/token": "^0.3.0",
-        "peek-readable": "^7.0.0"
+        "js-tokens": "^9.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/strtok3": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-10.3.1.tgz",
+      "integrity": "sha512-3JWEZM6mfix/GCJBBUrkA8p2Id2pBkyTkVCJKto55w080QBKZ+8R171fGrbiSp+yMO/u6F8/yUh7K4V9K+YCnw==",
+      "license": "MIT",
+      "dependencies": {
+        "@tokenizer/token": "^0.3.0"
       },
       "engines": {
         "node": ">=18"
@@ -15984,9 +16557,9 @@
       }
     },
     "node_modules/sucrase/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -16030,13 +16603,6 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/sucrase/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "license": "ISC",
-      "peer": true
-    },
     "node_modules/sucrase/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -16156,14 +16722,13 @@
       "license": "MIT"
     },
     "node_modules/synckit": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.4.tgz",
-      "integrity": "sha512-Q/XQKRaJiLiFIBNN+mndW7S/RHxvwzuZS6ZwmRzUBqJBv/5QIKCEwkBC8GBf8EQJKYnaFs0wOZbKTXBPj8L9oQ==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.8.tgz",
+      "integrity": "sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@pkgr/core": "^0.2.3",
-        "tslib": "^2.8.1"
+        "@pkgr/core": "^0.2.4"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -16287,9 +16852,9 @@
       }
     },
     "node_modules/tailwindcss/node_modules/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "funding": [
         {
           "type": "opencollective",
@@ -16307,7 +16872,7 @@
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -16316,9 +16881,9 @@
       }
     },
     "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
+      "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -16326,27 +16891,27 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/tar-fs": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.9.tgz",
-      "integrity": "sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.10.tgz",
+      "integrity": "sha512-C1SwlQGNLe/jPNqapK8epDsXME7CAJR5RL3GcE6KWx1d9OUByzoHVcbu1VPI8tevg9H8Alae0AApHHFGzrD5zA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16369,38 +16934,31 @@
         "streamx": "^2.15.0"
       }
     },
-    "node_modules/tar/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/tar/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
       "dev": true,
       "license": "MIT",
       "bin": {
-        "mkdirp": "bin/cmd.js"
+        "mkdirp": "dist/cjs/src/bin.js"
       },
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/terser": {
-      "version": "5.39.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
-      "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
+      "version": "5.43.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.43.1.tgz",
+      "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
+        "acorn": "^8.14.0",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -16502,9 +17060,9 @@
       "license": "MIT"
     },
     "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+      "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16544,9 +17102,9 @@
       }
     },
     "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16590,13 +17148,6 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/test-exclude/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/test-exclude/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -16631,9 +17182,9 @@
       }
     },
     "node_modules/testcontainers": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-11.0.2.tgz",
-      "integrity": "sha512-rI+CiMYGxd1t/fTW+xs79OHkhBIVLCh7Xstm6duYhKH+LZGyoWtXJsljLvkvWV0J8y8FovcG2Z6/1j1KPqM3rA==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-11.0.3.tgz",
+      "integrity": "sha512-Xu6ZAaE1FaLyHzFSYdCsd+xMPxUegUjkum0r6zgO8SinnFDHRX/PllIHMt1D+DVUmJqBvPQI6vge/J5jgE5vng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16644,7 +17195,7 @@
         "byline": "^5.0.0",
         "debug": "^4.4.1",
         "docker-compose": "^1.2.0",
-        "dockerode": "^4.0.6",
+        "dockerode": "^4.0.7",
         "get-port": "^7.1.0",
         "proper-lockfile": "^4.1.2",
         "properties-reader": "^2.3.0",
@@ -16730,9 +17281,9 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
-      "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16747,9 +17298,9 @@
       }
     },
     "node_modules/tinypool": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
-      "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -16767,9 +17318,9 @@
       }
     },
     "node_modules/tinyspy": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
-      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.3.tgz",
+      "integrity": "sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -16869,10 +17420,17 @@
       }
     },
     "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "license": "MIT"
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
+      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/tree-kill": {
       "version": "1.2.2",
@@ -16914,9 +17472,9 @@
       "peer": true
     },
     "node_modules/tsconfck": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.5.tgz",
-      "integrity": "sha512-CLDfGgUp7XPswWnezWwsCRxNmgQjhYq3VXHM0/XIRxhVrKw0M1if9agzryh1QS3nxjCROvV+xWxoJO1YctzzWg==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.6.tgz",
+      "integrity": "sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -17024,9 +17582,9 @@
       "license": "MIT"
     },
     "node_modules/typeorm": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.24.tgz",
-      "integrity": "sha512-4IrHG7A0tY8l5gEGXfW56VOMfUVWEkWlH/h5wmcyZ+V8oCiLj7iTPp0lEjMEZVrxEkGSdP9ErgTKHKXQApl/oA==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.25.tgz",
+      "integrity": "sha512-fTKDFzWXKwAaBdEMU4k661seZewbNYET4r1J/z3Jwf+eAvlzMVpTLKAVcAzg75WwQk7GDmtsmkZ5MfkmXCiFWg==",
       "license": "MIT",
       "dependencies": {
         "@sqltools/formatter": "^1.2.5",
@@ -17130,9 +17688,9 @@
       }
     },
     "node_modules/typeorm/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -17197,12 +17755,6 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/typeorm/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "license": "ISC"
-    },
     "node_modules/typeorm/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -17262,15 +17814,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.1.tgz",
-      "integrity": "sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==",
+      "version": "8.34.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.34.1.tgz",
+      "integrity": "sha512-XjS+b6Vg9oT1BaIUfkW3M3LvqZE++rbzAMEHuccCfO/YkP43ha6w3jTEMilQxMF92nVOYCcdjv1ZUhAa1D/0ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.32.1",
-        "@typescript-eslint/parser": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1"
+        "@typescript-eslint/eslint-plugin": "8.34.1",
+        "@typescript-eslint/parser": "8.34.1",
+        "@typescript-eslint/utils": "8.34.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -17445,9 +17997,9 @@
       }
     },
     "node_modules/unplugin": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-2.3.4.tgz",
-      "integrity": "sha512-m4PjxTurwpWfpMomp8AptjD5yj8qEZN5uQjjGM3TAs9MWWD2tXSSNNj6jGR2FoVGod4293ytyV6SwBbertfyJg==",
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-2.3.5.tgz",
+      "integrity": "sha512-RyWSb5AHmGtjjNQ6gIlA67sHOsWpsbWpwDokLwTcejVdOjEkJZh7QKu14J00gDDVSh8kGH4KYC/TNBceXFZhtw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17460,15 +18012,15 @@
       }
     },
     "node_modules/unplugin-swc": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/unplugin-swc/-/unplugin-swc-1.5.3.tgz",
-      "integrity": "sha512-lfBT7Wtauf/1y89xGt+x8+T7yB7bCMq/qXeXcOcqQddKDULGEg/4O2201Eh6eCBxbEi8J1Tmy2scG5dhiBJONg==",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/unplugin-swc/-/unplugin-swc-1.5.5.tgz",
+      "integrity": "sha512-BahYtYvQ/KSgOqHoy5FfQgp/oZNAB7jwERxNeFVeN/PtJhg4fpK/ybj9OwKtqGPseOadS7+TGbq6tH2DmDAYvA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rollup/pluginutils": "^5.1.4",
+        "@rollup/pluginutils": "^5.2.0",
         "load-tsconfig": "^0.2.5",
-        "unplugin": "^2.3.4"
+        "unplugin": "^2.3.5"
       },
       "peerDependencies": {
         "@swc/core": "^1.2.108"
@@ -17563,9 +18115,9 @@
       }
     },
     "node_modules/validator": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-13.15.0.tgz",
-      "integrity": "sha512-36B2ryl4+oL5QxZ3AzD0t5SsMNGvTtQHpjgFO5tbNxfXbMFkY822ktCDe1MnlqV3301QQI9SLHDNJokDI+Z9pA==",
+      "version": "13.15.15",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.15.15.tgz",
+      "integrity": "sha512-BgWVbCI72aIQy937xbawcs+hrVaN/CZ2UwutgaJ36hGqRrLNM+f5LUT/YPRbo8IV/ASeFzXszezV+y2+rq3l8A==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.10"
@@ -17581,15 +18133,18 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.2.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz",
-      "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==",
+      "version": "6.3.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
+      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2",
         "postcss": "^8.5.3",
-        "rollup": "^4.30.1"
+        "rollup": "^4.34.9",
+        "tinyglobby": "^0.2.13"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -17653,17 +18208,17 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz",
-      "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
+      "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.4.0",
+        "debug": "^4.4.1",
         "es-module-lexer": "^1.7.0",
         "pathe": "^2.0.3",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "bin": {
         "vite-node": "vite-node.mjs"
@@ -17696,9 +18251,9 @@
       }
     },
     "node_modules/vite/node_modules/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "dev": true,
       "funding": [
         {
@@ -17716,7 +18271,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -17725,32 +18280,34 @@
       }
     },
     "node_modules/vitest": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz",
-      "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
+      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "3.1.4",
-        "@vitest/mocker": "3.1.4",
-        "@vitest/pretty-format": "^3.1.4",
-        "@vitest/runner": "3.1.4",
-        "@vitest/snapshot": "3.1.4",
-        "@vitest/spy": "3.1.4",
-        "@vitest/utils": "3.1.4",
+        "@types/chai": "^5.2.2",
+        "@vitest/expect": "3.2.4",
+        "@vitest/mocker": "3.2.4",
+        "@vitest/pretty-format": "^3.2.4",
+        "@vitest/runner": "3.2.4",
+        "@vitest/snapshot": "3.2.4",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
         "chai": "^5.2.0",
-        "debug": "^4.4.0",
+        "debug": "^4.4.1",
         "expect-type": "^1.2.1",
         "magic-string": "^0.30.17",
         "pathe": "^2.0.3",
+        "picomatch": "^4.0.2",
         "std-env": "^3.9.0",
         "tinybench": "^2.9.0",
         "tinyexec": "^0.3.2",
-        "tinyglobby": "^0.2.13",
-        "tinypool": "^1.0.2",
+        "tinyglobby": "^0.2.14",
+        "tinypool": "^1.1.1",
         "tinyrainbow": "^2.0.0",
-        "vite": "^5.0.0 || ^6.0.0",
-        "vite-node": "3.1.4",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
+        "vite-node": "3.2.4",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -17766,8 +18323,8 @@
         "@edge-runtime/vm": "*",
         "@types/debug": "^4.1.12",
         "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.1.4",
-        "@vitest/ui": "3.1.4",
+        "@vitest/browser": "3.2.4",
+        "@vitest/ui": "3.2.4",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -17809,9 +18366,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
+      "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17832,10 +18389,14 @@
       }
     },
     "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "license": "BSD-2-Clause"
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/webpack": {
       "version": "5.99.6",
@@ -17895,9 +18456,9 @@
       }
     },
     "node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
+      "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -18014,9 +18575,9 @@
       }
     },
     "node_modules/webpack/node_modules/schema-utils": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+      "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18057,13 +18618,17 @@
       }
     },
     "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
+      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+        "tr46": "^5.1.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/which": {
@@ -18205,9 +18770,10 @@
       "license": "ISC"
     },
     "node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "version": "8.18.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
+      "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -18261,22 +18827,25 @@
       }
     },
     "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
       "dev": true,
-      "license": "ISC"
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/yaml": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz",
-      "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
+      "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
       },
       "engines": {
-        "node": ">= 14"
+        "node": ">= 14.6"
       }
     },
     "node_modules/yargs": {
diff --git a/server/package.json b/server/package.json
index 2d1478b39f..f5093d36a6 100644
--- a/server/package.json
+++ b/server/package.json
@@ -45,15 +45,25 @@
     "@nestjs/schedule": "^5.0.0",
     "@nestjs/swagger": "^11.0.2",
     "@nestjs/websockets": "^11.0.4",
+    "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/auto-instrumentations-node": "^0.59.0",
     "@opentelemetry/context-async-hooks": "^2.0.0",
     "@opentelemetry/exporter-prometheus": "^0.201.0",
+    "@opentelemetry/instrumentation-http": "^0.202.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.50.0",
+    "@opentelemetry/instrumentation-nestjs-core": "^0.48.0",
+    "@opentelemetry/instrumentation-pg": "^0.54.0",
+    "@opentelemetry/resources": "^2.0.1",
+    "@opentelemetry/sdk-metrics": "^2.0.1",
     "@opentelemetry/sdk-node": "^0.201.0",
+    "@opentelemetry/semantic-conventions": "^1.34.0",
     "@react-email/components": "^0.0.41",
+    "@react-email/render": "^1.1.2",
     "@socket.io/redis-adapter": "^8.3.0",
     "archiver": "^7.0.0",
     "async-lock": "^1.4.0",
     "bcrypt": "^6.0.0",
+    "body-parser": "^2.2.0",
     "bullmq": "^5.51.0",
     "chokidar": "^3.5.3",
     "class-transformer": "^0.5.1",
@@ -61,7 +71,9 @@
     "compression": "^1.8.0",
     "cookie": "^1.0.2",
     "cookie-parser": "^1.4.7",
+    "cron": "^3.5.0",
     "exiftool-vendored": "^28.3.1",
+    "express": "^5.1.0",
     "fast-glob": "^3.3.2",
     "fluent-ffmpeg": "^2.1.2",
     "geo-tz": "^8.0.0",
@@ -74,6 +86,7 @@
     "lodash": "^4.17.21",
     "luxon": "^3.4.2",
     "mnemonist": "^0.40.3",
+    "multer": "^2.0.1",
     "nest-commander": "^3.16.0",
     "nestjs-cls": "^5.0.0",
     "nestjs-kysely": "^1.1.0",
@@ -81,7 +94,9 @@
     "nodemailer": "^7.0.0",
     "openid-client": "^6.3.3",
     "pg": "^8.11.3",
+    "pg-connection-string": "^2.9.1",
     "picomatch": "^4.0.2",
+    "postgres": "3.4.5",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-email": "^4.0.0",
@@ -92,6 +107,7 @@
     "semver": "^7.6.2",
     "sharp": "^0.34.2",
     "sirv": "^3.0.0",
+    "socket.io": "^4.8.1",
     "tailwindcss-preset-email": "^1.3.2",
     "thumbhash": "^0.1.1",
     "typeorm": "^0.3.17",
@@ -110,12 +126,14 @@
     "@types/archiver": "^6.0.0",
     "@types/async-lock": "^1.4.2",
     "@types/bcrypt": "^5.0.0",
+    "@types/body-parser": "^1.19.6",
     "@types/compression": "^1.7.5",
     "@types/cookie-parser": "^1.4.8",
     "@types/express": "^5.0.0",
     "@types/fluent-ffmpeg": "^2.1.21",
     "@types/js-yaml": "^4.0.9",
     "@types/lodash": "^4.14.197",
+    "@types/luxon": "^3.6.2",
     "@types/mock-fs": "^4.13.1",
     "@types/multer": "^1.4.7",
     "@types/node": "^22.15.31",
@@ -127,6 +145,7 @@
     "@types/semver": "^7.5.8",
     "@types/supertest": "^6.0.0",
     "@types/ua-parser-js": "^0.7.36",
+    "@types/validator": "^13.15.2",
     "@vitest/coverage-v8": "^3.0.0",
     "eslint": "^9.14.0",
     "eslint-config-prettier": "^10.0.0",

From 4cd633dc68a32141eda9ebcfc902a785e45b9025 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Mon, 23 Jun 2025 10:52:19 +0800
Subject: [PATCH 017/337] fix(web): download icon color (#19427)

---
 .../lib/components/asset-viewer/actions/download-action.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/lib/components/asset-viewer/actions/download-action.svelte b/web/src/lib/components/asset-viewer/actions/download-action.svelte
index 9a2e1a9553..e6c96da016 100644
--- a/web/src/lib/components/asset-viewer/actions/download-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/download-action.svelte
@@ -23,8 +23,9 @@
 
 {#if !menuItem}
   <IconButton
-    color="primary"
+    color="secondary"
     shape="round"
+    variant="ghost"
     icon={mdiFolderDownloadOutline}
     aria-label={$t('download')}
     onclick={onDownloadFile}

From ef278b4fb0475362dfaf4f4d831154bb890e8482 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Sun, 22 Jun 2025 21:54:29 -0500
Subject: [PATCH 018/337] fix: storage template onboarding save (#19405)

* fix: storage template onboarding save

* no need for async/await
---
 .../onboarding-page/onboarding-storage-template.svelte      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte b/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte
index 45d11e0718..06ee9accbb 100644
--- a/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte
+++ b/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte
@@ -5,7 +5,7 @@
   import { featureFlags } from '$lib/stores/server-config.store';
   import { user } from '$lib/stores/user.store';
   import { getConfig, type SystemConfigDto } from '@immich/sdk';
-  import { onMount } from 'svelte';
+  import { onDestroy, onMount } from 'svelte';
 
   let config: SystemConfigDto | undefined = $state();
   let adminSettingsComponent = $state<ReturnType<typeof AdminSettings>>();
@@ -14,9 +14,7 @@
     config = await getConfig();
   });
 
-  export const save = async () => {
-    await adminSettingsComponent?.handleSave({ storageTemplate: config?.storageTemplate });
-  };
+  onDestroy(() => adminSettingsComponent?.handleSave({ storageTemplate: config?.storageTemplate }));
 </script>
 
 <div class="flex flex-col">

From c705a7b2807a441f54646fd8635039d3105d1b36 Mon Sep 17 00:00:00 2001
From: Yaros <thedj.launchpadder.dmx512@gmail.com>
Date: Mon, 23 Jun 2025 04:55:21 +0200
Subject: [PATCH 019/337] fix(web): map broken after redirect from details
 (#19424)

* fix(web): map broken after redirect from details

* chore: use globalThis instead of window
---
 .../lib/components/shared-components/map/map.svelte  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/web/src/lib/components/shared-components/map/map.svelte b/web/src/lib/components/shared-components/map/map.svelte
index 06c754f0dc..d5b531dfc7 100644
--- a/web/src/lib/components/shared-components/map/map.svelte
+++ b/web/src/lib/components/shared-components/map/map.svelte
@@ -7,6 +7,7 @@
 </script>
 
 <script lang="ts">
+  import { afterNavigate } from '$app/navigation';
   import Icon from '$lib/components/elements/icon.svelte';
   import { Theme } from '$lib/constants';
   import { modalManager } from '$lib/managers/modal-manager.svelte';
@@ -213,6 +214,17 @@
     }
   };
 
+  afterNavigate(() => {
+    if (map) {
+      map.resize();
+
+      if (globalThis.location.hash) {
+        const hashChangeEvent = new HashChangeEvent('hashchange');
+        globalThis.dispatchEvent(hashChangeEvent);
+      }
+    }
+  });
+
   onMount(async () => {
     if (!mapMarkers) {
       mapMarkers = await loadMapMarkers();

From ecc58a897136208475b95d75b661988b1ea5d553 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Mon, 23 Jun 2025 04:56:41 +0200
Subject: [PATCH 020/337] chore: migrate version announcement modal (#19381)

---
 .../version-announcement-box.svelte           | 75 -------------------
 .../modals/VersionAnnouncementModal.svelte    | 44 +++++++++++
 web/src/routes/+layout.svelte                 | 41 ++++++++--
 3 files changed, 79 insertions(+), 81 deletions(-)
 delete mode 100644 web/src/lib/components/shared-components/version-announcement-box.svelte
 create mode 100644 web/src/lib/modals/VersionAnnouncementModal.svelte

diff --git a/web/src/lib/components/shared-components/version-announcement-box.svelte b/web/src/lib/components/shared-components/version-announcement-box.svelte
deleted file mode 100644
index 236c3ed559..0000000000
--- a/web/src/lib/components/shared-components/version-announcement-box.svelte
+++ /dev/null
@@ -1,75 +0,0 @@
-<script lang="ts">
-  import FormatMessage from '$lib/components/i18n/format-message.svelte';
-  import { websocketStore } from '$lib/stores/websocket';
-  import type { ServerVersionResponseDto } from '@immich/sdk';
-  import { Button, Modal, ModalBody, ModalFooter } from '@immich/ui';
-  import { t } from 'svelte-i18n';
-
-  let showModal = $state(false);
-
-  const { release } = websocketStore;
-
-  const semverToName = ({ major, minor, patch }: ServerVersionResponseDto) => `v${major}.${minor}.${patch}`;
-
-  const onAcknowledge = () => {
-    localStorage.setItem('appVersion', releaseVersion);
-    sessionStorage.setItem('modalAcknowledged', 'true');
-    showModal = false;
-  };
-
-  const handleRelease = () => {
-    try {
-      if (localStorage.getItem('appVersion') === releaseVersion) {
-        return;
-      }
-
-      showModal = true;
-    } catch (error) {
-      console.error('Error [VersionAnnouncementBox]:', error);
-    }
-  };
-  let releaseVersion = $derived($release && semverToName($release.releaseVersion));
-  let serverVersion = $derived($release && semverToName($release.serverVersion));
-  $effect(() => {
-    if ($release?.isAvailable && !sessionStorage.getItem('modalAcknowledged')) {
-      handleRelease();
-    }
-  });
-</script>
-
-{#if showModal}
-  <Modal size="small" title="🎉 {$t('new_version_available')}" onClose={() => (showModal = false)} icon={false}>
-    <ModalBody>
-      <div>
-        <FormatMessage key="version_announcement_message">
-          {#snippet children({ tag, message })}
-            {#if tag === 'link'}
-              <span class="font-medium underline">
-                <a
-                  href="https://github.com/immich-app/immich/releases/latest"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  {message}
-                </a>
-              </span>
-            {:else if tag === 'code'}
-              <code>{message}</code>
-            {/if}
-          {/snippet}
-        </FormatMessage>
-      </div>
-
-      <div class="mt-4 font-medium">{$t('version_announcement_closing')}</div>
-
-      <div class="font-sm mt-8">
-        <code>{$t('server_version')}: {serverVersion}</code>
-        <br />
-        <code>{$t('latest_version')}: {releaseVersion}</code>
-      </div>
-    </ModalBody>
-    <ModalFooter>
-      <Button fullWidth shape="round" onclick={onAcknowledge}>{$t('acknowledge')}</Button>
-    </ModalFooter>
-  </Modal>
-{/if}
diff --git a/web/src/lib/modals/VersionAnnouncementModal.svelte b/web/src/lib/modals/VersionAnnouncementModal.svelte
new file mode 100644
index 0000000000..feecb3fd4c
--- /dev/null
+++ b/web/src/lib/modals/VersionAnnouncementModal.svelte
@@ -0,0 +1,44 @@
+<script lang="ts">
+  import FormatMessage from '$lib/components/i18n/format-message.svelte';
+  import { Button, Modal, ModalBody, ModalFooter } from '@immich/ui';
+  import { t } from 'svelte-i18n';
+
+  type Props = {
+    serverVersion: string;
+    releaseVersion: string;
+    onClose: () => void;
+  };
+
+  const { serverVersion, releaseVersion, onClose }: Props = $props();
+</script>
+
+<Modal size="small" title="🎉 {$t('new_version_available')}" {onClose} icon={false}>
+  <ModalBody>
+    <div>
+      <FormatMessage key="version_announcement_message">
+        {#snippet children({ tag, message })}
+          {#if tag === 'link'}
+            <span class="font-medium underline">
+              <a href="https://github.com/immich-app/immich/releases/latest" target="_blank" rel="noopener noreferrer">
+                {message}
+              </a>
+            </span>
+          {:else if tag === 'code'}
+            <code>{message}</code>
+          {/if}
+        {/snippet}
+      </FormatMessage>
+    </div>
+
+    <div class="mt-4 font-medium">{$t('version_announcement_closing')}</div>
+
+    <div class="font-sm mt-8">
+      <code>{$t('server_version')}: {serverVersion}</code>
+      <br />
+      <code>{$t('latest_version')}: {releaseVersion}</code>
+    </div>
+  </ModalBody>
+  <ModalFooter>
+    <Button fullWidth shape="round" onclick={onClose}>{$t('acknowledge')}</Button>
+  </ModalFooter>
+</Modal>
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index c9e91f3beb..30f62e5861 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -8,13 +8,20 @@
   import NavigationLoadingBar from '$lib/components/shared-components/navigation-loading-bar.svelte';
   import NotificationList from '$lib/components/shared-components/notification/notification-list.svelte';
   import UploadPanel from '$lib/components/shared-components/upload-panel.svelte';
-  import VersionAnnouncementBox from '$lib/components/shared-components/version-announcement-box.svelte';
   import { eventManager } from '$lib/managers/event-manager.svelte';
+  import { modalManager } from '$lib/managers/modal-manager.svelte';
+  import VersionAnnouncementModal from '$lib/modals/VersionAnnouncementModal.svelte';
   import { serverConfig } from '$lib/stores/server-config.store';
   import { user } from '$lib/stores/user.store';
-  import { closeWebsocketConnection, openWebsocketConnection } from '$lib/stores/websocket';
+  import {
+    closeWebsocketConnection,
+    openWebsocketConnection,
+    websocketStore,
+    type ReleaseEvent,
+  } from '$lib/stores/websocket';
   import { copyToClipboard } from '$lib/utils';
   import { isAssetViewerRoute } from '$lib/utils/navigation';
+  import type { ServerVersionResponseDto } from '@immich/sdk';
   import { setTranslations } from '@immich/ui';
   import { onMount, type Snippet } from 'svelte';
   import { t } from 'svelte-i18n';
@@ -66,6 +73,32 @@
       closeWebsocketConnection();
     }
   });
+
+  const semverToName = ({ major, minor, patch }: ServerVersionResponseDto) => `v${major}.${minor}.${patch}`;
+  const { release } = websocketStore;
+
+  const handleRelease = async (release: ReleaseEvent) => {
+    if (!release.isAvailable || !$user.isAdmin) {
+      return;
+    }
+
+    const releaseVersion = semverToName(release.releaseVersion);
+    const serverVersion = semverToName(release.serverVersion);
+
+    if (localStorage.getItem('appVersion') === releaseVersion) {
+      return;
+    }
+
+    try {
+      await modalManager.show(VersionAnnouncementModal, { serverVersion, releaseVersion });
+
+      localStorage.setItem('appVersion', releaseVersion);
+    } catch (error) {
+      console.error('Error [VersionAnnouncementBox]:', error);
+    }
+  };
+
+  $effect(() => void handleRelease($release));
 </script>
 
 <svelte:head>
@@ -121,7 +154,3 @@
 <DownloadPanel />
 <UploadPanel />
 <NotificationList />
-
-{#if $user?.isAdmin}
-  <VersionAnnouncementBox />
-{/if}

From 03966146fe9597a5893ea7fbf0a0d6cc0de487b7 Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Mon, 23 Jun 2025 14:10:00 +0300
Subject: [PATCH 021/337] fix(server): filter parameters by database and role
 (#19392)

---
 .../migrations/1750323941566-UnsetPrewarmDimParameter.ts    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts b/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts
index 92f398235e..776b51d1db 100644
--- a/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts
+++ b/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts
@@ -2,7 +2,11 @@ import { Kysely, sql } from 'kysely';
 
 export async function up(qb: Kysely<any>): Promise<void> {
   type Conf = { db: string; guc: string[] };
-  const res = await sql<Conf>`select current_database() db, to_json(setconfig) guc from pg_db_role_setting`.execute(qb);
+  const res = await sql<Conf>`
+    select current_database() db, to_json(setconfig) guc
+    from pg_db_role_setting
+    where setdatabase = (select oid from pg_database where datname = current_database())
+      and setrole = 0;`.execute(qb);
   if (res.rows.length === 0) {
     return;
   }

From 3a9e79a452b766e6a7a73a3ece5a48951d998afd Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Mon, 23 Jun 2025 07:11:52 -0400
Subject: [PATCH 022/337] chore: optimize playwright gha (#19435)

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9b16713696..c30c58fec2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -461,7 +461,7 @@ jobs:
         if: ${{ !cancelled() }}
 
       - name: Install Playwright Browsers
-        run: npx playwright install --with-deps chromium
+        run: npx playwright install chromium --only-shell
         if: ${{ !cancelled() }}
 
       - name: Docker build

From 20d9204ada60aa2ed61d1a0636ae57cfcbb2ab88 Mon Sep 17 00:00:00 2001
From: fmis13 <fmis13@disroot.org>
Date: Mon, 23 Jun 2025 13:18:04 +0200
Subject: [PATCH 023/337] feat(mobile): enable Croatian (hr) translations
 (#19428)

---
 mobile/lib/constants/locales.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/lib/constants/locales.dart b/mobile/lib/constants/locales.dart
index 658242ea3a..b2d8df525b 100644
--- a/mobile/lib/constants/locales.dart
+++ b/mobile/lib/constants/locales.dart
@@ -11,6 +11,7 @@ const Map<String, Locale> locales = {
       Locale.fromSubtags(languageCode: 'zh', scriptCode: 'SIMPLIFIED'),
   'Chinese Traditional (zh_TW)':
       Locale.fromSubtags(languageCode: 'zh', scriptCode: 'Hant'),
+  'Croatian (hr)': Locale('hr'),
   'Czech (cs)': Locale('cs'),
   'Danish (da)': Locale('da'),
   'Dutch (nl)': Locale('nl'),

From 813186e618e736789834645678d2cc7785ef4666 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Mon, 23 Jun 2025 20:13:08 +0800
Subject: [PATCH 024/337] fix(web): undefined release (#19455)

Co-authored-by: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
---
 web/src/routes/+layout.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index 30f62e5861..4893513e0e 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -77,8 +77,8 @@
   const semverToName = ({ major, minor, patch }: ServerVersionResponseDto) => `v${major}.${minor}.${patch}`;
   const { release } = websocketStore;
 
-  const handleRelease = async (release: ReleaseEvent) => {
-    if (!release.isAvailable || !$user.isAdmin) {
+  const handleRelease = async (release?: ReleaseEvent) => {
+    if (!release?.isAvailable || !$user.isAdmin) {
       return;
     }
 

From 7f89999abe1ed4918c8a2ddfd445831b523ad2ad Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Mon, 23 Jun 2025 21:36:30 +0800
Subject: [PATCH 025/337] fix(web): toggle favorite (#19453)

---
 web/src/routes/(user)/people/+page.svelte | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/src/routes/(user)/people/+page.svelte b/web/src/routes/(user)/people/+page.svelte
index ead776c8b8..014614094e 100644
--- a/web/src/routes/(user)/people/+page.svelte
+++ b/web/src/routes/(user)/people/+page.svelte
@@ -203,8 +203,12 @@
         personUpdateDto: { isFavorite: !detail.isFavorite },
       });
 
-      const index = people.findIndex((person) => person.id === detail.id);
-      people[index] = updatedPerson;
+      people = people.map((person: PersonResponseDto) => {
+        if (person.id === updatedPerson.id) {
+          return updatedPerson;
+        }
+        return person;
+      });
 
       notificationController.show({
         message: updatedPerson.isFavorite ? $t('added_to_favorites') : $t('removed_from_favorites'),

From bcb1bf4692648ee595e907cc24eeda264a9a9f9a Mon Sep 17 00:00:00 2001
From: Matthew Momjian <50788000+mmomjian@users.noreply.github.com>
Date: Mon, 23 Jun 2025 09:54:26 -0400
Subject: [PATCH 026/337] fix(docs): portainer absolute paths (#19459)

absolute paths
---
 docs/docs/install/portainer.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/install/portainer.md b/docs/docs/install/portainer.md
index 5ff324e282..916d89a0d5 100644
--- a/docs/docs/install/portainer.md
+++ b/docs/docs/install/portainer.md
@@ -39,8 +39,8 @@ alt="Dot Env Example"
 />
 
 - Change the default `DB_PASSWORD`, and add custom database connection information if necessary.
-- Change `DB_DATA_LOCATION` to a folder where the database will be saved to disk.
-- Change `UPLOAD_LOCATION` to a folder where media (uploaded and generated) will be stored.
+- Change `DB_DATA_LOCATION` to a folder (absolute path) where the database will be saved to disk.
+- Change `UPLOAD_LOCATION` to a folder (absolute path) where media (uploaded and generated) will be stored.
 
 11. Click on "**Deploy the stack**".
 

From 6a309129b73edd22739602053cf7dd7895a99970 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Mon, 23 Jun 2025 22:06:26 +0800
Subject: [PATCH 027/337] fix(web): timeline timezone (#19418)

---
 web/src/lib/utils/timeline-util.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/src/lib/utils/timeline-util.ts b/web/src/lib/utils/timeline-util.ts
index c3e41c01be..7646d0d6d4 100644
--- a/web/src/lib/utils/timeline-util.ts
+++ b/web/src/lib/utils/timeline-util.ts
@@ -108,7 +108,6 @@ export function formatMonthGroupTitle(_date: DateTime): string {
     {
       month: 'short',
       year: 'numeric',
-      timeZone: 'UTC',
     },
     { locale: get(locale) },
   );

From ce14324c97c6818cc3369eb832f9cbdb8c14e237 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Mon, 23 Jun 2025 23:00:41 +0800
Subject: [PATCH 028/337] fix(web): oauth quota display (#19417)

* fix(web): oauth quota display

* fix(web): oauth quota display
---
 .../admin-page/server-stats/server-stats-panel.svelte       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/lib/components/admin-page/server-stats/server-stats-panel.svelte b/web/src/lib/components/admin-page/server-stats/server-stats-panel.svelte
index 2f8d391954..b9ceec7445 100644
--- a/web/src/lib/components/admin-page/server-stats/server-stats-panel.svelte
+++ b/web/src/lib/components/admin-page/server-stats/server-stats-panel.svelte
@@ -113,12 +113,12 @@
             >
             <td class="w-1/4 text-ellipsis px-2 text-sm">
               {getByteUnitString(user.usage, $locale, 0)}
-              {#if user.quotaSizeInBytes}
+              {#if user.quotaSizeInBytes !== null}
                 / {getByteUnitString(user.quotaSizeInBytes, $locale, 0)}
               {/if}
               <span class="text-immich-primary dark:text-immich-dark-primary">
-                {#if user.quotaSizeInBytes}
-                  ({(user.usage / user.quotaSizeInBytes).toLocaleString($locale, {
+                {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
+                  ({(user.quotaSizeInBytes === 0 ? 1 : user.usage / user.quotaSizeInBytes).toLocaleString($locale, {
                     style: 'percent',
                     maximumFractionDigits: 0,
                   })})

From 1923f1a8870fd6efe13f706ef5e640d809133156 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 23 Jun 2025 11:27:44 -0500
Subject: [PATCH 029/337] refactor(mobile): interfaces refactor (#19415)

* refactor(mobile): interfaces refactor

* generate files
---
 .../interfaces/asset_media.interface.dart     | 10 ------
 .../interfaces/device_asset.interface.dart    | 12 -------
 .../lib/domain/interfaces/exif.interface.dart | 14 --------
 .../interfaces/local_album.interface.dart     | 33 -------------------
 .../interfaces/local_asset.interface.dart     |  6 ----
 .../lib/domain/interfaces/log.interface.dart  | 17 ----------
 .../domain/interfaces/storage.interface.dart  |  7 ----
 .../domain/interfaces/store.interface.dart    | 20 -----------
 .../domain/interfaces/sync_api.interface.dart | 12 -------
 .../domain/interfaces/timeline.interface.dart | 27 ---------------
 mobile/lib/domain/services/hash.service.dart  | 18 +++++-----
 .../domain/services/local_sync.service.dart   |  6 ++--
 mobile/lib/domain/services/log.service.dart   | 16 ++++-----
 mobile/lib/domain/services/store.service.dart | 10 +++---
 .../domain/services/sync_stream.service.dart  |  6 ++--
 .../lib/domain/services/timeline.service.dart |  6 ++--
 .../repositories/asset_media.repository.dart  |  4 +--
 .../repositories/device_asset.repository.dart |  7 +---
 .../repositories/exif.repository.dart         |  9 +----
 .../repositories/local_album.repository.dart  | 15 ++-------
 .../repositories/local_asset.repository.dart  |  5 +--
 .../repositories/log.repository.dart          |  9 +----
 .../repositories/storage.repository.dart      |  4 +--
 .../repositories/store.repository.dart        | 12 +------
 .../repositories/sync_api.repository.dart     |  5 +--
 .../repositories/timeline.repository.dart     |  8 +----
 mobile/lib/interfaces/upload.interface.dart   | 11 -------
 mobile/lib/interfaces/widget.interface.dart   |  5 ---
 .../widgets/images/local_thumb_provider.dart  |  3 +-
 .../infrastructure/album.provider.dart        |  3 +-
 .../infrastructure/asset.provider.dart        |  3 +-
 .../infrastructure/device_asset.provider.dart |  3 +-
 .../infrastructure/exif.provider.dart         |  3 +-
 .../infrastructure/exif.provider.g.dart       |  6 ++--
 .../infrastructure/storage.provider.dart      |  3 +-
 .../infrastructure/store.provider.dart        |  3 +-
 .../infrastructure/store.provider.g.dart      |  6 ++--
 .../infrastructure/timeline.provider.dart     |  3 +-
 .../lib/repositories/upload.repository.dart   |  9 +----
 .../lib/repositories/widget.repository.dart   |  6 +---
 mobile/lib/services/asset.service.dart        |  4 +--
 .../services/backup_verification.service.dart |  4 +--
 mobile/lib/services/exif.service.dart         |  4 +--
 mobile/lib/services/hash.service.dart         |  6 ++--
 mobile/lib/services/sync.service.dart         |  4 +--
 mobile/lib/services/upload.service.dart       |  3 +-
 mobile/lib/services/widget.service.dart       |  3 +-
 .../domain/services/hash_service_test.dart    |  2 +-
 .../domain/services/log_service_test.dart     |  8 ++---
 .../domain/services/store_service_test.dart   |  4 +--
 .../services/sync_stream_service_test.dart    |  4 +--
 .../repositories/exif_repository_test.dart    |  3 +-
 .../local_album_repository_test.dart          |  4 +--
 .../repositories/store_repository_test.dart   |  3 +-
 .../test/infrastructure/repository.mock.dart  | 30 +++++++++--------
 mobile/test/repository.mocks.dart             |  4 +--
 mobile/test/services/hash_service_test.dart   |  4 +--
 mobile/test/test_utils/medium_factory.dart    |  3 +-
 58 files changed, 106 insertions(+), 356 deletions(-)
 delete mode 100644 mobile/lib/domain/interfaces/asset_media.interface.dart
 delete mode 100644 mobile/lib/domain/interfaces/device_asset.interface.dart
 delete mode 100644 mobile/lib/domain/interfaces/exif.interface.dart
 delete mode 100644 mobile/lib/domain/interfaces/local_album.interface.dart
 delete mode 100644 mobile/lib/domain/interfaces/local_asset.interface.dart
 delete mode 100644 mobile/lib/domain/interfaces/log.interface.dart
 delete mode 100644 mobile/lib/domain/interfaces/storage.interface.dart
 delete mode 100644 mobile/lib/domain/interfaces/store.interface.dart
 delete mode 100644 mobile/lib/domain/interfaces/sync_api.interface.dart
 delete mode 100644 mobile/lib/domain/interfaces/timeline.interface.dart
 delete mode 100644 mobile/lib/interfaces/upload.interface.dart
 delete mode 100644 mobile/lib/interfaces/widget.interface.dart

diff --git a/mobile/lib/domain/interfaces/asset_media.interface.dart b/mobile/lib/domain/interfaces/asset_media.interface.dart
deleted file mode 100644
index 93f99827ee..0000000000
--- a/mobile/lib/domain/interfaces/asset_media.interface.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-import 'dart:typed_data';
-import 'dart:ui';
-
-abstract interface class IAssetMediaRepository {
-  Future<Uint8List?> getThumbnail(
-    String id, {
-    int quality = 80,
-    Size size = const Size.square(256),
-  });
-}
diff --git a/mobile/lib/domain/interfaces/device_asset.interface.dart b/mobile/lib/domain/interfaces/device_asset.interface.dart
deleted file mode 100644
index 1df8cc2250..0000000000
--- a/mobile/lib/domain/interfaces/device_asset.interface.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'dart:async';
-
-import 'package:immich_mobile/domain/interfaces/db.interface.dart';
-import 'package:immich_mobile/domain/models/device_asset.model.dart';
-
-abstract interface class IDeviceAssetRepository implements IDatabaseRepository {
-  Future<bool> updateAll(List<DeviceAsset> assetHash);
-
-  Future<List<DeviceAsset>> getByIds(List<String> localIds);
-
-  Future<void> deleteIds(List<String> ids);
-}
diff --git a/mobile/lib/domain/interfaces/exif.interface.dart b/mobile/lib/domain/interfaces/exif.interface.dart
deleted file mode 100644
index a5de6167e9..0000000000
--- a/mobile/lib/domain/interfaces/exif.interface.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'package:immich_mobile/domain/interfaces/db.interface.dart';
-import 'package:immich_mobile/domain/models/exif.model.dart';
-
-abstract interface class IExifInfoRepository implements IDatabaseRepository {
-  Future<ExifInfo?> get(int assetId);
-
-  Future<ExifInfo> update(ExifInfo exifInfo);
-
-  Future<List<ExifInfo>> updateAll(List<ExifInfo> exifInfos);
-
-  Future<void> delete(int assetId);
-
-  Future<void> deleteAll();
-}
diff --git a/mobile/lib/domain/interfaces/local_album.interface.dart b/mobile/lib/domain/interfaces/local_album.interface.dart
deleted file mode 100644
index 1df62954d2..0000000000
--- a/mobile/lib/domain/interfaces/local_album.interface.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'package:immich_mobile/domain/interfaces/db.interface.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/local_album.model.dart';
-
-abstract interface class ILocalAlbumRepository implements IDatabaseRepository {
-  Future<List<LocalAlbum>> getAll({Set<SortLocalAlbumsBy> sortBy = const {}});
-
-  Future<List<LocalAsset>> getAssets(String albumId);
-
-  Future<List<String>> getAssetIds(String albumId);
-
-  Future<void> upsert(
-    LocalAlbum album, {
-    Iterable<LocalAsset> toUpsert = const [],
-    Iterable<String> toDelete = const [],
-  });
-
-  Future<void> updateAll(Iterable<LocalAlbum> albums);
-
-  Future<void> delete(String albumId);
-
-  Future<void> processDelta({
-    required List<LocalAsset> updates,
-    required List<String> deletes,
-    required Map<String, List<String>> assetAlbums,
-  });
-
-  Future<void> syncDeletes(String albumId, Iterable<String> assetIdsToKeep);
-
-  Future<List<LocalAsset>> getAssetsToHash(String albumId);
-}
-
-enum SortLocalAlbumsBy { id, backupSelection, isIosSharedAlbum }
diff --git a/mobile/lib/domain/interfaces/local_asset.interface.dart b/mobile/lib/domain/interfaces/local_asset.interface.dart
deleted file mode 100644
index 5792ebe5d9..0000000000
--- a/mobile/lib/domain/interfaces/local_asset.interface.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-import 'package:immich_mobile/domain/interfaces/db.interface.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-
-abstract interface class ILocalAssetRepository implements IDatabaseRepository {
-  Future<void> updateHashes(Iterable<LocalAsset> hashes);
-}
diff --git a/mobile/lib/domain/interfaces/log.interface.dart b/mobile/lib/domain/interfaces/log.interface.dart
deleted file mode 100644
index 27e91c5488..0000000000
--- a/mobile/lib/domain/interfaces/log.interface.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'dart:async';
-
-import 'package:immich_mobile/domain/interfaces/db.interface.dart';
-import 'package:immich_mobile/domain/models/log.model.dart';
-
-abstract interface class ILogRepository implements IDatabaseRepository {
-  Future<bool> insert(LogMessage log);
-
-  Future<bool> insertAll(Iterable<LogMessage> logs);
-
-  Future<List<LogMessage>> getAll();
-
-  Future<bool> deleteAll();
-
-  /// Truncates the logs to the most recent [limit]. Defaults to recent 250 logs
-  Future<void> truncate({int limit = 250});
-}
diff --git a/mobile/lib/domain/interfaces/storage.interface.dart b/mobile/lib/domain/interfaces/storage.interface.dart
deleted file mode 100644
index ea6513e7f2..0000000000
--- a/mobile/lib/domain/interfaces/storage.interface.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'dart:io';
-
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-
-abstract interface class IStorageRepository {
-  Future<File?> getFileForAsset(LocalAsset asset);
-}
diff --git a/mobile/lib/domain/interfaces/store.interface.dart b/mobile/lib/domain/interfaces/store.interface.dart
deleted file mode 100644
index b0a6762566..0000000000
--- a/mobile/lib/domain/interfaces/store.interface.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-import 'package:immich_mobile/domain/interfaces/db.interface.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-
-abstract interface class IStoreRepository implements IDatabaseRepository {
-  Future<bool> insert<T>(StoreKey<T> key, T value);
-
-  Future<T?> tryGet<T>(StoreKey<T> key);
-
-  Future<List<StoreDto<Object>>> getAll();
-
-  Stream<T?> watch<T>(StoreKey<T> key);
-
-  Stream<StoreDto<Object>> watchAll();
-
-  Future<bool> update<T>(StoreKey<T> key, T value);
-
-  Future<void> delete<T>(StoreKey<T> key);
-
-  Future<void> deleteAll();
-}
diff --git a/mobile/lib/domain/interfaces/sync_api.interface.dart b/mobile/lib/domain/interfaces/sync_api.interface.dart
deleted file mode 100644
index 57abed2e7f..0000000000
--- a/mobile/lib/domain/interfaces/sync_api.interface.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'package:http/http.dart' as http;
-import 'package:immich_mobile/domain/models/sync_event.model.dart';
-
-abstract interface class ISyncApiRepository {
-  Future<void> ack(List<String> data);
-
-  Future<void> streamChanges(
-    Function(List<SyncEvent>, Function() abort) onData, {
-    int batchSize,
-    http.Client? httpClient,
-  });
-}
diff --git a/mobile/lib/domain/interfaces/timeline.interface.dart b/mobile/lib/domain/interfaces/timeline.interface.dart
deleted file mode 100644
index e60dd83b50..0000000000
--- a/mobile/lib/domain/interfaces/timeline.interface.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-import 'package:immich_mobile/domain/interfaces/db.interface.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/timeline.model.dart';
-
-abstract interface class ITimelineRepository implements IDatabaseRepository {
-  Stream<List<Bucket>> watchMainBucket(
-    List<String> timelineUsers, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  });
-
-  Future<List<BaseAsset>> getMainBucketAssets(
-    List<String> timelineUsers, {
-    required int offset,
-    required int count,
-  });
-
-  Stream<List<Bucket>> watchLocalBucket(
-    String albumId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  });
-
-  Future<List<BaseAsset>> getLocalBucketAssets(
-    String albumId, {
-    required int offset,
-    required int count,
-  });
-}
diff --git a/mobile/lib/domain/services/hash.service.dart b/mobile/lib/domain/services/hash.service.dart
index d8ad3dc2dc..87579067c8 100644
--- a/mobile/lib/domain/services/hash.service.dart
+++ b/mobile/lib/domain/services/hash.service.dart
@@ -1,10 +1,10 @@
 import 'dart:convert';
 
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/interfaces/local_album.interface.dart';
-import 'package:immich_mobile/domain/interfaces/local_asset.interface.dart';
-import 'package:immich_mobile/domain/interfaces/storage.interface.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.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/storage.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/presentation/pages/dev/dev_logger.dart';
 import 'package:logging/logging.dart';
@@ -12,16 +12,16 @@ import 'package:logging/logging.dart';
 class HashService {
   final int batchSizeLimit;
   final int batchFileLimit;
-  final ILocalAlbumRepository _localAlbumRepository;
-  final ILocalAssetRepository _localAssetRepository;
-  final IStorageRepository _storageRepository;
+  final DriftLocalAlbumRepository _localAlbumRepository;
+  final DriftLocalAssetRepository _localAssetRepository;
+  final StorageRepository _storageRepository;
   final NativeSyncApi _nativeSyncApi;
   final _log = Logger('HashService');
 
   HashService({
-    required ILocalAlbumRepository localAlbumRepository,
-    required ILocalAssetRepository localAssetRepository,
-    required IStorageRepository storageRepository,
+    required DriftLocalAlbumRepository localAlbumRepository,
+    required DriftLocalAssetRepository localAssetRepository,
+    required StorageRepository storageRepository,
     required NativeSyncApi nativeSyncApi,
     this.batchSizeLimit = kBatchHashSizeLimit,
     this.batchFileLimit = kBatchHashFileLimit,
diff --git a/mobile/lib/domain/services/local_sync.service.dart b/mobile/lib/domain/services/local_sync.service.dart
index ff77ebd83e..2fdb0e82c5 100644
--- a/mobile/lib/domain/services/local_sync.service.dart
+++ b/mobile/lib/domain/services/local_sync.service.dart
@@ -2,11 +2,11 @@ import 'dart:async';
 
 import 'package:collection/collection.dart';
 import 'package:flutter/widgets.dart';
-import 'package:immich_mobile/domain/interfaces/local_album.interface.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/local_album.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/presentation/pages/dev/dev_logger.dart';
 import 'package:immich_mobile/utils/diff.dart';
@@ -14,14 +14,14 @@ import 'package:logging/logging.dart';
 import 'package:platform/platform.dart';
 
 class LocalSyncService {
-  final ILocalAlbumRepository _localAlbumRepository;
+  final DriftLocalAlbumRepository _localAlbumRepository;
   final NativeSyncApi _nativeSyncApi;
   final Platform _platform;
   final StoreService _storeService;
   final Logger _log = Logger("DeviceSyncService");
 
   LocalSyncService({
-    required ILocalAlbumRepository localAlbumRepository,
+    required DriftLocalAlbumRepository localAlbumRepository,
     required NativeSyncApi nativeSyncApi,
     required StoreService storeService,
     Platform? platform,
diff --git a/mobile/lib/domain/services/log.service.dart b/mobile/lib/domain/services/log.service.dart
index a25147d185..c52665f093 100644
--- a/mobile/lib/domain/services/log.service.dart
+++ b/mobile/lib/domain/services/log.service.dart
@@ -2,10 +2,10 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/interfaces/log.interface.dart';
-import 'package:immich_mobile/domain/interfaces/store.interface.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:logging/logging.dart';
 
 /// Service responsible for handling application logging.
@@ -14,8 +14,8 @@ import 'package:logging/logging.dart';
 /// writes them to a persistent [ILogRepository], and manages log levels
 /// via [IStoreRepository]
 class LogService {
-  final ILogRepository _logRepository;
-  final IStoreRepository _storeRepository;
+  final IsarLogRepository _logRepository;
+  final IsarStoreRepository _storeRepository;
 
   final List<LogMessage> _msgBuffer = [];
 
@@ -37,8 +37,8 @@ class LogService {
   }
 
   static Future<LogService> init({
-    required ILogRepository logRepository,
-    required IStoreRepository storeRepository,
+    required IsarLogRepository logRepository,
+    required IsarStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
     _instance ??= await create(
@@ -50,8 +50,8 @@ class LogService {
   }
 
   static Future<LogService> create({
-    required ILogRepository logRepository,
-    required IStoreRepository storeRepository,
+    required IsarLogRepository logRepository,
+    required IsarStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
     final instance = LogService._(logRepository, storeRepository, shouldBuffer);
diff --git a/mobile/lib/domain/services/store.service.dart b/mobile/lib/domain/services/store.service.dart
index 7b71acd254..359ce8cf60 100644
--- a/mobile/lib/domain/services/store.service.dart
+++ b/mobile/lib/domain/services/store.service.dart
@@ -1,18 +1,18 @@
 import 'dart:async';
 
-import 'package:immich_mobile/domain/interfaces/store.interface.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 
 /// Provides access to a persistent key-value store with an in-memory cache.
 /// Listens for repository changes to keep the cache updated.
 class StoreService {
-  final IStoreRepository _storeRepository;
+  final IsarStoreRepository _storeRepository;
 
   /// In-memory cache. Keys are [StoreKey.id]
   final Map<int, Object?> _cache = {};
   late final StreamSubscription<StoreDto> _storeUpdateSubscription;
 
-  StoreService._({required IStoreRepository storeRepository})
+  StoreService._({required IsarStoreRepository storeRepository})
       : _storeRepository = storeRepository;
 
   // TODO: Temporary typedef to make minimal changes. Remove this and make the presentation layer access store through a provider
@@ -26,14 +26,14 @@ class StoreService {
 
   // TODO: Replace the implementation with the one from create after removing the typedef
   static Future<StoreService> init({
-    required IStoreRepository storeRepository,
+    required IsarStoreRepository storeRepository,
   }) async {
     _instance ??= await create(storeRepository: storeRepository);
     return _instance!;
   }
 
   static Future<StoreService> create({
-    required IStoreRepository storeRepository,
+    required IsarStoreRepository storeRepository,
   }) async {
     final instance = StoreService._(storeRepository: storeRepository);
     await instance._populateCache();
diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index f8c76b9543..d612e83368 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:immich_mobile/domain/interfaces/sync_api.interface.dart';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
@@ -9,12 +9,12 @@ import 'package:openapi/api.dart';
 class SyncStreamService {
   final Logger _logger = Logger('SyncStreamService');
 
-  final ISyncApiRepository _syncApiRepository;
+  final SyncApiRepository _syncApiRepository;
   final SyncStreamRepository _syncStreamRepository;
   final bool Function()? _cancelChecker;
 
   SyncStreamService({
-    required ISyncApiRepository syncApiRepository,
+    required SyncApiRepository syncApiRepository,
     required SyncStreamRepository syncStreamRepository,
     bool Function()? cancelChecker,
   })  : _syncApiRepository = syncApiRepository,
diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index d1211f46e2..225f7a89b1 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -3,11 +3,11 @@ import 'dart:math' as math;
 
 import 'package:collection/collection.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/interfaces/timeline.interface.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
 
 typedef TimelineAssetSource = Future<List<BaseAsset>> Function(
@@ -18,11 +18,11 @@ typedef TimelineAssetSource = Future<List<BaseAsset>> Function(
 typedef TimelineBucketSource = Stream<List<Bucket>> Function();
 
 class TimelineFactory {
-  final ITimelineRepository _timelineRepository;
+  final DriftTimelineRepository _timelineRepository;
   final SettingsService _settingsService;
 
   const TimelineFactory({
-    required ITimelineRepository timelineRepository,
+    required DriftTimelineRepository timelineRepository,
     required SettingsService settingsService,
   })  : _timelineRepository = timelineRepository,
         _settingsService = settingsService;
diff --git a/mobile/lib/infrastructure/repositories/asset_media.repository.dart b/mobile/lib/infrastructure/repositories/asset_media.repository.dart
index d46c340028..e8bf9ace43 100644
--- a/mobile/lib/infrastructure/repositories/asset_media.repository.dart
+++ b/mobile/lib/infrastructure/repositories/asset_media.repository.dart
@@ -1,13 +1,11 @@
 import 'dart:typed_data';
 import 'dart:ui';
 
-import 'package:immich_mobile/domain/interfaces/asset_media.interface.dart';
 import 'package:photo_manager/photo_manager.dart';
 
-class AssetMediaRepository implements IAssetMediaRepository {
+class AssetMediaRepository {
   const AssetMediaRepository();
 
-  @override
   Future<Uint8List?> getThumbnail(
     String id, {
     int quality = 80,
diff --git a/mobile/lib/infrastructure/repositories/device_asset.repository.dart b/mobile/lib/infrastructure/repositories/device_asset.repository.dart
index 87784ecaab..4e72d4a7f6 100644
--- a/mobile/lib/infrastructure/repositories/device_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/device_asset.repository.dart
@@ -1,23 +1,19 @@
-import 'package:immich_mobile/domain/interfaces/device_asset.interface.dart';
 import 'package:immich_mobile/domain/models/device_asset.model.dart';
 import 'package:immich_mobile/infrastructure/entities/device_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:isar/isar.dart';
 
-class IsarDeviceAssetRepository extends IsarDatabaseRepository
-    implements IDeviceAssetRepository {
+class IsarDeviceAssetRepository extends IsarDatabaseRepository {
   final Isar _db;
 
   const IsarDeviceAssetRepository(this._db) : super(_db);
 
-  @override
   Future<void> deleteIds(List<String> ids) {
     return transaction(() async {
       await _db.deviceAssetEntitys.deleteAllByAssetId(ids.toList());
     });
   }
 
-  @override
   Future<List<DeviceAsset>> getByIds(List<String> localIds) {
     return _db.deviceAssetEntitys
         .where()
@@ -26,7 +22,6 @@ class IsarDeviceAssetRepository extends IsarDatabaseRepository
         .then((value) => value.map((e) => e.toModel()).toList());
   }
 
-  @override
   Future<bool> updateAll(List<DeviceAsset> assetHash) {
     return transaction(() async {
       await _db.deviceAssetEntitys
diff --git a/mobile/lib/infrastructure/repositories/exif.repository.dart b/mobile/lib/infrastructure/repositories/exif.repository.dart
index 2b4276dd57..0012e329ca 100644
--- a/mobile/lib/infrastructure/repositories/exif.repository.dart
+++ b/mobile/lib/infrastructure/repositories/exif.repository.dart
@@ -1,36 +1,30 @@
-import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
     as entity;
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:isar/isar.dart';
 
-class IsarExifRepository extends IsarDatabaseRepository
-    implements IExifInfoRepository {
+class IsarExifRepository extends IsarDatabaseRepository {
   final Isar _db;
 
   const IsarExifRepository(this._db) : super(_db);
 
-  @override
   Future<void> delete(int assetId) async {
     await transaction(() async {
       await _db.exifInfos.delete(assetId);
     });
   }
 
-  @override
   Future<void> deleteAll() async {
     await transaction(() async {
       await _db.exifInfos.clear();
     });
   }
 
-  @override
   Future<ExifInfo?> get(int assetId) async {
     return (await _db.exifInfos.get(assetId))?.toDto();
   }
 
-  @override
   Future<ExifInfo> update(ExifInfo exifInfo) {
     return transaction(() async {
       await _db.exifInfos.put(entity.ExifInfo.fromDto(exifInfo));
@@ -38,7 +32,6 @@ class IsarExifRepository extends IsarDatabaseRepository
     });
   }
 
-  @override
   Future<List<ExifInfo>> updateAll(List<ExifInfo> exifInfos) {
     return transaction(() async {
       await _db.exifInfos.putAll(
diff --git a/mobile/lib/infrastructure/repositories/local_album.repository.dart b/mobile/lib/infrastructure/repositories/local_album.repository.dart
index 4f46b9b408..e5f8c7b526 100644
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -1,5 +1,4 @@
 import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/interfaces/local_album.interface.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/local_album.model.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';
@@ -8,15 +7,15 @@ import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.d
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:platform/platform.dart';
 
-class DriftLocalAlbumRepository extends DriftDatabaseRepository
-    implements ILocalAlbumRepository {
+enum SortLocalAlbumsBy { id, backupSelection, isIosSharedAlbum }
+
+class DriftLocalAlbumRepository extends DriftDatabaseRepository {
   final Drift _db;
   final Platform _platform;
   const DriftLocalAlbumRepository(this._db, {Platform? platform})
       : _platform = platform ?? const LocalPlatform(),
         super(_db);
 
-  @override
   Future<List<LocalAlbum>> getAll({Set<SortLocalAlbumsBy> sortBy = const {}}) {
     final assetCount = _db.localAlbumAssetEntity.assetId.count();
 
@@ -56,7 +55,6 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository
         .get();
   }
 
-  @override
   Future<void> delete(String albumId) => transaction(() async {
         // Remove all assets that are only in this particular album
         // We cannot remove all assets in the album because they might be in other albums in iOS
@@ -72,7 +70,6 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository
             .delete();
       });
 
-  @override
   Future<void> syncDeletes(
     String albumId,
     Iterable<String> assetIdsToKeep,
@@ -101,7 +98,6 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository
     await deleteSmt.go();
   }
 
-  @override
   Future<void> upsert(
     LocalAlbum localAlbum, {
     Iterable<LocalAsset> toUpsert = const [],
@@ -134,7 +130,6 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository
     });
   }
 
-  @override
   Future<void> updateAll(Iterable<LocalAlbum> albums) {
     return _db.transaction(() async {
       await _db.localAlbumEntity
@@ -185,7 +180,6 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository
     });
   }
 
-  @override
   Future<List<LocalAsset>> getAssets(String albumId) {
     final query = _db.localAlbumAssetEntity.select().join(
       [
@@ -202,7 +196,6 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository
         .get();
   }
 
-  @override
   Future<List<String>> getAssetIds(String albumId) {
     final query = _db.localAlbumAssetEntity.selectOnly()
       ..addColumns([_db.localAlbumAssetEntity.assetId])
@@ -212,7 +205,6 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository
         .get();
   }
 
-  @override
   Future<void> processDelta({
     required List<LocalAsset> updates,
     required List<String> deletes,
@@ -253,7 +245,6 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository
     });
   }
 
-  @override
   Future<List<LocalAsset>> getAssetsToHash(String albumId) {
     final query = _db.localAlbumAssetEntity.select().join(
       [
diff --git a/mobile/lib/infrastructure/repositories/local_asset.repository.dart b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
index 350a8dcd32..2efa04cc1b 100644
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -1,15 +1,12 @@
 import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/interfaces/local_asset.interface.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
-class DriftLocalAssetRepository extends DriftDatabaseRepository
-    implements ILocalAssetRepository {
+class DriftLocalAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
   const DriftLocalAssetRepository(this._db) : super(_db);
 
-  @override
   Future<void> updateHashes(Iterable<LocalAsset> hashes) {
     if (hashes.isEmpty) {
       return Future.value();
diff --git a/mobile/lib/infrastructure/repositories/log.repository.dart b/mobile/lib/infrastructure/repositories/log.repository.dart
index 6ff128f93b..717900910a 100644
--- a/mobile/lib/infrastructure/repositories/log.repository.dart
+++ b/mobile/lib/infrastructure/repositories/log.repository.dart
@@ -1,28 +1,23 @@
-import 'package:immich_mobile/domain/interfaces/log.interface.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/infrastructure/entities/log.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:isar/isar.dart';
 
-class IsarLogRepository extends IsarDatabaseRepository
-    implements ILogRepository {
+class IsarLogRepository extends IsarDatabaseRepository {
   final Isar _db;
   const IsarLogRepository(super.db) : _db = db;
 
-  @override
   Future<bool> deleteAll() async {
     await transaction(() async => await _db.loggerMessages.clear());
     return true;
   }
 
-  @override
   Future<List<LogMessage>> getAll() async {
     final logs =
         await _db.loggerMessages.where().sortByCreatedAtDesc().findAll();
     return logs.map((l) => l.toDto()).toList();
   }
 
-  @override
   Future<bool> insert(LogMessage log) async {
     final logEntity = LoggerMessage.fromDto(log);
     await transaction(() async {
@@ -31,7 +26,6 @@ class IsarLogRepository extends IsarDatabaseRepository
     return true;
   }
 
-  @override
   Future<bool> insertAll(Iterable<LogMessage> logs) async {
     await transaction(() async {
       final logEntities =
@@ -41,7 +35,6 @@ class IsarLogRepository extends IsarDatabaseRepository
     return true;
   }
 
-  @override
   Future<void> truncate({int limit = 250}) async {
     await transaction(() async {
       final count = await _db.loggerMessages.count();
diff --git a/mobile/lib/infrastructure/repositories/storage.repository.dart b/mobile/lib/infrastructure/repositories/storage.repository.dart
index 57dfc42135..2b6b616d87 100644
--- a/mobile/lib/infrastructure/repositories/storage.repository.dart
+++ b/mobile/lib/infrastructure/repositories/storage.repository.dart
@@ -1,14 +1,12 @@
 import 'dart:io';
 
-import 'package:immich_mobile/domain/interfaces/storage.interface.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';
 
-class StorageRepository implements IStorageRepository {
+class StorageRepository {
   final _log = Logger('StorageRepository');
 
-  @override
   Future<File?> getFileForAsset(LocalAsset asset) async {
     File? file;
     try {
diff --git a/mobile/lib/infrastructure/repositories/store.repository.dart b/mobile/lib/infrastructure/repositories/store.repository.dart
index fec36193bc..400c8ccf7d 100644
--- a/mobile/lib/infrastructure/repositories/store.repository.dart
+++ b/mobile/lib/infrastructure/repositories/store.repository.dart
@@ -1,4 +1,3 @@
-import 'package:immich_mobile/domain/interfaces/store.interface.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
@@ -6,14 +5,12 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:isar/isar.dart';
 
-class IsarStoreRepository extends IsarDatabaseRepository
-    implements IStoreRepository {
+class IsarStoreRepository extends IsarDatabaseRepository {
   final Isar _db;
   final validStoreKeys = StoreKey.values.map((e) => e.id).toSet();
 
   IsarStoreRepository(super.db) : _db = db;
 
-  @override
   Future<bool> deleteAll() async {
     return await transaction(() async {
       await _db.storeValues.clear();
@@ -21,7 +18,6 @@ class IsarStoreRepository extends IsarDatabaseRepository
     });
   }
 
-  @override
   Stream<StoreDto<Object>> watchAll() {
     return _db.storeValues
         .filter()
@@ -34,12 +30,10 @@ class IsarStoreRepository extends IsarDatabaseRepository
         );
   }
 
-  @override
   Future<void> delete<T>(StoreKey<T> key) async {
     return await transaction(() async => await _db.storeValues.delete(key.id));
   }
 
-  @override
   Future<bool> insert<T>(StoreKey<T> key, T value) async {
     return await transaction(() async {
       await _db.storeValues.put(await _fromValue(key, value));
@@ -47,7 +41,6 @@ class IsarStoreRepository extends IsarDatabaseRepository
     });
   }
 
-  @override
   Future<T?> tryGet<T>(StoreKey<T> key) async {
     final entity = (await _db.storeValues.get(key.id));
     if (entity == null) {
@@ -56,7 +49,6 @@ class IsarStoreRepository extends IsarDatabaseRepository
     return await _toValue(key, entity);
   }
 
-  @override
   Future<bool> update<T>(StoreKey<T> key, T value) async {
     return await transaction(() async {
       await _db.storeValues.put(await _fromValue(key, value));
@@ -64,7 +56,6 @@ class IsarStoreRepository extends IsarDatabaseRepository
     });
   }
 
-  @override
   Stream<T?> watch<T>(StoreKey<T> key) async* {
     yield* _db.storeValues
         .watchObject(key.id, fireImmediately: true)
@@ -109,7 +100,6 @@ class IsarStoreRepository extends IsarDatabaseRepository
     return StoreValue(key.id, intValue: intValue, strValue: strValue);
   }
 
-  @override
   Future<List<StoreDto<Object>>> getAll() async {
     final entities = await _db.storeValues
         .filter()
diff --git a/mobile/lib/infrastructure/repositories/sync_api.repository.dart b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
index ca24eef60f..f14773fc4d 100644
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -3,24 +3,21 @@ import 'dart:convert';
 
 import 'package:http/http.dart' as http;
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/interfaces/sync_api.interface.dart';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/presentation/pages/dev/dev_logger.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
-class SyncApiRepository implements ISyncApiRepository {
+class SyncApiRepository {
   final Logger _logger = Logger('SyncApiRepository');
   final ApiService _api;
   SyncApiRepository(this._api);
 
-  @override
   Future<void> ack(List<String> data) {
     return _api.syncApi.sendSyncAck(SyncAckSetDto(acks: data));
   }
 
-  @override
   Future<void> streamChanges(
     Function(List<SyncEvent>, Function() abort) onData, {
     int batchSize = kSyncEventBatchSize,
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 909332ec6e..add327cf00 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -3,15 +3,13 @@ import 'dart:async';
 import 'package:drift/drift.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/interfaces/timeline.interface.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:stream_transform/stream_transform.dart';
 
-class DriftTimelineRepository extends DriftDatabaseRepository
-    implements ITimelineRepository {
+class DriftTimelineRepository extends DriftDatabaseRepository {
   final Drift _db;
 
   const DriftTimelineRepository(super._db) : _db = _db;
@@ -28,7 +26,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository
     return buckets;
   }
 
-  @override
   Stream<List<Bucket>> watchMainBucket(
     List<String> userIds, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
@@ -49,7 +46,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository
         .throttle(const Duration(seconds: 3), trailing: true);
   }
 
-  @override
   Future<List<BaseAsset>> getMainBucketAssets(
     List<String> userIds, {
     required int offset,
@@ -90,7 +86,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository
         .get();
   }
 
-  @override
   Stream<List<Bucket>> watchLocalBucket(
     String albumId, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
@@ -124,7 +119,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository
     }).watch();
   }
 
-  @override
   Future<List<BaseAsset>> getLocalBucketAssets(
     String albumId, {
     required int offset,
diff --git a/mobile/lib/interfaces/upload.interface.dart b/mobile/lib/interfaces/upload.interface.dart
deleted file mode 100644
index d4b2298a14..0000000000
--- a/mobile/lib/interfaces/upload.interface.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-import 'package:background_downloader/background_downloader.dart';
-
-abstract interface class IUploadRepository {
-  void Function(TaskStatusUpdate)? onUploadStatus;
-  void Function(TaskProgressUpdate)? onTaskProgress;
-
-  Future<bool> upload(UploadTask task);
-  Future<bool> cancel(String id);
-  Future<void> deleteAllTrackingRecords();
-  Future<void> deleteRecordsWithIds(List<String> id);
-}
diff --git a/mobile/lib/interfaces/widget.interface.dart b/mobile/lib/interfaces/widget.interface.dart
deleted file mode 100644
index f76fbef8de..0000000000
--- a/mobile/lib/interfaces/widget.interface.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-abstract interface class IWidgetRepository {
-  Future<void> saveData(String key, String value);
-  Future<void> refresh(String name);
-  Future<void> setAppGroupId(String appGroupId);
-}
diff --git a/mobile/lib/presentation/widgets/images/local_thumb_provider.dart b/mobile/lib/presentation/widgets/images/local_thumb_provider.dart
index 607057cf44..11b2f2b08e 100644
--- a/mobile/lib/presentation/widgets/images/local_thumb_provider.dart
+++ b/mobile/lib/presentation/widgets/images/local_thumb_provider.dart
@@ -4,14 +4,13 @@ import 'dart:ui';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:immich_mobile/domain/interfaces/asset_media.interface.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/providers/image/cache/thumbnail_image_cache_manager.dart';
 
 class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
-  final IAssetMediaRepository _assetMediaRepository =
+  final AssetMediaRepository _assetMediaRepository =
       const AssetMediaRepository();
   final CacheManager? cacheManager;
 
diff --git a/mobile/lib/providers/infrastructure/album.provider.dart b/mobile/lib/providers/infrastructure/album.provider.dart
index cb4aadb8a7..6a48073196 100644
--- a/mobile/lib/providers/infrastructure/album.provider.dart
+++ b/mobile/lib/providers/infrastructure/album.provider.dart
@@ -1,8 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/interfaces/local_album.interface.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 
-final localAlbumRepository = Provider<ILocalAlbumRepository>(
+final localAlbumRepository = Provider<DriftLocalAlbumRepository>(
   (ref) => DriftLocalAlbumRepository(ref.watch(driftProvider)),
 );
diff --git a/mobile/lib/providers/infrastructure/asset.provider.dart b/mobile/lib/providers/infrastructure/asset.provider.dart
index d714571473..9faef5a53f 100644
--- a/mobile/lib/providers/infrastructure/asset.provider.dart
+++ b/mobile/lib/providers/infrastructure/asset.provider.dart
@@ -1,8 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/interfaces/local_asset.interface.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 
-final localAssetRepository = Provider<ILocalAssetRepository>(
+final localAssetRepository = Provider<DriftLocalAssetRepository>(
   (ref) => DriftLocalAssetRepository(ref.watch(driftProvider)),
 );
diff --git a/mobile/lib/providers/infrastructure/device_asset.provider.dart b/mobile/lib/providers/infrastructure/device_asset.provider.dart
index 5fa532b9ec..7854af016a 100644
--- a/mobile/lib/providers/infrastructure/device_asset.provider.dart
+++ b/mobile/lib/providers/infrastructure/device_asset.provider.dart
@@ -1,8 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/interfaces/device_asset.interface.dart';
 import 'package:immich_mobile/infrastructure/repositories/device_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 
-final deviceAssetRepositoryProvider = Provider<IDeviceAssetRepository>(
+final deviceAssetRepositoryProvider = Provider<IsarDeviceAssetRepository>(
   (ref) => IsarDeviceAssetRepository(ref.watch(isarProvider)),
 );
diff --git a/mobile/lib/providers/infrastructure/exif.provider.dart b/mobile/lib/providers/infrastructure/exif.provider.dart
index ecb67dd2fe..59ad632927 100644
--- a/mobile/lib/providers/infrastructure/exif.provider.dart
+++ b/mobile/lib/providers/infrastructure/exif.provider.dart
@@ -1,5 +1,4 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/infrastructure/repositories/exif.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -7,5 +6,5 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'exif.provider.g.dart';
 
 @Riverpod(keepAlive: true)
-IExifInfoRepository exifRepository(Ref ref) =>
+IsarExifRepository exifRepository(Ref ref) =>
     IsarExifRepository(ref.watch(isarProvider));
diff --git a/mobile/lib/providers/infrastructure/exif.provider.g.dart b/mobile/lib/providers/infrastructure/exif.provider.g.dart
index 053abf18cc..0261558707 100644
--- a/mobile/lib/providers/infrastructure/exif.provider.g.dart
+++ b/mobile/lib/providers/infrastructure/exif.provider.g.dart
@@ -6,11 +6,11 @@ part of 'exif.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$exifRepositoryHash() => r'f0abe778ed61fbb257001fdf2ac6e17814011fee';
+String _$exifRepositoryHash() => r'bf4a3f6a50d954a23d317659b4f3e2f381066463';
 
 /// See also [exifRepository].
 @ProviderFor(exifRepository)
-final exifRepositoryProvider = Provider<IExifInfoRepository>.internal(
+final exifRepositoryProvider = Provider<IsarExifRepository>.internal(
   exifRepository,
   name: r'exifRepositoryProvider',
   debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
@@ -22,6 +22,6 @@ final exifRepositoryProvider = Provider<IExifInfoRepository>.internal(
 
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
-typedef ExifRepositoryRef = ProviderRef<IExifInfoRepository>;
+typedef ExifRepositoryRef = ProviderRef<IsarExifRepository>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
diff --git a/mobile/lib/providers/infrastructure/storage.provider.dart b/mobile/lib/providers/infrastructure/storage.provider.dart
index d8ac79f1c1..f9ac10b461 100644
--- a/mobile/lib/providers/infrastructure/storage.provider.dart
+++ b/mobile/lib/providers/infrastructure/storage.provider.dart
@@ -1,7 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/interfaces/storage.interface.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 
-final storageRepositoryProvider = Provider<IStorageRepository>(
+final storageRepositoryProvider = Provider<StorageRepository>(
   (ref) => StorageRepository(),
 );
diff --git a/mobile/lib/providers/infrastructure/store.provider.dart b/mobile/lib/providers/infrastructure/store.provider.dart
index c7f0c04a4f..6ae7ff987b 100644
--- a/mobile/lib/providers/infrastructure/store.provider.dart
+++ b/mobile/lib/providers/infrastructure/store.provider.dart
@@ -1,5 +1,4 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/interfaces/store.interface.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
@@ -8,7 +7,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'store.provider.g.dart';
 
 @Riverpod(keepAlive: true)
-IStoreRepository storeRepository(Ref ref) =>
+IsarStoreRepository storeRepository(Ref ref) =>
     IsarStoreRepository(ref.watch(isarProvider));
 
 @Riverpod(keepAlive: true)
diff --git a/mobile/lib/providers/infrastructure/store.provider.g.dart b/mobile/lib/providers/infrastructure/store.provider.g.dart
index ffdcd291b6..22b783013a 100644
--- a/mobile/lib/providers/infrastructure/store.provider.g.dart
+++ b/mobile/lib/providers/infrastructure/store.provider.g.dart
@@ -6,11 +6,11 @@ part of 'store.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$storeRepositoryHash() => r'99d24875d30c5e86b1c6caa352a0026167114e62';
+String _$storeRepositoryHash() => r'659cb134466e4b0d5f04e2fc93e426350d99545f';
 
 /// See also [storeRepository].
 @ProviderFor(storeRepository)
-final storeRepositoryProvider = Provider<IStoreRepository>.internal(
+final storeRepositoryProvider = Provider<IsarStoreRepository>.internal(
   storeRepository,
   name: r'storeRepositoryProvider',
   debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
@@ -22,7 +22,7 @@ final storeRepositoryProvider = Provider<IStoreRepository>.internal(
 
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
-typedef StoreRepositoryRef = ProviderRef<IStoreRepository>;
+typedef StoreRepositoryRef = ProviderRef<IsarStoreRepository>;
 String _$storeServiceHash() => r'250e10497c42df360e9e1f9a618d0b19c1b5b0a0';
 
 /// See also [storeService].
diff --git a/mobile/lib/providers/infrastructure/timeline.provider.dart b/mobile/lib/providers/infrastructure/timeline.provider.dart
index 7004dd0262..4172e559c4 100644
--- a/mobile/lib/providers/infrastructure/timeline.provider.dart
+++ b/mobile/lib/providers/infrastructure/timeline.provider.dart
@@ -1,12 +1,11 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/interfaces/timeline.interface.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 
-final timelineRepositoryProvider = Provider<ITimelineRepository>(
+final timelineRepositoryProvider = Provider<DriftTimelineRepository>(
   (ref) => DriftTimelineRepository(ref.watch(driftProvider)),
 );
 
diff --git a/mobile/lib/repositories/upload.repository.dart b/mobile/lib/repositories/upload.repository.dart
index 6445d144f6..4f840fa3c6 100644
--- a/mobile/lib/repositories/upload.repository.dart
+++ b/mobile/lib/repositories/upload.repository.dart
@@ -1,15 +1,12 @@
 import 'package:background_downloader/background_downloader.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/interfaces/upload.interface.dart';
 import 'package:immich_mobile/utils/upload.dart';
 
 final uploadRepositoryProvider = Provider((ref) => UploadRepository());
 
-class UploadRepository implements IUploadRepository {
-  @override
+class UploadRepository {
   void Function(TaskStatusUpdate)? onUploadStatus;
 
-  @override
   void Function(TaskProgressUpdate)? onTaskProgress;
 
   UploadRepository() {
@@ -20,22 +17,18 @@ class UploadRepository implements IUploadRepository {
     );
   }
 
-  @override
   Future<bool> upload(UploadTask task) {
     return FileDownloader().enqueue(task);
   }
 
-  @override
   Future<void> deleteAllTrackingRecords() {
     return FileDownloader().database.deleteAllRecords();
   }
 
-  @override
   Future<bool> cancel(String id) {
     return FileDownloader().cancelTaskWithId(id);
   }
 
-  @override
   Future<void> deleteRecordsWithIds(List<String> ids) {
     return FileDownloader().database.deleteRecordsWithIds(ids);
   }
diff --git a/mobile/lib/repositories/widget.repository.dart b/mobile/lib/repositories/widget.repository.dart
index a813bc56d6..630c47fcec 100644
--- a/mobile/lib/repositories/widget.repository.dart
+++ b/mobile/lib/repositories/widget.repository.dart
@@ -1,23 +1,19 @@
 import 'package:home_widget/home_widget.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/interfaces/widget.interface.dart';
 
 final widgetRepositoryProvider = Provider((_) => WidgetRepository());
 
-class WidgetRepository implements IWidgetRepository {
+class WidgetRepository {
   WidgetRepository();
 
-  @override
   Future<void> saveData(String key, String value) async {
     await HomeWidget.saveWidgetData<String>(key, value);
   }
 
-  @override
   Future<void> refresh(String name) async {
     await HomeWidget.updateWidget(name: name, iOSName: name);
   }
 
-  @override
   Future<void> setAppGroupId(String appGroupId) async {
     await HomeWidget.setAppGroupId(appGroupId);
   }
diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart
index cd582b94ac..b761ebb39b 100644
--- a/mobile/lib/services/asset.service.dart
+++ b/mobile/lib/services/asset.service.dart
@@ -4,11 +4,11 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/exif.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
@@ -47,7 +47,7 @@ final assetServiceProvider = Provider(
 class AssetService {
   final AssetApiRepository _assetApiRepository;
   final AssetRepository _assetRepository;
-  final IExifInfoRepository _exifInfoRepository;
+  final IsarExifRepository _exifInfoRepository;
   final IsarUserRepository _isarUserRepository;
   final ETagRepository _etagRepository;
   final BackupAlbumRepository _backupRepository;
diff --git a/mobile/lib/services/backup_verification.service.dart b/mobile/lib/services/backup_verification.service.dart
index 5e3ec667da..6d6884eb00 100644
--- a/mobile/lib/services/backup_verification.service.dart
+++ b/mobile/lib/services/backup_verification.service.dart
@@ -5,12 +5,12 @@ import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/exif.repository.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -25,7 +25,7 @@ class BackupVerificationService {
   final UserService _userService;
   final FileMediaRepository _fileMediaRepository;
   final AssetRepository _assetRepository;
-  final IExifInfoRepository _exifInfoRepository;
+  final IsarExifRepository _exifInfoRepository;
 
   const BackupVerificationService(
     this._userService,
diff --git a/mobile/lib/services/exif.service.dart b/mobile/lib/services/exif.service.dart
index 973f04303e..4d21614ec5 100644
--- a/mobile/lib/services/exif.service.dart
+++ b/mobile/lib/services/exif.service.dart
@@ -1,12 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
+import 'package:immich_mobile/infrastructure/repositories/exif.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 
 final exifServiceProvider =
     Provider((ref) => ExifService(ref.watch(exifRepositoryProvider)));
 
 class ExifService {
-  final IExifInfoRepository _exifInfoRepository;
+  final IsarExifRepository _exifInfoRepository;
 
   const ExifService(this._exifInfoRepository);
 
diff --git a/mobile/lib/services/hash.service.dart b/mobile/lib/services/hash.service.dart
index f8a09471e4..f0554bf00b 100644
--- a/mobile/lib/services/hash.service.dart
+++ b/mobile/lib/services/hash.service.dart
@@ -4,23 +4,23 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/interfaces/device_asset.interface.dart';
 import 'package:immich_mobile/domain/models/device_asset.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/device_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/device_asset.provider.dart';
 import 'package:immich_mobile/services/background.service.dart';
 import 'package:logging/logging.dart';
 
 class HashService {
   HashService({
-    required IDeviceAssetRepository deviceAssetRepository,
+    required IsarDeviceAssetRepository deviceAssetRepository,
     required BackgroundService backgroundService,
     this.batchSizeLimit = kBatchHashSizeLimit,
     this.batchFileLimit = kBatchHashFileLimit,
   })  : _deviceAssetRepository = deviceAssetRepository,
         _backgroundService = backgroundService;
 
-  final IDeviceAssetRepository _deviceAssetRepository;
+  final IsarDeviceAssetRepository _deviceAssetRepository;
   final BackgroundService _backgroundService;
   final int batchSizeLimit;
   final int batchFileLimit;
diff --git a/mobile/lib/services/sync.service.dart b/mobile/lib/services/sync.service.dart
index cdf7340958..5a95be2237 100644
--- a/mobile/lib/services/sync.service.dart
+++ b/mobile/lib/services/sync.service.dart
@@ -4,13 +4,13 @@ import 'dart:io';
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/etag.entity.dart';
 import 'package:immich_mobile/extensions/collection_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/exif.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/providers/app_settings.provider.dart';
@@ -60,7 +60,7 @@ class SyncService {
   final AlbumApiRepository _albumApiRepository;
   final AlbumRepository _albumRepository;
   final AssetRepository _assetRepository;
-  final IExifInfoRepository _exifInfoRepository;
+  final IsarExifRepository _exifInfoRepository;
   final IsarUserRepository _isarUserRepository;
   final UserService _userService;
   final PartnerRepository _partnerRepository;
diff --git a/mobile/lib/services/upload.service.dart b/mobile/lib/services/upload.service.dart
index 0734e57212..18f90ab844 100644
--- a/mobile/lib/services/upload.service.dart
+++ b/mobile/lib/services/upload.service.dart
@@ -4,7 +4,6 @@ import 'package:background_downloader/background_downloader.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/interfaces/upload.interface.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/upload.dart';
@@ -18,7 +17,7 @@ final uploadServiceProvider = Provider(
 );
 
 class UploadService {
-  final IUploadRepository _uploadRepository;
+  final UploadRepository _uploadRepository;
   // final Logger _log = Logger("UploadService");
   void Function(TaskStatusUpdate)? onUploadStatus;
   void Function(TaskProgressUpdate)? onTaskProgress;
diff --git a/mobile/lib/services/widget.service.dart b/mobile/lib/services/widget.service.dart
index bb7b367c27..e71733f4b9 100644
--- a/mobile/lib/services/widget.service.dart
+++ b/mobile/lib/services/widget.service.dart
@@ -1,6 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/interfaces/widget.interface.dart';
 import 'package:immich_mobile/repositories/widget.repository.dart';
 
 final widgetServiceProvider = Provider((ref) {
@@ -10,7 +9,7 @@ final widgetServiceProvider = Provider((ref) {
 });
 
 class WidgetService {
-  final IWidgetRepository _repository;
+  final WidgetRepository _repository;
 
   WidgetService(this._repository);
 
diff --git a/mobile/test/domain/services/hash_service_test.dart b/mobile/test/domain/services/hash_service_test.dart
index 623aed5409..2a7ea740bf 100644
--- a/mobile/test/domain/services/hash_service_test.dart
+++ b/mobile/test/domain/services/hash_service_test.dart
@@ -3,9 +3,9 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/interfaces/local_album.interface.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/hash.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 import '../../fixtures/album.stub.dart';
diff --git a/mobile/test/domain/services/log_service_test.dart b/mobile/test/domain/services/log_service_test.dart
index fd9a86ce4e..23bdcc9909 100644
--- a/mobile/test/domain/services/log_service_test.dart
+++ b/mobile/test/domain/services/log_service_test.dart
@@ -1,11 +1,11 @@
 import 'package:collection/collection.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/interfaces/log.interface.dart';
-import 'package:immich_mobile/domain/interfaces/store.interface.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:mocktail/mocktail.dart';
 
@@ -28,8 +28,8 @@ final _kWarnLog = LogMessage(
 
 void main() {
   late LogService sut;
-  late ILogRepository mockLogRepo;
-  late IStoreRepository mockStoreRepo;
+  late IsarLogRepository mockLogRepo;
+  late IsarStoreRepository mockStoreRepo;
 
   setUp(() async {
     mockLogRepo = MockLogRepository();
diff --git a/mobile/test/domain/services/store_service_test.dart b/mobile/test/domain/services/store_service_test.dart
index 8f4749ac62..7eab532ef3 100644
--- a/mobile/test/domain/services/store_service_test.dart
+++ b/mobile/test/domain/services/store_service_test.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/interfaces/store.interface.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 import '../../infrastructure/repository.mock.dart';
@@ -15,7 +15,7 @@ final _kBackupFailedSince = DateTime.utc(2023);
 
 void main() {
   late StoreService sut;
-  late IStoreRepository mockStoreRepo;
+  late IsarStoreRepository mockStoreRepo;
   late StreamController<StoreDto<Object>> controller;
 
   setUp(() async {
diff --git a/mobile/test/domain/services/sync_stream_service_test.dart b/mobile/test/domain/services/sync_stream_service_test.dart
index 3e19306bdb..03d481f9f3 100644
--- a/mobile/test/domain/services/sync_stream_service_test.dart
+++ b/mobile/test/domain/services/sync_stream_service_test.dart
@@ -3,9 +3,9 @@
 import 'dart:async';
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/interfaces/sync_api.interface.dart';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/domain/services/sync_stream.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
@@ -31,7 +31,7 @@ class _MockCancellationWrapper extends Mock implements _CancellationWrapper {}
 void main() {
   late SyncStreamService sut;
   late SyncStreamRepository mockSyncStreamRepo;
-  late ISyncApiRepository mockSyncApiRepo;
+  late SyncApiRepository mockSyncApiRepo;
   late Function(List<SyncEvent>, Function()) handleEventsCallback;
   late _MockAbortCallbackWrapper mockAbortCallbackWrapper;
 
diff --git a/mobile/test/infrastructure/repositories/exif_repository_test.dart b/mobile/test/infrastructure/repositories/exif_repository_test.dart
index e267d2dac4..4e7ee4d79d 100644
--- a/mobile/test/infrastructure/repositories/exif_repository_test.dart
+++ b/mobile/test/infrastructure/repositories/exif_repository_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/exif.repository.dart';
 import 'package:isar/isar.dart';
@@ -20,7 +19,7 @@ Future<void> _populateExifTable(Isar db) async {
 
 void main() {
   late Isar db;
-  late IExifInfoRepository sut;
+  late IsarExifRepository sut;
 
   setUp(() async {
     db = await TestUtils.initIsar();
diff --git a/mobile/test/infrastructure/repositories/local_album_repository_test.dart b/mobile/test/infrastructure/repositories/local_album_repository_test.dart
index 827d81c79b..f6c82c1be8 100644
--- a/mobile/test/infrastructure/repositories/local_album_repository_test.dart
+++ b/mobile/test/infrastructure/repositories/local_album_repository_test.dart
@@ -1,9 +1,9 @@
 import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/interfaces/local_album.interface.dart';
 import 'package:immich_mobile/domain/models/local_album.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 
 import '../../test_utils/medium_factory.dart';
 
@@ -24,7 +24,7 @@ void main() {
   group('getAll', () {
     test('sorts albums by backupSelection & isIosSharedAlbum', () async {
       final localAlbumRepo =
-          mediumFactory.getRepository<ILocalAlbumRepository>();
+          mediumFactory.getRepository<DriftLocalAlbumRepository>();
       await localAlbumRepo.upsert(
         mediumFactory.localAlbum(
           id: '1',
diff --git a/mobile/test/infrastructure/repositories/store_repository_test.dart b/mobile/test/infrastructure/repositories/store_repository_test.dart
index 528e17ba3d..ce13c1ecdd 100644
--- a/mobile/test/infrastructure/repositories/store_repository_test.dart
+++ b/mobile/test/infrastructure/repositories/store_repository_test.dart
@@ -1,5 +1,4 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/interfaces/store.interface.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
@@ -42,7 +41,7 @@ Future<void> _populateStore(Isar db) async {
 
 void main() {
   late Isar db;
-  late IStoreRepository sut;
+  late IsarStoreRepository sut;
 
   setUp(() async {
     db = await TestUtils.initIsar();
diff --git a/mobile/test/infrastructure/repository.mock.dart b/mobile/test/infrastructure/repository.mock.dart
index e41b89f16a..1fde303863 100644
--- a/mobile/test/infrastructure/repository.mock.dart
+++ b/mobile/test/infrastructure/repository.mock.dart
@@ -1,33 +1,35 @@
-import 'package:immich_mobile/domain/interfaces/device_asset.interface.dart';
-import 'package:immich_mobile/domain/interfaces/local_album.interface.dart';
-import 'package:immich_mobile/domain/interfaces/local_asset.interface.dart';
-import 'package:immich_mobile/domain/interfaces/log.interface.dart';
-import 'package:immich_mobile/domain/interfaces/storage.interface.dart';
-import 'package:immich_mobile/domain/interfaces/store.interface.dart';
-import 'package:immich_mobile/domain/interfaces/sync_api.interface.dart';
+import 'package:immich_mobile/infrastructure/repositories/device_asset.repository.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/log.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/user.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
-class MockStoreRepository extends Mock implements IStoreRepository {}
+class MockStoreRepository extends Mock implements IsarStoreRepository {}
 
-class MockLogRepository extends Mock implements ILogRepository {}
+class MockLogRepository extends Mock implements IsarLogRepository {}
 
 class MockIsarUserRepository extends Mock implements IsarUserRepository {}
 
 class MockDeviceAssetRepository extends Mock
-    implements IDeviceAssetRepository {}
+    implements IsarDeviceAssetRepository {}
 
 class MockSyncStreamRepository extends Mock implements SyncStreamRepository {}
 
-class MockLocalAlbumRepository extends Mock implements ILocalAlbumRepository {}
+class MockLocalAlbumRepository extends Mock
+    implements DriftLocalAlbumRepository {}
 
-class MockLocalAssetRepository extends Mock implements ILocalAssetRepository {}
+class MockLocalAssetRepository extends Mock
+    implements DriftLocalAssetRepository {}
 
-class MockStorageRepository extends Mock implements IStorageRepository {}
+class MockStorageRepository extends Mock implements StorageRepository {}
 
 // API Repos
 class MockUserApiRepository extends Mock implements UserApiRepository {}
 
-class MockSyncApiRepository extends Mock implements ISyncApiRepository {}
+class MockSyncApiRepository extends Mock implements SyncApiRepository {}
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index e0a12e97cf..54a7e2d4a4 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -1,4 +1,4 @@
-import 'package:immich_mobile/domain/interfaces/exif.interface.dart';
+import 'package:immich_mobile/infrastructure/repositories/exif.repository.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:immich_mobile/repositories/album_media.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
@@ -21,7 +21,7 @@ class MockAssetRepository extends Mock implements AssetRepository {}
 
 class MockBackupRepository extends Mock implements BackupAlbumRepository {}
 
-class MockExifInfoRepository extends Mock implements IExifInfoRepository {}
+class MockExifInfoRepository extends Mock implements IsarExifRepository {}
 
 class MockETagRepository extends Mock implements ETagRepository {}
 
diff --git a/mobile/test/services/hash_service_test.dart b/mobile/test/services/hash_service_test.dart
index e278199e4f..2ba9c356a0 100644
--- a/mobile/test/services/hash_service_test.dart
+++ b/mobile/test/services/hash_service_test.dart
@@ -6,9 +6,9 @@ import 'package:collection/collection.dart';
 import 'package:file/memory.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/interfaces/device_asset.interface.dart';
 import 'package:immich_mobile/domain/models/device_asset.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/device_asset.repository.dart';
 import 'package:immich_mobile/services/background.service.dart';
 import 'package:immich_mobile/services/hash.service.dart';
 import 'package:mocktail/mocktail.dart';
@@ -25,7 +25,7 @@ class MockAssetEntity extends Mock implements AssetEntity {}
 void main() {
   late HashService sut;
   late BackgroundService mockBackgroundService;
-  late IDeviceAssetRepository mockDeviceAssetRepository;
+  late IsarDeviceAssetRepository mockDeviceAssetRepository;
 
   setUp(() {
     mockBackgroundService = MockBackgroundService();
diff --git a/mobile/test/test_utils/medium_factory.dart b/mobile/test/test_utils/medium_factory.dart
index 64c23321aa..affe9c9b39 100644
--- a/mobile/test/test_utils/medium_factory.dart
+++ b/mobile/test/test_utils/medium_factory.dart
@@ -1,6 +1,5 @@
 import 'dart:math';
 
-import 'package:immich_mobile/domain/interfaces/local_album.interface.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/local_album.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
@@ -56,7 +55,7 @@ class MediumFactory {
 
   T getRepository<T>() {
     switch (T) {
-      case const (ILocalAlbumRepository):
+      case const (DriftLocalAlbumRepository):
         return DriftLocalAlbumRepository(_db) as T;
       default:
         throw Exception('Unknown repository: $T');

From ebcf133beafa71b8239b177eec1e6f1a4930fe27 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 23 Jun 2025 16:39:20 -0400
Subject: [PATCH 030/337] fix(web): consistent merge people icons (#19473)

fix(web): consistent merge icons
---
 .../modals/PersonMergeSuggestionModal.svelte  | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/web/src/lib/modals/PersonMergeSuggestionModal.svelte b/web/src/lib/modals/PersonMergeSuggestionModal.svelte
index ab306aca7a..6df32cb354 100644
--- a/web/src/lib/modals/PersonMergeSuggestionModal.svelte
+++ b/web/src/lib/modals/PersonMergeSuggestionModal.svelte
@@ -8,7 +8,7 @@
   import { handleError } from '$lib/utils/handle-error';
   import { mergePerson, type PersonResponseDto } from '@immich/sdk';
   import { Button, HStack, IconButton, Modal, ModalBody, ModalFooter } from '@immich/ui';
-  import { mdiArrowLeft, mdiMerge } from '@mdi/js';
+  import { mdiArrowLeft, mdiCallMerge, mdiSwapHorizontal } from '@mdi/js';
   import { onMount, tick } from 'svelte';
   import { t } from 'svelte-i18n';
   import ImageThumbnail from '../components/assets/thumbnail/image-thumbnail.svelte';
@@ -62,7 +62,7 @@
 
 <Modal title="{$t('merge_people')} - {title}" {onClose}>
   <ModalBody>
-    <div class="flex items-center justify-center py-4 md:h-36 md:py-4">
+    <div class="flex items-center justify-center gap-2 py-4 md:h-36">
       {#if !choosePersonToMerge}
         <div class="flex h-20 w-20 items-center px-1 md:h-24 md:w-24 md:px-2">
           <ImageThumbnail
@@ -73,15 +73,24 @@
             widthStyle="100%"
           />
         </div>
-        <div class="mx-0.5 flex md:mx-2">
-          <IconButton
-            shape="round"
-            variant="ghost"
-            color="secondary"
-            aria-label={$t('swap_merge_direction')}
-            icon={mdiMerge}
-            onclick={() => ([personToMerge, personToBeMergedInto] = [personToBeMergedInto, personToMerge])}
-          />
+
+        <div class="grid grid-rows-3">
+          <div></div>
+          <div class="flex flex-col h-full items-center justify-center">
+            <div class="flex h-full items-center justify-center">
+              <Icon path={mdiCallMerge} size={48} class="rotate-90 dark:text-white" />
+            </div>
+          </div>
+          <div>
+            <IconButton
+              shape="round"
+              color="secondary"
+              variant="ghost"
+              aria-label={$t('swap_merge_direction')}
+              icon={mdiSwapHorizontal}
+              onclick={() => ([personToMerge, personToBeMergedInto] = [personToBeMergedInto, personToMerge])}
+            />
+          </div>
         </div>
 
         <button

From 9ca31abae9f1ba1212ee9bf9d7c92507e09932e7 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 24 Jun 2025 02:05:25 -0500
Subject: [PATCH 031/337] feat: new timeline multi-selection (#19443)

* feat: new timeline multiselection

* select all from bucket

* wip

* group multi-select

* group multi-select

* pr feedback

* pr feedback

* lint
---
 .../widgets/images/thumbnail_tile.widget.dart | 143 +++++++++++++----
 .../widgets/timeline/fixed/segment.model.dart |  59 +++++--
 .../widgets/timeline/header.widget.dart       | 129 +++++++++++++---
 .../widgets/timeline/segment_builder.dart     |   2 +-
 .../timeline/multiselect.provider.dart        | 144 ++++++++++++++++++
 5 files changed, 416 insertions(+), 61 deletions(-)
 create mode 100644 mobile/lib/providers/timeline/multiselect.provider.dart

diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index eb64b2dcd3..7c2fbf4e21 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -1,13 +1,18 @@
 import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
-class ThumbnailTile extends StatelessWidget {
+class ThumbnailTile extends ConsumerWidget {
   const ThumbnailTile(
     this.asset, {
     this.size = const Size.square(256),
     this.fit = BoxFit.cover,
     this.showStorageIndicator = true,
+    this.canDeselect = true,
     super.key,
   });
 
@@ -16,46 +21,128 @@ class ThumbnailTile extends StatelessWidget {
   final BoxFit fit;
   final bool showStorageIndicator;
 
+  /// If we are allowed to deselect this image
+  final bool canDeselect;
+
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final assetContainerColor = context.isDarkTheme
+        ? context.primaryColor.darken(amount: 0.6)
+        : context.primaryColor.lighten(amount: 0.8);
+
+    final isSelected = ref
+        .watch(multiSelectProvider.select((state) => state.selectedAssets))
+        .contains(asset);
+
     return Stack(
       children: [
-        Positioned.fill(child: Thumbnail(asset: asset, fit: fit, size: size)),
-        if (asset.isVideo)
-          Align(
-            alignment: Alignment.topRight,
-            child: Padding(
-              padding: const EdgeInsets.only(right: 10.0, top: 6.0),
-              child: _VideoIndicator(asset.durationInSeconds ?? 0),
+        AnimatedContainer(
+          duration: Durations.short4,
+          curve: Curves.decelerate,
+          decoration: BoxDecoration(
+            color: isSelected
+                ? (canDeselect ? assetContainerColor : Colors.grey)
+                : null,
+            border: isSelected
+                ? Border.all(
+                    color: canDeselect ? assetContainerColor : Colors.grey,
+                    width: 8,
+                  )
+                : const Border(),
+          ),
+          child: ClipRRect(
+            borderRadius: isSelected
+                ? const BorderRadius.all(Radius.circular(15.0))
+                : BorderRadius.zero,
+            child: Stack(
+              children: [
+                Positioned.fill(
+                  child: Thumbnail(
+                    asset: asset,
+                    fit: fit,
+                    size: size,
+                  ),
+                ),
+                if (asset.isVideo)
+                  Align(
+                    alignment: Alignment.topRight,
+                    child: Padding(
+                      padding: const EdgeInsets.only(right: 10.0, top: 6.0),
+                      child: _VideoIndicator(asset.durationInSeconds ?? 0),
+                    ),
+                  ),
+                if (showStorageIndicator)
+                  Align(
+                    alignment: Alignment.bottomRight,
+                    child: Padding(
+                      padding: const EdgeInsets.only(right: 10.0, bottom: 6.0),
+                      child: _TileOverlayIcon(
+                        switch (asset.storage) {
+                          AssetState.local => Icons.cloud_off_outlined,
+                          AssetState.remote => Icons.cloud_outlined,
+                          AssetState.merged => Icons.cloud_done_outlined,
+                        },
+                      ),
+                    ),
+                  ),
+                if (asset.isFavorite)
+                  const Align(
+                    alignment: Alignment.bottomLeft,
+                    child: Padding(
+                      padding: EdgeInsets.only(left: 10.0, bottom: 6.0),
+                      child: _TileOverlayIcon(Icons.favorite_rounded),
+                    ),
+                  ),
+              ],
             ),
           ),
-        if (showStorageIndicator)
-          Align(
-            alignment: Alignment.bottomRight,
-            child: Padding(
-              padding: const EdgeInsets.only(right: 10.0, bottom: 6.0),
-              child: _TileOverlayIcon(
-                switch (asset.storage) {
-                  AssetState.local => Icons.cloud_off_outlined,
-                  AssetState.remote => Icons.cloud_outlined,
-                  AssetState.merged => Icons.cloud_done_outlined,
-                },
+        ),
+        if (isSelected)
+          Padding(
+            padding: const EdgeInsets.all(3.0),
+            child: Align(
+              alignment: Alignment.topLeft,
+              child: _SelectionIndicator(
+                isSelected: isSelected,
+                color: assetContainerColor,
               ),
             ),
           ),
-        if (asset.isFavorite)
-          const Align(
-            alignment: Alignment.bottomLeft,
-            child: Padding(
-              padding: EdgeInsets.only(left: 10.0, bottom: 6.0),
-              child: _TileOverlayIcon(Icons.favorite_rounded),
-            ),
-          ),
       ],
     );
   }
 }
 
+class _SelectionIndicator extends StatelessWidget {
+  final bool isSelected;
+  final Color? color;
+  const _SelectionIndicator({
+    required this.isSelected,
+    this.color,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    if (isSelected) {
+      return Container(
+        decoration: BoxDecoration(
+          shape: BoxShape.circle,
+          color: color,
+        ),
+        child: Icon(
+          Icons.check_circle_rounded,
+          color: context.primaryColor,
+        ),
+      );
+    } else {
+      return const Icon(
+        Icons.circle_outlined,
+        color: Colors.white,
+      );
+    }
+  }
+}
+
 class _VideoIndicator extends StatelessWidget {
   final int durationInSeconds;
   const _VideoIndicator(this.durationInSeconds);
diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
index bea754b3ff..fff5e68146 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -9,7 +9,9 @@ import 'package:immich_mobile/presentation/widgets/timeline/header.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment_builder.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
 class FixedSegment extends Segment {
   final double tileHeight;
@@ -60,21 +62,39 @@ class FixedSegment extends Segment {
     return gridIndex + firstRowBelow - 1;
   }
 
+  void _handleOnTap(WidgetRef ref, BaseAsset asset) {
+    if (!ref.read(multiSelectProvider.select((s) => s.isEnabled))) {
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).toggleAssetSelection(asset);
+  }
+
+  void _handleOnLongPress(WidgetRef ref, BaseAsset asset) {
+    if (ref.read(multiSelectProvider.select((s) => s.isEnabled))) {
+      return;
+    }
+
+    ref.read(hapticFeedbackProvider.notifier).heavyImpact();
+    ref.read(multiSelectProvider.notifier).toggleAssetSelection(asset);
+  }
+
   @override
   Widget builder(BuildContext context, int index) {
+    final rowIndexInSegment = index - (firstIndex + 1);
+    final assetIndex = rowIndexInSegment * columnCount;
+    final assetCount = bucket.assetCount;
+    final numberOfAssets = math.min(columnCount, assetCount - assetIndex);
+
     if (index == firstIndex) {
       return TimelineHeader(
         bucket: bucket,
         header: header,
         height: headerExtent,
+        assetOffset: firstAssetIndex,
       );
     }
 
-    final rowIndexInSegment = index - (firstIndex + 1);
-    final assetIndex = rowIndexInSegment * columnCount;
-    final assetCount = bucket.assetCount;
-    final numberOfAssets = math.min(columnCount, assetCount - assetIndex);
-
     return _buildRow(firstAssetIndex + assetIndex, numberOfAssets);
   }
 
@@ -97,7 +117,12 @@ class FixedSegment extends Segment {
           // Bucket is already loaded, show the assets
           if (timelineService.hasRange(assetIndex, count)) {
             final assets = timelineService.getAssets(assetIndex, count);
-            return _buildAssetRow(ctx, assets);
+            return _buildAssetRow(
+              ctx,
+              assets,
+              onTap: (asset) => _handleOnTap(ref, asset),
+              onLongPress: (asset) => _handleOnLongPress(ref, asset),
+            );
           }
 
           // Bucket is not loaded, show placeholders and load the bucket
@@ -113,20 +138,36 @@ class FixedSegment extends Segment {
                 );
               }
 
-              return _buildAssetRow(ctxx, snap.requireData);
+              return _buildAssetRow(
+                ctxx,
+                snap.requireData,
+                onTap: (asset) => _handleOnTap(ref, asset),
+                onLongPress: (asset) => _handleOnLongPress(ref, asset),
+              );
             },
           );
         },
       );
 
-  Widget _buildAssetRow(BuildContext context, List<BaseAsset> assets) =>
+  Widget _buildAssetRow(
+    BuildContext context,
+    List<BaseAsset> assets, {
+    required void Function(BaseAsset) onTap,
+    required void Function(BaseAsset) onLongPress,
+  }) =>
       FixedTimelineRow(
         dimension: tileHeight,
         spacing: spacing,
         textDirection: Directionality.of(context),
         children: List.generate(
           assets.length,
-          (i) => RepaintBoundary(child: ThumbnailTile(assets[i])),
+          (i) => RepaintBoundary(
+            child: GestureDetector(
+              onTap: () => onTap(assets[i]),
+              onLongPress: () => onLongPress(assets[i]),
+              child: ThumbnailTile(assets[i]),
+            ),
+          ),
         ),
       );
 }
diff --git a/mobile/lib/presentation/widgets/timeline/header.widget.dart b/mobile/lib/presentation/widgets/timeline/header.widget.dart
index f5cce1dbbb..5c69f92a5a 100644
--- a/mobile/lib/presentation/widgets/timeline/header.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/header.widget.dart
@@ -1,18 +1,25 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
-class TimelineHeader extends StatelessWidget {
+class TimelineHeader extends ConsumerWidget {
   final Bucket bucket;
   final HeaderType header;
   final double height;
+  final int assetOffset;
 
   const TimelineHeader({
     super.key,
     required this.bucket,
     required this.header,
     required this.height,
+    required this.assetOffset,
   });
 
   String _formatMonth(BuildContext context, DateTime date) {
@@ -28,33 +35,109 @@ class TimelineHeader extends StatelessWidget {
   }
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     if (bucket is! TimeBucket || header == HeaderType.none) {
       return const SizedBox.shrink();
     }
 
     final date = (bucket as TimeBucket).date;
-    return Container(
-      padding: const EdgeInsets.only(left: 10, top: 30, bottom: 10),
-      height: height,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisAlignment: MainAxisAlignment.spaceAround,
-        children: [
-          if (header == HeaderType.month || header == HeaderType.monthAndDay)
-            Text(
-              _formatMonth(context, date),
-              style: context.textTheme.labelLarge
-                  ?.copyWith(fontSize: 24, fontWeight: FontWeight.w500),
-            ),
-          if (header == HeaderType.day || header == HeaderType.monthAndDay)
-            Text(
-              _formatDay(context, date),
-              style: context.textTheme.labelLarge
-                  ?.copyWith(fontWeight: FontWeight.w500),
-            ),
-        ],
+
+    List<BaseAsset> bucketAssets;
+    try {
+      bucketAssets = ref
+          .watch(timelineServiceProvider)
+          .getAssets(assetOffset, bucket.assetCount);
+    } catch (e) {
+      bucketAssets = <BaseAsset>[];
+    }
+
+    final isAllSelected = ref.watch(bucketSelectionProvider(bucketAssets));
+    final isMonthHeader =
+        header == HeaderType.month || header == HeaderType.monthAndDay;
+    final isDayHeader =
+        header == HeaderType.day || header == HeaderType.monthAndDay;
+
+    return Padding(
+      padding: EdgeInsets.only(
+        top: isMonthHeader ? 8.0 : 0.0,
+        left: 12.0,
+        right: 12.0,
+      ),
+      child: SizedBox(
+        height: height,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          children: [
+            if (isMonthHeader)
+              Row(
+                children: [
+                  Text(
+                    _formatMonth(context, date),
+                    style: context.textTheme.labelLarge?.copyWith(fontSize: 24),
+                  ),
+                  const Spacer(),
+                  if (header != HeaderType.monthAndDay)
+                    _BulkSelectIconButton(
+                      isAllSelected: isAllSelected,
+                      onPressed: () => ref
+                          .read(multiSelectProvider.notifier)
+                          .toggleBucketSelection(
+                            assetOffset,
+                            bucket.assetCount,
+                          ),
+                    ),
+                ],
+              ),
+            if (isDayHeader)
+              Row(
+                children: [
+                  Text(
+                    _formatDay(context, date),
+                    style: context.textTheme.labelLarge?.copyWith(
+                      fontSize: 15,
+                    ),
+                  ),
+                  const Spacer(),
+                  _BulkSelectIconButton(
+                    isAllSelected: isAllSelected,
+                    onPressed: () => ref
+                        .read(multiSelectProvider.notifier)
+                        .toggleBucketSelection(assetOffset, bucket.assetCount),
+                  ),
+                ],
+              ),
+          ],
+        ),
       ),
     );
   }
 }
+
+class _BulkSelectIconButton extends ConsumerWidget {
+  final bool isAllSelected;
+  final VoidCallback onPressed;
+
+  const _BulkSelectIconButton({
+    required this.isAllSelected,
+    required this.onPressed,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return IconButton(
+      onPressed: onPressed,
+      icon: isAllSelected
+          ? Icon(
+              Icons.check_circle_rounded,
+              size: 26,
+              color: context.primaryColor,
+            )
+          : Icon(
+              Icons.check_circle_outline_rounded,
+              size: 26,
+              color: context.colorScheme.onSurfaceSecondary,
+            ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/timeline/segment_builder.dart b/mobile/lib/presentation/widgets/timeline/segment_builder.dart
index 97031c623f..313292c5dd 100644
--- a/mobile/lib/presentation/widgets/timeline/segment_builder.dart
+++ b/mobile/lib/presentation/widgets/timeline/segment_builder.dart
@@ -22,7 +22,7 @@ abstract class SegmentBuilder {
       case HeaderType.day:
         return kTimelineHeaderExtent * 0.90;
       case HeaderType.monthAndDay:
-        return kTimelineHeaderExtent * 1.5;
+        return kTimelineHeaderExtent * 1.6;
       case HeaderType.none:
         return 0.0;
     }
diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dart
new file mode 100644
index 0000000000..df9e999036
--- /dev/null
+++ b/mobile/lib/providers/timeline/multiselect.provider.dart
@@ -0,0 +1,144 @@
+import 'package:collection/collection.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+
+final multiSelectProvider =
+    NotifierProvider<MultiSelectNotifier, MultiSelectState>(
+  MultiSelectNotifier.new,
+  dependencies: [timelineServiceProvider],
+);
+
+class MultiSelectState {
+  final Set<BaseAsset> selectedAssets;
+
+  MultiSelectState({
+    required this.selectedAssets,
+  });
+
+  bool get isEnabled => selectedAssets.isNotEmpty;
+
+  MultiSelectState copyWith({
+    Set<BaseAsset>? selectedAssets,
+  }) {
+    return MultiSelectState(
+      selectedAssets: selectedAssets ?? this.selectedAssets,
+    );
+  }
+
+  @override
+  String toString() => 'MultiSelectState(selectedAssets: $selectedAssets)';
+
+  @override
+  bool operator ==(covariant MultiSelectState other) {
+    if (identical(this, other)) return true;
+    final listEquals = const DeepCollectionEquality().equals;
+
+    return listEquals(other.selectedAssets, selectedAssets);
+  }
+
+  @override
+  int get hashCode => selectedAssets.hashCode;
+}
+
+class MultiSelectNotifier extends Notifier<MultiSelectState> {
+  late final TimelineService _timelineService;
+
+  @override
+  MultiSelectState build() {
+    _timelineService = ref.read(timelineServiceProvider);
+
+    return MultiSelectState(
+      selectedAssets: {},
+    );
+  }
+
+  void selectAsset(BaseAsset asset) {
+    if (state.selectedAssets.contains(asset)) {
+      return;
+    }
+
+    state = state.copyWith(
+      selectedAssets: {...state.selectedAssets, asset},
+    );
+  }
+
+  void deselectAsset(BaseAsset asset) {
+    if (!state.selectedAssets.contains(asset)) {
+      return;
+    }
+
+    state = state.copyWith(
+      selectedAssets: state.selectedAssets.where((a) => a != asset).toSet(),
+    );
+  }
+
+  void toggleAssetSelection(BaseAsset asset) {
+    if (state.selectedAssets.contains(asset)) {
+      deselectAsset(asset);
+    } else {
+      selectAsset(asset);
+    }
+  }
+
+  /// Bucket bulk operations
+  void selectBucket(int offset, int bucketCount) async {
+    final assets = await _timelineService.loadAssets(offset, bucketCount);
+    final selectedAssets = state.selectedAssets.toSet();
+
+    selectedAssets.addAll(assets);
+
+    state = state.copyWith(
+      selectedAssets: selectedAssets,
+    );
+  }
+
+  void deselectBucket(int offset, int bucketCount) async {
+    final assets = await _timelineService.loadAssets(offset, bucketCount);
+    final selectedAssets = state.selectedAssets.toSet();
+
+    selectedAssets.removeAll(assets);
+
+    state = state.copyWith(selectedAssets: selectedAssets);
+  }
+
+  void toggleBucketSelection(int offset, int bucketCount) async {
+    final assets = await _timelineService.loadAssets(offset, bucketCount);
+    toggleBucketSelectionByAssets(assets);
+  }
+
+  void toggleBucketSelectionByAssets(List<BaseAsset> bucketAssets) {
+    if (bucketAssets.isEmpty) return;
+
+    // Check if all assets in this bucket are currently selected
+    final allSelected =
+        bucketAssets.every((asset) => state.selectedAssets.contains(asset));
+
+    final selectedAssets = state.selectedAssets.toSet();
+
+    if (allSelected) {
+      // If all assets in this bucket are selected, deselect them
+      selectedAssets.removeAll(bucketAssets);
+    } else {
+      // If not all assets in this bucket are selected, select them all
+      selectedAssets.addAll(bucketAssets);
+    }
+
+    state = state.copyWith(selectedAssets: selectedAssets);
+  }
+}
+
+final bucketSelectionProvider = Provider.family<bool, List<BaseAsset>>(
+  (ref, bucketAssets) {
+    final selectedAssets =
+        ref.watch(multiSelectProvider.select((s) => s.selectedAssets));
+
+    if (bucketAssets.isEmpty) return false;
+
+    // Check if all assets in the bucket are selected
+    return bucketAssets.every((asset) => selectedAssets.contains(asset));
+  },
+  dependencies: [multiSelectProvider],
+);

From c1b82bed9b55c47caa8216ee172d278ce93130cd Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Tue, 24 Jun 2025 05:59:52 -0400
Subject: [PATCH 032/337] chore: speedup devcontainer start (#19406)

---
 .devcontainer/server/container-common.sh             |  6 +++---
 .devcontainer/server/container-compose-overrides.yml |  1 +
 .dockerignore                                        |  4 ++++
 Makefile                                             |  5 ++++-
 server/Dockerfile                                    | 11 ++++++++---
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.devcontainer/server/container-common.sh b/.devcontainer/server/container-common.sh
index 34dcb6beac..7dff4a0894 100755
--- a/.devcontainer/server/container-common.sh
+++ b/.devcontainer/server/container-common.sh
@@ -73,10 +73,10 @@ install_dependencies() {
     log "Installing dependencies"
     (
         cd "${IMMICH_WORKSPACE}" || exit 1
-        run_cmd make install-server
-        run_cmd make install-sdk
+        run_cmd make ci-server
+        run_cmd make ci-sdk
         run_cmd make build-sdk
-        run_cmd make install-web
+        run_cmd make ci-web
     )
     log ""
 }
diff --git a/.devcontainer/server/container-compose-overrides.yml b/.devcontainer/server/container-compose-overrides.yml
index eb8e66a3d3..4e340ae5bd 100644
--- a/.devcontainer/server/container-compose-overrides.yml
+++ b/.devcontainer/server/container-compose-overrides.yml
@@ -3,6 +3,7 @@ services:
     build:
       target: dev-container-server
     env_file: !reset []
+    hostname: immich-dev
     environment:
       - IMMICH_SERVER_URL=http://127.0.0.1:2283/
     volumes: !override
diff --git a/.dockerignore b/.dockerignore
index e182865ae0..6e830bae35 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,7 +6,11 @@ design/
 docker/
 !docker/scripts
 docs/
+!docs/package.json
+!docs/package-lock.json
 e2e/
+!e2e/package.json
+!e2e/package-lock.json
 fastlane/
 machine-learning/
 misc/
diff --git a/Makefile b/Makefile
index 1e7760ae68..a9e36caf8a 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,8 @@ audit-%:
 	npm --prefix $(subst sdk,open-api/typescript-sdk,$*) audit fix
 install-%:
 	npm --prefix $(subst sdk,open-api/typescript-sdk,$*) i
+ci-%:
+	npm --prefix $(subst sdk,open-api/typescript-sdk,$*) ci
 build-cli: build-sdk
 build-web: build-sdk
 build-%: install-%
@@ -81,7 +83,8 @@ test-medium-dev:
 	docker exec -it immich_server /bin/sh -c "npm run test:medium"
 
 build-all: $(foreach M,$(filter-out e2e .github,$(MODULES)),build-$M) ;
-install-all: $(foreach M,$(MODULES),install-$M) ;
+install-all: $(foreach M,$(filter-out .github,$(MODULES)),install-$M) ;
+ci-all: $(foreach M,$(filter-out .github,$(MODULES)),ci-$M) ;
 check-all: $(foreach M,$(filter-out sdk cli docs .github,$(MODULES)),check-$M) ;
 lint-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),lint-$M) ;
 format-all: $(foreach M,$(filter-out sdk,$(MODULES)),format-$M) ;
diff --git a/server/Dockerfile b/server/Dockerfile
index 21c2031227..236b8b08d5 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -18,6 +18,7 @@ ENTRYPOINT ["tini", "--", "/bin/sh"]
 
 FROM dev AS dev-container-server
 
+RUN rm -rf /usr/src/app
 RUN apt-get update && \
     apt-get install sudo inetutils-ping openjdk-11-jre-headless \
     vim nano \
@@ -27,12 +28,16 @@ RUN usermod -aG sudo node
 RUN echo "node ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 RUN mkdir -p /workspaces/immich
 RUN chown node -R /workspaces
+COPY --chown=node:node --chmod=777 ../.devcontainer/server/*.sh /immich-devcontainer/
+
+USER node
+COPY --chown=node:node .. /tmp/create-dep-cache/
+WORKDIR /tmp/create-dep-cache
+RUN make ci-all && rm -rf /tmp/create-dep-cache 
 
-RUN mkdir /immich-devcontainer && chown node -R /immich-devcontainer
-COPY --chmod=777 ../.devcontainer/server/*.sh /immich-devcontainer/
 
 FROM dev-container-server AS dev-container-mobile
-
+USER root
 # Enable multiarch for arm64 if necessary
 RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
     dpkg --add-architecture amd64 && \

From c2d7337d12a9ac9d68601028bfe8592fefc04130 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 24 Jun 2025 11:18:35 +0100
Subject: [PATCH 033/337] chore(deps): update grafana/grafana docker tag to
 v12.0.2 (#19484)

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 f31f651b18..5fe121847d 100644
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -94,7 +94,7 @@ services:
     command: ['./run.sh', '-disable-reporting']
     ports:
       - 3000:3000
-    image: grafana/grafana:12.0.1-ubuntu@sha256:65575bb9c761335e2ff30e364f21d38632e3b2e75f5f81d83cc92f44b9bbc055
+    image: grafana/grafana:12.0.2-ubuntu@sha256:0512d81cdeaaff0e370a9aa66027b465d1f1f04379c3a9c801a905fabbdbc7a5
     volumes:
       - grafana-data:/var/lib/grafana
 

From 4e59a55c1d6570b66f2fbefd84c75ce337a21801 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 24 Jun 2025 11:18:47 +0100
Subject: [PATCH 034/337] chore(deps): update dependency @types/node to
 ^22.15.32 (#19483)

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

diff --git a/cli/package-lock.json b/cli/package-lock.json
index e33b7d6cbe..b8ba2a077a 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -27,7 +27,7 @@
         "@types/lodash-es": "^4.17.12",
         "@types/micromatch": "^4.0.9",
         "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.15.31",
+        "@types/node": "^22.15.32",
         "@vitest/coverage-v8": "^3.0.0",
         "byte-size": "^9.0.0",
         "cli-progress": "^3.12.0",
@@ -61,7 +61,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.31",
+        "@types/node": "^22.15.32",
         "typescript": "^5.3.3"
       }
     },
diff --git a/cli/package.json b/cli/package.json
index b53ef1d530..e8c3ac6f3f 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -21,7 +21,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.15.31",
+    "@types/node": "^22.15.32",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index e72c7ebed9..acc20b97f8 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -15,7 +15,7 @@
         "@immich/sdk": "file:../open-api/typescript-sdk",
         "@playwright/test": "^1.44.1",
         "@types/luxon": "^3.4.2",
-        "@types/node": "^22.15.31",
+        "@types/node": "^22.15.32",
         "@types/oidc-provider": "^9.0.0",
         "@types/pg": "^8.15.1",
         "@types/pngjs": "^6.0.4",
@@ -66,7 +66,7 @@
         "@types/lodash-es": "^4.17.12",
         "@types/micromatch": "^4.0.9",
         "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.15.31",
+        "@types/node": "^22.15.32",
         "@vitest/coverage-v8": "^3.0.0",
         "byte-size": "^9.0.0",
         "cli-progress": "^3.12.0",
@@ -100,7 +100,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.31",
+        "@types/node": "^22.15.32",
         "typescript": "^5.3.3"
       }
     },
diff --git a/e2e/package.json b/e2e/package.json
index b87f7d2810..5c31d23ed1 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -25,7 +25,7 @@
     "@immich/sdk": "file:../open-api/typescript-sdk",
     "@playwright/test": "^1.44.1",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.15.31",
+    "@types/node": "^22.15.32",
     "@types/oidc-provider": "^9.0.0",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
diff --git a/open-api/typescript-sdk/package-lock.json b/open-api/typescript-sdk/package-lock.json
index 734cb642dc..83cf583230 100644
--- a/open-api/typescript-sdk/package-lock.json
+++ b/open-api/typescript-sdk/package-lock.json
@@ -12,7 +12,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.31",
+        "@types/node": "^22.15.32",
         "typescript": "^5.3.3"
       }
     },
diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json
index f3bf00c9b9..b699fce7a8 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.15.31",
+    "@types/node": "^22.15.32",
     "typescript": "^5.3.3"
   },
   "repository": {
diff --git a/server/package-lock.json b/server/package-lock.json
index 34999e5eba..0111d3171f 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -47,6 +47,7 @@
         "cookie-parser": "^1.4.7",
         "cron": "^3.5.0",
         "exiftool-vendored": "^28.3.1",
+        "express": "^5.1.0",
         "fast-glob": "^3.3.2",
         "fluent-ffmpeg": "^2.1.2",
         "geo-tz": "^8.0.0",
@@ -59,6 +60,7 @@
         "lodash": "^4.17.21",
         "luxon": "^3.4.2",
         "mnemonist": "^0.40.3",
+        "multer": "^2.0.1",
         "nest-commander": "^3.16.0",
         "nestjs-cls": "^5.0.0",
         "nestjs-kysely": "^1.1.0",
@@ -108,7 +110,7 @@
         "@types/luxon": "^3.6.2",
         "@types/mock-fs": "^4.13.1",
         "@types/multer": "^1.4.7",
-        "@types/node": "^22.15.31",
+        "@types/node": "^22.15.32",
         "@types/nodemailer": "^6.4.14",
         "@types/picomatch": "^4.0.0",
         "@types/pngjs": "^6.0.5",
diff --git a/server/package.json b/server/package.json
index f5093d36a6..72207526a5 100644
--- a/server/package.json
+++ b/server/package.json
@@ -136,7 +136,7 @@
     "@types/luxon": "^3.6.2",
     "@types/mock-fs": "^4.13.1",
     "@types/multer": "^1.4.7",
-    "@types/node": "^22.15.31",
+    "@types/node": "^22.15.32",
     "@types/nodemailer": "^6.4.14",
     "@types/picomatch": "^4.0.0",
     "@types/pngjs": "^6.0.5",

From 7edbeb2ed61f644f6f0e6a78c248a1436496bce7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 24 Jun 2025 11:19:00 +0100
Subject: [PATCH 035/337] chore(deps): update
 ghcr.io/immich-app/postgres:14-vectorchord0.3.0 docker digest to 3aef84a
 (#19481)

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 5188a2d017..f43e0cd1b0 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -39,7 +39,7 @@ services:
     image: redis:6.2-alpine@sha256:3211c33a618c457e5d241922c975dbc4f446d0bdb2dc75694f5573ef8e2d01fa
 
   database:
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0@sha256:9c704fb49ce27549df00f1b096cc93f8b0c959ef087507704d74954808f78a82
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0@sha256:3aef84a0a4fabbda17ef115c3019ba0c914ec73e9f6e59203674322d858b8eea
     command: -c fsync=off -c shared_preload_libraries=vchord.so -c config_file=/var/lib/postgresql/data/postgresql.conf
     environment:
       POSTGRES_PASSWORD: postgres

From 6c7b2e4b5c59264b2a8c23048126a1ef793ac6bc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 24 Jun 2025 11:19:40 +0100
Subject: [PATCH 036/337] chore(deps): pin ghcr.io/immich-app/postgres docker
 tag to 5f6a838 (#19480)

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

diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index cb2348945b..f44f8dae05 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -122,7 +122,7 @@ services:
 
   database:
     container_name: immich_postgres
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:5f6a838e4e44c8e0e019d0ebfe3ee8952b69afc2809b2c25f7b0119641978e91
     env_file:
       - .env
     environment:
diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
index 5fe121847d..18348620ca 100644
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -63,7 +63,7 @@ services:
 
   database:
     container_name: immich_postgres
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:5f6a838e4e44c8e0e019d0ebfe3ee8952b69afc2809b2c25f7b0119641978e91
     env_file:
       - .env
     environment:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a578167e68..c9ddee2a62 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -56,7 +56,7 @@ services:
 
   database:
     container_name: immich_postgres
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:5f6a838e4e44c8e0e019d0ebfe3ee8952b69afc2809b2c25f7b0119641978e91
     environment:
       POSTGRES_PASSWORD: ${DB_PASSWORD}
       POSTGRES_USER: ${DB_USERNAME}

From bfe32c2bb9a9a8d202ee145f6ad1a825e84eaf05 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Tue, 24 Jun 2025 07:16:09 -0400
Subject: [PATCH 037/337] chore: npm caching (#19410)

---
 .github/workflows/cli.yml        |  3 +++
 .github/workflows/docs-build.yml |  2 ++
 .github/workflows/fix-format.yml |  2 ++
 .github/workflows/sdk.yml        |  2 ++
 .github/workflows/test.yml       | 26 ++++++++++++++++++++++++++
 5 files changed, 35 insertions(+)

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index 74f5970139..bf2b774ac4 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -38,6 +38,9 @@ jobs:
         with:
           node-version-file: './cli/.nvmrc'
           registry-url: 'https://registry.npmjs.org'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+
       - name: Prepare SDK
         run: npm ci --prefix ../open-api/typescript-sdk/
       - name: Build SDK
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
index 32010728cf..93b6c8ad04 100644
--- a/.github/workflows/docs-build.yml
+++ b/.github/workflows/docs-build.yml
@@ -57,6 +57,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './docs/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Run npm install
         run: npm ci
diff --git a/.github/workflows/fix-format.yml b/.github/workflows/fix-format.yml
index 7a90747c12..7ef80306ba 100644
--- a/.github/workflows/fix-format.yml
+++ b/.github/workflows/fix-format.yml
@@ -32,6 +32,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Fix formatting
         run: make install-all && make format-all
diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index bb3ae8f27f..c94ee14209 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -25,6 +25,8 @@ jobs:
         with:
           node-version-file: './open-api/typescript-sdk/.nvmrc'
           registry-url: 'https://registry.npmjs.org'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
       - name: Install deps
         run: npm ci
       - name: Build
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c30c58fec2..9e3a762f4e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -84,6 +84,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Run npm install
         run: npm ci
@@ -125,6 +127,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './cli/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Setup typescript-sdk
         run: npm ci && npm run build
@@ -170,6 +174,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './cli/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Setup typescript-sdk
         run: npm ci && npm run build
@@ -208,6 +214,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './web/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Run setup typescript-sdk
         run: npm ci && npm run build
@@ -249,6 +257,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './web/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Run setup typescript-sdk
         run: npm ci && npm run build
@@ -282,6 +292,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './web/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Install dependencies
         run: npm --prefix=web ci
@@ -326,6 +338,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './e2e/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Run setup typescript-sdk
         run: npm ci && npm run build
@@ -369,6 +383,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Run npm install
         run: npm ci
@@ -402,6 +418,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './e2e/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Run setup typescript-sdk
         run: npm ci && npm run build
@@ -450,6 +468,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './e2e/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Run setup typescript-sdk
         run: npm ci && npm run build
@@ -568,6 +588,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './.github/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Run npm install
         run: npm ci
@@ -609,6 +631,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Install server dependencies
         run: npm --prefix=server ci
@@ -670,6 +694,8 @@ jobs:
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Install server dependencies
         run: npm ci

From c759233d8c06327e3e42f18a4ec51421cc063ec5 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 24 Jun 2025 08:42:38 -0400
Subject: [PATCH 038/337] fix(server): include hidden assets in missing
 metadata extraction query (#19471)

---
 server/src/queries/asset.job.repository.sql     | 1 -
 server/src/repositories/asset-job.repository.ts | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/src/queries/asset.job.repository.sql b/server/src/queries/asset.job.repository.sql
index 5caf2e30cd..3a88642c0e 100644
--- a/server/src/queries/asset.job.repository.sql
+++ b/server/src/queries/asset.job.repository.sql
@@ -394,7 +394,6 @@ where
     "asset_job_status"."metadataExtractedAt" is null
     or "asset_job_status"."assetId" is null
   )
-  and "assets"."visibility" != $1
   and "assets"."deletedAt" is null
 
 -- AssetJobRepository.getForStorageTemplateJob
diff --git a/server/src/repositories/asset-job.repository.ts b/server/src/repositories/asset-job.repository.ts
index d629202f04..af9d5affb1 100644
--- a/server/src/repositories/asset-job.repository.ts
+++ b/server/src/repositories/asset-job.repository.ts
@@ -273,8 +273,7 @@ export class AssetJobRepository {
           .leftJoin('asset_job_status', 'asset_job_status.assetId', 'assets.id')
           .where((eb) =>
             eb.or([eb('asset_job_status.metadataExtractedAt', 'is', null), eb('asset_job_status.assetId', 'is', null)]),
-          )
-          .where('assets.visibility', '!=', AssetVisibility.HIDDEN),
+          ),
       )
       .where('assets.deletedAt', 'is', null)
       .stream();

From 7d0e8f50f799782475fd5c1f0c2fd9719f2902aa Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Tue, 24 Jun 2025 09:20:24 -0500
Subject: [PATCH 039/337] feat(mobile): deep links (#19232)

* add deep linking on ios app

* add deeplinking to android

* code review fixes

* lint

* cleanly handle malformed URIs when launching app

* refactor deep link builder/service, still have bug with navigation stack not containing TabControllerRoute

* fix: tab controller insertion conditions

* add my.immich.app app linking

* chore: remove one-liner if statement

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../android/app/src/main/AndroidManifest.xml  |   6 +
 mobile/ios/Runner/Info.plist                  |  16 +-
 mobile/ios/Runner/Runner.entitlements         |   4 +
 mobile/ios/Runner/RunnerProfile.entitlements  |   4 +
 mobile/lib/main.dart                          |  32 +++-
 .../lib/pages/common/splash_screen.page.dart  |   2 +-
 mobile/lib/providers/routes.provider.dart     |   1 +
 mobile/lib/repositories/album.repository.dart |   4 +
 .../lib/routing/app_navigation_observer.dart  |   5 +
 mobile/lib/routing/router.dart                |   3 +
 mobile/lib/services/album.service.dart        |   4 +
 mobile/lib/services/asset.service.dart        |   5 +
 mobile/lib/services/deep_link.service.dart    | 140 ++++++++++++++++++
 mobile/lib/services/memory.service.dart       |  30 ++++
 14 files changed, 251 insertions(+), 5 deletions(-)
 create mode 100644 mobile/lib/services/deep_link.service.dart

diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index 2179c9eb3c..d5a7c9ca86 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -90,6 +90,12 @@
         <data android:mimeType="video/*" />
       </intent-filter>
 
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="immich" />
+      </intent-filter>
     </activity>
 
 
diff --git a/mobile/ios/Runner/Info.plist b/mobile/ios/Runner/Info.plist
index b2566e6790..4237813dfc 100644
--- a/mobile/ios/Runner/Info.plist
+++ b/mobile/ios/Runner/Info.plist
@@ -86,11 +86,23 @@
       <dict>
         <key>CFBundleTypeRole</key>
         <string>Editor</string>
+        <key>CFBundleURLName</key>
+        <string>Share Extension</string>
         <key>CFBundleURLSchemes</key>
         <array>
           <string>ShareMedia-$(PRODUCT_BUNDLE_IDENTIFIER)</string>
         </array>
       </dict>
+      <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleURLName</key>
+        <string>Deep Link</string>
+        <key>CFBundleURLSchemes</key>
+        <array>
+          <string>immich</string>
+        </array>
+      </dict>
     </array>
     <key>CFBundleVersion</key>
     <string>210</string>
@@ -120,6 +132,8 @@
     </array>
     <key>NSCameraUsageDescription</key>
     <string>We need to access the camera to let you take beautiful video using this app</string>
+    <key>NSFaceIDUsageDescription</key>
+    <string>We need to use FaceID to allow access to your locked folder</string>
     <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
     <string>We require this permission to access the local WiFi name for background upload mechanism</string>
     <key>NSLocationUsageDescription</key>
@@ -166,8 +180,6 @@
     <true />
     <key>io.flutter.embedded_views_preview</key>
     <true />
-    <key>NSFaceIDUsageDescription</key>
-    <string>We need to use FaceID to allow access to your locked folder</string>
     <key>NSLocalNetworkUsageDescription</key>
     <string>We need local network permission to connect to the local server using IP address and
       allow the casting feature to work</string>
diff --git a/mobile/ios/Runner/Runner.entitlements b/mobile/ios/Runner/Runner.entitlements
index d558e35e0a..e5862cb213 100644
--- a/mobile/ios/Runner/Runner.entitlements
+++ b/mobile/ios/Runner/Runner.entitlements
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:my.immich.app</string>
+	</array>
 	<key>com.apple.developer.networking.wifi-info</key>
 	<true/>
 	<key>com.apple.security.application-groups</key>
diff --git a/mobile/ios/Runner/RunnerProfile.entitlements b/mobile/ios/Runner/RunnerProfile.entitlements
index d44633db40..6a5c086baf 100644
--- a/mobile/ios/Runner/RunnerProfile.entitlements
+++ b/mobile/ios/Runner/RunnerProfile.entitlements
@@ -4,6 +4,10 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:my.immich.app</string>
+	</array>
 	<key>com.apple.developer.networking.wifi-info</key>
 	<true/>
 	<key>com.apple.security.application-groups</key>
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index bc9edcd46e..1f18ecdf5a 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:auto_route/auto_route.dart';
 import 'package:background_downloader/background_downloader.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -17,6 +18,7 @@ import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provide
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/locale_provider.dart';
+import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/theme.provider.dart';
 import 'package:immich_mobile/routing/app_navigation_observer.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -26,6 +28,7 @@ import 'package:immich_mobile/theme/dynamic_theme.dart';
 import 'package:immich_mobile/theme/theme_data.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/cache/widgets_binding.dart';
+import 'package:immich_mobile/services/deep_link.service.dart';
 import 'package:immich_mobile/utils/download.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/utils/migration.dart';
@@ -169,6 +172,31 @@ class ImmichAppState extends ConsumerState<ImmichApp>
     );
   }
 
+  Future<DeepLink> _deepLinkBuilder(PlatformDeepLink deepLink) async {
+    final deepLinkHandler = ref.read(deepLinkServiceProvider);
+    final currentRouteName = ref.read(currentRouteNameProvider.notifier).state;
+
+    if (deepLink.uri.scheme == "immich") {
+      final proposedRoute = await deepLinkHandler.handleScheme(
+        deepLink,
+        currentRouteName == SplashScreenRoute.name,
+      );
+
+      return proposedRoute;
+    }
+
+    if (deepLink.uri.host == "my.immich.app") {
+      final proposedRoute = await deepLinkHandler.handleMyImmichApp(
+        deepLink,
+        currentRouteName == SplashScreenRoute.name,
+      );
+
+      return proposedRoute;
+    }
+
+    return DeepLink.path(deepLink.path);
+  }
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -220,8 +248,8 @@ class ImmichAppState extends ConsumerState<ImmichApp>
           colorScheme: immichTheme.light,
           locale: context.locale,
         ),
-        routeInformationParser: router.defaultRouteParser(),
-        routerDelegate: router.delegate(
+        routerConfig: router.config(
+          deepLinkBuilder: _deepLinkBuilder,
           navigatorObservers: () => [AppNavigationObserver(ref: ref)],
         ),
       ),
diff --git a/mobile/lib/pages/common/splash_screen.page.dart b/mobile/lib/pages/common/splash_screen.page.dart
index b640aaa3ed..4b7a10d612 100644
--- a/mobile/lib/pages/common/splash_screen.page.dart
+++ b/mobile/lib/pages/common/splash_screen.page.dart
@@ -72,7 +72,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
       return;
     }
 
-    if (context.router.current.name != ShareIntentRoute.name) {
+    if (context.router.current.name == SplashScreenRoute.name) {
       context.replaceRoute(const TabControllerRoute());
     }
 
diff --git a/mobile/lib/providers/routes.provider.dart b/mobile/lib/providers/routes.provider.dart
index a5b903e312..74d86f4767 100644
--- a/mobile/lib/providers/routes.provider.dart
+++ b/mobile/lib/providers/routes.provider.dart
@@ -1,3 +1,4 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 final inLockedViewProvider = StateProvider<bool>((ref) => false);
+final currentRouteNameProvider = StateProvider<String?>((ref) => null);
diff --git a/mobile/lib/repositories/album.repository.dart b/mobile/lib/repositories/album.repository.dart
index b555f918b4..aeb9fb3947 100644
--- a/mobile/lib/repositories/album.repository.dart
+++ b/mobile/lib/repositories/album.repository.dart
@@ -93,6 +93,10 @@ class AlbumRepository extends DatabaseRepository {
 
   Future<Album?> get(int id) => db.albums.get(id);
 
+  Future<Album?> getByRemoteId(String remoteId) {
+    return db.albums.filter().remoteIdEqualTo(remoteId).findFirst();
+  }
+
   Future<void> removeUsers(Album album, List<UserDto> users) => txn(
         () => album.sharedUsers.update(unlink: users.map(entity.User.fromDto)),
       );
diff --git a/mobile/lib/routing/app_navigation_observer.dart b/mobile/lib/routing/app_navigation_observer.dart
index 44662c0b8b..047e897c8e 100644
--- a/mobile/lib/routing/app_navigation_observer.dart
+++ b/mobile/lib/routing/app_navigation_observer.dart
@@ -25,6 +25,11 @@ class AppNavigationObserver extends AutoRouterObserver {
   @override
   void didPush(Route route, Route? previousRoute) {
     _handleLockedViewState(route, previousRoute);
+
+    Future(
+      () => ref.read(currentRouteNameProvider.notifier).state =
+          route.settings.name,
+    );
   }
 
   _handleLockedViewState(Route route, Route? previousRoute) {
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 3e1563dd25..79f74bc5ee 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -340,5 +340,8 @@ class AppRouter extends RootStackRouter {
       page: MainTimelineRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    // required to handle all deeplinks in deep_link.service.dart
+    // auto_route_library#1722
+    RedirectRoute(path: '*', redirectTo: '/'),
   ];
 }
diff --git a/mobile/lib/services/album.service.dart b/mobile/lib/services/album.service.dart
index cc1f56f579..6733ec41b2 100644
--- a/mobile/lib/services/album.service.dart
+++ b/mobile/lib/services/album.service.dart
@@ -486,6 +486,10 @@ class AlbumService {
     return _albumRepository.get(id);
   }
 
+  Future<Album?> getAlbumByRemoteId(String remoteId) {
+    return _albumRepository.getByRemoteId(remoteId);
+  }
+
   Stream<Album?> watchAlbum(int id) {
     return _albumRepository.watchAlbum(id);
   }
diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart
index b761ebb39b..cb7f59e3a9 100644
--- a/mobile/lib/services/asset.service.dart
+++ b/mobile/lib/services/asset.service.dart
@@ -549,4 +549,9 @@ class AssetService {
 
     await _assetRepository.updateAll(updatedAssets);
   }
+
+  Future<Asset?> getAssetByRemoteId(String remoteId) async {
+    final assets = await _assetRepository.getAllByRemoteId([remoteId]);
+    return assets.isNotEmpty ? assets.first : null;
+  }
 }
diff --git a/mobile/lib/services/deep_link.service.dart b/mobile/lib/services/deep_link.service.dart
new file mode 100644
index 0000000000..67b6b79793
--- /dev/null
+++ b/mobile/lib/services/deep_link.service.dart
@@ -0,0 +1,140 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:immich_mobile/providers/album/current_album.provider.dart';
+import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/album.service.dart';
+import 'package:immich_mobile/services/asset.service.dart';
+import 'package:immich_mobile/services/memory.service.dart';
+import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+final deepLinkServiceProvider = Provider(
+  (ref) => DeepLinkService(
+    ref.watch(memoryServiceProvider),
+    ref.watch(assetServiceProvider),
+    ref.watch(albumServiceProvider),
+    ref.watch(currentAssetProvider.notifier),
+    ref.watch(currentAlbumProvider.notifier),
+  ),
+);
+
+class DeepLinkService {
+  final MemoryService _memoryService;
+  final AssetService _assetService;
+  final AlbumService _albumService;
+  final CurrentAsset _currentAsset;
+  final CurrentAlbum _currentAlbum;
+
+  DeepLinkService(
+    this._memoryService,
+    this._assetService,
+    this._albumService,
+    this._currentAsset,
+    this._currentAlbum,
+  );
+
+  Future<DeepLink> handleScheme(PlatformDeepLink link, bool isColdStart) async {
+    // get everything after the scheme, since Uri cannot parse path
+    final intent = link.uri.host;
+    final queryParams = link.uri.queryParameters;
+
+    PageRouteInfo<dynamic>? deepLinkRoute;
+
+    switch (intent) {
+      case "memory":
+        deepLinkRoute = await _buildMemoryDeepLink(queryParams['id'] ?? '');
+      case "asset":
+        deepLinkRoute = await _buildAssetDeepLink(queryParams['id'] ?? '');
+      case "album":
+        deepLinkRoute = await _buildAlbumDeepLink(queryParams['id'] ?? '');
+    }
+
+    // Deep link resolution failed, safely handle it based on the app state
+    if (deepLinkRoute == null) {
+      if (isColdStart) {
+        return DeepLink.defaultPath;
+      }
+
+      return DeepLink.none;
+    }
+
+    return DeepLink([
+      // we need something to segue back to if the app was cold started
+      if (isColdStart) const PhotosRoute(),
+      deepLinkRoute,
+    ]);
+  }
+
+  Future<DeepLink> handleMyImmichApp(
+    PlatformDeepLink link,
+    bool isColdStart,
+  ) async {
+    final path = link.uri.path;
+
+    const uuidRegex =
+        r'[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}';
+    final assetRegex = RegExp('/photos/($uuidRegex)');
+    final albumRegex = RegExp('/albums/($uuidRegex)');
+
+    PageRouteInfo<dynamic>? deepLinkRoute;
+    if (assetRegex.hasMatch(path)) {
+      final assetId = assetRegex.firstMatch(path)?.group(1) ?? '';
+      deepLinkRoute = await _buildAssetDeepLink(assetId);
+    } else if (albumRegex.hasMatch(path)) {
+      final albumId = albumRegex.firstMatch(path)?.group(1) ?? '';
+      deepLinkRoute = await _buildAlbumDeepLink(albumId);
+    }
+
+    // Deep link resolution failed, safely handle it based on the app state
+    if (deepLinkRoute == null) {
+      if (isColdStart) return DeepLink.defaultPath;
+      return DeepLink.none;
+    }
+
+    return DeepLink([
+      // we need something to segue back to if the app was cold started
+      if (isColdStart) const PhotosRoute(),
+      deepLinkRoute,
+    ]);
+  }
+
+  Future<MemoryRoute?> _buildMemoryDeepLink(String memoryId) async {
+    final memory = await _memoryService.getMemoryById(memoryId);
+
+    if (memory == null) {
+      return null;
+    }
+
+    return MemoryRoute(memories: [memory], memoryIndex: 0);
+  }
+
+  Future<GalleryViewerRoute?> _buildAssetDeepLink(String assetId) async {
+    final asset = await _assetService.getAssetByRemoteId(assetId);
+
+    if (asset == null) {
+      return null;
+    }
+
+    _currentAsset.set(asset);
+    final renderList = await RenderList.fromAssets([asset], GroupAssetsBy.auto);
+
+    return GalleryViewerRoute(
+      renderList: renderList,
+      initialIndex: 0,
+      heroOffset: 0,
+      showStack: true,
+    );
+  }
+
+  Future<AlbumViewerRoute?> _buildAlbumDeepLink(String albumId) async {
+    final album = await _albumService.getAlbumByRemoteId(albumId);
+
+    if (album == null) {
+      return null;
+    }
+
+    _currentAlbum.set(album);
+
+    return AlbumViewerRoute(albumId: album.id);
+  }
+}
diff --git a/mobile/lib/services/memory.service.dart b/mobile/lib/services/memory.service.dart
index 6e9d017c7a..a44a5ad1bd 100644
--- a/mobile/lib/services/memory.service.dart
+++ b/mobile/lib/services/memory.service.dart
@@ -59,4 +59,34 @@ class MemoryService {
       return null;
     }
   }
+
+  Future<Memory?> getMemoryById(String id) async {
+    try {
+      final memoryResponse = await _apiService.memoriesApi.getMemory(id);
+
+      if (memoryResponse == null) {
+        return null;
+      }
+      final dbAssets = await _assetRepository
+          .getAllByRemoteId(memoryResponse.assets.map((e) => e.id));
+      if (dbAssets.isEmpty) {
+        log.warning("No assets found for memory with ID: $id");
+        return null;
+      }
+      final yearsAgo = DateTime.now().year - memoryResponse.data.year;
+      final String title = 'years_ago'.t(
+        args: {
+          'years': yearsAgo.toString(),
+        },
+      );
+
+      return Memory(
+        title: title,
+        assets: dbAssets,
+      );
+    } catch (error, stack) {
+      log.severe("Cannot get memory with ID: $id", error, stack);
+      return null;
+    }
+  }
 }

From bcfc967d778a8d638786036537075a68de9ed14c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 24 Jun 2025 17:55:37 +0300
Subject: [PATCH 040/337] fix(deps): update machine-learning (#19219)

---
 machine-learning/Dockerfile |   8 +-
 machine-learning/uv.lock    | 141 ++++++++++++++++++------------------
 2 files changed, 75 insertions(+), 74 deletions(-)

diff --git a/machine-learning/Dockerfile b/machine-learning/Dockerfile
index 1f4d7aa635..b2e389af8f 100644
--- a/machine-learning/Dockerfile
+++ b/machine-learning/Dockerfile
@@ -1,6 +1,6 @@
 ARG DEVICE=cpu
 
-FROM python:3.11-bookworm@sha256:d2621a9f74d31a8a60af19f97b09cc3ac54382c8680b6544018713a12ef6c048 AS builder-cpu
+FROM python:3.11-bookworm@sha256:ce3b954c9285a7a145cba620bae03db836ab890b6b9e0d05a3ca522ea00dfbc9 AS builder-cpu
 
 FROM builder-cpu AS builder-openvino
 
@@ -59,7 +59,7 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 
 RUN apt-get update && apt-get install -y --no-install-recommends g++
 
-COPY --from=ghcr.io/astral-sh/uv:latest@sha256:4faec156e35a5f345d57804d8858c6ba1cf6352ce5f4bffc11b7fdebdef46a38 /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:latest@sha256:cda0fdc9b6066975ba4c791597870d18bc3a441dfc18ab24c5e888c16e15780c /uv /uvx /bin/
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
@@ -68,11 +68,11 @@ RUN if [ "$DEVICE" = "rocm" ]; then \
     uv pip install /opt/onnxruntime_rocm-*.whl; \
     fi
 
-FROM python:3.11-slim-bookworm@sha256:7a3ed1226224bcc1fe5443262363d42f48cf832a540c1836ba8ccbeaadf8637c AS prod-cpu
+FROM python:3.11-slim-bookworm@sha256:9e1912aab0a30bbd9488eb79063f68f42a68ab0946cbe98fecf197fe5b085506 AS prod-cpu
 
 ENV LD_PRELOAD=/usr/lib/libmimalloc.so.2
 
-FROM python:3.11-slim-bookworm@sha256:7a3ed1226224bcc1fe5443262363d42f48cf832a540c1836ba8ccbeaadf8637c AS prod-openvino
+FROM python:3.11-slim-bookworm@sha256:9e1912aab0a30bbd9488eb79063f68f42a68ab0946cbe98fecf197fe5b085506 AS prod-openvino
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -yqq ocl-icd-libopencl1 wget && \
diff --git a/machine-learning/uv.lock b/machine-learning/uv.lock
index 115ea259f3..4e40ede5af 100644
--- a/machine-learning/uv.lock
+++ b/machine-learning/uv.lock
@@ -517,16 +517,16 @@ wheels = [
 
 [[package]]
 name = "fastapi"
-version = "0.115.12"
+version = "0.115.13"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pydantic" },
     { name = "starlette" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/f4/55/ae499352d82338331ca1e28c7f4a63bfd09479b16395dce38cf50a39e2c2/fastapi-0.115.12.tar.gz", hash = "sha256:1e2c2a2646905f9e83d32f04a3f86aff4a286669c6c950ca95b5fd68c2602681", size = 295236, upload-time = "2025-03-23T22:55:43.822Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/20/64/ec0788201b5554e2a87c49af26b77a4d132f807a0fa9675257ac92c6aa0e/fastapi-0.115.13.tar.gz", hash = "sha256:55d1d25c2e1e0a0a50aceb1c8705cd932def273c102bff0b1c1da88b3c6eb307", size = 295680, upload-time = "2025-06-17T11:49:45.575Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/50/b3/b51f09c2ba432a576fe63758bddc81f78f0c6309d9e5c10d194313bf021e/fastapi-0.115.12-py3-none-any.whl", hash = "sha256:e94613d6c05e27be7ffebdd6ea5f388112e5e430c8f7d6494a9d1d88d43e814d", size = 95164, upload-time = "2025-03-23T22:55:42.101Z" },
+    { url = "https://files.pythonhosted.org/packages/59/4a/e17764385382062b0edbb35a26b7cf76d71e27e456546277a42ba6545c6e/fastapi-0.115.13-py3-none-any.whl", hash = "sha256:0a0cab59afa7bab22f5eb347f8c9864b681558c278395e94035a741fc10cd865", size = 95315, upload-time = "2025-06-17T11:49:44.106Z" },
 ]
 
 [[package]]
@@ -900,7 +900,7 @@ wheels = [
 
 [[package]]
 name = "huggingface-hub"
-version = "0.32.4"
+version = "0.33.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "filelock" },
@@ -912,9 +912,9 @@ dependencies = [
     { name = "tqdm" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/60/c8/4f7d270285c46324fd66f62159eb16739aa5696f422dba57678a8c6b78e9/huggingface_hub-0.32.4.tar.gz", hash = "sha256:f61d45cd338736f59fb0e97550b74c24ee771bcc92c05ae0766b9116abe720be", size = 424494, upload-time = "2025-06-03T09:59:46.105Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/91/8a/1362d565fefabaa4185cf3ae842a98dbc5b35146f5694f7080f043a6952f/huggingface_hub-0.33.0.tar.gz", hash = "sha256:aa31f70d29439d00ff7a33837c03f1f9dd83971ce4e29ad664d63ffb17d3bb97", size = 426179, upload-time = "2025-06-11T17:08:07.913Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/67/8b/222140f3cfb6f17b0dd8c4b9a0b36bd4ebefe9fb0098ba35d6960abcda0f/huggingface_hub-0.32.4-py3-none-any.whl", hash = "sha256:37abf8826b38d971f60d3625229221c36e53fe58060286db9baf619cfbf39767", size = 512101, upload-time = "2025-06-03T09:59:44.099Z" },
+    { url = "https://files.pythonhosted.org/packages/33/fb/53587a89fbc00799e4179796f51b3ad713c5de6bb680b2becb6d37c94649/huggingface_hub-0.33.0-py3-none-any.whl", hash = "sha256:e8668875b40c68f9929150d99727d39e5ebb8a05a98e4191b908dc7ded9074b3", size = 514799, upload-time = "2025-06-11T17:08:05.757Z" },
 ]
 
 [[package]]
@@ -1225,7 +1225,7 @@ wheels = [
 
 [[package]]
 name = "locust"
-version = "2.37.9"
+version = "2.37.11"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "configargparse" },
@@ -1245,14 +1245,14 @@ dependencies = [
     { name = "typing-extensions", marker = "python_full_version < '3.11'" },
     { name = "werkzeug" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/90/05/2bfdf19756c6a12f6f9513f75340ecf0595d83cab4d9fc91162225908e3d/locust-2.37.9.tar.gz", hash = "sha256:e43673b594ec5ecde4f9ba6e0d5c66c00d7c0ae93591951abe83e8d186c67175", size = 2252507, upload-time = "2025-06-05T09:26:58.186Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/4f/19/66cdab585f7d4385be615d3792402fc75a1bed7519e5283adbe7133dbc78/locust-2.37.11.tar.gz", hash = "sha256:89c79bc599aa57160bd41dd3876e35d8b9dee5abded78e35008d01fd8f1640ed", size = 2252602, upload-time = "2025-06-23T08:22:23.922Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/33/1c/0ece4176231c578e819d970ec08d124492833e50aafd171c582bcc414446/locust-2.37.9-py3-none-any.whl", hash = "sha256:e17da439f3a252d1fb6d4c34daf00d7e8b87e99d833a32e8a79f4f8ebb07767d", size = 2269084, upload-time = "2025-06-05T09:26:56.257Z" },
+    { url = "https://files.pythonhosted.org/packages/3a/2d/e5ae05911521bf84113be349d51b16d54589e986837d2d518f63434ea3ec/locust-2.37.11-py3-none-any.whl", hash = "sha256:b826f95fbfd5d9a32df6ab1b74672b88e65bbc33ec99fdc10af98079952ad517", size = 2269179, upload-time = "2025-06-23T08:22:21.067Z" },
 ]
 
 [[package]]
 name = "locust-cloud"
-version = "1.23.1"
+version = "1.24.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "configargparse" },
@@ -1262,9 +1262,9 @@ dependencies = [
     { name = "python-socketio", extra = ["client"] },
     { name = "tomli", marker = "python_full_version < '3.11'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/bd/7c/d9cbbd051490aeedfbd6ddda8ad48f77dd848ee490f6ebd166d20db5911e/locust_cloud-1.23.1.tar.gz", hash = "sha256:a09161752b8c9a9205e97cef5223ee3ad967bc2d91c52d61952aaa3da6802a55", size = 450937, upload-time = "2025-06-05T06:07:53.773Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/d9/77/bda24167a2b763ba5d3cad1f3fa2a938f5273e51a61bffdbc8dc2e3ba24d/locust_cloud-1.24.2.tar.gz", hash = "sha256:a2656537ff367e6d4d4673477ba9e81ed73a8423a71573cd2512248740eded77", size = 451122, upload-time = "2025-06-23T11:08:00.558Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/7e/01/5af43edee540e38ba0ee0a2e3beb72c50073e0f646bb543a8b34650315e3/locust_cloud-1.23.1-py3-none-any.whl", hash = "sha256:11677895c6ed6d0beef1b425a6f04f10ea2cfcaeaefbf00a97fb3c9134296e54", size = 408323, upload-time = "2025-06-05T06:07:51.947Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/38/8cda8aa1c6dfe5c5abbf69a9b10c03585c37eff64ca92733a291806052ac/locust_cloud-1.24.2-py3-none-any.whl", hash = "sha256:64a5e6f2bf0a1a012d9805291d44fb57e57535c2b5c0fa5bc87ba0d7cce9ef9c", size = 408594, upload-time = "2025-06-23T11:07:59.092Z" },
 ]
 
 [[package]]
@@ -1415,7 +1415,7 @@ wheels = [
 
 [[package]]
 name = "mypy"
-version = "1.16.0"
+version = "1.16.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "mypy-extensions" },
@@ -1423,33 +1423,33 @@ dependencies = [
     { name = "tomli", marker = "python_full_version < '3.11'" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/d4/38/13c2f1abae94d5ea0354e146b95a1be9b2137a0d506728e0da037c4276f6/mypy-1.16.0.tar.gz", hash = "sha256:84b94283f817e2aa6350a14b4a8fb2a35a53c286f97c9d30f53b63620e7af8ab", size = 3323139, upload-time = "2025-05-29T13:46:12.532Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/81/69/92c7fa98112e4d9eb075a239caa4ef4649ad7d441545ccffbd5e34607cbb/mypy-1.16.1.tar.gz", hash = "sha256:6bd00a0a2094841c5e47e7374bb42b83d64c527a502e3334e1173a0c24437bab", size = 3324747, upload-time = "2025-06-16T16:51:35.145Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/64/5e/a0485f0608a3d67029d3d73cec209278b025e3493a3acfda3ef3a88540fd/mypy-1.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7909541fef256527e5ee9c0a7e2aeed78b6cda72ba44298d1334fe7881b05c5c", size = 10967416, upload-time = "2025-05-29T13:34:17.783Z" },
-    { url = "https://files.pythonhosted.org/packages/4b/53/5837c221f74c0d53a4bfc3003296f8179c3a2a7f336d7de7bbafbe96b688/mypy-1.16.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e71d6f0090c2256c713ed3d52711d01859c82608b5d68d4fa01a3fe30df95571", size = 10087654, upload-time = "2025-05-29T13:32:37.878Z" },
-    { url = "https://files.pythonhosted.org/packages/29/59/5fd2400352c3093bed4c09017fe671d26bc5bb7e6ef2d4bf85f2a2488104/mypy-1.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:936ccfdd749af4766be824268bfe22d1db9eb2f34a3ea1d00ffbe5b5265f5491", size = 11875192, upload-time = "2025-05-29T13:34:54.281Z" },
-    { url = "https://files.pythonhosted.org/packages/ad/3e/4bfec74663a64c2012f3e278dbc29ffe82b121bc551758590d1b6449ec0c/mypy-1.16.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4086883a73166631307fdd330c4a9080ce24913d4f4c5ec596c601b3a4bdd777", size = 12612939, upload-time = "2025-05-29T13:33:14.766Z" },
-    { url = "https://files.pythonhosted.org/packages/88/1f/fecbe3dcba4bf2ca34c26ca016383a9676711907f8db4da8354925cbb08f/mypy-1.16.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:feec38097f71797da0231997e0de3a58108c51845399669ebc532c815f93866b", size = 12874719, upload-time = "2025-05-29T13:21:52.09Z" },
-    { url = "https://files.pythonhosted.org/packages/f3/51/c2d280601cd816c43dfa512a759270d5a5ef638d7ac9bea9134c8305a12f/mypy-1.16.0-cp310-cp310-win_amd64.whl", hash = "sha256:09a8da6a0ee9a9770b8ff61b39c0bb07971cda90e7297f4213741b48a0cc8d93", size = 9487053, upload-time = "2025-05-29T13:33:29.797Z" },
-    { url = "https://files.pythonhosted.org/packages/24/c4/ff2f79db7075c274fe85b5fff8797d29c6b61b8854c39e3b7feb556aa377/mypy-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9f826aaa7ff8443bac6a494cf743f591488ea940dd360e7dd330e30dd772a5ab", size = 10884498, upload-time = "2025-05-29T13:18:54.066Z" },
-    { url = "https://files.pythonhosted.org/packages/02/07/12198e83006235f10f6a7808917376b5d6240a2fd5dce740fe5d2ebf3247/mypy-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:82d056e6faa508501af333a6af192c700b33e15865bda49611e3d7d8358ebea2", size = 10011755, upload-time = "2025-05-29T13:34:00.851Z" },
-    { url = "https://files.pythonhosted.org/packages/f1/9b/5fd5801a72b5d6fb6ec0105ea1d0e01ab2d4971893076e558d4b6d6b5f80/mypy-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:089bedc02307c2548eb51f426e085546db1fa7dd87fbb7c9fa561575cf6eb1ff", size = 11800138, upload-time = "2025-05-29T13:32:55.082Z" },
-    { url = "https://files.pythonhosted.org/packages/2e/81/a117441ea5dfc3746431e51d78a4aca569c677aa225bca2cc05a7c239b61/mypy-1.16.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6a2322896003ba66bbd1318c10d3afdfe24e78ef12ea10e2acd985e9d684a666", size = 12533156, upload-time = "2025-05-29T13:19:12.963Z" },
-    { url = "https://files.pythonhosted.org/packages/3f/38/88ec57c6c86014d3f06251e00f397b5a7daa6888884d0abf187e4f5f587f/mypy-1.16.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:021a68568082c5b36e977d54e8f1de978baf401a33884ffcea09bd8e88a98f4c", size = 12742426, upload-time = "2025-05-29T13:20:22.72Z" },
-    { url = "https://files.pythonhosted.org/packages/bd/53/7e9d528433d56e6f6f77ccf24af6ce570986c2d98a5839e4c2009ef47283/mypy-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:54066fed302d83bf5128632d05b4ec68412e1f03ef2c300434057d66866cea4b", size = 9478319, upload-time = "2025-05-29T13:21:17.582Z" },
-    { url = "https://files.pythonhosted.org/packages/70/cf/158e5055e60ca2be23aec54a3010f89dcffd788732634b344fc9cb1e85a0/mypy-1.16.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:c5436d11e89a3ad16ce8afe752f0f373ae9620841c50883dc96f8b8805620b13", size = 11062927, upload-time = "2025-05-29T13:35:52.328Z" },
-    { url = "https://files.pythonhosted.org/packages/94/34/cfff7a56be1609f5d10ef386342ce3494158e4d506516890142007e6472c/mypy-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f2622af30bf01d8fc36466231bdd203d120d7a599a6d88fb22bdcb9dbff84090", size = 10083082, upload-time = "2025-05-29T13:35:33.378Z" },
-    { url = "https://files.pythonhosted.org/packages/b3/7f/7242062ec6288c33d8ad89574df87c3903d394870e5e6ba1699317a65075/mypy-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d045d33c284e10a038f5e29faca055b90eee87da3fc63b8889085744ebabb5a1", size = 11828306, upload-time = "2025-05-29T13:21:02.164Z" },
-    { url = "https://files.pythonhosted.org/packages/6f/5f/b392f7b4f659f5b619ce5994c5c43caab3d80df2296ae54fa888b3d17f5a/mypy-1.16.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b4968f14f44c62e2ec4a038c8797a87315be8df7740dc3ee8d3bfe1c6bf5dba8", size = 12702764, upload-time = "2025-05-29T13:20:42.826Z" },
-    { url = "https://files.pythonhosted.org/packages/9b/c0/7646ef3a00fa39ac9bc0938626d9ff29d19d733011be929cfea59d82d136/mypy-1.16.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:eb14a4a871bb8efb1e4a50360d4e3c8d6c601e7a31028a2c79f9bb659b63d730", size = 12896233, upload-time = "2025-05-29T13:18:37.446Z" },
-    { url = "https://files.pythonhosted.org/packages/6d/38/52f4b808b3fef7f0ef840ee8ff6ce5b5d77381e65425758d515cdd4f5bb5/mypy-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:bd4e1ebe126152a7bbaa4daedd781c90c8f9643c79b9748caa270ad542f12bec", size = 9565547, upload-time = "2025-05-29T13:20:02.836Z" },
-    { url = "https://files.pythonhosted.org/packages/97/9c/ca03bdbefbaa03b264b9318a98950a9c683e06472226b55472f96ebbc53d/mypy-1.16.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:a9e056237c89f1587a3be1a3a70a06a698d25e2479b9a2f57325ddaaffc3567b", size = 11059753, upload-time = "2025-05-29T13:18:18.167Z" },
-    { url = "https://files.pythonhosted.org/packages/36/92/79a969b8302cfe316027c88f7dc6fee70129490a370b3f6eb11d777749d0/mypy-1.16.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0b07e107affb9ee6ce1f342c07f51552d126c32cd62955f59a7db94a51ad12c0", size = 10073338, upload-time = "2025-05-29T13:19:48.079Z" },
-    { url = "https://files.pythonhosted.org/packages/14/9b/a943f09319167da0552d5cd722104096a9c99270719b1afeea60d11610aa/mypy-1.16.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c6fb60cbd85dc65d4d63d37cb5c86f4e3a301ec605f606ae3a9173e5cf34997b", size = 11827764, upload-time = "2025-05-29T13:46:04.47Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/64/ff75e71c65a0cb6ee737287c7913ea155845a556c64144c65b811afdb9c7/mypy-1.16.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a7e32297a437cc915599e0578fa6bc68ae6a8dc059c9e009c628e1c47f91495d", size = 12701356, upload-time = "2025-05-29T13:35:13.553Z" },
-    { url = "https://files.pythonhosted.org/packages/0a/ad/0e93c18987a1182c350f7a5fab70550852f9fabe30ecb63bfbe51b602074/mypy-1.16.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:afe420c9380ccec31e744e8baff0d406c846683681025db3531b32db56962d52", size = 12900745, upload-time = "2025-05-29T13:17:24.409Z" },
-    { url = "https://files.pythonhosted.org/packages/28/5d/036c278d7a013e97e33f08c047fe5583ab4f1fc47c9a49f985f1cdd2a2d7/mypy-1.16.0-cp313-cp313-win_amd64.whl", hash = "sha256:55f9076c6ce55dd3f8cd0c6fff26a008ca8e5131b89d5ba6d86bd3f47e736eeb", size = 9572200, upload-time = "2025-05-29T13:33:44.92Z" },
-    { url = "https://files.pythonhosted.org/packages/99/a3/6ed10530dec8e0fdc890d81361260c9ef1f5e5c217ad8c9b21ecb2b8366b/mypy-1.16.0-py3-none-any.whl", hash = "sha256:29e1499864a3888bca5c1542f2d7232c6e586295183320caa95758fc84034031", size = 2265773, upload-time = "2025-05-29T13:35:18.762Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/12/2bf23a80fcef5edb75de9a1e295d778e0f46ea89eb8b115818b663eff42b/mypy-1.16.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b4f0fed1022a63c6fec38f28b7fc77fca47fd490445c69d0a66266c59dd0b88a", size = 10958644, upload-time = "2025-06-16T16:51:11.649Z" },
+    { url = "https://files.pythonhosted.org/packages/08/50/bfe47b3b278eacf348291742fd5e6613bbc4b3434b72ce9361896417cfe5/mypy-1.16.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:86042bbf9f5a05ea000d3203cf87aa9d0ccf9a01f73f71c58979eb9249f46d72", size = 10087033, upload-time = "2025-06-16T16:35:30.089Z" },
+    { url = "https://files.pythonhosted.org/packages/21/de/40307c12fe25675a0776aaa2cdd2879cf30d99eec91b898de00228dc3ab5/mypy-1.16.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ea7469ee5902c95542bea7ee545f7006508c65c8c54b06dc2c92676ce526f3ea", size = 11875645, upload-time = "2025-06-16T16:35:48.49Z" },
+    { url = "https://files.pythonhosted.org/packages/a6/d8/85bdb59e4a98b7a31495bd8f1a4445d8ffc86cde4ab1f8c11d247c11aedc/mypy-1.16.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:352025753ef6a83cb9e7f2427319bb7875d1fdda8439d1e23de12ab164179574", size = 12616986, upload-time = "2025-06-16T16:48:39.526Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/d0/bb25731158fa8f8ee9e068d3e94fcceb4971fedf1424248496292512afe9/mypy-1.16.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:ff9fa5b16e4c1364eb89a4d16bcda9987f05d39604e1e6c35378a2987c1aac2d", size = 12878632, upload-time = "2025-06-16T16:36:08.195Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/11/822a9beb7a2b825c0cb06132ca0a5183f8327a5e23ef89717c9474ba0bc6/mypy-1.16.1-cp310-cp310-win_amd64.whl", hash = "sha256:1256688e284632382f8f3b9e2123df7d279f603c561f099758e66dd6ed4e8bd6", size = 9484391, upload-time = "2025-06-16T16:37:56.151Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/61/ec1245aa1c325cb7a6c0f8570a2eee3bfc40fa90d19b1267f8e50b5c8645/mypy-1.16.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:472e4e4c100062488ec643f6162dd0d5208e33e2f34544e1fc931372e806c0cc", size = 10890557, upload-time = "2025-06-16T16:37:21.421Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/bb/6eccc0ba0aa0c7a87df24e73f0ad34170514abd8162eb0c75fd7128171fb/mypy-1.16.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ea16e2a7d2714277e349e24d19a782a663a34ed60864006e8585db08f8ad1782", size = 10012921, upload-time = "2025-06-16T16:51:28.659Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/80/b337a12e2006715f99f529e732c5f6a8c143bb58c92bb142d5ab380963a5/mypy-1.16.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:08e850ea22adc4d8a4014651575567b0318ede51e8e9fe7a68f25391af699507", size = 11802887, upload-time = "2025-06-16T16:50:53.627Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/59/f7af072d09793d581a745a25737c7c0a945760036b16aeb620f658a017af/mypy-1.16.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:22d76a63a42619bfb90122889b903519149879ddbf2ba4251834727944c8baca", size = 12531658, upload-time = "2025-06-16T16:33:55.002Z" },
+    { url = "https://files.pythonhosted.org/packages/82/c4/607672f2d6c0254b94a646cfc45ad589dd71b04aa1f3d642b840f7cce06c/mypy-1.16.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:2c7ce0662b6b9dc8f4ed86eb7a5d505ee3298c04b40ec13b30e572c0e5ae17c4", size = 12732486, upload-time = "2025-06-16T16:37:03.301Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/5e/136555ec1d80df877a707cebf9081bd3a9f397dedc1ab9750518d87489ec/mypy-1.16.1-cp311-cp311-win_amd64.whl", hash = "sha256:211287e98e05352a2e1d4e8759c5490925a7c784ddc84207f4714822f8cf99b6", size = 9479482, upload-time = "2025-06-16T16:47:37.48Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/d6/39482e5fcc724c15bf6280ff5806548c7185e0c090712a3736ed4d07e8b7/mypy-1.16.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:af4792433f09575d9eeca5c63d7d90ca4aeceda9d8355e136f80f8967639183d", size = 11066493, upload-time = "2025-06-16T16:47:01.683Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/e5/26c347890efc6b757f4d5bb83f4a0cf5958b8cf49c938ac99b8b72b420a6/mypy-1.16.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:66df38405fd8466ce3517eda1f6640611a0b8e70895e2a9462d1d4323c5eb4b9", size = 10081687, upload-time = "2025-06-16T16:48:19.367Z" },
+    { url = "https://files.pythonhosted.org/packages/44/c7/b5cb264c97b86914487d6a24bd8688c0172e37ec0f43e93b9691cae9468b/mypy-1.16.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:44e7acddb3c48bd2713994d098729494117803616e116032af192871aed80b79", size = 11839723, upload-time = "2025-06-16T16:49:20.912Z" },
+    { url = "https://files.pythonhosted.org/packages/15/f8/491997a9b8a554204f834ed4816bda813aefda31cf873bb099deee3c9a99/mypy-1.16.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0ab5eca37b50188163fa7c1b73c685ac66c4e9bdee4a85c9adac0e91d8895e15", size = 12722980, upload-time = "2025-06-16T16:37:40.929Z" },
+    { url = "https://files.pythonhosted.org/packages/df/f0/2bd41e174b5fd93bc9de9a28e4fb673113633b8a7f3a607fa4a73595e468/mypy-1.16.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:dedb6229b2c9086247e21a83c309754b9058b438704ad2f6807f0d8227f6ebdd", size = 12903328, upload-time = "2025-06-16T16:34:35.099Z" },
+    { url = "https://files.pythonhosted.org/packages/61/81/5572108a7bec2c46b8aff7e9b524f371fe6ab5efb534d38d6b37b5490da8/mypy-1.16.1-cp312-cp312-win_amd64.whl", hash = "sha256:1f0435cf920e287ff68af3d10a118a73f212deb2ce087619eb4e648116d1fe9b", size = 9562321, upload-time = "2025-06-16T16:48:58.823Z" },
+    { url = "https://files.pythonhosted.org/packages/28/e3/96964af4a75a949e67df4b95318fe2b7427ac8189bbc3ef28f92a1c5bc56/mypy-1.16.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ddc91eb318c8751c69ddb200a5937f1232ee8efb4e64e9f4bc475a33719de438", size = 11063480, upload-time = "2025-06-16T16:47:56.205Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/4d/cd1a42b8e5be278fab7010fb289d9307a63e07153f0ae1510a3d7b703193/mypy-1.16.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:87ff2c13d58bdc4bbe7dc0dedfe622c0f04e2cb2a492269f3b418df2de05c536", size = 10090538, upload-time = "2025-06-16T16:46:43.92Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/4f/c3c6b4b66374b5f68bab07c8cabd63a049ff69796b844bc759a0ca99bb2a/mypy-1.16.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0a7cfb0fe29fe5a9841b7c8ee6dffb52382c45acdf68f032145b75620acfbd6f", size = 11836839, upload-time = "2025-06-16T16:36:28.039Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/7e/81ca3b074021ad9775e5cb97ebe0089c0f13684b066a750b7dc208438403/mypy-1.16.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:051e1677689c9d9578b9c7f4d206d763f9bbd95723cd1416fad50db49d52f359", size = 12715634, upload-time = "2025-06-16T16:50:34.441Z" },
+    { url = "https://files.pythonhosted.org/packages/e9/95/bdd40c8be346fa4c70edb4081d727a54d0a05382d84966869738cfa8a497/mypy-1.16.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:d5d2309511cc56c021b4b4e462907c2b12f669b2dbeb68300110ec27723971be", size = 12895584, upload-time = "2025-06-16T16:34:54.857Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/fd/d486a0827a1c597b3b48b1bdef47228a6e9ee8102ab8c28f944cb83b65dc/mypy-1.16.1-cp313-cp313-win_amd64.whl", hash = "sha256:4f58ac32771341e38a853c5d0ec0dfe27e18e27da9cdb8bbc882d2249c71a3ee", size = 9573886, upload-time = "2025-06-16T16:36:43.589Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/d3/53e684e78e07c1a2bf7105715e5edd09ce951fc3f47cf9ed095ec1b7a037/mypy-1.16.1-py3-none-any.whl", hash = "sha256:5fc2ac4027d0ef28d6ba69a0343737a23c4d1b83672bf38d1fe237bdc0643b37", size = 2265923, upload-time = "2025-06-16T16:48:02.366Z" },
 ]
 
 [[package]]
@@ -1834,7 +1834,7 @@ wheels = [
 
 [[package]]
 name = "pydantic"
-version = "2.11.5"
+version = "2.11.7"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "annotated-types" },
@@ -1842,9 +1842,9 @@ dependencies = [
     { name = "typing-extensions" },
     { name = "typing-inspection" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/f0/86/8ce9040065e8f924d642c58e4a344e33163a07f6b57f836d0d734e0ad3fb/pydantic-2.11.5.tar.gz", hash = "sha256:7f853db3d0ce78ce8bbb148c401c2cdd6431b3473c0cdff2755c7690952a7b7a", size = 787102, upload-time = "2025-05-22T21:18:08.761Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/00/dd/4325abf92c39ba8623b5af936ddb36ffcfe0beae70405d456ab1fb2f5b8c/pydantic-2.11.7.tar.gz", hash = "sha256:d989c3c6cb79469287b1569f7447a17848c998458d49ebe294e975b9baf0f0db", size = 788350, upload-time = "2025-06-14T08:33:17.137Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b5/69/831ed22b38ff9b4b64b66569f0e5b7b97cf3638346eb95a2147fdb49ad5f/pydantic-2.11.5-py3-none-any.whl", hash = "sha256:f9c26ba06f9747749ca1e5c94d6a85cb84254577553c8785576fd38fa64dc0f7", size = 444229, upload-time = "2025-05-22T21:18:06.329Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/c0/ec2b1c8712ca690e5d61979dee872603e92b8a32f94cc1b72d53beab008a/pydantic-2.11.7-py3-none-any.whl", hash = "sha256:dde5df002701f6de26248661f6835bbe296a47bf73990135c7d07ce741b9623b", size = 444782, upload-time = "2025-06-14T08:33:14.905Z" },
 ]
 
 [[package]]
@@ -1977,7 +1977,7 @@ wheels = [
 
 [[package]]
 name = "pytest"
-version = "8.4.0"
+version = "8.4.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "colorama", marker = "sys_platform == 'win32'" },
@@ -1988,9 +1988,9 @@ dependencies = [
     { name = "pygments" },
     { name = "tomli", marker = "python_full_version < '3.11'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/fb/aa/405082ce2749be5398045152251ac69c0f3578c7077efc53431303af97ce/pytest-8.4.0.tar.gz", hash = "sha256:14d920b48472ea0dbf68e45b96cd1ffda4705f33307dcc86c676c1b5104838a6", size = 1515232, upload-time = "2025-06-02T17:36:30.03Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/08/ba/45911d754e8eba3d5a841a5ce61a65a685ff1798421ac054f85aa8747dfb/pytest-8.4.1.tar.gz", hash = "sha256:7c67fd69174877359ed9371ec3af8a3d2b04741818c51e5e99cc1742251fa93c", size = 1517714, upload-time = "2025-06-18T05:48:06.109Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/2f/de/afa024cbe022b1b318a3d224125aa24939e99b4ff6f22e0ba639a2eaee47/pytest-8.4.0-py3-none-any.whl", hash = "sha256:f40f825768ad76c0977cbacdf1fd37c6f7a468e460ea6a0636078f8972d4517e", size = 363797, upload-time = "2025-06-02T17:36:27.859Z" },
+    { url = "https://files.pythonhosted.org/packages/29/16/c8a903f4c4dffe7a12843191437d7cd8e32751d5de349d45d3fe69544e87/pytest-8.4.1-py3-none-any.whl", hash = "sha256:539c70ba6fcead8e78eebbf1115e8b589e7565830d7d006a8723f19ac8a0afb7", size = 365474, upload-time = "2025-06-18T05:48:03.955Z" },
 ]
 
 [[package]]
@@ -2007,15 +2007,16 @@ wheels = [
 
 [[package]]
 name = "pytest-cov"
-version = "6.1.1"
+version = "6.2.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "coverage", extra = ["toml"] },
+    { name = "pluggy" },
     { name = "pytest" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/25/69/5f1e57f6c5a39f81411b550027bf72842c4567ff5fd572bed1edc9e4b5d9/pytest_cov-6.1.1.tar.gz", hash = "sha256:46935f7aaefba760e716c2ebfbe1c216240b9592966e7da99ea8292d4d3e2a0a", size = 66857, upload-time = "2025-04-05T14:07:51.592Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/18/99/668cade231f434aaa59bbfbf49469068d2ddd945000621d3d165d2e7dd7b/pytest_cov-6.2.1.tar.gz", hash = "sha256:25cc6cc0a5358204b8108ecedc51a9b57b34cc6b8c967cc2c01a4e00d8a67da2", size = 69432, upload-time = "2025-06-12T10:47:47.684Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/28/d0/def53b4a790cfb21483016430ed828f64830dd981ebe1089971cd10cab25/pytest_cov-6.1.1-py3-none-any.whl", hash = "sha256:bddf29ed2d0ab6f4df17b4c55b0a657287db8684af9c42ea546b21b1041b3dde", size = 23841, upload-time = "2025-04-05T14:07:49.641Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/16/4ea354101abb1287856baa4af2732be351c7bee728065aed451b678153fd/pytest_cov-6.2.1-py3-none-any.whl", hash = "sha256:f5bc4c23f42f1cdd23c70b1dab1bbaef4fc505ba950d53e0081d0730dd7e86d5", size = 24644, upload-time = "2025-06-12T10:47:45.932Z" },
 ]
 
 [[package]]
@@ -2303,27 +2304,27 @@ wheels = [
 
 [[package]]
 name = "ruff"
-version = "0.11.13"
+version = "0.12.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ed/da/9c6f995903b4d9474b39da91d2d626659af3ff1eeb43e9ae7c119349dba6/ruff-0.11.13.tar.gz", hash = "sha256:26fa247dc68d1d4e72c179e08889a25ac0c7ba4d78aecfc835d49cbfd60bf514", size = 4282054, upload-time = "2025-06-05T21:00:15.721Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/24/90/5255432602c0b196a0da6720f6f76b93eb50baef46d3c9b0025e2f9acbf3/ruff-0.12.0.tar.gz", hash = "sha256:4d047db3662418d4a848a3fdbfaf17488b34b62f527ed6f10cb8afd78135bc5c", size = 4376101, upload-time = "2025-06-17T15:19:26.217Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/7d/ce/a11d381192966e0b4290842cc8d4fac7dc9214ddf627c11c1afff87da29b/ruff-0.11.13-py3-none-linux_armv6l.whl", hash = "sha256:4bdfbf1240533f40042ec00c9e09a3aade6f8c10b6414cf11b519488d2635d46", size = 10292516, upload-time = "2025-06-05T20:59:32.944Z" },
-    { url = "https://files.pythonhosted.org/packages/78/db/87c3b59b0d4e753e40b6a3b4a2642dfd1dcaefbff121ddc64d6c8b47ba00/ruff-0.11.13-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:aef9c9ed1b5ca28bb15c7eac83b8670cf3b20b478195bd49c8d756ba0a36cf48", size = 11106083, upload-time = "2025-06-05T20:59:37.03Z" },
-    { url = "https://files.pythonhosted.org/packages/77/79/d8cec175856ff810a19825d09ce700265f905c643c69f45d2b737e4a470a/ruff-0.11.13-py3-none-macosx_11_0_arm64.whl", hash = "sha256:53b15a9dfdce029c842e9a5aebc3855e9ab7771395979ff85b7c1dedb53ddc2b", size = 10436024, upload-time = "2025-06-05T20:59:39.741Z" },
-    { url = "https://files.pythonhosted.org/packages/8b/5b/f6d94f2980fa1ee854b41568368a2e1252681b9238ab2895e133d303538f/ruff-0.11.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ab153241400789138d13f362c43f7edecc0edfffce2afa6a68434000ecd8f69a", size = 10646324, upload-time = "2025-06-05T20:59:42.185Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/9c/b4c2acf24ea4426016d511dfdc787f4ce1ceb835f3c5fbdbcb32b1c63bda/ruff-0.11.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6c51f93029d54a910d3d24f7dd0bb909e31b6cd989a5e4ac513f4eb41629f0dc", size = 10174416, upload-time = "2025-06-05T20:59:44.319Z" },
-    { url = "https://files.pythonhosted.org/packages/f3/10/e2e62f77c65ede8cd032c2ca39c41f48feabedb6e282bfd6073d81bb671d/ruff-0.11.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1808b3ed53e1a777c2ef733aca9051dc9bf7c99b26ece15cb59a0320fbdbd629", size = 11724197, upload-time = "2025-06-05T20:59:46.935Z" },
-    { url = "https://files.pythonhosted.org/packages/bb/f0/466fe8469b85c561e081d798c45f8a1d21e0b4a5ef795a1d7f1a9a9ec182/ruff-0.11.13-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:d28ce58b5ecf0f43c1b71edffabe6ed7f245d5336b17805803312ec9bc665933", size = 12511615, upload-time = "2025-06-05T20:59:49.534Z" },
-    { url = "https://files.pythonhosted.org/packages/17/0e/cefe778b46dbd0cbcb03a839946c8f80a06f7968eb298aa4d1a4293f3448/ruff-0.11.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:55e4bc3a77842da33c16d55b32c6cac1ec5fb0fbec9c8c513bdce76c4f922165", size = 12117080, upload-time = "2025-06-05T20:59:51.654Z" },
-    { url = "https://files.pythonhosted.org/packages/5d/2c/caaeda564cbe103bed145ea557cb86795b18651b0f6b3ff6a10e84e5a33f/ruff-0.11.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:633bf2c6f35678c56ec73189ba6fa19ff1c5e4807a78bf60ef487b9dd272cc71", size = 11326315, upload-time = "2025-06-05T20:59:54.469Z" },
-    { url = "https://files.pythonhosted.org/packages/75/f0/782e7d681d660eda8c536962920c41309e6dd4ebcea9a2714ed5127d44bd/ruff-0.11.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4ffbc82d70424b275b089166310448051afdc6e914fdab90e08df66c43bb5ca9", size = 11555640, upload-time = "2025-06-05T20:59:56.986Z" },
-    { url = "https://files.pythonhosted.org/packages/5d/d4/3d580c616316c7f07fb3c99dbecfe01fbaea7b6fd9a82b801e72e5de742a/ruff-0.11.13-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:4a9ddd3ec62a9a89578c85842b836e4ac832d4a2e0bfaad3b02243f930ceafcc", size = 10507364, upload-time = "2025-06-05T20:59:59.154Z" },
-    { url = "https://files.pythonhosted.org/packages/5a/dc/195e6f17d7b3ea6b12dc4f3e9de575db7983db187c378d44606e5d503319/ruff-0.11.13-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:d237a496e0778d719efb05058c64d28b757c77824e04ffe8796c7436e26712b7", size = 10141462, upload-time = "2025-06-05T21:00:01.481Z" },
-    { url = "https://files.pythonhosted.org/packages/f4/8e/39a094af6967faa57ecdeacb91bedfb232474ff8c3d20f16a5514e6b3534/ruff-0.11.13-py3-none-musllinux_1_2_i686.whl", hash = "sha256:26816a218ca6ef02142343fd24c70f7cd8c5aa6c203bca284407adf675984432", size = 11121028, upload-time = "2025-06-05T21:00:04.06Z" },
-    { url = "https://files.pythonhosted.org/packages/5a/c0/b0b508193b0e8a1654ec683ebab18d309861f8bd64e3a2f9648b80d392cb/ruff-0.11.13-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:51c3f95abd9331dc5b87c47ac7f376db5616041173826dfd556cfe3d4977f492", size = 11602992, upload-time = "2025-06-05T21:00:06.249Z" },
-    { url = "https://files.pythonhosted.org/packages/7c/91/263e33ab93ab09ca06ce4f8f8547a858cc198072f873ebc9be7466790bae/ruff-0.11.13-py3-none-win32.whl", hash = "sha256:96c27935418e4e8e77a26bb05962817f28b8ef3843a6c6cc49d8783b5507f250", size = 10474944, upload-time = "2025-06-05T21:00:08.459Z" },
-    { url = "https://files.pythonhosted.org/packages/46/f4/7c27734ac2073aae8efb0119cae6931b6fb48017adf048fdf85c19337afc/ruff-0.11.13-py3-none-win_amd64.whl", hash = "sha256:29c3189895a8a6a657b7af4e97d330c8a3afd2c9c8f46c81e2fc5a31866517e3", size = 11548669, upload-time = "2025-06-05T21:00:11.147Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/bf/b273dd11673fed8a6bd46032c0ea2a04b2ac9bfa9c628756a5856ba113b0/ruff-0.11.13-py3-none-win_arm64.whl", hash = "sha256:b4385285e9179d608ff1d2fb9922062663c658605819a6876d8beef0c30b7f3b", size = 10683928, upload-time = "2025-06-05T21:00:13.758Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/fd/b46bb20e14b11ff49dbc74c61de352e0dc07fb650189513631f6fb5fc69f/ruff-0.12.0-py3-none-linux_armv6l.whl", hash = "sha256:5652a9ecdb308a1754d96a68827755f28d5dfb416b06f60fd9e13f26191a8848", size = 10311554, upload-time = "2025-06-17T15:18:45.792Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/d3/021dde5a988fa3e25d2468d1dadeea0ae89dc4bc67d0140c6e68818a12a1/ruff-0.12.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:05ed0c914fabc602fc1f3b42c53aa219e5736cb030cdd85640c32dbc73da74a6", size = 11118435, upload-time = "2025-06-17T15:18:49.064Z" },
+    { url = "https://files.pythonhosted.org/packages/07/a2/01a5acf495265c667686ec418f19fd5c32bcc326d4c79ac28824aecd6a32/ruff-0.12.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:07a7aa9b69ac3fcfda3c507916d5d1bca10821fe3797d46bad10f2c6de1edda0", size = 10466010, upload-time = "2025-06-17T15:18:51.341Z" },
+    { url = "https://files.pythonhosted.org/packages/4c/57/7caf31dd947d72e7aa06c60ecb19c135cad871a0a8a251723088132ce801/ruff-0.12.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7731c3eec50af71597243bace7ec6104616ca56dda2b99c89935fe926bdcd48", size = 10661366, upload-time = "2025-06-17T15:18:53.29Z" },
+    { url = "https://files.pythonhosted.org/packages/e9/ba/aa393b972a782b4bc9ea121e0e358a18981980856190d7d2b6187f63e03a/ruff-0.12.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:952d0630eae628250ab1c70a7fffb641b03e6b4a2d3f3ec6c1d19b4ab6c6c807", size = 10173492, upload-time = "2025-06-17T15:18:55.262Z" },
+    { url = "https://files.pythonhosted.org/packages/d7/50/9349ee777614bc3062fc6b038503a59b2034d09dd259daf8192f56c06720/ruff-0.12.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c021f04ea06966b02614d442e94071781c424ab8e02ec7af2f037b4c1e01cc82", size = 11761739, upload-time = "2025-06-17T15:18:58.906Z" },
+    { url = "https://files.pythonhosted.org/packages/04/8f/ad459de67c70ec112e2ba7206841c8f4eb340a03ee6a5cabc159fe558b8e/ruff-0.12.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:7d235618283718ee2fe14db07f954f9b2423700919dc688eacf3f8797a11315c", size = 12537098, upload-time = "2025-06-17T15:19:01.316Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/50/15ad9c80ebd3c4819f5bd8883e57329f538704ed57bac680d95cb6627527/ruff-0.12.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0758038f81beec8cc52ca22de9685b8ae7f7cc18c013ec2050012862cc9165", size = 12154122, upload-time = "2025-06-17T15:19:03.727Z" },
+    { url = "https://files.pythonhosted.org/packages/76/e6/79b91e41bc8cc3e78ee95c87093c6cacfa275c786e53c9b11b9358026b3d/ruff-0.12.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:139b3d28027987b78fc8d6cfb61165447bdf3740e650b7c480744873688808c2", size = 11363374, upload-time = "2025-06-17T15:19:05.875Z" },
+    { url = "https://files.pythonhosted.org/packages/db/c3/82b292ff8a561850934549aa9dc39e2c4e783ab3c21debe55a495ddf7827/ruff-0.12.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68853e8517b17bba004152aebd9dd77d5213e503a5f2789395b25f26acac0da4", size = 11587647, upload-time = "2025-06-17T15:19:08.246Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/42/d5760d742669f285909de1bbf50289baccb647b53e99b8a3b4f7ce1b2001/ruff-0.12.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:3a9512af224b9ac4757f7010843771da6b2b0935a9e5e76bb407caa901a1a514", size = 10527284, upload-time = "2025-06-17T15:19:10.37Z" },
+    { url = "https://files.pythonhosted.org/packages/19/f6/fcee9935f25a8a8bba4adbae62495c39ef281256693962c2159e8b284c5f/ruff-0.12.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b08df3d96db798e5beb488d4df03011874aff919a97dcc2dd8539bb2be5d6a88", size = 10158609, upload-time = "2025-06-17T15:19:12.286Z" },
+    { url = "https://files.pythonhosted.org/packages/37/fb/057febf0eea07b9384787bfe197e8b3384aa05faa0d6bd844b94ceb29945/ruff-0.12.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:6a315992297a7435a66259073681bb0d8647a826b7a6de45c6934b2ca3a9ed51", size = 11141462, upload-time = "2025-06-17T15:19:15.195Z" },
+    { url = "https://files.pythonhosted.org/packages/10/7c/1be8571011585914b9d23c95b15d07eec2d2303e94a03df58294bc9274d4/ruff-0.12.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1e55e44e770e061f55a7dbc6e9aed47feea07731d809a3710feda2262d2d4d8a", size = 11641616, upload-time = "2025-06-17T15:19:17.6Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/ef/b960ab4818f90ff59e571d03c3f992828d4683561095e80f9ef31f3d58b7/ruff-0.12.0-py3-none-win32.whl", hash = "sha256:7162a4c816f8d1555eb195c46ae0bd819834d2a3f18f98cc63819a7b46f474fb", size = 10525289, upload-time = "2025-06-17T15:19:19.688Z" },
+    { url = "https://files.pythonhosted.org/packages/34/93/8b16034d493ef958a500f17cda3496c63a537ce9d5a6479feec9558f1695/ruff-0.12.0-py3-none-win_amd64.whl", hash = "sha256:d00b7a157b8fb6d3827b49d3324da34a1e3f93492c1f97b08e222ad7e9b291e0", size = 11598311, upload-time = "2025-06-17T15:19:21.785Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/33/4d3e79e4a84533d6cd526bfb42c020a23256ae5e4265d858bd1287831f7d/ruff-0.12.0-py3-none-win_arm64.whl", hash = "sha256:8cd24580405ad8c1cc64d61725bca091d6b6da7eb3d36f72cc605467069d7e8b", size = 10724946, upload-time = "2025-06-17T15:19:23.952Z" },
 ]
 
 [[package]]
@@ -2558,14 +2559,14 @@ wheels = [
 
 [[package]]
 name = "types-requests"
-version = "2.32.0.20250602"
+version = "2.32.4.20250611"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "urllib3" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/48/b0/5321e6eeba5d59e4347fcf9bf06a5052f085c3aa0f4876230566d6a4dc97/types_requests-2.32.0.20250602.tar.gz", hash = "sha256:ee603aeefec42051195ae62ca7667cd909a2f8128fdf8aad9e8a5219ecfab3bf", size = 23042, upload-time = "2025-06-02T03:15:02.958Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/6d/7f/73b3a04a53b0fd2a911d4ec517940ecd6600630b559e4505cc7b68beb5a0/types_requests-2.32.4.20250611.tar.gz", hash = "sha256:741c8777ed6425830bf51e54d6abe245f79b4dcb9019f1622b773463946bf826", size = 23118, upload-time = "2025-06-11T03:11:41.272Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/da/18/9b782980e575c6581d5c0c1c99f4c6f89a1d7173dad072ee96b2756c02e6/types_requests-2.32.0.20250602-py3-none-any.whl", hash = "sha256:f4f335f87779b47ce10b8b8597b409130299f6971ead27fead4fe7ba6ea3e726", size = 20638, upload-time = "2025-06-02T03:15:01.959Z" },
+    { url = "https://files.pythonhosted.org/packages/3d/ea/0be9258c5a4fa1ba2300111aa5a0767ee6d18eb3fd20e91616c12082284d/types_requests-2.32.4.20250611-py3-none-any.whl", hash = "sha256:ad2fe5d3b0cb3c2c902c8815a70e7fb2302c4b8c1f77bdcd738192cdb3878072", size = 20643, upload-time = "2025-06-11T03:11:40.186Z" },
 ]
 
 [[package]]

From 2e13543d5dbfc1cf8a2c514ca43a03dbeb7d41ff Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Tue, 24 Jun 2025 10:33:38 -0500
Subject: [PATCH 041/337] fix: ios widget webp support (#19469)

---
 .../ios/WidgetExtension/ImageWidgetView.swift | 18 +------
 mobile/ios/WidgetExtension/ImmichAPI.swift    | 48 ++++++++++++++++---
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/mobile/ios/WidgetExtension/ImageWidgetView.swift b/mobile/ios/WidgetExtension/ImageWidgetView.swift
index ff11133e51..2c84acc074 100644
--- a/mobile/ios/WidgetExtension/ImageWidgetView.swift
+++ b/mobile/ios/WidgetExtension/ImageWidgetView.swift
@@ -24,27 +24,11 @@ struct ImageEntry: TimelineEntry {
 struct ImmichWidgetView: View {
   var entry: ImageEntry
 
-  func getErrorText(_ error: WidgetError?) -> String {
-    switch error {
-    case .noLogin:
-      return "Login to Immich"
-
-    case .fetchFailed:
-      return "Unable to connect to your Immich instance"
-
-    case .albumNotFound:
-      return "Album not found"
-
-    default:
-      return "An unknown error occured"
-    }
-  }
-
   var body: some View {
     if entry.image == nil {
       VStack {
         Image("LaunchImage")
-        Text(getErrorText(entry.error))
+        Text(entry.error?.errorDescription ?? "")
           .minimumScaleFactor(0.25)
           .multilineTextAlignment(.center)
           .foregroundStyle(.secondary)
diff --git a/mobile/ios/WidgetExtension/ImmichAPI.swift b/mobile/ios/WidgetExtension/ImmichAPI.swift
index 4da610f1c7..628c7311ee 100644
--- a/mobile/ios/WidgetExtension/ImmichAPI.swift
+++ b/mobile/ios/WidgetExtension/ImmichAPI.swift
@@ -8,6 +8,32 @@ enum WidgetError: Error {
   case unknown
   case albumNotFound
   case unableToResize
+  case invalidImage
+  case invalidURL
+}
+
+extension WidgetError: LocalizedError {
+  public var errorDescription: String? {
+    switch self {
+    case .noLogin:
+      return "Login to Immich"
+
+    case .fetchFailed:
+      return "Unable to connect to your Immich instance"
+
+    case .albumNotFound:
+      return "Album not found"
+        
+    case .invalidURL:
+      return "An invalid URL was used"
+        
+    case .invalidImage:
+      return "An invalid image was received"
+
+    default:
+      return "An unknown error occured"
+    }
+  }
 }
 
 enum AssetType: String, Codable {
@@ -146,7 +172,7 @@ class ImmichAPI {
     return try JSONDecoder().decode([MemoryResult].self, from: data)
   }
 
-  func fetchImage(asset: SearchResult) async throws -> UIImage {
+  func fetchImage(asset: SearchResult) async throws(WidgetError) -> UIImage {
     let thumbnailParams = [URLQueryItem(name: "size", value: "preview")]
     let assetEndpoint = "/assets/" + asset.id + "/thumbnail"
 
@@ -157,16 +183,24 @@ class ImmichAPI {
         params: thumbnailParams
       )
     else {
-      throw URLError(.badURL)
+      throw .invalidURL
+    }
+    
+    guard let imageSource = CGImageSourceCreateWithURL(fetchURL as CFURL, nil) else {
+      throw .invalidURL
     }
 
-    let (data, _) = try await URLSession.shared.data(from: fetchURL)
-
-    guard let img = UIImage(data: data) else {
-      throw URLError(.badServerResponse)
+    let decodeOptions: [NSString: Any] = [
+        kCGImageSourceCreateThumbnailFromImageAlways: true,
+        kCGImageSourceThumbnailMaxPixelSize: 400,
+        kCGImageSourceCreateThumbnailWithTransform: true
+    ]
+    
+    guard let thumbnail = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, decodeOptions as CFDictionary) else {
+      throw .fetchFailed
     }
 
-    return img
+    return UIImage(cgImage: thumbnail)
   }
 
   func fetchAlbums() async throws -> [Album] {

From 88b8afb8d647821756f502977f157d65bf49d0d6 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 24 Jun 2025 11:37:14 -0400
Subject: [PATCH 042/337] fix: return 404 for invalid shared link pages
 (#19493)

---
 e2e/src/api/specs/shared-link.e2e-spec.ts | 10 +++++++
 server/src/services/api.service.ts        | 36 ++++++++---------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/e2e/src/api/specs/shared-link.e2e-spec.ts b/e2e/src/api/specs/shared-link.e2e-spec.ts
index 04ed8ca0a4..97aa252dbb 100644
--- a/e2e/src/api/specs/shared-link.e2e-spec.ts
+++ b/e2e/src/api/specs/shared-link.e2e-spec.ts
@@ -119,6 +119,16 @@ describe('/shared-links', () => {
       expect(resp.header['content-type']).toContain('text/html');
       expect(resp.text).toContain(`<meta property="og:image" content="https://my.immich.app`);
     });
+
+    it('should return 404 for an invalid shared link', async () => {
+      const resp = await request(shareUrl).get(`/invalid-key`);
+      expect(resp.status).toBe(404);
+      expect(resp.header['content-type']).toContain('text/html');
+      expect(resp.text).not.toContain(`og:type`);
+      expect(resp.text).not.toContain(`og:title`);
+      expect(resp.text).not.toContain(`og:description`);
+      expect(resp.text).not.toContain(`og:image`);
+    });
   });
 
   describe('GET /shared-links', () => {
diff --git a/server/src/services/api.service.ts b/server/src/services/api.service.ts
index 6bfbf307f6..6b40aa46ef 100644
--- a/server/src/services/api.service.ts
+++ b/server/src/services/api.service.ts
@@ -78,36 +78,24 @@ export class ApiService {
         return next();
       }
 
-      const targets = [
-        {
-          regex: /^\/share\/(.+)$/,
-          onMatch: async (matches: RegExpMatchArray) => {
-            const key = matches[1];
-            const auth = await this.authService.validateSharedLink(key);
-            return this.sharedLinkService.getMetadataTags(auth);
-          },
-        },
-      ];
-
+      let status = 200;
       let html = index;
 
-      try {
-        for (const { regex, onMatch } of targets) {
-          const matches = request.url.match(regex);
-          if (matches) {
-            const meta = await onMatch(matches);
-            if (meta) {
-              html = render(index, meta);
-            }
-
-            break;
+      const shareMatches = request.url.match(/^\/share\/(.+)$/);
+      if (shareMatches) {
+        try {
+          const key = shareMatches[1];
+          const auth = await this.authService.validateSharedLink(key);
+          const meta = await this.sharedLinkService.getMetadataTags(auth);
+          if (meta) {
+            html = render(index, meta);
           }
+        } catch {
+          status = 404;
         }
-      } catch {
-        // nothing to do here
       }
 
-      res.type('text/html').header('Cache-Control', 'no-store').send(html);
+      res.status(status).type('text/html').header('Cache-Control', 'no-store').send(html);
     };
   }
 }

From 3751f8bc576604f6942bcc979838568be7b6fe47 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Tue, 24 Jun 2025 12:52:15 -0500
Subject: [PATCH 043/337] fix: android app link support (#19501)

* fix: android app link support

* add autoVerify tag

* adjust intent to have scheme separate
---
 .../android/app/src/main/AndroidManifest.xml  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index d5a7c9ca86..6a96aa68e4 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -90,12 +90,35 @@
         <data android:mimeType="video/*" />
       </intent-filter>
 
+      <!-- immich:// URL scheme handling -->
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
         <data android:scheme="immich" />
       </intent-filter>
+
+      <!-- my.immich.app deep link -->
+      <intent-filter android:autoVerify="true">
+          <action android:name="android.intent.action.VIEW" />
+          <category android:name="android.intent.category.DEFAULT" />
+          <category android:name="android.intent.category.BROWSABLE" />
+
+          <data android:scheme="https" />
+
+          <data
+              android:host="my.immich.app"
+              android:path="/" />
+          <data
+              android:host="my.immich.app"
+              android:pathPrefix="/albums/" />
+          <data
+              android:host="my.immich.app"
+              android:pathPrefix="/memories/" />
+          <data
+              android:host="my.immich.app"
+              android:pathPrefix="/photos/" />
+      </intent-filter>
     </activity>
 
 

From 9240bbc6ffe2e74645e83b9e7df87246112cd3d2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 24 Jun 2025 22:54:05 +0200
Subject: [PATCH 044/337] chore(deps): update github-actions (#19045)

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

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index 33912d687c..4dac0ce04f 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -73,7 +73,7 @@ jobs:
           cache: 'gradle'
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2.19.0
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index bf2b774ac4..9729450a91 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -70,7 +70,7 @@ jobs:
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
@@ -99,7 +99,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.event_name == 'release' }}
 
       - name: Build and push image
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           file: cli/Dockerfile
           platforms: linux/amd64,linux/arm64
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index fb6d686878..1bc5a830c2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -50,7 +50,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,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@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
 
       # ℹ️ 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
@@ -76,6 +76,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           category: '/language:${{matrix.language}}'
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 20da0c5201..7bb7f72b51 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -177,7 +177,7 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}
 
@@ -188,6 +188,6 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index f1995bb866..fa1152c336 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -100,7 +100,7 @@ jobs:
           name: release-apk-signed
 
       - name: Create draft release
-        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
         with:
           draft: true
           tag_name: ${{ env.IMMICH_VERSION }}
diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index 62e84ac957..a6365f5c98 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -49,7 +49,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2.19.0
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml
@@ -134,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           sarif_file: results.sarif
           category: zizmor
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9e3a762f4e..f3644ff74e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -499,7 +499,7 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}
 
@@ -516,7 +516,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2.19.0
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml
@@ -668,7 +668,7 @@ jobs:
       contents: read
     services:
       postgres:
-        image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3
+        image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3@sha256:1f5583fe3397210a0fbc7f11b0cec18bacc4a99e3e8ea0548e9bd6bcf26ec37a
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_USER: postgres
diff --git a/.github/workflows/weblate-lock.yml b/.github/workflows/weblate-lock.yml
index 0758ef4dc9..084e1a97d6 100644
--- a/.github/workflows/weblate-lock.yml
+++ b/.github/workflows/weblate-lock.yml
@@ -52,6 +52,6 @@ jobs:
     permissions: {}
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}

From 522cdbac993b8ef24e1dfd25b07587880b451e18 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 24 Jun 2025 19:34:30 -0500
Subject: [PATCH 045/337] feat: sliver timeline selection optimization (#19504)

---
 .../widgets/timeline/fixed/segment.model.dart | 165 ++++++++++++------
 1 file changed, 111 insertions(+), 54 deletions(-)

diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
index fff5e68146..7cadff9ee2 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -63,7 +63,8 @@ class FixedSegment extends Segment {
   }
 
   void _handleOnTap(WidgetRef ref, BaseAsset asset) {
-    if (!ref.read(multiSelectProvider.select((s) => s.isEnabled))) {
+    final multiSelectState = ref.read(multiSelectProvider);
+    if (!multiSelectState.isEnabled) {
       return;
     }
 
@@ -71,7 +72,8 @@ class FixedSegment extends Segment {
   }
 
   void _handleOnLongPress(WidgetRef ref, BaseAsset asset) {
-    if (ref.read(multiSelectProvider.select((s) => s.isEnabled))) {
+    final multiSelectState = ref.read(multiSelectProvider);
+    if (multiSelectState.isEnabled) {
       return;
     }
 
@@ -98,55 +100,63 @@ class FixedSegment extends Segment {
     return _buildRow(firstAssetIndex + assetIndex, numberOfAssets);
   }
 
-  Widget _buildRow(int assetIndex, int count) => Consumer(
-        builder: (ctx, ref, _) {
-          final isScrubbing =
-              ref.watch(timelineStateProvider.select((s) => s.isScrubbing));
-          final timelineService = ref.read(timelineServiceProvider);
+  Widget _buildRow(int assetIndex, int count) => RepaintBoundary(
+        child: Consumer(
+          builder: (ctx, ref, _) {
+            final isScrubbing =
+                ref.watch(timelineStateProvider.select((s) => s.isScrubbing));
+            final timelineService = ref.read(timelineServiceProvider);
 
-          // Timeline is being scrubbed, show placeholders
-          if (isScrubbing) {
-            return SegmentBuilder.buildPlaceholder(
-              ctx,
-              count,
-              size: Size.square(tileHeight),
-              spacing: spacing,
-            );
-          }
+            // Create stable callback references to prevent unnecessary rebuilds
+            onTap(BaseAsset asset) => _handleOnTap(ref, asset);
+            onLongPress(BaseAsset asset) => _handleOnLongPress(ref, asset);
 
-          // Bucket is already loaded, show the assets
-          if (timelineService.hasRange(assetIndex, count)) {
-            final assets = timelineService.getAssets(assetIndex, count);
-            return _buildAssetRow(
-              ctx,
-              assets,
-              onTap: (asset) => _handleOnTap(ref, asset),
-              onLongPress: (asset) => _handleOnLongPress(ref, asset),
-            );
-          }
-
-          // Bucket is not loaded, show placeholders and load the bucket
-          return FutureBuilder(
-            future: timelineService.loadAssets(assetIndex, count),
-            builder: (ctxx, snap) {
-              if (snap.connectionState != ConnectionState.done) {
-                return SegmentBuilder.buildPlaceholder(
-                  ctx,
-                  count,
-                  size: Size.square(tileHeight),
-                  spacing: spacing,
-                );
-              }
-
-              return _buildAssetRow(
-                ctxx,
-                snap.requireData,
-                onTap: (asset) => _handleOnTap(ref, asset),
-                onLongPress: (asset) => _handleOnLongPress(ref, asset),
+            // Timeline is being scrubbed, show placeholders
+            if (isScrubbing) {
+              return SegmentBuilder.buildPlaceholder(
+                ctx,
+                count,
+                size: Size.square(tileHeight),
+                spacing: spacing,
               );
-            },
-          );
-        },
+            }
+
+            // Bucket is already loaded, show the assets
+            if (timelineService.hasRange(assetIndex, count)) {
+              final assets = timelineService.getAssets(assetIndex, count);
+              return _buildAssetRow(
+                ctx,
+                assets,
+                baseAssetIndex: assetIndex,
+                onTap: onTap,
+                onLongPress: onLongPress,
+              );
+            }
+
+            // Bucket is not loaded, show placeholders and load the bucket
+            return FutureBuilder(
+              future: timelineService.loadAssets(assetIndex, count),
+              builder: (ctxx, snap) {
+                if (snap.connectionState != ConnectionState.done) {
+                  return SegmentBuilder.buildPlaceholder(
+                    ctx,
+                    count,
+                    size: Size.square(tileHeight),
+                    spacing: spacing,
+                  );
+                }
+
+                return _buildAssetRow(
+                  ctxx,
+                  snap.requireData,
+                  baseAssetIndex: assetIndex,
+                  onTap: onTap,
+                  onLongPress: onLongPress,
+                );
+              },
+            );
+          },
+        ),
       );
 
   Widget _buildAssetRow(
@@ -154,6 +164,7 @@ class FixedSegment extends Segment {
     List<BaseAsset> assets, {
     required void Function(BaseAsset) onTap,
     required void Function(BaseAsset) onLongPress,
+    required int baseAssetIndex,
   }) =>
       FixedTimelineRow(
         dimension: tileHeight,
@@ -161,13 +172,59 @@ class FixedSegment extends Segment {
         textDirection: Directionality.of(context),
         children: List.generate(
           assets.length,
-          (i) => RepaintBoundary(
-            child: GestureDetector(
-              onTap: () => onTap(assets[i]),
-              onLongPress: () => onLongPress(assets[i]),
-              child: ThumbnailTile(assets[i]),
-            ),
+          (i) => _AssetTileWidget(
+            key: ValueKey(_generateUniqueKey(assets[i], baseAssetIndex + i)),
+            asset: assets[i],
+            onTap: onTap,
+            onLongPress: onLongPress,
           ),
         ),
       );
+
+  /// Generates a unique key for an asset that handles different asset types
+  /// and prevents duplicate keys even when assets have the same name/timestamp
+  String _generateUniqueKey(BaseAsset asset, int assetIndex) {
+    // Try to get the most unique identifier based on asset type
+    if (asset is Asset) {
+      // For remote/merged assets, use the remote ID which is globally unique
+      return 'asset_${asset.id}';
+    } else if (asset is LocalAsset) {
+      // For local assets, use the local ID which should be unique per device
+      return 'local_${asset.id}';
+    } else {
+      // Fallback for any other BaseAsset implementation
+      // Use checksum if available for additional uniqueness
+      final checksum = asset.checksum;
+      if (checksum != null && checksum.isNotEmpty) {
+        return 'checksum_${checksum.hashCode}';
+      } else {
+        // Last resort: use global asset index + object hash for uniqueness
+        return 'fallback_${assetIndex}_${asset.hashCode}_${asset.createdAt.microsecondsSinceEpoch}';
+      }
+    }
+  }
+}
+
+class _AssetTileWidget extends StatelessWidget {
+  final BaseAsset asset;
+  final void Function(BaseAsset) onTap;
+  final void Function(BaseAsset) onLongPress;
+
+  const _AssetTileWidget({
+    super.key,
+    required this.asset,
+    required this.onTap,
+    required this.onLongPress,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return RepaintBoundary(
+      child: GestureDetector(
+        onTap: () => onTap(asset),
+        onLongPress: () => onLongPress(asset),
+        child: ThumbnailTile(asset),
+      ),
+    );
+  }
 }

From 05064f87f0321bf99787b9a63923192f8a1cfc1a Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 24 Jun 2025 20:02:46 -0500
Subject: [PATCH 046/337] feat: sliver appbar and snap scrubbing (#19446)

---
 mobile/lib/pages/common/tab_shell.page.dart   | 183 +++++++++++++
 .../pages/dev/feat_in_development.page.dart   |   2 +-
 .../widgets/timeline/header.widget.dart       |  28 +-
 .../widgets/timeline/scrubber.widget.dart     | 216 +++++++++++++--
 .../widgets/timeline/timeline.widget.dart     | 106 ++++++--
 .../timeline/multiselect.provider.dart        |   6 +
 mobile/lib/routing/router.dart                |  25 ++
 mobile/lib/routing/router.gr.dart             |  16 ++
 .../widgets/common/immich_sliver_app_bar.dart | 256 ++++++++++++++++++
 9 files changed, 780 insertions(+), 58 deletions(-)
 create mode 100644 mobile/lib/pages/common/tab_shell.page.dart
 create mode 100644 mobile/lib/widgets/common/immich_sliver_app_bar.dart

diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
new file mode 100644
index 0000000000..7315f05c7f
--- /dev/null
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -0,0 +1,183 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
+import 'package:immich_mobile/providers/multiselect.provider.dart';
+import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/providers/tab.provider.dart';
+
+@RoutePage()
+class TabShellPage extends ConsumerWidget {
+  const TabShellPage({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isScreenLandscape = context.orientation == Orientation.landscape;
+
+    Widget buildIcon({required Widget icon, required bool isProcessing}) {
+      if (!isProcessing) return icon;
+      return Stack(
+        alignment: Alignment.center,
+        clipBehavior: Clip.none,
+        children: [
+          icon,
+          Positioned(
+            right: -18,
+            child: SizedBox(
+              height: 20,
+              width: 20,
+              child: CircularProgressIndicator(
+                strokeWidth: 2,
+                valueColor: AlwaysStoppedAnimation<Color>(
+                  context.primaryColor,
+                ),
+              ),
+            ),
+          ),
+        ],
+      );
+    }
+
+    void onNavigationSelected(TabsRouter router, int index) {
+      // On Photos page menu tapped
+      if (router.activeIndex == 0 && index == 0) {
+        scrollToTopNotifierProvider.scrollToTop();
+      }
+
+      // On Search page tapped
+      if (router.activeIndex == 1 && index == 1) {
+        ref.read(searchInputFocusProvider).requestFocus();
+      }
+
+      ref.read(hapticFeedbackProvider.notifier).selectionClick();
+      router.setActiveIndex(index);
+      ref.read(tabProvider.notifier).state = TabEnum.values[index];
+    }
+
+    final navigationDestinations = [
+      NavigationDestination(
+        label: 'photos'.tr(),
+        icon: const Icon(
+          Icons.photo_library_outlined,
+        ),
+        selectedIcon: buildIcon(
+          isProcessing: false,
+          icon: Icon(
+            Icons.photo_library,
+            color: context.primaryColor,
+          ),
+        ),
+      ),
+      NavigationDestination(
+        label: 'search'.tr(),
+        icon: const Icon(
+          Icons.search_rounded,
+        ),
+        selectedIcon: Icon(
+          Icons.search,
+          color: context.primaryColor,
+        ),
+      ),
+      NavigationDestination(
+        label: 'albums'.tr(),
+        icon: const Icon(
+          Icons.photo_album_outlined,
+        ),
+        selectedIcon: buildIcon(
+          isProcessing: false,
+          icon: Icon(
+            Icons.photo_album_rounded,
+            color: context.primaryColor,
+          ),
+        ),
+      ),
+      NavigationDestination(
+        label: 'library'.tr(),
+        icon: const Icon(
+          Icons.space_dashboard_outlined,
+        ),
+        selectedIcon: buildIcon(
+          isProcessing: false,
+          icon: Icon(
+            Icons.space_dashboard_rounded,
+            color: context.primaryColor,
+          ),
+        ),
+      ),
+    ];
+
+    Widget bottomNavigationBar(TabsRouter tabsRouter) {
+      return NavigationBar(
+        selectedIndex: tabsRouter.activeIndex,
+        onDestinationSelected: (index) =>
+            onNavigationSelected(tabsRouter, index),
+        destinations: navigationDestinations,
+      );
+    }
+
+    Widget navigationRail(TabsRouter tabsRouter) {
+      return NavigationRail(
+        destinations: navigationDestinations
+            .map(
+              (e) => NavigationRailDestination(
+                icon: e.icon,
+                label: Text(e.label),
+                selectedIcon: e.selectedIcon,
+              ),
+            )
+            .toList(),
+        onDestinationSelected: (index) =>
+            onNavigationSelected(tabsRouter, index),
+        selectedIndex: tabsRouter.activeIndex,
+        labelType: NavigationRailLabelType.all,
+        groupAlignment: 0.0,
+      );
+    }
+
+    final multiselectEnabled = ref.watch(multiselectProvider);
+    return AutoTabsRouter(
+      routes: [
+        const MainTimelineRoute(),
+        SearchRoute(),
+        const AlbumsRoute(),
+        const LibraryRoute(),
+      ],
+      duration: const Duration(milliseconds: 600),
+      transitionBuilder: (context, child, animation) => FadeTransition(
+        opacity: animation,
+        child: child,
+      ),
+      builder: (context, child) {
+        final tabsRouter = AutoTabsRouter.of(context);
+        final heroedChild = HeroControllerScope(
+          controller: HeroController(),
+          child: child,
+        );
+        return PopScope(
+          canPop: tabsRouter.activeIndex == 0,
+          onPopInvokedWithResult: (didPop, _) =>
+              !didPop ? tabsRouter.setActiveIndex(0) : null,
+          child: Scaffold(
+            resizeToAvoidBottomInset: false,
+            body: isScreenLandscape
+                ? Row(
+                    children: [
+                      navigationRail(tabsRouter),
+                      const VerticalDivider(),
+                      Expanded(child: heroedChild),
+                    ],
+                  )
+                : heroedChild,
+            bottomNavigationBar: multiselectEnabled || isScreenLandscape
+                ? null
+                : bottomNavigationBar(tabsRouter),
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index 6fbb83185e..c53b7fe0dc 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -91,7 +91,7 @@ final _features = [
   _Feature(
     name: 'Main Timeline',
     icon: Icons.timeline_rounded,
-    onTap: (ctx, _) => ctx.pushRoute(const MainTimelineRoute()),
+    onTap: (ctx, _) => ctx.pushRoute(const TabShellRoute()),
   ),
 ];
 
diff --git a/mobile/lib/presentation/widgets/timeline/header.widget.dart b/mobile/lib/presentation/widgets/timeline/header.widget.dart
index 5c69f92a5a..43d6b53b3d 100644
--- a/mobile/lib/presentation/widgets/timeline/header.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/header.widget.dart
@@ -5,6 +5,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
@@ -80,12 +81,15 @@ class TimelineHeader extends ConsumerWidget {
                   if (header != HeaderType.monthAndDay)
                     _BulkSelectIconButton(
                       isAllSelected: isAllSelected,
-                      onPressed: () => ref
-                          .read(multiSelectProvider.notifier)
-                          .toggleBucketSelection(
-                            assetOffset,
-                            bucket.assetCount,
-                          ),
+                      onPressed: () {
+                        ref
+                            .read(multiSelectProvider.notifier)
+                            .toggleBucketSelection(
+                              assetOffset,
+                              bucket.assetCount,
+                            );
+                        ref.read(hapticFeedbackProvider.notifier).heavyImpact();
+                      },
                     ),
                 ],
               ),
@@ -101,9 +105,15 @@ class TimelineHeader extends ConsumerWidget {
                   const Spacer(),
                   _BulkSelectIconButton(
                     isAllSelected: isAllSelected,
-                    onPressed: () => ref
-                        .read(multiSelectProvider.notifier)
-                        .toggleBucketSelection(assetOffset, bucket.assetCount),
+                    onPressed: () {
+                      ref
+                          .read(multiSelectProvider.notifier)
+                          .toggleBucketSelection(
+                            assetOffset,
+                            bucket.assetCount,
+                          );
+                      ref.read(hapticFeedbackProvider.notifier).heavyImpact();
+                    },
                   ),
                 ],
               ),
diff --git a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
index d68d9cfd67..63f8f9926a 100644
--- a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
@@ -44,12 +44,16 @@ List<_Segment> _buildSegments({
   required List<Segment> layoutSegments,
   required double timelineHeight,
 }) {
+  const double offsetThreshold = 20.0;
+
   final segments = <_Segment>[];
   if (layoutSegments.isEmpty || layoutSegments.first.bucket is! TimeBucket) {
     return [];
   }
 
   final formatter = DateFormat.yMMM();
+  DateTime? lastDate;
+  double lastOffset = -offsetThreshold;
   for (final layoutSegment in layoutSegments) {
     final scrollPercentage =
         layoutSegment.startOffset / layoutSegments.last.endOffset;
@@ -58,13 +62,21 @@ List<_Segment> _buildSegments({
     final date = (layoutSegment.bucket as TimeBucket).date;
     final label = formatter.format(date);
 
+    final showSegment = lastOffset + offsetThreshold <= startOffset &&
+        (lastDate == null || date.year != lastDate.year);
+
     segments.add(
       _Segment(
         date: date,
         startOffset: startOffset,
         scrollLabel: label,
+        showSegment: showSegment,
       ),
     );
+    lastDate = date;
+    if (showSegment) {
+      lastOffset = startOffset;
+    }
   }
 
   return segments;
@@ -85,12 +97,15 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
   double get _scrubberHeight =>
       widget.timelineHeight - widget.topPadding - widget.bottomPadding;
 
-  late final ScrollController _scrollController;
+  late ScrollController _scrollController;
 
-  double get _currentOffset =>
-      _scrollController.offset *
-      _scrubberHeight /
-      _scrollController.position.maxScrollExtent;
+  double get _currentOffset {
+    if (_scrollController.hasClients != true) return 0.0;
+
+    return _scrollController.offset *
+        _scrubberHeight /
+        _scrollController.position.maxScrollExtent;
+  }
 
   @override
   void initState() {
@@ -194,28 +209,102 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
       _thumbAnimationController.forward();
     }
 
-    final newOffset =
-        details.globalPosition.dy - widget.topPadding - widget.bottomPadding;
+    final dragPosition = _calculateDragPosition(details);
+    final nearestMonthSegment = _findNearestMonthSegment(dragPosition);
 
+    if (nearestMonthSegment != null) {
+      _snapToSegment(nearestMonthSegment);
+    }
+  }
+
+  /// Calculate the drag position relative to the scrubber area
+  ///
+  /// This method converts the global drag coordinates from the gesture detector
+  /// into a position relative to the scrubber's active area (excluding padding).
+  ///
+  /// The scrubber has padding at the top and bottom, so we need to:
+  /// 1. Calculate the actual draggable area (timelineHeight - topPadding - bottomPadding)
+  /// 2. Convert the global Y position to a position within this draggable area
+  /// 3. Clamp the result to ensure it stays within bounds (0 to dragAreaHeight)
+  ///
+  /// Example:
+  /// - If timelineHeight = 800, topPadding = 50, bottomPadding = 50
+  /// - Then dragAreaHeight = 700 (the actual scrubber area)
+  /// - If user drags to global Y position that's 100 pixels from the top
+  /// - The relative position would be 100 - 50 = 50 (50 pixels into the scrubber area)
+  double _calculateDragPosition(DragUpdateDetails details) {
+    final dragAreaTop = widget.topPadding;
+    final dragAreaBottom = widget.timelineHeight - widget.bottomPadding;
+    final dragAreaHeight = dragAreaBottom - dragAreaTop;
+
+    final relativePosition = details.globalPosition.dy - dragAreaTop;
+
+    // Make sure the position stays within the scrubber's bounds
+    return relativePosition.clamp(0.0, dragAreaHeight);
+  }
+
+  /// Find the segment closest to the given position
+  _Segment? _findNearestMonthSegment(double position) {
+    _Segment? nearestSegment;
+    double minDistance = double.infinity;
+
+    for (final segment in _segments) {
+      final distance = (segment.startOffset - position).abs();
+      if (distance < minDistance) {
+        minDistance = distance;
+        nearestSegment = segment;
+      }
+    }
+
+    return nearestSegment;
+  }
+
+  /// Snap the scrubber thumb and scroll view to the given segment
+  void _snapToSegment(_Segment segment) {
     setState(() {
-      _thumbTopOffset = newOffset.clamp(0, _scrubberHeight);
-      final scrollPercentage = _thumbTopOffset / _scrubberHeight;
-      final maxScrollExtent = _scrollController.position.maxScrollExtent;
-      _scrollController.jumpTo(maxScrollExtent * scrollPercentage);
+      _thumbTopOffset = segment.startOffset;
+
+      final layoutSegmentIndex = _findLayoutSegmentIndex(segment);
+
+      if (layoutSegmentIndex >= 0) {
+        _scrollToLayoutSegment(layoutSegmentIndex);
+      }
     });
   }
 
+  int _findLayoutSegmentIndex(_Segment segment) {
+    return widget.layoutSegments.indexWhere(
+      (layoutSegment) {
+        final bucket = layoutSegment.bucket as TimeBucket;
+        return bucket.date.year == segment.date.year &&
+            bucket.date.month == segment.date.month;
+      },
+    );
+  }
+
+  void _scrollToLayoutSegment(int layoutSegmentIndex) {
+    final layoutSegment = widget.layoutSegments[layoutSegmentIndex];
+    final maxScrollExtent = _scrollController.position.maxScrollExtent;
+    final viewportHeight = _scrollController.position.viewportDimension;
+
+    final targetScrollOffset = layoutSegment.startOffset;
+    final centeredOffset = targetScrollOffset - (viewportHeight / 4) + 100;
+
+    _scrollController.jumpTo(centeredOffset.clamp(0.0, maxScrollExtent));
+  }
+
   void _onDragEnd(WidgetRef ref) {
     ref.read(timelineStateProvider.notifier).setScrubbing(false);
     _labelAnimationController.reverse();
     _isDragging = false;
+
     _resetThumbTimer();
   }
 
   @override
   Widget build(BuildContext ctx) {
     Text? label;
-    if (_scrollController.hasClients) {
+    if (_scrollController.hasClients == true) {
       // Cache to avoid multiple calls to [_currentOffset]
       final scrollOffset = _currentOffset;
       final labelText = _segments
@@ -240,20 +329,31 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
       child: Stack(
         children: [
           RepaintBoundary(child: widget.child),
+          // Scroll Segments - wrapped in RepaintBoundary for better performance
+          RepaintBoundary(
+            child: _SegmentsLayer(
+              key: ValueKey('segments_${_isDragging}_${_segments.length}'),
+              segments: _segments,
+              topPadding: widget.topPadding,
+              isDragging: _isDragging,
+            ),
+          ),
           PositionedDirectional(
             top: _thumbTopOffset + widget.topPadding,
             end: 0,
-            child: Consumer(
-              builder: (_, ref, child) => GestureDetector(
-                onVerticalDragStart: (_) => _onDragStart(ref),
-                onVerticalDragUpdate: _onDragUpdate,
-                onVerticalDragEnd: (_) => _onDragEnd(ref),
-                child: child,
-              ),
-              child: _Scrubber(
-                thumbAnimation: _thumbAnimation,
-                labelAnimation: _labelAnimation,
-                label: label,
+            child: RepaintBoundary(
+              child: Consumer(
+                builder: (_, ref, child) => GestureDetector(
+                  onVerticalDragStart: (_) => _onDragStart(ref),
+                  onVerticalDragUpdate: _onDragUpdate,
+                  onVerticalDragEnd: (_) => _onDragEnd(ref),
+                  child: child,
+                ),
+                child: _Scrubber(
+                  thumbAnimation: _thumbAnimation,
+                  labelAnimation: _labelAnimation,
+                  label: label,
+                ),
               ),
             ),
           ),
@@ -263,6 +363,72 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
   }
 }
 
+class _SegmentsLayer extends StatelessWidget {
+  final List<_Segment> segments;
+  final double topPadding;
+  final bool isDragging;
+
+  const _SegmentsLayer({
+    super.key,
+    required this.segments,
+    required this.topPadding,
+    required this.isDragging,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Visibility(
+      visible: isDragging,
+      child: Stack(
+        children: segments
+            .where((segment) => segment.showSegment)
+            .map(
+              (segment) => PositionedDirectional(
+                key: ValueKey('segment_${segment.date.millisecondsSinceEpoch}'),
+                top: topPadding + segment.startOffset,
+                end: 100,
+                child: RepaintBoundary(
+                  child: _SegmentWidget(segment),
+                ),
+              ),
+            )
+            .toList(),
+      ),
+    );
+  }
+}
+
+class _SegmentWidget extends StatelessWidget {
+  final _Segment _segment;
+
+  const _SegmentWidget(this._segment);
+
+  @override
+  Widget build(BuildContext context) {
+    return IgnorePointer(
+      child: Container(
+        margin: const EdgeInsets.only(right: 12.0),
+        child: Material(
+          color: context.colorScheme.surface,
+          borderRadius: const BorderRadius.all(Radius.circular(16.0)),
+          child: Container(
+            constraints: const BoxConstraints(maxHeight: 28),
+            padding: const EdgeInsets.symmetric(horizontal: 10.0),
+            alignment: Alignment.center,
+            child: Text(
+              _segment.date.year.toString(),
+              style: context.textTheme.labelMedium?.copyWith(
+                fontFamily: "OverpassMono",
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
 class _ScrollLabel extends StatelessWidget {
   final Text label;
   final Color backgroundColor;
@@ -429,22 +595,26 @@ class _Segment {
   final DateTime date;
   final double startOffset;
   final String scrollLabel;
+  final bool showSegment;
 
   const _Segment({
     required this.date,
     required this.startOffset,
     required this.scrollLabel,
+    this.showSegment = false,
   });
 
   _Segment copyWith({
     DateTime? date,
     double? startOffset,
     String? scrollLabel,
+    bool? showSegment,
   }) {
     return _Segment(
       date: date ?? this.date,
       startOffset: startOffset ?? this.startOffset,
       scrollLabel: scrollLabel ?? this.scrollLabel,
+      showSegment: showSegment ?? this.showSegment,
     );
   }
 
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 6ea3ddaf44..109c4e0de0 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -13,6 +13,8 @@ import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
 
 class Timeline extends StatelessWidget {
   const Timeline({super.key});
@@ -63,38 +65,68 @@ class _SliverTimelineState extends State<_SliverTimeline> {
         final asyncSegments = ref.watch(timelineSegmentProvider);
         final maxHeight =
             ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
+        final isMultiSelectEnabled =
+            ref.watch(multiSelectProvider.select((s) => s.isEnabled));
         return asyncSegments.widgetWhen(
           onData: (segments) {
             final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
+            final statusBarHeight = context.padding.top;
+            final totalAppBarHeight = statusBarHeight + kToolbarHeight;
+            const scrubberBottomPadding = 100.0;
 
             return PrimaryScrollController(
               controller: _scrollController,
-              child: Scrubber(
-                layoutSegments: segments,
-                timelineHeight: maxHeight,
-                topPadding: context.padding.top + 10,
-                bottomPadding: context.padding.bottom + 10,
-                child: CustomScrollView(
-                  primary: true,
-                  cacheExtent: maxHeight * 2,
-                  slivers: [
-                    _SliverSegmentedList(
-                      segments: segments,
-                      delegate: SliverChildBuilderDelegate(
-                        (ctx, index) {
-                          if (index >= childCount) return null;
-                          final segment = segments.findByIndex(index);
-                          return segment?.builder(ctx, index) ??
-                              const SizedBox.shrink();
-                        },
-                        childCount: childCount,
-                        addAutomaticKeepAlives: false,
-                        // We add repaint boundary around tiles, so skip the auto boundaries
-                        addRepaintBoundaries: false,
-                      ),
+              child: Stack(
+                children: [
+                  Scrubber(
+                    layoutSegments: segments,
+                    timelineHeight: maxHeight,
+                    topPadding: totalAppBarHeight + 10,
+                    bottomPadding:
+                        context.padding.bottom + scrubberBottomPadding,
+                    child: CustomScrollView(
+                      primary: true,
+                      cacheExtent: maxHeight * 2,
+                      slivers: [
+                        SliverAnimatedOpacity(
+                          duration: Durations.medium1,
+                          opacity: isMultiSelectEnabled ? 0 : 1,
+                          sliver: const ImmichSliverAppBar(
+                            floating: true,
+                            pinned: false,
+                            snap: false,
+                          ),
+                        ),
+                        _SliverSegmentedList(
+                          segments: segments,
+                          delegate: SliverChildBuilderDelegate(
+                            (ctx, index) {
+                              if (index >= childCount) return null;
+                              final segment = segments.findByIndex(index);
+                              return segment?.builder(ctx, index) ??
+                                  const SizedBox.shrink();
+                            },
+                            childCount: childCount,
+                            addAutomaticKeepAlives: false,
+                            // We add repaint boundary around tiles, so skip the auto boundaries
+                            addRepaintBoundaries: false,
+                          ),
+                        ),
+                        const SliverPadding(
+                          padding: EdgeInsets.only(
+                            bottom: scrubberBottomPadding,
+                          ),
+                        ),
+                      ],
                     ),
-                  ],
-                ),
+                  ),
+                  if (isMultiSelectEnabled)
+                    const Positioned(
+                      top: 60,
+                      left: 25,
+                      child: _MultiSelectStatusButton(),
+                    ),
+                ],
               ),
             );
           },
@@ -363,3 +395,27 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
     childManager.didFinishLayout();
   }
 }
+
+class _MultiSelectStatusButton extends ConsumerWidget {
+  const _MultiSelectStatusButton();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final selectCount =
+        ref.watch(multiSelectProvider.select((s) => s.selectedAssets.length));
+    return ElevatedButton.icon(
+      onPressed: () => ref.read(multiSelectProvider.notifier).clearSelection(),
+      icon: Icon(
+        Icons.close_rounded,
+        color: context.colorScheme.onPrimary,
+      ),
+      label: Text(
+        selectCount.toString(),
+        style: context.textTheme.titleMedium?.copyWith(
+          height: 2.5,
+          color: context.colorScheme.onPrimary,
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dart
index df9e999036..121bcba343 100644
--- a/mobile/lib/providers/timeline/multiselect.provider.dart
+++ b/mobile/lib/providers/timeline/multiselect.provider.dart
@@ -83,6 +83,12 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
     }
   }
 
+  void clearSelection() {
+    state = state.copyWith(
+      selectedAssets: {},
+    );
+  }
+
   /// Bucket bulk operations
   void selectBucket(int offset, int bucketCount) async {
     final assets = await _timelineService.loadAssets(offset, bucketCount);
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 79f74bc5ee..5e8f018ae8 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -31,6 +31,7 @@ import 'package:immich_mobile/pages/common/native_video_viewer.page.dart';
 import 'package:immich_mobile/pages/common/settings.page.dart';
 import 'package:immich_mobile/pages/common/splash_screen.page.dart';
 import 'package:immich_mobile/pages/common/tab_controller.page.dart';
+import 'package:immich_mobile/pages/common/tab_shell.page.dart';
 import 'package:immich_mobile/pages/editing/crop.page.dart';
 import 'package:immich_mobile/pages/editing/edit.page.dart';
 import 'package:immich_mobile/pages/editing/filter.page.dart';
@@ -152,6 +153,30 @@ class AppRouter extends RootStackRouter {
       ],
       transitionsBuilder: TransitionsBuilders.fadeIn,
     ),
+    CustomRoute(
+      page: TabShellRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+      children: [
+        AutoRoute(
+          page: MainTimelineRoute.page,
+          guards: [_authGuard, _duplicateGuard],
+        ),
+        AutoRoute(
+          page: SearchRoute.page,
+          guards: [_authGuard, _duplicateGuard],
+          maintainState: false,
+        ),
+        AutoRoute(
+          page: LibraryRoute.page,
+          guards: [_authGuard, _duplicateGuard],
+        ),
+        AutoRoute(
+          page: AlbumsRoute.page,
+          guards: [_authGuard, _duplicateGuard],
+        ),
+      ],
+      transitionsBuilder: TransitionsBuilders.fadeIn,
+    ),
     CustomRoute(
       page: GalleryViewerRoute.page,
       guards: [_authGuard, _duplicateGuard],
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index efc9e71a23..797b519ddb 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -1662,6 +1662,22 @@ class TabControllerRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [TabShellPage]
+class TabShellRoute extends PageRouteInfo<void> {
+  const TabShellRoute({List<PageRouteInfo>? children})
+      : super(TabShellRoute.name, initialChildren: children);
+
+  static const String name = 'TabShellRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const TabShellPage();
+    },
+  );
+}
+
 /// generated route for
 /// [TrashPage]
 class TrashRoute extends PageRouteInfo<void> {
diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
new file mode 100644
index 0000000000..4970a3a0c8
--- /dev/null
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -0,0 +1,256 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/models/backup/backup_state.model.dart';
+import 'package:immich_mobile/models/server_info/server_info.model.dart';
+import 'package:immich_mobile/providers/backup/backup.provider.dart';
+import 'package:immich_mobile/providers/cast.provider.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/asset_viewer/cast_dialog.dart';
+import 'package:immich_mobile/widgets/common/app_bar_dialog/app_bar_dialog.dart';
+import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
+
+class ImmichSliverAppBar extends ConsumerWidget {
+  final List<Widget>? actions;
+  final bool showUploadButton;
+  final bool floating;
+  final bool pinned;
+  final bool snap;
+  final Widget? title;
+  final double? expandedHeight;
+
+  const ImmichSliverAppBar({
+    super.key,
+    this.actions,
+    this.showUploadButton = true,
+    this.floating = true,
+    this.pinned = false,
+    this.snap = true,
+    this.title,
+    this.expandedHeight,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
+
+    return SliverAppBar(
+      floating: floating,
+      pinned: pinned,
+      snap: snap,
+      expandedHeight: expandedHeight,
+      backgroundColor: context.colorScheme.surfaceContainer,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(
+          Radius.circular(5),
+        ),
+      ),
+      automaticallyImplyLeading: false,
+      centerTitle: false,
+      title: title ?? const _ImmichLogoWithText(),
+      actions: [
+        if (actions != null)
+          ...actions!.map(
+            (action) => Padding(
+              padding: const EdgeInsets.only(right: 16),
+              child: action,
+            ),
+          ),
+        IconButton(
+          icon: const Icon(Icons.science_rounded),
+          onPressed: () => context.pushRoute(const FeatInDevRoute()),
+        ),
+        if (isCasting)
+          Padding(
+            padding: const EdgeInsets.only(right: 12),
+            child: IconButton(
+              onPressed: () {
+                showDialog(
+                  context: context,
+                  builder: (context) => const CastDialog(),
+                );
+              },
+              icon: Icon(
+                isCasting ? Icons.cast_connected_rounded : Icons.cast_rounded,
+              ),
+            ),
+          ),
+        if (showUploadButton)
+          const Padding(
+            padding: EdgeInsets.only(right: 20),
+            child: _BackupIndicator(),
+          ),
+        const Padding(
+          padding: EdgeInsets.only(right: 20),
+          child: _ProfileIndicator(),
+        ),
+      ],
+    );
+  }
+}
+
+class _ImmichLogoWithText extends StatelessWidget {
+  const _ImmichLogoWithText();
+
+  @override
+  Widget build(BuildContext context) {
+    return Builder(
+      builder: (BuildContext context) {
+        return Row(
+          children: [
+            Builder(
+              builder: (context) {
+                return Padding(
+                  padding: const EdgeInsets.only(top: 3.0),
+                  child: SvgPicture.asset(
+                    context.isDarkTheme
+                        ? 'assets/immich-logo-inline-dark.svg'
+                        : 'assets/immich-logo-inline-light.svg',
+                    height: 40,
+                  ),
+                );
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
+
+class _ProfileIndicator extends ConsumerWidget {
+  const _ProfileIndicator();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final ServerInfo serverInfoState = ref.watch(serverInfoProvider);
+    final user = ref.watch(currentUserProvider);
+    const widgetSize = 30.0;
+
+    return InkWell(
+      onTap: () => showDialog(
+        context: context,
+        useRootNavigator: false,
+        builder: (ctx) => const ImmichAppBarDialog(),
+      ),
+      borderRadius: BorderRadius.circular(12),
+      child: Badge(
+        label: Container(
+          decoration: BoxDecoration(
+            color: Colors.black,
+            borderRadius: BorderRadius.circular(widgetSize / 2),
+          ),
+          child: const Icon(
+            Icons.info,
+            color: Color.fromARGB(255, 243, 188, 106),
+            size: widgetSize / 2,
+          ),
+        ),
+        backgroundColor: Colors.transparent,
+        alignment: Alignment.bottomRight,
+        isLabelVisible: serverInfoState.isVersionMismatch ||
+            ((user?.isAdmin ?? false) && serverInfoState.isNewReleaseAvailable),
+        offset: const Offset(-2, -12),
+        child: user == null
+            ? const Icon(
+                Icons.face_outlined,
+                size: widgetSize,
+              )
+            : Semantics(
+                label: "logged_in_as".tr(namedArgs: {"user": user.name}),
+                child: UserCircleAvatar(
+                  radius: 17,
+                  size: 31,
+                  user: user,
+                ),
+              ),
+      ),
+    );
+  }
+}
+
+class _BackupIndicator extends ConsumerWidget {
+  const _BackupIndicator();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    const widgetSize = 30.0;
+    final indicatorIcon = _getBackupBadgeIcon(context, ref);
+    final badgeBackground = context.colorScheme.surfaceContainer;
+
+    return InkWell(
+      onTap: () => context.pushRoute(const BackupControllerRoute()),
+      borderRadius: BorderRadius.circular(12),
+      child: Badge(
+        label: Container(
+          width: widgetSize / 2,
+          height: widgetSize / 2,
+          decoration: BoxDecoration(
+            color: badgeBackground,
+            border: Border.all(
+              color: context.colorScheme.outline.withValues(alpha: .3),
+            ),
+            borderRadius: BorderRadius.circular(widgetSize / 2),
+          ),
+          child: indicatorIcon,
+        ),
+        backgroundColor: Colors.transparent,
+        alignment: Alignment.bottomRight,
+        isLabelVisible: indicatorIcon != null,
+        offset: const Offset(-2, -12),
+        child: Icon(
+          Icons.backup_rounded,
+          size: widgetSize,
+          color: context.primaryColor,
+        ),
+      ),
+    );
+  }
+
+  Widget? _getBackupBadgeIcon(BuildContext context, WidgetRef ref) {
+    final BackUpState backupState = ref.watch(backupProvider);
+    final bool isEnableAutoBackup =
+        backupState.backgroundBackup || backupState.autoBackup;
+    final isDarkTheme = context.isDarkTheme;
+    final iconColor = isDarkTheme ? Colors.white : Colors.black;
+
+    if (isEnableAutoBackup) {
+      if (backupState.backupProgress == BackUpProgressEnum.inProgress) {
+        return Container(
+          padding: const EdgeInsets.all(3.5),
+          child: CircularProgressIndicator(
+            strokeWidth: 2,
+            strokeCap: StrokeCap.round,
+            valueColor: AlwaysStoppedAnimation<Color>(iconColor),
+            semanticsLabel: 'backup_controller_page_backup'.tr(),
+          ),
+        );
+      } else if (backupState.backupProgress !=
+              BackUpProgressEnum.inBackground &&
+          backupState.backupProgress != BackUpProgressEnum.manualInProgress) {
+        return Icon(
+          Icons.check_outlined,
+          size: 9,
+          color: iconColor,
+          semanticLabel: 'backup_controller_page_backup'.tr(),
+        );
+      }
+    }
+
+    if (!isEnableAutoBackup) {
+      return Icon(
+        Icons.cloud_off_rounded,
+        size: 9,
+        color: iconColor,
+        semanticLabel: 'backup_controller_page_backup'.tr(),
+      );
+    }
+
+    return null;
+  }
+}

From 5b0575b956840077f774b6618e7016a512a9ab2a Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Wed, 25 Jun 2025 13:06:24 +0530
Subject: [PATCH 047/337] refactor: DCM - const border radius, constructor &
 switch expressions (#19515)

* enable border radius, switch exp, const constructor

* regenerate provider

* more formatting

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .github/workflows/static_analysis.yml         |  2 +-
 mobile/analysis_options.yaml                  |  4 ++-
 .../test_utils/login_helper.dart              |  6 ++--
 mobile/lib/constants/errors.dart              |  2 ++
 mobile/lib/domain/models/person.model.dart    |  2 +-
 mobile/lib/entities/asset.entity.dart         | 18 ++++--------
 mobile/lib/entities/store.entity.dart         |  2 +-
 .../repositories/api.repository.dart          |  2 +-
 .../albums/album_viewer_page_state.model.dart |  2 +-
 .../asset_selection_page_result.model.dart    |  2 +-
 mobile/lib/models/auth/auth_state.model.dart  |  2 +-
 .../models/auth/auxilary_endpoint.model.dart  |  4 +--
 .../lib/models/auth/login_response.model.dart |  2 +-
 .../models/backup/available_album.model.dart  |  2 +-
 .../backup/current_upload_asset.model.dart    |  2 +-
 .../backup/success_upload_asset.model.dart    |  2 +-
 .../models/download/download_state.model.dart |  4 +--
 .../models/folder/recursive_folder.model.dart |  2 +-
 .../lib/models/folder/root_folder.model.dart  |  2 +-
 mobile/lib/models/map/map_event.model.dart    |  4 ++-
 mobile/lib/models/map/map_marker.model.dart   |  2 +-
 mobile/lib/models/map/map_state.model.dart    |  2 +-
 mobile/lib/models/memories/memory.model.dart  |  2 +-
 .../search/search_curated_content.model.dart  |  2 +-
 .../models/search/search_result.model.dart    |  2 +-
 .../search_result_page_state.model.dart       |  2 +-
 .../models/server_info/server_info.model.dart |  2 +-
 mobile/lib/pages/albums/albums.page.dart      | 20 +++++++++----
 .../backup/backup_album_selection.page.dart   |  6 ++--
 .../pages/backup/backup_controller.page.dart  |  4 ++-
 .../backup/failed_backup_status.page.dart     |  8 +++--
 .../lib/pages/common/app_log_detail.page.dart |  8 +++--
 .../lib/pages/common/create_album.page.dart   |  6 ++--
 mobile/lib/pages/common/download_panel.dart   |  6 ++--
 mobile/lib/pages/common/settings.page.dart    |  6 ++--
 mobile/lib/pages/editing/edit.page.dart       | 12 ++++++--
 mobile/lib/pages/editing/filter.page.dart     |  8 +++--
 mobile/lib/pages/library/library.page.dart    |  8 +++--
 .../library/partner/partner_detail.page.dart  |  4 ++-
 .../places/places_collection.page.dart        |  4 ++-
 mobile/lib/pages/search/map/map.page.dart     |  2 +-
 mobile/lib/pages/search/search.page.dart      | 29 ++++++++++---------
 .../widgets/images/remote_thumb_provider.dart |  2 +-
 .../widgets/images/thumb_hash_provider.dart   |  2 +-
 .../widgets/timeline/segment_builder.dart     | 18 ++++--------
 .../album/album_viewer.provider.dart          |  4 +--
 .../lib/providers/app_settings.provider.dart  |  2 +-
 .../providers/app_settings.provider.g.dart    |  2 +-
 .../asset_viewer/download.provider.dart       |  2 +-
 mobile/lib/providers/auth.provider.dart       |  4 +--
 .../ios_background_settings.provider.dart     |  2 +-
 .../providers/image/cache/image_loader.dart   |  2 +-
 .../exceptions/image_loading_exception.dart   |  2 +-
 .../image/immich_remote_image_provider.dart   |  2 +-
 .../immich_remote_thumbnail_provider.dart     |  2 +-
 .../search/paginated_search.provider.dart     |  4 +--
 .../lib/providers/server_info.provider.dart   | 19 ++++++------
 .../timeline/multiselect.provider.dart        |  4 +--
 .../upload_profile_image.provider.dart        |  4 +--
 mobile/lib/providers/websocket.provider.dart  |  8 +++--
 mobile/lib/repositories/album.repository.dart |  2 +-
 mobile/lib/repositories/api.repository.dart   |  2 +-
 mobile/lib/repositories/asset.repository.dart |  2 +-
 .../repositories/asset_api.repository.dart    | 18 ++++--------
 .../repositories/asset_media.repository.dart  |  4 ++-
 mobile/lib/repositories/auth.repository.dart  |  2 +-
 .../lib/repositories/backup.repository.dart   |  2 +-
 .../repositories/biometric.repository.dart    |  2 +-
 .../lib/repositories/database.repository.dart |  2 +-
 mobile/lib/repositories/etag.repository.dart  |  2 +-
 .../repositories/file_media.repository.dart   |  4 ++-
 .../local_files_manager.repository.dart       |  2 +-
 .../lib/repositories/network.repository.dart  |  2 +-
 .../lib/repositories/partner.repository.dart  |  2 +-
 .../repositories/permission.repository.dart   |  4 +--
 .../secure_storage.repository.dart            |  4 +--
 .../lib/repositories/timeline.repository.dart |  2 +-
 .../lib/repositories/widget.repository.dart   |  4 +--
 .../lib/routing/backup_permission_guard.dart  |  2 +-
 mobile/lib/routing/duplicate_guard.dart       |  2 +-
 mobile/lib/routing/router.dart                |  2 +-
 mobile/lib/services/app_settings.service.dart |  1 +
 mobile/lib/services/backup_album.service.dart |  2 +-
 mobile/lib/services/deep_link.service.dart    | 24 +++++++--------
 mobile/lib/services/device.service.dart       |  4 +--
 mobile/lib/services/entity.service.dart       |  2 +-
 mobile/lib/services/etag.service.dart         |  2 +-
 mobile/lib/services/local_auth.service.dart   |  2 +-
 .../services/local_files_manager.service.dart |  3 +-
 mobile/lib/services/network.service.dart      |  2 +-
 .../lib/services/secure_storage.service.dart  |  2 +-
 mobile/lib/services/server_info.service.dart  |  2 +-
 mobile/lib/services/stack.service.dart        |  2 +-
 mobile/lib/services/widget.service.dart       |  2 +-
 mobile/lib/theme/dynamic_theme.dart           |  2 +-
 mobile/lib/utils/map_utils.dart               |  2 +-
 .../widgets/album/album_thumbnail_card.dart   |  4 ++-
 .../widgets/album/album_title_text_field.dart | 16 ++++++----
 .../asset_grid/asset_grid_data_structure.dart |  2 +-
 .../asset_grid/draggable_scrollbar.dart       |  3 +-
 .../draggable_scrollbar_custom.dart           |  1 +
 .../asset_viewer/advanced_bottom_sheet.dart   |  4 ++-
 .../widgets/asset_viewer/gallery_app_bar.dart |  6 ++--
 .../lib/widgets/backup/album_info_card.dart   | 14 ++++++---
 .../lib/widgets/backup/backup_info_card.dart  |  4 ++-
 .../common/app_bar_dialog/app_bar_dialog.dart |  6 ++--
 .../app_bar_dialog/app_bar_profile_info.dart  |  4 +--
 .../app_bar_dialog/app_bar_server_info.dart   |  5 ++--
 .../lib/widgets/common/date_time_picker.dart  | 12 +++++---
 mobile/lib/widgets/common/immich_app_bar.dart |  4 +--
 .../widgets/common/immich_sliver_app_bar.dart |  4 +--
 mobile/lib/widgets/common/search_field.dart   | 16 +++++++---
 .../lib/widgets/forms/login/login_form.dart   |  4 ++-
 mobile/lib/widgets/map/map_app_bar.dart       |  8 +++--
 mobile/lib/widgets/map/map_asset_grid.dart    |  4 ++-
 .../map/positioned_asset_marker_icon.dart     |  2 +-
 mobile/lib/widgets/memories/memory_card.dart  |  6 ++--
 .../photo_view/photo_view_gallery.dart        |  3 +-
 .../widgets/search/person_name_edit_form.dart |  4 +--
 .../search/search_filter/common/dropdown.dart |  4 +--
 .../backup_settings/background_settings.dart  |  4 ++-
 .../external_network_preference.dart          |  7 +++--
 .../primary_color_setting.dart                |  6 ++--
 .../settings/settings_radio_list_tile.dart    |  2 +-
 .../widgets/shared_link/shared_link_item.dart |  4 +--
 .../domain/services/log_service_test.dart     |  1 -
 .../services/sync_stream_service_test.dart    |  3 --
 .../modules/map/map_theme_override_test.dart  |  2 +-
 mobile/test/services/auth.service_test.dart   | 12 ++++----
 mobile/test/test_utils.dart                   |  1 -
 130 files changed, 338 insertions(+), 264 deletions(-)

diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index a6365f5c98..5d0d690661 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -109,7 +109,7 @@ jobs:
         working-directory: ./mobile
 
       - name: Run DCM
-        run: dcm analyze lib
+        run: dcm analyze lib --fatal-style --fatal-warnings
         working-directory: ./mobile
 
   zizmor:
diff --git a/mobile/analysis_options.yaml b/mobile/analysis_options.yaml
index 7ca6b7a2b8..2c52595a26 100644
--- a/mobile/analysis_options.yaml
+++ b/mobile/analysis_options.yaml
@@ -146,6 +146,7 @@ dart_code_metrics:
   #  - no-empty-block
   #  - no-equal-then-else
   #  - prefer-correct-test-file-name
+    - prefer-const-border-radius
   #  - prefer-match-file-name
   #  - prefer-return-await
   #  - avoid-self-assignment
@@ -290,7 +291,8 @@ dart_code_metrics:
     # Style
   #  - prefer-trailing-comma
   #  - unnecessary-trailing-comma
-  #  - prefer-declaring-const-constructor
+    - prefer-declaring-const-constructor
   #  - prefer-single-widget-per-file
+    - prefer-switch-expression
   #  - prefer-prefixed-global-constants
   #  - prefer-correct-callback-field-name
diff --git a/mobile/integration_test/test_utils/login_helper.dart b/mobile/integration_test/test_utils/login_helper.dart
index b3a867af68..cfbc5a9214 100644
--- a/mobile/integration_test/test_utils/login_helper.dart
+++ b/mobile/integration_test/test_utils/login_helper.dart
@@ -7,7 +7,7 @@ import 'general_helper.dart';
 class ImmichTestLoginHelper {
   final WidgetTester tester;
 
-  ImmichTestLoginHelper(this.tester);
+  const ImmichTestLoginHelper(this.tester);
 
   Future<void> waitForLoginScreen() async {
     await pumpUntilFound(tester, find.text("Login"));
@@ -60,11 +60,11 @@ class ImmichTestLoginHelper {
     await tester.tap(button);
   }
 
-  Future<void> assertLoginSuccess({int timeoutSeconds = 15}) async {
+  Future<void> assertLoginSuccess() async {
     await pumpUntilFound(tester, find.text("home_page_building_timeline".tr()));
   }
 
-  Future<void> assertLoginFailed({int timeoutSeconds = 15}) async {
+  Future<void> assertLoginFailed() async {
     await pumpUntilFound(tester, find.text("login_form_failed_login".tr()));
   }
 }
diff --git a/mobile/lib/constants/errors.dart b/mobile/lib/constants/errors.dart
index 3d1f775033..0ee1195737 100644
--- a/mobile/lib/constants/errors.dart
+++ b/mobile/lib/constants/errors.dart
@@ -4,6 +4,8 @@ sealed class ImmichErrors {
 }
 
 class NoResponseDtoError extends ImmichErrors implements Exception {
+  const NoResponseDtoError();
+
   @override
   String toString() => "Response Dto is null";
 }
diff --git a/mobile/lib/domain/models/person.model.dart b/mobile/lib/domain/models/person.model.dart
index 63b9f5c159..10453f768d 100644
--- a/mobile/lib/domain/models/person.model.dart
+++ b/mobile/lib/domain/models/person.model.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 class Person {
-  Person({
+  const Person({
     required this.id,
     this.birthDate,
     required this.isHidden,
diff --git a/mobile/lib/entities/asset.entity.dart b/mobile/lib/entities/asset.entity.dart
index d8d2bd23c3..d754b11dc5 100644
--- a/mobile/lib/entities/asset.entity.dart
+++ b/mobile/lib/entities/asset.entity.dart
@@ -554,18 +554,12 @@ class Asset {
 }""";
   }
 
-  static getVisibility(AssetVisibility visibility) {
-    switch (visibility) {
-      case AssetVisibility.timeline:
-        return AssetVisibilityEnum.timeline;
-      case AssetVisibility.archive:
-        return AssetVisibilityEnum.archive;
-      case AssetVisibility.hidden:
-        return AssetVisibilityEnum.hidden;
-      case AssetVisibility.locked:
-        return AssetVisibilityEnum.locked;
-    }
-  }
+  static getVisibility(AssetVisibility visibility) => switch (visibility) {
+        AssetVisibility.archive => AssetVisibilityEnum.archive,
+        AssetVisibility.hidden => AssetVisibilityEnum.hidden,
+        AssetVisibility.locked => AssetVisibilityEnum.locked,
+        AssetVisibility.timeline || _ => AssetVisibilityEnum.timeline,
+      };
 }
 
 enum AssetType {
diff --git a/mobile/lib/entities/store.entity.dart b/mobile/lib/entities/store.entity.dart
index ed955352e2..c937697149 100644
--- a/mobile/lib/entities/store.entity.dart
+++ b/mobile/lib/entities/store.entity.dart
@@ -11,7 +11,7 @@ class SSLClientCertStoreVal {
   final Uint8List data;
   final String? password;
 
-  SSLClientCertStoreVal(this.data, this.password);
+  const SSLClientCertStoreVal(this.data, this.password);
 
   void save() {
     final b64Str = base64Encode(data);
diff --git a/mobile/lib/infrastructure/repositories/api.repository.dart b/mobile/lib/infrastructure/repositories/api.repository.dart
index 56c64c5512..15696c65b7 100644
--- a/mobile/lib/infrastructure/repositories/api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/api.repository.dart
@@ -5,7 +5,7 @@ class ApiRepository {
 
   Future<T> checkNull<T>(Future<T?> future) async {
     final response = await future;
-    if (response == null) throw NoResponseDtoError();
+    if (response == null) throw const NoResponseDtoError();
     return response;
   }
 }
diff --git a/mobile/lib/models/albums/album_viewer_page_state.model.dart b/mobile/lib/models/albums/album_viewer_page_state.model.dart
index 10a8183ddc..9fd5da1b28 100644
--- a/mobile/lib/models/albums/album_viewer_page_state.model.dart
+++ b/mobile/lib/models/albums/album_viewer_page_state.model.dart
@@ -5,7 +5,7 @@ class AlbumViewerPageState {
   final String editTitleText;
   final String editDescriptionText;
 
-  AlbumViewerPageState({
+  const AlbumViewerPageState({
     required this.isEditAlbum,
     required this.editTitleText,
     required this.editDescriptionText,
diff --git a/mobile/lib/models/albums/asset_selection_page_result.model.dart b/mobile/lib/models/albums/asset_selection_page_result.model.dart
index 04934f7a72..2a4daba64a 100644
--- a/mobile/lib/models/albums/asset_selection_page_result.model.dart
+++ b/mobile/lib/models/albums/asset_selection_page_result.model.dart
@@ -4,7 +4,7 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 class AssetSelectionPageResult {
   final Set<Asset> selectedAssets;
 
-  AssetSelectionPageResult({
+  const AssetSelectionPageResult({
     required this.selectedAssets,
   });
   @override
diff --git a/mobile/lib/models/auth/auth_state.model.dart b/mobile/lib/models/auth/auth_state.model.dart
index fb65850f1d..0d8357d66d 100644
--- a/mobile/lib/models/auth/auth_state.model.dart
+++ b/mobile/lib/models/auth/auth_state.model.dart
@@ -7,7 +7,7 @@ class AuthState {
   final bool isAdmin;
   final String profileImagePath;
 
-  AuthState({
+  const AuthState({
     required this.deviceId,
     required this.userId,
     required this.userEmail,
diff --git a/mobile/lib/models/auth/auxilary_endpoint.model.dart b/mobile/lib/models/auth/auxilary_endpoint.model.dart
index 89aba60913..f49d0f692c 100644
--- a/mobile/lib/models/auth/auxilary_endpoint.model.dart
+++ b/mobile/lib/models/auth/auxilary_endpoint.model.dart
@@ -5,7 +5,7 @@ class AuxilaryEndpoint {
   final String url;
   final AuxCheckStatus status;
 
-  AuxilaryEndpoint({
+  const AuxilaryEndpoint({
     required this.url,
     required this.status,
   });
@@ -55,7 +55,7 @@ class AuxilaryEndpoint {
 
 class AuxCheckStatus {
   final String name;
-  AuxCheckStatus({
+  const AuxCheckStatus({
     required this.name,
   });
   const AuxCheckStatus._(this.name);
diff --git a/mobile/lib/models/auth/login_response.model.dart b/mobile/lib/models/auth/login_response.model.dart
index f1398418ca..0aa9c0b349 100644
--- a/mobile/lib/models/auth/login_response.model.dart
+++ b/mobile/lib/models/auth/login_response.model.dart
@@ -13,7 +13,7 @@ class LoginResponse {
 
   final String userId;
 
-  LoginResponse({
+  const LoginResponse({
     required this.accessToken,
     required this.isAdmin,
     required this.name,
diff --git a/mobile/lib/models/backup/available_album.model.dart b/mobile/lib/models/backup/available_album.model.dart
index c75d6446d8..e34d2b1abe 100644
--- a/mobile/lib/models/backup/available_album.model.dart
+++ b/mobile/lib/models/backup/available_album.model.dart
@@ -4,7 +4,7 @@ class AvailableAlbum {
   final Album album;
   final int assetCount;
   final DateTime? lastBackup;
-  AvailableAlbum({
+  const AvailableAlbum({
     required this.album,
     required this.assetCount,
     this.lastBackup,
diff --git a/mobile/lib/models/backup/current_upload_asset.model.dart b/mobile/lib/models/backup/current_upload_asset.model.dart
index 787f117269..edaac06987 100644
--- a/mobile/lib/models/backup/current_upload_asset.model.dart
+++ b/mobile/lib/models/backup/current_upload_asset.model.dart
@@ -9,7 +9,7 @@ class CurrentUploadAsset {
   final int? fileSize;
   final bool? iCloudAsset;
 
-  CurrentUploadAsset({
+  const CurrentUploadAsset({
     required this.id,
     required this.fileCreatedAt,
     required this.fileName,
diff --git a/mobile/lib/models/backup/success_upload_asset.model.dart b/mobile/lib/models/backup/success_upload_asset.model.dart
index 045715e8cb..2b39dde5ea 100644
--- a/mobile/lib/models/backup/success_upload_asset.model.dart
+++ b/mobile/lib/models/backup/success_upload_asset.model.dart
@@ -5,7 +5,7 @@ class SuccessUploadAsset {
   final String remoteAssetId;
   final bool isDuplicate;
 
-  SuccessUploadAsset({
+  const SuccessUploadAsset({
     required this.candidate,
     required this.remoteAssetId,
     required this.isDuplicate,
diff --git a/mobile/lib/models/download/download_state.model.dart b/mobile/lib/models/download/download_state.model.dart
index edd2fa183e..c032c73dcd 100644
--- a/mobile/lib/models/download/download_state.model.dart
+++ b/mobile/lib/models/download/download_state.model.dart
@@ -10,7 +10,7 @@ class DownloadInfo {
   // enum
   final TaskStatus status;
 
-  DownloadInfo({
+  const DownloadInfo({
     required this.fileName,
     required this.progress,
     required this.status,
@@ -71,7 +71,7 @@ class DownloadState {
   final TaskStatus downloadStatus;
   final Map<String, DownloadInfo> taskProgress;
   final bool showProgress;
-  DownloadState({
+  const DownloadState({
     required this.downloadStatus,
     required this.taskProgress,
     required this.showProgress,
diff --git a/mobile/lib/models/folder/recursive_folder.model.dart b/mobile/lib/models/folder/recursive_folder.model.dart
index 5b54a2e1bf..62ec670fed 100644
--- a/mobile/lib/models/folder/recursive_folder.model.dart
+++ b/mobile/lib/models/folder/recursive_folder.model.dart
@@ -3,7 +3,7 @@ import 'package:immich_mobile/models/folder/root_folder.model.dart';
 class RecursiveFolder extends RootFolder {
   final String name;
 
-  RecursiveFolder({
+  const RecursiveFolder({
     required this.name,
     required super.path,
     required super.subfolders,
diff --git a/mobile/lib/models/folder/root_folder.model.dart b/mobile/lib/models/folder/root_folder.model.dart
index 8f72a539c0..567093ecd5 100644
--- a/mobile/lib/models/folder/root_folder.model.dart
+++ b/mobile/lib/models/folder/root_folder.model.dart
@@ -4,7 +4,7 @@ class RootFolder {
   final List<RecursiveFolder> subfolders;
   final String path;
 
-  RootFolder({
+  const RootFolder({
     required this.subfolders,
     required this.path,
   });
diff --git a/mobile/lib/models/map/map_event.model.dart b/mobile/lib/models/map/map_event.model.dart
index dd9fec06e6..a57fcb4c36 100644
--- a/mobile/lib/models/map/map_event.model.dart
+++ b/mobile/lib/models/map/map_event.model.dart
@@ -8,4 +8,6 @@ class MapAssetsInBoundsUpdated extends MapEvent {
   const MapAssetsInBoundsUpdated(this.assetRemoteIds);
 }
 
-class MapCloseBottomSheet extends MapEvent {}
+class MapCloseBottomSheet extends MapEvent {
+  const MapCloseBottomSheet();
+}
diff --git a/mobile/lib/models/map/map_marker.model.dart b/mobile/lib/models/map/map_marker.model.dart
index c9253a37cc..7ab925464a 100644
--- a/mobile/lib/models/map/map_marker.model.dart
+++ b/mobile/lib/models/map/map_marker.model.dart
@@ -4,7 +4,7 @@ import 'package:openapi/api.dart';
 class MapMarker {
   final LatLng latLng;
   final String assetRemoteId;
-  MapMarker({
+  const MapMarker({
     required this.latLng,
     required this.assetRemoteId,
   });
diff --git a/mobile/lib/models/map/map_state.model.dart b/mobile/lib/models/map/map_state.model.dart
index 973b925aa8..78747e770d 100644
--- a/mobile/lib/models/map/map_state.model.dart
+++ b/mobile/lib/models/map/map_state.model.dart
@@ -11,7 +11,7 @@ class MapState {
   final AsyncValue<String> lightStyleFetched;
   final AsyncValue<String> darkStyleFetched;
 
-  MapState({
+  const MapState({
     this.themeMode = ThemeMode.system,
     this.showFavoriteOnly = false,
     this.includeArchived = false,
diff --git a/mobile/lib/models/memories/memory.model.dart b/mobile/lib/models/memories/memory.model.dart
index 34691d3b55..c8451dda64 100644
--- a/mobile/lib/models/memories/memory.model.dart
+++ b/mobile/lib/models/memories/memory.model.dart
@@ -7,7 +7,7 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 class Memory {
   final String title;
   final List<Asset> assets;
-  Memory({
+  const Memory({
     required this.title,
     required this.assets,
   });
diff --git a/mobile/lib/models/search/search_curated_content.model.dart b/mobile/lib/models/search/search_curated_content.model.dart
index a3d74941b3..aff61097e2 100644
--- a/mobile/lib/models/search/search_curated_content.model.dart
+++ b/mobile/lib/models/search/search_curated_content.model.dart
@@ -14,7 +14,7 @@ class SearchCuratedContent {
   /// The id to lookup the asset from the server
   final String id;
 
-  SearchCuratedContent({
+  const SearchCuratedContent({
     required this.label,
     required this.id,
     this.subtitle,
diff --git a/mobile/lib/models/search/search_result.model.dart b/mobile/lib/models/search/search_result.model.dart
index f51353ad61..458a9b4abc 100644
--- a/mobile/lib/models/search/search_result.model.dart
+++ b/mobile/lib/models/search/search_result.model.dart
@@ -6,7 +6,7 @@ class SearchResult {
   final List<Asset> assets;
   final int? nextPage;
 
-  SearchResult({
+  const SearchResult({
     required this.assets,
     this.nextPage,
   });
diff --git a/mobile/lib/models/search/search_result_page_state.model.dart b/mobile/lib/models/search/search_result_page_state.model.dart
index 00895c4586..2fd4dcbcd3 100644
--- a/mobile/lib/models/search/search_result_page_state.model.dart
+++ b/mobile/lib/models/search/search_result_page_state.model.dart
@@ -8,7 +8,7 @@ class SearchResultPageState {
   final bool isSmart;
   final List<Asset> searchResult;
 
-  SearchResultPageState({
+  const SearchResultPageState({
     required this.isLoading,
     required this.isSuccess,
     required this.isError,
diff --git a/mobile/lib/models/server_info/server_info.model.dart b/mobile/lib/models/server_info/server_info.model.dart
index 8a70e13883..aafab56e4c 100644
--- a/mobile/lib/models/server_info/server_info.model.dart
+++ b/mobile/lib/models/server_info/server_info.model.dart
@@ -13,7 +13,7 @@ class ServerInfo {
   final bool isNewReleaseAvailable;
   final String versionMismatchErrorMessage;
 
-  ServerInfo({
+  const ServerInfo({
     required this.serverVersion,
     required this.latestVersion,
     required this.serverFeatures,
diff --git a/mobile/lib/pages/albums/albums.page.dart b/mobile/lib/pages/albums/albums.page.dart
index 2a13ccccd7..3fc628afd3 100644
--- a/mobile/lib/pages/albums/albums.page.dart
+++ b/mobile/lib/pages/albums/albums.page.dart
@@ -105,7 +105,9 @@ class AlbumsPage extends HookConsumerWidget {
                   color: context.colorScheme.onSurface.withAlpha(0),
                   width: 0,
                 ),
-                borderRadius: BorderRadius.circular(24),
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(24),
+                ),
                 gradient: LinearGradient(
                   colors: [
                     context.colorScheme.primary.withValues(alpha: 0.075),
@@ -301,7 +303,9 @@ class QuickFilterButton extends StatelessWidget {
         ),
         shape: WidgetStateProperty.all(
           RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(20),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
             side: BorderSide(
               color: context.colorScheme.onSurface.withAlpha(25),
               width: 1,
@@ -334,8 +338,10 @@ class SortButton extends ConsumerWidget {
       style: MenuStyle(
         elevation: const WidgetStatePropertyAll(1),
         shape: WidgetStateProperty.all(
-          RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(24),
+          const RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(
+              Radius.circular(24),
+            ),
           ),
         ),
         padding: const WidgetStatePropertyAll(
@@ -384,8 +390,10 @@ class SortButton extends ConsumerWidget {
                       : Colors.transparent,
                 ),
                 shape: WidgetStateProperty.all(
-                  RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(24),
+                  const RoundedRectangleBorder(
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(24),
+                    ),
                   ),
                 ),
               ),
diff --git a/mobile/lib/pages/backup/backup_album_selection.page.dart b/mobile/lib/pages/backup/backup_album_selection.page.dart
index c4124efb52..e51d259969 100644
--- a/mobile/lib/pages/backup/backup_album_selection.page.dart
+++ b/mobile/lib/pages/backup/backup_album_selection.page.dart
@@ -246,8 +246,10 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
                         context: context,
                         builder: (BuildContext context) {
                           return AlertDialog(
-                            shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(10),
+                            shape: const RoundedRectangleBorder(
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(10),
+                              ),
                             ),
                             elevation: 5,
                             title: Text(
diff --git a/mobile/lib/pages/backup/backup_controller.page.dart b/mobile/lib/pages/backup/backup_controller.page.dart
index 6cbf172ce5..ca094437ac 100644
--- a/mobile/lib/pages/backup/backup_controller.page.dart
+++ b/mobile/lib/pages/backup/backup_controller.page.dart
@@ -147,7 +147,9 @@ class BackupControllerPage extends HookConsumerWidget {
         padding: const EdgeInsets.only(top: 8.0),
         child: Card(
           shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(20),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
             side: BorderSide(
               color: context.colorScheme.outlineVariant,
               width: 1,
diff --git a/mobile/lib/pages/backup/failed_backup_status.page.dart b/mobile/lib/pages/backup/failed_backup_status.page.dart
index 551555d75e..167b0f2ebd 100644
--- a/mobile/lib/pages/backup/failed_backup_status.page.dart
+++ b/mobile/lib/pages/backup/failed_backup_status.page.dart
@@ -42,9 +42,11 @@ class FailedBackupStatusPage extends HookConsumerWidget {
               vertical: 4,
             ),
             child: Card(
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(15), // if you need this
-                side: const BorderSide(
+              shape: const RoundedRectangleBorder(
+                borderRadius: BorderRadius.all(
+                  Radius.circular(15), // if you need this
+                ),
+                side: BorderSide(
                   color: Colors.black12,
                   width: 1,
                 ),
diff --git a/mobile/lib/pages/common/app_log_detail.page.dart b/mobile/lib/pages/common/app_log_detail.page.dart
index 1bfea44ba1..b88d6aeb3a 100644
--- a/mobile/lib/pages/common/app_log_detail.page.dart
+++ b/mobile/lib/pages/common/app_log_detail.page.dart
@@ -60,7 +60,9 @@ class AppLogDetailPage extends HookConsumerWidget {
             Container(
               decoration: BoxDecoration(
                 color: context.colorScheme.surfaceContainerHigh,
-                borderRadius: BorderRadius.circular(15.0),
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(15.0),
+                ),
               ),
               child: Padding(
                 padding: const EdgeInsets.all(8.0),
@@ -99,7 +101,9 @@ class AppLogDetailPage extends HookConsumerWidget {
             Container(
               decoration: BoxDecoration(
                 color: context.colorScheme.surfaceContainerHigh,
-                borderRadius: BorderRadius.circular(15.0),
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(15.0),
+                ),
               ),
               child: Padding(
                 padding: const EdgeInsets.all(8.0),
diff --git a/mobile/lib/pages/common/create_album.page.dart b/mobile/lib/pages/common/create_album.page.dart
index f5c6321451..faf1671a9e 100644
--- a/mobile/lib/pages/common/create_album.page.dart
+++ b/mobile/lib/pages/common/create_album.page.dart
@@ -120,8 +120,10 @@ class CreateAlbumPage extends HookConsumerWidget {
                 alignment: Alignment.centerLeft,
                 padding:
                     const EdgeInsets.symmetric(vertical: 24, horizontal: 16),
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(10),
+                shape: const RoundedRectangleBorder(
+                  borderRadius: BorderRadius.all(
+                    Radius.circular(10),
+                  ),
                 ),
                 backgroundColor: context.colorScheme.surfaceContainerHigh,
               ),
diff --git a/mobile/lib/pages/common/download_panel.dart b/mobile/lib/pages/common/download_panel.dart
index 5cc6e5b8d6..cc543c9e4e 100644
--- a/mobile/lib/pages/common/download_panel.dart
+++ b/mobile/lib/pages/common/download_panel.dart
@@ -90,8 +90,10 @@ class DownloadTaskTile extends StatelessWidget {
       width: context.width - 32,
       child: Card(
         clipBehavior: Clip.antiAlias,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(16),
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(
+            Radius.circular(16),
+          ),
         ),
         child: ListTile(
           minVerticalPadding: 18,
diff --git a/mobile/lib/pages/common/settings.page.dart b/mobile/lib/pages/common/settings.page.dart
index 05c7606970..6fc4cf5d88 100644
--- a/mobile/lib/pages/common/settings.page.dart
+++ b/mobile/lib/pages/common/settings.page.dart
@@ -3,6 +3,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/settings/advanced_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_list_settings/asset_list_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_viewer_settings/asset_viewer_settings.dart';
@@ -11,7 +12,6 @@ import 'package:immich_mobile/widgets/settings/language_settings.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/networking_settings.dart';
 import 'package:immich_mobile/widgets/settings/notification_setting.dart';
 import 'package:immich_mobile/widgets/settings/preference_settings/preference_setting.dart';
-import 'package:immich_mobile/routing/router.dart';
 
 enum SettingSection {
   advanced(
@@ -85,12 +85,13 @@ class SettingsPage extends StatelessWidget {
         centerTitle: false,
         title: const Text('settings').tr(),
       ),
-      body: context.isMobile ? _MobileLayout() : _TabletLayout(),
+      body: context.isMobile ? const _MobileLayout() : const _TabletLayout(),
     );
   }
 }
 
 class _MobileLayout extends StatelessWidget {
+  const _MobileLayout();
   @override
   Widget build(BuildContext context) {
     return ListView(
@@ -147,6 +148,7 @@ class _MobileLayout extends StatelessWidget {
 }
 
 class _TabletLayout extends HookWidget {
+  const _TabletLayout();
   @override
   Widget build(BuildContext context) {
     final selectedSection =
diff --git a/mobile/lib/pages/editing/edit.page.dart b/mobile/lib/pages/editing/edit.page.dart
index 39524df024..d37941f4fe 100644
--- a/mobile/lib/pages/editing/edit.page.dart
+++ b/mobile/lib/pages/editing/edit.page.dart
@@ -124,7 +124,9 @@ class EditImagePage extends ConsumerWidget {
           ),
           child: Container(
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(7),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(7),
+              ),
               boxShadow: [
                 BoxShadow(
                   color: Colors.black.withValues(alpha: 0.2),
@@ -135,7 +137,9 @@ class EditImagePage extends ConsumerWidget {
               ],
             ),
             child: ClipRRect(
-              borderRadius: BorderRadius.circular(7),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(7),
+              ),
               child: Image(
                 image: image.image,
                 fit: BoxFit.contain,
@@ -149,7 +153,9 @@ class EditImagePage extends ConsumerWidget {
         margin: const EdgeInsets.only(bottom: 60, right: 10, left: 10, top: 10),
         decoration: BoxDecoration(
           color: context.scaffoldBackgroundColor,
-          borderRadius: BorderRadius.circular(30),
+          borderRadius: const BorderRadius.all(
+            Radius.circular(30),
+          ),
         ),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
diff --git a/mobile/lib/pages/editing/filter.page.dart b/mobile/lib/pages/editing/filter.page.dart
index f8b1f180df..9af065489d 100644
--- a/mobile/lib/pages/editing/filter.page.dart
+++ b/mobile/lib/pages/editing/filter.page.dart
@@ -162,13 +162,17 @@ class _FilterButton extends StatelessWidget {
             width: 80,
             height: 80,
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(10),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(10),
+              ),
               border: isSelected
                   ? Border.all(color: context.primaryColor, width: 3)
                   : null,
             ),
             child: ClipRRect(
-              borderRadius: BorderRadius.circular(10),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(10),
+              ),
               child: ColorFiltered(
                 colorFilter: filter,
                 child: FittedBox(
diff --git a/mobile/lib/pages/library/library.page.dart b/mobile/lib/pages/library/library.page.dart
index 37b5e28797..a9ef479e2c 100644
--- a/mobile/lib/pages/library/library.page.dart
+++ b/mobile/lib/pages/library/library.page.dart
@@ -105,7 +105,9 @@ class QuickAccessButtons extends ConsumerWidget {
           color: context.colorScheme.onSurface.withAlpha(10),
           width: 1,
         ),
-        borderRadius: BorderRadius.circular(20),
+        borderRadius: const BorderRadius.all(
+          Radius.circular(20),
+        ),
         gradient: LinearGradient(
           colors: [
             context.colorScheme.primary.withAlpha(10),
@@ -240,7 +242,9 @@ class PeopleCollectionCard extends ConsumerWidget {
                 height: size,
                 width: size,
                 decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(20),
+                  borderRadius: const BorderRadius.all(
+                    Radius.circular(20),
+                  ),
                   gradient: LinearGradient(
                     colors: [
                       context.colorScheme.primary.withAlpha(30),
diff --git a/mobile/lib/pages/library/partner/partner_detail.page.dart b/mobile/lib/pages/library/partner/partner_detail.page.dart
index 618d31affa..94e098b973 100644
--- a/mobile/lib/pages/library/partner/partner_detail.page.dart
+++ b/mobile/lib/pages/library/partner/partner_detail.page.dart
@@ -80,7 +80,9 @@ class PartnerDetailPage extends HookConsumerWidget {
                 color: context.colorScheme.onSurface.withAlpha(10),
                 width: 1,
               ),
-              borderRadius: BorderRadius.circular(20),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(20),
+              ),
               gradient: LinearGradient(
                 colors: [
                   context.colorScheme.primary.withAlpha(10),
diff --git a/mobile/lib/pages/library/places/places_collection.page.dart b/mobile/lib/pages/library/places/places_collection.page.dart
index 5f2dea0dec..b98537d515 100644
--- a/mobile/lib/pages/library/places/places_collection.page.dart
+++ b/mobile/lib/pages/library/places/places_collection.page.dart
@@ -143,7 +143,9 @@ class PlaceTile extends StatelessWidget {
         ),
       ),
       leading: ClipRRect(
-        borderRadius: BorderRadius.circular(20),
+        borderRadius: const BorderRadius.all(
+          Radius.circular(20),
+        ),
         child: CachedNetworkImage(
           width: 80,
           height: 80,
diff --git a/mobile/lib/pages/search/map/map.page.dart b/mobile/lib/pages/search/map/map.page.dart
index 022bf5da5f..9f32b1877b 100644
--- a/mobile/lib/pages/search/map/map.page.dart
+++ b/mobile/lib/pages/search/map/map.page.dart
@@ -156,7 +156,7 @@ class MapPage extends HookConsumerWidget {
       } else {
         // If no asset was previously selected and no new asset is available, close the bottom sheet
         if (selectedMarker.value == null) {
-          bottomSheetStreamController.add(MapCloseBottomSheet());
+          bottomSheetStreamController.add(const MapCloseBottomSheet());
         }
         selectedMarker.value = null;
       }
diff --git a/mobile/lib/pages/search/search.page.dart b/mobile/lib/pages/search/search.page.dart
index 0ab94df7c8..dba3199fac 100644
--- a/mobile/lib/pages/search/search.page.dart
+++ b/mobile/lib/pages/search/search.page.dart
@@ -511,16 +511,11 @@ class SearchPage extends HookConsumerWidget {
       search();
     }
 
-    IconData getSearchPrefixIcon() {
-      switch (textSearchType.value) {
-        case TextSearchType.context:
-          return Icons.image_search_rounded;
-        case TextSearchType.filename:
-          return Icons.abc_rounded;
-        case TextSearchType.description:
-          return Icons.text_snippet_outlined;
-      }
-    }
+    IconData getSearchPrefixIcon() => switch (textSearchType.value) {
+          TextSearchType.context => Icons.image_search_rounded,
+          TextSearchType.filename => Icons.abc_rounded,
+          TextSearchType.description => Icons.text_snippet_outlined,
+        };
 
     return Scaffold(
       resizeToAvoidBottomInset: false,
@@ -533,8 +528,10 @@ class SearchPage extends HookConsumerWidget {
               style: MenuStyle(
                 elevation: const WidgetStatePropertyAll(1),
                 shape: WidgetStateProperty.all(
-                  RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(24),
+                  const RoundedRectangleBorder(
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(24),
+                    ),
                   ),
                 ),
                 padding: const WidgetStatePropertyAll(
@@ -631,7 +628,9 @@ class SearchPage extends HookConsumerWidget {
               color: context.colorScheme.onSurface.withAlpha(0),
               width: 0,
             ),
-            borderRadius: BorderRadius.circular(24),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(24),
+            ),
             gradient: LinearGradient(
               colors: [
                 context.colorScheme.primary.withValues(alpha: 0.075),
@@ -823,7 +822,9 @@ class QuickLinkList extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(20),
+        borderRadius: const BorderRadius.all(
+          Radius.circular(20),
+        ),
         border: Border.all(
           color: context.colorScheme.outline.withAlpha(10),
           width: 1,
diff --git a/mobile/lib/presentation/widgets/images/remote_thumb_provider.dart b/mobile/lib/presentation/widgets/images/remote_thumb_provider.dart
index c9561ee156..f9388ea5d6 100644
--- a/mobile/lib/presentation/widgets/images/remote_thumb_provider.dart
+++ b/mobile/lib/presentation/widgets/images/remote_thumb_provider.dart
@@ -15,7 +15,7 @@ class RemoteThumbProvider extends ImageProvider<RemoteThumbProvider> {
   final double width;
   final CacheManager? cacheManager;
 
-  RemoteThumbProvider({
+  const RemoteThumbProvider({
     required this.assetId,
     this.height = kTimelineFixedTileExtent,
     this.width = kTimelineFixedTileExtent,
diff --git a/mobile/lib/presentation/widgets/images/thumb_hash_provider.dart b/mobile/lib/presentation/widgets/images/thumb_hash_provider.dart
index 308c92e968..cd286a4cdf 100644
--- a/mobile/lib/presentation/widgets/images/thumb_hash_provider.dart
+++ b/mobile/lib/presentation/widgets/images/thumb_hash_provider.dart
@@ -8,7 +8,7 @@ import 'package:thumbhash/thumbhash.dart';
 class ThumbHashProvider extends ImageProvider<ThumbHashProvider> {
   final String thumbHash;
 
-  ThumbHashProvider({
+  const ThumbHashProvider({
     required this.thumbHash,
   });
 
diff --git a/mobile/lib/presentation/widgets/timeline/segment_builder.dart b/mobile/lib/presentation/widgets/timeline/segment_builder.dart
index 313292c5dd..a746eab243 100644
--- a/mobile/lib/presentation/widgets/timeline/segment_builder.dart
+++ b/mobile/lib/presentation/widgets/timeline/segment_builder.dart
@@ -15,18 +15,12 @@ abstract class SegmentBuilder {
     this.groupBy = GroupAssetsBy.day,
   });
 
-  static double headerExtent(HeaderType header) {
-    switch (header) {
-      case HeaderType.month:
-        return kTimelineHeaderExtent;
-      case HeaderType.day:
-        return kTimelineHeaderExtent * 0.90;
-      case HeaderType.monthAndDay:
-        return kTimelineHeaderExtent * 1.6;
-      case HeaderType.none:
-        return 0.0;
-    }
-  }
+  static double headerExtent(HeaderType header) => switch (header) {
+        HeaderType.month => kTimelineHeaderExtent,
+        HeaderType.day => kTimelineHeaderExtent * 0.90,
+        HeaderType.monthAndDay => kTimelineHeaderExtent * 1.6,
+        HeaderType.none => 0.0,
+      };
 
   static Widget buildPlaceholder(
     BuildContext context,
diff --git a/mobile/lib/providers/album/album_viewer.provider.dart b/mobile/lib/providers/album/album_viewer.provider.dart
index cf7344d321..d1290df298 100644
--- a/mobile/lib/providers/album/album_viewer.provider.dart
+++ b/mobile/lib/providers/album/album_viewer.provider.dart
@@ -1,12 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/models/albums/album_viewer_page_state.model.dart';
 import 'package:immich_mobile/services/album.service.dart';
-import 'package:immich_mobile/entities/album.entity.dart';
 
 class AlbumViewerNotifier extends StateNotifier<AlbumViewerPageState> {
   AlbumViewerNotifier(this.ref)
       : super(
-          AlbumViewerPageState(
+          const AlbumViewerPageState(
             editTitleText: "",
             isEditAlbum: false,
             editDescriptionText: "",
diff --git a/mobile/lib/providers/app_settings.provider.dart b/mobile/lib/providers/app_settings.provider.dart
index 2d4bdd0eef..109218a07c 100644
--- a/mobile/lib/providers/app_settings.provider.dart
+++ b/mobile/lib/providers/app_settings.provider.dart
@@ -5,4 +5,4 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'app_settings.provider.g.dart';
 
 @Riverpod(keepAlive: true)
-AppSettingsService appSettingsService(Ref _) => AppSettingsService();
+AppSettingsService appSettingsService(Ref _) => const AppSettingsService();
diff --git a/mobile/lib/providers/app_settings.provider.g.dart b/mobile/lib/providers/app_settings.provider.g.dart
index 66814abd49..c959861c04 100644
--- a/mobile/lib/providers/app_settings.provider.g.dart
+++ b/mobile/lib/providers/app_settings.provider.g.dart
@@ -7,7 +7,7 @@ part of 'app_settings.provider.dart';
 // **************************************************************************
 
 String _$appSettingsServiceHash() =>
-    r'2aa16d76a8df869c39486325efc1d08b2d2c284c';
+    r'89cece3a19e06612f5639ae290120e854a0c5a31';
 
 /// See also [appSettingsService].
 @ProviderFor(appSettingsService)
diff --git a/mobile/lib/providers/asset_viewer/download.provider.dart b/mobile/lib/providers/asset_viewer/download.provider.dart
index 3daed6f686..7f0d913a02 100644
--- a/mobile/lib/providers/asset_viewer/download.provider.dart
+++ b/mobile/lib/providers/asset_viewer/download.provider.dart
@@ -23,7 +23,7 @@ class DownloadStateNotifier extends StateNotifier<DownloadState> {
     this._shareService,
     this._albumService,
   ) : super(
-          DownloadState(
+          const DownloadState(
             downloadStatus: TaskStatus.complete,
             showProgress: false,
             taskProgress: <String, DownloadInfo>{},
diff --git a/mobile/lib/providers/auth.provider.dart b/mobile/lib/providers/auth.provider.dart
index dfbd18953a..2d3de11257 100644
--- a/mobile/lib/providers/auth.provider.dart
+++ b/mobile/lib/providers/auth.provider.dart
@@ -45,7 +45,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
     this._secureStorageService,
     this._widgetService,
   ) : super(
-          AuthState(
+          const AuthState(
             deviceId: "",
             userId: "",
             userEmail: "",
@@ -89,7 +89,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
   }
 
   Future<void> _cleanUp() async {
-    state = AuthState(
+    state = const AuthState(
       deviceId: "",
       userId: "",
       userEmail: "",
diff --git a/mobile/lib/providers/backup/ios_background_settings.provider.dart b/mobile/lib/providers/backup/ios_background_settings.provider.dart
index 7605d73650..d70e674845 100644
--- a/mobile/lib/providers/backup/ios_background_settings.provider.dart
+++ b/mobile/lib/providers/backup/ios_background_settings.provider.dart
@@ -7,7 +7,7 @@ class IOSBackgroundSettings {
   final DateTime? timeOfLastFetch;
   final DateTime? timeOfLastProcessing;
 
-  IOSBackgroundSettings({
+  const IOSBackgroundSettings({
     required this.appRefreshEnabled,
     required this.numberOfBackgroundTasksQueued,
     this.timeOfLastFetch,
diff --git a/mobile/lib/providers/image/cache/image_loader.dart b/mobile/lib/providers/image/cache/image_loader.dart
index fd6e567b2c..f88d54e4f1 100644
--- a/mobile/lib/providers/image/cache/image_loader.dart
+++ b/mobile/lib/providers/image/cache/image_loader.dart
@@ -42,6 +42,6 @@ class ImageLoader {
     }
 
     // If we get here, the image failed to load from the cache stream
-    throw ImageLoadingException('Could not load image from stream');
+    throw const ImageLoadingException('Could not load image from stream');
   }
 }
diff --git a/mobile/lib/providers/image/exceptions/image_loading_exception.dart b/mobile/lib/providers/image/exceptions/image_loading_exception.dart
index 5e5ff72359..98f633a88f 100644
--- a/mobile/lib/providers/image/exceptions/image_loading_exception.dart
+++ b/mobile/lib/providers/image/exceptions/image_loading_exception.dart
@@ -1,5 +1,5 @@
 /// An exception for the [ImageLoader] and the Immich image providers
 class ImageLoadingException implements Exception {
   final String message;
-  ImageLoadingException(this.message);
+  const ImageLoadingException(this.message);
 }
diff --git a/mobile/lib/providers/image/immich_remote_image_provider.dart b/mobile/lib/providers/image/immich_remote_image_provider.dart
index d5189fa4fc..fe0811583c 100644
--- a/mobile/lib/providers/image/immich_remote_image_provider.dart
+++ b/mobile/lib/providers/image/immich_remote_image_provider.dart
@@ -23,7 +23,7 @@ class ImmichRemoteImageProvider
   /// The image cache manager
   final CacheManager? cacheManager;
 
-  ImmichRemoteImageProvider({
+  const ImmichRemoteImageProvider({
     required this.assetId,
     this.cacheManager,
   });
diff --git a/mobile/lib/providers/image/immich_remote_thumbnail_provider.dart b/mobile/lib/providers/image/immich_remote_thumbnail_provider.dart
index a1e9c737b0..8533cb6f08 100644
--- a/mobile/lib/providers/image/immich_remote_thumbnail_provider.dart
+++ b/mobile/lib/providers/image/immich_remote_thumbnail_provider.dart
@@ -24,7 +24,7 @@ class ImmichRemoteThumbnailProvider
   /// The image cache manager
   final CacheManager? cacheManager;
 
-  ImmichRemoteThumbnailProvider({
+  const ImmichRemoteThumbnailProvider({
     required this.assetId,
     this.height,
     this.width,
diff --git a/mobile/lib/providers/search/paginated_search.provider.dart b/mobile/lib/providers/search/paginated_search.provider.dart
index bac5c5e77e..65afb39b7c 100644
--- a/mobile/lib/providers/search/paginated_search.provider.dart
+++ b/mobile/lib/providers/search/paginated_search.provider.dart
@@ -17,7 +17,7 @@ class PaginatedSearchNotifier extends StateNotifier<SearchResult> {
   final SearchService _searchService;
 
   PaginatedSearchNotifier(this._searchService)
-      : super(SearchResult(assets: [], nextPage: 1));
+      : super(const SearchResult(assets: [], nextPage: 1));
 
   Future<bool> search(SearchFilter filter) async {
     if (state.nextPage == null) {
@@ -39,7 +39,7 @@ class PaginatedSearchNotifier extends StateNotifier<SearchResult> {
   }
 
   clear() {
-    state = SearchResult(assets: [], nextPage: 1);
+    state = const SearchResult(assets: [], nextPage: 1);
   }
 }
 
diff --git a/mobile/lib/providers/server_info.provider.dart b/mobile/lib/providers/server_info.provider.dart
index a793acb3f6..aabf6a5390 100644
--- a/mobile/lib/providers/server_info.provider.dart
+++ b/mobile/lib/providers/server_info.provider.dart
@@ -1,36 +1,35 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/models/server_info/server_disk_info.model.dart';
-
-import 'package:immich_mobile/models/server_info/server_info.model.dart';
-import 'package:immich_mobile/services/server_info.service.dart';
 import 'package:immich_mobile/models/server_info/server_config.model.dart';
+import 'package:immich_mobile/models/server_info/server_disk_info.model.dart';
 import 'package:immich_mobile/models/server_info/server_features.model.dart';
+import 'package:immich_mobile/models/server_info/server_info.model.dart';
 import 'package:immich_mobile/models/server_info/server_version.model.dart';
+import 'package:immich_mobile/services/server_info.service.dart';
 import 'package:logging/logging.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
 class ServerInfoNotifier extends StateNotifier<ServerInfo> {
   ServerInfoNotifier(this._serverInfoService)
       : super(
-          ServerInfo(
-            serverVersion: const ServerVersion(
+          const ServerInfo(
+            serverVersion: ServerVersion(
               major: 0,
               minor: 0,
               patch: 0,
             ),
-            latestVersion: const ServerVersion(
+            latestVersion: ServerVersion(
               major: 0,
               minor: 0,
               patch: 0,
             ),
-            serverFeatures: const ServerFeatures(
+            serverFeatures: ServerFeatures(
               map: true,
               trash: true,
               oauthEnabled: false,
               passwordLogin: true,
             ),
-            serverConfig: const ServerConfig(
+            serverConfig: ServerConfig(
               trashDays: 30,
               oauthButtonText: '',
               externalDomain: '',
@@ -38,7 +37,7 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {
                   'https://tiles.immich.cloud/v1/style/light.json',
               mapDarkStyleUrl: 'https://tiles.immich.cloud/v1/style/dark.json',
             ),
-            serverDiskInfo: const ServerDiskInfo(
+            serverDiskInfo: ServerDiskInfo(
               diskAvailable: "0",
               diskSize: "0",
               diskUse: "0",
diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dart
index 121bcba343..cb9ddc6d7c 100644
--- a/mobile/lib/providers/timeline/multiselect.provider.dart
+++ b/mobile/lib/providers/timeline/multiselect.provider.dart
@@ -14,7 +14,7 @@ final multiSelectProvider =
 class MultiSelectState {
   final Set<BaseAsset> selectedAssets;
 
-  MultiSelectState({
+  const MultiSelectState({
     required this.selectedAssets,
   });
 
@@ -50,7 +50,7 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
   MultiSelectState build() {
     _timelineService = ref.read(timelineServiceProvider);
 
-    return MultiSelectState(
+    return const MultiSelectState(
       selectedAssets: {},
     );
   }
diff --git a/mobile/lib/providers/upload_profile_image.provider.dart b/mobile/lib/providers/upload_profile_image.provider.dart
index 10aa645654..fe13944ef6 100644
--- a/mobile/lib/providers/upload_profile_image.provider.dart
+++ b/mobile/lib/providers/upload_profile_image.provider.dart
@@ -17,7 +17,7 @@ class UploadProfileImageState {
   // enum
   final UploadProfileStatus status;
   final String profileImagePath;
-  UploadProfileImageState({
+  const UploadProfileImageState({
     required this.status,
     required this.profileImagePath,
   });
@@ -74,7 +74,7 @@ class UploadProfileImageNotifier
     extends StateNotifier<UploadProfileImageState> {
   UploadProfileImageNotifier(this._userService)
       : super(
-          UploadProfileImageState(
+          const UploadProfileImageState(
             profileImagePath: '',
             status: UploadProfileStatus.idle,
           ),
diff --git a/mobile/lib/providers/websocket.provider.dart b/mobile/lib/providers/websocket.provider.dart
index 72dbda8b6f..2600c6d8ee 100644
--- a/mobile/lib/providers/websocket.provider.dart
+++ b/mobile/lib/providers/websocket.provider.dart
@@ -56,7 +56,7 @@ class WebsocketState {
   final bool isConnected;
   final List<PendingChange> pendingChanges;
 
-  WebsocketState({
+  const WebsocketState({
     this.socket,
     required this.isConnected,
     required this.pendingChanges,
@@ -94,7 +94,11 @@ class WebsocketState {
 class WebsocketNotifier extends StateNotifier<WebsocketState> {
   WebsocketNotifier(this._ref)
       : super(
-          WebsocketState(socket: null, isConnected: false, pendingChanges: []),
+          const WebsocketState(
+            socket: null,
+            isConnected: false,
+            pendingChanges: [],
+          ),
         );
 
   final _log = Logger('WebsocketNotifier');
diff --git a/mobile/lib/repositories/album.repository.dart b/mobile/lib/repositories/album.repository.dart
index aeb9fb3947..1d0349bb2a 100644
--- a/mobile/lib/repositories/album.repository.dart
+++ b/mobile/lib/repositories/album.repository.dart
@@ -18,7 +18,7 @@ final albumRepositoryProvider =
     Provider((ref) => AlbumRepository(ref.watch(dbProvider)));
 
 class AlbumRepository extends DatabaseRepository {
-  AlbumRepository(super.db);
+  const AlbumRepository(super.db);
 
   Future<int> count({bool? local}) {
     final baseQuery = db.albums.where();
diff --git a/mobile/lib/repositories/api.repository.dart b/mobile/lib/repositories/api.repository.dart
index b454c77f9b..646e2480e9 100644
--- a/mobile/lib/repositories/api.repository.dart
+++ b/mobile/lib/repositories/api.repository.dart
@@ -3,7 +3,7 @@ import 'package:immich_mobile/constants/errors.dart';
 abstract class ApiRepository {
   Future<T> checkNull<T>(Future<T?> future) async {
     final response = await future;
-    if (response == null) throw NoResponseDtoError();
+    if (response == null) throw const NoResponseDtoError();
     return response;
   }
 }
diff --git a/mobile/lib/repositories/asset.repository.dart b/mobile/lib/repositories/asset.repository.dart
index 4437ddfcff..1e3defae08 100644
--- a/mobile/lib/repositories/asset.repository.dart
+++ b/mobile/lib/repositories/asset.repository.dart
@@ -15,7 +15,7 @@ final assetRepositoryProvider =
     Provider((ref) => AssetRepository(ref.watch(dbProvider)));
 
 class AssetRepository extends DatabaseRepository {
-  AssetRepository(super.db);
+  const AssetRepository(super.db);
 
   Future<List<Asset>> getByAlbum(
     Album album, {
diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dart
index 510715c199..49dbf74304 100644
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -56,18 +56,12 @@ class AssetApiRepository extends ApiRepository {
     );
   }
 
-  _mapVisibility(AssetVisibilityEnum visibility) {
-    switch (visibility) {
-      case AssetVisibilityEnum.timeline:
-        return AssetVisibility.timeline;
-      case AssetVisibilityEnum.hidden:
-        return AssetVisibility.hidden;
-      case AssetVisibilityEnum.locked:
-        return AssetVisibility.locked;
-      case AssetVisibilityEnum.archive:
-        return AssetVisibility.archive;
-    }
-  }
+  _mapVisibility(AssetVisibilityEnum visibility) => switch (visibility) {
+        AssetVisibilityEnum.timeline => AssetVisibility.timeline,
+        AssetVisibilityEnum.hidden => AssetVisibility.hidden,
+        AssetVisibilityEnum.locked => AssetVisibility.locked,
+        AssetVisibilityEnum.archive => AssetVisibility.archive,
+      };
 
   Future<String?> getAssetMIMEType(String assetId) async {
     final response = await checkNull(_api.getAssetInfo(assetId));
diff --git a/mobile/lib/repositories/asset_media.repository.dart b/mobile/lib/repositories/asset_media.repository.dart
index 0a415b95e2..bb1e6f414f 100644
--- a/mobile/lib/repositories/asset_media.repository.dart
+++ b/mobile/lib/repositories/asset_media.repository.dart
@@ -6,9 +6,11 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/utils/hash.dart';
 import 'package:photo_manager/photo_manager.dart' hide AssetType;
 
-final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository());
+final assetMediaRepositoryProvider =
+    Provider((ref) => const AssetMediaRepository());
 
 class AssetMediaRepository {
+  const AssetMediaRepository();
   Future<List<String>> deleteAll(List<String> ids) =>
       PhotoManager.editor.deleteWithIds(ids);
 
diff --git a/mobile/lib/repositories/auth.repository.dart b/mobile/lib/repositories/auth.repository.dart
index c1163b8639..1403280723 100644
--- a/mobile/lib/repositories/auth.repository.dart
+++ b/mobile/lib/repositories/auth.repository.dart
@@ -22,7 +22,7 @@ final authRepositoryProvider = Provider<AuthRepository>(
 class AuthRepository extends DatabaseRepository {
   final Drift _drift;
 
-  AuthRepository(super.db, this._drift);
+  const AuthRepository(super.db, this._drift);
 
   Future<void> clearLocalData() {
     return db.writeTxn(() {
diff --git a/mobile/lib/repositories/backup.repository.dart b/mobile/lib/repositories/backup.repository.dart
index 836dde22c5..05d2047add 100644
--- a/mobile/lib/repositories/backup.repository.dart
+++ b/mobile/lib/repositories/backup.repository.dart
@@ -10,7 +10,7 @@ final backupAlbumRepositoryProvider =
     Provider((ref) => BackupAlbumRepository(ref.watch(dbProvider)));
 
 class BackupAlbumRepository extends DatabaseRepository {
-  BackupAlbumRepository(super.db);
+  const BackupAlbumRepository(super.db);
 
   Future<List<BackupAlbum>> getAll({BackupAlbumSort? sort}) {
     final baseQuery = db.backupAlbums.where();
diff --git a/mobile/lib/repositories/biometric.repository.dart b/mobile/lib/repositories/biometric.repository.dart
index 12d45f8de7..94540c8249 100644
--- a/mobile/lib/repositories/biometric.repository.dart
+++ b/mobile/lib/repositories/biometric.repository.dart
@@ -9,7 +9,7 @@ final biometricRepositoryProvider =
 class BiometricRepository {
   final LocalAuthentication _localAuth;
 
-  BiometricRepository(this._localAuth);
+  const BiometricRepository(this._localAuth);
 
   Future<BiometricStatus> getStatus() async {
     final bool canAuthenticateWithBiometrics =
diff --git a/mobile/lib/repositories/database.repository.dart b/mobile/lib/repositories/database.repository.dart
index 3eb74621fa..c644dae668 100644
--- a/mobile/lib/repositories/database.repository.dart
+++ b/mobile/lib/repositories/database.repository.dart
@@ -7,7 +7,7 @@ const Symbol _zoneTxn = #zoneTxn;
 
 abstract class DatabaseRepository implements IDatabaseRepository {
   final Isar db;
-  DatabaseRepository(this.db);
+  const DatabaseRepository(this.db);
 
   bool get inTxn => Zone.current[_zoneTxn] != null;
 
diff --git a/mobile/lib/repositories/etag.repository.dart b/mobile/lib/repositories/etag.repository.dart
index 2bf76218de..b8382efdfc 100644
--- a/mobile/lib/repositories/etag.repository.dart
+++ b/mobile/lib/repositories/etag.repository.dart
@@ -8,7 +8,7 @@ final etagRepositoryProvider =
     Provider((ref) => ETagRepository(ref.watch(dbProvider)));
 
 class ETagRepository extends DatabaseRepository {
-  ETagRepository(super.db);
+  const ETagRepository(super.db);
 
   Future<List<String>> getAllIds() => db.eTags.where().idProperty().findAll();
 
diff --git a/mobile/lib/repositories/file_media.repository.dart b/mobile/lib/repositories/file_media.repository.dart
index 6b0237dcdb..2bccb05210 100644
--- a/mobile/lib/repositories/file_media.repository.dart
+++ b/mobile/lib/repositories/file_media.repository.dart
@@ -6,9 +6,11 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:photo_manager/photo_manager.dart' hide AssetType;
 
-final fileMediaRepositoryProvider = Provider((ref) => FileMediaRepository());
+final fileMediaRepositoryProvider =
+    Provider((ref) => const FileMediaRepository());
 
 class FileMediaRepository {
+  const FileMediaRepository();
   Future<Asset?> saveImage(
     Uint8List data, {
     required String title,
diff --git a/mobile/lib/repositories/local_files_manager.repository.dart b/mobile/lib/repositories/local_files_manager.repository.dart
index 4e99f5d6ef..35c59acc2f 100644
--- a/mobile/lib/repositories/local_files_manager.repository.dart
+++ b/mobile/lib/repositories/local_files_manager.repository.dart
@@ -7,7 +7,7 @@ final localFilesManagerRepositoryProvider = Provider(
 );
 
 class LocalFilesManagerRepository {
-  LocalFilesManagerRepository(this._service);
+  const LocalFilesManagerRepository(this._service);
 
   final LocalFilesManagerService _service;
 
diff --git a/mobile/lib/repositories/network.repository.dart b/mobile/lib/repositories/network.repository.dart
index e80b406b10..2f859e9452 100644
--- a/mobile/lib/repositories/network.repository.dart
+++ b/mobile/lib/repositories/network.repository.dart
@@ -12,7 +12,7 @@ final networkRepositoryProvider = Provider((_) {
 class NetworkRepository {
   final NetworkInfo _networkInfo;
 
-  NetworkRepository(this._networkInfo);
+  const NetworkRepository(this._networkInfo);
 
   Future<String?> getWifiName() {
     if (Platform.isAndroid) {
diff --git a/mobile/lib/repositories/partner.repository.dart b/mobile/lib/repositories/partner.repository.dart
index 8a53ca7c8d..eb41391ba2 100644
--- a/mobile/lib/repositories/partner.repository.dart
+++ b/mobile/lib/repositories/partner.repository.dart
@@ -11,7 +11,7 @@ final partnerRepositoryProvider = Provider(
 );
 
 class PartnerRepository extends DatabaseRepository {
-  PartnerRepository(super.db);
+  const PartnerRepository(super.db);
 
   Future<List<UserDto>> getSharedBy() async {
     return (await db.users
diff --git a/mobile/lib/repositories/permission.repository.dart b/mobile/lib/repositories/permission.repository.dart
index f825c36075..74230a3652 100644
--- a/mobile/lib/repositories/permission.repository.dart
+++ b/mobile/lib/repositories/permission.repository.dart
@@ -2,11 +2,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 final permissionRepositoryProvider = Provider((_) {
-  return PermissionRepository();
+  return const PermissionRepository();
 });
 
 class PermissionRepository implements IPermissionRepository {
-  PermissionRepository();
+  const PermissionRepository();
 
   @override
   Future<bool> hasLocationWhenInUsePermission() {
diff --git a/mobile/lib/repositories/secure_storage.repository.dart b/mobile/lib/repositories/secure_storage.repository.dart
index 08d47b0525..5660258a2d 100644
--- a/mobile/lib/repositories/secure_storage.repository.dart
+++ b/mobile/lib/repositories/secure_storage.repository.dart
@@ -2,12 +2,12 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 final secureStorageRepositoryProvider =
-    Provider((ref) => SecureStorageRepository(const FlutterSecureStorage()));
+    Provider((ref) => const SecureStorageRepository(FlutterSecureStorage()));
 
 class SecureStorageRepository {
   final FlutterSecureStorage _secureStorage;
 
-  SecureStorageRepository(this._secureStorage);
+  const SecureStorageRepository(this._secureStorage);
 
   Future<String?> read(String key) {
     return _secureStorage.read(key: key);
diff --git a/mobile/lib/repositories/timeline.repository.dart b/mobile/lib/repositories/timeline.repository.dart
index 0120ea85ad..ea4cb63753 100644
--- a/mobile/lib/repositories/timeline.repository.dart
+++ b/mobile/lib/repositories/timeline.repository.dart
@@ -13,7 +13,7 @@ final timelineRepositoryProvider =
     Provider((ref) => TimelineRepository(ref.watch(dbProvider)));
 
 class TimelineRepository extends DatabaseRepository {
-  TimelineRepository(super.db);
+  const TimelineRepository(super.db);
 
   Future<List<String>> getTimelineUserIds(String id) {
     return db.users
diff --git a/mobile/lib/repositories/widget.repository.dart b/mobile/lib/repositories/widget.repository.dart
index 630c47fcec..be314a281e 100644
--- a/mobile/lib/repositories/widget.repository.dart
+++ b/mobile/lib/repositories/widget.repository.dart
@@ -1,10 +1,10 @@
 import 'package:home_widget/home_widget.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-final widgetRepositoryProvider = Provider((_) => WidgetRepository());
+final widgetRepositoryProvider = Provider((_) => const WidgetRepository());
 
 class WidgetRepository {
-  WidgetRepository();
+  const WidgetRepository();
 
   Future<void> saveData(String key, String value) async {
     await HomeWidget.saveWidgetData<String>(key, value);
diff --git a/mobile/lib/routing/backup_permission_guard.dart b/mobile/lib/routing/backup_permission_guard.dart
index 57a0c7a927..245a4b27af 100644
--- a/mobile/lib/routing/backup_permission_guard.dart
+++ b/mobile/lib/routing/backup_permission_guard.dart
@@ -5,7 +5,7 @@ import 'package:immich_mobile/routing/router.dart';
 class BackupPermissionGuard extends AutoRouteGuard {
   final GalleryPermissionNotifier _permission;
 
-  BackupPermissionGuard(this._permission);
+  const BackupPermissionGuard(this._permission);
 
   @override
   void onNavigation(NavigationResolver resolver, StackRouter router) async {
diff --git a/mobile/lib/routing/duplicate_guard.dart b/mobile/lib/routing/duplicate_guard.dart
index 217ff1cbf4..efc649bc41 100644
--- a/mobile/lib/routing/duplicate_guard.dart
+++ b/mobile/lib/routing/duplicate_guard.dart
@@ -3,7 +3,7 @@ import 'package:flutter/foundation.dart';
 
 /// Guards against duplicate navigation to this route
 class DuplicateGuard extends AutoRouteGuard {
-  DuplicateGuard();
+  const DuplicateGuard();
   @override
   void onNavigation(NavigationResolver resolver, StackRouter router) async {
     // Duplicate navigation
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 5e8f018ae8..33631f85da 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -106,7 +106,7 @@ class AppRouter extends RootStackRouter {
     LocalAuthService localAuthService,
   ) {
     _authGuard = AuthGuard(apiService);
-    _duplicateGuard = DuplicateGuard();
+    _duplicateGuard = const DuplicateGuard();
     _lockedGuard =
         LockedGuard(apiService, secureStorageService, localAuthService);
     _backupPermissionGuard = BackupPermissionGuard(galleryPermissionNotifier);
diff --git a/mobile/lib/services/app_settings.service.dart b/mobile/lib/services/app_settings.service.dart
index b6c675b636..76fd5e1ff6 100644
--- a/mobile/lib/services/app_settings.service.dart
+++ b/mobile/lib/services/app_settings.service.dart
@@ -100,6 +100,7 @@ enum AppSettingsEnum<T> {
 }
 
 class AppSettingsService {
+  const AppSettingsService();
   T getSetting<T>(AppSettingsEnum<T> setting) {
     return Store.get(setting.storeKey, setting.defaultValue);
   }
diff --git a/mobile/lib/services/backup_album.service.dart b/mobile/lib/services/backup_album.service.dart
index 0de7748a9c..ef9d1031de 100644
--- a/mobile/lib/services/backup_album.service.dart
+++ b/mobile/lib/services/backup_album.service.dart
@@ -9,7 +9,7 @@ final backupAlbumServiceProvider = Provider<BackupAlbumService>((ref) {
 class BackupAlbumService {
   final BackupAlbumRepository _backupAlbumRepository;
 
-  BackupAlbumService(this._backupAlbumRepository);
+  const BackupAlbumService(this._backupAlbumRepository);
 
   Future<List<BackupAlbum>> getAll({BackupAlbumSort? sort}) {
     return _backupAlbumRepository.getAll(sort: sort);
diff --git a/mobile/lib/services/deep_link.service.dart b/mobile/lib/services/deep_link.service.dart
index 67b6b79793..2665d9ee52 100644
--- a/mobile/lib/services/deep_link.service.dart
+++ b/mobile/lib/services/deep_link.service.dart
@@ -25,7 +25,7 @@ class DeepLinkService {
   final CurrentAsset _currentAsset;
   final CurrentAlbum _currentAlbum;
 
-  DeepLinkService(
+  const DeepLinkService(
     this._memoryService,
     this._assetService,
     this._albumService,
@@ -38,16 +38,12 @@ class DeepLinkService {
     final intent = link.uri.host;
     final queryParams = link.uri.queryParameters;
 
-    PageRouteInfo<dynamic>? deepLinkRoute;
-
-    switch (intent) {
-      case "memory":
-        deepLinkRoute = await _buildMemoryDeepLink(queryParams['id'] ?? '');
-      case "asset":
-        deepLinkRoute = await _buildAssetDeepLink(queryParams['id'] ?? '');
-      case "album":
-        deepLinkRoute = await _buildAlbumDeepLink(queryParams['id'] ?? '');
-    }
+    PageRouteInfo<dynamic>? deepLinkRoute = switch (intent) {
+      "memory" => await _buildMemoryDeepLink(queryParams['id'] ?? ''),
+      "asset" => await _buildAssetDeepLink(queryParams['id'] ?? ''),
+      "album" => await _buildAlbumDeepLink(queryParams['id'] ?? ''),
+      _ => null,
+    };
 
     // Deep link resolution failed, safely handle it based on the app state
     if (deepLinkRoute == null) {
@@ -98,7 +94,7 @@ class DeepLinkService {
     ]);
   }
 
-  Future<MemoryRoute?> _buildMemoryDeepLink(String memoryId) async {
+  Future<PageRouteInfo?> _buildMemoryDeepLink(String memoryId) async {
     final memory = await _memoryService.getMemoryById(memoryId);
 
     if (memory == null) {
@@ -108,7 +104,7 @@ class DeepLinkService {
     return MemoryRoute(memories: [memory], memoryIndex: 0);
   }
 
-  Future<GalleryViewerRoute?> _buildAssetDeepLink(String assetId) async {
+  Future<PageRouteInfo?> _buildAssetDeepLink(String assetId) async {
     final asset = await _assetService.getAssetByRemoteId(assetId);
 
     if (asset == null) {
@@ -126,7 +122,7 @@ class DeepLinkService {
     );
   }
 
-  Future<AlbumViewerRoute?> _buildAlbumDeepLink(String albumId) async {
+  Future<PageRouteInfo?> _buildAlbumDeepLink(String albumId) async {
     final album = await _albumService.getAlbumByRemoteId(albumId);
 
     if (album == null) {
diff --git a/mobile/lib/services/device.service.dart b/mobile/lib/services/device.service.dart
index 393274608b..50a0d93b24 100644
--- a/mobile/lib/services/device.service.dart
+++ b/mobile/lib/services/device.service.dart
@@ -3,10 +3,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 
-final deviceServiceProvider = Provider((ref) => DeviceService());
+final deviceServiceProvider = Provider((ref) => const DeviceService());
 
 class DeviceService {
-  DeviceService();
+  const DeviceService();
 
   createDeviceId() {
     return FlutterUdid.consistentUdid;
diff --git a/mobile/lib/services/entity.service.dart b/mobile/lib/services/entity.service.dart
index 91598dcd13..8ffead40fa 100644
--- a/mobile/lib/services/entity.service.dart
+++ b/mobile/lib/services/entity.service.dart
@@ -8,7 +8,7 @@ import 'package:immich_mobile/repositories/asset.repository.dart';
 class EntityService {
   final AssetRepository _assetRepository;
   final IsarUserRepository _isarUserRepository;
-  EntityService(
+  const EntityService(
     this._assetRepository,
     this._isarUserRepository,
   );
diff --git a/mobile/lib/services/etag.service.dart b/mobile/lib/services/etag.service.dart
index 1808e32485..4b6f2279ed 100644
--- a/mobile/lib/services/etag.service.dart
+++ b/mobile/lib/services/etag.service.dart
@@ -7,7 +7,7 @@ final etagServiceProvider =
 class ETagService {
   final ETagRepository _eTagRepository;
 
-  ETagService(this._eTagRepository);
+  const ETagService(this._eTagRepository);
 
   Future<void> clearTable() {
     return _eTagRepository.clearTable();
diff --git a/mobile/lib/services/local_auth.service.dart b/mobile/lib/services/local_auth.service.dart
index c4abf0dbb2..12da5f256b 100644
--- a/mobile/lib/services/local_auth.service.dart
+++ b/mobile/lib/services/local_auth.service.dart
@@ -11,7 +11,7 @@ final localAuthServiceProvider = Provider(
 class LocalAuthService {
   final BiometricRepository _biometricRepository;
 
-  LocalAuthService(this._biometricRepository);
+  const LocalAuthService(this._biometricRepository);
 
   Future<BiometricStatus> getStatus() {
     return _biometricRepository.getStatus();
diff --git a/mobile/lib/services/local_files_manager.service.dart b/mobile/lib/services/local_files_manager.service.dart
index 3d5f7a217d..6ba8b43fbf 100644
--- a/mobile/lib/services/local_files_manager.service.dart
+++ b/mobile/lib/services/local_files_manager.service.dart
@@ -3,10 +3,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:logging/logging.dart';
 
 final localFileManagerServiceProvider = Provider<LocalFilesManagerService>(
-  (ref) => LocalFilesManagerService(),
+  (ref) => const LocalFilesManagerService(),
 );
 
 class LocalFilesManagerService {
+  const LocalFilesManagerService();
   static final Logger _logger = Logger('LocalFilesManager');
   static const MethodChannel _channel = MethodChannel('file_trash');
 
diff --git a/mobile/lib/services/network.service.dart b/mobile/lib/services/network.service.dart
index ac91a56f2c..de55da8d7c 100644
--- a/mobile/lib/services/network.service.dart
+++ b/mobile/lib/services/network.service.dart
@@ -13,7 +13,7 @@ class NetworkService {
   final NetworkRepository _repository;
   final IPermissionRepository _permissionRepository;
 
-  NetworkService(this._repository, this._permissionRepository);
+  const NetworkService(this._repository, this._permissionRepository);
 
   Future<bool> getLocationWhenInUserPermission() {
     return _permissionRepository.hasLocationWhenInUsePermission();
diff --git a/mobile/lib/services/secure_storage.service.dart b/mobile/lib/services/secure_storage.service.dart
index e9b67257b8..38e6deb0d4 100644
--- a/mobile/lib/services/secure_storage.service.dart
+++ b/mobile/lib/services/secure_storage.service.dart
@@ -10,7 +10,7 @@ final secureStorageServiceProvider = Provider(
 class SecureStorageService {
   final SecureStorageRepository _secureStorageRepository;
 
-  SecureStorageService(this._secureStorageRepository);
+  const SecureStorageService(this._secureStorageRepository);
 
   Future<void> write(String key, String value) async {
     await _secureStorageRepository.write(key, value);
diff --git a/mobile/lib/services/server_info.service.dart b/mobile/lib/services/server_info.service.dart
index e2b7db2fce..75ce68a73c 100644
--- a/mobile/lib/services/server_info.service.dart
+++ b/mobile/lib/services/server_info.service.dart
@@ -16,7 +16,7 @@ final serverInfoServiceProvider = Provider(
 class ServerInfoService {
   final ApiService _apiService;
 
-  ServerInfoService(this._apiService);
+  const ServerInfoService(this._apiService);
 
   Future<ServerDiskInfo?> getDiskInfo() async {
     try {
diff --git a/mobile/lib/services/stack.service.dart b/mobile/lib/services/stack.service.dart
index 963169411e..e2ab6c804b 100644
--- a/mobile/lib/services/stack.service.dart
+++ b/mobile/lib/services/stack.service.dart
@@ -7,7 +7,7 @@ import 'package:immich_mobile/services/api.service.dart';
 import 'package:openapi/api.dart';
 
 class StackService {
-  StackService(this._api, this._assetRepository);
+  const StackService(this._api, this._assetRepository);
 
   final ApiService _api;
   final AssetRepository _assetRepository;
diff --git a/mobile/lib/services/widget.service.dart b/mobile/lib/services/widget.service.dart
index e71733f4b9..66e070494f 100644
--- a/mobile/lib/services/widget.service.dart
+++ b/mobile/lib/services/widget.service.dart
@@ -11,7 +11,7 @@ final widgetServiceProvider = Provider((ref) {
 class WidgetService {
   final WidgetRepository _repository;
 
-  WidgetService(this._repository);
+  const WidgetService(this._repository);
 
   Future<void> writeCredentials(String serverURL, String sessionKey) async {
     await _repository.setAppGroupId(appShareGroupId);
diff --git a/mobile/lib/theme/dynamic_theme.dart b/mobile/lib/theme/dynamic_theme.dart
index 39d6b6ee45..8ebf783469 100644
--- a/mobile/lib/theme/dynamic_theme.dart
+++ b/mobile/lib/theme/dynamic_theme.dart
@@ -4,7 +4,7 @@ import 'package:dynamic_color/dynamic_color.dart';
 import 'package:immich_mobile/theme/theme_data.dart';
 
 abstract final class DynamicTheme {
-  DynamicTheme._();
+  const DynamicTheme._();
 
   static ImmichTheme? _theme;
   // Method to fetch dynamic system colors
diff --git a/mobile/lib/utils/map_utils.dart b/mobile/lib/utils/map_utils.dart
index df1ff28d8f..39443fb225 100644
--- a/mobile/lib/utils/map_utils.dart
+++ b/mobile/lib/utils/map_utils.dart
@@ -7,7 +7,7 @@ import 'package:logging/logging.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 class MapUtils {
-  MapUtils._();
+  const MapUtils._();
 
   static final Logger _log = Logger("MapUtils");
   static const defaultSourceId = 'asset-map-markers';
diff --git a/mobile/lib/widgets/album/album_thumbnail_card.dart b/mobile/lib/widgets/album/album_thumbnail_card.dart
index 5e89cd7db3..d78f391754 100644
--- a/mobile/lib/widgets/album/album_thumbnail_card.dart
+++ b/mobile/lib/widgets/album/album_thumbnail_card.dart
@@ -106,7 +106,9 @@ class AlbumThumbnailCard extends ConsumerWidget {
                       width: cardSize,
                       height: cardSize,
                       child: ClipRRect(
-                        borderRadius: BorderRadius.circular(20),
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(20),
+                        ),
                         child: album.thumbnail.value == null
                             ? buildEmptyThumbnail()
                             : buildAlbumThumbnail(),
diff --git a/mobile/lib/widgets/album/album_title_text_field.dart b/mobile/lib/widgets/album/album_title_text_field.dart
index c19c827846..7807a6e6ae 100644
--- a/mobile/lib/widgets/album/album_title_text_field.dart
+++ b/mobile/lib/widgets/album/album_title_text_field.dart
@@ -59,13 +59,17 @@ class AlbumTitleTextField extends ConsumerWidget {
                 splashRadius: 10,
               )
             : null,
-        enabledBorder: OutlineInputBorder(
-          borderSide: const BorderSide(color: Colors.transparent),
-          borderRadius: BorderRadius.circular(10),
+        enabledBorder: const OutlineInputBorder(
+          borderSide: BorderSide(color: Colors.transparent),
+          borderRadius: BorderRadius.all(
+            Radius.circular(10),
+          ),
         ),
-        focusedBorder: OutlineInputBorder(
-          borderSide: const BorderSide(color: Colors.transparent),
-          borderRadius: BorderRadius.circular(10),
+        focusedBorder: const OutlineInputBorder(
+          borderSide: BorderSide(color: Colors.transparent),
+          borderRadius: BorderRadius.all(
+            Radius.circular(10),
+          ),
         ),
         hintText: 'add_a_title'.tr(),
         hintStyle: context.themeData.inputDecorationTheme.hintStyle?.copyWith(
diff --git a/mobile/lib/widgets/asset_grid/asset_grid_data_structure.dart b/mobile/lib/widgets/asset_grid/asset_grid_data_structure.dart
index 64803046ef..6b94c04c4d 100644
--- a/mobile/lib/widgets/asset_grid/asset_grid_data_structure.dart
+++ b/mobile/lib/widgets/asset_grid/asset_grid_data_structure.dart
@@ -23,7 +23,7 @@ class RenderAssetGridElement {
   final int offset;
   final int totalCount;
 
-  RenderAssetGridElement(
+  const RenderAssetGridElement(
     this.type, {
     this.title,
     required this.date,
diff --git a/mobile/lib/widgets/asset_grid/draggable_scrollbar.dart b/mobile/lib/widgets/asset_grid/draggable_scrollbar.dart
index 6eddf58adb..779da8add7 100644
--- a/mobile/lib/widgets/asset_grid/draggable_scrollbar.dart
+++ b/mobile/lib/widgets/asset_grid/draggable_scrollbar.dart
@@ -210,7 +210,7 @@ class DraggableScrollbar extends StatefulWidget {
       BoxConstraints? labelConstraints,
     }) {
       final scrollThumb = ClipPath(
-        clipper: ArrowClipper(),
+        clipper: const ArrowClipper(),
         child: Container(
           height: height,
           width: 20.0,
@@ -570,6 +570,7 @@ class ArrowCustomPainter extends CustomPainter {
 
 ///This cut 2 lines in arrow shape
 class ArrowClipper extends CustomClipper<Path> {
+  const ArrowClipper();
   @override
   Path getClip(Size size) {
     Path path = Path();
diff --git a/mobile/lib/widgets/asset_grid/draggable_scrollbar_custom.dart b/mobile/lib/widgets/asset_grid/draggable_scrollbar_custom.dart
index 746bbde6ef..06954f4ff4 100644
--- a/mobile/lib/widgets/asset_grid/draggable_scrollbar_custom.dart
+++ b/mobile/lib/widgets/asset_grid/draggable_scrollbar_custom.dart
@@ -479,6 +479,7 @@ class ArrowCustomPainter extends CustomPainter {
 
 ///This cut 2 lines in arrow shape
 class ArrowClipper extends CustomClipper<Path> {
+  const ArrowClipper();
   @override
   Path getClip(Size size) {
     Path path = Path();
diff --git a/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart b/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart
index 1e6aba2bda..f6a617bf1c 100644
--- a/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart
+++ b/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart
@@ -38,7 +38,9 @@ class AdvancedBottomSheet extends HookConsumerWidget {
                     color: context.isDarkTheme
                         ? Colors.grey[900]
                         : Colors.grey[200],
-                    borderRadius: BorderRadius.circular(15.0),
+                    borderRadius: const BorderRadius.all(
+                      Radius.circular(15.0),
+                    ),
                   ),
                   child: Padding(
                     padding: const EdgeInsets.only(
diff --git a/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart b/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart
index 4ef55f4f76..f47e73ea78 100644
--- a/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart
+++ b/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart
@@ -83,8 +83,10 @@ class GalleryAppBar extends ConsumerWidget {
     addToAlbum(Asset addToAlbumAsset) {
       showModalBottomSheet(
         elevation: 0,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(15.0),
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(
+            Radius.circular(15.0),
+          ),
         ),
         context: context,
         builder: (BuildContext _) {
diff --git a/mobile/lib/widgets/backup/album_info_card.dart b/mobile/lib/widgets/backup/album_info_card.dart
index 526d2199be..fa113c6291 100644
--- a/mobile/lib/widgets/backup/album_info_card.dart
+++ b/mobile/lib/widgets/backup/album_info_card.dart
@@ -8,8 +8,8 @@ import 'package:immich_mobile/models/backup/available_album.model.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -46,7 +46,9 @@ class AlbumInfoCard extends HookConsumerWidget {
       if (isSelected) {
         return Chip(
           visualDensity: VisualDensity.compact,
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)),
+          shape: const RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(5)),
+          ),
           label: Text(
             "album_info_card_backup_album_included",
             style: TextStyle(
@@ -60,7 +62,9 @@ class AlbumInfoCard extends HookConsumerWidget {
       } else if (isExcluded) {
         return Chip(
           visualDensity: VisualDensity.compact,
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)),
+          shape: const RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(5)),
+          ),
           label: Text(
             "album_info_card_backup_album_excluded",
             style: TextStyle(
@@ -125,7 +129,9 @@ class AlbumInfoCard extends HookConsumerWidget {
         clipBehavior: Clip.hardEdge,
         margin: const EdgeInsets.all(1),
         shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(12), // if you need this
+          borderRadius: const BorderRadius.all(
+            Radius.circular(12), // if you need this
+          ),
           side: BorderSide(
             color: isDarkTheme
                 ? const Color.fromARGB(255, 37, 35, 35)
diff --git a/mobile/lib/widgets/backup/backup_info_card.dart b/mobile/lib/widgets/backup/backup_info_card.dart
index 58fc89cb65..54551da35a 100644
--- a/mobile/lib/widgets/backup/backup_info_card.dart
+++ b/mobile/lib/widgets/backup/backup_info_card.dart
@@ -18,7 +18,9 @@ class BackupInfoCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return Card(
       shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20), // if you need this
+        borderRadius: const BorderRadius.all(
+          Radius.circular(20), // if you need this
+        ),
         side: BorderSide(
           color: context.colorScheme.outlineVariant,
           width: 1,
diff --git a/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart b/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart
index cc14ffa5fe..9d8be7c6ce 100644
--- a/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart
+++ b/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart
@@ -274,8 +274,10 @@ class ImmichAppBarDialog extends HookConsumerWidget {
           right: horizontalPadding,
           bottom: isHorizontal ? 20 : 100,
         ),
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(20),
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(
+            Radius.circular(20),
+          ),
         ),
         child: SizedBox(
           child: SingleChildScrollView(
diff --git a/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart b/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart
index 93cdcd0e6f..0224ff030f 100644
--- a/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart
+++ b/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart
@@ -96,8 +96,8 @@ class AppBarProfileInfoBox extends HookConsumerWidget {
                   child: Material(
                     color: context.colorScheme.surfaceContainerHighest,
                     elevation: 3,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(50.0),
+                    shape: const RoundedRectangleBorder(
+                      borderRadius: BorderRadius.all(Radius.circular(50.0)),
                     ),
                     child: Padding(
                       padding: const EdgeInsets.all(5.0),
diff --git a/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart b/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart
index 0f8ae8b8e1..a867a11e00 100644
--- a/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart
+++ b/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart
@@ -1,10 +1,10 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/models/server_info/server_info.model.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:immich_mobile/providers/locale_provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
@@ -173,7 +173,8 @@ class AppBarServerInfo extends HookConsumerWidget {
                         verticalOffset: 0,
                         decoration: BoxDecoration(
                           color: context.primaryColor.withValues(alpha: 0.9),
-                          borderRadius: BorderRadius.circular(10),
+                          borderRadius:
+                              const BorderRadius.all(Radius.circular(10)),
                         ),
                         textStyle: TextStyle(
                           color:
diff --git a/mobile/lib/widgets/common/date_time_picker.dart b/mobile/lib/widgets/common/date_time_picker.dart
index 22384ebe8e..064c4845fe 100644
--- a/mobile/lib/widgets/common/date_time_picker.dart
+++ b/mobile/lib/widgets/common/date_time_picker.dart
@@ -172,11 +172,15 @@ class _DateTimePicker extends HookWidget {
           ListTile(
             tileColor: context.colorScheme.surfaceContainerHighest,
             shape: ShapeBorder.lerp(
-              RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(10),
+              const RoundedRectangleBorder(
+                borderRadius: BorderRadius.all(
+                  Radius.circular(10),
+                ),
               ),
-              RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(10),
+              const RoundedRectangleBorder(
+                borderRadius: BorderRadius.all(
+                  Radius.circular(10),
+                ),
               ),
               1,
             ),
diff --git a/mobile/lib/widgets/common/immich_app_bar.dart b/mobile/lib/widgets/common/immich_app_bar.dart
index c3bb75afd6..dbf088c112 100644
--- a/mobile/lib/widgets/common/immich_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_app_bar.dart
@@ -42,7 +42,7 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {
           useRootNavigator: false,
           builder: (ctx) => const ImmichAppBarDialog(),
         ),
-        borderRadius: BorderRadius.circular(12),
+        borderRadius: const BorderRadius.all(Radius.circular(12)),
         child: Badge(
           label: Container(
             decoration: BoxDecoration(
@@ -120,7 +120,7 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {
 
       return InkWell(
         onTap: () => context.pushRoute(const BackupControllerRoute()),
-        borderRadius: BorderRadius.circular(12),
+        borderRadius: const BorderRadius.all(Radius.circular(12)),
         child: Badge(
           label: Container(
             width: widgetSize / 2,
diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
index 4970a3a0c8..64b5ee0136 100644
--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -138,7 +138,7 @@ class _ProfileIndicator extends ConsumerWidget {
         useRootNavigator: false,
         builder: (ctx) => const ImmichAppBarDialog(),
       ),
-      borderRadius: BorderRadius.circular(12),
+      borderRadius: const BorderRadius.all(Radius.circular(12)),
       child: Badge(
         label: Container(
           decoration: BoxDecoration(
@@ -185,7 +185,7 @@ class _BackupIndicator extends ConsumerWidget {
 
     return InkWell(
       onTap: () => context.pushRoute(const BackupControllerRoute()),
-      borderRadius: BorderRadius.circular(12),
+      borderRadius: const BorderRadius.all(Radius.circular(12)),
       child: Badge(
         label: Container(
           width: widgetSize / 2,
diff --git a/mobile/lib/widgets/common/search_field.dart b/mobile/lib/widgets/common/search_field.dart
index 5d71082b24..97ac75a63b 100644
--- a/mobile/lib/widgets/common/search_field.dart
+++ b/mobile/lib/widgets/common/search_field.dart
@@ -47,25 +47,33 @@ class SearchField extends StatelessWidget {
           color: context.themeData.colorScheme.onSurfaceSecondary,
         ),
         border: OutlineInputBorder(
-          borderRadius: BorderRadius.circular(25),
+          borderRadius: const BorderRadius.all(
+            Radius.circular(25),
+          ),
           borderSide: BorderSide(
             color: context.colorScheme.surfaceDim,
           ),
         ),
         enabledBorder: OutlineInputBorder(
-          borderRadius: BorderRadius.circular(25),
+          borderRadius: const BorderRadius.all(
+            Radius.circular(25),
+          ),
           borderSide: BorderSide(
             color: context.colorScheme.surfaceContainer,
           ),
         ),
         disabledBorder: OutlineInputBorder(
-          borderRadius: BorderRadius.circular(25),
+          borderRadius: const BorderRadius.all(
+            Radius.circular(25),
+          ),
           borderSide: BorderSide(
             color: context.colorScheme.surfaceDim,
           ),
         ),
         focusedBorder: OutlineInputBorder(
-          borderRadius: BorderRadius.circular(25),
+          borderRadius: const BorderRadius.all(
+            Radius.circular(25),
+          ),
           borderSide: BorderSide(
             color: context.colorScheme.primary.withAlpha(100),
           ),
diff --git a/mobile/lib/widgets/forms/login/login_form.dart b/mobile/lib/widgets/forms/login/login_form.dart
index 5374d1ef33..8ccd69930a 100644
--- a/mobile/lib/widgets/forms/login/login_form.dart
+++ b/mobile/lib/widgets/forms/login/login_form.dart
@@ -394,7 +394,9 @@ class LoginForm extends HookConsumerWidget {
           decoration: BoxDecoration(
             color:
                 context.isDarkTheme ? Colors.red.shade700 : Colors.red.shade100,
-            borderRadius: BorderRadius.circular(8),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(8),
+            ),
             border: Border.all(
               color:
                   context.isDarkTheme ? Colors.red.shade900 : Colors.red[200]!,
diff --git a/mobile/lib/widgets/map/map_app_bar.dart b/mobile/lib/widgets/map/map_app_bar.dart
index 4de5721486..ccadd2ad15 100644
--- a/mobile/lib/widgets/map/map_app_bar.dart
+++ b/mobile/lib/widgets/map/map_app_bar.dart
@@ -4,12 +4,12 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/map/map_state.provider.dart';
-import 'package:immich_mobile/widgets/map/map_settings_sheet.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/utils/immich_loading_overlay.dart';
 import 'package:immich_mobile/utils/selection_handlers.dart';
+import 'package:immich_mobile/widgets/map/map_settings_sheet.dart';
 
 class MapAppBar extends HookWidget implements PreferredSizeWidget {
   final ValueNotifier<Set<Asset>> selectedAssets;
@@ -24,7 +24,7 @@ class MapAppBar extends HookWidget implements PreferredSizeWidget {
         valueListenable: selectedAssets,
         builder: (ctx, value, child) => value.isNotEmpty
             ? _SelectionRow(selectedAssets: selectedAssets)
-            : _NonSelectionRow(),
+            : const _NonSelectionRow(),
       ),
     );
   }
@@ -34,6 +34,8 @@ class MapAppBar extends HookWidget implements PreferredSizeWidget {
 }
 
 class _NonSelectionRow extends StatelessWidget {
+  const _NonSelectionRow();
+
   @override
   Widget build(BuildContext context) {
     void onSettingsPressed() {
diff --git a/mobile/lib/widgets/map/map_asset_grid.dart b/mobile/lib/widgets/map/map_asset_grid.dart
index 4a3bb69cc0..c8c0816551 100644
--- a/mobile/lib/widgets/map/map_asset_grid.dart
+++ b/mobile/lib/widgets/map/map_asset_grid.dart
@@ -185,7 +185,7 @@ class MapAssetGrid extends HookConsumerWidget {
                         },
                         loading: () => const SizedBox.shrink(),
                       )
-                  : _MapNoAssetsInSheet(),
+                  : const _MapNoAssetsInSheet(),
             ),
           ),
           _MapSheetDragRegion(
@@ -201,6 +201,8 @@ class MapAssetGrid extends HookConsumerWidget {
 }
 
 class _MapNoAssetsInSheet extends StatelessWidget {
+  const _MapNoAssetsInSheet();
+
   @override
   Widget build(BuildContext context) {
     const image = Image(
diff --git a/mobile/lib/widgets/map/positioned_asset_marker_icon.dart b/mobile/lib/widgets/map/positioned_asset_marker_icon.dart
index 2cf82517ae..5ad49b42f8 100644
--- a/mobile/lib/widgets/map/positioned_asset_marker_icon.dart
+++ b/mobile/lib/widgets/map/positioned_asset_marker_icon.dart
@@ -108,7 +108,7 @@ class _PinPainter extends CustomPainter {
   final double primaryRadius;
   final double secondaryRadius;
 
-  _PinPainter({
+  const _PinPainter({
     required this.primaryColor,
     required this.secondaryColor,
     required this.primaryRadius,
diff --git a/mobile/lib/widgets/memories/memory_card.dart b/mobile/lib/widgets/memories/memory_card.dart
index abe3586194..31f4d5ed94 100644
--- a/mobile/lib/widgets/memories/memory_card.dart
+++ b/mobile/lib/widgets/memories/memory_card.dart
@@ -26,9 +26,9 @@ class MemoryCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return Card(
       color: Colors.black,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(25.0),
-        side: const BorderSide(
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(Radius.circular(25.0)),
+        side: BorderSide(
           color: Colors.black,
           width: 1.0,
         ),
diff --git a/mobile/lib/widgets/photo_view/photo_view_gallery.dart b/mobile/lib/widgets/photo_view/photo_view_gallery.dart
index b8918309bc..26c292d678 100644
--- a/mobile/lib/widgets/photo_view/photo_view_gallery.dart
+++ b/mobile/lib/widgets/photo_view/photo_view_gallery.dart
@@ -12,7 +12,6 @@ import 'package:immich_mobile/widgets/photo_view/photo_view.dart'
         PhotoViewImageScaleEndCallback,
         PhotoViewImageLongPressStartCallback,
         ScaleStateCycle;
-
 import 'package:immich_mobile/widgets/photo_view/src/controller/photo_view_controller.dart';
 import 'package:immich_mobile/widgets/photo_view/src/controller/photo_view_scalestate_controller.dart';
 import 'package:immich_mobile/widgets/photo_view/src/core/photo_view_gesture_detector.dart';
@@ -358,7 +357,7 @@ class PhotoViewGalleryPageOptions {
         childSize = null,
         assert(imageProvider != null);
 
-  PhotoViewGalleryPageOptions.customChild({
+  const PhotoViewGalleryPageOptions.customChild({
     required this.child,
     this.childSize,
     this.heroAttributes,
diff --git a/mobile/lib/widgets/search/person_name_edit_form.dart b/mobile/lib/widgets/search/person_name_edit_form.dart
index 76d6e80832..886f17b2cc 100644
--- a/mobile/lib/widgets/search/person_name_edit_form.dart
+++ b/mobile/lib/widgets/search/person_name_edit_form.dart
@@ -9,7 +9,7 @@ class PersonNameEditFormResult {
   final bool success;
   final String updatedName;
 
-  PersonNameEditFormResult(this.success, this.updatedName);
+  const PersonNameEditFormResult(this.success, this.updatedName);
 }
 
 class PersonNameEditForm extends HookConsumerWidget {
@@ -47,7 +47,7 @@ class PersonNameEditForm extends HookConsumerWidget {
       actions: [
         TextButton(
           onPressed: () => context.pop(
-            PersonNameEditFormResult(false, ''),
+            const PersonNameEditFormResult(false, ''),
           ),
           child: Text(
             "cancel",
diff --git a/mobile/lib/widgets/search/search_filter/common/dropdown.dart b/mobile/lib/widgets/search/search_filter/common/dropdown.dart
index dd8785459f..dd0ec44e45 100644
--- a/mobile/lib/widgets/search/search_filter/common/dropdown.dart
+++ b/mobile/lib/widgets/search/search_filter/common/dropdown.dart
@@ -18,10 +18,10 @@ class SearchDropdown<T> extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final menuStyle = MenuStyle(
+    final menuStyle = const MenuStyle(
       shape: WidgetStatePropertyAll<OutlinedBorder>(
         RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(15),
+          borderRadius: BorderRadius.all(Radius.circular(15)),
         ),
       ),
     );
diff --git a/mobile/lib/widgets/settings/backup_settings/background_settings.dart b/mobile/lib/widgets/settings/backup_settings/background_settings.dart
index d628309050..619a410545 100644
--- a/mobile/lib/widgets/settings/backup_settings/background_settings.dart
+++ b/mobile/lib/widgets/settings/backup_settings/background_settings.dart
@@ -97,7 +97,7 @@ class BackgroundBackupSettings extends ConsumerWidget {
             onBatteryInfo: showBatteryOptimizationInfoToUser,
           ),
         if (Platform.isIOS && iosSettings?.appRefreshEnabled != true)
-          _IOSBackgroundRefreshDisabled(),
+          const _IOSBackgroundRefreshDisabled(),
         if (Platform.isIOS && iosSettings != null)
           IosDebugInfoTile(settings: iosSettings),
       ],
@@ -106,6 +106,8 @@ class BackgroundBackupSettings extends ConsumerWidget {
 }
 
 class _IOSBackgroundRefreshDisabled extends StatelessWidget {
+  const _IOSBackgroundRefreshDisabled();
+
   @override
   Widget build(BuildContext context) {
     return SettingsButtonListTile(
diff --git a/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart b/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart
index 633d84c9c8..d38ba06d76 100644
--- a/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart
+++ b/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart
@@ -17,8 +17,9 @@ class ExternalNetworkPreference extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final entries =
-        useState([AuxilaryEndpoint(url: '', status: AuxCheckStatus.unknown)]);
+    final entries = useState(
+      [const AuxilaryEndpoint(url: '', status: AuxCheckStatus.unknown)],
+    );
     final canSave = useState(false);
 
     saveEndpointList() {
@@ -169,7 +170,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
                           ? () {
                               entries.value = [
                                 ...entries.value,
-                                AuxilaryEndpoint(
+                                const AuxilaryEndpoint(
                                   url: '',
                                   status: AuxCheckStatus.unknown,
                                 ),
diff --git a/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart b/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart
index af34ab9e16..011904c310 100644
--- a/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart
+++ b/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart
@@ -7,9 +7,9 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/providers/theme.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 import 'package:immich_mobile/theme/color_scheme.dart';
 import 'package:immich_mobile/theme/dynamic_theme.dart';
+import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 
 class PrimaryColorSetting extends HookConsumerWidget {
   const PrimaryColorSetting({
@@ -136,8 +136,8 @@ class PrimaryColorSetting extends HookConsumerWidget {
                 dense: true,
                 activeColor: context.primaryColor,
                 tileColor: context.colorScheme.surfaceContainerHigh,
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(15),
+                shape: const RoundedRectangleBorder(
+                  borderRadius: BorderRadius.all(Radius.circular(15)),
                 ),
                 title: Text(
                   'theme_setting_system_primary_color_title'.tr(),
diff --git a/mobile/lib/widgets/settings/settings_radio_list_tile.dart b/mobile/lib/widgets/settings/settings_radio_list_tile.dart
index 1c26682a65..3f3a6cbe69 100644
--- a/mobile/lib/widgets/settings/settings_radio_list_tile.dart
+++ b/mobile/lib/widgets/settings/settings_radio_list_tile.dart
@@ -5,7 +5,7 @@ class SettingsRadioGroup<T> {
   final String title;
   final T value;
 
-  SettingsRadioGroup({required this.title, required this.value});
+  const SettingsRadioGroup({required this.title, required this.value});
 }
 
 class SettingsRadioListTile<T> extends StatelessWidget {
diff --git a/mobile/lib/widgets/shared_link/shared_link_item.dart b/mobile/lib/widgets/shared_link/shared_link_item.dart
index 69e763ea09..a9707eb0d3 100644
--- a/mobile/lib/widgets/shared_link/shared_link_item.dart
+++ b/mobile/lib/widgets/shared_link/shared_link_item.dart
@@ -240,7 +240,7 @@ class SharedLinkItem extends ConsumerWidget {
               verticalOffset: 0,
               decoration: BoxDecoration(
                 color: colorScheme.primary.withValues(alpha: 0.9),
-                borderRadius: BorderRadius.circular(10),
+                borderRadius: const BorderRadius.all(Radius.circular(10)),
               ),
               textStyle: TextStyle(
                 color: isDarkMode ? Colors.black : Colors.white,
@@ -268,7 +268,7 @@ class SharedLinkItem extends ConsumerWidget {
                   verticalOffset: 0,
                   decoration: BoxDecoration(
                     color: colorScheme.primary.withValues(alpha: 0.9),
-                    borderRadius: BorderRadius.circular(10),
+                    borderRadius: const BorderRadius.all(Radius.circular(10)),
                   ),
                   textStyle: TextStyle(
                     color: isDarkMode ? Colors.black : Colors.white,
diff --git a/mobile/test/domain/services/log_service_test.dart b/mobile/test/domain/services/log_service_test.dart
index 23bdcc9909..3efa717f97 100644
--- a/mobile/test/domain/services/log_service_test.dart
+++ b/mobile/test/domain/services/log_service_test.dart
@@ -121,7 +121,6 @@ void main() {
         time.elapse(const Duration(seconds: 6));
         final insert = verify(() => mockLogRepo.insertAll(captureAny()));
         insert.called(1);
-        // ignore: prefer-correct-json-casts
         final captured = insert.captured.firstOrNull as List<LogMessage>;
         expect(captured.firstOrNull?.message, _kInfoLog.message);
         expect(captured.firstOrNull?.logger, _kInfoLog.logger);
diff --git a/mobile/test/domain/services/sync_stream_service_test.dart b/mobile/test/domain/services/sync_stream_service_test.dart
index 03d481f9f3..2922358ff4 100644
--- a/mobile/test/domain/services/sync_stream_service_test.dart
+++ b/mobile/test/domain/services/sync_stream_service_test.dart
@@ -1,5 +1,3 @@
-// ignore_for_file: avoid-declaring-call-method, avoid-unnecessary-futures
-
 import 'dart:async';
 
 import 'package:flutter_test/flutter_test.dart';
@@ -46,7 +44,6 @@ void main() {
 
     when(() => mockSyncApiRepo.streamChanges(any()))
         .thenAnswer((invocation) async {
-      // ignore: avoid-unsafe-collection-methods
       handleEventsCallback = invocation.positionalArguments.first;
     });
 
diff --git a/mobile/test/modules/map/map_theme_override_test.dart b/mobile/test/modules/map/map_theme_override_test.dart
index 5a6b163c04..db133d5c34 100644
--- a/mobile/test/modules/map/map_theme_override_test.dart
+++ b/mobile/test/modules/map/map_theme_override_test.dart
@@ -28,7 +28,7 @@ void main() {
   });
 
   setUp(() async {
-    mapState = MapState(themeMode: ThemeMode.dark);
+    mapState = const MapState(themeMode: ThemeMode.dark);
     mapStateNotifier = MockMapStateNotifier(mapState);
     await StoreService.init(storeRepository: IsarStoreRepository(db));
     overrides = [
diff --git a/mobile/test/services/auth.service_test.dart b/mobile/test/services/auth.service_test.dart
index 4ada98a6c9..46ad8bbc4c 100644
--- a/mobile/test/services/auth.service_test.dart
+++ b/mobile/test/services/auth.service_test.dart
@@ -187,7 +187,7 @@ void main() {
       when(() => authRepository.getPreferredWifiName())
           .thenReturn('DifferentWifi');
       when(() => authRepository.getExternalEndpointList()).thenReturn([
-        AuxilaryEndpoint(
+        const AuxilaryEndpoint(
           url: 'https://external.endpoint',
           status: AuxCheckStatus.valid,
         ),
@@ -214,11 +214,11 @@ void main() {
       when(() => authRepository.getPreferredWifiName())
           .thenReturn('DifferentWifi');
       when(() => authRepository.getExternalEndpointList()).thenReturn([
-        AuxilaryEndpoint(
+        const AuxilaryEndpoint(
           url: 'https://external.endpoint',
           status: AuxCheckStatus.valid,
         ),
-        AuxilaryEndpoint(
+        const AuxilaryEndpoint(
           url: 'https://external.endpoint2',
           status: AuxCheckStatus.valid,
         ),
@@ -249,11 +249,11 @@ void main() {
       when(() => authRepository.getPreferredWifiName())
           .thenReturn('DifferentWifi');
       when(() => authRepository.getExternalEndpointList()).thenReturn([
-        AuxilaryEndpoint(
+        const AuxilaryEndpoint(
           url: 'https://external.endpoint',
           status: AuxCheckStatus.valid,
         ),
-        AuxilaryEndpoint(
+        const AuxilaryEndpoint(
           url: 'https://external.endpoint2',
           status: AuxCheckStatus.valid,
         ),
@@ -302,7 +302,7 @@ void main() {
       when(() => authRepository.getPreferredWifiName())
           .thenReturn('DifferentWifi');
       when(() => authRepository.getExternalEndpointList()).thenReturn([
-        AuxilaryEndpoint(
+        const AuxilaryEndpoint(
           url: 'https://external.endpoint',
           status: AuxCheckStatus.valid,
         ),
diff --git a/mobile/test/test_utils.dart b/mobile/test/test_utils.dart
index c0f789795c..596d3bcd1c 100644
--- a/mobile/test/test_utils.dart
+++ b/mobile/test/test_utils.dart
@@ -24,7 +24,6 @@ import 'mock_http_override.dart';
 
 // Listener Mock to test when a provider notifies its listeners
 class ListenerMock<T> extends Mock {
-  // ignore: avoid-declaring-call-method
   void call(T? previous, T next);
 }
 

From eca9b5684751b09cbad46a200b9fdd9a206193e6 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Wed, 25 Jun 2025 11:12:36 -0400
Subject: [PATCH 048/337] feat(server): person delete (#19511)

feat(api): person delete
---
 mobile/openapi/README.md                      |  2 +
 mobile/openapi/lib/api/people_api.dart        | 79 ++++++++++++++++
 open-api/immich-openapi-specs.json            | 66 ++++++++++++++
 open-api/typescript-sdk/src/fetch-client.ts   | 17 ++++
 .../src/controllers/person.controller.spec.ts | 42 +++++++++
 server/src/controllers/person.controller.ts   | 31 ++++++-
 server/src/queries/person.repository.sql      |  9 ++
 server/src/repositories/person.repository.ts  | 12 ++-
 server/src/services/person.service.ts         | 18 +++-
 server/src/utils/access.ts                    | 19 ++--
 server/test/medium.factory.ts                 | 14 ++-
 .../specs/services/person.service.spec.ts     | 90 +++++++++++++++++++
 .../repositories/person.repository.mock.ts    | 38 --------
 server/test/utils.ts                          |  3 +-
 14 files changed, 380 insertions(+), 60 deletions(-)
 create mode 100644 server/test/medium/specs/services/person.service.spec.ts
 delete mode 100644 server/test/repositories/person.repository.mock.ts

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index a412c237dd..590e45f04b 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -169,6 +169,8 @@ Class | Method | HTTP request | Description
 *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 | 
diff --git a/mobile/openapi/lib/api/people_api.dart b/mobile/openapi/lib/api/people_api.dart
index 1cdb878852..35dbac4e97 100644
--- a/mobile/openapi/lib/api/people_api.dart
+++ b/mobile/openapi/lib/api/people_api.dart
@@ -63,6 +63,85 @@ class PeopleApi {
     return null;
   }
 
+  /// Performs an HTTP 'DELETE /people' operation and returns the [Response].
+  /// Parameters:
+  ///
+  /// * [BulkIdsDto] bulkIdsDto (required):
+  Future<Response> deletePeopleWithHttpInfo(BulkIdsDto bulkIdsDto,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/people';
+
+    // ignore: prefer_final_locals
+    Object? postBody = bulkIdsDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'DELETE',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Parameters:
+  ///
+  /// * [BulkIdsDto] bulkIdsDto (required):
+  Future<void> deletePeople(BulkIdsDto bulkIdsDto,) async {
+    final response = await deletePeopleWithHttpInfo(bulkIdsDto,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+  }
+
+  /// Performs an HTTP 'DELETE /people/{id}' operation and returns the [Response].
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  Future<Response> deletePersonWithHttpInfo(String id,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/people/{id}'
+      .replaceAll('{id}', id);
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'DELETE',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  Future<void> deletePerson(String id,) async {
+    final response = await deletePersonWithHttpInfo(id,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+  }
+
   /// Performs an HTTP 'GET /people' operation and returns the [Response].
   /// Parameters:
   ///
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index bd5e8e7fa0..c436f81953 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -4546,6 +4546,39 @@
       }
     },
     "/people": {
+      "delete": {
+        "operationId": "deletePeople",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/BulkIdsDto"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "204": {
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "People"
+        ]
+      },
       "get": {
         "operationId": "getAllPeople",
         "parameters": [
@@ -4711,6 +4744,39 @@
       }
     },
     "/people/{id}": {
+      "delete": {
+        "operationId": "deletePerson",
+        "parameters": [
+          {
+            "name": "id",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "format": "uuid",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "People"
+        ]
+      },
       "get": {
         "operationId": "getPerson",
         "parameters": [
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index fd866d9122..ff8ea67a18 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -2769,6 +2769,15 @@ export function updatePartner({ id, updatePartnerDto }: {
         body: updatePartnerDto
     })));
 }
+export function deletePeople({ bulkIdsDto }: {
+    bulkIdsDto: BulkIdsDto;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchText("/people", oazapfts.json({
+        ...opts,
+        method: "DELETE",
+        body: bulkIdsDto
+    })));
+}
 export function getAllPeople({ closestAssetId, closestPersonId, page, size, withHidden }: {
     closestAssetId?: string;
     closestPersonId?: string;
@@ -2813,6 +2822,14 @@ export function updatePeople({ peopleUpdateDto }: {
         body: peopleUpdateDto
     })));
 }
+export function deletePerson({ id }: {
+    id: string;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchText(`/people/${encodeURIComponent(id)}`, {
+        ...opts,
+        method: "DELETE"
+    }));
+}
 export function getPerson({ id }: {
     id: string;
 }, opts?: Oazapfts.RequestOpts) {
diff --git a/server/src/controllers/person.controller.spec.ts b/server/src/controllers/person.controller.spec.ts
index 0366829336..5b63fcc6cd 100644
--- a/server/src/controllers/person.controller.spec.ts
+++ b/server/src/controllers/person.controller.spec.ts
@@ -60,6 +60,29 @@ describe(PersonController.name, () => {
     });
   });
 
+  describe('DELETE /people', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).delete('/people');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it('should require uuids in the body', async () => {
+      const { status, body } = await request(ctx.getHttpServer())
+        .delete('/people')
+        .send({ ids: ['invalid'] });
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest([expect.stringContaining('must be a UUID')]));
+    });
+
+    it('should respond with 204', async () => {
+      const { status } = await request(ctx.getHttpServer())
+        .delete(`/people`)
+        .send({ ids: [factory.uuid()] });
+      expect(status).toBe(204);
+      expect(service.deleteAll).toHaveBeenCalled();
+    });
+  });
+
   describe('GET /people/:id', () => {
     it('should be an authenticated route', async () => {
       await request(ctx.getHttpServer()).get(`/people/${factory.uuid()}`);
@@ -156,6 +179,25 @@ describe(PersonController.name, () => {
     });
   });
 
+  describe('DELETE /people/:id', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).delete(`/people/${factory.uuid()}`);
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it('should require a valid uuid', async () => {
+      const { status, body } = await request(ctx.getHttpServer()).delete(`/people/invalid`);
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest([expect.stringContaining('must be a UUID')]));
+    });
+
+    it('should respond with 204', async () => {
+      const { status } = await request(ctx.getHttpServer()).delete(`/people/${factory.uuid()}`);
+      expect(status).toBe(204);
+      expect(service.delete).toHaveBeenCalled();
+    });
+  });
+
   describe('POST /people/:id/merge', () => {
     it('should be an authenticated route', async () => {
       await request(ctx.getHttpServer()).post(`/people/${factory.uuid()}/merge`);
diff --git a/server/src/controllers/person.controller.ts b/server/src/controllers/person.controller.ts
index 3440042eda..a9f6616426 100644
--- a/server/src/controllers/person.controller.ts
+++ b/server/src/controllers/person.controller.ts
@@ -1,7 +1,20 @@
-import { Body, Controller, Get, Next, Param, Post, Put, Query, Res } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  HttpCode,
+  HttpStatus,
+  Next,
+  Param,
+  Post,
+  Put,
+  Query,
+  Res,
+} from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { NextFunction, Response } from 'express';
-import { BulkIdResponseDto } from 'src/dtos/asset-ids.response.dto';
+import { BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import {
   AssetFaceUpdateDto,
@@ -49,6 +62,13 @@ export class PersonController {
     return this.service.updateAll(auth, dto);
   }
 
+  @Delete()
+  @HttpCode(HttpStatus.NO_CONTENT)
+  @Authenticated({ permission: Permission.PERSON_DELETE })
+  deletePeople(@Auth() auth: AuthDto, @Body() dto: BulkIdsDto): Promise<void> {
+    return this.service.deleteAll(auth, dto);
+  }
+
   @Get(':id')
   @Authenticated({ permission: Permission.PERSON_READ })
   getPerson(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<PersonResponseDto> {
@@ -65,6 +85,13 @@ export class PersonController {
     return this.service.update(auth, id, dto);
   }
 
+  @Delete(':id')
+  @HttpCode(HttpStatus.NO_CONTENT)
+  @Authenticated({ permission: Permission.PERSON_DELETE })
+  deletePerson(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
+    return this.service.delete(auth, id);
+  }
+
   @Get(':id/statistics')
   @Authenticated({ permission: Permission.PERSON_STATISTICS })
   getPersonStatistics(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<PersonStatisticsResponseDto> {
diff --git a/server/src/queries/person.repository.sql b/server/src/queries/person.repository.sql
index 1ac7111d56..cbd952cd04 100644
--- a/server/src/queries/person.repository.sql
+++ b/server/src/queries/person.repository.sql
@@ -328,3 +328,12 @@ set
   "deletedAt" = $1
 where
   "asset_faces"."id" = $2
+
+-- PersonRepository.getForPeopleDelete
+select
+  "id",
+  "thumbnailPath"
+from
+  "person"
+where
+  "id" in ($1)
diff --git a/server/src/repositories/person.repository.ts b/server/src/repositories/person.repository.ts
index a18bf2646a..8fef625a70 100644
--- a/server/src/repositories/person.repository.ts
+++ b/server/src/repositories/person.repository.ts
@@ -3,7 +3,7 @@ import { ExpressionBuilder, Insertable, Kysely, Selectable, sql, Updateable } fr
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { AssetFaces, DB, FaceSearch, Person } from 'src/db';
-import { ChunkedArray, DummyValue, GenerateSql } from 'src/decorators';
+import { Chunked, ChunkedArray, DummyValue, GenerateSql } from 'src/decorators';
 import { AssetFileType, AssetVisibility, SourceType } from 'src/enum';
 import { removeUndefinedKeys } from 'src/utils/database';
 import { paginationHelper, PaginationOptions } from 'src/utils/pagination';
@@ -102,6 +102,7 @@ export class PersonRepository {
   }
 
   @GenerateSql({ params: [[DummyValue.UUID]] })
+  @Chunked()
   async delete(ids: string[]): Promise<void> {
     if (ids.length === 0) {
       return;
@@ -517,4 +518,13 @@ export class PersonRepository {
       await sql`REINDEX TABLE face_search`.execute(this.db);
     }
   }
+
+  @GenerateSql({ params: [[DummyValue.UUID]] })
+  @Chunked()
+  getForPeopleDelete(ids: string[]) {
+    if (ids.length === 0) {
+      return Promise.resolve([]);
+    }
+    return this.db.selectFrom('person').select(['id', 'thumbnailPath']).where('id', 'in', ids).execute();
+  }
 }
diff --git a/server/src/services/person.service.ts b/server/src/services/person.service.ts
index cd484c230b..61978ba8d5 100644
--- a/server/src/services/person.service.ts
+++ b/server/src/services/person.service.ts
@@ -4,7 +4,7 @@ import { JOBS_ASSET_PAGINATION_SIZE } from 'src/constants';
 import { Person } from 'src/database';
 import { AssetFaces, FaceSearch } from 'src/db';
 import { Chunked, OnJob } from 'src/decorators';
-import { BulkIdErrorReason, BulkIdResponseDto } from 'src/dtos/asset-ids.response.dto';
+import { BulkIdErrorReason, BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import {
   AssetFaceCreateDto,
@@ -216,6 +216,10 @@ export class PersonService extends BaseService {
     return mapPerson(person);
   }
 
+  delete(auth: AuthDto, id: string): Promise<void> {
+    return this.deleteAll(auth, { ids: [id] });
+  }
+
   async updateAll(auth: AuthDto, dto: PeopleUpdateDto): Promise<BulkIdResponseDto[]> {
     const results: BulkIdResponseDto[] = [];
     for (const person of dto.people) {
@@ -236,8 +240,14 @@ export class PersonService extends BaseService {
     return results;
   }
 
+  async deleteAll(auth: AuthDto, { ids }: BulkIdsDto): Promise<void> {
+    await this.requireAccess({ auth, permission: Permission.PERSON_DELETE, ids });
+    const people = await this.personRepository.getForPeopleDelete(ids);
+    await this.removeAllPeople(people);
+  }
+
   @Chunked()
-  private async delete(people: { id: string; thumbnailPath: string }[]) {
+  private async removeAllPeople(people: { id: string; thumbnailPath: string }[]) {
     await Promise.all(people.map((person) => this.storageRepository.unlink(person.thumbnailPath)));
     await this.personRepository.delete(people.map((person) => person.id));
     this.logger.debug(`Deleted ${people.length} people`);
@@ -246,7 +256,7 @@ export class PersonService extends BaseService {
   @OnJob({ name: JobName.PERSON_CLEANUP, queue: QueueName.BACKGROUND_TASK })
   async handlePersonCleanup(): Promise<JobStatus> {
     const people = await this.personRepository.getAllWithoutFaces();
-    await this.delete(people);
+    await this.removeAllPeople(people);
     return JobStatus.SUCCESS;
   }
 
@@ -589,7 +599,7 @@ export class PersonService extends BaseService {
         this.logger.log(`Merging ${mergeName} into ${primaryName}`);
 
         await this.personRepository.reassignFaces(mergeData);
-        await this.delete([mergePerson]);
+        await this.removeAllPeople([mergePerson]);
 
         this.logger.log(`Merged ${mergeName} into ${primaryName}`);
         results.push({ id: mergeId, success: true });
diff --git a/server/src/utils/access.ts b/server/src/utils/access.ts
index c1b162927d..b639643b6f 100644
--- a/server/src/utils/access.ts
+++ b/server/src/utils/access.ts
@@ -256,22 +256,17 @@ const checkOtherAccess = async (access: AccessRepository, request: OtherAccessRe
       return access.memory.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.PERSON_READ: {
-      return await access.person.checkOwnerAccess(auth.user.id, ids);
-    }
-
-    case Permission.PERSON_UPDATE: {
-      return await access.person.checkOwnerAccess(auth.user.id, ids);
-    }
-
-    case Permission.PERSON_MERGE: {
-      return await access.person.checkOwnerAccess(auth.user.id, ids);
-    }
-
     case Permission.PERSON_CREATE: {
       return access.person.checkFaceOwnerAccess(auth.user.id, ids);
     }
 
+    case Permission.PERSON_READ:
+    case Permission.PERSON_UPDATE:
+    case Permission.PERSON_DELETE:
+    case Permission.PERSON_MERGE: {
+      return await access.person.checkOwnerAccess(auth.user.id, ids);
+    }
+
     case Permission.PERSON_REASSIGN: {
       return access.person.checkFaceOwnerAccess(auth.user.id, ids);
     }
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index 988f1b406f..cbecff267d 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -7,6 +7,7 @@ import { AssetFace } from 'src/database';
 import { Albums, AssetJobStatus, Assets, DB, FaceSearch, Person, Sessions } from 'src/db';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { AssetType, AssetVisibility, SourceType, SyncRequestType } from 'src/enum';
+import { AccessRepository } from 'src/repositories/access.repository';
 import { ActivityRepository } from 'src/repositories/activity.repository';
 import { AlbumUserRepository } from 'src/repositories/album-user.repository';
 import { AlbumRepository } from 'src/repositories/album.repository';
@@ -24,6 +25,7 @@ import { PartnerRepository } from 'src/repositories/partner.repository';
 import { PersonRepository } from 'src/repositories/person.repository';
 import { SearchRepository } from 'src/repositories/search.repository';
 import { SessionRepository } from 'src/repositories/session.repository';
+import { StorageRepository } from 'src/repositories/storage.repository';
 import { SyncRepository } from 'src/repositories/sync.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { UserRepository } from 'src/repositories/user.repository';
@@ -40,6 +42,7 @@ const sha256 = (value: string) => createHash('sha256').update(value).digest('bas
 
 // type Repositories = Omit<ServiceOverrides, 'access' | 'telemetry'>;
 type RepositoriesTypes = {
+  access: AccessRepository;
   activity: ActivityRepository;
   album: AlbumRepository;
   albumUser: AlbumUserRepository;
@@ -58,6 +61,7 @@ type RepositoriesTypes = {
   person: PersonRepository;
   search: SearchRepository;
   session: SessionRepository;
+  storage: StorageRepository;
   sync: SyncRepository;
   systemMetadata: SystemMetadataRepository;
   versionHistory: VersionHistoryRepository;
@@ -180,6 +184,10 @@ export const newMediumService = <R extends RepositoryOptions, S extends BaseServ
 
 export const getRepository = <K extends keyof RepositoriesTypes>(key: K, db: Kysely<DB>) => {
   switch (key) {
+    case 'access': {
+      return new AccessRepository(db);
+    }
+
     case 'activity': {
       return new ActivityRepository(db);
     }
@@ -352,6 +360,10 @@ const getRepositoryMock = <K extends keyof RepositoryMocks>(key: K) => {
       return automock(SessionRepository);
     }
 
+    case 'storage': {
+      return automock(StorageRepository, { args: [{ setContext: () => {} }] });
+    }
+
     case 'sync': {
       return automock(SyncRepository);
     }
@@ -411,7 +423,7 @@ export const asDeps = (repositories: ServiceOverrides) => {
     repositories.session || getRepositoryMock('session'),
     repositories.sharedLink,
     repositories.stack,
-    repositories.storage,
+    repositories.storage || getRepositoryMock('storage'),
     repositories.sync || getRepositoryMock('sync'),
     repositories.systemMetadata || getRepositoryMock('systemMetadata'),
     repositories.tag,
diff --git a/server/test/medium/specs/services/person.service.spec.ts b/server/test/medium/specs/services/person.service.spec.ts
new file mode 100644
index 0000000000..bd5eb5d543
--- /dev/null
+++ b/server/test/medium/specs/services/person.service.spec.ts
@@ -0,0 +1,90 @@
+import { Kysely } from 'kysely';
+import { DB } from 'src/db';
+import { PersonService } from 'src/services/person.service';
+import { mediumFactory, newMediumService } from 'test/medium.factory';
+import { factory } from 'test/small.factory';
+import { getKyselyDB } from 'test/utils';
+
+describe.concurrent(PersonService.name, () => {
+  let defaultDatabase: Kysely<DB>;
+
+  const createSut = (db?: Kysely<DB>) => {
+    return newMediumService(PersonService, {
+      database: db || defaultDatabase,
+      repos: {
+        access: 'real',
+        database: 'real',
+        person: 'real',
+        storage: 'mock',
+      },
+    });
+  };
+
+  beforeEach(async () => {
+    defaultDatabase = await getKyselyDB();
+  });
+
+  describe('delete', () => {
+    it('should throw an error when there is no access', async () => {
+      const { sut } = createSut();
+      const auth = factory.auth();
+      const personId = factory.uuid();
+      await expect(sut.delete(auth, personId)).rejects.toThrow('Not found or no person.delete access');
+    });
+
+    it('should delete the person', async () => {
+      const { sut, getRepository, mocks } = createSut();
+
+      const user = mediumFactory.userInsert();
+      const auth = factory.auth({ user });
+      const person = mediumFactory.personInsert({ ownerId: auth.user.id });
+      mocks.storage.unlink.mockResolvedValue();
+
+      const userRepo = getRepository('user');
+      await userRepo.create(user);
+
+      const personRepo = getRepository('person');
+      await personRepo.create(person);
+
+      await expect(personRepo.getById(person.id)).resolves.toEqual(expect.objectContaining({ id: person.id }));
+      await expect(sut.delete(auth, person.id)).resolves.toBeUndefined();
+      await expect(personRepo.getById(person.id)).resolves.toBeUndefined();
+
+      expect(mocks.storage.unlink).toHaveBeenCalledWith(person.thumbnailPath);
+    });
+  });
+
+  describe('deleteAll', () => {
+    it('should throw an error when there is no access', async () => {
+      const { sut } = createSut();
+      const auth = factory.auth();
+      const personId = factory.uuid();
+      await expect(sut.deleteAll(auth, { ids: [personId] })).rejects.toThrow('Not found or no person.delete access');
+    });
+
+    it('should delete the person', async () => {
+      const { sut, getRepository, mocks } = createSut();
+
+      const user = mediumFactory.userInsert();
+      const auth = factory.auth({ user });
+      const person1 = mediumFactory.personInsert({ ownerId: auth.user.id });
+      const person2 = mediumFactory.personInsert({ ownerId: auth.user.id });
+      mocks.storage.unlink.mockResolvedValue();
+
+      const userRepo = getRepository('user');
+      await userRepo.create(user);
+
+      const personRepo = getRepository('person');
+      await personRepo.create(person1);
+      await personRepo.create(person2);
+
+      await expect(sut.deleteAll(auth, { ids: [person1.id, person2.id] })).resolves.toBeUndefined();
+      await expect(personRepo.getById(person1.id)).resolves.toBeUndefined();
+      await expect(personRepo.getById(person2.id)).resolves.toBeUndefined();
+
+      expect(mocks.storage.unlink).toHaveBeenCalledTimes(2);
+      expect(mocks.storage.unlink).toHaveBeenCalledWith(person1.thumbnailPath);
+      expect(mocks.storage.unlink).toHaveBeenCalledWith(person2.thumbnailPath);
+    });
+  });
+});
diff --git a/server/test/repositories/person.repository.mock.ts b/server/test/repositories/person.repository.mock.ts
deleted file mode 100644
index 2875c9ada5..0000000000
--- a/server/test/repositories/person.repository.mock.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { PersonRepository } from 'src/repositories/person.repository';
-import { RepositoryInterface } from 'src/types';
-import { Mocked, vitest } from 'vitest';
-
-export const newPersonRepositoryMock = (): Mocked<RepositoryInterface<PersonRepository>> => {
-  return {
-    reassignFaces: vitest.fn(),
-    unassignFaces: vitest.fn(),
-    delete: vitest.fn(),
-    deleteFaces: vitest.fn(),
-    getAllFaces: vitest.fn(),
-    getAll: vitest.fn(),
-    getAllForUser: vitest.fn(),
-    getAllWithoutFaces: vitest.fn(),
-    getFaces: vitest.fn(),
-    getFaceById: vitest.fn(),
-    getFaceForFacialRecognitionJob: vitest.fn(),
-    getDataForThumbnailGenerationJob: vitest.fn(),
-    reassignFace: vitest.fn(),
-    getById: vitest.fn(),
-    getByName: vitest.fn(),
-    getDistinctNames: vitest.fn(),
-    getStatistics: vitest.fn(),
-    getNumberOfPeople: vitest.fn(),
-    create: vitest.fn(),
-    createAll: vitest.fn(),
-    refreshFaces: vitest.fn(),
-    update: vitest.fn(),
-    updateAll: vitest.fn(),
-    getFacesByIds: vitest.fn(),
-    getRandomFace: vitest.fn(),
-    getLatestFaceDate: vitest.fn(),
-    createAssetFace: vitest.fn(),
-    deleteAssetFace: vitest.fn(),
-    softDeleteAssetFaces: vitest.fn(),
-    vacuum: vitest.fn(),
-  };
-};
diff --git a/server/test/utils.ts b/server/test/utils.ts
index 9f3d3f120d..0e07e603b5 100644
--- a/server/test/utils.ts
+++ b/server/test/utils.ts
@@ -67,7 +67,6 @@ import { newDatabaseRepositoryMock } from 'test/repositories/database.repository
 import { newJobRepositoryMock } from 'test/repositories/job.repository.mock';
 import { newMediaRepositoryMock } from 'test/repositories/media.repository.mock';
 import { newMetadataRepositoryMock } from 'test/repositories/metadata.repository.mock';
-import { newPersonRepositoryMock } from 'test/repositories/person.repository.mock';
 import { newStorageRepositoryMock } from 'test/repositories/storage.repository.mock';
 import { newSystemMetadataRepositoryMock } from 'test/repositories/system-metadata.repository.mock';
 import { ITelemetryRepositoryMock, newTelemetryRepositoryMock } from 'test/repositories/telemetry.repository.mock';
@@ -278,7 +277,7 @@ export const newTestService = <T extends BaseService>(
     notification: automock(NotificationRepository),
     oauth: automock(OAuthRepository, { args: [loggerMock] }),
     partner: automock(PartnerRepository, { strict: false }),
-    person: newPersonRepositoryMock(),
+    person: automock(PersonRepository, { strict: false }),
     process: automock(ProcessRepository),
     search: automock(SearchRepository, { strict: false }),
     // eslint-disable-next-line no-sparse-arrays

From 027c4a8b347ee6486539ffdedc70ca941774f8bc Mon Sep 17 00:00:00 2001
From: Zack Pollard <zack@futo.org>
Date: Wed, 25 Jun 2025 16:40:53 +0100
Subject: [PATCH 049/337] ci: much faster mobile builds (#19490)

---
 .github/workflows/build-mobile.yml | 57 +++++++++++++++++++++++++-----
 mobile/android/gradle.properties   |  4 ++-
 2 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index 4dac0ce04f..e7c6d60182 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -58,7 +58,7 @@ jobs:
       contents: read
     # Skip when PR from a fork
     if: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' && needs.pre-job.outputs.should_run == 'true' }}
-    runs-on: macos-14
+    runs-on: mich
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -66,11 +66,34 @@ jobs:
           ref: ${{ inputs.ref || github.sha }}
           persist-credentials: false
 
+      - name: Install missing deps
+        run: |
+          sudo add-apt-repository ppa:rmescandon/yq
+          sudo apt-get update
+          sudo apt-get install -y yq xz-utils ninja-build zstd
+
+      - name: Create the Keystore
+        env:
+          KEY_JKS: ${{ secrets.KEY_JKS }}
+        working-directory: ./mobile
+        run: printf "%s" $KEY_JKS | base64 -d > android/key.jks
+
       - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: 'zulu'
           java-version: '17'
-          cache: 'gradle'
+
+      - name: Restore Gradle Cache
+        id: cache-gradle-restore
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.android/sdk
+            mobile/android/.gradle
+            mobile/.dart_tool
+          key: build-mobile-gradle-${{ runner.os }}-main
 
       - name: Setup Flutter SDK
         uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
@@ -79,11 +102,10 @@ jobs:
           flutter-version-file: ./mobile/pubspec.yaml
           cache: true
 
-      - name: Create the Keystore
-        env:
-          KEY_JKS: ${{ secrets.KEY_JKS }}
-        working-directory: ./mobile
-        run: echo $KEY_JKS | base64 -d > android/key.jks
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
+        with:
+          packages: ''
 
       - name: Get Packages
         working-directory: ./mobile
@@ -104,11 +126,28 @@ jobs:
           ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
           ANDROID_STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }}
         run: |
-          flutter build apk --release
-          flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64
+          if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+            flutter build apk --release
+            flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64
+          else
+            flutter build apk --debug --split-per-abi --target-platform android-arm64
+          fi
 
       - name: Publish Android Artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: release-apk-signed
           path: mobile/build/app/outputs/flutter-apk/*.apk
+
+      - name: Save Gradle Cache
+        id: cache-gradle-save
+        uses: actions/cache/save@v4
+        if: github.ref == 'refs/heads/main'
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.android/sdk
+            mobile/android/.gradle
+            mobile/.dart_tool
+          key: ${{ steps.cache-gradle-restore.outputs.cache-primary-key }}
diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties
index 78c37cc2a3..f63dcd33e1 100644
--- a/mobile/android/gradle.properties
+++ b/mobile/android/gradle.properties
@@ -2,4 +2,6 @@ org.gradle.jvmargs=-Xmx4096M
 android.useAndroidX=true
 android.enableJetifier=true
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonFinalResIds=false
+org.gradle.caching=true
+org.gradle.parallel=true

From afb444c92c867277cc8864106ed4ef5b51db5dd2 Mon Sep 17 00:00:00 2001
From: Zack Pollard <zack@futo.org>
Date: Wed, 25 Jun 2025 16:53:08 +0100
Subject: [PATCH 050/337] fix: only pass in is_main flag to mobile build for
 zizmor (#19525)

---
 .github/workflows/build-mobile.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index e7c6d60182..5c26965161 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -125,8 +125,9 @@ jobs:
           ALIAS: ${{ secrets.ALIAS }}
           ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
           ANDROID_STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }}
+          IS_MAIN: ${{ github.ref == 'refs/heads/main' }}
         run: |
-          if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+          if [[ $IS_MAIN == 'true' ]]; then
             flutter build apk --release
             flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64
           else

From b001ba44f5131513506c194103869f7c2f6034c5 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Wed, 25 Jun 2025 11:08:02 -0500
Subject: [PATCH 051/337] feat: generic control bottom app bar (#19524)

* feat: sliver appbar

* feat: snapping segment

* Date label font size

* lint

* fix: scrollController reinitialize multiple times

* feat: tab navigation

* chore: refactor to private widget

* feat: new control bottom app bar

* bad merge

* feat: sliver control bottom app bar
---
 .../base_action_button.widget.dart            |  47 +++++++
 .../share_action_button.widget.dart           |  19 +++
 .../base_bottom_sheet.widget.dart             | 126 ++++++++++++++++++
 .../home_bottom_app_bar.widget.dart           |  17 +++
 .../widgets/timeline/scrubber.widget.dart     |  33 +++--
 .../widgets/timeline/timeline.state.dart      |  28 +++-
 .../widgets/timeline/timeline.widget.dart     |   5 +-
 7 files changed, 255 insertions(+), 20 deletions(-)
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart

diff --git a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
new file mode 100644
index 0000000000..8ea43b8781
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+
+class BaseActionButton extends StatelessWidget {
+  const BaseActionButton({
+    super.key,
+    required this.label,
+    required this.iconData,
+    this.onPressed,
+    this.onLongPressed,
+  });
+
+  final String label;
+  final IconData iconData;
+  final void Function()? onPressed;
+  final void Function()? onLongPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    final minWidth =
+        context.isMobile ? MediaQuery.sizeOf(context).width / 4.5 : 75.0;
+
+    return MaterialButton(
+      padding: const EdgeInsets.all(10),
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(Radius.circular(20)),
+      ),
+      onPressed: onPressed,
+      onLongPress: onLongPressed,
+      minWidth: minWidth,
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          Icon(iconData, size: 24),
+          const SizedBox(height: 8),
+          Text(
+            label,
+            style: const TextStyle(fontSize: 14.0, fontWeight: FontWeight.w400),
+            maxLines: 3,
+            textAlign: TextAlign.center,
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
new file mode 100644
index 0000000000..4e6b6e2af4
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
@@ -0,0 +1,19 @@
+import 'dart:io';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class ShareActionButton extends ConsumerWidget {
+  const ShareActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData:
+          Platform.isAndroid ? Icons.share_rounded : Icons.ios_share_rounded,
+      label: context.tr('share'),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
new file mode 100644
index 0000000000..d041bca514
--- /dev/null
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
@@ -0,0 +1,126 @@
+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/presentation/widgets/timeline/timeline.state.dart';
+
+class BaseBottomSheet extends ConsumerStatefulWidget {
+  final List<Widget> actions;
+  final DraggableScrollableController? controller;
+  final List<Widget>? slivers;
+  final double initialChildSize;
+  final double minChildSize;
+  final double maxChildSize;
+  final bool expand;
+  final bool shouldCloseOnMinExtent;
+  final bool resizeOnScroll;
+
+  const BaseBottomSheet({
+    super.key,
+    required this.actions,
+    this.slivers,
+    this.controller,
+    this.initialChildSize = 0.35,
+    this.minChildSize = 0.15,
+    this.maxChildSize = 0.65,
+    this.expand = true,
+    this.shouldCloseOnMinExtent = true,
+    this.resizeOnScroll = true,
+  });
+
+  @override
+  ConsumerState<BaseBottomSheet> createState() =>
+      _BaseDraggableScrollableSheetState();
+}
+
+class _BaseDraggableScrollableSheetState
+    extends ConsumerState<BaseBottomSheet> {
+  late DraggableScrollableController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = widget.controller ?? DraggableScrollableController();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    ref.listen(timelineStateProvider, (previous, next) {
+      if (!widget.resizeOnScroll) {
+        return;
+      }
+
+      if (previous?.isInteracting != true && next.isInteracting) {
+        _controller.animateTo(
+          widget.minChildSize,
+          duration: const Duration(milliseconds: 200),
+          curve: Curves.easeInOut,
+        );
+      }
+    });
+
+    return DraggableScrollableSheet(
+      controller: _controller,
+      initialChildSize: widget.initialChildSize,
+      minChildSize: widget.minChildSize,
+      maxChildSize: widget.maxChildSize,
+      snap: false,
+      expand: widget.expand,
+      shouldCloseOnMinExtent: widget.shouldCloseOnMinExtent,
+      builder: (BuildContext context, ScrollController scrollController) {
+        return Card(
+          color: context.colorScheme.surfaceContainerHigh,
+          surfaceTintColor: context.colorScheme.surfaceContainerHigh,
+          borderOnForeground: false,
+          clipBehavior: Clip.antiAlias,
+          elevation: 6.0,
+          shape: const RoundedRectangleBorder(
+            borderRadius: BorderRadius.only(
+              topLeft: Radius.circular(6),
+              topRight: Radius.circular(6),
+            ),
+          ),
+          margin: const EdgeInsets.symmetric(horizontal: 0),
+          child: CustomScrollView(
+            controller: scrollController,
+            slivers: [
+              SliverToBoxAdapter(
+                child: Column(
+                  children: [
+                    const SizedBox(height: 16),
+                    const _DragHandle(),
+                    const SizedBox(height: 16),
+                    SizedBox(
+                      height: 120,
+                      child: ListView(
+                        shrinkWrap: true,
+                        scrollDirection: Axis.horizontal,
+                        children: widget.actions,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              ...(widget.slivers ?? []),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _DragHandle extends StatelessWidget {
+  const _DragHandle();
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: 6,
+      width: 32,
+      decoration: BoxDecoration(
+        color: context.themeData.dividerColor,
+        borderRadius: const BorderRadius.all(Radius.circular(20)),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
new file mode 100644
index 0000000000..c29149df85
--- /dev/null
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart';
+
+class HomeBottomAppBar extends ConsumerWidget {
+  const HomeBottomAppBar({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return const BaseBottomSheet(
+      actions: [
+        ShareActionButton(),
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
index 63f8f9926a..e660f77767 100644
--- a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
@@ -13,7 +13,7 @@ import 'package:intl/intl.dart' hide TextDirection;
 
 /// A widget that will display a BoxScrollView with a ScrollThumb that can be dragged
 /// for quick navigation of the BoxScrollView.
-class Scrubber extends StatefulWidget {
+class Scrubber extends ConsumerStatefulWidget {
   /// The view that will be scrolled with the scroll thumb
   final CustomScrollView child;
 
@@ -37,7 +37,7 @@ class Scrubber extends StatefulWidget {
   }) : assert(child.scrollDirection == Axis.vertical);
 
   @override
-  State createState() => ScrubberState();
+  ConsumerState createState() => ScrubberState();
 }
 
 List<_Segment> _buildSegments({
@@ -82,7 +82,8 @@ List<_Segment> _buildSegments({
   return segments;
 }
 
-class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
+class ScrubberState extends ConsumerState<Scrubber>
+    with TickerProviderStateMixin {
   double _thumbTopOffset = 0.0;
   bool _isDragging = false;
   List<_Segment> _segments = [];
@@ -175,6 +176,13 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
       return false;
     }
 
+    if (notification is ScrollStartNotification ||
+        notification is ScrollUpdateNotification) {
+      ref.read(timelineStateProvider.notifier).setScrolling(true);
+    } else if (notification is ScrollEndNotification) {
+      ref.read(timelineStateProvider.notifier).setScrolling(false);
+    }
+
     setState(() {
       if (notification is ScrollUpdateNotification) {
         _thumbTopOffset = _currentOffset;
@@ -191,7 +199,7 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
     return false;
   }
 
-  void _onDragStart(WidgetRef ref) {
+  void _onDragStart(DragStartDetails _) {
     ref.read(timelineStateProvider.notifier).setScrubbing(true);
     setState(() {
       _isDragging = true;
@@ -293,10 +301,12 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
     _scrollController.jumpTo(centeredOffset.clamp(0.0, maxScrollExtent));
   }
 
-  void _onDragEnd(WidgetRef ref) {
+  void _onDragEnd(DragEndDetails _) {
     ref.read(timelineStateProvider.notifier).setScrubbing(false);
     _labelAnimationController.reverse();
-    _isDragging = false;
+    setState(() {
+      _isDragging = false;
+    });
 
     _resetThumbTimer();
   }
@@ -342,13 +352,10 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
             top: _thumbTopOffset + widget.topPadding,
             end: 0,
             child: RepaintBoundary(
-              child: Consumer(
-                builder: (_, ref, child) => GestureDetector(
-                  onVerticalDragStart: (_) => _onDragStart(ref),
-                  onVerticalDragUpdate: _onDragUpdate,
-                  onVerticalDragEnd: (_) => _onDragEnd(ref),
-                  child: child,
-                ),
+              child: GestureDetector(
+                onVerticalDragStart: _onDragStart,
+                onVerticalDragUpdate: _onDragUpdate,
+                onVerticalDragEnd: _onDragEnd,
                 child: _Scrubber(
                   thumbAnimation: _thumbAnimation,
                   labelAnimation: _labelAnimation,
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.state.dart b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
index 6e38bf2ac1..629fac7831 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.state.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
@@ -40,19 +40,28 @@ class TimelineArgs {
 
 class TimelineState {
   final bool isScrubbing;
+  final bool isScrolling;
 
-  const TimelineState({this.isScrubbing = false});
+  const TimelineState({
+    this.isScrubbing = false,
+    this.isScrolling = false,
+  });
+
+  bool get isInteracting => isScrubbing || isScrolling;
 
   @override
   bool operator ==(covariant TimelineState other) {
-    return isScrubbing == other.isScrubbing;
+    return isScrubbing == other.isScrubbing && isScrolling == other.isScrolling;
   }
 
   @override
-  int get hashCode => isScrubbing.hashCode;
+  int get hashCode => isScrubbing.hashCode ^ isScrolling.hashCode;
 
-  TimelineState copyWith({bool? isScrubbing}) {
-    return TimelineState(isScrubbing: isScrubbing ?? this.isScrubbing);
+  TimelineState copyWith({bool? isScrubbing, bool? isScrolling}) {
+    return TimelineState(
+      isScrubbing: isScrubbing ?? this.isScrubbing,
+      isScrolling: isScrolling ?? this.isScrolling,
+    );
   }
 }
 
@@ -63,8 +72,15 @@ class TimelineStateNotifier extends Notifier<TimelineState> {
     state = state.copyWith(isScrubbing: isScrubbing);
   }
 
+  void setScrolling(bool isScrolling) {
+    state = state.copyWith(isScrolling: isScrolling);
+  }
+
   @override
-  TimelineState build() => const TimelineState(isScrubbing: false);
+  TimelineState build() => const TimelineState(
+        isScrubbing: false,
+        isScrolling: false,
+      );
 }
 
 // This provider watches the buckets from the timeline service & args and serves the segments.
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 109c4e0de0..688675c686 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -8,6 +8,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
@@ -120,12 +121,14 @@ class _SliverTimelineState extends State<_SliverTimeline> {
                       ],
                     ),
                   ),
-                  if (isMultiSelectEnabled)
+                  if (isMultiSelectEnabled) ...[
                     const Positioned(
                       top: 60,
                       left: 25,
                       child: _MultiSelectStatusButton(),
                     ),
+                    const HomeBottomAppBar(),
+                  ],
                 ],
               ),
             );

From 881a96cdf99cadc30d4b247883dfcecce8a9d80b Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Wed, 25 Jun 2025 12:10:31 -0400
Subject: [PATCH 052/337] feat: add album asset sync (#19503)

wip: fix album asset exif and some other refactorings

feat: add album assets sync

feat: album to assets relation sync

Co-authored-by: Zack Pollard <zackpollard@ymail.com>
---
 mobile/openapi/README.md                      |   1 +
 mobile/openapi/lib/api.dart                   |   1 +
 mobile/openapi/lib/api_client.dart            |   2 +
 .../lib/model/sync_album_to_asset_v1.dart     | 107 ++++++
 .../openapi/lib/model/sync_entity_type.dart   |  21 ++
 .../openapi/lib/model/sync_request_type.dart  |   9 +
 open-api/immich-openapi-specs.json            |  31 +-
 open-api/typescript-sdk/src/fetch-client.ts   |  12 +-
 server/src/database.ts                        |  35 +-
 server/src/db.d.ts                            |  10 +
 server/src/dtos/sync.dto.ts                   |  23 +-
 server/src/enum.ts                            |  10 +
 server/src/queries/sync.repository.sql        | 310 +++++++++++++---
 server/src/repositories/sync.repository.ts    | 146 +++++++-
 server/src/schema/functions.ts                |  14 +
 server/src/schema/index.ts                    |   2 +
 .../1750676477029-AlbumAssetUpdateId.ts       |  18 +
 .../1750694237564-AlbumAssetAuditTable.ts     |  22 ++
 ...0780093818-AddAlbumToAssetDeleteTrigger.ts |  28 ++
 .../schema/tables/album-asset-audit.table.ts  |  23 ++
 server/src/schema/tables/album-asset.table.ts |  18 +-
 server/src/services/sync.service.ts           | 163 +++++++-
 .../specs/sync/sync-album-asset-exif.spec.ts  | 222 +++++++++++
 .../specs/sync/sync-album-asset.spec.ts       | 218 +++++++++++
 .../specs/sync/sync-album-to-asset.spec.ts    | 350 ++++++++++++++++++
 25 files changed, 1706 insertions(+), 90 deletions(-)
 create mode 100644 mobile/openapi/lib/model/sync_album_to_asset_v1.dart
 create mode 100644 server/src/schema/migrations/1750676477029-AlbumAssetUpdateId.ts
 create mode 100644 server/src/schema/migrations/1750694237564-AlbumAssetAuditTable.ts
 create mode 100644 server/src/schema/migrations/1750780093818-AddAlbumToAssetDeleteTrigger.ts
 create mode 100644 server/src/schema/tables/album-asset-audit.table.ts
 create mode 100644 server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
 create mode 100644 server/test/medium/specs/sync/sync-album-asset.spec.ts
 create mode 100644 server/test/medium/specs/sync/sync-album-to-asset.spec.ts

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 590e45f04b..238a19e5d1 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -466,6 +466,7 @@ Class | Method | HTTP request | Description
  - [SyncAckDto](doc//SyncAckDto.md)
  - [SyncAckSetDto](doc//SyncAckSetDto.md)
  - [SyncAlbumDeleteV1](doc//SyncAlbumDeleteV1.md)
+ - [SyncAlbumToAssetV1](doc//SyncAlbumToAssetV1.md)
  - [SyncAlbumUserDeleteV1](doc//SyncAlbumUserDeleteV1.md)
  - [SyncAlbumUserV1](doc//SyncAlbumUserV1.md)
  - [SyncAlbumV1](doc//SyncAlbumV1.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index 573081503f..b9649b0ba3 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -249,6 +249,7 @@ part 'model/sync_ack_delete_dto.dart';
 part 'model/sync_ack_dto.dart';
 part 'model/sync_ack_set_dto.dart';
 part 'model/sync_album_delete_v1.dart';
+part 'model/sync_album_to_asset_v1.dart';
 part 'model/sync_album_user_delete_v1.dart';
 part 'model/sync_album_user_v1.dart';
 part 'model/sync_album_v1.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 28b67f52c5..dd37b628ab 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -554,6 +554,8 @@ class ApiClient {
           return SyncAckSetDto.fromJson(value);
         case 'SyncAlbumDeleteV1':
           return SyncAlbumDeleteV1.fromJson(value);
+        case 'SyncAlbumToAssetV1':
+          return SyncAlbumToAssetV1.fromJson(value);
         case 'SyncAlbumUserDeleteV1':
           return SyncAlbumUserDeleteV1.fromJson(value);
         case 'SyncAlbumUserV1':
diff --git a/mobile/openapi/lib/model/sync_album_to_asset_v1.dart b/mobile/openapi/lib/model/sync_album_to_asset_v1.dart
new file mode 100644
index 0000000000..6908f320f8
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_album_to_asset_v1.dart
@@ -0,0 +1,107 @@
+//
+// 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 SyncAlbumToAssetV1 {
+  /// Returns a new [SyncAlbumToAssetV1] instance.
+  SyncAlbumToAssetV1({
+    required this.albumId,
+    required this.assetId,
+  });
+
+  String albumId;
+
+  String assetId;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncAlbumToAssetV1 &&
+    other.albumId == albumId &&
+    other.assetId == assetId;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (albumId.hashCode) +
+    (assetId.hashCode);
+
+  @override
+  String toString() => 'SyncAlbumToAssetV1[albumId=$albumId, assetId=$assetId]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'albumId'] = this.albumId;
+      json[r'assetId'] = this.assetId;
+    return json;
+  }
+
+  /// Returns a new [SyncAlbumToAssetV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncAlbumToAssetV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncAlbumToAssetV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncAlbumToAssetV1(
+        albumId: mapValueOfType<String>(json, r'albumId')!,
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncAlbumToAssetV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncAlbumToAssetV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncAlbumToAssetV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncAlbumToAssetV1> mapFromJson(dynamic json) {
+    final map = <String, SyncAlbumToAssetV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncAlbumToAssetV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncAlbumToAssetV1-objects as value to a dart map
+  static Map<String, List<SyncAlbumToAssetV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncAlbumToAssetV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncAlbumToAssetV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'albumId',
+    'assetId',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_entity_type.dart b/mobile/openapi/lib/model/sync_entity_type.dart
index 654ff45d6f..7129ebc0a4 100644
--- a/mobile/openapi/lib/model/sync_entity_type.dart
+++ b/mobile/openapi/lib/model/sync_entity_type.dart
@@ -40,6 +40,13 @@ class SyncEntityType {
   static const albumUserV1 = SyncEntityType._(r'AlbumUserV1');
   static const albumUserBackfillV1 = SyncEntityType._(r'AlbumUserBackfillV1');
   static const albumUserDeleteV1 = SyncEntityType._(r'AlbumUserDeleteV1');
+  static const albumAssetV1 = SyncEntityType._(r'AlbumAssetV1');
+  static const albumAssetBackfillV1 = SyncEntityType._(r'AlbumAssetBackfillV1');
+  static const albumAssetExifV1 = SyncEntityType._(r'AlbumAssetExifV1');
+  static const albumAssetExifBackfillV1 = SyncEntityType._(r'AlbumAssetExifBackfillV1');
+  static const albumToAssetV1 = SyncEntityType._(r'AlbumToAssetV1');
+  static const albumToAssetDeleteV1 = SyncEntityType._(r'AlbumToAssetDeleteV1');
+  static const albumToAssetBackfillV1 = SyncEntityType._(r'AlbumToAssetBackfillV1');
   static const syncAckV1 = SyncEntityType._(r'SyncAckV1');
 
   /// List of all possible values in this [enum][SyncEntityType].
@@ -61,6 +68,13 @@ class SyncEntityType {
     albumUserV1,
     albumUserBackfillV1,
     albumUserDeleteV1,
+    albumAssetV1,
+    albumAssetBackfillV1,
+    albumAssetExifV1,
+    albumAssetExifBackfillV1,
+    albumToAssetV1,
+    albumToAssetDeleteV1,
+    albumToAssetBackfillV1,
     syncAckV1,
   ];
 
@@ -117,6 +131,13 @@ class SyncEntityTypeTypeTransformer {
         case r'AlbumUserV1': return SyncEntityType.albumUserV1;
         case r'AlbumUserBackfillV1': return SyncEntityType.albumUserBackfillV1;
         case r'AlbumUserDeleteV1': return SyncEntityType.albumUserDeleteV1;
+        case r'AlbumAssetV1': return SyncEntityType.albumAssetV1;
+        case r'AlbumAssetBackfillV1': return SyncEntityType.albumAssetBackfillV1;
+        case r'AlbumAssetExifV1': return SyncEntityType.albumAssetExifV1;
+        case r'AlbumAssetExifBackfillV1': return SyncEntityType.albumAssetExifBackfillV1;
+        case r'AlbumToAssetV1': return SyncEntityType.albumToAssetV1;
+        case r'AlbumToAssetDeleteV1': return SyncEntityType.albumToAssetDeleteV1;
+        case r'AlbumToAssetBackfillV1': return SyncEntityType.albumToAssetBackfillV1;
         case r'SyncAckV1': return SyncEntityType.syncAckV1;
         default:
           if (!allowNull) {
diff --git a/mobile/openapi/lib/model/sync_request_type.dart b/mobile/openapi/lib/model/sync_request_type.dart
index c149c329de..c3cce99b1a 100644
--- a/mobile/openapi/lib/model/sync_request_type.dart
+++ b/mobile/openapi/lib/model/sync_request_type.dart
@@ -31,6 +31,9 @@ class SyncRequestType {
   static const partnerAssetExifsV1 = SyncRequestType._(r'PartnerAssetExifsV1');
   static const albumsV1 = SyncRequestType._(r'AlbumsV1');
   static const albumUsersV1 = SyncRequestType._(r'AlbumUsersV1');
+  static const albumToAssetsV1 = SyncRequestType._(r'AlbumToAssetsV1');
+  static const albumAssetsV1 = SyncRequestType._(r'AlbumAssetsV1');
+  static const albumAssetExifsV1 = SyncRequestType._(r'AlbumAssetExifsV1');
 
   /// List of all possible values in this [enum][SyncRequestType].
   static const values = <SyncRequestType>[
@@ -42,6 +45,9 @@ class SyncRequestType {
     partnerAssetExifsV1,
     albumsV1,
     albumUsersV1,
+    albumToAssetsV1,
+    albumAssetsV1,
+    albumAssetExifsV1,
   ];
 
   static SyncRequestType? fromJson(dynamic value) => SyncRequestTypeTypeTransformer().decode(value);
@@ -88,6 +94,9 @@ class SyncRequestTypeTypeTransformer {
         case r'PartnerAssetExifsV1': return SyncRequestType.partnerAssetExifsV1;
         case r'AlbumsV1': return SyncRequestType.albumsV1;
         case r'AlbumUsersV1': return SyncRequestType.albumUsersV1;
+        case r'AlbumToAssetsV1': return SyncRequestType.albumToAssetsV1;
+        case r'AlbumAssetsV1': return SyncRequestType.albumAssetsV1;
+        case r'AlbumAssetExifsV1': return SyncRequestType.albumAssetExifsV1;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index c436f81953..b63b50338b 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13435,6 +13435,10 @@
         ],
         "type": "object"
       },
+      "SyncAckV1": {
+        "properties": {},
+        "type": "object"
+      },
       "SyncAlbumDeleteV1": {
         "properties": {
           "albumId": {
@@ -13446,6 +13450,21 @@
         ],
         "type": "object"
       },
+      "SyncAlbumToAssetV1": {
+        "properties": {
+          "albumId": {
+            "type": "string"
+          },
+          "assetId": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "albumId",
+          "assetId"
+        ],
+        "type": "object"
+      },
       "SyncAlbumUserDeleteV1": {
         "properties": {
           "albumId": {
@@ -13774,6 +13793,13 @@
           "AlbumUserV1",
           "AlbumUserBackfillV1",
           "AlbumUserDeleteV1",
+          "AlbumAssetV1",
+          "AlbumAssetBackfillV1",
+          "AlbumAssetExifV1",
+          "AlbumAssetExifBackfillV1",
+          "AlbumToAssetV1",
+          "AlbumToAssetDeleteV1",
+          "AlbumToAssetBackfillV1",
           "SyncAckV1"
         ],
         "type": "string"
@@ -13821,7 +13847,10 @@
           "PartnerAssetsV1",
           "PartnerAssetExifsV1",
           "AlbumsV1",
-          "AlbumUsersV1"
+          "AlbumUsersV1",
+          "AlbumToAssetsV1",
+          "AlbumAssetsV1",
+          "AlbumAssetExifsV1"
         ],
         "type": "string"
       },
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index ff8ea67a18..5b94834105 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -4078,6 +4078,13 @@ export enum SyncEntityType {
     AlbumUserV1 = "AlbumUserV1",
     AlbumUserBackfillV1 = "AlbumUserBackfillV1",
     AlbumUserDeleteV1 = "AlbumUserDeleteV1",
+    AlbumAssetV1 = "AlbumAssetV1",
+    AlbumAssetBackfillV1 = "AlbumAssetBackfillV1",
+    AlbumAssetExifV1 = "AlbumAssetExifV1",
+    AlbumAssetExifBackfillV1 = "AlbumAssetExifBackfillV1",
+    AlbumToAssetV1 = "AlbumToAssetV1",
+    AlbumToAssetDeleteV1 = "AlbumToAssetDeleteV1",
+    AlbumToAssetBackfillV1 = "AlbumToAssetBackfillV1",
     SyncAckV1 = "SyncAckV1"
 }
 export enum SyncRequestType {
@@ -4088,7 +4095,10 @@ export enum SyncRequestType {
     PartnerAssetsV1 = "PartnerAssetsV1",
     PartnerAssetExifsV1 = "PartnerAssetExifsV1",
     AlbumsV1 = "AlbumsV1",
-    AlbumUsersV1 = "AlbumUsersV1"
+    AlbumUsersV1 = "AlbumUsersV1",
+    AlbumToAssetsV1 = "AlbumToAssetsV1",
+    AlbumAssetsV1 = "AlbumAssetsV1",
+    AlbumAssetExifsV1 = "AlbumAssetExifsV1"
 }
 export enum TranscodeHWAccel {
     Nvenc = "nvenc",
diff --git a/server/src/database.ts b/server/src/database.ts
index 1cddda1ee6..8a3c3b702b 100644
--- a/server/src/database.ts
+++ b/server/src/database.ts
@@ -340,27 +340,21 @@ export const columns = {
   apiKey: ['id', 'name', 'userId', 'createdAt', 'updatedAt', 'permissions'],
   notification: ['id', 'createdAt', 'level', 'type', 'title', 'description', 'data', 'readAt'],
   syncAsset: [
-    'id',
-    'ownerId',
-    'originalFileName',
-    'thumbhash',
-    'checksum',
-    'fileCreatedAt',
-    'fileModifiedAt',
-    'localDateTime',
-    'type',
-    'deletedAt',
-    'isFavorite',
-    'visibility',
-    'updateId',
-    'duration',
-  ],
-  syncAlbumUser: [
-    'albums_shared_users_users.albumsId as albumId',
-    'albums_shared_users_users.usersId as userId',
-    'albums_shared_users_users.role',
-    'albums_shared_users_users.updateId',
+    'assets.id',
+    'assets.ownerId',
+    'assets.originalFileName',
+    'assets.thumbhash',
+    'assets.checksum',
+    'assets.fileCreatedAt',
+    'assets.fileModifiedAt',
+    'assets.localDateTime',
+    'assets.type',
+    'assets.deletedAt',
+    'assets.isFavorite',
+    'assets.visibility',
+    'assets.duration',
   ],
+  syncAlbumUser: ['album_users.albumsId as albumId', 'album_users.usersId as userId', 'album_users.role'],
   stack: ['stack.id', 'stack.primaryAssetId', 'ownerId'],
   syncAssetExif: [
     'exif.assetId',
@@ -388,7 +382,6 @@ export const columns = {
     'exif.profileDescription',
     'exif.rating',
     'exif.fps',
-    'exif.updateId',
   ],
   exif: [
     'exif.assetId',
diff --git a/server/src/db.d.ts b/server/src/db.d.ts
index 7a4c319d0b..3fcf4ddea7 100644
--- a/server/src/db.d.ts
+++ b/server/src/db.d.ts
@@ -92,6 +92,15 @@ export interface AlbumsAssetsAssets {
   albumsId: string;
   assetsId: string;
   createdAt: Generated<Timestamp>;
+  updatedAt: Generated<Timestamp>;
+  updateId: Generated<string>;
+}
+
+export interface AlbumAssetsAudit {
+  deletedAt: Generated<Timestamp>;
+  id: Generated<string>;
+  albumId: string;
+  assetId: string;
 }
 
 export interface AlbumsSharedUsersUsers {
@@ -487,6 +496,7 @@ export interface DB {
   albums: Albums;
   albums_audit: AlbumsAudit;
   albums_assets_assets: AlbumsAssetsAssets;
+  album_assets_audit: AlbumAssetsAudit;
   albums_shared_users_users: AlbumsSharedUsersUsers;
   album_users_audit: AlbumUsersAudit;
   api_keys: ApiKeys;
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index 91c93fef66..b552f52a31 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -145,6 +145,18 @@ export class SyncAlbumV1 {
   order!: AssetOrder;
 }
 
+export class SyncAlbumToAssetV1 {
+  albumId!: string;
+  assetId!: string;
+}
+
+export class SyncAlbumToAssetDeleteV1 {
+  albumId!: string;
+  assetId!: string;
+}
+
+export class SyncAckV1 {}
+
 export type SyncItem = {
   [SyncEntityType.UserV1]: SyncUserV1;
   [SyncEntityType.UserDeleteV1]: SyncUserDeleteV1;
@@ -163,7 +175,14 @@ export type SyncItem = {
   [SyncEntityType.AlbumUserV1]: SyncAlbumUserV1;
   [SyncEntityType.AlbumUserBackfillV1]: SyncAlbumUserV1;
   [SyncEntityType.AlbumUserDeleteV1]: SyncAlbumUserDeleteV1;
-  [SyncEntityType.SyncAckV1]: object;
+  [SyncEntityType.AlbumAssetV1]: SyncAssetV1;
+  [SyncEntityType.AlbumAssetBackfillV1]: SyncAssetV1;
+  [SyncEntityType.AlbumAssetExifV1]: SyncAssetExifV1;
+  [SyncEntityType.AlbumAssetExifBackfillV1]: SyncAssetExifV1;
+  [SyncEntityType.AlbumToAssetV1]: SyncAlbumToAssetV1;
+  [SyncEntityType.AlbumToAssetBackfillV1]: SyncAlbumToAssetV1;
+  [SyncEntityType.AlbumToAssetDeleteV1]: SyncAlbumToAssetDeleteV1;
+  [SyncEntityType.SyncAckV1]: SyncAckV1;
 };
 
 const responseDtos = [
@@ -178,6 +197,8 @@ const responseDtos = [
   SyncAlbumDeleteV1,
   SyncAlbumUserV1,
   SyncAlbumUserDeleteV1,
+  SyncAlbumToAssetV1,
+  SyncAckV1,
 ];
 
 export const extraSyncModels = responseDtos;
diff --git a/server/src/enum.ts b/server/src/enum.ts
index 4f3fd9a521..bbe8f001de 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -581,6 +581,9 @@ export enum SyncRequestType {
   PartnerAssetExifsV1 = 'PartnerAssetExifsV1',
   AlbumsV1 = 'AlbumsV1',
   AlbumUsersV1 = 'AlbumUsersV1',
+  AlbumToAssetsV1 = 'AlbumToAssetsV1',
+  AlbumAssetsV1 = 'AlbumAssetsV1',
+  AlbumAssetExifsV1 = 'AlbumAssetExifsV1',
 }
 
 export enum SyncEntityType {
@@ -605,6 +608,13 @@ export enum SyncEntityType {
   AlbumUserV1 = 'AlbumUserV1',
   AlbumUserBackfillV1 = 'AlbumUserBackfillV1',
   AlbumUserDeleteV1 = 'AlbumUserDeleteV1',
+  AlbumAssetV1 = 'AlbumAssetV1',
+  AlbumAssetBackfillV1 = 'AlbumAssetBackfillV1',
+  AlbumAssetExifV1 = 'AlbumAssetExifV1',
+  AlbumAssetExifBackfillV1 = 'AlbumAssetExifBackfillV1',
+  AlbumToAssetV1 = 'AlbumToAssetV1',
+  AlbumToAssetDeleteV1 = 'AlbumToAssetDeleteV1',
+  AlbumToAssetBackfillV1 = 'AlbumToAssetBackfillV1',
 
   SyncAckV1 = 'SyncAckV1',
 }
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index 26aaf014d9..46b72ffca0 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -74,20 +74,20 @@ order by
 
 -- SyncRepository.getAssetUpserts
 select
-  "id",
-  "ownerId",
-  "originalFileName",
-  "thumbhash",
-  "checksum",
-  "fileCreatedAt",
-  "fileModifiedAt",
-  "localDateTime",
-  "type",
-  "deletedAt",
-  "isFavorite",
-  "visibility",
-  "updateId",
-  "duration"
+  "assets"."id",
+  "assets"."ownerId",
+  "assets"."originalFileName",
+  "assets"."thumbhash",
+  "assets"."checksum",
+  "assets"."fileCreatedAt",
+  "assets"."fileModifiedAt",
+  "assets"."localDateTime",
+  "assets"."type",
+  "assets"."deletedAt",
+  "assets"."isFavorite",
+  "assets"."visibility",
+  "assets"."duration",
+  "assets"."updateId"
 from
   "assets"
 where
@@ -111,20 +111,20 @@ order by
 
 -- SyncRepository.getPartnerAssetsBackfill
 select
-  "id",
-  "ownerId",
-  "originalFileName",
-  "thumbhash",
-  "checksum",
-  "fileCreatedAt",
-  "fileModifiedAt",
-  "localDateTime",
-  "type",
-  "deletedAt",
-  "isFavorite",
-  "visibility",
-  "updateId",
-  "duration"
+  "assets"."id",
+  "assets"."ownerId",
+  "assets"."originalFileName",
+  "assets"."thumbhash",
+  "assets"."checksum",
+  "assets"."fileCreatedAt",
+  "assets"."fileModifiedAt",
+  "assets"."localDateTime",
+  "assets"."type",
+  "assets"."deletedAt",
+  "assets"."isFavorite",
+  "assets"."visibility",
+  "assets"."duration",
+  "assets"."updateId"
 from
   "assets"
 where
@@ -137,20 +137,20 @@ order by
 
 -- SyncRepository.getPartnerAssetsUpserts
 select
-  "id",
-  "ownerId",
-  "originalFileName",
-  "thumbhash",
-  "checksum",
-  "fileCreatedAt",
-  "fileModifiedAt",
-  "localDateTime",
-  "type",
-  "deletedAt",
-  "isFavorite",
-  "visibility",
-  "updateId",
-  "duration"
+  "assets"."id",
+  "assets"."ownerId",
+  "assets"."originalFileName",
+  "assets"."thumbhash",
+  "assets"."checksum",
+  "assets"."fileCreatedAt",
+  "assets"."fileModifiedAt",
+  "assets"."localDateTime",
+  "assets"."type",
+  "assets"."deletedAt",
+  "assets"."isFavorite",
+  "assets"."visibility",
+  "assets"."duration",
+  "assets"."updateId"
 from
   "assets"
 where
@@ -365,6 +365,35 @@ where
 order by
   "albums"."updateId" asc
 
+-- SyncRepository.getAlbumToAssetDeletes
+select
+  "id",
+  "assetId",
+  "albumId"
+from
+  "album_assets_audit"
+where
+  "albumId" in (
+    select
+      "id"
+    from
+      "albums"
+    where
+      "ownerId" = $1
+    union
+    (
+      select
+        "albumUsers"."albumsId" as "id"
+      from
+        "albums_shared_users_users" as "albumUsers"
+      where
+        "albumUsers"."usersId" = $2
+    )
+  )
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
 -- SyncRepository.getAlbumUserDeletes
 select
   "id",
@@ -409,12 +438,12 @@ order by
 
 -- SyncRepository.getAlbumUsersBackfill
 select
-  "albums_shared_users_users"."albumsId" as "albumId",
-  "albums_shared_users_users"."usersId" as "userId",
-  "albums_shared_users_users"."role",
-  "albums_shared_users_users"."updateId"
+  "album_users"."albumsId" as "albumId",
+  "album_users"."usersId" as "userId",
+  "album_users"."role",
+  "album_users"."updateId"
 from
-  "albums_shared_users_users"
+  "albums_shared_users_users" as "album_users"
 where
   "albumsId" = $1
   and "updatedAt" < now() - interval '1 millisecond'
@@ -425,15 +454,15 @@ order by
 
 -- SyncRepository.getAlbumUserUpserts
 select
-  "albums_shared_users_users"."albumsId" as "albumId",
-  "albums_shared_users_users"."usersId" as "userId",
-  "albums_shared_users_users"."role",
-  "albums_shared_users_users"."updateId"
+  "album_users"."albumsId" as "albumId",
+  "album_users"."usersId" as "userId",
+  "album_users"."role",
+  "album_users"."updateId"
 from
-  "albums_shared_users_users"
+  "albums_shared_users_users" as "album_users"
 where
-  "albums_shared_users_users"."updatedAt" < now() - interval '1 millisecond'
-  and "albums_shared_users_users"."albumsId" in (
+  "album_users"."updatedAt" < now() - interval '1 millisecond'
+  and "album_users"."albumsId" in (
     select
       "id"
     from
@@ -451,4 +480,175 @@ where
     )
   )
 order by
-  "albums_shared_users_users"."updateId" asc
+  "album_users"."updateId" asc
+
+-- SyncRepository.getAlbumAssetsBackfill
+select
+  "assets"."id",
+  "assets"."ownerId",
+  "assets"."originalFileName",
+  "assets"."thumbhash",
+  "assets"."checksum",
+  "assets"."fileCreatedAt",
+  "assets"."fileModifiedAt",
+  "assets"."localDateTime",
+  "assets"."type",
+  "assets"."deletedAt",
+  "assets"."isFavorite",
+  "assets"."visibility",
+  "assets"."duration",
+  "assets"."updateId"
+from
+  "assets"
+  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "assets"."id"
+where
+  "album_assets"."albumsId" = $1
+  and "assets"."updatedAt" < now() - interval '1 millisecond'
+  and "assets"."updateId" <= $2
+  and "assets"."updateId" >= $3
+order by
+  "assets"."updateId" asc
+
+-- SyncRepository.getAlbumAssetsUpserts
+select
+  "assets"."id",
+  "assets"."ownerId",
+  "assets"."originalFileName",
+  "assets"."thumbhash",
+  "assets"."checksum",
+  "assets"."fileCreatedAt",
+  "assets"."fileModifiedAt",
+  "assets"."localDateTime",
+  "assets"."type",
+  "assets"."deletedAt",
+  "assets"."isFavorite",
+  "assets"."visibility",
+  "assets"."duration",
+  "assets"."updateId"
+from
+  "assets"
+  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "assets"."id"
+  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
+  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
+where
+  "assets"."updatedAt" < now() - interval '1 millisecond'
+  and (
+    "albums"."ownerId" = $1
+    or "album_users"."usersId" = $2
+  )
+order by
+  "assets"."updateId" asc
+
+-- SyncRepository.getAlbumToAssetBackfill
+select
+  "album_assets"."assetsId" as "assetId",
+  "album_assets"."albumsId" as "albumId",
+  "album_assets"."updateId"
+from
+  "albums_assets_assets" as "album_assets"
+where
+  "album_assets"."albumsId" = $1
+  and "album_assets"."updatedAt" < now() - interval '1 millisecond'
+  and "album_assets"."updateId" <= $2
+  and "album_assets"."updateId" >= $3
+order by
+  "album_assets"."updateId" asc
+
+-- SyncRepository.getAlbumToAssetUpserts
+select
+  "album_assets"."assetsId" as "assetId",
+  "album_assets"."albumsId" as "albumId",
+  "album_assets"."updateId"
+from
+  "albums_assets_assets" as "album_assets"
+  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
+  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
+where
+  "album_assets"."updatedAt" < now() - interval '1 millisecond'
+  and (
+    "albums"."ownerId" = $1
+    or "album_users"."usersId" = $2
+  )
+order by
+  "album_assets"."updateId" asc
+
+-- SyncRepository.getAlbumAssetExifsBackfill
+select
+  "exif"."assetId",
+  "exif"."description",
+  "exif"."exifImageWidth",
+  "exif"."exifImageHeight",
+  "exif"."fileSizeInByte",
+  "exif"."orientation",
+  "exif"."dateTimeOriginal",
+  "exif"."modifyDate",
+  "exif"."timeZone",
+  "exif"."latitude",
+  "exif"."longitude",
+  "exif"."projectionType",
+  "exif"."city",
+  "exif"."state",
+  "exif"."country",
+  "exif"."make",
+  "exif"."model",
+  "exif"."lensModel",
+  "exif"."fNumber",
+  "exif"."focalLength",
+  "exif"."iso",
+  "exif"."exposureTime",
+  "exif"."profileDescription",
+  "exif"."rating",
+  "exif"."fps",
+  "exif"."updateId"
+from
+  "exif"
+  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "exif"."assetId"
+where
+  "album_assets"."albumsId" = $1
+  and "exif"."updatedAt" < now() - interval '1 millisecond'
+  and "exif"."updateId" <= $2
+  and "exif"."updateId" >= $3
+order by
+  "exif"."updateId" asc
+
+-- SyncRepository.getAlbumAssetExifsUpserts
+select
+  "exif"."assetId",
+  "exif"."description",
+  "exif"."exifImageWidth",
+  "exif"."exifImageHeight",
+  "exif"."fileSizeInByte",
+  "exif"."orientation",
+  "exif"."dateTimeOriginal",
+  "exif"."modifyDate",
+  "exif"."timeZone",
+  "exif"."latitude",
+  "exif"."longitude",
+  "exif"."projectionType",
+  "exif"."city",
+  "exif"."state",
+  "exif"."country",
+  "exif"."make",
+  "exif"."model",
+  "exif"."lensModel",
+  "exif"."fNumber",
+  "exif"."focalLength",
+  "exif"."iso",
+  "exif"."exposureTime",
+  "exif"."profileDescription",
+  "exif"."rating",
+  "exif"."fps",
+  "exif"."updateId"
+from
+  "exif"
+  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "exif"."assetId"
+  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
+  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
+where
+  "exif"."updatedAt" < now() - interval '1 millisecond'
+  and (
+    "albums"."ownerId" = $1
+    or "album_users"."usersId" = $2
+  )
+order by
+  "exif"."updateId" asc
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index 341966c6fa..0d44af4bb2 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -7,7 +7,13 @@ import { DummyValue, GenerateSql } from 'src/decorators';
 import { SyncEntityType } from 'src/enum';
 import { SyncAck } from 'src/types';
 
-type AuditTables = 'users_audit' | 'partners_audit' | 'assets_audit' | 'albums_audit' | 'album_users_audit';
+type AuditTables =
+  | 'users_audit'
+  | 'partners_audit'
+  | 'assets_audit'
+  | 'albums_audit'
+  | 'album_users_audit'
+  | 'album_assets_audit';
 type UpsertTables = 'users' | 'partners' | 'assets' | 'exif' | 'albums' | 'albums_shared_users_users';
 
 @Injectable()
@@ -87,6 +93,7 @@ export class SyncRepository {
     return this.db
       .selectFrom('assets')
       .select(columns.syncAsset)
+      .select('assets.updateId')
       .where('ownerId', '=', userId)
       .$call((qb) => this.upsertTableFilters(qb, ack))
       .stream();
@@ -109,6 +116,7 @@ export class SyncRepository {
     return this.db
       .selectFrom('assets')
       .select(columns.syncAsset)
+      .select('assets.updateId')
       .where('ownerId', '=', partnerId)
       .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
       .where('updateId', '<=', beforeUpdateId)
@@ -122,6 +130,7 @@ export class SyncRepository {
     return this.db
       .selectFrom('assets')
       .select(columns.syncAsset)
+      .select('assets.updateId')
       .where('ownerId', 'in', (eb) =>
         eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
       )
@@ -156,6 +165,7 @@ export class SyncRepository {
     return this.db
       .selectFrom('exif')
       .select(columns.syncAssetExif)
+      .select('exif.updateId')
       .where('assetId', 'in', (eb) => eb.selectFrom('assets').select('id').where('ownerId', '=', userId))
       .$call((qb) => this.upsertTableFilters(qb, ack))
       .stream();
@@ -166,6 +176,7 @@ export class SyncRepository {
     return this.db
       .selectFrom('exif')
       .select(columns.syncAssetExif)
+      .select('exif.updateId')
       .innerJoin('assets', 'assets.id', 'exif.assetId')
       .where('assets.ownerId', '=', partnerId)
       .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
@@ -180,6 +191,7 @@ export class SyncRepository {
     return this.db
       .selectFrom('exif')
       .select(columns.syncAssetExif)
+      .select('exif.updateId')
       .where('assetId', 'in', (eb) =>
         eb
           .selectFrom('assets')
@@ -227,6 +239,33 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getAlbumToAssetDeletes(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('album_assets_audit')
+      .select(['id', 'assetId', 'albumId'])
+      .where((eb) =>
+        eb(
+          'albumId',
+          'in',
+          eb
+            .selectFrom('albums')
+            .select(['id'])
+            .where('ownerId', '=', userId)
+            .union((eb) =>
+              eb.parens(
+                eb
+                  .selectFrom('albums_shared_users_users as albumUsers')
+                  .select(['albumUsers.albumsId as id'])
+                  .where('albumUsers.usersId', '=', userId),
+              ),
+            ),
+        ),
+      )
+      .$call((qb) => this.auditTableFilters(qb, ack))
+      .stream();
+  }
+
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getAlbumUserDeletes(userId: string, ack?: SyncAck) {
     return this.db
@@ -266,11 +305,12 @@ export class SyncRepository {
       .execute();
   }
 
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
   getAlbumUsersBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
     return this.db
-      .selectFrom('albums_shared_users_users')
+      .selectFrom('albums_shared_users_users as album_users')
       .select(columns.syncAlbumUser)
+      .select('album_users.updateId')
       .where('albumsId', '=', albumId)
       .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
       .where('updateId', '<=', beforeUpdateId)
@@ -282,14 +322,15 @@ export class SyncRepository {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getAlbumUserUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('albums_shared_users_users')
+      .selectFrom('albums_shared_users_users as album_users')
       .select(columns.syncAlbumUser)
-      .where('albums_shared_users_users.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('albums_shared_users_users.updateId', '>', ack!.updateId))
-      .orderBy('albums_shared_users_users.updateId', 'asc')
+      .select('album_users.updateId')
+      .where('album_users.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('album_users.updateId', '>', ack!.updateId))
+      .orderBy('album_users.updateId', 'asc')
       .where((eb) =>
         eb(
-          'albums_shared_users_users.albumsId',
+          'album_users.albumsId',
           'in',
           eb
             .selectFrom('albums')
@@ -308,6 +349,95 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
+  getAlbumAssetsBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+    return this.db
+      .selectFrom('assets')
+      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'assets.id')
+      .select(columns.syncAsset)
+      .select('assets.updateId')
+      .where('album_assets.albumsId', '=', albumId)
+      .where('assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('assets.updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('assets.updateId', '>=', afterUpdateId!))
+      .orderBy('assets.updateId', 'asc')
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getAlbumAssetsUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('assets')
+      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'assets.id')
+      .select(columns.syncAsset)
+      .select('assets.updateId')
+      .where('assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('assets.updateId', '>', ack!.updateId))
+      .orderBy('assets.updateId', 'asc')
+      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
+      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
+      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
+  getAlbumToAssetBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+    return this.db
+      .selectFrom('albums_assets_assets as album_assets')
+      .select(['album_assets.assetsId as assetId', 'album_assets.albumsId as albumId', 'album_assets.updateId'])
+      .where('album_assets.albumsId', '=', albumId)
+      .where('album_assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('album_assets.updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('album_assets.updateId', '>=', afterUpdateId!))
+      .orderBy('album_assets.updateId', 'asc')
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getAlbumToAssetUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('albums_assets_assets as album_assets')
+      .select(['album_assets.assetsId as assetId', 'album_assets.albumsId as albumId', 'album_assets.updateId'])
+      .where('album_assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('album_assets.updateId', '>', ack!.updateId))
+      .orderBy('album_assets.updateId', 'asc')
+      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
+      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
+      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
+  getAlbumAssetExifsBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+    return this.db
+      .selectFrom('exif')
+      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'exif.assetId')
+      .select(columns.syncAssetExif)
+      .select('exif.updateId')
+      .where('album_assets.albumsId', '=', albumId)
+      .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('exif.updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('exif.updateId', '>=', afterUpdateId!))
+      .orderBy('exif.updateId', 'asc')
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getAlbumAssetExifsUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('exif')
+      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'exif.assetId')
+      .select(columns.syncAssetExif)
+      .select('exif.updateId')
+      .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('exif.updateId', '>', ack!.updateId))
+      .orderBy('exif.updateId', 'asc')
+      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
+      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
+      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .stream();
+  }
+
   private auditTableFilters<T extends keyof Pick<DB, AuditTables>, D>(qb: SelectQueryBuilder<DB, T, D>, ack?: SyncAck) {
     const builder = qb as SelectQueryBuilder<DB, AuditTables, D>;
     return builder
diff --git a/server/src/schema/functions.ts b/server/src/schema/functions.ts
index a03f715bff..fdef5867b9 100644
--- a/server/src/schema/functions.ts
+++ b/server/src/schema/functions.ts
@@ -142,6 +142,20 @@ export const albums_delete_audit = registerFunction({
   synchronize: false,
 });
 
+export const album_assets_delete_audit = registerFunction({
+  name: 'album_assets_delete_audit',
+  returnType: 'TRIGGER',
+  language: 'PLPGSQL',
+  body: `
+    BEGIN
+      INSERT INTO album_assets_audit ("albumId", "assetId")
+      SELECT "albumsId", "assetsId" FROM OLD
+      WHERE "albumsId" IN (SELECT "id" FROM albums WHERE "id" IN (SELECT "albumsId" FROM OLD));
+      RETURN NULL;
+    END`,
+  synchronize: false,
+});
+
 export const album_users_delete_audit = registerFunction({
   name: 'album_users_delete_audit',
   returnType: 'TRIGGER',
diff --git a/server/src/schema/index.ts b/server/src/schema/index.ts
index d2f8d80afc..bab3acb232 100644
--- a/server/src/schema/index.ts
+++ b/server/src/schema/index.ts
@@ -13,6 +13,7 @@ import {
   users_delete_audit,
 } from 'src/schema/functions';
 import { ActivityTable } from 'src/schema/tables/activity.table';
+import { AlbumAssetAuditTable } from 'src/schema/tables/album-asset-audit.table';
 import { AlbumAssetTable } from 'src/schema/tables/album-asset.table';
 import { AlbumAuditTable } from 'src/schema/tables/album-audit.table';
 import { AlbumUserAuditTable } from 'src/schema/tables/album-user-audit.table';
@@ -58,6 +59,7 @@ export class ImmichDatabase {
   tables = [
     ActivityTable,
     AlbumAssetTable,
+    AlbumAssetAuditTable,
     AlbumAuditTable,
     AlbumUserAuditTable,
     AlbumUserTable,
diff --git a/server/src/schema/migrations/1750676477029-AlbumAssetUpdateId.ts b/server/src/schema/migrations/1750676477029-AlbumAssetUpdateId.ts
new file mode 100644
index 0000000000..8feba6f11c
--- /dev/null
+++ b/server/src/schema/migrations/1750676477029-AlbumAssetUpdateId.ts
@@ -0,0 +1,18 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`ALTER TABLE "albums_assets_assets" ADD "updatedAt" timestamp with time zone NOT NULL DEFAULT now();`.execute(db);
+  await sql`ALTER TABLE "albums_assets_assets" ADD "updateId" uuid NOT NULL DEFAULT immich_uuid_v7();`.execute(db);
+  await sql`CREATE INDEX "IDX_album_assets_update_id" ON "albums_assets_assets" ("updateId")`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_assets_updated_at"
+  BEFORE UPDATE ON "albums_assets_assets"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`DROP INDEX "IDX_album_assets_update_id";`.execute(db);
+  await sql`ALTER TABLE "albums_assets_assets" DROP COLUMN "updatedAt";`.execute(db);
+  await sql`ALTER TABLE "albums_assets_assets" DROP COLUMN "updateId";`.execute(db);
+  await sql`DROP TRIGGER "album_assets_updated_at" ON "albums_assets_assets";`.execute(db);
+}
diff --git a/server/src/schema/migrations/1750694237564-AlbumAssetAuditTable.ts b/server/src/schema/migrations/1750694237564-AlbumAssetAuditTable.ts
new file mode 100644
index 0000000000..0191b5d07a
--- /dev/null
+++ b/server/src/schema/migrations/1750694237564-AlbumAssetAuditTable.ts
@@ -0,0 +1,22 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`CREATE TABLE "album_assets_audit" ("id" uuid NOT NULL DEFAULT immich_uuid_v7(), "albumId" uuid NOT NULL, "assetId" uuid NOT NULL, "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp());`.execute(db);
+  await sql`ALTER TABLE "album_assets_audit" ADD CONSTRAINT "PK_32969b576ec8f78d84f37c2eb2d" PRIMARY KEY ("id");`.execute(db);
+  await sql`CREATE INDEX "IDX_album_assets_audit_album_id" ON "album_assets_audit" ("albumId")`.execute(db);
+  await sql`CREATE INDEX "IDX_album_assets_audit_asset_id" ON "album_assets_audit" ("assetId")`.execute(db);
+  await sql`CREATE INDEX "IDX_album_assets_audit_deleted_at" ON "album_assets_audit" ("deletedAt")`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_assets_updated_at"
+  BEFORE UPDATE ON "albums_assets_assets"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`DROP TRIGGER "album_assets_updated_at" ON "albums_assets_assets";`.execute(db);
+  await sql`DROP INDEX "IDX_album_assets_audit_album_id";`.execute(db);
+  await sql`DROP INDEX "IDX_album_assets_audit_asset_id";`.execute(db);
+  await sql`DROP INDEX "IDX_album_assets_audit_deleted_at";`.execute(db);
+  await sql`ALTER TABLE "album_assets_audit" DROP CONSTRAINT "PK_32969b576ec8f78d84f37c2eb2d";`.execute(db);
+  await sql`DROP TABLE "album_assets_audit";`.execute(db);
+}
diff --git a/server/src/schema/migrations/1750780093818-AddAlbumToAssetDeleteTrigger.ts b/server/src/schema/migrations/1750780093818-AddAlbumToAssetDeleteTrigger.ts
new file mode 100644
index 0000000000..f3cb75d10e
--- /dev/null
+++ b/server/src/schema/migrations/1750780093818-AddAlbumToAssetDeleteTrigger.ts
@@ -0,0 +1,28 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`CREATE OR REPLACE FUNCTION album_assets_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO album_assets_audit ("albumId", "assetId")
+      SELECT "albumsId", "assetsId" FROM OLD
+      WHERE "albumsId" IN (SELECT "id" FROM albums WHERE "id" IN (SELECT "albumsId" FROM OLD));
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`ALTER TABLE "album_assets_audit" ADD CONSTRAINT "FK_8047b44b812619a3c75a2839b0d" FOREIGN KEY ("albumId") REFERENCES "albums" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_assets_delete_audit"
+  AFTER DELETE ON "albums_assets_assets"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() <= 1)
+  EXECUTE FUNCTION album_assets_delete_audit();`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`DROP TRIGGER "album_assets_delete_audit" ON "albums_assets_assets";`.execute(db);
+  await sql`ALTER TABLE "album_assets_audit" DROP CONSTRAINT "FK_8047b44b812619a3c75a2839b0d";`.execute(db);
+  await sql`DROP FUNCTION album_assets_delete_audit;`.execute(db);
+}
diff --git a/server/src/schema/tables/album-asset-audit.table.ts b/server/src/schema/tables/album-asset-audit.table.ts
new file mode 100644
index 0000000000..d2b71aa599
--- /dev/null
+++ b/server/src/schema/tables/album-asset-audit.table.ts
@@ -0,0 +1,23 @@
+import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
+import { AlbumTable } from 'src/schema/tables/album.table';
+import { Column, CreateDateColumn, ForeignKeyColumn, Table } from 'src/sql-tools';
+
+@Table('album_assets_audit')
+export class AlbumAssetAuditTable {
+  @PrimaryGeneratedUuidV7Column()
+  id!: string;
+
+  @ForeignKeyColumn(() => AlbumTable, {
+    type: 'uuid',
+    indexName: 'IDX_album_assets_audit_album_id',
+    onDelete: 'CASCADE',
+    onUpdate: 'CASCADE',
+  })
+  albumId!: string;
+
+  @Column({ type: 'uuid', indexName: 'IDX_album_assets_audit_asset_id' })
+  assetId!: string;
+
+  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_album_assets_audit_deleted_at' })
+  deletedAt!: Date;
+}
diff --git a/server/src/schema/tables/album-asset.table.ts b/server/src/schema/tables/album-asset.table.ts
index 8054009c39..567a6f9d4b 100644
--- a/server/src/schema/tables/album-asset.table.ts
+++ b/server/src/schema/tables/album-asset.table.ts
@@ -1,8 +1,18 @@
+import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
+import { album_assets_delete_audit } from 'src/schema/functions';
 import { AlbumTable } from 'src/schema/tables/album.table';
 import { AssetTable } from 'src/schema/tables/asset.table';
-import { CreateDateColumn, ForeignKeyColumn, Table } from 'src/sql-tools';
+import { AfterDeleteTrigger, CreateDateColumn, ForeignKeyColumn, Table, UpdateDateColumn } from 'src/sql-tools';
 
 @Table({ name: 'albums_assets_assets', primaryConstraintName: 'PK_c67bc36fa845fb7b18e0e398180' })
+@UpdatedAtTrigger('album_assets_updated_at')
+@AfterDeleteTrigger({
+  name: 'album_assets_delete_audit',
+  scope: 'statement',
+  function: album_assets_delete_audit,
+  referencingOldTableAs: 'old',
+  when: 'pg_trigger_depth() <= 1',
+})
 export class AlbumAssetTable {
   @ForeignKeyColumn(() => AlbumTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false, primary: true })
   albumsId!: string;
@@ -12,4 +22,10 @@ export class AlbumAssetTable {
 
   @CreateDateColumn()
   createdAt!: Date;
+
+  @UpdateDateColumn()
+  updatedAt!: Date;
+
+  @UpdateIdColumn({ indexName: 'IDX_album_assets_update_id' })
+  updateId!: string;
 }
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 733dd9036a..8293ae33b9 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -57,11 +57,14 @@ export const SYNC_TYPES_ORDER = [
   SyncRequestType.UsersV1,
   SyncRequestType.PartnersV1,
   SyncRequestType.AssetsV1,
-  SyncRequestType.AssetExifsV1,
   SyncRequestType.PartnerAssetsV1,
-  SyncRequestType.PartnerAssetExifsV1,
   SyncRequestType.AlbumsV1,
   SyncRequestType.AlbumUsersV1,
+  SyncRequestType.AlbumAssetsV1,
+  SyncRequestType.AlbumToAssetsV1,
+  SyncRequestType.AssetExifsV1,
+  SyncRequestType.AlbumAssetExifsV1,
+  SyncRequestType.PartnerAssetExifsV1,
 ];
 
 const throwSessionRequired = () => {
@@ -164,6 +167,21 @@ export class SyncService extends BaseService {
           break;
         }
 
+        case SyncRequestType.AlbumAssetsV1: {
+          await this.syncAlbumAssetsV1(response, checkpointMap, auth, sessionId);
+          break;
+        }
+
+        case SyncRequestType.AlbumToAssetsV1: {
+          await this.syncAlbumToAssetsV1(response, checkpointMap, auth, sessionId);
+          break;
+        }
+
+        case SyncRequestType.AlbumAssetExifsV1: {
+          await this.syncAlbumAssetExifsV1(response, checkpointMap, auth, sessionId);
+          break;
+        }
+
         default: {
           this.logger.warn(`Unsupported sync type: ${type}`);
           break;
@@ -380,6 +398,147 @@ export class SyncService extends BaseService {
     }
   }
 
+  private async syncAlbumAssetsV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto, sessionId: string) {
+    const backfillType = SyncEntityType.AlbumAssetBackfillV1;
+    const upsertType = SyncEntityType.AlbumAssetV1;
+
+    const backfillCheckpoint = checkpointMap[backfillType];
+    const upsertCheckpoint = checkpointMap[upsertType];
+
+    const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
+
+    if (upsertCheckpoint) {
+      const endId = upsertCheckpoint.updateId;
+
+      for (const album of albums) {
+        const createId = album.createId;
+        if (isEntityBackfillComplete(createId, backfillCheckpoint)) {
+          continue;
+        }
+
+        const startId = getStartId(createId, backfillCheckpoint);
+        const backfill = this.syncRepository.getAlbumAssetsBackfill(album.id, startId, endId);
+
+        for await (const { updateId, ...data } of backfill) {
+          send(response, { type: backfillType, ids: [createId, updateId], data: mapSyncAssetV1(data) });
+        }
+
+        sendEntityBackfillCompleteAck(response, backfillType, createId);
+      }
+    } else if (albums.length > 0) {
+      await this.upsertBackfillCheckpoint({
+        type: backfillType,
+        sessionId,
+        createId: albums.at(-1)!.createId,
+      });
+    }
+
+    const upserts = this.syncRepository.getAlbumAssetsUpserts(auth.user.id, checkpointMap[upsertType]);
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data: mapSyncAssetV1(data) });
+    }
+  }
+
+  private async syncAlbumAssetExifsV1(
+    response: Writable,
+    checkpointMap: CheckpointMap,
+    auth: AuthDto,
+    sessionId: string,
+  ) {
+    const backfillType = SyncEntityType.AlbumAssetExifBackfillV1;
+    const upsertType = SyncEntityType.AlbumAssetExifV1;
+
+    const backfillCheckpoint = checkpointMap[backfillType];
+    const upsertCheckpoint = checkpointMap[upsertType];
+
+    const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
+
+    if (upsertCheckpoint) {
+      const endId = upsertCheckpoint.updateId;
+
+      for (const album of albums) {
+        const createId = album.createId;
+        if (isEntityBackfillComplete(createId, backfillCheckpoint)) {
+          continue;
+        }
+
+        const startId = getStartId(createId, backfillCheckpoint);
+        const backfill = this.syncRepository.getAlbumAssetExifsBackfill(album.id, startId, endId);
+
+        for await (const { updateId, ...data } of backfill) {
+          send(response, { type: backfillType, ids: [createId, updateId], data });
+        }
+
+        sendEntityBackfillCompleteAck(response, backfillType, createId);
+      }
+    } else if (albums.length > 0) {
+      await this.upsertBackfillCheckpoint({
+        type: backfillType,
+        sessionId,
+        createId: albums.at(-1)!.createId,
+      });
+    }
+
+    const upserts = this.syncRepository.getAlbumAssetExifsUpserts(auth.user.id, checkpointMap[upsertType]);
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data });
+    }
+  }
+
+  private async syncAlbumToAssetsV1(
+    response: Writable,
+    checkpointMap: CheckpointMap,
+    auth: AuthDto,
+    sessionId: string,
+  ) {
+    const backfillType = SyncEntityType.AlbumToAssetBackfillV1;
+    const upsertType = SyncEntityType.AlbumToAssetV1;
+
+    const backfillCheckpoint = checkpointMap[backfillType];
+    const upsertCheckpoint = checkpointMap[upsertType];
+
+    const deletes = this.syncRepository.getAlbumToAssetDeletes(
+      auth.user.id,
+      checkpointMap[SyncEntityType.AlbumToAssetDeleteV1],
+    );
+    for await (const { id, ...data } of deletes) {
+      send(response, { type: SyncEntityType.AlbumToAssetDeleteV1, ids: [id], data });
+    }
+
+    const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
+
+    if (upsertCheckpoint) {
+      const endId = upsertCheckpoint.updateId;
+
+      for (const album of albums) {
+        const createId = album.createId;
+        if (isEntityBackfillComplete(createId, backfillCheckpoint)) {
+          continue;
+        }
+
+        const startId = getStartId(createId, backfillCheckpoint);
+        const backfill = this.syncRepository.getAlbumToAssetBackfill(album.id, startId, endId);
+
+        for await (const { updateId, ...data } of backfill) {
+          send(response, { type: backfillType, ids: [createId, updateId], data });
+        }
+
+        sendEntityBackfillCompleteAck(response, backfillType, createId);
+      }
+    } else if (albums.length > 0) {
+      await this.upsertBackfillCheckpoint({
+        type: backfillType,
+        sessionId,
+        createId: albums.at(-1)!.createId,
+      });
+    }
+
+    const upserts = this.syncRepository.getAlbumToAssetUpserts(auth.user.id, checkpointMap[upsertType]);
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data });
+    }
+  }
+
   private async upsertBackfillCheckpoint(item: { type: SyncEntityType; sessionId: string; createId: string }) {
     const { type, sessionId, createId } = item;
     await this.syncRepository.upsertCheckpoints([
diff --git a/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts b/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
new file mode 100644
index 0000000000..07ed8e5785
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
@@ -0,0 +1,222 @@
+import { Kysely } from 'kysely';
+import { DB } from 'src/db';
+import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
+import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { factory } from 'test/small.factory';
+import { getKyselyDB, wait } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const database = db || defaultDatabase;
+  const result = newSyncTest({ db: database });
+  const { auth, create } = newSyncAuthUser();
+  await create(database);
+  return { ...result, auth };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe.concurrent(SyncRequestType.AlbumAssetExifsV1, () => {
+  it('should detect and sync the first album asset exif', async () => {
+    const { auth, sut, getRepository, testSync } = await setup();
+
+    const userRepo = getRepository('user');
+    const user2 = mediumFactory.userInsert();
+    await userRepo.create(user2);
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: user2.id });
+    await assetRepo.create(asset);
+    await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
+    await albumRepo.create({ ownerId: user2.id }, [asset.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
+
+    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumAssetExifsV1]);
+
+    expect(initialSyncResponse).toHaveLength(1);
+    expect(initialSyncResponse).toEqual(
+      expect.arrayContaining([
+        {
+          ack: expect.any(String),
+          data: {
+            assetId: asset.id,
+            city: null,
+            country: null,
+            dateTimeOriginal: null,
+            description: '',
+            exifImageHeight: null,
+            exifImageWidth: null,
+            exposureTime: null,
+            fNumber: null,
+            fileSizeInByte: null,
+            focalLength: null,
+            fps: null,
+            iso: null,
+            latitude: null,
+            lensModel: null,
+            longitude: null,
+            make: 'Canon',
+            model: null,
+            modifyDate: null,
+            orientation: null,
+            profileDescription: null,
+            projectionType: null,
+            rating: null,
+            state: null,
+            timeZone: null,
+          },
+          type: SyncEntityType.AlbumAssetExifV1,
+        },
+      ]),
+    );
+
+    const acks = [initialSyncResponse[0].ack];
+    await sut.setAcks(auth, { acks });
+
+    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumAssetExifsV1]);
+
+    expect(ackSyncResponse).toEqual([]);
+  });
+
+  it('should sync album asset exif for own user', async () => {
+    const { auth, getRepository, testSync } = await setup();
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
+    await assetRepo.create(asset);
+    await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
+    await albumRepo.create({ ownerId: auth.user.id }, [asset.id], []);
+
+    await expect(testSync(auth, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
+    await expect(testSync(auth, [SyncRequestType.AlbumAssetExifsV1])).resolves.toHaveLength(1);
+  });
+
+  it('should not sync album asset exif for unrelated user', async () => {
+    const { auth, getRepository, testSync } = await setup();
+
+    const userRepo = getRepository('user');
+    const user2 = mediumFactory.userInsert();
+    const user3 = mediumFactory.userInsert();
+    await userRepo.create(user2);
+    await userRepo.create(user3);
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: user3.id });
+    await assetRepo.create(asset);
+    await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
+    await albumRepo.create({ ownerId: user2.id }, [asset.id], [{ userId: user3.id, role: AlbumUserRole.EDITOR }]);
+
+    const sessionRepo = getRepository('session');
+    const session = mediumFactory.sessionInsert({ userId: user3.id });
+    await sessionRepo.create(session);
+
+    const authUser3 = factory.auth({ session, user: user3 });
+
+    await expect(testSync(authUser3, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
+    await expect(testSync(auth, [SyncRequestType.PartnerAssetExifsV1])).resolves.toHaveLength(0);
+  });
+
+  it('should backfill album assets exif when a user shares an album with you', async () => {
+    const { auth, sut, testSync, getRepository } = await setup();
+
+    const userRepo = getRepository('user');
+    const user2 = mediumFactory.userInsert();
+    const user3 = mediumFactory.userInsert();
+    await userRepo.create(user2);
+    await userRepo.create(user3);
+
+    const assetRepo = getRepository('asset');
+    // Asset to check that we do backfill our own assets
+    const asset1Owner = mediumFactory.assetInsert({ ownerId: auth.user.id });
+    const asset1User2 = mediumFactory.assetInsert({ ownerId: user2.id });
+    const asset2User2 = mediumFactory.assetInsert({ ownerId: user2.id });
+    const asset3User2 = mediumFactory.assetInsert({ ownerId: user2.id });
+    await assetRepo.create(asset1Owner);
+    await assetRepo.upsertExif({ assetId: asset1Owner.id, make: 'asset1Owner' });
+    await wait(2);
+    await assetRepo.create(asset1User2);
+    await assetRepo.upsertExif({ assetId: asset1User2.id, make: 'asset1User2' });
+    await wait(2);
+    await assetRepo.create(asset2User2);
+    await assetRepo.upsertExif({ assetId: asset2User2.id, make: 'asset2User2' });
+    await wait(2);
+    await assetRepo.create(asset3User2);
+    await assetRepo.upsertExif({ assetId: asset3User2.id, make: 'asset3User2' });
+
+    const albumRepo = getRepository('album');
+    const album1 = mediumFactory.albumInsert({ ownerId: user2.id });
+    await albumRepo.create(album1, [asset2User2.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
+
+    const response = await testSync(auth, [SyncRequestType.AlbumAssetExifsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          assetId: asset2User2.id,
+        }),
+        type: SyncEntityType.AlbumAssetExifV1,
+      },
+    ]);
+
+    // ack initial album asset exif sync
+    const acks = response.map(({ ack }) => ack);
+    await sut.setAcks(auth, { acks });
+
+    // create a second album with
+    const album2 = mediumFactory.albumInsert({ ownerId: user2.id });
+    await albumRepo.create(
+      album2,
+      [asset1User2.id, asset2User2.id, asset3User2.id, asset1Owner.id],
+      [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }],
+    );
+
+    // should backfill the album user
+    const backfillResponse = await testSync(auth, [SyncRequestType.AlbumAssetExifsV1]);
+    expect(backfillResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          assetId: asset1Owner.id,
+        }),
+        type: SyncEntityType.AlbumAssetExifBackfillV1,
+      },
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          assetId: asset1User2.id,
+        }),
+        type: SyncEntityType.AlbumAssetExifBackfillV1,
+      },
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          assetId: asset2User2.id,
+        }),
+        type: SyncEntityType.AlbumAssetExifBackfillV1,
+      },
+      {
+        ack: expect.stringContaining(SyncEntityType.AlbumAssetExifBackfillV1),
+        data: {},
+        type: SyncEntityType.SyncAckV1,
+      },
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          assetId: asset3User2.id,
+        }),
+        type: SyncEntityType.AlbumAssetExifV1,
+      },
+    ]);
+
+    await sut.setAcks(auth, { acks: [backfillResponse[3].ack, backfillResponse.at(-1).ack] });
+
+    const finalResponse = await testSync(auth, [SyncRequestType.AlbumAssetExifsV1]);
+    expect(finalResponse).toEqual([]);
+  });
+});
diff --git a/server/test/medium/specs/sync/sync-album-asset.spec.ts b/server/test/medium/specs/sync/sync-album-asset.spec.ts
new file mode 100644
index 0000000000..ea16393f11
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-album-asset.spec.ts
@@ -0,0 +1,218 @@
+import { Kysely } from 'kysely';
+import { DB } from 'src/db';
+import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
+import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { factory } from 'test/small.factory';
+import { getKyselyDB, wait } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const database = db || defaultDatabase;
+  const result = newSyncTest({ db: database });
+  const { auth, create } = newSyncAuthUser();
+  await create(database);
+  return { ...result, auth };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe.concurrent(SyncRequestType.AlbumAssetsV1, () => {
+  it('should detect and sync the first album asset', async () => {
+    const { auth, sut, getRepository, testSync } = await setup();
+
+    const userRepo = getRepository('user');
+    const user2 = mediumFactory.userInsert();
+    await userRepo.create(user2);
+
+    const originalFileName = 'firstAsset';
+    const checksum = '1115vHcVkZzNp3Q9G+FEA0nu6zUbGb4Tj4UOXkN0wRA=';
+    const thumbhash = '2225vHcVkZzNp3Q9G+FEA0nu6zUbGb4Tj4UOXkN0wRA=';
+    const date = new Date().toISOString();
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({
+      originalFileName,
+      ownerId: user2.id,
+      checksum: Buffer.from(checksum, 'base64'),
+      thumbhash: Buffer.from(thumbhash, 'base64'),
+      fileCreatedAt: date,
+      fileModifiedAt: date,
+      localDateTime: date,
+      deletedAt: null,
+      duration: '0:10:00.00000',
+    });
+    await assetRepo.create(asset);
+    await albumRepo.create({ ownerId: user2.id }, [asset.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
+
+    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumAssetsV1]);
+
+    expect(initialSyncResponse).toHaveLength(1);
+    expect(initialSyncResponse).toEqual(
+      expect.arrayContaining([
+        {
+          ack: expect.any(String),
+          data: {
+            id: asset.id,
+            originalFileName,
+            ownerId: asset.ownerId,
+            thumbhash,
+            checksum,
+            deletedAt: asset.deletedAt,
+            fileCreatedAt: asset.fileCreatedAt,
+            fileModifiedAt: asset.fileModifiedAt,
+            isFavorite: asset.isFavorite,
+            localDateTime: asset.localDateTime,
+            type: asset.type,
+            visibility: asset.visibility,
+            duration: asset.duration,
+          },
+          type: SyncEntityType.AlbumAssetV1,
+        },
+      ]),
+    );
+
+    const acks = [initialSyncResponse[0].ack];
+    await sut.setAcks(auth, { acks });
+
+    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumAssetsV1]);
+
+    expect(ackSyncResponse).toEqual([]);
+  });
+
+  it('should sync album asset for own user', async () => {
+    const { auth, getRepository, testSync } = await setup();
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
+    await assetRepo.create(asset);
+    await albumRepo.create({ ownerId: auth.user.id }, [asset.id], []);
+
+    await expect(testSync(auth, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
+    await expect(testSync(auth, [SyncRequestType.AlbumAssetsV1])).resolves.toHaveLength(1);
+  });
+
+  it('should not sync album asset for unrelated user', async () => {
+    const { auth, getRepository, testSync } = await setup();
+
+    const userRepo = getRepository('user');
+    const user2 = mediumFactory.userInsert();
+    const user3 = mediumFactory.userInsert();
+    await userRepo.create(user2);
+    await userRepo.create(user3);
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: user3.id });
+    await assetRepo.create(asset);
+    await albumRepo.create({ ownerId: user2.id }, [asset.id], [{ userId: user3.id, role: AlbumUserRole.EDITOR }]);
+
+    const sessionRepo = getRepository('session');
+    const session = mediumFactory.sessionInsert({ userId: user3.id });
+    await sessionRepo.create(session);
+
+    const authUser3 = factory.auth({ session, user: user3 });
+
+    await expect(testSync(authUser3, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
+    await expect(testSync(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(0);
+  });
+
+  it('should backfill album assets when a user shares an album with you', async () => {
+    const { auth, sut, testSync, getRepository } = await setup();
+
+    const userRepo = getRepository('user');
+    const user2 = mediumFactory.userInsert();
+    const user3 = mediumFactory.userInsert();
+    await userRepo.create(user2);
+    await userRepo.create(user3);
+
+    const assetRepo = getRepository('asset');
+    // Asset to check that we do backfill our own assets
+    const asset1Owner = mediumFactory.assetInsert({ ownerId: auth.user.id });
+    const asset1User2 = mediumFactory.assetInsert({ ownerId: user2.id });
+    const asset2User2 = mediumFactory.assetInsert({ ownerId: user2.id });
+    const asset3User2 = mediumFactory.assetInsert({ ownerId: user2.id });
+    await assetRepo.create(asset1Owner);
+    await wait(2);
+    await assetRepo.create(asset1User2);
+    await wait(2);
+    await assetRepo.create(asset2User2);
+    await wait(2);
+    await assetRepo.create(asset3User2);
+
+    const albumRepo = getRepository('album');
+    const album1 = mediumFactory.albumInsert({ ownerId: user2.id });
+    await albumRepo.create(album1, [asset2User2.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
+
+    const response = await testSync(auth, [SyncRequestType.AlbumAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: asset2User2.id,
+        }),
+        type: SyncEntityType.AlbumAssetV1,
+      },
+    ]);
+
+    // ack initial album asset sync
+    const acks = response.map(({ ack }) => ack);
+    await sut.setAcks(auth, { acks });
+
+    // create a second album with
+    const album2 = mediumFactory.albumInsert({ ownerId: user2.id });
+    await albumRepo.create(
+      album2,
+      [asset1User2.id, asset2User2.id, asset3User2.id, asset1Owner.id],
+      [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }],
+    );
+
+    // should backfill the album user
+    const backfillResponse = await testSync(auth, [SyncRequestType.AlbumAssetsV1]);
+    expect(backfillResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: asset1Owner.id,
+        }),
+        type: SyncEntityType.AlbumAssetBackfillV1,
+      },
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: asset1User2.id,
+        }),
+        type: SyncEntityType.AlbumAssetBackfillV1,
+      },
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: asset2User2.id,
+        }),
+        type: SyncEntityType.AlbumAssetBackfillV1,
+      },
+      {
+        ack: expect.stringContaining(SyncEntityType.AlbumAssetBackfillV1),
+        data: {},
+        type: SyncEntityType.SyncAckV1,
+      },
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: asset3User2.id,
+        }),
+        type: SyncEntityType.AlbumAssetV1,
+      },
+    ]);
+
+    await sut.setAcks(auth, { acks: [backfillResponse[3].ack, backfillResponse.at(-1).ack] });
+
+    const finalResponse = await testSync(auth, [SyncRequestType.AlbumAssetsV1]);
+    expect(finalResponse).toEqual([]);
+  });
+});
diff --git a/server/test/medium/specs/sync/sync-album-to-asset.spec.ts b/server/test/medium/specs/sync/sync-album-to-asset.spec.ts
new file mode 100644
index 0000000000..0941ab05b7
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-album-to-asset.spec.ts
@@ -0,0 +1,350 @@
+import { Kysely } from 'kysely';
+import { DB } from 'src/db';
+import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
+import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { getKyselyDB, wait } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const database = db || defaultDatabase;
+  const result = newSyncTest({ db: database });
+  const { auth, create } = newSyncAuthUser();
+  await create(database);
+  return { ...result, auth };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe.concurrent(SyncRequestType.AlbumToAssetsV1, () => {
+  it('should detect and sync the first album to asset relation', async () => {
+    const { auth, sut, getRepository, testSync } = await setup();
+
+    const userRepo = getRepository('user');
+    const user2 = mediumFactory.userInsert();
+    await userRepo.create(user2);
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: user2.id });
+    await assetRepo.create(asset);
+    const album = mediumFactory.albumInsert({ ownerId: user2.id });
+    await albumRepo.create(album, [asset.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
+
+    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+
+    expect(initialSyncResponse).toHaveLength(1);
+    expect(initialSyncResponse).toEqual(
+      expect.arrayContaining([
+        {
+          ack: expect.any(String),
+          data: {
+            albumId: album.id,
+            assetId: asset.id,
+          },
+          type: SyncEntityType.AlbumToAssetV1,
+        },
+      ]),
+    );
+
+    const acks = [initialSyncResponse[0].ack];
+    await sut.setAcks(auth, { acks });
+
+    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+
+    expect(ackSyncResponse).toEqual([]);
+  });
+
+  it('should sync album to asset for owned albums', async () => {
+    const { auth, sut, getRepository, testSync } = await setup();
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
+    await assetRepo.create(asset);
+    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
+    await albumRepo.create(album, [asset.id], []);
+
+    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+
+    expect(initialSyncResponse).toHaveLength(1);
+    expect(initialSyncResponse).toEqual(
+      expect.arrayContaining([
+        {
+          ack: expect.any(String),
+          data: {
+            albumId: album.id,
+            assetId: asset.id,
+          },
+          type: SyncEntityType.AlbumToAssetV1,
+        },
+      ]),
+    );
+
+    const acks = [initialSyncResponse[0].ack];
+    await sut.setAcks(auth, { acks });
+
+    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(ackSyncResponse).toEqual([]);
+  });
+
+  it('should detect and sync the album to asset for shared albums', async () => {
+    const { auth, sut, getRepository, testSync } = await setup();
+
+    const userRepo = getRepository('user');
+    const user2 = mediumFactory.userInsert();
+    await userRepo.create(user2);
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
+    await assetRepo.create(asset);
+    const album = mediumFactory.albumInsert({ ownerId: user2.id });
+    await albumRepo.create(album, [asset.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
+
+    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+
+    expect(initialSyncResponse).toHaveLength(1);
+    expect(initialSyncResponse).toEqual(
+      expect.arrayContaining([
+        {
+          ack: expect.any(String),
+          data: {
+            albumId: album.id,
+            assetId: asset.id,
+          },
+          type: SyncEntityType.AlbumToAssetV1,
+        },
+      ]),
+    );
+
+    const acks = [initialSyncResponse[0].ack];
+    await sut.setAcks(auth, { acks });
+
+    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+
+    expect(ackSyncResponse).toEqual([]);
+  });
+
+  it('should not sync album to asset for an album owned by another user', async () => {
+    const { auth, getRepository, testSync } = await setup();
+
+    const userRepo = getRepository('user');
+    const user2 = mediumFactory.userInsert();
+    await userRepo.create(user2);
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: user2.id });
+    await assetRepo.create(asset);
+    await albumRepo.create({ ownerId: user2.id }, [asset.id], []);
+
+    await expect(testSync(auth, [SyncRequestType.AlbumToAssetsV1])).resolves.toHaveLength(0);
+  });
+
+  it('should backfill album to assets when a user shares an album with you', async () => {
+    const { auth, sut, testSync, getRepository } = await setup();
+
+    const userRepo = getRepository('user');
+    const user2 = mediumFactory.userInsert();
+    await userRepo.create(user2);
+
+    const assetRepo = getRepository('asset');
+    const album1Asset = mediumFactory.assetInsert({ ownerId: user2.id });
+    await assetRepo.create(album1Asset);
+    const album2Asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
+    await assetRepo.create(album2Asset);
+
+    // Backfill album
+    const albumRepo = getRepository('album');
+    const album2 = mediumFactory.albumInsert({ ownerId: user2.id });
+    await albumRepo.create(album2, [album2Asset.id], []);
+
+    await wait(2);
+
+    const album1 = mediumFactory.albumInsert({ ownerId: auth.user.id });
+    await albumRepo.create(album1, [album1Asset.id], []);
+
+    const response = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          albumId: album1.id,
+          assetId: album1Asset.id,
+        },
+        type: SyncEntityType.AlbumToAssetV1,
+      },
+    ]);
+
+    // ack initial album to asset sync
+    const acks = response.map(({ ack }) => ack);
+    await sut.setAcks(auth, { acks });
+
+    // add user to backfill album
+    const albumUserRepo = getRepository('albumUser');
+    await albumUserRepo.create({ albumsId: album2.id, usersId: auth.user.id, role: AlbumUserRole.EDITOR });
+
+    // should backfill the album to asset relation
+    const backfillResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(backfillResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          albumId: album2.id,
+          assetId: album2Asset.id,
+        }),
+        type: SyncEntityType.AlbumToAssetBackfillV1,
+      },
+      {
+        ack: expect.stringContaining(SyncEntityType.AlbumToAssetBackfillV1),
+        data: {},
+        type: SyncEntityType.SyncAckV1,
+      },
+    ]);
+
+    await sut.setAcks(auth, { acks: [backfillResponse[1].ack] });
+
+    const finalResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(finalResponse).toEqual([]);
+  });
+
+  it('should detect and sync a deleted album to asset relation', async () => {
+    const { auth, sut, getRepository, testSync } = await setup();
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
+    await assetRepo.create(asset);
+    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
+    await albumRepo.create(album, [asset.id], []);
+
+    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+
+    expect(initialSyncResponse).toHaveLength(1);
+    expect(initialSyncResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          albumId: album.id,
+          assetId: asset.id,
+        },
+        type: SyncEntityType.AlbumToAssetV1,
+      },
+    ]);
+
+    const acks = [initialSyncResponse[0].ack];
+    await sut.setAcks(auth, { acks });
+
+    await albumRepo.removeAssetIds(album.id, [asset.id]);
+
+    await wait(2);
+
+    const syncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(syncResponse).toHaveLength(1);
+    expect(syncResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          albumId: album.id,
+          assetId: asset.id,
+        },
+        type: SyncEntityType.AlbumToAssetDeleteV1,
+      },
+    ]);
+
+    await sut.setAcks(auth, { acks: [syncResponse[0].ack] });
+
+    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(ackSyncResponse).toEqual([]);
+  });
+
+  it('should detect and sync a deleted album to asset relation when an asset is deleted', async () => {
+    const { auth, sut, getRepository, testSync } = await setup();
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
+    await assetRepo.create(asset);
+    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
+    await albumRepo.create(album, [asset.id], []);
+
+    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+
+    expect(initialSyncResponse).toHaveLength(1);
+    expect(initialSyncResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          albumId: album.id,
+          assetId: asset.id,
+        },
+        type: SyncEntityType.AlbumToAssetV1,
+      },
+    ]);
+
+    const acks = [initialSyncResponse[0].ack];
+    await sut.setAcks(auth, { acks });
+
+    await assetRepo.remove({ id: asset.id });
+
+    await wait(2);
+
+    const syncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(syncResponse).toHaveLength(1);
+    expect(syncResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          albumId: album.id,
+          assetId: asset.id,
+        },
+        type: SyncEntityType.AlbumToAssetDeleteV1,
+      },
+    ]);
+
+    await sut.setAcks(auth, { acks: [syncResponse[0].ack] });
+
+    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(ackSyncResponse).toEqual([]);
+  });
+
+  it('should not sync a deleted album to asset relation when the album is deleted', async () => {
+    const { auth, sut, getRepository, testSync } = await setup();
+
+    const albumRepo = getRepository('album');
+    const assetRepo = getRepository('asset');
+    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
+    await assetRepo.create(asset);
+    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
+    await albumRepo.create(album, [asset.id], []);
+
+    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+
+    expect(initialSyncResponse).toHaveLength(1);
+    expect(initialSyncResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          albumId: album.id,
+          assetId: asset.id,
+        },
+        type: SyncEntityType.AlbumToAssetV1,
+      },
+    ]);
+
+    const acks = [initialSyncResponse[0].ack];
+    await sut.setAcks(auth, { acks });
+
+    await albumRepo.delete(album.id);
+
+    await wait(2);
+
+    const syncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(syncResponse).toHaveLength(0);
+    expect(syncResponse).toEqual([]);
+  });
+});

From 4621ec5ea28fb803c00eeaadecb495218a2a34b6 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Thu, 26 Jun 2025 00:18:11 +0800
Subject: [PATCH 053/337] fix(web): load day group in asset viewer (#19523)

* fix(web): load day group in asset viewer

* fix: lint
---
 .../lib/components/photos-page/asset-grid.svelte   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelte
index ac6ec8906a..cf8f0fb879 100644
--- a/web/src/lib/components/photos-page/asset-grid.svelte
+++ b/web/src/lib/components/photos-page/asset-grid.svelte
@@ -30,7 +30,12 @@
   import { deleteAssets, updateStackedAssetInTimeline, updateUnstackedAssetInTimeline } from '$lib/utils/actions';
   import { archiveAssets, cancelMultiselect, selectAllAssets, stackAssets } from '$lib/utils/asset-utils';
   import { navigate } from '$lib/utils/navigation';
-  import { toTimelineAsset, type ScrubberListener, type TimelinePlainYearMonth } from '$lib/utils/timeline-util';
+  import {
+    getTimes,
+    toTimelineAsset,
+    type ScrubberListener,
+    type TimelinePlainYearMonth,
+  } from '$lib/utils/timeline-util';
   import { AssetVisibility, getAssetInfo, type AlbumResponseDto, type PersonResponseDto } from '@immich/sdk';
   import { DateTime } from 'luxon';
   import { onMount, type Snippet } from 'svelte';
@@ -768,6 +773,13 @@
       void selectAssetCandidates(lastAssetMouseEvent);
     }
   });
+
+  $effect(() => {
+    if ($showAssetViewer) {
+      const { localDateTime } = getTimes($viewingAsset.fileCreatedAt, DateTime.local().offset / 60);
+      void timelineManager.loadMonthGroup({ year: localDateTime.year, month: localDateTime.month });
+    }
+  });
 </script>
 
 <svelte:document onkeydown={onKeyDown} onkeyup={onKeyUp} onselectstart={onSelectStart} use:shortcuts={shortcutList} />

From 5f89c2d1113febef478180d9af8f8f0c7d64a7ee Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 25 Jun 2025 16:21:49 +0000
Subject: [PATCH 054/337] chore(deps): pin actions/cache action to 5a3ec84
 (#19529)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/build-mobile.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index 5c26965161..bb45456727 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -85,7 +85,7 @@ jobs:
 
       - name: Restore Gradle Cache
         id: cache-gradle-restore
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         with:
           path: |
             ~/.gradle/caches
@@ -142,7 +142,7 @@ jobs:
 
       - name: Save Gradle Cache
         id: cache-gradle-save
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         if: github.ref == 'refs/heads/main'
         with:
           path: |

From 64cc7239fe55f025dcb2341407c1717ae3f0d162 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Wed, 25 Jun 2025 11:37:25 -0500
Subject: [PATCH 055/337] feat(mobile): ios widget deeplink to asset in app
 (#19510)

* feat: ios widget deeplinks to asset in app

* fix: casing

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 mobile/ios/WidgetExtension/EntryGenerators.swift |  5 +++--
 mobile/ios/WidgetExtension/ImageWidgetView.swift |  2 ++
 mobile/ios/WidgetExtension/ImmichAPI.swift       | 14 +++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/mobile/ios/WidgetExtension/EntryGenerators.swift b/mobile/ios/WidgetExtension/EntryGenerators.swift
index 6c1e1d4118..81bcc2263e 100644
--- a/mobile/ios/WidgetExtension/EntryGenerators.swift
+++ b/mobile/ios/WidgetExtension/EntryGenerators.swift
@@ -3,7 +3,7 @@ import WidgetKit
 
 func buildEntry(
   api: ImmichAPI,
-  asset: SearchResult,
+  asset: Asset,
   dateOffset: Int,
   subtitle: String? = nil
 )
@@ -15,7 +15,8 @@ func buildEntry(
     to: Date.now
   )!
   let image = try await api.fetchImage(asset: asset)
-  return ImageEntry(date: entryDate, image: image, subtitle: subtitle)
+
+  return ImageEntry(date: entryDate, image: image, subtitle: subtitle, deepLink: asset.deepLink)
 }
 
 func generateRandomEntries(
diff --git a/mobile/ios/WidgetExtension/ImageWidgetView.swift b/mobile/ios/WidgetExtension/ImageWidgetView.swift
index 2c84acc074..a4bda9d845 100644
--- a/mobile/ios/WidgetExtension/ImageWidgetView.swift
+++ b/mobile/ios/WidgetExtension/ImageWidgetView.swift
@@ -6,6 +6,7 @@ struct ImageEntry: TimelineEntry {
   var image: UIImage?
   var subtitle: String? = nil
   var error: WidgetError? = nil
+  var deepLink: URL? = nil
 
   // Resizes the stored image to a maximum width of 450 pixels
   mutating func resize() {
@@ -54,6 +55,7 @@ struct ImmichWidgetView: View {
         }
         .padding(16)
       }
+      .widgetURL(entry.deepLink)
     }
   }
 }
diff --git a/mobile/ios/WidgetExtension/ImmichAPI.swift b/mobile/ios/WidgetExtension/ImmichAPI.swift
index 628c7311ee..65fc27be77 100644
--- a/mobile/ios/WidgetExtension/ImmichAPI.swift
+++ b/mobile/ios/WidgetExtension/ImmichAPI.swift
@@ -43,9 +43,13 @@ enum AssetType: String, Codable {
   case other = "OTHER"
 }
 
-struct SearchResult: Codable {
+struct Asset: Codable {
   let id: String
   let type: AssetType
+  
+  var deepLink: URL? {
+    return URL(string: "immich://asset?id=\(id)")
+  }
 }
 
 struct SearchFilters: Codable {
@@ -56,7 +60,7 @@ struct SearchFilters: Codable {
 
 struct MemoryResult: Codable {
   let id: String
-  var assets: [SearchResult]
+  var assets: [Asset]
   let type: String
 
   struct MemoryData: Codable {
@@ -127,7 +131,7 @@ class ImmichAPI {
   }
 
   func fetchSearchResults(with filters: SearchFilters) async throws
-    -> [SearchResult]
+    -> [Asset]
   {
     // get URL
     guard
@@ -147,7 +151,7 @@ class ImmichAPI {
     let (data, _) = try await URLSession.shared.data(for: request)
 
     // decode data
-    return try JSONDecoder().decode([SearchResult].self, from: data)
+    return try JSONDecoder().decode([Asset].self, from: data)
   }
 
   func fetchMemory(for date: Date) async throws -> [MemoryResult] {
@@ -172,7 +176,7 @@ class ImmichAPI {
     return try JSONDecoder().decode([MemoryResult].self, from: data)
   }
 
-  func fetchImage(asset: SearchResult) async throws(WidgetError) -> UIImage {
+  func fetchImage(asset: Asset) async throws(WidgetError) -> UIImage {
     let thumbnailParams = [URLQueryItem(name: "size", value: "preview")]
     let assetEndpoint = "/assets/" + asset.id + "/thumbnail"
 

From 65dce58aa42a70272f5faa87c84e93f8df224a62 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Wed, 25 Jun 2025 22:16:31 +0530
Subject: [PATCH 056/337] refactor(mobile): do not skip iCloud albums during
 local sync (#19231)

do not skip cloud albums during local sync

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../domain/services/local_sync.service.dart   | 21 ++-----------------
 .../infrastructure/sync.provider.dart         |  2 --
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/mobile/lib/domain/services/local_sync.service.dart b/mobile/lib/domain/services/local_sync.service.dart
index 2fdb0e82c5..882bb801ec 100644
--- a/mobile/lib/domain/services/local_sync.service.dart
+++ b/mobile/lib/domain/services/local_sync.service.dart
@@ -4,8 +4,6 @@ import 'package:collection/collection.dart';
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/local_album.model.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/presentation/pages/dev/dev_logger.dart';
@@ -17,22 +15,16 @@ class LocalSyncService {
   final DriftLocalAlbumRepository _localAlbumRepository;
   final NativeSyncApi _nativeSyncApi;
   final Platform _platform;
-  final StoreService _storeService;
   final Logger _log = Logger("DeviceSyncService");
 
   LocalSyncService({
     required DriftLocalAlbumRepository localAlbumRepository,
     required NativeSyncApi nativeSyncApi,
-    required StoreService storeService,
     Platform? platform,
   })  : _localAlbumRepository = localAlbumRepository,
         _nativeSyncApi = nativeSyncApi,
-        _storeService = storeService,
         _platform = platform ?? const LocalPlatform();
 
-  bool get _ignoreIcloudAssets =>
-      _storeService.get(StoreKey.ignoreIcloudAssets, false) == true;
-
   Future<void> sync({bool full = false}) async {
     final Stopwatch stopwatch = Stopwatch()..start();
     try {
@@ -84,11 +76,7 @@ class LocalSyncService {
             );
             continue;
           }
-          if (_ignoreIcloudAssets) {
-            await removeAlbum(dbAlbum);
-          } else {
-            await updateAlbum(dbAlbum, album);
-          }
+          await updateAlbum(dbAlbum, album);
         }
       }
 
@@ -106,12 +94,7 @@ class LocalSyncService {
     try {
       final Stopwatch stopwatch = Stopwatch()..start();
 
-      List<PlatformAlbum> deviceAlbums =
-          List.of(await _nativeSyncApi.getAlbums());
-      if (_platform.isIOS && _ignoreIcloudAssets) {
-        deviceAlbums.removeWhere((album) => album.isCloud);
-      }
-
+      final deviceAlbums = await _nativeSyncApi.getAlbums();
       final dbAlbums =
           await _localAlbumRepository.getAll(sortBy: {SortLocalAlbumsBy.id});
 
diff --git a/mobile/lib/providers/infrastructure/sync.provider.dart b/mobile/lib/providers/infrastructure/sync.provider.dart
index 706deacb04..2406c37fa8 100644
--- a/mobile/lib/providers/infrastructure/sync.provider.dart
+++ b/mobile/lib/providers/infrastructure/sync.provider.dart
@@ -11,7 +11,6 @@ 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/providers/infrastructure/store.provider.dart';
 
 final syncStreamServiceProvider = Provider(
   (ref) => SyncStreamService(
@@ -33,7 +32,6 @@ final localSyncServiceProvider = Provider(
   (ref) => LocalSyncService(
     localAlbumRepository: ref.watch(localAlbumRepository),
     nativeSyncApi: ref.watch(nativeSyncApiProvider),
-    storeService: ref.watch(storeServiceProvider),
   ),
 );
 

From 6c11ef62e8cf21dca3e17c0dc4275070982eae18 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Wed, 25 Jun 2025 19:55:17 +0200
Subject: [PATCH 057/337] fix: don't use @master action version (#19526)

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f3644ff74e..a6d368532d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -609,7 +609,7 @@ jobs:
           persist-credentials: false
 
       - name: Run ShellCheck
-        uses: ludeeus/action-shellcheck@master
+        uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # 2.0.0
         with:
           ignore_paths: >-
             **/open-api/**

From 48be10e48b7905865190af5d987244dfd5a84abc Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Wed, 25 Jun 2025 21:37:40 +0200
Subject: [PATCH 058/337] fix: don't exclude .github folder from make
 install-all (#19534)

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 Makefile              | 2 +-
 web/package-lock.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a9e36caf8a..590ed3e126 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ test-medium-dev:
 	docker exec -it immich_server /bin/sh -c "npm run test:medium"
 
 build-all: $(foreach M,$(filter-out e2e .github,$(MODULES)),build-$M) ;
-install-all: $(foreach M,$(filter-out .github,$(MODULES)),install-$M) ;
+install-all: $(foreach M,$(MODULES),install-$M) ;  
 ci-all: $(foreach M,$(filter-out .github,$(MODULES)),ci-$M) ;
 check-all: $(foreach M,$(filter-out sdk cli docs .github,$(MODULES)),check-$M) ;
 lint-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),lint-$M) ;
diff --git a/web/package-lock.json b/web/package-lock.json
index 80908f2462..290dfaf23e 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -93,7 +93,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.31",
+        "@types/node": "^22.15.32",
         "typescript": "^5.3.3"
       }
     },

From 5f76cdddc75b9c296dc2ea37b224edc429b87b3e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 25 Jun 2025 20:37:53 +0100
Subject: [PATCH 059/337] chore(deps): update ghcr.io/astral-sh/uv:latest
 docker digest to 9653efd (#19530)

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

diff --git a/machine-learning/Dockerfile b/machine-learning/Dockerfile
index b2e389af8f..372982af67 100644
--- a/machine-learning/Dockerfile
+++ b/machine-learning/Dockerfile
@@ -59,7 +59,7 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 
 RUN apt-get update && apt-get install -y --no-install-recommends g++
 
-COPY --from=ghcr.io/astral-sh/uv:latest@sha256:cda0fdc9b6066975ba4c791597870d18bc3a441dfc18ab24c5e888c16e15780c /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:latest@sha256:9653efd4380d5a0e5511e337dcfc3b8ba5bc4e6ea7fa3be7716598261d5503fa /uv /uvx /bin/
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \

From 2a8019726c7a54c93eccc21e6681e62a89986be0 Mon Sep 17 00:00:00 2001
From: Matthew Momjian <50788000+mmomjian@users.noreply.github.com>
Date: Wed, 25 Jun 2025 15:38:37 -0400
Subject: [PATCH 060/337] feat(deployment): add shm_size for PG (#19472)

---
 docker/docker-compose.dev.yml  | 1 +
 docker/docker-compose.prod.yml | 1 +
 docker/docker-compose.yml      | 1 +
 docs/docs/FAQ.mdx              | 4 ++--
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index f44f8dae05..0694bf57f2 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -134,6 +134,7 @@ services:
       - ${UPLOAD_LOCATION}/postgres:/var/lib/postgresql/data
     ports:
       - 5432:5432
+    shm_size: 128mb
   # set IMMICH_TELEMETRY_INCLUDE=all in .env to enable metrics
   # immich-prometheus:
   #   container_name: immich_prometheus
diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
index 18348620ca..b293260555 100644
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -75,6 +75,7 @@ services:
       - ${UPLOAD_LOCATION}/postgres:/var/lib/postgresql/data
     ports:
       - 5432:5432
+    shm_size: 128mb
     restart: always
 
   # set IMMICH_TELEMETRY_INCLUDE=all in .env to enable metrics
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index c9ddee2a62..95d375ccd6 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -67,6 +67,7 @@ services:
     volumes:
       # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file
       - ${DB_DATA_LOCATION}:/var/lib/postgresql/data
+    shm_size: 128mb
     restart: always
 
 volumes:
diff --git a/docs/docs/FAQ.mdx b/docs/docs/FAQ.mdx
index 24aa8e5d1b..906d9fd355 100644
--- a/docs/docs/FAQ.mdx
+++ b/docs/docs/FAQ.mdx
@@ -458,7 +458,7 @@ A result of `on` means that checksums are enabled.
 <summary>Check if checksums are enabled</summary>
 
 ```bash
-docker exec -it immich_postgres psql --dbname=postgres --username=<DB_USERNAME> --command="show data_checksums"
+docker exec -it immich_postgres psql --dbname=postgres --username=postgres --command="show data_checksums"
  data_checksums
 ----------------
  on
@@ -473,7 +473,7 @@ If checksums are enabled, you can check the status of the database with the foll
 <summary>Check for database corruption</summary>
 
 ```bash
-docker exec -it immich_postgres psql --dbname=postgres --username=<DB_USERNAME> --command="SELECT datname, checksum_failures, checksum_last_failure FROM pg_stat_database WHERE datname IS NOT NULL"
+docker exec -it immich_postgres psql --dbname=postgres --username=postgres --command="SELECT datname, checksum_failures, checksum_last_failure FROM pg_stat_database WHERE datname IS NOT NULL"
   datname  | checksum_failures | checksum_last_failure
 -----------+-------------------+-----------------------
  postgres  |                 0 |

From fda22c83b9907692fe02071fbb0e9788b85cdae5 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Thu, 26 Jun 2025 07:12:56 +0530
Subject: [PATCH 061/337] fix: sync stream album assets type order (#19540)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 server/src/services/sync.service.ts              | 2 +-
 server/test/medium/specs/sync/sync-types.spec.ts | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 8293ae33b9..47189cb033 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -58,9 +58,9 @@ export const SYNC_TYPES_ORDER = [
   SyncRequestType.PartnersV1,
   SyncRequestType.AssetsV1,
   SyncRequestType.PartnerAssetsV1,
+  SyncRequestType.AlbumAssetsV1,
   SyncRequestType.AlbumsV1,
   SyncRequestType.AlbumUsersV1,
-  SyncRequestType.AlbumAssetsV1,
   SyncRequestType.AlbumToAssetsV1,
   SyncRequestType.AssetExifsV1,
   SyncRequestType.AlbumAssetExifsV1,
diff --git a/server/test/medium/specs/sync/sync-types.spec.ts b/server/test/medium/specs/sync/sync-types.spec.ts
index 1af5a68fd6..737db068ba 100644
--- a/server/test/medium/specs/sync/sync-types.spec.ts
+++ b/server/test/medium/specs/sync/sync-types.spec.ts
@@ -9,4 +9,11 @@ describe('types', () => {
 
     expect(SYNC_TYPES_ORDER.length).toBe(Object.keys(SyncRequestType).length);
   });
+
+  it('should ensure album follows albums assets', () => {
+    const albumIndex = SYNC_TYPES_ORDER.indexOf(SyncRequestType.AlbumsV1);
+    const albumAssetsIndex = SYNC_TYPES_ORDER.indexOf(SyncRequestType.AlbumAssetsV1);
+
+    expect(albumIndex).toBeGreaterThan(albumAssetsIndex);
+  });
 });

From 24a4cba9535e8b8dcd03091829926614b1092159 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Thu, 26 Jun 2025 07:58:17 +0530
Subject: [PATCH 062/337] fix: enable photo manager custom filter by default
 (#19520)

enable photo manager custom filter by default

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../lib/repositories/album_media.repository.dart |  2 +-
 mobile/lib/services/app_settings.service.dart    |  2 +-
 mobile/lib/utils/migration.dart                  | 16 ++++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/mobile/lib/repositories/album_media.repository.dart b/mobile/lib/repositories/album_media.repository.dart
index b3d31f4a1b..94f1d0581e 100644
--- a/mobile/lib/repositories/album_media.repository.dart
+++ b/mobile/lib/repositories/album_media.repository.dart
@@ -14,7 +14,7 @@ class AlbumMediaRepository {
   const AlbumMediaRepository();
 
   bool get useCustomFilter =>
-      Store.get(StoreKey.photoManagerCustomFilter, false);
+      Store.get(StoreKey.photoManagerCustomFilter, true);
 
   FilterOptionGroup? _getAlbumFilter({
     DateTimeCond? updateTimeCond,
diff --git a/mobile/lib/services/app_settings.service.dart b/mobile/lib/services/app_settings.service.dart
index 76fd5e1ff6..8d1f7c24a5 100644
--- a/mobile/lib/services/app_settings.service.dart
+++ b/mobile/lib/services/app_settings.service.dart
@@ -88,7 +88,7 @@ enum AppSettingsEnum<T> {
   photoManagerCustomFilter<bool>(
     StoreKey.photoManagerCustomFilter,
     null,
-    false,
+    true,
   ),
   ;
 
diff --git a/mobile/lib/utils/migration.dart b/mobile/lib/utils/migration.dart
index 6bcf92d402..3ec8ce5bbc 100644
--- a/mobile/lib/utils/migration.dart
+++ b/mobile/lib/utils/migration.dart
@@ -23,7 +23,7 @@ import 'package:isar/isar.dart';
 // ignore: import_rule_photo_manager
 import 'package:photo_manager/photo_manager.dart';
 
-const int targetVersion = 12;
+const int targetVersion = 13;
 
 Future<void> migrateDatabaseIfNeeded(Isar db) async {
   final int version = Store.get(StoreKey.version, targetVersion);
@@ -56,14 +56,18 @@ Future<void> migrateDatabaseIfNeeded(Isar db) async {
     await drift.close();
   }
 
+  if (version < 13) {
+    await Store.put(StoreKey.photoManagerCustomFilter, true);
+  }
+
+  if (targetVersion >= 12) {
+    await Store.put(StoreKey.version, targetVersion);
+    return;
+  }
+
   final shouldTruncate = version < 8 || version < targetVersion;
 
   if (shouldTruncate) {
-    if (targetVersion == 12) {
-      await Store.put(StoreKey.version, targetVersion);
-      return;
-    }
-
     await _migrateTo(db, targetVersion);
   }
 }

From ea3a14ed2545beb78ce59c6f0b19487705becdb3 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Thu, 26 Jun 2025 19:20:39 +0530
Subject: [PATCH 063/337] feat(mobile): add album asset sync (#19522)

* feat(mobile): add album asset sync

* add SyncAlbumToAssetDeleteV1 to openapi-spec

* update delete queries to use where in statements

* clear remote album when clear remote data

* fix: bad merge

* fix: bad merge

* fix: _SyncAckV1 return type

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: wuzihao051119 <wuzihao051119@outlook.com>
Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
---
 .../drift_schemas/main/drift_schema_v1.json   |   2 +-
 .../lib/domain/models/album/album.model.dart  |  79 ++
 .../models/{ => album}/local_album.model.dart |   0
 .../domain/services/local_sync.service.dart   |   2 +-
 .../domain/services/sync_stream.service.dart  |  71 +-
 .../lib/domain/services/timeline.service.dart |   7 +
 .../entities/local_album.entity.dart          |   2 +-
 .../entities/local_album.entity.drift.dart    |   2 +-
 .../entities/remote_album.entity.dart         |  34 +
 .../entities/remote_album.entity.drift.dart   | 946 ++++++++++++++++++
 .../entities/remote_album_asset.entity.dart   |  17 +
 .../remote_album_asset.entity.drift.dart      | 565 +++++++++++
 .../entities/remote_album_user.entity.dart    |  20 +
 .../remote_album_user.entity.drift.dart       | 618 ++++++++++++
 .../entities/remote_asset.entity.dart         |  19 +
 .../repositories/db.repository.dart           |   6 +
 .../repositories/db.repository.drift.dart     |  78 +-
 .../repositories/local_album.repository.dart  |   2 +-
 .../repositories/remote_album.repository.dart |  45 +
 .../repositories/sync_api.repository.dart     |  28 +-
 .../repositories/sync_stream.repository.dart  | 261 +++--
 .../repositories/timeline.repository.dart     |  57 ++
 .../pages/dev/feat_in_development.page.dart   |   3 +
 .../pages/dev/media_stat.page.dart            |  53 +-
 .../pages/dev/remote_timeline.page.dart       |  32 +
 .../infrastructure/album.provider.dart        |   5 +
 mobile/lib/repositories/auth.repository.dart  |   6 +
 mobile/lib/routing/router.dart                |   5 +
 mobile/lib/routing/router.gr.dart             |  37 +
 mobile/openapi/README.md                      |   1 +
 mobile/openapi/lib/api.dart                   |   1 +
 mobile/openapi/lib/api_client.dart            |   2 +
 .../model/sync_album_to_asset_delete_v1.dart  | 107 ++
 .../services/sync_stream_service_test.dart    |  24 +-
 mobile/test/fixtures/album.stub.dart          |   2 +-
 .../local_album_repository_test.dart          |   2 +-
 mobile/test/test_utils/medium_factory.dart    |   2 +-
 open-api/immich-openapi-specs.json            |  15 +
 server/src/dtos/sync.dto.ts                   |   1 +
 39 files changed, 3059 insertions(+), 100 deletions(-)
 create mode 100644 mobile/lib/domain/models/album/album.model.dart
 rename mobile/lib/domain/models/{ => album}/local_album.model.dart (100%)
 create mode 100644 mobile/lib/infrastructure/entities/remote_album.entity.dart
 create mode 100644 mobile/lib/infrastructure/entities/remote_album.entity.drift.dart
 create mode 100644 mobile/lib/infrastructure/entities/remote_album_asset.entity.dart
 create mode 100644 mobile/lib/infrastructure/entities/remote_album_asset.entity.drift.dart
 create mode 100644 mobile/lib/infrastructure/entities/remote_album_user.entity.dart
 create mode 100644 mobile/lib/infrastructure/entities/remote_album_user.entity.drift.dart
 create mode 100644 mobile/lib/infrastructure/repositories/remote_album.repository.dart
 create mode 100644 mobile/lib/presentation/pages/dev/remote_timeline.page.dart
 create mode 100644 mobile/openapi/lib/model/sync_album_to_asset_delete_v1.dart

diff --git a/mobile/drift_schemas/main/drift_schema_v1.json b/mobile/drift_schemas/main/drift_schema_v1.json
index 1b2c86026c..3663d35b56 100644
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
@@ -1 +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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":"int","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":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"latitude","getter_name":"latitude","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"longitude","getter_name":"longitude","moor_type":"int","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":"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":11,"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":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":"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<AssetOrder>(AssetOrder.values)","dart_type_name":"AssetOrder"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":12,"references":[1,11],"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":13,"references":[11,0],"type":"table","data":{"name":"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"]}}]}
\ No newline at end of file
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":"int","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":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"latitude","getter_name":"latitude","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"longitude","getter_name":"longitude","moor_type":"int","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":"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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"]}}]}
\ No newline at end of file
diff --git a/mobile/lib/domain/models/album/album.model.dart b/mobile/lib/domain/models/album/album.model.dart
new file mode 100644
index 0000000000..1f433b84fe
--- /dev/null
+++ b/mobile/lib/domain/models/album/album.model.dart
@@ -0,0 +1,79 @@
+enum AlbumAssetOrder {
+  // do not change this order!
+  asc,
+  desc,
+}
+
+enum AlbumUserRole {
+  // do not change this order!
+  editor,
+  viewer,
+}
+
+// Model for an album stored in the server
+class Album {
+  final String id;
+  final String name;
+  final String ownerId;
+  final String description;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final String? thumbnailAssetId;
+  final bool isActivityEnabled;
+  final AlbumAssetOrder order;
+
+  const Album({
+    required this.id,
+    required this.name,
+    required this.ownerId,
+    required this.description,
+    required this.createdAt,
+    required this.updatedAt,
+    this.thumbnailAssetId,
+    required this.isActivityEnabled,
+    required this.order,
+  });
+
+  @override
+  String toString() {
+    return '''Album {
+   id: $id,
+   name: $name,
+   ownerId: $ownerId,
+   description: $description,
+   createdAt: $createdAt,
+   updatedAt: $updatedAt,
+   isActivityEnabled: $isActivityEnabled,
+   order: $order,
+   thumbnailAssetId: ${thumbnailAssetId ?? "<NA>"}
+ }''';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! Album) return false;
+    if (identical(this, other)) return true;
+    return id == other.id &&
+        name == other.name &&
+        ownerId == other.ownerId &&
+        description == other.description &&
+        createdAt == other.createdAt &&
+        updatedAt == other.updatedAt &&
+        thumbnailAssetId == other.thumbnailAssetId &&
+        isActivityEnabled == other.isActivityEnabled &&
+        order == other.order;
+  }
+
+  @override
+  int get hashCode {
+    return id.hashCode ^
+        name.hashCode ^
+        ownerId.hashCode ^
+        description.hashCode ^
+        createdAt.hashCode ^
+        updatedAt.hashCode ^
+        thumbnailAssetId.hashCode ^
+        isActivityEnabled.hashCode ^
+        order.hashCode;
+  }
+}
diff --git a/mobile/lib/domain/models/local_album.model.dart b/mobile/lib/domain/models/album/local_album.model.dart
similarity index 100%
rename from mobile/lib/domain/models/local_album.model.dart
rename to mobile/lib/domain/models/album/local_album.model.dart
diff --git a/mobile/lib/domain/services/local_sync.service.dart b/mobile/lib/domain/services/local_sync.service.dart
index 882bb801ec..7a61dbc0c7 100644
--- a/mobile/lib/domain/services/local_sync.service.dart
+++ b/mobile/lib/domain/services/local_sync.service.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:collection/collection.dart';
 import 'package:flutter/widgets.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/local_album.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/presentation/pages/dev/dev_logger.dart';
diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index d612e83368..2160018df5 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -76,11 +76,76 @@ class SyncStreamService {
       case SyncEntityType.assetExifV1:
         return _syncStreamRepository.updateAssetsExifV1(data.cast());
       case SyncEntityType.partnerAssetV1:
-        return _syncStreamRepository.updatePartnerAssetsV1(data.cast());
+        return _syncStreamRepository.updateAssetsV1(
+          data.cast(),
+          debugLabel: 'partner',
+        );
+      case SyncEntityType.partnerAssetBackfillV1:
+        return _syncStreamRepository.updateAssetsV1(
+          data.cast(),
+          debugLabel: 'partner backfill',
+        );
       case SyncEntityType.partnerAssetDeleteV1:
-        return _syncStreamRepository.deletePartnerAssetsV1(data.cast());
+        return _syncStreamRepository.deleteAssetsV1(
+          data.cast(),
+          debugLabel: "partner",
+        );
       case SyncEntityType.partnerAssetExifV1:
-        return _syncStreamRepository.updatePartnerAssetsExifV1(data.cast());
+        return _syncStreamRepository.updateAssetsExifV1(
+          data.cast(),
+          debugLabel: 'partner',
+        );
+      case SyncEntityType.partnerAssetExifBackfillV1:
+        return _syncStreamRepository.updateAssetsExifV1(
+          data.cast(),
+          debugLabel: 'partner backfill',
+        );
+      case SyncEntityType.albumV1:
+        return _syncStreamRepository.updateAlbumsV1(data.cast());
+      case SyncEntityType.albumDeleteV1:
+        return _syncStreamRepository.deleteAlbumsV1(data.cast());
+      case SyncEntityType.albumUserV1:
+        return _syncStreamRepository.updateAlbumUsersV1(data.cast());
+      case SyncEntityType.albumUserBackfillV1:
+        return _syncStreamRepository.updateAlbumUsersV1(
+          data.cast(),
+          debugLabel: 'backfill',
+        );
+      case SyncEntityType.albumUserDeleteV1:
+        return _syncStreamRepository.deleteAlbumUsersV1(data.cast());
+      case SyncEntityType.albumAssetV1:
+        return _syncStreamRepository.updateAssetsV1(
+          data.cast(),
+          debugLabel: 'album',
+        );
+      case SyncEntityType.albumAssetBackfillV1:
+        return _syncStreamRepository.updateAssetsV1(
+          data.cast(),
+          debugLabel: 'album backfill',
+        );
+      case SyncEntityType.albumAssetExifV1:
+        return _syncStreamRepository.updateAssetsExifV1(
+          data.cast(),
+          debugLabel: 'album',
+        );
+      case SyncEntityType.albumAssetExifBackfillV1:
+        return _syncStreamRepository.updateAssetsExifV1(
+          data.cast(),
+          debugLabel: 'album backfill',
+        );
+      case SyncEntityType.albumToAssetV1:
+        return _syncStreamRepository.updateAlbumToAssetsV1(data.cast());
+      case SyncEntityType.albumToAssetBackfillV1:
+        return _syncStreamRepository.updateAlbumToAssetsV1(
+          data.cast(),
+          debugLabel: 'backfill',
+        );
+      case SyncEntityType.albumToAssetDeleteV1:
+        return _syncStreamRepository.deleteAlbumToAssetsV1(data.cast());
+      // No-op. SyncAckV1 entities are checkpoints in the sync stream
+      // to acknowledge that the client has processed all the backfill events
+      case SyncEntityType.syncAckV1:
+        return;
       default:
         _logger.warning("Unknown sync data type: $type");
     }
diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 225f7a89b1..1dd2dfa150 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -45,6 +45,13 @@ class TimelineFactory {
         bucketSource: () =>
             _timelineRepository.watchLocalBucket(albumId, groupBy: groupBy),
       );
+
+  TimelineService remoteAlbum({required String albumId}) => TimelineService(
+        assetSource: (offset, count) => _timelineRepository
+            .getRemoteBucketAssets(albumId, offset: offset, count: count),
+        bucketSource: () =>
+            _timelineRepository.watchRemoteBucket(albumId, groupBy: groupBy),
+      );
 }
 
 class TimelineService {
diff --git a/mobile/lib/infrastructure/entities/local_album.entity.dart b/mobile/lib/infrastructure/entities/local_album.entity.dart
index 9657173c3c..398c5d4e44 100644
--- a/mobile/lib/infrastructure/entities/local_album.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_album.entity.dart
@@ -1,5 +1,5 @@
 import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/models/local_album.model.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 
 class LocalAlbumEntity extends Table with DriftDefaultsMixin {
diff --git a/mobile/lib/infrastructure/entities/local_album.entity.drift.dart b/mobile/lib/infrastructure/entities/local_album.entity.drift.dart
index ff6226ba3f..06f65e25d8 100644
--- a/mobile/lib/infrastructure/entities/local_album.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/local_album.entity.drift.dart
@@ -3,7 +3,7 @@
 import 'package:drift/drift.dart' as i0;
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart'
     as i1;
-import 'package:immich_mobile/domain/models/local_album.model.dart' as i2;
+import 'package:immich_mobile/domain/models/album/local_album.model.dart' as i2;
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart'
     as i3;
 import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
diff --git a/mobile/lib/infrastructure/entities/remote_album.entity.dart b/mobile/lib/infrastructure/entities/remote_album.entity.dart
new file mode 100644
index 0000000000..377d67446f
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/remote_album.entity.dart
@@ -0,0 +1,34 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class RemoteAlbumEntity extends Table with DriftDefaultsMixin {
+  const RemoteAlbumEntity();
+
+  TextColumn get id => text()();
+
+  TextColumn get name => text()();
+
+  TextColumn get description => text().withDefault(const Constant(''))();
+
+  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+
+  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+
+  TextColumn get ownerId =>
+      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get thumbnailAssetId => text()
+      .references(RemoteAssetEntity, #id, onDelete: KeyAction.setNull)
+      .nullable()();
+
+  BoolColumn get isActivityEnabled =>
+      boolean().withDefault(const Constant(true))();
+
+  IntColumn get order => intEnum<AlbumAssetOrder>()();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}
diff --git a/mobile/lib/infrastructure/entities/remote_album.entity.drift.dart b/mobile/lib/infrastructure/entities/remote_album.entity.drift.dart
new file mode 100644
index 0000000000..bc13c8cb5c
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/remote_album.entity.drift.dart
@@ -0,0 +1,946 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/domain/models/album/album.model.dart' as i2;
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart'
+    as i3;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
+import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
+    as i5;
+import 'package:drift/internal/modular.dart' as i6;
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
+    as i7;
+
+typedef $$RemoteAlbumEntityTableCreateCompanionBuilder
+    = i1.RemoteAlbumEntityCompanion Function({
+  required String id,
+  required String name,
+  i0.Value<String> description,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  required String ownerId,
+  i0.Value<String?> thumbnailAssetId,
+  i0.Value<bool> isActivityEnabled,
+  required i2.AlbumAssetOrder order,
+});
+typedef $$RemoteAlbumEntityTableUpdateCompanionBuilder
+    = i1.RemoteAlbumEntityCompanion Function({
+  i0.Value<String> id,
+  i0.Value<String> name,
+  i0.Value<String> description,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  i0.Value<String> ownerId,
+  i0.Value<String?> thumbnailAssetId,
+  i0.Value<bool> isActivityEnabled,
+  i0.Value<i2.AlbumAssetOrder> order,
+});
+
+final class $$RemoteAlbumEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumEntityTable,
+    i1.RemoteAlbumEntityData> {
+  $$RemoteAlbumEntityTableReferences(
+      super.$_db, super.$_table, super.$_typedResult);
+
+  static i5.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
+      i6.ReadDatabaseContainer(db)
+          .resultSet<i5.$UserEntityTable>('user_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumEntityTable>('remote_album_entity')
+                  .ownerId,
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i5.$UserEntityTable>('user_entity')
+                  .id));
+
+  i5.$$UserEntityTableProcessedTableManager get ownerId {
+    final $_column = $_itemColumn<String>('owner_id')!;
+
+    final manager = i5
+        .$$UserEntityTableTableManager(
+            $_db,
+            i6.ReadDatabaseContainer($_db)
+                .resultSet<i5.$UserEntityTable>('user_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_ownerIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+
+  static i7.$RemoteAssetEntityTable _thumbnailAssetIdTable(
+          i0.GeneratedDatabase db) =>
+      i6.ReadDatabaseContainer(db)
+          .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumEntityTable>('remote_album_entity')
+                  .thumbnailAssetId,
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity')
+                  .id));
+
+  i7.$$RemoteAssetEntityTableProcessedTableManager? get thumbnailAssetId {
+    final $_column = $_itemColumn<String>('thumbnail_asset_id');
+    if ($_column == null) return null;
+    final manager = i7
+        .$$RemoteAssetEntityTableTableManager(
+            $_db,
+            i6.ReadDatabaseContainer($_db)
+                .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_thumbnailAssetIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$RemoteAlbumEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumEntityTable> {
+  $$RemoteAlbumEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get name => $composableBuilder(
+      column: $table.name, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get description => $composableBuilder(
+      column: $table.description,
+      builder: (column) => i0.ColumnFilters(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<bool> get isActivityEnabled => $composableBuilder(
+      column: $table.isActivityEnabled,
+      builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnWithTypeConverterFilters<i2.AlbumAssetOrder, i2.AlbumAssetOrder, int>
+      get order => $composableBuilder(
+          column: $table.order,
+          builder: (column) => i0.ColumnWithTypeConverterFilters(column));
+
+  i5.$$UserEntityTableFilterComposer get ownerId {
+    final i5.$$UserEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableFilterComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i7.$$RemoteAssetEntityTableFilterComposer get thumbnailAssetId {
+    final i7.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.thumbnailAssetId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i7.$$RemoteAssetEntityTableFilterComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumEntityTable> {
+  $$RemoteAlbumEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get name => $composableBuilder(
+      column: $table.name, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get description => $composableBuilder(
+      column: $table.description,
+      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<bool> get isActivityEnabled => $composableBuilder(
+      column: $table.isActivityEnabled,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get order => $composableBuilder(
+      column: $table.order, builder: (column) => i0.ColumnOrderings(column));
+
+  i5.$$UserEntityTableOrderingComposer get ownerId {
+    final i5.$$UserEntityTableOrderingComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableOrderingComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i7.$$RemoteAssetEntityTableOrderingComposer get thumbnailAssetId {
+    final i7.$$RemoteAssetEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.thumbnailAssetId,
+            referencedTable: i6.ReadDatabaseContainer($db)
+                .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i7.$$RemoteAssetEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i6.ReadDatabaseContainer($db)
+                      .resultSet<i7.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumEntityTable> {
+  $$RemoteAlbumEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get name =>
+      $composableBuilder(column: $table.name, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get description => $composableBuilder(
+      column: $table.description, 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<bool> get isActivityEnabled => $composableBuilder(
+      column: $table.isActivityEnabled, builder: (column) => column);
+
+  i0.GeneratedColumnWithTypeConverter<i2.AlbumAssetOrder, int> get order =>
+      $composableBuilder(column: $table.order, builder: (column) => column);
+
+  i5.$$UserEntityTableAnnotationComposer get ownerId {
+    final i5.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableAnnotationComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i7.$$RemoteAssetEntityTableAnnotationComposer get thumbnailAssetId {
+    final i7.$$RemoteAssetEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.thumbnailAssetId,
+            referencedTable: i6.ReadDatabaseContainer($db)
+                .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i7.$$RemoteAssetEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i6.ReadDatabaseContainer($db)
+                      .resultSet<i7.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumEntityTable,
+    i1.RemoteAlbumEntityData,
+    i1.$$RemoteAlbumEntityTableFilterComposer,
+    i1.$$RemoteAlbumEntityTableOrderingComposer,
+    i1.$$RemoteAlbumEntityTableAnnotationComposer,
+    $$RemoteAlbumEntityTableCreateCompanionBuilder,
+    $$RemoteAlbumEntityTableUpdateCompanionBuilder,
+    (i1.RemoteAlbumEntityData, i1.$$RemoteAlbumEntityTableReferences),
+    i1.RemoteAlbumEntityData,
+    i0.PrefetchHooks Function({bool ownerId, bool thumbnailAssetId})> {
+  $$RemoteAlbumEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$RemoteAlbumEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$RemoteAlbumEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () => i1
+              .$$RemoteAlbumEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$RemoteAlbumEntityTableAnnotationComposer(
+                  $db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> id = const i0.Value.absent(),
+            i0.Value<String> name = const i0.Value.absent(),
+            i0.Value<String> description = const i0.Value.absent(),
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<String> ownerId = const i0.Value.absent(),
+            i0.Value<String?> thumbnailAssetId = const i0.Value.absent(),
+            i0.Value<bool> isActivityEnabled = const i0.Value.absent(),
+            i0.Value<i2.AlbumAssetOrder> order = const i0.Value.absent(),
+          }) =>
+              i1.RemoteAlbumEntityCompanion(
+            id: id,
+            name: name,
+            description: description,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            ownerId: ownerId,
+            thumbnailAssetId: thumbnailAssetId,
+            isActivityEnabled: isActivityEnabled,
+            order: order,
+          ),
+          createCompanionCallback: ({
+            required String id,
+            required String name,
+            i0.Value<String> description = const i0.Value.absent(),
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            required String ownerId,
+            i0.Value<String?> thumbnailAssetId = const i0.Value.absent(),
+            i0.Value<bool> isActivityEnabled = const i0.Value.absent(),
+            required i2.AlbumAssetOrder order,
+          }) =>
+              i1.RemoteAlbumEntityCompanion.insert(
+            id: id,
+            name: name,
+            description: description,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            ownerId: ownerId,
+            thumbnailAssetId: thumbnailAssetId,
+            isActivityEnabled: isActivityEnabled,
+            order: order,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$RemoteAlbumEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({ownerId = false, thumbnailAssetId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (ownerId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.ownerId,
+                    referencedTable:
+                        i1.$$RemoteAlbumEntityTableReferences._ownerIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumEntityTableReferences
+                        ._ownerIdTable(db)
+                        .id,
+                  ) as T;
+                }
+                if (thumbnailAssetId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.thumbnailAssetId,
+                    referencedTable: i1.$$RemoteAlbumEntityTableReferences
+                        ._thumbnailAssetIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumEntityTableReferences
+                        ._thumbnailAssetIdTable(db)
+                        .id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$RemoteAlbumEntityTableProcessedTableManager
+    = i0.ProcessedTableManager<
+        i0.GeneratedDatabase,
+        i1.$RemoteAlbumEntityTable,
+        i1.RemoteAlbumEntityData,
+        i1.$$RemoteAlbumEntityTableFilterComposer,
+        i1.$$RemoteAlbumEntityTableOrderingComposer,
+        i1.$$RemoteAlbumEntityTableAnnotationComposer,
+        $$RemoteAlbumEntityTableCreateCompanionBuilder,
+        $$RemoteAlbumEntityTableUpdateCompanionBuilder,
+        (i1.RemoteAlbumEntityData, i1.$$RemoteAlbumEntityTableReferences),
+        i1.RemoteAlbumEntityData,
+        i0.PrefetchHooks Function({bool ownerId, bool thumbnailAssetId})>;
+
+class $RemoteAlbumEntityTable extends i3.RemoteAlbumEntity
+    with i0.TableInfo<$RemoteAlbumEntityTable, i1.RemoteAlbumEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $RemoteAlbumEntityTable(this.attachedDatabase, [this._alias]);
+  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 _nameMeta =
+      const i0.VerificationMeta('name');
+  @override
+  late final i0.GeneratedColumn<String> name = i0.GeneratedColumn<String>(
+      'name', aliasedName, false,
+      type: i0.DriftSqlType.string, requiredDuringInsert: true);
+  static const i0.VerificationMeta _descriptionMeta =
+      const i0.VerificationMeta('description');
+  @override
+  late final i0.GeneratedColumn<String> description =
+      i0.GeneratedColumn<String>('description', aliasedName, false,
+          type: i0.DriftSqlType.string,
+          requiredDuringInsert: false,
+          defaultValue: const i4.Constant(''));
+  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 _ownerIdMeta =
+      const i0.VerificationMeta('ownerId');
+  @override
+  late final i0.GeneratedColumn<String> ownerId = i0.GeneratedColumn<String>(
+      'owner_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES user_entity (id) ON DELETE CASCADE'));
+  static const i0.VerificationMeta _thumbnailAssetIdMeta =
+      const i0.VerificationMeta('thumbnailAssetId');
+  @override
+  late final i0.GeneratedColumn<String> thumbnailAssetId =
+      i0.GeneratedColumn<String>('thumbnail_asset_id', aliasedName, true,
+          type: i0.DriftSqlType.string,
+          requiredDuringInsert: false,
+          defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+              'REFERENCES remote_asset_entity (id) ON DELETE SET NULL'));
+  static const i0.VerificationMeta _isActivityEnabledMeta =
+      const i0.VerificationMeta('isActivityEnabled');
+  @override
+  late final i0.GeneratedColumn<bool> isActivityEnabled =
+      i0.GeneratedColumn<bool>('is_activity_enabled', aliasedName, false,
+          type: i0.DriftSqlType.bool,
+          requiredDuringInsert: false,
+          defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+              'CHECK ("is_activity_enabled" IN (0, 1))'),
+          defaultValue: const i4.Constant(true));
+  @override
+  late final i0.GeneratedColumnWithTypeConverter<i2.AlbumAssetOrder, int>
+      order = i0.GeneratedColumn<int>('order', aliasedName, false,
+              type: i0.DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<i2.AlbumAssetOrder>(
+              i1.$RemoteAlbumEntityTable.$converterorder);
+  @override
+  List<i0.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
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.RemoteAlbumEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('name')) {
+      context.handle(
+          _nameMeta, name.isAcceptableOrUnknown(data['name']!, _nameMeta));
+    } else if (isInserting) {
+      context.missing(_nameMeta);
+    }
+    if (data.containsKey('description')) {
+      context.handle(
+          _descriptionMeta,
+          description.isAcceptableOrUnknown(
+              data['description']!, _descriptionMeta));
+    }
+    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('owner_id')) {
+      context.handle(_ownerIdMeta,
+          ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta));
+    } else if (isInserting) {
+      context.missing(_ownerIdMeta);
+    }
+    if (data.containsKey('thumbnail_asset_id')) {
+      context.handle(
+          _thumbnailAssetIdMeta,
+          thumbnailAssetId.isAcceptableOrUnknown(
+              data['thumbnail_asset_id']!, _thumbnailAssetIdMeta));
+    }
+    if (data.containsKey('is_activity_enabled')) {
+      context.handle(
+          _isActivityEnabledMeta,
+          isActivityEnabled.isAcceptableOrUnknown(
+              data['is_activity_enabled']!, _isActivityEnabledMeta));
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.RemoteAlbumEntityData map(Map<String, dynamic> data,
+      {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.RemoteAlbumEntityData(
+      id: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}id'])!,
+      name: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}name'])!,
+      description: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}description'])!,
+      createdAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
+      updatedAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      ownerId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}owner_id'])!,
+      thumbnailAssetId: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.string, data['${effectivePrefix}thumbnail_asset_id']),
+      isActivityEnabled: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.bool, data['${effectivePrefix}is_activity_enabled'])!,
+      order: i1.$RemoteAlbumEntityTable.$converterorder.fromSql(attachedDatabase
+          .typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}order'])!),
+    );
+  }
+
+  @override
+  $RemoteAlbumEntityTable createAlias(String alias) {
+    return $RemoteAlbumEntityTable(attachedDatabase, alias);
+  }
+
+  static i0.JsonTypeConverter2<i2.AlbumAssetOrder, int, int> $converterorder =
+      const i0.EnumIndexConverter<i2.AlbumAssetOrder>(
+          i2.AlbumAssetOrder.values);
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteAlbumEntityData extends i0.DataClass
+    implements i0.Insertable<i1.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 i2.AlbumAssetOrder 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, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<String>(id);
+    map['name'] = i0.Variable<String>(name);
+    map['description'] = i0.Variable<String>(description);
+    map['created_at'] = i0.Variable<DateTime>(createdAt);
+    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    map['owner_id'] = i0.Variable<String>(ownerId);
+    if (!nullToAbsent || thumbnailAssetId != null) {
+      map['thumbnail_asset_id'] = i0.Variable<String>(thumbnailAssetId);
+    }
+    map['is_activity_enabled'] = i0.Variable<bool>(isActivityEnabled);
+    {
+      map['order'] = i0.Variable<int>(
+          i1.$RemoteAlbumEntityTable.$converterorder.toSql(order));
+    }
+    return map;
+  }
+
+  factory RemoteAlbumEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.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: i1.$RemoteAlbumEntityTable.$converterorder
+          .fromJson(serializer.fromJson<int>(json['order'])),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.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>(
+          i1.$RemoteAlbumEntityTable.$converterorder.toJson(order)),
+    };
+  }
+
+  i1.RemoteAlbumEntityData copyWith(
+          {String? id,
+          String? name,
+          String? description,
+          DateTime? createdAt,
+          DateTime? updatedAt,
+          String? ownerId,
+          i0.Value<String?> thumbnailAssetId = const i0.Value.absent(),
+          bool? isActivityEnabled,
+          i2.AlbumAssetOrder? order}) =>
+      i1.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(i1.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 i1.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 i0.UpdateCompanion<i1.RemoteAlbumEntityData> {
+  final i0.Value<String> id;
+  final i0.Value<String> name;
+  final i0.Value<String> description;
+  final i0.Value<DateTime> createdAt;
+  final i0.Value<DateTime> updatedAt;
+  final i0.Value<String> ownerId;
+  final i0.Value<String?> thumbnailAssetId;
+  final i0.Value<bool> isActivityEnabled;
+  final i0.Value<i2.AlbumAssetOrder> order;
+  const RemoteAlbumEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.name = const i0.Value.absent(),
+    this.description = const i0.Value.absent(),
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    this.ownerId = const i0.Value.absent(),
+    this.thumbnailAssetId = const i0.Value.absent(),
+    this.isActivityEnabled = const i0.Value.absent(),
+    this.order = const i0.Value.absent(),
+  });
+  RemoteAlbumEntityCompanion.insert({
+    required String id,
+    required String name,
+    this.description = const i0.Value.absent(),
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    required String ownerId,
+    this.thumbnailAssetId = const i0.Value.absent(),
+    this.isActivityEnabled = const i0.Value.absent(),
+    required i2.AlbumAssetOrder order,
+  })  : id = i0.Value(id),
+        name = i0.Value(name),
+        ownerId = i0.Value(ownerId),
+        order = i0.Value(order);
+  static i0.Insertable<i1.RemoteAlbumEntityData> custom({
+    i0.Expression<String>? id,
+    i0.Expression<String>? name,
+    i0.Expression<String>? description,
+    i0.Expression<DateTime>? createdAt,
+    i0.Expression<DateTime>? updatedAt,
+    i0.Expression<String>? ownerId,
+    i0.Expression<String>? thumbnailAssetId,
+    i0.Expression<bool>? isActivityEnabled,
+    i0.Expression<int>? order,
+  }) {
+    return i0.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,
+    });
+  }
+
+  i1.RemoteAlbumEntityCompanion copyWith(
+      {i0.Value<String>? id,
+      i0.Value<String>? name,
+      i0.Value<String>? description,
+      i0.Value<DateTime>? createdAt,
+      i0.Value<DateTime>? updatedAt,
+      i0.Value<String>? ownerId,
+      i0.Value<String?>? thumbnailAssetId,
+      i0.Value<bool>? isActivityEnabled,
+      i0.Value<i2.AlbumAssetOrder>? order}) {
+    return i1.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, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<String>(id.value);
+    }
+    if (name.present) {
+      map['name'] = i0.Variable<String>(name.value);
+    }
+    if (description.present) {
+      map['description'] = i0.Variable<String>(description.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
+    }
+    if (ownerId.present) {
+      map['owner_id'] = i0.Variable<String>(ownerId.value);
+    }
+    if (thumbnailAssetId.present) {
+      map['thumbnail_asset_id'] = i0.Variable<String>(thumbnailAssetId.value);
+    }
+    if (isActivityEnabled.present) {
+      map['is_activity_enabled'] = i0.Variable<bool>(isActivityEnabled.value);
+    }
+    if (order.present) {
+      map['order'] = i0.Variable<int>(
+          i1.$RemoteAlbumEntityTable.$converterorder.toSql(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();
+  }
+}
diff --git a/mobile/lib/infrastructure/entities/remote_album_asset.entity.dart b/mobile/lib/infrastructure/entities/remote_album_asset.entity.dart
new file mode 100644
index 0000000000..1dcc336ed8
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/remote_album_asset.entity.dart
@@ -0,0 +1,17 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class RemoteAlbumAssetEntity extends Table with DriftDefaultsMixin {
+  const RemoteAlbumAssetEntity();
+
+  TextColumn get assetId =>
+      text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get albumId =>
+      text().references(RemoteAlbumEntity, #id, onDelete: KeyAction.cascade)();
+
+  @override
+  Set<Column> get primaryKey => {assetId, albumId};
+}
diff --git a/mobile/lib/infrastructure/entities/remote_album_asset.entity.drift.dart b/mobile/lib/infrastructure/entities/remote_album_asset.entity.drift.dart
new file mode 100644
index 0000000000..ab50607c96
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/remote_album_asset.entity.drift.dart
@@ -0,0 +1,565 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart'
+    as i2;
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
+    as i3;
+import 'package:drift/internal/modular.dart' as i4;
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
+    as i5;
+
+typedef $$RemoteAlbumAssetEntityTableCreateCompanionBuilder
+    = i1.RemoteAlbumAssetEntityCompanion Function({
+  required String assetId,
+  required String albumId,
+});
+typedef $$RemoteAlbumAssetEntityTableUpdateCompanionBuilder
+    = i1.RemoteAlbumAssetEntityCompanion Function({
+  i0.Value<String> assetId,
+  i0.Value<String> albumId,
+});
+
+final class $$RemoteAlbumAssetEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumAssetEntityTable,
+    i1.RemoteAlbumAssetEntityData> {
+  $$RemoteAlbumAssetEntityTableReferences(
+      super.$_db, super.$_table, super.$_typedResult);
+
+  static i3.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
+      i4.ReadDatabaseContainer(db)
+          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumAssetEntityTable>(
+                      'remote_album_asset_entity')
+                  .assetId,
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+                  .id));
+
+  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
+    final $_column = $_itemColumn<String>('asset_id')!;
+
+    final manager = i3
+        .$$RemoteAssetEntityTableTableManager(
+            $_db,
+            i4.ReadDatabaseContainer($_db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_assetIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+
+  static i5.$RemoteAlbumEntityTable _albumIdTable(i0.GeneratedDatabase db) =>
+      i4.ReadDatabaseContainer(db)
+          .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumAssetEntityTable>(
+                      'remote_album_asset_entity')
+                  .albumId,
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity')
+                  .id));
+
+  i5.$$RemoteAlbumEntityTableProcessedTableManager get albumId {
+    final $_column = $_itemColumn<String>('album_id')!;
+
+    final manager = i5
+        .$$RemoteAlbumEntityTableTableManager(
+            $_db,
+            i4.ReadDatabaseContainer($_db)
+                .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_albumIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$RemoteAlbumAssetEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumAssetEntityTable> {
+  $$RemoteAlbumAssetEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableFilterComposer get assetId {
+    final i3.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.assetId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i3.$$RemoteAssetEntityTableFilterComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i5.$$RemoteAlbumEntityTableFilterComposer get albumId {
+    final i5.$$RemoteAlbumEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.albumId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$RemoteAlbumEntityTableFilterComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumAssetEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumAssetEntityTable> {
+  $$RemoteAlbumAssetEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableOrderingComposer get assetId {
+    final i3.$$RemoteAssetEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.assetId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i3.$$RemoteAssetEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i3.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i5.$$RemoteAlbumEntityTableOrderingComposer get albumId {
+    final i5.$$RemoteAlbumEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.albumId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i5.$$RemoteAlbumEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i5.$RemoteAlbumEntityTable>(
+                          'remote_album_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumAssetEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumAssetEntityTable> {
+  $$RemoteAlbumAssetEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableAnnotationComposer get assetId {
+    final i3.$$RemoteAssetEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.assetId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i3.$$RemoteAssetEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i3.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i5.$$RemoteAlbumEntityTableAnnotationComposer get albumId {
+    final i5.$$RemoteAlbumEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.albumId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i5.$$RemoteAlbumEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i5.$RemoteAlbumEntityTable>(
+                          'remote_album_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumAssetEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumAssetEntityTable,
+    i1.RemoteAlbumAssetEntityData,
+    i1.$$RemoteAlbumAssetEntityTableFilterComposer,
+    i1.$$RemoteAlbumAssetEntityTableOrderingComposer,
+    i1.$$RemoteAlbumAssetEntityTableAnnotationComposer,
+    $$RemoteAlbumAssetEntityTableCreateCompanionBuilder,
+    $$RemoteAlbumAssetEntityTableUpdateCompanionBuilder,
+    (i1.RemoteAlbumAssetEntityData, i1.$$RemoteAlbumAssetEntityTableReferences),
+    i1.RemoteAlbumAssetEntityData,
+    i0.PrefetchHooks Function({bool assetId, bool albumId})> {
+  $$RemoteAlbumAssetEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$RemoteAlbumAssetEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$RemoteAlbumAssetEntityTableFilterComposer(
+                  $db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$RemoteAlbumAssetEntityTableOrderingComposer(
+                  $db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$RemoteAlbumAssetEntityTableAnnotationComposer(
+                  $db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> assetId = const i0.Value.absent(),
+            i0.Value<String> albumId = const i0.Value.absent(),
+          }) =>
+              i1.RemoteAlbumAssetEntityCompanion(
+            assetId: assetId,
+            albumId: albumId,
+          ),
+          createCompanionCallback: ({
+            required String assetId,
+            required String albumId,
+          }) =>
+              i1.RemoteAlbumAssetEntityCompanion.insert(
+            assetId: assetId,
+            albumId: albumId,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$RemoteAlbumAssetEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({assetId = false, albumId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (assetId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.assetId,
+                    referencedTable: i1.$$RemoteAlbumAssetEntityTableReferences
+                        ._assetIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumAssetEntityTableReferences
+                        ._assetIdTable(db)
+                        .id,
+                  ) as T;
+                }
+                if (albumId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.albumId,
+                    referencedTable: i1.$$RemoteAlbumAssetEntityTableReferences
+                        ._albumIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumAssetEntityTableReferences
+                        ._albumIdTable(db)
+                        .id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$RemoteAlbumAssetEntityTableProcessedTableManager
+    = i0.ProcessedTableManager<
+        i0.GeneratedDatabase,
+        i1.$RemoteAlbumAssetEntityTable,
+        i1.RemoteAlbumAssetEntityData,
+        i1.$$RemoteAlbumAssetEntityTableFilterComposer,
+        i1.$$RemoteAlbumAssetEntityTableOrderingComposer,
+        i1.$$RemoteAlbumAssetEntityTableAnnotationComposer,
+        $$RemoteAlbumAssetEntityTableCreateCompanionBuilder,
+        $$RemoteAlbumAssetEntityTableUpdateCompanionBuilder,
+        (
+          i1.RemoteAlbumAssetEntityData,
+          i1.$$RemoteAlbumAssetEntityTableReferences
+        ),
+        i1.RemoteAlbumAssetEntityData,
+        i0.PrefetchHooks Function({bool assetId, bool albumId})>;
+
+class $RemoteAlbumAssetEntityTable extends i2.RemoteAlbumAssetEntity
+    with
+        i0.TableInfo<$RemoteAlbumAssetEntityTable,
+            i1.RemoteAlbumAssetEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $RemoteAlbumAssetEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _assetIdMeta =
+      const i0.VerificationMeta('assetId');
+  @override
+  late final i0.GeneratedColumn<String> assetId = i0.GeneratedColumn<String>(
+      'asset_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_asset_entity (id) ON DELETE CASCADE'));
+  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,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
+  @override
+  List<i0.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
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.RemoteAlbumAssetEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('asset_id')) {
+      context.handle(_assetIdMeta,
+          assetId.isAcceptableOrUnknown(data['asset_id']!, _assetIdMeta));
+    } else if (isInserting) {
+      context.missing(_assetIdMeta);
+    }
+    if (data.containsKey('album_id')) {
+      context.handle(_albumIdMeta,
+          albumId.isAcceptableOrUnknown(data['album_id']!, _albumIdMeta));
+    } else if (isInserting) {
+      context.missing(_albumIdMeta);
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {assetId, albumId};
+  @override
+  i1.RemoteAlbumAssetEntityData map(Map<String, dynamic> data,
+      {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.RemoteAlbumAssetEntityData(
+      assetId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      albumId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}album_id'])!,
+    );
+  }
+
+  @override
+  $RemoteAlbumAssetEntityTable createAlias(String alias) {
+    return $RemoteAlbumAssetEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteAlbumAssetEntityData extends i0.DataClass
+    implements i0.Insertable<i1.RemoteAlbumAssetEntityData> {
+  final String assetId;
+  final String albumId;
+  const RemoteAlbumAssetEntityData(
+      {required this.assetId, required this.albumId});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['asset_id'] = i0.Variable<String>(assetId);
+    map['album_id'] = i0.Variable<String>(albumId);
+    return map;
+  }
+
+  factory RemoteAlbumAssetEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return RemoteAlbumAssetEntityData(
+      assetId: serializer.fromJson<String>(json['assetId']),
+      albumId: serializer.fromJson<String>(json['albumId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'albumId': serializer.toJson<String>(albumId),
+    };
+  }
+
+  i1.RemoteAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
+      i1.RemoteAlbumAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        albumId: albumId ?? this.albumId,
+      );
+  RemoteAlbumAssetEntityData copyWithCompanion(
+      i1.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 i1.RemoteAlbumAssetEntityData &&
+          other.assetId == this.assetId &&
+          other.albumId == this.albumId);
+}
+
+class RemoteAlbumAssetEntityCompanion
+    extends i0.UpdateCompanion<i1.RemoteAlbumAssetEntityData> {
+  final i0.Value<String> assetId;
+  final i0.Value<String> albumId;
+  const RemoteAlbumAssetEntityCompanion({
+    this.assetId = const i0.Value.absent(),
+    this.albumId = const i0.Value.absent(),
+  });
+  RemoteAlbumAssetEntityCompanion.insert({
+    required String assetId,
+    required String albumId,
+  })  : assetId = i0.Value(assetId),
+        albumId = i0.Value(albumId);
+  static i0.Insertable<i1.RemoteAlbumAssetEntityData> custom({
+    i0.Expression<String>? assetId,
+    i0.Expression<String>? albumId,
+  }) {
+    return i0.RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (albumId != null) 'album_id': albumId,
+    });
+  }
+
+  i1.RemoteAlbumAssetEntityCompanion copyWith(
+      {i0.Value<String>? assetId, i0.Value<String>? albumId}) {
+    return i1.RemoteAlbumAssetEntityCompanion(
+      assetId: assetId ?? this.assetId,
+      albumId: albumId ?? this.albumId,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (assetId.present) {
+      map['asset_id'] = i0.Variable<String>(assetId.value);
+    }
+    if (albumId.present) {
+      map['album_id'] = i0.Variable<String>(albumId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumAssetEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('albumId: $albumId')
+          ..write(')'))
+        .toString();
+  }
+}
diff --git a/mobile/lib/infrastructure/entities/remote_album_user.entity.dart b/mobile/lib/infrastructure/entities/remote_album_user.entity.dart
new file mode 100644
index 0000000000..4198fb7e46
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/remote_album_user.entity.dart
@@ -0,0 +1,20 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class RemoteAlbumUserEntity extends Table with DriftDefaultsMixin {
+  const RemoteAlbumUserEntity();
+
+  TextColumn get albumId =>
+      text().references(RemoteAlbumEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get userId =>
+      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+
+  IntColumn get role => intEnum<AlbumUserRole>()();
+
+  @override
+  Set<Column> get primaryKey => {albumId, userId};
+}
diff --git a/mobile/lib/infrastructure/entities/remote_album_user.entity.drift.dart b/mobile/lib/infrastructure/entities/remote_album_user.entity.drift.dart
new file mode 100644
index 0000000000..7ec1151a8a
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/remote_album_user.entity.drift.dart
@@ -0,0 +1,618 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/domain/models/album/album.model.dart' as i2;
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart'
+    as i3;
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
+    as i4;
+import 'package:drift/internal/modular.dart' as i5;
+import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
+    as i6;
+
+typedef $$RemoteAlbumUserEntityTableCreateCompanionBuilder
+    = i1.RemoteAlbumUserEntityCompanion Function({
+  required String albumId,
+  required String userId,
+  required i2.AlbumUserRole role,
+});
+typedef $$RemoteAlbumUserEntityTableUpdateCompanionBuilder
+    = i1.RemoteAlbumUserEntityCompanion Function({
+  i0.Value<String> albumId,
+  i0.Value<String> userId,
+  i0.Value<i2.AlbumUserRole> role,
+});
+
+final class $$RemoteAlbumUserEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumUserEntityTable,
+    i1.RemoteAlbumUserEntityData> {
+  $$RemoteAlbumUserEntityTableReferences(
+      super.$_db, super.$_table, super.$_typedResult);
+
+  static i4.$RemoteAlbumEntityTable _albumIdTable(i0.GeneratedDatabase db) =>
+      i5.ReadDatabaseContainer(db)
+          .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumUserEntityTable>(
+                      'remote_album_user_entity')
+                  .albumId,
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity')
+                  .id));
+
+  i4.$$RemoteAlbumEntityTableProcessedTableManager get albumId {
+    final $_column = $_itemColumn<String>('album_id')!;
+
+    final manager = i4
+        .$$RemoteAlbumEntityTableTableManager(
+            $_db,
+            i5.ReadDatabaseContainer($_db)
+                .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_albumIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+
+  static i6.$UserEntityTable _userIdTable(i0.GeneratedDatabase db) =>
+      i5.ReadDatabaseContainer(db)
+          .resultSet<i6.$UserEntityTable>('user_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumUserEntityTable>(
+                      'remote_album_user_entity')
+                  .userId,
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i6.$UserEntityTable>('user_entity')
+                  .id));
+
+  i6.$$UserEntityTableProcessedTableManager get userId {
+    final $_column = $_itemColumn<String>('user_id')!;
+
+    final manager = i6
+        .$$UserEntityTableTableManager(
+            $_db,
+            i5.ReadDatabaseContainer($_db)
+                .resultSet<i6.$UserEntityTable>('user_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_userIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$RemoteAlbumUserEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumUserEntityTable> {
+  $$RemoteAlbumUserEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnWithTypeConverterFilters<i2.AlbumUserRole, i2.AlbumUserRole, int>
+      get role => $composableBuilder(
+          column: $table.role,
+          builder: (column) => i0.ColumnWithTypeConverterFilters(column));
+
+  i4.$$RemoteAlbumEntityTableFilterComposer get albumId {
+    final i4.$$RemoteAlbumEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.albumId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i4.$$RemoteAlbumEntityTableFilterComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i6.$$UserEntityTableFilterComposer get userId {
+    final i6.$$UserEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.userId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i6.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i6.$$UserEntityTableFilterComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i6.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumUserEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumUserEntityTable> {
+  $$RemoteAlbumUserEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<int> get role => $composableBuilder(
+      column: $table.role, builder: (column) => i0.ColumnOrderings(column));
+
+  i4.$$RemoteAlbumEntityTableOrderingComposer get albumId {
+    final i4.$$RemoteAlbumEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.albumId,
+            referencedTable: i5.ReadDatabaseContainer($db)
+                .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i4.$$RemoteAlbumEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i5.ReadDatabaseContainer($db)
+                      .resultSet<i4.$RemoteAlbumEntityTable>(
+                          'remote_album_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i6.$$UserEntityTableOrderingComposer get userId {
+    final i6.$$UserEntityTableOrderingComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.userId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i6.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i6.$$UserEntityTableOrderingComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i6.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumUserEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumUserEntityTable> {
+  $$RemoteAlbumUserEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumnWithTypeConverter<i2.AlbumUserRole, int> get role =>
+      $composableBuilder(column: $table.role, builder: (column) => column);
+
+  i4.$$RemoteAlbumEntityTableAnnotationComposer get albumId {
+    final i4.$$RemoteAlbumEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.albumId,
+            referencedTable: i5.ReadDatabaseContainer($db)
+                .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i4.$$RemoteAlbumEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i5.ReadDatabaseContainer($db)
+                      .resultSet<i4.$RemoteAlbumEntityTable>(
+                          'remote_album_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i6.$$UserEntityTableAnnotationComposer get userId {
+    final i6.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.userId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i6.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i6.$$UserEntityTableAnnotationComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i6.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumUserEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumUserEntityTable,
+    i1.RemoteAlbumUserEntityData,
+    i1.$$RemoteAlbumUserEntityTableFilterComposer,
+    i1.$$RemoteAlbumUserEntityTableOrderingComposer,
+    i1.$$RemoteAlbumUserEntityTableAnnotationComposer,
+    $$RemoteAlbumUserEntityTableCreateCompanionBuilder,
+    $$RemoteAlbumUserEntityTableUpdateCompanionBuilder,
+    (i1.RemoteAlbumUserEntityData, i1.$$RemoteAlbumUserEntityTableReferences),
+    i1.RemoteAlbumUserEntityData,
+    i0.PrefetchHooks Function({bool albumId, bool userId})> {
+  $$RemoteAlbumUserEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$RemoteAlbumUserEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$RemoteAlbumUserEntityTableFilterComposer(
+                  $db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$RemoteAlbumUserEntityTableOrderingComposer(
+                  $db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$RemoteAlbumUserEntityTableAnnotationComposer(
+                  $db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> albumId = const i0.Value.absent(),
+            i0.Value<String> userId = const i0.Value.absent(),
+            i0.Value<i2.AlbumUserRole> role = const i0.Value.absent(),
+          }) =>
+              i1.RemoteAlbumUserEntityCompanion(
+            albumId: albumId,
+            userId: userId,
+            role: role,
+          ),
+          createCompanionCallback: ({
+            required String albumId,
+            required String userId,
+            required i2.AlbumUserRole role,
+          }) =>
+              i1.RemoteAlbumUserEntityCompanion.insert(
+            albumId: albumId,
+            userId: userId,
+            role: role,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$RemoteAlbumUserEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({albumId = false, userId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (albumId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.albumId,
+                    referencedTable: i1.$$RemoteAlbumUserEntityTableReferences
+                        ._albumIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumUserEntityTableReferences
+                        ._albumIdTable(db)
+                        .id,
+                  ) as T;
+                }
+                if (userId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.userId,
+                    referencedTable: i1.$$RemoteAlbumUserEntityTableReferences
+                        ._userIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumUserEntityTableReferences
+                        ._userIdTable(db)
+                        .id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$RemoteAlbumUserEntityTableProcessedTableManager
+    = i0.ProcessedTableManager<
+        i0.GeneratedDatabase,
+        i1.$RemoteAlbumUserEntityTable,
+        i1.RemoteAlbumUserEntityData,
+        i1.$$RemoteAlbumUserEntityTableFilterComposer,
+        i1.$$RemoteAlbumUserEntityTableOrderingComposer,
+        i1.$$RemoteAlbumUserEntityTableAnnotationComposer,
+        $$RemoteAlbumUserEntityTableCreateCompanionBuilder,
+        $$RemoteAlbumUserEntityTableUpdateCompanionBuilder,
+        (
+          i1.RemoteAlbumUserEntityData,
+          i1.$$RemoteAlbumUserEntityTableReferences
+        ),
+        i1.RemoteAlbumUserEntityData,
+        i0.PrefetchHooks Function({bool albumId, bool userId})>;
+
+class $RemoteAlbumUserEntityTable extends i3.RemoteAlbumUserEntity
+    with
+        i0
+        .TableInfo<$RemoteAlbumUserEntityTable, i1.RemoteAlbumUserEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $RemoteAlbumUserEntityTable(this.attachedDatabase, [this._alias]);
+  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,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
+  static const i0.VerificationMeta _userIdMeta =
+      const i0.VerificationMeta('userId');
+  @override
+  late final i0.GeneratedColumn<String> userId = i0.GeneratedColumn<String>(
+      'user_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES user_entity (id) ON DELETE CASCADE'));
+  @override
+  late final i0.GeneratedColumnWithTypeConverter<i2.AlbumUserRole, int> role =
+      i0.GeneratedColumn<int>('role', aliasedName, false,
+              type: i0.DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<i2.AlbumUserRole>(
+              i1.$RemoteAlbumUserEntityTable.$converterrole);
+  @override
+  List<i0.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
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.RemoteAlbumUserEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('album_id')) {
+      context.handle(_albumIdMeta,
+          albumId.isAcceptableOrUnknown(data['album_id']!, _albumIdMeta));
+    } else if (isInserting) {
+      context.missing(_albumIdMeta);
+    }
+    if (data.containsKey('user_id')) {
+      context.handle(_userIdMeta,
+          userId.isAcceptableOrUnknown(data['user_id']!, _userIdMeta));
+    } else if (isInserting) {
+      context.missing(_userIdMeta);
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {albumId, userId};
+  @override
+  i1.RemoteAlbumUserEntityData map(Map<String, dynamic> data,
+      {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.RemoteAlbumUserEntityData(
+      albumId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}album_id'])!,
+      userId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}user_id'])!,
+      role: i1.$RemoteAlbumUserEntityTable.$converterrole.fromSql(
+          attachedDatabase.typeMapping
+              .read(i0.DriftSqlType.int, data['${effectivePrefix}role'])!),
+    );
+  }
+
+  @override
+  $RemoteAlbumUserEntityTable createAlias(String alias) {
+    return $RemoteAlbumUserEntityTable(attachedDatabase, alias);
+  }
+
+  static i0.JsonTypeConverter2<i2.AlbumUserRole, int, int> $converterrole =
+      const i0.EnumIndexConverter<i2.AlbumUserRole>(i2.AlbumUserRole.values);
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteAlbumUserEntityData extends i0.DataClass
+    implements i0.Insertable<i1.RemoteAlbumUserEntityData> {
+  final String albumId;
+  final String userId;
+  final i2.AlbumUserRole role;
+  const RemoteAlbumUserEntityData(
+      {required this.albumId, required this.userId, required this.role});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['album_id'] = i0.Variable<String>(albumId);
+    map['user_id'] = i0.Variable<String>(userId);
+    {
+      map['role'] = i0.Variable<int>(
+          i1.$RemoteAlbumUserEntityTable.$converterrole.toSql(role));
+    }
+    return map;
+  }
+
+  factory RemoteAlbumUserEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return RemoteAlbumUserEntityData(
+      albumId: serializer.fromJson<String>(json['albumId']),
+      userId: serializer.fromJson<String>(json['userId']),
+      role: i1.$RemoteAlbumUserEntityTable.$converterrole
+          .fromJson(serializer.fromJson<int>(json['role'])),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'albumId': serializer.toJson<String>(albumId),
+      'userId': serializer.toJson<String>(userId),
+      'role': serializer.toJson<int>(
+          i1.$RemoteAlbumUserEntityTable.$converterrole.toJson(role)),
+    };
+  }
+
+  i1.RemoteAlbumUserEntityData copyWith(
+          {String? albumId, String? userId, i2.AlbumUserRole? role}) =>
+      i1.RemoteAlbumUserEntityData(
+        albumId: albumId ?? this.albumId,
+        userId: userId ?? this.userId,
+        role: role ?? this.role,
+      );
+  RemoteAlbumUserEntityData copyWithCompanion(
+      i1.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 i1.RemoteAlbumUserEntityData &&
+          other.albumId == this.albumId &&
+          other.userId == this.userId &&
+          other.role == this.role);
+}
+
+class RemoteAlbumUserEntityCompanion
+    extends i0.UpdateCompanion<i1.RemoteAlbumUserEntityData> {
+  final i0.Value<String> albumId;
+  final i0.Value<String> userId;
+  final i0.Value<i2.AlbumUserRole> role;
+  const RemoteAlbumUserEntityCompanion({
+    this.albumId = const i0.Value.absent(),
+    this.userId = const i0.Value.absent(),
+    this.role = const i0.Value.absent(),
+  });
+  RemoteAlbumUserEntityCompanion.insert({
+    required String albumId,
+    required String userId,
+    required i2.AlbumUserRole role,
+  })  : albumId = i0.Value(albumId),
+        userId = i0.Value(userId),
+        role = i0.Value(role);
+  static i0.Insertable<i1.RemoteAlbumUserEntityData> custom({
+    i0.Expression<String>? albumId,
+    i0.Expression<String>? userId,
+    i0.Expression<int>? role,
+  }) {
+    return i0.RawValuesInsertable({
+      if (albumId != null) 'album_id': albumId,
+      if (userId != null) 'user_id': userId,
+      if (role != null) 'role': role,
+    });
+  }
+
+  i1.RemoteAlbumUserEntityCompanion copyWith(
+      {i0.Value<String>? albumId,
+      i0.Value<String>? userId,
+      i0.Value<i2.AlbumUserRole>? role}) {
+    return i1.RemoteAlbumUserEntityCompanion(
+      albumId: albumId ?? this.albumId,
+      userId: userId ?? this.userId,
+      role: role ?? this.role,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (albumId.present) {
+      map['album_id'] = i0.Variable<String>(albumId.value);
+    }
+    if (userId.present) {
+      map['user_id'] = i0.Variable<String>(userId.value);
+    }
+    if (role.present) {
+      map['role'] = i0.Variable<int>(
+          i1.$RemoteAlbumUserEntityTable.$converterrole.toSql(role.value));
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumUserEntityCompanion(')
+          ..write('albumId: $albumId, ')
+          ..write('userId: $userId, ')
+          ..write('role: $role')
+          ..write(')'))
+        .toString();
+  }
+}
diff --git a/mobile/lib/infrastructure/entities/remote_asset.entity.dart b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
index 3c7589949f..bfe08346dd 100644
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
@@ -1,5 +1,6 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
@@ -34,3 +35,21 @@ class RemoteAssetEntity extends Table
   @override
   Set<Column> get primaryKey => {id};
 }
+
+extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
+  Asset toDto() => Asset(
+        id: id,
+        name: name,
+        checksum: checksum,
+        type: type,
+        createdAt: createdAt,
+        updatedAt: updatedAt,
+        durationInSeconds: durationInSeconds,
+        isFavorite: isFavorite,
+        height: height,
+        width: width,
+        thumbHash: thumbHash,
+        visibility: visibility,
+        localId: null,
+      );
+}
diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/lib/infrastructure/repositories/db.repository.dart
index 15b19f5c80..dbe491b035 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -8,6 +8,9 @@ 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/partner.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
@@ -40,6 +43,9 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     LocalAlbumAssetEntity,
     RemoteAssetEntity,
     RemoteExifEntity,
+    RemoteAlbumEntity,
+    RemoteAlbumAssetEntity,
+    RemoteAlbumUserEntity,
   ],
   include: {
     'package:immich_mobile/infrastructure/entities/merged_asset.drift',
diff --git a/mobile/lib/infrastructure/repositories/db.repository.drift.dart b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
index d088e5420a..69fd84b79a 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -17,9 +17,15 @@ import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.d
     as i7;
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
     as i8;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
     as i9;
-import 'package:drift/internal/modular.dart' as i10;
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'
+    as i10;
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
+    as i11;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i12;
+import 'package:drift/internal/modular.dart' as i13;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -39,8 +45,14 @@ abstract class $Drift extends i0.GeneratedDatabase {
       i7.$LocalAlbumAssetEntityTable(this);
   late final i8.$RemoteExifEntityTable remoteExifEntity =
       i8.$RemoteExifEntityTable(this);
-  i9.MergedAssetDrift get mergedAssetDrift => i10.ReadDatabaseContainer(this)
-      .accessor<i9.MergedAssetDrift>(i9.MergedAssetDrift.new);
+  late final i9.$RemoteAlbumEntityTable remoteAlbumEntity =
+      i9.$RemoteAlbumEntityTable(this);
+  late final i10.$RemoteAlbumAssetEntityTable remoteAlbumAssetEntity =
+      i10.$RemoteAlbumAssetEntityTable(this);
+  late final i11.$RemoteAlbumUserEntityTable remoteAlbumUserEntity =
+      i11.$RemoteAlbumUserEntityTable(this);
+  i12.MergedAssetDrift get mergedAssetDrift => i13.ReadDatabaseContainer(this)
+      .accessor<i12.MergedAssetDrift>(i12.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -56,7 +68,10 @@ abstract class $Drift extends i0.GeneratedDatabase {
         partnerEntity,
         localAlbumEntity,
         localAlbumAssetEntity,
-        remoteExifEntity
+        remoteExifEntity,
+        remoteAlbumEntity,
+        remoteAlbumAssetEntity,
+        remoteAlbumUserEntity
       ];
   @override
   i0.StreamQueryUpdateRules get streamUpdateRules =>
@@ -114,6 +129,52 @@ abstract class $Drift extends i0.GeneratedDatabase {
               i0.TableUpdate('remote_exif_entity', kind: i0.UpdateKind.delete),
             ],
           ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('user_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_entity', kind: i0.UpdateKind.update),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_asset_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('remote_album_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_asset_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('remote_album_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_user_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('user_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_user_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
         ],
       );
   @override
@@ -140,4 +201,11 @@ class $DriftManager {
       .$$LocalAlbumAssetEntityTableTableManager(_db, _db.localAlbumAssetEntity);
   i8.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
       i8.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
+  i9.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity =>
+      i9.$$RemoteAlbumEntityTableTableManager(_db, _db.remoteAlbumEntity);
+  i10.$$RemoteAlbumAssetEntityTableTableManager get remoteAlbumAssetEntity =>
+      i10.$$RemoteAlbumAssetEntityTableTableManager(
+          _db, _db.remoteAlbumAssetEntity);
+  i11.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i11
+      .$$RemoteAlbumUserEntityTableTableManager(_db, _db.remoteAlbumUserEntity);
 }
diff --git a/mobile/lib/infrastructure/repositories/local_album.repository.dart b/mobile/lib/infrastructure/repositories/local_album.repository.dart
index e5f8c7b526..33d61848db 100644
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -1,6 +1,6 @@
 import 'package:drift/drift.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/local_album.model.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
diff --git a/mobile/lib/infrastructure/repositories/remote_album.repository.dart b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
new file mode 100644
index 0000000000..dd237c95bf
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -0,0 +1,45 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+enum SortRemoteAlbumsBy { id }
+
+class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftRemoteAlbumRepository(this._db) : super(_db);
+
+  Future<List<Album>> getAll({Set<SortRemoteAlbumsBy> sortBy = const {}}) {
+    final query = _db.remoteAlbumEntity.select();
+
+    if (sortBy.isNotEmpty) {
+      final orderings = <OrderClauseGenerator<$RemoteAlbumEntityTable>>[];
+      for (final sort in sortBy) {
+        orderings.add(
+          switch (sort) {
+            SortRemoteAlbumsBy.id => (row) => OrderingTerm.asc(row.id),
+          },
+        );
+      }
+      query.orderBy(orderings);
+    }
+
+    return query.map((row) => row.toDto()).get();
+  }
+}
+
+extension on RemoteAlbumEntityData {
+  Album toDto() {
+    return Album(
+      id: id,
+      name: name,
+      ownerId: ownerId,
+      createdAt: createdAt,
+      updatedAt: updatedAt,
+      description: description,
+      thumbnailAssetId: thumbnailAssetId,
+      isActivityEnabled: isActivityEnabled,
+      order: order,
+    );
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/sync_api.repository.dart b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
index f14773fc4d..ccc79fa818 100644
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -42,11 +42,16 @@ class SyncApiRepository {
       SyncStreamDto(
         types: [
           SyncRequestType.usersV1,
-          SyncRequestType.partnersV1,
           SyncRequestType.assetsV1,
-          SyncRequestType.partnerAssetsV1,
           SyncRequestType.assetExifsV1,
+          SyncRequestType.partnersV1,
+          SyncRequestType.partnerAssetsV1,
           SyncRequestType.partnerAssetExifsV1,
+          SyncRequestType.albumsV1,
+          SyncRequestType.albumUsersV1,
+          SyncRequestType.albumAssetsV1,
+          SyncRequestType.albumAssetExifsV1,
+          SyncRequestType.albumToAssetsV1,
         ],
       ).toJson(),
     );
@@ -135,6 +140,25 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.assetDeleteV1: SyncAssetDeleteV1.fromJson,
   SyncEntityType.assetExifV1: SyncAssetExifV1.fromJson,
   SyncEntityType.partnerAssetV1: SyncAssetV1.fromJson,
+  SyncEntityType.partnerAssetBackfillV1: SyncAssetV1.fromJson,
   SyncEntityType.partnerAssetDeleteV1: SyncAssetDeleteV1.fromJson,
   SyncEntityType.partnerAssetExifV1: SyncAssetExifV1.fromJson,
+  SyncEntityType.partnerAssetExifBackfillV1: SyncAssetExifV1.fromJson,
+  SyncEntityType.albumV1: SyncAlbumV1.fromJson,
+  SyncEntityType.albumDeleteV1: SyncAlbumDeleteV1.fromJson,
+  SyncEntityType.albumUserV1: SyncAlbumUserV1.fromJson,
+  SyncEntityType.albumUserBackfillV1: SyncAlbumUserV1.fromJson,
+  SyncEntityType.albumUserDeleteV1: SyncAlbumUserDeleteV1.fromJson,
+  SyncEntityType.albumAssetV1: SyncAssetV1.fromJson,
+  SyncEntityType.albumAssetBackfillV1: SyncAssetV1.fromJson,
+  SyncEntityType.albumAssetExifV1: SyncAssetExifV1.fromJson,
+  SyncEntityType.albumAssetExifBackfillV1: SyncAssetExifV1.fromJson,
+  SyncEntityType.albumToAssetV1: SyncAlbumToAssetV1.fromJson,
+  SyncEntityType.albumToAssetBackfillV1: SyncAlbumToAssetV1.fromJson,
+  SyncEntityType.albumToAssetDeleteV1: SyncAlbumToAssetDeleteV1.fromJson,
+  SyncEntityType.syncAckV1: _SyncAckV1.fromJson,
 };
+
+class _SyncAckV1 {
+  static _SyncAckV1? fromJson(dynamic _) => _SyncAckV1();
+}
diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index 56f1631ee6..dfe65b698e 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -1,13 +1,17 @@
 import 'package:drift/drift.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/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:logging/logging.dart';
-import 'package:openapi/api.dart' as api show AssetVisibility;
-import 'package:openapi/api.dart' hide AssetVisibility;
+import 'package:openapi/api.dart' as api show AssetVisibility, AlbumUserRole;
+import 'package:openapi/api.dart' hide AssetVisibility, AlbumUserRole;
 
 class SyncStreamRepository extends DriftDatabaseRepository {
   final Logger _logger = Logger('DriftSyncStreamRepository');
@@ -17,16 +21,10 @@ class SyncStreamRepository extends DriftDatabaseRepository {
 
   Future<void> deleteUsersV1(Iterable<SyncUserDeleteV1> data) async {
     try {
-      await _db.batch((batch) {
-        for (final user in data) {
-          batch.delete(
-            _db.userEntity,
-            UserEntityCompanion(id: Value(user.userId)),
-          );
-        }
-      });
+      await _db.userEntity
+          .deleteWhere((row) => row.id.isIn(data.map((e) => e.userId)));
     } catch (error, stack) {
-      _logger.severe('Error while processing SyncUserDeleteV1', error, stack);
+      _logger.severe('Error: SyncUserDeleteV1', error, stack);
       rethrow;
     }
   }
@@ -48,7 +46,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
         }
       });
     } catch (error, stack) {
-      _logger.severe('Error while processing SyncUserV1', error, stack);
+      _logger.severe('Error: SyncUserV1', error, stack);
       rethrow;
     }
   }
@@ -67,7 +65,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
         }
       });
     } catch (e, s) {
-      _logger.severe('Error while processing SyncPartnerDeleteV1', e, s);
+      _logger.severe('Error: SyncPartnerDeleteV1', e, s);
       rethrow;
     }
   }
@@ -90,67 +88,30 @@ class SyncStreamRepository extends DriftDatabaseRepository {
         }
       });
     } catch (e, s) {
-      _logger.severe('Error while processing SyncPartnerV1', e, s);
+      _logger.severe('Error: SyncPartnerV1', e, s);
       rethrow;
     }
   }
 
-  Future<void> deleteAssetsV1(Iterable<SyncAssetDeleteV1> data) async {
+  Future<void> deleteAssetsV1(
+    Iterable<SyncAssetDeleteV1> data, {
+    String debugLabel = 'user',
+  }) async {
     try {
-      await _deleteAssetsV1(data);
+      await _db.remoteAssetEntity
+          .deleteWhere((row) => row.id.isIn(data.map((e) => e.assetId)));
     } catch (e, s) {
-      _logger.severe('Error while processing deleteAssetsV1', e, s);
+      _logger.severe('Error: deleteAssetsV1 - $debugLabel', e, s);
       rethrow;
     }
   }
 
-  Future<void> updateAssetsV1(Iterable<SyncAssetV1> data) async {
+  Future<void> updateAssetsV1(
+    Iterable<SyncAssetV1> data, {
+    String debugLabel = 'user',
+  }) async {
     try {
-      await _updateAssetsV1(data);
-    } catch (e, s) {
-      _logger.severe('Error while processing updateAssetsV1', e, s);
-      rethrow;
-    }
-  }
-
-  Future<void> deletePartnerAssetsV1(Iterable<SyncAssetDeleteV1> data) async {
-    try {
-      await _deleteAssetsV1(data);
-    } catch (e, s) {
-      _logger.severe('Error while processing deletePartnerAssetsV1', e, s);
-      rethrow;
-    }
-  }
-
-  Future<void> updatePartnerAssetsV1(Iterable<SyncAssetV1> data) async {
-    try {
-      await _updateAssetsV1(data);
-    } catch (e, s) {
-      _logger.severe('Error while processing updatePartnerAssetsV1', e, s);
-      rethrow;
-    }
-  }
-
-  Future<void> updateAssetsExifV1(Iterable<SyncAssetExifV1> data) async {
-    try {
-      await _updateAssetExifV1(data);
-    } catch (e, s) {
-      _logger.severe('Error while processing updateAssetsExifV1', e, s);
-      rethrow;
-    }
-  }
-
-  Future<void> updatePartnerAssetsExifV1(Iterable<SyncAssetExifV1> data) async {
-    try {
-      await _updateAssetExifV1(data);
-    } catch (e, s) {
-      _logger.severe('Error while processing updatePartnerAssetsExifV1', e, s);
-      rethrow;
-    }
-  }
-
-  Future<void> _updateAssetsV1(Iterable<SyncAssetV1> data) =>
-      _db.batch((batch) {
+      await _db.batch((batch) {
         for (final asset in data) {
           final companion = RemoteAssetEntityCompanion(
             name: Value(asset.originalFileName),
@@ -175,19 +136,18 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
+    } catch (e, s) {
+      _logger.severe('Error: updateAssetsV1 - $debugLabel', e, s);
+      rethrow;
+    }
+  }
 
-  Future<void> _deleteAssetsV1(Iterable<SyncAssetDeleteV1> assets) =>
-      _db.batch((batch) {
-        for (final asset in assets) {
-          batch.delete(
-            _db.remoteAssetEntity,
-            RemoteAssetEntityCompanion(id: Value(asset.assetId)),
-          );
-        }
-      });
-
-  Future<void> _updateAssetExifV1(Iterable<SyncAssetExifV1> data) =>
-      _db.batch((batch) {
+  Future<void> updateAssetsExifV1(
+    Iterable<SyncAssetExifV1> data, {
+    String debugLabel = 'user',
+  }) async {
+    try {
+      await _db.batch((batch) {
         for (final exif in data) {
           final companion = RemoteExifEntityCompanion(
             city: Value(exif.city),
@@ -219,6 +179,141 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
+    } catch (e, s) {
+      _logger.severe('Error: updateAssetsExifV1 - $debugLabel', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async {
+    try {
+      await _db.remoteAlbumEntity
+          .deleteWhere((row) => row.id.isIn(data.map((e) => e.albumId)));
+    } catch (e, s) {
+      _logger.severe('Error: deleteAlbumsV1', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> updateAlbumsV1(Iterable<SyncAlbumV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final album in data) {
+          final companion = RemoteAlbumEntityCompanion(
+            name: Value(album.name),
+            description: Value(album.description),
+            isActivityEnabled: Value(album.isActivityEnabled),
+            order: Value(album.order.toAlbumAssetOrder()),
+            thumbnailAssetId: Value(album.thumbnailAssetId),
+            ownerId: Value(album.ownerId),
+            createdAt: Value(album.createdAt),
+            updatedAt: Value(album.updatedAt),
+          );
+
+          batch.insert(
+            _db.remoteAlbumEntity,
+            companion.copyWith(id: Value(album.id)),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (e, s) {
+      _logger.severe('Error: updateAlbumsV1', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteAlbumUsersV1(Iterable<SyncAlbumUserDeleteV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final album in data) {
+          batch.delete(
+            _db.remoteAlbumUserEntity,
+            RemoteAlbumUserEntityCompanion(
+              albumId: Value(album.albumId),
+              userId: Value(album.userId),
+            ),
+          );
+        }
+      });
+    } catch (e, s) {
+      _logger.severe('Error: deleteAlbumUsersV1', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> updateAlbumUsersV1(
+    Iterable<SyncAlbumUserV1> data, {
+    String debugLabel = 'user',
+  }) async {
+    try {
+      await _db.batch((batch) {
+        for (final album in data) {
+          final companion = RemoteAlbumUserEntityCompanion(
+            role: Value(album.role.toAlbumUserRole()),
+          );
+
+          batch.insert(
+            _db.remoteAlbumUserEntity,
+            companion.copyWith(
+              albumId: Value(album.albumId),
+              userId: Value(album.userId),
+            ),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (e, s) {
+      _logger.severe('Error: updateAlbumUsersV1 - $debugLabel', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteAlbumToAssetsV1(
+    Iterable<SyncAlbumToAssetDeleteV1> data,
+  ) async {
+    try {
+      await _db.batch((batch) {
+        for (final album in data) {
+          batch.delete(
+            _db.remoteAlbumAssetEntity,
+            RemoteAlbumAssetEntityCompanion(
+              albumId: Value(album.albumId),
+              assetId: Value(album.assetId),
+            ),
+          );
+        }
+      });
+    } catch (e, s) {
+      _logger.severe('Error: deleteAlbumToAssetsV1', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> updateAlbumToAssetsV1(
+    Iterable<SyncAlbumToAssetV1> data, {
+    String debugLabel = 'user',
+  }) async {
+    try {
+      await _db.batch((batch) {
+        for (final album in data) {
+          final companion = RemoteAlbumAssetEntityCompanion(
+            albumId: Value(album.albumId),
+            assetId: Value(album.assetId),
+          );
+
+          batch.insert(
+            _db.remoteAlbumAssetEntity,
+            companion,
+            onConflict: DoNothing(),
+          );
+        }
+      });
+    } catch (e, s) {
+      _logger.severe('Error: updateAlbumToAssetsV1 - $debugLabel', e, s);
+      rethrow;
+    }
+  }
 }
 
 extension on AssetTypeEnum {
@@ -231,6 +326,22 @@ extension on AssetTypeEnum {
       };
 }
 
+extension on AssetOrder {
+  AlbumAssetOrder toAlbumAssetOrder() => switch (this) {
+        AssetOrder.asc => AlbumAssetOrder.asc,
+        AssetOrder.desc => AlbumAssetOrder.desc,
+        _ => throw Exception('Unknown AssetOrder value: $this'),
+      };
+}
+
+extension on api.AlbumUserRole {
+  AlbumUserRole toAlbumUserRole() => switch (this) {
+        api.AlbumUserRole.editor => AlbumUserRole.editor,
+        api.AlbumUserRole.viewer => AlbumUserRole.viewer,
+        _ => throw Exception('Unknown AlbumUserRole value: $this'),
+      };
+}
+
 extension on api.AssetVisibility {
   AssetVisibility toAssetVisibility() => switch (this) {
         api.AssetVisibility.timeline => AssetVisibility.timeline,
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index add327cf00..7f5591c047 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -6,6 +6,7 @@ import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:stream_transform/stream_transform.dart';
 
@@ -139,6 +140,62 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         .map((row) => row.readTable(_db.localAssetEntity).toDto())
         .get();
   }
+
+  Stream<List<Bucket>> watchRemoteBucket(
+    String albumId, {
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    if (groupBy == GroupAssetsBy.none) {
+      return _db.remoteAlbumAssetEntity
+          .count(where: (row) => row.albumId.equals(albumId))
+          .map(_generateBuckets)
+          .watchSingle();
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..join([
+        innerJoin(
+          _db.remoteAlbumAssetEntity,
+          _db.remoteAlbumAssetEntity.assetId
+              .equalsExp(_db.remoteAssetEntity.id),
+        ),
+      ])
+      ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId))
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> getRemoteBucketAssets(
+    String albumId, {
+    required int offset,
+    required int count,
+  }) {
+    final query = _db.remoteAssetEntity.select().join(
+      [
+        innerJoin(
+          _db.remoteAlbumAssetEntity,
+          _db.remoteAlbumAssetEntity.assetId
+              .equalsExp(_db.remoteAssetEntity.id),
+        ),
+      ],
+    )
+      ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId))
+      ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
+      ..limit(count, offset: offset);
+    return query
+        .map((row) => row.readTable(_db.remoteAssetEntity).toDto())
+        .get();
+  }
 }
 
 extension on Expression<DateTime> {
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index c53b7fe0dc..f10c042e10 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -63,6 +63,9 @@ final _features = [
       final db = ref.read(driftProvider);
       await db.remoteAssetEntity.deleteAll();
       await db.remoteExifEntity.deleteAll();
+      await db.remoteAlbumEntity.deleteAll();
+      await db.remoteAlbumUserEntity.deleteAll();
+      await db.remoteAlbumAssetEntity.deleteAll();
     },
   ),
   _Feature(
diff --git a/mobile/lib/presentation/pages/dev/media_stat.page.dart b/mobile/lib/presentation/pages/dev/media_stat.page.dart
index cc1fd0ae0c..10d09f8de5 100644
--- a/mobile/lib/presentation/pages/dev/media_stat.page.dart
+++ b/mobile/lib/presentation/pages/dev/media_stat.page.dart
@@ -40,7 +40,10 @@ class _Summary extends StatelessWidget {
         } else if (snapshot.hasError) {
           subtitle = const Icon(Icons.error_rounded);
         } else {
-          subtitle = Text('${snapshot.data ?? 0}');
+          subtitle = Text(
+            '${snapshot.data ?? 0}',
+            style: ctx.textTheme.bodyLarge,
+          );
         }
         return ListTile(
           leading: leading,
@@ -147,6 +150,10 @@ final _remoteStats = [
     name: 'Exif Entities',
     load: (db) => db.managers.remoteExifEntity.count(),
   ),
+  _Stat(
+    name: 'Remote Albums',
+    load: (db) => db.managers.remoteAlbumEntity.count(),
+  ),
 ];
 
 @RoutePage()
@@ -160,6 +167,7 @@ class RemoteMediaSummaryPage extends StatelessWidget {
       body: Consumer(
         builder: (ctx, ref, __) {
           final db = ref.watch(driftProvider);
+          final albumsFuture = ref.watch(remoteAlbumRepository).getAll();
 
           return CustomScrollView(
             slivers: [
@@ -171,6 +179,49 @@ class RemoteMediaSummaryPage extends StatelessWidget {
                 },
                 itemCount: _remoteStats.length,
               ),
+              SliverToBoxAdapter(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    const Divider(),
+                    Padding(
+                      padding: const EdgeInsets.only(left: 15),
+                      child: Text(
+                        "Album summary",
+                        style: ctx.textTheme.titleMedium,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              FutureBuilder(
+                future: albumsFuture,
+                builder: (_, snap) {
+                  final albums = snap.data ?? [];
+                  if (albums.isEmpty) {
+                    return const SliverToBoxAdapter(child: SizedBox.shrink());
+                  }
+
+                  albums.sortBy((a) => a.name);
+                  return SliverList.builder(
+                    itemBuilder: (_, index) {
+                      final album = albums[index];
+                      final countFuture = db.managers.remoteAlbumAssetEntity
+                          .filter((f) => f.albumId.id.equals(album.id))
+                          .count();
+                      return _Summary(
+                        leading: const Icon(Icons.photo_album_rounded),
+                        name: album.name,
+                        countFuture: countFuture,
+                        onTap: () => context.router.push(
+                          RemoteTimelineRoute(albumId: album.id),
+                        ),
+                      );
+                    },
+                    itemCount: albums.length,
+                  );
+                },
+              ),
             ],
           );
         },
diff --git a/mobile/lib/presentation/pages/dev/remote_timeline.page.dart b/mobile/lib/presentation/pages/dev/remote_timeline.page.dart
new file mode 100644
index 0000000000..4965359ad5
--- /dev/null
+++ b/mobile/lib/presentation/pages/dev/remote_timeline.page.dart
@@ -0,0 +1,32 @@
+import 'dart:async';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+
+@RoutePage()
+class RemoteTimelinePage extends StatelessWidget {
+  final String albumId;
+
+  const RemoteTimelinePage({super.key, required this.albumId});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final timelineService = ref
+                .watch(timelineFactoryProvider)
+                .remoteAlbum(albumId: albumId);
+            ref.onDispose(() => unawaited(timelineService.dispose()));
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}
diff --git a/mobile/lib/providers/infrastructure/album.provider.dart b/mobile/lib/providers/infrastructure/album.provider.dart
index 6a48073196..b9dd212042 100644
--- a/mobile/lib/providers/infrastructure/album.provider.dart
+++ b/mobile/lib/providers/infrastructure/album.provider.dart
@@ -1,7 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 
 final localAlbumRepository = Provider<DriftLocalAlbumRepository>(
   (ref) => DriftLocalAlbumRepository(ref.watch(driftProvider)),
 );
+
+final remoteAlbumRepository = Provider<DriftRemoteAlbumRepository>(
+  (ref) => DriftRemoteAlbumRepository(ref.watch(driftProvider)),
+);
diff --git a/mobile/lib/repositories/auth.repository.dart b/mobile/lib/repositories/auth.repository.dart
index 1403280723..3ad8e34580 100644
--- a/mobile/lib/repositories/auth.repository.dart
+++ b/mobile/lib/repositories/auth.repository.dart
@@ -34,6 +34,12 @@ class AuthRepository extends DatabaseRepository {
         db.users.clear(),
         _drift.remoteAssetEntity.deleteAll(),
         _drift.remoteExifEntity.deleteAll(),
+        _drift.userEntity.deleteAll(),
+        _drift.userMetadataEntity.deleteAll(),
+        _drift.partnerEntity.deleteAll(),
+        _drift.remoteAlbumEntity.deleteAll(),
+        _drift.remoteAlbumAssetEntity.deleteAll(),
+        _drift.remoteAlbumUserEntity.deleteAll(),
       ]);
     });
   }
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 33631f85da..708171896a 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -68,6 +68,7 @@ import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.da
 import 'package:immich_mobile/presentation/pages/dev/local_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/remote_timeline.page.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/routing/auth_guard.dart';
@@ -365,6 +366,10 @@ class AppRouter extends RootStackRouter {
       page: MainTimelineRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: RemoteTimelineRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 797b519ddb..a5c2c58614 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -1425,6 +1425,43 @@ class RemoteMediaSummaryRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [RemoteTimelinePage]
+class RemoteTimelineRoute extends PageRouteInfo<RemoteTimelineRouteArgs> {
+  RemoteTimelineRoute({
+    Key? key,
+    required String albumId,
+    List<PageRouteInfo>? children,
+  }) : super(
+          RemoteTimelineRoute.name,
+          args: RemoteTimelineRouteArgs(key: key, albumId: albumId),
+          initialChildren: children,
+        );
+
+  static const String name = 'RemoteTimelineRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<RemoteTimelineRouteArgs>();
+      return RemoteTimelinePage(key: args.key, albumId: args.albumId);
+    },
+  );
+}
+
+class RemoteTimelineRouteArgs {
+  const RemoteTimelineRouteArgs({this.key, required this.albumId});
+
+  final Key? key;
+
+  final String albumId;
+
+  @override
+  String toString() {
+    return 'RemoteTimelineRouteArgs{key: $key, albumId: $albumId}';
+  }
+}
+
 /// generated route for
 /// [SearchPage]
 class SearchRoute extends PageRouteInfo<SearchRouteArgs> {
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 238a19e5d1..b09f36548a 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -466,6 +466,7 @@ Class | Method | HTTP request | Description
  - [SyncAckDto](doc//SyncAckDto.md)
  - [SyncAckSetDto](doc//SyncAckSetDto.md)
  - [SyncAlbumDeleteV1](doc//SyncAlbumDeleteV1.md)
+ - [SyncAlbumToAssetDeleteV1](doc//SyncAlbumToAssetDeleteV1.md)
  - [SyncAlbumToAssetV1](doc//SyncAlbumToAssetV1.md)
  - [SyncAlbumUserDeleteV1](doc//SyncAlbumUserDeleteV1.md)
  - [SyncAlbumUserV1](doc//SyncAlbumUserV1.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index b9649b0ba3..df61b8ab00 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -249,6 +249,7 @@ part 'model/sync_ack_delete_dto.dart';
 part 'model/sync_ack_dto.dart';
 part 'model/sync_ack_set_dto.dart';
 part 'model/sync_album_delete_v1.dart';
+part 'model/sync_album_to_asset_delete_v1.dart';
 part 'model/sync_album_to_asset_v1.dart';
 part 'model/sync_album_user_delete_v1.dart';
 part 'model/sync_album_user_v1.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index dd37b628ab..18b2c9202b 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -554,6 +554,8 @@ class ApiClient {
           return SyncAckSetDto.fromJson(value);
         case 'SyncAlbumDeleteV1':
           return SyncAlbumDeleteV1.fromJson(value);
+        case 'SyncAlbumToAssetDeleteV1':
+          return SyncAlbumToAssetDeleteV1.fromJson(value);
         case 'SyncAlbumToAssetV1':
           return SyncAlbumToAssetV1.fromJson(value);
         case 'SyncAlbumUserDeleteV1':
diff --git a/mobile/openapi/lib/model/sync_album_to_asset_delete_v1.dart b/mobile/openapi/lib/model/sync_album_to_asset_delete_v1.dart
new file mode 100644
index 0000000000..d18c850b2a
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_album_to_asset_delete_v1.dart
@@ -0,0 +1,107 @@
+//
+// 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 SyncAlbumToAssetDeleteV1 {
+  /// Returns a new [SyncAlbumToAssetDeleteV1] instance.
+  SyncAlbumToAssetDeleteV1({
+    required this.albumId,
+    required this.assetId,
+  });
+
+  String albumId;
+
+  String assetId;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncAlbumToAssetDeleteV1 &&
+    other.albumId == albumId &&
+    other.assetId == assetId;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (albumId.hashCode) +
+    (assetId.hashCode);
+
+  @override
+  String toString() => 'SyncAlbumToAssetDeleteV1[albumId=$albumId, assetId=$assetId]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'albumId'] = this.albumId;
+      json[r'assetId'] = this.assetId;
+    return json;
+  }
+
+  /// Returns a new [SyncAlbumToAssetDeleteV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncAlbumToAssetDeleteV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncAlbumToAssetDeleteV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncAlbumToAssetDeleteV1(
+        albumId: mapValueOfType<String>(json, r'albumId')!,
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncAlbumToAssetDeleteV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncAlbumToAssetDeleteV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncAlbumToAssetDeleteV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncAlbumToAssetDeleteV1> mapFromJson(dynamic json) {
+    final map = <String, SyncAlbumToAssetDeleteV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncAlbumToAssetDeleteV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncAlbumToAssetDeleteV1-objects as value to a dart map
+  static Map<String, List<SyncAlbumToAssetDeleteV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncAlbumToAssetDeleteV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncAlbumToAssetDeleteV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'albumId',
+    'assetId',
+  };
+}
+
diff --git a/mobile/test/domain/services/sync_stream_service_test.dart b/mobile/test/domain/services/sync_stream_service_test.dart
index 2922358ff4..a0b61bcaff 100644
--- a/mobile/test/domain/services/sync_stream_service_test.dart
+++ b/mobile/test/domain/services/sync_stream_service_test.dart
@@ -59,16 +59,28 @@ void main() {
         .thenAnswer(successHandler);
     when(() => mockSyncStreamRepo.updateAssetsV1(any()))
         .thenAnswer(successHandler);
+    when(
+      () => mockSyncStreamRepo.updateAssetsV1(
+        any(),
+        debugLabel: any(named: 'debugLabel'),
+      ),
+    ).thenAnswer(successHandler);
     when(() => mockSyncStreamRepo.deleteAssetsV1(any()))
         .thenAnswer(successHandler);
+    when(
+      () => mockSyncStreamRepo.deleteAssetsV1(
+        any(),
+        debugLabel: any(named: 'debugLabel'),
+      ),
+    ).thenAnswer(successHandler);
     when(() => mockSyncStreamRepo.updateAssetsExifV1(any()))
         .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.updatePartnerAssetsV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.deletePartnerAssetsV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.updatePartnerAssetsExifV1(any()))
-        .thenAnswer(successHandler);
+    when(
+      () => mockSyncStreamRepo.updateAssetsExifV1(
+        any(),
+        debugLabel: any(named: 'debugLabel'),
+      ),
+    ).thenAnswer(successHandler);
 
     sut = SyncStreamService(
       syncApiRepository: mockSyncApiRepo,
diff --git a/mobile/test/fixtures/album.stub.dart b/mobile/test/fixtures/album.stub.dart
index 1432d35901..1e79f62faf 100644
--- a/mobile/test/fixtures/album.stub.dart
+++ b/mobile/test/fixtures/album.stub.dart
@@ -1,4 +1,4 @@
-import 'package:immich_mobile/domain/models/local_album.model.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 
diff --git a/mobile/test/infrastructure/repositories/local_album_repository_test.dart b/mobile/test/infrastructure/repositories/local_album_repository_test.dart
index f6c82c1be8..bab25de52a 100644
--- a/mobile/test/infrastructure/repositories/local_album_repository_test.dart
+++ b/mobile/test/infrastructure/repositories/local_album_repository_test.dart
@@ -1,7 +1,7 @@
 import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/local_album.model.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 
diff --git a/mobile/test/test_utils/medium_factory.dart b/mobile/test/test_utils/medium_factory.dart
index affe9c9b39..8dafc564c1 100644
--- a/mobile/test/test_utils/medium_factory.dart
+++ b/mobile/test/test_utils/medium_factory.dart
@@ -1,7 +1,7 @@
 import 'dart:math';
 
+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/local_album.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index b63b50338b..129c120286 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13450,6 +13450,21 @@
         ],
         "type": "object"
       },
+      "SyncAlbumToAssetDeleteV1": {
+        "properties": {
+          "albumId": {
+            "type": "string"
+          },
+          "assetId": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "albumId",
+          "assetId"
+        ],
+        "type": "object"
+      },
       "SyncAlbumToAssetV1": {
         "properties": {
           "albumId": {
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index b552f52a31..7385edf400 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -198,6 +198,7 @@ const responseDtos = [
   SyncAlbumUserV1,
   SyncAlbumUserDeleteV1,
   SyncAlbumToAssetV1,
+  SyncAlbumToAssetDeleteV1,
   SyncAckV1,
 ];
 

From a43159f4ba682c62ebfc54f7fafcb3b6d11e2d32 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Thu, 26 Jun 2025 10:07:22 -0500
Subject: [PATCH 064/337] fix(mobile): skip widget updates if on android
 (#19553)

* fix: skip widget updates if on android

* remove dead line
---
 mobile/lib/services/widget.service.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mobile/lib/services/widget.service.dart b/mobile/lib/services/widget.service.dart
index 66e070494f..02ddedbe89 100644
--- a/mobile/lib/services/widget.service.dart
+++ b/mobile/lib/services/widget.service.dart
@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/repositories/widget.repository.dart';
@@ -32,6 +33,8 @@ class WidgetService {
   }
 
   Future<void> refreshWidgets() async {
+    if (Platform.isAndroid) return;
+
     for (final name in kWidgetNames) {
       await _repository.refresh(name);
     }

From 934649c8df96226f19312b83009bf5aac9d015d4 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Thu, 26 Jun 2025 11:18:40 -0400
Subject: [PATCH 065/337] feat(server): check additional exif date tags
 (#19216)

* feat(server): check additional exif date tags

- Add support for UTC date tags (GPSDateTime, DateTimeUTC, GPSDateStamp, SonyDateTime2)
- This matches tags that exiftool-vendored uses for tzSource in extractTzOffsetFromUTCOffset()

* Review comments

* nit

* review comments

* lots of tests for exif datetime

* missed

* format

* format again

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 e2e/package-lock.json                        | 474 +++++++++++++++++++
 e2e/package.json                             |   1 +
 e2e/src/api/specs/asset.e2e-spec.ts          | 440 +++++++++++++++++
 e2e/src/generate-date-tag-test-images.ts     | 178 +++++++
 e2e/test-assets                              |   2 +-
 server/src/services/metadata.service.spec.ts |  78 ++-
 server/src/services/metadata.service.ts      |  52 +-
 7 files changed, 1213 insertions(+), 12 deletions(-)
 create mode 100644 e2e/src/generate-date-tag-test-images.ts

diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index acc20b97f8..ecf78cf9a9 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -34,6 +34,7 @@
         "pngjs": "^7.0.0",
         "prettier": "^3.2.5",
         "prettier-plugin-organize-imports": "^4.0.0",
+        "sharp": "^0.33.5",
         "socket.io-client": "^4.7.4",
         "supertest": "^7.0.0",
         "typescript": "^5.3.3",
@@ -178,6 +179,17 @@
         "node": ">=18"
       }
     },
+    "node_modules/@emnapi/runtime": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz",
+      "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.25.5",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
@@ -823,6 +835,386 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@img/sharp-darwin-arm64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz",
+      "integrity": "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-arm64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-darwin-x64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz",
+      "integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-x64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-libvips-darwin-arm64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz",
+      "integrity": "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-darwin-x64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz",
+      "integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-arm": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz",
+      "integrity": "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-arm64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz",
+      "integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-s390x": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz",
+      "integrity": "sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-x64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz",
+      "integrity": "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz",
+      "integrity": "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz",
+      "integrity": "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-linux-arm": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz",
+      "integrity": "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-arm": "1.0.5"
+      }
+    },
+    "node_modules/@img/sharp-linux-arm64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz",
+      "integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-arm64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-linux-s390x": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz",
+      "integrity": "sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-s390x": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-linux-x64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz",
+      "integrity": "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-x64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-linuxmusl-arm64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz",
+      "integrity": "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-linuxmusl-x64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz",
+      "integrity": "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linuxmusl-x64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-wasm32": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz",
+      "integrity": "sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==",
+      "cpu": [
+        "wasm32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/runtime": "^1.2.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-win32-ia32": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz",
+      "integrity": "sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-win32-x64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz",
+      "integrity": "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
     "node_modules/@immich/cli": {
       "resolved": "../cli",
       "link": true
@@ -2447,6 +2839,20 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/color": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
+      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1",
+        "color-string": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=12.5.0"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2467,6 +2873,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/color-string": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
     "node_modules/color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
@@ -3964,6 +4381,13 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/is-builtin-module": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-5.0.0.tgz",
@@ -5536,6 +5960,46 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/sharp": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.5.tgz",
+      "integrity": "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "color": "^4.2.3",
+        "detect-libc": "^2.0.3",
+        "semver": "^7.6.3"
+      },
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-darwin-arm64": "0.33.5",
+        "@img/sharp-darwin-x64": "0.33.5",
+        "@img/sharp-libvips-darwin-arm64": "1.0.4",
+        "@img/sharp-libvips-darwin-x64": "1.0.4",
+        "@img/sharp-libvips-linux-arm": "1.0.5",
+        "@img/sharp-libvips-linux-arm64": "1.0.4",
+        "@img/sharp-libvips-linux-s390x": "1.0.4",
+        "@img/sharp-libvips-linux-x64": "1.0.4",
+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.4",
+        "@img/sharp-libvips-linuxmusl-x64": "1.0.4",
+        "@img/sharp-linux-arm": "0.33.5",
+        "@img/sharp-linux-arm64": "0.33.5",
+        "@img/sharp-linux-s390x": "0.33.5",
+        "@img/sharp-linux-x64": "0.33.5",
+        "@img/sharp-linuxmusl-arm64": "0.33.5",
+        "@img/sharp-linuxmusl-x64": "0.33.5",
+        "@img/sharp-wasm32": "0.33.5",
+        "@img/sharp-win32-ia32": "0.33.5",
+        "@img/sharp-win32-x64": "0.33.5"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -5655,6 +6119,16 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
     "node_modules/socket.io-client": {
       "version": "4.8.1",
       "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz",
diff --git a/e2e/package.json b/e2e/package.json
index 5c31d23ed1..d2d5857ed5 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -44,6 +44,7 @@
     "pngjs": "^7.0.0",
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^4.0.0",
+    "sharp": "^0.33.5",
     "socket.io-client": "^4.7.4",
     "supertest": "^7.0.0",
     "typescript": "^5.3.3",
diff --git a/e2e/src/api/specs/asset.e2e-spec.ts b/e2e/src/api/specs/asset.e2e-spec.ts
index 4673db5426..c1e9f9dfb8 100644
--- a/e2e/src/api/specs/asset.e2e-spec.ts
+++ b/e2e/src/api/specs/asset.e2e-spec.ts
@@ -15,6 +15,7 @@ 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';
@@ -40,6 +41,40 @@ 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;
@@ -1190,6 +1225,411 @@ 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: 'CreateDate when DateTimeOriginal missing',
+              exifData: {
+                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-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
new file mode 100644
index 0000000000..34cc956416
--- /dev/null
+++ b/e2e/src/generate-date-tag-test-images.ts
@@ -0,0 +1,178 @@
+#!/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 8885d6d01c..18736fc27a 160000
--- a/e2e/test-assets
+++ b/e2e/test-assets
@@ -1 +1 @@
-Subproject commit 8885d6d01c12242785b6ea68f4a277334f60bc90
+Subproject commit 18736fc27a80c99c68e856cdb4f842bc81ed3445
diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.ts
index 7b2cba1250..5386b5fb12 100644
--- a/server/src/services/metadata.service.spec.ts
+++ b/server/src/services/metadata.service.spec.ts
@@ -6,7 +6,7 @@ import { defaults } from 'src/config';
 import { MapAsset } from 'src/dtos/asset-response.dto';
 import { AssetType, AssetVisibility, ExifOrientation, ImmichWorker, JobName, JobStatus, SourceType } from 'src/enum';
 import { ImmichTags } from 'src/repositories/metadata.repository';
-import { MetadataService } from 'src/services/metadata.service';
+import { firstDateTime, MetadataService } from 'src/services/metadata.service';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { fileStub } from 'test/fixtures/file.stub';
 import { probeStub } from 'test/fixtures/media.stub';
@@ -1639,4 +1639,80 @@ describe(MetadataService.name, () => {
       });
     });
   });
+
+  describe('firstDateTime', () => {
+    it('should ignore date-only tags like GPSDateStamp', () => {
+      const tags = {
+        GPSDateStamp: '2023:08:08', // Date-only tag, should be ignored
+        SonyDateTime2: '2023:07:07 07:00:00',
+      };
+
+      const result = firstDateTime(tags);
+      expect(result?.tag).toBe('SonyDateTime2');
+      expect(result?.dateTime?.toDate()?.toISOString()).toBe('2023-07-07T07:00:00.000Z');
+    });
+
+    it('should respect full priority order with all date tags present', () => {
+      const tags = {
+        // SubSec and standard EXIF date tags
+        SubSecDateTimeOriginal: '2023:01:01 01:00:00',
+        SubSecCreateDate: '2023:02:02 02:00:00',
+        SubSecMediaCreateDate: '2023:03:03 03:00:00',
+        DateTimeOriginal: '2023:04:04 04:00:00',
+        CreateDate: '2023:05:05 05:00:00',
+        MediaCreateDate: '2023:06:06 06:00:00',
+        CreationDate: '2023:07:07 07:00:00',
+        DateTimeCreated: '2023:08:08 08:00:00',
+
+        // Additional date tags
+        TimeCreated: '2023:09:09 09:00:00',
+        GPSDateTime: '2023:10:10 10:00:00',
+        DateTimeUTC: '2023:11:11 11:00:00',
+        GPSDateStamp: '2023:12:12', // Date-only tag, should be ignored
+        SonyDateTime2: '2023:13:13 13:00:00',
+
+        // Non-standard tag
+        SourceImageCreateTime: '2023:14:14 14:00:00',
+      };
+
+      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');
+    });
+
+    it('should handle missing SubSec tags and use available date tags', () => {
+      const tags = {
+        // Standard date tags
+        CreationDate: '2023:07:07 07:00:00',
+        DateTimeCreated: '2023:08:08 08:00:00',
+
+        // Additional date tags
+        TimeCreated: '2023:09:09 09:00:00',
+        GPSDateTime: '2023:10:10 10:00:00',
+        DateTimeUTC: '2023:11:11 11:00:00',
+        GPSDateStamp: '2023:12:12', // Date-only tag, should be ignored
+        SonyDateTime2: '2023:13:13 13:00:00',
+      };
+
+      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');
+    });
+
+    it('should handle invalid date formats gracefully', () => {
+      const tags = {
+        TimeCreated: 'invalid-date',
+        GPSDateTime: '2023:10:10 10:00:00',
+        DateTimeUTC: 'also-invalid',
+        SonyDateTime2: '2023:13:13 13:00:00',
+      };
+
+      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');
+    });
+  });
 });
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
index 109f5f6936..7c6d659124 100644
--- a/server/src/services/metadata.service.ts
+++ b/server/src/services/metadata.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { ContainerDirectoryItem, Maybe, Tags } from 'exiftool-vendored';
-import { firstDateTime } from 'exiftool-vendored/dist/FirstDateTime';
+import { ContainerDirectoryItem, ExifDateTime, Tags } from 'exiftool-vendored';
 import { Insertable } from 'kysely';
 import _ from 'lodash';
 import { Duration } from 'luxon';
@@ -32,19 +31,47 @@ import { isFaceImportEnabled } from 'src/utils/misc';
 import { upsertTags } from 'src/utils/tag';
 
 /** look for a date from these tags (in order) */
-const EXIF_DATE_TAGS: Array<keyof Tags> = [
+const EXIF_DATE_TAGS: Array<keyof ImmichTags> = [
   'SubSecDateTimeOriginal',
-  'DateTimeOriginal',
   'SubSecCreateDate',
-  'CreationDate',
-  'CreateDate',
   'SubSecMediaCreateDate',
+  'DateTimeOriginal',
+  'CreateDate',
   'MediaCreateDate',
+  'CreationDate',
   'DateTimeCreated',
+  'GPSDateTime',
+  'DateTimeUTC',
+  'SonyDateTime2',
   // Undocumented, non-standard tag from insta360 in xmp.GPano namespace
-  'SourceImageCreateTime' as keyof Tags,
+  'SourceImageCreateTime' as keyof ImmichTags,
 ];
 
+export function firstDateTime(tags: ImmichTags) {
+  for (const tag of EXIF_DATE_TAGS) {
+    const tagValue = tags?.[tag];
+
+    if (tagValue instanceof ExifDateTime) {
+      return {
+        tag,
+        dateTime: tagValue,
+      };
+    }
+
+    if (typeof tagValue !== 'string') {
+      continue;
+    }
+
+    const exifDateTime = ExifDateTime.fromEXIF(tagValue);
+    if (exifDateTime) {
+      return {
+        tag,
+        dateTime: exifDateTime,
+      };
+    }
+  }
+}
+
 const validate = <T>(value: T): NonNullable<T> | null => {
   // handle lists of numbers
   if (Array.isArray(value)) {
@@ -407,7 +434,8 @@ export class MetadataService extends BaseService {
 
     // prefer dates from sidecar tags
     if (sidecarTags) {
-      const sidecarDate = firstDateTime(sidecarTags as Tags, EXIF_DATE_TAGS);
+      const result = firstDateTime(sidecarTags);
+      const sidecarDate = result?.dateTime;
       if (sidecarDate) {
         for (const tag of EXIF_DATE_TAGS) {
           delete mediaTags[tag];
@@ -748,8 +776,12 @@ export class MetadataService extends BaseService {
   }
 
   private getDates(asset: { id: string; originalPath: string }, exifTags: ImmichTags, stats: Stats) {
-    const dateTime = firstDateTime(exifTags as Maybe<Tags>, EXIF_DATE_TAGS);
-    this.logger.verbose(`Date and time is ${dateTime} for asset ${asset.id}: ${asset.originalPath}`);
+    const result = firstDateTime(exifTags);
+    const tag = result?.tag;
+    const dateTime = result?.dateTime;
+    this.logger.verbose(
+      `Date and time is ${dateTime} using exifTag ${tag} for asset ${asset.id}: ${asset.originalPath}`,
+    );
 
     // timezone
     let timeZone = exifTags.tz ?? null;

From 926ff075a37c2dda2c58924ee841e9f5120a2e8c Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Thu, 26 Jun 2025 23:46:34 +0800
Subject: [PATCH 066/337] fix(web): absolute path match in external library
 (#19551)

---
 server/src/repositories/view-repository.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/repositories/view-repository.ts b/server/src/repositories/view-repository.ts
index 03e8b3763f..3a498d5b3e 100644
--- a/server/src/repositories/view-repository.ts
+++ b/server/src/repositories/view-repository.ts
@@ -22,12 +22,12 @@ export class ViewRepository {
       .where('localDateTime', 'is not', null)
       .execute();
 
-    return results.map((row) => row.directoryPath.replaceAll(/^\/|\/$/g, ''));
+    return results.map((row) => row.directoryPath.replaceAll(/\/$/g, ''));
   }
 
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.STRING] })
   async getAssetsByOriginalPath(userId: string, partialPath: string) {
-    const normalizedPath = partialPath.replaceAll(/^\/|\/$/g, '');
+    const normalizedPath = partialPath.replaceAll(/\/$/g, '');
 
     return this.db
       .selectFrom('assets')

From b96c95beda468a780a57fa68851eae375f884102 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Thu, 26 Jun 2025 13:24:57 -0400
Subject: [PATCH 067/337] refactor(server): sync service (#19559)

---
 open-api/immich-openapi-specs.json  | 1 +
 server/src/dtos/sync.dto.ts         | 3 ++-
 server/src/services/sync.service.ts | 5 +----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 129c120286..9ac60e2a54 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13425,6 +13425,7 @@
         "properties": {
           "acks": {
             "items": {
+              "maxLength": 1000,
               "type": "string"
             },
             "type": "array"
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index 7385edf400..7a15c2e456 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsInt, IsPositive, IsString } from 'class-validator';
+import { IsEnum, IsInt, IsPositive, IsString, MaxLength } from 'class-validator';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AlbumUserRole, AssetOrder, AssetType, AssetVisibility, SyncEntityType, SyncRequestType } from 'src/enum';
 import { Optional, ValidateDate, ValidateUUID } from 'src/validation';
@@ -217,6 +217,7 @@ export class SyncAckDto {
 }
 
 export class SyncAckSetDto {
+  @MaxLength(1000)
   @IsString({ each: true })
   acks!: string[];
 }
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 47189cb033..484065bcc9 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -96,10 +96,7 @@ export class SyncService extends BaseService {
         throw new BadRequestException(`Invalid ack type: ${type}`);
       }
 
-      if (checkpoints[type]) {
-        throw new BadRequestException('Only one ack per type is allowed');
-      }
-
+      // TODO pick the latest ack for each type, instead of using the last one
       checkpoints[type] = { sessionId, type, ack };
     }
 

From 3105094a3df35b57e58fb5f181116ae0cabc78ac Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Thu, 26 Jun 2025 15:32:06 -0400
Subject: [PATCH 068/337] refactor: medium tests (#19537)

---
 server/src/services/base.service.ts           |  47 ++
 server/test/medium.factory.ts                 | 546 +++++++-----------
 .../specs/services/asset.service.spec.ts      |  47 +-
 .../specs/services/audit.database.spec.ts     |  59 +-
 .../specs/services/memory.service.spec.ts     |  97 ++--
 .../specs/services/person.service.spec.ts     |  84 ++-
 .../specs/services/user.service.spec.ts       | 138 ++---
 .../specs/services/version.service.spec.ts    |  56 +-
 .../specs/sync/sync-album-asset-exif.spec.ts  | 226 +++-----
 .../specs/sync/sync-album-asset.spec.ts       | 189 +++---
 .../specs/sync/sync-album-to-asset.spec.ts    | 328 ++++-------
 .../medium/specs/sync/sync-album-user.spec.ts | 305 ++++------
 .../test/medium/specs/sync/sync-album.spec.ts | 195 ++++---
 .../medium/specs/sync/sync-asset-exif.spec.ts | 130 ++---
 .../test/medium/specs/sync/sync-asset.spec.ts | 139 ++---
 .../sync/sync-partner-asset-exif.spec.ts      | 457 ++++++---------
 .../specs/sync/sync-partner-asset.spec.ts     | 425 ++++++--------
 .../medium/specs/sync/sync-partner.spec.ts    | 203 +++----
 .../test/medium/specs/sync/sync-user.spec.ts  | 161 +++---
 19 files changed, 1579 insertions(+), 2253 deletions(-)

diff --git a/server/src/services/base.service.ts b/server/src/services/base.service.ts
index 1c44abfd92..3e2128ac2c 100644
--- a/server/src/services/base.service.ts
+++ b/server/src/services/base.service.ts
@@ -53,6 +53,53 @@ import { UserTable } from 'src/schema/tables/user.table';
 import { AccessRequest, checkAccess, requireAccess } from 'src/utils/access';
 import { getConfig, updateConfig } from 'src/utils/config';
 
+export const BASE_SERVICE_DEPENDENCIES = [
+  LoggingRepository,
+  AccessRepository,
+  ActivityRepository,
+  AlbumRepository,
+  AlbumUserRepository,
+  ApiKeyRepository,
+  AssetRepository,
+  AssetJobRepository,
+  AuditRepository,
+  ConfigRepository,
+  CronRepository,
+  CryptoRepository,
+  DatabaseRepository,
+  DownloadRepository,
+  DuplicateRepository,
+  EmailRepository,
+  EventRepository,
+  JobRepository,
+  LibraryRepository,
+  MachineLearningRepository,
+  MapRepository,
+  MediaRepository,
+  MemoryRepository,
+  MetadataRepository,
+  MoveRepository,
+  NotificationRepository,
+  OAuthRepository,
+  PartnerRepository,
+  PersonRepository,
+  ProcessRepository,
+  SearchRepository,
+  ServerInfoRepository,
+  SessionRepository,
+  SharedLinkRepository,
+  StackRepository,
+  StorageRepository,
+  SyncRepository,
+  SystemMetadataRepository,
+  TagRepository,
+  TelemetryRepository,
+  TrashRepository,
+  UserRepository,
+  VersionHistoryRepository,
+  ViewRepository,
+];
+
 @Injectable()
 export class BaseService {
   protected storageCore: StorageCore;
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index cbecff267d..69708d0fce 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -1,12 +1,12 @@
-import { ClassConstructor } from 'class-transformer';
+/* eslint-disable @typescript-eslint/no-unsafe-function-type */
 import { Insertable, Kysely } from 'kysely';
 import { DateTime } from 'luxon';
 import { createHash, randomBytes } from 'node:crypto';
 import { Writable } from 'node:stream';
 import { AssetFace } from 'src/database';
-import { Albums, AssetJobStatus, Assets, DB, FaceSearch, Person, Sessions } from 'src/db';
+import { Albums, AssetJobStatus, Assets, DB, Exif, FaceSearch, Person, Sessions } from 'src/db';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { AssetType, AssetVisibility, SourceType, SyncRequestType } from 'src/enum';
+import { AlbumUserRole, AssetType, AssetVisibility, SourceType, SyncRequestType } from 'src/enum';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { ActivityRepository } from 'src/repositories/activity.repository';
 import { AlbumUserRepository } from 'src/repositories/album-user.repository';
@@ -31,298 +31,263 @@ import { SystemMetadataRepository } from 'src/repositories/system-metadata.repos
 import { UserRepository } from 'src/repositories/user.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
 import { UserTable } from 'src/schema/tables/user.table';
-import { BaseService } from 'src/services/base.service';
+import { BASE_SERVICE_DEPENDENCIES, BaseService } from 'src/services/base.service';
 import { SyncService } from 'src/services/sync.service';
-import { RepositoryInterface } from 'src/types';
 import { factory, newDate, newEmbedding, newUuid } from 'test/small.factory';
-import { automock, ServiceOverrides, wait } from 'test/utils';
+import { automock, wait } from 'test/utils';
 import { Mocked } from 'vitest';
 
-const sha256 = (value: string) => createHash('sha256').update(value).digest('base64');
+interface ClassConstructor<T = any> extends Function {
+  new (...args: any[]): T;
+}
 
-// type Repositories = Omit<ServiceOverrides, 'access' | 'telemetry'>;
-type RepositoriesTypes = {
-  access: AccessRepository;
-  activity: ActivityRepository;
-  album: AlbumRepository;
-  albumUser: AlbumUserRepository;
-  asset: AssetRepository;
-  assetJob: AssetJobRepository;
-  config: ConfigRepository;
-  crypto: CryptoRepository;
-  database: DatabaseRepository;
-  email: EmailRepository;
-  job: JobRepository;
-  user: UserRepository;
-  logger: LoggingRepository;
-  memory: MemoryRepository;
-  notification: NotificationRepository;
-  partner: PartnerRepository;
-  person: PersonRepository;
-  search: SearchRepository;
-  session: SessionRepository;
-  storage: StorageRepository;
-  sync: SyncRepository;
-  systemMetadata: SystemMetadataRepository;
-  versionHistory: VersionHistoryRepository;
-};
-type RepositoryMocks = { [K in keyof RepositoriesTypes]: Mocked<RepositoryInterface<RepositoriesTypes[K]>> };
-type RepositoryOptions = Partial<{ [K in keyof RepositoriesTypes]: 'mock' | 'real' }>;
-
-type ContextRepositoryMocks<R extends RepositoryOptions> = {
-  [K in keyof RepositoriesTypes as R[K] extends 'mock' ? K : never]: Mocked<RepositoryInterface<RepositoriesTypes[K]>>;
+type MediumTestOptions = {
+  mock: ClassConstructor<any>[];
+  real: ClassConstructor<any>[];
+  database: Kysely<DB>;
 };
 
-type ContextRepositories<R extends RepositoryOptions> = {
-  [K in keyof RepositoriesTypes as R[K] extends 'real' ? K : never]: RepositoriesTypes[K];
+export const newMediumService = <S extends BaseService>(Service: ClassConstructor<S>, options: MediumTestOptions) => {
+  const ctx = new MediumTestContext(Service, options);
+  return { sut: ctx.sut, ctx };
 };
 
-export type Context<R extends RepositoryOptions, S extends BaseService> = {
+export class MediumTestContext<S extends BaseService = BaseService> {
+  private repoCache: Record<string, any> = {};
+  private sutDeps: any[];
+
   sut: S;
-  mocks: ContextRepositoryMocks<R>;
-  repos: ContextRepositories<R>;
-  getRepository<T extends keyof RepositoriesTypes>(key: T): RepositoriesTypes[T];
-};
+  database: Kysely<DB>;
 
-export type SyncTestOptions = {
-  db: Kysely<DB>;
-};
+  constructor(
+    Service: ClassConstructor<S>,
+    private options: MediumTestOptions,
+  ) {
+    this.sutDeps = this.makeDeps(options);
+    this.sut = new Service(...this.sutDeps);
+    this.database = options.database;
+  }
 
-export const newSyncAuthUser = () => {
-  const user = mediumFactory.userInsert();
-  const session = mediumFactory.sessionInsert({ userId: user.id });
+  private makeDeps(options: MediumTestOptions) {
+    const deps = BASE_SERVICE_DEPENDENCIES;
 
-  const auth = factory.auth({
-    session,
-    user: {
-      id: user.id,
-      name: user.name,
-      email: user.email,
-    },
-  });
+    for (const dep of options.mock) {
+      if (!deps.includes(dep)) {
+        throw new Error(`Mocked repository ${dep.name} is not a valid dependency`);
+      }
+    }
 
-  return {
-    auth,
-    session,
-    user,
-    create: async (db: Kysely<DB>) => {
-      await new UserRepository(db).create(user);
-      await new SessionRepository(db).create(session);
-    },
-  };
-};
+    for (const dep of options.real) {
+      if (!deps.includes(dep)) {
+        throw new Error(`Real repository ${dep.name} is not a valid dependency`);
+      }
+    }
+    return (deps as ClassConstructor<any>[]).map((dep) => {
+      if (options.real.includes(dep)) {
+        return this.get(dep);
+      }
 
-export const newSyncTest = (options: SyncTestOptions) => {
-  const { sut, mocks, repos, getRepository } = newMediumService(SyncService, {
-    database: options.db,
-    repos: {
-      sync: 'real',
-      session: 'real',
-    },
-  });
+      if (options.mock.includes(dep)) {
+        return newMockRepository(dep);
+      }
+    });
+  }
 
-  const testSync = async (auth: AuthDto, types: SyncRequestType[]) => {
+  get<T>(key: ClassConstructor<T>): T {
+    if (!this.repoCache[key.name]) {
+      const real = newRealRepository(key, this.options.database);
+      this.repoCache[key.name] = real;
+    }
+
+    return this.repoCache[key.name];
+  }
+
+  getMock<T, R = Mocked<T>>(key: ClassConstructor<T>): R {
+    const index = BASE_SERVICE_DEPENDENCIES.indexOf(key as any);
+    if (index === -1 || !this.options.mock.includes(key)) {
+      throw new Error(`getMock called with a key that is not a mock: ${key.name}`);
+    }
+
+    return this.sutDeps[index] as R;
+  }
+
+  async newUser(dto: Partial<Insertable<UserTable>> = {}) {
+    const user = mediumFactory.userInsert(dto);
+    const result = await this.get(UserRepository).create(user);
+    return { user, result };
+  }
+
+  async newPartner(dto: { sharedById: string; sharedWithId: string; inTimeline?: boolean }) {
+    const partner = { inTimeline: true, ...dto };
+    const result = await this.get(PartnerRepository).create(partner);
+    return { partner, result };
+  }
+
+  async newAsset(dto: Partial<Insertable<Assets>> = {}) {
+    const asset = mediumFactory.assetInsert(dto);
+    const result = await this.get(AssetRepository).create(asset);
+    return { asset, result };
+  }
+
+  async newExif(dto: Insertable<Exif>) {
+    const result = await this.get(AssetRepository).upsertExif(dto);
+    return { result };
+  }
+
+  async newAlbum(dto: Insertable<Albums>) {
+    const album = mediumFactory.albumInsert(dto);
+    const result = await this.get(AlbumRepository).create(album, [], []);
+    return { album, result };
+  }
+
+  async newAlbumAsset(albumAsset: { albumId: string; assetId: string }) {
+    const result = await this.get(AlbumRepository).addAssetIds(albumAsset.albumId, [albumAsset.assetId]);
+    return { albumAsset, result };
+  }
+
+  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 });
+    return { albumUser: { albumId, userId, role }, result };
+  }
+
+  async newJobStatus(dto: Partial<Insertable<AssetJobStatus>> & { assetId: string }) {
+    const jobStatus = mediumFactory.assetJobStatusInsert({ assetId: dto.assetId });
+    const result = await this.get(AssetRepository).upsertJobStatus(jobStatus);
+    return { jobStatus, result };
+  }
+
+  async newPerson(dto: Partial<Insertable<Person>> & { ownerId: string }) {
+    const person = mediumFactory.personInsert(dto);
+    const result = await this.get(PersonRepository).create(person);
+    return { person, result };
+  }
+
+  async newSession(dto: Partial<Insertable<Sessions>> & { userId: string }) {
+    const session = mediumFactory.sessionInsert(dto);
+    const result = await this.get(SessionRepository).create(session);
+    return { session, result };
+  }
+
+  async newSyncAuthUser() {
+    const { user } = await this.newUser();
+    const { session } = await this.newSession({ userId: user.id });
+    const auth = factory.auth({
+      session,
+      user: {
+        id: user.id,
+        name: user.name,
+        email: user.email,
+      },
+    });
+
+    return {
+      auth,
+      session,
+      user,
+    };
+  }
+}
+
+export class SyncTestContext extends MediumTestContext<SyncService> {
+  constructor(database: Kysely<DB>) {
+    super(SyncService, { database, real: [SyncRepository, SessionRepository], mock: [LoggingRepository] });
+  }
+
+  async syncStream(auth: AuthDto, types: SyncRequestType[]) {
     const stream = mediumFactory.syncStream();
     // Wait for 2ms to ensure all updates are available and account for setTimeout inaccuracy
     await wait(2);
-    await sut.stream(auth, stream, { types });
+    await this.sut.stream(auth, stream, { types });
 
     return stream.getResponse();
-  };
-
-  return {
-    sut,
-    mocks,
-    repos,
-    getRepository,
-    testSync,
-  };
-};
-
-export const newMediumService = <R extends RepositoryOptions, S extends BaseService>(
-  Service: ClassConstructor<S>,
-  options: {
-    database: Kysely<DB>;
-    repos: R;
-  },
-): Context<R, S> => {
-  const repos: Partial<RepositoriesTypes> = {};
-  const mocks: Partial<RepositoryMocks> = {};
-
-  const loggerMock = getRepositoryMock('logger') as Mocked<LoggingRepository>;
-  loggerMock.setContext.mockImplementation(() => {});
-  repos.logger = loggerMock;
-
-  for (const [_key, type] of Object.entries(options.repos)) {
-    if (type === 'real') {
-      const key = _key as keyof RepositoriesTypes;
-      repos[key] = getRepository(key, options.database) as any;
-      continue;
-    }
-
-    if (type === 'mock') {
-      const key = _key as keyof RepositoryMocks;
-      mocks[key] = getRepositoryMock(key) as any;
-      continue;
-    }
   }
 
-  const makeRepository = <K extends keyof RepositoriesTypes>(key: K) => {
-    return repos[key] || getRepository(key, options.database);
-  };
+  async syncAckAll(auth: AuthDto, response: Array<{ type: string; ack: string }>) {
+    const acks: Record<string, string> = {};
+    for (const { type, ack } of response) {
+      acks[type] = ack;
+    }
 
-  const deps = asDeps({ ...mocks, ...repos } as ServiceOverrides);
-  const sut = new Service(...deps);
+    await this.sut.setAcks(auth, { acks: Object.values(acks) });
+  }
+}
 
-  return {
-    sut,
-    mocks,
-    repos,
-    getRepository: makeRepository,
-  } as Context<R, S>;
-};
-
-export const getRepository = <K extends keyof RepositoriesTypes>(key: K, db: Kysely<DB>) => {
+const newRealRepository = <T>(key: ClassConstructor<T>, db: Kysely<DB>): T => {
   switch (key) {
-    case 'access': {
-      return new AccessRepository(db);
+    case AccessRepository:
+    case AlbumRepository:
+    case AlbumUserRepository:
+    case ActivityRepository:
+    case AssetRepository:
+    case AssetJobRepository:
+    case MemoryRepository:
+    case NotificationRepository:
+    case PartnerRepository:
+    case PersonRepository:
+    case SearchRepository:
+    case SessionRepository:
+    case SyncRepository:
+    case SystemMetadataRepository:
+    case UserRepository:
+    case VersionHistoryRepository: {
+      return new key(db);
     }
 
-    case 'activity': {
-      return new ActivityRepository(db);
+    case ConfigRepository:
+    case CryptoRepository: {
+      return new key();
     }
 
-    case 'album': {
-      return new AlbumRepository(db);
+    case DatabaseRepository: {
+      return new key(db, LoggingRepository.create(), new ConfigRepository());
     }
 
-    case 'albumUser': {
-      return new AlbumUserRepository(db);
+    case EmailRepository: {
+      return new key(LoggingRepository.create());
     }
 
-    case 'asset': {
-      return new AssetRepository(db);
-    }
-
-    case 'assetJob': {
-      return new AssetJobRepository(db);
-    }
-
-    case 'config': {
-      return new ConfigRepository();
-    }
-
-    case 'crypto': {
-      return new CryptoRepository();
-    }
-
-    case 'database': {
-      return new DatabaseRepository(db, LoggingRepository.create(), new ConfigRepository());
-    }
-
-    case 'email': {
-      return new EmailRepository(LoggingRepository.create());
-    }
-
-    case 'logger': {
-      return LoggingRepository.create();
-    }
-
-    case 'memory': {
-      return new MemoryRepository(db);
-    }
-
-    case 'notification': {
-      return new NotificationRepository(db);
-    }
-
-    case 'partner': {
-      return new PartnerRepository(db);
-    }
-
-    case 'person': {
-      return new PersonRepository(db);
-    }
-
-    case 'search': {
-      return new SearchRepository(db);
-    }
-
-    case 'session': {
-      return new SessionRepository(db);
-    }
-
-    case 'sync': {
-      return new SyncRepository(db);
-    }
-
-    case 'systemMetadata': {
-      return new SystemMetadataRepository(db);
-    }
-
-    case 'user': {
-      return new UserRepository(db);
-    }
-
-    case 'versionHistory': {
-      return new VersionHistoryRepository(db);
+    case LoggingRepository as unknown as ClassConstructor<LoggingRepository>: {
+      return new key() as unknown as T;
     }
 
     default: {
-      throw new Error(`Invalid repository key: ${key}`);
+      throw new Error(`Unable to create repository instance for key: ${key?.name || key}`);
     }
   }
 };
 
-const getRepositoryMock = <K extends keyof RepositoryMocks>(key: K) => {
+const newMockRepository = <T>(key: ClassConstructor<T>) => {
   switch (key) {
-    case 'activity': {
-      return automock(ActivityRepository) as Mocked<RepositoryInterface<ActivityRepository>>;
+    case ActivityRepository:
+    case AlbumRepository:
+    case AssetRepository:
+    case AssetJobRepository:
+    case ConfigRepository:
+    case CryptoRepository:
+    case MemoryRepository:
+    case NotificationRepository:
+    case PartnerRepository:
+    case PersonRepository:
+    case SessionRepository:
+    case SyncRepository:
+    case SystemMetadataRepository:
+    case UserRepository:
+    case VersionHistoryRepository: {
+      return automock(key);
     }
 
-    case 'album': {
-      return automock(AlbumRepository);
-    }
-
-    case 'asset': {
-      return automock(AssetRepository);
-    }
-
-    case 'assetJob': {
-      return automock(AssetJobRepository);
-    }
-
-    case 'config': {
-      return automock(ConfigRepository);
-    }
-
-    case 'crypto': {
-      return automock(CryptoRepository);
-    }
-
-    case 'database': {
+    case DatabaseRepository: {
       return automock(DatabaseRepository, {
-        args: [
-          undefined,
-          {
-            setContext: () => {},
-          },
-          { getEnv: () => ({ database: { vectorExtension: '' } }) },
-        ],
+        args: [undefined, { setContext: () => {} }, { getEnv: () => ({ database: { vectorExtension: '' } }) }],
       });
     }
 
-    case 'email': {
-      return automock(EmailRepository, {
-        args: [
-          {
-            setContext: () => {},
-          },
-        ],
-      });
+    case EmailRepository: {
+      return automock(EmailRepository, { args: [{ setContext: () => {} }] });
     }
 
-    case 'job': {
+    case JobRepository: {
       return automock(JobRepository, {
         args: [
           undefined,
@@ -335,106 +300,21 @@ const getRepositoryMock = <K extends keyof RepositoryMocks>(key: K) => {
       });
     }
 
-    case 'logger': {
+    case LoggingRepository as unknown as ClassConstructor<T>: {
       const configMock = { getEnv: () => ({ noColor: false }) };
       return automock(LoggingRepository, { args: [undefined, configMock], strict: false });
     }
 
-    case 'memory': {
-      return automock(MemoryRepository);
-    }
-
-    case 'notification': {
-      return automock(NotificationRepository);
-    }
-
-    case 'partner': {
-      return automock(PartnerRepository);
-    }
-
-    case 'person': {
-      return automock(PersonRepository);
-    }
-
-    case 'session': {
-      return automock(SessionRepository);
-    }
-
-    case 'storage': {
+    case StorageRepository: {
       return automock(StorageRepository, { args: [{ setContext: () => {} }] });
     }
 
-    case 'sync': {
-      return automock(SyncRepository);
-    }
-
-    case 'systemMetadata': {
-      return automock(SystemMetadataRepository);
-    }
-
-    case 'user': {
-      return automock(UserRepository);
-    }
-
-    case 'versionHistory': {
-      return automock(VersionHistoryRepository);
-    }
-
     default: {
       throw new Error(`Invalid repository key: ${key}`);
     }
   }
 };
 
-export const asDeps = (repositories: ServiceOverrides) => {
-  return [
-    repositories.logger || getRepositoryMock('logger'), // logger
-    repositories.access, // access
-    repositories.activity || getRepositoryMock('activity'),
-    repositories.album || getRepositoryMock('album'),
-    repositories.albumUser,
-    repositories.apiKey,
-    repositories.asset || getRepositoryMock('asset'),
-    repositories.assetJob || getRepositoryMock('assetJob'),
-    repositories.audit,
-    repositories.config || getRepositoryMock('config'),
-    repositories.cron,
-    repositories.crypto || getRepositoryMock('crypto'),
-    repositories.database || getRepositoryMock('database'),
-    repositories.downloadRepository,
-    repositories.duplicateRepository,
-    repositories.email || getRepositoryMock('email'),
-    repositories.event,
-    repositories.job || getRepositoryMock('job'),
-    repositories.library,
-    repositories.machineLearning,
-    repositories.map,
-    repositories.media,
-    repositories.memory || getRepositoryMock('memory'),
-    repositories.metadata,
-    repositories.move,
-    repositories.notification || getRepositoryMock('notification'),
-    repositories.oauth,
-    repositories.partner || getRepositoryMock('partner'),
-    repositories.person || getRepositoryMock('person'),
-    repositories.process,
-    repositories.search,
-    repositories.serverInfo,
-    repositories.session || getRepositoryMock('session'),
-    repositories.sharedLink,
-    repositories.stack,
-    repositories.storage || getRepositoryMock('storage'),
-    repositories.sync || getRepositoryMock('sync'),
-    repositories.systemMetadata || getRepositoryMock('systemMetadata'),
-    repositories.tag,
-    repositories.telemetry,
-    repositories.trash,
-    repositories.user,
-    repositories.versionHistory || getRepositoryMock('versionHistory'),
-    repositories.view,
-  ];
-};
-
 const assetInsert = (asset: Partial<Insertable<Assets>> = {}) => {
   const id = asset.id || newUuid();
   const now = newDate();
@@ -544,6 +424,8 @@ const personInsert = (person: Partial<Insertable<Person>> & { ownerId: string })
   };
 };
 
+const sha256 = (value: string) => createHash('sha256').update(value).digest('base64');
+
 const sessionInsert = ({ id = newUuid(), userId, ...session }: Partial<Insertable<Sessions>> & { userId: string }) => {
   const defaults: Insertable<Sessions> = {
     id,
diff --git a/server/test/medium/specs/services/asset.service.spec.ts b/server/test/medium/specs/services/asset.service.spec.ts
index 7be431f5f2..db9a7de082 100644
--- a/server/test/medium/specs/services/asset.service.spec.ts
+++ b/server/test/medium/specs/services/asset.service.spec.ts
@@ -1,44 +1,33 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { AssetRepository } from 'src/repositories/asset.repository';
-import { UserRepository } from 'src/repositories/user.repository';
+import { LoggingRepository } from 'src/repositories/logging.repository';
 import { AssetService } from 'src/services/asset.service';
-import { mediumFactory, newMediumService } from 'test/medium.factory';
+import { newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB } from 'test/utils';
 
-describe(AssetService.name, () => {
-  let defaultDatabase: Kysely<DB>;
-  let assetRepo: AssetRepository;
-  let userRepo: UserRepository;
+let defaultDatabase: Kysely<DB>;
 
-  const createSut = (db?: Kysely<DB>) => {
-    return newMediumService(AssetService, {
-      database: db || defaultDatabase,
-      repos: {
-        asset: 'real',
-      },
-    });
-  };
-
-  beforeAll(async () => {
-    defaultDatabase = await getKyselyDB();
-
-    assetRepo = new AssetRepository(defaultDatabase);
-    userRepo = new UserRepository(defaultDatabase);
+const setup = (db?: Kysely<DB>) => {
+  return newMediumService(AssetService, {
+    database: db || defaultDatabase,
+    real: [AssetRepository],
+    mock: [LoggingRepository],
   });
+};
 
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(AssetService.name, () => {
   describe('getStatistics', () => {
     it('should return stats as numbers, not strings', async () => {
-      const { sut } = createSut();
-
-      const user = mediumFactory.userInsert();
-      const asset = mediumFactory.assetInsert({ ownerId: user.id });
-
-      await userRepo.create(user);
-      await assetRepo.create(asset);
-      await assetRepo.upsertExif({ assetId: asset.id, fileSizeInByte: 12_345 });
-
+      const { sut, ctx } = setup();
+      const { user } = await ctx.newUser();
+      const { asset } = await ctx.newAsset({ ownerId: user.id });
+      await ctx.newExif({ assetId: asset.id, fileSizeInByte: 12_345 });
       const auth = factory.auth({ user: { id: user.id } });
       await expect(sut.getStatistics(auth, {})).resolves.toEqual({ images: 1, total: 1, videos: 0 });
     });
diff --git a/server/test/medium/specs/services/audit.database.spec.ts b/server/test/medium/specs/services/audit.database.spec.ts
index 33ae38ec6f..377736408c 100644
--- a/server/test/medium/specs/services/audit.database.spec.ts
+++ b/server/test/medium/specs/services/audit.database.spec.ts
@@ -1,74 +1,63 @@
-import { Kysely } from 'kysely';
-import { DB } from 'src/db';
-import { AssetRepository } from 'src/repositories/asset.repository';
+import { LoggingRepository } from 'src/repositories/logging.repository';
 import { PartnerRepository } from 'src/repositories/partner.repository';
 import { UserRepository } from 'src/repositories/user.repository';
 import { partners_delete_audit } from 'src/schema/functions';
-import { mediumFactory } from 'test/medium.factory';
+import { BaseService } from 'src/services/base.service';
+import { MediumTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 
 describe('audit', () => {
-  let defaultDatabase: Kysely<DB>;
-  let assetRepo: AssetRepository;
-  let userRepo: UserRepository;
-  let partnerRepo: PartnerRepository;
+  let ctx: MediumTestContext;
 
   beforeAll(async () => {
-    defaultDatabase = await getKyselyDB();
-
-    assetRepo = new AssetRepository(defaultDatabase);
-    userRepo = new UserRepository(defaultDatabase);
-    partnerRepo = new PartnerRepository(defaultDatabase);
+    ctx = new MediumTestContext(BaseService, {
+      database: await getKyselyDB(),
+      real: [],
+      mock: [LoggingRepository],
+    });
   });
 
   describe(partners_delete_audit.name, () => {
     it('should not cascade user deletes to partners_audit', async () => {
-      const user1 = mediumFactory.userInsert();
-      const user2 = mediumFactory.userInsert();
-
-      await Promise.all([userRepo.create(user1), userRepo.create(user2)]);
+      const partnerRepo = ctx.get(PartnerRepository);
+      const userRepo = ctx.get(UserRepository);
+      const { user: user1 } = await ctx.newUser();
+      const { user: user2 } = await ctx.newUser();
       await partnerRepo.create({ sharedById: user1.id, sharedWithId: user2.id });
       await userRepo.delete(user1, true);
-
       await expect(
-        defaultDatabase.selectFrom('partners_audit').select(['id']).where('sharedById', '=', user1.id).execute(),
+        ctx.database.selectFrom('partners_audit').select(['id']).where('sharedById', '=', user1.id).execute(),
       ).resolves.toHaveLength(0);
     });
   });
 
   describe('assets_audit', () => {
     it('should not cascade user deletes to assets_audit', async () => {
-      const user = mediumFactory.userInsert();
-      const asset = mediumFactory.assetInsert({ ownerId: user.id });
-
-      await userRepo.create(user);
-      await assetRepo.create(asset);
+      const userRepo = ctx.get(UserRepository);
+      const { user } = await ctx.newUser();
+      const { asset } = await ctx.newAsset({ ownerId: user.id });
       await userRepo.delete(user, true);
-
       await expect(
-        defaultDatabase.selectFrom('assets_audit').select(['id']).where('assetId', '=', asset.id).execute(),
+        ctx.database.selectFrom('assets_audit').select(['id']).where('assetId', '=', asset.id).execute(),
       ).resolves.toHaveLength(0);
     });
   });
 
   describe('exif', () => {
     it('should automatically set updatedAt and updateId when the row is updated', async () => {
-      const user = mediumFactory.userInsert();
-      const asset = mediumFactory.assetInsert({ ownerId: user.id });
+      const { user } = await ctx.newUser();
+      const { asset } = await ctx.newAsset({ ownerId: user.id });
+      await ctx.newExif({ assetId: asset.id, make: 'Canon' });
 
-      await userRepo.create(user);
-      await assetRepo.create(asset);
-      await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
-
-      const before = await defaultDatabase
+      const before = await ctx.database
         .selectFrom('exif')
         .select(['updatedAt', 'updateId'])
         .where('assetId', '=', asset.id)
         .executeTakeFirstOrThrow();
 
-      await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon 2' });
+      await ctx.newExif({ assetId: asset.id, make: 'Canon 2' });
 
-      const after = await defaultDatabase
+      const after = await ctx.database
         .selectFrom('exif')
         .select(['updatedAt', 'updateId'])
         .where('assetId', '=', asset.id)
diff --git a/server/test/medium/specs/services/memory.service.spec.ts b/server/test/medium/specs/services/memory.service.spec.ts
index 8489e6bcc9..ff7249d930 100644
--- a/server/test/medium/specs/services/memory.service.spec.ts
+++ b/server/test/medium/specs/services/memory.service.spec.ts
@@ -2,71 +2,66 @@ import { Kysely } from 'kysely';
 import { DateTime } from 'luxon';
 import { DB } from 'src/db';
 import { AssetFileType } from 'src/enum';
+import { AssetRepository } from 'src/repositories/asset.repository';
+import { DatabaseRepository } from 'src/repositories/database.repository';
+import { LoggingRepository } from 'src/repositories/logging.repository';
+import { MemoryRepository } from 'src/repositories/memory.repository';
+import { PartnerRepository } from 'src/repositories/partner.repository';
+import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { UserRepository } from 'src/repositories/user.repository';
 import { MemoryService } from 'src/services/memory.service';
-import { mediumFactory, newMediumService } from 'test/medium.factory';
+import { newMediumService } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 
+let defaultDatabase: Kysely<DB>;
+
+const setup = (db?: Kysely<DB>) => {
+  return newMediumService(MemoryService, {
+    database: db || defaultDatabase,
+    real: [
+      AssetRepository,
+      DatabaseRepository,
+      MemoryRepository,
+      UserRepository,
+      SystemMetadataRepository,
+      UserRepository,
+      PartnerRepository,
+    ],
+    mock: [LoggingRepository],
+  });
+};
+
 describe(MemoryService.name, () => {
-  let defaultDatabase: Kysely<DB>;
-
-  const createSut = (db?: Kysely<DB>) => {
-    return newMediumService(MemoryService, {
-      database: db || defaultDatabase,
-      repos: {
-        asset: 'real',
-        database: 'real',
-        memory: 'real',
-        user: 'real',
-        systemMetadata: 'real',
-        partner: 'real',
-      },
-    });
-  };
-
   beforeEach(async () => {
     defaultDatabase = await getKyselyDB();
-    const userRepo = new UserRepository(defaultDatabase);
-    const admin = mediumFactory.userInsert({ isAdmin: true });
-    await userRepo.create(admin);
   });
 
   describe('onMemoryCreate', () => {
     it('should work on an empty database', async () => {
-      const { sut } = createSut();
+      const { sut } = setup();
       await expect(sut.onMemoriesCreate()).resolves.not.toThrow();
     });
 
     it('should create a memory from an asset', async () => {
-      const { sut, repos, getRepository } = createSut();
-
+      const { sut, ctx } = setup();
+      const assetRepo = ctx.get(AssetRepository);
+      const memoryRepo = ctx.get(MemoryRepository);
       const now = DateTime.fromObject({ year: 2025, month: 2, day: 25 }, { zone: 'utc' }) as DateTime<true>;
-      const user = mediumFactory.userInsert();
-      const asset = mediumFactory.assetInsert({
-        ownerId: user.id,
-        localDateTime: now.minus({ years: 1 }).toISO(),
-      });
-      const jobStatus = mediumFactory.assetJobStatusInsert({ assetId: asset.id });
-
-      const userRepo = getRepository('user');
-      const assetRepo = getRepository('asset');
-
-      await userRepo.create(user);
-      await assetRepo.create(asset);
+      const { user } = await ctx.newUser();
+      const { asset } = await ctx.newAsset({ ownerId: user.id, localDateTime: now.minus({ years: 1 }).toISO() });
       await Promise.all([
-        assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' }),
+        ctx.newExif({ assetId: asset.id, make: 'Canon' }),
+        ctx.newJobStatus({ assetId: asset.id }),
         assetRepo.upsertFiles([
           { assetId: asset.id, type: AssetFileType.PREVIEW, path: '/path/to/preview.jpg' },
           { assetId: asset.id, type: AssetFileType.THUMBNAIL, path: '/path/to/thumbnail.jpg' },
         ]),
-        assetRepo.upsertJobStatus(jobStatus),
       ]);
 
       vi.setSystemTime(now.toJSDate());
-
       await sut.onMemoriesCreate();
 
-      const memories = await repos.memory.search(user.id, {});
+      const memories = await memoryRepo.search(user.id, {});
       expect(memories.length).toBe(1);
       expect(memories[0]).toEqual(
         expect.objectContaining({
@@ -88,16 +83,11 @@ describe(MemoryService.name, () => {
     });
 
     it('should not generate a memory twice for the same day', async () => {
-      const { sut, repos, getRepository } = createSut();
-
+      const { sut, ctx } = setup();
+      const assetRepo = ctx.get(AssetRepository);
+      const memoryRepo = ctx.get(MemoryRepository);
       const now = DateTime.fromObject({ year: 2025, month: 2, day: 20 }, { zone: 'utc' }) as DateTime<true>;
-
-      const assetRepo = getRepository('asset');
-      const memoryRepo = getRepository('memory');
-
-      const user = mediumFactory.userInsert();
-      await repos.user.create(user);
-
+      const { user } = await ctx.newUser();
       for (const dto of [
         {
           ownerId: user.id,
@@ -112,11 +102,10 @@ describe(MemoryService.name, () => {
           localDateTime: now.minus({ year: 1 }).plus({ days: 5 }).toISO(),
         },
       ]) {
-        const asset = mediumFactory.assetInsert(dto);
-        await assetRepo.create(asset);
+        const { asset } = await ctx.newAsset(dto);
         await Promise.all([
-          assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' }),
-          assetRepo.upsertJobStatus(mediumFactory.assetJobStatusInsert({ assetId: asset.id })),
+          ctx.newExif({ assetId: asset.id, make: 'Canon' }),
+          ctx.newJobStatus({ assetId: asset.id }),
           assetRepo.upsertFiles([
             { assetId: asset.id, type: AssetFileType.PREVIEW, path: '/path/to/preview.jpg' },
             { assetId: asset.id, type: AssetFileType.THUMBNAIL, path: '/path/to/thumbnail.jpg' },
@@ -125,13 +114,13 @@ describe(MemoryService.name, () => {
       }
 
       vi.setSystemTime(now.toJSDate());
-
       await sut.onMemoriesCreate();
 
       const memories = await memoryRepo.search(user.id, {});
       expect(memories.length).toBe(1);
 
       await sut.onMemoriesCreate();
+
       const memoriesAfter = await memoryRepo.search(user.id, {});
       expect(memoriesAfter.length).toBe(1);
     });
@@ -139,7 +128,7 @@ describe(MemoryService.name, () => {
 
   describe('onMemoriesCleanup', () => {
     it('should run without error', async () => {
-      const { sut } = createSut();
+      const { sut } = setup();
       await expect(sut.onMemoriesCleanup()).resolves.not.toThrow();
     });
   });
diff --git a/server/test/medium/specs/services/person.service.spec.ts b/server/test/medium/specs/services/person.service.spec.ts
index bd5eb5d543..2a1080704c 100644
--- a/server/test/medium/specs/services/person.service.spec.ts
+++ b/server/test/medium/specs/services/person.service.spec.ts
@@ -1,90 +1,80 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
+import { AccessRepository } from 'src/repositories/access.repository';
+import { DatabaseRepository } from 'src/repositories/database.repository';
+import { LoggingRepository } from 'src/repositories/logging.repository';
+import { PersonRepository } from 'src/repositories/person.repository';
+import { StorageRepository } from 'src/repositories/storage.repository';
 import { PersonService } from 'src/services/person.service';
-import { mediumFactory, newMediumService } from 'test/medium.factory';
+import { newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB } from 'test/utils';
 
-describe.concurrent(PersonService.name, () => {
-  let defaultDatabase: Kysely<DB>;
+let defaultDatabase: Kysely<DB>;
 
-  const createSut = (db?: Kysely<DB>) => {
-    return newMediumService(PersonService, {
-      database: db || defaultDatabase,
-      repos: {
-        access: 'real',
-        database: 'real',
-        person: 'real',
-        storage: 'mock',
-      },
-    });
-  };
-
-  beforeEach(async () => {
-    defaultDatabase = await getKyselyDB();
+const setup = (db?: Kysely<DB>) => {
+  return newMediumService(PersonService, {
+    database: db || defaultDatabase,
+    real: [AccessRepository, DatabaseRepository, PersonRepository],
+    mock: [LoggingRepository, StorageRepository],
   });
+};
 
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(PersonService.name, () => {
   describe('delete', () => {
     it('should throw an error when there is no access', async () => {
-      const { sut } = createSut();
+      const { sut } = setup();
       const auth = factory.auth();
       const personId = factory.uuid();
       await expect(sut.delete(auth, personId)).rejects.toThrow('Not found or no person.delete access');
     });
 
     it('should delete the person', async () => {
-      const { sut, getRepository, mocks } = createSut();
-
-      const user = mediumFactory.userInsert();
+      const { sut, ctx } = setup();
+      const personRepo = ctx.get(PersonRepository);
+      const storageMock = ctx.getMock(StorageRepository);
+      const { user } = await ctx.newUser();
+      const { person } = await ctx.newPerson({ ownerId: user.id });
       const auth = factory.auth({ user });
-      const person = mediumFactory.personInsert({ ownerId: auth.user.id });
-      mocks.storage.unlink.mockResolvedValue();
-
-      const userRepo = getRepository('user');
-      await userRepo.create(user);
-
-      const personRepo = getRepository('person');
-      await personRepo.create(person);
+      storageMock.unlink.mockResolvedValue();
 
       await expect(personRepo.getById(person.id)).resolves.toEqual(expect.objectContaining({ id: person.id }));
       await expect(sut.delete(auth, person.id)).resolves.toBeUndefined();
       await expect(personRepo.getById(person.id)).resolves.toBeUndefined();
 
-      expect(mocks.storage.unlink).toHaveBeenCalledWith(person.thumbnailPath);
+      expect(storageMock.unlink).toHaveBeenCalledWith(person.thumbnailPath);
     });
   });
 
   describe('deleteAll', () => {
     it('should throw an error when there is no access', async () => {
-      const { sut } = createSut();
+      const { sut } = setup();
       const auth = factory.auth();
       const personId = factory.uuid();
       await expect(sut.deleteAll(auth, { ids: [personId] })).rejects.toThrow('Not found or no person.delete access');
     });
 
     it('should delete the person', async () => {
-      const { sut, getRepository, mocks } = createSut();
-
-      const user = mediumFactory.userInsert();
+      const { sut, ctx } = setup();
+      const storageMock = ctx.getMock(StorageRepository);
+      const personRepo = ctx.get(PersonRepository);
+      const { user } = await ctx.newUser();
+      const { person: person1 } = await ctx.newPerson({ ownerId: user.id });
+      const { person: person2 } = await ctx.newPerson({ ownerId: user.id });
       const auth = factory.auth({ user });
-      const person1 = mediumFactory.personInsert({ ownerId: auth.user.id });
-      const person2 = mediumFactory.personInsert({ ownerId: auth.user.id });
-      mocks.storage.unlink.mockResolvedValue();
-
-      const userRepo = getRepository('user');
-      await userRepo.create(user);
-
-      const personRepo = getRepository('person');
-      await personRepo.create(person1);
-      await personRepo.create(person2);
+      storageMock.unlink.mockResolvedValue();
 
       await expect(sut.deleteAll(auth, { ids: [person1.id, person2.id] })).resolves.toBeUndefined();
       await expect(personRepo.getById(person1.id)).resolves.toBeUndefined();
       await expect(personRepo.getById(person2.id)).resolves.toBeUndefined();
 
-      expect(mocks.storage.unlink).toHaveBeenCalledTimes(2);
-      expect(mocks.storage.unlink).toHaveBeenCalledWith(person1.thumbnailPath);
-      expect(mocks.storage.unlink).toHaveBeenCalledWith(person2.thumbnailPath);
+      expect(storageMock.unlink).toHaveBeenCalledTimes(2);
+      expect(storageMock.unlink).toHaveBeenCalledWith(person1.thumbnailPath);
+      expect(storageMock.unlink).toHaveBeenCalledWith(person2.thumbnailPath);
     });
   });
 });
diff --git a/server/test/medium/specs/services/user.service.spec.ts b/server/test/medium/specs/services/user.service.spec.ts
index 0113c70158..a16ea3c877 100644
--- a/server/test/medium/specs/services/user.service.spec.ts
+++ b/server/test/medium/specs/services/user.service.spec.ts
@@ -2,72 +2,65 @@ import { Kysely } from 'kysely';
 import { DateTime } from 'luxon';
 import { DB } from 'src/db';
 import { ImmichEnvironment, JobName, JobStatus } from 'src/enum';
+import { ConfigRepository } from 'src/repositories/config.repository';
+import { CryptoRepository } from 'src/repositories/crypto.repository';
+import { JobRepository } from 'src/repositories/job.repository';
+import { LoggingRepository } from 'src/repositories/logging.repository';
+import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
+import { UserRepository } from 'src/repositories/user.repository';
 import { UserService } from 'src/services/user.service';
 import { mediumFactory, newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB } from 'test/utils';
 
-describe(UserService.name, () => {
-  let defaultDatabase: Kysely<DB>;
+let defaultDatabase: Kysely<DB>;
 
-  const createSut = (db?: Kysely<DB>) => {
-    process.env.IMMICH_ENV = ImmichEnvironment.TESTING;
+const setup = (db?: Kysely<DB>) => {
+  process.env.IMMICH_ENV = ImmichEnvironment.TESTING;
 
-    return newMediumService(UserService, {
-      database: db || defaultDatabase,
-      repos: {
-        user: 'real',
-        crypto: 'real',
-        config: 'real',
-        job: 'mock',
-        systemMetadata: 'real',
-      },
-    });
-  };
-
-  beforeAll(async () => {
-    defaultDatabase = await getKyselyDB();
-    const { repos } = createSut();
-    await repos.user.create({ isAdmin: true, email: 'admin@immich.cloud' });
+  return newMediumService(UserService, {
+    database: db || defaultDatabase,
+    real: [CryptoRepository, ConfigRepository, SystemMetadataRepository, UserRepository],
+    mock: [LoggingRepository, JobRepository],
   });
+};
 
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+  const { ctx } = setup();
+  await ctx.newUser({ isAdmin: true, email: 'admin@immich.cloud' });
+});
+
+describe(UserService.name, () => {
   describe('create', () => {
     it('should create a user', async () => {
-      const { sut } = createSut();
+      const { sut } = setup();
       const user = mediumFactory.userInsert();
-
       await expect(sut.createUser({ name: user.name, email: user.email })).resolves.toEqual(
         expect.objectContaining({ name: user.name, email: user.email }),
       );
     });
 
     it('should reject user with duplicate email', async () => {
-      const { sut } = createSut();
-
+      const { sut } = setup();
       const user = mediumFactory.userInsert();
-
       await expect(sut.createUser({ email: user.email })).resolves.toMatchObject({ email: user.email });
       await expect(sut.createUser({ email: user.email })).rejects.toThrow('User exists');
     });
 
     it('should not return password', async () => {
-      const { sut } = createSut();
+      const { sut } = setup();
       const dto = mediumFactory.userInsert({ password: 'password' });
-
       const user = await sut.createUser({ email: dto.email, password: 'password' });
-
       expect((user as any).password).toBeUndefined();
     });
   });
 
   describe('search', () => {
     it('should get users', async () => {
-      const { sut, repos } = createSut();
-      const user1 = mediumFactory.userInsert();
-      const user2 = mediumFactory.userInsert();
-
-      await Promise.all([repos.user.create(user1), repos.user.create(user2)]);
-
+      const { sut, ctx } = setup();
+      const { user: user1 } = await ctx.newUser();
+      const { user: user2 } = await ctx.newUser();
       const auth = factory.auth({ user: user1 });
 
       await expect(sut.search(auth)).resolves.toEqual(
@@ -81,10 +74,8 @@ describe(UserService.name, () => {
 
   describe('get', () => {
     it('should get a user', async () => {
-      const { sut, repos } = createSut();
-      const user = mediumFactory.userInsert();
-
-      await repos.user.create(user);
+      const { sut, ctx } = setup();
+      const { user } = await ctx.newUser();
 
       await expect(sut.get(user.id)).resolves.toEqual(
         expect.objectContaining({
@@ -96,11 +87,8 @@ describe(UserService.name, () => {
     });
 
     it('should not return password', async () => {
-      const { sut, repos } = createSut();
-      const user = mediumFactory.userInsert();
-
-      await repos.user.create(user);
-
+      const { sut, ctx } = setup();
+      const { user } = await ctx.newUser();
       const result = await sut.get(user.id);
 
       expect((result as any).password).toBeUndefined();
@@ -109,10 +97,9 @@ describe(UserService.name, () => {
 
   describe('updateMe', () => {
     it('should update a user', async () => {
-      const { sut, repos: repositories } = createSut();
-
-      const before = await repositories.user.create(mediumFactory.userInsert());
-      const auth = factory.auth({ user: { id: before.id } });
+      const { sut, ctx } = setup();
+      const { user, result: before } = await ctx.newUser();
+      const auth = factory.auth({ user: { id: user.id } });
       const after = await sut.updateMe(auth, { name: `${before.name} Updated` });
 
       expect(before.updatedAt).toBeDefined();
@@ -128,17 +115,13 @@ describe(UserService.name, () => {
         activationKey:
           'KuX8KsktrBSiXpQMAH0zLgA5SpijXVr_PDkzLdWUlAogCTMBZ0I3KCHXK0eE9EEd7harxup8_EHMeqAWeHo5VQzol6LGECpFv585U9asXD4Zc-UXt3mhJr2uhazqipBIBwJA2YhmUCDy8hiyiGsukDQNu9Rg9C77UeoKuZBWVjWUBWG0mc1iRqfvF0faVM20w53czAzlhaMxzVGc3Oimbd7xi_CAMSujF_2y8QpA3X2fOVkQkzdcH9lV0COejl7IyH27zQQ9HrlrXv3Lai5Hw67kNkaSjmunVBxC5PS0TpKoc9SfBJMaAGWnaDbjhjYUrm-8nIDQnoeEAidDXVAdPw',
       };
-      const { sut, repos } = createSut();
-      const user = mediumFactory.userInsert();
-      await repos.user.create(user);
+      const { sut, ctx } = setup();
+      const { user } = await ctx.newUser();
       const auth = factory.auth({ user: { id: user.id } });
-
       await expect(sut.getLicense(auth)).rejects.toThrowError();
       const after = await sut.setLicense(auth, license);
-
       expect(after.licenseKey).toEqual(license.licenseKey);
       expect(after.activationKey).toEqual(license.activationKey);
-
       const getResponse = await sut.getLicense(auth);
       expect(getResponse).toEqual(after);
     });
@@ -146,7 +129,7 @@ describe(UserService.name, () => {
 
   describe.sequential('handleUserDeleteCheck', () => {
     beforeEach(async () => {
-      const { sut } = createSut();
+      const { sut } = setup();
       // These tests specifically have to be sequential otherwise we hit race conditions with config changes applying in incorrect tests
       const config = await sut.getConfig({ withCache: false });
       config.user.deleteDelay = 7;
@@ -154,52 +137,43 @@ describe(UserService.name, () => {
     });
 
     it('should work when there are no deleted users', async () => {
-      const { sut, mocks } = createSut();
-      mocks.job.queueAll.mockResolvedValue(void 0);
-
+      const { sut, ctx } = setup();
+      const jobMock = ctx.getMock(JobRepository);
+      jobMock.queueAll.mockResolvedValue(void 0);
       await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.SUCCESS);
-
-      expect(mocks.job.queueAll).toHaveBeenCalledExactlyOnceWith([]);
+      expect(jobMock.queueAll).toHaveBeenCalledExactlyOnceWith([]);
     });
 
     it('should work when there is a user to delete', async () => {
-      const { sut, repos, mocks } = createSut(await getKyselyDB());
-      mocks.job.queueAll.mockResolvedValue(void 0);
-      const user = mediumFactory.userInsert({ deletedAt: DateTime.now().minus({ days: 60 }).toJSDate() });
-      await repos.user.create(user);
-
+      const { sut, ctx } = setup(await getKyselyDB());
+      const jobMock = ctx.getMock(JobRepository);
+      const { user } = await ctx.newUser({ deletedAt: DateTime.now().minus({ days: 60 }).toJSDate() });
+      jobMock.queueAll.mockResolvedValue(void 0);
       await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.SUCCESS);
-
-      expect(mocks.job.queueAll).toHaveBeenCalledExactlyOnceWith([
+      expect(jobMock.queueAll).toHaveBeenCalledExactlyOnceWith([
         { name: JobName.USER_DELETION, data: { id: user.id } },
       ]);
     });
 
     it('should skip a recently deleted user', async () => {
-      const { sut, repos, mocks } = createSut(await getKyselyDB());
-      mocks.job.queueAll.mockResolvedValue(void 0);
-      const user = mediumFactory.userInsert({ deletedAt: DateTime.now().minus({ days: 5 }).toJSDate() });
-      await repos.user.create(user);
-
+      const { sut, ctx } = setup(await getKyselyDB());
+      const jobMock = ctx.getMock(JobRepository);
+      await ctx.newUser({ deletedAt: DateTime.now().minus({ days: 5 }).toJSDate() });
+      jobMock.queueAll.mockResolvedValue(void 0);
       await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.SUCCESS);
-
-      expect(mocks.job.queueAll).toHaveBeenCalledExactlyOnceWith([]);
+      expect(jobMock.queueAll).toHaveBeenCalledExactlyOnceWith([]);
     });
 
     it('should respect a custom user delete delay', async () => {
-      const { sut, repos, mocks } = createSut(await getKyselyDB());
-      mocks.job.queueAll.mockResolvedValue(void 0);
-      const user = mediumFactory.userInsert({ deletedAt: DateTime.now().minus({ days: 25 }).toJSDate() });
-      await repos.user.create(user);
-
+      const { sut, ctx } = setup(await getKyselyDB());
+      const jobMock = ctx.getMock(JobRepository);
+      await ctx.newUser({ deletedAt: DateTime.now().minus({ days: 25 }).toJSDate() });
+      jobMock.queueAll.mockResolvedValue(void 0);
       const config = await sut.getConfig({ withCache: false });
       config.user.deleteDelay = 30;
-
       await sut.updateConfig(config);
-
       await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.SUCCESS);
-
-      expect(mocks.job.queueAll).toHaveBeenCalledExactlyOnceWith([]);
+      expect(jobMock.queueAll).toHaveBeenCalledExactlyOnceWith([]);
     });
   });
 });
diff --git a/server/test/medium/specs/services/version.service.spec.ts b/server/test/medium/specs/services/version.service.spec.ts
index f99e439e1f..6e9984cc50 100644
--- a/server/test/medium/specs/services/version.service.spec.ts
+++ b/server/test/medium/specs/services/version.service.spec.ts
@@ -2,38 +2,40 @@ import { Kysely } from 'kysely';
 import { serverVersion } from 'src/constants';
 import { DB } from 'src/db';
 import { JobName } from 'src/enum';
+import { DatabaseRepository } from 'src/repositories/database.repository';
+import { JobRepository } from 'src/repositories/job.repository';
+import { LoggingRepository } from 'src/repositories/logging.repository';
+import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
 import { VersionService } from 'src/services/version.service';
 import { newMediumService } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 
-describe(VersionService.name, () => {
-  let defaultDatabase: Kysely<DB>;
+let defaultDatabase: Kysely<DB>;
 
-  const setup = (db?: Kysely<DB>) => {
-    return newMediumService(VersionService, {
-      database: db || defaultDatabase,
-      repos: {
-        job: 'mock',
-        database: 'real',
-        versionHistory: 'real',
-      },
-    });
-  };
-
-  beforeAll(async () => {
-    defaultDatabase = await getKyselyDB();
+const setup = (db?: Kysely<DB>) => {
+  return newMediumService(VersionService, {
+    database: db || defaultDatabase,
+    real: [DatabaseRepository, VersionHistoryRepository],
+    mock: [LoggingRepository, JobRepository],
   });
+};
 
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(VersionService.name, () => {
   describe('onBootstrap', () => {
     it('record the current version on startup', async () => {
-      const { sut, repos } = setup();
+      const { sut, ctx } = setup();
+      const versionHistoryRepo = ctx.get(VersionHistoryRepository);
 
-      const itemsBefore = await repos.versionHistory.getAll();
+      const itemsBefore = await versionHistoryRepo.getAll();
       expect(itemsBefore).toHaveLength(0);
 
       await sut.onBootstrap();
 
-      const itemsAfter = await repos.versionHistory.getAll();
+      const itemsAfter = await versionHistoryRepo.getAll();
       expect(itemsAfter).toHaveLength(1);
       expect(itemsAfter[0]).toEqual({
         createdAt: expect.any(Date),
@@ -43,22 +45,26 @@ describe(VersionService.name, () => {
     });
 
     it('should queue memory creation when upgrading from 1.128.0', async () => {
-      const { sut, repos, mocks } = setup();
-      mocks.job.queue.mockResolvedValue(void 0);
+      const { sut, ctx } = setup();
+      const jobMock = ctx.getMock(JobRepository);
+      const versionHistoryRepo = ctx.get(VersionHistoryRepository);
+      jobMock.queue.mockResolvedValue(void 0);
 
-      await repos.versionHistory.create({ version: 'v1.128.0' });
+      await versionHistoryRepo.create({ version: 'v1.128.0' });
       await sut.onBootstrap();
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.MEMORIES_CREATE });
+      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.MEMORIES_CREATE });
     });
 
     it('should not queue memory creation when upgrading from 1.129.0', async () => {
-      const { sut, repos, mocks } = setup();
+      const { sut, ctx } = setup();
+      const jobMock = ctx.getMock(JobRepository);
+      const versionHistoryRepo = ctx.get(VersionHistoryRepository);
 
-      await repos.versionHistory.create({ version: 'v1.129.0' });
+      await versionHistoryRepo.create({ version: 'v1.129.0' });
       await sut.onBootstrap();
 
-      expect(mocks.job.queue).not.toHaveBeenCalled();
+      expect(jobMock.queue).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts b/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
index 07ed8e5785..811dbb374b 100644
--- a/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
@@ -1,158 +1,118 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
-import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
 
 const setup = async (db?: Kysely<DB>) => {
-  const database = db || defaultDatabase;
-  const result = newSyncTest({ db: database });
-  const { auth, create } = newSyncAuthUser();
-  await create(database);
-  return { ...result, auth };
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
 };
 
 beforeAll(async () => {
   defaultDatabase = await getKyselyDB();
 });
 
-describe.concurrent(SyncRequestType.AlbumAssetExifsV1, () => {
+describe(SyncRequestType.AlbumAssetExifsV1, () => {
   it('should detect and sync the first album asset exif', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newExif({ assetId: asset.id, make: 'Canon' });
+    const { album } = await ctx.newAlbum({ ownerId: user2.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
+    await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(asset);
-    await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
-    await albumRepo.create({ ownerId: user2.id }, [asset.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
-
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumAssetExifsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            assetId: asset.id,
-            city: null,
-            country: null,
-            dateTimeOriginal: null,
-            description: '',
-            exifImageHeight: null,
-            exifImageWidth: null,
-            exposureTime: null,
-            fNumber: null,
-            fileSizeInByte: null,
-            focalLength: null,
-            fps: null,
-            iso: null,
-            latitude: null,
-            lensModel: null,
-            longitude: null,
-            make: 'Canon',
-            model: null,
-            modifyDate: null,
-            orientation: null,
-            profileDescription: null,
-            projectionType: null,
-            rating: null,
-            state: null,
-            timeZone: null,
-          },
-          type: SyncEntityType.AlbumAssetExifV1,
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          assetId: asset.id,
+          city: null,
+          country: null,
+          dateTimeOriginal: null,
+          description: '',
+          exifImageHeight: null,
+          exifImageWidth: null,
+          exposureTime: null,
+          fNumber: null,
+          fileSizeInByte: null,
+          focalLength: null,
+          fps: null,
+          iso: null,
+          latitude: null,
+          lensModel: null,
+          longitude: null,
+          make: 'Canon',
+          model: null,
+          modifyDate: null,
+          orientation: null,
+          profileDescription: null,
+          projectionType: null,
+          rating: null,
+          state: null,
+          timeZone: null,
         },
-      ]),
-    );
+        type: SyncEntityType.AlbumAssetExifV1,
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumAssetExifsV1]);
-
-    expect(ackSyncResponse).toEqual([]);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1])).resolves.toEqual([]);
   });
 
   it('should sync album asset exif for own user', async () => {
-    const { auth, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    await ctx.newExif({ assetId: asset.id, make: 'Canon' });
+    const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
 
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(asset);
-    await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
-    await albumRepo.create({ ownerId: auth.user.id }, [asset.id], []);
-
-    await expect(testSync(auth, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
-    await expect(testSync(auth, [SyncRequestType.AlbumAssetExifsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1])).resolves.toHaveLength(1);
   });
 
   it('should not sync album asset exif for unrelated user', async () => {
-    const { auth, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    const user3 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-    await userRepo.create(user3);
-
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: user3.id });
-    await assetRepo.create(asset);
-    await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
-    await albumRepo.create({ ownerId: user2.id }, [asset.id], [{ userId: user3.id, role: AlbumUserRole.EDITOR }]);
-
-    const sessionRepo = getRepository('session');
-    const session = mediumFactory.sessionInsert({ userId: user3.id });
-    await sessionRepo.create(session);
-
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { user: user3 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({ ownerId: user3.id });
+    await ctx.newExif({ assetId: asset.id, make: 'Canon' });
+    const { album } = await ctx.newAlbum({ ownerId: user2.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
+    await ctx.newAlbumUser({ albumId: album.id, userId: user3.id, role: AlbumUserRole.EDITOR });
+    const { session } = await ctx.newSession({ userId: user3.id });
     const authUser3 = factory.auth({ session, user: user3 });
 
-    await expect(testSync(authUser3, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
-    await expect(testSync(auth, [SyncRequestType.PartnerAssetExifsV1])).resolves.toHaveLength(0);
+    await expect(ctx.syncStream(authUser3, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1])).resolves.toHaveLength(0);
   });
 
   it('should backfill album assets exif when a user shares an album with you', async () => {
-    const { auth, sut, testSync, getRepository } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    const user3 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-    await userRepo.create(user3);
-
-    const assetRepo = getRepository('asset');
-    // Asset to check that we do backfill our own assets
-    const asset1Owner = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    const asset1User2 = mediumFactory.assetInsert({ ownerId: user2.id });
-    const asset2User2 = mediumFactory.assetInsert({ ownerId: user2.id });
-    const asset3User2 = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(asset1Owner);
-    await assetRepo.upsertExif({ assetId: asset1Owner.id, make: 'asset1Owner' });
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { asset: asset1Owner } = await ctx.newAsset({ ownerId: auth.user.id });
+    await ctx.newExif({ assetId: asset1Owner.id, make: 'asset1Owner' });
     await wait(2);
-    await assetRepo.create(asset1User2);
-    await assetRepo.upsertExif({ assetId: asset1User2.id, make: 'asset1User2' });
+    const { asset: asset1User2 } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newExif({ assetId: asset1User2.id, make: 'asset1User2' });
     await wait(2);
-    await assetRepo.create(asset2User2);
-    await assetRepo.upsertExif({ assetId: asset2User2.id, make: 'asset2User2' });
+    const { asset: asset2User2 } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newExif({ assetId: asset2User2.id, make: 'asset2User2' });
     await wait(2);
-    await assetRepo.create(asset3User2);
-    await assetRepo.upsertExif({ assetId: asset3User2.id, make: 'asset3User2' });
+    const { asset: asset3User2 } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newExif({ assetId: asset3User2.id, make: 'asset3User2' });
+    const { album: album1 } = await ctx.newAlbum({ ownerId: user2.id });
+    await ctx.newAlbumAsset({ albumId: album1.id, assetId: asset2User2.id });
+    await ctx.newAlbumUser({ albumId: album1.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
-    const albumRepo = getRepository('album');
-    const album1 = mediumFactory.albumInsert({ ownerId: user2.id });
-    await albumRepo.create(album1, [asset2User2.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
-
-    const response = await testSync(auth, [SyncRequestType.AlbumAssetExifsV1]);
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1]);
     expect(response).toHaveLength(1);
     expect(response).toEqual([
       {
@@ -165,20 +125,20 @@ describe.concurrent(SyncRequestType.AlbumAssetExifsV1, () => {
     ]);
 
     // ack initial album asset exif sync
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
+    await ctx.syncAckAll(auth, response);
 
-    // create a second album with
-    const album2 = mediumFactory.albumInsert({ ownerId: user2.id });
-    await albumRepo.create(
-      album2,
-      [asset1User2.id, asset2User2.id, asset3User2.id, asset1Owner.id],
-      [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }],
+    // create a second album
+    const { album: album2 } = await ctx.newAlbum({ ownerId: user2.id });
+    await Promise.all(
+      [asset1User2.id, asset2User2.id, asset3User2.id, asset1Owner.id].map((assetId) =>
+        ctx.newAlbumAsset({ albumId: album2.id, assetId }),
+      ),
     );
+    await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
     // should backfill the album user
-    const backfillResponse = await testSync(auth, [SyncRequestType.AlbumAssetExifsV1]);
-    expect(backfillResponse).toEqual([
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1]);
+    expect(newResponse).toEqual([
       {
         ack: expect.any(String),
         data: expect.objectContaining({
@@ -214,9 +174,7 @@ describe.concurrent(SyncRequestType.AlbumAssetExifsV1, () => {
       },
     ]);
 
-    await sut.setAcks(auth, { acks: [backfillResponse[3].ack, backfillResponse.at(-1).ack] });
-
-    const finalResponse = await testSync(auth, [SyncRequestType.AlbumAssetExifsV1]);
-    expect(finalResponse).toEqual([]);
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1])).resolves.toEqual([]);
   });
 });
diff --git a/server/test/medium/specs/sync/sync-album-asset.spec.ts b/server/test/medium/specs/sync/sync-album-asset.spec.ts
index ea16393f11..ae4833de34 100644
--- a/server/test/medium/specs/sync/sync-album-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-asset.spec.ts
@@ -1,40 +1,32 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
-import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
 
 const setup = async (db?: Kysely<DB>) => {
-  const database = db || defaultDatabase;
-  const result = newSyncTest({ db: database });
-  const { auth, create } = newSyncAuthUser();
-  await create(database);
-  return { ...result, auth };
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
 };
 
 beforeAll(async () => {
   defaultDatabase = await getKyselyDB();
 });
 
-describe.concurrent(SyncRequestType.AlbumAssetsV1, () => {
+describe(SyncRequestType.AlbumAssetsV1, () => {
   it('should detect and sync the first album asset', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
     const originalFileName = 'firstAsset';
     const checksum = '1115vHcVkZzNp3Q9G+FEA0nu6zUbGb4Tj4UOXkN0wRA=';
     const thumbhash = '2225vHcVkZzNp3Q9G+FEA0nu6zUbGb4Tj4UOXkN0wRA=';
     const date = new Date().toISOString();
 
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({
       originalFileName,
       ownerId: user2.id,
       checksum: Buffer.from(checksum, 'base64'),
@@ -45,110 +37,79 @@ describe.concurrent(SyncRequestType.AlbumAssetsV1, () => {
       deletedAt: null,
       duration: '0:10:00.00000',
     });
-    await assetRepo.create(asset);
-    await albumRepo.create({ ownerId: user2.id }, [asset.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
+    const { album } = await ctx.newAlbum({ ownerId: user2.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
+    await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumAssetsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            id: asset.id,
-            originalFileName,
-            ownerId: asset.ownerId,
-            thumbhash,
-            checksum,
-            deletedAt: asset.deletedAt,
-            fileCreatedAt: asset.fileCreatedAt,
-            fileModifiedAt: asset.fileModifiedAt,
-            isFavorite: asset.isFavorite,
-            localDateTime: asset.localDateTime,
-            type: asset.type,
-            visibility: asset.visibility,
-            duration: asset.duration,
-          },
-          type: SyncEntityType.AlbumAssetV1,
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: asset.id,
+          originalFileName,
+          ownerId: asset.ownerId,
+          thumbhash,
+          checksum,
+          deletedAt: asset.deletedAt,
+          fileCreatedAt: asset.fileCreatedAt,
+          fileModifiedAt: asset.fileModifiedAt,
+          isFavorite: asset.isFavorite,
+          localDateTime: asset.localDateTime,
+          type: asset.type,
+          visibility: asset.visibility,
+          duration: asset.duration,
         },
-      ]),
-    );
+        type: SyncEntityType.AlbumAssetV1,
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumAssetsV1]);
-
-    expect(ackSyncResponse).toEqual([]);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumAssetsV1])).resolves.toEqual([]);
   });
 
   it('should sync album asset for own user', async () => {
-    const { auth, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
 
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(asset);
-    await albumRepo.create({ ownerId: auth.user.id }, [asset.id], []);
-
-    await expect(testSync(auth, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
-    await expect(testSync(auth, [SyncRequestType.AlbumAssetsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumAssetsV1])).resolves.toHaveLength(1);
   });
 
   it('should not sync album asset for unrelated user', async () => {
-    const { auth, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    const user3 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-    await userRepo.create(user3);
-
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: user3.id });
-    await assetRepo.create(asset);
-    await albumRepo.create({ ownerId: user2.id }, [asset.id], [{ userId: user3.id, role: AlbumUserRole.EDITOR }]);
-
-    const sessionRepo = getRepository('session');
-    const session = mediumFactory.sessionInsert({ userId: user3.id });
-    await sessionRepo.create(session);
-
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { user: user3 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({ ownerId: user3.id });
+    const { album } = await ctx.newAlbum({ ownerId: user2.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
+    await ctx.newAlbumUser({ albumId: album.id, userId: user3.id, role: AlbumUserRole.EDITOR });
+    const { session } = await ctx.newSession({ userId: user3.id });
     const authUser3 = factory.auth({ session, user: user3 });
 
-    await expect(testSync(authUser3, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
-    await expect(testSync(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(0);
+    await expect(ctx.syncStream(authUser3, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumAssetsV1])).resolves.toHaveLength(0);
   });
 
   it('should backfill album assets when a user shares an album with you', async () => {
-    const { auth, sut, testSync, getRepository } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    const user3 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-    await userRepo.create(user3);
-
-    const assetRepo = getRepository('asset');
-    // Asset to check that we do backfill our own assets
-    const asset1Owner = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    const asset1User2 = mediumFactory.assetInsert({ ownerId: user2.id });
-    const asset2User2 = mediumFactory.assetInsert({ ownerId: user2.id });
-    const asset3User2 = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(asset1Owner);
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { asset: asset1Owner } = await ctx.newAsset({ ownerId: auth.user.id });
     await wait(2);
-    await assetRepo.create(asset1User2);
+    const { asset: asset1User2 } = await ctx.newAsset({ ownerId: user2.id });
     await wait(2);
-    await assetRepo.create(asset2User2);
+    const { asset: asset2User2 } = await ctx.newAsset({ ownerId: user2.id });
     await wait(2);
-    await assetRepo.create(asset3User2);
+    const { asset: asset3User2 } = await ctx.newAsset({ ownerId: user2.id });
+    await wait(2);
+    const { album: album1 } = await ctx.newAlbum({ ownerId: user2.id });
+    await ctx.newAlbumAsset({ albumId: album1.id, assetId: asset2User2.id });
+    await ctx.newAlbumUser({ albumId: album1.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
-    const albumRepo = getRepository('album');
-    const album1 = mediumFactory.albumInsert({ ownerId: user2.id });
-    await albumRepo.create(album1, [asset2User2.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
-
-    const response = await testSync(auth, [SyncRequestType.AlbumAssetsV1]);
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetsV1]);
     expect(response).toHaveLength(1);
     expect(response).toEqual([
       {
@@ -161,20 +122,20 @@ describe.concurrent(SyncRequestType.AlbumAssetsV1, () => {
     ]);
 
     // ack initial album asset sync
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
+    await ctx.syncAckAll(auth, response);
 
-    // create a second album with
-    const album2 = mediumFactory.albumInsert({ ownerId: user2.id });
-    await albumRepo.create(
-      album2,
-      [asset1User2.id, asset2User2.id, asset3User2.id, asset1Owner.id],
-      [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }],
+    // create a second album
+    const { album: album2 } = await ctx.newAlbum({ ownerId: user2.id });
+    await Promise.all(
+      [asset1User2.id, asset2User2.id, asset3User2.id, asset1Owner.id].map((assetId) =>
+        ctx.newAlbumAsset({ albumId: album2.id, assetId }),
+      ),
     );
+    await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
     // should backfill the album user
-    const backfillResponse = await testSync(auth, [SyncRequestType.AlbumAssetsV1]);
-    expect(backfillResponse).toEqual([
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetsV1]);
+    expect(newResponse).toEqual([
       {
         ack: expect.any(String),
         data: expect.objectContaining({
@@ -210,9 +171,7 @@ describe.concurrent(SyncRequestType.AlbumAssetsV1, () => {
       },
     ]);
 
-    await sut.setAcks(auth, { acks: [backfillResponse[3].ack, backfillResponse.at(-1).ack] });
-
-    const finalResponse = await testSync(auth, [SyncRequestType.AlbumAssetsV1]);
-    expect(finalResponse).toEqual([]);
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumAssetsV1])).resolves.toEqual([]);
   });
 });
diff --git a/server/test/medium/specs/sync/sync-album-to-asset.spec.ts b/server/test/medium/specs/sync/sync-album-to-asset.spec.ts
index 0941ab05b7..c1af6676f8 100644
--- a/server/test/medium/specs/sync/sync-album-to-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-to-asset.spec.ts
@@ -1,173 +1,119 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
-import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { AlbumRepository } from 'src/repositories/album.repository';
+import { AssetRepository } from 'src/repositories/asset.repository';
+import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB, wait } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
 
 const setup = async (db?: Kysely<DB>) => {
-  const database = db || defaultDatabase;
-  const result = newSyncTest({ db: database });
-  const { auth, create } = newSyncAuthUser();
-  await create(database);
-  return { ...result, auth };
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
 };
 
 beforeAll(async () => {
   defaultDatabase = await getKyselyDB();
 });
 
-describe.concurrent(SyncRequestType.AlbumToAssetsV1, () => {
+describe(SyncRequestType.AlbumToAssetsV1, () => {
   it('should detect and sync the first album to asset relation', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    const { album } = await ctx.newAlbum({ ownerId: user2.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
+    await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id });
 
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(asset);
-    const album = mediumFactory.albumInsert({ ownerId: user2.id });
-    await albumRepo.create(album, [asset.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
-
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            albumId: album.id,
-            assetId: asset.id,
-          },
-          type: SyncEntityType.AlbumToAssetV1,
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          albumId: album.id,
+          assetId: asset.id,
         },
-      ]),
-    );
+        type: SyncEntityType.AlbumToAssetV1,
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-
-    expect(ackSyncResponse).toEqual([]);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1])).resolves.toEqual([]);
   });
 
   it('should sync album to asset for owned albums', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
 
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(asset);
-    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
-    await albumRepo.create(album, [asset.id], []);
-
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            albumId: album.id,
-            assetId: asset.id,
-          },
-          type: SyncEntityType.AlbumToAssetV1,
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          albumId: album.id,
+          assetId: asset.id,
         },
-      ]),
-    );
+        type: SyncEntityType.AlbumToAssetV1,
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-    expect(ackSyncResponse).toEqual([]);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1])).resolves.toEqual([]);
   });
 
   it('should detect and sync the album to asset for shared albums', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    const { album } = await ctx.newAlbum({ ownerId: user2.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
+    await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(asset);
-    const album = mediumFactory.albumInsert({ ownerId: user2.id });
-    await albumRepo.create(album, [asset.id], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
-
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            albumId: album.id,
-            assetId: asset.id,
-          },
-          type: SyncEntityType.AlbumToAssetV1,
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          albumId: album.id,
+          assetId: asset.id,
         },
-      ]),
-    );
+        type: SyncEntityType.AlbumToAssetV1,
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-
-    expect(ackSyncResponse).toEqual([]);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1])).resolves.toEqual([]);
   });
 
   it('should not sync album to asset for an album owned by another user', async () => {
-    const { auth, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(asset);
-    await albumRepo.create({ ownerId: user2.id }, [asset.id], []);
-
-    await expect(testSync(auth, [SyncRequestType.AlbumToAssetsV1])).resolves.toHaveLength(0);
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    const { album } = await ctx.newAlbum({ ownerId: user2.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1])).resolves.toEqual([]);
   });
 
   it('should backfill album to assets when a user shares an album with you', async () => {
-    const { auth, sut, testSync, getRepository } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const assetRepo = getRepository('asset');
-    const album1Asset = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(album1Asset);
-    const album2Asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(album2Asset);
-
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { asset: album1Asset } = await ctx.newAsset({ ownerId: user2.id });
+    const { asset: album2Asset } = await ctx.newAsset({ ownerId: auth.user.id });
     // Backfill album
-    const albumRepo = getRepository('album');
-    const album2 = mediumFactory.albumInsert({ ownerId: user2.id });
-    await albumRepo.create(album2, [album2Asset.id], []);
-
+    const { album: album2 } = await ctx.newAlbum({ ownerId: user2.id });
+    await ctx.newAlbumAsset({ albumId: album2.id, assetId: album2Asset.id });
     await wait(2);
+    const { album: album1 } = await ctx.newAlbum({ ownerId: auth.user.id });
+    await ctx.newAlbumAsset({ albumId: album1.id, assetId: album1Asset.id });
 
-    const album1 = mediumFactory.albumInsert({ ownerId: auth.user.id });
-    await albumRepo.create(album1, [album1Asset.id], []);
-
-    const response = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
     expect(response).toHaveLength(1);
     expect(response).toEqual([
       {
@@ -181,16 +127,14 @@ describe.concurrent(SyncRequestType.AlbumToAssetsV1, () => {
     ]);
 
     // ack initial album to asset sync
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
+    await ctx.syncAckAll(auth, response);
 
     // add user to backfill album
-    const albumUserRepo = getRepository('albumUser');
-    await albumUserRepo.create({ albumsId: album2.id, usersId: auth.user.id, role: AlbumUserRole.EDITOR });
+    await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
     // should backfill the album to asset relation
-    const backfillResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-    expect(backfillResponse).toEqual([
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(newResponse).toEqual([
       {
         ack: expect.any(String),
         data: expect.objectContaining({
@@ -206,26 +150,20 @@ describe.concurrent(SyncRequestType.AlbumToAssetsV1, () => {
       },
     ]);
 
-    await sut.setAcks(auth, { acks: [backfillResponse[1].ack] });
-
-    const finalResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-    expect(finalResponse).toEqual([]);
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1])).resolves.toEqual([]);
   });
 
   it('should detect and sync a deleted album to asset relation', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const albumRepo = ctx.get(AlbumRepository);
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
 
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(asset);
-    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
-    await albumRepo.create(album, [asset.id], []);
-
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual([
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
       {
         ack: expect.any(String),
         data: {
@@ -236,16 +174,13 @@ describe.concurrent(SyncRequestType.AlbumToAssetsV1, () => {
       },
     ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
+    await ctx.syncAckAll(auth, response);
     await albumRepo.removeAssetIds(album.id, [asset.id]);
-
     await wait(2);
 
-    const syncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-    expect(syncResponse).toHaveLength(1);
-    expect(syncResponse).toEqual([
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(newResponse).toHaveLength(1);
+    expect(newResponse).toEqual([
       {
         ack: expect.any(String),
         data: {
@@ -256,26 +191,20 @@ describe.concurrent(SyncRequestType.AlbumToAssetsV1, () => {
       },
     ]);
 
-    await sut.setAcks(auth, { acks: [syncResponse[0].ack] });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-    expect(ackSyncResponse).toEqual([]);
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1])).resolves.toEqual([]);
   });
 
   it('should detect and sync a deleted album to asset relation when an asset is deleted', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const assetRepo = ctx.get(AssetRepository);
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
 
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(asset);
-    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
-    await albumRepo.create(album, [asset.id], []);
-
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual([
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
       {
         ack: expect.any(String),
         data: {
@@ -286,16 +215,13 @@ describe.concurrent(SyncRequestType.AlbumToAssetsV1, () => {
       },
     ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
+    await ctx.syncAckAll(auth, response);
     await assetRepo.remove({ id: asset.id });
-
     await wait(2);
 
-    const syncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-    expect(syncResponse).toHaveLength(1);
-    expect(syncResponse).toEqual([
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(newResponse).toHaveLength(1);
+    expect(newResponse).toEqual([
       {
         ack: expect.any(String),
         data: {
@@ -306,26 +232,20 @@ describe.concurrent(SyncRequestType.AlbumToAssetsV1, () => {
       },
     ]);
 
-    await sut.setAcks(auth, { acks: [syncResponse[0].ack] });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-    expect(ackSyncResponse).toEqual([]);
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1])).resolves.toEqual([]);
   });
 
   it('should not sync a deleted album to asset relation when the album is deleted', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const albumRepo = ctx.get(AlbumRepository);
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+    await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
 
-    const albumRepo = getRepository('album');
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(asset);
-    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
-    await albumRepo.create(album, [asset.id], []);
-
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual([
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
       {
         ack: expect.any(String),
         data: {
@@ -336,15 +256,9 @@ describe.concurrent(SyncRequestType.AlbumToAssetsV1, () => {
       },
     ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
+    await ctx.syncAckAll(auth, response);
     await albumRepo.delete(album.id);
-
     await wait(2);
-
-    const syncResponse = await testSync(auth, [SyncRequestType.AlbumToAssetsV1]);
-    expect(syncResponse).toHaveLength(0);
-    expect(syncResponse).toEqual([]);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1])).resolves.toEqual([]);
   });
 });
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 305bead275..215752ca6e 100644
--- a/server/test/medium/specs/sync/sync-album-user.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-user.spec.ts
@@ -1,17 +1,16 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
-import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { AlbumUserRepository } from 'src/repositories/album-user.repository';
+import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB, wait } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
 
 const setup = async (db?: Kysely<DB>) => {
-  const database = db || defaultDatabase;
-  const result = newSyncTest({ db: database });
-  const { auth, create } = newSyncAuthUser();
-  await create(database);
-  return { ...result, auth };
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
 };
 
 beforeAll(async () => {
@@ -20,198 +19,156 @@ beforeAll(async () => {
 
 describe(SyncRequestType.AlbumUsersV1, () => {
   it('should sync an album user with the correct properties', async () => {
-    const { auth, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+    const { user } = await ctx.newUser();
+    const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user.id, role: AlbumUserRole.EDITOR });
 
-    const albumRepo = getRepository('album');
-    const albumUserRepo = getRepository('albumUser');
-    const userRepo = getRepository('user');
-
-    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
-    await albumRepo.create(album, [], []);
-
-    const user = mediumFactory.userInsert();
-    await userRepo.create(user);
-
-    const albumUser = { albumsId: album.id, usersId: user.id, role: AlbumUserRole.EDITOR };
-    await albumUserRepo.create(albumUser);
-
-    await expect(testSync(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([
       {
         ack: expect.any(String),
         data: expect.objectContaining({
-          albumId: albumUser.albumsId,
+          albumId: albumUser.albumId,
           role: albumUser.role,
-          userId: albumUser.usersId,
+          userId: albumUser.userId,
         }),
         type: SyncEntityType.AlbumUserV1,
       },
     ]);
   });
+
   describe('owner', () => {
     it('should detect and sync a new shared user', async () => {
-      const { auth, testSync, getRepository } = await setup();
+      const { auth, ctx } = await setup();
+      const { user: user1 } = await ctx.newUser();
+      const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+      const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user1.id, role: AlbumUserRole.EDITOR });
 
-      const albumRepo = getRepository('album');
-      const albumUserRepo = getRepository('albumUser');
-      const userRepo = getRepository('user');
-
-      const user1 = mediumFactory.userInsert();
-      await userRepo.create(user1);
-
-      const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
-      await albumRepo.create(album, [], []);
-
-      const albumUser = { albumsId: album.id, usersId: user1.id, role: AlbumUserRole.EDITOR };
-      await albumUserRepo.create(albumUser);
-
-      await expect(testSync(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
+      expect(response).toHaveLength(1);
+      expect(response).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({
-            albumId: albumUser.albumsId,
+            albumId: albumUser.albumId,
             role: albumUser.role,
-            userId: albumUser.usersId,
+            userId: albumUser.userId,
           }),
           type: SyncEntityType.AlbumUserV1,
         },
       ]);
+
+      await ctx.syncAckAll(auth, response);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
     });
 
     it('should detect and sync an updated shared user', async () => {
-      const { auth, testSync, getRepository, sut } = await setup();
+      const { auth, ctx } = await setup();
+      const albumUserRepo = ctx.get(AlbumUserRepository);
+      const { user: user1 } = await ctx.newUser();
+      const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+      const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user1.id, role: AlbumUserRole.EDITOR });
 
-      const albumRepo = getRepository('album');
-      const albumUserRepo = getRepository('albumUser');
-      const userRepo = getRepository('user');
-
-      const user1 = mediumFactory.userInsert();
-      await userRepo.create(user1);
-
-      const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
-      await albumRepo.create(album, [], []);
-
-      const albumUser = { albumsId: album.id, usersId: user1.id, role: AlbumUserRole.EDITOR };
-      await albumUserRepo.create(albumUser);
-
-      const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumUsersV1]);
-      const acks = [initialSyncResponse[0].ack];
-      await sut.setAcks(auth, { acks });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
+      await ctx.syncAckAll(auth, response);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
 
       await albumUserRepo.update({ albumsId: album.id, usersId: user1.id }, { role: AlbumUserRole.VIEWER });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([
+      const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
+      expect(newResponse).toHaveLength(1);
+      expect(newResponse).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({
-            albumId: albumUser.albumsId,
+            albumId: albumUser.albumId,
             role: AlbumUserRole.VIEWER,
-            userId: albumUser.usersId,
+            userId: albumUser.userId,
           }),
           type: SyncEntityType.AlbumUserV1,
         },
       ]);
+
+      await ctx.syncAckAll(auth, newResponse);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
     });
 
     it('should detect and sync a deleted shared user', async () => {
-      const { auth, testSync, getRepository, sut } = await setup();
+      const { auth, ctx } = await setup();
+      const albumUserRepo = ctx.get(AlbumUserRepository);
+      const { user: user1 } = await ctx.newUser();
+      const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+      const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user1.id, role: AlbumUserRole.EDITOR });
 
-      const albumRepo = getRepository('album');
-      const albumUserRepo = getRepository('albumUser');
-      const userRepo = getRepository('user');
-
-      const user1 = mediumFactory.userInsert();
-      await userRepo.create(user1);
-
-      const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
-      await albumRepo.create(album, [], []);
-
-      const albumUser = { albumsId: album.id, usersId: user1.id, role: AlbumUserRole.EDITOR };
-      await albumUserRepo.create(albumUser);
-
-      const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumUsersV1]);
-      const acks = [initialSyncResponse[0].ack];
-      await sut.setAcks(auth, { acks });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
+      expect(response).toHaveLength(1);
+      await ctx.syncAckAll(auth, response);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
 
       await albumUserRepo.delete({ albumsId: album.id, usersId: user1.id });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([
+      const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
+      expect(newResponse).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({
-            albumId: albumUser.albumsId,
-            userId: albumUser.usersId,
+            albumId: albumUser.albumId,
+            userId: albumUser.userId,
           }),
           type: SyncEntityType.AlbumUserDeleteV1,
         },
       ]);
+
+      await ctx.syncAckAll(auth, newResponse);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
     });
   });
 
   describe('shared user', () => {
     it('should detect and sync a new shared user', async () => {
-      const { auth, testSync, getRepository } = await setup();
+      const { auth, ctx } = await setup();
+      const { user: user1 } = await ctx.newUser();
+      const { album } = await ctx.newAlbum({ ownerId: user1.id });
+      const { albumUser } = await ctx.newAlbumUser({
+        albumId: album.id,
+        userId: auth.user.id,
+        role: AlbumUserRole.EDITOR,
+      });
 
-      const albumRepo = getRepository('album');
-      const albumUserRepo = getRepository('albumUser');
-      const userRepo = getRepository('user');
-
-      const user1 = mediumFactory.userInsert();
-      await userRepo.create(user1);
-
-      const album = mediumFactory.albumInsert({ ownerId: user1.id });
-      await albumRepo.create(album, [], []);
-
-      const albumUser = { albumsId: album.id, usersId: auth.user.id, role: AlbumUserRole.EDITOR };
-      await albumUserRepo.create(albumUser);
-
-      await expect(testSync(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
+      expect(response).toHaveLength(1);
+      expect(response).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({
-            albumId: albumUser.albumsId,
+            albumId: albumUser.albumId,
             role: albumUser.role,
-            userId: albumUser.usersId,
+            userId: albumUser.userId,
           }),
           type: SyncEntityType.AlbumUserV1,
         },
       ]);
+
+      await ctx.syncAckAll(auth, response);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
     });
 
     it('should detect and sync an updated shared user', async () => {
-      const { auth, testSync, getRepository, sut } = await setup();
+      const { auth, ctx } = await setup();
+      const albumUserRepo = ctx.get(AlbumUserRepository);
+      const { user: owner } = await ctx.newUser();
+      const { user: user } = await ctx.newUser();
+      const { album } = await ctx.newAlbum({ ownerId: owner.id });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album.id, userId: user.id, role: AlbumUserRole.EDITOR });
 
-      const albumRepo = getRepository('album');
-      const albumUserRepo = getRepository('albumUser');
-      const userRepo = getRepository('user');
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
+      expect(response).toHaveLength(2);
 
-      const owner = mediumFactory.userInsert();
-      const user = mediumFactory.userInsert();
-      await Promise.all([userRepo.create(owner), userRepo.create(user)]);
-
-      const album = mediumFactory.albumInsert({ ownerId: owner.id });
-      await albumRepo.create(
-        album,
-        [],
-        [
-          { userId: auth.user.id, role: AlbumUserRole.EDITOR },
-          { userId: user.id, role: AlbumUserRole.EDITOR },
-        ],
-      );
-
-      const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumUsersV1]);
-      expect(initialSyncResponse).toHaveLength(2);
-      const acks = [initialSyncResponse[1].ack];
-      await sut.setAcks(auth, { acks });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
+      await ctx.syncAckAll(auth, response);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
 
       await albumUserRepo.update({ albumsId: album.id, usersId: user.id }, { role: AlbumUserRole.VIEWER });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([
+      const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
+      expect(newResponse).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({
@@ -222,39 +179,29 @@ describe(SyncRequestType.AlbumUsersV1, () => {
           type: SyncEntityType.AlbumUserV1,
         },
       ]);
+
+      await ctx.syncAckAll(auth, newResponse);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
     });
 
     it('should detect and sync a deleted shared user', async () => {
-      const { auth, testSync, getRepository, sut } = await setup();
+      const { auth, ctx } = await setup();
+      const albumUserRepo = ctx.get(AlbumUserRepository);
+      const { user: owner } = await ctx.newUser();
+      const { user: user } = await ctx.newUser();
+      const { album } = await ctx.newAlbum({ ownerId: owner.id });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album.id, userId: user.id, role: AlbumUserRole.EDITOR });
 
-      const albumRepo = getRepository('album');
-      const albumUserRepo = getRepository('albumUser');
-      const userRepo = getRepository('user');
-
-      const owner = mediumFactory.userInsert();
-      const user = mediumFactory.userInsert();
-      await Promise.all([userRepo.create(owner), userRepo.create(user)]);
-
-      const album = mediumFactory.albumInsert({ ownerId: owner.id });
-      await albumRepo.create(
-        album,
-        [],
-        [
-          { userId: auth.user.id, role: AlbumUserRole.EDITOR },
-          { userId: user.id, role: AlbumUserRole.EDITOR },
-        ],
-      );
-
-      const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumUsersV1]);
-      expect(initialSyncResponse).toHaveLength(2);
-      const acks = [initialSyncResponse[1].ack];
-      await sut.setAcks(auth, { acks });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
+      expect(response).toHaveLength(2);
+      await ctx.syncAckAll(auth, response);
 
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
       await albumUserRepo.delete({ albumsId: album.id, usersId: user.id });
 
-      await expect(testSync(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([
+      const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
+      expect(newResponse).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({
@@ -264,35 +211,27 @@ describe(SyncRequestType.AlbumUsersV1, () => {
           type: SyncEntityType.AlbumUserDeleteV1,
         },
       ]);
+
+      await ctx.syncAckAll(auth, newResponse);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
     });
 
     it('should backfill album users when a user shares an album with you', async () => {
-      const { auth, sut, testSync, getRepository } = await setup();
-
-      const albumRepo = getRepository('album');
-      const albumUserRepo = getRepository('albumUser');
-      const userRepo = getRepository('user');
-
-      const user1 = mediumFactory.userInsert();
-      const user2 = mediumFactory.userInsert();
-      await userRepo.create(user1);
-      await userRepo.create(user2);
-
-      const album1 = mediumFactory.albumInsert({ ownerId: user1.id });
-      const album2 = mediumFactory.albumInsert({ ownerId: user1.id });
-      await albumRepo.create(album1, [], []);
-      await albumRepo.create(album2, [], []);
-
+      const { auth, ctx } = await setup();
+      const { user: user1 } = await ctx.newUser();
+      const { user: user2 } = await ctx.newUser();
+      const { album: album1 } = await ctx.newAlbum({ ownerId: user1.id });
+      const { album: album2 } = await ctx.newAlbum({ ownerId: user1.id });
       // backfill album user
-      await albumUserRepo.create({ albumsId: album1.id, usersId: user1.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album1.id, userId: user1.id, role: AlbumUserRole.EDITOR });
       await wait(2);
       // initial album user
-      await albumUserRepo.create({ albumsId: album2.id, usersId: auth.user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
       await wait(2);
       // post checkpoint album user
-      await albumUserRepo.create({ albumsId: album1.id, usersId: user2.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album1.id, userId: user2.id, role: AlbumUserRole.EDITOR });
 
-      const response = await testSync(auth, [SyncRequestType.AlbumUsersV1]);
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(response).toHaveLength(1);
       expect(response).toEqual([
         {
@@ -307,15 +246,13 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       ]);
 
       // ack initial user
-      const acks = response.map(({ ack }) => ack);
-      await sut.setAcks(auth, { acks });
-
+      await ctx.syncAckAll(auth, response);
       // get access to the backfill album user
-      await albumUserRepo.create({ albumsId: album1.id, usersId: auth.user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album1.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
       // should backfill the album user
-      const backfillResponse = await testSync(auth, [SyncRequestType.AlbumUsersV1]);
-      expect(backfillResponse).toEqual([
+      const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
+      expect(newResponse).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({
@@ -350,10 +287,8 @@ describe(SyncRequestType.AlbumUsersV1, () => {
         },
       ]);
 
-      await sut.setAcks(auth, { acks: [backfillResponse[1].ack, backfillResponse.at(-1).ack] });
-
-      const finalResponse = await testSync(auth, [SyncRequestType.AlbumUsersV1]);
-      expect(finalResponse).toEqual([]);
+      await ctx.syncAckAll(auth, newResponse);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
     });
   });
 });
diff --git a/server/test/medium/specs/sync/sync-album.spec.ts b/server/test/medium/specs/sync/sync-album.spec.ts
index 7ee7bf624f..90aa8c4576 100644
--- a/server/test/medium/specs/sync/sync-album.spec.ts
+++ b/server/test/medium/specs/sync/sync-album.spec.ts
@@ -1,17 +1,17 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
-import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { AlbumUserRepository } from 'src/repositories/album-user.repository';
+import { AlbumRepository } from 'src/repositories/album.repository';
+import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
 
 const setup = async (db?: Kysely<DB>) => {
-  const database = db || defaultDatabase;
-  const result = newSyncTest({ db: database });
-  const { auth, create } = newSyncAuthUser();
-  await create(database);
-  return { ...result, auth };
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
 };
 
 beforeAll(async () => {
@@ -20,11 +20,12 @@ beforeAll(async () => {
 
 describe(SyncRequestType.AlbumsV1, () => {
   it('should sync an album with the correct properties', async () => {
-    const { auth, getRepository, testSync } = await setup();
-    const albumRepo = getRepository('album');
-    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
-    await albumRepo.create(album, [], []);
-    await expect(testSync(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([
+    const { auth, ctx } = await setup();
+    const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
       {
         ack: expect.any(String),
         data: expect.objectContaining({
@@ -35,14 +36,18 @@ describe(SyncRequestType.AlbumsV1, () => {
         type: SyncEntityType.AlbumV1,
       },
     ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
   });
 
   it('should detect and sync a new album', async () => {
-    const { auth, getRepository, testSync } = await setup();
-    const albumRepo = getRepository('album');
-    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
-    await albumRepo.create(album, [], []);
-    await expect(testSync(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([
+    const { auth, ctx } = await setup();
+    const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
       {
         ack: expect.any(String),
         data: expect.objectContaining({
@@ -51,14 +56,19 @@ describe(SyncRequestType.AlbumsV1, () => {
         type: SyncEntityType.AlbumV1,
       },
     ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
   });
 
   it('should detect and sync an album delete', async () => {
-    const { auth, getRepository, testSync } = await setup();
-    const albumRepo = getRepository('album');
-    const album = mediumFactory.albumInsert({ ownerId: auth.user.id });
-    await albumRepo.create(album, [], []);
-    await expect(testSync(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([
+    const { auth, ctx } = await setup();
+    const albumRepo = ctx.get(AlbumRepository);
+    const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
       {
         ack: expect.any(String),
         data: expect.objectContaining({
@@ -69,7 +79,10 @@ describe(SyncRequestType.AlbumsV1, () => {
     ]);
 
     await albumRepo.delete(album.id);
-    await expect(testSync(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([
+
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+    expect(newResponse).toHaveLength(1);
+    expect(newResponse).toEqual([
       {
         ack: expect.any(String),
         data: {
@@ -78,67 +91,60 @@ describe(SyncRequestType.AlbumsV1, () => {
         type: SyncEntityType.AlbumDeleteV1,
       },
     ]);
+
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
   });
 
   describe('shared albums', () => {
     it('should detect and sync an album create', async () => {
-      const { auth, getRepository, testSync } = await setup();
-      const albumRepo = getRepository('album');
-      const userRepo = getRepository('user');
+      const { auth, ctx } = await setup();
+      const { user: user2 } = await ctx.newUser();
+      const { album } = await ctx.newAlbum({ ownerId: user2.id });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
-      const user2 = mediumFactory.userInsert();
-      await userRepo.create(user2);
-
-      const album = mediumFactory.albumInsert({ ownerId: user2.id });
-      await albumRepo.create(album, [], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
-
-      await expect(testSync(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+      expect(response).toHaveLength(1);
+      expect(response).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({ id: album.id }),
           type: SyncEntityType.AlbumV1,
         },
       ]);
+
+      await ctx.syncAckAll(auth, response);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
     });
 
     it('should detect and sync an album share (share before sync)', async () => {
-      const { auth, getRepository, testSync } = await setup();
-      const albumRepo = getRepository('album');
-      const albumUserRepo = getRepository('albumUser');
-      const userRepo = getRepository('user');
+      const { auth, ctx } = await setup();
+      const { user: user2 } = await ctx.newUser();
+      const { album } = await ctx.newAlbum({ ownerId: user2.id });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
-      const user2 = mediumFactory.userInsert();
-      await userRepo.create(user2);
-
-      const album = mediumFactory.albumInsert({ ownerId: user2.id });
-      await albumRepo.create(album, [], []);
-      await albumUserRepo.create({ usersId: auth.user.id, albumsId: album.id, role: AlbumUserRole.EDITOR });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+      expect(response).toHaveLength(1);
+      expect(response).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({ id: album.id }),
           type: SyncEntityType.AlbumV1,
         },
       ]);
+
+      await ctx.syncAckAll(auth, response);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
     });
 
     it('should detect and sync an album share (share after sync)', async () => {
-      const { auth, getRepository, sut, testSync } = await setup();
-      const albumRepo = getRepository('album');
-      const albumUserRepo = getRepository('albumUser');
-      const userRepo = getRepository('user');
+      const { auth, ctx } = await setup();
+      const { user: user2 } = await ctx.newUser();
+      const { album: userAlbum } = await ctx.newAlbum({ ownerId: auth.user.id });
+      const { album: user2Album } = await ctx.newAlbum({ ownerId: user2.id });
 
-      const user2 = mediumFactory.userInsert();
-      await userRepo.create(user2);
-
-      const userAlbum = mediumFactory.albumInsert({ ownerId: auth.user.id });
-      const user2Album = mediumFactory.albumInsert({ ownerId: user2.id });
-      await Promise.all([albumRepo.create(user2Album, [], []), albumRepo.create(userAlbum, [], [])]);
-
-      const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumsV1]);
-
-      expect(initialSyncResponse).toEqual([
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+      expect(response).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({ id: userAlbum.id }),
@@ -146,75 +152,76 @@ describe(SyncRequestType.AlbumsV1, () => {
         },
       ]);
 
-      const acks = [initialSyncResponse[0].ack];
-      await sut.setAcks(auth, { acks });
+      await ctx.syncAckAll(auth, response);
+      await ctx.newAlbumUser({ userId: auth.user.id, albumId: user2Album.id, role: AlbumUserRole.EDITOR });
 
-      await albumUserRepo.create({ usersId: auth.user.id, albumsId: user2Album.id, role: AlbumUserRole.EDITOR });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([
+      const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+      expect(newResponse).toHaveLength(1);
+      expect(newResponse).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({ id: user2Album.id }),
           type: SyncEntityType.AlbumV1,
         },
       ]);
+
+      await ctx.syncAckAll(auth, newResponse);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
     });
 
     it('should detect and sync an album delete`', async () => {
-      const { auth, getRepository, testSync, sut } = await setup();
-      const albumRepo = getRepository('album');
-      const userRepo = getRepository('user');
+      const { auth, ctx } = await setup();
+      const albumRepo = ctx.get(AlbumRepository);
+      const { user: user2 } = await ctx.newUser();
+      const { album } = await ctx.newAlbum({ ownerId: user2.id });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
-      const user2 = mediumFactory.userInsert();
-      await userRepo.create(user2);
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+      expect(response).toHaveLength(1);
 
-      const album = mediumFactory.albumInsert({ ownerId: user2.id });
-      await albumRepo.create(album, [], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
-
-      const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumsV1]);
-      const acks = [initialSyncResponse[0].ack];
-      await sut.setAcks(auth, { acks });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
+      await ctx.syncAckAll(auth, response);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
 
       await albumRepo.delete(album.id);
-
-      await expect(testSync(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([
+      const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+      expect(newResponse).toHaveLength(1);
+      expect(newResponse).toEqual([
         {
           ack: expect.any(String),
           data: { albumId: album.id },
           type: SyncEntityType.AlbumDeleteV1,
         },
       ]);
+
+      await ctx.syncAckAll(auth, newResponse);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
     });
 
     it('should detect and sync an album unshare as an album delete', async () => {
-      const { auth, getRepository, testSync, sut } = await setup();
-      const albumRepo = getRepository('album');
-      const albumUserRepo = getRepository('albumUser');
-      const userRepo = getRepository('user');
+      const { auth, ctx } = await setup();
+      const albumUserRepo = ctx.get(AlbumUserRepository);
+      const { user: user2 } = await ctx.newUser();
+      const { album } = await ctx.newAlbum({ ownerId: user2.id });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
 
-      const user2 = mediumFactory.userInsert();
-      await userRepo.create(user2);
+      const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+      expect(response).toHaveLength(1);
 
-      const album = mediumFactory.albumInsert({ ownerId: user2.id });
-      await albumRepo.create(album, [], [{ userId: auth.user.id, role: AlbumUserRole.EDITOR }]);
-
-      const initialSyncResponse = await testSync(auth, [SyncRequestType.AlbumsV1]);
-      const acks = [initialSyncResponse[0].ack];
-      await sut.setAcks(auth, { acks });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
+      await ctx.syncAckAll(auth, response);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
 
       await albumUserRepo.delete({ albumsId: album.id, usersId: auth.user.id });
-
-      await expect(testSync(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([
+      const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
+      expect(newResponse).toEqual([
         {
           ack: expect.any(String),
           data: { albumId: album.id },
           type: SyncEntityType.AlbumDeleteV1,
         },
       ]);
+
+      await ctx.syncAckAll(auth, newResponse);
+      await expect(ctx.syncStream(auth, [SyncRequestType.AlbumsV1])).resolves.toEqual([]);
     });
   });
 });
diff --git a/server/test/medium/specs/sync/sync-asset-exif.spec.ts b/server/test/medium/specs/sync/sync-asset-exif.spec.ts
index 9a3bcb4314..8ddb05a2b7 100644
--- a/server/test/medium/specs/sync/sync-asset-exif.spec.ts
+++ b/server/test/medium/specs/sync/sync-asset-exif.spec.ts
@@ -1,100 +1,78 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
-import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
 
 const setup = async (db?: Kysely<DB>) => {
-  const database = db || defaultDatabase;
-  const result = newSyncTest({ db: database });
-  const { auth, create } = newSyncAuthUser();
-  await create(database);
-  return { ...result, auth };
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
 };
+
 beforeAll(async () => {
   defaultDatabase = await getKyselyDB();
 });
 
-describe.concurrent(SyncRequestType.AssetExifsV1, () => {
+describe(SyncRequestType.AssetExifsV1, () => {
   it('should detect and sync the first asset exif', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    await ctx.newExif({ assetId: asset.id, make: 'Canon' });
 
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(asset);
-    await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
-
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.AssetExifsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            assetId: asset.id,
-            city: null,
-            country: null,
-            dateTimeOriginal: null,
-            description: '',
-            exifImageHeight: null,
-            exifImageWidth: null,
-            exposureTime: null,
-            fNumber: null,
-            fileSizeInByte: null,
-            focalLength: null,
-            fps: null,
-            iso: null,
-            latitude: null,
-            lensModel: null,
-            longitude: null,
-            make: 'Canon',
-            model: null,
-            modifyDate: null,
-            orientation: null,
-            profileDescription: null,
-            projectionType: null,
-            rating: null,
-            state: null,
-            timeZone: null,
-          },
-          type: SyncEntityType.AssetExifV1,
+    const response = await ctx.syncStream(auth, [SyncRequestType.AssetExifsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          assetId: asset.id,
+          city: null,
+          country: null,
+          dateTimeOriginal: null,
+          description: '',
+          exifImageHeight: null,
+          exifImageWidth: null,
+          exposureTime: null,
+          fNumber: null,
+          fileSizeInByte: null,
+          focalLength: null,
+          fps: null,
+          iso: null,
+          latitude: null,
+          lensModel: null,
+          longitude: null,
+          make: 'Canon',
+          model: null,
+          modifyDate: null,
+          orientation: null,
+          profileDescription: null,
+          projectionType: null,
+          rating: null,
+          state: null,
+          timeZone: null,
         },
-      ]),
-    );
+        type: SyncEntityType.AssetExifV1,
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.AssetExifsV1]);
-
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetExifsV1])).resolves.toEqual([]);
   });
 
   it('should only sync asset exif for own user', async () => {
-    const { auth, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(asset);
-    await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
-
-    const sessionRepo = getRepository('session');
-    const session = mediumFactory.sessionInsert({ userId: user2.id });
-    await sessionRepo.create(session);
-
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newExif({ assetId: asset.id, make: 'Canon' });
+    const { session } = await ctx.newSession({ userId: user2.id });
     const auth2 = factory.auth({ session, user: user2 });
-    await expect(testSync(auth2, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
-    await expect(testSync(auth, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(0);
+
+    await expect(ctx.syncStream(auth2, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(0);
   });
 });
diff --git a/server/test/medium/specs/sync/sync-asset.spec.ts b/server/test/medium/specs/sync/sync-asset.spec.ts
index 913edac5d9..5ffec3612e 100644
--- a/server/test/medium/specs/sync/sync-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-asset.spec.ts
@@ -1,35 +1,32 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
-import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { AssetRepository } from 'src/repositories/asset.repository';
+import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
 
 const setup = async (db?: Kysely<DB>) => {
-  const database = db || defaultDatabase;
-  const result = newSyncTest({ db: database });
-  const { auth, create } = newSyncAuthUser();
-  await create(database);
-  return { ...result, auth };
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
 };
 
 beforeAll(async () => {
   defaultDatabase = await getKyselyDB();
 });
 
-describe.concurrent(SyncEntityType.AssetV1, () => {
+describe(SyncEntityType.AssetV1, () => {
   it('should detect and sync the first asset', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
-
     const originalFileName = 'firstAsset';
     const checksum = '1115vHcVkZzNp3Q9G+FEA0nu6zUbGb4Tj4UOXkN0wRA=';
     const thumbhash = '2225vHcVkZzNp3Q9G+FEA0nu6zUbGb4Tj4UOXkN0wRA=';
     const date = new Date().toISOString();
 
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({
+    const { auth, ctx } = await setup();
+    const { asset } = await ctx.newAsset({
       originalFileName,
       ownerId: auth.user.id,
       checksum: Buffer.from(checksum, 'base64'),
@@ -40,96 +37,70 @@ describe.concurrent(SyncEntityType.AssetV1, () => {
       deletedAt: null,
       duration: '0:10:00.00000',
     });
-    await assetRepo.create(asset);
 
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.AssetsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            id: asset.id,
-            originalFileName,
-            ownerId: asset.ownerId,
-            thumbhash,
-            checksum,
-            deletedAt: asset.deletedAt,
-            fileCreatedAt: asset.fileCreatedAt,
-            fileModifiedAt: asset.fileModifiedAt,
-            isFavorite: asset.isFavorite,
-            localDateTime: asset.localDateTime,
-            type: asset.type,
-            visibility: asset.visibility,
-            duration: asset.duration,
-          },
-          type: 'AssetV1',
+    const response = await ctx.syncStream(auth, [SyncRequestType.AssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: asset.id,
+          originalFileName,
+          ownerId: asset.ownerId,
+          thumbhash,
+          checksum,
+          deletedAt: asset.deletedAt,
+          fileCreatedAt: asset.fileCreatedAt,
+          fileModifiedAt: asset.fileModifiedAt,
+          isFavorite: asset.isFavorite,
+          localDateTime: asset.localDateTime,
+          type: asset.type,
+          visibility: asset.visibility,
+          duration: asset.duration,
         },
-      ]),
-    );
+        type: 'AssetV1',
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.AssetsV1]);
-
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetsV1])).resolves.toEqual([]);
   });
 
   it('should detect and sync a deleted asset', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
-
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(asset);
+    const { auth, ctx } = await setup();
+    const assetRepo = ctx.get(AssetRepository);
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
     await assetRepo.remove(asset);
 
-    const response = await testSync(auth, [SyncRequestType.AssetsV1]);
-
+    const response = await ctx.syncStream(auth, [SyncRequestType.AssetsV1]);
     expect(response).toHaveLength(1);
-    expect(response).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            assetId: asset.id,
-          },
-          type: 'AssetDeleteV1',
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          assetId: asset.id,
         },
-      ]),
-    );
+        type: 'AssetDeleteV1',
+      },
+    ]);
 
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.AssetsV1]);
-
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetsV1])).resolves.toEqual([]);
   });
 
   it('should not sync an asset or asset delete for an unrelated user', async () => {
-    const { auth, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const sessionRepo = getRepository('session');
-    const session = mediumFactory.sessionInsert({ userId: user2.id });
-    await sessionRepo.create(session);
-
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(asset);
-
+    const { auth, ctx } = await setup();
+    const assetRepo = ctx.get(AssetRepository);
+    const { user: user2 } = await ctx.newUser();
+    const { session } = await ctx.newSession({ userId: user2.id });
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
     const auth2 = factory.auth({ session, user: user2 });
 
-    expect(await testSync(auth2, [SyncRequestType.AssetsV1])).toHaveLength(1);
-    expect(await testSync(auth, [SyncRequestType.AssetsV1])).toHaveLength(0);
+    expect(await ctx.syncStream(auth2, [SyncRequestType.AssetsV1])).toHaveLength(1);
+    expect(await ctx.syncStream(auth, [SyncRequestType.AssetsV1])).toHaveLength(0);
 
     await assetRepo.remove(asset);
-    expect(await testSync(auth2, [SyncRequestType.AssetsV1])).toHaveLength(1);
-    expect(await testSync(auth, [SyncRequestType.AssetsV1])).toHaveLength(0);
+    expect(await ctx.syncStream(auth2, [SyncRequestType.AssetsV1])).toHaveLength(1);
+    expect(await ctx.syncStream(auth, [SyncRequestType.AssetsV1])).toHaveLength(0);
   });
 });
diff --git a/server/test/medium/specs/sync/sync-partner-asset-exif.spec.ts b/server/test/medium/specs/sync/sync-partner-asset-exif.spec.ts
index c47c55ecdc..2fee9b09a9 100644
--- a/server/test/medium/specs/sync/sync-partner-asset-exif.spec.ts
+++ b/server/test/medium/specs/sync/sync-partner-asset-exif.spec.ts
@@ -1,18 +1,16 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
-import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
 
 const setup = async (db?: Kysely<DB>) => {
-  const database = db || defaultDatabase;
-  const result = newSyncTest({ db: database });
-  const { auth, create } = newSyncAuthUser();
-  await create(database);
-  return { ...result, auth };
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
 };
 
 beforeAll(async () => {
@@ -21,134 +19,89 @@ beforeAll(async () => {
 
 describe(SyncRequestType.PartnerAssetExifsV1, () => {
   it('should detect and sync the first partner asset exif', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newExif({ assetId: asset.id, make: 'Canon' });
 
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(asset);
-    await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
-
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            assetId: asset.id,
-            city: null,
-            country: null,
-            dateTimeOriginal: null,
-            description: '',
-            exifImageHeight: null,
-            exifImageWidth: null,
-            exposureTime: null,
-            fNumber: null,
-            fileSizeInByte: null,
-            focalLength: null,
-            fps: null,
-            iso: null,
-            latitude: null,
-            lensModel: null,
-            longitude: null,
-            make: 'Canon',
-            model: null,
-            modifyDate: null,
-            orientation: null,
-            profileDescription: null,
-            projectionType: null,
-            rating: null,
-            state: null,
-            timeZone: null,
-          },
-          type: SyncEntityType.PartnerAssetExifV1,
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          assetId: asset.id,
+          city: null,
+          country: null,
+          dateTimeOriginal: null,
+          description: '',
+          exifImageHeight: null,
+          exifImageWidth: null,
+          exposureTime: null,
+          fNumber: null,
+          fileSizeInByte: null,
+          focalLength: null,
+          fps: null,
+          iso: null,
+          latitude: null,
+          lensModel: null,
+          longitude: null,
+          make: 'Canon',
+          model: null,
+          modifyDate: null,
+          orientation: null,
+          profileDescription: null,
+          projectionType: null,
+          rating: null,
+          state: null,
+          timeZone: null,
         },
-      ]),
-    );
+        type: SyncEntityType.PartnerAssetExifV1,
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1])).resolves.toEqual([]);
   });
 
   it('should not sync partner asset exif for own user', async () => {
-    const { auth, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    await ctx.newExif({ assetId: asset.id, make: 'Canon' });
 
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(asset);
-    await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
-
-    await expect(testSync(auth, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
-    await expect(testSync(auth, [SyncRequestType.PartnerAssetExifsV1])).resolves.toHaveLength(0);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1])).resolves.toHaveLength(0);
   });
 
   it('should not sync partner asset exif for unrelated user', async () => {
-    const { auth, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-
-    const user2 = mediumFactory.userInsert();
-    const user3 = mediumFactory.userInsert();
-    await Promise.all([userRepo.create(user2), userRepo.create(user3)]);
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: user3.id });
-    await assetRepo.create(asset);
-    await assetRepo.upsertExif({ assetId: asset.id, make: 'Canon' });
-
-    const sessionRepo = getRepository('session');
-    const session = mediumFactory.sessionInsert({ userId: user3.id });
-    await sessionRepo.create(session);
-
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { user: user3 } = await ctx.newUser();
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
+    const { asset } = await ctx.newAsset({ ownerId: user3.id });
+    await ctx.newExif({ assetId: asset.id, make: 'Canon' });
+    const { session } = await ctx.newSession({ userId: user3.id });
     const authUser3 = factory.auth({ session, user: user3 });
-    await expect(testSync(authUser3, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
-    await expect(testSync(auth, [SyncRequestType.PartnerAssetExifsV1])).resolves.toHaveLength(0);
+
+    await expect(ctx.syncStream(authUser3, [SyncRequestType.AssetExifsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1])).resolves.toHaveLength(0);
   });
 
   it('should backfill partner asset exif when a partner shared their library with you', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    const user3 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-    await userRepo.create(user3);
-
-    const assetRepo = getRepository('asset');
-    const assetUser3 = mediumFactory.assetInsert({ ownerId: user3.id });
-    const assetUser2 = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(assetUser3);
-    await assetRepo.upsertExif({ assetId: assetUser3.id, make: 'Canon' });
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { user: user3 } = await ctx.newUser();
+    const { asset: assetUser3 } = await ctx.newAsset({ ownerId: user3.id });
+    await ctx.newExif({ assetId: assetUser3.id, make: 'Canon' });
     await wait(2);
-    await assetRepo.create(assetUser2);
-    await assetRepo.upsertExif({ assetId: assetUser2.id, make: 'Canon' });
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    const response = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
+    const { asset: assetUser2 } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newExif({ assetId: assetUser2.id, make: 'Canon' });
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
 
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1]);
     expect(response).toHaveLength(1);
     expect(response).toEqual(
       expect.arrayContaining([
@@ -162,189 +115,133 @@ describe(SyncRequestType.PartnerAssetExifsV1, () => {
       ]),
     );
 
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
+    await ctx.syncAckAll(auth, response);
+    await ctx.newPartner({ sharedById: user3.id, sharedWithId: auth.user.id });
 
-    await partnerRepo.create({ sharedById: user3.id, sharedWithId: auth.user.id });
-    const backfillResponse = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1]);
+    expect(newResponse).toHaveLength(2);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          assetId: assetUser3.id,
+        }),
+        type: SyncEntityType.PartnerAssetExifBackfillV1,
+      },
+      {
+        ack: expect.any(String),
+        data: {},
+        type: SyncEntityType.SyncAckV1,
+      },
+    ]);
 
-    expect(backfillResponse).toHaveLength(2);
-    expect(backfillResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: expect.objectContaining({
-            assetId: assetUser3.id,
-          }),
-          type: SyncEntityType.PartnerAssetExifBackfillV1,
-        },
-        {
-          ack: expect.any(String),
-          data: {},
-          type: SyncEntityType.SyncAckV1,
-        },
-      ]),
-    );
-
-    const backfillAck = backfillResponse[1].ack;
-    await sut.setAcks(auth, { acks: [backfillAck] });
-
-    const finalResponse = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
-
-    const finalAcks = finalResponse.map(({ ack }) => ack);
-    expect(finalAcks).toEqual([]);
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1])).resolves.toEqual([]);
   });
 
   it('should handle partners with users ids lower than a uuidv7', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert({ id: '00d4c0af-7695-4cf2-85e6-415eeaf449cb' });
-    const user3 = mediumFactory.userInsert({ id: '00e4c0af-7695-4cf2-85e6-415eeaf449cb' });
-    await userRepo.create(user2);
-    await userRepo.create(user3);
-
-    const assetRepo = getRepository('asset');
-    const assetUser3 = mediumFactory.assetInsert({ ownerId: user3.id });
-    await assetRepo.create(assetUser3);
-    await assetRepo.upsertExif({ assetId: assetUser3.id, make: 'assetUser3' });
-
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser({ id: '00d4c0af-7695-4cf2-85e6-415eeaf449cb' });
+    const { user: user3 } = await ctx.newUser({ id: '00e4c0af-7695-4cf2-85e6-415eeaf449cb' });
+    const { asset: assetUser3 } = await ctx.newAsset({ ownerId: user3.id });
+    await ctx.newExif({ assetId: assetUser3.id, make: 'assetUser3' });
     await wait(2);
+    const { asset: assetUser2 } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newExif({ assetId: assetUser2.id, make: 'assetUser2' });
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
 
-    const assetUser2 = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(assetUser2);
-    await assetRepo.upsertExif({ assetId: assetUser2.id, make: 'assetUser2' });
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    const response = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
-
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1]);
     expect(response).toHaveLength(1);
-    expect(response).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: expect.objectContaining({
-            assetId: assetUser2.id,
-          }),
-          type: SyncEntityType.PartnerAssetExifV1,
-        },
-      ]),
-    );
-
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          assetId: assetUser2.id,
+        }),
+        type: SyncEntityType.PartnerAssetExifV1,
+      },
+    ]);
 
+    await ctx.syncAckAll(auth, response);
     // This checks that our ack upsert is correct
-    const ackUpsertResponse = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
-    expect(ackUpsertResponse).toEqual([]);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1])).resolves.toEqual([]);
+    await ctx.newPartner({ sharedById: user3.id, sharedWithId: auth.user.id });
 
-    await partnerRepo.create({ sharedById: user3.id, sharedWithId: auth.user.id });
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1]);
+    expect(newResponse).toHaveLength(2);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.stringMatching(new RegExp(`${SyncEntityType.PartnerAssetExifBackfillV1}\\|.+?\\|.+`)),
+        data: expect.objectContaining({
+          assetId: assetUser3.id,
+        }),
+        type: SyncEntityType.PartnerAssetExifBackfillV1,
+      },
+      {
+        ack: expect.stringContaining(SyncEntityType.PartnerAssetExifBackfillV1),
+        data: {},
+        type: SyncEntityType.SyncAckV1,
+      },
+    ]);
 
-    const syncAckResponse = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
-    expect(syncAckResponse).toHaveLength(2);
-    expect(syncAckResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.stringMatching(new RegExp(`${SyncEntityType.PartnerAssetExifBackfillV1}\\|.+?\\|.+`)),
-          data: expect.objectContaining({
-            assetId: assetUser3.id,
-          }),
-          type: SyncEntityType.PartnerAssetExifBackfillV1,
-        },
-        {
-          ack: expect.stringContaining(SyncEntityType.PartnerAssetExifBackfillV1),
-          data: {},
-          type: SyncEntityType.SyncAckV1,
-        },
-      ]),
-    );
-
-    const syncAckResponseAcks = syncAckResponse.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks: [syncAckResponseAcks[1]] });
-
-    const finalResponse = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
-    expect(finalResponse).toEqual([]);
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1])).resolves.toEqual([]);
   });
 
   it('should only backfill partner assets created prior to the current partner asset checkpoint', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    const user3 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-    await userRepo.create(user3);
-
-    const assetRepo = getRepository('asset');
-    const assetUser3 = mediumFactory.assetInsert({ ownerId: user3.id });
-    const assetUser2 = mediumFactory.assetInsert({ ownerId: user2.id });
-    const asset2User3 = mediumFactory.assetInsert({ ownerId: user3.id });
-    await assetRepo.create(assetUser3);
-    await assetRepo.upsertExif({ assetId: assetUser3.id, make: 'assetUser3' });
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { user: user3 } = await ctx.newUser();
+    const { asset: assetUser3 } = await ctx.newAsset({ ownerId: user3.id });
+    await ctx.newExif({ assetId: assetUser3.id, make: 'assetUser3' });
     await wait(2);
-    await assetRepo.create(assetUser2);
-    await assetRepo.upsertExif({ assetId: assetUser2.id, make: 'assetUser2' });
+    const { asset: assetUser2 } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newExif({ assetId: assetUser2.id, make: 'assetUser2' });
     await wait(2);
-    await assetRepo.create(asset2User3);
-    await assetRepo.upsertExif({ assetId: asset2User3.id, make: 'asset2User3' });
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    const response = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
+    const { asset: asset2User3 } = await ctx.newAsset({ ownerId: user3.id });
+    await ctx.newExif({ assetId: asset2User3.id, make: 'asset2User3' });
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
 
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1]);
     expect(response).toHaveLength(1);
-    expect(response).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: expect.objectContaining({
-            assetId: assetUser2.id,
-          }),
-          type: SyncEntityType.PartnerAssetExifV1,
-        },
-      ]),
-    );
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          assetId: assetUser2.id,
+        }),
+        type: SyncEntityType.PartnerAssetExifV1,
+      },
+    ]);
 
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
+    await ctx.syncAckAll(auth, response);
+    await ctx.newPartner({ sharedById: user3.id, sharedWithId: auth.user.id });
 
-    await partnerRepo.create({ sharedById: user3.id, sharedWithId: auth.user.id });
-    const backfillResponse = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1]);
+    expect(newResponse).toHaveLength(3);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.stringMatching(new RegExp(`${SyncEntityType.PartnerAssetExifBackfillV1}\\|.+?\\|.+`)),
+        data: expect.objectContaining({
+          assetId: assetUser3.id,
+        }),
+        type: SyncEntityType.PartnerAssetExifBackfillV1,
+      },
+      {
+        ack: expect.stringContaining(SyncEntityType.PartnerAssetExifBackfillV1),
+        data: {},
+        type: SyncEntityType.SyncAckV1,
+      },
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          assetId: asset2User3.id,
+        }),
+        type: SyncEntityType.PartnerAssetExifV1,
+      },
+    ]);
 
-    expect(backfillResponse).toHaveLength(3);
-    expect(backfillResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.stringMatching(new RegExp(`${SyncEntityType.PartnerAssetExifBackfillV1}\\|.+?\\|.+`)),
-          data: expect.objectContaining({
-            assetId: assetUser3.id,
-          }),
-          type: SyncEntityType.PartnerAssetExifBackfillV1,
-        },
-        {
-          ack: expect.stringContaining(SyncEntityType.PartnerAssetExifBackfillV1),
-          data: {},
-          type: SyncEntityType.SyncAckV1,
-        },
-        {
-          ack: expect.any(String),
-          data: expect.objectContaining({
-            assetId: asset2User3.id,
-          }),
-          type: SyncEntityType.PartnerAssetExifV1,
-        },
-      ]),
-    );
-
-    const backfillAck = backfillResponse[1].ack;
-    const partnerAssetAck = backfillResponse[2].ack;
-    await sut.setAcks(auth, { acks: [backfillAck, partnerAssetAck] });
-    const finalResponse = await testSync(auth, [SyncRequestType.PartnerAssetExifsV1]);
-
-    const finalAcks = finalResponse.map(({ ack }) => ack);
-    expect(finalAcks).toEqual([]);
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetExifsV1])).resolves.toEqual([]);
   });
 });
diff --git a/server/test/medium/specs/sync/sync-partner-asset.spec.ts b/server/test/medium/specs/sync/sync-partner-asset.spec.ts
index fe3d4edbcc..4faa2f6966 100644
--- a/server/test/medium/specs/sync/sync-partner-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-partner-asset.spec.ts
@@ -1,18 +1,19 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
-import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { AssetRepository } from 'src/repositories/asset.repository';
+import { PartnerRepository } from 'src/repositories/partner.repository';
+import { UserRepository } from 'src/repositories/user.repository';
+import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
 
 const setup = async (db?: Kysely<DB>) => {
-  const database = db || defaultDatabase;
-  const result = newSyncTest({ db: database });
-  const { auth, create } = newSyncAuthUser();
-  await create(database);
-  return { ...result, auth };
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
 };
 
 beforeAll(async () => {
@@ -21,19 +22,15 @@ beforeAll(async () => {
 
 describe(SyncRequestType.PartnerAssetsV1, () => {
   it('should detect and sync the first partner asset', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
 
     const originalFileName = 'firstPartnerAsset';
     const checksum = '1115vHcVkZzNp3Q9G+FEA0nu6zUbGb4Tj4UOXkN0wRA=';
     const thumbhash = '2225vHcVkZzNp3Q9G+FEA0nu6zUbGb4Tj4UOXkN0wRA=';
     const date = new Date().toISOString();
 
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({
+    const { user: user2 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({
       ownerId: user2.id,
       originalFileName,
       checksum: Buffer.from(checksum, 'base64'),
@@ -44,315 +41,217 @@ describe(SyncRequestType.PartnerAssetsV1, () => {
       deletedAt: null,
       duration: '0:10:00.00000',
     });
-    await assetRepo.create(asset);
 
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
 
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.PartnerAssetsV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            id: asset.id,
-            ownerId: asset.ownerId,
-            originalFileName,
-            thumbhash,
-            checksum,
-            deletedAt: null,
-            fileCreatedAt: date,
-            fileModifiedAt: date,
-            isFavorite: false,
-            localDateTime: date,
-            type: asset.type,
-            visibility: asset.visibility,
-            duration: asset.duration,
-          },
-          type: SyncEntityType.PartnerAssetV1,
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: asset.id,
+          ownerId: asset.ownerId,
+          originalFileName,
+          thumbhash,
+          checksum,
+          deletedAt: null,
+          fileCreatedAt: date,
+          fileModifiedAt: date,
+          isFavorite: false,
+          localDateTime: date,
+          type: asset.type,
+          visibility: asset.visibility,
+          duration: asset.duration,
         },
-      ]),
-    );
+        type: SyncEntityType.PartnerAssetV1,
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.PartnerAssetsV1]);
-
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toEqual([]);
   });
 
   it('should detect and sync a deleted partner asset', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const assetRepo = ctx.get(AssetRepository);
 
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-    const asset = mediumFactory.assetInsert({ ownerId: user2.id });
-
-    const assetRepo = getRepository('asset');
-    await assetRepo.create(asset);
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
+    const { user: user2 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
     await assetRepo.remove(asset);
 
-    const response = await testSync(auth, [SyncRequestType.PartnerAssetsV1]);
-
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1]);
     expect(response).toHaveLength(1);
-    expect(response).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            assetId: asset.id,
-          },
-          type: SyncEntityType.PartnerAssetDeleteV1,
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          assetId: asset.id,
         },
-      ]),
-    );
+        type: SyncEntityType.PartnerAssetDeleteV1,
+      },
+    ]);
 
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.PartnerAssetsV1]);
-
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toEqual([]);
   });
 
   it('should not sync a deleted partner asset due to a user delete', async () => {
-    const { auth, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    const assetRepo = getRepository('asset');
-    await assetRepo.create(mediumFactory.assetInsert({ ownerId: user2.id }));
+    const { auth, ctx } = await setup();
+    const userRepo = ctx.get(UserRepository);
 
+    const { user: user2 } = await ctx.newUser();
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
+    await ctx.newAsset({ ownerId: user2.id });
     await userRepo.delete({ id: user2.id }, true);
-
-    const response = await testSync(auth, [SyncRequestType.PartnerAssetsV1]);
-    expect(response).toHaveLength(0);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toEqual([]);
   });
 
   it('should not sync a deleted partner asset due to a partner delete (unshare)', async () => {
-    const { auth, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const assetRepo = getRepository('asset');
-    await assetRepo.create(mediumFactory.assetInsert({ ownerId: user2.id }));
-
-    const partnerRepo = getRepository('partner');
-    const partner = { sharedById: user2.id, sharedWithId: auth.user.id };
-    await partnerRepo.create(partner);
-
-    await expect(testSync(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(1);
+    const { auth, ctx } = await setup();
+    const partnerRepo = ctx.get(PartnerRepository);
 
+    const { user: user2 } = await ctx.newUser();
+    await ctx.newAsset({ ownerId: user2.id });
+    const { partner } = await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(1);
     await partnerRepo.remove(partner);
-
-    await expect(testSync(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(0);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toEqual([]);
   });
 
   it('should not sync an asset or asset delete for own user', async () => {
-    const { auth, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
+    const assetRepo = ctx.get(AssetRepository);
 
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
+    const { user: user2 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
 
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: auth.user.id });
-    await assetRepo.create(asset);
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    await expect(testSync(auth, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
-    await expect(testSync(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(0);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(0);
 
     await assetRepo.remove(asset);
 
-    await expect(testSync(auth, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
-    await expect(testSync(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(0);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(0);
   });
 
   it('should not sync an asset or asset delete for unrelated user', async () => {
-    const { auth, getRepository, testSync } = await setup();
-
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const sessionRepo = getRepository('session');
-    const session = mediumFactory.sessionInsert({ userId: user2.id });
-    await sessionRepo.create(session);
+    const { auth, ctx } = await setup();
+    const assetRepo = ctx.get(AssetRepository);
 
+    const { user: user2 } = await ctx.newUser();
+    const { session } = await ctx.newSession({ userId: user2.id });
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
     const auth2 = factory.auth({ session, user: user2 });
 
-    const assetRepo = getRepository('asset');
-    const asset = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(asset);
-
-    await expect(testSync(auth2, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
-    await expect(testSync(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(0);
+    await expect(ctx.syncStream(auth2, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(0);
 
     await assetRepo.remove(asset);
 
-    await expect(testSync(auth2, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
-    await expect(testSync(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(0);
+    await expect(ctx.syncStream(auth2, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toHaveLength(0);
   });
 
   it('should backfill partner assets when a partner shared their library with you', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
 
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    const user3 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-    await userRepo.create(user3);
-
-    const assetRepo = getRepository('asset');
-    const assetUser3 = mediumFactory.assetInsert({ ownerId: user3.id });
-    const assetUser2 = mediumFactory.assetInsert({ ownerId: user2.id });
-    await assetRepo.create(assetUser3);
+    const { user: user2 } = await ctx.newUser();
+    const { user: user3 } = await ctx.newUser();
+    const { asset: assetUser3 } = await ctx.newAsset({ ownerId: user3.id });
     await wait(2);
-    await assetRepo.create(assetUser2);
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    const response = await testSync(auth, [SyncRequestType.PartnerAssetsV1]);
+    const { asset: assetUser2 } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
 
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1]);
     expect(response).toHaveLength(1);
-    expect(response).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: expect.objectContaining({
-            id: assetUser2.id,
-          }),
-          type: SyncEntityType.PartnerAssetV1,
-        },
-      ]),
-    );
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: assetUser2.id,
+        }),
+        type: SyncEntityType.PartnerAssetV1,
+      },
+    ]);
 
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
+    await ctx.syncAckAll(auth, response);
+    await ctx.newPartner({ sharedById: user3.id, sharedWithId: auth.user.id });
 
-    await partnerRepo.create({ sharedById: user3.id, sharedWithId: auth.user.id });
-    const backfillResponse = await testSync(auth, [SyncRequestType.PartnerAssetsV1]);
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1]);
+    expect(newResponse).toHaveLength(2);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: assetUser3.id,
+        }),
+        type: SyncEntityType.PartnerAssetBackfillV1,
+      },
+      {
+        ack: expect.stringContaining(SyncEntityType.PartnerAssetBackfillV1),
+        data: {},
+        type: SyncEntityType.SyncAckV1,
+      },
+    ]);
 
-    expect(backfillResponse).toHaveLength(2);
-    expect(backfillResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: expect.objectContaining({
-            id: assetUser3.id,
-          }),
-          type: SyncEntityType.PartnerAssetBackfillV1,
-        },
-        {
-          ack: expect.stringContaining(SyncEntityType.PartnerAssetBackfillV1),
-          data: {},
-          type: SyncEntityType.SyncAckV1,
-        },
-      ]),
-    );
-
-    const backfillAck = backfillResponse[1].ack;
-    await sut.setAcks(auth, { acks: [backfillAck] });
-
-    const finalResponse = await testSync(auth, [SyncRequestType.PartnerAssetsV1]);
-
-    const finalAcks = finalResponse.map(({ ack }) => ack);
-    expect(finalAcks).toEqual([]);
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toEqual([]);
   });
 
   it('should only backfill partner assets created prior to the current partner asset checkpoint', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
 
-    const userRepo = getRepository('user');
-    const user2 = mediumFactory.userInsert();
-    const user3 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-    await userRepo.create(user3);
-
-    const assetRepo = getRepository('asset');
-    const assetUser3 = mediumFactory.assetInsert({ ownerId: user3.id });
-    const assetUser2 = mediumFactory.assetInsert({ ownerId: user2.id });
-    const asset2User3 = mediumFactory.assetInsert({ ownerId: user3.id });
-    await assetRepo.create(assetUser3);
+    const { user: user2 } = await ctx.newUser();
+    const { user: user3 } = await ctx.newUser();
+    const { asset: assetUser3 } = await ctx.newAsset({ ownerId: user3.id });
     await wait(2);
-    await assetRepo.create(assetUser2);
+    const { asset: assetUser2 } = await ctx.newAsset({ ownerId: user2.id });
     await wait(2);
-    await assetRepo.create(asset2User3);
-
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    const response = await testSync(auth, [SyncRequestType.PartnerAssetsV1]);
+    const { asset: asset2User3 } = await ctx.newAsset({ ownerId: user3.id });
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
 
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1]);
     expect(response).toHaveLength(1);
-    expect(response).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: expect.objectContaining({
-            id: assetUser2.id,
-          }),
-          type: SyncEntityType.PartnerAssetV1,
-        },
-      ]),
-    );
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: assetUser2.id,
+        }),
+        type: SyncEntityType.PartnerAssetV1,
+      },
+    ]);
+    await ctx.syncAckAll(auth, response);
 
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
+    await ctx.newPartner({ sharedById: user3.id, sharedWithId: auth.user.id });
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1]);
+    expect(newResponse).toHaveLength(3);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: assetUser3.id,
+        }),
+        type: SyncEntityType.PartnerAssetBackfillV1,
+      },
+      {
+        ack: expect.stringContaining(SyncEntityType.PartnerAssetBackfillV1),
+        data: {},
+        type: SyncEntityType.SyncAckV1,
+      },
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: asset2User3.id,
+        }),
+        type: SyncEntityType.PartnerAssetV1,
+      },
+    ]);
 
-    await partnerRepo.create({ sharedById: user3.id, sharedWithId: auth.user.id });
-    const backfillResponse = await testSync(auth, [SyncRequestType.PartnerAssetsV1]);
-
-    expect(backfillResponse).toHaveLength(3);
-    expect(backfillResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: expect.objectContaining({
-            id: assetUser3.id,
-          }),
-          type: SyncEntityType.PartnerAssetBackfillV1,
-        },
-        {
-          ack: expect.stringContaining(SyncEntityType.PartnerAssetBackfillV1),
-          data: {},
-          type: SyncEntityType.SyncAckV1,
-        },
-        {
-          ack: expect.any(String),
-          data: expect.objectContaining({
-            id: asset2User3.id,
-          }),
-          type: SyncEntityType.PartnerAssetV1,
-        },
-      ]),
-    );
-
-    const backfillAck = backfillResponse[1].ack;
-    const partnerAssetAck = backfillResponse[2].ack;
-    await sut.setAcks(auth, { acks: [backfillAck, partnerAssetAck] });
-
-    const finalResponse = await testSync(auth, [SyncRequestType.PartnerAssetsV1]);
-
-    const finalAcks = finalResponse.map(({ ack }) => ack);
-    expect(finalAcks).toEqual([]);
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV1])).resolves.toEqual([]);
   });
 });
diff --git a/server/test/medium/specs/sync/sync-partner.spec.ts b/server/test/medium/specs/sync/sync-partner.spec.ts
index f262eec853..11d843243d 100644
--- a/server/test/medium/specs/sync/sync-partner.spec.ts
+++ b/server/test/medium/specs/sync/sync-partner.spec.ts
@@ -1,75 +1,58 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
-import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { PartnerRepository } from 'src/repositories/partner.repository';
+import { UserRepository } from 'src/repositories/user.repository';
+import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
 
 const setup = async (db?: Kysely<DB>) => {
-  const database = db || defaultDatabase;
-  const result = newSyncTest({ db: database });
-  const { auth, create } = newSyncAuthUser();
-  await create(database);
-  return { ...result, auth };
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
 };
 
 beforeAll(async () => {
   defaultDatabase = await getKyselyDB();
 });
 
-describe.concurrent(SyncEntityType.PartnerV1, () => {
+describe(SyncEntityType.PartnerV1, () => {
   it('should detect and sync the first partner', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, user: user1, ctx } = await setup();
 
-    const user1 = auth.user;
-    const userRepo = getRepository('user');
-    const partnerRepo = getRepository('partner');
+    const { user: user2 } = await ctx.newUser();
+    const { partner } = await ctx.newPartner({ sharedById: user2.id, sharedWithId: user1.id });
 
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
-
-    const partner = await partnerRepo.create({ sharedById: user2.id, sharedWithId: user1.id });
-
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.PartnersV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            inTimeline: partner.inTimeline,
-            sharedById: partner.sharedById,
-            sharedWithId: partner.sharedWithId,
-          },
-          type: 'PartnerV1',
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnersV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          inTimeline: partner.inTimeline,
+          sharedById: partner.sharedById,
+          sharedWithId: partner.sharedWithId,
         },
-      ]),
-    );
+        type: 'PartnerV1',
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.PartnersV1]);
-
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnersV1])).resolves.toEqual([]);
   });
 
   it('should detect and sync a deleted partner', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, user: user1, ctx } = await setup();
 
-    const userRepo = getRepository('user');
-    const user1 = auth.user;
-    const user2 = mediumFactory.userInsert();
-    await userRepo.create(user2);
+    const partnerRepo = ctx.get(PartnerRepository);
 
-    const partnerRepo = getRepository('partner');
-    const partner = await partnerRepo.create({ sharedById: user2.id, sharedWithId: user1.id });
+    const { user: user2 } = await ctx.newUser();
+    const { partner } = await ctx.newPartner({ sharedById: user2.id, sharedWithId: user1.id });
     await partnerRepo.remove(partner);
 
-    const response = await testSync(auth, [SyncRequestType.PartnersV1]);
-
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnersV1]);
     expect(response).toHaveLength(1);
     expect(response).toEqual(
       expect.arrayContaining([
@@ -84,27 +67,18 @@ describe.concurrent(SyncEntityType.PartnerV1, () => {
       ]),
     );
 
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.PartnersV1]);
-
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnersV1])).resolves.toEqual([]);
   });
 
   it('should detect and sync a partner share both to and from another user', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, user: user1, ctx } = await setup();
 
-    const userRepo = getRepository('user');
-    const user1 = auth.user;
-    const user2 = await userRepo.create(mediumFactory.userInsert());
-
-    const partnerRepo = getRepository('partner');
-    const partner1 = await partnerRepo.create({ sharedById: user2.id, sharedWithId: user1.id });
-    const partner2 = await partnerRepo.create({ sharedById: user1.id, sharedWithId: user2.id });
-
-    const response = await testSync(auth, [SyncRequestType.PartnersV1]);
+    const { user: user2 } = await ctx.newUser();
+    const { partner: partner1 } = await ctx.newPartner({ sharedById: user2.id, sharedWithId: user1.id });
+    const { partner: partner2 } = await ctx.newPartner({ sharedById: user1.id, sharedWithId: user2.id });
 
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnersV1]);
     expect(response).toHaveLength(2);
     expect(response).toEqual(
       expect.arrayContaining([
@@ -129,93 +103,80 @@ describe.concurrent(SyncEntityType.PartnerV1, () => {
       ]),
     );
 
-    await sut.setAcks(auth, { acks: [response[1].ack] });
-
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.PartnersV1]);
-
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnersV1])).resolves.toEqual([]);
   });
 
   it('should sync a partner and then an update to that same partner', async () => {
-    const { auth, sut, getRepository, testSync } = await setup();
+    const { auth, user: user1, ctx } = await setup();
 
-    const userRepo = getRepository('user');
-    const user1 = auth.user;
-    const user2 = await userRepo.create(mediumFactory.userInsert());
+    const partnerRepo = ctx.get(PartnerRepository);
 
-    const partnerRepo = getRepository('partner');
-    const partner = await partnerRepo.create({ sharedById: user2.id, sharedWithId: user1.id });
+    const { user: user2 } = await ctx.newUser();
+    const { partner } = await ctx.newPartner({ sharedById: user2.id, sharedWithId: user1.id });
 
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.PartnersV1]);
-
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            inTimeline: partner.inTimeline,
-            sharedById: partner.sharedById,
-            sharedWithId: partner.sharedWithId,
-          },
-          type: 'PartnerV1',
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnersV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          inTimeline: partner.inTimeline,
+          sharedById: partner.sharedById,
+          sharedWithId: partner.sharedWithId,
         },
-      ]),
-    );
+        type: 'PartnerV1',
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
+    await ctx.syncAckAll(auth, response);
 
     const updated = await partnerRepo.update(
       { sharedById: partner.sharedById, sharedWithId: partner.sharedWithId },
       { inTimeline: true },
     );
 
-    const updatedSyncResponse = await testSync(auth, [SyncRequestType.PartnersV1]);
-
-    expect(updatedSyncResponse).toHaveLength(1);
-    expect(updatedSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            inTimeline: updated.inTimeline,
-            sharedById: updated.sharedById,
-            sharedWithId: updated.sharedWithId,
-          },
-          type: 'PartnerV1',
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.PartnersV1]);
+    expect(newResponse).toHaveLength(1);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          inTimeline: updated.inTimeline,
+          sharedById: updated.sharedById,
+          sharedWithId: updated.sharedWithId,
         },
-      ]),
-    );
+        type: 'PartnerV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnersV1])).resolves.toEqual([]);
   });
 
   it('should not sync a partner or partner delete for an unrelated user', async () => {
-    const { auth, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
 
-    const userRepo = getRepository('user');
-    const user2 = await userRepo.create(mediumFactory.userInsert());
-    const user3 = await userRepo.create(mediumFactory.userInsert());
+    const partnerRepo = ctx.get(PartnerRepository);
 
-    const partnerRepo = getRepository('partner');
-    const partner = await partnerRepo.create({ sharedById: user2.id, sharedWithId: user3.id });
-
-    expect(await testSync(auth, [SyncRequestType.PartnersV1])).toHaveLength(0);
+    const { user: user2 } = await ctx.newUser();
+    const { user: user3 } = await ctx.newUser();
+    const { partner } = await ctx.newPartner({ sharedById: user2.id, sharedWithId: user3.id });
 
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnersV1])).resolves.toEqual([]);
     await partnerRepo.remove(partner);
-
-    expect(await testSync(auth, [SyncRequestType.PartnersV1])).toHaveLength(0);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnersV1])).resolves.toEqual([]);
   });
 
   it('should not sync a partner delete after a user is deleted', async () => {
-    const { auth, getRepository, testSync } = await setup();
+    const { auth, ctx } = await setup();
 
-    const userRepo = getRepository('user');
-    const user2 = await userRepo.create(mediumFactory.userInsert());
+    const userRepo = ctx.get(UserRepository);
 
-    const partnerRepo = getRepository('partner');
-    await partnerRepo.create({ sharedById: user2.id, sharedWithId: auth.user.id });
+    const { user: user2 } = await ctx.newUser();
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
     await userRepo.delete({ id: user2.id }, true);
 
-    expect(await testSync(auth, [SyncRequestType.PartnersV1])).toHaveLength(0);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnersV1])).resolves.toEqual([]);
   });
 });
diff --git a/server/test/medium/specs/sync/sync-user.spec.ts b/server/test/medium/specs/sync/sync-user.spec.ts
index 2cea38267c..10a06bd9f7 100644
--- a/server/test/medium/specs/sync/sync-user.spec.ts
+++ b/server/test/medium/specs/sync/sync-user.spec.ts
@@ -1,36 +1,35 @@
 import { Kysely } from 'kysely';
 import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
-import { mediumFactory, newSyncAuthUser, newSyncTest } from 'test/medium.factory';
+import { UserRepository } from 'src/repositories/user.repository';
+import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
 
 const setup = async (db?: Kysely<DB>) => {
-  const database = db || defaultDatabase;
-  const result = newSyncTest({ db: database });
-  const { auth, create } = newSyncAuthUser();
-  await create(database);
-  return { ...result, auth };
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
 };
 
 beforeAll(async () => {
   defaultDatabase = await getKyselyDB();
 });
 
-describe.concurrent(SyncEntityType.UserV1, () => {
+describe(SyncEntityType.UserV1, () => {
   it('should detect and sync the first user', async () => {
-    const { auth, sut, getRepository, testSync } = await setup(await getKyselyDB());
+    const { auth, ctx } = await setup(await getKyselyDB());
 
-    const userRepo = getRepository('user');
+    const userRepo = ctx.get(UserRepository);
     const user = await userRepo.get(auth.user.id, { withDeleted: false });
     if (!user) {
       expect.fail('First user should exist');
     }
 
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.UsersV1]);
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual([
+    const response = await ctx.syncStream(auth, [SyncRequestType.UsersV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
       {
         ack: expect.any(String),
         data: {
@@ -43,21 +42,17 @@ describe.concurrent(SyncEntityType.UserV1, () => {
       },
     ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.UsersV1]);
-
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.UsersV1])).resolves.toEqual([]);
   });
 
   it('should detect and sync a soft deleted user', async () => {
-    const { auth, sut, getRepository, testSync } = await setup(await getKyselyDB());
+    const { auth, ctx } = await setup(await getKyselyDB());
 
     const deletedAt = new Date().toISOString();
-    const deletedUser = mediumFactory.userInsert({ deletedAt });
-    const deleted = await getRepository('user').create(deletedUser);
+    const { user: deleted } = await ctx.newUser({ deletedAt });
 
-    const response = await testSync(auth, [SyncRequestType.UsersV1]);
+    const response = await ctx.syncStream(auth, [SyncRequestType.UsersV1]);
 
     expect(response).toHaveLength(2);
     expect(response).toEqual(
@@ -85,95 +80,81 @@ describe.concurrent(SyncEntityType.UserV1, () => {
       ]),
     );
 
-    const acks = [response[1].ack];
-    await sut.setAcks(auth, { acks });
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.UsersV1]);
-
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.UsersV1])).resolves.toEqual([]);
   });
 
   it('should detect and sync a deleted user', async () => {
-    const { auth, sut, getRepository, testSync } = await setup(await getKyselyDB());
+    const { auth, ctx } = await setup(await getKyselyDB());
 
-    const userRepo = getRepository('user');
-    const user = mediumFactory.userInsert();
-    await userRepo.create(user);
+    const userRepo = ctx.get(UserRepository);
+
+    const { user } = await ctx.newUser();
     await userRepo.delete({ id: user.id }, true);
 
-    const response = await testSync(auth, [SyncRequestType.UsersV1]);
-
+    const response = await ctx.syncStream(auth, [SyncRequestType.UsersV1]);
     expect(response).toHaveLength(2);
-    expect(response).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            userId: user.id,
-          },
-          type: 'UserDeleteV1',
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          userId: user.id,
         },
-        {
-          ack: expect.any(String),
-          data: {
-            deletedAt: null,
-            email: auth.user.email,
-            id: auth.user.id,
-            name: auth.user.name,
-          },
-          type: 'UserV1',
+        type: 'UserDeleteV1',
+      },
+      {
+        ack: expect.any(String),
+        data: {
+          deletedAt: null,
+          email: auth.user.email,
+          id: auth.user.id,
+          name: auth.user.name,
         },
-      ]),
-    );
+        type: 'UserV1',
+      },
+    ]);
 
-    const acks = response.map(({ ack }) => ack);
-    await sut.setAcks(auth, { acks });
-    const ackSyncResponse = await testSync(auth, [SyncRequestType.UsersV1]);
-
-    expect(ackSyncResponse).toHaveLength(0);
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.UsersV1])).resolves.toEqual([]);
   });
 
   it('should sync a user and then an update to that same user', async () => {
-    const { auth, sut, getRepository, testSync } = await setup(await getKyselyDB());
+    const { auth, ctx } = await setup(await getKyselyDB());
 
-    const initialSyncResponse = await testSync(auth, [SyncRequestType.UsersV1]);
+    const userRepo = ctx.get(UserRepository);
 
-    expect(initialSyncResponse).toHaveLength(1);
-    expect(initialSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            deletedAt: null,
-            email: auth.user.email,
-            id: auth.user.id,
-            name: auth.user.name,
-          },
-          type: 'UserV1',
+    const response = await ctx.syncStream(auth, [SyncRequestType.UsersV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          deletedAt: null,
+          email: auth.user.email,
+          id: auth.user.id,
+          name: auth.user.name,
         },
-      ]),
-    );
+        type: 'UserV1',
+      },
+    ]);
 
-    const acks = [initialSyncResponse[0].ack];
-    await sut.setAcks(auth, { acks });
+    await ctx.syncAckAll(auth, response);
 
-    const userRepo = getRepository('user');
     const updated = await userRepo.update(auth.user.id, { name: 'new name' });
-    const updatedSyncResponse = await testSync(auth, [SyncRequestType.UsersV1]);
 
-    expect(updatedSyncResponse).toHaveLength(1);
-    expect(updatedSyncResponse).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            deletedAt: null,
-            email: auth.user.email,
-            id: auth.user.id,
-            name: updated.name,
-          },
-          type: 'UserV1',
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.UsersV1]);
+    expect(newResponse).toHaveLength(1);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          deletedAt: null,
+          email: auth.user.email,
+          id: auth.user.id,
+          name: updated.name,
         },
-      ]),
-    );
+        type: 'UserV1',
+      },
+    ]);
   });
 });

From 6fed22340520aa3c7f1ef34e07224527c6205294 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Thu, 26 Jun 2025 15:41:48 -0400
Subject: [PATCH 069/337] fix: array-max-length (#19562)

---
 open-api/immich-openapi-specs.json            |  2 +-
 .../src/controllers/sync.controller.spec.ts   | 84 +++++++++++++++++++
 server/src/dtos/sync.dto.ts                   |  4 +-
 3 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 server/src/controllers/sync.controller.spec.ts

diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 9ac60e2a54..79b019bb2d 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13425,9 +13425,9 @@
         "properties": {
           "acks": {
             "items": {
-              "maxLength": 1000,
               "type": "string"
             },
+            "maxItems": 1000,
             "type": "array"
           }
         },
diff --git a/server/src/controllers/sync.controller.spec.ts b/server/src/controllers/sync.controller.spec.ts
new file mode 100644
index 0000000000..c1f19ddd66
--- /dev/null
+++ b/server/src/controllers/sync.controller.spec.ts
@@ -0,0 +1,84 @@
+import { SyncController } from 'src/controllers/sync.controller';
+import { GlobalExceptionFilter } from 'src/middleware/global-exception.filter';
+import { SyncService } from 'src/services/sync.service';
+import request from 'supertest';
+import { errorDto } from 'test/medium/responses';
+import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils';
+
+describe(SyncController.name, () => {
+  let ctx: ControllerContext;
+  const syncService = mockBaseService(SyncService);
+  const errorService = { handleError: vi.fn() };
+
+  beforeAll(async () => {
+    ctx = await controllerSetup(SyncController, [
+      { provide: SyncService, useValue: syncService },
+      { provide: GlobalExceptionFilter, useValue: errorService },
+    ]);
+    return () => ctx.close();
+  });
+
+  beforeEach(() => {
+    syncService.resetAllMocks();
+    errorService.handleError.mockReset();
+    ctx.reset();
+  });
+
+  describe('POST /sync/stream', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).post('/sync/stream');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it('should require sync request type enums', async () => {
+      const { status, body } = await request(ctx.getHttpServer())
+        .post('/sync/stream')
+        .send({ types: ['invalid'] });
+      expect(status).toBe(400);
+      expect(body).toEqual(
+        errorDto.badRequest([expect.stringContaining('each value in types must be one of the following values')]),
+      );
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+  });
+
+  describe('GET /sync/ack', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).get('/sync/ack');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+  });
+
+  describe('POST /sync/ack', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).post('/sync/ack');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it('should not allow more than 1,000 entries', async () => {
+      const acks = Array.from({ length: 1001 }, (_, i) => `ack-${i}`);
+      const { status, body } = await request(ctx.getHttpServer()).post('/sync/ack').send({ acks });
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest(['acks must contain no more than 1000 elements']));
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+  });
+
+  describe('DELETE /sync/ack', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).delete('/sync/ack');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it('should require sync response type enums', async () => {
+      const { status, body } = await request(ctx.getHttpServer())
+        .delete('/sync/ack')
+        .send({ types: ['invalid'] });
+      expect(status).toBe(400);
+      expect(body).toEqual(
+        errorDto.badRequest([expect.stringContaining('each value in types must be one of the following values')]),
+      );
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index 7a15c2e456..d467791825 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsInt, IsPositive, IsString, MaxLength } from 'class-validator';
+import { ArrayMaxSize, IsEnum, IsInt, IsPositive, IsString } from 'class-validator';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AlbumUserRole, AssetOrder, AssetType, AssetVisibility, SyncEntityType, SyncRequestType } from 'src/enum';
 import { Optional, ValidateDate, ValidateUUID } from 'src/validation';
@@ -217,7 +217,7 @@ export class SyncAckDto {
 }
 
 export class SyncAckSetDto {
-  @MaxLength(1000)
+  @ArrayMaxSize(1000)
   @IsString({ each: true })
   acks!: string[];
 }

From 6c6a32c63e371d9cd3f5220aa6a4f7d94224af77 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Thu, 26 Jun 2025 19:52:10 -0400
Subject: [PATCH 070/337] refactor: memory medium tests (#19568)

---
 e2e/src/api/specs/memory.e2e-spec.ts          | 203 +-----------------
 .../src/controllers/memory.controller.spec.ts | 132 ++++++++++++
 .../specs/services/memory.service.spec.ts     |  73 ++++++-
 3 files changed, 206 insertions(+), 202 deletions(-)
 create mode 100644 server/src/controllers/memory.controller.spec.ts

diff --git a/e2e/src/api/specs/memory.e2e-spec.ts b/e2e/src/api/specs/memory.e2e-spec.ts
index d91a570f77..e5e2351738 100644
--- a/e2e/src/api/specs/memory.e2e-spec.ts
+++ b/e2e/src/api/specs/memory.e2e-spec.ts
@@ -6,7 +6,7 @@ import {
   createMemory,
   getMemory,
 } from '@immich/sdk';
-import { createUserDto, uuidDto } from 'src/fixtures';
+import { createUserDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
 import { app, asBearerAuth, utils } from 'src/utils';
 import request from 'supertest';
@@ -17,7 +17,6 @@ describe('/memories', () => {
   let user: LoginResponseDto;
   let adminAsset: AssetMediaResponseDto;
   let userAsset1: AssetMediaResponseDto;
-  let userAsset2: AssetMediaResponseDto;
   let userMemory: MemoryResponseDto;
 
   beforeAll(async () => {
@@ -25,10 +24,9 @@ describe('/memories', () => {
 
     admin = await utils.adminSetup();
     user = await utils.userSetup(admin.accessToken, createUserDto.user1);
-    [adminAsset, userAsset1, userAsset2] = await Promise.all([
+    [adminAsset, userAsset1] = await Promise.all([
       utils.createAsset(admin.accessToken),
       utils.createAsset(user.accessToken),
-      utils.createAsset(user.accessToken),
     ]);
     userMemory = await createMemory(
       {
@@ -43,121 +41,7 @@ describe('/memories', () => {
     );
   });
 
-  describe('GET /memories', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/memories');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-  });
-
-  describe('POST /memories', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/memories');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should validate data when type is on this day', async () => {
-      const { status, body } = await request(app)
-        .post('/memories')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({
-          type: 'on_this_day',
-          data: {},
-          memoryAt: new Date(2021).toISOString(),
-        });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.badRequest(['data.year must be a positive number', 'data.year must be an integer number']),
-      );
-    });
-
-    it('should create a new memory', async () => {
-      const { status, body } = await request(app)
-        .post('/memories')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({
-          type: 'on_this_day',
-          data: { year: 2021 },
-          memoryAt: new Date(2021).toISOString(),
-        });
-
-      expect(status).toBe(201);
-      expect(body).toEqual({
-        id: expect.any(String),
-        type: 'on_this_day',
-        data: { year: 2021 },
-        createdAt: expect.any(String),
-        updatedAt: expect.any(String),
-        isSaved: false,
-        memoryAt: expect.any(String),
-        ownerId: user.userId,
-        assets: [],
-      });
-    });
-
-    it('should create a new memory (with assets)', async () => {
-      const { status, body } = await request(app)
-        .post('/memories')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({
-          type: 'on_this_day',
-          data: { year: 2021 },
-          memoryAt: new Date(2021).toISOString(),
-          assetIds: [userAsset1.id, userAsset2.id],
-        });
-
-      expect(status).toBe(201);
-      expect(body).toMatchObject({
-        id: expect.any(String),
-        assets: expect.arrayContaining([
-          expect.objectContaining({ id: userAsset1.id }),
-          expect.objectContaining({ id: userAsset2.id }),
-        ]),
-      });
-      expect(body.assets).toHaveLength(2);
-    });
-
-    it('should create a new memory and ignore assets the user does not have access to', async () => {
-      const { status, body } = await request(app)
-        .post('/memories')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({
-          type: 'on_this_day',
-          data: { year: 2021 },
-          memoryAt: new Date(2021).toISOString(),
-          assetIds: [userAsset1.id, adminAsset.id],
-        });
-
-      expect(status).toBe(201);
-      expect(body).toMatchObject({
-        id: expect.any(String),
-        assets: [expect.objectContaining({ id: userAsset1.id })],
-      });
-      expect(body.assets).toHaveLength(1);
-    });
-  });
-
   describe('GET /memories/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/memories/${uuidDto.invalid}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .get(`/memories/${uuidDto.invalid}`)
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
     it('should require access', async () => {
       const { status, body } = await request(app)
         .get(`/memories/${userMemory.id}`)
@@ -176,22 +60,6 @@ describe('/memories', () => {
   });
 
   describe('PUT /memories/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/memories/${uuidDto.invalid}`).send({ isSaved: true });
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .put(`/memories/${uuidDto.invalid}`)
-        .send({ isSaved: true })
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
     it('should require access', async () => {
       const { status, body } = await request(app)
         .put(`/memories/${userMemory.id}`)
@@ -218,23 +86,6 @@ describe('/memories', () => {
   });
 
   describe('PUT /memories/:id/assets', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app)
-        .put(`/memories/${userMemory.id}/assets`)
-        .send({ ids: [userAsset1.id] });
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .put(`/memories/${uuidDto.invalid}/assets`)
-        .send({ ids: [userAsset1.id] })
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
     it('should require access', async () => {
       const { status, body } = await request(app)
         .put(`/memories/${userMemory.id}/assets`)
@@ -244,15 +95,6 @@ describe('/memories', () => {
       expect(body).toEqual(errorDto.noPermission);
     });
 
-    it('should require a valid asset id', async () => {
-      const { status, body } = await request(app)
-        .put(`/memories/${userMemory.id}/assets`)
-        .send({ ids: [uuidDto.invalid] })
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['each value in ids must be a UUID']));
-    });
-
     it('should require asset access', async () => {
       const { status, body } = await request(app)
         .put(`/memories/${userMemory.id}/assets`)
@@ -279,23 +121,6 @@ describe('/memories', () => {
   });
 
   describe('DELETE /memories/:id/assets', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app)
-        .delete(`/memories/${userMemory.id}/assets`)
-        .send({ ids: [userAsset1.id] });
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .delete(`/memories/${uuidDto.invalid}/assets`)
-        .send({ ids: [userAsset1.id] })
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
     it('should require access', async () => {
       const { status, body } = await request(app)
         .delete(`/memories/${userMemory.id}/assets`)
@@ -305,15 +130,6 @@ describe('/memories', () => {
       expect(body).toEqual(errorDto.noPermission);
     });
 
-    it('should require a valid asset id', async () => {
-      const { status, body } = await request(app)
-        .delete(`/memories/${userMemory.id}/assets`)
-        .send({ ids: [uuidDto.invalid] })
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['each value in ids must be a UUID']));
-    });
-
     it('should only remove assets in the memory', async () => {
       const { status, body } = await request(app)
         .delete(`/memories/${userMemory.id}/assets`)
@@ -340,21 +156,6 @@ describe('/memories', () => {
   });
 
   describe('DELETE /memories/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/memories/${uuidDto.invalid}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .delete(`/memories/${uuidDto.invalid}`)
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
     it('should require access', async () => {
       const { status, body } = await request(app)
         .delete(`/memories/${userMemory.id}`)
diff --git a/server/src/controllers/memory.controller.spec.ts b/server/src/controllers/memory.controller.spec.ts
new file mode 100644
index 0000000000..ac96e54a5b
--- /dev/null
+++ b/server/src/controllers/memory.controller.spec.ts
@@ -0,0 +1,132 @@
+import { MemoryController } from 'src/controllers/memory.controller';
+import { MemoryService } from 'src/services/memory.service';
+import request from 'supertest';
+import { errorDto } from 'test/medium/responses';
+import { factory } from 'test/small.factory';
+import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils';
+
+describe(MemoryController.name, () => {
+  let ctx: ControllerContext;
+  const service = mockBaseService(MemoryService);
+
+  beforeAll(async () => {
+    ctx = await controllerSetup(MemoryController, [{ provide: MemoryService, useValue: service }]);
+    return () => ctx.close();
+  });
+
+  beforeEach(() => {
+    service.resetAllMocks();
+    ctx.reset();
+  });
+
+  describe('GET /memories', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).get('/memories');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+  });
+
+  describe('POST /memories', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).post('/memories');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it('should validate data when type is on this day', async () => {
+      const { status, body } = await request(ctx.getHttpServer())
+        .post('/memories')
+        .send({
+          type: 'on_this_day',
+          data: {},
+          memoryAt: new Date(2021).toISOString(),
+        });
+
+      expect(status).toBe(400);
+      expect(body).toEqual(
+        errorDto.badRequest(['data.year must be a positive number', 'data.year must be an integer number']),
+      );
+    });
+  });
+
+  describe('GET /memories/statistics', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).get('/memories/statistics');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+  });
+
+  describe('GET /memories/:id', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).get(`/memories/${factory.uuid()}`);
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it('should require a valid id', async () => {
+      const { status, body } = await request(ctx.getHttpServer()).get(`/memories/invalid`);
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
+    });
+  });
+
+  describe('PUT /memories/:id', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).put(`/memories/${factory.uuid()}`);
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it('should require a valid id', async () => {
+      const { status, body } = await request(ctx.getHttpServer()).put(`/memories/invalid`);
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
+    });
+  });
+
+  describe('DELETE /memories/:id', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).delete(`/memories/${factory.uuid()}`);
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+  });
+
+  describe('PUT /memories/:id/assets', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).put(`/memories/${factory.uuid()}/assets`);
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it('should require a valid id', async () => {
+      const { status, body } = await request(ctx.getHttpServer()).put(`/memories/invalid/assets`).send({ ids: [] });
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
+    });
+
+    it('should require a valid asset id', async () => {
+      const { status, body } = await request(ctx.getHttpServer())
+        .put(`/memories/${factory.uuid()}/assets`)
+        .send({ ids: ['invalid'] });
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest(['each value in ids must be a UUID']));
+    });
+  });
+
+  describe('DELETE /memories/:id/assets', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).delete(`/memories/${factory.uuid()}/assets`);
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    it('should require a valid id', async () => {
+      const { status, body } = await request(ctx.getHttpServer()).delete(`/memories/invalid/assets`);
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
+    });
+
+    it('should require a valid asset id', async () => {
+      const { status, body } = await request(ctx.getHttpServer())
+        .delete(`/memories/${factory.uuid()}/assets`)
+        .send({ ids: ['invalid'] });
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest(['each value in ids must be a UUID']));
+    });
+  });
+});
diff --git a/server/test/medium/specs/services/memory.service.spec.ts b/server/test/medium/specs/services/memory.service.spec.ts
index ff7249d930..53ab970d47 100644
--- a/server/test/medium/specs/services/memory.service.spec.ts
+++ b/server/test/medium/specs/services/memory.service.spec.ts
@@ -1,7 +1,8 @@
 import { Kysely } from 'kysely';
 import { DateTime } from 'luxon';
 import { DB } from 'src/db';
-import { AssetFileType } from 'src/enum';
+import { AssetFileType, MemoryType } from 'src/enum';
+import { AccessRepository } from 'src/repositories/access.repository';
 import { AssetRepository } from 'src/repositories/asset.repository';
 import { DatabaseRepository } from 'src/repositories/database.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
@@ -11,6 +12,7 @@ import { SystemMetadataRepository } from 'src/repositories/system-metadata.repos
 import { UserRepository } from 'src/repositories/user.repository';
 import { MemoryService } from 'src/services/memory.service';
 import { newMediumService } from 'test/medium.factory';
+import { factory } from 'test/small.factory';
 import { getKyselyDB } from 'test/utils';
 
 let defaultDatabase: Kysely<DB>;
@@ -19,6 +21,7 @@ const setup = (db?: Kysely<DB>) => {
   return newMediumService(MemoryService, {
     database: db || defaultDatabase,
     real: [
+      AccessRepository,
       AssetRepository,
       DatabaseRepository,
       MemoryRepository,
@@ -36,6 +39,74 @@ describe(MemoryService.name, () => {
     defaultDatabase = await getKyselyDB();
   });
 
+  describe('create', () => {
+    it('should create a new memory', async () => {
+      const { sut, ctx } = setup();
+      const { user } = await ctx.newUser();
+      const auth = factory.auth({ user });
+      const dto = {
+        type: MemoryType.ON_THIS_DAY,
+        data: { year: 2021 },
+        memoryAt: new Date(2021),
+      };
+
+      await expect(sut.create(auth, dto)).resolves.toEqual({
+        id: expect.any(String),
+        type: dto.type,
+        data: dto.data,
+        createdAt: expect.any(Date),
+        updatedAt: expect.any(Date),
+        isSaved: false,
+        memoryAt: dto.memoryAt,
+        ownerId: user.id,
+        assets: [],
+      });
+    });
+
+    it('should create a new memory (with assets)', async () => {
+      const { sut, ctx } = setup();
+      const { user } = await ctx.newUser();
+      const { asset: asset1 } = await ctx.newAsset({ ownerId: user.id });
+      const { asset: asset2 } = await ctx.newAsset({ ownerId: user.id });
+      const auth = factory.auth({ user });
+      const dto = {
+        type: MemoryType.ON_THIS_DAY,
+        data: { year: 2021 },
+        memoryAt: new Date(2021),
+        assetIds: [asset1.id, asset2.id],
+      };
+
+      await expect(sut.create(auth, dto)).resolves.toEqual(
+        expect.objectContaining({
+          id: expect.any(String),
+          assets: [expect.objectContaining({ id: asset1.id }), expect.objectContaining({ id: asset2.id })],
+        }),
+      );
+    });
+
+    it('should create a new memory and ignore assets the user does not have access to', async () => {
+      const { sut, ctx } = setup();
+      const { user: user1 } = await ctx.newUser();
+      const { user: user2 } = await ctx.newUser();
+      const { asset: asset1 } = await ctx.newAsset({ ownerId: user1.id });
+      const { asset: asset2 } = await ctx.newAsset({ ownerId: user2.id });
+      const auth = factory.auth({ user: user1 });
+      const dto = {
+        type: MemoryType.ON_THIS_DAY,
+        data: { year: 2021 },
+        memoryAt: new Date(2021),
+        assetIds: [asset1.id, asset2.id],
+      };
+
+      await expect(sut.create(auth, dto)).resolves.toEqual(
+        expect.objectContaining({
+          id: expect.any(String),
+          assets: [expect.objectContaining({ id: asset1.id })],
+        }),
+      );
+    });
+  });
+
   describe('onMemoryCreate', () => {
     it('should work on an empty database', async () => {
       const { sut } = setup();

From 30b4f334d8a7b18343b0a9e74f2c2159f11521a1 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 27 Jun 2025 09:13:43 -0400
Subject: [PATCH 071/337] feat: upload manager (#19565)

---
 web/src/lib/managers/upload-manager.svelte.ts | 24 +++++++++++++++++++
 web/src/lib/utils/file-uploader.ts            | 16 +++----------
 2 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 web/src/lib/managers/upload-manager.svelte.ts

diff --git a/web/src/lib/managers/upload-manager.svelte.ts b/web/src/lib/managers/upload-manager.svelte.ts
new file mode 100644
index 0000000000..0ff2b0c214
--- /dev/null
+++ b/web/src/lib/managers/upload-manager.svelte.ts
@@ -0,0 +1,24 @@
+import { eventManager } from '$lib/managers/event-manager.svelte';
+import { getSupportedMediaTypes, type ServerMediaTypesResponseDto } from '@immich/sdk';
+
+class UploadManager {
+  mediaTypes = $state<ServerMediaTypesResponseDto>({ image: [], sidecar: [], video: [] });
+
+  constructor() {
+    eventManager.on('app.init', () => void this.#loadExtensions());
+  }
+
+  async #loadExtensions() {
+    try {
+      this.mediaTypes = await getSupportedMediaTypes();
+    } catch {
+      console.error('Failed to load supported media types');
+    }
+  }
+
+  getExtensions() {
+    return [...this.mediaTypes.image, ...this.mediaTypes.video];
+  }
+}
+
+export const uploadManager = new UploadManager();
diff --git a/web/src/lib/utils/file-uploader.ts b/web/src/lib/utils/file-uploader.ts
index 9b0361e1e0..56a152266b 100644
--- a/web/src/lib/utils/file-uploader.ts
+++ b/web/src/lib/utils/file-uploader.ts
@@ -1,4 +1,5 @@
 import { authManager } from '$lib/managers/auth-manager.svelte';
+import { uploadManager } from '$lib/managers/upload-manager.svelte';
 import { UploadState } from '$lib/models/upload-asset';
 import { uploadAssetsStore } from '$lib/stores/upload';
 import { uploadRequest } from '$lib/utils';
@@ -11,7 +12,6 @@ import {
   checkBulkUpload,
   getAssetOriginalPath,
   getBaseUrl,
-  getSupportedMediaTypes,
   type AssetMediaResponseDto,
 } from '@immich/sdk';
 import { tick } from 'svelte';
@@ -40,25 +40,15 @@ export const addDummyItems = () => {
 
 // addDummyItems();
 
-let _extensions: string[];
-
 export const uploadExecutionQueue = new ExecutorQueue({ concurrency: 2 });
 
-const getExtensions = async () => {
-  if (!_extensions) {
-    const { image, video } = await getSupportedMediaTypes();
-    _extensions = [...image, ...video];
-  }
-  return _extensions;
-};
-
 type FileUploadParam = { multiple?: boolean } & (
   | { albumId?: string; assetId?: never }
   | { albumId?: never; assetId?: string }
 );
 export const openFileUploadDialog = async (options: FileUploadParam = {}) => {
   const { albumId, multiple = true, assetId } = options;
-  const extensions = await getExtensions();
+  const extensions = uploadManager.getExtensions();
 
   return new Promise<(string | undefined)[]>((resolve, reject) => {
     try {
@@ -99,7 +89,7 @@ export const fileUploadHandler = async ({
   replaceAssetId,
   isLockedAssets = false,
 }: FileUploadHandlerParams): Promise<string[]> => {
-  const extensions = await getExtensions();
+  const extensions = uploadManager.getExtensions();
   const promises = [];
   for (const file of files) {
     const name = file.name.toLowerCase();

From 72a53f43c82f59b4be43e3d5c61f8dd83af51536 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 27 Jun 2025 18:59:27 +0530
Subject: [PATCH 072/337] feat: use sqlite timeline user provider (#19577)

use sqlite timeline user provider

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../repositories/timeline.repository.dart         | 15 +++++++++++++++
 .../pages/dev/main_timeline.page.dart             |  8 ++++----
 .../infrastructure/timeline.provider.dart         | 14 ++++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 7f5591c047..18abac99de 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -15,6 +15,21 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
 
   const DriftTimelineRepository(super._db) : _db = _db;
 
+  Stream<List<String>> watchTimelineUserIds(String userId) {
+    final query = _db.partnerEntity.selectOnly()
+      ..addColumns([_db.partnerEntity.sharedById])
+      ..where(
+        _db.partnerEntity.inTimeline.equals(true) &
+            _db.partnerEntity.sharedWithId.equals(userId),
+      );
+
+    return query
+        .map((row) => row.read(_db.partnerEntity.sharedById)!)
+        .watch()
+        // Add current user ID to the list
+        .map((users) => users..add(userId));
+  }
+
   List<Bucket> _generateBuckets(int count) {
     final numBuckets = (count / kTimelineNoneSegmentSize).floor();
     final buckets = List.generate(
diff --git a/mobile/lib/presentation/pages/dev/main_timeline.page.dart b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
index 8c04f129eb..5ed7d88c4b 100644
--- a/mobile/lib/presentation/pages/dev/main_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.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/user.provider.dart';
 
 @RoutePage()
 class MainTimelinePage extends StatelessWidget {
@@ -17,9 +16,10 @@ class MainTimelinePage extends StatelessWidget {
       overrides: [
         timelineServiceProvider.overrideWith(
           (ref) {
-            final timelineService = ref
-                .watch(timelineFactoryProvider)
-                .main(ref.watch(timelineUsersIdsProvider));
+            final timelineUsers =
+                ref.watch(timelineUsersProvider).valueOrNull ?? [];
+            final timelineService =
+                ref.watch(timelineFactoryProvider).main(timelineUsers);
             ref.onDispose(() => unawaited(timelineService.dispose()));
             return timelineService;
           },
diff --git a/mobile/lib/providers/infrastructure/timeline.provider.dart b/mobile/lib/providers/infrastructure/timeline.provider.dart
index 4172e559c4..0bf8b1b143 100644
--- a/mobile/lib/providers/infrastructure/timeline.provider.dart
+++ b/mobile/lib/providers/infrastructure/timeline.provider.dart
@@ -4,6 +4,7 @@ import 'package:immich_mobile/infrastructure/repositories/timeline.repository.da
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 
 final timelineRepositoryProvider = Provider<DriftTimelineRepository>(
   (ref) => DriftTimelineRepository(ref.watch(driftProvider)),
@@ -25,3 +26,16 @@ final timelineFactoryProvider = Provider<TimelineFactory>(
     settingsService: ref.watch(settingsProvider),
   ),
 );
+
+final timelineUsersProvider = StreamProvider<List<String>>(
+  (ref) {
+    final currentUserId = ref.watch(currentUserProvider.select((u) => u?.id));
+    if (currentUserId == null) {
+      return Stream.value([]);
+    }
+
+    return ref
+        .watch(timelineRepositoryProvider)
+        .watchTimelineUserIds(currentUserId);
+  },
+);

From 97aabe466e44d5cb79479604142331e293800dd5 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 27 Jun 2025 08:33:46 -0500
Subject: [PATCH 073/337] feat: action buttons place holder (#19561)

* feat: action buttons place holder

* lint

* Update base_action_button.widget.dart

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

---------

Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
---
 .../archive_action_button.widget.dart         | 16 ++++++
 .../base_action_button.widget.dart            | 51 +++++++++++--------
 .../delete_action_button.widget.dart          | 17 +++++++
 .../delete_local_action_button.widget.dart    | 17 +++++++
 .../download_action_button.widget.dart        | 16 ++++++
 .../edit_date_time_action_button.widget.dart  | 17 +++++++
 .../edit_location_action_button.widget.dart   | 16 ++++++
 .../favorite_action_button.widget.dart        | 16 ++++++
 ...e_to_lock_folder_action_button.widget.dart | 17 +++++++
 ...emove_from_album_action_button.widget.dart | 16 ++++++
 ...from_lock_folder_action_button.widget.dart | 17 +++++++
 .../share_action_button.widget.dart           |  4 +-
 .../share_link_action_button.widget.dart      | 16 ++++++
 .../stack_action_button.widget.dart           | 16 ++++++
 .../trash_action_buton.widget.dart            | 17 +++++++
 .../unarchive_action_button.widget.dart       | 16 ++++++
 .../unfavorite_action_button.widget.dart      | 16 ++++++
 .../upload_action_button.widget.dart          | 16 ++++++
 .../home_bottom_app_bar.widget.dart           | 42 ++++++++++++++-
 .../timeline/multiselect.provider.dart        |  8 +++
 20 files changed, 341 insertions(+), 26 deletions(-)
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart

diff --git a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
new file mode 100644
index 0000000000..90209b171d
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class ArchiveActionButton extends ConsumerWidget {
+  const ArchiveActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.archive_outlined,
+      label: "archive".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
index 8ea43b8781..6c60b47535 100644
--- a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
@@ -8,39 +8,46 @@ class BaseActionButton extends StatelessWidget {
     required this.iconData,
     this.onPressed,
     this.onLongPressed,
+    this.maxWidth = 90.0,
   });
 
   final String label;
   final IconData iconData;
+  final double maxWidth;
   final void Function()? onPressed;
   final void Function()? onLongPressed;
 
   @override
   Widget build(BuildContext context) {
-    final minWidth =
-        context.isMobile ? MediaQuery.sizeOf(context).width / 4.5 : 75.0;
+    final minWidth = context.isMobile ? context.width / 4.5 : 75.0;
 
-    return MaterialButton(
-      padding: const EdgeInsets.all(10),
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.all(Radius.circular(20)),
+    return ConstrainedBox(
+      constraints: BoxConstraints(
+        maxWidth: maxWidth,
       ),
-      onPressed: onPressed,
-      onLongPress: onLongPressed,
-      minWidth: minWidth,
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.start,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          Icon(iconData, size: 24),
-          const SizedBox(height: 8),
-          Text(
-            label,
-            style: const TextStyle(fontSize: 14.0, fontWeight: FontWeight.w400),
-            maxLines: 3,
-            textAlign: TextAlign.center,
-          ),
-        ],
+      child: MaterialButton(
+        padding: const EdgeInsets.all(10),
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(20)),
+        ),
+        onPressed: onPressed,
+        onLongPress: onLongPressed,
+        minWidth: minWidth,
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            Icon(iconData, size: 24),
+            const SizedBox(height: 8),
+            Text(
+              label,
+              style:
+                  const TextStyle(fontSize: 14.0, fontWeight: FontWeight.w400),
+              maxLines: 3,
+              textAlign: TextAlign.center,
+            ),
+          ],
+        ),
       ),
     );
   }
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
new file mode 100644
index 0000000000..ff77e99041
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class DeletePermanentActionButton extends ConsumerWidget {
+  const DeletePermanentActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 110.0,
+      iconData: Icons.delete_forever,
+      label: "delete_dialog_title".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
new file mode 100644
index 0000000000..dfc84b4190
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class DeleteLocalActionButton extends ConsumerWidget {
+  const DeleteLocalActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 95.0,
+      iconData: Icons.no_cell_outlined,
+      label: "control_bottom_app_bar_delete_from_local".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
new file mode 100644
index 0000000000..53ea5d4946
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class DownloadActionButton extends ConsumerWidget {
+  const DownloadActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.download,
+      label: "download".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart
new file mode 100644
index 0000000000..3db3dde44d
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart
@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class EditDateTimeActionButton extends ConsumerWidget {
+  const EditDateTimeActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 95.0,
+      iconData: Icons.edit_calendar_outlined,
+      label: "control_bottom_app_bar_edit_time".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart
new file mode 100644
index 0000000000..e8a6b633c8
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class EditLocationActionButton extends ConsumerWidget {
+  const EditLocationActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.edit_location_alt_outlined,
+      label: "control_bottom_app_bar_edit_location".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
new file mode 100644
index 0000000000..5c093c8fa0
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class FavoriteActionButton extends ConsumerWidget {
+  const FavoriteActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.favorite_border_rounded,
+      label: "favorite".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
new file mode 100644
index 0000000000..ba93c86109
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class MoveToLockFolderActionButton extends ConsumerWidget {
+  const MoveToLockFolderActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 100.0,
+      iconData: Icons.lock_outline_rounded,
+      label: "move_to_locked_folder".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
new file mode 100644
index 0000000000..b18e10ebba
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class RemoveFromAlbumActionButton extends ConsumerWidget {
+  const RemoveFromAlbumActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.remove_circle_outline,
+      label: "remove_from_album".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
new file mode 100644
index 0000000000..24c84281d4
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class RemoveFromLockFolderActionButton extends ConsumerWidget {
+  const RemoveFromLockFolderActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 100.0,
+      iconData: Icons.lock_open_rounded,
+      label: "remove_from_locked_folder".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
index 4e6b6e2af4..6a8864c14f 100644
--- a/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 
 class ShareActionButton extends ConsumerWidget {
@@ -13,7 +13,7 @@ class ShareActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData:
           Platform.isAndroid ? Icons.share_rounded : Icons.ios_share_rounded,
-      label: context.tr('share'),
+      label: 'share'.t(context: context),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
new file mode 100644
index 0000000000..c227df1b33
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class ShareLinkActionButton extends ConsumerWidget {
+  const ShareLinkActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.link_rounded,
+      label: "share_link".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart
new file mode 100644
index 0000000000..dc42eb96f1
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class StackActionButton extends ConsumerWidget {
+  const StackActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.filter_none_rounded,
+      label: "stack".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart b/mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart
new file mode 100644
index 0000000000..ccaaf314fc
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart
@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class TrashActionButton extends ConsumerWidget {
+  const TrashActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 85.0,
+      iconData: Icons.delete_outline_rounded,
+      label: "control_bottom_app_bar_trash_from_immich".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
new file mode 100644
index 0000000000..7fa0f8513a
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class UnarchiveActionButton extends ConsumerWidget {
+  const UnarchiveActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.unarchive_outlined,
+      label: "unarchive".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
new file mode 100644
index 0000000000..420821ef3f
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class UnFavoriteActionButton extends ConsumerWidget {
+  const UnFavoriteActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.favorite_rounded,
+      label: "unfavorite".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart
new file mode 100644
index 0000000000..66467e44a3
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+
+class UploadActionButton extends ConsumerWidget {
+  const UploadActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.backup_outlined,
+      label: "upload".t(context: context),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
index c29149df85..0b5efc4bd1 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
@@ -1,16 +1,54 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_buton.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
 class HomeBottomAppBar extends ConsumerWidget {
   const HomeBottomAppBar({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return const BaseBottomSheet(
+    final multiselect = ref.watch(multiSelectProvider);
+    final isTrashEnable = ref.watch(
+      serverInfoProvider.select((state) => state.serverFeatures.trash),
+    );
+
+    return BaseBottomSheet(
+      initialChildSize: 0.25,
+      minChildSize: 0.22,
       actions: [
-        ShareActionButton(),
+        const ShareActionButton(),
+        if (multiselect.hasRemote) ...[
+          const ShareLinkActionButton(),
+          const ArchiveActionButton(),
+          const FavoriteActionButton(),
+          const DownloadActionButton(),
+          isTrashEnable
+              ? const TrashActionButton()
+              : const DeletePermanentActionButton(),
+          const EditDateTimeActionButton(),
+          const EditLocationActionButton(),
+          const MoveToLockFolderActionButton(),
+          const StackActionButton(),
+        ],
+        if (multiselect.hasLocal) ...[
+          const DeleteLocalActionButton(),
+          const UploadActionButton(),
+        ],
       ],
     );
   }
diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dart
index cb9ddc6d7c..1a4c0e4c65 100644
--- a/mobile/lib/providers/timeline/multiselect.provider.dart
+++ b/mobile/lib/providers/timeline/multiselect.provider.dart
@@ -19,6 +19,14 @@ class MultiSelectState {
   });
 
   bool get isEnabled => selectedAssets.isNotEmpty;
+  bool get hasRemote => selectedAssets.any(
+        (asset) =>
+            asset.storage == AssetState.remote ||
+            asset.storage == AssetState.merged,
+      );
+  bool get hasLocal => selectedAssets.any(
+        (asset) => asset.storage == AssetState.local,
+      );
 
   MultiSelectState copyWith({
     Set<BaseAsset>? selectedAssets,

From 6feca56da8c4b39d6cf13b5d6d856fd59dbbdea1 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 27 Jun 2025 12:20:13 -0400
Subject: [PATCH 074/337] feat: sync memories (#19579)

---
 mobile/openapi/README.md                      |   4 +
 mobile/openapi/lib/api.dart                   |   4 +
 mobile/openapi/lib/api_client.dart            |   8 +
 .../openapi/lib/model/sync_entity_type.dart   |  24 +-
 .../model/sync_memory_asset_delete_v1.dart    | 107 ++++++++
 .../lib/model/sync_memory_asset_v1.dart       | 107 ++++++++
 .../lib/model/sync_memory_delete_v1.dart      |  99 ++++++++
 mobile/openapi/lib/model/sync_memory_v1.dart  | 203 +++++++++++++++
 .../openapi/lib/model/sync_request_type.dart  |   6 +
 open-api/immich-openapi-specs.json            | 123 ++++++++-
 open-api/typescript-sdk/src/fetch-client.ts   |  12 +-
 server/src/database.ts                        |   4 +-
 server/src/db.d.ts                            |  16 +-
 server/src/dtos/sync.dto.ts                   |  90 +++++--
 server/src/enum.ts                            |  17 +-
 server/src/queries/sync.repository.sql        |  75 ++++++
 server/src/repositories/sync.repository.ts    |  69 ++++-
 server/src/schema/functions.ts                |  28 +++
 server/src/schema/index.ts                    |  12 +-
 .../1751035357937-MemorySyncChanges.ts        |  80 ++++++
 server/src/schema/tables/index.ts             |   2 +-
 .../schema/tables/memory-asset-audit.table.ts |  23 ++
 .../src/schema/tables/memory-asset.table.ts   |  36 +++
 .../src/schema/tables/memory-audit.table.ts   |  22 ++
 server/src/schema/tables/memory.table.ts      |  16 +-
 .../src/schema/tables/memory_asset.table.ts   |  12 -
 server/src/services/memory.service.spec.ts    |  11 +-
 server/src/services/sync.service.ts           | 238 ++++++++----------
 server/test/medium.factory.ts                 |  38 ++-
 .../specs/sync/sync-memory-asset.spec.ts      |  84 +++++++
 .../medium/specs/sync/sync-memory.spec.ts     | 115 +++++++++
 31 files changed, 1482 insertions(+), 203 deletions(-)
 create mode 100644 mobile/openapi/lib/model/sync_memory_asset_delete_v1.dart
 create mode 100644 mobile/openapi/lib/model/sync_memory_asset_v1.dart
 create mode 100644 mobile/openapi/lib/model/sync_memory_delete_v1.dart
 create mode 100644 mobile/openapi/lib/model/sync_memory_v1.dart
 create mode 100644 server/src/schema/migrations/1751035357937-MemorySyncChanges.ts
 create mode 100644 server/src/schema/tables/memory-asset-audit.table.ts
 create mode 100644 server/src/schema/tables/memory-asset.table.ts
 create mode 100644 server/src/schema/tables/memory-audit.table.ts
 delete mode 100644 server/src/schema/tables/memory_asset.table.ts
 create mode 100644 server/test/medium/specs/sync/sync-memory-asset.spec.ts
 create mode 100644 server/test/medium/specs/sync/sync-memory.spec.ts

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index b09f36548a..d9607ef2ec 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -475,6 +475,10 @@ Class | Method | HTTP request | Description
  - [SyncAssetExifV1](doc//SyncAssetExifV1.md)
  - [SyncAssetV1](doc//SyncAssetV1.md)
  - [SyncEntityType](doc//SyncEntityType.md)
+ - [SyncMemoryAssetDeleteV1](doc//SyncMemoryAssetDeleteV1.md)
+ - [SyncMemoryAssetV1](doc//SyncMemoryAssetV1.md)
+ - [SyncMemoryDeleteV1](doc//SyncMemoryDeleteV1.md)
+ - [SyncMemoryV1](doc//SyncMemoryV1.md)
  - [SyncPartnerDeleteV1](doc//SyncPartnerDeleteV1.md)
  - [SyncPartnerV1](doc//SyncPartnerV1.md)
  - [SyncRequestType](doc//SyncRequestType.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index df61b8ab00..67f75fba38 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -258,6 +258,10 @@ part 'model/sync_asset_delete_v1.dart';
 part 'model/sync_asset_exif_v1.dart';
 part 'model/sync_asset_v1.dart';
 part 'model/sync_entity_type.dart';
+part 'model/sync_memory_asset_delete_v1.dart';
+part 'model/sync_memory_asset_v1.dart';
+part 'model/sync_memory_delete_v1.dart';
+part 'model/sync_memory_v1.dart';
 part 'model/sync_partner_delete_v1.dart';
 part 'model/sync_partner_v1.dart';
 part 'model/sync_request_type.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 18b2c9202b..d0f7837bc9 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -572,6 +572,14 @@ class ApiClient {
           return SyncAssetV1.fromJson(value);
         case 'SyncEntityType':
           return SyncEntityTypeTypeTransformer().decode(value);
+        case 'SyncMemoryAssetDeleteV1':
+          return SyncMemoryAssetDeleteV1.fromJson(value);
+        case 'SyncMemoryAssetV1':
+          return SyncMemoryAssetV1.fromJson(value);
+        case 'SyncMemoryDeleteV1':
+          return SyncMemoryDeleteV1.fromJson(value);
+        case 'SyncMemoryV1':
+          return SyncMemoryV1.fromJson(value);
         case 'SyncPartnerDeleteV1':
           return SyncPartnerDeleteV1.fromJson(value);
         case 'SyncPartnerV1':
diff --git a/mobile/openapi/lib/model/sync_entity_type.dart b/mobile/openapi/lib/model/sync_entity_type.dart
index 7129ebc0a4..fb530240ed 100644
--- a/mobile/openapi/lib/model/sync_entity_type.dart
+++ b/mobile/openapi/lib/model/sync_entity_type.dart
@@ -25,11 +25,11 @@ class SyncEntityType {
 
   static const userV1 = SyncEntityType._(r'UserV1');
   static const userDeleteV1 = SyncEntityType._(r'UserDeleteV1');
-  static const partnerV1 = SyncEntityType._(r'PartnerV1');
-  static const partnerDeleteV1 = SyncEntityType._(r'PartnerDeleteV1');
   static const assetV1 = SyncEntityType._(r'AssetV1');
   static const assetDeleteV1 = SyncEntityType._(r'AssetDeleteV1');
   static const assetExifV1 = SyncEntityType._(r'AssetExifV1');
+  static const partnerV1 = SyncEntityType._(r'PartnerV1');
+  static const partnerDeleteV1 = SyncEntityType._(r'PartnerDeleteV1');
   static const partnerAssetV1 = SyncEntityType._(r'PartnerAssetV1');
   static const partnerAssetBackfillV1 = SyncEntityType._(r'PartnerAssetBackfillV1');
   static const partnerAssetDeleteV1 = SyncEntityType._(r'PartnerAssetDeleteV1');
@@ -47,17 +47,21 @@ class SyncEntityType {
   static const albumToAssetV1 = SyncEntityType._(r'AlbumToAssetV1');
   static const albumToAssetDeleteV1 = SyncEntityType._(r'AlbumToAssetDeleteV1');
   static const albumToAssetBackfillV1 = SyncEntityType._(r'AlbumToAssetBackfillV1');
+  static const memoryV1 = SyncEntityType._(r'MemoryV1');
+  static const memoryDeleteV1 = SyncEntityType._(r'MemoryDeleteV1');
+  static const memoryToAssetV1 = SyncEntityType._(r'MemoryToAssetV1');
+  static const memoryToAssetDeleteV1 = SyncEntityType._(r'MemoryToAssetDeleteV1');
   static const syncAckV1 = SyncEntityType._(r'SyncAckV1');
 
   /// List of all possible values in this [enum][SyncEntityType].
   static const values = <SyncEntityType>[
     userV1,
     userDeleteV1,
-    partnerV1,
-    partnerDeleteV1,
     assetV1,
     assetDeleteV1,
     assetExifV1,
+    partnerV1,
+    partnerDeleteV1,
     partnerAssetV1,
     partnerAssetBackfillV1,
     partnerAssetDeleteV1,
@@ -75,6 +79,10 @@ class SyncEntityType {
     albumToAssetV1,
     albumToAssetDeleteV1,
     albumToAssetBackfillV1,
+    memoryV1,
+    memoryDeleteV1,
+    memoryToAssetV1,
+    memoryToAssetDeleteV1,
     syncAckV1,
   ];
 
@@ -116,11 +124,11 @@ class SyncEntityTypeTypeTransformer {
       switch (data) {
         case r'UserV1': return SyncEntityType.userV1;
         case r'UserDeleteV1': return SyncEntityType.userDeleteV1;
-        case r'PartnerV1': return SyncEntityType.partnerV1;
-        case r'PartnerDeleteV1': return SyncEntityType.partnerDeleteV1;
         case r'AssetV1': return SyncEntityType.assetV1;
         case r'AssetDeleteV1': return SyncEntityType.assetDeleteV1;
         case r'AssetExifV1': return SyncEntityType.assetExifV1;
+        case r'PartnerV1': return SyncEntityType.partnerV1;
+        case r'PartnerDeleteV1': return SyncEntityType.partnerDeleteV1;
         case r'PartnerAssetV1': return SyncEntityType.partnerAssetV1;
         case r'PartnerAssetBackfillV1': return SyncEntityType.partnerAssetBackfillV1;
         case r'PartnerAssetDeleteV1': return SyncEntityType.partnerAssetDeleteV1;
@@ -138,6 +146,10 @@ class SyncEntityTypeTypeTransformer {
         case r'AlbumToAssetV1': return SyncEntityType.albumToAssetV1;
         case r'AlbumToAssetDeleteV1': return SyncEntityType.albumToAssetDeleteV1;
         case r'AlbumToAssetBackfillV1': return SyncEntityType.albumToAssetBackfillV1;
+        case r'MemoryV1': return SyncEntityType.memoryV1;
+        case r'MemoryDeleteV1': return SyncEntityType.memoryDeleteV1;
+        case r'MemoryToAssetV1': return SyncEntityType.memoryToAssetV1;
+        case r'MemoryToAssetDeleteV1': return SyncEntityType.memoryToAssetDeleteV1;
         case r'SyncAckV1': return SyncEntityType.syncAckV1;
         default:
           if (!allowNull) {
diff --git a/mobile/openapi/lib/model/sync_memory_asset_delete_v1.dart b/mobile/openapi/lib/model/sync_memory_asset_delete_v1.dart
new file mode 100644
index 0000000000..a9af77e929
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_memory_asset_delete_v1.dart
@@ -0,0 +1,107 @@
+//
+// 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 SyncMemoryAssetDeleteV1 {
+  /// Returns a new [SyncMemoryAssetDeleteV1] instance.
+  SyncMemoryAssetDeleteV1({
+    required this.assetId,
+    required this.memoryId,
+  });
+
+  String assetId;
+
+  String memoryId;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncMemoryAssetDeleteV1 &&
+    other.assetId == assetId &&
+    other.memoryId == memoryId;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (assetId.hashCode) +
+    (memoryId.hashCode);
+
+  @override
+  String toString() => 'SyncMemoryAssetDeleteV1[assetId=$assetId, memoryId=$memoryId]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'assetId'] = this.assetId;
+      json[r'memoryId'] = this.memoryId;
+    return json;
+  }
+
+  /// Returns a new [SyncMemoryAssetDeleteV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncMemoryAssetDeleteV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncMemoryAssetDeleteV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncMemoryAssetDeleteV1(
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+        memoryId: mapValueOfType<String>(json, r'memoryId')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncMemoryAssetDeleteV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncMemoryAssetDeleteV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncMemoryAssetDeleteV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncMemoryAssetDeleteV1> mapFromJson(dynamic json) {
+    final map = <String, SyncMemoryAssetDeleteV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncMemoryAssetDeleteV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncMemoryAssetDeleteV1-objects as value to a dart map
+  static Map<String, List<SyncMemoryAssetDeleteV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncMemoryAssetDeleteV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncMemoryAssetDeleteV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'assetId',
+    'memoryId',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_memory_asset_v1.dart b/mobile/openapi/lib/model/sync_memory_asset_v1.dart
new file mode 100644
index 0000000000..d26e3c9a29
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_memory_asset_v1.dart
@@ -0,0 +1,107 @@
+//
+// 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 SyncMemoryAssetV1 {
+  /// Returns a new [SyncMemoryAssetV1] instance.
+  SyncMemoryAssetV1({
+    required this.assetId,
+    required this.memoryId,
+  });
+
+  String assetId;
+
+  String memoryId;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncMemoryAssetV1 &&
+    other.assetId == assetId &&
+    other.memoryId == memoryId;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (assetId.hashCode) +
+    (memoryId.hashCode);
+
+  @override
+  String toString() => 'SyncMemoryAssetV1[assetId=$assetId, memoryId=$memoryId]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'assetId'] = this.assetId;
+      json[r'memoryId'] = this.memoryId;
+    return json;
+  }
+
+  /// Returns a new [SyncMemoryAssetV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncMemoryAssetV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncMemoryAssetV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncMemoryAssetV1(
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+        memoryId: mapValueOfType<String>(json, r'memoryId')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncMemoryAssetV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncMemoryAssetV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncMemoryAssetV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncMemoryAssetV1> mapFromJson(dynamic json) {
+    final map = <String, SyncMemoryAssetV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncMemoryAssetV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncMemoryAssetV1-objects as value to a dart map
+  static Map<String, List<SyncMemoryAssetV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncMemoryAssetV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncMemoryAssetV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'assetId',
+    'memoryId',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_memory_delete_v1.dart b/mobile/openapi/lib/model/sync_memory_delete_v1.dart
new file mode 100644
index 0000000000..9702da5aaf
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_memory_delete_v1.dart
@@ -0,0 +1,99 @@
+//
+// 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 SyncMemoryDeleteV1 {
+  /// Returns a new [SyncMemoryDeleteV1] instance.
+  SyncMemoryDeleteV1({
+    required this.memoryId,
+  });
+
+  String memoryId;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncMemoryDeleteV1 &&
+    other.memoryId == memoryId;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (memoryId.hashCode);
+
+  @override
+  String toString() => 'SyncMemoryDeleteV1[memoryId=$memoryId]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'memoryId'] = this.memoryId;
+    return json;
+  }
+
+  /// Returns a new [SyncMemoryDeleteV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncMemoryDeleteV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncMemoryDeleteV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncMemoryDeleteV1(
+        memoryId: mapValueOfType<String>(json, r'memoryId')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncMemoryDeleteV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncMemoryDeleteV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncMemoryDeleteV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncMemoryDeleteV1> mapFromJson(dynamic json) {
+    final map = <String, SyncMemoryDeleteV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncMemoryDeleteV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncMemoryDeleteV1-objects as value to a dart map
+  static Map<String, List<SyncMemoryDeleteV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncMemoryDeleteV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncMemoryDeleteV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'memoryId',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_memory_v1.dart b/mobile/openapi/lib/model/sync_memory_v1.dart
new file mode 100644
index 0000000000..2ae2b01fd7
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_memory_v1.dart
@@ -0,0 +1,203 @@
+//
+// 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 SyncMemoryV1 {
+  /// Returns a new [SyncMemoryV1] instance.
+  SyncMemoryV1({
+    required this.createdAt,
+    required this.data,
+    required this.deletedAt,
+    required this.hideAt,
+    required this.id,
+    required this.isSaved,
+    required this.memoryAt,
+    required this.ownerId,
+    required this.seenAt,
+    required this.showAt,
+    required this.type,
+    required this.updatedAt,
+  });
+
+  DateTime createdAt;
+
+  Object data;
+
+  DateTime? deletedAt;
+
+  DateTime? hideAt;
+
+  String id;
+
+  bool isSaved;
+
+  DateTime memoryAt;
+
+  String ownerId;
+
+  DateTime? seenAt;
+
+  DateTime? showAt;
+
+  MemoryType type;
+
+  DateTime updatedAt;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncMemoryV1 &&
+    other.createdAt == createdAt &&
+    other.data == data &&
+    other.deletedAt == deletedAt &&
+    other.hideAt == hideAt &&
+    other.id == id &&
+    other.isSaved == isSaved &&
+    other.memoryAt == memoryAt &&
+    other.ownerId == ownerId &&
+    other.seenAt == seenAt &&
+    other.showAt == showAt &&
+    other.type == type &&
+    other.updatedAt == updatedAt;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (createdAt.hashCode) +
+    (data.hashCode) +
+    (deletedAt == null ? 0 : deletedAt!.hashCode) +
+    (hideAt == null ? 0 : hideAt!.hashCode) +
+    (id.hashCode) +
+    (isSaved.hashCode) +
+    (memoryAt.hashCode) +
+    (ownerId.hashCode) +
+    (seenAt == null ? 0 : seenAt!.hashCode) +
+    (showAt == null ? 0 : showAt!.hashCode) +
+    (type.hashCode) +
+    (updatedAt.hashCode);
+
+  @override
+  String toString() => 'SyncMemoryV1[createdAt=$createdAt, data=$data, deletedAt=$deletedAt, hideAt=$hideAt, id=$id, isSaved=$isSaved, memoryAt=$memoryAt, ownerId=$ownerId, seenAt=$seenAt, showAt=$showAt, type=$type, updatedAt=$updatedAt]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'createdAt'] = this.createdAt.toUtc().toIso8601String();
+      json[r'data'] = this.data;
+    if (this.deletedAt != null) {
+      json[r'deletedAt'] = this.deletedAt!.toUtc().toIso8601String();
+    } else {
+    //  json[r'deletedAt'] = null;
+    }
+    if (this.hideAt != null) {
+      json[r'hideAt'] = this.hideAt!.toUtc().toIso8601String();
+    } else {
+    //  json[r'hideAt'] = null;
+    }
+      json[r'id'] = this.id;
+      json[r'isSaved'] = this.isSaved;
+      json[r'memoryAt'] = this.memoryAt.toUtc().toIso8601String();
+      json[r'ownerId'] = this.ownerId;
+    if (this.seenAt != null) {
+      json[r'seenAt'] = this.seenAt!.toUtc().toIso8601String();
+    } else {
+    //  json[r'seenAt'] = null;
+    }
+    if (this.showAt != null) {
+      json[r'showAt'] = this.showAt!.toUtc().toIso8601String();
+    } else {
+    //  json[r'showAt'] = null;
+    }
+      json[r'type'] = this.type;
+      json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
+    return json;
+  }
+
+  /// Returns a new [SyncMemoryV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncMemoryV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncMemoryV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncMemoryV1(
+        createdAt: mapDateTime(json, r'createdAt', r'')!,
+        data: mapValueOfType<Object>(json, r'data')!,
+        deletedAt: mapDateTime(json, r'deletedAt', r''),
+        hideAt: mapDateTime(json, r'hideAt', r''),
+        id: mapValueOfType<String>(json, r'id')!,
+        isSaved: mapValueOfType<bool>(json, r'isSaved')!,
+        memoryAt: mapDateTime(json, r'memoryAt', r'')!,
+        ownerId: mapValueOfType<String>(json, r'ownerId')!,
+        seenAt: mapDateTime(json, r'seenAt', r''),
+        showAt: mapDateTime(json, r'showAt', r''),
+        type: MemoryType.fromJson(json[r'type'])!,
+        updatedAt: mapDateTime(json, r'updatedAt', r'')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncMemoryV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncMemoryV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncMemoryV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncMemoryV1> mapFromJson(dynamic json) {
+    final map = <String, SyncMemoryV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncMemoryV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncMemoryV1-objects as value to a dart map
+  static Map<String, List<SyncMemoryV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncMemoryV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncMemoryV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'createdAt',
+    'data',
+    'deletedAt',
+    'hideAt',
+    'id',
+    'isSaved',
+    'memoryAt',
+    'ownerId',
+    'seenAt',
+    'showAt',
+    'type',
+    'updatedAt',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_request_type.dart b/mobile/openapi/lib/model/sync_request_type.dart
index c3cce99b1a..21b71dbc5b 100644
--- a/mobile/openapi/lib/model/sync_request_type.dart
+++ b/mobile/openapi/lib/model/sync_request_type.dart
@@ -34,6 +34,8 @@ class SyncRequestType {
   static const albumToAssetsV1 = SyncRequestType._(r'AlbumToAssetsV1');
   static const albumAssetsV1 = SyncRequestType._(r'AlbumAssetsV1');
   static const albumAssetExifsV1 = SyncRequestType._(r'AlbumAssetExifsV1');
+  static const memoriesV1 = SyncRequestType._(r'MemoriesV1');
+  static const memoryToAssetsV1 = SyncRequestType._(r'MemoryToAssetsV1');
 
   /// List of all possible values in this [enum][SyncRequestType].
   static const values = <SyncRequestType>[
@@ -48,6 +50,8 @@ class SyncRequestType {
     albumToAssetsV1,
     albumAssetsV1,
     albumAssetExifsV1,
+    memoriesV1,
+    memoryToAssetsV1,
   ];
 
   static SyncRequestType? fromJson(dynamic value) => SyncRequestTypeTypeTransformer().decode(value);
@@ -97,6 +101,8 @@ class SyncRequestTypeTypeTransformer {
         case r'AlbumToAssetsV1': return SyncRequestType.albumToAssetsV1;
         case r'AlbumAssetsV1': return SyncRequestType.albumAssetsV1;
         case r'AlbumAssetExifsV1': return SyncRequestType.albumAssetExifsV1;
+        case r'MemoriesV1': return SyncRequestType.memoriesV1;
+        case r'MemoryToAssetsV1': return SyncRequestType.memoryToAssetsV1;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 79b019bb2d..5859331614 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13794,11 +13794,11 @@
         "enum": [
           "UserV1",
           "UserDeleteV1",
-          "PartnerV1",
-          "PartnerDeleteV1",
           "AssetV1",
           "AssetDeleteV1",
           "AssetExifV1",
+          "PartnerV1",
+          "PartnerDeleteV1",
           "PartnerAssetV1",
           "PartnerAssetBackfillV1",
           "PartnerAssetDeleteV1",
@@ -13816,10 +13816,125 @@
           "AlbumToAssetV1",
           "AlbumToAssetDeleteV1",
           "AlbumToAssetBackfillV1",
+          "MemoryV1",
+          "MemoryDeleteV1",
+          "MemoryToAssetV1",
+          "MemoryToAssetDeleteV1",
           "SyncAckV1"
         ],
         "type": "string"
       },
+      "SyncMemoryAssetDeleteV1": {
+        "properties": {
+          "assetId": {
+            "type": "string"
+          },
+          "memoryId": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "assetId",
+          "memoryId"
+        ],
+        "type": "object"
+      },
+      "SyncMemoryAssetV1": {
+        "properties": {
+          "assetId": {
+            "type": "string"
+          },
+          "memoryId": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "assetId",
+          "memoryId"
+        ],
+        "type": "object"
+      },
+      "SyncMemoryDeleteV1": {
+        "properties": {
+          "memoryId": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "memoryId"
+        ],
+        "type": "object"
+      },
+      "SyncMemoryV1": {
+        "properties": {
+          "createdAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "data": {
+            "type": "object"
+          },
+          "deletedAt": {
+            "format": "date-time",
+            "nullable": true,
+            "type": "string"
+          },
+          "hideAt": {
+            "format": "date-time",
+            "nullable": true,
+            "type": "string"
+          },
+          "id": {
+            "type": "string"
+          },
+          "isSaved": {
+            "type": "boolean"
+          },
+          "memoryAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "ownerId": {
+            "type": "string"
+          },
+          "seenAt": {
+            "format": "date-time",
+            "nullable": true,
+            "type": "string"
+          },
+          "showAt": {
+            "format": "date-time",
+            "nullable": true,
+            "type": "string"
+          },
+          "type": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/MemoryType"
+              }
+            ]
+          },
+          "updatedAt": {
+            "format": "date-time",
+            "type": "string"
+          }
+        },
+        "required": [
+          "createdAt",
+          "data",
+          "deletedAt",
+          "hideAt",
+          "id",
+          "isSaved",
+          "memoryAt",
+          "ownerId",
+          "seenAt",
+          "showAt",
+          "type",
+          "updatedAt"
+        ],
+        "type": "object"
+      },
       "SyncPartnerDeleteV1": {
         "properties": {
           "sharedById": {
@@ -13866,7 +13981,9 @@
           "AlbumUsersV1",
           "AlbumToAssetsV1",
           "AlbumAssetsV1",
-          "AlbumAssetExifsV1"
+          "AlbumAssetExifsV1",
+          "MemoriesV1",
+          "MemoryToAssetsV1"
         ],
         "type": "string"
       },
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 5b94834105..a7016df710 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -4063,11 +4063,11 @@ export enum Error2 {
 export enum SyncEntityType {
     UserV1 = "UserV1",
     UserDeleteV1 = "UserDeleteV1",
-    PartnerV1 = "PartnerV1",
-    PartnerDeleteV1 = "PartnerDeleteV1",
     AssetV1 = "AssetV1",
     AssetDeleteV1 = "AssetDeleteV1",
     AssetExifV1 = "AssetExifV1",
+    PartnerV1 = "PartnerV1",
+    PartnerDeleteV1 = "PartnerDeleteV1",
     PartnerAssetV1 = "PartnerAssetV1",
     PartnerAssetBackfillV1 = "PartnerAssetBackfillV1",
     PartnerAssetDeleteV1 = "PartnerAssetDeleteV1",
@@ -4085,6 +4085,10 @@ export enum SyncEntityType {
     AlbumToAssetV1 = "AlbumToAssetV1",
     AlbumToAssetDeleteV1 = "AlbumToAssetDeleteV1",
     AlbumToAssetBackfillV1 = "AlbumToAssetBackfillV1",
+    MemoryV1 = "MemoryV1",
+    MemoryDeleteV1 = "MemoryDeleteV1",
+    MemoryToAssetV1 = "MemoryToAssetV1",
+    MemoryToAssetDeleteV1 = "MemoryToAssetDeleteV1",
     SyncAckV1 = "SyncAckV1"
 }
 export enum SyncRequestType {
@@ -4098,7 +4102,9 @@ export enum SyncRequestType {
     AlbumUsersV1 = "AlbumUsersV1",
     AlbumToAssetsV1 = "AlbumToAssetsV1",
     AlbumAssetsV1 = "AlbumAssetsV1",
-    AlbumAssetExifsV1 = "AlbumAssetExifsV1"
+    AlbumAssetExifsV1 = "AlbumAssetExifsV1",
+    MemoriesV1 = "MemoriesV1",
+    MemoryToAssetsV1 = "MemoryToAssetsV1"
 }
 export enum TranscodeHWAccel {
     Nvenc = "nvenc",
diff --git a/server/src/database.ts b/server/src/database.ts
index 8a3c3b702b..4042617e98 100644
--- a/server/src/database.ts
+++ b/server/src/database.ts
@@ -13,7 +13,7 @@ import {
   UserAvatarColor,
   UserStatus,
 } from 'src/enum';
-import { OnThisDayData, UserMetadataItem } from 'src/types';
+import { UserMetadataItem } from 'src/types';
 
 export type AuthUser = {
   id: string;
@@ -95,7 +95,7 @@ export type Memory = {
   showAt: Date | null;
   hideAt: Date | null;
   type: MemoryType;
-  data: OnThisDayData;
+  data: object;
   ownerId: string;
   isSaved: boolean;
   assets: MapAsset[];
diff --git a/server/src/db.d.ts b/server/src/db.d.ts
index 3fcf4ddea7..68ddd245f3 100644
--- a/server/src/db.d.ts
+++ b/server/src/db.d.ts
@@ -19,8 +19,11 @@ import {
   SourceType,
   SyncEntityType,
 } from 'src/enum';
+import { MemoryAssetAuditTable } from 'src/schema/tables/memory-asset-audit.table';
+import { MemoryAssetTable } from 'src/schema/tables/memory-asset.table';
+import { MemoryAuditTable } from 'src/schema/tables/memory-audit.table';
 import { UserTable } from 'src/schema/tables/user.table';
-import { OnThisDayData, UserMetadataItem } from 'src/types';
+import { UserMetadataItem } from 'src/types';
 
 export type ArrayType<T> = ArrayTypeImpl<T> extends (infer U)[] ? U[] : ArrayTypeImpl<T>;
 
@@ -278,7 +281,7 @@ export interface Libraries {
 
 export interface Memories {
   createdAt: Generated<Timestamp>;
-  data: OnThisDayData;
+  data: object;
   deletedAt: Timestamp | null;
   hideAt: Timestamp | null;
   id: Generated<string>;
@@ -307,11 +310,6 @@ export interface Notifications {
   readAt: Timestamp | null;
 }
 
-export interface MemoriesAssetsAssets {
-  assetsId: string;
-  memoriesId: string;
-}
-
 export interface Migrations {
   id: Generated<number>;
   name: string;
@@ -512,7 +510,9 @@ export interface DB {
   geodata_places: GeodataPlaces;
   libraries: Libraries;
   memories: Memories;
-  memories_assets_assets: MemoriesAssetsAssets;
+  memories_audit: MemoryAuditTable;
+  memories_assets_assets: MemoryAssetTable;
+  memory_assets_audit: MemoryAssetAuditTable;
   migrations: Migrations;
   notifications: Notifications;
   move_history: MoveHistory;
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index d467791825..77f0578c36 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -1,7 +1,16 @@
+/* eslint-disable @typescript-eslint/no-unsafe-function-type */
 import { ApiProperty } from '@nestjs/swagger';
 import { ArrayMaxSize, IsEnum, IsInt, IsPositive, IsString } from 'class-validator';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
-import { AlbumUserRole, AssetOrder, AssetType, AssetVisibility, SyncEntityType, SyncRequestType } from 'src/enum';
+import {
+  AlbumUserRole,
+  AssetOrder,
+  AssetType,
+  AssetVisibility,
+  MemoryType,
+  SyncEntityType,
+  SyncRequestType,
+} from 'src/enum';
 import { Optional, ValidateDate, ValidateUUID } from 'src/validation';
 
 export class AssetFullSyncDto {
@@ -34,6 +43,15 @@ export class AssetDeltaSyncResponseDto {
   deleted!: string[];
 }
 
+export const extraSyncModels: Function[] = [];
+
+export const ExtraModel = (): ClassDecorator => {
+  return (object: Function) => {
+    extraSyncModels.push(object);
+  };
+};
+
+@ExtraModel()
 export class SyncUserV1 {
   id!: string;
   name!: string;
@@ -41,21 +59,25 @@ export class SyncUserV1 {
   deletedAt!: Date | null;
 }
 
+@ExtraModel()
 export class SyncUserDeleteV1 {
   userId!: string;
 }
 
+@ExtraModel()
 export class SyncPartnerV1 {
   sharedById!: string;
   sharedWithId!: string;
   inTimeline!: boolean;
 }
 
+@ExtraModel()
 export class SyncPartnerDeleteV1 {
   sharedById!: string;
   sharedWithId!: string;
 }
 
+@ExtraModel()
 export class SyncAssetV1 {
   id!: string;
   ownerId!: string;
@@ -74,10 +96,12 @@ export class SyncAssetV1 {
   visibility!: AssetVisibility;
 }
 
+@ExtraModel()
 export class SyncAssetDeleteV1 {
   assetId!: string;
 }
 
+@ExtraModel()
 export class SyncAssetExifV1 {
   assetId!: string;
   description!: string | null;
@@ -116,15 +140,18 @@ export class SyncAssetExifV1 {
   fps!: number | null;
 }
 
+@ExtraModel()
 export class SyncAlbumDeleteV1 {
   albumId!: string;
 }
 
+@ExtraModel()
 export class SyncAlbumUserDeleteV1 {
   albumId!: string;
   userId!: string;
 }
 
+@ExtraModel()
 export class SyncAlbumUserV1 {
   albumId!: string;
   userId!: string;
@@ -132,6 +159,7 @@ export class SyncAlbumUserV1 {
   role!: AlbumUserRole;
 }
 
+@ExtraModel()
 export class SyncAlbumV1 {
   id!: string;
   ownerId!: string;
@@ -145,16 +173,53 @@ export class SyncAlbumV1 {
   order!: AssetOrder;
 }
 
+@ExtraModel()
 export class SyncAlbumToAssetV1 {
   albumId!: string;
   assetId!: string;
 }
 
+@ExtraModel()
 export class SyncAlbumToAssetDeleteV1 {
   albumId!: string;
   assetId!: string;
 }
 
+@ExtraModel()
+export class SyncMemoryV1 {
+  id!: string;
+  createdAt!: Date;
+  updatedAt!: Date;
+  deletedAt!: Date | null;
+  ownerId!: string;
+  @ApiProperty({ enumName: 'MemoryType', enum: MemoryType })
+  type!: MemoryType;
+  data!: object;
+  isSaved!: boolean;
+  memoryAt!: Date;
+  seenAt!: Date | null;
+  showAt!: Date | null;
+  hideAt!: Date | null;
+}
+
+@ExtraModel()
+export class SyncMemoryDeleteV1 {
+  memoryId!: string;
+}
+
+@ExtraModel()
+export class SyncMemoryAssetV1 {
+  memoryId!: string;
+  assetId!: string;
+}
+
+@ExtraModel()
+export class SyncMemoryAssetDeleteV1 {
+  memoryId!: string;
+  assetId!: string;
+}
+
+@ExtraModel()
 export class SyncAckV1 {}
 
 export type SyncItem = {
@@ -182,28 +247,13 @@ export type SyncItem = {
   [SyncEntityType.AlbumToAssetV1]: SyncAlbumToAssetV1;
   [SyncEntityType.AlbumToAssetBackfillV1]: SyncAlbumToAssetV1;
   [SyncEntityType.AlbumToAssetDeleteV1]: SyncAlbumToAssetDeleteV1;
+  [SyncEntityType.MemoryV1]: SyncMemoryV1;
+  [SyncEntityType.MemoryDeleteV1]: SyncMemoryDeleteV1;
+  [SyncEntityType.MemoryToAssetV1]: SyncMemoryAssetV1;
+  [SyncEntityType.MemoryToAssetDeleteV1]: SyncMemoryAssetDeleteV1;
   [SyncEntityType.SyncAckV1]: SyncAckV1;
 };
 
-const responseDtos = [
-  SyncUserV1,
-  SyncUserDeleteV1,
-  SyncPartnerV1,
-  SyncPartnerDeleteV1,
-  SyncAssetV1,
-  SyncAssetDeleteV1,
-  SyncAssetExifV1,
-  SyncAlbumV1,
-  SyncAlbumDeleteV1,
-  SyncAlbumUserV1,
-  SyncAlbumUserDeleteV1,
-  SyncAlbumToAssetV1,
-  SyncAlbumToAssetDeleteV1,
-  SyncAckV1,
-];
-
-export const extraSyncModels = responseDtos;
-
 export class SyncStreamDto {
   @IsEnum(SyncRequestType, { each: true })
   @ApiProperty({ enumName: 'SyncRequestType', enum: SyncRequestType, isArray: true })
diff --git a/server/src/enum.ts b/server/src/enum.ts
index bbe8f001de..4a89baa6bd 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -584,19 +584,21 @@ export enum SyncRequestType {
   AlbumToAssetsV1 = 'AlbumToAssetsV1',
   AlbumAssetsV1 = 'AlbumAssetsV1',
   AlbumAssetExifsV1 = 'AlbumAssetExifsV1',
+  MemoriesV1 = 'MemoriesV1',
+  MemoryToAssetsV1 = 'MemoryToAssetsV1',
 }
 
 export enum SyncEntityType {
   UserV1 = 'UserV1',
   UserDeleteV1 = 'UserDeleteV1',
 
-  PartnerV1 = 'PartnerV1',
-  PartnerDeleteV1 = 'PartnerDeleteV1',
-
   AssetV1 = 'AssetV1',
   AssetDeleteV1 = 'AssetDeleteV1',
   AssetExifV1 = 'AssetExifV1',
 
+  PartnerV1 = 'PartnerV1',
+  PartnerDeleteV1 = 'PartnerDeleteV1',
+
   PartnerAssetV1 = 'PartnerAssetV1',
   PartnerAssetBackfillV1 = 'PartnerAssetBackfillV1',
   PartnerAssetDeleteV1 = 'PartnerAssetDeleteV1',
@@ -605,17 +607,26 @@ export enum SyncEntityType {
 
   AlbumV1 = 'AlbumV1',
   AlbumDeleteV1 = 'AlbumDeleteV1',
+
   AlbumUserV1 = 'AlbumUserV1',
   AlbumUserBackfillV1 = 'AlbumUserBackfillV1',
   AlbumUserDeleteV1 = 'AlbumUserDeleteV1',
+
   AlbumAssetV1 = 'AlbumAssetV1',
   AlbumAssetBackfillV1 = 'AlbumAssetBackfillV1',
   AlbumAssetExifV1 = 'AlbumAssetExifV1',
   AlbumAssetExifBackfillV1 = 'AlbumAssetExifBackfillV1',
+
   AlbumToAssetV1 = 'AlbumToAssetV1',
   AlbumToAssetDeleteV1 = 'AlbumToAssetDeleteV1',
   AlbumToAssetBackfillV1 = 'AlbumToAssetBackfillV1',
 
+  MemoryV1 = 'MemoryV1',
+  MemoryDeleteV1 = 'MemoryDeleteV1',
+
+  MemoryToAssetV1 = 'MemoryToAssetV1',
+  MemoryToAssetDeleteV1 = 'MemoryToAssetDeleteV1',
+
   SyncAckV1 = 'SyncAckV1',
 }
 
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index 46b72ffca0..0abe985317 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -652,3 +652,78 @@ where
   )
 order by
   "exif"."updateId" asc
+
+-- SyncRepository.getMemoryUpserts
+select
+  "id",
+  "createdAt",
+  "updatedAt",
+  "deletedAt",
+  "ownerId",
+  "type",
+  "data",
+  "isSaved",
+  "memoryAt",
+  "seenAt",
+  "showAt",
+  "hideAt",
+  "updateId"
+from
+  "memories"
+where
+  "ownerId" = $1
+  and "updatedAt" < now() - interval '1 millisecond'
+order by
+  "updateId" asc
+
+-- SyncRepository.getMemoryDeletes
+select
+  "id",
+  "memoryId"
+from
+  "memories_audit"
+where
+  "userId" = $1
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
+-- SyncRepository.getMemoryAssetUpserts
+select
+  "memoriesId" as "memoryId",
+  "assetsId" as "assetId",
+  "updateId"
+from
+  "memories_assets_assets"
+where
+  "memoriesId" in (
+    select
+      "id"
+    from
+      "memories"
+    where
+      "ownerId" = $1
+  )
+  and "updatedAt" < now() - interval '1 millisecond'
+order by
+  "updateId" asc
+
+-- SyncRepository.getMemoryAssetDeletes
+select
+  "id",
+  "memoryId",
+  "assetId"
+from
+  "memory_assets_audit"
+where
+  "memoryId" in (
+    select
+      "id"
+    from
+      "memories"
+    where
+      "ownerId" = $1
+  )
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index 0d44af4bb2..db616f78cc 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -13,8 +13,18 @@ type AuditTables =
   | 'assets_audit'
   | 'albums_audit'
   | 'album_users_audit'
-  | 'album_assets_audit';
-type UpsertTables = 'users' | 'partners' | 'assets' | 'exif' | 'albums' | 'albums_shared_users_users';
+  | 'album_assets_audit'
+  | 'memories_audit'
+  | 'memory_assets_audit';
+type UpsertTables =
+  | 'users'
+  | 'partners'
+  | 'assets'
+  | 'exif'
+  | 'albums'
+  | 'albums_shared_users_users'
+  | 'memories'
+  | 'memories_assets_assets';
 
 @Injectable()
 export class SyncRepository {
@@ -438,6 +448,61 @@ export class SyncRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getMemoryUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('memories')
+      .select([
+        'id',
+        'createdAt',
+        'updatedAt',
+        'deletedAt',
+        'ownerId',
+        'type',
+        'data',
+        'isSaved',
+        'memoryAt',
+        'seenAt',
+        'showAt',
+        'hideAt',
+      ])
+      .select('updateId')
+      .where('ownerId', '=', userId)
+      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getMemoryDeletes(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('memories_audit')
+      .select(['id', 'memoryId'])
+      .where('userId', '=', userId)
+      .$call((qb) => this.auditTableFilters(qb, ack))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getMemoryAssetUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('memories_assets_assets')
+      .select(['memoriesId as memoryId', 'assetsId as assetId'])
+      .select('updateId')
+      .where('memoriesId', 'in', (eb) => eb.selectFrom('memories').select('id').where('ownerId', '=', userId))
+      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getMemoryAssetDeletes(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('memory_assets_audit')
+      .select(['id', 'memoryId', 'assetId'])
+      .where('memoryId', 'in', (eb) => eb.selectFrom('memories').select('id').where('ownerId', '=', userId))
+      .$call((qb) => this.auditTableFilters(qb, ack))
+      .stream();
+  }
+
   private auditTableFilters<T extends keyof Pick<DB, AuditTables>, D>(qb: SelectQueryBuilder<DB, T, D>, ack?: SyncAck) {
     const builder = qb as SelectQueryBuilder<DB, AuditTables, D>;
     return builder
diff --git a/server/src/schema/functions.ts b/server/src/schema/functions.ts
index fdef5867b9..279eb62a24 100644
--- a/server/src/schema/functions.ts
+++ b/server/src/schema/functions.ts
@@ -176,3 +176,31 @@ export const album_users_delete_audit = registerFunction({
     END`,
   synchronize: false,
 });
+
+export const memories_delete_audit = registerFunction({
+  name: 'memories_delete_audit',
+  returnType: 'TRIGGER',
+  language: 'PLPGSQL',
+  body: `
+    BEGIN
+      INSERT INTO memories_audit ("memoryId", "userId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END`,
+  synchronize: false,
+});
+
+export const memory_assets_delete_audit = registerFunction({
+  name: 'memory_assets_delete_audit',
+  returnType: 'TRIGGER',
+  language: 'PLPGSQL',
+  body: `
+    BEGIN
+      INSERT INTO memory_assets_audit ("memoryId", "assetId")
+      SELECT "memoriesId", "assetsId" FROM OLD
+      WHERE "memoriesId" IN (SELECT "id" FROM memories WHERE "id" IN (SELECT "memoriesId" FROM OLD));
+      RETURN NULL;
+    END`,
+  synchronize: false,
+});
diff --git a/server/src/schema/index.ts b/server/src/schema/index.ts
index bab3acb232..6dac1ff51e 100644
--- a/server/src/schema/index.ts
+++ b/server/src/schema/index.ts
@@ -8,6 +8,8 @@ import {
   f_unaccent,
   immich_uuid_v7,
   ll_to_earth_public,
+  memories_delete_audit,
+  memory_assets_delete_audit,
   partners_delete_audit,
   updated_at,
   users_delete_audit,
@@ -30,8 +32,10 @@ import { ExifTable } from 'src/schema/tables/exif.table';
 import { FaceSearchTable } from 'src/schema/tables/face-search.table';
 import { GeodataPlacesTable } from 'src/schema/tables/geodata-places.table';
 import { LibraryTable } from 'src/schema/tables/library.table';
+import { MemoryAssetAuditTable } from 'src/schema/tables/memory-asset-audit.table';
+import { MemoryAssetTable } from 'src/schema/tables/memory-asset.table';
+import { MemoryAuditTable } from 'src/schema/tables/memory-audit.table';
 import { MemoryTable } from 'src/schema/tables/memory.table';
-import { MemoryAssetTable } from 'src/schema/tables/memory_asset.table';
 import { MoveTable } from 'src/schema/tables/move.table';
 import { NaturalEarthCountriesTable } from 'src/schema/tables/natural-earth-countries.table';
 import { NotificationTable } from 'src/schema/tables/notification.table';
@@ -75,8 +79,10 @@ export class ImmichDatabase {
     FaceSearchTable,
     GeodataPlacesTable,
     LibraryTable,
-    MemoryAssetTable,
     MemoryTable,
+    MemoryAuditTable,
+    MemoryAssetTable,
+    MemoryAssetAuditTable,
     MoveTable,
     NaturalEarthCountriesTable,
     NotificationTable,
@@ -110,6 +116,8 @@ export class ImmichDatabase {
     albums_delete_audit,
     album_user_after_insert,
     album_users_delete_audit,
+    memories_delete_audit,
+    memory_assets_delete_audit,
   ];
 
   enum = [assets_status_enum, asset_face_source_type, asset_visibility_enum];
diff --git a/server/src/schema/migrations/1751035357937-MemorySyncChanges.ts b/server/src/schema/migrations/1751035357937-MemorySyncChanges.ts
new file mode 100644
index 0000000000..8704c30ca3
--- /dev/null
+++ b/server/src/schema/migrations/1751035357937-MemorySyncChanges.ts
@@ -0,0 +1,80 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> { 
+  await sql`CREATE TABLE "memory_assets_audit" ("id" uuid NOT NULL DEFAULT immich_uuid_v7(), "memoryId" uuid NOT NULL, "assetId" uuid NOT NULL, "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp());`.execute(db);
+  await sql`CREATE TABLE "memories_audit" ("id" uuid NOT NULL DEFAULT immich_uuid_v7(), "memoryId" uuid NOT NULL, "userId" uuid NOT NULL, "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp());`.execute(db);
+  await sql`ALTER TABLE "memories_assets_assets" ADD "createdAt" timestamp with time zone NOT NULL DEFAULT now();`.execute(db);
+  await sql`ALTER TABLE "memories_assets_assets" ADD "updatedAt" timestamp with time zone NOT NULL DEFAULT now();`.execute(db);
+  await sql`ALTER TABLE "memories_assets_assets" ADD "updateId" uuid NOT NULL DEFAULT immich_uuid_v7();`.execute(db);
+  await sql`ALTER TABLE "memory_assets_audit" ADD CONSTRAINT "PK_35ef16910228f980e0766dcc59b" PRIMARY KEY ("id");`.execute(db);
+  await sql`ALTER TABLE "memories_audit" ADD CONSTRAINT "PK_19de798c033a710dcfa5c72f81b" PRIMARY KEY ("id");`.execute(db);
+  await sql`ALTER TABLE "memory_assets_audit" ADD CONSTRAINT "FK_225a204afcb0bd6de015080fb03" FOREIGN KEY ("memoryId") REFERENCES "memories" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
+  await sql`CREATE INDEX "IDX_memory_assets_audit_memory_id" ON "memory_assets_audit" ("memoryId")`.execute(db);
+  await sql`CREATE INDEX "IDX_memory_assets_audit_asset_id" ON "memory_assets_audit" ("assetId")`.execute(db);
+  await sql`CREATE INDEX "IDX_memory_assets_audit_deleted_at" ON "memory_assets_audit" ("deletedAt")`.execute(db);
+  await sql`CREATE INDEX "IDX_memory_assets_update_id" ON "memories_assets_assets" ("updateId")`.execute(db);
+  await sql`CREATE INDEX "IDX_memories_audit_memory_id" ON "memories_audit" ("memoryId")`.execute(db);
+  await sql`CREATE INDEX "IDX_memories_audit_user_id" ON "memories_audit" ("userId")`.execute(db);
+  await sql`CREATE INDEX "IDX_memories_audit_deleted_at" ON "memories_audit" ("deletedAt")`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION memories_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO memories_audit ("memoryId", "userId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION memory_assets_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO memory_assets_audit ("memoryId", "assetId")
+      SELECT "memoriesId", "assetsId" FROM OLD
+      WHERE "memoriesId" IN (SELECT "id" FROM memories WHERE "id" IN (SELECT "memoriesId" FROM OLD));
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "memories_delete_audit"
+  AFTER DELETE ON "memories"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION memories_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "memory_assets_delete_audit"
+  AFTER DELETE ON "memories_assets_assets"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() <= 1)
+  EXECUTE FUNCTION memory_assets_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "memory_assets_updated_at"
+  BEFORE UPDATE ON "memories_assets_assets"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`DROP TRIGGER "memories_delete_audit" ON "memories";`.execute(db);
+  await sql`DROP TRIGGER "memory_assets_delete_audit" ON "memories_assets_assets";`.execute(db);
+  await sql`DROP TRIGGER "memory_assets_updated_at" ON "memories_assets_assets";`.execute(db);
+  await sql`DROP INDEX "IDX_memory_assets_update_id";`.execute(db);
+  await sql`DROP INDEX "IDX_memory_assets_audit_memory_id";`.execute(db);
+  await sql`DROP INDEX "IDX_memory_assets_audit_asset_id";`.execute(db);
+  await sql`DROP INDEX "IDX_memory_assets_audit_deleted_at";`.execute(db);
+  await sql`DROP INDEX "IDX_memories_audit_memory_id";`.execute(db);
+  await sql`DROP INDEX "IDX_memories_audit_user_id";`.execute(db);
+  await sql`DROP INDEX "IDX_memories_audit_deleted_at";`.execute(db);
+  await sql`ALTER TABLE "memory_assets_audit" DROP CONSTRAINT "FK_225a204afcb0bd6de015080fb03";`.execute(db);
+  await sql`ALTER TABLE "memory_assets_audit" DROP CONSTRAINT "PK_35ef16910228f980e0766dcc59b";`.execute(db);
+  await sql`ALTER TABLE "memories_audit" DROP CONSTRAINT "PK_19de798c033a710dcfa5c72f81b";`.execute(db);
+  await sql`ALTER TABLE "memories_assets_assets" DROP COLUMN "createdAt";`.execute(db);
+  await sql`ALTER TABLE "memories_assets_assets" DROP COLUMN "updatedAt";`.execute(db);
+  await sql`ALTER TABLE "memories_assets_assets" DROP COLUMN "updateId";`.execute(db);
+  await sql`DROP TABLE "memory_assets_audit";`.execute(db);
+  await sql`DROP TABLE "memories_audit";`.execute(db);
+  await sql`DROP FUNCTION memories_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION memory_assets_delete_audit;`.execute(db);
+}
diff --git a/server/src/schema/tables/index.ts b/server/src/schema/tables/index.ts
index 470f500bc2..67b36ab351 100644
--- a/server/src/schema/tables/index.ts
+++ b/server/src/schema/tables/index.ts
@@ -13,8 +13,8 @@ import 'src/schema/tables/exif.table';
 import 'src/schema/tables/face-search.table';
 import 'src/schema/tables/geodata-places.table';
 import 'src/schema/tables/library.table';
+import 'src/schema/tables/memory-asset.table';
 import 'src/schema/tables/memory.table';
-import 'src/schema/tables/memory_asset.table';
 import 'src/schema/tables/move.table';
 import 'src/schema/tables/natural-earth-countries.table';
 import 'src/schema/tables/partner-audit.table';
diff --git a/server/src/schema/tables/memory-asset-audit.table.ts b/server/src/schema/tables/memory-asset-audit.table.ts
new file mode 100644
index 0000000000..ecb72f6270
--- /dev/null
+++ b/server/src/schema/tables/memory-asset-audit.table.ts
@@ -0,0 +1,23 @@
+import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
+import { MemoryTable } from 'src/schema/tables/memory.table';
+import { Column, CreateDateColumn, ForeignKeyColumn, Table } from 'src/sql-tools';
+
+@Table('memory_assets_audit')
+export class MemoryAssetAuditTable {
+  @PrimaryGeneratedUuidV7Column()
+  id!: string;
+
+  @ForeignKeyColumn(() => MemoryTable, {
+    type: 'uuid',
+    indexName: 'IDX_memory_assets_audit_memory_id',
+    onDelete: 'CASCADE',
+    onUpdate: 'CASCADE',
+  })
+  memoryId!: string;
+
+  @Column({ type: 'uuid', indexName: 'IDX_memory_assets_audit_asset_id' })
+  assetId!: string;
+
+  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_memory_assets_audit_deleted_at' })
+  deletedAt!: Date;
+}
diff --git a/server/src/schema/tables/memory-asset.table.ts b/server/src/schema/tables/memory-asset.table.ts
new file mode 100644
index 0000000000..9512ed61da
--- /dev/null
+++ b/server/src/schema/tables/memory-asset.table.ts
@@ -0,0 +1,36 @@
+import { ColumnType } from 'kysely';
+import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
+import { memory_assets_delete_audit } from 'src/schema/functions';
+import { AssetTable } from 'src/schema/tables/asset.table';
+import { MemoryTable } from 'src/schema/tables/memory.table';
+import { AfterDeleteTrigger, CreateDateColumn, ForeignKeyColumn, Table, UpdateDateColumn } from 'src/sql-tools';
+
+type Timestamp = ColumnType<Date, Date | string, Date | string>;
+type Generated<T> =
+  T extends ColumnType<infer S, infer I, infer U> ? ColumnType<S, I | undefined, U> : ColumnType<T, T | undefined, T>;
+
+@Table('memories_assets_assets')
+@UpdatedAtTrigger('memory_assets_updated_at')
+@AfterDeleteTrigger({
+  name: 'memory_assets_delete_audit',
+  scope: 'statement',
+  function: memory_assets_delete_audit,
+  referencingOldTableAs: 'old',
+  when: 'pg_trigger_depth() <= 1',
+})
+export class MemoryAssetTable {
+  @ForeignKeyColumn(() => MemoryTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE', primary: true })
+  memoriesId!: string;
+
+  @ForeignKeyColumn(() => AssetTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE', primary: true })
+  assetsId!: string;
+
+  @CreateDateColumn()
+  createdAt!: Generated<Timestamp>;
+
+  @UpdateDateColumn()
+  updatedAt!: Generated<Timestamp>;
+
+  @UpdateIdColumn({ indexName: 'IDX_memory_assets_update_id' })
+  updateId!: Generated<string>;
+}
diff --git a/server/src/schema/tables/memory-audit.table.ts b/server/src/schema/tables/memory-audit.table.ts
new file mode 100644
index 0000000000..efc6b66fd1
--- /dev/null
+++ b/server/src/schema/tables/memory-audit.table.ts
@@ -0,0 +1,22 @@
+import { ColumnType } from 'kysely';
+import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
+import { Column, CreateDateColumn, Table } from 'src/sql-tools';
+
+type Timestamp = ColumnType<Date, Date | string, Date | string>;
+type Generated<T> =
+  T extends ColumnType<infer S, infer I, infer U> ? ColumnType<S, I | undefined, U> : ColumnType<T, T | undefined, T>;
+
+@Table('memories_audit')
+export class MemoryAuditTable {
+  @PrimaryGeneratedUuidV7Column()
+  id!: Generated<string>;
+
+  @Column({ type: 'uuid', indexName: 'IDX_memories_audit_memory_id' })
+  memoryId!: string;
+
+  @Column({ type: 'uuid', indexName: 'IDX_memories_audit_user_id' })
+  userId!: string;
+
+  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_memories_audit_deleted_at' })
+  deletedAt!: Timestamp;
+}
diff --git a/server/src/schema/tables/memory.table.ts b/server/src/schema/tables/memory.table.ts
index 32dafe3384..d715820a9c 100644
--- a/server/src/schema/tables/memory.table.ts
+++ b/server/src/schema/tables/memory.table.ts
@@ -1,7 +1,9 @@
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { MemoryType } from 'src/enum';
+import { memories_delete_audit } from 'src/schema/functions';
 import { UserTable } from 'src/schema/tables/user.table';
 import {
+  AfterDeleteTrigger,
   Column,
   CreateDateColumn,
   DeleteDateColumn,
@@ -10,11 +12,17 @@ import {
   Table,
   UpdateDateColumn,
 } from 'src/sql-tools';
-import { MemoryData } from 'src/types';
 
 @Table('memories')
 @UpdatedAtTrigger('memories_updated_at')
-export class MemoryTable<T extends MemoryType = MemoryType> {
+@AfterDeleteTrigger({
+  name: 'memories_delete_audit',
+  scope: 'statement',
+  function: memories_delete_audit,
+  referencingOldTableAs: 'old',
+  when: 'pg_trigger_depth() = 0',
+})
+export class MemoryTable {
   @PrimaryGeneratedColumn()
   id!: string;
 
@@ -31,10 +39,10 @@ export class MemoryTable<T extends MemoryType = MemoryType> {
   ownerId!: string;
 
   @Column()
-  type!: T;
+  type!: MemoryType;
 
   @Column({ type: 'jsonb' })
-  data!: MemoryData[T];
+  data!: object;
 
   /** unless set to true, will be automatically deleted in the future */
   @Column({ type: 'boolean', default: false })
diff --git a/server/src/schema/tables/memory_asset.table.ts b/server/src/schema/tables/memory_asset.table.ts
deleted file mode 100644
index 0e5ca29a08..0000000000
--- a/server/src/schema/tables/memory_asset.table.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { AssetTable } from 'src/schema/tables/asset.table';
-import { MemoryTable } from 'src/schema/tables/memory.table';
-import { ForeignKeyColumn, Table } from 'src/sql-tools';
-
-@Table('memories_assets_assets')
-export class MemoryAssetTable {
-  @ForeignKeyColumn(() => MemoryTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE', primary: true })
-  memoriesId!: string;
-
-  @ForeignKeyColumn(() => AssetTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE', primary: true })
-  assetsId!: string;
-}
diff --git a/server/src/services/memory.service.spec.ts b/server/src/services/memory.service.spec.ts
index d55c58d9af..44929f2bbf 100644
--- a/server/src/services/memory.service.spec.ts
+++ b/server/src/services/memory.service.spec.ts
@@ -1,5 +1,6 @@
 import { BadRequestException } from '@nestjs/common';
 import { MemoryService } from 'src/services/memory.service';
+import { OnThisDayData } from 'src/types';
 import { factory, newUuid, newUuids } from 'test/small.factory';
 import { newTestService, ServiceMocks } from 'test/utils';
 
@@ -87,7 +88,7 @@ describe(MemoryService.name, () => {
       await expect(
         sut.create(factory.auth({ user: { id: userId } }), {
           type: memory.type,
-          data: memory.data,
+          data: memory.data as OnThisDayData,
           memoryAt: memory.memoryAt,
           isSaved: memory.isSaved,
           assetIds: [assetId],
@@ -117,7 +118,7 @@ describe(MemoryService.name, () => {
       await expect(
         sut.create(factory.auth({ user: { id: userId } }), {
           type: memory.type,
-          data: memory.data,
+          data: memory.data as OnThisDayData,
           assetIds: memory.assets.map((asset) => asset.id),
           memoryAt: memory.memoryAt,
         }),
@@ -135,7 +136,11 @@ describe(MemoryService.name, () => {
       mocks.memory.create.mockResolvedValue(memory);
 
       await expect(
-        sut.create(factory.auth(), { type: memory.type, data: memory.data, memoryAt: memory.memoryAt }),
+        sut.create(factory.auth(), {
+          type: memory.type,
+          data: memory.data as OnThisDayData,
+          memoryAt: memory.memoryAt,
+        }),
       ).resolves.toBeDefined();
     });
   });
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 484065bcc9..7e97f07370 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -65,6 +65,8 @@ export const SYNC_TYPES_ORDER = [
   SyncRequestType.AssetExifsV1,
   SyncRequestType.AlbumAssetExifsV1,
   SyncRequestType.PartnerAssetExifsV1,
+  SyncRequestType.MemoriesV1,
+  SyncRequestType.MemoryToAssetsV1,
 ];
 
 const throwSessionRequired = () => {
@@ -120,108 +122,70 @@ export class SyncService extends BaseService {
 
     const checkpoints = await this.syncRepository.getCheckpoints(sessionId);
     const checkpointMap: CheckpointMap = Object.fromEntries(checkpoints.map(({ type, ack }) => [type, fromAck(ack)]));
+    const handlers: Record<SyncRequestType, () => Promise<void>> = {
+      [SyncRequestType.UsersV1]: () => this.syncUsersV1(response, checkpointMap),
+      [SyncRequestType.PartnersV1]: () => this.syncPartnersV1(response, checkpointMap, auth),
+      [SyncRequestType.AssetsV1]: () => this.syncAssetsV1(response, checkpointMap, auth),
+      [SyncRequestType.AssetExifsV1]: () => this.syncAssetExifsV1(response, checkpointMap, auth),
+      [SyncRequestType.PartnerAssetsV1]: () => this.syncPartnerAssetsV1(response, checkpointMap, auth, sessionId),
+      [SyncRequestType.PartnerAssetExifsV1]: () =>
+        this.syncPartnerAssetExifsV1(response, checkpointMap, auth, sessionId),
+      [SyncRequestType.AlbumsV1]: () => this.syncAlbumsV1(response, checkpointMap, auth),
+      [SyncRequestType.AlbumUsersV1]: () => this.syncAlbumUsersV1(response, checkpointMap, auth, sessionId),
+      [SyncRequestType.AlbumAssetsV1]: () => this.syncAlbumAssetsV1(response, checkpointMap, auth, sessionId),
+      [SyncRequestType.AlbumToAssetsV1]: () => this.syncAlbumToAssetsV1(response, checkpointMap, auth, sessionId),
+      [SyncRequestType.AlbumAssetExifsV1]: () => this.syncAlbumAssetExifsV1(response, checkpointMap, auth, sessionId),
+      [SyncRequestType.MemoriesV1]: () => this.syncMemoriesV1(response, checkpointMap, auth),
+      [SyncRequestType.MemoryToAssetsV1]: () => this.syncMemoryAssetsV1(response, checkpointMap, auth),
+    };
 
     for (const type of SYNC_TYPES_ORDER.filter((type) => dto.types.includes(type))) {
-      switch (type) {
-        case SyncRequestType.UsersV1: {
-          await this.syncUsersV1(response, checkpointMap);
-          break;
-        }
-
-        case SyncRequestType.PartnersV1: {
-          await this.syncPartnersV1(response, checkpointMap, auth);
-          break;
-        }
-
-        case SyncRequestType.AssetsV1: {
-          await this.syncAssetsV1(response, checkpointMap, auth);
-          break;
-        }
-
-        case SyncRequestType.AssetExifsV1: {
-          await this.syncAssetExifsV1(response, checkpointMap, auth);
-          break;
-        }
-
-        case SyncRequestType.PartnerAssetsV1: {
-          await this.syncPartnerAssetsV1(response, checkpointMap, auth, sessionId);
-
-          break;
-        }
-
-        case SyncRequestType.PartnerAssetExifsV1: {
-          await this.syncPartnerAssetExifsV1(response, checkpointMap, auth, sessionId);
-          break;
-        }
-
-        case SyncRequestType.AlbumsV1: {
-          await this.syncAlbumsV1(response, checkpointMap, auth);
-          break;
-        }
-
-        case SyncRequestType.AlbumUsersV1: {
-          await this.syncAlbumUsersV1(response, checkpointMap, auth, sessionId);
-          break;
-        }
-
-        case SyncRequestType.AlbumAssetsV1: {
-          await this.syncAlbumAssetsV1(response, checkpointMap, auth, sessionId);
-          break;
-        }
-
-        case SyncRequestType.AlbumToAssetsV1: {
-          await this.syncAlbumToAssetsV1(response, checkpointMap, auth, sessionId);
-          break;
-        }
-
-        case SyncRequestType.AlbumAssetExifsV1: {
-          await this.syncAlbumAssetExifsV1(response, checkpointMap, auth, sessionId);
-          break;
-        }
-
-        default: {
-          this.logger.warn(`Unsupported sync type: ${type}`);
-          break;
-        }
-      }
+      const handler = handlers[type];
+      await handler();
     }
 
     response.end();
   }
 
   private async syncUsersV1(response: Writable, checkpointMap: CheckpointMap) {
-    const deletes = this.syncRepository.getUserDeletes(checkpointMap[SyncEntityType.UserDeleteV1]);
+    const deleteType = SyncEntityType.UserDeleteV1;
+    const deletes = this.syncRepository.getUserDeletes(checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
-      send(response, { type: SyncEntityType.UserDeleteV1, ids: [id], data });
+      send(response, { type: deleteType, ids: [id], data });
     }
 
-    const upserts = this.syncRepository.getUserUpserts(checkpointMap[SyncEntityType.UserV1]);
+    const upsertType = SyncEntityType.UserV1;
+    const upserts = this.syncRepository.getUserUpserts(checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
-      send(response, { type: SyncEntityType.UserV1, ids: [updateId], data });
+      send(response, { type: upsertType, ids: [updateId], data });
     }
   }
 
   private async syncPartnersV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
-    const deletes = this.syncRepository.getPartnerDeletes(auth.user.id, checkpointMap[SyncEntityType.PartnerDeleteV1]);
+    const deleteType = SyncEntityType.PartnerDeleteV1;
+    const deletes = this.syncRepository.getPartnerDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
-      send(response, { type: SyncEntityType.PartnerDeleteV1, ids: [id], data });
+      send(response, { type: deleteType, ids: [id], data });
     }
 
-    const upserts = this.syncRepository.getPartnerUpserts(auth.user.id, checkpointMap[SyncEntityType.PartnerV1]);
+    const upsertType = SyncEntityType.PartnerV1;
+    const upserts = this.syncRepository.getPartnerUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
-      send(response, { type: SyncEntityType.PartnerV1, ids: [updateId], data });
+      send(response, { type: upsertType, ids: [updateId], data });
     }
   }
 
   private async syncAssetsV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
-    const deletes = this.syncRepository.getAssetDeletes(auth.user.id, checkpointMap[SyncEntityType.AssetDeleteV1]);
+    const deleteType = SyncEntityType.AssetDeleteV1;
+    const deletes = this.syncRepository.getAssetDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
-      send(response, { type: SyncEntityType.AssetDeleteV1, ids: [id], data });
+      send(response, { type: deleteType, ids: [id], data });
     }
 
-    const upserts = this.syncRepository.getAssetUpserts(auth.user.id, checkpointMap[SyncEntityType.AssetV1]);
+    const upsertType = SyncEntityType.AssetV1;
+    const upserts = this.syncRepository.getAssetUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
-      send(response, { type: SyncEntityType.AssetV1, ids: [updateId], data: mapSyncAssetV1(data) });
+      send(response, { type: upsertType, ids: [updateId], data: mapSyncAssetV1(data) });
     }
   }
 
@@ -231,21 +195,17 @@ export class SyncService extends BaseService {
     auth: AuthDto,
     sessionId: string,
   ) {
-    const backfillType = SyncEntityType.PartnerAssetBackfillV1;
-    const upsertType = SyncEntityType.PartnerAssetV1;
     const deleteType = SyncEntityType.PartnerAssetDeleteV1;
-
-    const backfillCheckpoint = checkpointMap[backfillType];
-    const upsertCheckpoint = checkpointMap[upsertType];
-
     const deletes = this.syncRepository.getPartnerAssetDeletes(auth.user.id, checkpointMap[deleteType]);
-
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
 
+    const backfillType = SyncEntityType.PartnerAssetBackfillV1;
+    const backfillCheckpoint = checkpointMap[backfillType];
     const partners = await this.syncRepository.getPartnerBackfill(auth.user.id, backfillCheckpoint?.updateId);
-
+    const upsertType = SyncEntityType.PartnerAssetV1;
+    const upsertCheckpoint = checkpointMap[upsertType];
     if (upsertCheckpoint) {
       const endId = upsertCheckpoint.updateId;
 
@@ -283,9 +243,10 @@ export class SyncService extends BaseService {
   }
 
   private async syncAssetExifsV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
-    const upserts = this.syncRepository.getAssetExifsUpserts(auth.user.id, checkpointMap[SyncEntityType.AssetExifV1]);
+    const upsertType = SyncEntityType.AssetExifV1;
+    const upserts = this.syncRepository.getAssetExifsUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
-      send(response, { type: SyncEntityType.AssetExifV1, ids: [updateId], data });
+      send(response, { type: upsertType, ids: [updateId], data });
     }
   }
 
@@ -296,13 +257,11 @@ export class SyncService extends BaseService {
     sessionId: string,
   ) {
     const backfillType = SyncEntityType.PartnerAssetExifBackfillV1;
-    const upsertType = SyncEntityType.PartnerAssetExifV1;
-
     const backfillCheckpoint = checkpointMap[backfillType];
-    const upsertCheckpoint = checkpointMap[upsertType];
-
     const partners = await this.syncRepository.getPartnerBackfill(auth.user.id, backfillCheckpoint?.updateId);
 
+    const upsertType = SyncEntityType.PartnerAssetExifV1;
+    const upsertCheckpoint = checkpointMap[upsertType];
     if (upsertCheckpoint) {
       const endId = upsertCheckpoint.updateId;
 
@@ -336,33 +295,31 @@ export class SyncService extends BaseService {
   }
 
   private async syncAlbumsV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
-    const deletes = this.syncRepository.getAlbumDeletes(auth.user.id, checkpointMap[SyncEntityType.AlbumDeleteV1]);
-    for await (const { id, ...data } of deletes) {
-      send(response, { type: SyncEntityType.AlbumDeleteV1, ids: [id], data });
-    }
-
-    const upserts = this.syncRepository.getAlbumUpserts(auth.user.id, checkpointMap[SyncEntityType.AlbumV1]);
-    for await (const { updateId, ...data } of upserts) {
-      send(response, { type: SyncEntityType.AlbumV1, ids: [updateId], data });
-    }
-  }
-
-  private async syncAlbumUsersV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto, sessionId: string) {
-    const backfillType = SyncEntityType.AlbumUserBackfillV1;
-    const upsertType = SyncEntityType.AlbumUserV1;
-    const deleteType = SyncEntityType.AlbumUserDeleteV1;
-
-    const backfillCheckpoint = checkpointMap[backfillType];
-    const upsertCheckpoint = checkpointMap[upsertType];
-
-    const deletes = this.syncRepository.getAlbumUserDeletes(auth.user.id, checkpointMap[deleteType]);
-
+    const deleteType = SyncEntityType.AlbumDeleteV1;
+    const deletes = this.syncRepository.getAlbumDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
 
-    const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
+    const upsertType = SyncEntityType.AlbumV1;
+    const upserts = this.syncRepository.getAlbumUpserts(auth.user.id, checkpointMap[upsertType]);
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data });
+    }
+  }
 
+  private async syncAlbumUsersV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto, sessionId: string) {
+    const deleteType = SyncEntityType.AlbumUserDeleteV1;
+    const deletes = this.syncRepository.getAlbumUserDeletes(auth.user.id, checkpointMap[deleteType]);
+    for await (const { id, ...data } of deletes) {
+      send(response, { type: deleteType, ids: [id], data });
+    }
+
+    const backfillType = SyncEntityType.AlbumUserBackfillV1;
+    const backfillCheckpoint = checkpointMap[backfillType];
+    const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
+    const upsertType = SyncEntityType.AlbumUserV1;
+    const upsertCheckpoint = checkpointMap[upsertType];
     if (upsertCheckpoint) {
       const endId = upsertCheckpoint.updateId;
 
@@ -397,13 +354,10 @@ export class SyncService extends BaseService {
 
   private async syncAlbumAssetsV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto, sessionId: string) {
     const backfillType = SyncEntityType.AlbumAssetBackfillV1;
-    const upsertType = SyncEntityType.AlbumAssetV1;
-
     const backfillCheckpoint = checkpointMap[backfillType];
-    const upsertCheckpoint = checkpointMap[upsertType];
-
     const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
-
+    const upsertType = SyncEntityType.AlbumAssetV1;
+    const upsertCheckpoint = checkpointMap[upsertType];
     if (upsertCheckpoint) {
       const endId = upsertCheckpoint.updateId;
 
@@ -443,13 +397,10 @@ export class SyncService extends BaseService {
     sessionId: string,
   ) {
     const backfillType = SyncEntityType.AlbumAssetExifBackfillV1;
-    const upsertType = SyncEntityType.AlbumAssetExifV1;
-
     const backfillCheckpoint = checkpointMap[backfillType];
-    const upsertCheckpoint = checkpointMap[upsertType];
-
     const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
-
+    const upsertType = SyncEntityType.AlbumAssetExifV1;
+    const upsertCheckpoint = checkpointMap[upsertType];
     if (upsertCheckpoint) {
       const endId = upsertCheckpoint.updateId;
 
@@ -488,22 +439,17 @@ export class SyncService extends BaseService {
     auth: AuthDto,
     sessionId: string,
   ) {
-    const backfillType = SyncEntityType.AlbumToAssetBackfillV1;
-    const upsertType = SyncEntityType.AlbumToAssetV1;
-
-    const backfillCheckpoint = checkpointMap[backfillType];
-    const upsertCheckpoint = checkpointMap[upsertType];
-
-    const deletes = this.syncRepository.getAlbumToAssetDeletes(
-      auth.user.id,
-      checkpointMap[SyncEntityType.AlbumToAssetDeleteV1],
-    );
+    const deleteType = SyncEntityType.AlbumToAssetDeleteV1;
+    const deletes = this.syncRepository.getAlbumToAssetDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
-      send(response, { type: SyncEntityType.AlbumToAssetDeleteV1, ids: [id], data });
+      send(response, { type: deleteType, ids: [id], data });
     }
 
+    const backfillType = SyncEntityType.AlbumToAssetBackfillV1;
+    const backfillCheckpoint = checkpointMap[backfillType];
     const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
-
+    const upsertType = SyncEntityType.AlbumToAssetV1;
+    const upsertCheckpoint = checkpointMap[upsertType];
     if (upsertCheckpoint) {
       const endId = upsertCheckpoint.updateId;
 
@@ -536,6 +482,34 @@ export class SyncService extends BaseService {
     }
   }
 
+  private async syncMemoriesV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
+    const deleteType = SyncEntityType.MemoryDeleteV1;
+    const deletes = this.syncRepository.getMemoryDeletes(auth.user.id, checkpointMap[SyncEntityType.MemoryDeleteV1]);
+    for await (const { id, ...data } of deletes) {
+      send(response, { type: deleteType, ids: [id], data });
+    }
+
+    const upsertType = SyncEntityType.MemoryV1;
+    const upserts = this.syncRepository.getMemoryUpserts(auth.user.id, checkpointMap[upsertType]);
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data });
+    }
+  }
+
+  private async syncMemoryAssetsV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
+    const deleteType = SyncEntityType.MemoryToAssetDeleteV1;
+    const deletes = this.syncRepository.getMemoryAssetDeletes(auth.user.id, checkpointMap[deleteType]);
+    for await (const { id, ...data } of deletes) {
+      send(response, { type: deleteType, ids: [id], data });
+    }
+
+    const upsertType = SyncEntityType.MemoryToAssetV1;
+    const upserts = this.syncRepository.getMemoryAssetUpserts(auth.user.id, checkpointMap[upsertType]);
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data });
+    }
+  }
+
   private async upsertBackfillCheckpoint(item: { type: SyncEntityType; sessionId: string; createId: string }) {
     const { type, sessionId, createId } = item;
     await this.syncRepository.upsertCheckpoints([
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index 69708d0fce..8c113a13cf 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -4,9 +4,9 @@ import { DateTime } from 'luxon';
 import { createHash, randomBytes } from 'node:crypto';
 import { Writable } from 'node:stream';
 import { AssetFace } from 'src/database';
-import { Albums, AssetJobStatus, Assets, DB, Exif, FaceSearch, Person, Sessions } from 'src/db';
+import { Albums, AssetJobStatus, Assets, DB, Exif, FaceSearch, Memories, Person, Sessions } from 'src/db';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { AlbumUserRole, AssetType, AssetVisibility, SourceType, SyncRequestType } from 'src/enum';
+import { AlbumUserRole, AssetType, AssetVisibility, MemoryType, SourceType, SyncRequestType } from 'src/enum';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { ActivityRepository } from 'src/repositories/activity.repository';
 import { AlbumUserRepository } from 'src/repositories/album-user.repository';
@@ -129,6 +129,17 @@ export class MediumTestContext<S extends BaseService = BaseService> {
     return { asset, result };
   }
 
+  async newMemory(dto: Partial<Insertable<Memories>> = {}) {
+    const memory = mediumFactory.memoryInsert(dto);
+    const result = await this.get(MemoryRepository).create(memory, new Set<string>());
+    return { memory, result };
+  }
+
+  async newMemoryAsset(dto: { memoryId: string; assetId: string }) {
+    const result = await this.get(MemoryRepository).addAssetIds(dto.memoryId, [dto.assetId]);
+    return { memoryAsset: dto, result };
+  }
+
   async newExif(dto: Insertable<Exif>) {
     const result = await this.get(AssetRepository).upsertExif(dto);
     return { result };
@@ -452,6 +463,28 @@ const userInsert = (user: Partial<Insertable<UserTable>> = {}) => {
   return { ...defaults, ...user, id };
 };
 
+const memoryInsert = (memory: Partial<Insertable<Memories>> = {}) => {
+  const id = memory.id || newUuid();
+  const date = newDate();
+
+  const defaults: Insertable<Memories> = {
+    id,
+    createdAt: date,
+    updatedAt: date,
+    deletedAt: null,
+    type: MemoryType.ON_THIS_DAY,
+    data: { year: 2025 },
+    showAt: null,
+    hideAt: null,
+    seenAt: null,
+    isSaved: false,
+    memoryAt: date,
+    ownerId: memory.ownerId || newUuid(),
+  };
+
+  return { ...defaults, ...memory, id };
+};
+
 class CustomWritable extends Writable {
   private data = '';
 
@@ -483,4 +516,5 @@ export const mediumFactory = {
   sessionInsert,
   syncStream,
   userInsert,
+  memoryInsert,
 };
diff --git a/server/test/medium/specs/sync/sync-memory-asset.spec.ts b/server/test/medium/specs/sync/sync-memory-asset.spec.ts
new file mode 100644
index 0000000000..a6cfadea6d
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-memory-asset.spec.ts
@@ -0,0 +1,84 @@
+import { Kysely } from 'kysely';
+import { DB } from 'src/db';
+import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { MemoryRepository } from 'src/repositories/memory.repository';
+import { SyncTestContext } from 'test/medium.factory';
+import { getKyselyDB } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(SyncEntityType.MemoryToAssetV1, () => {
+  it('should detect and sync a memory to asset relation', async () => {
+    const { auth, user, ctx } = await setup();
+    const { asset } = await ctx.newAsset({ ownerId: user.id });
+    const { memory } = await ctx.newMemory({ ownerId: user.id });
+    await ctx.newMemoryAsset({ memoryId: memory.id, assetId: asset.id });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.MemoryToAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          memoryId: memory.id,
+          assetId: asset.id,
+        },
+        type: 'MemoryToAssetV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.MemoryToAssetsV1])).resolves.toEqual([]);
+  });
+
+  it('should detect and sync a deleted memory to asset relation', async () => {
+    const { auth, user, ctx } = await setup();
+    const memoryRepo = ctx.get(MemoryRepository);
+    const { asset } = await ctx.newAsset({ ownerId: user.id });
+    const { memory } = await ctx.newMemory({ ownerId: user.id });
+    await ctx.newMemoryAsset({ memoryId: memory.id, assetId: asset.id });
+    await memoryRepo.removeAssetIds(memory.id, [asset.id]);
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.MemoryToAssetsV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          assetId: asset.id,
+          memoryId: memory.id,
+        },
+        type: 'MemoryToAssetDeleteV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.MemoryToAssetsV1])).resolves.toEqual([]);
+  });
+
+  it('should not sync a memory to asset relation or delete for an unrelated user', async () => {
+    const { auth, ctx } = await setup();
+    const memoryRepo = ctx.get(MemoryRepository);
+    const { auth: auth2, user: user2 } = await ctx.newSyncAuthUser();
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    const { memory } = await ctx.newMemory({ ownerId: user2.id });
+    await ctx.newMemoryAsset({ memoryId: memory.id, assetId: asset.id });
+
+    expect(await ctx.syncStream(auth, [SyncRequestType.MemoryToAssetsV1])).toHaveLength(0);
+    expect(await ctx.syncStream(auth2, [SyncRequestType.MemoryToAssetsV1])).toHaveLength(1);
+
+    await memoryRepo.removeAssetIds(memory.id, [asset.id]);
+    expect(await ctx.syncStream(auth, [SyncRequestType.MemoryToAssetsV1])).toHaveLength(0);
+    expect(await ctx.syncStream(auth2, [SyncRequestType.MemoryToAssetsV1])).toHaveLength(1);
+  });
+});
diff --git a/server/test/medium/specs/sync/sync-memory.spec.ts b/server/test/medium/specs/sync/sync-memory.spec.ts
new file mode 100644
index 0000000000..df41671fde
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-memory.spec.ts
@@ -0,0 +1,115 @@
+import { Kysely } from 'kysely';
+import { DB } from 'src/db';
+import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { MemoryRepository } from 'src/repositories/memory.repository';
+import { SyncTestContext } from 'test/medium.factory';
+import { getKyselyDB } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(SyncEntityType.MemoryV1, () => {
+  it('should detect and sync the first memory with the right properties', async () => {
+    const { auth, user: user1, ctx } = await setup();
+    const { memory } = await ctx.newMemory({ ownerId: user1.id });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.MemoriesV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: memory.id,
+          createdAt: expect.any(String),
+          updatedAt: expect.any(String),
+          deletedAt: memory.deletedAt,
+          type: memory.type,
+          data: memory.data,
+          hideAt: memory.hideAt,
+          showAt: memory.showAt,
+          seenAt: memory.seenAt,
+          memoryAt: expect.any(String),
+          isSaved: memory.isSaved,
+          ownerId: memory.ownerId,
+        },
+        type: 'MemoryV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.MemoriesV1])).resolves.toEqual([]);
+  });
+
+  it('should detect and sync a deleted memory', async () => {
+    const { auth, user, ctx } = await setup();
+    const memoryRepo = ctx.get(MemoryRepository);
+    const { memory } = await ctx.newMemory({ ownerId: user.id });
+    await memoryRepo.delete(memory.id);
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.MemoriesV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          memoryId: memory.id,
+        },
+        type: 'MemoryDeleteV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.MemoriesV1])).resolves.toEqual([]);
+  });
+
+  it('should sync a memory and then an update to that same memory', async () => {
+    const { auth, user, ctx } = await setup();
+    const memoryRepo = ctx.get(MemoryRepository);
+    const { memory } = await ctx.newMemory({ ownerId: user.id });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.MemoriesV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({ id: memory.id }),
+        type: 'MemoryV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await memoryRepo.update(memory.id, { seenAt: new Date() });
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.MemoriesV1]);
+    expect(newResponse).toHaveLength(1);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({ id: memory.id }),
+        type: 'MemoryV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.MemoriesV1])).resolves.toEqual([]);
+  });
+
+  it('should not sync a memory or a memory delete for an unrelated user', async () => {
+    const { auth, ctx } = await setup();
+    const memoryRepo = ctx.get(MemoryRepository);
+    const { user: user2 } = await ctx.newUser();
+    const { memory } = await ctx.newMemory({ ownerId: user2.id });
+
+    await expect(ctx.syncStream(auth, [SyncRequestType.MemoriesV1])).resolves.toEqual([]);
+    await memoryRepo.delete(memory.id);
+    await expect(ctx.syncStream(auth, [SyncRequestType.MemoriesV1])).resolves.toEqual([]);
+  });
+});

From df76735f4a9b089e0451423c8dce4bd98a0466c7 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 27 Jun 2025 13:47:06 -0400
Subject: [PATCH 075/337] refactor: sync repository (#19581)

---
 server/src/bin/sync-sql.ts                    |    3 +-
 .../queries/sync.checkpoint.repository.sql    |   15 +
 server/src/queries/sync.repository.sql        | 1028 ++++++++---------
 server/src/repositories/index.ts              |    2 +
 .../sync-checkpoint.repository.ts             |   41 +
 server/src/repositories/sync.repository.ts    |  664 ++++++-----
 server/src/services/base.service.ts           |    3 +
 server/src/services/sync.service.ts           |   78 +-
 server/test/medium.factory.ts                 |    9 +-
 server/test/utils.ts                          |    4 +
 10 files changed, 968 insertions(+), 879 deletions(-)
 create mode 100644 server/src/queries/sync.checkpoint.repository.sql
 create mode 100644 server/src/repositories/sync-checkpoint.repository.ts

diff --git a/server/src/bin/sync-sql.ts b/server/src/bin/sync-sql.ts
index a114830e09..6d3cb42fae 100644
--- a/server/src/bin/sync-sql.ts
+++ b/server/src/bin/sync-sql.ts
@@ -15,6 +15,7 @@ import { repositories } from 'src/repositories';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { SyncRepository } from 'src/repositories/sync.repository';
 import { AuthService } from 'src/services/auth.service';
 import { getKyselyConfig } from 'src/utils/database';
 
@@ -111,7 +112,7 @@ class SqlGenerator {
     data.push(...(await this.runTargets(instance, `${Repository.name}`)));
 
     // nested repositories
-    if (Repository.name === AccessRepository.name) {
+    if (Repository.name === AccessRepository.name || Repository.name === SyncRepository.name) {
       for (const key of Object.keys(instance)) {
         const subInstance = (instance as any)[key];
         data.push(...(await this.runTargets(subInstance, `${Repository.name}.${key}`)));
diff --git a/server/src/queries/sync.checkpoint.repository.sql b/server/src/queries/sync.checkpoint.repository.sql
new file mode 100644
index 0000000000..40edf0f405
--- /dev/null
+++ b/server/src/queries/sync.checkpoint.repository.sql
@@ -0,0 +1,15 @@
+-- NOTE: This file is auto generated by ./sql-generator
+
+-- SyncCheckpointRepository.getAll
+select
+  "type",
+  "ack"
+from
+  "session_sync_checkpoints"
+where
+  "sessionId" = $1
+
+-- SyncCheckpointRepository.deleteAll
+delete from "session_sync_checkpoints"
+where
+  "sessionId" = $1
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index 0abe985317..bbd327ff69 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -1,141 +1,342 @@
 -- NOTE: This file is auto generated by ./sql-generator
 
--- SyncRepository.getCheckpoints
+-- SyncRepository.album.getCreatedAfter
 select
-  "type",
-  "ack"
+  "albumsId" as "id",
+  "createId"
 from
-  "session_sync_checkpoints"
+  "albums_shared_users_users"
 where
-  "sessionId" = $1
-
--- SyncRepository.deleteCheckpoints
-delete from "session_sync_checkpoints"
-where
-  "sessionId" = $1
-
--- SyncRepository.getUserUpserts
-select
-  "id",
-  "name",
-  "email",
-  "deletedAt",
-  "updateId"
-from
-  "users"
-where
-  "updatedAt" < now() - interval '1 millisecond'
+  "usersId" = $1
+  and "createId" >= $2
+  and "createdAt" < now() - interval '1 millisecond'
 order by
-  "updateId" asc
+  "createId" asc
 
--- SyncRepository.getUserDeletes
+-- SyncRepository.album.getDeletes
 select
   "id",
-  "userId"
+  "albumId"
 from
-  "users_audit"
+  "albums_audit"
 where
-  "deletedAt" < now() - interval '1 millisecond'
+  "userId" = $1
+  and "deletedAt" < now() - interval '1 millisecond'
 order by
   "id" asc
 
--- SyncRepository.getPartnerUpserts
-select
-  "sharedById",
-  "sharedWithId",
-  "inTimeline",
-  "updateId"
+-- SyncRepository.album.getUpserts
+select distinct
+  on ("albums"."id", "albums"."updateId") "albums"."id",
+  "albums"."ownerId",
+  "albums"."albumName" as "name",
+  "albums"."description",
+  "albums"."createdAt",
+  "albums"."updatedAt",
+  "albums"."albumThumbnailAssetId" as "thumbnailAssetId",
+  "albums"."isActivityEnabled",
+  "albums"."order",
+  "albums"."updateId"
 from
-  "partners"
+  "albums"
+  left join "albums_shared_users_users" as "album_users" on "albums"."id" = "album_users"."albumsId"
 where
-  (
-    "sharedById" = $1
-    or "sharedWithId" = $2
+  "albums"."updatedAt" < now() - interval '1 millisecond'
+  and (
+    "albums"."ownerId" = $1
+    or "album_users"."usersId" = $2
   )
-  and "updatedAt" < now() - interval '1 millisecond'
 order by
-  "updateId" asc
+  "albums"."updateId" asc
 
--- SyncRepository.getPartnerDeletes
+-- SyncRepository.albumAsset.getBackfill
+select
+  "assets"."id",
+  "assets"."ownerId",
+  "assets"."originalFileName",
+  "assets"."thumbhash",
+  "assets"."checksum",
+  "assets"."fileCreatedAt",
+  "assets"."fileModifiedAt",
+  "assets"."localDateTime",
+  "assets"."type",
+  "assets"."deletedAt",
+  "assets"."isFavorite",
+  "assets"."visibility",
+  "assets"."duration",
+  "assets"."updateId"
+from
+  "assets"
+  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "assets"."id"
+where
+  "album_assets"."albumsId" = $1
+  and "assets"."updatedAt" < now() - interval '1 millisecond'
+  and "assets"."updateId" <= $2
+  and "assets"."updateId" >= $3
+order by
+  "assets"."updateId" asc
+
+-- SyncRepository.albumAsset.getUpserts
+select
+  "assets"."id",
+  "assets"."ownerId",
+  "assets"."originalFileName",
+  "assets"."thumbhash",
+  "assets"."checksum",
+  "assets"."fileCreatedAt",
+  "assets"."fileModifiedAt",
+  "assets"."localDateTime",
+  "assets"."type",
+  "assets"."deletedAt",
+  "assets"."isFavorite",
+  "assets"."visibility",
+  "assets"."duration",
+  "assets"."updateId"
+from
+  "assets"
+  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "assets"."id"
+  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
+  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
+where
+  "assets"."updatedAt" < now() - interval '1 millisecond'
+  and (
+    "albums"."ownerId" = $1
+    or "album_users"."usersId" = $2
+  )
+order by
+  "assets"."updateId" asc
+
+-- SyncRepository.albumAssetExif.getBackfill
+select
+  "exif"."assetId",
+  "exif"."description",
+  "exif"."exifImageWidth",
+  "exif"."exifImageHeight",
+  "exif"."fileSizeInByte",
+  "exif"."orientation",
+  "exif"."dateTimeOriginal",
+  "exif"."modifyDate",
+  "exif"."timeZone",
+  "exif"."latitude",
+  "exif"."longitude",
+  "exif"."projectionType",
+  "exif"."city",
+  "exif"."state",
+  "exif"."country",
+  "exif"."make",
+  "exif"."model",
+  "exif"."lensModel",
+  "exif"."fNumber",
+  "exif"."focalLength",
+  "exif"."iso",
+  "exif"."exposureTime",
+  "exif"."profileDescription",
+  "exif"."rating",
+  "exif"."fps",
+  "exif"."updateId"
+from
+  "exif"
+  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "exif"."assetId"
+where
+  "album_assets"."albumsId" = $1
+  and "exif"."updatedAt" < now() - interval '1 millisecond'
+  and "exif"."updateId" <= $2
+  and "exif"."updateId" >= $3
+order by
+  "exif"."updateId" asc
+
+-- SyncRepository.albumAssetExif.getUpserts
+select
+  "exif"."assetId",
+  "exif"."description",
+  "exif"."exifImageWidth",
+  "exif"."exifImageHeight",
+  "exif"."fileSizeInByte",
+  "exif"."orientation",
+  "exif"."dateTimeOriginal",
+  "exif"."modifyDate",
+  "exif"."timeZone",
+  "exif"."latitude",
+  "exif"."longitude",
+  "exif"."projectionType",
+  "exif"."city",
+  "exif"."state",
+  "exif"."country",
+  "exif"."make",
+  "exif"."model",
+  "exif"."lensModel",
+  "exif"."fNumber",
+  "exif"."focalLength",
+  "exif"."iso",
+  "exif"."exposureTime",
+  "exif"."profileDescription",
+  "exif"."rating",
+  "exif"."fps",
+  "exif"."updateId"
+from
+  "exif"
+  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "exif"."assetId"
+  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
+  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
+where
+  "exif"."updatedAt" < now() - interval '1 millisecond'
+  and (
+    "albums"."ownerId" = $1
+    or "album_users"."usersId" = $2
+  )
+order by
+  "exif"."updateId" asc
+
+-- SyncRepository.albumToAsset.getBackfill
+select
+  "album_assets"."assetsId" as "assetId",
+  "album_assets"."albumsId" as "albumId",
+  "album_assets"."updateId"
+from
+  "albums_assets_assets" as "album_assets"
+where
+  "album_assets"."albumsId" = $1
+  and "album_assets"."updatedAt" < now() - interval '1 millisecond'
+  and "album_assets"."updateId" <= $2
+  and "album_assets"."updateId" >= $3
+order by
+  "album_assets"."updateId" asc
+
+-- SyncRepository.albumToAsset.getDeletes
 select
   "id",
-  "sharedById",
-  "sharedWithId"
+  "assetId",
+  "albumId"
 from
-  "partners_audit"
+  "album_assets_audit"
 where
-  (
-    "sharedById" = $1
-    or "sharedWithId" = $2
+  "albumId" in (
+    select
+      "id"
+    from
+      "albums"
+    where
+      "ownerId" = $1
+    union
+    (
+      select
+        "albumUsers"."albumsId" as "id"
+      from
+        "albums_shared_users_users" as "albumUsers"
+      where
+        "albumUsers"."usersId" = $2
+    )
   )
   and "deletedAt" < now() - interval '1 millisecond'
 order by
   "id" asc
 
--- SyncRepository.getAssetUpserts
+-- SyncRepository.albumToAsset.getUpserts
 select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."originalFileName",
-  "assets"."thumbhash",
-  "assets"."checksum",
-  "assets"."fileCreatedAt",
-  "assets"."fileModifiedAt",
-  "assets"."localDateTime",
-  "assets"."type",
-  "assets"."deletedAt",
-  "assets"."isFavorite",
-  "assets"."visibility",
-  "assets"."duration",
-  "assets"."updateId"
+  "album_assets"."assetsId" as "assetId",
+  "album_assets"."albumsId" as "albumId",
+  "album_assets"."updateId"
 from
-  "assets"
+  "albums_assets_assets" as "album_assets"
+  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
+  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
 where
-  "ownerId" = $1
-  and "updatedAt" < now() - interval '1 millisecond'
+  "album_assets"."updatedAt" < now() - interval '1 millisecond'
+  and (
+    "albums"."ownerId" = $1
+    or "album_users"."usersId" = $2
+  )
 order by
-  "updateId" asc
+  "album_assets"."updateId" asc
 
--- SyncRepository.getPartnerBackfill
+-- SyncRepository.albumUser.getBackfill
 select
-  "sharedById",
-  "createId"
+  "album_users"."albumsId" as "albumId",
+  "album_users"."usersId" as "userId",
+  "album_users"."role",
+  "album_users"."updateId"
 from
-  "partners"
+  "albums_shared_users_users" as "album_users"
 where
-  "sharedWithId" = $1
-  and "createId" >= $2
-  and "createdAt" < now() - interval '1 millisecond'
-order by
-  "partners"."createId" asc
-
--- SyncRepository.getPartnerAssetsBackfill
-select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."originalFileName",
-  "assets"."thumbhash",
-  "assets"."checksum",
-  "assets"."fileCreatedAt",
-  "assets"."fileModifiedAt",
-  "assets"."localDateTime",
-  "assets"."type",
-  "assets"."deletedAt",
-  "assets"."isFavorite",
-  "assets"."visibility",
-  "assets"."duration",
-  "assets"."updateId"
-from
-  "assets"
-where
-  "ownerId" = $1
+  "albumsId" = $1
   and "updatedAt" < now() - interval '1 millisecond'
   and "updateId" <= $2
   and "updateId" >= $3
 order by
   "updateId" asc
 
--- SyncRepository.getPartnerAssetsUpserts
+-- SyncRepository.albumUser.getDeletes
+select
+  "id",
+  "userId",
+  "albumId"
+from
+  "album_users_audit"
+where
+  "albumId" in (
+    select
+      "id"
+    from
+      "albums"
+    where
+      "ownerId" = $1
+    union
+    (
+      select
+        "albumUsers"."albumsId" as "id"
+      from
+        "albums_shared_users_users" as "albumUsers"
+      where
+        "albumUsers"."usersId" = $2
+    )
+  )
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
+-- SyncRepository.albumUser.getUpserts
+select
+  "album_users"."albumsId" as "albumId",
+  "album_users"."usersId" as "userId",
+  "album_users"."role",
+  "album_users"."updateId"
+from
+  "albums_shared_users_users" as "album_users"
+where
+  "album_users"."updatedAt" < now() - interval '1 millisecond'
+  and "album_users"."albumsId" in (
+    select
+      "id"
+    from
+      "albums"
+    where
+      "ownerId" = $1
+    union
+    (
+      select
+        "albumUsers"."albumsId" as "id"
+      from
+        "albums_shared_users_users" as "albumUsers"
+      where
+        "albumUsers"."usersId" = $2
+    )
+  )
+order by
+  "album_users"."updateId" asc
+
+-- SyncRepository.asset.getDeletes
+select
+  "id",
+  "assetId"
+from
+  "assets_audit"
+where
+  "ownerId" = $1
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
+-- SyncRepository.asset.getUpserts
 select
   "assets"."id",
   "assets"."ownerId",
@@ -154,50 +355,12 @@ select
 from
   "assets"
 where
-  "ownerId" in (
-    select
-      "sharedById"
-    from
-      "partners"
-    where
-      "sharedWithId" = $1
-  )
+  "ownerId" = $1
   and "updatedAt" < now() - interval '1 millisecond'
 order by
   "updateId" asc
 
--- SyncRepository.getAssetDeletes
-select
-  "id",
-  "assetId"
-from
-  "assets_audit"
-where
-  "ownerId" = $1
-  and "deletedAt" < now() - interval '1 millisecond'
-order by
-  "id" asc
-
--- SyncRepository.getPartnerAssetDeletes
-select
-  "id",
-  "assetId"
-from
-  "assets_audit"
-where
-  "ownerId" in (
-    select
-      "sharedById"
-    from
-      "partners"
-    where
-      "sharedWithId" = $1
-  )
-  and "deletedAt" < now() - interval '1 millisecond'
-order by
-  "id" asc
-
--- SyncRepository.getAssetExifsUpserts
+-- SyncRepository.assetExif.getUpserts
 select
   "exif"."assetId",
   "exif"."description",
@@ -240,7 +403,204 @@ where
 order by
   "updateId" asc
 
--- SyncRepository.getPartnerAssetExifsBackfill
+-- SyncRepository.memory.getDeletes
+select
+  "id",
+  "memoryId"
+from
+  "memories_audit"
+where
+  "userId" = $1
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
+-- SyncRepository.memory.getUpserts
+select
+  "id",
+  "createdAt",
+  "updatedAt",
+  "deletedAt",
+  "ownerId",
+  "type",
+  "data",
+  "isSaved",
+  "memoryAt",
+  "seenAt",
+  "showAt",
+  "hideAt",
+  "updateId"
+from
+  "memories"
+where
+  "ownerId" = $1
+  and "updatedAt" < now() - interval '1 millisecond'
+order by
+  "updateId" asc
+
+-- SyncRepository.memoryToAsset.getDeletes
+select
+  "id",
+  "memoryId",
+  "assetId"
+from
+  "memory_assets_audit"
+where
+  "memoryId" in (
+    select
+      "id"
+    from
+      "memories"
+    where
+      "ownerId" = $1
+  )
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
+-- SyncRepository.memoryToAsset.getUpserts
+select
+  "memoriesId" as "memoryId",
+  "assetsId" as "assetId",
+  "updateId"
+from
+  "memories_assets_assets"
+where
+  "memoriesId" in (
+    select
+      "id"
+    from
+      "memories"
+    where
+      "ownerId" = $1
+  )
+  and "updatedAt" < now() - interval '1 millisecond'
+order by
+  "updateId" asc
+
+-- SyncRepository.partner.getCreatedAfter
+select
+  "sharedById",
+  "createId"
+from
+  "partners"
+where
+  "sharedWithId" = $1
+  and "createId" >= $2
+  and "createdAt" < now() - interval '1 millisecond'
+order by
+  "partners"."createId" asc
+
+-- SyncRepository.partner.getDeletes
+select
+  "id",
+  "sharedById",
+  "sharedWithId"
+from
+  "partners_audit"
+where
+  (
+    "sharedById" = $1
+    or "sharedWithId" = $2
+  )
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
+-- SyncRepository.partner.getUpserts
+select
+  "sharedById",
+  "sharedWithId",
+  "inTimeline",
+  "updateId"
+from
+  "partners"
+where
+  (
+    "sharedById" = $1
+    or "sharedWithId" = $2
+  )
+  and "updatedAt" < now() - interval '1 millisecond'
+order by
+  "updateId" asc
+
+-- SyncRepository.partnerAsset.getBackfill
+select
+  "assets"."id",
+  "assets"."ownerId",
+  "assets"."originalFileName",
+  "assets"."thumbhash",
+  "assets"."checksum",
+  "assets"."fileCreatedAt",
+  "assets"."fileModifiedAt",
+  "assets"."localDateTime",
+  "assets"."type",
+  "assets"."deletedAt",
+  "assets"."isFavorite",
+  "assets"."visibility",
+  "assets"."duration",
+  "assets"."updateId"
+from
+  "assets"
+where
+  "ownerId" = $1
+  and "updatedAt" < now() - interval '1 millisecond'
+  and "updateId" <= $2
+  and "updateId" >= $3
+order by
+  "updateId" asc
+
+-- SyncRepository.partnerAsset.getDeletes
+select
+  "id",
+  "assetId"
+from
+  "assets_audit"
+where
+  "ownerId" in (
+    select
+      "sharedById"
+    from
+      "partners"
+    where
+      "sharedWithId" = $1
+  )
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
+-- SyncRepository.partnerAsset.getUpserts
+select
+  "assets"."id",
+  "assets"."ownerId",
+  "assets"."originalFileName",
+  "assets"."thumbhash",
+  "assets"."checksum",
+  "assets"."fileCreatedAt",
+  "assets"."fileModifiedAt",
+  "assets"."localDateTime",
+  "assets"."type",
+  "assets"."deletedAt",
+  "assets"."isFavorite",
+  "assets"."visibility",
+  "assets"."duration",
+  "assets"."updateId"
+from
+  "assets"
+where
+  "ownerId" in (
+    select
+      "sharedById"
+    from
+      "partners"
+    where
+      "sharedWithId" = $1
+  )
+  and "updatedAt" < now() - interval '1 millisecond'
+order by
+  "updateId" asc
+
+-- SyncRepository.partnerAssetExif.getBackfill
 select
   "exif"."assetId",
   "exif"."description",
@@ -279,7 +639,7 @@ where
 order by
   "exif"."updateId" asc
 
--- SyncRepository.getPartnerAssetExifsUpserts
+-- SyncRepository.partnerAssetExif.getUpserts
 select
   "exif"."assetId",
   "exif"."description",
@@ -329,401 +689,27 @@ where
 order by
   "updateId" asc
 
--- SyncRepository.getAlbumDeletes
+-- SyncRepository.user.getDeletes
 select
   "id",
-  "albumId"
+  "userId"
 from
-  "albums_audit"
+  "users_audit"
 where
-  "userId" = $1
-  and "deletedAt" < now() - interval '1 millisecond'
+  "deletedAt" < now() - interval '1 millisecond'
 order by
   "id" asc
 
--- SyncRepository.getAlbumUpserts
-select distinct
-  on ("albums"."id", "albums"."updateId") "albums"."id",
-  "albums"."ownerId",
-  "albums"."albumName" as "name",
-  "albums"."description",
-  "albums"."createdAt",
-  "albums"."updatedAt",
-  "albums"."albumThumbnailAssetId" as "thumbnailAssetId",
-  "albums"."isActivityEnabled",
-  "albums"."order",
-  "albums"."updateId"
-from
-  "albums"
-  left join "albums_shared_users_users" as "album_users" on "albums"."id" = "album_users"."albumsId"
-where
-  "albums"."updatedAt" < now() - interval '1 millisecond'
-  and (
-    "albums"."ownerId" = $1
-    or "album_users"."usersId" = $2
-  )
-order by
-  "albums"."updateId" asc
-
--- SyncRepository.getAlbumToAssetDeletes
+-- SyncRepository.user.getUpserts
 select
   "id",
-  "assetId",
-  "albumId"
-from
-  "album_assets_audit"
-where
-  "albumId" in (
-    select
-      "id"
-    from
-      "albums"
-    where
-      "ownerId" = $1
-    union
-    (
-      select
-        "albumUsers"."albumsId" as "id"
-      from
-        "albums_shared_users_users" as "albumUsers"
-      where
-        "albumUsers"."usersId" = $2
-    )
-  )
-  and "deletedAt" < now() - interval '1 millisecond'
-order by
-  "id" asc
-
--- SyncRepository.getAlbumUserDeletes
-select
-  "id",
-  "userId",
-  "albumId"
-from
-  "album_users_audit"
-where
-  "albumId" in (
-    select
-      "id"
-    from
-      "albums"
-    where
-      "ownerId" = $1
-    union
-    (
-      select
-        "albumUsers"."albumsId" as "id"
-      from
-        "albums_shared_users_users" as "albumUsers"
-      where
-        "albumUsers"."usersId" = $2
-    )
-  )
-  and "deletedAt" < now() - interval '1 millisecond'
-order by
-  "id" asc
-
--- SyncRepository.getAlbumBackfill
-select
-  "albumsId" as "id",
-  "createId"
-from
-  "albums_shared_users_users"
-where
-  "usersId" = $1
-  and "createId" >= $2
-  and "createdAt" < now() - interval '1 millisecond'
-order by
-  "createId" asc
-
--- SyncRepository.getAlbumUsersBackfill
-select
-  "album_users"."albumsId" as "albumId",
-  "album_users"."usersId" as "userId",
-  "album_users"."role",
-  "album_users"."updateId"
-from
-  "albums_shared_users_users" as "album_users"
-where
-  "albumsId" = $1
-  and "updatedAt" < now() - interval '1 millisecond'
-  and "updateId" <= $2
-  and "updateId" >= $3
-order by
-  "updateId" asc
-
--- SyncRepository.getAlbumUserUpserts
-select
-  "album_users"."albumsId" as "albumId",
-  "album_users"."usersId" as "userId",
-  "album_users"."role",
-  "album_users"."updateId"
-from
-  "albums_shared_users_users" as "album_users"
-where
-  "album_users"."updatedAt" < now() - interval '1 millisecond'
-  and "album_users"."albumsId" in (
-    select
-      "id"
-    from
-      "albums"
-    where
-      "ownerId" = $1
-    union
-    (
-      select
-        "albumUsers"."albumsId" as "id"
-      from
-        "albums_shared_users_users" as "albumUsers"
-      where
-        "albumUsers"."usersId" = $2
-    )
-  )
-order by
-  "album_users"."updateId" asc
-
--- SyncRepository.getAlbumAssetsBackfill
-select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."originalFileName",
-  "assets"."thumbhash",
-  "assets"."checksum",
-  "assets"."fileCreatedAt",
-  "assets"."fileModifiedAt",
-  "assets"."localDateTime",
-  "assets"."type",
-  "assets"."deletedAt",
-  "assets"."isFavorite",
-  "assets"."visibility",
-  "assets"."duration",
-  "assets"."updateId"
-from
-  "assets"
-  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "assets"."id"
-where
-  "album_assets"."albumsId" = $1
-  and "assets"."updatedAt" < now() - interval '1 millisecond'
-  and "assets"."updateId" <= $2
-  and "assets"."updateId" >= $3
-order by
-  "assets"."updateId" asc
-
--- SyncRepository.getAlbumAssetsUpserts
-select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."originalFileName",
-  "assets"."thumbhash",
-  "assets"."checksum",
-  "assets"."fileCreatedAt",
-  "assets"."fileModifiedAt",
-  "assets"."localDateTime",
-  "assets"."type",
-  "assets"."deletedAt",
-  "assets"."isFavorite",
-  "assets"."visibility",
-  "assets"."duration",
-  "assets"."updateId"
-from
-  "assets"
-  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "assets"."id"
-  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
-  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
-where
-  "assets"."updatedAt" < now() - interval '1 millisecond'
-  and (
-    "albums"."ownerId" = $1
-    or "album_users"."usersId" = $2
-  )
-order by
-  "assets"."updateId" asc
-
--- SyncRepository.getAlbumToAssetBackfill
-select
-  "album_assets"."assetsId" as "assetId",
-  "album_assets"."albumsId" as "albumId",
-  "album_assets"."updateId"
-from
-  "albums_assets_assets" as "album_assets"
-where
-  "album_assets"."albumsId" = $1
-  and "album_assets"."updatedAt" < now() - interval '1 millisecond'
-  and "album_assets"."updateId" <= $2
-  and "album_assets"."updateId" >= $3
-order by
-  "album_assets"."updateId" asc
-
--- SyncRepository.getAlbumToAssetUpserts
-select
-  "album_assets"."assetsId" as "assetId",
-  "album_assets"."albumsId" as "albumId",
-  "album_assets"."updateId"
-from
-  "albums_assets_assets" as "album_assets"
-  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
-  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
-where
-  "album_assets"."updatedAt" < now() - interval '1 millisecond'
-  and (
-    "albums"."ownerId" = $1
-    or "album_users"."usersId" = $2
-  )
-order by
-  "album_assets"."updateId" asc
-
--- SyncRepository.getAlbumAssetExifsBackfill
-select
-  "exif"."assetId",
-  "exif"."description",
-  "exif"."exifImageWidth",
-  "exif"."exifImageHeight",
-  "exif"."fileSizeInByte",
-  "exif"."orientation",
-  "exif"."dateTimeOriginal",
-  "exif"."modifyDate",
-  "exif"."timeZone",
-  "exif"."latitude",
-  "exif"."longitude",
-  "exif"."projectionType",
-  "exif"."city",
-  "exif"."state",
-  "exif"."country",
-  "exif"."make",
-  "exif"."model",
-  "exif"."lensModel",
-  "exif"."fNumber",
-  "exif"."focalLength",
-  "exif"."iso",
-  "exif"."exposureTime",
-  "exif"."profileDescription",
-  "exif"."rating",
-  "exif"."fps",
-  "exif"."updateId"
-from
-  "exif"
-  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "exif"."assetId"
-where
-  "album_assets"."albumsId" = $1
-  and "exif"."updatedAt" < now() - interval '1 millisecond'
-  and "exif"."updateId" <= $2
-  and "exif"."updateId" >= $3
-order by
-  "exif"."updateId" asc
-
--- SyncRepository.getAlbumAssetExifsUpserts
-select
-  "exif"."assetId",
-  "exif"."description",
-  "exif"."exifImageWidth",
-  "exif"."exifImageHeight",
-  "exif"."fileSizeInByte",
-  "exif"."orientation",
-  "exif"."dateTimeOriginal",
-  "exif"."modifyDate",
-  "exif"."timeZone",
-  "exif"."latitude",
-  "exif"."longitude",
-  "exif"."projectionType",
-  "exif"."city",
-  "exif"."state",
-  "exif"."country",
-  "exif"."make",
-  "exif"."model",
-  "exif"."lensModel",
-  "exif"."fNumber",
-  "exif"."focalLength",
-  "exif"."iso",
-  "exif"."exposureTime",
-  "exif"."profileDescription",
-  "exif"."rating",
-  "exif"."fps",
-  "exif"."updateId"
-from
-  "exif"
-  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "exif"."assetId"
-  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
-  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
-where
-  "exif"."updatedAt" < now() - interval '1 millisecond'
-  and (
-    "albums"."ownerId" = $1
-    or "album_users"."usersId" = $2
-  )
-order by
-  "exif"."updateId" asc
-
--- SyncRepository.getMemoryUpserts
-select
-  "id",
-  "createdAt",
-  "updatedAt",
+  "name",
+  "email",
   "deletedAt",
-  "ownerId",
-  "type",
-  "data",
-  "isSaved",
-  "memoryAt",
-  "seenAt",
-  "showAt",
-  "hideAt",
   "updateId"
 from
-  "memories"
+  "users"
 where
-  "ownerId" = $1
-  and "updatedAt" < now() - interval '1 millisecond'
+  "updatedAt" < now() - interval '1 millisecond'
 order by
   "updateId" asc
-
--- SyncRepository.getMemoryDeletes
-select
-  "id",
-  "memoryId"
-from
-  "memories_audit"
-where
-  "userId" = $1
-  and "deletedAt" < now() - interval '1 millisecond'
-order by
-  "id" asc
-
--- SyncRepository.getMemoryAssetUpserts
-select
-  "memoriesId" as "memoryId",
-  "assetsId" as "assetId",
-  "updateId"
-from
-  "memories_assets_assets"
-where
-  "memoriesId" in (
-    select
-      "id"
-    from
-      "memories"
-    where
-      "ownerId" = $1
-  )
-  and "updatedAt" < now() - interval '1 millisecond'
-order by
-  "updateId" asc
-
--- SyncRepository.getMemoryAssetDeletes
-select
-  "id",
-  "memoryId",
-  "assetId"
-from
-  "memory_assets_audit"
-where
-  "memoryId" in (
-    select
-      "id"
-    from
-      "memories"
-    where
-      "ownerId" = $1
-  )
-  and "deletedAt" < now() - interval '1 millisecond'
-order by
-  "id" asc
diff --git a/server/src/repositories/index.ts b/server/src/repositories/index.ts
index 879385f9fd..a01b46f3bd 100644
--- a/server/src/repositories/index.ts
+++ b/server/src/repositories/index.ts
@@ -34,6 +34,7 @@ import { SessionRepository } from 'src/repositories/session.repository';
 import { SharedLinkRepository } from 'src/repositories/shared-link.repository';
 import { StackRepository } from 'src/repositories/stack.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
+import { SyncCheckpointRepository } from 'src/repositories/sync-checkpoint.repository';
 import { SyncRepository } from 'src/repositories/sync.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { TagRepository } from 'src/repositories/tag.repository';
@@ -81,6 +82,7 @@ export const repositories = [
   StackRepository,
   StorageRepository,
   SyncRepository,
+  SyncCheckpointRepository,
   SystemMetadataRepository,
   TagRepository,
   TelemetryRepository,
diff --git a/server/src/repositories/sync-checkpoint.repository.ts b/server/src/repositories/sync-checkpoint.repository.ts
new file mode 100644
index 0000000000..aae0da0890
--- /dev/null
+++ b/server/src/repositories/sync-checkpoint.repository.ts
@@ -0,0 +1,41 @@
+import { Injectable } from '@nestjs/common';
+import { Insertable, Kysely } from 'kysely';
+import { InjectKysely } from 'nestjs-kysely';
+import { DB, SessionSyncCheckpoints } from 'src/db';
+import { DummyValue, GenerateSql } from 'src/decorators';
+import { SyncEntityType } from 'src/enum';
+
+@Injectable()
+export class SyncCheckpointRepository {
+  constructor(@InjectKysely() private db: Kysely<DB>) {}
+
+  @GenerateSql({ params: [DummyValue.UUID] })
+  getAll(sessionId: string) {
+    return this.db
+      .selectFrom('session_sync_checkpoints')
+      .select(['type', 'ack'])
+      .where('sessionId', '=', sessionId)
+      .execute();
+  }
+
+  upsertAll(items: Insertable<SessionSyncCheckpoints>[]) {
+    return this.db
+      .insertInto('session_sync_checkpoints')
+      .values(items)
+      .onConflict((oc) =>
+        oc.columns(['sessionId', 'type']).doUpdateSet((eb) => ({
+          ack: eb.ref('excluded.ack'),
+        })),
+      )
+      .execute();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID] })
+  deleteAll(sessionId: string, types?: SyncEntityType[]) {
+    return this.db
+      .deleteFrom('session_sync_checkpoints')
+      .where('sessionId', '=', sessionId)
+      .$if(!!types, (qb) => qb.where('type', 'in', types!))
+      .execute();
+  }
+}
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index db616f78cc..2b1157492d 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -1,10 +1,9 @@
 import { Injectable } from '@nestjs/common';
-import { Insertable, Kysely, SelectQueryBuilder, sql } from 'kysely';
+import { Kysely, SelectQueryBuilder, sql } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
-import { DB, SessionSyncCheckpoints } from 'src/db';
+import { DB } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
-import { SyncEntityType } from 'src/enum';
 import { SyncAck } from 'src/types';
 
 type AuditTables =
@@ -28,194 +27,78 @@ type UpsertTables =
 
 @Injectable()
 export class SyncRepository {
-  constructor(@InjectKysely() private db: Kysely<DB>) {}
+  album: AlbumSync;
+  albumAsset: AlbumAssetSync;
+  albumAssetExif: AlbumAssetExifSync;
+  albumToAsset: AlbumToAssetSync;
+  albumUser: AlbumUserSync;
+  asset: AssetSync;
+  assetExif: AssetExifSync;
+  memory: MemorySync;
+  memoryToAsset: MemoryToAssetSync;
+  partner: PartnerSync;
+  partnerAsset: PartnerAssetsSync;
+  partnerAssetExif: PartnerAssetExifsSync;
+  user: UserSync;
 
-  @GenerateSql({ params: [DummyValue.UUID] })
-  getCheckpoints(sessionId: string) {
-    return this.db
-      .selectFrom('session_sync_checkpoints')
-      .select(['type', 'ack'])
-      .where('sessionId', '=', sessionId)
-      .execute();
+  constructor(@InjectKysely() private db: Kysely<DB>) {
+    this.album = new AlbumSync(this.db);
+    this.albumAsset = new AlbumAssetSync(this.db);
+    this.albumAssetExif = new AlbumAssetExifSync(this.db);
+    this.albumToAsset = new AlbumToAssetSync(this.db);
+    this.albumUser = new AlbumUserSync(this.db);
+    this.asset = new AssetSync(this.db);
+    this.assetExif = new AssetExifSync(this.db);
+    this.memory = new MemorySync(this.db);
+    this.memoryToAsset = new MemoryToAssetSync(this.db);
+    this.partner = new PartnerSync(this.db);
+    this.partnerAsset = new PartnerAssetsSync(this.db);
+    this.partnerAssetExif = new PartnerAssetExifsSync(this.db);
+    this.user = new UserSync(this.db);
+  }
+}
+
+class BaseSync {
+  constructor(protected db: Kysely<DB>) {}
+
+  protected auditTableFilters<T extends keyof Pick<DB, AuditTables>, D>(
+    qb: SelectQueryBuilder<DB, T, D>,
+    ack?: SyncAck,
+  ) {
+    const builder = qb as SelectQueryBuilder<DB, AuditTables, D>;
+    return builder
+      .where('deletedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('id', '>', ack!.updateId))
+      .orderBy('id', 'asc') as SelectQueryBuilder<DB, T, D>;
   }
 
-  upsertCheckpoints(items: Insertable<SessionSyncCheckpoints>[]) {
-    return this.db
-      .insertInto('session_sync_checkpoints')
-      .values(items)
-      .onConflict((oc) =>
-        oc.columns(['sessionId', 'type']).doUpdateSet((eb) => ({
-          ack: eb.ref('excluded.ack'),
-        })),
-      )
-      .execute();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID] })
-  deleteCheckpoints(sessionId: string, types?: SyncEntityType[]) {
-    return this.db
-      .deleteFrom('session_sync_checkpoints')
-      .where('sessionId', '=', sessionId)
-      .$if(!!types, (qb) => qb.where('type', 'in', types!))
-      .execute();
-  }
-
-  @GenerateSql({ params: [], stream: true })
-  getUserUpserts(ack?: SyncAck) {
-    return this.db
-      .selectFrom('users')
-      .select(['id', 'name', 'email', 'deletedAt', 'updateId'])
-      .$call((qb) => this.upsertTableFilters(qb, ack))
-      .stream();
-  }
-
-  @GenerateSql({ params: [], stream: true })
-  getUserDeletes(ack?: SyncAck) {
-    return this.db
-      .selectFrom('users_audit')
-      .select(['id', 'userId'])
-      .$call((qb) => this.auditTableFilters(qb, ack))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getPartnerUpserts(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('partners')
-      .select(['sharedById', 'sharedWithId', 'inTimeline', 'updateId'])
-      .where((eb) => eb.or([eb('sharedById', '=', userId), eb('sharedWithId', '=', userId)]))
-      .$call((qb) => this.upsertTableFilters(qb, ack))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getPartnerDeletes(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('partners_audit')
-      .select(['id', 'sharedById', 'sharedWithId'])
-      .where((eb) => eb.or([eb('sharedById', '=', userId), eb('sharedWithId', '=', userId)]))
-      .$call((qb) => this.auditTableFilters(qb, ack))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getAssetUpserts(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('assets')
-      .select(columns.syncAsset)
-      .select('assets.updateId')
-      .where('ownerId', '=', userId)
-      .$call((qb) => this.upsertTableFilters(qb, ack))
-      .stream();
+  protected upsertTableFilters<T extends keyof Pick<DB, UpsertTables>, D>(
+    qb: SelectQueryBuilder<DB, T, D>,
+    ack?: SyncAck,
+  ) {
+    const builder = qb as SelectQueryBuilder<DB, UpsertTables, D>;
+    return builder
+      .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('updateId', '>', ack!.updateId))
+      .orderBy('updateId', 'asc') as SelectQueryBuilder<DB, T, D>;
   }
+}
 
+class AlbumSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
-  getPartnerBackfill(userId: string, afterCreateId?: string) {
+  getCreatedAfter(userId: string, afterCreateId?: string) {
     return this.db
-      .selectFrom('partners')
-      .select(['sharedById', 'createId'])
-      .where('sharedWithId', '=', userId)
+      .selectFrom('albums_shared_users_users')
+      .select(['albumsId as id', 'createId'])
+      .where('usersId', '=', userId)
       .$if(!!afterCreateId, (qb) => qb.where('createId', '>=', afterCreateId!))
       .where('createdAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .orderBy('partners.createId', 'asc')
+      .orderBy('createId', 'asc')
       .execute();
   }
 
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
-  getPartnerAssetsBackfill(partnerId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
-    return this.db
-      .selectFrom('assets')
-      .select(columns.syncAsset)
-      .select('assets.updateId')
-      .where('ownerId', '=', partnerId)
-      .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .where('updateId', '<=', beforeUpdateId)
-      .$if(!!afterUpdateId, (eb) => eb.where('updateId', '>=', afterUpdateId!))
-      .orderBy('updateId', 'asc')
-      .stream();
-  }
-
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getPartnerAssetsUpserts(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('assets')
-      .select(columns.syncAsset)
-      .select('assets.updateId')
-      .where('ownerId', 'in', (eb) =>
-        eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
-      )
-      .$call((qb) => this.upsertTableFilters(qb, ack))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getAssetDeletes(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('assets_audit')
-      .select(['id', 'assetId'])
-      .where('ownerId', '=', userId)
-      .$call((qb) => this.auditTableFilters(qb, ack))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getPartnerAssetDeletes(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('assets_audit')
-      .select(['id', 'assetId'])
-      .where('ownerId', 'in', (eb) =>
-        eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
-      )
-      .$call((qb) => this.auditTableFilters(qb, ack))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getAssetExifsUpserts(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('exif')
-      .select(columns.syncAssetExif)
-      .select('exif.updateId')
-      .where('assetId', 'in', (eb) => eb.selectFrom('assets').select('id').where('ownerId', '=', userId))
-      .$call((qb) => this.upsertTableFilters(qb, ack))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
-  getPartnerAssetExifsBackfill(partnerId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
-    return this.db
-      .selectFrom('exif')
-      .select(columns.syncAssetExif)
-      .select('exif.updateId')
-      .innerJoin('assets', 'assets.id', 'exif.assetId')
-      .where('assets.ownerId', '=', partnerId)
-      .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .where('exif.updateId', '<=', beforeUpdateId)
-      .$if(!!afterUpdateId, (eb) => eb.where('exif.updateId', '>=', afterUpdateId!))
-      .orderBy('exif.updateId', 'asc')
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getPartnerAssetExifsUpserts(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('exif')
-      .select(columns.syncAssetExif)
-      .select('exif.updateId')
-      .where('assetId', 'in', (eb) =>
-        eb
-          .selectFrom('assets')
-          .select('id')
-          .where('ownerId', 'in', (eb) =>
-            eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
-          ),
-      )
-      .$call((qb) => this.upsertTableFilters(qb, ack))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getAlbumDeletes(userId: string, ack?: SyncAck) {
+  getDeletes(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('albums_audit')
       .select(['id', 'albumId'])
@@ -225,7 +108,7 @@ export class SyncRepository {
   }
 
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getAlbumUpserts(userId: string, ack?: SyncAck) {
+  getUpserts(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('albums')
       .distinctOn(['albums.id', 'albums.updateId'])
@@ -248,9 +131,90 @@ export class SyncRepository {
       ])
       .stream();
   }
+}
+
+class AlbumAssetSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
+  getBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+    return this.db
+      .selectFrom('assets')
+      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'assets.id')
+      .select(columns.syncAsset)
+      .select('assets.updateId')
+      .where('album_assets.albumsId', '=', albumId)
+      .where('assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('assets.updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('assets.updateId', '>=', afterUpdateId!))
+      .orderBy('assets.updateId', 'asc')
+      .stream();
+  }
 
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getAlbumToAssetDeletes(userId: string, ack?: SyncAck) {
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('assets')
+      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'assets.id')
+      .select(columns.syncAsset)
+      .select('assets.updateId')
+      .where('assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('assets.updateId', '>', ack!.updateId))
+      .orderBy('assets.updateId', 'asc')
+      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
+      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
+      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .stream();
+  }
+}
+
+class AlbumAssetExifSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
+  getBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+    return this.db
+      .selectFrom('exif')
+      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'exif.assetId')
+      .select(columns.syncAssetExif)
+      .select('exif.updateId')
+      .where('album_assets.albumsId', '=', albumId)
+      .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('exif.updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('exif.updateId', '>=', afterUpdateId!))
+      .orderBy('exif.updateId', 'asc')
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('exif')
+      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'exif.assetId')
+      .select(columns.syncAssetExif)
+      .select('exif.updateId')
+      .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('exif.updateId', '>', ack!.updateId))
+      .orderBy('exif.updateId', 'asc')
+      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
+      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
+      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .stream();
+  }
+}
+
+class AlbumToAssetSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
+  getBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+    return this.db
+      .selectFrom('albums_assets_assets as album_assets')
+      .select(['album_assets.assetsId as assetId', 'album_assets.albumsId as albumId', 'album_assets.updateId'])
+      .where('album_assets.albumsId', '=', albumId)
+      .where('album_assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('album_assets.updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('album_assets.updateId', '>=', afterUpdateId!))
+      .orderBy('album_assets.updateId', 'asc')
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getDeletes(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('album_assets_audit')
       .select(['id', 'assetId', 'albumId'])
@@ -277,7 +241,37 @@ export class SyncRepository {
   }
 
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getAlbumUserDeletes(userId: string, ack?: SyncAck) {
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('albums_assets_assets as album_assets')
+      .select(['album_assets.assetsId as assetId', 'album_assets.albumsId as albumId', 'album_assets.updateId'])
+      .where('album_assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('album_assets.updateId', '>', ack!.updateId))
+      .orderBy('album_assets.updateId', 'asc')
+      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
+      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
+      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .stream();
+  }
+}
+
+class AlbumUserSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
+  getBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+    return this.db
+      .selectFrom('albums_shared_users_users as album_users')
+      .select(columns.syncAlbumUser)
+      .select('album_users.updateId')
+      .where('albumsId', '=', albumId)
+      .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('updateId', '>=', afterUpdateId!))
+      .orderBy('updateId', 'asc')
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getDeletes(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('album_users_audit')
       .select(['id', 'userId', 'albumId'])
@@ -303,34 +297,8 @@ export class SyncRepository {
       .stream();
   }
 
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
-  getAlbumBackfill(userId: string, afterCreateId?: string) {
-    return this.db
-      .selectFrom('albums_shared_users_users')
-      .select(['albumsId as id', 'createId'])
-      .where('usersId', '=', userId)
-      .$if(!!afterCreateId, (qb) => qb.where('createId', '>=', afterCreateId!))
-      .where('createdAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .orderBy('createId', 'asc')
-      .execute();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
-  getAlbumUsersBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
-    return this.db
-      .selectFrom('albums_shared_users_users as album_users')
-      .select(columns.syncAlbumUser)
-      .select('album_users.updateId')
-      .where('albumsId', '=', albumId)
-      .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .where('updateId', '<=', beforeUpdateId)
-      .$if(!!afterUpdateId, (eb) => eb.where('updateId', '>=', afterUpdateId!))
-      .orderBy('updateId', 'asc')
-      .stream();
-  }
-
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getAlbumUserUpserts(userId: string, ack?: SyncAck) {
+  getUpserts(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('albums_shared_users_users as album_users')
       .select(columns.syncAlbumUser)
@@ -358,98 +326,57 @@ export class SyncRepository {
       )
       .stream();
   }
+}
 
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
-  getAlbumAssetsBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+class AssetSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getDeletes(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('assets_audit')
+      .select(['id', 'assetId'])
+      .where('ownerId', '=', userId)
+      .$call((qb) => this.auditTableFilters(qb, ack))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getUpserts(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('assets')
-      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'assets.id')
       .select(columns.syncAsset)
       .select('assets.updateId')
-      .where('album_assets.albumsId', '=', albumId)
-      .where('assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .where('assets.updateId', '<=', beforeUpdateId)
-      .$if(!!afterUpdateId, (eb) => eb.where('assets.updateId', '>=', afterUpdateId!))
-      .orderBy('assets.updateId', 'asc')
+      .where('ownerId', '=', userId)
+      .$call((qb) => this.upsertTableFilters(qb, ack))
       .stream();
   }
+}
 
+class AssetExifSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getAlbumAssetsUpserts(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('assets')
-      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'assets.id')
-      .select(columns.syncAsset)
-      .select('assets.updateId')
-      .where('assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('assets.updateId', '>', ack!.updateId))
-      .orderBy('assets.updateId', 'asc')
-      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
-      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
-      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
-  getAlbumToAssetBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
-    return this.db
-      .selectFrom('albums_assets_assets as album_assets')
-      .select(['album_assets.assetsId as assetId', 'album_assets.albumsId as albumId', 'album_assets.updateId'])
-      .where('album_assets.albumsId', '=', albumId)
-      .where('album_assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .where('album_assets.updateId', '<=', beforeUpdateId)
-      .$if(!!afterUpdateId, (eb) => eb.where('album_assets.updateId', '>=', afterUpdateId!))
-      .orderBy('album_assets.updateId', 'asc')
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getAlbumToAssetUpserts(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('albums_assets_assets as album_assets')
-      .select(['album_assets.assetsId as assetId', 'album_assets.albumsId as albumId', 'album_assets.updateId'])
-      .where('album_assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('album_assets.updateId', '>', ack!.updateId))
-      .orderBy('album_assets.updateId', 'asc')
-      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
-      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
-      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
-  getAlbumAssetExifsBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+  getUpserts(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('exif')
-      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'exif.assetId')
       .select(columns.syncAssetExif)
       .select('exif.updateId')
-      .where('album_assets.albumsId', '=', albumId)
-      .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .where('exif.updateId', '<=', beforeUpdateId)
-      .$if(!!afterUpdateId, (eb) => eb.where('exif.updateId', '>=', afterUpdateId!))
-      .orderBy('exif.updateId', 'asc')
+      .where('assetId', 'in', (eb) => eb.selectFrom('assets').select('id').where('ownerId', '=', userId))
+      .$call((qb) => this.upsertTableFilters(qb, ack))
       .stream();
   }
+}
 
+class MemorySync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getAlbumAssetExifsUpserts(userId: string, ack?: SyncAck) {
+  getDeletes(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('exif')
-      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'exif.assetId')
-      .select(columns.syncAssetExif)
-      .select('exif.updateId')
-      .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('exif.updateId', '>', ack!.updateId))
-      .orderBy('exif.updateId', 'asc')
-      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
-      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
-      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .selectFrom('memories_audit')
+      .select(['id', 'memoryId'])
+      .where('userId', '=', userId)
+      .$call((qb) => this.auditTableFilters(qb, ack))
       .stream();
   }
 
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getMemoryUpserts(userId: string, ack?: SyncAck) {
+  getUpserts(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('memories')
       .select([
@@ -471,30 +398,11 @@ export class SyncRepository {
       .$call((qb) => this.upsertTableFilters(qb, ack))
       .stream();
   }
+}
 
+class MemoryToAssetSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getMemoryDeletes(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('memories_audit')
-      .select(['id', 'memoryId'])
-      .where('userId', '=', userId)
-      .$call((qb) => this.auditTableFilters(qb, ack))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getMemoryAssetUpserts(userId: string, ack?: SyncAck) {
-    return this.db
-      .selectFrom('memories_assets_assets')
-      .select(['memoriesId as memoryId', 'assetsId as assetId'])
-      .select('updateId')
-      .where('memoriesId', 'in', (eb) => eb.selectFrom('memories').select('id').where('ownerId', '=', userId))
-      .$call((qb) => this.upsertTableFilters(qb, ack))
-      .stream();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID], stream: true })
-  getMemoryAssetDeletes(userId: string, ack?: SyncAck) {
+  getDeletes(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('memory_assets_audit')
       .select(['id', 'memoryId', 'assetId'])
@@ -503,22 +411,144 @@ export class SyncRepository {
       .stream();
   }
 
-  private auditTableFilters<T extends keyof Pick<DB, AuditTables>, D>(qb: SelectQueryBuilder<DB, T, D>, ack?: SyncAck) {
-    const builder = qb as SelectQueryBuilder<DB, AuditTables, D>;
-    return builder
-      .where('deletedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('id', '>', ack!.updateId))
-      .orderBy('id', 'asc') as SelectQueryBuilder<DB, T, D>;
-  }
-
-  private upsertTableFilters<T extends keyof Pick<DB, UpsertTables>, D>(
-    qb: SelectQueryBuilder<DB, T, D>,
-    ack?: SyncAck,
-  ) {
-    const builder = qb as SelectQueryBuilder<DB, UpsertTables, D>;
-    return builder
-      .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('updateId', '>', ack!.updateId))
-      .orderBy('updateId', 'asc') as SelectQueryBuilder<DB, T, D>;
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('memories_assets_assets')
+      .select(['memoriesId as memoryId', 'assetsId as assetId'])
+      .select('updateId')
+      .where('memoriesId', 'in', (eb) => eb.selectFrom('memories').select('id').where('ownerId', '=', userId))
+      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .stream();
+  }
+}
+
+class PartnerSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
+  getCreatedAfter(userId: string, afterCreateId?: string) {
+    return this.db
+      .selectFrom('partners')
+      .select(['sharedById', 'createId'])
+      .where('sharedWithId', '=', userId)
+      .$if(!!afterCreateId, (qb) => qb.where('createId', '>=', afterCreateId!))
+      .where('createdAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .orderBy('partners.createId', 'asc')
+      .execute();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getDeletes(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('partners_audit')
+      .select(['id', 'sharedById', 'sharedWithId'])
+      .where((eb) => eb.or([eb('sharedById', '=', userId), eb('sharedWithId', '=', userId)]))
+      .$call((qb) => this.auditTableFilters(qb, ack))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('partners')
+      .select(['sharedById', 'sharedWithId', 'inTimeline', 'updateId'])
+      .where((eb) => eb.or([eb('sharedById', '=', userId), eb('sharedWithId', '=', userId)]))
+      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .stream();
+  }
+}
+
+class PartnerAssetsSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
+  getBackfill(partnerId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+    return this.db
+      .selectFrom('assets')
+      .select(columns.syncAsset)
+      .select('assets.updateId')
+      .where('ownerId', '=', partnerId)
+      .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('updateId', '>=', afterUpdateId!))
+      .orderBy('updateId', 'asc')
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getDeletes(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('assets_audit')
+      .select(['id', 'assetId'])
+      .where('ownerId', 'in', (eb) =>
+        eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
+      )
+      .$call((qb) => this.auditTableFilters(qb, ack))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('assets')
+      .select(columns.syncAsset)
+      .select('assets.updateId')
+      .where('ownerId', 'in', (eb) =>
+        eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
+      )
+      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .stream();
+  }
+}
+
+class PartnerAssetExifsSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
+  getBackfill(partnerId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+    return this.db
+      .selectFrom('exif')
+      .select(columns.syncAssetExif)
+      .select('exif.updateId')
+      .innerJoin('assets', 'assets.id', 'exif.assetId')
+      .where('assets.ownerId', '=', partnerId)
+      .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('exif.updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('exif.updateId', '>=', afterUpdateId!))
+      .orderBy('exif.updateId', 'asc')
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('exif')
+      .select(columns.syncAssetExif)
+      .select('exif.updateId')
+      .where('assetId', 'in', (eb) =>
+        eb
+          .selectFrom('assets')
+          .select('id')
+          .where('ownerId', 'in', (eb) =>
+            eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
+          ),
+      )
+      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .stream();
+  }
+}
+
+class UserSync extends BaseSync {
+  @GenerateSql({ params: [], stream: true })
+  getDeletes(ack?: SyncAck) {
+    return this.db
+      .selectFrom('users_audit')
+      .select(['id', 'userId'])
+      .$call((qb) => this.auditTableFilters(qb, ack))
+      .stream();
+  }
+
+  @GenerateSql({ params: [], stream: true })
+  getUpserts(ack?: SyncAck) {
+    return this.db
+      .selectFrom('users')
+      .select(['id', 'name', 'email', 'deletedAt', 'updateId'])
+      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .stream();
   }
 }
diff --git a/server/src/services/base.service.ts b/server/src/services/base.service.ts
index 3e2128ac2c..2f0e272883 100644
--- a/server/src/services/base.service.ts
+++ b/server/src/services/base.service.ts
@@ -41,6 +41,7 @@ import { SessionRepository } from 'src/repositories/session.repository';
 import { SharedLinkRepository } from 'src/repositories/shared-link.repository';
 import { StackRepository } from 'src/repositories/stack.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
+import { SyncCheckpointRepository } from 'src/repositories/sync-checkpoint.repository';
 import { SyncRepository } from 'src/repositories/sync.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { TagRepository } from 'src/repositories/tag.repository';
@@ -91,6 +92,7 @@ export const BASE_SERVICE_DEPENDENCIES = [
   StackRepository,
   StorageRepository,
   SyncRepository,
+  SyncCheckpointRepository,
   SystemMetadataRepository,
   TagRepository,
   TelemetryRepository,
@@ -142,6 +144,7 @@ export class BaseService {
     protected stackRepository: StackRepository,
     protected storageRepository: StorageRepository,
     protected syncRepository: SyncRepository,
+    protected syncCheckpointRepository: SyncCheckpointRepository,
     protected systemMetadataRepository: SystemMetadataRepository,
     protected tagRepository: TagRepository,
     protected telemetryRepository: TelemetryRepository,
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 7e97f07370..62ec1f02a8 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -81,7 +81,7 @@ export class SyncService extends BaseService {
       return throwSessionRequired();
     }
 
-    return this.syncRepository.getCheckpoints(sessionId);
+    return this.syncCheckpointRepository.getAll(sessionId);
   }
 
   async setAcks(auth: AuthDto, dto: SyncAckSetDto) {
@@ -102,7 +102,7 @@ export class SyncService extends BaseService {
       checkpoints[type] = { sessionId, type, ack };
     }
 
-    await this.syncRepository.upsertCheckpoints(Object.values(checkpoints));
+    await this.syncCheckpointRepository.upsertAll(Object.values(checkpoints));
   }
 
   async deleteAcks(auth: AuthDto, dto: SyncAckDeleteDto) {
@@ -111,7 +111,7 @@ export class SyncService extends BaseService {
       return throwSessionRequired();
     }
 
-    await this.syncRepository.deleteCheckpoints(sessionId, dto.types);
+    await this.syncCheckpointRepository.deleteAll(sessionId, dto.types);
   }
 
   async stream(auth: AuthDto, response: Writable, dto: SyncStreamDto) {
@@ -120,7 +120,7 @@ export class SyncService extends BaseService {
       return throwSessionRequired();
     }
 
-    const checkpoints = await this.syncRepository.getCheckpoints(sessionId);
+    const checkpoints = await this.syncCheckpointRepository.getAll(sessionId);
     const checkpointMap: CheckpointMap = Object.fromEntries(checkpoints.map(({ type, ack }) => [type, fromAck(ack)]));
     const handlers: Record<SyncRequestType, () => Promise<void>> = {
       [SyncRequestType.UsersV1]: () => this.syncUsersV1(response, checkpointMap),
@@ -149,13 +149,13 @@ export class SyncService extends BaseService {
 
   private async syncUsersV1(response: Writable, checkpointMap: CheckpointMap) {
     const deleteType = SyncEntityType.UserDeleteV1;
-    const deletes = this.syncRepository.getUserDeletes(checkpointMap[deleteType]);
+    const deletes = this.syncRepository.user.getDeletes(checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
 
     const upsertType = SyncEntityType.UserV1;
-    const upserts = this.syncRepository.getUserUpserts(checkpointMap[upsertType]);
+    const upserts = this.syncRepository.user.getUpserts(checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data });
     }
@@ -163,13 +163,13 @@ export class SyncService extends BaseService {
 
   private async syncPartnersV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
     const deleteType = SyncEntityType.PartnerDeleteV1;
-    const deletes = this.syncRepository.getPartnerDeletes(auth.user.id, checkpointMap[deleteType]);
+    const deletes = this.syncRepository.partner.getDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
 
     const upsertType = SyncEntityType.PartnerV1;
-    const upserts = this.syncRepository.getPartnerUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.partner.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data });
     }
@@ -177,13 +177,13 @@ export class SyncService extends BaseService {
 
   private async syncAssetsV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
     const deleteType = SyncEntityType.AssetDeleteV1;
-    const deletes = this.syncRepository.getAssetDeletes(auth.user.id, checkpointMap[deleteType]);
+    const deletes = this.syncRepository.asset.getDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
 
     const upsertType = SyncEntityType.AssetV1;
-    const upserts = this.syncRepository.getAssetUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.asset.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data: mapSyncAssetV1(data) });
     }
@@ -196,14 +196,14 @@ export class SyncService extends BaseService {
     sessionId: string,
   ) {
     const deleteType = SyncEntityType.PartnerAssetDeleteV1;
-    const deletes = this.syncRepository.getPartnerAssetDeletes(auth.user.id, checkpointMap[deleteType]);
+    const deletes = this.syncRepository.partnerAsset.getDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
 
     const backfillType = SyncEntityType.PartnerAssetBackfillV1;
     const backfillCheckpoint = checkpointMap[backfillType];
-    const partners = await this.syncRepository.getPartnerBackfill(auth.user.id, backfillCheckpoint?.updateId);
+    const partners = await this.syncRepository.partner.getCreatedAfter(auth.user.id, backfillCheckpoint?.updateId);
     const upsertType = SyncEntityType.PartnerAssetV1;
     const upsertCheckpoint = checkpointMap[upsertType];
     if (upsertCheckpoint) {
@@ -216,7 +216,7 @@ export class SyncService extends BaseService {
         }
 
         const startId = getStartId(createId, backfillCheckpoint);
-        const backfill = this.syncRepository.getPartnerAssetsBackfill(partner.sharedById, startId, endId);
+        const backfill = this.syncRepository.partnerAsset.getBackfill(partner.sharedById, startId, endId);
 
         for await (const { updateId, ...data } of backfill) {
           send(response, {
@@ -236,7 +236,7 @@ export class SyncService extends BaseService {
       });
     }
 
-    const upserts = this.syncRepository.getPartnerAssetsUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.partnerAsset.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data: mapSyncAssetV1(data) });
     }
@@ -244,7 +244,7 @@ export class SyncService extends BaseService {
 
   private async syncAssetExifsV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
     const upsertType = SyncEntityType.AssetExifV1;
-    const upserts = this.syncRepository.getAssetExifsUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.assetExif.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data });
     }
@@ -258,7 +258,7 @@ export class SyncService extends BaseService {
   ) {
     const backfillType = SyncEntityType.PartnerAssetExifBackfillV1;
     const backfillCheckpoint = checkpointMap[backfillType];
-    const partners = await this.syncRepository.getPartnerBackfill(auth.user.id, backfillCheckpoint?.updateId);
+    const partners = await this.syncRepository.partner.getCreatedAfter(auth.user.id, backfillCheckpoint?.updateId);
 
     const upsertType = SyncEntityType.PartnerAssetExifV1;
     const upsertCheckpoint = checkpointMap[upsertType];
@@ -272,7 +272,7 @@ export class SyncService extends BaseService {
         }
 
         const startId = getStartId(createId, backfillCheckpoint);
-        const backfill = this.syncRepository.getPartnerAssetExifsBackfill(partner.sharedById, startId, endId);
+        const backfill = this.syncRepository.partnerAssetExif.getBackfill(partner.sharedById, startId, endId);
 
         for await (const { updateId, ...data } of backfill) {
           send(response, { type: backfillType, ids: [partner.createId, updateId], data });
@@ -288,7 +288,7 @@ export class SyncService extends BaseService {
       });
     }
 
-    const upserts = this.syncRepository.getPartnerAssetExifsUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.partnerAssetExif.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data });
     }
@@ -296,13 +296,13 @@ export class SyncService extends BaseService {
 
   private async syncAlbumsV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
     const deleteType = SyncEntityType.AlbumDeleteV1;
-    const deletes = this.syncRepository.getAlbumDeletes(auth.user.id, checkpointMap[deleteType]);
+    const deletes = this.syncRepository.album.getDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
 
     const upsertType = SyncEntityType.AlbumV1;
-    const upserts = this.syncRepository.getAlbumUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.album.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data });
     }
@@ -310,14 +310,14 @@ export class SyncService extends BaseService {
 
   private async syncAlbumUsersV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto, sessionId: string) {
     const deleteType = SyncEntityType.AlbumUserDeleteV1;
-    const deletes = this.syncRepository.getAlbumUserDeletes(auth.user.id, checkpointMap[deleteType]);
+    const deletes = this.syncRepository.albumUser.getDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
 
     const backfillType = SyncEntityType.AlbumUserBackfillV1;
     const backfillCheckpoint = checkpointMap[backfillType];
-    const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
+    const albums = await this.syncRepository.album.getCreatedAfter(auth.user.id, backfillCheckpoint?.updateId);
     const upsertType = SyncEntityType.AlbumUserV1;
     const upsertCheckpoint = checkpointMap[upsertType];
     if (upsertCheckpoint) {
@@ -330,7 +330,7 @@ export class SyncService extends BaseService {
         }
 
         const startId = getStartId(createId, backfillCheckpoint);
-        const backfill = this.syncRepository.getAlbumUsersBackfill(album.id, startId, endId);
+        const backfill = this.syncRepository.albumUser.getBackfill(album.id, startId, endId);
 
         for await (const { updateId, ...data } of backfill) {
           send(response, { type: backfillType, ids: [createId, updateId], data });
@@ -346,7 +346,7 @@ export class SyncService extends BaseService {
       });
     }
 
-    const upserts = this.syncRepository.getAlbumUserUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.albumUser.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data });
     }
@@ -355,7 +355,7 @@ export class SyncService extends BaseService {
   private async syncAlbumAssetsV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto, sessionId: string) {
     const backfillType = SyncEntityType.AlbumAssetBackfillV1;
     const backfillCheckpoint = checkpointMap[backfillType];
-    const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
+    const albums = await this.syncRepository.album.getCreatedAfter(auth.user.id, backfillCheckpoint?.updateId);
     const upsertType = SyncEntityType.AlbumAssetV1;
     const upsertCheckpoint = checkpointMap[upsertType];
     if (upsertCheckpoint) {
@@ -368,7 +368,7 @@ export class SyncService extends BaseService {
         }
 
         const startId = getStartId(createId, backfillCheckpoint);
-        const backfill = this.syncRepository.getAlbumAssetsBackfill(album.id, startId, endId);
+        const backfill = this.syncRepository.albumAsset.getBackfill(album.id, startId, endId);
 
         for await (const { updateId, ...data } of backfill) {
           send(response, { type: backfillType, ids: [createId, updateId], data: mapSyncAssetV1(data) });
@@ -384,7 +384,7 @@ export class SyncService extends BaseService {
       });
     }
 
-    const upserts = this.syncRepository.getAlbumAssetsUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.albumAsset.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data: mapSyncAssetV1(data) });
     }
@@ -398,7 +398,7 @@ export class SyncService extends BaseService {
   ) {
     const backfillType = SyncEntityType.AlbumAssetExifBackfillV1;
     const backfillCheckpoint = checkpointMap[backfillType];
-    const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
+    const albums = await this.syncRepository.album.getCreatedAfter(auth.user.id, backfillCheckpoint?.updateId);
     const upsertType = SyncEntityType.AlbumAssetExifV1;
     const upsertCheckpoint = checkpointMap[upsertType];
     if (upsertCheckpoint) {
@@ -411,7 +411,7 @@ export class SyncService extends BaseService {
         }
 
         const startId = getStartId(createId, backfillCheckpoint);
-        const backfill = this.syncRepository.getAlbumAssetExifsBackfill(album.id, startId, endId);
+        const backfill = this.syncRepository.albumAssetExif.getBackfill(album.id, startId, endId);
 
         for await (const { updateId, ...data } of backfill) {
           send(response, { type: backfillType, ids: [createId, updateId], data });
@@ -427,7 +427,7 @@ export class SyncService extends BaseService {
       });
     }
 
-    const upserts = this.syncRepository.getAlbumAssetExifsUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.albumAssetExif.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data });
     }
@@ -440,14 +440,14 @@ export class SyncService extends BaseService {
     sessionId: string,
   ) {
     const deleteType = SyncEntityType.AlbumToAssetDeleteV1;
-    const deletes = this.syncRepository.getAlbumToAssetDeletes(auth.user.id, checkpointMap[deleteType]);
+    const deletes = this.syncRepository.albumToAsset.getDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
 
     const backfillType = SyncEntityType.AlbumToAssetBackfillV1;
     const backfillCheckpoint = checkpointMap[backfillType];
-    const albums = await this.syncRepository.getAlbumBackfill(auth.user.id, backfillCheckpoint?.updateId);
+    const albums = await this.syncRepository.album.getCreatedAfter(auth.user.id, backfillCheckpoint?.updateId);
     const upsertType = SyncEntityType.AlbumToAssetV1;
     const upsertCheckpoint = checkpointMap[upsertType];
     if (upsertCheckpoint) {
@@ -460,7 +460,7 @@ export class SyncService extends BaseService {
         }
 
         const startId = getStartId(createId, backfillCheckpoint);
-        const backfill = this.syncRepository.getAlbumToAssetBackfill(album.id, startId, endId);
+        const backfill = this.syncRepository.albumToAsset.getBackfill(album.id, startId, endId);
 
         for await (const { updateId, ...data } of backfill) {
           send(response, { type: backfillType, ids: [createId, updateId], data });
@@ -476,7 +476,7 @@ export class SyncService extends BaseService {
       });
     }
 
-    const upserts = this.syncRepository.getAlbumToAssetUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.albumToAsset.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data });
     }
@@ -484,13 +484,13 @@ export class SyncService extends BaseService {
 
   private async syncMemoriesV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
     const deleteType = SyncEntityType.MemoryDeleteV1;
-    const deletes = this.syncRepository.getMemoryDeletes(auth.user.id, checkpointMap[SyncEntityType.MemoryDeleteV1]);
+    const deletes = this.syncRepository.memory.getDeletes(auth.user.id, checkpointMap[SyncEntityType.MemoryDeleteV1]);
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
 
     const upsertType = SyncEntityType.MemoryV1;
-    const upserts = this.syncRepository.getMemoryUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.memory.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data });
     }
@@ -498,13 +498,13 @@ export class SyncService extends BaseService {
 
   private async syncMemoryAssetsV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
     const deleteType = SyncEntityType.MemoryToAssetDeleteV1;
-    const deletes = this.syncRepository.getMemoryAssetDeletes(auth.user.id, checkpointMap[deleteType]);
+    const deletes = this.syncRepository.memoryToAsset.getDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
 
     const upsertType = SyncEntityType.MemoryToAssetV1;
-    const upserts = this.syncRepository.getMemoryAssetUpserts(auth.user.id, checkpointMap[upsertType]);
+    const upserts = this.syncRepository.memoryToAsset.getUpserts(auth.user.id, checkpointMap[upsertType]);
     for await (const { updateId, ...data } of upserts) {
       send(response, { type: upsertType, ids: [updateId], data });
     }
@@ -512,7 +512,7 @@ export class SyncService extends BaseService {
 
   private async upsertBackfillCheckpoint(item: { type: SyncEntityType; sessionId: string; createId: string }) {
     const { type, sessionId, createId } = item;
-    await this.syncRepository.upsertCheckpoints([
+    await this.syncCheckpointRepository.upsertAll([
       {
         type,
         sessionId,
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index 8c113a13cf..922c5d3fdb 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -26,6 +26,7 @@ import { PersonRepository } from 'src/repositories/person.repository';
 import { SearchRepository } from 'src/repositories/search.repository';
 import { SessionRepository } from 'src/repositories/session.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
+import { SyncCheckpointRepository } from 'src/repositories/sync-checkpoint.repository';
 import { SyncRepository } from 'src/repositories/sync.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { UserRepository } from 'src/repositories/user.repository';
@@ -202,7 +203,11 @@ export class MediumTestContext<S extends BaseService = BaseService> {
 
 export class SyncTestContext extends MediumTestContext<SyncService> {
   constructor(database: Kysely<DB>) {
-    super(SyncService, { database, real: [SyncRepository, SessionRepository], mock: [LoggingRepository] });
+    super(SyncService, {
+      database,
+      real: [SyncRepository, SyncCheckpointRepository, SessionRepository],
+      mock: [LoggingRepository],
+    });
   }
 
   async syncStream(auth: AuthDto, types: SyncRequestType[]) {
@@ -239,6 +244,7 @@ const newRealRepository = <T>(key: ClassConstructor<T>, db: Kysely<DB>): T => {
     case SearchRepository:
     case SessionRepository:
     case SyncRepository:
+    case SyncCheckpointRepository:
     case SystemMetadataRepository:
     case UserRepository:
     case VersionHistoryRepository: {
@@ -282,6 +288,7 @@ const newMockRepository = <T>(key: ClassConstructor<T>) => {
     case PersonRepository:
     case SessionRepository:
     case SyncRepository:
+    case SyncCheckpointRepository:
     case SystemMetadataRepository:
     case UserRepository:
     case VersionHistoryRepository: {
diff --git a/server/test/utils.ts b/server/test/utils.ts
index 0e07e603b5..0b4c743802 100644
--- a/server/test/utils.ts
+++ b/server/test/utils.ts
@@ -47,6 +47,7 @@ import { SessionRepository } from 'src/repositories/session.repository';
 import { SharedLinkRepository } from 'src/repositories/shared-link.repository';
 import { StackRepository } from 'src/repositories/stack.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
+import { SyncCheckpointRepository } from 'src/repositories/sync-checkpoint.repository';
 import { SyncRepository } from 'src/repositories/sync.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { TagRepository } from 'src/repositories/tag.repository';
@@ -217,6 +218,7 @@ export type ServiceOverrides = {
   stack: StackRepository;
   storage: StorageRepository;
   sync: SyncRepository;
+  syncCheckpoint: SyncCheckpointRepository;
   systemMetadata: SystemMetadataRepository;
   tag: TagRepository;
   telemetry: TelemetryRepository;
@@ -287,6 +289,7 @@ export const newTestService = <T extends BaseService>(
     stack: automock(StackRepository),
     storage: newStorageRepositoryMock(),
     sync: automock(SyncRepository),
+    syncCheckpoint: automock(SyncCheckpointRepository),
     systemMetadata: newSystemMetadataRepositoryMock(),
     // systemMetadata: automock(SystemMetadataRepository, { strict: false }),
     // eslint-disable-next-line no-sparse-arrays
@@ -336,6 +339,7 @@ export const newTestService = <T extends BaseService>(
     overrides.stack || (mocks.stack as As<StackRepository>),
     overrides.storage || (mocks.storage as As<StorageRepository>),
     overrides.sync || (mocks.sync as As<SyncRepository>),
+    overrides.syncCheckpoint || (mocks.syncCheckpoint as As<SyncCheckpointRepository>),
     overrides.systemMetadata || (mocks.systemMetadata as As<SystemMetadataRepository>),
     overrides.tag || (mocks.tag as As<TagRepository>),
     overrides.telemetry || (mocks.telemetry as unknown as TelemetryRepository),

From 3d35e65f270724c7f3923a2052294670eecff9a8 Mon Sep 17 00:00:00 2001
From: Matthew Momjian <50788000+mmomjian@users.noreply.github.com>
Date: Fri, 27 Jun 2025 13:54:27 -0400
Subject: [PATCH 076/337] fix(docs): add DB_USERNAME when needed (#19578)

add DB_USERNAME when needed
---
 docs/docs/FAQ.mdx                              | 6 +++---
 docs/docs/administration/backup-and-restore.md | 4 ++--
 docs/docs/guides/template-backup-script.md     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/docs/FAQ.mdx b/docs/docs/FAQ.mdx
index 906d9fd355..9e14d10a0e 100644
--- a/docs/docs/FAQ.mdx
+++ b/docs/docs/FAQ.mdx
@@ -458,7 +458,7 @@ A result of `on` means that checksums are enabled.
 <summary>Check if checksums are enabled</summary>
 
 ```bash
-docker exec -it immich_postgres psql --dbname=postgres --username=postgres --command="show data_checksums"
+docker exec -it immich_postgres psql --dbname=postgres --username=<DB_USERNAME> --command="show data_checksums"
  data_checksums
 ----------------
  on
@@ -473,7 +473,7 @@ If checksums are enabled, you can check the status of the database with the foll
 <summary>Check for database corruption</summary>
 
 ```bash
-docker exec -it immich_postgres psql --dbname=postgres --username=postgres --command="SELECT datname, checksum_failures, checksum_last_failure FROM pg_stat_database WHERE datname IS NOT NULL"
+docker exec -it immich_postgres psql --dbname=postgres --username=<DB_USERNAME> --command="SELECT datname, checksum_failures, checksum_last_failure FROM pg_stat_database WHERE datname IS NOT NULL"
   datname  | checksum_failures | checksum_last_failure
 -----------+-------------------+-----------------------
  postgres  |                 0 |
@@ -490,7 +490,7 @@ You can also scan the Postgres database file structure for errors:
 <details>
 <summary>Scan for file structure errors</summary>
 ```bash
-docker exec -it immich_postgres pg_amcheck --username=postgres --heapallindexed --parent-check --rootdescend --progress --all --install-missing
+docker exec -it immich_postgres pg_amcheck --username=<DB_USERNAME> --heapallindexed --parent-check --rootdescend --progress --all --install-missing
 ```
 
 A normal result will end something like this and return with an exit code of `0`:
diff --git a/docs/docs/administration/backup-and-restore.md b/docs/docs/administration/backup-and-restore.md
index 7b90c3b19a..50f2d01ebf 100644
--- a/docs/docs/administration/backup-and-restore.md
+++ b/docs/docs/administration/backup-and-restore.md
@@ -57,7 +57,7 @@ Then please follow the steps in the following section for restoring the database
   <TabItem value="Linux system" label="Linux system" default>
 
 ```bash title='Backup'
-docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=postgres | gzip > "/path/to/backup/dump.sql.gz"
+docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=<DB_USERNAME> | gzip > "/path/to/backup/dump.sql.gz"
 ```
 
 ```bash title='Restore'
@@ -79,7 +79,7 @@ docker compose up -d            # Start remainder of Immich apps
   <TabItem value="Windows system (PowerShell)" label="Windows system (PowerShell)">
 
 ```powershell title='Backup'
-[System.IO.File]::WriteAllLines("C:\absolute\path\to\backup\dump.sql", (docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=postgres))
+[System.IO.File]::WriteAllLines("C:\absolute\path\to\backup\dump.sql", (docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=<DB_USERNAME>))
 ```
 
 ```powershell title='Restore'
diff --git a/docs/docs/guides/template-backup-script.md b/docs/docs/guides/template-backup-script.md
index dd0b94ebb1..34381dd0ee 100644
--- a/docs/docs/guides/template-backup-script.md
+++ b/docs/docs/guides/template-backup-script.md
@@ -52,9 +52,9 @@ REMOTE_BACKUP_PATH="/path/to/remote/backup/directory"
 ### Local
 
 # Backup Immich database
-docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=postgres > "$UPLOAD_LOCATION"/database-backup/immich-database.sql
+docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=<DB_USERNAME> > "$UPLOAD_LOCATION"/database-backup/immich-database.sql
 # For deduplicating backup programs such as Borg or Restic, compressing the content can increase backup size by making it harder to deduplicate. If you are using a different program or still prefer to compress, you can use the following command instead:
-# docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=postgres | /usr/bin/gzip --rsyncable > "$UPLOAD_LOCATION"/database-backup/immich-database.sql.gz
+# docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=<DB_USERNAME> | /usr/bin/gzip --rsyncable > "$UPLOAD_LOCATION"/database-backup/immich-database.sql.gz
 
 ### Append to local Borg repository
 borg create "$BACKUP_PATH/immich-borg::{now}" "$UPLOAD_LOCATION" --exclude "$UPLOAD_LOCATION"/thumbs/ --exclude "$UPLOAD_LOCATION"/encoded-video/

From a2a9797fabbb840a3dc712852a08c010e2f5002f Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 27 Jun 2025 15:35:19 -0400
Subject: [PATCH 077/337] refactor: auth medium tests (#19583)

---
 e2e/src/api/specs/auth.e2e-spec.ts            | 146 ----------------
 .../src/controllers/auth.controller.spec.ts   |  45 +++++
 server/test/medium.factory.ts                 |  32 +++-
 .../specs/services/auth.service.spec.ts       | 163 ++++++++++++++++++
 4 files changed, 238 insertions(+), 148 deletions(-)
 delete mode 100644 e2e/src/api/specs/auth.e2e-spec.ts
 create mode 100644 server/test/medium/specs/services/auth.service.spec.ts

diff --git a/e2e/src/api/specs/auth.e2e-spec.ts b/e2e/src/api/specs/auth.e2e-spec.ts
deleted file mode 100644
index 0f407f4ba7..0000000000
--- a/e2e/src/api/specs/auth.e2e-spec.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { LoginResponseDto, login, signUpAdmin } from '@immich/sdk';
-import { loginDto, signupDto } from 'src/fixtures';
-import { errorDto, loginResponseDto, signupResponseDto } from 'src/responses';
-import { app, utils } from 'src/utils';
-import request from 'supertest';
-import { beforeEach, describe, expect, it } from 'vitest';
-
-const { email, password } = signupDto.admin;
-
-describe(`/auth/admin-sign-up`, () => {
-  beforeEach(async () => {
-    await utils.resetDatabase();
-  });
-
-  describe('POST /auth/admin-sign-up', () => {
-    it(`should sign up the admin`, async () => {
-      const { status, body } = await request(app).post('/auth/admin-sign-up').send(signupDto.admin);
-      expect(status).toBe(201);
-      expect(body).toEqual(signupResponseDto.admin);
-    });
-
-    it('should not allow a second admin to sign up', async () => {
-      await signUpAdmin({ signUpDto: signupDto.admin });
-
-      const { status, body } = await request(app).post('/auth/admin-sign-up').send(signupDto.admin);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.alreadyHasAdmin);
-    });
-  });
-});
-
-describe('/auth/*', () => {
-  let admin: LoginResponseDto;
-
-  beforeEach(async () => {
-    await utils.resetDatabase();
-    await signUpAdmin({ signUpDto: signupDto.admin });
-    admin = await login({ loginCredentialDto: loginDto.admin });
-  });
-
-  describe(`POST /auth/login`, () => {
-    it('should reject an incorrect password', async () => {
-      const { status, body } = await request(app).post('/auth/login').send({ email, password: 'incorrect' });
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.incorrectLogin);
-    });
-
-    it('should accept a correct password', async () => {
-      const { status, body, headers } = await request(app).post('/auth/login').send({ email, password });
-      expect(status).toBe(201);
-      expect(body).toEqual(loginResponseDto.admin);
-
-      const token = body.accessToken;
-      expect(token).toBeDefined();
-
-      const cookies = headers['set-cookie'];
-      expect(cookies).toHaveLength(3);
-      expect(cookies[0].split(';').map((item) => item.trim())).toEqual([
-        `immich_access_token=${token}`,
-        'Max-Age=34560000',
-        'Path=/',
-        expect.stringContaining('Expires='),
-        'HttpOnly',
-        'SameSite=Lax',
-      ]);
-      expect(cookies[1].split(';').map((item) => item.trim())).toEqual([
-        'immich_auth_type=password',
-        'Max-Age=34560000',
-        'Path=/',
-        expect.stringContaining('Expires='),
-        'HttpOnly',
-        'SameSite=Lax',
-      ]);
-      expect(cookies[2].split(';').map((item) => item.trim())).toEqual([
-        'immich_is_authenticated=true',
-        'Max-Age=34560000',
-        'Path=/',
-        expect.stringContaining('Expires='),
-        'SameSite=Lax',
-      ]);
-    });
-  });
-
-  describe('POST /auth/validateToken', () => {
-    it('should reject an invalid token', async () => {
-      const { status, body } = await request(app).post(`/auth/validateToken`).set('Authorization', 'Bearer 123');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.invalidToken);
-    });
-
-    it('should accept a valid token', async () => {
-      const { status, body } = await request(app)
-        .post(`/auth/validateToken`)
-        .send({})
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual({ authStatus: true });
-    });
-  });
-
-  describe('POST /auth/change-password', () => {
-    it('should require the current password', async () => {
-      const { status, body } = await request(app)
-        .post(`/auth/change-password`)
-        .send({ password: 'wrong-password', newPassword: 'Password1234' })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.wrongPassword);
-    });
-
-    it('should change the password', async () => {
-      const { status } = await request(app)
-        .post(`/auth/change-password`)
-        .send({ password, newPassword: 'Password1234' })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-
-      await login({
-        loginCredentialDto: {
-          email: 'admin@immich.cloud',
-          password: 'Password1234',
-        },
-      });
-    });
-  });
-
-  describe('POST /auth/logout', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/auth/logout`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should logout the user', async () => {
-      const { status, body } = await request(app)
-        .post(`/auth/logout`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        successful: true,
-        redirectUri: '/auth/login?autoLaunch=0',
-      });
-    });
-  });
-});
diff --git a/server/src/controllers/auth.controller.spec.ts b/server/src/controllers/auth.controller.spec.ts
index 4129b24124..031ef460c2 100644
--- a/server/src/controllers/auth.controller.spec.ts
+++ b/server/src/controllers/auth.controller.spec.ts
@@ -2,6 +2,7 @@ import { AuthController } from 'src/controllers/auth.controller';
 import { LoginResponseDto } from 'src/dtos/auth.dto';
 import { AuthService } from 'src/services/auth.service';
 import request from 'supertest';
+import { mediumFactory } from 'test/medium.factory';
 import { errorDto } from 'test/medium/responses';
 import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils';
 
@@ -132,6 +133,50 @@ describe(AuthController.name, () => {
       expect(status).toEqual(201);
       expect(service.login).toHaveBeenCalledWith(expect.objectContaining({ email: 'admin@local' }), expect.anything());
     });
+
+    it('should auth cookies on a secure connection', async () => {
+      const loginResponse = mediumFactory.loginResponse();
+      service.login.mockResolvedValue(loginResponse);
+      const { status, body, headers } = await request(ctx.getHttpServer())
+        .post('/auth/login')
+        .send({ name: 'admin', email: 'admin@local', password: 'password' });
+
+      expect(status).toEqual(201);
+      expect(body).toEqual(loginResponse);
+
+      const cookies = headers['set-cookie'];
+      expect(cookies).toHaveLength(3);
+      expect(cookies[0].split(';').map((item) => item.trim())).toEqual([
+        `immich_access_token=${loginResponse.accessToken}`,
+        'Max-Age=34560000',
+        'Path=/',
+        expect.stringContaining('Expires='),
+        'HttpOnly',
+        'SameSite=Lax',
+      ]);
+      expect(cookies[1].split(';').map((item) => item.trim())).toEqual([
+        'immich_auth_type=password',
+        'Max-Age=34560000',
+        'Path=/',
+        expect.stringContaining('Expires='),
+        'HttpOnly',
+        'SameSite=Lax',
+      ]);
+      expect(cookies[2].split(';').map((item) => item.trim())).toEqual([
+        'immich_is_authenticated=true',
+        'Max-Age=34560000',
+        'Path=/',
+        expect.stringContaining('Expires='),
+        'SameSite=Lax',
+      ]);
+    });
+  });
+
+  describe('POST /auth/logout', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).post('/auth/logout');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
   });
 
   describe('POST /auth/change-password', () => {
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index 922c5d3fdb..a2dd36527c 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -5,7 +5,7 @@ import { createHash, randomBytes } from 'node:crypto';
 import { Writable } from 'node:stream';
 import { AssetFace } from 'src/database';
 import { Albums, AssetJobStatus, Assets, DB, Exif, FaceSearch, Memories, Person, Sessions } from 'src/db';
-import { AuthDto } from 'src/dtos/auth.dto';
+import { AuthDto, LoginResponseDto } from 'src/dtos/auth.dto';
 import { AlbumUserRole, AssetType, AssetVisibility, MemoryType, SourceType, SyncRequestType } from 'src/enum';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { ActivityRepository } from 'src/repositories/activity.repository';
@@ -17,6 +17,7 @@ import { ConfigRepository } from 'src/repositories/config.repository';
 import { CryptoRepository } from 'src/repositories/crypto.repository';
 import { DatabaseRepository } from 'src/repositories/database.repository';
 import { EmailRepository } from 'src/repositories/email.repository';
+import { EventRepository } from 'src/repositories/event.repository';
 import { JobRepository } from 'src/repositories/job.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { MemoryRepository } from 'src/repositories/memory.repository';
@@ -305,6 +306,10 @@ const newMockRepository = <T>(key: ClassConstructor<T>) => {
       return automock(EmailRepository, { args: [{ setContext: () => {} }] });
     }
 
+    case EventRepository: {
+      return automock(EventRepository, { args: [undefined, undefined, { setContext: () => {} }] });
+    }
+
     case JobRepository: {
       return automock(JobRepository, {
         args: [
@@ -461,10 +466,13 @@ const sessionInsert = ({ id = newUuid(), userId, ...session }: Partial<Insertabl
 const userInsert = (user: Partial<Insertable<UserTable>> = {}) => {
   const id = user.id || newUuid();
 
-  const defaults: Insertable<UserTable> = {
+  const defaults = {
     email: `${id}@immich.cloud`,
     name: `User ${id}`,
     deletedAt: null,
+    isAdmin: false,
+    profileImagePath: '',
+    shouldChangePassword: true,
   };
 
   return { ...defaults, ...user, id };
@@ -513,6 +521,24 @@ const syncStream = () => {
   return new CustomWritable();
 };
 
+const loginDetails = () => {
+  return { isSecure: false, clientIp: '', deviceType: '', deviceOS: '' };
+};
+
+const loginResponse = (): LoginResponseDto => {
+  const user = userInsert({});
+  return {
+    accessToken: 'access-token',
+    userId: user.id,
+    userEmail: user.email,
+    name: user.name,
+    profileImagePath: user.profileImagePath,
+    isAdmin: user.isAdmin,
+    shouldChangePassword: user.shouldChangePassword,
+    isOnboarded: false,
+  };
+};
+
 export const mediumFactory = {
   assetInsert,
   assetFaceInsert,
@@ -524,4 +550,6 @@ export const mediumFactory = {
   syncStream,
   userInsert,
   memoryInsert,
+  loginDetails,
+  loginResponse,
 };
diff --git a/server/test/medium/specs/services/auth.service.spec.ts b/server/test/medium/specs/services/auth.service.spec.ts
new file mode 100644
index 0000000000..53deaa1291
--- /dev/null
+++ b/server/test/medium/specs/services/auth.service.spec.ts
@@ -0,0 +1,163 @@
+import { BadRequestException } from '@nestjs/common';
+import { hash } from 'bcrypt';
+import { Kysely } from 'kysely';
+import { DB } from 'src/db';
+import { AuthType } from 'src/enum';
+import { AccessRepository } from 'src/repositories/access.repository';
+import { ConfigRepository } from 'src/repositories/config.repository';
+import { CryptoRepository } from 'src/repositories/crypto.repository';
+import { DatabaseRepository } from 'src/repositories/database.repository';
+import { EventRepository } from 'src/repositories/event.repository';
+import { LoggingRepository } from 'src/repositories/logging.repository';
+import { SessionRepository } from 'src/repositories/session.repository';
+import { StorageRepository } from 'src/repositories/storage.repository';
+import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
+import { UserRepository } from 'src/repositories/user.repository';
+import { AuthService } from 'src/services/auth.service';
+import { mediumFactory, newMediumService } from 'test/medium.factory';
+import { factory } from 'test/small.factory';
+import { getKyselyDB } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = (db?: Kysely<DB>) => {
+  return newMediumService(AuthService, {
+    database: db || defaultDatabase,
+    real: [
+      AccessRepository,
+      ConfigRepository,
+      CryptoRepository,
+      DatabaseRepository,
+      SessionRepository,
+      SystemMetadataRepository,
+      UserRepository,
+    ],
+    mock: [LoggingRepository, StorageRepository, EventRepository],
+  });
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(AuthService.name, () => {
+  describe('adminSignUp', () => {
+    it(`should sign up the admin`, async () => {
+      const { sut } = setup();
+      const dto = { name: 'Admin', email: 'admin@immich.cloud', password: 'password' };
+
+      await expect(sut.adminSignUp(dto)).resolves.toEqual(
+        expect.objectContaining({
+          id: expect.any(String),
+          email: dto.email,
+          name: dto.name,
+          isAdmin: true,
+        }),
+      );
+    });
+
+    it('should not allow a second admin to sign up', async () => {
+      const { sut, ctx } = setup();
+      await ctx.newUser({ isAdmin: true });
+      const dto = { name: 'Admin', email: 'admin@immich.cloud', password: 'password' };
+
+      const response = sut.adminSignUp(dto);
+      await expect(response).rejects.toThrow(BadRequestException);
+      await expect(response).rejects.toThrow('The server already has an admin');
+    });
+  });
+
+  describe('login', () => {
+    it('should reject an incorrect password', async () => {
+      const { sut, ctx } = setup();
+      const password = 'password';
+      const passwordHashed = await hash(password, 10);
+      const { user } = await ctx.newUser({ password: passwordHashed });
+      const dto = { email: user.email, password: 'wrong-password' };
+
+      await expect(sut.login(dto, mediumFactory.loginDetails())).rejects.toThrow('Incorrect email or password');
+    });
+
+    it('should accept a correct password and return a login response', async () => {
+      const { sut, ctx } = setup();
+      const password = 'password';
+      const passwordHashed = await hash(password, 10);
+      const { user } = await ctx.newUser({ password: passwordHashed });
+      const dto = { email: user.email, password };
+
+      await expect(sut.login(dto, mediumFactory.loginDetails())).resolves.toEqual({
+        accessToken: expect.any(String),
+        isAdmin: user.isAdmin,
+        isOnboarded: false,
+        name: user.name,
+        profileImagePath: user.profileImagePath,
+        userId: user.id,
+        userEmail: user.email,
+        shouldChangePassword: user.shouldChangePassword,
+      });
+    });
+  });
+
+  describe('logout', () => {
+    it('should logout', async () => {
+      const { sut } = setup();
+      const auth = factory.auth();
+      await expect(sut.logout(auth, AuthType.PASSWORD)).resolves.toEqual({
+        successful: true,
+        redirectUri: '/auth/login?autoLaunch=0',
+      });
+    });
+
+    it('should cleanup the session', async () => {
+      const { sut, ctx } = setup();
+      const sessionRepo = ctx.get(SessionRepository);
+      const eventRepo = ctx.getMock(EventRepository);
+      const { user } = await ctx.newUser();
+      const { session } = await ctx.newSession({ userId: user.id });
+      const auth = factory.auth({ session, user });
+      eventRepo.emit.mockResolvedValue();
+
+      await expect(sessionRepo.get(session.id)).resolves.toEqual(expect.objectContaining({ id: session.id }));
+      await expect(sut.logout(auth, AuthType.PASSWORD)).resolves.toEqual({
+        successful: true,
+        redirectUri: '/auth/login?autoLaunch=0',
+      });
+      await expect(sessionRepo.get(session.id)).resolves.toBeUndefined();
+    });
+  });
+
+  describe('changePassword', () => {
+    it('should change the password and login with it', async () => {
+      const { sut, ctx } = setup();
+      const dto = { password: 'password', newPassword: 'new-password' };
+      const passwordHashed = await hash(dto.password, 10);
+      const { user } = await ctx.newUser({ password: passwordHashed });
+      const auth = factory.auth({ user });
+
+      const response = await sut.changePassword(auth, dto);
+      expect(response).toEqual(
+        expect.objectContaining({
+          id: user.id,
+          email: user.email,
+        }),
+      );
+      expect((response as any).password).not.toBeDefined();
+
+      await expect(
+        sut.login({ email: user.email, password: dto.newPassword }, mediumFactory.loginDetails()),
+      ).resolves.toBeDefined();
+    });
+
+    it('should validate the current password', async () => {
+      const { sut, ctx } = setup();
+      const dto = { password: 'wrong-password', newPassword: 'new-password' };
+      const passwordHashed = await hash('password', 10);
+      const { user } = await ctx.newUser({ password: passwordHashed });
+      const auth = factory.auth({ user });
+
+      const response = sut.changePassword(auth, dto);
+      await expect(response).rejects.toThrow(BadRequestException);
+      await expect(response).rejects.toThrow('Wrong password');
+    });
+  });
+});

From 09cbc5d3f4369119d8124e0459affdb9acacc51c Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 27 Jun 2025 16:52:04 -0400
Subject: [PATCH 078/337] refactor: change password repository lookup (#19584)

---
 server/src/queries/user.repository.sql     | 10 ++++++++
 server/src/repositories/user.repository.ts | 10 ++++++++
 server/src/services/auth.service.spec.ts   | 29 ++++++----------------
 server/src/services/auth.service.ts        |  6 +----
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/server/src/queries/user.repository.sql b/server/src/queries/user.repository.sql
index 0638b8c965..88f94c85ac 100644
--- a/server/src/queries/user.repository.sql
+++ b/server/src/queries/user.repository.sql
@@ -97,6 +97,16 @@ where
   "users"."id" = $1
   and "users"."deletedAt" is null
 
+-- UserRepository.getForChangePassword
+select
+  "users"."id",
+  "users"."password"
+from
+  "users"
+where
+  "users"."id" = $1
+  and "users"."deletedAt" is null
+
 -- UserRepository.getByEmail
 select
   "id",
diff --git a/server/src/repositories/user.repository.ts b/server/src/repositories/user.repository.ts
index 06159041c5..ef55c93222 100644
--- a/server/src/repositories/user.repository.ts
+++ b/server/src/repositories/user.repository.ts
@@ -100,6 +100,16 @@ export class UserRepository {
       .executeTakeFirstOrThrow();
   }
 
+  @GenerateSql({ params: [DummyValue.UUID] })
+  getForChangePassword(id: string) {
+    return this.db
+      .selectFrom('users')
+      .select(['users.id', 'users.password'])
+      .where('users.id', '=', id)
+      .where('users.deletedAt', 'is', null)
+      .executeTakeFirstOrThrow();
+  }
+
   @GenerateSql({ params: [DummyValue.EMAIL] })
   getByEmail(email: string, options?: { withPassword?: boolean }) {
     return this.db
diff --git a/server/src/services/auth.service.spec.ts b/server/src/services/auth.service.spec.ts
index e84db72fc9..3568bb9d6b 100644
--- a/server/src/services/auth.service.spec.ts
+++ b/server/src/services/auth.service.spec.ts
@@ -116,46 +116,33 @@ describe(AuthService.name, () => {
       const auth = factory.auth({ user });
       const dto = { password: 'old-password', newPassword: 'new-password' };
 
-      mocks.user.getByEmail.mockResolvedValue({ ...user, password: 'hash-password' });
+      mocks.user.getForChangePassword.mockResolvedValue({ id: user.id, password: 'hash-password' });
       mocks.user.update.mockResolvedValue(user);
 
       await sut.changePassword(auth, dto);
 
-      expect(mocks.user.getByEmail).toHaveBeenCalledWith(auth.user.email, { withPassword: true });
+      expect(mocks.user.getForChangePassword).toHaveBeenCalledWith(user.id);
       expect(mocks.crypto.compareBcrypt).toHaveBeenCalledWith('old-password', 'hash-password');
     });
 
-    it('should throw when auth user email is not found', async () => {
-      const auth = { user: { email: 'test@imimch.com' } } as AuthDto;
-      const dto = { password: 'old-password', newPassword: 'new-password' };
-
-      mocks.user.getByEmail.mockResolvedValue(void 0);
-
-      await expect(sut.changePassword(auth, dto)).rejects.toBeInstanceOf(UnauthorizedException);
-    });
-
     it('should throw when password does not match existing password', async () => {
-      const auth = { user: { email: 'test@imimch.com' } as UserAdmin };
+      const user = factory.user();
+      const auth = factory.auth({ user });
       const dto = { password: 'old-password', newPassword: 'new-password' };
 
       mocks.crypto.compareBcrypt.mockReturnValue(false);
 
-      mocks.user.getByEmail.mockResolvedValue({
-        email: 'test@immich.com',
-        password: 'hash-password',
-      } as UserAdmin & { password: string });
+      mocks.user.getForChangePassword.mockResolvedValue({ id: user.id, password: 'hash-password' });
 
       await expect(sut.changePassword(auth, dto)).rejects.toBeInstanceOf(BadRequestException);
     });
 
     it('should throw when user does not have a password', async () => {
-      const auth = { user: { email: 'test@imimch.com' } } as AuthDto;
+      const user = factory.user();
+      const auth = factory.auth({ user });
       const dto = { password: 'old-password', newPassword: 'new-password' };
 
-      mocks.user.getByEmail.mockResolvedValue({
-        email: 'test@immich.com',
-        password: '',
-      } as UserAdmin & { password: string });
+      mocks.user.getForChangePassword.mockResolvedValue({ id: user.id, password: '' });
 
       await expect(sut.changePassword(auth, dto)).rejects.toBeInstanceOf(BadRequestException);
     });
diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
index cbe892054d..70da8d81d3 100644
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -91,11 +91,7 @@ export class AuthService extends BaseService {
 
   async changePassword(auth: AuthDto, dto: ChangePasswordDto): Promise<UserAdminResponseDto> {
     const { password, newPassword } = dto;
-    const user = await this.userRepository.getByEmail(auth.user.email, { withPassword: true });
-    if (!user) {
-      throw new UnauthorizedException();
-    }
-
+    const user = await this.userRepository.getForChangePassword(auth.user.id);
     const valid = this.validateSecret(password, user.password);
     if (!valid) {
       throw new BadRequestException('Wrong password');

From e60bc3c3040a0c5c6cf0fad7dfd2d924aae8ad1b Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 30 Jun 2025 13:19:16 -0400
Subject: [PATCH 079/337] refactor: database types (#19624)

---
 server/package.json                           |   1 -
 server/src/database.ts                        |   7 +-
 server/src/db.d.ts                            | 540 ------------------
 server/src/dtos/person.dto.ts                 |   4 +-
 server/src/repositories/access.repository.ts  |   2 +-
 .../src/repositories/activity.repository.ts   |   5 +-
 .../src/repositories/album-user.repository.ts |   7 +-
 server/src/repositories/album.repository.ts   |   7 +-
 server/src/repositories/api-key.repository.ts |   7 +-
 .../src/repositories/asset-job.repository.ts  |   2 +-
 server/src/repositories/asset.repository.ts   |  28 +-
 server/src/repositories/audit.repository.ts   |   2 +-
 .../src/repositories/database.repository.ts   |   2 +-
 .../src/repositories/download.repository.ts   |   2 +-
 .../src/repositories/duplicate.repository.ts  |   2 +-
 server/src/repositories/library.repository.ts |   7 +-
 server/src/repositories/map.repository.ts     |  12 +-
 server/src/repositories/memory.repository.ts  |   7 +-
 server/src/repositories/move.repository.ts    |   7 +-
 .../repositories/notification.repository.ts   |   9 +-
 server/src/repositories/partner.repository.ts |   7 +-
 server/src/repositories/person.repository.ts  |  21 +-
 server/src/repositories/search.repository.ts  |   5 +-
 server/src/repositories/session.repository.ts |   7 +-
 .../repositories/shared-link.repository.ts    |   7 +-
 server/src/repositories/stack.repository.ts   |   5 +-
 .../sync-checkpoint.repository.ts             |   5 +-
 server/src/repositories/sync.repository.ts    |   2 +-
 .../system-metadata.repository.ts             |   5 +-
 server/src/repositories/tag.repository.ts     |  10 +-
 server/src/repositories/trash.repository.ts   |   2 +-
 server/src/repositories/user.repository.ts    |   5 +-
 .../version-history.repository.ts             |   5 +-
 server/src/repositories/view-repository.ts    |   2 +-
 server/src/schema/index.ts                    |  60 +-
 server/src/schema/tables/activity.table.ts    |  12 +-
 .../schema/tables/album-asset-audit.table.ts  |   6 +-
 server/src/schema/tables/album-asset.table.ts |  16 +-
 server/src/schema/tables/album-audit.table.ts |   6 +-
 .../schema/tables/album-user-audit.table.ts   |   6 +-
 server/src/schema/tables/album-user.table.ts  |  12 +-
 server/src/schema/tables/album.table.ts       |  22 +-
 server/src/schema/tables/api-key.table.ts     |  16 +-
 server/src/schema/tables/asset-audit.table.ts |   6 +-
 server/src/schema/tables/asset-face.table.ts  |  33 +-
 server/src/schema/tables/asset-files.table.ts |  12 +-
 .../schema/tables/asset-job-status.table.ts   |  12 +-
 server/src/schema/tables/asset.table.ts       |  32 +-
 server/src/schema/tables/audit.table.ts       |   6 +-
 server/src/schema/tables/exif.table.ts        |  16 +-
 .../src/schema/tables/geodata-places.table.ts |  14 +-
 server/src/schema/tables/library.table.ts     |  14 +-
 .../src/schema/tables/memory-asset.table.ts   |  15 +-
 .../src/schema/tables/memory-audit.table.ts   |   9 +-
 server/src/schema/tables/memory.table.ts      |  22 +-
 server/src/schema/tables/move.table.ts        |   4 +-
 .../tables/natural-earth-countries.table.ts   |   4 +-
 .../src/schema/tables/notification.table.ts   |  20 +-
 .../src/schema/tables/partner-audit.table.ts  |   6 +-
 server/src/schema/tables/partner.table.ts     |  21 +-
 server/src/schema/tables/person.table.ts      |  22 +-
 server/src/schema/tables/session.table.ts     |  18 +-
 server/src/schema/tables/shared-link.table.ts |  23 +-
 server/src/schema/tables/stack.table.ts       |   4 +-
 .../schema/tables/sync-checkpoint.table.ts    |  17 +-
 server/src/schema/tables/tag.table.ts         |  12 +-
 server/src/schema/tables/user-audit.table.ts  |  10 +-
 server/src/schema/tables/user.table.ts        |   6 +-
 .../schema/tables/version-history.table.ts    |   6 +-
 server/src/services/library.service.ts        |   4 +-
 server/src/services/metadata.service.ts       |  12 +-
 server/src/services/person.service.ts         |   7 +-
 server/src/services/sync.service.ts           |   4 +-
 server/src/services/tag.service.ts            |   4 +-
 server/src/sql-tools/types.ts                 |   9 +-
 server/src/utils/database.ts                  |   2 +-
 server/test/fixtures/asset.stub.ts            |   1 +
 server/test/medium.factory.ts                 |  54 +-
 server/test/medium/globalSetup.ts             |   2 +-
 .../specs/services/asset.service.spec.ts      |   2 +-
 .../specs/services/auth.service.spec.ts       |   2 +-
 .../specs/services/memory.service.spec.ts     |   2 +-
 .../specs/services/person.service.spec.ts     |   2 +-
 .../specs/services/user.service.spec.ts       |   2 +-
 .../specs/services/version.service.spec.ts    |   2 +-
 .../specs/sync/sync-album-asset-exif.spec.ts  |   2 +-
 .../specs/sync/sync-album-asset.spec.ts       |   2 +-
 .../specs/sync/sync-album-to-asset.spec.ts    |   2 +-
 .../medium/specs/sync/sync-album-user.spec.ts |   2 +-
 .../test/medium/specs/sync/sync-album.spec.ts |   2 +-
 .../medium/specs/sync/sync-asset-exif.spec.ts |   2 +-
 .../test/medium/specs/sync/sync-asset.spec.ts |   2 +-
 .../specs/sync/sync-memory-asset.spec.ts      |   2 +-
 .../medium/specs/sync/sync-memory.spec.ts     |   2 +-
 .../sync/sync-partner-asset-exif.spec.ts      |   2 +-
 .../specs/sync/sync-partner-asset.spec.ts     |   2 +-
 .../medium/specs/sync/sync-partner.spec.ts    |   2 +-
 .../test/medium/specs/sync/sync-user.spec.ts  |   2 +-
 server/test/utils.ts                          |   2 +-
 99 files changed, 518 insertions(+), 889 deletions(-)
 delete mode 100644 server/src/db.d.ts

diff --git a/server/package.json b/server/package.json
index 72207526a5..9e3d32862d 100644
--- a/server/package.json
+++ b/server/package.json
@@ -29,7 +29,6 @@
     "migrations:run": "node ./dist/bin/migrations.js run",
     "schema:drop": "node ./dist/bin/migrations.js query 'DROP schema public cascade; CREATE schema public;'",
     "schema:reset": "npm run schema:drop && npm run migrations:run",
-    "kysely:codegen": "npx kysely-codegen --include-pattern=\"(public|vectors).*\" --dialect postgres --url postgres://postgres:postgres@localhost/immich --log-level debug --out-file=./src/db.d.ts",
     "sync:open-api": "node ./dist/bin/sync-open-api.js",
     "sync:sql": "node ./dist/bin/sync-sql.js",
     "email:dev": "email dev -p 3050 --dir src/emails",
diff --git a/server/src/database.ts b/server/src/database.ts
index 4042617e98..b28bb24451 100644
--- a/server/src/database.ts
+++ b/server/src/database.ts
@@ -1,5 +1,4 @@
 import { Selectable } from 'kysely';
-import { Albums, Exif as DatabaseExif } from 'src/db';
 import { MapAsset } from 'src/dtos/asset-response.dto';
 import {
   AlbumUserRole,
@@ -13,6 +12,8 @@ import {
   UserAvatarColor,
   UserStatus,
 } from 'src/enum';
+import { AlbumTable } from 'src/schema/tables/album.table';
+import { ExifTable } from 'src/schema/tables/exif.table';
 import { UserMetadataItem } from 'src/types';
 
 export type AuthUser = {
@@ -193,7 +194,7 @@ export type SharedLink = {
   userId: string;
 };
 
-export type Album = Selectable<Albums> & {
+export type Album = Selectable<AlbumTable> & {
   owner: User;
   assets: MapAsset[];
 };
@@ -239,7 +240,7 @@ export type Session = {
   pinExpiresAt: Date | null;
 };
 
-export type Exif = Omit<Selectable<DatabaseExif>, 'updatedAt' | 'updateId'>;
+export type Exif = Omit<Selectable<ExifTable>, 'updatedAt' | 'updateId'>;
 
 export type Person = {
   createdAt: Date;
diff --git a/server/src/db.d.ts b/server/src/db.d.ts
deleted file mode 100644
index 68ddd245f3..0000000000
--- a/server/src/db.d.ts
+++ /dev/null
@@ -1,540 +0,0 @@
-/**
- * This file was generated by kysely-codegen.
- * Please do not edit it manually.
- */
-
-import type { ColumnType } from 'kysely';
-import {
-  AlbumUserRole,
-  AssetFileType,
-  AssetOrder,
-  AssetStatus,
-  AssetType,
-  AssetVisibility,
-  MemoryType,
-  NotificationLevel,
-  NotificationType,
-  Permission,
-  SharedLinkType,
-  SourceType,
-  SyncEntityType,
-} from 'src/enum';
-import { MemoryAssetAuditTable } from 'src/schema/tables/memory-asset-audit.table';
-import { MemoryAssetTable } from 'src/schema/tables/memory-asset.table';
-import { MemoryAuditTable } from 'src/schema/tables/memory-audit.table';
-import { UserTable } from 'src/schema/tables/user.table';
-import { UserMetadataItem } from 'src/types';
-
-export type ArrayType<T> = ArrayTypeImpl<T> extends (infer U)[] ? U[] : ArrayTypeImpl<T>;
-
-export type ArrayTypeImpl<T> = T extends ColumnType<infer S, infer I, infer U> ? ColumnType<S[], I[], U[]> : T[];
-
-export type Generated<T> =
-  T extends ColumnType<infer S, infer I, infer U> ? ColumnType<S, I | undefined, U> : ColumnType<T, T | undefined, T>;
-
-export type Int8 = ColumnType<number>;
-
-export type Json = JsonValue;
-
-export type JsonArray = JsonValue[];
-
-export type JsonObject = {
-  [x: string]: JsonValue | undefined;
-};
-
-export type JsonPrimitive = boolean | number | string | null;
-
-export type JsonValue = JsonArray | JsonObject | JsonPrimitive;
-
-export type Timestamp = ColumnType<Date, Date | string, Date | string>;
-
-export interface Activity {
-  albumId: string;
-  assetId: string | null;
-  comment: string | null;
-  createdAt: Generated<Timestamp>;
-  id: Generated<string>;
-  isLiked: Generated<boolean>;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-  userId: string;
-}
-
-export interface Albums {
-  albumName: Generated<string>;
-  /**
-   * Asset ID to be used as thumbnail
-   */
-  albumThumbnailAssetId: string | null;
-  createdAt: Generated<Timestamp>;
-  deletedAt: Timestamp | null;
-  description: Generated<string>;
-  id: Generated<string>;
-  isActivityEnabled: Generated<boolean>;
-  order: Generated<AssetOrder>;
-  ownerId: string;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-}
-
-export interface AlbumsAudit {
-  deletedAt: Generated<Timestamp>;
-  id: Generated<string>;
-  albumId: string;
-  userId: string;
-}
-
-export interface AlbumUsersAudit {
-  deletedAt: Generated<Timestamp>;
-  id: Generated<string>;
-  albumId: string;
-  userId: string;
-}
-
-export interface AlbumsAssetsAssets {
-  albumsId: string;
-  assetsId: string;
-  createdAt: Generated<Timestamp>;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-}
-
-export interface AlbumAssetsAudit {
-  deletedAt: Generated<Timestamp>;
-  id: Generated<string>;
-  albumId: string;
-  assetId: string;
-}
-
-export interface AlbumsSharedUsersUsers {
-  albumsId: string;
-  role: Generated<AlbumUserRole>;
-  usersId: string;
-  createId: Generated<string>;
-  createdAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-  updatedAt: Generated<Timestamp>;
-}
-
-export interface ApiKeys {
-  createdAt: Generated<Timestamp>;
-  id: Generated<string>;
-  key: string;
-  name: string;
-  permissions: Permission[];
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-  userId: string;
-}
-
-export interface AssetFaces {
-  assetId: string;
-  boundingBoxX1: Generated<number>;
-  boundingBoxX2: Generated<number>;
-  boundingBoxY1: Generated<number>;
-  boundingBoxY2: Generated<number>;
-  deletedAt: Timestamp | null;
-  id: Generated<string>;
-  imageHeight: Generated<number>;
-  imageWidth: Generated<number>;
-  personId: string | null;
-  sourceType: Generated<SourceType>;
-}
-
-export interface AssetFiles {
-  assetId: string;
-  createdAt: Generated<Timestamp>;
-  id: Generated<string>;
-  path: string;
-  type: AssetFileType;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-}
-
-export interface AssetJobStatus {
-  assetId: string;
-  duplicatesDetectedAt: Timestamp | null;
-  facesRecognizedAt: Timestamp | null;
-  metadataExtractedAt: Timestamp | null;
-  previewAt: Timestamp | null;
-  thumbnailAt: Timestamp | null;
-}
-
-export interface AssetsAudit {
-  deletedAt: Generated<Timestamp>;
-  id: Generated<string>;
-  assetId: string;
-  ownerId: string;
-}
-
-export interface Assets {
-  checksum: Buffer;
-  createdAt: Generated<Timestamp>;
-  deletedAt: Timestamp | null;
-  deviceAssetId: string;
-  deviceId: string;
-  duplicateId: string | null;
-  duration: string | null;
-  encodedVideoPath: Generated<string | null>;
-  fileCreatedAt: Timestamp;
-  fileModifiedAt: Timestamp;
-  id: Generated<string>;
-  isExternal: Generated<boolean>;
-  isFavorite: Generated<boolean>;
-  isOffline: Generated<boolean>;
-  visibility: Generated<AssetVisibility>;
-  libraryId: string | null;
-  livePhotoVideoId: string | null;
-  localDateTime: Timestamp;
-  originalFileName: string;
-  originalPath: string;
-  ownerId: string;
-  sidecarPath: string | null;
-  stackId: string | null;
-  status: Generated<AssetStatus>;
-  thumbhash: Buffer | null;
-  type: AssetType;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-}
-
-export interface AssetStack {
-  id: Generated<string>;
-  ownerId: string;
-  primaryAssetId: string;
-}
-
-export interface Audit {
-  action: string;
-  createdAt: Generated<Timestamp>;
-  entityId: string;
-  entityType: string;
-  id: Generated<number>;
-  ownerId: string;
-}
-
-export interface Exif {
-  assetId: string;
-  updateId: Generated<string>;
-  updatedAt: Generated<Timestamp>;
-  autoStackId: string | null;
-  bitsPerSample: number | null;
-  city: string | null;
-  colorspace: string | null;
-  country: string | null;
-  dateTimeOriginal: Timestamp | null;
-  description: Generated<string>;
-  exifImageHeight: number | null;
-  exifImageWidth: number | null;
-  exposureTime: string | null;
-  fileSizeInByte: Int8 | null;
-  fNumber: number | null;
-  focalLength: number | null;
-  fps: number | null;
-  iso: number | null;
-  latitude: number | null;
-  lensModel: string | null;
-  livePhotoCID: string | null;
-  longitude: number | null;
-  make: string | null;
-  model: string | null;
-  modifyDate: Timestamp | null;
-  orientation: string | null;
-  profileDescription: string | null;
-  projectionType: string | null;
-  rating: number | null;
-  state: string | null;
-  timeZone: string | null;
-}
-
-export interface FaceSearch {
-  embedding: string;
-  faceId: string;
-}
-
-export interface GeodataPlaces {
-  admin1Code: string | null;
-  admin1Name: string | null;
-  admin2Code: string | null;
-  admin2Name: string | null;
-  alternateNames: string | null;
-  countryCode: string;
-  id: number;
-  latitude: number;
-  longitude: number;
-  modificationDate: Timestamp;
-  name: string;
-}
-
-export interface Libraries {
-  createdAt: Generated<Timestamp>;
-  deletedAt: Timestamp | null;
-  exclusionPatterns: string[];
-  id: Generated<string>;
-  importPaths: string[];
-  name: string;
-  ownerId: string;
-  refreshedAt: Timestamp | null;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-}
-
-export interface Memories {
-  createdAt: Generated<Timestamp>;
-  data: object;
-  deletedAt: Timestamp | null;
-  hideAt: Timestamp | null;
-  id: Generated<string>;
-  isSaved: Generated<boolean>;
-  memoryAt: Timestamp;
-  ownerId: string;
-  seenAt: Timestamp | null;
-  showAt: Timestamp | null;
-  type: MemoryType;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-}
-
-export interface Notifications {
-  id: Generated<string>;
-  createdAt: Generated<Timestamp>;
-  updatedAt: Generated<Timestamp>;
-  deletedAt: Timestamp | null;
-  updateId: Generated<string>;
-  userId: string;
-  level: Generated<NotificationLevel>;
-  type: NotificationType;
-  title: string;
-  description: string | null;
-  data: any | null;
-  readAt: Timestamp | null;
-}
-
-export interface Migrations {
-  id: Generated<number>;
-  name: string;
-  timestamp: Int8;
-}
-
-export interface MoveHistory {
-  entityId: string;
-  id: Generated<string>;
-  newPath: string;
-  oldPath: string;
-  pathType: string;
-}
-
-export interface NaturalearthCountries {
-  admin: string;
-  admin_a3: string;
-  coordinates: string;
-  id: Generated<number>;
-  type: string;
-}
-
-export interface PartnersAudit {
-  deletedAt: Generated<Timestamp>;
-  id: Generated<string>;
-  sharedById: string;
-  sharedWithId: string;
-}
-
-export interface Partners {
-  createdAt: Generated<Timestamp>;
-  createId: Generated<string>;
-  inTimeline: Generated<boolean>;
-  sharedById: string;
-  sharedWithId: string;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-}
-
-export interface Person {
-  birthDate: Timestamp | null;
-  color: string | null;
-  createdAt: Generated<Timestamp>;
-  faceAssetId: string | null;
-  id: Generated<string>;
-  isFavorite: Generated<boolean>;
-  isHidden: Generated<boolean>;
-  name: Generated<string>;
-  ownerId: string;
-  thumbnailPath: Generated<string>;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-}
-
-export interface Sessions {
-  createdAt: Generated<Timestamp>;
-  deviceOS: Generated<string>;
-  deviceType: Generated<string>;
-  id: Generated<string>;
-  parentId: string | null;
-  expiresAt: Date | null;
-  token: string;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-  userId: string;
-  pinExpiresAt: Timestamp | null;
-}
-
-export interface SessionSyncCheckpoints {
-  ack: string;
-  createdAt: Generated<Timestamp>;
-  sessionId: string;
-  type: SyncEntityType;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-}
-
-export interface SharedLinkAsset {
-  assetsId: string;
-  sharedLinksId: string;
-}
-
-export interface SharedLinks {
-  albumId: string | null;
-  allowDownload: Generated<boolean>;
-  allowUpload: Generated<boolean>;
-  createdAt: Generated<Timestamp>;
-  description: string | null;
-  expiresAt: Timestamp | null;
-  id: Generated<string>;
-  key: Buffer;
-  password: string | null;
-  showExif: Generated<boolean>;
-  type: SharedLinkType;
-  userId: string;
-}
-
-export interface SmartSearch {
-  assetId: string;
-  embedding: string;
-}
-
-export interface SocketIoAttachments {
-  created_at: Generated<Timestamp | null>;
-  id: Generated<Int8>;
-  payload: Buffer | null;
-}
-
-export interface SystemConfig {
-  key: string;
-  value: string | null;
-}
-
-export interface SystemMetadata {
-  key: string;
-  value: Json;
-}
-
-export interface TagAsset {
-  assetsId: string;
-  tagsId: string;
-}
-
-export interface Tags {
-  color: string | null;
-  createdAt: Generated<Timestamp>;
-  id: Generated<string>;
-  parentId: string | null;
-  updatedAt: Generated<Timestamp>;
-  updateId: Generated<string>;
-  userId: string;
-  value: string;
-}
-
-export interface TagsClosure {
-  id_ancestor: string;
-  id_descendant: string;
-}
-
-export interface TypeormMetadata {
-  database: string | null;
-  name: string | null;
-  schema: string | null;
-  table: string | null;
-  type: string;
-  value: string | null;
-}
-
-export interface UserMetadata extends UserMetadataItem {
-  userId: string;
-}
-
-export interface UsersAudit {
-  id: Generated<string>;
-  userId: string;
-  deletedAt: Generated<Timestamp>;
-}
-
-export interface VectorsPgVectorIndexStat {
-  idx_growing: ArrayType<Int8> | null;
-  idx_indexing: boolean | null;
-  idx_options: string | null;
-  idx_sealed: ArrayType<Int8> | null;
-  idx_size: Int8 | null;
-  idx_status: string | null;
-  idx_tuples: Int8 | null;
-  idx_write: Int8 | null;
-  indexname: string | null;
-  indexrelid: number | null;
-  tablename: string | null;
-  tablerelid: number | null;
-}
-
-export interface VersionHistory {
-  createdAt: Generated<Timestamp>;
-  id: Generated<string>;
-  version: string;
-}
-
-export interface DB {
-  activity: Activity;
-  albums: Albums;
-  albums_audit: AlbumsAudit;
-  albums_assets_assets: AlbumsAssetsAssets;
-  album_assets_audit: AlbumAssetsAudit;
-  albums_shared_users_users: AlbumsSharedUsersUsers;
-  album_users_audit: AlbumUsersAudit;
-  api_keys: ApiKeys;
-  asset_faces: AssetFaces;
-  asset_files: AssetFiles;
-  asset_job_status: AssetJobStatus;
-  asset_stack: AssetStack;
-  assets: Assets;
-  assets_audit: AssetsAudit;
-  audit: Audit;
-  exif: Exif;
-  face_search: FaceSearch;
-  geodata_places: GeodataPlaces;
-  libraries: Libraries;
-  memories: Memories;
-  memories_audit: MemoryAuditTable;
-  memories_assets_assets: MemoryAssetTable;
-  memory_assets_audit: MemoryAssetAuditTable;
-  migrations: Migrations;
-  notifications: Notifications;
-  move_history: MoveHistory;
-  naturalearth_countries: NaturalearthCountries;
-  partners_audit: PartnersAudit;
-  partners: Partners;
-  person: Person;
-  sessions: Sessions;
-  session_sync_checkpoints: SessionSyncCheckpoints;
-  shared_link__asset: SharedLinkAsset;
-  shared_links: SharedLinks;
-  smart_search: SmartSearch;
-  socket_io_attachments: SocketIoAttachments;
-  system_config: SystemConfig;
-  system_metadata: SystemMetadata;
-  tag_asset: TagAsset;
-  tags: Tags;
-  tags_closure: TagsClosure;
-  typeorm_metadata: TypeormMetadata;
-  user_metadata: UserMetadata;
-  users: UserTable;
-  users_audit: UsersAudit;
-  'vectors.pg_vector_index_stat': VectorsPgVectorIndexStat;
-  version_history: VersionHistory;
-}
diff --git a/server/src/dtos/person.dto.ts b/server/src/dtos/person.dto.ts
index c59ab905bd..18da39b6d4 100644
--- a/server/src/dtos/person.dto.ts
+++ b/server/src/dtos/person.dto.ts
@@ -4,10 +4,10 @@ import { IsArray, IsInt, IsNotEmpty, IsNumber, IsString, Max, Min, ValidateNeste
 import { Selectable } from 'kysely';
 import { DateTime } from 'luxon';
 import { AssetFace, Person } from 'src/database';
-import { AssetFaces } from 'src/db';
 import { PropertyLifecycle } from 'src/decorators';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { SourceType } from 'src/enum';
+import { AssetFaceTable } from 'src/schema/tables/asset-face.table';
 import { asDateString } from 'src/utils/date';
 import {
   IsDateStringFormat,
@@ -232,7 +232,7 @@ export function mapPerson(person: Person): PersonResponseDto {
   };
 }
 
-export function mapFacesWithoutPerson(face: Selectable<AssetFaces>): AssetFaceWithoutPersonResponseDto {
+export function mapFacesWithoutPerson(face: Selectable<AssetFaceTable>): AssetFaceWithoutPersonResponseDto {
   return {
     id: face.id,
     imageHeight: face.imageHeight,
diff --git a/server/src/repositories/access.repository.ts b/server/src/repositories/access.repository.ts
index 17f69c0e52..8863d117bc 100644
--- a/server/src/repositories/access.repository.ts
+++ b/server/src/repositories/access.repository.ts
@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { Kysely, sql } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { DB } from 'src/db';
 import { ChunkedSet, DummyValue, GenerateSql } from 'src/decorators';
 import { AlbumUserRole, AssetVisibility } from 'src/enum';
+import { DB } from 'src/schema';
 import { asUuid } from 'src/utils/database';
 
 class ActivityAccess {
diff --git a/server/src/repositories/activity.repository.ts b/server/src/repositories/activity.repository.ts
index ecde95cf78..0714d058cf 100644
--- a/server/src/repositories/activity.repository.ts
+++ b/server/src/repositories/activity.repository.ts
@@ -3,9 +3,10 @@ import { Insertable, Kysely, NotNull, sql } from 'kysely';
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
-import { Activity, DB } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AssetVisibility } from 'src/enum';
+import { DB } from 'src/schema';
+import { ActivityTable } from 'src/schema/tables/activity.table';
 import { asUuid } from 'src/utils/database';
 
 export interface ActivitySearch {
@@ -48,7 +49,7 @@ export class ActivityRepository {
   }
 
   @GenerateSql({ params: [{ albumId: DummyValue.UUID, userId: DummyValue.UUID }] })
-  async create(activity: Insertable<Activity>) {
+  async create(activity: Insertable<ActivityTable>) {
     return this.db
       .insertInto('activity')
       .values(activity)
diff --git a/server/src/repositories/album-user.repository.ts b/server/src/repositories/album-user.repository.ts
index ad7ba8d6cd..82e631a6dc 100644
--- a/server/src/repositories/album-user.repository.ts
+++ b/server/src/repositories/album-user.repository.ts
@@ -1,9 +1,10 @@
 import { Injectable } from '@nestjs/common';
 import { Insertable, Kysely, Updateable } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { AlbumsSharedUsersUsers, DB } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AlbumUserRole } from 'src/enum';
+import { DB } from 'src/schema';
+import { AlbumUserTable } from 'src/schema/tables/album-user.table';
 
 export type AlbumPermissionId = {
   albumsId: string;
@@ -15,7 +16,7 @@ export class AlbumUserRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
   @GenerateSql({ params: [{ usersId: DummyValue.UUID, albumsId: DummyValue.UUID }] })
-  create(albumUser: Insertable<AlbumsSharedUsersUsers>) {
+  create(albumUser: Insertable<AlbumUserTable>) {
     return this.db
       .insertInto('albums_shared_users_users')
       .values(albumUser)
@@ -24,7 +25,7 @@ export class AlbumUserRepository {
   }
 
   @GenerateSql({ params: [{ usersId: DummyValue.UUID, albumsId: DummyValue.UUID }, { role: AlbumUserRole.VIEWER }] })
-  update({ usersId, albumsId }: AlbumPermissionId, dto: Updateable<AlbumsSharedUsersUsers>) {
+  update({ usersId, albumsId }: AlbumPermissionId, dto: Updateable<AlbumUserTable>) {
     return this.db
       .updateTable('albums_shared_users_users')
       .set(dto)
diff --git a/server/src/repositories/album.repository.ts b/server/src/repositories/album.repository.ts
index 7131a72f61..a52fa9c990 100644
--- a/server/src/repositories/album.repository.ts
+++ b/server/src/repositories/album.repository.ts
@@ -3,9 +3,10 @@ import { ExpressionBuilder, Insertable, Kysely, NotNull, sql, Updateable } from
 import { jsonArrayFrom, jsonObjectFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns, Exif } from 'src/database';
-import { Albums, DB } from 'src/db';
 import { Chunked, ChunkedArray, ChunkedSet, DummyValue, GenerateSql } from 'src/decorators';
 import { AlbumUserCreateDto } from 'src/dtos/album.dto';
+import { DB } from 'src/schema';
+import { AlbumTable } from 'src/schema/tables/album.table';
 import { withDefaultVisibility } from 'src/utils/database';
 
 export interface AlbumAssetCount {
@@ -269,7 +270,7 @@ export class AlbumRepository {
     await this.addAssets(this.db, albumId, assetIds);
   }
 
-  create(album: Insertable<Albums>, assetIds: string[], albumUsers: AlbumUserCreateDto[]) {
+  create(album: Insertable<AlbumTable>, assetIds: string[], albumUsers: AlbumUserCreateDto[]) {
     return this.db.transaction().execute(async (tx) => {
       const newAlbum = await tx.insertInto('albums').values(album).returning('albums.id').executeTakeFirst();
 
@@ -302,7 +303,7 @@ export class AlbumRepository {
     });
   }
 
-  update(id: string, album: Updateable<Albums>) {
+  update(id: string, album: Updateable<AlbumTable>) {
     return this.db
       .updateTable('albums')
       .set(album)
diff --git a/server/src/repositories/api-key.repository.ts b/server/src/repositories/api-key.repository.ts
index 0085db2337..5f71399a38 100644
--- a/server/src/repositories/api-key.repository.ts
+++ b/server/src/repositories/api-key.repository.ts
@@ -3,19 +3,20 @@ import { Insertable, Kysely, Updateable } from 'kysely';
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
-import { ApiKeys, DB } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
+import { DB } from 'src/schema';
+import { ApiKeyTable } from 'src/schema/tables/api-key.table';
 import { asUuid } from 'src/utils/database';
 
 @Injectable()
 export class ApiKeyRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
-  create(dto: Insertable<ApiKeys>) {
+  create(dto: Insertable<ApiKeyTable>) {
     return this.db.insertInto('api_keys').values(dto).returning(columns.apiKey).executeTakeFirstOrThrow();
   }
 
-  async update(userId: string, id: string, dto: Updateable<ApiKeys>) {
+  async update(userId: string, id: string, dto: Updateable<ApiKeyTable>) {
     return this.db
       .updateTable('api_keys')
       .set(dto)
diff --git a/server/src/repositories/asset-job.repository.ts b/server/src/repositories/asset-job.repository.ts
index af9d5affb1..4ae52556b4 100644
--- a/server/src/repositories/asset-job.repository.ts
+++ b/server/src/repositories/asset-job.repository.ts
@@ -3,9 +3,9 @@ import { Kysely } from 'kysely';
 import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { Asset, columns } from 'src/database';
-import { DB } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AssetFileType, AssetType, AssetVisibility } from 'src/enum';
+import { DB } from 'src/schema';
 import { StorageAsset } from 'src/types';
 import {
   anyUuid,
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index 2a3975f446..f3e798d2b4 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -3,9 +3,13 @@ import { Insertable, Kysely, NotNull, Selectable, UpdateResult, Updateable, sql
 import { isEmpty, isUndefined, omitBy } from 'lodash';
 import { InjectKysely } from 'nestjs-kysely';
 import { Stack } from 'src/database';
-import { AssetFiles, AssetJobStatus, Assets, DB, Exif } from 'src/db';
 import { Chunked, ChunkedArray, DummyValue, GenerateSql } from 'src/decorators';
 import { AssetFileType, AssetOrder, AssetStatus, AssetType, AssetVisibility } from 'src/enum';
+import { DB } from 'src/schema';
+import { AssetFileTable } from 'src/schema/tables/asset-files.table';
+import { AssetJobStatusTable } from 'src/schema/tables/asset-job-status.table';
+import { AssetTable } from 'src/schema/tables/asset.table';
+import { ExifTable } from 'src/schema/tables/exif.table';
 import {
   anyUuid,
   asUuid,
@@ -110,7 +114,7 @@ interface GetByIdsRelations {
 export class AssetRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
-  async upsertExif(exif: Insertable<Exif>): Promise<void> {
+  async upsertExif(exif: Insertable<ExifTable>): Promise<void> {
     const value = { ...exif, assetId: asUuid(exif.assetId) };
     await this.db
       .insertInto('exif')
@@ -157,7 +161,7 @@ export class AssetRepository {
 
   @GenerateSql({ params: [[DummyValue.UUID], { model: DummyValue.STRING }] })
   @Chunked()
-  async updateAllExif(ids: string[], options: Updateable<Exif>): Promise<void> {
+  async updateAllExif(ids: string[], options: Updateable<ExifTable>): Promise<void> {
     if (ids.length === 0) {
       return;
     }
@@ -165,7 +169,7 @@ export class AssetRepository {
     await this.db.updateTable('exif').set(options).where('assetId', 'in', ids).execute();
   }
 
-  async upsertJobStatus(...jobStatus: Insertable<AssetJobStatus>[]): Promise<void> {
+  async upsertJobStatus(...jobStatus: Insertable<AssetJobStatusTable>[]): Promise<void> {
     if (jobStatus.length === 0) {
       return;
     }
@@ -191,11 +195,11 @@ export class AssetRepository {
       .execute();
   }
 
-  create(asset: Insertable<Assets>) {
+  create(asset: Insertable<AssetTable>) {
     return this.db.insertInto('assets').values(asset).returningAll().executeTakeFirstOrThrow();
   }
 
-  createAll(assets: Insertable<Assets>[]) {
+  createAll(assets: Insertable<AssetTable>[]) {
     return this.db.insertInto('assets').values(assets).returningAll().execute();
   }
 
@@ -375,18 +379,18 @@ export class AssetRepository {
 
   @GenerateSql({ params: [[DummyValue.UUID], { deviceId: DummyValue.STRING }] })
   @Chunked()
-  async updateAll(ids: string[], options: Updateable<Assets>): Promise<void> {
+  async updateAll(ids: string[], options: Updateable<AssetTable>): Promise<void> {
     if (ids.length === 0) {
       return;
     }
     await this.db.updateTable('assets').set(options).where('id', '=', anyUuid(ids)).execute();
   }
 
-  async updateByLibraryId(libraryId: string, options: Updateable<Assets>): Promise<void> {
+  async updateByLibraryId(libraryId: string, options: Updateable<AssetTable>): Promise<void> {
     await this.db.updateTable('assets').set(options).where('libraryId', '=', asUuid(libraryId)).execute();
   }
 
-  async update(asset: Updateable<Assets> & { id: string }) {
+  async update(asset: Updateable<AssetTable> & { id: string }) {
     const value = omitBy(asset, isUndefined);
     delete value.id;
     if (!isEmpty(value)) {
@@ -742,7 +746,7 @@ export class AssetRepository {
       .execute();
   }
 
-  async upsertFile(file: Pick<Insertable<AssetFiles>, 'assetId' | 'path' | 'type'>): Promise<void> {
+  async upsertFile(file: Pick<Insertable<AssetFileTable>, 'assetId' | 'path' | 'type'>): Promise<void> {
     const value = { ...file, assetId: asUuid(file.assetId) };
     await this.db
       .insertInto('asset_files')
@@ -755,7 +759,7 @@ export class AssetRepository {
       .execute();
   }
 
-  async upsertFiles(files: Pick<Insertable<AssetFiles>, 'assetId' | 'path' | 'type'>[]): Promise<void> {
+  async upsertFiles(files: Pick<Insertable<AssetFileTable>, 'assetId' | 'path' | 'type'>[]): Promise<void> {
     if (files.length === 0) {
       return;
     }
@@ -772,7 +776,7 @@ export class AssetRepository {
       .execute();
   }
 
-  async deleteFiles(files: Pick<Selectable<AssetFiles>, 'id'>[]): Promise<void> {
+  async deleteFiles(files: Pick<Selectable<AssetFileTable>, 'id'>[]): Promise<void> {
     if (files.length === 0) {
       return;
     }
diff --git a/server/src/repositories/audit.repository.ts b/server/src/repositories/audit.repository.ts
index 1193e26ebe..85ca4a79f8 100644
--- a/server/src/repositories/audit.repository.ts
+++ b/server/src/repositories/audit.repository.ts
@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { Kysely } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { DB } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { DatabaseAction, EntityType } from 'src/enum';
+import { DB } from 'src/schema';
 
 export interface AuditSearch {
   action?: DatabaseAction;
diff --git a/server/src/repositories/database.repository.ts b/server/src/repositories/database.repository.ts
index 8d9141f182..b611ff6c7f 100644
--- a/server/src/repositories/database.repository.ts
+++ b/server/src/repositories/database.repository.ts
@@ -15,11 +15,11 @@ import {
   VECTORCHORD_VERSION_RANGE,
   VECTORS_VERSION_RANGE,
 } from 'src/constants';
-import { DB } from 'src/db';
 import { GenerateSql } from 'src/decorators';
 import { DatabaseExtension, DatabaseLock, VectorIndex } from 'src/enum';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { DB } from 'src/schema';
 import { ExtensionVersion, VectorExtension, VectorUpdateResult } from 'src/types';
 import { vectorIndexQuery } from 'src/utils/database';
 import { isValidInteger } from 'src/validation';
diff --git a/server/src/repositories/download.repository.ts b/server/src/repositories/download.repository.ts
index 4c4bed07ff..aef00f1ed1 100644
--- a/server/src/repositories/download.repository.ts
+++ b/server/src/repositories/download.repository.ts
@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
 import { Kysely } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { DB } from 'src/db';
 import { AssetVisibility } from 'src/enum';
+import { DB } from 'src/schema';
 import { anyUuid } from 'src/utils/database';
 
 const builder = (db: Kysely<DB>) =>
diff --git a/server/src/repositories/duplicate.repository.ts b/server/src/repositories/duplicate.repository.ts
index 73f09aa710..d654e1844e 100644
--- a/server/src/repositories/duplicate.repository.ts
+++ b/server/src/repositories/duplicate.repository.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { Kysely, NotNull, sql } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { DB } from 'src/db';
 import { Chunked, DummyValue, GenerateSql } from 'src/decorators';
 import { MapAsset } from 'src/dtos/asset-response.dto';
 import { AssetType, VectorIndex } from 'src/enum';
 import { probes } from 'src/repositories/database.repository';
+import { DB } from 'src/schema';
 import { anyUuid, asUuid, withDefaultVisibility } from 'src/utils/database';
 
 interface DuplicateSearch {
diff --git a/server/src/repositories/library.repository.ts b/server/src/repositories/library.repository.ts
index b6c5ebbe08..704f809689 100644
--- a/server/src/repositories/library.repository.ts
+++ b/server/src/repositories/library.repository.ts
@@ -1,10 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { Insertable, Kysely, sql, Updateable } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { DB, Libraries } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { LibraryStatsResponseDto } from 'src/dtos/library.dto';
 import { AssetType, AssetVisibility } from 'src/enum';
+import { DB } from 'src/schema';
+import { LibraryTable } from 'src/schema/tables/library.table';
 
 export enum AssetSyncResult {
   DO_NOTHING,
@@ -47,7 +48,7 @@ export class LibraryRepository {
       .execute();
   }
 
-  create(library: Insertable<Libraries>) {
+  create(library: Insertable<LibraryTable>) {
     return this.db.insertInto('libraries').values(library).returningAll().executeTakeFirstOrThrow();
   }
 
@@ -59,7 +60,7 @@ export class LibraryRepository {
     await this.db.updateTable('libraries').set({ deletedAt: new Date() }).where('libraries.id', '=', id).execute();
   }
 
-  update(id: string, library: Updateable<Libraries>) {
+  update(id: string, library: Updateable<LibraryTable>) {
     return this.db
       .updateTable('libraries')
       .set(library)
diff --git a/server/src/repositories/map.repository.ts b/server/src/repositories/map.repository.ts
index 3f559442aa..cdfe0dbe22 100644
--- a/server/src/repositories/map.repository.ts
+++ b/server/src/repositories/map.repository.ts
@@ -6,12 +6,14 @@ import { createReadStream, existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import readLine from 'node:readline';
 import { citiesFile } from 'src/constants';
-import { DB, GeodataPlaces, NaturalearthCountries } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AssetVisibility, SystemMetadataKey } from 'src/enum';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
+import { DB } from 'src/schema';
+import { GeodataPlacesTable } from 'src/schema/tables/geodata-places.table';
+import { NaturalEarthCountriesTable } from 'src/schema/tables/natural-earth-countries.table';
 
 export interface MapMarkerSearchOptions {
   isArchived?: boolean;
@@ -38,8 +40,8 @@ export interface MapMarker extends ReverseGeocodeResult {
 }
 
 interface MapDB extends DB {
-  geodata_places_tmp: GeodataPlaces;
-  naturalearth_countries_tmp: NaturalearthCountries;
+  geodata_places_tmp: GeodataPlacesTable;
+  naturalearth_countries_tmp: NaturalEarthCountriesTable;
 }
 
 @Injectable()
@@ -193,11 +195,11 @@ export class MapRepository {
       return;
     }
 
-    const entities: Insertable<NaturalearthCountries>[] = [];
+    const entities: Insertable<NaturalEarthCountriesTable>[] = [];
     for (const feature of geoJSONData.features) {
       for (const entry of feature.geometry.coordinates) {
         const coordinates: number[][][] = feature.geometry.type === 'MultiPolygon' ? entry[0] : entry;
-        const featureRecord: Insertable<NaturalearthCountries> = {
+        const featureRecord: Insertable<NaturalEarthCountriesTable> = {
           admin: feature.properties.ADMIN,
           admin_a3: feature.properties.ADM0_A3,
           type: feature.properties.TYPE,
diff --git a/server/src/repositories/memory.repository.ts b/server/src/repositories/memory.repository.ts
index 0f29b3746f..65975a232d 100644
--- a/server/src/repositories/memory.repository.ts
+++ b/server/src/repositories/memory.repository.ts
@@ -3,10 +3,11 @@ import { Insertable, Kysely, sql, Updateable } from 'kysely';
 import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { DateTime } from 'luxon';
 import { InjectKysely } from 'nestjs-kysely';
-import { DB, Memories } from 'src/db';
 import { Chunked, ChunkedSet, DummyValue, GenerateSql } from 'src/decorators';
 import { MemorySearchDto } from 'src/dtos/memory.dto';
 import { AssetVisibility } from 'src/enum';
+import { DB } from 'src/schema';
+import { MemoryTable } from 'src/schema/tables/memory.table';
 import { IBulkAsset } from 'src/types';
 
 @Injectable()
@@ -80,7 +81,7 @@ export class MemoryRepository implements IBulkAsset {
     return this.getByIdBuilder(id).executeTakeFirst();
   }
 
-  async create(memory: Insertable<Memories>, assetIds: Set<string>) {
+  async create(memory: Insertable<MemoryTable>, assetIds: Set<string>) {
     const id = await this.db.transaction().execute(async (tx) => {
       const { id } = await tx.insertInto('memories').values(memory).returning('id').executeTakeFirstOrThrow();
 
@@ -96,7 +97,7 @@ export class MemoryRepository implements IBulkAsset {
   }
 
   @GenerateSql({ params: [DummyValue.UUID, { ownerId: DummyValue.UUID, isSaved: true }] })
-  async update(id: string, memory: Updateable<Memories>) {
+  async update(id: string, memory: Updateable<MemoryTable>) {
     await this.db.updateTable('memories').set(memory).where('id', '=', id).execute();
     return this.getByIdBuilder(id).executeTakeFirstOrThrow();
   }
diff --git a/server/src/repositories/move.repository.ts b/server/src/repositories/move.repository.ts
index a21167fffd..3538dd4627 100644
--- a/server/src/repositories/move.repository.ts
+++ b/server/src/repositories/move.repository.ts
@@ -1,15 +1,16 @@
 import { Injectable } from '@nestjs/common';
 import { Insertable, Kysely, sql, Updateable } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { DB, MoveHistory } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AssetPathType, PathType } from 'src/enum';
+import { DB } from 'src/schema';
+import { MoveTable } from 'src/schema/tables/move.table';
 
 @Injectable()
 export class MoveRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
-  create(entity: Insertable<MoveHistory>) {
+  create(entity: Insertable<MoveTable>) {
     return this.db.insertInto('move_history').values(entity).returningAll().executeTakeFirstOrThrow();
   }
 
@@ -23,7 +24,7 @@ export class MoveRepository {
       .executeTakeFirst();
   }
 
-  update(id: string, entity: Updateable<MoveHistory>) {
+  update(id: string, entity: Updateable<MoveTable>) {
     return this.db
       .updateTable('move_history')
       .set(entity)
diff --git a/server/src/repositories/notification.repository.ts b/server/src/repositories/notification.repository.ts
index b35f532094..bbbd059e42 100644
--- a/server/src/repositories/notification.repository.ts
+++ b/server/src/repositories/notification.repository.ts
@@ -2,9 +2,10 @@ import { Insertable, Kysely, Updateable } from 'kysely';
 import { DateTime } from 'luxon';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
-import { DB, Notifications } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { NotificationSearchDto } from 'src/dtos/notification.dto';
+import { DB } from 'src/schema';
+import { NotificationTable } from 'src/schema/tables/notification.table';
 
 export class NotificationRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
@@ -53,7 +54,7 @@ export class NotificationRepository {
       .execute();
   }
 
-  create(notification: Insertable<Notifications>) {
+  create(notification: Insertable<NotificationTable>) {
     return this.db
       .insertInto('notifications')
       .values(notification)
@@ -70,7 +71,7 @@ export class NotificationRepository {
       .executeTakeFirst();
   }
 
-  update(id: string, notification: Updateable<Notifications>) {
+  update(id: string, notification: Updateable<NotificationTable>) {
     return this.db
       .updateTable('notifications')
       .set(notification)
@@ -80,7 +81,7 @@ export class NotificationRepository {
       .executeTakeFirstOrThrow();
   }
 
-  async updateAll(ids: string[], notification: Updateable<Notifications>) {
+  async updateAll(ids: string[], notification: Updateable<NotificationTable>) {
     await this.db.updateTable('notifications').set(notification).where('id', 'in', ids).execute();
   }
 
diff --git a/server/src/repositories/partner.repository.ts b/server/src/repositories/partner.repository.ts
index 31350541ca..af6d5d69c4 100644
--- a/server/src/repositories/partner.repository.ts
+++ b/server/src/repositories/partner.repository.ts
@@ -3,8 +3,9 @@ import { ExpressionBuilder, Insertable, Kysely, NotNull, Updateable } from 'kyse
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
-import { DB, Partners } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
+import { DB } from 'src/schema';
+import { PartnerTable } from 'src/schema/tables/partner.table';
 
 export interface PartnerIds {
   sharedById: string;
@@ -47,7 +48,7 @@ export class PartnerRepository {
       .executeTakeFirst();
   }
 
-  create(values: Insertable<Partners>) {
+  create(values: Insertable<PartnerTable>) {
     return this.db
       .insertInto('partners')
       .values(values)
@@ -59,7 +60,7 @@ export class PartnerRepository {
   }
 
   @GenerateSql({ params: [{ sharedWithId: DummyValue.UUID, sharedById: DummyValue.UUID }, { inTimeline: true }] })
-  update({ sharedWithId, sharedById }: PartnerIds, values: Updateable<Partners>) {
+  update({ sharedWithId, sharedById }: PartnerIds, values: Updateable<PartnerTable>) {
     return this.db
       .updateTable('partners')
       .set(values)
diff --git a/server/src/repositories/person.repository.ts b/server/src/repositories/person.repository.ts
index 8fef625a70..949d39747e 100644
--- a/server/src/repositories/person.repository.ts
+++ b/server/src/repositories/person.repository.ts
@@ -2,9 +2,12 @@ import { Injectable } from '@nestjs/common';
 import { ExpressionBuilder, Insertable, Kysely, Selectable, sql, Updateable } from 'kysely';
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
-import { AssetFaces, DB, FaceSearch, Person } from 'src/db';
 import { Chunked, ChunkedArray, DummyValue, GenerateSql } from 'src/decorators';
 import { AssetFileType, AssetVisibility, SourceType } from 'src/enum';
+import { DB } from 'src/schema';
+import { AssetFaceTable } from 'src/schema/tables/asset-face.table';
+import { FaceSearchTable } from 'src/schema/tables/face-search.table';
+import { PersonTable } from 'src/schema/tables/person.table';
 import { removeUndefinedKeys } from 'src/utils/database';
 import { paginationHelper, PaginationOptions } from 'src/utils/pagination';
 
@@ -57,7 +60,7 @@ export interface GetAllFacesOptions {
 
 export type UnassignFacesOptions = DeleteFacesOptions;
 
-export type SelectFaceOptions = (keyof Selectable<AssetFaces>)[];
+export type SelectFaceOptions = (keyof Selectable<AssetFaceTable>)[];
 
 const withPerson = (eb: ExpressionBuilder<DB, 'asset_faces'>) => {
   return jsonObjectFrom(
@@ -378,11 +381,11 @@ export class PersonRepository {
       .executeTakeFirstOrThrow();
   }
 
-  create(person: Insertable<Person>) {
+  create(person: Insertable<PersonTable>) {
     return this.db.insertInto('person').values(person).returningAll().executeTakeFirstOrThrow();
   }
 
-  async createAll(people: Insertable<Person>[]): Promise<string[]> {
+  async createAll(people: Insertable<PersonTable>[]): Promise<string[]> {
     if (people.length === 0) {
       return [];
     }
@@ -393,9 +396,9 @@ export class PersonRepository {
 
   @GenerateSql({ params: [[], [], [{ faceId: DummyValue.UUID, embedding: DummyValue.VECTOR }]] })
   async refreshFaces(
-    facesToAdd: (Insertable<AssetFaces> & { assetId: string })[],
+    facesToAdd: (Insertable<AssetFaceTable> & { assetId: string })[],
     faceIdsToRemove: string[],
-    embeddingsToAdd?: Insertable<FaceSearch>[],
+    embeddingsToAdd?: Insertable<FaceSearchTable>[],
   ): Promise<void> {
     let query = this.db;
     if (facesToAdd.length > 0) {
@@ -415,7 +418,7 @@ export class PersonRepository {
     await query.selectFrom(sql`(select 1)`.as('dummy')).execute();
   }
 
-  async update(person: Updateable<Person> & { id: string }) {
+  async update(person: Updateable<PersonTable> & { id: string }) {
     return this.db
       .updateTable('person')
       .set(person)
@@ -424,7 +427,7 @@ export class PersonRepository {
       .executeTakeFirstOrThrow();
   }
 
-  async updateAll(people: Insertable<Person>[]): Promise<void> {
+  async updateAll(people: Insertable<PersonTable>[]): Promise<void> {
     if (people.length === 0) {
       return;
     }
@@ -496,7 +499,7 @@ export class PersonRepository {
     return result?.latestDate;
   }
 
-  async createAssetFace(face: Insertable<AssetFaces>): Promise<void> {
+  async createAssetFace(face: Insertable<AssetFaceTable>): Promise<void> {
     await this.db.insertInto('asset_faces').values(face).execute();
   }
 
diff --git a/server/src/repositories/search.repository.ts b/server/src/repositories/search.repository.ts
index 2455b65b20..9026b795ca 100644
--- a/server/src/repositories/search.repository.ts
+++ b/server/src/repositories/search.repository.ts
@@ -2,11 +2,12 @@ import { Injectable } from '@nestjs/common';
 import { Kysely, OrderByDirection, Selectable, sql } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
 import { randomUUID } from 'node:crypto';
-import { DB, Exif } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { MapAsset } from 'src/dtos/asset-response.dto';
 import { AssetStatus, AssetType, AssetVisibility, VectorIndex } from 'src/enum';
 import { probes } from 'src/repositories/database.repository';
+import { DB } from 'src/schema';
+import { ExifTable } from 'src/schema/tables/exif.table';
 import { anyUuid, searchAssetBuilder } from 'src/utils/database';
 import { paginationHelper } from 'src/utils/pagination';
 import { isValidInteger } from 'src/validation';
@@ -385,7 +386,7 @@ export class SearchRepository {
       .select((eb) =>
         eb
           .fn('to_jsonb', [eb.table('exif')])
-          .$castTo<Selectable<Exif>>()
+          .$castTo<Selectable<ExifTable>>()
           .as('exifInfo'),
       )
       .orderBy('exif.city')
diff --git a/server/src/repositories/session.repository.ts b/server/src/repositories/session.repository.ts
index 6c3d10cb9a..b9fa5458e4 100644
--- a/server/src/repositories/session.repository.ts
+++ b/server/src/repositories/session.repository.ts
@@ -4,8 +4,9 @@ import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import { DateTime } from 'luxon';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
-import { DB, Sessions } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
+import { DB } from 'src/schema';
+import { SessionTable } from 'src/schema/tables/session.table';
 import { asUuid } from 'src/utils/database';
 
 export type SessionSearchOptions = { updatedBefore: Date };
@@ -72,11 +73,11 @@ export class SessionRepository {
       .execute();
   }
 
-  create(dto: Insertable<Sessions>) {
+  create(dto: Insertable<SessionTable>) {
     return this.db.insertInto('sessions').values(dto).returningAll().executeTakeFirstOrThrow();
   }
 
-  update(id: string, dto: Updateable<Sessions>) {
+  update(id: string, dto: Updateable<SessionTable>) {
     return this.db
       .updateTable('sessions')
       .set(dto)
diff --git a/server/src/repositories/shared-link.repository.ts b/server/src/repositories/shared-link.repository.ts
index 67a97dc2d5..0875b535e2 100644
--- a/server/src/repositories/shared-link.repository.ts
+++ b/server/src/repositories/shared-link.repository.ts
@@ -4,10 +4,11 @@ import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import _ from 'lodash';
 import { InjectKysely } from 'nestjs-kysely';
 import { Album, columns } from 'src/database';
-import { DB, SharedLinks } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { MapAsset } from 'src/dtos/asset-response.dto';
 import { SharedLinkType } from 'src/enum';
+import { DB } from 'src/schema';
+import { SharedLinkTable } from 'src/schema/tables/shared-link.table';
 
 export type SharedLinkSearchOptions = {
   userId: string;
@@ -183,7 +184,7 @@ export class SharedLinkRepository {
       .executeTakeFirst();
   }
 
-  async create(entity: Insertable<SharedLinks> & { assetIds?: string[] }) {
+  async create(entity: Insertable<SharedLinkTable> & { assetIds?: string[] }) {
     const { id } = await this.db
       .insertInto('shared_links')
       .values(_.omit(entity, 'assetIds'))
@@ -200,7 +201,7 @@ export class SharedLinkRepository {
     return this.getSharedLinks(id);
   }
 
-  async update(entity: Updateable<SharedLinks> & { id: string; assetIds?: string[] }) {
+  async update(entity: Updateable<SharedLinkTable> & { id: string; assetIds?: string[] }) {
     const { id } = await this.db
       .updateTable('shared_links')
       .set(_.omit(entity, 'assets', 'album', 'assetIds'))
diff --git a/server/src/repositories/stack.repository.ts b/server/src/repositories/stack.repository.ts
index 78ff255579..b7ee46c671 100644
--- a/server/src/repositories/stack.repository.ts
+++ b/server/src/repositories/stack.repository.ts
@@ -3,8 +3,9 @@ import { ExpressionBuilder, Kysely, Updateable } from 'kysely';
 import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
-import { AssetStack, DB } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
+import { DB } from 'src/schema';
+import { StackTable } from 'src/schema/tables/stack.table';
 import { asUuid, withDefaultVisibility } from 'src/utils/database';
 
 export interface StackSearch {
@@ -130,7 +131,7 @@ export class StackRepository {
     await this.db.deleteFrom('asset_stack').where('id', 'in', ids).execute();
   }
 
-  update(id: string, entity: Updateable<AssetStack>) {
+  update(id: string, entity: Updateable<StackTable>) {
     return this.db
       .updateTable('asset_stack')
       .set(entity)
diff --git a/server/src/repositories/sync-checkpoint.repository.ts b/server/src/repositories/sync-checkpoint.repository.ts
index aae0da0890..5133ba8904 100644
--- a/server/src/repositories/sync-checkpoint.repository.ts
+++ b/server/src/repositories/sync-checkpoint.repository.ts
@@ -1,9 +1,10 @@
 import { Injectable } from '@nestjs/common';
 import { Insertable, Kysely } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { DB, SessionSyncCheckpoints } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { SyncEntityType } from 'src/enum';
+import { DB } from 'src/schema';
+import { SessionSyncCheckpointTable } from 'src/schema/tables/sync-checkpoint.table';
 
 @Injectable()
 export class SyncCheckpointRepository {
@@ -18,7 +19,7 @@ export class SyncCheckpointRepository {
       .execute();
   }
 
-  upsertAll(items: Insertable<SessionSyncCheckpoints>[]) {
+  upsertAll(items: Insertable<SessionSyncCheckpointTable>[]) {
     return this.db
       .insertInto('session_sync_checkpoints')
       .values(items)
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index 2b1157492d..73a1aca749 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { Kysely, SelectQueryBuilder, sql } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
-import { DB } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
+import { DB } from 'src/schema';
 import { SyncAck } from 'src/types';
 
 type AuditTables =
diff --git a/server/src/repositories/system-metadata.repository.ts b/server/src/repositories/system-metadata.repository.ts
index fcccde6a5c..755dc4cd30 100644
--- a/server/src/repositories/system-metadata.repository.ts
+++ b/server/src/repositories/system-metadata.repository.ts
@@ -2,11 +2,12 @@ import { Injectable } from '@nestjs/common';
 import { Insertable, Kysely } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
 import { readFile } from 'node:fs/promises';
-import { DB, SystemMetadata as DbSystemMetadata } from 'src/db';
 import { GenerateSql } from 'src/decorators';
+import { DB } from 'src/schema';
+import { SystemMetadataTable } from 'src/schema/tables/system-metadata.table';
 import { SystemMetadata } from 'src/types';
 
-type Upsert = Insertable<DbSystemMetadata>;
+type Upsert = Insertable<SystemMetadataTable>;
 
 @Injectable()
 export class SystemMetadataRepository {
diff --git a/server/src/repositories/tag.repository.ts b/server/src/repositories/tag.repository.ts
index a7cdc9554c..1c38242f53 100644
--- a/server/src/repositories/tag.repository.ts
+++ b/server/src/repositories/tag.repository.ts
@@ -2,9 +2,11 @@ import { Injectable } from '@nestjs/common';
 import { Insertable, Kysely, sql, Updateable } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
-import { DB, TagAsset, Tags } from 'src/db';
 import { Chunked, ChunkedSet, DummyValue, GenerateSql } from 'src/decorators';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { DB } from 'src/schema';
+import { TagAssetTable } from 'src/schema/tables/tag-asset.table';
+import { TagTable } from 'src/schema/tables/tag.table';
 
 @Injectable()
 export class TagRepository {
@@ -72,12 +74,12 @@ export class TagRepository {
   }
 
   @GenerateSql({ params: [{ userId: DummyValue.UUID, color: DummyValue.STRING, value: DummyValue.STRING }] })
-  create(tag: Insertable<Tags>) {
+  create(tag: Insertable<TagTable>) {
     return this.db.insertInto('tags').values(tag).returningAll().executeTakeFirstOrThrow();
   }
 
   @GenerateSql({ params: [DummyValue.UUID, { color: DummyValue.STRING }] })
-  update(id: string, dto: Updateable<Tags>) {
+  update(id: string, dto: Updateable<TagTable>) {
     return this.db.updateTable('tags').set(dto).where('id', '=', id).returningAll().executeTakeFirstOrThrow();
   }
 
@@ -128,7 +130,7 @@ export class TagRepository {
 
   @GenerateSql({ params: [[{ assetId: DummyValue.UUID, tagsIds: [DummyValue.UUID] }]] })
   @Chunked()
-  upsertAssetIds(items: Insertable<TagAsset>[]) {
+  upsertAssetIds(items: Insertable<TagAssetTable>[]) {
     if (items.length === 0) {
       return Promise.resolve([]);
     }
diff --git a/server/src/repositories/trash.repository.ts b/server/src/repositories/trash.repository.ts
index 69507b1d58..3389678c50 100644
--- a/server/src/repositories/trash.repository.ts
+++ b/server/src/repositories/trash.repository.ts
@@ -1,8 +1,8 @@
 import { Kysely } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { DB } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AssetStatus } from 'src/enum';
+import { DB } from 'src/schema';
 
 export class TrashRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
diff --git a/server/src/repositories/user.repository.ts b/server/src/repositories/user.repository.ts
index ef55c93222..91c4b71139 100644
--- a/server/src/repositories/user.repository.ts
+++ b/server/src/repositories/user.repository.ts
@@ -4,14 +4,15 @@ import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { DateTime } from 'luxon';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
-import { DB, UserMetadata as DbUserMetadata } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AssetType, AssetVisibility, UserStatus } from 'src/enum';
+import { DB } from 'src/schema';
+import { UserMetadataTable } from 'src/schema/tables/user-metadata.table';
 import { UserTable } from 'src/schema/tables/user.table';
 import { UserMetadata, UserMetadataItem } from 'src/types';
 import { asUuid } from 'src/utils/database';
 
-type Upsert = Insertable<DbUserMetadata>;
+type Upsert = Insertable<UserMetadataTable>;
 
 export interface UserListFilter {
   id?: string;
diff --git a/server/src/repositories/version-history.repository.ts b/server/src/repositories/version-history.repository.ts
index b1d2696164..b69e0e5faa 100644
--- a/server/src/repositories/version-history.repository.ts
+++ b/server/src/repositories/version-history.repository.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { Insertable, Kysely } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { DB, VersionHistory } from 'src/db';
 import { GenerateSql } from 'src/decorators';
+import { DB } from 'src/schema';
+import { VersionHistoryTable } from 'src/schema/tables/version-history.table';
 
 @Injectable()
 export class VersionHistoryRepository {
@@ -18,7 +19,7 @@ export class VersionHistoryRepository {
     return this.db.selectFrom('version_history').selectAll().orderBy('createdAt', 'desc').executeTakeFirst();
   }
 
-  create(version: Insertable<VersionHistory>) {
+  create(version: Insertable<VersionHistoryTable>) {
     return this.db.insertInto('version_history').values(version).returningAll().executeTakeFirstOrThrow();
   }
 }
diff --git a/server/src/repositories/view-repository.ts b/server/src/repositories/view-repository.ts
index 3a498d5b3e..d0d4983e09 100644
--- a/server/src/repositories/view-repository.ts
+++ b/server/src/repositories/view-repository.ts
@@ -1,8 +1,8 @@
 import { Kysely } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
-import { DB } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AssetVisibility } from 'src/enum';
+import { DB } from 'src/schema';
 import { asUuid, withExif } from 'src/utils/database';
 
 export class ViewRepository {
diff --git a/server/src/schema/index.ts b/server/src/schema/index.ts
index 6dac1ff51e..a8508b2c4b 100644
--- a/server/src/schema/index.ts
+++ b/server/src/schema/index.ts
@@ -21,7 +21,7 @@ import { AlbumAuditTable } from 'src/schema/tables/album-audit.table';
 import { AlbumUserAuditTable } from 'src/schema/tables/album-user-audit.table';
 import { AlbumUserTable } from 'src/schema/tables/album-user.table';
 import { AlbumTable } from 'src/schema/tables/album.table';
-import { APIKeyTable } from 'src/schema/tables/api-key.table';
+import { ApiKeyTable } from 'src/schema/tables/api-key.table';
 import { AssetAuditTable } from 'src/schema/tables/asset-audit.table';
 import { AssetFaceTable } from 'src/schema/tables/asset-face.table';
 import { AssetFileTable } from 'src/schema/tables/asset-files.table';
@@ -51,11 +51,12 @@ import { SessionSyncCheckpointTable } from 'src/schema/tables/sync-checkpoint.ta
 import { SystemMetadataTable } from 'src/schema/tables/system-metadata.table';
 import { TagAssetTable } from 'src/schema/tables/tag-asset.table';
 import { TagClosureTable } from 'src/schema/tables/tag-closure.table';
+import { TagTable } from 'src/schema/tables/tag.table';
 import { UserAuditTable } from 'src/schema/tables/user-audit.table';
 import { UserMetadataTable } from 'src/schema/tables/user-metadata.table';
 import { UserTable } from 'src/schema/tables/user.table';
 import { VersionHistoryTable } from 'src/schema/tables/version-history.table';
-import { Database, Extensions } from 'src/sql-tools';
+import { Database, Extensions, Generated, Int8 } from 'src/sql-tools';
 
 @Extensions(['uuid-ossp', 'unaccent', 'cube', 'earthdistance', 'pg_trgm', 'plpgsql'])
 @Database({ name: 'immich' })
@@ -68,7 +69,7 @@ export class ImmichDatabase {
     AlbumUserAuditTable,
     AlbumUserTable,
     AlbumTable,
-    APIKeyTable,
+    ApiKeyTable,
     AssetAuditTable,
     AssetFaceTable,
     AssetJobStatusTable,
@@ -96,6 +97,7 @@ export class ImmichDatabase {
     StackTable,
     SessionSyncCheckpointTable,
     SystemMetadataTable,
+    TagTable,
     TagAssetTable,
     TagClosureTable,
     UserAuditTable,
@@ -122,3 +124,55 @@ export class ImmichDatabase {
 
   enum = [assets_status_enum, asset_face_source_type, asset_visibility_enum];
 }
+
+export interface Migrations {
+  id: Generated<number>;
+  name: string;
+  timestamp: Int8;
+}
+
+export interface DB {
+  activity: ActivityTable;
+  albums: AlbumTable;
+  albums_audit: AlbumAuditTable;
+  albums_assets_assets: AlbumAssetTable;
+  album_assets_audit: AlbumAssetAuditTable;
+  albums_shared_users_users: AlbumUserTable;
+  album_users_audit: AlbumUserAuditTable;
+  api_keys: ApiKeyTable;
+  asset_faces: AssetFaceTable;
+  asset_files: AssetFileTable;
+  asset_job_status: AssetJobStatusTable;
+  asset_stack: StackTable;
+  assets: AssetTable;
+  assets_audit: AssetAuditTable;
+  audit: AuditTable;
+  exif: ExifTable;
+  face_search: FaceSearchTable;
+  geodata_places: GeodataPlacesTable;
+  libraries: LibraryTable;
+  memories: MemoryTable;
+  memories_audit: MemoryAuditTable;
+  memories_assets_assets: MemoryAssetTable;
+  memory_assets_audit: MemoryAssetAuditTable;
+  migrations: Migrations;
+  notifications: NotificationTable;
+  move_history: MoveTable;
+  naturalearth_countries: NaturalEarthCountriesTable;
+  partners_audit: PartnerAuditTable;
+  partners: PartnerTable;
+  person: PersonTable;
+  sessions: SessionTable;
+  session_sync_checkpoints: SessionSyncCheckpointTable;
+  shared_link__asset: SharedLinkAssetTable;
+  shared_links: SharedLinkTable;
+  smart_search: SmartSearchTable;
+  system_metadata: SystemMetadataTable;
+  tag_asset: TagAssetTable;
+  tags: TagTable;
+  tags_closure: TagClosureTable;
+  user_metadata: UserMetadataTable;
+  users: UserTable;
+  users_audit: UserAuditTable;
+  version_history: VersionHistoryTable;
+}
diff --git a/server/src/schema/tables/activity.table.ts b/server/src/schema/tables/activity.table.ts
index 802a86a303..47fca24bb1 100644
--- a/server/src/schema/tables/activity.table.ts
+++ b/server/src/schema/tables/activity.table.ts
@@ -7,9 +7,11 @@ import {
   Column,
   CreateDateColumn,
   ForeignKeyColumn,
+  Generated,
   Index,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 
@@ -27,13 +29,13 @@ import {
 })
 export class ActivityTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @ForeignKeyColumn(() => AlbumTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
   albumId!: string;
@@ -48,8 +50,8 @@ export class ActivityTable {
   comment!: string | null;
 
   @Column({ type: 'boolean', default: false })
-  isLiked!: boolean;
+  isLiked!: Generated<boolean>;
 
   @UpdateIdColumn({ indexName: 'IDX_activity_update_id' })
-  updateId!: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/album-asset-audit.table.ts b/server/src/schema/tables/album-asset-audit.table.ts
index d2b71aa599..7c8da313c0 100644
--- a/server/src/schema/tables/album-asset-audit.table.ts
+++ b/server/src/schema/tables/album-asset-audit.table.ts
@@ -1,11 +1,11 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
 import { AlbumTable } from 'src/schema/tables/album.table';
-import { Column, CreateDateColumn, ForeignKeyColumn, Table } from 'src/sql-tools';
+import { Column, CreateDateColumn, ForeignKeyColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
 @Table('album_assets_audit')
 export class AlbumAssetAuditTable {
   @PrimaryGeneratedUuidV7Column()
-  id!: string;
+  id!: Generated<string>;
 
   @ForeignKeyColumn(() => AlbumTable, {
     type: 'uuid',
@@ -19,5 +19,5 @@ export class AlbumAssetAuditTable {
   assetId!: string;
 
   @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_album_assets_audit_deleted_at' })
-  deletedAt!: Date;
+  deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/album-asset.table.ts b/server/src/schema/tables/album-asset.table.ts
index 567a6f9d4b..f0841edc44 100644
--- a/server/src/schema/tables/album-asset.table.ts
+++ b/server/src/schema/tables/album-asset.table.ts
@@ -2,7 +2,15 @@ import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { album_assets_delete_audit } from 'src/schema/functions';
 import { AlbumTable } from 'src/schema/tables/album.table';
 import { AssetTable } from 'src/schema/tables/asset.table';
-import { AfterDeleteTrigger, CreateDateColumn, ForeignKeyColumn, Table, UpdateDateColumn } from 'src/sql-tools';
+import {
+  AfterDeleteTrigger,
+  CreateDateColumn,
+  ForeignKeyColumn,
+  Generated,
+  Table,
+  Timestamp,
+  UpdateDateColumn,
+} from 'src/sql-tools';
 
 @Table({ name: 'albums_assets_assets', primaryConstraintName: 'PK_c67bc36fa845fb7b18e0e398180' })
 @UpdatedAtTrigger('album_assets_updated_at')
@@ -21,11 +29,11 @@ export class AlbumAssetTable {
   assetsId!: string;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @UpdateIdColumn({ indexName: 'IDX_album_assets_update_id' })
-  updateId!: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/album-audit.table.ts b/server/src/schema/tables/album-audit.table.ts
index 66b70654e9..3dd2682232 100644
--- a/server/src/schema/tables/album-audit.table.ts
+++ b/server/src/schema/tables/album-audit.table.ts
@@ -1,10 +1,10 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
-import { Column, CreateDateColumn, Table } from 'src/sql-tools';
+import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
 @Table('albums_audit')
 export class AlbumAuditTable {
   @PrimaryGeneratedUuidV7Column()
-  id!: string;
+  id!: Generated<string>;
 
   @Column({ type: 'uuid', indexName: 'IDX_albums_audit_album_id' })
   albumId!: string;
@@ -13,5 +13,5 @@ export class AlbumAuditTable {
   userId!: string;
 
   @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_albums_audit_deleted_at' })
-  deletedAt!: Date;
+  deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/album-user-audit.table.ts b/server/src/schema/tables/album-user-audit.table.ts
index 46ad6b682b..01ad991a52 100644
--- a/server/src/schema/tables/album-user-audit.table.ts
+++ b/server/src/schema/tables/album-user-audit.table.ts
@@ -1,10 +1,10 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
-import { Column, CreateDateColumn, Table } from 'src/sql-tools';
+import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
 @Table('album_users_audit')
 export class AlbumUserAuditTable {
   @PrimaryGeneratedUuidV7Column()
-  id!: string;
+  id!: Generated<string>;
 
   @Column({ type: 'uuid', indexName: 'IDX_album_users_audit_album_id' })
   albumId!: string;
@@ -13,5 +13,5 @@ export class AlbumUserAuditTable {
   userId!: string;
 
   @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_album_users_audit_deleted_at' })
-  deletedAt!: Date;
+  deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/album-user.table.ts b/server/src/schema/tables/album-user.table.ts
index 15300f7c6a..65e3db7185 100644
--- a/server/src/schema/tables/album-user.table.ts
+++ b/server/src/schema/tables/album-user.table.ts
@@ -9,8 +9,10 @@ import {
   Column,
   CreateDateColumn,
   ForeignKeyColumn,
+  Generated,
   Index,
   Table,
+  Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 
@@ -50,17 +52,17 @@ export class AlbumUserTable {
   usersId!: string;
 
   @Column({ type: 'character varying', default: AlbumUserRole.EDITOR })
-  role!: AlbumUserRole;
+  role!: Generated<AlbumUserRole>;
 
   @CreateIdColumn({ indexName: 'IDX_album_users_create_id' })
-  createId?: string;
+  createId!: Generated<string>;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateIdColumn({ indexName: 'IDX_album_users_update_id' })
-  updateId?: string;
+  updateId!: Generated<string>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/album.table.ts b/server/src/schema/tables/album.table.ts
index 5d02cc9f25..509b7d2cec 100644
--- a/server/src/schema/tables/album.table.ts
+++ b/server/src/schema/tables/album.table.ts
@@ -9,8 +9,10 @@ import {
   CreateDateColumn,
   DeleteDateColumn,
   ForeignKeyColumn,
+  Generated,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 
@@ -25,16 +27,16 @@ import {
 })
 export class AlbumTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   @ForeignKeyColumn(() => UserTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false })
   ownerId!: string;
 
   @Column({ default: 'Untitled Album' })
-  albumName!: string;
+  albumName!: Generated<string>;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @ForeignKeyColumn(() => AssetTable, {
     nullable: true,
@@ -42,23 +44,23 @@ export class AlbumTable {
     onUpdate: 'CASCADE',
     comment: 'Asset ID to be used as thumbnail',
   })
-  albumThumbnailAssetId!: string;
+  albumThumbnailAssetId!: string | null;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @Column({ type: 'text', default: '' })
-  description!: string;
+  description!: Generated<string>;
 
   @DeleteDateColumn()
-  deletedAt!: Date | null;
+  deletedAt!: Timestamp | null;
 
   @Column({ type: 'boolean', default: true })
-  isActivityEnabled!: boolean;
+  isActivityEnabled!: Generated<boolean>;
 
   @Column({ default: AssetOrder.DESC })
-  order!: AssetOrder;
+  order!: Generated<AssetOrder>;
 
   @UpdateIdColumn({ indexName: 'IDX_albums_update_id' })
-  updateId?: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/api-key.table.ts b/server/src/schema/tables/api-key.table.ts
index 1d4cc83172..4bcd4beae8 100644
--- a/server/src/schema/tables/api-key.table.ts
+++ b/server/src/schema/tables/api-key.table.ts
@@ -5,14 +5,19 @@ import {
   Column,
   CreateDateColumn,
   ForeignKeyColumn,
+  Generated,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 
 @Table('api_keys')
 @UpdatedAtTrigger('api_keys_updated_at')
-export class APIKeyTable {
+export class ApiKeyTable {
+  @PrimaryGeneratedColumn()
+  id!: Generated<string>;
+
   @Column()
   name!: string;
 
@@ -23,17 +28,14 @@ export class APIKeyTable {
   userId!: string;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
-
-  @PrimaryGeneratedColumn()
-  id!: string;
+  updatedAt!: Generated<Timestamp>;
 
   @Column({ array: true, type: 'character varying' })
   permissions!: Permission[];
 
   @UpdateIdColumn({ indexName: 'IDX_api_keys_update_id' })
-  updateId?: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/asset-audit.table.ts b/server/src/schema/tables/asset-audit.table.ts
index 030256480c..8ca6aa956d 100644
--- a/server/src/schema/tables/asset-audit.table.ts
+++ b/server/src/schema/tables/asset-audit.table.ts
@@ -1,10 +1,10 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
-import { Column, CreateDateColumn, Table } from 'src/sql-tools';
+import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
 @Table('assets_audit')
 export class AssetAuditTable {
   @PrimaryGeneratedUuidV7Column()
-  id!: string;
+  id!: Generated<string>;
 
   @Column({ type: 'uuid', indexName: 'IDX_assets_audit_asset_id' })
   assetId!: string;
@@ -13,5 +13,5 @@ export class AssetAuditTable {
   ownerId!: string;
 
   @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_assets_audit_deleted_at' })
-  deletedAt!: Date;
+  deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/asset-face.table.ts b/server/src/schema/tables/asset-face.table.ts
index 52f4364a93..329783d6df 100644
--- a/server/src/schema/tables/asset-face.table.ts
+++ b/server/src/schema/tables/asset-face.table.ts
@@ -2,12 +2,24 @@ import { SourceType } from 'src/enum';
 import { asset_face_source_type } from 'src/schema/enums';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { PersonTable } from 'src/schema/tables/person.table';
-import { Column, DeleteDateColumn, ForeignKeyColumn, Index, PrimaryGeneratedColumn, Table } from 'src/sql-tools';
+import {
+  Column,
+  DeleteDateColumn,
+  ForeignKeyColumn,
+  Generated,
+  Index,
+  PrimaryGeneratedColumn,
+  Table,
+  Timestamp,
+} from 'src/sql-tools';
 
 @Table({ name: 'asset_faces' })
 @Index({ name: 'IDX_asset_faces_assetId_personId', columns: ['assetId', 'personId'] })
 @Index({ columns: ['personId', 'assetId'] })
 export class AssetFaceTable {
+  @PrimaryGeneratedColumn()
+  id!: Generated<string>;
+
   @ForeignKeyColumn(() => AssetTable, {
     onDelete: 'CASCADE',
     onUpdate: 'CASCADE',
@@ -26,29 +38,26 @@ export class AssetFaceTable {
   personId!: string | null;
 
   @Column({ default: 0, type: 'integer' })
-  imageWidth!: number;
+  imageWidth!: Generated<number>;
 
   @Column({ default: 0, type: 'integer' })
-  imageHeight!: number;
+  imageHeight!: Generated<number>;
 
   @Column({ default: 0, type: 'integer' })
-  boundingBoxX1!: number;
+  boundingBoxX1!: Generated<number>;
 
   @Column({ default: 0, type: 'integer' })
-  boundingBoxY1!: number;
+  boundingBoxY1!: Generated<number>;
 
   @Column({ default: 0, type: 'integer' })
-  boundingBoxX2!: number;
+  boundingBoxX2!: Generated<number>;
 
   @Column({ default: 0, type: 'integer' })
-  boundingBoxY2!: number;
-
-  @PrimaryGeneratedColumn()
-  id!: string;
+  boundingBoxY2!: Generated<number>;
 
   @Column({ default: SourceType.MACHINE_LEARNING, enum: asset_face_source_type })
-  sourceType!: SourceType;
+  sourceType!: Generated<SourceType>;
 
   @DeleteDateColumn()
-  deletedAt!: Date | null;
+  deletedAt!: Timestamp | null;
 }
diff --git a/server/src/schema/tables/asset-files.table.ts b/server/src/schema/tables/asset-files.table.ts
index 0859bd5cf0..d0721e5b91 100644
--- a/server/src/schema/tables/asset-files.table.ts
+++ b/server/src/schema/tables/asset-files.table.ts
@@ -5,8 +5,10 @@ import {
   Column,
   CreateDateColumn,
   ForeignKeyColumn,
+  Generated,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   Unique,
   UpdateDateColumn,
 } from 'src/sql-tools';
@@ -16,20 +18,20 @@ import {
 @UpdatedAtTrigger('asset_files_updated_at')
 export class AssetFileTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   @ForeignKeyColumn(() => AssetTable, {
     onDelete: 'CASCADE',
     onUpdate: 'CASCADE',
     indexName: 'IDX_asset_files_assetId',
   })
-  assetId?: string;
+  assetId!: string;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @Column()
   type!: AssetFileType;
@@ -38,5 +40,5 @@ export class AssetFileTable {
   path!: string;
 
   @UpdateIdColumn({ indexName: 'IDX_asset_files_update_id' })
-  updateId?: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/asset-job-status.table.ts b/server/src/schema/tables/asset-job-status.table.ts
index 669ea0a20d..5ae10edbfa 100644
--- a/server/src/schema/tables/asset-job-status.table.ts
+++ b/server/src/schema/tables/asset-job-status.table.ts
@@ -1,5 +1,5 @@
 import { AssetTable } from 'src/schema/tables/asset.table';
-import { Column, ForeignKeyColumn, Table } from 'src/sql-tools';
+import { Column, ForeignKeyColumn, Table, Timestamp } from 'src/sql-tools';
 
 @Table('asset_job_status')
 export class AssetJobStatusTable {
@@ -7,17 +7,17 @@ export class AssetJobStatusTable {
   assetId!: string;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  facesRecognizedAt!: Date | null;
+  facesRecognizedAt!: Timestamp | null;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  metadataExtractedAt!: Date | null;
+  metadataExtractedAt!: Timestamp | null;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  duplicatesDetectedAt!: Date | null;
+  duplicatesDetectedAt!: Timestamp | null;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  previewAt!: Date | null;
+  previewAt!: Timestamp | null;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  thumbnailAt!: Date | null;
+  thumbnailAt!: Timestamp | null;
 }
diff --git a/server/src/schema/tables/asset.table.ts b/server/src/schema/tables/asset.table.ts
index d337984a46..0a8120e656 100644
--- a/server/src/schema/tables/asset.table.ts
+++ b/server/src/schema/tables/asset.table.ts
@@ -11,9 +11,11 @@ import {
   CreateDateColumn,
   DeleteDateColumn,
   ForeignKeyColumn,
+  Generated,
   Index,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 import { ASSET_CHECKSUM_CONSTRAINT } from 'src/utils/database';
@@ -60,7 +62,7 @@ import { ASSET_CHECKSUM_CONSTRAINT } from 'src/utils/database';
 // For all assets, each originalpath must be unique per user and library
 export class AssetTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   @Column()
   deviceAssetId!: string;
@@ -78,13 +80,13 @@ export class AssetTable {
   originalPath!: string;
 
   @Column({ type: 'timestamp with time zone', indexName: 'idx_asset_file_created_at' })
-  fileCreatedAt!: Date;
+  fileCreatedAt!: Timestamp;
 
   @Column({ type: 'timestamp with time zone' })
-  fileModifiedAt!: Date;
+  fileModifiedAt!: Timestamp;
 
   @Column({ type: 'boolean', default: false })
-  isFavorite!: boolean;
+  isFavorite!: Generated<boolean>;
 
   @Column({ type: 'character varying', nullable: true })
   duration!: string | null;
@@ -99,10 +101,10 @@ export class AssetTable {
   livePhotoVideoId!: string | null;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @Column({ index: true })
   originalFileName!: string;
@@ -114,32 +116,32 @@ export class AssetTable {
   thumbhash!: Buffer | null;
 
   @Column({ type: 'boolean', default: false })
-  isOffline!: boolean;
+  isOffline!: Generated<boolean>;
 
   @ForeignKeyColumn(() => LibraryTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: true })
-  libraryId?: string | null;
+  libraryId!: string | null;
 
   @Column({ type: 'boolean', default: false })
-  isExternal!: boolean;
+  isExternal!: Generated<boolean>;
 
   @DeleteDateColumn()
-  deletedAt!: Date | null;
+  deletedAt!: Timestamp | null;
 
   @Column({ type: 'timestamp with time zone' })
-  localDateTime!: Date;
+  localDateTime!: Timestamp;
 
   @ForeignKeyColumn(() => StackTable, { nullable: true, onDelete: 'SET NULL', onUpdate: 'CASCADE' })
-  stackId?: string | null;
+  stackId!: string | null;
 
   @Column({ type: 'uuid', nullable: true, indexName: 'IDX_assets_duplicateId' })
   duplicateId!: string | null;
 
   @Column({ enum: assets_status_enum, default: AssetStatus.ACTIVE })
-  status!: AssetStatus;
+  status!: Generated<AssetStatus>;
 
   @UpdateIdColumn({ indexName: 'IDX_assets_update_id' })
-  updateId?: string;
+  updateId!: Generated<string>;
 
   @Column({ enum: asset_visibility_enum, default: AssetVisibility.TIMELINE })
-  visibility!: AssetVisibility;
+  visibility!: Generated<AssetVisibility>;
 }
diff --git a/server/src/schema/tables/audit.table.ts b/server/src/schema/tables/audit.table.ts
index 9674bbf308..049bba9a1b 100644
--- a/server/src/schema/tables/audit.table.ts
+++ b/server/src/schema/tables/audit.table.ts
@@ -1,11 +1,11 @@
 import { DatabaseAction, EntityType } from 'src/enum';
-import { Column, CreateDateColumn, Index, PrimaryColumn, Table } from 'src/sql-tools';
+import { Column, CreateDateColumn, Generated, Index, PrimaryColumn, Table, Timestamp } from 'src/sql-tools';
 
 @Table('audit')
 @Index({ name: 'IDX_ownerId_createdAt', columns: ['ownerId', 'createdAt'] })
 export class AuditTable {
   @PrimaryColumn({ type: 'serial', synchronize: false })
-  id!: number;
+  id!: Generated<number>;
 
   @Column()
   entityType!: EntityType;
@@ -20,5 +20,5 @@ export class AuditTable {
   ownerId!: string;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/exif.table.ts b/server/src/schema/tables/exif.table.ts
index ca300945c3..668f215776 100644
--- a/server/src/schema/tables/exif.table.ts
+++ b/server/src/schema/tables/exif.table.ts
@@ -1,6 +1,6 @@
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { AssetTable } from 'src/schema/tables/asset.table';
-import { Column, ForeignKeyColumn, Table, UpdateDateColumn } from 'src/sql-tools';
+import { Column, ForeignKeyColumn, Generated, Int8, Table, Timestamp, UpdateDateColumn } from 'src/sql-tools';
 
 @Table('exif')
 @UpdatedAtTrigger('asset_exif_updated_at')
@@ -21,16 +21,16 @@ export class ExifTable {
   exifImageHeight!: number | null;
 
   @Column({ type: 'bigint', nullable: true })
-  fileSizeInByte!: number | null;
+  fileSizeInByte!: Int8 | null;
 
   @Column({ type: 'character varying', nullable: true })
   orientation!: string | null;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  dateTimeOriginal!: Date | null;
+  dateTimeOriginal!: Timestamp | null;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  modifyDate!: Date | null;
+  modifyDate!: Timestamp | null;
 
   @Column({ type: 'character varying', nullable: true })
   lensModel!: string | null;
@@ -60,10 +60,10 @@ export class ExifTable {
   country!: string | null;
 
   @Column({ type: 'text', default: '' })
-  description!: string; // or caption
+  description!: Generated<string>; // or caption
 
   @Column({ type: 'double precision', nullable: true })
-  fps?: number | null;
+  fps!: number | null;
 
   @Column({ type: 'character varying', nullable: true })
   exposureTime!: string | null;
@@ -93,8 +93,8 @@ export class ExifTable {
   rating!: number | null;
 
   @UpdateDateColumn({ default: () => 'clock_timestamp()' })
-  updatedAt?: Date;
+  updatedAt!: Generated<Date>;
 
   @UpdateIdColumn({ indexName: 'IDX_asset_exif_update_id' })
-  updateId?: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/geodata-places.table.ts b/server/src/schema/tables/geodata-places.table.ts
index 3e78b4cfcf..11c3ef5d25 100644
--- a/server/src/schema/tables/geodata-places.table.ts
+++ b/server/src/schema/tables/geodata-places.table.ts
@@ -1,4 +1,4 @@
-import { Column, Index, PrimaryColumn, Table } from 'src/sql-tools';
+import { Column, Index, PrimaryColumn, Table, Timestamp } from 'src/sql-tools';
 
 @Table({ name: 'geodata_places', synchronize: false })
 @Index({
@@ -47,20 +47,20 @@ export class GeodataPlacesTable {
   countryCode!: string;
 
   @Column({ type: 'character varying', length: 20, nullable: true })
-  admin1Code!: string;
+  admin1Code!: string | null;
 
   @Column({ type: 'character varying', length: 80, nullable: true })
-  admin2Code!: string;
+  admin2Code!: string | null;
 
   @Column({ type: 'date' })
-  modificationDate!: Date;
+  modificationDate!: Timestamp;
 
   @Column({ type: 'character varying', nullable: true })
-  admin1Name!: string;
+  admin1Name!: string | null;
 
   @Column({ type: 'character varying', nullable: true })
-  admin2Name!: string;
+  admin2Name!: string | null;
 
   @Column({ type: 'character varying', nullable: true })
-  alternateNames!: string;
+  alternateNames!: string | null;
 }
diff --git a/server/src/schema/tables/library.table.ts b/server/src/schema/tables/library.table.ts
index 8b21d5feb0..0bf7e8ea82 100644
--- a/server/src/schema/tables/library.table.ts
+++ b/server/src/schema/tables/library.table.ts
@@ -5,8 +5,10 @@ import {
   CreateDateColumn,
   DeleteDateColumn,
   ForeignKeyColumn,
+  Generated,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 
@@ -14,7 +16,7 @@ import {
 @UpdatedAtTrigger('libraries_updated_at')
 export class LibraryTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   @Column()
   name!: string;
@@ -29,17 +31,17 @@ export class LibraryTable {
   exclusionPatterns!: string[];
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Date>;
 
   @DeleteDateColumn()
-  deletedAt?: Date;
+  deletedAt!: Timestamp | null;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  refreshedAt!: Date | null;
+  refreshedAt!: Timestamp | null;
 
   @UpdateIdColumn({ indexName: 'IDX_libraries_update_id' })
-  updateId?: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/memory-asset.table.ts b/server/src/schema/tables/memory-asset.table.ts
index 9512ed61da..c8ef9297be 100644
--- a/server/src/schema/tables/memory-asset.table.ts
+++ b/server/src/schema/tables/memory-asset.table.ts
@@ -1,13 +1,16 @@
-import { ColumnType } from 'kysely';
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { memory_assets_delete_audit } from 'src/schema/functions';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { MemoryTable } from 'src/schema/tables/memory.table';
-import { AfterDeleteTrigger, CreateDateColumn, ForeignKeyColumn, Table, UpdateDateColumn } from 'src/sql-tools';
-
-type Timestamp = ColumnType<Date, Date | string, Date | string>;
-type Generated<T> =
-  T extends ColumnType<infer S, infer I, infer U> ? ColumnType<S, I | undefined, U> : ColumnType<T, T | undefined, T>;
+import {
+  AfterDeleteTrigger,
+  CreateDateColumn,
+  ForeignKeyColumn,
+  Generated,
+  Table,
+  Timestamp,
+  UpdateDateColumn,
+} from 'src/sql-tools';
 
 @Table('memories_assets_assets')
 @UpdatedAtTrigger('memory_assets_updated_at')
diff --git a/server/src/schema/tables/memory-audit.table.ts b/server/src/schema/tables/memory-audit.table.ts
index efc6b66fd1..d84573a023 100644
--- a/server/src/schema/tables/memory-audit.table.ts
+++ b/server/src/schema/tables/memory-audit.table.ts
@@ -1,10 +1,5 @@
-import { ColumnType } from 'kysely';
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
-import { Column, CreateDateColumn, Table } from 'src/sql-tools';
-
-type Timestamp = ColumnType<Date, Date | string, Date | string>;
-type Generated<T> =
-  T extends ColumnType<infer S, infer I, infer U> ? ColumnType<S, I | undefined, U> : ColumnType<T, T | undefined, T>;
+import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
 @Table('memories_audit')
 export class MemoryAuditTable {
@@ -18,5 +13,5 @@ export class MemoryAuditTable {
   userId!: string;
 
   @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_memories_audit_deleted_at' })
-  deletedAt!: Timestamp;
+  deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/memory.table.ts b/server/src/schema/tables/memory.table.ts
index d715820a9c..8345eacbed 100644
--- a/server/src/schema/tables/memory.table.ts
+++ b/server/src/schema/tables/memory.table.ts
@@ -8,8 +8,10 @@ import {
   CreateDateColumn,
   DeleteDateColumn,
   ForeignKeyColumn,
+  Generated,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 
@@ -24,16 +26,16 @@ import {
 })
 export class MemoryTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @DeleteDateColumn()
-  deletedAt?: Date;
+  deletedAt!: Timestamp | null;
 
   @ForeignKeyColumn(() => UserTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false })
   ownerId!: string;
@@ -46,22 +48,22 @@ export class MemoryTable {
 
   /** unless set to true, will be automatically deleted in the future */
   @Column({ type: 'boolean', default: false })
-  isSaved!: boolean;
+  isSaved!: Generated<boolean>;
 
   /** memories are sorted in ascending order by this value */
   @Column({ type: 'timestamp with time zone' })
-  memoryAt!: Date;
+  memoryAt!: Timestamp;
 
   /** when the user last viewed the memory */
   @Column({ type: 'timestamp with time zone', nullable: true })
-  seenAt?: Date;
+  seenAt!: Timestamp | null;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  showAt?: Date;
+  showAt!: Timestamp | null;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  hideAt?: Date;
+  hideAt!: Timestamp | null;
 
   @UpdateIdColumn({ indexName: 'IDX_memories_update_id' })
-  updateId?: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/move.table.ts b/server/src/schema/tables/move.table.ts
index cdc00efcaf..1afda2767a 100644
--- a/server/src/schema/tables/move.table.ts
+++ b/server/src/schema/tables/move.table.ts
@@ -1,5 +1,5 @@
 import { PathType } from 'src/enum';
-import { Column, PrimaryGeneratedColumn, Table, Unique } from 'src/sql-tools';
+import { Column, Generated, PrimaryGeneratedColumn, Table, Unique } from 'src/sql-tools';
 
 @Table('move_history')
 // path lock (per entity)
@@ -8,7 +8,7 @@ import { Column, PrimaryGeneratedColumn, Table, Unique } from 'src/sql-tools';
 @Unique({ name: 'UQ_newPath', columns: ['newPath'] })
 export class MoveTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   @Column({ type: 'uuid' })
   entityId!: string;
diff --git a/server/src/schema/tables/natural-earth-countries.table.ts b/server/src/schema/tables/natural-earth-countries.table.ts
index e5e6ead772..c59d15fc21 100644
--- a/server/src/schema/tables/natural-earth-countries.table.ts
+++ b/server/src/schema/tables/natural-earth-countries.table.ts
@@ -1,9 +1,9 @@
-import { Column, PrimaryGeneratedColumn, Table } from 'src/sql-tools';
+import { Column, Generated, PrimaryGeneratedColumn, Table } from 'src/sql-tools';
 
 @Table({ name: 'naturalearth_countries', primaryConstraintName: 'naturalearth_countries_pkey' })
 export class NaturalEarthCountriesTable {
   @PrimaryGeneratedColumn({ strategy: 'identity' })
-  id!: number;
+  id!: Generated<number>;
 
   @Column({ type: 'character varying', length: 50 })
   admin!: string;
diff --git a/server/src/schema/tables/notification.table.ts b/server/src/schema/tables/notification.table.ts
index bf9b8bdf3b..aa6cc60be9 100644
--- a/server/src/schema/tables/notification.table.ts
+++ b/server/src/schema/tables/notification.table.ts
@@ -6,8 +6,10 @@ import {
   CreateDateColumn,
   DeleteDateColumn,
   ForeignKeyColumn,
+  Generated,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 
@@ -15,28 +17,28 @@ import {
 @UpdatedAtTrigger('notifications_updated_at')
 export class NotificationTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @DeleteDateColumn()
-  deletedAt?: Date;
+  deletedAt!: Timestamp | null;
 
   @UpdateIdColumn({ indexName: 'IDX_notifications_update_id' })
-  updateId?: string;
+  updateId!: Generated<string>;
 
   @ForeignKeyColumn(() => UserTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: true })
   userId!: string;
 
   @Column({ default: NotificationLevel.Info })
-  level!: NotificationLevel;
+  level!: Generated<NotificationLevel>;
 
   @Column({ default: NotificationLevel.Info })
-  type!: NotificationType;
+  type!: Generated<NotificationType>;
 
   @Column({ type: 'jsonb', nullable: true })
   data!: any | null;
@@ -45,8 +47,8 @@ export class NotificationTable {
   title!: string;
 
   @Column({ type: 'text', nullable: true })
-  description!: string;
+  description!: string | null;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  readAt?: Date | null;
+  readAt!: Timestamp | null;
 }
diff --git a/server/src/schema/tables/partner-audit.table.ts b/server/src/schema/tables/partner-audit.table.ts
index da5243dc75..35595e47b4 100644
--- a/server/src/schema/tables/partner-audit.table.ts
+++ b/server/src/schema/tables/partner-audit.table.ts
@@ -1,10 +1,10 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
-import { Column, CreateDateColumn, Table } from 'src/sql-tools';
+import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
 @Table('partners_audit')
 export class PartnerAuditTable {
   @PrimaryGeneratedUuidV7Column()
-  id!: string;
+  id!: Generated<string>;
 
   @Column({ type: 'uuid', indexName: 'IDX_partners_audit_shared_by_id' })
   sharedById!: string;
@@ -13,5 +13,5 @@ export class PartnerAuditTable {
   sharedWithId!: string;
 
   @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_partners_audit_deleted_at' })
-  deletedAt!: Date;
+  deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/partner.table.ts b/server/src/schema/tables/partner.table.ts
index 8cec2ee58a..a973f02320 100644
--- a/server/src/schema/tables/partner.table.ts
+++ b/server/src/schema/tables/partner.table.ts
@@ -1,7 +1,16 @@
 import { CreateIdColumn, UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { partners_delete_audit } from 'src/schema/functions';
 import { UserTable } from 'src/schema/tables/user.table';
-import { AfterDeleteTrigger, Column, CreateDateColumn, ForeignKeyColumn, Table, UpdateDateColumn } from 'src/sql-tools';
+import {
+  AfterDeleteTrigger,
+  Column,
+  CreateDateColumn,
+  ForeignKeyColumn,
+  Generated,
+  Table,
+  Timestamp,
+  UpdateDateColumn,
+} from 'src/sql-tools';
 
 @Table('partners')
 @UpdatedAtTrigger('partners_updated_at')
@@ -25,17 +34,17 @@ export class PartnerTable {
   sharedWithId!: string;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @CreateIdColumn({ indexName: 'IDX_partners_create_id' })
-  createId!: string;
+  createId!: Generated<string>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @Column({ type: 'boolean', default: false })
-  inTimeline!: boolean;
+  inTimeline!: Generated<boolean>;
 
   @UpdateIdColumn({ indexName: 'IDX_partners_update_id' })
-  updateId!: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/person.table.ts b/server/src/schema/tables/person.table.ts
index 1320b91f18..5835b2528c 100644
--- a/server/src/schema/tables/person.table.ts
+++ b/server/src/schema/tables/person.table.ts
@@ -6,8 +6,10 @@ import {
   Column,
   CreateDateColumn,
   ForeignKeyColumn,
+  Generated,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 
@@ -16,38 +18,38 @@ import {
 @Check({ name: 'CHK_b0f82b0ed662bfc24fbb58bb45', expression: `"birthDate" <= CURRENT_DATE` })
 export class PersonTable {
   @PrimaryGeneratedColumn('uuid')
-  id!: string;
+  id!: Generated<string>;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @ForeignKeyColumn(() => UserTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false })
   ownerId!: string;
 
   @Column({ default: '' })
-  name!: string;
+  name!: Generated<string>;
 
   @Column({ default: '' })
-  thumbnailPath!: string;
+  thumbnailPath!: Generated<string>;
 
   @Column({ type: 'boolean', default: false })
-  isHidden!: boolean;
+  isHidden!: Generated<boolean>;
 
   @Column({ type: 'date', nullable: true })
-  birthDate!: Date | string | null;
+  birthDate!: Timestamp | null;
 
   @ForeignKeyColumn(() => AssetFaceTable, { onDelete: 'SET NULL', nullable: true })
   faceAssetId!: string | null;
 
   @Column({ type: 'boolean', default: false })
-  isFavorite!: boolean;
+  isFavorite!: Generated<boolean>;
 
   @Column({ type: 'character varying', nullable: true, default: null })
-  color?: string | null;
+  color!: string | null;
 
   @UpdateIdColumn({ indexName: 'IDX_person_update_id' })
-  updateId!: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/session.table.ts b/server/src/schema/tables/session.table.ts
index 6bd5d84cb2..cc05500beb 100644
--- a/server/src/schema/tables/session.table.ts
+++ b/server/src/schema/tables/session.table.ts
@@ -4,8 +4,10 @@ import {
   Column,
   CreateDateColumn,
   ForeignKeyColumn,
+  Generated,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 
@@ -13,20 +15,20 @@ import {
 @UpdatedAtTrigger('sessions_updated_at')
 export class SessionTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   // TODO convert to byte[]
   @Column()
   token!: string;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  expiresAt!: Date | null;
+  expiresAt!: Timestamp | null;
 
   @ForeignKeyColumn(() => UserTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE' })
   userId!: string;
@@ -35,14 +37,14 @@ export class SessionTable {
   parentId!: string | null;
 
   @Column({ default: '' })
-  deviceType!: string;
+  deviceType!: Generated<string>;
 
   @Column({ default: '' })
-  deviceOS!: string;
+  deviceOS!: Generated<string>;
 
   @UpdateIdColumn({ indexName: 'IDX_sessions_update_id' })
-  updateId!: string;
+  updateId!: Generated<string>;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  pinExpiresAt!: Date | null;
+  pinExpiresAt!: Timestamp | null;
 }
diff --git a/server/src/schema/tables/shared-link.table.ts b/server/src/schema/tables/shared-link.table.ts
index 39693f3893..0670a7c5f5 100644
--- a/server/src/schema/tables/shared-link.table.ts
+++ b/server/src/schema/tables/shared-link.table.ts
@@ -1,13 +1,22 @@
 import { SharedLinkType } from 'src/enum';
 import { AlbumTable } from 'src/schema/tables/album.table';
 import { UserTable } from 'src/schema/tables/user.table';
-import { Column, CreateDateColumn, ForeignKeyColumn, PrimaryGeneratedColumn, Table, Unique } from 'src/sql-tools';
+import {
+  Column,
+  CreateDateColumn,
+  ForeignKeyColumn,
+  Generated,
+  PrimaryGeneratedColumn,
+  Table,
+  Timestamp,
+  Unique,
+} from 'src/sql-tools';
 
 @Table('shared_links')
 @Unique({ name: 'UQ_sharedlink_key', columns: ['key'] })
 export class SharedLinkTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   @Column({ type: 'character varying', nullable: true })
   description!: string | null;
@@ -22,10 +31,10 @@ export class SharedLinkTable {
   type!: SharedLinkType;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @Column({ type: 'timestamp with time zone', nullable: true })
-  expiresAt!: Date | null;
+  expiresAt!: Timestamp | null;
 
   @Column({ type: 'boolean', default: false })
   allowUpload!: boolean;
@@ -36,13 +45,13 @@ export class SharedLinkTable {
     onUpdate: 'CASCADE',
     indexName: 'IDX_sharedlink_albumId',
   })
-  albumId!: string;
+  albumId!: string | null;
 
   @Column({ type: 'boolean', default: true })
-  allowDownload!: boolean;
+  allowDownload!: Generated<boolean>;
 
   @Column({ type: 'boolean', default: true })
-  showExif!: boolean;
+  showExif!: Generated<boolean>;
 
   @Column({ type: 'character varying', nullable: true })
   password!: string | null;
diff --git a/server/src/schema/tables/stack.table.ts b/server/src/schema/tables/stack.table.ts
index 222114d715..78700d82f9 100644
--- a/server/src/schema/tables/stack.table.ts
+++ b/server/src/schema/tables/stack.table.ts
@@ -1,11 +1,11 @@
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { UserTable } from 'src/schema/tables/user.table';
-import { ForeignKeyColumn, PrimaryGeneratedColumn, Table } from 'src/sql-tools';
+import { ForeignKeyColumn, Generated, PrimaryGeneratedColumn, Table } from 'src/sql-tools';
 
 @Table('asset_stack')
 export class StackTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   //TODO: Add constraint to ensure primary asset exists in the assets array
   @ForeignKeyColumn(() => AssetTable, { nullable: false, unique: true })
diff --git a/server/src/schema/tables/sync-checkpoint.table.ts b/server/src/schema/tables/sync-checkpoint.table.ts
index 21fd7983ac..a5ae9181e3 100644
--- a/server/src/schema/tables/sync-checkpoint.table.ts
+++ b/server/src/schema/tables/sync-checkpoint.table.ts
@@ -1,7 +1,16 @@
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { SyncEntityType } from 'src/enum';
 import { SessionTable } from 'src/schema/tables/session.table';
-import { Column, CreateDateColumn, ForeignKeyColumn, PrimaryColumn, Table, UpdateDateColumn } from 'src/sql-tools';
+import {
+  Column,
+  CreateDateColumn,
+  ForeignKeyColumn,
+  Generated,
+  PrimaryColumn,
+  Table,
+  Timestamp,
+  UpdateDateColumn,
+} from 'src/sql-tools';
 
 @Table('session_sync_checkpoints')
 @UpdatedAtTrigger('session_sync_checkpoints_updated_at')
@@ -13,14 +22,14 @@ export class SessionSyncCheckpointTable {
   type!: SyncEntityType;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @Column()
   ack!: string;
 
   @UpdateIdColumn({ indexName: 'IDX_session_sync_checkpoints_update_id' })
-  updateId!: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/tag.table.ts b/server/src/schema/tables/tag.table.ts
index a9f2a57f27..55abe0a852 100644
--- a/server/src/schema/tables/tag.table.ts
+++ b/server/src/schema/tables/tag.table.ts
@@ -4,8 +4,10 @@ import {
   Column,
   CreateDateColumn,
   ForeignKeyColumn,
+  Generated,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   Unique,
   UpdateDateColumn,
 } from 'src/sql-tools';
@@ -15,7 +17,7 @@ import {
 @Unique({ columns: ['userId', 'value'] })
 export class TagTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   @ForeignKeyColumn(() => UserTable, {
     onUpdate: 'CASCADE',
@@ -29,17 +31,17 @@ export class TagTable {
   value!: string;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @UpdateDateColumn()
-  updatedAt!: Date;
+  updatedAt!: Generated<Timestamp>;
 
   @Column({ type: 'character varying', nullable: true, default: null })
   color!: string | null;
 
   @ForeignKeyColumn(() => TagTable, { nullable: true, onDelete: 'CASCADE' })
-  parentId?: string;
+  parentId!: string | null;
 
   @UpdateIdColumn({ indexName: 'IDX_tags_update_id' })
-  updateId!: string;
+  updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/user-audit.table.ts b/server/src/schema/tables/user-audit.table.ts
index e0c9afcdc3..0c20323a54 100644
--- a/server/src/schema/tables/user-audit.table.ts
+++ b/server/src/schema/tables/user-audit.table.ts
@@ -1,14 +1,14 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
-import { Column, CreateDateColumn, Table } from 'src/sql-tools';
+import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
 @Table('users_audit')
 export class UserAuditTable {
+  @PrimaryGeneratedUuidV7Column()
+  id!: Generated<string>;
+
   @Column({ type: 'uuid' })
   userId!: string;
 
   @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_users_audit_deleted_at' })
-  deletedAt!: Date;
-
-  @PrimaryGeneratedUuidV7Column()
-  id!: string;
+  deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/user.table.ts b/server/src/schema/tables/user.table.ts
index c806d6e3f7..c4b32f571a 100644
--- a/server/src/schema/tables/user.table.ts
+++ b/server/src/schema/tables/user.table.ts
@@ -7,16 +7,14 @@ import {
   Column,
   CreateDateColumn,
   DeleteDateColumn,
+  Generated,
   Index,
   PrimaryGeneratedColumn,
   Table,
+  Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-type Timestamp = ColumnType<Date, Date | string, Date | string>;
-type Generated<T> =
-  T extends ColumnType<infer S, infer I, infer U> ? ColumnType<S, I | undefined, U> : ColumnType<T, T | undefined, T>;
-
 @Table('users')
 @UpdatedAtTrigger('users_updated_at')
 @AfterDeleteTrigger({
diff --git a/server/src/schema/tables/version-history.table.ts b/server/src/schema/tables/version-history.table.ts
index 18805a2de3..143852c527 100644
--- a/server/src/schema/tables/version-history.table.ts
+++ b/server/src/schema/tables/version-history.table.ts
@@ -1,12 +1,12 @@
-import { Column, CreateDateColumn, PrimaryGeneratedColumn, Table } from 'src/sql-tools';
+import { Column, CreateDateColumn, Generated, PrimaryGeneratedColumn, Table, Timestamp } from 'src/sql-tools';
 
 @Table('version_history')
 export class VersionHistoryTable {
   @PrimaryGeneratedColumn()
-  id!: string;
+  id!: Generated<string>;
 
   @CreateDateColumn()
-  createdAt!: Date;
+  createdAt!: Generated<Timestamp>;
 
   @Column()
   version!: string;
diff --git a/server/src/services/library.service.ts b/server/src/services/library.service.ts
index 2add5f484b..8c7f79ee5c 100644
--- a/server/src/services/library.service.ts
+++ b/server/src/services/library.service.ts
@@ -6,7 +6,6 @@ import path, { basename, isAbsolute, parse } from 'node:path';
 import picomatch from 'picomatch';
 import { JOBS_LIBRARY_PAGINATION_SIZE } from 'src/constants';
 import { StorageCore } from 'src/cores/storage.core';
-import { Assets } from 'src/db';
 import { OnEvent, OnJob } from 'src/decorators';
 import {
   CreateLibraryDto,
@@ -21,6 +20,7 @@ import {
 import { AssetStatus, AssetType, DatabaseLock, ImmichWorker, JobName, JobStatus, QueueName } from 'src/enum';
 import { ArgOf } from 'src/repositories/event.repository';
 import { AssetSyncResult } from 'src/repositories/library.repository';
+import { AssetTable } from 'src/schema/tables/asset.table';
 import { BaseService } from 'src/services/base.service';
 import { JobOf } from 'src/types';
 import { mimeTypes } from 'src/utils/mime-types';
@@ -237,7 +237,7 @@ export class LibraryService extends BaseService {
       return JobStatus.FAILED;
     }
 
-    const assetImports: Insertable<Assets>[] = [];
+    const assetImports: Insertable<AssetTable>[] = [];
     await Promise.all(
       job.paths.map((path) =>
         this.processEntity(path, library.ownerId, job.libraryId)
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
index 7c6d659124..3212d150f6 100644
--- a/server/src/services/metadata.service.ts
+++ b/server/src/services/metadata.service.ts
@@ -9,7 +9,6 @@ import path from 'node:path';
 import { JOBS_ASSET_PAGINATION_SIZE } from 'src/constants';
 import { StorageCore } from 'src/cores/storage.core';
 import { Asset, AssetFace } from 'src/database';
-import { AssetFaces, Exif, Person } from 'src/db';
 import { OnEvent, OnJob } from 'src/decorators';
 import {
   AssetType,
@@ -25,6 +24,9 @@ import {
 import { ArgOf } from 'src/repositories/event.repository';
 import { ReverseGeocodeResult } from 'src/repositories/map.repository';
 import { ImmichTags } from 'src/repositories/metadata.repository';
+import { AssetFaceTable } from 'src/schema/tables/asset-face.table';
+import { ExifTable } from 'src/schema/tables/exif.table';
+import { PersonTable } from 'src/schema/tables/person.table';
 import { BaseService } from 'src/services/base.service';
 import { JobItem, JobOf } from 'src/types';
 import { isFaceImportEnabled } from 'src/utils/misc';
@@ -162,7 +164,7 @@ export class MetadataService extends BaseService {
 
   private async linkLivePhotos(
     asset: { id: string; type: AssetType; ownerId: string; libraryId: string | null },
-    exifInfo: Insertable<Exif>,
+    exifInfo: Insertable<ExifTable>,
   ): Promise<void> {
     if (!exifInfo.livePhotoCID) {
       return;
@@ -240,7 +242,7 @@ export class MetadataService extends BaseService {
       }
     }
 
-    const exifData: Insertable<Exif> = {
+    const exifData: Insertable<ExifTable> = {
       assetId: asset.id,
 
       // dates
@@ -710,10 +712,10 @@ export class MetadataService extends BaseService {
       return;
     }
 
-    const facesToAdd: (Insertable<AssetFaces> & { assetId: string })[] = [];
+    const facesToAdd: (Insertable<AssetFaceTable> & { assetId: string })[] = [];
     const existingNames = await this.personRepository.getDistinctNames(asset.ownerId, { withHidden: true });
     const existingNameMap = new Map(existingNames.map(({ id, name }) => [name.toLowerCase(), id]));
-    const missing: (Insertable<Person> & { ownerId: string })[] = [];
+    const missing: (Insertable<PersonTable> & { ownerId: string })[] = [];
     const missingWithFaceAsset: { id: string; ownerId: string; faceAssetId: string }[] = [];
 
     const adjustedRegionInfo = this.orientRegionInfo(tags.RegionInfo, tags.Orientation);
diff --git a/server/src/services/person.service.ts b/server/src/services/person.service.ts
index 61978ba8d5..af34e6eda9 100644
--- a/server/src/services/person.service.ts
+++ b/server/src/services/person.service.ts
@@ -2,7 +2,6 @@ import { BadRequestException, Injectable, NotFoundException } from '@nestjs/comm
 import { Insertable, Updateable } from 'kysely';
 import { JOBS_ASSET_PAGINATION_SIZE } from 'src/constants';
 import { Person } from 'src/database';
-import { AssetFaces, FaceSearch } from 'src/db';
 import { Chunked, OnJob } from 'src/decorators';
 import { BulkIdErrorReason, BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
@@ -37,6 +36,8 @@ import {
 } from 'src/enum';
 import { BoundingBox } from 'src/repositories/machine-learning.repository';
 import { UpdateFacesData } from 'src/repositories/person.repository';
+import { AssetFaceTable } from 'src/schema/tables/asset-face.table';
+import { FaceSearchTable } from 'src/schema/tables/face-search.table';
 import { BaseService } from 'src/services/base.service';
 import { JobItem, JobOf } from 'src/types';
 import { ImmichFileResponse } from 'src/utils/file';
@@ -317,8 +318,8 @@ export class PersonService extends BaseService {
     );
     this.logger.debug(`${faces.length} faces detected in ${previewFile.path}`);
 
-    const facesToAdd: (Insertable<AssetFaces> & { id: string })[] = [];
-    const embeddings: FaceSearch[] = [];
+    const facesToAdd: (Insertable<AssetFaceTable> & { id: string })[] = [];
+    const embeddings: FaceSearchTable[] = [];
     const mlFaceIds = new Set<string>();
 
     for (const face of asset.faces) {
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 62ec1f02a8..bd3ce0da47 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -3,7 +3,6 @@ import { Insertable } from 'kysely';
 import { DateTime } from 'luxon';
 import { Writable } from 'node:stream';
 import { AUDIT_LOG_MAX_DURATION } from 'src/constants';
-import { SessionSyncCheckpoints } from 'src/db';
 import { AssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import {
@@ -17,6 +16,7 @@ import {
   SyncStreamDto,
 } from 'src/dtos/sync.dto';
 import { AssetVisibility, DatabaseAction, EntityType, Permission, SyncEntityType, SyncRequestType } from 'src/enum';
+import { SessionSyncCheckpointTable } from 'src/schema/tables/sync-checkpoint.table';
 import { BaseService } from 'src/services/base.service';
 import { SyncAck } from 'src/types';
 import { getMyPartnerIds } from 'src/utils/asset.util';
@@ -90,7 +90,7 @@ export class SyncService extends BaseService {
       return throwSessionRequired();
     }
 
-    const checkpoints: Record<string, Insertable<SessionSyncCheckpoints>> = {};
+    const checkpoints: Record<string, Insertable<SessionSyncCheckpointTable>> = {};
     for (const ack of dto.acks) {
       const { type } = fromAck(ack);
       // TODO proper ack validation via class validator
diff --git a/server/src/services/tag.service.ts b/server/src/services/tag.service.ts
index ecf4d6e9fb..5e8b2b4057 100644
--- a/server/src/services/tag.service.ts
+++ b/server/src/services/tag.service.ts
@@ -1,6 +1,5 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { Insertable } from 'kysely';
-import { TagAsset } from 'src/db';
 import { OnJob } from 'src/decorators';
 import { BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
@@ -14,6 +13,7 @@ import {
   mapTag,
 } from 'src/dtos/tag.dto';
 import { JobName, JobStatus, Permission, QueueName } from 'src/enum';
+import { TagAssetTable } from 'src/schema/tables/tag-asset.table';
 import { BaseService } from 'src/services/base.service';
 import { addAssets, removeAssets } from 'src/utils/asset.util';
 import { upsertTags } from 'src/utils/tag';
@@ -81,7 +81,7 @@ export class TagService extends BaseService {
       this.checkAccess({ auth, permission: Permission.ASSET_UPDATE, ids: dto.assetIds }),
     ]);
 
-    const items: Insertable<TagAsset>[] = [];
+    const items: Insertable<TagAssetTable>[] = [];
     for (const tagsId of tagIds) {
       for (const assetsId of assetIds) {
         items.push({ tagsId, assetsId });
diff --git a/server/src/sql-tools/types.ts b/server/src/sql-tools/types.ts
index 22bdf7d7a6..0641487e0e 100644
--- a/server/src/sql-tools/types.ts
+++ b/server/src/sql-tools/types.ts
@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import { Kysely, ColumnType as KyselyColumnType } from 'kysely';
 
 export type PostgresDB = {
   pg_am: {
@@ -476,3 +476,10 @@ export enum Reason {
   MissingInSource = 'missing in source',
   MissingInTarget = 'missing in target',
 }
+
+export type Timestamp = KyselyColumnType<Date, Date | string, Date | string>;
+export type Generated<T> =
+  T extends KyselyColumnType<infer S, infer I, infer U>
+    ? KyselyColumnType<S, I | undefined, U>
+    : KyselyColumnType<T, T | undefined, T>;
+export type Int8 = KyselyColumnType<number>;
diff --git a/server/src/utils/database.ts b/server/src/utils/database.ts
index 54a21fe994..191e02eb63 100644
--- a/server/src/utils/database.ts
+++ b/server/src/utils/database.ts
@@ -16,9 +16,9 @@ import { jsonArrayFrom, jsonObjectFrom } from 'kysely/helpers/postgres';
 import { parse } from 'pg-connection-string';
 import postgres, { Notice } from 'postgres';
 import { columns, Exif, Person } from 'src/database';
-import { DB } from 'src/db';
 import { AssetFileType, AssetVisibility, DatabaseExtension, DatabaseSslMode } from 'src/enum';
 import { AssetSearchBuilderOptions } from 'src/repositories/search.repository';
+import { DB } from 'src/schema';
 import { DatabaseConnectionParams, VectorExtension } from 'src/types';
 
 type Ssl = 'require' | 'allow' | 'prefer' | 'verify-full' | boolean | object;
diff --git a/server/test/fixtures/asset.stub.ts b/server/test/fixtures/asset.stub.ts
index 454be00844..aa38a520ee 100644
--- a/server/test/fixtures/asset.stub.ts
+++ b/server/test/fixtures/asset.stub.ts
@@ -35,6 +35,7 @@ export const stackStub = (stackId: string, assets: (MapAsset & { exifInfo: Exif
     primaryAssetId: assets[0].id,
     createdAt: new Date('2023-02-23T05:06:29.716Z'),
     updatedAt: new Date('2023-02-23T05:06:29.716Z'),
+    updateId: 'uuid-v7',
   };
 };
 
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index a2dd36527c..6d1a75502b 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -4,7 +4,6 @@ import { DateTime } from 'luxon';
 import { createHash, randomBytes } from 'node:crypto';
 import { Writable } from 'node:stream';
 import { AssetFace } from 'src/database';
-import { Albums, AssetJobStatus, Assets, DB, Exif, FaceSearch, Memories, Person, Sessions } from 'src/db';
 import { AuthDto, LoginResponseDto } from 'src/dtos/auth.dto';
 import { AlbumUserRole, AssetType, AssetVisibility, MemoryType, SourceType, SyncRequestType } from 'src/enum';
 import { AccessRepository } from 'src/repositories/access.repository';
@@ -32,6 +31,15 @@ import { SyncRepository } from 'src/repositories/sync.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { UserRepository } from 'src/repositories/user.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
+import { DB } from 'src/schema';
+import { AlbumTable } from 'src/schema/tables/album.table';
+import { AssetJobStatusTable } from 'src/schema/tables/asset-job-status.table';
+import { AssetTable } from 'src/schema/tables/asset.table';
+import { ExifTable } from 'src/schema/tables/exif.table';
+import { FaceSearchTable } from 'src/schema/tables/face-search.table';
+import { MemoryTable } from 'src/schema/tables/memory.table';
+import { PersonTable } from 'src/schema/tables/person.table';
+import { SessionTable } from 'src/schema/tables/session.table';
 import { UserTable } from 'src/schema/tables/user.table';
 import { BASE_SERVICE_DEPENDENCIES, BaseService } from 'src/services/base.service';
 import { SyncService } from 'src/services/sync.service';
@@ -125,13 +133,13 @@ export class MediumTestContext<S extends BaseService = BaseService> {
     return { partner, result };
   }
 
-  async newAsset(dto: Partial<Insertable<Assets>> = {}) {
+  async newAsset(dto: Partial<Insertable<AssetTable>> = {}) {
     const asset = mediumFactory.assetInsert(dto);
     const result = await this.get(AssetRepository).create(asset);
     return { asset, result };
   }
 
-  async newMemory(dto: Partial<Insertable<Memories>> = {}) {
+  async newMemory(dto: Partial<Insertable<MemoryTable>> = {}) {
     const memory = mediumFactory.memoryInsert(dto);
     const result = await this.get(MemoryRepository).create(memory, new Set<string>());
     return { memory, result };
@@ -142,12 +150,12 @@ export class MediumTestContext<S extends BaseService = BaseService> {
     return { memoryAsset: dto, result };
   }
 
-  async newExif(dto: Insertable<Exif>) {
+  async newExif(dto: Insertable<ExifTable>) {
     const result = await this.get(AssetRepository).upsertExif(dto);
     return { result };
   }
 
-  async newAlbum(dto: Insertable<Albums>) {
+  async newAlbum(dto: Insertable<AlbumTable>) {
     const album = mediumFactory.albumInsert(dto);
     const result = await this.get(AlbumRepository).create(album, [], []);
     return { album, result };
@@ -164,19 +172,19 @@ export class MediumTestContext<S extends BaseService = BaseService> {
     return { albumUser: { albumId, userId, role }, result };
   }
 
-  async newJobStatus(dto: Partial<Insertable<AssetJobStatus>> & { assetId: string }) {
+  async newJobStatus(dto: Partial<Insertable<AssetJobStatusTable>> & { assetId: string }) {
     const jobStatus = mediumFactory.assetJobStatusInsert({ assetId: dto.assetId });
     const result = await this.get(AssetRepository).upsertJobStatus(jobStatus);
     return { jobStatus, result };
   }
 
-  async newPerson(dto: Partial<Insertable<Person>> & { ownerId: string }) {
+  async newPerson(dto: Partial<Insertable<PersonTable>> & { ownerId: string }) {
     const person = mediumFactory.personInsert(dto);
     const result = await this.get(PersonRepository).create(person);
     return { person, result };
   }
 
-  async newSession(dto: Partial<Insertable<Sessions>> & { userId: string }) {
+  async newSession(dto: Partial<Insertable<SessionTable>> & { userId: string }) {
     const session = mediumFactory.sessionInsert(dto);
     const result = await this.get(SessionRepository).create(session);
     return { session, result };
@@ -338,10 +346,10 @@ const newMockRepository = <T>(key: ClassConstructor<T>) => {
   }
 };
 
-const assetInsert = (asset: Partial<Insertable<Assets>> = {}) => {
+const assetInsert = (asset: Partial<Insertable<AssetTable>> = {}) => {
   const id = asset.id || newUuid();
   const now = newDate();
-  const defaults: Insertable<Assets> = {
+  const defaults: Insertable<AssetTable> = {
     deviceAssetId: '',
     deviceId: '',
     originalFileName: '',
@@ -363,9 +371,9 @@ const assetInsert = (asset: Partial<Insertable<Assets>> = {}) => {
   };
 };
 
-const albumInsert = (album: Partial<Insertable<Albums>> & { ownerId: string }) => {
+const albumInsert = (album: Partial<Insertable<AlbumTable>> & { ownerId: string }) => {
   const id = album.id || newUuid();
-  const defaults: Omit<Insertable<Albums>, 'ownerId'> = {
+  const defaults: Omit<Insertable<AlbumTable>, 'ownerId'> = {
     albumName: 'Album',
   };
 
@@ -376,7 +384,7 @@ const albumInsert = (album: Partial<Insertable<Albums>> & { ownerId: string }) =
   };
 };
 
-const faceInsert = (face: Partial<Insertable<FaceSearch>> & { faceId: string }) => {
+const faceInsert = (face: Partial<Insertable<FaceSearchTable>> & { faceId: string }) => {
   const defaults = {
     faceId: face.faceId,
     embedding: face.embedding || newEmbedding(),
@@ -409,10 +417,10 @@ const assetFaceInsert = (assetFace: Partial<AssetFace> & { assetId: string }) =>
 };
 
 const assetJobStatusInsert = (
-  job: Partial<Insertable<AssetJobStatus>> & { assetId: string },
-): Insertable<AssetJobStatus> => {
+  job: Partial<Insertable<AssetJobStatusTable>> & { assetId: string },
+): Insertable<AssetJobStatusTable> => {
   const date = DateTime.now().minus({ days: 15 }).toISO();
-  const defaults: Omit<Insertable<AssetJobStatus>, 'assetId'> = {
+  const defaults: Omit<Insertable<AssetJobStatusTable>, 'assetId'> = {
     duplicatesDetectedAt: date,
     facesRecognizedAt: date,
     metadataExtractedAt: date,
@@ -426,7 +434,7 @@ const assetJobStatusInsert = (
   };
 };
 
-const personInsert = (person: Partial<Insertable<Person>> & { ownerId: string }) => {
+const personInsert = (person: Partial<Insertable<PersonTable>> & { ownerId: string }) => {
   const defaults = {
     birthDate: person.birthDate || null,
     color: person.color || null,
@@ -449,8 +457,12 @@ const personInsert = (person: Partial<Insertable<Person>> & { ownerId: string })
 
 const sha256 = (value: string) => createHash('sha256').update(value).digest('base64');
 
-const sessionInsert = ({ id = newUuid(), userId, ...session }: Partial<Insertable<Sessions>> & { userId: string }) => {
-  const defaults: Insertable<Sessions> = {
+const sessionInsert = ({
+  id = newUuid(),
+  userId,
+  ...session
+}: Partial<Insertable<SessionTable>> & { userId: string }) => {
+  const defaults: Insertable<SessionTable> = {
     id,
     userId,
     token: sha256(id),
@@ -478,11 +490,11 @@ const userInsert = (user: Partial<Insertable<UserTable>> = {}) => {
   return { ...defaults, ...user, id };
 };
 
-const memoryInsert = (memory: Partial<Insertable<Memories>> = {}) => {
+const memoryInsert = (memory: Partial<Insertable<MemoryTable>> = {}) => {
   const id = memory.id || newUuid();
   const date = newDate();
 
-  const defaults: Insertable<Memories> = {
+  const defaults: Insertable<MemoryTable> = {
     id,
     createdAt: date,
     updatedAt: date,
diff --git a/server/test/medium/globalSetup.ts b/server/test/medium/globalSetup.ts
index 811fb2cadb..4f56216b84 100644
--- a/server/test/medium/globalSetup.ts
+++ b/server/test/medium/globalSetup.ts
@@ -1,8 +1,8 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { DatabaseRepository } from 'src/repositories/database.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { DB } from 'src/schema';
 import { getKyselyConfig } from 'src/utils/database';
 import { GenericContainer, Wait } from 'testcontainers';
 
diff --git a/server/test/medium/specs/services/asset.service.spec.ts b/server/test/medium/specs/services/asset.service.spec.ts
index db9a7de082..11343bd6e1 100644
--- a/server/test/medium/specs/services/asset.service.spec.ts
+++ b/server/test/medium/specs/services/asset.service.spec.ts
@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AssetRepository } from 'src/repositories/asset.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { DB } from 'src/schema';
 import { AssetService } from 'src/services/asset.service';
 import { newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
diff --git a/server/test/medium/specs/services/auth.service.spec.ts b/server/test/medium/specs/services/auth.service.spec.ts
index 53deaa1291..f1d50ce841 100644
--- a/server/test/medium/specs/services/auth.service.spec.ts
+++ b/server/test/medium/specs/services/auth.service.spec.ts
@@ -1,7 +1,6 @@
 import { BadRequestException } from '@nestjs/common';
 import { hash } from 'bcrypt';
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AuthType } from 'src/enum';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { ConfigRepository } from 'src/repositories/config.repository';
@@ -13,6 +12,7 @@ import { SessionRepository } from 'src/repositories/session.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { AuthService } from 'src/services/auth.service';
 import { mediumFactory, newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
diff --git a/server/test/medium/specs/services/memory.service.spec.ts b/server/test/medium/specs/services/memory.service.spec.ts
index 53ab970d47..bdd06b4a3f 100644
--- a/server/test/medium/specs/services/memory.service.spec.ts
+++ b/server/test/medium/specs/services/memory.service.spec.ts
@@ -1,6 +1,5 @@
 import { Kysely } from 'kysely';
 import { DateTime } from 'luxon';
-import { DB } from 'src/db';
 import { AssetFileType, MemoryType } from 'src/enum';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { AssetRepository } from 'src/repositories/asset.repository';
@@ -10,6 +9,7 @@ import { MemoryRepository } from 'src/repositories/memory.repository';
 import { PartnerRepository } from 'src/repositories/partner.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { MemoryService } from 'src/services/memory.service';
 import { newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
diff --git a/server/test/medium/specs/services/person.service.spec.ts b/server/test/medium/specs/services/person.service.spec.ts
index 2a1080704c..f26834c5e2 100644
--- a/server/test/medium/specs/services/person.service.spec.ts
+++ b/server/test/medium/specs/services/person.service.spec.ts
@@ -1,10 +1,10 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AccessRepository } from 'src/repositories/access.repository';
 import { DatabaseRepository } from 'src/repositories/database.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { PersonRepository } from 'src/repositories/person.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
+import { DB } from 'src/schema';
 import { PersonService } from 'src/services/person.service';
 import { newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
diff --git a/server/test/medium/specs/services/user.service.spec.ts b/server/test/medium/specs/services/user.service.spec.ts
index a16ea3c877..535ac30aec 100644
--- a/server/test/medium/specs/services/user.service.spec.ts
+++ b/server/test/medium/specs/services/user.service.spec.ts
@@ -1,6 +1,5 @@
 import { Kysely } from 'kysely';
 import { DateTime } from 'luxon';
-import { DB } from 'src/db';
 import { ImmichEnvironment, JobName, JobStatus } from 'src/enum';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { CryptoRepository } from 'src/repositories/crypto.repository';
@@ -8,6 +7,7 @@ import { JobRepository } from 'src/repositories/job.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { UserService } from 'src/services/user.service';
 import { mediumFactory, newMediumService } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
diff --git a/server/test/medium/specs/services/version.service.spec.ts b/server/test/medium/specs/services/version.service.spec.ts
index 6e9984cc50..9feda5b8c4 100644
--- a/server/test/medium/specs/services/version.service.spec.ts
+++ b/server/test/medium/specs/services/version.service.spec.ts
@@ -1,11 +1,11 @@
 import { Kysely } from 'kysely';
 import { serverVersion } from 'src/constants';
-import { DB } from 'src/db';
 import { JobName } from 'src/enum';
 import { DatabaseRepository } from 'src/repositories/database.repository';
 import { JobRepository } from 'src/repositories/job.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
+import { DB } from 'src/schema';
 import { VersionService } from 'src/services/version.service';
 import { newMediumService } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
diff --git a/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts b/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
index 811dbb374b..2c6b98e949 100644
--- a/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
@@ -1,6 +1,6 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';
diff --git a/server/test/medium/specs/sync/sync-album-asset.spec.ts b/server/test/medium/specs/sync/sync-album-asset.spec.ts
index ae4833de34..6bfb6b5d27 100644
--- a/server/test/medium/specs/sync/sync-album-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-asset.spec.ts
@@ -1,6 +1,6 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';
diff --git a/server/test/medium/specs/sync/sync-album-to-asset.spec.ts b/server/test/medium/specs/sync/sync-album-to-asset.spec.ts
index c1af6676f8..a0c1d413a0 100644
--- a/server/test/medium/specs/sync/sync-album-to-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-to-asset.spec.ts
@@ -1,8 +1,8 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
 import { AlbumRepository } from 'src/repositories/album.repository';
 import { AssetRepository } from 'src/repositories/asset.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB, wait } from 'test/utils';
 
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 215752ca6e..798b3d607d 100644
--- a/server/test/medium/specs/sync/sync-album-user.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-user.spec.ts
@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
 import { AlbumUserRepository } from 'src/repositories/album-user.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB, wait } from 'test/utils';
 
diff --git a/server/test/medium/specs/sync/sync-album.spec.ts b/server/test/medium/specs/sync/sync-album.spec.ts
index 90aa8c4576..83e9f12651 100644
--- a/server/test/medium/specs/sync/sync-album.spec.ts
+++ b/server/test/medium/specs/sync/sync-album.spec.ts
@@ -1,8 +1,8 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { AlbumUserRole, SyncEntityType, SyncRequestType } from 'src/enum';
 import { AlbumUserRepository } from 'src/repositories/album-user.repository';
 import { AlbumRepository } from 'src/repositories/album.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 
diff --git a/server/test/medium/specs/sync/sync-asset-exif.spec.ts b/server/test/medium/specs/sync/sync-asset-exif.spec.ts
index 8ddb05a2b7..425ea89054 100644
--- a/server/test/medium/specs/sync/sync-asset-exif.spec.ts
+++ b/server/test/medium/specs/sync/sync-asset-exif.spec.ts
@@ -1,6 +1,6 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB } from 'test/utils';
diff --git a/server/test/medium/specs/sync/sync-asset.spec.ts b/server/test/medium/specs/sync/sync-asset.spec.ts
index 5ffec3612e..8603296028 100644
--- a/server/test/medium/specs/sync/sync-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-asset.spec.ts
@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { AssetRepository } from 'src/repositories/asset.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB } from 'test/utils';
diff --git a/server/test/medium/specs/sync/sync-memory-asset.spec.ts b/server/test/medium/specs/sync/sync-memory-asset.spec.ts
index a6cfadea6d..a3247637d7 100644
--- a/server/test/medium/specs/sync/sync-memory-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-memory-asset.spec.ts
@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { MemoryRepository } from 'src/repositories/memory.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 
diff --git a/server/test/medium/specs/sync/sync-memory.spec.ts b/server/test/medium/specs/sync/sync-memory.spec.ts
index df41671fde..fa833ad094 100644
--- a/server/test/medium/specs/sync/sync-memory.spec.ts
+++ b/server/test/medium/specs/sync/sync-memory.spec.ts
@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { MemoryRepository } from 'src/repositories/memory.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 
diff --git a/server/test/medium/specs/sync/sync-partner-asset-exif.spec.ts b/server/test/medium/specs/sync/sync-partner-asset-exif.spec.ts
index 2fee9b09a9..c33eb59dbb 100644
--- a/server/test/medium/specs/sync/sync-partner-asset-exif.spec.ts
+++ b/server/test/medium/specs/sync/sync-partner-asset-exif.spec.ts
@@ -1,6 +1,6 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';
diff --git a/server/test/medium/specs/sync/sync-partner-asset.spec.ts b/server/test/medium/specs/sync/sync-partner-asset.spec.ts
index 4faa2f6966..d9655add57 100644
--- a/server/test/medium/specs/sync/sync-partner-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-partner-asset.spec.ts
@@ -1,9 +1,9 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { AssetRepository } from 'src/repositories/asset.repository';
 import { PartnerRepository } from 'src/repositories/partner.repository';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { factory } from 'test/small.factory';
 import { getKyselyDB, wait } from 'test/utils';
diff --git a/server/test/medium/specs/sync/sync-partner.spec.ts b/server/test/medium/specs/sync/sync-partner.spec.ts
index 11d843243d..d20970da8f 100644
--- a/server/test/medium/specs/sync/sync-partner.spec.ts
+++ b/server/test/medium/specs/sync/sync-partner.spec.ts
@@ -1,8 +1,8 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { PartnerRepository } from 'src/repositories/partner.repository';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 
diff --git a/server/test/medium/specs/sync/sync-user.spec.ts b/server/test/medium/specs/sync/sync-user.spec.ts
index 10a06bd9f7..24137e3aea 100644
--- a/server/test/medium/specs/sync/sync-user.spec.ts
+++ b/server/test/medium/specs/sync/sync-user.spec.ts
@@ -1,7 +1,7 @@
 import { Kysely } from 'kysely';
-import { DB } from 'src/db';
 import { SyncEntityType, SyncRequestType } from 'src/enum';
 import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
 import { SyncTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
 
diff --git a/server/test/utils.ts b/server/test/utils.ts
index 0b4c743802..af6f2826f9 100644
--- a/server/test/utils.ts
+++ b/server/test/utils.ts
@@ -7,7 +7,6 @@ import { ChildProcessWithoutNullStreams } from 'node:child_process';
 import { Writable } from 'node:stream';
 import { PNG } from 'pngjs';
 import postgres from 'postgres';
-import { DB } from 'src/db';
 import { AssetUploadInterceptor } from 'src/middleware/asset-upload.interceptor';
 import { AuthGuard } from 'src/middleware/auth.guard';
 import { FileUploadInterceptor } from 'src/middleware/file-upload.interceptor';
@@ -56,6 +55,7 @@ import { TrashRepository } from 'src/repositories/trash.repository';
 import { UserRepository } from 'src/repositories/user.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
 import { ViewRepository } from 'src/repositories/view-repository';
+import { DB } from 'src/schema';
 import { AuthService } from 'src/services/auth.service';
 import { BaseService } from 'src/services/base.service';
 import { RepositoryInterface } from 'src/types';

From fa5f30d9caedfa02f1bec6be84eb0afe53a7b209 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 30 Jun 2025 12:20:13 -0500
Subject: [PATCH 080/337] fix: timeline service mismatch state (#19612)

---
 mobile/lib/presentation/pages/dev/main_timeline.page.dart | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/presentation/pages/dev/main_timeline.page.dart b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
index 5ed7d88c4b..cb2fdacf39 100644
--- a/mobile/lib/presentation/pages/dev/main_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
@@ -7,12 +7,15 @@ import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 
 @RoutePage()
-class MainTimelinePage extends StatelessWidget {
+class MainTimelinePage extends ConsumerWidget {
   const MainTimelinePage({super.key});
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     return ProviderScope(
+      key: ref.watch(timelineUsersProvider).value != null
+          ? ValueKey(ref.watch(timelineUsersProvider).value)
+          : const ValueKey("main-timeline"),
       overrides: [
         timelineServiceProvider.overrideWith(
           (ref) {

From 4c3fcdc745281b6166309363315b7a754207cf49 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 30 Jun 2025 12:21:09 -0500
Subject: [PATCH 081/337] feat: favorite action (#19623)

---
 i18n/en.json                                  |  1 +
 mobile/lib/constants/enums.dart               |  2 +
 .../domain/models/asset/base_asset.model.dart |  2 +-
 ...set.model.dart => remote_asset.model.dart} | 31 ++++++----
 .../entities/remote_asset.entity.dart         |  3 +-
 .../repositories/remote_asset.repository.dart | 26 ++++++++
 .../repositories/timeline.repository.dart     | 62 ++++++++++---------
 .../favorite_action_button.widget.dart        | 59 +++++++++++++++++-
 .../home_bottom_app_bar.widget.dart           |  3 +-
 .../widgets/images/thumbnail.widget.dart      |  5 +-
 .../widgets/images/thumbnail_tile.widget.dart |  5 +-
 .../widgets/timeline/fixed/segment.model.dart |  2 +-
 .../infrastructure/action.provider.dart       | 28 +++++++++
 .../timeline/multiselect.provider.dart        | 20 +++++-
 .../repositories/asset_api.repository.dart    |  9 +++
 mobile/lib/services/action.service.dart       | 36 +++++++++++
 16 files changed, 238 insertions(+), 56 deletions(-)
 rename mobile/lib/domain/models/asset/{asset.model.dart => remote_asset.model.dart} (70%)
 create mode 100644 mobile/lib/infrastructure/repositories/remote_asset.repository.dart
 create mode 100644 mobile/lib/providers/infrastructure/action.provider.dart
 create mode 100644 mobile/lib/services/action.service.dart

diff --git a/i18n/en.json b/i18n/en.json
index d61116f2a6..f3f1322045 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -983,6 +983,7 @@
   "failed_to_load_assets": "Failed to load assets",
   "failed_to_load_folder": "Failed to load folder",
   "favorite": "Favorite",
+  "favorite_action_prompt": "{count} added to Favorites",
   "favorite_or_unfavorite_photo": "Favorite or unfavorite photo",
   "favorites": "Favorites",
   "favorites_page_no_favorites": "No favorite assets found",
diff --git a/mobile/lib/constants/enums.dart b/mobile/lib/constants/enums.dart
index 4999c48660..febc71032e 100644
--- a/mobile/lib/constants/enums.dart
+++ b/mobile/lib/constants/enums.dart
@@ -12,3 +12,5 @@ enum TextSearchType {
 enum AssetVisibilityEnum { timeline, hidden, archive, locked }
 
 enum SortUserBy { id }
+
+enum ActionSource { timeline, viewer }
diff --git a/mobile/lib/domain/models/asset/base_asset.model.dart b/mobile/lib/domain/models/asset/base_asset.model.dart
index 509998a109..9833f9a682 100644
--- a/mobile/lib/domain/models/asset/base_asset.model.dart
+++ b/mobile/lib/domain/models/asset/base_asset.model.dart
@@ -1,4 +1,4 @@
-part 'asset.model.dart';
+part 'remote_asset.model.dart';
 part 'local_asset.model.dart';
 
 enum AssetType {
diff --git a/mobile/lib/domain/models/asset/asset.model.dart b/mobile/lib/domain/models/asset/remote_asset.model.dart
similarity index 70%
rename from mobile/lib/domain/models/asset/asset.model.dart
rename to mobile/lib/domain/models/asset/remote_asset.model.dart
index b0a0b0dfb9..608a03f2b2 100644
--- a/mobile/lib/domain/models/asset/asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -8,16 +8,18 @@ enum AssetVisibility {
 }
 
 // Model for an asset stored in the server
-class Asset extends BaseAsset {
+class RemoteAsset extends BaseAsset {
   final String id;
   final String? localId;
   final String? thumbHash;
   final AssetVisibility visibility;
+  final String ownerId;
 
-  const Asset({
+  const RemoteAsset({
     required this.id,
     this.localId,
     required super.name,
+    required this.ownerId,
     required super.checksum,
     required super.type,
     required super.createdAt,
@@ -37,16 +39,17 @@ class Asset extends BaseAsset {
   @override
   String toString() {
     return '''Asset {
-   id: $id,
-   name: $name,
-   type: $type,
-   createdAt: $createdAt,
-   updatedAt: $updatedAt,
-   width: ${width ?? "<NA>"},
-   height: ${height ?? "<NA>"},
-   durationInSeconds: ${durationInSeconds ?? "<NA>"},
-   localId: ${localId ?? "<NA>"},
-   isFavorite: $isFavorite,
+    id: $id,
+    name: $name,
+    ownerId: $ownerId,
+    type: $type,
+    createdAt: $createdAt,
+    updatedAt: $updatedAt,
+    width: ${width ?? "<NA>"},
+    height: ${height ?? "<NA>"},
+    durationInSeconds: ${durationInSeconds ?? "<NA>"},
+    localId: ${localId ?? "<NA>"},
+    isFavorite: $isFavorite,
     thumbHash: ${thumbHash ?? "<NA>"},
     visibility: $visibility,
  }''';
@@ -54,10 +57,11 @@ class Asset extends BaseAsset {
 
   @override
   bool operator ==(Object other) {
-    if (other is! Asset) return false;
+    if (other is! RemoteAsset) return false;
     if (identical(this, other)) return true;
     return super == other &&
         id == other.id &&
+        ownerId == other.ownerId &&
         localId == other.localId &&
         thumbHash == other.thumbHash &&
         visibility == other.visibility;
@@ -67,6 +71,7 @@ class Asset extends BaseAsset {
   int get hashCode =>
       super.hashCode ^
       id.hashCode ^
+      ownerId.hashCode ^
       localId.hashCode ^
       thumbHash.hashCode ^
       visibility.hashCode;
diff --git a/mobile/lib/infrastructure/entities/remote_asset.entity.dart b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
index bfe08346dd..c08401356c 100644
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
@@ -37,9 +37,10 @@ class RemoteAssetEntity extends Table
 }
 
 extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
-  Asset toDto() => Asset(
+  RemoteAsset toDto() => RemoteAsset(
         id: id,
         name: name,
+        ownerId: ownerId,
         checksum: checksum,
         type: type,
         createdAt: createdAt,
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
new file mode 100644
index 0000000000..ef347cfa75
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -0,0 +1,26 @@
+import 'package:drift/drift.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+
+final remoteAssetRepositoryProvider = Provider<RemoteAssetRepository>(
+  (ref) => RemoteAssetRepository(ref.watch(driftProvider)),
+);
+
+class RemoteAssetRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const RemoteAssetRepository(this._db) : super(_db);
+
+  Future<void> updateFavorite(List<String> ids, bool isFavorite) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteAssetEntity,
+          RemoteAssetEntityCompanion(isFavorite: Value(isFavorite)),
+          where: (e) => e.id.equals(id),
+        );
+      }
+    });
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 18abac99de..fcd92cb30c 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -70,36 +70,38 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     return _db.mergedAssetDrift
         .mergedAsset(userIds, limit: Limit(count, offset))
         .map(
-          (row) => row.remoteId != null
-              ? Asset(
-                  id: row.remoteId!,
-                  localId: row.localId,
-                  name: row.name,
-                  checksum: row.checksum,
-                  type: row.type,
-                  createdAt: row.createdAt,
-                  updatedAt: row.updatedAt,
-                  thumbHash: row.thumbHash,
-                  width: row.width,
-                  height: row.height,
-                  isFavorite: row.isFavorite,
-                  durationInSeconds: row.durationInSeconds,
-                )
-              : LocalAsset(
-                  id: row.localId!,
-                  remoteId: row.remoteId,
-                  name: row.name,
-                  checksum: row.checksum,
-                  type: row.type,
-                  createdAt: row.createdAt,
-                  updatedAt: row.updatedAt,
-                  width: row.width,
-                  height: row.height,
-                  isFavorite: row.isFavorite,
-                  durationInSeconds: row.durationInSeconds,
-                ),
-        )
-        .get();
+      (row) {
+        return row.remoteId != null && row.ownerId != null
+            ? RemoteAsset(
+                id: row.remoteId!,
+                localId: row.localId,
+                name: row.name,
+                ownerId: row.ownerId!,
+                checksum: row.checksum,
+                type: row.type,
+                createdAt: row.createdAt,
+                updatedAt: row.updatedAt,
+                thumbHash: row.thumbHash,
+                width: row.width,
+                height: row.height,
+                isFavorite: row.isFavorite,
+                durationInSeconds: row.durationInSeconds,
+              )
+            : LocalAsset(
+                id: row.localId!,
+                remoteId: row.remoteId,
+                name: row.name,
+                checksum: row.checksum,
+                type: row.type,
+                createdAt: row.createdAt,
+                updatedAt: row.updatedAt,
+                width: row.width,
+                height: row.height,
+                isFavorite: row.isFavorite,
+                durationInSeconds: row.durationInSeconds,
+              );
+      },
+    ).get();
   }
 
   Stream<List<Bucket>> watchLocalBucket(
diff --git a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
index 5c093c8fa0..5bf0566f20 100644
--- a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
@@ -1,16 +1,73 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class FavoriteActionButton extends ConsumerWidget {
-  const FavoriteActionButton({super.key});
+  final ActionSource source;
+
+  const FavoriteActionButton({super.key, required this.source});
+
+  onAction(BuildContext context, WidgetRef ref) {
+    switch (source) {
+      case ActionSource.timeline:
+        timelineAction(context, ref);
+      case ActionSource.viewer:
+        viewerAction(ref);
+    }
+  }
+
+  void timelineAction(BuildContext context, WidgetRef ref) {
+    final user = ref.read(currentUserProvider);
+    if (user == null) {
+      return;
+    }
+
+    final ids = ref
+        .read(multiSelectProvider.select((value) => value.selectedAssets))
+        .whereType<RemoteAsset>()
+        .where((asset) => asset.ownerId == user.id)
+        .map((asset) => asset.id)
+        .toList();
+
+    if (ids.isEmpty) {
+      return;
+    }
+
+    ref.read(actionProvider.notifier).favorite(ids);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final toastMessage = 'favorite_action_prompt'.t(
+      context: context,
+      args: {'count': ids.length.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: toastMessage,
+        gravity: ToastGravity.BOTTOM,
+      );
+    }
+  }
+
+  void viewerAction(WidgetRef _) {
+    UnimplementedError("Viewer action for favorite is not implemented yet.");
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.favorite_border_rounded,
       label: "favorite".t(context: context),
+      onPressed: () => onAction(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
index 0b5efc4bd1..d7677b77e8 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
@@ -35,7 +36,7 @@ class HomeBottomAppBar extends ConsumerWidget {
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(),
           const ArchiveActionButton(),
-          const FavoriteActionButton(),
+          const FavoriteActionButton(source: ActionSource.timeline),
           const DownloadActionButton(),
           isTrashEnable
               ? const TrashActionButton()
diff --git a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
index e9648ab06e..82aef61633 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
@@ -32,7 +32,7 @@ class Thumbnail extends StatelessWidget {
       );
     }
 
-    if (asset is Asset) {
+    if (asset is RemoteAsset) {
       return RemoteThumbProvider(
         assetId: asset.id,
         height: size.height,
@@ -45,7 +45,8 @@ class Thumbnail extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final thumbHash = asset is Asset ? (asset as Asset).thumbHash : null;
+    final thumbHash =
+        asset is RemoteAsset ? (asset as RemoteAsset).thumbHash : null;
     final provider = imageProvider(asset: asset, size: size);
 
     return OctoImage.fromSet(
diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index 7c2fbf4e21..ba02ea56e8 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -30,9 +30,8 @@ class ThumbnailTile extends ConsumerWidget {
         ? context.primaryColor.darken(amount: 0.6)
         : context.primaryColor.lighten(amount: 0.8);
 
-    final isSelected = ref
-        .watch(multiSelectProvider.select((state) => state.selectedAssets))
-        .contains(asset);
+    final multiselect = ref.watch(multiSelectProvider);
+    final isSelected = multiselect.selectedAssets.contains(asset);
 
     return Stack(
       children: [
diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
index 7cadff9ee2..4de9eaad38 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -185,7 +185,7 @@ class FixedSegment extends Segment {
   /// and prevents duplicate keys even when assets have the same name/timestamp
   String _generateUniqueKey(BaseAsset asset, int assetIndex) {
     // Try to get the most unique identifier based on asset type
-    if (asset is Asset) {
+    if (asset is RemoteAsset) {
       // For remote/merged assets, use the remote ID which is globally unique
       return 'asset_${asset.id}';
     } else if (asset is LocalAsset) {
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
new file mode 100644
index 0000000000..18b7378dd2
--- /dev/null
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -0,0 +1,28 @@
+import 'package:immich_mobile/services/action.service.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+final actionProvider = NotifierProvider<ActionNotifier, void>(
+  ActionNotifier.new,
+  dependencies: [
+    actionServiceProvider,
+  ],
+);
+
+class ActionNotifier extends Notifier<void> {
+  late final ActionService _service;
+
+  ActionNotifier() : super();
+
+  @override
+  void build() {
+    _service = ref.watch(actionServiceProvider);
+  }
+
+  Future<void> favorite(List<String> ids) async {
+    await _service.favorite(ids);
+  }
+
+  Future<void> unFavorite(List<String> ids) async {
+    await _service.unFavorite(ids);
+  }
+}
diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dart
index 1a4c0e4c65..1bd0ae1565 100644
--- a/mobile/lib/providers/timeline/multiselect.provider.dart
+++ b/mobile/lib/providers/timeline/multiselect.provider.dart
@@ -13,9 +13,11 @@ final multiSelectProvider =
 
 class MultiSelectState {
   final Set<BaseAsset> selectedAssets;
+  final int lastUpdatedTime;
 
   const MultiSelectState({
     required this.selectedAssets,
+    required this.lastUpdatedTime,
   });
 
   bool get isEnabled => selectedAssets.isNotEmpty;
@@ -30,25 +32,29 @@ class MultiSelectState {
 
   MultiSelectState copyWith({
     Set<BaseAsset>? selectedAssets,
+    int? lastUpdatedTime,
   }) {
     return MultiSelectState(
       selectedAssets: selectedAssets ?? this.selectedAssets,
+      lastUpdatedTime: lastUpdatedTime ?? this.lastUpdatedTime,
     );
   }
 
   @override
-  String toString() => 'MultiSelectState(selectedAssets: $selectedAssets)';
+  String toString() =>
+      'MultiSelectState(selectedAssets: $selectedAssets, lastUpdatedTime: $lastUpdatedTime)';
 
   @override
   bool operator ==(covariant MultiSelectState other) {
     if (identical(this, other)) return true;
     final listEquals = const DeepCollectionEquality().equals;
 
-    return listEquals(other.selectedAssets, selectedAssets);
+    return listEquals(other.selectedAssets, selectedAssets) &&
+        other.lastUpdatedTime == lastUpdatedTime;
   }
 
   @override
-  int get hashCode => selectedAssets.hashCode;
+  int get hashCode => selectedAssets.hashCode ^ lastUpdatedTime.hashCode;
 }
 
 class MultiSelectNotifier extends Notifier<MultiSelectState> {
@@ -60,6 +66,7 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
 
     return const MultiSelectState(
       selectedAssets: {},
+      lastUpdatedTime: 0,
     );
   }
 
@@ -97,6 +104,13 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
     );
   }
 
+  void reset() {
+    state = MultiSelectState(
+      selectedAssets: {},
+      lastUpdatedTime: DateTime.now().millisecondsSinceEpoch,
+    );
+  }
+
   /// Bucket bulk operations
   void selectBucket(int offset, int bucketCount) async {
     final assets = await _timelineService.loadAssets(offset, bucketCount);
diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dart
index 49dbf74304..923a214015 100644
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -56,6 +56,15 @@ class AssetApiRepository extends ApiRepository {
     );
   }
 
+  Future<void> updateFavorite(
+    List<String> ids,
+    bool isFavorite,
+  ) async {
+    return _api.updateAssets(
+      AssetBulkUpdateDto(ids: ids, isFavorite: isFavorite),
+    );
+  }
+
   _mapVisibility(AssetVisibilityEnum visibility) => switch (visibility) {
         AssetVisibilityEnum.timeline => AssetVisibility.timeline,
         AssetVisibilityEnum.hidden => AssetVisibility.hidden,
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
new file mode 100644
index 0000000000..9affff9804
--- /dev/null
+++ b/mobile/lib/services/action.service.dart
@@ -0,0 +1,36 @@
+import 'package:flutter/foundation.dart';
+import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
+import 'package:immich_mobile/repositories/asset_api.repository.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+final actionServiceProvider = Provider<ActionService>(
+  (ref) => ActionService(
+    ref.watch(assetApiRepositoryProvider),
+    ref.watch(remoteAssetRepositoryProvider),
+  ),
+);
+
+class ActionService {
+  final AssetApiRepository _assetApiRepository;
+  final RemoteAssetRepository _remoteAssetRepository;
+
+  const ActionService(this._assetApiRepository, this._remoteAssetRepository);
+
+  Future<void> favorite(List<String> remoteIds) async {
+    try {
+      await _assetApiRepository.updateFavorite(remoteIds, true);
+      await _remoteAssetRepository.updateFavorite(remoteIds, true);
+    } catch (e) {
+      debugPrint('Error favoriting assets: $e');
+    }
+  }
+
+  Future<void> unFavorite(List<String> remoteIds) async {
+    try {
+      await _assetApiRepository.updateFavorite(remoteIds, false);
+      await _remoteAssetRepository.updateFavorite(remoteIds, false);
+    } catch (e) {
+      debugPrint('Error unfavoriting assets: $e');
+    }
+  }
+}

From 095ace8687a9ceaf53150f09be01238bc40a1e3c Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 30 Jun 2025 12:32:18 -0500
Subject: [PATCH 082/337] feat: shared link action (#19610)

---
 .../share_link_action_button.widget.dart      | 38 ++++++++++++++++++-
 .../home_bottom_app_bar.widget.dart           |  2 +-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
index c227df1b33..8b82b1c54e 100644
--- a/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
@@ -1,16 +1,52 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 
 class ShareLinkActionButton extends ConsumerWidget {
-  const ShareLinkActionButton({super.key});
+  final ActionSource source;
+
+  const ShareLinkActionButton({super.key, required this.source});
+
+  onAction(BuildContext context, WidgetRef ref) {
+    switch (source) {
+      case ActionSource.timeline:
+        timelineAction(context, ref);
+      case ActionSource.viewer:
+        viewerAction(ref);
+    }
+  }
+
+  void timelineAction(BuildContext context, WidgetRef ref) {
+    final ids = ref
+        .read(multiSelectProvider.select((value) => value.selectedAssets))
+        .whereType<RemoteAsset>()
+        .toList()
+        .map((asset) => asset.id)
+        .toList();
+
+    context.pushRoute(
+      SharedLinkEditRoute(
+        assetsList: ids,
+      ),
+    );
+  }
+
+  void viewerAction(WidgetRef _) {
+    UnimplementedError("Viewer action for favorite is not implemented yet.");
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.link_rounded,
       label: "share_link".t(context: context),
+      onPressed: () => onAction(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
index d7677b77e8..e2c2c2898f 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
@@ -34,7 +34,7 @@ class HomeBottomAppBar extends ConsumerWidget {
       actions: [
         const ShareActionButton(),
         if (multiselect.hasRemote) ...[
-          const ShareLinkActionButton(),
+          const ShareLinkActionButton(source: ActionSource.timeline),
           const ArchiveActionButton(),
           const FavoriteActionButton(source: ActionSource.timeline),
           const DownloadActionButton(),

From 181a7e115f365ee82f31287f4e6002000f7b971e Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 30 Jun 2025 15:26:41 -0400
Subject: [PATCH 083/337] feat: sync stacks (#19629)

---
 mobile/openapi/README.md                      |   2 +
 mobile/openapi/lib/api.dart                   |   2 +
 mobile/openapi/lib/api_client.dart            |   4 +
 .../openapi/lib/model/sync_entity_type.dart   |   6 +
 .../openapi/lib/model/sync_request_type.dart  |   3 +
 .../lib/model/sync_stack_delete_v1.dart       |  99 +++++++++++++
 mobile/openapi/lib/model/sync_stack_v1.dart   | 131 ++++++++++++++++++
 open-api/immich-openapi-specs.json            |  45 +++++-
 open-api/typescript-sdk/src/fetch-client.ts   |   5 +-
 server/src/dtos/sync.dto.ts                   |  16 +++
 server/src/enum.ts                            |   4 +
 server/src/queries/sync.repository.sql        |  28 ++++
 server/src/repositories/stack.repository.ts   |  17 +--
 server/src/repositories/sync.repository.ts    |  30 +++-
 server/src/schema/functions.ts                |  14 ++
 server/src/schema/index.ts                    |   5 +
 .../1751304834247-StackSyncChanges.ts         |  43 ++++++
 server/src/schema/tables/album-asset.table.ts |   1 -
 server/src/schema/tables/album-user.table.ts  |   1 -
 server/src/schema/tables/album.table.ts       |   1 -
 server/src/schema/tables/asset.table.ts       |   1 -
 server/src/schema/tables/index.ts             |  35 -----
 .../src/schema/tables/memory-asset.table.ts   |   1 -
 server/src/schema/tables/memory.table.ts      |   1 -
 server/src/schema/tables/partner.table.ts     |   1 -
 server/src/schema/tables/stack-audit.table.ts |  17 +++
 server/src/schema/tables/stack.table.ts       |  29 +++-
 server/src/schema/tables/user.table.ts        |   1 -
 server/src/services/stack.service.ts          |   2 +-
 server/src/services/sync.service.ts           |  16 +++
 .../decorators/trigger-function.decorator.ts  |   6 +-
 server/test/medium.factory.ts                 |  16 +++
 .../specs/services/audit.database.spec.ts     |  16 ++-
 .../test/medium/specs/sync/sync-stack.spec.ts | 107 ++++++++++++++
 .../sql-tools/trigger-after-delete.stub.ts    |   2 +-
 35 files changed, 646 insertions(+), 62 deletions(-)
 create mode 100644 mobile/openapi/lib/model/sync_stack_delete_v1.dart
 create mode 100644 mobile/openapi/lib/model/sync_stack_v1.dart
 create mode 100644 server/src/schema/migrations/1751304834247-StackSyncChanges.ts
 delete mode 100644 server/src/schema/tables/index.ts
 create mode 100644 server/src/schema/tables/stack-audit.table.ts
 create mode 100644 server/test/medium/specs/sync/sync-stack.spec.ts

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index d9607ef2ec..1beaec0ae6 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -482,6 +482,8 @@ Class | Method | HTTP request | Description
  - [SyncPartnerDeleteV1](doc//SyncPartnerDeleteV1.md)
  - [SyncPartnerV1](doc//SyncPartnerV1.md)
  - [SyncRequestType](doc//SyncRequestType.md)
+ - [SyncStackDeleteV1](doc//SyncStackDeleteV1.md)
+ - [SyncStackV1](doc//SyncStackV1.md)
  - [SyncStreamDto](doc//SyncStreamDto.md)
  - [SyncUserDeleteV1](doc//SyncUserDeleteV1.md)
  - [SyncUserV1](doc//SyncUserV1.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index 67f75fba38..3998961720 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -265,6 +265,8 @@ part 'model/sync_memory_v1.dart';
 part 'model/sync_partner_delete_v1.dart';
 part 'model/sync_partner_v1.dart';
 part 'model/sync_request_type.dart';
+part 'model/sync_stack_delete_v1.dart';
+part 'model/sync_stack_v1.dart';
 part 'model/sync_stream_dto.dart';
 part 'model/sync_user_delete_v1.dart';
 part 'model/sync_user_v1.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index d0f7837bc9..0edc2638bc 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -586,6 +586,10 @@ class ApiClient {
           return SyncPartnerV1.fromJson(value);
         case 'SyncRequestType':
           return SyncRequestTypeTypeTransformer().decode(value);
+        case 'SyncStackDeleteV1':
+          return SyncStackDeleteV1.fromJson(value);
+        case 'SyncStackV1':
+          return SyncStackV1.fromJson(value);
         case 'SyncStreamDto':
           return SyncStreamDto.fromJson(value);
         case 'SyncUserDeleteV1':
diff --git a/mobile/openapi/lib/model/sync_entity_type.dart b/mobile/openapi/lib/model/sync_entity_type.dart
index fb530240ed..7c28ae6265 100644
--- a/mobile/openapi/lib/model/sync_entity_type.dart
+++ b/mobile/openapi/lib/model/sync_entity_type.dart
@@ -51,6 +51,8 @@ class SyncEntityType {
   static const memoryDeleteV1 = SyncEntityType._(r'MemoryDeleteV1');
   static const memoryToAssetV1 = SyncEntityType._(r'MemoryToAssetV1');
   static const memoryToAssetDeleteV1 = SyncEntityType._(r'MemoryToAssetDeleteV1');
+  static const stackV1 = SyncEntityType._(r'StackV1');
+  static const stackDeleteV1 = SyncEntityType._(r'StackDeleteV1');
   static const syncAckV1 = SyncEntityType._(r'SyncAckV1');
 
   /// List of all possible values in this [enum][SyncEntityType].
@@ -83,6 +85,8 @@ class SyncEntityType {
     memoryDeleteV1,
     memoryToAssetV1,
     memoryToAssetDeleteV1,
+    stackV1,
+    stackDeleteV1,
     syncAckV1,
   ];
 
@@ -150,6 +154,8 @@ class SyncEntityTypeTypeTransformer {
         case r'MemoryDeleteV1': return SyncEntityType.memoryDeleteV1;
         case r'MemoryToAssetV1': return SyncEntityType.memoryToAssetV1;
         case r'MemoryToAssetDeleteV1': return SyncEntityType.memoryToAssetDeleteV1;
+        case r'StackV1': return SyncEntityType.stackV1;
+        case r'StackDeleteV1': return SyncEntityType.stackDeleteV1;
         case r'SyncAckV1': return SyncEntityType.syncAckV1;
         default:
           if (!allowNull) {
diff --git a/mobile/openapi/lib/model/sync_request_type.dart b/mobile/openapi/lib/model/sync_request_type.dart
index 21b71dbc5b..e30a509b99 100644
--- a/mobile/openapi/lib/model/sync_request_type.dart
+++ b/mobile/openapi/lib/model/sync_request_type.dart
@@ -36,6 +36,7 @@ class SyncRequestType {
   static const albumAssetExifsV1 = SyncRequestType._(r'AlbumAssetExifsV1');
   static const memoriesV1 = SyncRequestType._(r'MemoriesV1');
   static const memoryToAssetsV1 = SyncRequestType._(r'MemoryToAssetsV1');
+  static const stacksV1 = SyncRequestType._(r'StacksV1');
 
   /// List of all possible values in this [enum][SyncRequestType].
   static const values = <SyncRequestType>[
@@ -52,6 +53,7 @@ class SyncRequestType {
     albumAssetExifsV1,
     memoriesV1,
     memoryToAssetsV1,
+    stacksV1,
   ];
 
   static SyncRequestType? fromJson(dynamic value) => SyncRequestTypeTypeTransformer().decode(value);
@@ -103,6 +105,7 @@ class SyncRequestTypeTypeTransformer {
         case r'AlbumAssetExifsV1': return SyncRequestType.albumAssetExifsV1;
         case r'MemoriesV1': return SyncRequestType.memoriesV1;
         case r'MemoryToAssetsV1': return SyncRequestType.memoryToAssetsV1;
+        case r'StacksV1': return SyncRequestType.stacksV1;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');
diff --git a/mobile/openapi/lib/model/sync_stack_delete_v1.dart b/mobile/openapi/lib/model/sync_stack_delete_v1.dart
new file mode 100644
index 0000000000..22c6d99a52
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_stack_delete_v1.dart
@@ -0,0 +1,99 @@
+//
+// 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 SyncStackDeleteV1 {
+  /// Returns a new [SyncStackDeleteV1] instance.
+  SyncStackDeleteV1({
+    required this.stackId,
+  });
+
+  String stackId;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncStackDeleteV1 &&
+    other.stackId == stackId;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (stackId.hashCode);
+
+  @override
+  String toString() => 'SyncStackDeleteV1[stackId=$stackId]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'stackId'] = this.stackId;
+    return json;
+  }
+
+  /// Returns a new [SyncStackDeleteV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncStackDeleteV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncStackDeleteV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncStackDeleteV1(
+        stackId: mapValueOfType<String>(json, r'stackId')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncStackDeleteV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncStackDeleteV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncStackDeleteV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncStackDeleteV1> mapFromJson(dynamic json) {
+    final map = <String, SyncStackDeleteV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncStackDeleteV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncStackDeleteV1-objects as value to a dart map
+  static Map<String, List<SyncStackDeleteV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncStackDeleteV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncStackDeleteV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'stackId',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_stack_v1.dart b/mobile/openapi/lib/model/sync_stack_v1.dart
new file mode 100644
index 0000000000..c65affe8c0
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_stack_v1.dart
@@ -0,0 +1,131 @@
+//
+// 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 SyncStackV1 {
+  /// Returns a new [SyncStackV1] instance.
+  SyncStackV1({
+    required this.createdAt,
+    required this.id,
+    required this.ownerId,
+    required this.primaryAssetId,
+    required this.updatedAt,
+  });
+
+  DateTime createdAt;
+
+  String id;
+
+  String ownerId;
+
+  String primaryAssetId;
+
+  DateTime updatedAt;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncStackV1 &&
+    other.createdAt == createdAt &&
+    other.id == id &&
+    other.ownerId == ownerId &&
+    other.primaryAssetId == primaryAssetId &&
+    other.updatedAt == updatedAt;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (createdAt.hashCode) +
+    (id.hashCode) +
+    (ownerId.hashCode) +
+    (primaryAssetId.hashCode) +
+    (updatedAt.hashCode);
+
+  @override
+  String toString() => 'SyncStackV1[createdAt=$createdAt, id=$id, ownerId=$ownerId, primaryAssetId=$primaryAssetId, updatedAt=$updatedAt]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'createdAt'] = this.createdAt.toUtc().toIso8601String();
+      json[r'id'] = this.id;
+      json[r'ownerId'] = this.ownerId;
+      json[r'primaryAssetId'] = this.primaryAssetId;
+      json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
+    return json;
+  }
+
+  /// Returns a new [SyncStackV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncStackV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncStackV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncStackV1(
+        createdAt: mapDateTime(json, r'createdAt', r'')!,
+        id: mapValueOfType<String>(json, r'id')!,
+        ownerId: mapValueOfType<String>(json, r'ownerId')!,
+        primaryAssetId: mapValueOfType<String>(json, r'primaryAssetId')!,
+        updatedAt: mapDateTime(json, r'updatedAt', r'')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncStackV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncStackV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncStackV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncStackV1> mapFromJson(dynamic json) {
+    final map = <String, SyncStackV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncStackV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncStackV1-objects as value to a dart map
+  static Map<String, List<SyncStackV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncStackV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncStackV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'createdAt',
+    'id',
+    'ownerId',
+    'primaryAssetId',
+    'updatedAt',
+  };
+}
+
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 5859331614..eda16498ad 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13820,6 +13820,8 @@
           "MemoryDeleteV1",
           "MemoryToAssetV1",
           "MemoryToAssetDeleteV1",
+          "StackV1",
+          "StackDeleteV1",
           "SyncAckV1"
         ],
         "type": "string"
@@ -13983,10 +13985,51 @@
           "AlbumAssetsV1",
           "AlbumAssetExifsV1",
           "MemoriesV1",
-          "MemoryToAssetsV1"
+          "MemoryToAssetsV1",
+          "StacksV1"
         ],
         "type": "string"
       },
+      "SyncStackDeleteV1": {
+        "properties": {
+          "stackId": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "stackId"
+        ],
+        "type": "object"
+      },
+      "SyncStackV1": {
+        "properties": {
+          "createdAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "id": {
+            "type": "string"
+          },
+          "ownerId": {
+            "type": "string"
+          },
+          "primaryAssetId": {
+            "type": "string"
+          },
+          "updatedAt": {
+            "format": "date-time",
+            "type": "string"
+          }
+        },
+        "required": [
+          "createdAt",
+          "id",
+          "ownerId",
+          "primaryAssetId",
+          "updatedAt"
+        ],
+        "type": "object"
+      },
       "SyncStreamDto": {
         "properties": {
           "types": {
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index a7016df710..5b98e094c2 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -4089,6 +4089,8 @@ export enum SyncEntityType {
     MemoryDeleteV1 = "MemoryDeleteV1",
     MemoryToAssetV1 = "MemoryToAssetV1",
     MemoryToAssetDeleteV1 = "MemoryToAssetDeleteV1",
+    StackV1 = "StackV1",
+    StackDeleteV1 = "StackDeleteV1",
     SyncAckV1 = "SyncAckV1"
 }
 export enum SyncRequestType {
@@ -4104,7 +4106,8 @@ export enum SyncRequestType {
     AlbumAssetsV1 = "AlbumAssetsV1",
     AlbumAssetExifsV1 = "AlbumAssetExifsV1",
     MemoriesV1 = "MemoriesV1",
-    MemoryToAssetsV1 = "MemoryToAssetsV1"
+    MemoryToAssetsV1 = "MemoryToAssetsV1",
+    StacksV1 = "StacksV1"
 }
 export enum TranscodeHWAccel {
     Nvenc = "nvenc",
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index 77f0578c36..c972983a1f 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -219,6 +219,20 @@ export class SyncMemoryAssetDeleteV1 {
   assetId!: string;
 }
 
+@ExtraModel()
+export class SyncStackV1 {
+  id!: string;
+  createdAt!: Date;
+  updatedAt!: Date;
+  primaryAssetId!: string;
+  ownerId!: string;
+}
+
+@ExtraModel()
+export class SyncStackDeleteV1 {
+  stackId!: string;
+}
+
 @ExtraModel()
 export class SyncAckV1 {}
 
@@ -251,6 +265,8 @@ export type SyncItem = {
   [SyncEntityType.MemoryDeleteV1]: SyncMemoryDeleteV1;
   [SyncEntityType.MemoryToAssetV1]: SyncMemoryAssetV1;
   [SyncEntityType.MemoryToAssetDeleteV1]: SyncMemoryAssetDeleteV1;
+  [SyncEntityType.StackV1]: SyncStackV1;
+  [SyncEntityType.StackDeleteV1]: SyncStackDeleteV1;
   [SyncEntityType.SyncAckV1]: SyncAckV1;
 };
 
diff --git a/server/src/enum.ts b/server/src/enum.ts
index 4a89baa6bd..706b5c876f 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -586,6 +586,7 @@ export enum SyncRequestType {
   AlbumAssetExifsV1 = 'AlbumAssetExifsV1',
   MemoriesV1 = 'MemoriesV1',
   MemoryToAssetsV1 = 'MemoryToAssetsV1',
+  StacksV1 = 'StacksV1',
 }
 
 export enum SyncEntityType {
@@ -627,6 +628,9 @@ export enum SyncEntityType {
   MemoryToAssetV1 = 'MemoryToAssetV1',
   MemoryToAssetDeleteV1 = 'MemoryToAssetDeleteV1',
 
+  StackV1 = 'StackV1',
+  StackDeleteV1 = 'StackDeleteV1',
+
   SyncAckV1 = 'SyncAckV1',
 }
 
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index bbd327ff69..42c386a372 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -689,6 +689,34 @@ where
 order by
   "updateId" asc
 
+-- SyncRepository.stack.getDeletes
+select
+  "id",
+  "stackId"
+from
+  "stacks_audit"
+where
+  "userId" = $1
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
+-- SyncRepository.stack.getUpserts
+select
+  "id",
+  "createdAt",
+  "updatedAt",
+  "primaryAssetId",
+  "ownerId",
+  "updateId"
+from
+  "asset_stack"
+where
+  "ownerId" = $1
+  and "updatedAt" < now() - interval '1 millisecond'
+order by
+  "updateId" asc
+
 -- SyncRepository.user.getDeletes
 select
   "id",
diff --git a/server/src/repositories/stack.repository.ts b/server/src/repositories/stack.repository.ts
index b7ee46c671..c049a19373 100644
--- a/server/src/repositories/stack.repository.ts
+++ b/server/src/repositories/stack.repository.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { ExpressionBuilder, Kysely, Updateable } from 'kysely';
+import { ExpressionBuilder, Insertable, Kysely, Updateable } from 'kysely';
 import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { columns } from 'src/database';
@@ -55,12 +55,12 @@ export class StackRepository {
       .execute();
   }
 
-  async create(entity: { ownerId: string; assetIds: string[] }) {
+  async create(entity: Omit<Insertable<StackTable>, 'primaryAssetId'>, assetIds: string[]) {
     return this.db.transaction().execute(async (tx) => {
       const stacks = await tx
         .selectFrom('asset_stack')
         .where('asset_stack.ownerId', '=', entity.ownerId)
-        .where('asset_stack.primaryAssetId', 'in', entity.assetIds)
+        .where('asset_stack.primaryAssetId', 'in', assetIds)
         .select('asset_stack.id')
         .select((eb) =>
           jsonArrayFrom(
@@ -73,13 +73,13 @@ export class StackRepository {
         )
         .execute();
 
-      const assetIds = new Set<string>(entity.assetIds);
+      const uniqueIds = new Set<string>(assetIds);
 
       // children
       for (const stack of stacks) {
         if (stack.assets && stack.assets.length > 0) {
           for (const asset of stack.assets) {
-            assetIds.add(asset.id);
+            uniqueIds.add(asset.id);
           }
         }
       }
@@ -97,10 +97,7 @@ export class StackRepository {
 
       const newRecord = await tx
         .insertInto('asset_stack')
-        .values({
-          ownerId: entity.ownerId,
-          primaryAssetId: entity.assetIds[0],
-        })
+        .values({ ...entity, primaryAssetId: assetIds[0] })
         .returning('id')
         .executeTakeFirstOrThrow();
 
@@ -110,7 +107,7 @@ export class StackRepository {
           stackId: newRecord.id,
           updatedAt: new Date(),
         })
-        .where('id', 'in', [...assetIds])
+        .where('id', 'in', [...uniqueIds])
         .execute();
 
       return tx
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index 73a1aca749..593847b426 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -14,7 +14,8 @@ type AuditTables =
   | 'album_users_audit'
   | 'album_assets_audit'
   | 'memories_audit'
-  | 'memory_assets_audit';
+  | 'memory_assets_audit'
+  | 'stacks_audit';
 type UpsertTables =
   | 'users'
   | 'partners'
@@ -23,7 +24,8 @@ type UpsertTables =
   | 'albums'
   | 'albums_shared_users_users'
   | 'memories'
-  | 'memories_assets_assets';
+  | 'memories_assets_assets'
+  | 'asset_stack';
 
 @Injectable()
 export class SyncRepository {
@@ -39,6 +41,7 @@ export class SyncRepository {
   partner: PartnerSync;
   partnerAsset: PartnerAssetsSync;
   partnerAssetExif: PartnerAssetExifsSync;
+  stack: StackSync;
   user: UserSync;
 
   constructor(@InjectKysely() private db: Kysely<DB>) {
@@ -54,6 +57,7 @@ export class SyncRepository {
     this.partner = new PartnerSync(this.db);
     this.partnerAsset = new PartnerAssetsSync(this.db);
     this.partnerAssetExif = new PartnerAssetExifsSync(this.db);
+    this.stack = new StackSync(this.db);
     this.user = new UserSync(this.db);
   }
 }
@@ -533,6 +537,28 @@ class PartnerAssetExifsSync extends BaseSync {
   }
 }
 
+class StackSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getDeletes(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('stacks_audit')
+      .select(['id', 'stackId'])
+      .where('userId', '=', userId)
+      .$call((qb) => this.auditTableFilters(qb, ack))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('asset_stack')
+      .select(['id', 'createdAt', 'updatedAt', 'primaryAssetId', 'ownerId', 'updateId'])
+      .where('ownerId', '=', userId)
+      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .stream();
+  }
+}
+
 class UserSync extends BaseSync {
   @GenerateSql({ params: [], stream: true })
   getDeletes(ack?: SyncAck) {
diff --git a/server/src/schema/functions.ts b/server/src/schema/functions.ts
index 279eb62a24..d4c97e1966 100644
--- a/server/src/schema/functions.ts
+++ b/server/src/schema/functions.ts
@@ -204,3 +204,17 @@ export const memory_assets_delete_audit = registerFunction({
     END`,
   synchronize: false,
 });
+
+export const stacks_delete_audit = registerFunction({
+  name: 'stacks_delete_audit',
+  returnType: 'TRIGGER',
+  language: 'PLPGSQL',
+  body: `
+    BEGIN
+      INSERT INTO stacks_audit ("stackId", "userId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END`,
+  synchronize: false,
+});
diff --git a/server/src/schema/index.ts b/server/src/schema/index.ts
index a8508b2c4b..6512ccc225 100644
--- a/server/src/schema/index.ts
+++ b/server/src/schema/index.ts
@@ -11,6 +11,7 @@ import {
   memories_delete_audit,
   memory_assets_delete_audit,
   partners_delete_audit,
+  stacks_delete_audit,
   updated_at,
   users_delete_audit,
 } from 'src/schema/functions';
@@ -46,6 +47,7 @@ import { SessionTable } from 'src/schema/tables/session.table';
 import { SharedLinkAssetTable } from 'src/schema/tables/shared-link-asset.table';
 import { SharedLinkTable } from 'src/schema/tables/shared-link.table';
 import { SmartSearchTable } from 'src/schema/tables/smart-search.table';
+import { StackAuditTable } from 'src/schema/tables/stack-audit.table';
 import { StackTable } from 'src/schema/tables/stack.table';
 import { SessionSyncCheckpointTable } from 'src/schema/tables/sync-checkpoint.table';
 import { SystemMetadataTable } from 'src/schema/tables/system-metadata.table';
@@ -95,6 +97,7 @@ export class ImmichDatabase {
     SharedLinkTable,
     SmartSearchTable,
     StackTable,
+    StackAuditTable,
     SessionSyncCheckpointTable,
     SystemMetadataTable,
     TagTable,
@@ -120,6 +123,7 @@ export class ImmichDatabase {
     album_users_delete_audit,
     memories_delete_audit,
     memory_assets_delete_audit,
+    stacks_delete_audit,
   ];
 
   enum = [assets_status_enum, asset_face_source_type, asset_visibility_enum];
@@ -167,6 +171,7 @@ export interface DB {
   shared_link__asset: SharedLinkAssetTable;
   shared_links: SharedLinkTable;
   smart_search: SmartSearchTable;
+  stacks_audit: StackAuditTable;
   system_metadata: SystemMetadataTable;
   tag_asset: TagAssetTable;
   tags: TagTable;
diff --git a/server/src/schema/migrations/1751304834247-StackSyncChanges.ts b/server/src/schema/migrations/1751304834247-StackSyncChanges.ts
new file mode 100644
index 0000000000..83744988b9
--- /dev/null
+++ b/server/src/schema/migrations/1751304834247-StackSyncChanges.ts
@@ -0,0 +1,43 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`CREATE TABLE "stacks_audit" ("id" uuid NOT NULL DEFAULT immich_uuid_v7(), "stackId" uuid NOT NULL, "userId" uuid NOT NULL, "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp());`.execute(db);
+  await sql`ALTER TABLE "asset_stack" ADD "createdAt" timestamp with time zone NOT NULL DEFAULT now();`.execute(db);
+  await sql`ALTER TABLE "asset_stack" ADD "updatedAt" timestamp with time zone NOT NULL DEFAULT now();`.execute(db);
+  await sql`ALTER TABLE "asset_stack" ADD "updateId" uuid NOT NULL DEFAULT immich_uuid_v7();`.execute(db);
+  await sql`ALTER TABLE "stacks_audit" ADD CONSTRAINT "PK_dbe4ec648fa032e8973297de07e" PRIMARY KEY ("id");`.execute(db);
+  await sql`CREATE INDEX "IDX_stacks_audit_deleted_at" ON "stacks_audit" ("deletedAt")`.execute(db);
+    await sql`CREATE OR REPLACE FUNCTION stacks_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO stacks_audit ("stackId", "userId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "stacks_delete_audit"
+  AFTER DELETE ON "asset_stack"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION stacks_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "stacks_updated_at"
+  BEFORE UPDATE ON "asset_stack"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`DROP TRIGGER "stacks_delete_audit" ON "asset_stack";`.execute(db);
+  await sql`DROP TRIGGER "stacks_updated_at" ON "asset_stack";`.execute(db);
+  await sql`DROP INDEX "IDX_stacks_audit_deleted_at";`.execute(db);
+  await sql`ALTER TABLE "stacks_audit" DROP CONSTRAINT "PK_dbe4ec648fa032e8973297de07e";`.execute(db);
+  await sql`ALTER TABLE "asset_stack" DROP COLUMN "createdAt";`.execute(db);
+  await sql`ALTER TABLE "asset_stack" DROP COLUMN "updatedAt";`.execute(db);
+  await sql`ALTER TABLE "asset_stack" DROP COLUMN "updateId";`.execute(db);
+  await sql`DROP TABLE "stacks_audit";`.execute(db);
+  await sql`DROP FUNCTION stacks_delete_audit;`.execute(db);
+}
diff --git a/server/src/schema/tables/album-asset.table.ts b/server/src/schema/tables/album-asset.table.ts
index f0841edc44..9b97db7ea0 100644
--- a/server/src/schema/tables/album-asset.table.ts
+++ b/server/src/schema/tables/album-asset.table.ts
@@ -15,7 +15,6 @@ import {
 @Table({ name: 'albums_assets_assets', primaryConstraintName: 'PK_c67bc36fa845fb7b18e0e398180' })
 @UpdatedAtTrigger('album_assets_updated_at')
 @AfterDeleteTrigger({
-  name: 'album_assets_delete_audit',
   scope: 'statement',
   function: album_assets_delete_audit,
   referencingOldTableAs: 'old',
diff --git a/server/src/schema/tables/album-user.table.ts b/server/src/schema/tables/album-user.table.ts
index 65e3db7185..e8ed720eef 100644
--- a/server/src/schema/tables/album-user.table.ts
+++ b/server/src/schema/tables/album-user.table.ts
@@ -28,7 +28,6 @@ import {
   function: album_user_after_insert,
 })
 @AfterDeleteTrigger({
-  name: 'album_users_delete_audit',
   scope: 'statement',
   function: album_users_delete_audit,
   referencingOldTableAs: 'old',
diff --git a/server/src/schema/tables/album.table.ts b/server/src/schema/tables/album.table.ts
index 509b7d2cec..e4cad8f469 100644
--- a/server/src/schema/tables/album.table.ts
+++ b/server/src/schema/tables/album.table.ts
@@ -19,7 +19,6 @@ import {
 @Table({ name: 'albums', primaryConstraintName: 'PK_7f71c7b5bc7c87b8f94c9a93a00' })
 @UpdatedAtTrigger('albums_updated_at')
 @AfterDeleteTrigger({
-  name: 'albums_delete_audit',
   scope: 'statement',
   function: albums_delete_audit,
   referencingOldTableAs: 'old',
diff --git a/server/src/schema/tables/asset.table.ts b/server/src/schema/tables/asset.table.ts
index 0a8120e656..fcbb0aec76 100644
--- a/server/src/schema/tables/asset.table.ts
+++ b/server/src/schema/tables/asset.table.ts
@@ -23,7 +23,6 @@ import { ASSET_CHECKSUM_CONSTRAINT } from 'src/utils/database';
 @Table('assets')
 @UpdatedAtTrigger('assets_updated_at')
 @AfterDeleteTrigger({
-  name: 'assets_delete_audit',
   scope: 'statement',
   function: assets_delete_audit,
   referencingOldTableAs: 'old',
diff --git a/server/src/schema/tables/index.ts b/server/src/schema/tables/index.ts
deleted file mode 100644
index 67b36ab351..0000000000
--- a/server/src/schema/tables/index.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import 'src/schema/tables/activity.table';
-import 'src/schema/tables/album-asset.table';
-import 'src/schema/tables/album-user.table';
-import 'src/schema/tables/album.table';
-import 'src/schema/tables/api-key.table';
-import 'src/schema/tables/asset-audit.table';
-import 'src/schema/tables/asset-face.table';
-import 'src/schema/tables/asset-files.table';
-import 'src/schema/tables/asset-job-status.table';
-import 'src/schema/tables/asset.table';
-import 'src/schema/tables/audit.table';
-import 'src/schema/tables/exif.table';
-import 'src/schema/tables/face-search.table';
-import 'src/schema/tables/geodata-places.table';
-import 'src/schema/tables/library.table';
-import 'src/schema/tables/memory-asset.table';
-import 'src/schema/tables/memory.table';
-import 'src/schema/tables/move.table';
-import 'src/schema/tables/natural-earth-countries.table';
-import 'src/schema/tables/partner-audit.table';
-import 'src/schema/tables/partner.table';
-import 'src/schema/tables/person.table';
-import 'src/schema/tables/session.table';
-import 'src/schema/tables/shared-link-asset.table';
-import 'src/schema/tables/shared-link.table';
-import 'src/schema/tables/smart-search.table';
-import 'src/schema/tables/stack.table';
-import 'src/schema/tables/sync-checkpoint.table';
-import 'src/schema/tables/system-metadata.table';
-import 'src/schema/tables/tag-asset.table';
-import 'src/schema/tables/tag-closure.table';
-import 'src/schema/tables/user-audit.table';
-import 'src/schema/tables/user-metadata.table';
-import 'src/schema/tables/user.table';
-import 'src/schema/tables/version-history.table';
diff --git a/server/src/schema/tables/memory-asset.table.ts b/server/src/schema/tables/memory-asset.table.ts
index c8ef9297be..7ccdcdc13d 100644
--- a/server/src/schema/tables/memory-asset.table.ts
+++ b/server/src/schema/tables/memory-asset.table.ts
@@ -15,7 +15,6 @@ import {
 @Table('memories_assets_assets')
 @UpdatedAtTrigger('memory_assets_updated_at')
 @AfterDeleteTrigger({
-  name: 'memory_assets_delete_audit',
   scope: 'statement',
   function: memory_assets_delete_audit,
   referencingOldTableAs: 'old',
diff --git a/server/src/schema/tables/memory.table.ts b/server/src/schema/tables/memory.table.ts
index 8345eacbed..30aef7e0a4 100644
--- a/server/src/schema/tables/memory.table.ts
+++ b/server/src/schema/tables/memory.table.ts
@@ -18,7 +18,6 @@ import {
 @Table('memories')
 @UpdatedAtTrigger('memories_updated_at')
 @AfterDeleteTrigger({
-  name: 'memories_delete_audit',
   scope: 'statement',
   function: memories_delete_audit,
   referencingOldTableAs: 'old',
diff --git a/server/src/schema/tables/partner.table.ts b/server/src/schema/tables/partner.table.ts
index a973f02320..dd5024832f 100644
--- a/server/src/schema/tables/partner.table.ts
+++ b/server/src/schema/tables/partner.table.ts
@@ -15,7 +15,6 @@ import {
 @Table('partners')
 @UpdatedAtTrigger('partners_updated_at')
 @AfterDeleteTrigger({
-  name: 'partners_delete_audit',
   scope: 'statement',
   function: partners_delete_audit,
   referencingOldTableAs: 'old',
diff --git a/server/src/schema/tables/stack-audit.table.ts b/server/src/schema/tables/stack-audit.table.ts
new file mode 100644
index 0000000000..01b628d081
--- /dev/null
+++ b/server/src/schema/tables/stack-audit.table.ts
@@ -0,0 +1,17 @@
+import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
+import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
+
+@Table('stacks_audit')
+export class StackAuditTable {
+  @PrimaryGeneratedUuidV7Column()
+  id!: Generated<string>;
+
+  @Column({ type: 'uuid' })
+  stackId!: string;
+
+  @Column({ type: 'uuid' })
+  userId!: string;
+
+  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_stacks_audit_deleted_at' })
+  deletedAt!: Generated<Timestamp>;
+}
diff --git a/server/src/schema/tables/stack.table.ts b/server/src/schema/tables/stack.table.ts
index 78700d82f9..fa206f24f2 100644
--- a/server/src/schema/tables/stack.table.ts
+++ b/server/src/schema/tables/stack.table.ts
@@ -1,12 +1,39 @@
+import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
+import { stacks_delete_audit } from 'src/schema/functions';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { UserTable } from 'src/schema/tables/user.table';
-import { ForeignKeyColumn, Generated, PrimaryGeneratedColumn, Table } from 'src/sql-tools';
+import {
+  AfterDeleteTrigger,
+  CreateDateColumn,
+  ForeignKeyColumn,
+  Generated,
+  PrimaryGeneratedColumn,
+  Table,
+  Timestamp,
+  UpdateDateColumn,
+} from 'src/sql-tools';
 
 @Table('asset_stack')
+@UpdatedAtTrigger('stacks_updated_at')
+@AfterDeleteTrigger({
+  scope: 'statement',
+  function: stacks_delete_audit,
+  referencingOldTableAs: 'old',
+  when: 'pg_trigger_depth() = 0',
+})
 export class StackTable {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;
 
+  @CreateDateColumn()
+  createdAt!: Generated<Timestamp>;
+
+  @UpdateDateColumn()
+  updatedAt!: Generated<Timestamp>;
+
+  @UpdateIdColumn()
+  updateId!: Generated<string>;
+
   //TODO: Add constraint to ensure primary asset exists in the assets array
   @ForeignKeyColumn(() => AssetTable, { nullable: false, unique: true })
   primaryAssetId!: string;
diff --git a/server/src/schema/tables/user.table.ts b/server/src/schema/tables/user.table.ts
index c4b32f571a..76b60521ac 100644
--- a/server/src/schema/tables/user.table.ts
+++ b/server/src/schema/tables/user.table.ts
@@ -18,7 +18,6 @@ import {
 @Table('users')
 @UpdatedAtTrigger('users_updated_at')
 @AfterDeleteTrigger({
-  name: 'users_delete_audit',
   scope: 'statement',
   function: users_delete_audit,
   referencingOldTableAs: 'old',
diff --git a/server/src/services/stack.service.ts b/server/src/services/stack.service.ts
index 29413109c5..831755fefb 100644
--- a/server/src/services/stack.service.ts
+++ b/server/src/services/stack.service.ts
@@ -19,7 +19,7 @@ export class StackService extends BaseService {
   async create(auth: AuthDto, dto: StackCreateDto): Promise<StackResponseDto> {
     await this.requireAccess({ auth, permission: Permission.ASSET_UPDATE, ids: dto.assetIds });
 
-    const stack = await this.stackRepository.create({ ownerId: auth.user.id, assetIds: dto.assetIds });
+    const stack = await this.stackRepository.create({ ownerId: auth.user.id }, dto.assetIds);
 
     await this.eventRepository.emit('stack.create', { stackId: stack.id, userId: auth.user.id });
 
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index bd3ce0da47..58cb294312 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -57,6 +57,7 @@ export const SYNC_TYPES_ORDER = [
   SyncRequestType.UsersV1,
   SyncRequestType.PartnersV1,
   SyncRequestType.AssetsV1,
+  SyncRequestType.StacksV1,
   SyncRequestType.PartnerAssetsV1,
   SyncRequestType.AlbumAssetsV1,
   SyncRequestType.AlbumsV1,
@@ -137,6 +138,7 @@ export class SyncService extends BaseService {
       [SyncRequestType.AlbumAssetExifsV1]: () => this.syncAlbumAssetExifsV1(response, checkpointMap, auth, sessionId),
       [SyncRequestType.MemoriesV1]: () => this.syncMemoriesV1(response, checkpointMap, auth),
       [SyncRequestType.MemoryToAssetsV1]: () => this.syncMemoryAssetsV1(response, checkpointMap, auth),
+      [SyncRequestType.StacksV1]: () => this.syncStackV1(response, checkpointMap, auth),
     };
 
     for (const type of SYNC_TYPES_ORDER.filter((type) => dto.types.includes(type))) {
@@ -510,6 +512,20 @@ export class SyncService extends BaseService {
     }
   }
 
+  private async syncStackV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
+    const deleteType = SyncEntityType.StackDeleteV1;
+    const deletes = this.syncRepository.stack.getDeletes(auth.user.id, checkpointMap[deleteType]);
+    for await (const { id, ...data } of deletes) {
+      send(response, { type: deleteType, ids: [id], data });
+    }
+
+    const upsertType = SyncEntityType.StackV1;
+    const upserts = this.syncRepository.stack.getUpserts(auth.user.id, checkpointMap[upsertType]);
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data });
+    }
+  }
+
   private async upsertBackfillCheckpoint(item: { type: SyncEntityType; sessionId: string; createId: string }) {
     const { type, sessionId, createId } = item;
     await this.syncCheckpointRepository.upsertAll([
diff --git a/server/src/sql-tools/from-code/decorators/trigger-function.decorator.ts b/server/src/sql-tools/from-code/decorators/trigger-function.decorator.ts
index 68ea286474..cb2fa36800 100644
--- a/server/src/sql-tools/from-code/decorators/trigger-function.decorator.ts
+++ b/server/src/sql-tools/from-code/decorators/trigger-function.decorator.ts
@@ -3,4 +3,8 @@ import { DatabaseFunction } from 'src/sql-tools/types';
 
 export type TriggerFunctionOptions = Omit<TriggerOptions, 'functionName'> & { function: DatabaseFunction };
 export const TriggerFunction = (options: TriggerFunctionOptions) =>
-  Trigger({ ...options, functionName: options.function.name });
+  Trigger({
+    name: options.function.name,
+    ...options,
+    functionName: options.function.name,
+  });
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index 6d1a75502b..44182602cd 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -25,6 +25,7 @@ import { PartnerRepository } from 'src/repositories/partner.repository';
 import { PersonRepository } from 'src/repositories/person.repository';
 import { SearchRepository } from 'src/repositories/search.repository';
 import { SessionRepository } from 'src/repositories/session.repository';
+import { StackRepository } from 'src/repositories/stack.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
 import { SyncCheckpointRepository } from 'src/repositories/sync-checkpoint.repository';
 import { SyncRepository } from 'src/repositories/sync.repository';
@@ -40,6 +41,7 @@ import { FaceSearchTable } from 'src/schema/tables/face-search.table';
 import { MemoryTable } from 'src/schema/tables/memory.table';
 import { PersonTable } from 'src/schema/tables/person.table';
 import { SessionTable } from 'src/schema/tables/session.table';
+import { StackTable } from 'src/schema/tables/stack.table';
 import { UserTable } from 'src/schema/tables/user.table';
 import { BASE_SERVICE_DEPENDENCIES, BaseService } from 'src/services/base.service';
 import { SyncService } from 'src/services/sync.service';
@@ -133,6 +135,19 @@ export class MediumTestContext<S extends BaseService = BaseService> {
     return { partner, result };
   }
 
+  async newStack(dto: Omit<Insertable<StackTable>, 'primaryAssetId'>, assetIds: string[]) {
+    const date = factory.date();
+    const stack = {
+      id: factory.uuid(),
+      createdAt: date,
+      updatedAt: date,
+      ...dto,
+    };
+
+    const result = await this.get(StackRepository).create(stack, assetIds);
+    return { stack: { ...stack, primaryAssetId: assetIds[0] }, result };
+  }
+
   async newAsset(dto: Partial<Insertable<AssetTable>> = {}) {
     const asset = mediumFactory.assetInsert(dto);
     const result = await this.get(AssetRepository).create(asset);
@@ -252,6 +267,7 @@ const newRealRepository = <T>(key: ClassConstructor<T>, db: Kysely<DB>): T => {
     case PersonRepository:
     case SearchRepository:
     case SessionRepository:
+    case StackRepository:
     case SyncRepository:
     case SyncCheckpointRepository:
     case SystemMetadataRepository:
diff --git a/server/test/medium/specs/services/audit.database.spec.ts b/server/test/medium/specs/services/audit.database.spec.ts
index 377736408c..8ca68cdb4a 100644
--- a/server/test/medium/specs/services/audit.database.spec.ts
+++ b/server/test/medium/specs/services/audit.database.spec.ts
@@ -1,7 +1,7 @@
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { PartnerRepository } from 'src/repositories/partner.repository';
 import { UserRepository } from 'src/repositories/user.repository';
-import { partners_delete_audit } from 'src/schema/functions';
+import { partners_delete_audit, stacks_delete_audit } from 'src/schema/functions';
 import { BaseService } from 'src/services/base.service';
 import { MediumTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
@@ -31,6 +31,20 @@ describe('audit', () => {
     });
   });
 
+  describe(stacks_delete_audit.name, () => {
+    it('should not cascade user deletes to stacks_audit', async () => {
+      const userRepo = ctx.get(UserRepository);
+      const { user } = await ctx.newUser();
+      const { asset: asset1 } = await ctx.newAsset({ ownerId: user.id });
+      const { asset: asset2 } = await ctx.newAsset({ ownerId: user.id });
+      await ctx.newStack({ ownerId: user.id }, [asset1.id, asset2.id]);
+      await userRepo.delete(user, true);
+      await expect(
+        ctx.database.selectFrom('stacks_audit').select(['id']).where('userId', '=', user.id).execute(),
+      ).resolves.toHaveLength(0);
+    });
+  });
+
   describe('assets_audit', () => {
     it('should not cascade user deletes to assets_audit', async () => {
       const userRepo = ctx.get(UserRepository);
diff --git a/server/test/medium/specs/sync/sync-stack.spec.ts b/server/test/medium/specs/sync/sync-stack.spec.ts
new file mode 100644
index 0000000000..1696172911
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-stack.spec.ts
@@ -0,0 +1,107 @@
+import { Kysely } from 'kysely';
+import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { StackRepository } from 'src/repositories/stack.repository';
+import { DB } from 'src/schema';
+import { SyncTestContext } from 'test/medium.factory';
+import { getKyselyDB } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(SyncEntityType.StackV1, () => {
+  it('should detect and sync the first stack', async () => {
+    const { auth, user, ctx } = await setup();
+    const { asset: asset1 } = await ctx.newAsset({ ownerId: user.id });
+    const { asset: asset2 } = await ctx.newAsset({ ownerId: user.id });
+    const { stack } = await ctx.newStack({ ownerId: user.id }, [asset1.id, asset2.id]);
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.StacksV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.stringContaining('StackV1'),
+        data: {
+          id: stack.id,
+          createdAt: (stack.createdAt as Date).toISOString(),
+          updatedAt: (stack.updatedAt as Date).toISOString(),
+          primaryAssetId: stack.primaryAssetId,
+          ownerId: stack.ownerId,
+        },
+        type: 'StackV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toEqual([]);
+  });
+
+  it('should detect and sync a deleted stack', async () => {
+    const { auth, user, ctx } = await setup();
+    const stackRepo = ctx.get(StackRepository);
+    const { asset: asset1 } = await ctx.newAsset({ ownerId: user.id });
+    const { asset: asset2 } = await ctx.newAsset({ ownerId: user.id });
+    const { stack } = await ctx.newStack({ ownerId: user.id }, [asset1.id, asset2.id]);
+    await stackRepo.delete(stack.id);
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.StacksV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.stringContaining('StackDeleteV1'),
+        data: { stackId: stack.id },
+        type: 'StackDeleteV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toEqual([]);
+  });
+
+  it('should sync a stack and then an update to that same stack', async () => {
+    const { auth, user, ctx } = await setup();
+    const stackRepo = ctx.get(StackRepository);
+    const { asset: asset1 } = await ctx.newAsset({ ownerId: user.id });
+    const { asset: asset2 } = await ctx.newAsset({ ownerId: user.id });
+    const { stack } = await ctx.newStack({ ownerId: user.id }, [asset1.id, asset2.id]);
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.StacksV1]);
+    expect(response).toHaveLength(1);
+    await ctx.syncAckAll(auth, response);
+
+    await stackRepo.update(stack.id, { primaryAssetId: asset2.id });
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.StacksV1]);
+    expect(newResponse).toHaveLength(1);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.stringContaining('StackV1'),
+        data: expect.objectContaining({ id: stack.id, primaryAssetId: asset2.id }),
+        type: 'StackV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toEqual([]);
+  });
+
+  it('should not sync a stack or stack delete for an unrelated user', async () => {
+    const { auth, ctx } = await setup();
+    const stackRepo = ctx.get(StackRepository);
+    const { user: user2 } = await ctx.newUser();
+    const { asset: asset1 } = await ctx.newAsset({ ownerId: user2.id });
+    const { asset: asset2 } = await ctx.newAsset({ ownerId: user2.id });
+    const { stack } = await ctx.newStack({ ownerId: user2.id }, [asset1.id, asset2.id]);
+
+    await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toEqual([]);
+    await stackRepo.delete(stack.id);
+    await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toEqual([]);
+  });
+});
diff --git a/server/test/sql-tools/trigger-after-delete.stub.ts b/server/test/sql-tools/trigger-after-delete.stub.ts
index 903fe2179e..1eb063c968 100644
--- a/server/test/sql-tools/trigger-after-delete.stub.ts
+++ b/server/test/sql-tools/trigger-after-delete.stub.ts
@@ -14,7 +14,7 @@ const test_fn = registerFunction({
 })
 export class Table1 {}
 
-export const description = 'should create a trigger ';
+export const description = 'should create a trigger';
 export const schema: DatabaseSchema = {
   name: 'postgres',
   schemaName: 'public',

From 53020852ecc26ab2d1a9c8fe3eaf653609b842ad Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 1 Jul 2025 03:33:47 +0800
Subject: [PATCH 084/337] fix(web): modal race condition (#19625)

* fix(web): modal race condition

* fix: translation

* fix: translation
---
 i18n/en.json                                 |  2 +-
 web/package-lock.json                        | 94 ++++++++++----------
 web/package.json                             |  2 +-
 web/src/lib/managers/modal-manager.svelte.ts |  2 +-
 web/src/routes/+layout.svelte                |  4 +-
 5 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index f3f1322045..92f2d3c35f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -702,7 +702,7 @@
   "daily_title_text_date": "E, MMM dd",
   "daily_title_text_date_year": "E, MMM dd, yyyy",
   "dark": "Dark",
-  "darkTheme": "Toggle dark theme",
+  "dark_theme": "Toggle dark theme",
   "date_after": "Date after",
   "date_and_time": "Date and Time",
   "date_before": "Date before",
diff --git a/web/package-lock.json b/web/package-lock.json
index 290dfaf23e..408fd7f00e 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@formatjs/icu-messageformat-parser": "^2.9.8",
         "@immich/sdk": "file:../open-api/typescript-sdk",
-        "@immich/ui": "^0.22.8",
+        "@immich/ui": "^0.23.2",
         "@mapbox/mapbox-gl-rtl-text": "0.2.3",
         "@mdi/js": "^7.4.47",
         "@photo-sphere-viewer/core": "^5.11.5",
@@ -790,28 +790,28 @@
       }
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.0.tgz",
-      "integrity": "sha512-FRdBLykrPPA6P76GGGqlex/e7fbe0F1ykgxHYNXQsH/iTEtjMj/f9bpY5oQqbjt5VgZvgz/uKXbGuROijh3VLA==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.2.tgz",
+      "integrity": "sha512-wNB5ooIKHQc+Kui96jE/n69rHFWAVoxn5CAzL1Xdd8FG03cgY3MLO+GF9U3W737fYDSgPWA6MReKhBQBop6Pcw==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.9"
+        "@floating-ui/utils": "^0.2.10"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.0.tgz",
-      "integrity": "sha512-lGTor4VlXcesUMh1cupTUTDoCxMb0V6bm3CnxHzQcw8Eaf1jQbgQX4i02fYgT0vJ82tb5MZ4CZk1LRGkktJCzg==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.2.tgz",
+      "integrity": "sha512-7cfaOQuCS27HD7DX+6ib2OrnW+b4ZBwDNnCcT0uTyidcmyWb03FnQqJybDBoCnpdxwBSfA94UAYlRCt7mV+TbA==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.7.0",
-        "@floating-ui/utils": "^0.2.9"
+        "@floating-ui/core": "^1.7.2",
+        "@floating-ui/utils": "^0.2.10"
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz",
-      "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
+      "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
       "license": "MIT"
     },
     "node_modules/@formatjs/ecma402-abstract": {
@@ -1333,14 +1333,14 @@
       "link": true
     },
     "node_modules/@immich/ui": {
-      "version": "0.22.8",
-      "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.22.8.tgz",
-      "integrity": "sha512-DVhDgz6drx7vfNhAssX4yYgOC3JpLm8uovLvz3n36skCNU6pm8GoSgH6gMGTM36sx5go3fvhHw5N3KR+A/7bjg==",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.23.2.tgz",
+      "integrity": "sha512-eBSZPp2f5ms0jX+fOUiJizY1IqzuGn6latsJa8Pk+wSK0HizLHA6weI3CJoyzPCrOn7L8rRja/pBr8JA/E0Z6g==",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@mdi/js": "^7.4.47",
-        "bits-ui": "^1.5.3",
-        "tailwind-merge": "^2.5.4",
+        "bits-ui": "^2.0.0",
+        "tailwind-merge": "^3.0.0",
         "tailwind-variants": "^1.0.0"
       },
       "peerDependencies": {
@@ -1348,10 +1348,11 @@
       }
     },
     "node_modules/@internationalized/date": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.8.1.tgz",
-      "integrity": "sha512-PgVE6B6eIZtzf9Gu5HvJxRK3ufUFz9DhspELuhW/N0GuMGMTLvPQNRkHP2hTuP9lblOk+f+1xi96sPiPXANXAA==",
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.8.2.tgz",
+      "integrity": "sha512-/wENk7CbvLbkUvX1tu0mwq49CVkkWpkXubGel6birjRPyo6uQ4nQpnq5xZu823zRCwwn82zgHrvgF1vZyvmVgA==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@swc/helpers": "^0.5.0"
       }
@@ -2254,6 +2255,7 @@
       "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
       "integrity": "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.8.0"
       }
@@ -3607,28 +3609,27 @@
       "license": "MIT"
     },
     "node_modules/bits-ui": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/bits-ui/-/bits-ui-1.5.3.tgz",
-      "integrity": "sha512-BTZ9/GU11DaEGyQp+AY+sXCMLZO0gbDC5J8l7+Ngj4Vf6hNOwrpMmoh5iuKktA6cphXYolVkUDgBWmkh415I+w==",
+      "version": "2.8.10",
+      "resolved": "https://registry.npmjs.org/bits-ui/-/bits-ui-2.8.10.tgz",
+      "integrity": "sha512-MOobkqapDZNrpcNmeL2g664xFmH4tZBOKBTxFmsQYMZQuybSZHQnPXy+AjM5XZEXRmCFx5+XRmo6+fC3vHh1hQ==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.6.4",
-        "@floating-ui/dom": "^1.6.7",
-        "@internationalized/date": "^3.5.6",
+        "@floating-ui/core": "^1.7.1",
+        "@floating-ui/dom": "^1.7.1",
         "esm-env": "^1.1.2",
-        "runed": "^0.23.2",
-        "svelte-toolbelt": "^0.7.1",
+        "runed": "^0.29.1",
+        "svelte-toolbelt": "^0.9.3",
         "tabbable": "^6.2.0"
       },
       "engines": {
-        "node": ">=18",
-        "pnpm": ">=8.7.0"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/huntabyte"
       },
       "peerDependencies": {
-        "svelte": "^5.11.0"
+        "@internationalized/date": "^3.8.1",
+        "svelte": "^5.33.0"
       }
     },
     "node_modules/brace-expansion": {
@@ -8103,13 +8104,14 @@
       }
     },
     "node_modules/runed": {
-      "version": "0.23.4",
-      "resolved": "https://registry.npmjs.org/runed/-/runed-0.23.4.tgz",
-      "integrity": "sha512-9q8oUiBYeXIDLWNK5DfCWlkL0EW3oGbk845VdKlPeia28l751VpfesaB/+7pI6rnbx1I6rqoZ2fZxptOJLxILA==",
+      "version": "0.29.1",
+      "resolved": "https://registry.npmjs.org/runed/-/runed-0.29.1.tgz",
+      "integrity": "sha512-RGQEB8ZiWv4OvzBJhbMj2hMgRM8QrEptzTrDr7TDfkHaRePKjiUka4vJ9QHGY+8s87KymNvFoZAxFdQ4jtZNcA==",
       "funding": [
         "https://github.com/sponsors/huntabyte",
         "https://github.com/sponsors/tglide"
       ],
+      "license": "MIT",
       "dependencies": {
         "esm-env": "^1.0.0"
       },
@@ -8553,9 +8555,9 @@
       }
     },
     "node_modules/style-to-object": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.8.tgz",
-      "integrity": "sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.9.tgz",
+      "integrity": "sha512-G4qppLgKu/k6FwRpHiGiKPaPTFcG3g4wNVX/Qsfu+RqQM30E7Tyu/TEgxcL9PNLF5pdRLwQdE3YKKf+KF2Dzlw==",
       "license": "MIT",
       "dependencies": {
         "inline-style-parser": "0.2.4"
@@ -8765,15 +8767,15 @@
       }
     },
     "node_modules/svelte-toolbelt": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/svelte-toolbelt/-/svelte-toolbelt-0.7.1.tgz",
-      "integrity": "sha512-HcBOcR17Vx9bjaOceUvxkY3nGmbBmCBBbuWLLEWO6jtmWH8f/QoWmbyUfQZrpDINH39en1b8mptfPQT9VKQ1xQ==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/svelte-toolbelt/-/svelte-toolbelt-0.9.3.tgz",
+      "integrity": "sha512-HCSWxCtVmv+c6g1ACb8LTwHVbDqLKJvHpo6J8TaqwUme2hj9ATJCpjCPNISR1OCq2Q4U1KT41if9ON0isINQZw==",
       "funding": [
         "https://github.com/sponsors/huntabyte"
       ],
       "dependencies": {
         "clsx": "^2.1.1",
-        "runed": "^0.23.2",
+        "runed": "^0.29.0",
         "style-to-object": "^1.0.8"
       },
       "engines": {
@@ -8781,7 +8783,7 @@
         "pnpm": ">=8.7.0"
       },
       "peerDependencies": {
-        "svelte": "^5.0.0"
+        "svelte": "^5.30.2"
       }
     },
     "node_modules/svelte/node_modules/aria-query": {
@@ -8807,9 +8809,9 @@
       "license": "MIT"
     },
     "node_modules/tailwind-merge": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
-      "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.3.1.tgz",
+      "integrity": "sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==",
       "license": "MIT",
       "funding": {
         "type": "github",
diff --git a/web/package.json b/web/package.json
index a6e037d2e2..0dd35971cc 100644
--- a/web/package.json
+++ b/web/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@formatjs/icu-messageformat-parser": "^2.9.8",
     "@immich/sdk": "file:../open-api/typescript-sdk",
-    "@immich/ui": "^0.22.8",
+    "@immich/ui": "^0.23.2",
     "@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/managers/modal-manager.svelte.ts b/web/src/lib/managers/modal-manager.svelte.ts
index f5612d072d..73967aef15 100644
--- a/web/src/lib/managers/modal-manager.svelte.ts
+++ b/web/src/lib/managers/modal-manager.svelte.ts
@@ -27,7 +27,7 @@ class ModalManager {
     const deferred = new Promise<StripValueIfOptional<K>>((resolve) => {
       onClose = async (...args: [StripValueIfOptional<K>]) => {
         await unmount(modal);
-        resolve(args?.[0]);
+        setTimeout(() => resolve(args?.[0]), 0);
       };
 
       modal = mount(Component, {
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index 4893513e0e..6e1c193276 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -35,8 +35,8 @@
   $effect(() => {
     setTranslations({
       close: $t('close'),
-      showPassword: $t('show_password'),
-      hidePassword: $t('hide_password'),
+      show_password: $t('show_password'),
+      hide_password: $t('hide_password'),
     });
   });
 

From 32a7087883ca3537fd8ba946b73fe8f4ecc0ef76 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 1 Jul 2025 03:38:15 +0800
Subject: [PATCH 085/337] feat(mobile): archive action (#19630)

* feat(mobile): archive action

* fix: lint

* Update i18n/en.json

Co-authored-by: Alex <alex.tran1502@gmail.com>

* fix: lint

* fix: lint

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 i18n/en.json                                  |  1 +
 .../repositories/remote_asset.repository.dart | 13 ++++
 .../archive_action_button.widget.dart         | 59 ++++++++++++++++++-
 .../home_bottom_app_bar.widget.dart           |  2 +-
 .../infrastructure/action.provider.dart       |  8 +++
 mobile/lib/services/action.service.dart       | 32 ++++++++++
 mobile/lib/services/api.service.dart          |  2 +-
 7 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 92f2d3c35f..1eff23eca9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -427,6 +427,7 @@
   "app_settings": "App Settings",
   "appears_in": "Appears in",
   "archive": "Archive",
+  "archive_action_prompt": "{count} added to Archive",
   "archive_or_unarchive_photo": "Archive or unarchive photo",
   "archive_page_no_archived_assets": "No archived assets found",
   "archive_page_title": "Archive ({count})",
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index ef347cfa75..909c3b3910 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -1,5 +1,6 @@
 import 'package:drift/drift.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
@@ -23,4 +24,16 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
       }
     });
   }
+
+  Future<void> updateVisibility(List<String> ids, AssetVisibility visibility) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteAssetEntity,
+          RemoteAssetEntityCompanion(visibility: Value(visibility)),
+          where: (e) => e.id.equals(id),
+        );
+      }
+    });
+  }
 }
diff --git a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
index 90209b171d..046ee051fc 100644
--- a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
@@ -1,16 +1,73 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class ArchiveActionButton extends ConsumerWidget {
-  const ArchiveActionButton({super.key});
+  final ActionSource source;
+
+  const ArchiveActionButton({super.key, required this.source});
+
+  onAction(BuildContext context, WidgetRef ref) {
+    switch (source) {
+      case ActionSource.timeline:
+        timelineAction(context, ref);
+      case ActionSource.viewer:
+        viewerAction(ref);
+    }
+  }
+
+  void timelineAction(BuildContext context, WidgetRef ref) {
+    final user = ref.read(currentUserProvider);
+    if (user == null) {
+      return;
+    }
+
+    final ids = ref
+        .read(multiSelectProvider.select((value) => value.selectedAssets))
+        .whereType<RemoteAsset>()
+        .where((asset) => asset.ownerId == user.id)
+        .map((asset) => asset.id)
+        .toList();
+
+    if (ids.isEmpty) {
+      return;
+    }
+
+    ref.read(actionProvider.notifier).archive(ids);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final toastMessage = 'archive_action_prompt'.t(
+      context: context,
+      args: {'count': ids.length.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: toastMessage,
+        gravity: ToastGravity.BOTTOM,
+      );
+    }
+  }
+
+  void viewerAction(WidgetRef _) {
+    UnimplementedError("Viewer action for archive is not implemented yet.");
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.archive_outlined,
       label: "archive".t(context: context),
+      onPressed: () => onAction(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
index e2c2c2898f..e09d14c4e8 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
@@ -35,7 +35,7 @@ class HomeBottomAppBar extends ConsumerWidget {
         const ShareActionButton(),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
-          const ArchiveActionButton(),
+          const ArchiveActionButton(source: ActionSource.timeline),
           const FavoriteActionButton(source: ActionSource.timeline),
           const DownloadActionButton(),
           isTrashEnable
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 18b7378dd2..f5fb83bd5a 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -25,4 +25,12 @@ class ActionNotifier extends Notifier<void> {
   Future<void> unFavorite(List<String> ids) async {
     await _service.unFavorite(ids);
   }
+
+  Future<void> archive(List<String> ids) async {
+    await _service.archive(ids);
+  }
+
+  Future<void> unArchive(List<String> ids) async {
+    await _service.unArchive(ids);
+  }
 }
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index 9affff9804..29afb3a331 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -1,4 +1,6 @@
 import 'package:flutter/foundation.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -33,4 +35,34 @@ class ActionService {
       debugPrint('Error unfavoriting assets: $e');
     }
   }
+
+  Future<void> archive(List<String> remoteIds) async {
+    try {
+      await _assetApiRepository.updateVisibility(
+        remoteIds,
+        AssetVisibilityEnum.archive,
+      );
+      await _remoteAssetRepository.updateVisibility(
+        remoteIds,
+        AssetVisibility.archive,
+      );
+    } catch (e) {
+      debugPrint('Error archive assets: $e');
+    }
+  }
+
+  Future<void> unArchive(List<String> remoteIds) async {
+    try {
+      await _assetApiRepository.updateVisibility(
+        remoteIds,
+        AssetVisibilityEnum.timeline,
+      );
+      await _remoteAssetRepository.updateVisibility(
+        remoteIds,
+        AssetVisibility.timeline,
+      );
+    } catch (e) {
+      debugPrint('Error unarchive assets: $e');
+    }
+  }
 }
diff --git a/mobile/lib/services/api.service.dart b/mobile/lib/services/api.service.dart
index fe007a2aab..65da247eac 100644
--- a/mobile/lib/services/api.service.dart
+++ b/mobile/lib/services/api.service.dart
@@ -121,7 +121,7 @@ class ApiService implements Authentication {
 
     try {
       await setEndpoint(serverUrl);
-      await serverInfoApi.pingServer().timeout(const Duration(seconds: 5));
+      await serverInfoApi.pingServer().timeout(const Duration(seconds: 60));
     } on TimeoutException catch (_) {
       return false;
     } on SocketException catch (_) {

From 58ca1402ed97d5089c6312296d242627926d4d0e Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 30 Jun 2025 16:41:06 -0400
Subject: [PATCH 086/337] feat: sync partner stacks (#19635)

---
 .../openapi/lib/model/sync_entity_type.dart   |   9 +
 .../openapi/lib/model/sync_request_type.dart  |  39 +--
 open-api/immich-openapi-specs.json            |  18 +-
 open-api/typescript-sdk/src/fetch-client.ts   |  18 +-
 server/src/database.ts                        |   7 +
 server/src/dtos/sync.dto.ts                   |   3 +
 server/src/enum.ts                            |  16 +-
 server/src/queries/sync.repository.sql        |  70 +++++-
 server/src/repositories/sync.repository.ts    |  45 +++-
 server/src/services/sync.service.ts           |  50 ++++
 .../specs/sync/sync-partner-stack.spec.ts     | 232 ++++++++++++++++++
 11 files changed, 463 insertions(+), 44 deletions(-)
 create mode 100644 server/test/medium/specs/sync/sync-partner-stack.spec.ts

diff --git a/mobile/openapi/lib/model/sync_entity_type.dart b/mobile/openapi/lib/model/sync_entity_type.dart
index 7c28ae6265..ecaadc9c31 100644
--- a/mobile/openapi/lib/model/sync_entity_type.dart
+++ b/mobile/openapi/lib/model/sync_entity_type.dart
@@ -35,6 +35,9 @@ class SyncEntityType {
   static const partnerAssetDeleteV1 = SyncEntityType._(r'PartnerAssetDeleteV1');
   static const partnerAssetExifV1 = SyncEntityType._(r'PartnerAssetExifV1');
   static const partnerAssetExifBackfillV1 = SyncEntityType._(r'PartnerAssetExifBackfillV1');
+  static const partnerStackBackfillV1 = SyncEntityType._(r'PartnerStackBackfillV1');
+  static const partnerStackDeleteV1 = SyncEntityType._(r'PartnerStackDeleteV1');
+  static const partnerStackV1 = SyncEntityType._(r'PartnerStackV1');
   static const albumV1 = SyncEntityType._(r'AlbumV1');
   static const albumDeleteV1 = SyncEntityType._(r'AlbumDeleteV1');
   static const albumUserV1 = SyncEntityType._(r'AlbumUserV1');
@@ -69,6 +72,9 @@ class SyncEntityType {
     partnerAssetDeleteV1,
     partnerAssetExifV1,
     partnerAssetExifBackfillV1,
+    partnerStackBackfillV1,
+    partnerStackDeleteV1,
+    partnerStackV1,
     albumV1,
     albumDeleteV1,
     albumUserV1,
@@ -138,6 +144,9 @@ class SyncEntityTypeTypeTransformer {
         case r'PartnerAssetDeleteV1': return SyncEntityType.partnerAssetDeleteV1;
         case r'PartnerAssetExifV1': return SyncEntityType.partnerAssetExifV1;
         case r'PartnerAssetExifBackfillV1': return SyncEntityType.partnerAssetExifBackfillV1;
+        case r'PartnerStackBackfillV1': return SyncEntityType.partnerStackBackfillV1;
+        case r'PartnerStackDeleteV1': return SyncEntityType.partnerStackDeleteV1;
+        case r'PartnerStackV1': return SyncEntityType.partnerStackV1;
         case r'AlbumV1': return SyncEntityType.albumV1;
         case r'AlbumDeleteV1': return SyncEntityType.albumDeleteV1;
         case r'AlbumUserV1': return SyncEntityType.albumUserV1;
diff --git a/mobile/openapi/lib/model/sync_request_type.dart b/mobile/openapi/lib/model/sync_request_type.dart
index e30a509b99..c13d791d84 100644
--- a/mobile/openapi/lib/model/sync_request_type.dart
+++ b/mobile/openapi/lib/model/sync_request_type.dart
@@ -23,37 +23,39 @@ class SyncRequestType {
 
   String toJson() => value;
 
-  static const usersV1 = SyncRequestType._(r'UsersV1');
-  static const partnersV1 = SyncRequestType._(r'PartnersV1');
-  static const assetsV1 = SyncRequestType._(r'AssetsV1');
-  static const assetExifsV1 = SyncRequestType._(r'AssetExifsV1');
-  static const partnerAssetsV1 = SyncRequestType._(r'PartnerAssetsV1');
-  static const partnerAssetExifsV1 = SyncRequestType._(r'PartnerAssetExifsV1');
   static const albumsV1 = SyncRequestType._(r'AlbumsV1');
   static const albumUsersV1 = SyncRequestType._(r'AlbumUsersV1');
   static const albumToAssetsV1 = SyncRequestType._(r'AlbumToAssetsV1');
   static const albumAssetsV1 = SyncRequestType._(r'AlbumAssetsV1');
   static const albumAssetExifsV1 = SyncRequestType._(r'AlbumAssetExifsV1');
+  static const assetsV1 = SyncRequestType._(r'AssetsV1');
+  static const assetExifsV1 = SyncRequestType._(r'AssetExifsV1');
   static const memoriesV1 = SyncRequestType._(r'MemoriesV1');
   static const memoryToAssetsV1 = SyncRequestType._(r'MemoryToAssetsV1');
+  static const partnersV1 = SyncRequestType._(r'PartnersV1');
+  static const partnerAssetsV1 = SyncRequestType._(r'PartnerAssetsV1');
+  static const partnerAssetExifsV1 = SyncRequestType._(r'PartnerAssetExifsV1');
+  static const partnerStacksV1 = SyncRequestType._(r'PartnerStacksV1');
   static const stacksV1 = SyncRequestType._(r'StacksV1');
+  static const usersV1 = SyncRequestType._(r'UsersV1');
 
   /// List of all possible values in this [enum][SyncRequestType].
   static const values = <SyncRequestType>[
-    usersV1,
-    partnersV1,
-    assetsV1,
-    assetExifsV1,
-    partnerAssetsV1,
-    partnerAssetExifsV1,
     albumsV1,
     albumUsersV1,
     albumToAssetsV1,
     albumAssetsV1,
     albumAssetExifsV1,
+    assetsV1,
+    assetExifsV1,
     memoriesV1,
     memoryToAssetsV1,
+    partnersV1,
+    partnerAssetsV1,
+    partnerAssetExifsV1,
+    partnerStacksV1,
     stacksV1,
+    usersV1,
   ];
 
   static SyncRequestType? fromJson(dynamic value) => SyncRequestTypeTypeTransformer().decode(value);
@@ -92,20 +94,21 @@ class SyncRequestTypeTypeTransformer {
   SyncRequestType? decode(dynamic data, {bool allowNull = true}) {
     if (data != null) {
       switch (data) {
-        case r'UsersV1': return SyncRequestType.usersV1;
-        case r'PartnersV1': return SyncRequestType.partnersV1;
-        case r'AssetsV1': return SyncRequestType.assetsV1;
-        case r'AssetExifsV1': return SyncRequestType.assetExifsV1;
-        case r'PartnerAssetsV1': return SyncRequestType.partnerAssetsV1;
-        case r'PartnerAssetExifsV1': return SyncRequestType.partnerAssetExifsV1;
         case r'AlbumsV1': return SyncRequestType.albumsV1;
         case r'AlbumUsersV1': return SyncRequestType.albumUsersV1;
         case r'AlbumToAssetsV1': return SyncRequestType.albumToAssetsV1;
         case r'AlbumAssetsV1': return SyncRequestType.albumAssetsV1;
         case r'AlbumAssetExifsV1': return SyncRequestType.albumAssetExifsV1;
+        case r'AssetsV1': return SyncRequestType.assetsV1;
+        case r'AssetExifsV1': return SyncRequestType.assetExifsV1;
         case r'MemoriesV1': return SyncRequestType.memoriesV1;
         case r'MemoryToAssetsV1': return SyncRequestType.memoryToAssetsV1;
+        case r'PartnersV1': return SyncRequestType.partnersV1;
+        case r'PartnerAssetsV1': return SyncRequestType.partnerAssetsV1;
+        case r'PartnerAssetExifsV1': return SyncRequestType.partnerAssetExifsV1;
+        case r'PartnerStacksV1': return SyncRequestType.partnerStacksV1;
         case r'StacksV1': return SyncRequestType.stacksV1;
+        case r'UsersV1': return SyncRequestType.usersV1;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index eda16498ad..ef66c985cb 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13804,6 +13804,9 @@
           "PartnerAssetDeleteV1",
           "PartnerAssetExifV1",
           "PartnerAssetExifBackfillV1",
+          "PartnerStackBackfillV1",
+          "PartnerStackDeleteV1",
+          "PartnerStackV1",
           "AlbumV1",
           "AlbumDeleteV1",
           "AlbumUserV1",
@@ -13973,20 +13976,21 @@
       },
       "SyncRequestType": {
         "enum": [
-          "UsersV1",
-          "PartnersV1",
-          "AssetsV1",
-          "AssetExifsV1",
-          "PartnerAssetsV1",
-          "PartnerAssetExifsV1",
           "AlbumsV1",
           "AlbumUsersV1",
           "AlbumToAssetsV1",
           "AlbumAssetsV1",
           "AlbumAssetExifsV1",
+          "AssetsV1",
+          "AssetExifsV1",
           "MemoriesV1",
           "MemoryToAssetsV1",
-          "StacksV1"
+          "PartnersV1",
+          "PartnerAssetsV1",
+          "PartnerAssetExifsV1",
+          "PartnerStacksV1",
+          "StacksV1",
+          "UsersV1"
         ],
         "type": "string"
       },
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 5b98e094c2..24f9a6d75d 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -4073,6 +4073,9 @@ export enum SyncEntityType {
     PartnerAssetDeleteV1 = "PartnerAssetDeleteV1",
     PartnerAssetExifV1 = "PartnerAssetExifV1",
     PartnerAssetExifBackfillV1 = "PartnerAssetExifBackfillV1",
+    PartnerStackBackfillV1 = "PartnerStackBackfillV1",
+    PartnerStackDeleteV1 = "PartnerStackDeleteV1",
+    PartnerStackV1 = "PartnerStackV1",
     AlbumV1 = "AlbumV1",
     AlbumDeleteV1 = "AlbumDeleteV1",
     AlbumUserV1 = "AlbumUserV1",
@@ -4094,20 +4097,21 @@ export enum SyncEntityType {
     SyncAckV1 = "SyncAckV1"
 }
 export enum SyncRequestType {
-    UsersV1 = "UsersV1",
-    PartnersV1 = "PartnersV1",
-    AssetsV1 = "AssetsV1",
-    AssetExifsV1 = "AssetExifsV1",
-    PartnerAssetsV1 = "PartnerAssetsV1",
-    PartnerAssetExifsV1 = "PartnerAssetExifsV1",
     AlbumsV1 = "AlbumsV1",
     AlbumUsersV1 = "AlbumUsersV1",
     AlbumToAssetsV1 = "AlbumToAssetsV1",
     AlbumAssetsV1 = "AlbumAssetsV1",
     AlbumAssetExifsV1 = "AlbumAssetExifsV1",
+    AssetsV1 = "AssetsV1",
+    AssetExifsV1 = "AssetExifsV1",
     MemoriesV1 = "MemoriesV1",
     MemoryToAssetsV1 = "MemoryToAssetsV1",
-    StacksV1 = "StacksV1"
+    PartnersV1 = "PartnersV1",
+    PartnerAssetsV1 = "PartnerAssetsV1",
+    PartnerAssetExifsV1 = "PartnerAssetExifsV1",
+    PartnerStacksV1 = "PartnerStacksV1",
+    StacksV1 = "StacksV1",
+    UsersV1 = "UsersV1"
 }
 export enum TranscodeHWAccel {
     Nvenc = "nvenc",
diff --git a/server/src/database.ts b/server/src/database.ts
index b28bb24451..acd6980985 100644
--- a/server/src/database.ts
+++ b/server/src/database.ts
@@ -356,6 +356,13 @@ export const columns = {
     'assets.duration',
   ],
   syncAlbumUser: ['album_users.albumsId as albumId', 'album_users.usersId as userId', 'album_users.role'],
+  syncStack: [
+    'asset_stack.id',
+    'asset_stack.createdAt',
+    'asset_stack.updatedAt',
+    'asset_stack.primaryAssetId',
+    'asset_stack.ownerId',
+  ],
   stack: ['stack.id', 'stack.primaryAssetId', 'ownerId'],
   syncAssetExif: [
     'exif.assetId',
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index c972983a1f..c888f89441 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -267,6 +267,9 @@ export type SyncItem = {
   [SyncEntityType.MemoryToAssetDeleteV1]: SyncMemoryAssetDeleteV1;
   [SyncEntityType.StackV1]: SyncStackV1;
   [SyncEntityType.StackDeleteV1]: SyncStackDeleteV1;
+  [SyncEntityType.PartnerStackBackfillV1]: SyncStackV1;
+  [SyncEntityType.PartnerStackDeleteV1]: SyncStackDeleteV1;
+  [SyncEntityType.PartnerStackV1]: SyncStackV1;
   [SyncEntityType.SyncAckV1]: SyncAckV1;
 };
 
diff --git a/server/src/enum.ts b/server/src/enum.ts
index 706b5c876f..d211420ab5 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -573,20 +573,21 @@ export enum DatabaseLock {
 }
 
 export enum SyncRequestType {
-  UsersV1 = 'UsersV1',
-  PartnersV1 = 'PartnersV1',
-  AssetsV1 = 'AssetsV1',
-  AssetExifsV1 = 'AssetExifsV1',
-  PartnerAssetsV1 = 'PartnerAssetsV1',
-  PartnerAssetExifsV1 = 'PartnerAssetExifsV1',
   AlbumsV1 = 'AlbumsV1',
   AlbumUsersV1 = 'AlbumUsersV1',
   AlbumToAssetsV1 = 'AlbumToAssetsV1',
   AlbumAssetsV1 = 'AlbumAssetsV1',
   AlbumAssetExifsV1 = 'AlbumAssetExifsV1',
+  AssetsV1 = 'AssetsV1',
+  AssetExifsV1 = 'AssetExifsV1',
   MemoriesV1 = 'MemoriesV1',
   MemoryToAssetsV1 = 'MemoryToAssetsV1',
+  PartnersV1 = 'PartnersV1',
+  PartnerAssetsV1 = 'PartnerAssetsV1',
+  PartnerAssetExifsV1 = 'PartnerAssetExifsV1',
+  PartnerStacksV1 = 'PartnerStacksV1',
   StacksV1 = 'StacksV1',
+  UsersV1 = 'UsersV1',
 }
 
 export enum SyncEntityType {
@@ -605,6 +606,9 @@ export enum SyncEntityType {
   PartnerAssetDeleteV1 = 'PartnerAssetDeleteV1',
   PartnerAssetExifV1 = 'PartnerAssetExifV1',
   PartnerAssetExifBackfillV1 = 'PartnerAssetExifBackfillV1',
+  PartnerStackBackfillV1 = 'PartnerStackBackfillV1',
+  PartnerStackDeleteV1 = 'PartnerStackDeleteV1',
+  PartnerStackV1 = 'PartnerStackV1',
 
   AlbumV1 = 'AlbumV1',
   AlbumDeleteV1 = 'AlbumDeleteV1',
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index 42c386a372..50a89655cb 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -689,6 +689,66 @@ where
 order by
   "updateId" asc
 
+-- SyncRepository.partnerStack.getDeletes
+select
+  "id",
+  "stackId"
+from
+  "stacks_audit"
+where
+  "userId" in (
+    select
+      "sharedById"
+    from
+      "partners"
+    where
+      "sharedWithId" = $1
+  )
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
+-- SyncRepository.partnerStack.getBackfill
+select
+  "asset_stack"."id",
+  "asset_stack"."createdAt",
+  "asset_stack"."updatedAt",
+  "asset_stack"."primaryAssetId",
+  "asset_stack"."ownerId",
+  "updateId"
+from
+  "asset_stack"
+where
+  "ownerId" = $1
+  and "updatedAt" < now() - interval '1 millisecond'
+  and "updateId" <= $2
+  and "updateId" >= $3
+order by
+  "updateId" asc
+
+-- SyncRepository.partnerStack.getUpserts
+select
+  "asset_stack"."id",
+  "asset_stack"."createdAt",
+  "asset_stack"."updatedAt",
+  "asset_stack"."primaryAssetId",
+  "asset_stack"."ownerId",
+  "updateId"
+from
+  "asset_stack"
+where
+  "ownerId" in (
+    select
+      "sharedById"
+    from
+      "partners"
+    where
+      "sharedWithId" = $1
+  )
+  and "updatedAt" < now() - interval '1 millisecond'
+order by
+  "updateId" asc
+
 -- SyncRepository.stack.getDeletes
 select
   "id",
@@ -703,11 +763,11 @@ order by
 
 -- SyncRepository.stack.getUpserts
 select
-  "id",
-  "createdAt",
-  "updatedAt",
-  "primaryAssetId",
-  "ownerId",
+  "asset_stack"."id",
+  "asset_stack"."createdAt",
+  "asset_stack"."updatedAt",
+  "asset_stack"."primaryAssetId",
+  "asset_stack"."ownerId",
   "updateId"
 from
   "asset_stack"
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index 593847b426..699aaec83d 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -41,6 +41,7 @@ export class SyncRepository {
   partner: PartnerSync;
   partnerAsset: PartnerAssetsSync;
   partnerAssetExif: PartnerAssetExifsSync;
+  partnerStack: PartnerStackSync;
   stack: StackSync;
   user: UserSync;
 
@@ -57,6 +58,7 @@ export class SyncRepository {
     this.partner = new PartnerSync(this.db);
     this.partnerAsset = new PartnerAssetsSync(this.db);
     this.partnerAssetExif = new PartnerAssetExifsSync(this.db);
+    this.partnerStack = new PartnerStackSync(this.db);
     this.stack = new StackSync(this.db);
     this.user = new UserSync(this.db);
   }
@@ -552,13 +554,54 @@ class StackSync extends BaseSync {
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
       .selectFrom('asset_stack')
-      .select(['id', 'createdAt', 'updatedAt', 'primaryAssetId', 'ownerId', 'updateId'])
+      .select(columns.syncStack)
+      .select('updateId')
       .where('ownerId', '=', userId)
       .$call((qb) => this.upsertTableFilters(qb, ack))
       .stream();
   }
 }
 
+class PartnerStackSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getDeletes(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('stacks_audit')
+      .select(['id', 'stackId'])
+      .where('userId', 'in', (eb) =>
+        eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
+      )
+      .$call((qb) => this.auditTableFilters(qb, ack))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
+  getBackfill(partnerId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
+    return this.db
+      .selectFrom('asset_stack')
+      .select(columns.syncStack)
+      .select('updateId')
+      .where('ownerId', '=', partnerId)
+      .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('updateId', '>=', afterUpdateId!))
+      .orderBy('updateId', 'asc')
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('asset_stack')
+      .select(columns.syncStack)
+      .select('updateId')
+      .where('ownerId', 'in', (eb) =>
+        eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
+      )
+      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .stream();
+  }
+}
 class UserSync extends BaseSync {
   @GenerateSql({ params: [], stream: true })
   getDeletes(ack?: SyncAck) {
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 58cb294312..e3322de2e1 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -59,6 +59,7 @@ export const SYNC_TYPES_ORDER = [
   SyncRequestType.AssetsV1,
   SyncRequestType.StacksV1,
   SyncRequestType.PartnerAssetsV1,
+  SyncRequestType.PartnerStacksV1,
   SyncRequestType.AlbumAssetsV1,
   SyncRequestType.AlbumsV1,
   SyncRequestType.AlbumUsersV1,
@@ -139,6 +140,7 @@ export class SyncService extends BaseService {
       [SyncRequestType.MemoriesV1]: () => this.syncMemoriesV1(response, checkpointMap, auth),
       [SyncRequestType.MemoryToAssetsV1]: () => this.syncMemoryAssetsV1(response, checkpointMap, auth),
       [SyncRequestType.StacksV1]: () => this.syncStackV1(response, checkpointMap, auth),
+      [SyncRequestType.PartnerStacksV1]: () => this.syncPartnerStackV1(response, checkpointMap, auth, sessionId),
     };
 
     for (const type of SYNC_TYPES_ORDER.filter((type) => dto.types.includes(type))) {
@@ -526,6 +528,54 @@ export class SyncService extends BaseService {
     }
   }
 
+  private async syncPartnerStackV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto, sessionId: string) {
+    const deleteType = SyncEntityType.PartnerStackDeleteV1;
+    const deletes = this.syncRepository.partnerStack.getDeletes(auth.user.id, checkpointMap[deleteType]);
+    for await (const { id, ...data } of deletes) {
+      send(response, { type: deleteType, ids: [id], data });
+    }
+
+    const backfillType = SyncEntityType.PartnerStackBackfillV1;
+    const backfillCheckpoint = checkpointMap[backfillType];
+    const partners = await this.syncRepository.partner.getCreatedAfter(auth.user.id, backfillCheckpoint?.updateId);
+    const upsertType = SyncEntityType.PartnerStackV1;
+    const upsertCheckpoint = checkpointMap[upsertType];
+    if (upsertCheckpoint) {
+      const endId = upsertCheckpoint.updateId;
+
+      for (const partner of partners) {
+        const createId = partner.createId;
+        if (isEntityBackfillComplete(createId, backfillCheckpoint)) {
+          continue;
+        }
+
+        const startId = getStartId(createId, backfillCheckpoint);
+        const backfill = this.syncRepository.partnerStack.getBackfill(partner.sharedById, startId, endId);
+
+        for await (const { updateId, ...data } of backfill) {
+          send(response, {
+            type: backfillType,
+            ids: [createId, updateId],
+            data,
+          });
+        }
+
+        sendEntityBackfillCompleteAck(response, backfillType, createId);
+      }
+    } else if (partners.length > 0) {
+      await this.upsertBackfillCheckpoint({
+        type: backfillType,
+        sessionId,
+        createId: partners.at(-1)!.createId,
+      });
+    }
+
+    const upserts = this.syncRepository.partnerStack.getUpserts(auth.user.id, checkpointMap[upsertType]);
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data });
+    }
+  }
+
   private async upsertBackfillCheckpoint(item: { type: SyncEntityType; sessionId: string; createId: string }) {
     const { type, sessionId, createId } = item;
     await this.syncCheckpointRepository.upsertAll([
diff --git a/server/test/medium/specs/sync/sync-partner-stack.spec.ts b/server/test/medium/specs/sync/sync-partner-stack.spec.ts
new file mode 100644
index 0000000000..3a879cb580
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-partner-stack.spec.ts
@@ -0,0 +1,232 @@
+import { Kysely } from 'kysely';
+import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { PartnerRepository } from 'src/repositories/partner.repository';
+import { StackRepository } from 'src/repositories/stack.repository';
+import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
+import { SyncTestContext } from 'test/medium.factory';
+import { factory } from 'test/small.factory';
+import { getKyselyDB, wait } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(SyncRequestType.PartnerStacksV1, () => {
+  it('should detect and sync the first partner stack', async () => {
+    const { auth, user, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: user.id });
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    const { stack } = await ctx.newStack({ ownerId: user2.id }, [asset.id]);
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: stack.id,
+          ownerId: stack.ownerId,
+          createdAt: (stack.createdAt as Date).toISOString(),
+          updatedAt: (stack.updatedAt as Date).toISOString(),
+          primaryAssetId: stack.primaryAssetId,
+        },
+        type: SyncEntityType.PartnerStackV1,
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1])).resolves.toEqual([]);
+  });
+
+  it('should detect and sync a deleted partner stack', async () => {
+    const { auth, user, ctx } = await setup();
+    const stackRepo = ctx.get(StackRepository);
+    const { user: user2 } = await ctx.newUser();
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: user.id });
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    const { stack } = await ctx.newStack({ ownerId: user2.id }, [asset.id]);
+    await stackRepo.delete(stack.id);
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.stringContaining('PartnerStackDeleteV1'),
+        data: {
+          stackId: stack.id,
+        },
+        type: SyncEntityType.PartnerStackDeleteV1,
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1])).resolves.toEqual([]);
+  });
+
+  it('should not sync a deleted partner stack due to a user delete', async () => {
+    const { auth, user, ctx } = await setup();
+    const userRepo = ctx.get(UserRepository);
+    const { user: user2 } = await ctx.newUser();
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: user.id });
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newStack({ ownerId: user2.id }, [asset.id]);
+    await userRepo.delete({ id: user2.id }, true);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1])).resolves.toEqual([]);
+  });
+
+  it('should not sync a deleted partner stack due to a partner delete (unshare)', async () => {
+    const { auth, user, ctx } = await setup();
+    const partnerRepo = ctx.get(PartnerRepository);
+    const { user: user2 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    await ctx.newStack({ ownerId: user2.id }, [asset.id]);
+    const { partner } = await ctx.newPartner({ sharedById: user2.id, sharedWithId: user.id });
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1])).resolves.toHaveLength(1);
+    await partnerRepo.remove(partner);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1])).resolves.toEqual([]);
+  });
+
+  it('should not sync a stack or stack delete for own user', async () => {
+    const { auth, user, ctx } = await setup();
+    const stackRepo = ctx.get(StackRepository);
+    const { user: user2 } = await ctx.newUser();
+    const { asset } = await ctx.newAsset({ ownerId: user.id });
+    const { stack } = await ctx.newStack({ ownerId: user.id }, [asset.id]);
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: user.id });
+    await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1])).resolves.toHaveLength(0);
+    await stackRepo.delete(stack.id);
+    await expect(ctx.syncStream(auth, [SyncRequestType.StacksV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1])).resolves.toHaveLength(0);
+  });
+
+  it('should not sync a stack or stack delete for unrelated user', async () => {
+    const { auth, ctx } = await setup();
+    const stackRepo = ctx.get(StackRepository);
+    const { user: user2 } = await ctx.newUser();
+    const { session } = await ctx.newSession({ userId: user2.id });
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    const { stack } = await ctx.newStack({ ownerId: user2.id }, [asset.id]);
+    const auth2 = factory.auth({ session, user: user2 });
+
+    await expect(ctx.syncStream(auth2, [SyncRequestType.StacksV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1])).resolves.toHaveLength(0);
+
+    await stackRepo.delete(stack.id);
+
+    await expect(ctx.syncStream(auth2, [SyncRequestType.StacksV1])).resolves.toHaveLength(1);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1])).resolves.toHaveLength(0);
+  });
+
+  it('should backfill partner stacks when a partner shared their library with you', async () => {
+    const { auth, user, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { user: user3 } = await ctx.newUser();
+    const { asset: asset3 } = await ctx.newAsset({ ownerId: user3.id });
+    const { stack: stack3 } = await ctx.newStack({ ownerId: user3.id }, [asset3.id]);
+    await wait(2);
+    const { asset: asset2 } = await ctx.newAsset({ ownerId: user2.id });
+    const { stack: stack2 } = await ctx.newStack({ ownerId: user2.id }, [asset2.id]);
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.stringContaining('PartnerStackV1'),
+        data: expect.objectContaining({
+          id: stack2.id,
+        }),
+        type: SyncEntityType.PartnerStackV1,
+      },
+    ]);
+    await ctx.syncAckAll(auth, response);
+    await ctx.newPartner({ sharedById: user3.id, sharedWithId: user.id });
+
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1]);
+    expect(newResponse).toHaveLength(2);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.stringContaining(SyncEntityType.PartnerStackBackfillV1),
+        data: expect.objectContaining({
+          id: stack3.id,
+        }),
+        type: SyncEntityType.PartnerStackBackfillV1,
+      },
+      {
+        ack: expect.stringContaining(SyncEntityType.PartnerStackBackfillV1),
+        data: {},
+        type: SyncEntityType.SyncAckV1,
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1])).resolves.toEqual([]);
+  });
+
+  it('should only backfill partner stacks created prior to the current partner stack checkpoint', async () => {
+    const { auth, ctx } = await setup();
+    const { user: user2 } = await ctx.newUser();
+    const { user: user3 } = await ctx.newUser();
+    const { asset: asset3 } = await ctx.newAsset({ ownerId: user3.id });
+    const { stack: stack3 } = await ctx.newStack({ ownerId: user3.id }, [asset3.id]);
+    await wait(2);
+    const { asset: asset2 } = await ctx.newAsset({ ownerId: user2.id });
+    const { stack: stack2 } = await ctx.newStack({ ownerId: user2.id }, [asset2.id]);
+    await wait(2);
+    const { asset: asset4 } = await ctx.newAsset({ ownerId: user3.id });
+    const { stack: stack4 } = await ctx.newStack({ ownerId: user3.id }, [asset4.id]);
+    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.stringContaining(SyncEntityType.PartnerStackV1),
+        data: expect.objectContaining({
+          id: stack2.id,
+        }),
+        type: SyncEntityType.PartnerStackV1,
+      },
+    ]);
+    await ctx.syncAckAll(auth, response);
+
+    await ctx.newPartner({ sharedById: user3.id, sharedWithId: auth.user.id });
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1]);
+    expect(newResponse).toHaveLength(3);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: stack3.id,
+        }),
+        type: SyncEntityType.PartnerStackBackfillV1,
+      },
+      {
+        ack: expect.stringContaining(SyncEntityType.PartnerStackBackfillV1),
+        data: {},
+        type: SyncEntityType.SyncAckV1,
+      },
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: stack4.id,
+        }),
+        type: SyncEntityType.PartnerStackV1,
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, newResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PartnerStacksV1])).resolves.toEqual([]);
+  });
+});

From 93f9e118ad850ddd42b1f69b8149dfc6dc12cd7d Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 30 Jun 2025 17:43:45 -0400
Subject: [PATCH 087/337] refactor: timeline tests (#19641)

---
 e2e/src/api/specs/timeline.e2e-spec.ts        | 230 ------------------
 .../controllers/timeline.controller.spec.ts   |  41 ++++
 .../specs/services/timeline.service.spec.ts   | 159 ++++++++++++
 3 files changed, 200 insertions(+), 230 deletions(-)
 delete mode 100644 e2e/src/api/specs/timeline.e2e-spec.ts
 create mode 100644 server/src/controllers/timeline.controller.spec.ts
 create mode 100644 server/test/medium/specs/services/timeline.service.spec.ts

diff --git a/e2e/src/api/specs/timeline.e2e-spec.ts b/e2e/src/api/specs/timeline.e2e-spec.ts
deleted file mode 100644
index e633c8694d..0000000000
--- a/e2e/src/api/specs/timeline.e2e-spec.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-import {
-  AssetMediaResponseDto,
-  AssetVisibility,
-  LoginResponseDto,
-  SharedLinkType,
-  TimeBucketAssetResponseDto,
-} from '@immich/sdk';
-import { DateTime } from 'luxon';
-import { createUserDto } from 'src/fixtures';
-import { errorDto } from 'src/responses';
-import { app, utils } from 'src/utils';
-import request from 'supertest';
-import { beforeAll, describe, expect, it } from 'vitest';
-
-// TODO this should probably be a test util function
-const today = DateTime.fromObject({
-  year: 2023,
-  month: 11,
-  day: 3,
-}) as DateTime<true>;
-const yesterday = today.minus({ days: 1 });
-
-describe('/timeline', () => {
-  let admin: LoginResponseDto;
-  let user: LoginResponseDto;
-  let timeBucketUser: LoginResponseDto;
-
-  let user1Assets: AssetMediaResponseDto[];
-  let user2Assets: AssetMediaResponseDto[];
-
-  beforeAll(async () => {
-    await utils.resetDatabase();
-    admin = await utils.adminSetup({ onboarding: false });
-    [user, timeBucketUser] = await Promise.all([
-      utils.userSetup(admin.accessToken, createUserDto.create('1')),
-      utils.userSetup(admin.accessToken, createUserDto.create('time-bucket')),
-    ]);
-
-    user1Assets = await Promise.all([
-      utils.createAsset(user.accessToken),
-      utils.createAsset(user.accessToken),
-      utils.createAsset(user.accessToken, {
-        isFavorite: true,
-        fileCreatedAt: yesterday.toISO(),
-        fileModifiedAt: yesterday.toISO(),
-        assetData: { filename: 'example.mp4' },
-      }),
-      utils.createAsset(user.accessToken),
-      utils.createAsset(user.accessToken),
-    ]);
-
-    user2Assets = await Promise.all([
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-01-01').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-10').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-11').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-11').toISOString() }),
-      utils.createAsset(timeBucketUser.accessToken, { fileCreatedAt: new Date('1970-02-12').toISOString() }),
-    ]);
-
-    await utils.deleteAssets(timeBucketUser.accessToken, [user2Assets[4].id]);
-  });
-
-  describe('GET /timeline/buckets', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/timeline/buckets');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should get time buckets by month', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          { count: 3, timeBucket: '1970-02-01' },
-          { count: 1, timeBucket: '1970-01-01' },
-        ]),
-      );
-    });
-
-    it('should not allow access for unrelated shared links', async () => {
-      const sharedLink = await utils.createSharedLink(user.accessToken, {
-        type: SharedLinkType.Individual,
-        assetIds: user1Assets.map(({ id }) => id),
-      });
-
-      const { status, body } = await request(app).get('/timeline/buckets').query({ key: sharedLink.key });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.noPermission);
-    });
-
-    it('should return error if time bucket is requested with partners asset and archived', async () => {
-      const req1 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ withPartners: true, visibility: AssetVisibility.Archive });
-
-      expect(req1.status).toBe(400);
-      expect(req1.body).toEqual(errorDto.badRequest());
-
-      const req2 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .query({ withPartners: true, visibility: undefined });
-
-      expect(req2.status).toBe(400);
-      expect(req2.body).toEqual(errorDto.badRequest());
-    });
-
-    it('should return error if time bucket is requested with partners asset and favorite', async () => {
-      const req1 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ withPartners: true, isFavorite: true });
-
-      expect(req1.status).toBe(400);
-      expect(req1.body).toEqual(errorDto.badRequest());
-
-      const req2 = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ withPartners: true, isFavorite: false });
-
-      expect(req2.status).toBe(400);
-      expect(req2.body).toEqual(errorDto.badRequest());
-    });
-
-    it('should return error if time bucket is requested with partners asset and trash', async () => {
-      const req = await request(app)
-        .get('/timeline/buckets')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .query({ withPartners: true, isTrashed: true });
-
-      expect(req.status).toBe(400);
-      expect(req.body).toEqual(errorDto.badRequest());
-    });
-  });
-
-  describe('GET /timeline/bucket', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/timeline/bucket').query({
-        timeBucket: '1900-01-01',
-      });
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should handle 5 digit years', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/bucket')
-        .query({ timeBucket: '012345-01-01' })
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        city: [],
-        country: [],
-        duration: [],
-        id: [],
-        visibility: [],
-        isFavorite: [],
-        isImage: [],
-        isTrashed: [],
-        livePhotoVideoId: [],
-        fileCreatedAt: [],
-        localOffsetHours: [],
-        ownerId: [],
-        projectionType: [],
-        ratio: [],
-        status: [],
-        thumbhash: [],
-      });
-    });
-
-    // TODO enable date string validation while still accepting 5 digit years
-    // it('should fail if time bucket is invalid', async () => {
-    //   const { status, body } = await request(app)
-    //     .get('/timeline/bucket')
-    //     .set('Authorization', `Bearer ${user.accessToken}`)
-    //     .query({  timeBucket: 'foo' });
-
-    //   expect(status).toBe(400);
-    //   expect(body).toEqual(errorDto.badRequest);
-    // });
-
-    it('should return time bucket', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/bucket')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ timeBucket: '1970-02-10' });
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        city: [],
-        country: [],
-        duration: [],
-        id: [],
-        visibility: [],
-        isFavorite: [],
-        isImage: [],
-        isTrashed: [],
-        livePhotoVideoId: [],
-        fileCreatedAt: [],
-        localOffsetHours: [],
-        ownerId: [],
-        projectionType: [],
-        ratio: [],
-        status: [],
-        thumbhash: [],
-      });
-    });
-
-    it('should return time bucket in trash', async () => {
-      const { status, body } = await request(app)
-        .get('/timeline/bucket')
-        .set('Authorization', `Bearer ${timeBucketUser.accessToken}`)
-        .query({ timeBucket: '1970-02-01T00:00:00.000Z', isTrashed: true });
-
-      expect(status).toBe(200);
-
-      const timeBucket: TimeBucketAssetResponseDto = body;
-      expect(timeBucket.isTrashed).toEqual([true]);
-    });
-  });
-});
diff --git a/server/src/controllers/timeline.controller.spec.ts b/server/src/controllers/timeline.controller.spec.ts
new file mode 100644
index 0000000000..6d0276c6a3
--- /dev/null
+++ b/server/src/controllers/timeline.controller.spec.ts
@@ -0,0 +1,41 @@
+import { TimelineController } from 'src/controllers/timeline.controller';
+import { TimelineService } from 'src/services/timeline.service';
+import request from 'supertest';
+import { errorDto } from 'test/medium/responses';
+import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils';
+
+describe(TimelineController.name, () => {
+  let ctx: ControllerContext;
+  const service = mockBaseService(TimelineService);
+
+  beforeAll(async () => {
+    ctx = await controllerSetup(TimelineController, [{ provide: TimelineService, useValue: service }]);
+    return () => ctx.close();
+  });
+
+  beforeEach(() => {
+    service.resetAllMocks();
+    ctx.reset();
+  });
+
+  describe('GET /timeline/buckets', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).get('/timeline/buckets');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+  });
+
+  describe('GET /timeline/bucket', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).get('/timeline/bucket?timeBucket=1900-01-01');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    // TODO enable date string validation while still accepting 5 digit years
+    it.fails('should fail if time bucket is invalid', async () => {
+      const { status, body } = await request(ctx.getHttpServer()).get('/timeline/bucket').query({ timeBucket: 'foo' });
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest('Invalid time bucket format'));
+    });
+  });
+});
diff --git a/server/test/medium/specs/services/timeline.service.spec.ts b/server/test/medium/specs/services/timeline.service.spec.ts
new file mode 100644
index 0000000000..6af936eb49
--- /dev/null
+++ b/server/test/medium/specs/services/timeline.service.spec.ts
@@ -0,0 +1,159 @@
+import { BadRequestException } from '@nestjs/common';
+import { Kysely } from 'kysely';
+import { AssetVisibility } from 'src/enum';
+import { AccessRepository } from 'src/repositories/access.repository';
+import { AssetRepository } from 'src/repositories/asset.repository';
+import { LoggingRepository } from 'src/repositories/logging.repository';
+import { DB } from 'src/schema';
+import { TimelineService } from 'src/services/timeline.service';
+import { newMediumService } from 'test/medium.factory';
+import { factory } from 'test/small.factory';
+import { getKyselyDB } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = (db?: Kysely<DB>) => {
+  return newMediumService(TimelineService, {
+    database: db || defaultDatabase,
+    real: [AssetRepository, AccessRepository],
+    mock: [LoggingRepository],
+  });
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(TimelineService.name, () => {
+  describe('getTimeBuckets', () => {
+    it('should get time buckets by month', async () => {
+      const { sut, ctx } = setup();
+      const { user } = await ctx.newUser();
+      const auth = factory.auth({ user });
+      const dates = [new Date('1970-01-01'), new Date('1970-02-10'), new Date('1970-02-11'), new Date('1970-02-11')];
+      for (const localDateTime of dates) {
+        const { asset } = await ctx.newAsset({ ownerId: user.id, localDateTime });
+        await ctx.newExif({ assetId: asset.id, make: 'Canon' });
+      }
+
+      const response = sut.getTimeBuckets(auth, {});
+      await expect(response).resolves.toEqual([
+        { count: 3, timeBucket: '1970-02-01' },
+        { count: 1, timeBucket: '1970-01-01' },
+      ]);
+    });
+
+    it('should return error if time bucket is requested with partners asset and archived', async () => {
+      const { sut } = setup();
+      const auth = factory.auth();
+      const response1 = sut.getTimeBuckets(auth, { withPartners: true, visibility: AssetVisibility.ARCHIVE });
+      await expect(response1).rejects.toBeInstanceOf(BadRequestException);
+      await expect(response1).rejects.toThrow(
+        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
+      );
+
+      const response2 = sut.getTimeBuckets(auth, { withPartners: true });
+      await expect(response2).rejects.toBeInstanceOf(BadRequestException);
+      await expect(response2).rejects.toThrow(
+        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
+      );
+    });
+
+    it('should return error if time bucket is requested with partners asset and favorite', async () => {
+      const { sut } = setup();
+      const auth = factory.auth();
+      const response1 = sut.getTimeBuckets(auth, { withPartners: true, isFavorite: false });
+      await expect(response1).rejects.toBeInstanceOf(BadRequestException);
+      await expect(response1).rejects.toThrow(
+        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
+      );
+
+      const response2 = sut.getTimeBuckets(auth, { withPartners: true, isFavorite: true });
+      await expect(response2).rejects.toBeInstanceOf(BadRequestException);
+      await expect(response2).rejects.toThrow(
+        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
+      );
+    });
+
+    it('should return error if time bucket is requested with partners asset and trash', async () => {
+      const { sut } = setup();
+      const auth = factory.auth();
+      const response = sut.getTimeBuckets(auth, { withPartners: true, isTrashed: true });
+      await expect(response).rejects.toBeInstanceOf(BadRequestException);
+      await expect(response).rejects.toThrow(
+        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
+      );
+    });
+
+    it('should not allow access for unrelated shared links', async () => {
+      const { sut } = setup();
+      const auth = factory.auth({ sharedLink: {} });
+      const response = sut.getTimeBuckets(auth, {});
+      await expect(response).rejects.toBeInstanceOf(BadRequestException);
+      await expect(response).rejects.toThrow('Not found or no timeline.read access');
+    });
+  });
+
+  describe('getTimeBucket', () => {
+    it('should return time bucket', async () => {
+      const { sut, ctx } = setup();
+      const { user } = await ctx.newUser();
+      const { asset } = await ctx.newAsset({
+        ownerId: user.id,
+        localDateTime: new Date('1970-02-12'),
+        deletedAt: new Date(),
+      });
+      await ctx.newExif({ assetId: asset.id, make: 'Canon' });
+      const auth = factory.auth({ user: { id: user.id } });
+      const rawResponse = await sut.getTimeBucket(auth, { timeBucket: '1970-02-01', isTrashed: true });
+      const response = JSON.parse(rawResponse);
+      expect(response).toEqual(expect.objectContaining({ isTrashed: [true] }));
+    });
+
+    it('should handle a bucket without any assets', async () => {
+      const { sut } = setup();
+      const rawResponse = await sut.getTimeBucket(factory.auth(), { timeBucket: '1970-02-01' });
+      const response = JSON.parse(rawResponse);
+      expect(response).toEqual({
+        city: [],
+        country: [],
+        duration: [],
+        id: [],
+        visibility: [],
+        isFavorite: [],
+        isImage: [],
+        isTrashed: [],
+        livePhotoVideoId: [],
+        fileCreatedAt: [],
+        localOffsetHours: [],
+        ownerId: [],
+        projectionType: [],
+        ratio: [],
+        status: [],
+        thumbhash: [],
+      });
+    });
+
+    it('should handle 5 digit years', async () => {
+      const { sut } = setup();
+      const rawResponse = await sut.getTimeBucket(factory.auth(), { timeBucket: '012345-01-01' });
+      const response = JSON.parse(rawResponse);
+      expect(response).toEqual(expect.objectContaining({ id: [] }));
+    });
+
+    it('should return time bucket in trash', async () => {
+      const { sut, ctx } = setup();
+      const { user } = await ctx.newUser();
+      const { asset } = await ctx.newAsset({
+        ownerId: user.id,
+        localDateTime: new Date('1970-02-12'),
+        deletedAt: new Date(),
+      });
+      await ctx.newExif({ assetId: asset.id, make: 'Canon' });
+      const auth = factory.auth({ user: { id: user.id } });
+      const rawResponse = await sut.getTimeBucket(auth, { timeBucket: '1970-02-01', isTrashed: true });
+      const response = JSON.parse(rawResponse);
+      expect(response).toEqual(expect.objectContaining({ isTrashed: [true] }));
+    });
+  });
+});

From bb8755021da75731b5dad7e4bfc9046f519bd2a9 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 1 Jul 2025 06:02:50 +0800
Subject: [PATCH 088/337] revert: timeout (#19639)

---
 mobile/lib/services/api.service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/api.service.dart b/mobile/lib/services/api.service.dart
index 65da247eac..fe007a2aab 100644
--- a/mobile/lib/services/api.service.dart
+++ b/mobile/lib/services/api.service.dart
@@ -121,7 +121,7 @@ class ApiService implements Authentication {
 
     try {
       await setEndpoint(serverUrl);
-      await serverInfoApi.pingServer().timeout(const Duration(seconds: 60));
+      await serverInfoApi.pingServer().timeout(const Duration(seconds: 5));
     } on TimeoutException catch (_) {
       return false;
     } on SocketException catch (_) {

From 3f330c6476654da5fea59ac9c94bc9b6e61c6c48 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 30 Jun 2025 21:24:50 -0500
Subject: [PATCH 089/337] feat: drift album page (#19564)

* feat: drift album page

* feat: page renderred

* feat: asset count

* refactor: use statefulwidget

* refactor: private widgets

* refactor: service layer

* refactor: import

* feat: get owner name

* pr feedback

* pr feedback

* pr feedback

* pr feedback
---
 .../lib/domain/models/album/album.model.dart  |  32 +-
 .../domain/services/remote_album.service.dart |  60 ++
 .../repositories/remote_album.repository.dart |  34 +-
 mobile/lib/pages/common/tab_shell.page.dart   |   2 +-
 .../presentation/pages/drift_album.page.dart  | 767 ++++++++++++++++++
 .../widgets/images/thumbnail.widget.dart      |  30 +-
 .../infrastructure/album.provider.dart        |  13 +
 .../infrastructure/remote_album.provider.dart | 121 +++
 mobile/lib/routing/router.dart                |   3 +-
 mobile/lib/routing/router.gr.dart             |  16 +
 mobile/lib/utils/remote_album.utils.dart      |  71 ++
 .../widgets/common/immich_sliver_app_bar.dart |  11 +-
 12 files changed, 1135 insertions(+), 25 deletions(-)
 create mode 100644 mobile/lib/domain/services/remote_album.service.dart
 create mode 100644 mobile/lib/presentation/pages/drift_album.page.dart
 create mode 100644 mobile/lib/providers/infrastructure/remote_album.provider.dart
 create mode 100644 mobile/lib/utils/remote_album.utils.dart

diff --git a/mobile/lib/domain/models/album/album.model.dart b/mobile/lib/domain/models/album/album.model.dart
index 1f433b84fe..29f75f29ef 100644
--- a/mobile/lib/domain/models/album/album.model.dart
+++ b/mobile/lib/domain/models/album/album.model.dart
@@ -21,6 +21,8 @@ class Album {
   final String? thumbnailAssetId;
   final bool isActivityEnabled;
   final AlbumAssetOrder order;
+  final int assetCount;
+  final String ownerName;
 
   const Album({
     required this.id,
@@ -32,20 +34,24 @@ class Album {
     this.thumbnailAssetId,
     required this.isActivityEnabled,
     required this.order,
+    required this.assetCount,
+    required this.ownerName,
   });
 
   @override
   String toString() {
     return '''Album {
-   id: $id,
-   name: $name,
-   ownerId: $ownerId,
-   description: $description,
-   createdAt: $createdAt,
-   updatedAt: $updatedAt,
-   isActivityEnabled: $isActivityEnabled,
-   order: $order,
-   thumbnailAssetId: ${thumbnailAssetId ?? "<NA>"}
+    id: $id,
+    name: $name,
+    ownerId: $ownerId,
+    description: $description,
+    createdAt: $createdAt,
+    updatedAt: $updatedAt,
+    isActivityEnabled: $isActivityEnabled,
+    order: $order,
+    thumbnailAssetId: ${thumbnailAssetId ?? "<NA>"}
+    assetCount: $assetCount
+    ownerName: $ownerName
  }''';
   }
 
@@ -61,7 +67,9 @@ class Album {
         updatedAt == other.updatedAt &&
         thumbnailAssetId == other.thumbnailAssetId &&
         isActivityEnabled == other.isActivityEnabled &&
-        order == other.order;
+        order == other.order &&
+        assetCount == other.assetCount &&
+        ownerName == other.ownerName;
   }
 
   @override
@@ -74,6 +82,8 @@ class Album {
         updatedAt.hashCode ^
         thumbnailAssetId.hashCode ^
         isActivityEnabled.hashCode ^
-        order.hashCode;
+        order.hashCode ^
+        assetCount.hashCode ^
+        ownerName.hashCode;
   }
 }
diff --git a/mobile/lib/domain/services/remote_album.service.dart b/mobile/lib/domain/services/remote_album.service.dart
new file mode 100644
index 0000000000..f3106470d2
--- /dev/null
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -0,0 +1,60 @@
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
+import 'package:immich_mobile/models/albums/album_search.model.dart';
+import 'package:immich_mobile/utils/remote_album.utils.dart';
+
+class RemoteAlbumService {
+  final DriftRemoteAlbumRepository _repository;
+
+  const RemoteAlbumService(this._repository);
+
+  Future<List<Album>> getAll() {
+    return _repository.getAll();
+  }
+
+  List<Album> sortAlbums(
+    List<Album> albums,
+    RemoteAlbumSortMode sortMode, {
+    bool isReverse = false,
+  }) {
+    return sortMode.sortFn(albums, isReverse);
+  }
+
+  List<Album> searchAlbums(
+    List<Album> albums,
+    String query,
+    String? userId, [
+    QuickFilterMode filterMode = QuickFilterMode.all,
+  ]) {
+    final lowerQuery = query.toLowerCase();
+    List<Album> filtered = albums;
+
+    // Apply text search filter
+    if (query.isNotEmpty) {
+      filtered = filtered
+          .where(
+            (album) =>
+                album.name.toLowerCase().contains(lowerQuery) ||
+                album.description.toLowerCase().contains(lowerQuery),
+          )
+          .toList();
+    }
+
+    if (userId != null) {
+      switch (filterMode) {
+        case QuickFilterMode.myAlbums:
+          filtered =
+              filtered.where((album) => album.ownerId == userId).toList();
+          break;
+        case QuickFilterMode.sharedWithMe:
+          filtered =
+              filtered.where((album) => album.ownerId != userId).toList();
+          break;
+        case QuickFilterMode.all:
+          break;
+      }
+    }
+
+    return filtered;
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/remote_album.repository.dart b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
index dd237c95bf..0e49b45bc5 100644
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -10,26 +10,48 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
   const DriftRemoteAlbumRepository(this._db) : super(_db);
 
   Future<List<Album>> getAll({Set<SortRemoteAlbumsBy> sortBy = const {}}) {
-    final query = _db.remoteAlbumEntity.select();
+    final assetCount = _db.remoteAlbumAssetEntity.assetId.count();
+
+    final query = _db.remoteAlbumEntity.select().join([
+      leftOuterJoin(
+        _db.remoteAlbumAssetEntity,
+        _db.remoteAlbumAssetEntity.albumId.equalsExp(_db.remoteAlbumEntity.id),
+        useColumns: false,
+      ),
+      leftOuterJoin(
+        _db.userEntity,
+        _db.userEntity.id.equalsExp(_db.remoteAlbumEntity.ownerId),
+      ),
+    ]);
+    query
+      ..addColumns([assetCount])
+      ..groupBy([_db.remoteAlbumEntity.id]);
 
     if (sortBy.isNotEmpty) {
-      final orderings = <OrderClauseGenerator<$RemoteAlbumEntityTable>>[];
+      final orderings = <OrderingTerm>[];
       for (final sort in sortBy) {
         orderings.add(
           switch (sort) {
-            SortRemoteAlbumsBy.id => (row) => OrderingTerm.asc(row.id),
+            SortRemoteAlbumsBy.id => OrderingTerm.asc(_db.remoteAlbumEntity.id),
           },
         );
       }
       query.orderBy(orderings);
     }
 
-    return query.map((row) => row.toDto()).get();
+    return query
+        .map(
+          (row) => row.readTable(_db.remoteAlbumEntity).toDto(
+                assetCount: row.read(assetCount) ?? 0,
+                ownerName: row.readTable(_db.userEntity).name,
+              ),
+        )
+        .get();
   }
 }
 
 extension on RemoteAlbumEntityData {
-  Album toDto() {
+  Album toDto({int assetCount = 0, required String ownerName}) {
     return Album(
       id: id,
       name: name,
@@ -40,6 +62,8 @@ extension on RemoteAlbumEntityData {
       thumbnailAssetId: thumbnailAssetId,
       isActivityEnabled: isActivityEnabled,
       order: order,
+      assetCount: assetCount,
+      ownerName: ownerName,
     );
   }
 }
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index 7315f05c7f..aa5b695999 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -143,7 +143,7 @@ class TabShellPage extends ConsumerWidget {
       routes: [
         const MainTimelineRoute(),
         SearchRoute(),
-        const AlbumsRoute(),
+        const DriftAlbumsRoute(),
         const LibraryRoute(),
       ],
       duration: const Duration(milliseconds: 600),
diff --git a/mobile/lib/presentation/pages/drift_album.page.dart b/mobile/lib/presentation/pages/drift_album.page.dart
new file mode 100644
index 0000000000..3298f12b65
--- /dev/null
+++ b/mobile/lib/presentation/pages/drift_album.page.dart
@@ -0,0 +1,767 @@
+import 'dart:async';
+import 'dart:math';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/models/albums/album_search.model.dart';
+import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/remote_album.utils.dart';
+import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
+import 'package:immich_mobile/widgets/common/search_field.dart';
+
+@RoutePage()
+class DriftAlbumsPage extends ConsumerStatefulWidget {
+  const DriftAlbumsPage({super.key});
+
+  @override
+  ConsumerState<DriftAlbumsPage> createState() => _DriftAlbumsPageState();
+}
+
+class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
+  bool isGrid = false;
+  final searchController = TextEditingController();
+  QuickFilterMode filterMode = QuickFilterMode.all;
+  final searchFocusNode = FocusNode();
+
+  @override
+  void initState() {
+    super.initState();
+
+    // Load albums when component mounts
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      ref.read(remoteAlbumProvider.notifier).getAll();
+    });
+
+    searchController.addListener(() {
+      onSearch(searchController.text, filterMode);
+    });
+  }
+
+  void onSearch(String searchTerm, QuickFilterMode sortMode) {
+    final userId = ref.watch(currentUserProvider)?.id;
+    ref
+        .read(remoteAlbumProvider.notifier)
+        .searchAlbums(searchTerm, userId, sortMode);
+  }
+
+  Future<void> onRefresh() async {
+    await ref.read(remoteAlbumProvider.notifier).refresh();
+  }
+
+  void toggleViewMode() {
+    setState(() {
+      isGrid = !isGrid;
+    });
+  }
+
+  void changeFilter(QuickFilterMode sortMode) {
+    setState(() {
+      filterMode = sortMode;
+    });
+  }
+
+  void clearSearch() {
+    setState(() {
+      filterMode = QuickFilterMode.all;
+      searchController.clear();
+      ref.read(remoteAlbumProvider.notifier).clearSearch();
+    });
+  }
+
+  @override
+  void dispose() {
+    searchController.dispose();
+    searchFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final albumState = ref.watch(remoteAlbumProvider);
+    final albums = albumState.filteredAlbums;
+    final isLoading = albumState.isLoading;
+    final error = albumState.error;
+    final userId = ref.watch(currentUserProvider)?.id;
+
+    return RefreshIndicator(
+      onRefresh: onRefresh,
+      child: CustomScrollView(
+        slivers: [
+          const ImmichSliverAppBar(),
+          _SearchBar(
+            searchController: searchController,
+            searchFocusNode: searchFocusNode,
+            onSearch: onSearch,
+            filterMode: filterMode,
+            onClearSearch: clearSearch,
+          ),
+          _QuickFilterButtonRow(
+            filterMode: filterMode,
+            onChangeFilter: changeFilter,
+            onSearch: onSearch,
+            searchController: searchController,
+          ),
+          _QuickSortAndViewMode(
+            isGrid: isGrid,
+            onToggleViewMode: toggleViewMode,
+          ),
+          isGrid
+              ? _AlbumGrid(
+                  albums: albums,
+                  userId: userId,
+                  isLoading: isLoading,
+                  error: error,
+                )
+              : _AlbumList(
+                  albums: albums,
+                  userId: userId,
+                  isLoading: isLoading,
+                  error: error,
+                ),
+        ],
+      ),
+    );
+  }
+}
+
+class _SortButton extends ConsumerStatefulWidget {
+  const _SortButton();
+
+  @override
+  ConsumerState<_SortButton> createState() => _SortButtonState();
+}
+
+class _SortButtonState extends ConsumerState<_SortButton> {
+  RemoteAlbumSortMode albumSortOption = RemoteAlbumSortMode.lastModified;
+  bool albumSortIsReverse = true;
+
+  void onMenuTapped(RemoteAlbumSortMode sortMode) {
+    final selected = albumSortOption == sortMode;
+    // Switch direction
+    if (selected) {
+      setState(() {
+        albumSortIsReverse = !albumSortIsReverse;
+      });
+      ref.read(remoteAlbumProvider.notifier).sortFilteredAlbums(
+            sortMode,
+            isReverse: albumSortIsReverse,
+          );
+    } else {
+      setState(() {
+        albumSortOption = sortMode;
+      });
+      ref.read(remoteAlbumProvider.notifier).sortFilteredAlbums(
+            sortMode,
+            isReverse: albumSortIsReverse,
+          );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MenuAnchor(
+      style: MenuStyle(
+        elevation: const WidgetStatePropertyAll(1),
+        shape: WidgetStateProperty.all(
+          const RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(
+              Radius.circular(24),
+            ),
+          ),
+        ),
+        padding: const WidgetStatePropertyAll(
+          EdgeInsets.all(4),
+        ),
+      ),
+      consumeOutsideTap: true,
+      menuChildren: RemoteAlbumSortMode.values
+          .map(
+            (sortMode) => MenuItemButton(
+              leadingIcon: albumSortOption == sortMode
+                  ? albumSortIsReverse
+                      ? Icon(
+                          Icons.keyboard_arrow_down,
+                          color: albumSortOption == sortMode
+                              ? context.colorScheme.onPrimary
+                              : context.colorScheme.onSurface,
+                        )
+                      : Icon(
+                          Icons.keyboard_arrow_up_rounded,
+                          color: albumSortOption == sortMode
+                              ? context.colorScheme.onPrimary
+                              : context.colorScheme.onSurface,
+                        )
+                  : const Icon(Icons.abc, color: Colors.transparent),
+              onPressed: () => onMenuTapped(sortMode),
+              style: ButtonStyle(
+                padding: WidgetStateProperty.all(
+                  const EdgeInsets.fromLTRB(16, 16, 32, 16),
+                ),
+                backgroundColor: WidgetStateProperty.all(
+                  albumSortOption == sortMode
+                      ? context.colorScheme.primary
+                      : Colors.transparent,
+                ),
+                shape: WidgetStateProperty.all(
+                  const RoundedRectangleBorder(
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(24),
+                    ),
+                  ),
+                ),
+              ),
+              child: Text(
+                sortMode.key.t(context: context),
+                style: context.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
+                  color: albumSortOption == sortMode
+                      ? context.colorScheme.onPrimary
+                      : context.colorScheme.onSurface.withAlpha(185),
+                ),
+              ),
+            ),
+          )
+          .toList(),
+      builder: (context, controller, child) {
+        return GestureDetector(
+          onTap: () {
+            if (controller.isOpen) {
+              controller.close();
+            } else {
+              controller.open();
+            }
+          },
+          child: Row(
+            children: [
+              Padding(
+                padding: const EdgeInsets.only(right: 5),
+                child: albumSortIsReverse
+                    ? const Icon(
+                        Icons.keyboard_arrow_down,
+                      )
+                    : const Icon(
+                        Icons.keyboard_arrow_up_rounded,
+                      ),
+              ),
+              Text(
+                albumSortOption.key.t(context: context),
+                style: context.textTheme.bodyLarge?.copyWith(
+                  fontWeight: FontWeight.w500,
+                  color: context.colorScheme.onSurface.withAlpha(225),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _SearchBar extends StatelessWidget {
+  const _SearchBar({
+    required this.searchController,
+    required this.searchFocusNode,
+    required this.onSearch,
+    required this.filterMode,
+    required this.onClearSearch,
+  });
+
+  final TextEditingController searchController;
+  final FocusNode searchFocusNode;
+  final void Function(String, QuickFilterMode) onSearch;
+  final QuickFilterMode filterMode;
+  final VoidCallback onClearSearch;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+      sliver: SliverToBoxAdapter(
+        child: Container(
+          decoration: BoxDecoration(
+            border: Border.all(
+              color: context.colorScheme.onSurface.withAlpha(0),
+              width: 0,
+            ),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(24),
+            ),
+            gradient: LinearGradient(
+              colors: [
+                context.colorScheme.primary.withValues(alpha: 0.075),
+                context.colorScheme.primary.withValues(alpha: 0.09),
+                context.colorScheme.primary.withValues(alpha: 0.075),
+              ],
+              begin: Alignment.topLeft,
+              end: Alignment.bottomRight,
+              transform: const GradientRotation(0.5 * pi),
+            ),
+          ),
+          child: SearchField(
+            autofocus: false,
+            contentPadding: const EdgeInsets.all(16),
+            hintText: 'search_albums'.tr(),
+            prefixIcon: const Icon(Icons.search_rounded),
+            suffixIcon: searchController.text.isNotEmpty
+                ? IconButton(
+                    icon: const Icon(Icons.clear_rounded),
+                    onPressed: onClearSearch,
+                  )
+                : null,
+            controller: searchController,
+            onChanged: (_) => onSearch(searchController.text, filterMode),
+            focusNode: searchFocusNode,
+            onTapOutside: (_) => searchFocusNode.unfocus(),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickFilterButtonRow extends StatelessWidget {
+  const _QuickFilterButtonRow({
+    required this.filterMode,
+    required this.onChangeFilter,
+    required this.onSearch,
+    required this.searchController,
+  });
+
+  final QuickFilterMode filterMode;
+  final void Function(QuickFilterMode) onChangeFilter;
+  final void Function(String, QuickFilterMode) onSearch;
+  final TextEditingController searchController;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      sliver: SliverToBoxAdapter(
+        child: Wrap(
+          spacing: 4,
+          runSpacing: 4,
+          children: [
+            _QuickFilterButton(
+              label: 'all'.tr(),
+              isSelected: filterMode == QuickFilterMode.all,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.all);
+                onSearch(searchController.text, QuickFilterMode.all);
+              },
+            ),
+            _QuickFilterButton(
+              label: 'shared_with_me'.tr(),
+              isSelected: filterMode == QuickFilterMode.sharedWithMe,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.sharedWithMe);
+                onSearch(
+                  searchController.text,
+                  QuickFilterMode.sharedWithMe,
+                );
+              },
+            ),
+            _QuickFilterButton(
+              label: 'my_albums'.tr(),
+              isSelected: filterMode == QuickFilterMode.myAlbums,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.myAlbums);
+                onSearch(
+                  searchController.text,
+                  QuickFilterMode.myAlbums,
+                );
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickFilterButton extends StatelessWidget {
+  const _QuickFilterButton({
+    required this.isSelected,
+    required this.onTap,
+    required this.label,
+  });
+
+  final bool isSelected;
+  final VoidCallback onTap;
+  final String label;
+
+  @override
+  Widget build(BuildContext context) {
+    return TextButton(
+      onPressed: onTap,
+      style: ButtonStyle(
+        backgroundColor: WidgetStateProperty.all(
+          isSelected ? context.colorScheme.primary : Colors.transparent,
+        ),
+        shape: WidgetStateProperty.all(
+          RoundedRectangleBorder(
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
+            side: BorderSide(
+              color: context.colorScheme.onSurface.withAlpha(25),
+              width: 1,
+            ),
+          ),
+        ),
+      ),
+      child: Text(
+        label,
+        style: TextStyle(
+          color: isSelected
+              ? context.colorScheme.onPrimary
+              : context.colorScheme.onSurface,
+          fontSize: 14,
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickSortAndViewMode extends StatelessWidget {
+  const _QuickSortAndViewMode({
+    required this.isGrid,
+    required this.onToggleViewMode,
+  });
+
+  final bool isGrid;
+  final VoidCallback onToggleViewMode;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      sliver: SliverToBoxAdapter(
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            const _SortButton(),
+            IconButton(
+              icon: Icon(
+                isGrid ? Icons.view_list_outlined : Icons.grid_view_outlined,
+                size: 24,
+              ),
+              onPressed: onToggleViewMode,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _AlbumList extends StatelessWidget {
+  const _AlbumList({
+    required this.isLoading,
+    required this.error,
+    required this.albums,
+    required this.userId,
+  });
+
+  final bool isLoading;
+  final String? error;
+  final List<Album> albums;
+  final String? userId;
+
+  @override
+  Widget build(BuildContext context) {
+    if (isLoading) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: CircularProgressIndicator(),
+          ),
+        ),
+      );
+    }
+
+    if (error != null) {
+      return SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(20.0),
+            child: Text(
+              'Error loading albums: $error',
+              style: TextStyle(
+                color: context.colorScheme.error,
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    if (albums.isEmpty) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: Text('No albums found'),
+          ),
+        ),
+      );
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0),
+      sliver: SliverList.builder(
+        itemBuilder: (_, index) {
+          final album = albums[index];
+
+          return Padding(
+            padding: const EdgeInsets.only(
+              bottom: 8.0,
+            ),
+            child: LargeLeadingTile(
+              title: Text(
+                album.name,
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+                style: context.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+              subtitle: Text(
+                '${'items_count'.t(
+                  context: context,
+                  args: {
+                    'count': album.assetCount,
+                  },
+                )} • ${album.ownerId != userId ? 'shared_by_user'.t(
+                    context: context,
+                    args: {
+                      'user': album.ownerName,
+                    },
+                  ) : 'owned'.t(context: context)}',
+                overflow: TextOverflow.ellipsis,
+                style: context.textTheme.bodyMedium?.copyWith(
+                  color: context.colorScheme.onSurfaceSecondary,
+                ),
+              ),
+              onTap: () => context.router.push(
+                RemoteTimelineRoute(albumId: album.id),
+              ),
+              leadingPadding: const EdgeInsets.only(
+                right: 16,
+              ),
+              leading: album.thumbnailAssetId != null
+                  ? ClipRRect(
+                      borderRadius: const BorderRadius.all(
+                        Radius.circular(15),
+                      ),
+                      child: SizedBox(
+                        width: 80,
+                        height: 80,
+                        child: Thumbnail(
+                          remoteId: album.thumbnailAssetId,
+                        ),
+                      ),
+                    )
+                  : const SizedBox(
+                      width: 80,
+                      height: 80,
+                      child: Icon(
+                        Icons.photo_album_rounded,
+                        size: 40,
+                        color: Colors.grey,
+                      ),
+                    ),
+            ),
+          );
+        },
+        itemCount: albums.length,
+      ),
+    );
+  }
+}
+
+class _AlbumGrid extends StatelessWidget {
+  const _AlbumGrid({
+    required this.albums,
+    required this.userId,
+    required this.isLoading,
+    required this.error,
+  });
+
+  final List<Album> albums;
+  final String? userId;
+  final bool isLoading;
+  final String? error;
+
+  @override
+  Widget build(BuildContext context) {
+    if (isLoading) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: CircularProgressIndicator(),
+          ),
+        ),
+      );
+    }
+
+    if (error != null) {
+      return SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(20.0),
+            child: Text(
+              'Error loading albums: $error',
+              style: TextStyle(
+                color: context.colorScheme.error,
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    if (albums.isEmpty) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: Text('No albums found'),
+          ),
+        ),
+      );
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0),
+      sliver: SliverGrid(
+        gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: 250,
+          mainAxisSpacing: 4,
+          crossAxisSpacing: 4,
+          childAspectRatio: .7,
+        ),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            final album = albums[index];
+            return _GridAlbumCard(
+              album: album,
+              userId: userId,
+            );
+          },
+          childCount: albums.length,
+        ),
+      ),
+    );
+  }
+}
+
+class _GridAlbumCard extends StatelessWidget {
+  const _GridAlbumCard({
+    required this.album,
+    required this.userId,
+  });
+
+  final Album album;
+  final String? userId;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => context.router.push(
+        RemoteTimelineRoute(albumId: album.id),
+      ),
+      child: Card(
+        elevation: 0,
+        color: context.colorScheme.surfaceBright,
+        shape: RoundedRectangleBorder(
+          borderRadius: const BorderRadius.all(
+            Radius.circular(16),
+          ),
+          side: BorderSide(
+            color: context.colorScheme.onSurface.withAlpha(25),
+            width: 1,
+          ),
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Expanded(
+              flex: 2,
+              child: ClipRRect(
+                borderRadius: const BorderRadius.vertical(
+                  top: Radius.circular(15),
+                ),
+                child: SizedBox(
+                  width: double.infinity,
+                  child: album.thumbnailAssetId != null
+                      ? Thumbnail(
+                          remoteId: album.thumbnailAssetId,
+                        )
+                      : Container(
+                          color: context.colorScheme.surfaceContainerHighest,
+                          child: const Icon(
+                            Icons.photo_album_rounded,
+                            size: 40,
+                            color: Colors.grey,
+                          ),
+                        ),
+                ),
+              ),
+            ),
+            Expanded(
+              flex: 1,
+              child: Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    Text(
+                      album.name,
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                      style: context.textTheme.titleSmall?.copyWith(
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                    Text(
+                      '${'items_count'.t(
+                        context: context,
+                        args: {
+                          'count': album.assetCount,
+                        },
+                      )} • ${album.ownerId != userId ? 'shared_by_user'.t(
+                          context: context,
+                          args: {
+                            'user': album.ownerName,
+                          },
+                        ) : 'owned'.t(context: context)}',
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: context.textTheme.labelMedium?.copyWith(
+                        color: context.colorScheme.onSurfaceSecondary,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
index 82aef61633..bdf0baa3ca 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
@@ -10,20 +10,39 @@ import 'package:octo_image/octo_image.dart';
 
 class Thumbnail extends StatelessWidget {
   const Thumbnail({
-    required this.asset,
+    this.asset,
+    this.remoteId,
     this.size = const Size.square(256),
     this.fit = BoxFit.cover,
     super.key,
-  });
+  }) : assert(
+          asset != null || remoteId != null,
+          'Either asset or remoteId must be provided',
+        );
 
-  final BaseAsset asset;
+  final BaseAsset? asset;
+  final String? remoteId;
   final Size size;
   final BoxFit fit;
 
   static ImageProvider imageProvider({
-    required BaseAsset asset,
+    BaseAsset? asset,
+    String? remoteId,
     Size size = const Size.square(256),
   }) {
+    assert(
+      asset != null || remoteId != null,
+      'Either asset or remoteId must be provided',
+    );
+
+    if (remoteId != null) {
+      return RemoteThumbProvider(
+        assetId: remoteId,
+        height: size.height,
+        width: size.width,
+      );
+    }
+
     if (asset is LocalAsset) {
       return LocalThumbProvider(
         asset: asset,
@@ -47,7 +66,8 @@ class Thumbnail extends StatelessWidget {
   Widget build(BuildContext context) {
     final thumbHash =
         asset is RemoteAsset ? (asset as RemoteAsset).thumbHash : null;
-    final provider = imageProvider(asset: asset, size: size);
+    final provider =
+        imageProvider(asset: asset, remoteId: remoteId, size: size);
 
     return OctoImage.fromSet(
       image: provider,
diff --git a/mobile/lib/providers/infrastructure/album.provider.dart b/mobile/lib/providers/infrastructure/album.provider.dart
index b9dd212042..f222e20f50 100644
--- a/mobile/lib/providers/infrastructure/album.provider.dart
+++ b/mobile/lib/providers/infrastructure/album.provider.dart
@@ -1,7 +1,9 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/services/remote_album.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
 
 final localAlbumRepository = Provider<DriftLocalAlbumRepository>(
   (ref) => DriftLocalAlbumRepository(ref.watch(driftProvider)),
@@ -10,3 +12,14 @@ final localAlbumRepository = Provider<DriftLocalAlbumRepository>(
 final remoteAlbumRepository = Provider<DriftRemoteAlbumRepository>(
   (ref) => DriftRemoteAlbumRepository(ref.watch(driftProvider)),
 );
+
+final remoteAlbumServiceProvider = Provider<RemoteAlbumService>(
+  (ref) => RemoteAlbumService(ref.watch(remoteAlbumRepository)),
+  dependencies: [remoteAlbumRepository],
+);
+
+final remoteAlbumProvider =
+    NotifierProvider<RemoteAlbumNotifier, RemoteAlbumState>(
+  RemoteAlbumNotifier.new,
+  dependencies: [remoteAlbumServiceProvider],
+);
diff --git a/mobile/lib/providers/infrastructure/remote_album.provider.dart b/mobile/lib/providers/infrastructure/remote_album.provider.dart
new file mode 100644
index 0000000000..2e5a475b9c
--- /dev/null
+++ b/mobile/lib/providers/infrastructure/remote_album.provider.dart
@@ -0,0 +1,121 @@
+import 'package:collection/collection.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/domain/services/remote_album.service.dart';
+import 'package:immich_mobile/models/albums/album_search.model.dart';
+import 'package:immich_mobile/utils/remote_album.utils.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+import 'album.provider.dart';
+
+class RemoteAlbumState {
+  final List<Album> albums;
+  final List<Album> filteredAlbums;
+  final bool isLoading;
+  final String? error;
+
+  const RemoteAlbumState({
+    required this.albums,
+    List<Album>? filteredAlbums,
+    this.isLoading = false,
+    this.error,
+  }) : filteredAlbums = filteredAlbums ?? albums;
+
+  RemoteAlbumState copyWith({
+    List<Album>? albums,
+    List<Album>? filteredAlbums,
+    bool? isLoading,
+    String? error,
+  }) {
+    return RemoteAlbumState(
+      albums: albums ?? this.albums,
+      filteredAlbums: filteredAlbums ?? this.filteredAlbums,
+      isLoading: isLoading ?? this.isLoading,
+      error: error ?? this.error,
+    );
+  }
+
+  @override
+  String toString() =>
+      'RemoteAlbumState(albums: ${albums.length}, filteredAlbums: ${filteredAlbums.length}, isLoading: $isLoading, error: $error)';
+
+  @override
+  bool operator ==(covariant RemoteAlbumState other) {
+    if (identical(this, other)) return true;
+    final listEquals = const DeepCollectionEquality().equals;
+
+    return listEquals(other.albums, albums) &&
+        listEquals(other.filteredAlbums, filteredAlbums) &&
+        other.isLoading == isLoading &&
+        other.error == error;
+  }
+
+  @override
+  int get hashCode =>
+      albums.hashCode ^
+      filteredAlbums.hashCode ^
+      isLoading.hashCode ^
+      error.hashCode;
+}
+
+class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
+  late final RemoteAlbumService _remoteAlbumService;
+
+  @override
+  RemoteAlbumState build() {
+    _remoteAlbumService = ref.read(remoteAlbumServiceProvider);
+    return const RemoteAlbumState(albums: [], filteredAlbums: []);
+  }
+
+  Future<List<Album>> getAll() async {
+    state = state.copyWith(isLoading: true, error: null);
+
+    try {
+      final albums = await _remoteAlbumService.getAll();
+      state = state.copyWith(
+        albums: albums,
+        filteredAlbums: albums,
+        isLoading: false,
+      );
+      return albums;
+    } catch (e) {
+      state = state.copyWith(isLoading: false, error: e.toString());
+      rethrow;
+    }
+  }
+
+  Future<void> refresh() async {
+    await getAll();
+  }
+
+  void searchAlbums(
+    String query,
+    String? userId, [
+    QuickFilterMode filterMode = QuickFilterMode.all,
+  ]) {
+    final filtered = _remoteAlbumService.searchAlbums(
+      state.albums,
+      query,
+      userId,
+      filterMode,
+    );
+
+    state = state.copyWith(
+      filteredAlbums: filtered,
+    );
+  }
+
+  void clearSearch() {
+    state = state.copyWith(
+      filteredAlbums: state.albums,
+    );
+  }
+
+  void sortFilteredAlbums(
+    RemoteAlbumSortMode sortMode, {
+    bool isReverse = false,
+  }) {
+    final sortedAlbums = _remoteAlbumService
+        .sortAlbums(state.filteredAlbums, sortMode, isReverse: isReverse);
+    state = state.copyWith(filteredAlbums: sortedAlbums);
+  }
+}
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 708171896a..31e1d715a1 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -69,6 +69,7 @@ import 'package:immich_mobile/presentation/pages/dev/local_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/remote_timeline.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/routing/auth_guard.dart';
@@ -172,7 +173,7 @@ class AppRouter extends RootStackRouter {
           guards: [_authGuard, _duplicateGuard],
         ),
         AutoRoute(
-          page: AlbumsRoute.page,
+          page: DriftAlbumsRoute.page,
           guards: [_authGuard, _duplicateGuard],
         ),
       ],
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index a5c2c58614..2ea10491b3 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -550,6 +550,22 @@ class CropImageRouteArgs {
   }
 }
 
+/// generated route for
+/// [DriftAlbumsPage]
+class DriftAlbumsRoute extends PageRouteInfo<void> {
+  const DriftAlbumsRoute({List<PageRouteInfo>? children})
+      : super(DriftAlbumsRoute.name, initialChildren: children);
+
+  static const String name = 'DriftAlbumsRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftAlbumsPage();
+    },
+  );
+}
+
 /// generated route for
 /// [EditImagePage]
 class EditImageRoute extends PageRouteInfo<EditImageRouteArgs> {
diff --git a/mobile/lib/utils/remote_album.utils.dart b/mobile/lib/utils/remote_album.utils.dart
new file mode 100644
index 0000000000..4fc7ba5f74
--- /dev/null
+++ b/mobile/lib/utils/remote_album.utils.dart
@@ -0,0 +1,71 @@
+import 'package:collection/collection.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+
+typedef AlbumSortFn = List<Album> Function(List<Album> albums, bool isReverse);
+
+class _RemoteAlbumSortHandlers {
+  const _RemoteAlbumSortHandlers._();
+
+  static const AlbumSortFn created = _sortByCreated;
+  static List<Album> _sortByCreated(List<Album> albums, bool isReverse) {
+    final sorted = albums.sortedBy((album) => album.createdAt);
+    return (isReverse ? sorted.reversed : sorted).toList();
+  }
+
+  static const AlbumSortFn title = _sortByTitle;
+  static List<Album> _sortByTitle(List<Album> albums, bool isReverse) {
+    final sorted = albums.sortedBy((album) => album.name);
+    return (isReverse ? sorted.reversed : sorted).toList();
+  }
+
+  static const AlbumSortFn lastModified = _sortByLastModified;
+  static List<Album> _sortByLastModified(List<Album> albums, bool isReverse) {
+    final sorted = albums.sortedBy((album) => album.updatedAt);
+    return (isReverse ? sorted.reversed : sorted).toList();
+  }
+
+  static const AlbumSortFn assetCount = _sortByAssetCount;
+  static List<Album> _sortByAssetCount(List<Album> albums, bool isReverse) {
+    final sorted =
+        albums.sorted((a, b) => a.assetCount.compareTo(b.assetCount));
+    return (isReverse ? sorted.reversed : sorted).toList();
+  }
+
+  static const AlbumSortFn mostRecent = _sortByMostRecent;
+  static List<Album> _sortByMostRecent(List<Album> albums, bool isReverse) {
+    final sorted = albums.sorted((a, b) {
+      // For most recent, we sort by updatedAt in descending order
+      return b.updatedAt.compareTo(a.updatedAt);
+    });
+    return (isReverse ? sorted.reversed : sorted).toList();
+  }
+
+  static const AlbumSortFn mostOldest = _sortByMostOldest;
+  static List<Album> _sortByMostOldest(List<Album> albums, bool isReverse) {
+    final sorted = albums.sorted((a, b) {
+      // For oldest, we sort by createdAt in ascending order
+      return a.createdAt.compareTo(b.createdAt);
+    });
+    return (isReverse ? sorted.reversed : sorted).toList();
+  }
+}
+
+enum RemoteAlbumSortMode {
+  title("library_page_sort_title", _RemoteAlbumSortHandlers.title),
+  assetCount(
+    "library_page_sort_asset_count",
+    _RemoteAlbumSortHandlers.assetCount,
+  ),
+  lastModified(
+    "library_page_sort_last_modified",
+    _RemoteAlbumSortHandlers.lastModified,
+  ),
+  created("library_page_sort_created", _RemoteAlbumSortHandlers.created),
+  mostRecent("sort_recent", _RemoteAlbumSortHandlers.mostRecent),
+  mostOldest("sort_oldest", _RemoteAlbumSortHandlers.mostOldest);
+
+  final String key;
+  final AlbumSortFn sortFn;
+
+  const RemoteAlbumSortMode(this.key, this.sortFn);
+}
diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
index 64b5ee0136..51a3a136b9 100644
--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -6,6 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/backup/backup_state.model.dart';
 import 'package:immich_mobile/models/server_info/server_info.model.dart';
+import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
@@ -62,8 +63,14 @@ class ImmichSliverAppBar extends ConsumerWidget {
             ),
           ),
         IconButton(
-          icon: const Icon(Icons.science_rounded),
-          onPressed: () => context.pushRoute(const FeatInDevRoute()),
+          icon: const Icon(Icons.swipe_left_alt_rounded),
+          onPressed: () => context.pop(),
+        ),
+        IconButton(
+          onPressed: () => ref.read(backgroundSyncProvider).syncRemote(),
+          icon: const Icon(
+            Icons.sync,
+          ),
         ),
         if (isCasting)
           Padding(

From 5011636d951df3b72cab834a0800fbe8c99589c1 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Tue, 1 Jul 2025 08:03:37 +0530
Subject: [PATCH 090/337] refactor: header - bulk select icon (#19652)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../widgets/timeline/header.widget.dart       | 65 ++++++++-----------
 1 file changed, 28 insertions(+), 37 deletions(-)

diff --git a/mobile/lib/presentation/widgets/timeline/header.widget.dart b/mobile/lib/presentation/widgets/timeline/header.widget.dart
index 43d6b53b3d..c6c10c26c9 100644
--- a/mobile/lib/presentation/widgets/timeline/header.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/header.widget.dart
@@ -9,7 +9,7 @@ import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
-class TimelineHeader extends ConsumerWidget {
+class TimelineHeader extends StatelessWidget {
   final Bucket bucket;
   final HeaderType header;
   final double height;
@@ -36,23 +36,13 @@ class TimelineHeader extends ConsumerWidget {
   }
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
     if (bucket is! TimeBucket || header == HeaderType.none) {
       return const SizedBox.shrink();
     }
 
     final date = (bucket as TimeBucket).date;
 
-    List<BaseAsset> bucketAssets;
-    try {
-      bucketAssets = ref
-          .watch(timelineServiceProvider)
-          .getAssets(assetOffset, bucket.assetCount);
-    } catch (e) {
-      bucketAssets = <BaseAsset>[];
-    }
-
-    final isAllSelected = ref.watch(bucketSelectionProvider(bucketAssets));
     final isMonthHeader =
         header == HeaderType.month || header == HeaderType.monthAndDay;
     final isDayHeader =
@@ -80,16 +70,8 @@ class TimelineHeader extends ConsumerWidget {
                   const Spacer(),
                   if (header != HeaderType.monthAndDay)
                     _BulkSelectIconButton(
-                      isAllSelected: isAllSelected,
-                      onPressed: () {
-                        ref
-                            .read(multiSelectProvider.notifier)
-                            .toggleBucketSelection(
-                              assetOffset,
-                              bucket.assetCount,
-                            );
-                        ref.read(hapticFeedbackProvider.notifier).heavyImpact();
-                      },
+                      bucket: bucket,
+                      assetOffset: assetOffset,
                     ),
                 ],
               ),
@@ -104,16 +86,8 @@ class TimelineHeader extends ConsumerWidget {
                   ),
                   const Spacer(),
                   _BulkSelectIconButton(
-                    isAllSelected: isAllSelected,
-                    onPressed: () {
-                      ref
-                          .read(multiSelectProvider.notifier)
-                          .toggleBucketSelection(
-                            assetOffset,
-                            bucket.assetCount,
-                          );
-                      ref.read(hapticFeedbackProvider.notifier).heavyImpact();
-                    },
+                    bucket: bucket,
+                    assetOffset: assetOffset,
                   ),
                 ],
               ),
@@ -125,18 +99,35 @@ class TimelineHeader extends ConsumerWidget {
 }
 
 class _BulkSelectIconButton extends ConsumerWidget {
-  final bool isAllSelected;
-  final VoidCallback onPressed;
+  final Bucket bucket;
+  final int assetOffset;
 
   const _BulkSelectIconButton({
-    required this.isAllSelected,
-    required this.onPressed,
+    required this.bucket,
+    required this.assetOffset,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    List<BaseAsset> bucketAssets;
+    try {
+      bucketAssets = ref
+          .watch(timelineServiceProvider)
+          .getAssets(assetOffset, bucket.assetCount);
+    } catch (e) {
+      bucketAssets = <BaseAsset>[];
+    }
+
+    final isAllSelected = ref.watch(bucketSelectionProvider(bucketAssets));
+
     return IconButton(
-      onPressed: onPressed,
+      onPressed: () {
+        ref.read(multiSelectProvider.notifier).toggleBucketSelection(
+              assetOffset,
+              bucket.assetCount,
+            );
+        ref.read(hapticFeedbackProvider.notifier).heavyImpact();
+      },
       icon: isAllSelected
           ? Icon(
               Icons.check_circle_rounded,

From 21f500191a9b5413a12feffd9cb0bd3416d64f4a Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Tue, 1 Jul 2025 08:10:25 +0530
Subject: [PATCH 091/337] refactor: actions provider (#19651)

* refactor: actions provider

* chore: rename error and stack

* remove empty checks

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../lib/domain/services/timeline.service.dart |   4 +-
 .../archive_action_button.widget.dart         |  42 ++-----
 .../favorite_action_button.widget.dart        |  42 ++-----
 .../widgets/images/thumbnail_tile.widget.dart |   7 +-
 .../widgets/timeline/timeline.widget.dart     |   2 +-
 .../infrastructure/action.provider.dart       | 108 ++++++++++++++++--
 .../timeline/multiselect.provider.dart        |  37 ++----
 mobile/lib/services/action.service.dart       |  57 ++++-----
 8 files changed, 159 insertions(+), 140 deletions(-)

diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 1dd2dfa150..56a12cac07 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -64,7 +64,7 @@ class TimelineService {
   })  : _assetSource = assetSource,
         _bucketSource = bucketSource {
     _bucketSubscription =
-        _bucketSource().listen((_) => unawaited(_reloadBucket()));
+        _bucketSource().listen((_) => unawaited(reloadBucket()));
   }
 
   final AsyncMutex _mutex = AsyncMutex();
@@ -74,7 +74,7 @@ class TimelineService {
 
   Stream<List<Bucket>> Function() get watchBuckets => _bucketSource;
 
-  Future<void> _reloadBucket() => _mutex.run(() async {
+  Future<void> reloadBucket() => _mutex.run(() async {
         _buffer = await _assetSource(_bufferOffset, _buffer.length);
       });
 
diff --git a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
index 046ee051fc..5ec88231ca 100644
--- a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
@@ -2,12 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class ArchiveActionButton extends ConsumerWidget {
@@ -15,45 +14,28 @@ class ArchiveActionButton extends ConsumerWidget {
 
   const ArchiveActionButton({super.key, required this.source});
 
-  onAction(BuildContext context, WidgetRef ref) {
-    switch (source) {
-      case ActionSource.timeline:
-        timelineAction(context, ref);
-      case ActionSource.viewer:
-        viewerAction(ref);
-    }
-  }
-
-  void timelineAction(BuildContext context, WidgetRef ref) {
-    final user = ref.read(currentUserProvider);
-    if (user == null) {
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
       return;
     }
 
-    final ids = ref
-        .read(multiSelectProvider.select((value) => value.selectedAssets))
-        .whereType<RemoteAsset>()
-        .where((asset) => asset.ownerId == user.id)
-        .map((asset) => asset.id)
-        .toList();
-
-    if (ids.isEmpty) {
-      return;
-    }
-
-    ref.read(actionProvider.notifier).archive(ids);
+    final result = await ref.read(actionProvider.notifier).archive(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
     ref.read(multiSelectProvider.notifier).reset();
 
-    final toastMessage = 'archive_action_prompt'.t(
+    final successMessage = 'archive_action_prompt'.t(
       context: context,
-      args: {'count': ids.length.toString()},
+      args: {'count': result.count.toString()},
     );
 
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: toastMessage,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
       );
     }
   }
@@ -67,7 +49,7 @@ class ArchiveActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.archive_outlined,
       label: "archive".t(context: context),
-      onPressed: () => onAction(context, ref),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
index 5bf0566f20..dbe43d2f17 100644
--- a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
@@ -2,12 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class FavoriteActionButton extends ConsumerWidget {
@@ -15,45 +14,28 @@ class FavoriteActionButton extends ConsumerWidget {
 
   const FavoriteActionButton({super.key, required this.source});
 
-  onAction(BuildContext context, WidgetRef ref) {
-    switch (source) {
-      case ActionSource.timeline:
-        timelineAction(context, ref);
-      case ActionSource.viewer:
-        viewerAction(ref);
-    }
-  }
-
-  void timelineAction(BuildContext context, WidgetRef ref) {
-    final user = ref.read(currentUserProvider);
-    if (user == null) {
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
       return;
     }
 
-    final ids = ref
-        .read(multiSelectProvider.select((value) => value.selectedAssets))
-        .whereType<RemoteAsset>()
-        .where((asset) => asset.ownerId == user.id)
-        .map((asset) => asset.id)
-        .toList();
-
-    if (ids.isEmpty) {
-      return;
-    }
-
-    ref.read(actionProvider.notifier).favorite(ids);
+    final result = await ref.read(actionProvider.notifier).favorite(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
     ref.read(multiSelectProvider.notifier).reset();
 
-    final toastMessage = 'favorite_action_prompt'.t(
+    final successMessage = 'favorite_action_prompt'.t(
       context: context,
-      args: {'count': ids.length.toString()},
+      args: {'count': result.count.toString()},
     );
 
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: toastMessage,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
       );
     }
   }
@@ -67,7 +49,7 @@ class FavoriteActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.favorite_border_rounded,
       label: "favorite".t(context: context),
-      onPressed: () => onAction(context, ref),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index ba02ea56e8..f243fb1130 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -30,8 +30,11 @@ class ThumbnailTile extends ConsumerWidget {
         ? context.primaryColor.darken(amount: 0.6)
         : context.primaryColor.lighten(amount: 0.8);
 
-    final multiselect = ref.watch(multiSelectProvider);
-    final isSelected = multiselect.selectedAssets.contains(asset);
+    final isSelected = ref.watch(
+      multiSelectProvider.select(
+        (multiselect) => multiselect.selectedAssets.contains(asset),
+      ),
+    );
 
     return Stack(
       children: [
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 688675c686..fd0806cff0 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -407,7 +407,7 @@ class _MultiSelectStatusButton extends ConsumerWidget {
     final selectCount =
         ref.watch(multiSelectProvider.select((s) => s.selectedAssets.length));
     return ElevatedButton.icon(
-      onPressed: () => ref.read(multiSelectProvider.notifier).clearSelection(),
+      onPressed: () => ref.read(multiSelectProvider.notifier).reset(),
       icon: Icon(
         Icons.close_rounded,
         color: context.colorScheme.onPrimary,
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index f5fb83bd5a..0b7fcd1469 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -1,14 +1,36 @@
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/multiselect.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/action.service.dart';
+import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 final actionProvider = NotifierProvider<ActionNotifier, void>(
   ActionNotifier.new,
   dependencies: [
     actionServiceProvider,
+    timelineServiceProvider,
+    multiselectProvider,
   ],
 );
 
+class ActionResult {
+  final int count;
+  final bool success;
+  final String? error;
+
+  const ActionResult({required this.count, required this.success, this.error});
+
+  @override
+  String toString() =>
+      'ActionResult(count: $count, success: $success, error: $error)';
+}
+
 class ActionNotifier extends Notifier<void> {
+  final Logger _logger = Logger('ActionNotifier');
   late final ActionService _service;
 
   ActionNotifier() : super();
@@ -18,19 +40,89 @@ class ActionNotifier extends Notifier<void> {
     _service = ref.watch(actionServiceProvider);
   }
 
-  Future<void> favorite(List<String> ids) async {
-    await _service.favorite(ids);
+  List<String> _getIdsForSource<T extends BaseAsset>(ActionSource source) {
+    final currentUser = ref.read(currentUserProvider);
+    if (T is RemoteAsset && currentUser == null) {
+      return [];
+    }
+
+    final Set<BaseAsset> assets = switch (source) {
+      ActionSource.timeline =>
+        ref.read(multiSelectProvider.select((s) => s.selectedAssets)),
+      ActionSource.viewer => {},
+    };
+
+    return switch (T) {
+      const (RemoteAsset) => assets
+          .where(
+            (asset) => asset is RemoteAsset && asset.ownerId == currentUser!.id,
+          )
+          .cast<RemoteAsset>()
+          .map((asset) => asset.id)
+          .toList(),
+      const (LocalAsset) =>
+        assets.whereType<LocalAsset>().map((asset) => asset.id).toList(),
+      _ => [],
+    };
   }
 
-  Future<void> unFavorite(List<String> ids) async {
-    await _service.unFavorite(ids);
+  Future<ActionResult> favorite(ActionSource source) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.favorite(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to favorite assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
   }
 
-  Future<void> archive(List<String> ids) async {
-    await _service.archive(ids);
+  Future<ActionResult> unFavorite(ActionSource source) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.unFavorite(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to unfavorite assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
   }
 
-  Future<void> unArchive(List<String> ids) async {
-    await _service.unArchive(ids);
+  Future<ActionResult> archive(ActionSource source) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.archive(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to archive assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult> unArchive(ActionSource source) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.unArchive(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to unarchive assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
   }
 }
diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dart
index 1bd0ae1565..2f2d76c68c 100644
--- a/mobile/lib/providers/timeline/multiselect.provider.dart
+++ b/mobile/lib/providers/timeline/multiselect.provider.dart
@@ -1,6 +1,5 @@
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
@@ -13,12 +12,8 @@ final multiSelectProvider =
 
 class MultiSelectState {
   final Set<BaseAsset> selectedAssets;
-  final int lastUpdatedTime;
 
-  const MultiSelectState({
-    required this.selectedAssets,
-    required this.lastUpdatedTime,
-  });
+  const MultiSelectState({required this.selectedAssets});
 
   bool get isEnabled => selectedAssets.isNotEmpty;
   bool get hasRemote => selectedAssets.any(
@@ -30,31 +25,25 @@ class MultiSelectState {
         (asset) => asset.storage == AssetState.local,
       );
 
-  MultiSelectState copyWith({
-    Set<BaseAsset>? selectedAssets,
-    int? lastUpdatedTime,
-  }) {
+  MultiSelectState copyWith({Set<BaseAsset>? selectedAssets}) {
     return MultiSelectState(
       selectedAssets: selectedAssets ?? this.selectedAssets,
-      lastUpdatedTime: lastUpdatedTime ?? this.lastUpdatedTime,
     );
   }
 
   @override
-  String toString() =>
-      'MultiSelectState(selectedAssets: $selectedAssets, lastUpdatedTime: $lastUpdatedTime)';
+  String toString() => 'MultiSelectState(selectedAssets: $selectedAssets)';
 
   @override
   bool operator ==(covariant MultiSelectState other) {
     if (identical(this, other)) return true;
     final listEquals = const DeepCollectionEquality().equals;
 
-    return listEquals(other.selectedAssets, selectedAssets) &&
-        other.lastUpdatedTime == lastUpdatedTime;
+    return listEquals(other.selectedAssets, selectedAssets);
   }
 
   @override
-  int get hashCode => selectedAssets.hashCode ^ lastUpdatedTime.hashCode;
+  int get hashCode => selectedAssets.hashCode;
 }
 
 class MultiSelectNotifier extends Notifier<MultiSelectState> {
@@ -64,10 +53,7 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
   MultiSelectState build() {
     _timelineService = ref.read(timelineServiceProvider);
 
-    return const MultiSelectState(
-      selectedAssets: {},
-      lastUpdatedTime: 0,
-    );
+    return const MultiSelectState(selectedAssets: {});
   }
 
   void selectAsset(BaseAsset asset) {
@@ -98,17 +84,8 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
     }
   }
 
-  void clearSelection() {
-    state = state.copyWith(
-      selectedAssets: {},
-    );
-  }
-
   void reset() {
-    state = MultiSelectState(
-      selectedAssets: {},
-      lastUpdatedTime: DateTime.now().millisecondsSinceEpoch,
-    );
+    state = const MultiSelectState(selectedAssets: {});
   }
 
   /// Bucket bulk operations
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index 29afb3a331..afc4e3f776 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
@@ -19,50 +18,34 @@ class ActionService {
   const ActionService(this._assetApiRepository, this._remoteAssetRepository);
 
   Future<void> favorite(List<String> remoteIds) async {
-    try {
-      await _assetApiRepository.updateFavorite(remoteIds, true);
-      await _remoteAssetRepository.updateFavorite(remoteIds, true);
-    } catch (e) {
-      debugPrint('Error favoriting assets: $e');
-    }
+    await _assetApiRepository.updateFavorite(remoteIds, true);
+    await _remoteAssetRepository.updateFavorite(remoteIds, true);
   }
 
   Future<void> unFavorite(List<String> remoteIds) async {
-    try {
-      await _assetApiRepository.updateFavorite(remoteIds, false);
-      await _remoteAssetRepository.updateFavorite(remoteIds, false);
-    } catch (e) {
-      debugPrint('Error unfavoriting assets: $e');
-    }
+    await _assetApiRepository.updateFavorite(remoteIds, false);
+    await _remoteAssetRepository.updateFavorite(remoteIds, false);
   }
 
   Future<void> archive(List<String> remoteIds) async {
-    try {
-      await _assetApiRepository.updateVisibility(
-        remoteIds,
-        AssetVisibilityEnum.archive,
-      );
-      await _remoteAssetRepository.updateVisibility(
-        remoteIds,
-        AssetVisibility.archive,
-      );
-    } catch (e) {
-      debugPrint('Error archive assets: $e');
-    }
+    await _assetApiRepository.updateVisibility(
+      remoteIds,
+      AssetVisibilityEnum.archive,
+    );
+    await _remoteAssetRepository.updateVisibility(
+      remoteIds,
+      AssetVisibility.archive,
+    );
   }
 
   Future<void> unArchive(List<String> remoteIds) async {
-    try {
-      await _assetApiRepository.updateVisibility(
-        remoteIds,
-        AssetVisibilityEnum.timeline,
-      );
-      await _remoteAssetRepository.updateVisibility(
-        remoteIds,
-        AssetVisibility.timeline,
-      );
-    } catch (e) {
-      debugPrint('Error unarchive assets: $e');
-    }
+    await _assetApiRepository.updateVisibility(
+      remoteIds,
+      AssetVisibilityEnum.timeline,
+    );
+    await _remoteAssetRepository.updateVisibility(
+      remoteIds,
+      AssetVisibility.timeline,
+    );
   }
 }

From a3d588f6bd6aae2cd342190b4ed3969cc827a010 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Mon, 30 Jun 2025 22:40:42 -0400
Subject: [PATCH 092/337] feat: makefile improvements (#19650)

---
 Makefile | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 590ed3e126..207665d31c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,33 @@
 dev:
-	docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans || make dev-down
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans
 
 dev-down:
 	docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans
 
 dev-update:
-	docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans
 
 dev-scale:
-	docker compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V  --scale immich-server=3 --remove-orphans
 
 .PHONY: e2e
 e2e:
-	docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
+
+e2e-update:
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
+
+e2e-down:
+	docker compose -f ./e2e/docker-compose.yml down --remove-orphans
 
 prod:
-	docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans
+	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans
 
 prod-down:
 	docker compose -f ./docker/docker-compose.prod.yml down --remove-orphans
 
 prod-scale:
-	docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans
+	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans
 
 .PHONY: open-api
 open-api:
@@ -93,9 +99,11 @@ hygiene-all: lint-all format-all check-all sql audit-all;
 test-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),test-$M) ;
 
 clean:
-	find . -name "node_modules" -type d -prune -exec rm -rf '{}' +
+	find . -name "node_modules" -type d -prune -exec rm -rf {} +
 	find . -name "dist" -type d -prune -exec rm -rf '{}' +
 	find . -name "build" -type d -prune -exec rm -rf '{}' +
 	find . -name "svelte-kit" -type d -prune -exec rm -rf '{}' +
-	docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
-	docker compose -f ./e2e/docker-compose.yml rm -v -f || true
+	command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
+	command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml rm -v -f || true
+
+setup-dev: install-server install-sdk build-sdk install-web
\ No newline at end of file

From a5c431fbf568fd12e15903d301dbe801764c72e4 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Tue, 1 Jul 2025 08:53:38 +0530
Subject: [PATCH 093/337] refactor: animate bottom sheet (#19655)

* refactor: animate bottom sheet

* rebase on main

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../home_bottom_app_bar.widget.dart           |   3 +-
 .../widgets/timeline/timeline.widget.dart     | 164 ++++++++++--------
 2 files changed, 96 insertions(+), 71 deletions(-)

diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
index e09d14c4e8..5c93d37696 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
@@ -31,8 +31,9 @@ class HomeBottomAppBar extends ConsumerWidget {
     return BaseBottomSheet(
       initialChildSize: 0.25,
       minChildSize: 0.22,
+      expand: false,
       actions: [
-        const ShareActionButton(),
+        if (multiselect.isEnabled) const ShareActionButton(),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
           const ArchiveActionButton(source: ActionSource.timeline),
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index fd0806cff0..59c4c46135 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -43,15 +43,26 @@ class Timeline extends StatelessWidget {
   }
 }
 
-class _SliverTimeline extends StatefulWidget {
+class _SliverTimeline extends ConsumerStatefulWidget {
   const _SliverTimeline();
 
   @override
-  State createState() => _SliverTimelineState();
+  ConsumerState createState() => _SliverTimelineState();
 }
 
-class _SliverTimelineState extends State<_SliverTimeline> {
+class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   final _scrollController = ScrollController();
+  PersistentBottomSheetController? _bottomSheetController;
+  bool _isMultiSelectEnabled = false;
+
+  @override
+  void initState() {
+    super.initState();
+    ref.listenManual(
+      multiSelectProvider.select((s) => s.isEnabled),
+      _onMultiSelectChanged,
+    );
+  }
 
   @override
   void dispose() {
@@ -59,80 +70,93 @@ class _SliverTimelineState extends State<_SliverTimeline> {
     super.dispose();
   }
 
+  void _onMultiSelectChanged(bool? previous, bool current) {
+    if (context.mounted && current != _isMultiSelectEnabled) {
+      setState(() {
+        _isMultiSelectEnabled = current;
+        if (current) {
+          _bottomSheetController = showBottomSheet(
+            context: context,
+            builder: (_) => const HomeBottomAppBar(),
+          );
+          _bottomSheetController?.closed.then((_) {
+            _bottomSheetController = null;
+            // Reset the multi-select state when the bottom sheet is closed
+            ref.read(multiSelectProvider.notifier).reset();
+          });
+        } else {
+          _bottomSheetController?.close();
+        }
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext _) {
-    return Consumer(
-      builder: (context, ref, child) {
-        final asyncSegments = ref.watch(timelineSegmentProvider);
-        final maxHeight =
-            ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
-        final isMultiSelectEnabled =
-            ref.watch(multiSelectProvider.select((s) => s.isEnabled));
-        return asyncSegments.widgetWhen(
-          onData: (segments) {
-            final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
-            final statusBarHeight = context.padding.top;
-            final totalAppBarHeight = statusBarHeight + kToolbarHeight;
-            const scrubberBottomPadding = 100.0;
+    final asyncSegments = ref.watch(timelineSegmentProvider);
+    final maxHeight =
+        ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
 
-            return PrimaryScrollController(
-              controller: _scrollController,
-              child: Stack(
-                children: [
-                  Scrubber(
-                    layoutSegments: segments,
-                    timelineHeight: maxHeight,
-                    topPadding: totalAppBarHeight + 10,
-                    bottomPadding:
-                        context.padding.bottom + scrubberBottomPadding,
-                    child: CustomScrollView(
-                      primary: true,
-                      cacheExtent: maxHeight * 2,
-                      slivers: [
-                        SliverAnimatedOpacity(
-                          duration: Durations.medium1,
-                          opacity: isMultiSelectEnabled ? 0 : 1,
-                          sliver: const ImmichSliverAppBar(
-                            floating: true,
-                            pinned: false,
-                            snap: false,
-                          ),
-                        ),
-                        _SliverSegmentedList(
-                          segments: segments,
-                          delegate: SliverChildBuilderDelegate(
-                            (ctx, index) {
-                              if (index >= childCount) return null;
-                              final segment = segments.findByIndex(index);
-                              return segment?.builder(ctx, index) ??
-                                  const SizedBox.shrink();
-                            },
-                            childCount: childCount,
-                            addAutomaticKeepAlives: false,
-                            // We add repaint boundary around tiles, so skip the auto boundaries
-                            addRepaintBoundaries: false,
-                          ),
-                        ),
-                        const SliverPadding(
-                          padding: EdgeInsets.only(
-                            bottom: scrubberBottomPadding,
-                          ),
-                        ),
-                      ],
+    return asyncSegments.widgetWhen(
+      onData: (segments) {
+        final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
+        final statusBarHeight = context.padding.top;
+        final totalAppBarHeight = statusBarHeight + kToolbarHeight;
+        const scrubberBottomPadding = 100.0;
+
+        return PrimaryScrollController(
+          controller: _scrollController,
+          child: Stack(
+            children: [
+              Scrubber(
+                layoutSegments: segments,
+                timelineHeight: maxHeight,
+                topPadding: totalAppBarHeight + 10,
+                bottomPadding: context.padding.bottom + scrubberBottomPadding,
+                child: CustomScrollView(
+                  primary: true,
+                  cacheExtent: maxHeight * 2,
+                  slivers: [
+                    SliverAnimatedOpacity(
+                      duration: Durations.medium1,
+                      opacity: _isMultiSelectEnabled ? 0 : 1,
+                      sliver: const ImmichSliverAppBar(
+                        floating: true,
+                        pinned: false,
+                        snap: false,
+                      ),
                     ),
-                  ),
-                  if (isMultiSelectEnabled) ...[
-                    const Positioned(
-                      top: 60,
-                      left: 25,
-                      child: _MultiSelectStatusButton(),
+                    _SliverSegmentedList(
+                      segments: segments,
+                      delegate: SliverChildBuilderDelegate(
+                        (ctx, index) {
+                          if (index >= childCount) return null;
+                          final segment = segments.findByIndex(index);
+                          return segment?.builder(ctx, index) ??
+                              const SizedBox.shrink();
+                        },
+                        childCount: childCount,
+                        addAutomaticKeepAlives: false,
+                        // We add repaint boundary around tiles, so skip the auto boundaries
+                        addRepaintBoundaries: false,
+                      ),
+                    ),
+                    const SliverPadding(
+                      padding: EdgeInsets.only(
+                        bottom: scrubberBottomPadding,
+                      ),
                     ),
-                    const HomeBottomAppBar(),
                   ],
-                ],
+                ),
               ),
-            );
-          },
+              if (_isMultiSelectEnabled)
+                const Positioned(
+                  top: 60,
+                  left: 25,
+                  child: _MultiSelectStatusButton(),
+                ),
+            ],
+          ),
         );
       },
     );

From db0415bbcc7512e99013a6c310b64f51fd34a711 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Mon, 30 Jun 2025 23:23:41 -0400
Subject: [PATCH 094/337] chore: undeclared versions/updates (#19649)

---
 .dockerignore                                 |   4 +
 docs/package-lock.json                        |   2 +
 docs/package.json                             |   2 +
 server/package-lock.json                      | 688 +++++++++++-------
 server/package.json                           |   9 +-
 server/src/repositories/storage.repository.ts |   6 +-
 .../repositories/storage.repository.mock.ts   |   5 +-
 web/package-lock.json                         |  35 +-
 web/package.json                              |   1 +
 web/src/lib/utils/asset-utils.spec.ts         |   5 +-
 web/vite.config.js                            |   2 +-
 11 files changed, 477 insertions(+), 282 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 6e830bae35..d152800d1b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,6 +4,7 @@
 
 design/
 docker/
+Dockerfile
 !docker/scripts
 docs/
 !docs/package.json
@@ -19,6 +20,7 @@ mobile/
 cli/coverage/
 cli/dist/
 cli/node_modules/
+cli/Dockerfile
 
 open-api/typescript-sdk/build/
 open-api/typescript-sdk/node_modules/
@@ -29,9 +31,11 @@ server/upload/
 server/src/queries
 server/dist/
 server/www/
+server/Dockerfile
 
 web/node_modules/
 web/coverage/
 web/.svelte-kit
 web/build/
 web/.env
+web/Dockerfile
diff --git a/docs/package-lock.json b/docs/package-lock.json
index 602232da07..83c7514a38 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -10,6 +10,7 @@
       "dependencies": {
         "@docusaurus/core": "~3.7.0",
         "@docusaurus/preset-classic": "~3.7.0",
+        "@docusaurus/theme-common": "~3.7.0",
         "@mdi/js": "^7.3.67",
         "@mdi/react": "^1.6.1",
         "@mdx-js/react": "^3.0.0",
@@ -18,6 +19,7 @@
         "clsx": "^2.0.0",
         "docusaurus-lunr-search": "^3.3.2",
         "docusaurus-preset-openapi": "^0.7.5",
+        "lunr": "^2.3.9",
         "postcss": "^8.4.25",
         "prism-react-renderer": "^2.3.1",
         "raw-loader": "^4.0.2",
diff --git a/docs/package.json b/docs/package.json
index e13e85ecb3..dba22fc199 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -18,6 +18,7 @@
   "dependencies": {
     "@docusaurus/core": "~3.7.0",
     "@docusaurus/preset-classic": "~3.7.0",
+    "@docusaurus/theme-common": "~3.7.0",
     "@mdi/js": "^7.3.67",
     "@mdi/react": "^1.6.1",
     "@mdx-js/react": "^3.0.0",
@@ -26,6 +27,7 @@
     "clsx": "^2.0.0",
     "docusaurus-lunr-search": "^3.3.2",
     "docusaurus-preset-openapi": "^0.7.5",
+    "lunr": "^2.3.9",
     "postcss": "^8.4.25",
     "prism-react-renderer": "^2.3.1",
     "raw-loader": "^4.0.2",
diff --git a/server/package-lock.json b/server/package-lock.json
index 0111d3171f..c2ce36bad4 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -39,14 +39,14 @@
         "bcrypt": "^6.0.0",
         "body-parser": "^2.2.0",
         "bullmq": "^5.51.0",
-        "chokidar": "^3.5.3",
+        "chokidar": "^4.0.3",
         "class-transformer": "^0.5.1",
         "class-validator": "^0.14.0",
         "compression": "^1.8.0",
         "cookie": "^1.0.2",
         "cookie-parser": "^1.4.7",
         "cron": "^3.5.0",
-        "exiftool-vendored": "^28.3.1",
+        "exiftool-vendored": "^28.8.0",
         "express": "^5.1.0",
         "fast-glob": "^3.3.2",
         "fluent-ffmpeg": "^2.1.2",
@@ -82,7 +82,7 @@
         "sharp": "^0.34.2",
         "sirv": "^3.0.0",
         "socket.io": "^4.8.1",
-        "tailwindcss-preset-email": "^1.3.2",
+        "tailwindcss-preset-email": "^1.4.0",
         "thumbhash": "^0.1.1",
         "typeorm": "^0.3.17",
         "ua-parser-js": "^2.0.0",
@@ -121,12 +121,12 @@
         "@types/ua-parser-js": "^0.7.36",
         "@types/validator": "^13.15.2",
         "@vitest/coverage-v8": "^3.0.0",
+        "canvas": "^3.1.0",
         "eslint": "^9.14.0",
         "eslint-config-prettier": "^10.0.0",
         "eslint-plugin-prettier": "^5.1.3",
         "eslint-plugin-unicorn": "^59.0.0",
         "globals": "^16.0.0",
-        "jsdom": "^26.1.0",
         "mock-fs": "^5.2.0",
         "node-addon-api": "^8.3.1",
         "node-gyp": "^11.2.0",
@@ -138,6 +138,7 @@
         "source-map-support": "^0.5.21",
         "sql-formatter": "^15.0.0",
         "supertest": "^7.1.0",
+        "tailwindcss": "^3.4.0",
         "testcontainers": "^11.0.0",
         "tsconfig-paths": "^4.2.0",
         "typescript": "^5.3.3",
@@ -153,7 +154,6 @@
       "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
       "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -292,24 +292,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@angular-devkit/schematics-cli/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/@angular-devkit/schematics-cli/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -317,22 +299,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@angular-devkit/schematics-cli/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 14.18.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/@angular-devkit/schematics-cli/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -398,24 +364,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@angular-devkit/schematics/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/@angular-devkit/schematics/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -423,22 +371,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@angular-devkit/schematics/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 14.18.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -465,6 +397,8 @@
       "integrity": "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@csstools/css-calc": "^2.1.3",
         "@csstools/css-color-parser": "^3.0.9",
@@ -640,6 +574,8 @@
         }
       ],
       "license": "MIT-0",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -660,6 +596,8 @@
         }
       ],
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -684,6 +622,8 @@
         }
       ],
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@csstools/color-helpers": "^5.0.2",
         "@csstools/css-calc": "^2.1.4"
@@ -712,6 +652,8 @@
         }
       ],
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -735,6 +677,8 @@
         }
       ],
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -2787,22 +2731,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@nestjs/cli/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/@nestjs/cli/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -2810,20 +2738,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@nestjs/cli/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14.18.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/@nestjs/cli/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -3083,24 +2997,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@nestjs/schematics/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/@nestjs/schematics/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -3108,22 +3004,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@nestjs/schematics/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 14.18.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/@nestjs/schematics/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -7532,8 +7412,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
       "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/anymatch": {
       "version": "3.1.3",
@@ -7727,8 +7606,7 @@
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
       "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/argparse": {
       "version": "2.0.1",
@@ -8371,7 +8249,6 @@
       "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
       "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 6"
       }
@@ -8396,6 +8273,28 @@
       ],
       "license": "CC-BY-4.0"
     },
+    "node_modules/canvas": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-3.1.2.tgz",
+      "integrity": "sha512-Z/tzFAcBzoCvJlOSlCnoekh1Gu8YMn0J51+UAuXJAbW1Z6I9l2mZgdD7738MepoeeIcUdDtbMnOg6cC7GJxy/g==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "node-addon-api": "^7.0.0",
+        "prebuild-install": "^7.1.3"
+      },
+      "engines": {
+        "node": "^18.12.0 || >= 20.9.0"
+      }
+    },
+    "node_modules/canvas/node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/chai": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz",
@@ -8446,27 +8345,18 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "license": "MIT",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "readdirp": "^4.0.1"
       },
       "engines": {
-        "node": ">= 8.10.0"
+        "node": ">= 14.16.0"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
       }
     },
     "node_modules/chownr": {
@@ -9109,7 +8999,6 @@
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -9123,6 +9012,8 @@
       "integrity": "sha512-/7gw8TGrvH/0g564EnhgFZogTMVe+lifpB7LWU+PEsiq5o83TUXR3fDbzTRXOJhoJwck5IS9ez3Em5LNMMO2aw==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@asamuzakjp/css-color": "^3.2.0",
         "rrweb-cssom": "^0.8.0"
@@ -9144,6 +9035,8 @@
       "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "whatwg-mimetype": "^4.0.0",
         "whatwg-url": "^14.0.0"
@@ -9192,7 +9085,25 @@
       "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
       "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/dedent": {
       "version": "1.6.0",
@@ -9218,6 +9129,16 @@
         "node": ">=6"
       }
     },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -9348,8 +9269,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
       "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/discontinuous-range": {
       "version": "1.0.0",
@@ -9362,8 +9282,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
       "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/docker-compose": {
       "version": "1.2.0",
@@ -10290,6 +10209,16 @@
         "!win32"
       ]
     },
+    "node_modules/expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+      "dev": true,
+      "license": "(MIT OR WTFPL)",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/expect-type": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz",
@@ -10731,36 +10660,6 @@
         "webpack": "^5.11.0"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14.18.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/form-data": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
@@ -11099,6 +10998,13 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/glob": {
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz",
@@ -11324,6 +11230,8 @@
       "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "whatwg-encoding": "^3.1.1"
       },
@@ -11555,6 +11463,13 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "license": "ISC"
     },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/inquirer": {
       "version": "8.2.6",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz",
@@ -11791,7 +11706,9 @@
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -11983,7 +11900,6 @@
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
       "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -12029,6 +11945,8 @@
       "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
@@ -12295,7 +12213,6 @@
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
       "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=14"
       },
@@ -12683,6 +12600,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -13040,7 +12970,6 @@
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -13073,6 +13002,13 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/napi-build-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz",
+      "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -13269,6 +13205,19 @@
         "tslib": "^2.8.0"
       }
     },
+    "node_modules/node-abi": {
+      "version": "3.75.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz",
+      "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/node-abort-controller": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
@@ -13479,7 +13428,9 @@
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz",
       "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/oauth4webapi": {
       "version": "3.5.3",
@@ -13781,6 +13732,8 @@
       "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "entities": "^6.0.0"
       },
@@ -13794,6 +13747,8 @@
       "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
       "dev": true,
       "license": "BSD-2-Clause",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.12"
       },
@@ -14227,7 +14182,6 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14237,7 +14191,6 @@
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
       "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 6"
       }
@@ -14304,7 +14257,6 @@
       "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
       "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
@@ -14322,7 +14274,6 @@
       "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
       "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "camelcase-css": "^2.0.1"
       },
@@ -14352,7 +14303,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "lilconfig": "^3.0.0",
         "yaml": "^2.3.4"
@@ -14388,7 +14338,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "postcss-selector-parser": "^6.1.1"
       },
@@ -14404,7 +14353,6 @@
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
       "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -14417,8 +14365,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/postgres": {
       "version": "3.4.5",
@@ -14478,6 +14425,85 @@
       "integrity": "sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==",
       "license": "MIT"
     },
+    "node_modules/prebuild-install": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
+      "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^2.0.0",
+        "node-abi": "^3.3.0",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^4.0.0",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0"
+      },
+      "bin": {
+        "prebuild-install": "bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/prebuild-install/node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/prebuild-install/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/prebuild-install/node_modules/tar-fs": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
+      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/prebuild-install/node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -14784,6 +14810,32 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dev": true,
+      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/rc/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/react": {
       "version": "19.1.0",
       "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
@@ -14845,21 +14897,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/react-email/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "license": "MIT",
-      "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/react-email/node_modules/cli-cursor": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
@@ -14996,19 +15033,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/react-email/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14.18.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/react-email/node_modules/restore-cursor": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
@@ -15062,7 +15086,6 @@
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "pify": "^2.3.0"
       }
@@ -15138,27 +15161,16 @@
       }
     },
     "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "license": "MIT",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
       "license": "MIT",
       "engines": {
-        "node": ">=8.6"
+        "node": ">= 14.18.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/redis-errors": {
@@ -15454,7 +15466,9 @@
       "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
       "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/run-async": {
       "version": "2.4.1",
@@ -15552,6 +15566,8 @@
       "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
       "license": "ISC",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "xmlchars": "^2.2.0"
       },
@@ -15882,6 +15898,53 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
     "node_modules/simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
@@ -16540,7 +16603,6 @@
       "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
       "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.2",
         "commander": "^4.0.0",
@@ -16563,7 +16625,6 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
       "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -16573,7 +16634,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
       "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^3.1.2",
@@ -16594,7 +16654,6 @@
       "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
       "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
       "license": "BlueOak-1.0.0",
-      "peer": true,
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
@@ -16610,7 +16669,6 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -16626,7 +16684,6 @@
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
       "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
       "license": "BlueOak-1.0.0",
-      "peer": true,
       "dependencies": {
         "lru-cache": "^10.2.0",
         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
@@ -16721,7 +16778,9 @@
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/synckit": {
       "version": "0.11.8",
@@ -16770,7 +16829,6 @@
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
       "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
@@ -16840,12 +16898,47 @@
         "tailwindcss": ">=3.4.17"
       }
     },
+    "node_modules/tailwindcss/node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/tailwindcss/node_modules/chokidar/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/tailwindcss/node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "license": "ISC",
-      "peer": true,
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -16853,6 +16946,18 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/tailwindcss/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/tailwindcss/node_modules/postcss": {
       "version": "8.5.6",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
@@ -16872,7 +16977,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -16882,6 +16986,18 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/tailwindcss/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
     "node_modules/tapable": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
@@ -17238,7 +17354,6 @@
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "any-promise": "^1.0.0"
       }
@@ -17248,7 +17363,6 @@
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "thenify": ">= 3.1.0 < 4"
       },
@@ -17335,6 +17449,8 @@
       "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "tldts-core": "^6.1.86"
       },
@@ -17347,7 +17463,9 @@
       "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
       "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/tmp": {
       "version": "0.0.33",
@@ -17414,6 +17532,8 @@
       "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "tldts": "^6.1.32"
       },
@@ -17427,6 +17547,8 @@
       "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "punycode": "^2.3.1"
       },
@@ -17470,8 +17592,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
       "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/tsconfck": {
       "version": "3.1.6",
@@ -17531,6 +17652,19 @@
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
@@ -18360,6 +18494,8 @@
       "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "xml-name-validator": "^5.0.0"
       },
@@ -18396,6 +18532,8 @@
       "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "dev": true,
       "license": "BSD-2-Clause",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -18602,6 +18740,8 @@
       "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "iconv-lite": "0.6.3"
       },
@@ -18615,6 +18755,8 @@
       "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -18625,6 +18767,8 @@
       "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "tr46": "^5.1.0",
         "webidl-conversions": "^7.0.0"
@@ -18777,6 +18921,8 @@
       "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -18799,6 +18945,8 @@
       "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
       "dev": true,
       "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -18808,7 +18956,9 @@
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/xtend": {
       "version": "4.0.2",
diff --git a/server/package.json b/server/package.json
index 9e3d32862d..cc11107c1c 100644
--- a/server/package.json
+++ b/server/package.json
@@ -64,14 +64,14 @@
     "bcrypt": "^6.0.0",
     "body-parser": "^2.2.0",
     "bullmq": "^5.51.0",
-    "chokidar": "^3.5.3",
+    "chokidar": "^4.0.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
     "compression": "^1.8.0",
     "cookie": "^1.0.2",
     "cookie-parser": "^1.4.7",
     "cron": "^3.5.0",
-    "exiftool-vendored": "^28.3.1",
+    "exiftool-vendored": "^28.8.0",
     "express": "^5.1.0",
     "fast-glob": "^3.3.2",
     "fluent-ffmpeg": "^2.1.2",
@@ -107,13 +107,14 @@
     "sharp": "^0.34.2",
     "sirv": "^3.0.0",
     "socket.io": "^4.8.1",
-    "tailwindcss-preset-email": "^1.3.2",
+    "tailwindcss-preset-email": "^1.4.0",
     "thumbhash": "^0.1.1",
     "typeorm": "^0.3.17",
     "ua-parser-js": "^2.0.0",
     "validator": "^13.12.0"
   },
   "devDependencies": {
+    "canvas": "^3.1.0",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.8.0",
     "@nestjs/cli": "^11.0.2",
@@ -151,7 +152,6 @@
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-unicorn": "^59.0.0",
     "globals": "^16.0.0",
-    "jsdom": "^26.1.0",
     "mock-fs": "^5.2.0",
     "node-addon-api": "^8.3.1",
     "node-gyp": "^11.2.0",
@@ -163,6 +163,7 @@
     "source-map-support": "^0.5.21",
     "sql-formatter": "^15.0.0",
     "supertest": "^7.1.0",
+    "tailwindcss": "^3.4.0",
     "testcontainers": "^11.0.0",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.3.3",
diff --git a/server/src/repositories/storage.repository.ts b/server/src/repositories/storage.repository.ts
index 15b81e7106..4d89b02a50 100644
--- a/server/src/repositories/storage.repository.ts
+++ b/server/src/repositories/storage.repository.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import archiver from 'archiver';
-import chokidar, { WatchOptions } from 'chokidar';
+import chokidar, { ChokidarOptions } from 'chokidar';
 import { escapePath, glob, globStream } from 'fast-glob';
 import { constants, createReadStream, createWriteStream, existsSync, mkdirSync } from 'node:fs';
 import fs from 'node:fs/promises';
@@ -219,14 +219,14 @@ export class StorageRepository {
     }
   }
 
-  watch(paths: string[], options: WatchOptions, events: Partial<WatchEvents>) {
+  watch(paths: string[], options: ChokidarOptions, events: Partial<WatchEvents>) {
     const watcher = chokidar.watch(paths, options);
 
     watcher.on('ready', () => events.onReady?.());
     watcher.on('add', (path) => events.onAdd?.(path));
     watcher.on('change', (path) => events.onChange?.(path));
     watcher.on('unlink', (path) => events.onUnlink?.(path));
-    watcher.on('error', (error) => events.onError?.(error));
+    watcher.on('error', (error) => events.onError?.(error as Error));
 
     return () => watcher.close();
   }
diff --git a/server/test/repositories/storage.repository.mock.ts b/server/test/repositories/storage.repository.mock.ts
index 984785d510..dc3fb3e16c 100644
--- a/server/test/repositories/storage.repository.mock.ts
+++ b/server/test/repositories/storage.repository.mock.ts
@@ -1,4 +1,4 @@
-import { WatchOptions } from 'chokidar';
+import { ChokidarOptions } from 'chokidar';
 import { StorageCore } from 'src/cores/storage.core';
 import { StorageRepository, WatchEvents } from 'src/repositories/storage.repository';
 import { RepositoryInterface } from 'src/types';
@@ -11,7 +11,7 @@ interface MockWatcherOptions {
 
 export const makeMockWatcher =
   ({ items, close }: MockWatcherOptions) =>
-  (paths: string[], options: WatchOptions, events: Partial<WatchEvents>) => {
+  (paths: string[], options: ChokidarOptions, events: Partial<WatchEvents>) => {
     events.onReady?.();
     for (const item of items || []) {
       switch (item.event) {
@@ -29,6 +29,7 @@ export const makeMockWatcher =
         }
         case 'error': {
           events.onError?.(new Error(item.value));
+          break;
         }
       }
     }
diff --git a/web/package-lock.json b/web/package-lock.json
index 408fd7f00e..4199e4e16b 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -69,6 +69,7 @@
         "eslint-plugin-unicorn": "^59.0.0",
         "factory.ts": "^1.4.1",
         "globals": "^16.0.0",
+        "happy-dom": "^18.0.1",
         "prettier": "^3.4.2",
         "prettier-plugin-organize-imports": "^4.0.0",
         "prettier-plugin-sort-json": "^4.1.1",
@@ -2972,6 +2973,13 @@
         "@types/geojson": "*"
       }
     },
+    "node_modules/@types/whatwg-mimetype": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/whatwg-mimetype/-/whatwg-mimetype-3.0.2.tgz",
+      "integrity": "sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "8.32.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
@@ -5615,6 +5623,31 @@
         "uglify-js": "^3.1.4"
       }
     },
+    "node_modules/happy-dom": {
+      "version": "18.0.1",
+      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-18.0.1.tgz",
+      "integrity": "sha512-qn+rKOW7KWpVTtgIUi6RVmTBZJSe2k0Db0vh1f7CWrWclkkc7/Q+FrOfkZIb2eiErLyqu5AXEzE7XthO9JVxRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "^20.0.0",
+        "@types/whatwg-mimetype": "^3.0.2",
+        "whatwg-mimetype": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/happy-dom/node_modules/@types/node": {
+      "version": "20.19.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.2.tgz",
+      "integrity": "sha512-9pLGGwdzOUBDYi0GNjM97FIA+f92fqSke6joWeBjWXllfNxZBs7qeMF7tvtOIsbY45xkWkxrdwUfUf3MnQa9gA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.21.0"
+      }
+    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -9955,8 +9988,8 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
       "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=12"
       }
diff --git a/web/package.json b/web/package.json
index 0dd35971cc..5a86897f2b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -86,6 +86,7 @@
     "eslint-plugin-unicorn": "^59.0.0",
     "factory.ts": "^1.4.1",
     "globals": "^16.0.0",
+    "happy-dom": "^18.0.1",
     "prettier": "^3.4.2",
     "prettier-plugin-organize-imports": "^4.0.0",
     "prettier-plugin-sort-json": "^4.1.1",
diff --git a/web/src/lib/utils/asset-utils.spec.ts b/web/src/lib/utils/asset-utils.spec.ts
index b3a668192d..b0f76f3bc2 100644
--- a/web/src/lib/utils/asset-utils.spec.ts
+++ b/web/src/lib/utils/asset-utils.spec.ts
@@ -58,7 +58,8 @@ describe('get asset filename', () => {
 });
 
 describe('copy image to clipboard', () => {
-  it('should not allow copy image to clipboard', () => {
-    expect(canCopyImageToClipboard()).toEqual(false);
+  // This test is dubious, as it totally on the environment where the test is run which is mocked.
+  it('should allow copy image to clipboard', () => {
+    expect(canCopyImageToClipboard()).toEqual(true);
   });
 });
diff --git a/web/vite.config.js b/web/vite.config.js
index 748c815646..e55f606b86 100644
--- a/web/vite.config.js
+++ b/web/vite.config.js
@@ -53,7 +53,7 @@ export default defineConfig({
   test: {
     include: ['src/**/*.{test,spec}.{js,ts}'],
     globals: true,
-    environment: 'jsdom',
+    environment: 'happy-dom',
     setupFiles: ['./src/test-data/setup.ts'],
     sequence: {
       hooks: 'list',

From 3c6e9e1191f35a54402801aff7bdb88da79320da Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Tue, 1 Jul 2025 05:24:44 +0200
Subject: [PATCH 095/337] feat: use request host as default SSR domain (#19485)

fix: hostname and domain confusion

chore: e2e test
---
 e2e/src/api/specs/shared-link.e2e-spec.ts  | 7 +++++++
 server/src/services/api.service.ts         | 5 ++++-
 server/src/services/shared-link.service.ts | 4 ++--
 server/src/utils/misc.ts                   | 3 ++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/e2e/src/api/specs/shared-link.e2e-spec.ts b/e2e/src/api/specs/shared-link.e2e-spec.ts
index 97aa252dbb..d9f8672c66 100644
--- a/e2e/src/api/specs/shared-link.e2e-spec.ts
+++ b/e2e/src/api/specs/shared-link.e2e-spec.ts
@@ -117,6 +117,13 @@ describe('/shared-links', () => {
       const resp = await request(shareUrl).get(`/${linkWithAssets.key}`);
       expect(resp.status).toBe(200);
       expect(resp.header['content-type']).toContain('text/html');
+      expect(resp.text).toContain(`<meta property="og:image" content="http://127.0.0.1:2285`);
+    });
+
+    it('should fall back to my.immich.app og:image meta tag for shared asset if Host header is not present', async () => {
+      const resp = await request(shareUrl).get(`/${linkWithAssets.key}`).set('Host', '');
+      expect(resp.status).toBe(200);
+      expect(resp.header['content-type']).toContain('text/html');
       expect(resp.text).toContain(`<meta property="og:image" content="https://my.immich.app`);
     });
 
diff --git a/server/src/services/api.service.ts b/server/src/services/api.service.ts
index 6b40aa46ef..064b2e268d 100644
--- a/server/src/services/api.service.ts
+++ b/server/src/services/api.service.ts
@@ -86,7 +86,10 @@ export class ApiService {
         try {
           const key = shareMatches[1];
           const auth = await this.authService.validateSharedLink(key);
-          const meta = await this.sharedLinkService.getMetadataTags(auth);
+          const meta = await this.sharedLinkService.getMetadataTags(
+            auth,
+            request.host ? `${request.protocol}://${request.host}` : undefined,
+          );
           if (meta) {
             html = render(index, meta);
           }
diff --git a/server/src/services/shared-link.service.ts b/server/src/services/shared-link.service.ts
index 17f1b974d2..c70b31a3a1 100644
--- a/server/src/services/shared-link.service.ts
+++ b/server/src/services/shared-link.service.ts
@@ -174,7 +174,7 @@ export class SharedLinkService extends BaseService {
     return results;
   }
 
-  async getMetadataTags(auth: AuthDto): Promise<null | OpenGraphTags> {
+  async getMetadataTags(auth: AuthDto, defaultDomain?: string): Promise<null | OpenGraphTags> {
     if (!auth.sharedLink || auth.sharedLink.password) {
       return null;
     }
@@ -190,7 +190,7 @@ export class SharedLinkService extends BaseService {
     return {
       title: sharedLink.album ? sharedLink.album.albumName : 'Public Share',
       description: sharedLink.description || `${assetCount} shared photos & videos`,
-      imageUrl: new URL(imagePath, getExternalDomain(config.server)).href,
+      imageUrl: new URL(imagePath, getExternalDomain(config.server, defaultDomain)).href,
     };
   }
 
diff --git a/server/src/utils/misc.ts b/server/src/utils/misc.ts
index 05811350e4..742e98c1c3 100644
--- a/server/src/utils/misc.ts
+++ b/server/src/utils/misc.ts
@@ -44,7 +44,8 @@ export const getMethodNames = (instance: any) => {
   return methods;
 };
 
-export const getExternalDomain = (server: SystemConfig['server']) => server.externalDomain || `https://my.immich.app`;
+export const getExternalDomain = (server: SystemConfig['server'], defaultDomain = 'https://my.immich.app') =>
+  server.externalDomain || defaultDomain;
 
 /**
  * @returns a list of strings representing the keys of the object in dot notation

From a068a41c0691b77d5f06377cbb211cff2c6d6db9 Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Tue, 1 Jul 2025 06:28:30 +0300
Subject: [PATCH 096/337] fix(server): prevent duplicate geodata temp table
 (#18580)

drop tmp table, create gist index first
---
 server/src/repositories/map.repository.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/src/repositories/map.repository.ts b/server/src/repositories/map.repository.ts
index cdfe0dbe22..36c45bcb71 100644
--- a/server/src/repositories/map.repository.ts
+++ b/server/src/repositories/map.repository.ts
@@ -232,6 +232,7 @@ export class MapRepository {
       this.loadAdmin(resourcePaths.geodata.admin2),
     ]);
 
+    await this.db.schema.dropTable('geodata_places_tmp').ifExists().execute();
     await this.db.transaction().execute(async (manager) => {
       await sql`CREATE TABLE geodata_places_tmp
                 (
@@ -240,7 +241,12 @@ export class MapRepository {
       await manager.schema.dropTable('geodata_places').execute();
       await manager.schema.alterTable('geodata_places_tmp').renameTo('geodata_places').execute();
     });
-
+    await this.db.schema
+      .createIndex('IDX_geodata_gist_earthcoord')
+      .on('geodata_places')
+      .using('gist')
+      .expression(sql`ll_to_earth_public(latitude, longitude)`)
+      .execute();
     await this.loadCities500(admin1, admin2);
     await this.createGeodataIndices();
   }
@@ -325,12 +331,6 @@ export class MapRepository {
   private createGeodataIndices() {
     return Promise.all([
       sql`ALTER TABLE geodata_places ADD PRIMARY KEY (id) WITH (FILLFACTOR = 100)`.execute(this.db),
-      sql`
-        CREATE INDEX IDX_geodata_gist_earthcoord
-                ON geodata_places
-                USING gist (ll_to_earth_public(latitude, longitude))
-                WITH (fillfactor = 100)
-      `.execute(this.db),
       this.db.schema
         .createIndex(`idx_geodata_places_alternate_names`)
         .on('geodata_places')

From 29b3981609af752bbf088ee97842516261056222 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 10:27:20 +0100
Subject: [PATCH 097/337] fix(deps): update dependency nestjs-kysely to v3
 (#19660)

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

diff --git a/server/package-lock.json b/server/package-lock.json
index c2ce36bad4..6c7ac46098 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -63,7 +63,7 @@
         "multer": "^2.0.1",
         "nest-commander": "^3.16.0",
         "nestjs-cls": "^5.0.0",
-        "nestjs-kysely": "^1.1.0",
+        "nestjs-kysely": "^3.0.0",
         "nestjs-otel": "^6.0.0",
         "nodemailer": "^7.0.0",
         "openid-client": "^6.3.3",
@@ -13116,9 +13116,9 @@
       }
     },
     "node_modules/nestjs-kysely": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/nestjs-kysely/-/nestjs-kysely-1.2.0.tgz",
-      "integrity": "sha512-KseCGb0SXCzIYC+Hx3Z3d+kPAfSZCSK6j9UoqUV/gcBCPad9utC7itmoUw0/w5sV+Jf9pc1DKpgClP1IkflA4w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/nestjs-kysely/-/nestjs-kysely-3.0.0.tgz",
+      "integrity": "sha512-YA6tHBgXQYPNpMBPII2OvUOiaWjCCoh5pP5dUHirQcMUHxNFzInBL6MDk8y74rk2z/5IvAK9AUlsdPyJtToO6g==",
       "license": "MIT",
       "peerDependencies": {
         "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0",
diff --git a/server/package.json b/server/package.json
index cc11107c1c..98d87ed535 100644
--- a/server/package.json
+++ b/server/package.json
@@ -88,7 +88,7 @@
     "multer": "^2.0.1",
     "nest-commander": "^3.16.0",
     "nestjs-cls": "^5.0.0",
-    "nestjs-kysely": "^1.1.0",
+    "nestjs-kysely": "^3.0.0",
     "nestjs-otel": "^6.0.0",
     "nodemailer": "^7.0.0",
     "openid-client": "^6.3.3",

From 214ca50406e9d9d9327d81718f99da58c2c5d856 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 10:59:31 +0100
Subject: [PATCH 098/337] chore(deps): update node.js to v22.17.0 (#19656)

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

diff --git a/.github/.nvmrc b/.github/.nvmrc
index 5b540673a8..fc37597bcc 100644
--- a/.github/.nvmrc
+++ b/.github/.nvmrc
@@ -1 +1 @@
-22.16.0
+22.17.0
diff --git a/cli/.nvmrc b/cli/.nvmrc
index 5b540673a8..fc37597bcc 100644
--- a/cli/.nvmrc
+++ b/cli/.nvmrc
@@ -1 +1 @@
-22.16.0
+22.17.0
diff --git a/cli/package.json b/cli/package.json
index e8c3ac6f3f..abf44944db 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -69,6 +69,6 @@
     "micromatch": "^4.0.8"
   },
   "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
   }
 }
diff --git a/docs/.nvmrc b/docs/.nvmrc
index 5b540673a8..fc37597bcc 100644
--- a/docs/.nvmrc
+++ b/docs/.nvmrc
@@ -1 +1 @@
-22.16.0
+22.17.0
diff --git a/docs/package.json b/docs/package.json
index dba22fc199..4dca627faa 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -59,6 +59,6 @@
     "node": ">=20"
   },
   "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
   }
 }
diff --git a/e2e/.nvmrc b/e2e/.nvmrc
index 5b540673a8..fc37597bcc 100644
--- a/e2e/.nvmrc
+++ b/e2e/.nvmrc
@@ -1 +1 @@
-22.16.0
+22.17.0
diff --git a/e2e/package.json b/e2e/package.json
index d2d5857ed5..15733e0d4f 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -53,6 +53,6 @@
     "vitest": "^3.0.0"
   },
   "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
   }
 }
diff --git a/open-api/typescript-sdk/.nvmrc b/open-api/typescript-sdk/.nvmrc
index 5b540673a8..fc37597bcc 100644
--- a/open-api/typescript-sdk/.nvmrc
+++ b/open-api/typescript-sdk/.nvmrc
@@ -1 +1 @@
-22.16.0
+22.17.0
diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json
index b699fce7a8..b80d5cd01a 100644
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -28,6 +28,6 @@
     "directory": "open-api/typescript-sdk"
   },
   "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
   }
 }
diff --git a/server/.nvmrc b/server/.nvmrc
index 5b540673a8..fc37597bcc 100644
--- a/server/.nvmrc
+++ b/server/.nvmrc
@@ -1 +1 @@
-22.16.0
+22.17.0
diff --git a/server/package.json b/server/package.json
index 98d87ed535..aada75bae8 100644
--- a/server/package.json
+++ b/server/package.json
@@ -174,7 +174,7 @@
     "vitest": "^3.0.0"
   },
   "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
   },
   "overrides": {
     "sharp": "^0.34.2"
diff --git a/web/.nvmrc b/web/.nvmrc
index 5b540673a8..fc37597bcc 100644
--- a/web/.nvmrc
+++ b/web/.nvmrc
@@ -1 +1 @@
-22.16.0
+22.17.0
diff --git a/web/package.json b/web/package.json
index 5a86897f2b..14eb178d91 100644
--- a/web/package.json
+++ b/web/package.json
@@ -103,6 +103,6 @@
     "vitest": "^3.0.0"
   },
   "volta": {
-    "node": "22.16.0"
+    "node": "22.17.0"
   }
 }

From 36b018e355ff059ffd79e585f9f2a4270026c6d5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 10:00:35 +0000
Subject: [PATCH 099/337] fix(deps): update typescript-projects (#18898)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Zack Pollard <zackpollard@ymail.com>
---
 .github/package-lock.json                     |    6 +-
 cli/package-lock.json                         |  462 +++--
 .../docs/administration/backup-and-restore.md |    3 -
 docs/docs/administration/oauth.md             |    6 -
 docs/docs/developer/devcontainers.md          |    5 -
 docs/docs/install/unraid.md                   |    1 -
 docs/package-lock.json                        | 1533 ++++++-----------
 docs/package.json                             |    8 +-
 e2e/package-lock.json                         |  913 +++++-----
 e2e/package.json                              |    2 +-
 server/Dockerfile                             |    3 +-
 server/package-lock.json                      | 1490 +++++-----------
 server/package.json                           |   14 +-
 server/patches/postgres+3.4.5.patch           |   48 -
 web/package-lock.json                         | 1383 +++++++++++----
 web/package.json                              |    2 +-
 16 files changed, 2838 insertions(+), 3041 deletions(-)
 delete mode 100644 server/patches/postgres+3.4.5.patch

diff --git a/.github/package-lock.json b/.github/package-lock.json
index 423661befb..2e430ce056 100644
--- a/.github/package-lock.json
+++ b/.github/package-lock.json
@@ -9,9 +9,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
+      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
       "dev": true,
       "license": "MIT",
       "bin": {
diff --git a/cli/package-lock.json b/cli/package-lock.json
index b8ba2a077a..c669838c26 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -607,9 +607,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
+      "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -682,9 +682,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
-      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
+      "version": "9.29.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
+      "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1276,6 +1276,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/chai": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.2.tgz",
+      "integrity": "sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/deep-eql": "*"
+      }
+    },
     "node_modules/@types/cli-progress": {
       "version": "3.11.6",
       "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.6.tgz",
@@ -1286,6 +1296,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/deep-eql": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
+      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/estree": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
@@ -1348,17 +1365,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
-      "integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz",
+      "integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/type-utils": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/type-utils": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -1372,7 +1389,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "@typescript-eslint/parser": "^8.35.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
@@ -1388,16 +1405,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
-      "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz",
+      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1412,15 +1429,37 @@
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
-      "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
+      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1"
+        "@typescript-eslint/tsconfig-utils": "^8.35.0",
+        "@typescript-eslint/types": "^8.35.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
+      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1430,15 +1469,32 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
+      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
-      "integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
+      "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
+        "@typescript-eslint/typescript-estree": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -1455,9 +1511,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
-      "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1469,14 +1525,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
-      "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
+      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/project-service": "8.35.0",
+        "@typescript-eslint/tsconfig-utils": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -1496,9 +1554,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1522,16 +1580,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
-      "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
+      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1"
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1546,14 +1604,14 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
-      "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
+      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "eslint-visitor-keys": "^4.2.0"
+        "@typescript-eslint/types": "8.35.0",
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1564,15 +1622,16 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.1.4.tgz",
-      "integrity": "sha512-G4p6OtioySL+hPV7Y6JHlhpsODbJzt1ndwHAFkyk6vVjpK03PFsKnauZIzcd0PrK4zAbc5lc+jeZ+eNGiMA+iw==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.2.4.tgz",
+      "integrity": "sha512-EyF9SXU6kS5Ku/U82E259WSnvg6c8KTjppUncuNdm5QHpe17mwREHnjDzozC8x9MZ0xfBUFSaLkRv4TMA75ALQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
         "@bcoe/v8-coverage": "^1.0.2",
-        "debug": "^4.4.0",
+        "ast-v8-to-istanbul": "^0.3.3",
+        "debug": "^4.4.1",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
         "istanbul-lib-source-maps": "^5.0.6",
@@ -1587,8 +1646,8 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "3.1.4",
-        "vitest": "3.1.4"
+        "@vitest/browser": "3.2.4",
+        "vitest": "3.2.4"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -1597,14 +1656,15 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz",
-      "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
+      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.1.4",
-        "@vitest/utils": "3.1.4",
+        "@types/chai": "^5.2.2",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
         "chai": "^5.2.0",
         "tinyrainbow": "^2.0.0"
       },
@@ -1613,13 +1673,13 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz",
-      "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
+      "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.1.4",
+        "@vitest/spy": "3.2.4",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.17"
       },
@@ -1628,7 +1688,7 @@
       },
       "peerDependencies": {
         "msw": "^2.4.9",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "peerDependenciesMeta": {
         "msw": {
@@ -1640,9 +1700,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz",
-      "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
+      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1653,27 +1713,28 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz",
-      "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz",
+      "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "3.1.4",
-        "pathe": "^2.0.3"
+        "@vitest/utils": "3.2.4",
+        "pathe": "^2.0.3",
+        "strip-literal": "^3.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz",
-      "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz",
+      "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
+        "@vitest/pretty-format": "3.2.4",
         "magic-string": "^0.30.17",
         "pathe": "^2.0.3"
       },
@@ -1682,27 +1743,27 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz",
-      "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
+      "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tinyspy": "^3.0.2"
+        "tinyspy": "^4.0.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz",
-      "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
+      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
-        "loupe": "^3.1.3",
+        "@vitest/pretty-format": "3.2.4",
+        "loupe": "^3.1.4",
         "tinyrainbow": "^2.0.0"
       },
       "funding": {
@@ -1710,9 +1771,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -1792,6 +1853,18 @@
         "node": ">=12"
       }
     },
+    "node_modules/ast-v8-to-istanbul": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.3.tgz",
+      "integrity": "sha512-MuXMrSLVVoA6sYN/6Hke18vMzrT4TZNbZIj/hvh0fnYFpO+/kFXcLIaiPwXXWaQUPg4yJD8fj+lfJ7/1EBconw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "estree-walker": "^3.0.3",
+        "js-tokens": "^9.0.1"
+      }
+    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -2105,9 +2178,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2232,19 +2305,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
-      "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
+      "version": "9.29.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
+      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.0",
+        "@eslint/config-array": "^0.20.1",
         "@eslint/config-helpers": "^0.2.1",
         "@eslint/core": "^0.14.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.27.0",
+        "@eslint/js": "9.29.0",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -2256,9 +2329,9 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -2309,14 +2382,14 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.0.tgz",
-      "integrity": "sha512-BvQOvUhkVQM1i63iMETK9Hjud9QhqBnbtT1Zc642p9ynzBuCe5pybkOnvqZIBypXmMlsGcnU4HZ8sCTPfpAexA==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.1.tgz",
+      "integrity": "sha512-dobTkHT6XaEVOo8IO90Q4DOSxnm3Y151QxPJlM/vKC0bVy+d6cVWQZLlFiuZPP0wS6vZwSKeJgKkcS+KfMBlRw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0",
-        "synckit": "^0.11.0"
+        "synckit": "^0.11.7"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -2402,9 +2475,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -2419,9 +2492,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -2432,15 +2505,15 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2749,9 +2822,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.1.0.tgz",
-      "integrity": "sha512-aibexHNbb/jiUSObBgpHLj+sIuUmJnYcgXBlrfsiDZ9rt4aF2TFRbyLgZ2iFQuVZ1K5Mx3FVkbKRSgKrbK3K2g==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
+      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2975,6 +3048,13 @@
         "@pkgjs/parseargs": "^0.11.0"
       }
     },
+    "node_modules/js-tokens": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -3076,9 +3156,9 @@
       "license": "MIT"
     },
     "node_modules/loupe": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
-      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.4.tgz",
+      "integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
       "dev": true,
       "license": "MIT"
     },
@@ -3347,9 +3427,9 @@
       "license": "MIT"
     },
     "node_modules/pathval": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
-      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
+      "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3425,9 +3505,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
+      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -3799,6 +3879,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/strip-literal": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz",
+      "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^9.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -3813,14 +3906,13 @@
       }
     },
     "node_modules/synckit": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.4.tgz",
-      "integrity": "sha512-Q/XQKRaJiLiFIBNN+mndW7S/RHxvwzuZS6ZwmRzUBqJBv/5QIKCEwkBC8GBf8EQJKYnaFs0wOZbKTXBPj8L9oQ==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.8.tgz",
+      "integrity": "sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@pkgr/core": "^0.2.3",
-        "tslib": "^2.8.1"
+        "@pkgr/core": "^0.2.4"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -3885,9 +3977,9 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
-      "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3930,9 +4022,9 @@
       }
     },
     "node_modules/tinypool": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
-      "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3950,9 +4042,9 @@
       }
     },
     "node_modules/tinyspy": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
-      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.3.tgz",
+      "integrity": "sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4005,13 +4097,6 @@
         }
       }
     },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true,
-      "license": "0BSD"
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -4040,15 +4125,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.1.tgz",
-      "integrity": "sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.0.tgz",
+      "integrity": "sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.32.1",
-        "@typescript-eslint/parser": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1"
+        "@typescript-eslint/eslint-plugin": "8.35.0",
+        "@typescript-eslint/parser": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4186,17 +4271,17 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz",
-      "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
+      "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.4.0",
+        "debug": "^4.4.1",
         "es-module-lexer": "^1.7.0",
         "pathe": "^2.0.3",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "bin": {
         "vite-node": "vite-node.mjs"
@@ -4257,32 +4342,34 @@
       }
     },
     "node_modules/vitest": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz",
-      "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
+      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "3.1.4",
-        "@vitest/mocker": "3.1.4",
-        "@vitest/pretty-format": "^3.1.4",
-        "@vitest/runner": "3.1.4",
-        "@vitest/snapshot": "3.1.4",
-        "@vitest/spy": "3.1.4",
-        "@vitest/utils": "3.1.4",
+        "@types/chai": "^5.2.2",
+        "@vitest/expect": "3.2.4",
+        "@vitest/mocker": "3.2.4",
+        "@vitest/pretty-format": "^3.2.4",
+        "@vitest/runner": "3.2.4",
+        "@vitest/snapshot": "3.2.4",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
         "chai": "^5.2.0",
-        "debug": "^4.4.0",
+        "debug": "^4.4.1",
         "expect-type": "^1.2.1",
         "magic-string": "^0.30.17",
         "pathe": "^2.0.3",
+        "picomatch": "^4.0.2",
         "std-env": "^3.9.0",
         "tinybench": "^2.9.0",
         "tinyexec": "^0.3.2",
-        "tinyglobby": "^0.2.13",
-        "tinypool": "^1.0.2",
+        "tinyglobby": "^0.2.14",
+        "tinypool": "^1.1.1",
         "tinyrainbow": "^2.0.0",
-        "vite": "^5.0.0 || ^6.0.0",
-        "vite-node": "3.1.4",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
+        "vite-node": "3.2.4",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -4298,8 +4385,8 @@
         "@edge-runtime/vm": "*",
         "@types/debug": "^4.1.12",
         "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.1.4",
-        "@vitest/ui": "3.1.4",
+        "@vitest/browser": "3.2.4",
+        "@vitest/ui": "3.2.4",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -4340,6 +4427,19 @@
         "vitest": ">=2.0.0"
       }
     },
+    "node_modules/vitest/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/docs/docs/administration/backup-and-restore.md b/docs/docs/administration/backup-and-restore.md
index 50f2d01ebf..deeefa5635 100644
--- a/docs/docs/administration/backup-and-restore.md
+++ b/docs/docs/administration/backup-and-restore.md
@@ -150,12 +150,10 @@ for more info read the [release notes](https://github.com/immich-app/immich/rele
   - Preview images (small thumbnails and large previews) for each asset and thumbnails for recognized faces.
   - Stored in `UPLOAD_LOCATION/thumbs/<userID>`.
 - **Encoded Assets:**
-
   - Videos that have been re-encoded from the original for wider compatibility. The original is not removed.
   - Stored in `UPLOAD_LOCATION/encoded-video/<userID>`.
 
 - **Postgres**
-
   - The Immich database containing all the information to allow the system to function properly.  
     **Note:** This folder will only appear to users who have made the changes mentioned in [v1.102.0](https://github.com/immich-app/immich/discussions/8930) (an optional, non-mandatory change) or who started with this version.
   - Stored in `DB_DATA_LOCATION`.
@@ -201,7 +199,6 @@ When you turn off the storage template engine, it will leave the assets in `UPLO
   - Temporarily located in `UPLOAD_LOCATION/upload/<userID>`.
   - Transferred to `UPLOAD_LOCATION/library/<userID>` upon successful upload.
 - **Postgres**
-
   - The Immich database containing all the information to allow the system to function properly.  
     **Note:** This folder will only appear to users who have made the changes mentioned in [v1.102.0](https://github.com/immich-app/immich/discussions/8930) (an optional, non-mandatory change) or who started with this version.
   - Stored in `DB_DATA_LOCATION`.
diff --git a/docs/docs/administration/oauth.md b/docs/docs/administration/oauth.md
index b60b5dbb8b..5105d2eb75 100644
--- a/docs/docs/administration/oauth.md
+++ b/docs/docs/administration/oauth.md
@@ -20,7 +20,6 @@ Immich supports 3rd party authentication via [OpenID Connect][oidc] (OIDC), an i
 Before enabling OAuth in Immich, a new client application needs to be configured in the 3rd-party authentication server. While the specifics of this setup vary from provider to provider, the general approach should be the same.
 
 1. Create a new (Client) Application
-
    1. The **Provider** type should be `OpenID Connect` or `OAuth2`
    2. The **Client type** should be `Confidential`
    3. The **Application** type should be `Web`
@@ -29,7 +28,6 @@ Before enabling OAuth in Immich, a new client application needs to be configured
 2. Configure Redirect URIs/Origins
 
    The **Sign-in redirect URIs** should include:
-
    - `app.immich:///oauth-callback` - for logging in with OAuth from the [Mobile App](/docs/features/mobile-app.mdx)
    - `http://DOMAIN:PORT/auth/login` - for logging in with OAuth from the Web Client
    - `http://DOMAIN:PORT/user-settings` - for manually linking OAuth in the Web Client
@@ -37,21 +35,17 @@ Before enabling OAuth in Immich, a new client application needs to be configured
    Redirect URIs should contain all the domains you will be using to access Immich. Some examples include:
 
    Mobile
-
    - `app.immich:///oauth-callback` (You **MUST** include this for iOS and Android mobile apps to work properly)
 
    Localhost
-
    - `http://localhost:2283/auth/login`
    - `http://localhost:2283/user-settings`
 
    Local IP
-
    - `http://192.168.0.200:2283/auth/login`
    - `http://192.168.0.200:2283/user-settings`
 
    Hostname
-
    - `https://immich.example.com/auth/login`
    - `https://immich.example.com/user-settings`
 
diff --git a/docs/docs/developer/devcontainers.md b/docs/docs/developer/devcontainers.md
index 10cb733383..1aab5ad327 100644
--- a/docs/docs/developer/devcontainers.md
+++ b/docs/docs/developer/devcontainers.md
@@ -199,13 +199,11 @@ To use your SSH key for commit signing, see the [GitHub guide on SSH commit sign
 When the Dev Container starts, it automatically:
 
 1. **Runs post-create script** (`container-server-post-create.sh`):
-
    - Adjusts file permissions for the `node` user
    - Installs dependencies: `npm install` in all packages
    - Builds TypeScript SDK: `npm run build` in `open-api/typescript-sdk`
 
 2. **Starts development servers** via VS Code tasks:
-
    - `Immich API Server (Nest)` - API server with hot-reloading on port 2283
    - `Immich Web Server (Vite)` - Web frontend with hot-reloading on port 3000
    - Both servers watch for file changes and recompile automatically
@@ -335,14 +333,12 @@ make install-all      # Install all dependencies
 The Dev Container is pre-configured for debugging:
 
 1. **API Server Debugging**:
-
    - Set breakpoints in VS Code
    - Press `F5` or use "Run and Debug" panel
    - Select "Attach to Server" configuration
    - Debug port: 9231
 
 2. **Worker Debugging**:
-
    - Use "Attach to Workers" configuration
    - Debug port: 9230
 
@@ -428,7 +424,6 @@ While the Dev Container focuses on server and web development, you can connect m
    ```
 
 2. **Configure mobile app**:
-
    - Server URL: `http://YOUR_IP:2283/api`
    - Ensure firewall allows port 2283
 
diff --git a/docs/docs/install/unraid.md b/docs/docs/install/unraid.md
index 344b912aea..efb493f267 100644
--- a/docs/docs/install/unraid.md
+++ b/docs/docs/install/unraid.md
@@ -75,7 +75,6 @@ alt="Select Plugins > Compose.Manager > Add New Stack > Label it Immich"
 5.  Click "**Save Changes**", you will be prompted to edit stack UI labels, just leave this blank and click "**Ok**"
 6.  Select the cog ⚙️ next to Immich, click "**Edit Stack**", then click "**Env File**"
 7.  Paste the entire contents of the [Immich example.env](https://github.com/immich-app/immich/releases/latest/download/example.env) file into the Unraid editor, then **before saving** edit the following:
-
     - `UPLOAD_LOCATION`: Create a folder in your Images Unraid share and place the **absolute** location here > For example my _"images"_ share has a folder within it called _"immich"_. If I browse to this directory in the terminal and type `pwd` the output is `/mnt/user/images/immich`. This is the exact value I need to enter as my `UPLOAD_LOCATION`
     - `DB_DATA_LOCATION`: Change this to use an Unraid share (preferably a cache pool, e.g. `/mnt/user/appdata/postgresql/data`). This uses the `appdata` share. Do also create the `postgresql` folder, by running `mkdir /mnt/user/{share_location}/postgresql/data`. If left at default it will try to use Unraid's `/boot/config/plugins/compose.manager/projects/[stack_name]/postgres` folder which it doesn't have permissions to, resulting in this container continuously restarting.
 
diff --git a/docs/package-lock.json b/docs/package-lock.json
index 83c7514a38..b2cafa05f0 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -8,9 +8,9 @@
       "name": "documentation",
       "version": "0.0.0",
       "dependencies": {
-        "@docusaurus/core": "~3.7.0",
-        "@docusaurus/preset-classic": "~3.7.0",
-        "@docusaurus/theme-common": "~3.7.0",
+        "@docusaurus/core": "~3.8.0",
+        "@docusaurus/preset-classic": "~3.8.0",
+        "@docusaurus/theme-common": "~3.8.0",
         "@mdi/js": "^7.3.67",
         "@mdi/react": "^1.6.1",
         "@mdx-js/react": "^3.0.0",
@@ -29,7 +29,7 @@
         "url": "^0.11.0"
       },
       "devDependencies": {
-        "@docusaurus/module-type-aliases": "~3.7.0",
+        "@docusaurus/module-type-aliases": "~3.8.0",
         "@docusaurus/tsconfig": "^3.7.0",
         "@docusaurus/types": "^3.7.0",
         "prettier": "^3.2.4",
@@ -1982,9 +1982,9 @@
       }
     },
     "node_modules/@csstools/cascade-layer-name-parser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-2.0.4.tgz",
-      "integrity": "sha512-7DFHlPuIxviKYZrOiwVU/PiHLm3lLUR23OMuEEtfEOQTOp9hzQ2JjdY6X5H18RVuUPJqSCI+qNnD5iOLMVE0bA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-2.0.5.tgz",
+      "integrity": "sha512-p1ko5eHgV+MgXFVa4STPKpvPxr6ReS8oS2jzTukjR74i5zJNyWO1ZM1m8YKBXnzDKWfBN1ztLYlHxbVemDD88A==",
       "funding": [
         {
           "type": "github",
@@ -2000,8 +2000,8 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/color-helpers": {
@@ -2024,9 +2024,9 @@
       }
     },
     "node_modules/@csstools/css-calc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz",
-      "integrity": "sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
+      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
       "funding": [
         {
           "type": "github",
@@ -2042,14 +2042,14 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz",
-      "integrity": "sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.10.tgz",
+      "integrity": "sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==",
       "funding": [
         {
           "type": "github",
@@ -2063,20 +2063,20 @@
       "license": "MIT",
       "dependencies": {
         "@csstools/color-helpers": "^5.0.2",
-        "@csstools/css-calc": "^2.1.2"
+        "@csstools/css-calc": "^2.1.4"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz",
-      "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
       "funding": [
         {
           "type": "github",
@@ -2092,13 +2092,13 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz",
-      "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
       "funding": [
         {
           "type": "github",
@@ -2115,9 +2115,9 @@
       }
     },
     "node_modules/@csstools/media-query-list-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.2.tgz",
-      "integrity": "sha512-EUos465uvVvMJehckATTlNqGj4UJWkTmdWuDMjqvSUkjGpmOyFZBVwb4knxCm/k2GMTXY+c/5RkdndzFYWeX5A==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.3.tgz",
+      "integrity": "sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==",
       "funding": [
         {
           "type": "github",
@@ -2133,14 +2133,14 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/postcss-cascade-layers": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-5.0.1.tgz",
-      "integrity": "sha512-XOfhI7GShVcKiKwmPAnWSqd2tBR0uxt+runAxttbSp/LY2U16yAVPmAf7e9q4JJ0d+xMNmpwNDLBXnmRCl3HMQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-5.0.2.tgz",
+      "integrity": "sha512-nWBE08nhO8uWl6kSAeCx4im7QfVko3zLrtgWZY4/bP87zrSPpSyN/3W3TDqz1jJuH+kbKOHXg5rJnK+ZVYcFFg==",
       "funding": [
         {
           "type": "github",
@@ -2199,9 +2199,9 @@
       }
     },
     "node_modules/@csstools/postcss-color-function": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-4.0.8.tgz",
-      "integrity": "sha512-9dUvP2qpZI6PlGQ/sob+95B3u5u7nkYt9yhZFCC7G9HBRHBxj+QxS/wUlwaMGYW0waf+NIierI8aoDTssEdRYw==",
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-4.0.10.tgz",
+      "integrity": "sha512-4dY0NBu7NVIpzxZRgh/Q/0GPSz/jLSw0i/u3LTUor0BkQcz/fNhN10mSWBDsL0p9nDb0Ky1PD6/dcGbhACuFTQ==",
       "funding": [
         {
           "type": "github",
@@ -2214,10 +2214,10 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-color-parser": "^3.0.8",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/css-color-parser": "^3.0.10",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0"
       },
       "engines": {
@@ -2228,9 +2228,9 @@
       }
     },
     "node_modules/@csstools/postcss-color-mix-function": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-3.0.8.tgz",
-      "integrity": "sha512-yuZpgWUzqZWQhEqfvtJufhl28DgO9sBwSbXbf/59gejNuvZcoUTRGQZhzhwF4ccqb53YAGB+u92z9+eSKoB4YA==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-3.0.10.tgz",
+      "integrity": "sha512-P0lIbQW9I4ShE7uBgZRib/lMTf9XMjJkFl/d6w4EMNHu2qvQ6zljJGEcBkw/NsBtq/6q3WrmgxSS8kHtPMkK4Q==",
       "funding": [
         {
           "type": "github",
@@ -2243,10 +2243,39 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-color-parser": "^3.0.8",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/css-color-parser": "^3.0.10",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-color-mix-variadic-function-arguments": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-mix-variadic-function-arguments/-/postcss-color-mix-variadic-function-arguments-1.0.0.tgz",
+      "integrity": "sha512-Z5WhouTyD74dPFPrVE7KydgNS9VvnjB8qcdes9ARpCOItb4jTnm7cHp4FhxCRUoyhabD0WVv43wbkJ4p8hLAlQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.0.10",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0"
       },
       "engines": {
@@ -2257,9 +2286,9 @@
       }
     },
     "node_modules/@csstools/postcss-content-alt-text": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-content-alt-text/-/postcss-content-alt-text-2.0.4.tgz",
-      "integrity": "sha512-YItlZUOuZJCBlRaCf8Aucc1lgN41qYGALMly0qQllrxYJhiyzlI6RxOTMUvtWk+KhS8GphMDsDhKQ7KTPfEMSw==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-content-alt-text/-/postcss-content-alt-text-2.0.6.tgz",
+      "integrity": "sha512-eRjLbOjblXq+byyaedQRSrAejKGNAFued+LcbzT+LCL78fabxHkxYjBbxkroONxHHYu2qxhFK2dBStTLPG3jpQ==",
       "funding": [
         {
           "type": "github",
@@ -2272,9 +2301,9 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0"
       },
       "engines": {
@@ -2285,9 +2314,9 @@
       }
     },
     "node_modules/@csstools/postcss-exponential-functions": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-2.0.7.tgz",
-      "integrity": "sha512-XTb6Mw0v2qXtQYRW9d9duAjDnoTbBpsngD7sRNLmYDjvwU2ebpIHplyxgOeo6jp/Kr52gkLi5VaK5RDCqzMzZQ==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-2.0.9.tgz",
+      "integrity": "sha512-abg2W/PI3HXwS/CZshSa79kNWNZHdJPMBXeZNyPQFbbj8sKO3jXxOt/wF7juJVjyDTc6JrvaUZYFcSBZBhaxjw==",
       "funding": [
         {
           "type": "github",
@@ -2300,9 +2329,9 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-calc": "^2.1.2",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       },
       "engines": {
         "node": ">=18"
@@ -2338,9 +2367,9 @@
       }
     },
     "node_modules/@csstools/postcss-gamut-mapping": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-gamut-mapping/-/postcss-gamut-mapping-2.0.8.tgz",
-      "integrity": "sha512-/K8u9ZyGMGPjmwCSIjgaOLKfic2RIGdFHHes84XW5LnmrvdhOTVxo255NppHi3ROEvoHPW7MplMJgjZK5Q+TxA==",
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-gamut-mapping/-/postcss-gamut-mapping-2.0.10.tgz",
+      "integrity": "sha512-QDGqhJlvFnDlaPAfCYPsnwVA6ze+8hhrwevYWlnUeSjkkZfBpcCO42SaUD8jiLlq7niouyLgvup5lh+f1qessg==",
       "funding": [
         {
           "type": "github",
@@ -2353,9 +2382,9 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-color-parser": "^3.0.8",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-color-parser": "^3.0.10",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       },
       "engines": {
         "node": ">=18"
@@ -2365,9 +2394,9 @@
       }
     },
     "node_modules/@csstools/postcss-gradients-interpolation-method": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-5.0.8.tgz",
-      "integrity": "sha512-CoHQ/0UXrvxLovu0ZeW6c3/20hjJ/QRg6lyXm3dZLY/JgvRU6bdbQZF/Du30A4TvowfcgvIHQmP1bNXUxgDrAw==",
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-5.0.10.tgz",
+      "integrity": "sha512-HHPauB2k7Oits02tKFUeVFEU2ox/H3OQVrP3fSOKDxvloOikSal+3dzlyTZmYsb9FlY9p5EUpBtz0//XBmy+aw==",
       "funding": [
         {
           "type": "github",
@@ -2380,10 +2409,10 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-color-parser": "^3.0.8",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/css-color-parser": "^3.0.10",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0"
       },
       "engines": {
@@ -2394,9 +2423,9 @@
       }
     },
     "node_modules/@csstools/postcss-hwb-function": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-4.0.8.tgz",
-      "integrity": "sha512-LpFKjX6hblpeqyych1cKmk+3FJZ19QmaJtqincySoMkbkG/w2tfbnO5oE6mlnCTXcGUJ0rCEuRHvTqKK0nHYUQ==",
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-4.0.10.tgz",
+      "integrity": "sha512-nOKKfp14SWcdEQ++S9/4TgRKchooLZL0TUFdun3nI4KPwCjETmhjta1QT4ICQcGVWQTvrsgMM/aLB5We+kMHhQ==",
       "funding": [
         {
           "type": "github",
@@ -2409,10 +2438,10 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-color-parser": "^3.0.8",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/css-color-parser": "^3.0.10",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0"
       },
       "engines": {
@@ -2423,9 +2452,9 @@
       }
     },
     "node_modules/@csstools/postcss-ic-unit": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-4.0.0.tgz",
-      "integrity": "sha512-9QT5TDGgx7wD3EEMN3BSUG6ckb6Eh5gSPT5kZoVtUuAonfPmLDJyPhqR4ntPpMYhUKAMVKAg3I/AgzqHMSeLhA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-4.0.2.tgz",
+      "integrity": "sha512-lrK2jjyZwh7DbxaNnIUjkeDmU8Y6KyzRBk91ZkI5h8nb1ykEfZrtIVArdIjX4DHMIBGpdHrgP0n4qXDr7OHaKA==",
       "funding": [
         {
           "type": "github",
@@ -2438,7 +2467,7 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0",
         "postcss-value-parser": "^4.2.0"
       },
@@ -2472,9 +2501,9 @@
       }
     },
     "node_modules/@csstools/postcss-is-pseudo-class": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-5.0.1.tgz",
-      "integrity": "sha512-JLp3POui4S1auhDR0n8wHd/zTOWmMsmK3nQd3hhL6FhWPaox5W7j1se6zXOG/aP07wV2ww0lxbKYGwbBszOtfQ==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-5.0.3.tgz",
+      "integrity": "sha512-jS/TY4SpG4gszAtIg7Qnf3AS2pjcUM5SzxpApOrlndMeGhIbaTzWBzzP/IApXoNWEW7OhcjkRT48jnAUIFXhAQ==",
       "funding": [
         {
           "type": "github",
@@ -2533,9 +2562,9 @@
       }
     },
     "node_modules/@csstools/postcss-light-dark-function": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-light-dark-function/-/postcss-light-dark-function-2.0.7.tgz",
-      "integrity": "sha512-ZZ0rwlanYKOHekyIPaU+sVm3BEHCe+Ha0/px+bmHe62n0Uc1lL34vbwrLYn6ote8PHlsqzKeTQdIejQCJ05tfw==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-light-dark-function/-/postcss-light-dark-function-2.0.9.tgz",
+      "integrity": "sha512-1tCZH5bla0EAkFAI2r0H33CDnIBeLUaJh1p+hvvsylJ4svsv2wOmJjJn+OXwUZLXef37GYbRIVKX+X+g6m+3CQ==",
       "funding": [
         {
           "type": "github",
@@ -2548,9 +2577,9 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0"
       },
       "engines": {
@@ -2652,9 +2681,9 @@
       }
     },
     "node_modules/@csstools/postcss-logical-viewport-units": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-3.0.3.tgz",
-      "integrity": "sha512-OC1IlG/yoGJdi0Y+7duz/kU/beCwO+Gua01sD6GtOtLi7ByQUpcIqs7UE/xuRPay4cHgOMatWdnDdsIDjnWpPw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-3.0.4.tgz",
+      "integrity": "sha512-q+eHV1haXA4w9xBwZLKjVKAWn3W2CMqmpNpZUk5kRprvSiBEGMgrNH3/sJZ8UA3JgyHaOt3jwT9uFa4wLX4EqQ==",
       "funding": [
         {
           "type": "github",
@@ -2667,7 +2696,7 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-tokenizer": "^3.0.3",
+        "@csstools/css-tokenizer": "^3.0.4",
         "@csstools/utilities": "^2.0.0"
       },
       "engines": {
@@ -2678,9 +2707,9 @@
       }
     },
     "node_modules/@csstools/postcss-media-minmax": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-media-minmax/-/postcss-media-minmax-2.0.7.tgz",
-      "integrity": "sha512-LB6tIP7iBZb5CYv8iRenfBZmbaG3DWNEziOnPjGoQX5P94FBPvvTBy68b/d9NnS5PELKwFmmOYsAEIgEhDPCHA==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-media-minmax/-/postcss-media-minmax-2.0.9.tgz",
+      "integrity": "sha512-af9Qw3uS3JhYLnCbqtZ9crTvvkR+0Se+bBqSr7ykAnl9yKhk6895z9rf+2F4dClIDJWxgn0iZZ1PSdkhrbs2ig==",
       "funding": [
         {
           "type": "github",
@@ -2693,10 +2722,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/css-calc": "^2.1.2",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/media-query-list-parser": "^4.0.2"
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/media-query-list-parser": "^4.0.3"
       },
       "engines": {
         "node": ">=18"
@@ -2706,9 +2735,9 @@
       }
     },
     "node_modules/@csstools/postcss-media-queries-aspect-ratio-number-values": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-3.0.4.tgz",
-      "integrity": "sha512-AnGjVslHMm5xw9keusQYvjVWvuS7KWK+OJagaG0+m9QnIjZsrysD2kJP/tr/UJIyYtMCtu8OkUd+Rajb4DqtIQ==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-3.0.5.tgz",
+      "integrity": "sha512-zhAe31xaaXOY2Px8IYfoVTB3wglbJUVigGphFLj6exb7cjZRH9A6adyE22XfFK3P2PzwRk0VDeTJmaxpluyrDg==",
       "funding": [
         {
           "type": "github",
@@ -2721,9 +2750,9 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/media-query-list-parser": "^4.0.2"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/media-query-list-parser": "^4.0.3"
       },
       "engines": {
         "node": ">=18"
@@ -2784,9 +2813,9 @@
       }
     },
     "node_modules/@csstools/postcss-oklab-function": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-4.0.8.tgz",
-      "integrity": "sha512-+5aPsNWgxohXoYNS1f+Ys0x3Qnfehgygv3qrPyv+Y25G0yX54/WlVB+IXprqBLOXHM1gsVF+QQSjlArhygna0Q==",
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-4.0.10.tgz",
+      "integrity": "sha512-ZzZUTDd0fgNdhv8UUjGCtObPD8LYxMH+MJsW9xlZaWTV8Ppr4PtxlHYNMmF4vVWGl0T6f8tyWAKjoI6vePSgAg==",
       "funding": [
         {
           "type": "github",
@@ -2799,10 +2828,10 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-color-parser": "^3.0.8",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/css-color-parser": "^3.0.10",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0"
       },
       "engines": {
@@ -2813,9 +2842,9 @@
       }
     },
     "node_modules/@csstools/postcss-progressive-custom-properties": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-4.0.0.tgz",
-      "integrity": "sha512-XQPtROaQjomnvLUSy/bALTR5VCtTVUFwYs1SblvYgLSeTo2a/bMNwUwo2piXw5rTv/FEYiy5yPSXBqg9OKUx7Q==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-4.1.0.tgz",
+      "integrity": "sha512-YrkI9dx8U4R8Sz2EJaoeD9fI7s7kmeEBfmO+UURNeL6lQI7VxF6sBE+rSqdCBn4onwqmxFdBU3lTwyYb/lCmxA==",
       "funding": [
         {
           "type": "github",
@@ -2838,9 +2867,9 @@
       }
     },
     "node_modules/@csstools/postcss-random-function": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-random-function/-/postcss-random-function-1.0.3.tgz",
-      "integrity": "sha512-dbNeEEPHxAwfQJ3duRL5IPpuD77QAHtRl4bAHRs0vOVhVbHrsL7mHnwe0irYjbs9kYwhAHZBQTLBgmvufPuRkA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-random-function/-/postcss-random-function-2.0.1.tgz",
+      "integrity": "sha512-q+FQaNiRBhnoSNo+GzqGOIBKoHQ43lYz0ICrV+UudfWnEF6ksS6DsBIJSISKQT2Bvu3g4k6r7t0zYrk5pDlo8w==",
       "funding": [
         {
           "type": "github",
@@ -2853,9 +2882,9 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-calc": "^2.1.2",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       },
       "engines": {
         "node": ">=18"
@@ -2865,9 +2894,9 @@
       }
     },
     "node_modules/@csstools/postcss-relative-color-syntax": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-3.0.8.tgz",
-      "integrity": "sha512-eGE31oLnJDoUysDdjS9MLxNZdtqqSxjDXMdISpLh80QMaYrKs7VINpid34tWQ+iU23Wg5x76qAzf1Q/SLLbZVg==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-3.0.10.tgz",
+      "integrity": "sha512-8+0kQbQGg9yYG8hv0dtEpOMLwB9M+P7PhacgIzVzJpixxV4Eq9AUQtQw8adMmAJU1RBBmIlpmtmm3XTRd/T00g==",
       "funding": [
         {
           "type": "github",
@@ -2880,10 +2909,10 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-color-parser": "^3.0.8",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/css-color-parser": "^3.0.10",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0"
       },
       "engines": {
@@ -2932,9 +2961,9 @@
       }
     },
     "node_modules/@csstools/postcss-sign-functions": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-sign-functions/-/postcss-sign-functions-1.1.2.tgz",
-      "integrity": "sha512-4EcAvXTUPh7n6UoZZkCzgtCf/wPzMlTNuddcKg7HG8ozfQkUcHsJ2faQKeLmjyKdYPyOUn4YA7yDPf8K/jfIxw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-sign-functions/-/postcss-sign-functions-1.1.4.tgz",
+      "integrity": "sha512-P97h1XqRPcfcJndFdG95Gv/6ZzxUBBISem0IDqPZ7WMvc/wlO+yU0c5D/OCpZ5TJoTt63Ok3knGk64N+o6L2Pg==",
       "funding": [
         {
           "type": "github",
@@ -2947,9 +2976,9 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-calc": "^2.1.2",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       },
       "engines": {
         "node": ">=18"
@@ -2959,9 +2988,9 @@
       }
     },
     "node_modules/@csstools/postcss-stepped-value-functions": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-4.0.7.tgz",
-      "integrity": "sha512-rdrRCKRnWtj5FyRin0u/gLla7CIvZRw/zMGI1fVJP0Sg/m1WGicjPVHRANL++3HQtsiXKAbPrcPr+VkyGck0IA==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-4.0.9.tgz",
+      "integrity": "sha512-h9btycWrsex4dNLeQfyU3y3w40LMQooJWFMm/SK9lrKguHDcFl4VMkncKKoXi2z5rM9YGWbUQABI8BT2UydIcA==",
       "funding": [
         {
           "type": "github",
@@ -2974,9 +3003,9 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-calc": "^2.1.2",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       },
       "engines": {
         "node": ">=18"
@@ -3012,9 +3041,9 @@
       }
     },
     "node_modules/@csstools/postcss-trigonometric-functions": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-4.0.7.tgz",
-      "integrity": "sha512-qTrZgLju3AV7Djhzuh2Bq/wjFqbcypnk0FhHjxW8DWJQcZLS1HecIus4X2/RLch1ukX7b+YYCdqbEnpIQO5ccg==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-4.0.9.tgz",
+      "integrity": "sha512-Hnh5zJUdpNrJqK9v1/E3BbrQhaDTj5YiX7P61TOvUhoDHnUmsNNxcDAgkQ32RrcWx9GVUvfUNPcUkn8R3vIX6A==",
       "funding": [
         {
           "type": "github",
@@ -3027,9 +3056,9 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-calc": "^2.1.2",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       },
       "engines": {
         "node": ">=18"
@@ -3130,9 +3159,9 @@
       }
     },
     "node_modules/@docusaurus/babel": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/babel/-/babel-3.7.0.tgz",
-      "integrity": "sha512-0H5uoJLm14S/oKV3Keihxvh8RV+vrid+6Gv+2qhuzbqHanawga8tYnsdpjEyt36ucJjqlby2/Md2ObWjA02UXQ==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/babel/-/babel-3.8.1.tgz",
+      "integrity": "sha512-3brkJrml8vUbn9aeoZUlJfsI/GqyFcDgQJwQkmBtclJgWDEQBKKeagZfOgx0WfUQhagL1sQLNW0iBdxnI863Uw==",
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.25.9",
@@ -3145,8 +3174,8 @@
         "@babel/runtime": "^7.25.9",
         "@babel/runtime-corejs3": "^7.25.9",
         "@babel/traverse": "^7.25.9",
-        "@docusaurus/logger": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
+        "@docusaurus/logger": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "fs-extra": "^11.1.1",
         "tslib": "^2.6.0"
@@ -3156,31 +3185,30 @@
       }
     },
     "node_modules/@docusaurus/bundler": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/bundler/-/bundler-3.7.0.tgz",
-      "integrity": "sha512-CUUT9VlSGukrCU5ctZucykvgCISivct+cby28wJwCC/fkQFgAHRp/GKv2tx38ZmXb7nacrKzFTcp++f9txUYGg==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/bundler/-/bundler-3.8.1.tgz",
+      "integrity": "sha512-/z4V0FRoQ0GuSLToNjOSGsk6m2lQUG4FRn8goOVoZSRsTrU8YR2aJacX5K3RG18EaX9b+52pN4m1sL3MQZVsQA==",
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.25.9",
-        "@docusaurus/babel": "3.7.0",
-        "@docusaurus/cssnano-preset": "3.7.0",
-        "@docusaurus/logger": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
+        "@docusaurus/babel": "3.8.1",
+        "@docusaurus/cssnano-preset": "3.8.1",
+        "@docusaurus/logger": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
         "babel-loader": "^9.2.1",
-        "clean-css": "^5.3.2",
+        "clean-css": "^5.3.3",
         "copy-webpack-plugin": "^11.0.0",
-        "css-loader": "^6.8.1",
+        "css-loader": "^6.11.0",
         "css-minimizer-webpack-plugin": "^5.0.1",
         "cssnano": "^6.1.2",
         "file-loader": "^6.2.0",
         "html-minifier-terser": "^7.2.0",
-        "mini-css-extract-plugin": "^2.9.1",
+        "mini-css-extract-plugin": "^2.9.2",
         "null-loader": "^4.0.1",
-        "postcss": "^8.4.26",
-        "postcss-loader": "^7.3.3",
-        "postcss-preset-env": "^10.1.0",
-        "react-dev-utils": "^12.0.1",
+        "postcss": "^8.5.4",
+        "postcss-loader": "^7.3.4",
+        "postcss-preset-env": "^10.2.1",
         "terser-webpack-plugin": "^5.3.9",
         "tslib": "^2.6.0",
         "url-loader": "^4.1.1",
@@ -3200,18 +3228,18 @@
       }
     },
     "node_modules/@docusaurus/core": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-3.7.0.tgz",
-      "integrity": "sha512-b0fUmaL+JbzDIQaamzpAFpTviiaU4cX3Qz8cuo14+HGBCwa0evEK0UYCBFY3n4cLzL8Op1BueeroUD2LYAIHbQ==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-3.8.1.tgz",
+      "integrity": "sha512-ENB01IyQSqI2FLtOzqSI3qxG2B/jP4gQPahl2C3XReiLebcVh5B5cB9KYFvdoOqOWPyr5gXK4sjgTKv7peXCrA==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/babel": "3.7.0",
-        "@docusaurus/bundler": "3.7.0",
-        "@docusaurus/logger": "3.7.0",
-        "@docusaurus/mdx-loader": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
-        "@docusaurus/utils-common": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docusaurus/babel": "3.8.1",
+        "@docusaurus/bundler": "3.8.1",
+        "@docusaurus/logger": "3.8.1",
+        "@docusaurus/mdx-loader": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-common": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "boxen": "^6.2.1",
         "chalk": "^4.1.2",
         "chokidar": "^3.5.3",
@@ -3219,19 +3247,19 @@
         "combine-promises": "^1.1.0",
         "commander": "^5.1.0",
         "core-js": "^3.31.1",
-        "del": "^6.1.1",
         "detect-port": "^1.5.1",
         "escape-html": "^1.0.3",
         "eta": "^2.2.0",
         "eval": "^0.1.8",
+        "execa": "5.1.1",
         "fs-extra": "^11.1.1",
         "html-tags": "^3.3.1",
         "html-webpack-plugin": "^5.6.0",
         "leven": "^3.1.0",
         "lodash": "^4.17.21",
+        "open": "^8.4.0",
         "p-map": "^4.0.0",
         "prompts": "^2.4.2",
-        "react-dev-utils": "^12.0.1",
         "react-helmet-async": "npm:@slorber/react-helmet-async@1.3.0",
         "react-loadable": "npm:@docusaurus/react-loadable@6.0.0",
         "react-loadable-ssr-addon-v5-slorber": "^1.0.1",
@@ -3240,7 +3268,7 @@
         "react-router-dom": "^5.3.4",
         "semver": "^7.5.4",
         "serve-handler": "^6.1.6",
-        "shelljs": "^0.8.5",
+        "tinypool": "^1.0.2",
         "tslib": "^2.6.0",
         "update-notifier": "^6.0.2",
         "webpack": "^5.95.0",
@@ -3261,13 +3289,13 @@
       }
     },
     "node_modules/@docusaurus/cssnano-preset": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-3.7.0.tgz",
-      "integrity": "sha512-X9GYgruZBSOozg4w4dzv9uOz8oK/EpPVQXkp0MM6Tsgp/nRIU9hJzJ0Pxg1aRa3xCeEQTOimZHcocQFlLwYajQ==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-3.8.1.tgz",
+      "integrity": "sha512-G7WyR2N6SpyUotqhGznERBK+x84uyhfMQM2MmDLs88bw4Flom6TY46HzkRkSEzaP9j80MbTN8naiL1fR17WQug==",
       "license": "MIT",
       "dependencies": {
         "cssnano-preset-advanced": "^6.1.2",
-        "postcss": "^8.4.38",
+        "postcss": "^8.5.4",
         "postcss-sort-media-queries": "^5.2.0",
         "tslib": "^2.6.0"
       },
@@ -3276,9 +3304,9 @@
       }
     },
     "node_modules/@docusaurus/logger": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-3.7.0.tgz",
-      "integrity": "sha512-z7g62X7bYxCYmeNNuO9jmzxLQG95q9QxINCwpboVcNff3SJiHJbGrarxxOVMVmAh1MsrSfxWkVGv4P41ktnFsA==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-3.8.1.tgz",
+      "integrity": "sha512-2wjeGDhKcExEmjX8k1N/MRDiPKXGF2Pg+df/bDDPnnJWHXnVEZxXj80d6jcxp1Gpnksl0hF8t/ZQw9elqj2+ww==",
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.2",
@@ -3289,21 +3317,21 @@
       }
     },
     "node_modules/@docusaurus/mdx-loader": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-3.7.0.tgz",
-      "integrity": "sha512-OFBG6oMjZzc78/U3WNPSHs2W9ZJ723ewAcvVJaqS0VgyeUfmzUV8f1sv+iUHA0DtwiR5T5FjOxj6nzEE8LY6VA==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-3.8.1.tgz",
+      "integrity": "sha512-DZRhagSFRcEq1cUtBMo4TKxSNo/W6/s44yhr8X+eoXqCLycFQUylebOMPseHi5tc4fkGJqwqpWJLz6JStU9L4w==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/logger": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docusaurus/logger": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "@mdx-js/mdx": "^3.0.0",
         "@slorber/remark-comment": "^1.0.0",
         "escape-html": "^1.0.3",
         "estree-util-value-to-estree": "^3.0.1",
         "file-loader": "^6.2.0",
         "fs-extra": "^11.1.1",
-        "image-size": "^1.0.2",
+        "image-size": "^2.0.2",
         "mdast-util-mdx": "^3.0.0",
         "mdast-util-to-string": "^4.0.0",
         "rehype-raw": "^7.0.0",
@@ -3328,17 +3356,17 @@
       }
     },
     "node_modules/@docusaurus/module-type-aliases": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-3.7.0.tgz",
-      "integrity": "sha512-g7WdPqDNaqA60CmBrr0cORTrsOit77hbsTj7xE2l71YhBn79sxdm7WMK7wfhcaafkbpIh7jv5ef5TOpf1Xv9Lg==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-3.8.1.tgz",
+      "integrity": "sha512-6xhvAJiXzsaq3JdosS7wbRt/PwEPWHr9eM4YNYqVlbgG1hSK3uQDXTVvQktasp3VO6BmfYWPozueLWuj4gB+vg==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/types": "3.7.0",
+        "@docusaurus/types": "3.8.1",
         "@types/history": "^4.7.11",
         "@types/react": "*",
         "@types/react-router-config": "*",
         "@types/react-router-dom": "*",
-        "react-helmet-async": "npm:@slorber/react-helmet-async@*",
+        "react-helmet-async": "npm:@slorber/react-helmet-async@1.3.0",
         "react-loadable": "npm:@docusaurus/react-loadable@6.0.0"
       },
       "peerDependencies": {
@@ -3347,24 +3375,24 @@
       }
     },
     "node_modules/@docusaurus/plugin-content-blog": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.7.0.tgz",
-      "integrity": "sha512-EFLgEz6tGHYWdPU0rK8tSscZwx+AsyuBW/r+tNig2kbccHYGUJmZtYN38GjAa3Fda4NU+6wqUO5kTXQSRBQD3g==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.8.1.tgz",
+      "integrity": "sha512-vNTpMmlvNP9n3hGEcgPaXyvTljanAKIUkuG9URQ1DeuDup0OR7Ltvoc8yrmH+iMZJbcQGhUJF+WjHLwuk8HSdw==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/logger": "3.7.0",
-        "@docusaurus/mdx-loader": "3.7.0",
-        "@docusaurus/theme-common": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
-        "@docusaurus/utils-common": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/logger": "3.8.1",
+        "@docusaurus/mdx-loader": "3.8.1",
+        "@docusaurus/theme-common": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-common": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "cheerio": "1.0.0-rc.12",
         "feed": "^4.2.2",
         "fs-extra": "^11.1.1",
         "lodash": "^4.17.21",
-        "reading-time": "^1.5.0",
+        "schema-dts": "^1.1.2",
         "srcset": "^4.0.0",
         "tslib": "^2.6.0",
         "unist-util-visit": "^5.0.0",
@@ -3381,25 +3409,26 @@
       }
     },
     "node_modules/@docusaurus/plugin-content-docs": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.7.0.tgz",
-      "integrity": "sha512-GXg5V7kC9FZE4FkUZA8oo/NrlRb06UwuICzI6tcbzj0+TVgjq/mpUXXzSgKzMS82YByi4dY2Q808njcBCyy6tQ==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.8.1.tgz",
+      "integrity": "sha512-oByRkSZzeGNQByCMaX+kif5Nl2vmtj2IHQI2fWjCfCootsdKZDPFLonhIp5s3IGJO7PLUfe0POyw0Xh/RrGXJA==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/logger": "3.7.0",
-        "@docusaurus/mdx-loader": "3.7.0",
-        "@docusaurus/module-type-aliases": "3.7.0",
-        "@docusaurus/theme-common": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
-        "@docusaurus/utils-common": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/logger": "3.8.1",
+        "@docusaurus/mdx-loader": "3.8.1",
+        "@docusaurus/module-type-aliases": "3.8.1",
+        "@docusaurus/theme-common": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-common": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "@types/react-router-config": "^5.0.7",
         "combine-promises": "^1.1.0",
         "fs-extra": "^11.1.1",
         "js-yaml": "^4.1.0",
         "lodash": "^4.17.21",
+        "schema-dts": "^1.1.2",
         "tslib": "^2.6.0",
         "utility-types": "^3.10.0",
         "webpack": "^5.88.1"
@@ -3413,16 +3442,16 @@
       }
     },
     "node_modules/@docusaurus/plugin-content-pages": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.7.0.tgz",
-      "integrity": "sha512-YJSU3tjIJf032/Aeao8SZjFOrXJbz/FACMveSMjLyMH4itQyZ2XgUIzt4y+1ISvvk5zrW4DABVT2awTCqBkx0Q==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.8.1.tgz",
+      "integrity": "sha512-a+V6MS2cIu37E/m7nDJn3dcxpvXb6TvgdNI22vJX8iUTp8eoMoPa0VArEbWvCxMY/xdC26WzNv4wZ6y0iIni/w==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/mdx-loader": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/mdx-loader": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "fs-extra": "^11.1.1",
         "tslib": "^2.6.0",
         "webpack": "^5.88.1"
@@ -3435,17 +3464,33 @@
         "react-dom": "^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/@docusaurus/plugin-debug": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-3.7.0.tgz",
-      "integrity": "sha512-Qgg+IjG/z4svtbCNyTocjIwvNTNEwgRjSXXSJkKVG0oWoH0eX/HAPiu+TS1HBwRPQV+tTYPWLrUypYFepfujZA==",
+    "node_modules/@docusaurus/plugin-css-cascade-layers": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-css-cascade-layers/-/plugin-css-cascade-layers-3.8.1.tgz",
+      "integrity": "sha512-VQ47xRxfNKjHS5ItzaVXpxeTm7/wJLFMOPo1BkmoMG4Cuz4nuI+Hs62+RMk1OqVog68Swz66xVPK8g9XTrBKRw==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=18.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-debug": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-3.8.1.tgz",
+      "integrity": "sha512-nT3lN7TV5bi5hKMB7FK8gCffFTBSsBsAfV84/v293qAmnHOyg1nr9okEw8AiwcO3bl9vije5nsUvP0aRl2lpaw==",
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
         "fs-extra": "^11.1.1",
-        "react-json-view-lite": "^1.2.0",
+        "react-json-view-lite": "^2.3.0",
         "tslib": "^2.6.0"
       },
       "engines": {
@@ -3457,14 +3502,14 @@
       }
     },
     "node_modules/@docusaurus/plugin-google-analytics": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.7.0.tgz",
-      "integrity": "sha512-otIqiRV/jka6Snjf+AqB360XCeSv7lQC+DKYW+EUZf6XbuE8utz5PeUQ8VuOcD8Bk5zvT1MC4JKcd5zPfDuMWA==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.8.1.tgz",
+      "integrity": "sha512-Hrb/PurOJsmwHAsfMDH6oVpahkEGsx7F8CWMjyP/dw1qjqmdS9rcV1nYCGlM8nOtD3Wk/eaThzUB5TSZsGz+7Q==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "tslib": "^2.6.0"
       },
       "engines": {
@@ -3476,14 +3521,14 @@
       }
     },
     "node_modules/@docusaurus/plugin-google-gtag": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.7.0.tgz",
-      "integrity": "sha512-M3vrMct1tY65ModbyeDaMoA+fNJTSPe5qmchhAbtqhDD/iALri0g9LrEpIOwNaoLmm6lO88sfBUADQrSRSGSWA==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.8.1.tgz",
+      "integrity": "sha512-tKE8j1cEZCh8KZa4aa80zpSTxsC2/ZYqjx6AAfd8uA8VHZVw79+7OTEP2PoWi0uL5/1Is0LF5Vwxd+1fz5HlKg==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "@types/gtag.js": "^0.0.12",
         "tslib": "^2.6.0"
       },
@@ -3496,14 +3541,14 @@
       }
     },
     "node_modules/@docusaurus/plugin-google-tag-manager": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.7.0.tgz",
-      "integrity": "sha512-X8U78nb8eiMiPNg3jb9zDIVuuo/rE1LjGDGu+5m5CX4UBZzjMy+klOY2fNya6x8ACyE/L3K2erO1ErheP55W/w==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.8.1.tgz",
+      "integrity": "sha512-iqe3XKITBquZq+6UAXdb1vI0fPY5iIOitVjPQ581R1ZKpHr0qe+V6gVOrrcOHixPDD/BUKdYwkxFjpNiEN+vBw==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "tslib": "^2.6.0"
       },
       "engines": {
@@ -3515,17 +3560,17 @@
       }
     },
     "node_modules/@docusaurus/plugin-sitemap": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.7.0.tgz",
-      "integrity": "sha512-bTRT9YLZ/8I/wYWKMQke18+PF9MV8Qub34Sku6aw/vlZ/U+kuEuRpQ8bTcNOjaTSfYsWkK4tTwDMHK2p5S86cA==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.8.1.tgz",
+      "integrity": "sha512-+9YV/7VLbGTq8qNkjiugIelmfUEVkTyLe6X8bWq7K5qPvGXAjno27QAfFq63mYfFFbJc7z+pudL63acprbqGzw==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/logger": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
-        "@docusaurus/utils-common": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/logger": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-common": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "fs-extra": "^11.1.1",
         "sitemap": "^7.1.1",
         "tslib": "^2.6.0"
@@ -3539,15 +3584,15 @@
       }
     },
     "node_modules/@docusaurus/plugin-svgr": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-svgr/-/plugin-svgr-3.7.0.tgz",
-      "integrity": "sha512-HByXIZTbc4GV5VAUkZ2DXtXv1Qdlnpk3IpuImwSnEzCDBkUMYcec5282hPjn6skZqB25M1TYCmWS91UbhBGxQg==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-svgr/-/plugin-svgr-3.8.1.tgz",
+      "integrity": "sha512-rW0LWMDsdlsgowVwqiMb/7tANDodpy1wWPwCcamvhY7OECReN3feoFwLjd/U4tKjNY3encj0AJSTxJA+Fpe+Gw==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "@svgr/core": "8.1.0",
         "@svgr/webpack": "^8.1.0",
         "tslib": "^2.6.0",
@@ -3562,25 +3607,26 @@
       }
     },
     "node_modules/@docusaurus/preset-classic": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-3.7.0.tgz",
-      "integrity": "sha512-nPHj8AxDLAaQXs+O6+BwILFuhiWbjfQWrdw2tifOClQoNfuXDjfjogee6zfx6NGHWqshR23LrcN115DmkHC91Q==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-3.8.1.tgz",
+      "integrity": "sha512-yJSjYNHXD8POMGc2mKQuj3ApPrN+eG0rO1UPgSx7jySpYU+n4WjBikbrA2ue5ad9A7aouEtMWUoiSRXTH/g7KQ==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/plugin-content-blog": "3.7.0",
-        "@docusaurus/plugin-content-docs": "3.7.0",
-        "@docusaurus/plugin-content-pages": "3.7.0",
-        "@docusaurus/plugin-debug": "3.7.0",
-        "@docusaurus/plugin-google-analytics": "3.7.0",
-        "@docusaurus/plugin-google-gtag": "3.7.0",
-        "@docusaurus/plugin-google-tag-manager": "3.7.0",
-        "@docusaurus/plugin-sitemap": "3.7.0",
-        "@docusaurus/plugin-svgr": "3.7.0",
-        "@docusaurus/theme-classic": "3.7.0",
-        "@docusaurus/theme-common": "3.7.0",
-        "@docusaurus/theme-search-algolia": "3.7.0",
-        "@docusaurus/types": "3.7.0"
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/plugin-content-blog": "3.8.1",
+        "@docusaurus/plugin-content-docs": "3.8.1",
+        "@docusaurus/plugin-content-pages": "3.8.1",
+        "@docusaurus/plugin-css-cascade-layers": "3.8.1",
+        "@docusaurus/plugin-debug": "3.8.1",
+        "@docusaurus/plugin-google-analytics": "3.8.1",
+        "@docusaurus/plugin-google-gtag": "3.8.1",
+        "@docusaurus/plugin-google-tag-manager": "3.8.1",
+        "@docusaurus/plugin-sitemap": "3.8.1",
+        "@docusaurus/plugin-svgr": "3.8.1",
+        "@docusaurus/theme-classic": "3.8.1",
+        "@docusaurus/theme-common": "3.8.1",
+        "@docusaurus/theme-search-algolia": "3.8.1",
+        "@docusaurus/types": "3.8.1"
       },
       "engines": {
         "node": ">=18.0"
@@ -3591,31 +3637,31 @@
       }
     },
     "node_modules/@docusaurus/theme-classic": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-3.7.0.tgz",
-      "integrity": "sha512-MnLxG39WcvLCl4eUzHr0gNcpHQfWoGqzADCly54aqCofQX6UozOS9Th4RK3ARbM9m7zIRv3qbhggI53dQtx/hQ==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-3.8.1.tgz",
+      "integrity": "sha512-bqDUCNqXeYypMCsE1VcTXSI1QuO4KXfx8Cvl6rYfY0bhhqN6d2WZlRkyLg/p6pm+DzvanqHOyYlqdPyP0iz+iw==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/logger": "3.7.0",
-        "@docusaurus/mdx-loader": "3.7.0",
-        "@docusaurus/module-type-aliases": "3.7.0",
-        "@docusaurus/plugin-content-blog": "3.7.0",
-        "@docusaurus/plugin-content-docs": "3.7.0",
-        "@docusaurus/plugin-content-pages": "3.7.0",
-        "@docusaurus/theme-common": "3.7.0",
-        "@docusaurus/theme-translations": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
-        "@docusaurus/utils-common": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/logger": "3.8.1",
+        "@docusaurus/mdx-loader": "3.8.1",
+        "@docusaurus/module-type-aliases": "3.8.1",
+        "@docusaurus/plugin-content-blog": "3.8.1",
+        "@docusaurus/plugin-content-docs": "3.8.1",
+        "@docusaurus/plugin-content-pages": "3.8.1",
+        "@docusaurus/theme-common": "3.8.1",
+        "@docusaurus/theme-translations": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-common": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "@mdx-js/react": "^3.0.0",
         "clsx": "^2.0.0",
         "copy-text-to-clipboard": "^3.2.0",
         "infima": "0.2.0-alpha.45",
         "lodash": "^4.17.21",
         "nprogress": "^0.2.0",
-        "postcss": "^8.4.26",
+        "postcss": "^8.5.4",
         "prism-react-renderer": "^2.3.0",
         "prismjs": "^1.29.0",
         "react-router-dom": "^5.3.4",
@@ -3632,15 +3678,15 @@
       }
     },
     "node_modules/@docusaurus/theme-common": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-3.7.0.tgz",
-      "integrity": "sha512-8eJ5X0y+gWDsURZnBfH0WabdNm8XMCXHv8ENy/3Z/oQKwaB/EHt5lP9VsTDTf36lKEp0V6DjzjFyFIB+CetL0A==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-3.8.1.tgz",
+      "integrity": "sha512-UswMOyTnPEVRvN5Qzbo+l8k4xrd5fTFu2VPPfD6FcW/6qUtVLmJTQCktbAL3KJ0BVXGm5aJXz/ZrzqFuZERGPw==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/mdx-loader": "3.7.0",
-        "@docusaurus/module-type-aliases": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
-        "@docusaurus/utils-common": "3.7.0",
+        "@docusaurus/mdx-loader": "3.8.1",
+        "@docusaurus/module-type-aliases": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-common": "3.8.1",
         "@types/history": "^4.7.11",
         "@types/react": "*",
         "@types/react-router-config": "*",
@@ -3660,19 +3706,19 @@
       }
     },
     "node_modules/@docusaurus/theme-search-algolia": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.7.0.tgz",
-      "integrity": "sha512-Al/j5OdzwRU1m3falm+sYy9AaB93S1XF1Lgk9Yc6amp80dNxJVplQdQTR4cYdzkGtuQqbzUA8+kaoYYO0RbK6g==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.8.1.tgz",
+      "integrity": "sha512-NBFH5rZVQRAQM087aYSRKQ9yGEK9eHd+xOxQjqNpxMiV85OhJDD4ZGz6YJIod26Fbooy54UWVdzNU0TFeUUUzQ==",
       "license": "MIT",
       "dependencies": {
-        "@docsearch/react": "^3.8.1",
-        "@docusaurus/core": "3.7.0",
-        "@docusaurus/logger": "3.7.0",
-        "@docusaurus/plugin-content-docs": "3.7.0",
-        "@docusaurus/theme-common": "3.7.0",
-        "@docusaurus/theme-translations": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
-        "@docusaurus/utils-validation": "3.7.0",
+        "@docsearch/react": "^3.9.0",
+        "@docusaurus/core": "3.8.1",
+        "@docusaurus/logger": "3.8.1",
+        "@docusaurus/plugin-content-docs": "3.8.1",
+        "@docusaurus/theme-common": "3.8.1",
+        "@docusaurus/theme-translations": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-validation": "3.8.1",
         "algoliasearch": "^5.17.1",
         "algoliasearch-helper": "^3.22.6",
         "clsx": "^2.0.0",
@@ -3691,9 +3737,9 @@
       }
     },
     "node_modules/@docusaurus/theme-translations": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-3.7.0.tgz",
-      "integrity": "sha512-Ewq3bEraWDmienM6eaNK7fx+/lHMtGDHQyd1O+4+3EsDxxUmrzPkV7Ct3nBWTuE0MsoZr3yNwQVKjllzCMuU3g==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-3.8.1.tgz",
+      "integrity": "sha512-OTp6eebuMcf2rJt4bqnvuwmm3NVXfzfYejL+u/Y1qwKhZPrjPoKWfk1CbOP5xH5ZOPkiAsx4dHdQBRJszK3z2g==",
       "license": "MIT",
       "dependencies": {
         "fs-extra": "^11.1.1",
@@ -3704,16 +3750,16 @@
       }
     },
     "node_modules/@docusaurus/tsconfig": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/tsconfig/-/tsconfig-3.7.0.tgz",
-      "integrity": "sha512-vRsyj3yUZCjscgfgcFYjIsTcAru/4h4YH2/XAE8Rs7wWdnng98PgWKvP5ovVc4rmRpRg2WChVW0uOy2xHDvDBQ==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/tsconfig/-/tsconfig-3.8.1.tgz",
+      "integrity": "sha512-XBWCcqhRHhkhfolnSolNL+N7gj3HVE3CoZVqnVjfsMzCoOsuQw2iCLxVVHtO+rePUUfouVZHURDgmqIySsF66A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@docusaurus/types": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.7.0.tgz",
-      "integrity": "sha512-kOmZg5RRqJfH31m+6ZpnwVbkqMJrPOG5t0IOl4i/+3ruXyNfWzZ0lVtVrD0u4ONc/0NOsS9sWYaxxWNkH1LdLQ==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.8.1.tgz",
+      "integrity": "sha512-ZPdW5AB+pBjiVrcLuw3dOS6BFlrG0XkS2lDGsj8TizcnREQg3J8cjsgfDviszOk4CweNfwo1AEELJkYaMUuOPg==",
       "license": "MIT",
       "dependencies": {
         "@mdx-js/mdx": "^3.0.0",
@@ -3746,15 +3792,16 @@
       }
     },
     "node_modules/@docusaurus/utils": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-3.7.0.tgz",
-      "integrity": "sha512-e7zcB6TPnVzyUaHMJyLSArKa2AG3h9+4CfvKXKKWNx6hRs+p0a+u7HHTJBgo6KW2m+vqDnuIHK4X+bhmoghAFA==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-3.8.1.tgz",
+      "integrity": "sha512-P1ml0nvOmEFdmu0smSXOqTS1sxU5tqvnc0dA4MTKV39kye+bhQnjkIKEE18fNOvxjyB86k8esoCIFM3x4RykOQ==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/logger": "3.7.0",
-        "@docusaurus/types": "3.7.0",
-        "@docusaurus/utils-common": "3.7.0",
+        "@docusaurus/logger": "3.8.1",
+        "@docusaurus/types": "3.8.1",
+        "@docusaurus/utils-common": "3.8.1",
         "escape-string-regexp": "^4.0.0",
+        "execa": "5.1.1",
         "file-loader": "^6.2.0",
         "fs-extra": "^11.1.1",
         "github-slugger": "^1.5.0",
@@ -3764,9 +3811,9 @@
         "js-yaml": "^4.1.0",
         "lodash": "^4.17.21",
         "micromatch": "^4.0.5",
+        "p-queue": "^6.6.2",
         "prompts": "^2.4.2",
         "resolve-pathname": "^3.0.0",
-        "shelljs": "^0.8.5",
         "tslib": "^2.6.0",
         "url-loader": "^4.1.1",
         "utility-types": "^3.10.0",
@@ -3777,12 +3824,12 @@
       }
     },
     "node_modules/@docusaurus/utils-common": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-3.7.0.tgz",
-      "integrity": "sha512-IZeyIfCfXy0Mevj6bWNg7DG7B8G+S6o6JVpddikZtWyxJguiQ7JYr0SIZ0qWd8pGNuMyVwriWmbWqMnK7Y5PwA==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-3.8.1.tgz",
+      "integrity": "sha512-zTZiDlvpvoJIrQEEd71c154DkcriBecm4z94OzEE9kz7ikS3J+iSlABhFXM45mZ0eN5pVqqr7cs60+ZlYLewtg==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/types": "3.7.0",
+        "@docusaurus/types": "3.8.1",
         "tslib": "^2.6.0"
       },
       "engines": {
@@ -3790,14 +3837,14 @@
       }
     },
     "node_modules/@docusaurus/utils-validation": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-3.7.0.tgz",
-      "integrity": "sha512-w8eiKk8mRdN+bNfeZqC4nyFoxNyI1/VExMKAzD9tqpJfLLbsa46Wfn5wcKH761g9WkKh36RtFV49iL9lh1DYBA==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-3.8.1.tgz",
+      "integrity": "sha512-gs5bXIccxzEbyVecvxg6upTwaUbfa0KMmTj7HhHzc016AGyxH2o73k1/aOD0IFrdCsfJNt37MqNI47s2MgRZMA==",
       "license": "MIT",
       "dependencies": {
-        "@docusaurus/logger": "3.7.0",
-        "@docusaurus/utils": "3.7.0",
-        "@docusaurus/utils-common": "3.7.0",
+        "@docusaurus/logger": "3.8.1",
+        "@docusaurus/utils": "3.8.1",
+        "@docusaurus/utils-common": "3.8.1",
         "fs-extra": "^11.2.0",
         "joi": "^17.9.2",
         "js-yaml": "^4.1.0",
@@ -4759,12 +4806,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
-      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
-      "license": "MIT"
-    },
     "node_modules/@types/parse5": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz",
@@ -5439,15 +5480,6 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "license": "MIT"
     },
-    "node_modules/at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "license": "ISC",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
     "node_modules/autocomplete.js": {
       "version": "0.37.1",
       "resolved": "https://registry.npmjs.org/autocomplete.js/-/autocomplete.js-0.37.1.tgz",
@@ -5777,9 +5809,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+      "version": "4.25.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
+      "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
       "funding": [
         {
           "type": "opencollective",
@@ -5796,10 +5828,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001688",
-        "electron-to-chromium": "^1.5.73",
+        "caniuse-lite": "^1.0.30001726",
+        "electron-to-chromium": "^1.5.173",
         "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.1"
+        "update-browserslist-db": "^1.1.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -5980,9 +6012,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001713",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz",
-      "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
+      "version": "1.0.30001726",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz",
+      "integrity": "sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==",
       "funding": [
         {
           "type": "opencollective",
@@ -7063,9 +7095,9 @@
       }
     },
     "node_modules/cssdb": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-8.2.5.tgz",
-      "integrity": "sha512-leAt8/hdTCtzql9ZZi86uYAmCLzVKpJMMdjbvOGVnXFXz/BWFpBmM1MHEHU/RqtPyRYmabVmEW1DtX3YGLuuLA==",
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-8.3.1.tgz",
+      "integrity": "sha512-XnDRQMXucLueX92yDe0LPKupXetWoFOgawr4O4X41l5TltgK2NVbJJVDnnOywDYfW1sTJ28AcXGKOqdRKwCcmQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -7371,28 +7403,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/del": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
-      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
-      "license": "MIT",
-      "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -7465,38 +7475,6 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/detect-port-alt": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
-      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
-      "license": "MIT",
-      "dependencies": {
-        "address": "^1.0.1",
-        "debug": "^2.6.0"
-      },
-      "bin": {
-        "detect": "bin/detect-port",
-        "detect-port": "bin/detect-port"
-      },
-      "engines": {
-        "node": ">= 4.2.1"
-      }
-    },
-    "node_modules/detect-port-alt/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/detect-port-alt/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "license": "MIT"
-    },
     "node_modules/devlop": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
@@ -7938,9 +7916,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.137.tgz",
-      "integrity": "sha512-/QSJaU2JyIuTbbABAo/crOs+SuAZLS+fVVS10PVrIT9hrRkmZl8Hb0xPSkKRUUWHQtYzXHpQUW3Dy5hwMzGZkA==",
+      "version": "1.5.178",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.178.tgz",
+      "integrity": "sha512-wObbz/ar3Bc6e4X5vf0iO8xTN8YAjN/tgiAOJLr7yjYFtP9wAjq8Mb5h0yn6kResir+VYx2DXBj9NNobs0ETSA==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -8687,15 +8665,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/filesize": {
-      "version": "8.0.7",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz",
-      "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -8836,134 +8805,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz",
-      "integrity": "sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@types/json-schema": "^7.0.5",
-        "chalk": "^4.1.0",
-        "chokidar": "^3.4.2",
-        "cosmiconfig": "^6.0.0",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^9.0.0",
-        "glob": "^7.1.6",
-        "memfs": "^3.1.2",
-        "minimatch": "^3.0.4",
-        "schema-utils": "2.7.0",
-        "semver": "^7.3.2",
-        "tapable": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10",
-        "yarn": ">=1.0.0"
-      },
-      "peerDependencies": {
-        "eslint": ">= 6",
-        "typescript": ">= 2.7",
-        "vue-template-compiler": "*",
-        "webpack": ">= 4"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        },
-        "vue-template-compiler": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "license": "MIT",
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "license": "MIT"
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.4",
-        "ajv": "^6.12.2",
-        "ajv-keywords": "^3.4.1"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/form-data": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
@@ -9283,44 +9124,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "license": "MIT",
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "license": "MIT",
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
     "node_modules/globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -10646,13 +10449,10 @@
       }
     },
     "node_modules/image-size": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.1.tgz",
-      "integrity": "sha512-rH+46sQJ2dlwfjfhCyNx5thzrv+dtmBIhPHk0zgRUukHzZ/kRueTJXoYYsclBaKcSMBWuGbOFXtioLpzTb5euw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-2.0.2.tgz",
+      "integrity": "sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==",
       "license": "MIT",
-      "dependencies": {
-        "queue": "6.0.2"
-      },
       "bin": {
         "image-size": "bin/image-size.js"
       },
@@ -10996,15 +10796,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/is-path-inside": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
@@ -11047,15 +10838,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-root": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -14652,6 +14434,15 @@
         "node": ">=12.20"
       }
     },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/p-limit": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
@@ -14697,6 +14488,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/p-queue": {
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
+      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.4",
+        "p-timeout": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/p-retry": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
@@ -14710,13 +14517,16 @@
         "node": ">=8"
       }
     },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+    "node_modules/p-timeout": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
+      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
       "license": "MIT",
+      "dependencies": {
+        "p-finally": "^1.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
     "node_modules/package-json": {
@@ -15014,83 +14824,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/pkg-up": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-      "license": "MIT",
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-up/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "funding": [
         {
           "type": "opencollective",
@@ -15107,7 +14844,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -15185,9 +14922,9 @@
       }
     },
     "node_modules/postcss-color-functional-notation": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-7.0.8.tgz",
-      "integrity": "sha512-S/TpMKVKofNvsxfau/+bw+IA6cSfB6/kmzFj5szUofHOVnFFMB2WwK+Zu07BeMD8T0n+ZnTO5uXiMvAKe2dPkA==",
+      "version": "7.0.10",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-7.0.10.tgz",
+      "integrity": "sha512-k9qX+aXHBiLTRrWoCJuUFI6F1iF6QJQUXNVWJVSbqZgj57jDhBlOvD8gNUGl35tgqDivbGLhZeW3Ongz4feuKA==",
       "funding": [
         {
           "type": "github",
@@ -15200,10 +14937,10 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-color-parser": "^3.0.8",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/css-color-parser": "^3.0.10",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0"
       },
       "engines": {
@@ -15300,9 +15037,9 @@
       }
     },
     "node_modules/postcss-custom-media": {
-      "version": "11.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-11.0.5.tgz",
-      "integrity": "sha512-SQHhayVNgDvSAdX9NQ/ygcDQGEY+aSF4b/96z7QUX6mqL5yl/JgG/DywcF6fW9XbnCRE+aVYk+9/nqGuzOPWeQ==",
+      "version": "11.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-11.0.6.tgz",
+      "integrity": "sha512-C4lD4b7mUIw+RZhtY7qUbf4eADmb7Ey8BFA2px9jUbwg7pjTZDl4KY4bvlUV+/vXQvzQRfiGEVJyAbtOsCMInw==",
       "funding": [
         {
           "type": "github",
@@ -15315,10 +15052,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/cascade-layer-name-parser": "^2.0.4",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/media-query-list-parser": "^4.0.2"
+        "@csstools/cascade-layer-name-parser": "^2.0.5",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/media-query-list-parser": "^4.0.3"
       },
       "engines": {
         "node": ">=18"
@@ -15328,9 +15065,9 @@
       }
     },
     "node_modules/postcss-custom-properties": {
-      "version": "14.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-14.0.4.tgz",
-      "integrity": "sha512-QnW8FCCK6q+4ierwjnmXF9Y9KF8q0JkbgVfvQEMa93x1GT8FvOiUevWCN2YLaOWyByeDX8S6VFbZEeWoAoXs2A==",
+      "version": "14.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-14.0.6.tgz",
+      "integrity": "sha512-fTYSp3xuk4BUeVhxCSJdIPhDLpJfNakZKoiTDx7yRGCdlZrSJR7mWKVOBS4sBF+5poPQFMj2YdXx1VHItBGihQ==",
       "funding": [
         {
           "type": "github",
@@ -15343,9 +15080,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/cascade-layer-name-parser": "^2.0.4",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
+        "@csstools/cascade-layer-name-parser": "^2.0.5",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
         "@csstools/utilities": "^2.0.0",
         "postcss-value-parser": "^4.2.0"
       },
@@ -15357,9 +15094,9 @@
       }
     },
     "node_modules/postcss-custom-selectors": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-8.0.4.tgz",
-      "integrity": "sha512-ASOXqNvDCE0dAJ/5qixxPeL1aOVGHGW2JwSy7HyjWNbnWTQCl+fDc968HY1jCmZI0+BaYT5CxsOiUhavpG/7eg==",
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-8.0.5.tgz",
+      "integrity": "sha512-9PGmckHQswiB2usSO6XMSswO2yFWVoCAuih1yl9FVcwkscLjRKjwsjM3t+NIWpSU2Jx3eOiK2+t4vVTQaoCHHg==",
       "funding": [
         {
           "type": "github",
@@ -15372,9 +15109,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/cascade-layer-name-parser": "^2.0.4",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
+        "@csstools/cascade-layer-name-parser": "^2.0.5",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
         "postcss-selector-parser": "^7.0.0"
       },
       "engines": {
@@ -15499,9 +15236,9 @@
       }
     },
     "node_modules/postcss-double-position-gradients": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-6.0.0.tgz",
-      "integrity": "sha512-JkIGah3RVbdSEIrcobqj4Gzq0h53GG4uqDPsho88SgY84WnpkTpI0k50MFK/sX7XqVisZ6OqUfFnoUO6m1WWdg==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-6.0.2.tgz",
+      "integrity": "sha512-7qTqnL7nfLRyJK/AHSVrrXOuvDDzettC+wGoienURV8v2svNbu6zJC52ruZtHaO6mfcagFmuTGFdzRsJKB3k5Q==",
       "funding": [
         {
           "type": "github",
@@ -15514,7 +15251,7 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0",
         "postcss-value-parser": "^4.2.0"
       },
@@ -15695,9 +15432,9 @@
       }
     },
     "node_modules/postcss-lab-function": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-7.0.8.tgz",
-      "integrity": "sha512-plV21I86Hg9q8omNz13G9fhPtLopIWH06bt/Cb5cs1XnaGU2kUtEitvVd4vtQb/VqCdNUHK5swKn3QFmMRbpDg==",
+      "version": "7.0.10",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-7.0.10.tgz",
+      "integrity": "sha512-tqs6TCEv9tC1Riq6fOzHuHcZyhg4k3gIAMB8GGY/zA1ssGdm6puHMVE7t75aOSoFg7UD2wyrFFhbldiCMyyFTQ==",
       "funding": [
         {
           "type": "github",
@@ -15710,10 +15447,10 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/css-color-parser": "^3.0.8",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
+        "@csstools/css-color-parser": "^3.0.10",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
         "@csstools/utilities": "^2.0.0"
       },
       "engines": {
@@ -16042,9 +15779,9 @@
       }
     },
     "node_modules/postcss-nesting": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.1.tgz",
-      "integrity": "sha512-VbqqHkOBOt4Uu3G8Dm8n6lU5+9cJFxiuty9+4rcoyRPO9zZS1JIs6td49VIoix3qYqELHlJIn46Oih9SAKo+yQ==",
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.2.tgz",
+      "integrity": "sha512-1YCI290TX+VP0U/K/aFxzHzQWHWURL+CtHMSbex1lCdpXD1SoR2sYuxDu5aNI9lPoXpKTCggFZiDJbwylU0LEQ==",
       "funding": [
         {
           "type": "github",
@@ -16057,7 +15794,7 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/selector-resolve-nested": "^3.0.0",
+        "@csstools/selector-resolve-nested": "^3.1.0",
         "@csstools/selector-specificity": "^5.0.0",
         "postcss-selector-parser": "^7.0.0"
       },
@@ -16069,9 +15806,9 @@
       }
     },
     "node_modules/postcss-nesting/node_modules/@csstools/selector-resolve-nested": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.0.0.tgz",
-      "integrity": "sha512-ZoK24Yku6VJU1gS79a5PFmC8yn3wIapiKmPgun0hZgEI5AOqgH2kiPRsPz1qkGv4HL+wuDLH83yQyk6inMYrJQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.1.0.tgz",
+      "integrity": "sha512-mf1LEW0tJLKfWyvn5KdDrhpxHyuxpbNwTIwOYLIvsTffeyOf85j5oIzfG0yosxDgx/sswlqBnESYUcQH0vgZ0g==",
       "funding": [
         {
           "type": "github",
@@ -16356,9 +16093,9 @@
       }
     },
     "node_modules/postcss-preset-env": {
-      "version": "10.1.5",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-10.1.5.tgz",
-      "integrity": "sha512-LQybafF/K7H+6fAs4SIkgzkSCixJy0/h0gubDIAP3Ihz+IQBRwsjyvBnAZ3JUHD+A/ITaxVRPDxn//a3Qy4pDw==",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-10.2.4.tgz",
+      "integrity": "sha512-q+lXgqmTMdB0Ty+EQ31SuodhdfZetUlwCA/F0zRcd/XdxjzI+Rl2JhZNz5US2n/7t9ePsvuhCnEN4Bmu86zXlA==",
       "funding": [
         {
           "type": "github",
@@ -16371,62 +16108,63 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/postcss-cascade-layers": "^5.0.1",
-        "@csstools/postcss-color-function": "^4.0.8",
-        "@csstools/postcss-color-mix-function": "^3.0.8",
-        "@csstools/postcss-content-alt-text": "^2.0.4",
-        "@csstools/postcss-exponential-functions": "^2.0.7",
+        "@csstools/postcss-cascade-layers": "^5.0.2",
+        "@csstools/postcss-color-function": "^4.0.10",
+        "@csstools/postcss-color-mix-function": "^3.0.10",
+        "@csstools/postcss-color-mix-variadic-function-arguments": "^1.0.0",
+        "@csstools/postcss-content-alt-text": "^2.0.6",
+        "@csstools/postcss-exponential-functions": "^2.0.9",
         "@csstools/postcss-font-format-keywords": "^4.0.0",
-        "@csstools/postcss-gamut-mapping": "^2.0.8",
-        "@csstools/postcss-gradients-interpolation-method": "^5.0.8",
-        "@csstools/postcss-hwb-function": "^4.0.8",
-        "@csstools/postcss-ic-unit": "^4.0.0",
+        "@csstools/postcss-gamut-mapping": "^2.0.10",
+        "@csstools/postcss-gradients-interpolation-method": "^5.0.10",
+        "@csstools/postcss-hwb-function": "^4.0.10",
+        "@csstools/postcss-ic-unit": "^4.0.2",
         "@csstools/postcss-initial": "^2.0.1",
-        "@csstools/postcss-is-pseudo-class": "^5.0.1",
-        "@csstools/postcss-light-dark-function": "^2.0.7",
+        "@csstools/postcss-is-pseudo-class": "^5.0.3",
+        "@csstools/postcss-light-dark-function": "^2.0.9",
         "@csstools/postcss-logical-float-and-clear": "^3.0.0",
         "@csstools/postcss-logical-overflow": "^2.0.0",
         "@csstools/postcss-logical-overscroll-behavior": "^2.0.0",
         "@csstools/postcss-logical-resize": "^3.0.0",
-        "@csstools/postcss-logical-viewport-units": "^3.0.3",
-        "@csstools/postcss-media-minmax": "^2.0.7",
-        "@csstools/postcss-media-queries-aspect-ratio-number-values": "^3.0.4",
+        "@csstools/postcss-logical-viewport-units": "^3.0.4",
+        "@csstools/postcss-media-minmax": "^2.0.9",
+        "@csstools/postcss-media-queries-aspect-ratio-number-values": "^3.0.5",
         "@csstools/postcss-nested-calc": "^4.0.0",
         "@csstools/postcss-normalize-display-values": "^4.0.0",
-        "@csstools/postcss-oklab-function": "^4.0.8",
-        "@csstools/postcss-progressive-custom-properties": "^4.0.0",
-        "@csstools/postcss-random-function": "^1.0.3",
-        "@csstools/postcss-relative-color-syntax": "^3.0.8",
+        "@csstools/postcss-oklab-function": "^4.0.10",
+        "@csstools/postcss-progressive-custom-properties": "^4.1.0",
+        "@csstools/postcss-random-function": "^2.0.1",
+        "@csstools/postcss-relative-color-syntax": "^3.0.10",
         "@csstools/postcss-scope-pseudo-class": "^4.0.1",
-        "@csstools/postcss-sign-functions": "^1.1.2",
-        "@csstools/postcss-stepped-value-functions": "^4.0.7",
+        "@csstools/postcss-sign-functions": "^1.1.4",
+        "@csstools/postcss-stepped-value-functions": "^4.0.9",
         "@csstools/postcss-text-decoration-shorthand": "^4.0.2",
-        "@csstools/postcss-trigonometric-functions": "^4.0.7",
+        "@csstools/postcss-trigonometric-functions": "^4.0.9",
         "@csstools/postcss-unset-value": "^4.0.0",
-        "autoprefixer": "^10.4.19",
-        "browserslist": "^4.24.4",
+        "autoprefixer": "^10.4.21",
+        "browserslist": "^4.25.0",
         "css-blank-pseudo": "^7.0.1",
         "css-has-pseudo": "^7.0.2",
         "css-prefers-color-scheme": "^10.0.0",
-        "cssdb": "^8.2.3",
+        "cssdb": "^8.3.0",
         "postcss-attribute-case-insensitive": "^7.0.1",
         "postcss-clamp": "^4.1.0",
-        "postcss-color-functional-notation": "^7.0.8",
+        "postcss-color-functional-notation": "^7.0.10",
         "postcss-color-hex-alpha": "^10.0.0",
         "postcss-color-rebeccapurple": "^10.0.0",
-        "postcss-custom-media": "^11.0.5",
-        "postcss-custom-properties": "^14.0.4",
-        "postcss-custom-selectors": "^8.0.4",
+        "postcss-custom-media": "^11.0.6",
+        "postcss-custom-properties": "^14.0.6",
+        "postcss-custom-selectors": "^8.0.5",
         "postcss-dir-pseudo-class": "^9.0.1",
-        "postcss-double-position-gradients": "^6.0.0",
+        "postcss-double-position-gradients": "^6.0.2",
         "postcss-focus-visible": "^10.0.1",
         "postcss-focus-within": "^9.0.1",
         "postcss-font-variant": "^5.0.0",
         "postcss-gap-properties": "^6.0.0",
         "postcss-image-set-function": "^7.0.0",
-        "postcss-lab-function": "^7.0.8",
+        "postcss-lab-function": "^7.0.10",
         "postcss-logical": "^8.1.0",
-        "postcss-nesting": "^13.0.1",
+        "postcss-nesting": "^13.0.2",
         "postcss-opacity-percentage": "^3.0.0",
         "postcss-overflow-shorthand": "^6.0.0",
         "postcss-page-break": "^3.0.4",
@@ -16721,9 +16459,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
+      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -16896,15 +16634,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/queue": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
-      "integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "~2.0.3"
-      }
-    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -17096,132 +16825,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/react-dev-utils": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
-      "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.16.0",
-        "address": "^1.1.2",
-        "browserslist": "^4.18.1",
-        "chalk": "^4.1.2",
-        "cross-spawn": "^7.0.3",
-        "detect-port-alt": "^1.1.6",
-        "escape-string-regexp": "^4.0.0",
-        "filesize": "^8.0.6",
-        "find-up": "^5.0.0",
-        "fork-ts-checker-webpack-plugin": "^6.5.0",
-        "global-modules": "^2.0.0",
-        "globby": "^11.0.4",
-        "gzip-size": "^6.0.0",
-        "immer": "^9.0.7",
-        "is-root": "^2.1.0",
-        "loader-utils": "^3.2.0",
-        "open": "^8.4.0",
-        "pkg-up": "^3.1.0",
-        "prompts": "^2.4.2",
-        "react-error-overlay": "^6.0.11",
-        "recursive-readdir": "^2.2.2",
-        "shell-quote": "^1.7.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/loader-utils": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz",
-      "integrity": "sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 12.13.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "license": "MIT",
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/react-dom": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
@@ -17235,12 +16838,6 @@
         "react": "^18.3.1"
       }
     },
-    "node_modules/react-error-overlay": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.1.0.tgz",
-      "integrity": "sha512-SN/U6Ytxf1QGkw/9ve5Y+NxBbZM6Ht95tuXNMKs8EJyFa/Vy/+Co3stop3KBHARfn/giv+Lj1uUnTfOJ3moFEQ==",
-      "license": "MIT"
-    },
     "node_modules/react-fast-compare": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
@@ -17272,15 +16869,15 @@
       "license": "MIT"
     },
     "node_modules/react-json-view-lite": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/react-json-view-lite/-/react-json-view-lite-1.5.0.tgz",
-      "integrity": "sha512-nWqA1E4jKPklL2jvHWs6s+7Na0qNgw9HCP6xehdQJeg6nPBTFZgGwyko9Q0oj+jQWKTTVRS30u0toM5wiuL3iw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/react-json-view-lite/-/react-json-view-lite-2.4.1.tgz",
+      "integrity": "sha512-fwFYknRIBxjbFm0kBDrzgBy1xa5tDg2LyXXBepC5f1b+MY3BUClMCsvanMPn089JbV1Eg3nZcrp0VCuH43aXnA==",
       "license": "MIT",
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "react": "^16.13.1 || ^17.0.0 || ^18.0.0"
+        "react": "^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/react-loadable": {
@@ -17435,12 +17032,6 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/reading-time": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/reading-time/-/reading-time-1.5.0.tgz",
-      "integrity": "sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg==",
-      "license": "MIT"
-    },
     "node_modules/rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -17516,18 +17107,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/recursive-readdir": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
-      "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
-      "license": "MIT",
-      "dependencies": {
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/redux": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
@@ -18210,6 +17789,12 @@
         "loose-envify": "^1.1.0"
       }
     },
+    "node_modules/schema-dts": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/schema-dts/-/schema-dts-1.1.5.tgz",
+      "integrity": "sha512-RJr9EaCmsLzBX2NDiO5Z3ux2BVosNZN5jo0gWgsyKvxKIUL5R3swNvoorulAeL9kLB0iTSX7V6aokhla2m7xbg==",
+      "license": "Apache-2.0"
+    },
     "node_modules/schema-utils": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
@@ -19474,12 +19059,6 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "license": "MIT"
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "license": "MIT"
-    },
     "node_modules/thenify": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
@@ -19519,6 +19098,15 @@
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==",
       "license": "MIT"
     },
+    "node_modules/tinypool": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
+      "license": "MIT",
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      }
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -19688,6 +19276,7 @@
       "version": "5.8.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
       "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+      "devOptional": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
diff --git a/docs/package.json b/docs/package.json
index 4dca627faa..b1faa4cfcb 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -16,9 +16,9 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "~3.7.0",
-    "@docusaurus/preset-classic": "~3.7.0",
-    "@docusaurus/theme-common": "~3.7.0",
+    "@docusaurus/core": "~3.8.0",
+    "@docusaurus/preset-classic": "~3.8.0",
+    "@docusaurus/theme-common": "~3.8.0",
     "@mdi/js": "^7.3.67",
     "@mdi/react": "^1.6.1",
     "@mdx-js/react": "^3.0.0",
@@ -37,7 +37,7 @@
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "~3.7.0",
+    "@docusaurus/module-type-aliases": "~3.8.0",
     "@docusaurus/tsconfig": "^3.7.0",
     "@docusaurus/types": "^3.7.0",
     "prettier": "^3.2.4",
diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index ecf78cf9a9..376afb310c 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -34,7 +34,7 @@
         "pngjs": "^7.0.0",
         "prettier": "^3.2.5",
         "prettier-plugin-organize-imports": "^4.0.0",
-        "sharp": "^0.33.5",
+        "sharp": "^0.34.0",
         "socket.io-client": "^4.7.4",
         "supertest": "^7.0.0",
         "typescript": "^5.3.3",
@@ -658,9 +658,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
+      "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -673,9 +673,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz",
-      "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
+      "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -733,9 +733,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
-      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
+      "version": "9.29.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
+      "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -836,9 +836,9 @@
       }
     },
     "node_modules/@img/sharp-darwin-arm64": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz",
-      "integrity": "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.2.tgz",
+      "integrity": "sha512-OfXHZPppddivUJnqyKoi5YVeHRkkNE2zUFT2gbpKxp/JZCFYEYubnMg+gOp6lWfasPrTS+KPosKqdI+ELYVDtg==",
       "cpu": [
         "arm64"
       ],
@@ -855,13 +855,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-darwin-arm64": "1.0.4"
+        "@img/sharp-libvips-darwin-arm64": "1.1.0"
       }
     },
     "node_modules/@img/sharp-darwin-x64": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz",
-      "integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.2.tgz",
+      "integrity": "sha512-dYvWqmjU9VxqXmjEtjmvHnGqF8GrVjM2Epj9rJ6BUIXvk8slvNDJbhGFvIoXzkDhrJC2jUxNLz/GUjjvSzfw+g==",
       "cpu": [
         "x64"
       ],
@@ -878,13 +878,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-darwin-x64": "1.0.4"
+        "@img/sharp-libvips-darwin-x64": "1.1.0"
       }
     },
     "node_modules/@img/sharp-libvips-darwin-arm64": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz",
-      "integrity": "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.1.0.tgz",
+      "integrity": "sha512-HZ/JUmPwrJSoM4DIQPv/BfNh9yrOA8tlBbqbLz4JZ5uew2+o22Ik+tHQJcih7QJuSa0zo5coHTfD5J8inqj9DA==",
       "cpu": [
         "arm64"
       ],
@@ -899,9 +899,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-darwin-x64": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz",
-      "integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.1.0.tgz",
+      "integrity": "sha512-Xzc2ToEmHN+hfvsl9wja0RlnXEgpKNmftriQp6XzY/RaSfwD9th+MSh0WQKzUreLKKINb3afirxW7A0fz2YWuQ==",
       "cpu": [
         "x64"
       ],
@@ -916,9 +916,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linux-arm": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz",
-      "integrity": "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.1.0.tgz",
+      "integrity": "sha512-s8BAd0lwUIvYCJyRdFqvsj+BJIpDBSxs6ivrOPm/R7piTs5UIwY5OjXrP2bqXC9/moGsyRa37eYWYCOGVXxVrA==",
       "cpu": [
         "arm"
       ],
@@ -933,9 +933,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linux-arm64": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz",
-      "integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.1.0.tgz",
+      "integrity": "sha512-IVfGJa7gjChDET1dK9SekxFFdflarnUB8PwW8aGwEoF3oAsSDuNUTYS+SKDOyOJxQyDC1aPFMuRYLoDInyV9Ew==",
       "cpu": [
         "arm64"
       ],
@@ -949,10 +949,27 @@
         "url": "https://opencollective.com/libvips"
       }
     },
+    "node_modules/@img/sharp-libvips-linux-ppc64": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.1.0.tgz",
+      "integrity": "sha512-tiXxFZFbhnkWE2LA8oQj7KYR+bWBkiV2nilRldT7bqoEZ4HiDOcePr9wVDAZPi/Id5fT1oY9iGnDq20cwUz8lQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
     "node_modules/@img/sharp-libvips-linux-s390x": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz",
-      "integrity": "sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.1.0.tgz",
+      "integrity": "sha512-xukSwvhguw7COyzvmjydRb3x/09+21HykyapcZchiCUkTThEQEOMtBj9UhkaBRLuBrgLFzQ2wbxdeCCJW/jgJA==",
       "cpu": [
         "s390x"
       ],
@@ -967,9 +984,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linux-x64": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz",
-      "integrity": "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.1.0.tgz",
+      "integrity": "sha512-yRj2+reB8iMg9W5sULM3S74jVS7zqSzHG3Ol/twnAAkAhnGQnpjj6e4ayUz7V+FpKypwgs82xbRdYtchTTUB+Q==",
       "cpu": [
         "x64"
       ],
@@ -984,9 +1001,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz",
-      "integrity": "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.1.0.tgz",
+      "integrity": "sha512-jYZdG+whg0MDK+q2COKbYidaqW/WTz0cc1E+tMAusiDygrM4ypmSCjOJPmFTvHHJ8j/6cAGyeDWZOsK06tP33w==",
       "cpu": [
         "arm64"
       ],
@@ -1001,9 +1018,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linuxmusl-x64": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz",
-      "integrity": "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.1.0.tgz",
+      "integrity": "sha512-wK7SBdwrAiycjXdkPnGCPLjYb9lD4l6Ze2gSdAGVZrEL05AOUJESWU2lhlC+Ffn5/G+VKuSm6zzbQSzFX/P65A==",
       "cpu": [
         "x64"
       ],
@@ -1018,9 +1035,9 @@
       }
     },
     "node_modules/@img/sharp-linux-arm": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz",
-      "integrity": "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.2.tgz",
+      "integrity": "sha512-0DZzkvuEOqQUP9mo2kjjKNok5AmnOr1jB2XYjkaoNRwpAYMDzRmAqUIa1nRi58S2WswqSfPOWLNOr0FDT3H5RQ==",
       "cpu": [
         "arm"
       ],
@@ -1037,13 +1054,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm": "1.0.5"
+        "@img/sharp-libvips-linux-arm": "1.1.0"
       }
     },
     "node_modules/@img/sharp-linux-arm64": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz",
-      "integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.2.tgz",
+      "integrity": "sha512-D8n8wgWmPDakc83LORcfJepdOSN6MvWNzzz2ux0MnIbOqdieRZwVYY32zxVx+IFUT8er5KPcyU3XXsn+GzG/0Q==",
       "cpu": [
         "arm64"
       ],
@@ -1060,13 +1077,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm64": "1.0.4"
+        "@img/sharp-libvips-linux-arm64": "1.1.0"
       }
     },
     "node_modules/@img/sharp-linux-s390x": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz",
-      "integrity": "sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.2.tgz",
+      "integrity": "sha512-EGZ1xwhBI7dNISwxjChqBGELCWMGDvmxZXKjQRuqMrakhO8QoMgqCrdjnAqJq/CScxfRn+Bb7suXBElKQpPDiw==",
       "cpu": [
         "s390x"
       ],
@@ -1083,13 +1100,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-s390x": "1.0.4"
+        "@img/sharp-libvips-linux-s390x": "1.1.0"
       }
     },
     "node_modules/@img/sharp-linux-x64": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz",
-      "integrity": "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.2.tgz",
+      "integrity": "sha512-sD7J+h5nFLMMmOXYH4DD9UtSNBD05tWSSdWAcEyzqW8Cn5UxXvsHAxmxSesYUsTOBmUnjtxghKDl15EvfqLFbQ==",
       "cpu": [
         "x64"
       ],
@@ -1106,13 +1123,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-x64": "1.0.4"
+        "@img/sharp-libvips-linux-x64": "1.1.0"
       }
     },
     "node_modules/@img/sharp-linuxmusl-arm64": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz",
-      "integrity": "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.2.tgz",
+      "integrity": "sha512-NEE2vQ6wcxYav1/A22OOxoSOGiKnNmDzCYFOZ949xFmrWZOVII1Bp3NqVVpvj+3UeHMFyN5eP/V5hzViQ5CZNA==",
       "cpu": [
         "arm64"
       ],
@@ -1129,13 +1146,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-arm64": "1.0.4"
+        "@img/sharp-libvips-linuxmusl-arm64": "1.1.0"
       }
     },
     "node_modules/@img/sharp-linuxmusl-x64": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz",
-      "integrity": "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.2.tgz",
+      "integrity": "sha512-DOYMrDm5E6/8bm/yQLCWyuDJwUnlevR8xtF8bs+gjZ7cyUNYXiSf/E8Kp0Ss5xasIaXSHzb888V1BE4i1hFhAA==",
       "cpu": [
         "x64"
       ],
@@ -1152,13 +1169,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-x64": "1.0.4"
+        "@img/sharp-libvips-linuxmusl-x64": "1.1.0"
       }
     },
     "node_modules/@img/sharp-wasm32": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz",
-      "integrity": "sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.2.tgz",
+      "integrity": "sha512-/VI4mdlJ9zkaq53MbIG6rZY+QRN3MLbR6usYlgITEzi4Rpx5S6LFKsycOQjkOGmqTNmkIdLjEvooFKwww6OpdQ==",
       "cpu": [
         "wasm32"
       ],
@@ -1166,7 +1183,7 @@
       "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/runtime": "^1.2.0"
+        "@emnapi/runtime": "^1.4.3"
       },
       "engines": {
         "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -1175,10 +1192,30 @@
         "url": "https://opencollective.com/libvips"
       }
     },
+    "node_modules/@img/sharp-win32-arm64": {
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.2.tgz",
+      "integrity": "sha512-cfP/r9FdS63VA5k0xiqaNaEoGxBg9k7uE+RQGzuK9fHt7jib4zAVVseR9LsE4gJcNWgT6APKMNnCcnyOtmSEUQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
     "node_modules/@img/sharp-win32-ia32": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz",
-      "integrity": "sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.2.tgz",
+      "integrity": "sha512-QLjGGvAbj0X/FXl8n1WbtQ6iVBpWU7JO94u/P2M4a8CFYsvQi4GW2mRy/JqkRx0qpBzaOdKJKw8uc930EX2AHw==",
       "cpu": [
         "ia32"
       ],
@@ -1196,9 +1233,9 @@
       }
     },
     "node_modules/@img/sharp-win32-x64": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz",
-      "integrity": "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.2.tgz",
+      "integrity": "sha512-aUdT6zEYtDKCaxkofmmJDJYGCf0+pJg3eU9/oBuqvEeoB9dKI6ZLc/1iLJCTuJQDO4ptntAlkUmHgGjyuobZbw==",
       "cpu": [
         "x64"
       ],
@@ -1472,13 +1509,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.52.0.tgz",
-      "integrity": "sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==",
+      "version": "1.53.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.53.1.tgz",
+      "integrity": "sha512-Z4c23LHV0muZ8hfv4jw6HngPJkbbtZxTkxPNIg7cJcTc9C28N/p2q7g3JZS2SiKBBHJ3uM1dgDye66bB7LEk5w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.52.0"
+        "playwright": "1.53.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -1795,6 +1832,16 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/chai": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.2.tgz",
+      "integrity": "sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/deep-eql": "*"
+      }
+    },
     "node_modules/@types/connect": {
       "version": "3.4.38",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
@@ -1832,6 +1879,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/deep-eql": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
+      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/estree": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
@@ -1951,9 +2005,9 @@
       }
     },
     "node_modules/@types/oidc-provider": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@types/oidc-provider/-/oidc-provider-9.1.0.tgz",
-      "integrity": "sha512-UoC3ZQur+TtVL5hiUN8LoCbXocS2WI2eAPBtZtv1Y5F3vW0QTBawFAgDoctPqCQF73kah/Nzb5Gd3m5GtxFxiA==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@types/oidc-provider/-/oidc-provider-9.1.1.tgz",
+      "integrity": "sha512-sG4UcE4AbUwAsEpyrcyoqZ383wJiQObZU+gTa1Iv288+l09HwSr88hBZE2IBLlXS+RKmLId0i4B430PBFO/XRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1963,15 +2017,75 @@
       }
     },
     "node_modules/@types/pg": {
-      "version": "8.15.2",
-      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.15.2.tgz",
-      "integrity": "sha512-+BKxo5mM6+/A1soSHBI7ufUglqYXntChLDyTbvcAn1Lawi9J7J9Ok3jt6w7I0+T/UDJ4CyhHk66+GZbwmkYxSg==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.15.4.tgz",
+      "integrity": "sha512-I6UNVBAoYbvuWkkU3oosC8yxqH21f4/Jc4DK71JLG3dT2mdlGe1z+ep/LQGXaKaOgcvUrsQoPRqfgtMcvZiJhg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "pg-protocol": "*",
-        "pg-types": "^4.0.1"
+        "pg-types": "^2.2.0"
+      }
+    },
+    "node_modules/@types/pg/node_modules/pg-types": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
+      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pg-int8": "1.0.1",
+        "postgres-array": "~2.0.0",
+        "postgres-bytea": "~1.0.0",
+        "postgres-date": "~1.0.4",
+        "postgres-interval": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@types/pg/node_modules/postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@types/pg/node_modules/postgres-bytea": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@types/pg/node_modules/postgres-date": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@types/pg/node_modules/postgres-interval": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/@types/pngjs": {
@@ -2046,17 +2160,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
-      "integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz",
+      "integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/type-utils": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/type-utils": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -2070,15 +2184,15 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "@typescript-eslint/parser": "^8.35.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
-      "integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2086,16 +2200,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
-      "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz",
+      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2110,15 +2224,37 @@
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
-      "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
+      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1"
+        "@typescript-eslint/tsconfig-utils": "^8.35.0",
+        "@typescript-eslint/types": "^8.35.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
+      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2128,15 +2264,32 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
+      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
-      "integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
+      "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
+        "@typescript-eslint/typescript-estree": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -2153,9 +2306,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
-      "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2167,14 +2320,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
-      "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
+      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/project-service": "8.35.0",
+        "@typescript-eslint/tsconfig-utils": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -2194,9 +2349,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2220,16 +2375,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
-      "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
+      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1"
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2244,14 +2399,14 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
-      "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
+      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "eslint-visitor-keys": "^4.2.0"
+        "@typescript-eslint/types": "8.35.0",
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2262,15 +2417,16 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.1.4.tgz",
-      "integrity": "sha512-G4p6OtioySL+hPV7Y6JHlhpsODbJzt1ndwHAFkyk6vVjpK03PFsKnauZIzcd0PrK4zAbc5lc+jeZ+eNGiMA+iw==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.2.4.tgz",
+      "integrity": "sha512-EyF9SXU6kS5Ku/U82E259WSnvg6c8KTjppUncuNdm5QHpe17mwREHnjDzozC8x9MZ0xfBUFSaLkRv4TMA75ALQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
         "@bcoe/v8-coverage": "^1.0.2",
-        "debug": "^4.4.0",
+        "ast-v8-to-istanbul": "^0.3.3",
+        "debug": "^4.4.1",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
         "istanbul-lib-source-maps": "^5.0.6",
@@ -2285,8 +2441,8 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "3.1.4",
-        "vitest": "3.1.4"
+        "@vitest/browser": "3.2.4",
+        "vitest": "3.2.4"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -2295,14 +2451,15 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz",
-      "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
+      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.1.4",
-        "@vitest/utils": "3.1.4",
+        "@types/chai": "^5.2.2",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
         "chai": "^5.2.0",
         "tinyrainbow": "^2.0.0"
       },
@@ -2311,13 +2468,13 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz",
-      "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
+      "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.1.4",
+        "@vitest/spy": "3.2.4",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.17"
       },
@@ -2326,7 +2483,7 @@
       },
       "peerDependencies": {
         "msw": "^2.4.9",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "peerDependenciesMeta": {
         "msw": {
@@ -2338,9 +2495,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz",
-      "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
+      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2351,27 +2508,28 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz",
-      "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz",
+      "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "3.1.4",
-        "pathe": "^2.0.3"
+        "@vitest/utils": "3.2.4",
+        "pathe": "^2.0.3",
+        "strip-literal": "^3.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz",
-      "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz",
+      "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
+        "@vitest/pretty-format": "3.2.4",
         "magic-string": "^0.30.17",
         "pathe": "^2.0.3"
       },
@@ -2380,27 +2538,27 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz",
-      "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
+      "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tinyspy": "^3.0.2"
+        "tinyspy": "^4.0.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz",
-      "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
+      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
-        "loupe": "^3.1.3",
+        "@vitest/pretty-format": "3.2.4",
+        "loupe": "^3.1.4",
         "tinyrainbow": "^2.0.0"
       },
       "funding": {
@@ -2429,9 +2587,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -2556,6 +2714,18 @@
         "node": ">=12"
       }
     },
+    "node_modules/ast-v8-to-istanbul": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.3.tgz",
+      "integrity": "sha512-MuXMrSLVVoA6sYN/6Hke18vMzrT4TZNbZIj/hvh0fnYFpO+/kFXcLIaiPwXXWaQUPg4yJD8fj+lfJ7/1EBconw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "estree-walker": "^3.0.3",
+        "js-tokens": "^9.0.1"
+      }
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -3085,9 +3255,9 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
-      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
+      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -3328,19 +3498,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
-      "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
+      "version": "9.29.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
+      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.0",
+        "@eslint/config-array": "^0.20.1",
         "@eslint/config-helpers": "^0.2.1",
         "@eslint/core": "^0.14.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.27.0",
+        "@eslint/js": "9.29.0",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -3352,9 +3522,9 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -3405,14 +3575,14 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.0.tgz",
-      "integrity": "sha512-BvQOvUhkVQM1i63iMETK9Hjud9QhqBnbtT1Zc642p9ynzBuCe5pybkOnvqZIBypXmMlsGcnU4HZ8sCTPfpAexA==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.1.tgz",
+      "integrity": "sha512-dobTkHT6XaEVOo8IO90Q4DOSxnm3Y151QxPJlM/vKC0bVy+d6cVWQZLlFiuZPP0wS6vZwSKeJgKkcS+KfMBlRw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0",
-        "synckit": "^0.11.0"
+        "synckit": "^0.11.7"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -3498,9 +3668,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -3515,9 +3685,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -3528,15 +3698,15 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4109,9 +4279,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.1.0.tgz",
-      "integrity": "sha512-aibexHNbb/jiUSObBgpHLj+sIuUmJnYcgXBlrfsiDZ9rt4aF2TFRbyLgZ2iFQuVZ1K5Mx3FVkbKRSgKrbK3K2g==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
+      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4534,6 +4704,13 @@
         "url": "https://github.com/sponsors/panva"
       }
     },
+    "node_modules/js-tokens": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -4680,9 +4857,9 @@
       "license": "MIT"
     },
     "node_modules/loupe": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
-      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.4.tgz",
+      "integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
       "dev": true,
       "license": "MIT"
     },
@@ -5035,17 +5212,10 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/oidc-provider": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/oidc-provider/-/oidc-provider-9.1.3.tgz",
-      "integrity": "sha512-DaiiCllAr+y33M2HzTRRpV7/jmcZBSfIXaDv0eHURIV85N0O+QUqtjVtPY+viCwHKBRGWwfShWWFKddPUxpAWw==",
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/oidc-provider/-/oidc-provider-9.2.0.tgz",
+      "integrity": "sha512-L0JL1ymI/hLKzDRqYzhKluNfRRQUR0++q5fTTziniKmJgNrJ6DnI5h5SP6w8Z0U/3wZrCndpVmbbu0VpKpY0CA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5260,23 +5430,23 @@
       }
     },
     "node_modules/pg": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.0.tgz",
-      "integrity": "sha512-7SKfdvP8CTNXjMUzfcVTaI+TDzBEeaUnVwiVGZQD1Hh33Kpev7liQba9uLd4CfN8r9mCVsD0JIpq03+Unpz+kg==",
+      "version": "8.16.2",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.2.tgz",
+      "integrity": "sha512-OtLWF0mKLmpxelOt9BqVq83QV6bTfsS0XLegIeAKqKjurRnRKie1Dc1iL89MugmSLhftxw6NNCyZhm1yQFLMEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pg-connection-string": "^2.9.0",
-        "pg-pool": "^3.10.0",
-        "pg-protocol": "^1.10.0",
+        "pg-connection-string": "^2.9.1",
+        "pg-pool": "^3.10.1",
+        "pg-protocol": "^1.10.2",
         "pg-types": "2.2.0",
         "pgpass": "1.0.5"
       },
       "engines": {
-        "node": ">= 8.0.0"
+        "node": ">= 16.0.0"
       },
       "optionalDependencies": {
-        "pg-cloudflare": "^1.2.5"
+        "pg-cloudflare": "^1.2.6"
       },
       "peerDependencies": {
         "pg-native": ">=3.0.1"
@@ -5288,17 +5458,17 @@
       }
     },
     "node_modules/pg-cloudflare": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.5.tgz",
-      "integrity": "sha512-OOX22Vt0vOSRrdoUPKJ8Wi2OpE/o/h9T8X1s4qSkCedbNah9ei2W2765be8iMVxQUsvgT7zIAT2eIa9fs5+vtg==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz",
+      "integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==",
       "dev": true,
       "license": "MIT",
       "optional": true
     },
     "node_modules/pg-connection-string": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.0.tgz",
-      "integrity": "sha512-P2DEBKuvh5RClafLngkAuGe9OUlFV7ebu8w1kmaaOgPcpJd1RIFh7otETfI6hAR8YupOLFTY7nuvvIn7PLciUQ==",
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz",
+      "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==",
       "dev": true,
       "license": "MIT"
     },
@@ -5312,20 +5482,10 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/pg-numeric": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pg-numeric/-/pg-numeric-1.0.2.tgz",
-      "integrity": "sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/pg-pool": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.0.tgz",
-      "integrity": "sha512-DzZ26On4sQ0KmqnO34muPcmKbhrjmyiO4lCCR0VwEd7MjmiKf5NTg/6+apUEu0NF7ESa37CGzFxH513CoUmWnA==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz",
+      "integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -5333,31 +5493,12 @@
       }
     },
     "node_modules/pg-protocol": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.0.tgz",
-      "integrity": "sha512-IpdytjudNuLv8nhlHs/UrVBhU0e78J0oIS/0AVdTbWxSOkFUVdsHC/NrorO6nXsQNDTT1kzDSOMJubBQviX18Q==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz",
+      "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/pg-types": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-4.0.2.tgz",
-      "integrity": "sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "pg-int8": "1.0.1",
-        "pg-numeric": "1.0.2",
-        "postgres-array": "~3.0.1",
-        "postgres-bytea": "~3.0.0",
-        "postgres-date": "~2.1.0",
-        "postgres-interval": "^3.0.0",
-        "postgres-range": "^1.1.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/pg/node_modules/pg-types": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
@@ -5449,13 +5590,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz",
-      "integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==",
+      "version": "1.53.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.53.1.tgz",
+      "integrity": "sha512-LJ13YLr/ocweuwxyGf1XNFWIU4M2zUSo149Qbp+A4cpwDjsxRPj7k6H25LBrEHiEwxvRbD8HdwvQmRMSvquhYw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.52.0"
+        "playwright-core": "1.53.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -5468,9 +5609,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz",
-      "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==",
+      "version": "1.53.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.53.1.tgz",
+      "integrity": "sha512-Z46Oq7tLAyT0lGoFx4DOuB1IA9D1TPj0QkYxpPVUnGDqHHvDpCftu1J2hM2PiWsNMoZh8+LQaarAWcDfPBc6zg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -5548,56 +5689,6 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/postgres-array": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-3.0.4.tgz",
-      "integrity": "sha512-nAUSGfSDGOaOAEGwqsRY27GPOea7CNipJPOA7lPbdEpx5Kg3qzdP0AaWC5MlhTWV9s4hFX39nomVZ+C4tnGOJQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/postgres-bytea": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-3.0.0.tgz",
-      "integrity": "sha512-CNd4jim9RFPkObHSjVHlVrxoVQXz7quwNFpz7RY1okNNme49+sVyiTvTRobiLV548Hx/hb1BG+iE7h9493WzFw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "obuf": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/postgres-date": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-2.1.0.tgz",
-      "integrity": "sha512-K7Juri8gtgXVcDfZttFKVmhglp7epKb1K4pgrkLxehjqkrgPhfG6OO8LHLkfaqkbpjNRnra018XwAr1yQFWGcA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/postgres-interval": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-3.0.0.tgz",
-      "integrity": "sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/postgres-range": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/postgres-range/-/postgres-range-1.1.4.tgz",
-      "integrity": "sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -5609,9 +5700,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
+      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -5934,9 +6025,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -5961,16 +6052,16 @@
       "license": "ISC"
     },
     "node_modules/sharp": {
-      "version": "0.33.5",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.5.tgz",
-      "integrity": "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==",
+      "version": "0.34.2",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.2.tgz",
+      "integrity": "sha512-lszvBmB9QURERtyKT2bNmsgxXK0ShJrL/fvqlonCo7e6xBF8nT8xU6pW+PMIbLsz0RxQk3rgH9kd8UmvOzlMJg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
         "color": "^4.2.3",
-        "detect-libc": "^2.0.3",
-        "semver": "^7.6.3"
+        "detect-libc": "^2.0.4",
+        "semver": "^7.7.2"
       },
       "engines": {
         "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -5979,25 +6070,27 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-darwin-arm64": "0.33.5",
-        "@img/sharp-darwin-x64": "0.33.5",
-        "@img/sharp-libvips-darwin-arm64": "1.0.4",
-        "@img/sharp-libvips-darwin-x64": "1.0.4",
-        "@img/sharp-libvips-linux-arm": "1.0.5",
-        "@img/sharp-libvips-linux-arm64": "1.0.4",
-        "@img/sharp-libvips-linux-s390x": "1.0.4",
-        "@img/sharp-libvips-linux-x64": "1.0.4",
-        "@img/sharp-libvips-linuxmusl-arm64": "1.0.4",
-        "@img/sharp-libvips-linuxmusl-x64": "1.0.4",
-        "@img/sharp-linux-arm": "0.33.5",
-        "@img/sharp-linux-arm64": "0.33.5",
-        "@img/sharp-linux-s390x": "0.33.5",
-        "@img/sharp-linux-x64": "0.33.5",
-        "@img/sharp-linuxmusl-arm64": "0.33.5",
-        "@img/sharp-linuxmusl-x64": "0.33.5",
-        "@img/sharp-wasm32": "0.33.5",
-        "@img/sharp-win32-ia32": "0.33.5",
-        "@img/sharp-win32-x64": "0.33.5"
+        "@img/sharp-darwin-arm64": "0.34.2",
+        "@img/sharp-darwin-x64": "0.34.2",
+        "@img/sharp-libvips-darwin-arm64": "1.1.0",
+        "@img/sharp-libvips-darwin-x64": "1.1.0",
+        "@img/sharp-libvips-linux-arm": "1.1.0",
+        "@img/sharp-libvips-linux-arm64": "1.1.0",
+        "@img/sharp-libvips-linux-ppc64": "1.1.0",
+        "@img/sharp-libvips-linux-s390x": "1.1.0",
+        "@img/sharp-libvips-linux-x64": "1.1.0",
+        "@img/sharp-libvips-linuxmusl-arm64": "1.1.0",
+        "@img/sharp-libvips-linuxmusl-x64": "1.1.0",
+        "@img/sharp-linux-arm": "0.34.2",
+        "@img/sharp-linux-arm64": "0.34.2",
+        "@img/sharp-linux-s390x": "0.34.2",
+        "@img/sharp-linux-x64": "0.34.2",
+        "@img/sharp-linuxmusl-arm64": "0.34.2",
+        "@img/sharp-linuxmusl-x64": "0.34.2",
+        "@img/sharp-wasm32": "0.34.2",
+        "@img/sharp-win32-arm64": "0.34.2",
+        "@img/sharp-win32-ia32": "0.34.2",
+        "@img/sharp-win32-x64": "0.34.2"
       }
     },
     "node_modules/shebang-command": {
@@ -6382,6 +6475,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/strip-literal": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz",
+      "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^9.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
     "node_modules/superagent": {
       "version": "10.2.1",
       "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.2.1.tgz",
@@ -6431,14 +6537,13 @@
       }
     },
     "node_modules/synckit": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.4.tgz",
-      "integrity": "sha512-Q/XQKRaJiLiFIBNN+mndW7S/RHxvwzuZS6ZwmRzUBqJBv/5QIKCEwkBC8GBf8EQJKYnaFs0wOZbKTXBPj8L9oQ==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.8.tgz",
+      "integrity": "sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@pkgr/core": "^0.2.3",
-        "tslib": "^2.8.1"
+        "@pkgr/core": "^0.2.4"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -6576,9 +6681,9 @@
       }
     },
     "node_modules/tinypool": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
-      "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6596,9 +6701,9 @@
       }
     },
     "node_modules/tinyspy": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
-      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.3.tgz",
+      "integrity": "sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6653,7 +6758,8 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true,
-      "license": "0BSD"
+      "license": "0BSD",
+      "optional": true
     },
     "node_modules/tsscmp": {
       "version": "1.0.6",
@@ -6731,15 +6837,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.1.tgz",
-      "integrity": "sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.0.tgz",
+      "integrity": "sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.32.1",
-        "@typescript-eslint/parser": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1"
+        "@typescript-eslint/eslint-plugin": "8.35.0",
+        "@typescript-eslint/parser": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6919,17 +7025,17 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz",
-      "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
+      "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.4.0",
+        "debug": "^4.4.1",
         "es-module-lexer": "^1.7.0",
         "pathe": "^2.0.3",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "bin": {
         "vite-node": "vite-node.mjs"
@@ -6985,32 +7091,34 @@
       }
     },
     "node_modules/vitest": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz",
-      "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
+      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "3.1.4",
-        "@vitest/mocker": "3.1.4",
-        "@vitest/pretty-format": "^3.1.4",
-        "@vitest/runner": "3.1.4",
-        "@vitest/snapshot": "3.1.4",
-        "@vitest/spy": "3.1.4",
-        "@vitest/utils": "3.1.4",
+        "@types/chai": "^5.2.2",
+        "@vitest/expect": "3.2.4",
+        "@vitest/mocker": "3.2.4",
+        "@vitest/pretty-format": "^3.2.4",
+        "@vitest/runner": "3.2.4",
+        "@vitest/snapshot": "3.2.4",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
         "chai": "^5.2.0",
-        "debug": "^4.4.0",
+        "debug": "^4.4.1",
         "expect-type": "^1.2.1",
         "magic-string": "^0.30.17",
         "pathe": "^2.0.3",
+        "picomatch": "^4.0.2",
         "std-env": "^3.9.0",
         "tinybench": "^2.9.0",
         "tinyexec": "^0.3.2",
-        "tinyglobby": "^0.2.13",
-        "tinypool": "^1.0.2",
+        "tinyglobby": "^0.2.14",
+        "tinypool": "^1.1.1",
         "tinyrainbow": "^2.0.0",
-        "vite": "^5.0.0 || ^6.0.0",
-        "vite-node": "3.1.4",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
+        "vite-node": "3.2.4",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -7026,8 +7134,8 @@
         "@edge-runtime/vm": "*",
         "@types/debug": "^4.1.12",
         "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.1.4",
-        "@vitest/ui": "3.1.4",
+        "@vitest/browser": "3.2.4",
+        "@vitest/ui": "3.2.4",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -7055,6 +7163,19 @@
         }
       }
     },
+    "node_modules/vitest/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
diff --git a/e2e/package.json b/e2e/package.json
index 15733e0d4f..25e1d27d23 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -44,7 +44,7 @@
     "pngjs": "^7.0.0",
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^4.0.0",
-    "sharp": "^0.33.5",
+    "sharp": "^0.34.0",
     "socket.io-client": "^4.7.4",
     "supertest": "^7.0.0",
     "typescript": "^5.3.3",
diff --git a/server/Dockerfile b/server/Dockerfile
index 236b8b08d5..de977d5436 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -4,7 +4,6 @@ FROM ghcr.io/immich-app/base-server-dev:202505131114@sha256:cf4507bbbf307e9b6d8e
 RUN apt-get install --no-install-recommends -yqq tini
 WORKDIR /usr/src/app
 COPY server/package.json server/package-lock.json ./
-COPY server/patches ./patches
 RUN npm ci && \
     # exiftool-vendored.pl, sharp-linux-x64 and sharp-linux-arm64 are the only ones we need
     # they're marked as optional dependencies, so we need to copy them manually after pruning
@@ -33,7 +32,7 @@ COPY --chown=node:node --chmod=777 ../.devcontainer/server/*.sh /immich-devconta
 USER node
 COPY --chown=node:node .. /tmp/create-dep-cache/
 WORKDIR /tmp/create-dep-cache
-RUN make ci-all && rm -rf /tmp/create-dep-cache 
+RUN make ci-all && rm -rf /tmp/create-dep-cache
 
 
 FROM dev-container-server AS dev-container-mobile
diff --git a/server/package-lock.json b/server/package-lock.json
index 6c7ac46098..23304af5fc 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -7,7 +7,6 @@
     "": {
       "name": "immich",
       "version": "1.135.3",
-      "hasInstallScript": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@nestjs/bullmq": "^11.0.1",
@@ -20,18 +19,18 @@
         "@nestjs/swagger": "^11.0.2",
         "@nestjs/websockets": "^11.0.4",
         "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/auto-instrumentations-node": "^0.59.0",
+        "@opentelemetry/auto-instrumentations-node": "^0.60.0",
         "@opentelemetry/context-async-hooks": "^2.0.0",
-        "@opentelemetry/exporter-prometheus": "^0.201.0",
+        "@opentelemetry/exporter-prometheus": "^0.202.0",
         "@opentelemetry/instrumentation-http": "^0.202.0",
         "@opentelemetry/instrumentation-ioredis": "^0.50.0",
         "@opentelemetry/instrumentation-nestjs-core": "^0.48.0",
         "@opentelemetry/instrumentation-pg": "^0.54.0",
         "@opentelemetry/resources": "^2.0.1",
         "@opentelemetry/sdk-metrics": "^2.0.1",
-        "@opentelemetry/sdk-node": "^0.201.0",
+        "@opentelemetry/sdk-node": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.34.0",
-        "@react-email/components": "^0.0.41",
+        "@react-email/components": "^0.1.0",
         "@react-email/render": "^1.1.2",
         "@socket.io/redis-adapter": "^8.3.0",
         "archiver": "^7.0.0",
@@ -70,7 +69,7 @@
         "pg": "^8.11.3",
         "pg-connection-string": "^2.9.1",
         "picomatch": "^4.0.2",
-        "postgres": "3.4.5",
+        "postgres": "3.4.7",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
         "react-email": "^4.0.0",
@@ -130,7 +129,6 @@
         "mock-fs": "^5.2.0",
         "node-addon-api": "^8.3.1",
         "node-gyp": "^11.2.0",
-        "patch-package": "^8.0.0",
         "pngjs": "^7.0.0",
         "prettier": "^3.0.2",
         "prettier-plugin-organize-imports": "^4.0.0",
@@ -3346,9 +3344,9 @@
       }
     },
     "node_modules/@opentelemetry/api-logs": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.201.1.tgz",
-      "integrity": "sha512-IxcFDP1IGMDemVFG2by/AMK+/o6EuBQ8idUq3xZ6MxgQGeumYZuX5OwR0h9HuvcUc/JPjQGfU5OHKIKYDJcXeA==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.202.0.tgz",
+      "integrity": "sha512-fTBjMqKCfotFWfLzaKyhjLvyEyq5vDKTTFfBmx21btv3gvy8Lq6N5Dh2OzqeuN4DjtpSvNT1uNVfg08eD2Rfxw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/api": "^1.3.0"
@@ -3358,60 +3356,60 @@
       }
     },
     "node_modules/@opentelemetry/auto-instrumentations-node": {
-      "version": "0.59.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/auto-instrumentations-node/-/auto-instrumentations-node-0.59.0.tgz",
-      "integrity": "sha512-kqoEBQss8fGGGRND0ycXZrwCXa/ePFop6W+YvZF5PikA9EsH0J/F2W6zvjetKjtdjyl6AUDW8I7gslZPXLLz3Q==",
+      "version": "0.60.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/auto-instrumentations-node/-/auto-instrumentations-node-0.60.1.tgz",
+      "integrity": "sha512-oMBVXiun0qWhj693Y24Ie+75q45YXHRFeH9vX/XBWKRNJIM/02ufjmNvmOdoHY0EPxU9rBmWCW82Uidf54iSPA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
-        "@opentelemetry/instrumentation-amqplib": "^0.48.0",
-        "@opentelemetry/instrumentation-aws-lambda": "^0.52.0",
-        "@opentelemetry/instrumentation-aws-sdk": "^0.53.0",
-        "@opentelemetry/instrumentation-bunyan": "^0.47.0",
-        "@opentelemetry/instrumentation-cassandra-driver": "^0.47.0",
-        "@opentelemetry/instrumentation-connect": "^0.45.0",
-        "@opentelemetry/instrumentation-cucumber": "^0.16.0",
-        "@opentelemetry/instrumentation-dataloader": "^0.18.0",
-        "@opentelemetry/instrumentation-dns": "^0.45.0",
-        "@opentelemetry/instrumentation-express": "^0.50.0",
-        "@opentelemetry/instrumentation-fastify": "^0.46.0",
-        "@opentelemetry/instrumentation-fs": "^0.21.0",
-        "@opentelemetry/instrumentation-generic-pool": "^0.45.0",
-        "@opentelemetry/instrumentation-graphql": "^0.49.0",
-        "@opentelemetry/instrumentation-grpc": "^0.201.0",
-        "@opentelemetry/instrumentation-hapi": "^0.47.0",
-        "@opentelemetry/instrumentation-http": "^0.201.0",
-        "@opentelemetry/instrumentation-ioredis": "^0.49.0",
-        "@opentelemetry/instrumentation-kafkajs": "^0.10.0",
-        "@opentelemetry/instrumentation-knex": "^0.46.0",
-        "@opentelemetry/instrumentation-koa": "^0.49.0",
-        "@opentelemetry/instrumentation-lru-memoizer": "^0.46.0",
-        "@opentelemetry/instrumentation-memcached": "^0.45.0",
-        "@opentelemetry/instrumentation-mongodb": "^0.54.0",
-        "@opentelemetry/instrumentation-mongoose": "^0.48.0",
-        "@opentelemetry/instrumentation-mysql": "^0.47.0",
-        "@opentelemetry/instrumentation-mysql2": "^0.47.0",
-        "@opentelemetry/instrumentation-nestjs-core": "^0.47.0",
-        "@opentelemetry/instrumentation-net": "^0.45.0",
-        "@opentelemetry/instrumentation-oracledb": "^0.27.0",
-        "@opentelemetry/instrumentation-pg": "^0.53.0",
-        "@opentelemetry/instrumentation-pino": "^0.48.0",
-        "@opentelemetry/instrumentation-redis": "^0.48.0",
-        "@opentelemetry/instrumentation-redis-4": "^0.48.0",
-        "@opentelemetry/instrumentation-restify": "^0.47.0",
-        "@opentelemetry/instrumentation-router": "^0.46.0",
-        "@opentelemetry/instrumentation-runtime-node": "^0.15.0",
-        "@opentelemetry/instrumentation-socket.io": "^0.48.0",
-        "@opentelemetry/instrumentation-tedious": "^0.20.0",
-        "@opentelemetry/instrumentation-undici": "^0.12.0",
-        "@opentelemetry/instrumentation-winston": "^0.46.0",
-        "@opentelemetry/resource-detector-alibaba-cloud": "^0.31.1",
-        "@opentelemetry/resource-detector-aws": "^2.1.0",
-        "@opentelemetry/resource-detector-azure": "^0.8.0",
-        "@opentelemetry/resource-detector-container": "^0.7.1",
-        "@opentelemetry/resource-detector-gcp": "^0.35.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation-amqplib": "^0.49.0",
+        "@opentelemetry/instrumentation-aws-lambda": "^0.53.0",
+        "@opentelemetry/instrumentation-aws-sdk": "^0.54.0",
+        "@opentelemetry/instrumentation-bunyan": "^0.48.0",
+        "@opentelemetry/instrumentation-cassandra-driver": "^0.48.0",
+        "@opentelemetry/instrumentation-connect": "^0.46.0",
+        "@opentelemetry/instrumentation-cucumber": "^0.17.0",
+        "@opentelemetry/instrumentation-dataloader": "^0.19.0",
+        "@opentelemetry/instrumentation-dns": "^0.46.0",
+        "@opentelemetry/instrumentation-express": "^0.51.0",
+        "@opentelemetry/instrumentation-fastify": "^0.47.0",
+        "@opentelemetry/instrumentation-fs": "^0.22.0",
+        "@opentelemetry/instrumentation-generic-pool": "^0.46.0",
+        "@opentelemetry/instrumentation-graphql": "^0.50.0",
+        "@opentelemetry/instrumentation-grpc": "^0.202.0",
+        "@opentelemetry/instrumentation-hapi": "^0.49.0",
+        "@opentelemetry/instrumentation-http": "^0.202.0",
+        "@opentelemetry/instrumentation-ioredis": "^0.50.0",
+        "@opentelemetry/instrumentation-kafkajs": "^0.11.0",
+        "@opentelemetry/instrumentation-knex": "^0.47.0",
+        "@opentelemetry/instrumentation-koa": "^0.50.1",
+        "@opentelemetry/instrumentation-lru-memoizer": "^0.47.0",
+        "@opentelemetry/instrumentation-memcached": "^0.46.0",
+        "@opentelemetry/instrumentation-mongodb": "^0.55.1",
+        "@opentelemetry/instrumentation-mongoose": "^0.49.0",
+        "@opentelemetry/instrumentation-mysql": "^0.48.0",
+        "@opentelemetry/instrumentation-mysql2": "^0.48.0",
+        "@opentelemetry/instrumentation-nestjs-core": "^0.48.0",
+        "@opentelemetry/instrumentation-net": "^0.46.1",
+        "@opentelemetry/instrumentation-oracledb": "^0.28.0",
+        "@opentelemetry/instrumentation-pg": "^0.54.0",
+        "@opentelemetry/instrumentation-pino": "^0.49.0",
+        "@opentelemetry/instrumentation-redis": "^0.49.1",
+        "@opentelemetry/instrumentation-redis-4": "^0.49.0",
+        "@opentelemetry/instrumentation-restify": "^0.48.1",
+        "@opentelemetry/instrumentation-router": "^0.47.0",
+        "@opentelemetry/instrumentation-runtime-node": "^0.16.0",
+        "@opentelemetry/instrumentation-socket.io": "^0.49.0",
+        "@opentelemetry/instrumentation-tedious": "^0.21.0",
+        "@opentelemetry/instrumentation-undici": "^0.13.1",
+        "@opentelemetry/instrumentation-winston": "^0.47.0",
+        "@opentelemetry/resource-detector-alibaba-cloud": "^0.31.2",
+        "@opentelemetry/resource-detector-aws": "^2.2.0",
+        "@opentelemetry/resource-detector-azure": "^0.9.0",
+        "@opentelemetry/resource-detector-container": "^0.7.2",
+        "@opentelemetry/resource-detector-gcp": "^0.36.0",
         "@opentelemetry/resources": "^2.0.0",
-        "@opentelemetry/sdk-node": "^0.201.0"
+        "@opentelemetry/sdk-node": "^0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3421,143 +3419,6 @@
         "@opentelemetry/core": "^2.0.0"
       }
     },
-    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@opentelemetry/instrumentation-http": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.201.1.tgz",
-      "integrity": "sha512-xhkL/eOntScSLS8C2/LHKZ9Z9MEyGB9Yil7lF3JV0+YBeLXHQUIw2xPD7T0qw0DnqlrN8c/gi8hb5BEXZcyHRg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/instrumentation": "0.201.1",
-        "@opentelemetry/semantic-conventions": "^1.29.0",
-        "forwarded-parse": "2.1.2"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@opentelemetry/instrumentation-ioredis": {
-      "version": "0.49.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.49.0.tgz",
-      "integrity": "sha512-CcbA9ylntqK7/lo7NUD/I+Uj6xcIiFFk1O2RnY23MugJunqZIFufvYkdh1mdG2bvBKdIVvA2nkVVt1Igw0uw1A==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
-        "@opentelemetry/redis-common": "^0.37.0",
-        "@opentelemetry/semantic-conventions": "^1.27.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@opentelemetry/instrumentation-nestjs-core": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.47.0.tgz",
-      "integrity": "sha512-xTtWbqdvlxRfhYidLEq0XvQUGqqgT4Fom21nxJ7XYvOoUJ4KNOxFBnfGW9RcXtFHDkux6rIjNP5CiPCYMZ007g==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
-        "@opentelemetry/semantic-conventions": "^1.30.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@opentelemetry/instrumentation-pg": {
-      "version": "0.53.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.53.0.tgz",
-      "integrity": "sha512-riWbJvSviTAsjeuq8fn7Y7+CXEYf3sGR18WfLeM7GgSnptTOur1++SLTN7XogqiwP3LFFQ0GLoYe+hxVOEyEpw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
-        "@opentelemetry/semantic-conventions": "^1.27.0",
-        "@opentelemetry/sql-common": "^0.41.0",
-        "@types/pg": "8.6.1",
-        "@types/pg-pool": "2.0.6"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@types/pg": {
-      "version": "8.6.1",
-      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.6.1.tgz",
-      "integrity": "sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "pg-protocol": "*",
-        "pg-types": "^2.2.0"
-      }
-    },
-    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/pg-types": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
-      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
-      "license": "MIT",
-      "dependencies": {
-        "pg-int8": "1.0.1",
-        "postgres-array": "~2.0.0",
-        "postgres-bytea": "~1.0.0",
-        "postgres-date": "~1.0.4",
-        "postgres-interval": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/postgres-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
-      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/postgres-bytea": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
-      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/postgres-date": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
-      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/postgres-interval": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
-      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
-      "license": "MIT",
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@opentelemetry/context-async-hooks": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-2.0.1.tgz",
@@ -3586,17 +3447,17 @@
       }
     },
     "node_modules/@opentelemetry/exporter-logs-otlp-grpc": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-grpc/-/exporter-logs-otlp-grpc-0.201.1.tgz",
-      "integrity": "sha512-ACV2Az9BHRcAaPMYBnYMwKHNn2JwkzzsT3cdeG6+Tokm47fFfpf2xk3sq3QvX0Gk+TXW7q6d+OfBuYfWoAud2g==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-grpc/-/exporter-logs-otlp-grpc-0.202.0.tgz",
+      "integrity": "sha512-Y84L8Yja/A2qjGEzC/To0yrMUXHrtwJzHtZ2za1/ulZplRe5QFsLNyHixIS42ZYUKuNyWMDgOFhnN2Pz5uThtg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@grpc/grpc-js": "^1.7.1",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-grpc-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-transformer": "0.201.1",
-        "@opentelemetry/sdk-logs": "0.201.1"
+        "@opentelemetry/otlp-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-grpc-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-transformer": "0.202.0",
+        "@opentelemetry/sdk-logs": "0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3606,16 +3467,16 @@
       }
     },
     "node_modules/@opentelemetry/exporter-logs-otlp-http": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-http/-/exporter-logs-otlp-http-0.201.1.tgz",
-      "integrity": "sha512-flYr1tr/wlUxsVc2ZYt/seNLgp3uagyUg9MtjiHYyaMQcN4XuEuI4UjUFwXAGQjd2khmXeie5YnTmO8gzyzemw==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-http/-/exporter-logs-otlp-http-0.202.0.tgz",
+      "integrity": "sha512-mJWLkmoG+3r+SsYQC+sbWoy1rjowJhMhFvFULeIPTxSI+EZzKPya0+NZ3+vhhgx2UTybGQlye3FBtCH3o6Rejg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.201.1",
+        "@opentelemetry/api-logs": "0.202.0",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-transformer": "0.201.1",
-        "@opentelemetry/sdk-logs": "0.201.1"
+        "@opentelemetry/otlp-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-transformer": "0.202.0",
+        "@opentelemetry/sdk-logs": "0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3625,17 +3486,17 @@
       }
     },
     "node_modules/@opentelemetry/exporter-logs-otlp-proto": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-proto/-/exporter-logs-otlp-proto-0.201.1.tgz",
-      "integrity": "sha512-ZVkutDoQYLAkWmpbmd9XKZ9NeBQS6GPxLl/NZ/uDMq+tFnmZu1p0cvZ43x5+TpFoGkjPR6QYHCxkcZBwI9M8ag==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-proto/-/exporter-logs-otlp-proto-0.202.0.tgz",
+      "integrity": "sha512-qYwbmNWPkP7AbzX8o4DRu5bb/a0TWYNcpZc1NEAOhuV7pgBpAUPEClxRWPN94ulIia+PfQjzFGMaRwmLGmNP6g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.201.1",
+        "@opentelemetry/api-logs": "0.202.0",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-transformer": "0.201.1",
+        "@opentelemetry/otlp-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-transformer": "0.202.0",
         "@opentelemetry/resources": "2.0.1",
-        "@opentelemetry/sdk-logs": "0.201.1",
+        "@opentelemetry/sdk-logs": "0.202.0",
         "@opentelemetry/sdk-trace-base": "2.0.1"
       },
       "engines": {
@@ -3646,17 +3507,17 @@
       }
     },
     "node_modules/@opentelemetry/exporter-metrics-otlp-grpc": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-grpc/-/exporter-metrics-otlp-grpc-0.201.1.tgz",
-      "integrity": "sha512-ywo4TpQNOLi07K7P3CaymzS8XlDGfTFmMQ4oSPsZv38/gAf3/wPVh2uL5qYAFqrVokNCmkcaeCwX3QSy0g9b/A==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-grpc/-/exporter-metrics-otlp-grpc-0.202.0.tgz",
+      "integrity": "sha512-/dq/rf4KCkTYoP+NyPXTE+5wjvfhAHSqK62vRsJ/IalG61VPQvwaL18yWcavbI+44ImQwtMeZxfIJSox7oQL0w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@grpc/grpc-js": "^1.7.1",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/exporter-metrics-otlp-http": "0.201.1",
-        "@opentelemetry/otlp-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-grpc-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-transformer": "0.201.1",
+        "@opentelemetry/exporter-metrics-otlp-http": "0.202.0",
+        "@opentelemetry/otlp-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-grpc-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-transformer": "0.202.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-metrics": "2.0.1"
       },
@@ -3668,14 +3529,14 @@
       }
     },
     "node_modules/@opentelemetry/exporter-metrics-otlp-http": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-http/-/exporter-metrics-otlp-http-0.201.1.tgz",
-      "integrity": "sha512-LMRVg2yTev28L51RLLUK3gY0avMa1RVBq7IkYNtXDBxJRcd0TGGq/0rqfk7Y4UIM9NCJhDIUFHeGg8NpSgSWcw==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-http/-/exporter-metrics-otlp-http-0.202.0.tgz",
+      "integrity": "sha512-ooYcrf/m9ZuVGpQnER7WRH+JZbDPD389HG7VS/EnvIEF5WpNYEqf+NdmtaAcs51d81QrytTYAubc5bVWi//28w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-transformer": "0.201.1",
+        "@opentelemetry/otlp-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-transformer": "0.202.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-metrics": "2.0.1"
       },
@@ -3687,15 +3548,15 @@
       }
     },
     "node_modules/@opentelemetry/exporter-metrics-otlp-proto": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-proto/-/exporter-metrics-otlp-proto-0.201.1.tgz",
-      "integrity": "sha512-9ie2jcaUQZdIoe6B02r0rF4Gz+JsZ9mev/2pYou1N0woOUkFM8xwO6BAlORnrFVslqF/XO5WG3q5FsTbuC5iiw==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-proto/-/exporter-metrics-otlp-proto-0.202.0.tgz",
+      "integrity": "sha512-X0RpPpPjyCAmIq9tySZm0Hk3Ltw8KWsqeNq5I7gS9AR9RzbVHb/l+eiMI1CqSRvW9R47HXcUu/epmEzY8ebFAg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/exporter-metrics-otlp-http": "0.201.1",
-        "@opentelemetry/otlp-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-transformer": "0.201.1",
+        "@opentelemetry/exporter-metrics-otlp-http": "0.202.0",
+        "@opentelemetry/otlp-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-transformer": "0.202.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-metrics": "2.0.1"
       },
@@ -3707,9 +3568,9 @@
       }
     },
     "node_modules/@opentelemetry/exporter-prometheus": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-prometheus/-/exporter-prometheus-0.201.1.tgz",
-      "integrity": "sha512-J6/4KgljApWda/2YBMHHZg6vaZ6H8BjFInO8YQW+N0al1LjGAAq3pFRCEHpU6GI7ZlkphCxKy6MUjXOZVM8KWQ==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-prometheus/-/exporter-prometheus-0.202.0.tgz",
+      "integrity": "sha512-6RvQqZHAPFiwL1OKRJe4ta6SgJx/g8or41B+OovVVEie3HeCDhDGL9S1VJNkBozUz6wTY8a47fQwdMrCOUdMhQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
@@ -3724,16 +3585,16 @@
       }
     },
     "node_modules/@opentelemetry/exporter-trace-otlp-grpc": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-grpc/-/exporter-trace-otlp-grpc-0.201.1.tgz",
-      "integrity": "sha512-0ZM5CBoZbufXckxi/SWwP5B++CjPWS6N1i+K7f+GhRxYWVGt/yh4eiV3jklZKWw/DUyMkUvUOo0GW1RxoiLoZQ==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-grpc/-/exporter-trace-otlp-grpc-0.202.0.tgz",
+      "integrity": "sha512-d5wLdbNA3ahpSeD0I34vbDFMTh4vPsXemH0bKDXLeCVULCAjOJXuZmEiuRammiDgVvvX7CAb/IGLDz8d2QHvoA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@grpc/grpc-js": "^1.7.1",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-grpc-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-transformer": "0.201.1",
+        "@opentelemetry/otlp-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-grpc-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-transformer": "0.202.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-trace-base": "2.0.1"
       },
@@ -3745,14 +3606,14 @@
       }
     },
     "node_modules/@opentelemetry/exporter-trace-otlp-http": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.201.1.tgz",
-      "integrity": "sha512-Nw3pIqATC/9LfSGrMiQeeMQ7/z7W2D0wKPxtXwAcr7P64JW7KSH4YSX7Ji8Ti3MmB79NQg6imdagfegJDB0rng==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.202.0.tgz",
+      "integrity": "sha512-/hKE8DaFCJuaQqE1IxpgkcjOolUIwgi3TgHElPVKGdGRBSmJMTmN/cr6vWa55pCJIXPyhKvcMrbrya7DZ3VmzA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-transformer": "0.201.1",
+        "@opentelemetry/otlp-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-transformer": "0.202.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-trace-base": "2.0.1"
       },
@@ -3764,14 +3625,14 @@
       }
     },
     "node_modules/@opentelemetry/exporter-trace-otlp-proto": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-proto/-/exporter-trace-otlp-proto-0.201.1.tgz",
-      "integrity": "sha512-wMxdDDyW+lmmenYGBp0evCoKzajXqIw6SSaZtaF/uqKR9/POhC/9vudnc+kf8W49hYFyIEutPrc1hA0exe3UwQ==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-proto/-/exporter-trace-otlp-proto-0.202.0.tgz",
+      "integrity": "sha512-z3vzdMclCETGIn8uUBgpz7w651ftCiH2qh3cewhBk+rF0EYPNQ3mJvyxktLnKIBZ/ci0zUknAzzYC7LIIZmggQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-transformer": "0.201.1",
+        "@opentelemetry/otlp-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-transformer": "0.202.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-trace-base": "2.0.1"
       },
@@ -3816,16 +3677,14 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.201.1.tgz",
-      "integrity": "sha512-6EOSoT2zcyBM3VryAzn35ytjRrOMeaWZyzQ/PHVfxoXp5rMf7UUgVToqxOhQffKOHtC7Dma4bHt+DuwIBBZyZA==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.202.0.tgz",
+      "integrity": "sha512-Uz3BxZWPgDwgHM2+vCKEQRh0R8WKrd/q6Tus1vThRClhlPO39Dyz7mDrOr6KuqGXAlBQ1e5Tnymzri4RMZNaWA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.201.1",
-        "@types/shimmer": "^1.2.0",
+        "@opentelemetry/api-logs": "0.202.0",
         "import-in-the-middle": "^1.8.1",
-        "require-in-the-middle": "^7.1.1",
-        "shimmer": "^1.2.1"
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3835,13 +3694,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-amqplib": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.48.0.tgz",
-      "integrity": "sha512-zXcClQX3sttvBih1CjdPbvve/If1lCHPFK41fDpJE5NYjK38dwTMOUEV0+/ulfq4iU4oEV+ReCA+ZaXAm/uYdw==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.49.0.tgz",
+      "integrity": "sha512-OCGkE+1JoUN+gOzs3u0GSa7GV//KX6NMKzaPchedae7ZwFVyyBQ8VECJngHgW3k/FLABFnq9Oiym2WZGiWugVQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -3852,12 +3711,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-aws-lambda": {
-      "version": "0.52.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-aws-lambda/-/instrumentation-aws-lambda-0.52.0.tgz",
-      "integrity": "sha512-xGVhBxxO7OuOl72XNwt1MOgaA6d3pSKI2Y5r3OfGNkx602KzW1t2vBHzJf8s4DAJYdMd5/RJLRi1z87CBu7yyg==",
+      "version": "0.53.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-aws-lambda/-/instrumentation-aws-lambda-0.53.0.tgz",
+      "integrity": "sha512-dZywDIc4t7o28eU9W4QMB+mNhRdH5/kVxVmxRtB46/diHg8Im6RFncuiCVJ1l9ig/RUtwR3dU9LX1huFBwxkPw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@types/aws-lambda": "8.10.147"
       },
@@ -3869,14 +3728,14 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-aws-sdk": {
-      "version": "0.53.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-aws-sdk/-/instrumentation-aws-sdk-0.53.0.tgz",
-      "integrity": "sha512-CXB2cu0qnp5lHtNZRpvz0oOZrIKiWfHOiNVGWln9KY0m9sBheEqc58x3Ptpi5lMyso67heVCGDAc9+KbLAZwTQ==",
+      "version": "0.54.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-aws-sdk/-/instrumentation-aws-sdk-0.54.0.tgz",
+      "integrity": "sha512-4XnXfpACX8fpOnt/D8d/1AFg3uOwBTG9TopQBuikDZJYUrLUSdT7UiotCFqAM/Z6hQJh72Jy3591C/OrmKct7A==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
-        "@opentelemetry/propagation-utils": "^0.31.1",
+        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/propagation-utils": "^0.31.2",
         "@opentelemetry/semantic-conventions": "^1.31.0"
       },
       "engines": {
@@ -3887,13 +3746,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-bunyan": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-bunyan/-/instrumentation-bunyan-0.47.0.tgz",
-      "integrity": "sha512-Sux5us8fkBLO/z+H8P2fSu+fRIm1xTeUHlwtM/E4CNZS9W/sAYrc8djZVa2JrwNXj/tE6U5vRJVObGekIkULow==",
+      "version": "0.48.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-bunyan/-/instrumentation-bunyan-0.48.0.tgz",
+      "integrity": "sha512-Q6ay5CXIKuyejadPoLboz+jKumB3Zuxyk35ycFh9vfIeww3+mNRyMVj6KxHRS0Imbv9zhNbP3uyrUpvEMMyHuw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "^0.201.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/api-logs": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@types/bunyan": "1.8.11"
       },
       "engines": {
@@ -3904,12 +3763,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-cassandra-driver": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-cassandra-driver/-/instrumentation-cassandra-driver-0.47.0.tgz",
-      "integrity": "sha512-MMn/Y2ErClGe7fmzTfR3iJcbEIspAn9hxbnj8oH7bVpPHcWbPphYICkNfLqah4tKVd+zazhs1agCiHL8y/e12g==",
+      "version": "0.48.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-cassandra-driver/-/instrumentation-cassandra-driver-0.48.0.tgz",
+      "integrity": "sha512-0dcX8Kx0S6ZAOknrbA+BBh1j5lg5F20W18m5VYoGUxkuLIUbWkQA3uaqeTfqbOwmnBmb1upDPUWPR+g5N12B4Q==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -3920,13 +3779,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-connect": {
-      "version": "0.45.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.45.0.tgz",
-      "integrity": "sha512-OHdp71gsRnm0lVD7SEtYSJFfvq4r6QN/5lgRK+Vrife1DHy+Insm66JJZN2Frt1waIzmDNn3VLCCafTnItfVcA==",
+      "version": "0.46.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.46.0.tgz",
+      "integrity": "sha512-YNq/7M1JXnWRkpKPC9dbYZA36cg547gY0p1bijW7vuZJ9t5f3alo6w8TWtZwV/hOFtBGHDXVhKVfp2Mh6zVHjQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@types/connect": "3.4.38"
       },
@@ -3938,12 +3797,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-cucumber": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-cucumber/-/instrumentation-cucumber-0.16.0.tgz",
-      "integrity": "sha512-bLKOQFgKimQkD8th+y0zMD9vNBjq79BWmPd7QqOGV2atQFbb2QJnorp/Y6poTVQNiITv0GE2mmmcqbjF+Y+JQA==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-cucumber/-/instrumentation-cucumber-0.17.0.tgz",
+      "integrity": "sha512-TTfQ9DmUlbeBsYZjNdJqs8mlcn1uY3t/AsTsALDBEFg6tWV+S1ADM9kVmKnscfbCwcQX2x17f/6a1Kpq5p91ww==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -3954,12 +3813,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-dataloader": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.18.0.tgz",
-      "integrity": "sha512-egPb8OcGZP6GUU/dbB8NnVgnSIqlM0nHS8KkADq51rVaMkzBcevtinYDFYTQu9tuQ6GEwaSdiQxiQORpYaVeQw==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.19.0.tgz",
+      "integrity": "sha512-zIVRnRs3zDZCqStQcpIdRx3Dz9WXFSVj9qimqI7CRuKao9qnrZYUVQHvvVlLZX3JAg+nDC6JRS95zvbq50hj4A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0"
+        "@opentelemetry/instrumentation": "^0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3969,12 +3828,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-dns": {
-      "version": "0.45.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-dns/-/instrumentation-dns-0.45.0.tgz",
-      "integrity": "sha512-gE02Jj97aaYUdZIvp2RwWPy3DLN86k15YvPRzkMaPWZKVwsKrHcA+xVX8k3rh9o0g64PC/U2f+LXiJr14PyVLg==",
+      "version": "0.46.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-dns/-/instrumentation-dns-0.46.0.tgz",
+      "integrity": "sha512-m8u72x2fSIjhP1ITJX9Ims3eR4Qn8ze+QWy9NHYO01JlmiMamoc9TfIOd4dyOtxVja4tjnkWceKQdlEH9F9BoA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0"
+        "@opentelemetry/instrumentation": "^0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3984,13 +3843,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-express": {
-      "version": "0.50.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.50.0.tgz",
-      "integrity": "sha512-0VF7HM8hTe0B5oXqCfBljMYFeQ3WKKqs0kCTRT02/Pjnmj5bOmR62r2dstjxbxnGKoeFRUHD/QAown9gyf659A==",
+      "version": "0.51.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.51.0.tgz",
+      "integrity": "sha512-v1mgfvyeQh7yfsZ8wZlr+jgFGk9FxzLfNH0EH0UYGO9das8fCIkixsEasZMWhjwAJKjlf+ElTZ2jE2pT7I3DyQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4001,13 +3860,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-fastify": {
-      "version": "0.46.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.46.0.tgz",
-      "integrity": "sha512-tib8SH5RCqhYRw9Qcpep9tP6ABxyXFDljdRy2aKpklHaFAyDELr3EpEAkGdkMZtO5Y3/QhUsmzYZp1np9jkjUg==",
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.47.0.tgz",
+      "integrity": "sha512-dLld0pI63WR1BXvNiGKFWzqrnhgItiIDNsRf/vVOhKV20HQNUQk5FfzcX0eUyiJtW/+u95Txh/vdfeQRwLELcA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4018,13 +3877,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-fs": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.21.0.tgz",
-      "integrity": "sha512-p2Fn78KSSbSSIJOOTn9FbxEzNRIIsYn9KTemKhABuunVqHixIqQ3hUjChbR+RbjPNZQthDC/0GHDeihRoyLdLQ==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.22.0.tgz",
+      "integrity": "sha512-ktQVFD6pd8eAIW6t2DtDuXj2lxq+wnQ8WUkJLNZzl3rEE2TZEiHg7wIkWVoxl4Cz4pJ2YZJbdU2fHAizuDebDw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0"
+        "@opentelemetry/instrumentation": "^0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4034,12 +3893,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-generic-pool": {
-      "version": "0.45.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.45.0.tgz",
-      "integrity": "sha512-+fk7tnpzkkBAQzEtyJA0zRv7aBDhr05zczyBn//iJdmDG+ZfQFuIKK4dXNnv9FUZpedW0wcHlPqbP5FIGhAsLQ==",
+      "version": "0.46.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.46.0.tgz",
+      "integrity": "sha512-QJUH9n5Ld0xz54gX1k3L2RDoSyJjeZaASA17Zvm0uVa40v+s8oMfCa1/4y9TONFSVbL0fPbAGojVsRRtg6dJ5w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0"
+        "@opentelemetry/instrumentation": "^0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4049,12 +3908,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-graphql": {
-      "version": "0.49.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.49.0.tgz",
-      "integrity": "sha512-FZaOS/BmE5npzk95X3Iqfo80a6wEJlkAtk7wLUJG/VZaB8RbBjJow4g0YdtvK8GNGEQW02KiQ+VtzdPGRemlwg==",
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.50.0.tgz",
+      "integrity": "sha512-Nn3vBS5T0Dv4+9WF1dGR0Lgsxuz6ztQmTsxoHvesm6YAAXiHffnwsxBEJUKEJcjxfXzjO1SVuLDkv1bAeQ3NFw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0"
+        "@opentelemetry/instrumentation": "^0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4064,12 +3923,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-grpc": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-grpc/-/instrumentation-grpc-0.201.1.tgz",
-      "integrity": "sha512-OIkXkVnilh8E6YKz/PiQtWeERqbcbjtVppMc7A2h39eaoaKnckXxom3YXhX+/PMhfmjbUnqw6k/KvmUr9zig1Q==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-grpc/-/instrumentation-grpc-0.202.0.tgz",
+      "integrity": "sha512-dWvefHNAyAfaHVmxQ/ySLQSI2hGKLgK1sBtvae4w9xruqU08bBMtvmVeGMA/5whfiUDU8ftp1/84U4Zoe5N56A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "0.201.1",
+        "@opentelemetry/instrumentation": "0.202.0",
         "@opentelemetry/semantic-conventions": "^1.29.0"
       },
       "engines": {
@@ -4080,13 +3939,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-hapi": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.47.0.tgz",
-      "integrity": "sha512-0BCiQl2+oAuhSzbZrgpZgRvg7PclTfb7GxuBqWmWj9XkRk6cKla18S0pBqRCtl+qluRIaZ7tyXKmdtlsXj0QIw==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.49.0.tgz",
+      "integrity": "sha512-d4BcCjbW7Pfg4FpbAAF0cK/ue3dN02WMw0uO2G792KzDjxj05MtZm3eBTz672j3ejV9hM0HvPPhUHUsIC0H6Gw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4114,35 +3973,6 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-http/node_modules/@opentelemetry/api-logs": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.202.0.tgz",
-      "integrity": "sha512-fTBjMqKCfotFWfLzaKyhjLvyEyq5vDKTTFfBmx21btv3gvy8Lq6N5Dh2OzqeuN4DjtpSvNT1uNVfg08eD2Rfxw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/instrumentation-http/node_modules/@opentelemetry/instrumentation": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.202.0.tgz",
-      "integrity": "sha512-Uz3BxZWPgDwgHM2+vCKEQRh0R8WKrd/q6Tus1vThRClhlPO39Dyz7mDrOr6KuqGXAlBQ1e5Tnymzri4RMZNaWA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api-logs": "0.202.0",
-        "import-in-the-middle": "^1.8.1",
-        "require-in-the-middle": "^7.1.1"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
     "node_modules/@opentelemetry/instrumentation-ioredis": {
       "version": "0.50.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.50.0.tgz",
@@ -4160,42 +3990,13 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-ioredis/node_modules/@opentelemetry/api-logs": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.202.0.tgz",
-      "integrity": "sha512-fTBjMqKCfotFWfLzaKyhjLvyEyq5vDKTTFfBmx21btv3gvy8Lq6N5Dh2OzqeuN4DjtpSvNT1uNVfg08eD2Rfxw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/instrumentation-ioredis/node_modules/@opentelemetry/instrumentation": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.202.0.tgz",
-      "integrity": "sha512-Uz3BxZWPgDwgHM2+vCKEQRh0R8WKrd/q6Tus1vThRClhlPO39Dyz7mDrOr6KuqGXAlBQ1e5Tnymzri4RMZNaWA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api-logs": "0.202.0",
-        "import-in-the-middle": "^1.8.1",
-        "require-in-the-middle": "^7.1.1"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
     "node_modules/@opentelemetry/instrumentation-kafkajs": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.10.0.tgz",
-      "integrity": "sha512-0roBjhMaW5li1gXVqrBRjzeLPWUiym8TPQi3iXqMA3GizPzilE4hwhIVI7GxtMHAdS15TgkUce6WVYVOBFrrbg==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.11.0.tgz",
+      "integrity": "sha512-+i9VqVEPNObB1tkwcLV6zAafnve72h2Iwo48E11M/kVXMNXlgGhiYckYCmzba8c2u5XD/V98XZDrCIyO8CLCNA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.30.0"
       },
       "engines": {
@@ -4206,13 +4007,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-knex": {
-      "version": "0.46.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.46.0.tgz",
-      "integrity": "sha512-+AxDwDdLJB467mEPOQKHod/1NDzX8msUAOEiViMkM7xAJoUsHTrP6EKlbjrCKkK+X2Eqh2pTO0ibeLkhG96oNA==",
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.47.0.tgz",
+      "integrity": "sha512-OjqjnzXD5+FXVGkOznbRAz9yByb4UWzIUhXjuHvOQ50IUY8mv3rM2Gj6Ar7m5JsENiS5DtAy2Vfwk4e9zNC0ng==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
-        "@opentelemetry/semantic-conventions": "^1.27.0"
+        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/semantic-conventions": "^1.33.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4222,13 +4023,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-koa": {
-      "version": "0.49.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.49.0.tgz",
-      "integrity": "sha512-LO2pdZ5SF2LzWZLwrPTja/sQN8Kl4Wu5QvWSFJJLLGpeVKQWC4n41qjPUAAu668w43s42xqfs9bC4hWmQe7o8g==",
+      "version": "0.50.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.50.1.tgz",
+      "integrity": "sha512-HoQ9OuzLx4z6/BfA4medM6cj5+UXWQWakQVCd/Xd+gU+gA1eCxwdoECH44p+mTl3GFS7/icgfGE1if/lguaG0Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4239,12 +4040,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-lru-memoizer": {
-      "version": "0.46.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.46.0.tgz",
-      "integrity": "sha512-k8wdehAJYuSYWKiIDXrXSd7+33M4qOUEhrE3ymNFOHxVjwtUWpSh6JYSFe+5pqGilhl4CqUgxCkaQ9kPy3rAOQ==",
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.47.0.tgz",
+      "integrity": "sha512-UJ2UlCAIF+N4zNkiHdMr4O0caN0K6YboAso3/zaFdG1QiPR2zqZcbWAGFBikZ9HSByU+NwbxTXDzlpkcDZIqWg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0"
+        "@opentelemetry/instrumentation": "^0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4254,12 +4055,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-memcached": {
-      "version": "0.45.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-memcached/-/instrumentation-memcached-0.45.0.tgz",
-      "integrity": "sha512-9NjbvCBM7p+wh/sHfSGDvrtinFYqIr6qunL9nN3e86eIQh3WyE9YdnlFGRbBR+MOzTCwSzrKAvY+J0fQe91VHA==",
+      "version": "0.46.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-memcached/-/instrumentation-memcached-0.46.0.tgz",
+      "integrity": "sha512-FFDcOVJUxZQqbg57gVskZGXRfEsZXwOvCaPv6/qIZRw5glLXPTulpnfG/s8NAltsj2buXSvS4eKFo+0HKH0apw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@types/memcached": "^2.2.6"
       },
@@ -4271,12 +4072,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-mongodb": {
-      "version": "0.54.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.54.0.tgz",
-      "integrity": "sha512-xTECmvFNfavpNz7btxmmvkCZKdHphQSSf0J4tSw4OOT0CSTythB/IWo41mYBd6GIutkmeA12dkKPd8zAU7zzyA==",
+      "version": "0.55.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.55.1.tgz",
+      "integrity": "sha512-Wb13YixWm8nB27ZSQW3h070UWkivoh6bjeyDUY6lLimSUulALr+YHBn0t71U1aTcUeaZv3IBNaPRimFXhz6gBA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4287,13 +4088,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-mongoose": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.48.0.tgz",
-      "integrity": "sha512-kvopwp/kb1wN8jd0HhIBx/ZxbSmwqhN7LLvl9a7fXYACYlewUtCnVJLG80kwuG+rexRZlxeDfjoacFRDQSf9XA==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.49.0.tgz",
+      "integrity": "sha512-nF+43QFe8IoW20TmTJZdxZhnVZGEglODUvzAo3fRmaBFAkwUXRGzRgABS255PCjIbScEaRRDCXc6EAsSkwRNPg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4304,12 +4105,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-mysql": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.47.0.tgz",
-      "integrity": "sha512-QWJNDNW0JyHj3cGtQOeNBcrDeOY35yX/JnDg8jEvxzmoEABHyj0EqI8fHPdOQmdctTjKTjzbqwtuAzLYIfkdAA==",
+      "version": "0.48.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.48.0.tgz",
+      "integrity": "sha512-o7DwkkRn3eLWfzJdbXrlCS1EhbIOgB0W74eucbP+5Lk0XDGixy4yURTkmNclCcsemgzRZfEq0YvYQV29Yhpo5A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@types/mysql": "2.15.26"
       },
@@ -4321,12 +4122,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-mysql2": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.47.0.tgz",
-      "integrity": "sha512-rVKuKJ6HFVTNXNo8WuC3lBL/9zQ0OZfga/2dLseg/jlQZzUlWijsA57trnA92pcYxs32HBPSfKpuA88ZAVBFpA==",
+      "version": "0.48.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.48.0.tgz",
+      "integrity": "sha512-eCRpv0WV2s0Pa6CpjPWzZiLZDqx8kqZJopJESd4ywoUwtijXzBiTRidp/8aL9k+kl4drhm2GVNr4thUCMlEOSA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@opentelemetry/sql-common": "^0.41.0"
       },
@@ -4353,42 +4154,13 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-nestjs-core/node_modules/@opentelemetry/api-logs": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.202.0.tgz",
-      "integrity": "sha512-fTBjMqKCfotFWfLzaKyhjLvyEyq5vDKTTFfBmx21btv3gvy8Lq6N5Dh2OzqeuN4DjtpSvNT1uNVfg08eD2Rfxw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/instrumentation-nestjs-core/node_modules/@opentelemetry/instrumentation": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.202.0.tgz",
-      "integrity": "sha512-Uz3BxZWPgDwgHM2+vCKEQRh0R8WKrd/q6Tus1vThRClhlPO39Dyz7mDrOr6KuqGXAlBQ1e5Tnymzri4RMZNaWA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api-logs": "0.202.0",
-        "import-in-the-middle": "^1.8.1",
-        "require-in-the-middle": "^7.1.1"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
     "node_modules/@opentelemetry/instrumentation-net": {
-      "version": "0.45.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-net/-/instrumentation-net-0.45.0.tgz",
-      "integrity": "sha512-kFdY4IMth8obBPXoAlpLkea7l85Joe+p7oep+BexrHQ0iX+0cvnfoYBMMSE/vAp6T1N3Nu6RDT2Wzf3mqkHxjw==",
+      "version": "0.46.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-net/-/instrumentation-net-0.46.1.tgz",
+      "integrity": "sha512-r7Buqem+odrTTPlWfT7EqS24QnDAL4U+c4e38RzcRtdZF00Z34oqEpge7TZcQLo0vEASWbHQ/WjWNR7ZYKFKBA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4399,12 +4171,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-oracledb": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-oracledb/-/instrumentation-oracledb-0.27.0.tgz",
-      "integrity": "sha512-b/JBJroC22DqgeMUSLYyleN6ohyXbCK1YGvBsCuDdiYUmOOyyWYSKdm4D26hTwFv1TKce+Im6aGcXF1hq2WKuQ==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-oracledb/-/instrumentation-oracledb-0.28.0.tgz",
+      "integrity": "sha512-VObbQRd3g8nDLLOeGjm5l6TnB9dtEaJoedLfLwMGrlD6lkai+hdfalYh6FOF5dce+dJouZdW6NUUAaBj4f4KcA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@types/oracledb": "6.5.2"
       },
@@ -4435,44 +4207,15 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-pg/node_modules/@opentelemetry/api-logs": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.202.0.tgz",
-      "integrity": "sha512-fTBjMqKCfotFWfLzaKyhjLvyEyq5vDKTTFfBmx21btv3gvy8Lq6N5Dh2OzqeuN4DjtpSvNT1uNVfg08eD2Rfxw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/instrumentation-pg/node_modules/@opentelemetry/instrumentation": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.202.0.tgz",
-      "integrity": "sha512-Uz3BxZWPgDwgHM2+vCKEQRh0R8WKrd/q6Tus1vThRClhlPO39Dyz7mDrOr6KuqGXAlBQ1e5Tnymzri4RMZNaWA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api-logs": "0.202.0",
-        "import-in-the-middle": "^1.8.1",
-        "require-in-the-middle": "^7.1.1"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
     "node_modules/@opentelemetry/instrumentation-pino": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pino/-/instrumentation-pino-0.48.0.tgz",
-      "integrity": "sha512-+X+GTaXFuExrmQ3XS1HH8E+4KkKQ1HPzjNGnckuW/SQVOxRGeZMwJu1s60lx4eLpQuXXRh9nJaCAqMi/As347w==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pino/-/instrumentation-pino-0.49.0.tgz",
+      "integrity": "sha512-nngcqUnIeVnDvRMf6fixYwlMbTNzCVGv93CacyR/8TL/pjyumje020PC5q7b6CfcTdToiD5GMTMKvWBiTd08cA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "^0.201.0",
+        "@opentelemetry/api-logs": "^0.202.0",
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0"
+        "@opentelemetry/instrumentation": "^0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4482,12 +4225,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-redis": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis/-/instrumentation-redis-0.48.0.tgz",
-      "integrity": "sha512-bp82CqAcBNk0+nneAX2L+wbCKiNHTnTEJlppOEjxESIR8AocSKO7gnWpotTh5Bki2UULUn62MBXJmRnIzj0ikw==",
+      "version": "0.49.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis/-/instrumentation-redis-0.49.1.tgz",
+      "integrity": "sha512-Ds5Ke9qE9kTlDThqLSJJntkIvuMQCBPiFKwHntocb/3q/9q5D47BNwawO5Mj9sVMV6zkld5M5Pb9Av39iieuOg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/redis-common": "^0.37.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
@@ -4499,12 +4242,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-redis-4": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.48.0.tgz",
-      "integrity": "sha512-aHZGrVwOsCM5u2PQdK1/PJuIWjGjYhOKEqqaPg3Mere2C6brwp+ih1bjcGyMRBS+7KNn5OSPcsFWpcW17Bfotw==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.49.0.tgz",
+      "integrity": "sha512-i+Wsl7M2LXEDA2yXouNJ3fttSzzb5AhlehvSBVRIFuinY51XrrKSH66biO0eox+pYQMwAlPxJ778XcMQffN78A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/redis-common": "^0.37.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
@@ -4516,13 +4259,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-restify": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-restify/-/instrumentation-restify-0.47.0.tgz",
-      "integrity": "sha512-A1VixeXnRAQQfWidjnNqOwqGp1K5/r6fIyCdL+1Yvde11HiruMQOf6B71D7wWJHRtNKpLhq3o8JzeNGJoBEMpA==",
+      "version": "0.48.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-restify/-/instrumentation-restify-0.48.1.tgz",
+      "integrity": "sha512-0KY7mWpm0TJJ8ajhsNsLUmsBE/yNr70o128Crn30eDmnyRQkG7uS0xfDi6keExjF7SKzXQabs3Gtx7SuFmE80Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4533,12 +4276,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-router": {
-      "version": "0.46.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-router/-/instrumentation-router-0.46.0.tgz",
-      "integrity": "sha512-p98dJcw0reSyfkhRwzx8HrhyjcKmyguIE0KCLcxBnvQFnPL7EfUR2up2M9ggceFiZO5GUo1gk+r/mP+B9VBsQw==",
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-router/-/instrumentation-router-0.47.0.tgz",
+      "integrity": "sha512-U0zA1LTDqtTWyd5e4SdoqQA/8QUOhc4LDv9U7b+8FMFTty95OF84apUdatl09Dzc51XeWPWIV7VutmSCd/zsUg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4549,12 +4292,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-runtime-node": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-runtime-node/-/instrumentation-runtime-node-0.15.0.tgz",
-      "integrity": "sha512-K3aPMYImALNsovPUjlIHctS2oH1YESlIAQMgiHXvcUxxz6+d66pPE1a4IoGP19iFOmRDMjshgHR/0DXMOEvZKg==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-runtime-node/-/instrumentation-runtime-node-0.16.0.tgz",
+      "integrity": "sha512-Q/GB9LsKLrRCEIPLAQTDQvydnLmLXBSRkYkWzwKzY/LCkOs+Cl8YiJG08p6D4CaJ6lvP0iG4kwPHk1ydNbdehg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0"
+        "@opentelemetry/instrumentation": "^0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4564,12 +4307,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-socket.io": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-socket.io/-/instrumentation-socket.io-0.48.0.tgz",
-      "integrity": "sha512-bVFiRvQnAW9hT+8FZVuhhybAvopAShLGm6LYz8raNZokxEw2FzGDVXONWaAM5D2/RbCbMl7R+PLN//3SEU/k0g==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-socket.io/-/instrumentation-socket.io-0.49.0.tgz",
+      "integrity": "sha512-DpMtNBEcaLCcbP1WVBPCSgRiBs31igTQkal1gUm40VL/XAv5GUqRAUnvHZrQh3yPipOqzV65pdb0jJXdps/tug==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4580,12 +4323,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-tedious": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.20.0.tgz",
-      "integrity": "sha512-8OqIj554Rh8sll9myfDaFD1cYY8XKpxK3SMzCTZGc4BqS61gU0kd7UEydZeplrkQHDgySP4nvtFfkQCaZyTS4Q==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.21.0.tgz",
+      "integrity": "sha512-pt37kHYGQ8D2vBOQwyB/TKUqLPF8Q4rfTNu3whZsPOsc6QHDPXpfQISIupWAnMjAaeujF/Spg6IA04W6jXrzRQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.201.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@types/tedious": "^4.0.14"
       },
@@ -4597,13 +4340,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-undici": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.12.0.tgz",
-      "integrity": "sha512-SLqTWPWWwqSZVYZw3a9sdcNXsahJfimvDpYaoDd6ryvQGDlOrHVKr56gL5qD3XDVa67DmV5ZQrxRrnYUdlp3BQ==",
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.13.1.tgz",
+      "integrity": "sha512-w0e7q983oNa+dQiWOEgU+1R6H48ks6mICZKrIxY08KqZPFroPUYbH4Db7X6p8m4QhuHgI2/wEAgLf9h03ILzcg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.201.0"
+        "@opentelemetry/instrumentation": "^0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4613,13 +4356,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-winston": {
-      "version": "0.46.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-winston/-/instrumentation-winston-0.46.0.tgz",
-      "integrity": "sha512-/nvmsLSON9Ki8C32kOMAkzsCpFfpjI2Fvr51uAY8/8bwG258MUUN8fCbAOMaiaPEKiB807wsE/aym83LYiB0ng==",
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-winston/-/instrumentation-winston-0.47.0.tgz",
+      "integrity": "sha512-r+GqnZU/aFldQyB5QdOlxsMlH9KZ4+zJfnYplz3lbC9f9ozAIlVAeoshvWTtbv7Oxp2NnK64EfnNP1pClaGEqA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "^0.201.0",
-        "@opentelemetry/instrumentation": "^0.201.0"
+        "@opentelemetry/api-logs": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4629,13 +4372,13 @@
       }
     },
     "node_modules/@opentelemetry/otlp-exporter-base": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.201.1.tgz",
-      "integrity": "sha512-FiS/mIWmZXyRxYGyXPHY+I/4+XrYVTD7Fz/zwOHkVPQsA1JTakAOP9fAi6trXMio0dIpzvQujLNiBqGM7ExrQw==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.202.0.tgz",
+      "integrity": "sha512-nMEOzel+pUFYuBJg2znGmHJWbmvMbdX5/RhoKNKowguMbURhz0fwik5tUKplLcUtl8wKPL1y9zPnPxeBn65N0Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-transformer": "0.201.1"
+        "@opentelemetry/otlp-transformer": "0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4645,15 +4388,15 @@
       }
     },
     "node_modules/@opentelemetry/otlp-grpc-exporter-base": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-grpc-exporter-base/-/otlp-grpc-exporter-base-0.201.1.tgz",
-      "integrity": "sha512-Y0h9hiMvNtUuXUMkYNAt81hxnFuOHHSeu/RC+pXcHe7S6ac0ROlcjdabBKmYSadJxRrP4YfLahLRuNkVtZow4w==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-grpc-exporter-base/-/otlp-grpc-exporter-base-0.202.0.tgz",
+      "integrity": "sha512-yIEHVxFA5dmYif7lZbbB66qulLLhrklj6mI2X3cuGW5hYPyUErztEmbroM+6teu/XobBi9bLHid2VT4NIaRuGg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@grpc/grpc-js": "^1.7.1",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.201.1",
-        "@opentelemetry/otlp-transformer": "0.201.1"
+        "@opentelemetry/otlp-exporter-base": "0.202.0",
+        "@opentelemetry/otlp-transformer": "0.202.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4663,15 +4406,15 @@
       }
     },
     "node_modules/@opentelemetry/otlp-transformer": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.201.1.tgz",
-      "integrity": "sha512-+q/8Yuhtu9QxCcjEAXEO8fXLjlSnrnVwfzi9jiWaMAppQp69MoagHHomQj02V2WnGjvBod5ajgkbK4IoWab50A==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.202.0.tgz",
+      "integrity": "sha512-5XO77QFzs9WkexvJQL9ksxL8oVFb/dfi9NWQSq7Sv0Efr9x3N+nb1iklP1TeVgxqJ7m1xWiC/Uv3wupiQGevMw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.201.1",
+        "@opentelemetry/api-logs": "0.202.0",
         "@opentelemetry/core": "2.0.1",
         "@opentelemetry/resources": "2.0.1",
-        "@opentelemetry/sdk-logs": "0.201.1",
+        "@opentelemetry/sdk-logs": "0.202.0",
         "@opentelemetry/sdk-metrics": "2.0.1",
         "@opentelemetry/sdk-trace-base": "2.0.1",
         "protobufjs": "^7.3.0"
@@ -4769,9 +4512,9 @@
       }
     },
     "node_modules/@opentelemetry/resource-detector-azure": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-azure/-/resource-detector-azure-0.8.0.tgz",
-      "integrity": "sha512-YBsJQrt0NGT66BgdVhhTkv7/oe/rTflX/rKteptVK6HNo7z8wbeAbB4SnSNJFfF+v3XrP/ruiTxKnNzoh/ampw==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-azure/-/resource-detector-azure-0.9.0.tgz",
+      "integrity": "sha512-5wJwAAW2vhbqIhgaRisU1y0F5mUco59F/dKgmnnnT6YNbxjrbdUZYxKF5Wl7deJoACVdL5wi/3N97GCXPEwwCQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
@@ -4803,9 +4546,9 @@
       }
     },
     "node_modules/@opentelemetry/resource-detector-gcp": {
-      "version": "0.35.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-gcp/-/resource-detector-gcp-0.35.0.tgz",
-      "integrity": "sha512-JYkyOUc7TZAyHy37N2aPAwFvRdET0+E5qIRjmQLPop9LQi4+N0sKf65g4xCwuY/0M721T/424G3zneJjxyiooA==",
+      "version": "0.36.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-gcp/-/resource-detector-gcp-0.36.0.tgz",
+      "integrity": "sha512-mWnEcg4tA+IDPrkETWo42psEsDN20dzYZSm4ZH8m8uiQALnNksVmf5C3An0GUEj5zrrxMasjSuv4zEH1gI40XQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
@@ -4837,12 +4580,12 @@
       }
     },
     "node_modules/@opentelemetry/sdk-logs": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.201.1.tgz",
-      "integrity": "sha512-Ug8gtpssUNUnfpotB9ZhnSsPSGDu+7LngTMgKl31mmVJwLAKyl6jC8diZrMcGkSgBh0o5dbg9puvLyR25buZfw==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.202.0.tgz",
+      "integrity": "sha512-pv8QiQLQzk4X909YKm0lnW4hpuQg4zHwJ4XBd5bZiXcd9urvrJNoNVKnxGHPiDVX/GiLFvr5DMYsDBQbZCypRQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.201.1",
+        "@opentelemetry/api-logs": "0.202.0",
         "@opentelemetry/core": "2.0.1",
         "@opentelemetry/resources": "2.0.1"
       },
@@ -4870,29 +4613,29 @@
       }
     },
     "node_modules/@opentelemetry/sdk-node": {
-      "version": "0.201.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-node/-/sdk-node-0.201.1.tgz",
-      "integrity": "sha512-OdkYe6ZEFbPq+YXhebuiYpPECIBrrKgFJoAQVATllKlB5RDQDTE4J84/8LwGfQqSxBiSK2u1aSaFpzgBVoBrKA==",
+      "version": "0.202.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-node/-/sdk-node-0.202.0.tgz",
+      "integrity": "sha512-SF9vXWVd9I5CZ69mW3GfwfLI2SHgyvEqntcg0en5y8kRp5+2PPoa3Mkgj0WzFLrbSgTw4PsXn7c7H6eSdrtV0w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.201.1",
+        "@opentelemetry/api-logs": "0.202.0",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/exporter-logs-otlp-grpc": "0.201.1",
-        "@opentelemetry/exporter-logs-otlp-http": "0.201.1",
-        "@opentelemetry/exporter-logs-otlp-proto": "0.201.1",
-        "@opentelemetry/exporter-metrics-otlp-grpc": "0.201.1",
-        "@opentelemetry/exporter-metrics-otlp-http": "0.201.1",
-        "@opentelemetry/exporter-metrics-otlp-proto": "0.201.1",
-        "@opentelemetry/exporter-prometheus": "0.201.1",
-        "@opentelemetry/exporter-trace-otlp-grpc": "0.201.1",
-        "@opentelemetry/exporter-trace-otlp-http": "0.201.1",
-        "@opentelemetry/exporter-trace-otlp-proto": "0.201.1",
+        "@opentelemetry/exporter-logs-otlp-grpc": "0.202.0",
+        "@opentelemetry/exporter-logs-otlp-http": "0.202.0",
+        "@opentelemetry/exporter-logs-otlp-proto": "0.202.0",
+        "@opentelemetry/exporter-metrics-otlp-grpc": "0.202.0",
+        "@opentelemetry/exporter-metrics-otlp-http": "0.202.0",
+        "@opentelemetry/exporter-metrics-otlp-proto": "0.202.0",
+        "@opentelemetry/exporter-prometheus": "0.202.0",
+        "@opentelemetry/exporter-trace-otlp-grpc": "0.202.0",
+        "@opentelemetry/exporter-trace-otlp-http": "0.202.0",
+        "@opentelemetry/exporter-trace-otlp-proto": "0.202.0",
         "@opentelemetry/exporter-zipkin": "2.0.1",
-        "@opentelemetry/instrumentation": "0.201.1",
+        "@opentelemetry/instrumentation": "0.202.0",
         "@opentelemetry/propagator-b3": "2.0.1",
         "@opentelemetry/propagator-jaeger": "2.0.1",
         "@opentelemetry/resources": "2.0.1",
-        "@opentelemetry/sdk-logs": "0.201.1",
+        "@opentelemetry/sdk-logs": "0.202.0",
         "@opentelemetry/sdk-metrics": "2.0.1",
         "@opentelemetry/sdk-trace-base": "2.0.1",
         "@opentelemetry/sdk-trace-node": "2.0.1",
@@ -5082,9 +4825,9 @@
       }
     },
     "node_modules/@react-email/button": {
-      "version": "0.0.19",
-      "resolved": "https://registry.npmjs.org/@react-email/button/-/button-0.0.19.tgz",
-      "integrity": "sha512-HYHrhyVGt7rdM/ls6FuuD6XE7fa7bjZTJqB2byn6/oGsfiEZaogY77OtoLL/mrQHjHjZiJadtAMSik9XLcm7+A==",
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@react-email/button/-/button-0.1.0.tgz",
+      "integrity": "sha512-fg4LtgTu5zXxaRSly9cuv6sHVF/hi1lElbRaIA8EPx5coWOBhCto6rCPfawcXpaN2oER7rNHUrcNBkI+lz5F9A==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
@@ -5094,9 +4837,9 @@
       }
     },
     "node_modules/@react-email/code-block": {
-      "version": "0.0.13",
-      "resolved": "https://registry.npmjs.org/@react-email/code-block/-/code-block-0.0.13.tgz",
-      "integrity": "sha512-4DE4yPSgKEOnZMzcrDvRuD6mxsNxOex0hCYEG9F9q23geYgb2WCCeGBvIUXVzK69l703Dg4Vzrd5qUjl+JfcwA==",
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@react-email/code-block/-/code-block-0.1.0.tgz",
+      "integrity": "sha512-jSpHFsgqnQXxDIssE4gvmdtFncaFQz5D6e22BnVjcCPk/udK+0A9jRwGFEG8JD2si9ZXBmU4WsuqQEczuZn4ww==",
       "license": "MIT",
       "dependencies": {
         "prismjs": "^1.30.0"
@@ -5133,14 +4876,14 @@
       }
     },
     "node_modules/@react-email/components": {
-      "version": "0.0.41",
-      "resolved": "https://registry.npmjs.org/@react-email/components/-/components-0.0.41.tgz",
-      "integrity": "sha512-WUI3wHwra3QS0pwrovSU6b0I0f3TvY33ph0y44LuhSYDSQlMRyeOzgoT6HRDY5FXMDF57cHYq9WoKwpwP0yd7Q==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@react-email/components/-/components-0.1.1.tgz",
+      "integrity": "sha512-NyPuoqd1o77HL4+58pBrpk3e5/0UZLNU11/OBnE59F2MCZ8IaZX+55Ce+HR5itKTMdqlgfncz7sGA1TDITo41g==",
       "license": "MIT",
       "dependencies": {
         "@react-email/body": "0.0.11",
-        "@react-email/button": "0.0.19",
-        "@react-email/code-block": "0.0.13",
+        "@react-email/button": "0.1.0",
+        "@react-email/code-block": "0.1.0",
         "@react-email/code-inline": "0.0.5",
         "@react-email/column": "0.0.13",
         "@react-email/container": "0.0.15",
@@ -5153,11 +4896,11 @@
         "@react-email/link": "0.0.12",
         "@react-email/markdown": "0.0.15",
         "@react-email/preview": "0.0.13",
-        "@react-email/render": "1.1.2",
+        "@react-email/render": "1.1.3",
         "@react-email/row": "0.0.12",
         "@react-email/section": "0.0.16",
         "@react-email/tailwind": "1.0.5",
-        "@react-email/text": "0.1.4"
+        "@react-email/text": "0.1.5"
       },
       "engines": {
         "node": ">=18.0.0"
@@ -5287,9 +5030,9 @@
       }
     },
     "node_modules/@react-email/render": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@react-email/render/-/render-1.1.2.tgz",
-      "integrity": "sha512-RnRehYN3v9gVlNMehHPHhyp2RQo7+pSkHDtXPvg3s0GbzM9SQMW4Qrf8GRNvtpLC4gsI+Wt0VatNRUFqjvevbw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@react-email/render/-/render-1.1.3.tgz",
+      "integrity": "sha512-TjjF1tdTmOqYEIWWg9wMx5q9JbQRbWmnG7owQbSGEHkNfc/c/vBu7hjfrki907lgQEAkYac9KPTyIjOKhvhJCg==",
       "license": "MIT",
       "dependencies": {
         "html-to-text": "^9.0.5",
@@ -5341,9 +5084,9 @@
       }
     },
     "node_modules/@react-email/text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@react-email/text/-/text-0.1.4.tgz",
-      "integrity": "sha512-cMNE02y8172DocpNGh97uV5HSTawaS4CKG/zOku8Pu+m6ehBKbAjgtQZDIxhgstw8+TWraFB8ltS1DPjfG8nLA==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@react-email/text/-/text-0.1.5.tgz",
+      "integrity": "sha512-o5PNHFSE085VMXayxH+SJ1LSOtGsTv+RpNKnTiJDrJUwoBu77G3PlKOsZZQHCNyD28WsQpl9v2WcJLbQudqwPg==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
@@ -5729,9 +5472,9 @@
       "license": "MIT"
     },
     "node_modules/@swc/core": {
-      "version": "1.12.5",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.12.5.tgz",
-      "integrity": "sha512-KxA0PHHIuUBmQ/Oi+xFpVzILj2Oo37sTtftCbyowQlyx5YOknEOw1kLpas5hMcpznXgFyAWbpK71xQps4INPgA==",
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.12.7.tgz",
+      "integrity": "sha512-bcpllEihyUSnqp0UtXTvXc19CT4wp3tGWLENhWnjr4B5iEOkzqMu+xHGz1FI5IBatjfqOQb29tgIfv6IL05QaA==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
@@ -5747,16 +5490,16 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.12.5",
-        "@swc/core-darwin-x64": "1.12.5",
-        "@swc/core-linux-arm-gnueabihf": "1.12.5",
-        "@swc/core-linux-arm64-gnu": "1.12.5",
-        "@swc/core-linux-arm64-musl": "1.12.5",
-        "@swc/core-linux-x64-gnu": "1.12.5",
-        "@swc/core-linux-x64-musl": "1.12.5",
-        "@swc/core-win32-arm64-msvc": "1.12.5",
-        "@swc/core-win32-ia32-msvc": "1.12.5",
-        "@swc/core-win32-x64-msvc": "1.12.5"
+        "@swc/core-darwin-arm64": "1.12.7",
+        "@swc/core-darwin-x64": "1.12.7",
+        "@swc/core-linux-arm-gnueabihf": "1.12.7",
+        "@swc/core-linux-arm64-gnu": "1.12.7",
+        "@swc/core-linux-arm64-musl": "1.12.7",
+        "@swc/core-linux-x64-gnu": "1.12.7",
+        "@swc/core-linux-x64-musl": "1.12.7",
+        "@swc/core-win32-arm64-msvc": "1.12.7",
+        "@swc/core-win32-ia32-msvc": "1.12.7",
+        "@swc/core-win32-x64-msvc": "1.12.7"
       },
       "peerDependencies": {
         "@swc/helpers": ">=0.5.17"
@@ -5768,9 +5511,9 @@
       }
     },
     "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.12.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.12.5.tgz",
-      "integrity": "sha512-3WF+naP/qkt5flrTfJr+p07b522JcixKvIivM7FgvllA6LjJxf+pheoILrTS8IwrNAK/XtHfKWYcGY+3eaA4mA==",
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.12.7.tgz",
+      "integrity": "sha512-w6BBT0hBRS56yS+LbReVym0h+iB7/PpCddqrn1ha94ra4rZ4R/A91A/rkv+LnQlPqU/+fhqdlXtCJU9mrhCBtA==",
       "cpu": [
         "arm64"
       ],
@@ -5785,9 +5528,9 @@
       }
     },
     "node_modules/@swc/core-darwin-x64": {
-      "version": "1.12.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.12.5.tgz",
-      "integrity": "sha512-GCcD3dft8YN7unTBcW02Fx41jXp2MNQHCjx5ceWSEYOGvn7vBSUp7k7LkfTxGN5Ftxb9a1mxhPq8r4rD2u/aPw==",
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.12.7.tgz",
+      "integrity": "sha512-jN6LhFfGOpm4DY2mXPgwH4aa9GLOwublwMVFFZ/bGnHYYCRitLZs9+JWBbyWs7MyGcA246Ew+EREx36KVEAxjA==",
       "cpu": [
         "x64"
       ],
@@ -5802,9 +5545,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.12.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.12.5.tgz",
-      "integrity": "sha512-jWlzP/Y4+wbE/EJM+WGIDQsklLFV3g5LmbYTBgrY4+5nb517P31mkBzf5y2knfNWPrL7HzNu0578j3Zi2E6Iig==",
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.12.7.tgz",
+      "integrity": "sha512-rHn8XXi7G2StEtZRAeJ6c7nhJPDnqsHXmeNrAaYwk8Tvpa6ZYG2nT9E1OQNXj1/dfbSFTjdiA8M8ZvGYBlpBoA==",
       "cpu": [
         "arm"
       ],
@@ -5819,9 +5562,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.12.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.12.5.tgz",
-      "integrity": "sha512-GkzgIUz+2r6J6Tn3hb7/4ByaWHRrRZt4vuN9BLAd+y65m2Bt0vlEpPtWhrB/TVe4hEkFR+W5PDETLEbUT4i0tQ==",
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.12.7.tgz",
+      "integrity": "sha512-N15hKizSSh+hkZ2x3TDVrxq0TDcbvDbkQJi2ZrLb9fK+NdFUV/x+XF16ZDPlbxtrGXl1CT7VD439SNaMN9F7qw==",
       "cpu": [
         "arm64"
       ],
@@ -5836,9 +5579,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.12.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.12.5.tgz",
-      "integrity": "sha512-g0AJ7QmZPj3Uw+C5pDa48LAUG7JBgQmB0mN5cW+s2mjaFKT0mTSxYALtx/MDZwJExDPo0yJV8kSbFO1tvFPyhg==",
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.12.7.tgz",
+      "integrity": "sha512-jxyINtBezpxd3eIUDiDXv7UQ87YWlPsM9KumOwJk09FkFSO4oYxV2RT+Wu+Nt5tVWue4N0MdXT/p7SQsDEk4YA==",
       "cpu": [
         "arm64"
       ],
@@ -5853,9 +5596,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.12.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.12.5.tgz",
-      "integrity": "sha512-PeYoSziNy+iNiBHPtAsO84bzBne/mbCsG5ijYkAhS1GVsDgohClorUvRXXhcUZoX2gr8TfSI9WLHo30K+DKiHg==",
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.12.7.tgz",
+      "integrity": "sha512-PR4tPVwU1BQBfFDk2XfzXxsEIjF3x/bOV1BzZpYvrlkU0TKUDbR4t2wzvsYwD/coW7/yoQmlL70/qnuPtTp1Zw==",
       "cpu": [
         "x64"
       ],
@@ -5870,9 +5613,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.12.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.12.5.tgz",
-      "integrity": "sha512-EJrfCCIyuV5LLmYgKtIMwtgsnjVesdFe0IgQzEKs9OfB6cL6g7WO9conn8BkGX8jphVa7jChKxShDGkreWWDzA==",
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.12.7.tgz",
+      "integrity": "sha512-zy7JWfQtQItgMfUjSbbcS3DZqQUn2d9VuV0LSGpJxtTXwgzhRpF1S2Sj7cU9hGpbM27Y8RJ4DeFb3qbAufjbrw==",
       "cpu": [
         "x64"
       ],
@@ -5887,9 +5630,9 @@
       }
     },
     "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.12.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.12.5.tgz",
-      "integrity": "sha512-FnwT7fxkJJMgsfiDoZKEVGyCzrPFbzpflFAAoTCUCu3MaHw6mW55o/MAAfofvJ1iIcEpec4o93OilsmKtpyO5Q==",
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.12.7.tgz",
+      "integrity": "sha512-52PeF0tyX04ZFD8nibNhy/GjMFOZWTEWPmIB3wpD1vIJ1po+smtBnEdRRll5WIXITKoiND8AeHlBNBPqcsdcwA==",
       "cpu": [
         "arm64"
       ],
@@ -5904,9 +5647,9 @@
       }
     },
     "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.12.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.12.5.tgz",
-      "integrity": "sha512-jW6l4KFt9mIXSpGseE6BQOEFmbIeXeShDuWgldEJXKeXf/uPs8wrqv80XBIUwVpK0ZbmJwPQ0waGVj8UM3th2Q==",
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.12.7.tgz",
+      "integrity": "sha512-WzQwkNMuhB1qQShT9uUgz/mX2j7NIEPExEtzvGsBT7TlZ9j1kGZ8NJcZH/fwOFcSJL4W7DnkL7nAhx6DBlSPaA==",
       "cpu": [
         "ia32"
       ],
@@ -5921,9 +5664,9 @@
       }
     },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.12.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.12.5.tgz",
-      "integrity": "sha512-AZszwuEjlz1tSNLQRm3T5OZJ5eebxjJlDQnnzXJmg0B7DJMRoaAe1HTLOmejxjFK6yWr7fh+pSeCw2PgQLxgqA==",
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.12.7.tgz",
+      "integrity": "sha512-R52ivBi2lgjl+Bd3XCPum0YfgbZq/W1AUExITysddP9ErsNSwnreYyNB3exEijiazWGcqHEas2ChiuMOP7NYrA==",
       "cpu": [
         "x64"
       ],
@@ -6294,9 +6037,9 @@
       "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.18",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.18.tgz",
-      "integrity": "sha512-KJ65INaxqxmU6EoCiJmRPZC9H9RVWCRd349tXM2M3O5NA7cY6YL7c0bHAHQ93NOfTObEQ004kd2QVHs/r0+m4g==",
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-NYqRyg/hIQrYPT9lbOeYc3kIRabJDn/k4qQHIXUpx88CBDww2fD15Sg5kbXlW86zm2XEW4g0QxkTI3/Kfkc7xQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -6507,12 +6250,6 @@
         "@types/send": "*"
       }
     },
-    "node_modules/@types/shimmer": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.2.0.tgz",
-      "integrity": "sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==",
-      "license": "MIT"
-    },
     "node_modules/@types/ssh2": {
       "version": "1.15.5",
       "resolved": "https://registry.npmjs.org/@types/ssh2/-/ssh2-1.15.5.tgz",
@@ -6607,17 +6344,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.34.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.34.1.tgz",
-      "integrity": "sha512-STXcN6ebF6li4PxwNeFnqF8/2BNDvBupf2OPx2yWNzr6mKNGF7q49VM00Pz5FaomJyqvbXpY6PhO+T9w139YEQ==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz",
+      "integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.34.1",
-        "@typescript-eslint/type-utils": "8.34.1",
-        "@typescript-eslint/utils": "8.34.1",
-        "@typescript-eslint/visitor-keys": "8.34.1",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/type-utils": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -6631,7 +6368,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.34.1",
+        "@typescript-eslint/parser": "^8.35.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
@@ -6647,16 +6384,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.34.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.34.1.tgz",
-      "integrity": "sha512-4O3idHxhyzjClSMJ0a29AcoK0+YwnEqzI6oz3vlRf3xw0zbzt15MzXwItOlnr5nIth6zlY2RENLsOPvhyrKAQA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz",
+      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.34.1",
-        "@typescript-eslint/types": "8.34.1",
-        "@typescript-eslint/typescript-estree": "8.34.1",
-        "@typescript-eslint/visitor-keys": "8.34.1",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6672,14 +6409,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.34.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.34.1.tgz",
-      "integrity": "sha512-nuHlOmFZfuRwLJKDGQOVc0xnQrAmuq1Mj/ISou5044y1ajGNp2BNliIqp7F2LPQ5sForz8lempMFCovfeS1XoA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
+      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.34.1",
-        "@typescript-eslint/types": "^8.34.1",
+        "@typescript-eslint/tsconfig-utils": "^8.35.0",
+        "@typescript-eslint/types": "^8.35.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6694,14 +6431,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.34.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.34.1.tgz",
-      "integrity": "sha512-beu6o6QY4hJAgL1E8RaXNC071G4Kso2MGmJskCFQhRhg8VOH/FDbC8soP8NHN7e/Hdphwp8G8cE6OBzC8o41ZA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
+      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.34.1",
-        "@typescript-eslint/visitor-keys": "8.34.1"
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6712,9 +6449,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.34.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.34.1.tgz",
-      "integrity": "sha512-K4Sjdo4/xF9NEeA2khOb7Y5nY6NSXBnod87uniVYW9kHP+hNlDV8trUSFeynA2uxWam4gIWgWoygPrv9VMWrYg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
+      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6729,14 +6466,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.34.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.34.1.tgz",
-      "integrity": "sha512-Tv7tCCr6e5m8hP4+xFugcrwTOucB8lshffJ6zf1mF1TbU67R+ntCc6DzLNKM+s/uzDyv8gLq7tufaAhIBYeV8g==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
+      "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.34.1",
-        "@typescript-eslint/utils": "8.34.1",
+        "@typescript-eslint/typescript-estree": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -6753,9 +6490,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.34.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.34.1.tgz",
-      "integrity": "sha512-rjLVbmE7HR18kDsjNIZQHxmv9RZwlgzavryL5Lnj2ujIRTeXlKtILHgRNmQ3j4daw7zd+mQgy+uyt6Zo6I0IGA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6767,16 +6504,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.34.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.34.1.tgz",
-      "integrity": "sha512-rjCNqqYPuMUF5ODD+hWBNmOitjBWghkGKJg6hiCHzUvXRy6rK22Jd3rwbP2Xi+R7oYVvIKhokHVhH41BxPV5mA==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
+      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.34.1",
-        "@typescript-eslint/tsconfig-utils": "8.34.1",
-        "@typescript-eslint/types": "8.34.1",
-        "@typescript-eslint/visitor-keys": "8.34.1",
+        "@typescript-eslint/project-service": "8.35.0",
+        "@typescript-eslint/tsconfig-utils": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -6822,16 +6559,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.34.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.34.1.tgz",
-      "integrity": "sha512-mqOwUdZ3KjtGk7xJJnLbHxTuWVn3GO2WZZuM+Slhkun4+qthLdXx32C8xIXbO1kfCECb3jIs3eoxK3eryk7aoQ==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
+      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.34.1",
-        "@typescript-eslint/types": "8.34.1",
-        "@typescript-eslint/typescript-estree": "8.34.1"
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6846,13 +6583,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.34.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.34.1.tgz",
-      "integrity": "sha512-xoh5rJ+tgsRKoXnkBPFRLZ7rjKM0AfVbC68UZ/ECXoDbfggb9RbEySN359acY1vS3qZ0jVTVWzbtfapwm5ztxw==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
+      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.34.1",
+        "@typescript-eslint/types": "8.35.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -7187,13 +6924,6 @@
       "dev": true,
       "license": "Apache-2.0"
     },
-    "node_modules/@yarnpkg/lockfile": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
     "node_modules/abbrev": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz",
@@ -7684,16 +7414,6 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "license": "MIT"
     },
-    "node_modules/at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
     "node_modules/b4a": {
       "version": "1.6.7",
       "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",
@@ -8187,25 +7907,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
-      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/call-bind-apply-helpers": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
@@ -9167,24 +8868,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -9916,9 +9599,9 @@
       }
     },
     "node_modules/eslint-plugin-prettier": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.0.tgz",
-      "integrity": "sha512-8qsOYwkkGrahrgoUv76NZi23koqXOGiiEzXMrT8Q7VcYaUISR+5MorIUxfWqYXN0fN/31WbSrxCxFkVQ43wwrA==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.1.tgz",
+      "integrity": "sha512-dobTkHT6XaEVOo8IO90Q4DOSxnm3Y151QxPJlM/vKC0bVy+d6cVWQZLlFiuZPP0wS6vZwSKeJgKkcS+KfMBlRw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10554,16 +10237,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/find-yarn-workspace-root": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
-      "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "micromatch": "^4.0.2"
-      }
-    },
     "node_modules/flat-cache": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
@@ -11156,19 +10829,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/has-symbols": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
@@ -11628,22 +11288,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -11760,26 +11404,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -12022,26 +11646,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/json-stable-stringify": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz",
-      "integrity": "sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "isarray": "^2.0.5",
-        "jsonify": "^0.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -12053,7 +11657,6 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
@@ -12082,16 +11685,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/jsonify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
-      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
-      "dev": true,
-      "license": "Public Domain",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -12102,16 +11695,6 @@
         "json-buffer": "3.0.1"
       }
     },
-    "node_modules/klaw-sync": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
-      "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.1.11"
-      }
-    },
     "node_modules/kysely": {
       "version": "0.28.2",
       "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.28.2.tgz",
@@ -13471,16 +13054,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/obliterator": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-2.0.5.tgz",
@@ -13538,23 +13111,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/open": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/openid-client": {
       "version": "6.6.1",
       "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-6.6.1.tgz",
@@ -13778,105 +13334,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/patch-package": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz",
-      "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@yarnpkg/lockfile": "^1.1.0",
-        "chalk": "^4.1.2",
-        "ci-info": "^3.7.0",
-        "cross-spawn": "^7.0.3",
-        "find-yarn-workspace-root": "^2.0.0",
-        "fs-extra": "^9.0.0",
-        "json-stable-stringify": "^1.0.2",
-        "klaw-sync": "^6.0.0",
-        "minimist": "^1.2.6",
-        "open": "^7.4.2",
-        "rimraf": "^2.6.3",
-        "semver": "^7.5.3",
-        "slash": "^2.0.0",
-        "tmp": "^0.0.33",
-        "yaml": "^2.2.2"
-      },
-      "bin": {
-        "patch-package": "index.js"
-      },
-      "engines": {
-        "node": ">=14",
-        "npm": ">5"
-      }
-    },
-    "node_modules/patch-package/node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/patch-package/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/patch-package/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/patch-package/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -14368,9 +13825,9 @@
       "license": "MIT"
     },
     "node_modules/postgres": {
-      "version": "3.4.5",
-      "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.5.tgz",
-      "integrity": "sha512-cDWgoah1Gez9rN3H4165peY9qfpEo+SA61oQv65O3cRUE1pOEoJWwddwcqKE8XZYjbblOJlYDlLV4h67HrEVDg==",
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.7.tgz",
+      "integrity": "sha512-Jtc2612XINuBjIl/QTWsV5UvE8UHuNblcO3vVADSrKsrc6RqGX6lOW1cEo3CM2v0XG4Nat8nI+YM7/f26VxXLw==",
       "license": "Unlicense",
       "engines": {
         "node": ">=12"
@@ -14515,9 +13972,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
+      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
       "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -14858,9 +14315,9 @@
       }
     },
     "node_modules/react-email": {
-      "version": "4.0.16",
-      "resolved": "https://registry.npmjs.org/react-email/-/react-email-4.0.16.tgz",
-      "integrity": "sha512-auhFU+nQxAkKkP6lQhPyGsa9exwfUEzp2BwZnjHokCwphZlg30tu4t1LgdKRwGPYsi7XNGy6asbVLAUhOVpzzg==",
+      "version": "4.0.17",
+      "resolved": "https://registry.npmjs.org/react-email/-/react-email-4.0.17.tgz",
+      "integrity": "sha512-Wppdxgio/QKNe3piccIhk6jvgiLwfOTAwud5t/NlWL8wepsirgXo09OyZCz62Qb9flFNBw+Hz5ahOkpk3JaizQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.27.0",
@@ -14876,7 +14333,8 @@
         "next": "^15.3.1",
         "normalize-path": "^3.0.0",
         "ora": "^8.0.0",
-        "socket.io": "^4.8.1"
+        "socket.io": "^4.8.1",
+        "tsconfig-paths": "4.2.0"
       },
       "bin": {
         "email": "dist/cli/index.mjs"
@@ -15678,24 +15136,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -15801,12 +15241,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/shimmer": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz",
-      "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==",
-      "license": "BSD-2-Clause"
-    },
     "node_modules/side-channel": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
@@ -15974,16 +15408,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/slash": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/slice-source": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/slice-source/-/slice-source-0.4.1.tgz",
@@ -16511,7 +15935,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -17619,7 +17042,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
       "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "json5": "^2.2.2",
@@ -17950,15 +17372,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.34.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.34.1.tgz",
-      "integrity": "sha512-XjS+b6Vg9oT1BaIUfkW3M3LvqZE++rbzAMEHuccCfO/YkP43ha6w3jTEMilQxMF92nVOYCcdjv1ZUhAa1D/0ow==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.0.tgz",
+      "integrity": "sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.34.1",
-        "@typescript-eslint/parser": "8.34.1",
-        "@typescript-eslint/utils": "8.34.1"
+        "@typescript-eslint/eslint-plugin": "8.35.0",
+        "@typescript-eslint/parser": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -17993,9 +17415,9 @@
       "license": "MIT"
     },
     "node_modules/ua-parser-js": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-2.0.3.tgz",
-      "integrity": "sha512-LZyXZdNttONW8LjzEH3Z8+6TE7RfrEiJqDKyh0R11p/kxvrV2o9DrT2FGZO+KVNs3k+drcIQ6C3En6wLnzJGpw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-2.0.4.tgz",
+      "integrity": "sha512-XiBOnM/UpUq21ZZ91q2AVDOnGROE6UQd37WrO9WBgw4u2eGvUCNOheMmZ3EfEUj7DLHr8tre+Um/436Of/Vwzg==",
       "funding": [
         {
           "type": "opencollective",
diff --git a/server/package.json b/server/package.json
index aada75bae8..37cfd237bd 100644
--- a/server/package.json
+++ b/server/package.json
@@ -31,8 +31,7 @@
     "schema:reset": "npm run schema:drop && npm run migrations:run",
     "sync:open-api": "node ./dist/bin/sync-open-api.js",
     "sync:sql": "node ./dist/bin/sync-sql.js",
-    "email:dev": "email dev -p 3050 --dir src/emails",
-    "postinstall": "patch-package"
+    "email:dev": "email dev -p 3050 --dir src/emails"
   },
   "dependencies": {
     "@nestjs/bullmq": "^11.0.1",
@@ -45,18 +44,18 @@
     "@nestjs/swagger": "^11.0.2",
     "@nestjs/websockets": "^11.0.4",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.59.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.60.0",
     "@opentelemetry/context-async-hooks": "^2.0.0",
-    "@opentelemetry/exporter-prometheus": "^0.201.0",
+    "@opentelemetry/exporter-prometheus": "^0.202.0",
     "@opentelemetry/instrumentation-http": "^0.202.0",
     "@opentelemetry/instrumentation-ioredis": "^0.50.0",
     "@opentelemetry/instrumentation-nestjs-core": "^0.48.0",
     "@opentelemetry/instrumentation-pg": "^0.54.0",
     "@opentelemetry/resources": "^2.0.1",
     "@opentelemetry/sdk-metrics": "^2.0.1",
-    "@opentelemetry/sdk-node": "^0.201.0",
+    "@opentelemetry/sdk-node": "^0.202.0",
     "@opentelemetry/semantic-conventions": "^1.34.0",
-    "@react-email/components": "^0.0.41",
+    "@react-email/components": "^0.1.0",
     "@react-email/render": "^1.1.2",
     "@socket.io/redis-adapter": "^8.3.0",
     "archiver": "^7.0.0",
@@ -95,7 +94,7 @@
     "pg": "^8.11.3",
     "pg-connection-string": "^2.9.1",
     "picomatch": "^4.0.2",
-    "postgres": "3.4.5",
+    "postgres": "3.4.7",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-email": "^4.0.0",
@@ -155,7 +154,6 @@
     "mock-fs": "^5.2.0",
     "node-addon-api": "^8.3.1",
     "node-gyp": "^11.2.0",
-    "patch-package": "^8.0.0",
     "pngjs": "^7.0.0",
     "prettier": "^3.0.2",
     "prettier-plugin-organize-imports": "^4.0.0",
diff --git a/server/patches/postgres+3.4.5.patch b/server/patches/postgres+3.4.5.patch
deleted file mode 100644
index 019ef9df78..0000000000
--- a/server/patches/postgres+3.4.5.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/node_modules/postgres/cf/src/connection.js b/node_modules/postgres/cf/src/connection.js
-index ee8b1e6..acf4566 100644
---- a/node_modules/postgres/cf/src/connection.js
-+++ b/node_modules/postgres/cf/src/connection.js
-@@ -387,8 +387,10 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
-   }
- 
-   function queryError(query, err) {
-+    if (!query || typeof query !== 'object' || !query.reject) throw err
-+
-     'query' in err || 'parameters' in err || Object.defineProperties(err, {
--      stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },
-+      stack: { value: err.stack + (query.origin || '').replace(/.*\n/, '\n'), enumerable: options.debug },
-       query: { value: query.string, enumerable: options.debug },
-       parameters: { value: query.parameters, enumerable: options.debug },
-       args: { value: query.args, enumerable: options.debug },
-diff --git a/node_modules/postgres/cjs/src/connection.js b/node_modules/postgres/cjs/src/connection.js
-index f7f58d1..b7f2d65 100644
---- a/node_modules/postgres/cjs/src/connection.js
-+++ b/node_modules/postgres/cjs/src/connection.js
-@@ -385,8 +385,10 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
-   }
- 
-   function queryError(query, err) {
-+    if (!query || typeof query !== 'object' || !query.reject) throw err
-+
-     'query' in err || 'parameters' in err || Object.defineProperties(err, {
--      stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },
-+      stack: { value: err.stack + (query.origin || '').replace(/.*\n/, '\n'), enumerable: options.debug },
-       query: { value: query.string, enumerable: options.debug },
-       parameters: { value: query.parameters, enumerable: options.debug },
-       args: { value: query.args, enumerable: options.debug },
-diff --git a/node_modules/postgres/src/connection.js b/node_modules/postgres/src/connection.js
-index 97cc97e..26f508e 100644
---- a/node_modules/postgres/src/connection.js
-+++ b/node_modules/postgres/src/connection.js
-@@ -385,8 +385,10 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
-   }
- 
-   function queryError(query, err) {
-+    if (!query || typeof query !== 'object' || !query.reject) throw err
-+
-     'query' in err || 'parameters' in err || Object.defineProperties(err, {
--      stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },
-+      stack: { value: err.stack + (query.origin || '').replace(/.*\n/, '\n'), enumerable: options.debug },
-       query: { value: query.string, enumerable: options.debug },
-       parameters: { value: query.parameters, enumerable: options.debug },
-       args: { value: query.args, enumerable: options.debug },
diff --git a/web/package-lock.json b/web/package-lock.json
index 4199e4e16b..770e4edd6d 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -63,7 +63,7 @@
         "dotenv": "^16.4.7",
         "eslint": "^9.18.0",
         "eslint-config-prettier": "^10.0.0",
-        "eslint-p": "^0.23.0",
+        "eslint-p": "^0.24.0",
         "eslint-plugin-compat": "^6.0.2",
         "eslint-plugin-svelte": "^3.9.0",
         "eslint-plugin-unicorn": "^59.0.0",
@@ -662,9 +662,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
+      "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -677,9 +677,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz",
-      "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
+      "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -737,9 +737,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
-      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
+      "version": "9.29.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
+      "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1669,9 +1669,9 @@
       }
     },
     "node_modules/@maplibre/maplibre-gl-style-spec": {
-      "version": "23.2.2",
-      "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-23.2.2.tgz",
-      "integrity": "sha512-kLcVlItPCULc20SM6pSVA7u8nST9xmQA8d7utc9j3KB0Tf/xhM4GgCn/QsZcmlbN/wW0ujyomDrvZ3/LbwvAmw==",
+      "version": "23.3.0",
+      "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-23.3.0.tgz",
+      "integrity": "sha512-IGJtuBbaGzOUgODdBRg66p8stnwj9iDXkgbYKoYcNiiQmaez5WVRfXm4b03MCDwmZyX93csbfHFWEJJYHnn5oA==",
       "license": "ISC",
       "dependencies": {
         "@mapbox/jsonlint-lines-primitives": "~2.0.2",
@@ -1768,50 +1768,50 @@
       }
     },
     "node_modules/@photo-sphere-viewer/core": {
-      "version": "5.13.2",
-      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/core/-/core-5.13.2.tgz",
-      "integrity": "sha512-rL4Ey39Prx4Iyxt1f2tAqlXvqu4/ovXfUvIpLt540OpZJiFjWccs6qLywof9vuhBJ7PXHudHWCjRPce0W8kx8w==",
+      "version": "5.13.3",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/core/-/core-5.13.3.tgz",
+      "integrity": "sha512-6Fjkx2fTUFSmoy6jJxXn+FrwNlMtTi6M8ErEZkQgn7ULenMpIUx6tdFz3l85NM7Br/Rj4CK8IyUo8Le1eI1Fdg==",
       "license": "MIT",
       "dependencies": {
         "three": "^0.175.0"
       }
     },
     "node_modules/@photo-sphere-viewer/equirectangular-video-adapter": {
-      "version": "5.13.2",
-      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/equirectangular-video-adapter/-/equirectangular-video-adapter-5.13.2.tgz",
-      "integrity": "sha512-Ln9VyZSGAEjqtJ5dYluiSYkUF87FsOwzZvQoEgAt4odQR/q7ktSaVDdRfuuTMcbBKq6kTdsavNzdg+g877WyhA==",
+      "version": "5.13.3",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/equirectangular-video-adapter/-/equirectangular-video-adapter-5.13.3.tgz",
+      "integrity": "sha512-Gl63vt9ztRHrw2lxDF4KTPsndDbIByg+hUsaMtEAuc304wLUKj6GIapAh71eCyDqvPBhLoTZ5+4RX/TPafnCGg==",
       "license": "MIT",
       "peerDependencies": {
-        "@photo-sphere-viewer/core": "5.13.2",
-        "@photo-sphere-viewer/video-plugin": "5.13.2"
+        "@photo-sphere-viewer/core": "5.13.3",
+        "@photo-sphere-viewer/video-plugin": "5.13.3"
       }
     },
     "node_modules/@photo-sphere-viewer/resolution-plugin": {
-      "version": "5.13.2",
-      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/resolution-plugin/-/resolution-plugin-5.13.2.tgz",
-      "integrity": "sha512-T2bUvtKqhPk7FVqRJfynWhnglMpar5FNxCgf3EsnFjV9g+Xnc0LmOLlCeNmsCWXv0lRmNbohDMRN1WpY1O3ojA==",
+      "version": "5.13.3",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/resolution-plugin/-/resolution-plugin-5.13.3.tgz",
+      "integrity": "sha512-spSBm7OXDisnw5Fx4+JPR510nb+nGFZf2aecPRhP23GZyxKPg82i1PYoDJgRCWKTlvz8Yq2eilKdAtncmHWgSA==",
       "license": "MIT",
       "peerDependencies": {
-        "@photo-sphere-viewer/core": "5.13.2",
-        "@photo-sphere-viewer/settings-plugin": "5.13.2"
+        "@photo-sphere-viewer/core": "5.13.3",
+        "@photo-sphere-viewer/settings-plugin": "5.13.3"
       }
     },
     "node_modules/@photo-sphere-viewer/settings-plugin": {
-      "version": "5.13.2",
-      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/settings-plugin/-/settings-plugin-5.13.2.tgz",
-      "integrity": "sha512-z1539qy4XC9UextvgxFBBZqiNKQ1DzaI4EZRbrRbfG6LnSsjKwGgX8gIZ8ZpBHoZdU+b2d8PRPmNKiSjhYOvGA==",
+      "version": "5.13.3",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/settings-plugin/-/settings-plugin-5.13.3.tgz",
+      "integrity": "sha512-x/KulP3UxoawDS8MuGrZU3DznrzpaYqQ2BQnxlaOVItewrgCdS8WRG18E7nBo+2lfZGDDwGhRsSp/IRUOwScRg==",
       "license": "MIT",
       "peerDependencies": {
-        "@photo-sphere-viewer/core": "5.13.2"
+        "@photo-sphere-viewer/core": "5.13.3"
       }
     },
     "node_modules/@photo-sphere-viewer/video-plugin": {
-      "version": "5.13.2",
-      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/video-plugin/-/video-plugin-5.13.2.tgz",
-      "integrity": "sha512-6/tajOJaPUDP7mwtdQZul+KNfjL2sUPUt7EcAHZ9KcSq1WcwqZfaUYSCdKaW2uxdpn4BLESSD1h0mJdWNw7vJA==",
+      "version": "5.13.3",
+      "resolved": "https://registry.npmjs.org/@photo-sphere-viewer/video-plugin/-/video-plugin-5.13.3.tgz",
+      "integrity": "sha512-npNeknhV3jLJLKbbFzaLRVRROiN2POSdHLnV0R6QNiF7rQURC0Cs7Yuztl2nFJWUBOS3MiO13t5Wyz1wwfKfSQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@photo-sphere-viewer/core": "5.13.2"
+        "@photo-sphere-viewer/core": "5.13.3"
       }
     },
     "node_modules/@pkgjs/parseargs": {
@@ -2161,9 +2161,9 @@
       }
     },
     "node_modules/@sveltejs/enhanced-img": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@sveltejs/enhanced-img/-/enhanced-img-0.6.0.tgz",
-      "integrity": "sha512-B9rHh6zHnFex6fWxD8rkmUsMvkAG+cZiv+5/NfXyLcDvDFqUQbcADACeioVFuUxNXDXAe3y+Ui3JVmekk8R/zg==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@sveltejs/enhanced-img/-/enhanced-img-0.6.1.tgz",
+      "integrity": "sha512-8oj/cXc/M1soGQOkkkuEzeaiE/LTa3MJnoRwoRzG7GOPKHOfNRJDzsCcx3s1GqxQlcoHc4BJK3HoU1m0OV9UMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2174,15 +2174,15 @@
         "zimmerframe": "^1.1.2"
       },
       "peerDependencies": {
-        "@sveltejs/vite-plugin-svelte": "^5.0.0",
+        "@sveltejs/vite-plugin-svelte": "^5.0.0 || ^6.0.0-next.0",
         "svelte": "^5.0.0",
         "vite": ">= 5.0.0"
       }
     },
     "node_modules/@sveltejs/kit": {
-      "version": "2.21.1",
-      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.21.1.tgz",
-      "integrity": "sha512-vLbtVwtDcK8LhJKnFkFYwM0uCdFmzioQnif0bjEYH1I24Arz22JPr/hLUiXGVYAwhu8INKx5qrdvr4tHgPwX6w==",
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.22.2.tgz",
+      "integrity": "sha512-2MvEpSYabUrsJAoq5qCOBGAlkICjfjunrnLcx3YAk2XV7TvAIhomlKsAgR4H/4uns5rAfYmj7Wet5KRtc8dPIg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2197,7 +2197,8 @@
         "mrmime": "^2.0.0",
         "sade": "^1.8.1",
         "set-cookie-parser": "^2.6.0",
-        "sirv": "^3.0.0"
+        "sirv": "^3.0.0",
+        "vitefu": "^1.0.6"
       },
       "bin": {
         "svelte-kit": "svelte-kit.js"
@@ -2206,24 +2207,24 @@
         "node": ">=18.13"
       },
       "peerDependencies": {
-        "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0",
+        "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0",
         "svelte": "^4.0.0 || ^5.0.0-next.0",
-        "vite": "^5.0.3 || ^6.0.0"
+        "vite": "^5.0.3 || ^6.0.0 || ^7.0.0-beta.0"
       }
     },
     "node_modules/@sveltejs/vite-plugin-svelte": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-5.0.3.tgz",
-      "integrity": "sha512-MCFS6CrQDu1yGwspm4qtli0e63vaPCehf6V7pIMP15AsWgMKrqDGCPFF/0kn4SP0ii4aySu4Pa62+fIRGFMjgw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-5.1.0.tgz",
+      "integrity": "sha512-wojIS/7GYnJDYIg1higWj2ROA6sSRWvcR1PO/bqEyFr/5UZah26c8Cz4u0NaqjPeVltzsVpt2Tm8d2io0V+4Tw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@sveltejs/vite-plugin-svelte-inspector": "^4.0.1",
-        "debug": "^4.4.0",
+        "debug": "^4.4.1",
         "deepmerge": "^4.3.1",
         "kleur": "^4.1.5",
-        "magic-string": "^0.30.15",
-        "vitefu": "^1.0.4"
+        "magic-string": "^0.30.17",
+        "vitefu": "^1.0.6"
       },
       "engines": {
         "node": "^18.0.0 || ^20.0.0 || >=22"
@@ -2262,9 +2263,9 @@
       }
     },
     "node_modules/@tailwindcss/node": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.7.tgz",
-      "integrity": "sha512-9rsOpdY9idRI2NH6CL4wORFY0+Q6fnx9XP9Ju+iq/0wJwGD5IByIgFmwVbyy4ymuyprj8Qh4ErxMKTUL4uNh3g==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.10.tgz",
+      "integrity": "sha512-2ACf1znY5fpRBwRhMgj9ZXvb2XZW8qs+oTfotJ2C5xR0/WNL7UHZ7zXl6s+rUqedL1mNi+0O+WQr5awGowS3PQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2274,13 +2275,13 @@
         "lightningcss": "1.30.1",
         "magic-string": "^0.30.17",
         "source-map-js": "^1.2.1",
-        "tailwindcss": "4.1.7"
+        "tailwindcss": "4.1.10"
       }
     },
     "node_modules/@tailwindcss/oxide": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.7.tgz",
-      "integrity": "sha512-5SF95Ctm9DFiUyjUPnDGkoKItPX/k+xifcQhcqX5RA85m50jw1pT/KzjdvlqxRja45Y52nR4MR9fD1JYd7f8NQ==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.10.tgz",
+      "integrity": "sha512-v0C43s7Pjw+B9w21htrQwuFObSkio2aV/qPx/mhrRldbqxbWJK6KizM+q7BF1/1CmuLqZqX3CeYF7s7P9fbA8Q==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -2292,24 +2293,24 @@
         "node": ">= 10"
       },
       "optionalDependencies": {
-        "@tailwindcss/oxide-android-arm64": "4.1.7",
-        "@tailwindcss/oxide-darwin-arm64": "4.1.7",
-        "@tailwindcss/oxide-darwin-x64": "4.1.7",
-        "@tailwindcss/oxide-freebsd-x64": "4.1.7",
-        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.7",
-        "@tailwindcss/oxide-linux-arm64-gnu": "4.1.7",
-        "@tailwindcss/oxide-linux-arm64-musl": "4.1.7",
-        "@tailwindcss/oxide-linux-x64-gnu": "4.1.7",
-        "@tailwindcss/oxide-linux-x64-musl": "4.1.7",
-        "@tailwindcss/oxide-wasm32-wasi": "4.1.7",
-        "@tailwindcss/oxide-win32-arm64-msvc": "4.1.7",
-        "@tailwindcss/oxide-win32-x64-msvc": "4.1.7"
+        "@tailwindcss/oxide-android-arm64": "4.1.10",
+        "@tailwindcss/oxide-darwin-arm64": "4.1.10",
+        "@tailwindcss/oxide-darwin-x64": "4.1.10",
+        "@tailwindcss/oxide-freebsd-x64": "4.1.10",
+        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.10",
+        "@tailwindcss/oxide-linux-arm64-gnu": "4.1.10",
+        "@tailwindcss/oxide-linux-arm64-musl": "4.1.10",
+        "@tailwindcss/oxide-linux-x64-gnu": "4.1.10",
+        "@tailwindcss/oxide-linux-x64-musl": "4.1.10",
+        "@tailwindcss/oxide-wasm32-wasi": "4.1.10",
+        "@tailwindcss/oxide-win32-arm64-msvc": "4.1.10",
+        "@tailwindcss/oxide-win32-x64-msvc": "4.1.10"
       }
     },
     "node_modules/@tailwindcss/oxide-android-arm64": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.7.tgz",
-      "integrity": "sha512-IWA410JZ8fF7kACus6BrUwY2Z1t1hm0+ZWNEzykKmMNM09wQooOcN/VXr0p/WJdtHZ90PvJf2AIBS/Ceqx1emg==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.10.tgz",
+      "integrity": "sha512-VGLazCoRQ7rtsCzThaI1UyDu/XRYVyH4/EWiaSX6tFglE+xZB5cvtC5Omt0OQ+FfiIVP98su16jDVHDEIuH4iQ==",
       "cpu": [
         "arm64"
       ],
@@ -2324,9 +2325,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-arm64": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.7.tgz",
-      "integrity": "sha512-81jUw9To7fimGGkuJ2W5h3/oGonTOZKZ8C2ghm/TTxbwvfSiFSDPd6/A/KE2N7Jp4mv3Ps9OFqg2fEKgZFfsvg==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.10.tgz",
+      "integrity": "sha512-ZIFqvR1irX2yNjWJzKCqTCcHZbgkSkSkZKbRM3BPzhDL/18idA8uWCoopYA2CSDdSGFlDAxYdU2yBHwAwx8euQ==",
       "cpu": [
         "arm64"
       ],
@@ -2341,9 +2342,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-x64": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.7.tgz",
-      "integrity": "sha512-q77rWjEyGHV4PdDBtrzO0tgBBPlQWKY7wZK0cUok/HaGgbNKecegNxCGikuPJn5wFAlIywC3v+WMBt0PEBtwGw==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.10.tgz",
+      "integrity": "sha512-eCA4zbIhWUFDXoamNztmS0MjXHSEJYlvATzWnRiTqJkcUteSjO94PoRHJy1Xbwp9bptjeIxxBHh+zBWFhttbrQ==",
       "cpu": [
         "x64"
       ],
@@ -2358,9 +2359,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-freebsd-x64": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.7.tgz",
-      "integrity": "sha512-RfmdbbK6G6ptgF4qqbzoxmH+PKfP4KSVs7SRlTwcbRgBwezJkAO3Qta/7gDy10Q2DcUVkKxFLXUQO6J3CRvBGw==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.10.tgz",
+      "integrity": "sha512-8/392Xu12R0cc93DpiJvNpJ4wYVSiciUlkiOHOSOQNH3adq9Gi/dtySK7dVQjXIOzlpSHjeCL89RUUI8/GTI6g==",
       "cpu": [
         "x64"
       ],
@@ -2375,9 +2376,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.7.tgz",
-      "integrity": "sha512-OZqsGvpwOa13lVd1z6JVwQXadEobmesxQ4AxhrwRiPuE04quvZHWn/LnihMg7/XkN+dTioXp/VMu/p6A5eZP3g==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.10.tgz",
+      "integrity": "sha512-t9rhmLT6EqeuPT+MXhWhlRYIMSfh5LZ6kBrC4FS6/+M1yXwfCtp24UumgCWOAJVyjQwG+lYva6wWZxrfvB+NhQ==",
       "cpu": [
         "arm"
       ],
@@ -2392,9 +2393,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.7.tgz",
-      "integrity": "sha512-voMvBTnJSfKecJxGkoeAyW/2XRToLZ227LxswLAwKY7YslG/Xkw9/tJNH+3IVh5bdYzYE7DfiaPbRkSHFxY1xA==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.10.tgz",
+      "integrity": "sha512-3oWrlNlxLRxXejQ8zImzrVLuZ/9Z2SeKoLhtCu0hpo38hTO2iL86eFOu4sVR8cZc6n3z7eRXXqtHJECa6mFOvA==",
       "cpu": [
         "arm64"
       ],
@@ -2409,9 +2410,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.7.tgz",
-      "integrity": "sha512-PjGuNNmJeKHnP58M7XyjJyla8LPo+RmwHQpBI+W/OxqrwojyuCQ+GUtygu7jUqTEexejZHr/z3nBc/gTiXBj4A==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.10.tgz",
+      "integrity": "sha512-saScU0cmWvg/Ez4gUmQWr9pvY9Kssxt+Xenfx1LG7LmqjcrvBnw4r9VjkFcqmbBb7GCBwYNcZi9X3/oMda9sqQ==",
       "cpu": [
         "arm64"
       ],
@@ -2426,9 +2427,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.7.tgz",
-      "integrity": "sha512-HMs+Va+ZR3gC3mLZE00gXxtBo3JoSQxtu9lobbZd+DmfkIxR54NO7Z+UQNPsa0P/ITn1TevtFxXTpsRU7qEvWg==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.10.tgz",
+      "integrity": "sha512-/G3ao/ybV9YEEgAXeEg28dyH6gs1QG8tvdN9c2MNZdUXYBaIY/Gx0N6RlJzfLy/7Nkdok4kaxKPHKJUlAaoTdA==",
       "cpu": [
         "x64"
       ],
@@ -2443,9 +2444,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-musl": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.7.tgz",
-      "integrity": "sha512-MHZ6jyNlutdHH8rd+YTdr3QbXrHXqwIhHw9e7yXEBcQdluGwhpQY2Eku8UZK6ReLaWtQ4gijIv5QoM5eE+qlsA==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.10.tgz",
+      "integrity": "sha512-LNr7X8fTiKGRtQGOerSayc2pWJp/9ptRYAa4G+U+cjw9kJZvkopav1AQc5HHD+U364f71tZv6XamaHKgrIoVzA==",
       "cpu": [
         "x64"
       ],
@@ -2460,9 +2461,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-wasm32-wasi": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.7.tgz",
-      "integrity": "sha512-ANaSKt74ZRzE2TvJmUcbFQ8zS201cIPxUDm5qez5rLEwWkie2SkGtA4P+GPTj+u8N6JbPrC8MtY8RmJA35Oo+A==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.10.tgz",
+      "integrity": "sha512-d6ekQpopFQJAcIK2i7ZzWOYGZ+A6NzzvQ3ozBvWFdeyqfOZdYHU66g5yr+/HC4ipP1ZgWsqa80+ISNILk+ae/Q==",
       "bundleDependencies": [
         "@napi-rs/wasm-runtime",
         "@emnapi/core",
@@ -2481,7 +2482,7 @@
         "@emnapi/core": "^1.4.3",
         "@emnapi/runtime": "^1.4.3",
         "@emnapi/wasi-threads": "^1.0.2",
-        "@napi-rs/wasm-runtime": "^0.2.9",
+        "@napi-rs/wasm-runtime": "^0.2.10",
         "@tybys/wasm-util": "^0.9.0",
         "tslib": "^2.8.0"
       },
@@ -2489,70 +2490,10 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
-      "version": "1.4.3",
-      "dev": true,
-      "inBundle": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/wasi-threads": "1.0.2",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
-      "version": "1.4.3",
-      "dev": true,
-      "inBundle": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
-      "version": "1.0.2",
-      "dev": true,
-      "inBundle": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
-      "version": "0.2.9",
-      "dev": true,
-      "inBundle": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/core": "^1.4.0",
-        "@emnapi/runtime": "^1.4.0",
-        "@tybys/wasm-util": "^0.9.0"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
-      "version": "0.9.0",
-      "dev": true,
-      "inBundle": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": {
-      "version": "2.8.0",
-      "dev": true,
-      "inBundle": true,
-      "license": "0BSD",
-      "optional": true
-    },
     "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.7.tgz",
-      "integrity": "sha512-HUiSiXQ9gLJBAPCMVRk2RT1ZrBjto7WvqsPBwUrNK2BcdSxMnk19h4pjZjI7zgPhDxlAbJSumTC4ljeA9y0tEw==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.10.tgz",
+      "integrity": "sha512-i1Iwg9gRbwNVOCYmnigWCCgow8nDWSFmeTUU5nbNx3rqbe4p0kRbEqLwLJbYZKmSSp23g4N6rCDmm7OuPBXhDA==",
       "cpu": [
         "arm64"
       ],
@@ -2567,9 +2508,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.7.tgz",
-      "integrity": "sha512-rYHGmvoHiLJ8hWucSfSOEmdCBIGZIq7SpkPRSqLsH2Ab2YUNgKeAPT1Fi2cx3+hnYOrAb0jp9cRyode3bBW4mQ==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.10.tgz",
+      "integrity": "sha512-sGiJTjcBSfGq2DVRtaSljq5ZgZS2SDHSIfhOylkBvHVjwOsodBhnb3HdmiKkVuUGKD0I7G63abMOVaskj1KpOA==",
       "cpu": [
         "x64"
       ],
@@ -2661,15 +2602,15 @@
       }
     },
     "node_modules/@tailwindcss/vite": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.7.tgz",
-      "integrity": "sha512-tYa2fO3zDe41I7WqijyVbRd8oWT0aEID1Eokz5hMT6wShLIHj3yvwj9XbfuloHP9glZ6H+aG2AN/+ZrxJ1Y5RQ==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.10.tgz",
+      "integrity": "sha512-QWnD5HDY2IADv+vYR82lOhqOlS1jSCUUAmfem52cXAhRTKxpDh3ARX8TTXJTCCO7Rv7cD2Nlekabv02bwP3a2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@tailwindcss/node": "4.1.7",
-        "@tailwindcss/oxide": "4.1.7",
-        "tailwindcss": "4.1.7"
+        "@tailwindcss/node": "4.1.10",
+        "@tailwindcss/oxide": "4.1.10",
+        "tailwindcss": "4.1.10"
       },
       "peerDependencies": {
         "vite": "^5.2.0 || ^6"
@@ -2794,6 +2735,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/chai": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.2.tgz",
+      "integrity": "sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/deep-eql": "*"
+      }
+    },
     "node_modules/@types/chrome": {
       "version": "0.0.322",
       "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.322.tgz",
@@ -2822,6 +2773,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/deep-eql": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
+      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/dom-to-image": {
       "version": "2.6.7",
       "resolved": "https://registry.npmjs.org/@types/dom-to-image/-/dom-to-image-2.6.7.tgz",
@@ -2981,17 +2939,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
-      "integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz",
+      "integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/type-utils": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/type-utils": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -3005,32 +2963,224 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "@typescript-eslint/parser": "^8.35.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/project-service": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
+      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.35.0",
+        "@typescript-eslint/types": "^8.35.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
+      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
+      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
+      "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
+      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.35.0",
+        "@typescript-eslint/tsconfig-utils": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
+      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
+      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.0",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
-      "integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
-      "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz",
+      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3045,15 +3195,37 @@
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
-      "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
+      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1"
+        "@typescript-eslint/tsconfig-utils": "^8.35.0",
+        "@typescript-eslint/types": "^8.35.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
+      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3063,15 +3235,176 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
-      "integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
+      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
+      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1",
+        "@typescript-eslint/project-service": "8.35.0",
+        "@typescript-eslint/tsconfig-utils": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
+      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.0",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
+      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.35.1",
+        "@typescript-eslint/types": "^8.35.1",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
+      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
+      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
+      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -3088,9 +3421,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
-      "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3102,14 +3435,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
-      "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
+      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/visitor-keys": "8.32.1",
+        "@typescript-eslint/project-service": "8.35.1",
+        "@typescript-eslint/tsconfig-utils": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -3129,9 +3464,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3155,16 +3490,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
-      "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
+      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.32.1",
-        "@typescript-eslint/types": "8.32.1",
-        "@typescript-eslint/typescript-estree": "8.32.1"
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3179,14 +3514,14 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
-      "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
+      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.32.1",
-        "eslint-visitor-keys": "^4.2.0"
+        "@typescript-eslint/types": "8.35.1",
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3197,15 +3532,16 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.1.4.tgz",
-      "integrity": "sha512-G4p6OtioySL+hPV7Y6JHlhpsODbJzt1ndwHAFkyk6vVjpK03PFsKnauZIzcd0PrK4zAbc5lc+jeZ+eNGiMA+iw==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.2.4.tgz",
+      "integrity": "sha512-EyF9SXU6kS5Ku/U82E259WSnvg6c8KTjppUncuNdm5QHpe17mwREHnjDzozC8x9MZ0xfBUFSaLkRv4TMA75ALQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
         "@bcoe/v8-coverage": "^1.0.2",
-        "debug": "^4.4.0",
+        "ast-v8-to-istanbul": "^0.3.3",
+        "debug": "^4.4.1",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
         "istanbul-lib-source-maps": "^5.0.6",
@@ -3220,8 +3556,8 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "3.1.4",
-        "vitest": "3.1.4"
+        "@vitest/browser": "3.2.4",
+        "vitest": "3.2.4"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -3230,14 +3566,15 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz",
-      "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
+      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.1.4",
-        "@vitest/utils": "3.1.4",
+        "@types/chai": "^5.2.2",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
         "chai": "^5.2.0",
         "tinyrainbow": "^2.0.0"
       },
@@ -3246,13 +3583,13 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz",
-      "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
+      "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.1.4",
+        "@vitest/spy": "3.2.4",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.17"
       },
@@ -3261,7 +3598,7 @@
       },
       "peerDependencies": {
         "msw": "^2.4.9",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "peerDependenciesMeta": {
         "msw": {
@@ -3283,9 +3620,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz",
-      "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
+      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3296,27 +3633,28 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz",
-      "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz",
+      "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "3.1.4",
-        "pathe": "^2.0.3"
+        "@vitest/utils": "3.2.4",
+        "pathe": "^2.0.3",
+        "strip-literal": "^3.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz",
-      "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz",
+      "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
+        "@vitest/pretty-format": "3.2.4",
         "magic-string": "^0.30.17",
         "pathe": "^2.0.3"
       },
@@ -3325,27 +3663,27 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz",
-      "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
+      "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tinyspy": "^3.0.2"
+        "tinyspy": "^4.0.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz",
-      "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
+      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.1.4",
-        "loupe": "^3.1.3",
+        "@vitest/pretty-format": "3.2.4",
+        "loupe": "^3.1.4",
         "tinyrainbow": "^2.0.0"
       },
       "funding": {
@@ -3353,9 +3691,9 @@
       }
     },
     "node_modules/@zoom-image/core": {
-      "version": "0.40.0",
-      "resolved": "https://registry.npmjs.org/@zoom-image/core/-/core-0.40.0.tgz",
-      "integrity": "sha512-NsXhw7QCXu7390rs7AlcB3d8Vx6HnEB9gFHpF9yf5IfhB8wrv37IgIL1FC4QW+1id5FeGv2o62XyPL6vMz3EfA==",
+      "version": "0.41.0",
+      "resolved": "https://registry.npmjs.org/@zoom-image/core/-/core-0.41.0.tgz",
+      "integrity": "sha512-LAxGru91286gFmyiQB4RjM277YOWxJX+OZcwtIH/N0dyo73y4NfaAE1eGVdnhjxEYv7yVV3xToMyYnm+uQboTw==",
       "license": "MIT",
       "dependencies": {
         "@namnode/store": "^0.1.0"
@@ -3366,12 +3704,12 @@
       }
     },
     "node_modules/@zoom-image/svelte": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@zoom-image/svelte/-/svelte-0.3.1.tgz",
-      "integrity": "sha512-ZJj5/Q11jzcpjItqPJpfvU/XpcWkOehvTcIBZzenGfUWprJ6o8qSesuUAum1WEpv2vbTwUlybe5h3Rim3/vIGA==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@zoom-image/svelte/-/svelte-0.3.4.tgz",
+      "integrity": "sha512-8cPkFUjh+t3/eYkoT2krvz8hoFiXoiYZKpcHOnYCHLhEwaHr1yjgXg/ttWehotVH9V3Z51JQgIcGF3uhYWKB/Q==",
       "license": "MIT",
       "dependencies": {
-        "@zoom-image/core": "0.40.0"
+        "@zoom-image/core": "0.41.0"
       },
       "funding": {
         "type": "github",
@@ -3397,9 +3735,9 @@
       "optional": true
     },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -3555,6 +3893,35 @@
         "@mdn/browser-compat-data": "^5.6.19"
       }
     },
+    "node_modules/ast-v8-to-istanbul": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.3.tgz",
+      "integrity": "sha512-MuXMrSLVVoA6sYN/6Hke18vMzrT4TZNbZIj/hvh0fnYFpO+/kFXcLIaiPwXXWaQUPg4yJD8fj+lfJ7/1EBconw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "estree-walker": "^3.0.3",
+        "js-tokens": "^9.0.1"
+      }
+    },
+    "node_modules/ast-v8-to-istanbul/node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
+    "node_modules/ast-v8-to-istanbul/node_modules/js-tokens": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -4183,9 +4550,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -4456,9 +4823,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+      "version": "5.18.2",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz",
+      "integrity": "sha512-6Jw4sE1maoRJo3q8MsSIn2onJFbLTOjY9hlx4DZXmOKvLRd1Ok2kXmAGXaafL2+ijsJZ1ClYbl/pmqr9+k4iUQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4674,19 +5041,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
-      "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
+      "version": "9.29.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
+      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.0",
+        "@eslint/config-array": "^0.20.1",
         "@eslint/config-helpers": "^0.2.1",
         "@eslint/core": "^0.14.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.27.0",
+        "@eslint/js": "9.29.0",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -4698,9 +5065,9 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -4751,13 +5118,13 @@
       }
     },
     "node_modules/eslint-p": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/eslint-p/-/eslint-p-0.23.1.tgz",
-      "integrity": "sha512-g1ZzYhoSsSmOEO9W2Elcnza0cjDdcU0wUJtpBHkg4WT3QRt0WO3QIBoBFcjMvWUfzajZCbyizg+LeWR7y2pUSw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/eslint-p/-/eslint-p-0.24.0.tgz",
+      "integrity": "sha512-I0UgYBOqckfo9RQSIgwL+fhOG+Nllo18YyCA8qBL0rgrTh3ZFPRCm8/eJQry5I+EQzL0TnGpY/dfbUvf1Ozx5g==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "eslint": "9.27.0"
+        "eslint": "9.28.0"
       },
       "bin": {
         "eslint-p": "lib/eslint-p.js"
@@ -4766,6 +5133,80 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/eslint-p/node_modules/@eslint/js": {
+      "version": "9.28.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.28.0.tgz",
+      "integrity": "sha512-fnqSjGWd/CoIp4EXIxWVK/sHA6DOHN4+8Ix2cX5ycOY7LG0UY8nHCU5pIp2eaE1Mc7Qd8kHspYNzYXT2ojPLzg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
+      }
+    },
+    "node_modules/eslint-p/node_modules/eslint": {
+      "version": "9.28.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.28.0.tgz",
+      "integrity": "sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.20.0",
+        "@eslint/config-helpers": "^0.2.1",
+        "@eslint/core": "^0.14.0",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "9.28.0",
+        "@eslint/plugin-kit": "^0.3.1",
+        "@humanfs/node": "^0.16.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.6",
+        "debug": "^4.3.2",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^8.3.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^8.0.0",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-plugin-compat": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-6.0.2.tgz",
@@ -4803,9 +5244,9 @@
       }
     },
     "node_modules/eslint-plugin-svelte": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.9.0.tgz",
-      "integrity": "sha512-nvIUNyyPGbr5922Kd1p/jXe+FfNdVPXsxLyrrXpwfSbZZEFdAYva9O/gm2lObC/wXkQo/AUmQkAihfmNJYeCjA==",
+      "version": "3.9.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.9.3.tgz",
+      "integrity": "sha512-PlcyK80sqAZ43IITeZkgl3zPFWJytx/Joup9iKGqIOsXM2m3pWfPbWuXPr5PN3loXFEypqTY/JyZwNqlSpSvRw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4813,7 +5254,7 @@
         "@jridgewell/sourcemap-codec": "^1.5.0",
         "esutils": "^2.0.3",
         "globals": "^16.0.0",
-        "known-css-properties": "^0.36.0",
+        "known-css-properties": "^0.37.0",
         "postcss": "^8.4.49",
         "postcss-load-config": "^3.1.4",
         "postcss-safe-parser": "^7.0.0",
@@ -4899,9 +5340,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -4916,9 +5357,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -4950,15 +5391,15 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4995,9 +5436,9 @@
       }
     },
     "node_modules/esrap": {
-      "version": "1.4.6",
-      "resolved": "https://registry.npmjs.org/esrap/-/esrap-1.4.6.tgz",
-      "integrity": "sha512-F/D2mADJ9SHY3IwksD4DAXjTt7qt7GWUf3/8RhCNWmC/67tyb55dpimHmy7EplakFaflV0R/PC+fdSPqrRHAQw==",
+      "version": "1.4.9",
+      "resolved": "https://registry.npmjs.org/esrap/-/esrap-1.4.9.tgz",
+      "integrity": "sha512-3OMlcd0a03UGuZpPeUC1HxR3nA23l+HEyCiZw3b3FumJIN9KphoGzDJKMXI1S72jVS1dsenDyQC0kJlO1U9E1g==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
@@ -5072,9 +5513,9 @@
       }
     },
     "node_modules/fabric": {
-      "version": "6.6.5",
-      "resolved": "https://registry.npmjs.org/fabric/-/fabric-6.6.5.tgz",
-      "integrity": "sha512-BFxyLDeLMMgtteqQwKAyRM+oSkf82lDFzsiC7AMob7k7ag7naFuHOtWtcll4v+M9Cpn5aqRBfz1shnsO0vZhbg==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/fabric/-/fabric-6.7.0.tgz",
+      "integrity": "sha512-+yKumsh1MvJ44Um2eOhb4Q6CyZ6e2XKBV3IfQvzuGKhl2UkRFQtIKPUi6f06m3gd0r5zspgMUl5iwxtT1dmFAQ==",
       "license": "MIT",
       "engines": {
         "node": ">=16.20.0"
@@ -5544,9 +5985,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.1.0.tgz",
-      "integrity": "sha512-aibexHNbb/jiUSObBgpHLj+sIuUmJnYcgXBlrfsiDZ9rt4aF2TFRbyLgZ2iFQuVZ1K5Mx3FVkbKRSgKrbK3K2g==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
+      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6300,9 +6741,9 @@
       }
     },
     "node_modules/known-css-properties": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.36.0.tgz",
-      "integrity": "sha512-A+9jP+IUmuQsNdsLdcg6Yt7voiMF/D4K83ew0OpJtpu+l34ef7LaohWV0Rc6KNvzw6ZDizkqfyB5JznZnzuKQA==",
+      "version": "0.37.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.37.0.tgz",
+      "integrity": "sha512-JCDrsP4Z1Sb9JwG0aJ8Eo2r7k4Ou5MwmThS/6lcIe1ICyb7UBJKGRIUUdqc2ASdE/42lgz6zFUnzAIhtXnBVrQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -6619,9 +7060,9 @@
       "license": "MIT"
     },
     "node_modules/loupe": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
-      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.4.tgz",
+      "integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
       "dev": true,
       "license": "MIT"
     },
@@ -6742,9 +7183,9 @@
       }
     },
     "node_modules/maplibre-gl": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.5.0.tgz",
-      "integrity": "sha512-p8AOPuzzqn1ZA9gcXxKw0IED715we/2Owa/YUr6PANmgMvNMe/JG+V/C1hRra43Wm62Biz+Aa8AgbOLJimA8tA==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.6.0.tgz",
+      "integrity": "sha512-7TuHMozUC4rlIp08bSsxCixFn18P24otrlZU/7UGCO5RufFTJadFzauTrvBHr9FB67MbJ6nvFXEftGd0bUl4Iw==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@mapbox/geojson-rewind": "^0.5.2",
@@ -6754,7 +7195,7 @@
         "@mapbox/unitbezier": "^0.0.1",
         "@mapbox/vector-tile": "^1.3.1",
         "@mapbox/whoots-js": "^3.1.0",
-        "@maplibre/maplibre-gl-style-spec": "^23.2.2",
+        "@maplibre/maplibre-gl-style-spec": "^23.3.0",
         "@types/geojson": "^7946.0.16",
         "@types/geojson-vt": "3.2.5",
         "@types/mapbox__point-geometry": "^0.1.4",
@@ -7609,9 +8050,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
+      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -8587,6 +9028,26 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/strip-literal": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz",
+      "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^9.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/strip-literal/node_modules/js-tokens": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/style-to-object": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.9.tgz",
@@ -8627,9 +9088,9 @@
       }
     },
     "node_modules/svelte": {
-      "version": "5.33.1",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.33.1.tgz",
-      "integrity": "sha512-7znzaaQALL62NBzkdKV04tmYIVla8qjrW+k6GdgFZcKcj8XOb8iEjmfRPo40iaWZlKv3+uiuc0h4iaGgwoORtA==",
+      "version": "5.34.8",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.34.8.tgz",
+      "integrity": "sha512-TF+8irl7rpj3+fpaLuPRX5BqReTAqckp0Fumxa/mCeK3fo0/MnBb9W/Z2bLwtqj3C3r5Lm6NKIAw7YrgIv1Fwg==",
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
@@ -8641,7 +9102,7 @@
         "axobject-query": "^4.1.0",
         "clsx": "^2.1.1",
         "esm-env": "^1.2.1",
-        "esrap": "^1.4.6",
+        "esrap": "^1.4.8",
         "is-reference": "^3.0.3",
         "locate-character": "^3.0.0",
         "magic-string": "^0.30.11",
@@ -8652,9 +9113,9 @@
       }
     },
     "node_modules/svelte-check": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.2.1.tgz",
-      "integrity": "sha512-e49SU1RStvQhoipkQ/aonDhHnG3qxHSBtNfBRb9pxVXoa+N7qybAo32KgA9wEb2PCYFNaDg7bZCdhLD1vHpdYA==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.2.2.tgz",
+      "integrity": "sha512-1+31EOYZ7NKN0YDMKusav2hhEoA51GD9Ws6o//0SphMT0ve9mBTsTUEX7OmDMadUP3KjNHsSKtJrqdSaD8CrGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8878,15 +9339,15 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.7.tgz",
-      "integrity": "sha512-kr1o/ErIdNhTz8uzAYL7TpaUuzKIE6QPQ4qmSdxnoX/lo+5wmUHQA6h3L5yIqEImSRnAAURDirLu/BgiXGPAhg==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.10.tgz",
+      "integrity": "sha512-P3nr6WkvKV/ONsTzj6Gb57sWPMX29EPNPopo7+FcpkQaNsrNpZ1pv8QmrYI2RqEKD7mlGqLnGovlcYnBK0IqUA==",
       "license": "MIT"
     },
     "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
+      "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9033,9 +9494,9 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
-      "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9050,9 +9511,9 @@
       }
     },
     "node_modules/tinypool": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
-      "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9077,9 +9538,9 @@
       }
     },
     "node_modules/tinyspy": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
-      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.3.tgz",
+      "integrity": "sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9191,15 +9652,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.32.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.1.tgz",
-      "integrity": "sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.0.tgz",
+      "integrity": "sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.32.1",
-        "@typescript-eslint/parser": "8.32.1",
-        "@typescript-eslint/utils": "8.32.1"
+        "@typescript-eslint/eslint-plugin": "8.35.0",
+        "@typescript-eslint/parser": "8.35.0",
+        "@typescript-eslint/utils": "8.35.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9213,6 +9674,174 @@
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/project-service": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
+      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.35.0",
+        "@typescript-eslint/types": "^8.35.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
+      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
+      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/types": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
+      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.35.0",
+        "@typescript-eslint/tsconfig-utils": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/visitor-keys": "8.35.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/utils": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
+      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.35.0",
+        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
+      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.0",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/uglify-js": {
       "version": "3.19.3",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
@@ -9393,17 +10022,17 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz",
-      "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
+      "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.4.0",
+        "debug": "^4.4.1",
         "es-module-lexer": "^1.7.0",
         "pathe": "^2.0.3",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "bin": {
         "vite-node": "vite-node.mjs"
@@ -9867,32 +10496,34 @@
       }
     },
     "node_modules/vitest": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz",
-      "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
+      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "3.1.4",
-        "@vitest/mocker": "3.1.4",
-        "@vitest/pretty-format": "^3.1.4",
-        "@vitest/runner": "3.1.4",
-        "@vitest/snapshot": "3.1.4",
-        "@vitest/spy": "3.1.4",
-        "@vitest/utils": "3.1.4",
+        "@types/chai": "^5.2.2",
+        "@vitest/expect": "3.2.4",
+        "@vitest/mocker": "3.2.4",
+        "@vitest/pretty-format": "^3.2.4",
+        "@vitest/runner": "3.2.4",
+        "@vitest/snapshot": "3.2.4",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
         "chai": "^5.2.0",
-        "debug": "^4.4.0",
+        "debug": "^4.4.1",
         "expect-type": "^1.2.1",
         "magic-string": "^0.30.17",
         "pathe": "^2.0.3",
+        "picomatch": "^4.0.2",
         "std-env": "^3.9.0",
         "tinybench": "^2.9.0",
         "tinyexec": "^0.3.2",
-        "tinyglobby": "^0.2.13",
-        "tinypool": "^1.0.2",
+        "tinyglobby": "^0.2.14",
+        "tinypool": "^1.1.1",
         "tinyrainbow": "^2.0.0",
-        "vite": "^5.0.0 || ^6.0.0",
-        "vite-node": "3.1.4",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
+        "vite-node": "3.2.4",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -9908,8 +10539,8 @@
         "@edge-runtime/vm": "*",
         "@types/debug": "^4.1.12",
         "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.1.4",
-        "@vitest/ui": "3.1.4",
+        "@vitest/browser": "3.2.4",
+        "@vitest/ui": "3.2.4",
         "happy-dom": "*",
         "jsdom": "*"
       },
diff --git a/web/package.json b/web/package.json
index 14eb178d91..72df25a195 100644
--- a/web/package.json
+++ b/web/package.json
@@ -80,7 +80,7 @@
     "dotenv": "^16.4.7",
     "eslint": "^9.18.0",
     "eslint-config-prettier": "^10.0.0",
-    "eslint-p": "^0.23.0",
+    "eslint-p": "^0.24.0",
     "eslint-plugin-compat": "^6.0.2",
     "eslint-plugin-svelte": "^3.9.0",
     "eslint-plugin-unicorn": "^59.0.0",

From 96e3b96d57045e8557671f2cfcfd831e4e91e077 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 11:02:46 +0100
Subject: [PATCH 100/337] fix(deps): update dependency nestjs-otel to v7
 (#19662)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 server/package-lock.json | 25 ++++++++++++++-----------
 server/package.json      |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index 23304af5fc..0d5eba8adf 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -63,7 +63,7 @@
         "nest-commander": "^3.16.0",
         "nestjs-cls": "^5.0.0",
         "nestjs-kysely": "^3.0.0",
-        "nestjs-otel": "^6.0.0",
+        "nestjs-otel": "^7.0.0",
         "nodemailer": "^7.0.0",
         "openid-client": "^6.3.3",
         "pg": "^8.11.3",
@@ -3662,15 +3662,15 @@
       }
     },
     "node_modules/@opentelemetry/host-metrics": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/host-metrics/-/host-metrics-0.35.5.tgz",
-      "integrity": "sha512-Zf9Cjl7H6JalspnK5KD1+LLKSVecSinouVctNmUxRy+WP+20KwHq+qg4hADllkEmJ99MZByLLmEmzrr7s92V6g==",
+      "version": "0.36.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/host-metrics/-/host-metrics-0.36.0.tgz",
+      "integrity": "sha512-14lNY57qa21V3ZOl6xrqLMHR0HGlnPIApR6hr3oCw/Dqs5IzxhTwt2X8Stn82vWJJis7j/ezn11oODsizHj2dQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "systeminformation": "5.23.8"
       },
       "engines": {
-        "node": ">=14"
+        "node": "^18.19.0 || >=20.6.0"
       },
       "peerDependencies": {
         "@opentelemetry/api": "^1.3.0"
@@ -12711,18 +12711,21 @@
       }
     },
     "node_modules/nestjs-otel": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/nestjs-otel/-/nestjs-otel-6.2.0.tgz",
-      "integrity": "sha512-F15GnWNrmHxDRdn0o2/cDx65gR7+s3xou1mEJ5vVONfOOYeneIJi1Mkf6h/Qu6NfO4SHPFPKGMXoovvTX1D8Iw==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/nestjs-otel/-/nestjs-otel-7.0.0.tgz",
+      "integrity": "sha512-BjuzY+fJrlbooIZds15XOHvdv2LrtUiVjIBcV3DMw/VrIXK9szWe+njjMZS6Pqft9hV78M8lJE+Ux2ZowDQ/Hw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/host-metrics": "^0.35.5",
+        "@opentelemetry/host-metrics": "^0.36.0",
         "response-time": "^2.3.3"
       },
+      "engines": {
+        "node": ">= 20"
+      },
       "peerDependencies": {
-        "@nestjs/common": ">= 10 < 12",
-        "@nestjs/core": ">= 10 < 12"
+        "@nestjs/common": ">= 11 < 12",
+        "@nestjs/core": ">= 11 < 12"
       }
     },
     "node_modules/next": {
diff --git a/server/package.json b/server/package.json
index 37cfd237bd..3de551e6ff 100644
--- a/server/package.json
+++ b/server/package.json
@@ -88,7 +88,7 @@
     "nest-commander": "^3.16.0",
     "nestjs-cls": "^5.0.0",
     "nestjs-kysely": "^3.0.0",
-    "nestjs-otel": "^6.0.0",
+    "nestjs-otel": "^7.0.0",
     "nodemailer": "^7.0.0",
     "openid-client": "^6.3.3",
     "pg": "^8.11.3",

From 38d73f2bc612e8d378779b8ba7c6b3e2ae9fd619 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 11:32:11 +0100
Subject: [PATCH 101/337] chore(deps): update dependency @types/node to
 ^22.15.33 (#19653)

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

diff --git a/cli/package-lock.json b/cli/package-lock.json
index c669838c26..b690003395 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -27,7 +27,7 @@
         "@types/lodash-es": "^4.17.12",
         "@types/micromatch": "^4.0.9",
         "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.15.32",
+        "@types/node": "^22.15.33",
         "@vitest/coverage-v8": "^3.0.0",
         "byte-size": "^9.0.0",
         "cli-progress": "^3.12.0",
@@ -61,7 +61,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.32",
+        "@types/node": "^22.15.33",
         "typescript": "^5.3.3"
       }
     },
@@ -1355,9 +1355,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.15.32",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.32.tgz",
-      "integrity": "sha512-3jigKqgSjsH6gYZv2nEsqdXfZqIFGAV36XYYjf9KGZ3PSG+IhLecqPnI310RvjutyMwifE2hhhNEklOUrvx/wA==",
+      "version": "22.15.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.34.tgz",
+      "integrity": "sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/cli/package.json b/cli/package.json
index abf44944db..e69555924d 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -21,7 +21,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.15.32",
+    "@types/node": "^22.15.33",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index 376afb310c..162c863832 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -15,7 +15,7 @@
         "@immich/sdk": "file:../open-api/typescript-sdk",
         "@playwright/test": "^1.44.1",
         "@types/luxon": "^3.4.2",
-        "@types/node": "^22.15.32",
+        "@types/node": "^22.15.33",
         "@types/oidc-provider": "^9.0.0",
         "@types/pg": "^8.15.1",
         "@types/pngjs": "^6.0.4",
@@ -67,7 +67,7 @@
         "@types/lodash-es": "^4.17.12",
         "@types/micromatch": "^4.0.9",
         "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.15.32",
+        "@types/node": "^22.15.33",
         "@vitest/coverage-v8": "^3.0.0",
         "byte-size": "^9.0.0",
         "cli-progress": "^3.12.0",
@@ -101,7 +101,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.32",
+        "@types/node": "^22.15.33",
         "typescript": "^5.3.3"
       }
     },
@@ -1995,9 +1995,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.15.32",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.32.tgz",
-      "integrity": "sha512-3jigKqgSjsH6gYZv2nEsqdXfZqIFGAV36XYYjf9KGZ3PSG+IhLecqPnI310RvjutyMwifE2hhhNEklOUrvx/wA==",
+      "version": "22.15.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.34.tgz",
+      "integrity": "sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/e2e/package.json b/e2e/package.json
index 25e1d27d23..4669ca0a1a 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -25,7 +25,7 @@
     "@immich/sdk": "file:../open-api/typescript-sdk",
     "@playwright/test": "^1.44.1",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.15.32",
+    "@types/node": "^22.15.33",
     "@types/oidc-provider": "^9.0.0",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
diff --git a/open-api/typescript-sdk/package-lock.json b/open-api/typescript-sdk/package-lock.json
index 83cf583230..ab9f3b1fd7 100644
--- a/open-api/typescript-sdk/package-lock.json
+++ b/open-api/typescript-sdk/package-lock.json
@@ -12,7 +12,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.32",
+        "@types/node": "^22.15.33",
         "typescript": "^5.3.3"
       }
     },
@@ -23,9 +23,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.15.32",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.32.tgz",
-      "integrity": "sha512-3jigKqgSjsH6gYZv2nEsqdXfZqIFGAV36XYYjf9KGZ3PSG+IhLecqPnI310RvjutyMwifE2hhhNEklOUrvx/wA==",
+      "version": "22.15.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.34.tgz",
+      "integrity": "sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json
index b80d5cd01a..f2885f4a7b 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.15.32",
+    "@types/node": "^22.15.33",
     "typescript": "^5.3.3"
   },
   "repository": {
diff --git a/server/package-lock.json b/server/package-lock.json
index 0d5eba8adf..5e4f9a6fe1 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -109,7 +109,7 @@
         "@types/luxon": "^3.6.2",
         "@types/mock-fs": "^4.13.1",
         "@types/multer": "^1.4.7",
-        "@types/node": "^22.15.32",
+        "@types/node": "^22.15.33",
         "@types/nodemailer": "^6.4.14",
         "@types/picomatch": "^4.0.0",
         "@types/pngjs": "^6.0.5",
@@ -6102,9 +6102,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.15.32",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.32.tgz",
-      "integrity": "sha512-3jigKqgSjsH6gYZv2nEsqdXfZqIFGAV36XYYjf9KGZ3PSG+IhLecqPnI310RvjutyMwifE2hhhNEklOUrvx/wA==",
+      "version": "22.15.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.34.tgz",
+      "integrity": "sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
diff --git a/server/package.json b/server/package.json
index 3de551e6ff..cb234ab20a 100644
--- a/server/package.json
+++ b/server/package.json
@@ -135,7 +135,7 @@
     "@types/luxon": "^3.6.2",
     "@types/mock-fs": "^4.13.1",
     "@types/multer": "^1.4.7",
-    "@types/node": "^22.15.32",
+    "@types/node": "^22.15.33",
     "@types/nodemailer": "^6.4.14",
     "@types/picomatch": "^4.0.0",
     "@types/pngjs": "^6.0.5",

From 590f96246d3d6cfdb128891502bfbbeea3bb69b8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 11:33:01 +0100
Subject: [PATCH 102/337] chore(deps): update github-actions (#19654)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/build-mobile.yml        | 2 +-
 .github/workflows/pr-label-validation.yml | 2 +-
 .github/workflows/static_analysis.yml     | 2 +-
 .github/workflows/test.yml                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index bb45456727..842065585c 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -96,7 +96,7 @@ jobs:
           key: build-mobile-gradle-${{ runner.os }}-main
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
+        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml
diff --git a/.github/workflows/pr-label-validation.yml b/.github/workflows/pr-label-validation.yml
index 19f90143e0..2c75be8653 100644
--- a/.github/workflows/pr-label-validation.yml
+++ b/.github/workflows/pr-label-validation.yml
@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Require PR to have a changelog label
-        uses: mheap/github-action-required-labels@fb29a14a076b0f74099f6198f77750e8fc236016 # v5.5.0
+        uses: mheap/github-action-required-labels@8afbe8ae6ab7647d0c9f0cfa7c2f939650d22509 # v5.5.1
         with:
           mode: exactly
           count: 1
diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index 5d0d690661..b128c3f80f 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -49,7 +49,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
+        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a6d368532d..47a11c8232 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -516,7 +516,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
+        uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # v2.21.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml

From e5e857edc32266ca099e4a1f310aa9c6e63585f4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 11:33:39 +0100
Subject: [PATCH 103/337] chore(deps): update prom/prometheus docker digest to
 7a34573 (#19646)

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 b293260555..bf70c43e4a 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:9abc6cf6aea7710d163dbb28d8eeb7dc5baef01e38fa4cd146a406dd9f07f70d
+    image: prom/prometheus@sha256:7a34573f0b9c952286b33d537f233cd5b708e12263733aa646e50c33f598f16c
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - prometheus-data:/prometheus

From 53f80393bf1045716d896a9367db24679fe37724 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Tue, 1 Jul 2025 12:47:04 +0200
Subject: [PATCH 104/337] chore: upgrade to cron v4 (#19664)

---
 server/package-lock.json                   | 40 ++++++++--------------
 server/package.json                        |  4 +--
 server/src/repositories/cron.repository.ts |  2 +-
 3 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index 5e4f9a6fe1..3243444915 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -15,7 +15,7 @@
         "@nestjs/event-emitter": "^3.0.0",
         "@nestjs/platform-express": "^11.0.4",
         "@nestjs/platform-socket.io": "^11.0.4",
-        "@nestjs/schedule": "^5.0.0",
+        "@nestjs/schedule": "^6.0.0",
         "@nestjs/swagger": "^11.0.2",
         "@nestjs/websockets": "^11.0.4",
         "@opentelemetry/api": "^1.9.0",
@@ -44,7 +44,7 @@
         "compression": "^1.8.0",
         "cookie": "^1.0.2",
         "cookie-parser": "^1.4.7",
-        "cron": "^3.5.0",
+        "cron": "4.3.0",
         "exiftool-vendored": "^28.8.0",
         "express": "^5.1.0",
         "fast-glob": "^3.3.2",
@@ -2902,12 +2902,12 @@
       }
     },
     "node_modules/@nestjs/schedule": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@nestjs/schedule/-/schedule-5.0.1.tgz",
-      "integrity": "sha512-kFoel84I4RyS2LNPH6yHYTKxB16tb3auAEciFuc788C3ph6nABkUfzX5IE+unjVaRX+3GuruJwurNepMlHXpQg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@nestjs/schedule/-/schedule-6.0.0.tgz",
+      "integrity": "sha512-aQySMw6tw2nhitELXd3EiRacQRgzUKD9mFcUZVOJ7jPLqIBvXOyvRWLsK9SdurGA+jjziAlMef7iB5ZEFFoQpw==",
       "license": "MIT",
       "dependencies": {
-        "cron": "3.5.0"
+        "cron": "4.3.0"
       },
       "peerDependencies": {
         "@nestjs/common": "^10.0.0 || ^11.0.0",
@@ -8645,13 +8645,16 @@
       }
     },
     "node_modules/cron": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/cron/-/cron-3.5.0.tgz",
-      "integrity": "sha512-0eYZqCnapmxYcV06uktql93wNWdlTmmBFP2iYz+JPVcQqlyFYcn1lFuIk4R54pkOmE7mcldTAPZv6X5XA4Q46A==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/cron/-/cron-4.3.0.tgz",
+      "integrity": "sha512-ciiYNLfSlF9MrDqnbMdRWFiA6oizSF7kA1osPP9lRzNu0Uu+AWog1UKy7SkckiDY2irrNjeO6qLyKnXC8oxmrw==",
       "license": "MIT",
       "dependencies": {
-        "@types/luxon": "~3.4.0",
-        "luxon": "~3.5.0"
+        "@types/luxon": "~3.6.0",
+        "luxon": "~3.6.0"
+      },
+      "engines": {
+        "node": ">=18.x"
       }
     },
     "node_modules/cron-parser": {
@@ -8666,21 +8669,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/cron/node_modules/@types/luxon": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz",
-      "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==",
-      "license": "MIT"
-    },
-    "node_modules/cron/node_modules/luxon": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
-      "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
diff --git a/server/package.json b/server/package.json
index cb234ab20a..ab8424329f 100644
--- a/server/package.json
+++ b/server/package.json
@@ -40,7 +40,7 @@
     "@nestjs/event-emitter": "^3.0.0",
     "@nestjs/platform-express": "^11.0.4",
     "@nestjs/platform-socket.io": "^11.0.4",
-    "@nestjs/schedule": "^5.0.0",
+    "@nestjs/schedule": "^6.0.0",
     "@nestjs/swagger": "^11.0.2",
     "@nestjs/websockets": "^11.0.4",
     "@opentelemetry/api": "^1.9.0",
@@ -69,7 +69,7 @@
     "compression": "^1.8.0",
     "cookie": "^1.0.2",
     "cookie-parser": "^1.4.7",
-    "cron": "^3.5.0",
+    "cron": "4.3.0",
     "exiftool-vendored": "^28.8.0",
     "express": "^5.1.0",
     "fast-glob": "^3.3.2",
diff --git a/server/src/repositories/cron.repository.ts b/server/src/repositories/cron.repository.ts
index e6e8fe7568..03fecca9ad 100644
--- a/server/src/repositories/cron.repository.ts
+++ b/server/src/repositories/cron.repository.ts
@@ -58,7 +58,7 @@ export class CronRepository {
       if (start) {
         job.start();
       } else {
-        job.stop();
+        void job.stop();
       }
     }
   }

From 8ccca04e27f7e543b4e2a362787ae0dee0ab0c54 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Tue, 1 Jul 2025 06:53:04 -0400
Subject: [PATCH 105/337] fix(web): improve request cancellation handling in
 service worker cache (#19217)

---
 web/src/service-worker/cache.ts       | 104 ++++++++++++++++++++++++++
 web/src/service-worker/fetch-event.ts |  74 +++++++++---------
 web/src/service-worker/index.ts       |   4 +-
 3 files changed, 141 insertions(+), 41 deletions(-)
 create mode 100644 web/src/service-worker/cache.ts

diff --git a/web/src/service-worker/cache.ts b/web/src/service-worker/cache.ts
new file mode 100644
index 0000000000..29d6073d5f
--- /dev/null
+++ b/web/src/service-worker/cache.ts
@@ -0,0 +1,104 @@
+import { build, files, version } from '$service-worker';
+
+const useCache = true;
+const CACHE = `cache-${version}`;
+
+export const APP_RESOURCES = [
+  ...build, // the app itself
+  ...files, // everything in `static`
+];
+
+let cache: Cache | undefined;
+export async function getCache() {
+  if (cache) {
+    return cache;
+  }
+  cache = await caches.open(CACHE);
+  return cache;
+}
+
+export const isURL = (request: URL | RequestInfo): request is URL => (request as URL).href !== undefined;
+export const isRequest = (request: RequestInfo): request is Request => (request as Request).url !== undefined;
+
+export async function deleteOldCaches() {
+  for (const key of await caches.keys()) {
+    if (key !== CACHE) {
+      await caches.delete(key);
+    }
+  }
+}
+
+const pendingRequests = new Map<string, AbortController>();
+const canceledRequests = new Set<string>();
+
+export async function cancelLoad(urlString: string) {
+  const pending = pendingRequests.get(urlString);
+  if (pending) {
+    canceledRequests.add(urlString);
+    pending.abort();
+    pendingRequests.delete(urlString);
+  }
+}
+
+export async function getCachedOrFetch(request: URL | Request | string) {
+  const response = await checkCache(request);
+  if (response) {
+    return response;
+  }
+
+  const urlString = getCacheKey(request);
+  const cancelToken = new AbortController();
+
+  try {
+    pendingRequests.set(urlString, cancelToken);
+    const response = await fetch(request, {
+      signal: cancelToken.signal,
+    });
+
+    checkResponse(response);
+    await setCached(response, urlString);
+    return response;
+  } catch (error) {
+    if (canceledRequests.has(urlString)) {
+      canceledRequests.delete(urlString);
+      return new Response(undefined, {
+        status: 499,
+        statusText: 'Request canceled: Instructions unclear, accidentally interrupted myself',
+      });
+    }
+    throw error;
+  } finally {
+    pendingRequests.delete(urlString);
+  }
+}
+
+export async function checkCache(url: URL | Request | string) {
+  if (!useCache) {
+    return;
+  }
+  const cache = await getCache();
+  return await cache.match(url);
+}
+
+export async function setCached(response: Response, cacheKey: URL | Request | string) {
+  if (cache && response.status === 200) {
+    const cache = await getCache();
+    cache.put(cacheKey, response.clone());
+  }
+}
+
+function checkResponse(response: Response) {
+  if (!(response instanceof Response)) {
+    throw new TypeError('Fetch did not return a valid Response object');
+  }
+}
+
+export function getCacheKey(request: URL | Request | string) {
+  if (isURL(request)) {
+    return request.toString();
+  } else if (isRequest(request)) {
+    return request.url;
+  } else {
+    return request;
+  }
+}
diff --git a/web/src/service-worker/fetch-event.ts b/web/src/service-worker/fetch-event.ts
index 11c8e0fd00..c23620abe3 100644
--- a/web/src/service-worker/fetch-event.ts
+++ b/web/src/service-worker/fetch-event.ts
@@ -1,6 +1,6 @@
 import { version } from '$service-worker';
+import { APP_RESOURCES, checkCache, getCacheKey, setCached } from './cache';
 
-const useCache = true;
 const CACHE = `cache-${version}`;
 
 export const isURL = (request: URL | RequestInfo): request is URL => (request as URL).href !== undefined;
@@ -24,20 +24,14 @@ export async function cancelLoad(urlString: string) {
   }
 }
 
-export async function getCachedOrFetch(request: URL | Request | string, cancelable: boolean = false) {
-  const cached = await checkCache(request);
-  if (cached.response) {
-    return cached.response;
+export async function getCachedOrFetch(request: URL | Request | string) {
+  const response = await checkCache(request);
+  if (response) {
+    return response;
   }
 
   try {
-    if (!cancelable) {
-      const response = await fetch(request);
-      checkResponse(response);
-      return response;
-    }
-
-    return await fetchWithCancellation(request, cached.cache);
+    return await fetchWithCancellation(request);
   } catch {
     return new Response(undefined, {
       status: 499,
@@ -46,7 +40,7 @@ export async function getCachedOrFetch(request: URL | Request | string, cancelab
   }
 }
 
-async function fetchWithCancellation(request: URL | Request | string, cache: Cache) {
+async function fetchWithCancellation(request: URL | Request | string) {
   const cacheKey = getCacheKey(request);
   const cancelToken = new AbortController();
 
@@ -57,44 +51,26 @@ async function fetchWithCancellation(request: URL | Request | string, cache: Cac
     });
 
     checkResponse(response);
-    setCached(response, cache, cacheKey);
+    setCached(response, cacheKey);
     return response;
   } finally {
     pendingLoads.delete(cacheKey);
   }
 }
 
-async function checkCache(url: URL | Request | string) {
-  if (!useCache) {
-    return;
-  }
-  const cache = await caches.open(CACHE);
-  const response = await cache.match(url);
-  return { cache, response };
-}
-
-async function setCached(response: Response, cache: Cache, cacheKey: URL | Request | string) {
-  if (response.status === 200) {
-    cache.put(cacheKey, response.clone());
-  }
-}
-
 function checkResponse(response: Response) {
   if (!(response instanceof Response)) {
-    throw new TypeError('invalid response from fetch');
+    throw new TypeError('Fetch did not return a valid Response object');
   }
 }
 
-function getCacheKey(request: URL | Request | string) {
-  if (isURL(request)) {
-    return request.toString();
-  } else if (isRequest(request)) {
-    return request.url;
-  } else {
-    return request;
-  }
+function isIgnoredFileType(pathname: string): boolean {
+  return /\.(png|ico|txt|json|ts|ttf|css|js|svelte)$/.test(pathname);
 }
 
+function isIgnoredPath(pathname: string): boolean {
+  return /^\/(src|api)(\/.*)?$/.test(pathname) || /^\/(node_modules|@vite|@id)(\/.*)?$/.test(pathname);
+}
 function isAssetRequest(pathname: string): boolean {
   return /^\/api\/assets\/[a-f0-9-]+\/(original|thumbnail)/.test(pathname);
 }
@@ -105,12 +81,30 @@ export function handleFetchEvent(event: FetchEvent): void {
   }
 
   const url = new URL(event.request.url);
+
+  // Only handle requests to the same origin
   if (url.origin !== self.location.origin) {
     return;
   }
 
-  if (isAssetRequest(url.pathname)) {
-    event.respondWith(getCachedOrFetch(event.request, true));
+  // Do not cache app resources
+  if (APP_RESOURCES.includes(url.pathname)) {
     return;
   }
+
+  // Cache requests for thumbnails
+  if (isAssetRequest(url.pathname)) {
+    event.respondWith(getCachedOrFetch(event.request));
+    return;
+  }
+
+  // Do not cache ignored file types or paths
+  if (isIgnoredFileType(url.pathname) || isIgnoredPath(url.pathname)) {
+    return;
+  }
+
+  // At this point, the only remaining requests for top level routes
+  // so serve the Svelte SPA fallback page
+  const slash = new URL('/', url.origin);
+  event.respondWith(getCachedOrFetch(slash));
 }
diff --git a/web/src/service-worker/index.ts b/web/src/service-worker/index.ts
index fbb6f74d82..54ada639ec 100644
--- a/web/src/service-worker/index.ts
+++ b/web/src/service-worker/index.ts
@@ -3,7 +3,8 @@
 /// <reference lib="esnext" />
 /// <reference lib="webworker" />
 import { installBroadcastChannelListener } from './broadcast-channel';
-import { deleteOldCaches, handleFetchEvent } from './fetch-event';
+import { deleteOldCaches } from './cache';
+import { handleFetchEvent } from './fetch-event';
 
 const sw = globalThis as unknown as ServiceWorkerGlobalScope;
 
@@ -14,6 +15,7 @@ const handleActivate = (event: ExtendableEvent) => {
 
 const handleInstall = (event: ExtendableEvent) => {
   event.waitUntil(sw.skipWaiting());
+  // do not preload app resources
 };
 
 sw.addEventListener('install', handleInstall, { passive: true });

From e6f8bfdf5eeb1d4008cd4934ac1b3fc4fed3041a Mon Sep 17 00:00:00 2001
From: seifer44 <9002783+seifer44@users.noreply.github.com>
Date: Tue, 1 Jul 2025 05:21:57 -0600
Subject: [PATCH 106/337] chore(docs): add instruction for trusting self-signed
 certificates with Immich and an OAuth server (#18624)

---
 docs/src/components/community-guides.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/src/components/community-guides.tsx b/docs/src/components/community-guides.tsx
index f5331a9163..49ba7a8a08 100644
--- a/docs/src/components/community-guides.tsx
+++ b/docs/src/components/community-guides.tsx
@@ -58,6 +58,12 @@ const guides: CommunityGuidesProps[] = [
     description: 'Access Immich with an end-to-end encrypted connection.',
     url: 'https://meshnet.nordvpn.com/how-to/remote-files-media-access/immich-remote-access',
   },
+  {
+    title: 'Trust Self Signed Certificates with Immich - OAuth Setup',
+    description:
+      'Set up Certificate Authority trust with Immich, and your private OAuth2/OpenID service, while using a private CA for HTTPS commication.',
+    url: 'https://github.com/immich-app/immich/discussions/18614',
+  },
 ];
 
 function CommunityGuide({ title, description, url }: CommunityGuidesProps): JSX.Element {

From 7f9689b4bcaf8f1c190fee23bae03eeffd12c7aa Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Tue, 1 Jul 2025 08:00:41 -0400
Subject: [PATCH 107/337] feat: bin for cli (#19648)

---
 cli/bin/immich   | 2 ++
 cli/package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100755 cli/bin/immich

diff --git a/cli/bin/immich b/cli/bin/immich
new file mode 100755
index 0000000000..924fff1230
--- /dev/null
+++ b/cli/bin/immich
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/index.js';
diff --git a/cli/package.json b/cli/package.json
index e69555924d..ca4ada2f65 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "exports": "./dist/index.js",
   "bin": {
-    "immich": "dist/index.js"
+    "immich": "./bin/immich"
   },
   "license": "GNU Affero General Public License version 3",
   "keywords": [

From e0c4b8df6f3039088be826ea61e88194b6eef31a Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Tue, 1 Jul 2025 15:18:14 +0200
Subject: [PATCH 108/337] chore: remove runner deps install step (#19527)

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/workflows/build-mobile.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index 842065585c..a048536b2f 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -66,12 +66,6 @@ jobs:
           ref: ${{ inputs.ref || github.sha }}
           persist-credentials: false
 
-      - name: Install missing deps
-        run: |
-          sudo add-apt-repository ppa:rmescandon/yq
-          sudo apt-get update
-          sudo apt-get install -y yq xz-utils ninja-build zstd
-
       - name: Create the Keystore
         env:
           KEY_JKS: ${{ secrets.KEY_JKS }}

From fa418d778b6e45963c426e7bdcea47512ad16077 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 1 Jul 2025 09:03:45 -0500
Subject: [PATCH 109/337] feat: lock folder action (#19634)

* feat: lock folder action

* refactor
---
 i18n/en.json                                  |  2 +
 ...e_to_lock_folder_action_button.widget.dart | 44 ++++++++++++++++++-
 ...from_lock_folder_action_button.widget.dart | 44 ++++++++++++++++++-
 .../home_bottom_app_bar.widget.dart           |  4 +-
 .../infrastructure/action.provider.dart       | 30 +++++++++++++
 mobile/lib/services/action.service.dart       | 22 ++++++++++
 6 files changed, 143 insertions(+), 3 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 1eff23eca9..3bd31638ec 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1247,6 +1247,7 @@
   "more": "More",
   "move": "Move",
   "move_off_locked_folder": "Move out of locked folder",
+  "move_to_lock_folder_action_prompt": "{count} added to the locked folder",
   "move_to_locked_folder": "Move to locked folder",
   "move_to_locked_folder_confirmation": "These photos and video will be removed from all albums, and only viewable from the locked folder",
   "moved_to_archive": "Moved {count, plural, one {# asset} other {# assets}} to archive",
@@ -1497,6 +1498,7 @@
   "remove_deleted_assets": "Remove Deleted Assets",
   "remove_from_album": "Remove from album",
   "remove_from_favorites": "Remove from favorites",
+  "remove_from_lock_folder_action_prompt": "{count} removed from the locked folder",
   "remove_from_locked_folder": "Remove from locked folder",
   "remove_from_locked_folder_confirmation": "Are you sure you want to move these photos and videos out of the locked folder? They will be visible in your library.",
   "remove_from_shared_link": "Remove from shared link",
diff --git a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
index ba93c86109..b150c13359 100644
--- a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
@@ -1,10 +1,51 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class MoveToLockFolderActionButton extends ConsumerWidget {
-  const MoveToLockFolderActionButton({super.key});
+  final ActionSource source;
+
+  const MoveToLockFolderActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).moveToLockFolder(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'move_to_lock_folder_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  void viewerAction(WidgetRef _) {
+    UnimplementedError(
+      "Viewer action for move to locked folder is not implemented yet.",
+    );
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -12,6 +53,7 @@ class MoveToLockFolderActionButton extends ConsumerWidget {
       maxWidth: 100.0,
       iconData: Icons.lock_outline_rounded,
       label: "move_to_locked_folder".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
index 24c84281d4..e17f655f01 100644
--- a/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
@@ -1,10 +1,51 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class RemoveFromLockFolderActionButton extends ConsumerWidget {
-  const RemoveFromLockFolderActionButton({super.key});
+  final ActionSource source;
+
+  const RemoveFromLockFolderActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).removeFromLockFolder(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'remove_from_lock_folder_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  void viewerAction(WidgetRef _) {
+    UnimplementedError(
+      "Viewer action for remove from locked folder is not implemented yet.",
+    );
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -12,6 +53,7 @@ class RemoveFromLockFolderActionButton extends ConsumerWidget {
       maxWidth: 100.0,
       iconData: Icons.lock_open_rounded,
       label: "remove_from_locked_folder".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
index 5c93d37696..8559cc99ad 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
@@ -44,7 +44,9 @@ class HomeBottomAppBar extends ConsumerWidget {
               : const DeletePermanentActionButton(),
           const EditDateTimeActionButton(),
           const EditLocationActionButton(),
-          const MoveToLockFolderActionButton(),
+          const MoveToLockFolderActionButton(
+            source: ActionSource.timeline,
+          ),
           const StackActionButton(),
         ],
         if (multiselect.hasLocal) ...[
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 0b7fcd1469..6b4c675929 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -125,4 +125,34 @@ class ActionNotifier extends Notifier<void> {
       );
     }
   }
+
+  Future<ActionResult> moveToLockFolder(ActionSource source) async {
+    final ids = _getIdsForSource<LocalAsset>(source);
+    try {
+      await _service.moveToLockFolder(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to move assets to lock folder', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult> removeFromLockFolder(ActionSource source) async {
+    final ids = _getIdsForSource<LocalAsset>(source);
+    try {
+      await _service.removeFromLockFolder(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to remove assets from lock folder', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
 }
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index afc4e3f776..3b7c04ea94 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -48,4 +48,26 @@ class ActionService {
       AssetVisibility.timeline,
     );
   }
+
+  Future<void> moveToLockFolder(List<String> remoteIds) async {
+    await _assetApiRepository.updateVisibility(
+      remoteIds,
+      AssetVisibilityEnum.locked,
+    );
+    await _remoteAssetRepository.updateVisibility(
+      remoteIds,
+      AssetVisibility.locked,
+    );
+  }
+
+  Future<void> removeFromLockFolder(List<String> remoteIds) async {
+    await _assetApiRepository.updateVisibility(
+      remoteIds,
+      AssetVisibilityEnum.timeline,
+    );
+    await _remoteAssetRepository.updateVisibility(
+      remoteIds,
+      AssetVisibility.timeline,
+    );
+  }
 }

From f59b0bab5a5e22d33b7cbb0dd87134cbc6015f9f Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 1 Jul 2025 23:18:23 +0800
Subject: [PATCH 110/337] refactor(mobile): action provider (#19669)

* refactor action provider

* fix lint
---
 .../archive_action_button.widget.dart         |  4 --
 .../favorite_action_button.widget.dart        |  4 --
 ...e_to_lock_folder_action_button.widget.dart |  6 ---
 ...from_lock_folder_action_button.widget.dart |  6 ---
 .../share_link_action_button.widget.dart      | 48 +++++++++----------
 .../infrastructure/action.provider.dart       | 23 ++++++++-
 mobile/lib/services/action.service.dart       | 11 +++++
 7 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
index 5ec88231ca..d1d0695a99 100644
--- a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
@@ -40,10 +40,6 @@ class ArchiveActionButton extends ConsumerWidget {
     }
   }
 
-  void viewerAction(WidgetRef _) {
-    UnimplementedError("Viewer action for archive is not implemented yet.");
-  }
-
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
diff --git a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
index dbe43d2f17..50d13e6b4e 100644
--- a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
@@ -40,10 +40,6 @@ class FavoriteActionButton extends ConsumerWidget {
     }
   }
 
-  void viewerAction(WidgetRef _) {
-    UnimplementedError("Viewer action for favorite is not implemented yet.");
-  }
-
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
diff --git a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
index b150c13359..503dd34403 100644
--- a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
@@ -41,12 +41,6 @@ class MoveToLockFolderActionButton extends ConsumerWidget {
     }
   }
 
-  void viewerAction(WidgetRef _) {
-    UnimplementedError(
-      "Viewer action for move to locked folder is not implemented yet.",
-    );
-  }
-
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
diff --git a/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
index e17f655f01..32857f300e 100644
--- a/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
@@ -41,12 +41,6 @@ class RemoveFromLockFolderActionButton extends ConsumerWidget {
     }
   }
 
-  void viewerAction(WidgetRef _) {
-    UnimplementedError(
-      "Viewer action for remove from locked folder is not implemented yet.",
-    );
-  }
-
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
diff --git a/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
index 8b82b1c54e..d23dd377c4 100644
--- a/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
@@ -1,44 +1,42 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class ShareLinkActionButton extends ConsumerWidget {
   final ActionSource source;
 
   const ShareLinkActionButton({super.key, required this.source});
 
-  onAction(BuildContext context, WidgetRef ref) {
-    switch (source) {
-      case ActionSource.timeline:
-        timelineAction(context, ref);
-      case ActionSource.viewer:
-        viewerAction(ref);
+  _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
     }
-  }
 
-  void timelineAction(BuildContext context, WidgetRef ref) {
-    final ids = ref
-        .read(multiSelectProvider.select((value) => value.selectedAssets))
-        .whereType<RemoteAsset>()
-        .toList()
-        .map((asset) => asset.id)
-        .toList();
+    final result =
+        await ref.read(actionProvider.notifier).shareLink(source, context);
+    ref.read(multiSelectProvider.notifier).reset();
 
-    context.pushRoute(
-      SharedLinkEditRoute(
-        assetsList: ids,
-      ),
+    final successMessage = 'share_link_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
     );
-  }
 
-  void viewerAction(WidgetRef _) {
-    UnimplementedError("Viewer action for favorite is not implemented yet.");
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
   }
 
   @override
@@ -46,7 +44,7 @@ class ShareLinkActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.link_rounded,
       label: "share_link".t(context: context),
-      onPressed: () => onAction(context, ref),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 6b4c675929..e18a2aeb1b 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
@@ -66,6 +67,24 @@ class ActionNotifier extends Notifier<void> {
     };
   }
 
+  Future<ActionResult> shareLink(
+    ActionSource source,
+    BuildContext context,
+  ) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      await _service.shareLink(ids, context);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to create shared link for assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
   Future<ActionResult> favorite(ActionSource source) async {
     final ids = _getIdsForSource<RemoteAsset>(source);
     try {
@@ -127,7 +146,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> moveToLockFolder(ActionSource source) async {
-    final ids = _getIdsForSource<LocalAsset>(source);
+    final ids = _getIdsForSource<RemoteAsset>(source);
     try {
       await _service.moveToLockFolder(ids);
       return ActionResult(count: ids.length, success: true);
@@ -142,7 +161,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> removeFromLockFolder(ActionSource source) async {
-    final ids = _getIdsForSource<LocalAsset>(source);
+    final ids = _getIdsForSource<RemoteAsset>(source);
     try {
       await _service.removeFromLockFolder(ids);
       return ActionResult(count: ids.length, success: true);
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index 3b7c04ea94..df059405ed 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -1,7 +1,10 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 final actionServiceProvider = Provider<ActionService>(
@@ -17,6 +20,14 @@ class ActionService {
 
   const ActionService(this._assetApiRepository, this._remoteAssetRepository);
 
+  Future<void> shareLink(List<String> remoteIds, BuildContext context) async {
+    context.pushRoute(
+      SharedLinkEditRoute(
+        assetsList: remoteIds,
+      ),
+    );
+  }
+
   Future<void> favorite(List<String> remoteIds) async {
     await _assetApiRepository.updateFavorite(remoteIds, true);
     await _remoteAssetRepository.updateFavorite(remoteIds, true);

From 15be3437bf8e889589331a09938e3b477d0394a0 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Tue, 1 Jul 2025 20:53:20 +0530
Subject: [PATCH 111/337] fix: timeline service uninitialised across routes
 (#19544)

---
 mobile/lib/pages/common/tab_shell.page.dart   |   9 +-
 .../pages/dev/local_timeline.page.dart        |   4 +-
 .../pages/dev/main_timeline.page.dart         |  22 +--
 .../pages/dev/remote_timeline.page.dart       |   4 +-
 .../home_bottom_app_bar.widget.dart           |   3 +-
 .../widgets/timeline/timeline.widget.dart     | 164 ++++++++----------
 .../infrastructure/action.provider.dart       |   8 +-
 .../infrastructure/timeline.provider.dart     |  14 +-
 .../timeline/multiselect.provider.dart        |   6 +-
 9 files changed, 95 insertions(+), 139 deletions(-)

diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index aa5b695999..31ccb12392 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -4,11 +4,11 @@ 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/providers/asset_viewer/scroll_notifier.provider.dart';
-import 'package:immich_mobile/providers/multiselect.provider.dart';
-import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/providers/haptic_feedback.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';
+import 'package:immich_mobile/routing/router.dart';
 
 @RoutePage()
 class TabShellPage extends ConsumerWidget {
@@ -138,7 +138,8 @@ class TabShellPage extends ConsumerWidget {
       );
     }
 
-    final multiselectEnabled = ref.watch(multiselectProvider);
+    final multiselectEnabled =
+        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
     return AutoTabsRouter(
       routes: [
         const MainTimelineRoute(),
diff --git a/mobile/lib/presentation/pages/dev/local_timeline.page.dart b/mobile/lib/presentation/pages/dev/local_timeline.page.dart
index 8c06a6b62a..3a98a81e9e 100644
--- a/mobile/lib/presentation/pages/dev/local_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/local_timeline.page.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -20,7 +18,7 @@ class LocalTimelinePage extends StatelessWidget {
           (ref) {
             final timelineService =
                 ref.watch(timelineFactoryProvider).localAlbum(albumId: albumId);
-            ref.onDispose(() => unawaited(timelineService.dispose()));
+            ref.onDispose(timelineService.dispose);
             return timelineService;
           },
         ),
diff --git a/mobile/lib/presentation/pages/dev/main_timeline.page.dart b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
index cb2fdacf39..090db4f6ba 100644
--- a/mobile/lib/presentation/pages/dev/main_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
@@ -1,10 +1,7 @@
-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/presentation/widgets/timeline/timeline.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 
 @RoutePage()
 class MainTimelinePage extends ConsumerWidget {
@@ -12,23 +9,6 @@ class MainTimelinePage extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return ProviderScope(
-      key: ref.watch(timelineUsersProvider).value != null
-          ? ValueKey(ref.watch(timelineUsersProvider).value)
-          : const ValueKey("main-timeline"),
-      overrides: [
-        timelineServiceProvider.overrideWith(
-          (ref) {
-            final timelineUsers =
-                ref.watch(timelineUsersProvider).valueOrNull ?? [];
-            final timelineService =
-                ref.watch(timelineFactoryProvider).main(timelineUsers);
-            ref.onDispose(() => unawaited(timelineService.dispose()));
-            return timelineService;
-          },
-        ),
-      ],
-      child: const Timeline(),
-    );
+    return const Timeline();
   }
 }
diff --git a/mobile/lib/presentation/pages/dev/remote_timeline.page.dart b/mobile/lib/presentation/pages/dev/remote_timeline.page.dart
index 4965359ad5..6568f0f74f 100644
--- a/mobile/lib/presentation/pages/dev/remote_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/remote_timeline.page.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -21,7 +19,7 @@ class RemoteTimelinePage extends StatelessWidget {
             final timelineService = ref
                 .watch(timelineFactoryProvider)
                 .remoteAlbum(albumId: albumId);
-            ref.onDispose(() => unawaited(timelineService.dispose()));
+            ref.onDispose(timelineService.dispose);
             return timelineService;
           },
         ),
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
index 8559cc99ad..4e55dbb3db 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
@@ -30,8 +30,7 @@ class HomeBottomAppBar extends ConsumerWidget {
 
     return BaseBottomSheet(
       initialChildSize: 0.25,
-      minChildSize: 0.22,
-      expand: false,
+      shouldCloseOnMinExtent: false,
       actions: [
         if (multiselect.isEnabled) const ShareActionButton(),
         if (multiselect.hasRemote) ...[
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 59c4c46135..fd0806cff0 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -43,26 +43,15 @@ class Timeline extends StatelessWidget {
   }
 }
 
-class _SliverTimeline extends ConsumerStatefulWidget {
+class _SliverTimeline extends StatefulWidget {
   const _SliverTimeline();
 
   @override
-  ConsumerState createState() => _SliverTimelineState();
+  State createState() => _SliverTimelineState();
 }
 
-class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
+class _SliverTimelineState extends State<_SliverTimeline> {
   final _scrollController = ScrollController();
-  PersistentBottomSheetController? _bottomSheetController;
-  bool _isMultiSelectEnabled = false;
-
-  @override
-  void initState() {
-    super.initState();
-    ref.listenManual(
-      multiSelectProvider.select((s) => s.isEnabled),
-      _onMultiSelectChanged,
-    );
-  }
 
   @override
   void dispose() {
@@ -70,93 +59,80 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
     super.dispose();
   }
 
-  void _onMultiSelectChanged(bool? previous, bool current) {
-    if (context.mounted && current != _isMultiSelectEnabled) {
-      setState(() {
-        _isMultiSelectEnabled = current;
-        if (current) {
-          _bottomSheetController = showBottomSheet(
-            context: context,
-            builder: (_) => const HomeBottomAppBar(),
-          );
-          _bottomSheetController?.closed.then((_) {
-            _bottomSheetController = null;
-            // Reset the multi-select state when the bottom sheet is closed
-            ref.read(multiSelectProvider.notifier).reset();
-          });
-        } else {
-          _bottomSheetController?.close();
-        }
-      });
-    }
-  }
-
   @override
   Widget build(BuildContext _) {
-    final asyncSegments = ref.watch(timelineSegmentProvider);
-    final maxHeight =
-        ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
+    return Consumer(
+      builder: (context, ref, child) {
+        final asyncSegments = ref.watch(timelineSegmentProvider);
+        final maxHeight =
+            ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
+        final isMultiSelectEnabled =
+            ref.watch(multiSelectProvider.select((s) => s.isEnabled));
+        return asyncSegments.widgetWhen(
+          onData: (segments) {
+            final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
+            final statusBarHeight = context.padding.top;
+            final totalAppBarHeight = statusBarHeight + kToolbarHeight;
+            const scrubberBottomPadding = 100.0;
 
-    return asyncSegments.widgetWhen(
-      onData: (segments) {
-        final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
-        final statusBarHeight = context.padding.top;
-        final totalAppBarHeight = statusBarHeight + kToolbarHeight;
-        const scrubberBottomPadding = 100.0;
-
-        return PrimaryScrollController(
-          controller: _scrollController,
-          child: Stack(
-            children: [
-              Scrubber(
-                layoutSegments: segments,
-                timelineHeight: maxHeight,
-                topPadding: totalAppBarHeight + 10,
-                bottomPadding: context.padding.bottom + scrubberBottomPadding,
-                child: CustomScrollView(
-                  primary: true,
-                  cacheExtent: maxHeight * 2,
-                  slivers: [
-                    SliverAnimatedOpacity(
-                      duration: Durations.medium1,
-                      opacity: _isMultiSelectEnabled ? 0 : 1,
-                      sliver: const ImmichSliverAppBar(
-                        floating: true,
-                        pinned: false,
-                        snap: false,
-                      ),
+            return PrimaryScrollController(
+              controller: _scrollController,
+              child: Stack(
+                children: [
+                  Scrubber(
+                    layoutSegments: segments,
+                    timelineHeight: maxHeight,
+                    topPadding: totalAppBarHeight + 10,
+                    bottomPadding:
+                        context.padding.bottom + scrubberBottomPadding,
+                    child: CustomScrollView(
+                      primary: true,
+                      cacheExtent: maxHeight * 2,
+                      slivers: [
+                        SliverAnimatedOpacity(
+                          duration: Durations.medium1,
+                          opacity: isMultiSelectEnabled ? 0 : 1,
+                          sliver: const ImmichSliverAppBar(
+                            floating: true,
+                            pinned: false,
+                            snap: false,
+                          ),
+                        ),
+                        _SliverSegmentedList(
+                          segments: segments,
+                          delegate: SliverChildBuilderDelegate(
+                            (ctx, index) {
+                              if (index >= childCount) return null;
+                              final segment = segments.findByIndex(index);
+                              return segment?.builder(ctx, index) ??
+                                  const SizedBox.shrink();
+                            },
+                            childCount: childCount,
+                            addAutomaticKeepAlives: false,
+                            // We add repaint boundary around tiles, so skip the auto boundaries
+                            addRepaintBoundaries: false,
+                          ),
+                        ),
+                        const SliverPadding(
+                          padding: EdgeInsets.only(
+                            bottom: scrubberBottomPadding,
+                          ),
+                        ),
+                      ],
                     ),
-                    _SliverSegmentedList(
-                      segments: segments,
-                      delegate: SliverChildBuilderDelegate(
-                        (ctx, index) {
-                          if (index >= childCount) return null;
-                          final segment = segments.findByIndex(index);
-                          return segment?.builder(ctx, index) ??
-                              const SizedBox.shrink();
-                        },
-                        childCount: childCount,
-                        addAutomaticKeepAlives: false,
-                        // We add repaint boundary around tiles, so skip the auto boundaries
-                        addRepaintBoundaries: false,
-                      ),
-                    ),
-                    const SliverPadding(
-                      padding: EdgeInsets.only(
-                        bottom: scrubberBottomPadding,
-                      ),
+                  ),
+                  if (isMultiSelectEnabled) ...[
+                    const Positioned(
+                      top: 60,
+                      left: 25,
+                      child: _MultiSelectStatusButton(),
                     ),
+                    const HomeBottomAppBar(),
                   ],
-                ),
+                ],
               ),
-              if (_isMultiSelectEnabled)
-                const Positioned(
-                  top: 60,
-                  left: 25,
-                  child: _MultiSelectStatusButton(),
-                ),
-            ],
-          ),
+            );
+          },
         );
       },
     );
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index e18a2aeb1b..5d0db7b382 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -1,20 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-import 'package:immich_mobile/providers/multiselect.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/action.service.dart';
+import 'package:immich_mobile/services/timeline.service.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 final actionProvider = NotifierProvider<ActionNotifier, void>(
   ActionNotifier.new,
   dependencies: [
-    actionServiceProvider,
+    multiSelectProvider,
     timelineServiceProvider,
-    multiselectProvider,
   ],
 );
 
@@ -32,7 +30,7 @@ class ActionResult {
 
 class ActionNotifier extends Notifier<void> {
   final Logger _logger = Logger('ActionNotifier');
-  late final ActionService _service;
+  late ActionService _service;
 
   ActionNotifier() : super();
 
diff --git a/mobile/lib/providers/infrastructure/timeline.provider.dart b/mobile/lib/providers/infrastructure/timeline.provider.dart
index 0bf8b1b143..bbc04349de 100644
--- a/mobile/lib/providers/infrastructure/timeline.provider.dart
+++ b/mobile/lib/providers/infrastructure/timeline.provider.dart
@@ -15,9 +15,17 @@ final timelineArgsProvider = Provider.autoDispose<TimelineArgs>(
       throw UnimplementedError('Will be overridden through a ProviderScope.'),
 );
 
-final timelineServiceProvider = Provider.autoDispose<TimelineService>(
-  (ref) =>
-      throw UnimplementedError('Will be overridden through a ProviderScope.'),
+final timelineServiceProvider = Provider<TimelineService>(
+  (ref) {
+    final timelineUsers = ref.watch(timelineUsersProvider).valueOrNull ?? [];
+    final timelineService =
+        ref.watch(timelineFactoryProvider).main(timelineUsers);
+    ref.onDispose(timelineService.dispose);
+    return timelineService;
+  },
+  // Empty dependencies to inform the framework that this provider
+  // might be used in a ProviderScope
+  dependencies: [],
 );
 
 final timelineFactoryProvider = Provider<TimelineFactory>(
diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dart
index 2f2d76c68c..2b24a272bf 100644
--- a/mobile/lib/providers/timeline/multiselect.provider.dart
+++ b/mobile/lib/providers/timeline/multiselect.provider.dart
@@ -47,12 +47,10 @@ class MultiSelectState {
 }
 
 class MultiSelectNotifier extends Notifier<MultiSelectState> {
-  late final TimelineService _timelineService;
+  TimelineService get _timelineService => ref.read(timelineServiceProvider);
 
   @override
   MultiSelectState build() {
-    _timelineService = ref.read(timelineServiceProvider);
-
     return const MultiSelectState(selectedAssets: {});
   }
 
@@ -145,5 +143,5 @@ final bucketSelectionProvider = Provider.family<bool, List<BaseAsset>>(
     // Check if all assets in the bucket are selected
     return bucketAssets.every((asset) => selectedAssets.contains(asset));
   },
-  dependencies: [multiSelectProvider],
+  dependencies: [multiSelectProvider, timelineServiceProvider],
 );

From 639ede78c208311d6d0ef5398ab8339940e2dda9 Mon Sep 17 00:00:00 2001
From: Ramon Smits <ramon.smits@gmail.com>
Date: Tue, 1 Jul 2025 18:13:24 +0200
Subject: [PATCH 112/337] docs: document `DB_STORAGE_TYPE` environment variable
 (#19609)

Co-authored-by: Zack Pollard <github@zackpollard.uk>
---
 docs/docs/install/environment-variables.md | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/docs/docs/install/environment-variables.md b/docs/docs/install/environment-variables.md
index d3ca49a0a4..b9dab5b9c8 100644
--- a/docs/docs/install/environment-variables.md
+++ b/docs/docs/install/environment-variables.md
@@ -72,22 +72,25 @@ Information on the current workers can be found [here](/docs/administration/jobs
 
 ## Database
 
-| Variable                            | Description                                                                  |  Default   | Containers                     |
-| :---------------------------------- | :--------------------------------------------------------------------------- | :--------: | :----------------------------- |
-| `DB_URL`                            | Database URL                                                                 |            | server                         |
-| `DB_HOSTNAME`                       | Database host                                                                | `database` | server                         |
-| `DB_PORT`                           | Database port                                                                |   `5432`   | server                         |
-| `DB_USERNAME`                       | Database user                                                                | `postgres` | server, database<sup>\*1</sup> |
-| `DB_PASSWORD`                       | Database password                                                            | `postgres` | server, database<sup>\*1</sup> |
-| `DB_DATABASE_NAME`                  | Database name                                                                |  `immich`  | server, database<sup>\*1</sup> |
-| `DB_SSL_MODE`                       | Database SSL mode                                                            |            | server                         |
-| `DB_VECTOR_EXTENSION`<sup>\*2</sup> | Database vector extension (one of [`vectorchord`, `pgvector`, `pgvecto.rs`]) |            | server                         |
-| `DB_SKIP_MIGRATIONS`                | Whether to skip running migrations on startup (one of [`true`, `false`])     |  `false`   | server                         |
+| Variable                            | Description                                                                            |  Default   | Containers                     |
+| :---------------------------------- | :------------------------------------------------------------------------------------- | :--------: | :----------------------------- |
+| `DB_URL`                            | Database URL                                                                           |            | server                         |
+| `DB_HOSTNAME`                       | Database host                                                                          | `database` | server                         |
+| `DB_PORT`                           | Database port                                                                          |   `5432`   | server                         |
+| `DB_USERNAME`                       | Database user                                                                          | `postgres` | server, database<sup>\*1</sup> |
+| `DB_PASSWORD`                       | Database password                                                                      | `postgres` | server, database<sup>\*1</sup> |
+| `DB_DATABASE_NAME`                  | Database name                                                                          |  `immich`  | server, database<sup>\*1</sup> |
+| `DB_SSL_MODE`                       | Database SSL mode                                                                      |            | server                         |
+| `DB_VECTOR_EXTENSION`<sup>\*2</sup> | Database vector extension (one of [`vectorchord`, `pgvector`, `pgvecto.rs`])           |            | server                         |
+| `DB_SKIP_MIGRATIONS`                | Whether to skip running migrations on startup (one of [`true`, `false`])               |  `false`   | server                         |
+| `DB_STORAGE_TYPE`                   | Optimize concurrent IO on SSDs or sequential IO on HDDs ([`SSD`, `HDD`])<sup>\*3</sup> |   `SSD`    | server                         |
 
 \*1: The values of `DB_USERNAME`, `DB_PASSWORD`, and `DB_DATABASE_NAME` are passed to the Postgres container as the variables `POSTGRES_USER`, `POSTGRES_PASSWORD`, and `POSTGRES_DB` in `docker-compose.yml`.
 
 \*2: If not provided, the appropriate extension to use is auto-detected at startup by introspecting the database. When multiple extensions are installed, the order of preference is VectorChord, pgvecto.rs, pgvector.
 
+\*3: Uses either [`postgresql.ssd.conf`](https://github.com/immich-app/base-images/blob/main/postgres/postgresql.ssd.conf) or [`postgresql.hdd.conf`](https://github.com/immich-app/base-images/blob/main/postgres/postgresql.hdd.conf) which mainly controls the Postgres `effective_io_concurrency` setting to allow for concurrenct IO on SSDs and sequential IO on HDDs.
+
 :::info
 
 All `DB_` variables must be provided to all Immich workers, including `api` and `microservices`.

From 83afd49f5c3a11f0845a4361815471e86dfe3e13 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Wed, 2 Jul 2025 00:52:11 +0800
Subject: [PATCH 113/337] feat(mobile): edit location action (#19645)

* change dto from integer to double

* feat(mobile): edit location action

* patch openapi

* refactor in provider

* fix lint

* chore: not showing success prompt if dimissed

* i18n

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 i18n/en.json                                  |   1 +
 .../drift_schemas/main/drift_schema_v1.json   |   2 +-
 .../infrastructure/entities/exif.entity.dart  |   8 +-
 .../entities/exif.entity.drift.dart           | 154 +++++++++---------
 .../repositories/exif.repository.dart         |  35 ++++
 .../repositories/remote_asset.repository.dart |  27 ++-
 .../edit_location_action_button.widget.dart   |  40 ++++-
 .../home_bottom_app_bar.widget.dart           |   2 +-
 .../infrastructure/action.provider.dart       |  22 +++
 .../infrastructure/asset.provider.dart        |   5 +
 .../infrastructure/exif.provider.dart         |   4 +
 .../repositories/asset_api.repository.dart    |  14 ++
 mobile/lib/services/action.service.dart       |  51 +++++-
 .../openapi/lib/model/sync_asset_exif_v1.dart |  20 +--
 open-api/immich-openapi-specs.json            |  15 +-
 .../native/native_class.mustache              |   2 +-
 .../native/native_class.mustache.patch        |   6 +-
 server/src/dtos/sync.dto.ts                   |  10 +-
 18 files changed, 299 insertions(+), 119 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 3bd31638ec..d81a6270ad 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -799,6 +799,7 @@
   "edit_key": "Edit key",
   "edit_link": "Edit link",
   "edit_location": "Edit location",
+  "edit_location_action_prompt": "{count} location edited",
   "edit_location_dialog_title": "Location",
   "edit_name": "Edit name",
   "edit_people": "Edit people",
diff --git a/mobile/drift_schemas/main/drift_schema_v1.json b/mobile/drift_schemas/main/drift_schema_v1.json
index 3663d35b56..096128e526 100644
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
@@ -1 +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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":"int","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":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"latitude","getter_name":"latitude","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"longitude","getter_name":"longitude","moor_type":"int","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":"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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"]}}]}
\ No newline at end of file
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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"]}}]}
\ No newline at end of file
diff --git a/mobile/lib/infrastructure/entities/exif.entity.dart b/mobile/lib/infrastructure/entities/exif.entity.dart
index 11730b7761..c78643d89b 100644
--- a/mobile/lib/infrastructure/entities/exif.entity.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.dart
@@ -116,15 +116,15 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {
 
   TextColumn get exposureTime => text().nullable()();
 
-  IntColumn get fNumber => integer().nullable()();
+  RealColumn get fNumber => real().nullable()();
 
   IntColumn get fileSize => integer().nullable()();
 
-  IntColumn get focalLength => integer().nullable()();
+  RealColumn get focalLength => real().nullable()();
 
-  IntColumn get latitude => integer().nullable()();
+  RealColumn get latitude => real().nullable()();
 
-  IntColumn get longitude => integer().nullable()();
+  RealColumn get longitude => real().nullable()();
 
   IntColumn get iso => integer().nullable()();
 
diff --git a/mobile/lib/infrastructure/entities/exif.entity.drift.dart b/mobile/lib/infrastructure/entities/exif.entity.drift.dart
index 10025d9cb8..a8fd3a4477 100644
--- a/mobile/lib/infrastructure/entities/exif.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.drift.dart
@@ -19,11 +19,11 @@ typedef $$RemoteExifEntityTableCreateCompanionBuilder
   i0.Value<int?> height,
   i0.Value<int?> width,
   i0.Value<String?> exposureTime,
-  i0.Value<int?> fNumber,
+  i0.Value<double?> fNumber,
   i0.Value<int?> fileSize,
-  i0.Value<int?> focalLength,
-  i0.Value<int?> latitude,
-  i0.Value<int?> longitude,
+  i0.Value<double?> focalLength,
+  i0.Value<double?> latitude,
+  i0.Value<double?> longitude,
   i0.Value<int?> iso,
   i0.Value<String?> make,
   i0.Value<String?> model,
@@ -43,11 +43,11 @@ typedef $$RemoteExifEntityTableUpdateCompanionBuilder
   i0.Value<int?> height,
   i0.Value<int?> width,
   i0.Value<String?> exposureTime,
-  i0.Value<int?> fNumber,
+  i0.Value<double?> fNumber,
   i0.Value<int?> fileSize,
-  i0.Value<int?> focalLength,
-  i0.Value<int?> latitude,
-  i0.Value<int?> longitude,
+  i0.Value<double?> focalLength,
+  i0.Value<double?> latitude,
+  i0.Value<double?> longitude,
   i0.Value<int?> iso,
   i0.Value<String?> make,
   i0.Value<String?> model,
@@ -125,20 +125,20 @@ class $$RemoteExifEntityTableFilterComposer
       column: $table.exposureTime,
       builder: (column) => i0.ColumnFilters(column));
 
-  i0.ColumnFilters<int> get fNumber => $composableBuilder(
+  i0.ColumnFilters<double> get fNumber => $composableBuilder(
       column: $table.fNumber, builder: (column) => i0.ColumnFilters(column));
 
   i0.ColumnFilters<int> get fileSize => $composableBuilder(
       column: $table.fileSize, builder: (column) => i0.ColumnFilters(column));
 
-  i0.ColumnFilters<int> get focalLength => $composableBuilder(
+  i0.ColumnFilters<double> get focalLength => $composableBuilder(
       column: $table.focalLength,
       builder: (column) => i0.ColumnFilters(column));
 
-  i0.ColumnFilters<int> get latitude => $composableBuilder(
+  i0.ColumnFilters<double> get latitude => $composableBuilder(
       column: $table.latitude, builder: (column) => i0.ColumnFilters(column));
 
-  i0.ColumnFilters<int> get longitude => $composableBuilder(
+  i0.ColumnFilters<double> get longitude => $composableBuilder(
       column: $table.longitude, builder: (column) => i0.ColumnFilters(column));
 
   i0.ColumnFilters<int> get iso => $composableBuilder(
@@ -223,20 +223,20 @@ class $$RemoteExifEntityTableOrderingComposer
       column: $table.exposureTime,
       builder: (column) => i0.ColumnOrderings(column));
 
-  i0.ColumnOrderings<int> get fNumber => $composableBuilder(
+  i0.ColumnOrderings<double> get fNumber => $composableBuilder(
       column: $table.fNumber, builder: (column) => i0.ColumnOrderings(column));
 
   i0.ColumnOrderings<int> get fileSize => $composableBuilder(
       column: $table.fileSize, builder: (column) => i0.ColumnOrderings(column));
 
-  i0.ColumnOrderings<int> get focalLength => $composableBuilder(
+  i0.ColumnOrderings<double> get focalLength => $composableBuilder(
       column: $table.focalLength,
       builder: (column) => i0.ColumnOrderings(column));
 
-  i0.ColumnOrderings<int> get latitude => $composableBuilder(
+  i0.ColumnOrderings<double> get latitude => $composableBuilder(
       column: $table.latitude, builder: (column) => i0.ColumnOrderings(column));
 
-  i0.ColumnOrderings<int> get longitude => $composableBuilder(
+  i0.ColumnOrderings<double> get longitude => $composableBuilder(
       column: $table.longitude,
       builder: (column) => i0.ColumnOrderings(column));
 
@@ -321,19 +321,19 @@ class $$RemoteExifEntityTableAnnotationComposer
   i0.GeneratedColumn<String> get exposureTime => $composableBuilder(
       column: $table.exposureTime, builder: (column) => column);
 
-  i0.GeneratedColumn<int> get fNumber =>
+  i0.GeneratedColumn<double> get fNumber =>
       $composableBuilder(column: $table.fNumber, builder: (column) => column);
 
   i0.GeneratedColumn<int> get fileSize =>
       $composableBuilder(column: $table.fileSize, builder: (column) => column);
 
-  i0.GeneratedColumn<int> get focalLength => $composableBuilder(
+  i0.GeneratedColumn<double> get focalLength => $composableBuilder(
       column: $table.focalLength, builder: (column) => column);
 
-  i0.GeneratedColumn<int> get latitude =>
+  i0.GeneratedColumn<double> get latitude =>
       $composableBuilder(column: $table.latitude, builder: (column) => column);
 
-  i0.GeneratedColumn<int> get longitude =>
+  i0.GeneratedColumn<double> get longitude =>
       $composableBuilder(column: $table.longitude, builder: (column) => column);
 
   i0.GeneratedColumn<int> get iso =>
@@ -416,11 +416,11 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             i0.Value<int?> height = const i0.Value.absent(),
             i0.Value<int?> width = const i0.Value.absent(),
             i0.Value<String?> exposureTime = const i0.Value.absent(),
-            i0.Value<int?> fNumber = const i0.Value.absent(),
+            i0.Value<double?> fNumber = const i0.Value.absent(),
             i0.Value<int?> fileSize = const i0.Value.absent(),
-            i0.Value<int?> focalLength = const i0.Value.absent(),
-            i0.Value<int?> latitude = const i0.Value.absent(),
-            i0.Value<int?> longitude = const i0.Value.absent(),
+            i0.Value<double?> focalLength = const i0.Value.absent(),
+            i0.Value<double?> latitude = const i0.Value.absent(),
+            i0.Value<double?> longitude = const i0.Value.absent(),
             i0.Value<int?> iso = const i0.Value.absent(),
             i0.Value<String?> make = const i0.Value.absent(),
             i0.Value<String?> model = const i0.Value.absent(),
@@ -462,11 +462,11 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             i0.Value<int?> height = const i0.Value.absent(),
             i0.Value<int?> width = const i0.Value.absent(),
             i0.Value<String?> exposureTime = const i0.Value.absent(),
-            i0.Value<int?> fNumber = const i0.Value.absent(),
+            i0.Value<double?> fNumber = const i0.Value.absent(),
             i0.Value<int?> fileSize = const i0.Value.absent(),
-            i0.Value<int?> focalLength = const i0.Value.absent(),
-            i0.Value<int?> latitude = const i0.Value.absent(),
-            i0.Value<int?> longitude = const i0.Value.absent(),
+            i0.Value<double?> focalLength = const i0.Value.absent(),
+            i0.Value<double?> latitude = const i0.Value.absent(),
+            i0.Value<double?> longitude = const i0.Value.absent(),
             i0.Value<int?> iso = const i0.Value.absent(),
             i0.Value<String?> make = const i0.Value.absent(),
             i0.Value<String?> model = const i0.Value.absent(),
@@ -622,9 +622,9 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
   static const i0.VerificationMeta _fNumberMeta =
       const i0.VerificationMeta('fNumber');
   @override
-  late final i0.GeneratedColumn<int> fNumber = i0.GeneratedColumn<int>(
+  late final i0.GeneratedColumn<double> fNumber = i0.GeneratedColumn<double>(
       'f_number', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+      type: i0.DriftSqlType.double, requiredDuringInsert: false);
   static const i0.VerificationMeta _fileSizeMeta =
       const i0.VerificationMeta('fileSize');
   @override
@@ -634,21 +634,21 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
   static const i0.VerificationMeta _focalLengthMeta =
       const i0.VerificationMeta('focalLength');
   @override
-  late final i0.GeneratedColumn<int> focalLength = i0.GeneratedColumn<int>(
-      'focal_length', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+  late final i0.GeneratedColumn<double> focalLength =
+      i0.GeneratedColumn<double>('focal_length', aliasedName, true,
+          type: i0.DriftSqlType.double, requiredDuringInsert: false);
   static const i0.VerificationMeta _latitudeMeta =
       const i0.VerificationMeta('latitude');
   @override
-  late final i0.GeneratedColumn<int> latitude = i0.GeneratedColumn<int>(
+  late final i0.GeneratedColumn<double> latitude = i0.GeneratedColumn<double>(
       'latitude', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+      type: i0.DriftSqlType.double, requiredDuringInsert: false);
   static const i0.VerificationMeta _longitudeMeta =
       const i0.VerificationMeta('longitude');
   @override
-  late final i0.GeneratedColumn<int> longitude = i0.GeneratedColumn<int>(
+  late final i0.GeneratedColumn<double> longitude = i0.GeneratedColumn<double>(
       'longitude', aliasedName, true,
-      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+      type: i0.DriftSqlType.double, requiredDuringInsert: false);
   static const i0.VerificationMeta _isoMeta = const i0.VerificationMeta('iso');
   @override
   late final i0.GeneratedColumn<int> iso = i0.GeneratedColumn<int>(
@@ -853,15 +853,15 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
       exposureTime: attachedDatabase.typeMapping.read(
           i0.DriftSqlType.string, data['${effectivePrefix}exposure_time']),
       fNumber: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}f_number']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}f_number']),
       fileSize: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.int, data['${effectivePrefix}file_size']),
       focalLength: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}focal_length']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}focal_length']),
       latitude: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}latitude']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}latitude']),
       longitude: attachedDatabase.typeMapping
-          .read(i0.DriftSqlType.int, data['${effectivePrefix}longitude']),
+          .read(i0.DriftSqlType.double, data['${effectivePrefix}longitude']),
       iso: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.int, data['${effectivePrefix}iso']),
       make: attachedDatabase.typeMapping
@@ -901,11 +901,11 @@ class RemoteExifEntityData extends i0.DataClass
   final int? height;
   final int? width;
   final String? exposureTime;
-  final int? fNumber;
+  final double? fNumber;
   final int? fileSize;
-  final int? focalLength;
-  final int? latitude;
-  final int? longitude;
+  final double? focalLength;
+  final double? latitude;
+  final double? longitude;
   final int? iso;
   final String? make;
   final String? model;
@@ -964,19 +964,19 @@ class RemoteExifEntityData extends i0.DataClass
       map['exposure_time'] = i0.Variable<String>(exposureTime);
     }
     if (!nullToAbsent || fNumber != null) {
-      map['f_number'] = i0.Variable<int>(fNumber);
+      map['f_number'] = i0.Variable<double>(fNumber);
     }
     if (!nullToAbsent || fileSize != null) {
       map['file_size'] = i0.Variable<int>(fileSize);
     }
     if (!nullToAbsent || focalLength != null) {
-      map['focal_length'] = i0.Variable<int>(focalLength);
+      map['focal_length'] = i0.Variable<double>(focalLength);
     }
     if (!nullToAbsent || latitude != null) {
-      map['latitude'] = i0.Variable<int>(latitude);
+      map['latitude'] = i0.Variable<double>(latitude);
     }
     if (!nullToAbsent || longitude != null) {
-      map['longitude'] = i0.Variable<int>(longitude);
+      map['longitude'] = i0.Variable<double>(longitude);
     }
     if (!nullToAbsent || iso != null) {
       map['iso'] = i0.Variable<int>(iso);
@@ -1016,11 +1016,11 @@ class RemoteExifEntityData extends i0.DataClass
       height: serializer.fromJson<int?>(json['height']),
       width: serializer.fromJson<int?>(json['width']),
       exposureTime: serializer.fromJson<String?>(json['exposureTime']),
-      fNumber: serializer.fromJson<int?>(json['fNumber']),
+      fNumber: serializer.fromJson<double?>(json['fNumber']),
       fileSize: serializer.fromJson<int?>(json['fileSize']),
-      focalLength: serializer.fromJson<int?>(json['focalLength']),
-      latitude: serializer.fromJson<int?>(json['latitude']),
-      longitude: serializer.fromJson<int?>(json['longitude']),
+      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']),
@@ -1043,11 +1043,11 @@ class RemoteExifEntityData extends i0.DataClass
       'height': serializer.toJson<int?>(height),
       'width': serializer.toJson<int?>(width),
       'exposureTime': serializer.toJson<String?>(exposureTime),
-      'fNumber': serializer.toJson<int?>(fNumber),
+      'fNumber': serializer.toJson<double?>(fNumber),
       'fileSize': serializer.toJson<int?>(fileSize),
-      'focalLength': serializer.toJson<int?>(focalLength),
-      'latitude': serializer.toJson<int?>(latitude),
-      'longitude': serializer.toJson<int?>(longitude),
+      '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),
@@ -1068,11 +1068,11 @@ class RemoteExifEntityData extends i0.DataClass
           i0.Value<int?> height = const i0.Value.absent(),
           i0.Value<int?> width = const i0.Value.absent(),
           i0.Value<String?> exposureTime = const i0.Value.absent(),
-          i0.Value<int?> fNumber = const i0.Value.absent(),
+          i0.Value<double?> fNumber = const i0.Value.absent(),
           i0.Value<int?> fileSize = const i0.Value.absent(),
-          i0.Value<int?> focalLength = const i0.Value.absent(),
-          i0.Value<int?> latitude = const i0.Value.absent(),
-          i0.Value<int?> longitude = const i0.Value.absent(),
+          i0.Value<double?> focalLength = const i0.Value.absent(),
+          i0.Value<double?> latitude = const i0.Value.absent(),
+          i0.Value<double?> longitude = const i0.Value.absent(),
           i0.Value<int?> iso = const i0.Value.absent(),
           i0.Value<String?> make = const i0.Value.absent(),
           i0.Value<String?> model = const i0.Value.absent(),
@@ -1232,11 +1232,11 @@ class RemoteExifEntityCompanion
   final i0.Value<int?> height;
   final i0.Value<int?> width;
   final i0.Value<String?> exposureTime;
-  final i0.Value<int?> fNumber;
+  final i0.Value<double?> fNumber;
   final i0.Value<int?> fileSize;
-  final i0.Value<int?> focalLength;
-  final i0.Value<int?> latitude;
-  final i0.Value<int?> longitude;
+  final i0.Value<double?> focalLength;
+  final i0.Value<double?> latitude;
+  final i0.Value<double?> longitude;
   final i0.Value<int?> iso;
   final i0.Value<String?> make;
   final i0.Value<String?> model;
@@ -1300,11 +1300,11 @@ class RemoteExifEntityCompanion
     i0.Expression<int>? height,
     i0.Expression<int>? width,
     i0.Expression<String>? exposureTime,
-    i0.Expression<int>? fNumber,
+    i0.Expression<double>? fNumber,
     i0.Expression<int>? fileSize,
-    i0.Expression<int>? focalLength,
-    i0.Expression<int>? latitude,
-    i0.Expression<int>? longitude,
+    i0.Expression<double>? focalLength,
+    i0.Expression<double>? latitude,
+    i0.Expression<double>? longitude,
     i0.Expression<int>? iso,
     i0.Expression<String>? make,
     i0.Expression<String>? model,
@@ -1348,11 +1348,11 @@ class RemoteExifEntityCompanion
       i0.Value<int?>? height,
       i0.Value<int?>? width,
       i0.Value<String?>? exposureTime,
-      i0.Value<int?>? fNumber,
+      i0.Value<double?>? fNumber,
       i0.Value<int?>? fileSize,
-      i0.Value<int?>? focalLength,
-      i0.Value<int?>? latitude,
-      i0.Value<int?>? longitude,
+      i0.Value<double?>? focalLength,
+      i0.Value<double?>? latitude,
+      i0.Value<double?>? longitude,
       i0.Value<int?>? iso,
       i0.Value<String?>? make,
       i0.Value<String?>? model,
@@ -1416,19 +1416,19 @@ class RemoteExifEntityCompanion
       map['exposure_time'] = i0.Variable<String>(exposureTime.value);
     }
     if (fNumber.present) {
-      map['f_number'] = i0.Variable<int>(fNumber.value);
+      map['f_number'] = i0.Variable<double>(fNumber.value);
     }
     if (fileSize.present) {
       map['file_size'] = i0.Variable<int>(fileSize.value);
     }
     if (focalLength.present) {
-      map['focal_length'] = i0.Variable<int>(focalLength.value);
+      map['focal_length'] = i0.Variable<double>(focalLength.value);
     }
     if (latitude.present) {
-      map['latitude'] = i0.Variable<int>(latitude.value);
+      map['latitude'] = i0.Variable<double>(latitude.value);
     }
     if (longitude.present) {
-      map['longitude'] = i0.Variable<int>(longitude.value);
+      map['longitude'] = i0.Variable<double>(longitude.value);
     }
     if (iso.present) {
       map['iso'] = i0.Variable<int>(iso.value);
diff --git a/mobile/lib/infrastructure/repositories/exif.repository.dart b/mobile/lib/infrastructure/repositories/exif.repository.dart
index 0012e329ca..d25572fdad 100644
--- a/mobile/lib/infrastructure/repositories/exif.repository.dart
+++ b/mobile/lib/infrastructure/repositories/exif.repository.dart
@@ -1,6 +1,8 @@
+import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
     as entity;
+import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:isar/isar.dart';
 
@@ -41,3 +43,36 @@ class IsarExifRepository extends IsarDatabaseRepository {
     });
   }
 }
+
+class DriftRemoteExifRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftRemoteExifRepository(this._db) : super(_db);
+
+  Future<ExifInfo?> get(String assetId) {
+    final query = _db.remoteExifEntity.select()
+      ..where((exif) => exif.assetId.equals(assetId));
+
+    return query.map((asset) => asset.toDto()).getSingleOrNull();
+  }
+}
+
+extension on RemoteExifEntityData {
+  ExifInfo toDto() {
+    return ExifInfo(
+      fileSize: fileSize,
+      description: description,
+      orientation: orientation,
+      timeZone: timeZone,
+      dateTimeOriginal: dateTimeOriginal,
+      latitude: latitude,
+      longitude: longitude,
+      city: city,
+      state: state,
+      country: country,
+      make: make,
+      model: model,
+      f: fNumber,
+      iso: iso,
+    );
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index 909c3b3910..a9e0811104 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -1,17 +1,13 @@
 import 'package:drift/drift.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
-final remoteAssetRepositoryProvider = Provider<RemoteAssetRepository>(
-  (ref) => RemoteAssetRepository(ref.watch(driftProvider)),
-);
-
-class RemoteAssetRepository extends DriftDatabaseRepository {
+class DriftRemoteAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
-  const RemoteAssetRepository(this._db) : super(_db);
+  const DriftRemoteAssetRepository(this._db) : super(_db);
 
   Future<void> updateFavorite(List<String> ids, bool isFavorite) {
     return _db.batch((batch) async {
@@ -36,4 +32,19 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
       }
     });
   }
+
+  Future<void> updateLocation(List<String> ids, LatLng location) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteExifEntity,
+          RemoteExifEntityCompanion(
+            latitude: Value(location.latitude),
+            longitude: Value(location.longitude),
+          ),
+          where: (e) => e.assetId.equals(id),
+        );
+      }
+    });
+  }
 }
diff --git a/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart
index e8a6b633c8..c7279995ff 100644
--- a/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart
@@ -1,16 +1,54 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class EditLocationActionButton extends ConsumerWidget {
-  const EditLocationActionButton({super.key});
+  final ActionSource source;
+
+  const EditLocationActionButton({super.key, required this.source});
+
+  _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).editLocation(source, context);
+    if (result == null) {
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'edit_location_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.edit_location_alt_outlined,
       label: "control_bottom_app_bar_edit_location".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
index 4e55dbb3db..d122d188ff 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
@@ -42,7 +42,7 @@ class HomeBottomAppBar extends ConsumerWidget {
               ? const TrashActionButton()
               : const DeletePermanentActionButton(),
           const EditDateTimeActionButton(),
-          const EditLocationActionButton(),
+          const EditLocationActionButton(source: ActionSource.timeline),
           const MoveToLockFolderActionButton(
             source: ActionSource.timeline,
           ),
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 5d0db7b382..940adf10ed 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -172,4 +172,26 @@ class ActionNotifier extends Notifier<void> {
       );
     }
   }
+
+  Future<ActionResult?> editLocation(
+    ActionSource source,
+    BuildContext context,
+  ) async {
+    final ids = _getIdsForSource<RemoteAsset>(source);
+    try {
+      final isEdited = await _service.editLocation(ids, context);
+      if (!isEdited) {
+        return null;
+      }
+
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to edit location for assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
 }
diff --git a/mobile/lib/providers/infrastructure/asset.provider.dart b/mobile/lib/providers/infrastructure/asset.provider.dart
index 9faef5a53f..28a6bda278 100644
--- a/mobile/lib/providers/infrastructure/asset.provider.dart
+++ b/mobile/lib/providers/infrastructure/asset.provider.dart
@@ -1,7 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.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/providers/infrastructure/db.provider.dart';
 
 final localAssetRepository = Provider<DriftLocalAssetRepository>(
   (ref) => DriftLocalAssetRepository(ref.watch(driftProvider)),
 );
+
+final remoteAssetRepository = Provider<DriftRemoteAssetRepository>(
+  (ref) => DriftRemoteAssetRepository(ref.watch(driftProvider)),
+);
diff --git a/mobile/lib/providers/infrastructure/exif.provider.dart b/mobile/lib/providers/infrastructure/exif.provider.dart
index 59ad632927..af4bb933ec 100644
--- a/mobile/lib/providers/infrastructure/exif.provider.dart
+++ b/mobile/lib/providers/infrastructure/exif.provider.dart
@@ -8,3 +8,7 @@ part 'exif.provider.g.dart';
 @Riverpod(keepAlive: true)
 IsarExifRepository exifRepository(Ref ref) =>
     IsarExifRepository(ref.watch(isarProvider));
+
+final remoteExifRepository = Provider<DriftRemoteExifRepository>(
+  (ref) => DriftRemoteExifRepository(ref.watch(driftProvider)),
+);
diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dart
index 923a214015..9631428409 100644
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -3,6 +3,7 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/api.repository.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 import 'package:openapi/api.dart';
 
 final assetApiRepositoryProvider = Provider(
@@ -65,6 +66,19 @@ class AssetApiRepository extends ApiRepository {
     );
   }
 
+  Future<void> updateLocation(
+    List<String> ids,
+    LatLng location,
+  ) async {
+    return _api.updateAssets(
+      AssetBulkUpdateDto(
+        ids: ids,
+        latitude: location.latitude,
+        longitude: location.longitude,
+      ),
+    );
+  }
+
   _mapVisibility(AssetVisibilityEnum visibility) => switch (visibility) {
         AssetVisibilityEnum.timeline => AssetVisibility.timeline,
         AssetVisibilityEnum.hidden => AssetVisibility.hidden,
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index df059405ed..b5ddbac270 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -2,23 +2,34 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/exif.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/common/location_picker.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 final actionServiceProvider = Provider<ActionService>(
   (ref) => ActionService(
     ref.watch(assetApiRepositoryProvider),
-    ref.watch(remoteAssetRepositoryProvider),
+    ref.watch(remoteAssetRepository),
+    ref.watch(remoteExifRepository),
   ),
 );
 
 class ActionService {
   final AssetApiRepository _assetApiRepository;
-  final RemoteAssetRepository _remoteAssetRepository;
+  final DriftRemoteAssetRepository _remoteAssetRepository;
+  final DriftRemoteExifRepository _remoteExifRepository;
 
-  const ActionService(this._assetApiRepository, this._remoteAssetRepository);
+  const ActionService(
+    this._assetApiRepository,
+    this._remoteAssetRepository,
+    this._remoteExifRepository,
+  );
 
   Future<void> shareLink(List<String> remoteIds, BuildContext context) async {
     context.pushRoute(
@@ -81,4 +92,38 @@ class ActionService {
       AssetVisibility.timeline,
     );
   }
+
+  Future<bool> editLocation(
+    List<String> remoteIds,
+    BuildContext context,
+  ) async {
+    LatLng? initialLatLng;
+    if (remoteIds.length == 1) {
+      final exif = await _remoteExifRepository.get(remoteIds[0]);
+
+      if (exif?.latitude != null && exif?.longitude != null) {
+        initialLatLng = LatLng(exif!.latitude!, exif.longitude!);
+      }
+    }
+
+    final location = await showLocationPicker(
+      context: context,
+      initialLatLng: initialLatLng,
+    );
+
+    if (location == null) {
+      return false;
+    }
+
+    await _assetApiRepository.updateLocation(
+      remoteIds,
+      location,
+    );
+    await _remoteAssetRepository.updateLocation(
+      remoteIds,
+      location,
+    );
+
+    return true;
+  }
 }
diff --git a/mobile/openapi/lib/model/sync_asset_exif_v1.dart b/mobile/openapi/lib/model/sync_asset_exif_v1.dart
index b0fef28b76..d4fdc9249d 100644
--- a/mobile/openapi/lib/model/sync_asset_exif_v1.dart
+++ b/mobile/openapi/lib/model/sync_asset_exif_v1.dart
@@ -56,21 +56,21 @@ class SyncAssetExifV1 {
 
   String? exposureTime;
 
-  int? fNumber;
+  double? fNumber;
 
   int? fileSizeInByte;
 
-  int? focalLength;
+  double? focalLength;
 
-  int? fps;
+  double? fps;
 
   int? iso;
 
-  int? latitude;
+  double? latitude;
 
   String? lensModel;
 
-  int? longitude;
+  double? longitude;
 
   String? make;
 
@@ -293,14 +293,14 @@ class SyncAssetExifV1 {
         exifImageHeight: mapValueOfType<int>(json, r'exifImageHeight'),
         exifImageWidth: mapValueOfType<int>(json, r'exifImageWidth'),
         exposureTime: mapValueOfType<String>(json, r'exposureTime'),
-        fNumber: mapValueOfType<int>(json, r'fNumber'),
+        fNumber: (mapValueOfType<num>(json, r'fNumber'))?.toDouble(),
         fileSizeInByte: mapValueOfType<int>(json, r'fileSizeInByte'),
-        focalLength: mapValueOfType<int>(json, r'focalLength'),
-        fps: mapValueOfType<int>(json, r'fps'),
+        focalLength: (mapValueOfType<num>(json, r'focalLength'))?.toDouble(),
+        fps: (mapValueOfType<num>(json, r'fps'))?.toDouble(),
         iso: mapValueOfType<int>(json, r'iso'),
-        latitude: mapValueOfType<int>(json, r'latitude'),
+        latitude: (mapValueOfType<num>(json, r'latitude'))?.toDouble(),
         lensModel: mapValueOfType<String>(json, r'lensModel'),
-        longitude: mapValueOfType<int>(json, r'longitude'),
+        longitude: (mapValueOfType<num>(json, r'longitude'))?.toDouble(),
         make: mapValueOfType<String>(json, r'make'),
         model: mapValueOfType<String>(json, r'model'),
         modifyDate: mapDateTime(json, r'modifyDate', r''),
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index ef66c985cb..0dc0c43ec8 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13615,36 +13615,41 @@
             "type": "string"
           },
           "fNumber": {
+            "format": "double",
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           },
           "fileSizeInByte": {
             "nullable": true,
             "type": "integer"
           },
           "focalLength": {
+            "format": "double",
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           },
           "fps": {
+            "format": "double",
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           },
           "iso": {
             "nullable": true,
             "type": "integer"
           },
           "latitude": {
+            "format": "double",
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           },
           "lensModel": {
             "nullable": true,
             "type": "string"
           },
           "longitude": {
+            "format": "double",
             "nullable": true,
-            "type": "integer"
+            "type": "number"
           },
           "make": {
             "nullable": true,
diff --git a/open-api/templates/mobile/serialization/native/native_class.mustache b/open-api/templates/mobile/serialization/native/native_class.mustache
index 9f40d5b0bf..2d6e6d24f3 100644
--- a/open-api/templates/mobile/serialization/native/native_class.mustache
+++ b/open-api/templates/mobile/serialization/native/native_class.mustache
@@ -206,7 +206,7 @@ class {{{classname}}} {
             : {{/isNullable}}{{{datatypeWithEnum}}}.parse('${json[r'{{{baseName}}}']}'),
               {{/isNumber}}
               {{#isDouble}}
-        {{{name}}}: (mapValueOfType<num>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}}).toDouble(),
+        {{{name}}}: (mapValueOfType<num>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}}){{#isNullable}}?{{/isNullable}}.toDouble(),
               {{/isDouble}}
               {{^isDouble}}
               {{^isNumber}}
diff --git a/open-api/templates/mobile/serialization/native/native_class.mustache.patch b/open-api/templates/mobile/serialization/native/native_class.mustache.patch
index 4ba6594966..8eeefdad97 100644
--- a/open-api/templates/mobile/serialization/native/native_class.mustache.patch
+++ b/open-api/templates/mobile/serialization/native/native_class.mustache.patch
@@ -1,5 +1,5 @@
---- native_class.mustache	2024-09-19 11:41:07.855683995 -0400
-+++ native_class_temp.mustache	2024-09-19 11:41:57.113249395 -0400
+--- native_class.mustache	2025-07-01 08:29:23.968133163 +0800
++++ native_class_temp.mustache	2025-07-01 08:29:44.225850583 +0800
 @@ -91,14 +91,14 @@
      {{/isDateTime}}
      {{#isNullable}}
@@ -44,7 +44,7 @@
              : {{/isNullable}}{{{datatypeWithEnum}}}.parse('${json[r'{{{baseName}}}']}'),
                {{/isNumber}}
 +              {{#isDouble}}
-+        {{{name}}}: (mapValueOfType<num>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}}).toDouble(),
++        {{{name}}}: (mapValueOfType<num>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}}){{#isNullable}}?{{/isNullable}}.toDouble(),
 +              {{/isDouble}}
 +              {{^isDouble}}
                {{^isNumber}}
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index c888f89441..db1fd29418 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -115,9 +115,9 @@ export class SyncAssetExifV1 {
   dateTimeOriginal!: Date | null;
   modifyDate!: Date | null;
   timeZone!: string | null;
-  @ApiProperty({ type: 'integer' })
+  @ApiProperty({ type: 'number', format: 'double' })
   latitude!: number | null;
-  @ApiProperty({ type: 'integer' })
+  @ApiProperty({ type: 'number', format: 'double' })
   longitude!: number | null;
   projectionType!: string | null;
   city!: string | null;
@@ -126,9 +126,9 @@ export class SyncAssetExifV1 {
   make!: string | null;
   model!: string | null;
   lensModel!: string | null;
-  @ApiProperty({ type: 'integer' })
+  @ApiProperty({ type: 'number', format: 'double' })
   fNumber!: number | null;
-  @ApiProperty({ type: 'integer' })
+  @ApiProperty({ type: 'number', format: 'double' })
   focalLength!: number | null;
   @ApiProperty({ type: 'integer' })
   iso!: number | null;
@@ -136,7 +136,7 @@ export class SyncAssetExifV1 {
   profileDescription!: string | null;
   @ApiProperty({ type: 'integer' })
   rating!: number | null;
-  @ApiProperty({ type: 'integer' })
+  @ApiProperty({ type: 'number', format: 'double' })
   fps!: number | null;
 }
 

From 25efba8fe6c8076b0bdfe8428e0e25216d902a06 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 1 Jul 2025 11:55:17 -0500
Subject: [PATCH 114/337] chore: remove share link success prompt (#19671)

---
 .../share_link_action_button.widget.dart      | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
index d23dd377c4..4a9f6d9bd6 100644
--- a/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/share_link_action_button.widget.dart
@@ -1,12 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class ShareLinkActionButton extends ConsumerWidget {
   final ActionSource source;
@@ -18,25 +15,7 @@ class ShareLinkActionButton extends ConsumerWidget {
       return;
     }
 
-    final result =
-        await ref.read(actionProvider.notifier).shareLink(source, context);
-    ref.read(multiSelectProvider.notifier).reset();
-
-    final successMessage = 'share_link_action_prompt'.t(
-      context: context,
-      args: {'count': result.count.toString()},
-    );
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
+    await ref.read(actionProvider.notifier).shareLink(source, context);
   }
 
   @override

From 090d87f82e58094c3cf4ed770033080e425f6fb2 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Tue, 1 Jul 2025 22:47:59 -0400
Subject: [PATCH 115/337] chore: dev environment improvements and dependency
 updates (#19676)

---
 .devcontainer/server/container-common.sh            |  6 ++----
 .../server/container-compose-overrides.yml          |  4 ++--
 .github/.prettierignore                             |  4 ++++
 e2e/src/utils.ts                                    |  5 +++--
 web/package-lock.json                               | 13 ++++++++++++-
 web/package.json                                    |  2 ++
 6 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 .github/.prettierignore

diff --git a/.devcontainer/server/container-common.sh b/.devcontainer/server/container-common.sh
index 7dff4a0894..e1e81a9b52 100755
--- a/.devcontainer/server/container-common.sh
+++ b/.devcontainer/server/container-common.sh
@@ -73,10 +73,8 @@ install_dependencies() {
     log "Installing dependencies"
     (
         cd "${IMMICH_WORKSPACE}" || exit 1
-        run_cmd make ci-server
-        run_cmd make ci-sdk
-        run_cmd make build-sdk
-        run_cmd make ci-web
+        export CI=1 FROZEN=1 OFFLINE=1
+        run_cmd make setup-dev
     )
     log ""
 }
diff --git a/.devcontainer/server/container-compose-overrides.yml b/.devcontainer/server/container-compose-overrides.yml
index 4e340ae5bd..d7efc92cb1 100644
--- a/.devcontainer/server/container-compose-overrides.yml
+++ b/.devcontainer/server/container-compose-overrides.yml
@@ -22,7 +22,7 @@ services:
 
   immich-machine-learning:
     env_file: !reset []
-    
+
   database:
     env_file: !reset []
     environment: !override
@@ -31,7 +31,7 @@ services:
       POSTGRES_DB: ${DB_DATABASE_NAME-immich}
       POSTGRES_INITDB_ARGS: '--data-checksums'
       POSTGRES_HOST_AUTH_METHOD: md5
-    volumes: 
+    volumes:
       - ${UPLOAD_LOCATION:-postgres-devcontainer-volume}${UPLOAD_LOCATION:+/postgres}:/var/lib/postgresql/data
 
   redis:
diff --git a/.github/.prettierignore b/.github/.prettierignore
new file mode 100644
index 0000000000..cc41cea9b2
--- /dev/null
+++ b/.github/.prettierignore
@@ -0,0 +1,4 @@
+# Ignore files for PNPM, NPM and YARN
+pnpm-lock.yaml
+package-lock.json
+yarn.lock
diff --git a/e2e/src/utils.ts b/e2e/src/utils.ts
index 1d5004d385..cf9eafbf23 100644
--- a/e2e/src/utils.ts
+++ b/e2e/src/utils.ts
@@ -60,6 +60,7 @@ import { io, type Socket } from 'socket.io-client';
 import { loginDto, signupDto } from 'src/fixtures';
 import { makeRandomImage } from 'src/generators';
 import request from 'supertest';
+export type { Emitter } from '@socket.io/component-emitter';
 
 type CommandResponse = { stdout: string; stderr: string; exitCode: number | null };
 type EventType = 'assetUpload' | 'assetUpdate' | 'assetDelete' | 'userDelete' | 'assetHidden';
@@ -84,10 +85,10 @@ export const immichAdmin = (args: string[]) =>
 export const specialCharStrings = ["'", '"', ',', '{', '}', '*'];
 export const TEN_TIMES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 
-const executeCommand = (command: string, args: string[]) => {
+const executeCommand = (command: string, args: string[], options?: { cwd?: string }) => {
   let _resolve: (value: CommandResponse) => void;
   const promise = new Promise<CommandResponse>((resolve) => (_resolve = resolve));
-  const child = spawn(command, args, { stdio: 'pipe' });
+  const child = spawn(command, args, { stdio: 'pipe', cwd: options?.cwd });
 
   let stdout = '';
   let stderr = '';
diff --git a/web/package-lock.json b/web/package-lock.json
index 770e4edd6d..e998a46a10 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -22,7 +22,9 @@
         "@zoom-image/svelte": "^0.3.0",
         "dom-to-image": "^2.6.0",
         "fabric": "^6.5.4",
+        "geojson": "^0.5.0",
         "handlebars": "^4.7.8",
+        "happy-dom": "^18.0.1",
         "intl-messageformat": "^10.7.11",
         "justified-layout": "^4.1.0",
         "lodash-es": "^4.17.21",
@@ -94,7 +96,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.32",
+        "@types/node": "^22.15.33",
         "typescript": "^5.3.3"
       }
     },
@@ -5838,6 +5840,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/geojson": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/geojson/-/geojson-0.5.0.tgz",
+      "integrity": "sha512-/Bx5lEn+qRF4TfQ5aLu6NH+UKtvIv7Lhc487y/c8BdludrCTpiWf9wyI0RTyqg49MFefIAvFDuEi5Dfd/zgNxQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/geojson-vt": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz",
diff --git a/web/package.json b/web/package.json
index 72df25a195..08afe31762 100644
--- a/web/package.json
+++ b/web/package.json
@@ -39,7 +39,9 @@
     "@zoom-image/svelte": "^0.3.0",
     "dom-to-image": "^2.6.0",
     "fabric": "^6.5.4",
+    "geojson": "^0.5.0",
     "handlebars": "^4.7.8",
+    "happy-dom": "^18.0.1",
     "intl-messageformat": "^10.7.11",
     "justified-layout": "^4.1.0",
     "lodash-es": "^4.17.21",

From 15da0d5a71aee6d406dae3fbd5eafd10e1d2a08a Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Tue, 1 Jul 2025 22:48:41 -0400
Subject: [PATCH 116/337] fix: email button (#19675)

---
 server/src/emails/components/button.component.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/src/emails/components/button.component.tsx b/server/src/emails/components/button.component.tsx
index 9c229fc16d..b490e36650 100644
--- a/server/src/emails/components/button.component.tsx
+++ b/server/src/emails/components/button.component.tsx
@@ -2,9 +2,7 @@ import React from 'react';
 
 import { Button, ButtonProps } from '@react-email/components';
 
-interface ImmichButtonProps extends ButtonProps {}
-
-export const ImmichButton = ({ children, ...props }: ImmichButtonProps) => (
+export const ImmichButton = ({ children, ...props }: ButtonProps) => (
   <Button
     {...props}
     className="py-3 px-8 border bg-immich-primary rounded-full no-underline hover:no-underline text-white hover:text-gray-50 font-bold uppercase"

From c435bdb5d3b4db402876a8c19cb02773b2621301 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 1 Jul 2025 22:57:17 -0400
Subject: [PATCH 117/337] refactor: sql-tools readers (#19672)

---
 server/src/sql-tools/from-database/index.ts   | 602 ++----------------
 .../from-database/readers/column.reader.ts    | 119 ++++
 .../from-database/readers/comment.reader.ts   |  36 ++
 .../readers/constraint.reader.ts              | 144 +++++
 .../from-database/readers/extension.reader.ts |  14 +
 .../from-database/readers/function.reader.ts  |  27 +
 .../from-database/readers/index.reader.ts     |  58 ++
 .../from-database/readers/name.reader.ts      |   8 +
 .../from-database/readers/parameter.reader.ts |  21 +
 .../from-database/readers/table.reader.ts     |  22 +
 .../from-database/readers/trigger.reader.ts   |  46 ++
 .../sql-tools/from-database/readers/type.ts   |   3 +
 12 files changed, 538 insertions(+), 562 deletions(-)
 create mode 100644 server/src/sql-tools/from-database/readers/column.reader.ts
 create mode 100644 server/src/sql-tools/from-database/readers/comment.reader.ts
 create mode 100644 server/src/sql-tools/from-database/readers/constraint.reader.ts
 create mode 100644 server/src/sql-tools/from-database/readers/extension.reader.ts
 create mode 100644 server/src/sql-tools/from-database/readers/function.reader.ts
 create mode 100644 server/src/sql-tools/from-database/readers/index.reader.ts
 create mode 100644 server/src/sql-tools/from-database/readers/name.reader.ts
 create mode 100644 server/src/sql-tools/from-database/readers/parameter.reader.ts
 create mode 100644 server/src/sql-tools/from-database/readers/table.reader.ts
 create mode 100644 server/src/sql-tools/from-database/readers/trigger.reader.ts
 create mode 100644 server/src/sql-tools/from-database/readers/type.ts

diff --git a/server/src/sql-tools/from-database/index.ts b/server/src/sql-tools/from-database/index.ts
index 3c66788670..771a24d7b1 100644
--- a/server/src/sql-tools/from-database/index.ts
+++ b/server/src/sql-tools/from-database/index.ts
@@ -1,576 +1,54 @@
-import { Kysely, QueryResult, sql } from 'kysely';
+import { Kysely } from 'kysely';
 import { PostgresJSDialect } from 'kysely-postgres-js';
-import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { Sql } from 'postgres';
-import { parseTriggerType } from 'src/sql-tools/helpers';
-import {
-  ColumnType,
-  DatabaseActionType,
-  DatabaseClient,
-  DatabaseColumn,
-  DatabaseConstraintType,
-  DatabaseEnum,
-  DatabaseExtension,
-  DatabaseFunction,
-  DatabaseParameter,
-  DatabaseSchema,
-  DatabaseTable,
-  LoadSchemaOptions,
-  ParameterScope,
-  PostgresDB,
-} from 'src/sql-tools/types';
+import { readColumns } from 'src/sql-tools/from-database/readers/column.reader';
+import { readComments } from 'src/sql-tools/from-database/readers/comment.reader';
+import { readConstraints } from 'src/sql-tools/from-database/readers/constraint.reader';
+import { readExtensions } from 'src/sql-tools/from-database/readers/extension.reader';
+import { readFunctions } from 'src/sql-tools/from-database/readers/function.reader';
+import { readIndexes } from 'src/sql-tools/from-database/readers/index.reader';
+import { readName } from 'src/sql-tools/from-database/readers/name.reader';
+import { readParameters } from 'src/sql-tools/from-database/readers/parameter.reader';
+import { readTables } from 'src/sql-tools/from-database/readers/table.reader';
+import { readTriggers } from 'src/sql-tools/from-database/readers/trigger.reader';
+import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+import { DatabaseSchema, LoadSchemaOptions, PostgresDB } from 'src/sql-tools/types';
+
+const readers: DatabaseReader[] = [
+  //
+  readName,
+  readParameters,
+  readExtensions,
+  readFunctions,
+  readTables,
+  readColumns,
+  readIndexes,
+  readConstraints,
+  readTriggers,
+  readComments,
+];
 
 /**
  * Load the database schema from the database
  */
 export const schemaFromDatabase = async (postgres: Sql, options: LoadSchemaOptions = {}): Promise<DatabaseSchema> => {
-  const db = createDatabaseClient(postgres);
-
-  const warnings: string[] = [];
-  const warn = (message: string) => {
-    warnings.push(message);
+  const schema: DatabaseSchema = {
+    name: 'immich',
+    schemaName: options.schemaName || 'public',
+    parameters: [],
+    functions: [],
+    enums: [],
+    extensions: [],
+    tables: [],
+    warnings: [],
   };
 
-  const schemaName = options.schemaName || 'public';
-  const tablesMap: Record<string, DatabaseTable> = {};
-
-  const [
-    databaseName,
-    tables,
-    columns,
-    indexes,
-    constraints,
-    enums,
-    routines,
-    extensions,
-    triggers,
-    parameters,
-    comments,
-  ] = await Promise.all([
-    getDatabaseName(db),
-    getTables(db, schemaName),
-    getTableColumns(db, schemaName),
-    getTableIndexes(db, schemaName),
-    getTableConstraints(db, schemaName),
-    getUserDefinedEnums(db, schemaName),
-    getRoutines(db, schemaName),
-    getExtensions(db),
-    getTriggers(db, schemaName),
-    getParameters(db),
-    getObjectComments(db),
-  ]);
-
-  const schemaEnums: DatabaseEnum[] = [];
-  const schemaFunctions: DatabaseFunction[] = [];
-  const schemaExtensions: DatabaseExtension[] = [];
-  const schemaParameters: DatabaseParameter[] = [];
-
-  const enumMap = Object.fromEntries(enums.map((e) => [e.name, e.values]));
-
-  for (const { name } of extensions) {
-    schemaExtensions.push({ name, synchronize: true });
-  }
-
-  for (const { name, values } of enums) {
-    schemaEnums.push({ name, values, synchronize: true });
-  }
-
-  for (const parameter of parameters) {
-    schemaParameters.push({
-      name: parameter.name,
-      value: parameter.value,
-      databaseName,
-      scope: parameter.scope as ParameterScope,
-      synchronize: true,
-    });
-  }
-
-  for (const { name, expression } of routines) {
-    schemaFunctions.push({
-      name,
-      // TODO read expression from the overrides table
-      expression,
-      synchronize: true,
-    });
-  }
-
-  // add tables
-  for (const table of tables) {
-    const tableName = table.table_name;
-    if (tablesMap[tableName]) {
-      continue;
-    }
-
-    tablesMap[table.table_name] = {
-      name: table.table_name,
-      columns: [],
-      indexes: [],
-      triggers: [],
-      constraints: [],
-      synchronize: true,
-    };
-  }
-
-  // add columns to tables
-  for (const column of columns) {
-    const table = tablesMap[column.table_name];
-    if (!table) {
-      continue;
-    }
-
-    const columnName = column.column_name;
-
-    const item: DatabaseColumn = {
-      type: column.data_type as ColumnType,
-      name: columnName,
-      tableName: column.table_name,
-      nullable: column.is_nullable === 'YES',
-      isArray: column.array_type !== null,
-      numericPrecision: column.numeric_precision ?? undefined,
-      numericScale: column.numeric_scale ?? undefined,
-      length: column.character_maximum_length ?? undefined,
-      default: column.column_default ?? undefined,
-      synchronize: true,
-    };
-
-    const columnLabel = `${table.name}.${columnName}`;
-
-    switch (column.data_type) {
-      // array types
-      case 'ARRAY': {
-        if (!column.array_type) {
-          warn(`Unable to find type for ${columnLabel} (ARRAY)`);
-          continue;
-        }
-        item.type = column.array_type as ColumnType;
-        break;
-      }
-
-      // enum types
-      case 'USER-DEFINED': {
-        if (!enumMap[column.udt_name]) {
-          warn(`Unable to find type for ${columnLabel} (ENUM)`);
-          continue;
-        }
-
-        item.type = 'enum';
-        item.enumName = column.udt_name;
-        break;
-      }
-    }
-
-    table.columns.push(item);
-  }
-
-  // add table indexes
-  for (const index of indexes) {
-    const table = tablesMap[index.table_name];
-    if (!table) {
-      continue;
-    }
-
-    const indexName = index.index_name;
-
-    table.indexes.push({
-      name: indexName,
-      tableName: index.table_name,
-      columnNames: index.column_names ?? undefined,
-      expression: index.expression ?? undefined,
-      using: index.using,
-      where: index.where ?? undefined,
-      unique: index.unique,
-      synchronize: true,
-    });
-  }
-
-  // add table constraints
-  for (const constraint of constraints) {
-    const table = tablesMap[constraint.table_name];
-    if (!table) {
-      continue;
-    }
-
-    const constraintName = constraint.constraint_name;
-
-    switch (constraint.constraint_type) {
-      // primary key constraint
-      case 'p': {
-        if (!constraint.column_names) {
-          warn(`Skipping CONSTRAINT "${constraintName}", no columns found`);
-          continue;
-        }
-        table.constraints.push({
-          type: DatabaseConstraintType.PRIMARY_KEY,
-          name: constraintName,
-          tableName: constraint.table_name,
-          columnNames: constraint.column_names,
-          synchronize: true,
-        });
-        break;
-      }
-
-      // foreign key constraint
-      case 'f': {
-        if (!constraint.column_names || !constraint.reference_table_name || !constraint.reference_column_names) {
-          warn(
-            `Skipping CONSTRAINT "${constraintName}", missing either columns, referenced table, or referenced columns,`,
-          );
-          continue;
-        }
-
-        table.constraints.push({
-          type: DatabaseConstraintType.FOREIGN_KEY,
-          name: constraintName,
-          tableName: constraint.table_name,
-          columnNames: constraint.column_names,
-          referenceTableName: constraint.reference_table_name,
-          referenceColumnNames: constraint.reference_column_names,
-          onUpdate: asDatabaseAction(constraint.update_action),
-          onDelete: asDatabaseAction(constraint.delete_action),
-          synchronize: true,
-        });
-        break;
-      }
-
-      // unique constraint
-      case 'u': {
-        table.constraints.push({
-          type: DatabaseConstraintType.UNIQUE,
-          name: constraintName,
-          tableName: constraint.table_name,
-          columnNames: constraint.column_names as string[],
-          synchronize: true,
-        });
-        break;
-      }
-
-      //  check constraint
-      case 'c': {
-        table.constraints.push({
-          type: DatabaseConstraintType.CHECK,
-          name: constraint.constraint_name,
-          tableName: constraint.table_name,
-          expression: constraint.expression.replace('CHECK ', ''),
-          synchronize: true,
-        });
-        break;
-      }
-    }
-  }
-
-  // add triggers to tables
-  for (const trigger of triggers) {
-    const table = tablesMap[trigger.table_name];
-    if (!table) {
-      continue;
-    }
-
-    table.triggers.push({
-      name: trigger.name,
-      tableName: trigger.table_name,
-      functionName: trigger.function_name,
-      referencingNewTableAs: trigger.referencing_new_table_as ?? undefined,
-      referencingOldTableAs: trigger.referencing_old_table_as ?? undefined,
-      when: trigger.when_expression,
-      synchronize: true,
-      ...parseTriggerType(trigger.type),
-    });
-  }
-
-  for (const comment of comments) {
-    if (comment.object_type === 'r') {
-      const table = tablesMap[comment.object_name];
-      if (!table) {
-        continue;
-      }
-
-      if (comment.column_name) {
-        const column = table.columns.find(({ name }) => name === comment.column_name);
-        if (column) {
-          column.comment = comment.value;
-        }
-      }
-    }
+  const db = new Kysely<PostgresDB>({ dialect: new PostgresJSDialect({ postgres }) });
+  for (const reader of readers) {
+    await reader(schema, db);
   }
 
   await db.destroy();
 
-  return {
-    name: databaseName,
-    schemaName,
-    parameters: schemaParameters,
-    functions: schemaFunctions,
-    enums: schemaEnums,
-    extensions: schemaExtensions,
-    tables: Object.values(tablesMap),
-    warnings,
-  };
-};
-
-const createDatabaseClient = (postgres: Sql): DatabaseClient =>
-  new Kysely<PostgresDB>({ dialect: new PostgresJSDialect({ postgres }) });
-
-const asDatabaseAction = (action: string) => {
-  switch (action) {
-    case 'a': {
-      return DatabaseActionType.NO_ACTION;
-    }
-    case 'c': {
-      return DatabaseActionType.CASCADE;
-    }
-    case 'r': {
-      return DatabaseActionType.RESTRICT;
-    }
-    case 'n': {
-      return DatabaseActionType.SET_NULL;
-    }
-    case 'd': {
-      return DatabaseActionType.SET_DEFAULT;
-    }
-
-    default: {
-      return DatabaseActionType.NO_ACTION;
-    }
-  }
-};
-
-const getDatabaseName = async (db: DatabaseClient) => {
-  const result = (await sql`SELECT current_database() as name`.execute(db)) as QueryResult<{ name: string }>;
-  return result.rows[0].name;
-};
-
-const getTables = (db: DatabaseClient, schemaName: string) => {
-  return db
-    .selectFrom('information_schema.tables')
-    .where('table_schema', '=', schemaName)
-    .where('table_type', '=', sql.lit('BASE TABLE'))
-    .selectAll()
-    .execute();
-};
-
-const getTableColumns = (db: DatabaseClient, schemaName: string) => {
-  return db
-    .selectFrom('information_schema.columns as c')
-    .leftJoin('information_schema.element_types as o', (join) =>
-      join
-        .onRef('c.table_catalog', '=', 'o.object_catalog')
-        .onRef('c.table_schema', '=', 'o.object_schema')
-        .onRef('c.table_name', '=', 'o.object_name')
-        .on('o.object_type', '=', sql.lit('TABLE'))
-        .onRef('c.dtd_identifier', '=', 'o.collection_type_identifier'),
-    )
-    .leftJoin('pg_type as t', (join) =>
-      join.onRef('t.typname', '=', 'c.udt_name').on('c.data_type', '=', sql.lit('USER-DEFINED')),
-    )
-    .leftJoin('pg_enum as e', (join) => join.onRef('e.enumtypid', '=', 't.oid'))
-    .select([
-      'c.table_name',
-      'c.column_name',
-
-      // is ARRAY, USER-DEFINED, or data type
-      'c.data_type',
-      'c.column_default',
-      'c.is_nullable',
-      'c.character_maximum_length',
-
-      // number types
-      'c.numeric_precision',
-      'c.numeric_scale',
-
-      // date types
-      'c.datetime_precision',
-
-      // user defined type
-      'c.udt_catalog',
-      'c.udt_schema',
-      'c.udt_name',
-
-      // data type for ARRAYs
-      'o.data_type as array_type',
-    ])
-    .where('table_schema', '=', schemaName)
-    .execute();
-};
-
-const getTableIndexes = (db: DatabaseClient, schemaName: string) => {
-  return (
-    db
-      .selectFrom('pg_index as ix')
-      // matching index, which has column information
-      .innerJoin('pg_class as i', 'ix.indexrelid', 'i.oid')
-      .innerJoin('pg_am as a', 'i.relam', 'a.oid')
-      // matching table
-      .innerJoin('pg_class as t', 'ix.indrelid', 't.oid')
-      // namespace
-      .innerJoin('pg_namespace', 'pg_namespace.oid', 'i.relnamespace')
-      // PK and UQ constraints automatically have indexes, so we can ignore those
-      .leftJoin('pg_constraint', (join) =>
-        join
-          .onRef('pg_constraint.conindid', '=', 'i.oid')
-          .on('pg_constraint.contype', 'in', [sql.lit('p'), sql.lit('u')]),
-      )
-      .where('pg_constraint.oid', 'is', null)
-      .select((eb) => [
-        'i.relname as index_name',
-        't.relname as table_name',
-        'ix.indisunique as unique',
-        'a.amname as using',
-        eb.fn<string>('pg_get_expr', ['ix.indexprs', 'ix.indrelid']).as('expression'),
-        eb.fn<string>('pg_get_expr', ['ix.indpred', 'ix.indrelid']).as('where'),
-        eb
-          .selectFrom('pg_attribute as a')
-          .where('t.relkind', '=', sql.lit('r'))
-          .whereRef('a.attrelid', '=', 't.oid')
-          // list of columns numbers in the index
-          .whereRef('a.attnum', '=', sql`any("ix"."indkey")`)
-          .select((eb) => eb.fn<string[]>('json_agg', ['a.attname']).as('column_name'))
-          .as('column_names'),
-      ])
-      .where('pg_namespace.nspname', '=', schemaName)
-      .where('ix.indisprimary', '=', sql.lit(false))
-      .execute()
-  );
-};
-
-const getTableConstraints = (db: DatabaseClient, schemaName: string) => {
-  return db
-    .selectFrom('pg_constraint')
-    .innerJoin('pg_namespace', 'pg_namespace.oid', 'pg_constraint.connamespace') // namespace
-    .innerJoin('pg_class as source_table', (join) =>
-      join.onRef('source_table.oid', '=', 'pg_constraint.conrelid').on('source_table.relkind', 'in', [
-        // ordinary table
-        sql.lit('r'),
-        // partitioned table
-        sql.lit('p'),
-        // foreign table
-        sql.lit('f'),
-      ]),
-    ) // table
-    .leftJoin('pg_class as reference_table', 'reference_table.oid', 'pg_constraint.confrelid') // reference table
-    .select((eb) => [
-      'pg_constraint.contype as constraint_type',
-      'pg_constraint.conname as constraint_name',
-      'source_table.relname as table_name',
-      'reference_table.relname as reference_table_name',
-      'pg_constraint.confupdtype as update_action',
-      'pg_constraint.confdeltype as delete_action',
-      // 'pg_constraint.oid as constraint_id',
-      eb
-        .selectFrom('pg_attribute')
-        // matching table for PK, FK, and UQ
-        .whereRef('pg_attribute.attrelid', '=', 'pg_constraint.conrelid')
-        .whereRef('pg_attribute.attnum', '=', sql`any("pg_constraint"."conkey")`)
-        .select((eb) => eb.fn<string[]>('json_agg', ['pg_attribute.attname']).as('column_name'))
-        .as('column_names'),
-      eb
-        .selectFrom('pg_attribute')
-        // matching foreign table for FK
-        .whereRef('pg_attribute.attrelid', '=', 'pg_constraint.confrelid')
-        .whereRef('pg_attribute.attnum', '=', sql`any("pg_constraint"."confkey")`)
-        .select((eb) => eb.fn<string[]>('json_agg', ['pg_attribute.attname']).as('column_name'))
-        .as('reference_column_names'),
-      eb.fn<string>('pg_get_constraintdef', ['pg_constraint.oid']).as('expression'),
-    ])
-    .where('pg_namespace.nspname', '=', schemaName)
-    .execute();
-};
-
-const getUserDefinedEnums = async (db: DatabaseClient, schemaName: string) => {
-  const items = await db
-    .selectFrom('pg_type')
-    .innerJoin('pg_namespace', (join) =>
-      join.onRef('pg_namespace.oid', '=', 'pg_type.typnamespace').on('pg_namespace.nspname', '=', schemaName),
-    )
-    .where('typtype', '=', sql.lit('e'))
-    .select((eb) => [
-      'pg_type.typname as name',
-      jsonArrayFrom(
-        eb.selectFrom('pg_enum as e').select(['e.enumlabel as value']).whereRef('e.enumtypid', '=', 'pg_type.oid'),
-      ).as('values'),
-    ])
-    .execute();
-
-  return items.map((item) => ({
-    name: item.name,
-    values: item.values.map(({ value }) => value),
-  }));
-};
-
-const getRoutines = async (db: DatabaseClient, schemaName: string) => {
-  return db
-    .selectFrom('pg_proc as p')
-    .innerJoin('pg_namespace', 'pg_namespace.oid', 'p.pronamespace')
-    .leftJoin('pg_depend as d', (join) => join.onRef('d.objid', '=', 'p.oid').on('d.deptype', '=', sql.lit('e')))
-    .where('d.objid', 'is', sql.lit(null))
-    .where('p.prokind', '=', sql.lit('f'))
-    .where('pg_namespace.nspname', '=', schemaName)
-    .select((eb) => [
-      'p.proname as name',
-      eb.fn<string>('pg_get_function_identity_arguments', ['p.oid']).as('arguments'),
-      eb.fn<string>('pg_get_functiondef', ['p.oid']).as('expression'),
-    ])
-    .execute();
-};
-
-const getExtensions = async (db: DatabaseClient) => {
-  return (
-    db
-      .selectFrom('pg_catalog.pg_extension')
-      // .innerJoin('pg_namespace', 'pg_namespace.oid', 'pg_catalog.pg_extension.extnamespace')
-      // .where('pg_namespace.nspname', '=', schemaName)
-      .select(['extname as name', 'extversion as version'])
-      .execute()
-  );
-};
-
-const getTriggers = async (db: Kysely<PostgresDB>, schemaName: string) => {
-  return db
-    .selectFrom('pg_trigger as t')
-    .innerJoin('pg_proc as p', 't.tgfoid', 'p.oid')
-    .innerJoin('pg_namespace as n', 'p.pronamespace', 'n.oid')
-    .innerJoin('pg_class as c', 't.tgrelid', 'c.oid')
-    .select((eb) => [
-      't.tgname as name',
-      't.tgenabled as enabled',
-      't.tgtype as type',
-      't.tgconstraint as _constraint',
-      't.tgdeferrable as is_deferrable',
-      't.tginitdeferred as is_initially_deferred',
-      't.tgargs as arguments',
-      't.tgoldtable as referencing_old_table_as',
-      't.tgnewtable as referencing_new_table_as',
-      eb.fn<string>('pg_get_expr', ['t.tgqual', 't.tgrelid']).as('when_expression'),
-      'p.proname as function_name',
-      'c.relname as table_name',
-    ])
-    .where('t.tgisinternal', '=', false) // Exclude internal system triggers
-    .where('n.nspname', '=', schemaName)
-    .execute();
-};
-
-const getParameters = async (db: Kysely<PostgresDB>) => {
-  return db
-    .selectFrom('pg_settings')
-    .where('source', 'in', [sql.lit('database'), sql.lit('user')])
-    .select(['name', 'setting as value', 'source as scope'])
-    .execute();
-};
-
-const getObjectComments = async (db: Kysely<PostgresDB>) => {
-  return db
-    .selectFrom('pg_description as d')
-    .innerJoin('pg_class as c', 'd.objoid', 'c.oid')
-    .leftJoin('pg_attribute as a', (join) =>
-      join.onRef('a.attrelid', '=', 'c.oid').onRef('a.attnum', '=', 'd.objsubid'),
-    )
-    .select([
-      'c.relname as object_name',
-      'c.relkind as object_type',
-      'd.description as value',
-      'a.attname as column_name',
-    ])
-    .where('d.description', 'is not', null)
-    .orderBy('object_type')
-    .orderBy('object_name')
-    .execute();
+  return schema;
 };
diff --git a/server/src/sql-tools/from-database/readers/column.reader.ts b/server/src/sql-tools/from-database/readers/column.reader.ts
new file mode 100644
index 0000000000..167124bac9
--- /dev/null
+++ b/server/src/sql-tools/from-database/readers/column.reader.ts
@@ -0,0 +1,119 @@
+import { sql } from 'kysely';
+import { jsonArrayFrom } from 'kysely/helpers/postgres';
+import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+import { ColumnType, DatabaseColumn } from 'src/sql-tools/types';
+
+export const readColumns: DatabaseReader = async (schema, db) => {
+  const columns = await db
+    .selectFrom('information_schema.columns as c')
+    .leftJoin('information_schema.element_types as o', (join) =>
+      join
+        .onRef('c.table_catalog', '=', 'o.object_catalog')
+        .onRef('c.table_schema', '=', 'o.object_schema')
+        .onRef('c.table_name', '=', 'o.object_name')
+        .on('o.object_type', '=', sql.lit('TABLE'))
+        .onRef('c.dtd_identifier', '=', 'o.collection_type_identifier'),
+    )
+    .leftJoin('pg_type as t', (join) =>
+      join.onRef('t.typname', '=', 'c.udt_name').on('c.data_type', '=', sql.lit('USER-DEFINED')),
+    )
+    .leftJoin('pg_enum as e', (join) => join.onRef('e.enumtypid', '=', 't.oid'))
+    .select([
+      'c.table_name',
+      'c.column_name',
+
+      // is ARRAY, USER-DEFINED, or data type
+      'c.data_type',
+      'c.column_default',
+      'c.is_nullable',
+      'c.character_maximum_length',
+
+      // number types
+      'c.numeric_precision',
+      'c.numeric_scale',
+
+      // date types
+      'c.datetime_precision',
+
+      // user defined type
+      'c.udt_catalog',
+      'c.udt_schema',
+      'c.udt_name',
+
+      // data type for ARRAYs
+      'o.data_type as array_type',
+    ])
+    .where('table_schema', '=', schema.schemaName)
+    .execute();
+
+  const enumRaw = await db
+    .selectFrom('pg_type')
+    .innerJoin('pg_namespace', (join) =>
+      join.onRef('pg_namespace.oid', '=', 'pg_type.typnamespace').on('pg_namespace.nspname', '=', schema.schemaName),
+    )
+    .where('typtype', '=', sql.lit('e'))
+    .select((eb) => [
+      'pg_type.typname as name',
+      jsonArrayFrom(
+        eb.selectFrom('pg_enum as e').select(['e.enumlabel as value']).whereRef('e.enumtypid', '=', 'pg_type.oid'),
+      ).as('values'),
+    ])
+    .execute();
+
+  const enums = enumRaw.map((item) => ({ name: item.name, values: item.values.map(({ value }) => value) }));
+  for (const { name, values } of enums) {
+    schema.enums.push({ name, values, synchronize: true });
+  }
+
+  const enumMap = Object.fromEntries(enums.map((e) => [e.name, e.values]));
+  // add columns to tables
+  for (const column of columns) {
+    const table = schema.tables.find((table) => table.name === column.table_name);
+    if (!table) {
+      continue;
+    }
+
+    const columnName = column.column_name;
+
+    const item: DatabaseColumn = {
+      type: column.data_type as ColumnType,
+      name: columnName,
+      tableName: column.table_name,
+      nullable: column.is_nullable === 'YES',
+      isArray: column.array_type !== null,
+      numericPrecision: column.numeric_precision ?? undefined,
+      numericScale: column.numeric_scale ?? undefined,
+      length: column.character_maximum_length ?? undefined,
+      default: column.column_default ?? undefined,
+      synchronize: true,
+    };
+
+    const columnLabel = `${table.name}.${columnName}`;
+
+    switch (column.data_type) {
+      // array types
+      case 'ARRAY': {
+        if (!column.array_type) {
+          schema.warnings.push(`Unable to find type for ${columnLabel} (ARRAY)`);
+          continue;
+        }
+        item.type = column.array_type as ColumnType;
+        break;
+      }
+
+      // enum types
+      case 'USER-DEFINED': {
+        if (!enumMap[column.udt_name]) {
+          schema.warnings.push(`Unable to find type for ${columnLabel} (ENUM)`);
+          continue;
+        }
+
+        item.type = 'enum';
+        item.enumName = column.udt_name;
+        break;
+      }
+    }
+
+    table.columns.push(item);
+  }
+};
diff --git a/server/src/sql-tools/from-database/readers/comment.reader.ts b/server/src/sql-tools/from-database/readers/comment.reader.ts
new file mode 100644
index 0000000000..3dd4f4adc9
--- /dev/null
+++ b/server/src/sql-tools/from-database/readers/comment.reader.ts
@@ -0,0 +1,36 @@
+import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+
+export const readComments: DatabaseReader = async (schema, db) => {
+  const comments = await db
+    .selectFrom('pg_description as d')
+    .innerJoin('pg_class as c', 'd.objoid', 'c.oid')
+    .leftJoin('pg_attribute as a', (join) =>
+      join.onRef('a.attrelid', '=', 'c.oid').onRef('a.attnum', '=', 'd.objsubid'),
+    )
+    .select([
+      'c.relname as object_name',
+      'c.relkind as object_type',
+      'd.description as value',
+      'a.attname as column_name',
+    ])
+    .where('d.description', 'is not', null)
+    .orderBy('object_type')
+    .orderBy('object_name')
+    .execute();
+
+  for (const comment of comments) {
+    if (comment.object_type === 'r') {
+      const table = schema.tables.find((table) => table.name === comment.object_name);
+      if (!table) {
+        continue;
+      }
+
+      if (comment.column_name) {
+        const column = table.columns.find(({ name }) => name === comment.column_name);
+        if (column) {
+          column.comment = comment.value;
+        }
+      }
+    }
+  }
+};
diff --git a/server/src/sql-tools/from-database/readers/constraint.reader.ts b/server/src/sql-tools/from-database/readers/constraint.reader.ts
new file mode 100644
index 0000000000..a633324f25
--- /dev/null
+++ b/server/src/sql-tools/from-database/readers/constraint.reader.ts
@@ -0,0 +1,144 @@
+import { sql } from 'kysely';
+import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+import { DatabaseActionType, DatabaseConstraintType } from 'src/sql-tools/types';
+
+export const readConstraints: DatabaseReader = async (schema, db) => {
+  const constraints = await db
+    .selectFrom('pg_constraint')
+    .innerJoin('pg_namespace', 'pg_namespace.oid', 'pg_constraint.connamespace') // namespace
+    .innerJoin('pg_class as source_table', (join) =>
+      join.onRef('source_table.oid', '=', 'pg_constraint.conrelid').on('source_table.relkind', 'in', [
+        // ordinary table
+        sql.lit('r'),
+        // partitioned table
+        sql.lit('p'),
+        // foreign table
+        sql.lit('f'),
+      ]),
+    ) // table
+    .leftJoin('pg_class as reference_table', 'reference_table.oid', 'pg_constraint.confrelid') // reference table
+    .select((eb) => [
+      'pg_constraint.contype as constraint_type',
+      'pg_constraint.conname as constraint_name',
+      'source_table.relname as table_name',
+      'reference_table.relname as reference_table_name',
+      'pg_constraint.confupdtype as update_action',
+      'pg_constraint.confdeltype as delete_action',
+      // 'pg_constraint.oid as constraint_id',
+      eb
+        .selectFrom('pg_attribute')
+        // matching table for PK, FK, and UQ
+        .whereRef('pg_attribute.attrelid', '=', 'pg_constraint.conrelid')
+        .whereRef('pg_attribute.attnum', '=', sql`any("pg_constraint"."conkey")`)
+        .select((eb) => eb.fn<string[]>('json_agg', ['pg_attribute.attname']).as('column_name'))
+        .as('column_names'),
+      eb
+        .selectFrom('pg_attribute')
+        // matching foreign table for FK
+        .whereRef('pg_attribute.attrelid', '=', 'pg_constraint.confrelid')
+        .whereRef('pg_attribute.attnum', '=', sql`any("pg_constraint"."confkey")`)
+        .select((eb) => eb.fn<string[]>('json_agg', ['pg_attribute.attname']).as('column_name'))
+        .as('reference_column_names'),
+      eb.fn<string>('pg_get_constraintdef', ['pg_constraint.oid']).as('expression'),
+    ])
+    .where('pg_namespace.nspname', '=', schema.schemaName)
+    .execute();
+
+  for (const constraint of constraints) {
+    const table = schema.tables.find((table) => table.name === constraint.table_name);
+    if (!table) {
+      continue;
+    }
+
+    const constraintName = constraint.constraint_name;
+
+    switch (constraint.constraint_type) {
+      // primary key constraint
+      case 'p': {
+        if (!constraint.column_names) {
+          schema.warnings.push(`Skipping CONSTRAINT "${constraintName}", no columns found`);
+          continue;
+        }
+        table.constraints.push({
+          type: DatabaseConstraintType.PRIMARY_KEY,
+          name: constraintName,
+          tableName: constraint.table_name,
+          columnNames: constraint.column_names,
+          synchronize: true,
+        });
+        break;
+      }
+
+      // foreign key constraint
+      case 'f': {
+        if (!constraint.column_names || !constraint.reference_table_name || !constraint.reference_column_names) {
+          schema.warnings.push(
+            `Skipping CONSTRAINT "${constraintName}", missing either columns, referenced table, or referenced columns,`,
+          );
+          continue;
+        }
+
+        table.constraints.push({
+          type: DatabaseConstraintType.FOREIGN_KEY,
+          name: constraintName,
+          tableName: constraint.table_name,
+          columnNames: constraint.column_names,
+          referenceTableName: constraint.reference_table_name,
+          referenceColumnNames: constraint.reference_column_names,
+          onUpdate: asDatabaseAction(constraint.update_action),
+          onDelete: asDatabaseAction(constraint.delete_action),
+          synchronize: true,
+        });
+        break;
+      }
+
+      // unique constraint
+      case 'u': {
+        table.constraints.push({
+          type: DatabaseConstraintType.UNIQUE,
+          name: constraintName,
+          tableName: constraint.table_name,
+          columnNames: constraint.column_names as string[],
+          synchronize: true,
+        });
+        break;
+      }
+
+      //  check constraint
+      case 'c': {
+        table.constraints.push({
+          type: DatabaseConstraintType.CHECK,
+          name: constraint.constraint_name,
+          tableName: constraint.table_name,
+          expression: constraint.expression.replace('CHECK ', ''),
+          synchronize: true,
+        });
+        break;
+      }
+    }
+  }
+};
+
+const asDatabaseAction = (action: string) => {
+  switch (action) {
+    case 'a': {
+      return DatabaseActionType.NO_ACTION;
+    }
+    case 'c': {
+      return DatabaseActionType.CASCADE;
+    }
+    case 'r': {
+      return DatabaseActionType.RESTRICT;
+    }
+    case 'n': {
+      return DatabaseActionType.SET_NULL;
+    }
+    case 'd': {
+      return DatabaseActionType.SET_DEFAULT;
+    }
+
+    default: {
+      return DatabaseActionType.NO_ACTION;
+    }
+  }
+};
diff --git a/server/src/sql-tools/from-database/readers/extension.reader.ts b/server/src/sql-tools/from-database/readers/extension.reader.ts
new file mode 100644
index 0000000000..c0a59f85d8
--- /dev/null
+++ b/server/src/sql-tools/from-database/readers/extension.reader.ts
@@ -0,0 +1,14 @@
+import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+
+export const readExtensions: DatabaseReader = async (schema, db) => {
+  const extensions = await db
+    .selectFrom('pg_catalog.pg_extension')
+    // .innerJoin('pg_namespace', 'pg_namespace.oid', 'pg_catalog.pg_extension.extnamespace')
+    // .where('pg_namespace.nspname', '=', schemaName)
+    .select(['extname as name', 'extversion as version'])
+    .execute();
+
+  for (const { name } of extensions) {
+    schema.extensions.push({ name, synchronize: true });
+  }
+};
diff --git a/server/src/sql-tools/from-database/readers/function.reader.ts b/server/src/sql-tools/from-database/readers/function.reader.ts
new file mode 100644
index 0000000000..0c81117d7c
--- /dev/null
+++ b/server/src/sql-tools/from-database/readers/function.reader.ts
@@ -0,0 +1,27 @@
+import { sql } from 'kysely';
+import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+
+export const readFunctions: DatabaseReader = async (schema, db) => {
+  const routines = await db
+    .selectFrom('pg_proc as p')
+    .innerJoin('pg_namespace', 'pg_namespace.oid', 'p.pronamespace')
+    .leftJoin('pg_depend as d', (join) => join.onRef('d.objid', '=', 'p.oid').on('d.deptype', '=', sql.lit('e')))
+    .where('d.objid', 'is', sql.lit(null))
+    .where('p.prokind', '=', sql.lit('f'))
+    .where('pg_namespace.nspname', '=', schema.schemaName)
+    .select((eb) => [
+      'p.proname as name',
+      eb.fn<string>('pg_get_function_identity_arguments', ['p.oid']).as('arguments'),
+      eb.fn<string>('pg_get_functiondef', ['p.oid']).as('expression'),
+    ])
+    .execute();
+
+  for (const { name, expression } of routines) {
+    schema.functions.push({
+      name,
+      // TODO read expression from the overrides table
+      expression,
+      synchronize: true,
+    });
+  }
+};
diff --git a/server/src/sql-tools/from-database/readers/index.reader.ts b/server/src/sql-tools/from-database/readers/index.reader.ts
new file mode 100644
index 0000000000..681ba8f9ef
--- /dev/null
+++ b/server/src/sql-tools/from-database/readers/index.reader.ts
@@ -0,0 +1,58 @@
+import { sql } from 'kysely';
+import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+
+export const readIndexes: DatabaseReader = async (schema, db) => {
+  const indexes = await db
+    .selectFrom('pg_index as ix')
+    // matching index, which has column information
+    .innerJoin('pg_class as i', 'ix.indexrelid', 'i.oid')
+    .innerJoin('pg_am as a', 'i.relam', 'a.oid')
+    // matching table
+    .innerJoin('pg_class as t', 'ix.indrelid', 't.oid')
+    // namespace
+    .innerJoin('pg_namespace', 'pg_namespace.oid', 'i.relnamespace')
+    // PK and UQ constraints automatically have indexes, so we can ignore those
+    .leftJoin('pg_constraint', (join) =>
+      join
+        .onRef('pg_constraint.conindid', '=', 'i.oid')
+        .on('pg_constraint.contype', 'in', [sql.lit('p'), sql.lit('u')]),
+    )
+    .where('pg_constraint.oid', 'is', null)
+    .select((eb) => [
+      'i.relname as index_name',
+      't.relname as table_name',
+      'ix.indisunique as unique',
+      'a.amname as using',
+      eb.fn<string>('pg_get_expr', ['ix.indexprs', 'ix.indrelid']).as('expression'),
+      eb.fn<string>('pg_get_expr', ['ix.indpred', 'ix.indrelid']).as('where'),
+      eb
+        .selectFrom('pg_attribute as a')
+        .where('t.relkind', '=', sql.lit('r'))
+        .whereRef('a.attrelid', '=', 't.oid')
+        // list of columns numbers in the index
+        .whereRef('a.attnum', '=', sql`any("ix"."indkey")`)
+        .select((eb) => eb.fn<string[]>('json_agg', ['a.attname']).as('column_name'))
+        .as('column_names'),
+    ])
+    .where('pg_namespace.nspname', '=', schema.schemaName)
+    .where('ix.indisprimary', '=', sql.lit(false))
+    .execute();
+
+  for (const index of indexes) {
+    const table = schema.tables.find((table) => table.name === index.table_name);
+    if (!table) {
+      continue;
+    }
+
+    table.indexes.push({
+      name: index.index_name,
+      tableName: index.table_name,
+      columnNames: index.column_names ?? undefined,
+      expression: index.expression ?? undefined,
+      using: index.using,
+      where: index.where ?? undefined,
+      unique: index.unique,
+      synchronize: true,
+    });
+  }
+};
diff --git a/server/src/sql-tools/from-database/readers/name.reader.ts b/server/src/sql-tools/from-database/readers/name.reader.ts
new file mode 100644
index 0000000000..dc3d4ec745
--- /dev/null
+++ b/server/src/sql-tools/from-database/readers/name.reader.ts
@@ -0,0 +1,8 @@
+import { QueryResult, sql } from 'kysely';
+import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+
+export const readName: DatabaseReader = async (schema, db) => {
+  const result = (await sql`SELECT current_database() as name`.execute(db)) as QueryResult<{ name: string }>;
+
+  schema.name = result.rows[0].name;
+};
diff --git a/server/src/sql-tools/from-database/readers/parameter.reader.ts b/server/src/sql-tools/from-database/readers/parameter.reader.ts
new file mode 100644
index 0000000000..f58718a6b6
--- /dev/null
+++ b/server/src/sql-tools/from-database/readers/parameter.reader.ts
@@ -0,0 +1,21 @@
+import { sql } from 'kysely';
+import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+import { ParameterScope } from 'src/sql-tools/types';
+
+export const readParameters: DatabaseReader = async (schema, db) => {
+  const parameters = await db
+    .selectFrom('pg_settings')
+    .where('source', 'in', [sql.lit('database'), sql.lit('user')])
+    .select(['name', 'setting as value', 'source as scope'])
+    .execute();
+
+  for (const parameter of parameters) {
+    schema.parameters.push({
+      name: parameter.name,
+      value: parameter.value,
+      databaseName: schema.name,
+      scope: parameter.scope as ParameterScope,
+      synchronize: true,
+    });
+  }
+};
diff --git a/server/src/sql-tools/from-database/readers/table.reader.ts b/server/src/sql-tools/from-database/readers/table.reader.ts
new file mode 100644
index 0000000000..6dbf9fc8b8
--- /dev/null
+++ b/server/src/sql-tools/from-database/readers/table.reader.ts
@@ -0,0 +1,22 @@
+import { sql } from 'kysely';
+import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+
+export const readTables: DatabaseReader = async (schema, db) => {
+  const tables = await db
+    .selectFrom('information_schema.tables')
+    .where('table_schema', '=', schema.schemaName)
+    .where('table_type', '=', sql.lit('BASE TABLE'))
+    .selectAll()
+    .execute();
+
+  for (const table of tables) {
+    schema.tables.push({
+      name: table.table_name,
+      columns: [],
+      indexes: [],
+      triggers: [],
+      constraints: [],
+      synchronize: true,
+    });
+  }
+};
diff --git a/server/src/sql-tools/from-database/readers/trigger.reader.ts b/server/src/sql-tools/from-database/readers/trigger.reader.ts
new file mode 100644
index 0000000000..a174a7502b
--- /dev/null
+++ b/server/src/sql-tools/from-database/readers/trigger.reader.ts
@@ -0,0 +1,46 @@
+import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+import { parseTriggerType } from 'src/sql-tools/helpers';
+
+export const readTriggers: DatabaseReader = async (schema, db) => {
+  const triggers = await db
+    .selectFrom('pg_trigger as t')
+    .innerJoin('pg_proc as p', 't.tgfoid', 'p.oid')
+    .innerJoin('pg_namespace as n', 'p.pronamespace', 'n.oid')
+    .innerJoin('pg_class as c', 't.tgrelid', 'c.oid')
+    .select((eb) => [
+      't.tgname as name',
+      't.tgenabled as enabled',
+      't.tgtype as type',
+      't.tgconstraint as _constraint',
+      't.tgdeferrable as is_deferrable',
+      't.tginitdeferred as is_initially_deferred',
+      't.tgargs as arguments',
+      't.tgoldtable as referencing_old_table_as',
+      't.tgnewtable as referencing_new_table_as',
+      eb.fn<string>('pg_get_expr', ['t.tgqual', 't.tgrelid']).as('when_expression'),
+      'p.proname as function_name',
+      'c.relname as table_name',
+    ])
+    .where('t.tgisinternal', '=', false) // Exclude internal system triggers
+    .where('n.nspname', '=', schema.schemaName)
+    .execute();
+
+  // add triggers to tables
+  for (const trigger of triggers) {
+    const table = schema.tables.find((table) => table.name === trigger.table_name);
+    if (!table) {
+      continue;
+    }
+
+    table.triggers.push({
+      name: trigger.name,
+      tableName: trigger.table_name,
+      functionName: trigger.function_name,
+      referencingNewTableAs: trigger.referencing_new_table_as ?? undefined,
+      referencingOldTableAs: trigger.referencing_old_table_as ?? undefined,
+      when: trigger.when_expression,
+      synchronize: true,
+      ...parseTriggerType(trigger.type),
+    });
+  }
+};
diff --git a/server/src/sql-tools/from-database/readers/type.ts b/server/src/sql-tools/from-database/readers/type.ts
new file mode 100644
index 0000000000..d8a21d486b
--- /dev/null
+++ b/server/src/sql-tools/from-database/readers/type.ts
@@ -0,0 +1,3 @@
+import { DatabaseClient, DatabaseSchema } from 'src/sql-tools/types';
+
+export type DatabaseReader = (schema: DatabaseSchema, db: DatabaseClient) => Promise<void>;

From f2f3db3a79a734e5c0a9d814ad478eb0e118f426 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Wed, 2 Jul 2025 09:38:52 +0530
Subject: [PATCH 118/337] refactor: action provider (#19677)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../infrastructure/action.provider.dart       | 57 +++++++++++--------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 940adf10ed..57dde6456e 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -39,12 +39,19 @@ class ActionNotifier extends Notifier<void> {
     _service = ref.watch(actionServiceProvider);
   }
 
-  List<String> _getIdsForSource<T extends BaseAsset>(ActionSource source) {
-    final currentUser = ref.read(currentUserProvider);
-    if (T is RemoteAsset && currentUser == null) {
-      return [];
-    }
+  List<String> _getRemoteIdsForSource(ActionSource source) {
+    return _getIdsForSource<RemoteAsset>(source).toIds().toList();
+  }
 
+  List<String> _getOwnedRemoteForSource(ActionSource source) {
+    final ownerId = ref.read(currentUserProvider)?.id;
+    return _getIdsForSource<RemoteAsset>(source)
+        .ownedAssets(ownerId)
+        .toIds()
+        .toList();
+  }
+
+  Iterable<T> _getIdsForSource<T extends BaseAsset>(ActionSource source) {
     final Set<BaseAsset> assets = switch (source) {
       ActionSource.timeline =>
         ref.read(multiSelectProvider.select((s) => s.selectedAssets)),
@@ -52,24 +59,17 @@ class ActionNotifier extends Notifier<void> {
     };
 
     return switch (T) {
-      const (RemoteAsset) => assets
-          .where(
-            (asset) => asset is RemoteAsset && asset.ownerId == currentUser!.id,
-          )
-          .cast<RemoteAsset>()
-          .map((asset) => asset.id)
-          .toList(),
-      const (LocalAsset) =>
-        assets.whereType<LocalAsset>().map((asset) => asset.id).toList(),
-      _ => [],
-    };
+      const (RemoteAsset) => assets.whereType<RemoteAsset>(),
+      const (LocalAsset) => assets.whereType<LocalAsset>(),
+      _ => <T>[],
+    } as Iterable<T>;
   }
 
   Future<ActionResult> shareLink(
     ActionSource source,
     BuildContext context,
   ) async {
-    final ids = _getIdsForSource<RemoteAsset>(source);
+    final ids = _getRemoteIdsForSource(source);
     try {
       await _service.shareLink(ids, context);
       return ActionResult(count: ids.length, success: true);
@@ -84,7 +84,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> favorite(ActionSource source) async {
-    final ids = _getIdsForSource<RemoteAsset>(source);
+    final ids = _getOwnedRemoteForSource(source);
     try {
       await _service.favorite(ids);
       return ActionResult(count: ids.length, success: true);
@@ -99,7 +99,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> unFavorite(ActionSource source) async {
-    final ids = _getIdsForSource<RemoteAsset>(source);
+    final ids = _getOwnedRemoteForSource(source);
     try {
       await _service.unFavorite(ids);
       return ActionResult(count: ids.length, success: true);
@@ -114,7 +114,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> archive(ActionSource source) async {
-    final ids = _getIdsForSource<RemoteAsset>(source);
+    final ids = _getOwnedRemoteForSource(source);
     try {
       await _service.archive(ids);
       return ActionResult(count: ids.length, success: true);
@@ -129,7 +129,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> unArchive(ActionSource source) async {
-    final ids = _getIdsForSource<RemoteAsset>(source);
+    final ids = _getOwnedRemoteForSource(source);
     try {
       await _service.unArchive(ids);
       return ActionResult(count: ids.length, success: true);
@@ -144,7 +144,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> moveToLockFolder(ActionSource source) async {
-    final ids = _getIdsForSource<RemoteAsset>(source);
+    final ids = _getOwnedRemoteForSource(source);
     try {
       await _service.moveToLockFolder(ids);
       return ActionResult(count: ids.length, success: true);
@@ -159,7 +159,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> removeFromLockFolder(ActionSource source) async {
-    final ids = _getIdsForSource<RemoteAsset>(source);
+    final ids = _getOwnedRemoteForSource(source);
     try {
       await _service.removeFromLockFolder(ids);
       return ActionResult(count: ids.length, success: true);
@@ -177,7 +177,7 @@ class ActionNotifier extends Notifier<void> {
     ActionSource source,
     BuildContext context,
   ) async {
-    final ids = _getIdsForSource<RemoteAsset>(source);
+    final ids = _getOwnedRemoteForSource(source);
     try {
       final isEdited = await _service.editLocation(ids, context);
       if (!isEdited) {
@@ -195,3 +195,12 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 }
+
+extension on Iterable<RemoteAsset> {
+  Iterable<String> toIds() => map((e) => e.id);
+
+  Iterable<RemoteAsset> ownedAssets(String? ownerId) {
+    if (ownerId == null) return [];
+    return whereType<RemoteAsset>().where((a) => a.ownerId == ownerId);
+  }
+}

From ca78bc91b671d17186cb2e8d1f61ca61727a7e63 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Wed, 2 Jul 2025 09:31:20 -0400
Subject: [PATCH 119/337] feat: fully qualified path in error msg (#19674)

* feat: fully qualified path in error msg

* import style
---
 server/src/services/storage.service.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/src/services/storage.service.ts b/server/src/services/storage.service.ts
index 99d89df099..3861f84815 100644
--- a/server/src/services/storage.service.ts
+++ b/server/src/services/storage.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { join } from 'node:path';
+import { join, resolve } from 'node:path';
 import { StorageCore } from 'src/cores/storage.core';
 import { OnEvent, OnJob } from 'src/decorators';
 import { DatabaseLock, JobName, JobStatus, QueueName, StorageFolder, SystemMetadataKey } from 'src/enum';
@@ -87,8 +87,9 @@ export class StorageService extends BaseService {
     try {
       await this.storageRepository.readFile(internalPath);
     } catch (error) {
-      this.logger.error(`Failed to read ${internalPath}: ${error}`);
-      throw new ImmichStartupError(`Failed to read "${externalPath} - ${docsMessage}"`);
+      const fullyQualifiedPath = resolve(process.cwd(), internalPath);
+      this.logger.error(`Failed to read ${fullyQualifiedPath} (${internalPath}): ${error}`);
+      throw new ImmichStartupError(`Failed to read: "${externalPath} (${fullyQualifiedPath}) - ${docsMessage}"`);
     }
   }
 

From b8e67d0ef9ac58a10fed36fd53a2106b9e68556b Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Thu, 3 Jul 2025 01:25:14 +0800
Subject: [PATCH 120/337] fix(mobile): filter deleted assets (#19683)

---
 mobile/lib/infrastructure/entities/merged_asset.drift  | 10 +++++-----
 .../infrastructure/entities/merged_asset.drift.dart    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift b/mobile/lib/infrastructure/entities/merged_asset.drift
index 51f731f0ff..825484503b 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -1,7 +1,7 @@
 import 'remote_asset.entity.dart';
 import 'local_asset.entity.dart';
 
-mergedAsset: SELECT * FROM 
+mergedAsset: SELECT * FROM
 (
 	SELECT
 		rae.id as remote_id,
@@ -22,7 +22,7 @@ mergedAsset: SELECT * FROM
 	LEFT JOIN
 		local_asset_entity lae ON rae.checksum  = lae.checksum
 	WHERE
-		rae.visibility = 0 AND rae.owner_id in ?
+		rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ?
 	UNION ALL
 	SELECT
 		NULL as remote_id,
@@ -48,8 +48,8 @@ mergedAsset: SELECT * FROM
 ORDER BY created_at DESC
 LIMIT $limit;
 
-mergedBucket(:group_by AS INTEGER): 
-SELECT 
+mergedBucket(:group_by AS INTEGER):
+SELECT
 	COUNT(*) as asset_count,
 	 CASE
         WHEN :group_by = 0 THEN STRFTIME('%Y-%m-%d', created_at) -- day
@@ -65,7 +65,7 @@ FROM
 	LEFT JOIN
 		local_asset_entity lae  ON rae.checksum  = lae.checksum
 	WHERE
-		rae.visibility = 0 AND rae.owner_id in ?
+		rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ?
 	UNION ALL
 	SELECT
 		lae.name,
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift.dart b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
index be9d8b521e..19fb9e3dac 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift.dart
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
@@ -18,7 +18,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
     final generatedlimit = $write(limit, startIndex: $arrayStartIndex);
     $arrayStartIndex += generatedlimit.amountOfVariables;
     return customSelect(
-        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
+        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
         variables: [
           for (var $ in var1) i0.Variable<String>($),
           ...generatedlimit.introducedVariables
@@ -51,7 +51,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
     final expandedvar2 = $expandVar($arrayStartIndex, var2.length);
     $arrayStartIndex += var2.length;
     return customSelect(
-        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at) WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at) END AS bucket_date FROM (SELECT rae.name, rae.created_at FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) UNION ALL SELECT lae.name, lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) GROUP BY bucket_date ORDER BY bucket_date DESC',
+        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at) WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at) END AS bucket_date FROM (SELECT rae.name, rae.created_at FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) UNION ALL SELECT lae.name, lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) GROUP BY bucket_date ORDER BY bucket_date DESC',
         variables: [
           i0.Variable<int>(groupBy),
           for (var $ in var2) i0.Variable<String>($)

From a644cabab6e117323211ca76b0e5ef01f232eb1a Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Thu, 3 Jul 2025 01:26:07 +0800
Subject: [PATCH 121/337] feat(mobile): trash and delete action (#19681)

* feat(mobile): trash and delete action

* fix lint
---
 i18n/en.json                                  |  2 +
 .../repositories/remote_asset.repository.dart | 16 ++++++++
 .../delete_action_button.widget.dart          | 37 ++++++++++++++++++-
 .../trash_action_buton.widget.dart            | 37 ++++++++++++++++++-
 .../home_bottom_app_bar.widget.dart           |  6 ++-
 .../infrastructure/action.provider.dart       | 30 +++++++++++++++
 .../repositories/asset_api.repository.dart    |  4 ++
 mobile/lib/services/action.service.dart       | 10 +++++
 8 files changed, 138 insertions(+), 4 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index d81a6270ad..97d4457427 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -719,6 +719,7 @@
   "default_locale": "Default Locale",
   "default_locale_description": "Format dates and numbers based on your browser locale",
   "delete": "Delete",
+  "delete_action_prompt": "{count} deleted permanently",
   "delete_album": "Delete album",
   "delete_api_key_prompt": "Are you sure you want to delete this API key?",
   "delete_dialog_alert": "These items will be permanently deleted from Immich and from your device",
@@ -1842,6 +1843,7 @@
   "total": "Total",
   "total_usage": "Total usage",
   "trash": "Trash",
+  "trash_action_prompt": "{count} moved to trash",
   "trash_all": "Trash All",
   "trash_count": "Trash {count, number}",
   "trash_delete_asset": "Trash/Delete Asset",
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index a9e0811104..4ac2073dda 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -33,6 +33,22 @@ class DriftRemoteAssetRepository extends DriftDatabaseRepository {
     });
   }
 
+  Future<void> trash(List<String> ids) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteAssetEntity,
+          RemoteAssetEntityCompanion(deletedAt: Value(DateTime.now())),
+          where: (e) => e.id.equals(id),
+        );
+      }
+    });
+  }
+
+  Future<void> delete(List<String> ids) {
+    return _db.remoteAssetEntity.deleteWhere((row) => row.id.isIn(ids));
+  }
+
   Future<void> updateLocation(List<String> ids, LatLng location) {
     return _db.batch((batch) async {
       for (final id in ids) {
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
index ff77e99041..6f8c0f5227 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
@@ -1,10 +1,44 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class DeletePermanentActionButton extends ConsumerWidget {
-  const DeletePermanentActionButton({super.key});
+  final ActionSource source;
+
+  const DeletePermanentActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).delete(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'delete_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -12,6 +46,7 @@ class DeletePermanentActionButton extends ConsumerWidget {
       maxWidth: 110.0,
       iconData: Icons.delete_forever,
       label: "delete_dialog_title".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart b/mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart
index ccaaf314fc..1d287e34e2 100644
--- a/mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart
@@ -1,10 +1,44 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class TrashActionButton extends ConsumerWidget {
-  const TrashActionButton({super.key});
+  final ActionSource source;
+
+  const TrashActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).trash(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'trash_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -12,6 +46,7 @@ class TrashActionButton extends ConsumerWidget {
       maxWidth: 85.0,
       iconData: Icons.delete_outline_rounded,
       label: "control_bottom_app_bar_trash_from_immich".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
index d122d188ff..7f870bfdff 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
@@ -39,8 +39,10 @@ class HomeBottomAppBar extends ConsumerWidget {
           const FavoriteActionButton(source: ActionSource.timeline),
           const DownloadActionButton(),
           isTrashEnable
-              ? const TrashActionButton()
-              : const DeletePermanentActionButton(),
+              ? const TrashActionButton(source: ActionSource.timeline)
+              : const DeletePermanentActionButton(
+                  source: ActionSource.timeline,
+                ),
           const EditDateTimeActionButton(),
           const EditLocationActionButton(source: ActionSource.timeline),
           const MoveToLockFolderActionButton(
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 57dde6456e..4f92d4e325 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -173,6 +173,36 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
+  Future<ActionResult> trash(ActionSource source) async {
+    final ids = _getOwnedRemoteForSource(source);
+    try {
+      await _service.trash(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to trash assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult> delete(ActionSource source) async {
+    final ids = _getOwnedRemoteForSource(source);
+    try {
+      await _service.delete(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to delete assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
   Future<ActionResult?> editLocation(
     ActionSource source,
     BuildContext context,
diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dart
index 9631428409..0dff309172 100644
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -48,6 +48,10 @@ class AssetApiRepository extends ApiRepository {
     return result;
   }
 
+  Future<void> delete(List<String> ids, bool force) async {
+    return _api.deleteAssets(AssetBulkDeleteDto(ids: ids, force: force));
+  }
+
   Future<void> updateVisibility(
     List<String> ids,
     AssetVisibilityEnum visibility,
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index b5ddbac270..d1aabf3fb6 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -93,6 +93,16 @@ class ActionService {
     );
   }
 
+  Future<void> trash(List<String> remoteIds) async {
+    await _assetApiRepository.delete(remoteIds, false);
+    await _remoteAssetRepository.trash(remoteIds);
+  }
+
+  Future<void> delete(List<String> remoteIds) async {
+    await _assetApiRepository.delete(remoteIds, true);
+    await _remoteAssetRepository.delete(remoteIds);
+  }
+
   Future<bool> editLocation(
     List<String> remoteIds,
     BuildContext context,

From 14276f41d85a5a0a2be6d0df6e159a706bea2818 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Wed, 2 Jul 2025 22:56:42 +0530
Subject: [PATCH 122/337] fix: handle null bucket name during android sync
 (#19685)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 9ec0d763f7..5183c274b3 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
@@ -5,6 +5,7 @@ import android.content.Context
 import android.database.Cursor
 import android.provider.MediaStore
 import android.util.Log
+import androidx.core.database.getStringOrNull
 import java.io.File
 import java.io.FileInputStream
 import java.security.MessageDigest
@@ -152,7 +153,8 @@ open class NativeSyncApiImplBase(context: Context) {
           continue
         }
 
-        val name = cursor.getString(bucketNameColumn)
+        // MediaStore might return null for bucket name (commonly for the Root Directory), so default to "Internal Storage"
+        val name = cursor.getStringOrNull(bucketNameColumn) ?: "Internal Storage"
         val updatedAt = cursor.getLong(dateModified)
         albums.add(PlatformAlbum(id, name, updatedAt, false, 0))
         albumsCount[id] = 1

From ec603a008ce4b037c8a4ee8bf494399069e8ca5f Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Thu, 3 Jul 2025 01:27:30 +0800
Subject: [PATCH 123/337] feat(mobile): unarchive and unfavorite action
 (#19678)

---
 i18n/en.json                                  |  2 +
 .../unarchive_action_button.widget.dart       | 37 ++++++++++++++++++-
 .../unfavorite_action_button.widget.dart      | 37 ++++++++++++++++++-
 3 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 97d4457427..91a55cc85f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1861,9 +1861,11 @@
   "unable_to_change_pin_code": "Unable to change PIN code",
   "unable_to_setup_pin_code": "Unable to setup PIN code",
   "unarchive": "Unarchive",
+  "unarchive_action_prompt": "{count} removed from Archive",
   "unarchived_count": "{count, plural, other {Unarchived #}}",
   "undo": "Undo",
   "unfavorite": "Unfavorite",
+  "unfavorite_action_prompt": "{count} removed from Favorites",
   "unhide_person": "Unhide person",
   "unknown": "Unknown",
   "unknown_country": "Unknown Country",
diff --git a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
index 7fa0f8513a..b5e210eb3b 100644
--- a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
@@ -1,16 +1,51 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class UnarchiveActionButton extends ConsumerWidget {
-  const UnarchiveActionButton({super.key});
+  final ActionSource source;
+
+  const UnarchiveActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).unArchive(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'unarchive_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.unarchive_outlined,
       label: "unarchive".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
index 420821ef3f..2d485f3418 100644
--- a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
@@ -1,16 +1,51 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class UnFavoriteActionButton extends ConsumerWidget {
-  const UnFavoriteActionButton({super.key});
+  final ActionSource source;
+
+  const UnFavoriteActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).unFavorite(source);
+    await ref.read(timelineServiceProvider).reloadBucket();
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'unfavorite_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.favorite_rounded,
       label: "unfavorite".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }

From 7855974a29e28746b854fca858b69b71637e8806 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Wed, 2 Jul 2025 23:54:37 +0530
Subject: [PATCH 124/337] feat(mobile): sqlite asset viewer (#19552)

* add full image provider and refactor thumb providers

* photo_view updates

* wip: asset-viewer

* fix controller dispose on page change

* wip: bottom sheet

* fix interactions

* more bottomsheet changes

* generate schema

* PR feedback

* refactor asset viewer

* never rotate and fix background on page change

* use photoview as the loading builder

* precache after delay

* claude: optimizing rebuild of image provider

* claude: optimizing image decoding and caching

* use proper cache for new full size image providers

* chore: load local HEIC fullsize for iOS

* make controller callbacks nullable

* remove imageprovider cache

* do not handle drag gestures when zoomed

* use loadOriginal setting for HEIC / larger images

* preload assets outside timer

* never use same controllers in photo-view gallery

* fix: cannot scroll down once swipe with bottom sheet

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../drift_schemas/main/drift_schema_v1.json   |   2 +-
 .../domain/models/asset/base_asset.model.dart |  10 +
 .../models/asset/local_asset.model.dart       |   5 +
 .../models/asset/remote_asset.model.dart      |   5 +
 mobile/lib/domain/models/exif.model.dart      |  13 +
 mobile/lib/domain/models/setting.model.dart   |   5 +-
 mobile/lib/domain/services/asset.service.dart |  19 +
 .../lib/domain/services/setting.service.dart  |   5 +
 .../lib/domain/services/timeline.service.dart |  21 +-
 .../infrastructure/entities/exif.entity.dart  |  27 +
 .../entities/exif.entity.drift.dart           |  52 ++
 .../entities/merged_asset.drift               |   4 +-
 .../entities/merged_asset.drift.dart          |   2 +-
 .../repositories/exif.repository.dart         |  35 --
 .../repositories/remote_asset.repository.dart |  14 +-
 .../repositories/storage.repository.dart      |   7 +-
 .../repositories/sync_stream.repository.dart  |   5 +-
 .../lib/pages/common/gallery_viewer.page.dart |   6 +-
 .../asset_viewer/asset_viewer.page.dart       | 473 ++++++++++++++++++
 .../widgets/asset_viewer/bottom_sheet.dart    | 199 ++++++++
 .../base_bottom_sheet.widget.dart             |  31 +-
 .../widgets/images/full_image.widget.dart     |  38 ++
 .../widgets/images/image_provider.dart        |  63 +++
 .../widgets/images/local_image_provider.dart  | 241 +++++++++
 .../widgets/images/local_thumb_provider.dart  |  95 ----
 .../widgets/images/remote_image_provider.dart | 142 ++++++
 .../widgets/images/remote_thumb_provider.dart |  80 ---
 .../widgets/images/thumbnail.widget.dart      |  42 +-
 .../widgets/images/thumbnail_tile.widget.dart |  11 +-
 .../widgets/timeline/fixed/segment.model.dart | 270 +++++-----
 .../infrastructure/asset.provider.dart        |  11 +-
 .../asset_viewer/current_asset.provider.dart  |  26 +
 .../infrastructure/exif.provider.dart         |   4 -
 .../infrastructure/storage.provider.dart      |   2 +-
 mobile/lib/routing/router.dart                |  14 +
 mobile/lib/routing/router.gr.dart             |  52 ++
 mobile/lib/services/action.service.dart       |  11 +-
 .../lib/utils/cache/custom_image_cache.dart   |  12 +-
 mobile/lib/utils/image_url_builder.dart       |   3 +
 mobile/lib/widgets/photo_view/photo_view.dart |  40 +-
 .../photo_view/photo_view_gallery.dart        |  56 ++-
 .../src/controller/photo_view_controller.dart |  41 ++
 .../photo_view_controller_delegate.dart       |  10 +
 .../photo_view_scalestate_controller.dart     |  21 +
 .../photo_view/src/core/photo_view_core.dart  | 112 ++++-
 .../src/core/photo_view_gesture_detector.dart |  11 +-
 .../photo_view/src/photo_view_wrappers.dart   |   9 +
 47 files changed, 1867 insertions(+), 490 deletions(-)
 create mode 100644 mobile/lib/domain/services/asset.service.dart
 create mode 100644 mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
 create mode 100644 mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.dart
 create mode 100644 mobile/lib/presentation/widgets/images/full_image.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/images/image_provider.dart
 create mode 100644 mobile/lib/presentation/widgets/images/local_image_provider.dart
 delete mode 100644 mobile/lib/presentation/widgets/images/local_thumb_provider.dart
 create mode 100644 mobile/lib/presentation/widgets/images/remote_image_provider.dart
 delete mode 100644 mobile/lib/presentation/widgets/images/remote_thumb_provider.dart
 create mode 100644 mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart

diff --git a/mobile/drift_schemas/main/drift_schema_v1.json b/mobile/drift_schemas/main/drift_schema_v1.json
index 096128e526..30f92cf8db 100644
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
@@ -1 +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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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"]}}]}
\ No newline at end of file
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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"]}}]}
\ No newline at end of file
diff --git a/mobile/lib/domain/models/asset/base_asset.model.dart b/mobile/lib/domain/models/asset/base_asset.model.dart
index 9833f9a682..dd57456c76 100644
--- a/mobile/lib/domain/models/asset/base_asset.model.dart
+++ b/mobile/lib/domain/models/asset/base_asset.model.dart
@@ -40,7 +40,17 @@ sealed class BaseAsset {
 
   bool get isImage => type == AssetType.image;
   bool get isVideo => type == AssetType.video;
+
+  double? get aspectRatio {
+    if (width != null && height != null && height! > 0) {
+      return width! / height!;
+    }
+    return null;
+  }
+
+  // Overridden in subclasses
   AssetState get storage;
+  String get heroTag;
 
   @override
   String toString() {
diff --git a/mobile/lib/domain/models/asset/local_asset.model.dart b/mobile/lib/domain/models/asset/local_asset.model.dart
index 95eb1bce9f..8aab1e3431 100644
--- a/mobile/lib/domain/models/asset/local_asset.model.dart
+++ b/mobile/lib/domain/models/asset/local_asset.model.dart
@@ -22,6 +22,11 @@ class LocalAsset extends BaseAsset {
   AssetState get storage =>
       remoteId == null ? AssetState.local : AssetState.merged;
 
+  @override
+  String get heroTag => '${id}_${remoteId ?? checksum}';
+
+  bool get hasRemote => remoteId != null;
+
   @override
   String toString() {
     return '''LocalAsset {
diff --git a/mobile/lib/domain/models/asset/remote_asset.model.dart b/mobile/lib/domain/models/asset/remote_asset.model.dart
index 608a03f2b2..052e1d5eff 100644
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -36,6 +36,11 @@ class RemoteAsset extends BaseAsset {
   AssetState get storage =>
       localId == null ? AssetState.remote : AssetState.merged;
 
+  @override
+  String get heroTag => '${localId ?? checksum}_$id';
+
+  bool get hasLocal => localId != null;
+
   @override
   String toString() {
     return '''Asset {
diff --git a/mobile/lib/domain/models/exif.model.dart b/mobile/lib/domain/models/exif.model.dart
index e95653ca4e..b73aa4cae1 100644
--- a/mobile/lib/domain/models/exif.model.dart
+++ b/mobile/lib/domain/models/exif.model.dart
@@ -3,6 +3,8 @@ class ExifInfo {
   final int? fileSize;
   final String? description;
   final bool isFlipped;
+  final double? width;
+  final double? height;
   final String? orientation;
   final String? timeZone;
   final DateTime? dateTimeOriginal;
@@ -45,6 +47,8 @@ class ExifInfo {
     this.fileSize,
     this.description,
     this.orientation,
+    this.width,
+    this.height,
     this.timeZone,
     this.dateTimeOriginal,
     this.isFlipped = false,
@@ -68,6 +72,9 @@ class ExifInfo {
 
     return other.fileSize == fileSize &&
         other.description == description &&
+        other.isFlipped == isFlipped &&
+        other.width == width &&
+        other.height == height &&
         other.orientation == orientation &&
         other.timeZone == timeZone &&
         other.dateTimeOriginal == dateTimeOriginal &&
@@ -91,6 +98,9 @@ class ExifInfo {
     return fileSize.hashCode ^
         description.hashCode ^
         orientation.hashCode ^
+        isFlipped.hashCode ^
+        width.hashCode ^
+        height.hashCode ^
         timeZone.hashCode ^
         dateTimeOriginal.hashCode ^
         latitude.hashCode ^
@@ -114,6 +124,9 @@ class ExifInfo {
 fileSize: ${fileSize ?? 'NA'},
 description: ${description ?? 'NA'},
 orientation: ${orientation ?? 'NA'},
+width: ${width ?? 'NA'},
+height: ${height ?? 'NA'},
+isFlipped: $isFlipped,
 timeZone: ${timeZone ?? 'NA'},
 dateTimeOriginal: ${dateTimeOriginal ?? 'NA'},
 latitude: ${latitude ?? 'NA'},
diff --git a/mobile/lib/domain/models/setting.model.dart b/mobile/lib/domain/models/setting.model.dart
index d975cbb4fe..fe341dc028 100644
--- a/mobile/lib/domain/models/setting.model.dart
+++ b/mobile/lib/domain/models/setting.model.dart
@@ -3,7 +3,10 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 enum Setting<T> {
   tilesPerRow<int>(StoreKey.tilesPerRow, 4),
   groupAssetsBy<int>(StoreKey.groupAssetsBy, 0),
-  showStorageIndicator<bool>(StoreKey.storageIndicator, true);
+  showStorageIndicator<bool>(StoreKey.storageIndicator, true),
+  loadOriginal<bool>(StoreKey.loadOriginal, false),
+  preferRemoteImage<bool>(StoreKey.preferRemoteImage, false),
+  ;
 
   const Setting(this.storeKey, this.defaultValue);
 
diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dart
new file mode 100644
index 0000000000..ee39220554
--- /dev/null
+++ b/mobile/lib/domain/services/asset.service.dart
@@ -0,0 +1,19 @@
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
+
+class AssetService {
+  final RemoteAssetRepository _remoteAssetRepository;
+
+  const AssetService({
+    required RemoteAssetRepository remoteAssetRepository,
+  }) : _remoteAssetRepository = remoteAssetRepository;
+
+  Future<ExifInfo?> getExif(BaseAsset asset) async {
+    if (asset is LocalAsset || asset is! RemoteAsset) {
+      return null;
+    }
+
+    return _remoteAssetRepository.getExif(asset.id);
+  }
+}
diff --git a/mobile/lib/domain/services/setting.service.dart b/mobile/lib/domain/services/setting.service.dart
index 2d1937be5a..8f91e9c66b 100644
--- a/mobile/lib/domain/services/setting.service.dart
+++ b/mobile/lib/domain/services/setting.service.dart
@@ -1,6 +1,11 @@
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 
+// Singleton instance of SettingsService, to use in places
+// where reactivity is not required
+// ignore: non_constant_identifier_names
+final AppSetting = SettingsService(storeService: StoreService.I);
+
 class SettingsService {
   final StoreService _storeService;
 
diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 56a12cac07..54a9a3a142 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -57,14 +57,19 @@ class TimelineFactory {
 class TimelineService {
   final TimelineAssetSource _assetSource;
   final TimelineBucketSource _bucketSource;
+  int _totalAssets = 0;
+  int get totalAssets => _totalAssets;
 
   TimelineService({
     required TimelineAssetSource assetSource,
     required TimelineBucketSource bucketSource,
   })  : _assetSource = assetSource,
         _bucketSource = bucketSource {
-    _bucketSubscription =
-        _bucketSource().listen((_) => unawaited(reloadBucket()));
+    _bucketSubscription = _bucketSource().listen((buckets) {
+      _totalAssets =
+          buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
+      unawaited(reloadBucket());
+    });
   }
 
   final AsyncMutex _mutex = AsyncMutex();
@@ -117,6 +122,7 @@ class TimelineService {
       index >= _bufferOffset && index + count <= _bufferOffset + _buffer.length;
 
   List<BaseAsset> getAssets(int index, int count) {
+    assert(index + count <= totalAssets);
     if (!hasRange(index, count)) {
       throw RangeError('TimelineService::getAssets Index out of range');
     }
@@ -124,6 +130,17 @@ class TimelineService {
     return _buffer.slice(start, start + count);
   }
 
+  // Pre-cache assets around the given index for asset viewer
+  Future<void> preCacheAssets(int index) =>
+      _mutex.run(() => _loadAssets(index, 5));
+
+  BaseAsset getAsset(int index) {
+    if (!hasRange(index, 1)) {
+      throw RangeError('TimelineService::getAsset Index out of range');
+    }
+    return _buffer.elementAt(index - _bufferOffset);
+  }
+
   Future<void> dispose() async {
     await _bucketSubscription?.cancel();
     _bucketSubscription = null;
diff --git a/mobile/lib/infrastructure/entities/exif.entity.dart b/mobile/lib/infrastructure/entities/exif.entity.dart
index c78643d89b..2ec8f0023f 100644
--- a/mobile/lib/infrastructure/entities/exif.entity.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.dart
@@ -1,5 +1,6 @@
 import 'package:drift/drift.dart' hide Query;
 import 'package:immich_mobile/domain/models/exif.model.dart' as domain;
+import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
@@ -132,6 +133,8 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {
 
   TextColumn get model => text().nullable()();
 
+  TextColumn get lens => text().nullable()();
+
   TextColumn get orientation => text().nullable()();
 
   TextColumn get timeZone => text().nullable()();
@@ -143,3 +146,27 @@ class RemoteExifEntity extends Table with DriftDefaultsMixin {
   @override
   Set<Column> get primaryKey => {assetId};
 }
+
+extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
+  domain.ExifInfo toDto() => domain.ExifInfo(
+        fileSize: fileSize,
+        dateTimeOriginal: dateTimeOriginal,
+        timeZone: timeZone,
+        make: make,
+        model: model,
+        iso: iso,
+        city: city,
+        state: state,
+        country: country,
+        description: description,
+        orientation: orientation,
+        latitude: latitude,
+        longitude: longitude,
+        f: fNumber?.toDouble(),
+        mm: focalLength?.toDouble(),
+        lens: lens,
+        width: width?.toDouble(),
+        height: height?.toDouble(),
+        isFlipped: ExifDtoConverter.isOrientationFlipped(orientation),
+      );
+}
diff --git a/mobile/lib/infrastructure/entities/exif.entity.drift.dart b/mobile/lib/infrastructure/entities/exif.entity.drift.dart
index a8fd3a4477..10712948ea 100644
--- a/mobile/lib/infrastructure/entities/exif.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.drift.dart
@@ -27,6 +27,7 @@ typedef $$RemoteExifEntityTableCreateCompanionBuilder
   i0.Value<int?> iso,
   i0.Value<String?> make,
   i0.Value<String?> model,
+  i0.Value<String?> lens,
   i0.Value<String?> orientation,
   i0.Value<String?> timeZone,
   i0.Value<int?> rating,
@@ -51,6 +52,7 @@ typedef $$RemoteExifEntityTableUpdateCompanionBuilder
   i0.Value<int?> iso,
   i0.Value<String?> make,
   i0.Value<String?> model,
+  i0.Value<String?> lens,
   i0.Value<String?> orientation,
   i0.Value<String?> timeZone,
   i0.Value<int?> rating,
@@ -150,6 +152,9 @@ class $$RemoteExifEntityTableFilterComposer
   i0.ColumnFilters<String> get model => $composableBuilder(
       column: $table.model, builder: (column) => i0.ColumnFilters(column));
 
+  i0.ColumnFilters<String> get lens => $composableBuilder(
+      column: $table.lens, builder: (column) => i0.ColumnFilters(column));
+
   i0.ColumnFilters<String> get orientation => $composableBuilder(
       column: $table.orientation,
       builder: (column) => i0.ColumnFilters(column));
@@ -249,6 +254,9 @@ class $$RemoteExifEntityTableOrderingComposer
   i0.ColumnOrderings<String> get model => $composableBuilder(
       column: $table.model, builder: (column) => i0.ColumnOrderings(column));
 
+  i0.ColumnOrderings<String> get lens => $composableBuilder(
+      column: $table.lens, builder: (column) => i0.ColumnOrderings(column));
+
   i0.ColumnOrderings<String> get orientation => $composableBuilder(
       column: $table.orientation,
       builder: (column) => i0.ColumnOrderings(column));
@@ -345,6 +353,9 @@ class $$RemoteExifEntityTableAnnotationComposer
   i0.GeneratedColumn<String> get model =>
       $composableBuilder(column: $table.model, builder: (column) => column);
 
+  i0.GeneratedColumn<String> get lens =>
+      $composableBuilder(column: $table.lens, builder: (column) => column);
+
   i0.GeneratedColumn<String> get orientation => $composableBuilder(
       column: $table.orientation, builder: (column) => column);
 
@@ -424,6 +435,7 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             i0.Value<int?> iso = const i0.Value.absent(),
             i0.Value<String?> make = const i0.Value.absent(),
             i0.Value<String?> model = const i0.Value.absent(),
+            i0.Value<String?> lens = const i0.Value.absent(),
             i0.Value<String?> orientation = const i0.Value.absent(),
             i0.Value<String?> timeZone = const i0.Value.absent(),
             i0.Value<int?> rating = const i0.Value.absent(),
@@ -447,6 +459,7 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             iso: iso,
             make: make,
             model: model,
+            lens: lens,
             orientation: orientation,
             timeZone: timeZone,
             rating: rating,
@@ -470,6 +483,7 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             i0.Value<int?> iso = const i0.Value.absent(),
             i0.Value<String?> make = const i0.Value.absent(),
             i0.Value<String?> model = const i0.Value.absent(),
+            i0.Value<String?> lens = const i0.Value.absent(),
             i0.Value<String?> orientation = const i0.Value.absent(),
             i0.Value<String?> timeZone = const i0.Value.absent(),
             i0.Value<int?> rating = const i0.Value.absent(),
@@ -493,6 +507,7 @@ class $$RemoteExifEntityTableTableManager extends i0.RootTableManager<
             iso: iso,
             make: make,
             model: model,
+            lens: lens,
             orientation: orientation,
             timeZone: timeZone,
             rating: rating,
@@ -666,6 +681,12 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
   late final i0.GeneratedColumn<String> model = i0.GeneratedColumn<String>(
       'model', aliasedName, true,
       type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  static const i0.VerificationMeta _lensMeta =
+      const i0.VerificationMeta('lens');
+  @override
+  late final i0.GeneratedColumn<String> lens = i0.GeneratedColumn<String>(
+      'lens', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
   static const i0.VerificationMeta _orientationMeta =
       const i0.VerificationMeta('orientation');
   @override
@@ -709,6 +730,7 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
         iso,
         make,
         model,
+        lens,
         orientation,
         timeZone,
         rating,
@@ -803,6 +825,10 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
       context.handle(
           _modelMeta, model.isAcceptableOrUnknown(data['model']!, _modelMeta));
     }
+    if (data.containsKey('lens')) {
+      context.handle(
+          _lensMeta, lens.isAcceptableOrUnknown(data['lens']!, _lensMeta));
+    }
     if (data.containsKey('orientation')) {
       context.handle(
           _orientationMeta,
@@ -868,6 +894,8 @@ class $RemoteExifEntityTable extends i2.RemoteExifEntity
           .read(i0.DriftSqlType.string, data['${effectivePrefix}make']),
       model: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.string, data['${effectivePrefix}model']),
+      lens: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}lens']),
       orientation: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.string, data['${effectivePrefix}orientation']),
       timeZone: attachedDatabase.typeMapping
@@ -909,6 +937,7 @@ class RemoteExifEntityData extends i0.DataClass
   final int? iso;
   final String? make;
   final String? model;
+  final String? lens;
   final String? orientation;
   final String? timeZone;
   final int? rating;
@@ -931,6 +960,7 @@ class RemoteExifEntityData extends i0.DataClass
       this.iso,
       this.make,
       this.model,
+      this.lens,
       this.orientation,
       this.timeZone,
       this.rating,
@@ -987,6 +1017,9 @@ class RemoteExifEntityData extends i0.DataClass
     if (!nullToAbsent || model != null) {
       map['model'] = i0.Variable<String>(model);
     }
+    if (!nullToAbsent || lens != null) {
+      map['lens'] = i0.Variable<String>(lens);
+    }
     if (!nullToAbsent || orientation != null) {
       map['orientation'] = i0.Variable<String>(orientation);
     }
@@ -1024,6 +1057,7 @@ class RemoteExifEntityData extends i0.DataClass
       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']),
@@ -1051,6 +1085,7 @@ class RemoteExifEntityData extends i0.DataClass
       '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),
@@ -1076,6 +1111,7 @@ class RemoteExifEntityData extends i0.DataClass
           i0.Value<int?> iso = const i0.Value.absent(),
           i0.Value<String?> make = const i0.Value.absent(),
           i0.Value<String?> model = const i0.Value.absent(),
+          i0.Value<String?> lens = const i0.Value.absent(),
           i0.Value<String?> orientation = const i0.Value.absent(),
           i0.Value<String?> timeZone = const i0.Value.absent(),
           i0.Value<int?> rating = const i0.Value.absent(),
@@ -1101,6 +1137,7 @@ class RemoteExifEntityData extends i0.DataClass
         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,
@@ -1132,6 +1169,7 @@ class RemoteExifEntityData extends i0.DataClass
       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,
@@ -1162,6 +1200,7 @@ class RemoteExifEntityData extends i0.DataClass
           ..write('iso: $iso, ')
           ..write('make: $make, ')
           ..write('model: $model, ')
+          ..write('lens: $lens, ')
           ..write('orientation: $orientation, ')
           ..write('timeZone: $timeZone, ')
           ..write('rating: $rating, ')
@@ -1189,6 +1228,7 @@ class RemoteExifEntityData extends i0.DataClass
         iso,
         make,
         model,
+        lens,
         orientation,
         timeZone,
         rating,
@@ -1215,6 +1255,7 @@ class RemoteExifEntityData extends i0.DataClass
           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 &&
@@ -1240,6 +1281,7 @@ class RemoteExifEntityCompanion
   final i0.Value<int?> iso;
   final i0.Value<String?> make;
   final i0.Value<String?> model;
+  final i0.Value<String?> lens;
   final i0.Value<String?> orientation;
   final i0.Value<String?> timeZone;
   final i0.Value<int?> rating;
@@ -1262,6 +1304,7 @@ class RemoteExifEntityCompanion
     this.iso = const i0.Value.absent(),
     this.make = const i0.Value.absent(),
     this.model = const i0.Value.absent(),
+    this.lens = const i0.Value.absent(),
     this.orientation = const i0.Value.absent(),
     this.timeZone = const i0.Value.absent(),
     this.rating = const i0.Value.absent(),
@@ -1285,6 +1328,7 @@ class RemoteExifEntityCompanion
     this.iso = const i0.Value.absent(),
     this.make = const i0.Value.absent(),
     this.model = const i0.Value.absent(),
+    this.lens = const i0.Value.absent(),
     this.orientation = const i0.Value.absent(),
     this.timeZone = const i0.Value.absent(),
     this.rating = const i0.Value.absent(),
@@ -1308,6 +1352,7 @@ class RemoteExifEntityCompanion
     i0.Expression<int>? iso,
     i0.Expression<String>? make,
     i0.Expression<String>? model,
+    i0.Expression<String>? lens,
     i0.Expression<String>? orientation,
     i0.Expression<String>? timeZone,
     i0.Expression<int>? rating,
@@ -1331,6 +1376,7 @@ class RemoteExifEntityCompanion
       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,
@@ -1356,6 +1402,7 @@ class RemoteExifEntityCompanion
       i0.Value<int?>? iso,
       i0.Value<String?>? make,
       i0.Value<String?>? model,
+      i0.Value<String?>? lens,
       i0.Value<String?>? orientation,
       i0.Value<String?>? timeZone,
       i0.Value<int?>? rating,
@@ -1378,6 +1425,7 @@ class RemoteExifEntityCompanion
       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,
@@ -1439,6 +1487,9 @@ class RemoteExifEntityCompanion
     if (model.present) {
       map['model'] = i0.Variable<String>(model.value);
     }
+    if (lens.present) {
+      map['lens'] = i0.Variable<String>(lens.value);
+    }
     if (orientation.present) {
       map['orientation'] = i0.Variable<String>(orientation.value);
     }
@@ -1474,6 +1525,7 @@ class RemoteExifEntityCompanion
           ..write('iso: $iso, ')
           ..write('make: $make, ')
           ..write('model: $model, ')
+          ..write('lens: $lens, ')
           ..write('orientation: $orientation, ')
           ..write('timeZone: $timeZone, ')
           ..write('rating: $rating, ')
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift b/mobile/lib/infrastructure/entities/merged_asset.drift
index 825484503b..51e5e4d73c 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -52,8 +52,8 @@ mergedBucket(:group_by AS INTEGER):
 SELECT
 	COUNT(*) as asset_count,
 	 CASE
-        WHEN :group_by = 0 THEN STRFTIME('%Y-%m-%d', created_at) -- day
-        WHEN :group_by = 1 THEN STRFTIME('%Y-%m', created_at) -- month
+        WHEN :group_by = 0 THEN STRFTIME('%Y-%m-%d', created_at, 'localtime') -- day
+        WHEN :group_by = 1 THEN STRFTIME('%Y-%m', created_at, 'localtime') -- month
     END AS bucket_date
 FROM
 (
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift.dart b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
index 19fb9e3dac..f836dabe6a 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift.dart
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
@@ -51,7 +51,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
     final expandedvar2 = $expandVar($arrayStartIndex, var2.length);
     $arrayStartIndex += var2.length;
     return customSelect(
-        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at) WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at) END AS bucket_date FROM (SELECT rae.name, rae.created_at FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) UNION ALL SELECT lae.name, lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) GROUP BY bucket_date ORDER BY bucket_date DESC',
+        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at, \'localtime\') WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at, \'localtime\') END AS bucket_date FROM (SELECT rae.name, rae.created_at FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) UNION ALL SELECT lae.name, lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) GROUP BY bucket_date ORDER BY bucket_date DESC',
         variables: [
           i0.Variable<int>(groupBy),
           for (var $ in var2) i0.Variable<String>($)
diff --git a/mobile/lib/infrastructure/repositories/exif.repository.dart b/mobile/lib/infrastructure/repositories/exif.repository.dart
index d25572fdad..0012e329ca 100644
--- a/mobile/lib/infrastructure/repositories/exif.repository.dart
+++ b/mobile/lib/infrastructure/repositories/exif.repository.dart
@@ -1,8 +1,6 @@
-import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
     as entity;
-import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:isar/isar.dart';
 
@@ -43,36 +41,3 @@ class IsarExifRepository extends IsarDatabaseRepository {
     });
   }
 }
-
-class DriftRemoteExifRepository extends DriftDatabaseRepository {
-  final Drift _db;
-  const DriftRemoteExifRepository(this._db) : super(_db);
-
-  Future<ExifInfo?> get(String assetId) {
-    final query = _db.remoteExifEntity.select()
-      ..where((exif) => exif.assetId.equals(assetId));
-
-    return query.map((asset) => asset.toDto()).getSingleOrNull();
-  }
-}
-
-extension on RemoteExifEntityData {
-  ExifInfo toDto() {
-    return ExifInfo(
-      fileSize: fileSize,
-      description: description,
-      orientation: orientation,
-      timeZone: timeZone,
-      dateTimeOriginal: dateTimeOriginal,
-      latitude: latitude,
-      longitude: longitude,
-      city: city,
-      state: state,
-      country: country,
-      make: make,
-      model: model,
-      f: fNumber,
-      iso: iso,
-    );
-  }
-}
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index 4ac2073dda..9c036e4ea1 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -1,13 +1,23 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
+    hide ExifInfo;
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
-class DriftRemoteAssetRepository extends DriftDatabaseRepository {
+class RemoteAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
-  const DriftRemoteAssetRepository(this._db) : super(_db);
+  const RemoteAssetRepository(this._db) : super(_db);
+
+  Future<ExifInfo?> getExif(String id) {
+    return _db.managers.remoteExifEntity
+        .filter((row) => row.assetId.id.equals(id))
+        .map((row) => row.toDto())
+        .getSingleOrNull();
+  }
 
   Future<void> updateFavorite(List<String> ids, bool isFavorite) {
     return _db.batch((batch) async {
diff --git a/mobile/lib/infrastructure/repositories/storage.repository.dart b/mobile/lib/infrastructure/repositories/storage.repository.dart
index 2b6b616d87..1f41e48522 100644
--- a/mobile/lib/infrastructure/repositories/storage.repository.dart
+++ b/mobile/lib/infrastructure/repositories/storage.repository.dart
@@ -5,20 +5,21 @@ import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';
 
 class StorageRepository {
-  final _log = Logger('StorageRepository');
+  const StorageRepository();
 
   Future<File?> getFileForAsset(LocalAsset asset) async {
+    final log = Logger('StorageRepository');
     File? file;
     try {
       final entity = await AssetEntity.fromId(asset.id);
       file = await entity?.originFile;
       if (file == null) {
-        _log.warning(
+        log.warning(
           "Cannot get file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
         );
       }
     } catch (error, stackTrace) {
-      _log.warning(
+      log.warning(
         "Error getting file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
         error,
         stackTrace,
diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index dfe65b698e..015e09d663 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -161,8 +161,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             fNumber: Value(exif.fNumber),
             fileSize: Value(exif.fileSizeInByte),
             focalLength: Value(exif.focalLength),
-            latitude: Value(exif.latitude),
-            longitude: Value(exif.longitude),
+            latitude: Value(exif.latitude?.toDouble()),
+            longitude: Value(exif.longitude?.toDouble()),
             iso: Value(exif.iso),
             make: Value(exif.make),
             model: Value(exif.model),
@@ -170,6 +170,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             timeZone: Value(exif.timeZone),
             rating: Value(exif.rating),
             projectionType: Value(exif.projectionType),
+            lens: Value(exif.lensModel),
           );
 
           batch.insert(
diff --git a/mobile/lib/pages/common/gallery_viewer.page.dart b/mobile/lib/pages/common/gallery_viewer.page.dart
index 77b734ce0b..6fdbecced1 100644
--- a/mobile/lib/pages/common/gallery_viewer.page.dart
+++ b/mobile/lib/pages/common/gallery_viewer.page.dart
@@ -238,7 +238,7 @@ class GalleryViewerPage extends HookConsumerWidget {
 
     PhotoViewGalleryPageOptions buildImage(Asset asset) {
       return PhotoViewGalleryPageOptions(
-        onDragStart: (_, details, __) {
+        onDragStart: (_, details, __, ___) {
           localPosition.value = details.localPosition;
         },
         onDragUpdate: (_, details, __) {
@@ -267,7 +267,7 @@ class GalleryViewerPage extends HookConsumerWidget {
 
     PhotoViewGalleryPageOptions buildVideo(BuildContext context, Asset asset) {
       return PhotoViewGalleryPageOptions.customChild(
-        onDragStart: (_, details, __) =>
+        onDragStart: (_, details, __, ___) =>
             localPosition.value = details.localPosition,
         onDragUpdate: (_, details, __) => handleSwipeUpDown(details),
         heroAttributes: _getHeroAttributes(asset),
@@ -370,7 +370,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                   ),
               itemCount: totalAssets.value,
               scrollDirection: Axis.horizontal,
-              onPageChanged: (value) {
+              onPageChanged: (value, _) {
                 final next = currentIndex.value < value ? value + 1 : value - 1;
 
                 ref.read(hapticFeedbackProvider.notifier).selectionClick();
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
new file mode 100644
index 0000000000..6f5ceb6da1
--- /dev/null
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -0,0 +1,473 @@
+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/domain/services/timeline.service.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/scroll_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
+import 'package:immich_mobile/widgets/photo_view/photo_view_gallery.dart';
+import 'package:platform/platform.dart';
+
+@RoutePage()
+class AssetViewerPage extends StatelessWidget {
+  final int initialIndex;
+  final TimelineService timelineService;
+
+  const AssetViewerPage({
+    super.key,
+    required this.initialIndex,
+    required this.timelineService,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    // This is necessary to ensure that the timeline service is available
+    // since the Timeline and AssetViewer are on different routes / Widget subtrees.
+    return ProviderScope(
+      overrides: [timelineServiceProvider.overrideWithValue(timelineService)],
+      child: AssetViewer(initialIndex: initialIndex),
+    );
+  }
+}
+
+class AssetViewer extends ConsumerStatefulWidget {
+  final int initialIndex;
+  final Platform? platform;
+
+  const AssetViewer({
+    super.key,
+    required this.initialIndex,
+    this.platform,
+  });
+
+  @override
+  ConsumerState createState() => _AssetViewerState();
+}
+
+const double _kBottomSheetMinimumExtent = 0.4;
+const double _kBottomSheetSnapExtent = 0.7;
+
+class _AssetViewerState extends ConsumerState<AssetViewer> {
+  late PageController pageController;
+  late DraggableScrollableController bottomSheetController;
+  PersistentBottomSheetController? sheetCloseNotifier;
+  // PhotoViewGallery takes care of disposing it's controllers
+  PhotoViewControllerBase? viewController;
+
+  late Platform platform;
+  late PhotoViewControllerValue initialPhotoViewState;
+  bool? hasDraggedDown;
+  bool isSnapping = false;
+  bool blockGestures = false;
+  bool dragInProgress = false;
+  bool shouldPopOnDrag = false;
+  bool showingBottomSheet = false;
+  double? initialScale;
+  double previousExtent = _kBottomSheetMinimumExtent;
+  Offset dragDownPosition = Offset.zero;
+  int totalAssets = 0;
+  int backgroundOpacity = 255;
+
+  // Delayed operations that should be cancelled on disposal
+  final List<Timer> _delayedOperations = [];
+
+  @override
+  void initState() {
+    super.initState();
+    pageController = PageController(initialPage: widget.initialIndex);
+    platform = widget.platform ?? const LocalPlatform();
+    totalAssets = ref.read(timelineServiceProvider).totalAssets;
+    bottomSheetController = DraggableScrollableController();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _onAssetChanged(widget.initialIndex);
+    });
+  }
+
+  @override
+  void dispose() {
+    pageController.dispose();
+    bottomSheetController.dispose();
+    _cancelTimers();
+    super.dispose();
+  }
+
+  Color get backgroundColor {
+    if (showingBottomSheet && !context.isDarkTheme) {
+      return Colors.white;
+    }
+    return Colors.black.withAlpha(backgroundOpacity);
+  }
+
+  void _cancelTimers() {
+    for (final timer in _delayedOperations) {
+      timer.cancel();
+    }
+    _delayedOperations.clear();
+  }
+
+  // This is used to calculate the scale of the asset when the bottom sheet is showing.
+  // It is a small increment to ensure that the asset is slightly zoomed in when the
+  // bottom sheet is showing, which emulates the zoom effect.
+  double get _getScaleForBottomSheet =>
+      (viewController?.prevValue.scale ?? viewController?.value.scale ?? 1.0) +
+      0.01;
+
+  Future<void> _precacheImage(int index) async {
+    if (!mounted || index < 0 || index >= totalAssets) {
+      return;
+    }
+
+    final asset = ref.read(timelineServiceProvider).getAsset(index);
+    final screenSize = Size(context.width, context.height);
+
+    // Precache both thumbnail and full image for smooth transitions
+    unawaited(
+      Future.wait([
+        precacheImage(
+          getThumbnailImageProvider(asset: asset, size: screenSize),
+          context,
+          onError: (_, __) {},
+        ),
+        precacheImage(
+          getFullImageProvider(asset, size: screenSize),
+          context,
+          onError: (_, __) {},
+        ),
+      ]),
+    );
+  }
+
+  void _onAssetChanged(int index) {
+    final asset = ref.read(timelineServiceProvider).getAsset(index);
+    ref.read(currentAssetNotifier.notifier).setAsset(asset);
+    unawaited(ref.read(timelineServiceProvider).preCacheAssets(index));
+    _cancelTimers();
+    // This will trigger the pre-caching of adjacent assets ensuring
+    // that they are ready when the user navigates to them.
+    final timer = Timer(Durations.medium4, () {
+      // Check if widget is still mounted before proceeding
+      if (!mounted) return;
+
+      for (final offset in [-1, 1]) {
+        unawaited(_precacheImage(index + offset));
+      }
+    });
+    _delayedOperations.add(timer);
+  }
+
+  void _onPageBuild(PhotoViewControllerBase controller) {
+    viewController ??= controller;
+    if (showingBottomSheet) {
+      final verticalOffset = (context.height * bottomSheetController.size) -
+          (context.height * _kBottomSheetMinimumExtent);
+      controller.position = Offset(0, -verticalOffset);
+    }
+  }
+
+  void _onPageChanged(int index, PhotoViewControllerBase? controller) {
+    _onAssetChanged(index);
+    viewController = controller;
+
+    // If the bottom sheet is showing, we need to adjust scale the asset to
+    // emulate the zoom effect
+    if (showingBottomSheet) {
+      initialScale = controller?.scale;
+      controller?.scale = _getScaleForBottomSheet;
+    }
+  }
+
+  void _onDragStart(
+    _,
+    DragStartDetails details,
+    PhotoViewControllerValue value,
+    PhotoViewScaleStateController scaleStateController,
+  ) {
+    dragDownPosition = details.localPosition;
+    initialPhotoViewState = value;
+    final isZoomed =
+        scaleStateController.scaleState == PhotoViewScaleState.zoomedIn ||
+            scaleStateController.scaleState == PhotoViewScaleState.covering;
+    if (!showingBottomSheet && isZoomed) {
+      blockGestures = true;
+    }
+  }
+
+  void _onDragEnd(BuildContext ctx, _, __) {
+    dragInProgress = false;
+
+    if (shouldPopOnDrag) {
+      // Dismiss immediately without state updates to avoid rebuilds
+      ctx.maybePop();
+      return;
+    }
+
+    // Do not reset the state if the bottom sheet is showing
+    if (showingBottomSheet) {
+      _snapBottomSheet();
+      return;
+    }
+
+    // If the gestures are blocked, do not reset the state
+    if (blockGestures) {
+      blockGestures = false;
+      return;
+    }
+
+    setState(() {
+      shouldPopOnDrag = false;
+      hasDraggedDown = null;
+      backgroundOpacity = 255;
+      viewController?.animateMultiple(
+        position: initialPhotoViewState.position,
+        scale: initialPhotoViewState.scale,
+        rotation: initialPhotoViewState.rotation,
+      );
+    });
+  }
+
+  void _onDragUpdate(BuildContext ctx, DragUpdateDetails details, _) {
+    if (blockGestures) {
+      return;
+    }
+
+    dragInProgress = true;
+    final delta = details.localPosition - dragDownPosition;
+    hasDraggedDown ??= delta.dy > 0;
+    if (!hasDraggedDown! || showingBottomSheet) {
+      _handleDragUp(ctx, delta);
+      return;
+    }
+
+    _handleDragDown(ctx, delta);
+  }
+
+  void _handleDragUp(BuildContext ctx, Offset delta) {
+    const double openThreshold = 50;
+    const double closeThreshold = 25;
+
+    final position = initialPhotoViewState.position + Offset(0, delta.dy);
+    final distanceToOrigin = position.distance;
+
+    if (showingBottomSheet && distanceToOrigin < closeThreshold) {
+      // Prevents the user from dragging the bottom sheet further down
+      blockGestures = true;
+      sheetCloseNotifier?.close();
+      return;
+    }
+
+    viewController?.updateMultiple(position: position);
+    // Moves the bottom sheet when the asset is being dragged up
+    if (showingBottomSheet && bottomSheetController.isAttached) {
+      final centre = (ctx.height * _kBottomSheetMinimumExtent);
+      bottomSheetController.jumpTo((centre + distanceToOrigin) / ctx.height);
+    }
+
+    if (distanceToOrigin > openThreshold && !showingBottomSheet) {
+      _openBottomSheet(ctx);
+    }
+  }
+
+  void _openBottomSheet(BuildContext ctx) {
+    setState(() {
+      initialScale = viewController?.scale;
+      viewController?.animateMultiple(scale: _getScaleForBottomSheet);
+      showingBottomSheet = true;
+      previousExtent = _kBottomSheetMinimumExtent;
+      sheetCloseNotifier = showBottomSheet(
+        context: ctx,
+        sheetAnimationStyle: AnimationStyle(
+          duration: Duration.zero,
+          reverseDuration: Duration.zero,
+        ),
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.vertical(top: Radius.circular(20.0)),
+        ),
+        backgroundColor: ctx.colorScheme.surfaceContainerLowest,
+        builder: (_) {
+          return NotificationListener<Notification>(
+            onNotification: _onNotification,
+            child: AssetDetailBottomSheet(
+              controller: bottomSheetController,
+              initialChildSize: _kBottomSheetMinimumExtent,
+            ),
+          );
+        },
+      );
+      sheetCloseNotifier?.closed.then((_) => _handleSheetClose());
+    });
+  }
+
+  void _handleSheetClose() {
+    setState(() {
+      showingBottomSheet = false;
+      sheetCloseNotifier = null;
+      viewController?.animateMultiple(
+        position: Offset.zero,
+        scale: initialScale,
+      );
+      shouldPopOnDrag = false;
+      hasDraggedDown = null;
+    });
+  }
+
+  void _snapBottomSheet() {
+    if (bottomSheetController.size > _kBottomSheetSnapExtent ||
+        bottomSheetController.size < 0.4) {
+      return;
+    }
+    isSnapping = true;
+    bottomSheetController.animateTo(
+      _kBottomSheetSnapExtent,
+      duration: Durations.short3,
+      curve: Curves.easeOut,
+    );
+  }
+
+  bool _onNotification(Notification delta) {
+    // Ignore notifications when user dragging the asset
+    if (dragInProgress) {
+      return false;
+    }
+
+    if (delta is DraggableScrollableNotification) {
+      _handleDraggableNotification(delta);
+    }
+
+    // Handle sheet snap manually so that the it snaps only at _kBottomSheetSnapExtent but not after
+    // the isSnapping guard is to prevent the notification from recursively handling the
+    // notification, eventually resulting in a heap overflow
+    if (!isSnapping && delta is ScrollEndNotification) {
+      _snapBottomSheet();
+    }
+    return false;
+  }
+
+  void _handleDraggableNotification(DraggableScrollableNotification delta) {
+    final verticalOffset = (context.height * delta.extent) -
+        (context.height * _kBottomSheetMinimumExtent);
+    // Moves the asset when the bottom sheet is being dragged
+    if (verticalOffset > 0) {
+      viewController?.position = Offset(0, -verticalOffset);
+    }
+
+    final currentExtent = delta.extent;
+    final isDraggingDown = currentExtent < previousExtent;
+    previousExtent = currentExtent;
+    // Closes the bottom sheet if the user is dragging down and the extent is less than the snap extent
+    if (isDraggingDown && delta.extent < _kBottomSheetSnapExtent - 0.1) {
+      sheetCloseNotifier?.close();
+    }
+  }
+
+  void _handleDragDown(BuildContext ctx, Offset delta) {
+    const double dragRatio = 0.2;
+    const double popThreshold = 75;
+
+    final distance = delta.distance;
+    final newShouldPopOnDrag = delta.dy > 0 && distance > popThreshold;
+
+    final maxScaleDistance = ctx.height * 0.5;
+    final scaleReduction = (distance / maxScaleDistance).clamp(0.0, dragRatio);
+    double? updatedScale;
+    if (initialPhotoViewState.scale != null) {
+      updatedScale = initialPhotoViewState.scale! * (1.0 - scaleReduction);
+    }
+
+    final newBackgroundOpacity =
+        (255 * (1.0 - (scaleReduction / dragRatio))).round();
+
+    viewController?.updateMultiple(
+      position: initialPhotoViewState.position + delta,
+      scale: updatedScale,
+    );
+    if (shouldPopOnDrag != newShouldPopOnDrag ||
+        backgroundOpacity != newBackgroundOpacity) {
+      setState(() {
+        shouldPopOnDrag = newShouldPopOnDrag;
+        backgroundOpacity = newBackgroundOpacity;
+      });
+    }
+  }
+
+  Widget _placeholderBuilder(
+    BuildContext ctx,
+    ImageChunkEvent? progress,
+    int index,
+  ) {
+    final asset = ref.read(timelineServiceProvider).getAsset(index);
+    return Container(
+      width: double.infinity,
+      height: double.infinity,
+      color: backgroundColor,
+      child: Thumbnail(
+        asset: asset,
+        fit: BoxFit.contain,
+        size: Size(
+          ctx.width,
+          ctx.height,
+        ),
+      ),
+    );
+  }
+
+  PhotoViewGalleryPageOptions _assetBuilder(BuildContext ctx, int index) {
+    final asset = ref.read(timelineServiceProvider).getAsset(index);
+    final size = Size(ctx.width, ctx.height);
+    final imageProvider = getFullImageProvider(asset, size: size);
+
+    return PhotoViewGalleryPageOptions(
+      imageProvider: imageProvider,
+      heroAttributes: PhotoViewHeroAttributes(tag: asset.heroTag),
+      filterQuality: FilterQuality.high,
+      tightMode: true,
+      initialScale: PhotoViewComputedScale.contained * 0.999,
+      minScale: PhotoViewComputedScale.contained * 0.999,
+      disableScaleGestures: showingBottomSheet,
+      onDragStart: _onDragStart,
+      onDragUpdate: _onDragUpdate,
+      onDragEnd: _onDragEnd,
+      errorBuilder: (_, __, ___) => Container(
+        width: ctx.width,
+        height: ctx.height,
+        color: backgroundColor,
+        child: Thumbnail(
+          asset: asset,
+          fit: BoxFit.contain,
+          size: size,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Currently it is not possible to scroll the asset when the bottom sheet is open all the way.
+    // Issue: https://github.com/flutter/flutter/issues/109037
+    // TODO: Add a custom scrum builder once the fix lands on stable
+    return Scaffold(
+      backgroundColor: Colors.black.withAlpha(backgroundOpacity),
+      body: PhotoViewGallery.builder(
+        gaplessPlayback: true,
+        loadingBuilder: _placeholderBuilder,
+        pageController: pageController,
+        scrollPhysics: platform.isIOS
+            ? const FastScrollPhysics() // Use bouncing physics for iOS
+            : const FastClampingScrollPhysics() // Use heavy physics for Android
+        ,
+        itemCount: totalAssets,
+        onPageChanged: _onPageChanged,
+        onPageBuild: _onPageBuild,
+        builder: _assetBuilder,
+        backgroundDecoration: BoxDecoration(color: backgroundColor),
+        enablePanAlways: true,
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.dart
new file mode 100644
index 0000000000..39f28d2f60
--- /dev/null
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.dart
@@ -0,0 +1,199 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/utils/bytes_units.dart';
+
+const _kSeparator = '  •  ';
+
+class AssetDetailBottomSheet extends BaseBottomSheet {
+  const AssetDetailBottomSheet({
+    super.controller,
+    super.initialChildSize,
+    super.key,
+  }) : super(
+          actions: const [],
+          slivers: const [_AssetDetailBottomSheet()],
+          minChildSize: 0.1,
+          maxChildSize: 1.0,
+          expand: false,
+          shouldCloseOnMinExtent: false,
+          resizeOnScroll: false,
+        );
+}
+
+class _AssetDetailBottomSheet extends ConsumerWidget {
+  const _AssetDetailBottomSheet();
+
+  String _getDateTime(BuildContext ctx, BaseAsset asset) {
+    final dateTime = asset.createdAt.toLocal();
+    final date = DateFormat.yMMMEd(ctx.locale.toLanguageTag()).format(dateTime);
+    final time = DateFormat.jm(ctx.locale.toLanguageTag()).format(dateTime);
+    return '$date$_kSeparator$time';
+  }
+
+  String _getFileInfo(BaseAsset asset, ExifInfo? exifInfo) {
+    final height = asset.height ?? exifInfo?.height;
+    final width = asset.width ?? exifInfo?.width;
+    final resolution =
+        (width != null && height != null) ? "$width x $height" : null;
+    final fileSize =
+        exifInfo?.fileSize != null ? formatBytes(exifInfo!.fileSize!) : null;
+
+    return switch ((fileSize, resolution)) {
+      (null, null) => '',
+      (String fileSize, null) => fileSize,
+      (null, String resolution) => resolution,
+      (String fileSize, String resolution) =>
+        '$fileSize$_kSeparator$resolution',
+    };
+  }
+
+  String? _getCameraInfoTitle(ExifInfo? exifInfo) {
+    if (exifInfo == null) {
+      return null;
+    }
+
+    return switch ((exifInfo.make, exifInfo.model)) {
+      (null, null) => null,
+      (String make, null) => make,
+      (null, String model) => model,
+      (String make, String model) => '$make $model',
+    };
+  }
+
+  String? _getCameraInfoSubtitle(ExifInfo? exifInfo) {
+    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 [fNumber, exposureTime, focalLength, iso]
+        .where((spec) => spec != null && spec.isNotEmpty)
+        .join(_kSeparator);
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final asset = ref.watch(currentAssetNotifier);
+    final exifInfo = ref.watch(currentAssetExifProvider).valueOrNull;
+    final cameraTitle = _getCameraInfoTitle(exifInfo);
+
+    return SliverList.list(
+      children: [
+        // Asset Date and Time
+        _SheetTile(
+          title: _getDateTime(context, asset),
+          titleStyle: context.textTheme.bodyLarge
+              ?.copyWith(fontWeight: FontWeight.w600),
+        ),
+        // Details header
+        _SheetTile(
+          title: 'exif_bottom_sheet_details'.t(context: context),
+          titleStyle: context.textTheme.labelLarge?.copyWith(
+            color: context.textTheme.labelLarge?.color,
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+        // File info
+        _SheetTile(
+          title: asset.name,
+          titleStyle: context.textTheme.labelLarge
+              ?.copyWith(fontWeight: FontWeight.w600),
+          leading: Icon(
+            asset.isImage ? Icons.image_outlined : Icons.videocam_outlined,
+            size: 30,
+            color: context.textTheme.labelLarge?.color,
+          ),
+          subtitle: _getFileInfo(asset, exifInfo),
+          subtitleStyle: context.textTheme.labelLarge?.copyWith(
+            color: context.textTheme.labelLarge?.color?.withAlpha(200),
+          ),
+        ),
+        // Camera info
+        if (cameraTitle != null)
+          _SheetTile(
+            title: cameraTitle,
+            titleStyle: context.textTheme.labelLarge
+                ?.copyWith(fontWeight: FontWeight.w600),
+            leading: Icon(
+              Icons.camera_outlined,
+              size: 30,
+              color: context.textTheme.labelLarge?.color,
+            ),
+            subtitle: _getCameraInfoSubtitle(exifInfo),
+            subtitleStyle: context.textTheme.labelLarge?.copyWith(
+              color: context.textTheme.labelLarge?.color?.withAlpha(200),
+            ),
+          ),
+      ],
+    );
+  }
+}
+
+class _SheetTile extends StatelessWidget {
+  final String title;
+  final Widget? leading;
+  final String? subtitle;
+  final TextStyle? titleStyle;
+  final TextStyle? subtitleStyle;
+
+  const _SheetTile({
+    required this.title,
+    this.titleStyle,
+    this.leading,
+    this.subtitle,
+    this.subtitleStyle,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final Widget titleWidget;
+    if (leading == null) {
+      titleWidget = LimitedBox(
+        maxWidth: double.infinity,
+        child: Text(title, style: titleStyle),
+      );
+    } else {
+      titleWidget = Container(
+        width: double.infinity,
+        padding: const EdgeInsets.only(left: 15),
+        child: Text(title, style: titleStyle),
+      );
+    }
+
+    final Widget? subtitleWidget;
+    if (leading == null && subtitle != null) {
+      subtitleWidget = Text(subtitle!, style: subtitleStyle);
+    } else if (leading != null && subtitle != null) {
+      subtitleWidget = Padding(
+        padding: const EdgeInsets.only(left: 15),
+        child: Text(subtitle!, style: subtitleStyle),
+      );
+    } else {
+      subtitleWidget = null;
+    }
+
+    return ListTile(
+      dense: true,
+      visualDensity: VisualDensity.compact,
+      title: titleWidget,
+      titleAlignment: ListTileTitleAlignment.center,
+      leading: leading,
+      contentPadding: leading == null ? null : const EdgeInsets.only(left: 25),
+      subtitle: subtitleWidget,
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
index d041bca514..1fb98a0032 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
@@ -1,6 +1,7 @@
 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/theme_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 
 class BaseBottomSheet extends ConsumerStatefulWidget {
@@ -74,10 +75,7 @@ class _BaseDraggableScrollableSheetState
           clipBehavior: Clip.antiAlias,
           elevation: 6.0,
           shape: const RoundedRectangleBorder(
-            borderRadius: BorderRadius.only(
-              topLeft: Radius.circular(6),
-              topRight: Radius.circular(6),
-            ),
+            borderRadius: BorderRadius.vertical(top: Radius.circular(18)),
           ),
           margin: const EdgeInsets.symmetric(horizontal: 0),
           child: CustomScrollView(
@@ -86,17 +84,22 @@ class _BaseDraggableScrollableSheetState
               SliverToBoxAdapter(
                 child: Column(
                   children: [
-                    const SizedBox(height: 16),
+                    const SizedBox(height: 10),
                     const _DragHandle(),
-                    const SizedBox(height: 16),
-                    SizedBox(
-                      height: 120,
-                      child: ListView(
-                        shrinkWrap: true,
-                        scrollDirection: Axis.horizontal,
-                        children: widget.actions,
+                    const SizedBox(height: 14),
+                    if (widget.actions.isNotEmpty)
+                      SizedBox(
+                        height: 80,
+                        child: ListView(
+                          shrinkWrap: true,
+                          scrollDirection: Axis.horizontal,
+                          children: widget.actions,
+                        ),
                       ),
-                    ),
+                    if (widget.actions.isNotEmpty) const SizedBox(height: 14),
+                    if (widget.actions.isNotEmpty)
+                      const Divider(indent: 20, endIndent: 20),
+                    if (widget.actions.isNotEmpty) const SizedBox(height: 14),
                   ],
                 ),
               ),
@@ -118,7 +121,7 @@ class _DragHandle extends StatelessWidget {
       height: 6,
       width: 32,
       decoration: BoxDecoration(
-        color: context.themeData.dividerColor,
+        color: context.themeData.dividerColor.lighten(amount: 0.6),
         borderRadius: const BorderRadius.all(Radius.circular(20)),
       ),
     );
diff --git a/mobile/lib/presentation/widgets/images/full_image.widget.dart b/mobile/lib/presentation/widgets/images/full_image.widget.dart
new file mode 100644
index 0000000000..77ea996b89
--- /dev/null
+++ b/mobile/lib/presentation/widgets/images/full_image.widget.dart
@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/widgets/asset_grid/thumbnail_placeholder.dart';
+import 'package:octo_image/octo_image.dart';
+
+class FullImage extends StatelessWidget {
+  const FullImage(
+    this.asset, {
+    required this.size,
+    this.fit = BoxFit.cover,
+    this.placeholder = const ThumbnailPlaceholder(),
+    super.key,
+  });
+
+  final BaseAsset asset;
+  final Size size;
+  final Widget? placeholder;
+  final BoxFit fit;
+
+  @override
+  Widget build(BuildContext context) {
+    final provider = getFullImageProvider(asset, size: size);
+    return OctoImage(
+      fadeInDuration: const Duration(milliseconds: 0),
+      fadeOutDuration: const Duration(milliseconds: 100),
+      placeholderBuilder: placeholder != null ? (_) => placeholder! : null,
+      image: provider,
+      width: size.width,
+      height: size.height,
+      fit: fit,
+      errorBuilder: (context, error, stackTrace) {
+        provider.evict();
+        return const Icon(Icons.image_not_supported_outlined, size: 32);
+      },
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/images/image_provider.dart b/mobile/lib/presentation/widgets/images/image_provider.dart
new file mode 100644
index 0000000000..e79665baf7
--- /dev/null
+++ b/mobile/lib/presentation/widgets/images/image_provider.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/widgets.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/setting.model.dart';
+import 'package:immich_mobile/domain/services/setting.service.dart';
+import 'package:immich_mobile/presentation/widgets/images/local_image_provider.dart';
+import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
+
+ImageProvider getFullImageProvider(
+  BaseAsset asset, {
+  Size size = const Size(1080, 1920),
+}) {
+  // Create new provider and cache it
+  final ImageProvider provider;
+  if (_shouldUseLocalAsset(asset)) {
+    provider = LocalFullImageProvider(asset: asset as LocalAsset, size: size);
+  } else {
+    final String assetId;
+    if (asset is LocalAsset && asset.hasRemote) {
+      assetId = asset.remoteId!;
+    } else if (asset is RemoteAsset) {
+      assetId = asset.id;
+    } else {
+      throw ArgumentError("Unsupported asset type: ${asset.runtimeType}");
+    }
+    provider = RemoteFullImageProvider(assetId: assetId);
+  }
+
+  return provider;
+}
+
+ImageProvider getThumbnailImageProvider({
+  BaseAsset? asset,
+  String? remoteId,
+  Size size = const Size.square(256),
+}) {
+  assert(
+    asset != null || remoteId != null,
+    'Either asset or remoteId must be provided',
+  );
+
+  if (remoteId != null) {
+    return RemoteThumbProvider(assetId: remoteId);
+  }
+
+  if (_shouldUseLocalAsset(asset!)) {
+    return LocalThumbProvider(asset: asset as LocalAsset, size: size);
+  }
+
+  final String assetId;
+  if (asset is LocalAsset && asset.hasRemote) {
+    assetId = asset.remoteId!;
+  } else if (asset is RemoteAsset) {
+    assetId = asset.id;
+  } else {
+    throw ArgumentError("Unsupported asset type: ${asset.runtimeType}");
+  }
+
+  return RemoteThumbProvider(assetId: assetId);
+}
+
+bool _shouldUseLocalAsset(BaseAsset asset) =>
+    asset is LocalAsset &&
+    (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage));
diff --git a/mobile/lib/presentation/widgets/images/local_image_provider.dart b/mobile/lib/presentation/widgets/images/local_image_provider.dart
new file mode 100644
index 0000000000..214dede1af
--- /dev/null
+++ b/mobile/lib/presentation/widgets/images/local_image_provider.dart
@@ -0,0 +1,241 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:ui';
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/setting.model.dart';
+import 'package:immich_mobile/domain/services/setting.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
+import 'package:immich_mobile/providers/image/cache/thumbnail_image_cache_manager.dart';
+import 'package:immich_mobile/providers/image/exceptions/image_loading_exception.dart';
+import 'package:logging/logging.dart';
+
+class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
+  final AssetMediaRepository _assetMediaRepository =
+      const AssetMediaRepository();
+  final CacheManager? cacheManager;
+
+  final LocalAsset asset;
+  final Size size;
+
+  const LocalThumbProvider({
+    required this.asset,
+    this.size = const Size.square(kTimelineFixedTileExtent),
+    this.cacheManager,
+  });
+
+  @override
+  Future<LocalThumbProvider> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture(this);
+  }
+
+  @override
+  ImageStreamCompleter loadImage(
+    LocalThumbProvider key,
+    ImageDecoderCallback decode,
+  ) {
+    final cache = cacheManager ?? ThumbnailImageCacheManager();
+    return MultiFrameImageStreamCompleter(
+      codec: _codec(key, cache, decode),
+      scale: 1.0,
+      informationCollector: () => <DiagnosticsNode>[
+        DiagnosticsProperty<ImageProvider>('Image provider', this),
+        DiagnosticsProperty<LocalAsset>('Asset', key.asset),
+      ],
+    );
+  }
+
+  Future<Codec> _codec(
+    LocalThumbProvider key,
+    CacheManager cache,
+    ImageDecoderCallback decode,
+  ) async {
+    final cacheKey =
+        '${key.asset.id}-${key.asset.updatedAt}-${key.size.width}x${key.size.height}';
+
+    final fileFromCache = await cache.getFileFromCache(cacheKey);
+    if (fileFromCache != null) {
+      try {
+        final buffer =
+            await ImmutableBuffer.fromFilePath(fileFromCache.file.path);
+        return decode(buffer);
+      } catch (_) {}
+    }
+
+    final thumbnailBytes =
+        await _assetMediaRepository.getThumbnail(key.asset.id, size: key.size);
+    if (thumbnailBytes == null) {
+      PaintingBinding.instance.imageCache.evict(key);
+      throw StateError(
+        "Loading thumb for local photo ${key.asset.name} failed",
+      );
+    }
+
+    final buffer = await ImmutableBuffer.fromUint8List(thumbnailBytes);
+    unawaited(cache.putFile(cacheKey, thumbnailBytes));
+    return decode(buffer);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other is LocalThumbProvider) {
+      return asset.id == other.asset.id &&
+          asset.updatedAt == other.asset.updatedAt;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode => asset.id.hashCode ^ asset.updatedAt.hashCode;
+}
+
+class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
+  final AssetMediaRepository _assetMediaRepository =
+      const AssetMediaRepository();
+  final StorageRepository _storageRepository = const StorageRepository();
+
+  final LocalAsset asset;
+  final Size size;
+
+  const LocalFullImageProvider({
+    required this.asset,
+    required this.size,
+  });
+
+  @override
+  Future<LocalFullImageProvider> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture(this);
+  }
+
+  @override
+  ImageStreamCompleter loadImage(
+    LocalFullImageProvider key,
+    ImageDecoderCallback decode,
+  ) {
+    return MultiImageStreamCompleter(
+      codec: _codec(key, decode),
+      scale: 1.0,
+      informationCollector: () sync* {
+        yield ErrorDescription(asset.name);
+      },
+    );
+  }
+
+  // Streams in each stage of the image as we ask for it
+  Stream<Codec> _codec(
+    LocalFullImageProvider key,
+    ImageDecoderCallback decode,
+  ) async* {
+    try {
+      switch (key.asset.type) {
+        case AssetType.image:
+          yield* _decodeProgressive(key, decode);
+          break;
+        case AssetType.video:
+          final codec = await _getThumbnailCodec(key, decode);
+          if (codec == null) {
+            throw StateError("Failed to load preview for ${key.asset.name}");
+          }
+          yield codec;
+          break;
+        case AssetType.other:
+        case AssetType.audio:
+          throw StateError('Unsupported asset type ${key.asset.type}');
+      }
+    } catch (error, stack) {
+      Logger('ImmichLocalImageProvider')
+          .severe('Error loading local image ${key.asset.name}', error, stack);
+      throw const ImageLoadingException(
+        'Could not load image from local storage',
+      );
+    }
+  }
+
+  Future<Codec?> _getThumbnailCodec(
+    LocalFullImageProvider key,
+    ImageDecoderCallback decode,
+  ) async {
+    final thumbBytes =
+        await _assetMediaRepository.getThumbnail(key.asset.id, size: key.size);
+    if (thumbBytes == null) {
+      return null;
+    }
+    final buffer = await ImmutableBuffer.fromUint8List(thumbBytes);
+    return decode(buffer);
+  }
+
+  Stream<Codec> _decodeProgressive(
+    LocalFullImageProvider key,
+    ImageDecoderCallback decode,
+  ) async* {
+    final file = await _storageRepository.getFileForAsset(key.asset);
+    if (file == null) {
+      throw StateError("Opening file for asset ${key.asset.name} failed");
+    }
+
+    final fileSize = await file.length();
+    final devicePixelRatio =
+        PlatformDispatcher.instance.views.first.devicePixelRatio;
+    final isLargeFile = fileSize > 20 * 1024 * 1024; // 20MB
+    final isHEIC = file.path.toLowerCase().contains(RegExp(r'\.(heic|heif)$'));
+    final isProgressive = isLargeFile || (isHEIC && !Platform.isIOS);
+
+    if (isProgressive) {
+      try {
+        final progressiveMultiplier = devicePixelRatio >= 3.0 ? 1.3 : 1.2;
+        final size = Size(
+          (key.size.width * progressiveMultiplier).clamp(256, 1024),
+          (key.size.height * progressiveMultiplier).clamp(256, 1024),
+        );
+        final mediumThumb =
+            await _assetMediaRepository.getThumbnail(key.asset.id, size: size);
+        if (mediumThumb != null) {
+          final mediumBuffer = await ImmutableBuffer.fromUint8List(mediumThumb);
+          yield await decode(mediumBuffer);
+        }
+      } catch (_) {}
+    }
+
+    // Load original only when the file is smaller or if the user wants to load original images
+    // Or load a slightly larger image for progressive loading
+    if (isProgressive && !(AppSetting.get(Setting.loadOriginal))) {
+      final progressiveMultiplier = devicePixelRatio >= 3.0 ? 2.0 : 1.6;
+      final size = Size(
+        (key.size.width * progressiveMultiplier).clamp(512, 2048),
+        (key.size.height * progressiveMultiplier).clamp(512, 2048),
+      );
+      final highThumb =
+          await _assetMediaRepository.getThumbnail(key.asset.id, size: size);
+      if (highThumb != null) {
+        final highBuffer = await ImmutableBuffer.fromUint8List(highThumb);
+        yield await decode(highBuffer);
+      }
+      return;
+    }
+
+    final buffer = await ImmutableBuffer.fromFilePath(file.path);
+    yield await decode(buffer);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other is LocalFullImageProvider) {
+      return asset.id == other.asset.id &&
+          asset.updatedAt == other.asset.updatedAt &&
+          size == other.size;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode =>
+      asset.id.hashCode ^ asset.updatedAt.hashCode ^ size.hashCode;
+}
diff --git a/mobile/lib/presentation/widgets/images/local_thumb_provider.dart b/mobile/lib/presentation/widgets/images/local_thumb_provider.dart
deleted file mode 100644
index 11b2f2b08e..0000000000
--- a/mobile/lib/presentation/widgets/images/local_thumb_provider.dart
+++ /dev/null
@@ -1,95 +0,0 @@
-import 'dart:async';
-import 'dart:ui';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/widgets.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/asset_media.repository.dart';
-import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
-import 'package:immich_mobile/providers/image/cache/thumbnail_image_cache_manager.dart';
-
-class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
-  final AssetMediaRepository _assetMediaRepository =
-      const AssetMediaRepository();
-  final CacheManager? cacheManager;
-
-  final LocalAsset asset;
-  final double height;
-  final double width;
-
-  LocalThumbProvider({
-    required this.asset,
-    this.height = kTimelineFixedTileExtent,
-    this.width = kTimelineFixedTileExtent,
-    this.cacheManager,
-  });
-
-  @override
-  Future<LocalThumbProvider> obtainKey(
-    ImageConfiguration configuration,
-  ) {
-    return SynchronousFuture(this);
-  }
-
-  @override
-  ImageStreamCompleter loadImage(
-    LocalThumbProvider key,
-    ImageDecoderCallback decode,
-  ) {
-    final cache = cacheManager ?? ThumbnailImageCacheManager();
-    return MultiFrameImageStreamCompleter(
-      codec: _codec(key, cache, decode),
-      scale: 1.0,
-      informationCollector: () => <DiagnosticsNode>[
-        DiagnosticsProperty<ImageProvider>('Image provider', this),
-        DiagnosticsProperty<LocalAsset>('Asset', key.asset),
-      ],
-    );
-  }
-
-  Future<Codec> _codec(
-    LocalThumbProvider key,
-    CacheManager cache,
-    ImageDecoderCallback decode,
-  ) async {
-    final cacheKey = '${key.asset.id}-${key.asset.updatedAt}-${width}x$height';
-
-    final fileFromCache = await cache.getFileFromCache(cacheKey);
-    if (fileFromCache != null) {
-      try {
-        final buffer =
-            await ImmutableBuffer.fromFilePath(fileFromCache.file.path);
-        return await decode(buffer);
-      } catch (_) {}
-    }
-
-    final thumbnailBytes = await _assetMediaRepository.getThumbnail(
-      key.asset.id,
-      size: Size(key.width, key.height),
-    );
-    if (thumbnailBytes == null) {
-      PaintingBinding.instance.imageCache.evict(key);
-      throw StateError(
-        "Loading thumb for local photo ${key.asset.name} failed",
-      );
-    }
-
-    final buffer = await ImmutableBuffer.fromUint8List(thumbnailBytes);
-    unawaited(cache.putFile(cacheKey, thumbnailBytes));
-    return decode(buffer);
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    if (other is LocalThumbProvider) {
-      return asset.id == other.asset.id &&
-          asset.updatedAt == other.asset.updatedAt;
-    }
-    return false;
-  }
-
-  @override
-  int get hashCode => asset.id.hashCode ^ asset.updatedAt.hashCode;
-}
diff --git a/mobile/lib/presentation/widgets/images/remote_image_provider.dart b/mobile/lib/presentation/widgets/images/remote_image_provider.dart
new file mode 100644
index 0000000000..14d13a08d8
--- /dev/null
+++ b/mobile/lib/presentation/widgets/images/remote_image_provider.dart
@@ -0,0 +1,142 @@
+import 'dart:async';
+import 'dart:ui';
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/painting.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:immich_mobile/domain/models/setting.model.dart';
+import 'package:immich_mobile/domain/services/setting.service.dart';
+import 'package:immich_mobile/providers/image/cache/image_loader.dart';
+import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
+
+class RemoteThumbProvider extends ImageProvider<RemoteThumbProvider> {
+  final String assetId;
+  final CacheManager? cacheManager;
+
+  const RemoteThumbProvider({
+    required this.assetId,
+    this.cacheManager,
+  });
+
+  @override
+  Future<RemoteThumbProvider> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture(this);
+  }
+
+  @override
+  ImageStreamCompleter loadImage(
+    RemoteThumbProvider key,
+    ImageDecoderCallback decode,
+  ) {
+    final cache = cacheManager ?? RemoteImageCacheManager();
+    final chunkController = StreamController<ImageChunkEvent>();
+    return MultiFrameImageStreamCompleter(
+      codec: _codec(key, cache, decode, chunkController),
+      scale: 1.0,
+      chunkEvents: chunkController.stream,
+      informationCollector: () => <DiagnosticsNode>[
+        DiagnosticsProperty<ImageProvider>('Image provider', this),
+        DiagnosticsProperty<String>('Asset Id', key.assetId),
+      ],
+    );
+  }
+
+  Future<Codec> _codec(
+    RemoteThumbProvider key,
+    CacheManager cache,
+    ImageDecoderCallback decode,
+    StreamController<ImageChunkEvent> chunkController,
+  ) async {
+    final preview = getThumbnailUrlForRemoteId(
+      key.assetId,
+    );
+
+    return ImageLoader.loadImageFromCache(
+      preview,
+      cache: cache,
+      decode: decode,
+      chunkEvents: chunkController,
+    ).whenComplete(chunkController.close);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other is RemoteThumbProvider) {
+      return assetId == other.assetId;
+    }
+
+    return false;
+  }
+
+  @override
+  int get hashCode => assetId.hashCode;
+}
+
+class RemoteFullImageProvider extends ImageProvider<RemoteFullImageProvider> {
+  final String assetId;
+  final CacheManager? cacheManager;
+
+  const RemoteFullImageProvider({
+    required this.assetId,
+    this.cacheManager,
+  });
+
+  @override
+  Future<RemoteFullImageProvider> obtainKey(ImageConfiguration configuration) {
+    return SynchronousFuture(this);
+  }
+
+  @override
+  ImageStreamCompleter loadImage(
+    RemoteFullImageProvider key,
+    ImageDecoderCallback decode,
+  ) {
+    final cache = cacheManager ?? RemoteImageCacheManager();
+    final chunkEvents = StreamController<ImageChunkEvent>();
+    return MultiImageStreamCompleter(
+      codec: _codec(key, cache, decode, chunkEvents),
+      scale: 1.0,
+      chunkEvents: chunkEvents.stream,
+    );
+  }
+
+  Stream<Codec> _codec(
+    RemoteFullImageProvider key,
+    CacheManager cache,
+    ImageDecoderCallback decode,
+    StreamController<ImageChunkEvent> chunkController,
+  ) async* {
+    yield await ImageLoader.loadImageFromCache(
+      getPreviewUrlForRemoteId(key.assetId),
+      cache: cache,
+      decode: decode,
+      chunkEvents: chunkController,
+    );
+
+    if (AppSetting.get(Setting.loadOriginal)) {
+      yield await ImageLoader.loadImageFromCache(
+        getOriginalUrlForRemoteId(key.assetId),
+        cache: cache,
+        decode: decode,
+        chunkEvents: chunkController,
+      );
+    }
+    await chunkController.close();
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other is RemoteFullImageProvider) {
+      return assetId == other.assetId;
+    }
+
+    return false;
+  }
+
+  @override
+  int get hashCode => assetId.hashCode;
+}
diff --git a/mobile/lib/presentation/widgets/images/remote_thumb_provider.dart b/mobile/lib/presentation/widgets/images/remote_thumb_provider.dart
deleted file mode 100644
index f9388ea5d6..0000000000
--- a/mobile/lib/presentation/widgets/images/remote_thumb_provider.dart
+++ /dev/null
@@ -1,80 +0,0 @@
-import 'dart:async';
-import 'dart:ui';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/painting.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
-import 'package:immich_mobile/providers/image/cache/image_loader.dart';
-import 'package:immich_mobile/providers/image/cache/thumbnail_image_cache_manager.dart';
-import 'package:immich_mobile/utils/image_url_builder.dart';
-
-class RemoteThumbProvider extends ImageProvider<RemoteThumbProvider> {
-  final String assetId;
-  final double height;
-  final double width;
-  final CacheManager? cacheManager;
-
-  const RemoteThumbProvider({
-    required this.assetId,
-    this.height = kTimelineFixedTileExtent,
-    this.width = kTimelineFixedTileExtent,
-    this.cacheManager,
-  });
-
-  @override
-  Future<RemoteThumbProvider> obtainKey(
-    ImageConfiguration configuration,
-  ) {
-    return SynchronousFuture(this);
-  }
-
-  @override
-  ImageStreamCompleter loadImage(
-    RemoteThumbProvider key,
-    ImageDecoderCallback decode,
-  ) {
-    final cache = cacheManager ?? ThumbnailImageCacheManager();
-    final chunkController = StreamController<ImageChunkEvent>();
-    return MultiFrameImageStreamCompleter(
-      codec: _codec(key, cache, decode, chunkController),
-      scale: 1.0,
-      chunkEvents: chunkController.stream,
-      informationCollector: () => <DiagnosticsNode>[
-        DiagnosticsProperty<ImageProvider>('Image provider', this),
-        DiagnosticsProperty<String>('Asset Id', key.assetId),
-      ],
-    );
-  }
-
-  Future<Codec> _codec(
-    RemoteThumbProvider key,
-    CacheManager cache,
-    ImageDecoderCallback decode,
-    StreamController<ImageChunkEvent> chunkController,
-  ) async {
-    final preview = getThumbnailUrlForRemoteId(
-      key.assetId,
-    );
-
-    return ImageLoader.loadImageFromCache(
-      preview,
-      cache: cache,
-      decode: decode,
-      chunkEvents: chunkController,
-    ).whenComplete(chunkController.close);
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    if (other is RemoteThumbProvider) {
-      return assetId == other.assetId;
-    }
-
-    return false;
-  }
-
-  @override
-  int get hashCode => assetId.hashCode;
-}
diff --git a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
index bdf0baa3ca..f54c32dac1 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/presentation/widgets/images/local_thumb_provider.dart';
-import 'package:immich_mobile/presentation/widgets/images/remote_thumb_provider.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumb_hash_provider.dart';
 import 'package:immich_mobile/widgets/asset_grid/thumbnail_placeholder.dart';
 import 'package:immich_mobile/widgets/common/fade_in_placeholder_image.dart';
@@ -25,49 +24,12 @@ class Thumbnail extends StatelessWidget {
   final Size size;
   final BoxFit fit;
 
-  static ImageProvider imageProvider({
-    BaseAsset? asset,
-    String? remoteId,
-    Size size = const Size.square(256),
-  }) {
-    assert(
-      asset != null || remoteId != null,
-      'Either asset or remoteId must be provided',
-    );
-
-    if (remoteId != null) {
-      return RemoteThumbProvider(
-        assetId: remoteId,
-        height: size.height,
-        width: size.width,
-      );
-    }
-
-    if (asset is LocalAsset) {
-      return LocalThumbProvider(
-        asset: asset,
-        height: size.height,
-        width: size.width,
-      );
-    }
-
-    if (asset is RemoteAsset) {
-      return RemoteThumbProvider(
-        assetId: asset.id,
-        height: size.height,
-        width: size.width,
-      );
-    }
-
-    throw ArgumentError("Unsupported asset type: ${asset.runtimeType}");
-  }
-
   @override
   Widget build(BuildContext context) {
     final thumbHash =
         asset is RemoteAsset ? (asset as RemoteAsset).thumbHash : null;
     final provider =
-        imageProvider(asset: asset, remoteId: remoteId, size: size);
+        getThumbnailImageProvider(asset: asset, remoteId: remoteId, size: size);
 
     return OctoImage.fromSet(
       image: provider,
diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index f243fb1130..571d1c5412 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -59,10 +59,13 @@ class ThumbnailTile extends ConsumerWidget {
             child: Stack(
               children: [
                 Positioned.fill(
-                  child: Thumbnail(
-                    asset: asset,
-                    fit: fit,
-                    size: size,
+                  child: Hero(
+                    tag: asset.heroTag,
+                    child: Thumbnail(
+                      asset: asset,
+                      fit: fit,
+                      size: size,
+                    ),
                   ),
                 ),
                 if (asset.isVideo)
diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
index 4de9eaad38..3fbba803db 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -1,5 +1,6 @@
 import 'dart:math' as math;
 
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -12,6 +13,7 @@ import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart'
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 
 class FixedSegment extends Segment {
   final double tileHeight;
@@ -35,50 +37,24 @@ class FixedSegment extends Segment {
 
   @override
   double indexToLayoutOffset(int index) {
-    index -= gridIndex;
-    if (index < 0) {
-      return startOffset;
-    }
-    return gridOffset + (mainAxisExtend * index);
+    final relativeIndex = index - gridIndex;
+    return relativeIndex < 0
+        ? startOffset
+        : gridOffset + (mainAxisExtend * relativeIndex);
   }
 
   @override
   int getMinChildIndexForScrollOffset(double scrollOffset) {
-    scrollOffset -= gridOffset;
-    if (!scrollOffset.isFinite || scrollOffset < 0) {
-      return firstIndex;
-    }
-    final rowsAbove = (scrollOffset / mainAxisExtend).floor();
-    return gridIndex + rowsAbove;
+    final adjustedOffset = scrollOffset - gridOffset;
+    if (!adjustedOffset.isFinite || adjustedOffset < 0) return firstIndex;
+    return gridIndex + (adjustedOffset / mainAxisExtend).floor();
   }
 
   @override
   int getMaxChildIndexForScrollOffset(double scrollOffset) {
-    scrollOffset -= gridOffset;
-    if (!scrollOffset.isFinite || scrollOffset < 0) {
-      return firstIndex;
-    }
-    final firstRowBelow = (scrollOffset / mainAxisExtend).ceil();
-    return gridIndex + firstRowBelow - 1;
-  }
-
-  void _handleOnTap(WidgetRef ref, BaseAsset asset) {
-    final multiSelectState = ref.read(multiSelectProvider);
-    if (!multiSelectState.isEnabled) {
-      return;
-    }
-
-    ref.read(multiSelectProvider.notifier).toggleAssetSelection(asset);
-  }
-
-  void _handleOnLongPress(WidgetRef ref, BaseAsset asset) {
-    final multiSelectState = ref.read(multiSelectProvider);
-    if (multiSelectState.isEnabled) {
-      return;
-    }
-
-    ref.read(hapticFeedbackProvider.notifier).heavyImpact();
-    ref.read(multiSelectProvider.notifier).toggleAssetSelection(asset);
+    final adjustedOffset = scrollOffset - gridOffset;
+    if (!adjustedOffset.isFinite || adjustedOffset < 0) return firstIndex;
+    return gridIndex + (adjustedOffset / mainAxisExtend).ceil() - 1;
   }
 
   @override
@@ -97,132 +73,128 @@ class FixedSegment extends Segment {
       );
     }
 
-    return _buildRow(firstAssetIndex + assetIndex, numberOfAssets);
-  }
-
-  Widget _buildRow(int assetIndex, int count) => RepaintBoundary(
-        child: Consumer(
-          builder: (ctx, ref, _) {
-            final isScrubbing =
-                ref.watch(timelineStateProvider.select((s) => s.isScrubbing));
-            final timelineService = ref.read(timelineServiceProvider);
-
-            // Create stable callback references to prevent unnecessary rebuilds
-            onTap(BaseAsset asset) => _handleOnTap(ref, asset);
-            onLongPress(BaseAsset asset) => _handleOnLongPress(ref, asset);
-
-            // Timeline is being scrubbed, show placeholders
-            if (isScrubbing) {
-              return SegmentBuilder.buildPlaceholder(
-                ctx,
-                count,
-                size: Size.square(tileHeight),
-                spacing: spacing,
-              );
-            }
-
-            // Bucket is already loaded, show the assets
-            if (timelineService.hasRange(assetIndex, count)) {
-              final assets = timelineService.getAssets(assetIndex, count);
-              return _buildAssetRow(
-                ctx,
-                assets,
-                baseAssetIndex: assetIndex,
-                onTap: onTap,
-                onLongPress: onLongPress,
-              );
-            }
-
-            // Bucket is not loaded, show placeholders and load the bucket
-            return FutureBuilder(
-              future: timelineService.loadAssets(assetIndex, count),
-              builder: (ctxx, snap) {
-                if (snap.connectionState != ConnectionState.done) {
-                  return SegmentBuilder.buildPlaceholder(
-                    ctx,
-                    count,
-                    size: Size.square(tileHeight),
-                    spacing: spacing,
-                  );
-                }
-
-                return _buildAssetRow(
-                  ctxx,
-                  snap.requireData,
-                  baseAssetIndex: assetIndex,
-                  onTap: onTap,
-                  onLongPress: onLongPress,
-                );
-              },
-            );
-          },
-        ),
-      );
-
-  Widget _buildAssetRow(
-    BuildContext context,
-    List<BaseAsset> assets, {
-    required void Function(BaseAsset) onTap,
-    required void Function(BaseAsset) onLongPress,
-    required int baseAssetIndex,
-  }) =>
-      FixedTimelineRow(
-        dimension: tileHeight,
-        spacing: spacing,
-        textDirection: Directionality.of(context),
-        children: List.generate(
-          assets.length,
-          (i) => _AssetTileWidget(
-            key: ValueKey(_generateUniqueKey(assets[i], baseAssetIndex + i)),
-            asset: assets[i],
-            onTap: onTap,
-            onLongPress: onLongPress,
-          ),
-        ),
-      );
-
-  /// Generates a unique key for an asset that handles different asset types
-  /// and prevents duplicate keys even when assets have the same name/timestamp
-  String _generateUniqueKey(BaseAsset asset, int assetIndex) {
-    // Try to get the most unique identifier based on asset type
-    if (asset is RemoteAsset) {
-      // For remote/merged assets, use the remote ID which is globally unique
-      return 'asset_${asset.id}';
-    } else if (asset is LocalAsset) {
-      // For local assets, use the local ID which should be unique per device
-      return 'local_${asset.id}';
-    } else {
-      // Fallback for any other BaseAsset implementation
-      // Use checksum if available for additional uniqueness
-      final checksum = asset.checksum;
-      if (checksum != null && checksum.isNotEmpty) {
-        return 'checksum_${checksum.hashCode}';
-      } else {
-        // Last resort: use global asset index + object hash for uniqueness
-        return 'fallback_${assetIndex}_${asset.hashCode}_${asset.createdAt.microsecondsSinceEpoch}';
-      }
-    }
+    return _FixedSegmentRow(
+      assetIndex: firstAssetIndex + assetIndex,
+      assetCount: numberOfAssets,
+      tileHeight: tileHeight,
+      spacing: spacing,
+    );
   }
 }
 
-class _AssetTileWidget extends StatelessWidget {
+class _FixedSegmentRow extends ConsumerWidget {
+  final int assetIndex;
+  final int assetCount;
+  final double tileHeight;
+  final double spacing;
+
+  const _FixedSegmentRow({
+    required this.assetIndex,
+    required this.assetCount,
+    required this.tileHeight,
+    required this.spacing,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isScrubbing =
+        ref.watch(timelineStateProvider.select((s) => s.isScrubbing));
+    final timelineService = ref.read(timelineServiceProvider);
+
+    if (isScrubbing) {
+      return _buildPlaceholder(context);
+    }
+
+    if (timelineService.hasRange(assetIndex, assetCount)) {
+      return _buildAssetRow(
+        context,
+        timelineService.getAssets(assetIndex, assetCount),
+      );
+    }
+
+    return FutureBuilder<List<BaseAsset>>(
+      future: timelineService.loadAssets(assetIndex, assetCount),
+      builder: (context, snapshot) {
+        if (snapshot.connectionState != ConnectionState.done) {
+          return _buildPlaceholder(context);
+        }
+        return _buildAssetRow(context, snapshot.requireData);
+      },
+    );
+  }
+
+  Widget _buildPlaceholder(BuildContext context) {
+    return SegmentBuilder.buildPlaceholder(
+      context,
+      assetCount,
+      size: Size.square(tileHeight),
+      spacing: spacing,
+    );
+  }
+
+  Widget _buildAssetRow(BuildContext context, List<BaseAsset> assets) {
+    return FixedTimelineRow(
+      dimension: tileHeight,
+      spacing: spacing,
+      textDirection: Directionality.of(context),
+      children: [
+        for (int i = 0; i < assets.length; i++)
+          _AssetTileWidget(
+            key: ValueKey(assets[i].heroTag),
+            asset: assets[i],
+            assetIndex: assetIndex + i,
+          ),
+      ],
+    );
+  }
+}
+
+class _AssetTileWidget extends ConsumerWidget {
   final BaseAsset asset;
-  final void Function(BaseAsset) onTap;
-  final void Function(BaseAsset) onLongPress;
+  final int assetIndex;
 
   const _AssetTileWidget({
     super.key,
     required this.asset,
-    required this.onTap,
-    required this.onLongPress,
+    required this.assetIndex,
   });
 
+  void _handleOnTap(
+    BuildContext ctx,
+    WidgetRef ref,
+    int assetIndex,
+    BaseAsset asset,
+  ) {
+    final multiSelectState = ref.read(multiSelectProvider);
+    if (!multiSelectState.isEnabled) {
+      ctx.pushRoute(
+        AssetViewerRoute(
+          initialIndex: assetIndex,
+          timelineService: ref.read(timelineServiceProvider),
+        ),
+      );
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).toggleAssetSelection(asset);
+  }
+
+  void _handleOnLongPress(WidgetRef ref, BaseAsset asset) {
+    final multiSelectState = ref.read(multiSelectProvider);
+    if (multiSelectState.isEnabled) {
+      return;
+    }
+
+    ref.read(hapticFeedbackProvider.notifier).heavyImpact();
+    ref.read(multiSelectProvider.notifier).toggleAssetSelection(asset);
+  }
+
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     return RepaintBoundary(
       child: GestureDetector(
-        onTap: () => onTap(asset),
-        onLongPress: () => onLongPress(asset),
+        onTap: () => _handleOnTap(context, ref, assetIndex, asset),
+        onLongPress: () => _handleOnLongPress(ref, asset),
         child: ThumbnailTile(asset),
       ),
     );
diff --git a/mobile/lib/providers/infrastructure/asset.provider.dart b/mobile/lib/providers/infrastructure/asset.provider.dart
index 28a6bda278..860af134ae 100644
--- a/mobile/lib/providers/infrastructure/asset.provider.dart
+++ b/mobile/lib/providers/infrastructure/asset.provider.dart
@@ -1,4 +1,5 @@
 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/providers/infrastructure/db.provider.dart';
@@ -7,6 +8,12 @@ final localAssetRepository = Provider<DriftLocalAssetRepository>(
   (ref) => DriftLocalAssetRepository(ref.watch(driftProvider)),
 );
 
-final remoteAssetRepository = Provider<DriftRemoteAssetRepository>(
-  (ref) => DriftRemoteAssetRepository(ref.watch(driftProvider)),
+final remoteAssetRepositoryProvider = Provider<RemoteAssetRepository>(
+  (ref) => RemoteAssetRepository(ref.watch(driftProvider)),
+);
+
+final assetServiceProvider = Provider(
+  (ref) => AssetService(
+    remoteAssetRepository: ref.watch(remoteAssetRepositoryProvider),
+  ),
 );
diff --git a/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart b/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart
new file mode 100644
index 0000000000..48cf190bbc
--- /dev/null
+++ b/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart
@@ -0,0 +1,26 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+
+final currentAssetNotifier =
+    NotifierProvider<CurrentAssetNotifier, BaseAsset>(CurrentAssetNotifier.new);
+
+class CurrentAssetNotifier extends Notifier<BaseAsset> {
+  @override
+  BaseAsset build() {
+    throw UnimplementedError(
+      'An asset must be set before using the currentAssetProvider.',
+    );
+  }
+
+  void setAsset(BaseAsset asset) {
+    state = asset;
+  }
+}
+
+final currentAssetExifProvider = FutureProvider(
+  (ref) {
+    final currentAsset = ref.watch(currentAssetNotifier);
+    return ref.watch(assetServiceProvider).getExif(currentAsset);
+  },
+);
diff --git a/mobile/lib/providers/infrastructure/exif.provider.dart b/mobile/lib/providers/infrastructure/exif.provider.dart
index af4bb933ec..59ad632927 100644
--- a/mobile/lib/providers/infrastructure/exif.provider.dart
+++ b/mobile/lib/providers/infrastructure/exif.provider.dart
@@ -8,7 +8,3 @@ part 'exif.provider.g.dart';
 @Riverpod(keepAlive: true)
 IsarExifRepository exifRepository(Ref ref) =>
     IsarExifRepository(ref.watch(isarProvider));
-
-final remoteExifRepository = Provider<DriftRemoteExifRepository>(
-  (ref) => DriftRemoteExifRepository(ref.watch(driftProvider)),
-);
diff --git a/mobile/lib/providers/infrastructure/storage.provider.dart b/mobile/lib/providers/infrastructure/storage.provider.dart
index f9ac10b461..5bbbe51497 100644
--- a/mobile/lib/providers/infrastructure/storage.provider.dart
+++ b/mobile/lib/providers/infrastructure/storage.provider.dart
@@ -2,5 +2,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 
 final storageRepositoryProvider = Provider<StorageRepository>(
-  (ref) => StorageRepository(),
+  (ref) => const StorageRepository(),
 );
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 31e1d715a1..dae2dcdbfb 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/models/folder/recursive_folder.model.dart';
@@ -70,6 +71,7 @@ import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/remote_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.page.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/routing/auth_guard.dart';
@@ -371,6 +373,18 @@ class AppRouter extends RootStackRouter {
       page: RemoteTimelineRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: AssetViewerRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+      type: RouteType.custom(
+        customRouteBuilder: <T>(context, child, page) => PageRouteBuilder<T>(
+          fullscreenDialog: page.fullscreenDialog,
+          settings: page,
+          pageBuilder: (_, __, ___) => child,
+          opaque: false,
+        ),
+      ),
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 2ea10491b3..348cea656e 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -403,6 +403,58 @@ class ArchiveRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [AssetViewerPage]
+class AssetViewerRoute extends PageRouteInfo<AssetViewerRouteArgs> {
+  AssetViewerRoute({
+    Key? key,
+    required int initialIndex,
+    required TimelineService timelineService,
+    List<PageRouteInfo>? children,
+  }) : super(
+          AssetViewerRoute.name,
+          args: AssetViewerRouteArgs(
+            key: key,
+            initialIndex: initialIndex,
+            timelineService: timelineService,
+          ),
+          initialChildren: children,
+        );
+
+  static const String name = 'AssetViewerRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<AssetViewerRouteArgs>();
+      return AssetViewerPage(
+        key: args.key,
+        initialIndex: args.initialIndex,
+        timelineService: args.timelineService,
+      );
+    },
+  );
+}
+
+class AssetViewerRouteArgs {
+  const AssetViewerRouteArgs({
+    this.key,
+    required this.initialIndex,
+    required this.timelineService,
+  });
+
+  final Key? key;
+
+  final int initialIndex;
+
+  final TimelineService timelineService;
+
+  @override
+  String toString() {
+    return 'AssetViewerRouteArgs{key: $key, initialIndex: $initialIndex, timelineService: $timelineService}';
+  }
+}
+
 /// generated route for
 /// [BackupAlbumSelectionPage]
 class BackupAlbumSelectionRoute extends PageRouteInfo<void> {
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index d1aabf3fb6..2f4c8cc926 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -2,10 +2,8 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/exif.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/location_picker.dart';
@@ -15,20 +13,17 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 final actionServiceProvider = Provider<ActionService>(
   (ref) => ActionService(
     ref.watch(assetApiRepositoryProvider),
-    ref.watch(remoteAssetRepository),
-    ref.watch(remoteExifRepository),
+    ref.watch(remoteAssetRepositoryProvider),
   ),
 );
 
 class ActionService {
   final AssetApiRepository _assetApiRepository;
-  final DriftRemoteAssetRepository _remoteAssetRepository;
-  final DriftRemoteExifRepository _remoteExifRepository;
+  final RemoteAssetRepository _remoteAssetRepository;
 
   const ActionService(
     this._assetApiRepository,
     this._remoteAssetRepository,
-    this._remoteExifRepository,
   );
 
   Future<void> shareLink(List<String> remoteIds, BuildContext context) async {
@@ -109,7 +104,7 @@ class ActionService {
   ) async {
     LatLng? initialLatLng;
     if (remoteIds.length == 1) {
-      final exif = await _remoteExifRepository.get(remoteIds[0]);
+      final exif = await _remoteAssetRepository.getExif(remoteIds[0]);
 
       if (exif?.latitude != null && exif?.longitude != null) {
         initialLatLng = LatLng(exif!.latitude!, exif.longitude!);
diff --git a/mobile/lib/utils/cache/custom_image_cache.dart b/mobile/lib/utils/cache/custom_image_cache.dart
index dcb8dacb0d..8c70472765 100644
--- a/mobile/lib/utils/cache/custom_image_cache.dart
+++ b/mobile/lib/utils/cache/custom_image_cache.dart
@@ -1,4 +1,6 @@
 import 'package:flutter/painting.dart';
+import 'package:immich_mobile/presentation/widgets/images/local_image_provider.dart';
+import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
 import 'package:immich_mobile/providers/image/immich_local_image_provider.dart';
 import 'package:immich_mobile/providers/image/immich_local_thumbnail_provider.dart';
 import 'package:immich_mobile/providers/image/immich_remote_image_provider.dart';
@@ -37,10 +39,12 @@ final class CustomImageCache implements ImageCache {
   /// Gets the cache for the given key
   /// [_large] is used for [ImmichLocalImageProvider] and [ImmichRemoteImageProvider]
   /// [_small] is used for [ImmichLocalThumbnailProvider] and [ImmichRemoteThumbnailProvider]
-  ImageCache _cacheForKey(Object key) =>
-      (key is ImmichLocalImageProvider || key is ImmichRemoteImageProvider)
-          ? _large
-          : _small;
+  ImageCache _cacheForKey(Object key) => (key is ImmichLocalImageProvider ||
+          key is ImmichRemoteImageProvider ||
+          key is LocalFullImageProvider ||
+          key is RemoteFullImageProvider)
+      ? _large
+      : _small;
 
   @override
   bool containsKey(Object key) {
diff --git a/mobile/lib/utils/image_url_builder.dart b/mobile/lib/utils/image_url_builder.dart
index 50218eaffd..bde50f3a90 100644
--- a/mobile/lib/utils/image_url_builder.dart
+++ b/mobile/lib/utils/image_url_builder.dart
@@ -73,6 +73,9 @@ String getThumbnailUrlForRemoteId(
   return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.value}';
 }
 
+String getPreviewUrlForRemoteId(final String id) =>
+    '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${AssetMediaSize.preview}';
+
 String getPlaybackUrlForRemoteId(final String id) {
   return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/video/playback?';
 }
diff --git a/mobile/lib/widgets/photo_view/photo_view.dart b/mobile/lib/widgets/photo_view/photo_view.dart
index f72d1e298f..0c1a4f4855 100644
--- a/mobile/lib/widgets/photo_view/photo_view.dart
+++ b/mobile/lib/widgets/photo_view/photo_view.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-
 import 'package:immich_mobile/widgets/photo_view/src/controller/photo_view_controller.dart';
 import 'package:immich_mobile/widgets/photo_view/src/controller/photo_view_scalestate_controller.dart';
 import 'package:immich_mobile/widgets/photo_view/src/core/photo_view_core.dart';
@@ -16,6 +15,11 @@ export 'src/photo_view_computed_scale.dart';
 export 'src/photo_view_scale_state.dart';
 export 'src/utils/photo_view_hero_attributes.dart';
 
+typedef PhotoViewControllerCallback = PhotoViewControllerBase Function();
+typedef PhotoViewControllerCallbackBuilder = void Function(
+  PhotoViewControllerCallback photoViewMethod,
+);
+
 /// A [StatefulWidget] that contains all the photo view rendering elements.
 ///
 /// Sample code to use within an image:
@@ -239,8 +243,11 @@ class PhotoView extends StatefulWidget {
     this.wantKeepAlive = false,
     this.gaplessPlayback = false,
     this.heroAttributes,
+    this.onPageBuild,
+    this.controllerCallbackBuilder,
     this.scaleStateChangedCallback,
     this.enableRotation = false,
+    this.semanticLabel,
     this.controller,
     this.scaleStateController,
     this.maxScale,
@@ -260,6 +267,7 @@ class PhotoView extends StatefulWidget {
     this.tightMode,
     this.filterQuality,
     this.disableGestures,
+    this.disableScaleGestures,
     this.errorBuilder,
     this.enablePanAlways,
   })  : child = null,
@@ -278,6 +286,8 @@ class PhotoView extends StatefulWidget {
     this.backgroundDecoration,
     this.wantKeepAlive = false,
     this.heroAttributes,
+    this.onPageBuild,
+    this.controllerCallbackBuilder,
     this.scaleStateChangedCallback,
     this.enableRotation = false,
     this.controller,
@@ -298,9 +308,11 @@ class PhotoView extends StatefulWidget {
     this.gestureDetectorBehavior,
     this.tightMode,
     this.filterQuality,
+    this.disableScaleGestures,
     this.disableGestures,
     this.enablePanAlways,
-  })  : errorBuilder = null,
+  })  : semanticLabel = null,
+        errorBuilder = null,
         imageProvider = null,
         gaplessPlayback = false,
         loadingBuilder = null,
@@ -325,6 +337,11 @@ class PhotoView extends StatefulWidget {
   /// `true`  -> keeps the state
   final bool wantKeepAlive;
 
+  /// A Semantic description of the image.
+  ///
+  /// Used to provide a description of the image to TalkBack on Android, and VoiceOver on iOS.
+  final String? semanticLabel;
+
   /// This is used to continue showing the old image (`true`), or briefly show
   /// nothing (`false`), when the `imageProvider` changes. By default it's set
   /// to `false`.
@@ -338,6 +355,12 @@ class PhotoView extends StatefulWidget {
   /// by default it is `MediaQuery.of(context).size`.
   final Size? customSize;
 
+  // Called when a new PhotoView widget is built
+  final ValueChanged<PhotoViewControllerBase>? onPageBuild;
+
+  // Called from the parent during page change to get the new controller
+  final PhotoViewControllerCallbackBuilder? controllerCallbackBuilder;
+
   /// A [Function] to be called whenever the scaleState changes, this happens when the user double taps the content ou start to pinch-in.
   final ValueChanged<PhotoViewScaleState>? scaleStateChangedCallback;
 
@@ -419,6 +442,9 @@ class PhotoView extends StatefulWidget {
   // Useful when custom gesture detector is used in child widget.
   final bool? disableGestures;
 
+  /// Mirror to [PhotoView.disableGestures]
+  final bool? disableScaleGestures;
+
   /// Enable pan the widget even if it's smaller than the hole parent widget.
   /// Useful when you want to drag a widget without restrictions.
   final bool? enablePanAlways;
@@ -452,6 +478,7 @@ class _PhotoViewState extends State<PhotoView>
     if (widget.controller == null) {
       _controlledController = true;
       _controller = PhotoViewController();
+      widget.onPageBuild?.call(_controller);
     } else {
       _controlledController = false;
       _controller = widget.controller!;
@@ -466,6 +493,8 @@ class _PhotoViewState extends State<PhotoView>
     }
 
     _scaleStateController.outputScaleStateStream.listen(scaleStateListener);
+    // Pass a ref to the method back to the gallery so it can fetch the controller on page changes
+    widget.controllerCallbackBuilder?.call(_controllerGetter);
   }
 
   @override
@@ -474,6 +503,7 @@ class _PhotoViewState extends State<PhotoView>
       if (!_controlledController) {
         _controlledController = true;
         _controller = PhotoViewController();
+        widget.onPageBuild?.call(_controller);
       }
     } else {
       _controlledController = false;
@@ -509,6 +539,8 @@ class _PhotoViewState extends State<PhotoView>
     }
   }
 
+  PhotoViewControllerBase _controllerGetter() => _controller;
+
   @override
   Widget build(BuildContext context) {
     super.build(context);
@@ -547,6 +579,7 @@ class _PhotoViewState extends State<PhotoView>
                 tightMode: widget.tightMode,
                 filterQuality: widget.filterQuality,
                 disableGestures: widget.disableGestures,
+                disableScaleGestures: widget.disableScaleGestures,
                 enablePanAlways: widget.enablePanAlways,
                 child: widget.child,
               )
@@ -554,6 +587,7 @@ class _PhotoViewState extends State<PhotoView>
                 imageProvider: widget.imageProvider!,
                 loadingBuilder: widget.loadingBuilder,
                 backgroundDecoration: backgroundDecoration,
+                semanticLabel: widget.semanticLabel,
                 gaplessPlayback: widget.gaplessPlayback,
                 heroAttributes: widget.heroAttributes,
                 scaleStateChangedCallback: widget.scaleStateChangedCallback,
@@ -577,6 +611,7 @@ class _PhotoViewState extends State<PhotoView>
                 tightMode: widget.tightMode,
                 filterQuality: widget.filterQuality,
                 disableGestures: widget.disableGestures,
+                disableScaleGestures: widget.disableScaleGestures,
                 errorBuilder: widget.errorBuilder,
                 enablePanAlways: widget.enablePanAlways,
                 index: widget.index,
@@ -626,6 +661,7 @@ typedef PhotoViewImageDragStartCallback = Function(
   BuildContext context,
   DragStartDetails details,
   PhotoViewControllerValue controllerValue,
+  PhotoViewScaleStateController scaleStateController,
 );
 
 /// A type definition for a callback when the user drags
diff --git a/mobile/lib/widgets/photo_view/photo_view_gallery.dart b/mobile/lib/widgets/photo_view/photo_view_gallery.dart
index 26c292d678..cf026288fb 100644
--- a/mobile/lib/widgets/photo_view/photo_view_gallery.dart
+++ b/mobile/lib/widgets/photo_view/photo_view_gallery.dart
@@ -4,13 +4,14 @@ import 'package:immich_mobile/widgets/photo_view/photo_view.dart'
     show
         LoadingBuilder,
         PhotoView,
+        PhotoViewControllerCallback,
+        PhotoViewImageDragEndCallback,
+        PhotoViewImageDragStartCallback,
+        PhotoViewImageDragUpdateCallback,
+        PhotoViewImageLongPressStartCallback,
+        PhotoViewImageScaleEndCallback,
         PhotoViewImageTapDownCallback,
         PhotoViewImageTapUpCallback,
-        PhotoViewImageDragStartCallback,
-        PhotoViewImageDragEndCallback,
-        PhotoViewImageDragUpdateCallback,
-        PhotoViewImageScaleEndCallback,
-        PhotoViewImageLongPressStartCallback,
         ScaleStateCycle;
 import 'package:immich_mobile/widgets/photo_view/src/controller/photo_view_controller.dart';
 import 'package:immich_mobile/widgets/photo_view/src/controller/photo_view_scalestate_controller.dart';
@@ -19,7 +20,10 @@ import 'package:immich_mobile/widgets/photo_view/src/photo_view_scale_state.dart
 import 'package:immich_mobile/widgets/photo_view/src/utils/photo_view_hero_attributes.dart';
 
 /// A type definition for a [Function] that receives a index after a page change in [PhotoViewGallery]
-typedef PhotoViewGalleryPageChangedCallback = void Function(int index);
+typedef PhotoViewGalleryPageChangedCallback = void Function(
+  int index,
+  PhotoViewControllerBase? controller,
+);
 
 /// A type definition for a [Function] that defines a page in [PhotoViewGallery.build]
 typedef PhotoViewGalleryBuilder = PhotoViewGalleryPageOptions Function(
@@ -114,12 +118,14 @@ class PhotoViewGallery extends StatefulWidget {
     this.reverse = false,
     this.pageController,
     this.onPageChanged,
+    this.onPageBuild,
     this.scaleStateChangedCallback,
     this.enableRotation = false,
     this.scrollPhysics,
     this.scrollDirection = Axis.horizontal,
     this.customSize,
     this.allowImplicitScrolling = false,
+    this.enablePanAlways = false,
   })  : itemCount = null,
         builder = null;
 
@@ -137,12 +143,14 @@ class PhotoViewGallery extends StatefulWidget {
     this.reverse = false,
     this.pageController,
     this.onPageChanged,
+    this.onPageBuild,
     this.scaleStateChangedCallback,
     this.enableRotation = false,
     this.scrollPhysics,
     this.scrollDirection = Axis.horizontal,
     this.customSize,
     this.allowImplicitScrolling = false,
+    this.enablePanAlways = false,
   })  : pageOptions = null,
         assert(itemCount != null),
         assert(builder != null);
@@ -168,6 +176,9 @@ class PhotoViewGallery extends StatefulWidget {
   /// Mirror to [PhotoView.wantKeepAlive]
   final bool wantKeepAlive;
 
+  /// Mirror to [PhotoView.enablePanAlways]
+  final bool enablePanAlways;
+
   /// Mirror to [PhotoView.gaplessPlayback]
   final bool gaplessPlayback;
 
@@ -180,6 +191,9 @@ class PhotoViewGallery extends StatefulWidget {
   /// An callback to be called on a page change
   final PhotoViewGalleryPageChangedCallback? onPageChanged;
 
+  /// Mirror to [PhotoView.onPageBuild]
+  final ValueChanged<PhotoViewControllerBase>? onPageBuild;
+
   /// Mirror to [PhotoView.scaleStateChangedCallback]
   final ValueChanged<PhotoViewScaleState>? scaleStateChangedCallback;
 
@@ -206,6 +220,7 @@ class PhotoViewGallery extends StatefulWidget {
 class _PhotoViewGalleryState extends State<PhotoViewGallery> {
   late final PageController _controller =
       widget.pageController ?? PageController();
+  PhotoViewControllerCallback? _getController;
 
   void scaleStateChangedCallback(PhotoViewScaleState scaleState) {
     if (widget.scaleStateChangedCallback != null) {
@@ -224,6 +239,14 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
     return widget.pageOptions!.length;
   }
 
+  void _getControllerCallbackBuilder(PhotoViewControllerCallback method) {
+    _getController = method;
+  }
+
+  void _onPageChange(int page) {
+    widget.onPageChanged?.call(page, _getController?.call());
+  }
+
   @override
   Widget build(BuildContext context) {
     // Enable corner hit test
@@ -232,7 +255,7 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
       child: PageView.builder(
         reverse: widget.reverse,
         controller: _controller,
-        onPageChanged: widget.onPageChanged,
+        onPageChanged: _onPageChange,
         itemCount: itemCount,
         itemBuilder: _buildItem,
         scrollDirection: widget.scrollDirection,
@@ -255,6 +278,8 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
             controller: pageOption.controller,
             scaleStateController: pageOption.scaleStateController,
             customSize: widget.customSize,
+            onPageBuild: widget.onPageBuild,
+            controllerCallbackBuilder: _getControllerCallbackBuilder,
             scaleStateChangedCallback: scaleStateChangedCallback,
             enableRotation: widget.enableRotation,
             initialScale: pageOption.initialScale,
@@ -273,7 +298,9 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
             filterQuality: pageOption.filterQuality,
             basePosition: pageOption.basePosition,
             disableGestures: pageOption.disableGestures,
+            disableScaleGestures: pageOption.disableScaleGestures,
             heroAttributes: pageOption.heroAttributes,
+            enablePanAlways: widget.enablePanAlways,
             child: pageOption.child,
           )
         : PhotoView(
@@ -282,8 +309,11 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
             imageProvider: pageOption.imageProvider,
             loadingBuilder: widget.loadingBuilder,
             backgroundDecoration: widget.backgroundDecoration,
+            semanticLabel: pageOption.semanticLabel,
             wantKeepAlive: widget.wantKeepAlive,
             controller: pageOption.controller,
+            onPageBuild: widget.onPageBuild,
+            controllerCallbackBuilder: _getControllerCallbackBuilder,
             scaleStateController: pageOption.scaleStateController,
             customSize: widget.customSize,
             gaplessPlayback: widget.gaplessPlayback,
@@ -305,6 +335,8 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
             filterQuality: pageOption.filterQuality,
             basePosition: pageOption.basePosition,
             disableGestures: pageOption.disableGestures,
+            disableScaleGestures: pageOption.disableScaleGestures,
+            enablePanAlways: widget.enablePanAlways,
             errorBuilder: pageOption.errorBuilder,
             heroAttributes: pageOption.heroAttributes,
           );
@@ -334,6 +366,7 @@ class PhotoViewGalleryPageOptions {
     Key? key,
     required this.imageProvider,
     this.heroAttributes,
+    this.semanticLabel,
     this.minScale,
     this.maxScale,
     this.initialScale,
@@ -351,6 +384,7 @@ class PhotoViewGalleryPageOptions {
     this.gestureDetectorBehavior,
     this.tightMode,
     this.filterQuality,
+    this.disableScaleGestures,
     this.disableGestures,
     this.errorBuilder,
   })  : child = null,
@@ -360,6 +394,7 @@ class PhotoViewGalleryPageOptions {
   const PhotoViewGalleryPageOptions.customChild({
     required this.child,
     this.childSize,
+    this.semanticLabel,
     this.heroAttributes,
     this.minScale,
     this.maxScale,
@@ -378,6 +413,7 @@ class PhotoViewGalleryPageOptions {
     this.gestureDetectorBehavior,
     this.tightMode,
     this.filterQuality,
+    this.disableScaleGestures,
     this.disableGestures,
   })  : errorBuilder = null,
         imageProvider = null;
@@ -388,6 +424,9 @@ class PhotoViewGalleryPageOptions {
   /// Mirror to [PhotoView.heroAttributes]
   final PhotoViewHeroAttributes? heroAttributes;
 
+  /// Mirror to [PhotoView.semanticLabel]
+  final String? semanticLabel;
+
   /// Mirror to [PhotoView.minScale]
   final dynamic minScale;
 
@@ -445,6 +484,9 @@ class PhotoViewGalleryPageOptions {
   /// Mirror to [PhotoView.disableGestures]
   final bool? disableGestures;
 
+  /// Mirror to [PhotoView.disableGestures]
+  final bool? disableScaleGestures;
+
   /// Quality levels for image filters.
   final FilterQuality? filterQuality;
 
diff --git a/mobile/lib/widgets/photo_view/src/controller/photo_view_controller.dart b/mobile/lib/widgets/photo_view/src/controller/photo_view_controller.dart
index e26708bb41..37d1c78de1 100644
--- a/mobile/lib/widgets/photo_view/src/controller/photo_view_controller.dart
+++ b/mobile/lib/widgets/photo_view/src/controller/photo_view_controller.dart
@@ -37,6 +37,13 @@ abstract class PhotoViewControllerBase<T extends PhotoViewControllerValue> {
   /// Closes streams and removes eventual listeners.
   void dispose();
 
+  void positionAnimationBuilder(void Function(Offset)? value);
+  void scaleAnimationBuilder(void Function(double)? value);
+  void rotationAnimationBuilder(void Function(double)? value);
+
+  /// Animates multiple fields of the state
+  void animateMultiple({Offset? position, double? scale, double? rotation});
+
   /// Add a listener that will ignore updates made internally
   ///
   /// Since it is made for internal use, it is not performatic to use more than one
@@ -147,12 +154,31 @@ class PhotoViewController
 
   late StreamController<PhotoViewControllerValue> _outputCtrl;
 
+  late void Function(Offset)? _animatePosition;
+  late void Function(double)? _animateScale;
+  late void Function(double)? _animateRotation;
+
   @override
   Stream<PhotoViewControllerValue> get outputStateStream => _outputCtrl.stream;
 
   @override
   late PhotoViewControllerValue prevValue;
 
+  @override
+  void positionAnimationBuilder(void Function(Offset)? value) {
+    _animatePosition = value;
+  }
+
+  @override
+  void scaleAnimationBuilder(void Function(double)? value) {
+    _animateScale = value;
+  }
+
+  @override
+  void rotationAnimationBuilder(void Function(double)? value) {
+    _animateRotation = value;
+  }
+
   @override
   void reset() {
     value = initial;
@@ -172,6 +198,21 @@ class PhotoViewController
     _valueNotifier.removeIgnorableListener(callback);
   }
 
+  @override
+  void animateMultiple({Offset? position, double? scale, double? rotation}) {
+    if (position != null && _animatePosition != null) {
+      _animatePosition!(position);
+    }
+
+    if (scale != null && _animateScale != null) {
+      _animateScale!(scale);
+    }
+
+    if (rotation != null && _animateRotation != null) {
+      _animateRotation!(rotation);
+    }
+  }
+
   @override
   void dispose() {
     _outputCtrl.close();
diff --git a/mobile/lib/widgets/photo_view/src/controller/photo_view_controller_delegate.dart b/mobile/lib/widgets/photo_view/src/controller/photo_view_controller_delegate.dart
index 968ac652e7..e2e668199a 100644
--- a/mobile/lib/widgets/photo_view/src/controller/photo_view_controller_delegate.dart
+++ b/mobile/lib/widgets/photo_view/src/controller/photo_view_controller_delegate.dart
@@ -111,6 +111,16 @@ mixin PhotoViewControllerDelegate on State<PhotoViewCore> {
     );
   }
 
+  PhotoViewScaleState getScaleStateFromNewScale(double newScale) {
+    PhotoViewScaleState newScaleState = PhotoViewScaleState.initial;
+    if (scale != scaleBoundaries.initialScale) {
+      newScaleState = (newScale > scaleBoundaries.initialScale)
+          ? PhotoViewScaleState.zoomedIn
+          : PhotoViewScaleState.zoomedOut;
+    }
+    return newScaleState;
+  }
+
   void updateScaleStateFromNewScale(double newScale) {
     PhotoViewScaleState newScaleState = PhotoViewScaleState.initial;
     if (scale != scaleBoundaries.initialScale) {
diff --git a/mobile/lib/widgets/photo_view/src/controller/photo_view_scalestate_controller.dart b/mobile/lib/widgets/photo_view/src/controller/photo_view_scalestate_controller.dart
index 16021ceab1..dea8be1a0f 100644
--- a/mobile/lib/widgets/photo_view/src/controller/photo_view_scalestate_controller.dart
+++ b/mobile/lib/widgets/photo_view/src/controller/photo_view_scalestate_controller.dart
@@ -26,6 +26,8 @@ class PhotoViewScaleStateController {
       StreamController<PhotoViewScaleState>.broadcast()
         ..sink.add(PhotoViewScaleState.initial);
 
+  bool _hasZoomedOutManually = false;
+
   /// The output for state/value updates
   Stream<PhotoViewScaleState> get outputScaleStateStream =>
       _outputScaleStateCtrl.stream;
@@ -42,10 +44,20 @@ class PhotoViewScaleStateController {
       return;
     }
 
+    if (newValue == PhotoViewScaleState.zoomedOut) {
+      _hasZoomedOutManually = true;
+    }
+
+    if (newValue == PhotoViewScaleState.initial) {
+      _hasZoomedOutManually = false;
+    }
+
     prevScaleState = _scaleStateNotifier.value;
     _scaleStateNotifier.value = newValue;
   }
 
+  bool get hasZoomedOutManually => _hasZoomedOutManually;
+
   /// Checks if its actual value is different than previousValue
   bool get hasChanged => prevScaleState != scaleState;
 
@@ -71,6 +83,15 @@ class PhotoViewScaleStateController {
     if (_scaleStateNotifier.value == newValue) {
       return;
     }
+
+    if (newValue == PhotoViewScaleState.zoomedOut) {
+      _hasZoomedOutManually = true;
+    }
+
+    if (newValue == PhotoViewScaleState.initial) {
+      _hasZoomedOutManually = false;
+    }
+
     prevScaleState = _scaleStateNotifier.value;
     _scaleStateNotifier.updateIgnoring(newValue);
   }
diff --git a/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart b/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart
index bb892737f6..bc97da1e06 100644
--- a/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart
+++ b/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart
@@ -29,6 +29,7 @@ class PhotoViewCore extends StatefulWidget {
     super.key,
     required this.imageProvider,
     required this.backgroundDecoration,
+    required this.semanticLabel,
     required this.gaplessPlayback,
     required this.heroAttributes,
     required this.enableRotation,
@@ -48,6 +49,7 @@ class PhotoViewCore extends StatefulWidget {
     required this.tightMode,
     required this.filterQuality,
     required this.disableGestures,
+    required this.disableScaleGestures,
     required this.enablePanAlways,
   }) : customChild = null;
 
@@ -73,12 +75,15 @@ class PhotoViewCore extends StatefulWidget {
     required this.tightMode,
     required this.filterQuality,
     required this.disableGestures,
+    required this.disableScaleGestures,
     required this.enablePanAlways,
-  })  : imageProvider = null,
+  })  : semanticLabel = null,
+        imageProvider = null,
         gaplessPlayback = false;
 
   final Decoration? backgroundDecoration;
   final ImageProvider? imageProvider;
+  final String? semanticLabel;
   final bool? gaplessPlayback;
   final PhotoViewHeroAttributes? heroAttributes;
   final bool enableRotation;
@@ -103,6 +108,7 @@ class PhotoViewCore extends StatefulWidget {
   final HitTestBehavior? gestureDetectorBehavior;
   final bool tightMode;
   final bool disableGestures;
+  final bool disableScaleGestures;
   final bool enablePanAlways;
 
   final FilterQuality filterQuality;
@@ -120,6 +126,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
         TickerProviderStateMixin,
         PhotoViewControllerDelegate,
         HitCornersDetector {
+  Offset? _normalizedPosition;
   double? _scaleBefore;
   double? _rotationBefore;
 
@@ -152,32 +159,33 @@ class PhotoViewCoreState extends State<PhotoViewCore>
   void onScaleStart(ScaleStartDetails details) {
     _rotationBefore = controller.rotation;
     _scaleBefore = scale;
+    _normalizedPosition = details.focalPoint - controller.position;
     _scaleAnimationController.stop();
     _positionAnimationController.stop();
     _rotationAnimationController.stop();
   }
 
+  bool _shouldAllowPanRotate() => switch (scaleStateController.scaleState) {
+        PhotoViewScaleState.zoomedIn =>
+          scaleStateController.hasZoomedOutManually,
+        _ => true,
+      };
+
   void onScaleUpdate(ScaleUpdateDetails details) {
-    final centeredFocalPoint = Offset(
-      details.focalPoint.dx - scaleBoundaries.outerSize.width / 2,
-      details.focalPoint.dy - scaleBoundaries.outerSize.height / 2,
-    );
     final double newScale = _scaleBefore! * details.scale;
-    final double scaleDelta = newScale / scale;
-    final Offset newPosition =
-        (controller.position + details.focalPointDelta) * scaleDelta -
-            centeredFocalPoint * (scaleDelta - 1);
+    Offset delta = details.focalPoint - _normalizedPosition!;
 
     updateScaleStateFromNewScale(newScale);
 
+    final panEnabled = widget.enablePanAlways && _shouldAllowPanRotate();
+    final rotationEnabled = widget.enableRotation && _shouldAllowPanRotate();
+
     updateMultiple(
       scale: newScale,
-      position: widget.enablePanAlways
-          ? newPosition
-          : clampPosition(position: newPosition),
-      rotation:
-          widget.enableRotation ? _rotationBefore! + details.rotation : null,
-      rotationFocusPoint: widget.enableRotation ? details.focalPoint : null,
+      position:
+          panEnabled ? delta : clampPosition(position: delta * details.scale),
+      rotation: rotationEnabled ? _rotationBefore! + details.rotation : null,
+      rotationFocusPoint: rotationEnabled ? details.focalPoint : null,
     );
   }
 
@@ -189,6 +197,16 @@ class PhotoViewCoreState extends State<PhotoViewCore>
 
     widget.onScaleEnd?.call(context, details, controller.value);
 
+    final scaleState = getScaleStateFromNewScale(scale);
+    if (scaleState == PhotoViewScaleState.zoomedOut) {
+      scaleStateController.scaleState = PhotoViewScaleState.originalSize;
+    } else if (scaleState == PhotoViewScaleState.zoomedIn) {
+      animateRotation(controller.rotation, 0);
+      if (_shouldAllowPanRotate()) {
+        animatePosition(controller.position, Offset.zero);
+      }
+    }
+
     //animate back to maxScale if gesture exceeded the maxScale specified
     if (s > maxScale) {
       final double scaleComebackRatio = maxScale / s;
@@ -232,6 +250,9 @@ class PhotoViewCoreState extends State<PhotoViewCore>
   }
 
   void animateScale(double from, double to) {
+    if (!mounted) {
+      return;
+    }
     _scaleAnimation = Tween<double>(
       begin: from,
       end: to,
@@ -242,6 +263,9 @@ class PhotoViewCoreState extends State<PhotoViewCore>
   }
 
   void animatePosition(Offset from, Offset to) {
+    if (!mounted) {
+      return;
+    }
     _positionAnimation = Tween<Offset>(begin: from, end: to)
         .animate(_positionAnimationController);
     _positionAnimationController
@@ -250,6 +274,9 @@ class PhotoViewCoreState extends State<PhotoViewCore>
   }
 
   void animateRotation(double from, double to) {
+    if (!mounted) {
+      return;
+    }
     _rotationAnimation = Tween<double>(begin: from, end: to)
         .animate(_rotationAnimationController);
     _rotationAnimationController
@@ -271,11 +298,28 @@ class PhotoViewCoreState extends State<PhotoViewCore>
     }
   }
 
+  void _animateControllerPosition(Offset position) {
+    animatePosition(controller.position, position);
+  }
+
+  void _animateControllerScale(double scale) {
+    if (controller.scale != null) {
+      animateScale(controller.scale!, scale);
+    }
+  }
+
+  void _animateControllerRotation(double rotation) {
+    animateRotation(controller.rotation, rotation);
+  }
+
   @override
   void initState() {
     super.initState();
     initDelegate();
     addAnimateOnScaleStateUpdate(animateOnScaleStateUpdate);
+    controller.positionAnimationBuilder(_animateControllerPosition);
+    controller.scaleAnimationBuilder(_animateControllerScale);
+    controller.rotationAnimationBuilder(_animateControllerRotation);
 
     cachedScaleBoundaries = widget.scaleBoundaries;
 
@@ -341,7 +385,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
               basePosition,
               useImageScale,
             ),
-            child: _buildHero(),
+            child: _buildHero(_buildChild()),
           );
 
           final child = Container(
@@ -363,18 +407,29 @@ class PhotoViewCoreState extends State<PhotoViewCore>
           }
 
           return PhotoViewGestureDetector(
-            onDoubleTap: nextScaleState,
-            onScaleStart: onScaleStart,
-            onScaleUpdate: onScaleUpdate,
-            onScaleEnd: onScaleEnd,
+            disableScaleGestures: widget.disableScaleGestures,
+            onDoubleTap: widget.disableScaleGestures ? null : onDoubleTap,
+            onScaleStart: widget.disableScaleGestures ? null : onScaleStart,
+            onScaleUpdate: widget.disableScaleGestures ? null : onScaleUpdate,
+            onScaleEnd: widget.disableScaleGestures ? null : onScaleEnd,
             onDragStart: widget.onDragStart != null
-                ? (details) => widget.onDragStart!(context, details, value)
+                ? (details) => widget.onDragStart!(
+                      context,
+                      details,
+                      widget.controller.value,
+                      widget.scaleStateController,
+                    )
                 : null,
             onDragEnd: widget.onDragEnd != null
-                ? (details) => widget.onDragEnd!(context, details, value)
+                ? (details) =>
+                    widget.onDragEnd!(context, details, widget.controller.value)
                 : null,
             onDragUpdate: widget.onDragUpdate != null
-                ? (details) => widget.onDragUpdate!(context, details, value)
+                ? (details) => widget.onDragUpdate!(
+                      context,
+                      details,
+                      widget.controller.value,
+                    )
                 : null,
             hitDetector: this,
             onTapUp: widget.onTapUp != null
@@ -395,7 +450,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
     );
   }
 
-  Widget _buildHero() {
+  Widget _buildHero(Widget child) {
     return heroAttributes != null
         ? Hero(
             tag: heroAttributes!.tag,
@@ -403,16 +458,20 @@ class PhotoViewCoreState extends State<PhotoViewCore>
             flightShuttleBuilder: heroAttributes!.flightShuttleBuilder,
             placeholderBuilder: heroAttributes!.placeholderBuilder,
             transitionOnUserGestures: heroAttributes!.transitionOnUserGestures,
-            child: _buildChild(),
+            child: child,
           )
-        : _buildChild();
+        : child;
   }
 
   Widget _buildChild() {
     return widget.hasCustomChild
         ? widget.customChild!
         : Image(
+            key: widget.heroAttributes?.tag != null
+                ? ObjectKey(widget.heroAttributes!.tag)
+                : null,
             image: widget.imageProvider!,
+            semanticLabel: widget.semanticLabel,
             gaplessPlayback: widget.gaplessPlayback ?? false,
             filterQuality: widget.filterQuality,
             width: scaleBoundaries.childSize.width * scale,
@@ -442,6 +501,7 @@ class _CenterWithOriginalSizeDelegate extends SingleChildLayoutDelegate {
 
     final double offsetX = halfWidth * (basePosition.x + 1);
     final double offsetY = halfHeight * (basePosition.y + 1);
+
     return Offset(offsetX, offsetY);
   }
 
diff --git a/mobile/lib/widgets/photo_view/src/core/photo_view_gesture_detector.dart b/mobile/lib/widgets/photo_view/src/core/photo_view_gesture_detector.dart
index 2eef5e6742..93fd1526da 100644
--- a/mobile/lib/widgets/photo_view/src/core/photo_view_gesture_detector.dart
+++ b/mobile/lib/widgets/photo_view/src/core/photo_view_gesture_detector.dart
@@ -21,6 +21,7 @@ class PhotoViewGestureDetector extends StatelessWidget {
     this.onTapUp,
     this.onTapDown,
     this.behavior,
+    this.disableScaleGestures = false,
   });
 
   final GestureDoubleTapCallback? onDoubleTap;
@@ -43,6 +44,8 @@ class PhotoViewGestureDetector extends StatelessWidget {
 
   final HitTestBehavior? behavior;
 
+  final bool disableScaleGestures;
+
   @override
   Widget build(BuildContext context) {
     final scope = PhotoViewGestureDetectorScope.of(context);
@@ -96,9 +99,11 @@ class PhotoViewGestureDetector extends StatelessWidget {
       ),
       (PhotoViewGestureRecognizer instance) {
         instance
+          ..dragStartBehavior = DragStartBehavior.start
           ..onStart = onScaleStart
           ..onUpdate = onScaleUpdate
-          ..onEnd = onScaleEnd;
+          ..onEnd = onScaleEnd
+          ..disableScaleGestures = disableScaleGestures;
       },
     );
 
@@ -124,10 +129,12 @@ class PhotoViewGestureRecognizer extends ScaleGestureRecognizer {
     this.validateAxis,
     this.touchSlopFactor = 1,
     PointerDeviceKind? kind,
+    this.disableScaleGestures = false,
   }) : super(supportedDevices: null);
   final HitCornersDetector? hitDetector;
   final Axis? validateAxis;
   final double touchSlopFactor;
+  bool disableScaleGestures;
 
   Map<int, Offset> _pointerLocations = <int, Offset>{};
 
@@ -155,7 +162,7 @@ class PhotoViewGestureRecognizer extends ScaleGestureRecognizer {
 
   @override
   void handleEvent(PointerEvent event) {
-    if (validateAxis != null) {
+    if (validateAxis != null && !disableScaleGestures) {
       bool didChangeConfiguration = false;
       if (event is PointerMoveEvent) {
         if (!event.synthesized) {
diff --git a/mobile/lib/widgets/photo_view/src/photo_view_wrappers.dart b/mobile/lib/widgets/photo_view/src/photo_view_wrappers.dart
index 57496f3777..d4afe85d2b 100644
--- a/mobile/lib/widgets/photo_view/src/photo_view_wrappers.dart
+++ b/mobile/lib/widgets/photo_view/src/photo_view_wrappers.dart
@@ -11,6 +11,7 @@ class ImageWrapper extends StatefulWidget {
     required this.imageProvider,
     required this.loadingBuilder,
     required this.backgroundDecoration,
+    required this.semanticLabel,
     required this.gaplessPlayback,
     required this.heroAttributes,
     required this.scaleStateChangedCallback,
@@ -34,6 +35,7 @@ class ImageWrapper extends StatefulWidget {
     required this.tightMode,
     required this.filterQuality,
     required this.disableGestures,
+    this.disableScaleGestures,
     required this.errorBuilder,
     required this.enablePanAlways,
     required this.index,
@@ -43,6 +45,7 @@ class ImageWrapper extends StatefulWidget {
   final LoadingBuilder? loadingBuilder;
   final ImageErrorWidgetBuilder? errorBuilder;
   final BoxDecoration backgroundDecoration;
+  final String? semanticLabel;
   final bool gaplessPlayback;
   final PhotoViewHeroAttributes? heroAttributes;
   final ValueChanged<PhotoViewScaleState>? scaleStateChangedCallback;
@@ -66,6 +69,7 @@ class ImageWrapper extends StatefulWidget {
   final bool? tightMode;
   final FilterQuality? filterQuality;
   final bool? disableGestures;
+  final bool? disableScaleGestures;
   final bool? enablePanAlways;
   final int index;
 
@@ -193,6 +197,7 @@ class _ImageWrapperState extends State<ImageWrapper> {
     return PhotoViewCore(
       imageProvider: widget.imageProvider,
       backgroundDecoration: widget.backgroundDecoration,
+      semanticLabel: widget.semanticLabel,
       gaplessPlayback: widget.gaplessPlayback,
       enableRotation: widget.enableRotation,
       heroAttributes: widget.heroAttributes,
@@ -212,6 +217,7 @@ class _ImageWrapperState extends State<ImageWrapper> {
       tightMode: widget.tightMode ?? false,
       filterQuality: widget.filterQuality ?? FilterQuality.none,
       disableGestures: widget.disableGestures ?? false,
+      disableScaleGestures: widget.disableScaleGestures ?? false,
       enablePanAlways: widget.enablePanAlways ?? false,
     );
   }
@@ -266,6 +272,7 @@ class CustomChildWrapper extends StatelessWidget {
     required this.tightMode,
     required this.filterQuality,
     required this.disableGestures,
+    this.disableScaleGestures,
     required this.enablePanAlways,
   });
 
@@ -296,6 +303,7 @@ class CustomChildWrapper extends StatelessWidget {
   final HitTestBehavior? gestureDetectorBehavior;
   final bool? tightMode;
   final FilterQuality? filterQuality;
+  final bool? disableScaleGestures;
   final bool? disableGestures;
   final bool? enablePanAlways;
 
@@ -330,6 +338,7 @@ class CustomChildWrapper extends StatelessWidget {
       tightMode: tightMode ?? false,
       filterQuality: filterQuality ?? FilterQuality.none,
       disableGestures: disableGestures ?? false,
+      disableScaleGestures: disableScaleGestures ?? false,
       enablePanAlways: enablePanAlways ?? false,
     );
   }

From 445f9174eaea85c205db5d13e81e43db2879c60a Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Wed, 2 Jul 2025 14:18:37 -0500
Subject: [PATCH 125/337] feat: memories sync (#19644)

* feat: memories sync

* Update mobile/lib/infrastructure/repositories/sync_stream.repository.dart

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update mobile/lib/infrastructure/repositories/sync_stream.repository.dart

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* show sync information

* tests and pr feedback

* pr feedback

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../drift_schemas/main/drift_schema_v1.json   | 1332 ++++++++++++++++-
 mobile/lib/domain/models/memory.model.dart    |  202 +++
 .../domain/services/sync_stream.service.dart  |    8 +
 .../entities/memory.entity.dart               |   36 +
 .../entities/memory.entity.drift.dart         |  970 ++++++++++++
 .../entities/memory_asset.entity.dart         |   17 +
 .../entities/memory_asset.entity.drift.dart   |  550 +++++++
 .../repositories/db.repository.dart           |    4 +
 .../repositories/db.repository.drift.dart     |   44 +-
 .../repositories/memory.repository.dart       |   37 +
 .../repositories/sync_api.repository.dart     |    6 +
 .../repositories/sync_stream.repository.dart  |  164 +-
 .../pages/dev/media_stat.page.dart            |    8 +
 mobile/lib/providers/memory.provider.dart     |    6 +
 .../services/sync_stream_service_test.dart    |   97 ++
 mobile/test/fixtures/sync_stream.stub.dart    |   43 +
 16 files changed, 3491 insertions(+), 33 deletions(-)
 create mode 100644 mobile/lib/domain/models/memory.model.dart
 create mode 100644 mobile/lib/infrastructure/entities/memory.entity.dart
 create mode 100644 mobile/lib/infrastructure/entities/memory.entity.drift.dart
 create mode 100644 mobile/lib/infrastructure/entities/memory_asset.entity.dart
 create mode 100644 mobile/lib/infrastructure/entities/memory_asset.entity.drift.dart
 create mode 100644 mobile/lib/infrastructure/repositories/memory.repository.dart

diff --git a/mobile/drift_schemas/main/drift_schema_v1.json b/mobile/drift_schemas/main/drift_schema_v1.json
index 30f92cf8db..32ba52e366 100644
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
@@ -1 +1,1331 @@
-{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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"]}}]}
\ No newline at end of file
+{
+  "_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": "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": "email",
+            "getter_name": "email",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "profile_image_path",
+            "getter_name": "profileImagePath",
+            "moor_type": "string",
+            "nullable": true,
+            "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": "quota_size_in_bytes",
+            "getter_name": "quotaSizeInBytes",
+            "moor_type": "int",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "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": []
+          }
+        ],
+        "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": "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"
+            }
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": true,
+        "constraints": [],
+        "strict": true,
+        "explicit_pk": ["id"]
+      }
+    },
+    {
+      "id": 2,
+      "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": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": true,
+        "constraints": [],
+        "strict": true,
+        "explicit_pk": ["id"]
+      }
+    },
+    {
+      "id": 3,
+      "references": [2],
+      "type": "index",
+      "data": {
+        "on": 2,
+        "name": "idx_local_asset_checksum",
+        "sql": null,
+        "unique": false,
+        "columns": ["checksum"]
+      }
+    },
+    {
+      "id": 4,
+      "references": [1],
+      "type": "index",
+      "data": {
+        "on": 1,
+        "name": "UQ_remote_asset_owner_checksum",
+        "sql": null,
+        "unique": true,
+        "columns": ["checksum", "owner_id"]
+      }
+    },
+    {
+      "id": 5,
+      "references": [1],
+      "type": "index",
+      "data": {
+        "on": 1,
+        "name": "idx_remote_asset_checksum",
+        "sql": null,
+        "unique": false,
+        "columns": ["checksum"]
+      }
+    },
+    {
+      "id": 6,
+      "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": "preferences",
+            "getter_name": "preferences",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [],
+            "type_converter": {
+              "dart_expr": "userPreferenceConverter",
+              "dart_type_name": "UserPreferences"
+            }
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": true,
+        "constraints": [],
+        "strict": true,
+        "explicit_pk": ["user_id"]
+      }
+    },
+    {
+      "id": 7,
+      "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": 8,
+      "references": [],
+      "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": "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": 9,
+      "references": [2, 8],
+      "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"]
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": true,
+        "constraints": [],
+        "strict": true,
+        "explicit_pk": ["asset_id", "album_id"]
+      }
+    },
+    {
+      "id": 10,
+      "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": "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": 11,
+      "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": 12,
+      "references": [1, 11],
+      "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": 13,
+      "references": [11, 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": 14,
+      "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<MemoryType>(MemoryType.values)",
+              "dart_type_name": "MemoryType"
+            }
+          },
+          {
+            "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": 15,
+      "references": [1, 14],
+      "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"]
+      }
+    }
+  ]
+}
diff --git a/mobile/lib/domain/models/memory.model.dart b/mobile/lib/domain/models/memory.model.dart
new file mode 100644
index 0000000000..d24e1ae1c6
--- /dev/null
+++ b/mobile/lib/domain/models/memory.model.dart
@@ -0,0 +1,202 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
+import 'dart:convert';
+
+enum MemoryTypeEnum {
+  // do not change this order!
+  onThisDay,
+}
+
+class MemoryData {
+  final int year;
+
+  const MemoryData({
+    required this.year,
+  });
+
+  MemoryData copyWith({
+    int? year,
+  }) {
+    return MemoryData(
+      year: year ?? this.year,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'year': year,
+    };
+  }
+
+  factory MemoryData.fromMap(Map<String, dynamic> map) {
+    return MemoryData(
+      year: map['year'] as int,
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory MemoryData.fromJson(String source) =>
+      MemoryData.fromMap(json.decode(source) as Map<String, dynamic>);
+
+  @override
+  String toString() => 'MemoryData(year: $year)';
+
+  @override
+  bool operator ==(covariant MemoryData other) {
+    if (identical(this, other)) return true;
+
+    return other.year == year;
+  }
+
+  @override
+  int get hashCode => year.hashCode;
+}
+
+// Model for a memory stored in the server
+class Memory {
+  final String id;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final DateTime? deletedAt;
+  final String ownerId;
+
+  // enum
+  final MemoryTypeEnum type;
+  final MemoryData data;
+  final bool isSaved;
+  final DateTime memoryAt;
+  final DateTime? seenAt;
+  final DateTime? showAt;
+  final DateTime? hideAt;
+
+  const Memory({
+    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,
+  });
+
+  Memory copyWith({
+    String? id,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    DateTime? deletedAt,
+    String? ownerId,
+    MemoryTypeEnum? type,
+    MemoryData? data,
+    bool? isSaved,
+    DateTime? memoryAt,
+    DateTime? seenAt,
+    DateTime? showAt,
+    DateTime? hideAt,
+  }) {
+    return Memory(
+      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,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'id': id,
+      'createdAt': createdAt.millisecondsSinceEpoch,
+      'updatedAt': updatedAt.millisecondsSinceEpoch,
+      'deletedAt': deletedAt?.millisecondsSinceEpoch,
+      'ownerId': ownerId,
+      'type': type.index,
+      'data': data.toMap(),
+      'isSaved': isSaved,
+      'memoryAt': memoryAt.millisecondsSinceEpoch,
+      'seenAt': seenAt?.millisecondsSinceEpoch,
+      'showAt': showAt?.millisecondsSinceEpoch,
+      'hideAt': hideAt?.millisecondsSinceEpoch,
+    };
+  }
+
+  factory Memory.fromMap(Map<String, dynamic> map) {
+    return Memory(
+      id: map['id'] as String,
+      createdAt: DateTime.fromMillisecondsSinceEpoch(map['createdAt'] as int),
+      updatedAt: DateTime.fromMillisecondsSinceEpoch(map['updatedAt'] as int),
+      deletedAt: map['deletedAt'] != null
+          ? DateTime.fromMillisecondsSinceEpoch(map['deletedAt'] as int)
+          : null,
+      ownerId: map['ownerId'] as String,
+      type: MemoryTypeEnum.values[map['type'] as int],
+      data: MemoryData.fromMap(map['data'] as Map<String, dynamic>),
+      isSaved: map['isSaved'] as bool,
+      memoryAt: DateTime.fromMillisecondsSinceEpoch(map['memoryAt'] as int),
+      seenAt: map['seenAt'] != null
+          ? DateTime.fromMillisecondsSinceEpoch(map['seenAt'] as int)
+          : null,
+      showAt: map['showAt'] != null
+          ? DateTime.fromMillisecondsSinceEpoch(map['showAt'] as int)
+          : null,
+      hideAt: map['hideAt'] != null
+          ? DateTime.fromMillisecondsSinceEpoch(map['hideAt'] as int)
+          : null,
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory Memory.fromJson(String source) =>
+      Memory.fromMap(json.decode(source) as Map<String, dynamic>);
+
+  @override
+  String toString() {
+    return 'Memory(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, ownerId: $ownerId, type: $type, data: $data, isSaved: $isSaved, memoryAt: $memoryAt, seenAt: $seenAt, showAt: $showAt, hideAt: $hideAt)';
+  }
+
+  @override
+  bool operator ==(covariant Memory other) {
+    if (identical(this, other)) return true;
+
+    return other.id == id &&
+        other.createdAt == createdAt &&
+        other.updatedAt == updatedAt &&
+        other.deletedAt == deletedAt &&
+        other.ownerId == ownerId &&
+        other.type == type &&
+        other.data == data &&
+        other.isSaved == isSaved &&
+        other.memoryAt == memoryAt &&
+        other.seenAt == seenAt &&
+        other.showAt == showAt &&
+        other.hideAt == hideAt;
+  }
+
+  @override
+  int get hashCode {
+    return id.hashCode ^
+        createdAt.hashCode ^
+        updatedAt.hashCode ^
+        deletedAt.hashCode ^
+        ownerId.hashCode ^
+        type.hashCode ^
+        data.hashCode ^
+        isSaved.hashCode ^
+        memoryAt.hashCode ^
+        seenAt.hashCode ^
+        showAt.hashCode ^
+        hideAt.hashCode;
+  }
+}
diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index 2160018df5..c4e40726b5 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -146,6 +146,14 @@ class SyncStreamService {
       // to acknowledge that the client has processed all the backfill events
       case SyncEntityType.syncAckV1:
         return;
+      case SyncEntityType.memoryV1:
+        return _syncStreamRepository.updateMemoriesV1(data.cast());
+      case SyncEntityType.memoryDeleteV1:
+        return _syncStreamRepository.deleteMemoriesV1(data.cast());
+      case SyncEntityType.memoryToAssetV1:
+        return _syncStreamRepository.updateMemoryAssetsV1(data.cast());
+      case SyncEntityType.memoryToAssetDeleteV1:
+        return _syncStreamRepository.deleteMemoryAssetsV1(data.cast());
       default:
         _logger.warning("Unknown sync data type: $type");
     }
diff --git a/mobile/lib/infrastructure/entities/memory.entity.dart b/mobile/lib/infrastructure/entities/memory.entity.dart
new file mode 100644
index 0000000000..0e19802103
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/memory.entity.dart
@@ -0,0 +1,36 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class MemoryEntity extends Table with DriftDefaultsMixin {
+  const MemoryEntity();
+
+  TextColumn get id => text()();
+
+  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+
+  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+
+  DateTimeColumn get deletedAt => dateTime().nullable()();
+
+  TextColumn get ownerId =>
+      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+
+  IntColumn get type => intEnum<MemoryTypeEnum>()();
+
+  TextColumn get data => text()();
+
+  BoolColumn get isSaved => boolean().withDefault(const Constant(false))();
+
+  DateTimeColumn get memoryAt => dateTime()();
+
+  DateTimeColumn get seenAt => dateTime().nullable()();
+
+  DateTimeColumn get showAt => dateTime().nullable()();
+
+  DateTimeColumn get hideAt => dateTime().nullable()();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}
diff --git a/mobile/lib/infrastructure/entities/memory.entity.drift.dart b/mobile/lib/infrastructure/entities/memory.entity.drift.dart
new file mode 100644
index 0000000000..cb88651ba4
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/memory.entity.drift.dart
@@ -0,0 +1,970 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/domain/models/memory.model.dart' as i2;
+import 'package:immich_mobile/infrastructure/entities/memory.entity.dart' as i3;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
+import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
+    as i5;
+import 'package:drift/internal/modular.dart' as i6;
+
+typedef $$MemoryEntityTableCreateCompanionBuilder = i1.MemoryEntityCompanion
+    Function({
+  required String id,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  i0.Value<DateTime?> deletedAt,
+  required String ownerId,
+  required i2.MemoryTypeEnum type,
+  required String data,
+  i0.Value<bool> isSaved,
+  required DateTime memoryAt,
+  i0.Value<DateTime?> seenAt,
+  i0.Value<DateTime?> showAt,
+  i0.Value<DateTime?> hideAt,
+});
+typedef $$MemoryEntityTableUpdateCompanionBuilder = i1.MemoryEntityCompanion
+    Function({
+  i0.Value<String> id,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  i0.Value<DateTime?> deletedAt,
+  i0.Value<String> ownerId,
+  i0.Value<i2.MemoryTypeEnum> type,
+  i0.Value<String> data,
+  i0.Value<bool> isSaved,
+  i0.Value<DateTime> memoryAt,
+  i0.Value<DateTime?> seenAt,
+  i0.Value<DateTime?> showAt,
+  i0.Value<DateTime?> hideAt,
+});
+
+final class $$MemoryEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase, i1.$MemoryEntityTable, i1.MemoryEntityData> {
+  $$MemoryEntityTableReferences(super.$_db, super.$_table, super.$_typedResult);
+
+  static i5.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
+      i6.ReadDatabaseContainer(db)
+          .resultSet<i5.$UserEntityTable>('user_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i1.$MemoryEntityTable>('memory_entity')
+                  .ownerId,
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i5.$UserEntityTable>('user_entity')
+                  .id));
+
+  i5.$$UserEntityTableProcessedTableManager get ownerId {
+    final $_column = $_itemColumn<String>('owner_id')!;
+
+    final manager = i5
+        .$$UserEntityTableTableManager(
+            $_db,
+            i6.ReadDatabaseContainer($_db)
+                .resultSet<i5.$UserEntityTable>('user_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_ownerIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$MemoryEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryEntityTable> {
+  $$MemoryEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnFilters(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<DateTime> get deletedAt => $composableBuilder(
+      column: $table.deletedAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnWithTypeConverterFilters<i2.MemoryTypeEnum, i2.MemoryTypeEnum, int>
+      get type => $composableBuilder(
+          column: $table.type,
+          builder: (column) => i0.ColumnWithTypeConverterFilters(column));
+
+  i0.ColumnFilters<String> get data => $composableBuilder(
+      column: $table.data, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<bool> get isSaved => $composableBuilder(
+      column: $table.isSaved, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get memoryAt => $composableBuilder(
+      column: $table.memoryAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get seenAt => $composableBuilder(
+      column: $table.seenAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get showAt => $composableBuilder(
+      column: $table.showAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get hideAt => $composableBuilder(
+      column: $table.hideAt, builder: (column) => i0.ColumnFilters(column));
+
+  i5.$$UserEntityTableFilterComposer get ownerId {
+    final i5.$$UserEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableFilterComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryEntityTable> {
+  $$MemoryEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get id => $composableBuilder(
+      column: $table.id, 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<DateTime> get deletedAt => $composableBuilder(
+      column: $table.deletedAt,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get type => $composableBuilder(
+      column: $table.type, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get data => $composableBuilder(
+      column: $table.data, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<bool> get isSaved => $composableBuilder(
+      column: $table.isSaved, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get memoryAt => $composableBuilder(
+      column: $table.memoryAt, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get seenAt => $composableBuilder(
+      column: $table.seenAt, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get showAt => $composableBuilder(
+      column: $table.showAt, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get hideAt => $composableBuilder(
+      column: $table.hideAt, builder: (column) => i0.ColumnOrderings(column));
+
+  i5.$$UserEntityTableOrderingComposer get ownerId {
+    final i5.$$UserEntityTableOrderingComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableOrderingComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryEntityTable> {
+  $$MemoryEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get id =>
+      $composableBuilder(column: $table.id, 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<DateTime> get deletedAt =>
+      $composableBuilder(column: $table.deletedAt, builder: (column) => column);
+
+  i0.GeneratedColumnWithTypeConverter<i2.MemoryTypeEnum, int> get type =>
+      $composableBuilder(column: $table.type, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get data =>
+      $composableBuilder(column: $table.data, builder: (column) => column);
+
+  i0.GeneratedColumn<bool> get isSaved =>
+      $composableBuilder(column: $table.isSaved, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get memoryAt =>
+      $composableBuilder(column: $table.memoryAt, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get seenAt =>
+      $composableBuilder(column: $table.seenAt, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get showAt =>
+      $composableBuilder(column: $table.showAt, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get hideAt =>
+      $composableBuilder(column: $table.hideAt, builder: (column) => column);
+
+  i5.$$UserEntityTableAnnotationComposer get ownerId {
+    final i5.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableAnnotationComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$MemoryEntityTable,
+    i1.MemoryEntityData,
+    i1.$$MemoryEntityTableFilterComposer,
+    i1.$$MemoryEntityTableOrderingComposer,
+    i1.$$MemoryEntityTableAnnotationComposer,
+    $$MemoryEntityTableCreateCompanionBuilder,
+    $$MemoryEntityTableUpdateCompanionBuilder,
+    (i1.MemoryEntityData, i1.$$MemoryEntityTableReferences),
+    i1.MemoryEntityData,
+    i0.PrefetchHooks Function({bool ownerId})> {
+  $$MemoryEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$MemoryEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$MemoryEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$MemoryEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$MemoryEntityTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> id = const i0.Value.absent(),
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+            i0.Value<String> ownerId = const i0.Value.absent(),
+            i0.Value<i2.MemoryTypeEnum> type = const i0.Value.absent(),
+            i0.Value<String> data = const i0.Value.absent(),
+            i0.Value<bool> isSaved = const i0.Value.absent(),
+            i0.Value<DateTime> memoryAt = const i0.Value.absent(),
+            i0.Value<DateTime?> seenAt = const i0.Value.absent(),
+            i0.Value<DateTime?> showAt = const i0.Value.absent(),
+            i0.Value<DateTime?> hideAt = const i0.Value.absent(),
+          }) =>
+              i1.MemoryEntityCompanion(
+            id: id,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            deletedAt: deletedAt,
+            ownerId: ownerId,
+            type: type,
+            data: data,
+            isSaved: isSaved,
+            memoryAt: memoryAt,
+            seenAt: seenAt,
+            showAt: showAt,
+            hideAt: hideAt,
+          ),
+          createCompanionCallback: ({
+            required String id,
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+            required String ownerId,
+            required i2.MemoryTypeEnum type,
+            required String data,
+            i0.Value<bool> isSaved = const i0.Value.absent(),
+            required DateTime memoryAt,
+            i0.Value<DateTime?> seenAt = const i0.Value.absent(),
+            i0.Value<DateTime?> showAt = const i0.Value.absent(),
+            i0.Value<DateTime?> hideAt = const i0.Value.absent(),
+          }) =>
+              i1.MemoryEntityCompanion.insert(
+            id: id,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            deletedAt: deletedAt,
+            ownerId: ownerId,
+            type: type,
+            data: data,
+            isSaved: isSaved,
+            memoryAt: memoryAt,
+            seenAt: seenAt,
+            showAt: showAt,
+            hideAt: hideAt,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$MemoryEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({ownerId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (ownerId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.ownerId,
+                    referencedTable:
+                        i1.$$MemoryEntityTableReferences._ownerIdTable(db),
+                    referencedColumn:
+                        i1.$$MemoryEntityTableReferences._ownerIdTable(db).id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$MemoryEntityTableProcessedTableManager = i0.ProcessedTableManager<
+    i0.GeneratedDatabase,
+    i1.$MemoryEntityTable,
+    i1.MemoryEntityData,
+    i1.$$MemoryEntityTableFilterComposer,
+    i1.$$MemoryEntityTableOrderingComposer,
+    i1.$$MemoryEntityTableAnnotationComposer,
+    $$MemoryEntityTableCreateCompanionBuilder,
+    $$MemoryEntityTableUpdateCompanionBuilder,
+    (i1.MemoryEntityData, i1.$$MemoryEntityTableReferences),
+    i1.MemoryEntityData,
+    i0.PrefetchHooks Function({bool ownerId})>;
+
+class $MemoryEntityTable extends i3.MemoryEntity
+    with i0.TableInfo<$MemoryEntityTable, i1.MemoryEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $MemoryEntityTable(this.attachedDatabase, [this._alias]);
+  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 _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 _deletedAtMeta =
+      const i0.VerificationMeta('deletedAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> deletedAt =
+      i0.GeneratedColumn<DateTime>('deleted_at', aliasedName, true,
+          type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
+  static const i0.VerificationMeta _ownerIdMeta =
+      const i0.VerificationMeta('ownerId');
+  @override
+  late final i0.GeneratedColumn<String> ownerId = i0.GeneratedColumn<String>(
+      'owner_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES user_entity (id) ON DELETE CASCADE'));
+  @override
+  late final i0.GeneratedColumnWithTypeConverter<i2.MemoryTypeEnum, int> type =
+      i0.GeneratedColumn<int>('type', aliasedName, false,
+              type: i0.DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<i2.MemoryTypeEnum>(
+              i1.$MemoryEntityTable.$convertertype);
+  static const i0.VerificationMeta _dataMeta =
+      const i0.VerificationMeta('data');
+  @override
+  late final i0.GeneratedColumn<String> data = i0.GeneratedColumn<String>(
+      'data', aliasedName, false,
+      type: i0.DriftSqlType.string, requiredDuringInsert: true);
+  static const i0.VerificationMeta _isSavedMeta =
+      const i0.VerificationMeta('isSaved');
+  @override
+  late final i0.GeneratedColumn<bool> isSaved = i0.GeneratedColumn<bool>(
+      'is_saved', aliasedName, false,
+      type: i0.DriftSqlType.bool,
+      requiredDuringInsert: false,
+      defaultConstraints:
+          i0.GeneratedColumn.constraintIsAlways('CHECK ("is_saved" IN (0, 1))'),
+      defaultValue: const i4.Constant(false));
+  static const i0.VerificationMeta _memoryAtMeta =
+      const i0.VerificationMeta('memoryAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> memoryAt =
+      i0.GeneratedColumn<DateTime>('memory_at', aliasedName, false,
+          type: i0.DriftSqlType.dateTime, requiredDuringInsert: true);
+  static const i0.VerificationMeta _seenAtMeta =
+      const i0.VerificationMeta('seenAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> seenAt = i0.GeneratedColumn<DateTime>(
+      'seen_at', aliasedName, true,
+      type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
+  static const i0.VerificationMeta _showAtMeta =
+      const i0.VerificationMeta('showAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> showAt = i0.GeneratedColumn<DateTime>(
+      'show_at', aliasedName, true,
+      type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
+  static const i0.VerificationMeta _hideAtMeta =
+      const i0.VerificationMeta('hideAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> hideAt = i0.GeneratedColumn<DateTime>(
+      'hide_at', aliasedName, true,
+      type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
+  @override
+  List<i0.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
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.MemoryEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    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('deleted_at')) {
+      context.handle(_deletedAtMeta,
+          deletedAt.isAcceptableOrUnknown(data['deleted_at']!, _deletedAtMeta));
+    }
+    if (data.containsKey('owner_id')) {
+      context.handle(_ownerIdMeta,
+          ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta));
+    } else if (isInserting) {
+      context.missing(_ownerIdMeta);
+    }
+    if (data.containsKey('data')) {
+      context.handle(
+          _dataMeta, this.data.isAcceptableOrUnknown(data['data']!, _dataMeta));
+    } else if (isInserting) {
+      context.missing(_dataMeta);
+    }
+    if (data.containsKey('is_saved')) {
+      context.handle(_isSavedMeta,
+          isSaved.isAcceptableOrUnknown(data['is_saved']!, _isSavedMeta));
+    }
+    if (data.containsKey('memory_at')) {
+      context.handle(_memoryAtMeta,
+          memoryAt.isAcceptableOrUnknown(data['memory_at']!, _memoryAtMeta));
+    } else if (isInserting) {
+      context.missing(_memoryAtMeta);
+    }
+    if (data.containsKey('seen_at')) {
+      context.handle(_seenAtMeta,
+          seenAt.isAcceptableOrUnknown(data['seen_at']!, _seenAtMeta));
+    }
+    if (data.containsKey('show_at')) {
+      context.handle(_showAtMeta,
+          showAt.isAcceptableOrUnknown(data['show_at']!, _showAtMeta));
+    }
+    if (data.containsKey('hide_at')) {
+      context.handle(_hideAtMeta,
+          hideAt.isAcceptableOrUnknown(data['hide_at']!, _hideAtMeta));
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.MemoryEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.MemoryEntityData(
+      id: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}id'])!,
+      createdAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
+      updatedAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      deletedAt: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}deleted_at']),
+      ownerId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}owner_id'])!,
+      type: i1.$MemoryEntityTable.$convertertype.fromSql(attachedDatabase
+          .typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}type'])!),
+      data: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}data'])!,
+      isSaved: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.bool, data['${effectivePrefix}is_saved'])!,
+      memoryAt: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}memory_at'])!,
+      seenAt: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}seen_at']),
+      showAt: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}show_at']),
+      hideAt: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}hide_at']),
+    );
+  }
+
+  @override
+  $MemoryEntityTable createAlias(String alias) {
+    return $MemoryEntityTable(attachedDatabase, alias);
+  }
+
+  static i0.JsonTypeConverter2<i2.MemoryTypeEnum, int, int> $convertertype =
+      const i0.EnumIndexConverter<i2.MemoryTypeEnum>(i2.MemoryTypeEnum.values);
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class MemoryEntityData extends i0.DataClass
+    implements i0.Insertable<i1.MemoryEntityData> {
+  final String id;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final DateTime? deletedAt;
+  final String ownerId;
+  final i2.MemoryTypeEnum 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, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<String>(id);
+    map['created_at'] = i0.Variable<DateTime>(createdAt);
+    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || deletedAt != null) {
+      map['deleted_at'] = i0.Variable<DateTime>(deletedAt);
+    }
+    map['owner_id'] = i0.Variable<String>(ownerId);
+    {
+      map['type'] =
+          i0.Variable<int>(i1.$MemoryEntityTable.$convertertype.toSql(type));
+    }
+    map['data'] = i0.Variable<String>(data);
+    map['is_saved'] = i0.Variable<bool>(isSaved);
+    map['memory_at'] = i0.Variable<DateTime>(memoryAt);
+    if (!nullToAbsent || seenAt != null) {
+      map['seen_at'] = i0.Variable<DateTime>(seenAt);
+    }
+    if (!nullToAbsent || showAt != null) {
+      map['show_at'] = i0.Variable<DateTime>(showAt);
+    }
+    if (!nullToAbsent || hideAt != null) {
+      map['hide_at'] = i0.Variable<DateTime>(hideAt);
+    }
+    return map;
+  }
+
+  factory MemoryEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.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: i1.$MemoryEntityTable.$convertertype
+          .fromJson(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({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.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>(i1.$MemoryEntityTable.$convertertype.toJson(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),
+    };
+  }
+
+  i1.MemoryEntityData copyWith(
+          {String? id,
+          DateTime? createdAt,
+          DateTime? updatedAt,
+          i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+          String? ownerId,
+          i2.MemoryTypeEnum? type,
+          String? data,
+          bool? isSaved,
+          DateTime? memoryAt,
+          i0.Value<DateTime?> seenAt = const i0.Value.absent(),
+          i0.Value<DateTime?> showAt = const i0.Value.absent(),
+          i0.Value<DateTime?> hideAt = const i0.Value.absent()}) =>
+      i1.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(i1.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 i1.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 i0.UpdateCompanion<i1.MemoryEntityData> {
+  final i0.Value<String> id;
+  final i0.Value<DateTime> createdAt;
+  final i0.Value<DateTime> updatedAt;
+  final i0.Value<DateTime?> deletedAt;
+  final i0.Value<String> ownerId;
+  final i0.Value<i2.MemoryTypeEnum> type;
+  final i0.Value<String> data;
+  final i0.Value<bool> isSaved;
+  final i0.Value<DateTime> memoryAt;
+  final i0.Value<DateTime?> seenAt;
+  final i0.Value<DateTime?> showAt;
+  final i0.Value<DateTime?> hideAt;
+  const MemoryEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    this.deletedAt = const i0.Value.absent(),
+    this.ownerId = const i0.Value.absent(),
+    this.type = const i0.Value.absent(),
+    this.data = const i0.Value.absent(),
+    this.isSaved = const i0.Value.absent(),
+    this.memoryAt = const i0.Value.absent(),
+    this.seenAt = const i0.Value.absent(),
+    this.showAt = const i0.Value.absent(),
+    this.hideAt = const i0.Value.absent(),
+  });
+  MemoryEntityCompanion.insert({
+    required String id,
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    this.deletedAt = const i0.Value.absent(),
+    required String ownerId,
+    required i2.MemoryTypeEnum type,
+    required String data,
+    this.isSaved = const i0.Value.absent(),
+    required DateTime memoryAt,
+    this.seenAt = const i0.Value.absent(),
+    this.showAt = const i0.Value.absent(),
+    this.hideAt = const i0.Value.absent(),
+  })  : id = i0.Value(id),
+        ownerId = i0.Value(ownerId),
+        type = i0.Value(type),
+        data = i0.Value(data),
+        memoryAt = i0.Value(memoryAt);
+  static i0.Insertable<i1.MemoryEntityData> custom({
+    i0.Expression<String>? id,
+    i0.Expression<DateTime>? createdAt,
+    i0.Expression<DateTime>? updatedAt,
+    i0.Expression<DateTime>? deletedAt,
+    i0.Expression<String>? ownerId,
+    i0.Expression<int>? type,
+    i0.Expression<String>? data,
+    i0.Expression<bool>? isSaved,
+    i0.Expression<DateTime>? memoryAt,
+    i0.Expression<DateTime>? seenAt,
+    i0.Expression<DateTime>? showAt,
+    i0.Expression<DateTime>? hideAt,
+  }) {
+    return i0.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,
+    });
+  }
+
+  i1.MemoryEntityCompanion copyWith(
+      {i0.Value<String>? id,
+      i0.Value<DateTime>? createdAt,
+      i0.Value<DateTime>? updatedAt,
+      i0.Value<DateTime?>? deletedAt,
+      i0.Value<String>? ownerId,
+      i0.Value<i2.MemoryTypeEnum>? type,
+      i0.Value<String>? data,
+      i0.Value<bool>? isSaved,
+      i0.Value<DateTime>? memoryAt,
+      i0.Value<DateTime?>? seenAt,
+      i0.Value<DateTime?>? showAt,
+      i0.Value<DateTime?>? hideAt}) {
+    return i1.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, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<String>(id.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
+    }
+    if (deletedAt.present) {
+      map['deleted_at'] = i0.Variable<DateTime>(deletedAt.value);
+    }
+    if (ownerId.present) {
+      map['owner_id'] = i0.Variable<String>(ownerId.value);
+    }
+    if (type.present) {
+      map['type'] = i0.Variable<int>(
+          i1.$MemoryEntityTable.$convertertype.toSql(type.value));
+    }
+    if (data.present) {
+      map['data'] = i0.Variable<String>(data.value);
+    }
+    if (isSaved.present) {
+      map['is_saved'] = i0.Variable<bool>(isSaved.value);
+    }
+    if (memoryAt.present) {
+      map['memory_at'] = i0.Variable<DateTime>(memoryAt.value);
+    }
+    if (seenAt.present) {
+      map['seen_at'] = i0.Variable<DateTime>(seenAt.value);
+    }
+    if (showAt.present) {
+      map['show_at'] = i0.Variable<DateTime>(showAt.value);
+    }
+    if (hideAt.present) {
+      map['hide_at'] = i0.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();
+  }
+}
diff --git a/mobile/lib/infrastructure/entities/memory_asset.entity.dart b/mobile/lib/infrastructure/entities/memory_asset.entity.dart
new file mode 100644
index 0000000000..c304b03724
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/memory_asset.entity.dart
@@ -0,0 +1,17 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class MemoryAssetEntity extends Table with DriftDefaultsMixin {
+  const MemoryAssetEntity();
+
+  TextColumn get assetId =>
+      text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get memoryId =>
+      text().references(MemoryEntity, #id, onDelete: KeyAction.cascade)();
+
+  @override
+  Set<Column> get primaryKey => {assetId, memoryId};
+}
diff --git a/mobile/lib/infrastructure/entities/memory_asset.entity.drift.dart b/mobile/lib/infrastructure/entities/memory_asset.entity.drift.dart
new file mode 100644
index 0000000000..9253e8bc05
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/memory_asset.entity.drift.dart
@@ -0,0 +1,550 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart'
+    as i2;
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
+    as i3;
+import 'package:drift/internal/modular.dart' as i4;
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
+    as i5;
+
+typedef $$MemoryAssetEntityTableCreateCompanionBuilder
+    = i1.MemoryAssetEntityCompanion Function({
+  required String assetId,
+  required String memoryId,
+});
+typedef $$MemoryAssetEntityTableUpdateCompanionBuilder
+    = i1.MemoryAssetEntityCompanion Function({
+  i0.Value<String> assetId,
+  i0.Value<String> memoryId,
+});
+
+final class $$MemoryAssetEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase,
+    i1.$MemoryAssetEntityTable,
+    i1.MemoryAssetEntityData> {
+  $$MemoryAssetEntityTableReferences(
+      super.$_db, super.$_table, super.$_typedResult);
+
+  static i3.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
+      i4.ReadDatabaseContainer(db)
+          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$MemoryAssetEntityTable>('memory_asset_entity')
+                  .assetId,
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+                  .id));
+
+  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
+    final $_column = $_itemColumn<String>('asset_id')!;
+
+    final manager = i3
+        .$$RemoteAssetEntityTableTableManager(
+            $_db,
+            i4.ReadDatabaseContainer($_db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_assetIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+
+  static i5.$MemoryEntityTable _memoryIdTable(i0.GeneratedDatabase db) =>
+      i4.ReadDatabaseContainer(db)
+          .resultSet<i5.$MemoryEntityTable>('memory_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$MemoryAssetEntityTable>('memory_asset_entity')
+                  .memoryId,
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i5.$MemoryEntityTable>('memory_entity')
+                  .id));
+
+  i5.$$MemoryEntityTableProcessedTableManager get memoryId {
+    final $_column = $_itemColumn<String>('memory_id')!;
+
+    final manager = i5
+        .$$MemoryEntityTableTableManager(
+            $_db,
+            i4.ReadDatabaseContainer($_db)
+                .resultSet<i5.$MemoryEntityTable>('memory_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_memoryIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$MemoryAssetEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryAssetEntityTable> {
+  $$MemoryAssetEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableFilterComposer get assetId {
+    final i3.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.assetId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i3.$$RemoteAssetEntityTableFilterComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i5.$$MemoryEntityTableFilterComposer get memoryId {
+    final i5.$$MemoryEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.memoryId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$MemoryEntityTableFilterComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryAssetEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryAssetEntityTable> {
+  $$MemoryAssetEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableOrderingComposer get assetId {
+    final i3.$$RemoteAssetEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.assetId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i3.$$RemoteAssetEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i3.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i5.$$MemoryEntityTableOrderingComposer get memoryId {
+    final i5.$$MemoryEntityTableOrderingComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.memoryId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$MemoryEntityTableOrderingComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryAssetEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MemoryAssetEntityTable> {
+  $$MemoryAssetEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableAnnotationComposer get assetId {
+    final i3.$$RemoteAssetEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.assetId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i3.$$RemoteAssetEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i3.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i5.$$MemoryEntityTableAnnotationComposer get memoryId {
+    final i5.$$MemoryEntityTableAnnotationComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.memoryId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$MemoryEntityTableAnnotationComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i5.$MemoryEntityTable>('memory_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$MemoryAssetEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$MemoryAssetEntityTable,
+    i1.MemoryAssetEntityData,
+    i1.$$MemoryAssetEntityTableFilterComposer,
+    i1.$$MemoryAssetEntityTableOrderingComposer,
+    i1.$$MemoryAssetEntityTableAnnotationComposer,
+    $$MemoryAssetEntityTableCreateCompanionBuilder,
+    $$MemoryAssetEntityTableUpdateCompanionBuilder,
+    (i1.MemoryAssetEntityData, i1.$$MemoryAssetEntityTableReferences),
+    i1.MemoryAssetEntityData,
+    i0.PrefetchHooks Function({bool assetId, bool memoryId})> {
+  $$MemoryAssetEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$MemoryAssetEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$MemoryAssetEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () => i1
+              .$$MemoryAssetEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$MemoryAssetEntityTableAnnotationComposer(
+                  $db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> assetId = const i0.Value.absent(),
+            i0.Value<String> memoryId = const i0.Value.absent(),
+          }) =>
+              i1.MemoryAssetEntityCompanion(
+            assetId: assetId,
+            memoryId: memoryId,
+          ),
+          createCompanionCallback: ({
+            required String assetId,
+            required String memoryId,
+          }) =>
+              i1.MemoryAssetEntityCompanion.insert(
+            assetId: assetId,
+            memoryId: memoryId,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$MemoryAssetEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({assetId = false, memoryId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (assetId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.assetId,
+                    referencedTable:
+                        i1.$$MemoryAssetEntityTableReferences._assetIdTable(db),
+                    referencedColumn: i1.$$MemoryAssetEntityTableReferences
+                        ._assetIdTable(db)
+                        .id,
+                  ) as T;
+                }
+                if (memoryId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.memoryId,
+                    referencedTable: i1.$$MemoryAssetEntityTableReferences
+                        ._memoryIdTable(db),
+                    referencedColumn: i1.$$MemoryAssetEntityTableReferences
+                        ._memoryIdTable(db)
+                        .id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$MemoryAssetEntityTableProcessedTableManager
+    = i0.ProcessedTableManager<
+        i0.GeneratedDatabase,
+        i1.$MemoryAssetEntityTable,
+        i1.MemoryAssetEntityData,
+        i1.$$MemoryAssetEntityTableFilterComposer,
+        i1.$$MemoryAssetEntityTableOrderingComposer,
+        i1.$$MemoryAssetEntityTableAnnotationComposer,
+        $$MemoryAssetEntityTableCreateCompanionBuilder,
+        $$MemoryAssetEntityTableUpdateCompanionBuilder,
+        (i1.MemoryAssetEntityData, i1.$$MemoryAssetEntityTableReferences),
+        i1.MemoryAssetEntityData,
+        i0.PrefetchHooks Function({bool assetId, bool memoryId})>;
+
+class $MemoryAssetEntityTable extends i2.MemoryAssetEntity
+    with i0.TableInfo<$MemoryAssetEntityTable, i1.MemoryAssetEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $MemoryAssetEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _assetIdMeta =
+      const i0.VerificationMeta('assetId');
+  @override
+  late final i0.GeneratedColumn<String> assetId = i0.GeneratedColumn<String>(
+      'asset_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_asset_entity (id) ON DELETE CASCADE'));
+  static const i0.VerificationMeta _memoryIdMeta =
+      const i0.VerificationMeta('memoryId');
+  @override
+  late final i0.GeneratedColumn<String> memoryId = i0.GeneratedColumn<String>(
+      'memory_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES memory_entity (id) ON DELETE CASCADE'));
+  @override
+  List<i0.GeneratedColumn> get $columns => [assetId, memoryId];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'memory_asset_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.MemoryAssetEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('asset_id')) {
+      context.handle(_assetIdMeta,
+          assetId.isAcceptableOrUnknown(data['asset_id']!, _assetIdMeta));
+    } else if (isInserting) {
+      context.missing(_assetIdMeta);
+    }
+    if (data.containsKey('memory_id')) {
+      context.handle(_memoryIdMeta,
+          memoryId.isAcceptableOrUnknown(data['memory_id']!, _memoryIdMeta));
+    } else if (isInserting) {
+      context.missing(_memoryIdMeta);
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {assetId, memoryId};
+  @override
+  i1.MemoryAssetEntityData map(Map<String, dynamic> data,
+      {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.MemoryAssetEntityData(
+      assetId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      memoryId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}memory_id'])!,
+    );
+  }
+
+  @override
+  $MemoryAssetEntityTable createAlias(String alias) {
+    return $MemoryAssetEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class MemoryAssetEntityData extends i0.DataClass
+    implements i0.Insertable<i1.MemoryAssetEntityData> {
+  final String assetId;
+  final String memoryId;
+  const MemoryAssetEntityData({required this.assetId, required this.memoryId});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['asset_id'] = i0.Variable<String>(assetId);
+    map['memory_id'] = i0.Variable<String>(memoryId);
+    return map;
+  }
+
+  factory MemoryAssetEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return MemoryAssetEntityData(
+      assetId: serializer.fromJson<String>(json['assetId']),
+      memoryId: serializer.fromJson<String>(json['memoryId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'memoryId': serializer.toJson<String>(memoryId),
+    };
+  }
+
+  i1.MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) =>
+      i1.MemoryAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        memoryId: memoryId ?? this.memoryId,
+      );
+  MemoryAssetEntityData copyWithCompanion(i1.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 i1.MemoryAssetEntityData &&
+          other.assetId == this.assetId &&
+          other.memoryId == this.memoryId);
+}
+
+class MemoryAssetEntityCompanion
+    extends i0.UpdateCompanion<i1.MemoryAssetEntityData> {
+  final i0.Value<String> assetId;
+  final i0.Value<String> memoryId;
+  const MemoryAssetEntityCompanion({
+    this.assetId = const i0.Value.absent(),
+    this.memoryId = const i0.Value.absent(),
+  });
+  MemoryAssetEntityCompanion.insert({
+    required String assetId,
+    required String memoryId,
+  })  : assetId = i0.Value(assetId),
+        memoryId = i0.Value(memoryId);
+  static i0.Insertable<i1.MemoryAssetEntityData> custom({
+    i0.Expression<String>? assetId,
+    i0.Expression<String>? memoryId,
+  }) {
+    return i0.RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (memoryId != null) 'memory_id': memoryId,
+    });
+  }
+
+  i1.MemoryAssetEntityCompanion copyWith(
+      {i0.Value<String>? assetId, i0.Value<String>? memoryId}) {
+    return i1.MemoryAssetEntityCompanion(
+      assetId: assetId ?? this.assetId,
+      memoryId: memoryId ?? this.memoryId,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (assetId.present) {
+      map['asset_id'] = i0.Variable<String>(assetId.value);
+    }
+    if (memoryId.present) {
+      map['memory_id'] = i0.Variable<String>(memoryId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MemoryAssetEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('memoryId: $memoryId')
+          ..write(')'))
+        .toString();
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/lib/infrastructure/repositories/db.repository.dart
index dbe491b035..e71598a999 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -7,6 +7,8 @@ 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/memory.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
@@ -46,6 +48,8 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     RemoteAlbumEntity,
     RemoteAlbumAssetEntity,
     RemoteAlbumUserEntity,
+    MemoryEntity,
+    MemoryAssetEntity,
   ],
   include: {
     'package:immich_mobile/infrastructure/entities/merged_asset.drift',
diff --git a/mobile/lib/infrastructure/repositories/db.repository.drift.dart b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
index 69fd84b79a..925591def8 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -23,9 +23,13 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.
     as i10;
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
     as i11;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
     as i12;
-import 'package:drift/internal/modular.dart' as i13;
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
+    as i13;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i14;
+import 'package:drift/internal/modular.dart' as i15;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -51,8 +55,11 @@ abstract class $Drift extends i0.GeneratedDatabase {
       i10.$RemoteAlbumAssetEntityTable(this);
   late final i11.$RemoteAlbumUserEntityTable remoteAlbumUserEntity =
       i11.$RemoteAlbumUserEntityTable(this);
-  i12.MergedAssetDrift get mergedAssetDrift => i13.ReadDatabaseContainer(this)
-      .accessor<i12.MergedAssetDrift>(i12.MergedAssetDrift.new);
+  late final i12.$MemoryEntityTable memoryEntity = i12.$MemoryEntityTable(this);
+  late final i13.$MemoryAssetEntityTable memoryAssetEntity =
+      i13.$MemoryAssetEntityTable(this);
+  i14.MergedAssetDrift get mergedAssetDrift => i15.ReadDatabaseContainer(this)
+      .accessor<i14.MergedAssetDrift>(i14.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -71,7 +78,9 @@ abstract class $Drift extends i0.GeneratedDatabase {
         remoteExifEntity,
         remoteAlbumEntity,
         remoteAlbumAssetEntity,
-        remoteAlbumUserEntity
+        remoteAlbumUserEntity,
+        memoryEntity,
+        memoryAssetEntity
       ];
   @override
   i0.StreamQueryUpdateRules get streamUpdateRules =>
@@ -175,6 +184,27 @@ abstract class $Drift extends i0.GeneratedDatabase {
                   kind: i0.UpdateKind.delete),
             ],
           ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('user_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('memory_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('memory_asset_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('memory_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('memory_asset_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
         ],
       );
   @override
@@ -208,4 +238,8 @@ class $DriftManager {
           _db, _db.remoteAlbumAssetEntity);
   i11.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i11
       .$$RemoteAlbumUserEntityTableTableManager(_db, _db.remoteAlbumUserEntity);
+  i12.$$MemoryEntityTableTableManager get memoryEntity =>
+      i12.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
+  i13.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
+      i13.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
 }
diff --git a/mobile/lib/infrastructure/repositories/memory.repository.dart b/mobile/lib/infrastructure/repositories/memory.repository.dart
new file mode 100644
index 0000000000..1f70f9dcd2
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/memory.repository.dart
@@ -0,0 +1,37 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class DriftMemoryRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftMemoryRepository(this._db) : super(_db);
+
+  Future<List<Memory>> getAll(String userId) {
+    final query = _db.memoryEntity.select()
+      ..where((e) => e.ownerId.equals(userId));
+
+    return query.map((memory) {
+      return memory.toDto();
+    }).get();
+  }
+}
+
+extension on MemoryEntityData {
+  Memory toDto() {
+    return Memory(
+      id: id,
+      createdAt: createdAt,
+      updatedAt: updatedAt,
+      deletedAt: deletedAt,
+      ownerId: ownerId,
+      type: type,
+      data: MemoryData.fromJson(data),
+      isSaved: isSaved,
+      memoryAt: memoryAt,
+      seenAt: seenAt,
+      showAt: showAt,
+      hideAt: hideAt,
+    );
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/sync_api.repository.dart b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
index ccc79fa818..99199a7fc6 100644
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -52,6 +52,8 @@ class SyncApiRepository {
           SyncRequestType.albumAssetsV1,
           SyncRequestType.albumAssetExifsV1,
           SyncRequestType.albumToAssetsV1,
+          SyncRequestType.memoriesV1,
+          SyncRequestType.memoryToAssetsV1,
         ],
       ).toJson(),
     );
@@ -157,6 +159,10 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.albumToAssetBackfillV1: SyncAlbumToAssetV1.fromJson,
   SyncEntityType.albumToAssetDeleteV1: SyncAlbumToAssetDeleteV1.fromJson,
   SyncEntityType.syncAckV1: _SyncAckV1.fromJson,
+  SyncEntityType.memoryV1: SyncMemoryV1.fromJson,
+  SyncEntityType.memoryDeleteV1: SyncMemoryDeleteV1.fromJson,
+  SyncEntityType.memoryToAssetV1: SyncMemoryAssetV1.fromJson,
+  SyncEntityType.memoryToAssetDeleteV1: SyncMemoryAssetDeleteV1.fromJson,
 };
 
 class _SyncAckV1 {
diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index 015e09d663..b88083aa02 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -1,12 +1,17 @@
+import 'dart:convert';
+
 import 'package:drift/drift.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/domain/models/memory.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:logging/logging.dart';
@@ -64,8 +69,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (e, s) {
-      _logger.severe('Error: SyncPartnerDeleteV1', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: SyncPartnerDeleteV1', error, stackTrace);
       rethrow;
     }
   }
@@ -87,8 +92,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (e, s) {
-      _logger.severe('Error: SyncPartnerV1', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: SyncPartnerV1', error, stackTrace);
       rethrow;
     }
   }
@@ -98,10 +103,11 @@ class SyncStreamRepository extends DriftDatabaseRepository {
     String debugLabel = 'user',
   }) async {
     try {
-      await _db.remoteAssetEntity
-          .deleteWhere((row) => row.id.isIn(data.map((e) => e.assetId)));
-    } catch (e, s) {
-      _logger.severe('Error: deleteAssetsV1 - $debugLabel', e, s);
+      await _db.remoteAssetEntity.deleteWhere(
+        (row) => row.id.isIn(data.map((error) => error.assetId)),
+      );
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteAssetsV1 - $debugLabel', error, stackTrace);
       rethrow;
     }
   }
@@ -136,8 +142,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (e, s) {
-      _logger.severe('Error: updateAssetsV1 - $debugLabel', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: updateAssetsV1 - $debugLabel', error, stackTrace);
       rethrow;
     }
   }
@@ -180,18 +186,23 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (e, s) {
-      _logger.severe('Error: updateAssetsExifV1 - $debugLabel', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe(
+        'Error: updateAssetsExifV1 - $debugLabel',
+        error,
+        stackTrace,
+      );
       rethrow;
     }
   }
 
   Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async {
     try {
-      await _db.remoteAlbumEntity
-          .deleteWhere((row) => row.id.isIn(data.map((e) => e.albumId)));
-    } catch (e, s) {
-      _logger.severe('Error: deleteAlbumsV1', e, s);
+      await _db.remoteAlbumEntity.deleteWhere(
+        (row) => row.id.isIn(data.map((e) => e.albumId)),
+      );
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteAlbumsV1', error, stackTrace);
       rethrow;
     }
   }
@@ -218,8 +229,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (e, s) {
-      _logger.severe('Error: updateAlbumsV1', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: updateAlbumsV1', error, stackTrace);
       rethrow;
     }
   }
@@ -237,8 +248,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (e, s) {
-      _logger.severe('Error: deleteAlbumUsersV1', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteAlbumUsersV1', error, stackTrace);
       rethrow;
     }
   }
@@ -264,8 +275,12 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (e, s) {
-      _logger.severe('Error: updateAlbumUsersV1 - $debugLabel', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe(
+        'Error: updateAlbumUsersV1 - $debugLabel',
+        error,
+        stackTrace,
+      );
       rethrow;
     }
   }
@@ -285,8 +300,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (e, s) {
-      _logger.severe('Error: deleteAlbumToAssetsV1', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteAlbumToAssetsV1', error, stackTrace);
       rethrow;
     }
   }
@@ -310,8 +325,96 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (e, s) {
-      _logger.severe('Error: updateAlbumToAssetsV1 - $debugLabel', e, s);
+    } catch (error, stackTrace) {
+      _logger.severe(
+        'Error: updateAlbumToAssetsV1 - $debugLabel',
+        error,
+        stackTrace,
+      );
+      rethrow;
+    }
+  }
+
+  Future<void> updateMemoriesV1(Iterable<SyncMemoryV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final memory in data) {
+          final companion = MemoryEntityCompanion(
+            createdAt: Value(memory.createdAt),
+            deletedAt: Value(memory.deletedAt),
+            ownerId: Value(memory.ownerId),
+            type: Value(memory.type.toMemoryType()),
+            data: Value(jsonEncode(memory.data)),
+            isSaved: Value(memory.isSaved),
+            memoryAt: Value(memory.memoryAt),
+            seenAt: Value.absentIfNull(memory.seenAt),
+            showAt: Value.absentIfNull(memory.showAt),
+            hideAt: Value.absentIfNull(memory.hideAt),
+          );
+
+          batch.insert(
+            _db.memoryEntity,
+            companion.copyWith(id: Value(memory.id)),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (error, stackTrace) {
+      _logger.severe('Error: updateMemoriesV1', error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteMemoriesV1(Iterable<SyncMemoryDeleteV1> data) async {
+    try {
+      await _db.memoryEntity.deleteWhere(
+        (row) => row.id.isIn(data.map((e) => e.memoryId)),
+      );
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteMemoriesV1', error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<void> updateMemoryAssetsV1(Iterable<SyncMemoryAssetV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final asset in data) {
+          final companion = MemoryAssetEntityCompanion(
+            memoryId: Value(asset.memoryId),
+            assetId: Value(asset.assetId),
+          );
+
+          batch.insert(
+            _db.memoryAssetEntity,
+            companion,
+            onConflict: DoNothing(),
+          );
+        }
+      });
+    } catch (error, stackTrace) {
+      _logger.severe('Error: updateMemoryAssetsV1', error, stackTrace);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteMemoryAssetsV1(
+    Iterable<SyncMemoryAssetDeleteV1> data,
+  ) async {
+    try {
+      await _db.batch((batch) {
+        for (final asset in data) {
+          batch.delete(
+            _db.memoryAssetEntity,
+            MemoryAssetEntityCompanion(
+              memoryId: Value(asset.memoryId),
+              assetId: Value(asset.assetId),
+            ),
+          );
+        }
+      });
+    } catch (error, stackTrace) {
+      _logger.severe('Error: deleteMemoryAssetsV1', error, stackTrace);
       rethrow;
     }
   }
@@ -335,6 +438,13 @@ extension on AssetOrder {
       };
 }
 
+extension on MemoryType {
+  MemoryTypeEnum toMemoryType() => switch (this) {
+        MemoryType.onThisDay => MemoryTypeEnum.onThisDay,
+        _ => throw Exception('Unknown MemoryType value: $this'),
+      };
+}
+
 extension on api.AlbumUserRole {
   AlbumUserRole toAlbumUserRole() => switch (this) {
         api.AlbumUserRole.editor => AlbumUserRole.editor,
@@ -357,7 +467,7 @@ extension on String {
   Duration? toDuration() {
     try {
       final parts = split(':')
-          .map((e) => double.parse(e).toInt())
+          .map((error) => double.parse(error).toInt())
           .toList(growable: false);
 
       return Duration(hours: parts[0], minutes: parts[1], seconds: parts[2]);
diff --git a/mobile/lib/presentation/pages/dev/media_stat.page.dart b/mobile/lib/presentation/pages/dev/media_stat.page.dart
index 10d09f8de5..f0a648fd5a 100644
--- a/mobile/lib/presentation/pages/dev/media_stat.page.dart
+++ b/mobile/lib/presentation/pages/dev/media_stat.page.dart
@@ -154,6 +154,14 @@ final _remoteStats = [
     name: 'Remote Albums',
     load: (db) => db.managers.remoteAlbumEntity.count(),
   ),
+  _Stat(
+    name: 'Memories',
+    load: (db) => db.managers.memoryEntity.count(),
+  ),
+  _Stat(
+    name: 'Memories Assets',
+    load: (db) => db.managers.memoryAssetEntity.count(),
+  ),
 ];
 
 @RoutePage()
diff --git a/mobile/lib/providers/memory.provider.dart b/mobile/lib/providers/memory.provider.dart
index aed546002d..37f84dca93 100644
--- a/mobile/lib/providers/memory.provider.dart
+++ b/mobile/lib/providers/memory.provider.dart
@@ -1,5 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/infrastructure/repositories/memory.repository.dart';
 import 'package:immich_mobile/models/memories/memory.model.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/services/memory.service.dart';
 
 final memoryFutureProvider =
@@ -8,3 +10,7 @@ final memoryFutureProvider =
 
   return await service.getMemoryLane();
 });
+
+final driftMemoryProvider = Provider<DriftMemoryRepository>(
+  (ref) => DriftMemoryRepository(ref.watch(driftProvider)),
+);
diff --git a/mobile/test/domain/services/sync_stream_service_test.dart b/mobile/test/domain/services/sync_stream_service_test.dart
index a0b61bcaff..28288422fd 100644
--- a/mobile/test/domain/services/sync_stream_service_test.dart
+++ b/mobile/test/domain/services/sync_stream_service_test.dart
@@ -81,6 +81,14 @@ void main() {
         debugLabel: any(named: 'debugLabel'),
       ),
     ).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updateMemoriesV1(any()))
+        .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deleteMemoriesV1(any()))
+        .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updateMemoryAssetsV1(any()))
+        .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deleteMemoryAssetsV1(any()))
+        .thenAnswer(successHandler);
 
     sut = SyncStreamService(
       syncApiRepository: mockSyncApiRepo,
@@ -227,5 +235,94 @@ void main() {
         verify(() => mockSyncApiRepo.ack(["2"])).called(1);
       },
     );
+
+    test("processes memory sync events successfully", () async {
+      final events = [
+        SyncStreamStub.memoryV1,
+        SyncStreamStub.memoryDeleteV1,
+        SyncStreamStub.memoryToAssetV1,
+        SyncStreamStub.memoryToAssetDeleteV1,
+      ];
+
+      await simulateEvents(events);
+
+      verifyInOrder([
+        () => mockSyncStreamRepo.updateMemoriesV1(any()),
+        () => mockSyncApiRepo.ack(["5"]),
+        () => mockSyncStreamRepo.deleteMemoriesV1(any()),
+        () => mockSyncApiRepo.ack(["6"]),
+        () => mockSyncStreamRepo.updateMemoryAssetsV1(any()),
+        () => mockSyncApiRepo.ack(["7"]),
+        () => mockSyncStreamRepo.deleteMemoryAssetsV1(any()),
+        () => mockSyncApiRepo.ack(["8"]),
+      ]);
+      verifyNever(() => mockAbortCallbackWrapper());
+    });
+
+    test("processes mixed memory and user events in correct order", () async {
+      final events = [
+        SyncStreamStub.memoryDeleteV1,
+        SyncStreamStub.userV1Admin,
+        SyncStreamStub.memoryToAssetV1,
+        SyncStreamStub.memoryV1,
+      ];
+
+      await simulateEvents(events);
+
+      verifyInOrder([
+        () => mockSyncStreamRepo.deleteMemoriesV1(any()),
+        () => mockSyncApiRepo.ack(["6"]),
+        () => mockSyncStreamRepo.updateUsersV1(any()),
+        () => mockSyncApiRepo.ack(["1"]),
+        () => mockSyncStreamRepo.updateMemoryAssetsV1(any()),
+        () => mockSyncApiRepo.ack(["7"]),
+        () => mockSyncStreamRepo.updateMemoriesV1(any()),
+        () => mockSyncApiRepo.ack(["5"]),
+      ]);
+      verifyNever(() => mockAbortCallbackWrapper());
+    });
+
+    test("handles memory sync failure gracefully", () async {
+      when(() => mockSyncStreamRepo.updateMemoriesV1(any()))
+          .thenThrow(Exception("Memory sync failed"));
+
+      final events = [
+        SyncStreamStub.memoryV1,
+        SyncStreamStub.userV1Admin,
+      ];
+
+      expect(
+        () async => await simulateEvents(events),
+        throwsA(isA<Exception>()),
+      );
+    });
+
+    test("processes memory asset events with correct data types", () async {
+      final events = [SyncStreamStub.memoryToAssetV1];
+
+      await simulateEvents(events);
+
+      verify(() => mockSyncStreamRepo.updateMemoryAssetsV1(any())).called(1);
+      verify(() => mockSyncApiRepo.ack(["7"])).called(1);
+    });
+
+    test("processes memory delete events with correct data types", () async {
+      final events = [SyncStreamStub.memoryDeleteV1];
+
+      await simulateEvents(events);
+
+      verify(() => mockSyncStreamRepo.deleteMemoriesV1(any())).called(1);
+      verify(() => mockSyncApiRepo.ack(["6"])).called(1);
+    });
+
+    test("processes memory create/update events with correct data types",
+        () async {
+      final events = [SyncStreamStub.memoryV1];
+
+      await simulateEvents(events);
+
+      verify(() => mockSyncStreamRepo.updateMemoriesV1(any())).called(1);
+      verify(() => mockSyncApiRepo.ack(["5"])).called(1);
+    });
   });
 }
diff --git a/mobile/test/fixtures/sync_stream.stub.dart b/mobile/test/fixtures/sync_stream.stub.dart
index ba97f1434a..de2d58bc9d 100644
--- a/mobile/test/fixtures/sync_stream.stub.dart
+++ b/mobile/test/fixtures/sync_stream.stub.dart
@@ -42,4 +42,47 @@ abstract final class SyncStreamStub {
     data: SyncPartnerDeleteV1(sharedById: "3", sharedWithId: "4"),
     ack: "4",
   );
+
+  static final memoryV1 = SyncEvent(
+    type: SyncEntityType.memoryV1,
+    data: SyncMemoryV1(
+      createdAt: DateTime(2023, 1, 1),
+      data: {"year": 2023, "title": "Test Memory"},
+      deletedAt: null,
+      hideAt: null,
+      id: "memory-1",
+      isSaved: false,
+      memoryAt: DateTime(2023, 1, 1),
+      ownerId: "user-1",
+      seenAt: null,
+      showAt: DateTime(2023, 1, 1),
+      type: MemoryType.onThisDay,
+      updatedAt: DateTime(2023, 1, 1),
+    ),
+    ack: "5",
+  );
+
+  static final memoryDeleteV1 = SyncEvent(
+    type: SyncEntityType.memoryDeleteV1,
+    data: SyncMemoryDeleteV1(memoryId: "memory-2"),
+    ack: "6",
+  );
+
+  static final memoryToAssetV1 = SyncEvent(
+    type: SyncEntityType.memoryToAssetV1,
+    data: SyncMemoryAssetV1(
+      assetId: "asset-1",
+      memoryId: "memory-1",
+    ),
+    ack: "7",
+  );
+
+  static final memoryToAssetDeleteV1 = SyncEvent(
+    type: SyncEntityType.memoryToAssetDeleteV1,
+    data: SyncMemoryAssetDeleteV1(
+      assetId: "asset-2",
+      memoryId: "memory-1",
+    ),
+    ack: "8",
+  );
 }

From 484529e61e687c738580b0fe482f47315d0b5d79 Mon Sep 17 00:00:00 2001
From: aviv926 <51673860+aviv926@users.noreply.github.com>
Date: Thu, 3 Jul 2025 12:35:24 +0300
Subject: [PATCH 126/337] feat(server): add immich and postgres version to the
 database backup name (#19603)

---
 server/src/services/backup.service.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/services/backup.service.ts b/server/src/services/backup.service.ts
index 10f7becc7d..afef497e59 100644
--- a/server/src/services/backup.service.ts
+++ b/server/src/services/backup.service.ts
@@ -1,6 +1,8 @@
 import { Injectable } from '@nestjs/common';
+import { DateTime } from 'luxon';
 import path from 'node:path';
 import semver from 'semver';
+import { serverVersion } from 'src/constants';
 import { StorageCore } from 'src/cores/storage.core';
 import { OnEvent, OnJob } from 'src/decorators';
 import { DatabaseLock, ImmichWorker, JobName, JobStatus, QueueName, StorageFolder } from 'src/enum';
@@ -88,13 +90,11 @@ export class BackupService extends BaseService {
         ];
 
     databaseParams.push('--clean', '--if-exists');
-
+    const databaseVersion = await this.databaseRepository.getPostgresVersion();
     const backupFilePath = path.join(
       StorageCore.getBaseFolder(StorageFolder.BACKUPS),
-      `immich-db-backup-${Date.now()}.sql.gz.tmp`,
+      `immich-db-backup-${DateTime.now().toFormat("yyyyLLdd'T'HHmmss")}-v${serverVersion.toString()}-pg${databaseVersion.split(' ')[0]}.sql.gz.tmp`,
     );
-
-    const databaseVersion = await this.databaseRepository.getPostgresVersion();
     const databaseSemver = semver.coerce(databaseVersion);
     const databaseMajorVersion = databaseSemver?.major;
 

From 6044663e26a81360b540dcc3e9f53b78e0937f61 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Thu, 3 Jul 2025 10:59:17 -0400
Subject: [PATCH 127/337] refactor: sql-tools (#19717)

---
 .../comparers/column.comparer.spec.ts         |  12 +-
 .../{diff => }/comparers/column.comparer.ts   |  14 +-
 .../comparers/constraint.comparer.spec.ts     |  14 +-
 .../comparers/constraint.comparer.ts          |  18 +--
 .../comparers/enum.comparer.spec.ts           |  10 +-
 .../{diff => }/comparers/enum.comparer.ts     |   8 +-
 .../comparers/extension.comparer.spec.ts      |   6 +-
 .../comparers/extension.comparer.ts           |   4 +-
 .../comparers/function.comparer.spec.ts       |   8 +-
 .../{diff => }/comparers/function.comparer.ts |   6 +-
 .../comparers/index.comparer.spec.ts          |  10 +-
 .../{diff => }/comparers/index.comparer.ts    |   8 +-
 .../comparers/parameter.comparer.spec.ts      |   6 +-
 .../comparers/parameter.comparer.ts           |   4 +-
 .../comparers/table.comparer.spec.ts          |   6 +-
 .../{diff => }/comparers/table.comparer.ts    |  48 +++----
 .../comparers/trigger.comparer.spec.ts        |  18 +--
 .../{diff => }/comparers/trigger.comparer.ts  |   6 +-
 .../decorators/after-delete.decorator.ts      |   2 +-
 .../decorators/after-insert.decorator.ts      |   2 +-
 .../decorators/before-update.decorator.ts     |   2 +-
 .../decorators/check.decorator.ts             |   2 +-
 .../decorators/column.decorator.ts            |   2 +-
 .../configuration-parameter.decorator.ts      |   4 +-
 .../create-date-column.decorator.ts           |   2 +-
 .../decorators/database.decorator.ts          |   2 +-
 .../delete-date-column.decorator.ts           |   2 +-
 .../decorators/extension.decorator.ts         |   2 +-
 .../decorators/extensions.decorator.ts        |   2 +-
 .../foreign-key-column.decorator.ts           |  16 +++
 .../foreign-key-constraint.decorator.ts       |   2 +-
 .../decorators/generated-column.decorator.ts  |   2 +-
 .../decorators/index.decorator.ts             |   2 +-
 server/src/sql-tools/decorators/index.ts      |  22 ++++
 .../decorators/primary-column.decorator.ts    |   2 +-
 .../primary-generated-column.decorator.ts     |   2 +-
 .../decorators/table.decorator.ts             |   2 +-
 .../decorators/trigger-function.decorator.ts  |   2 +-
 .../decorators/trigger.decorator.ts           |   2 +-
 .../decorators/unique.decorator.ts            |   2 +-
 .../update-date-column.decorator.ts           |   2 +-
 server/src/sql-tools/diff/index.ts            |  85 ------------
 .../foreign-key-column.decorator.ts           |  15 ---
 server/src/sql-tools/from-code/index.spec.ts  |  36 ------
 server/src/sql-tools/from-code/index.ts       |  77 -----------
 .../from-code/processors/column.processor.ts  |  93 --------------
 .../from-code/processors/table.processor.ts   |  58 ---------
 .../sql-tools/from-code/processors/type.ts    |  10 --
 server/src/sql-tools/from-database/index.ts   |  54 --------
 .../sql-tools/from-database/readers/type.ts   |   3 -
 server/src/sql-tools/helpers.ts               |  74 +----------
 .../processors/check-constraint.processor.ts  |  10 +-
 .../sql-tools/processors/column.processor.ts  |  55 ++++++++
 .../configuration-parameter.processor.ts      |   4 +-
 .../processors/database.processor.ts          |   4 +-
 .../processors/enum.processor.ts              |   2 +-
 .../processors/extension.processor.ts         |   2 +-
 .../foreign-key-column.processor.ts           |  23 ++--
 .../foreign-key-constraint.processor.ts       |  36 +++---
 .../processors/function.processor.ts          |   2 +-
 .../processors/index.processor.ts             |  19 ++-
 server/src/sql-tools/processors/index.ts      |  32 +++++
 .../primary-key-contraint.processor.ts        |  11 +-
 .../sql-tools/processors/table.processor.ts   |  28 ++++
 .../processors/trigger.processor.ts           |   9 +-
 .../processors/unique-constraint.processor.ts |  19 ++-
 server/src/sql-tools/public_api.ts            |  34 +----
 .../readers/column.reader.ts                  |   3 +-
 .../readers/comment.reader.ts                 |   2 +-
 .../readers/constraint.reader.ts              |  23 ++--
 .../readers/extension.reader.ts               |   2 +-
 .../readers/function.reader.ts                |   2 +-
 .../readers/index.reader.ts                   |   2 +-
 server/src/sql-tools/readers/index.ts         |  25 ++++
 .../readers/name.reader.ts                    |   4 +-
 .../readers/parameter.reader.ts               |   5 +-
 .../readers/table.reader.ts                   |   2 +-
 .../readers/trigger.reader.ts                 |  44 ++++++-
 .../{from-code => }/register-enum.ts          |   2 +-
 .../{from-code => }/register-function.ts      |   2 +-
 .../{from-code => }/register-item.ts          |  26 ++--
 .../src/sql-tools/{from-code => }/register.ts |   2 +-
 server/src/sql-tools/schema-builder.ts        | 121 ++++++++++++++++++
 .../index.spec.ts => schema-diff.spec.ts}     |  88 ++++++-------
 server/src/sql-tools/schema-diff.ts           | 121 ++++++++++++++++++
 server/src/sql-tools/schema-from-code.spec.ts |  46 +++++++
 server/src/sql-tools/schema-from-code.ts      |  29 +++++
 server/src/sql-tools/schema-from-database.ts  |  33 +++++
 server/src/sql-tools/to-sql/index.spec.ts     |  21 ---
 server/src/sql-tools/to-sql/index.ts          |  59 ---------
 .../transformers/column.transformer.spec.ts   |  24 ++--
 .../transformers/column.transformer.ts        |   8 +-
 .../constraint.transformer.spec.ts            |  26 ++--
 .../transformers/constraint.transformer.ts    |  20 +--
 .../transformers/enum.transformer.ts          |   6 +-
 .../extension.transformer.spec.ts             |  10 +-
 .../transformers/extension.transformer.ts     |   6 +-
 .../transformers/function.transformer.spec.ts |   6 +-
 .../transformers/function.transformer.ts      |   6 +-
 .../transformers/index.transformer.spec.ts    |  18 +--
 .../transformers/index.transformer.ts         |   6 +-
 server/src/sql-tools/transformers/index.ts    |  22 ++++
 .../transformers/parameter.transformer.ts     |   6 +-
 .../transformers/table.transformer.spec.ts    |  18 +--
 .../transformers/table.transformer.ts         |   8 +-
 .../transformers/trigger.transformer.spec.ts  |  14 +-
 .../transformers/trigger.transformer.ts       |   6 +-
 .../{to-sql => }/transformers/types.ts        |   0
 server/src/sql-tools/types.ts                 | 111 +++++++++-------
 .../check-constraint-default-name.stub.ts     |   6 +-
 .../check-constraint-override-name.stub.ts    |   6 +-
 .../test/sql-tools/column-create-date.stub.ts |   2 +-
 .../sql-tools/column-default-boolean.stub.ts  |   2 +-
 .../sql-tools/column-default-date.stub.ts     |   2 +-
 .../sql-tools/column-default-function.stub.ts |   2 +-
 .../sql-tools/column-default-null.stub.ts     |   2 +-
 .../sql-tools/column-default-number.stub.ts   |   2 +-
 .../sql-tools/column-default-string.stub.ts   |   2 +-
 .../test/sql-tools/column-delete-date.stub.ts |   2 +-
 .../test/sql-tools/column-enum-type.stub.ts   |   2 +-
 .../sql-tools/column-generated-identity.ts    |   6 +-
 .../sql-tools/column-generated-uuid.stub.ts   |   6 +-
 .../sql-tools/column-index-name-default.ts    |   2 +-
 server/test/sql-tools/column-index-name.ts    |   2 +-
 .../column-inferred-nullable.stub.ts          |   2 +-
 .../sql-tools/column-name-default.stub.ts     |   2 +-
 .../sql-tools/column-name-override.stub.ts    |   2 +-
 .../test/sql-tools/column-name-string.stub.ts |   2 +-
 server/test/sql-tools/column-nullable.stub.ts |   2 +-
 .../sql-tools/column-string-length.stub.ts    |   2 +-
 ...umn-unique-constraint-name-default.stub.ts |   6 +-
 ...mn-unique-constraint-name-override.stub.ts |   6 +-
 .../test/sql-tools/column-update-date.stub.ts |   2 +-
 .../errors/table-duplicate-decorator.stub.ts  |   7 +
 ...oreign-key-constraint-column-order.stub.ts |  15 +--
 ...eign-key-constraint-missing-column.stub.ts |  13 +-
 ...onstraint-missing-reference-column.stub.ts |  13 +-
 ...constraint-missing-reference-table.stub.ts |   2 +-
 ...gn-key-constraint-multiple-columns.stub.ts |  15 +--
 .../foreign-key-constraint-no-index.stub.ts   |  15 +--
 .../foreign-key-constraint-no-primary.stub.ts |   6 +-
 .../sql-tools/foreign-key-constraint.stub.ts  |  15 +--
 .../foreign-key-inferred-type.stub.ts         |   8 +-
 ...foreign-key-with-unique-constraint.stub.ts |  10 +-
 .../test/sql-tools/index-name-default.stub.ts |   2 +-
 .../sql-tools/index-name-override.stub.ts     |   2 +-
 .../test/sql-tools/index-with-expression.ts   |   2 +-
 .../test/sql-tools/index-with-where.stub.ts   |   2 +-
 ...rimary-key-constraint-name-default.stub.ts |   6 +-
 ...imary-key-constraint-name-override.stub.ts |   6 +-
 .../test/sql-tools/table-name-default.stub.ts |   2 +-
 .../sql-tools/table-name-override.stub.ts     |   2 +-
 .../table-name-string-option.stub.ts          |   2 +-
 .../sql-tools/trigger-after-delete.stub.ts    |   2 +-
 .../sql-tools/trigger-before-update.stub.ts   |   2 +-
 .../sql-tools/trigger-name-default.stub.ts    |   2 +-
 .../sql-tools/trigger-name-override.stub.ts   |   2 +-
 .../unique-constraint-name-default.stub.ts    |   6 +-
 .../unique-constraint-name-override.stub.ts   |   6 +-
 server/test/vitest.config.mjs                 |   1 -
 160 files changed, 1120 insertions(+), 1186 deletions(-)
 rename server/src/sql-tools/{diff => }/comparers/column.comparer.spec.ts (89%)
 rename server/src/sql-tools/{diff => }/comparers/column.comparer.ts (90%)
 rename server/src/sql-tools/{diff => }/comparers/constraint.comparer.spec.ts (80%)
 rename server/src/sql-tools/{diff => }/comparers/constraint.comparer.ts (91%)
 rename server/src/sql-tools/{diff => }/comparers/enum.comparer.spec.ts (87%)
 rename server/src/sql-tools/{diff => }/comparers/enum.comparer.ts (87%)
 rename server/src/sql-tools/{diff => }/comparers/extension.comparer.spec.ts (84%)
 rename server/src/sql-tools/{diff => }/comparers/extension.comparer.ts (87%)
 rename server/src/sql-tools/{diff => }/comparers/function.comparer.spec.ts (88%)
 rename server/src/sql-tools/{diff => }/comparers/function.comparer.ts (87%)
 rename server/src/sql-tools/{diff => }/comparers/index.comparer.spec.ts (89%)
 rename server/src/sql-tools/{diff => }/comparers/index.comparer.ts (88%)
 rename server/src/sql-tools/{diff => }/comparers/parameter.comparer.spec.ts (86%)
 rename server/src/sql-tools/{diff => }/comparers/parameter.comparer.ts (88%)
 rename server/src/sql-tools/{diff => }/comparers/table.comparer.spec.ts (86%)
 rename server/src/sql-tools/{diff => }/comparers/table.comparer.ts (54%)
 rename server/src/sql-tools/{diff => }/comparers/trigger.comparer.spec.ts (87%)
 rename server/src/sql-tools/{diff => }/comparers/trigger.comparer.ts (92%)
 rename server/src/sql-tools/{from-code => }/decorators/after-delete.decorator.ts (81%)
 rename server/src/sql-tools/{from-code => }/decorators/after-insert.decorator.ts (81%)
 rename server/src/sql-tools/{from-code => }/decorators/before-update.decorator.ts (81%)
 rename server/src/sql-tools/{from-code => }/decorators/check.decorator.ts (84%)
 rename server/src/sql-tools/{from-code => }/decorators/column.decorator.ts (93%)
 rename server/src/sql-tools/{from-code => }/decorators/configuration-parameter.decorator.ts (76%)
 rename server/src/sql-tools/{from-code => }/decorators/create-date-column.decorator.ts (67%)
 rename server/src/sql-tools/{from-code => }/decorators/database.decorator.ts (84%)
 rename server/src/sql-tools/{from-code => }/decorators/delete-date-column.decorator.ts (66%)
 rename server/src/sql-tools/{from-code => }/decorators/extension.decorator.ts (86%)
 rename server/src/sql-tools/{from-code => }/decorators/extensions.decorator.ts (88%)
 create mode 100644 server/src/sql-tools/decorators/foreign-key-column.decorator.ts
 rename server/src/sql-tools/{from-code => }/decorators/foreign-key-constraint.decorator.ts (92%)
 rename server/src/sql-tools/{from-code => }/decorators/generated-column.decorator.ts (95%)
 rename server/src/sql-tools/{from-code => }/decorators/index.decorator.ts (89%)
 create mode 100644 server/src/sql-tools/decorators/index.ts
 rename server/src/sql-tools/{from-code => }/decorators/primary-column.decorator.ts (56%)
 rename server/src/sql-tools/{from-code => }/decorators/primary-generated-column.decorator.ts (79%)
 rename server/src/sql-tools/{from-code => }/decorators/table.decorator.ts (88%)
 rename server/src/sql-tools/{from-code => }/decorators/trigger-function.decorator.ts (78%)
 rename server/src/sql-tools/{from-code => }/decorators/trigger.decorator.ts (90%)
 rename server/src/sql-tools/{from-code => }/decorators/unique.decorator.ts (84%)
 rename server/src/sql-tools/{from-code => }/decorators/update-date-column.decorator.ts (67%)
 delete mode 100644 server/src/sql-tools/diff/index.ts
 delete mode 100644 server/src/sql-tools/from-code/decorators/foreign-key-column.decorator.ts
 delete mode 100644 server/src/sql-tools/from-code/index.spec.ts
 delete mode 100644 server/src/sql-tools/from-code/index.ts
 delete mode 100644 server/src/sql-tools/from-code/processors/column.processor.ts
 delete mode 100644 server/src/sql-tools/from-code/processors/table.processor.ts
 delete mode 100644 server/src/sql-tools/from-code/processors/type.ts
 delete mode 100644 server/src/sql-tools/from-database/index.ts
 delete mode 100644 server/src/sql-tools/from-database/readers/type.ts
 rename server/src/sql-tools/{from-code => }/processors/check-constraint.processor.ts (63%)
 create mode 100644 server/src/sql-tools/processors/column.processor.ts
 rename server/src/sql-tools/{from-code => }/processors/configuration-parameter.processor.ts (81%)
 rename server/src/sql-tools/{from-code => }/processors/database.processor.ts (63%)
 rename server/src/sql-tools/{from-code => }/processors/enum.processor.ts (76%)
 rename server/src/sql-tools/{from-code => }/processors/extension.processor.ts (80%)
 rename server/src/sql-tools/{from-code => }/processors/foreign-key-column.processor.ts (64%)
 rename server/src/sql-tools/{from-code => }/processors/foreign-key-constraint.processor.ts (61%)
 rename server/src/sql-tools/{from-code => }/processors/function.processor.ts (77%)
 rename server/src/sql-tools/{from-code => }/processors/index.processor.ts (70%)
 create mode 100644 server/src/sql-tools/processors/index.ts
 rename server/src/sql-tools/{from-code => }/processors/primary-key-contraint.processor.ts (61%)
 create mode 100644 server/src/sql-tools/processors/table.processor.ts
 rename server/src/sql-tools/{from-code => }/processors/trigger.processor.ts (71%)
 rename server/src/sql-tools/{from-code => }/processors/unique-constraint.processor.ts (66%)
 rename server/src/sql-tools/{from-database => }/readers/column.reader.ts (96%)
 rename server/src/sql-tools/{from-database => }/readers/comment.reader.ts (93%)
 rename server/src/sql-tools/{from-database => }/readers/constraint.reader.ts (88%)
 rename server/src/sql-tools/{from-database => }/readers/extension.reader.ts (86%)
 rename server/src/sql-tools/{from-database => }/readers/function.reader.ts (92%)
 rename server/src/sql-tools/{from-database => }/readers/index.reader.ts (96%)
 create mode 100644 server/src/sql-tools/readers/index.ts
 rename server/src/sql-tools/{from-database => }/readers/name.reader.ts (66%)
 rename server/src/sql-tools/{from-database => }/readers/parameter.reader.ts (76%)
 rename server/src/sql-tools/{from-database => }/readers/table.reader.ts (87%)
 rename server/src/sql-tools/{from-database => }/readers/trigger.reader.ts (56%)
 rename server/src/sql-tools/{from-code => }/register-enum.ts (86%)
 rename server/src/sql-tools/{from-code => }/register-function.ts (96%)
 rename server/src/sql-tools/{from-code => }/register-item.ts (53%)
 rename server/src/sql-tools/{from-code => }/register.ts (76%)
 create mode 100644 server/src/sql-tools/schema-builder.ts
 rename server/src/sql-tools/{diff/index.spec.ts => schema-diff.spec.ts} (90%)
 create mode 100644 server/src/sql-tools/schema-diff.ts
 create mode 100644 server/src/sql-tools/schema-from-code.spec.ts
 create mode 100644 server/src/sql-tools/schema-from-code.ts
 create mode 100644 server/src/sql-tools/schema-from-database.ts
 delete mode 100644 server/src/sql-tools/to-sql/index.spec.ts
 delete mode 100644 server/src/sql-tools/to-sql/index.ts
 rename server/src/sql-tools/{to-sql => }/transformers/column.transformer.spec.ts (87%)
 rename server/src/sql-tools/{to-sql => }/transformers/column.transformer.ts (91%)
 rename server/src/sql-tools/{to-sql => }/transformers/constraint.transformer.spec.ts (78%)
 rename server/src/sql-tools/{to-sql => }/transformers/constraint.transformer.ts (68%)
 rename server/src/sql-tools/{to-sql => }/transformers/enum.transformer.ts (81%)
 rename server/src/sql-tools/{to-sql => }/transformers/extension.transformer.spec.ts (70%)
 rename server/src/sql-tools/{to-sql => }/transformers/extension.transformer.ts (81%)
 rename server/src/sql-tools/{to-sql => }/transformers/function.transformer.spec.ts (65%)
 rename server/src/sql-tools/{to-sql => }/transformers/function.transformer.ts (79%)
 rename server/src/sql-tools/{to-sql => }/transformers/index.transformer.spec.ts (87%)
 rename server/src/sql-tools/{to-sql => }/transformers/index.transformer.ts (89%)
 create mode 100644 server/src/sql-tools/transformers/index.ts
 rename server/src/sql-tools/{to-sql => }/transformers/parameter.transformer.ts (85%)
 rename server/src/sql-tools/{to-sql => }/transformers/table.transformer.spec.ts (91%)
 rename server/src/sql-tools/{to-sql => }/transformers/table.transformer.ts (83%)
 rename server/src/sql-tools/{to-sql => }/transformers/trigger.transformer.spec.ts (87%)
 rename server/src/sql-tools/{to-sql => }/transformers/trigger.transformer.ts (91%)
 rename server/src/sql-tools/{to-sql => }/transformers/types.ts (100%)
 create mode 100644 server/test/sql-tools/errors/table-duplicate-decorator.stub.ts

diff --git a/server/src/sql-tools/diff/comparers/column.comparer.spec.ts b/server/src/sql-tools/comparers/column.comparer.spec.ts
similarity index 89%
rename from server/src/sql-tools/diff/comparers/column.comparer.spec.ts
rename to server/src/sql-tools/comparers/column.comparer.spec.ts
index 082d15f0db..25ef8543a8 100644
--- a/server/src/sql-tools/diff/comparers/column.comparer.spec.ts
+++ b/server/src/sql-tools/comparers/column.comparer.spec.ts
@@ -1,4 +1,4 @@
-import { compareColumns } from 'src/sql-tools/diff/comparers/column.comparer';
+import { compareColumns } from 'src/sql-tools/comparers/column.comparer';
 import { DatabaseColumn, Reason } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
@@ -18,7 +18,7 @@ describe('compareColumns', () => {
         {
           tableName: 'table1',
           columnName: 'test',
-          type: 'column.drop',
+          type: 'ColumnDrop',
           reason: Reason.MissingInSource,
         },
       ]);
@@ -29,7 +29,7 @@ describe('compareColumns', () => {
     it('should work', () => {
       expect(compareColumns.onMissing(testColumn)).toEqual([
         {
-          type: 'column.add',
+          type: 'ColumnAdd',
           column: testColumn,
           reason: Reason.MissingInTarget,
         },
@@ -50,11 +50,11 @@ describe('compareColumns', () => {
         {
           columnName: 'test',
           tableName: 'table1',
-          type: 'column.drop',
+          type: 'ColumnDrop',
           reason,
         },
         {
-          type: 'column.add',
+          type: 'ColumnAdd',
           column: source,
           reason,
         },
@@ -69,7 +69,7 @@ describe('compareColumns', () => {
         {
           columnName: 'test',
           tableName: 'table1',
-          type: 'column.alter',
+          type: 'ColumnAlter',
           changes: {
             comment: 'new comment',
           },
diff --git a/server/src/sql-tools/diff/comparers/column.comparer.ts b/server/src/sql-tools/comparers/column.comparer.ts
similarity index 90%
rename from server/src/sql-tools/diff/comparers/column.comparer.ts
rename to server/src/sql-tools/comparers/column.comparer.ts
index 205bd594ae..5cc3f7a930 100644
--- a/server/src/sql-tools/diff/comparers/column.comparer.ts
+++ b/server/src/sql-tools/comparers/column.comparer.ts
@@ -4,14 +4,14 @@ import { Comparer, DatabaseColumn, Reason, SchemaDiff } from 'src/sql-tools/type
 export const compareColumns: Comparer<DatabaseColumn> = {
   onMissing: (source) => [
     {
-      type: 'column.add',
+      type: 'ColumnAdd',
       column: source,
       reason: Reason.MissingInTarget,
     },
   ],
   onExtra: (target) => [
     {
-      type: 'column.drop',
+      type: 'ColumnDrop',
       tableName: target.tableName,
       columnName: target.name,
       reason: Reason.MissingInSource,
@@ -31,7 +31,7 @@ export const compareColumns: Comparer<DatabaseColumn> = {
     const items: SchemaDiff[] = [];
     if (source.nullable !== target.nullable) {
       items.push({
-        type: 'column.alter',
+        type: 'ColumnAlter',
         tableName: source.tableName,
         columnName: source.name,
         changes: {
@@ -43,7 +43,7 @@ export const compareColumns: Comparer<DatabaseColumn> = {
 
     if (!isDefaultEqual(source, target)) {
       items.push({
-        type: 'column.alter',
+        type: 'ColumnAlter',
         tableName: source.tableName,
         columnName: source.name,
         changes: {
@@ -55,7 +55,7 @@ export const compareColumns: Comparer<DatabaseColumn> = {
 
     if (source.comment !== target.comment) {
       items.push({
-        type: 'column.alter',
+        type: 'ColumnAlter',
         tableName: source.tableName,
         columnName: source.name,
         changes: {
@@ -72,11 +72,11 @@ export const compareColumns: Comparer<DatabaseColumn> = {
 const dropAndRecreateColumn = (source: DatabaseColumn, target: DatabaseColumn, reason: string): SchemaDiff[] => {
   return [
     {
-      type: 'column.drop',
+      type: 'ColumnDrop',
       tableName: target.tableName,
       columnName: target.name,
       reason,
     },
-    { type: 'column.add', column: source, reason },
+    { type: 'ColumnAdd', column: source, reason },
   ];
 };
diff --git a/server/src/sql-tools/diff/comparers/constraint.comparer.spec.ts b/server/src/sql-tools/comparers/constraint.comparer.spec.ts
similarity index 80%
rename from server/src/sql-tools/diff/comparers/constraint.comparer.spec.ts
rename to server/src/sql-tools/comparers/constraint.comparer.spec.ts
index 69d8a8cc43..b5da19e8df 100644
--- a/server/src/sql-tools/diff/comparers/constraint.comparer.spec.ts
+++ b/server/src/sql-tools/comparers/constraint.comparer.spec.ts
@@ -1,9 +1,9 @@
-import { compareConstraints } from 'src/sql-tools/diff/comparers/constraint.comparer';
-import { DatabaseConstraint, DatabaseConstraintType, Reason } from 'src/sql-tools/types';
+import { compareConstraints } from 'src/sql-tools/comparers/constraint.comparer';
+import { ConstraintType, DatabaseConstraint, Reason } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
 const testConstraint: DatabaseConstraint = {
-  type: DatabaseConstraintType.PRIMARY_KEY,
+  type: ConstraintType.PRIMARY_KEY,
   name: 'test',
   tableName: 'table1',
   columnNames: ['column1'],
@@ -15,7 +15,7 @@ describe('compareConstraints', () => {
     it('should work', () => {
       expect(compareConstraints.onExtra(testConstraint)).toEqual([
         {
-          type: 'constraint.drop',
+          type: 'ConstraintDrop',
           constraintName: 'test',
           tableName: 'table1',
           reason: Reason.MissingInSource,
@@ -28,7 +28,7 @@ describe('compareConstraints', () => {
     it('should work', () => {
       expect(compareConstraints.onMissing(testConstraint)).toEqual([
         {
-          type: 'constraint.add',
+          type: 'ConstraintAdd',
           constraint: testConstraint,
           reason: Reason.MissingInTarget,
         },
@@ -49,11 +49,11 @@ describe('compareConstraints', () => {
         {
           constraintName: 'test',
           tableName: 'table1',
-          type: 'constraint.drop',
+          type: 'ConstraintDrop',
           reason,
         },
         {
-          type: 'constraint.add',
+          type: 'ConstraintAdd',
           constraint: source,
           reason,
         },
diff --git a/server/src/sql-tools/diff/comparers/constraint.comparer.ts b/server/src/sql-tools/comparers/constraint.comparer.ts
similarity index 91%
rename from server/src/sql-tools/diff/comparers/constraint.comparer.ts
rename to server/src/sql-tools/comparers/constraint.comparer.ts
index ccb594741c..0ff6fbe131 100644
--- a/server/src/sql-tools/diff/comparers/constraint.comparer.ts
+++ b/server/src/sql-tools/comparers/constraint.comparer.ts
@@ -2,9 +2,9 @@ import { haveEqualColumns } from 'src/sql-tools/helpers';
 import {
   CompareFunction,
   Comparer,
+  ConstraintType,
   DatabaseCheckConstraint,
   DatabaseConstraint,
-  DatabaseConstraintType,
   DatabaseForeignKeyConstraint,
   DatabasePrimaryKeyConstraint,
   DatabaseUniqueConstraint,
@@ -15,14 +15,14 @@ import {
 export const compareConstraints: Comparer<DatabaseConstraint> = {
   onMissing: (source) => [
     {
-      type: 'constraint.add',
+      type: 'ConstraintAdd',
       constraint: source,
       reason: Reason.MissingInTarget,
     },
   ],
   onExtra: (target) => [
     {
-      type: 'constraint.drop',
+      type: 'ConstraintDrop',
       tableName: target.tableName,
       constraintName: target.name,
       reason: Reason.MissingInSource,
@@ -30,19 +30,19 @@ export const compareConstraints: Comparer<DatabaseConstraint> = {
   ],
   onCompare: (source, target) => {
     switch (source.type) {
-      case DatabaseConstraintType.PRIMARY_KEY: {
+      case ConstraintType.PRIMARY_KEY: {
         return comparePrimaryKeyConstraint(source, target as DatabasePrimaryKeyConstraint);
       }
 
-      case DatabaseConstraintType.FOREIGN_KEY: {
+      case ConstraintType.FOREIGN_KEY: {
         return compareForeignKeyConstraint(source, target as DatabaseForeignKeyConstraint);
       }
 
-      case DatabaseConstraintType.UNIQUE: {
+      case ConstraintType.UNIQUE: {
         return compareUniqueConstraint(source, target as DatabaseUniqueConstraint);
       }
 
-      case DatabaseConstraintType.CHECK: {
+      case ConstraintType.CHECK: {
         return compareCheckConstraint(source, target as DatabaseCheckConstraint);
       }
 
@@ -123,11 +123,11 @@ const dropAndRecreateConstraint = (
 ): SchemaDiff[] => {
   return [
     {
-      type: 'constraint.drop',
+      type: 'ConstraintDrop',
       tableName: target.tableName,
       constraintName: target.name,
       reason,
     },
-    { type: 'constraint.add', constraint: source, reason },
+    { type: 'ConstraintAdd', constraint: source, reason },
   ];
 };
diff --git a/server/src/sql-tools/diff/comparers/enum.comparer.spec.ts b/server/src/sql-tools/comparers/enum.comparer.spec.ts
similarity index 87%
rename from server/src/sql-tools/diff/comparers/enum.comparer.spec.ts
rename to server/src/sql-tools/comparers/enum.comparer.spec.ts
index 6e1ad992d5..82fc205662 100644
--- a/server/src/sql-tools/diff/comparers/enum.comparer.spec.ts
+++ b/server/src/sql-tools/comparers/enum.comparer.spec.ts
@@ -1,4 +1,4 @@
-import { compareEnums } from 'src/sql-tools/diff/comparers/enum.comparer';
+import { compareEnums } from 'src/sql-tools/comparers/enum.comparer';
 import { DatabaseEnum, Reason } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
@@ -10,7 +10,7 @@ describe('compareEnums', () => {
       expect(compareEnums.onExtra(testEnum)).toEqual([
         {
           enumName: 'test',
-          type: 'enum.drop',
+          type: 'EnumDrop',
           reason: Reason.MissingInSource,
         },
       ]);
@@ -21,7 +21,7 @@ describe('compareEnums', () => {
     it('should work', () => {
       expect(compareEnums.onMissing(testEnum)).toEqual([
         {
-          type: 'enum.create',
+          type: 'EnumCreate',
           enum: testEnum,
           reason: Reason.MissingInTarget,
         },
@@ -40,11 +40,11 @@ describe('compareEnums', () => {
       expect(compareEnums.onCompare(source, target)).toEqual([
         {
           enumName: 'test',
-          type: 'enum.drop',
+          type: 'EnumDrop',
           reason: 'enum values has changed (foo,bar vs foo,bar,world)',
         },
         {
-          type: 'enum.create',
+          type: 'EnumCreate',
           enum: source,
           reason: 'enum values has changed (foo,bar vs foo,bar,world)',
         },
diff --git a/server/src/sql-tools/diff/comparers/enum.comparer.ts b/server/src/sql-tools/comparers/enum.comparer.ts
similarity index 87%
rename from server/src/sql-tools/diff/comparers/enum.comparer.ts
rename to server/src/sql-tools/comparers/enum.comparer.ts
index 408f01050b..d81f9ed3c0 100644
--- a/server/src/sql-tools/diff/comparers/enum.comparer.ts
+++ b/server/src/sql-tools/comparers/enum.comparer.ts
@@ -3,14 +3,14 @@ import { Comparer, DatabaseEnum, Reason } from 'src/sql-tools/types';
 export const compareEnums: Comparer<DatabaseEnum> = {
   onMissing: (source) => [
     {
-      type: 'enum.create',
+      type: 'EnumCreate',
       enum: source,
       reason: Reason.MissingInTarget,
     },
   ],
   onExtra: (target) => [
     {
-      type: 'enum.drop',
+      type: 'EnumDrop',
       enumName: target.name,
       reason: Reason.MissingInSource,
     },
@@ -21,12 +21,12 @@ export const compareEnums: Comparer<DatabaseEnum> = {
       const reason = `enum values has changed (${source.values} vs ${target.values})`;
       return [
         {
-          type: 'enum.drop',
+          type: 'EnumDrop',
           enumName: source.name,
           reason,
         },
         {
-          type: 'enum.create',
+          type: 'EnumCreate',
           enum: source,
           reason,
         },
diff --git a/server/src/sql-tools/diff/comparers/extension.comparer.spec.ts b/server/src/sql-tools/comparers/extension.comparer.spec.ts
similarity index 84%
rename from server/src/sql-tools/diff/comparers/extension.comparer.spec.ts
rename to server/src/sql-tools/comparers/extension.comparer.spec.ts
index 753c461c69..38e553719d 100644
--- a/server/src/sql-tools/diff/comparers/extension.comparer.spec.ts
+++ b/server/src/sql-tools/comparers/extension.comparer.spec.ts
@@ -1,4 +1,4 @@
-import { compareExtensions } from 'src/sql-tools/diff/comparers/extension.comparer';
+import { compareExtensions } from 'src/sql-tools/comparers/extension.comparer';
 import { Reason } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
@@ -10,7 +10,7 @@ describe('compareExtensions', () => {
       expect(compareExtensions.onExtra(testExtension)).toEqual([
         {
           extensionName: 'test',
-          type: 'extension.drop',
+          type: 'ExtensionDrop',
           reason: Reason.MissingInSource,
         },
       ]);
@@ -21,7 +21,7 @@ describe('compareExtensions', () => {
     it('should work', () => {
       expect(compareExtensions.onMissing(testExtension)).toEqual([
         {
-          type: 'extension.create',
+          type: 'ExtensionCreate',
           extension: testExtension,
           reason: Reason.MissingInTarget,
         },
diff --git a/server/src/sql-tools/diff/comparers/extension.comparer.ts b/server/src/sql-tools/comparers/extension.comparer.ts
similarity index 87%
rename from server/src/sql-tools/diff/comparers/extension.comparer.ts
rename to server/src/sql-tools/comparers/extension.comparer.ts
index 1c9d19165a..441b00e3e3 100644
--- a/server/src/sql-tools/diff/comparers/extension.comparer.ts
+++ b/server/src/sql-tools/comparers/extension.comparer.ts
@@ -3,14 +3,14 @@ import { Comparer, DatabaseExtension, Reason } from 'src/sql-tools/types';
 export const compareExtensions: Comparer<DatabaseExtension> = {
   onMissing: (source) => [
     {
-      type: 'extension.create',
+      type: 'ExtensionCreate',
       extension: source,
       reason: Reason.MissingInTarget,
     },
   ],
   onExtra: (target) => [
     {
-      type: 'extension.drop',
+      type: 'ExtensionDrop',
       extensionName: target.name,
       reason: Reason.MissingInSource,
     },
diff --git a/server/src/sql-tools/diff/comparers/function.comparer.spec.ts b/server/src/sql-tools/comparers/function.comparer.spec.ts
similarity index 88%
rename from server/src/sql-tools/diff/comparers/function.comparer.spec.ts
rename to server/src/sql-tools/comparers/function.comparer.spec.ts
index ac478ed000..964768cf98 100644
--- a/server/src/sql-tools/diff/comparers/function.comparer.spec.ts
+++ b/server/src/sql-tools/comparers/function.comparer.spec.ts
@@ -1,4 +1,4 @@
-import { compareFunctions } from 'src/sql-tools/diff/comparers/function.comparer';
+import { compareFunctions } from 'src/sql-tools/comparers/function.comparer';
 import { DatabaseFunction, Reason } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
@@ -14,7 +14,7 @@ describe('compareFunctions', () => {
       expect(compareFunctions.onExtra(testFunction)).toEqual([
         {
           functionName: 'test',
-          type: 'function.drop',
+          type: 'FunctionDrop',
           reason: Reason.MissingInSource,
         },
       ]);
@@ -25,7 +25,7 @@ describe('compareFunctions', () => {
     it('should work', () => {
       expect(compareFunctions.onMissing(testFunction)).toEqual([
         {
-          type: 'function.create',
+          type: 'FunctionCreate',
           function: testFunction,
           reason: Reason.MissingInTarget,
         },
@@ -43,7 +43,7 @@ describe('compareFunctions', () => {
       const target: DatabaseFunction = { ...testFunction, expression: 'SELECT 2' };
       expect(compareFunctions.onCompare(source, target)).toEqual([
         {
-          type: 'function.create',
+          type: 'FunctionCreate',
           reason: 'function expression has changed (SELECT 1 vs SELECT 2)',
           function: source,
         },
diff --git a/server/src/sql-tools/diff/comparers/function.comparer.ts b/server/src/sql-tools/comparers/function.comparer.ts
similarity index 87%
rename from server/src/sql-tools/diff/comparers/function.comparer.ts
rename to server/src/sql-tools/comparers/function.comparer.ts
index d10353b89c..000cf07058 100644
--- a/server/src/sql-tools/diff/comparers/function.comparer.ts
+++ b/server/src/sql-tools/comparers/function.comparer.ts
@@ -3,14 +3,14 @@ import { Comparer, DatabaseFunction, Reason } from 'src/sql-tools/types';
 export const compareFunctions: Comparer<DatabaseFunction> = {
   onMissing: (source) => [
     {
-      type: 'function.create',
+      type: 'FunctionCreate',
       function: source,
       reason: Reason.MissingInTarget,
     },
   ],
   onExtra: (target) => [
     {
-      type: 'function.drop',
+      type: 'FunctionDrop',
       functionName: target.name,
       reason: Reason.MissingInSource,
     },
@@ -20,7 +20,7 @@ export const compareFunctions: Comparer<DatabaseFunction> = {
       const reason = `function expression has changed (${source.expression} vs ${target.expression})`;
       return [
         {
-          type: 'function.create',
+          type: 'FunctionCreate',
           function: source,
           reason,
         },
diff --git a/server/src/sql-tools/diff/comparers/index.comparer.spec.ts b/server/src/sql-tools/comparers/index.comparer.spec.ts
similarity index 89%
rename from server/src/sql-tools/diff/comparers/index.comparer.spec.ts
rename to server/src/sql-tools/comparers/index.comparer.spec.ts
index 806bab190c..b00be386e0 100644
--- a/server/src/sql-tools/diff/comparers/index.comparer.spec.ts
+++ b/server/src/sql-tools/comparers/index.comparer.spec.ts
@@ -1,4 +1,4 @@
-import { compareIndexes } from 'src/sql-tools/diff/comparers/index.comparer';
+import { compareIndexes } from 'src/sql-tools/comparers/index.comparer';
 import { DatabaseIndex, Reason } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
@@ -15,7 +15,7 @@ describe('compareIndexes', () => {
     it('should work', () => {
       expect(compareIndexes.onExtra(testIndex)).toEqual([
         {
-          type: 'index.drop',
+          type: 'IndexDrop',
           indexName: 'test',
           reason: Reason.MissingInSource,
         },
@@ -27,7 +27,7 @@ describe('compareIndexes', () => {
     it('should work', () => {
       expect(compareIndexes.onMissing(testIndex)).toEqual([
         {
-          type: 'index.create',
+          type: 'IndexCreate',
           index: testIndex,
           reason: Reason.MissingInTarget,
         },
@@ -58,11 +58,11 @@ describe('compareIndexes', () => {
       expect(compareIndexes.onCompare(source, target)).toEqual([
         {
           indexName: 'test',
-          type: 'index.drop',
+          type: 'IndexDrop',
           reason: 'columns are different (column1 vs column1,column2)',
         },
         {
-          type: 'index.create',
+          type: 'IndexCreate',
           index: source,
           reason: 'columns are different (column1 vs column1,column2)',
         },
diff --git a/server/src/sql-tools/diff/comparers/index.comparer.ts b/server/src/sql-tools/comparers/index.comparer.ts
similarity index 88%
rename from server/src/sql-tools/diff/comparers/index.comparer.ts
rename to server/src/sql-tools/comparers/index.comparer.ts
index ef07e3a17b..99571cf61a 100644
--- a/server/src/sql-tools/diff/comparers/index.comparer.ts
+++ b/server/src/sql-tools/comparers/index.comparer.ts
@@ -4,14 +4,14 @@ import { Comparer, DatabaseIndex, Reason } from 'src/sql-tools/types';
 export const compareIndexes: Comparer<DatabaseIndex> = {
   onMissing: (source) => [
     {
-      type: 'index.create',
+      type: 'IndexCreate',
       index: source,
       reason: Reason.MissingInTarget,
     },
   ],
   onExtra: (target) => [
     {
-      type: 'index.drop',
+      type: 'IndexDrop',
       indexName: target.name,
       reason: Reason.MissingInSource,
     },
@@ -36,8 +36,8 @@ export const compareIndexes: Comparer<DatabaseIndex> = {
 
     if (reason) {
       return [
-        { type: 'index.drop', indexName: target.name, reason },
-        { type: 'index.create', index: source, reason },
+        { type: 'IndexDrop', indexName: target.name, reason },
+        { type: 'IndexCreate', index: source, reason },
       ];
     }
 
diff --git a/server/src/sql-tools/diff/comparers/parameter.comparer.spec.ts b/server/src/sql-tools/comparers/parameter.comparer.spec.ts
similarity index 86%
rename from server/src/sql-tools/diff/comparers/parameter.comparer.spec.ts
rename to server/src/sql-tools/comparers/parameter.comparer.spec.ts
index 517ec79341..cd1520faff 100644
--- a/server/src/sql-tools/diff/comparers/parameter.comparer.spec.ts
+++ b/server/src/sql-tools/comparers/parameter.comparer.spec.ts
@@ -1,4 +1,4 @@
-import { compareParameters } from 'src/sql-tools/diff/comparers/parameter.comparer';
+import { compareParameters } from 'src/sql-tools/comparers/parameter.comparer';
 import { DatabaseParameter, Reason } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
@@ -15,7 +15,7 @@ describe('compareParameters', () => {
     it('should work', () => {
       expect(compareParameters.onExtra(testParameter)).toEqual([
         {
-          type: 'parameter.reset',
+          type: 'ParameterReset',
           databaseName: 'immich',
           parameterName: 'test',
           reason: Reason.MissingInSource,
@@ -28,7 +28,7 @@ describe('compareParameters', () => {
     it('should work', () => {
       expect(compareParameters.onMissing(testParameter)).toEqual([
         {
-          type: 'parameter.set',
+          type: 'ParameterSet',
           parameter: testParameter,
           reason: Reason.MissingInTarget,
         },
diff --git a/server/src/sql-tools/diff/comparers/parameter.comparer.ts b/server/src/sql-tools/comparers/parameter.comparer.ts
similarity index 88%
rename from server/src/sql-tools/diff/comparers/parameter.comparer.ts
rename to server/src/sql-tools/comparers/parameter.comparer.ts
index 03c24bada7..d1a33ad090 100644
--- a/server/src/sql-tools/diff/comparers/parameter.comparer.ts
+++ b/server/src/sql-tools/comparers/parameter.comparer.ts
@@ -3,14 +3,14 @@ import { Comparer, DatabaseParameter, Reason } from 'src/sql-tools/types';
 export const compareParameters: Comparer<DatabaseParameter> = {
   onMissing: (source) => [
     {
-      type: 'parameter.set',
+      type: 'ParameterSet',
       parameter: source,
       reason: Reason.MissingInTarget,
     },
   ],
   onExtra: (target) => [
     {
-      type: 'parameter.reset',
+      type: 'ParameterReset',
       databaseName: target.databaseName,
       parameterName: target.name,
       reason: Reason.MissingInSource,
diff --git a/server/src/sql-tools/diff/comparers/table.comparer.spec.ts b/server/src/sql-tools/comparers/table.comparer.spec.ts
similarity index 86%
rename from server/src/sql-tools/diff/comparers/table.comparer.spec.ts
rename to server/src/sql-tools/comparers/table.comparer.spec.ts
index 0b1873b2ba..575e25ab44 100644
--- a/server/src/sql-tools/diff/comparers/table.comparer.spec.ts
+++ b/server/src/sql-tools/comparers/table.comparer.spec.ts
@@ -1,4 +1,4 @@
-import { compareTables } from 'src/sql-tools/diff/comparers/table.comparer';
+import { compareTables } from 'src/sql-tools/comparers/table.comparer';
 import { DatabaseTable, Reason } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
@@ -16,7 +16,7 @@ describe('compareParameters', () => {
     it('should work', () => {
       expect(compareTables.onExtra(testTable)).toEqual([
         {
-          type: 'table.drop',
+          type: 'TableDrop',
           tableName: 'test',
           reason: Reason.MissingInSource,
         },
@@ -28,7 +28,7 @@ describe('compareParameters', () => {
     it('should work', () => {
       expect(compareTables.onMissing(testTable)).toEqual([
         {
-          type: 'table.create',
+          type: 'TableCreate',
           table: testTable,
           reason: Reason.MissingInTarget,
         },
diff --git a/server/src/sql-tools/diff/comparers/table.comparer.ts b/server/src/sql-tools/comparers/table.comparer.ts
similarity index 54%
rename from server/src/sql-tools/diff/comparers/table.comparer.ts
rename to server/src/sql-tools/comparers/table.comparer.ts
index 8f6d0e04f8..c920a1d07a 100644
--- a/server/src/sql-tools/diff/comparers/table.comparer.ts
+++ b/server/src/sql-tools/comparers/table.comparer.ts
@@ -1,47 +1,33 @@
-import { compareColumns } from 'src/sql-tools/diff/comparers/column.comparer';
-import { compareConstraints } from 'src/sql-tools/diff/comparers/constraint.comparer';
-import { compareIndexes } from 'src/sql-tools/diff/comparers/index.comparer';
-import { compareTriggers } from 'src/sql-tools/diff/comparers/trigger.comparer';
+import { compareColumns } from 'src/sql-tools/comparers/column.comparer';
+import { compareConstraints } from 'src/sql-tools/comparers/constraint.comparer';
+import { compareIndexes } from 'src/sql-tools/comparers/index.comparer';
+import { compareTriggers } from 'src/sql-tools/comparers/trigger.comparer';
 import { compare } from 'src/sql-tools/helpers';
 import { Comparer, DatabaseTable, Reason, SchemaDiff } from 'src/sql-tools/types';
 
+const newTable = (name: string) => ({
+  name,
+  columns: [],
+  indexes: [],
+  constraints: [],
+  triggers: [],
+  synchronize: true,
+});
+
 export const compareTables: Comparer<DatabaseTable> = {
   onMissing: (source) => [
     {
-      type: 'table.create',
+      type: 'TableCreate',
       table: source,
       reason: Reason.MissingInTarget,
     },
     // TODO merge constraints into table create record when possible
-    ...compareTable(
-      source,
-      {
-        name: source.name,
-        columns: [],
-        indexes: [],
-        constraints: [],
-        triggers: [],
-        synchronize: true,
-      },
-
-      { columns: false },
-    ),
+    ...compareTable(source, newTable(source.name), { columns: false }),
   ],
   onExtra: (target) => [
-    ...compareTable(
-      {
-        name: target.name,
-        columns: [],
-        indexes: [],
-        constraints: [],
-        triggers: [],
-        synchronize: true,
-      },
-      target,
-      { columns: false },
-    ),
+    ...compareTable(newTable(target.name), target, { columns: false }),
     {
-      type: 'table.drop',
+      type: 'TableDrop',
       tableName: target.name,
       reason: Reason.MissingInSource,
     },
diff --git a/server/src/sql-tools/diff/comparers/trigger.comparer.spec.ts b/server/src/sql-tools/comparers/trigger.comparer.spec.ts
similarity index 87%
rename from server/src/sql-tools/diff/comparers/trigger.comparer.spec.ts
rename to server/src/sql-tools/comparers/trigger.comparer.spec.ts
index 800cb4d66b..731fae8da2 100644
--- a/server/src/sql-tools/diff/comparers/trigger.comparer.spec.ts
+++ b/server/src/sql-tools/comparers/trigger.comparer.spec.ts
@@ -1,4 +1,4 @@
-import { compareTriggers } from 'src/sql-tools/diff/comparers/trigger.comparer';
+import { compareTriggers } from 'src/sql-tools/comparers/trigger.comparer';
 import { DatabaseTrigger, Reason } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
@@ -17,7 +17,7 @@ describe('compareTriggers', () => {
     it('should work', () => {
       expect(compareTriggers.onExtra(testTrigger)).toEqual([
         {
-          type: 'trigger.drop',
+          type: 'TriggerDrop',
           tableName: 'table1',
           triggerName: 'test',
           reason: Reason.MissingInSource,
@@ -30,7 +30,7 @@ describe('compareTriggers', () => {
     it('should work', () => {
       expect(compareTriggers.onMissing(testTrigger)).toEqual([
         {
-          type: 'trigger.create',
+          type: 'TriggerCreate',
           trigger: testTrigger,
           reason: Reason.MissingInTarget,
         },
@@ -47,42 +47,42 @@ describe('compareTriggers', () => {
       const source: DatabaseTrigger = { ...testTrigger, functionName: 'my_new_name' };
       const target: DatabaseTrigger = { ...testTrigger, functionName: 'my_old_name' };
       const reason = `function is different (my_new_name vs my_old_name)`;
-      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'trigger.create', trigger: source, reason }]);
+      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'TriggerCreate', trigger: source, reason }]);
     });
 
     it('should detect a change in actions', () => {
       const source: DatabaseTrigger = { ...testTrigger, actions: ['delete'] };
       const target: DatabaseTrigger = { ...testTrigger, actions: ['delete', 'insert'] };
       const reason = `action is different (delete vs delete,insert)`;
-      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'trigger.create', trigger: source, reason }]);
+      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'TriggerCreate', trigger: source, reason }]);
     });
 
     it('should detect a change in timing', () => {
       const source: DatabaseTrigger = { ...testTrigger, timing: 'before' };
       const target: DatabaseTrigger = { ...testTrigger, timing: 'after' };
       const reason = `timing method is different (before vs after)`;
-      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'trigger.create', trigger: source, reason }]);
+      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'TriggerCreate', trigger: source, reason }]);
     });
 
     it('should detect a change in scope', () => {
       const source: DatabaseTrigger = { ...testTrigger, scope: 'row' };
       const target: DatabaseTrigger = { ...testTrigger, scope: 'statement' };
       const reason = `scope is different (row vs statement)`;
-      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'trigger.create', trigger: source, reason }]);
+      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'TriggerCreate', trigger: source, reason }]);
     });
 
     it('should detect a change in new table reference', () => {
       const source: DatabaseTrigger = { ...testTrigger, referencingNewTableAs: 'new_table' };
       const target: DatabaseTrigger = { ...testTrigger, referencingNewTableAs: undefined };
       const reason = `new table reference is different (new_table vs undefined)`;
-      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'trigger.create', trigger: source, reason }]);
+      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'TriggerCreate', trigger: source, reason }]);
     });
 
     it('should detect a change in old table reference', () => {
       const source: DatabaseTrigger = { ...testTrigger, referencingOldTableAs: 'old_table' };
       const target: DatabaseTrigger = { ...testTrigger, referencingOldTableAs: undefined };
       const reason = `old table reference is different (old_table vs undefined)`;
-      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'trigger.create', trigger: source, reason }]);
+      expect(compareTriggers.onCompare(source, target)).toEqual([{ type: 'TriggerCreate', trigger: source, reason }]);
     });
   });
 });
diff --git a/server/src/sql-tools/diff/comparers/trigger.comparer.ts b/server/src/sql-tools/comparers/trigger.comparer.ts
similarity index 92%
rename from server/src/sql-tools/diff/comparers/trigger.comparer.ts
rename to server/src/sql-tools/comparers/trigger.comparer.ts
index 38adae9905..da1de6e48b 100644
--- a/server/src/sql-tools/diff/comparers/trigger.comparer.ts
+++ b/server/src/sql-tools/comparers/trigger.comparer.ts
@@ -3,14 +3,14 @@ import { Comparer, DatabaseTrigger, Reason } from 'src/sql-tools/types';
 export const compareTriggers: Comparer<DatabaseTrigger> = {
   onMissing: (source) => [
     {
-      type: 'trigger.create',
+      type: 'TriggerCreate',
       trigger: source,
       reason: Reason.MissingInTarget,
     },
   ],
   onExtra: (target) => [
     {
-      type: 'trigger.drop',
+      type: 'TriggerDrop',
       tableName: target.tableName,
       triggerName: target.name,
       reason: Reason.MissingInSource,
@@ -33,7 +33,7 @@ export const compareTriggers: Comparer<DatabaseTrigger> = {
     }
 
     if (reason) {
-      return [{ type: 'trigger.create', trigger: source, reason }];
+      return [{ type: 'TriggerCreate', trigger: source, reason }];
     }
 
     return [];
diff --git a/server/src/sql-tools/from-code/decorators/after-delete.decorator.ts b/server/src/sql-tools/decorators/after-delete.decorator.ts
similarity index 81%
rename from server/src/sql-tools/from-code/decorators/after-delete.decorator.ts
rename to server/src/sql-tools/decorators/after-delete.decorator.ts
index 7713c4b625..181bfab6c8 100644
--- a/server/src/sql-tools/from-code/decorators/after-delete.decorator.ts
+++ b/server/src/sql-tools/decorators/after-delete.decorator.ts
@@ -1,4 +1,4 @@
-import { TriggerFunction, TriggerFunctionOptions } from 'src/sql-tools/from-code/decorators/trigger-function.decorator';
+import { TriggerFunction, TriggerFunctionOptions } from 'src/sql-tools/decorators/trigger-function.decorator';
 
 export const AfterDeleteTrigger = (options: Omit<TriggerFunctionOptions, 'timing' | 'actions'>) =>
   TriggerFunction({
diff --git a/server/src/sql-tools/from-code/decorators/after-insert.decorator.ts b/server/src/sql-tools/decorators/after-insert.decorator.ts
similarity index 81%
rename from server/src/sql-tools/from-code/decorators/after-insert.decorator.ts
rename to server/src/sql-tools/decorators/after-insert.decorator.ts
index 103d59b4fc..c302a5cebe 100644
--- a/server/src/sql-tools/from-code/decorators/after-insert.decorator.ts
+++ b/server/src/sql-tools/decorators/after-insert.decorator.ts
@@ -1,4 +1,4 @@
-import { TriggerFunction, TriggerFunctionOptions } from 'src/sql-tools/from-code/decorators/trigger-function.decorator';
+import { TriggerFunction, TriggerFunctionOptions } from 'src/sql-tools/decorators/trigger-function.decorator';
 
 export const AfterInsertTrigger = (options: Omit<TriggerFunctionOptions, 'timing' | 'actions'>) =>
   TriggerFunction({
diff --git a/server/src/sql-tools/from-code/decorators/before-update.decorator.ts b/server/src/sql-tools/decorators/before-update.decorator.ts
similarity index 81%
rename from server/src/sql-tools/from-code/decorators/before-update.decorator.ts
rename to server/src/sql-tools/decorators/before-update.decorator.ts
index 03dad25ed0..2119e29c9b 100644
--- a/server/src/sql-tools/from-code/decorators/before-update.decorator.ts
+++ b/server/src/sql-tools/decorators/before-update.decorator.ts
@@ -1,4 +1,4 @@
-import { TriggerFunction, TriggerFunctionOptions } from 'src/sql-tools/from-code/decorators/trigger-function.decorator';
+import { TriggerFunction, TriggerFunctionOptions } from 'src/sql-tools/decorators/trigger-function.decorator';
 
 export const BeforeUpdateTrigger = (options: Omit<TriggerFunctionOptions, 'timing' | 'actions'>) =>
   TriggerFunction({
diff --git a/server/src/sql-tools/from-code/decorators/check.decorator.ts b/server/src/sql-tools/decorators/check.decorator.ts
similarity index 84%
rename from server/src/sql-tools/from-code/decorators/check.decorator.ts
rename to server/src/sql-tools/decorators/check.decorator.ts
index 7d046df0c3..56fe1ecc3f 100644
--- a/server/src/sql-tools/from-code/decorators/check.decorator.ts
+++ b/server/src/sql-tools/decorators/check.decorator.ts
@@ -1,4 +1,4 @@
-import { register } from 'src/sql-tools/from-code/register';
+import { register } from 'src/sql-tools/register';
 
 export type CheckOptions = {
   name?: string;
diff --git a/server/src/sql-tools/from-code/decorators/column.decorator.ts b/server/src/sql-tools/decorators/column.decorator.ts
similarity index 93%
rename from server/src/sql-tools/from-code/decorators/column.decorator.ts
rename to server/src/sql-tools/decorators/column.decorator.ts
index 7b00af80cc..adb3d0ed59 100644
--- a/server/src/sql-tools/from-code/decorators/column.decorator.ts
+++ b/server/src/sql-tools/decorators/column.decorator.ts
@@ -1,5 +1,5 @@
-import { register } from 'src/sql-tools/from-code/register';
 import { asOptions } from 'src/sql-tools/helpers';
+import { register } from 'src/sql-tools/register';
 import { ColumnStorage, ColumnType, DatabaseEnum } from 'src/sql-tools/types';
 
 export type ColumnValue = null | boolean | string | number | object | Date | (() => string);
diff --git a/server/src/sql-tools/from-code/decorators/configuration-parameter.decorator.ts b/server/src/sql-tools/decorators/configuration-parameter.decorator.ts
similarity index 76%
rename from server/src/sql-tools/from-code/decorators/configuration-parameter.decorator.ts
rename to server/src/sql-tools/decorators/configuration-parameter.decorator.ts
index 6a987884d1..953027d25c 100644
--- a/server/src/sql-tools/from-code/decorators/configuration-parameter.decorator.ts
+++ b/server/src/sql-tools/decorators/configuration-parameter.decorator.ts
@@ -1,5 +1,5 @@
-import { ColumnValue } from 'src/sql-tools/from-code/decorators/column.decorator';
-import { register } from 'src/sql-tools/from-code/register';
+import { ColumnValue } from 'src/sql-tools/decorators/column.decorator';
+import { register } from 'src/sql-tools/register';
 import { ParameterScope } from 'src/sql-tools/types';
 
 export type ConfigurationParameterOptions = {
diff --git a/server/src/sql-tools/from-code/decorators/create-date-column.decorator.ts b/server/src/sql-tools/decorators/create-date-column.decorator.ts
similarity index 67%
rename from server/src/sql-tools/from-code/decorators/create-date-column.decorator.ts
rename to server/src/sql-tools/decorators/create-date-column.decorator.ts
index 8f81d59914..1a3362a614 100644
--- a/server/src/sql-tools/from-code/decorators/create-date-column.decorator.ts
+++ b/server/src/sql-tools/decorators/create-date-column.decorator.ts
@@ -1,4 +1,4 @@
-import { Column, ColumnOptions } from 'src/sql-tools/from-code/decorators/column.decorator';
+import { Column, ColumnOptions } from 'src/sql-tools/decorators/column.decorator';
 
 export const CreateDateColumn = (options: ColumnOptions = {}): PropertyDecorator => {
   return Column({
diff --git a/server/src/sql-tools/from-code/decorators/database.decorator.ts b/server/src/sql-tools/decorators/database.decorator.ts
similarity index 84%
rename from server/src/sql-tools/from-code/decorators/database.decorator.ts
rename to server/src/sql-tools/decorators/database.decorator.ts
index 3bcc464f74..17b2460df6 100644
--- a/server/src/sql-tools/from-code/decorators/database.decorator.ts
+++ b/server/src/sql-tools/decorators/database.decorator.ts
@@ -1,4 +1,4 @@
-import { register } from 'src/sql-tools/from-code/register';
+import { register } from 'src/sql-tools/register';
 
 export type DatabaseOptions = {
   name?: string;
diff --git a/server/src/sql-tools/from-code/decorators/delete-date-column.decorator.ts b/server/src/sql-tools/decorators/delete-date-column.decorator.ts
similarity index 66%
rename from server/src/sql-tools/from-code/decorators/delete-date-column.decorator.ts
rename to server/src/sql-tools/decorators/delete-date-column.decorator.ts
index 518c4e76fc..ca5427c27f 100644
--- a/server/src/sql-tools/from-code/decorators/delete-date-column.decorator.ts
+++ b/server/src/sql-tools/decorators/delete-date-column.decorator.ts
@@ -1,4 +1,4 @@
-import { Column, ColumnOptions } from 'src/sql-tools/from-code/decorators/column.decorator';
+import { Column, ColumnOptions } from 'src/sql-tools/decorators/column.decorator';
 
 export const DeleteDateColumn = (options: ColumnOptions = {}): PropertyDecorator => {
   return Column({
diff --git a/server/src/sql-tools/from-code/decorators/extension.decorator.ts b/server/src/sql-tools/decorators/extension.decorator.ts
similarity index 86%
rename from server/src/sql-tools/from-code/decorators/extension.decorator.ts
rename to server/src/sql-tools/decorators/extension.decorator.ts
index c43a18c16f..d431cbfd02 100644
--- a/server/src/sql-tools/from-code/decorators/extension.decorator.ts
+++ b/server/src/sql-tools/decorators/extension.decorator.ts
@@ -1,5 +1,5 @@
-import { register } from 'src/sql-tools/from-code/register';
 import { asOptions } from 'src/sql-tools/helpers';
+import { register } from 'src/sql-tools/register';
 
 export type ExtensionOptions = {
   name: string;
diff --git a/server/src/sql-tools/from-code/decorators/extensions.decorator.ts b/server/src/sql-tools/decorators/extensions.decorator.ts
similarity index 88%
rename from server/src/sql-tools/from-code/decorators/extensions.decorator.ts
rename to server/src/sql-tools/decorators/extensions.decorator.ts
index 9d3769a210..724446c5fa 100644
--- a/server/src/sql-tools/from-code/decorators/extensions.decorator.ts
+++ b/server/src/sql-tools/decorators/extensions.decorator.ts
@@ -1,5 +1,5 @@
-import { register } from 'src/sql-tools/from-code/register';
 import { asOptions } from 'src/sql-tools/helpers';
+import { register } from 'src/sql-tools/register';
 
 export type ExtensionsOptions = {
   name: string;
diff --git a/server/src/sql-tools/decorators/foreign-key-column.decorator.ts b/server/src/sql-tools/decorators/foreign-key-column.decorator.ts
new file mode 100644
index 0000000000..c9c83f010d
--- /dev/null
+++ b/server/src/sql-tools/decorators/foreign-key-column.decorator.ts
@@ -0,0 +1,16 @@
+/* eslint-disable @typescript-eslint/no-unsafe-function-type */
+import { ForeignKeyAction } from 'src/sql-tools//decorators/foreign-key-constraint.decorator';
+import { ColumnBaseOptions } from 'src/sql-tools/decorators/column.decorator';
+import { register } from 'src/sql-tools/register';
+
+export type ForeignKeyColumnOptions = ColumnBaseOptions & {
+  onUpdate?: ForeignKeyAction;
+  onDelete?: ForeignKeyAction;
+  constraintName?: string;
+};
+
+export const ForeignKeyColumn = (target: () => Function, options: ForeignKeyColumnOptions): PropertyDecorator => {
+  return (object: object, propertyName: string | symbol) => {
+    register({ type: 'foreignKeyColumn', item: { object, propertyName, options, target } });
+  };
+};
diff --git a/server/src/sql-tools/from-code/decorators/foreign-key-constraint.decorator.ts b/server/src/sql-tools/decorators/foreign-key-constraint.decorator.ts
similarity index 92%
rename from server/src/sql-tools/from-code/decorators/foreign-key-constraint.decorator.ts
rename to server/src/sql-tools/decorators/foreign-key-constraint.decorator.ts
index 7d18a9fda0..e5d2f513dc 100644
--- a/server/src/sql-tools/from-code/decorators/foreign-key-constraint.decorator.ts
+++ b/server/src/sql-tools/decorators/foreign-key-constraint.decorator.ts
@@ -1,4 +1,4 @@
-import { register } from 'src/sql-tools/from-code/register';
+import { register } from 'src/sql-tools/register';
 
 export type ForeignKeyAction = 'CASCADE' | 'SET NULL' | 'SET DEFAULT' | 'RESTRICT' | 'NO ACTION';
 
diff --git a/server/src/sql-tools/from-code/decorators/generated-column.decorator.ts b/server/src/sql-tools/decorators/generated-column.decorator.ts
similarity index 95%
rename from server/src/sql-tools/from-code/decorators/generated-column.decorator.ts
rename to server/src/sql-tools/decorators/generated-column.decorator.ts
index 82d3131b5c..4338b4146c 100644
--- a/server/src/sql-tools/from-code/decorators/generated-column.decorator.ts
+++ b/server/src/sql-tools/decorators/generated-column.decorator.ts
@@ -1,4 +1,4 @@
-import { Column, ColumnOptions, ColumnValue } from 'src/sql-tools/from-code/decorators/column.decorator';
+import { Column, ColumnOptions, ColumnValue } from 'src/sql-tools/decorators/column.decorator';
 import { ColumnType } from 'src/sql-tools/types';
 
 export type GeneratedColumnStrategy = 'uuid' | 'identity';
diff --git a/server/src/sql-tools/from-code/decorators/index.decorator.ts b/server/src/sql-tools/decorators/index.decorator.ts
similarity index 89%
rename from server/src/sql-tools/from-code/decorators/index.decorator.ts
rename to server/src/sql-tools/decorators/index.decorator.ts
index 5d90c4f58d..1b6d38e390 100644
--- a/server/src/sql-tools/from-code/decorators/index.decorator.ts
+++ b/server/src/sql-tools/decorators/index.decorator.ts
@@ -1,5 +1,5 @@
-import { register } from 'src/sql-tools/from-code/register';
 import { asOptions } from 'src/sql-tools/helpers';
+import { register } from 'src/sql-tools/register';
 
 export type IndexOptions = {
   name?: string;
diff --git a/server/src/sql-tools/decorators/index.ts b/server/src/sql-tools/decorators/index.ts
new file mode 100644
index 0000000000..86affe5002
--- /dev/null
+++ b/server/src/sql-tools/decorators/index.ts
@@ -0,0 +1,22 @@
+export * from 'src/sql-tools/decorators/after-delete.decorator';
+export * from 'src/sql-tools/decorators/after-insert.decorator';
+export * from 'src/sql-tools/decorators/before-update.decorator';
+export * from 'src/sql-tools/decorators/check.decorator';
+export * from 'src/sql-tools/decorators/column.decorator';
+export * from 'src/sql-tools/decorators/configuration-parameter.decorator';
+export * from 'src/sql-tools/decorators/create-date-column.decorator';
+export * from 'src/sql-tools/decorators/database.decorator';
+export * from 'src/sql-tools/decorators/delete-date-column.decorator';
+export * from 'src/sql-tools/decorators/extension.decorator';
+export * from 'src/sql-tools/decorators/extensions.decorator';
+export * from 'src/sql-tools/decorators/foreign-key-column.decorator';
+export * from 'src/sql-tools/decorators/foreign-key-constraint.decorator';
+export * from 'src/sql-tools/decorators/generated-column.decorator';
+export * from 'src/sql-tools/decorators/index.decorator';
+export * from 'src/sql-tools/decorators/primary-column.decorator';
+export * from 'src/sql-tools/decorators/primary-generated-column.decorator';
+export * from 'src/sql-tools/decorators/table.decorator';
+export * from 'src/sql-tools/decorators/trigger-function.decorator';
+export * from 'src/sql-tools/decorators/trigger.decorator';
+export * from 'src/sql-tools/decorators/unique.decorator';
+export * from 'src/sql-tools/decorators/update-date-column.decorator';
diff --git a/server/src/sql-tools/from-code/decorators/primary-column.decorator.ts b/server/src/sql-tools/decorators/primary-column.decorator.ts
similarity index 56%
rename from server/src/sql-tools/from-code/decorators/primary-column.decorator.ts
rename to server/src/sql-tools/decorators/primary-column.decorator.ts
index f702965675..e605b4be5d 100644
--- a/server/src/sql-tools/from-code/decorators/primary-column.decorator.ts
+++ b/server/src/sql-tools/decorators/primary-column.decorator.ts
@@ -1,3 +1,3 @@
-import { Column, ColumnOptions } from 'src/sql-tools/from-code/decorators/column.decorator';
+import { Column, ColumnOptions } from 'src/sql-tools/decorators/column.decorator';
 
 export const PrimaryColumn = (options: Omit<ColumnOptions, 'primary'> = {}) => Column({ ...options, primary: true });
diff --git a/server/src/sql-tools/from-code/decorators/primary-generated-column.decorator.ts b/server/src/sql-tools/decorators/primary-generated-column.decorator.ts
similarity index 79%
rename from server/src/sql-tools/from-code/decorators/primary-generated-column.decorator.ts
rename to server/src/sql-tools/decorators/primary-generated-column.decorator.ts
index 9dc8ca6817..25e125ebf6 100644
--- a/server/src/sql-tools/from-code/decorators/primary-generated-column.decorator.ts
+++ b/server/src/sql-tools/decorators/primary-generated-column.decorator.ts
@@ -1,4 +1,4 @@
-import { GenerateColumnOptions, GeneratedColumn } from 'src/sql-tools/from-code/decorators/generated-column.decorator';
+import { GenerateColumnOptions, GeneratedColumn } from 'src/sql-tools/decorators/generated-column.decorator';
 
 export const PrimaryGeneratedColumn = (options: Omit<GenerateColumnOptions, 'primary'> = {}) =>
   GeneratedColumn({ ...options, primary: true });
diff --git a/server/src/sql-tools/from-code/decorators/table.decorator.ts b/server/src/sql-tools/decorators/table.decorator.ts
similarity index 88%
rename from server/src/sql-tools/from-code/decorators/table.decorator.ts
rename to server/src/sql-tools/decorators/table.decorator.ts
index 589a88aa29..7ea5882147 100644
--- a/server/src/sql-tools/from-code/decorators/table.decorator.ts
+++ b/server/src/sql-tools/decorators/table.decorator.ts
@@ -1,5 +1,5 @@
-import { register } from 'src/sql-tools/from-code/register';
 import { asOptions } from 'src/sql-tools/helpers';
+import { register } from 'src/sql-tools/register';
 
 export type TableOptions = {
   name?: string;
diff --git a/server/src/sql-tools/from-code/decorators/trigger-function.decorator.ts b/server/src/sql-tools/decorators/trigger-function.decorator.ts
similarity index 78%
rename from server/src/sql-tools/from-code/decorators/trigger-function.decorator.ts
rename to server/src/sql-tools/decorators/trigger-function.decorator.ts
index cb2fa36800..17016f7946 100644
--- a/server/src/sql-tools/from-code/decorators/trigger-function.decorator.ts
+++ b/server/src/sql-tools/decorators/trigger-function.decorator.ts
@@ -1,4 +1,4 @@
-import { Trigger, TriggerOptions } from 'src/sql-tools/from-code/decorators/trigger.decorator';
+import { Trigger, TriggerOptions } from 'src/sql-tools/decorators/trigger.decorator';
 import { DatabaseFunction } from 'src/sql-tools/types';
 
 export type TriggerFunctionOptions = Omit<TriggerOptions, 'functionName'> & { function: DatabaseFunction };
diff --git a/server/src/sql-tools/from-code/decorators/trigger.decorator.ts b/server/src/sql-tools/decorators/trigger.decorator.ts
similarity index 90%
rename from server/src/sql-tools/from-code/decorators/trigger.decorator.ts
rename to server/src/sql-tools/decorators/trigger.decorator.ts
index e0c0ccf3e4..ce9a5c17f7 100644
--- a/server/src/sql-tools/from-code/decorators/trigger.decorator.ts
+++ b/server/src/sql-tools/decorators/trigger.decorator.ts
@@ -1,4 +1,4 @@
-import { register } from 'src/sql-tools/from-code/register';
+import { register } from 'src/sql-tools/register';
 import { TriggerAction, TriggerScope, TriggerTiming } from 'src/sql-tools/types';
 
 export type TriggerOptions = {
diff --git a/server/src/sql-tools/from-code/decorators/unique.decorator.ts b/server/src/sql-tools/decorators/unique.decorator.ts
similarity index 84%
rename from server/src/sql-tools/from-code/decorators/unique.decorator.ts
rename to server/src/sql-tools/decorators/unique.decorator.ts
index c7186d7296..1f61fccb6f 100644
--- a/server/src/sql-tools/from-code/decorators/unique.decorator.ts
+++ b/server/src/sql-tools/decorators/unique.decorator.ts
@@ -1,4 +1,4 @@
-import { register } from 'src/sql-tools/from-code/register';
+import { register } from 'src/sql-tools/register';
 
 export type UniqueOptions = {
   name?: string;
diff --git a/server/src/sql-tools/from-code/decorators/update-date-column.decorator.ts b/server/src/sql-tools/decorators/update-date-column.decorator.ts
similarity index 67%
rename from server/src/sql-tools/from-code/decorators/update-date-column.decorator.ts
rename to server/src/sql-tools/decorators/update-date-column.decorator.ts
index ddc7a6a1e8..68dd50c617 100644
--- a/server/src/sql-tools/from-code/decorators/update-date-column.decorator.ts
+++ b/server/src/sql-tools/decorators/update-date-column.decorator.ts
@@ -1,4 +1,4 @@
-import { Column, ColumnOptions } from 'src/sql-tools/from-code/decorators/column.decorator';
+import { Column, ColumnOptions } from 'src/sql-tools/decorators/column.decorator';
 
 export const UpdateDateColumn = (options: ColumnOptions = {}): PropertyDecorator => {
   return Column({
diff --git a/server/src/sql-tools/diff/index.ts b/server/src/sql-tools/diff/index.ts
deleted file mode 100644
index dd90293dc3..0000000000
--- a/server/src/sql-tools/diff/index.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { compareEnums } from 'src/sql-tools/diff/comparers/enum.comparer';
-import { compareExtensions } from 'src/sql-tools/diff/comparers/extension.comparer';
-import { compareFunctions } from 'src/sql-tools/diff/comparers/function.comparer';
-import { compareParameters } from 'src/sql-tools/diff/comparers/parameter.comparer';
-import { compareTables } from 'src/sql-tools/diff/comparers/table.comparer';
-import { compare } from 'src/sql-tools/helpers';
-import { schemaDiffToSql } from 'src/sql-tools/to-sql';
-import {
-  DatabaseConstraintType,
-  DatabaseSchema,
-  SchemaDiff,
-  SchemaDiffOptions,
-  SchemaDiffToSqlOptions,
-} from 'src/sql-tools/types';
-
-/**
- * Compute the difference between two database schemas
- */
-export const schemaDiff = (source: DatabaseSchema, target: DatabaseSchema, options: SchemaDiffOptions = {}) => {
-  const items = [
-    ...compare(source.parameters, target.parameters, options.parameters, compareParameters),
-    ...compare(source.extensions, target.extensions, options.extension, compareExtensions),
-    ...compare(source.functions, target.functions, options.functions, compareFunctions),
-    ...compare(source.enums, target.enums, options.enums, compareEnums),
-    ...compare(source.tables, target.tables, options.tables, compareTables),
-  ];
-
-  type SchemaName = SchemaDiff['type'];
-  const itemMap: Record<SchemaName, SchemaDiff[]> = {
-    'enum.create': [],
-    'enum.drop': [],
-    'extension.create': [],
-    'extension.drop': [],
-    'function.create': [],
-    'function.drop': [],
-    'table.create': [],
-    'table.drop': [],
-    'column.add': [],
-    'column.alter': [],
-    'column.drop': [],
-    'constraint.add': [],
-    'constraint.drop': [],
-    'index.create': [],
-    'index.drop': [],
-    'trigger.create': [],
-    'trigger.drop': [],
-    'parameter.set': [],
-    'parameter.reset': [],
-  };
-
-  for (const item of items) {
-    itemMap[item.type].push(item);
-  }
-
-  const constraintAdds = itemMap['constraint.add'].filter((item) => item.type === 'constraint.add');
-
-  const orderedItems = [
-    ...itemMap['extension.create'],
-    ...itemMap['function.create'],
-    ...itemMap['parameter.set'],
-    ...itemMap['parameter.reset'],
-    ...itemMap['enum.create'],
-    ...itemMap['trigger.drop'],
-    ...itemMap['index.drop'],
-    ...itemMap['constraint.drop'],
-    ...itemMap['table.create'],
-    ...itemMap['column.alter'],
-    ...itemMap['column.add'],
-    ...constraintAdds.filter(({ constraint }) => constraint.type === DatabaseConstraintType.PRIMARY_KEY),
-    ...constraintAdds.filter(({ constraint }) => constraint.type === DatabaseConstraintType.FOREIGN_KEY),
-    ...constraintAdds.filter(({ constraint }) => constraint.type === DatabaseConstraintType.UNIQUE),
-    ...constraintAdds.filter(({ constraint }) => constraint.type === DatabaseConstraintType.CHECK),
-    ...itemMap['index.create'],
-    ...itemMap['trigger.create'],
-    ...itemMap['column.drop'],
-    ...itemMap['table.drop'],
-    ...itemMap['enum.drop'],
-    ...itemMap['function.drop'],
-  ];
-
-  return {
-    items: orderedItems,
-    asSql: (options?: SchemaDiffToSqlOptions) => schemaDiffToSql(orderedItems, options),
-  };
-};
diff --git a/server/src/sql-tools/from-code/decorators/foreign-key-column.decorator.ts b/server/src/sql-tools/from-code/decorators/foreign-key-column.decorator.ts
deleted file mode 100644
index d2b7d623a7..0000000000
--- a/server/src/sql-tools/from-code/decorators/foreign-key-column.decorator.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { ColumnBaseOptions } from 'src/sql-tools/from-code/decorators/column.decorator';
-import { ForeignKeyAction } from 'src/sql-tools/from-code/decorators/foreign-key-constraint.decorator';
-import { register } from 'src/sql-tools/from-code/register';
-
-export type ForeignKeyColumnOptions = ColumnBaseOptions & {
-  onUpdate?: ForeignKeyAction;
-  onDelete?: ForeignKeyAction;
-  constraintName?: string;
-};
-
-export const ForeignKeyColumn = (target: () => object, options: ForeignKeyColumnOptions): PropertyDecorator => {
-  return (object: object, propertyName: string | symbol) => {
-    register({ type: 'foreignKeyColumn', item: { object, propertyName, options, target } });
-  };
-};
diff --git a/server/src/sql-tools/from-code/index.spec.ts b/server/src/sql-tools/from-code/index.spec.ts
deleted file mode 100644
index 5306722c76..0000000000
--- a/server/src/sql-tools/from-code/index.spec.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { readdirSync } from 'node:fs';
-import { join } from 'node:path';
-import { reset, schemaFromCode } from 'src/sql-tools/from-code';
-import { describe, expect, it } from 'vitest';
-
-describe(schemaFromCode.name, () => {
-  beforeEach(() => {
-    reset();
-  });
-
-  it('should work', () => {
-    expect(schemaFromCode()).toEqual({
-      name: 'postgres',
-      schemaName: 'public',
-      functions: [],
-      enums: [],
-      extensions: [],
-      parameters: [],
-      tables: [],
-      warnings: [],
-    });
-  });
-
-  describe('test files', () => {
-    const files = readdirSync('test/sql-tools', { withFileTypes: true });
-    for (const file of files) {
-      const filePath = join(file.parentPath, file.name);
-      it(filePath, async () => {
-        const module = await import(filePath);
-        expect(module.description).toBeDefined();
-        expect(module.schema).toBeDefined();
-        expect(schemaFromCode(), module.description).toEqual(module.schema);
-      });
-    }
-  });
-});
diff --git a/server/src/sql-tools/from-code/index.ts b/server/src/sql-tools/from-code/index.ts
deleted file mode 100644
index d820f236df..0000000000
--- a/server/src/sql-tools/from-code/index.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import 'reflect-metadata';
-import { processCheckConstraints } from 'src/sql-tools/from-code/processors/check-constraint.processor';
-import { processColumns } from 'src/sql-tools/from-code/processors/column.processor';
-import { processConfigurationParameters } from 'src/sql-tools/from-code/processors/configuration-parameter.processor';
-import { processDatabases } from 'src/sql-tools/from-code/processors/database.processor';
-import { processEnums } from 'src/sql-tools/from-code/processors/enum.processor';
-import { processExtensions } from 'src/sql-tools/from-code/processors/extension.processor';
-import { processForeignKeyColumns } from 'src/sql-tools/from-code/processors/foreign-key-column.processor';
-import { processForeignKeyConstraints } from 'src/sql-tools/from-code/processors/foreign-key-constraint.processor';
-import { processFunctions } from 'src/sql-tools/from-code/processors/function.processor';
-import { processIndexes } from 'src/sql-tools/from-code/processors/index.processor';
-import { processPrimaryKeyConstraints } from 'src/sql-tools/from-code/processors/primary-key-contraint.processor';
-import { processTables } from 'src/sql-tools/from-code/processors/table.processor';
-import { processTriggers } from 'src/sql-tools/from-code/processors/trigger.processor';
-import { Processor, SchemaBuilder } from 'src/sql-tools/from-code/processors/type';
-import { processUniqueConstraints } from 'src/sql-tools/from-code/processors/unique-constraint.processor';
-import { getRegisteredItems, resetRegisteredItems } from 'src/sql-tools/from-code/register';
-import { DatabaseSchema } from 'src/sql-tools/types';
-
-let initialized = false;
-let schema: DatabaseSchema;
-
-export const reset = () => {
-  initialized = false;
-  resetRegisteredItems();
-};
-
-const processors: Processor[] = [
-  processDatabases,
-  processConfigurationParameters,
-  processEnums,
-  processExtensions,
-  processFunctions,
-  processTables,
-  processColumns,
-  processForeignKeyColumns,
-  processForeignKeyConstraints,
-  processUniqueConstraints,
-  processCheckConstraints,
-  processPrimaryKeyConstraints,
-  processIndexes,
-  processTriggers,
-];
-
-export type SchemaFromCodeOptions = {
-  /** automatically create indexes on foreign key columns */
-  createForeignKeyIndexes?: boolean;
-};
-export const schemaFromCode = (options: SchemaFromCodeOptions = {}) => {
-  if (!initialized) {
-    const globalOptions = {
-      createForeignKeyIndexes: options.createForeignKeyIndexes ?? true,
-    };
-
-    const builder: SchemaBuilder = {
-      name: 'postgres',
-      schemaName: 'public',
-      tables: [],
-      functions: [],
-      enums: [],
-      extensions: [],
-      parameters: [],
-      warnings: [],
-    };
-
-    const items = getRegisteredItems();
-
-    for (const processor of processors) {
-      processor(builder, items, globalOptions);
-    }
-
-    schema = { ...builder, tables: builder.tables.map(({ metadata: _, ...table }) => table) };
-    initialized = true;
-  }
-
-  return schema;
-};
diff --git a/server/src/sql-tools/from-code/processors/column.processor.ts b/server/src/sql-tools/from-code/processors/column.processor.ts
deleted file mode 100644
index 6fff3070e3..0000000000
--- a/server/src/sql-tools/from-code/processors/column.processor.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { ColumnOptions } from 'src/sql-tools/from-code/decorators/column.decorator';
-import { onMissingTable, resolveTable } from 'src/sql-tools/from-code/processors/table.processor';
-import { Processor, SchemaBuilder } from 'src/sql-tools/from-code/processors/type';
-import { addWarning, asMetadataKey, fromColumnValue } from 'src/sql-tools/helpers';
-import { DatabaseColumn } from 'src/sql-tools/types';
-
-export const processColumns: Processor = (builder, items) => {
-  for (const {
-    type,
-    item: { object, propertyName, options },
-  } of items.filter((item) => item.type === 'column' || item.type === 'foreignKeyColumn')) {
-    const table = resolveTable(builder, object.constructor);
-    if (!table) {
-      onMissingTable(builder, type === 'column' ? '@Column' : '@ForeignKeyColumn', object, propertyName);
-      continue;
-    }
-
-    const columnName = options.name ?? String(propertyName);
-    const existingColumn = table.columns.find((column) => column.name === columnName);
-    if (existingColumn) {
-      // TODO log warnings if column name is not unique
-      continue;
-    }
-
-    const tableName = table.name;
-
-    let defaultValue = fromColumnValue(options.default);
-    let nullable = options.nullable ?? false;
-
-    // map `{ default: null }` to `{ nullable: true }`
-    if (defaultValue === null) {
-      nullable = true;
-      defaultValue = undefined;
-    }
-
-    const isEnum = !!(options as ColumnOptions).enum;
-
-    const column: DatabaseColumn = {
-      name: columnName,
-      tableName,
-      primary: options.primary ?? false,
-      default: defaultValue,
-      nullable,
-      isArray: (options as ColumnOptions).array ?? false,
-      length: options.length,
-      type: isEnum ? 'enum' : options.type || 'character varying',
-      enumName: isEnum ? (options as ColumnOptions).enum!.name : undefined,
-      comment: options.comment,
-      storage: options.storage,
-      identity: options.identity,
-      synchronize: options.synchronize ?? true,
-    };
-
-    writeMetadata(object, propertyName, { name: column.name, options });
-
-    table.columns.push(column);
-  }
-};
-
-type ColumnMetadata = { name: string; options: ColumnOptions };
-
-export const resolveColumn = (builder: SchemaBuilder, object: object, propertyName: string | symbol) => {
-  const table = resolveTable(builder, object.constructor);
-  if (!table) {
-    return {};
-  }
-
-  const metadata = readMetadata(object, propertyName);
-  if (!metadata) {
-    return { table };
-  }
-
-  const column = table.columns.find((column) => column.name === metadata.name);
-  return { table, column };
-};
-
-export const onMissingColumn = (
-  builder: SchemaBuilder,
-  context: string,
-  object: object,
-  propertyName?: symbol | string,
-) => {
-  const label = object.constructor.name + (propertyName ? '.' + String(propertyName) : '');
-  addWarning(builder, context, `Unable to find column (${label})`);
-};
-
-const METADATA_KEY = asMetadataKey('table-metadata');
-
-const writeMetadata = (object: object, propertyName: symbol | string, metadata: ColumnMetadata) =>
-  Reflect.defineMetadata(METADATA_KEY, metadata, object, propertyName);
-
-const readMetadata = (object: object, propertyName: symbol | string): ColumnMetadata | undefined =>
-  Reflect.getMetadata(METADATA_KEY, object, propertyName);
diff --git a/server/src/sql-tools/from-code/processors/table.processor.ts b/server/src/sql-tools/from-code/processors/table.processor.ts
deleted file mode 100644
index e96f858266..0000000000
--- a/server/src/sql-tools/from-code/processors/table.processor.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { TableOptions } from 'src/sql-tools/from-code/decorators/table.decorator';
-import { Processor, SchemaBuilder } from 'src/sql-tools/from-code/processors/type';
-import { addWarning, asMetadataKey, asSnakeCase } from 'src/sql-tools/helpers';
-
-export const processTables: Processor = (builder, items) => {
-  for (const {
-    item: { options, object },
-  } of items.filter((item) => item.type === 'table')) {
-    const test = readMetadata(object);
-    if (test) {
-      throw new Error(
-        `Table ${test.name} has already been registered. Does ${object.name} have two @Table() decorators?`,
-      );
-    }
-
-    const tableName = options.name || asSnakeCase(object.name);
-
-    writeMetadata(object, { name: tableName, options });
-
-    builder.tables.push({
-      name: tableName,
-      columns: [],
-      constraints: [],
-      indexes: [],
-      triggers: [],
-      synchronize: options.synchronize ?? true,
-      metadata: { options, object },
-    });
-  }
-};
-
-export const resolveTable = (builder: SchemaBuilder, object: object) => {
-  const metadata = readMetadata(object);
-  if (!metadata) {
-    return;
-  }
-
-  return builder.tables.find((table) => table.name === metadata.name);
-};
-
-export const onMissingTable = (
-  builder: SchemaBuilder,
-  context: string,
-  object: object,
-  propertyName?: symbol | string,
-) => {
-  const label = object.constructor.name + (propertyName ? '.' + String(propertyName) : '');
-  addWarning(builder, context, `Unable to find table (${label})`);
-};
-
-const METADATA_KEY = asMetadataKey('table-metadata');
-
-type TableMetadata = { name: string; options: TableOptions };
-
-const readMetadata = (object: object): TableMetadata | undefined => Reflect.getMetadata(METADATA_KEY, object);
-
-const writeMetadata = (object: object, metadata: TableMetadata): void =>
-  Reflect.defineMetadata(METADATA_KEY, metadata, object);
diff --git a/server/src/sql-tools/from-code/processors/type.ts b/server/src/sql-tools/from-code/processors/type.ts
deleted file mode 100644
index deb142d278..0000000000
--- a/server/src/sql-tools/from-code/processors/type.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { SchemaFromCodeOptions } from 'src/sql-tools/from-code';
-import { TableOptions } from 'src/sql-tools/from-code/decorators/table.decorator';
-import { RegisterItem } from 'src/sql-tools/from-code/register-item';
-import { DatabaseSchema, DatabaseTable } from 'src/sql-tools/types';
-
-// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-export type TableWithMetadata = DatabaseTable & { metadata: { options: TableOptions; object: Function } };
-export type SchemaBuilder = Omit<DatabaseSchema, 'tables'> & { tables: TableWithMetadata[] };
-
-export type Processor = (builder: SchemaBuilder, items: RegisterItem[], options: SchemaFromCodeOptions) => void;
diff --git a/server/src/sql-tools/from-database/index.ts b/server/src/sql-tools/from-database/index.ts
deleted file mode 100644
index 771a24d7b1..0000000000
--- a/server/src/sql-tools/from-database/index.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Kysely } from 'kysely';
-import { PostgresJSDialect } from 'kysely-postgres-js';
-import { Sql } from 'postgres';
-import { readColumns } from 'src/sql-tools/from-database/readers/column.reader';
-import { readComments } from 'src/sql-tools/from-database/readers/comment.reader';
-import { readConstraints } from 'src/sql-tools/from-database/readers/constraint.reader';
-import { readExtensions } from 'src/sql-tools/from-database/readers/extension.reader';
-import { readFunctions } from 'src/sql-tools/from-database/readers/function.reader';
-import { readIndexes } from 'src/sql-tools/from-database/readers/index.reader';
-import { readName } from 'src/sql-tools/from-database/readers/name.reader';
-import { readParameters } from 'src/sql-tools/from-database/readers/parameter.reader';
-import { readTables } from 'src/sql-tools/from-database/readers/table.reader';
-import { readTriggers } from 'src/sql-tools/from-database/readers/trigger.reader';
-import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
-import { DatabaseSchema, LoadSchemaOptions, PostgresDB } from 'src/sql-tools/types';
-
-const readers: DatabaseReader[] = [
-  //
-  readName,
-  readParameters,
-  readExtensions,
-  readFunctions,
-  readTables,
-  readColumns,
-  readIndexes,
-  readConstraints,
-  readTriggers,
-  readComments,
-];
-
-/**
- * Load the database schema from the database
- */
-export const schemaFromDatabase = async (postgres: Sql, options: LoadSchemaOptions = {}): Promise<DatabaseSchema> => {
-  const schema: DatabaseSchema = {
-    name: 'immich',
-    schemaName: options.schemaName || 'public',
-    parameters: [],
-    functions: [],
-    enums: [],
-    extensions: [],
-    tables: [],
-    warnings: [],
-  };
-
-  const db = new Kysely<PostgresDB>({ dialect: new PostgresJSDialect({ postgres }) });
-  for (const reader of readers) {
-    await reader(schema, db);
-  }
-
-  await db.destroy();
-
-  return schema;
-};
diff --git a/server/src/sql-tools/from-database/readers/type.ts b/server/src/sql-tools/from-database/readers/type.ts
deleted file mode 100644
index d8a21d486b..0000000000
--- a/server/src/sql-tools/from-database/readers/type.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { DatabaseClient, DatabaseSchema } from 'src/sql-tools/types';
-
-export type DatabaseReader = (schema: DatabaseSchema, db: DatabaseClient) => Promise<void>;
diff --git a/server/src/sql-tools/helpers.ts b/server/src/sql-tools/helpers.ts
index 015bbe4d9c..119fe63291 100644
--- a/server/src/sql-tools/helpers.ts
+++ b/server/src/sql-tools/helpers.ts
@@ -1,15 +1,6 @@
 import { createHash } from 'node:crypto';
-import { ColumnValue } from 'src/sql-tools/from-code/decorators/column.decorator';
-import { SchemaBuilder } from 'src/sql-tools/from-code/processors/type';
-import {
-  Comparer,
-  DatabaseColumn,
-  DiffOptions,
-  SchemaDiff,
-  TriggerAction,
-  TriggerScope,
-  TriggerTiming,
-} from 'src/sql-tools/types';
+import { ColumnValue } from 'src/sql-tools/decorators/column.decorator';
+import { Comparer, DatabaseColumn, IgnoreOptions, SchemaDiff } from 'src/sql-tools/types';
 
 export const asMetadataKey = (name: string) => `sql-tools:${name}`;
 
@@ -27,46 +18,6 @@ export const asOptions = <T extends { name?: string }>(options: string | T): T =
 };
 
 export const sha1 = (value: string) => createHash('sha1').update(value).digest('hex');
-export const hasMask = (input: number, mask: number) => (input & mask) === mask;
-
-export const parseTriggerType = (type: number) => {
-  // eslint-disable-next-line unicorn/prefer-math-trunc
-  const scope: TriggerScope = hasMask(type, 1 << 0) ? 'row' : 'statement';
-
-  let timing: TriggerTiming = 'after';
-  const timingMasks: Array<{ mask: number; value: TriggerTiming }> = [
-    { mask: 1 << 1, value: 'before' },
-    { mask: 1 << 6, value: 'instead of' },
-  ];
-
-  for (const { mask, value } of timingMasks) {
-    if (hasMask(type, mask)) {
-      timing = value;
-      break;
-    }
-  }
-
-  const actions: TriggerAction[] = [];
-  const actionMasks: Array<{ mask: number; value: TriggerAction }> = [
-    { mask: 1 << 2, value: 'insert' },
-    { mask: 1 << 3, value: 'delete' },
-    { mask: 1 << 4, value: 'update' },
-    { mask: 1 << 5, value: 'truncate' },
-  ];
-
-  for (const { mask, value } of actionMasks) {
-    if (hasMask(type, mask)) {
-      actions.push(value);
-      break;
-    }
-  }
-
-  if (actions.length === 0) {
-    throw new Error(`Unable to parse trigger type ${type}`);
-  }
-
-  return { actions, timing, scope };
-};
 
 export const fromColumnValue = (columnValue?: ColumnValue) => {
   if (columnValue === undefined) {
@@ -108,7 +59,7 @@ export const haveEqualColumns = (sourceColumns?: string[], targetColumns?: strin
 export const compare = <T extends { name: string; synchronize: boolean }>(
   sources: T[],
   targets: T[],
-  options: DiffOptions | undefined,
+  options: IgnoreOptions | undefined,
   comparer: Comparer<T>,
 ) => {
   options = options || {};
@@ -144,7 +95,7 @@ export const compare = <T extends { name: string; synchronize: boolean }>(
 const isIgnored = (
   source: { synchronize?: boolean } | undefined,
   target: { synchronize?: boolean } | undefined,
-  options: DiffOptions,
+  options: IgnoreOptions,
 ) => {
   return (options.ignoreExtra && !source) || (options.ignoreMissing && !target);
 };
@@ -214,20 +165,3 @@ export const asColumnComment = (tableName: string, columnName: string, comment:
 export const asColumnList = (columns: string[]) => columns.map((column) => `"${column}"`).join(', ');
 
 export const asForeignKeyConstraintName = (table: string, columns: string[]) => asKey('FK_', table, [...columns]);
-
-export const asIndexName = (table: string, columns?: string[], where?: string) => {
-  const items: string[] = [];
-  for (const columnName of columns ?? []) {
-    items.push(columnName);
-  }
-
-  if (where) {
-    items.push(where);
-  }
-
-  return asKey('IDX_', table, items);
-};
-
-export const addWarning = (builder: SchemaBuilder, context: string, message: string) => {
-  builder.warnings.push(`[${context}] ${message}`);
-};
diff --git a/server/src/sql-tools/from-code/processors/check-constraint.processor.ts b/server/src/sql-tools/processors/check-constraint.processor.ts
similarity index 63%
rename from server/src/sql-tools/from-code/processors/check-constraint.processor.ts
rename to server/src/sql-tools/processors/check-constraint.processor.ts
index feb21b9894..10e5c18791 100644
--- a/server/src/sql-tools/from-code/processors/check-constraint.processor.ts
+++ b/server/src/sql-tools/processors/check-constraint.processor.ts
@@ -1,22 +1,20 @@
-import { onMissingTable, resolveTable } from 'src/sql-tools/from-code/processors/table.processor';
-import { Processor } from 'src/sql-tools/from-code/processors/type';
 import { asKey } from 'src/sql-tools/helpers';
-import { DatabaseConstraintType } from 'src/sql-tools/types';
+import { ConstraintType, Processor } from 'src/sql-tools/types';
 
 export const processCheckConstraints: Processor = (builder, items) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'checkConstraint')) {
-    const table = resolveTable(builder, object);
+    const table = builder.getTableByObject(object);
     if (!table) {
-      onMissingTable(builder, '@Check', object);
+      builder.warnMissingTable('@Check', object);
       continue;
     }
 
     const tableName = table.name;
 
     table.constraints.push({
-      type: DatabaseConstraintType.CHECK,
+      type: ConstraintType.CHECK,
       name: options.name || asCheckConstraintName(tableName, options.expression),
       tableName,
       expression: options.expression,
diff --git a/server/src/sql-tools/processors/column.processor.ts b/server/src/sql-tools/processors/column.processor.ts
new file mode 100644
index 0000000000..3981ee4036
--- /dev/null
+++ b/server/src/sql-tools/processors/column.processor.ts
@@ -0,0 +1,55 @@
+import { ColumnOptions } from 'src/sql-tools/decorators/column.decorator';
+import { fromColumnValue } from 'src/sql-tools/helpers';
+import { Processor } from 'src/sql-tools/types';
+
+export const processColumns: Processor = (builder, items) => {
+  for (const {
+    type,
+    item: { object, propertyName, options },
+  } of items.filter((item) => item.type === 'column' || item.type === 'foreignKeyColumn')) {
+    const table = builder.getTableByObject(object.constructor);
+    if (!table) {
+      builder.warnMissingTable(type === 'column' ? '@Column' : '@ForeignKeyColumn', object, propertyName);
+      continue;
+    }
+
+    const columnName = options.name ?? String(propertyName);
+    const existingColumn = table.columns.find((column) => column.name === columnName);
+    if (existingColumn) {
+      // TODO log warnings if column name is not unique
+      continue;
+    }
+
+    let defaultValue = fromColumnValue(options.default);
+    let nullable = options.nullable ?? false;
+
+    // map `{ default: null }` to `{ nullable: true }`
+    if (defaultValue === null) {
+      nullable = true;
+      defaultValue = undefined;
+    }
+
+    const isEnum = !!(options as ColumnOptions).enum;
+
+    builder.addColumn(
+      table,
+      {
+        name: columnName,
+        tableName: table.name,
+        primary: options.primary ?? false,
+        default: defaultValue,
+        nullable,
+        isArray: (options as ColumnOptions).array ?? false,
+        length: options.length,
+        type: isEnum ? 'enum' : options.type || 'character varying',
+        enumName: isEnum ? (options as ColumnOptions).enum!.name : undefined,
+        comment: options.comment,
+        storage: options.storage,
+        identity: options.identity,
+        synchronize: options.synchronize ?? true,
+      },
+      options,
+      propertyName,
+    );
+  }
+};
diff --git a/server/src/sql-tools/from-code/processors/configuration-parameter.processor.ts b/server/src/sql-tools/processors/configuration-parameter.processor.ts
similarity index 81%
rename from server/src/sql-tools/from-code/processors/configuration-parameter.processor.ts
rename to server/src/sql-tools/processors/configuration-parameter.processor.ts
index 493214e5b8..4b2d56f103 100644
--- a/server/src/sql-tools/from-code/processors/configuration-parameter.processor.ts
+++ b/server/src/sql-tools/processors/configuration-parameter.processor.ts
@@ -1,12 +1,12 @@
-import { Processor } from 'src/sql-tools/from-code/processors/type';
 import { fromColumnValue } from 'src/sql-tools/helpers';
+import { Processor } from 'src/sql-tools/types';
 
 export const processConfigurationParameters: Processor = (builder, items) => {
   for (const {
     item: { options },
   } of items.filter((item) => item.type === 'configurationParameter')) {
     builder.parameters.push({
-      databaseName: builder.name,
+      databaseName: builder.databaseName,
       name: options.name,
       value: fromColumnValue(options.value),
       scope: options.scope,
diff --git a/server/src/sql-tools/from-code/processors/database.processor.ts b/server/src/sql-tools/processors/database.processor.ts
similarity index 63%
rename from server/src/sql-tools/from-code/processors/database.processor.ts
rename to server/src/sql-tools/processors/database.processor.ts
index 9b0662f7e0..9c9e61a6cf 100644
--- a/server/src/sql-tools/from-code/processors/database.processor.ts
+++ b/server/src/sql-tools/processors/database.processor.ts
@@ -1,10 +1,10 @@
-import { Processor } from 'src/sql-tools/from-code/processors/type';
 import { asSnakeCase } from 'src/sql-tools/helpers';
+import { Processor } from 'src/sql-tools/types';
 
 export const processDatabases: Processor = (builder, items) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'database')) {
-    builder.name = options.name || asSnakeCase(object.name);
+    builder.databaseName = options.name || asSnakeCase(object.name);
   }
 };
diff --git a/server/src/sql-tools/from-code/processors/enum.processor.ts b/server/src/sql-tools/processors/enum.processor.ts
similarity index 76%
rename from server/src/sql-tools/from-code/processors/enum.processor.ts
rename to server/src/sql-tools/processors/enum.processor.ts
index d6d19ec025..d396089c8f 100644
--- a/server/src/sql-tools/from-code/processors/enum.processor.ts
+++ b/server/src/sql-tools/processors/enum.processor.ts
@@ -1,4 +1,4 @@
-import { Processor } from 'src/sql-tools/from-code/processors/type';
+import { Processor } from 'src/sql-tools/types';
 
 export const processEnums: Processor = (builder, items) => {
   for (const { item } of items.filter((item) => item.type === 'enum')) {
diff --git a/server/src/sql-tools/from-code/processors/extension.processor.ts b/server/src/sql-tools/processors/extension.processor.ts
similarity index 80%
rename from server/src/sql-tools/from-code/processors/extension.processor.ts
rename to server/src/sql-tools/processors/extension.processor.ts
index 4b12054aa3..97a39c0d8b 100644
--- a/server/src/sql-tools/from-code/processors/extension.processor.ts
+++ b/server/src/sql-tools/processors/extension.processor.ts
@@ -1,4 +1,4 @@
-import { Processor } from 'src/sql-tools/from-code/processors/type';
+import { Processor } from 'src/sql-tools/types';
 
 export const processExtensions: Processor = (builder, items) => {
   for (const {
diff --git a/server/src/sql-tools/from-code/processors/foreign-key-column.processor.ts b/server/src/sql-tools/processors/foreign-key-column.processor.ts
similarity index 64%
rename from server/src/sql-tools/from-code/processors/foreign-key-column.processor.ts
rename to server/src/sql-tools/processors/foreign-key-column.processor.ts
index d706763d1d..a3cac0a85e 100644
--- a/server/src/sql-tools/from-code/processors/foreign-key-column.processor.ts
+++ b/server/src/sql-tools/processors/foreign-key-column.processor.ts
@@ -1,28 +1,25 @@
-import { onMissingColumn, resolveColumn } from 'src/sql-tools/from-code/processors/column.processor';
-import { onMissingTable, resolveTable } from 'src/sql-tools/from-code/processors/table.processor';
-import { Processor } from 'src/sql-tools/from-code/processors/type';
 import { asForeignKeyConstraintName, asKey } from 'src/sql-tools/helpers';
-import { DatabaseActionType, DatabaseConstraintType } from 'src/sql-tools/types';
+import { ActionType, ConstraintType, Processor } from 'src/sql-tools/types';
 
 export const processForeignKeyColumns: Processor = (builder, items) => {
   for (const {
     item: { object, propertyName, options, target },
   } of items.filter((item) => item.type === 'foreignKeyColumn')) {
-    const { table, column } = resolveColumn(builder, object, propertyName);
+    const { table, column } = builder.getColumnByObjectAndPropertyName(object, propertyName);
     if (!table) {
-      onMissingTable(builder, '@ForeignKeyColumn', object);
+      builder.warnMissingTable('@ForeignKeyColumn', object);
       continue;
     }
 
     if (!column) {
       // should be impossible since they are pre-created in `column.processor.ts`
-      onMissingColumn(builder, '@ForeignKeyColumn', object, propertyName);
+      builder.warnMissingColumn('@ForeignKeyColumn', object, propertyName);
       continue;
     }
 
-    const referenceTable = resolveTable(builder, target());
+    const referenceTable = builder.getTableByObject(target());
     if (!referenceTable) {
-      onMissingTable(builder, '@ForeignKeyColumn', object, propertyName);
+      builder.warnMissingTable('@ForeignKeyColumn', object, propertyName);
       continue;
     }
 
@@ -41,11 +38,11 @@ export const processForeignKeyColumns: Processor = (builder, items) => {
       name,
       tableName: table.name,
       columnNames,
-      type: DatabaseConstraintType.FOREIGN_KEY,
+      type: ConstraintType.FOREIGN_KEY,
       referenceTableName: referenceTable.name,
       referenceColumnNames,
-      onUpdate: options.onUpdate as DatabaseActionType,
-      onDelete: options.onDelete as DatabaseActionType,
+      onUpdate: options.onUpdate as ActionType,
+      onDelete: options.onDelete as ActionType,
       synchronize: options.synchronize ?? true,
     });
 
@@ -54,7 +51,7 @@ export const processForeignKeyColumns: Processor = (builder, items) => {
         name: options.uniqueConstraintName || asRelationKeyConstraintName(table.name, columnNames),
         tableName: table.name,
         columnNames,
-        type: DatabaseConstraintType.UNIQUE,
+        type: ConstraintType.UNIQUE,
         synchronize: options.synchronize ?? true,
       });
     }
diff --git a/server/src/sql-tools/from-code/processors/foreign-key-constraint.processor.ts b/server/src/sql-tools/processors/foreign-key-constraint.processor.ts
similarity index 61%
rename from server/src/sql-tools/from-code/processors/foreign-key-constraint.processor.ts
rename to server/src/sql-tools/processors/foreign-key-constraint.processor.ts
index e88297b6c6..704e6ed8e4 100644
--- a/server/src/sql-tools/from-code/processors/foreign-key-constraint.processor.ts
+++ b/server/src/sql-tools/processors/foreign-key-constraint.processor.ts
@@ -1,23 +1,20 @@
-import { onMissingTable, resolveTable } from 'src/sql-tools/from-code/processors/table.processor';
-import { Processor } from 'src/sql-tools/from-code/processors/type';
-import { addWarning, asForeignKeyConstraintName, asIndexName } from 'src/sql-tools/helpers';
-import { DatabaseActionType, DatabaseConstraintType } from 'src/sql-tools/types';
+import { asForeignKeyConstraintName } from 'src/sql-tools/helpers';
+import { ActionType, ConstraintType, Processor } from 'src/sql-tools/types';
 
 export const processForeignKeyConstraints: Processor = (builder, items, config) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'foreignKeyConstraint')) {
-    const table = resolveTable(builder, object);
+    const table = builder.getTableByObject(object);
     if (!table) {
-      onMissingTable(builder, '@ForeignKeyConstraint', { name: 'referenceTable' });
+      builder.warnMissingTable('@ForeignKeyConstraint', { name: 'referenceTable' });
       continue;
     }
 
-    const referenceTable = resolveTable(builder, options.referenceTable());
+    const referenceTable = builder.getTableByObject(options.referenceTable());
     if (!referenceTable) {
       const referenceTableName = options.referenceTable()?.name;
-      addWarning(
-        builder,
+      builder.warn(
         '@ForeignKeyConstraint.referenceTable',
         `Unable to find table` + (referenceTableName ? ` (${referenceTableName})` : ''),
       );
@@ -28,21 +25,18 @@ export const processForeignKeyConstraints: Processor = (builder, items, config)
 
     for (const columnName of options.columns) {
       if (!table.columns.some(({ name }) => name === columnName)) {
-        addWarning(
-          builder,
-          '@ForeignKeyConstraint.columns',
-          `Unable to find column (${table.metadata.object.name}.${columnName})`,
-        );
+        const metadata = builder.getTableMetadata(table);
+        builder.warn('@ForeignKeyConstraint.columns', `Unable to find column (${metadata.object.name}.${columnName})`);
         missingColumn = true;
       }
     }
 
     for (const columnName of options.referenceColumns || []) {
       if (!referenceTable.columns.some(({ name }) => name === columnName)) {
-        addWarning(
-          builder,
+        const metadata = builder.getTableMetadata(referenceTable);
+        builder.warn(
           '@ForeignKeyConstraint.referenceColumns',
-          `Unable to find column (${referenceTable.metadata.object.name}.${columnName})`,
+          `Unable to find column (${metadata.object.name}.${columnName})`,
         );
         missingColumn = true;
       }
@@ -58,14 +52,14 @@ export const processForeignKeyConstraints: Processor = (builder, items, config)
     const name = options.name || asForeignKeyConstraintName(table.name, options.columns);
 
     table.constraints.push({
-      type: DatabaseConstraintType.FOREIGN_KEY,
+      type: ConstraintType.FOREIGN_KEY,
       name,
       tableName: table.name,
       columnNames: options.columns,
       referenceTableName: referenceTable.name,
       referenceColumnNames: referenceColumns,
-      onUpdate: options.onUpdate as DatabaseActionType,
-      onDelete: options.onDelete as DatabaseActionType,
+      onUpdate: options.onUpdate as ActionType,
+      onDelete: options.onDelete as ActionType,
       synchronize: options.synchronize ?? true,
     });
 
@@ -75,7 +69,7 @@ export const processForeignKeyConstraints: Processor = (builder, items, config)
 
     if (options.index || options.indexName || config.createForeignKeyIndexes) {
       table.indexes.push({
-        name: options.indexName || asIndexName(table.name, options.columns),
+        name: options.indexName || builder.asIndexName(table.name, options.columns),
         tableName: table.name,
         columnNames: options.columns,
         unique: false,
diff --git a/server/src/sql-tools/from-code/processors/function.processor.ts b/server/src/sql-tools/processors/function.processor.ts
similarity index 77%
rename from server/src/sql-tools/from-code/processors/function.processor.ts
rename to server/src/sql-tools/processors/function.processor.ts
index cbd9c87abc..669d1a5ec0 100644
--- a/server/src/sql-tools/from-code/processors/function.processor.ts
+++ b/server/src/sql-tools/processors/function.processor.ts
@@ -1,4 +1,4 @@
-import { Processor } from 'src/sql-tools/from-code/processors/type';
+import { Processor } from 'src/sql-tools/types';
 
 export const processFunctions: Processor = (builder, items) => {
   for (const { item } of items.filter((item) => item.type === 'function')) {
diff --git a/server/src/sql-tools/from-code/processors/index.processor.ts b/server/src/sql-tools/processors/index.processor.ts
similarity index 70%
rename from server/src/sql-tools/from-code/processors/index.processor.ts
rename to server/src/sql-tools/processors/index.processor.ts
index 4de8914231..546bac236a 100644
--- a/server/src/sql-tools/from-code/processors/index.processor.ts
+++ b/server/src/sql-tools/processors/index.processor.ts
@@ -1,20 +1,17 @@
-import { onMissingColumn, resolveColumn } from 'src/sql-tools/from-code/processors/column.processor';
-import { onMissingTable, resolveTable } from 'src/sql-tools/from-code/processors/table.processor';
-import { Processor } from 'src/sql-tools/from-code/processors/type';
-import { asIndexName } from 'src/sql-tools/helpers';
+import { Processor } from 'src/sql-tools/types';
 
 export const processIndexes: Processor = (builder, items, config) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'index')) {
-    const table = resolveTable(builder, object);
+    const table = builder.getTableByObject(object);
     if (!table) {
-      onMissingTable(builder, '@Check', object);
+      builder.warnMissingTable('@Check', object);
       continue;
     }
 
     table.indexes.push({
-      name: options.name || asIndexName(table.name, options.columns, options.where),
+      name: options.name || builder.asIndexName(table.name, options.columns, options.where),
       tableName: table.name,
       unique: options.unique ?? false,
       expression: options.expression,
@@ -31,15 +28,15 @@ export const processIndexes: Processor = (builder, items, config) => {
     type,
     item: { object, propertyName, options },
   } of items.filter((item) => item.type === 'column' || item.type === 'foreignKeyColumn')) {
-    const { table, column } = resolveColumn(builder, object, propertyName);
+    const { table, column } = builder.getColumnByObjectAndPropertyName(object, propertyName);
     if (!table) {
-      onMissingTable(builder, '@Column', object);
+      builder.warnMissingTable('@Column', object);
       continue;
     }
 
     if (!column) {
       // should be impossible since they are created in `column.processor.ts`
-      onMissingColumn(builder, '@Column', object, propertyName);
+      builder.warnMissingColumn('@Column', object, propertyName);
       continue;
     }
 
@@ -53,7 +50,7 @@ export const processIndexes: Processor = (builder, items, config) => {
       continue;
     }
 
-    const indexName = options.indexName || asIndexName(table.name, [column.name]);
+    const indexName = options.indexName || builder.asIndexName(table.name, [column.name]);
 
     const isIndexPresent = table.indexes.some((index) => index.name === indexName);
     if (isIndexPresent) {
diff --git a/server/src/sql-tools/processors/index.ts b/server/src/sql-tools/processors/index.ts
new file mode 100644
index 0000000000..054540f7b0
--- /dev/null
+++ b/server/src/sql-tools/processors/index.ts
@@ -0,0 +1,32 @@
+import { processCheckConstraints } from 'src/sql-tools/processors/check-constraint.processor';
+import { processColumns } from 'src/sql-tools/processors/column.processor';
+import { processConfigurationParameters } from 'src/sql-tools/processors/configuration-parameter.processor';
+import { processDatabases } from 'src/sql-tools/processors/database.processor';
+import { processEnums } from 'src/sql-tools/processors/enum.processor';
+import { processExtensions } from 'src/sql-tools/processors/extension.processor';
+import { processForeignKeyColumns } from 'src/sql-tools/processors/foreign-key-column.processor';
+import { processForeignKeyConstraints } from 'src/sql-tools/processors/foreign-key-constraint.processor';
+import { processFunctions } from 'src/sql-tools/processors/function.processor';
+import { processIndexes } from 'src/sql-tools/processors/index.processor';
+import { processPrimaryKeyConstraints } from 'src/sql-tools/processors/primary-key-contraint.processor';
+import { processTables } from 'src/sql-tools/processors/table.processor';
+import { processTriggers } from 'src/sql-tools/processors/trigger.processor';
+import { processUniqueConstraints } from 'src/sql-tools/processors/unique-constraint.processor';
+import { Processor } from 'src/sql-tools/types';
+
+export const processors: Processor[] = [
+  processDatabases,
+  processConfigurationParameters,
+  processEnums,
+  processExtensions,
+  processFunctions,
+  processTables,
+  processColumns,
+  processForeignKeyColumns,
+  processForeignKeyConstraints,
+  processUniqueConstraints,
+  processCheckConstraints,
+  processPrimaryKeyConstraints,
+  processIndexes,
+  processTriggers,
+];
diff --git a/server/src/sql-tools/from-code/processors/primary-key-contraint.processor.ts b/server/src/sql-tools/processors/primary-key-contraint.processor.ts
similarity index 61%
rename from server/src/sql-tools/from-code/processors/primary-key-contraint.processor.ts
rename to server/src/sql-tools/processors/primary-key-contraint.processor.ts
index 74aecc5ea0..be8983f79a 100644
--- a/server/src/sql-tools/from-code/processors/primary-key-contraint.processor.ts
+++ b/server/src/sql-tools/processors/primary-key-contraint.processor.ts
@@ -1,6 +1,5 @@
-import { Processor } from 'src/sql-tools/from-code/processors/type';
 import { asKey } from 'src/sql-tools/helpers';
-import { DatabaseConstraintType } from 'src/sql-tools/types';
+import { ConstraintType, Processor } from 'src/sql-tools/types';
 
 export const processPrimaryKeyConstraints: Processor = (builder) => {
   for (const table of builder.tables) {
@@ -11,13 +10,15 @@ export const processPrimaryKeyConstraints: Processor = (builder) => {
         columnNames.push(column.name);
       }
     }
+
     if (columnNames.length > 0) {
+      const tableMetadata = builder.getTableMetadata(table);
       table.constraints.push({
-        type: DatabaseConstraintType.PRIMARY_KEY,
-        name: table.metadata.options.primaryConstraintName || asPrimaryKeyConstraintName(table.name, columnNames),
+        type: ConstraintType.PRIMARY_KEY,
+        name: tableMetadata.options.primaryConstraintName || asPrimaryKeyConstraintName(table.name, columnNames),
         tableName: table.name,
         columnNames,
-        synchronize: table.metadata.options.synchronize ?? true,
+        synchronize: tableMetadata.options.synchronize ?? true,
       });
     }
   }
diff --git a/server/src/sql-tools/processors/table.processor.ts b/server/src/sql-tools/processors/table.processor.ts
new file mode 100644
index 0000000000..967e4a023b
--- /dev/null
+++ b/server/src/sql-tools/processors/table.processor.ts
@@ -0,0 +1,28 @@
+import { asSnakeCase } from 'src/sql-tools/helpers';
+import { Processor } from 'src/sql-tools/types';
+
+export const processTables: Processor = (builder, items) => {
+  for (const {
+    item: { options, object },
+  } of items.filter((item) => item.type === 'table')) {
+    const test = builder.getTableByObject(object);
+    if (test) {
+      throw new Error(
+        `Table ${test.name} has already been registered. Does ${object.name} have two @Table() decorators?`,
+      );
+    }
+
+    builder.addTable(
+      {
+        name: options.name || asSnakeCase(object.name),
+        columns: [],
+        constraints: [],
+        indexes: [],
+        triggers: [],
+        synchronize: options.synchronize ?? true,
+      },
+      options,
+      object,
+    );
+  }
+};
diff --git a/server/src/sql-tools/from-code/processors/trigger.processor.ts b/server/src/sql-tools/processors/trigger.processor.ts
similarity index 71%
rename from server/src/sql-tools/from-code/processors/trigger.processor.ts
rename to server/src/sql-tools/processors/trigger.processor.ts
index 4b875f353b..03e7076fdb 100644
--- a/server/src/sql-tools/from-code/processors/trigger.processor.ts
+++ b/server/src/sql-tools/processors/trigger.processor.ts
@@ -1,15 +1,14 @@
-import { TriggerOptions } from 'src/sql-tools/from-code/decorators/trigger.decorator';
-import { onMissingTable, resolveTable } from 'src/sql-tools/from-code/processors/table.processor';
-import { Processor } from 'src/sql-tools/from-code/processors/type';
+import { TriggerOptions } from 'src/sql-tools/decorators/trigger.decorator';
 import { asKey } from 'src/sql-tools/helpers';
+import { Processor } from 'src/sql-tools/types';
 
 export const processTriggers: Processor = (builder, items) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'trigger')) {
-    const table = resolveTable(builder, object);
+    const table = builder.getTableByObject(object);
     if (!table) {
-      onMissingTable(builder, '@Trigger', object);
+      builder.warnMissingTable('@Trigger', object);
       continue;
     }
 
diff --git a/server/src/sql-tools/from-code/processors/unique-constraint.processor.ts b/server/src/sql-tools/processors/unique-constraint.processor.ts
similarity index 66%
rename from server/src/sql-tools/from-code/processors/unique-constraint.processor.ts
rename to server/src/sql-tools/processors/unique-constraint.processor.ts
index 9014378085..eed9597879 100644
--- a/server/src/sql-tools/from-code/processors/unique-constraint.processor.ts
+++ b/server/src/sql-tools/processors/unique-constraint.processor.ts
@@ -1,16 +1,13 @@
-import { onMissingColumn, resolveColumn } from 'src/sql-tools/from-code/processors/column.processor';
-import { onMissingTable, resolveTable } from 'src/sql-tools/from-code/processors/table.processor';
-import { Processor } from 'src/sql-tools/from-code/processors/type';
 import { asKey } from 'src/sql-tools/helpers';
-import { DatabaseConstraintType } from 'src/sql-tools/types';
+import { ConstraintType, Processor } from 'src/sql-tools/types';
 
 export const processUniqueConstraints: Processor = (builder, items) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'uniqueConstraint')) {
-    const table = resolveTable(builder, object);
+    const table = builder.getTableByObject(object);
     if (!table) {
-      onMissingTable(builder, '@Unique', object);
+      builder.warnMissingTable('@Unique', object);
       continue;
     }
 
@@ -18,7 +15,7 @@ export const processUniqueConstraints: Processor = (builder, items) => {
     const columnNames = options.columns;
 
     table.constraints.push({
-      type: DatabaseConstraintType.UNIQUE,
+      type: ConstraintType.UNIQUE,
       name: options.name || asUniqueConstraintName(tableName, columnNames),
       tableName,
       columnNames,
@@ -31,21 +28,21 @@ export const processUniqueConstraints: Processor = (builder, items) => {
     type,
     item: { object, propertyName, options },
   } of items.filter((item) => item.type === 'column' || item.type === 'foreignKeyColumn')) {
-    const { table, column } = resolveColumn(builder, object, propertyName);
+    const { table, column } = builder.getColumnByObjectAndPropertyName(object, propertyName);
     if (!table) {
-      onMissingTable(builder, '@Column', object);
+      builder.warnMissingTable('@Column', object);
       continue;
     }
 
     if (!column) {
       // should be impossible since they are created in `column.processor.ts`
-      onMissingColumn(builder, '@Column', object, propertyName);
+      builder.warnMissingColumn('@Column', object, propertyName);
       continue;
     }
 
     if (type === 'column' && !options.primary && (options.unique || options.uniqueConstraintName)) {
       table.constraints.push({
-        type: DatabaseConstraintType.UNIQUE,
+        type: ConstraintType.UNIQUE,
         name: options.uniqueConstraintName || asUniqueConstraintName(table.name, [column.name]),
         tableName: table.name,
         columnNames: [column.name],
diff --git a/server/src/sql-tools/public_api.ts b/server/src/sql-tools/public_api.ts
index 61e4a3e431..aaef55dd8d 100644
--- a/server/src/sql-tools/public_api.ts
+++ b/server/src/sql-tools/public_api.ts
@@ -1,29 +1,7 @@
-export { schemaDiff } from 'src/sql-tools/diff';
-export { schemaFromCode } from 'src/sql-tools/from-code';
-export * from 'src/sql-tools/from-code/decorators/after-delete.decorator';
-export * from 'src/sql-tools/from-code/decorators/after-insert.decorator';
-export * from 'src/sql-tools/from-code/decorators/before-update.decorator';
-export * from 'src/sql-tools/from-code/decorators/check.decorator';
-export * from 'src/sql-tools/from-code/decorators/column.decorator';
-export * from 'src/sql-tools/from-code/decorators/configuration-parameter.decorator';
-export * from 'src/sql-tools/from-code/decorators/create-date-column.decorator';
-export * from 'src/sql-tools/from-code/decorators/database.decorator';
-export * from 'src/sql-tools/from-code/decorators/delete-date-column.decorator';
-export * from 'src/sql-tools/from-code/decorators/extension.decorator';
-export * from 'src/sql-tools/from-code/decorators/extensions.decorator';
-export * from 'src/sql-tools/from-code/decorators/foreign-key-column.decorator';
-export * from 'src/sql-tools/from-code/decorators/foreign-key-constraint.decorator';
-export * from 'src/sql-tools/from-code/decorators/generated-column.decorator';
-export * from 'src/sql-tools/from-code/decorators/index.decorator';
-export * from 'src/sql-tools/from-code/decorators/primary-column.decorator';
-export * from 'src/sql-tools/from-code/decorators/primary-generated-column.decorator';
-export * from 'src/sql-tools/from-code/decorators/table.decorator';
-export * from 'src/sql-tools/from-code/decorators/trigger-function.decorator';
-export * from 'src/sql-tools/from-code/decorators/trigger.decorator';
-export * from 'src/sql-tools/from-code/decorators/unique.decorator';
-export * from 'src/sql-tools/from-code/decorators/update-date-column.decorator';
-export * from 'src/sql-tools/from-code/register-enum';
-export * from 'src/sql-tools/from-code/register-function';
-export { schemaFromDatabase } from 'src/sql-tools/from-database';
-export { schemaDiffToSql } from 'src/sql-tools/to-sql';
+export * from 'src/sql-tools/decorators';
+export * from 'src/sql-tools/register-enum';
+export * from 'src/sql-tools/register-function';
+export { schemaDiff, schemaDiffToSql } from 'src/sql-tools/schema-diff';
+export { schemaFromCode } from 'src/sql-tools/schema-from-code';
+export { schemaFromDatabase } from 'src/sql-tools/schema-from-database';
 export * from 'src/sql-tools/types';
diff --git a/server/src/sql-tools/from-database/readers/column.reader.ts b/server/src/sql-tools/readers/column.reader.ts
similarity index 96%
rename from server/src/sql-tools/from-database/readers/column.reader.ts
rename to server/src/sql-tools/readers/column.reader.ts
index 167124bac9..c81fafa68f 100644
--- a/server/src/sql-tools/from-database/readers/column.reader.ts
+++ b/server/src/sql-tools/readers/column.reader.ts
@@ -1,7 +1,6 @@
 import { sql } from 'kysely';
 import { jsonArrayFrom } from 'kysely/helpers/postgres';
-import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
-import { ColumnType, DatabaseColumn } from 'src/sql-tools/types';
+import { ColumnType, DatabaseColumn, DatabaseReader } from 'src/sql-tools/types';
 
 export const readColumns: DatabaseReader = async (schema, db) => {
   const columns = await db
diff --git a/server/src/sql-tools/from-database/readers/comment.reader.ts b/server/src/sql-tools/readers/comment.reader.ts
similarity index 93%
rename from server/src/sql-tools/from-database/readers/comment.reader.ts
rename to server/src/sql-tools/readers/comment.reader.ts
index 3dd4f4adc9..a06e111f84 100644
--- a/server/src/sql-tools/from-database/readers/comment.reader.ts
+++ b/server/src/sql-tools/readers/comment.reader.ts
@@ -1,4 +1,4 @@
-import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+import { DatabaseReader } from 'src/sql-tools/types';
 
 export const readComments: DatabaseReader = async (schema, db) => {
   const comments = await db
diff --git a/server/src/sql-tools/from-database/readers/constraint.reader.ts b/server/src/sql-tools/readers/constraint.reader.ts
similarity index 88%
rename from server/src/sql-tools/from-database/readers/constraint.reader.ts
rename to server/src/sql-tools/readers/constraint.reader.ts
index a633324f25..0e4334bf04 100644
--- a/server/src/sql-tools/from-database/readers/constraint.reader.ts
+++ b/server/src/sql-tools/readers/constraint.reader.ts
@@ -1,6 +1,5 @@
 import { sql } from 'kysely';
-import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
-import { DatabaseActionType, DatabaseConstraintType } from 'src/sql-tools/types';
+import { ActionType, ConstraintType, DatabaseReader } from 'src/sql-tools/types';
 
 export const readConstraints: DatabaseReader = async (schema, db) => {
   const constraints = await db
@@ -60,7 +59,7 @@ export const readConstraints: DatabaseReader = async (schema, db) => {
           continue;
         }
         table.constraints.push({
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: constraintName,
           tableName: constraint.table_name,
           columnNames: constraint.column_names,
@@ -79,7 +78,7 @@ export const readConstraints: DatabaseReader = async (schema, db) => {
         }
 
         table.constraints.push({
-          type: DatabaseConstraintType.FOREIGN_KEY,
+          type: ConstraintType.FOREIGN_KEY,
           name: constraintName,
           tableName: constraint.table_name,
           columnNames: constraint.column_names,
@@ -95,7 +94,7 @@ export const readConstraints: DatabaseReader = async (schema, db) => {
       // unique constraint
       case 'u': {
         table.constraints.push({
-          type: DatabaseConstraintType.UNIQUE,
+          type: ConstraintType.UNIQUE,
           name: constraintName,
           tableName: constraint.table_name,
           columnNames: constraint.column_names as string[],
@@ -107,7 +106,7 @@ export const readConstraints: DatabaseReader = async (schema, db) => {
       //  check constraint
       case 'c': {
         table.constraints.push({
-          type: DatabaseConstraintType.CHECK,
+          type: ConstraintType.CHECK,
           name: constraint.constraint_name,
           tableName: constraint.table_name,
           expression: constraint.expression.replace('CHECK ', ''),
@@ -122,23 +121,23 @@ export const readConstraints: DatabaseReader = async (schema, db) => {
 const asDatabaseAction = (action: string) => {
   switch (action) {
     case 'a': {
-      return DatabaseActionType.NO_ACTION;
+      return ActionType.NO_ACTION;
     }
     case 'c': {
-      return DatabaseActionType.CASCADE;
+      return ActionType.CASCADE;
     }
     case 'r': {
-      return DatabaseActionType.RESTRICT;
+      return ActionType.RESTRICT;
     }
     case 'n': {
-      return DatabaseActionType.SET_NULL;
+      return ActionType.SET_NULL;
     }
     case 'd': {
-      return DatabaseActionType.SET_DEFAULT;
+      return ActionType.SET_DEFAULT;
     }
 
     default: {
-      return DatabaseActionType.NO_ACTION;
+      return ActionType.NO_ACTION;
     }
   }
 };
diff --git a/server/src/sql-tools/from-database/readers/extension.reader.ts b/server/src/sql-tools/readers/extension.reader.ts
similarity index 86%
rename from server/src/sql-tools/from-database/readers/extension.reader.ts
rename to server/src/sql-tools/readers/extension.reader.ts
index c0a59f85d8..6c7e6dd28a 100644
--- a/server/src/sql-tools/from-database/readers/extension.reader.ts
+++ b/server/src/sql-tools/readers/extension.reader.ts
@@ -1,4 +1,4 @@
-import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+import { DatabaseReader } from 'src/sql-tools/types';
 
 export const readExtensions: DatabaseReader = async (schema, db) => {
   const extensions = await db
diff --git a/server/src/sql-tools/from-database/readers/function.reader.ts b/server/src/sql-tools/readers/function.reader.ts
similarity index 92%
rename from server/src/sql-tools/from-database/readers/function.reader.ts
rename to server/src/sql-tools/readers/function.reader.ts
index 0c81117d7c..385d061181 100644
--- a/server/src/sql-tools/from-database/readers/function.reader.ts
+++ b/server/src/sql-tools/readers/function.reader.ts
@@ -1,5 +1,5 @@
 import { sql } from 'kysely';
-import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+import { DatabaseReader } from 'src/sql-tools/types';
 
 export const readFunctions: DatabaseReader = async (schema, db) => {
   const routines = await db
diff --git a/server/src/sql-tools/from-database/readers/index.reader.ts b/server/src/sql-tools/readers/index.reader.ts
similarity index 96%
rename from server/src/sql-tools/from-database/readers/index.reader.ts
rename to server/src/sql-tools/readers/index.reader.ts
index 681ba8f9ef..e3fea7b74f 100644
--- a/server/src/sql-tools/from-database/readers/index.reader.ts
+++ b/server/src/sql-tools/readers/index.reader.ts
@@ -1,5 +1,5 @@
 import { sql } from 'kysely';
-import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+import { DatabaseReader } from 'src/sql-tools/types';
 
 export const readIndexes: DatabaseReader = async (schema, db) => {
   const indexes = await db
diff --git a/server/src/sql-tools/readers/index.ts b/server/src/sql-tools/readers/index.ts
new file mode 100644
index 0000000000..d710fb4acb
--- /dev/null
+++ b/server/src/sql-tools/readers/index.ts
@@ -0,0 +1,25 @@
+import { readColumns } from 'src/sql-tools/readers/column.reader';
+import { readComments } from 'src/sql-tools/readers/comment.reader';
+import { readConstraints } from 'src/sql-tools/readers/constraint.reader';
+import { readExtensions } from 'src/sql-tools/readers/extension.reader';
+import { readFunctions } from 'src/sql-tools/readers/function.reader';
+import { readIndexes } from 'src/sql-tools/readers/index.reader';
+import { readName } from 'src/sql-tools/readers/name.reader';
+import { readParameters } from 'src/sql-tools/readers/parameter.reader';
+import { readTables } from 'src/sql-tools/readers/table.reader';
+import { readTriggers } from 'src/sql-tools/readers/trigger.reader';
+import { DatabaseReader } from 'src/sql-tools/types';
+
+export const readers: DatabaseReader[] = [
+  //
+  readName,
+  readParameters,
+  readExtensions,
+  readFunctions,
+  readTables,
+  readColumns,
+  readIndexes,
+  readConstraints,
+  readTriggers,
+  readComments,
+];
diff --git a/server/src/sql-tools/from-database/readers/name.reader.ts b/server/src/sql-tools/readers/name.reader.ts
similarity index 66%
rename from server/src/sql-tools/from-database/readers/name.reader.ts
rename to server/src/sql-tools/readers/name.reader.ts
index dc3d4ec745..5989ccb4c9 100644
--- a/server/src/sql-tools/from-database/readers/name.reader.ts
+++ b/server/src/sql-tools/readers/name.reader.ts
@@ -1,8 +1,8 @@
 import { QueryResult, sql } from 'kysely';
-import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+import { DatabaseReader } from 'src/sql-tools/types';
 
 export const readName: DatabaseReader = async (schema, db) => {
   const result = (await sql`SELECT current_database() as name`.execute(db)) as QueryResult<{ name: string }>;
 
-  schema.name = result.rows[0].name;
+  schema.databaseName = result.rows[0].name;
 };
diff --git a/server/src/sql-tools/from-database/readers/parameter.reader.ts b/server/src/sql-tools/readers/parameter.reader.ts
similarity index 76%
rename from server/src/sql-tools/from-database/readers/parameter.reader.ts
rename to server/src/sql-tools/readers/parameter.reader.ts
index f58718a6b6..7930c251f4 100644
--- a/server/src/sql-tools/from-database/readers/parameter.reader.ts
+++ b/server/src/sql-tools/readers/parameter.reader.ts
@@ -1,6 +1,5 @@
 import { sql } from 'kysely';
-import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
-import { ParameterScope } from 'src/sql-tools/types';
+import { DatabaseReader, ParameterScope } from 'src/sql-tools/types';
 
 export const readParameters: DatabaseReader = async (schema, db) => {
   const parameters = await db
@@ -13,7 +12,7 @@ export const readParameters: DatabaseReader = async (schema, db) => {
     schema.parameters.push({
       name: parameter.name,
       value: parameter.value,
-      databaseName: schema.name,
+      databaseName: schema.databaseName,
       scope: parameter.scope as ParameterScope,
       synchronize: true,
     });
diff --git a/server/src/sql-tools/from-database/readers/table.reader.ts b/server/src/sql-tools/readers/table.reader.ts
similarity index 87%
rename from server/src/sql-tools/from-database/readers/table.reader.ts
rename to server/src/sql-tools/readers/table.reader.ts
index 6dbf9fc8b8..793da20644 100644
--- a/server/src/sql-tools/from-database/readers/table.reader.ts
+++ b/server/src/sql-tools/readers/table.reader.ts
@@ -1,5 +1,5 @@
 import { sql } from 'kysely';
-import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
+import { DatabaseReader } from 'src/sql-tools/types';
 
 export const readTables: DatabaseReader = async (schema, db) => {
   const tables = await db
diff --git a/server/src/sql-tools/from-database/readers/trigger.reader.ts b/server/src/sql-tools/readers/trigger.reader.ts
similarity index 56%
rename from server/src/sql-tools/from-database/readers/trigger.reader.ts
rename to server/src/sql-tools/readers/trigger.reader.ts
index a174a7502b..09e7ae9c8a 100644
--- a/server/src/sql-tools/from-database/readers/trigger.reader.ts
+++ b/server/src/sql-tools/readers/trigger.reader.ts
@@ -1,5 +1,4 @@
-import { DatabaseReader } from 'src/sql-tools/from-database/readers/type';
-import { parseTriggerType } from 'src/sql-tools/helpers';
+import { DatabaseReader, TriggerAction, TriggerScope, TriggerTiming } from 'src/sql-tools/types';
 
 export const readTriggers: DatabaseReader = async (schema, db) => {
   const triggers = await db
@@ -44,3 +43,44 @@ export const readTriggers: DatabaseReader = async (schema, db) => {
     });
   }
 };
+
+export const hasMask = (input: number, mask: number) => (input & mask) === mask;
+
+export const parseTriggerType = (type: number) => {
+  // eslint-disable-next-line unicorn/prefer-math-trunc
+  const scope: TriggerScope = hasMask(type, 1 << 0) ? 'row' : 'statement';
+
+  let timing: TriggerTiming = 'after';
+  const timingMasks: Array<{ mask: number; value: TriggerTiming }> = [
+    { mask: 1 << 1, value: 'before' },
+    { mask: 1 << 6, value: 'instead of' },
+  ];
+
+  for (const { mask, value } of timingMasks) {
+    if (hasMask(type, mask)) {
+      timing = value;
+      break;
+    }
+  }
+
+  const actions: TriggerAction[] = [];
+  const actionMasks: Array<{ mask: number; value: TriggerAction }> = [
+    { mask: 1 << 2, value: 'insert' },
+    { mask: 1 << 3, value: 'delete' },
+    { mask: 1 << 4, value: 'update' },
+    { mask: 1 << 5, value: 'truncate' },
+  ];
+
+  for (const { mask, value } of actionMasks) {
+    if (hasMask(type, mask)) {
+      actions.push(value);
+      break;
+    }
+  }
+
+  if (actions.length === 0) {
+    throw new Error(`Unable to parse trigger type ${type}`);
+  }
+
+  return { actions, timing, scope };
+};
diff --git a/server/src/sql-tools/from-code/register-enum.ts b/server/src/sql-tools/register-enum.ts
similarity index 86%
rename from server/src/sql-tools/from-code/register-enum.ts
rename to server/src/sql-tools/register-enum.ts
index e2415cebff..5e9b41adcb 100644
--- a/server/src/sql-tools/from-code/register-enum.ts
+++ b/server/src/sql-tools/register-enum.ts
@@ -1,4 +1,4 @@
-import { register } from 'src/sql-tools/from-code/register';
+import { register } from 'src/sql-tools/register';
 import { DatabaseEnum } from 'src/sql-tools/types';
 
 export type EnumOptions = {
diff --git a/server/src/sql-tools/from-code/register-function.ts b/server/src/sql-tools/register-function.ts
similarity index 96%
rename from server/src/sql-tools/from-code/register-function.ts
rename to server/src/sql-tools/register-function.ts
index 3e1e7054be..9f1c84c4fa 100644
--- a/server/src/sql-tools/from-code/register-function.ts
+++ b/server/src/sql-tools/register-function.ts
@@ -1,4 +1,4 @@
-import { register } from 'src/sql-tools/from-code/register';
+import { register } from 'src/sql-tools/register';
 import { ColumnType, DatabaseFunction } from 'src/sql-tools/types';
 
 export type FunctionOptions = {
diff --git a/server/src/sql-tools/from-code/register-item.ts b/server/src/sql-tools/register-item.ts
similarity index 53%
rename from server/src/sql-tools/from-code/register-item.ts
rename to server/src/sql-tools/register-item.ts
index 2f394cf9c1..fede281a1b 100644
--- a/server/src/sql-tools/from-code/register-item.ts
+++ b/server/src/sql-tools/register-item.ts
@@ -1,17 +1,17 @@
-import { CheckOptions } from 'src/sql-tools/from-code/decorators/check.decorator';
-import { ColumnOptions } from 'src/sql-tools/from-code/decorators/column.decorator';
-import { ConfigurationParameterOptions } from 'src/sql-tools/from-code/decorators/configuration-parameter.decorator';
-import { DatabaseOptions } from 'src/sql-tools/from-code/decorators/database.decorator';
-import { ExtensionOptions } from 'src/sql-tools/from-code/decorators/extension.decorator';
-import { ForeignKeyColumnOptions } from 'src/sql-tools/from-code/decorators/foreign-key-column.decorator';
-import { ForeignKeyConstraintOptions } from 'src/sql-tools/from-code/decorators/foreign-key-constraint.decorator';
-import { IndexOptions } from 'src/sql-tools/from-code/decorators/index.decorator';
-import { TableOptions } from 'src/sql-tools/from-code/decorators/table.decorator';
-import { TriggerOptions } from 'src/sql-tools/from-code/decorators/trigger.decorator';
-import { UniqueOptions } from 'src/sql-tools/from-code/decorators/unique.decorator';
+/* eslint-disable @typescript-eslint/no-unsafe-function-type */
+import { CheckOptions } from 'src/sql-tools/decorators/check.decorator';
+import { ColumnOptions } from 'src/sql-tools/decorators/column.decorator';
+import { ConfigurationParameterOptions } from 'src/sql-tools/decorators/configuration-parameter.decorator';
+import { DatabaseOptions } from 'src/sql-tools/decorators/database.decorator';
+import { ExtensionOptions } from 'src/sql-tools/decorators/extension.decorator';
+import { ForeignKeyColumnOptions } from 'src/sql-tools/decorators/foreign-key-column.decorator';
+import { ForeignKeyConstraintOptions } from 'src/sql-tools/decorators/foreign-key-constraint.decorator';
+import { IndexOptions } from 'src/sql-tools/decorators/index.decorator';
+import { TableOptions } from 'src/sql-tools/decorators/table.decorator';
+import { TriggerOptions } from 'src/sql-tools/decorators/trigger.decorator';
+import { UniqueOptions } from 'src/sql-tools/decorators/unique.decorator';
 import { DatabaseEnum, DatabaseFunction } from 'src/sql-tools/types';
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
 export type ClassBased<T> = { object: Function } & T;
 export type PropertyBased<T> = { object: object; propertyName: string | symbol } & T;
 export type RegisterItem =
@@ -26,6 +26,6 @@ export type RegisterItem =
   | { type: 'trigger'; item: ClassBased<{ options: TriggerOptions }> }
   | { type: 'extension'; item: ClassBased<{ options: ExtensionOptions }> }
   | { type: 'configurationParameter'; item: ClassBased<{ options: ConfigurationParameterOptions }> }
-  | { type: 'foreignKeyColumn'; item: PropertyBased<{ options: ForeignKeyColumnOptions; target: () => object }> }
+  | { type: 'foreignKeyColumn'; item: PropertyBased<{ options: ForeignKeyColumnOptions; target: () => Function }> }
   | { type: 'foreignKeyConstraint'; item: ClassBased<{ options: ForeignKeyConstraintOptions }> };
 export type RegisterItemType<T extends RegisterItem['type']> = Extract<RegisterItem, { type: T }>['item'];
diff --git a/server/src/sql-tools/from-code/register.ts b/server/src/sql-tools/register.ts
similarity index 76%
rename from server/src/sql-tools/from-code/register.ts
rename to server/src/sql-tools/register.ts
index 824af28c52..4df04c935a 100644
--- a/server/src/sql-tools/from-code/register.ts
+++ b/server/src/sql-tools/register.ts
@@ -1,4 +1,4 @@
-import { RegisterItem } from 'src/sql-tools/from-code/register-item';
+import { RegisterItem } from 'src/sql-tools/register-item';
 
 const items: RegisterItem[] = [];
 
diff --git a/server/src/sql-tools/schema-builder.ts b/server/src/sql-tools/schema-builder.ts
new file mode 100644
index 0000000000..e9d82b509a
--- /dev/null
+++ b/server/src/sql-tools/schema-builder.ts
@@ -0,0 +1,121 @@
+/* eslint-disable @typescript-eslint/no-unsafe-function-type */
+import { ColumnOptions, TableOptions } from 'src/sql-tools/decorators';
+import { asKey } from 'src/sql-tools/helpers';
+import {
+  DatabaseColumn,
+  DatabaseEnum,
+  DatabaseExtension,
+  DatabaseFunction,
+  DatabaseParameter,
+  DatabaseSchema,
+  DatabaseTable,
+  SchemaFromCodeOptions,
+} from 'src/sql-tools/types';
+
+type TableMetadata = { options: TableOptions; object: Function; methodToColumn: Map<string | symbol, DatabaseColumn> };
+
+export class SchemaBuilder {
+  databaseName: string;
+  schemaName: string;
+  tables: DatabaseTable[] = [];
+  functions: DatabaseFunction[] = [];
+  enums: DatabaseEnum[] = [];
+  extensions: DatabaseExtension[] = [];
+  parameters: DatabaseParameter[] = [];
+  warnings: string[] = [];
+
+  classToTable: WeakMap<Function, DatabaseTable> = new WeakMap();
+  tableToMetadata: WeakMap<DatabaseTable, TableMetadata> = new WeakMap();
+
+  constructor(options: SchemaFromCodeOptions) {
+    this.databaseName = options.databaseName ?? 'postgres';
+    this.schemaName = options.schemaName ?? 'public';
+  }
+
+  getTableByObject(object: Function) {
+    return this.classToTable.get(object);
+  }
+
+  getTableByName(name: string) {
+    return this.tables.find((table) => table.name === name);
+  }
+
+  getTableMetadata(table: DatabaseTable) {
+    const metadata = this.tableToMetadata.get(table);
+    if (!metadata) {
+      throw new Error(`Table metadata not found for table: ${table.name}`);
+    }
+    return metadata;
+  }
+
+  addTable(table: DatabaseTable, options: TableOptions, object: Function) {
+    this.tables.push(table);
+    this.classToTable.set(object, table);
+    this.tableToMetadata.set(table, { options, object, methodToColumn: new Map() });
+  }
+
+  getColumnByObjectAndPropertyName(
+    object: object,
+    propertyName: string | symbol,
+  ): { table?: DatabaseTable; column?: DatabaseColumn } {
+    const table = this.getTableByObject(object.constructor);
+    if (!table) {
+      return {};
+    }
+
+    const tableMetadata = this.tableToMetadata.get(table);
+    if (!tableMetadata) {
+      return {};
+    }
+
+    const column = tableMetadata.methodToColumn.get(propertyName);
+
+    return { table, column };
+  }
+
+  addColumn(table: DatabaseTable, column: DatabaseColumn, options: ColumnOptions, propertyName: string | symbol) {
+    table.columns.push(column);
+    const tableMetadata = this.getTableMetadata(table);
+    tableMetadata.methodToColumn.set(propertyName, column);
+  }
+
+  asIndexName(table: string, columns?: string[], where?: string) {
+    const items: string[] = [];
+    for (const columnName of columns ?? []) {
+      items.push(columnName);
+    }
+
+    if (where) {
+      items.push(where);
+    }
+
+    return asKey('IDX_', table, items);
+  }
+
+  warn(context: string, message: string) {
+    this.warnings.push(`[${context}] ${message}`);
+  }
+
+  warnMissingTable(context: string, object: object, propertyName?: symbol | string) {
+    const label = object.constructor.name + (propertyName ? '.' + String(propertyName) : '');
+    this.warn(context, `Unable to find table (${label})`);
+  }
+
+  warnMissingColumn(context: string, object: object, propertyName?: symbol | string) {
+    const label = object.constructor.name + (propertyName ? '.' + String(propertyName) : '');
+    this.warn(context, `Unable to find column (${label})`);
+  }
+
+  build(): DatabaseSchema {
+    return {
+      databaseName: this.databaseName,
+      schemaName: this.schemaName,
+      tables: this.tables,
+      functions: this.functions,
+      enums: this.enums,
+      extensions: this.extensions,
+      parameters: this.parameters,
+      warnings: this.warnings,
+    };
+  }
+}
diff --git a/server/src/sql-tools/diff/index.spec.ts b/server/src/sql-tools/schema-diff.spec.ts
similarity index 90%
rename from server/src/sql-tools/diff/index.spec.ts
rename to server/src/sql-tools/schema-diff.spec.ts
index 7ffd3946f2..98153eabd9 100644
--- a/server/src/sql-tools/diff/index.spec.ts
+++ b/server/src/sql-tools/schema-diff.spec.ts
@@ -1,10 +1,10 @@
-import { schemaDiff } from 'src/sql-tools/diff';
+import { schemaDiff } from 'src/sql-tools/schema-diff';
 import {
+  ActionType,
   ColumnType,
-  DatabaseActionType,
+  ConstraintType,
   DatabaseColumn,
   DatabaseConstraint,
-  DatabaseConstraintType,
   DatabaseIndex,
   DatabaseSchema,
   DatabaseTable,
@@ -15,7 +15,7 @@ const fromColumn = (column: Partial<Omit<DatabaseColumn, 'tableName'>>): Databas
   const tableName = 'table1';
 
   return {
-    name: 'postgres',
+    databaseName: 'postgres',
     schemaName: 'public',
     functions: [],
     enums: [],
@@ -49,7 +49,7 @@ const fromConstraint = (constraint?: DatabaseConstraint): DatabaseSchema => {
   const tableName = constraint?.tableName || 'table1';
 
   return {
-    name: 'postgres',
+    databaseName: 'postgres',
     schemaName: 'public',
     functions: [],
     enums: [],
@@ -82,7 +82,7 @@ const fromIndex = (index?: DatabaseIndex): DatabaseSchema => {
   const tableName = index?.tableName || 'table1';
 
   return {
-    name: 'postgres',
+    databaseName: 'postgres',
     schemaName: 'public',
     functions: [],
     enums: [],
@@ -155,7 +155,7 @@ const newSchema = (schema: {
   }
 
   return {
-    name: 'immich',
+    databaseName: 'immich',
     schemaName: schema?.name || 'public',
     functions: [],
     enums: [],
@@ -166,14 +166,14 @@ const newSchema = (schema: {
   };
 };
 
-describe('schemaDiff', () => {
+describe(schemaDiff.name, () => {
   it('should work', () => {
     const diff = schemaDiff(newSchema({ tables: [] }), newSchema({ tables: [] }));
     expect(diff.items).toEqual([]);
   });
 
   describe('table', () => {
-    describe('table.create', () => {
+    describe('TableCreate', () => {
       it('should find a missing table', () => {
         const column: DatabaseColumn = {
           type: 'character varying',
@@ -190,7 +190,7 @@ describe('schemaDiff', () => {
 
         expect(diff.items).toHaveLength(1);
         expect(diff.items[0]).toEqual({
-          type: 'table.create',
+          type: 'TableCreate',
           table: {
             name: 'table1',
             columns: [column],
@@ -204,7 +204,7 @@ describe('schemaDiff', () => {
       });
     });
 
-    describe('table.drop', () => {
+    describe('TableDrop', () => {
       it('should find an extra table', () => {
         const diff = schemaDiff(
           newSchema({ tables: [] }),
@@ -216,7 +216,7 @@ describe('schemaDiff', () => {
 
         expect(diff.items).toHaveLength(1);
         expect(diff.items[0]).toEqual({
-          type: 'table.drop',
+          type: 'TableDrop',
           tableName: 'table1',
           reason: 'missing in source',
         });
@@ -238,7 +238,7 @@ describe('schemaDiff', () => {
   });
 
   describe('column', () => {
-    describe('column.add', () => {
+    describe('ColumnAdd', () => {
       it('should find a new column', () => {
         const diff = schemaDiff(
           newSchema({
@@ -256,7 +256,7 @@ describe('schemaDiff', () => {
 
         expect(diff.items).toEqual([
           {
-            type: 'column.add',
+            type: 'ColumnAdd',
             column: {
               tableName: 'table1',
               isArray: false,
@@ -271,7 +271,7 @@ describe('schemaDiff', () => {
       });
     });
 
-    describe('column.drop', () => {
+    describe('ColumnDrop', () => {
       it('should find an extra column', () => {
         const diff = schemaDiff(
           newSchema({
@@ -289,7 +289,7 @@ describe('schemaDiff', () => {
 
         expect(diff.items).toEqual([
           {
-            type: 'column.drop',
+            type: 'ColumnDrop',
             tableName: 'table1',
             columnName: 'column2',
             reason: 'missing in source',
@@ -307,7 +307,7 @@ describe('schemaDiff', () => {
 
         expect(diff.items).toEqual([
           {
-            type: 'column.alter',
+            type: 'ColumnAlter',
             tableName: 'table1',
             columnName: 'column1',
             changes: {
@@ -326,7 +326,7 @@ describe('schemaDiff', () => {
 
         expect(diff.items).toEqual([
           {
-            type: 'column.alter',
+            type: 'ColumnAlter',
             tableName: 'table1',
             columnName: 'column1',
             changes: {
@@ -347,7 +347,7 @@ describe('schemaDiff', () => {
 
         expect(diff.items).toEqual([
           {
-            type: 'column.alter',
+            type: 'ColumnAlter',
             tableName: 'table1',
             columnName: 'column1',
             changes: {
@@ -388,12 +388,12 @@ describe('schemaDiff', () => {
   });
 
   describe('constraint', () => {
-    describe('constraint.add', () => {
+    describe('ConstraintAdd', () => {
       it('should detect a new constraint', () => {
         const diff = schemaDiff(
           fromConstraint({
             name: 'PK_test',
-            type: DatabaseConstraintType.PRIMARY_KEY,
+            type: ConstraintType.PRIMARY_KEY,
             tableName: 'table1',
             columnNames: ['id'],
             synchronize: true,
@@ -403,9 +403,9 @@ describe('schemaDiff', () => {
 
         expect(diff.items).toEqual([
           {
-            type: 'constraint.add',
+            type: 'ConstraintAdd',
             constraint: {
-              type: DatabaseConstraintType.PRIMARY_KEY,
+              type: ConstraintType.PRIMARY_KEY,
               name: 'PK_test',
               columnNames: ['id'],
               tableName: 'table1',
@@ -417,13 +417,13 @@ describe('schemaDiff', () => {
       });
     });
 
-    describe('constraint.drop', () => {
+    describe('ConstraintDrop', () => {
       it('should detect an extra constraint', () => {
         const diff = schemaDiff(
           fromConstraint(),
           fromConstraint({
             name: 'PK_test',
-            type: DatabaseConstraintType.PRIMARY_KEY,
+            type: ConstraintType.PRIMARY_KEY,
             tableName: 'table1',
             columnNames: ['id'],
             synchronize: true,
@@ -432,7 +432,7 @@ describe('schemaDiff', () => {
 
         expect(diff.items).toEqual([
           {
-            type: 'constraint.drop',
+            type: 'ConstraintDrop',
             tableName: 'table1',
             constraintName: 'PK_test',
             reason: 'missing in source',
@@ -444,7 +444,7 @@ describe('schemaDiff', () => {
     describe('primary key', () => {
       it('should skip identical primary key constraints', () => {
         const constraint: DatabaseConstraint = {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_test',
           tableName: 'table1',
           columnNames: ['id'],
@@ -460,7 +460,7 @@ describe('schemaDiff', () => {
     describe('foreign key', () => {
       it('should skip identical foreign key constraints', () => {
         const constraint: DatabaseConstraint = {
-          type: DatabaseConstraintType.FOREIGN_KEY,
+          type: ConstraintType.FOREIGN_KEY,
           name: 'FK_test',
           tableName: 'table1',
           columnNames: ['parentId'],
@@ -476,7 +476,7 @@ describe('schemaDiff', () => {
 
       it('should drop and recreate when the column changes', () => {
         const constraint: DatabaseConstraint = {
-          type: DatabaseConstraintType.FOREIGN_KEY,
+          type: ConstraintType.FOREIGN_KEY,
           name: 'FK_test',
           tableName: 'table1',
           columnNames: ['parentId'],
@@ -495,7 +495,7 @@ describe('schemaDiff', () => {
             constraintName: 'FK_test',
             reason: 'columns are different (parentId vs parentId2)',
             tableName: 'table1',
-            type: 'constraint.drop',
+            type: 'ConstraintDrop',
           },
           {
             constraint: {
@@ -508,20 +508,20 @@ describe('schemaDiff', () => {
               type: 'foreign-key',
             },
             reason: 'columns are different (parentId vs parentId2)',
-            type: 'constraint.add',
+            type: 'ConstraintAdd',
           },
         ]);
       });
 
       it('should drop and recreate when the ON DELETE action changes', () => {
         const constraint: DatabaseConstraint = {
-          type: DatabaseConstraintType.FOREIGN_KEY,
+          type: ConstraintType.FOREIGN_KEY,
           name: 'FK_test',
           tableName: 'table1',
           columnNames: ['parentId'],
           referenceTableName: 'table2',
           referenceColumnNames: ['id'],
-          onDelete: DatabaseActionType.CASCADE,
+          onDelete: ActionType.CASCADE,
           synchronize: true,
         };
 
@@ -532,7 +532,7 @@ describe('schemaDiff', () => {
             constraintName: 'FK_test',
             reason: 'ON DELETE action is different (CASCADE vs NO ACTION)',
             tableName: 'table1',
-            type: 'constraint.drop',
+            type: 'ConstraintDrop',
           },
           {
             constraint: {
@@ -540,13 +540,13 @@ describe('schemaDiff', () => {
               name: 'FK_test',
               referenceColumnNames: ['id'],
               referenceTableName: 'table2',
-              onDelete: DatabaseActionType.CASCADE,
+              onDelete: ActionType.CASCADE,
               synchronize: true,
               tableName: 'table1',
               type: 'foreign-key',
             },
             reason: 'ON DELETE action is different (CASCADE vs NO ACTION)',
-            type: 'constraint.add',
+            type: 'ConstraintAdd',
           },
         ]);
       });
@@ -555,7 +555,7 @@ describe('schemaDiff', () => {
     describe('unique', () => {
       it('should skip identical unique constraints', () => {
         const constraint: DatabaseConstraint = {
-          type: DatabaseConstraintType.UNIQUE,
+          type: ConstraintType.UNIQUE,
           name: 'UQ_test',
           tableName: 'table1',
           columnNames: ['id'],
@@ -571,7 +571,7 @@ describe('schemaDiff', () => {
     describe('check', () => {
       it('should skip identical check constraints', () => {
         const constraint: DatabaseConstraint = {
-          type: DatabaseConstraintType.CHECK,
+          type: ConstraintType.CHECK,
           name: 'CHK_test',
           tableName: 'table1',
           expression: 'column1 > 0',
@@ -586,7 +586,7 @@ describe('schemaDiff', () => {
   });
 
   describe('index', () => {
-    describe('index.create', () => {
+    describe('IndexCreate', () => {
       it('should detect a new index', () => {
         const diff = schemaDiff(
           fromIndex({
@@ -601,7 +601,7 @@ describe('schemaDiff', () => {
 
         expect(diff.items).toEqual([
           {
-            type: 'index.create',
+            type: 'IndexCreate',
             index: {
               name: 'IDX_test',
               columnNames: ['id'],
@@ -615,7 +615,7 @@ describe('schemaDiff', () => {
       });
     });
 
-    describe('index.drop', () => {
+    describe('IndexDrop', () => {
       it('should detect an extra index', () => {
         const diff = schemaDiff(
           fromIndex(),
@@ -630,7 +630,7 @@ describe('schemaDiff', () => {
 
         expect(diff.items).toEqual([
           {
-            type: 'index.drop',
+            type: 'IndexDrop',
             indexName: 'IDX_test',
             reason: 'missing in source',
           },
@@ -650,12 +650,12 @@ describe('schemaDiff', () => {
 
       expect(diff.items).toEqual([
         {
-          type: 'index.drop',
+          type: 'IndexDrop',
           indexName: 'IDX_test',
           reason: 'uniqueness is different (true vs false)',
         },
         {
-          type: 'index.create',
+          type: 'IndexCreate',
           index,
           reason: 'uniqueness is different (true vs false)',
         },
diff --git a/server/src/sql-tools/schema-diff.ts b/server/src/sql-tools/schema-diff.ts
new file mode 100644
index 0000000000..9708a11c4a
--- /dev/null
+++ b/server/src/sql-tools/schema-diff.ts
@@ -0,0 +1,121 @@
+import { compareEnums } from 'src/sql-tools/comparers/enum.comparer';
+import { compareExtensions } from 'src/sql-tools/comparers/extension.comparer';
+import { compareFunctions } from 'src/sql-tools/comparers/function.comparer';
+import { compareParameters } from 'src/sql-tools/comparers/parameter.comparer';
+import { compareTables } from 'src/sql-tools/comparers/table.comparer';
+import { compare } from 'src/sql-tools/helpers';
+import { transformers } from 'src/sql-tools/transformers';
+import {
+  ConstraintType,
+  DatabaseSchema,
+  SchemaDiff,
+  SchemaDiffOptions,
+  SchemaDiffToSqlOptions,
+} from 'src/sql-tools/types';
+
+/**
+ * Compute the difference between two database schemas
+ */
+export const schemaDiff = (source: DatabaseSchema, target: DatabaseSchema, options: SchemaDiffOptions = {}) => {
+  const items = [
+    ...compare(source.parameters, target.parameters, options.parameters, compareParameters),
+    ...compare(source.extensions, target.extensions, options.extension, compareExtensions),
+    ...compare(source.functions, target.functions, options.functions, compareFunctions),
+    ...compare(source.enums, target.enums, options.enums, compareEnums),
+    ...compare(source.tables, target.tables, options.tables, compareTables),
+  ];
+
+  type SchemaName = SchemaDiff['type'];
+  const itemMap: Record<SchemaName, SchemaDiff[]> = {
+    EnumCreate: [],
+    EnumDrop: [],
+    ExtensionCreate: [],
+    ExtensionDrop: [],
+    FunctionCreate: [],
+    FunctionDrop: [],
+    TableCreate: [],
+    TableDrop: [],
+    ColumnAdd: [],
+    ColumnAlter: [],
+    ColumnDrop: [],
+    ConstraintAdd: [],
+    ConstraintDrop: [],
+    IndexCreate: [],
+    IndexDrop: [],
+    TriggerCreate: [],
+    TriggerDrop: [],
+    ParameterSet: [],
+    ParameterReset: [],
+  };
+
+  for (const item of items) {
+    itemMap[item.type].push(item);
+  }
+
+  const constraintAdds = itemMap.ConstraintAdd.filter((item) => item.type === 'ConstraintAdd');
+
+  const orderedItems = [
+    ...itemMap.ExtensionCreate,
+    ...itemMap.FunctionCreate,
+    ...itemMap.ParameterSet,
+    ...itemMap.ParameterReset,
+    ...itemMap.EnumCreate,
+    ...itemMap.TriggerDrop,
+    ...itemMap.IndexDrop,
+    ...itemMap.ConstraintDrop,
+    ...itemMap.TableCreate,
+    ...itemMap.ColumnAlter,
+    ...itemMap.ColumnAdd,
+    ...constraintAdds.filter(({ constraint }) => constraint.type === ConstraintType.PRIMARY_KEY),
+    ...constraintAdds.filter(({ constraint }) => constraint.type === ConstraintType.FOREIGN_KEY),
+    ...constraintAdds.filter(({ constraint }) => constraint.type === ConstraintType.UNIQUE),
+    ...constraintAdds.filter(({ constraint }) => constraint.type === ConstraintType.CHECK),
+    ...itemMap.IndexCreate,
+    ...itemMap.TriggerCreate,
+    ...itemMap.ColumnDrop,
+    ...itemMap.TableDrop,
+    ...itemMap.EnumDrop,
+    ...itemMap.FunctionDrop,
+  ];
+
+  return {
+    items: orderedItems,
+    asSql: (options?: SchemaDiffToSqlOptions) => schemaDiffToSql(orderedItems, options),
+  };
+};
+
+/**
+ * Convert schema diffs into SQL statements
+ */
+export const schemaDiffToSql = (items: SchemaDiff[], options: SchemaDiffToSqlOptions = {}): string[] => {
+  return items.flatMap((item) => asSql(item).map((result) => result + withComments(options.comments, item)));
+};
+
+const asSql = (item: SchemaDiff): string[] => {
+  for (const transform of transformers) {
+    const result = transform(item);
+    if (!result) {
+      continue;
+    }
+
+    return asArray(result);
+  }
+
+  throw new Error(`Unhandled schema diff type: ${item.type}`);
+};
+
+const withComments = (comments: boolean | undefined, item: SchemaDiff): string => {
+  if (!comments) {
+    return '';
+  }
+
+  return ` -- ${item.reason}`;
+};
+
+const asArray = <T>(items: T | T[]): T[] => {
+  if (Array.isArray(items)) {
+    return items;
+  }
+
+  return [items];
+};
diff --git a/server/src/sql-tools/schema-from-code.spec.ts b/server/src/sql-tools/schema-from-code.spec.ts
new file mode 100644
index 0000000000..55e64e0b4e
--- /dev/null
+++ b/server/src/sql-tools/schema-from-code.spec.ts
@@ -0,0 +1,46 @@
+import { readdirSync } from 'node:fs';
+import { join } from 'node:path';
+import { schemaFromCode } from 'src/sql-tools/schema-from-code';
+import { describe, expect, it } from 'vitest';
+
+describe(schemaFromCode.name, () => {
+  it('should work', () => {
+    expect(schemaFromCode({ reset: true })).toEqual({
+      databaseName: 'postgres',
+      schemaName: 'public',
+      functions: [],
+      enums: [],
+      extensions: [],
+      parameters: [],
+      tables: [],
+      warnings: [],
+    });
+  });
+
+  describe('test files', () => {
+    const errorStubs = readdirSync('test/sql-tools/errors', { withFileTypes: true });
+    for (const file of errorStubs) {
+      const filePath = join(file.parentPath, file.name);
+      it(filePath, async () => {
+        const module = await import(filePath);
+        expect(module.message).toBeDefined();
+        expect(() => schemaFromCode({ reset: true })).toThrowError(module.message);
+      });
+    }
+
+    const stubs = readdirSync('test/sql-tools', { withFileTypes: true });
+    for (const file of stubs) {
+      if (file.isDirectory()) {
+        continue;
+      }
+
+      const filePath = join(file.parentPath, file.name);
+      it(filePath, async () => {
+        const module = await import(filePath);
+        expect(module.description).toBeDefined();
+        expect(module.schema).toBeDefined();
+        expect(schemaFromCode({ reset: true }), module.description).toEqual(module.schema);
+      });
+    }
+  });
+});
diff --git a/server/src/sql-tools/schema-from-code.ts b/server/src/sql-tools/schema-from-code.ts
new file mode 100644
index 0000000000..f36e0ee07e
--- /dev/null
+++ b/server/src/sql-tools/schema-from-code.ts
@@ -0,0 +1,29 @@
+import { processors } from 'src/sql-tools/processors';
+import { getRegisteredItems, resetRegisteredItems } from 'src/sql-tools/register';
+import { SchemaBuilder } from 'src/sql-tools/schema-builder';
+import { SchemaFromCodeOptions } from 'src/sql-tools/types';
+
+/**
+ * Load schema from code (decorators, etc)
+ */
+export const schemaFromCode = (options: SchemaFromCodeOptions = {}) => {
+  try {
+    const globalOptions = {
+      createForeignKeyIndexes: options.createForeignKeyIndexes ?? true,
+    };
+
+    const builder = new SchemaBuilder(options);
+    const items = getRegisteredItems();
+    for (const processor of processors) {
+      processor(builder, items, globalOptions);
+    }
+
+    const newSchema = builder.build();
+
+    return newSchema;
+  } finally {
+    if (options.reset) {
+      resetRegisteredItems();
+    }
+  }
+};
diff --git a/server/src/sql-tools/schema-from-database.ts b/server/src/sql-tools/schema-from-database.ts
new file mode 100644
index 0000000000..7122ec1105
--- /dev/null
+++ b/server/src/sql-tools/schema-from-database.ts
@@ -0,0 +1,33 @@
+import { Kysely } from 'kysely';
+import { PostgresJSDialect } from 'kysely-postgres-js';
+import { Sql } from 'postgres';
+import { readers } from 'src/sql-tools/readers';
+import { DatabaseSchema, PostgresDB, SchemaFromDatabaseOptions } from 'src/sql-tools/types';
+
+/**
+ * Load schema from a database url
+ */
+export const schemaFromDatabase = async (
+  postgres: Sql,
+  options: SchemaFromDatabaseOptions = {},
+): Promise<DatabaseSchema> => {
+  const schema: DatabaseSchema = {
+    databaseName: 'immich',
+    schemaName: options.schemaName || 'public',
+    parameters: [],
+    functions: [],
+    enums: [],
+    extensions: [],
+    tables: [],
+    warnings: [],
+  };
+
+  const db = new Kysely<PostgresDB>({ dialect: new PostgresJSDialect({ postgres }) });
+  for (const reader of readers) {
+    await reader(schema, db);
+  }
+
+  await db.destroy();
+
+  return schema;
+};
diff --git a/server/src/sql-tools/to-sql/index.spec.ts b/server/src/sql-tools/to-sql/index.spec.ts
deleted file mode 100644
index 509f44ebe5..0000000000
--- a/server/src/sql-tools/to-sql/index.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { schemaDiffToSql } from 'src/sql-tools';
-import { describe, expect, it } from 'vitest';
-
-describe(schemaDiffToSql.name, () => {
-  describe('comments', () => {
-    it('should include the reason in a SQL comment', () => {
-      expect(
-        schemaDiffToSql(
-          [
-            {
-              type: 'index.drop',
-              indexName: 'IDX_test',
-              reason: 'unknown',
-            },
-          ],
-          { comments: true },
-        ),
-      ).toEqual([`DROP INDEX "IDX_test"; -- unknown`]);
-    });
-  });
-});
diff --git a/server/src/sql-tools/to-sql/index.ts b/server/src/sql-tools/to-sql/index.ts
deleted file mode 100644
index 973c7ef287..0000000000
--- a/server/src/sql-tools/to-sql/index.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { transformColumns } from 'src/sql-tools/to-sql/transformers/column.transformer';
-import { transformConstraints } from 'src/sql-tools/to-sql/transformers/constraint.transformer';
-import { transformEnums } from 'src/sql-tools/to-sql/transformers/enum.transformer';
-import { transformExtensions } from 'src/sql-tools/to-sql/transformers/extension.transformer';
-import { transformFunctions } from 'src/sql-tools/to-sql/transformers/function.transformer';
-import { transformIndexes } from 'src/sql-tools/to-sql/transformers/index.transformer';
-import { transformParameters } from 'src/sql-tools/to-sql/transformers/parameter.transformer';
-import { transformTables } from 'src/sql-tools/to-sql/transformers/table.transformer';
-import { transformTriggers } from 'src/sql-tools/to-sql/transformers/trigger.transformer';
-import { SqlTransformer } from 'src/sql-tools/to-sql/transformers/types';
-import { SchemaDiff, SchemaDiffToSqlOptions } from 'src/sql-tools/types';
-
-/**
- * Convert schema diffs into SQL statements
- */
-export const schemaDiffToSql = (items: SchemaDiff[], options: SchemaDiffToSqlOptions = {}): string[] => {
-  return items.flatMap((item) => asSql(item).map((result) => result + withComments(options.comments, item)));
-};
-
-const transformers: SqlTransformer[] = [
-  transformColumns,
-  transformConstraints,
-  transformEnums,
-  transformExtensions,
-  transformFunctions,
-  transformIndexes,
-  transformParameters,
-  transformTables,
-  transformTriggers,
-];
-
-const asSql = (item: SchemaDiff): string[] => {
-  for (const transform of transformers) {
-    const result = transform(item);
-    if (!result) {
-      continue;
-    }
-
-    return asArray(result);
-  }
-
-  throw new Error(`Unhandled schema diff type: ${item.type}`);
-};
-
-const withComments = (comments: boolean | undefined, item: SchemaDiff): string => {
-  if (!comments) {
-    return '';
-  }
-
-  return ` -- ${item.reason}`;
-};
-
-const asArray = <T>(items: T | T[]): T[] => {
-  if (Array.isArray(items)) {
-    return items;
-  }
-
-  return [items];
-};
diff --git a/server/src/sql-tools/to-sql/transformers/column.transformer.spec.ts b/server/src/sql-tools/transformers/column.transformer.spec.ts
similarity index 87%
rename from server/src/sql-tools/to-sql/transformers/column.transformer.spec.ts
rename to server/src/sql-tools/transformers/column.transformer.spec.ts
index 8bf5ac3bc4..2f975381aa 100644
--- a/server/src/sql-tools/to-sql/transformers/column.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/column.transformer.spec.ts
@@ -1,12 +1,12 @@
-import { transformColumns } from 'src/sql-tools/to-sql/transformers/column.transformer';
+import { transformColumns } from 'src/sql-tools/transformers/column.transformer';
 import { describe, expect, it } from 'vitest';
 
 describe(transformColumns.name, () => {
-  describe('column.add', () => {
+  describe('ColumnAdd', () => {
     it('should work', () => {
       expect(
         transformColumns({
-          type: 'column.add',
+          type: 'ColumnAdd',
           column: {
             name: 'column1',
             tableName: 'table1',
@@ -23,7 +23,7 @@ describe(transformColumns.name, () => {
     it('should add a nullable column', () => {
       expect(
         transformColumns({
-          type: 'column.add',
+          type: 'ColumnAdd',
           column: {
             name: 'column1',
             tableName: 'table1',
@@ -40,7 +40,7 @@ describe(transformColumns.name, () => {
     it('should add a column with an enum type', () => {
       expect(
         transformColumns({
-          type: 'column.add',
+          type: 'ColumnAdd',
           column: {
             name: 'column1',
             tableName: 'table1',
@@ -58,7 +58,7 @@ describe(transformColumns.name, () => {
     it('should add a column that is an array type', () => {
       expect(
         transformColumns({
-          type: 'column.add',
+          type: 'ColumnAdd',
           column: {
             name: 'column1',
             tableName: 'table1',
@@ -73,11 +73,11 @@ describe(transformColumns.name, () => {
     });
   });
 
-  describe('column.alter', () => {
+  describe('ColumnAlter', () => {
     it('should make a column nullable', () => {
       expect(
         transformColumns({
-          type: 'column.alter',
+          type: 'ColumnAlter',
           tableName: 'table1',
           columnName: 'column1',
           changes: { nullable: true },
@@ -89,7 +89,7 @@ describe(transformColumns.name, () => {
     it('should make a column non-nullable', () => {
       expect(
         transformColumns({
-          type: 'column.alter',
+          type: 'ColumnAlter',
           tableName: 'table1',
           columnName: 'column1',
           changes: { nullable: false },
@@ -101,7 +101,7 @@ describe(transformColumns.name, () => {
     it('should update the default value', () => {
       expect(
         transformColumns({
-          type: 'column.alter',
+          type: 'ColumnAlter',
           tableName: 'table1',
           columnName: 'column1',
           changes: { default: 'uuid_generate_v4()' },
@@ -111,11 +111,11 @@ describe(transformColumns.name, () => {
     });
   });
 
-  describe('column.drop', () => {
+  describe('ColumnDrop', () => {
     it('should work', () => {
       expect(
         transformColumns({
-          type: 'column.drop',
+          type: 'ColumnDrop',
           tableName: 'table1',
           columnName: 'column1',
           reason: 'unknown',
diff --git a/server/src/sql-tools/to-sql/transformers/column.transformer.ts b/server/src/sql-tools/transformers/column.transformer.ts
similarity index 91%
rename from server/src/sql-tools/to-sql/transformers/column.transformer.ts
rename to server/src/sql-tools/transformers/column.transformer.ts
index 117b460938..ab1135379c 100644
--- a/server/src/sql-tools/to-sql/transformers/column.transformer.ts
+++ b/server/src/sql-tools/transformers/column.transformer.ts
@@ -1,18 +1,18 @@
 import { asColumnComment, getColumnModifiers, getColumnType } from 'src/sql-tools/helpers';
-import { SqlTransformer } from 'src/sql-tools/to-sql/transformers/types';
+import { SqlTransformer } from 'src/sql-tools/transformers/types';
 import { ColumnChanges, DatabaseColumn, SchemaDiff } from 'src/sql-tools/types';
 
 export const transformColumns: SqlTransformer = (item: SchemaDiff) => {
   switch (item.type) {
-    case 'column.add': {
+    case 'ColumnAdd': {
       return asColumnAdd(item.column);
     }
 
-    case 'column.alter': {
+    case 'ColumnAlter': {
       return asColumnAlter(item.tableName, item.columnName, item.changes);
     }
 
-    case 'column.drop': {
+    case 'ColumnDrop': {
       return asColumnDrop(item.tableName, item.columnName);
     }
 
diff --git a/server/src/sql-tools/to-sql/transformers/constraint.transformer.spec.ts b/server/src/sql-tools/transformers/constraint.transformer.spec.ts
similarity index 78%
rename from server/src/sql-tools/to-sql/transformers/constraint.transformer.spec.ts
rename to server/src/sql-tools/transformers/constraint.transformer.spec.ts
index 59d21e7b50..595db10a39 100644
--- a/server/src/sql-tools/to-sql/transformers/constraint.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/constraint.transformer.spec.ts
@@ -1,16 +1,16 @@
-import { transformConstraints } from 'src/sql-tools/to-sql/transformers/constraint.transformer';
-import { DatabaseConstraintType } from 'src/sql-tools/types';
+import { transformConstraints } from 'src/sql-tools/transformers/constraint.transformer';
+import { ConstraintType } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
 describe(transformConstraints.name, () => {
-  describe('constraint.add', () => {
+  describe('ConstraintAdd', () => {
     describe('primary keys', () => {
       it('should work', () => {
         expect(
           transformConstraints({
-            type: 'constraint.add',
+            type: 'ConstraintAdd',
             constraint: {
-              type: DatabaseConstraintType.PRIMARY_KEY,
+              type: ConstraintType.PRIMARY_KEY,
               name: 'PK_test',
               tableName: 'table1',
               columnNames: ['id'],
@@ -26,9 +26,9 @@ describe(transformConstraints.name, () => {
       it('should work', () => {
         expect(
           transformConstraints({
-            type: 'constraint.add',
+            type: 'ConstraintAdd',
             constraint: {
-              type: DatabaseConstraintType.FOREIGN_KEY,
+              type: ConstraintType.FOREIGN_KEY,
               name: 'FK_test',
               tableName: 'table1',
               columnNames: ['parentId'],
@@ -48,9 +48,9 @@ describe(transformConstraints.name, () => {
       it('should work', () => {
         expect(
           transformConstraints({
-            type: 'constraint.add',
+            type: 'ConstraintAdd',
             constraint: {
-              type: DatabaseConstraintType.UNIQUE,
+              type: ConstraintType.UNIQUE,
               name: 'UQ_test',
               tableName: 'table1',
               columnNames: ['id'],
@@ -66,9 +66,9 @@ describe(transformConstraints.name, () => {
       it('should work', () => {
         expect(
           transformConstraints({
-            type: 'constraint.add',
+            type: 'ConstraintAdd',
             constraint: {
-              type: DatabaseConstraintType.CHECK,
+              type: ConstraintType.CHECK,
               name: 'CHK_test',
               tableName: 'table1',
               expression: '"id" IS NOT NULL',
@@ -81,11 +81,11 @@ describe(transformConstraints.name, () => {
     });
   });
 
-  describe('constraint.drop', () => {
+  describe('ConstraintDrop', () => {
     it('should work', () => {
       expect(
         transformConstraints({
-          type: 'constraint.drop',
+          type: 'ConstraintDrop',
           tableName: 'table1',
           constraintName: 'PK_test',
           reason: 'unknown',
diff --git a/server/src/sql-tools/to-sql/transformers/constraint.transformer.ts b/server/src/sql-tools/transformers/constraint.transformer.ts
similarity index 68%
rename from server/src/sql-tools/to-sql/transformers/constraint.transformer.ts
rename to server/src/sql-tools/transformers/constraint.transformer.ts
index ec65143eba..d9c2fcd8d1 100644
--- a/server/src/sql-tools/to-sql/transformers/constraint.transformer.ts
+++ b/server/src/sql-tools/transformers/constraint.transformer.ts
@@ -1,14 +1,14 @@
 import { asColumnList } from 'src/sql-tools/helpers';
-import { SqlTransformer } from 'src/sql-tools/to-sql/transformers/types';
-import { DatabaseActionType, DatabaseConstraint, DatabaseConstraintType, SchemaDiff } from 'src/sql-tools/types';
+import { SqlTransformer } from 'src/sql-tools/transformers/types';
+import { ActionType, ConstraintType, DatabaseConstraint, SchemaDiff } from 'src/sql-tools/types';
 
 export const transformConstraints: SqlTransformer = (item: SchemaDiff) => {
   switch (item.type) {
-    case 'constraint.add': {
+    case 'ConstraintAdd': {
       return asConstraintAdd(item.constraint);
     }
 
-    case 'constraint.drop': {
+    case 'ConstraintDrop': {
       return asConstraintDrop(item.tableName, item.constraintName);
     }
     default: {
@@ -17,18 +17,18 @@ export const transformConstraints: SqlTransformer = (item: SchemaDiff) => {
   }
 };
 
-const withAction = (constraint: { onDelete?: DatabaseActionType; onUpdate?: DatabaseActionType }) =>
-  ` ON UPDATE ${constraint.onUpdate ?? DatabaseActionType.NO_ACTION} ON DELETE ${constraint.onDelete ?? DatabaseActionType.NO_ACTION}`;
+const withAction = (constraint: { onDelete?: ActionType; onUpdate?: ActionType }) =>
+  ` ON UPDATE ${constraint.onUpdate ?? ActionType.NO_ACTION} ON DELETE ${constraint.onDelete ?? ActionType.NO_ACTION}`;
 
 export const asConstraintAdd = (constraint: DatabaseConstraint): string | string[] => {
   const base = `ALTER TABLE "${constraint.tableName}" ADD CONSTRAINT "${constraint.name}"`;
   switch (constraint.type) {
-    case DatabaseConstraintType.PRIMARY_KEY: {
+    case ConstraintType.PRIMARY_KEY: {
       const columnNames = asColumnList(constraint.columnNames);
       return `${base} PRIMARY KEY (${columnNames});`;
     }
 
-    case DatabaseConstraintType.FOREIGN_KEY: {
+    case ConstraintType.FOREIGN_KEY: {
       const columnNames = asColumnList(constraint.columnNames);
       const referenceColumnNames = asColumnList(constraint.referenceColumnNames);
       return (
@@ -38,12 +38,12 @@ export const asConstraintAdd = (constraint: DatabaseConstraint): string | string
       );
     }
 
-    case DatabaseConstraintType.UNIQUE: {
+    case ConstraintType.UNIQUE: {
       const columnNames = asColumnList(constraint.columnNames);
       return `${base} UNIQUE (${columnNames});`;
     }
 
-    case DatabaseConstraintType.CHECK: {
+    case ConstraintType.CHECK: {
       return `${base} CHECK (${constraint.expression});`;
     }
 
diff --git a/server/src/sql-tools/to-sql/transformers/enum.transformer.ts b/server/src/sql-tools/transformers/enum.transformer.ts
similarity index 81%
rename from server/src/sql-tools/to-sql/transformers/enum.transformer.ts
rename to server/src/sql-tools/transformers/enum.transformer.ts
index d5764d9b16..b012ff1a56 100644
--- a/server/src/sql-tools/to-sql/transformers/enum.transformer.ts
+++ b/server/src/sql-tools/transformers/enum.transformer.ts
@@ -1,13 +1,13 @@
-import { SqlTransformer } from 'src/sql-tools/to-sql/transformers/types';
+import { SqlTransformer } from 'src/sql-tools/transformers/types';
 import { DatabaseEnum, SchemaDiff } from 'src/sql-tools/types';
 
 export const transformEnums: SqlTransformer = (item: SchemaDiff) => {
   switch (item.type) {
-    case 'enum.create': {
+    case 'EnumCreate': {
       return asEnumCreate(item.enum);
     }
 
-    case 'enum.drop': {
+    case 'EnumDrop': {
       return asEnumDrop(item.enumName);
     }
 
diff --git a/server/src/sql-tools/to-sql/transformers/extension.transformer.spec.ts b/server/src/sql-tools/transformers/extension.transformer.spec.ts
similarity index 70%
rename from server/src/sql-tools/to-sql/transformers/extension.transformer.spec.ts
rename to server/src/sql-tools/transformers/extension.transformer.spec.ts
index 81b2db4d27..655b6ad20d 100644
--- a/server/src/sql-tools/to-sql/transformers/extension.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/extension.transformer.spec.ts
@@ -1,12 +1,12 @@
-import { transformExtensions } from 'src/sql-tools/to-sql/transformers/extension.transformer';
+import { transformExtensions } from 'src/sql-tools/transformers/extension.transformer';
 import { describe, expect, it } from 'vitest';
 
 describe(transformExtensions.name, () => {
-  describe('extension.drop', () => {
+  describe('ExtensionDrop', () => {
     it('should work', () => {
       expect(
         transformExtensions({
-          type: 'extension.drop',
+          type: 'ExtensionDrop',
           extensionName: 'cube',
           reason: 'unknown',
         }),
@@ -14,11 +14,11 @@ describe(transformExtensions.name, () => {
     });
   });
 
-  describe('extension.create', () => {
+  describe('ExtensionCreate', () => {
     it('should work', () => {
       expect(
         transformExtensions({
-          type: 'extension.create',
+          type: 'ExtensionCreate',
           extension: {
             name: 'cube',
             synchronize: true,
diff --git a/server/src/sql-tools/to-sql/transformers/extension.transformer.ts b/server/src/sql-tools/transformers/extension.transformer.ts
similarity index 81%
rename from server/src/sql-tools/to-sql/transformers/extension.transformer.ts
rename to server/src/sql-tools/transformers/extension.transformer.ts
index 2d51a26444..df1ee7da97 100644
--- a/server/src/sql-tools/to-sql/transformers/extension.transformer.ts
+++ b/server/src/sql-tools/transformers/extension.transformer.ts
@@ -1,13 +1,13 @@
-import { SqlTransformer } from 'src/sql-tools/to-sql/transformers/types';
+import { SqlTransformer } from 'src/sql-tools/transformers/types';
 import { DatabaseExtension, SchemaDiff } from 'src/sql-tools/types';
 
 export const transformExtensions: SqlTransformer = (item: SchemaDiff) => {
   switch (item.type) {
-    case 'extension.create': {
+    case 'ExtensionCreate': {
       return asExtensionCreate(item.extension);
     }
 
-    case 'extension.drop': {
+    case 'ExtensionDrop': {
       return asExtensionDrop(item.extensionName);
     }
 
diff --git a/server/src/sql-tools/to-sql/transformers/function.transformer.spec.ts b/server/src/sql-tools/transformers/function.transformer.spec.ts
similarity index 65%
rename from server/src/sql-tools/to-sql/transformers/function.transformer.spec.ts
rename to server/src/sql-tools/transformers/function.transformer.spec.ts
index 6e9a5bac56..b24256cb38 100644
--- a/server/src/sql-tools/to-sql/transformers/function.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/function.transformer.spec.ts
@@ -1,12 +1,12 @@
-import { transformFunctions } from 'src/sql-tools/to-sql/transformers/function.transformer';
+import { transformFunctions } from 'src/sql-tools/transformers/function.transformer';
 import { describe, expect, it } from 'vitest';
 
 describe(transformFunctions.name, () => {
-  describe('function.drop', () => {
+  describe('FunctionDrop', () => {
     it('should work', () => {
       expect(
         transformFunctions({
-          type: 'function.drop',
+          type: 'FunctionDrop',
           functionName: 'test_func',
           reason: 'unknown',
         }),
diff --git a/server/src/sql-tools/to-sql/transformers/function.transformer.ts b/server/src/sql-tools/transformers/function.transformer.ts
similarity index 79%
rename from server/src/sql-tools/to-sql/transformers/function.transformer.ts
rename to server/src/sql-tools/transformers/function.transformer.ts
index f05eca099a..01915349f0 100644
--- a/server/src/sql-tools/to-sql/transformers/function.transformer.ts
+++ b/server/src/sql-tools/transformers/function.transformer.ts
@@ -1,13 +1,13 @@
-import { SqlTransformer } from 'src/sql-tools/to-sql/transformers/types';
+import { SqlTransformer } from 'src/sql-tools/transformers/types';
 import { DatabaseFunction, SchemaDiff } from 'src/sql-tools/types';
 
 export const transformFunctions: SqlTransformer = (item: SchemaDiff) => {
   switch (item.type) {
-    case 'function.create': {
+    case 'FunctionCreate': {
       return asFunctionCreate(item.function);
     }
 
-    case 'function.drop': {
+    case 'FunctionDrop': {
       return asFunctionDrop(item.functionName);
     }
 
diff --git a/server/src/sql-tools/to-sql/transformers/index.transformer.spec.ts b/server/src/sql-tools/transformers/index.transformer.spec.ts
similarity index 87%
rename from server/src/sql-tools/to-sql/transformers/index.transformer.spec.ts
rename to server/src/sql-tools/transformers/index.transformer.spec.ts
index af3cc0286c..0599b00bdd 100644
--- a/server/src/sql-tools/to-sql/transformers/index.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/index.transformer.spec.ts
@@ -1,12 +1,12 @@
-import { transformIndexes } from 'src/sql-tools/to-sql/transformers/index.transformer';
+import { transformIndexes } from 'src/sql-tools/transformers/index.transformer';
 import { describe, expect, it } from 'vitest';
 
 describe(transformIndexes.name, () => {
-  describe('index.create', () => {
+  describe('IndexCreate', () => {
     it('should work', () => {
       expect(
         transformIndexes({
-          type: 'index.create',
+          type: 'IndexCreate',
           index: {
             name: 'IDX_test',
             tableName: 'table1',
@@ -22,7 +22,7 @@ describe(transformIndexes.name, () => {
     it('should create an unique index', () => {
       expect(
         transformIndexes({
-          type: 'index.create',
+          type: 'IndexCreate',
           index: {
             name: 'IDX_test',
             tableName: 'table1',
@@ -38,7 +38,7 @@ describe(transformIndexes.name, () => {
     it('should create an index with a custom expression', () => {
       expect(
         transformIndexes({
-          type: 'index.create',
+          type: 'IndexCreate',
           index: {
             name: 'IDX_test',
             tableName: 'table1',
@@ -54,7 +54,7 @@ describe(transformIndexes.name, () => {
     it('should create an index with a where clause', () => {
       expect(
         transformIndexes({
-          type: 'index.create',
+          type: 'IndexCreate',
           index: {
             name: 'IDX_test',
             tableName: 'table1',
@@ -71,7 +71,7 @@ describe(transformIndexes.name, () => {
     it('should create an index with a custom expression', () => {
       expect(
         transformIndexes({
-          type: 'index.create',
+          type: 'IndexCreate',
           index: {
             name: 'IDX_test',
             tableName: 'table1',
@@ -86,11 +86,11 @@ describe(transformIndexes.name, () => {
     });
   });
 
-  describe('index.drop', () => {
+  describe('IndexDrop', () => {
     it('should work', () => {
       expect(
         transformIndexes({
-          type: 'index.drop',
+          type: 'IndexDrop',
           indexName: 'IDX_test',
           reason: 'unknown',
         }),
diff --git a/server/src/sql-tools/to-sql/transformers/index.transformer.ts b/server/src/sql-tools/transformers/index.transformer.ts
similarity index 89%
rename from server/src/sql-tools/to-sql/transformers/index.transformer.ts
rename to server/src/sql-tools/transformers/index.transformer.ts
index 73d9ac9615..001b15315f 100644
--- a/server/src/sql-tools/to-sql/transformers/index.transformer.ts
+++ b/server/src/sql-tools/transformers/index.transformer.ts
@@ -1,14 +1,14 @@
 import { asColumnList } from 'src/sql-tools/helpers';
-import { SqlTransformer } from 'src/sql-tools/to-sql/transformers/types';
+import { SqlTransformer } from 'src/sql-tools/transformers/types';
 import { DatabaseIndex, SchemaDiff } from 'src/sql-tools/types';
 
 export const transformIndexes: SqlTransformer = (item: SchemaDiff) => {
   switch (item.type) {
-    case 'index.create': {
+    case 'IndexCreate': {
       return asIndexCreate(item.index);
     }
 
-    case 'index.drop': {
+    case 'IndexDrop': {
       return asIndexDrop(item.indexName);
     }
 
diff --git a/server/src/sql-tools/transformers/index.ts b/server/src/sql-tools/transformers/index.ts
new file mode 100644
index 0000000000..2865a376d7
--- /dev/null
+++ b/server/src/sql-tools/transformers/index.ts
@@ -0,0 +1,22 @@
+import { transformColumns } from 'src/sql-tools/transformers/column.transformer';
+import { transformConstraints } from 'src/sql-tools/transformers/constraint.transformer';
+import { transformEnums } from 'src/sql-tools/transformers/enum.transformer';
+import { transformExtensions } from 'src/sql-tools/transformers/extension.transformer';
+import { transformFunctions } from 'src/sql-tools/transformers/function.transformer';
+import { transformIndexes } from 'src/sql-tools/transformers/index.transformer';
+import { transformParameters } from 'src/sql-tools/transformers/parameter.transformer';
+import { transformTables } from 'src/sql-tools/transformers/table.transformer';
+import { transformTriggers } from 'src/sql-tools/transformers/trigger.transformer';
+import { SqlTransformer } from 'src/sql-tools/transformers/types';
+
+export const transformers: SqlTransformer[] = [
+  transformColumns,
+  transformConstraints,
+  transformEnums,
+  transformExtensions,
+  transformFunctions,
+  transformIndexes,
+  transformParameters,
+  transformTables,
+  transformTriggers,
+];
diff --git a/server/src/sql-tools/to-sql/transformers/parameter.transformer.ts b/server/src/sql-tools/transformers/parameter.transformer.ts
similarity index 85%
rename from server/src/sql-tools/to-sql/transformers/parameter.transformer.ts
rename to server/src/sql-tools/transformers/parameter.transformer.ts
index 0b12cdb27b..7768298d1d 100644
--- a/server/src/sql-tools/to-sql/transformers/parameter.transformer.ts
+++ b/server/src/sql-tools/transformers/parameter.transformer.ts
@@ -1,13 +1,13 @@
-import { SqlTransformer } from 'src/sql-tools/to-sql/transformers/types';
+import { SqlTransformer } from 'src/sql-tools/transformers/types';
 import { DatabaseParameter, SchemaDiff } from 'src/sql-tools/types';
 
 export const transformParameters: SqlTransformer = (item: SchemaDiff) => {
   switch (item.type) {
-    case 'parameter.set': {
+    case 'ParameterSet': {
       return asParameterSet(item.parameter);
     }
 
-    case 'parameter.reset': {
+    case 'ParameterReset': {
       return asParameterReset(item.databaseName, item.parameterName);
     }
 
diff --git a/server/src/sql-tools/to-sql/transformers/table.transformer.spec.ts b/server/src/sql-tools/transformers/table.transformer.spec.ts
similarity index 91%
rename from server/src/sql-tools/to-sql/transformers/table.transformer.spec.ts
rename to server/src/sql-tools/transformers/table.transformer.spec.ts
index db3ffa22ec..c6f20b3da3 100644
--- a/server/src/sql-tools/to-sql/transformers/table.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/table.transformer.spec.ts
@@ -1,12 +1,12 @@
-import { transformTables } from 'src/sql-tools/to-sql/transformers/table.transformer';
+import { transformTables } from 'src/sql-tools/transformers/table.transformer';
 import { describe, expect, it } from 'vitest';
 
 describe(transformTables.name, () => {
-  describe('table.drop', () => {
+  describe('TableDrop', () => {
     it('should work', () => {
       expect(
         transformTables({
-          type: 'table.drop',
+          type: 'TableDrop',
           tableName: 'table1',
           reason: 'unknown',
         }),
@@ -14,11 +14,11 @@ describe(transformTables.name, () => {
     });
   });
 
-  describe('table.create', () => {
+  describe('TableCreate', () => {
     it('should work', () => {
       expect(
         transformTables({
-          type: 'table.create',
+          type: 'TableCreate',
           table: {
             name: 'table1',
             columns: [
@@ -44,7 +44,7 @@ describe(transformTables.name, () => {
     it('should handle a non-nullable column', () => {
       expect(
         transformTables({
-          type: 'table.create',
+          type: 'TableCreate',
           table: {
             name: 'table1',
             columns: [
@@ -70,7 +70,7 @@ describe(transformTables.name, () => {
     it('should handle a default value', () => {
       expect(
         transformTables({
-          type: 'table.create',
+          type: 'TableCreate',
           table: {
             name: 'table1',
             columns: [
@@ -97,7 +97,7 @@ describe(transformTables.name, () => {
     it('should handle a string with a fixed length', () => {
       expect(
         transformTables({
-          type: 'table.create',
+          type: 'TableCreate',
           table: {
             name: 'table1',
             columns: [
@@ -124,7 +124,7 @@ describe(transformTables.name, () => {
     it('should handle an array type', () => {
       expect(
         transformTables({
-          type: 'table.create',
+          type: 'TableCreate',
           table: {
             name: 'table1',
             columns: [
diff --git a/server/src/sql-tools/to-sql/transformers/table.transformer.ts b/server/src/sql-tools/transformers/table.transformer.ts
similarity index 83%
rename from server/src/sql-tools/to-sql/transformers/table.transformer.ts
rename to server/src/sql-tools/transformers/table.transformer.ts
index f376b65274..b1fefab3e0 100644
--- a/server/src/sql-tools/to-sql/transformers/table.transformer.ts
+++ b/server/src/sql-tools/transformers/table.transformer.ts
@@ -1,15 +1,15 @@
 import { asColumnComment, getColumnModifiers, getColumnType } from 'src/sql-tools/helpers';
-import { asColumnAlter } from 'src/sql-tools/to-sql/transformers/column.transformer';
-import { SqlTransformer } from 'src/sql-tools/to-sql/transformers/types';
+import { asColumnAlter } from 'src/sql-tools/transformers/column.transformer';
+import { SqlTransformer } from 'src/sql-tools/transformers/types';
 import { DatabaseTable, SchemaDiff } from 'src/sql-tools/types';
 
 export const transformTables: SqlTransformer = (item: SchemaDiff) => {
   switch (item.type) {
-    case 'table.create': {
+    case 'TableCreate': {
       return asTableCreate(item.table);
     }
 
-    case 'table.drop': {
+    case 'TableDrop': {
       return asTableDrop(item.tableName);
     }
 
diff --git a/server/src/sql-tools/to-sql/transformers/trigger.transformer.spec.ts b/server/src/sql-tools/transformers/trigger.transformer.spec.ts
similarity index 87%
rename from server/src/sql-tools/to-sql/transformers/trigger.transformer.spec.ts
rename to server/src/sql-tools/transformers/trigger.transformer.spec.ts
index 778de88cba..9fdb8d1c23 100644
--- a/server/src/sql-tools/to-sql/transformers/trigger.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/trigger.transformer.spec.ts
@@ -1,12 +1,12 @@
-import { transformTriggers } from 'src/sql-tools/to-sql/transformers/trigger.transformer';
+import { transformTriggers } from 'src/sql-tools/transformers/trigger.transformer';
 import { describe, expect, it } from 'vitest';
 
 describe(transformTriggers.name, () => {
-  describe('trigger.create', () => {
+  describe('TriggerCreate', () => {
     it('should work', () => {
       expect(
         transformTriggers({
-          type: 'trigger.create',
+          type: 'TriggerCreate',
           trigger: {
             name: 'trigger1',
             tableName: 'table1',
@@ -29,7 +29,7 @@ describe(transformTriggers.name, () => {
     it('should work with multiple actions', () => {
       expect(
         transformTriggers({
-          type: 'trigger.create',
+          type: 'TriggerCreate',
           trigger: {
             name: 'trigger1',
             tableName: 'table1',
@@ -52,7 +52,7 @@ describe(transformTriggers.name, () => {
     it('should work with old/new reference table aliases', () => {
       expect(
         transformTriggers({
-          type: 'trigger.create',
+          type: 'TriggerCreate',
           trigger: {
             name: 'trigger1',
             tableName: 'table1',
@@ -76,11 +76,11 @@ describe(transformTriggers.name, () => {
     });
   });
 
-  describe('trigger.drop', () => {
+  describe('TriggerDrop', () => {
     it('should work', () => {
       expect(
         transformTriggers({
-          type: 'trigger.drop',
+          type: 'TriggerDrop',
           tableName: 'table1',
           triggerName: 'trigger1',
           reason: 'unknown',
diff --git a/server/src/sql-tools/to-sql/transformers/trigger.transformer.ts b/server/src/sql-tools/transformers/trigger.transformer.ts
similarity index 91%
rename from server/src/sql-tools/to-sql/transformers/trigger.transformer.ts
rename to server/src/sql-tools/transformers/trigger.transformer.ts
index c104a2ed6b..167449e249 100644
--- a/server/src/sql-tools/to-sql/transformers/trigger.transformer.ts
+++ b/server/src/sql-tools/transformers/trigger.transformer.ts
@@ -1,13 +1,13 @@
-import { SqlTransformer } from 'src/sql-tools/to-sql/transformers/types';
+import { SqlTransformer } from 'src/sql-tools/transformers/types';
 import { DatabaseTrigger, SchemaDiff } from 'src/sql-tools/types';
 
 export const transformTriggers: SqlTransformer = (item: SchemaDiff) => {
   switch (item.type) {
-    case 'trigger.create': {
+    case 'TriggerCreate': {
       return asTriggerCreate(item.trigger);
     }
 
-    case 'trigger.drop': {
+    case 'TriggerDrop': {
       return asTriggerDrop(item.tableName, item.triggerName);
     }
 
diff --git a/server/src/sql-tools/to-sql/transformers/types.ts b/server/src/sql-tools/transformers/types.ts
similarity index 100%
rename from server/src/sql-tools/to-sql/transformers/types.ts
rename to server/src/sql-tools/transformers/types.ts
diff --git a/server/src/sql-tools/types.ts b/server/src/sql-tools/types.ts
index 0641487e0e..a3aec7a061 100644
--- a/server/src/sql-tools/types.ts
+++ b/server/src/sql-tools/types.ts
@@ -1,4 +1,38 @@
 import { Kysely, ColumnType as KyselyColumnType } from 'kysely';
+import { RegisterItem } from 'src/sql-tools/register-item';
+import { SchemaBuilder } from 'src/sql-tools/schema-builder';
+
+export type SchemaFromCodeOptions = {
+  /** automatically create indexes on foreign key columns */
+  createForeignKeyIndexes?: boolean;
+  databaseName?: string;
+  schemaName?: string;
+  reset?: boolean;
+};
+
+export type SchemaFromDatabaseOptions = {
+  schemaName?: string;
+};
+
+export type SchemaDiffToSqlOptions = {
+  comments?: boolean;
+};
+
+export type SchemaDiffOptions = {
+  tables?: IgnoreOptions;
+  functions?: IgnoreOptions;
+  enums?: IgnoreOptions;
+  extension?: IgnoreOptions;
+  parameters?: IgnoreOptions;
+};
+
+export type IgnoreOptions = {
+  ignoreExtra?: boolean;
+  ignoreMissing?: boolean;
+};
+
+export type Processor = (builder: SchemaBuilder, items: RegisterItem[], options: SchemaFromCodeOptions) => void;
+export type DatabaseReader = (schema: DatabaseSchema, db: DatabaseClient) => Promise<void>;
 
 export type PostgresDB = {
   pg_am: {
@@ -237,14 +271,14 @@ type PostgresYesOrNo = 'YES' | 'NO';
 
 export type DatabaseClient = Kysely<PostgresDB>;
 
-export enum DatabaseConstraintType {
+export enum ConstraintType {
   PRIMARY_KEY = 'primary-key',
   FOREIGN_KEY = 'foreign-key',
   UNIQUE = 'unique',
   CHECK = 'check',
 }
 
-export enum DatabaseActionType {
+export enum ActionType {
   NO_ACTION = 'NO ACTION',
   RESTRICT = 'RESTRICT',
   CASCADE = 'CASCADE',
@@ -278,7 +312,7 @@ export type ColumnType =
   | 'serial';
 
 export type DatabaseSchema = {
-  name: string;
+  databaseName: string;
   schemaName: string;
   functions: DatabaseFunction[];
   enums: DatabaseEnum[];
@@ -288,19 +322,6 @@ export type DatabaseSchema = {
   warnings: string[];
 };
 
-export type SchemaDiffOptions = {
-  tables?: DiffOptions;
-  functions?: DiffOptions;
-  enums?: DiffOptions;
-  extension?: DiffOptions;
-  parameters?: DiffOptions;
-};
-
-export type DiffOptions = {
-  ignoreExtra?: boolean;
-  ignoreMissing?: boolean;
-};
-
 export type DatabaseParameter = {
   name: string;
   databaseName: string;
@@ -381,26 +402,26 @@ type ColumBasedConstraint = {
 };
 
 export type DatabasePrimaryKeyConstraint = ColumBasedConstraint & {
-  type: DatabaseConstraintType.PRIMARY_KEY;
+  type: ConstraintType.PRIMARY_KEY;
   synchronize: boolean;
 };
 
 export type DatabaseUniqueConstraint = ColumBasedConstraint & {
-  type: DatabaseConstraintType.UNIQUE;
+  type: ConstraintType.UNIQUE;
   synchronize: boolean;
 };
 
 export type DatabaseForeignKeyConstraint = ColumBasedConstraint & {
-  type: DatabaseConstraintType.FOREIGN_KEY;
+  type: ConstraintType.FOREIGN_KEY;
   referenceTableName: string;
   referenceColumnNames: string[];
-  onUpdate?: DatabaseActionType;
-  onDelete?: DatabaseActionType;
+  onUpdate?: ActionType;
+  onDelete?: ActionType;
   synchronize: boolean;
 };
 
 export type DatabaseCheckConstraint = {
-  type: DatabaseConstraintType.CHECK;
+  type: ConstraintType.CHECK;
   name: string;
   tableName: string;
   expression: string;
@@ -435,34 +456,26 @@ export type DatabaseIndex = {
   synchronize: boolean;
 };
 
-export type LoadSchemaOptions = {
-  schemaName?: string;
-};
-
-export type SchemaDiffToSqlOptions = {
-  comments?: boolean;
-};
-
 export type SchemaDiff = { reason: string } & (
-  | { type: 'extension.create'; extension: DatabaseExtension }
-  | { type: 'extension.drop'; extensionName: string }
-  | { type: 'function.create'; function: DatabaseFunction }
-  | { type: 'function.drop'; functionName: string }
-  | { type: 'table.create'; table: DatabaseTable }
-  | { type: 'table.drop'; tableName: string }
-  | { type: 'column.add'; column: DatabaseColumn }
-  | { type: 'column.alter'; tableName: string; columnName: string; changes: ColumnChanges }
-  | { type: 'column.drop'; tableName: string; columnName: string }
-  | { type: 'constraint.add'; constraint: DatabaseConstraint }
-  | { type: 'constraint.drop'; tableName: string; constraintName: string }
-  | { type: 'index.create'; index: DatabaseIndex }
-  | { type: 'index.drop'; indexName: string }
-  | { type: 'trigger.create'; trigger: DatabaseTrigger }
-  | { type: 'trigger.drop'; tableName: string; triggerName: string }
-  | { type: 'parameter.set'; parameter: DatabaseParameter }
-  | { type: 'parameter.reset'; databaseName: string; parameterName: string }
-  | { type: 'enum.create'; enum: DatabaseEnum }
-  | { type: 'enum.drop'; enumName: string }
+  | { type: 'ExtensionCreate'; extension: DatabaseExtension }
+  | { type: 'ExtensionDrop'; extensionName: string }
+  | { type: 'FunctionCreate'; function: DatabaseFunction }
+  | { type: 'FunctionDrop'; functionName: string }
+  | { type: 'TableCreate'; table: DatabaseTable }
+  | { type: 'TableDrop'; tableName: string }
+  | { type: 'ColumnAdd'; column: DatabaseColumn }
+  | { type: 'ColumnAlter'; tableName: string; columnName: string; changes: ColumnChanges }
+  | { type: 'ColumnDrop'; tableName: string; columnName: string }
+  | { type: 'ConstraintAdd'; constraint: DatabaseConstraint }
+  | { type: 'ConstraintDrop'; tableName: string; constraintName: string }
+  | { type: 'IndexCreate'; index: DatabaseIndex }
+  | { type: 'IndexDrop'; indexName: string }
+  | { type: 'TriggerCreate'; trigger: DatabaseTrigger }
+  | { type: 'TriggerDrop'; tableName: string; triggerName: string }
+  | { type: 'ParameterSet'; parameter: DatabaseParameter }
+  | { type: 'ParameterReset'; databaseName: string; parameterName: string }
+  | { type: 'EnumCreate'; enum: DatabaseEnum }
+  | { type: 'EnumDrop'; enumName: string }
 );
 
 export type CompareFunction<T> = (source: T, target: T) => SchemaDiff[];
diff --git a/server/test/sql-tools/check-constraint-default-name.stub.ts b/server/test/sql-tools/check-constraint-default-name.stub.ts
index af03e02a2e..4ed0e6ad3a 100644
--- a/server/test/sql-tools/check-constraint-default-name.stub.ts
+++ b/server/test/sql-tools/check-constraint-default-name.stub.ts
@@ -1,4 +1,4 @@
-import { Check, Column, DatabaseConstraintType, DatabaseSchema, Table } from 'src/sql-tools';
+import { Check, Column, ConstraintType, DatabaseSchema, Table } from 'src/sql-tools';
 
 @Table()
 @Check({ expression: '1=1' })
@@ -9,7 +9,7 @@ export class Table1 {
 
 export const description = 'should create a check constraint with a default name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -33,7 +33,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.CHECK,
+          type: ConstraintType.CHECK,
           name: 'CHK_8d2ecfd49b984941f6b2589799',
           tableName: 'table1',
           expression: '1=1',
diff --git a/server/test/sql-tools/check-constraint-override-name.stub.ts b/server/test/sql-tools/check-constraint-override-name.stub.ts
index b30025e2fc..1dfcfe7566 100644
--- a/server/test/sql-tools/check-constraint-override-name.stub.ts
+++ b/server/test/sql-tools/check-constraint-override-name.stub.ts
@@ -1,4 +1,4 @@
-import { Check, Column, DatabaseConstraintType, DatabaseSchema, Table } from 'src/sql-tools';
+import { Check, Column, ConstraintType, DatabaseSchema, Table } from 'src/sql-tools';
 
 @Table()
 @Check({ name: 'CHK_test', expression: '1=1' })
@@ -9,7 +9,7 @@ export class Table1 {
 
 export const description = 'should create a check constraint with a specific name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -33,7 +33,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.CHECK,
+          type: ConstraintType.CHECK,
           name: 'CHK_test',
           tableName: 'table1',
           expression: '1=1',
diff --git a/server/test/sql-tools/column-create-date.stub.ts b/server/test/sql-tools/column-create-date.stub.ts
index 7a284c674c..42fe3f98ae 100644
--- a/server/test/sql-tools/column-create-date.stub.ts
+++ b/server/test/sql-tools/column-create-date.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with an created at date column';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-default-boolean.stub.ts b/server/test/sql-tools/column-default-boolean.stub.ts
index 962b023a25..eafefc524e 100644
--- a/server/test/sql-tools/column-default-boolean.stub.ts
+++ b/server/test/sql-tools/column-default-boolean.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with a column with a default value (boolean)';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-default-date.stub.ts b/server/test/sql-tools/column-default-date.stub.ts
index 00f2db2c27..b1998b47b2 100644
--- a/server/test/sql-tools/column-default-date.stub.ts
+++ b/server/test/sql-tools/column-default-date.stub.ts
@@ -10,7 +10,7 @@ export class Table1 {
 
 export const description = 'should register a table with a column with a default value (date)';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-default-function.stub.ts b/server/test/sql-tools/column-default-function.stub.ts
index b13bd14c93..57579cb230 100644
--- a/server/test/sql-tools/column-default-function.stub.ts
+++ b/server/test/sql-tools/column-default-function.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with a column with a default function';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-default-null.stub.ts b/server/test/sql-tools/column-default-null.stub.ts
index c88ed218b3..869d02cf94 100644
--- a/server/test/sql-tools/column-default-null.stub.ts
+++ b/server/test/sql-tools/column-default-null.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a nullable column from a default of null';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-default-number.stub.ts b/server/test/sql-tools/column-default-number.stub.ts
index 36d0af5273..afec0da8fb 100644
--- a/server/test/sql-tools/column-default-number.stub.ts
+++ b/server/test/sql-tools/column-default-number.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with a column with a default value (number)';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-default-string.stub.ts b/server/test/sql-tools/column-default-string.stub.ts
index 04a00a4dfe..4b989a3f3b 100644
--- a/server/test/sql-tools/column-default-string.stub.ts
+++ b/server/test/sql-tools/column-default-string.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with a column with a default value (string)';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-delete-date.stub.ts b/server/test/sql-tools/column-delete-date.stub.ts
index facbfb0328..437407e33a 100644
--- a/server/test/sql-tools/column-delete-date.stub.ts
+++ b/server/test/sql-tools/column-delete-date.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with a deleted at date column';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-enum-type.stub.ts b/server/test/sql-tools/column-enum-type.stub.ts
index 878910dcdb..02fbeeabde 100644
--- a/server/test/sql-tools/column-enum-type.stub.ts
+++ b/server/test/sql-tools/column-enum-type.stub.ts
@@ -15,7 +15,7 @@ export class Table1 {
 
 export const description = 'should accept an enum type';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [
diff --git a/server/test/sql-tools/column-generated-identity.ts b/server/test/sql-tools/column-generated-identity.ts
index 98b0f582a6..a6525fe9ac 100644
--- a/server/test/sql-tools/column-generated-identity.ts
+++ b/server/test/sql-tools/column-generated-identity.ts
@@ -1,4 +1,4 @@
-import { DatabaseConstraintType, DatabaseSchema, PrimaryGeneratedColumn, Table } from 'src/sql-tools';
+import { ConstraintType, DatabaseSchema, PrimaryGeneratedColumn, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with a generated identity column';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -33,7 +33,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_50c4f9905061b1e506d38a2a380',
           tableName: 'table1',
           columnNames: ['column1'],
diff --git a/server/test/sql-tools/column-generated-uuid.stub.ts b/server/test/sql-tools/column-generated-uuid.stub.ts
index 69cc59530e..4d355f2cf6 100644
--- a/server/test/sql-tools/column-generated-uuid.stub.ts
+++ b/server/test/sql-tools/column-generated-uuid.stub.ts
@@ -1,4 +1,4 @@
-import { DatabaseConstraintType, DatabaseSchema, PrimaryGeneratedColumn, Table } from 'src/sql-tools';
+import { ConstraintType, DatabaseSchema, PrimaryGeneratedColumn, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with a primary generated uuid column';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -33,7 +33,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_50c4f9905061b1e506d38a2a380',
           tableName: 'table1',
           columnNames: ['column1'],
diff --git a/server/test/sql-tools/column-index-name-default.ts b/server/test/sql-tools/column-index-name-default.ts
index cedae006be..703a526285 100644
--- a/server/test/sql-tools/column-index-name-default.ts
+++ b/server/test/sql-tools/column-index-name-default.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should create a column with an index';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-index-name.ts b/server/test/sql-tools/column-index-name.ts
index 8ba18a8851..c72759c74d 100644
--- a/server/test/sql-tools/column-index-name.ts
+++ b/server/test/sql-tools/column-index-name.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should create a column with an index if a name is provided';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-inferred-nullable.stub.ts b/server/test/sql-tools/column-inferred-nullable.stub.ts
index 70495db800..64c6a8be99 100644
--- a/server/test/sql-tools/column-inferred-nullable.stub.ts
+++ b/server/test/sql-tools/column-inferred-nullable.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should infer nullable from the default value';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-name-default.stub.ts b/server/test/sql-tools/column-name-default.stub.ts
index e1db458e4b..fc16c7540d 100644
--- a/server/test/sql-tools/column-name-default.stub.ts
+++ b/server/test/sql-tools/column-name-default.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with a column with a default name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-name-override.stub.ts b/server/test/sql-tools/column-name-override.stub.ts
index 250e295280..5e5594a166 100644
--- a/server/test/sql-tools/column-name-override.stub.ts
+++ b/server/test/sql-tools/column-name-override.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with a column with a specific name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-name-string.stub.ts b/server/test/sql-tools/column-name-string.stub.ts
index 12f8b4a537..d0455ee773 100644
--- a/server/test/sql-tools/column-name-string.stub.ts
+++ b/server/test/sql-tools/column-name-string.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with a column with a specific name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-nullable.stub.ts b/server/test/sql-tools/column-nullable.stub.ts
index 2b82a3de13..037b2db948 100644
--- a/server/test/sql-tools/column-nullable.stub.ts
+++ b/server/test/sql-tools/column-nullable.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should set nullable correctly';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-string-length.stub.ts b/server/test/sql-tools/column-string-length.stub.ts
index 47400f25e0..00d7264914 100644
--- a/server/test/sql-tools/column-string-length.stub.ts
+++ b/server/test/sql-tools/column-string-length.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should use create a string column with a fixed length';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/column-unique-constraint-name-default.stub.ts b/server/test/sql-tools/column-unique-constraint-name-default.stub.ts
index e1e1619679..b1dfaf4308 100644
--- a/server/test/sql-tools/column-unique-constraint-name-default.stub.ts
+++ b/server/test/sql-tools/column-unique-constraint-name-default.stub.ts
@@ -1,4 +1,4 @@
-import { Column, DatabaseConstraintType, DatabaseSchema, Table } from 'src/sql-tools';
+import { Column, ConstraintType, DatabaseSchema, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should create a unique key constraint with a default name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -32,7 +32,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.UNIQUE,
+          type: ConstraintType.UNIQUE,
           name: 'UQ_b249cc64cf63b8a22557cdc8537',
           tableName: 'table1',
           columnNames: ['id'],
diff --git a/server/test/sql-tools/column-unique-constraint-name-override.stub.ts b/server/test/sql-tools/column-unique-constraint-name-override.stub.ts
index 36ce80efb6..b873085fa0 100644
--- a/server/test/sql-tools/column-unique-constraint-name-override.stub.ts
+++ b/server/test/sql-tools/column-unique-constraint-name-override.stub.ts
@@ -1,4 +1,4 @@
-import { Column, DatabaseConstraintType, DatabaseSchema, Table } from 'src/sql-tools';
+import { Column, ConstraintType, DatabaseSchema, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should create a unique key constraint with a specific name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -32,7 +32,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.UNIQUE,
+          type: ConstraintType.UNIQUE,
           name: 'UQ_test',
           tableName: 'table1',
           columnNames: ['id'],
diff --git a/server/test/sql-tools/column-update-date.stub.ts b/server/test/sql-tools/column-update-date.stub.ts
index bbdb6df923..f63f568cf6 100644
--- a/server/test/sql-tools/column-update-date.stub.ts
+++ b/server/test/sql-tools/column-update-date.stub.ts
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should register a table with an updated at date column';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/errors/table-duplicate-decorator.stub.ts b/server/test/sql-tools/errors/table-duplicate-decorator.stub.ts
new file mode 100644
index 0000000000..3b7a8781b9
--- /dev/null
+++ b/server/test/sql-tools/errors/table-duplicate-decorator.stub.ts
@@ -0,0 +1,7 @@
+import { Table } from 'src/sql-tools';
+
+@Table({ name: 'table-1' })
+@Table({ name: 'table-2' })
+export class Table1 {}
+
+export const message = 'Table table-2 has already been registered';
diff --git a/server/test/sql-tools/foreign-key-constraint-column-order.stub.ts b/server/test/sql-tools/foreign-key-constraint-column-order.stub.ts
index b211620343..c31a00c186 100644
--- a/server/test/sql-tools/foreign-key-constraint-column-order.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-column-order.stub.ts
@@ -1,11 +1,4 @@
-import {
-  Column,
-  DatabaseConstraintType,
-  DatabaseSchema,
-  ForeignKeyConstraint,
-  PrimaryColumn,
-  Table,
-} from 'src/sql-tools';
+import { Column, ConstraintType, DatabaseSchema, ForeignKeyConstraint, PrimaryColumn, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -32,7 +25,7 @@ export class Table2 {
 
 export const description = 'should create a foreign key constraint to the target table';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -65,7 +58,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_e457e8b1301b7bc06ef78188ee4',
           tableName: 'table1',
           columnNames: ['id1', 'id2'],
@@ -108,7 +101,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.FOREIGN_KEY,
+          type: ConstraintType.FOREIGN_KEY,
           name: 'FK_aed36d04470eba20161aa8b1dc6',
           tableName: 'table2',
           columnNames: ['parentId1', 'parentId2'],
diff --git a/server/test/sql-tools/foreign-key-constraint-missing-column.stub.ts b/server/test/sql-tools/foreign-key-constraint-missing-column.stub.ts
index 5bb335030a..f42f1251f4 100644
--- a/server/test/sql-tools/foreign-key-constraint-missing-column.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-missing-column.stub.ts
@@ -1,11 +1,4 @@
-import {
-  Column,
-  DatabaseConstraintType,
-  DatabaseSchema,
-  ForeignKeyConstraint,
-  PrimaryColumn,
-  Table,
-} from 'src/sql-tools';
+import { Column, ConstraintType, DatabaseSchema, ForeignKeyConstraint, PrimaryColumn, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -22,7 +15,7 @@ export class Table2 {
 
 export const description = 'should warn against missing column in foreign key constraint';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -46,7 +39,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_b249cc64cf63b8a22557cdc8537',
           tableName: 'table1',
           columnNames: ['id'],
diff --git a/server/test/sql-tools/foreign-key-constraint-missing-reference-column.stub.ts b/server/test/sql-tools/foreign-key-constraint-missing-reference-column.stub.ts
index 83c3adeb6d..8eb7b5cde8 100644
--- a/server/test/sql-tools/foreign-key-constraint-missing-reference-column.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-missing-reference-column.stub.ts
@@ -1,11 +1,4 @@
-import {
-  Column,
-  DatabaseConstraintType,
-  DatabaseSchema,
-  ForeignKeyConstraint,
-  PrimaryColumn,
-  Table,
-} from 'src/sql-tools';
+import { Column, ConstraintType, DatabaseSchema, ForeignKeyConstraint, PrimaryColumn, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -22,7 +15,7 @@ export class Table2 {
 
 export const description = 'should warn against missing reference column in foreign key constraint';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -46,7 +39,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_b249cc64cf63b8a22557cdc8537',
           tableName: 'table1',
           columnNames: ['id'],
diff --git a/server/test/sql-tools/foreign-key-constraint-missing-reference-table.stub.ts b/server/test/sql-tools/foreign-key-constraint-missing-reference-table.stub.ts
index 54cf731479..47c9f18e1d 100644
--- a/server/test/sql-tools/foreign-key-constraint-missing-reference-table.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-missing-reference-table.stub.ts
@@ -14,7 +14,7 @@ export class Table1 {
 
 export const description = 'should warn against missing reference table';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/foreign-key-constraint-multiple-columns.stub.ts b/server/test/sql-tools/foreign-key-constraint-multiple-columns.stub.ts
index 30f18eaf9d..6e2ee7741e 100644
--- a/server/test/sql-tools/foreign-key-constraint-multiple-columns.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-multiple-columns.stub.ts
@@ -1,11 +1,4 @@
-import {
-  Column,
-  DatabaseConstraintType,
-  DatabaseSchema,
-  ForeignKeyConstraint,
-  PrimaryColumn,
-  Table,
-} from 'src/sql-tools';
+import { Column, ConstraintType, DatabaseSchema, ForeignKeyConstraint, PrimaryColumn, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -28,7 +21,7 @@ export class Table2 {
 
 export const description = 'should create a foreign key constraint to the target table';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -61,7 +54,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_e457e8b1301b7bc06ef78188ee4',
           tableName: 'table1',
           columnNames: ['id1', 'id2'],
@@ -104,7 +97,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.FOREIGN_KEY,
+          type: ConstraintType.FOREIGN_KEY,
           name: 'FK_aed36d04470eba20161aa8b1dc6',
           tableName: 'table2',
           columnNames: ['parentId1', 'parentId2'],
diff --git a/server/test/sql-tools/foreign-key-constraint-no-index.stub.ts b/server/test/sql-tools/foreign-key-constraint-no-index.stub.ts
index 5ad0aa7a6b..508110f687 100644
--- a/server/test/sql-tools/foreign-key-constraint-no-index.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-no-index.stub.ts
@@ -1,11 +1,4 @@
-import {
-  Column,
-  DatabaseConstraintType,
-  DatabaseSchema,
-  ForeignKeyConstraint,
-  PrimaryColumn,
-  Table,
-} from 'src/sql-tools';
+import { Column, ConstraintType, DatabaseSchema, ForeignKeyConstraint, PrimaryColumn, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -22,7 +15,7 @@ export class Table2 {
 
 export const description = 'should create a foreign key constraint to the target table without an index';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -46,7 +39,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_b249cc64cf63b8a22557cdc8537',
           tableName: 'table1',
           columnNames: ['id'],
@@ -72,7 +65,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.FOREIGN_KEY,
+          type: ConstraintType.FOREIGN_KEY,
           name: 'FK_3fcca5cc563abf256fc346e3ff4',
           tableName: 'table2',
           columnNames: ['parentId'],
diff --git a/server/test/sql-tools/foreign-key-constraint-no-primary.stub.ts b/server/test/sql-tools/foreign-key-constraint-no-primary.stub.ts
index 645b0e76f2..dbcefa1d39 100644
--- a/server/test/sql-tools/foreign-key-constraint-no-primary.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-no-primary.stub.ts
@@ -1,4 +1,4 @@
-import { Column, DatabaseConstraintType, DatabaseSchema, ForeignKeyConstraint, Table } from 'src/sql-tools';
+import { Column, ConstraintType, DatabaseSchema, ForeignKeyConstraint, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -19,7 +19,7 @@ export class Table2 {
 
 export const description = 'should create a foreign key constraint to the target table without a primary key';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -69,7 +69,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.FOREIGN_KEY,
+          type: ConstraintType.FOREIGN_KEY,
           name: 'FK_7d9c784c98d12365d198d52e4e6',
           tableName: 'table2',
           columnNames: ['bar'],
diff --git a/server/test/sql-tools/foreign-key-constraint.stub.ts b/server/test/sql-tools/foreign-key-constraint.stub.ts
index c8117bd96d..81f6292782 100644
--- a/server/test/sql-tools/foreign-key-constraint.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint.stub.ts
@@ -1,11 +1,4 @@
-import {
-  Column,
-  DatabaseConstraintType,
-  DatabaseSchema,
-  ForeignKeyConstraint,
-  PrimaryColumn,
-  Table,
-} from 'src/sql-tools';
+import { Column, ConstraintType, DatabaseSchema, ForeignKeyConstraint, PrimaryColumn, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -22,7 +15,7 @@ export class Table2 {
 
 export const description = 'should create a foreign key constraint to the target table';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -46,7 +39,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_b249cc64cf63b8a22557cdc8537',
           tableName: 'table1',
           columnNames: ['id'],
@@ -80,7 +73,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.FOREIGN_KEY,
+          type: ConstraintType.FOREIGN_KEY,
           name: 'FK_3fcca5cc563abf256fc346e3ff4',
           tableName: 'table2',
           columnNames: ['parentId'],
diff --git a/server/test/sql-tools/foreign-key-inferred-type.stub.ts b/server/test/sql-tools/foreign-key-inferred-type.stub.ts
index 0b66a1acd4..626bb2a752 100644
--- a/server/test/sql-tools/foreign-key-inferred-type.stub.ts
+++ b/server/test/sql-tools/foreign-key-inferred-type.stub.ts
@@ -1,4 +1,4 @@
-import { DatabaseConstraintType, DatabaseSchema, ForeignKeyColumn, PrimaryColumn, Table } from 'src/sql-tools';
+import { ConstraintType, DatabaseSchema, ForeignKeyColumn, PrimaryColumn, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -14,7 +14,7 @@ export class Table2 {
 
 export const description = 'should infer the column type from the reference column';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -38,7 +38,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_b249cc64cf63b8a22557cdc8537',
           tableName: 'table1',
           columnNames: ['id'],
@@ -72,7 +72,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.FOREIGN_KEY,
+          type: ConstraintType.FOREIGN_KEY,
           name: 'FK_3fcca5cc563abf256fc346e3ff4',
           tableName: 'table2',
           columnNames: ['parentId'],
diff --git a/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts b/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts
index 109a3dfc85..ad4142a503 100644
--- a/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts
+++ b/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts
@@ -1,4 +1,4 @@
-import { DatabaseConstraintType, DatabaseSchema, ForeignKeyColumn, PrimaryColumn, Table } from 'src/sql-tools';
+import { ConstraintType, DatabaseSchema, ForeignKeyColumn, PrimaryColumn, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -14,7 +14,7 @@ export class Table2 {
 
 export const description = 'should create a foreign key constraint with a unique constraint';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -38,7 +38,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_b249cc64cf63b8a22557cdc8537',
           tableName: 'table1',
           columnNames: ['id'],
@@ -72,7 +72,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.FOREIGN_KEY,
+          type: ConstraintType.FOREIGN_KEY,
           name: 'FK_3fcca5cc563abf256fc346e3ff4',
           tableName: 'table2',
           columnNames: ['parentId'],
@@ -81,7 +81,7 @@ export const schema: DatabaseSchema = {
           synchronize: true,
         },
         {
-          type: DatabaseConstraintType.UNIQUE,
+          type: ConstraintType.UNIQUE,
           name: 'REL_3fcca5cc563abf256fc346e3ff',
           tableName: 'table2',
           columnNames: ['parentId'],
diff --git a/server/test/sql-tools/index-name-default.stub.ts b/server/test/sql-tools/index-name-default.stub.ts
index 06ccd7e173..b309e93d66 100644
--- a/server/test/sql-tools/index-name-default.stub.ts
+++ b/server/test/sql-tools/index-name-default.stub.ts
@@ -9,7 +9,7 @@ export class Table1 {
 
 export const description = 'should create an index with a default name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/index-name-override.stub.ts b/server/test/sql-tools/index-name-override.stub.ts
index afdc26dcc0..daa4fa208b 100644
--- a/server/test/sql-tools/index-name-override.stub.ts
+++ b/server/test/sql-tools/index-name-override.stub.ts
@@ -9,7 +9,7 @@ export class Table1 {
 
 export const description = 'should create an index with a specific name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/index-with-expression.ts b/server/test/sql-tools/index-with-expression.ts
index dec31ebe02..57bce5731b 100644
--- a/server/test/sql-tools/index-with-expression.ts
+++ b/server/test/sql-tools/index-with-expression.ts
@@ -9,7 +9,7 @@ export class Table1 {
 
 export const description = 'should create an index based off of an expression';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/index-with-where.stub.ts b/server/test/sql-tools/index-with-where.stub.ts
index ce4236e490..f88702010a 100644
--- a/server/test/sql-tools/index-with-where.stub.ts
+++ b/server/test/sql-tools/index-with-where.stub.ts
@@ -9,7 +9,7 @@ export class Table1 {
 
 export const description = 'should create an index with a where clause';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/primary-key-constraint-name-default.stub.ts b/server/test/sql-tools/primary-key-constraint-name-default.stub.ts
index 22a515735a..3047605b8e 100644
--- a/server/test/sql-tools/primary-key-constraint-name-default.stub.ts
+++ b/server/test/sql-tools/primary-key-constraint-name-default.stub.ts
@@ -1,4 +1,4 @@
-import { DatabaseConstraintType, DatabaseSchema, PrimaryColumn, Table } from 'src/sql-tools';
+import { ConstraintType, DatabaseSchema, PrimaryColumn, Table } from 'src/sql-tools';
 
 @Table()
 export class Table1 {
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should add a primary key constraint to the table with a default name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -32,7 +32,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_b249cc64cf63b8a22557cdc8537',
           tableName: 'table1',
           columnNames: ['id'],
diff --git a/server/test/sql-tools/primary-key-constraint-name-override.stub.ts b/server/test/sql-tools/primary-key-constraint-name-override.stub.ts
index e1e0daa82e..ffc014c91f 100644
--- a/server/test/sql-tools/primary-key-constraint-name-override.stub.ts
+++ b/server/test/sql-tools/primary-key-constraint-name-override.stub.ts
@@ -1,4 +1,4 @@
-import { DatabaseConstraintType, DatabaseSchema, PrimaryColumn, Table } from 'src/sql-tools';
+import { ConstraintType, DatabaseSchema, PrimaryColumn, Table } from 'src/sql-tools';
 
 @Table({ primaryConstraintName: 'PK_test' })
 export class Table1 {
@@ -8,7 +8,7 @@ export class Table1 {
 
 export const description = 'should add a primary key constraint to the table with a specific name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -32,7 +32,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.PRIMARY_KEY,
+          type: ConstraintType.PRIMARY_KEY,
           name: 'PK_test',
           tableName: 'table1',
           columnNames: ['id'],
diff --git a/server/test/sql-tools/table-name-default.stub.ts b/server/test/sql-tools/table-name-default.stub.ts
index 6ecc042a58..0cb84f518d 100644
--- a/server/test/sql-tools/table-name-default.stub.ts
+++ b/server/test/sql-tools/table-name-default.stub.ts
@@ -5,7 +5,7 @@ export class Table1 {}
 
 export const description = 'should register a table with a default name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/table-name-override.stub.ts b/server/test/sql-tools/table-name-override.stub.ts
index 929a4c4b28..1d66e0b7fb 100644
--- a/server/test/sql-tools/table-name-override.stub.ts
+++ b/server/test/sql-tools/table-name-override.stub.ts
@@ -5,7 +5,7 @@ export class Table1 {}
 
 export const description = 'should register a table with a specific name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/table-name-string-option.stub.ts b/server/test/sql-tools/table-name-string-option.stub.ts
index 33e582fb6b..ae1dfe1b2d 100644
--- a/server/test/sql-tools/table-name-string-option.stub.ts
+++ b/server/test/sql-tools/table-name-string-option.stub.ts
@@ -5,7 +5,7 @@ export class Table1 {}
 
 export const description = 'should register a table with a specific name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/trigger-after-delete.stub.ts b/server/test/sql-tools/trigger-after-delete.stub.ts
index 1eb063c968..56c5d5f267 100644
--- a/server/test/sql-tools/trigger-after-delete.stub.ts
+++ b/server/test/sql-tools/trigger-after-delete.stub.ts
@@ -16,7 +16,7 @@ export class Table1 {}
 
 export const description = 'should create a trigger';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [expect.any(Object)],
   enums: [],
diff --git a/server/test/sql-tools/trigger-before-update.stub.ts b/server/test/sql-tools/trigger-before-update.stub.ts
index a88675a9ef..cbc3454a0b 100644
--- a/server/test/sql-tools/trigger-before-update.stub.ts
+++ b/server/test/sql-tools/trigger-before-update.stub.ts
@@ -16,7 +16,7 @@ export class Table1 {}
 
 export const description = 'should create a trigger ';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [expect.any(Object)],
   enums: [],
diff --git a/server/test/sql-tools/trigger-name-default.stub.ts b/server/test/sql-tools/trigger-name-default.stub.ts
index a9951aef18..a6cf8d237a 100644
--- a/server/test/sql-tools/trigger-name-default.stub.ts
+++ b/server/test/sql-tools/trigger-name-default.stub.ts
@@ -11,7 +11,7 @@ export class Table1 {}
 
 export const description = 'should register a trigger with a default name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/trigger-name-override.stub.ts b/server/test/sql-tools/trigger-name-override.stub.ts
index 3fba0e12ab..aba0addb71 100644
--- a/server/test/sql-tools/trigger-name-override.stub.ts
+++ b/server/test/sql-tools/trigger-name-override.stub.ts
@@ -12,7 +12,7 @@ export class Table1 {}
 
 export const description = 'should a trigger with a specific name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
diff --git a/server/test/sql-tools/unique-constraint-name-default.stub.ts b/server/test/sql-tools/unique-constraint-name-default.stub.ts
index a3b9c512c5..bf302412c1 100644
--- a/server/test/sql-tools/unique-constraint-name-default.stub.ts
+++ b/server/test/sql-tools/unique-constraint-name-default.stub.ts
@@ -1,4 +1,4 @@
-import { Column, DatabaseConstraintType, DatabaseSchema, Table, Unique } from 'src/sql-tools';
+import { Column, ConstraintType, DatabaseSchema, Table, Unique } from 'src/sql-tools';
 
 @Table()
 @Unique({ columns: ['id'] })
@@ -9,7 +9,7 @@ export class Table1 {
 
 export const description = 'should add a unique constraint to the table with a default name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -33,7 +33,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.UNIQUE,
+          type: ConstraintType.UNIQUE,
           name: 'UQ_b249cc64cf63b8a22557cdc8537',
           tableName: 'table1',
           columnNames: ['id'],
diff --git a/server/test/sql-tools/unique-constraint-name-override.stub.ts b/server/test/sql-tools/unique-constraint-name-override.stub.ts
index 4def45043f..189c0c38d6 100644
--- a/server/test/sql-tools/unique-constraint-name-override.stub.ts
+++ b/server/test/sql-tools/unique-constraint-name-override.stub.ts
@@ -1,4 +1,4 @@
-import { Column, DatabaseConstraintType, DatabaseSchema, Table, Unique } from 'src/sql-tools';
+import { Column, ConstraintType, DatabaseSchema, Table, Unique } from 'src/sql-tools';
 
 @Table()
 @Unique({ name: 'UQ_test', columns: ['id'] })
@@ -9,7 +9,7 @@ export class Table1 {
 
 export const description = 'should add a unique constraint to the table with a specific name';
 export const schema: DatabaseSchema = {
-  name: 'postgres',
+  databaseName: 'postgres',
   schemaName: 'public',
   functions: [],
   enums: [],
@@ -33,7 +33,7 @@ export const schema: DatabaseSchema = {
       triggers: [],
       constraints: [
         {
-          type: DatabaseConstraintType.UNIQUE,
+          type: ConstraintType.UNIQUE,
           name: 'UQ_test',
           tableName: 'table1',
           columnNames: ['id'],
diff --git a/server/test/vitest.config.mjs b/server/test/vitest.config.mjs
index a22a6751c3..6d9ee3a564 100644
--- a/server/test/vitest.config.mjs
+++ b/server/test/vitest.config.mjs
@@ -18,7 +18,6 @@ export default defineConfig({
         'src/services/api.service.ts',
         'src/services/microservices.service.ts',
         'src/services/index.ts',
-        'src/sql-tools/from-database/index.ts',
       ],
     },
     server: {

From b00d44a00ced68e7c1d592ef09ecffd800ed804f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 3 Jul 2025 20:28:34 +0000
Subject: [PATCH 128/337] fix(deps): update machine-learning (#19647)

---
 machine-learning/uv.lock | 98 ++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/machine-learning/uv.lock b/machine-learning/uv.lock
index 4e40ede5af..7da2fd3920 100644
--- a/machine-learning/uv.lock
+++ b/machine-learning/uv.lock
@@ -517,16 +517,16 @@ wheels = [
 
 [[package]]
 name = "fastapi"
-version = "0.115.13"
+version = "0.115.14"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pydantic" },
     { name = "starlette" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/20/64/ec0788201b5554e2a87c49af26b77a4d132f807a0fa9675257ac92c6aa0e/fastapi-0.115.13.tar.gz", hash = "sha256:55d1d25c2e1e0a0a50aceb1c8705cd932def273c102bff0b1c1da88b3c6eb307", size = 295680, upload-time = "2025-06-17T11:49:45.575Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ca/53/8c38a874844a8b0fa10dd8adf3836ac154082cf88d3f22b544e9ceea0a15/fastapi-0.115.14.tar.gz", hash = "sha256:b1de15cdc1c499a4da47914db35d0e4ef8f1ce62b624e94e0e5824421df99739", size = 296263, upload-time = "2025-06-26T15:29:08.21Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/59/4a/e17764385382062b0edbb35a26b7cf76d71e27e456546277a42ba6545c6e/fastapi-0.115.13-py3-none-any.whl", hash = "sha256:0a0cab59afa7bab22f5eb347f8c9864b681558c278395e94035a741fc10cd865", size = 95315, upload-time = "2025-06-17T11:49:44.106Z" },
+    { url = "https://files.pythonhosted.org/packages/53/50/b1222562c6d270fea83e9c9075b8e8600b8479150a18e4516a6138b980d1/fastapi-0.115.14-py3-none-any.whl", hash = "sha256:6c0c8bf9420bd58f565e585036d971872472b4f7d3f6c73b698e10cffdefb3ca", size = 95514, upload-time = "2025-06-26T15:29:06.49Z" },
 ]
 
 [[package]]
@@ -900,7 +900,7 @@ wheels = [
 
 [[package]]
 name = "huggingface-hub"
-version = "0.33.0"
+version = "0.33.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "filelock" },
@@ -912,9 +912,9 @@ dependencies = [
     { name = "tqdm" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/91/8a/1362d565fefabaa4185cf3ae842a98dbc5b35146f5694f7080f043a6952f/huggingface_hub-0.33.0.tar.gz", hash = "sha256:aa31f70d29439d00ff7a33837c03f1f9dd83971ce4e29ad664d63ffb17d3bb97", size = 426179, upload-time = "2025-06-11T17:08:07.913Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fa/42/8a95c5632080ae312c0498744b2b852195e10b05a20b1be11c5141092f4c/huggingface_hub-0.33.2.tar.gz", hash = "sha256:84221defaec8fa09c090390cd68c78b88e3c4c2b7befba68d3dc5aacbc3c2c5f", size = 426637, upload-time = "2025-07-02T06:26:05.156Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/33/fb/53587a89fbc00799e4179796f51b3ad713c5de6bb680b2becb6d37c94649/huggingface_hub-0.33.0-py3-none-any.whl", hash = "sha256:e8668875b40c68f9929150d99727d39e5ebb8a05a98e4191b908dc7ded9074b3", size = 514799, upload-time = "2025-06-11T17:08:05.757Z" },
+    { url = "https://files.pythonhosted.org/packages/44/f4/5f3f22e762ad1965f01122b42dae5bf0e009286e2dba601ce1d0dba72424/huggingface_hub-0.33.2-py3-none-any.whl", hash = "sha256:3749498bfa91e8cde2ddc2c1db92c79981f40e66434c20133b39e5928ac9bcc5", size = 515373, upload-time = "2025-07-02T06:26:03.072Z" },
 ]
 
 [[package]]
@@ -1044,7 +1044,7 @@ requires-dist = [
     { name = "onnxruntime", marker = "extra == 'armnn'", specifier = ">=1.15.0,<2" },
     { name = "onnxruntime", marker = "extra == 'cpu'", specifier = ">=1.15.0,<2" },
     { name = "onnxruntime", marker = "extra == 'rknn'", specifier = ">=1.15.0,<2" },
-    { name = "onnxruntime-gpu", marker = "extra == 'cuda'", specifier = ">=1.17.0,<2", index = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/" },
+    { name = "onnxruntime-gpu", marker = "extra == 'cuda'", specifier = ">=1.17.0,<2", index = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple" },
     { name = "onnxruntime-openvino", marker = "extra == 'openvino'", specifier = ">=1.17.1,<1.19.0" },
     { name = "opencv-python-headless", specifier = ">=4.7.0.72,<5.0" },
     { name = "orjson", specifier = ">=3.9.5" },
@@ -1568,7 +1568,7 @@ wheels = [
 [[package]]
 name = "onnxruntime-gpu"
 version = "1.19.2"
-source = { registry = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/" }
+source = { registry = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple" }
 dependencies = [
     { name = "coloredlogs" },
     { name = "flatbuffers" },
@@ -1936,16 +1936,16 @@ wheels = [
 
 [[package]]
 name = "pydantic-settings"
-version = "2.9.1"
+version = "2.10.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pydantic" },
     { name = "python-dotenv" },
     { name = "typing-inspection" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/67/1d/42628a2c33e93f8e9acbde0d5d735fa0850f3e6a2f8cb1eb6c40b9a732ac/pydantic_settings-2.9.1.tar.gz", hash = "sha256:c509bf79d27563add44e8446233359004ed85066cd096d8b510f715e6ef5d268", size = 163234, upload-time = "2025-04-18T16:44:48.265Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/68/85/1ea668bbab3c50071ca613c6ab30047fb36ab0da1b92fa8f17bbc38fd36c/pydantic_settings-2.10.1.tar.gz", hash = "sha256:06f0062169818d0f5524420a360d632d5857b83cffd4d42fe29597807a1614ee", size = 172583, upload-time = "2025-06-24T13:26:46.841Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b6/5f/d6d641b490fd3ec2c4c13b4244d68deea3a1b970a97be64f34fb5504ff72/pydantic_settings-2.9.1-py3-none-any.whl", hash = "sha256:59b4f431b1defb26fe620c71a7d3968a710d719f5f4cdbbdb7926edeb770f6ef", size = 44356, upload-time = "2025-04-18T16:44:46.617Z" },
+    { url = "https://files.pythonhosted.org/packages/58/f0/427018098906416f580e3cf1366d3b1abfb408a0652e9f31600c24a1903c/pydantic_settings-2.10.1-py3-none-any.whl", hash = "sha256:a60952460b99cf661dc25c29c0ef171721f98bfcb52ef8d9ea4c943d7c8cc796", size = 45235, upload-time = "2025-06-24T13:26:45.485Z" },
 ]
 
 [[package]]
@@ -2304,27 +2304,27 @@ wheels = [
 
 [[package]]
 name = "ruff"
-version = "0.12.0"
+version = "0.12.2"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/24/90/5255432602c0b196a0da6720f6f76b93eb50baef46d3c9b0025e2f9acbf3/ruff-0.12.0.tar.gz", hash = "sha256:4d047db3662418d4a848a3fdbfaf17488b34b62f527ed6f10cb8afd78135bc5c", size = 4376101, upload-time = "2025-06-17T15:19:26.217Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/6c/3d/d9a195676f25d00dbfcf3cf95fdd4c685c497fcfa7e862a44ac5e4e96480/ruff-0.12.2.tar.gz", hash = "sha256:d7b4f55cd6f325cb7621244f19c873c565a08aff5a4ba9c69aa7355f3f7afd3e", size = 4432239, upload-time = "2025-07-03T16:40:19.566Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e6/fd/b46bb20e14b11ff49dbc74c61de352e0dc07fb650189513631f6fb5fc69f/ruff-0.12.0-py3-none-linux_armv6l.whl", hash = "sha256:5652a9ecdb308a1754d96a68827755f28d5dfb416b06f60fd9e13f26191a8848", size = 10311554, upload-time = "2025-06-17T15:18:45.792Z" },
-    { url = "https://files.pythonhosted.org/packages/e7/d3/021dde5a988fa3e25d2468d1dadeea0ae89dc4bc67d0140c6e68818a12a1/ruff-0.12.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:05ed0c914fabc602fc1f3b42c53aa219e5736cb030cdd85640c32dbc73da74a6", size = 11118435, upload-time = "2025-06-17T15:18:49.064Z" },
-    { url = "https://files.pythonhosted.org/packages/07/a2/01a5acf495265c667686ec418f19fd5c32bcc326d4c79ac28824aecd6a32/ruff-0.12.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:07a7aa9b69ac3fcfda3c507916d5d1bca10821fe3797d46bad10f2c6de1edda0", size = 10466010, upload-time = "2025-06-17T15:18:51.341Z" },
-    { url = "https://files.pythonhosted.org/packages/4c/57/7caf31dd947d72e7aa06c60ecb19c135cad871a0a8a251723088132ce801/ruff-0.12.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7731c3eec50af71597243bace7ec6104616ca56dda2b99c89935fe926bdcd48", size = 10661366, upload-time = "2025-06-17T15:18:53.29Z" },
-    { url = "https://files.pythonhosted.org/packages/e9/ba/aa393b972a782b4bc9ea121e0e358a18981980856190d7d2b6187f63e03a/ruff-0.12.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:952d0630eae628250ab1c70a7fffb641b03e6b4a2d3f3ec6c1d19b4ab6c6c807", size = 10173492, upload-time = "2025-06-17T15:18:55.262Z" },
-    { url = "https://files.pythonhosted.org/packages/d7/50/9349ee777614bc3062fc6b038503a59b2034d09dd259daf8192f56c06720/ruff-0.12.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c021f04ea06966b02614d442e94071781c424ab8e02ec7af2f037b4c1e01cc82", size = 11761739, upload-time = "2025-06-17T15:18:58.906Z" },
-    { url = "https://files.pythonhosted.org/packages/04/8f/ad459de67c70ec112e2ba7206841c8f4eb340a03ee6a5cabc159fe558b8e/ruff-0.12.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:7d235618283718ee2fe14db07f954f9b2423700919dc688eacf3f8797a11315c", size = 12537098, upload-time = "2025-06-17T15:19:01.316Z" },
-    { url = "https://files.pythonhosted.org/packages/ed/50/15ad9c80ebd3c4819f5bd8883e57329f538704ed57bac680d95cb6627527/ruff-0.12.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0758038f81beec8cc52ca22de9685b8ae7f7cc18c013ec2050012862cc9165", size = 12154122, upload-time = "2025-06-17T15:19:03.727Z" },
-    { url = "https://files.pythonhosted.org/packages/76/e6/79b91e41bc8cc3e78ee95c87093c6cacfa275c786e53c9b11b9358026b3d/ruff-0.12.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:139b3d28027987b78fc8d6cfb61165447bdf3740e650b7c480744873688808c2", size = 11363374, upload-time = "2025-06-17T15:19:05.875Z" },
-    { url = "https://files.pythonhosted.org/packages/db/c3/82b292ff8a561850934549aa9dc39e2c4e783ab3c21debe55a495ddf7827/ruff-0.12.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68853e8517b17bba004152aebd9dd77d5213e503a5f2789395b25f26acac0da4", size = 11587647, upload-time = "2025-06-17T15:19:08.246Z" },
-    { url = "https://files.pythonhosted.org/packages/2b/42/d5760d742669f285909de1bbf50289baccb647b53e99b8a3b4f7ce1b2001/ruff-0.12.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:3a9512af224b9ac4757f7010843771da6b2b0935a9e5e76bb407caa901a1a514", size = 10527284, upload-time = "2025-06-17T15:19:10.37Z" },
-    { url = "https://files.pythonhosted.org/packages/19/f6/fcee9935f25a8a8bba4adbae62495c39ef281256693962c2159e8b284c5f/ruff-0.12.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b08df3d96db798e5beb488d4df03011874aff919a97dcc2dd8539bb2be5d6a88", size = 10158609, upload-time = "2025-06-17T15:19:12.286Z" },
-    { url = "https://files.pythonhosted.org/packages/37/fb/057febf0eea07b9384787bfe197e8b3384aa05faa0d6bd844b94ceb29945/ruff-0.12.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:6a315992297a7435a66259073681bb0d8647a826b7a6de45c6934b2ca3a9ed51", size = 11141462, upload-time = "2025-06-17T15:19:15.195Z" },
-    { url = "https://files.pythonhosted.org/packages/10/7c/1be8571011585914b9d23c95b15d07eec2d2303e94a03df58294bc9274d4/ruff-0.12.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1e55e44e770e061f55a7dbc6e9aed47feea07731d809a3710feda2262d2d4d8a", size = 11641616, upload-time = "2025-06-17T15:19:17.6Z" },
-    { url = "https://files.pythonhosted.org/packages/6a/ef/b960ab4818f90ff59e571d03c3f992828d4683561095e80f9ef31f3d58b7/ruff-0.12.0-py3-none-win32.whl", hash = "sha256:7162a4c816f8d1555eb195c46ae0bd819834d2a3f18f98cc63819a7b46f474fb", size = 10525289, upload-time = "2025-06-17T15:19:19.688Z" },
-    { url = "https://files.pythonhosted.org/packages/34/93/8b16034d493ef958a500f17cda3496c63a537ce9d5a6479feec9558f1695/ruff-0.12.0-py3-none-win_amd64.whl", hash = "sha256:d00b7a157b8fb6d3827b49d3324da34a1e3f93492c1f97b08e222ad7e9b291e0", size = 11598311, upload-time = "2025-06-17T15:19:21.785Z" },
-    { url = "https://files.pythonhosted.org/packages/d0/33/4d3e79e4a84533d6cd526bfb42c020a23256ae5e4265d858bd1287831f7d/ruff-0.12.0-py3-none-win_arm64.whl", hash = "sha256:8cd24580405ad8c1cc64d61725bca091d6b6da7eb3d36f72cc605467069d7e8b", size = 10724946, upload-time = "2025-06-17T15:19:23.952Z" },
+    { url = "https://files.pythonhosted.org/packages/74/b6/2098d0126d2d3318fd5bec3ad40d06c25d377d95749f7a0c5af17129b3b1/ruff-0.12.2-py3-none-linux_armv6l.whl", hash = "sha256:093ea2b221df1d2b8e7ad92fc6ffdca40a2cb10d8564477a987b44fd4008a7be", size = 10369761, upload-time = "2025-07-03T16:39:38.847Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/4b/5da0142033dbe155dc598cfb99262d8ee2449d76920ea92c4eeb9547c208/ruff-0.12.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:09e4cf27cc10f96b1708100fa851e0daf21767e9709e1649175355280e0d950e", size = 11155659, upload-time = "2025-07-03T16:39:42.294Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/21/967b82550a503d7c5c5c127d11c935344b35e8c521f52915fc858fb3e473/ruff-0.12.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:8ae64755b22f4ff85e9c52d1f82644abd0b6b6b6deedceb74bd71f35c24044cc", size = 10537769, upload-time = "2025-07-03T16:39:44.75Z" },
+    { url = "https://files.pythonhosted.org/packages/33/91/00cff7102e2ec71a4890fb7ba1803f2cdb122d82787c7d7cf8041fe8cbc1/ruff-0.12.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3eb3a6b2db4d6e2c77e682f0b988d4d61aff06860158fdb413118ca133d57922", size = 10717602, upload-time = "2025-07-03T16:39:47.652Z" },
+    { url = "https://files.pythonhosted.org/packages/9b/eb/928814daec4e1ba9115858adcda44a637fb9010618721937491e4e2283b8/ruff-0.12.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:73448de992d05517170fc37169cbca857dfeaeaa8c2b9be494d7bcb0d36c8f4b", size = 10198772, upload-time = "2025-07-03T16:39:49.641Z" },
+    { url = "https://files.pythonhosted.org/packages/50/fa/f15089bc20c40f4f72334f9145dde55ab2b680e51afb3b55422effbf2fb6/ruff-0.12.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b8b94317cbc2ae4a2771af641739f933934b03555e51515e6e021c64441532d", size = 11845173, upload-time = "2025-07-03T16:39:52.069Z" },
+    { url = "https://files.pythonhosted.org/packages/43/9f/1f6f98f39f2b9302acc161a4a2187b1e3a97634fe918a8e731e591841cf4/ruff-0.12.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:45fc42c3bf1d30d2008023a0a9a0cfb06bf9835b147f11fe0679f21ae86d34b1", size = 12553002, upload-time = "2025-07-03T16:39:54.551Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/70/08991ac46e38ddd231c8f4fd05ef189b1b94be8883e8c0c146a025c20a19/ruff-0.12.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ce48f675c394c37e958bf229fb5c1e843e20945a6d962cf3ea20b7a107dcd9f4", size = 12171330, upload-time = "2025-07-03T16:39:57.55Z" },
+    { url = "https://files.pythonhosted.org/packages/88/a9/5a55266fec474acfd0a1c73285f19dd22461d95a538f29bba02edd07a5d9/ruff-0.12.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:793d8859445ea47591272021a81391350205a4af65a9392401f418a95dfb75c9", size = 11774717, upload-time = "2025-07-03T16:39:59.78Z" },
+    { url = "https://files.pythonhosted.org/packages/87/e5/0c270e458fc73c46c0d0f7cf970bb14786e5fdb88c87b5e423a4bd65232b/ruff-0.12.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6932323db80484dda89153da3d8e58164d01d6da86857c79f1961934354992da", size = 11646659, upload-time = "2025-07-03T16:40:01.934Z" },
+    { url = "https://files.pythonhosted.org/packages/b7/b6/45ab96070c9752af37f0be364d849ed70e9ccede07675b0ec4e3ef76b63b/ruff-0.12.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:6aa7e623a3a11538108f61e859ebf016c4f14a7e6e4eba1980190cacb57714ce", size = 10604012, upload-time = "2025-07-03T16:40:04.363Z" },
+    { url = "https://files.pythonhosted.org/packages/86/91/26a6e6a424eb147cc7627eebae095cfa0b4b337a7c1c413c447c9ebb72fd/ruff-0.12.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2a4a20aeed74671b2def096bdf2eac610c7d8ffcbf4fb0e627c06947a1d7078d", size = 10176799, upload-time = "2025-07-03T16:40:06.514Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/0c/9f344583465a61c8918a7cda604226e77b2c548daf8ef7c2bfccf2b37200/ruff-0.12.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:71a4c550195612f486c9d1f2b045a600aeba851b298c667807ae933478fcef04", size = 11241507, upload-time = "2025-07-03T16:40:08.708Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/b7/99c34ded8fb5f86c0280278fa89a0066c3760edc326e935ce0b1550d315d/ruff-0.12.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:4987b8f4ceadf597c927beee65a5eaf994c6e2b631df963f86d8ad1bdea99342", size = 11717609, upload-time = "2025-07-03T16:40:10.836Z" },
+    { url = "https://files.pythonhosted.org/packages/51/de/8589fa724590faa057e5a6d171e7f2f6cffe3287406ef40e49c682c07d89/ruff-0.12.2-py3-none-win32.whl", hash = "sha256:369ffb69b70cd55b6c3fc453b9492d98aed98062db9fec828cdfd069555f5f1a", size = 10523823, upload-time = "2025-07-03T16:40:13.203Z" },
+    { url = "https://files.pythonhosted.org/packages/94/47/8abf129102ae4c90cba0c2199a1a9b0fa896f6f806238d6f8c14448cc748/ruff-0.12.2-py3-none-win_amd64.whl", hash = "sha256:dca8a3b6d6dc9810ed8f328d406516bf4d660c00caeaef36eb831cf4871b0639", size = 11629831, upload-time = "2025-07-03T16:40:15.478Z" },
+    { url = "https://files.pythonhosted.org/packages/e2/1f/72d2946e3cc7456bb837e88000eb3437e55f80db339c840c04015a11115d/ruff-0.12.2-py3-none-win_arm64.whl", hash = "sha256:48d6c6bfb4761df68bc05ae630e24f506755e702d4fb08f08460be778c7ccb12", size = 10735334, upload-time = "2025-07-03T16:40:17.677Z" },
 ]
 
 [[package]]
@@ -2504,27 +2504,27 @@ wheels = [
 
 [[package]]
 name = "tokenizers"
-version = "0.21.1"
+version = "0.21.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "huggingface-hub" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/92/76/5ac0c97f1117b91b7eb7323dcd61af80d72f790b4df71249a7850c195f30/tokenizers-0.21.1.tar.gz", hash = "sha256:a1bb04dc5b448985f86ecd4b05407f5a8d97cb2c0532199b2a302a604a0165ab", size = 343256, upload-time = "2025-03-13T10:51:18.189Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ab/2d/b0fce2b8201635f60e8c95990080f58461cc9ca3d5026de2e900f38a7f21/tokenizers-0.21.2.tar.gz", hash = "sha256:fdc7cffde3e2113ba0e6cc7318c40e3438a4d74bbc62bf04bcc63bdfb082ac77", size = 351545, upload-time = "2025-06-24T10:24:52.449Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/a5/1f/328aee25f9115bf04262e8b4e5a2050b7b7cf44b59c74e982db7270c7f30/tokenizers-0.21.1-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:e78e413e9e668ad790a29456e677d9d3aa50a9ad311a40905d6861ba7692cf41", size = 2780767, upload-time = "2025-03-13T10:51:09.459Z" },
-    { url = "https://files.pythonhosted.org/packages/ae/1a/4526797f3719b0287853f12c5ad563a9be09d446c44ac784cdd7c50f76ab/tokenizers-0.21.1-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:cd51cd0a91ecc801633829fcd1fda9cf8682ed3477c6243b9a095539de4aecf3", size = 2650555, upload-time = "2025-03-13T10:51:07.692Z" },
-    { url = "https://files.pythonhosted.org/packages/4d/7a/a209b29f971a9fdc1da86f917fe4524564924db50d13f0724feed37b2a4d/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28da6b72d4fb14ee200a1bd386ff74ade8992d7f725f2bde2c495a9a98cf4d9f", size = 2937541, upload-time = "2025-03-13T10:50:56.679Z" },
-    { url = "https://files.pythonhosted.org/packages/3c/1e/b788b50ffc6191e0b1fc2b0d49df8cff16fe415302e5ceb89f619d12c5bc/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:34d8cfde551c9916cb92014e040806122295a6800914bab5865deb85623931cf", size = 2819058, upload-time = "2025-03-13T10:50:59.525Z" },
-    { url = "https://files.pythonhosted.org/packages/36/aa/3626dfa09a0ecc5b57a8c58eeaeb7dd7ca9a37ad9dd681edab5acd55764c/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aaa852d23e125b73d283c98f007e06d4595732104b65402f46e8ef24b588d9f8", size = 3133278, upload-time = "2025-03-13T10:51:04.678Z" },
-    { url = "https://files.pythonhosted.org/packages/a4/4d/8fbc203838b3d26269f944a89459d94c858f5b3f9a9b6ee9728cdcf69161/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a21a15d5c8e603331b8a59548bbe113564136dc0f5ad8306dd5033459a226da0", size = 3144253, upload-time = "2025-03-13T10:51:01.261Z" },
-    { url = "https://files.pythonhosted.org/packages/d8/1b/2bd062adeb7c7511b847b32e356024980c0ffcf35f28947792c2d8ad2288/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2fdbd4c067c60a0ac7eca14b6bd18a5bebace54eb757c706b47ea93204f7a37c", size = 3398225, upload-time = "2025-03-13T10:51:03.243Z" },
-    { url = "https://files.pythonhosted.org/packages/8a/63/38be071b0c8e06840bc6046991636bcb30c27f6bb1e670f4f4bc87cf49cc/tokenizers-0.21.1-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2dd9a0061e403546f7377df940e866c3e678d7d4e9643d0461ea442b4f89e61a", size = 3038874, upload-time = "2025-03-13T10:51:06.235Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/83/afa94193c09246417c23a3c75a8a0a96bf44ab5630a3015538d0c316dd4b/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:db9484aeb2e200c43b915a1a0150ea885e35f357a5a8fabf7373af333dcc8dbf", size = 9014448, upload-time = "2025-03-13T10:51:10.927Z" },
-    { url = "https://files.pythonhosted.org/packages/ae/b3/0e1a37d4f84c0f014d43701c11eb8072704f6efe8d8fc2dcdb79c47d76de/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:ed248ab5279e601a30a4d67bdb897ecbe955a50f1e7bb62bd99f07dd11c2f5b6", size = 8937877, upload-time = "2025-03-13T10:51:12.688Z" },
-    { url = "https://files.pythonhosted.org/packages/ac/33/ff08f50e6d615eb180a4a328c65907feb6ded0b8f990ec923969759dc379/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:9ac78b12e541d4ce67b4dfd970e44c060a2147b9b2a21f509566d556a509c67d", size = 9186645, upload-time = "2025-03-13T10:51:14.723Z" },
-    { url = "https://files.pythonhosted.org/packages/5f/aa/8ae85f69a9f6012c6f8011c6f4aa1c96154c816e9eea2e1b758601157833/tokenizers-0.21.1-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:e5a69c1a4496b81a5ee5d2c1f3f7fbdf95e90a0196101b0ee89ed9956b8a168f", size = 9384380, upload-time = "2025-03-13T10:51:16.526Z" },
-    { url = "https://files.pythonhosted.org/packages/e8/5b/a5d98c89f747455e8b7a9504910c865d5e51da55e825a7ae641fb5ff0a58/tokenizers-0.21.1-cp39-abi3-win32.whl", hash = "sha256:1039a3a5734944e09de1d48761ade94e00d0fa760c0e0551151d4dd851ba63e3", size = 2239506, upload-time = "2025-03-13T10:51:20.643Z" },
-    { url = "https://files.pythonhosted.org/packages/e6/b6/072a8e053ae600dcc2ac0da81a23548e3b523301a442a6ca900e92ac35be/tokenizers-0.21.1-cp39-abi3-win_amd64.whl", hash = "sha256:0f0dcbcc9f6e13e675a66d7a5f2f225a736745ce484c1a4e07476a89ccdad382", size = 2435481, upload-time = "2025-03-13T10:51:19.243Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/cc/2936e2d45ceb130a21d929743f1e9897514691bec123203e10837972296f/tokenizers-0.21.2-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:342b5dfb75009f2255ab8dec0041287260fed5ce00c323eb6bab639066fef8ec", size = 2875206, upload-time = "2025-06-24T10:24:42.755Z" },
+    { url = "https://files.pythonhosted.org/packages/6c/e6/33f41f2cc7861faeba8988e7a77601407bf1d9d28fc79c5903f8f77df587/tokenizers-0.21.2-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:126df3205d6f3a93fea80c7a8a266a78c1bd8dd2fe043386bafdd7736a23e45f", size = 2732655, upload-time = "2025-06-24T10:24:41.56Z" },
+    { url = "https://files.pythonhosted.org/packages/33/2b/1791eb329c07122a75b01035b1a3aa22ad139f3ce0ece1b059b506d9d9de/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a32cd81be21168bd0d6a0f0962d60177c447a1aa1b1e48fa6ec9fc728ee0b12", size = 3019202, upload-time = "2025-06-24T10:24:31.791Z" },
+    { url = "https://files.pythonhosted.org/packages/05/15/fd2d8104faa9f86ac68748e6f7ece0b5eb7983c7efc3a2c197cb98c99030/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8bd8999538c405133c2ab999b83b17c08b7fc1b48c1ada2469964605a709ef91", size = 2934539, upload-time = "2025-06-24T10:24:34.567Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/2e/53e8fd053e1f3ffbe579ca5f9546f35ac67cf0039ed357ad7ec57f5f5af0/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5e9944e61239b083a41cf8fc42802f855e1dca0f499196df37a8ce219abac6eb", size = 3248665, upload-time = "2025-06-24T10:24:39.024Z" },
+    { url = "https://files.pythonhosted.org/packages/00/15/79713359f4037aa8f4d1f06ffca35312ac83629da062670e8830917e2153/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:514cd43045c5d546f01142ff9c79a96ea69e4b5cda09e3027708cb2e6d5762ab", size = 3451305, upload-time = "2025-06-24T10:24:36.133Z" },
+    { url = "https://files.pythonhosted.org/packages/38/5f/959f3a8756fc9396aeb704292777b84f02a5c6f25c3fc3ba7530db5feb2c/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b1b9405822527ec1e0f7d8d2fdb287a5730c3a6518189c968254a8441b21faae", size = 3214757, upload-time = "2025-06-24T10:24:37.784Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/74/f41a432a0733f61f3d21b288de6dfa78f7acff309c6f0f323b2833e9189f/tokenizers-0.21.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fed9a4d51c395103ad24f8e7eb976811c57fbec2af9f133df471afcd922e5020", size = 3121887, upload-time = "2025-06-24T10:24:40.293Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/6a/bc220a11a17e5d07b0dfb3b5c628621d4dcc084bccd27cfaead659963016/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:2c41862df3d873665ec78b6be36fcc30a26e3d4902e9dd8608ed61d49a48bc19", size = 9091965, upload-time = "2025-06-24T10:24:44.431Z" },
+    { url = "https://files.pythonhosted.org/packages/6c/bd/ac386d79c4ef20dc6f39c4706640c24823dca7ebb6f703bfe6b5f0292d88/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:ed21dc7e624e4220e21758b2e62893be7101453525e3d23264081c9ef9a6d00d", size = 9053372, upload-time = "2025-06-24T10:24:46.455Z" },
+    { url = "https://files.pythonhosted.org/packages/63/7b/5440bf203b2a5358f074408f7f9c42884849cd9972879e10ee6b7a8c3b3d/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:0e73770507e65a0e0e2a1affd6b03c36e3bc4377bd10c9ccf51a82c77c0fe365", size = 9298632, upload-time = "2025-06-24T10:24:48.446Z" },
+    { url = "https://files.pythonhosted.org/packages/a4/d2/faa1acac3f96a7427866e94ed4289949b2524f0c1878512516567d80563c/tokenizers-0.21.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:106746e8aa9014a12109e58d540ad5465b4c183768ea96c03cbc24c44d329958", size = 9470074, upload-time = "2025-06-24T10:24:50.378Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/a5/896e1ef0707212745ae9f37e84c7d50269411aef2e9ccd0de63623feecdf/tokenizers-0.21.2-cp39-abi3-win32.whl", hash = "sha256:cabda5a6d15d620b6dfe711e1af52205266d05b379ea85a8a301b3593c60e962", size = 2330115, upload-time = "2025-06-24T10:24:55.069Z" },
+    { url = "https://files.pythonhosted.org/packages/13/c3/cc2755ee10be859c4338c962a35b9a663788c0c0b50c0bdd8078fb6870cf/tokenizers-0.21.2-cp39-abi3-win_amd64.whl", hash = "sha256:58747bb898acdb1007f37a7bbe614346e98dc28708ffb66a3fd50ce169ac6c98", size = 2509918, upload-time = "2025-06-24T10:24:53.71Z" },
 ]
 
 [[package]]
@@ -2628,16 +2628,16 @@ wheels = [
 
 [[package]]
 name = "uvicorn"
-version = "0.34.3"
+version = "0.35.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "click" },
     { name = "h11" },
     { name = "typing-extensions", marker = "python_full_version < '3.11'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/de/ad/713be230bcda622eaa35c28f0d328c3675c371238470abdea52417f17a8e/uvicorn-0.34.3.tar.gz", hash = "sha256:35919a9a979d7a59334b6b10e05d77c1d0d574c50e0fc98b8b1a0f165708b55a", size = 76631, upload-time = "2025-06-01T07:48:17.531Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/5e/42/e0e305207bb88c6b8d3061399c6a961ffe5fbb7e2aa63c9234df7259e9cd/uvicorn-0.35.0.tar.gz", hash = "sha256:bc662f087f7cf2ce11a1d7fd70b90c9f98ef2e2831556dd078d131b96cc94a01", size = 78473, upload-time = "2025-06-28T16:15:46.058Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/6d/0d/8adfeaa62945f90d19ddc461c55f4a50c258af7662d34b6a3d5d1f8646f6/uvicorn-0.34.3-py3-none-any.whl", hash = "sha256:16246631db62bdfbf069b0645177d6e8a77ba950cfedbfd093acef9444e4d885", size = 62431, upload-time = "2025-06-01T07:48:15.664Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/e2/dc81b1bd1dcfe91735810265e9d26bc8ec5da45b4c0f6237e286819194c3/uvicorn-0.35.0-py3-none-any.whl", hash = "sha256:197535216b25ff9b785e29a0b79199f55222193d47f820816e7da751e9bc8d4a", size = 66406, upload-time = "2025-06-28T16:15:44.816Z" },
 ]
 
 [package.optional-dependencies]

From 181efb9010670efa310658e5370ee7aa03a80e2d Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 4 Jul 2025 21:00:34 +0530
Subject: [PATCH 129/337] refactor: reduce timeline rebuilds (#19704)

* reduce timeline rebuilds

* feat: adds bottom sheet map and actions (#19692)

* adds bottom sheet map and actions

* PR feedbacks

* only reload the asset viewer if asset is changed

* styling tweak

---------

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

* rename singleton and remove event prefix

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../domain/models/asset/base_asset.model.dart |   9 +-
 .../models/asset/local_asset.model.dart       |   2 -
 .../models/asset/remote_asset.model.dart      |   2 -
 mobile/lib/domain/models/setting.model.dart   |   1 +
 .../lib/domain/services/timeline.service.dart |   6 +-
 mobile/lib/domain/utils/event_stream.dart     |  48 +++++
 mobile/lib/pages/common/tab_shell.page.dart   |  80 +++++----
 .../archive_action_button.widget.dart         |   2 -
 .../delete_action_button.widget.dart          |   2 -
 .../favorite_action_button.widget.dart        |   2 -
 ...e_to_lock_folder_action_button.widget.dart |   2 -
 ...from_lock_folder_action_button.widget.dart |   2 -
 ...t.dart => trash_action_button.widget.dart} |   2 -
 .../unarchive_action_button.widget.dart       |   2 -
 .../unfavorite_action_button.widget.dart      |   2 -
 .../asset_viewer/asset_viewer.page.dart       |  84 ++++++---
 ...om_sheet.dart => bottom_sheet.widget.dart} |  84 +++++++--
 .../bottom_sheet/location_details.widget.dart | 124 +++++++++++++
 .../base_bottom_sheet.widget.dart             |  10 +-
 .../home_bottom_app_bar.widget.dart           |   2 +-
 .../widgets/timeline/timeline.widget.dart     | 166 ++++++++++--------
 .../infrastructure/action.provider.dart       |   3 +-
 .../asset_viewer/current_asset.provider.dart  |  16 +-
 .../asset_viewer/detail_panel/exif_map.dart   |   3 +
 .../widgets/common/immich_sliver_app_bar.dart | 105 +++++------
 mobile/lib/widgets/map/map_thumbnail.dart     |  16 +-
 mobile/lib/widgets/photo_view/photo_view.dart |   2 +-
 .../photo_view/photo_view_gallery.dart        |   9 +-
 .../photo_view/src/core/photo_view_core.dart  |   2 +-
 29 files changed, 557 insertions(+), 233 deletions(-)
 create mode 100644 mobile/lib/domain/utils/event_stream.dart
 rename mobile/lib/presentation/widgets/action_buttons/{trash_action_buton.widget.dart => trash_action_button.widget.dart} (92%)
 rename mobile/lib/presentation/widgets/asset_viewer/{bottom_sheet.dart => bottom_sheet.widget.dart} (66%)
 create mode 100644 mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart

diff --git a/mobile/lib/domain/models/asset/base_asset.model.dart b/mobile/lib/domain/models/asset/base_asset.model.dart
index dd57456c76..1226d1730f 100644
--- a/mobile/lib/domain/models/asset/base_asset.model.dart
+++ b/mobile/lib/domain/models/asset/base_asset.model.dart
@@ -1,5 +1,5 @@
-part 'remote_asset.model.dart';
 part 'local_asset.model.dart';
+part 'remote_asset.model.dart';
 
 enum AssetType {
   // do not change this order!
@@ -48,6 +48,13 @@ sealed class BaseAsset {
     return null;
   }
 
+  bool get hasRemote =>
+      storage == AssetState.remote || storage == AssetState.merged;
+  bool get hasLocal =>
+      storage == AssetState.local || storage == AssetState.merged;
+  bool get isLocalOnly => storage == AssetState.local;
+  bool get isRemoteOnly => storage == AssetState.remote;
+
   // Overridden in subclasses
   AssetState get storage;
   String get heroTag;
diff --git a/mobile/lib/domain/models/asset/local_asset.model.dart b/mobile/lib/domain/models/asset/local_asset.model.dart
index 8aab1e3431..30a4955fa8 100644
--- a/mobile/lib/domain/models/asset/local_asset.model.dart
+++ b/mobile/lib/domain/models/asset/local_asset.model.dart
@@ -25,8 +25,6 @@ class LocalAsset extends BaseAsset {
   @override
   String get heroTag => '${id}_${remoteId ?? checksum}';
 
-  bool get hasRemote => remoteId != null;
-
   @override
   String toString() {
     return '''LocalAsset {
diff --git a/mobile/lib/domain/models/asset/remote_asset.model.dart b/mobile/lib/domain/models/asset/remote_asset.model.dart
index 052e1d5eff..e5c1f8345a 100644
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -39,8 +39,6 @@ class RemoteAsset extends BaseAsset {
   @override
   String get heroTag => '${localId ?? checksum}_$id';
 
-  bool get hasLocal => localId != null;
-
   @override
   String toString() {
     return '''Asset {
diff --git a/mobile/lib/domain/models/setting.model.dart b/mobile/lib/domain/models/setting.model.dart
index fe341dc028..a256ee3589 100644
--- a/mobile/lib/domain/models/setting.model.dart
+++ b/mobile/lib/domain/models/setting.model.dart
@@ -6,6 +6,7 @@ enum Setting<T> {
   showStorageIndicator<bool>(StoreKey.storageIndicator, true),
   loadOriginal<bool>(StoreKey.loadOriginal, false),
   preferRemoteImage<bool>(StoreKey.preferRemoteImage, false),
+  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),
   ;
 
   const Setting(this.storeKey, this.defaultValue);
diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 54a9a3a142..618ccd250f 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -7,6 +7,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
 
@@ -68,7 +69,7 @@ class TimelineService {
     _bucketSubscription = _bucketSource().listen((buckets) {
       _totalAssets =
           buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
-      unawaited(reloadBucket());
+      unawaited(_reloadBucket());
     });
   }
 
@@ -79,8 +80,9 @@ class TimelineService {
 
   Stream<List<Bucket>> Function() get watchBuckets => _bucketSource;
 
-  Future<void> reloadBucket() => _mutex.run(() async {
+  Future<void> _reloadBucket() => _mutex.run(() async {
         _buffer = await _assetSource(_bufferOffset, _buffer.length);
+        EventStream.shared.emit(const TimelineReloadEvent());
       });
 
   Future<List<BaseAsset>> loadAssets(int index, int count) =>
diff --git a/mobile/lib/domain/utils/event_stream.dart b/mobile/lib/domain/utils/event_stream.dart
new file mode 100644
index 0000000000..9acb3b4e39
--- /dev/null
+++ b/mobile/lib/domain/utils/event_stream.dart
@@ -0,0 +1,48 @@
+import 'dart:async';
+
+sealed class Event {
+  const Event();
+}
+
+class TimelineReloadEvent extends Event {
+  const TimelineReloadEvent();
+}
+
+class EventStream {
+  EventStream._();
+
+  static final EventStream shared = EventStream._();
+
+  final StreamController<Event> _controller =
+      StreamController<Event>.broadcast();
+
+  void emit(Event event) {
+    _controller.add(event);
+  }
+
+  Stream<T> where<T extends Event>() {
+    if (T == Event) {
+      return _controller.stream as Stream<T>;
+    }
+    return _controller.stream.where((event) => event is T).cast<T>();
+  }
+
+  StreamSubscription<T> listen<T extends Event>(
+    void Function(T event)? onData, {
+    Function? onError,
+    void Function()? onDone,
+    bool? cancelOnError,
+  }) {
+    return where<T>().listen(
+      onData,
+      onError: onError,
+      onDone: onDone,
+      cancelOnError: cancelOnError,
+    );
+  }
+
+  /// Closes the stream controller
+  void dispose() {
+    _controller.close();
+  }
+}
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index 31ccb12392..452c153342 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -42,22 +42,6 @@ class TabShellPage extends ConsumerWidget {
       );
     }
 
-    void onNavigationSelected(TabsRouter router, int index) {
-      // On Photos page menu tapped
-      if (router.activeIndex == 0 && index == 0) {
-        scrollToTopNotifierProvider.scrollToTop();
-      }
-
-      // On Search page tapped
-      if (router.activeIndex == 1 && index == 1) {
-        ref.read(searchInputFocusProvider).requestFocus();
-      }
-
-      ref.read(hapticFeedbackProvider.notifier).selectionClick();
-      router.setActiveIndex(index);
-      ref.read(tabProvider.notifier).state = TabEnum.values[index];
-    }
-
     final navigationDestinations = [
       NavigationDestination(
         label: 'photos'.tr(),
@@ -110,15 +94,6 @@ class TabShellPage extends ConsumerWidget {
       ),
     ];
 
-    Widget bottomNavigationBar(TabsRouter tabsRouter) {
-      return NavigationBar(
-        selectedIndex: tabsRouter.activeIndex,
-        onDestinationSelected: (index) =>
-            onNavigationSelected(tabsRouter, index),
-        destinations: navigationDestinations,
-      );
-    }
-
     Widget navigationRail(TabsRouter tabsRouter) {
       return NavigationRail(
         destinations: navigationDestinations
@@ -131,15 +106,13 @@ class TabShellPage extends ConsumerWidget {
             )
             .toList(),
         onDestinationSelected: (index) =>
-            onNavigationSelected(tabsRouter, index),
+            _onNavigationSelected(tabsRouter, index, ref),
         selectedIndex: tabsRouter.activeIndex,
         labelType: NavigationRailLabelType.all,
         groupAlignment: 0.0,
       );
     }
 
-    final multiselectEnabled =
-        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
     return AutoTabsRouter(
       routes: [
         const MainTimelineRoute(),
@@ -173,12 +146,57 @@ class TabShellPage extends ConsumerWidget {
                     ],
                   )
                 : heroedChild,
-            bottomNavigationBar: multiselectEnabled || isScreenLandscape
-                ? null
-                : bottomNavigationBar(tabsRouter),
+            bottomNavigationBar: _BottomNavigationBar(
+              tabsRouter: tabsRouter,
+              destinations: navigationDestinations,
+            ),
           ),
         );
       },
     );
   }
 }
+
+void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
+  // On Photos page menu tapped
+  if (router.activeIndex == 0 && index == 0) {
+    scrollToTopNotifierProvider.scrollToTop();
+  }
+
+  // On Search page tapped
+  if (router.activeIndex == 1 && index == 1) {
+    ref.read(searchInputFocusProvider).requestFocus();
+  }
+
+  ref.read(hapticFeedbackProvider.notifier).selectionClick();
+  router.setActiveIndex(index);
+  ref.read(tabProvider.notifier).state = TabEnum.values[index];
+}
+
+class _BottomNavigationBar extends ConsumerWidget {
+  const _BottomNavigationBar({
+    required this.tabsRouter,
+    required this.destinations,
+  });
+
+  final List<Widget> destinations;
+  final TabsRouter tabsRouter;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isScreenLandscape = context.orientation == Orientation.landscape;
+    final isMultiselectEnabled =
+        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
+
+    if (isScreenLandscape || isMultiselectEnabled) {
+      return const SizedBox.shrink();
+    }
+
+    return NavigationBar(
+      selectedIndex: tabsRouter.activeIndex,
+      onDestinationSelected: (index) =>
+          _onNavigationSelected(tabsRouter, index, ref),
+      destinations: destinations,
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
index d1d0695a99..86537816e3 100644
--- a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
@@ -5,7 +5,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -20,7 +19,6 @@ class ArchiveActionButton extends ConsumerWidget {
     }
 
     final result = await ref.read(actionProvider.notifier).archive(source);
-    await ref.read(timelineServiceProvider).reloadBucket();
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'archive_action_prompt'.t(
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
index 6f8c0f5227..d81f998a7b 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
@@ -5,7 +5,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -20,7 +19,6 @@ class DeletePermanentActionButton extends ConsumerWidget {
     }
 
     final result = await ref.read(actionProvider.notifier).delete(source);
-    await ref.read(timelineServiceProvider).reloadBucket();
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'delete_action_prompt'.t(
diff --git a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
index 50d13e6b4e..4b717149d9 100644
--- a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
@@ -5,7 +5,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -20,7 +19,6 @@ class FavoriteActionButton extends ConsumerWidget {
     }
 
     final result = await ref.read(actionProvider.notifier).favorite(source);
-    await ref.read(timelineServiceProvider).reloadBucket();
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'favorite_action_prompt'.t(
diff --git a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
index 503dd34403..7546f07961 100644
--- a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
@@ -5,7 +5,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -21,7 +20,6 @@ class MoveToLockFolderActionButton extends ConsumerWidget {
 
     final result =
         await ref.read(actionProvider.notifier).moveToLockFolder(source);
-    await ref.read(timelineServiceProvider).reloadBucket();
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'move_to_lock_folder_action_prompt'.t(
diff --git a/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
index 32857f300e..20fb62013f 100644
--- a/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
@@ -5,7 +5,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -21,7 +20,6 @@ class RemoveFromLockFolderActionButton extends ConsumerWidget {
 
     final result =
         await ref.read(actionProvider.notifier).removeFromLockFolder(source);
-    await ref.read(timelineServiceProvider).reloadBucket();
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'remove_from_lock_folder_action_prompt'.t(
diff --git a/mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
similarity index 92%
rename from mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart
rename to mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
index 1d287e34e2..449b688550 100644
--- a/mobile/lib/presentation/widgets/action_buttons/trash_action_buton.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
@@ -5,7 +5,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -20,7 +19,6 @@ class TrashActionButton extends ConsumerWidget {
     }
 
     final result = await ref.read(actionProvider.notifier).trash(source);
-    await ref.read(timelineServiceProvider).reloadBucket();
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'trash_action_prompt'.t(
diff --git a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
index b5e210eb3b..a58d9f1ee1 100644
--- a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
@@ -5,7 +5,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -20,7 +19,6 @@ class UnarchiveActionButton extends ConsumerWidget {
     }
 
     final result = await ref.read(actionProvider.notifier).unArchive(source);
-    await ref.read(timelineServiceProvider).reloadBucket();
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'unarchive_action_prompt'.t(
diff --git a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
index 2d485f3418..cf014c356c 100644
--- a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
@@ -5,7 +5,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -20,7 +19,6 @@ class UnFavoriteActionButton extends ConsumerWidget {
     }
 
     final result = await ref.read(actionProvider.notifier).unFavorite(source);
-    await ref.read(timelineServiceProvider).reloadBucket();
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'unfavorite_action_prompt'.t(
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 6f5ceb6da1..d221347ce1 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -4,9 +4,10 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/scroll_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
@@ -60,6 +61,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   PersistentBottomSheetController? sheetCloseNotifier;
   // PhotoViewGallery takes care of disposing it's controllers
   PhotoViewControllerBase? viewController;
+  StreamSubscription? _reloadSubscription;
 
   late Platform platform;
   late PhotoViewControllerValue initialPhotoViewState;
@@ -88,6 +90,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _onAssetChanged(widget.initialIndex);
     });
+    _reloadSubscription =
+        EventStream.shared.listen<TimelineReloadEvent>(_onTimelineReload);
   }
 
   @override
@@ -95,9 +99,31 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     pageController.dispose();
     bottomSheetController.dispose();
     _cancelTimers();
+    _reloadSubscription?.cancel();
     super.dispose();
   }
 
+  void _onTimelineReload(_) {
+    setState(() {
+      totalAssets = ref.read(timelineServiceProvider).totalAssets;
+      if (totalAssets == 0) {
+        context.maybePop();
+        return;
+      }
+
+      final index = pageController.page?.round() ?? 0;
+      final newAsset = ref.read(timelineServiceProvider).getAsset(index);
+      final currentAsset = ref.read(currentAssetNotifier);
+      // Do not reload / close the bottom sheet if the asset has not changed
+      if (newAsset.heroTag == currentAsset.heroTag) {
+        return;
+      }
+
+      _onAssetChanged(pageController.page!.round());
+      sheetCloseNotifier?.close();
+    });
+  }
+
   Color get backgroundColor {
     if (showingBottomSheet && !context.isDarkTheme) {
       return Colors.white;
@@ -186,11 +212,12 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   void _onDragStart(
     _,
     DragStartDetails details,
-    PhotoViewControllerValue value,
+    PhotoViewControllerBase controller,
     PhotoViewScaleStateController scaleStateController,
   ) {
+    viewController = controller;
     dragDownPosition = details.localPosition;
-    initialPhotoViewState = value;
+    initialPhotoViewState = controller.value;
     final isZoomed =
         scaleStateController.scaleState == PhotoViewScaleState.zoomedIn ||
             scaleStateController.scaleState == PhotoViewScaleState.covering;
@@ -277,7 +304,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   void _openBottomSheet(BuildContext ctx) {
     setState(() {
       initialScale = viewController?.scale;
-      viewController?.animateMultiple(scale: _getScaleForBottomSheet);
+      viewController?.updateMultiple(scale: _getScaleForBottomSheet);
       showingBottomSheet = true;
       previousExtent = _kBottomSheetMinimumExtent;
       sheetCloseNotifier = showBottomSheet(
@@ -308,10 +335,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     setState(() {
       showingBottomSheet = false;
       sheetCloseNotifier = null;
-      viewController?.animateMultiple(
-        position: Offset.zero,
-        scale: initialScale,
-      );
+      viewController?.animateMultiple(position: Offset.zero);
+      viewController?.updateMultiple(scale: initialScale);
       shouldPopOnDrag = false;
       hasDraggedDown = null;
     });
@@ -420,10 +445,10 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   PhotoViewGalleryPageOptions _assetBuilder(BuildContext ctx, int index) {
     final asset = ref.read(timelineServiceProvider).getAsset(index);
     final size = Size(ctx.width, ctx.height);
-    final imageProvider = getFullImageProvider(asset, size: size);
 
     return PhotoViewGalleryPageOptions(
-      imageProvider: imageProvider,
+      key: ValueKey(asset.heroTag),
+      imageProvider: getFullImageProvider(asset, size: size),
       heroAttributes: PhotoViewHeroAttributes(tag: asset.heroTag),
       filterQuality: FilterQuality.high,
       tightMode: true,
@@ -446,27 +471,34 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     );
   }
 
+  void _onPop<T>(bool didPop, T? result) {
+    ref.read(currentAssetNotifier.notifier).dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     // Currently it is not possible to scroll the asset when the bottom sheet is open all the way.
     // Issue: https://github.com/flutter/flutter/issues/109037
     // TODO: Add a custom scrum builder once the fix lands on stable
-    return Scaffold(
-      backgroundColor: Colors.black.withAlpha(backgroundOpacity),
-      body: PhotoViewGallery.builder(
-        gaplessPlayback: true,
-        loadingBuilder: _placeholderBuilder,
-        pageController: pageController,
-        scrollPhysics: platform.isIOS
-            ? const FastScrollPhysics() // Use bouncing physics for iOS
-            : const FastClampingScrollPhysics() // Use heavy physics for Android
-        ,
-        itemCount: totalAssets,
-        onPageChanged: _onPageChanged,
-        onPageBuild: _onPageBuild,
-        builder: _assetBuilder,
-        backgroundDecoration: BoxDecoration(color: backgroundColor),
-        enablePanAlways: true,
+    return PopScope(
+      onPopInvokedWithResult: _onPop,
+      child: Scaffold(
+        backgroundColor: Colors.black.withAlpha(backgroundOpacity),
+        body: PhotoViewGallery.builder(
+          gaplessPlayback: true,
+          loadingBuilder: _placeholderBuilder,
+          pageController: pageController,
+          scrollPhysics: platform.isIOS
+              ? const FastScrollPhysics() // Use bouncing physics for iOS
+              : const FastClampingScrollPhysics() // Use heavy physics for Android
+          ,
+          itemCount: totalAssets,
+          onPageChanged: _onPageChanged,
+          onPageBuild: _onPageBuild,
+          builder: _assetBuilder,
+          backgroundDecoration: BoxDecoration(color: backgroundColor),
+          enablePanAlways: true,
+        ),
       ),
     );
   }
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
similarity index 66%
rename from mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.dart
rename to mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
index 39f28d2f60..d8afe81564 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -1,30 +1,78 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
 
 const _kSeparator = '  •  ';
 
-class AssetDetailBottomSheet extends BaseBottomSheet {
+class AssetDetailBottomSheet extends ConsumerWidget {
+  final DraggableScrollableController? controller;
+  final double initialChildSize;
+
   const AssetDetailBottomSheet({
-    super.controller,
-    super.initialChildSize,
+    this.controller,
+    this.initialChildSize = 0.35,
     super.key,
-  }) : super(
-          actions: const [],
-          slivers: const [_AssetDetailBottomSheet()],
-          minChildSize: 0.1,
-          maxChildSize: 1.0,
-          expand: false,
-          shouldCloseOnMinExtent: false,
-          resizeOnScroll: false,
-        );
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final asset = ref.watch(currentAssetNotifier);
+    final isTrashEnable = ref.watch(
+      serverInfoProvider.select((state) => state.serverFeatures.trash),
+    );
+
+    final actions = <Widget>[
+      const ShareActionButton(),
+      if (asset.hasRemote) ...[
+        const ShareLinkActionButton(source: ActionSource.viewer),
+        const ArchiveActionButton(source: ActionSource.viewer),
+        const FavoriteActionButton(source: ActionSource.viewer),
+        if (!asset.hasLocal) const DownloadActionButton(),
+        isTrashEnable
+            ? const TrashActionButton(source: ActionSource.viewer)
+            : const DeletePermanentActionButton(source: ActionSource.viewer),
+        const MoveToLockFolderActionButton(
+          source: ActionSource.viewer,
+        ),
+      ],
+      if (asset.storage == AssetState.local) ...[
+        const DeleteLocalActionButton(),
+        const UploadActionButton(),
+      ],
+    ];
+
+    return BaseBottomSheet(
+      actions: actions,
+      slivers: const [_AssetDetailBottomSheet()],
+      controller: controller,
+      initialChildSize: initialChildSize,
+      minChildSize: 0.1,
+      maxChildSize: 1.0,
+      expand: false,
+      shouldCloseOnMinExtent: false,
+      resizeOnScroll: false,
+    );
+  }
 }
 
 class _AssetDetailBottomSheet extends ConsumerWidget {
@@ -96,16 +144,16 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
         // Asset Date and Time
         _SheetTile(
           title: _getDateTime(context, asset),
-          titleStyle: context.textTheme.bodyLarge
-              ?.copyWith(fontWeight: FontWeight.w600),
+          titleStyle: context.textTheme.bodyLarge?.copyWith(
+            fontWeight: FontWeight.w500,
+            fontSize: 16,
+          ),
         ),
+        const SheetLocationDetails(),
         // Details header
         _SheetTile(
           title: 'exif_bottom_sheet_details'.t(context: context),
-          titleStyle: context.textTheme.labelLarge?.copyWith(
-            color: context.textTheme.labelLarge?.color,
-            fontWeight: FontWeight.w600,
-          ),
+          titleStyle: context.textTheme.labelLarge,
         ),
         // File info
         _SheetTile(
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
new file mode 100644
index 0000000000..4b0294253c
--- /dev/null
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
@@ -0,0 +1,124 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/widgets/asset_viewer/detail_panel/exif_map.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
+
+class SheetLocationDetails extends ConsumerStatefulWidget {
+  const SheetLocationDetails({super.key});
+
+  @override
+  ConsumerState createState() => _SheetLocationDetailsState();
+}
+
+class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
+  late BaseAsset asset;
+  ExifInfo? exifInfo;
+  MapLibreMapController? _mapController;
+
+  String? _getLocationName(ExifInfo? exifInfo) {
+    if (exifInfo == null) {
+      return null;
+    }
+
+    final cityName = exifInfo.city;
+    final stateName = exifInfo.state;
+
+    if (cityName != null && stateName != null) {
+      return "$cityName, $stateName";
+    }
+    return null;
+  }
+
+  void _onMapCreated(MapLibreMapController controller) {
+    _mapController = controller;
+  }
+
+  void _onExifChanged(
+    AsyncValue<ExifInfo?>? previous,
+    AsyncValue<ExifInfo?> current,
+  ) {
+    asset = ref.read(currentAssetNotifier);
+    setState(() {
+      exifInfo = current.valueOrNull;
+      final hasCoordinates = exifInfo?.hasCoordinates ?? false;
+      if (exifInfo != null && hasCoordinates) {
+        _mapController?.moveCamera(
+          CameraUpdate.newLatLng(
+            LatLng(exifInfo!.latitude!, exifInfo!.longitude!),
+          ),
+        );
+      }
+    });
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    ref.listenManual(
+      currentAssetExifProvider,
+      _onExifChanged,
+      fireImmediately: true,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final hasCoordinates = exifInfo?.hasCoordinates ?? false;
+
+    // Guard no lat/lng
+    if (!hasCoordinates ||
+        (asset is LocalAsset && !(asset as LocalAsset).hasRemote)) {
+      return const SizedBox.shrink();
+    }
+
+    final remoteId = asset is LocalAsset
+        ? (asset as LocalAsset).remoteId
+        : (asset as RemoteAsset).id;
+    final locationName = _getLocationName(exifInfo);
+    final coordinates =
+        "${exifInfo!.latitude!.toStringAsFixed(4)}, ${exifInfo!.longitude!.toStringAsFixed(4)}";
+
+    return Padding(
+      padding: const EdgeInsets.all(16.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(bottom: 16),
+            child: Text(
+              "exif_bottom_sheet_location".t(context: context),
+              style: context.textTheme.labelLarge,
+            ),
+          ),
+          ExifMap(
+            exifInfo: exifInfo!,
+            markerId: remoteId,
+            onMapCreated: _onMapCreated,
+          ),
+          const SizedBox(height: 15),
+          if (locationName != null)
+            Padding(
+              padding: const EdgeInsets.only(bottom: 4.0),
+              child: Text(
+                locationName,
+                style: context.textTheme.bodyLarge?.copyWith(
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          Text(
+            coordinates,
+            style: context.textTheme.labelLarge?.copyWith(
+              color: context.textTheme.labelLarge?.color?.withAlpha(150),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
index 1fb98a0032..2db8ae2b4c 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
@@ -89,17 +89,17 @@ class _BaseDraggableScrollableSheetState
                     const SizedBox(height: 14),
                     if (widget.actions.isNotEmpty)
                       SizedBox(
-                        height: 80,
+                        height: 115,
                         child: ListView(
                           shrinkWrap: true,
                           scrollDirection: Axis.horizontal,
                           children: widget.actions,
                         ),
                       ),
-                    if (widget.actions.isNotEmpty) const SizedBox(height: 14),
-                    if (widget.actions.isNotEmpty)
-                      const Divider(indent: 20, endIndent: 20),
-                    if (widget.actions.isNotEmpty) const SizedBox(height: 14),
+                    if (widget.actions.isNotEmpty) ...[
+                      const Divider(indent: 16, endIndent: 16),
+                      const SizedBox(height: 16),
+                    ],
                   ],
                 ),
               ),
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
index 7f870bfdff..f5ba759130 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
@@ -12,7 +12,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_f
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_buton.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index fd0806cff0..2ef01e5faf 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:collection/collection.dart';
@@ -6,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart';
@@ -43,96 +45,120 @@ class Timeline extends StatelessWidget {
   }
 }
 
-class _SliverTimeline extends StatefulWidget {
+class _SliverTimeline extends ConsumerStatefulWidget {
   const _SliverTimeline();
 
   @override
-  State createState() => _SliverTimelineState();
+  ConsumerState createState() => _SliverTimelineState();
 }
 
-class _SliverTimelineState extends State<_SliverTimeline> {
+class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   final _scrollController = ScrollController();
+  StreamSubscription? _reloadSubscription;
+
+  @override
+  void initState() {
+    super.initState();
+    _reloadSubscription =
+        EventStream.shared.listen<TimelineReloadEvent>((_) => setState(() {}));
+  }
 
   @override
   void dispose() {
     _scrollController.dispose();
+    _reloadSubscription?.cancel();
     super.dispose();
   }
 
   @override
   Widget build(BuildContext _) {
-    return Consumer(
-      builder: (context, ref, child) {
-        final asyncSegments = ref.watch(timelineSegmentProvider);
-        final maxHeight =
-            ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
-        final isMultiSelectEnabled =
-            ref.watch(multiSelectProvider.select((s) => s.isEnabled));
-        return asyncSegments.widgetWhen(
-          onData: (segments) {
-            final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
-            final statusBarHeight = context.padding.top;
-            final totalAppBarHeight = statusBarHeight + kToolbarHeight;
-            const scrubberBottomPadding = 100.0;
+    final asyncSegments = ref.watch(timelineSegmentProvider);
+    final maxHeight =
+        ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
+    return asyncSegments.widgetWhen(
+      onData: (segments) {
+        final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
+        final statusBarHeight = context.padding.top;
+        final totalAppBarHeight = statusBarHeight + kToolbarHeight;
+        const scrubberBottomPadding = 100.0;
 
-            return PrimaryScrollController(
-              controller: _scrollController,
-              child: Stack(
-                children: [
-                  Scrubber(
-                    layoutSegments: segments,
-                    timelineHeight: maxHeight,
-                    topPadding: totalAppBarHeight + 10,
-                    bottomPadding:
-                        context.padding.bottom + scrubberBottomPadding,
-                    child: CustomScrollView(
-                      primary: true,
-                      cacheExtent: maxHeight * 2,
-                      slivers: [
-                        SliverAnimatedOpacity(
-                          duration: Durations.medium1,
-                          opacity: isMultiSelectEnabled ? 0 : 1,
-                          sliver: const ImmichSliverAppBar(
-                            floating: true,
-                            pinned: false,
-                            snap: false,
-                          ),
-                        ),
-                        _SliverSegmentedList(
-                          segments: segments,
-                          delegate: SliverChildBuilderDelegate(
-                            (ctx, index) {
-                              if (index >= childCount) return null;
-                              final segment = segments.findByIndex(index);
-                              return segment?.builder(ctx, index) ??
-                                  const SizedBox.shrink();
-                            },
-                            childCount: childCount,
-                            addAutomaticKeepAlives: false,
-                            // We add repaint boundary around tiles, so skip the auto boundaries
-                            addRepaintBoundaries: false,
-                          ),
-                        ),
-                        const SliverPadding(
-                          padding: EdgeInsets.only(
-                            bottom: scrubberBottomPadding,
-                          ),
-                        ),
-                      ],
+        return PrimaryScrollController(
+          controller: _scrollController,
+          child: Stack(
+            children: [
+              Scrubber(
+                layoutSegments: segments,
+                timelineHeight: maxHeight,
+                topPadding: totalAppBarHeight + 10,
+                bottomPadding: context.padding.bottom + scrubberBottomPadding,
+                child: CustomScrollView(
+                  primary: true,
+                  cacheExtent: maxHeight * 2,
+                  slivers: [
+                    const ImmichSliverAppBar(
+                      floating: true,
+                      pinned: false,
+                      snap: false,
                     ),
-                  ),
-                  if (isMultiSelectEnabled) ...[
-                    const Positioned(
-                      top: 60,
-                      left: 25,
-                      child: _MultiSelectStatusButton(),
+                    _SliverSegmentedList(
+                      segments: segments,
+                      delegate: SliverChildBuilderDelegate(
+                        (ctx, index) {
+                          if (index >= childCount) return null;
+                          final segment = segments.findByIndex(index);
+                          return segment?.builder(ctx, index) ??
+                              const SizedBox.shrink();
+                        },
+                        childCount: childCount,
+                        addAutomaticKeepAlives: false,
+                        // We add repaint boundary around tiles, so skip the auto boundaries
+                        addRepaintBoundaries: false,
+                      ),
+                    ),
+                    const SliverPadding(
+                      padding: EdgeInsets.only(
+                        bottom: scrubberBottomPadding,
+                      ),
                     ),
-                    const HomeBottomAppBar(),
                   ],
-                ],
+                ),
               ),
-            );
-          },
+              Consumer(
+                builder: (_, consumerRef, child) {
+                  final isMultiSelectEnabled = consumerRef.watch(
+                    multiSelectProvider.select(
+                      (s) => s.isEnabled,
+                    ),
+                  );
+
+                  if (isMultiSelectEnabled) {
+                    return child!;
+                  }
+                  return const SizedBox.shrink();
+                },
+                child: const Positioned(
+                  top: 60,
+                  left: 25,
+                  child: _MultiSelectStatusButton(),
+                ),
+              ),
+              Consumer(
+                builder: (_, consumerRef, child) {
+                  final isMultiSelectEnabled = consumerRef.watch(
+                    multiSelectProvider.select(
+                      (s) => s.isEnabled,
+                    ),
+                  );
+
+                  if (isMultiSelectEnabled) {
+                    return child!;
+                  }
+                  return const SizedBox.shrink();
+                },
+                child: const HomeBottomAppBar(),
+              ),
+            ],
+          ),
         );
       },
     );
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 4f92d4e325..947cc7df5b 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/action.service.dart';
@@ -55,7 +56,7 @@ class ActionNotifier extends Notifier<void> {
     final Set<BaseAsset> assets = switch (source) {
       ActionSource.timeline =>
         ref.read(multiSelectProvider.select((s) => s.selectedAssets)),
-      ActionSource.viewer => {},
+      ActionSource.viewer => {ref.read(currentAssetNotifier)},
     };
 
     return switch (T) {
diff --git a/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart b/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart
index 48cf190bbc..1ce6c740f9 100644
--- a/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart
+++ b/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart
@@ -3,9 +3,13 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 
 final currentAssetNotifier =
-    NotifierProvider<CurrentAssetNotifier, BaseAsset>(CurrentAssetNotifier.new);
+    AutoDisposeNotifierProvider<CurrentAssetNotifier, BaseAsset>(
+  CurrentAssetNotifier.new,
+);
+
+class CurrentAssetNotifier extends AutoDisposeNotifier<BaseAsset> {
+  KeepAliveLink? _keepAliveLink;
 
-class CurrentAssetNotifier extends Notifier<BaseAsset> {
   @override
   BaseAsset build() {
     throw UnimplementedError(
@@ -14,11 +18,17 @@ class CurrentAssetNotifier extends Notifier<BaseAsset> {
   }
 
   void setAsset(BaseAsset asset) {
+    _keepAliveLink?.close();
     state = asset;
+    _keepAliveLink = ref.keepAlive();
+  }
+
+  void dispose() {
+    _keepAliveLink?.close();
   }
 }
 
-final currentAssetExifProvider = FutureProvider(
+final currentAssetExifProvider = FutureProvider.autoDispose(
   (ref) {
     final currentAsset = ref.watch(currentAssetNotifier);
     return ref.watch(assetServiceProvider).getExif(currentAsset);
diff --git a/mobile/lib/widgets/asset_viewer/detail_panel/exif_map.dart b/mobile/lib/widgets/asset_viewer/detail_panel/exif_map.dart
index f3f72dfd87..7b6325cf2c 100644
--- a/mobile/lib/widgets/asset_viewer/detail_panel/exif_map.dart
+++ b/mobile/lib/widgets/asset_viewer/detail_panel/exif_map.dart
@@ -9,11 +9,13 @@ import 'package:url_launcher/url_launcher.dart';
 class ExifMap extends StatelessWidget {
   final ExifInfo exifInfo;
   final String? markerId;
+  final MapCreatedCallback? onMapCreated;
 
   const ExifMap({
     super.key,
     required this.exifInfo,
     this.markerId = 'marker',
+    this.onMapCreated,
   });
 
   @override
@@ -82,6 +84,7 @@ class ExifMap extends StatelessWidget {
             debugPrint('Opening Map Uri: $uri');
             launchUrl(uri);
           },
+          onCreated: onMapCreated,
         );
       },
     );
diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
index 51a3a136b9..ff0e88e5d7 100644
--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -10,6 +10,7 @@ import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/asset_viewer/cast_dialog.dart';
@@ -39,64 +40,70 @@ class ImmichSliverAppBar extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
+    final isMultiSelectEnabled =
+        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
 
-    return SliverAppBar(
-      floating: floating,
-      pinned: pinned,
-      snap: snap,
-      expandedHeight: expandedHeight,
-      backgroundColor: context.colorScheme.surfaceContainer,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.all(
-          Radius.circular(5),
-        ),
-      ),
-      automaticallyImplyLeading: false,
-      centerTitle: false,
-      title: title ?? const _ImmichLogoWithText(),
-      actions: [
-        if (actions != null)
-          ...actions!.map(
-            (action) => Padding(
-              padding: const EdgeInsets.only(right: 16),
-              child: action,
-            ),
-          ),
-        IconButton(
-          icon: const Icon(Icons.swipe_left_alt_rounded),
-          onPressed: () => context.pop(),
-        ),
-        IconButton(
-          onPressed: () => ref.read(backgroundSyncProvider).syncRemote(),
-          icon: const Icon(
-            Icons.sync,
+    return SliverAnimatedOpacity(
+      duration: Durations.medium1,
+      opacity: isMultiSelectEnabled ? 0 : 1,
+      sliver: SliverAppBar(
+        floating: floating,
+        pinned: pinned,
+        snap: snap,
+        expandedHeight: expandedHeight,
+        backgroundColor: context.colorScheme.surfaceContainer,
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(
+            Radius.circular(5),
           ),
         ),
-        if (isCasting)
-          Padding(
-            padding: const EdgeInsets.only(right: 12),
-            child: IconButton(
-              onPressed: () {
-                showDialog(
-                  context: context,
-                  builder: (context) => const CastDialog(),
-                );
-              },
-              icon: Icon(
-                isCasting ? Icons.cast_connected_rounded : Icons.cast_rounded,
+        automaticallyImplyLeading: false,
+        centerTitle: false,
+        title: title ?? const _ImmichLogoWithText(),
+        actions: [
+          if (actions != null)
+            ...actions!.map(
+              (action) => Padding(
+                padding: const EdgeInsets.only(right: 16),
+                child: action,
               ),
             ),
+          IconButton(
+            icon: const Icon(Icons.swipe_left_alt_rounded),
+            onPressed: () => context.pop(),
           ),
-        if (showUploadButton)
+          IconButton(
+            onPressed: () => ref.read(backgroundSyncProvider).syncRemote(),
+            icon: const Icon(
+              Icons.sync,
+            ),
+          ),
+          if (isCasting)
+            Padding(
+              padding: const EdgeInsets.only(right: 12),
+              child: IconButton(
+                onPressed: () {
+                  showDialog(
+                    context: context,
+                    builder: (context) => const CastDialog(),
+                  );
+                },
+                icon: Icon(
+                  isCasting ? Icons.cast_connected_rounded : Icons.cast_rounded,
+                ),
+              ),
+            ),
+          if (showUploadButton)
+            const Padding(
+              padding: EdgeInsets.only(right: 20),
+              child: _BackupIndicator(),
+            ),
           const Padding(
             padding: EdgeInsets.only(right: 20),
-            child: _BackupIndicator(),
+            child: _ProfileIndicator(),
           ),
-        const Padding(
-          padding: EdgeInsets.only(right: 20),
-          child: _ProfileIndicator(),
-        ),
-      ],
+        ],
+      ),
     );
   }
 }
diff --git a/mobile/lib/widgets/map/map_thumbnail.dart b/mobile/lib/widgets/map/map_thumbnail.dart
index b225a2edcb..06935cd4b5 100644
--- a/mobile/lib/widgets/map/map_thumbnail.dart
+++ b/mobile/lib/widgets/map/map_thumbnail.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/maplibrecontroller_extensions.dart';
 import 'package:immich_mobile/widgets/map/map_theme_override.dart';
 import 'package:immich_mobile/widgets/map/positioned_asset_marker_icon.dart';
@@ -24,6 +25,7 @@ class MapThumbnail extends HookConsumerWidget {
   final double width;
   final ThemeMode? themeMode;
   final bool showAttribution;
+  final MapCreatedCallback? onCreated;
 
   const MapThumbnail({
     super.key,
@@ -36,16 +38,19 @@ class MapThumbnail extends HookConsumerWidget {
     this.showMarkerPin = false,
     this.themeMode,
     this.showAttribution = true,
+    this.onCreated,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final offsettedCentre = LatLng(centre.latitude + 0.002, centre.longitude);
     final controller = useRef<MapLibreMapController?>(null);
+    final styleLoaded = useState(false);
     final position = useValueNotifier<Point<num>?>(null);
 
     Future<void> onMapCreated(MapLibreMapController mapController) async {
       controller.value = mapController;
+      styleLoaded.value = false;
       if (assetMarkerRemoteId != null) {
         // The iOS impl returns wrong toScreenLocation without the delay
         Future.delayed(
@@ -54,17 +59,26 @@ class MapThumbnail extends HookConsumerWidget {
               position.value = await mapController.toScreenLocation(centre),
         );
       }
+      onCreated?.call(mapController);
     }
 
     Future<void> onStyleLoaded() async {
       if (showMarkerPin && controller.value != null) {
         await controller.value?.addMarkerAtLatLng(centre);
       }
+      styleLoaded.value = true;
     }
 
     return MapThemeOverride(
       themeMode: themeMode,
-      mapBuilder: (style) => SizedBox(
+      mapBuilder: (style) => AnimatedContainer(
+        duration: Durations.medium2,
+        curve: Curves.easeOut,
+        foregroundDecoration: BoxDecoration(
+          color: context.colorScheme.inverseSurface
+              .withAlpha(styleLoaded.value ? 0 : 200),
+          borderRadius: const BorderRadius.all(Radius.circular(15)),
+        ),
         height: height,
         width: width,
         child: ClipRRect(
diff --git a/mobile/lib/widgets/photo_view/photo_view.dart b/mobile/lib/widgets/photo_view/photo_view.dart
index 0c1a4f4855..30e08748b8 100644
--- a/mobile/lib/widgets/photo_view/photo_view.dart
+++ b/mobile/lib/widgets/photo_view/photo_view.dart
@@ -660,7 +660,7 @@ typedef PhotoViewImageTapDownCallback = Function(
 typedef PhotoViewImageDragStartCallback = Function(
   BuildContext context,
   DragStartDetails details,
-  PhotoViewControllerValue controllerValue,
+  PhotoViewControllerBase controllerValue,
   PhotoViewScaleStateController scaleStateController,
 );
 
diff --git a/mobile/lib/widgets/photo_view/photo_view_gallery.dart b/mobile/lib/widgets/photo_view/photo_view_gallery.dart
index cf026288fb..1cd4d4b217 100644
--- a/mobile/lib/widgets/photo_view/photo_view_gallery.dart
+++ b/mobile/lib/widgets/photo_view/photo_view_gallery.dart
@@ -271,7 +271,7 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
 
     final PhotoView photoView = isCustomChild
         ? PhotoView.customChild(
-            key: ObjectKey(index),
+            key: pageOption.key ?? ObjectKey(index),
             childSize: pageOption.childSize,
             backgroundDecoration: widget.backgroundDecoration,
             wantKeepAlive: widget.wantKeepAlive,
@@ -304,7 +304,7 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
             child: pageOption.child,
           )
         : PhotoView(
-            key: ObjectKey(index),
+            key: pageOption.key ?? ObjectKey(index),
             index: index,
             imageProvider: pageOption.imageProvider,
             loadingBuilder: widget.loadingBuilder,
@@ -363,7 +363,7 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
 ///
 class PhotoViewGalleryPageOptions {
   PhotoViewGalleryPageOptions({
-    Key? key,
+    this.key,
     required this.imageProvider,
     this.heroAttributes,
     this.semanticLabel,
@@ -392,6 +392,7 @@ class PhotoViewGalleryPageOptions {
         assert(imageProvider != null);
 
   const PhotoViewGalleryPageOptions.customChild({
+    this.key,
     required this.child,
     this.childSize,
     this.semanticLabel,
@@ -418,6 +419,8 @@ class PhotoViewGalleryPageOptions {
   })  : errorBuilder = null,
         imageProvider = null;
 
+  final Key? key;
+
   /// Mirror to [PhotoView.imageProvider]
   final ImageProvider? imageProvider;
 
diff --git a/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart b/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart
index bc97da1e06..6b6e5067c5 100644
--- a/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart
+++ b/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart
@@ -416,7 +416,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
                 ? (details) => widget.onDragStart!(
                       context,
                       details,
-                      widget.controller.value,
+                      widget.controller,
                       widget.scaleStateController,
                     )
                 : null,

From 4a2cf28882a8cc390cdc78102b992c4f99387371 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 4 Jul 2025 13:49:15 -0500
Subject: [PATCH 130/337] feat: memories in new timeline (#19720)

* feat: memories sliver

* memories lane

* display and show memory

* fix: get correct memories

* naming

* pr feedback

* use equalsValue for visibility

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/domain/models/memory.model.dart    |  74 +---
 .../lib/domain/services/memory.service.dart   |  15 +
 .../repositories/memory.repository.dart       |  60 ++-
 .../pages/dev/main_timeline.page.dart         |  20 +-
 .../presentation/pages/drift_memory.page.dart | 394 ++++++++++++++++++
 .../memory/memory_bottom_info.widget.dart     |  64 +++
 .../widgets/memory/memory_card.widget.dart    | 159 +++++++
 .../widgets/memory/memory_lane.widget.dart    | 115 +++++
 .../widgets/timeline/scrubber.widget.dart     |   8 +-
 .../widgets/timeline/timeline.widget.dart     |  17 +-
 .../infrastructure/memory.provider.dart       |  27 ++
 mobile/lib/providers/memory.provider.dart     |   6 -
 mobile/lib/routing/router.dart                |   8 +
 mobile/lib/routing/router.gr.dart             |  52 +++
 mobile/lib/utils/hooks/blurhash_hook.dart     |  13 +
 15 files changed, 958 insertions(+), 74 deletions(-)
 create mode 100644 mobile/lib/domain/services/memory.service.dart
 create mode 100644 mobile/lib/presentation/pages/drift_memory.page.dart
 create mode 100644 mobile/lib/presentation/widgets/memory/memory_bottom_info.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/memory/memory_card.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
 create mode 100644 mobile/lib/providers/infrastructure/memory.provider.dart

diff --git a/mobile/lib/domain/models/memory.model.dart b/mobile/lib/domain/models/memory.model.dart
index d24e1ae1c6..ba2a43428f 100644
--- a/mobile/lib/domain/models/memory.model.dart
+++ b/mobile/lib/domain/models/memory.model.dart
@@ -1,6 +1,10 @@
 // ignore_for_file: public_member_api_docs, sort_constructors_first
 import 'dart:convert';
 
+import 'package:collection/collection.dart';
+
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+
 enum MemoryTypeEnum {
   // do not change this order!
   onThisDay,
@@ -53,7 +57,7 @@ class MemoryData {
 }
 
 // Model for a memory stored in the server
-class Memory {
+class DriftMemory {
   final String id;
   final DateTime createdAt;
   final DateTime updatedAt;
@@ -68,8 +72,9 @@ class Memory {
   final DateTime? seenAt;
   final DateTime? showAt;
   final DateTime? hideAt;
+  final List<RemoteAsset> assets;
 
-  const Memory({
+  const DriftMemory({
     required this.id,
     required this.createdAt,
     required this.updatedAt,
@@ -82,9 +87,10 @@ class Memory {
     this.seenAt,
     this.showAt,
     this.hideAt,
+    required this.assets,
   });
 
-  Memory copyWith({
+  DriftMemory copyWith({
     String? id,
     DateTime? createdAt,
     DateTime? updatedAt,
@@ -97,8 +103,9 @@ class Memory {
     DateTime? seenAt,
     DateTime? showAt,
     DateTime? hideAt,
+    List<RemoteAsset>? assets,
   }) {
-    return Memory(
+    return DriftMemory(
       id: id ?? this.id,
       createdAt: createdAt ?? this.createdAt,
       updatedAt: updatedAt ?? this.updatedAt,
@@ -111,64 +118,19 @@ class Memory {
       seenAt: seenAt ?? this.seenAt,
       showAt: showAt ?? this.showAt,
       hideAt: hideAt ?? this.hideAt,
+      assets: assets ?? this.assets,
     );
   }
 
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'id': id,
-      'createdAt': createdAt.millisecondsSinceEpoch,
-      'updatedAt': updatedAt.millisecondsSinceEpoch,
-      'deletedAt': deletedAt?.millisecondsSinceEpoch,
-      'ownerId': ownerId,
-      'type': type.index,
-      'data': data.toMap(),
-      'isSaved': isSaved,
-      'memoryAt': memoryAt.millisecondsSinceEpoch,
-      'seenAt': seenAt?.millisecondsSinceEpoch,
-      'showAt': showAt?.millisecondsSinceEpoch,
-      'hideAt': hideAt?.millisecondsSinceEpoch,
-    };
-  }
-
-  factory Memory.fromMap(Map<String, dynamic> map) {
-    return Memory(
-      id: map['id'] as String,
-      createdAt: DateTime.fromMillisecondsSinceEpoch(map['createdAt'] as int),
-      updatedAt: DateTime.fromMillisecondsSinceEpoch(map['updatedAt'] as int),
-      deletedAt: map['deletedAt'] != null
-          ? DateTime.fromMillisecondsSinceEpoch(map['deletedAt'] as int)
-          : null,
-      ownerId: map['ownerId'] as String,
-      type: MemoryTypeEnum.values[map['type'] as int],
-      data: MemoryData.fromMap(map['data'] as Map<String, dynamic>),
-      isSaved: map['isSaved'] as bool,
-      memoryAt: DateTime.fromMillisecondsSinceEpoch(map['memoryAt'] as int),
-      seenAt: map['seenAt'] != null
-          ? DateTime.fromMillisecondsSinceEpoch(map['seenAt'] as int)
-          : null,
-      showAt: map['showAt'] != null
-          ? DateTime.fromMillisecondsSinceEpoch(map['showAt'] as int)
-          : null,
-      hideAt: map['hideAt'] != null
-          ? DateTime.fromMillisecondsSinceEpoch(map['hideAt'] as int)
-          : null,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory Memory.fromJson(String source) =>
-      Memory.fromMap(json.decode(source) as Map<String, dynamic>);
-
   @override
   String toString() {
-    return 'Memory(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, ownerId: $ownerId, type: $type, data: $data, isSaved: $isSaved, memoryAt: $memoryAt, seenAt: $seenAt, showAt: $showAt, hideAt: $hideAt)';
+    return 'Memory(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, ownerId: $ownerId, type: $type, data: $data, isSaved: $isSaved, memoryAt: $memoryAt, seenAt: $seenAt, showAt: $showAt, hideAt: $hideAt, assets: $assets)';
   }
 
   @override
-  bool operator ==(covariant Memory other) {
+  bool operator ==(covariant DriftMemory other) {
     if (identical(this, other)) return true;
+    final listEquals = const DeepCollectionEquality().equals;
 
     return other.id == id &&
         other.createdAt == createdAt &&
@@ -181,7 +143,8 @@ class Memory {
         other.memoryAt == memoryAt &&
         other.seenAt == seenAt &&
         other.showAt == showAt &&
-        other.hideAt == hideAt;
+        other.hideAt == hideAt &&
+        listEquals(other.assets, assets);
   }
 
   @override
@@ -197,6 +160,7 @@ class Memory {
         memoryAt.hashCode ^
         seenAt.hashCode ^
         showAt.hashCode ^
-        hideAt.hashCode;
+        hideAt.hashCode ^
+        assets.hashCode;
   }
 }
diff --git a/mobile/lib/domain/services/memory.service.dart b/mobile/lib/domain/services/memory.service.dart
new file mode 100644
index 0000000000..c94b8a9f0a
--- /dev/null
+++ b/mobile/lib/domain/services/memory.service.dart
@@ -0,0 +1,15 @@
+import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/memory.repository.dart';
+import 'package:logging/logging.dart';
+
+class DriftMemoryService {
+  final log = Logger("DriftMemoryService");
+
+  final DriftMemoryRepository _repository;
+
+  DriftMemoryService(this._repository);
+
+  Future<List<DriftMemory>> getMemoryLane(String ownerId) {
+    return _repository.getAll(ownerId);
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/memory.repository.dart b/mobile/lib/infrastructure/repositories/memory.repository.dart
index 1f70f9dcd2..ff5f75c2ac 100644
--- a/mobile/lib/infrastructure/repositories/memory.repository.dart
+++ b/mobile/lib/infrastructure/repositories/memory.repository.dart
@@ -1,25 +1,68 @@
 import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/memory.model.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
 class DriftMemoryRepository extends DriftDatabaseRepository {
   final Drift _db;
   const DriftMemoryRepository(this._db) : super(_db);
 
-  Future<List<Memory>> getAll(String userId) {
-    final query = _db.memoryEntity.select()
-      ..where((e) => e.ownerId.equals(userId));
+  Future<List<DriftMemory>> getAll(String ownerId) async {
+    final now = DateTime.now();
+    final localUtc = DateTime.utc(now.year, now.month, now.day, 0, 0, 0);
 
-    return query.map((memory) {
-      return memory.toDto();
-    }).get();
+    final query = _db.select(_db.memoryEntity).join([
+      leftOuterJoin(
+        _db.memoryAssetEntity,
+        _db.memoryAssetEntity.memoryId.equalsExp(_db.memoryEntity.id),
+      ),
+      leftOuterJoin(
+        _db.remoteAssetEntity,
+        _db.remoteAssetEntity.id.equalsExp(_db.memoryAssetEntity.assetId) &
+            _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.visibility
+                .equalsValue(AssetVisibility.timeline),
+      ),
+    ])
+      ..where(_db.memoryEntity.ownerId.equals(ownerId))
+      ..where(_db.memoryEntity.deletedAt.isNull())
+      ..where(
+        _db.memoryEntity.showAt.isSmallerOrEqualValue(localUtc),
+      )
+      ..where(
+        _db.memoryEntity.hideAt.isBiggerOrEqualValue(localUtc),
+      )
+      ..orderBy([
+        OrderingTerm.desc(_db.memoryEntity.memoryAt),
+        OrderingTerm.asc(_db.remoteAssetEntity.createdAt),
+      ]);
+
+    final rows = await query.get();
+
+    final Map<String, DriftMemory> memoriesMap = {};
+
+    for (final row in rows) {
+      final memory = row.readTable(_db.memoryEntity);
+      final asset = row.readTable(_db.remoteAssetEntity);
+
+      final existingMemory = memoriesMap[memory.id];
+      if (existingMemory != null) {
+        existingMemory.assets.add(asset.toDto());
+      } else {
+        final assets = [asset.toDto()];
+        memoriesMap[memory.id] = memory.toDto().copyWith(assets: assets);
+      }
+    }
+
+    return memoriesMap.values.toList();
   }
 }
 
 extension on MemoryEntityData {
-  Memory toDto() {
-    return Memory(
+  DriftMemory toDto() {
+    return DriftMemory(
       id: id,
       createdAt: createdAt,
       updatedAt: updatedAt,
@@ -32,6 +75,7 @@ extension on MemoryEntityData {
       seenAt: seenAt,
       showAt: showAt,
       hideAt: hideAt,
+      assets: [],
     );
   }
 }
diff --git a/mobile/lib/presentation/pages/dev/main_timeline.page.dart b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
index 090db4f6ba..9ec8002463 100644
--- a/mobile/lib/presentation/pages/dev/main_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
@@ -1,7 +1,9 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/memory/memory_lane.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
 
 @RoutePage()
 class MainTimelinePage extends ConsumerWidget {
@@ -9,6 +11,22 @@ class MainTimelinePage extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return const Timeline();
+    final memoryLaneProvider = ref.watch(driftMemoryFutureProvider);
+
+    return memoryLaneProvider.when(
+      data: (memories) {
+        return memories.isEmpty
+            ? const Timeline()
+            : Timeline(
+                topSliverWidget: SliverToBoxAdapter(
+                  key: Key('memory-lane-${memories.first.assets.first.id}'),
+                  child: DriftMemoryLane(memories: memories),
+                ),
+                topSliverWidgetHeight: 200,
+              );
+      },
+      loading: () => const Timeline(),
+      error: (error, stackTrace) => const Timeline(),
+    );
   }
 }
diff --git a/mobile/lib/presentation/pages/drift_memory.page.dart b/mobile/lib/presentation/pages/drift_memory.page.dart
new file mode 100644
index 0000000000..7da2d1a4c7
--- /dev/null
+++ b/mobile/lib/presentation/pages/drift_memory.page.dart
@@ -0,0 +1,394 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/presentation/widgets/memory/memory_bottom_info.widget.dart';
+import 'package:immich_mobile/presentation/widgets/memory/memory_card.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/widgets/memories/memory_epilogue.dart';
+import 'package:immich_mobile/widgets/memories/memory_progress_indicator.dart';
+
+/// Expects [currentAssetNotifier] to be set before navigating to this page
+@RoutePage()
+class DriftMemoryPage extends HookConsumerWidget {
+  final List<DriftMemory> memories;
+  final int memoryIndex;
+
+  const DriftMemoryPage({
+    required this.memories,
+    required this.memoryIndex,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final currentMemory = useState(memories[memoryIndex]);
+    final currentAssetPage = useState(0);
+    final currentMemoryIndex = useState(memoryIndex);
+    final assetProgress = useState(
+      "${currentAssetPage.value + 1}|${currentMemory.value.assets.length}",
+    );
+    const bgColor = Colors.black;
+    final currentAsset = useState<RemoteAsset?>(null);
+
+    /// The list of all of the asset page controllers
+    final memoryAssetPageControllers =
+        List.generate(memories.length, (i) => usePageController());
+
+    /// The main vertically scrolling page controller with each list of memories
+    final memoryPageController = usePageController(initialPage: memoryIndex);
+
+    useEffect(() {
+      // Memories is an immersive activity
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+      return () {
+        // Clean up to normal edge to edge when we are done
+        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+      };
+    });
+
+    toNextMemory() {
+      memoryPageController.nextPage(
+        duration: const Duration(milliseconds: 500),
+        curve: Curves.easeIn,
+      );
+    }
+
+    void toPreviousMemory() {
+      if (currentMemoryIndex.value > 0) {
+        // Move to the previous memory page
+        memoryPageController.previousPage(
+          duration: const Duration(milliseconds: 500),
+          curve: Curves.easeIn,
+        );
+
+        // Wait for the next frame to ensure the page is built
+        SchedulerBinding.instance.addPostFrameCallback((_) {
+          final previousIndex = currentMemoryIndex.value - 1;
+          final previousMemoryController =
+              memoryAssetPageControllers[previousIndex];
+
+          // Ensure the controller is attached
+          if (previousMemoryController.hasClients) {
+            previousMemoryController
+                .jumpToPage(memories[previousIndex].assets.length - 1);
+          } else {
+            // Wait for the next frame until it is attached
+            SchedulerBinding.instance.addPostFrameCallback((_) {
+              if (previousMemoryController.hasClients) {
+                previousMemoryController
+                    .jumpToPage(memories[previousIndex].assets.length - 1);
+              }
+            });
+          }
+        });
+      }
+    }
+
+    toNextAsset(int currentAssetIndex) {
+      if (currentAssetIndex + 1 < currentMemory.value.assets.length) {
+        // Go to the next asset
+        PageController controller =
+            memoryAssetPageControllers[currentMemoryIndex.value];
+
+        controller.nextPage(
+          curve: Curves.easeInOut,
+          duration: const Duration(milliseconds: 500),
+        );
+      } else {
+        // Go to the next memory since we are at the end of our assets
+        toNextMemory();
+      }
+    }
+
+    toPreviousAsset(int currentAssetIndex) {
+      if (currentAssetIndex > 0) {
+        // Go to the previous asset
+        PageController controller =
+            memoryAssetPageControllers[currentMemoryIndex.value];
+
+        controller.previousPage(
+          curve: Curves.easeInOut,
+          duration: const Duration(milliseconds: 500),
+        );
+      } else {
+        // Go to the previous memory since we are at the end of our assets
+        toPreviousMemory();
+      }
+    }
+
+    updateProgressText() {
+      assetProgress.value =
+          "${currentAssetPage.value + 1}|${currentMemory.value.assets.length}";
+    }
+
+    /// Downloads and caches the image for the asset at this [currentMemory]'s index
+    precacheAsset(int index) async {
+      // Guard index out of range
+      if (index < 0) {
+        return;
+      }
+
+      // Context might be removed due to popping out of Memory Lane during Scroll handling
+      if (!context.mounted) {
+        return;
+      }
+
+      late RemoteAsset asset;
+      if (index < currentMemory.value.assets.length) {
+        // Uses the next asset in this current memory
+        asset = currentMemory.value.assets[index];
+      } else {
+        // Precache the first asset in the next memory if available
+        final currentMemoryIndex = memories.indexOf(currentMemory.value);
+
+        // Guard no memory found
+        if (currentMemoryIndex == -1) {
+          return;
+        }
+
+        final nextMemoryIndex = currentMemoryIndex + 1;
+        // Guard no next memory
+        if (nextMemoryIndex >= memories.length) {
+          return;
+        }
+
+        // Get the first asset from the next memory
+        asset = memories[nextMemoryIndex].assets.first;
+      }
+
+      // Precache the asset
+      final size = MediaQuery.sizeOf(context);
+      await precacheImage(
+        getFullImageProvider(
+          asset,
+          size: Size(size.width, size.height),
+        ),
+        context,
+        size: size,
+      );
+    }
+
+    // Precache the next page right away if we are on the first page
+    if (currentAssetPage.value == 0) {
+      Future.delayed(const Duration(milliseconds: 200))
+          .then((_) => precacheAsset(1));
+    }
+
+    Future<void> onAssetChanged(int otherIndex) async {
+      ref.read(hapticFeedbackProvider.notifier).selectionClick();
+      currentAssetPage.value = otherIndex;
+      updateProgressText();
+
+      // Wait for page change animation to finish
+      await Future.delayed(const Duration(milliseconds: 400));
+      // And then precache the next asset
+      await precacheAsset(otherIndex + 1);
+
+      final asset = currentMemory.value.assets[otherIndex];
+      currentAsset.value = asset;
+      ref.read(currentAssetNotifier.notifier).setAsset(asset);
+      // if (asset.isVideo || asset.isMotionPhoto) {
+      if (asset.isVideo) {
+        ref.read(videoPlaybackValueProvider.notifier).reset();
+      }
+    }
+
+    /* Notification listener is used instead of OnPageChanged callback since OnPageChanged is called
+     * when the page in the **center** of the viewer changes. We want to reset currentAssetPage only when the final
+     * page during the end of scroll is different than the current page
+     */
+    return NotificationListener<ScrollNotification>(
+      onNotification: (ScrollNotification notification) {
+        // Calculate OverScroll manually using the number of pixels away from maxScrollExtent
+        // maxScrollExtend contains the sum of horizontal pixels of all assets for depth = 1
+        // or sum of vertical pixels of all memories for depth = 0
+        if (notification is ScrollUpdateNotification) {
+          final isEpiloguePage =
+              (memoryPageController.page?.floor() ?? 0) >= memories.length;
+
+          final offset = notification.metrics.pixels;
+          if (isEpiloguePage &&
+              (offset > notification.metrics.maxScrollExtent + 150)) {
+            context.maybePop();
+            return true;
+          }
+        }
+
+        return false;
+      },
+      child: Scaffold(
+        backgroundColor: bgColor,
+        body: SafeArea(
+          child: PageView.builder(
+            physics: const BouncingScrollPhysics(
+              parent: AlwaysScrollableScrollPhysics(),
+            ),
+            scrollDirection: Axis.vertical,
+            controller: memoryPageController,
+            onPageChanged: (pageNumber) {
+              ref.read(hapticFeedbackProvider.notifier).mediumImpact();
+              if (pageNumber < memories.length) {
+                currentMemoryIndex.value = pageNumber;
+                currentMemory.value = memories[pageNumber];
+              }
+
+              currentAssetPage.value = 0;
+
+              updateProgressText();
+            },
+            itemCount: memories.length + 1,
+            itemBuilder: (context, mIndex) {
+              // Build last page
+              if (mIndex == memories.length) {
+                return MemoryEpilogue(
+                  onStartOver: () => memoryPageController.animateToPage(
+                    0,
+                    duration: const Duration(seconds: 1),
+                    curve: Curves.easeInOut,
+                  ),
+                );
+              }
+
+              final yearsAgo = DateTime.now().year - memories[mIndex].data.year;
+              final title = 'years_ago'.t(
+                context: context,
+                args: {
+                  'years': yearsAgo.toString(),
+                },
+              );
+              // Build horizontal page
+              final assetController = memoryAssetPageControllers[mIndex];
+              return Column(
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      left: 24.0,
+                      right: 24.0,
+                      top: 8.0,
+                      bottom: 2.0,
+                    ),
+                    child: AnimatedBuilder(
+                      animation: assetController,
+                      builder: (context, child) {
+                        double value = 0.0;
+                        if (assetController.hasClients) {
+                          // We can only access [page] if this has clients
+                          value = assetController.page ?? 0;
+                        }
+                        return MemoryProgressIndicator(
+                          ticks: memories[mIndex].assets.length,
+                          value: (value + 1) / memories[mIndex].assets.length,
+                        );
+                      },
+                    ),
+                  ),
+                  Expanded(
+                    child: Stack(
+                      children: [
+                        PageView.builder(
+                          physics: const BouncingScrollPhysics(
+                            parent: AlwaysScrollableScrollPhysics(),
+                          ),
+                          controller: assetController,
+                          onPageChanged: onAssetChanged,
+                          scrollDirection: Axis.horizontal,
+                          itemCount: memories[mIndex].assets.length,
+                          itemBuilder: (context, index) {
+                            final asset = memories[mIndex].assets[index];
+                            return Stack(
+                              children: [
+                                Container(
+                                  color: Colors.black,
+                                  child: DriftMemoryCard(
+                                    asset: asset,
+                                    title: title,
+                                    showTitle: index == 0,
+                                  ),
+                                ),
+                                Positioned.fill(
+                                  child: Row(
+                                    children: [
+                                      // Left side of the screen
+                                      Expanded(
+                                        child: GestureDetector(
+                                          behavior: HitTestBehavior.translucent,
+                                          onTap: () {
+                                            toPreviousAsset(index);
+                                          },
+                                        ),
+                                      ),
+
+                                      // Right side of the screen
+                                      Expanded(
+                                        child: GestureDetector(
+                                          behavior: HitTestBehavior.translucent,
+                                          onTap: () {
+                                            toNextAsset(index);
+                                          },
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              ],
+                            );
+                          },
+                        ),
+                        Positioned(
+                          top: 8,
+                          left: 8,
+                          child: MaterialButton(
+                            minWidth: 0,
+                            onPressed: () {
+                              // auto_route doesn't invoke pop scope, so
+                              // turn off full screen mode here
+                              // https://github.com/Milad-Akarie/auto_route_library/issues/1799
+                              context.maybePop();
+                              SystemChrome.setEnabledSystemUIMode(
+                                SystemUiMode.edgeToEdge,
+                              );
+                            },
+                            shape: const CircleBorder(),
+                            color: Colors.white.withValues(alpha: 0.2),
+                            elevation: 0,
+                            child: const Icon(
+                              Icons.close_rounded,
+                              color: Colors.white,
+                            ),
+                          ),
+                        ),
+                        if (currentAsset.value != null &&
+                            currentAsset.value!.isVideo)
+                          Positioned(
+                            bottom: 24,
+                            right: 32,
+                            child: Icon(
+                              Icons.videocam_outlined,
+                              color: Colors.grey[200],
+                            ),
+                          ),
+                      ],
+                    ),
+                  ),
+                  DriftMemoryBottomInfo(
+                    memory: memories[mIndex],
+                    title: title,
+                  ),
+                ],
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/memory/memory_bottom_info.widget.dart b/mobile/lib/presentation/widgets/memory/memory_bottom_info.widget.dart
new file mode 100644
index 0000000000..79e6288a72
--- /dev/null
+++ b/mobile/lib/presentation/widgets/memory/memory_bottom_info.widget.dart
@@ -0,0 +1,64 @@
+// ignore_for_file: require_trailing_commas
+
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/memory.model.dart';
+
+import 'package:immich_mobile/providers/asset_viewer/scroll_to_date_notifier.provider.dart';
+
+class DriftMemoryBottomInfo extends StatelessWidget {
+  final DriftMemory memory;
+  final String title;
+  const DriftMemoryBottomInfo({
+    super.key,
+    required this.memory,
+    required this.title,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final df = DateFormat.yMMMMd();
+    final fileCreatedDate = memory.assets.first.createdAt;
+    return Padding(
+      padding: const EdgeInsets.all(16.0),
+      child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              title,
+              style: TextStyle(
+                color: Colors.grey[400],
+                fontSize: 13.0,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+            Text(
+              df.format(fileCreatedDate),
+              style: const TextStyle(
+                color: Colors.white,
+                fontSize: 15.0,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ],
+        ),
+        MaterialButton(
+          minWidth: 0,
+          onPressed: () {
+            context.maybePop();
+            scrollToDateNotifierProvider.scrollToDate(fileCreatedDate);
+          },
+          shape: const CircleBorder(),
+          color: Colors.white.withValues(alpha: 0.2),
+          elevation: 0,
+          child: const Icon(
+            Icons.open_in_new,
+            color: Colors.white,
+          ),
+        ),
+      ]),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/memory/memory_card.widget.dart b/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
new file mode 100644
index 0000000000..8268196089
--- /dev/null
+++ b/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
@@ -0,0 +1,159 @@
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/images/full_image.widget.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/utils/hooks/blurhash_hook.dart';
+
+class DriftMemoryCard extends StatelessWidget {
+  final RemoteAsset asset;
+  final String title;
+  final bool showTitle;
+  final Function()? onVideoEnded;
+
+  const DriftMemoryCard({
+    required this.asset,
+    required this.title,
+    required this.showTitle,
+    this.onVideoEnded,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      color: Colors.black,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(Radius.circular(25.0)),
+        side: BorderSide(
+          color: Colors.black,
+          width: 1.0,
+        ),
+      ),
+      clipBehavior: Clip.hardEdge,
+      child: Stack(
+        children: [
+          SizedBox.expand(
+            child: _BlurredBackdrop(asset: asset),
+          ),
+          LayoutBuilder(
+            builder: (context, constraints) {
+              // Determine the fit using the aspect ratio
+              BoxFit fit = BoxFit.contain;
+              if (asset.width != null && asset.height != null) {
+                final aspectRatio = asset.width! / asset.height!;
+                final phoneAspectRatio =
+                    constraints.maxWidth / constraints.maxHeight;
+                // Look for a 25% difference in either direction
+                if (phoneAspectRatio * .75 < aspectRatio &&
+                    phoneAspectRatio * 1.25 > aspectRatio) {
+                  // Cover to look nice if we have nearly the same aspect ratio
+                  fit = BoxFit.cover;
+                }
+              }
+
+              if (asset.isImage) {
+                return Hero(
+                  tag: 'memory-${asset.id}',
+                  child: FullImage(
+                    asset,
+                    fit: fit,
+                    size: const Size(double.infinity, double.infinity),
+                  ),
+                );
+              } else {
+                return Hero(
+                  tag: 'memory-${asset.id}',
+                  // child: SizedBox(
+                  //   width: context.width,
+                  //   height: context.height,
+                  //   child: NativeVideoViewerPage(
+                  //     key: ValueKey(asset.id),
+                  //     asset: asset,
+                  //     showControls: false,
+                  //     playbackDelayFactor: 2,
+                  //     image: ImmichImage(
+                  //       asset,
+                  //       width: context.width,
+                  //       height: context.height,
+                  //       fit: BoxFit.contain,
+                  //     ),
+                  //   ),
+                  // ),
+                  child: FullImage(
+                    asset,
+                    fit: fit,
+                    size: const Size(double.infinity, double.infinity),
+                  ),
+                );
+              }
+            },
+          ),
+          if (showTitle)
+            Positioned(
+              left: 18.0,
+              bottom: 18.0,
+              child: Text(
+                title,
+                style: context.textTheme.headlineMedium?.copyWith(
+                  color: Colors.white,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+class _BlurredBackdrop extends HookWidget {
+  final RemoteAsset asset;
+
+  const _BlurredBackdrop({required this.asset});
+
+  @override
+  Widget build(BuildContext context) {
+    final blurhash = useDriftBlurHashRef(asset).value;
+    if (blurhash != null) {
+      // Use a nice cheap blur hash image decoration
+      return Container(
+        decoration: BoxDecoration(
+          image: DecorationImage(
+            image: MemoryImage(
+              blurhash,
+            ),
+            fit: BoxFit.cover,
+          ),
+        ),
+        child: Container(
+          color: Colors.black.withValues(alpha: 0.2),
+        ),
+      );
+    } else {
+      // Fall back to using a more expensive image filtered
+      // Since the ImmichImage is already precached, we can
+      // safely use that as the image provider
+      return ImageFiltered(
+        imageFilter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
+        child: Container(
+          decoration: BoxDecoration(
+            image: DecorationImage(
+              image: getFullImageProvider(
+                asset,
+                size: Size(context.width, context.height),
+              ),
+              fit: BoxFit.cover,
+            ),
+          ),
+          child: Container(
+            color: Colors.black.withValues(alpha: 0.2),
+          ),
+        ),
+      );
+    }
+  }
+}
diff --git a/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart b/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
new file mode 100644
index 0000000000..aa21f36dd1
--- /dev/null
+++ b/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
@@ -0,0 +1,115 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+
+class DriftMemoryLane extends ConsumerWidget {
+  final List<DriftMemory> memories;
+
+  const DriftMemoryLane({super.key, required this.memories});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return ConstrainedBox(
+      constraints: const BoxConstraints(
+        maxHeight: 200,
+      ),
+      child: CarouselView(
+        itemExtent: 145.0,
+        shrinkExtent: 1.0,
+        elevation: 2,
+        backgroundColor: Colors.black,
+        overlayColor: WidgetStateProperty.all(
+          Colors.white.withValues(alpha: 0.1),
+        ),
+        onTap: (index) {
+          ref.read(hapticFeedbackProvider.notifier).heavyImpact();
+
+          if (memories[index].assets.isNotEmpty) {
+            final asset = memories[index].assets[0];
+            ref.read(currentAssetNotifier.notifier).setAsset(asset);
+
+            if (asset.isVideo) {
+              ref.read(videoPlaybackValueProvider.notifier).reset();
+            }
+          }
+
+          context.pushRoute(
+            DriftMemoryRoute(
+              memories: memories,
+              memoryIndex: index,
+            ),
+          );
+        },
+        children:
+            memories.map((memory) => DriftMemoryCard(memory: memory)).toList(),
+      ),
+    );
+  }
+}
+
+class DriftMemoryCard extends ConsumerWidget {
+  const DriftMemoryCard({
+    super.key,
+    required this.memory,
+  });
+
+  final DriftMemory memory;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final yearsAgo = DateTime.now().year - memory.data.year;
+    final title = 'years_ago'.t(
+      context: context,
+      args: {
+        'years': yearsAgo.toString(),
+      },
+    );
+    return Center(
+      child: Stack(
+        children: [
+          ColorFiltered(
+            colorFilter: ColorFilter.mode(
+              Colors.black.withValues(alpha: 0.2),
+              BlendMode.darken,
+            ),
+            child: Hero(
+              tag: 'memory-${memory.assets[0].id}',
+              child: SizedBox(
+                width: 205,
+                height: 200,
+                child: Thumbnail(
+                  remoteId: memory.assets[0].id,
+                  fit: BoxFit.cover,
+                ),
+              ),
+            ),
+          ),
+          Positioned(
+            bottom: 16,
+            left: 16,
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(
+                maxWidth: 114,
+              ),
+              child: Text(
+                title,
+                style: const TextStyle(
+                  fontWeight: FontWeight.w600,
+                  color: Colors.white,
+                  fontSize: 15,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
index e660f77767..f88c123e1a 100644
--- a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
@@ -26,6 +26,8 @@ class Scrubber extends ConsumerStatefulWidget {
 
   final double bottomPadding;
 
+  final double? monthSegmentSnappingOffset;
+
   Scrubber({
     super.key,
     Key? scrollThumbKey,
@@ -33,6 +35,7 @@ class Scrubber extends ConsumerStatefulWidget {
     required this.timelineHeight,
     this.topPadding = 0,
     this.bottomPadding = 0,
+    this.monthSegmentSnappingOffset,
     required this.child,
   }) : assert(child.scrollDirection == Axis.vertical);
 
@@ -296,7 +299,10 @@ class ScrubberState extends ConsumerState<Scrubber>
     final viewportHeight = _scrollController.position.viewportDimension;
 
     final targetScrollOffset = layoutSegment.startOffset;
-    final centeredOffset = targetScrollOffset - (viewportHeight / 4) + 100;
+    final centeredOffset = targetScrollOffset -
+        (viewportHeight / 4) +
+        100 +
+        (widget.monthSegmentSnappingOffset ?? 0.0);
 
     _scrollController.jumpTo(centeredOffset.clamp(0.0, maxScrollExtent));
   }
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 2ef01e5faf..04015aafe9 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -20,7 +20,10 @@ import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
 
 class Timeline extends StatelessWidget {
-  const Timeline({super.key});
+  const Timeline({super.key, this.topSliverWidget, this.topSliverWidgetHeight});
+
+  final Widget? topSliverWidget;
+  final double? topSliverWidgetHeight;
 
   @override
   Widget build(BuildContext context) {
@@ -38,7 +41,10 @@ class Timeline extends StatelessWidget {
               ),
             ),
           ],
-          child: const _SliverTimeline(),
+          child: _SliverTimeline(
+            topSliverWidget: topSliverWidget,
+            topSliverWidgetHeight: topSliverWidgetHeight,
+          ),
         ),
       ),
     );
@@ -46,7 +52,10 @@ class Timeline extends StatelessWidget {
 }
 
 class _SliverTimeline extends ConsumerStatefulWidget {
-  const _SliverTimeline();
+  const _SliverTimeline({this.topSliverWidget, this.topSliverWidgetHeight});
+
+  final Widget? topSliverWidget;
+  final double? topSliverWidgetHeight;
 
   @override
   ConsumerState createState() => _SliverTimelineState();
@@ -91,6 +100,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                 timelineHeight: maxHeight,
                 topPadding: totalAppBarHeight + 10,
                 bottomPadding: context.padding.bottom + scrubberBottomPadding,
+                monthSegmentSnappingOffset: widget.topSliverWidgetHeight,
                 child: CustomScrollView(
                   primary: true,
                   cacheExtent: maxHeight * 2,
@@ -100,6 +110,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                       pinned: false,
                       snap: false,
                     ),
+                    if (widget.topSliverWidget != null) widget.topSliverWidget!,
                     _SliverSegmentedList(
                       segments: segments,
                       delegate: SliverChildBuilderDelegate(
diff --git a/mobile/lib/providers/infrastructure/memory.provider.dart b/mobile/lib/providers/infrastructure/memory.provider.dart
new file mode 100644
index 0000000000..0e58943f55
--- /dev/null
+++ b/mobile/lib/providers/infrastructure/memory.provider.dart
@@ -0,0 +1,27 @@
+import 'package:immich_mobile/domain/models/memory.model.dart';
+import 'package:immich_mobile/domain/services/memory.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/memory.repository.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+import 'db.provider.dart';
+
+final driftMemoryRepositoryProvider = Provider<DriftMemoryRepository>(
+  (ref) => DriftMemoryRepository(ref.watch(driftProvider)),
+);
+
+final driftMemoryServiceProvider = Provider<DriftMemoryService>(
+  (ref) => DriftMemoryService(ref.watch(driftMemoryRepositoryProvider)),
+);
+
+final driftMemoryFutureProvider =
+    FutureProvider.autoDispose<List<DriftMemory>>((ref) async {
+  final user = ref.watch(currentUserProvider);
+  if (user == null) {
+    return [];
+  }
+
+  final service = ref.watch(driftMemoryServiceProvider);
+
+  return service.getMemoryLane(user.id);
+});
diff --git a/mobile/lib/providers/memory.provider.dart b/mobile/lib/providers/memory.provider.dart
index 37f84dca93..aed546002d 100644
--- a/mobile/lib/providers/memory.provider.dart
+++ b/mobile/lib/providers/memory.provider.dart
@@ -1,7 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/infrastructure/repositories/memory.repository.dart';
 import 'package:immich_mobile/models/memories/memory.model.dart';
-import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/services/memory.service.dart';
 
 final memoryFutureProvider =
@@ -10,7 +8,3 @@ final memoryFutureProvider =
 
   return await service.getMemoryLane();
 });
-
-final driftMemoryProvider = Provider<DriftMemoryRepository>(
-  (ref) => DriftMemoryRepository(ref.watch(driftProvider)),
-);
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index dae2dcdbfb..56e1aa0f96 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -2,6 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
+import 'package:immich_mobile/domain/models/memory.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
@@ -71,6 +72,7 @@ import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/remote_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_memory.page.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.page.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
@@ -83,6 +85,7 @@ import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/local_auth.service.dart';
 import 'package:immich_mobile/services/secure_storage.service.dart';
 import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
+
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 part 'router.gr.dart';
@@ -385,6 +388,11 @@ class AppRouter extends RootStackRouter {
         ),
       ),
     ),
+    AutoRoute(
+      page: DriftMemoryRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
+
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 348cea656e..f8f37970f9 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -618,6 +618,58 @@ class DriftAlbumsRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftMemoryPage]
+class DriftMemoryRoute extends PageRouteInfo<DriftMemoryRouteArgs> {
+  DriftMemoryRoute({
+    required List<DriftMemory> memories,
+    required int memoryIndex,
+    Key? key,
+    List<PageRouteInfo>? children,
+  }) : super(
+          DriftMemoryRoute.name,
+          args: DriftMemoryRouteArgs(
+            memories: memories,
+            memoryIndex: memoryIndex,
+            key: key,
+          ),
+          initialChildren: children,
+        );
+
+  static const String name = 'DriftMemoryRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<DriftMemoryRouteArgs>();
+      return DriftMemoryPage(
+        memories: args.memories,
+        memoryIndex: args.memoryIndex,
+        key: args.key,
+      );
+    },
+  );
+}
+
+class DriftMemoryRouteArgs {
+  const DriftMemoryRouteArgs({
+    required this.memories,
+    required this.memoryIndex,
+    this.key,
+  });
+
+  final List<DriftMemory> memories;
+
+  final int memoryIndex;
+
+  final Key? key;
+
+  @override
+  String toString() {
+    return 'DriftMemoryRouteArgs{memories: $memories, memoryIndex: $memoryIndex, key: $key}';
+  }
+}
+
 /// generated route for
 /// [EditImagePage]
 class EditImageRoute extends PageRouteInfo<EditImageRouteArgs> {
diff --git a/mobile/lib/utils/hooks/blurhash_hook.dart b/mobile/lib/utils/hooks/blurhash_hook.dart
index 9231e2d972..62208c4cf5 100644
--- a/mobile/lib/utils/hooks/blurhash_hook.dart
+++ b/mobile/lib/utils/hooks/blurhash_hook.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:typed_data';
 import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:thumbhash/thumbhash.dart' as thumbhash;
 
@@ -15,3 +16,15 @@ ObjectRef<Uint8List?> useBlurHashRef(Asset? asset) {
 
   return useRef(thumbhash.rgbaToBmp(rbga));
 }
+
+ObjectRef<Uint8List?> useDriftBlurHashRef(RemoteAsset? asset) {
+  if (asset?.thumbHash == null) {
+    return useRef(null);
+  }
+
+  final rbga = thumbhash.thumbHashToRGBA(
+    base64Decode(asset!.thumbHash!),
+  );
+
+  return useRef(thumbhash.rgbaToBmp(rbga));
+}

From 73733370a2b485affc1eb59e51220987d1a9bbff Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Sat, 5 Jul 2025 00:38:06 +0530
Subject: [PATCH 131/337] feat: adds bottom sheet map and actions (#19726)

* reduce timeline rebuilds

* feat: adds bottom sheet map and actions (#19692)

* adds bottom sheet map and actions

* PR feedbacks

* only reload the asset viewer if asset is changed

* styling tweak

---------

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

* rename singleton and remove event prefix

* adds bottom sheet map and actions

* PR feedbacks

* refactor: use provider for viewer state

* feat: adds top and bottom app bar

* add safe area to bottom app bar

* change app and bottom bar color

* viewer - always have black background

* use the full width for the bottom sheet on landscape as well

* constraint the bottom sheet to not expand all the way

* add padding for location details in landscape

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../models/asset/remote_asset.model.dart      |  34 ++
 mobile/lib/domain/services/asset.service.dart |  13 +-
 mobile/lib/domain/utils/event_stream.dart     |   4 +
 .../entities/local_asset.entity.dart          |   3 +
 .../repositories/local_asset.repository.dart  |  21 ++
 .../repositories/remote_asset.repository.dart |  21 ++
 .../base_action_button.widget.dart            |  29 +-
 .../favorite_action_button.widget.dart        |  13 +-
 .../unfavorite_action_button.widget.dart      |  13 +-
 .../asset_viewer/asset_viewer.page.dart       | 292 ++++++++++--------
 .../asset_viewer/asset_viewer.state.dart      |  76 +++++
 .../asset_viewer/bottom_bar.widget.dart       |  93 ++++++
 .../asset_viewer/bottom_sheet.widget.dart     |  12 +-
 .../bottom_sheet/location_details.widget.dart |   7 +-
 .../asset_viewer/top_app_bar.widget.dart      | 114 +++++++
 .../infrastructure/action.provider.dart       |   5 +-
 .../infrastructure/asset.provider.dart        |   1 +
 .../asset_viewer/current_asset.provider.dart  |  26 +-
 18 files changed, 622 insertions(+), 155 deletions(-)
 create mode 100644 mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
 create mode 100644 mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart

diff --git a/mobile/lib/domain/models/asset/remote_asset.model.dart b/mobile/lib/domain/models/asset/remote_asset.model.dart
index e5c1f8345a..d04f3340ac 100644
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -78,4 +78,38 @@ class RemoteAsset extends BaseAsset {
       localId.hashCode ^
       thumbHash.hashCode ^
       visibility.hashCode;
+
+  RemoteAsset copyWith({
+    String? id,
+    String? localId,
+    String? name,
+    String? ownerId,
+    String? checksum,
+    AssetType? type,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    int? width,
+    int? height,
+    int? durationInSeconds,
+    bool? isFavorite,
+    String? thumbHash,
+    AssetVisibility? visibility,
+  }) {
+    return RemoteAsset(
+      id: id ?? this.id,
+      localId: localId ?? this.localId,
+      name: name ?? this.name,
+      ownerId: ownerId ?? this.ownerId,
+      checksum: checksum ?? this.checksum,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      width: width ?? this.width,
+      height: height ?? this.height,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
+      isFavorite: isFavorite ?? this.isFavorite,
+      thumbHash: thumbHash ?? this.thumbHash,
+      visibility: visibility ?? this.visibility,
+    );
+  }
 }
diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dart
index ee39220554..c4a0766601 100644
--- a/mobile/lib/domain/services/asset.service.dart
+++ b/mobile/lib/domain/services/asset.service.dart
@@ -1,13 +1,24 @@
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
 
 class AssetService {
   final RemoteAssetRepository _remoteAssetRepository;
+  final DriftLocalAssetRepository _localAssetRepository;
 
   const AssetService({
     required RemoteAssetRepository remoteAssetRepository,
-  }) : _remoteAssetRepository = remoteAssetRepository;
+    required DriftLocalAssetRepository localAssetRepository,
+  })  : _remoteAssetRepository = remoteAssetRepository,
+        _localAssetRepository = localAssetRepository;
+
+  Stream<BaseAsset?> watchAsset(BaseAsset asset) {
+    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;
+    return asset is LocalAsset
+        ? _localAssetRepository.watchAsset(id)
+        : _remoteAssetRepository.watchAsset(id);
+  }
 
   Future<ExifInfo?> getExif(BaseAsset asset) async {
     if (asset is LocalAsset || asset is! RemoteAsset) {
diff --git a/mobile/lib/domain/utils/event_stream.dart b/mobile/lib/domain/utils/event_stream.dart
index 9acb3b4e39..65ee17e12b 100644
--- a/mobile/lib/domain/utils/event_stream.dart
+++ b/mobile/lib/domain/utils/event_stream.dart
@@ -8,6 +8,10 @@ class TimelineReloadEvent extends Event {
   const TimelineReloadEvent();
 }
 
+class ViewerOpenBottomSheetEvent extends Event {
+  const ViewerOpenBottomSheetEvent();
+}
+
 class EventStream {
   EventStream._();
 
diff --git a/mobile/lib/infrastructure/entities/local_asset.entity.dart b/mobile/lib/infrastructure/entities/local_asset.entity.dart
index 39c3822b04..62f91ae458 100644
--- a/mobile/lib/infrastructure/entities/local_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.dart
@@ -28,5 +28,8 @@ extension LocalAssetEntityDataDomainEx on LocalAssetEntityData {
         updatedAt: updatedAt,
         durationInSeconds: durationInSeconds,
         isFavorite: isFavorite,
+        height: height,
+        width: width,
+        remoteId: null,
       );
 }
diff --git a/mobile/lib/infrastructure/repositories/local_asset.repository.dart b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
index 2efa04cc1b..28ca600f61 100644
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -1,5 +1,6 @@
 import 'package:drift/drift.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/repositories/db.repository.dart';
 
@@ -7,6 +8,26 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
   const DriftLocalAssetRepository(this._db) : super(_db);
 
+  Stream<LocalAsset?> watchAsset(String id) {
+    final query = _db.localAssetEntity
+        .select()
+        .addColumns([_db.localAssetEntity.id]).join([
+      leftOuterJoin(
+        _db.remoteAssetEntity,
+        _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
+        useColumns: false,
+      ),
+    ])
+      ..where(_db.localAssetEntity.id.equals(id));
+
+    return query.map((row) {
+      final asset = row.readTable(_db.localAssetEntity).toDto();
+      return asset.copyWith(
+        remoteId: row.read(_db.remoteAssetEntity.id),
+      );
+    }).watchSingleOrNull();
+  }
+
   Future<void> updateHashes(Iterable<LocalAsset> hashes) {
     if (hashes.isEmpty) {
       return Future.value();
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index 9c036e4ea1..fc341bc91e 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -4,6 +4,7 @@ import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
     hide ExifInfo;
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
@@ -12,6 +13,26 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
   const RemoteAssetRepository(this._db) : super(_db);
 
+  Stream<RemoteAsset?> watchAsset(String id) {
+    final query = _db.remoteAssetEntity
+        .select()
+        .addColumns([_db.localAssetEntity.id]).join([
+      leftOuterJoin(
+        _db.localAssetEntity,
+        _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
+        useColumns: false,
+      ),
+    ])
+      ..where(_db.remoteAssetEntity.id.equals(id));
+
+    return query.map((row) {
+      final asset = row.readTable(_db.remoteAssetEntity).toDto();
+      return asset.copyWith(
+        localId: row.read(_db.localAssetEntity.id),
+      );
+    }).watchSingleOrNull();
+  }
+
   Future<ExifInfo?> getExif(String id) {
     return _db.managers.remoteExifEntity
         .filter((row) => row.assetId.id.equals(id))
diff --git a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
index 6c60b47535..94e3610a57 100644
--- a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
@@ -9,17 +9,33 @@ class BaseActionButton extends StatelessWidget {
     this.onPressed,
     this.onLongPressed,
     this.maxWidth = 90.0,
+    this.minWidth,
+    this.menuItem = false,
   });
 
   final String label;
   final IconData iconData;
   final double maxWidth;
+  final double? minWidth;
+  final bool menuItem;
   final void Function()? onPressed;
   final void Function()? onLongPressed;
 
   @override
   Widget build(BuildContext context) {
-    final minWidth = context.isMobile ? context.width / 4.5 : 75.0;
+    final miniWidth =
+        minWidth ?? (context.isMobile ? context.width / 4.5 : 75.0);
+    final iconTheme = IconTheme.of(context);
+    final iconSize = iconTheme.size ?? 24.0;
+    final iconColor = iconTheme.color ?? context.themeData.iconTheme.color;
+    final textColor = context.themeData.textTheme.labelLarge?.color;
+
+    if (menuItem) {
+      return IconButton(
+        onPressed: onPressed,
+        icon: Icon(iconData, size: iconSize, color: iconColor),
+      );
+    }
 
     return ConstrainedBox(
       constraints: BoxConstraints(
@@ -30,19 +46,22 @@ class BaseActionButton extends StatelessWidget {
         shape: const RoundedRectangleBorder(
           borderRadius: BorderRadius.all(Radius.circular(20)),
         ),
+        textColor: textColor,
         onPressed: onPressed,
         onLongPress: onLongPressed,
-        minWidth: minWidth,
+        minWidth: miniWidth,
         child: Column(
           mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            Icon(iconData, size: 24),
+            Icon(iconData, size: iconSize, color: iconColor),
             const SizedBox(height: 8),
             Text(
               label,
-              style:
-                  const TextStyle(fontSize: 14.0, fontWeight: FontWeight.w400),
+              style: const TextStyle(
+                fontSize: 14.0,
+                fontWeight: FontWeight.w400,
+              ),
               maxLines: 3,
               textAlign: TextAlign.center,
             ),
diff --git a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
index 4b717149d9..39d059c2d1 100644
--- a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
@@ -10,8 +10,13 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class FavoriteActionButton extends ConsumerWidget {
   final ActionSource source;
+  final bool menuItem;
 
-  const FavoriteActionButton({super.key, required this.source});
+  const FavoriteActionButton({
+    super.key,
+    required this.source,
+    this.menuItem = false,
+  });
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -19,6 +24,11 @@ class FavoriteActionButton extends ConsumerWidget {
     }
 
     final result = await ref.read(actionProvider.notifier).favorite(source);
+
+    if (source == ActionSource.viewer) {
+      return;
+    }
+
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'favorite_action_prompt'.t(
@@ -43,6 +53,7 @@ class FavoriteActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.favorite_border_rounded,
       label: "favorite".t(context: context),
+      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }
diff --git a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
index cf014c356c..b465643796 100644
--- a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
@@ -10,8 +10,13 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class UnFavoriteActionButton extends ConsumerWidget {
   final ActionSource source;
+  final bool menuItem;
 
-  const UnFavoriteActionButton({super.key, required this.source});
+  const UnFavoriteActionButton({
+    super.key,
+    required this.source,
+    this.menuItem = false,
+  });
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -19,6 +24,11 @@ class UnFavoriteActionButton extends ConsumerWidget {
     }
 
     final result = await ref.read(actionProvider.notifier).unFavorite(source);
+
+    if (source == ActionSource.viewer) {
+      return;
+    }
+
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'unfavorite_action_prompt'.t(
@@ -44,6 +54,7 @@ class UnFavoriteActionButton extends ConsumerWidget {
       iconData: Icons.favorite_rounded,
       label: "unfavorite".t(context: context),
       onPressed: () => _onTap(context, ref),
+      menuItem: menuItem,
     );
   }
 }
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 d221347ce1..c91b71319c 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -7,7 +7,10 @@ import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/scroll_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_bar.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/top_app_bar.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
@@ -58,10 +61,10 @@ const double _kBottomSheetSnapExtent = 0.7;
 class _AssetViewerState extends ConsumerState<AssetViewer> {
   late PageController pageController;
   late DraggableScrollableController bottomSheetController;
-  PersistentBottomSheetController? sheetCloseNotifier;
+  PersistentBottomSheetController? sheetCloseController;
   // PhotoViewGallery takes care of disposing it's controllers
   PhotoViewControllerBase? viewController;
-  StreamSubscription? _reloadSubscription;
+  StreamSubscription? reloadSubscription;
 
   late Platform platform;
   late PhotoViewControllerValue initialPhotoViewState;
@@ -70,12 +73,11 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   bool blockGestures = false;
   bool dragInProgress = false;
   bool shouldPopOnDrag = false;
-  bool showingBottomSheet = false;
   double? initialScale;
   double previousExtent = _kBottomSheetMinimumExtent;
   Offset dragDownPosition = Offset.zero;
   int totalAssets = 0;
-  int backgroundOpacity = 255;
+  BuildContext? scaffoldContext;
 
   // Delayed operations that should be cancelled on disposal
   final List<Timer> _delayedOperations = [];
@@ -90,8 +92,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _onAssetChanged(widget.initialIndex);
     });
-    _reloadSubscription =
-        EventStream.shared.listen<TimelineReloadEvent>(_onTimelineReload);
+    reloadSubscription = EventStream.shared.listen(_onEvent);
   }
 
   @override
@@ -99,36 +100,17 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     pageController.dispose();
     bottomSheetController.dispose();
     _cancelTimers();
-    _reloadSubscription?.cancel();
+    reloadSubscription?.cancel();
     super.dispose();
   }
 
-  void _onTimelineReload(_) {
-    setState(() {
-      totalAssets = ref.read(timelineServiceProvider).totalAssets;
-      if (totalAssets == 0) {
-        context.maybePop();
-        return;
-      }
-
-      final index = pageController.page?.round() ?? 0;
-      final newAsset = ref.read(timelineServiceProvider).getAsset(index);
-      final currentAsset = ref.read(currentAssetNotifier);
-      // Do not reload / close the bottom sheet if the asset has not changed
-      if (newAsset.heroTag == currentAsset.heroTag) {
-        return;
-      }
-
-      _onAssetChanged(pageController.page!.round());
-      sheetCloseNotifier?.close();
-    });
-  }
+  bool get showingBottomSheet =>
+      ref.read(assetViewerProvider.select((s) => s.showingBottomSheet));
 
   Color get backgroundColor {
-    if (showingBottomSheet && !context.isDarkTheme) {
-      return Colors.white;
-    }
-    return Colors.black.withAlpha(backgroundOpacity);
+    final opacity =
+        ref.read(assetViewerProvider.select((s) => s.backgroundOpacity));
+    return Colors.black.withAlpha(opacity);
   }
 
   void _cancelTimers() {
@@ -145,6 +127,9 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       (viewController?.prevValue.scale ?? viewController?.value.scale ?? 1.0) +
       0.01;
 
+  double _getVerticalOffsetForBottomSheet(double extent) =>
+      (context.height * extent) - (context.height * _kBottomSheetMinimumExtent);
+
   Future<void> _precacheImage(int index) async {
     if (!mounted || index < 0 || index >= totalAssets) {
       return;
@@ -247,16 +232,14 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       return;
     }
 
-    setState(() {
-      shouldPopOnDrag = false;
-      hasDraggedDown = null;
-      backgroundOpacity = 255;
-      viewController?.animateMultiple(
-        position: initialPhotoViewState.position,
-        scale: initialPhotoViewState.scale,
-        rotation: initialPhotoViewState.rotation,
-      );
-    });
+    shouldPopOnDrag = false;
+    hasDraggedDown = null;
+    viewController?.animateMultiple(
+      position: initialPhotoViewState.position,
+      scale: initialPhotoViewState.scale,
+      rotation: initialPhotoViewState.rotation,
+    );
+    ref.read(assetViewerProvider.notifier).setOpacity(255);
   }
 
   void _onDragUpdate(BuildContext ctx, DragUpdateDetails details, _) {
@@ -277,18 +260,10 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   void _handleDragUp(BuildContext ctx, Offset delta) {
     const double openThreshold = 50;
-    const double closeThreshold = 25;
 
     final position = initialPhotoViewState.position + Offset(0, delta.dy);
     final distanceToOrigin = position.distance;
 
-    if (showingBottomSheet && distanceToOrigin < closeThreshold) {
-      // Prevents the user from dragging the bottom sheet further down
-      blockGestures = true;
-      sheetCloseNotifier?.close();
-      return;
-    }
-
     viewController?.updateMultiple(position: position);
     // Moves the bottom sheet when the asset is being dragged up
     if (showingBottomSheet && bottomSheetController.isAttached) {
@@ -301,66 +276,37 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     }
   }
 
-  void _openBottomSheet(BuildContext ctx) {
-    setState(() {
-      initialScale = viewController?.scale;
-      viewController?.updateMultiple(scale: _getScaleForBottomSheet);
-      showingBottomSheet = true;
-      previousExtent = _kBottomSheetMinimumExtent;
-      sheetCloseNotifier = showBottomSheet(
-        context: ctx,
-        sheetAnimationStyle: AnimationStyle(
-          duration: Duration.zero,
-          reverseDuration: Duration.zero,
-        ),
-        shape: const RoundedRectangleBorder(
-          borderRadius: BorderRadius.vertical(top: Radius.circular(20.0)),
-        ),
-        backgroundColor: ctx.colorScheme.surfaceContainerLowest,
-        builder: (_) {
-          return NotificationListener<Notification>(
-            onNotification: _onNotification,
-            child: AssetDetailBottomSheet(
-              controller: bottomSheetController,
-              initialChildSize: _kBottomSheetMinimumExtent,
-            ),
-          );
-        },
-      );
-      sheetCloseNotifier?.closed.then((_) => _handleSheetClose());
-    });
-  }
+  void _handleDragDown(BuildContext ctx, Offset delta) {
+    const double dragRatio = 0.2;
+    const double popThreshold = 75;
 
-  void _handleSheetClose() {
-    setState(() {
-      showingBottomSheet = false;
-      sheetCloseNotifier = null;
-      viewController?.animateMultiple(position: Offset.zero);
-      viewController?.updateMultiple(scale: initialScale);
-      shouldPopOnDrag = false;
-      hasDraggedDown = null;
-    });
-  }
+    final distance = delta.distance;
+    shouldPopOnDrag = delta.dy > 0 && distance > popThreshold;
 
-  void _snapBottomSheet() {
-    if (bottomSheetController.size > _kBottomSheetSnapExtent ||
-        bottomSheetController.size < 0.4) {
-      return;
+    final maxScaleDistance = ctx.height * 0.5;
+    final scaleReduction = (distance / maxScaleDistance).clamp(0.0, dragRatio);
+    double? updatedScale;
+    if (initialPhotoViewState.scale != null) {
+      updatedScale = initialPhotoViewState.scale! * (1.0 - scaleReduction);
     }
-    isSnapping = true;
-    bottomSheetController.animateTo(
-      _kBottomSheetSnapExtent,
-      duration: Durations.short3,
-      curve: Curves.easeOut,
+
+    final backgroundOpacity =
+        (255 * (1.0 - (scaleReduction / dragRatio))).round();
+
+    viewController?.updateMultiple(
+      position: initialPhotoViewState.position + delta,
+      scale: updatedScale,
     );
+    ref.read(assetViewerProvider.notifier).setOpacity(backgroundOpacity);
+  }
+
+  void _onTapDown(_, __, ___) {
+    if (!showingBottomSheet) {
+      ref.read(assetViewerProvider.notifier).toggleControls();
+    }
   }
 
   bool _onNotification(Notification delta) {
-    // Ignore notifications when user dragging the asset
-    if (dragInProgress) {
-      return false;
-    }
-
     if (delta is DraggableScrollableNotification) {
       _handleDraggableNotification(delta);
     }
@@ -375,50 +321,117 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   }
 
   void _handleDraggableNotification(DraggableScrollableNotification delta) {
-    final verticalOffset = (context.height * delta.extent) -
-        (context.height * _kBottomSheetMinimumExtent);
+    final currentExtent = delta.extent;
+    final isDraggingDown = currentExtent < previousExtent;
+    previousExtent = currentExtent;
+    // Closes the bottom sheet if the user is dragging down
+    if (isDraggingDown && delta.extent < 0.5) {
+      if (dragInProgress) {
+        blockGestures = true;
+      }
+      sheetCloseController?.close();
+    }
+
+    // If the asset is being dragged down, we do not want to update the asset position again
+    if (dragInProgress) {
+      return;
+    }
+
+    final verticalOffset = _getVerticalOffsetForBottomSheet(delta.extent);
     // Moves the asset when the bottom sheet is being dragged
     if (verticalOffset > 0) {
       viewController?.position = Offset(0, -verticalOffset);
     }
+  }
 
-    final currentExtent = delta.extent;
-    final isDraggingDown = currentExtent < previousExtent;
-    previousExtent = currentExtent;
-    // Closes the bottom sheet if the user is dragging down and the extent is less than the snap extent
-    if (isDraggingDown && delta.extent < _kBottomSheetSnapExtent - 0.1) {
-      sheetCloseNotifier?.close();
+  void _onEvent(Event event) {
+    if (event is TimelineReloadEvent) {
+      _onTimelineReload(event);
+      return;
+    }
+
+    if (event is ViewerOpenBottomSheetEvent) {
+      final extent = _kBottomSheetMinimumExtent + 0.3;
+      _openBottomSheet(scaffoldContext!, extent: extent);
+      final offset = _getVerticalOffsetForBottomSheet(extent);
+      viewController?.position = Offset(0, -offset);
+      return;
     }
   }
 
-  void _handleDragDown(BuildContext ctx, Offset delta) {
-    const double dragRatio = 0.2;
-    const double popThreshold = 75;
+  void _onTimelineReload(_) {
+    setState(() {
+      totalAssets = ref.read(timelineServiceProvider).totalAssets;
+      if (totalAssets == 0) {
+        context.maybePop();
+        return;
+      }
 
-    final distance = delta.distance;
-    final newShouldPopOnDrag = delta.dy > 0 && distance > popThreshold;
+      final index = pageController.page?.round() ?? 0;
+      final newAsset = ref.read(timelineServiceProvider).getAsset(index);
+      final currentAsset = ref.read(currentAssetNotifier);
+      // Do not reload / close the bottom sheet if the asset has not changed
+      if (newAsset.heroTag == currentAsset?.heroTag) {
+        return;
+      }
 
-    final maxScaleDistance = ctx.height * 0.5;
-    final scaleReduction = (distance / maxScaleDistance).clamp(0.0, dragRatio);
-    double? updatedScale;
-    if (initialPhotoViewState.scale != null) {
-      updatedScale = initialPhotoViewState.scale! * (1.0 - scaleReduction);
-    }
+      _onAssetChanged(pageController.page!.round());
+      sheetCloseController?.close();
+    });
+  }
 
-    final newBackgroundOpacity =
-        (255 * (1.0 - (scaleReduction / dragRatio))).round();
-
-    viewController?.updateMultiple(
-      position: initialPhotoViewState.position + delta,
-      scale: updatedScale,
+  void _openBottomSheet(
+    BuildContext ctx, {
+    double extent = _kBottomSheetMinimumExtent,
+  }) {
+    ref.read(assetViewerProvider.notifier).setBottomSheet(true);
+    initialScale = viewController?.scale;
+    viewController?.updateMultiple(scale: _getScaleForBottomSheet);
+    previousExtent = _kBottomSheetMinimumExtent;
+    sheetCloseController = showBottomSheet(
+      context: ctx,
+      sheetAnimationStyle: AnimationStyle(
+        duration: Durations.short4,
+        reverseDuration: Durations.short2,
+      ),
+      constraints: const BoxConstraints(maxWidth: double.infinity),
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(20.0)),
+      ),
+      backgroundColor: ctx.colorScheme.surfaceContainerLowest,
+      builder: (_) {
+        return NotificationListener<Notification>(
+          onNotification: _onNotification,
+          child: AssetDetailBottomSheet(
+            controller: bottomSheetController,
+            initialChildSize: extent,
+          ),
+        );
+      },
     );
-    if (shouldPopOnDrag != newShouldPopOnDrag ||
-        backgroundOpacity != newBackgroundOpacity) {
-      setState(() {
-        shouldPopOnDrag = newShouldPopOnDrag;
-        backgroundOpacity = newBackgroundOpacity;
-      });
+    sheetCloseController?.closed.then((_) => _handleSheetClose());
+  }
+
+  void _handleSheetClose() {
+    viewController?.animateMultiple(position: Offset.zero);
+    viewController?.updateMultiple(scale: initialScale);
+    ref.read(assetViewerProvider.notifier).setBottomSheet(false);
+    sheetCloseController = null;
+    shouldPopOnDrag = false;
+    hasDraggedDown = null;
+  }
+
+  void _snapBottomSheet() {
+    if (bottomSheetController.size > _kBottomSheetSnapExtent ||
+        bottomSheetController.size < 0.4) {
+      return;
     }
+    isSnapping = true;
+    bottomSheetController.animateTo(
+      _kBottomSheetSnapExtent,
+      duration: Durations.short3,
+      curve: Curves.easeOut,
+    );
   }
 
   Widget _placeholderBuilder(
@@ -443,6 +456,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   }
 
   PhotoViewGalleryPageOptions _assetBuilder(BuildContext ctx, int index) {
+    scaffoldContext ??= ctx;
     final asset = ref.read(timelineServiceProvider).getAsset(index);
     final size = Size(ctx.width, ctx.height);
 
@@ -458,6 +472,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       onDragStart: _onDragStart,
       onDragUpdate: _onDragUpdate,
       onDragEnd: _onDragEnd,
+      onTapDown: _onTapDown,
       errorBuilder: (_, __, ___) => Container(
         width: ctx.width,
         height: ctx.height,
@@ -477,13 +492,21 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   @override
   Widget build(BuildContext context) {
+    // 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.backgroundOpacity));
+
     // Currently it is not possible to scroll the asset when the bottom sheet is open all the way.
     // Issue: https://github.com/flutter/flutter/issues/109037
     // TODO: Add a custom scrum builder once the fix lands on stable
     return PopScope(
       onPopInvokedWithResult: _onPop,
       child: Scaffold(
-        backgroundColor: Colors.black.withAlpha(backgroundOpacity),
+        backgroundColor: backgroundColor,
+        appBar: const ViewerTopAppBar(),
+        extendBody: true,
+        extendBodyBehindAppBar: true,
         body: PhotoViewGallery.builder(
           gaplessPlayback: true,
           loadingBuilder: _placeholderBuilder,
@@ -499,6 +522,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
           backgroundDecoration: BoxDecoration(color: backgroundColor),
           enablePanAlways: true,
         ),
+        bottomNavigationBar: const ViewerBottomBar(),
       ),
     );
   }
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
new file mode 100644
index 0000000000..231d40c9ca
--- /dev/null
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
@@ -0,0 +1,76 @@
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+class AssetViewerState {
+  final int backgroundOpacity;
+  final bool showingBottomSheet;
+  final bool showingControls;
+
+  const AssetViewerState({
+    this.backgroundOpacity = 255,
+    this.showingBottomSheet = false,
+    this.showingControls = true,
+  });
+
+  AssetViewerState copyWith({
+    int? backgroundOpacity,
+    bool? showingBottomSheet,
+    bool? showingControls,
+  }) {
+    return AssetViewerState(
+      backgroundOpacity: backgroundOpacity ?? this.backgroundOpacity,
+      showingBottomSheet: showingBottomSheet ?? this.showingBottomSheet,
+      showingControls: showingControls ?? this.showingControls,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'AssetViewerState(opacity: $backgroundOpacity, bottomSheet: $showingBottomSheet, controls: $showingControls)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other.runtimeType != runtimeType) return false;
+    return other is AssetViewerState &&
+        other.backgroundOpacity == backgroundOpacity &&
+        other.showingBottomSheet == showingBottomSheet &&
+        other.showingControls == showingControls;
+  }
+
+  @override
+  int get hashCode =>
+      backgroundOpacity.hashCode ^
+      showingBottomSheet.hashCode ^
+      showingControls.hashCode;
+}
+
+class AssetViewerStateNotifier extends AutoDisposeNotifier<AssetViewerState> {
+  @override
+  AssetViewerState build() {
+    return const AssetViewerState();
+  }
+
+  void setOpacity(int opacity) {
+    state = state.copyWith(
+      backgroundOpacity: opacity,
+      showingControls: opacity == 255 ? true : state.showingControls,
+    );
+  }
+
+  void setBottomSheet(bool showing) {
+    state = state.copyWith(
+      showingBottomSheet: showing,
+      showingControls: showing ? true : state.showingControls,
+    );
+  }
+
+  void toggleControls() {
+    state = state.copyWith(showingControls: !state.showingControls);
+  }
+}
+
+final assetViewerProvider =
+    AutoDisposeNotifierProvider<AssetViewerStateNotifier, AssetViewerState>(
+  AssetViewerStateNotifier.new,
+);
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
new file mode 100644
index 0000000000..6269bef6be
--- /dev/null
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
@@ -0,0 +1,93 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+
+class ViewerBottomBar extends ConsumerWidget {
+  const ViewerBottomBar({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final asset = ref.watch(currentAssetNotifier);
+    if (asset == null) {
+      return const SizedBox.shrink();
+    }
+
+    final user = ref.watch(currentUserProvider);
+    final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
+    final isSheetOpen = ref.watch(
+      assetViewerProvider.select((s) => s.showingBottomSheet),
+    );
+    int opacity = ref.watch(
+      assetViewerProvider.select((state) => state.backgroundOpacity),
+    );
+    final showControls =
+        ref.watch(assetViewerProvider.select((s) => s.showingControls));
+
+    if (!showControls) {
+      opacity = 0;
+    }
+
+    final actions = <Widget>[
+      const ShareActionButton(),
+      const _EditActionButton(),
+      if (asset.hasRemote && isOwner)
+        const ArchiveActionButton(source: ActionSource.viewer),
+    ];
+
+    return IgnorePointer(
+      ignoring: opacity < 255,
+      child: AnimatedOpacity(
+        opacity: opacity / 255,
+        duration: Durations.short2,
+        child: AnimatedSwitcher(
+          duration: Durations.short4,
+          child: isSheetOpen
+              ? const SizedBox.shrink()
+              : SafeArea(
+                  child: Theme(
+                    data: context.themeData.copyWith(
+                      iconTheme:
+                          const IconThemeData(size: 22, color: Colors.white),
+                      textTheme: context.themeData.textTheme.copyWith(
+                        labelLarge:
+                            context.themeData.textTheme.labelLarge?.copyWith(
+                          color: Colors.white,
+                        ),
+                      ),
+                    ),
+                    child: Container(
+                      height: 80,
+                      color: Colors.black.withAlpha(125),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                        children: actions,
+                      ),
+                    ),
+                  ),
+                ),
+        ),
+      ),
+    );
+  }
+}
+
+class _EditActionButton extends ConsumerWidget {
+  const _EditActionButton();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.tune_outlined,
+      label: 'edit'.t(context: context),
+    );
+  }
+}
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 d8afe81564..d0bdc28d10 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -10,7 +10,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
@@ -37,6 +36,10 @@ class AssetDetailBottomSheet extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final asset = ref.watch(currentAssetNotifier);
+    if (asset == null) {
+      return const SizedBox.shrink();
+    }
+
     final isTrashEnable = ref.watch(
       serverInfoProvider.select((state) => state.serverFeatures.trash),
     );
@@ -46,7 +49,6 @@ class AssetDetailBottomSheet extends ConsumerWidget {
       if (asset.hasRemote) ...[
         const ShareLinkActionButton(source: ActionSource.viewer),
         const ArchiveActionButton(source: ActionSource.viewer),
-        const FavoriteActionButton(source: ActionSource.viewer),
         if (!asset.hasLocal) const DownloadActionButton(),
         isTrashEnable
             ? const TrashActionButton(source: ActionSource.viewer)
@@ -67,7 +69,7 @@ class AssetDetailBottomSheet extends ConsumerWidget {
       controller: controller,
       initialChildSize: initialChildSize,
       minChildSize: 0.1,
-      maxChildSize: 1.0,
+      maxChildSize: 0.88,
       expand: false,
       shouldCloseOnMinExtent: false,
       resizeOnScroll: false,
@@ -136,6 +138,10 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final asset = ref.watch(currentAssetNotifier);
+    if (asset == null) {
+      return const SliverToBoxAdapter(child: SizedBox.shrink());
+    }
+
     final exifInfo = ref.watch(currentAssetExifProvider).valueOrNull;
     final cameraTitle = _getCameraInfoTitle(exifInfo);
 
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
index 4b0294253c..2d22d063bd 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
@@ -16,7 +16,7 @@ class SheetLocationDetails extends ConsumerStatefulWidget {
 }
 
 class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
-  late BaseAsset asset;
+  BaseAsset? asset;
   ExifInfo? exifInfo;
   MapLibreMapController? _mapController;
 
@@ -84,7 +84,10 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
         "${exifInfo!.latitude!.toStringAsFixed(4)}, ${exifInfo!.longitude!.toStringAsFixed(4)}";
 
     return Padding(
-      padding: const EdgeInsets.all(16.0),
+      padding: EdgeInsets.symmetric(
+        vertical: 16.0,
+        horizontal: context.isMobile ? 16.0 : 56.0,
+      ),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
diff --git a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
new file mode 100644
index 0000000000..b7e8477073
--- /dev/null
+++ b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
@@ -0,0 +1,114 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+
+class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
+  const ViewerTopAppBar({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final asset = ref.watch(currentAssetNotifier);
+    if (asset == null) {
+      return const SizedBox.shrink();
+    }
+
+    final user = ref.watch(currentUserProvider);
+    final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
+
+    final isShowingSheet = ref
+        .watch(assetViewerProvider.select((state) => state.showingBottomSheet));
+    int opacity = ref.watch(
+      assetViewerProvider.select((state) => state.backgroundOpacity),
+    );
+    final showControls =
+        ref.watch(assetViewerProvider.select((s) => s.showingControls));
+
+    if (!showControls) {
+      opacity = 0;
+    }
+
+    final actions = <Widget>[
+      if (asset.hasRemote && isOwner && !asset.isFavorite)
+        const FavoriteActionButton(source: ActionSource.viewer, menuItem: true),
+      if (asset.hasRemote && isOwner && asset.isFavorite)
+        const UnFavoriteActionButton(
+          source: ActionSource.viewer,
+          menuItem: true,
+        ),
+      const _KebabMenu(),
+    ];
+
+    return IgnorePointer(
+      ignoring: opacity < 255,
+      child: AnimatedOpacity(
+        opacity: opacity / 255,
+        duration: Durations.short2,
+        child: AppBar(
+          backgroundColor:
+              isShowingSheet ? Colors.transparent : Colors.black.withAlpha(125),
+          leading: const _AppBarBackButton(),
+          iconTheme: const IconThemeData(size: 22, color: Colors.white),
+          actionsIconTheme: const IconThemeData(size: 22, color: Colors.white),
+          shape: const Border(),
+          actions: isShowingSheet ? null : actions,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Size get preferredSize => const Size.fromHeight(60.0);
+}
+
+class _KebabMenu extends ConsumerWidget {
+  const _KebabMenu();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return IconButton(
+      onPressed: () {
+        EventStream.shared.emit(const ViewerOpenBottomSheetEvent());
+      },
+      icon: const Icon(Icons.more_vert_rounded),
+    );
+  }
+}
+
+class _AppBarBackButton extends ConsumerWidget {
+  const _AppBarBackButton();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isShowingSheet = ref
+        .watch(assetViewerProvider.select((state) => state.showingBottomSheet));
+    final backgroundColor =
+        isShowingSheet && !context.isDarkTheme ? Colors.white : Colors.black;
+    final foregroundColor =
+        isShowingSheet && !context.isDarkTheme ? Colors.black : Colors.white;
+
+    return Padding(
+      padding: const EdgeInsets.only(left: 12.0),
+      child: ElevatedButton(
+        style: ElevatedButton.styleFrom(
+          backgroundColor: backgroundColor,
+          shape: const CircleBorder(),
+          iconSize: 22,
+          iconColor: foregroundColor,
+          padding: EdgeInsets.zero,
+          elevation: isShowingSheet ? 4 : 0,
+        ),
+        onPressed: context.maybePop,
+        child: const Icon(Icons.arrow_back_rounded),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 947cc7df5b..0c197ca683 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -56,7 +56,10 @@ class ActionNotifier extends Notifier<void> {
     final Set<BaseAsset> assets = switch (source) {
       ActionSource.timeline =>
         ref.read(multiSelectProvider.select((s) => s.selectedAssets)),
-      ActionSource.viewer => {ref.read(currentAssetNotifier)},
+      ActionSource.viewer => switch (ref.read(currentAssetNotifier)) {
+          BaseAsset asset => {asset},
+          null => {},
+        },
     };
 
     return switch (T) {
diff --git a/mobile/lib/providers/infrastructure/asset.provider.dart b/mobile/lib/providers/infrastructure/asset.provider.dart
index 860af134ae..0015986243 100644
--- a/mobile/lib/providers/infrastructure/asset.provider.dart
+++ b/mobile/lib/providers/infrastructure/asset.provider.dart
@@ -15,5 +15,6 @@ final remoteAssetRepositoryProvider = Provider<RemoteAssetRepository>(
 final assetServiceProvider = Provider(
   (ref) => AssetService(
     remoteAssetRepository: ref.watch(remoteAssetRepositoryProvider),
+    localAssetRepository: ref.watch(localAssetRepository),
   ),
 );
diff --git a/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart b/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart
index 1ce6c740f9..996d5d816f 100644
--- a/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart
+++ b/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart
@@ -1,36 +1,48 @@
+import 'dart:async';
+
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 
 final currentAssetNotifier =
-    AutoDisposeNotifierProvider<CurrentAssetNotifier, BaseAsset>(
+    AutoDisposeNotifierProvider<CurrentAssetNotifier, BaseAsset?>(
   CurrentAssetNotifier.new,
 );
 
-class CurrentAssetNotifier extends AutoDisposeNotifier<BaseAsset> {
+class CurrentAssetNotifier extends AutoDisposeNotifier<BaseAsset?> {
   KeepAliveLink? _keepAliveLink;
+  StreamSubscription<BaseAsset?>? _assetSubscription;
 
   @override
-  BaseAsset build() {
-    throw UnimplementedError(
-      'An asset must be set before using the currentAssetProvider.',
-    );
-  }
+  BaseAsset? build() => null;
 
   void setAsset(BaseAsset asset) {
     _keepAliveLink?.close();
+    _assetSubscription?.cancel();
     state = asset;
+    _assetSubscription = ref
+        .watch(assetServiceProvider)
+        .watchAsset(asset)
+        .listen((updatedAsset) {
+      if (updatedAsset != null) {
+        state = updatedAsset;
+      }
+    });
     _keepAliveLink = ref.keepAlive();
   }
 
   void dispose() {
     _keepAliveLink?.close();
+    _assetSubscription?.cancel();
   }
 }
 
 final currentAssetExifProvider = FutureProvider.autoDispose(
   (ref) {
     final currentAsset = ref.watch(currentAssetNotifier);
+    if (currentAsset == null) {
+      return null;
+    }
     return ref.watch(assetServiceProvider).getExif(currentAsset);
   },
 );

From fb384fe90bd4c4996891ffca590506ae23e21899 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Sat, 5 Jul 2025 10:52:39 +0800
Subject: [PATCH 132/337] fix(web): viewing asset lock (#19499)

* fix(web): viewing asset lock

* fix: lint

* make mutex stateless

---------

Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
---
 web/package-lock.json                                | 10 ++++++++++
 web/package.json                                     |  1 +
 web/src/lib/components/photos-page/asset-grid.svelte |  7 ++++++-
 web/src/lib/stores/asset-viewing.store.ts            |  3 +++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index e998a46a10..82942102fb 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -20,6 +20,7 @@
         "@photo-sphere-viewer/settings-plugin": "^5.11.5",
         "@photo-sphere-viewer/video-plugin": "^5.11.5",
         "@zoom-image/svelte": "^0.3.0",
+        "async-mutex": "^0.5.0",
         "dom-to-image": "^2.6.0",
         "fabric": "^6.5.4",
         "geojson": "^0.5.0",
@@ -3924,6 +3925,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/async-mutex": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz",
+      "integrity": "sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
diff --git a/web/package.json b/web/package.json
index 08afe31762..2ad2a8361a 100644
--- a/web/package.json
+++ b/web/package.json
@@ -37,6 +37,7 @@
     "@photo-sphere-viewer/settings-plugin": "^5.11.5",
     "@photo-sphere-viewer/video-plugin": "^5.11.5",
     "@zoom-image/svelte": "^0.3.0",
+    "async-mutex": "^0.5.0",
     "dom-to-image": "^2.6.0",
     "fabric": "^6.5.4",
     "geojson": "^0.5.0",
diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelte
index cf8f0fb879..2d40857f99 100644
--- a/web/src/lib/components/photos-page/asset-grid.svelte
+++ b/web/src/lib/components/photos-page/asset-grid.svelte
@@ -91,7 +91,7 @@
     empty,
   }: Props = $props();
 
-  let { isViewing: showAssetViewer, asset: viewingAsset, preloadAssets, gridScrollTarget } = assetViewingStore;
+  let { isViewing: showAssetViewer, asset: viewingAsset, preloadAssets, gridScrollTarget, mutex } = assetViewingStore;
 
   let element: HTMLElement | undefined = $state();
 
@@ -438,6 +438,7 @@
   };
 
   const handlePrevious = async () => {
+    const release = await mutex.acquire();
     const laterAsset = await timelineManager.getLaterAsset($viewingAsset);
 
     if (laterAsset) {
@@ -447,11 +448,14 @@
       await navigate({ targetRoute: 'current', assetId: laterAsset.id });
     }
 
+    release();
     return !!laterAsset;
   };
 
   const handleNext = async () => {
+    const release = await mutex.acquire();
     const earlierAsset = await timelineManager.getEarlierAsset($viewingAsset);
+
     if (earlierAsset) {
       const preloadAsset = await timelineManager.getEarlierAsset(earlierAsset);
       const asset = await getAssetInfo({ id: earlierAsset.id, key: authManager.key });
@@ -459,6 +463,7 @@
       await navigate({ targetRoute: 'current', assetId: earlierAsset.id });
     }
 
+    release();
     return !!earlierAsset;
   };
 
diff --git a/web/src/lib/stores/asset-viewing.store.ts b/web/src/lib/stores/asset-viewing.store.ts
index 2cd20d9d20..997f6d20fa 100644
--- a/web/src/lib/stores/asset-viewing.store.ts
+++ b/web/src/lib/stores/asset-viewing.store.ts
@@ -2,12 +2,14 @@ import { authManager } from '$lib/managers/auth-manager.svelte';
 import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
 import { type AssetGridRouteSearchParams } from '$lib/utils/navigation';
 import { getAssetInfo, type AssetResponseDto } from '@immich/sdk';
+import { Mutex } from 'async-mutex';
 import { readonly, writable } from 'svelte/store';
 
 function createAssetViewingStore() {
   const viewingAssetStoreState = writable<AssetResponseDto>();
   const preloadAssets = writable<TimelineAsset[]>([]);
   const viewState = writable<boolean>(false);
+  const viewingAssetMutex = new Mutex();
   const gridScrollTarget = writable<AssetGridRouteSearchParams | null | undefined>();
 
   const setAsset = (asset: AssetResponseDto, assetsToPreload: TimelineAsset[] = []) => {
@@ -28,6 +30,7 @@ function createAssetViewingStore() {
 
   return {
     asset: readonly(viewingAssetStoreState),
+    mutex: viewingAssetMutex,
     preloadAssets: readonly(preloadAssets),
     isViewing: viewState,
     gridScrollTarget,

From 2f5d75ce2109d085da730874dcb5962666ddfcfc Mon Sep 17 00:00:00 2001
From: OffsetMonkey538 <offsetmonkey538@gmail.com>
Date: Sat, 5 Jul 2025 18:52:22 +0300
Subject: [PATCH 133/337] docs: fix typo of webp listed under jpeg (#19743)

---
 docs/docs/features/supported-formats.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/features/supported-formats.md b/docs/docs/features/supported-formats.md
index e6fb2c8f00..16f1ab0b6b 100644
--- a/docs/docs/features/supported-formats.md
+++ b/docs/docs/features/supported-formats.md
@@ -16,7 +16,7 @@ For the full list, refer to the [Immich source code](https://github.com/immich-a
 | `HEIC`      | `.heic`                       | :white_check_mark: |                 |
 | `HEIF`      | `.heif`                       | :white_check_mark: |                 |
 | `JPEG 2000` | `.jp2`                        | :white_check_mark: |                 |
-| `JPEG`      | `.webp` `.jpg` `.jpe` `.insp` | :white_check_mark: |                 |
+| `JPEG`      | `.jpeg` `.jpg` `.jpe` `.insp` | :white_check_mark: |                 |
 | `JPEG XL`   | `.jxl`                        | :white_check_mark: |                 |
 | `PNG`       | `.png`                        | :white_check_mark: |                 |
 | `PSD`       | `.psd`                        | :white_check_mark: | Adobe Photoshop |

From 4ce9bce414b0a66cd2fc083ff3edb79bc2578d29 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Mon, 7 Jul 2025 00:45:32 +0200
Subject: [PATCH 134/337] feat: oauth role claim (#19758)

---
 docs/docs/administration/oauth.md             |  1 +
 e2e/src/api/specs/oauth.e2e-spec.ts           | 15 ++++
 e2e/src/setup/auth-server.ts                  | 17 +++-
 i18n/en.json                                  |  2 +
 .../lib/model/system_config_o_auth_dto.dart   | 10 ++-
 open-api/immich-openapi-specs.json            |  4 +
 open-api/typescript-sdk/src/fetch-client.ts   |  1 +
 server/src/config.ts                          |  2 +
 server/src/dtos/system-config.dto.ts          |  3 +
 server/src/services/auth.service.spec.ts      | 89 +++++++++++++++++++
 server/src/services/auth.service.ts           |  8 +-
 .../services/system-config.service.spec.ts    |  1 +
 .../settings/auth/auth-settings.svelte        | 10 +++
 13 files changed, 160 insertions(+), 3 deletions(-)

diff --git a/docs/docs/administration/oauth.md b/docs/docs/administration/oauth.md
index 5105d2eb75..833b70f77a 100644
--- a/docs/docs/administration/oauth.md
+++ b/docs/docs/administration/oauth.md
@@ -62,6 +62,7 @@ Once you have a new OAuth client application configured, Immich can be configure
 | Scope                                                | string  | openid email profile | Full list of scopes to send with the request (space delimited)                      |
 | Signing Algorithm                                    | string  | RS256                | The algorithm used to sign the id token (examples: RS256, HS256)                    |
 | Storage Label Claim                                  | string  | preferred_username   | Claim mapping for the user's storage label**¹**                                     |
+| Role Claim                                           | string  | immich_role          | Claim mapping for the user's role. (should return "user" or "admin")**¹**           |
 | Storage Quota Claim                                  | string  | immich_quota         | Claim mapping for the user's storage**¹**                                           |
 | Default Storage Quota (GiB)                          | number  | 0                    | Default quota for user without storage quota claim (Enter 0 for unlimited quota)    |
 | Button Text                                          | string  | Login with OAuth     | Text for the OAuth button on the web                                                |
diff --git a/e2e/src/api/specs/oauth.e2e-spec.ts b/e2e/src/api/specs/oauth.e2e-spec.ts
index 9e4d64892e..58fc43a2d5 100644
--- a/e2e/src/api/specs/oauth.e2e-spec.ts
+++ b/e2e/src/api/specs/oauth.e2e-spec.ts
@@ -227,6 +227,21 @@ describe(`/oauth`, () => {
       expect(user.storageLabel).toBe('user-username');
     });
 
+    it('should set the admin status from a role claim', async () => {
+      const callbackParams = await loginWithOAuth(OAuthUser.WITH_ROLE);
+      const { status, body } = await request(app).post('/oauth/callback').send(callbackParams);
+      expect(status).toBe(201);
+      expect(body).toMatchObject({
+        accessToken: expect.any(String),
+        userId: expect.any(String),
+        userEmail: 'oauth-with-role@immich.app',
+        isAdmin: true,
+      });
+
+      const user = await getMyUser({ headers: asBearerAuth(body.accessToken) });
+      expect(user.isAdmin).toBe(true);
+    });
+
     it('should work with RS256 signed tokens', async () => {
       await setupOAuth(admin.accessToken, {
         enabled: true,
diff --git a/e2e/src/setup/auth-server.ts b/e2e/src/setup/auth-server.ts
index 575e97d291..489bda2ee4 100644
--- a/e2e/src/setup/auth-server.ts
+++ b/e2e/src/setup/auth-server.ts
@@ -12,6 +12,7 @@ export enum OAuthUser {
   NO_NAME = 'no-name',
   WITH_QUOTA = 'with-quota',
   WITH_USERNAME = 'with-username',
+  WITH_ROLE = 'with-role',
 }
 
 const claims = [
@@ -34,6 +35,12 @@ const claims = [
     preferred_username: 'user-quota',
     immich_quota: 25,
   },
+  {
+    sub: OAuthUser.WITH_ROLE,
+    email: 'oauth-with-role@immich.app',
+    email_verified: true,
+    immich_role: 'admin',
+  },
 ];
 
 const withDefaultClaims = (sub: string) => ({
@@ -64,7 +71,15 @@ const setup = async () => {
     claims: {
       openid: ['sub'],
       email: ['email', 'email_verified'],
-      profile: ['name', 'given_name', 'family_name', 'preferred_username', 'immich_quota', 'immich_username'],
+      profile: [
+        'name',
+        'given_name',
+        'family_name',
+        'preferred_username',
+        'immich_quota',
+        'immich_username',
+        'immich_role',
+      ],
     },
     features: {
       jwtUserinfo: {
diff --git a/i18n/en.json b/i18n/en.json
index 91a55cc85f..e5c995f957 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -196,6 +196,8 @@
     "oauth_mobile_redirect_uri": "Mobile redirect URI",
     "oauth_mobile_redirect_uri_override": "Mobile redirect URI override",
     "oauth_mobile_redirect_uri_override_description": "Enable when OAuth provider does not allow a mobile URI, like ''{callback}''",
+    "oauth_role_claim": "Role Claim",
+    "oauth_role_claim_description": "Automatically grant admin access based on the presence of this claim. The claim may have either 'user' or 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Manage OAuth login settings",
     "oauth_settings_more_details": "For more details about this feature, refer to the <link>docs</link>.",
diff --git a/mobile/openapi/lib/model/system_config_o_auth_dto.dart b/mobile/openapi/lib/model/system_config_o_auth_dto.dart
index e100e8e5ca..c8f91be1f1 100644
--- a/mobile/openapi/lib/model/system_config_o_auth_dto.dart
+++ b/mobile/openapi/lib/model/system_config_o_auth_dto.dart
@@ -24,6 +24,7 @@ class SystemConfigOAuthDto {
     required this.mobileOverrideEnabled,
     required this.mobileRedirectUri,
     required this.profileSigningAlgorithm,
+    required this.roleClaim,
     required this.scope,
     required this.signingAlgorithm,
     required this.storageLabelClaim,
@@ -55,6 +56,8 @@ class SystemConfigOAuthDto {
 
   String profileSigningAlgorithm;
 
+  String roleClaim;
+
   String scope;
 
   String signingAlgorithm;
@@ -81,6 +84,7 @@ class SystemConfigOAuthDto {
     other.mobileOverrideEnabled == mobileOverrideEnabled &&
     other.mobileRedirectUri == mobileRedirectUri &&
     other.profileSigningAlgorithm == profileSigningAlgorithm &&
+    other.roleClaim == roleClaim &&
     other.scope == scope &&
     other.signingAlgorithm == signingAlgorithm &&
     other.storageLabelClaim == storageLabelClaim &&
@@ -102,6 +106,7 @@ class SystemConfigOAuthDto {
     (mobileOverrideEnabled.hashCode) +
     (mobileRedirectUri.hashCode) +
     (profileSigningAlgorithm.hashCode) +
+    (roleClaim.hashCode) +
     (scope.hashCode) +
     (signingAlgorithm.hashCode) +
     (storageLabelClaim.hashCode) +
@@ -110,7 +115,7 @@ class SystemConfigOAuthDto {
     (tokenEndpointAuthMethod.hashCode);
 
   @override
-  String toString() => 'SystemConfigOAuthDto[autoLaunch=$autoLaunch, autoRegister=$autoRegister, buttonText=$buttonText, clientId=$clientId, clientSecret=$clientSecret, defaultStorageQuota=$defaultStorageQuota, enabled=$enabled, issuerUrl=$issuerUrl, mobileOverrideEnabled=$mobileOverrideEnabled, mobileRedirectUri=$mobileRedirectUri, profileSigningAlgorithm=$profileSigningAlgorithm, scope=$scope, signingAlgorithm=$signingAlgorithm, storageLabelClaim=$storageLabelClaim, storageQuotaClaim=$storageQuotaClaim, timeout=$timeout, tokenEndpointAuthMethod=$tokenEndpointAuthMethod]';
+  String toString() => 'SystemConfigOAuthDto[autoLaunch=$autoLaunch, autoRegister=$autoRegister, buttonText=$buttonText, clientId=$clientId, clientSecret=$clientSecret, defaultStorageQuota=$defaultStorageQuota, enabled=$enabled, issuerUrl=$issuerUrl, mobileOverrideEnabled=$mobileOverrideEnabled, mobileRedirectUri=$mobileRedirectUri, profileSigningAlgorithm=$profileSigningAlgorithm, roleClaim=$roleClaim, scope=$scope, signingAlgorithm=$signingAlgorithm, storageLabelClaim=$storageLabelClaim, storageQuotaClaim=$storageQuotaClaim, timeout=$timeout, tokenEndpointAuthMethod=$tokenEndpointAuthMethod]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -129,6 +134,7 @@ class SystemConfigOAuthDto {
       json[r'mobileOverrideEnabled'] = this.mobileOverrideEnabled;
       json[r'mobileRedirectUri'] = this.mobileRedirectUri;
       json[r'profileSigningAlgorithm'] = this.profileSigningAlgorithm;
+      json[r'roleClaim'] = this.roleClaim;
       json[r'scope'] = this.scope;
       json[r'signingAlgorithm'] = this.signingAlgorithm;
       json[r'storageLabelClaim'] = this.storageLabelClaim;
@@ -158,6 +164,7 @@ class SystemConfigOAuthDto {
         mobileOverrideEnabled: mapValueOfType<bool>(json, r'mobileOverrideEnabled')!,
         mobileRedirectUri: mapValueOfType<String>(json, r'mobileRedirectUri')!,
         profileSigningAlgorithm: mapValueOfType<String>(json, r'profileSigningAlgorithm')!,
+        roleClaim: mapValueOfType<String>(json, r'roleClaim')!,
         scope: mapValueOfType<String>(json, r'scope')!,
         signingAlgorithm: mapValueOfType<String>(json, r'signingAlgorithm')!,
         storageLabelClaim: mapValueOfType<String>(json, r'storageLabelClaim')!,
@@ -222,6 +229,7 @@ class SystemConfigOAuthDto {
     'mobileOverrideEnabled',
     'mobileRedirectUri',
     'profileSigningAlgorithm',
+    'roleClaim',
     'scope',
     'signingAlgorithm',
     'storageLabelClaim',
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 0dc0c43ec8..7a44a5cf6f 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -14654,6 +14654,9 @@
           "profileSigningAlgorithm": {
             "type": "string"
           },
+          "roleClaim": {
+            "type": "string"
+          },
           "scope": {
             "type": "string"
           },
@@ -14690,6 +14693,7 @@
           "mobileOverrideEnabled",
           "mobileRedirectUri",
           "profileSigningAlgorithm",
+          "roleClaim",
           "scope",
           "signingAlgorithm",
           "storageLabelClaim",
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 24f9a6d75d..9eb9990d2c 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1398,6 +1398,7 @@ export type SystemConfigOAuthDto = {
     mobileOverrideEnabled: boolean;
     mobileRedirectUri: string;
     profileSigningAlgorithm: string;
+    roleClaim: string;
     scope: string;
     signingAlgorithm: string;
     storageLabelClaim: string;
diff --git a/server/src/config.ts b/server/src/config.ts
index ae4bdcd906..1fcc2e9782 100644
--- a/server/src/config.ts
+++ b/server/src/config.ts
@@ -101,6 +101,7 @@ export interface SystemConfig {
     timeout: number;
     storageLabelClaim: string;
     storageQuotaClaim: string;
+    roleClaim: string;
   };
   passwordLogin: {
     enabled: boolean;
@@ -263,6 +264,7 @@ export const defaults = Object.freeze<SystemConfig>({
     profileSigningAlgorithm: 'none',
     storageLabelClaim: 'preferred_username',
     storageQuotaClaim: 'immich_quota',
+    roleClaim: 'immich_role',
     tokenEndpointAuthMethod: OAuthTokenEndpointAuthMethod.CLIENT_SECRET_POST,
     timeout: 30_000,
   },
diff --git a/server/src/dtos/system-config.dto.ts b/server/src/dtos/system-config.dto.ts
index 03ef9192db..b0385984b4 100644
--- a/server/src/dtos/system-config.dto.ts
+++ b/server/src/dtos/system-config.dto.ts
@@ -395,6 +395,9 @@ class SystemConfigOAuthDto {
 
   @IsString()
   storageQuotaClaim!: string;
+
+  @IsString()
+  roleClaim!: string;
 }
 
 class SystemConfigPasswordLoginDto {
diff --git a/server/src/services/auth.service.spec.ts b/server/src/services/auth.service.spec.ts
index 3568bb9d6b..85c9f07815 100644
--- a/server/src/services/auth.service.spec.ts
+++ b/server/src/services/auth.service.spec.ts
@@ -711,6 +711,7 @@ describe(AuthService.name, () => {
 
       expect(mocks.user.create).toHaveBeenCalledWith({
         email: user.email,
+        isAdmin: false,
         name: ' ',
         oauthId: user.oauthId,
         quotaSizeInBytes: 0,
@@ -739,6 +740,7 @@ describe(AuthService.name, () => {
 
       expect(mocks.user.create).toHaveBeenCalledWith({
         email: user.email,
+        isAdmin: false,
         name: ' ',
         oauthId: user.oauthId,
         quotaSizeInBytes: 5_368_709_120,
@@ -805,6 +807,93 @@ describe(AuthService.name, () => {
       expect(mocks.user.update).not.toHaveBeenCalled();
       expect(mocks.oauth.getProfilePicture).not.toHaveBeenCalled();
     });
+
+    it('should only allow "admin" and "user" for the role claim', async () => {
+      const user = factory.userAdmin({ oauthId: 'oauth-id' });
+
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithAutoRegister);
+      mocks.oauth.getProfile.mockResolvedValue({ sub: user.oauthId, email: user.email, immich_role: 'foo' });
+      mocks.user.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getAdmin.mockResolvedValue(factory.userAdmin({ isAdmin: true }));
+      mocks.user.getByOAuthId.mockResolvedValue(void 0);
+      mocks.user.create.mockResolvedValue(user);
+      mocks.session.create.mockResolvedValue(factory.session());
+
+      await expect(
+        sut.callback(
+          { url: 'http://immich/auth/login?code=abc123', state: 'xyz789', codeVerifier: 'foo' },
+          {},
+          loginDetails,
+        ),
+      ).resolves.toEqual(oauthResponse(user));
+
+      expect(mocks.user.create).toHaveBeenCalledWith({
+        email: user.email,
+        name: ' ',
+        oauthId: user.oauthId,
+        quotaSizeInBytes: null,
+        storageLabel: null,
+        isAdmin: false,
+      });
+    });
+
+    it('should create an admin user if the role claim is set to admin', async () => {
+      const user = factory.userAdmin({ oauthId: 'oauth-id' });
+
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithAutoRegister);
+      mocks.oauth.getProfile.mockResolvedValue({ sub: user.oauthId, email: user.email, immich_role: 'admin' });
+      mocks.user.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getByOAuthId.mockResolvedValue(void 0);
+      mocks.user.create.mockResolvedValue(user);
+      mocks.session.create.mockResolvedValue(factory.session());
+
+      await expect(
+        sut.callback(
+          { url: 'http://immich/auth/login?code=abc123', state: 'xyz789', codeVerifier: 'foo' },
+          {},
+          loginDetails,
+        ),
+      ).resolves.toEqual(oauthResponse(user));
+
+      expect(mocks.user.create).toHaveBeenCalledWith({
+        email: user.email,
+        name: ' ',
+        oauthId: user.oauthId,
+        quotaSizeInBytes: null,
+        storageLabel: null,
+        isAdmin: true,
+      });
+    });
+
+    it('should accept a custom role claim', async () => {
+      const user = factory.userAdmin({ oauthId: 'oauth-id' });
+
+      mocks.systemMetadata.get.mockResolvedValue({
+        oauth: { ...systemConfigStub.oauthWithAutoRegister, roleClaim: 'my_role' },
+      });
+      mocks.oauth.getProfile.mockResolvedValue({ sub: user.oauthId, email: user.email, my_role: 'admin' });
+      mocks.user.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getByOAuthId.mockResolvedValue(void 0);
+      mocks.user.create.mockResolvedValue(user);
+      mocks.session.create.mockResolvedValue(factory.session());
+
+      await expect(
+        sut.callback(
+          { url: 'http://immich/auth/login?code=abc123', state: 'xyz789', codeVerifier: 'foo' },
+          {},
+          loginDetails,
+        ),
+      ).resolves.toEqual(oauthResponse(user));
+
+      expect(mocks.user.create).toHaveBeenCalledWith({
+        email: user.email,
+        name: ' ',
+        oauthId: user.oauthId,
+        quotaSizeInBytes: null,
+        storageLabel: null,
+        isAdmin: true,
+      });
+    });
   });
 
   describe('link', () => {
diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
index 70da8d81d3..ec3415ec8c 100644
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -250,7 +250,7 @@ export class AuthService extends BaseService {
     const { oauth } = await this.getConfig({ withCache: false });
     const url = this.resolveRedirectUri(oauth, dto.url);
     const profile = await this.oauthRepository.getProfile(oauth, url, expectedState, codeVerifier);
-    const { autoRegister, defaultStorageQuota, storageLabelClaim, storageQuotaClaim } = oauth;
+    const { autoRegister, defaultStorageQuota, storageLabelClaim, storageQuotaClaim, roleClaim } = oauth;
     this.logger.debug(`Logging in with OAuth: ${JSON.stringify(profile)}`);
     let user: UserAdmin | undefined = await this.userRepository.getByOAuthId(profile.sub);
 
@@ -290,6 +290,11 @@ export class AuthService extends BaseService {
         default: defaultStorageQuota,
         isValid: (value: unknown) => Number(value) >= 0,
       });
+      const role = this.getClaim<'admin' | 'user'>(profile, {
+        key: roleClaim,
+        default: 'user',
+        isValid: (value: unknown) => isString(value) && ['admin', 'user'].includes(value),
+      });
 
       const userName = profile.name ?? `${profile.given_name || ''} ${profile.family_name || ''}`;
       user = await this.createUser({
@@ -298,6 +303,7 @@ export class AuthService extends BaseService {
         oauthId: profile.sub,
         quotaSizeInBytes: storageQuota === null ? null : storageQuota * HumanReadableSize.GiB,
         storageLabel: storageLabel || null,
+        isAdmin: role === 'admin',
       });
     }
 
diff --git a/server/src/services/system-config.service.spec.ts b/server/src/services/system-config.service.spec.ts
index 87bd92129e..c7b98cc990 100644
--- a/server/src/services/system-config.service.spec.ts
+++ b/server/src/services/system-config.service.spec.ts
@@ -124,6 +124,7 @@ const updatedConfig = Object.freeze<SystemConfig>({
     timeout: 30_000,
     storageLabelClaim: 'preferred_username',
     storageQuotaClaim: 'immich_quota',
+    roleClaim: 'immich_role',
   },
   passwordLogin: {
     enabled: true,
diff --git a/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte b/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte
index f0dbc1a2da..a1926b4020 100644
--- a/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte
+++ b/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte
@@ -167,6 +167,16 @@
                 isEdited={!(config.oauth.storageLabelClaim == savedConfig.oauth.storageLabelClaim)}
               />
 
+              <SettingInputField
+                inputType={SettingInputFieldType.TEXT}
+                label={$t('admin.oauth_role_claim').toUpperCase()}
+                description={$t('admin.oauth_role_claim_description')}
+                bind:value={config.oauth.roleClaim}
+                required={true}
+                disabled={disabled || !config.oauth.enabled}
+                isEdited={!(config.oauth.roleClaim == savedConfig.oauth.roleClaim)}
+              />
+
               <SettingInputField
                 inputType={SettingInputFieldType.TEXT}
                 label={$t('admin.oauth_storage_quota_claim').toUpperCase()}

From cc471806fe63f0eafe30d9a869527a4a395ff8ba Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:01:09 +0800
Subject: [PATCH 135/337] feat(mobile): stack sync (#19735)

* feat(mobile): stack sync

* fix: lint

* Update mobile/lib/infrastructure/repositories/sync_api.repository.dart

Co-authored-by: Alex <alex.tran1502@gmail.com>

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../drift_schemas/main/drift_schema_v1.json   | 1332 +----------------
 mobile/lib/domain/models/stack.model.dart     |   84 ++
 .../domain/services/sync_stream.service.dart  |   19 +
 .../infrastructure/entities/stack.entity.dart |   22 +
 .../entities/stack.entity.drift.dart          |  706 +++++++++
 .../repositories/db.repository.dart           |    2 +
 .../repositories/db.repository.drift.dart     |   23 +-
 .../repositories/stack.repository.dart        |   30 +
 .../repositories/sync_api.repository.dart     |    7 +
 .../repositories/sync_stream.repository.dart  |  106 +-
 .../pages/dev/feat_in_development.page.dart   |    3 +
 .../pages/dev/media_stat.page.dart            |    4 +
 mobile/lib/providers/stack.provider.dart      |    7 +
 mobile/lib/repositories/auth.repository.dart  |    3 +
 .../services/sync_stream_service_test.dart    |   12 +
 15 files changed, 992 insertions(+), 1368 deletions(-)
 create mode 100644 mobile/lib/domain/models/stack.model.dart
 create mode 100644 mobile/lib/infrastructure/entities/stack.entity.dart
 create mode 100644 mobile/lib/infrastructure/entities/stack.entity.drift.dart
 create mode 100644 mobile/lib/infrastructure/repositories/stack.repository.dart
 create mode 100644 mobile/lib/providers/stack.provider.dart

diff --git a/mobile/drift_schemas/main/drift_schema_v1.json b/mobile/drift_schemas/main/drift_schema_v1.json
index 32ba52e366..493a34cc94 100644
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
@@ -1,1331 +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": "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": "email",
-            "getter_name": "email",
-            "moor_type": "string",
-            "nullable": false,
-            "customConstraints": null,
-            "default_dart": null,
-            "default_client_dart": null,
-            "dsl_features": []
-          },
-          {
-            "name": "profile_image_path",
-            "getter_name": "profileImagePath",
-            "moor_type": "string",
-            "nullable": true,
-            "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": "quota_size_in_bytes",
-            "getter_name": "quotaSizeInBytes",
-            "moor_type": "int",
-            "nullable": true,
-            "customConstraints": null,
-            "default_dart": null,
-            "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": []
-          }
-        ],
-        "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": "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"
-            }
-          }
-        ],
-        "is_virtual": false,
-        "without_rowid": true,
-        "constraints": [],
-        "strict": true,
-        "explicit_pk": ["id"]
-      }
-    },
-    {
-      "id": 2,
-      "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": []
-          }
-        ],
-        "is_virtual": false,
-        "without_rowid": true,
-        "constraints": [],
-        "strict": true,
-        "explicit_pk": ["id"]
-      }
-    },
-    {
-      "id": 3,
-      "references": [2],
-      "type": "index",
-      "data": {
-        "on": 2,
-        "name": "idx_local_asset_checksum",
-        "sql": null,
-        "unique": false,
-        "columns": ["checksum"]
-      }
-    },
-    {
-      "id": 4,
-      "references": [1],
-      "type": "index",
-      "data": {
-        "on": 1,
-        "name": "UQ_remote_asset_owner_checksum",
-        "sql": null,
-        "unique": true,
-        "columns": ["checksum", "owner_id"]
-      }
-    },
-    {
-      "id": 5,
-      "references": [1],
-      "type": "index",
-      "data": {
-        "on": 1,
-        "name": "idx_remote_asset_checksum",
-        "sql": null,
-        "unique": false,
-        "columns": ["checksum"]
-      }
-    },
-    {
-      "id": 6,
-      "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": "preferences",
-            "getter_name": "preferences",
-            "moor_type": "string",
-            "nullable": false,
-            "customConstraints": null,
-            "default_dart": null,
-            "default_client_dart": null,
-            "dsl_features": [],
-            "type_converter": {
-              "dart_expr": "userPreferenceConverter",
-              "dart_type_name": "UserPreferences"
-            }
-          }
-        ],
-        "is_virtual": false,
-        "without_rowid": true,
-        "constraints": [],
-        "strict": true,
-        "explicit_pk": ["user_id"]
-      }
-    },
-    {
-      "id": 7,
-      "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": 8,
-      "references": [],
-      "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": "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": 9,
-      "references": [2, 8],
-      "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"]
-          }
-        ],
-        "is_virtual": false,
-        "without_rowid": true,
-        "constraints": [],
-        "strict": true,
-        "explicit_pk": ["asset_id", "album_id"]
-      }
-    },
-    {
-      "id": 10,
-      "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": "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": 11,
-      "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": 12,
-      "references": [1, 11],
-      "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": 13,
-      "references": [11, 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": 14,
-      "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<MemoryType>(MemoryType.values)",
-              "dart_type_name": "MemoryType"
-            }
-          },
-          {
-            "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": 15,
-      "references": [1, 14],
-      "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"]
-      }
-    }
-  ]
-}
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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":14,"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":15,"references":[1,14],"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":16,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}}]}
\ No newline at end of file
diff --git a/mobile/lib/domain/models/stack.model.dart b/mobile/lib/domain/models/stack.model.dart
new file mode 100644
index 0000000000..5404eb8f42
--- /dev/null
+++ b/mobile/lib/domain/models/stack.model.dart
@@ -0,0 +1,84 @@
+import 'dart:convert';
+
+// Model for a stack stored in the server
+class Stack {
+  final String id;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final String ownerId;
+  final String primaryAssetId;
+
+  const Stack({
+    required this.id,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.ownerId,
+    required this.primaryAssetId,
+  });
+
+  Stack copyWith({
+    String? id,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    String? ownerId,
+    String? primaryAssetId,
+  }) {
+    return Stack(
+      id: id ?? this.id,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      ownerId: ownerId ?? this.ownerId,
+      primaryAssetId: primaryAssetId ?? this.primaryAssetId,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'id': id,
+      'createdAt': createdAt.millisecondsSinceEpoch,
+      'updatedAt': updatedAt.millisecondsSinceEpoch,
+      'ownerId': ownerId,
+      'primaryAssetId': primaryAssetId,
+    };
+  }
+
+  factory Stack.fromMap(Map<String, dynamic> map) {
+    return Stack(
+      id: map['id'] as String,
+      createdAt: DateTime.fromMillisecondsSinceEpoch(map['createdAt'] as int),
+      updatedAt: DateTime.fromMillisecondsSinceEpoch(map['updatedAt'] as int),
+      ownerId: map['ownerId'] as String,
+      primaryAssetId: map['primaryAssetId'] as String,
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory Stack.fromJson(String source) =>
+      Stack.fromMap(json.decode(source) as Map<String, dynamic>);
+
+  @override
+  String toString() {
+    return 'Stack(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, ownerId: $ownerId, primaryAssetId: $primaryAssetId)';
+  }
+
+  @override
+  bool operator ==(covariant Stack other) {
+    if (identical(this, other)) return true;
+
+    return other.id == id &&
+        other.createdAt == createdAt &&
+        other.updatedAt == updatedAt &&
+        other.ownerId == ownerId &&
+        other.primaryAssetId == primaryAssetId;
+  }
+
+  @override
+  int get hashCode {
+    return id.hashCode ^
+        createdAt.hashCode ^
+        updatedAt.hashCode ^
+        ownerId.hashCode ^
+        primaryAssetId.hashCode;
+  }
+}
diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index c4e40726b5..ee0ec6c44f 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -154,6 +154,25 @@ class SyncStreamService {
         return _syncStreamRepository.updateMemoryAssetsV1(data.cast());
       case SyncEntityType.memoryToAssetDeleteV1:
         return _syncStreamRepository.deleteMemoryAssetsV1(data.cast());
+      case SyncEntityType.stackV1:
+        return _syncStreamRepository.updateStacksV1(data.cast());
+      case SyncEntityType.stackDeleteV1:
+        return _syncStreamRepository.deleteStacksV1(data.cast());
+      case SyncEntityType.partnerStackV1:
+        return _syncStreamRepository.updateStacksV1(
+          data.cast(),
+          debugLabel: 'partner',
+        );
+      case SyncEntityType.partnerStackBackfillV1:
+        return _syncStreamRepository.updateStacksV1(
+          data.cast(),
+          debugLabel: 'partner backfill',
+        );
+      case SyncEntityType.partnerStackDeleteV1:
+        return _syncStreamRepository.deleteStacksV1(
+          data.cast(),
+          debugLabel: 'partner',
+        );
       default:
         _logger.warning("Unknown sync data type: $type");
     }
diff --git a/mobile/lib/infrastructure/entities/stack.entity.dart b/mobile/lib/infrastructure/entities/stack.entity.dart
new file mode 100644
index 0000000000..92375f19db
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/stack.entity.dart
@@ -0,0 +1,22 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class StackEntity extends Table with DriftDefaultsMixin {
+  const StackEntity();
+
+  TextColumn get id => text()();
+
+  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+
+  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+
+  TextColumn get ownerId =>
+      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get primaryAssetId => text().references(RemoteAssetEntity, #id)();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}
diff --git a/mobile/lib/infrastructure/entities/stack.entity.drift.dart b/mobile/lib/infrastructure/entities/stack.entity.drift.dart
new file mode 100644
index 0000000000..c0d000e02a
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/stack.entity.drift.dart
@@ -0,0 +1,706 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/stack.entity.dart' as i2;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
+import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
+    as i4;
+import 'package:drift/internal/modular.dart' as i5;
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
+    as i6;
+
+typedef $$StackEntityTableCreateCompanionBuilder = i1.StackEntityCompanion
+    Function({
+  required String id,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  required String ownerId,
+  required String primaryAssetId,
+});
+typedef $$StackEntityTableUpdateCompanionBuilder = i1.StackEntityCompanion
+    Function({
+  i0.Value<String> id,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  i0.Value<String> ownerId,
+  i0.Value<String> primaryAssetId,
+});
+
+final class $$StackEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase, i1.$StackEntityTable, i1.StackEntityData> {
+  $$StackEntityTableReferences(super.$_db, super.$_table, super.$_typedResult);
+
+  static i4.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
+      i5.ReadDatabaseContainer(db)
+          .resultSet<i4.$UserEntityTable>('user_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$StackEntityTable>('stack_entity')
+                  .ownerId,
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i4.$UserEntityTable>('user_entity')
+                  .id));
+
+  i4.$$UserEntityTableProcessedTableManager get ownerId {
+    final $_column = $_itemColumn<String>('owner_id')!;
+
+    final manager = i4
+        .$$UserEntityTableTableManager(
+            $_db,
+            i5.ReadDatabaseContainer($_db)
+                .resultSet<i4.$UserEntityTable>('user_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_ownerIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+
+  static i6.$RemoteAssetEntityTable _primaryAssetIdTable(
+          i0.GeneratedDatabase db) =>
+      i5.ReadDatabaseContainer(db)
+          .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$StackEntityTable>('stack_entity')
+                  .primaryAssetId,
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity')
+                  .id));
+
+  i6.$$RemoteAssetEntityTableProcessedTableManager get primaryAssetId {
+    final $_column = $_itemColumn<String>('primary_asset_id')!;
+
+    final manager = i6
+        .$$RemoteAssetEntityTableTableManager(
+            $_db,
+            i5.ReadDatabaseContainer($_db)
+                .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_primaryAssetIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$StackEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$StackEntityTable> {
+  $$StackEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnFilters(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));
+
+  i4.$$UserEntityTableFilterComposer get ownerId {
+    final i4.$$UserEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i4.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i4.$$UserEntityTableFilterComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i4.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i6.$$RemoteAssetEntityTableFilterComposer get primaryAssetId {
+    final i6.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.primaryAssetId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i6.$$RemoteAssetEntityTableFilterComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$StackEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$StackEntityTable> {
+  $$StackEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get id => $composableBuilder(
+      column: $table.id, 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));
+
+  i4.$$UserEntityTableOrderingComposer get ownerId {
+    final i4.$$UserEntityTableOrderingComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i4.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i4.$$UserEntityTableOrderingComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i4.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i6.$$RemoteAssetEntityTableOrderingComposer get primaryAssetId {
+    final i6.$$RemoteAssetEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.primaryAssetId,
+            referencedTable: i5.ReadDatabaseContainer($db)
+                .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i6.$$RemoteAssetEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i5.ReadDatabaseContainer($db)
+                      .resultSet<i6.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+}
+
+class $$StackEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$StackEntityTable> {
+  $$StackEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get id =>
+      $composableBuilder(column: $table.id, 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);
+
+  i4.$$UserEntityTableAnnotationComposer get ownerId {
+    final i4.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i4.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i4.$$UserEntityTableAnnotationComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i4.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i6.$$RemoteAssetEntityTableAnnotationComposer get primaryAssetId {
+    final i6.$$RemoteAssetEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.primaryAssetId,
+            referencedTable: i5.ReadDatabaseContainer($db)
+                .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i6.$$RemoteAssetEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i5.ReadDatabaseContainer($db)
+                      .resultSet<i6.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+}
+
+class $$StackEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$StackEntityTable,
+    i1.StackEntityData,
+    i1.$$StackEntityTableFilterComposer,
+    i1.$$StackEntityTableOrderingComposer,
+    i1.$$StackEntityTableAnnotationComposer,
+    $$StackEntityTableCreateCompanionBuilder,
+    $$StackEntityTableUpdateCompanionBuilder,
+    (i1.StackEntityData, i1.$$StackEntityTableReferences),
+    i1.StackEntityData,
+    i0.PrefetchHooks Function({bool ownerId, bool primaryAssetId})> {
+  $$StackEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$StackEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$StackEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$StackEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$StackEntityTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> id = const i0.Value.absent(),
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<String> ownerId = const i0.Value.absent(),
+            i0.Value<String> primaryAssetId = const i0.Value.absent(),
+          }) =>
+              i1.StackEntityCompanion(
+            id: id,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            ownerId: ownerId,
+            primaryAssetId: primaryAssetId,
+          ),
+          createCompanionCallback: ({
+            required String id,
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            required String ownerId,
+            required String primaryAssetId,
+          }) =>
+              i1.StackEntityCompanion.insert(
+            id: id,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            ownerId: ownerId,
+            primaryAssetId: primaryAssetId,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$StackEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({ownerId = false, primaryAssetId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (ownerId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.ownerId,
+                    referencedTable:
+                        i1.$$StackEntityTableReferences._ownerIdTable(db),
+                    referencedColumn:
+                        i1.$$StackEntityTableReferences._ownerIdTable(db).id,
+                  ) as T;
+                }
+                if (primaryAssetId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.primaryAssetId,
+                    referencedTable: i1.$$StackEntityTableReferences
+                        ._primaryAssetIdTable(db),
+                    referencedColumn: i1.$$StackEntityTableReferences
+                        ._primaryAssetIdTable(db)
+                        .id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$StackEntityTableProcessedTableManager = i0.ProcessedTableManager<
+    i0.GeneratedDatabase,
+    i1.$StackEntityTable,
+    i1.StackEntityData,
+    i1.$$StackEntityTableFilterComposer,
+    i1.$$StackEntityTableOrderingComposer,
+    i1.$$StackEntityTableAnnotationComposer,
+    $$StackEntityTableCreateCompanionBuilder,
+    $$StackEntityTableUpdateCompanionBuilder,
+    (i1.StackEntityData, i1.$$StackEntityTableReferences),
+    i1.StackEntityData,
+    i0.PrefetchHooks Function({bool ownerId, bool primaryAssetId})>;
+
+class $StackEntityTable extends i2.StackEntity
+    with i0.TableInfo<$StackEntityTable, i1.StackEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $StackEntityTable(this.attachedDatabase, [this._alias]);
+  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 _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: i3.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: i3.currentDateAndTime);
+  static const i0.VerificationMeta _ownerIdMeta =
+      const i0.VerificationMeta('ownerId');
+  @override
+  late final i0.GeneratedColumn<String> ownerId = i0.GeneratedColumn<String>(
+      'owner_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES user_entity (id) ON DELETE CASCADE'));
+  static const i0.VerificationMeta _primaryAssetIdMeta =
+      const i0.VerificationMeta('primaryAssetId');
+  @override
+  late final i0.GeneratedColumn<String> primaryAssetId =
+      i0.GeneratedColumn<String>(
+          'primary_asset_id', aliasedName, false,
+          type: i0.DriftSqlType.string,
+          requiredDuringInsert: true,
+          defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+              'REFERENCES remote_asset_entity (id)'));
+  @override
+  List<i0.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
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.StackEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    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('owner_id')) {
+      context.handle(_ownerIdMeta,
+          ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta));
+    } else if (isInserting) {
+      context.missing(_ownerIdMeta);
+    }
+    if (data.containsKey('primary_asset_id')) {
+      context.handle(
+          _primaryAssetIdMeta,
+          primaryAssetId.isAcceptableOrUnknown(
+              data['primary_asset_id']!, _primaryAssetIdMeta));
+    } else if (isInserting) {
+      context.missing(_primaryAssetIdMeta);
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.StackEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.StackEntityData(
+      id: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}id'])!,
+      createdAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
+      updatedAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      ownerId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}owner_id'])!,
+      primaryAssetId: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.string, data['${effectivePrefix}primary_asset_id'])!,
+    );
+  }
+
+  @override
+  $StackEntityTable createAlias(String alias) {
+    return $StackEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class StackEntityData extends i0.DataClass
+    implements i0.Insertable<i1.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, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<String>(id);
+    map['created_at'] = i0.Variable<DateTime>(createdAt);
+    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    map['owner_id'] = i0.Variable<String>(ownerId);
+    map['primary_asset_id'] = i0.Variable<String>(primaryAssetId);
+    return map;
+  }
+
+  factory StackEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.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({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.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),
+    };
+  }
+
+  i1.StackEntityData copyWith(
+          {String? id,
+          DateTime? createdAt,
+          DateTime? updatedAt,
+          String? ownerId,
+          String? primaryAssetId}) =>
+      i1.StackEntityData(
+        id: id ?? this.id,
+        createdAt: createdAt ?? this.createdAt,
+        updatedAt: updatedAt ?? this.updatedAt,
+        ownerId: ownerId ?? this.ownerId,
+        primaryAssetId: primaryAssetId ?? this.primaryAssetId,
+      );
+  StackEntityData copyWithCompanion(i1.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 i1.StackEntityData &&
+          other.id == this.id &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.ownerId == this.ownerId &&
+          other.primaryAssetId == this.primaryAssetId);
+}
+
+class StackEntityCompanion extends i0.UpdateCompanion<i1.StackEntityData> {
+  final i0.Value<String> id;
+  final i0.Value<DateTime> createdAt;
+  final i0.Value<DateTime> updatedAt;
+  final i0.Value<String> ownerId;
+  final i0.Value<String> primaryAssetId;
+  const StackEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    this.ownerId = const i0.Value.absent(),
+    this.primaryAssetId = const i0.Value.absent(),
+  });
+  StackEntityCompanion.insert({
+    required String id,
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    required String ownerId,
+    required String primaryAssetId,
+  })  : id = i0.Value(id),
+        ownerId = i0.Value(ownerId),
+        primaryAssetId = i0.Value(primaryAssetId);
+  static i0.Insertable<i1.StackEntityData> custom({
+    i0.Expression<String>? id,
+    i0.Expression<DateTime>? createdAt,
+    i0.Expression<DateTime>? updatedAt,
+    i0.Expression<String>? ownerId,
+    i0.Expression<String>? primaryAssetId,
+  }) {
+    return i0.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,
+    });
+  }
+
+  i1.StackEntityCompanion copyWith(
+      {i0.Value<String>? id,
+      i0.Value<DateTime>? createdAt,
+      i0.Value<DateTime>? updatedAt,
+      i0.Value<String>? ownerId,
+      i0.Value<String>? primaryAssetId}) {
+    return i1.StackEntityCompanion(
+      id: id ?? this.id,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      ownerId: ownerId ?? this.ownerId,
+      primaryAssetId: primaryAssetId ?? this.primaryAssetId,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<String>(id.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
+    }
+    if (ownerId.present) {
+      map['owner_id'] = i0.Variable<String>(ownerId.value);
+    }
+    if (primaryAssetId.present) {
+      map['primary_asset_id'] = i0.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();
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/lib/infrastructure/repositories/db.repository.dart
index e71598a999..a7920cf7b2 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -14,6 +14,7 @@ import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:isar/isar.dart';
@@ -50,6 +51,7 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     RemoteAlbumUserEntity,
     MemoryEntity,
     MemoryAssetEntity,
+    StackEntity,
   ],
   include: {
     'package:immich_mobile/infrastructure/entities/merged_asset.drift',
diff --git a/mobile/lib/infrastructure/repositories/db.repository.drift.dart b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
index 925591def8..15d445d226 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -27,9 +27,11 @@ import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
     as i12;
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
     as i13;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart'
     as i14;
-import 'package:drift/internal/modular.dart' as i15;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i15;
+import 'package:drift/internal/modular.dart' as i16;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -58,8 +60,9 @@ abstract class $Drift extends i0.GeneratedDatabase {
   late final i12.$MemoryEntityTable memoryEntity = i12.$MemoryEntityTable(this);
   late final i13.$MemoryAssetEntityTable memoryAssetEntity =
       i13.$MemoryAssetEntityTable(this);
-  i14.MergedAssetDrift get mergedAssetDrift => i15.ReadDatabaseContainer(this)
-      .accessor<i14.MergedAssetDrift>(i14.MergedAssetDrift.new);
+  late final i14.$StackEntityTable stackEntity = i14.$StackEntityTable(this);
+  i15.MergedAssetDrift get mergedAssetDrift => i16.ReadDatabaseContainer(this)
+      .accessor<i15.MergedAssetDrift>(i15.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -80,7 +83,8 @@ abstract class $Drift extends i0.GeneratedDatabase {
         remoteAlbumAssetEntity,
         remoteAlbumUserEntity,
         memoryEntity,
-        memoryAssetEntity
+        memoryAssetEntity,
+        stackEntity
       ];
   @override
   i0.StreamQueryUpdateRules get streamUpdateRules =>
@@ -205,6 +209,13 @@ abstract class $Drift extends i0.GeneratedDatabase {
               i0.TableUpdate('memory_asset_entity', kind: i0.UpdateKind.delete),
             ],
           ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('user_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('stack_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
         ],
       );
   @override
@@ -242,4 +253,6 @@ class $DriftManager {
       i12.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
   i13.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
       i13.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
+  i14.$$StackEntityTableTableManager get stackEntity =>
+      i14.$$StackEntityTableTableManager(_db, _db.stackEntity);
 }
diff --git a/mobile/lib/infrastructure/repositories/stack.repository.dart b/mobile/lib/infrastructure/repositories/stack.repository.dart
new file mode 100644
index 0000000000..7f97f3d9ae
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/stack.repository.dart
@@ -0,0 +1,30 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/stack.model.dart';
+import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class DriftStackRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftStackRepository(this._db) : super(_db);
+
+  Future<List<Stack>> getAll(String userId) {
+    final query = _db.stackEntity.select()
+      ..where((e) => e.ownerId.equals(userId));
+
+    return query.map((stack) {
+      return stack.toDto();
+    }).get();
+  }
+}
+
+extension on StackEntityData {
+  Stack toDto() {
+    return Stack(
+      id: id,
+      createdAt: createdAt,
+      updatedAt: updatedAt,
+      ownerId: ownerId,
+      primaryAssetId: primaryAssetId,
+    );
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/sync_api.repository.dart b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
index 99199a7fc6..d43f786a29 100644
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -54,6 +54,8 @@ class SyncApiRepository {
           SyncRequestType.albumToAssetsV1,
           SyncRequestType.memoriesV1,
           SyncRequestType.memoryToAssetsV1,
+          SyncRequestType.stacksV1,
+          SyncRequestType.partnerStacksV1,
         ],
       ).toJson(),
     );
@@ -163,6 +165,11 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.memoryDeleteV1: SyncMemoryDeleteV1.fromJson,
   SyncEntityType.memoryToAssetV1: SyncMemoryAssetV1.fromJson,
   SyncEntityType.memoryToAssetDeleteV1: SyncMemoryAssetDeleteV1.fromJson,
+  SyncEntityType.stackV1: SyncStackV1.fromJson,
+  SyncEntityType.stackDeleteV1: SyncStackDeleteV1.fromJson,
+  SyncEntityType.partnerStackV1: SyncStackV1.fromJson,
+  SyncEntityType.partnerStackBackfillV1: SyncStackV1.fromJson,
+  SyncEntityType.partnerStackDeleteV1: SyncStackDeleteV1.fromJson,
 };
 
 class _SyncAckV1 {
diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index b88083aa02..89f5c2f59a 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -12,6 +12,7 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:logging/logging.dart';
@@ -69,8 +70,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
-      _logger.severe('Error: SyncPartnerDeleteV1', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: SyncPartnerDeleteV1', error, stack);
       rethrow;
     }
   }
@@ -92,8 +93,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
-      _logger.severe('Error: SyncPartnerV1', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: SyncPartnerV1', error, stack);
       rethrow;
     }
   }
@@ -104,10 +105,10 @@ class SyncStreamRepository extends DriftDatabaseRepository {
   }) async {
     try {
       await _db.remoteAssetEntity.deleteWhere(
-        (row) => row.id.isIn(data.map((error) => error.assetId)),
+        (row) => row.id.isIn(data.map((e) => e.assetId)),
       );
-    } catch (error, stackTrace) {
-      _logger.severe('Error: deleteAssetsV1 - $debugLabel', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: deleteAssetsV1 - $debugLabel', error, stack);
       rethrow;
     }
   }
@@ -142,8 +143,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
-      _logger.severe('Error: updateAssetsV1 - $debugLabel', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: updateAssetsV1 - $debugLabel', error, stack);
       rethrow;
     }
   }
@@ -186,11 +187,11 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
+    } catch (error, stack) {
       _logger.severe(
         'Error: updateAssetsExifV1 - $debugLabel',
         error,
-        stackTrace,
+        stack,
       );
       rethrow;
     }
@@ -201,8 +202,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
       await _db.remoteAlbumEntity.deleteWhere(
         (row) => row.id.isIn(data.map((e) => e.albumId)),
       );
-    } catch (error, stackTrace) {
-      _logger.severe('Error: deleteAlbumsV1', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: deleteAlbumsV1', error, stack);
       rethrow;
     }
   }
@@ -229,8 +230,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
-      _logger.severe('Error: updateAlbumsV1', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: updateAlbumsV1', error, stack);
       rethrow;
     }
   }
@@ -248,8 +249,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
-      _logger.severe('Error: deleteAlbumUsersV1', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: deleteAlbumUsersV1', error, stack);
       rethrow;
     }
   }
@@ -275,11 +276,11 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
+    } catch (error, stack) {
       _logger.severe(
         'Error: updateAlbumUsersV1 - $debugLabel',
         error,
-        stackTrace,
+        stack,
       );
       rethrow;
     }
@@ -300,8 +301,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
-      _logger.severe('Error: deleteAlbumToAssetsV1', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: deleteAlbumToAssetsV1', error, stack);
       rethrow;
     }
   }
@@ -325,11 +326,11 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
+    } catch (error, stack) {
       _logger.severe(
         'Error: updateAlbumToAssetsV1 - $debugLabel',
         error,
-        stackTrace,
+        stack,
       );
       rethrow;
     }
@@ -359,8 +360,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
-      _logger.severe('Error: updateMemoriesV1', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: updateMemoriesV1', error, stack);
       rethrow;
     }
   }
@@ -370,8 +371,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
       await _db.memoryEntity.deleteWhere(
         (row) => row.id.isIn(data.map((e) => e.memoryId)),
       );
-    } catch (error, stackTrace) {
-      _logger.severe('Error: deleteMemoriesV1', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: deleteMemoriesV1', error, stack);
       rethrow;
     }
   }
@@ -392,8 +393,8 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
-      _logger.severe('Error: updateMemoryAssetsV1', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: updateMemoryAssetsV1', error, stack);
       rethrow;
     }
   }
@@ -413,8 +414,49 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
-    } catch (error, stackTrace) {
-      _logger.severe('Error: deleteMemoryAssetsV1', error, stackTrace);
+    } catch (error, stack) {
+      _logger.severe('Error: deleteMemoryAssetsV1', error, stack);
+      rethrow;
+    }
+  }
+
+  Future<void> updateStacksV1(
+    Iterable<SyncStackV1> data, {
+    String debugLabel = 'user',
+  }) async {
+    try {
+      await _db.batch((batch) {
+        for (final stack in data) {
+          final companion = StackEntityCompanion(
+            createdAt: Value(stack.createdAt),
+            updatedAt: Value(stack.updatedAt),
+            ownerId: Value(stack.ownerId),
+            primaryAssetId: Value(stack.primaryAssetId),
+          );
+
+          batch.insert(
+            _db.stackEntity,
+            companion.copyWith(id: Value(stack.id)),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: updateStacksV1 - $debugLabel', error, stack);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteStacksV1(
+    Iterable<SyncStackDeleteV1> data, {
+    String debugLabel = 'user',
+  }) async {
+    try {
+      await _db.stackEntity.deleteWhere(
+        (row) => row.id.isIn(data.map((e) => e.stackId)),
+      );
+    } catch (error, stack) {
+      _logger.severe('Error: deleteStacksV1 - $debugLabel', error, stack);
       rethrow;
     }
   }
@@ -467,7 +509,7 @@ extension on String {
   Duration? toDuration() {
     try {
       final parts = split(':')
-          .map((error) => double.parse(error).toInt())
+          .map((e) => double.parse(e).toInt())
           .toList(growable: false);
 
       return Duration(hours: parts[0], minutes: parts[1], seconds: parts[2]);
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index f10c042e10..e487d644e9 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -66,6 +66,9 @@ final _features = [
       await db.remoteAlbumEntity.deleteAll();
       await db.remoteAlbumUserEntity.deleteAll();
       await db.remoteAlbumAssetEntity.deleteAll();
+      await db.memoryEntity.deleteAll();
+      await db.memoryAssetEntity.deleteAll();
+      await db.stackEntity.deleteAll();
     },
   ),
   _Feature(
diff --git a/mobile/lib/presentation/pages/dev/media_stat.page.dart b/mobile/lib/presentation/pages/dev/media_stat.page.dart
index f0a648fd5a..e5745fa629 100644
--- a/mobile/lib/presentation/pages/dev/media_stat.page.dart
+++ b/mobile/lib/presentation/pages/dev/media_stat.page.dart
@@ -162,6 +162,10 @@ final _remoteStats = [
     name: 'Memories Assets',
     load: (db) => db.managers.memoryAssetEntity.count(),
   ),
+  _Stat(
+    name: 'Stacks',
+    load: (db) => db.managers.stackEntity.count(),
+  ),
 ];
 
 @RoutePage()
diff --git a/mobile/lib/providers/stack.provider.dart b/mobile/lib/providers/stack.provider.dart
new file mode 100644
index 0000000000..71abd1e87a
--- /dev/null
+++ b/mobile/lib/providers/stack.provider.dart
@@ -0,0 +1,7 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/infrastructure/repositories/stack.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+
+final driftStackProvider = Provider<DriftStackRepository>(
+  (ref) => DriftStackRepository(ref.watch(driftProvider)),
+);
diff --git a/mobile/lib/repositories/auth.repository.dart b/mobile/lib/repositories/auth.repository.dart
index 3ad8e34580..4ee4d8c131 100644
--- a/mobile/lib/repositories/auth.repository.dart
+++ b/mobile/lib/repositories/auth.repository.dart
@@ -40,6 +40,9 @@ class AuthRepository extends DatabaseRepository {
         _drift.remoteAlbumEntity.deleteAll(),
         _drift.remoteAlbumAssetEntity.deleteAll(),
         _drift.remoteAlbumUserEntity.deleteAll(),
+        _drift.memoryEntity.deleteAll(),
+        _drift.memoryAssetEntity.deleteAll(),
+        _drift.stackEntity.deleteAll(),
       ]);
     });
   }
diff --git a/mobile/test/domain/services/sync_stream_service_test.dart b/mobile/test/domain/services/sync_stream_service_test.dart
index 28288422fd..27cd8c5b21 100644
--- a/mobile/test/domain/services/sync_stream_service_test.dart
+++ b/mobile/test/domain/services/sync_stream_service_test.dart
@@ -89,6 +89,18 @@ void main() {
         .thenAnswer(successHandler);
     when(() => mockSyncStreamRepo.deleteMemoryAssetsV1(any()))
         .thenAnswer(successHandler);
+    when(
+      () => mockSyncStreamRepo.updateStacksV1(
+        any(),
+        debugLabel: any(named: 'debugLabel'),
+      ),
+    ).thenAnswer(successHandler);
+    when(
+      () => mockSyncStreamRepo.deleteStacksV1(
+        any(),
+        debugLabel: any(named: 'debugLabel'),
+      ),
+    ).thenAnswer(successHandler);
 
     sut = SyncStreamService(
       syncApiRepository: mockSyncApiRepo,

From d5923241b5891c36591b5859e46b07cd251527f6 Mon Sep 17 00:00:00 2001
From: matthieu-db <matthieu.debeule@axpo.com>
Date: Mon, 7 Jul 2025 05:06:36 +0200
Subject: [PATCH 136/337] fix: add quiet zone to QR code (#19771)

Add quiet zone to QR code

This is needed for the QR code to be readable by many QR readers. It is also a requirement for it to be a valid QR code.
---
 web/src/lib/components/shared-components/qrcode.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/lib/components/shared-components/qrcode.svelte b/web/src/lib/components/shared-components/qrcode.svelte
index 5fa83e880c..7ac23f8a34 100644
--- a/web/src/lib/components/shared-components/qrcode.svelte
+++ b/web/src/lib/components/shared-components/qrcode.svelte
@@ -10,7 +10,7 @@
 
   const { value, width, alt = $t('alt_text_qr_code') }: Props = $props();
 
-  let promise = $derived(QRCode.toDataURL(value, { margin: 0, width }));
+  let promise = $derived(QRCode.toDataURL(value, { margin: 4, width }));
 </script>
 
 <div style="width: {width}px; height: {width}px">

From 56756baea2349c9df8b43d1a92463f100a7d945a Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:51:58 +0800
Subject: [PATCH 137/337] feat(mobile): drift archive page (#19740)

* feat(mobile): drift archive page

* fix: lint

* feat: include local indicator

* remove join in bucket

* remove showing local indicator in bucket

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
Co-authored-by: alex <alex@localhost-live.localdomain>
---
 .../lib/domain/services/timeline.service.dart |  7 +++
 .../repositories/timeline.repository.dart     | 52 +++++++++++++++++++
 .../pages/dev/drift_archive.page.dart         | 33 ++++++++++++
 .../pages/dev/feat_in_development.page.dart   |  5 ++
 mobile/lib/routing/router.dart                |  6 ++-
 mobile/lib/routing/router.gr.dart             | 16 ++++++
 6 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 mobile/lib/presentation/pages/dev/drift_archive.page.dart

diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 618ccd250f..748bad5047 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -53,6 +53,13 @@ class TimelineFactory {
         bucketSource: () =>
             _timelineRepository.watchRemoteBucket(albumId, groupBy: groupBy),
       );
+
+  TimelineService archive(String userId) => TimelineService(
+        assetSource: (offset, count) => _timelineRepository
+            .getArchiveBucketAssets(userId, offset: offset, count: count),
+        bucketSource: () =>
+            _timelineRepository.watchArchiveBucket(userId, groupBy: groupBy),
+      );
 }
 
 class TimelineService {
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index fcd92cb30c..b234f92c87 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -213,6 +213,58 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         .map((row) => row.readTable(_db.remoteAssetEntity).toDto())
         .get();
   }
+
+  Stream<List<Bucket>> watchArchiveBucket(
+    String userId, {
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    if (groupBy == GroupAssetsBy.none) {
+      return _db.remoteAssetEntity
+          .count(
+            where: (row) =>
+                row.visibility.equalsValue(AssetVisibility.archive) &
+                row.ownerId.equals(userId),
+          )
+          .map(_generateBuckets)
+          .watchSingle();
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..where(
+        _db.remoteAssetEntity.ownerId.equals(userId) &
+            _db.remoteAssetEntity.visibility
+                .equalsValue(AssetVisibility.archive),
+      )
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> getArchiveBucketAssets(
+    String userId, {
+    required int offset,
+    required int count,
+  }) {
+    final query = _db.remoteAssetEntity.select()
+      ..where(
+        (row) =>
+            row.ownerId.equals(userId) &
+            row.visibility.equalsValue(AssetVisibility.archive),
+      )
+      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
+      ..limit(count, offset: offset);
+
+    return query.map((row) => row.toDto()).get();
+  }
 }
 
 extension on Expression<DateTime> {
diff --git a/mobile/lib/presentation/pages/dev/drift_archive.page.dart b/mobile/lib/presentation/pages/dev/drift_archive.page.dart
new file mode 100644
index 0000000000..14657f7149
--- /dev/null
+++ b/mobile/lib/presentation/pages/dev/drift_archive.page.dart
@@ -0,0 +1,33 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.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/user.provider.dart';
+
+@RoutePage()
+class DriftArchivePage extends StatelessWidget {
+  const DriftArchivePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final user = ref.watch(currentUserProvider);
+            if (user == null) {
+              throw Exception('User must be logged in to access archive');
+            }
+
+            final timelineService =
+                ref.watch(timelineFactoryProvider).archive(user.id);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index e487d644e9..823615f503 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -99,6 +99,11 @@ final _features = [
     icon: Icons.timeline_rounded,
     onTap: (ctx, _) => ctx.pushRoute(const TabShellRoute()),
   ),
+  _Feature(
+    name: 'Archive',
+    icon: Icons.archive_outlined,
+    onTap: (ctx, _) => ctx.pushRoute(const DriftArchiveRoute()),
+  ),
 ];
 
 @RoutePage()
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 56e1aa0f96..9e27feaa8b 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -66,6 +66,7 @@ import 'package:immich_mobile/pages/search/person_result.page.dart';
 import 'package:immich_mobile/pages/search/recently_taken.page.dart';
 import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/drift_archive.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/local_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
@@ -392,7 +393,10 @@ class AppRouter extends RootStackRouter {
       page: DriftMemoryRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
-
+    AutoRoute(
+      page: DriftArchiveRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index f8f37970f9..8c162cea7a 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -618,6 +618,22 @@ class DriftAlbumsRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftArchivePage]
+class DriftArchiveRoute extends PageRouteInfo<void> {
+  const DriftArchiveRoute({List<PageRouteInfo>? children})
+      : super(DriftArchiveRoute.name, initialChildren: children);
+
+  static const String name = 'DriftArchiveRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftArchivePage();
+    },
+  );
+}
+
 /// generated route for
 /// [DriftMemoryPage]
 class DriftMemoryRoute extends PageRouteInfo<DriftMemoryRouteArgs> {

From 7e35e6985ebfa09db51014366ad3e1f7ed151294 Mon Sep 17 00:00:00 2001
From: Damiano Ferrari <34270884+ferraridamiano@users.noreply.github.com>
Date: Mon, 7 Jul 2025 05:59:48 +0200
Subject: [PATCH 138/337] chore: Use a contrasted color for text avatar
 (#19756)

---
 mobile/lib/widgets/common/user_circle_avatar.dart | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mobile/lib/widgets/common/user_circle_avatar.dart b/mobile/lib/widgets/common/user_circle_avatar.dart
index 8866cb01b0..e8501f1184 100644
--- a/mobile/lib/widgets/common/user_circle_avatar.dart
+++ b/mobile/lib/widgets/common/user_circle_avatar.dart
@@ -5,9 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/widgets/common/transparent_image.dart';
 
@@ -26,7 +24,7 @@ class UserCircleAvatar extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    bool isDarkTheme = context.themeData.brightness == Brightness.dark;
+    final userAvatarColor = user.avatarColor.toColor();
     final profileImageUrl =
         '${Store.get(StoreKey.serverEndpoint)}/users/${user.id}/profile-image?d=${Random().nextInt(1024)}';
 
@@ -34,14 +32,14 @@ class UserCircleAvatar extends ConsumerWidget {
       style: TextStyle(
         fontWeight: FontWeight.bold,
         fontSize: 12,
-        color: isDarkTheme && user.avatarColor == AvatarColor.primary
+        color: userAvatarColor.computeLuminance() > 0.5
             ? Colors.black
             : Colors.white,
       ),
       child: Text(user.name[0].toUpperCase()),
     );
     return CircleAvatar(
-      backgroundColor: user.avatarColor.toColor(),
+      backgroundColor: userAvatarColor,
       radius: radius,
       child: user.profileImagePath == null
           ? textIcon

From 5579554532e0319321da97166640cb8a729ae9a1 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Mon, 7 Jul 2025 12:05:40 +0800
Subject: [PATCH 139/337] feat(mobile): drift trash page (#19745)

* feat(mobile): drift trash page

* feat: include local indicator

* remove join in bucket

* remove indicator join

---------

Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
---
 .../lib/domain/services/timeline.service.dart |  7 +++
 .../repositories/timeline.repository.dart     | 48 +++++++++++++++++++
 .../pages/dev/drift_trash.page.dart           | 33 +++++++++++++
 .../pages/dev/feat_in_development.page.dart   |  5 ++
 mobile/lib/routing/router.dart                |  5 ++
 mobile/lib/routing/router.gr.dart             | 16 +++++++
 6 files changed, 114 insertions(+)
 create mode 100644 mobile/lib/presentation/pages/dev/drift_trash.page.dart

diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 748bad5047..fc8b2a86fd 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -54,6 +54,13 @@ class TimelineFactory {
             _timelineRepository.watchRemoteBucket(albumId, groupBy: groupBy),
       );
 
+  TimelineService trash(String userId) => TimelineService(
+        assetSource: (offset, count) => _timelineRepository
+            .getTrashBucketAssets(userId, offset: offset, count: count),
+        bucketSource: () =>
+            _timelineRepository.watchTrashBucket(userId, groupBy: groupBy),
+      );
+
   TimelineService archive(String userId) => TimelineService(
         assetSource: (offset, count) => _timelineRepository
             .getArchiveBucketAssets(userId, offset: offset, count: count),
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index b234f92c87..acddb38534 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -214,6 +214,54 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         .get();
   }
 
+  Stream<List<Bucket>> watchTrashBucket(
+    String userId, {
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    if (groupBy == GroupAssetsBy.none) {
+      return _db.remoteAssetEntity
+          .count(
+            where: (row) =>
+                row.deletedAt.isNotNull() & row.ownerId.equals(userId),
+          )
+          .map(_generateBuckets)
+          .watchSingle();
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..where(
+        _db.remoteAssetEntity.ownerId.equals(userId) &
+            _db.remoteAssetEntity.deletedAt.isNotNull(),
+      )
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> getTrashBucketAssets(
+    String userId, {
+    required int offset,
+    required int count,
+  }) {
+    final query = _db.remoteAssetEntity.select()
+      ..where(
+        (row) => row.deletedAt.isNotNull() & row.ownerId.equals(userId),
+      )
+      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
+      ..limit(count, offset: offset);
+
+    return query.map((row) => row.toDto()).get();
+  }
+
   Stream<List<Bucket>> watchArchiveBucket(
     String userId, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
diff --git a/mobile/lib/presentation/pages/dev/drift_trash.page.dart b/mobile/lib/presentation/pages/dev/drift_trash.page.dart
new file mode 100644
index 0000000000..cbcfe50112
--- /dev/null
+++ b/mobile/lib/presentation/pages/dev/drift_trash.page.dart
@@ -0,0 +1,33 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.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/user.provider.dart';
+
+@RoutePage()
+class DriftTrashPage extends StatelessWidget {
+  const DriftTrashPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final user = ref.watch(currentUserProvider);
+            if (user == null) {
+              throw Exception('User must be logged in to access trash');
+            }
+
+            final timelineService =
+                ref.watch(timelineFactoryProvider).trash(user.id);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index 823615f503..8bfd02ab31 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -99,6 +99,11 @@ final _features = [
     icon: Icons.timeline_rounded,
     onTap: (ctx, _) => ctx.pushRoute(const TabShellRoute()),
   ),
+  _Feature(
+    name: 'Trash',
+    icon: Icons.delete_outline_rounded,
+    onTap: (ctx, _) => ctx.pushRoute(const DriftTrashRoute()),
+  ),
   _Feature(
     name: 'Archive',
     icon: Icons.archive_outlined,
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 9e27feaa8b..85e8700300 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -66,6 +66,7 @@ import 'package:immich_mobile/pages/search/person_result.page.dart';
 import 'package:immich_mobile/pages/search/recently_taken.page.dart';
 import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/drift_trash.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_archive.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/local_timeline.page.dart';
@@ -393,6 +394,10 @@ class AppRouter extends RootStackRouter {
       page: DriftMemoryRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftTrashRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     AutoRoute(
       page: DriftArchiveRoute.page,
       guards: [_authGuard, _duplicateGuard],
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 8c162cea7a..0a861898aa 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -686,6 +686,22 @@ class DriftMemoryRouteArgs {
   }
 }
 
+/// generated route for
+/// [DriftTrashPage]
+class DriftTrashRoute extends PageRouteInfo<void> {
+  const DriftTrashRoute({List<PageRouteInfo>? children})
+      : super(DriftTrashRoute.name, initialChildren: children);
+
+  static const String name = 'DriftTrashRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftTrashPage();
+    },
+  );
+}
+
 /// generated route for
 /// [EditImagePage]
 class EditImageRoute extends PageRouteInfo<EditImageRouteArgs> {

From cf91d9bdfcf11ecba07c3fba1df82a8df82f43b1 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Mon, 7 Jul 2025 12:29:33 +0800
Subject: [PATCH 140/337] feat(mobile): drift locked folder page (#19746)

* feat(mobile): drift locked folder page

* feat: include local indicator

* remove join in bucket

* remove status indicator join

---------

Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
---
 .../lib/domain/services/timeline.service.dart |  9 ++++
 .../repositories/timeline.repository.dart     | 52 +++++++++++++++++++
 .../pages/dev/drift_locked_folder.page.dart   | 33 ++++++++++++
 .../pages/dev/feat_in_development.page.dart   |  5 ++
 mobile/lib/routing/router.dart                |  5 ++
 mobile/lib/routing/router.gr.dart             | 16 ++++++
 6 files changed, 120 insertions(+)
 create mode 100644 mobile/lib/presentation/pages/dev/drift_locked_folder.page.dart

diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index fc8b2a86fd..2e56e6e10c 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -67,6 +67,15 @@ class TimelineFactory {
         bucketSource: () =>
             _timelineRepository.watchArchiveBucket(userId, groupBy: groupBy),
       );
+
+  TimelineService lockedFolder(String userId) => TimelineService(
+        assetSource: (offset, count) => _timelineRepository
+            .getLockedFolderBucketAssets(userId, offset: offset, count: count),
+        bucketSource: () => _timelineRepository.watchLockedFolderBucket(
+          userId,
+          groupBy: groupBy,
+        ),
+      );
 }
 
 class TimelineService {
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index acddb38534..45e2c5dac9 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -313,6 +313,58 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
 
     return query.map((row) => row.toDto()).get();
   }
+
+  Stream<List<Bucket>> watchLockedFolderBucket(
+    String userId, {
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    if (groupBy == GroupAssetsBy.none) {
+      return _db.remoteAssetEntity
+          .count(
+            where: (row) =>
+                row.visibility.equalsValue(AssetVisibility.locked) &
+                row.ownerId.equals(userId),
+          )
+          .map(_generateBuckets)
+          .watchSingle();
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..where(
+        _db.remoteAssetEntity.ownerId.equals(userId) &
+            _db.remoteAssetEntity.visibility
+                .equalsValue(AssetVisibility.locked),
+      )
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> getLockedFolderBucketAssets(
+    String userId, {
+    required int offset,
+    required int count,
+  }) {
+    final query = _db.remoteAssetEntity.select()
+      ..where(
+        (row) =>
+            row.visibility.equalsValue(AssetVisibility.locked) &
+            row.ownerId.equals(userId),
+      )
+      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
+      ..limit(count, offset: offset);
+
+    return query.map((row) => row.toDto()).get();
+  }
 }
 
 extension on Expression<DateTime> {
diff --git a/mobile/lib/presentation/pages/dev/drift_locked_folder.page.dart b/mobile/lib/presentation/pages/dev/drift_locked_folder.page.dart
new file mode 100644
index 0000000000..5ab7c71347
--- /dev/null
+++ b/mobile/lib/presentation/pages/dev/drift_locked_folder.page.dart
@@ -0,0 +1,33 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.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/user.provider.dart';
+
+@RoutePage()
+class DriftLockedFolderPage extends StatelessWidget {
+  const DriftLockedFolderPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final user = ref.watch(currentUserProvider);
+            if (user == null) {
+              throw Exception('User must be logged in to access locked folder');
+            }
+
+            final timelineService =
+                ref.watch(timelineFactoryProvider).lockedFolder(user.id);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index 8bfd02ab31..e4c4f1c879 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -109,6 +109,11 @@ final _features = [
     icon: Icons.archive_outlined,
     onTap: (ctx, _) => ctx.pushRoute(const DriftArchiveRoute()),
   ),
+  _Feature(
+    name: 'Locked Folder',
+    icon: Icons.lock_outline_rounded,
+    onTap: (ctx, _) => ctx.pushRoute(const DriftLockedFolderRoute()),
+  ),
 ];
 
 @RoutePage()
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 85e8700300..8513b0606c 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -68,6 +68,7 @@ import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_trash.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_archive.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/drift_locked_folder.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/local_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
@@ -402,6 +403,10 @@ class AppRouter extends RootStackRouter {
       page: DriftArchiveRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftLockedFolderRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 0a861898aa..cf34bc0d50 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -634,6 +634,22 @@ class DriftArchiveRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftLockedFolderPage]
+class DriftLockedFolderRoute extends PageRouteInfo<void> {
+  const DriftLockedFolderRoute({List<PageRouteInfo>? children})
+      : super(DriftLockedFolderRoute.name, initialChildren: children);
+
+  static const String name = 'DriftLockedFolderRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftLockedFolderPage();
+    },
+  );
+}
+
 /// generated route for
 /// [DriftMemoryPage]
 class DriftMemoryRoute extends PageRouteInfo<DriftMemoryRouteArgs> {

From 8c5269c002cb0323cdc04239b2e18f128d744d5c Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 7 Jul 2025 12:56:54 -0500
Subject: [PATCH 141/337] chore: lock DCM version in GHA (#19795)

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

diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index b128c3f80f..79c66a6cf4 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -64,7 +64,7 @@ jobs:
           wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
           echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
           sudo apt-get update
-          sudo apt-get install dcm
+          sudo apt-get install dcm=1.29.0-1
 
       - name: Generate translation file
         run: make translation

From d149d6fa3f131165d4e229f4ba8b5bd5dbb262b8 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 8 Jul 2025 01:57:08 +0800
Subject: [PATCH 142/337] feat(mobile): drift favorite page (#19783)

* feat(mobile): drift favorite page

* remove status indicator join
---
 .../lib/domain/services/timeline.service.dart |  7 +++
 .../repositories/timeline.repository.dart     | 48 +++++++++++++++++++
 .../pages/dev/drift_favorite.page.dart        | 33 +++++++++++++
 .../pages/dev/feat_in_development.page.dart   |  5 ++
 mobile/lib/routing/router.dart                |  5 ++
 mobile/lib/routing/router.gr.dart             | 16 +++++++
 6 files changed, 114 insertions(+)
 create mode 100644 mobile/lib/presentation/pages/dev/drift_favorite.page.dart

diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 2e56e6e10c..7e2c586b28 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -54,6 +54,13 @@ class TimelineFactory {
             _timelineRepository.watchRemoteBucket(albumId, groupBy: groupBy),
       );
 
+  TimelineService favorite(String userId) => TimelineService(
+        assetSource: (offset, count) => _timelineRepository
+            .getFavoriteBucketAssets(userId, offset: offset, count: count),
+        bucketSource: () =>
+            _timelineRepository.watchFavoriteBucket(userId, groupBy: groupBy),
+      );
+
   TimelineService trash(String userId) => TimelineService(
         assetSource: (offset, count) => _timelineRepository
             .getTrashBucketAssets(userId, offset: offset, count: count),
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 45e2c5dac9..a40b4f950a 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -214,6 +214,54 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         .get();
   }
 
+  Stream<List<Bucket>> watchFavoriteBucket(
+    String userId, {
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    if (groupBy == GroupAssetsBy.none) {
+      return _db.remoteAssetEntity
+          .count(
+            where: (row) =>
+                row.isFavorite.equals(true) & row.ownerId.equals(userId),
+          )
+          .map(_generateBuckets)
+          .watchSingle();
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..where(
+        _db.remoteAssetEntity.ownerId.equals(userId) &
+            _db.remoteAssetEntity.isFavorite.equals(true),
+      )
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> getFavoriteBucketAssets(
+    String userId, {
+    required int offset,
+    required int count,
+  }) {
+    final query = _db.remoteAssetEntity.select()
+      ..where(
+        (row) => row.isFavorite.equals(true) & row.ownerId.equals(userId),
+      )
+      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
+      ..limit(count, offset: offset);
+
+    return query.map((row) => row.toDto()).get();
+  }
+
   Stream<List<Bucket>> watchTrashBucket(
     String userId, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
diff --git a/mobile/lib/presentation/pages/dev/drift_favorite.page.dart b/mobile/lib/presentation/pages/dev/drift_favorite.page.dart
new file mode 100644
index 0000000000..4055ad863b
--- /dev/null
+++ b/mobile/lib/presentation/pages/dev/drift_favorite.page.dart
@@ -0,0 +1,33 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.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/user.provider.dart';
+
+@RoutePage()
+class DriftFavoritePage extends StatelessWidget {
+  const DriftFavoritePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final user = ref.watch(currentUserProvider);
+            if (user == null) {
+              throw Exception('User must be logged in to access favorite');
+            }
+
+            final timelineService =
+                ref.watch(timelineFactoryProvider).favorite(user.id);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index e4c4f1c879..66f7be4f05 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -99,6 +99,11 @@ final _features = [
     icon: Icons.timeline_rounded,
     onTap: (ctx, _) => ctx.pushRoute(const TabShellRoute()),
   ),
+  _Feature(
+    name: 'Favorite',
+    icon: Icons.favorite_outline_rounded,
+    onTap: (ctx, _) => ctx.pushRoute(const DriftFavoriteRoute()),
+  ),
   _Feature(
     name: 'Trash',
     icon: Icons.delete_outline_rounded,
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 8513b0606c..1805aab2b3 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -66,6 +66,7 @@ import 'package:immich_mobile/pages/search/person_result.page.dart';
 import 'package:immich_mobile/pages/search/recently_taken.page.dart';
 import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/drift_favorite.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_trash.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_archive.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_locked_folder.page.dart';
@@ -395,6 +396,10 @@ class AppRouter extends RootStackRouter {
       page: DriftMemoryRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftFavoriteRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     AutoRoute(
       page: DriftTrashRoute.page,
       guards: [_authGuard, _duplicateGuard],
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index cf34bc0d50..68f78b93fa 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -634,6 +634,22 @@ class DriftArchiveRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftFavoritePage]
+class DriftFavoriteRoute extends PageRouteInfo<void> {
+  const DriftFavoriteRoute({List<PageRouteInfo>? children})
+      : super(DriftFavoriteRoute.name, initialChildren: children);
+
+  static const String name = 'DriftFavoriteRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftFavoritePage();
+    },
+  );
+}
+
 /// generated route for
 /// [DriftLockedFolderPage]
 class DriftLockedFolderRoute extends PageRouteInfo<void> {

From 683af673447329a314a46809d7ad38e18b1e8aac Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 8 Jul 2025 02:51:49 +0800
Subject: [PATCH 143/337] feat(mobile): drift video page (#19784)

* feat(mobile): drift video page

* filter motional parts

* remove status indicator join

---------

Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
---
 .../lib/domain/services/timeline.service.dart |  7 +++
 .../repositories/timeline.repository.dart     | 56 +++++++++++++++++++
 .../pages/dev/drift_video.page.dart           | 33 +++++++++++
 .../pages/dev/feat_in_development.page.dart   |  5 ++
 mobile/lib/routing/router.dart                |  5 ++
 mobile/lib/routing/router.gr.dart             | 16 ++++++
 6 files changed, 122 insertions(+)
 create mode 100644 mobile/lib/presentation/pages/dev/drift_video.page.dart

diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 7e2c586b28..5cf8341a4d 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -83,6 +83,13 @@ class TimelineFactory {
           groupBy: groupBy,
         ),
       );
+
+  TimelineService video(String userId) => TimelineService(
+        assetSource: (offset, count) => _timelineRepository
+            .getVideoBucketAssets(userId, offset: offset, count: count),
+        bucketSource: () =>
+            _timelineRepository.watchVideoBucket(userId, groupBy: groupBy),
+      );
 }
 
 class TimelineService {
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index a40b4f950a..10f3298716 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -413,6 +413,62 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
 
     return query.map((row) => row.toDto()).get();
   }
+
+  Stream<List<Bucket>> watchVideoBucket(
+    String userId, {
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    if (groupBy == GroupAssetsBy.none) {
+      return _db.remoteAssetEntity
+          .count(
+            where: (row) =>
+                row.type.equalsValue(AssetType.video) &
+                row.visibility.equalsValue(AssetVisibility.timeline) &
+                row.ownerId.equals(userId),
+          )
+          .map(_generateBuckets)
+          .watchSingle();
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..where(
+        _db.remoteAssetEntity.ownerId.equals(userId) &
+            _db.remoteAssetEntity.type.equalsValue(AssetType.video) &
+            _db.remoteAssetEntity.visibility
+                .equalsValue(AssetVisibility.timeline),
+      )
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> getVideoBucketAssets(
+    String userId, {
+    required int offset,
+    required int count,
+  }) {
+    final query = _db.remoteAssetEntity.select()
+      ..where(
+        (row) =>
+            _db.remoteAssetEntity.type.equalsValue(AssetType.video) &
+            _db.remoteAssetEntity.visibility
+                .equalsValue(AssetVisibility.timeline) &
+            _db.remoteAssetEntity.ownerId.equals(userId),
+      )
+      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
+      ..limit(count, offset: offset);
+
+    return query.map((row) => row.toDto()).get();
+  }
 }
 
 extension on Expression<DateTime> {
diff --git a/mobile/lib/presentation/pages/dev/drift_video.page.dart b/mobile/lib/presentation/pages/dev/drift_video.page.dart
new file mode 100644
index 0000000000..488d027177
--- /dev/null
+++ b/mobile/lib/presentation/pages/dev/drift_video.page.dart
@@ -0,0 +1,33 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.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/user.provider.dart';
+
+@RoutePage()
+class DriftVideoPage extends StatelessWidget {
+  const DriftVideoPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final user = ref.watch(currentUserProvider);
+            if (user == null) {
+              throw Exception('User must be logged in to video');
+            }
+
+            final timelineService =
+                ref.watch(timelineFactoryProvider).video(user.id);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index 66f7be4f05..71b56476c9 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -119,6 +119,11 @@ final _features = [
     icon: Icons.lock_outline_rounded,
     onTap: (ctx, _) => ctx.pushRoute(const DriftLockedFolderRoute()),
   ),
+  _Feature(
+    name: 'Video',
+    icon: Icons.video_collection_outlined,
+    onTap: (ctx, _) => ctx.pushRoute(const DriftVideoRoute()),
+  ),
 ];
 
 @RoutePage()
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 1805aab2b3..d6c7e845d9 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -67,6 +67,7 @@ import 'package:immich_mobile/pages/search/recently_taken.page.dart';
 import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_favorite.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/drift_video.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_trash.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_archive.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_locked_folder.page.dart';
@@ -412,6 +413,10 @@ class AppRouter extends RootStackRouter {
       page: DriftLockedFolderRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftVideoRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 68f78b93fa..13d29e3ce8 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -734,6 +734,22 @@ class DriftTrashRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftVideoPage]
+class DriftVideoRoute extends PageRouteInfo<void> {
+  const DriftVideoRoute({List<PageRouteInfo>? children})
+      : super(DriftVideoRoute.name, initialChildren: children);
+
+  static const String name = 'DriftVideoRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftVideoPage();
+    },
+  );
+}
+
 /// generated route for
 /// [EditImagePage]
 class EditImageRoute extends PageRouteInfo<EditImageRouteArgs> {

From ebf2f9fd7b4b8a0e61d6e9c25650d970767cb46d Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 8 Jul 2025 04:11:16 +0800
Subject: [PATCH 144/337] feat(mobile): drift library page (#19789)

* feat(mobile): drift library page

* merge main & fix sliver padding

---------

Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
---
 mobile/lib/pages/common/tab_shell.page.dart   |   2 +-
 .../pages/dev/feat_in_development.page.dart   |  20 -
 .../pages/drift_library.page.dart             | 501 ++++++++++++++++++
 mobile/lib/routing/router.dart                |   7 +-
 mobile/lib/routing/router.gr.dart             |  16 +
 5 files changed, 524 insertions(+), 22 deletions(-)
 create mode 100644 mobile/lib/presentation/pages/drift_library.page.dart

diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index 452c153342..d5d53360b0 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -118,7 +118,7 @@ class TabShellPage extends ConsumerWidget {
         const MainTimelineRoute(),
         SearchRoute(),
         const DriftAlbumsRoute(),
-        const LibraryRoute(),
+        const DriftLibraryRoute(),
       ],
       duration: const Duration(milliseconds: 600),
       transitionBuilder: (context, child, animation) => FadeTransition(
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index 71b56476c9..2698eefccc 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -99,26 +99,6 @@ final _features = [
     icon: Icons.timeline_rounded,
     onTap: (ctx, _) => ctx.pushRoute(const TabShellRoute()),
   ),
-  _Feature(
-    name: 'Favorite',
-    icon: Icons.favorite_outline_rounded,
-    onTap: (ctx, _) => ctx.pushRoute(const DriftFavoriteRoute()),
-  ),
-  _Feature(
-    name: 'Trash',
-    icon: Icons.delete_outline_rounded,
-    onTap: (ctx, _) => ctx.pushRoute(const DriftTrashRoute()),
-  ),
-  _Feature(
-    name: 'Archive',
-    icon: Icons.archive_outlined,
-    onTap: (ctx, _) => ctx.pushRoute(const DriftArchiveRoute()),
-  ),
-  _Feature(
-    name: 'Locked Folder',
-    icon: Icons.lock_outline_rounded,
-    onTap: (ctx, _) => ctx.pushRoute(const DriftLockedFolderRoute()),
-  ),
   _Feature(
     name: 'Video',
     icon: Icons.video_collection_outlined,
diff --git a/mobile/lib/presentation/pages/drift_library.page.dart b/mobile/lib/presentation/pages/drift_library.page.dart
new file mode 100644
index 0000000000..6c83ce0ca0
--- /dev/null
+++ b/mobile/lib/presentation/pages/drift_library.page.dart
@@ -0,0 +1,501 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/providers/album/album.provider.dart';
+import 'package:immich_mobile/providers/partner.provider.dart';
+import 'package:immich_mobile/providers/search/people.provider.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/api.service.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
+import 'package:immich_mobile/widgets/album/album_thumbnail_card.dart';
+import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
+import 'package:immich_mobile/widgets/common/user_avatar.dart';
+import 'package:immich_mobile/widgets/map/map_thumbnail.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
+
+@RoutePage()
+class DriftLibraryPage extends ConsumerWidget {
+  const DriftLibraryPage({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return const Scaffold(
+      body: CustomScrollView(
+        slivers: [
+          ImmichSliverAppBar(),
+          _ActionButtonGrid(),
+          _CollectionCards(),
+          _QuickAccessButtonList(),
+        ],
+      ),
+    );
+  }
+}
+
+class _ActionButtonGrid extends ConsumerWidget {
+  const _ActionButtonGrid();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isTrashEnable = ref.watch(
+      serverInfoProvider.select((state) => state.serverFeatures.trash),
+    );
+
+    return SliverPadding(
+      padding: const EdgeInsets.only(left: 16, top: 16, right: 16, bottom: 12),
+      sliver: SliverToBoxAdapter(
+        child: Column(
+          children: [
+            Row(
+              children: [
+                _ActionButton(
+                  icon: Icons.favorite_outline_rounded,
+                  onTap: () => context.pushRoute(const DriftFavoriteRoute()),
+                  label: 'favorites'.t(context: context),
+                ),
+                const SizedBox(width: 8),
+                _ActionButton(
+                  icon: Icons.archive_outlined,
+                  onTap: () => context.pushRoute(const DriftArchiveRoute()),
+                  label: 'archived'.t(context: context),
+                ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            Row(
+              children: [
+                _ActionButton(
+                  icon: Icons.link_outlined,
+                  onTap: () => context.pushRoute(const SharedLinkRoute()),
+                  label: 'shared_links'.t(context: context),
+                ),
+                isTrashEnable
+                    ? const SizedBox(width: 8)
+                    : const SizedBox.shrink(),
+                isTrashEnable
+                    ? _ActionButton(
+                        icon: Icons.delete_outline_rounded,
+                        onTap: () => context.pushRoute(const DriftTrashRoute()),
+                        label: 'trash'.t(context: context),
+                      )
+                    : const SizedBox.shrink(),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _ActionButton extends StatelessWidget {
+  const _ActionButton({
+    required this.icon,
+    required this.onTap,
+    required this.label,
+  });
+
+  final IconData icon;
+  final VoidCallback onTap;
+  final String label;
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      child: FilledButton.icon(
+        onPressed: onTap,
+        label: Padding(
+          padding: const EdgeInsets.only(left: 4.0),
+          child: Text(
+            label,
+            style: TextStyle(
+              color: context.colorScheme.onSurface,
+              fontSize: 15,
+            ),
+          ),
+        ),
+        style: FilledButton.styleFrom(
+          elevation: 0,
+          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
+          backgroundColor: context.colorScheme.surfaceContainerLow,
+          alignment: Alignment.centerLeft,
+          shape: RoundedRectangleBorder(
+            borderRadius: const BorderRadius.all(Radius.circular(25)),
+            side: BorderSide(
+              color: context.colorScheme.onSurface.withAlpha(10),
+              width: 1,
+            ),
+          ),
+        ),
+        icon: Icon(
+          icon,
+          color: context.primaryColor,
+        ),
+      ),
+    );
+  }
+}
+
+class _CollectionCards extends StatelessWidget {
+  const _CollectionCards();
+
+  @override
+  Widget build(BuildContext context) {
+    return const SliverPadding(
+      padding: EdgeInsets.symmetric(horizontal: 16),
+      sliver: SliverToBoxAdapter(
+        child: Wrap(
+          spacing: 8,
+          runSpacing: 8,
+          children: [
+            _PeopleCollectionCard(),
+            _PlacesCollectionCard(),
+            _LocalAlbumsCollectionCard(),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _PeopleCollectionCard extends ConsumerWidget {
+  const _PeopleCollectionCard();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final people = ref.watch(getAllPeopleProvider);
+
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final isTablet = constraints.maxWidth > 600;
+        final widthFactor = isTablet ? 0.25 : 0.5;
+        final size = context.width * widthFactor - 20.0;
+
+        return GestureDetector(
+          onTap: () => context.pushRoute(const PeopleCollectionRoute()),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Container(
+                height: size,
+                width: size,
+                decoration: BoxDecoration(
+                  borderRadius: const BorderRadius.all(
+                    Radius.circular(20),
+                  ),
+                  gradient: LinearGradient(
+                    colors: [
+                      context.colorScheme.primary.withAlpha(30),
+                      context.colorScheme.primary.withAlpha(25),
+                    ],
+                    begin: Alignment.topCenter,
+                    end: Alignment.bottomCenter,
+                  ),
+                ),
+                child: people.widgetWhen(
+                  onLoading: () => const Center(
+                    child: CircularProgressIndicator(),
+                  ),
+                  onData: (people) {
+                    return GridView.count(
+                      crossAxisCount: 2,
+                      padding: const EdgeInsets.all(12),
+                      crossAxisSpacing: 8,
+                      mainAxisSpacing: 8,
+                      physics: const NeverScrollableScrollPhysics(),
+                      children: people.take(4).map((person) {
+                        return CircleAvatar(
+                          backgroundImage: NetworkImage(
+                            getFaceThumbnailUrl(person.id),
+                            headers: ApiService.getRequestHeaders(),
+                          ),
+                        );
+                      }).toList(),
+                    );
+                  },
+                ),
+              ),
+              Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: Text(
+                  'people'.t(context: context),
+                  style: context.textTheme.titleSmall?.copyWith(
+                    color: context.colorScheme.onSurface,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _PlacesCollectionCard extends StatelessWidget {
+  const _PlacesCollectionCard();
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final isTablet = constraints.maxWidth > 600;
+        final widthFactor = isTablet ? 0.25 : 0.5;
+        final size = context.width * widthFactor - 20.0;
+
+        return GestureDetector(
+          onTap: () => context.pushRoute(
+            PlacesCollectionRoute(
+              currentLocation: null,
+            ),
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              SizedBox(
+                height: size,
+                width: size,
+                child: DecoratedBox(
+                  decoration: BoxDecoration(
+                    borderRadius: const BorderRadius.all(Radius.circular(20)),
+                    color:
+                        context.colorScheme.secondaryContainer.withAlpha(100),
+                  ),
+                  child: IgnorePointer(
+                    child: MapThumbnail(
+                      zoom: 8,
+                      centre: const LatLng(
+                        21.44950,
+                        -157.91959,
+                      ),
+                      showAttribution: false,
+                      themeMode: context.isDarkTheme
+                          ? ThemeMode.dark
+                          : ThemeMode.light,
+                    ),
+                  ),
+                ),
+              ),
+              Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: Text(
+                  'places'.t(),
+                  style: context.textTheme.titleSmall?.copyWith(
+                    color: context.colorScheme.onSurface,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _LocalAlbumsCollectionCard extends ConsumerWidget {
+  const _LocalAlbumsCollectionCard();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    // TODO: Migrate to the drift after local album page
+    final albums = ref.watch(localAlbumsProvider);
+
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final isTablet = constraints.maxWidth > 600;
+        final widthFactor = isTablet ? 0.25 : 0.5;
+        final size = context.width * widthFactor - 20.0;
+
+        return GestureDetector(
+          onTap: () => context.pushRoute(
+            const LocalAlbumsRoute(),
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              SizedBox(
+                height: size,
+                width: size,
+                child: DecoratedBox(
+                  decoration: BoxDecoration(
+                    borderRadius: const BorderRadius.all(Radius.circular(20)),
+                    gradient: LinearGradient(
+                      colors: [
+                        context.colorScheme.primary.withAlpha(30),
+                        context.colorScheme.primary.withAlpha(25),
+                      ],
+                      begin: Alignment.topCenter,
+                      end: Alignment.bottomCenter,
+                    ),
+                  ),
+                  child: GridView.count(
+                    crossAxisCount: 2,
+                    padding: const EdgeInsets.all(12),
+                    crossAxisSpacing: 8,
+                    mainAxisSpacing: 8,
+                    physics: const NeverScrollableScrollPhysics(),
+                    children: albums.take(4).map((album) {
+                      return AlbumThumbnailCard(
+                        album: album,
+                        showTitle: false,
+                      );
+                    }).toList(),
+                  ),
+                ),
+              ),
+              Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: Text(
+                  'on_this_device'.t(context: context),
+                  style: context.textTheme.titleSmall?.copyWith(
+                    color: context.colorScheme.onSurface,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _QuickAccessButtonList extends ConsumerWidget {
+  const _QuickAccessButtonList();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final partners = ref.watch(partnerSharedWithProvider);
+
+    return SliverPadding(
+      padding: const EdgeInsets.only(left: 16, top: 12, right: 16, bottom: 32),
+      sliver: SliverToBoxAdapter(
+        child: Container(
+          decoration: BoxDecoration(
+            border: Border.all(
+              color: context.colorScheme.onSurface.withAlpha(10),
+              width: 1,
+            ),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
+            gradient: LinearGradient(
+              colors: [
+                context.colorScheme.primary.withAlpha(10),
+                context.colorScheme.primary.withAlpha(15),
+                context.colorScheme.primary.withAlpha(20),
+              ],
+              begin: Alignment.topCenter,
+              end: Alignment.bottomCenter,
+            ),
+          ),
+          child: ListView(
+            shrinkWrap: true,
+            padding: const EdgeInsets.all(0),
+            physics: const NeverScrollableScrollPhysics(),
+            children: [
+              ListTile(
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.only(
+                    topLeft: const Radius.circular(20),
+                    topRight: const Radius.circular(20),
+                    bottomLeft: Radius.circular(partners.isEmpty ? 20 : 0),
+                    bottomRight: Radius.circular(partners.isEmpty ? 20 : 0),
+                  ),
+                ),
+                leading: const Icon(
+                  Icons.folder_outlined,
+                  size: 26,
+                ),
+                title: Text(
+                  'folders'.t(context: context),
+                  style: context.textTheme.titleSmall?.copyWith(
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+                onTap: () => context.pushRoute(FolderRoute()),
+              ),
+              ListTile(
+                leading: const Icon(
+                  Icons.lock_outline_rounded,
+                  size: 26,
+                ),
+                title: Text(
+                  'locked_folder'.t(context: context),
+                  style: context.textTheme.titleSmall?.copyWith(
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+                // TODO: PIN code is needed
+                onTap: () => context.pushRoute(const DriftLockedFolderRoute()),
+              ),
+              ListTile(
+                leading: const Icon(
+                  Icons.group_outlined,
+                  size: 26,
+                ),
+                title: Text(
+                  'partners'.t(context: context),
+                  style: context.textTheme.titleSmall?.copyWith(
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+                onTap: () => context.pushRoute(const PartnerRoute()),
+              ),
+              _PartnerList(partners: partners),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _PartnerList extends StatelessWidget {
+  const _PartnerList({required this.partners});
+
+  final List<UserDto> partners;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.builder(
+      padding: const EdgeInsets.all(0),
+      physics: const NeverScrollableScrollPhysics(),
+      itemCount: partners.length,
+      shrinkWrap: true,
+      itemBuilder: (context, index) {
+        final partner = partners[index];
+        final isLastItem = index == partners.length - 1;
+        return ListTile(
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.only(
+              bottomLeft: Radius.circular(isLastItem ? 20 : 0),
+              bottomRight: Radius.circular(isLastItem ? 20 : 0),
+            ),
+          ),
+          contentPadding: const EdgeInsets.only(
+            left: 12.0,
+            right: 18.0,
+          ),
+          leading: userAvatar(context, partner, radius: 16),
+          title: const Text(
+            "partner_list_user_photos",
+            style: TextStyle(
+              fontWeight: FontWeight.w500,
+            ),
+          ).t(context: context, args: {'user': partner.name}),
+          onTap: () => context.pushRoute(PartnerDetailRoute(partner: partner)),
+        );
+      },
+    );
+  }
+}
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index d6c7e845d9..aa40ababfb 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -77,6 +77,7 @@ import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/remote_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_library.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_memory.page.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.page.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
@@ -179,7 +180,7 @@ class AppRouter extends RootStackRouter {
           maintainState: false,
         ),
         AutoRoute(
-          page: LibraryRoute.page,
+          page: DriftLibraryRoute.page,
           guards: [_authGuard, _duplicateGuard],
         ),
         AutoRoute(
@@ -417,6 +418,10 @@ class AppRouter extends RootStackRouter {
       page: DriftVideoRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftLibraryRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 13d29e3ce8..08e4a44ecb 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -650,6 +650,22 @@ class DriftFavoriteRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftLibraryPage]
+class DriftLibraryRoute extends PageRouteInfo<void> {
+  const DriftLibraryRoute({List<PageRouteInfo>? children})
+      : super(DriftLibraryRoute.name, initialChildren: children);
+
+  static const String name = 'DriftLibraryRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftLibraryPage();
+    },
+  );
+}
+
 /// generated route for
 /// [DriftLockedFolderPage]
 class DriftLockedFolderRoute extends PageRouteInfo<void> {

From a11ab4c3f7b2f5a973a9ccb652937b1cf0ac8ae1 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Mon, 7 Jul 2025 22:11:44 +0200
Subject: [PATCH 145/337] chore: tidy up DCM analysis workflow (#19797)

---
 .github/workflows/static_analysis.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index 79c66a6cf4..2a6c6261a8 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -42,6 +42,9 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
+    defaults:
+      run:
+        working-directory: ./mobile
     steps:
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -56,27 +59,23 @@ jobs:
 
       - name: Install dependencies
         run: dart pub get
-        working-directory: ./mobile
 
       - name: Install DCM
-        run: |
-          sudo apt-get update
-          wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
-          echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
-          sudo apt-get update
-          sudo apt-get install dcm=1.29.0-1
+        # TODO: Move to upstream after https://github.com/CQLabs/setup-dcm/pull/235 merges
+        uses: bo0tzz/setup-dcm@b4952ab813659c03513b57bd78bfe3f634171f8a
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          version: auto
+          working-directory: ./mobile
 
       - name: Generate translation file
         run: make translation
-        working-directory: ./mobile
 
       - name: Run Build Runner
         run: make build
-        working-directory: ./mobile
 
       - name: Generate platform API
         run: make pigeon
-        working-directory: ./mobile
 
       - name: Find file changes
         uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4
@@ -98,19 +97,16 @@ jobs:
 
       - name: Run dart analyze
         run: dart analyze --fatal-infos
-        working-directory: ./mobile
 
       - name: Run dart format
         run: dart format lib/ --set-exit-if-changed
-        working-directory: ./mobile
 
       - name: Run dart custom_lint
         run: dart run custom_lint
-        working-directory: ./mobile
 
+      # TODO: Use https://github.com/CQLabs/dcm-action
       - name: Run DCM
         run: dcm analyze lib --fatal-style --fatal-warnings
-        working-directory: ./mobile
 
   zizmor:
     name: zizmor

From a87c2e82cd7afa3c12b0eeadfc26674d26be608a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 7 Jul 2025 20:29:58 +0000
Subject: [PATCH 146/337] fix(deps): update typescript-projects (#19666)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
---
 .github/package-lock.json |   6 +-
 cli/package-lock.json     | 162 ++++----
 docs/package-lock.json    |   6 +-
 e2e/package-lock.json     | 342 +++++++----------
 server/package-lock.json  | 300 +++++++--------
 web/package-lock.json     | 783 ++++++++------------------------------
 6 files changed, 530 insertions(+), 1069 deletions(-)

diff --git a/.github/package-lock.json b/.github/package-lock.json
index 2e430ce056..bea1c66e46 100644
--- a/.github/package-lock.json
+++ b/.github/package-lock.json
@@ -9,9 +9,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
-      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
diff --git a/cli/package-lock.json b/cli/package-lock.json
index b690003395..0bb42db17c 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -16,7 +16,7 @@
         "micromatch": "^4.0.8"
       },
       "bin": {
-        "immich": "dist/index.js"
+        "immich": "bin/immich"
       },
       "devDependencies": {
         "@eslint/eslintrc": "^3.1.0",
@@ -607,9 +607,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
-      "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -622,9 +622,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz",
-      "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
+      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -682,9 +682,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.29.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
-      "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
+      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1365,17 +1365,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz",
-      "integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
+      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/type-utils": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/type-utils": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -1389,7 +1389,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.35.0",
+        "@typescript-eslint/parser": "^8.35.1",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
@@ -1405,16 +1405,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz",
-      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
+      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/typescript-estree": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1430,14 +1430,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
-      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
+      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.0",
-        "@typescript-eslint/types": "^8.35.0",
+        "@typescript-eslint/tsconfig-utils": "^8.35.1",
+        "@typescript-eslint/types": "^8.35.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1452,14 +1452,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
-      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
+      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0"
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1470,9 +1470,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
-      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
+      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1487,14 +1487,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
-      "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
+      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -1511,9 +1511,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
-      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1525,16 +1525,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
-      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
+      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.35.0",
-        "@typescript-eslint/tsconfig-utils": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/project-service": "8.35.1",
+        "@typescript-eslint/tsconfig-utils": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -1580,16 +1580,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
-      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
+      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/typescript-estree": "8.35.0"
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1604,13 +1604,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
-      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
+      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/types": "8.35.1",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -2305,19 +2305,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.29.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
-      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
+      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.1",
-        "@eslint/config-helpers": "^0.2.1",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.0",
         "@eslint/core": "^0.14.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.29.0",
+        "@eslint/js": "9.30.1",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -2822,9 +2822,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
-      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
+      "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3505,9 +3505,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
-      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -4125,15 +4125,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.0.tgz",
-      "integrity": "sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.1.tgz",
+      "integrity": "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.35.0",
-        "@typescript-eslint/parser": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0"
+        "@typescript-eslint/eslint-plugin": "8.35.1",
+        "@typescript-eslint/parser": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/docs/package-lock.json b/docs/package-lock.json
index b2cafa05f0..53ac997e3b 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -16459,9 +16459,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
-      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index 162c863832..2987223fe0 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -56,7 +56,7 @@
         "micromatch": "^4.0.8"
       },
       "bin": {
-        "immich": "dist/index.js"
+        "immich": "bin/immich"
       },
       "devDependencies": {
         "@eslint/eslintrc": "^3.1.0",
@@ -658,9 +658,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
-      "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -673,9 +673,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
-      "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
+      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -733,9 +733,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.29.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
-      "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
+      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1509,13 +1509,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.53.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.53.1.tgz",
-      "integrity": "sha512-Z4c23LHV0muZ8hfv4jw6HngPJkbbtZxTkxPNIg7cJcTc9C28N/p2q7g3JZS2SiKBBHJ3uM1dgDye66bB7LEk5w==",
+      "version": "1.53.2",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.53.2.tgz",
+      "integrity": "sha512-tEB2U5z74ebBeyfGNZ3Jfg29AnW+5HlWhvHtb/Mqco9pFdZU1ZLNdVb2UtB5CvmiilNr2ZfVH/qMmAROG/XTzw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.53.1"
+        "playwright": "1.53.2"
       },
       "bin": {
         "playwright": "cli.js"
@@ -2028,66 +2028,6 @@
         "pg-types": "^2.2.0"
       }
     },
-    "node_modules/@types/pg/node_modules/pg-types": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
-      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "pg-int8": "1.0.1",
-        "postgres-array": "~2.0.0",
-        "postgres-bytea": "~1.0.0",
-        "postgres-date": "~1.0.4",
-        "postgres-interval": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@types/pg/node_modules/postgres-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
-      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@types/pg/node_modules/postgres-bytea": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
-      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@types/pg/node_modules/postgres-date": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
-      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@types/pg/node_modules/postgres-interval": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
-      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@types/pngjs": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/@types/pngjs/-/pngjs-6.0.5.tgz",
@@ -2160,17 +2100,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz",
-      "integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
+      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/type-utils": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/type-utils": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -2184,7 +2124,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.35.0",
+        "@typescript-eslint/parser": "^8.35.1",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
@@ -2200,16 +2140,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz",
-      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
+      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/typescript-estree": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2225,14 +2165,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
-      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
+      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.0",
-        "@typescript-eslint/types": "^8.35.0",
+        "@typescript-eslint/tsconfig-utils": "^8.35.1",
+        "@typescript-eslint/types": "^8.35.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2247,14 +2187,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
-      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
+      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0"
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2265,9 +2205,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
-      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
+      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2282,14 +2222,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
-      "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
+      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -2306,9 +2246,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
-      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2320,16 +2260,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
-      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
+      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.35.0",
-        "@typescript-eslint/tsconfig-utils": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/project-service": "8.35.1",
+        "@typescript-eslint/tsconfig-utils": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -2375,16 +2315,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
-      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
+      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/typescript-estree": "8.35.0"
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2399,13 +2339,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
-      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
+      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/types": "8.35.1",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -3498,19 +3438,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.29.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
-      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
+      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.1",
-        "@eslint/config-helpers": "^0.2.1",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.0",
         "@eslint/core": "^0.14.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.29.0",
+        "@eslint/js": "9.30.1",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -4279,9 +4219,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
-      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
+      "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5430,15 +5370,15 @@
       }
     },
     "node_modules/pg": {
-      "version": "8.16.2",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.2.tgz",
-      "integrity": "sha512-OtLWF0mKLmpxelOt9BqVq83QV6bTfsS0XLegIeAKqKjurRnRKie1Dc1iL89MugmSLhftxw6NNCyZhm1yQFLMEQ==",
+      "version": "8.16.3",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
+      "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "pg-connection-string": "^2.9.1",
         "pg-pool": "^3.10.1",
-        "pg-protocol": "^1.10.2",
+        "pg-protocol": "^1.10.3",
         "pg-types": "2.2.0",
         "pgpass": "1.0.5"
       },
@@ -5446,7 +5386,7 @@
         "node": ">= 16.0.0"
       },
       "optionalDependencies": {
-        "pg-cloudflare": "^1.2.6"
+        "pg-cloudflare": "^1.2.7"
       },
       "peerDependencies": {
         "pg-native": ">=3.0.1"
@@ -5499,7 +5439,7 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/pg/node_modules/pg-types": {
+    "node_modules/pg-types": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
       "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
@@ -5516,49 +5456,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/pg/node_modules/postgres-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
-      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pg/node_modules/postgres-bytea": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
-      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pg/node_modules/postgres-date": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
-      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pg/node_modules/postgres-interval": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
-      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/pgpass": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
@@ -5590,13 +5487,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.53.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.53.1.tgz",
-      "integrity": "sha512-LJ13YLr/ocweuwxyGf1XNFWIU4M2zUSo149Qbp+A4cpwDjsxRPj7k6H25LBrEHiEwxvRbD8HdwvQmRMSvquhYw==",
+      "version": "1.53.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.53.2.tgz",
+      "integrity": "sha512-6K/qQxVFuVQhRQhFsVZ9fGeatxirtrpPgxzBYWyZLEXJzqYwuL4fuNmfOfD5et1tJE4GScKyPNeLhZeRwuTU3A==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.53.1"
+        "playwright-core": "1.53.2"
       },
       "bin": {
         "playwright": "cli.js"
@@ -5609,9 +5506,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.53.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.53.1.tgz",
-      "integrity": "sha512-Z46Oq7tLAyT0lGoFx4DOuB1IA9D1TPj0QkYxpPVUnGDqHHvDpCftu1J2hM2PiWsNMoZh8+LQaarAWcDfPBc6zg==",
+      "version": "1.53.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.53.2.tgz",
+      "integrity": "sha512-ox/OytMy+2w1jcYEYlOo1Hhp8hZkLCximMTUTMBXjGUA1KoFfiSZ+DU+3a739jsPY0yoKH2TFy9S2fsJas8yAw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -5689,6 +5586,49 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postgres-bytea": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postgres-date": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postgres-interval": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -5700,9 +5640,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
-      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -6837,15 +6777,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.0.tgz",
-      "integrity": "sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.1.tgz",
+      "integrity": "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.35.0",
-        "@typescript-eslint/parser": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0"
+        "@typescript-eslint/eslint-plugin": "8.35.1",
+        "@typescript-eslint/parser": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/server/package-lock.json b/server/package-lock.json
index 3243444915..ea45d89257 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1134,9 +1134,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
-      "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1149,9 +1149,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
-      "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
+      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1209,9 +1209,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.29.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
-      "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
+      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5472,9 +5472,9 @@
       "license": "MIT"
     },
     "node_modules/@swc/core": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.12.7.tgz",
-      "integrity": "sha512-bcpllEihyUSnqp0UtXTvXc19CT4wp3tGWLENhWnjr4B5iEOkzqMu+xHGz1FI5IBatjfqOQb29tgIfv6IL05QaA==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.12.9.tgz",
+      "integrity": "sha512-O+LfT2JlVMsIMWG9x+rdxg8GzpzeGtCZQfXV7cKc1PjIKUkLFf1QJ7okuseA4f/9vncu37dQ2ZcRrPKy0Ndd5g==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
@@ -5490,16 +5490,16 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.12.7",
-        "@swc/core-darwin-x64": "1.12.7",
-        "@swc/core-linux-arm-gnueabihf": "1.12.7",
-        "@swc/core-linux-arm64-gnu": "1.12.7",
-        "@swc/core-linux-arm64-musl": "1.12.7",
-        "@swc/core-linux-x64-gnu": "1.12.7",
-        "@swc/core-linux-x64-musl": "1.12.7",
-        "@swc/core-win32-arm64-msvc": "1.12.7",
-        "@swc/core-win32-ia32-msvc": "1.12.7",
-        "@swc/core-win32-x64-msvc": "1.12.7"
+        "@swc/core-darwin-arm64": "1.12.9",
+        "@swc/core-darwin-x64": "1.12.9",
+        "@swc/core-linux-arm-gnueabihf": "1.12.9",
+        "@swc/core-linux-arm64-gnu": "1.12.9",
+        "@swc/core-linux-arm64-musl": "1.12.9",
+        "@swc/core-linux-x64-gnu": "1.12.9",
+        "@swc/core-linux-x64-musl": "1.12.9",
+        "@swc/core-win32-arm64-msvc": "1.12.9",
+        "@swc/core-win32-ia32-msvc": "1.12.9",
+        "@swc/core-win32-x64-msvc": "1.12.9"
       },
       "peerDependencies": {
         "@swc/helpers": ">=0.5.17"
@@ -5511,9 +5511,9 @@
       }
     },
     "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.12.7.tgz",
-      "integrity": "sha512-w6BBT0hBRS56yS+LbReVym0h+iB7/PpCddqrn1ha94ra4rZ4R/A91A/rkv+LnQlPqU/+fhqdlXtCJU9mrhCBtA==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.12.9.tgz",
+      "integrity": "sha512-GACFEp4nD6V+TZNR2JwbMZRHB+Yyvp14FrcmB6UCUYmhuNWjkxi+CLnEvdbuiKyQYv0zA+TRpCHZ+whEs6gwfA==",
       "cpu": [
         "arm64"
       ],
@@ -5528,9 +5528,9 @@
       }
     },
     "node_modules/@swc/core-darwin-x64": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.12.7.tgz",
-      "integrity": "sha512-jN6LhFfGOpm4DY2mXPgwH4aa9GLOwublwMVFFZ/bGnHYYCRitLZs9+JWBbyWs7MyGcA246Ew+EREx36KVEAxjA==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.12.9.tgz",
+      "integrity": "sha512-hv2kls7Ilkm2EpeJz+I9MCil7pGS3z55ZAgZfxklEuYsxpICycxeH+RNRv4EraggN44ms+FWCjtZFu0LGg2V3g==",
       "cpu": [
         "x64"
       ],
@@ -5545,9 +5545,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.12.7.tgz",
-      "integrity": "sha512-rHn8XXi7G2StEtZRAeJ6c7nhJPDnqsHXmeNrAaYwk8Tvpa6ZYG2nT9E1OQNXj1/dfbSFTjdiA8M8ZvGYBlpBoA==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.12.9.tgz",
+      "integrity": "sha512-od9tDPiG+wMU9wKtd6y3nYJdNqgDOyLdgRRcrj1/hrbHoUPOM8wZQZdwQYGarw63iLXGgsw7t5HAF9Yc51ilFA==",
       "cpu": [
         "arm"
       ],
@@ -5562,9 +5562,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.12.7.tgz",
-      "integrity": "sha512-N15hKizSSh+hkZ2x3TDVrxq0TDcbvDbkQJi2ZrLb9fK+NdFUV/x+XF16ZDPlbxtrGXl1CT7VD439SNaMN9F7qw==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.12.9.tgz",
+      "integrity": "sha512-6qx1ka9LHcLzxIgn2Mros+CZLkHK2TawlXzi/h7DJeNnzi8F1Hw0Yzjp8WimxNCg6s2n+o3jnmin1oXB7gg8rw==",
       "cpu": [
         "arm64"
       ],
@@ -5579,9 +5579,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.12.7.tgz",
-      "integrity": "sha512-jxyINtBezpxd3eIUDiDXv7UQ87YWlPsM9KumOwJk09FkFSO4oYxV2RT+Wu+Nt5tVWue4N0MdXT/p7SQsDEk4YA==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.12.9.tgz",
+      "integrity": "sha512-yghFZWKPVVGbUdqiD7ft23G0JX6YFGDJPz9YbLLAwGuKZ9th3/jlWoQDAw1Naci31LQhVC+oIji6ozihSuwB2A==",
       "cpu": [
         "arm64"
       ],
@@ -5596,9 +5596,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.12.7.tgz",
-      "integrity": "sha512-PR4tPVwU1BQBfFDk2XfzXxsEIjF3x/bOV1BzZpYvrlkU0TKUDbR4t2wzvsYwD/coW7/yoQmlL70/qnuPtTp1Zw==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.12.9.tgz",
+      "integrity": "sha512-SFUxyhWLZRNL8QmgGNqdi2Q43PNyFVkRZ2zIif30SOGFSxnxcf2JNeSeBgKIGVgaLSuk6xFVVCtJ3KIeaStgRg==",
       "cpu": [
         "x64"
       ],
@@ -5613,9 +5613,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.12.7.tgz",
-      "integrity": "sha512-zy7JWfQtQItgMfUjSbbcS3DZqQUn2d9VuV0LSGpJxtTXwgzhRpF1S2Sj7cU9hGpbM27Y8RJ4DeFb3qbAufjbrw==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.12.9.tgz",
+      "integrity": "sha512-9FB0wM+6idCGTI20YsBNBg9xSWtkDBymnpaTCsZM3qDc0l4uOpJMqbfWhQvp17x7r/ulZfb2QY8RDvQmCL6AcQ==",
       "cpu": [
         "x64"
       ],
@@ -5630,9 +5630,9 @@
       }
     },
     "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.12.7.tgz",
-      "integrity": "sha512-52PeF0tyX04ZFD8nibNhy/GjMFOZWTEWPmIB3wpD1vIJ1po+smtBnEdRRll5WIXITKoiND8AeHlBNBPqcsdcwA==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.12.9.tgz",
+      "integrity": "sha512-zHOusMVbOH9ik5RtRrMiGzLpKwxrPXgXkBm3SbUCa65HAdjV33NZ0/R9Rv1uPESALtEl2tzMYLUxYA5ECFDFhA==",
       "cpu": [
         "arm64"
       ],
@@ -5647,9 +5647,9 @@
       }
     },
     "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.12.7.tgz",
-      "integrity": "sha512-WzQwkNMuhB1qQShT9uUgz/mX2j7NIEPExEtzvGsBT7TlZ9j1kGZ8NJcZH/fwOFcSJL4W7DnkL7nAhx6DBlSPaA==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.12.9.tgz",
+      "integrity": "sha512-aWZf0PqE0ot7tCuhAjRkDFf41AzzSQO0x2xRfTbnhpROp57BRJ/N5eee1VULO/UA2PIJRG7GKQky5bSGBYlFug==",
       "cpu": [
         "ia32"
       ],
@@ -5664,9 +5664,9 @@
       }
     },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.12.7.tgz",
-      "integrity": "sha512-R52ivBi2lgjl+Bd3XCPum0YfgbZq/W1AUExITysddP9ErsNSwnreYyNB3exEijiazWGcqHEas2ChiuMOP7NYrA==",
+      "version": "1.12.9",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.12.9.tgz",
+      "integrity": "sha512-C25fYftXOras3P3anSUeXXIpxmEkdAcsIL9yrr0j1xepTZ/yKwpnQ6g3coj8UXdeJy4GTVlR6+Ow/QiBgZQNOg==",
       "cpu": [
         "x64"
       ],
@@ -6037,9 +6037,9 @@
       "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-NYqRyg/hIQrYPT9lbOeYc3kIRabJDn/k4qQHIXUpx88CBDww2fD15Sg5kbXlW86zm2XEW4g0QxkTI3/Kfkc7xQ==",
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
       "dev": true,
       "license": "MIT"
     },
@@ -6344,17 +6344,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz",
-      "integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
+      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/type-utils": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/type-utils": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -6368,7 +6368,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.35.0",
+        "@typescript-eslint/parser": "^8.35.1",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
@@ -6384,16 +6384,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz",
-      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
+      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/typescript-estree": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6409,14 +6409,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
-      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
+      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.0",
-        "@typescript-eslint/types": "^8.35.0",
+        "@typescript-eslint/tsconfig-utils": "^8.35.1",
+        "@typescript-eslint/types": "^8.35.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6431,14 +6431,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
-      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
+      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0"
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6449,9 +6449,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
-      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
+      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6466,14 +6466,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
-      "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
+      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -6490,9 +6490,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
-      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6504,16 +6504,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
-      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
+      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.35.0",
-        "@typescript-eslint/tsconfig-utils": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/project-service": "8.35.1",
+        "@typescript-eslint/tsconfig-utils": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -6559,16 +6559,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
-      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
+      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/typescript-estree": "8.35.0"
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6583,13 +6583,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
-      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
+      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
+        "@typescript-eslint/types": "8.35.1",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -9510,19 +9510,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.29.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
-      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
+      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.1",
-        "@eslint/config-helpers": "^0.2.1",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.0",
         "@eslint/core": "^0.14.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.29.0",
+        "@eslint/js": "9.30.1",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -10724,9 +10724,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
-      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
+      "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -12944,9 +12944,9 @@
       "license": "MIT"
     },
     "node_modules/nodemailer": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.3.tgz",
-      "integrity": "sha512-Ajq6Sz1x7cIK3pN6KesGTah+1gnwMnx5gKl3piQlQQE/PwyJ4Mbc8is2psWYxK3RJTVeqsDaCv8ZzXLCDHMTZw==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.4.tgz",
+      "integrity": "sha512-9O00Vh89/Ld2EcVCqJ/etd7u20UhME0f/NToPfArwPEe1Don1zy4mAIz6ariRr7mJ2RDxtaDzN0WJVdVXPtZaw==",
       "license": "MIT-0",
       "engines": {
         "node": ">=6.0.0"
@@ -13007,9 +13007,9 @@
       "peer": true
     },
     "node_modules/oauth4webapi": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/oauth4webapi/-/oauth4webapi-3.5.3.tgz",
-      "integrity": "sha512-2bnHosmBLAQpXNBLOvaJMyMkr4Yya5ohE5Q9jqyxiN+aa7GFCzvDN1RRRMrp0NkfqRR2MTaQNkcSUCCjILD9oQ==",
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/oauth4webapi/-/oauth4webapi-3.5.5.tgz",
+      "integrity": "sha512-1K88D2GiAydGblHo39NBro5TebGXa+7tYoyIbxvqv3+haDDry7CBE1eSYuNbOSsYCCU6y0gdynVZAkm4YPw4hg==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/panva"
@@ -13103,13 +13103,13 @@
       }
     },
     "node_modules/openid-client": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-6.6.1.tgz",
-      "integrity": "sha512-GmqoICGMI3IyFFjhvXxad8of4QWk2D0tm4vdJkldGm9nw7J3p1f7LPLWgGeFuKuw8HjDVe8Dd8QLGBe0NFvSSg==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-6.6.2.tgz",
+      "integrity": "sha512-Xya5TNMnnZuTM6DbHdB4q0S3ig2NTAELnii/ASie1xDEr8iiB8zZbO871OWBdrw++sd3hW6bqWjgcmSy1RTWHA==",
       "license": "MIT",
       "dependencies": {
         "jose": "^6.0.11",
-        "oauth4webapi": "^3.5.3"
+        "oauth4webapi": "^3.5.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/panva"
@@ -13453,14 +13453,14 @@
       }
     },
     "node_modules/pg": {
-      "version": "8.16.2",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.2.tgz",
-      "integrity": "sha512-OtLWF0mKLmpxelOt9BqVq83QV6bTfsS0XLegIeAKqKjurRnRKie1Dc1iL89MugmSLhftxw6NNCyZhm1yQFLMEQ==",
+      "version": "8.16.3",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
+      "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
       "license": "MIT",
       "dependencies": {
         "pg-connection-string": "^2.9.1",
         "pg-pool": "^3.10.1",
-        "pg-protocol": "^1.10.2",
+        "pg-protocol": "^1.10.3",
         "pg-types": "2.2.0",
         "pgpass": "1.0.5"
       },
@@ -13468,7 +13468,7 @@
         "node": ">= 16.0.0"
       },
       "optionalDependencies": {
-        "pg-cloudflare": "^1.2.6"
+        "pg-cloudflare": "^1.2.7"
       },
       "peerDependencies": {
         "pg-native": ">=3.0.1"
@@ -13480,9 +13480,9 @@
       }
     },
     "node_modules/pg-cloudflare": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.6.tgz",
-      "integrity": "sha512-uxmJAnmIgmYgnSFzgOf2cqGQBzwnRYcrEgXuFjJNEkpedEIPBSEzxY7ph4uA9k1mI+l/GR0HjPNS6FKNZe8SBQ==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz",
+      "integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==",
       "license": "MIT",
       "optional": true
     },
@@ -13520,9 +13520,9 @@
       }
     },
     "node_modules/pg-protocol": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.2.tgz",
-      "integrity": "sha512-Ci7jy8PbaWxfsck2dwZdERcDG2A0MG8JoQILs+uZNjABFuBuItAZCWUNz8sXRDMoui24rJw7WlXqgpMdBSN/vQ==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz",
+      "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==",
       "license": "MIT"
     },
     "node_modules/pg-types": {
@@ -13963,9 +13963,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
-      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -15655,9 +15655,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/sql-formatter": {
-      "version": "15.6.5",
-      "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.6.5.tgz",
-      "integrity": "sha512-fr4TyM1udCSrOHOmouotwUi8dxIDhSLpYNmPePGFVzxq8/i8jd828IapE49QXG7Gzkswxo5WwdAGnYX4YpKoTg==",
+      "version": "15.6.6",
+      "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.6.6.tgz",
+      "integrity": "sha512-bZydXEXhaNDQBr8xYHC3a8thwcaMuTBp0CkKGjwGYDsIB26tnlWeWPwJtSQ0TEwiJcz9iJJON5mFPkx7XroHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -17363,15 +17363,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.0.tgz",
-      "integrity": "sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.1.tgz",
+      "integrity": "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.35.0",
-        "@typescript-eslint/parser": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0"
+        "@typescript-eslint/eslint-plugin": "8.35.1",
+        "@typescript-eslint/parser": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/web/package-lock.json b/web/package-lock.json
index 82942102fb..6af393b042 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -740,9 +740,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.29.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
-      "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
+      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -777,9 +777,9 @@
       }
     },
     "node_modules/@faker-js/faker": {
-      "version": "9.8.0",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.8.0.tgz",
-      "integrity": "sha512-U9wpuSrJC93jZBxx/Qq2wPjCuYISBueyVUGK7qqdmj7r/nxaxwW8AQDCLeRO7wZnjj94sh3p246cAYjUKuqgfg==",
+      "version": "9.9.0",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.9.0.tgz",
+      "integrity": "sha512-OEl393iCOoo/z8bMezRlJu+GlRGlsKbUAN7jKB6LhnKoqKve5DXRpalbItIIcwnCjs1k/FOPjFzcA6Qn+H+YbA==",
       "dev": true,
       "funding": [
         {
@@ -1337,9 +1337,9 @@
       "link": true
     },
     "node_modules/@immich/ui": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.23.2.tgz",
-      "integrity": "sha512-eBSZPp2f5ms0jX+fOUiJizY1IqzuGn6latsJa8Pk+wSK0HizLHA6weI3CJoyzPCrOn7L8rRja/pBr8JA/E0Z6g==",
+      "version": "0.23.3",
+      "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.23.3.tgz",
+      "integrity": "sha512-YbYJSv3HqDu2+6MmiHhLThSessZ6HkoVOWun/ZoGb8mKj5x/ZZ4AyXGPIqbyKTamsjzbcD9FInij70G+m4egkg==",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@mdi/js": "^7.4.47",
@@ -2266,9 +2266,9 @@
       }
     },
     "node_modules/@tailwindcss/node": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.10.tgz",
-      "integrity": "sha512-2ACf1znY5fpRBwRhMgj9ZXvb2XZW8qs+oTfotJ2C5xR0/WNL7UHZ7zXl6s+rUqedL1mNi+0O+WQr5awGowS3PQ==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.11.tgz",
+      "integrity": "sha512-yzhzuGRmv5QyU9qLNg4GTlYI6STedBWRE7NjxP45CsFYYq9taI0zJXZBMqIC/c8fViNLhmrbpSFS57EoxUmD6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2278,13 +2278,13 @@
         "lightningcss": "1.30.1",
         "magic-string": "^0.30.17",
         "source-map-js": "^1.2.1",
-        "tailwindcss": "4.1.10"
+        "tailwindcss": "4.1.11"
       }
     },
     "node_modules/@tailwindcss/oxide": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.10.tgz",
-      "integrity": "sha512-v0C43s7Pjw+B9w21htrQwuFObSkio2aV/qPx/mhrRldbqxbWJK6KizM+q7BF1/1CmuLqZqX3CeYF7s7P9fbA8Q==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.11.tgz",
+      "integrity": "sha512-Q69XzrtAhuyfHo+5/HMgr1lAiPP/G40OMFAnws7xcFEYqcypZmdW8eGXaOUIeOl1dzPJBPENXgbjsOyhg2nkrg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -2296,24 +2296,24 @@
         "node": ">= 10"
       },
       "optionalDependencies": {
-        "@tailwindcss/oxide-android-arm64": "4.1.10",
-        "@tailwindcss/oxide-darwin-arm64": "4.1.10",
-        "@tailwindcss/oxide-darwin-x64": "4.1.10",
-        "@tailwindcss/oxide-freebsd-x64": "4.1.10",
-        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.10",
-        "@tailwindcss/oxide-linux-arm64-gnu": "4.1.10",
-        "@tailwindcss/oxide-linux-arm64-musl": "4.1.10",
-        "@tailwindcss/oxide-linux-x64-gnu": "4.1.10",
-        "@tailwindcss/oxide-linux-x64-musl": "4.1.10",
-        "@tailwindcss/oxide-wasm32-wasi": "4.1.10",
-        "@tailwindcss/oxide-win32-arm64-msvc": "4.1.10",
-        "@tailwindcss/oxide-win32-x64-msvc": "4.1.10"
+        "@tailwindcss/oxide-android-arm64": "4.1.11",
+        "@tailwindcss/oxide-darwin-arm64": "4.1.11",
+        "@tailwindcss/oxide-darwin-x64": "4.1.11",
+        "@tailwindcss/oxide-freebsd-x64": "4.1.11",
+        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.11",
+        "@tailwindcss/oxide-linux-arm64-gnu": "4.1.11",
+        "@tailwindcss/oxide-linux-arm64-musl": "4.1.11",
+        "@tailwindcss/oxide-linux-x64-gnu": "4.1.11",
+        "@tailwindcss/oxide-linux-x64-musl": "4.1.11",
+        "@tailwindcss/oxide-wasm32-wasi": "4.1.11",
+        "@tailwindcss/oxide-win32-arm64-msvc": "4.1.11",
+        "@tailwindcss/oxide-win32-x64-msvc": "4.1.11"
       }
     },
     "node_modules/@tailwindcss/oxide-android-arm64": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.10.tgz",
-      "integrity": "sha512-VGLazCoRQ7rtsCzThaI1UyDu/XRYVyH4/EWiaSX6tFglE+xZB5cvtC5Omt0OQ+FfiIVP98su16jDVHDEIuH4iQ==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.11.tgz",
+      "integrity": "sha512-3IfFuATVRUMZZprEIx9OGDjG3Ou3jG4xQzNTvjDoKmU9JdmoCohQJ83MYd0GPnQIu89YoJqvMM0G3uqLRFtetg==",
       "cpu": [
         "arm64"
       ],
@@ -2328,9 +2328,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-arm64": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.10.tgz",
-      "integrity": "sha512-ZIFqvR1irX2yNjWJzKCqTCcHZbgkSkSkZKbRM3BPzhDL/18idA8uWCoopYA2CSDdSGFlDAxYdU2yBHwAwx8euQ==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.11.tgz",
+      "integrity": "sha512-ESgStEOEsyg8J5YcMb1xl8WFOXfeBmrhAwGsFxxB2CxY9evy63+AtpbDLAyRkJnxLy2WsD1qF13E97uQyP1lfQ==",
       "cpu": [
         "arm64"
       ],
@@ -2345,9 +2345,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-x64": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.10.tgz",
-      "integrity": "sha512-eCA4zbIhWUFDXoamNztmS0MjXHSEJYlvATzWnRiTqJkcUteSjO94PoRHJy1Xbwp9bptjeIxxBHh+zBWFhttbrQ==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.11.tgz",
+      "integrity": "sha512-EgnK8kRchgmgzG6jE10UQNaH9Mwi2n+yw1jWmof9Vyg2lpKNX2ioe7CJdf9M5f8V9uaQxInenZkOxnTVL3fhAw==",
       "cpu": [
         "x64"
       ],
@@ -2362,9 +2362,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-freebsd-x64": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.10.tgz",
-      "integrity": "sha512-8/392Xu12R0cc93DpiJvNpJ4wYVSiciUlkiOHOSOQNH3adq9Gi/dtySK7dVQjXIOzlpSHjeCL89RUUI8/GTI6g==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.11.tgz",
+      "integrity": "sha512-xdqKtbpHs7pQhIKmqVpxStnY1skuNh4CtbcyOHeX1YBE0hArj2romsFGb6yUmzkq/6M24nkxDqU8GYrKrz+UcA==",
       "cpu": [
         "x64"
       ],
@@ -2379,9 +2379,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.10.tgz",
-      "integrity": "sha512-t9rhmLT6EqeuPT+MXhWhlRYIMSfh5LZ6kBrC4FS6/+M1yXwfCtp24UumgCWOAJVyjQwG+lYva6wWZxrfvB+NhQ==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.11.tgz",
+      "integrity": "sha512-ryHQK2eyDYYMwB5wZL46uoxz2zzDZsFBwfjssgB7pzytAeCCa6glsiJGjhTEddq/4OsIjsLNMAiMlHNYnkEEeg==",
       "cpu": [
         "arm"
       ],
@@ -2396,9 +2396,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.10.tgz",
-      "integrity": "sha512-3oWrlNlxLRxXejQ8zImzrVLuZ/9Z2SeKoLhtCu0hpo38hTO2iL86eFOu4sVR8cZc6n3z7eRXXqtHJECa6mFOvA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.11.tgz",
+      "integrity": "sha512-mYwqheq4BXF83j/w75ewkPJmPZIqqP1nhoghS9D57CLjsh3Nfq0m4ftTotRYtGnZd3eCztgbSPJ9QhfC91gDZQ==",
       "cpu": [
         "arm64"
       ],
@@ -2413,9 +2413,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.10.tgz",
-      "integrity": "sha512-saScU0cmWvg/Ez4gUmQWr9pvY9Kssxt+Xenfx1LG7LmqjcrvBnw4r9VjkFcqmbBb7GCBwYNcZi9X3/oMda9sqQ==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.11.tgz",
+      "integrity": "sha512-m/NVRFNGlEHJrNVk3O6I9ggVuNjXHIPoD6bqay/pubtYC9QIdAMpS+cswZQPBLvVvEF6GtSNONbDkZrjWZXYNQ==",
       "cpu": [
         "arm64"
       ],
@@ -2430,9 +2430,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.10.tgz",
-      "integrity": "sha512-/G3ao/ybV9YEEgAXeEg28dyH6gs1QG8tvdN9c2MNZdUXYBaIY/Gx0N6RlJzfLy/7Nkdok4kaxKPHKJUlAaoTdA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.11.tgz",
+      "integrity": "sha512-YW6sblI7xukSD2TdbbaeQVDysIm/UPJtObHJHKxDEcW2exAtY47j52f8jZXkqE1krdnkhCMGqP3dbniu1Te2Fg==",
       "cpu": [
         "x64"
       ],
@@ -2447,9 +2447,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-musl": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.10.tgz",
-      "integrity": "sha512-LNr7X8fTiKGRtQGOerSayc2pWJp/9ptRYAa4G+U+cjw9kJZvkopav1AQc5HHD+U364f71tZv6XamaHKgrIoVzA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.11.tgz",
+      "integrity": "sha512-e3C/RRhGunWYNC3aSF7exsQkdXzQ/M+aYuZHKnw4U7KQwTJotnWsGOIVih0s2qQzmEzOFIJ3+xt7iq67K/p56Q==",
       "cpu": [
         "x64"
       ],
@@ -2464,9 +2464,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-wasm32-wasi": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.10.tgz",
-      "integrity": "sha512-d6ekQpopFQJAcIK2i7ZzWOYGZ+A6NzzvQ3ozBvWFdeyqfOZdYHU66g5yr+/HC4ipP1ZgWsqa80+ISNILk+ae/Q==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.11.tgz",
+      "integrity": "sha512-Xo1+/GU0JEN/C/dvcammKHzeM6NqKovG+6921MR6oadee5XPBaKOumrJCXvopJ/Qb5TH7LX/UAywbqrP4lax0g==",
       "bundleDependencies": [
         "@napi-rs/wasm-runtime",
         "@emnapi/core",
@@ -2485,7 +2485,7 @@
         "@emnapi/core": "^1.4.3",
         "@emnapi/runtime": "^1.4.3",
         "@emnapi/wasi-threads": "^1.0.2",
-        "@napi-rs/wasm-runtime": "^0.2.10",
+        "@napi-rs/wasm-runtime": "^0.2.11",
         "@tybys/wasm-util": "^0.9.0",
         "tslib": "^2.8.0"
       },
@@ -2494,9 +2494,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.10.tgz",
-      "integrity": "sha512-i1Iwg9gRbwNVOCYmnigWCCgow8nDWSFmeTUU5nbNx3rqbe4p0kRbEqLwLJbYZKmSSp23g4N6rCDmm7OuPBXhDA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.11.tgz",
+      "integrity": "sha512-UgKYx5PwEKrac3GPNPf6HVMNhUIGuUh4wlDFR2jYYdkX6pL/rn73zTq/4pzUm8fOjAn5L8zDeHp9iXmUGOXZ+w==",
       "cpu": [
         "arm64"
       ],
@@ -2511,9 +2511,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.10.tgz",
-      "integrity": "sha512-sGiJTjcBSfGq2DVRtaSljq5ZgZS2SDHSIfhOylkBvHVjwOsodBhnb3HdmiKkVuUGKD0I7G63abMOVaskj1KpOA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.11.tgz",
+      "integrity": "sha512-YfHoggn1j0LK7wR82TOucWc5LDCguHnoS879idHekmmiR7g9HUtMw9MI0NHatS28u/Xlkfi9w5RJWgz2Dl+5Qg==",
       "cpu": [
         "x64"
       ],
@@ -2605,18 +2605,18 @@
       }
     },
     "node_modules/@tailwindcss/vite": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.10.tgz",
-      "integrity": "sha512-QWnD5HDY2IADv+vYR82lOhqOlS1jSCUUAmfem52cXAhRTKxpDh3ARX8TTXJTCCO7Rv7cD2Nlekabv02bwP3a2A==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.11.tgz",
+      "integrity": "sha512-RHYhrR3hku0MJFRV+fN2gNbDNEh3dwKvY8XJvTxCSXeMOsCRSr+uKvDWQcbizrHgjML6ZmTE5OwMrl5wKcujCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@tailwindcss/node": "4.1.10",
-        "@tailwindcss/oxide": "4.1.10",
-        "tailwindcss": "4.1.10"
+        "@tailwindcss/node": "4.1.11",
+        "@tailwindcss/oxide": "4.1.11",
+        "tailwindcss": "4.1.11"
       },
       "peerDependencies": {
-        "vite": "^5.2.0 || ^6"
+        "vite": "^5.2.0 || ^6 || ^7"
       }
     },
     "node_modules/@testing-library/dom": {
@@ -2942,17 +2942,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz",
-      "integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
+      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/type-utils": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/type-utils": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -2966,187 +2966,11 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.35.0",
+        "@typescript-eslint/parser": "^8.35.1",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
-      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.0",
-        "@typescript-eslint/types": "^8.35.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
-      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
-      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
-      "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
-      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
-      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/project-service": "8.35.0",
-        "@typescript-eslint/tsconfig-utils": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
-      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/typescript-estree": "8.35.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
-      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
       "version": "7.0.5",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
@@ -3157,33 +2981,17 @@
         "node": ">= 4"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz",
-      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
+      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/typescript-estree": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3198,150 +3006,6 @@
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
-      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.0",
-        "@typescript-eslint/types": "^8.35.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
-      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
-      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
-      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
-      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/project-service": "8.35.0",
-        "@typescript-eslint/tsconfig-utils": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
-      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@typescript-eslint/project-service": {
       "version": "8.35.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
@@ -4720,9 +4384,9 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.5.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
-      "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
+      "version": "16.6.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -5053,19 +4717,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.29.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
-      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
+      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.1",
-        "@eslint/config-helpers": "^0.2.1",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.0",
         "@eslint/core": "^0.14.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.29.0",
+        "@eslint/js": "9.30.1",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -5256,9 +4920,9 @@
       }
     },
     "node_modules/eslint-plugin-svelte": {
-      "version": "3.9.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.9.3.tgz",
-      "integrity": "sha512-PlcyK80sqAZ43IITeZkgl3zPFWJytx/Joup9iKGqIOsXM2m3pWfPbWuXPr5PN3loXFEypqTY/JyZwNqlSpSvRw==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.10.1.tgz",
+      "integrity": "sha512-csCh2x0ge/DugXC7dCANh46Igi7bjMZEy6rHZCdS13AoGVJSu7a90Kru3I8oMYLGEemPRE1hQXadxvRPVMAAXQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5381,6 +5045,31 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint/node_modules/@eslint/config-array": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/object-schema": "^2.1.6",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/eslint/node_modules/@eslint/config-helpers": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
+      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/esm-env": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
@@ -5448,9 +5137,9 @@
       }
     },
     "node_modules/esrap": {
-      "version": "1.4.9",
-      "resolved": "https://registry.npmjs.org/esrap/-/esrap-1.4.9.tgz",
-      "integrity": "sha512-3OMlcd0a03UGuZpPeUC1HxR3nA23l+HEyCiZw3b3FumJIN9KphoGzDJKMXI1S72jVS1dsenDyQC0kJlO1U9E1g==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.1.0.tgz",
+      "integrity": "sha512-yzmPNpl7TBbMRC5Lj2JlJZNPml0tzqoqP5B1JXycNUwtqma9AKCO0M2wHrdgsHcy1WRW7S9rJknAMtByg3usgA==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
@@ -6006,9 +5695,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
-      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
+      "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7204,9 +6893,9 @@
       }
     },
     "node_modules/maplibre-gl": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.6.0.tgz",
-      "integrity": "sha512-7TuHMozUC4rlIp08bSsxCixFn18P24otrlZU/7UGCO5RufFTJadFzauTrvBHr9FB67MbJ6nvFXEftGd0bUl4Iw==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.6.1.tgz",
+      "integrity": "sha512-TTSfoTaF7RqKUR9wR5qDxCHH2J1XfZ1E85luiLOx0h8r50T/LnwAwwfV0WVNh9o8dA7rwt57Ucivf1emyeukXg==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@mapbox/geojson-rewind": "^0.5.2",
@@ -8071,9 +7760,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.1.tgz",
-      "integrity": "sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -9109,9 +8798,9 @@
       }
     },
     "node_modules/svelte": {
-      "version": "5.34.8",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.34.8.tgz",
-      "integrity": "sha512-TF+8irl7rpj3+fpaLuPRX5BqReTAqckp0Fumxa/mCeK3fo0/MnBb9W/Z2bLwtqj3C3r5Lm6NKIAw7YrgIv1Fwg==",
+      "version": "5.35.0",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.35.0.tgz",
+      "integrity": "sha512-zgtdzln2aPYbsyeeFSjiQVrojZZU2iPYu07FRzfNme7NCBWo00Xn3B5JP/wMhhYG7nK8BZfrqREfoJRHYAOA5w==",
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
@@ -9123,7 +8812,7 @@
         "axobject-query": "^4.1.0",
         "clsx": "^2.1.1",
         "esm-env": "^1.2.1",
-        "esrap": "^1.4.8",
+        "esrap": "^2.0.0",
         "is-reference": "^3.0.3",
         "locate-character": "^3.0.0",
         "magic-string": "^0.30.11",
@@ -9217,9 +8906,9 @@
       }
     },
     "node_modules/svelte-maplibre": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svelte-maplibre/-/svelte-maplibre-1.0.0.tgz",
-      "integrity": "sha512-lw6t0dnsaYzIPECqymSPnODuWGQnVVzEN1F0cPTXOIDcltEMkefDL3E5MnQ5YU4BY+VYedRDFYo7swEjZwpQCA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/svelte-maplibre/-/svelte-maplibre-1.1.0.tgz",
+      "integrity": "sha512-Qo6ASfa2vCaqShlFP7rDbXxBTrI4iP0jsyRhLXryLS5WOD/G0XI6ByW4kMTydcgMqdox7CmsKZLKT9V3hQ3VCA==",
       "license": "MIT",
       "dependencies": {
         "d3-geo": "^3.1.0",
@@ -9360,9 +9049,9 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.10.tgz",
-      "integrity": "sha512-P3nr6WkvKV/ONsTzj6Gb57sWPMX29EPNPopo7+FcpkQaNsrNpZ1pv8QmrYI2RqEKD7mlGqLnGovlcYnBK0IqUA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.11.tgz",
+      "integrity": "sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA==",
       "license": "MIT"
     },
     "node_modules/tapable": {
@@ -9673,15 +9362,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.0.tgz",
-      "integrity": "sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.1.tgz",
+      "integrity": "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.35.0",
-        "@typescript-eslint/parser": "8.35.0",
-        "@typescript-eslint/utils": "8.35.0"
+        "@typescript-eslint/eslint-plugin": "8.35.1",
+        "@typescript-eslint/parser": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9695,174 +9384,6 @@
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
-      "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.0",
-        "@typescript-eslint/types": "^8.35.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
-      "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
-      "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/types": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
-      "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
-      "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/project-service": "8.35.0",
-        "@typescript-eslint/tsconfig-utils": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/visitor-keys": "8.35.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/utils": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
-      "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.0",
-        "@typescript-eslint/types": "8.35.0",
-        "@typescript-eslint/typescript-estree": "8.35.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
-      "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.35.0",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/typescript-eslint/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/uglify-js": {
       "version": "3.19.3",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",

From dd94ad17aad0bb07958ddf7875600ac6def8ad9c Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 7 Jul 2025 23:30:47 -0500
Subject: [PATCH 147/337] fix: scrubber scroll error when page is not long
 enough (#19809)

---
 .../widgets/timeline/scrubber.widget.dart     | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
index f88c123e1a..248fc6b579 100644
--- a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
@@ -354,22 +354,24 @@ class ScrubberState extends ConsumerState<Scrubber>
               isDragging: _isDragging,
             ),
           ),
-          PositionedDirectional(
-            top: _thumbTopOffset + widget.topPadding,
-            end: 0,
-            child: RepaintBoundary(
-              child: GestureDetector(
-                onVerticalDragStart: _onDragStart,
-                onVerticalDragUpdate: _onDragUpdate,
-                onVerticalDragEnd: _onDragEnd,
-                child: _Scrubber(
-                  thumbAnimation: _thumbAnimation,
-                  labelAnimation: _labelAnimation,
-                  label: label,
+          if (_scrollController.hasClients &&
+              _scrollController.position.maxScrollExtent > 0)
+            PositionedDirectional(
+              top: _thumbTopOffset + widget.topPadding,
+              end: 0,
+              child: RepaintBoundary(
+                child: GestureDetector(
+                  onVerticalDragStart: _onDragStart,
+                  onVerticalDragUpdate: _onDragUpdate,
+                  onVerticalDragEnd: _onDragEnd,
+                  child: _Scrubber(
+                    thumbAnimation: _thumbAnimation,
+                    labelAnimation: _labelAnimation,
+                    label: label,
+                  ),
                 ),
               ),
             ),
-          ),
         ],
       ),
     );

From 87dd09d103f2636158f74916a888e18c07c70a9d Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 7 Jul 2025 23:41:37 -0500
Subject: [PATCH 148/337] feat: selection mode timeline (#19734)

* feat: new page

* force multi-selection state

* fix: provider scoping

* Return selected assets

* lint

* lint

* simplify provider scope and drop drilling

* selection styling
---
 .../lib/domain/services/timeline.service.dart | 25 +++--
 .../repositories/remote_asset.repository.dart | 16 ++++
 .../repositories/timeline.repository.dart     | 63 ++++++++++++-
 .../pages/dev/feat_in_development.page.dart   | 28 ++++++
 .../drift_asset_selection_timeline.page.dart  | 44 +++++++++
 .../widgets/images/thumbnail_tile.widget.dart | 62 ++++++++-----
 .../widgets/timeline/fixed/segment.model.dart | 38 ++++++--
 .../widgets/timeline/timeline.widget.dart     | 93 +++++++++++--------
 .../timeline/multiselect.provider.dart        | 54 +++++++++--
 mobile/lib/routing/router.dart                |  7 ++
 mobile/lib/routing/router.gr.dart             | 49 ++++++++++
 .../common/selection_sliver_app_bar.dart      | 77 +++++++++++++++
 12 files changed, 471 insertions(+), 85 deletions(-)
 create mode 100644 mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
 create mode 100644 mobile/lib/widgets/common/selection_sliver_app_bar.dart

diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 5cf8341a4d..eb332657ff 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -42,16 +42,29 @@ class TimelineFactory {
 
   TimelineService localAlbum({required String albumId}) => TimelineService(
         assetSource: (offset, count) => _timelineRepository
-            .getLocalBucketAssets(albumId, offset: offset, count: count),
-        bucketSource: () =>
-            _timelineRepository.watchLocalBucket(albumId, groupBy: groupBy),
+            .getLocalAlbumBucketAssets(albumId, offset: offset, count: count),
+        bucketSource: () => _timelineRepository.watchLocalAlbumBucket(
+          albumId,
+          groupBy: groupBy,
+        ),
       );
 
   TimelineService remoteAlbum({required String albumId}) => TimelineService(
         assetSource: (offset, count) => _timelineRepository
-            .getRemoteBucketAssets(albumId, offset: offset, count: count),
-        bucketSource: () =>
-            _timelineRepository.watchRemoteBucket(albumId, groupBy: groupBy),
+            .getRemoteAlbumBucketAssets(albumId, offset: offset, count: count),
+        bucketSource: () => _timelineRepository.watchRemoteAlbumBucket(
+          albumId,
+          groupBy: groupBy,
+        ),
+      );
+
+  TimelineService remoteAssets(List<String> timelineUsers) => TimelineService(
+        assetSource: (offset, count) => _timelineRepository
+            .getRemoteBucketAssets(timelineUsers, offset: offset, count: count),
+        bucketSource: () => _timelineRepository.watchRemoteBucket(
+          timelineUsers,
+          groupBy: GroupAssetsBy.month,
+        ),
       );
 
   TimelineService favorite(String userId) => TimelineService(
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index fc341bc91e..95de34d1b4 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -13,6 +13,22 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
   const RemoteAssetRepository(this._db) : super(_db);
 
+  /// For testing purposes
+  Future<List<RemoteAsset>> getSome(String userId) {
+    final query = _db.remoteAssetEntity.select()
+      ..where(
+        (row) =>
+            _db.remoteAssetEntity.ownerId.equals(userId) &
+            _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.visibility
+                .equalsValue(AssetVisibility.timeline),
+      )
+      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
+      ..limit(10);
+
+    return query.map((row) => row.toDto()).get();
+  }
+
   Stream<RemoteAsset?> watchAsset(String id) {
     final query = _db.remoteAssetEntity
         .select()
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 10f3298716..a13109068c 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -104,7 +104,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     ).get();
   }
 
-  Stream<List<Bucket>> watchLocalBucket(
+  Stream<List<Bucket>> watchLocalAlbumBucket(
     String albumId, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
   }) {
@@ -137,7 +137,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     }).watch();
   }
 
-  Future<List<BaseAsset>> getLocalBucketAssets(
+  Future<List<BaseAsset>> getLocalAlbumBucketAssets(
     String albumId, {
     required int offset,
     required int count,
@@ -158,7 +158,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         .get();
   }
 
-  Stream<List<Bucket>> watchRemoteBucket(
+  Stream<List<Bucket>> watchRemoteAlbumBucket(
     String albumId, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
   }) {
@@ -192,7 +192,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     }).watch();
   }
 
-  Future<List<BaseAsset>> getRemoteBucketAssets(
+  Future<List<BaseAsset>> getRemoteAlbumBucketAssets(
     String albumId, {
     required int offset,
     required int count,
@@ -469,6 +469,61 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
 
     return query.map((row) => row.toDto()).get();
   }
+
+  Stream<List<Bucket>> watchRemoteBucket(
+    List<String> userIds, {
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    if (groupBy == GroupAssetsBy.none) {
+      return _db.remoteAssetEntity
+          .count(
+            where: (row) =>
+                row.deletedAt.isNull() &
+                row.visibility.equalsValue(AssetVisibility.timeline) &
+                row.ownerId.isIn(userIds),
+          )
+          .map(_generateBuckets)
+          .watchSingle();
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..where(
+        _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.visibility
+                .equalsValue(AssetVisibility.timeline) &
+            _db.remoteAssetEntity.ownerId.isIn(userIds),
+      )
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> getRemoteBucketAssets(
+    List<String> userIds, {
+    required int offset,
+    required int count,
+  }) {
+    final query = _db.remoteAssetEntity.select()
+      ..where(
+        (row) =>
+            row.deletedAt.isNull() &
+            row.visibility.equalsValue(AssetVisibility.timeline) &
+            row.ownerId.isIn(userIds),
+      )
+      ..orderBy([(t) => OrderingTerm.desc(t.createdAt)])
+      ..limit(count, offset: offset);
+
+    return query.map((row) => row.toDto()).get();
+  }
 }
 
 extension on Expression<DateTime> {
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index 2698eefccc..a4343b720f 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -5,15 +5,43 @@ import 'package:drift/drift.dart' hide Column;
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/presentation/pages/dev/dev_logger.dart';
 import 'package:immich_mobile/providers/background_sync.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/platform.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 
 final _features = [
+  _Feature(
+    name: 'Selection Mode Timeline',
+    icon: Icons.developer_mode_rounded,
+    onTap: (ctx, ref) async {
+      final user = ref.watch(currentUserProvider);
+      if (user == null) {
+        return Future.value();
+      }
+
+      final assets =
+          await ref.read(remoteAssetRepositoryProvider).getSome(user.id);
+
+      final selectedAssets = await ctx.pushRoute<Set<BaseAsset>>(
+        DriftAssetSelectionTimelineRoute(
+          lockedSelectionAssets: assets.toSet(),
+        ),
+      );
+
+      DLog.log(
+        "Selected ${selectedAssets?.length ?? 0} assets",
+      );
+
+      return Future.value();
+    },
+  ),
   _Feature(
     name: 'Sync Local',
     icon: Icons.photo_album_rounded,
diff --git a/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart b/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
new file mode 100644
index 0000000000..b7cb033828
--- /dev/null
+++ b/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
@@ -0,0 +1,44 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.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/timeline/multiselect.provider.dart';
+
+@RoutePage()
+class DriftAssetSelectionTimelinePage extends ConsumerWidget {
+  final Set<BaseAsset> lockedSelectionAssets;
+  const DriftAssetSelectionTimelinePage({
+    super.key,
+    this.lockedSelectionAssets = const {},
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return ProviderScope(
+      overrides: [
+        multiSelectProvider.overrideWith(
+          () => MultiSelectNotifier(
+            MultiSelectState(
+              selectedAssets: {},
+              lockedSelectionAssets: lockedSelectionAssets,
+              forceEnable: true,
+            ),
+          ),
+        ),
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final timelineUsers =
+                ref.watch(timelineUsersProvider).valueOrNull ?? [];
+            final timelineService =
+                ref.watch(timelineFactoryProvider).remoteAssets(timelineUsers);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index 571d1c5412..9d7fae817e 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -12,7 +12,7 @@ class ThumbnailTile extends ConsumerWidget {
     this.size = const Size.square(256),
     this.fit = BoxFit.cover,
     this.showStorageIndicator = true,
-    this.canDeselect = true,
+    this.lockSelection = false,
     super.key,
   });
 
@@ -20,15 +20,13 @@ class ThumbnailTile extends ConsumerWidget {
   final Size size;
   final BoxFit fit;
   final bool showStorageIndicator;
-
-  /// If we are allowed to deselect this image
-  final bool canDeselect;
+  final bool lockSelection;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final assetContainerColor = context.isDarkTheme
-        ? context.primaryColor.darken(amount: 0.6)
-        : context.primaryColor.lighten(amount: 0.8);
+        ? context.primaryColor.darken(amount: 0.4)
+        : context.primaryColor.lighten(amount: 0.75);
 
     final isSelected = ref.watch(
       multiSelectProvider.select(
@@ -36,24 +34,29 @@ class ThumbnailTile extends ConsumerWidget {
       ),
     );
 
+    final borderStyle = lockSelection
+        ? BoxDecoration(
+            color: context.colorScheme.surfaceContainerHighest,
+            border: Border.all(
+              color: context.colorScheme.surfaceContainerHighest,
+              width: 6,
+            ),
+          )
+        : isSelected
+            ? BoxDecoration(
+                color: assetContainerColor,
+                border: Border.all(color: assetContainerColor, width: 6),
+              )
+            : const BoxDecoration();
+
     return Stack(
       children: [
         AnimatedContainer(
           duration: Durations.short4,
           curve: Curves.decelerate,
-          decoration: BoxDecoration(
-            color: isSelected
-                ? (canDeselect ? assetContainerColor : Colors.grey)
-                : null,
-            border: isSelected
-                ? Border.all(
-                    color: canDeselect ? assetContainerColor : Colors.grey,
-                    width: 8,
-                  )
-                : const Border(),
-          ),
+          decoration: borderStyle,
           child: ClipRRect(
-            borderRadius: isSelected
+            borderRadius: isSelected || lockSelection
                 ? const BorderRadius.all(Radius.circular(15.0))
                 : BorderRadius.zero,
             child: Stack(
@@ -102,14 +105,17 @@ class ThumbnailTile extends ConsumerWidget {
             ),
           ),
         ),
-        if (isSelected)
+        if (isSelected || lockSelection)
           Padding(
             padding: const EdgeInsets.all(3.0),
             child: Align(
               alignment: Alignment.topLeft,
               child: _SelectionIndicator(
                 isSelected: isSelected,
-                color: assetContainerColor,
+                isLocked: lockSelection,
+                color: lockSelection
+                    ? context.colorScheme.surfaceContainerHighest
+                    : assetContainerColor,
               ),
             ),
           ),
@@ -120,15 +126,29 @@ class ThumbnailTile extends ConsumerWidget {
 
 class _SelectionIndicator extends StatelessWidget {
   final bool isSelected;
+  final bool isLocked;
   final Color? color;
+
   const _SelectionIndicator({
     required this.isSelected,
+    required this.isLocked,
     this.color,
   });
 
   @override
   Widget build(BuildContext context) {
-    if (isSelected) {
+    if (isLocked) {
+      return Container(
+        decoration: BoxDecoration(
+          shape: BoxShape.circle,
+          color: color,
+        ),
+        child: const Icon(
+          Icons.check_circle_rounded,
+          color: Colors.grey,
+        ),
+      );
+    } else if (isSelected) {
       return Container(
         decoration: BoxDecoration(
           shape: BoxShape.circle,
diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
index 3fbba803db..14b1a4616d 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -166,22 +166,22 @@ class _AssetTileWidget extends ConsumerWidget {
     BaseAsset asset,
   ) {
     final multiSelectState = ref.read(multiSelectProvider);
-    if (!multiSelectState.isEnabled) {
+
+    if (multiSelectState.forceEnable || multiSelectState.isEnabled) {
+      ref.read(multiSelectProvider.notifier).toggleAssetSelection(asset);
+    } else {
       ctx.pushRoute(
         AssetViewerRoute(
           initialIndex: assetIndex,
           timelineService: ref.read(timelineServiceProvider),
         ),
       );
-      return;
     }
-
-    ref.read(multiSelectProvider.notifier).toggleAssetSelection(asset);
   }
 
   void _handleOnLongPress(WidgetRef ref, BaseAsset asset) {
     final multiSelectState = ref.read(multiSelectProvider);
-    if (multiSelectState.isEnabled) {
+    if (multiSelectState.isEnabled || multiSelectState.forceEnable) {
       return;
     }
 
@@ -189,13 +189,35 @@ class _AssetTileWidget extends ConsumerWidget {
     ref.read(multiSelectProvider.notifier).toggleAssetSelection(asset);
   }
 
+  bool _getLockSelectionStatus(WidgetRef ref) {
+    final lockSelectionAssets = ref.read(
+      multiSelectProvider.select(
+        (state) => state.lockedSelectionAssets,
+      ),
+    );
+
+    if (lockSelectionAssets.isEmpty) {
+      return false;
+    }
+
+    return lockSelectionAssets.contains(asset);
+  }
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final lockSelection = _getLockSelectionStatus(ref);
+
     return RepaintBoundary(
       child: GestureDetector(
-        onTap: () => _handleOnTap(context, ref, assetIndex, asset),
-        onLongPress: () => _handleOnLongPress(ref, asset),
-        child: ThumbnailTile(asset),
+        onTap: () => lockSelection
+            ? null
+            : _handleOnTap(context, ref, assetIndex, asset),
+        onLongPress: () =>
+            lockSelection ? null : _handleOnLongPress(ref, asset),
+        child: ThumbnailTile(
+          asset,
+          lockSelection: lockSelection,
+        ),
       ),
     );
   }
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 04015aafe9..9fb164e2dc 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -18,9 +18,14 @@ import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
+import 'package:immich_mobile/widgets/common/selection_sliver_app_bar.dart';
 
 class Timeline extends StatelessWidget {
-  const Timeline({super.key, this.topSliverWidget, this.topSliverWidgetHeight});
+  const Timeline({
+    super.key,
+    this.topSliverWidget,
+    this.topSliverWidgetHeight,
+  });
 
   final Widget? topSliverWidget;
   final double? topSliverWidgetHeight;
@@ -52,7 +57,10 @@ class Timeline extends StatelessWidget {
 }
 
 class _SliverTimeline extends ConsumerStatefulWidget {
-  const _SliverTimeline({this.topSliverWidget, this.topSliverWidgetHeight});
+  const _SliverTimeline({
+    this.topSliverWidget,
+    this.topSliverWidgetHeight,
+  });
 
   final Widget? topSliverWidget;
   final double? topSliverWidgetHeight;
@@ -84,6 +92,10 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
     final asyncSegments = ref.watch(timelineSegmentProvider);
     final maxHeight =
         ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
+    final isSelectionMode = ref.watch(
+      multiSelectProvider.select((s) => s.forceEnable),
+    );
+
     return asyncSegments.widgetWhen(
       onData: (segments) {
         final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
@@ -105,11 +117,14 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                   primary: true,
                   cacheExtent: maxHeight * 2,
                   slivers: [
-                    const ImmichSliverAppBar(
-                      floating: true,
-                      pinned: false,
-                      snap: false,
-                    ),
+                    if (isSelectionMode)
+                      const SelectionSliverAppBar()
+                    else
+                      const ImmichSliverAppBar(
+                        floating: true,
+                        pinned: false,
+                        snap: false,
+                      ),
                     if (widget.topSliverWidget != null) widget.topSliverWidget!,
                     _SliverSegmentedList(
                       segments: segments,
@@ -134,40 +149,42 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                   ],
                 ),
               ),
-              Consumer(
-                builder: (_, consumerRef, child) {
-                  final isMultiSelectEnabled = consumerRef.watch(
-                    multiSelectProvider.select(
-                      (s) => s.isEnabled,
-                    ),
-                  );
+              if (!isSelectionMode) ...[
+                Consumer(
+                  builder: (_, consumerRef, child) {
+                    final isMultiSelectEnabled = consumerRef.watch(
+                      multiSelectProvider.select(
+                        (s) => s.isEnabled,
+                      ),
+                    );
 
-                  if (isMultiSelectEnabled) {
-                    return child!;
-                  }
-                  return const SizedBox.shrink();
-                },
-                child: const Positioned(
-                  top: 60,
-                  left: 25,
-                  child: _MultiSelectStatusButton(),
+                    if (isMultiSelectEnabled) {
+                      return child!;
+                    }
+                    return const SizedBox.shrink();
+                  },
+                  child: const Positioned(
+                    top: 60,
+                    left: 25,
+                    child: _MultiSelectStatusButton(),
+                  ),
                 ),
-              ),
-              Consumer(
-                builder: (_, consumerRef, child) {
-                  final isMultiSelectEnabled = consumerRef.watch(
-                    multiSelectProvider.select(
-                      (s) => s.isEnabled,
-                    ),
-                  );
+                Consumer(
+                  builder: (_, consumerRef, child) {
+                    final isMultiSelectEnabled = consumerRef.watch(
+                      multiSelectProvider.select(
+                        (s) => s.isEnabled,
+                      ),
+                    );
 
-                  if (isMultiSelectEnabled) {
-                    return child!;
-                  }
-                  return const SizedBox.shrink();
-                },
-                child: const HomeBottomAppBar(),
-              ),
+                    if (isMultiSelectEnabled) {
+                      return child!;
+                    }
+                    return const SizedBox.shrink();
+                  },
+                  child: const HomeBottomAppBar(),
+                ),
+              ],
             ],
           ),
         );
diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dart
index 2b24a272bf..b1a926545d 100644
--- a/mobile/lib/providers/timeline/multiselect.provider.dart
+++ b/mobile/lib/providers/timeline/multiselect.provider.dart
@@ -1,5 +1,6 @@
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
@@ -12,8 +13,14 @@ final multiSelectProvider =
 
 class MultiSelectState {
   final Set<BaseAsset> selectedAssets;
+  final Set<BaseAsset> lockedSelectionAssets;
+  final bool forceEnable;
 
-  const MultiSelectState({required this.selectedAssets});
+  const MultiSelectState({
+    required this.selectedAssets,
+    required this.lockedSelectionAssets,
+    this.forceEnable = false,
+  });
 
   bool get isEnabled => selectedAssets.isNotEmpty;
   bool get hasRemote => selectedAssets.any(
@@ -25,33 +32,54 @@ class MultiSelectState {
         (asset) => asset.storage == AssetState.local,
       );
 
-  MultiSelectState copyWith({Set<BaseAsset>? selectedAssets}) {
+  MultiSelectState copyWith({
+    Set<BaseAsset>? selectedAssets,
+    Set<BaseAsset>? lockedSelectionAssets,
+    bool? forceEnable,
+  }) {
     return MultiSelectState(
       selectedAssets: selectedAssets ?? this.selectedAssets,
+      lockedSelectionAssets:
+          lockedSelectionAssets ?? this.lockedSelectionAssets,
+      forceEnable: forceEnable ?? this.forceEnable,
     );
   }
 
   @override
-  String toString() => 'MultiSelectState(selectedAssets: $selectedAssets)';
+  String toString() =>
+      'MultiSelectState(selectedAssets: $selectedAssets, lockedSelectionAssets: $lockedSelectionAssets, forceEnable: $forceEnable)';
 
   @override
   bool operator ==(covariant MultiSelectState other) {
     if (identical(this, other)) return true;
-    final listEquals = const DeepCollectionEquality().equals;
+    final setEquals = const DeepCollectionEquality().equals;
 
-    return listEquals(other.selectedAssets, selectedAssets);
+    return setEquals(other.selectedAssets, selectedAssets) &&
+        setEquals(other.lockedSelectionAssets, lockedSelectionAssets) &&
+        other.forceEnable == forceEnable;
   }
 
   @override
-  int get hashCode => selectedAssets.hashCode;
+  int get hashCode =>
+      selectedAssets.hashCode ^
+      lockedSelectionAssets.hashCode ^
+      forceEnable.hashCode;
 }
 
 class MultiSelectNotifier extends Notifier<MultiSelectState> {
+  MultiSelectNotifier([this._defaultState]);
+  final MultiSelectState? _defaultState;
+
   TimelineService get _timelineService => ref.read(timelineServiceProvider);
 
   @override
   MultiSelectState build() {
-    return const MultiSelectState(selectedAssets: {});
+    return _defaultState ??
+        const MultiSelectState(
+          selectedAssets: {},
+          lockedSelectionAssets: {},
+          forceEnable: false,
+        );
   }
 
   void selectAsset(BaseAsset asset) {
@@ -83,7 +111,11 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
   }
 
   void reset() {
-    state = const MultiSelectState(selectedAssets: {});
+    state = const MultiSelectState(
+      selectedAssets: {},
+      lockedSelectionAssets: {},
+      forceEnable: false,
+    );
   }
 
   /// Bucket bulk operations
@@ -131,6 +163,12 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
 
     state = state.copyWith(selectedAssets: selectedAssets);
   }
+
+  void setLockedSelectionAssets(Set<BaseAsset> assets) {
+    state = state.copyWith(
+      lockedSelectionAssets: assets,
+    );
+  }
 }
 
 final bucketSelectionProvider = Provider.family<bool, List<BaseAsset>>(
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index aa40ababfb..4bf287c08a 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -1,6 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/memory.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
@@ -78,6 +79,7 @@ import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/remote_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_library.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_asset_selection_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_memory.page.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.page.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
@@ -422,6 +424,11 @@ class AppRouter extends RootStackRouter {
       page: DriftLibraryRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftAssetSelectionTimelineRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
+
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 08e4a44ecb..f752c2dc8a 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -634,6 +634,55 @@ class DriftArchiveRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftAssetSelectionTimelinePage]
+class DriftAssetSelectionTimelineRoute
+    extends PageRouteInfo<DriftAssetSelectionTimelineRouteArgs> {
+  DriftAssetSelectionTimelineRoute({
+    Key? key,
+    Set<BaseAsset> lockedSelectionAssets = const {},
+    List<PageRouteInfo>? children,
+  }) : super(
+          DriftAssetSelectionTimelineRoute.name,
+          args: DriftAssetSelectionTimelineRouteArgs(
+            key: key,
+            lockedSelectionAssets: lockedSelectionAssets,
+          ),
+          initialChildren: children,
+        );
+
+  static const String name = 'DriftAssetSelectionTimelineRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<DriftAssetSelectionTimelineRouteArgs>(
+        orElse: () => const DriftAssetSelectionTimelineRouteArgs(),
+      );
+      return DriftAssetSelectionTimelinePage(
+        key: args.key,
+        lockedSelectionAssets: args.lockedSelectionAssets,
+      );
+    },
+  );
+}
+
+class DriftAssetSelectionTimelineRouteArgs {
+  const DriftAssetSelectionTimelineRouteArgs({
+    this.key,
+    this.lockedSelectionAssets = const {},
+  });
+
+  final Key? key;
+
+  final Set<BaseAsset> lockedSelectionAssets;
+
+  @override
+  String toString() {
+    return 'DriftAssetSelectionTimelineRouteArgs{key: $key, lockedSelectionAssets: $lockedSelectionAssets}';
+  }
+}
+
 /// generated route for
 /// [DriftFavoritePage]
 class DriftFavoriteRoute extends PageRouteInfo<void> {
diff --git a/mobile/lib/widgets/common/selection_sliver_app_bar.dart b/mobile/lib/widgets/common/selection_sliver_app_bar.dart
new file mode 100644
index 0000000000..2f06934bc0
--- /dev/null
+++ b/mobile/lib/widgets/common/selection_sliver_app_bar.dart
@@ -0,0 +1,77 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+
+class SelectionSliverAppBar extends ConsumerStatefulWidget {
+  const SelectionSliverAppBar({
+    super.key,
+  });
+
+  @override
+  ConsumerState<SelectionSliverAppBar> createState() =>
+      _SelectionSliverAppBarState();
+}
+
+class _SelectionSliverAppBarState extends ConsumerState<SelectionSliverAppBar> {
+  @override
+  Widget build(BuildContext context) {
+    final selection = ref.watch(
+      multiSelectProvider.select((s) => s.selectedAssets),
+    );
+
+    final toExclude = ref.watch(
+      multiSelectProvider.select((s) => s.lockedSelectionAssets),
+    );
+
+    final filteredAssets = selection.where((asset) {
+      return !toExclude.contains(asset);
+    }).toSet();
+
+    onDone(Set<BaseAsset> selected) {
+      ref.read(multiSelectProvider.notifier).reset();
+      context.maybePop<Set<BaseAsset>>(selected);
+    }
+
+    return SliverAppBar(
+      floating: true,
+      pinned: true,
+      snap: false,
+      backgroundColor: context.colorScheme.surfaceContainer,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(Radius.circular(5)),
+      ),
+      automaticallyImplyLeading: false,
+      leading: IconButton(
+        icon: const Icon(Icons.close_rounded),
+        onPressed: () {
+          ref.read(multiSelectProvider.notifier).reset();
+          context.pop<Set<BaseAsset>>(null);
+        },
+      ),
+      centerTitle: true,
+      title: Text(
+        "Select {count}".t(
+          context: context,
+          args: {
+            'count': filteredAssets.length.toString(),
+          },
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => onDone(filteredAssets),
+          child: Text(
+            'done'.t(context: context),
+            style: context.textTheme.titleSmall?.copyWith(
+              color: context.colorScheme.primary,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

From bbfff45058b51189dc5102a38e3072dbbd8b6c2f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 12:18:58 +0200
Subject: [PATCH 149/337] chore(deps): update redis:6.2-alpine docker digest to
 03fd052 (#19804)

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 f43e0cd1b0..6ec5402360 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -36,7 +36,7 @@ services:
       - 2285:2285
 
   redis:
-    image: redis:6.2-alpine@sha256:3211c33a618c457e5d241922c975dbc4f446d0bdb2dc75694f5573ef8e2d01fa
+    image: redis:6.2-alpine@sha256:03fd052257735b41cd19f3d8ae9782926bf9b704fb6a9dc5e29f9ccfbe8827f0
 
   database:
     image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0@sha256:3aef84a0a4fabbda17ef115c3019ba0c914ec73e9f6e59203674322d858b8eea

From 1f9813a28e9bb56da4cc26f389173807975cd5e5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 12:26:07 +0100
Subject: [PATCH 150/337] chore(deps): update github/codeql-action action to
 v3.29.2 (#19806)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/static_analysis.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1bc5a830c2..6f1e68afce 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -50,7 +50,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,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@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.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
@@ -76,6 +76,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           category: '/language:${{matrix.language}}'
diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index 2a6c6261a8..0344189043 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -130,7 +130,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           sarif_file: results.sarif
           category: zizmor

From df4a27e8a7d3e64c9d625a734814d6d9ea6ed29a Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 8 Jul 2025 08:17:40 -0400
Subject: [PATCH 151/337] feat: sql-tools overrides (#19796)

---
 server/src/bin/migrations.ts                  | 14 ++--
 server/src/schema/functions.ts                | 15 ----
 .../migrations/1751924596408-AddOverrides.ts  | 66 +++++++++++++++++
 server/src/schema/tables/asset.table.ts       |  2 -
 server/src/schema/tables/face-search.table.ts |  1 -
 .../src/schema/tables/geodata-places.table.ts |  7 +-
 .../comparers/override.comparer.spec.ts       | 69 +++++++++++++++++
 .../sql-tools/comparers/override.comparer.ts  | 29 ++++++++
 server/src/sql-tools/contexts/base-context.ts | 74 +++++++++++++++++++
 .../processor-context.ts}                     | 53 ++-----------
 .../src/sql-tools/contexts/reader-context.ts  |  8 ++
 server/src/sql-tools/helpers.ts               | 41 +++++++++-
 .../processors/check-constraint.processor.ts  |  6 +-
 .../sql-tools/processors/column.processor.ts  |  8 +-
 .../configuration-parameter.processor.ts      |  6 +-
 .../processors/database.processor.ts          |  4 +-
 .../sql-tools/processors/enum.processor.ts    |  4 +-
 .../processors/extension.processor.ts         |  8 +-
 .../foreign-key-column.processor.ts           | 12 +--
 .../foreign-key-constraint.processor.ts       | 22 +++---
 .../processors/function.processor.ts          |  8 +-
 .../sql-tools/processors/index.processor.ts   | 18 ++---
 server/src/sql-tools/processors/index.ts      |  2 +
 .../processors/override.processor.ts          | 50 +++++++++++++
 .../primary-key-contraint.processor.ts        |  6 +-
 .../sql-tools/processors/table.processor.ts   |  6 +-
 .../sql-tools/processors/trigger.processor.ts |  6 +-
 .../processors/unique-constraint.processor.ts | 12 +--
 server/src/sql-tools/readers/column.reader.ts | 16 ++--
 .../src/sql-tools/readers/comment.reader.ts   |  6 +-
 .../sql-tools/readers/constraint.reader.ts    | 12 +--
 .../src/sql-tools/readers/extension.reader.ts |  6 +-
 .../src/sql-tools/readers/function.reader.ts  |  8 +-
 server/src/sql-tools/readers/index.reader.ts  |  8 +-
 server/src/sql-tools/readers/index.ts         |  7 +-
 server/src/sql-tools/readers/name.reader.ts   |  6 +-
 .../src/sql-tools/readers/override.reader.ts  | 19 +++++
 .../src/sql-tools/readers/parameter.reader.ts |  8 +-
 server/src/sql-tools/readers/table.reader.ts  |  8 +-
 .../src/sql-tools/readers/trigger.reader.ts   |  8 +-
 server/src/sql-tools/schema-diff.spec.ts      |  4 +
 server/src/sql-tools/schema-diff.ts           | 20 +++--
 server/src/sql-tools/schema-from-code.spec.ts | 19 ++++-
 server/src/sql-tools/schema-from-code.ts      | 52 ++++++++++---
 server/src/sql-tools/schema-from-database.ts  | 28 +++----
 .../transformers/column.transformer.spec.ts   | 19 +++--
 .../transformers/column.transformer.ts        |  4 +-
 .../constraint.transformer.spec.ts            | 13 ++--
 .../transformers/constraint.transformer.ts    |  4 +-
 .../transformers/enum.transformer.ts          |  4 +-
 .../extension.transformer.spec.ts             |  7 +-
 .../transformers/extension.transformer.ts     |  4 +-
 .../transformers/function.transformer.spec.ts |  5 +-
 .../transformers/function.transformer.ts      |  6 +-
 .../transformers/index.transformer.spec.ts    | 15 ++--
 .../transformers/index.transformer.ts         |  4 +-
 server/src/sql-tools/transformers/index.ts    |  2 +
 .../transformers/override.transformer.ts      | 37 ++++++++++
 .../transformers/parameter.transformer.ts     |  4 +-
 .../transformers/table.transformer.spec.ts    | 15 ++--
 .../transformers/table.transformer.ts         |  4 +-
 .../transformers/trigger.transformer.spec.ts  | 11 ++-
 .../transformers/trigger.transformer.ts       |  4 +-
 server/src/sql-tools/transformers/types.ts    |  3 +-
 server/src/sql-tools/types.ts                 | 58 +++++++++++----
 .../check-constraint-default-name.stub.ts     |  1 +
 .../check-constraint-override-name.stub.ts    |  1 +
 .../test/sql-tools/column-create-date.stub.ts |  1 +
 .../sql-tools/column-default-boolean.stub.ts  |  1 +
 .../sql-tools/column-default-date.stub.ts     |  1 +
 .../sql-tools/column-default-function.stub.ts |  1 +
 .../sql-tools/column-default-null.stub.ts     |  1 +
 .../sql-tools/column-default-number.stub.ts   |  1 +
 .../sql-tools/column-default-string.stub.ts   |  1 +
 .../test/sql-tools/column-delete-date.stub.ts |  1 +
 .../test/sql-tools/column-enum-type.stub.ts   |  1 +
 .../sql-tools/column-generated-identity.ts    |  1 +
 .../sql-tools/column-generated-uuid.stub.ts   |  1 +
 .../sql-tools/column-index-name-default.ts    |  1 +
 server/test/sql-tools/column-index-name.ts    |  1 +
 .../column-inferred-nullable.stub.ts          |  1 +
 .../sql-tools/column-name-default.stub.ts     |  1 +
 .../sql-tools/column-name-override.stub.ts    |  1 +
 .../test/sql-tools/column-name-string.stub.ts |  1 +
 server/test/sql-tools/column-nullable.stub.ts |  1 +
 .../sql-tools/column-string-length.stub.ts    |  1 +
 ...umn-unique-constraint-name-default.stub.ts |  1 +
 ...mn-unique-constraint-name-override.stub.ts |  1 +
 .../test/sql-tools/column-update-date.stub.ts |  1 +
 ...oreign-key-constraint-column-order.stub.ts |  1 +
 ...eign-key-constraint-missing-column.stub.ts |  1 +
 ...onstraint-missing-reference-column.stub.ts |  1 +
 ...constraint-missing-reference-table.stub.ts |  1 +
 ...gn-key-constraint-multiple-columns.stub.ts |  1 +
 .../foreign-key-constraint-no-index.stub.ts   |  1 +
 .../foreign-key-constraint-no-primary.stub.ts |  1 +
 .../sql-tools/foreign-key-constraint.stub.ts  |  1 +
 .../foreign-key-inferred-type.stub.ts         |  1 +
 ...foreign-key-with-unique-constraint.stub.ts |  1 +
 .../test/sql-tools/index-name-default.stub.ts |  1 +
 .../sql-tools/index-name-override.stub.ts     |  1 +
 .../test/sql-tools/index-with-expression.ts   |  1 +
 .../test/sql-tools/index-with-where.stub.ts   |  1 +
 ...rimary-key-constraint-name-default.stub.ts |  1 +
 ...imary-key-constraint-name-override.stub.ts |  1 +
 .../test/sql-tools/table-name-default.stub.ts |  1 +
 .../sql-tools/table-name-override.stub.ts     |  1 +
 .../table-name-string-option.stub.ts          |  1 +
 .../sql-tools/trigger-after-delete.stub.ts    |  1 +
 .../sql-tools/trigger-before-update.stub.ts   |  1 +
 .../sql-tools/trigger-name-default.stub.ts    |  1 +
 .../sql-tools/trigger-name-override.stub.ts   |  1 +
 .../unique-constraint-name-default.stub.ts    |  1 +
 .../unique-constraint-name-override.stub.ts   |  1 +
 114 files changed, 775 insertions(+), 289 deletions(-)
 create mode 100644 server/src/schema/migrations/1751924596408-AddOverrides.ts
 create mode 100644 server/src/sql-tools/comparers/override.comparer.spec.ts
 create mode 100644 server/src/sql-tools/comparers/override.comparer.ts
 create mode 100644 server/src/sql-tools/contexts/base-context.ts
 rename server/src/sql-tools/{schema-builder.ts => contexts/processor-context.ts} (68%)
 create mode 100644 server/src/sql-tools/contexts/reader-context.ts
 create mode 100644 server/src/sql-tools/processors/override.processor.ts
 create mode 100644 server/src/sql-tools/readers/override.reader.ts
 create mode 100644 server/src/sql-tools/transformers/override.transformer.ts

diff --git a/server/src/bin/migrations.ts b/server/src/bin/migrations.ts
index b3329e6331..81f5c7e0ab 100644
--- a/server/src/bin/migrations.ts
+++ b/server/src/bin/migrations.ts
@@ -107,25 +107,21 @@ const compare = async () => {
   const { database } = configRepository.getEnv();
   const db = postgres(asPostgresConnectionConfig(database.config));
 
-  const source = schemaFromCode();
+  const source = schemaFromCode({ overrides: true });
   const target = await schemaFromDatabase(db, {});
 
-  const sourceParams = new Set(source.parameters.map(({ name }) => name));
-  target.parameters = target.parameters.filter(({ name }) => sourceParams.has(name));
-
-  const sourceTables = new Set(source.tables.map(({ name }) => name));
-  target.tables = target.tables.filter(({ name }) => sourceTables.has(name));
-
   console.log(source.warnings.join('\n'));
 
   const up = schemaDiff(source, target, {
     tables: { ignoreExtra: true },
     functions: { ignoreExtra: false },
+    parameters: { ignoreExtra: true },
   });
   const down = schemaDiff(target, source, {
-    tables: { ignoreExtra: false },
+    tables: { ignoreExtra: false, ignoreMissing: true },
     functions: { ignoreExtra: false },
-    extension: { ignoreMissing: true },
+    extensions: { ignoreMissing: true },
+    parameters: { ignoreMissing: true },
   });
 
   return { up, down };
diff --git a/server/src/schema/functions.ts b/server/src/schema/functions.ts
index d4c97e1966..1b7a4f884c 100644
--- a/server/src/schema/functions.ts
+++ b/server/src/schema/functions.ts
@@ -20,7 +20,6 @@ export const immich_uuid_v7 = registerFunction({
       ),
       'hex')::uuid;
 `,
-  synchronize: false,
 });
 
 export const album_user_after_insert = registerFunction({
@@ -33,7 +32,6 @@ export const album_user_after_insert = registerFunction({
       WHERE "id" IN (SELECT DISTINCT "albumsId" FROM inserted_rows);
       RETURN NULL;
     END`,
-  synchronize: false,
 });
 
 export const updated_at = registerFunction({
@@ -48,7 +46,6 @@ export const updated_at = registerFunction({
         new."updateId" = immich_uuid_v7(clock_timestamp);
         return new;
     END;`,
-  synchronize: false,
 });
 
 export const f_concat_ws = registerFunction({
@@ -59,7 +56,6 @@ export const f_concat_ws = registerFunction({
   parallel: 'safe',
   behavior: 'immutable',
   body: `SELECT array_to_string($2, $1)`,
-  synchronize: false,
 });
 
 export const f_unaccent = registerFunction({
@@ -71,7 +67,6 @@ export const f_unaccent = registerFunction({
   strict: true,
   behavior: 'immutable',
   return: `unaccent('unaccent', $1)`,
-  synchronize: false,
 });
 
 export const ll_to_earth_public = registerFunction({
@@ -83,7 +78,6 @@ export const ll_to_earth_public = registerFunction({
   strict: true,
   behavior: 'immutable',
   body: `SELECT public.cube(public.cube(public.cube(public.earth()*cos(radians(latitude))*cos(radians(longitude))),public.earth()*cos(radians(latitude))*sin(radians(longitude))),public.earth()*sin(radians(latitude)))::public.earth`,
-  synchronize: false,
 });
 
 export const users_delete_audit = registerFunction({
@@ -97,7 +91,6 @@ export const users_delete_audit = registerFunction({
       FROM OLD;
       RETURN NULL;
     END`,
-  synchronize: false,
 });
 
 export const partners_delete_audit = registerFunction({
@@ -111,7 +104,6 @@ export const partners_delete_audit = registerFunction({
       FROM OLD;
       RETURN NULL;
     END`,
-  synchronize: false,
 });
 
 export const assets_delete_audit = registerFunction({
@@ -125,7 +117,6 @@ export const assets_delete_audit = registerFunction({
       FROM OLD;
       RETURN NULL;
     END`,
-  synchronize: false,
 });
 
 export const albums_delete_audit = registerFunction({
@@ -139,7 +130,6 @@ export const albums_delete_audit = registerFunction({
       FROM OLD;
       RETURN NULL;
     END`,
-  synchronize: false,
 });
 
 export const album_assets_delete_audit = registerFunction({
@@ -153,7 +143,6 @@ export const album_assets_delete_audit = registerFunction({
       WHERE "albumsId" IN (SELECT "id" FROM albums WHERE "id" IN (SELECT "albumsId" FROM OLD));
       RETURN NULL;
     END`,
-  synchronize: false,
 });
 
 export const album_users_delete_audit = registerFunction({
@@ -174,7 +163,6 @@ export const album_users_delete_audit = registerFunction({
 
       RETURN NULL;
     END`,
-  synchronize: false,
 });
 
 export const memories_delete_audit = registerFunction({
@@ -188,7 +176,6 @@ export const memories_delete_audit = registerFunction({
       FROM OLD;
       RETURN NULL;
     END`,
-  synchronize: false,
 });
 
 export const memory_assets_delete_audit = registerFunction({
@@ -202,7 +189,6 @@ export const memory_assets_delete_audit = registerFunction({
       WHERE "memoriesId" IN (SELECT "id" FROM memories WHERE "id" IN (SELECT "memoriesId" FROM OLD));
       RETURN NULL;
     END`,
-  synchronize: false,
 });
 
 export const stacks_delete_audit = registerFunction({
@@ -216,5 +202,4 @@ export const stacks_delete_audit = registerFunction({
       FROM OLD;
       RETURN NULL;
     END`,
-  synchronize: false,
 });
diff --git a/server/src/schema/migrations/1751924596408-AddOverrides.ts b/server/src/schema/migrations/1751924596408-AddOverrides.ts
new file mode 100644
index 0000000000..14d3359f4d
--- /dev/null
+++ b/server/src/schema/migrations/1751924596408-AddOverrides.ts
@@ -0,0 +1,66 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`CREATE TABLE "migration_overrides" ("name" character varying NOT NULL, "value" jsonb NOT NULL);`.execute(db);
+  await sql`ALTER TABLE "migration_overrides" ADD CONSTRAINT "migration_overrides_pkey" PRIMARY KEY ("name");`.execute(db); 
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_immich_uuid_v7', '{"type":"function","name":"immich_uuid_v7","sql":"CREATE OR REPLACE FUNCTION immich_uuid_v7(p_timestamp timestamp with time zone default clock_timestamp())\\n  RETURNS uuid\\n  VOLATILE LANGUAGE SQL\\n  AS $$\\n    SELECT encode(\\n      set_bit(\\n        set_bit(\\n          overlay(uuid_send(gen_random_uuid())\\n                  placing substring(int8send(floor(extract(epoch from p_timestamp) * 1000)::bigint) from 3)\\n                  from 1 for 6\\n          ),\\n          52, 1\\n        ),\\n        53, 1\\n      ),\\n      ''hex'')::uuid;\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_album_user_after_insert', '{"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 albums SET \\"updatedAt\\" = clock_timestamp(), \\"updateId\\" = immich_uuid_v7(clock_timestamp())\\n      WHERE \\"id\\" IN (SELECT DISTINCT \\"albumsId\\" FROM inserted_rows);\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_updated_at', '{"type":"function","name":"updated_at","sql":"CREATE OR REPLACE FUNCTION updated_at()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    DECLARE\\n        clock_timestamp TIMESTAMP := clock_timestamp();\\n    BEGIN\\n        new.\\"updatedAt\\" = clock_timestamp;\\n        new.\\"updateId\\" = immich_uuid_v7(clock_timestamp);\\n        return new;\\n    END;\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_f_concat_ws', '{"type":"function","name":"f_concat_ws","sql":"CREATE OR REPLACE FUNCTION f_concat_ws(text, text[])\\n  RETURNS text\\n  PARALLEL SAFE IMMUTABLE LANGUAGE SQL\\n  AS $$SELECT array_to_string($2, $1)$$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_f_unaccent', '{"type":"function","name":"f_unaccent","sql":"CREATE OR REPLACE FUNCTION f_unaccent(text)\\n  RETURNS text\\n  PARALLEL SAFE STRICT IMMUTABLE LANGUAGE SQL\\n    RETURN unaccent(''unaccent'', $1)"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_ll_to_earth_public', '{"type":"function","name":"ll_to_earth_public","sql":"CREATE OR REPLACE FUNCTION ll_to_earth_public(latitude double precision, longitude double precision)\\n  RETURNS public.earth\\n  PARALLEL SAFE STRICT IMMUTABLE LANGUAGE SQL\\n  AS $$SELECT public.cube(public.cube(public.cube(public.earth()*cos(radians(latitude))*cos(radians(longitude))),public.earth()*cos(radians(latitude))*sin(radians(longitude))),public.earth()*sin(radians(latitude)))::public.earth$$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_users_delete_audit', '{"type":"function","name":"users_delete_audit","sql":"CREATE OR REPLACE FUNCTION users_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO users_audit (\\"userId\\")\\n      SELECT \\"id\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_partners_delete_audit', '{"type":"function","name":"partners_delete_audit","sql":"CREATE OR REPLACE FUNCTION partners_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO partners_audit (\\"sharedById\\", \\"sharedWithId\\")\\n      SELECT \\"sharedById\\", \\"sharedWithId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_assets_delete_audit', '{"type":"function","name":"assets_delete_audit","sql":"CREATE OR REPLACE FUNCTION assets_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO assets_audit (\\"assetId\\", \\"ownerId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_albums_delete_audit', '{"type":"function","name":"albums_delete_audit","sql":"CREATE OR REPLACE FUNCTION albums_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO albums_audit (\\"albumId\\", \\"userId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_album_assets_delete_audit', '{"type":"function","name":"album_assets_delete_audit","sql":"CREATE OR REPLACE FUNCTION album_assets_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO album_assets_audit (\\"albumId\\", \\"assetId\\")\\n      SELECT \\"albumsId\\", \\"assetsId\\" FROM OLD\\n      WHERE \\"albumsId\\" IN (SELECT \\"id\\" FROM albums WHERE \\"id\\" IN (SELECT \\"albumsId\\" FROM OLD));\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_album_users_delete_audit', '{"type":"function","name":"album_users_delete_audit","sql":"CREATE OR REPLACE FUNCTION album_users_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO albums_audit (\\"albumId\\", \\"userId\\")\\n      SELECT \\"albumsId\\", \\"usersId\\"\\n      FROM OLD;\\n\\n      IF pg_trigger_depth() = 1 THEN\\n        INSERT INTO album_users_audit (\\"albumId\\", \\"userId\\")\\n        SELECT \\"albumsId\\", \\"usersId\\"\\n        FROM OLD;\\n      END IF;\\n\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_memories_delete_audit', '{"type":"function","name":"memories_delete_audit","sql":"CREATE OR REPLACE FUNCTION memories_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO memories_audit (\\"memoryId\\", \\"userId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_memory_assets_delete_audit', '{"type":"function","name":"memory_assets_delete_audit","sql":"CREATE OR REPLACE FUNCTION memory_assets_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO memory_assets_audit (\\"memoryId\\", \\"assetId\\")\\n      SELECT \\"memoriesId\\", \\"assetsId\\" FROM OLD\\n      WHERE \\"memoriesId\\" IN (SELECT \\"id\\" FROM memories WHERE \\"id\\" IN (SELECT \\"memoriesId\\" FROM OLD));\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_stacks_delete_audit', '{"type":"function","name":"stacks_delete_audit","sql":"CREATE OR REPLACE FUNCTION stacks_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO stacks_audit (\\"stackId\\", \\"userId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_users_delete_audit', '{"type":"trigger","name":"users_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"users_delete_audit\\"\\n  AFTER DELETE ON \\"users\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION users_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_users_updated_at', '{"type":"trigger","name":"users_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"users_updated_at\\"\\n  BEFORE UPDATE ON \\"users\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_libraries_updated_at', '{"type":"trigger","name":"libraries_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"libraries_updated_at\\"\\n  BEFORE UPDATE ON \\"libraries\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_stacks_delete_audit', '{"type":"trigger","name":"stacks_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"stacks_delete_audit\\"\\n  AFTER DELETE ON \\"asset_stack\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION stacks_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_stacks_updated_at', '{"type":"trigger","name":"stacks_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"stacks_updated_at\\"\\n  BEFORE UPDATE ON \\"asset_stack\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_assets_delete_audit', '{"type":"trigger","name":"assets_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"assets_delete_audit\\"\\n  AFTER DELETE ON \\"assets\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION assets_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_assets_updated_at', '{"type":"trigger","name":"assets_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"assets_updated_at\\"\\n  BEFORE UPDATE ON \\"assets\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_idx_originalfilename_trigram', '{"type":"index","name":"idx_originalfilename_trigram","sql":"CREATE INDEX \\"idx_originalfilename_trigram\\" ON \\"assets\\" USING gin (f_unaccent(\\"originalFileName\\") gin_trgm_ops)"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_idx_local_date_time_month', '{"type":"index","name":"idx_local_date_time_month","sql":"CREATE INDEX \\"idx_local_date_time_month\\" ON \\"assets\\" ((date_trunc(''MONTH''::text, (\\"localDateTime\\" AT TIME ZONE ''UTC''::text)) AT TIME ZONE ''UTC''::text))"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_idx_local_date_time', '{"type":"index","name":"idx_local_date_time","sql":"CREATE INDEX \\"idx_local_date_time\\" ON \\"assets\\" (((\\"localDateTime\\" at time zone ''UTC'')::date))"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_UQ_assets_owner_library_checksum', '{"type":"index","name":"UQ_assets_owner_library_checksum","sql":"CREATE UNIQUE INDEX \\"UQ_assets_owner_library_checksum\\" ON \\"assets\\" (\\"ownerId\\", \\"libraryId\\", \\"checksum\\") WHERE (\\"libraryId\\" IS NOT NULL)"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_UQ_assets_owner_checksum', '{"type":"index","name":"UQ_assets_owner_checksum","sql":"CREATE UNIQUE INDEX \\"UQ_assets_owner_checksum\\" ON \\"assets\\" (\\"ownerId\\", \\"checksum\\") WHERE (\\"libraryId\\" IS NULL)"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_albums_delete_audit', '{"type":"trigger","name":"albums_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"albums_delete_audit\\"\\n  AFTER DELETE ON \\"albums\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION albums_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_albums_updated_at', '{"type":"trigger","name":"albums_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"albums_updated_at\\"\\n  BEFORE UPDATE ON \\"albums\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_activity_updated_at', '{"type":"trigger","name":"activity_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"activity_updated_at\\"\\n  BEFORE UPDATE ON \\"activity\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_IDX_activity_like', '{"type":"index","name":"IDX_activity_like","sql":"CREATE UNIQUE INDEX \\"IDX_activity_like\\" ON \\"activity\\" (\\"assetId\\", \\"userId\\", \\"albumId\\") WHERE (\\"isLiked\\" = true)"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_assets_delete_audit', '{"type":"trigger","name":"album_assets_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"album_assets_delete_audit\\"\\n  AFTER DELETE ON \\"albums_assets_assets\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() <= 1)\\n  EXECUTE FUNCTION album_assets_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_assets_updated_at', '{"type":"trigger","name":"album_assets_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"album_assets_updated_at\\"\\n  BEFORE UPDATE ON \\"albums_assets_assets\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_users_delete_audit', '{"type":"trigger","name":"album_users_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"album_users_delete_audit\\"\\n  AFTER DELETE ON \\"albums_shared_users_users\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() <= 1)\\n  EXECUTE FUNCTION album_users_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_user_after_insert', '{"type":"trigger","name":"album_user_after_insert","sql":"CREATE OR REPLACE TRIGGER \\"album_user_after_insert\\"\\n  AFTER INSERT ON \\"albums_shared_users_users\\"\\n  REFERENCING NEW TABLE AS \\"inserted_rows\\"\\n  FOR EACH STATEMENT\\n  EXECUTE FUNCTION album_user_after_insert();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_users_updated_at', '{"type":"trigger","name":"album_users_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"album_users_updated_at\\"\\n  BEFORE UPDATE ON \\"albums_shared_users_users\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_api_keys_updated_at', '{"type":"trigger","name":"api_keys_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"api_keys_updated_at\\"\\n  BEFORE UPDATE ON \\"api_keys\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_person_updated_at', '{"type":"trigger","name":"person_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"person_updated_at\\"\\n  BEFORE UPDATE ON \\"person\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_files_updated_at', '{"type":"trigger","name":"asset_files_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"asset_files_updated_at\\"\\n  BEFORE UPDATE ON \\"asset_files\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_exif_updated_at', '{"type":"trigger","name":"asset_exif_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"asset_exif_updated_at\\"\\n  BEFORE UPDATE ON \\"exif\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_face_index', '{"type":"index","name":"face_index","sql":"CREATE INDEX \\"face_index\\" ON \\"face_search\\" USING hnsw (embedding vector_cosine_ops) WITH (ef_construction = 300, m = 16)"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_IDX_geodata_gist_earthcoord', '{"type":"index","name":"IDX_geodata_gist_earthcoord","sql":"CREATE INDEX \\"IDX_geodata_gist_earthcoord\\" ON \\"geodata_places\\" (ll_to_earth_public(latitude, longitude))"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_idx_geodata_places_name', '{"type":"index","name":"idx_geodata_places_name","sql":"CREATE INDEX \\"idx_geodata_places_name\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"name\\") gin_trgm_ops)"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_idx_geodata_places_admin2_name', '{"type":"index","name":"idx_geodata_places_admin2_name","sql":"CREATE INDEX \\"idx_geodata_places_admin2_name\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"admin2Name\\") gin_trgm_ops)"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_idx_geodata_places_admin1_name', '{"type":"index","name":"idx_geodata_places_admin1_name","sql":"CREATE INDEX \\"idx_geodata_places_admin1_name\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"admin1Name\\") gin_trgm_ops)"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_idx_geodata_places_alternate_names', '{"type":"index","name":"idx_geodata_places_alternate_names","sql":"CREATE INDEX \\"idx_geodata_places_alternate_names\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"alternateNames\\") gin_trgm_ops)"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memories_delete_audit', '{"type":"trigger","name":"memories_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"memories_delete_audit\\"\\n  AFTER DELETE ON \\"memories\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION memories_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memories_updated_at', '{"type":"trigger","name":"memories_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"memories_updated_at\\"\\n  BEFORE UPDATE ON \\"memories\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memory_assets_delete_audit', '{"type":"trigger","name":"memory_assets_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"memory_assets_delete_audit\\"\\n  AFTER DELETE ON \\"memories_assets_assets\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() <= 1)\\n  EXECUTE FUNCTION memory_assets_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memory_assets_updated_at', '{"type":"trigger","name":"memory_assets_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"memory_assets_updated_at\\"\\n  BEFORE UPDATE ON \\"memories_assets_assets\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_notifications_updated_at', '{"type":"trigger","name":"notifications_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"notifications_updated_at\\"\\n  BEFORE UPDATE ON \\"notifications\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_partners_delete_audit', '{"type":"trigger","name":"partners_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"partners_delete_audit\\"\\n  AFTER DELETE ON \\"partners\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION partners_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_partners_updated_at', '{"type":"trigger","name":"partners_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"partners_updated_at\\"\\n  BEFORE UPDATE ON \\"partners\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_sessions_updated_at', '{"type":"trigger","name":"sessions_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"sessions_updated_at\\"\\n  BEFORE UPDATE ON \\"sessions\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_session_sync_checkpoints_updated_at', '{"type":"trigger","name":"session_sync_checkpoints_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"session_sync_checkpoints_updated_at\\"\\n  BEFORE UPDATE ON \\"session_sync_checkpoints\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_tags_updated_at', '{"type":"trigger","name":"tags_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"tags_updated_at\\"\\n  BEFORE UPDATE ON \\"tags\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`DROP TABLE "migration_overrides";`.execute(db);
+}
diff --git a/server/src/schema/tables/asset.table.ts b/server/src/schema/tables/asset.table.ts
index fcbb0aec76..de7dea2b57 100644
--- a/server/src/schema/tables/asset.table.ts
+++ b/server/src/schema/tables/asset.table.ts
@@ -44,7 +44,6 @@ import { ASSET_CHECKSUM_CONSTRAINT } from 'src/utils/database';
 @Index({
   name: 'idx_local_date_time',
   expression: `(("localDateTime" at time zone 'UTC')::date)`,
-  synchronize: false,
 })
 @Index({
   name: 'idx_local_date_time_month',
@@ -56,7 +55,6 @@ import { ASSET_CHECKSUM_CONSTRAINT } from 'src/utils/database';
   name: 'idx_originalfilename_trigram',
   using: 'gin',
   expression: 'f_unaccent("originalFileName") gin_trgm_ops',
-  synchronize: false,
 })
 // For all assets, each originalpath must be unique per user and library
 export class AssetTable {
diff --git a/server/src/schema/tables/face-search.table.ts b/server/src/schema/tables/face-search.table.ts
index 5ac1357198..600a08833e 100644
--- a/server/src/schema/tables/face-search.table.ts
+++ b/server/src/schema/tables/face-search.table.ts
@@ -7,7 +7,6 @@ import { Column, ForeignKeyColumn, Index, Table } from 'src/sql-tools';
   using: 'hnsw',
   expression: `embedding vector_cosine_ops`,
   with: 'ef_construction = 300, m = 16',
-  synchronize: false,
 })
 export class FaceSearchTable {
   @ForeignKeyColumn(() => AssetFaceTable, {
diff --git a/server/src/schema/tables/geodata-places.table.ts b/server/src/schema/tables/geodata-places.table.ts
index 11c3ef5d25..abdc213e7c 100644
--- a/server/src/schema/tables/geodata-places.table.ts
+++ b/server/src/schema/tables/geodata-places.table.ts
@@ -1,34 +1,29 @@
 import { Column, Index, PrimaryColumn, Table, Timestamp } from 'src/sql-tools';
 
-@Table({ name: 'geodata_places', synchronize: false })
+@Table({ name: 'geodata_places' })
 @Index({
   name: 'idx_geodata_places_alternate_names',
   using: 'gin',
   expression: 'f_unaccent("alternateNames") gin_trgm_ops',
-  synchronize: false,
 })
 @Index({
   name: 'idx_geodata_places_admin1_name',
   using: 'gin',
   expression: 'f_unaccent("admin1Name") gin_trgm_ops',
-  synchronize: false,
 })
 @Index({
   name: 'idx_geodata_places_admin2_name',
   using: 'gin',
   expression: 'f_unaccent("admin2Name") gin_trgm_ops',
-  synchronize: false,
 })
 @Index({
   name: 'idx_geodata_places_name',
   using: 'gin',
   expression: 'f_unaccent("name") gin_trgm_ops',
-  synchronize: false,
 })
 @Index({
   name: 'IDX_geodata_gist_earthcoord',
   expression: 'll_to_earth_public(latitude, longitude)',
-  synchronize: false,
 })
 export class GeodataPlacesTable {
   @PrimaryColumn({ type: 'integer' })
diff --git a/server/src/sql-tools/comparers/override.comparer.spec.ts b/server/src/sql-tools/comparers/override.comparer.spec.ts
new file mode 100644
index 0000000000..22093381ff
--- /dev/null
+++ b/server/src/sql-tools/comparers/override.comparer.spec.ts
@@ -0,0 +1,69 @@
+import { compareOverrides } from 'src/sql-tools/comparers/override.comparer';
+import { DatabaseOverride, Reason } from 'src/sql-tools/types';
+import { describe, expect, it } from 'vitest';
+
+const testOverride: DatabaseOverride = {
+  name: 'test',
+  value: { type: 'function', name: 'test_func', sql: 'func implementation' },
+  synchronize: true,
+};
+
+describe('compareOverrides', () => {
+  describe('onExtra', () => {
+    it('should work', () => {
+      expect(compareOverrides.onExtra(testOverride)).toEqual([
+        {
+          type: 'OverrideDrop',
+          overrideName: 'test',
+          reason: Reason.MissingInSource,
+        },
+      ]);
+    });
+  });
+
+  describe('onMissing', () => {
+    it('should work', () => {
+      expect(compareOverrides.onMissing(testOverride)).toEqual([
+        {
+          type: 'OverrideCreate',
+          override: testOverride,
+          reason: Reason.MissingInTarget,
+        },
+      ]);
+    });
+  });
+
+  describe('onCompare', () => {
+    it('should work', () => {
+      expect(compareOverrides.onCompare(testOverride, testOverride)).toEqual([]);
+    });
+
+    it('should drop and recreate when the value changes', () => {
+      const source: DatabaseOverride = {
+        name: 'test',
+        value: {
+          type: 'function',
+          name: 'test_func',
+          sql: 'func implementation',
+        },
+        synchronize: true,
+      };
+      const target: DatabaseOverride = {
+        name: 'test',
+        value: {
+          type: 'function',
+          name: 'test_func',
+          sql: 'func implementation2',
+        },
+        synchronize: true,
+      };
+      expect(compareOverrides.onCompare(source, target)).toEqual([
+        {
+          override: source,
+          type: 'OverrideUpdate',
+          reason: expect.stringContaining('value is different'),
+        },
+      ]);
+    });
+  });
+});
diff --git a/server/src/sql-tools/comparers/override.comparer.ts b/server/src/sql-tools/comparers/override.comparer.ts
new file mode 100644
index 0000000000..369f7cd59f
--- /dev/null
+++ b/server/src/sql-tools/comparers/override.comparer.ts
@@ -0,0 +1,29 @@
+import { Comparer, DatabaseOverride, Reason } from 'src/sql-tools/types';
+
+export const compareOverrides: Comparer<DatabaseOverride> = {
+  onMissing: (source) => [
+    {
+      type: 'OverrideCreate',
+      override: source,
+      reason: Reason.MissingInTarget,
+    },
+  ],
+  onExtra: (target) => [
+    {
+      type: 'OverrideDrop',
+      overrideName: target.name,
+      reason: Reason.MissingInSource,
+    },
+  ],
+  onCompare: (source, target) => {
+    if (source.value.name !== target.value.name || source.value.sql !== target.value.sql) {
+      const sourceValue = JSON.stringify(source.value);
+      const targetValue = JSON.stringify(target.value);
+      return [
+        { type: 'OverrideUpdate', override: source, reason: `value is different (${sourceValue} vs ${targetValue})` },
+      ];
+    }
+
+    return [];
+  },
+};
diff --git a/server/src/sql-tools/contexts/base-context.ts b/server/src/sql-tools/contexts/base-context.ts
new file mode 100644
index 0000000000..620286cae3
--- /dev/null
+++ b/server/src/sql-tools/contexts/base-context.ts
@@ -0,0 +1,74 @@
+import {
+  BaseContextOptions,
+  DatabaseEnum,
+  DatabaseExtension,
+  DatabaseFunction,
+  DatabaseOverride,
+  DatabaseParameter,
+  DatabaseSchema,
+  DatabaseTable,
+} from 'src/sql-tools/types';
+
+const asOverrideKey = (type: string, name: string) => `${type}:${name}`;
+
+export class BaseContext {
+  databaseName: string;
+  schemaName: string;
+  overrideTableName: string;
+
+  tables: DatabaseTable[] = [];
+  functions: DatabaseFunction[] = [];
+  enums: DatabaseEnum[] = [];
+  extensions: DatabaseExtension[] = [];
+  parameters: DatabaseParameter[] = [];
+  overrides: DatabaseOverride[] = [];
+  warnings: string[] = [];
+
+  constructor(options: BaseContextOptions) {
+    this.databaseName = options.databaseName ?? 'postgres';
+    this.schemaName = options.schemaName ?? 'public';
+    this.overrideTableName = options.overrideTableName ?? 'migration_overrides';
+  }
+
+  getTableByName(name: string) {
+    return this.tables.find((table) => table.name === name);
+  }
+
+  warn(context: string, message: string) {
+    this.warnings.push(`[${context}] ${message}`);
+  }
+
+  build(): DatabaseSchema {
+    const overrideMap = new Map<string, DatabaseOverride>();
+    for (const override of this.overrides) {
+      const { type, name } = override.value;
+      overrideMap.set(asOverrideKey(type, name), override);
+    }
+
+    for (const func of this.functions) {
+      func.override = overrideMap.get(asOverrideKey('function', func.name));
+    }
+
+    for (const { indexes, triggers } of this.tables) {
+      for (const index of indexes) {
+        index.override = overrideMap.get(asOverrideKey('index', index.name));
+      }
+
+      for (const trigger of triggers) {
+        trigger.override = overrideMap.get(asOverrideKey('trigger', trigger.name));
+      }
+    }
+
+    return {
+      databaseName: this.databaseName,
+      schemaName: this.schemaName,
+      tables: this.tables,
+      functions: this.functions,
+      enums: this.enums,
+      extensions: this.extensions,
+      parameters: this.parameters,
+      overrides: this.overrides,
+      warnings: this.warnings,
+    };
+  }
+}
diff --git a/server/src/sql-tools/schema-builder.ts b/server/src/sql-tools/contexts/processor-context.ts
similarity index 68%
rename from server/src/sql-tools/schema-builder.ts
rename to server/src/sql-tools/contexts/processor-context.ts
index e9d82b509a..562880a925 100644
--- a/server/src/sql-tools/schema-builder.ts
+++ b/server/src/sql-tools/contexts/processor-context.ts
@@ -1,45 +1,25 @@
 /* eslint-disable @typescript-eslint/no-unsafe-function-type */
+import { BaseContext } from 'src/sql-tools/contexts/base-context';
 import { ColumnOptions, TableOptions } from 'src/sql-tools/decorators';
 import { asKey } from 'src/sql-tools/helpers';
-import {
-  DatabaseColumn,
-  DatabaseEnum,
-  DatabaseExtension,
-  DatabaseFunction,
-  DatabaseParameter,
-  DatabaseSchema,
-  DatabaseTable,
-  SchemaFromCodeOptions,
-} from 'src/sql-tools/types';
+import { DatabaseColumn, DatabaseTable, SchemaFromCodeOptions } from 'src/sql-tools/types';
 
 type TableMetadata = { options: TableOptions; object: Function; methodToColumn: Map<string | symbol, DatabaseColumn> };
 
-export class SchemaBuilder {
-  databaseName: string;
-  schemaName: string;
-  tables: DatabaseTable[] = [];
-  functions: DatabaseFunction[] = [];
-  enums: DatabaseEnum[] = [];
-  extensions: DatabaseExtension[] = [];
-  parameters: DatabaseParameter[] = [];
-  warnings: string[] = [];
+export class ProcessorContext extends BaseContext {
+  constructor(public options: SchemaFromCodeOptions) {
+    options.createForeignKeyIndexes = options.createForeignKeyIndexes ?? true;
+    options.overrides = options.overrides ?? false;
+    super(options);
+  }
 
   classToTable: WeakMap<Function, DatabaseTable> = new WeakMap();
   tableToMetadata: WeakMap<DatabaseTable, TableMetadata> = new WeakMap();
 
-  constructor(options: SchemaFromCodeOptions) {
-    this.databaseName = options.databaseName ?? 'postgres';
-    this.schemaName = options.schemaName ?? 'public';
-  }
-
   getTableByObject(object: Function) {
     return this.classToTable.get(object);
   }
 
-  getTableByName(name: string) {
-    return this.tables.find((table) => table.name === name);
-  }
-
   getTableMetadata(table: DatabaseTable) {
     const metadata = this.tableToMetadata.get(table);
     if (!metadata) {
@@ -92,10 +72,6 @@ export class SchemaBuilder {
     return asKey('IDX_', table, items);
   }
 
-  warn(context: string, message: string) {
-    this.warnings.push(`[${context}] ${message}`);
-  }
-
   warnMissingTable(context: string, object: object, propertyName?: symbol | string) {
     const label = object.constructor.name + (propertyName ? '.' + String(propertyName) : '');
     this.warn(context, `Unable to find table (${label})`);
@@ -105,17 +81,4 @@ export class SchemaBuilder {
     const label = object.constructor.name + (propertyName ? '.' + String(propertyName) : '');
     this.warn(context, `Unable to find column (${label})`);
   }
-
-  build(): DatabaseSchema {
-    return {
-      databaseName: this.databaseName,
-      schemaName: this.schemaName,
-      tables: this.tables,
-      functions: this.functions,
-      enums: this.enums,
-      extensions: this.extensions,
-      parameters: this.parameters,
-      warnings: this.warnings,
-    };
-  }
 }
diff --git a/server/src/sql-tools/contexts/reader-context.ts b/server/src/sql-tools/contexts/reader-context.ts
new file mode 100644
index 0000000000..94f5c82fc1
--- /dev/null
+++ b/server/src/sql-tools/contexts/reader-context.ts
@@ -0,0 +1,8 @@
+import { BaseContext } from 'src/sql-tools/contexts/base-context';
+import { SchemaFromDatabaseOptions } from 'src/sql-tools/types';
+
+export class ReaderContext extends BaseContext {
+  constructor(public options: SchemaFromDatabaseOptions) {
+    super(options);
+  }
+}
diff --git a/server/src/sql-tools/helpers.ts b/server/src/sql-tools/helpers.ts
index 119fe63291..afa735e282 100644
--- a/server/src/sql-tools/helpers.ts
+++ b/server/src/sql-tools/helpers.ts
@@ -1,6 +1,6 @@
 import { createHash } from 'node:crypto';
 import { ColumnValue } from 'src/sql-tools/decorators/column.decorator';
-import { Comparer, DatabaseColumn, IgnoreOptions, SchemaDiff } from 'src/sql-tools/types';
+import { Comparer, DatabaseColumn, DatabaseOverride, IgnoreOptions, SchemaDiff } from 'src/sql-tools/types';
 
 export const asMetadataKey = (name: string) => `sql-tools:${name}`;
 
@@ -56,6 +56,17 @@ export const haveEqualColumns = (sourceColumns?: string[], targetColumns?: strin
   return setIsEqual(new Set(sourceColumns ?? []), new Set(targetColumns ?? []));
 };
 
+export const haveEqualOverrides = <T extends { override?: DatabaseOverride }>(source: T, target: T) => {
+  if (!source.override || !target.override) {
+    return false;
+  }
+
+  const sourceValue = source.override.value;
+  const targetValue = target.override.value;
+
+  return sourceValue.name === targetValue.name && sourceValue.sql === targetValue.sql;
+};
+
 export const compare = <T extends { name: string; synchronize: boolean }>(
   sources: T[],
   targets: T[],
@@ -72,7 +83,7 @@ export const compare = <T extends { name: string; synchronize: boolean }>(
     const source = sourceMap[key];
     const target = targetMap[key];
 
-    if (isIgnored(source, target, options)) {
+    if (isIgnored(source, target, options ?? true)) {
       continue;
     }
 
@@ -85,6 +96,14 @@ export const compare = <T extends { name: string; synchronize: boolean }>(
     } else if (!source && target) {
       items.push(...comparer.onExtra(target));
     } else {
+      if (
+        haveEqualOverrides(
+          source as unknown as { override?: DatabaseOverride },
+          target as unknown as { override?: DatabaseOverride },
+        )
+      ) {
+        continue;
+      }
       items.push(...comparer.onCompare(source, target));
     }
   }
@@ -97,6 +116,9 @@ const isIgnored = (
   target: { synchronize?: boolean } | undefined,
   options: IgnoreOptions,
 ) => {
+  if (typeof options === 'boolean') {
+    return !options;
+  }
   return (options.ignoreExtra && !source) || (options.ignoreMissing && !target);
 };
 
@@ -165,3 +187,18 @@ export const asColumnComment = (tableName: string, columnName: string, comment:
 export const asColumnList = (columns: string[]) => columns.map((column) => `"${column}"`).join(', ');
 
 export const asForeignKeyConstraintName = (table: string, columns: string[]) => asKey('FK_', table, [...columns]);
+
+export const asJsonString = (value: unknown): string => {
+  return `'${escape(JSON.stringify(value))}'::jsonb`;
+};
+
+const escape = (value: string) => {
+  return value
+    .replaceAll("'", "''")
+    .replaceAll(/[\\]/g, '\\\\')
+    .replaceAll(/[\b]/g, String.raw`\b`)
+    .replaceAll(/[\f]/g, String.raw`\f`)
+    .replaceAll(/[\n]/g, String.raw`\n`)
+    .replaceAll(/[\r]/g, String.raw`\r`)
+    .replaceAll(/[\t]/g, String.raw`\t`);
+};
diff --git a/server/src/sql-tools/processors/check-constraint.processor.ts b/server/src/sql-tools/processors/check-constraint.processor.ts
index 10e5c18791..21ee47ccc6 100644
--- a/server/src/sql-tools/processors/check-constraint.processor.ts
+++ b/server/src/sql-tools/processors/check-constraint.processor.ts
@@ -1,13 +1,13 @@
 import { asKey } from 'src/sql-tools/helpers';
 import { ConstraintType, Processor } from 'src/sql-tools/types';
 
-export const processCheckConstraints: Processor = (builder, items) => {
+export const processCheckConstraints: Processor = (ctx, items) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'checkConstraint')) {
-    const table = builder.getTableByObject(object);
+    const table = ctx.getTableByObject(object);
     if (!table) {
-      builder.warnMissingTable('@Check', object);
+      ctx.warnMissingTable('@Check', object);
       continue;
     }
 
diff --git a/server/src/sql-tools/processors/column.processor.ts b/server/src/sql-tools/processors/column.processor.ts
index 3981ee4036..84c158a234 100644
--- a/server/src/sql-tools/processors/column.processor.ts
+++ b/server/src/sql-tools/processors/column.processor.ts
@@ -2,14 +2,14 @@ import { ColumnOptions } from 'src/sql-tools/decorators/column.decorator';
 import { fromColumnValue } from 'src/sql-tools/helpers';
 import { Processor } from 'src/sql-tools/types';
 
-export const processColumns: Processor = (builder, items) => {
+export const processColumns: Processor = (ctx, items) => {
   for (const {
     type,
     item: { object, propertyName, options },
   } of items.filter((item) => item.type === 'column' || item.type === 'foreignKeyColumn')) {
-    const table = builder.getTableByObject(object.constructor);
+    const table = ctx.getTableByObject(object.constructor);
     if (!table) {
-      builder.warnMissingTable(type === 'column' ? '@Column' : '@ForeignKeyColumn', object, propertyName);
+      ctx.warnMissingTable(type === 'column' ? '@Column' : '@ForeignKeyColumn', object, propertyName);
       continue;
     }
 
@@ -31,7 +31,7 @@ export const processColumns: Processor = (builder, items) => {
 
     const isEnum = !!(options as ColumnOptions).enum;
 
-    builder.addColumn(
+    ctx.addColumn(
       table,
       {
         name: columnName,
diff --git a/server/src/sql-tools/processors/configuration-parameter.processor.ts b/server/src/sql-tools/processors/configuration-parameter.processor.ts
index 4b2d56f103..dbb5cd4636 100644
--- a/server/src/sql-tools/processors/configuration-parameter.processor.ts
+++ b/server/src/sql-tools/processors/configuration-parameter.processor.ts
@@ -1,12 +1,12 @@
 import { fromColumnValue } from 'src/sql-tools/helpers';
 import { Processor } from 'src/sql-tools/types';
 
-export const processConfigurationParameters: Processor = (builder, items) => {
+export const processConfigurationParameters: Processor = (ctx, items) => {
   for (const {
     item: { options },
   } of items.filter((item) => item.type === 'configurationParameter')) {
-    builder.parameters.push({
-      databaseName: builder.databaseName,
+    ctx.parameters.push({
+      databaseName: ctx.databaseName,
       name: options.name,
       value: fromColumnValue(options.value),
       scope: options.scope,
diff --git a/server/src/sql-tools/processors/database.processor.ts b/server/src/sql-tools/processors/database.processor.ts
index 9c9e61a6cf..7158cd9494 100644
--- a/server/src/sql-tools/processors/database.processor.ts
+++ b/server/src/sql-tools/processors/database.processor.ts
@@ -1,10 +1,10 @@
 import { asSnakeCase } from 'src/sql-tools/helpers';
 import { Processor } from 'src/sql-tools/types';
 
-export const processDatabases: Processor = (builder, items) => {
+export const processDatabases: Processor = (ctx, items) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'database')) {
-    builder.databaseName = options.name || asSnakeCase(object.name);
+    ctx.databaseName = options.name || asSnakeCase(object.name);
   }
 };
diff --git a/server/src/sql-tools/processors/enum.processor.ts b/server/src/sql-tools/processors/enum.processor.ts
index d396089c8f..1ef65231c9 100644
--- a/server/src/sql-tools/processors/enum.processor.ts
+++ b/server/src/sql-tools/processors/enum.processor.ts
@@ -1,8 +1,8 @@
 import { Processor } from 'src/sql-tools/types';
 
-export const processEnums: Processor = (builder, items) => {
+export const processEnums: Processor = (ctx, items) => {
   for (const { item } of items.filter((item) => item.type === 'enum')) {
     // TODO log warnings if enum name is not unique
-    builder.enums.push(item);
+    ctx.enums.push(item);
   }
 };
diff --git a/server/src/sql-tools/processors/extension.processor.ts b/server/src/sql-tools/processors/extension.processor.ts
index 97a39c0d8b..068c66883c 100644
--- a/server/src/sql-tools/processors/extension.processor.ts
+++ b/server/src/sql-tools/processors/extension.processor.ts
@@ -1,10 +1,14 @@
 import { Processor } from 'src/sql-tools/types';
 
-export const processExtensions: Processor = (builder, items) => {
+export const processExtensions: Processor = (ctx, items) => {
+  if (ctx.options.extensions === false) {
+    return;
+  }
+
   for (const {
     item: { options },
   } of items.filter((item) => item.type === 'extension')) {
-    builder.extensions.push({
+    ctx.extensions.push({
       name: options.name,
       synchronize: options.synchronize ?? true,
     });
diff --git a/server/src/sql-tools/processors/foreign-key-column.processor.ts b/server/src/sql-tools/processors/foreign-key-column.processor.ts
index a3cac0a85e..e37b6e3f0b 100644
--- a/server/src/sql-tools/processors/foreign-key-column.processor.ts
+++ b/server/src/sql-tools/processors/foreign-key-column.processor.ts
@@ -1,25 +1,25 @@
 import { asForeignKeyConstraintName, asKey } from 'src/sql-tools/helpers';
 import { ActionType, ConstraintType, Processor } from 'src/sql-tools/types';
 
-export const processForeignKeyColumns: Processor = (builder, items) => {
+export const processForeignKeyColumns: Processor = (ctx, items) => {
   for (const {
     item: { object, propertyName, options, target },
   } of items.filter((item) => item.type === 'foreignKeyColumn')) {
-    const { table, column } = builder.getColumnByObjectAndPropertyName(object, propertyName);
+    const { table, column } = ctx.getColumnByObjectAndPropertyName(object, propertyName);
     if (!table) {
-      builder.warnMissingTable('@ForeignKeyColumn', object);
+      ctx.warnMissingTable('@ForeignKeyColumn', object);
       continue;
     }
 
     if (!column) {
       // should be impossible since they are pre-created in `column.processor.ts`
-      builder.warnMissingColumn('@ForeignKeyColumn', object, propertyName);
+      ctx.warnMissingColumn('@ForeignKeyColumn', object, propertyName);
       continue;
     }
 
-    const referenceTable = builder.getTableByObject(target());
+    const referenceTable = ctx.getTableByObject(target());
     if (!referenceTable) {
-      builder.warnMissingTable('@ForeignKeyColumn', object, propertyName);
+      ctx.warnMissingTable('@ForeignKeyColumn', object, propertyName);
       continue;
     }
 
diff --git a/server/src/sql-tools/processors/foreign-key-constraint.processor.ts b/server/src/sql-tools/processors/foreign-key-constraint.processor.ts
index 704e6ed8e4..7c44ab2694 100644
--- a/server/src/sql-tools/processors/foreign-key-constraint.processor.ts
+++ b/server/src/sql-tools/processors/foreign-key-constraint.processor.ts
@@ -1,20 +1,20 @@
 import { asForeignKeyConstraintName } from 'src/sql-tools/helpers';
 import { ActionType, ConstraintType, Processor } from 'src/sql-tools/types';
 
-export const processForeignKeyConstraints: Processor = (builder, items, config) => {
+export const processForeignKeyConstraints: Processor = (ctx, items) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'foreignKeyConstraint')) {
-    const table = builder.getTableByObject(object);
+    const table = ctx.getTableByObject(object);
     if (!table) {
-      builder.warnMissingTable('@ForeignKeyConstraint', { name: 'referenceTable' });
+      ctx.warnMissingTable('@ForeignKeyConstraint', { name: 'referenceTable' });
       continue;
     }
 
-    const referenceTable = builder.getTableByObject(options.referenceTable());
+    const referenceTable = ctx.getTableByObject(options.referenceTable());
     if (!referenceTable) {
       const referenceTableName = options.referenceTable()?.name;
-      builder.warn(
+      ctx.warn(
         '@ForeignKeyConstraint.referenceTable',
         `Unable to find table` + (referenceTableName ? ` (${referenceTableName})` : ''),
       );
@@ -25,16 +25,16 @@ export const processForeignKeyConstraints: Processor = (builder, items, config)
 
     for (const columnName of options.columns) {
       if (!table.columns.some(({ name }) => name === columnName)) {
-        const metadata = builder.getTableMetadata(table);
-        builder.warn('@ForeignKeyConstraint.columns', `Unable to find column (${metadata.object.name}.${columnName})`);
+        const metadata = ctx.getTableMetadata(table);
+        ctx.warn('@ForeignKeyConstraint.columns', `Unable to find column (${metadata.object.name}.${columnName})`);
         missingColumn = true;
       }
     }
 
     for (const columnName of options.referenceColumns || []) {
       if (!referenceTable.columns.some(({ name }) => name === columnName)) {
-        const metadata = builder.getTableMetadata(referenceTable);
-        builder.warn(
+        const metadata = ctx.getTableMetadata(referenceTable);
+        ctx.warn(
           '@ForeignKeyConstraint.referenceColumns',
           `Unable to find column (${metadata.object.name}.${columnName})`,
         );
@@ -67,9 +67,9 @@ export const processForeignKeyConstraints: Processor = (builder, items, config)
       continue;
     }
 
-    if (options.index || options.indexName || config.createForeignKeyIndexes) {
+    if (options.index || options.indexName || ctx.options.createForeignKeyIndexes) {
       table.indexes.push({
-        name: options.indexName || builder.asIndexName(table.name, options.columns),
+        name: options.indexName || ctx.asIndexName(table.name, options.columns),
         tableName: table.name,
         columnNames: options.columns,
         unique: false,
diff --git a/server/src/sql-tools/processors/function.processor.ts b/server/src/sql-tools/processors/function.processor.ts
index 669d1a5ec0..9b351b77f7 100644
--- a/server/src/sql-tools/processors/function.processor.ts
+++ b/server/src/sql-tools/processors/function.processor.ts
@@ -1,8 +1,12 @@
 import { Processor } from 'src/sql-tools/types';
 
-export const processFunctions: Processor = (builder, items) => {
+export const processFunctions: Processor = (ctx, items) => {
+  if (ctx.options.functions === false) {
+    return;
+  }
+
   for (const { item } of items.filter((item) => item.type === 'function')) {
     // TODO log warnings if function name is not unique
-    builder.functions.push(item);
+    ctx.functions.push(item);
   }
 };
diff --git a/server/src/sql-tools/processors/index.processor.ts b/server/src/sql-tools/processors/index.processor.ts
index 546bac236a..cd2ee1507e 100644
--- a/server/src/sql-tools/processors/index.processor.ts
+++ b/server/src/sql-tools/processors/index.processor.ts
@@ -1,17 +1,17 @@
 import { Processor } from 'src/sql-tools/types';
 
-export const processIndexes: Processor = (builder, items, config) => {
+export const processIndexes: Processor = (ctx, items) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'index')) {
-    const table = builder.getTableByObject(object);
+    const table = ctx.getTableByObject(object);
     if (!table) {
-      builder.warnMissingTable('@Check', object);
+      ctx.warnMissingTable('@Check', object);
       continue;
     }
 
     table.indexes.push({
-      name: options.name || builder.asIndexName(table.name, options.columns, options.where),
+      name: options.name || ctx.asIndexName(table.name, options.columns, options.where),
       tableName: table.name,
       unique: options.unique ?? false,
       expression: options.expression,
@@ -28,15 +28,15 @@ export const processIndexes: Processor = (builder, items, config) => {
     type,
     item: { object, propertyName, options },
   } of items.filter((item) => item.type === 'column' || item.type === 'foreignKeyColumn')) {
-    const { table, column } = builder.getColumnByObjectAndPropertyName(object, propertyName);
+    const { table, column } = ctx.getColumnByObjectAndPropertyName(object, propertyName);
     if (!table) {
-      builder.warnMissingTable('@Column', object);
+      ctx.warnMissingTable('@Column', object);
       continue;
     }
 
     if (!column) {
       // should be impossible since they are created in `column.processor.ts`
-      builder.warnMissingColumn('@Column', object, propertyName);
+      ctx.warnMissingColumn('@Column', object, propertyName);
       continue;
     }
 
@@ -45,12 +45,12 @@ export const processIndexes: Processor = (builder, items, config) => {
     }
 
     const isIndexRequested =
-      options.indexName || options.index || (type === 'foreignKeyColumn' && config.createForeignKeyIndexes);
+      options.indexName || options.index || (type === 'foreignKeyColumn' && ctx.options.createForeignKeyIndexes);
     if (!isIndexRequested) {
       continue;
     }
 
-    const indexName = options.indexName || builder.asIndexName(table.name, [column.name]);
+    const indexName = options.indexName || ctx.asIndexName(table.name, [column.name]);
 
     const isIndexPresent = table.indexes.some((index) => index.name === indexName);
     if (isIndexPresent) {
diff --git a/server/src/sql-tools/processors/index.ts b/server/src/sql-tools/processors/index.ts
index 054540f7b0..feb0a82f05 100644
--- a/server/src/sql-tools/processors/index.ts
+++ b/server/src/sql-tools/processors/index.ts
@@ -8,6 +8,7 @@ import { processForeignKeyColumns } from 'src/sql-tools/processors/foreign-key-c
 import { processForeignKeyConstraints } from 'src/sql-tools/processors/foreign-key-constraint.processor';
 import { processFunctions } from 'src/sql-tools/processors/function.processor';
 import { processIndexes } from 'src/sql-tools/processors/index.processor';
+import { processOverrides } from 'src/sql-tools/processors/override.processor';
 import { processPrimaryKeyConstraints } from 'src/sql-tools/processors/primary-key-contraint.processor';
 import { processTables } from 'src/sql-tools/processors/table.processor';
 import { processTriggers } from 'src/sql-tools/processors/trigger.processor';
@@ -29,4 +30,5 @@ export const processors: Processor[] = [
   processPrimaryKeyConstraints,
   processIndexes,
   processTriggers,
+  processOverrides,
 ];
diff --git a/server/src/sql-tools/processors/override.processor.ts b/server/src/sql-tools/processors/override.processor.ts
new file mode 100644
index 0000000000..67b92fbd40
--- /dev/null
+++ b/server/src/sql-tools/processors/override.processor.ts
@@ -0,0 +1,50 @@
+import { asFunctionCreate } from 'src/sql-tools/transformers/function.transformer';
+import { asIndexCreate } from 'src/sql-tools/transformers/index.transformer';
+import { asTriggerCreate } from 'src/sql-tools/transformers/trigger.transformer';
+import { Processor } from 'src/sql-tools/types';
+
+export const processOverrides: Processor = (ctx) => {
+  if (ctx.options.overrides === false) {
+    return;
+  }
+
+  for (const func of ctx.functions) {
+    if (!func.synchronize) {
+      continue;
+    }
+
+    ctx.overrides.push({
+      name: `function_${func.name}`,
+      value: { type: 'function', name: func.name, sql: asFunctionCreate(func) },
+      synchronize: true,
+    });
+  }
+
+  for (const { triggers, indexes } of ctx.tables) {
+    for (const trigger of triggers) {
+      if (!trigger.synchronize) {
+        continue;
+      }
+
+      ctx.overrides.push({
+        name: `trigger_${trigger.name}`,
+        value: { type: 'trigger', name: trigger.name, sql: asTriggerCreate(trigger) },
+        synchronize: true,
+      });
+    }
+
+    for (const index of indexes) {
+      if (!index.synchronize) {
+        continue;
+      }
+
+      if (index.expression || index.using || index.with || index.where) {
+        ctx.overrides.push({
+          name: `index_${index.name}`,
+          value: { type: 'index', name: index.name, sql: asIndexCreate(index) },
+          synchronize: true,
+        });
+      }
+    }
+  }
+};
diff --git a/server/src/sql-tools/processors/primary-key-contraint.processor.ts b/server/src/sql-tools/processors/primary-key-contraint.processor.ts
index be8983f79a..12fc27db7e 100644
--- a/server/src/sql-tools/processors/primary-key-contraint.processor.ts
+++ b/server/src/sql-tools/processors/primary-key-contraint.processor.ts
@@ -1,8 +1,8 @@
 import { asKey } from 'src/sql-tools/helpers';
 import { ConstraintType, Processor } from 'src/sql-tools/types';
 
-export const processPrimaryKeyConstraints: Processor = (builder) => {
-  for (const table of builder.tables) {
+export const processPrimaryKeyConstraints: Processor = (ctx) => {
+  for (const table of ctx.tables) {
     const columnNames: string[] = [];
 
     for (const column of table.columns) {
@@ -12,7 +12,7 @@ export const processPrimaryKeyConstraints: Processor = (builder) => {
     }
 
     if (columnNames.length > 0) {
-      const tableMetadata = builder.getTableMetadata(table);
+      const tableMetadata = ctx.getTableMetadata(table);
       table.constraints.push({
         type: ConstraintType.PRIMARY_KEY,
         name: tableMetadata.options.primaryConstraintName || asPrimaryKeyConstraintName(table.name, columnNames),
diff --git a/server/src/sql-tools/processors/table.processor.ts b/server/src/sql-tools/processors/table.processor.ts
index 967e4a023b..7fec4eb317 100644
--- a/server/src/sql-tools/processors/table.processor.ts
+++ b/server/src/sql-tools/processors/table.processor.ts
@@ -1,18 +1,18 @@
 import { asSnakeCase } from 'src/sql-tools/helpers';
 import { Processor } from 'src/sql-tools/types';
 
-export const processTables: Processor = (builder, items) => {
+export const processTables: Processor = (ctx, items) => {
   for (const {
     item: { options, object },
   } of items.filter((item) => item.type === 'table')) {
-    const test = builder.getTableByObject(object);
+    const test = ctx.getTableByObject(object);
     if (test) {
       throw new Error(
         `Table ${test.name} has already been registered. Does ${object.name} have two @Table() decorators?`,
       );
     }
 
-    builder.addTable(
+    ctx.addTable(
       {
         name: options.name || asSnakeCase(object.name),
         columns: [],
diff --git a/server/src/sql-tools/processors/trigger.processor.ts b/server/src/sql-tools/processors/trigger.processor.ts
index 03e7076fdb..10b07a466a 100644
--- a/server/src/sql-tools/processors/trigger.processor.ts
+++ b/server/src/sql-tools/processors/trigger.processor.ts
@@ -2,13 +2,13 @@ import { TriggerOptions } from 'src/sql-tools/decorators/trigger.decorator';
 import { asKey } from 'src/sql-tools/helpers';
 import { Processor } from 'src/sql-tools/types';
 
-export const processTriggers: Processor = (builder, items) => {
+export const processTriggers: Processor = (ctx, items) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'trigger')) {
-    const table = builder.getTableByObject(object);
+    const table = ctx.getTableByObject(object);
     if (!table) {
-      builder.warnMissingTable('@Trigger', object);
+      ctx.warnMissingTable('@Trigger', object);
       continue;
     }
 
diff --git a/server/src/sql-tools/processors/unique-constraint.processor.ts b/server/src/sql-tools/processors/unique-constraint.processor.ts
index eed9597879..4d962a0a04 100644
--- a/server/src/sql-tools/processors/unique-constraint.processor.ts
+++ b/server/src/sql-tools/processors/unique-constraint.processor.ts
@@ -1,13 +1,13 @@
 import { asKey } from 'src/sql-tools/helpers';
 import { ConstraintType, Processor } from 'src/sql-tools/types';
 
-export const processUniqueConstraints: Processor = (builder, items) => {
+export const processUniqueConstraints: Processor = (ctx, items) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'uniqueConstraint')) {
-    const table = builder.getTableByObject(object);
+    const table = ctx.getTableByObject(object);
     if (!table) {
-      builder.warnMissingTable('@Unique', object);
+      ctx.warnMissingTable('@Unique', object);
       continue;
     }
 
@@ -28,15 +28,15 @@ export const processUniqueConstraints: Processor = (builder, items) => {
     type,
     item: { object, propertyName, options },
   } of items.filter((item) => item.type === 'column' || item.type === 'foreignKeyColumn')) {
-    const { table, column } = builder.getColumnByObjectAndPropertyName(object, propertyName);
+    const { table, column } = ctx.getColumnByObjectAndPropertyName(object, propertyName);
     if (!table) {
-      builder.warnMissingTable('@Column', object);
+      ctx.warnMissingTable('@Column', object);
       continue;
     }
 
     if (!column) {
       // should be impossible since they are created in `column.processor.ts`
-      builder.warnMissingColumn('@Column', object, propertyName);
+      ctx.warnMissingColumn('@Column', object, propertyName);
       continue;
     }
 
diff --git a/server/src/sql-tools/readers/column.reader.ts b/server/src/sql-tools/readers/column.reader.ts
index c81fafa68f..dfd2878185 100644
--- a/server/src/sql-tools/readers/column.reader.ts
+++ b/server/src/sql-tools/readers/column.reader.ts
@@ -1,8 +1,8 @@
 import { sql } from 'kysely';
 import { jsonArrayFrom } from 'kysely/helpers/postgres';
-import { ColumnType, DatabaseColumn, DatabaseReader } from 'src/sql-tools/types';
+import { ColumnType, DatabaseColumn, Reader } from 'src/sql-tools/types';
 
-export const readColumns: DatabaseReader = async (schema, db) => {
+export const readColumns: Reader = async (ctx, db) => {
   const columns = await db
     .selectFrom('information_schema.columns as c')
     .leftJoin('information_schema.element_types as o', (join) =>
@@ -42,13 +42,13 @@ export const readColumns: DatabaseReader = async (schema, db) => {
       // data type for ARRAYs
       'o.data_type as array_type',
     ])
-    .where('table_schema', '=', schema.schemaName)
+    .where('table_schema', '=', ctx.schemaName)
     .execute();
 
   const enumRaw = await db
     .selectFrom('pg_type')
     .innerJoin('pg_namespace', (join) =>
-      join.onRef('pg_namespace.oid', '=', 'pg_type.typnamespace').on('pg_namespace.nspname', '=', schema.schemaName),
+      join.onRef('pg_namespace.oid', '=', 'pg_type.typnamespace').on('pg_namespace.nspname', '=', ctx.schemaName),
     )
     .where('typtype', '=', sql.lit('e'))
     .select((eb) => [
@@ -61,13 +61,13 @@ export const readColumns: DatabaseReader = async (schema, db) => {
 
   const enums = enumRaw.map((item) => ({ name: item.name, values: item.values.map(({ value }) => value) }));
   for (const { name, values } of enums) {
-    schema.enums.push({ name, values, synchronize: true });
+    ctx.enums.push({ name, values, synchronize: true });
   }
 
   const enumMap = Object.fromEntries(enums.map((e) => [e.name, e.values]));
   // add columns to tables
   for (const column of columns) {
-    const table = schema.tables.find((table) => table.name === column.table_name);
+    const table = ctx.getTableByName(column.table_name);
     if (!table) {
       continue;
     }
@@ -93,7 +93,7 @@ export const readColumns: DatabaseReader = async (schema, db) => {
       // array types
       case 'ARRAY': {
         if (!column.array_type) {
-          schema.warnings.push(`Unable to find type for ${columnLabel} (ARRAY)`);
+          ctx.warnings.push(`Unable to find type for ${columnLabel} (ARRAY)`);
           continue;
         }
         item.type = column.array_type as ColumnType;
@@ -103,7 +103,7 @@ export const readColumns: DatabaseReader = async (schema, db) => {
       // enum types
       case 'USER-DEFINED': {
         if (!enumMap[column.udt_name]) {
-          schema.warnings.push(`Unable to find type for ${columnLabel} (ENUM)`);
+          ctx.warnings.push(`Unable to find type for ${columnLabel} (ENUM)`);
           continue;
         }
 
diff --git a/server/src/sql-tools/readers/comment.reader.ts b/server/src/sql-tools/readers/comment.reader.ts
index a06e111f84..05cc91e7a9 100644
--- a/server/src/sql-tools/readers/comment.reader.ts
+++ b/server/src/sql-tools/readers/comment.reader.ts
@@ -1,6 +1,6 @@
-import { DatabaseReader } from 'src/sql-tools/types';
+import { Reader } from 'src/sql-tools/types';
 
-export const readComments: DatabaseReader = async (schema, db) => {
+export const readComments: Reader = async (ctx, db) => {
   const comments = await db
     .selectFrom('pg_description as d')
     .innerJoin('pg_class as c', 'd.objoid', 'c.oid')
@@ -20,7 +20,7 @@ export const readComments: DatabaseReader = async (schema, db) => {
 
   for (const comment of comments) {
     if (comment.object_type === 'r') {
-      const table = schema.tables.find((table) => table.name === comment.object_name);
+      const table = ctx.getTableByName(comment.object_name);
       if (!table) {
         continue;
       }
diff --git a/server/src/sql-tools/readers/constraint.reader.ts b/server/src/sql-tools/readers/constraint.reader.ts
index 0e4334bf04..662c6f414a 100644
--- a/server/src/sql-tools/readers/constraint.reader.ts
+++ b/server/src/sql-tools/readers/constraint.reader.ts
@@ -1,7 +1,7 @@
 import { sql } from 'kysely';
-import { ActionType, ConstraintType, DatabaseReader } from 'src/sql-tools/types';
+import { ActionType, ConstraintType, Reader } from 'src/sql-tools/types';
 
-export const readConstraints: DatabaseReader = async (schema, db) => {
+export const readConstraints: Reader = async (ctx, db) => {
   const constraints = await db
     .selectFrom('pg_constraint')
     .innerJoin('pg_namespace', 'pg_namespace.oid', 'pg_constraint.connamespace') // namespace
@@ -40,11 +40,11 @@ export const readConstraints: DatabaseReader = async (schema, db) => {
         .as('reference_column_names'),
       eb.fn<string>('pg_get_constraintdef', ['pg_constraint.oid']).as('expression'),
     ])
-    .where('pg_namespace.nspname', '=', schema.schemaName)
+    .where('pg_namespace.nspname', '=', ctx.schemaName)
     .execute();
 
   for (const constraint of constraints) {
-    const table = schema.tables.find((table) => table.name === constraint.table_name);
+    const table = ctx.getTableByName(constraint.table_name);
     if (!table) {
       continue;
     }
@@ -55,7 +55,7 @@ export const readConstraints: DatabaseReader = async (schema, db) => {
       // primary key constraint
       case 'p': {
         if (!constraint.column_names) {
-          schema.warnings.push(`Skipping CONSTRAINT "${constraintName}", no columns found`);
+          ctx.warnings.push(`Skipping CONSTRAINT "${constraintName}", no columns found`);
           continue;
         }
         table.constraints.push({
@@ -71,7 +71,7 @@ export const readConstraints: DatabaseReader = async (schema, db) => {
       // foreign key constraint
       case 'f': {
         if (!constraint.column_names || !constraint.reference_table_name || !constraint.reference_column_names) {
-          schema.warnings.push(
+          ctx.warnings.push(
             `Skipping CONSTRAINT "${constraintName}", missing either columns, referenced table, or referenced columns,`,
           );
           continue;
diff --git a/server/src/sql-tools/readers/extension.reader.ts b/server/src/sql-tools/readers/extension.reader.ts
index 6c7e6dd28a..aa33f4d21e 100644
--- a/server/src/sql-tools/readers/extension.reader.ts
+++ b/server/src/sql-tools/readers/extension.reader.ts
@@ -1,6 +1,6 @@
-import { DatabaseReader } from 'src/sql-tools/types';
+import { Reader } from 'src/sql-tools/types';
 
-export const readExtensions: DatabaseReader = async (schema, db) => {
+export const readExtensions: Reader = async (ctx, db) => {
   const extensions = await db
     .selectFrom('pg_catalog.pg_extension')
     // .innerJoin('pg_namespace', 'pg_namespace.oid', 'pg_catalog.pg_extension.extnamespace')
@@ -9,6 +9,6 @@ export const readExtensions: DatabaseReader = async (schema, db) => {
     .execute();
 
   for (const { name } of extensions) {
-    schema.extensions.push({ name, synchronize: true });
+    ctx.extensions.push({ name, synchronize: true });
   }
 };
diff --git a/server/src/sql-tools/readers/function.reader.ts b/server/src/sql-tools/readers/function.reader.ts
index 385d061181..4696747f52 100644
--- a/server/src/sql-tools/readers/function.reader.ts
+++ b/server/src/sql-tools/readers/function.reader.ts
@@ -1,14 +1,14 @@
 import { sql } from 'kysely';
-import { DatabaseReader } from 'src/sql-tools/types';
+import { Reader } from 'src/sql-tools/types';
 
-export const readFunctions: DatabaseReader = async (schema, db) => {
+export const readFunctions: Reader = async (ctx, db) => {
   const routines = await db
     .selectFrom('pg_proc as p')
     .innerJoin('pg_namespace', 'pg_namespace.oid', 'p.pronamespace')
     .leftJoin('pg_depend as d', (join) => join.onRef('d.objid', '=', 'p.oid').on('d.deptype', '=', sql.lit('e')))
     .where('d.objid', 'is', sql.lit(null))
     .where('p.prokind', '=', sql.lit('f'))
-    .where('pg_namespace.nspname', '=', schema.schemaName)
+    .where('pg_namespace.nspname', '=', ctx.schemaName)
     .select((eb) => [
       'p.proname as name',
       eb.fn<string>('pg_get_function_identity_arguments', ['p.oid']).as('arguments'),
@@ -17,7 +17,7 @@ export const readFunctions: DatabaseReader = async (schema, db) => {
     .execute();
 
   for (const { name, expression } of routines) {
-    schema.functions.push({
+    ctx.functions.push({
       name,
       // TODO read expression from the overrides table
       expression,
diff --git a/server/src/sql-tools/readers/index.reader.ts b/server/src/sql-tools/readers/index.reader.ts
index e3fea7b74f..26b17a0d19 100644
--- a/server/src/sql-tools/readers/index.reader.ts
+++ b/server/src/sql-tools/readers/index.reader.ts
@@ -1,7 +1,7 @@
 import { sql } from 'kysely';
-import { DatabaseReader } from 'src/sql-tools/types';
+import { Reader } from 'src/sql-tools/types';
 
-export const readIndexes: DatabaseReader = async (schema, db) => {
+export const readIndexes: Reader = async (ctx, db) => {
   const indexes = await db
     .selectFrom('pg_index as ix')
     // matching index, which has column information
@@ -34,12 +34,12 @@ export const readIndexes: DatabaseReader = async (schema, db) => {
         .select((eb) => eb.fn<string[]>('json_agg', ['a.attname']).as('column_name'))
         .as('column_names'),
     ])
-    .where('pg_namespace.nspname', '=', schema.schemaName)
+    .where('pg_namespace.nspname', '=', ctx.schemaName)
     .where('ix.indisprimary', '=', sql.lit(false))
     .execute();
 
   for (const index of indexes) {
-    const table = schema.tables.find((table) => table.name === index.table_name);
+    const table = ctx.getTableByName(index.table_name);
     if (!table) {
       continue;
     }
diff --git a/server/src/sql-tools/readers/index.ts b/server/src/sql-tools/readers/index.ts
index d710fb4acb..354f99c7ca 100644
--- a/server/src/sql-tools/readers/index.ts
+++ b/server/src/sql-tools/readers/index.ts
@@ -5,13 +5,13 @@ import { readExtensions } from 'src/sql-tools/readers/extension.reader';
 import { readFunctions } from 'src/sql-tools/readers/function.reader';
 import { readIndexes } from 'src/sql-tools/readers/index.reader';
 import { readName } from 'src/sql-tools/readers/name.reader';
+import { readOverrides } from 'src/sql-tools/readers/override.reader';
 import { readParameters } from 'src/sql-tools/readers/parameter.reader';
 import { readTables } from 'src/sql-tools/readers/table.reader';
 import { readTriggers } from 'src/sql-tools/readers/trigger.reader';
-import { DatabaseReader } from 'src/sql-tools/types';
+import { Reader } from 'src/sql-tools/types';
 
-export const readers: DatabaseReader[] = [
-  //
+export const readers: Reader[] = [
   readName,
   readParameters,
   readExtensions,
@@ -22,4 +22,5 @@ export const readers: DatabaseReader[] = [
   readConstraints,
   readTriggers,
   readComments,
+  readOverrides,
 ];
diff --git a/server/src/sql-tools/readers/name.reader.ts b/server/src/sql-tools/readers/name.reader.ts
index 5989ccb4c9..de4f1af3a6 100644
--- a/server/src/sql-tools/readers/name.reader.ts
+++ b/server/src/sql-tools/readers/name.reader.ts
@@ -1,8 +1,8 @@
 import { QueryResult, sql } from 'kysely';
-import { DatabaseReader } from 'src/sql-tools/types';
+import { Reader } from 'src/sql-tools/types';
 
-export const readName: DatabaseReader = async (schema, db) => {
+export const readName: Reader = async (ctx, db) => {
   const result = (await sql`SELECT current_database() as name`.execute(db)) as QueryResult<{ name: string }>;
 
-  schema.databaseName = result.rows[0].name;
+  ctx.databaseName = result.rows[0].name;
 };
diff --git a/server/src/sql-tools/readers/override.reader.ts b/server/src/sql-tools/readers/override.reader.ts
new file mode 100644
index 0000000000..34f0004f95
--- /dev/null
+++ b/server/src/sql-tools/readers/override.reader.ts
@@ -0,0 +1,19 @@
+import { sql } from 'kysely';
+import { OverrideType, Reader } from 'src/sql-tools/types';
+
+export const readOverrides: Reader = async (ctx, db) => {
+  try {
+    const result = await sql
+      .raw<{
+        name: string;
+        value: { type: OverrideType; name: string; sql: string };
+      }>(`SELECT name, value FROM "${ctx.overrideTableName}"`)
+      .execute(db);
+
+    for (const { name, value } of result.rows) {
+      ctx.overrides.push({ name, value, synchronize: true });
+    }
+  } catch (error) {
+    ctx.warn('Overrides', `Error reading override table: ${error}`);
+  }
+};
diff --git a/server/src/sql-tools/readers/parameter.reader.ts b/server/src/sql-tools/readers/parameter.reader.ts
index 7930c251f4..c5f36591a3 100644
--- a/server/src/sql-tools/readers/parameter.reader.ts
+++ b/server/src/sql-tools/readers/parameter.reader.ts
@@ -1,7 +1,7 @@
 import { sql } from 'kysely';
-import { DatabaseReader, ParameterScope } from 'src/sql-tools/types';
+import { ParameterScope, Reader } from 'src/sql-tools/types';
 
-export const readParameters: DatabaseReader = async (schema, db) => {
+export const readParameters: Reader = async (ctx, db) => {
   const parameters = await db
     .selectFrom('pg_settings')
     .where('source', 'in', [sql.lit('database'), sql.lit('user')])
@@ -9,10 +9,10 @@ export const readParameters: DatabaseReader = async (schema, db) => {
     .execute();
 
   for (const parameter of parameters) {
-    schema.parameters.push({
+    ctx.parameters.push({
       name: parameter.name,
       value: parameter.value,
-      databaseName: schema.databaseName,
+      databaseName: ctx.databaseName,
       scope: parameter.scope as ParameterScope,
       synchronize: true,
     });
diff --git a/server/src/sql-tools/readers/table.reader.ts b/server/src/sql-tools/readers/table.reader.ts
index 793da20644..4570179bbf 100644
--- a/server/src/sql-tools/readers/table.reader.ts
+++ b/server/src/sql-tools/readers/table.reader.ts
@@ -1,16 +1,16 @@
 import { sql } from 'kysely';
-import { DatabaseReader } from 'src/sql-tools/types';
+import { Reader } from 'src/sql-tools/types';
 
-export const readTables: DatabaseReader = async (schema, db) => {
+export const readTables: Reader = async (ctx, db) => {
   const tables = await db
     .selectFrom('information_schema.tables')
-    .where('table_schema', '=', schema.schemaName)
+    .where('table_schema', '=', ctx.schemaName)
     .where('table_type', '=', sql.lit('BASE TABLE'))
     .selectAll()
     .execute();
 
   for (const table of tables) {
-    schema.tables.push({
+    ctx.tables.push({
       name: table.table_name,
       columns: [],
       indexes: [],
diff --git a/server/src/sql-tools/readers/trigger.reader.ts b/server/src/sql-tools/readers/trigger.reader.ts
index 09e7ae9c8a..92fb1d12bf 100644
--- a/server/src/sql-tools/readers/trigger.reader.ts
+++ b/server/src/sql-tools/readers/trigger.reader.ts
@@ -1,6 +1,6 @@
-import { DatabaseReader, TriggerAction, TriggerScope, TriggerTiming } from 'src/sql-tools/types';
+import { Reader, TriggerAction, TriggerScope, TriggerTiming } from 'src/sql-tools/types';
 
-export const readTriggers: DatabaseReader = async (schema, db) => {
+export const readTriggers: Reader = async (ctx, db) => {
   const triggers = await db
     .selectFrom('pg_trigger as t')
     .innerJoin('pg_proc as p', 't.tgfoid', 'p.oid')
@@ -21,12 +21,12 @@ export const readTriggers: DatabaseReader = async (schema, db) => {
       'c.relname as table_name',
     ])
     .where('t.tgisinternal', '=', false) // Exclude internal system triggers
-    .where('n.nspname', '=', schema.schemaName)
+    .where('n.nspname', '=', ctx.schemaName)
     .execute();
 
   // add triggers to tables
   for (const trigger of triggers) {
-    const table = schema.tables.find((table) => table.name === trigger.table_name);
+    const table = ctx.getTableByName(trigger.table_name);
     if (!table) {
       continue;
     }
diff --git a/server/src/sql-tools/schema-diff.spec.ts b/server/src/sql-tools/schema-diff.spec.ts
index 98153eabd9..0667d22d6b 100644
--- a/server/src/sql-tools/schema-diff.spec.ts
+++ b/server/src/sql-tools/schema-diff.spec.ts
@@ -21,6 +21,7 @@ const fromColumn = (column: Partial<Omit<DatabaseColumn, 'tableName'>>): Databas
     enums: [],
     extensions: [],
     parameters: [],
+    overrides: [],
     tables: [
       {
         name: tableName,
@@ -55,6 +56,7 @@ const fromConstraint = (constraint?: DatabaseConstraint): DatabaseSchema => {
     enums: [],
     extensions: [],
     parameters: [],
+    overrides: [],
     tables: [
       {
         name: tableName,
@@ -88,6 +90,7 @@ const fromIndex = (index?: DatabaseIndex): DatabaseSchema => {
     enums: [],
     extensions: [],
     parameters: [],
+    overrides: [],
     tables: [
       {
         name: tableName,
@@ -161,6 +164,7 @@ const newSchema = (schema: {
     enums: [],
     extensions: [],
     parameters: [],
+    overrides: [],
     tables,
     warnings: [],
   };
diff --git a/server/src/sql-tools/schema-diff.ts b/server/src/sql-tools/schema-diff.ts
index 9708a11c4a..24091a0256 100644
--- a/server/src/sql-tools/schema-diff.ts
+++ b/server/src/sql-tools/schema-diff.ts
@@ -1,8 +1,10 @@
 import { compareEnums } from 'src/sql-tools/comparers/enum.comparer';
 import { compareExtensions } from 'src/sql-tools/comparers/extension.comparer';
 import { compareFunctions } from 'src/sql-tools/comparers/function.comparer';
+import { compareOverrides } from 'src/sql-tools/comparers/override.comparer';
 import { compareParameters } from 'src/sql-tools/comparers/parameter.comparer';
 import { compareTables } from 'src/sql-tools/comparers/table.comparer';
+import { BaseContext } from 'src/sql-tools/contexts/base-context';
 import { compare } from 'src/sql-tools/helpers';
 import { transformers } from 'src/sql-tools/transformers';
 import {
@@ -19,10 +21,11 @@ import {
 export const schemaDiff = (source: DatabaseSchema, target: DatabaseSchema, options: SchemaDiffOptions = {}) => {
   const items = [
     ...compare(source.parameters, target.parameters, options.parameters, compareParameters),
-    ...compare(source.extensions, target.extensions, options.extension, compareExtensions),
+    ...compare(source.extensions, target.extensions, options.extensions, compareExtensions),
     ...compare(source.functions, target.functions, options.functions, compareFunctions),
     ...compare(source.enums, target.enums, options.enums, compareEnums),
     ...compare(source.tables, target.tables, options.tables, compareTables),
+    ...compare(source.overrides, target.overrides, options.overrides, compareOverrides),
   ];
 
   type SchemaName = SchemaDiff['type'];
@@ -46,6 +49,9 @@ export const schemaDiff = (source: DatabaseSchema, target: DatabaseSchema, optio
     TriggerDrop: [],
     ParameterSet: [],
     ParameterReset: [],
+    OverrideCreate: [],
+    OverrideUpdate: [],
+    OverrideDrop: [],
   };
 
   for (const item of items) {
@@ -76,6 +82,9 @@ export const schemaDiff = (source: DatabaseSchema, target: DatabaseSchema, optio
     ...itemMap.TableDrop,
     ...itemMap.EnumDrop,
     ...itemMap.FunctionDrop,
+    ...itemMap.OverrideCreate,
+    ...itemMap.OverrideUpdate,
+    ...itemMap.OverrideDrop,
   ];
 
   return {
@@ -88,17 +97,18 @@ export const schemaDiff = (source: DatabaseSchema, target: DatabaseSchema, optio
  * Convert schema diffs into SQL statements
  */
 export const schemaDiffToSql = (items: SchemaDiff[], options: SchemaDiffToSqlOptions = {}): string[] => {
-  return items.flatMap((item) => asSql(item).map((result) => result + withComments(options.comments, item)));
+  return items.flatMap((item) => asSql(item, options));
 };
 
-const asSql = (item: SchemaDiff): string[] => {
+const asSql = (item: SchemaDiff, options: SchemaDiffToSqlOptions): string[] => {
+  const ctx = new BaseContext(options);
   for (const transform of transformers) {
-    const result = transform(item);
+    const result = transform(ctx, item);
     if (!result) {
       continue;
     }
 
-    return asArray(result);
+    return asArray(result).map((result) => result + withComments(options.comments, item));
   }
 
   throw new Error(`Unhandled schema diff type: ${item.type}`);
diff --git a/server/src/sql-tools/schema-from-code.spec.ts b/server/src/sql-tools/schema-from-code.spec.ts
index 55e64e0b4e..b0c88d1f57 100644
--- a/server/src/sql-tools/schema-from-code.spec.ts
+++ b/server/src/sql-tools/schema-from-code.spec.ts
@@ -1,8 +1,16 @@
 import { readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { schemaFromCode } from 'src/sql-tools/schema-from-code';
+import { SchemaFromCodeOptions } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
+const importModule = async (filePath: string) => {
+  const module = await import(filePath);
+  const options: SchemaFromCodeOptions = module.options;
+
+  return { module, options };
+};
+
 describe(schemaFromCode.name, () => {
   it('should work', () => {
     expect(schemaFromCode({ reset: true })).toEqual({
@@ -12,6 +20,7 @@ describe(schemaFromCode.name, () => {
       enums: [],
       extensions: [],
       parameters: [],
+      overrides: [],
       tables: [],
       warnings: [],
     });
@@ -22,9 +31,10 @@ describe(schemaFromCode.name, () => {
     for (const file of errorStubs) {
       const filePath = join(file.parentPath, file.name);
       it(filePath, async () => {
-        const module = await import(filePath);
+        const { module, options } = await importModule(filePath);
+
         expect(module.message).toBeDefined();
-        expect(() => schemaFromCode({ reset: true })).toThrowError(module.message);
+        expect(() => schemaFromCode({ ...options, reset: true })).toThrowError(module.message);
       });
     }
 
@@ -36,10 +46,11 @@ describe(schemaFromCode.name, () => {
 
       const filePath = join(file.parentPath, file.name);
       it(filePath, async () => {
-        const module = await import(filePath);
+        const { module, options } = await importModule(filePath);
+
         expect(module.description).toBeDefined();
         expect(module.schema).toBeDefined();
-        expect(schemaFromCode({ reset: true }), module.description).toEqual(module.schema);
+        expect(schemaFromCode({ ...options, reset: true }), module.description).toEqual(module.schema);
       });
     }
   });
diff --git a/server/src/sql-tools/schema-from-code.ts b/server/src/sql-tools/schema-from-code.ts
index f36e0ee07e..6b4ab93b8d 100644
--- a/server/src/sql-tools/schema-from-code.ts
+++ b/server/src/sql-tools/schema-from-code.ts
@@ -1,26 +1,58 @@
+import { ProcessorContext } from 'src/sql-tools/contexts/processor-context';
 import { processors } from 'src/sql-tools/processors';
 import { getRegisteredItems, resetRegisteredItems } from 'src/sql-tools/register';
-import { SchemaBuilder } from 'src/sql-tools/schema-builder';
-import { SchemaFromCodeOptions } from 'src/sql-tools/types';
+import { ConstraintType, SchemaFromCodeOptions } from 'src/sql-tools/types';
 
 /**
  * Load schema from code (decorators, etc)
  */
 export const schemaFromCode = (options: SchemaFromCodeOptions = {}) => {
   try {
-    const globalOptions = {
-      createForeignKeyIndexes: options.createForeignKeyIndexes ?? true,
-    };
-
-    const builder = new SchemaBuilder(options);
+    const ctx = new ProcessorContext(options);
     const items = getRegisteredItems();
+
     for (const processor of processors) {
-      processor(builder, items, globalOptions);
+      processor(ctx, items);
     }
 
-    const newSchema = builder.build();
+    if (ctx.options.overrides) {
+      ctx.tables.push({
+        name: ctx.overrideTableName,
+        columns: [
+          {
+            primary: true,
+            name: 'name',
+            tableName: ctx.overrideTableName,
+            type: 'character varying',
+            nullable: false,
+            isArray: false,
+            synchronize: true,
+          },
+          {
+            name: 'value',
+            tableName: ctx.overrideTableName,
+            type: 'jsonb',
+            nullable: false,
+            isArray: false,
+            synchronize: true,
+          },
+        ],
+        indexes: [],
+        triggers: [],
+        constraints: [
+          {
+            type: ConstraintType.PRIMARY_KEY,
+            name: `${ctx.overrideTableName}_pkey`,
+            tableName: ctx.overrideTableName,
+            columnNames: ['name'],
+            synchronize: true,
+          },
+        ],
+        synchronize: true,
+      });
+    }
 
-    return newSchema;
+    return ctx.build();
   } finally {
     if (options.reset) {
       resetRegisteredItems();
diff --git a/server/src/sql-tools/schema-from-database.ts b/server/src/sql-tools/schema-from-database.ts
index 7122ec1105..b7b76a68b1 100644
--- a/server/src/sql-tools/schema-from-database.ts
+++ b/server/src/sql-tools/schema-from-database.ts
@@ -1,6 +1,7 @@
 import { Kysely } from 'kysely';
 import { PostgresJSDialect } from 'kysely-postgres-js';
 import { Sql } from 'postgres';
+import { ReaderContext } from 'src/sql-tools/contexts/reader-context';
 import { readers } from 'src/sql-tools/readers';
 import { DatabaseSchema, PostgresDB, SchemaFromDatabaseOptions } from 'src/sql-tools/types';
 
@@ -11,23 +12,16 @@ export const schemaFromDatabase = async (
   postgres: Sql,
   options: SchemaFromDatabaseOptions = {},
 ): Promise<DatabaseSchema> => {
-  const schema: DatabaseSchema = {
-    databaseName: 'immich',
-    schemaName: options.schemaName || 'public',
-    parameters: [],
-    functions: [],
-    enums: [],
-    extensions: [],
-    tables: [],
-    warnings: [],
-  };
-
   const db = new Kysely<PostgresDB>({ dialect: new PostgresJSDialect({ postgres }) });
-  for (const reader of readers) {
-    await reader(schema, db);
+  const ctx = new ReaderContext(options);
+
+  try {
+    for (const reader of readers) {
+      await reader(ctx, db);
+    }
+
+    return ctx.build();
+  } finally {
+    await db.destroy();
   }
-
-  await db.destroy();
-
-  return schema;
 };
diff --git a/server/src/sql-tools/transformers/column.transformer.spec.ts b/server/src/sql-tools/transformers/column.transformer.spec.ts
index 2f975381aa..1386b08c93 100644
--- a/server/src/sql-tools/transformers/column.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/column.transformer.spec.ts
@@ -1,11 +1,14 @@
+import { BaseContext } from 'src/sql-tools/contexts/base-context';
 import { transformColumns } from 'src/sql-tools/transformers/column.transformer';
 import { describe, expect, it } from 'vitest';
 
+const ctx = new BaseContext({});
+
 describe(transformColumns.name, () => {
   describe('ColumnAdd', () => {
     it('should work', () => {
       expect(
-        transformColumns({
+        transformColumns(ctx, {
           type: 'ColumnAdd',
           column: {
             name: 'column1',
@@ -22,7 +25,7 @@ describe(transformColumns.name, () => {
 
     it('should add a nullable column', () => {
       expect(
-        transformColumns({
+        transformColumns(ctx, {
           type: 'ColumnAdd',
           column: {
             name: 'column1',
@@ -39,7 +42,7 @@ describe(transformColumns.name, () => {
 
     it('should add a column with an enum type', () => {
       expect(
-        transformColumns({
+        transformColumns(ctx, {
           type: 'ColumnAdd',
           column: {
             name: 'column1',
@@ -57,7 +60,7 @@ describe(transformColumns.name, () => {
 
     it('should add a column that is an array type', () => {
       expect(
-        transformColumns({
+        transformColumns(ctx, {
           type: 'ColumnAdd',
           column: {
             name: 'column1',
@@ -76,7 +79,7 @@ describe(transformColumns.name, () => {
   describe('ColumnAlter', () => {
     it('should make a column nullable', () => {
       expect(
-        transformColumns({
+        transformColumns(ctx, {
           type: 'ColumnAlter',
           tableName: 'table1',
           columnName: 'column1',
@@ -88,7 +91,7 @@ describe(transformColumns.name, () => {
 
     it('should make a column non-nullable', () => {
       expect(
-        transformColumns({
+        transformColumns(ctx, {
           type: 'ColumnAlter',
           tableName: 'table1',
           columnName: 'column1',
@@ -100,7 +103,7 @@ describe(transformColumns.name, () => {
 
     it('should update the default value', () => {
       expect(
-        transformColumns({
+        transformColumns(ctx, {
           type: 'ColumnAlter',
           tableName: 'table1',
           columnName: 'column1',
@@ -114,7 +117,7 @@ describe(transformColumns.name, () => {
   describe('ColumnDrop', () => {
     it('should work', () => {
       expect(
-        transformColumns({
+        transformColumns(ctx, {
           type: 'ColumnDrop',
           tableName: 'table1',
           columnName: 'column1',
diff --git a/server/src/sql-tools/transformers/column.transformer.ts b/server/src/sql-tools/transformers/column.transformer.ts
index ab1135379c..43188c24c2 100644
--- a/server/src/sql-tools/transformers/column.transformer.ts
+++ b/server/src/sql-tools/transformers/column.transformer.ts
@@ -1,8 +1,8 @@
 import { asColumnComment, getColumnModifiers, getColumnType } from 'src/sql-tools/helpers';
 import { SqlTransformer } from 'src/sql-tools/transformers/types';
-import { ColumnChanges, DatabaseColumn, SchemaDiff } from 'src/sql-tools/types';
+import { ColumnChanges, DatabaseColumn } from 'src/sql-tools/types';
 
-export const transformColumns: SqlTransformer = (item: SchemaDiff) => {
+export const transformColumns: SqlTransformer = (ctx, item) => {
   switch (item.type) {
     case 'ColumnAdd': {
       return asColumnAdd(item.column);
diff --git a/server/src/sql-tools/transformers/constraint.transformer.spec.ts b/server/src/sql-tools/transformers/constraint.transformer.spec.ts
index 595db10a39..6e512afdca 100644
--- a/server/src/sql-tools/transformers/constraint.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/constraint.transformer.spec.ts
@@ -1,13 +1,16 @@
+import { BaseContext } from 'src/sql-tools/contexts/base-context';
 import { transformConstraints } from 'src/sql-tools/transformers/constraint.transformer';
 import { ConstraintType } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
+const ctx = new BaseContext({});
+
 describe(transformConstraints.name, () => {
   describe('ConstraintAdd', () => {
     describe('primary keys', () => {
       it('should work', () => {
         expect(
-          transformConstraints({
+          transformConstraints(ctx, {
             type: 'ConstraintAdd',
             constraint: {
               type: ConstraintType.PRIMARY_KEY,
@@ -25,7 +28,7 @@ describe(transformConstraints.name, () => {
     describe('foreign keys', () => {
       it('should work', () => {
         expect(
-          transformConstraints({
+          transformConstraints(ctx, {
             type: 'ConstraintAdd',
             constraint: {
               type: ConstraintType.FOREIGN_KEY,
@@ -47,7 +50,7 @@ describe(transformConstraints.name, () => {
     describe('unique', () => {
       it('should work', () => {
         expect(
-          transformConstraints({
+          transformConstraints(ctx, {
             type: 'ConstraintAdd',
             constraint: {
               type: ConstraintType.UNIQUE,
@@ -65,7 +68,7 @@ describe(transformConstraints.name, () => {
     describe('check', () => {
       it('should work', () => {
         expect(
-          transformConstraints({
+          transformConstraints(ctx, {
             type: 'ConstraintAdd',
             constraint: {
               type: ConstraintType.CHECK,
@@ -84,7 +87,7 @@ describe(transformConstraints.name, () => {
   describe('ConstraintDrop', () => {
     it('should work', () => {
       expect(
-        transformConstraints({
+        transformConstraints(ctx, {
           type: 'ConstraintDrop',
           tableName: 'table1',
           constraintName: 'PK_test',
diff --git a/server/src/sql-tools/transformers/constraint.transformer.ts b/server/src/sql-tools/transformers/constraint.transformer.ts
index d9c2fcd8d1..921774b7a9 100644
--- a/server/src/sql-tools/transformers/constraint.transformer.ts
+++ b/server/src/sql-tools/transformers/constraint.transformer.ts
@@ -1,8 +1,8 @@
 import { asColumnList } from 'src/sql-tools/helpers';
 import { SqlTransformer } from 'src/sql-tools/transformers/types';
-import { ActionType, ConstraintType, DatabaseConstraint, SchemaDiff } from 'src/sql-tools/types';
+import { ActionType, ConstraintType, DatabaseConstraint } from 'src/sql-tools/types';
 
-export const transformConstraints: SqlTransformer = (item: SchemaDiff) => {
+export const transformConstraints: SqlTransformer = (ctx, item) => {
   switch (item.type) {
     case 'ConstraintAdd': {
       return asConstraintAdd(item.constraint);
diff --git a/server/src/sql-tools/transformers/enum.transformer.ts b/server/src/sql-tools/transformers/enum.transformer.ts
index b012ff1a56..cd7bddc2d2 100644
--- a/server/src/sql-tools/transformers/enum.transformer.ts
+++ b/server/src/sql-tools/transformers/enum.transformer.ts
@@ -1,7 +1,7 @@
 import { SqlTransformer } from 'src/sql-tools/transformers/types';
-import { DatabaseEnum, SchemaDiff } from 'src/sql-tools/types';
+import { DatabaseEnum } from 'src/sql-tools/types';
 
-export const transformEnums: SqlTransformer = (item: SchemaDiff) => {
+export const transformEnums: SqlTransformer = (ctx, item) => {
   switch (item.type) {
     case 'EnumCreate': {
       return asEnumCreate(item.enum);
diff --git a/server/src/sql-tools/transformers/extension.transformer.spec.ts b/server/src/sql-tools/transformers/extension.transformer.spec.ts
index 655b6ad20d..2ab0402875 100644
--- a/server/src/sql-tools/transformers/extension.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/extension.transformer.spec.ts
@@ -1,11 +1,14 @@
+import { BaseContext } from 'src/sql-tools/contexts/base-context';
 import { transformExtensions } from 'src/sql-tools/transformers/extension.transformer';
 import { describe, expect, it } from 'vitest';
 
+const ctx = new BaseContext({});
+
 describe(transformExtensions.name, () => {
   describe('ExtensionDrop', () => {
     it('should work', () => {
       expect(
-        transformExtensions({
+        transformExtensions(ctx, {
           type: 'ExtensionDrop',
           extensionName: 'cube',
           reason: 'unknown',
@@ -17,7 +20,7 @@ describe(transformExtensions.name, () => {
   describe('ExtensionCreate', () => {
     it('should work', () => {
       expect(
-        transformExtensions({
+        transformExtensions(ctx, {
           type: 'ExtensionCreate',
           extension: {
             name: 'cube',
diff --git a/server/src/sql-tools/transformers/extension.transformer.ts b/server/src/sql-tools/transformers/extension.transformer.ts
index df1ee7da97..26e76c1157 100644
--- a/server/src/sql-tools/transformers/extension.transformer.ts
+++ b/server/src/sql-tools/transformers/extension.transformer.ts
@@ -1,7 +1,7 @@
 import { SqlTransformer } from 'src/sql-tools/transformers/types';
-import { DatabaseExtension, SchemaDiff } from 'src/sql-tools/types';
+import { DatabaseExtension } from 'src/sql-tools/types';
 
-export const transformExtensions: SqlTransformer = (item: SchemaDiff) => {
+export const transformExtensions: SqlTransformer = (ctx, item) => {
   switch (item.type) {
     case 'ExtensionCreate': {
       return asExtensionCreate(item.extension);
diff --git a/server/src/sql-tools/transformers/function.transformer.spec.ts b/server/src/sql-tools/transformers/function.transformer.spec.ts
index b24256cb38..5b0ba71c7d 100644
--- a/server/src/sql-tools/transformers/function.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/function.transformer.spec.ts
@@ -1,11 +1,14 @@
+import { BaseContext } from 'src/sql-tools/contexts/base-context';
 import { transformFunctions } from 'src/sql-tools/transformers/function.transformer';
 import { describe, expect, it } from 'vitest';
 
+const ctx = new BaseContext({});
+
 describe(transformFunctions.name, () => {
   describe('FunctionDrop', () => {
     it('should work', () => {
       expect(
-        transformFunctions({
+        transformFunctions(ctx, {
           type: 'FunctionDrop',
           functionName: 'test_func',
           reason: 'unknown',
diff --git a/server/src/sql-tools/transformers/function.transformer.ts b/server/src/sql-tools/transformers/function.transformer.ts
index 01915349f0..42a56cbe13 100644
--- a/server/src/sql-tools/transformers/function.transformer.ts
+++ b/server/src/sql-tools/transformers/function.transformer.ts
@@ -1,7 +1,7 @@
 import { SqlTransformer } from 'src/sql-tools/transformers/types';
-import { DatabaseFunction, SchemaDiff } from 'src/sql-tools/types';
+import { DatabaseFunction } from 'src/sql-tools/types';
 
-export const transformFunctions: SqlTransformer = (item: SchemaDiff) => {
+export const transformFunctions: SqlTransformer = (ctx, item) => {
   switch (item.type) {
     case 'FunctionCreate': {
       return asFunctionCreate(item.function);
@@ -17,7 +17,7 @@ export const transformFunctions: SqlTransformer = (item: SchemaDiff) => {
   }
 };
 
-const asFunctionCreate = (func: DatabaseFunction): string => {
+export const asFunctionCreate = (func: DatabaseFunction): string => {
   return func.expression;
 };
 
diff --git a/server/src/sql-tools/transformers/index.transformer.spec.ts b/server/src/sql-tools/transformers/index.transformer.spec.ts
index 0599b00bdd..45fa9546c5 100644
--- a/server/src/sql-tools/transformers/index.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/index.transformer.spec.ts
@@ -1,11 +1,14 @@
+import { BaseContext } from 'src/sql-tools/contexts/base-context';
 import { transformIndexes } from 'src/sql-tools/transformers/index.transformer';
 import { describe, expect, it } from 'vitest';
 
+const ctx = new BaseContext({});
+
 describe(transformIndexes.name, () => {
   describe('IndexCreate', () => {
     it('should work', () => {
       expect(
-        transformIndexes({
+        transformIndexes(ctx, {
           type: 'IndexCreate',
           index: {
             name: 'IDX_test',
@@ -21,7 +24,7 @@ describe(transformIndexes.name, () => {
 
     it('should create an unique index', () => {
       expect(
-        transformIndexes({
+        transformIndexes(ctx, {
           type: 'IndexCreate',
           index: {
             name: 'IDX_test',
@@ -37,7 +40,7 @@ describe(transformIndexes.name, () => {
 
     it('should create an index with a custom expression', () => {
       expect(
-        transformIndexes({
+        transformIndexes(ctx, {
           type: 'IndexCreate',
           index: {
             name: 'IDX_test',
@@ -53,7 +56,7 @@ describe(transformIndexes.name, () => {
 
     it('should create an index with a where clause', () => {
       expect(
-        transformIndexes({
+        transformIndexes(ctx, {
           type: 'IndexCreate',
           index: {
             name: 'IDX_test',
@@ -70,7 +73,7 @@ describe(transformIndexes.name, () => {
 
     it('should create an index with a custom expression', () => {
       expect(
-        transformIndexes({
+        transformIndexes(ctx, {
           type: 'IndexCreate',
           index: {
             name: 'IDX_test',
@@ -89,7 +92,7 @@ describe(transformIndexes.name, () => {
   describe('IndexDrop', () => {
     it('should work', () => {
       expect(
-        transformIndexes({
+        transformIndexes(ctx, {
           type: 'IndexDrop',
           indexName: 'IDX_test',
           reason: 'unknown',
diff --git a/server/src/sql-tools/transformers/index.transformer.ts b/server/src/sql-tools/transformers/index.transformer.ts
index 001b15315f..a8a1303b8b 100644
--- a/server/src/sql-tools/transformers/index.transformer.ts
+++ b/server/src/sql-tools/transformers/index.transformer.ts
@@ -1,8 +1,8 @@
 import { asColumnList } from 'src/sql-tools/helpers';
 import { SqlTransformer } from 'src/sql-tools/transformers/types';
-import { DatabaseIndex, SchemaDiff } from 'src/sql-tools/types';
+import { DatabaseIndex } from 'src/sql-tools/types';
 
-export const transformIndexes: SqlTransformer = (item: SchemaDiff) => {
+export const transformIndexes: SqlTransformer = (ctx, item) => {
   switch (item.type) {
     case 'IndexCreate': {
       return asIndexCreate(item.index);
diff --git a/server/src/sql-tools/transformers/index.ts b/server/src/sql-tools/transformers/index.ts
index 2865a376d7..395d69f2e2 100644
--- a/server/src/sql-tools/transformers/index.ts
+++ b/server/src/sql-tools/transformers/index.ts
@@ -4,6 +4,7 @@ import { transformEnums } from 'src/sql-tools/transformers/enum.transformer';
 import { transformExtensions } from 'src/sql-tools/transformers/extension.transformer';
 import { transformFunctions } from 'src/sql-tools/transformers/function.transformer';
 import { transformIndexes } from 'src/sql-tools/transformers/index.transformer';
+import { transformOverrides } from 'src/sql-tools/transformers/override.transformer';
 import { transformParameters } from 'src/sql-tools/transformers/parameter.transformer';
 import { transformTables } from 'src/sql-tools/transformers/table.transformer';
 import { transformTriggers } from 'src/sql-tools/transformers/trigger.transformer';
@@ -19,4 +20,5 @@ export const transformers: SqlTransformer[] = [
   transformParameters,
   transformTables,
   transformTriggers,
+  transformOverrides,
 ];
diff --git a/server/src/sql-tools/transformers/override.transformer.ts b/server/src/sql-tools/transformers/override.transformer.ts
new file mode 100644
index 0000000000..1e2e981128
--- /dev/null
+++ b/server/src/sql-tools/transformers/override.transformer.ts
@@ -0,0 +1,37 @@
+import { asJsonString } from 'src/sql-tools/helpers';
+import { SqlTransformer } from 'src/sql-tools/transformers/types';
+import { DatabaseOverride } from 'src/sql-tools/types';
+
+export const transformOverrides: SqlTransformer = (ctx, item) => {
+  const tableName = ctx.overrideTableName;
+
+  switch (item.type) {
+    case 'OverrideCreate': {
+      return asOverrideCreate(tableName, item.override);
+    }
+
+    case 'OverrideUpdate': {
+      return asOverrideUpdate(tableName, item.override);
+    }
+
+    case 'OverrideDrop': {
+      return asOverrideDrop(tableName, item.overrideName);
+    }
+
+    default: {
+      return false;
+    }
+  }
+};
+
+export const asOverrideCreate = (tableName: string, override: DatabaseOverride): string => {
+  return `INSERT INTO "${tableName}" ("name", "value") VALUES ('${override.name}', ${asJsonString(override.value)});`;
+};
+
+export const asOverrideUpdate = (tableName: string, override: DatabaseOverride): string => {
+  return `UPDATE "${tableName}" SET "value" = ${asJsonString(override.value)} WHERE "name" = '${override.name}';`;
+};
+
+export const asOverrideDrop = (tableName: string, overrideName: string): string => {
+  return `DELETE FROM "${tableName}" WHERE "name" = '${overrideName}';`;
+};
diff --git a/server/src/sql-tools/transformers/parameter.transformer.ts b/server/src/sql-tools/transformers/parameter.transformer.ts
index 7768298d1d..d23472f991 100644
--- a/server/src/sql-tools/transformers/parameter.transformer.ts
+++ b/server/src/sql-tools/transformers/parameter.transformer.ts
@@ -1,7 +1,7 @@
 import { SqlTransformer } from 'src/sql-tools/transformers/types';
-import { DatabaseParameter, SchemaDiff } from 'src/sql-tools/types';
+import { DatabaseParameter } from 'src/sql-tools/types';
 
-export const transformParameters: SqlTransformer = (item: SchemaDiff) => {
+export const transformParameters: SqlTransformer = (ctx, item) => {
   switch (item.type) {
     case 'ParameterSet': {
       return asParameterSet(item.parameter);
diff --git a/server/src/sql-tools/transformers/table.transformer.spec.ts b/server/src/sql-tools/transformers/table.transformer.spec.ts
index c6f20b3da3..756e6aeafa 100644
--- a/server/src/sql-tools/transformers/table.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/table.transformer.spec.ts
@@ -1,11 +1,14 @@
+import { BaseContext } from 'src/sql-tools/contexts/base-context';
 import { transformTables } from 'src/sql-tools/transformers/table.transformer';
 import { describe, expect, it } from 'vitest';
 
+const ctx = new BaseContext({});
+
 describe(transformTables.name, () => {
   describe('TableDrop', () => {
     it('should work', () => {
       expect(
-        transformTables({
+        transformTables(ctx, {
           type: 'TableDrop',
           tableName: 'table1',
           reason: 'unknown',
@@ -17,7 +20,7 @@ describe(transformTables.name, () => {
   describe('TableCreate', () => {
     it('should work', () => {
       expect(
-        transformTables({
+        transformTables(ctx, {
           type: 'TableCreate',
           table: {
             name: 'table1',
@@ -43,7 +46,7 @@ describe(transformTables.name, () => {
 
     it('should handle a non-nullable column', () => {
       expect(
-        transformTables({
+        transformTables(ctx, {
           type: 'TableCreate',
           table: {
             name: 'table1',
@@ -69,7 +72,7 @@ describe(transformTables.name, () => {
 
     it('should handle a default value', () => {
       expect(
-        transformTables({
+        transformTables(ctx, {
           type: 'TableCreate',
           table: {
             name: 'table1',
@@ -96,7 +99,7 @@ describe(transformTables.name, () => {
 
     it('should handle a string with a fixed length', () => {
       expect(
-        transformTables({
+        transformTables(ctx, {
           type: 'TableCreate',
           table: {
             name: 'table1',
@@ -123,7 +126,7 @@ describe(transformTables.name, () => {
 
     it('should handle an array type', () => {
       expect(
-        transformTables({
+        transformTables(ctx, {
           type: 'TableCreate',
           table: {
             name: 'table1',
diff --git a/server/src/sql-tools/transformers/table.transformer.ts b/server/src/sql-tools/transformers/table.transformer.ts
index b1fefab3e0..14cafe87f2 100644
--- a/server/src/sql-tools/transformers/table.transformer.ts
+++ b/server/src/sql-tools/transformers/table.transformer.ts
@@ -1,9 +1,9 @@
 import { asColumnComment, getColumnModifiers, getColumnType } from 'src/sql-tools/helpers';
 import { asColumnAlter } from 'src/sql-tools/transformers/column.transformer';
 import { SqlTransformer } from 'src/sql-tools/transformers/types';
-import { DatabaseTable, SchemaDiff } from 'src/sql-tools/types';
+import { DatabaseTable } from 'src/sql-tools/types';
 
-export const transformTables: SqlTransformer = (item: SchemaDiff) => {
+export const transformTables: SqlTransformer = (ctx, item) => {
   switch (item.type) {
     case 'TableCreate': {
       return asTableCreate(item.table);
diff --git a/server/src/sql-tools/transformers/trigger.transformer.spec.ts b/server/src/sql-tools/transformers/trigger.transformer.spec.ts
index 9fdb8d1c23..f6ba889c29 100644
--- a/server/src/sql-tools/transformers/trigger.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/trigger.transformer.spec.ts
@@ -1,11 +1,14 @@
+import { BaseContext } from 'src/sql-tools/contexts/base-context';
 import { transformTriggers } from 'src/sql-tools/transformers/trigger.transformer';
 import { describe, expect, it } from 'vitest';
 
+const ctx = new BaseContext({});
+
 describe(transformTriggers.name, () => {
   describe('TriggerCreate', () => {
     it('should work', () => {
       expect(
-        transformTriggers({
+        transformTriggers(ctx, {
           type: 'TriggerCreate',
           trigger: {
             name: 'trigger1',
@@ -28,7 +31,7 @@ describe(transformTriggers.name, () => {
 
     it('should work with multiple actions', () => {
       expect(
-        transformTriggers({
+        transformTriggers(ctx, {
           type: 'TriggerCreate',
           trigger: {
             name: 'trigger1',
@@ -51,7 +54,7 @@ describe(transformTriggers.name, () => {
 
     it('should work with old/new reference table aliases', () => {
       expect(
-        transformTriggers({
+        transformTriggers(ctx, {
           type: 'TriggerCreate',
           trigger: {
             name: 'trigger1',
@@ -79,7 +82,7 @@ describe(transformTriggers.name, () => {
   describe('TriggerDrop', () => {
     it('should work', () => {
       expect(
-        transformTriggers({
+        transformTriggers(ctx, {
           type: 'TriggerDrop',
           tableName: 'table1',
           triggerName: 'trigger1',
diff --git a/server/src/sql-tools/transformers/trigger.transformer.ts b/server/src/sql-tools/transformers/trigger.transformer.ts
index 167449e249..fca557abfc 100644
--- a/server/src/sql-tools/transformers/trigger.transformer.ts
+++ b/server/src/sql-tools/transformers/trigger.transformer.ts
@@ -1,7 +1,7 @@
 import { SqlTransformer } from 'src/sql-tools/transformers/types';
-import { DatabaseTrigger, SchemaDiff } from 'src/sql-tools/types';
+import { DatabaseTrigger } from 'src/sql-tools/types';
 
-export const transformTriggers: SqlTransformer = (item: SchemaDiff) => {
+export const transformTriggers: SqlTransformer = (ctx, item) => {
   switch (item.type) {
     case 'TriggerCreate': {
       return asTriggerCreate(item.trigger);
diff --git a/server/src/sql-tools/transformers/types.ts b/server/src/sql-tools/transformers/types.ts
index 9aa1031f85..96cbe4d918 100644
--- a/server/src/sql-tools/transformers/types.ts
+++ b/server/src/sql-tools/transformers/types.ts
@@ -1,3 +1,4 @@
+import { BaseContext } from 'src/sql-tools/contexts/base-context';
 import { SchemaDiff } from 'src/sql-tools/types';
 
-export type SqlTransformer = (item: SchemaDiff) => string | string[] | false;
+export type SqlTransformer = (ctx: BaseContext, item: SchemaDiff) => string | string[] | false;
diff --git a/server/src/sql-tools/types.ts b/server/src/sql-tools/types.ts
index a3aec7a061..617adc0a58 100644
--- a/server/src/sql-tools/types.ts
+++ b/server/src/sql-tools/types.ts
@@ -1,38 +1,49 @@
 import { Kysely, ColumnType as KyselyColumnType } from 'kysely';
+import { ProcessorContext } from 'src/sql-tools/contexts/processor-context';
+import { ReaderContext } from 'src/sql-tools/contexts/reader-context';
 import { RegisterItem } from 'src/sql-tools/register-item';
-import { SchemaBuilder } from 'src/sql-tools/schema-builder';
 
-export type SchemaFromCodeOptions = {
-  /** automatically create indexes on foreign key columns */
-  createForeignKeyIndexes?: boolean;
+export type BaseContextOptions = {
   databaseName?: string;
   schemaName?: string;
+  overrideTableName?: string;
+};
+
+export type SchemaFromCodeOptions = BaseContextOptions & {
+  /** automatically create indexes on foreign key columns */
+  createForeignKeyIndexes?: boolean;
   reset?: boolean;
+
+  functions?: boolean;
+  extensions?: boolean;
+  parameters?: boolean;
+  overrides?: boolean;
 };
 
-export type SchemaFromDatabaseOptions = {
-  schemaName?: string;
-};
+export type SchemaFromDatabaseOptions = BaseContextOptions;
 
-export type SchemaDiffToSqlOptions = {
+export type SchemaDiffToSqlOptions = BaseContextOptions & {
   comments?: boolean;
 };
 
-export type SchemaDiffOptions = {
+export type SchemaDiffOptions = BaseContextOptions & {
   tables?: IgnoreOptions;
   functions?: IgnoreOptions;
   enums?: IgnoreOptions;
-  extension?: IgnoreOptions;
+  extensions?: IgnoreOptions;
   parameters?: IgnoreOptions;
+  overrides?: IgnoreOptions;
 };
 
-export type IgnoreOptions = {
-  ignoreExtra?: boolean;
-  ignoreMissing?: boolean;
-};
+export type IgnoreOptions =
+  | boolean
+  | {
+      ignoreExtra?: boolean;
+      ignoreMissing?: boolean;
+    };
 
-export type Processor = (builder: SchemaBuilder, items: RegisterItem[], options: SchemaFromCodeOptions) => void;
-export type DatabaseReader = (schema: DatabaseSchema, db: DatabaseClient) => Promise<void>;
+export type Processor = (ctx: ProcessorContext, items: RegisterItem[]) => void;
+export type Reader = (ctx: ReaderContext, db: DatabaseClient) => Promise<void>;
 
 export type PostgresDB = {
   pg_am: {
@@ -319,6 +330,7 @@ export type DatabaseSchema = {
   tables: DatabaseTable[];
   extensions: DatabaseExtension[];
   parameters: DatabaseParameter[];
+  overrides: DatabaseOverride[];
   warnings: string[];
 };
 
@@ -332,6 +344,14 @@ export type DatabaseParameter = {
 
 export type ParameterScope = 'database' | 'user';
 
+export type DatabaseOverride = {
+  name: string;
+  value: { name: string; type: OverrideType; sql: string };
+  synchronize: boolean;
+};
+
+export type OverrideType = 'function' | 'index' | 'trigger';
+
 export type DatabaseEnum = {
   name: string;
   values: string[];
@@ -342,6 +362,7 @@ export type DatabaseFunction = {
   name: string;
   expression: string;
   synchronize: boolean;
+  override?: DatabaseOverride;
 };
 
 export type DatabaseExtension = {
@@ -438,6 +459,7 @@ export type DatabaseTrigger = {
   referencingOldTableAs?: string;
   when?: string;
   functionName: string;
+  override?: DatabaseOverride;
   synchronize: boolean;
 };
 export type TriggerTiming = 'before' | 'after' | 'instead of';
@@ -453,6 +475,7 @@ export type DatabaseIndex = {
   using?: string;
   with?: string;
   where?: string;
+  override?: DatabaseOverride;
   synchronize: boolean;
 };
 
@@ -476,6 +499,9 @@ export type SchemaDiff = { reason: string } & (
   | { type: 'ParameterReset'; databaseName: string; parameterName: string }
   | { type: 'EnumCreate'; enum: DatabaseEnum }
   | { type: 'EnumDrop'; enumName: string }
+  | { type: 'OverrideCreate'; override: DatabaseOverride }
+  | { type: 'OverrideUpdate'; override: DatabaseOverride }
+  | { type: 'OverrideDrop'; overrideName: string }
 );
 
 export type CompareFunction<T> = (source: T, target: T) => SchemaDiff[];
diff --git a/server/test/sql-tools/check-constraint-default-name.stub.ts b/server/test/sql-tools/check-constraint-default-name.stub.ts
index 4ed0e6ad3a..1cb7c0644a 100644
--- a/server/test/sql-tools/check-constraint-default-name.stub.ts
+++ b/server/test/sql-tools/check-constraint-default-name.stub.ts
@@ -15,6 +15,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/check-constraint-override-name.stub.ts b/server/test/sql-tools/check-constraint-override-name.stub.ts
index 1dfcfe7566..3752dcfb22 100644
--- a/server/test/sql-tools/check-constraint-override-name.stub.ts
+++ b/server/test/sql-tools/check-constraint-override-name.stub.ts
@@ -15,6 +15,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-create-date.stub.ts b/server/test/sql-tools/column-create-date.stub.ts
index 42fe3f98ae..db5add2a12 100644
--- a/server/test/sql-tools/column-create-date.stub.ts
+++ b/server/test/sql-tools/column-create-date.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-default-boolean.stub.ts b/server/test/sql-tools/column-default-boolean.stub.ts
index eafefc524e..6454333599 100644
--- a/server/test/sql-tools/column-default-boolean.stub.ts
+++ b/server/test/sql-tools/column-default-boolean.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-default-date.stub.ts b/server/test/sql-tools/column-default-date.stub.ts
index b1998b47b2..70f4d520f9 100644
--- a/server/test/sql-tools/column-default-date.stub.ts
+++ b/server/test/sql-tools/column-default-date.stub.ts
@@ -16,6 +16,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-default-function.stub.ts b/server/test/sql-tools/column-default-function.stub.ts
index 57579cb230..1066a9af21 100644
--- a/server/test/sql-tools/column-default-function.stub.ts
+++ b/server/test/sql-tools/column-default-function.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-default-null.stub.ts b/server/test/sql-tools/column-default-null.stub.ts
index 869d02cf94..b517ca5a96 100644
--- a/server/test/sql-tools/column-default-null.stub.ts
+++ b/server/test/sql-tools/column-default-null.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-default-number.stub.ts b/server/test/sql-tools/column-default-number.stub.ts
index afec0da8fb..7954f2498b 100644
--- a/server/test/sql-tools/column-default-number.stub.ts
+++ b/server/test/sql-tools/column-default-number.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-default-string.stub.ts b/server/test/sql-tools/column-default-string.stub.ts
index 4b989a3f3b..0d0a18a0eb 100644
--- a/server/test/sql-tools/column-default-string.stub.ts
+++ b/server/test/sql-tools/column-default-string.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-delete-date.stub.ts b/server/test/sql-tools/column-delete-date.stub.ts
index 437407e33a..de494ad16e 100644
--- a/server/test/sql-tools/column-delete-date.stub.ts
+++ b/server/test/sql-tools/column-delete-date.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-enum-type.stub.ts b/server/test/sql-tools/column-enum-type.stub.ts
index 02fbeeabde..563835d720 100644
--- a/server/test/sql-tools/column-enum-type.stub.ts
+++ b/server/test/sql-tools/column-enum-type.stub.ts
@@ -27,6 +27,7 @@ export const schema: DatabaseSchema = {
   ],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-generated-identity.ts b/server/test/sql-tools/column-generated-identity.ts
index a6525fe9ac..29f7ba969a 100644
--- a/server/test/sql-tools/column-generated-identity.ts
+++ b/server/test/sql-tools/column-generated-identity.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-generated-uuid.stub.ts b/server/test/sql-tools/column-generated-uuid.stub.ts
index 4d355f2cf6..0d4d78a84f 100644
--- a/server/test/sql-tools/column-generated-uuid.stub.ts
+++ b/server/test/sql-tools/column-generated-uuid.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-index-name-default.ts b/server/test/sql-tools/column-index-name-default.ts
index 703a526285..ea1fb17fb4 100644
--- a/server/test/sql-tools/column-index-name-default.ts
+++ b/server/test/sql-tools/column-index-name-default.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-index-name.ts b/server/test/sql-tools/column-index-name.ts
index c72759c74d..2a37469600 100644
--- a/server/test/sql-tools/column-index-name.ts
+++ b/server/test/sql-tools/column-index-name.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-inferred-nullable.stub.ts b/server/test/sql-tools/column-inferred-nullable.stub.ts
index 64c6a8be99..50810291d3 100644
--- a/server/test/sql-tools/column-inferred-nullable.stub.ts
+++ b/server/test/sql-tools/column-inferred-nullable.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-name-default.stub.ts b/server/test/sql-tools/column-name-default.stub.ts
index fc16c7540d..57e15fc8b6 100644
--- a/server/test/sql-tools/column-name-default.stub.ts
+++ b/server/test/sql-tools/column-name-default.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-name-override.stub.ts b/server/test/sql-tools/column-name-override.stub.ts
index 5e5594a166..8741162735 100644
--- a/server/test/sql-tools/column-name-override.stub.ts
+++ b/server/test/sql-tools/column-name-override.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-name-string.stub.ts b/server/test/sql-tools/column-name-string.stub.ts
index d0455ee773..e4a60f51b9 100644
--- a/server/test/sql-tools/column-name-string.stub.ts
+++ b/server/test/sql-tools/column-name-string.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-nullable.stub.ts b/server/test/sql-tools/column-nullable.stub.ts
index 037b2db948..31c72fe97c 100644
--- a/server/test/sql-tools/column-nullable.stub.ts
+++ b/server/test/sql-tools/column-nullable.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-string-length.stub.ts b/server/test/sql-tools/column-string-length.stub.ts
index 00d7264914..a04cfbd117 100644
--- a/server/test/sql-tools/column-string-length.stub.ts
+++ b/server/test/sql-tools/column-string-length.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-unique-constraint-name-default.stub.ts b/server/test/sql-tools/column-unique-constraint-name-default.stub.ts
index b1dfaf4308..076a93bf57 100644
--- a/server/test/sql-tools/column-unique-constraint-name-default.stub.ts
+++ b/server/test/sql-tools/column-unique-constraint-name-default.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-unique-constraint-name-override.stub.ts b/server/test/sql-tools/column-unique-constraint-name-override.stub.ts
index b873085fa0..d4c3d5bb6a 100644
--- a/server/test/sql-tools/column-unique-constraint-name-override.stub.ts
+++ b/server/test/sql-tools/column-unique-constraint-name-override.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/column-update-date.stub.ts b/server/test/sql-tools/column-update-date.stub.ts
index f63f568cf6..dfa09888c0 100644
--- a/server/test/sql-tools/column-update-date.stub.ts
+++ b/server/test/sql-tools/column-update-date.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/foreign-key-constraint-column-order.stub.ts b/server/test/sql-tools/foreign-key-constraint-column-order.stub.ts
index c31a00c186..2523701e49 100644
--- a/server/test/sql-tools/foreign-key-constraint-column-order.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-column-order.stub.ts
@@ -31,6 +31,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/foreign-key-constraint-missing-column.stub.ts b/server/test/sql-tools/foreign-key-constraint-missing-column.stub.ts
index f42f1251f4..dcd957676a 100644
--- a/server/test/sql-tools/foreign-key-constraint-missing-column.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-missing-column.stub.ts
@@ -21,6 +21,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/foreign-key-constraint-missing-reference-column.stub.ts b/server/test/sql-tools/foreign-key-constraint-missing-reference-column.stub.ts
index 8eb7b5cde8..238f4174f3 100644
--- a/server/test/sql-tools/foreign-key-constraint-missing-reference-column.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-missing-reference-column.stub.ts
@@ -21,6 +21,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/foreign-key-constraint-missing-reference-table.stub.ts b/server/test/sql-tools/foreign-key-constraint-missing-reference-table.stub.ts
index 47c9f18e1d..c6d6fd5b09 100644
--- a/server/test/sql-tools/foreign-key-constraint-missing-reference-table.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-missing-reference-table.stub.ts
@@ -20,6 +20,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/foreign-key-constraint-multiple-columns.stub.ts b/server/test/sql-tools/foreign-key-constraint-multiple-columns.stub.ts
index 6e2ee7741e..a86611bb50 100644
--- a/server/test/sql-tools/foreign-key-constraint-multiple-columns.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-multiple-columns.stub.ts
@@ -27,6 +27,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/foreign-key-constraint-no-index.stub.ts b/server/test/sql-tools/foreign-key-constraint-no-index.stub.ts
index 508110f687..8bb436c9ac 100644
--- a/server/test/sql-tools/foreign-key-constraint-no-index.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-no-index.stub.ts
@@ -21,6 +21,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/foreign-key-constraint-no-primary.stub.ts b/server/test/sql-tools/foreign-key-constraint-no-primary.stub.ts
index dbcefa1d39..6680b13b91 100644
--- a/server/test/sql-tools/foreign-key-constraint-no-primary.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint-no-primary.stub.ts
@@ -25,6 +25,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/foreign-key-constraint.stub.ts b/server/test/sql-tools/foreign-key-constraint.stub.ts
index 81f6292782..518c5aa6bb 100644
--- a/server/test/sql-tools/foreign-key-constraint.stub.ts
+++ b/server/test/sql-tools/foreign-key-constraint.stub.ts
@@ -21,6 +21,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/foreign-key-inferred-type.stub.ts b/server/test/sql-tools/foreign-key-inferred-type.stub.ts
index 626bb2a752..33f1c2dfde 100644
--- a/server/test/sql-tools/foreign-key-inferred-type.stub.ts
+++ b/server/test/sql-tools/foreign-key-inferred-type.stub.ts
@@ -20,6 +20,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts b/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts
index ad4142a503..c38c29cde0 100644
--- a/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts
+++ b/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts
@@ -20,6 +20,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/index-name-default.stub.ts b/server/test/sql-tools/index-name-default.stub.ts
index b309e93d66..1918106eaa 100644
--- a/server/test/sql-tools/index-name-default.stub.ts
+++ b/server/test/sql-tools/index-name-default.stub.ts
@@ -15,6 +15,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/index-name-override.stub.ts b/server/test/sql-tools/index-name-override.stub.ts
index daa4fa208b..a48dc6e6d6 100644
--- a/server/test/sql-tools/index-name-override.stub.ts
+++ b/server/test/sql-tools/index-name-override.stub.ts
@@ -15,6 +15,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/index-with-expression.ts b/server/test/sql-tools/index-with-expression.ts
index 57bce5731b..07755b7f96 100644
--- a/server/test/sql-tools/index-with-expression.ts
+++ b/server/test/sql-tools/index-with-expression.ts
@@ -15,6 +15,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/index-with-where.stub.ts b/server/test/sql-tools/index-with-where.stub.ts
index f88702010a..86a4a3089d 100644
--- a/server/test/sql-tools/index-with-where.stub.ts
+++ b/server/test/sql-tools/index-with-where.stub.ts
@@ -15,6 +15,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/primary-key-constraint-name-default.stub.ts b/server/test/sql-tools/primary-key-constraint-name-default.stub.ts
index 3047605b8e..7edfd6ff36 100644
--- a/server/test/sql-tools/primary-key-constraint-name-default.stub.ts
+++ b/server/test/sql-tools/primary-key-constraint-name-default.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/primary-key-constraint-name-override.stub.ts b/server/test/sql-tools/primary-key-constraint-name-override.stub.ts
index ffc014c91f..ce1f2a096c 100644
--- a/server/test/sql-tools/primary-key-constraint-name-override.stub.ts
+++ b/server/test/sql-tools/primary-key-constraint-name-override.stub.ts
@@ -14,6 +14,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/table-name-default.stub.ts b/server/test/sql-tools/table-name-default.stub.ts
index 0cb84f518d..4384944364 100644
--- a/server/test/sql-tools/table-name-default.stub.ts
+++ b/server/test/sql-tools/table-name-default.stub.ts
@@ -11,6 +11,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/table-name-override.stub.ts b/server/test/sql-tools/table-name-override.stub.ts
index 1d66e0b7fb..5bccc429d0 100644
--- a/server/test/sql-tools/table-name-override.stub.ts
+++ b/server/test/sql-tools/table-name-override.stub.ts
@@ -11,6 +11,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table-1',
diff --git a/server/test/sql-tools/table-name-string-option.stub.ts b/server/test/sql-tools/table-name-string-option.stub.ts
index ae1dfe1b2d..f394699172 100644
--- a/server/test/sql-tools/table-name-string-option.stub.ts
+++ b/server/test/sql-tools/table-name-string-option.stub.ts
@@ -11,6 +11,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table-1',
diff --git a/server/test/sql-tools/trigger-after-delete.stub.ts b/server/test/sql-tools/trigger-after-delete.stub.ts
index 56c5d5f267..dcceaf25ce 100644
--- a/server/test/sql-tools/trigger-after-delete.stub.ts
+++ b/server/test/sql-tools/trigger-after-delete.stub.ts
@@ -22,6 +22,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/trigger-before-update.stub.ts b/server/test/sql-tools/trigger-before-update.stub.ts
index cbc3454a0b..6bf6afc721 100644
--- a/server/test/sql-tools/trigger-before-update.stub.ts
+++ b/server/test/sql-tools/trigger-before-update.stub.ts
@@ -22,6 +22,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/trigger-name-default.stub.ts b/server/test/sql-tools/trigger-name-default.stub.ts
index a6cf8d237a..382389bcf7 100644
--- a/server/test/sql-tools/trigger-name-default.stub.ts
+++ b/server/test/sql-tools/trigger-name-default.stub.ts
@@ -17,6 +17,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/trigger-name-override.stub.ts b/server/test/sql-tools/trigger-name-override.stub.ts
index aba0addb71..33c4da6b67 100644
--- a/server/test/sql-tools/trigger-name-override.stub.ts
+++ b/server/test/sql-tools/trigger-name-override.stub.ts
@@ -18,6 +18,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/unique-constraint-name-default.stub.ts b/server/test/sql-tools/unique-constraint-name-default.stub.ts
index bf302412c1..90fbe09224 100644
--- a/server/test/sql-tools/unique-constraint-name-default.stub.ts
+++ b/server/test/sql-tools/unique-constraint-name-default.stub.ts
@@ -15,6 +15,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',
diff --git a/server/test/sql-tools/unique-constraint-name-override.stub.ts b/server/test/sql-tools/unique-constraint-name-override.stub.ts
index 189c0c38d6..3da7584c0c 100644
--- a/server/test/sql-tools/unique-constraint-name-override.stub.ts
+++ b/server/test/sql-tools/unique-constraint-name-override.stub.ts
@@ -15,6 +15,7 @@ export const schema: DatabaseSchema = {
   enums: [],
   extensions: [],
   parameters: [],
+  overrides: [],
   tables: [
     {
       name: 'table1',

From 172388c455f6ae0e0bcbf9bf7c7be8999916d750 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 8 Jul 2025 21:54:29 +0800
Subject: [PATCH 152/337] feat(mobile): drift recently taken page (#19814)

* feat(mobile): drift recently taken page

* fix: lint

* refactor(mobile): timeline queries (#19818)

refactor: remote assets query to take single user id

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

---------

Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../lib/domain/services/timeline.service.dart |   6 +-
 .../repositories/remote_album.repository.dart |  10 +-
 .../repositories/timeline.repository.dart     | 162 ++++++++++--------
 .../pages/dev/drift_recently_taken.page.dart  |  35 ++++
 .../pages/dev/feat_in_development.page.dart   |   5 +
 .../drift_asset_selection_timeline.page.dart  |  12 +-
 mobile/lib/routing/router.dart                |   6 +-
 mobile/lib/routing/router.gr.dart             |  16 ++
 8 files changed, 175 insertions(+), 77 deletions(-)
 create mode 100644 mobile/lib/presentation/pages/dev/drift_recently_taken.page.dart

diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index eb332657ff..02ed552e0e 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -58,11 +58,11 @@ class TimelineFactory {
         ),
       );
 
-  TimelineService remoteAssets(List<String> timelineUsers) => TimelineService(
+  TimelineService remoteAssets(String ownerId) => TimelineService(
         assetSource: (offset, count) => _timelineRepository
-            .getRemoteBucketAssets(timelineUsers, offset: offset, count: count),
+            .getRemoteBucketAssets(ownerId, offset: offset, count: count),
         bucketSource: () => _timelineRepository.watchRemoteBucket(
-          timelineUsers,
+          ownerId,
           groupBy: GroupAssetsBy.month,
         ),
       );
diff --git a/mobile/lib/infrastructure/repositories/remote_album.repository.dart b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
index 0e49b45bc5..b1b73b4cdc 100644
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -18,13 +18,21 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
         _db.remoteAlbumAssetEntity.albumId.equalsExp(_db.remoteAlbumEntity.id),
         useColumns: false,
       ),
+      leftOuterJoin(
+        _db.remoteAssetEntity,
+        _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId),
+        useColumns: false,
+      ),
       leftOuterJoin(
         _db.userEntity,
         _db.userEntity.id.equalsExp(_db.remoteAlbumEntity.ownerId),
+        useColumns: false,
       ),
     ]);
     query
+      ..where(_db.remoteAssetEntity.deletedAt.isNull())
       ..addColumns([assetCount])
+      ..addColumns([_db.userEntity.name])
       ..groupBy([_db.remoteAlbumEntity.id]);
 
     if (sortBy.isNotEmpty) {
@@ -43,7 +51,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
         .map(
           (row) => row.readTable(_db.remoteAlbumEntity).toDto(
                 assetCount: row.read(assetCount) ?? 0,
-                ownerName: row.readTable(_db.userEntity).name,
+                ownerName: row.read(_db.userEntity.name)!,
               ),
         )
         .get();
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index a13109068c..f67a154398 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -124,6 +124,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         innerJoin(
           _db.localAlbumAssetEntity,
           _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
+          useColumns: false,
         ),
       ])
       ..where(_db.localAlbumAssetEntity.albumId.equals(albumId))
@@ -147,6 +148,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         innerJoin(
           _db.localAlbumAssetEntity,
           _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
+          useColumns: false,
         ),
       ],
     )
@@ -179,9 +181,13 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
           _db.remoteAlbumAssetEntity,
           _db.remoteAlbumAssetEntity.assetId
               .equalsExp(_db.remoteAssetEntity.id),
+          useColumns: false,
         ),
       ])
-      ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId))
+      ..where(
+        _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAlbumAssetEntity.albumId.equals(albumId),
+      )
       ..groupBy([dateExp])
       ..orderBy([OrderingTerm.desc(dateExp)]);
 
@@ -203,10 +209,14 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
           _db.remoteAlbumAssetEntity,
           _db.remoteAlbumAssetEntity.assetId
               .equalsExp(_db.remoteAssetEntity.id),
+          useColumns: false,
         ),
       ],
     )
-      ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId))
+      ..where(
+        _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAlbumAssetEntity.albumId.equals(albumId),
+      )
       ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
       ..limit(count, offset: offset);
     return query
@@ -214,15 +224,17 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         .get();
   }
 
-  Stream<List<Bucket>> watchFavoriteBucket(
-    String userId, {
+  Stream<List<Bucket>> watchRemoteBucket(
+    String ownerId, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
   }) {
     if (groupBy == GroupAssetsBy.none) {
       return _db.remoteAssetEntity
           .count(
             where: (row) =>
-                row.isFavorite.equals(true) & row.ownerId.equals(userId),
+                row.deletedAt.isNull() &
+                row.visibility.equalsValue(AssetVisibility.timeline) &
+                row.ownerId.equals(ownerId),
           )
           .map(_generateBuckets)
           .watchSingle();
@@ -234,7 +246,63 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     final query = _db.remoteAssetEntity.selectOnly()
       ..addColumns([assetCountExp, dateExp])
       ..where(
-        _db.remoteAssetEntity.ownerId.equals(userId) &
+        _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.visibility
+                .equalsValue(AssetVisibility.timeline) &
+            _db.remoteAssetEntity.ownerId.equals(ownerId),
+      )
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> getRemoteBucketAssets(
+    String ownerId, {
+    required int offset,
+    required int count,
+  }) {
+    final query = _db.remoteAssetEntity.select()
+      ..where(
+        (row) =>
+            row.deletedAt.isNull() &
+            row.visibility.equalsValue(AssetVisibility.timeline) &
+            row.ownerId.equals(ownerId),
+      )
+      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
+      ..limit(count, offset: offset);
+
+    return query.map((row) => row.toDto()).get();
+  }
+
+  Stream<List<Bucket>> watchFavoriteBucket(
+    String userId, {
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    if (groupBy == GroupAssetsBy.none) {
+      return _db.remoteAssetEntity
+          .count(
+            where: (row) =>
+                row.deletedAt.isNull() &
+                row.isFavorite.equals(true) &
+                row.ownerId.equals(userId),
+          )
+          .map(_generateBuckets)
+          .watchSingle();
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..where(
+        _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.ownerId.equals(userId) &
             _db.remoteAssetEntity.isFavorite.equals(true),
       )
       ..groupBy([dateExp])
@@ -254,7 +322,10 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
   }) {
     final query = _db.remoteAssetEntity.select()
       ..where(
-        (row) => row.isFavorite.equals(true) & row.ownerId.equals(userId),
+        (row) =>
+            row.deletedAt.isNull() &
+            row.isFavorite.equals(true) &
+            row.ownerId.equals(userId),
       )
       ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
       ..limit(count, offset: offset);
@@ -318,6 +389,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       return _db.remoteAssetEntity
           .count(
             where: (row) =>
+                row.deletedAt.isNull() &
                 row.visibility.equalsValue(AssetVisibility.archive) &
                 row.ownerId.equals(userId),
           )
@@ -331,7 +403,8 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     final query = _db.remoteAssetEntity.selectOnly()
       ..addColumns([assetCountExp, dateExp])
       ..where(
-        _db.remoteAssetEntity.ownerId.equals(userId) &
+        _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.ownerId.equals(userId) &
             _db.remoteAssetEntity.visibility
                 .equalsValue(AssetVisibility.archive),
       )
@@ -353,6 +426,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     final query = _db.remoteAssetEntity.select()
       ..where(
         (row) =>
+            row.deletedAt.isNull() &
             row.ownerId.equals(userId) &
             row.visibility.equalsValue(AssetVisibility.archive),
       )
@@ -370,6 +444,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       return _db.remoteAssetEntity
           .count(
             where: (row) =>
+                row.deletedAt.isNull() &
                 row.visibility.equalsValue(AssetVisibility.locked) &
                 row.ownerId.equals(userId),
           )
@@ -383,7 +458,8 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     final query = _db.remoteAssetEntity.selectOnly()
       ..addColumns([assetCountExp, dateExp])
       ..where(
-        _db.remoteAssetEntity.ownerId.equals(userId) &
+        _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.ownerId.equals(userId) &
             _db.remoteAssetEntity.visibility
                 .equalsValue(AssetVisibility.locked),
       )
@@ -405,6 +481,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     final query = _db.remoteAssetEntity.select()
       ..where(
         (row) =>
+            row.deletedAt.isNull() &
             row.visibility.equalsValue(AssetVisibility.locked) &
             row.ownerId.equals(userId),
       )
@@ -422,6 +499,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       return _db.remoteAssetEntity
           .count(
             where: (row) =>
+                row.deletedAt.isNull() &
                 row.type.equalsValue(AssetType.video) &
                 row.visibility.equalsValue(AssetVisibility.timeline) &
                 row.ownerId.equals(userId),
@@ -436,7 +514,8 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     final query = _db.remoteAssetEntity.selectOnly()
       ..addColumns([assetCountExp, dateExp])
       ..where(
-        _db.remoteAssetEntity.ownerId.equals(userId) &
+        _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.ownerId.equals(userId) &
             _db.remoteAssetEntity.type.equalsValue(AssetType.video) &
             _db.remoteAssetEntity.visibility
                 .equalsValue(AssetVisibility.timeline),
@@ -459,71 +538,16 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     final query = _db.remoteAssetEntity.select()
       ..where(
         (row) =>
-            _db.remoteAssetEntity.type.equalsValue(AssetType.video) &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline) &
-            _db.remoteAssetEntity.ownerId.equals(userId),
+            row.deletedAt.isNull() &
+            row.type.equalsValue(AssetType.video) &
+            row.visibility.equalsValue(AssetVisibility.timeline) &
+            row.ownerId.equals(userId),
       )
       ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
       ..limit(count, offset: offset);
 
     return query.map((row) => row.toDto()).get();
   }
-
-  Stream<List<Bucket>> watchRemoteBucket(
-    List<String> userIds, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.deletedAt.isNull() &
-                row.visibility.equalsValue(AssetVisibility.timeline) &
-                row.ownerId.isIn(userIds),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline) &
-            _db.remoteAssetEntity.ownerId.isIn(userIds),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getRemoteBucketAssets(
-    List<String> userIds, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
-            row.deletedAt.isNull() &
-            row.visibility.equalsValue(AssetVisibility.timeline) &
-            row.ownerId.isIn(userIds),
-      )
-      ..orderBy([(t) => OrderingTerm.desc(t.createdAt)])
-      ..limit(count, offset: offset);
-
-    return query.map((row) => row.toDto()).get();
-  }
 }
 
 extension on Expression<DateTime> {
diff --git a/mobile/lib/presentation/pages/dev/drift_recently_taken.page.dart b/mobile/lib/presentation/pages/dev/drift_recently_taken.page.dart
new file mode 100644
index 0000000000..e2972fad56
--- /dev/null
+++ b/mobile/lib/presentation/pages/dev/drift_recently_taken.page.dart
@@ -0,0 +1,35 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.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/user.provider.dart';
+
+@RoutePage()
+class DriftRecentlyTakenPage extends StatelessWidget {
+  const DriftRecentlyTakenPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final user = ref.watch(currentUserProvider);
+            if (user == null) {
+              throw Exception(
+                'User must be logged in to access recently taken',
+              );
+            }
+
+            final timelineService =
+                ref.watch(timelineFactoryProvider).remoteAssets(user.id);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index a4343b720f..566c10c70a 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -132,6 +132,11 @@ final _features = [
     icon: Icons.video_collection_outlined,
     onTap: (ctx, _) => ctx.pushRoute(const DriftVideoRoute()),
   ),
+  _Feature(
+    name: 'Recently Taken',
+    icon: Icons.schedule_outlined,
+    onTap: (ctx, _) => ctx.pushRoute(const DriftRecentlyTakenRoute()),
+  ),
 ];
 
 @RoutePage()
diff --git a/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart b/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
index b7cb033828..df6211c338 100644
--- a/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
+++ b/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
@@ -5,6 +5,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.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/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 
 @RoutePage()
 class DriftAssetSelectionTimelinePage extends ConsumerWidget {
@@ -29,10 +30,15 @@ class DriftAssetSelectionTimelinePage extends ConsumerWidget {
         ),
         timelineServiceProvider.overrideWith(
           (ref) {
-            final timelineUsers =
-                ref.watch(timelineUsersProvider).valueOrNull ?? [];
+            final user = ref.watch(currentUserProvider);
+            if (user == null) {
+              throw Exception(
+                'User must be logged in to access recently taken',
+              );
+            }
+
             final timelineService =
-                ref.watch(timelineFactoryProvider).remoteAssets(timelineUsers);
+                ref.watch(timelineFactoryProvider).remoteAssets(user.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 4bf287c08a..0de001ea47 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -68,6 +68,7 @@ import 'package:immich_mobile/pages/search/recently_taken.page.dart';
 import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_favorite.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/drift_recently_taken.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_video.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_trash.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_archive.page.dart';
@@ -428,7 +429,10 @@ class AppRouter extends RootStackRouter {
       page: DriftAssetSelectionTimelineRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
-
+    AutoRoute(
+      page: DriftRecentlyTakenRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index f752c2dc8a..1ddba4e596 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -783,6 +783,22 @@ class DriftMemoryRouteArgs {
   }
 }
 
+/// generated route for
+/// [DriftRecentlyTakenPage]
+class DriftRecentlyTakenRoute extends PageRouteInfo<void> {
+  const DriftRecentlyTakenRoute({List<PageRouteInfo>? children})
+      : super(DriftRecentlyTakenRoute.name, initialChildren: children);
+
+  static const String name = 'DriftRecentlyTakenRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftRecentlyTakenPage();
+    },
+  );
+}
+
 /// generated route for
 /// [DriftTrashPage]
 class DriftTrashRoute extends PageRouteInfo<void> {

From e703685d8d5d74530792b98b534f26421250eb17 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:31:07 +0800
Subject: [PATCH 153/337] feat(mobile): drift partner detail page (#19815)

* feat(mobile): drift partner detail page

* fix: lint
---
 .../pages/dev/drift_partner_detail.page.dart  | 29 ++++++++++++++
 .../pages/drift_library.page.dart             |  3 +-
 mobile/lib/routing/router.dart                |  5 +++
 mobile/lib/routing/router.gr.dart             | 38 +++++++++++++++++++
 4 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 mobile/lib/presentation/pages/dev/drift_partner_detail.page.dart

diff --git a/mobile/lib/presentation/pages/dev/drift_partner_detail.page.dart b/mobile/lib/presentation/pages/dev/drift_partner_detail.page.dart
new file mode 100644
index 0000000000..4b62387cb4
--- /dev/null
+++ b/mobile/lib/presentation/pages/dev/drift_partner_detail.page.dart
@@ -0,0 +1,29 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+
+@RoutePage()
+class DriftPartnerDetailPage extends StatelessWidget {
+  final String partnerId;
+
+  const DriftPartnerDetailPage({super.key, required this.partnerId});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final timelineService =
+                ref.watch(timelineFactoryProvider).remoteAssets(partnerId);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/drift_library.page.dart b/mobile/lib/presentation/pages/drift_library.page.dart
index 6c83ce0ca0..1b3452009a 100644
--- a/mobile/lib/presentation/pages/drift_library.page.dart
+++ b/mobile/lib/presentation/pages/drift_library.page.dart
@@ -493,7 +493,8 @@ class _PartnerList extends StatelessWidget {
               fontWeight: FontWeight.w500,
             ),
           ).t(context: context, args: {'user': partner.name}),
-          onTap: () => context.pushRoute(PartnerDetailRoute(partner: partner)),
+          onTap: () =>
+              context.pushRoute(DriftPartnerDetailRoute(partnerId: partner.id)),
         );
       },
     );
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 0de001ea47..c8905d79c0 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -68,6 +68,7 @@ import 'package:immich_mobile/pages/search/recently_taken.page.dart';
 import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_favorite.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/drift_partner_detail.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_recently_taken.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_video.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_trash.page.dart';
@@ -429,6 +430,10 @@ class AppRouter extends RootStackRouter {
       page: DriftAssetSelectionTimelineRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftPartnerDetailRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     AutoRoute(
       page: DriftRecentlyTakenRoute.page,
       guards: [_authGuard, _duplicateGuard],
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 1ddba4e596..56ccb83aa9 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -783,6 +783,44 @@ class DriftMemoryRouteArgs {
   }
 }
 
+/// generated route for
+/// [DriftPartnerDetailPage]
+class DriftPartnerDetailRoute
+    extends PageRouteInfo<DriftPartnerDetailRouteArgs> {
+  DriftPartnerDetailRoute({
+    Key? key,
+    required String partnerId,
+    List<PageRouteInfo>? children,
+  }) : super(
+          DriftPartnerDetailRoute.name,
+          args: DriftPartnerDetailRouteArgs(key: key, partnerId: partnerId),
+          initialChildren: children,
+        );
+
+  static const String name = 'DriftPartnerDetailRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<DriftPartnerDetailRouteArgs>();
+      return DriftPartnerDetailPage(key: args.key, partnerId: args.partnerId);
+    },
+  );
+}
+
+class DriftPartnerDetailRouteArgs {
+  const DriftPartnerDetailRouteArgs({this.key, required this.partnerId});
+
+  final Key? key;
+
+  final String partnerId;
+
+  @override
+  String toString() {
+    return 'DriftPartnerDetailRouteArgs{key: $key, partnerId: $partnerId}';
+  }
+}
+
 /// generated route for
 /// [DriftRecentlyTakenPage]
 class DriftRecentlyTakenRoute extends PageRouteInfo<void> {

From a556de67b0ef330610f9d08fed660f093a767aee Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 8 Jul 2025 23:37:57 +0800
Subject: [PATCH 154/337] feat(mobile): drift local albums page (#19817)

* feat(mobile): drift local albums page

* fix: lint

* refactor: use AsyncValue

* fix: lint

* local album thumbnail

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../domain/services/local_album.service.dart  |  17 +++
 .../repositories/local_album.repository.dart  |  18 +++
 .../pages/dev/drift_local_album.page.dart     | 116 ++++++++++++++++++
 .../pages/drift_library.page.dart             |  40 ++++--
 .../images/local_album_thumbnail.widget.dart  |  54 ++++++++
 .../infrastructure/album.provider.dart        |  16 +++
 mobile/lib/routing/router.dart                |   5 +
 mobile/lib/routing/router.gr.dart             |  16 +++
 .../common/local_album_sliver_app_bar.dart    |  25 ++++
 9 files changed, 294 insertions(+), 13 deletions(-)
 create mode 100644 mobile/lib/domain/services/local_album.service.dart
 create mode 100644 mobile/lib/presentation/pages/dev/drift_local_album.page.dart
 create mode 100644 mobile/lib/presentation/widgets/images/local_album_thumbnail.widget.dart
 create mode 100644 mobile/lib/widgets/common/local_album_sliver_app_bar.dart

diff --git a/mobile/lib/domain/services/local_album.service.dart b/mobile/lib/domain/services/local_album.service.dart
new file mode 100644
index 0000000000..9af12ce595
--- /dev/null
+++ b/mobile/lib/domain/services/local_album.service.dart
@@ -0,0 +1,17 @@
+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/repositories/local_album.repository.dart';
+
+class LocalAlbumService {
+  final DriftLocalAlbumRepository _repository;
+
+  const LocalAlbumService(this._repository);
+
+  Future<List<LocalAlbum>> getAll() {
+    return _repository.getAll();
+  }
+
+  Future<LocalAsset?> getThumbnail(String albumId) {
+    return _repository.getThumbnail(albumId);
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/local_album.repository.dart b/mobile/lib/infrastructure/repositories/local_album.repository.dart
index 33d61848db..154e79149a 100644
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -361,6 +361,24 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
       batch.deleteWhere(_db.localAssetEntity, (f) => f.id.isIn(ids));
     });
   }
+
+  Future<LocalAsset?> getThumbnail(String albumId) async {
+    final query = _db.localAlbumAssetEntity.select().join([
+      innerJoin(
+        _db.localAssetEntity,
+        _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
+      ),
+    ])
+      ..where(_db.localAlbumAssetEntity.albumId.equals(albumId))
+      ..orderBy([OrderingTerm.asc(_db.localAssetEntity.id)])
+      ..limit(1);
+
+    final results = await query
+        .map((row) => row.readTable(_db.localAssetEntity).toDto())
+        .get();
+
+    return results.isNotEmpty ? results.first : null;
+  }
 }
 
 extension on LocalAlbumEntityData {
diff --git a/mobile/lib/presentation/pages/dev/drift_local_album.page.dart b/mobile/lib/presentation/pages/dev/drift_local_album.page.dart
new file mode 100644
index 0000000000..f47811b6da
--- /dev/null
+++ b/mobile/lib/presentation/pages/dev/drift_local_album.page.dart
@@ -0,0 +1,116 @@
+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/theme_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/presentation/widgets/images/local_album_thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/common/local_album_sliver_app_bar.dart';
+
+@RoutePage()
+class DriftLocalAlbumsPage extends StatelessWidget {
+  const DriftLocalAlbumsPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Scaffold(
+      body: CustomScrollView(
+        slivers: [
+          LocalAlbumsSliverAppBar(),
+          _AlbumList(),
+        ],
+      ),
+    );
+  }
+}
+
+class _AlbumList extends ConsumerWidget {
+  const _AlbumList();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final albums = ref.watch(localAlbumProvider);
+
+    return albums.when(
+      loading: () => const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: CircularProgressIndicator(),
+          ),
+        ),
+      ),
+      error: (error, stack) => SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(20.0),
+            child: Text(
+              'Error loading albums: $error, stack: $stack',
+              style: TextStyle(
+                color: context.colorScheme.error,
+              ),
+            ),
+          ),
+        ),
+      ),
+      data: (albums) {
+        if (albums.isEmpty) {
+          return const SliverToBoxAdapter(
+            child: Center(
+              child: Padding(
+                padding: EdgeInsets.all(20.0),
+                child: Text('No albums found'),
+              ),
+            ),
+          );
+        }
+
+        return SliverPadding(
+          padding: const EdgeInsets.all(18.0),
+          sliver: SliverList.builder(
+            itemBuilder: (_, index) {
+              final album = albums[index];
+
+              return Padding(
+                padding: const EdgeInsets.only(bottom: 8.0),
+                child: LargeLeadingTile(
+                  leadingPadding: const EdgeInsets.only(
+                    right: 16,
+                  ),
+                  leading: SizedBox(
+                    width: 80,
+                    height: 80,
+                    child: LocalAlbumThumbnail(
+                      albumId: album.id,
+                    ),
+                  ),
+                  title: Text(
+                    album.name,
+                    style: context.textTheme.titleSmall?.copyWith(
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                  subtitle: Text(
+                    'items_count'.t(
+                      context: context,
+                      args: {'count': album.assetCount},
+                    ),
+                    style: context.textTheme.bodyMedium?.copyWith(
+                      color: context.colorScheme.onSurfaceSecondary,
+                    ),
+                  ),
+                  onTap: () =>
+                      context.pushRoute(LocalTimelineRoute(albumId: album.id)),
+                ),
+              );
+            },
+            itemCount: albums.length,
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/drift_library.page.dart b/mobile/lib/presentation/pages/drift_library.page.dart
index 1b3452009a..0efa8040e7 100644
--- a/mobile/lib/presentation/pages/drift_library.page.dart
+++ b/mobile/lib/presentation/pages/drift_library.page.dart
@@ -5,14 +5,14 @@ import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/album/album.provider.dart';
+import 'package:immich_mobile/presentation/widgets/images/local_album_thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/partner.provider.dart';
 import 'package:immich_mobile/providers/search/people.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
-import 'package:immich_mobile/widgets/album/album_thumbnail_card.dart';
 import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
 import 'package:immich_mobile/widgets/common/user_avatar.dart';
 import 'package:immich_mobile/widgets/map/map_thumbnail.dart';
@@ -305,8 +305,7 @@ class _LocalAlbumsCollectionCard extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    // TODO: Migrate to the drift after local album page
-    final albums = ref.watch(localAlbumsProvider);
+    final albums = ref.watch(localAlbumProvider);
 
     return LayoutBuilder(
       builder: (context, constraints) {
@@ -315,9 +314,7 @@ class _LocalAlbumsCollectionCard extends ConsumerWidget {
         final size = context.width * widthFactor - 20.0;
 
         return GestureDetector(
-          onTap: () => context.pushRoute(
-            const LocalAlbumsRoute(),
-          ),
+          onTap: () => context.pushRoute(const DriftLocalAlbumsRoute()),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
@@ -342,12 +339,29 @@ class _LocalAlbumsCollectionCard extends ConsumerWidget {
                     crossAxisSpacing: 8,
                     mainAxisSpacing: 8,
                     physics: const NeverScrollableScrollPhysics(),
-                    children: albums.take(4).map((album) {
-                      return AlbumThumbnailCard(
-                        album: album,
-                        showTitle: false,
-                      );
-                    }).toList(),
+                    children: albums.when(
+                      data: (data) {
+                        return data.take(4).map((album) {
+                          return LocalAlbumThumbnail(
+                            albumId: album.id,
+                          );
+                        }).toList();
+                      },
+                      error: (error, _) {
+                        return [
+                          Center(
+                            child: Text('Error: $error'),
+                          ),
+                        ];
+                      },
+                      loading: () {
+                        return [
+                          const Center(
+                            child: CircularProgressIndicator(),
+                          ),
+                        ];
+                      },
+                    ),
                   ),
                 ),
               ),
diff --git a/mobile/lib/presentation/widgets/images/local_album_thumbnail.widget.dart b/mobile/lib/presentation/widgets/images/local_album_thumbnail.widget.dart
new file mode 100644
index 0000000000..dcf0f28527
--- /dev/null
+++ b/mobile/lib/presentation/widgets/images/local_album_thumbnail.widget.dart
@@ -0,0 +1,54 @@
+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/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+
+class LocalAlbumThumbnail extends ConsumerWidget {
+  const LocalAlbumThumbnail({
+    super.key,
+    required this.albumId,
+  });
+
+  final String albumId;
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final localAlbumThumbnail = ref.watch(localAlbumThumbnailProvider(albumId));
+    return localAlbumThumbnail.when(
+      data: (data) {
+        if (data == null) {
+          return Container(
+            decoration: BoxDecoration(
+              color: context.colorScheme.surfaceContainer,
+              borderRadius: const BorderRadius.all(Radius.circular(16)),
+              border: Border.all(
+                color: context.colorScheme.outline.withAlpha(50),
+                width: 1,
+              ),
+            ),
+            child: Icon(
+              Icons.collections,
+              size: 24,
+              color: context.primaryColor,
+            ),
+          );
+        }
+
+        return ClipRRect(
+          borderRadius: const BorderRadius.all(Radius.circular(16)),
+          child: Thumbnail(
+            asset: data,
+          ),
+        );
+      },
+      error: (error, stack) {
+        return const Icon(Icons.error, size: 24);
+      },
+      loading: () => const SizedBox(
+        width: 24,
+        height: 24,
+        child: Center(child: CircularProgressIndicator()),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/providers/infrastructure/album.provider.dart b/mobile/lib/providers/infrastructure/album.provider.dart
index f222e20f50..4a6db50697 100644
--- a/mobile/lib/providers/infrastructure/album.provider.dart
+++ b/mobile/lib/providers/infrastructure/album.provider.dart
@@ -1,4 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.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/services/local_album.service.dart';
 import 'package:immich_mobile/domain/services/remote_album.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
@@ -9,6 +12,19 @@ final localAlbumRepository = Provider<DriftLocalAlbumRepository>(
   (ref) => DriftLocalAlbumRepository(ref.watch(driftProvider)),
 );
 
+final localAlbumServiceProvider = Provider<LocalAlbumService>(
+  (ref) => LocalAlbumService(ref.watch(localAlbumRepository)),
+);
+
+final localAlbumProvider = FutureProvider<List<LocalAlbum>>(
+  (ref) => LocalAlbumService(ref.watch(localAlbumRepository)).getAll(),
+);
+
+final localAlbumThumbnailProvider = FutureProvider.family<LocalAsset?, String>(
+  (ref, albumId) =>
+      LocalAlbumService(ref.watch(localAlbumRepository)).getThumbnail(albumId),
+);
+
 final remoteAlbumRepository = Provider<DriftRemoteAlbumRepository>(
   (ref) => DriftRemoteAlbumRepository(ref.watch(driftProvider)),
 );
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index c8905d79c0..2dbd835ce8 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -69,6 +69,7 @@ import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_favorite.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_partner_detail.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/drift_local_album.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_recently_taken.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_video.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/drift_trash.page.dart';
@@ -438,6 +439,10 @@ class AppRouter extends RootStackRouter {
       page: DriftRecentlyTakenRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftLocalAlbumsRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 56ccb83aa9..b13320b1c0 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -715,6 +715,22 @@ class DriftLibraryRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftLocalAlbumsPage]
+class DriftLocalAlbumsRoute extends PageRouteInfo<void> {
+  const DriftLocalAlbumsRoute({List<PageRouteInfo>? children})
+      : super(DriftLocalAlbumsRoute.name, initialChildren: children);
+
+  static const String name = 'DriftLocalAlbumsRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftLocalAlbumsPage();
+    },
+  );
+}
+
 /// generated route for
 /// [DriftLockedFolderPage]
 class DriftLockedFolderRoute extends PageRouteInfo<void> {
diff --git a/mobile/lib/widgets/common/local_album_sliver_app_bar.dart b/mobile/lib/widgets/common/local_album_sliver_app_bar.dart
new file mode 100644
index 0000000000..4880865e66
--- /dev/null
+++ b/mobile/lib/widgets/common/local_album_sliver_app_bar.dart
@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+
+class LocalAlbumsSliverAppBar extends StatelessWidget {
+  const LocalAlbumsSliverAppBar({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverAppBar(
+      floating: true,
+      pinned: true,
+      snap: false,
+      backgroundColor: context.colorScheme.surfaceContainer,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(Radius.circular(5)),
+      ),
+      automaticallyImplyLeading: true,
+      centerTitle: true,
+      title: Text(
+        "on_this_device".t(context: context),
+      ),
+    );
+  }
+}

From d03eb87058799ac4e8b462aa2b4087449a564640 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Tue, 8 Jul 2025 10:50:59 -0500
Subject: [PATCH 155/337] fix(mobile): deeplinking to asset view while viewer
 is already open (#19812)

* initial attempt at new guard

* do not resolve the route when replaced

* Update gallery_guard.dart comment

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/routing/gallery_guard.dart      | 31 ++++++++++++++++++++++
 mobile/lib/routing/router.dart             |  5 +++-
 mobile/lib/services/deep_link.service.dart |  1 -
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 mobile/lib/routing/gallery_guard.dart

diff --git a/mobile/lib/routing/gallery_guard.dart b/mobile/lib/routing/gallery_guard.dart
new file mode 100644
index 0000000000..fcac142271
--- /dev/null
+++ b/mobile/lib/routing/gallery_guard.dart
@@ -0,0 +1,31 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:immich_mobile/routing/router.dart';
+
+/// Handles duplicate navigation to this route (primarily for deep linking)
+class GalleryGuard extends AutoRouteGuard {
+  const GalleryGuard();
+  @override
+  void onNavigation(NavigationResolver resolver, StackRouter router) async {
+    final newRouteName = resolver.route.name;
+    final currentTopRouteName =
+        router.stack.isNotEmpty ? router.stack.last.name : null;
+
+    if (currentTopRouteName == newRouteName) {
+      // Replace instead of pushing duplicate
+      final args = resolver.route.args as GalleryViewerRouteArgs;
+
+      router.replace(
+        GalleryViewerRoute(
+          renderList: args.renderList,
+          initialIndex: args.initialIndex,
+          heroOffset: args.heroOffset,
+          showStack: args.showStack,
+        ),
+      );
+      // Prevent further navigation since we replaced the route
+      resolver.next(false);
+      return;
+    }
+    resolver.next(true);
+  }
+}
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 2dbd835ce8..18aa937a9d 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -91,6 +91,7 @@ import 'package:immich_mobile/routing/auth_guard.dart';
 import 'package:immich_mobile/routing/backup_permission_guard.dart';
 import 'package:immich_mobile/routing/custom_transition_builders.dart';
 import 'package:immich_mobile/routing/duplicate_guard.dart';
+import 'package:immich_mobile/routing/gallery_guard.dart';
 import 'package:immich_mobile/routing/locked_guard.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/local_auth.service.dart';
@@ -116,6 +117,7 @@ class AppRouter extends RootStackRouter {
   late final DuplicateGuard _duplicateGuard;
   late final BackupPermissionGuard _backupPermissionGuard;
   late final LockedGuard _lockedGuard;
+  late final GalleryGuard _galleryGuard;
 
   AppRouter(
     ApiService apiService,
@@ -128,6 +130,7 @@ class AppRouter extends RootStackRouter {
     _lockedGuard =
         LockedGuard(apiService, secureStorageService, localAuthService);
     _backupPermissionGuard = BackupPermissionGuard(galleryPermissionNotifier);
+    _galleryGuard = const GalleryGuard();
   }
 
   @override
@@ -197,7 +200,7 @@ class AppRouter extends RootStackRouter {
     ),
     CustomRoute(
       page: GalleryViewerRoute.page,
-      guards: [_authGuard, _duplicateGuard],
+      guards: [_authGuard, _galleryGuard],
       transitionsBuilder: CustomTransitionsBuilders.zoomedPage,
     ),
     AutoRoute(
diff --git a/mobile/lib/services/deep_link.service.dart b/mobile/lib/services/deep_link.service.dart
index 2665d9ee52..e97a370967 100644
--- a/mobile/lib/services/deep_link.service.dart
+++ b/mobile/lib/services/deep_link.service.dart
@@ -106,7 +106,6 @@ class DeepLinkService {
 
   Future<PageRouteInfo?> _buildAssetDeepLink(String assetId) async {
     final asset = await _assetService.getAssetByRemoteId(assetId);
-
     if (asset == null) {
       return null;
     }

From 4db76ddcf0c397e2e95d7ce11913604d9efebc4f Mon Sep 17 00:00:00 2001
From: Hamish <133548095+Hamster45105@users.noreply.github.com>
Date: Wed, 9 Jul 2025 12:12:16 +1000
Subject: [PATCH 156/337] feat(web): update icons (#19831)

* fix: update password icon in user settings

* feat: add icons to more modals
---
 .../asset-viewer/actions/set-visibility-action.svelte    | 1 +
 .../photos-page/actions/set-visibility-action.svelte     | 1 +
 .../components/photos-page/delete-asset-dialog.svelte    | 2 ++
 .../lib/components/shared-components/change-date.svelte  | 2 ++
 .../components/shared-components/change-location.svelte  | 2 ++
 .../user-settings-page/user-settings-list.svelte         | 9 +++++++--
 .../lib/modals/AssetUpdateDecriptionConfirmModal.svelte  | 2 ++
 web/src/lib/modals/ConfirmModal.svelte                   | 4 +++-
 8 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte b/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte
index 1b06bf8e21..14126bb8c7 100644
--- a/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte
@@ -25,6 +25,7 @@
       prompt: isLocked ? $t('remove_from_locked_folder_confirmation') : $t('move_to_locked_folder_confirmation'),
       confirmText: $t('move'),
       confirmColor: isLocked ? 'danger' : 'primary',
+      icon: isLocked ? mdiLockOpenVariantOutline : mdiLockOutline,
     });
 
     if (!isConfirmed) {
diff --git a/web/src/lib/components/photos-page/actions/set-visibility-action.svelte b/web/src/lib/components/photos-page/actions/set-visibility-action.svelte
index 3c897d6b01..04598ca79d 100644
--- a/web/src/lib/components/photos-page/actions/set-visibility-action.svelte
+++ b/web/src/lib/components/photos-page/actions/set-visibility-action.svelte
@@ -26,6 +26,7 @@
       prompt: unlock ? $t('remove_from_locked_folder_confirmation') : $t('move_to_locked_folder_confirmation'),
       confirmText: $t('move'),
       confirmColor: unlock ? 'danger' : 'primary',
+      icon: unlock ? mdiLockOpenVariantOutline : mdiLockOutline,
     });
 
     if (!isConfirmed) {
diff --git a/web/src/lib/components/photos-page/delete-asset-dialog.svelte b/web/src/lib/components/photos-page/delete-asset-dialog.svelte
index 4862e072b8..2af215a34a 100644
--- a/web/src/lib/components/photos-page/delete-asset-dialog.svelte
+++ b/web/src/lib/components/photos-page/delete-asset-dialog.svelte
@@ -3,6 +3,7 @@
   import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
   import { showDeleteModal } from '$lib/stores/preferences.store';
   import { Checkbox, Label } from '@immich/ui';
+  import { mdiDeleteForeverOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
   interface Props {
@@ -26,6 +27,7 @@
 <ConfirmModal
   title={$t('permanently_delete_assets_count', { values: { count: size } })}
   confirmText={$t('delete')}
+  icon={mdiDeleteForeverOutline}
   onClose={(confirmed) => (confirmed ? handleConfirm() : onCancel())}
 >
   {#snippet promptSnippet()}
diff --git a/web/src/lib/components/shared-components/change-date.svelte b/web/src/lib/components/shared-components/change-date.svelte
index 7ab8303f5a..e5da909028 100644
--- a/web/src/lib/components/shared-components/change-date.svelte
+++ b/web/src/lib/components/shared-components/change-date.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
+  import { mdiCalendarEditOutline } from '@mdi/js';
   import { DateTime, Duration } from 'luxon';
   import { t } from 'svelte-i18n';
   import DateInput from '../elements/date-input.svelte';
@@ -178,6 +179,7 @@
 <ConfirmModal
   confirmColor="primary"
   {title}
+  icon={mdiCalendarEditOutline}
   prompt="Please select a new date:"
   disabled={!date.isValid}
   onClose={(confirmed) => (confirmed ? handleConfirm() : onCancel())}
diff --git a/web/src/lib/components/shared-components/change-location.svelte b/web/src/lib/components/shared-components/change-location.svelte
index 13f1c72da1..6409774d37 100644
--- a/web/src/lib/components/shared-components/change-location.svelte
+++ b/web/src/lib/components/shared-components/change-location.svelte
@@ -11,6 +11,7 @@
   import { delay } from '$lib/utils/asset-utils';
   import { handleError } from '$lib/utils/handle-error';
   import { searchPlaces, type AssetResponseDto, type PlacesResponseDto } from '@immich/sdk';
+  import { mdiMapMarkerMultipleOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import { get } from 'svelte/store';
   interface Point {
@@ -113,6 +114,7 @@
 <ConfirmModal
   confirmColor="primary"
   title={$t('change_location')}
+  icon={mdiMapMarkerMultipleOutline}
   size="medium"
   onClose={(confirmed) => (confirmed ? handleConfirm() : onCancel())}
 >
diff --git a/web/src/lib/components/user-settings-page/user-settings-list.svelte b/web/src/lib/components/user-settings-page/user-settings-list.svelte
index 32747f5ba6..ac8f3432b7 100644
--- a/web/src/lib/components/user-settings-page/user-settings-list.svelte
+++ b/web/src/lib/components/user-settings-page/user-settings-list.svelte
@@ -22,7 +22,7 @@
     mdiFeatureSearchOutline,
     mdiKeyOutline,
     mdiLockSmart,
-    mdiOnepassword,
+    mdiFormTextboxPassword,
     mdiServerOutline,
     mdiTwoFactorAuthentication,
   } from '@mdi/js';
@@ -124,7 +124,12 @@
     </SettingAccordion>
   {/if}
 
-  <SettingAccordion icon={mdiOnepassword} key="password" title={$t('password')} subtitle={$t('change_your_password')}>
+  <SettingAccordion
+    icon={mdiFormTextboxPassword}
+    key="password"
+    title={$t('password')}
+    subtitle={$t('change_your_password')}
+  >
     <ChangePasswordSettings />
   </SettingAccordion>
 
diff --git a/web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte b/web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte
index 4d5a81f5fa..77458b6e04 100644
--- a/web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte
+++ b/web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
   import { Input } from '@immich/ui';
+  import { mdiText } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
   interface Props {
@@ -15,6 +16,7 @@
 <ConfirmModal
   confirmColor="primary"
   title={$t('edit_description')}
+  icon={mdiText}
   prompt={$t('edit_description_prompt')}
   onClose={(confirmed) => (confirmed ? onClose(description) : onClose())}
 >
diff --git a/web/src/lib/modals/ConfirmModal.svelte b/web/src/lib/modals/ConfirmModal.svelte
index d1a109fa2c..c60d7c3963 100644
--- a/web/src/lib/modals/ConfirmModal.svelte
+++ b/web/src/lib/modals/ConfirmModal.svelte
@@ -10,6 +10,7 @@
     confirmColor?: Color;
     disabled?: boolean;
     size?: 'small' | 'medium';
+    icon?: string;
     onClose: (confirmed: boolean) => void;
     promptSnippet?: Snippet;
   }
@@ -21,6 +22,7 @@
     confirmColor = 'danger',
     disabled = false,
     size = 'small',
+    icon = undefined,
     onClose,
     promptSnippet,
   }: Props = $props();
@@ -30,7 +32,7 @@
   };
 </script>
 
-<Modal {title} onClose={() => onClose(false)} {size}>
+<Modal {title} {icon} onClose={() => onClose(false)} {size}>
   <ModalBody>
     {#if promptSnippet}{@render promptSnippet()}{:else}
       <p>{prompt}</p>

From 51ab7498e90b05c32d70f41c385d41ed4f2af787 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Wed, 9 Jul 2025 09:13:14 -0400
Subject: [PATCH 157/337] feat: create table with constraints (#19828)

---
 .../1752004072340-UpdateIndexOverrides.ts     |  31 +++++
 .../src/sql-tools/comparers/table.comparer.ts |  18 +--
 .../transformers/constraint.transformer.ts    |  20 ++--
 .../transformers/index.transformer.spec.ts    |  10 +-
 .../transformers/index.transformer.ts         |   2 +-
 .../transformers/table.transformer.spec.ts    | 113 ++++++++++++++----
 .../transformers/table.transformer.ts         |  36 ++++--
 7 files changed, 170 insertions(+), 60 deletions(-)
 create mode 100644 server/src/schema/migrations/1752004072340-UpdateIndexOverrides.ts

diff --git a/server/src/schema/migrations/1752004072340-UpdateIndexOverrides.ts b/server/src/schema/migrations/1752004072340-UpdateIndexOverrides.ts
new file mode 100644
index 0000000000..55638ab122
--- /dev/null
+++ b/server/src/schema/migrations/1752004072340-UpdateIndexOverrides.ts
@@ -0,0 +1,31 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"idx_originalfilename_trigram","sql":"CREATE INDEX \\"idx_originalfilename_trigram\\" ON \\"assets\\" USING gin (f_unaccent(\\"originalFileName\\") gin_trgm_ops);"}'::jsonb WHERE "name" = 'index_idx_originalfilename_trigram';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"idx_local_date_time_month","sql":"CREATE INDEX \\"idx_local_date_time_month\\" ON \\"assets\\" ((date_trunc(''MONTH''::text, (\\"localDateTime\\" AT TIME ZONE ''UTC''::text)) AT TIME ZONE ''UTC''::text));"}'::jsonb WHERE "name" = 'index_idx_local_date_time_month';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"idx_local_date_time","sql":"CREATE INDEX \\"idx_local_date_time\\" ON \\"assets\\" (((\\"localDateTime\\" at time zone ''UTC'')::date));"}'::jsonb WHERE "name" = 'index_idx_local_date_time';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"UQ_assets_owner_library_checksum","sql":"CREATE UNIQUE INDEX \\"UQ_assets_owner_library_checksum\\" ON \\"assets\\" (\\"ownerId\\", \\"libraryId\\", \\"checksum\\") WHERE (\\"libraryId\\" IS NOT NULL);"}'::jsonb WHERE "name" = 'index_UQ_assets_owner_library_checksum';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"UQ_assets_owner_checksum","sql":"CREATE UNIQUE INDEX \\"UQ_assets_owner_checksum\\" ON \\"assets\\" (\\"ownerId\\", \\"checksum\\") WHERE (\\"libraryId\\" IS NULL);"}'::jsonb WHERE "name" = 'index_UQ_assets_owner_checksum';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"IDX_activity_like","sql":"CREATE UNIQUE INDEX \\"IDX_activity_like\\" ON \\"activity\\" (\\"assetId\\", \\"userId\\", \\"albumId\\") WHERE (\\"isLiked\\" = true);"}'::jsonb WHERE "name" = 'index_IDX_activity_like';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"face_index","sql":"CREATE INDEX \\"face_index\\" ON \\"face_search\\" USING hnsw (embedding vector_cosine_ops) WITH (ef_construction = 300, m = 16);"}'::jsonb WHERE "name" = 'index_face_index';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"IDX_geodata_gist_earthcoord","sql":"CREATE INDEX \\"IDX_geodata_gist_earthcoord\\" ON \\"geodata_places\\" (ll_to_earth_public(latitude, longitude));"}'::jsonb WHERE "name" = 'index_IDX_geodata_gist_earthcoord';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"idx_geodata_places_name","sql":"CREATE INDEX \\"idx_geodata_places_name\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"name\\") gin_trgm_ops);"}'::jsonb WHERE "name" = 'index_idx_geodata_places_name';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"idx_geodata_places_admin2_name","sql":"CREATE INDEX \\"idx_geodata_places_admin2_name\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"admin2Name\\") gin_trgm_ops);"}'::jsonb WHERE "name" = 'index_idx_geodata_places_admin2_name';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"idx_geodata_places_admin1_name","sql":"CREATE INDEX \\"idx_geodata_places_admin1_name\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"admin1Name\\") gin_trgm_ops);"}'::jsonb WHERE "name" = 'index_idx_geodata_places_admin1_name';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"index","name":"idx_geodata_places_alternate_names","sql":"CREATE INDEX \\"idx_geodata_places_alternate_names\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"alternateNames\\") gin_trgm_ops);"}'::jsonb WHERE "name" = 'index_idx_geodata_places_alternate_names';`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE INDEX \\"idx_originalfilename_trigram\\" ON \\"assets\\" USING gin (f_unaccent(\\"originalFileName\\") gin_trgm_ops)","name":"idx_originalfilename_trigram","type":"index"}'::jsonb WHERE "name" = 'index_idx_originalfilename_trigram';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE INDEX \\"idx_local_date_time_month\\" ON \\"assets\\" ((date_trunc(''MONTH''::text, (\\"localDateTime\\" AT TIME ZONE ''UTC''::text)) AT TIME ZONE ''UTC''::text))","name":"idx_local_date_time_month","type":"index"}'::jsonb WHERE "name" = 'index_idx_local_date_time_month';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE INDEX \\"idx_local_date_time\\" ON \\"assets\\" (((\\"localDateTime\\" at time zone ''UTC'')::date))","name":"idx_local_date_time","type":"index"}'::jsonb WHERE "name" = 'index_idx_local_date_time';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE UNIQUE INDEX \\"UQ_assets_owner_library_checksum\\" ON \\"assets\\" (\\"ownerId\\", \\"libraryId\\", \\"checksum\\") WHERE (\\"libraryId\\" IS NOT NULL)","name":"UQ_assets_owner_library_checksum","type":"index"}'::jsonb WHERE "name" = 'index_UQ_assets_owner_library_checksum';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE UNIQUE INDEX \\"UQ_assets_owner_checksum\\" ON \\"assets\\" (\\"ownerId\\", \\"checksum\\") WHERE (\\"libraryId\\" IS NULL)","name":"UQ_assets_owner_checksum","type":"index"}'::jsonb WHERE "name" = 'index_UQ_assets_owner_checksum';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE UNIQUE INDEX \\"IDX_activity_like\\" ON \\"activity\\" (\\"assetId\\", \\"userId\\", \\"albumId\\") WHERE (\\"isLiked\\" = true)","name":"IDX_activity_like","type":"index"}'::jsonb WHERE "name" = 'index_IDX_activity_like';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE INDEX \\"face_index\\" ON \\"face_search\\" USING hnsw (embedding vector_cosine_ops) WITH (ef_construction = 300, m = 16)","name":"face_index","type":"index"}'::jsonb WHERE "name" = 'index_face_index';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE INDEX \\"IDX_geodata_gist_earthcoord\\" ON \\"geodata_places\\" (ll_to_earth_public(latitude, longitude))","name":"IDX_geodata_gist_earthcoord","type":"index"}'::jsonb WHERE "name" = 'index_IDX_geodata_gist_earthcoord';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE INDEX \\"idx_geodata_places_name\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"name\\") gin_trgm_ops)","name":"idx_geodata_places_name","type":"index"}'::jsonb WHERE "name" = 'index_idx_geodata_places_name';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE INDEX \\"idx_geodata_places_admin2_name\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"admin2Name\\") gin_trgm_ops)","name":"idx_geodata_places_admin2_name","type":"index"}'::jsonb WHERE "name" = 'index_idx_geodata_places_admin2_name';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE INDEX \\"idx_geodata_places_admin1_name\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"admin1Name\\") gin_trgm_ops)","name":"idx_geodata_places_admin1_name","type":"index"}'::jsonb WHERE "name" = 'index_idx_geodata_places_admin1_name';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE INDEX \\"idx_geodata_places_alternate_names\\" ON \\"geodata_places\\" USING gin (f_unaccent(\\"alternateNames\\") gin_trgm_ops)","name":"idx_geodata_places_alternate_names","type":"index"}'::jsonb WHERE "name" = 'index_idx_geodata_places_alternate_names';`.execute(db);
+}
diff --git a/server/src/sql-tools/comparers/table.comparer.ts b/server/src/sql-tools/comparers/table.comparer.ts
index c920a1d07a..0b36b7fce4 100644
--- a/server/src/sql-tools/comparers/table.comparer.ts
+++ b/server/src/sql-tools/comparers/table.comparer.ts
@@ -5,15 +5,6 @@ import { compareTriggers } from 'src/sql-tools/comparers/trigger.comparer';
 import { compare } from 'src/sql-tools/helpers';
 import { Comparer, DatabaseTable, Reason, SchemaDiff } from 'src/sql-tools/types';
 
-const newTable = (name: string) => ({
-  name,
-  columns: [],
-  indexes: [],
-  constraints: [],
-  triggers: [],
-  synchronize: true,
-});
-
 export const compareTables: Comparer<DatabaseTable> = {
   onMissing: (source) => [
     {
@@ -21,23 +12,20 @@ export const compareTables: Comparer<DatabaseTable> = {
       table: source,
       reason: Reason.MissingInTarget,
     },
-    // TODO merge constraints into table create record when possible
-    ...compareTable(source, newTable(source.name), { columns: false }),
   ],
   onExtra: (target) => [
-    ...compareTable(newTable(target.name), target, { columns: false }),
     {
       type: 'TableDrop',
       tableName: target.name,
       reason: Reason.MissingInSource,
     },
   ],
-  onCompare: (source, target) => compareTable(source, target, { columns: true }),
+  onCompare: (source, target) => compareTable(source, target),
 };
 
-const compareTable = (source: DatabaseTable, target: DatabaseTable, options: { columns?: boolean }): SchemaDiff[] => {
+const compareTable = (source: DatabaseTable, target: DatabaseTable): SchemaDiff[] => {
   return [
-    ...(options.columns ? compare(source.columns, target.columns, {}, compareColumns) : []),
+    ...compare(source.columns, target.columns, {}, compareColumns),
     ...compare(source.indexes, target.indexes, {}, compareIndexes),
     ...compare(source.constraints, target.constraints, {}, compareConstraints),
     ...compare(source.triggers, target.triggers, {}, compareTriggers),
diff --git a/server/src/sql-tools/transformers/constraint.transformer.ts b/server/src/sql-tools/transformers/constraint.transformer.ts
index 921774b7a9..bb8b30e7ce 100644
--- a/server/src/sql-tools/transformers/constraint.transformer.ts
+++ b/server/src/sql-tools/transformers/constraint.transformer.ts
@@ -20,12 +20,13 @@ export const transformConstraints: SqlTransformer = (ctx, item) => {
 const withAction = (constraint: { onDelete?: ActionType; onUpdate?: ActionType }) =>
   ` ON UPDATE ${constraint.onUpdate ?? ActionType.NO_ACTION} ON DELETE ${constraint.onDelete ?? ActionType.NO_ACTION}`;
 
-export const asConstraintAdd = (constraint: DatabaseConstraint): string | string[] => {
-  const base = `ALTER TABLE "${constraint.tableName}" ADD CONSTRAINT "${constraint.name}"`;
+export const asConstraintBody = (constraint: DatabaseConstraint): string => {
+  const base = `CONSTRAINT "${constraint.name}"`;
+
   switch (constraint.type) {
     case ConstraintType.PRIMARY_KEY: {
       const columnNames = asColumnList(constraint.columnNames);
-      return `${base} PRIMARY KEY (${columnNames});`;
+      return `${base} PRIMARY KEY (${columnNames})`;
     }
 
     case ConstraintType.FOREIGN_KEY: {
@@ -33,26 +34,29 @@ export const asConstraintAdd = (constraint: DatabaseConstraint): string | string
       const referenceColumnNames = asColumnList(constraint.referenceColumnNames);
       return (
         `${base} FOREIGN KEY (${columnNames}) REFERENCES "${constraint.referenceTableName}" (${referenceColumnNames})` +
-        withAction(constraint) +
-        ';'
+        withAction(constraint)
       );
     }
 
     case ConstraintType.UNIQUE: {
       const columnNames = asColumnList(constraint.columnNames);
-      return `${base} UNIQUE (${columnNames});`;
+      return `${base} UNIQUE (${columnNames})`;
     }
 
     case ConstraintType.CHECK: {
-      return `${base} CHECK (${constraint.expression});`;
+      return `${base} CHECK (${constraint.expression})`;
     }
 
     default: {
-      return [];
+      throw new Error(`Unknown constraint type: ${(constraint as any).type}`);
     }
   }
 };
 
+export const asConstraintAdd = (constraint: DatabaseConstraint): string | string[] => {
+  return `ALTER TABLE "${constraint.tableName}" ADD ${asConstraintBody(constraint)};`;
+};
+
 export const asConstraintDrop = (tableName: string, constraintName: string): string => {
   return `ALTER TABLE "${tableName}" DROP CONSTRAINT "${constraintName}";`;
 };
diff --git a/server/src/sql-tools/transformers/index.transformer.spec.ts b/server/src/sql-tools/transformers/index.transformer.spec.ts
index 45fa9546c5..c9656463bf 100644
--- a/server/src/sql-tools/transformers/index.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/index.transformer.spec.ts
@@ -19,7 +19,7 @@ describe(transformIndexes.name, () => {
           },
           reason: 'unknown',
         }),
-      ).toEqual('CREATE INDEX "IDX_test" ON "table1" ("column1")');
+      ).toEqual('CREATE INDEX "IDX_test" ON "table1" ("column1");');
     });
 
     it('should create an unique index', () => {
@@ -35,7 +35,7 @@ describe(transformIndexes.name, () => {
           },
           reason: 'unknown',
         }),
-      ).toEqual('CREATE UNIQUE INDEX "IDX_test" ON "table1" ("column1")');
+      ).toEqual('CREATE UNIQUE INDEX "IDX_test" ON "table1" ("column1");');
     });
 
     it('should create an index with a custom expression', () => {
@@ -51,7 +51,7 @@ describe(transformIndexes.name, () => {
           },
           reason: 'unknown',
         }),
-      ).toEqual('CREATE INDEX "IDX_test" ON "table1" ("id" IS NOT NULL)');
+      ).toEqual('CREATE INDEX "IDX_test" ON "table1" ("id" IS NOT NULL);');
     });
 
     it('should create an index with a where clause', () => {
@@ -68,7 +68,7 @@ describe(transformIndexes.name, () => {
           },
           reason: 'unknown',
         }),
-      ).toEqual('CREATE INDEX "IDX_test" ON "table1" ("id") WHERE ("id" IS NOT NULL)');
+      ).toEqual('CREATE INDEX "IDX_test" ON "table1" ("id") WHERE ("id" IS NOT NULL);');
     });
 
     it('should create an index with a custom expression', () => {
@@ -85,7 +85,7 @@ describe(transformIndexes.name, () => {
           },
           reason: 'unknown',
         }),
-      ).toEqual('CREATE INDEX "IDX_test" ON "table1" USING gin ("id" IS NOT NULL)');
+      ).toEqual('CREATE INDEX "IDX_test" ON "table1" USING gin ("id" IS NOT NULL);');
     });
   });
 
diff --git a/server/src/sql-tools/transformers/index.transformer.ts b/server/src/sql-tools/transformers/index.transformer.ts
index a8a1303b8b..bfdbf8e157 100644
--- a/server/src/sql-tools/transformers/index.transformer.ts
+++ b/server/src/sql-tools/transformers/index.transformer.ts
@@ -48,7 +48,7 @@ export const asIndexCreate = (index: DatabaseIndex): string => {
     sql += ` WHERE ${index.where}`;
   }
 
-  return sql;
+  return sql + ';';
 };
 
 export const asIndexDrop = (indexName: string): string => {
diff --git a/server/src/sql-tools/transformers/table.transformer.spec.ts b/server/src/sql-tools/transformers/table.transformer.spec.ts
index 756e6aeafa..662e1ba7fd 100644
--- a/server/src/sql-tools/transformers/table.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/table.transformer.spec.ts
@@ -1,9 +1,69 @@
 import { BaseContext } from 'src/sql-tools/contexts/base-context';
 import { transformTables } from 'src/sql-tools/transformers/table.transformer';
+import { ConstraintType, DatabaseTable } from 'src/sql-tools/types';
 import { describe, expect, it } from 'vitest';
 
 const ctx = new BaseContext({});
 
+const table1: DatabaseTable = {
+  name: 'table1',
+  columns: [
+    {
+      name: 'column1',
+      tableName: 'table1',
+      primary: true,
+      type: 'character varying',
+      nullable: true,
+      isArray: false,
+      synchronize: true,
+    },
+    {
+      name: 'column2',
+      tableName: 'table1',
+      type: 'character varying',
+      nullable: true,
+      isArray: false,
+      synchronize: true,
+    },
+  ],
+  indexes: [
+    {
+      name: 'index1',
+      tableName: 'table1',
+      columnNames: ['column2'],
+      unique: false,
+      synchronize: true,
+    },
+  ],
+  constraints: [
+    {
+      name: 'constraint1',
+      tableName: 'table1',
+      columnNames: ['column1'],
+      type: ConstraintType.PRIMARY_KEY,
+      synchronize: true,
+    },
+    {
+      name: 'constraint2',
+      tableName: 'table1',
+      columnNames: ['column1'],
+      type: ConstraintType.FOREIGN_KEY,
+      referenceTableName: 'table2',
+      referenceColumnNames: ['parentId'],
+      synchronize: true,
+    },
+    {
+      name: 'constraint3',
+      tableName: 'table1',
+      columnNames: ['column1'],
+      type: ConstraintType.UNIQUE,
+      synchronize: true,
+    },
+  ],
+  triggers: [],
+  synchronize: true,
+};
+
 describe(transformTables.name, () => {
   describe('TableDrop', () => {
     it('should work', () => {
@@ -22,26 +82,19 @@ describe(transformTables.name, () => {
       expect(
         transformTables(ctx, {
           type: 'TableCreate',
-          table: {
-            name: 'table1',
-            columns: [
-              {
-                tableName: 'table1',
-                name: 'column1',
-                type: 'character varying',
-                nullable: true,
-                isArray: false,
-                synchronize: true,
-              },
-            ],
-            indexes: [],
-            constraints: [],
-            triggers: [],
-            synchronize: true,
-          },
+          table: table1,
           reason: 'unknown',
         }),
-      ).toEqual([`CREATE TABLE "table1" ("column1" character varying);`]);
+      ).toEqual([
+        `CREATE TABLE "table1" (
+  "column1" character varying,
+  "column2" character varying,
+  CONSTRAINT "constraint1" PRIMARY KEY ("column1"),
+  CONSTRAINT "constraint2" FOREIGN KEY ("column1") REFERENCES "table2" ("parentId") ON UPDATE NO ACTION ON DELETE NO ACTION,
+  CONSTRAINT "constraint3" UNIQUE ("column1")
+);`,
+        `CREATE INDEX "index1" ON "table1" ("column2");`,
+      ]);
     });
 
     it('should handle a non-nullable column', () => {
@@ -67,7 +120,11 @@ describe(transformTables.name, () => {
           },
           reason: 'unknown',
         }),
-      ).toEqual([`CREATE TABLE "table1" ("column1" character varying NOT NULL);`]);
+      ).toEqual([
+        `CREATE TABLE "table1" (
+  "column1" character varying NOT NULL
+);`,
+      ]);
     });
 
     it('should handle a default value', () => {
@@ -94,7 +151,11 @@ describe(transformTables.name, () => {
           },
           reason: 'unknown',
         }),
-      ).toEqual([`CREATE TABLE "table1" ("column1" character varying DEFAULT uuid_generate_v4());`]);
+      ).toEqual([
+        `CREATE TABLE "table1" (
+  "column1" character varying DEFAULT uuid_generate_v4()
+);`,
+      ]);
     });
 
     it('should handle a string with a fixed length', () => {
@@ -121,7 +182,11 @@ describe(transformTables.name, () => {
           },
           reason: 'unknown',
         }),
-      ).toEqual([`CREATE TABLE "table1" ("column1" character varying(2));`]);
+      ).toEqual([
+        `CREATE TABLE "table1" (
+  "column1" character varying(2)
+);`,
+      ]);
     });
 
     it('should handle an array type', () => {
@@ -147,7 +212,11 @@ describe(transformTables.name, () => {
           },
           reason: 'unknown',
         }),
-      ).toEqual([`CREATE TABLE "table1" ("column1" character varying[]);`]);
+      ).toEqual([
+        `CREATE TABLE "table1" (
+  "column1" character varying[]
+);`,
+      ]);
     });
   });
 });
diff --git a/server/src/sql-tools/transformers/table.transformer.ts b/server/src/sql-tools/transformers/table.transformer.ts
index 14cafe87f2..a81bfc25aa 100644
--- a/server/src/sql-tools/transformers/table.transformer.ts
+++ b/server/src/sql-tools/transformers/table.transformer.ts
@@ -1,5 +1,8 @@
 import { asColumnComment, getColumnModifiers, getColumnType } from 'src/sql-tools/helpers';
 import { asColumnAlter } from 'src/sql-tools/transformers/column.transformer';
+import { asConstraintBody } from 'src/sql-tools/transformers/constraint.transformer';
+import { asIndexCreate } from 'src/sql-tools/transformers/index.transformer';
+import { asTriggerCreate } from 'src/sql-tools/transformers/trigger.transformer';
 import { SqlTransformer } from 'src/sql-tools/transformers/types';
 import { DatabaseTable } from 'src/sql-tools/types';
 
@@ -19,26 +22,41 @@ export const transformTables: SqlTransformer = (ctx, item) => {
   }
 };
 
-const asTableCreate = (table: DatabaseTable): string[] => {
+const asTableCreate = (table: DatabaseTable) => {
   const tableName = table.name;
-  const columnsTypes = table.columns
-    .map((column) => `"${column.name}" ${getColumnType(column)}` + getColumnModifiers(column))
-    .join(', ');
-  const items = [`CREATE TABLE "${tableName}" (${columnsTypes});`];
+
+  const items: string[] = [];
+  for (const column of table.columns) {
+    items.push(`"${column.name}" ${getColumnType(column)}${getColumnModifiers(column)}`);
+  }
+
+  for (const constraint of table.constraints) {
+    items.push(asConstraintBody(constraint));
+  }
+
+  const sql = [`CREATE TABLE "${tableName}" (\n  ${items.join(',\n  ')}\n);`];
 
   for (const column of table.columns) {
     if (column.comment) {
-      items.push(asColumnComment(tableName, column.name, column.comment));
+      sql.push(asColumnComment(tableName, column.name, column.comment));
     }
 
     if (column.storage) {
-      items.push(...asColumnAlter(tableName, column.name, { storage: column.storage }));
+      sql.push(...asColumnAlter(tableName, column.name, { storage: column.storage }));
     }
   }
 
-  return items;
+  for (const index of table.indexes) {
+    sql.push(asIndexCreate(index));
+  }
+
+  for (const trigger of table.triggers) {
+    sql.push(asTriggerCreate(trigger));
+  }
+
+  return sql;
 };
 
-const asTableDrop = (tableName: string): string => {
+const asTableDrop = (tableName: string) => {
   return `DROP TABLE "${tableName}";`;
 };

From dfe6d27bbdb20ebdf55988e3f74669c8210075cb Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Wed, 9 Jul 2025 20:04:25 +0530
Subject: [PATCH 158/337] feat: sqlite video player (#19792)

* feat: video player

* use remote asset id in local query

* fix: error from pre-caching beyond total assets

* fix: flipped local videos

* incorrect aspect ratio on iOS

* ignore other storage id during equals check

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../app/alextran/immich/sync/Messages.g.kt    |   7 +-
 .../alextran/immich/sync/MessagesImplBase.kt  |   9 +-
 .../drift_schemas/main/drift_schema_v1.json   |   2 +-
 mobile/ios/Runner/Sync/Messages.g.swift       |   6 +-
 mobile/ios/Runner/Sync/MessagesImpl.swift     |   6 +-
 .../domain/models/asset/base_asset.model.dart |   9 +-
 .../models/asset/local_asset.model.dart       |  11 +-
 .../models/asset/remote_asset.model.dart      |   2 +-
 mobile/lib/domain/models/setting.model.dart   |   1 +
 mobile/lib/domain/services/asset.service.dart |  40 +-
 mobile/lib/domain/services/hash.service.dart  |   2 +-
 .../domain/services/local_sync.service.dart   |   1 +
 .../lib/domain/services/timeline.service.dart |   2 +-
 .../entities/local_asset.entity.dart          |   3 +
 .../entities/local_asset.entity.drift.dart    |  72 ++-
 .../entities/merged_asset.drift               |   6 +-
 .../entities/merged_asset.drift.dart          |   5 +-
 .../repositories/local_album.repository.dart  |   1 +
 .../repositories/local_asset.repository.dart  |   2 +-
 .../repositories/storage.repository.dart      |  15 +-
 .../repositories/timeline.repository.dart     |   1 +
 mobile/lib/platform/native_sync_api.g.dart    |   5 +
 .../asset_viewer/asset_viewer.page.dart       |  64 ++-
 .../asset_viewer/asset_viewer.state.dart      |   8 +
 .../asset_viewer/bottom_bar.widget.dart       |  15 +-
 .../asset_viewer/video_viewer.widget.dart     | 429 ++++++++++++++++++
 .../video_viewer_controls.widget.dart         | 131 ++++++
 .../widgets/images/local_image_provider.dart  |   2 +-
 .../widgets/memory/memory_card.widget.dart    |  35 +-
 mobile/pigeon/native_sync_api.dart            |   2 +
 .../domain/services/hash_service_test.dart    |  20 +-
 31 files changed, 832 insertions(+), 82 deletions(-)
 create mode 100644 mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/asset_viewer/video_viewer_controls.widget.dart

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 6ae4c99bd7..b5ef90310e 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
@@ -87,7 +87,8 @@ data class PlatformAsset (
   val updatedAt: Long? = null,
   val width: Long? = null,
   val height: Long? = null,
-  val durationInSeconds: Long
+  val durationInSeconds: Long,
+  val orientation: Long
 )
  {
   companion object {
@@ -100,7 +101,8 @@ data class PlatformAsset (
       val width = pigeonVar_list[5] as Long?
       val height = pigeonVar_list[6] as Long?
       val durationInSeconds = pigeonVar_list[7] as Long
-      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds)
+      val orientation = pigeonVar_list[8] as Long
+      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation)
     }
   }
   fun toList(): List<Any?> {
@@ -113,6 +115,7 @@ data class PlatformAsset (
       width,
       height,
       durationInSeconds,
+      orientation,
     )
   }
   override fun equals(other: Any?): Boolean {
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 5183c274b3..02cd54b8c3 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
@@ -40,7 +40,8 @@ open class NativeSyncApiImplBase(context: Context) {
       MediaStore.MediaColumns.BUCKET_ID,
       MediaStore.MediaColumns.WIDTH,
       MediaStore.MediaColumns.HEIGHT,
-      MediaStore.MediaColumns.DURATION
+      MediaStore.MediaColumns.DURATION,
+      MediaStore.MediaColumns.ORIENTATION,
     )
 
     const val HASH_BUFFER_SIZE = 2 * 1024 * 1024
@@ -74,6 +75,8 @@ open class NativeSyncApiImplBase(context: Context) {
         val widthColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.WIDTH)
         val heightColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.HEIGHT)
         val durationColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.DURATION)
+        val orientationColumn =
+          c.getColumnIndexOrThrow(MediaStore.MediaColumns.ORIENTATION)
 
         while (c.moveToNext()) {
           val id = c.getLong(idColumn).toString()
@@ -101,6 +104,7 @@ open class NativeSyncApiImplBase(context: Context) {
           val duration = if (mediaType == MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE) 0
           else c.getLong(durationColumn) / 1000
           val bucketId = c.getString(bucketIdColumn)
+          val orientation = c.getInt(orientationColumn)
 
           val asset = PlatformAsset(
             id,
@@ -110,7 +114,8 @@ open class NativeSyncApiImplBase(context: Context) {
             modifiedAt,
             width,
             height,
-            duration
+            duration,
+            orientation.toLong(),
           )
           yield(AssetResult.ValidAsset(asset, bucketId))
         }
diff --git a/mobile/drift_schemas/main/drift_schema_v1.json b/mobile/drift_schemas/main/drift_schema_v1.json
index 493a34cc94..4960cd0a0d 100644
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
@@ -1 +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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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":14,"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":15,"references":[1,14],"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":16,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}}]}
\ No newline at end of file
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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":14,"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":15,"references":[1,14],"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":16,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}}]}
\ 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 89eb092a16..e629604d6a 100644
--- a/mobile/ios/Runner/Sync/Messages.g.swift
+++ b/mobile/ios/Runner/Sync/Messages.g.swift
@@ -138,6 +138,7 @@ struct PlatformAsset: Hashable {
   var width: Int64? = nil
   var height: Int64? = nil
   var durationInSeconds: Int64
+  var orientation: Int64
 
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
@@ -150,6 +151,7 @@ struct PlatformAsset: Hashable {
     let width: Int64? = nilOrValue(pigeonVar_list[5])
     let height: Int64? = nilOrValue(pigeonVar_list[6])
     let durationInSeconds = pigeonVar_list[7] as! Int64
+    let orientation = pigeonVar_list[8] as! Int64
 
     return PlatformAsset(
       id: id,
@@ -159,7 +161,8 @@ struct PlatformAsset: Hashable {
       updatedAt: updatedAt,
       width: width,
       height: height,
-      durationInSeconds: durationInSeconds
+      durationInSeconds: durationInSeconds,
+      orientation: orientation
     )
   }
   func toList() -> [Any?] {
@@ -172,6 +175,7 @@ struct PlatformAsset: Hashable {
       width,
       height,
       durationInSeconds,
+      orientation,
     ]
   }
   static func == (lhs: PlatformAsset, rhs: PlatformAsset) -> Bool {
diff --git a/mobile/ios/Runner/Sync/MessagesImpl.swift b/mobile/ios/Runner/Sync/MessagesImpl.swift
index 85f3b1fcfb..459e29fa5a 100644
--- a/mobile/ios/Runner/Sync/MessagesImpl.swift
+++ b/mobile/ios/Runner/Sync/MessagesImpl.swift
@@ -27,7 +27,8 @@ extension PHAsset {
       updatedAt: modificationDate.map { Int64($0.timeIntervalSince1970) },
       width: Int64(pixelWidth),
       height: Int64(pixelHeight),
-      durationInSeconds: Int64(duration)
+      durationInSeconds: Int64(duration),
+      orientation: 0
     )
   }
 }
@@ -169,7 +170,8 @@ class NativeSyncApiImpl: NativeSyncApi {
             id: asset.localIdentifier,
             name: "",
             type: 0,
-            durationInSeconds: 0
+            durationInSeconds: 0,
+            orientation: 0
           )
           if (updatedAssets.contains(AssetWrapper(with: predicate))) {
             continue
diff --git a/mobile/lib/domain/models/asset/base_asset.model.dart b/mobile/lib/domain/models/asset/base_asset.model.dart
index 1226d1730f..fb67b298c1 100644
--- a/mobile/lib/domain/models/asset/base_asset.model.dart
+++ b/mobile/lib/domain/models/asset/base_asset.model.dart
@@ -25,6 +25,7 @@ sealed class BaseAsset {
   final int? height;
   final int? durationInSeconds;
   final bool isFavorite;
+  final String? livePhotoVideoId;
 
   const BaseAsset({
     required this.name,
@@ -36,18 +37,12 @@ sealed class BaseAsset {
     this.height,
     this.durationInSeconds,
     this.isFavorite = false,
+    this.livePhotoVideoId,
   });
 
   bool get isImage => type == AssetType.image;
   bool get isVideo => type == AssetType.video;
 
-  double? get aspectRatio {
-    if (width != null && height != null && height! > 0) {
-      return width! / height!;
-    }
-    return null;
-  }
-
   bool get hasRemote =>
       storage == AssetState.remote || storage == AssetState.merged;
   bool get hasLocal =>
diff --git a/mobile/lib/domain/models/asset/local_asset.model.dart b/mobile/lib/domain/models/asset/local_asset.model.dart
index 30a4955fa8..0c3e8fa942 100644
--- a/mobile/lib/domain/models/asset/local_asset.model.dart
+++ b/mobile/lib/domain/models/asset/local_asset.model.dart
@@ -3,6 +3,7 @@ part of 'base_asset.model.dart';
 class LocalAsset extends BaseAsset {
   final String id;
   final String? remoteId;
+  final int orientation;
 
   const LocalAsset({
     required this.id,
@@ -16,6 +17,8 @@ class LocalAsset extends BaseAsset {
     super.height,
     super.durationInSeconds,
     super.isFavorite = false,
+    super.livePhotoVideoId,
+    this.orientation = 0,
   });
 
   @override
@@ -38,6 +41,7 @@ class LocalAsset extends BaseAsset {
    durationInSeconds: ${durationInSeconds ?? "<NA>"},
    remoteId: ${remoteId ?? "<NA>"}
    isFavorite: $isFavorite,
+  orientation: $orientation,
  }''';
   }
 
@@ -45,11 +49,12 @@ class LocalAsset extends BaseAsset {
   bool operator ==(Object other) {
     if (other is! LocalAsset) return false;
     if (identical(this, other)) return true;
-    return super == other && id == other.id && remoteId == other.remoteId;
+    return super == other && id == other.id && orientation == other.orientation;
   }
 
   @override
-  int get hashCode => super.hashCode ^ id.hashCode ^ remoteId.hashCode;
+  int get hashCode =>
+      super.hashCode ^ id.hashCode ^ remoteId.hashCode ^ orientation.hashCode;
 
   LocalAsset copyWith({
     String? id,
@@ -63,6 +68,7 @@ class LocalAsset extends BaseAsset {
     int? height,
     int? durationInSeconds,
     bool? isFavorite,
+    int? orientation,
   }) {
     return LocalAsset(
       id: id ?? this.id,
@@ -76,6 +82,7 @@ class LocalAsset extends BaseAsset {
       height: height ?? this.height,
       durationInSeconds: durationInSeconds ?? this.durationInSeconds,
       isFavorite: isFavorite ?? this.isFavorite,
+      orientation: orientation ?? this.orientation,
     );
   }
 }
diff --git a/mobile/lib/domain/models/asset/remote_asset.model.dart b/mobile/lib/domain/models/asset/remote_asset.model.dart
index d04f3340ac..587eabc00b 100644
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -30,6 +30,7 @@ class RemoteAsset extends BaseAsset {
     super.isFavorite = false,
     this.thumbHash,
     this.visibility = AssetVisibility.timeline,
+    super.livePhotoVideoId,
   });
 
   @override
@@ -65,7 +66,6 @@ class RemoteAsset extends BaseAsset {
     return super == other &&
         id == other.id &&
         ownerId == other.ownerId &&
-        localId == other.localId &&
         thumbHash == other.thumbHash &&
         visibility == other.visibility;
   }
diff --git a/mobile/lib/domain/models/setting.model.dart b/mobile/lib/domain/models/setting.model.dart
index a256ee3589..99246c31a1 100644
--- a/mobile/lib/domain/models/setting.model.dart
+++ b/mobile/lib/domain/models/setting.model.dart
@@ -5,6 +5,7 @@ enum Setting<T> {
   groupAssetsBy<int>(StoreKey.groupAssetsBy, 0),
   showStorageIndicator<bool>(StoreKey.storageIndicator, true),
   loadOriginal<bool>(StoreKey.loadOriginal, false),
+  loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, false),
   preferRemoteImage<bool>(StoreKey.preferRemoteImage, false),
   advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),
   ;
diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dart
index c4a0766601..a210c3d991 100644
--- a/mobile/lib/domain/services/asset.service.dart
+++ b/mobile/lib/domain/services/asset.service.dart
@@ -2,16 +2,20 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.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/utils/exif.converter.dart';
+import 'package:platform/platform.dart';
 
 class AssetService {
   final RemoteAssetRepository _remoteAssetRepository;
   final DriftLocalAssetRepository _localAssetRepository;
+  final Platform _platform;
 
   const AssetService({
     required RemoteAssetRepository remoteAssetRepository,
     required DriftLocalAssetRepository localAssetRepository,
   })  : _remoteAssetRepository = remoteAssetRepository,
-        _localAssetRepository = localAssetRepository;
+        _localAssetRepository = localAssetRepository,
+        _platform = const LocalPlatform();
 
   Stream<BaseAsset?> watchAsset(BaseAsset asset) {
     final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;
@@ -21,10 +25,40 @@ class AssetService {
   }
 
   Future<ExifInfo?> getExif(BaseAsset asset) async {
-    if (asset is LocalAsset || asset is! RemoteAsset) {
+    if (!asset.hasRemote) {
       return null;
     }
 
-    return _remoteAssetRepository.getExif(asset.id);
+    final id =
+        asset is LocalAsset ? asset.remoteId! : (asset as RemoteAsset).id;
+    return _remoteAssetRepository.getExif(id);
+  }
+
+  Future<double> getAspectRatio(BaseAsset asset) async {
+    bool isFlipped;
+    double? width;
+    double? height;
+
+    if (asset.hasRemote) {
+      final exif = await getExif(asset);
+      isFlipped = ExifDtoConverter.isOrientationFlipped(exif?.orientation);
+      width = exif?.width ?? asset.width?.toDouble();
+      height = exif?.height ?? asset.height?.toDouble();
+    } else if (asset is LocalAsset) {
+      isFlipped = _platform.isAndroid &&
+          (asset.orientation == 90 || asset.orientation == 270);
+      width = asset.width?.toDouble();
+      height = asset.height?.toDouble();
+    } else {
+      isFlipped = false;
+    }
+
+    final orientedWidth = isFlipped ? height : width;
+    final orientedHeight = isFlipped ? width : height;
+    if (orientedWidth != null && orientedHeight != null && orientedHeight > 0) {
+      return orientedWidth / orientedHeight;
+    }
+
+    return 1.0;
   }
 }
diff --git a/mobile/lib/domain/services/hash.service.dart b/mobile/lib/domain/services/hash.service.dart
index 87579067c8..d004041276 100644
--- a/mobile/lib/domain/services/hash.service.dart
+++ b/mobile/lib/domain/services/hash.service.dart
@@ -61,7 +61,7 @@ class HashService {
     final toHash = <_AssetToPath>[];
 
     for (final asset in assetsToHash) {
-      final file = await _storageRepository.getFileForAsset(asset);
+      final file = await _storageRepository.getFileForAsset(asset.id);
       if (file == null) {
         continue;
       }
diff --git a/mobile/lib/domain/services/local_sync.service.dart b/mobile/lib/domain/services/local_sync.service.dart
index 7a61dbc0c7..8d3b747b37 100644
--- a/mobile/lib/domain/services/local_sync.service.dart
+++ b/mobile/lib/domain/services/local_sync.service.dart
@@ -359,6 +359,7 @@ extension on Iterable<PlatformAsset> {
         width: e.width,
         height: e.height,
         durationInSeconds: e.durationInSeconds,
+        orientation: e.orientation,
       ),
     ).toList();
   }
diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 02ed552e0e..d8975e7e21 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -184,7 +184,7 @@ class TimelineService {
 
   // Pre-cache assets around the given index for asset viewer
   Future<void> preCacheAssets(int index) =>
-      _mutex.run(() => _loadAssets(index, 5));
+      _mutex.run(() => _loadAssets(index, math.min(5, totalAssets - index)));
 
   BaseAsset getAsset(int index) {
     if (!hasRange(index, 1)) {
diff --git a/mobile/lib/infrastructure/entities/local_asset.entity.dart b/mobile/lib/infrastructure/entities/local_asset.entity.dart
index 62f91ae458..204d5d6a80 100644
--- a/mobile/lib/infrastructure/entities/local_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.dart
@@ -14,6 +14,8 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
   // Only used during backup to mirror the favorite status of the asset in the server
   BoolColumn get isFavorite => boolean().withDefault(const Constant(false))();
 
+  IntColumn get orientation => integer().withDefault(const Constant(0))();
+
   @override
   Set<Column> get primaryKey => {id};
 }
@@ -31,5 +33,6 @@ extension LocalAssetEntityDataDomainEx on LocalAssetEntityData {
         height: height,
         width: width,
         remoteId: null,
+        orientation: orientation,
       );
 }
diff --git a/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart b/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart
index a3c79b2e2e..e9c5961aa5 100644
--- a/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart
@@ -20,6 +20,7 @@ typedef $$LocalAssetEntityTableCreateCompanionBuilder
   required String id,
   i0.Value<String?> checksum,
   i0.Value<bool> isFavorite,
+  i0.Value<int> orientation,
 });
 typedef $$LocalAssetEntityTableUpdateCompanionBuilder
     = i1.LocalAssetEntityCompanion Function({
@@ -33,6 +34,7 @@ typedef $$LocalAssetEntityTableUpdateCompanionBuilder
   i0.Value<String> id,
   i0.Value<String?> checksum,
   i0.Value<bool> isFavorite,
+  i0.Value<int> orientation,
 });
 
 class $$LocalAssetEntityTableFilterComposer
@@ -76,6 +78,10 @@ class $$LocalAssetEntityTableFilterComposer
 
   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 $$LocalAssetEntityTableOrderingComposer
@@ -120,6 +126,10 @@ class $$LocalAssetEntityTableOrderingComposer
   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 $$LocalAssetEntityTableAnnotationComposer
@@ -160,6 +170,9 @@ class $$LocalAssetEntityTableAnnotationComposer
 
   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 $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
@@ -201,6 +214,7 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             i0.Value<String> id = 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.LocalAssetEntityCompanion(
             name: name,
@@ -213,6 +227,7 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             id: id,
             checksum: checksum,
             isFavorite: isFavorite,
+            orientation: orientation,
           ),
           createCompanionCallback: ({
             required String name,
@@ -225,6 +240,7 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             required String id,
             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.LocalAssetEntityCompanion.insert(
             name: name,
@@ -237,6 +253,7 @@ class $$LocalAssetEntityTableTableManager extends i0.RootTableManager<
             id: id,
             checksum: checksum,
             isFavorite: isFavorite,
+            orientation: orientation,
           ),
           withReferenceMapper: (p0) => p0
               .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
@@ -337,6 +354,14 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
       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,
@@ -348,7 +373,8 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
         durationInSeconds,
         id,
         checksum,
-        isFavorite
+        isFavorite,
+        orientation
       ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -404,6 +430,12 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
           isFavorite.isAcceptableOrUnknown(
               data['is_favorite']!, _isFavoriteMeta));
     }
+    if (data.containsKey('orientation')) {
+      context.handle(
+          _orientationMeta,
+          orientation.isAcceptableOrUnknown(
+              data['orientation']!, _orientationMeta));
+    }
     return context;
   }
 
@@ -435,6 +467,8 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
           .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'])!,
     );
   }
 
@@ -463,6 +497,7 @@ class LocalAssetEntityData extends i0.DataClass
   final String id;
   final String? checksum;
   final bool isFavorite;
+  final int orientation;
   const LocalAssetEntityData(
       {required this.name,
       required this.type,
@@ -473,7 +508,8 @@ class LocalAssetEntityData extends i0.DataClass
       this.durationInSeconds,
       required this.id,
       this.checksum,
-      required this.isFavorite});
+      required this.isFavorite,
+      required this.orientation});
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
     final map = <String, i0.Expression>{};
@@ -498,6 +534,7 @@ class LocalAssetEntityData extends i0.DataClass
       map['checksum'] = i0.Variable<String>(checksum);
     }
     map['is_favorite'] = i0.Variable<bool>(isFavorite);
+    map['orientation'] = i0.Variable<int>(orientation);
     return map;
   }
 
@@ -516,6 +553,7 @@ class LocalAssetEntityData extends i0.DataClass
       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
@@ -533,6 +571,7 @@ class LocalAssetEntityData extends i0.DataClass
       'id': serializer.toJson<String>(id),
       'checksum': serializer.toJson<String?>(checksum),
       'isFavorite': serializer.toJson<bool>(isFavorite),
+      'orientation': serializer.toJson<int>(orientation),
     };
   }
 
@@ -546,7 +585,8 @@ class LocalAssetEntityData extends i0.DataClass
           i0.Value<int?> durationInSeconds = const i0.Value.absent(),
           String? id,
           i0.Value<String?> checksum = const i0.Value.absent(),
-          bool? isFavorite}) =>
+          bool? isFavorite,
+          int? orientation}) =>
       i1.LocalAssetEntityData(
         name: name ?? this.name,
         type: type ?? this.type,
@@ -560,6 +600,7 @@ class LocalAssetEntityData extends i0.DataClass
         id: id ?? this.id,
         checksum: checksum.present ? checksum.value : this.checksum,
         isFavorite: isFavorite ?? this.isFavorite,
+        orientation: orientation ?? this.orientation,
       );
   LocalAssetEntityData copyWithCompanion(i1.LocalAssetEntityCompanion data) {
     return LocalAssetEntityData(
@@ -576,6 +617,8 @@ class LocalAssetEntityData extends i0.DataClass
       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,
     );
   }
 
@@ -591,14 +634,15 @@ class LocalAssetEntityData extends i0.DataClass
           ..write('durationInSeconds: $durationInSeconds, ')
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')
-          ..write('isFavorite: $isFavorite')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('orientation: $orientation')
           ..write(')'))
         .toString();
   }
 
   @override
   int get hashCode => Object.hash(name, type, createdAt, updatedAt, width,
-      height, durationInSeconds, id, checksum, isFavorite);
+      height, durationInSeconds, id, checksum, isFavorite, orientation);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -612,7 +656,8 @@ class LocalAssetEntityData extends i0.DataClass
           other.durationInSeconds == this.durationInSeconds &&
           other.id == this.id &&
           other.checksum == this.checksum &&
-          other.isFavorite == this.isFavorite);
+          other.isFavorite == this.isFavorite &&
+          other.orientation == this.orientation);
 }
 
 class LocalAssetEntityCompanion
@@ -627,6 +672,7 @@ class LocalAssetEntityCompanion
   final i0.Value<String> id;
   final i0.Value<String?> checksum;
   final i0.Value<bool> isFavorite;
+  final i0.Value<int> orientation;
   const LocalAssetEntityCompanion({
     this.name = const i0.Value.absent(),
     this.type = const i0.Value.absent(),
@@ -638,6 +684,7 @@ class LocalAssetEntityCompanion
     this.id = const i0.Value.absent(),
     this.checksum = const i0.Value.absent(),
     this.isFavorite = const i0.Value.absent(),
+    this.orientation = const i0.Value.absent(),
   });
   LocalAssetEntityCompanion.insert({
     required String name,
@@ -650,6 +697,7 @@ class LocalAssetEntityCompanion
     required String id,
     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);
@@ -664,6 +712,7 @@ class LocalAssetEntityCompanion
     i0.Expression<String>? id,
     i0.Expression<String>? checksum,
     i0.Expression<bool>? isFavorite,
+    i0.Expression<int>? orientation,
   }) {
     return i0.RawValuesInsertable({
       if (name != null) 'name': name,
@@ -676,6 +725,7 @@ class LocalAssetEntityCompanion
       if (id != null) 'id': id,
       if (checksum != null) 'checksum': checksum,
       if (isFavorite != null) 'is_favorite': isFavorite,
+      if (orientation != null) 'orientation': orientation,
     });
   }
 
@@ -689,7 +739,8 @@ class LocalAssetEntityCompanion
       i0.Value<int?>? durationInSeconds,
       i0.Value<String>? id,
       i0.Value<String?>? checksum,
-      i0.Value<bool>? isFavorite}) {
+      i0.Value<bool>? isFavorite,
+      i0.Value<int>? orientation}) {
     return i1.LocalAssetEntityCompanion(
       name: name ?? this.name,
       type: type ?? this.type,
@@ -701,6 +752,7 @@ class LocalAssetEntityCompanion
       id: id ?? this.id,
       checksum: checksum ?? this.checksum,
       isFavorite: isFavorite ?? this.isFavorite,
+      orientation: orientation ?? this.orientation,
     );
   }
 
@@ -738,6 +790,9 @@ class LocalAssetEntityCompanion
     if (isFavorite.present) {
       map['is_favorite'] = i0.Variable<bool>(isFavorite.value);
     }
+    if (orientation.present) {
+      map['orientation'] = i0.Variable<int>(orientation.value);
+    }
     return map;
   }
 
@@ -753,7 +808,8 @@ class LocalAssetEntityCompanion
           ..write('durationInSeconds: $durationInSeconds, ')
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')
-          ..write('isFavorite: $isFavorite')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('orientation: $orientation')
           ..write(')'))
         .toString();
   }
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift b/mobile/lib/infrastructure/entities/merged_asset.drift
index 51e5e4d73c..d6451db8d8 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -16,7 +16,8 @@ mergedAsset: SELECT * FROM
 		rae.is_favorite,
 		rae.thumb_hash,
 		rae.checksum,
-		rae.owner_id
+		rae.owner_id,
+		0 as orientation
 	FROM
 		remote_asset_entity rae
 	LEFT JOIN
@@ -37,7 +38,8 @@ mergedAsset: SELECT * FROM
 		lae.is_favorite,
 		NULL as thumb_hash,
 		lae.checksum,
-		NULL as owner_id
+		NULL as owner_id,
+		lae.orientation
 	FROM
 		local_asset_entity lae
 	LEFT JOIN
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift.dart b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
index f836dabe6a..b289083a2b 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift.dart
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
@@ -18,7 +18,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
     final generatedlimit = $write(limit, startIndex: $arrayStartIndex);
     $arrayStartIndex += generatedlimit.amountOfVariables;
     return customSelect(
-        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
+        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, 0 AS orientation FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, lae.orientation FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
         variables: [
           for (var $ in var1) i0.Variable<String>($),
           ...generatedlimit.introducedVariables
@@ -42,6 +42,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
           thumbHash: row.readNullable<String>('thumb_hash'),
           checksum: row.readNullable<String>('checksum'),
           ownerId: row.readNullable<String>('owner_id'),
+          orientation: row.read<int>('orientation'),
         ));
   }
 
@@ -87,6 +88,7 @@ class MergedAssetResult {
   final String? thumbHash;
   final String? checksum;
   final String? ownerId;
+  final int orientation;
   MergedAssetResult({
     this.remoteId,
     this.localId,
@@ -101,6 +103,7 @@ class MergedAssetResult {
     this.thumbHash,
     this.checksum,
     this.ownerId,
+    required this.orientation,
   });
 }
 
diff --git a/mobile/lib/infrastructure/repositories/local_album.repository.dart b/mobile/lib/infrastructure/repositories/local_album.repository.dart
index 154e79149a..44ebe7f7ca 100644
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -281,6 +281,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
           height: Value(asset.height),
           durationInSeconds: Value(asset.durationInSeconds),
           id: asset.id,
+          orientation: Value(asset.orientation),
           checksum: const Value(null),
         );
         batch.insert<$LocalAssetEntityTable, LocalAssetEntityData>(
diff --git a/mobile/lib/infrastructure/repositories/local_asset.repository.dart b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
index 28ca600f61..cb6871cd22 100644
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -11,7 +11,7 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
   Stream<LocalAsset?> watchAsset(String id) {
     final query = _db.localAssetEntity
         .select()
-        .addColumns([_db.localAssetEntity.id]).join([
+        .addColumns([_db.remoteAssetEntity.id]).join([
       leftOuterJoin(
         _db.remoteAssetEntity,
         _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
diff --git a/mobile/lib/infrastructure/repositories/storage.repository.dart b/mobile/lib/infrastructure/repositories/storage.repository.dart
index 1f41e48522..5b511709cd 100644
--- a/mobile/lib/infrastructure/repositories/storage.repository.dart
+++ b/mobile/lib/infrastructure/repositories/storage.repository.dart
@@ -1,29 +1,22 @@
 import 'dart:io';
 
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';
 
 class StorageRepository {
   const StorageRepository();
 
-  Future<File?> getFileForAsset(LocalAsset asset) async {
+  Future<File?> getFileForAsset(String assetId) async {
     final log = Logger('StorageRepository');
     File? file;
     try {
-      final entity = await AssetEntity.fromId(asset.id);
+      final entity = await AssetEntity.fromId(assetId);
       file = await entity?.originFile;
       if (file == null) {
-        log.warning(
-          "Cannot get file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
-        );
+        log.warning("Cannot get file for asset $assetId");
       }
     } catch (error, stackTrace) {
-      log.warning(
-        "Error getting file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
-        error,
-        stackTrace,
-      );
+      log.warning("Error getting file for asset $assetId", error, stackTrace);
     }
     return file;
   }
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index f67a154398..569df0aed8 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -99,6 +99,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                 height: row.height,
                 isFavorite: row.isFavorite,
                 durationInSeconds: row.durationInSeconds,
+                orientation: row.orientation,
               );
       },
     ).get();
diff --git a/mobile/lib/platform/native_sync_api.g.dart b/mobile/lib/platform/native_sync_api.g.dart
index dd6e545f88..46599eb016 100644
--- a/mobile/lib/platform/native_sync_api.g.dart
+++ b/mobile/lib/platform/native_sync_api.g.dart
@@ -40,6 +40,7 @@ class PlatformAsset {
     this.width,
     this.height,
     required this.durationInSeconds,
+    required this.orientation,
   });
 
   String id;
@@ -58,6 +59,8 @@ class PlatformAsset {
 
   int durationInSeconds;
 
+  int orientation;
+
   List<Object?> _toList() {
     return <Object?>[
       id,
@@ -68,6 +71,7 @@ class PlatformAsset {
       width,
       height,
       durationInSeconds,
+      orientation,
     ];
   }
 
@@ -86,6 +90,7 @@ class PlatformAsset {
       width: result[5] as int?,
       height: result[6] as int?,
       durationInSeconds: result[7]! as int,
+      orientation: result[8]! as int,
     );
   }
 
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 c91b71319c..aea821d945 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -3,6 +3,7 @@ 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/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
@@ -11,8 +12,11 @@ import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.sta
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_bar.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/top_app_bar.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
+import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
@@ -78,6 +82,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   Offset dragDownPosition = Offset.zero;
   int totalAssets = 0;
   BuildContext? scaffoldContext;
+  Map<String, GlobalKey> videoPlayerKeys = {};
 
   // Delayed operations that should be cancelled on disposal
   final List<Timer> _delayedOperations = [];
@@ -158,6 +163,11 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   void _onAssetChanged(int index) {
     final asset = ref.read(timelineServiceProvider).getAsset(index);
     ref.read(currentAssetNotifier.notifier).setAsset(asset);
+    if (asset.isVideo) {
+      ref.read(videoPlaybackValueProvider.notifier).reset();
+      ref.read(videoPlayerControlsProvider.notifier).pause();
+    }
+
     unawaited(ref.read(timelineServiceProvider).preCacheAssets(index));
     _cancelTimers();
     // This will trigger the pre-caching of adjacent assets ensuring
@@ -455,11 +465,25 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     );
   }
 
+  void _onScaleStateChanged(PhotoViewScaleState scaleState) {
+    if (scaleState != PhotoViewScaleState.initial) {
+      ref.read(videoPlayerControlsProvider.notifier).pause();
+    }
+  }
+
   PhotoViewGalleryPageOptions _assetBuilder(BuildContext ctx, int index) {
     scaffoldContext ??= ctx;
     final asset = ref.read(timelineServiceProvider).getAsset(index);
-    final size = Size(ctx.width, ctx.height);
 
+    if (asset.isImage) {
+      return _imageBuilder(ctx, asset);
+    }
+
+    return _videoBuilder(ctx, asset);
+  }
+
+  PhotoViewGalleryPageOptions _imageBuilder(BuildContext ctx, BaseAsset asset) {
+    final size = Size(ctx.width, ctx.height);
     return PhotoViewGalleryPageOptions(
       key: ValueKey(asset.heroTag),
       imageProvider: getFullImageProvider(asset, size: size),
@@ -486,6 +510,43 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     );
   }
 
+  GlobalKey _getVideoPlayerKey(String id) {
+    videoPlayerKeys.putIfAbsent(id, () => GlobalKey());
+    return videoPlayerKeys[id]!;
+  }
+
+  PhotoViewGalleryPageOptions _videoBuilder(BuildContext ctx, BaseAsset asset) {
+    return PhotoViewGalleryPageOptions.customChild(
+      onDragStart: _onDragStart,
+      onDragUpdate: _onDragUpdate,
+      onDragEnd: _onDragEnd,
+      onTapDown: _onTapDown,
+      heroAttributes: PhotoViewHeroAttributes(tag: asset.heroTag),
+      filterQuality: FilterQuality.high,
+      initialScale: PhotoViewComputedScale.contained * 0.99,
+      maxScale: 1.0,
+      minScale: PhotoViewComputedScale.contained * 0.99,
+      basePosition: Alignment.center,
+      child: SizedBox(
+        width: ctx.width,
+        height: ctx.height,
+        child: NativeVideoViewer(
+          key: _getVideoPlayerKey(asset.heroTag),
+          asset: asset,
+          image: Image(
+            key: ValueKey(asset),
+            image:
+                getFullImageProvider(asset, size: Size(ctx.width, ctx.height)),
+            fit: BoxFit.contain,
+            height: ctx.height,
+            width: ctx.width,
+            alignment: Alignment.center,
+          ),
+        ),
+      ),
+    );
+  }
+
   void _onPop<T>(bool didPop, T? result) {
     ref.read(currentAssetNotifier.notifier).dispose();
   }
@@ -518,6 +579,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
           itemCount: totalAssets,
           onPageChanged: _onPageChanged,
           onPageBuild: _onPageBuild,
+          scaleStateChangedCallback: _onScaleStateChanged,
           builder: _assetBuilder,
           backgroundDecoration: BoxDecoration(color: backgroundColor),
           enablePanAlways: true,
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
index 231d40c9ca..020d1d9b2c 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
@@ -1,3 +1,4 @@
+import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 class AssetViewerState {
@@ -63,6 +64,13 @@ class AssetViewerStateNotifier extends AutoDisposeNotifier<AssetViewerState> {
       showingBottomSheet: showing,
       showingControls: showing ? true : state.showingControls,
     );
+    if (showing) {
+      ref.read(videoPlayerControlsProvider.notifier).pause();
+    }
+  }
+
+  void setControls(bool isShowing) {
+    state = state.copyWith(showingControls: isShowing);
   }
 
   void toggleControls() {
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
index 6269bef6be..a28d5eafa4 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
@@ -10,6 +10,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_b
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/asset_viewer/video_controls.dart';
 
 class ViewerBottomBar extends ConsumerWidget {
   const ViewerBottomBar({super.key});
@@ -65,11 +66,17 @@ class ViewerBottomBar extends ConsumerWidget {
                       ),
                     ),
                     child: Container(
-                      height: 80,
+                      height: asset.isVideo ? 160 : 80,
                       color: Colors.black.withAlpha(125),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                        children: actions,
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.end,
+                        children: [
+                          if (asset.isVideo) const VideoControls(),
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                            children: actions,
+                          ),
+                        ],
                       ),
                     ),
                   ),
diff --git a/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
new file mode 100644
index 0000000000..60cb61b255
--- /dev/null
+++ b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
@@ -0,0 +1,429 @@
+import 'dart:async';
+import 'dart:io';
+
+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/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/setting.model.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer_controls.widget.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
+import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
+import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
+import 'package:immich_mobile/providers/cast.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
+import 'package:immich_mobile/services/api.service.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/utils/debounce.dart';
+import 'package:immich_mobile/utils/hooks/interval_hook.dart';
+import 'package:logging/logging.dart';
+import 'package:native_video_player/native_video_player.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
+
+class NativeVideoViewer extends HookConsumerWidget {
+  final BaseAsset asset;
+  final bool showControls;
+  final int playbackDelayFactor;
+  final Widget image;
+
+  const NativeVideoViewer({
+    super.key,
+    required this.asset,
+    required this.image,
+    this.showControls = true,
+    this.playbackDelayFactor = 1,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final controller = useState<NativeVideoPlayerController?>(null);
+    final lastVideoPosition = useRef(-1);
+    final isBuffering = useRef(false);
+
+    // Used to track whether the video should play when the app
+    // is brought back to the foreground
+    final shouldPlayOnForeground = useRef(true);
+
+    // When a video is opened through the timeline, `isCurrent` will immediately be true.
+    // When swiping from video A to video B, `isCurrent` will initially be true for video A and false for video B.
+    // If the swipe is completed, `isCurrent` will be true for video B after a delay.
+    // If the swipe is canceled, `currentAsset` will not have changed and video A will continue to play.
+    final currentAsset = useState(ref.read(currentAssetNotifier));
+    final isCurrent = currentAsset.value == asset;
+
+    // Used to show the placeholder during hero animations for remote videos to avoid a stutter
+    final isVisible = useState(Platform.isIOS && asset.hasLocal);
+
+    final log = Logger('NativeVideoViewerPage');
+
+    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
+
+    Future<VideoSource?> createSource() async {
+      if (!context.mounted) {
+        return null;
+      }
+
+      try {
+        if (asset.hasLocal && asset.livePhotoVideoId == null) {
+          final id = asset is LocalAsset
+              ? (asset as LocalAsset).id
+              : (asset as RemoteAsset).localId!;
+          final file = await const StorageRepository().getFileForAsset(id);
+          if (file == null) {
+            throw Exception('No file found for the video');
+          }
+
+          final source = await VideoSource.init(
+            path: file.path,
+            type: VideoSourceType.file,
+          );
+          return source;
+        }
+
+        final remoteId = (asset as RemoteAsset).id;
+
+        // Use a network URL for the video player controller
+        final serverEndpoint = Store.get(StoreKey.serverEndpoint);
+        final isOriginalVideo =
+            ref.read(settingsProvider).get<bool>(Setting.loadOriginalVideo);
+        final String postfixUrl =
+            isOriginalVideo ? 'original' : 'video/playback';
+        final String videoUrl = asset.livePhotoVideoId != null
+            ? '$serverEndpoint/assets/${asset.livePhotoVideoId}/$postfixUrl'
+            : '$serverEndpoint/assets/$remoteId/$postfixUrl';
+
+        final source = await VideoSource.init(
+          path: videoUrl,
+          type: VideoSourceType.network,
+          headers: ApiService.getRequestHeaders(),
+        );
+        return source;
+      } catch (error) {
+        log.severe(
+          'Error creating video source for asset ${asset.name}: $error',
+        );
+        return null;
+      }
+    }
+
+    final videoSource = useMemoized<Future<VideoSource?>>(() => createSource());
+    final aspectRatio = useState<double?>(null);
+    useMemoized(
+      () async {
+        if (!context.mounted || aspectRatio.value != null) {
+          return null;
+        }
+
+        try {
+          aspectRatio.value =
+              await ref.read(assetServiceProvider).getAspectRatio(asset);
+        } catch (error) {
+          log.severe(
+            'Error getting aspect ratio for asset ${asset.name}: $error',
+          );
+        }
+      },
+      [asset.heroTag],
+    );
+
+    void checkIfBuffering() {
+      if (!context.mounted) {
+        return;
+      }
+
+      final videoPlayback = ref.read(videoPlaybackValueProvider);
+      if ((isBuffering.value ||
+              videoPlayback.state == VideoPlaybackState.initializing) &&
+          videoPlayback.state != VideoPlaybackState.buffering) {
+        ref.read(videoPlaybackValueProvider.notifier).value =
+            videoPlayback.copyWith(state: VideoPlaybackState.buffering);
+      }
+    }
+
+    // Timer to mark videos as buffering if the position does not change
+    useInterval(const Duration(seconds: 5), checkIfBuffering);
+
+    // When the position changes, seek to the position
+    // Debounce the seek to avoid seeking too often
+    // But also don't delay the seek too much to maintain visual feedback
+    final seekDebouncer = useDebouncer(
+      interval: const Duration(milliseconds: 100),
+      maxWaitTime: const Duration(milliseconds: 200),
+    );
+    ref.listen(videoPlayerControlsProvider, (oldControls, newControls) async {
+      final playerController = controller.value;
+      if (playerController == null) {
+        return;
+      }
+
+      final playbackInfo = playerController.playbackInfo;
+      if (playbackInfo == null) {
+        return;
+      }
+
+      final oldSeek = (oldControls?.position ?? 0) ~/ 1;
+      final newSeek = newControls.position ~/ 1;
+      if (oldSeek != newSeek || newControls.restarted) {
+        seekDebouncer.run(() => playerController.seekTo(newSeek));
+      }
+
+      if (oldControls?.pause != newControls.pause || newControls.restarted) {
+        // Make sure the last seek is complete before pausing or playing
+        // Otherwise, `onPlaybackPositionChanged` can receive outdated events
+        if (seekDebouncer.isActive) {
+          await seekDebouncer.drain();
+        }
+
+        try {
+          if (newControls.pause) {
+            await playerController.pause();
+          } else {
+            await playerController.play();
+          }
+        } catch (error) {
+          log.severe('Error pausing or playing video: $error');
+        }
+      }
+    });
+
+    void onPlaybackReady() async {
+      final videoController = controller.value;
+      if (videoController == null || !isCurrent || !context.mounted) {
+        return;
+      }
+
+      final videoPlayback =
+          VideoPlaybackValue.fromNativeController(videoController);
+      ref.read(videoPlaybackValueProvider.notifier).value = videoPlayback;
+
+      if (ref.read(assetViewerProvider.select((s) => s.showingBottomSheet))) {
+        return;
+      }
+
+      try {
+        await videoController.play();
+        await videoController.setVolume(0.9);
+      } catch (error) {
+        log.severe('Error playing video: $error');
+      }
+    }
+
+    void onPlaybackStatusChanged() {
+      final videoController = controller.value;
+      if (videoController == null || !context.mounted) {
+        return;
+      }
+
+      final videoPlayback =
+          VideoPlaybackValue.fromNativeController(videoController);
+      if (videoPlayback.state == VideoPlaybackState.playing) {
+        // Sync with the controls playing
+        WakelockPlus.enable();
+      } else {
+        // Sync with the controls pause
+        WakelockPlus.disable();
+      }
+
+      ref.read(videoPlaybackValueProvider.notifier).status =
+          videoPlayback.state;
+    }
+
+    void onPlaybackPositionChanged() {
+      // When seeking, these events sometimes move the slider to an older position
+      if (seekDebouncer.isActive) {
+        return;
+      }
+
+      final videoController = controller.value;
+      if (videoController == null || !context.mounted) {
+        return;
+      }
+
+      final playbackInfo = videoController.playbackInfo;
+      if (playbackInfo == null) {
+        return;
+      }
+
+      ref.read(videoPlaybackValueProvider.notifier).position =
+          Duration(seconds: playbackInfo.position);
+
+      // Check if the video is buffering
+      if (playbackInfo.status == PlaybackStatus.playing) {
+        isBuffering.value = lastVideoPosition.value == playbackInfo.position;
+        lastVideoPosition.value = playbackInfo.position;
+      } else {
+        isBuffering.value = false;
+        lastVideoPosition.value = -1;
+      }
+    }
+
+    void onPlaybackEnded() {
+      final videoController = controller.value;
+      if (videoController == null || !context.mounted) {
+        return;
+      }
+
+      if (videoController.playbackInfo?.status == PlaybackStatus.stopped &&
+          !ref
+              .read(appSettingsServiceProvider)
+              .getSetting<bool>(AppSettingsEnum.loopVideo)) {
+        ref.read(isPlayingMotionVideoProvider.notifier).playing = false;
+      }
+    }
+
+    void removeListeners(NativeVideoPlayerController controller) {
+      controller.onPlaybackPositionChanged
+          .removeListener(onPlaybackPositionChanged);
+      controller.onPlaybackStatusChanged
+          .removeListener(onPlaybackStatusChanged);
+      controller.onPlaybackReady.removeListener(onPlaybackReady);
+      controller.onPlaybackEnded.removeListener(onPlaybackEnded);
+    }
+
+    void initController(NativeVideoPlayerController nc) async {
+      if (controller.value != null || !context.mounted) {
+        return;
+      }
+      ref.read(videoPlayerControlsProvider.notifier).reset();
+      ref.read(videoPlaybackValueProvider.notifier).reset();
+
+      final source = await videoSource;
+      if (source == null) {
+        return;
+      }
+
+      nc.onPlaybackPositionChanged.addListener(onPlaybackPositionChanged);
+      nc.onPlaybackStatusChanged.addListener(onPlaybackStatusChanged);
+      nc.onPlaybackReady.addListener(onPlaybackReady);
+      nc.onPlaybackEnded.addListener(onPlaybackEnded);
+
+      nc.loadVideoSource(source).catchError((error) {
+        log.severe('Error loading video source: $error');
+      });
+      final loopVideo = ref
+          .read(appSettingsServiceProvider)
+          .getSetting<bool>(AppSettingsEnum.loopVideo);
+      nc.setLoop(loopVideo);
+
+      controller.value = nc;
+      Timer(const Duration(milliseconds: 200), checkIfBuffering);
+    }
+
+    ref.listen(currentAssetNotifier, (_, value) {
+      final playerController = controller.value;
+      if (playerController != null && value != asset) {
+        removeListeners(playerController);
+      }
+
+      final curAsset = currentAsset.value;
+      if (curAsset == asset) {
+        return;
+      }
+
+      final imageToVideo = curAsset != null && !curAsset.isVideo;
+
+      // No need to delay video playback when swiping from an image to a video
+      if (imageToVideo && Platform.isIOS) {
+        currentAsset.value = value;
+        onPlaybackReady();
+        return;
+      }
+
+      // Delay the video playback to avoid a stutter in the swipe animation
+      // Note, in some circumstances a longer delay is needed (eg: memories),
+      // the playbackDelayFactor can be used for this
+      // This delay seems like a hacky way to resolve underlying bugs in video
+      // playback, but other resolutions failed thus far
+      Timer(
+          Platform.isIOS
+              ? Duration(milliseconds: 300 * playbackDelayFactor)
+              : imageToVideo
+                  ? Duration(milliseconds: 200 * playbackDelayFactor)
+                  : Duration(milliseconds: 400 * playbackDelayFactor), () {
+        if (!context.mounted) {
+          return;
+        }
+
+        currentAsset.value = value;
+        if (currentAsset.value == asset) {
+          onPlaybackReady();
+        }
+      });
+    });
+
+    useEffect(
+      () {
+        // If opening a remote video from a hero animation, delay visibility to avoid a stutter
+        final timer = isVisible.value
+            ? null
+            : Timer(
+                const Duration(milliseconds: 300),
+                () => isVisible.value = true,
+              );
+
+        return () {
+          timer?.cancel();
+          final playerController = controller.value;
+          if (playerController == null) {
+            return;
+          }
+          removeListeners(playerController);
+          playerController.stop().catchError((error) {
+            log.fine('Error stopping video: $error');
+          });
+
+          WakelockPlus.disable();
+        };
+      },
+      const [],
+    );
+
+    useOnAppLifecycleStateChange((_, state) async {
+      if (state == AppLifecycleState.resumed && shouldPlayOnForeground.value) {
+        controller.value?.play();
+      } else if (state == AppLifecycleState.paused) {
+        final videoPlaying = await controller.value?.isPlaying();
+        if (videoPlaying ?? true) {
+          shouldPlayOnForeground.value = true;
+          controller.value?.pause();
+        } else {
+          shouldPlayOnForeground.value = false;
+        }
+      }
+    });
+
+    return Stack(
+      children: [
+        // This remains under the video to avoid flickering
+        // For motion videos, this is the image portion of the asset
+        Center(key: ValueKey(asset.heroTag), child: image),
+        if (aspectRatio.value != null && !isCasting)
+          Visibility.maintain(
+            key: ValueKey(asset),
+            visible: isVisible.value,
+            child: Center(
+              key: ValueKey(asset),
+              child: AspectRatio(
+                key: ValueKey(asset),
+                aspectRatio: aspectRatio.value!,
+                child: isCurrent
+                    ? NativeVideoPlayerView(
+                        key: ValueKey(asset),
+                        onViewReady: initController,
+                      )
+                    : null,
+              ),
+            ),
+          ),
+        if (showControls) const Center(child: VideoViewerControls()),
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/asset_viewer/video_viewer_controls.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/video_viewer_controls.widget.dart
new file mode 100644
index 0000000000..883169ae83
--- /dev/null
+++ b/mobile/lib/presentation/widgets/asset_viewer/video_viewer_controls.widget.dart
@@ -0,0 +1,131 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/models/cast/cast_manager_state.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
+import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
+import 'package:immich_mobile/providers/cast.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/utils/hooks/timer_hook.dart';
+import 'package:immich_mobile/widgets/asset_viewer/center_play_button.dart';
+import 'package:immich_mobile/widgets/common/delayed_loading_indicator.dart';
+
+class VideoViewerControls extends HookConsumerWidget {
+  final Duration hideTimerDuration;
+
+  const VideoViewerControls({
+    super.key,
+    this.hideTimerDuration = const Duration(seconds: 5),
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final assetIsVideo = ref.watch(
+      currentAssetNotifier.select((asset) => asset != null && asset.isVideo),
+    );
+    bool showControls =
+        ref.watch(assetViewerProvider.select((s) => s.showingControls));
+    final showBottomSheet =
+        ref.watch(assetViewerProvider.select((s) => s.showingBottomSheet));
+    if (showBottomSheet) {
+      showControls = false;
+    }
+    final VideoPlaybackState state =
+        ref.watch(videoPlaybackValueProvider.select((value) => value.state));
+
+    final cast = ref.watch(castProvider);
+
+    // A timer to hide the controls
+    final hideTimer = useTimer(
+      hideTimerDuration,
+      () {
+        if (!context.mounted) {
+          return;
+        }
+        final state = ref.read(videoPlaybackValueProvider).state;
+
+        // Do not hide on paused
+        if (state != VideoPlaybackState.paused &&
+            state != VideoPlaybackState.completed &&
+            assetIsVideo) {
+          ref.read(assetViewerProvider.notifier).setControls(false);
+        }
+      },
+    );
+    final showBuffering =
+        state == VideoPlaybackState.buffering && !cast.isCasting;
+
+    /// Shows the controls and starts the timer to hide them
+    void showControlsAndStartHideTimer() {
+      hideTimer.reset();
+      ref.read(assetViewerProvider.notifier).setControls(true);
+    }
+
+    // When we change position, show or hide timer
+    ref.listen(videoPlayerControlsProvider.select((v) => v.position),
+        (previous, next) {
+      showControlsAndStartHideTimer();
+    });
+
+    /// Toggles between playing and pausing depending on the state of the video
+    void togglePlay() {
+      showControlsAndStartHideTimer();
+
+      if (cast.isCasting) {
+        if (cast.castState == CastState.playing) {
+          ref.read(castProvider.notifier).pause();
+        } else if (cast.castState == CastState.paused) {
+          ref.read(castProvider.notifier).play();
+        } else if (cast.castState == CastState.idle) {
+          // resend the play command since its finished
+          final asset = ref.read(currentAssetNotifier);
+          if (asset == null) {
+            return;
+          }
+          // ref.read(castProvider.notifier).loadMedia(asset, true);
+        }
+        return;
+      }
+
+      if (state == VideoPlaybackState.playing) {
+        ref.read(videoPlayerControlsProvider.notifier).pause();
+      } else if (state == VideoPlaybackState.completed) {
+        ref.read(videoPlayerControlsProvider.notifier).restart();
+      } else {
+        ref.read(videoPlayerControlsProvider.notifier).play();
+      }
+    }
+
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: showControlsAndStartHideTimer,
+      child: AbsorbPointer(
+        absorbing: !showControls,
+        child: Stack(
+          children: [
+            if (showBuffering)
+              const Center(
+                child: DelayedLoadingIndicator(
+                  fadeInDuration: Duration(milliseconds: 400),
+                ),
+              )
+            else
+              GestureDetector(
+                onTap: () =>
+                    ref.read(assetViewerProvider.notifier).setControls(false),
+                child: CenterPlayButton(
+                  backgroundColor: Colors.black54,
+                  iconColor: Colors.white,
+                  isFinished: state == VideoPlaybackState.completed,
+                  isPlaying: state == VideoPlaybackState.playing ||
+                      (cast.isCasting && cast.castState == CastState.playing),
+                  show: assetIsVideo && showControls,
+                  onPressed: togglePlay,
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/images/local_image_provider.dart b/mobile/lib/presentation/widgets/images/local_image_provider.dart
index 214dede1af..f046fcad47 100644
--- a/mobile/lib/presentation/widgets/images/local_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/local_image_provider.dart
@@ -175,7 +175,7 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
     LocalFullImageProvider key,
     ImageDecoderCallback decode,
   ) async* {
-    final file = await _storageRepository.getFileForAsset(key.asset);
+    final file = await _storageRepository.getFileForAsset(key.asset.id);
     if (file == null) {
       throw StateError("Opening file for asset ${key.asset.name} failed");
     }
diff --git a/mobile/lib/presentation/widgets/memory/memory_card.widget.dart b/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
index 8268196089..a6262bd2e5 100644
--- a/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
+++ b/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/full_image.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/utils/hooks/blurhash_hook.dart';
@@ -67,26 +68,20 @@ class DriftMemoryCard extends StatelessWidget {
               } else {
                 return Hero(
                   tag: 'memory-${asset.id}',
-                  // child: SizedBox(
-                  //   width: context.width,
-                  //   height: context.height,
-                  //   child: NativeVideoViewerPage(
-                  //     key: ValueKey(asset.id),
-                  //     asset: asset,
-                  //     showControls: false,
-                  //     playbackDelayFactor: 2,
-                  //     image: ImmichImage(
-                  //       asset,
-                  //       width: context.width,
-                  //       height: context.height,
-                  //       fit: BoxFit.contain,
-                  //     ),
-                  //   ),
-                  // ),
-                  child: FullImage(
-                    asset,
-                    fit: fit,
-                    size: const Size(double.infinity, double.infinity),
+                  child: SizedBox(
+                    width: context.width,
+                    height: context.height,
+                    child: NativeVideoViewer(
+                      key: ValueKey(asset.id),
+                      asset: asset,
+                      showControls: false,
+                      playbackDelayFactor: 2,
+                      image: FullImage(
+                        asset,
+                        size: Size(context.width, context.height),
+                        fit: BoxFit.contain,
+                      ),
+                    ),
                   ),
                 );
               }
diff --git a/mobile/pigeon/native_sync_api.dart b/mobile/pigeon/native_sync_api.dart
index 33e2429405..4f14b7a0b9 100644
--- a/mobile/pigeon/native_sync_api.dart
+++ b/mobile/pigeon/native_sync_api.dart
@@ -23,6 +23,7 @@ class PlatformAsset {
   final int? width;
   final int? height;
   final int durationInSeconds;
+  final int orientation;
 
   const PlatformAsset({
     required this.id,
@@ -33,6 +34,7 @@ class PlatformAsset {
     this.width,
     this.height,
     this.durationInSeconds = 0,
+    this.orientation = 0,
   });
 }
 
diff --git a/mobile/test/domain/services/hash_service_test.dart b/mobile/test/domain/services/hash_service_test.dart
index 2a7ea740bf..b2ab803ac2 100644
--- a/mobile/test/domain/services/hash_service_test.dart
+++ b/mobile/test/domain/services/hash_service_test.dart
@@ -68,7 +68,7 @@ void main() {
           .thenAnswer((_) async => [album]);
       when(() => mockAlbumRepo.getAssetsToHash(album.id))
           .thenAnswer((_) async => [asset]);
-      when(() => mockStorageRepo.getFileForAsset(asset))
+      when(() => mockStorageRepo.getFileForAsset(asset.id))
           .thenAnswer((_) async => null);
 
       await sut.hashAssets();
@@ -89,7 +89,7 @@ void main() {
           .thenAnswer((_) async => [album]);
       when(() => mockAlbumRepo.getAssetsToHash(album.id))
           .thenAnswer((_) async => [asset]);
-      when(() => mockStorageRepo.getFileForAsset(asset))
+      when(() => mockStorageRepo.getFileForAsset(asset.id))
           .thenAnswer((_) async => mockFile);
       when(() => mockNativeApi.hashPaths(['image-path'])).thenAnswer(
         (_) async => [hash],
@@ -116,7 +116,7 @@ void main() {
           .thenAnswer((_) async => [album]);
       when(() => mockAlbumRepo.getAssetsToHash(album.id))
           .thenAnswer((_) async => [asset]);
-      when(() => mockStorageRepo.getFileForAsset(asset))
+      when(() => mockStorageRepo.getFileForAsset(asset.id))
           .thenAnswer((_) async => mockFile);
       when(() => mockNativeApi.hashPaths(['image-path']))
           .thenAnswer((_) async => [null]);
@@ -141,7 +141,7 @@ void main() {
           .thenAnswer((_) async => [album]);
       when(() => mockAlbumRepo.getAssetsToHash(album.id))
           .thenAnswer((_) async => [asset]);
-      when(() => mockStorageRepo.getFileForAsset(asset))
+      when(() => mockStorageRepo.getFileForAsset(asset.id))
           .thenAnswer((_) async => mockFile);
 
       final invalidHash = Uint8List.fromList([1, 2, 3]);
@@ -180,9 +180,9 @@ void main() {
           .thenAnswer((_) async => [album]);
       when(() => mockAlbumRepo.getAssetsToHash(album.id))
           .thenAnswer((_) async => [asset1, asset2]);
-      when(() => mockStorageRepo.getFileForAsset(asset1))
+      when(() => mockStorageRepo.getFileForAsset(asset1.id))
           .thenAnswer((_) async => mockFile1);
-      when(() => mockStorageRepo.getFileForAsset(asset2))
+      when(() => mockStorageRepo.getFileForAsset(asset2.id))
           .thenAnswer((_) async => mockFile2);
 
       final hash = Uint8List.fromList(List.generate(20, (i) => i));
@@ -220,9 +220,9 @@ void main() {
           .thenAnswer((_) async => [album]);
       when(() => mockAlbumRepo.getAssetsToHash(album.id))
           .thenAnswer((_) async => [asset1, asset2]);
-      when(() => mockStorageRepo.getFileForAsset(asset1))
+      when(() => mockStorageRepo.getFileForAsset(asset1.id))
           .thenAnswer((_) async => mockFile1);
-      when(() => mockStorageRepo.getFileForAsset(asset2))
+      when(() => mockStorageRepo.getFileForAsset(asset2.id))
           .thenAnswer((_) async => mockFile2);
 
       final hash = Uint8List.fromList(List.generate(20, (i) => i));
@@ -252,9 +252,9 @@ void main() {
           .thenAnswer((_) async => [album]);
       when(() => mockAlbumRepo.getAssetsToHash(album.id))
           .thenAnswer((_) async => [asset1, asset2]);
-      when(() => mockStorageRepo.getFileForAsset(asset1))
+      when(() => mockStorageRepo.getFileForAsset(asset1.id))
           .thenAnswer((_) async => mockFile1);
-      when(() => mockStorageRepo.getFileForAsset(asset2))
+      when(() => mockStorageRepo.getFileForAsset(asset2.id))
           .thenAnswer((_) async => mockFile2);
 
       final validHash = Uint8List.fromList(List.generate(20, (i) => i));

From 6278fe43c032922ca67a1f835af62edd065febd7 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Wed, 9 Jul 2025 20:45:37 +0530
Subject: [PATCH 159/337] fix: run reload within a mutex (#19826)

* fix: run reload within a mutex

* change total assets before emitting the reload event

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
---
 .../lib/domain/services/timeline.service.dart | 64 +++++++++++++------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index d8975e7e21..b3d6b51402 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -108,6 +108,11 @@ class TimelineFactory {
 class TimelineService {
   final TimelineAssetSource _assetSource;
   final TimelineBucketSource _bucketSource;
+  final AsyncMutex _mutex = AsyncMutex();
+  int _bufferOffset = 0;
+  List<BaseAsset> _buffer = [];
+  StreamSubscription? _bucketSubscription;
+
   int _totalAssets = 0;
   int get totalAssets => _totalAssets;
 
@@ -117,24 +122,41 @@ class TimelineService {
   })  : _assetSource = assetSource,
         _bucketSource = bucketSource {
     _bucketSubscription = _bucketSource().listen((buckets) {
-      _totalAssets =
-          buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
-      unawaited(_reloadBucket());
+      _mutex.run(() async {
+        final totalAssets =
+            buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
+
+        if (totalAssets == 0) {
+          _bufferOffset = 0;
+          _buffer.clear();
+        } else {
+          final int offset;
+          final int count;
+          // When the buffer is empty or the old bufferOffset is greater than the new total assets,
+          // we need to reset the buffer and load the first batch of assets.
+          if (_bufferOffset >= totalAssets || _buffer.isEmpty) {
+            offset = 0;
+            count = kTimelineAssetLoadBatchSize;
+          } else {
+            offset = _bufferOffset;
+            count = math.min(
+              _buffer.length,
+              totalAssets - _bufferOffset,
+            );
+          }
+          _buffer = await _assetSource(offset, count);
+          _bufferOffset = offset;
+        }
+
+        // change the state's total assets count only after the buffer is reloaded
+        _totalAssets = totalAssets;
+        EventStream.shared.emit(const TimelineReloadEvent());
+      });
     });
   }
 
-  final AsyncMutex _mutex = AsyncMutex();
-  int _bufferOffset = 0;
-  List<BaseAsset> _buffer = [];
-  StreamSubscription? _bucketSubscription;
-
   Stream<List<Bucket>> Function() get watchBuckets => _bucketSource;
 
-  Future<void> _reloadBucket() => _mutex.run(() async {
-        _buffer = await _assetSource(_bufferOffset, _buffer.length);
-        EventStream.shared.emit(const TimelineReloadEvent());
-      });
-
   Future<List<BaseAsset>> loadAssets(int index, int count) =>
       _mutex.run(() => _loadAssets(index, count));
 
@@ -163,18 +185,20 @@ class TimelineService {
           : (len > kTimelineAssetLoadBatchSize ? index : index + count - len),
     );
 
-    final assets = await _assetSource(start, len);
-    _buffer = assets;
+    _buffer = await _assetSource(start, len);
     _bufferOffset = start;
 
     return getAssets(index, count);
   }
 
   bool hasRange(int index, int count) =>
-      index >= _bufferOffset && index + count <= _bufferOffset + _buffer.length;
+      index >= 0 &&
+      index < _totalAssets &&
+      index >= _bufferOffset &&
+      index + count <= _bufferOffset + _buffer.length &&
+      index + count <= _totalAssets;
 
   List<BaseAsset> getAssets(int index, int count) {
-    assert(index + count <= totalAssets);
     if (!hasRange(index, count)) {
       throw RangeError('TimelineService::getAssets Index out of range');
     }
@@ -184,11 +208,13 @@ class TimelineService {
 
   // Pre-cache assets around the given index for asset viewer
   Future<void> preCacheAssets(int index) =>
-      _mutex.run(() => _loadAssets(index, math.min(5, totalAssets - index)));
+      _mutex.run(() => _loadAssets(index, math.min(5, _totalAssets - index)));
 
   BaseAsset getAsset(int index) {
     if (!hasRange(index, 1)) {
-      throw RangeError('TimelineService::getAsset Index out of range');
+      throw RangeError(
+        'TimelineService::getAsset Index $index not in buffer range [$_bufferOffset, ${_bufferOffset + _buffer.length})',
+      );
     }
     return _buffer.elementAt(index - _bufferOffset);
   }

From d902e7f87db33d6a1d6cd9a08d23b9687b0dbcc7 Mon Sep 17 00:00:00 2001
From: "immich-tofu[bot]" <171590969+immich-tofu[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 15:23:30 +0000
Subject: [PATCH 160/337] chore: modify .github/workflows/org-checks.yml

---
 .github/workflows/org-checks.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/workflows/org-checks.yml

diff --git a/.github/workflows/org-checks.yml b/.github/workflows/org-checks.yml
new file mode 100644
index 0000000000..55c5dfad5b
--- /dev/null
+++ b/.github/workflows/org-checks.yml
@@ -0,0 +1,12 @@
+name: Org Checks
+
+on:
+  pull_request_review:
+
+jobs:
+  check-approvals:
+    name: Check for Team/Admin Review
+    uses: immich-app/devtools/.github/workflows/required-approval.yml@main
+    permissions:
+      pull-requests: read
+      contents: read

From 2a222fcfba4b035ba3a3a0f6f33a12450e18801d Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Wed, 9 Jul 2025 10:54:00 -0500
Subject: [PATCH 161/337] chore(docs): roadmap updates (#19841)

---
 docs/src/pages/roadmap.tsx | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/docs/src/pages/roadmap.tsx b/docs/src/pages/roadmap.tsx
index 1258000052..e002c4d032 100644
--- a/docs/src/pages/roadmap.tsx
+++ b/docs/src/pages/roadmap.tsx
@@ -85,6 +85,7 @@ import React from 'react';
 import { Item, Timeline } from '../components/timeline';
 
 const releases = {
+  'v1.135.0': new Date(2025, 5, 18),
   'v1.133.0': new Date(2025, 4, 21),
   'v1.130.0': new Date(2025, 2, 25),
   'v1.127.0': new Date(2025, 1, 26),
@@ -196,14 +197,6 @@ const roadmap: Item[] = [
     description: 'Automate tasks with workflows',
     getDateLabel: () => 'Planned for 2025',
   },
-  {
-    done: false,
-    icon: mdiTableKey,
-    iconColor: 'gray',
-    title: 'Fine grained access controls',
-    description: 'Granular access controls for users and api keys',
-    getDateLabel: () => 'Planned for 2025',
-  },
   {
     done: false,
     icon: mdiImageEdit,
@@ -239,12 +232,26 @@ const roadmap: Item[] = [
 ];
 
 const milestones: Item[] = [
+  {
+    icon: mdiStar,
+    iconColor: 'gold',
+    title: '70,000 Stars',
+    description: 'Reached 70K Stars on GitHub!',
+    getDateLabel: withLanguage(new Date(2025, 6, 9)),
+  },
+  withRelease({
+    icon: mdiTableKey,
+    iconColor: 'gray',
+    title: 'Fine grained access controls',
+    description: 'Granular access controls for api keys',
+    release: 'v1.135.0',
+  }),
   withRelease({
     icon: mdiCast,
     iconColor: 'aqua',
-    title: 'Google Cast (web)',
+    title: 'Google Cast (web and mobile)',
     description: 'Cast assets to Google Cast/Chromecast compatible devices',
-    release: 'v1.133.0',
+    release: 'v1.135.0',
   }),
   withRelease({
     icon: mdiLockOutline,

From a201665b7e21216f5e6b16b632078fc1e28cb6fd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 12:52:11 -0500
Subject: [PATCH 162/337] chore(deps): update base-image to v202507091427
 (major) (#19840)

chore(deps): update base-image to v202507091427

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

diff --git a/server/Dockerfile b/server/Dockerfile
index de977d5436..3fc57b7db0 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,5 +1,5 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:202505131114@sha256:cf4507bbbf307e9b6d8ee9418993321f2b85867da8ce14d0a20ccaf9574cb995 AS dev
+FROM ghcr.io/immich-app/base-server-dev:202507091427@sha256:733e510024e03bc2450608a1f3622f45bf287b70d89a06e60acbccea4bf4fd8c AS dev
 
 RUN apt-get install --no-install-recommends -yqq tini
 WORKDIR /usr/src/app
@@ -99,7 +99,7 @@ RUN npm run build
 
 
 # prod build
-FROM ghcr.io/immich-app/base-server-prod:202505061115@sha256:9971d3a089787f0bd01f4682141d3665bcf5efb3e101a88e394ffd25bee4eedb
+FROM ghcr.io/immich-app/base-server-prod:202507091427@sha256:ad10451acd8eda05a006a2586b6b0425cdaaca97c413fb4c1a10896712528bdc
 
 WORKDIR /usr/src/app
 ENV NODE_ENV=production \

From a918481c0b4b587aee2127b68e7faaafda566fd9 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Wed, 9 Jul 2025 13:59:54 -0500
Subject: [PATCH 163/337] feat(mobile): cache latest ios widget entry for
 fallback (#19824)

* cache the last image an ios widget fetched and use if a fetch fails in a future timeline build

* code review fixes

* downgrade pbx for flutter

* use cache in snapshots
---
 .../ios/WidgetExtension/EntryGenerators.swift |  59 -------
 mobile/ios/WidgetExtension/ImageEntry.swift   | 161 ++++++++++++++++++
 .../ios/WidgetExtension/ImageWidgetView.swift |  31 +---
 mobile/ios/WidgetExtension/ImmichAPI.swift    |  33 ++--
 .../ios/WidgetExtension/UIImage+Resize.swift  |  21 ++-
 .../widgets/MemoryWidget.swift                |  35 ++--
 .../widgets/RandomWidget.swift                |  54 +++---
 7 files changed, 248 insertions(+), 146 deletions(-)
 delete mode 100644 mobile/ios/WidgetExtension/EntryGenerators.swift
 create mode 100644 mobile/ios/WidgetExtension/ImageEntry.swift

diff --git a/mobile/ios/WidgetExtension/EntryGenerators.swift b/mobile/ios/WidgetExtension/EntryGenerators.swift
deleted file mode 100644
index 81bcc2263e..0000000000
--- a/mobile/ios/WidgetExtension/EntryGenerators.swift
+++ /dev/null
@@ -1,59 +0,0 @@
-import SwiftUI
-import WidgetKit
-
-func buildEntry(
-  api: ImmichAPI,
-  asset: Asset,
-  dateOffset: Int,
-  subtitle: String? = nil
-)
-  async throws -> ImageEntry
-{
-  let entryDate = Calendar.current.date(
-    byAdding: .minute,
-    value: dateOffset * 20,
-    to: Date.now
-  )!
-  let image = try await api.fetchImage(asset: asset)
-
-  return ImageEntry(date: entryDate, image: image, subtitle: subtitle, deepLink: asset.deepLink)
-}
-
-func generateRandomEntries(
-  api: ImmichAPI,
-  now: Date,
-  count: Int,
-  albumId: String? = nil,
-  subtitle: String? = nil
-)
-  async throws -> [ImageEntry]
-{
-
-  var entries: [ImageEntry] = []
-  let albumIds = albumId != nil ? [albumId!] : []
-
-  let randomAssets = try await api.fetchSearchResults(
-    with: SearchFilters(size: count, albumIds: albumIds)
-  )
-
-  await withTaskGroup(of: ImageEntry?.self) { group in
-    for (dateOffset, asset) in randomAssets.enumerated() {
-      group.addTask {
-        return try? await buildEntry(
-          api: api,
-          asset: asset,
-          dateOffset: dateOffset,
-          subtitle: subtitle
-        )
-      }
-    }
-
-    for await result in group {
-      if let entry = result {
-        entries.append(entry)
-      }
-    }
-  }
-
-  return entries
-}
diff --git a/mobile/ios/WidgetExtension/ImageEntry.swift b/mobile/ios/WidgetExtension/ImageEntry.swift
new file mode 100644
index 0000000000..5239702d4b
--- /dev/null
+++ b/mobile/ios/WidgetExtension/ImageEntry.swift
@@ -0,0 +1,161 @@
+import SwiftUI
+import WidgetKit
+
+typealias EntryMetadata = ImageEntry.Metadata
+
+struct ImageEntry: TimelineEntry {
+  let date: Date
+  var image: UIImage?
+  var metadata: Metadata = Metadata()
+
+  struct Metadata: Codable {
+    var subtitle: String? = nil
+    var error: WidgetError? = nil
+    var deepLink: URL? = nil
+  }
+
+  // Resizes the stored image to a maximum width of 450 pixels
+  mutating func resize() {
+    if image == nil || image!.size.height < 450 || image!.size.width < 450 {
+      return
+    }
+
+    image = image?.resized(toWidth: 450)
+
+    if image == nil {
+      metadata.error = .unableToResize
+    }
+  }
+
+  static func build(
+    api: ImmichAPI,
+    asset: Asset,
+    dateOffset: Int,
+    subtitle: String? = nil
+  )
+    async throws -> Self
+  {
+    let entryDate = Calendar.current.date(
+      byAdding: .minute,
+      value: dateOffset * 20,
+      to: Date.now
+    )!
+    let image = try await api.fetchImage(asset: asset)
+
+    return Self(
+      date: entryDate,
+      image: image,
+      metadata: EntryMetadata(
+        subtitle: subtitle,
+        deepLink: asset.deepLink
+      )
+    )
+  }
+
+  func cache(for key: String) throws {
+    if let containerURL = FileManager.default.containerURL(
+      forSecurityApplicationGroupIdentifier: IMMICH_SHARE_GROUP
+    ) {
+      let imageURL = containerURL.appendingPathComponent("\(key)_image.png")
+      let metadataURL = containerURL.appendingPathComponent(
+        "\(key)_metadata.json"
+      )
+
+      // build metadata JSON
+      let entryMetadata = try JSONEncoder().encode(self.metadata)
+
+      // write to disk
+      try self.image?.pngData()?.write(to: imageURL, options: .atomic)
+      try entryMetadata.write(to: metadataURL, options: .atomic)
+    }
+  }
+
+  static func loadCached(for key: String, at date: Date = Date.now)
+    -> ImageEntry?
+  {
+    if let containerURL = FileManager.default.containerURL(
+      forSecurityApplicationGroupIdentifier: IMMICH_SHARE_GROUP
+    ) {
+      let imageURL = containerURL.appendingPathComponent("\(key)_image.png")
+      let metadataURL = containerURL.appendingPathComponent(
+        "\(key)_metadata.json"
+      )
+
+      guard let imageData = try? Data(contentsOf: imageURL),
+        let metadataJSON = try? Data(contentsOf: metadataURL),
+        let decodedMetadata = try? JSONDecoder().decode(Metadata.self, from: metadataJSON)
+      else {
+        return nil
+      }
+
+      return ImageEntry(
+        date: date,
+        image: UIImage(data: imageData),
+        metadata: decodedMetadata
+      )
+    }
+
+    return nil
+  }
+
+  static func handleCacheFallback(
+    for key: String,
+    error: WidgetError = .fetchFailed
+  ) -> Timeline<ImageEntry> {
+    var timelineEntry = ImageEntry(
+      date: Date.now,
+      image: nil,
+      metadata: EntryMetadata(error: error)
+    )
+
+    // skip cache if album not found or no login
+    // we want to show these errors to the user since without intervention,
+    // it will never succeed
+    if error != .noLogin && error != .albumNotFound {
+      if let cachedEntry = ImageEntry.loadCached(for: key) {
+        timelineEntry = cachedEntry
+      }
+    }
+
+    return Timeline(entries: [timelineEntry], policy: .atEnd)
+  }
+}
+
+func generateRandomEntries(
+  api: ImmichAPI,
+  now: Date,
+  count: Int,
+  albumId: String? = nil,
+  subtitle: String? = nil
+)
+  async throws -> [ImageEntry]
+{
+
+  var entries: [ImageEntry] = []
+  let albumIds = albumId != nil ? [albumId!] : []
+
+  let randomAssets = try await api.fetchSearchResults(
+    with: SearchFilters(size: count, albumIds: albumIds)
+  )
+
+  await withTaskGroup(of: ImageEntry?.self) { group in
+    for (dateOffset, asset) in randomAssets.enumerated() {
+      group.addTask {
+        return try? await ImageEntry.build(
+          api: api,
+          asset: asset,
+          dateOffset: dateOffset,
+          subtitle: subtitle
+        )
+      }
+    }
+
+    for await result in group {
+      if let entry = result {
+        entries.append(entry)
+      }
+    }
+  }
+
+  return entries
+}
diff --git a/mobile/ios/WidgetExtension/ImageWidgetView.swift b/mobile/ios/WidgetExtension/ImageWidgetView.swift
index a4bda9d845..24072b0607 100644
--- a/mobile/ios/WidgetExtension/ImageWidgetView.swift
+++ b/mobile/ios/WidgetExtension/ImageWidgetView.swift
@@ -1,27 +1,6 @@
 import SwiftUI
 import WidgetKit
 
-struct ImageEntry: TimelineEntry {
-  let date: Date
-  var image: UIImage?
-  var subtitle: String? = nil
-  var error: WidgetError? = nil
-  var deepLink: URL? = nil
-
-  // Resizes the stored image to a maximum width of 450 pixels
-  mutating func resize() {
-    if (image == nil || image!.size.height < 450 || image!.size.width < 450 ) {
-      return
-    }
-    
-    image = image?.resized(toWidth: 450)
-    
-    if image == nil {
-      error = .unableToResize
-    }
-  }
-}
-
 struct ImmichWidgetView: View {
   var entry: ImageEntry
 
@@ -29,7 +8,7 @@ struct ImmichWidgetView: View {
     if entry.image == nil {
       VStack {
         Image("LaunchImage")
-        Text(entry.error?.errorDescription ?? "")
+        Text(entry.metadata.error?.errorDescription ?? "")
           .minimumScaleFactor(0.25)
           .multilineTextAlignment(.center)
           .foregroundStyle(.secondary)
@@ -44,7 +23,7 @@ struct ImmichWidgetView: View {
         )
         VStack {
           Spacer()
-          if let subtitle = entry.subtitle {
+          if let subtitle = entry.metadata.subtitle {
             Text(subtitle)
               .foregroundColor(.white)
               .padding(8)
@@ -55,7 +34,7 @@ struct ImmichWidgetView: View {
         }
         .padding(16)
       }
-      .widgetURL(entry.deepLink)
+      .widgetURL(entry.metadata.deepLink)
     }
   }
 }
@@ -70,7 +49,9 @@ struct ImmichWidgetView: View {
     ImageEntry(
       date: date,
       image: UIImage(named: "ImmichLogo"),
-      subtitle: "1 year ago"
+      metadata: EntryMetadata(
+        subtitle: "1 year ago"
+      )
     )
   }
 )
diff --git a/mobile/ios/WidgetExtension/ImmichAPI.swift b/mobile/ios/WidgetExtension/ImmichAPI.swift
index 65fc27be77..7cefd9d5ee 100644
--- a/mobile/ios/WidgetExtension/ImmichAPI.swift
+++ b/mobile/ios/WidgetExtension/ImmichAPI.swift
@@ -2,7 +2,7 @@ import Foundation
 import SwiftUI
 import WidgetKit
 
-enum WidgetError: Error {
+enum WidgetError: Error, Codable {
   case noLogin
   case fetchFailed
   case unknown
@@ -23,10 +23,10 @@ extension WidgetError: LocalizedError {
 
     case .albumNotFound:
       return "Album not found"
-        
+
     case .invalidURL:
       return "An invalid URL was used"
-        
+
     case .invalidImage:
       return "An invalid image was received"
 
@@ -46,7 +46,7 @@ enum AssetType: String, Codable {
 struct Asset: Codable {
   let id: String
   let type: AssetType
-  
+
   var deepLink: URL? {
     return URL(string: "immich://asset?id=\(id)")
   }
@@ -75,6 +75,8 @@ struct Album: Codable {
   let albumName: String
 }
 
+let IMMICH_SHARE_GROUP = "group.app.immich.share"
+
 // MARK: API
 
 class ImmichAPI {
@@ -86,7 +88,7 @@ class ImmichAPI {
 
   init() async throws {
     // fetch the credentials from the UserDefaults store that dart placed here
-    guard let defaults = UserDefaults(suiteName: "group.app.immich.share"),
+    guard let defaults = UserDefaults(suiteName: IMMICH_SHARE_GROUP),
       let serverURL = defaults.string(forKey: "widget_server_url"),
       let sessionKey = defaults.string(forKey: "widget_auth_token")
     else {
@@ -189,18 +191,25 @@ class ImmichAPI {
     else {
       throw .invalidURL
     }
-    
-    guard let imageSource = CGImageSourceCreateWithURL(fetchURL as CFURL, nil) else {
+
+    guard let imageSource = CGImageSourceCreateWithURL(fetchURL as CFURL, nil)
+    else {
       throw .invalidURL
     }
 
     let decodeOptions: [NSString: Any] = [
-        kCGImageSourceCreateThumbnailFromImageAlways: true,
-        kCGImageSourceThumbnailMaxPixelSize: 400,
-        kCGImageSourceCreateThumbnailWithTransform: true
+      kCGImageSourceCreateThumbnailFromImageAlways: true,
+      kCGImageSourceThumbnailMaxPixelSize: 400,
+      kCGImageSourceCreateThumbnailWithTransform: true,
     ]
-    
-    guard let thumbnail = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, decodeOptions as CFDictionary) else {
+
+    guard
+      let thumbnail = CGImageSourceCreateThumbnailAtIndex(
+        imageSource,
+        0,
+        decodeOptions as CFDictionary
+      )
+    else {
       throw .fetchFailed
     }
 
diff --git a/mobile/ios/WidgetExtension/UIImage+Resize.swift b/mobile/ios/WidgetExtension/UIImage+Resize.swift
index 40bb9e2ace..030f354ca4 100644
--- a/mobile/ios/WidgetExtension/UIImage+Resize.swift
+++ b/mobile/ios/WidgetExtension/UIImage+Resize.swift
@@ -7,14 +7,17 @@
 import UIKit
 
 extension UIImage {
-    /// Crops the image to ensure width and height do not exceed maxSize.
-    /// Keeps original aspect ratio and crops excess equally from edges (center crop).
-    func resized(toWidth width: CGFloat, isOpaque: Bool = true) -> UIImage? {
-      let canvas = CGSize(width: width, height: CGFloat(ceil(width/size.width * size.height)))
-      let format = imageRendererFormat
-      format.opaque = isOpaque
-      return UIGraphicsImageRenderer(size: canvas, format: format).image {
-        _ in draw(in: CGRect(origin: .zero, size: canvas))
-      }
+  /// Crops the image to ensure width and height do not exceed maxSize.
+  /// Keeps original aspect ratio and crops excess equally from edges (center crop).
+  func resized(toWidth width: CGFloat, isOpaque: Bool = true) -> UIImage? {
+    let canvas = CGSize(
+      width: width,
+      height: CGFloat(ceil(width / size.width * size.height))
+    )
+    let format = imageRendererFormat
+    format.opaque = isOpaque
+    return UIGraphicsImageRenderer(size: canvas, format: format).image {
+      _ in draw(in: CGRect(origin: .zero, size: canvas))
     }
+  }
 }
diff --git a/mobile/ios/WidgetExtension/widgets/MemoryWidget.swift b/mobile/ios/WidgetExtension/widgets/MemoryWidget.swift
index 516bf6905e..da7b887c37 100644
--- a/mobile/ios/WidgetExtension/widgets/MemoryWidget.swift
+++ b/mobile/ios/WidgetExtension/widgets/MemoryWidget.swift
@@ -19,21 +19,23 @@ struct ImmichMemoryProvider: TimelineProvider {
     in context: Context,
     completion: @escaping @Sendable (ImageEntry) -> Void
   ) {
+    let cacheKey = "memory_\(context.family.rawValue)"
+
     Task {
       guard let api = try? await ImmichAPI() else {
-        completion(ImageEntry(date: Date(), image: nil, error: .noLogin))
+        completion(ImageEntry.handleCacheFallback(for: cacheKey, error: .noLogin).entries.first!)
         return
       }
 
       guard let memories = try? await api.fetchMemory(for: Date.now)
       else {
-        completion(ImageEntry(date: Date(), image: nil, error: .fetchFailed))
+        completion(ImageEntry.handleCacheFallback(for: cacheKey).entries.first!)
         return
       }
 
       for memory in memories {
         if let asset = memory.assets.first(where: { $0.type == .image }),
-          var entry = try? await buildEntry(
+          var entry = try? await ImageEntry.build(
             api: api,
             asset: asset,
             dateOffset: 0,
@@ -50,20 +52,14 @@ struct ImmichMemoryProvider: TimelineProvider {
       guard
         let randomImage = try? await api.fetchSearchResults(
           with: SearchFilters(size: 1)
-        ).first
-      else {
-        completion(ImageEntry(date: Date(), image: nil, error: .fetchFailed))
-        return
-      }
-
-      guard
-        var imageEntry = try? await buildEntry(
+        ).first,
+        var imageEntry = try? await ImageEntry.build(
           api: api,
           asset: randomImage,
           dateOffset: 0
         )
       else {
-        completion(ImageEntry(date: Date(), image: nil, error: .fetchFailed))
+        completion(ImageEntry.handleCacheFallback(for: cacheKey).entries.first!)
         return
       }
 
@@ -80,9 +76,12 @@ struct ImmichMemoryProvider: TimelineProvider {
       var entries: [ImageEntry] = []
       let now = Date()
 
+      let cacheKey = "memory_\(context.family.rawValue)"
+
       guard let api = try? await ImmichAPI() else {
-        entries.append(ImageEntry(date: now, image: nil, error: .noLogin))
-        completion(Timeline(entries: entries, policy: .atEnd))
+        completion(
+          ImageEntry.handleCacheFallback(for: cacheKey, error: .noLogin)
+        )
         return
       }
 
@@ -95,7 +94,7 @@ struct ImmichMemoryProvider: TimelineProvider {
           for asset in memory.assets {
             if asset.type == .image && totalAssets < 12 {
               group.addTask {
-                try? await buildEntry(
+                try? await ImageEntry.build(
                   api: api,
                   asset: asset,
                   dateOffset: totalAssets,
@@ -132,7 +131,8 @@ struct ImmichMemoryProvider: TimelineProvider {
       // If we fail to fetch images, we still want to add an entry
       // with a nil image and an error
       if entries.count == 0 {
-        entries.append(ImageEntry(date: now, image: nil, error: .fetchFailed))
+        completion(ImageEntry.handleCacheFallback(for: cacheKey))
+        return
       }
 
       // Resize all images to something that can be stored by iOS
@@ -140,6 +140,9 @@ struct ImmichMemoryProvider: TimelineProvider {
         entries[i].resize()
       }
 
+      // cache the last image
+      try? entries.last!.cache(for: cacheKey)
+
       completion(Timeline(entries: entries, policy: .atEnd))
     }
   }
diff --git a/mobile/ios/WidgetExtension/widgets/RandomWidget.swift b/mobile/ios/WidgetExtension/widgets/RandomWidget.swift
index 99968c4baa..8f9143cedd 100644
--- a/mobile/ios/WidgetExtension/widgets/RandomWidget.swift
+++ b/mobile/ios/WidgetExtension/widgets/RandomWidget.swift
@@ -45,7 +45,7 @@ struct RandomConfigurationAppIntent: WidgetConfigurationIntent {
 
   @Parameter(title: "Album")
   var album: Album?
-  
+
   @Parameter(title: "Show Album Name", default: false)
   var showAlbumName: Bool
 }
@@ -54,7 +54,7 @@ struct RandomConfigurationAppIntent: WidgetConfigurationIntent {
 
 struct ImmichRandomProvider: AppIntentTimelineProvider {
   func placeholder(in context: Context) -> ImageEntry {
-    ImageEntry(date: Date(), image: nil)
+    ImageEntry(date: Date())
   }
 
   func snapshot(
@@ -63,26 +63,23 @@ struct ImmichRandomProvider: AppIntentTimelineProvider {
   ) async
     -> ImageEntry
   {
+    let cacheKey = "random_none_\(context.family.rawValue)"
+    
     guard let api = try? await ImmichAPI() else {
-      return ImageEntry(date: Date(), image: nil, error: .noLogin)
+      return ImageEntry.handleCacheFallback(for: cacheKey, error: .noLogin).entries.first!
     }
 
     guard
       let randomImage = try? await api.fetchSearchResults(
         with: SearchFilters(size: 1)
-      ).first
-    else {
-      return ImageEntry(date: Date(), image: nil, error: .fetchFailed)
-    }
-
-    guard
-      var entry = try? await buildEntry(
+      ).first,
+      var entry = try? await ImageEntry.build(
         api: api,
         asset: randomImage,
         dateOffset: 0
       )
     else {
-      return ImageEntry(date: Date(), image: nil, error: .fetchFailed)
+      return ImageEntry.handleCacheFallback(for: cacheKey).entries.first!
     }
 
     entry.resize()
@@ -99,30 +96,34 @@ struct ImmichRandomProvider: AppIntentTimelineProvider {
     var entries: [ImageEntry] = []
     let now = Date()
 
-    // If we don't have a server config, return an entry with an error
-    guard let api = try? await ImmichAPI() else {
-      entries.append(ImageEntry(date: now, image: nil, error: .noLogin))
-      return Timeline(entries: entries, policy: .atEnd)
-    }
-
     // nil if album is NONE or nil
     let albumId =
       configuration.album?.id != "NONE" ? configuration.album?.id : nil
-    var albumName: String? = albumId != nil ? configuration.album?.albumName : nil
-    
+    let albumName: String? =
+      albumId != nil ? configuration.album?.albumName : nil
+
+    let cacheKey = "random_\(albumId ?? "none")_\(context.family.rawValue)"
+
+    // If we don't have a server config, return an entry with an error
+    guard let api = try? await ImmichAPI() else {
+      return ImageEntry.handleCacheFallback(for: cacheKey, error: .noLogin)
+    }
+
     if albumId != nil {
       // make sure the album exists on server, otherwise show error
       guard let albums = try? await api.fetchAlbums() else {
-        entries.append(ImageEntry(date: now, image: nil, error: .fetchFailed))
-        return Timeline(entries: entries, policy: .atEnd)
+        return ImageEntry.handleCacheFallback(for: cacheKey)
       }
 
       if !albums.contains(where: { $0.id == albumId }) {
-        entries.append(ImageEntry(date: now, image: nil, error: .albumNotFound))
-        return Timeline(entries: entries, policy: .atEnd)
+        return ImageEntry.handleCacheFallback(
+          for: cacheKey,
+          error: .albumNotFound
+        )
       }
     }
 
+    // build entries
     entries.append(
       contentsOf: (try? await generateRandomEntries(
         api: api,
@@ -134,9 +135,9 @@ struct ImmichRandomProvider: AppIntentTimelineProvider {
         ?? []
     )
 
-    // If we fail to fetch images, we still want to add an entry with a nil image and an error
+    // Load or save a cached asset for when network conditions are bad
     if entries.count == 0 {
-      entries.append(ImageEntry(date: now, image: nil, error: .fetchFailed))
+      return ImageEntry.handleCacheFallback(for: cacheKey)
     }
 
     // Resize all images to something that can be stored by iOS
@@ -144,6 +145,9 @@ struct ImmichRandomProvider: AppIntentTimelineProvider {
       entries[i].resize()
     }
 
+    // cache the last image
+    try? entries.last!.cache(for: cacheKey)
+
     return Timeline(entries: entries, policy: .atEnd)
   }
 }

From fd48a3368648296fabf408732c1339ac9d261494 Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Wed, 9 Jul 2025 22:16:09 +0300
Subject: [PATCH 164/337] refactor(mobile): image thumbnails (#19821)

* image thumbnail refactor

* minor const-ification in new thumbnail tile

* underscore helper classes

---------

Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
---
 .../domain/models/asset/base_asset.model.dart |   8 +
 .../lib/extensions/duration_extensions.dart   |  12 +
 .../widgets/images/thumbnail_tile.widget.dart |  72 ++-
 mobile/lib/utils/storage_indicator.dart       |   9 -
 .../widgets/asset_grid/thumbnail_image.dart   | 430 +++++++++++-------
 .../asset_viewer/formatted_duration.dart      |  14 +-
 6 files changed, 317 insertions(+), 228 deletions(-)
 delete mode 100644 mobile/lib/utils/storage_indicator.dart

diff --git a/mobile/lib/domain/models/asset/base_asset.model.dart b/mobile/lib/domain/models/asset/base_asset.model.dart
index fb67b298c1..fad1f1961a 100644
--- a/mobile/lib/domain/models/asset/base_asset.model.dart
+++ b/mobile/lib/domain/models/asset/base_asset.model.dart
@@ -43,6 +43,14 @@ sealed class BaseAsset {
   bool get isImage => type == AssetType.image;
   bool get isVideo => type == AssetType.video;
 
+  Duration get duration {
+    final durationInSeconds = this.durationInSeconds;
+    if (durationInSeconds != null) {
+      return Duration(seconds: durationInSeconds);
+    }
+    return const Duration();
+  }
+
   bool get hasRemote =>
       storage == AssetState.remote || storage == AssetState.merged;
   bool get hasLocal =>
diff --git a/mobile/lib/extensions/duration_extensions.dart b/mobile/lib/extensions/duration_extensions.dart
index ca5ba8310c..492627a727 100644
--- a/mobile/lib/extensions/duration_extensions.dart
+++ b/mobile/lib/extensions/duration_extensions.dart
@@ -3,3 +3,15 @@ extension TZOffsetExtension on Duration {
   String formatAsOffset() =>
       "${isNegative ? '-' : '+'}${inHours.abs().toString().padLeft(2, '0')}:${inMinutes.abs().remainder(60).toString().padLeft(2, '0')}";
 }
+
+extension DurationFormatExtension on Duration {
+  String format() {
+    final seconds = inSeconds.remainder(60).toString().padLeft(2, '0');
+    final minutes = inMinutes.remainder(60).toString().padLeft(2, '0');
+    if (inHours == 0) {
+      return "$minutes:$seconds";
+    }
+    final hours = inHours.toString().padLeft(2, '0');
+    return "$hours:$minutes:$seconds";
+  }
+}
diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index 9d7fae817e..d7261c927e 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/duration_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -76,23 +77,33 @@ class ThumbnailTile extends ConsumerWidget {
                     alignment: Alignment.topRight,
                     child: Padding(
                       padding: const EdgeInsets.only(right: 10.0, top: 6.0),
-                      child: _VideoIndicator(asset.durationInSeconds ?? 0),
+                      child: _VideoIndicator(asset.duration),
                     ),
                   ),
                 if (showStorageIndicator)
-                  Align(
-                    alignment: Alignment.bottomRight,
-                    child: Padding(
-                      padding: const EdgeInsets.only(right: 10.0, bottom: 6.0),
-                      child: _TileOverlayIcon(
-                        switch (asset.storage) {
-                          AssetState.local => Icons.cloud_off_outlined,
-                          AssetState.remote => Icons.cloud_outlined,
-                          AssetState.merged => Icons.cloud_done_outlined,
-                        },
+                  switch (asset.storage) {
+                    AssetState.local => const Align(
+                        alignment: Alignment.bottomRight,
+                        child: Padding(
+                          padding: EdgeInsets.only(right: 10.0, bottom: 6.0),
+                          child: _TileOverlayIcon(Icons.cloud_off_outlined),
+                        ),
                       ),
-                    ),
-                  ),
+                    AssetState.remote => const Align(
+                        alignment: Alignment.bottomRight,
+                        child: Padding(
+                          padding: EdgeInsets.only(right: 10.0, bottom: 6.0),
+                          child: _TileOverlayIcon(Icons.cloud_outlined),
+                        ),
+                      ),
+                    AssetState.merged => const Align(
+                        alignment: Alignment.bottomRight,
+                        child: Padding(
+                          padding: EdgeInsets.only(right: 10.0, bottom: 6.0),
+                          child: _TileOverlayIcon(Icons.cloud_done_outlined),
+                        ),
+                      ),
+                  },
                 if (asset.isFavorite)
                   const Align(
                     alignment: Alignment.bottomLeft,
@@ -138,7 +149,7 @@ class _SelectionIndicator extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     if (isLocked) {
-      return Container(
+      return DecoratedBox(
         decoration: BoxDecoration(
           shape: BoxShape.circle,
           color: color,
@@ -149,7 +160,7 @@ class _SelectionIndicator extends StatelessWidget {
         ),
       );
     } else if (isSelected) {
-      return Container(
+      return DecoratedBox(
         decoration: BoxDecoration(
           shape: BoxShape.circle,
           color: color,
@@ -169,23 +180,8 @@ class _SelectionIndicator extends StatelessWidget {
 }
 
 class _VideoIndicator extends StatelessWidget {
-  final int durationInSeconds;
-  const _VideoIndicator(this.durationInSeconds);
-
-  String _formatDuration(int durationInSec) {
-    final int hours = durationInSec ~/ 3600;
-    final int minutes = (durationInSec % 3600) ~/ 60;
-    final int seconds = durationInSec % 60;
-
-    final String minutesPadded = minutes.toString().padLeft(2, '0');
-    final String secondsPadded = seconds.toString().padLeft(2, '0');
-
-    if (hours > 0) {
-      return "$hours:$minutesPadded:$secondsPadded"; // H:MM:SS
-    } else {
-      return "$minutesPadded:$secondsPadded"; // MM:SS
-    }
-  }
+  final Duration duration;
+  const _VideoIndicator(this.duration);
 
   @override
   Widget build(BuildContext context) {
@@ -197,15 +193,15 @@ class _VideoIndicator extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.end,
       children: [
         Text(
-          _formatDuration(durationInSeconds),
-          style: TextStyle(
+          duration.format(),
+          style: const TextStyle(
             color: Colors.white,
             fontSize: 12,
             fontWeight: FontWeight.bold,
             shadows: [
               Shadow(
                 blurRadius: 5.0,
-                color: Colors.black.withValues(alpha: 0.6),
+                color: Color.fromRGBO(0, 0, 0, 0.6),
               ),
             ],
           ),
@@ -228,10 +224,10 @@ class _TileOverlayIcon extends StatelessWidget {
       color: Colors.white,
       size: 16,
       shadows: [
-        Shadow(
+        const Shadow(
           blurRadius: 5.0,
-          color: Colors.black.withValues(alpha: 0.6),
-          offset: const Offset(0.0, 0.0),
+          color: Color.fromRGBO(0, 0, 0, 0.6),
+          offset: Offset(0.0, 0.0),
         ),
       ],
     );
diff --git a/mobile/lib/utils/storage_indicator.dart b/mobile/lib/utils/storage_indicator.dart
deleted file mode 100644
index a7dad063ca..0000000000
--- a/mobile/lib/utils/storage_indicator.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-
-/// Returns the suitable [IconData] to represent an [Asset]s storage location
-IconData storageIcon(Asset asset) => switch (asset.storage) {
-      AssetState.local => Icons.cloud_off_outlined,
-      AssetState.remote => Icons.cloud_outlined,
-      AssetState.merged => Icons.cloud_done_outlined,
-    };
diff --git a/mobile/lib/widgets/asset_grid/thumbnail_image.dart b/mobile/lib/widgets/asset_grid/thumbnail_image.dart
index 25f65b448c..5b98c8a756 100644
--- a/mobile/lib/widgets/asset_grid/thumbnail_image.dart
+++ b/mobile/lib/widgets/asset_grid/thumbnail_image.dart
@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/extensions/duration_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/widgets/common/immich_thumbnail.dart';
-import 'package:immich_mobile/utils/storage_indicator.dart';
 
-class ThumbnailImage extends ConsumerWidget {
+class ThumbnailImage extends StatelessWidget {
   /// The asset to show the thumbnail image for
   final Asset asset;
 
@@ -41,144 +40,10 @@ class ThumbnailImage extends ConsumerWidget {
   });
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
     final assetContainerColor = context.isDarkTheme
         ? context.primaryColor.darken(amount: 0.6)
         : context.primaryColor.lighten(amount: 0.8);
-    // Assets from response DTOs do not have an isar id, querying which would give us the default autoIncrement id
-    final isFromDto = asset.id == noDbId;
-
-    Widget buildSelectionIcon() {
-      if (isSelected) {
-        return Container(
-          decoration: BoxDecoration(
-            shape: BoxShape.circle,
-            color: assetContainerColor,
-          ),
-          child: Icon(
-            Icons.check_circle_rounded,
-            color: context.primaryColor,
-          ),
-        );
-      } else {
-        return const Icon(
-          Icons.circle_outlined,
-          color: Colors.white,
-        );
-      }
-    }
-
-    Widget buildVideoIcon() {
-      final minutes = asset.duration.inMinutes;
-      final durationString = asset.duration.toString();
-      return Positioned(
-        top: 5,
-        right: 8,
-        child: Row(
-          children: [
-            Text(
-              minutes > 59
-                  ? durationString.substring(0, 7) // h:mm:ss
-                  : minutes > 0
-                      ? durationString.substring(2, 7) // mm:ss
-                      : durationString.substring(3, 7), // m:ss
-              style: const TextStyle(
-                color: Colors.white,
-                fontSize: 10,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-            const SizedBox(
-              width: 3,
-            ),
-            const Icon(
-              Icons.play_circle_fill_rounded,
-              color: Colors.white,
-              size: 18,
-            ),
-          ],
-        ),
-      );
-    }
-
-    Widget buildStackIcon() {
-      return Positioned(
-        top: !asset.isImage ? 28 : 5,
-        right: 8,
-        child: Row(
-          children: [
-            if (asset.stackCount > 1)
-              Text(
-                "${asset.stackCount}",
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontSize: 10,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            if (asset.stackCount > 1)
-              const SizedBox(
-                width: 3,
-              ),
-            const Icon(
-              Icons.burst_mode_rounded,
-              color: Colors.white,
-              size: 18,
-            ),
-          ],
-        ),
-      );
-    }
-
-    Widget buildImage() {
-      final image = SizedBox.expand(
-        child: Hero(
-          tag: isFromDto
-              ? '${asset.remoteId}-$heroOffset'
-              : asset.id + heroOffset,
-          child: Stack(
-            children: [
-              SizedBox.expand(
-                child: ImmichThumbnail(
-                  asset: asset,
-                  height: 250,
-                  width: 250,
-                ),
-              ),
-              Container(
-                decoration: const BoxDecoration(
-                  gradient: LinearGradient(
-                    colors: [
-                      Color.fromRGBO(0, 0, 0, 0.1),
-                      Colors.transparent,
-                      Colors.transparent,
-                      Color.fromRGBO(0, 0, 0, 0.1),
-                    ],
-                    begin: Alignment.topCenter,
-                    end: Alignment.bottomCenter,
-                    stops: [0, 0.3, 0.6, 1],
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      );
-      if (!multiselectEnabled || !isSelected) {
-        return image;
-      }
-      return Container(
-        decoration: BoxDecoration(
-          color: canDeselect ? assetContainerColor : Colors.grey,
-        ),
-        child: ClipRRect(
-          borderRadius: const BorderRadius.all(
-            Radius.circular(15.0),
-          ),
-          child: image,
-        ),
-      );
-    }
 
     return Stack(
       children: [
@@ -187,32 +52,30 @@ class ThumbnailImage extends ConsumerWidget {
           curve: Curves.decelerate,
           decoration: BoxDecoration(
             border: multiselectEnabled && isSelected
-                ? Border.all(
-                    color: canDeselect ? assetContainerColor : Colors.grey,
-                    width: 8,
-                  )
+                ? canDeselect
+                    ? Border.all(
+                        color: assetContainerColor,
+                        width: 8,
+                      )
+                    : const Border(
+                        top: BorderSide(color: Colors.grey, width: 8),
+                        right: BorderSide(color: Colors.grey, width: 8),
+                        bottom: BorderSide(color: Colors.grey, width: 8),
+                        left: BorderSide(color: Colors.grey, width: 8),
+                      )
                 : const Border(),
           ),
           child: Stack(
             children: [
-              buildImage(),
-              if (showStorageIndicator)
-                Positioned(
-                  right: 8,
-                  bottom: 5,
-                  child: Icon(
-                    storageIcon(asset),
-                    color: Colors.white.withValues(alpha: .8),
-                    size: 16,
-                    shadows: [
-                      Shadow(
-                        blurRadius: 5.0,
-                        color: Colors.black.withValues(alpha: 0.6),
-                        offset: const Offset(0.0, 0.0),
-                      ),
-                    ],
-                  ),
-                ),
+              _ImageIcon(
+                heroOffset: heroOffset,
+                asset: asset,
+                assetContainerColor: assetContainerColor,
+                multiselectEnabled: multiselectEnabled,
+                canDeselect: canDeselect,
+                isSelected: isSelected,
+              ),
+              if (showStorageIndicator) _StorageIcon(storage: asset.storage),
               if (asset.isFavorite)
                 const Positioned(
                   left: 8,
@@ -223,20 +86,249 @@ class ThumbnailImage extends ConsumerWidget {
                     size: 16,
                   ),
                 ),
-              if (!asset.isImage) buildVideoIcon(),
-              if (asset.stackCount > 0) buildStackIcon(),
+              if (asset.isVideo) _VideoIcon(duration: asset.duration),
+              if (asset.stackCount > 0)
+                _StackIcon(
+                  isVideo: asset.isVideo,
+                  stackCount: asset.stackCount,
+                ),
             ],
           ),
         ),
         if (multiselectEnabled)
-          Padding(
-            padding: const EdgeInsets.all(3.0),
-            child: Align(
-              alignment: Alignment.topLeft,
-              child: buildSelectionIcon(),
-            ),
-          ),
+          isSelected
+              ? const Padding(
+                  padding: EdgeInsets.all(3.0),
+                  child: Align(
+                    alignment: Alignment.topLeft,
+                    child: _SelectedIcon(),
+                  ),
+                )
+              : const Icon(
+                  Icons.circle_outlined,
+                  color: Colors.white,
+                ),
       ],
     );
   }
 }
+
+class _SelectedIcon extends StatelessWidget {
+  const _SelectedIcon();
+
+  @override
+  Widget build(BuildContext context) {
+    final assetContainerColor = context.isDarkTheme
+        ? context.primaryColor.darken(amount: 0.6)
+        : context.primaryColor.lighten(amount: 0.8);
+
+    return DecoratedBox(
+      decoration: BoxDecoration(
+        shape: BoxShape.circle,
+        color: assetContainerColor,
+      ),
+      child: Icon(
+        Icons.check_circle_rounded,
+        color: context.primaryColor,
+      ),
+    );
+  }
+}
+
+class _VideoIcon extends StatelessWidget {
+  final Duration duration;
+
+  const _VideoIcon({required this.duration});
+
+  @override
+  Widget build(BuildContext context) {
+    return Positioned(
+      top: 5,
+      right: 8,
+      child: Row(
+        children: [
+          Text(
+            duration.format(),
+            style: const TextStyle(
+              color: Colors.white,
+              fontSize: 10,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          const SizedBox(width: 3),
+          const Icon(
+            Icons.play_circle_fill_rounded,
+            color: Colors.white,
+            size: 18,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _StackIcon extends StatelessWidget {
+  final bool isVideo;
+  final int stackCount;
+
+  const _StackIcon({required this.isVideo, required this.stackCount});
+
+  @override
+  Widget build(BuildContext context) {
+    return Positioned(
+      top: isVideo ? 28 : 5,
+      right: 8,
+      child: Row(
+        children: [
+          if (stackCount > 1)
+            Text(
+              "$stackCount",
+              style: const TextStyle(
+                color: Colors.white,
+                fontSize: 10,
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+          if (stackCount > 1)
+            const SizedBox(
+              width: 3,
+            ),
+          const Icon(
+            Icons.burst_mode_rounded,
+            color: Colors.white,
+            size: 18,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _StorageIcon extends StatelessWidget {
+  final AssetState storage;
+
+  const _StorageIcon({required this.storage});
+
+  @override
+  Widget build(BuildContext context) {
+    return switch (storage) {
+      AssetState.local => const Positioned(
+          right: 8,
+          bottom: 5,
+          child: Icon(
+            Icons.cloud_off_outlined,
+            color: Color.fromRGBO(255, 255, 255, 0.8),
+            size: 16,
+            shadows: [
+              Shadow(
+                blurRadius: 5.0,
+                color: Color.fromRGBO(0, 0, 0, 0.6),
+                offset: Offset(0.0, 0.0),
+              ),
+            ],
+          ),
+        ),
+      AssetState.remote => const Positioned(
+          right: 8,
+          bottom: 5,
+          child: Icon(
+            Icons.cloud_outlined,
+            color: Color.fromRGBO(255, 255, 255, 0.8),
+            size: 16,
+            shadows: [
+              Shadow(
+                blurRadius: 5.0,
+                color: Color.fromRGBO(0, 0, 0, 0.6),
+                offset: Offset(0.0, 0.0),
+              ),
+            ],
+          ),
+        ),
+      AssetState.merged => const Positioned(
+          right: 8,
+          bottom: 5,
+          child: Icon(
+            Icons.cloud_done_outlined,
+            color: Color.fromRGBO(255, 255, 255, 0.8),
+            size: 16,
+            shadows: [
+              Shadow(
+                blurRadius: 5.0,
+                color: Color.fromRGBO(0, 0, 0, 0.6),
+                offset: Offset(0.0, 0.0),
+              ),
+            ],
+          ),
+        ),
+    };
+  }
+}
+
+class _ImageIcon extends StatelessWidget {
+  final int heroOffset;
+  final Asset asset;
+  final Color assetContainerColor;
+  final bool multiselectEnabled;
+  final bool canDeselect;
+  final bool isSelected;
+
+  const _ImageIcon({
+    required this.heroOffset,
+    required this.asset,
+    required this.assetContainerColor,
+    required this.multiselectEnabled,
+    required this.canDeselect,
+    required this.isSelected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    // Assets from response DTOs do not have an isar id, querying which would give us the default autoIncrement id
+    final isDto = asset.id == noDbId;
+    final image = SizedBox.expand(
+      child: Hero(
+        tag: isDto ? '${asset.remoteId}-$heroOffset' : asset.id + heroOffset,
+        child: Stack(
+          children: [
+            SizedBox.expand(
+              child: ImmichThumbnail(
+                asset: asset,
+                height: 250,
+                width: 250,
+              ),
+            ),
+            const DecoratedBox(
+              decoration: BoxDecoration(
+                gradient: LinearGradient(
+                  colors: [
+                    Color.fromRGBO(0, 0, 0, 0.1),
+                    Colors.transparent,
+                    Colors.transparent,
+                    Color.fromRGBO(0, 0, 0, 0.1),
+                  ],
+                  begin: Alignment.topCenter,
+                  end: Alignment.bottomCenter,
+                  stops: [0, 0.3, 0.6, 1],
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+
+    if (!multiselectEnabled || !isSelected) {
+      return image;
+    }
+
+    return DecoratedBox(
+      decoration: canDeselect
+          ? BoxDecoration(color: assetContainerColor)
+          : const BoxDecoration(color: Colors.grey),
+      child: ClipRRect(
+        borderRadius: const BorderRadius.all(Radius.circular(15.0)),
+        child: image,
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/widgets/asset_viewer/formatted_duration.dart b/mobile/lib/widgets/asset_viewer/formatted_duration.dart
index a34aab7d12..d18dc92575 100644
--- a/mobile/lib/widgets/asset_viewer/formatted_duration.dart
+++ b/mobile/lib/widgets/asset_viewer/formatted_duration.dart
@@ -1,15 +1,5 @@
 import 'package:flutter/material.dart';
-
-@pragma('vm:prefer-inline')
-String _formatDuration(Duration position) {
-  final seconds = position.inSeconds.remainder(60).toString().padLeft(2, "0");
-  final minutes = position.inMinutes.remainder(60).toString().padLeft(2, "0");
-  if (position.inHours == 0) {
-    return "$minutes:$seconds";
-  }
-  final hours = position.inHours.toString().padLeft(2, '0');
-  return "$hours:$minutes:$seconds";
-}
+import 'package:immich_mobile/extensions/duration_extensions.dart';
 
 class FormattedDuration extends StatelessWidget {
   final Duration data;
@@ -20,7 +10,7 @@ class FormattedDuration extends StatelessWidget {
     return SizedBox(
       width: data.inHours > 0 ? 70 : 60, // use a fixed width to prevent jitter
       child: Text(
-        _formatDuration(data),
+        data.format(),
         style: const TextStyle(
           fontSize: 14.0,
           color: Colors.white,

From 818bdde317096396db126423cb45a19ae792b582 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Wed, 9 Jul 2025 19:22:01 -0400
Subject: [PATCH 165/337] chore: update base images (#19741)

Update base images
---
 server/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/Dockerfile b/server/Dockerfile
index 3fc57b7db0..2f2749ada0 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,7 +1,6 @@
 # dev build
 FROM ghcr.io/immich-app/base-server-dev:202507091427@sha256:733e510024e03bc2450608a1f3622f45bf287b70d89a06e60acbccea4bf4fd8c AS dev
 
-RUN apt-get install --no-install-recommends -yqq tini
 WORKDIR /usr/src/app
 COPY server/package.json server/package-lock.json ./
 RUN npm ci && \

From f778adea92386dc498d7b0e7e22482382e27fe3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9opold=20Koprivnik?= <skwal.net@gmail.com>
Date: Thu, 10 Jul 2025 16:28:20 +0200
Subject: [PATCH 166/337] feat: adds option to search only for untagged assets
 (#19730)

Co-authored-by: SkwalExe <skwal@skwal.net>
---
 i18n/en.json                                  |  1 +
 .../lib/model/metadata_search_dto.dart        |  8 +++++--
 .../openapi/lib/model/random_search_dto.dart  |  8 +++++--
 .../openapi/lib/model/smart_search_dto.dart   |  8 +++++--
 .../lib/model/statistics_search_dto.dart      |  8 +++++--
 open-api/immich-openapi-specs.json            |  4 ++++
 open-api/typescript-sdk/src/fetch-client.ts   |  8 +++----
 server/src/dtos/search.dto.ts                 |  4 ++--
 server/src/repositories/search.repository.ts  |  2 +-
 server/src/utils/database.ts                  |  3 +++
 .../shared-components/combobox.svelte         |  3 +++
 .../search-bar/search-tags-section.svelte     | 23 ++++++++++++++++---
 web/src/lib/modals/SearchFilterModal.svelte   | 11 ++++++---
 .../[[assetId=id]]/+page.svelte               |  7 ++++--
 14 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index e5c995f957..352c8a24b6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1886,6 +1886,7 @@
   "unselect_all_in": "Unselect all in {group}",
   "unstack": "Un-stack",
   "unstacked_assets_count": "Un-stacked {count, plural, one {# asset} other {# assets}}",
+  "untagged": "Untagged",
   "up_next": "Up next",
   "updated_at": "Updated",
   "updated_password": "Updated password",
diff --git a/mobile/openapi/lib/model/metadata_search_dto.dart b/mobile/openapi/lib/model/metadata_search_dto.dart
index 520777a45d..b7e637d4b4 100644
--- a/mobile/openapi/lib/model/metadata_search_dto.dart
+++ b/mobile/openapi/lib/model/metadata_search_dto.dart
@@ -241,7 +241,7 @@ class MetadataSearchDto {
 
   String? state;
 
-  List<String> tagIds;
+  List<String>? tagIds;
 
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -425,7 +425,7 @@ class MetadataSearchDto {
     (rating == null ? 0 : rating!.hashCode) +
     (size == null ? 0 : size!.hashCode) +
     (state == null ? 0 : state!.hashCode) +
-    (tagIds.hashCode) +
+    (tagIds == null ? 0 : tagIds!.hashCode) +
     (takenAfter == null ? 0 : takenAfter!.hashCode) +
     (takenBefore == null ? 0 : takenBefore!.hashCode) +
     (thumbnailPath == null ? 0 : thumbnailPath!.hashCode) +
@@ -578,7 +578,11 @@ class MetadataSearchDto {
     } else {
     //  json[r'state'] = null;
     }
+    if (this.tagIds != null) {
       json[r'tagIds'] = this.tagIds;
+    } else {
+    //  json[r'tagIds'] = null;
+    }
     if (this.takenAfter != null) {
       json[r'takenAfter'] = this.takenAfter!.toUtc().toIso8601String();
     } else {
diff --git a/mobile/openapi/lib/model/random_search_dto.dart b/mobile/openapi/lib/model/random_search_dto.dart
index c5914f9fa3..98cc715af4 100644
--- a/mobile/openapi/lib/model/random_search_dto.dart
+++ b/mobile/openapi/lib/model/random_search_dto.dart
@@ -155,7 +155,7 @@ class RandomSearchDto {
 
   String? state;
 
-  List<String> tagIds;
+  List<String>? tagIds;
 
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -310,7 +310,7 @@ class RandomSearchDto {
     (rating == null ? 0 : rating!.hashCode) +
     (size == null ? 0 : size!.hashCode) +
     (state == null ? 0 : state!.hashCode) +
-    (tagIds.hashCode) +
+    (tagIds == null ? 0 : tagIds!.hashCode) +
     (takenAfter == null ? 0 : takenAfter!.hashCode) +
     (takenBefore == null ? 0 : takenBefore!.hashCode) +
     (trashedAfter == null ? 0 : trashedAfter!.hashCode) +
@@ -416,7 +416,11 @@ class RandomSearchDto {
     } else {
     //  json[r'state'] = null;
     }
+    if (this.tagIds != null) {
       json[r'tagIds'] = this.tagIds;
+    } else {
+    //  json[r'tagIds'] = null;
+    }
     if (this.takenAfter != null) {
       json[r'takenAfter'] = this.takenAfter!.toUtc().toIso8601String();
     } else {
diff --git a/mobile/openapi/lib/model/smart_search_dto.dart b/mobile/openapi/lib/model/smart_search_dto.dart
index c221340553..0d16b56d74 100644
--- a/mobile/openapi/lib/model/smart_search_dto.dart
+++ b/mobile/openapi/lib/model/smart_search_dto.dart
@@ -175,7 +175,7 @@ class SmartSearchDto {
 
   String? state;
 
-  List<String> tagIds;
+  List<String>? tagIds;
 
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -318,7 +318,7 @@ class SmartSearchDto {
     (rating == null ? 0 : rating!.hashCode) +
     (size == null ? 0 : size!.hashCode) +
     (state == null ? 0 : state!.hashCode) +
-    (tagIds.hashCode) +
+    (tagIds == null ? 0 : tagIds!.hashCode) +
     (takenAfter == null ? 0 : takenAfter!.hashCode) +
     (takenBefore == null ? 0 : takenBefore!.hashCode) +
     (trashedAfter == null ? 0 : trashedAfter!.hashCode) +
@@ -433,7 +433,11 @@ class SmartSearchDto {
     } else {
     //  json[r'state'] = null;
     }
+    if (this.tagIds != null) {
       json[r'tagIds'] = this.tagIds;
+    } else {
+    //  json[r'tagIds'] = null;
+    }
     if (this.takenAfter != null) {
       json[r'takenAfter'] = this.takenAfter!.toUtc().toIso8601String();
     } else {
diff --git a/mobile/openapi/lib/model/statistics_search_dto.dart b/mobile/openapi/lib/model/statistics_search_dto.dart
index 55de23ba32..73d80c9e36 100644
--- a/mobile/openapi/lib/model/statistics_search_dto.dart
+++ b/mobile/openapi/lib/model/statistics_search_dto.dart
@@ -149,7 +149,7 @@ class StatisticsSearchDto {
 
   String? state;
 
-  List<String> tagIds;
+  List<String>? tagIds;
 
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -268,7 +268,7 @@ class StatisticsSearchDto {
     (personIds.hashCode) +
     (rating == null ? 0 : rating!.hashCode) +
     (state == null ? 0 : state!.hashCode) +
-    (tagIds.hashCode) +
+    (tagIds == null ? 0 : tagIds!.hashCode) +
     (takenAfter == null ? 0 : takenAfter!.hashCode) +
     (takenBefore == null ? 0 : takenBefore!.hashCode) +
     (trashedAfter == null ? 0 : trashedAfter!.hashCode) +
@@ -370,7 +370,11 @@ class StatisticsSearchDto {
     } else {
     //  json[r'state'] = null;
     }
+    if (this.tagIds != null) {
       json[r'tagIds'] = this.tagIds;
+    } else {
+    //  json[r'tagIds'] = null;
+    }
     if (this.takenAfter != null) {
       json[r'takenAfter'] = this.takenAfter!.toUtc().toIso8601String();
     } else {
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 7a44a5cf6f..1624d0ed7e 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -11203,6 +11203,7 @@
               "format": "uuid",
               "type": "string"
             },
+            "nullable": true,
             "type": "array"
           },
           "takenAfter": {
@@ -12092,6 +12093,7 @@
               "format": "uuid",
               "type": "string"
             },
+            "nullable": true,
             "type": "array"
           },
           "takenAfter": {
@@ -13157,6 +13159,7 @@
               "format": "uuid",
               "type": "string"
             },
+            "nullable": true,
             "type": "array"
           },
           "takenAfter": {
@@ -13348,6 +13351,7 @@
               "format": "uuid",
               "type": "string"
             },
+            "nullable": true,
             "type": "array"
           },
           "takenAfter": {
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 9eb9990d2c..55991b8599 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -889,7 +889,7 @@ export type MetadataSearchDto = {
     rating?: number;
     size?: number;
     state?: string | null;
-    tagIds?: string[];
+    tagIds?: string[] | null;
     takenAfter?: string;
     takenBefore?: string;
     thumbnailPath?: string;
@@ -956,7 +956,7 @@ export type RandomSearchDto = {
     rating?: number;
     size?: number;
     state?: string | null;
-    tagIds?: string[];
+    tagIds?: string[] | null;
     takenAfter?: string;
     takenBefore?: string;
     trashedAfter?: string;
@@ -993,7 +993,7 @@ export type SmartSearchDto = {
     rating?: number;
     size?: number;
     state?: string | null;
-    tagIds?: string[];
+    tagIds?: string[] | null;
     takenAfter?: string;
     takenBefore?: string;
     trashedAfter?: string;
@@ -1025,7 +1025,7 @@ export type StatisticsSearchDto = {
     personIds?: string[];
     rating?: number;
     state?: string | null;
-    tagIds?: string[];
+    tagIds?: string[] | null;
     takenAfter?: string;
     takenBefore?: string;
     trashedAfter?: string;
diff --git a/server/src/dtos/search.dto.ts b/server/src/dtos/search.dto.ts
index d0427ef322..0024a1b34e 100644
--- a/server/src/dtos/search.dto.ts
+++ b/server/src/dtos/search.dto.ts
@@ -92,8 +92,8 @@ class BaseSearchDto {
   @ValidateUUID({ each: true, optional: true })
   personIds?: string[];
 
-  @ValidateUUID({ each: true, optional: true })
-  tagIds?: string[];
+  @ValidateUUID({ each: true, optional: true, nullable: true })
+  tagIds?: string[] | null;
 
   @ValidateUUID({ each: true, optional: true })
   albumIds?: string[];
diff --git a/server/src/repositories/search.repository.ts b/server/src/repositories/search.repository.ts
index 9026b795ca..b354e33e57 100644
--- a/server/src/repositories/search.repository.ts
+++ b/server/src/repositories/search.repository.ts
@@ -89,7 +89,7 @@ export interface SearchPeopleOptions {
 }
 
 export interface SearchTagOptions {
-  tagIds?: string[];
+  tagIds?: string[] | null;
 }
 
 export interface SearchAlbumOptions {
diff --git a/server/src/utils/database.ts b/server/src/utils/database.ts
index 191e02eb63..3d6f7b12a5 100644
--- a/server/src/utils/database.ts
+++ b/server/src/utils/database.ts
@@ -307,6 +307,9 @@ export function searchAssetBuilder(kysely: Kysely<DB>, options: AssetSearchBuild
     .where('assets.visibility', '=', visibility)
     .$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', '=', 'assets.id')))),
+    )
     .$if(!!options.personIds && options.personIds.length > 0, (qb) => hasPeople(qb, options.personIds!))
     .$if(!!options.createdBefore, (qb) => qb.where('assets.createdAt', '<=', options.createdBefore!))
     .$if(!!options.createdAfter, (qb) => qb.where('assets.createdAt', '>=', options.createdAfter!))
diff --git a/web/src/lib/components/shared-components/combobox.svelte b/web/src/lib/components/shared-components/combobox.svelte
index 2b3dd23cd4..ce6f8482f2 100644
--- a/web/src/lib/components/shared-components/combobox.svelte
+++ b/web/src/lib/components/shared-components/combobox.svelte
@@ -33,6 +33,7 @@
 
   interface Props {
     label: string;
+    disabled?: boolean;
     hideLabel?: boolean;
     options?: ComboBoxOption[];
     selectedOption?: ComboBoxOption | undefined;
@@ -52,6 +53,7 @@
   let {
     label,
     hideLabel = false,
+    disabled = false,
     options = [],
     selectedOption = $bindable(),
     placeholder = '',
@@ -275,6 +277,7 @@
 
     <input
       {placeholder}
+      {disabled}
       aria-activedescendant={selectedIndex || selectedIndex === 0 ? `${listboxId}-${selectedIndex}` : ''}
       aria-autocomplete="list"
       aria-controls={listboxId}
diff --git a/web/src/lib/components/shared-components/search-bar/search-tags-section.svelte b/web/src/lib/components/shared-components/search-bar/search-tags-section.svelte
index 98ef37db08..1afba7ea53 100644
--- a/web/src/lib/components/shared-components/search-bar/search-tags-section.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-tags-section.svelte
@@ -3,13 +3,14 @@
   import Combobox, { type ComboBoxOption } from '$lib/components/shared-components/combobox.svelte';
   import { preferences } from '$lib/stores/user.store';
   import { getAllTags, type TagResponseDto } from '@immich/sdk';
+  import { Checkbox, Label } from '@immich/ui';
   import { mdiClose } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
   import { SvelteSet } from 'svelte/reactivity';
 
   interface Props {
-    selectedTags: SvelteSet<string>;
+    selectedTags: SvelteSet<string> | null;
   }
 
   let { selectedTags = $bindable() }: Props = $props();
@@ -23,7 +24,7 @@
   });
 
   const handleSelect = (option?: ComboBoxOption) => {
-    if (!option || !option.id) {
+    if (!option || !option.id || selectedTags === null) {
       return;
     }
 
@@ -32,6 +33,10 @@
   };
 
   const handleRemove = (tag: string) => {
+    if (selectedTags === null) {
+      return;
+    }
+
     selectedTags.delete(tag);
   };
 </script>
@@ -41,6 +46,7 @@
     <form autocomplete="off" id="create-tag-form">
       <div class="my-4 flex flex-col gap-2">
         <Combobox
+          disabled={selectedTags === null}
           onSelect={handleSelect}
           label={$t('tags').toUpperCase()}
           defaultFirstOption
@@ -49,10 +55,21 @@
           placeholder={$t('search_tags')}
         />
       </div>
+      <div class="flex items-center gap-2">
+        <Checkbox
+          id="untagged-checkbox"
+          size="tiny"
+          checked={selectedTags === null}
+          onCheckedChange={(checked) => {
+            selectedTags = checked ? null : new SvelteSet();
+          }}
+        />
+        <Label label={$t('untagged')} for="untagged-checkbox" />
+      </div>
     </form>
 
     <section class="flex flex-wrap pt-2 gap-1">
-      {#each selectedTags as tagId (tagId)}
+      {#each selectedTags ?? [] as tagId (tagId)}
         {@const tag = tagMap[tagId]}
         {#if tag}
           <div class="flex group transition-all">
diff --git a/web/src/lib/modals/SearchFilterModal.svelte b/web/src/lib/modals/SearchFilterModal.svelte
index 9389a890e7..0647d0bb71 100644
--- a/web/src/lib/modals/SearchFilterModal.svelte
+++ b/web/src/lib/modals/SearchFilterModal.svelte
@@ -8,7 +8,7 @@
     query: string;
     queryType: 'smart' | 'metadata' | 'description';
     personIds: SvelteSet<string>;
-    tagIds: SvelteSet<string>;
+    tagIds: SvelteSet<string> | null;
     location: SearchLocationFilter;
     camera: SearchCameraFilter;
     date: SearchDateFilter;
@@ -68,7 +68,12 @@
     query: 'query' in searchQuery ? searchQuery.query : searchQuery.originalFileName || '',
     queryType: defaultQueryType(),
     personIds: new SvelteSet('personIds' in searchQuery ? searchQuery.personIds : []),
-    tagIds: new SvelteSet('tagIds' in searchQuery ? searchQuery.tagIds : []),
+    tagIds:
+      'tagIds' in searchQuery
+        ? searchQuery.tagIds === null
+          ? null
+          : new SvelteSet(searchQuery.tagIds)
+        : new SvelteSet(),
     location: {
       country: withNullAsUndefined(searchQuery.country),
       state: withNullAsUndefined(searchQuery.state),
@@ -140,7 +145,7 @@
       isFavorite: filter.display.isFavorite || undefined,
       isNotInAlbum: filter.display.isNotInAlbum || undefined,
       personIds: filter.personIds.size > 0 ? [...filter.personIds] : undefined,
-      tagIds: filter.tagIds.size > 0 ? [...filter.tagIds] : undefined,
+      tagIds: filter.tagIds === null ? null : filter.tagIds.size > 0 ? [...filter.tagIds] : undefined,
       type,
       rating: filter.rating,
     };
diff --git a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 092eb3b0d4..acb7176a7c 100644
--- a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -233,7 +233,10 @@
     return personNames.join(', ');
   }
 
-  async function getTagNames(tagIds: string[]) {
+  async function getTagNames(tagIds: string[] | null) {
+    if (tagIds === null) {
+      return $t('untagged');
+    }
     const tagNames = await Promise.all(
       tagIds.map(async (tagId) => {
         const tag = await getTagById({ id: tagId });
@@ -343,7 +346,7 @@
               {#await getPersonName(value) then personName}
                 {personName}
               {/await}
-            {:else if searchKey === 'tagIds' && Array.isArray(value)}
+            {:else if searchKey === 'tagIds' && (Array.isArray(value) || value === null)}
               {#await getTagNames(value) then tagNames}
                 {tagNames}
               {/await}

From 977d6452f6635e35c6d353f7706dcfba46c2bdcf Mon Sep 17 00:00:00 2001
From: Sergey Katsubo <skatsubo@gmail.com>
Date: Thu, 10 Jul 2025 17:31:06 +0300
Subject: [PATCH 167/337] fix(docs): library and folders minor adjustments
 (#19642)

---
 docs/docs/features/folder-view.md |  2 +-
 docs/docs/features/libraries.md   | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/docs/features/folder-view.md b/docs/docs/features/folder-view.md
index 3534a22081..3d8613a042 100644
--- a/docs/docs/features/folder-view.md
+++ b/docs/docs/features/folder-view.md
@@ -2,7 +2,7 @@
 
 Folder view provides an additional view besides the timeline that is similar to a file explorer. It allows you to navigate through the folders and files in the library. This feature is handy for a highly curated and customized external library or a nicely configured storage template.
 
-You can enable this feature under [`Account Settings > Features > Folder View`](https://my.immich.app/user-settings?isOpen=feature+folders)
+You can enable this feature under [`Account Settings > Features > Folders`](https://my.immich.app/user-settings?isOpen=feature+folders)
 
 ## Enable folder view
 
diff --git a/docs/docs/features/libraries.md b/docs/docs/features/libraries.md
index a8aa1316ed..ad76eb44b2 100644
--- a/docs/docs/features/libraries.md
+++ b/docs/docs/features/libraries.md
@@ -56,7 +56,7 @@ Internally, Immich uses the [glob](https://www.npmjs.com/package/glob) package t
 
 ### Automatic watching (EXPERIMENTAL)
 
-This feature - currently hidden in the config file - is considered experimental and for advanced users only. If enabled, it will allow automatic watching of the filesystem which means new assets are automatically imported to Immich without needing to rescan.
+This feature is considered experimental and for advanced users only. If enabled, it will allow automatic watching of the filesystem which means new assets are automatically imported to Immich without needing to rescan.
 
 If your photos are on a network drive, automatic file watching likely won't work. In that case, you will have to rely on a periodic library refresh to pull in your changes.
 
@@ -112,7 +112,7 @@ _Remember to run `docker compose up -d` to register the changes. Make sure you c
 
 These actions must be performed by the Immich administrator.
 
-- Click on your avatar on the upper right corner
+- Click on your avatar in the upper right corner
 - Click on Administration -> External Libraries
 - Click on Create an external library…
 - Select which user owns the library, this can not be changed later
@@ -159,9 +159,7 @@ Within seconds, the assets from the old-pics and videos folders should show up i
 
 Folder view provides an additional view besides the timeline that is similar to a file explorer. It allows you to navigate through the folders and files in the library. This feature is handy for a highly curated and customized external library or a nicely configured storage template.
 
-You can enable this feature under [`Account Settings > Features > Folder View`](https://my.immich.app/user-settings?isOpen=feature+folders)
-
-The UI is currently only available for the web; mobile will come in a subsequent release.
+You can enable this feature under [`Account Settings > Features > Folders`](https://my.immich.app/user-settings?isOpen=feature+folders)
 
 <img src={require('./img/folder-view-1.webp').default} width="100%" title='Folder-view' />
 
@@ -171,7 +169,7 @@ The UI is currently only available for the web; mobile will come in a subsequent
 Only an admin can do this.
 :::
 
-You can define a custom interval for the trigger external library rescan under Administration -> Settings -> Library.  
+You can define a custom interval for the trigger external library rescan under Administration -> Settings -> External Library.  
 You can set the scanning interval using the preset or cron format. For more information you can refer to [Crontab Guru](https://crontab.guru/).
 
 <img src={require('./img/library-custom-scan-interval.webp').default} width="75%" title='Set custom scan interval for external library' />

From feff1899eeef883948a2b4045e5daace16d1a3c6 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Thu, 10 Jul 2025 10:13:46 -0500
Subject: [PATCH 168/337] feat: expanded sliver app bar (#19827)

* use mutex

* feat: cool app bar

* animation

* adapt to more pages

* animation

* better animation

* fix: asset count

* Revert "fix: asset count"

This reverts commit 673a5b264be0ae851aa63a28ecc316c27cfc412b.

* fix: asset count

* fix: shaky animation on Android

* tunning

* offset SizedBox to fix scroll jump on multiselect

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../lib/domain/models/album/album.model.dart  |   6 +-
 .../domain/services/remote_album.service.dart |  12 +-
 .../lib/domain/services/timeline.service.dart |   3 +
 .../repositories/remote_album.repository.dart |   8 +-
 .../pages/dev/drift_archive.page.dart         |  11 +-
 .../pages/dev/drift_favorite.page.dart        |  11 +-
 .../pages/dev/drift_local_album.page.dart     |   2 +-
 .../pages/dev/drift_trash.page.dart           |  14 +-
 .../pages/dev/local_timeline.page.dart        |  15 +-
 .../pages/dev/media_stat.page.dart            |   4 +-
 .../pages/dev/remote_timeline.page.dart       |  17 +-
 .../presentation/pages/drift_album.page.dart  |  31 +-
 .../pages/drift_library.page.dart             |   7 +-
 .../asset_viewer/asset_viewer.page.dart       |   2 +-
 .../widgets/timeline/timeline.widget.dart     |  24 +-
 .../infrastructure/remote_album.provider.dart |  12 +-
 mobile/lib/routing/router.dart                |   2 +
 mobile/lib/routing/router.gr.dart             |  24 +-
 mobile/lib/utils/remote_album.utils.dart      |  35 +-
 .../widgets/common/immich_sliver_app_bar.dart |   5 +-
 .../common/mesmerizing_sliver_app_bar.dart    | 563 ++++++++++++++++++
 21 files changed, 733 insertions(+), 75 deletions(-)
 create mode 100644 mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart

diff --git a/mobile/lib/domain/models/album/album.model.dart b/mobile/lib/domain/models/album/album.model.dart
index 29f75f29ef..7cafca9116 100644
--- a/mobile/lib/domain/models/album/album.model.dart
+++ b/mobile/lib/domain/models/album/album.model.dart
@@ -11,7 +11,7 @@ enum AlbumUserRole {
 }
 
 // Model for an album stored in the server
-class Album {
+class RemoteAlbum {
   final String id;
   final String name;
   final String ownerId;
@@ -24,7 +24,7 @@ class Album {
   final int assetCount;
   final String ownerName;
 
-  const Album({
+  const RemoteAlbum({
     required this.id,
     required this.name,
     required this.ownerId,
@@ -57,7 +57,7 @@ class Album {
 
   @override
   bool operator ==(Object other) {
-    if (other is! Album) return false;
+    if (other is! RemoteAlbum) return false;
     if (identical(this, other)) return true;
     return id == other.id &&
         name == other.name &&
diff --git a/mobile/lib/domain/services/remote_album.service.dart b/mobile/lib/domain/services/remote_album.service.dart
index f3106470d2..9ff00e1ce3 100644
--- a/mobile/lib/domain/services/remote_album.service.dart
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -8,26 +8,26 @@ class RemoteAlbumService {
 
   const RemoteAlbumService(this._repository);
 
-  Future<List<Album>> getAll() {
+  Future<List<RemoteAlbum>> getAll() {
     return _repository.getAll();
   }
 
-  List<Album> sortAlbums(
-    List<Album> albums,
+  List<RemoteAlbum> sortAlbums(
+    List<RemoteAlbum> albums,
     RemoteAlbumSortMode sortMode, {
     bool isReverse = false,
   }) {
     return sortMode.sortFn(albums, isReverse);
   }
 
-  List<Album> searchAlbums(
-    List<Album> albums,
+  List<RemoteAlbum> searchAlbums(
+    List<RemoteAlbum> albums,
     String query,
     String? userId, [
     QuickFilterMode filterMode = QuickFilterMode.all,
   ]) {
     final lowerQuery = query.toLowerCase();
-    List<Album> filtered = albums;
+    List<RemoteAlbum> filtered = albums;
 
     // Apply text search filter
     if (query.isNotEmpty) {
diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index b3d6b51402..840d260950 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -210,6 +210,9 @@ class TimelineService {
   Future<void> preCacheAssets(int index) =>
       _mutex.run(() => _loadAssets(index, math.min(5, _totalAssets - index)));
 
+  BaseAsset getRandomAsset() =>
+      _buffer.elementAt(math.Random().nextInt(_buffer.length));
+
   BaseAsset getAsset(int index) {
     if (!hasRange(index, 1)) {
       throw RangeError(
diff --git a/mobile/lib/infrastructure/repositories/remote_album.repository.dart b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
index b1b73b4cdc..de55626b30 100644
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -9,7 +9,9 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
   final Drift _db;
   const DriftRemoteAlbumRepository(this._db) : super(_db);
 
-  Future<List<Album>> getAll({Set<SortRemoteAlbumsBy> sortBy = const {}}) {
+  Future<List<RemoteAlbum>> getAll({
+    Set<SortRemoteAlbumsBy> sortBy = const {},
+  }) {
     final assetCount = _db.remoteAlbumAssetEntity.assetId.count();
 
     final query = _db.remoteAlbumEntity.select().join([
@@ -59,8 +61,8 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
 }
 
 extension on RemoteAlbumEntityData {
-  Album toDto({int assetCount = 0, required String ownerName}) {
-    return Album(
+  RemoteAlbum toDto({int assetCount = 0, required String ownerName}) {
+    return RemoteAlbum(
       id: id,
       name: name,
       ownerId: ownerId,
diff --git a/mobile/lib/presentation/pages/dev/drift_archive.page.dart b/mobile/lib/presentation/pages/dev/drift_archive.page.dart
index 14657f7149..fa847c74b5 100644
--- a/mobile/lib/presentation/pages/dev/drift_archive.page.dart
+++ b/mobile/lib/presentation/pages/dev/drift_archive.page.dart
@@ -1,9 +1,11 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 
 @RoutePage()
 class DriftArchivePage extends StatelessWidget {
@@ -27,7 +29,12 @@ class DriftArchivePage extends StatelessWidget {
           },
         ),
       ],
-      child: const Timeline(),
+      child: Timeline(
+        appBar: MesmerizingSliverAppBar(
+          title: 'archive'.t(context: context),
+          icon: Icons.archive_outlined,
+        ),
+      ),
     );
   }
 }
diff --git a/mobile/lib/presentation/pages/dev/drift_favorite.page.dart b/mobile/lib/presentation/pages/dev/drift_favorite.page.dart
index 4055ad863b..43f270574b 100644
--- a/mobile/lib/presentation/pages/dev/drift_favorite.page.dart
+++ b/mobile/lib/presentation/pages/dev/drift_favorite.page.dart
@@ -1,9 +1,11 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 
 @RoutePage()
 class DriftFavoritePage extends StatelessWidget {
@@ -27,7 +29,12 @@ class DriftFavoritePage extends StatelessWidget {
           },
         ),
       ],
-      child: const Timeline(),
+      child: Timeline(
+        appBar: MesmerizingSliverAppBar(
+          title: 'favorites'.t(context: context),
+          icon: Icons.favorite_outline,
+        ),
+      ),
     );
   }
 }
diff --git a/mobile/lib/presentation/pages/dev/drift_local_album.page.dart b/mobile/lib/presentation/pages/dev/drift_local_album.page.dart
index f47811b6da..0ad9abd2fa 100644
--- a/mobile/lib/presentation/pages/dev/drift_local_album.page.dart
+++ b/mobile/lib/presentation/pages/dev/drift_local_album.page.dart
@@ -103,7 +103,7 @@ class _AlbumList extends ConsumerWidget {
                     ),
                   ),
                   onTap: () =>
-                      context.pushRoute(LocalTimelineRoute(albumId: album.id)),
+                      context.pushRoute(LocalTimelineRoute(album: album)),
                 ),
               );
             },
diff --git a/mobile/lib/presentation/pages/dev/drift_trash.page.dart b/mobile/lib/presentation/pages/dev/drift_trash.page.dart
index cbcfe50112..9cd2fac760 100644
--- a/mobile/lib/presentation/pages/dev/drift_trash.page.dart
+++ b/mobile/lib/presentation/pages/dev/drift_trash.page.dart
@@ -1,6 +1,7 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
@@ -27,7 +28,16 @@ class DriftTrashPage extends StatelessWidget {
           },
         ),
       ],
-      child: const Timeline(),
+      child: Timeline(
+        appBar: SliverAppBar(
+          title: Text('trash'.t(context: context)),
+          floating: true,
+          snap: true,
+          pinned: true,
+          centerTitle: true,
+          elevation: 0,
+        ),
+      ),
     );
   }
 }
diff --git a/mobile/lib/presentation/pages/dev/local_timeline.page.dart b/mobile/lib/presentation/pages/dev/local_timeline.page.dart
index 3a98a81e9e..f966109289 100644
--- a/mobile/lib/presentation/pages/dev/local_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/local_timeline.page.dart
@@ -1,14 +1,16 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 
 @RoutePage()
 class LocalTimelinePage extends StatelessWidget {
-  final String albumId;
+  final LocalAlbum album;
 
-  const LocalTimelinePage({super.key, required this.albumId});
+  const LocalTimelinePage({super.key, required this.album});
 
   @override
   Widget build(BuildContext context) {
@@ -16,14 +18,17 @@ class LocalTimelinePage extends StatelessWidget {
       overrides: [
         timelineServiceProvider.overrideWith(
           (ref) {
-            final timelineService =
-                ref.watch(timelineFactoryProvider).localAlbum(albumId: albumId);
+            final timelineService = ref
+                .watch(timelineFactoryProvider)
+                .localAlbum(albumId: album.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
         ),
       ],
-      child: const Timeline(),
+      child: Timeline(
+        appBar: MesmerizingSliverAppBar(title: album.name),
+      ),
     );
   }
 }
diff --git a/mobile/lib/presentation/pages/dev/media_stat.page.dart b/mobile/lib/presentation/pages/dev/media_stat.page.dart
index e5745fa629..0a77d9dfe8 100644
--- a/mobile/lib/presentation/pages/dev/media_stat.page.dart
+++ b/mobile/lib/presentation/pages/dev/media_stat.page.dart
@@ -125,7 +125,7 @@ class LocalMediaSummaryPage extends StatelessWidget {
                         name: album.name,
                         countFuture: countFuture,
                         onTap: () => context.router.push(
-                          LocalTimelineRoute(albumId: album.id),
+                          LocalTimelineRoute(album: album),
                         ),
                       );
                     },
@@ -226,7 +226,7 @@ class RemoteMediaSummaryPage extends StatelessWidget {
                         name: album.name,
                         countFuture: countFuture,
                         onTap: () => context.router.push(
-                          RemoteTimelineRoute(albumId: album.id),
+                          RemoteTimelineRoute(album: album),
                         ),
                       );
                     },
diff --git a/mobile/lib/presentation/pages/dev/remote_timeline.page.dart b/mobile/lib/presentation/pages/dev/remote_timeline.page.dart
index 6568f0f74f..2930a3c3d8 100644
--- a/mobile/lib/presentation/pages/dev/remote_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/remote_timeline.page.dart
@@ -1,14 +1,16 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 
 @RoutePage()
 class RemoteTimelinePage extends StatelessWidget {
-  final String albumId;
+  final RemoteAlbum album;
 
-  const RemoteTimelinePage({super.key, required this.albumId});
+  const RemoteTimelinePage({super.key, required this.album});
 
   @override
   Widget build(BuildContext context) {
@@ -18,13 +20,18 @@ class RemoteTimelinePage extends StatelessWidget {
           (ref) {
             final timelineService = ref
                 .watch(timelineFactoryProvider)
-                .remoteAlbum(albumId: albumId);
+                .remoteAlbum(albumId: album.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
         ),
       ],
-      child: const Timeline(),
+      child: Timeline(
+        appBar: MesmerizingSliverAppBar(
+          title: album.name,
+          icon: Icons.photo_album_outlined,
+        ),
+      ),
     );
   }
 }
diff --git a/mobile/lib/presentation/pages/drift_album.page.dart b/mobile/lib/presentation/pages/drift_album.page.dart
index 3298f12b65..4a7b12126a 100644
--- a/mobile/lib/presentation/pages/drift_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_album.page.dart
@@ -475,7 +475,7 @@ class _AlbumList extends StatelessWidget {
 
   final bool isLoading;
   final String? error;
-  final List<Album> albums;
+  final List<RemoteAlbum> albums;
   final String? userId;
 
   @override
@@ -555,7 +555,7 @@ class _AlbumList extends StatelessWidget {
                 ),
               ),
               onTap: () => context.router.push(
-                RemoteTimelineRoute(albumId: album.id),
+                RemoteTimelineRoute(album: album),
               ),
               leadingPadding: const EdgeInsets.only(
                 right: 16,
@@ -573,13 +573,24 @@ class _AlbumList extends StatelessWidget {
                         ),
                       ),
                     )
-                  : const SizedBox(
+                  : SizedBox(
                       width: 80,
                       height: 80,
-                      child: Icon(
-                        Icons.photo_album_rounded,
-                        size: 40,
-                        color: Colors.grey,
+                      child: Container(
+                        decoration: BoxDecoration(
+                          color: context.colorScheme.surfaceContainer,
+                          borderRadius:
+                              const BorderRadius.all(Radius.circular(16)),
+                          border: Border.all(
+                            color: context.colorScheme.outline.withAlpha(50),
+                            width: 1,
+                          ),
+                        ),
+                        child: const Icon(
+                          Icons.photo_album_rounded,
+                          size: 24,
+                          color: Colors.grey,
+                        ),
                       ),
                     ),
             ),
@@ -599,7 +610,7 @@ class _AlbumGrid extends StatelessWidget {
     required this.error,
   });
 
-  final List<Album> albums;
+  final List<RemoteAlbum> albums;
   final String? userId;
   final bool isLoading;
   final String? error;
@@ -674,14 +685,14 @@ class _GridAlbumCard extends StatelessWidget {
     required this.userId,
   });
 
-  final Album album;
+  final RemoteAlbum album;
   final String? userId;
 
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () => context.router.push(
-        RemoteTimelineRoute(albumId: album.id),
+        RemoteTimelineRoute(album: album),
       ),
       child: Card(
         elevation: 0,
diff --git a/mobile/lib/presentation/pages/drift_library.page.dart b/mobile/lib/presentation/pages/drift_library.page.dart
index 0efa8040e7..2b0ec191e2 100644
--- a/mobile/lib/presentation/pages/drift_library.page.dart
+++ b/mobile/lib/presentation/pages/drift_library.page.dart
@@ -27,7 +27,12 @@ class DriftLibraryPage extends ConsumerWidget {
     return const Scaffold(
       body: CustomScrollView(
         slivers: [
-          ImmichSliverAppBar(),
+          ImmichSliverAppBar(
+            snap: false,
+            floating: false,
+            pinned: true,
+            showUploadButton: false,
+          ),
           _ActionButtonGrid(),
           _CollectionCards(),
           _QuickAccessButtonList(),
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 aea821d945..0f0b5a5a67 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -335,7 +335,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     final isDraggingDown = currentExtent < previousExtent;
     previousExtent = currentExtent;
     // Closes the bottom sheet if the user is dragging down
-    if (isDraggingDown && delta.extent < 0.5) {
+    if (isDraggingDown && delta.extent < 0.55) {
       if (dragInProgress) {
         blockGestures = true;
       }
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 9fb164e2dc..6d3351e9c2 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -18,6 +18,7 @@ import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 import 'package:immich_mobile/widgets/common/selection_sliver_app_bar.dart';
 
 class Timeline extends StatelessWidget {
@@ -25,10 +26,12 @@ class Timeline extends StatelessWidget {
     super.key,
     this.topSliverWidget,
     this.topSliverWidgetHeight,
+    this.appBar,
   });
 
   final Widget? topSliverWidget;
   final double? topSliverWidgetHeight;
+  final Widget? appBar;
 
   @override
   Widget build(BuildContext context) {
@@ -49,6 +52,7 @@ class Timeline extends StatelessWidget {
           child: _SliverTimeline(
             topSliverWidget: topSliverWidget,
             topSliverWidgetHeight: topSliverWidgetHeight,
+            appBar: appBar,
           ),
         ),
       ),
@@ -60,10 +64,12 @@ class _SliverTimeline extends ConsumerStatefulWidget {
   const _SliverTimeline({
     this.topSliverWidget,
     this.topSliverWidgetHeight,
+    this.appBar,
   });
 
   final Widget? topSliverWidget;
   final double? topSliverWidgetHeight;
+  final Widget? appBar;
 
   @override
   ConsumerState createState() => _SliverTimelineState();
@@ -100,6 +106,10 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
       onData: (segments) {
         final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
         final statusBarHeight = context.padding.top;
+        final double appBarExpandedHeight =
+            widget.appBar != null && widget.appBar is MesmerizingSliverAppBar
+                ? 200
+                : 0;
         final totalAppBarHeight = statusBarHeight + kToolbarHeight;
         const scrubberBottomPadding = 100.0;
 
@@ -112,7 +122,8 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                 timelineHeight: maxHeight,
                 topPadding: totalAppBarHeight + 10,
                 bottomPadding: context.padding.bottom + scrubberBottomPadding,
-                monthSegmentSnappingOffset: widget.topSliverWidgetHeight,
+                monthSegmentSnappingOffset:
+                    widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
                 child: CustomScrollView(
                   primary: true,
                   cacheExtent: maxHeight * 2,
@@ -120,11 +131,12 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                     if (isSelectionMode)
                       const SelectionSliverAppBar()
                     else
-                      const ImmichSliverAppBar(
-                        floating: true,
-                        pinned: false,
-                        snap: false,
-                      ),
+                      widget.appBar ??
+                          const ImmichSliverAppBar(
+                            floating: true,
+                            pinned: false,
+                            snap: false,
+                          ),
                     if (widget.topSliverWidget != null) widget.topSliverWidget!,
                     _SliverSegmentedList(
                       segments: segments,
diff --git a/mobile/lib/providers/infrastructure/remote_album.provider.dart b/mobile/lib/providers/infrastructure/remote_album.provider.dart
index 2e5a475b9c..b80d791b0a 100644
--- a/mobile/lib/providers/infrastructure/remote_album.provider.dart
+++ b/mobile/lib/providers/infrastructure/remote_album.provider.dart
@@ -8,21 +8,21 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'album.provider.dart';
 
 class RemoteAlbumState {
-  final List<Album> albums;
-  final List<Album> filteredAlbums;
+  final List<RemoteAlbum> albums;
+  final List<RemoteAlbum> filteredAlbums;
   final bool isLoading;
   final String? error;
 
   const RemoteAlbumState({
     required this.albums,
-    List<Album>? filteredAlbums,
+    List<RemoteAlbum>? filteredAlbums,
     this.isLoading = false,
     this.error,
   }) : filteredAlbums = filteredAlbums ?? albums;
 
   RemoteAlbumState copyWith({
-    List<Album>? albums,
-    List<Album>? filteredAlbums,
+    List<RemoteAlbum>? albums,
+    List<RemoteAlbum>? filteredAlbums,
     bool? isLoading,
     String? error,
   }) {
@@ -66,7 +66,7 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
     return const RemoteAlbumState(albums: [], filteredAlbums: []);
   }
 
-  Future<List<Album>> getAll() async {
+  Future<List<RemoteAlbum>> getAll() async {
     state = state.copyWith(isLoading: true, error: null);
 
     try {
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 18aa937a9d..7becbd4804 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -1,6 +1,8 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.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/log.model.dart';
 import 'package:immich_mobile/domain/models/memory.model.dart';
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index b13320b1c0..8e8da4d8d0 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -1211,11 +1211,11 @@ class LocalMediaSummaryRoute extends PageRouteInfo<void> {
 class LocalTimelineRoute extends PageRouteInfo<LocalTimelineRouteArgs> {
   LocalTimelineRoute({
     Key? key,
-    required String albumId,
+    required LocalAlbum album,
     List<PageRouteInfo>? children,
   }) : super(
           LocalTimelineRoute.name,
-          args: LocalTimelineRouteArgs(key: key, albumId: albumId),
+          args: LocalTimelineRouteArgs(key: key, album: album),
           initialChildren: children,
         );
 
@@ -1225,21 +1225,21 @@ class LocalTimelineRoute extends PageRouteInfo<LocalTimelineRouteArgs> {
     name,
     builder: (data) {
       final args = data.argsAs<LocalTimelineRouteArgs>();
-      return LocalTimelinePage(key: args.key, albumId: args.albumId);
+      return LocalTimelinePage(key: args.key, album: args.album);
     },
   );
 }
 
 class LocalTimelineRouteArgs {
-  const LocalTimelineRouteArgs({this.key, required this.albumId});
+  const LocalTimelineRouteArgs({this.key, required this.album});
 
   final Key? key;
 
-  final String albumId;
+  final LocalAlbum album;
 
   @override
   String toString() {
-    return 'LocalTimelineRouteArgs{key: $key, albumId: $albumId}';
+    return 'LocalTimelineRouteArgs{key: $key, album: $album}';
   }
 }
 
@@ -1765,11 +1765,11 @@ class RemoteMediaSummaryRoute extends PageRouteInfo<void> {
 class RemoteTimelineRoute extends PageRouteInfo<RemoteTimelineRouteArgs> {
   RemoteTimelineRoute({
     Key? key,
-    required String albumId,
+    required RemoteAlbum album,
     List<PageRouteInfo>? children,
   }) : super(
           RemoteTimelineRoute.name,
-          args: RemoteTimelineRouteArgs(key: key, albumId: albumId),
+          args: RemoteTimelineRouteArgs(key: key, album: album),
           initialChildren: children,
         );
 
@@ -1779,21 +1779,21 @@ class RemoteTimelineRoute extends PageRouteInfo<RemoteTimelineRouteArgs> {
     name,
     builder: (data) {
       final args = data.argsAs<RemoteTimelineRouteArgs>();
-      return RemoteTimelinePage(key: args.key, albumId: args.albumId);
+      return RemoteTimelinePage(key: args.key, album: args.album);
     },
   );
 }
 
 class RemoteTimelineRouteArgs {
-  const RemoteTimelineRouteArgs({this.key, required this.albumId});
+  const RemoteTimelineRouteArgs({this.key, required this.album});
 
   final Key? key;
 
-  final String albumId;
+  final RemoteAlbum album;
 
   @override
   String toString() {
-    return 'RemoteTimelineRouteArgs{key: $key, albumId: $albumId}';
+    return 'RemoteTimelineRouteArgs{key: $key, album: $album}';
   }
 }
 
diff --git a/mobile/lib/utils/remote_album.utils.dart b/mobile/lib/utils/remote_album.utils.dart
index 4fc7ba5f74..04184ee367 100644
--- a/mobile/lib/utils/remote_album.utils.dart
+++ b/mobile/lib/utils/remote_album.utils.dart
@@ -1,38 +1,56 @@
 import 'package:collection/collection.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 
-typedef AlbumSortFn = List<Album> Function(List<Album> albums, bool isReverse);
+typedef AlbumSortFn = List<RemoteAlbum> Function(
+  List<RemoteAlbum> albums,
+  bool isReverse,
+);
 
 class _RemoteAlbumSortHandlers {
   const _RemoteAlbumSortHandlers._();
 
   static const AlbumSortFn created = _sortByCreated;
-  static List<Album> _sortByCreated(List<Album> albums, bool isReverse) {
+  static List<RemoteAlbum> _sortByCreated(
+    List<RemoteAlbum> albums,
+    bool isReverse,
+  ) {
     final sorted = albums.sortedBy((album) => album.createdAt);
     return (isReverse ? sorted.reversed : sorted).toList();
   }
 
   static const AlbumSortFn title = _sortByTitle;
-  static List<Album> _sortByTitle(List<Album> albums, bool isReverse) {
+  static List<RemoteAlbum> _sortByTitle(
+    List<RemoteAlbum> albums,
+    bool isReverse,
+  ) {
     final sorted = albums.sortedBy((album) => album.name);
     return (isReverse ? sorted.reversed : sorted).toList();
   }
 
   static const AlbumSortFn lastModified = _sortByLastModified;
-  static List<Album> _sortByLastModified(List<Album> albums, bool isReverse) {
+  static List<RemoteAlbum> _sortByLastModified(
+    List<RemoteAlbum> albums,
+    bool isReverse,
+  ) {
     final sorted = albums.sortedBy((album) => album.updatedAt);
     return (isReverse ? sorted.reversed : sorted).toList();
   }
 
   static const AlbumSortFn assetCount = _sortByAssetCount;
-  static List<Album> _sortByAssetCount(List<Album> albums, bool isReverse) {
+  static List<RemoteAlbum> _sortByAssetCount(
+    List<RemoteAlbum> albums,
+    bool isReverse,
+  ) {
     final sorted =
         albums.sorted((a, b) => a.assetCount.compareTo(b.assetCount));
     return (isReverse ? sorted.reversed : sorted).toList();
   }
 
   static const AlbumSortFn mostRecent = _sortByMostRecent;
-  static List<Album> _sortByMostRecent(List<Album> albums, bool isReverse) {
+  static List<RemoteAlbum> _sortByMostRecent(
+    List<RemoteAlbum> albums,
+    bool isReverse,
+  ) {
     final sorted = albums.sorted((a, b) {
       // For most recent, we sort by updatedAt in descending order
       return b.updatedAt.compareTo(a.updatedAt);
@@ -41,7 +59,10 @@ class _RemoteAlbumSortHandlers {
   }
 
   static const AlbumSortFn mostOldest = _sortByMostOldest;
-  static List<Album> _sortByMostOldest(List<Album> albums, bool isReverse) {
+  static List<RemoteAlbum> _sortByMostOldest(
+    List<RemoteAlbum> albums,
+    bool isReverse,
+  ) {
     final sorted = albums.sorted((a, b) {
       // For oldest, we sort by createdAt in ascending order
       return a.createdAt.compareTo(b.createdAt);
diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
index ff0e88e5d7..bff1ab4bb1 100644
--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -73,7 +73,10 @@ class ImmichSliverAppBar extends ConsumerWidget {
             onPressed: () => context.pop(),
           ),
           IconButton(
-            onPressed: () => ref.read(backgroundSyncProvider).syncRemote(),
+            onPressed: () {
+              ref.read(backgroundSyncProvider).syncLocal(full: true);
+              ref.read(backgroundSyncProvider).syncRemote();
+            },
             icon: const Icon(
               Icons.sync,
             ),
diff --git a/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
new file mode 100644
index 0000000000..36f944dbcd
--- /dev/null
+++ b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
@@ -0,0 +1,563 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+
+class MesmerizingSliverAppBar extends ConsumerStatefulWidget {
+  const MesmerizingSliverAppBar({
+    super.key,
+    required this.title,
+    this.icon = Icons.camera,
+  });
+
+  final String title;
+  final IconData icon;
+
+  @override
+  ConsumerState<MesmerizingSliverAppBar> createState() =>
+      _MesmerizingSliverAppBarState();
+}
+
+class _MesmerizingSliverAppBarState
+    extends ConsumerState<MesmerizingSliverAppBar> {
+  double _scrollProgress = 0.0;
+
+  double _calculateScrollProgress(FlexibleSpaceBarSettings? settings) {
+    if (settings?.maxExtent == null || settings?.minExtent == null) {
+      return 1.0;
+    }
+
+    final deltaExtent = settings!.maxExtent - settings.minExtent;
+    if (deltaExtent <= 0.0) {
+      return 1.0;
+    }
+
+    return (1.0 - (settings.currentExtent - settings.minExtent) / deltaExtent)
+        .clamp(0.0, 1.0);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isMultiSelectEnabled =
+        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
+
+    return isMultiSelectEnabled
+        ? SliverToBoxAdapter(
+            child: switch (_scrollProgress) {
+              < 0.8 => const SizedBox(height: 120),
+              _ => const SizedBox(height: 352),
+            },
+          )
+        : SliverAppBar(
+            expandedHeight: 300.0,
+            floating: false,
+            pinned: true,
+            snap: false,
+            elevation: 0,
+            leading: IconButton(
+              icon: Icon(
+                Platform.isIOS
+                    ? Icons.arrow_back_ios_new_rounded
+                    : Icons.arrow_back,
+                color: Color.lerp(
+                  Colors.white,
+                  context.primaryColor,
+                  _scrollProgress,
+                ),
+                shadows: [
+                  _scrollProgress < 0.95
+                      ? Shadow(
+                          offset: const Offset(0, 2),
+                          blurRadius: 5,
+                          color: Colors.black.withValues(alpha: 0.5),
+                        )
+                      : const Shadow(
+                          offset: Offset(0, 2),
+                          blurRadius: 0,
+                          color: Colors.transparent,
+                        ),
+                ],
+              ),
+              onPressed: () {
+                context.pop();
+              },
+            ),
+            flexibleSpace: Builder(
+              builder: (context) {
+                final settings = context.dependOnInheritedWidgetOfExactType<
+                    FlexibleSpaceBarSettings>();
+                final scrollProgress = _calculateScrollProgress(settings);
+
+                // Update scroll progress for the leading button
+                WidgetsBinding.instance.addPostFrameCallback((_) {
+                  if (mounted && _scrollProgress != scrollProgress) {
+                    setState(() {
+                      _scrollProgress = scrollProgress;
+                    });
+                  }
+                });
+
+                return FlexibleSpaceBar(
+                  centerTitle: true,
+                  title: AnimatedSwitcher(
+                    duration: const Duration(milliseconds: 200),
+                    child: scrollProgress > 0.95
+                        ? Text(
+                            widget.title,
+                            style: TextStyle(
+                              color: context.primaryColor,
+                              fontWeight: FontWeight.w600,
+                              fontSize: 18,
+                            ),
+                          )
+                        : null,
+                  ),
+                  background: _ExpandedBackground(
+                    scrollProgress: scrollProgress,
+                    title: widget.title,
+                    icon: widget.icon,
+                  ),
+                );
+              },
+            ),
+          );
+  }
+}
+
+class _ExpandedBackground extends ConsumerStatefulWidget {
+  final double scrollProgress;
+  final String title;
+  final IconData icon;
+
+  const _ExpandedBackground({
+    required this.scrollProgress,
+    required this.title,
+    required this.icon,
+  });
+
+  @override
+  ConsumerState<_ExpandedBackground> createState() =>
+      _ExpandedBackgroundState();
+}
+
+class _ExpandedBackgroundState extends ConsumerState<_ExpandedBackground>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _slideController;
+  late Animation<Offset> _slideAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _slideController = AnimationController(
+      duration: const Duration(milliseconds: 800),
+      vsync: this,
+    );
+
+    _slideAnimation = Tween<Offset>(
+      begin: const Offset(0, 1.5),
+      end: Offset.zero,
+    ).animate(
+      CurvedAnimation(
+        parent: _slideController,
+        curve: Curves.easeOutCubic,
+      ),
+    );
+
+    Future.delayed(const Duration(milliseconds: 100), () {
+      if (mounted) {
+        _slideController.forward();
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _slideController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final timelineService = ref.watch(timelineServiceProvider);
+
+    return Stack(
+      fit: StackFit.expand,
+      children: [
+        Transform.translate(
+          offset: Offset(0, widget.scrollProgress * 50),
+          child: Transform.scale(
+            scale: 1.4 - (widget.scrollProgress * 0.2),
+            child: _RandomAssetBackground(
+              timelineService: timelineService,
+              icon: widget.icon,
+            ),
+          ),
+        ),
+        Container(
+          decoration: BoxDecoration(
+            gradient: LinearGradient(
+              begin: Alignment.topCenter,
+              end: Alignment.bottomCenter,
+              colors: [
+                Colors.transparent,
+                Colors.transparent,
+                Colors.black.withValues(
+                  alpha: 0.6 + (widget.scrollProgress * 0.2),
+                ),
+              ],
+              stops: const [0.0, 0.65, 1.0],
+            ),
+          ),
+        ),
+        Positioned(
+          bottom: 16,
+          left: 16,
+          right: 16,
+          child: SlideTransition(
+            position: _slideAnimation,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                SizedBox(
+                  width: double.infinity,
+                  child: SingleChildScrollView(
+                    scrollDirection: Axis.horizontal,
+                    child: Text(
+                      widget.title,
+                      maxLines: 1,
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 36,
+                        fontWeight: FontWeight.bold,
+                        letterSpacing: 0.5,
+                        shadows: [
+                          Shadow(
+                            offset: Offset(0, 2),
+                            blurRadius: 12,
+                            color: Colors.black45,
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+                AnimatedContainer(
+                  duration: const Duration(milliseconds: 300),
+                  child: const _ItemCountText(),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _ItemCountText extends ConsumerStatefulWidget {
+  const _ItemCountText();
+
+  @override
+  ConsumerState<_ItemCountText> createState() => _ItemCountTextState();
+}
+
+class _ItemCountTextState extends ConsumerState<_ItemCountText> {
+  StreamSubscription? _reloadSubscription;
+
+  @override
+  void initState() {
+    super.initState();
+    _reloadSubscription =
+        EventStream.shared.listen<TimelineReloadEvent>((_) => setState(() {}));
+  }
+
+  @override
+  void dispose() {
+    _reloadSubscription?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final assetCount = ref.watch(
+      timelineServiceProvider.select((s) => s.totalAssets),
+    );
+
+    return Text(
+      'items_count'.t(
+        context: context,
+        args: {"count": assetCount},
+      ),
+      style: context.textTheme.labelLarge?.copyWith(
+        // letterSpacing: 0.2,
+        fontWeight: FontWeight.bold,
+        color: Colors.white,
+        shadows: [
+          const Shadow(
+            offset: Offset(0, 1),
+            blurRadius: 6,
+            color: Colors.black45,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _RandomAssetBackground extends StatefulWidget {
+  final TimelineService timelineService;
+  final IconData icon;
+
+  const _RandomAssetBackground({
+    required this.timelineService,
+    required this.icon,
+  });
+
+  @override
+  State<_RandomAssetBackground> createState() => _RandomAssetBackgroundState();
+}
+
+class _RandomAssetBackgroundState extends State<_RandomAssetBackground>
+    with TickerProviderStateMixin {
+  late AnimationController _zoomController;
+  late AnimationController _crossFadeController;
+  late Animation<double> _zoomAnimation;
+  late Animation<Offset> _panAnimation;
+  late Animation<double> _crossFadeAnimation;
+  BaseAsset? _currentAsset;
+  BaseAsset? _nextAsset;
+  bool _isZoomingIn = true;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _zoomController = AnimationController(
+      duration: const Duration(seconds: 12),
+      vsync: this,
+    );
+
+    _crossFadeController = AnimationController(
+      duration: const Duration(milliseconds: 1200),
+      vsync: this,
+    );
+
+    _zoomAnimation = Tween<double>(
+      begin: 1.0,
+      end: 1.2,
+    ).animate(
+      CurvedAnimation(
+        parent: _zoomController,
+        curve: Curves.easeInOut,
+      ),
+    );
+
+    _panAnimation = Tween<Offset>(
+      begin: Offset.zero,
+      end: const Offset(0.5, -0.5),
+    ).animate(
+      CurvedAnimation(
+        parent: _zoomController,
+        curve: Curves.easeInOut,
+      ),
+    );
+
+    _crossFadeAnimation = Tween<double>(
+      begin: 0.0,
+      end: 1.0,
+    ).animate(
+      CurvedAnimation(
+        parent: _crossFadeController,
+        curve: Curves.easeInOutCubic,
+      ),
+    );
+
+    Future.delayed(
+      Durations.medium1,
+      () => _loadFirstAsset(),
+    );
+  }
+
+  @override
+  void dispose() {
+    _zoomController.dispose();
+    _crossFadeController.dispose();
+    super.dispose();
+  }
+
+  void _startAnimationCycle() {
+    if (_isZoomingIn) {
+      _zoomController.forward().then((_) {
+        _loadNextAsset();
+      });
+    } else {
+      _zoomController.reverse().then((_) {
+        _loadNextAsset();
+      });
+    }
+  }
+
+  Future<void> _loadFirstAsset() async {
+    if (!mounted) {
+      return;
+    }
+
+    if (widget.timelineService.totalAssets == 0) {
+      setState(() {
+        _currentAsset = null;
+      });
+
+      return;
+    }
+
+    setState(() {
+      _currentAsset = widget.timelineService.getRandomAsset();
+    });
+
+    await _crossFadeController.forward();
+
+    if (_zoomController.status == AnimationStatus.dismissed) {
+      if (_isZoomingIn) {
+        _zoomController.reset();
+      } else {
+        _zoomController.value = 1.0;
+      }
+      _startAnimationCycle();
+    }
+  }
+
+  Future<void> _loadNextAsset() async {
+    if (!mounted) {
+      return;
+    }
+
+    try {
+      if (widget.timelineService.totalAssets > 1) {
+        // Load next asset while keeping current one visible
+        final nextAsset = widget.timelineService.getRandomAsset();
+
+        setState(() {
+          _nextAsset = nextAsset;
+        });
+
+        await _crossFadeController.reverse();
+        setState(() {
+          _currentAsset = _nextAsset;
+          _nextAsset = null;
+        });
+
+        _crossFadeController.value = 1.0;
+
+        _isZoomingIn = !_isZoomingIn;
+
+        _startAnimationCycle();
+      }
+    } catch (e) {
+      _zoomController.reset();
+      _startAnimationCycle();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.timelineService.totalAssets == 0) {
+      return const SizedBox.shrink();
+    }
+
+    return AnimatedBuilder(
+      animation: Listenable.merge(
+        [_zoomAnimation, _panAnimation, _crossFadeAnimation],
+      ),
+      builder: (context, child) {
+        return Transform.scale(
+          scale: _zoomAnimation.value,
+          filterQuality: FilterQuality.low,
+          child: Transform.translate(
+            offset: _panAnimation.value,
+            filterQuality: FilterQuality.low,
+            child: Stack(
+              fit: StackFit.expand,
+              children: [
+                // Current image
+                if (_currentAsset != null)
+                  Opacity(
+                    opacity: _crossFadeAnimation.value,
+                    child: SizedBox(
+                      width: double.infinity,
+                      height: double.infinity,
+                      child: Image(
+                        alignment: Alignment.topRight,
+                        image: getFullImageProvider(_currentAsset!),
+                        fit: BoxFit.cover,
+                        frameBuilder:
+                            (context, child, frame, wasSynchronouslyLoaded) {
+                          if (wasSynchronouslyLoaded || frame != null) {
+                            return child;
+                          }
+                          return Container();
+                        },
+                        errorBuilder: (context, error, stackTrace) {
+                          return SizedBox(
+                            width: double.infinity,
+                            height: double.infinity,
+                            child: Icon(
+                              Icons.error_outline_rounded,
+                              size: 24,
+                              color: Colors.red[300],
+                            ),
+                          );
+                        },
+                      ),
+                    ),
+                  ),
+
+                if (_nextAsset != null)
+                  Opacity(
+                    opacity: 1.0 - _crossFadeAnimation.value,
+                    child: SizedBox(
+                      width: double.infinity,
+                      height: double.infinity,
+                      child: Image(
+                        alignment: Alignment.topRight,
+                        image: getFullImageProvider(_nextAsset!),
+                        fit: BoxFit.cover,
+                        frameBuilder:
+                            (context, child, frame, wasSynchronouslyLoaded) {
+                          if (wasSynchronouslyLoaded || frame != null) {
+                            return child;
+                          }
+                          return const SizedBox.shrink();
+                        },
+                        errorBuilder: (context, error, stackTrace) {
+                          return SizedBox(
+                            width: double.infinity,
+                            height: double.infinity,
+                            child: Icon(
+                              Icons.error_outline_rounded,
+                              size: 24,
+                              color: Colors.red[300],
+                            ),
+                          );
+                        },
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}

From b19884d01e6e9ba5d4eb5c9b894570b0e380cff8 Mon Sep 17 00:00:00 2001
From: Zack Pollard <zack@futo.org>
Date: Thu, 10 Jul 2025 16:32:42 +0100
Subject: [PATCH 169/337] feat(server): people sync (#19854)

* chore: fix missing usage of deleteType for syncMemoriesV1

* chore: add src path for proper absolute imports in jetbrains

* feat: people sync
---
 mobile/openapi/README.md                      |   2 +
 mobile/openapi/lib/api.dart                   |   2 +
 mobile/openapi/lib/api_client.dart            |   4 +
 .../openapi/lib/model/sync_entity_type.dart   |   6 +
 .../lib/model/sync_person_delete_v1.dart      |  99 +++++++++
 mobile/openapi/lib/model/sync_person_v1.dart  | 191 ++++++++++++++++++
 .../openapi/lib/model/sync_request_type.dart  |   3 +
 open-api/immich-openapi-specs.json            |  73 ++++++-
 open-api/typescript-sdk/src/fetch-client.ts   |   5 +-
 server/src/dtos/sync.dto.ts                   |  22 ++
 server/src/enum.ts                            |   4 +
 server/src/queries/sync.repository.sql        |  34 ++++
 server/src/repositories/sync.repository.ts    |  43 +++-
 server/src/schema/functions.ts                |  13 ++
 server/src/schema/index.ts                    |   5 +
 .../1752152941084-PeopleAuditTable.ts         |  41 ++++
 .../src/schema/tables/person-audit.table.ts   |  17 ++
 server/src/schema/tables/person.table.ts      |   8 +
 server/src/services/sync.service.ts           |  18 +-
 .../medium/specs/sync/sync-person.spec.ts     |  87 ++++++++
 server/tsconfig.json                          |   3 +
 21 files changed, 675 insertions(+), 5 deletions(-)
 create mode 100644 mobile/openapi/lib/model/sync_person_delete_v1.dart
 create mode 100644 mobile/openapi/lib/model/sync_person_v1.dart
 create mode 100644 server/src/schema/migrations/1752152941084-PeopleAuditTable.ts
 create mode 100644 server/src/schema/tables/person-audit.table.ts
 create mode 100644 server/test/medium/specs/sync/sync-person.spec.ts

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 1beaec0ae6..3ba9327ec4 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -481,6 +481,8 @@ Class | Method | HTTP request | Description
  - [SyncMemoryV1](doc//SyncMemoryV1.md)
  - [SyncPartnerDeleteV1](doc//SyncPartnerDeleteV1.md)
  - [SyncPartnerV1](doc//SyncPartnerV1.md)
+ - [SyncPersonDeleteV1](doc//SyncPersonDeleteV1.md)
+ - [SyncPersonV1](doc//SyncPersonV1.md)
  - [SyncRequestType](doc//SyncRequestType.md)
  - [SyncStackDeleteV1](doc//SyncStackDeleteV1.md)
  - [SyncStackV1](doc//SyncStackV1.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index 3998961720..e771664827 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -264,6 +264,8 @@ part 'model/sync_memory_delete_v1.dart';
 part 'model/sync_memory_v1.dart';
 part 'model/sync_partner_delete_v1.dart';
 part 'model/sync_partner_v1.dart';
+part 'model/sync_person_delete_v1.dart';
+part 'model/sync_person_v1.dart';
 part 'model/sync_request_type.dart';
 part 'model/sync_stack_delete_v1.dart';
 part 'model/sync_stack_v1.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 0edc2638bc..8bdda3a320 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -584,6 +584,10 @@ class ApiClient {
           return SyncPartnerDeleteV1.fromJson(value);
         case 'SyncPartnerV1':
           return SyncPartnerV1.fromJson(value);
+        case 'SyncPersonDeleteV1':
+          return SyncPersonDeleteV1.fromJson(value);
+        case 'SyncPersonV1':
+          return SyncPersonV1.fromJson(value);
         case 'SyncRequestType':
           return SyncRequestTypeTypeTransformer().decode(value);
         case 'SyncStackDeleteV1':
diff --git a/mobile/openapi/lib/model/sync_entity_type.dart b/mobile/openapi/lib/model/sync_entity_type.dart
index ecaadc9c31..60cc4da6cb 100644
--- a/mobile/openapi/lib/model/sync_entity_type.dart
+++ b/mobile/openapi/lib/model/sync_entity_type.dart
@@ -56,6 +56,8 @@ class SyncEntityType {
   static const memoryToAssetDeleteV1 = SyncEntityType._(r'MemoryToAssetDeleteV1');
   static const stackV1 = SyncEntityType._(r'StackV1');
   static const stackDeleteV1 = SyncEntityType._(r'StackDeleteV1');
+  static const personV1 = SyncEntityType._(r'PersonV1');
+  static const personDeleteV1 = SyncEntityType._(r'PersonDeleteV1');
   static const syncAckV1 = SyncEntityType._(r'SyncAckV1');
 
   /// List of all possible values in this [enum][SyncEntityType].
@@ -93,6 +95,8 @@ class SyncEntityType {
     memoryToAssetDeleteV1,
     stackV1,
     stackDeleteV1,
+    personV1,
+    personDeleteV1,
     syncAckV1,
   ];
 
@@ -165,6 +169,8 @@ class SyncEntityTypeTypeTransformer {
         case r'MemoryToAssetDeleteV1': return SyncEntityType.memoryToAssetDeleteV1;
         case r'StackV1': return SyncEntityType.stackV1;
         case r'StackDeleteV1': return SyncEntityType.stackDeleteV1;
+        case r'PersonV1': return SyncEntityType.personV1;
+        case r'PersonDeleteV1': return SyncEntityType.personDeleteV1;
         case r'SyncAckV1': return SyncEntityType.syncAckV1;
         default:
           if (!allowNull) {
diff --git a/mobile/openapi/lib/model/sync_person_delete_v1.dart b/mobile/openapi/lib/model/sync_person_delete_v1.dart
new file mode 100644
index 0000000000..002f5c5b83
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_person_delete_v1.dart
@@ -0,0 +1,99 @@
+//
+// 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 SyncPersonDeleteV1 {
+  /// Returns a new [SyncPersonDeleteV1] instance.
+  SyncPersonDeleteV1({
+    required this.personId,
+  });
+
+  String personId;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncPersonDeleteV1 &&
+    other.personId == personId;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (personId.hashCode);
+
+  @override
+  String toString() => 'SyncPersonDeleteV1[personId=$personId]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'personId'] = this.personId;
+    return json;
+  }
+
+  /// Returns a new [SyncPersonDeleteV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncPersonDeleteV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncPersonDeleteV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncPersonDeleteV1(
+        personId: mapValueOfType<String>(json, r'personId')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncPersonDeleteV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncPersonDeleteV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncPersonDeleteV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncPersonDeleteV1> mapFromJson(dynamic json) {
+    final map = <String, SyncPersonDeleteV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncPersonDeleteV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncPersonDeleteV1-objects as value to a dart map
+  static Map<String, List<SyncPersonDeleteV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncPersonDeleteV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncPersonDeleteV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'personId',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_person_v1.dart b/mobile/openapi/lib/model/sync_person_v1.dart
new file mode 100644
index 0000000000..e86c22f64b
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_person_v1.dart
@@ -0,0 +1,191 @@
+//
+// 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 SyncPersonV1 {
+  /// Returns a new [SyncPersonV1] instance.
+  SyncPersonV1({
+    required this.birthDate,
+    required this.color,
+    required this.createdAt,
+    required this.faceAssetId,
+    required this.id,
+    required this.isFavorite,
+    required this.isHidden,
+    required this.name,
+    required this.ownerId,
+    required this.thumbnailPath,
+    required this.updatedAt,
+  });
+
+  DateTime? birthDate;
+
+  String? color;
+
+  DateTime createdAt;
+
+  String? faceAssetId;
+
+  String id;
+
+  bool isFavorite;
+
+  bool isHidden;
+
+  String name;
+
+  String ownerId;
+
+  String thumbnailPath;
+
+  DateTime updatedAt;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncPersonV1 &&
+    other.birthDate == birthDate &&
+    other.color == color &&
+    other.createdAt == createdAt &&
+    other.faceAssetId == faceAssetId &&
+    other.id == id &&
+    other.isFavorite == isFavorite &&
+    other.isHidden == isHidden &&
+    other.name == name &&
+    other.ownerId == ownerId &&
+    other.thumbnailPath == thumbnailPath &&
+    other.updatedAt == updatedAt;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (birthDate == null ? 0 : birthDate!.hashCode) +
+    (color == null ? 0 : color!.hashCode) +
+    (createdAt.hashCode) +
+    (faceAssetId == null ? 0 : faceAssetId!.hashCode) +
+    (id.hashCode) +
+    (isFavorite.hashCode) +
+    (isHidden.hashCode) +
+    (name.hashCode) +
+    (ownerId.hashCode) +
+    (thumbnailPath.hashCode) +
+    (updatedAt.hashCode);
+
+  @override
+  String toString() => 'SyncPersonV1[birthDate=$birthDate, color=$color, createdAt=$createdAt, faceAssetId=$faceAssetId, id=$id, isFavorite=$isFavorite, isHidden=$isHidden, name=$name, ownerId=$ownerId, thumbnailPath=$thumbnailPath, updatedAt=$updatedAt]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+    if (this.birthDate != null) {
+      json[r'birthDate'] = this.birthDate!.toUtc().toIso8601String();
+    } else {
+    //  json[r'birthDate'] = null;
+    }
+    if (this.color != null) {
+      json[r'color'] = this.color;
+    } else {
+    //  json[r'color'] = null;
+    }
+      json[r'createdAt'] = this.createdAt.toUtc().toIso8601String();
+    if (this.faceAssetId != null) {
+      json[r'faceAssetId'] = this.faceAssetId;
+    } else {
+    //  json[r'faceAssetId'] = null;
+    }
+      json[r'id'] = this.id;
+      json[r'isFavorite'] = this.isFavorite;
+      json[r'isHidden'] = this.isHidden;
+      json[r'name'] = this.name;
+      json[r'ownerId'] = this.ownerId;
+      json[r'thumbnailPath'] = this.thumbnailPath;
+      json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
+    return json;
+  }
+
+  /// Returns a new [SyncPersonV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncPersonV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncPersonV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncPersonV1(
+        birthDate: mapDateTime(json, r'birthDate', r''),
+        color: mapValueOfType<String>(json, r'color'),
+        createdAt: mapDateTime(json, r'createdAt', r'')!,
+        faceAssetId: mapValueOfType<String>(json, r'faceAssetId'),
+        id: mapValueOfType<String>(json, r'id')!,
+        isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
+        isHidden: mapValueOfType<bool>(json, r'isHidden')!,
+        name: mapValueOfType<String>(json, r'name')!,
+        ownerId: mapValueOfType<String>(json, r'ownerId')!,
+        thumbnailPath: mapValueOfType<String>(json, r'thumbnailPath')!,
+        updatedAt: mapDateTime(json, r'updatedAt', r'')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncPersonV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncPersonV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncPersonV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncPersonV1> mapFromJson(dynamic json) {
+    final map = <String, SyncPersonV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncPersonV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncPersonV1-objects as value to a dart map
+  static Map<String, List<SyncPersonV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncPersonV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncPersonV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'birthDate',
+    'color',
+    'createdAt',
+    'faceAssetId',
+    'id',
+    'isFavorite',
+    'isHidden',
+    'name',
+    'ownerId',
+    'thumbnailPath',
+    'updatedAt',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_request_type.dart b/mobile/openapi/lib/model/sync_request_type.dart
index c13d791d84..0b121d96c6 100644
--- a/mobile/openapi/lib/model/sync_request_type.dart
+++ b/mobile/openapi/lib/model/sync_request_type.dart
@@ -38,6 +38,7 @@ class SyncRequestType {
   static const partnerStacksV1 = SyncRequestType._(r'PartnerStacksV1');
   static const stacksV1 = SyncRequestType._(r'StacksV1');
   static const usersV1 = SyncRequestType._(r'UsersV1');
+  static const peopleV1 = SyncRequestType._(r'PeopleV1');
 
   /// List of all possible values in this [enum][SyncRequestType].
   static const values = <SyncRequestType>[
@@ -56,6 +57,7 @@ class SyncRequestType {
     partnerStacksV1,
     stacksV1,
     usersV1,
+    peopleV1,
   ];
 
   static SyncRequestType? fromJson(dynamic value) => SyncRequestTypeTypeTransformer().decode(value);
@@ -109,6 +111,7 @@ class SyncRequestTypeTypeTransformer {
         case r'PartnerStacksV1': return SyncRequestType.partnerStacksV1;
         case r'StacksV1': return SyncRequestType.stacksV1;
         case r'UsersV1': return SyncRequestType.usersV1;
+        case r'PeopleV1': return SyncRequestType.peopleV1;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 1624d0ed7e..fbd7165dd5 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13834,6 +13834,8 @@
           "MemoryToAssetDeleteV1",
           "StackV1",
           "StackDeleteV1",
+          "PersonV1",
+          "PersonDeleteV1",
           "SyncAckV1"
         ],
         "type": "string"
@@ -13983,6 +13985,74 @@
         ],
         "type": "object"
       },
+      "SyncPersonDeleteV1": {
+        "properties": {
+          "personId": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "personId"
+        ],
+        "type": "object"
+      },
+      "SyncPersonV1": {
+        "properties": {
+          "birthDate": {
+            "format": "date-time",
+            "nullable": true,
+            "type": "string"
+          },
+          "color": {
+            "nullable": true,
+            "type": "string"
+          },
+          "createdAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "faceAssetId": {
+            "nullable": true,
+            "type": "string"
+          },
+          "id": {
+            "type": "string"
+          },
+          "isFavorite": {
+            "type": "boolean"
+          },
+          "isHidden": {
+            "type": "boolean"
+          },
+          "name": {
+            "type": "string"
+          },
+          "ownerId": {
+            "type": "string"
+          },
+          "thumbnailPath": {
+            "type": "string"
+          },
+          "updatedAt": {
+            "format": "date-time",
+            "type": "string"
+          }
+        },
+        "required": [
+          "birthDate",
+          "color",
+          "createdAt",
+          "faceAssetId",
+          "id",
+          "isFavorite",
+          "isHidden",
+          "name",
+          "ownerId",
+          "thumbnailPath",
+          "updatedAt"
+        ],
+        "type": "object"
+      },
       "SyncRequestType": {
         "enum": [
           "AlbumsV1",
@@ -13999,7 +14069,8 @@
           "PartnerAssetExifsV1",
           "PartnerStacksV1",
           "StacksV1",
-          "UsersV1"
+          "UsersV1",
+          "PeopleV1"
         ],
         "type": "string"
       },
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 55991b8599..c869510b6f 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -4095,6 +4095,8 @@ export enum SyncEntityType {
     MemoryToAssetDeleteV1 = "MemoryToAssetDeleteV1",
     StackV1 = "StackV1",
     StackDeleteV1 = "StackDeleteV1",
+    PersonV1 = "PersonV1",
+    PersonDeleteV1 = "PersonDeleteV1",
     SyncAckV1 = "SyncAckV1"
 }
 export enum SyncRequestType {
@@ -4112,7 +4114,8 @@ export enum SyncRequestType {
     PartnerAssetExifsV1 = "PartnerAssetExifsV1",
     PartnerStacksV1 = "PartnerStacksV1",
     StacksV1 = "StacksV1",
-    UsersV1 = "UsersV1"
+    UsersV1 = "UsersV1",
+    PeopleV1 = "PeopleV1"
 }
 export enum TranscodeHWAccel {
     Nvenc = "nvenc",
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index db1fd29418..53b0041462 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -233,6 +233,26 @@ export class SyncStackDeleteV1 {
   stackId!: string;
 }
 
+@ExtraModel()
+export class SyncPersonV1 {
+  id!: string;
+  createdAt!: Date;
+  updatedAt!: Date;
+  ownerId!: string;
+  name!: string;
+  birthDate!: Date | null;
+  thumbnailPath!: string;
+  isHidden!: boolean;
+  isFavorite!: boolean;
+  color!: string | null;
+  faceAssetId!: string | null;
+}
+
+@ExtraModel()
+export class SyncPersonDeleteV1 {
+  personId!: string;
+}
+
 @ExtraModel()
 export class SyncAckV1 {}
 
@@ -270,6 +290,8 @@ export type SyncItem = {
   [SyncEntityType.PartnerStackBackfillV1]: SyncStackV1;
   [SyncEntityType.PartnerStackDeleteV1]: SyncStackDeleteV1;
   [SyncEntityType.PartnerStackV1]: SyncStackV1;
+  [SyncEntityType.PersonV1]: SyncPersonV1;
+  [SyncEntityType.PersonDeleteV1]: SyncPersonDeleteV1;
   [SyncEntityType.SyncAckV1]: SyncAckV1;
 };
 
diff --git a/server/src/enum.ts b/server/src/enum.ts
index d211420ab5..81af35cf0c 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -588,6 +588,7 @@ export enum SyncRequestType {
   PartnerStacksV1 = 'PartnerStacksV1',
   StacksV1 = 'StacksV1',
   UsersV1 = 'UsersV1',
+  PeopleV1 = 'PeopleV1',
 }
 
 export enum SyncEntityType {
@@ -635,6 +636,9 @@ export enum SyncEntityType {
   StackV1 = 'StackV1',
   StackDeleteV1 = 'StackDeleteV1',
 
+  PersonV1 = 'PersonV1',
+  PersonDeleteV1 = 'PersonDeleteV1',
+
   SyncAckV1 = 'SyncAckV1',
 }
 
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index 50a89655cb..f68be8c83f 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -749,6 +749,40 @@ where
 order by
   "updateId" asc
 
+-- SyncRepository.people.getDeletes
+select
+  "id",
+  "personId"
+from
+  "person_audit"
+where
+  "ownerId" = $1
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
+-- SyncRepository.people.getUpserts
+select
+  "id",
+  "createdAt",
+  "updatedAt",
+  "ownerId",
+  "name",
+  "birthDate",
+  "thumbnailPath",
+  "isHidden",
+  "isFavorite",
+  "color",
+  "updateId",
+  "faceAssetId"
+from
+  "person"
+where
+  "ownerId" = $1
+  and "updatedAt" < now() - interval '1 millisecond'
+order by
+  "updateId" asc
+
 -- SyncRepository.stack.getDeletes
 select
   "id",
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index 699aaec83d..3bc09c97eb 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -15,7 +15,8 @@ type AuditTables =
   | 'album_assets_audit'
   | 'memories_audit'
   | 'memory_assets_audit'
-  | 'stacks_audit';
+  | 'stacks_audit'
+  | 'person_audit';
 type UpsertTables =
   | 'users'
   | 'partners'
@@ -25,7 +26,8 @@ type UpsertTables =
   | 'albums_shared_users_users'
   | 'memories'
   | 'memories_assets_assets'
-  | 'asset_stack';
+  | 'asset_stack'
+  | 'person';
 
 @Injectable()
 export class SyncRepository {
@@ -42,6 +44,7 @@ export class SyncRepository {
   partnerAsset: PartnerAssetsSync;
   partnerAssetExif: PartnerAssetExifsSync;
   partnerStack: PartnerStackSync;
+  people: PersonSync;
   stack: StackSync;
   user: UserSync;
 
@@ -59,6 +62,7 @@ export class SyncRepository {
     this.partnerAsset = new PartnerAssetsSync(this.db);
     this.partnerAssetExif = new PartnerAssetExifsSync(this.db);
     this.partnerStack = new PartnerStackSync(this.db);
+    this.people = new PersonSync(this.db);
     this.stack = new StackSync(this.db);
     this.user = new UserSync(this.db);
   }
@@ -357,6 +361,41 @@ class AssetSync extends BaseSync {
   }
 }
 
+class PersonSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getDeletes(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('person_audit')
+      .select(['id', 'personId'])
+      .where('ownerId', '=', userId)
+      .$call((qb) => this.auditTableFilters(qb, ack))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('person')
+      .select([
+        'id',
+        'createdAt',
+        'updatedAt',
+        'ownerId',
+        'name',
+        'birthDate',
+        'thumbnailPath',
+        'isHidden',
+        'isFavorite',
+        'color',
+        'updateId',
+        'faceAssetId',
+      ])
+      .where('ownerId', '=', userId)
+      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .stream();
+  }
+}
+
 class AssetExifSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
diff --git a/server/src/schema/functions.ts b/server/src/schema/functions.ts
index 1b7a4f884c..424ceb0d33 100644
--- a/server/src/schema/functions.ts
+++ b/server/src/schema/functions.ts
@@ -203,3 +203,16 @@ export const stacks_delete_audit = registerFunction({
       RETURN NULL;
     END`,
 });
+
+export const person_delete_audit = registerFunction({
+  name: 'person_delete_audit',
+  returnType: 'TRIGGER',
+  language: 'PLPGSQL',
+  body: `
+    BEGIN
+      INSERT INTO person_audit ("personId", "ownerId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END`,
+});
diff --git a/server/src/schema/index.ts b/server/src/schema/index.ts
index 6512ccc225..f564e8c7f0 100644
--- a/server/src/schema/index.ts
+++ b/server/src/schema/index.ts
@@ -11,6 +11,7 @@ import {
   memories_delete_audit,
   memory_assets_delete_audit,
   partners_delete_audit,
+  person_delete_audit,
   stacks_delete_audit,
   updated_at,
   users_delete_audit,
@@ -42,6 +43,7 @@ import { NaturalEarthCountriesTable } from 'src/schema/tables/natural-earth-coun
 import { NotificationTable } from 'src/schema/tables/notification.table';
 import { PartnerAuditTable } from 'src/schema/tables/partner-audit.table';
 import { PartnerTable } from 'src/schema/tables/partner.table';
+import { PersonAuditTable } from 'src/schema/tables/person-audit.table';
 import { PersonTable } from 'src/schema/tables/person.table';
 import { SessionTable } from 'src/schema/tables/session.table';
 import { SharedLinkAssetTable } from 'src/schema/tables/shared-link-asset.table';
@@ -92,6 +94,7 @@ export class ImmichDatabase {
     PartnerAuditTable,
     PartnerTable,
     PersonTable,
+    PersonAuditTable,
     SessionTable,
     SharedLinkAssetTable,
     SharedLinkTable,
@@ -124,6 +127,7 @@ export class ImmichDatabase {
     memories_delete_audit,
     memory_assets_delete_audit,
     stacks_delete_audit,
+    person_delete_audit,
   ];
 
   enum = [assets_status_enum, asset_face_source_type, asset_visibility_enum];
@@ -166,6 +170,7 @@ export interface DB {
   partners_audit: PartnerAuditTable;
   partners: PartnerTable;
   person: PersonTable;
+  person_audit: PersonAuditTable;
   sessions: SessionTable;
   session_sync_checkpoints: SessionSyncCheckpointTable;
   shared_link__asset: SharedLinkAssetTable;
diff --git a/server/src/schema/migrations/1752152941084-PeopleAuditTable.ts b/server/src/schema/migrations/1752152941084-PeopleAuditTable.ts
new file mode 100644
index 0000000000..3a3da0ded5
--- /dev/null
+++ b/server/src/schema/migrations/1752152941084-PeopleAuditTable.ts
@@ -0,0 +1,41 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`CREATE OR REPLACE FUNCTION person_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO person_audit ("personId", "ownerId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE TABLE "person_audit" (
+  "id" uuid NOT NULL DEFAULT immich_uuid_v7(),
+  "personId" uuid NOT NULL,
+  "ownerId" uuid NOT NULL,
+  "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp(),
+  CONSTRAINT "PK_46c1ad23490b9312ffaa052aa59" PRIMARY KEY ("id")
+);`.execute(db);
+  await sql`CREATE INDEX "IDX_person_audit_person_id" ON "person_audit" ("personId");`.execute(db);
+  await sql`CREATE INDEX "IDX_person_audit_owner_id" ON "person_audit" ("ownerId");`.execute(db);
+  await sql`CREATE INDEX "IDX_person_audit_deleted_at" ON "person_audit" ("deletedAt");`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "person_delete_audit"
+  AFTER DELETE ON "person"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION person_delete_audit();`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_person_delete_audit', '{"type":"function","name":"person_delete_audit","sql":"CREATE OR REPLACE FUNCTION person_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO person_audit (\\"personId\\", \\"ownerId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_person_delete_audit', '{"type":"trigger","name":"person_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"person_delete_audit\\"\\n  AFTER DELETE ON \\"person\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION person_delete_audit();"}'::jsonb);`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`DROP TRIGGER "person_delete_audit" ON "person";`.execute(db);
+  await sql`DROP TABLE "person_audit";`.execute(db);
+  await sql`DROP FUNCTION person_delete_audit;`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_person_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_person_delete_audit';`.execute(db);
+}
diff --git a/server/src/schema/tables/person-audit.table.ts b/server/src/schema/tables/person-audit.table.ts
new file mode 100644
index 0000000000..f5790629d8
--- /dev/null
+++ b/server/src/schema/tables/person-audit.table.ts
@@ -0,0 +1,17 @@
+import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
+import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
+
+@Table('person_audit')
+export class PersonAuditTable {
+  @PrimaryGeneratedUuidV7Column()
+  id!: Generated<string>;
+
+  @Column({ type: 'uuid', indexName: 'IDX_person_audit_person_id' })
+  personId!: string;
+
+  @Column({ type: 'uuid', indexName: 'IDX_person_audit_owner_id' })
+  ownerId!: string;
+
+  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_person_audit_deleted_at' })
+  deletedAt!: Generated<Timestamp>;
+}
diff --git a/server/src/schema/tables/person.table.ts b/server/src/schema/tables/person.table.ts
index 5835b2528c..193ecb8921 100644
--- a/server/src/schema/tables/person.table.ts
+++ b/server/src/schema/tables/person.table.ts
@@ -1,7 +1,9 @@
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
+import { person_delete_audit } from 'src/schema/functions';
 import { AssetFaceTable } from 'src/schema/tables/asset-face.table';
 import { UserTable } from 'src/schema/tables/user.table';
 import {
+  AfterDeleteTrigger,
   Check,
   Column,
   CreateDateColumn,
@@ -15,6 +17,12 @@ import {
 
 @Table('person')
 @UpdatedAtTrigger('person_updated_at')
+@AfterDeleteTrigger({
+  scope: 'statement',
+  function: person_delete_audit,
+  referencingOldTableAs: 'old',
+  when: 'pg_trigger_depth() = 0',
+})
 @Check({ name: 'CHK_b0f82b0ed662bfc24fbb58bb45', expression: `"birthDate" <= CURRENT_DATE` })
 export class PersonTable {
   @PrimaryGeneratedColumn('uuid')
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index e3322de2e1..5e9c679d7f 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -69,6 +69,7 @@ export const SYNC_TYPES_ORDER = [
   SyncRequestType.PartnerAssetExifsV1,
   SyncRequestType.MemoriesV1,
   SyncRequestType.MemoryToAssetsV1,
+  SyncRequestType.PeopleV1,
 ];
 
 const throwSessionRequired = () => {
@@ -141,6 +142,7 @@ export class SyncService extends BaseService {
       [SyncRequestType.MemoryToAssetsV1]: () => this.syncMemoryAssetsV1(response, checkpointMap, auth),
       [SyncRequestType.StacksV1]: () => this.syncStackV1(response, checkpointMap, auth),
       [SyncRequestType.PartnerStacksV1]: () => this.syncPartnerStackV1(response, checkpointMap, auth, sessionId),
+      [SyncRequestType.PeopleV1]: () => this.syncPeopleV1(response, checkpointMap, auth),
     };
 
     for (const type of SYNC_TYPES_ORDER.filter((type) => dto.types.includes(type))) {
@@ -488,7 +490,7 @@ export class SyncService extends BaseService {
 
   private async syncMemoriesV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
     const deleteType = SyncEntityType.MemoryDeleteV1;
-    const deletes = this.syncRepository.memory.getDeletes(auth.user.id, checkpointMap[SyncEntityType.MemoryDeleteV1]);
+    const deletes = this.syncRepository.memory.getDeletes(auth.user.id, checkpointMap[deleteType]);
     for await (const { id, ...data } of deletes) {
       send(response, { type: deleteType, ids: [id], data });
     }
@@ -576,6 +578,20 @@ export class SyncService extends BaseService {
     }
   }
 
+  private async syncPeopleV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
+    const deleteType = SyncEntityType.PersonDeleteV1;
+    const deletes = this.syncRepository.people.getDeletes(auth.user.id, checkpointMap[deleteType]);
+    for await (const { id, ...data } of deletes) {
+      send(response, { type: deleteType, ids: [id], data });
+    }
+
+    const upsertType = SyncEntityType.PersonV1;
+    const upserts = this.syncRepository.people.getUpserts(auth.user.id, checkpointMap[upsertType]);
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data });
+    }
+  }
+
   private async upsertBackfillCheckpoint(item: { type: SyncEntityType; sessionId: string; createId: string }) {
     const { type, sessionId, createId } = item;
     await this.syncCheckpointRepository.upsertAll([
diff --git a/server/test/medium/specs/sync/sync-person.spec.ts b/server/test/medium/specs/sync/sync-person.spec.ts
new file mode 100644
index 0000000000..807e41894c
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-person.spec.ts
@@ -0,0 +1,87 @@
+import { Kysely } from 'kysely';
+import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { PersonRepository } from 'src/repositories/person.repository';
+import { DB } from 'src/schema';
+import { SyncTestContext } from 'test/medium.factory';
+import { factory } from 'test/small.factory';
+import { getKyselyDB } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(SyncEntityType.PersonV1, () => {
+  it('should detect and sync the first person', async () => {
+    const { auth, ctx } = await setup();
+    const { person } = await ctx.newPerson({ ownerId: auth.user.id });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.PeopleV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: person.id,
+          name: person.name,
+          thumbnailPath: person.thumbnailPath,
+          isHidden: person.isHidden,
+          birthDate: person.birthDate,
+          faceAssetId: person.faceAssetId,
+          isFavorite: person.isFavorite,
+          ownerId: auth.user.id,
+          color: person.color,
+        }),
+        type: 'PersonV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PeopleV1])).resolves.toEqual([]);
+  });
+
+  it('should detect and sync a deleted person', async () => {
+    const { auth, ctx } = await setup();
+    const personRepo = ctx.get(PersonRepository);
+    const { person } = await ctx.newPerson({ ownerId: auth.user.id });
+    await personRepo.delete([person.id]);
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.PeopleV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          personId: person.id,
+        },
+        type: 'PersonDeleteV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.PeopleV1])).resolves.toEqual([]);
+  });
+
+  it('should not sync a person or person delete for an unrelated user', async () => {
+    const { auth, ctx } = await setup();
+    const personRepo = ctx.get(PersonRepository);
+    const { user: user2 } = await ctx.newUser();
+    const { session } = await ctx.newSession({ userId: user2.id });
+    const { person } = await ctx.newPerson({ ownerId: user2.id });
+    const auth2 = factory.auth({ session, user: user2 });
+
+    expect(await ctx.syncStream(auth2, [SyncRequestType.PeopleV1])).toHaveLength(1);
+    expect(await ctx.syncStream(auth, [SyncRequestType.PeopleV1])).toHaveLength(0);
+
+    await personRepo.delete([person.id]);
+    expect(await ctx.syncStream(auth2, [SyncRequestType.PeopleV1])).toHaveLength(1);
+    expect(await ctx.syncStream(auth, [SyncRequestType.PeopleV1])).toHaveLength(0);
+  });
+});
diff --git a/server/tsconfig.json b/server/tsconfig.json
index 8d8d12c54e..e12b614f0d 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -17,6 +17,9 @@
     "skipLibCheck": true,
     "esModuleInterop": true,
     "preserveWatchOutput": true,
+    "paths": {
+      "src/*": ["./src/*"],
+    },
     "baseUrl": "./",
     "jsx": "react",
     "types": ["vitest/globals"],

From 1f50a0075ece6e37ab0d326588793287ab49e518 Mon Sep 17 00:00:00 2001
From: "immich-tofu[bot]" <171590969+immich-tofu[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 15:59:44 +0000
Subject: [PATCH 170/337] chore: modify .github/workflows/org-checks.yml

---
 .github/workflows/org-checks.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/org-checks.yml b/.github/workflows/org-checks.yml
index 55c5dfad5b..9781dc3b83 100644
--- a/.github/workflows/org-checks.yml
+++ b/.github/workflows/org-checks.yml
@@ -2,6 +2,7 @@ name: Org Checks
 
 on:
   pull_request_review:
+  pull_request:
 
 jobs:
   check-approvals:

From 68db17028b712d911cbf9a467016ffba080458b1 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Thu, 10 Jul 2025 11:59:15 -0500
Subject: [PATCH 171/337] feat: new create album page (#19731)

* feat: new create album page

* finished create album flow

* refactor into stateful widgets

* refactor

* focus fix

* lint

* default sort

* pr feedback
---
 mobile/ios/Runner.xcodeproj/project.pbxproj   |  12 +-
 .../domain/services/remote_album.service.dart |  20 +-
 .../repositories/remote_album.repository.dart |  44 +-
 .../presentation/pages/drift_album.page.dart  |  15 +-
 .../pages/drift_create_album.page.dart        | 500 ++++++++++++++++++
 .../infrastructure/album.provider.dart        |   6 +-
 .../infrastructure/remote_album.provider.dart |  27 +
 .../repositories/album_api.repository.dart    |  39 ++
 .../drift_album_api_repository.dart           |  53 ++
 mobile/lib/routing/router.dart                |   6 +
 mobile/lib/routing/router.gr.dart             |  16 +
 11 files changed, 730 insertions(+), 8 deletions(-)
 create mode 100644 mobile/lib/presentation/pages/drift_create_album.page.dart
 create mode 100644 mobile/lib/repositories/drift_album_api_repository.dart

diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index fb0908e8b6..1a39f98db3 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 */
@@ -117,8 +117,6 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -473,10 +471,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";
@@ -505,10 +507,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/lib/domain/services/remote_album.service.dart b/mobile/lib/domain/services/remote_album.service.dart
index 9ff00e1ce3..ae9e8b5336 100644
--- a/mobile/lib/domain/services/remote_album.service.dart
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -1,12 +1,14 @@
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
+import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/utils/remote_album.utils.dart';
 
 class RemoteAlbumService {
   final DriftRemoteAlbumRepository _repository;
+  final DriftAlbumApiRepository _albumApiRepository;
 
-  const RemoteAlbumService(this._repository);
+  const RemoteAlbumService(this._repository, this._albumApiRepository);
 
   Future<List<RemoteAlbum>> getAll() {
     return _repository.getAll();
@@ -57,4 +59,20 @@ class RemoteAlbumService {
 
     return filtered;
   }
+
+  Future<RemoteAlbum> createAlbum({
+    required String title,
+    required List<String> assetIds,
+    String? description,
+  }) async {
+    final album = await _albumApiRepository.createDriftAlbum(
+      title,
+      description: description,
+      assetIds: assetIds,
+    );
+
+    await _repository.create(album, assetIds);
+
+    return album;
+  }
 }
diff --git a/mobile/lib/infrastructure/repositories/remote_album.repository.dart b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
index de55626b30..49d6a2661d 100644
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -1,16 +1,17 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
-enum SortRemoteAlbumsBy { id }
+enum SortRemoteAlbumsBy { id, updatedAt }
 
 class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
   final Drift _db;
   const DriftRemoteAlbumRepository(this._db) : super(_db);
 
   Future<List<RemoteAlbum>> getAll({
-    Set<SortRemoteAlbumsBy> sortBy = const {},
+    Set<SortRemoteAlbumsBy> sortBy = const {SortRemoteAlbumsBy.updatedAt},
   }) {
     final assetCount = _db.remoteAlbumAssetEntity.assetId.count();
 
@@ -43,6 +44,8 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
         orderings.add(
           switch (sort) {
             SortRemoteAlbumsBy.id => OrderingTerm.asc(_db.remoteAlbumEntity.id),
+            SortRemoteAlbumsBy.updatedAt =>
+              OrderingTerm.desc(_db.remoteAlbumEntity.updatedAt),
           },
         );
       }
@@ -58,6 +61,43 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
         )
         .get();
   }
+
+  Future<void> create(
+    RemoteAlbum album,
+    List<String> assetIds,
+  ) async {
+    await _db.transaction(() async {
+      final entity = RemoteAlbumEntityCompanion(
+        id: Value(album.id),
+        name: Value(album.name),
+        ownerId: Value(album.ownerId),
+        createdAt: Value(album.createdAt),
+        updatedAt: Value(album.updatedAt),
+        description: Value(album.description),
+        thumbnailAssetId: Value(album.thumbnailAssetId),
+        isActivityEnabled: Value(album.isActivityEnabled),
+        order: Value(album.order),
+      );
+
+      await _db.remoteAlbumEntity.insertOne(entity);
+
+      if (assetIds.isNotEmpty) {
+        final albumAssets = assetIds.map(
+          (assetId) => RemoteAlbumAssetEntityCompanion(
+            albumId: Value(album.id),
+            assetId: Value(assetId),
+          ),
+        );
+
+        await _db.batch((batch) {
+          batch.insertAll(
+            _db.remoteAlbumAssetEntity,
+            albumAssets,
+          );
+        });
+      }
+    });
+  }
 }
 
 extension on RemoteAlbumEntityData {
diff --git a/mobile/lib/presentation/pages/drift_album.page.dart b/mobile/lib/presentation/pages/drift_album.page.dart
index 4a7b12126a..8ae3c79138 100644
--- a/mobile/lib/presentation/pages/drift_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_album.page.dart
@@ -97,7 +97,20 @@ class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
       onRefresh: onRefresh,
       child: CustomScrollView(
         slivers: [
-          const ImmichSliverAppBar(),
+          ImmichSliverAppBar(
+            actions: [
+              IconButton(
+                icon: const Icon(
+                  Icons.add_rounded,
+                  size: 28,
+                ),
+                onPressed: () => context.pushRoute(
+                  const DriftCreateAlbumRoute(),
+                ),
+              ),
+            ],
+            showUploadButton: false,
+          ),
           _SearchBar(
             searchController: searchController,
             searchFocusNode: searchFocusNode,
diff --git a/mobile/lib/presentation/pages/drift_create_album.page.dart b/mobile/lib/presentation/pages/drift_create_album.page.dart
new file mode 100644
index 0000000000..93dfb265c6
--- /dev/null
+++ b/mobile/lib/presentation/pages/drift_create_album.page.dart
@@ -0,0 +1,500 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/album/album_action_filled_button.dart';
+
+@RoutePage()
+class DriftCreateAlbumPage extends ConsumerStatefulWidget {
+  const DriftCreateAlbumPage({super.key});
+
+  @override
+  ConsumerState<DriftCreateAlbumPage> createState() =>
+      _DriftCreateAlbumPageState();
+}
+
+class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
+  TextEditingController albumTitleController = TextEditingController();
+  TextEditingController albumDescriptionController = TextEditingController();
+  FocusNode albumTitleTextFieldFocusNode = FocusNode();
+  FocusNode albumDescriptionTextFieldFocusNode = FocusNode();
+  bool isAlbumTitleTextFieldFocus = false;
+  Set<BaseAsset> selectedAssets = {};
+
+  @override
+  void dispose() {
+    albumTitleController.dispose();
+    albumDescriptionController.dispose();
+    albumTitleTextFieldFocusNode.dispose();
+    albumDescriptionTextFieldFocusNode.dispose();
+    super.dispose();
+  }
+
+  bool get _canCreateAlbum => albumTitleController.text.isNotEmpty;
+
+  String _getEffectiveTitle() {
+    return albumTitleController.text.isNotEmpty
+        ? albumTitleController.text
+        : 'create_album_page_untitled'.t(context: context);
+  }
+
+  Widget _buildSliverAppBar() {
+    return SliverAppBar(
+      backgroundColor: context.scaffoldBackgroundColor,
+      elevation: 0,
+      automaticallyImplyLeading: false,
+      pinned: true,
+      snap: false,
+      floating: false,
+      bottom: PreferredSize(
+        preferredSize: const Size.fromHeight(200.0),
+        child: SizedBox(
+          height: 200,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              buildTitleInputField(),
+              buildDescriptionInputField(),
+              if (selectedAssets.isNotEmpty) buildControlButton(),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildContent() {
+    if (selectedAssets.isEmpty) {
+      return SliverList(
+        delegate: SliverChildListDelegate([
+          _buildEmptyState(),
+          _buildSelectPhotosButton(),
+        ]),
+      );
+    } else {
+      return _buildSelectedImageGrid();
+    }
+  }
+
+  Widget _buildEmptyState() {
+    return Padding(
+      padding: const EdgeInsets.only(top: 0, left: 18),
+      child: Text(
+        'create_shared_album_page_share_add_assets',
+        style: context.textTheme.labelLarge,
+      ).t(),
+    );
+  }
+
+  Widget _buildSelectPhotosButton() {
+    return Padding(
+      padding: const EdgeInsets.all(16.0),
+      child: FilledButton.icon(
+        style: FilledButton.styleFrom(
+          alignment: Alignment.centerLeft,
+          padding: const EdgeInsets.symmetric(
+            vertical: 24.0,
+            horizontal: 16.0,
+          ),
+          shape: const RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(Radius.circular(10.0)),
+          ),
+          backgroundColor: context.colorScheme.surfaceContainerHigh,
+        ),
+        onPressed: onSelectPhotos,
+        icon: Icon(Icons.add_rounded, color: context.primaryColor),
+        label: Padding(
+          padding: const EdgeInsets.only(
+            left: 8.0,
+          ),
+          child: Text(
+            'create_shared_album_page_share_select_photos',
+            style: context.textTheme.titleMedium?.copyWith(
+              fontWeight: FontWeight.w600,
+              color: context.primaryColor,
+            ),
+          ).t(),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSelectedImageGrid() {
+    return SliverPadding(
+      padding: const EdgeInsets.only(top: 16.0),
+      sliver: SliverGrid(
+        gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+          crossAxisCount: 4,
+          crossAxisSpacing: 1.0,
+          mainAxisSpacing: 1.0,
+        ),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            final asset = selectedAssets.elementAt(index);
+            return GestureDetector(
+              onTap: onBackgroundTapped,
+              child: Thumbnail(asset: asset),
+            );
+          },
+          childCount: selectedAssets.length,
+        ),
+      ),
+    );
+  }
+
+  void onBackgroundTapped() {
+    albumTitleTextFieldFocusNode.unfocus();
+    albumDescriptionTextFieldFocusNode.unfocus();
+    setState(() {
+      isAlbumTitleTextFieldFocus = false;
+    });
+
+    if (albumTitleController.text.isEmpty) {
+      final untitledText = 'create_album_page_untitled'.t();
+      albumTitleController.text = untitledText;
+    }
+  }
+
+  Future<void> onSelectPhotos() async {
+    final assets = await context.pushRoute<Set<BaseAsset>>(
+      DriftAssetSelectionTimelineRoute(
+        lockedSelectionAssets: selectedAssets,
+      ),
+    );
+
+    if (assets == null || assets.isEmpty) {
+      return;
+    }
+
+    setState(() {
+      selectedAssets = selectedAssets.union(assets);
+    });
+  }
+
+  Future<void> createAlbum() async {
+    onBackgroundTapped();
+
+    final title = _getEffectiveTitle().trim();
+    if (title.isEmpty) {
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('create_album_title_required'.t()),
+            backgroundColor: context.colorScheme.error,
+          ),
+        );
+      }
+      return;
+    }
+
+    final album = await ref.watch(remoteAlbumProvider.notifier).createAlbum(
+          title: title,
+          description: albumDescriptionController.text.trim(),
+          assetIds: selectedAssets.map((asset) {
+            final remoteAsset = asset as RemoteAsset;
+            return remoteAsset.id;
+          }).toList(),
+        );
+
+    if (album != null) {
+      context.replaceRoute(
+        RemoteTimelineRoute(album: album),
+      );
+    }
+  }
+
+  Widget buildTitleInputField() {
+    return Padding(
+      padding: const EdgeInsets.only(
+        right: 10.0,
+        left: 10.0,
+      ),
+      child: _AlbumTitleTextField(
+        focusNode: albumTitleTextFieldFocusNode,
+        textController: albumTitleController,
+        isFocus: isAlbumTitleTextFieldFocus,
+        onFocusChanged: (focus) {
+          setState(() {
+            isAlbumTitleTextFieldFocus = focus;
+          });
+        },
+      ),
+    );
+  }
+
+  Widget buildDescriptionInputField() {
+    return Padding(
+      padding: const EdgeInsets.only(
+        right: 10.0,
+        left: 10.0,
+        top: 8,
+      ),
+      child: _AlbumViewerEditableDescription(
+        textController: albumDescriptionController,
+        focusNode: albumDescriptionTextFieldFocusNode,
+      ),
+    );
+  }
+
+  Widget buildControlButton() {
+    return Padding(
+      padding: const EdgeInsets.only(
+        left: 12.0,
+        top: 8.0,
+        bottom: 8.0,
+      ),
+      child: SizedBox(
+        height: 42.0,
+        child: ListView(
+          scrollDirection: Axis.horizontal,
+          children: [
+            AlbumActionFilledButton(
+              iconData: Icons.add_photo_alternate_outlined,
+              onPressed: onSelectPhotos,
+              labelText: "add_photos".t(),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        centerTitle: false,
+        backgroundColor: context.scaffoldBackgroundColor,
+        leading: IconButton(
+          onPressed: () => context.maybePop(),
+          icon: const Icon(Icons.close_rounded),
+        ),
+        title: const Text('create_album').t(),
+        actions: [
+          TextButton(
+            onPressed: _canCreateAlbum ? createAlbum : null,
+            child: Text(
+              'create'.t(),
+              style: TextStyle(
+                fontWeight: FontWeight.bold,
+                color: _canCreateAlbum
+                    ? context.primaryColor
+                    : context.themeData.disabledColor,
+              ),
+            ),
+          ),
+        ],
+      ),
+      body: GestureDetector(
+        onTap: onBackgroundTapped,
+        child: CustomScrollView(
+          slivers: [
+            _buildSliverAppBar(),
+            _buildContent(),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _AlbumTitleTextField extends StatefulWidget {
+  const _AlbumTitleTextField({
+    required this.focusNode,
+    required this.textController,
+    required this.isFocus,
+    required this.onFocusChanged,
+  });
+
+  final FocusNode focusNode;
+  final TextEditingController textController;
+  final bool isFocus;
+  final ValueChanged<bool> onFocusChanged;
+
+  @override
+  State<_AlbumTitleTextField> createState() => _AlbumTitleTextFieldState();
+}
+
+class _AlbumTitleTextFieldState extends State<_AlbumTitleTextField> {
+  @override
+  void initState() {
+    super.initState();
+    widget.focusNode.addListener(_onFocusChange);
+  }
+
+  @override
+  void dispose() {
+    widget.focusNode.removeListener(_onFocusChange);
+    super.dispose();
+  }
+
+  void _onFocusChange() {
+    widget.onFocusChanged(widget.focusNode.hasFocus);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return TextField(
+      focusNode: widget.focusNode,
+      style: TextStyle(
+        fontSize: 28.0,
+        color: context.colorScheme.onSurface,
+        fontWeight: FontWeight.bold,
+      ),
+      controller: widget.textController,
+      onTap: () {
+        if (widget.textController.text ==
+            'create_album_page_untitled'.t(context: context)) {
+          widget.textController.clear();
+        }
+      },
+      decoration: InputDecoration(
+        contentPadding: const EdgeInsets.symmetric(
+          horizontal: 8.0,
+          vertical: 16.0,
+        ),
+        suffixIcon: widget.textController.text.isNotEmpty && widget.isFocus
+            ? IconButton(
+                onPressed: () {
+                  widget.textController.clear();
+                },
+                icon: Icon(
+                  Icons.cancel_rounded,
+                  color: context.primaryColor,
+                ),
+                splashRadius: 10.0,
+              )
+            : null,
+        enabledBorder: const OutlineInputBorder(
+          borderSide: BorderSide(color: Colors.transparent),
+          borderRadius: BorderRadius.all(
+            Radius.circular(16.0),
+          ),
+        ),
+        focusedBorder: OutlineInputBorder(
+          borderSide: BorderSide(
+            color: context.primaryColor.withValues(alpha: 0.3),
+          ),
+          borderRadius: const BorderRadius.all(
+            Radius.circular(16.0),
+          ),
+        ),
+        hintText: 'add_a_title'.t(),
+        hintStyle: context.themeData.inputDecorationTheme.hintStyle?.copyWith(
+          fontSize: 28.0,
+          fontWeight: FontWeight.bold,
+          height: 1.2,
+        ),
+        focusColor: Colors.grey[300],
+        fillColor: context.colorScheme.surfaceContainerHigh,
+        filled: true,
+      ),
+    );
+  }
+}
+
+class _AlbumViewerEditableDescription extends StatefulWidget {
+  const _AlbumViewerEditableDescription({
+    required this.textController,
+    required this.focusNode,
+  });
+
+  final TextEditingController textController;
+  final FocusNode focusNode;
+
+  @override
+  State<_AlbumViewerEditableDescription> createState() =>
+      _AlbumViewerEditableDescriptionState();
+}
+
+class _AlbumViewerEditableDescriptionState
+    extends State<_AlbumViewerEditableDescription> {
+  @override
+  void initState() {
+    super.initState();
+    widget.focusNode.addListener(_onFocusModeChange);
+    widget.textController.addListener(_onTextChange);
+  }
+
+  @override
+  void dispose() {
+    widget.focusNode.removeListener(_onFocusModeChange);
+    widget.textController.removeListener(_onTextChange);
+    super.dispose();
+  }
+
+  void _onFocusModeChange() {
+    setState(() {
+      if (!widget.focusNode.hasFocus && widget.textController.text.isEmpty) {
+        widget.textController.clear();
+      }
+    });
+  }
+
+  void _onTextChange() {
+    setState(() {});
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: Colors.transparent,
+      child: TextField(
+        focusNode: widget.focusNode,
+        style: context.textTheme.bodyLarge,
+        maxLines: 3,
+        minLines: 1,
+        controller: widget.textController,
+        decoration: InputDecoration(
+          contentPadding: const EdgeInsets.symmetric(
+            horizontal: 12.0,
+            vertical: 16.0,
+          ),
+          suffixIcon:
+              widget.focusNode.hasFocus && widget.textController.text.isNotEmpty
+                  ? IconButton(
+                      onPressed: () {
+                        widget.textController.clear();
+                      },
+                      icon: Icon(
+                        Icons.cancel_rounded,
+                        color: context.primaryColor,
+                      ),
+                      splashRadius: 10.0,
+                    )
+                  : null,
+          enabledBorder: OutlineInputBorder(
+            borderSide: BorderSide(
+              color: context.colorScheme.outline.withValues(alpha: 0.3),
+            ),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(16.0),
+            ),
+          ),
+          focusedBorder: OutlineInputBorder(
+            borderSide: BorderSide(
+              color: context.primaryColor.withValues(alpha: 0.3),
+            ),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(16.0),
+            ),
+          ),
+          hintStyle: context.themeData.inputDecorationTheme.hintStyle?.copyWith(
+            fontSize: 16.0,
+            color: context.colorScheme.onSurface.withValues(alpha: 0.6),
+          ),
+          focusColor: Colors.grey[300],
+          fillColor: context.scaffoldBackgroundColor,
+          filled: widget.focusNode.hasFocus,
+          hintText: 'add_a_description'.t(),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/providers/infrastructure/album.provider.dart b/mobile/lib/providers/infrastructure/album.provider.dart
index 4a6db50697..4ec3453d16 100644
--- a/mobile/lib/providers/infrastructure/album.provider.dart
+++ b/mobile/lib/providers/infrastructure/album.provider.dart
@@ -7,6 +7,7 @@ import 'package:immich_mobile/infrastructure/repositories/local_album.repository
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
+import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 
 final localAlbumRepository = Provider<DriftLocalAlbumRepository>(
   (ref) => DriftLocalAlbumRepository(ref.watch(driftProvider)),
@@ -30,7 +31,10 @@ final remoteAlbumRepository = Provider<DriftRemoteAlbumRepository>(
 );
 
 final remoteAlbumServiceProvider = Provider<RemoteAlbumService>(
-  (ref) => RemoteAlbumService(ref.watch(remoteAlbumRepository)),
+  (ref) => RemoteAlbumService(
+    ref.watch(remoteAlbumRepository),
+    ref.watch(driftAlbumApiRepositoryProvider),
+  ),
   dependencies: [remoteAlbumRepository],
 );
 
diff --git a/mobile/lib/providers/infrastructure/remote_album.provider.dart b/mobile/lib/providers/infrastructure/remote_album.provider.dart
index b80d791b0a..84db53ab9f 100644
--- a/mobile/lib/providers/infrastructure/remote_album.provider.dart
+++ b/mobile/lib/providers/infrastructure/remote_album.provider.dart
@@ -118,4 +118,31 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
         .sortAlbums(state.filteredAlbums, sortMode, isReverse: isReverse);
     state = state.copyWith(filteredAlbums: sortedAlbums);
   }
+
+  Future<RemoteAlbum?> createAlbum({
+    required String title,
+    String? description,
+    List<String> assetIds = const [],
+  }) async {
+    state = state.copyWith(isLoading: true, error: null);
+
+    try {
+      final album = await _remoteAlbumService.createAlbum(
+        title: title,
+        description: description,
+        assetIds: assetIds,
+      );
+
+      state = state.copyWith(
+        albums: [...state.albums, album],
+        filteredAlbums: [...state.filteredAlbums, album],
+      );
+
+      state = state.copyWith(isLoading: false);
+      return album;
+    } catch (e) {
+      state = state.copyWith(isLoading: false, error: e.toString());
+      rethrow;
+    }
+  }
 }
diff --git a/mobile/lib/repositories/album_api.repository.dart b/mobile/lib/repositories/album_api.repository.dart
index 019e4dc63c..20365534c2 100644
--- a/mobile/lib/repositories/album_api.repository.dart
+++ b/mobile/lib/repositories/album_api.repository.dart
@@ -1,5 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart'
+    show AlbumAssetOrder, RemoteAlbum;
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
@@ -50,6 +52,25 @@ class AlbumApiRepository extends ApiRepository {
     return _toAlbum(responseDto);
   }
 
+  // TODO: Change name after removing old method
+  Future<RemoteAlbum> createDriftAlbum(
+    String name, {
+    required Iterable<String> assetIds,
+    String? description,
+  }) async {
+    final responseDto = await checkNull(
+      _api.createAlbum(
+        CreateAlbumDto(
+          albumName: name,
+          description: description,
+          assetIds: assetIds.toList(),
+        ),
+      ),
+    );
+
+    return _toRemoteAlbum(responseDto);
+  }
+
   Future<Album> update(
     String albumId, {
     String? name,
@@ -170,4 +191,22 @@ class AlbumApiRepository extends ApiRepository {
 
     return album;
   }
+
+  static RemoteAlbum _toRemoteAlbum(AlbumResponseDto dto) {
+    return RemoteAlbum(
+      id: dto.id,
+      name: dto.albumName,
+      ownerId: dto.owner.id,
+      description: dto.description,
+      createdAt: dto.createdAt,
+      updatedAt: dto.updatedAt,
+      thumbnailAssetId: dto.albumThumbnailAssetId,
+      isActivityEnabled: dto.isActivityEnabled,
+      order: dto.order == AssetOrder.asc
+          ? AlbumAssetOrder.asc
+          : AlbumAssetOrder.desc,
+      assetCount: dto.assetCount,
+      ownerName: dto.owner.name,
+    );
+  }
 }
diff --git a/mobile/lib/repositories/drift_album_api_repository.dart b/mobile/lib/repositories/drift_album_api_repository.dart
new file mode 100644
index 0000000000..3539012895
--- /dev/null
+++ b/mobile/lib/repositories/drift_album_api_repository.dart
@@ -0,0 +1,53 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/providers/api.provider.dart';
+import 'package:immich_mobile/repositories/api.repository.dart';
+// ignore: import_rule_openapi
+import 'package:openapi/api.dart';
+
+final driftAlbumApiRepositoryProvider = Provider(
+  (ref) => DriftAlbumApiRepository(ref.watch(apiServiceProvider).albumsApi),
+);
+
+class DriftAlbumApiRepository extends ApiRepository {
+  final AlbumsApi _api;
+
+  DriftAlbumApiRepository(this._api);
+
+  Future<RemoteAlbum> createDriftAlbum(
+    String name, {
+    required Iterable<String> assetIds,
+    String? description,
+  }) async {
+    final responseDto = await checkNull(
+      _api.createAlbum(
+        CreateAlbumDto(
+          albumName: name,
+          description: description,
+          assetIds: assetIds.toList(),
+        ),
+      ),
+    );
+
+    return responseDto.toRemoteAlbum();
+  }
+}
+
+extension on AlbumResponseDto {
+  RemoteAlbum toRemoteAlbum() {
+    return RemoteAlbum(
+      id: id,
+      name: albumName,
+      ownerId: owner.id,
+      description: description,
+      createdAt: createdAt,
+      updatedAt: updatedAt,
+      thumbnailAssetId: albumThumbnailAssetId,
+      isActivityEnabled: isActivityEnabled,
+      order:
+          order == AssetOrder.asc ? AlbumAssetOrder.asc : AlbumAssetOrder.desc,
+      assetCount: assetCount,
+      ownerName: owner.name,
+    );
+  }
+}
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 7becbd4804..63dc194ac6 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -85,6 +85,7 @@ import 'package:immich_mobile/presentation/pages/dev/remote_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_library.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_asset_selection_timeline.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_create_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_memory.page.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.page.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
@@ -448,6 +449,11 @@ class AppRouter extends RootStackRouter {
       page: DriftLocalAlbumsRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftCreateAlbumRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
+
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 8e8da4d8d0..51d171c582 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -683,6 +683,22 @@ class DriftAssetSelectionTimelineRouteArgs {
   }
 }
 
+/// generated route for
+/// [DriftCreateAlbumPage]
+class DriftCreateAlbumRoute extends PageRouteInfo<void> {
+  const DriftCreateAlbumRoute({List<PageRouteInfo>? children})
+      : super(DriftCreateAlbumRoute.name, initialChildren: children);
+
+  static const String name = 'DriftCreateAlbumRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftCreateAlbumPage();
+    },
+  );
+}
+
 /// generated route for
 /// [DriftFavoritePage]
 class DriftFavoriteRoute extends PageRouteInfo<void> {

From 4ddd3764b494dfde9ca5abfad3cc576cc52a3662 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Fri, 11 Jul 2025 00:59:52 +0800
Subject: [PATCH 172/337] feat(mobile): hide storage indicator outside main
 timeline (#19835)

* feat(mobile): hide storage indicator outside main timeline

* fix: lint

* set default as false

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 mobile/lib/presentation/pages/dev/main_timeline.page.dart | 7 ++++---
 .../pages/drift_asset_selection_timeline.page.dart        | 2 +-
 .../widgets/timeline/fixed/segment.model.dart             | 4 ++++
 .../lib/presentation/widgets/timeline/timeline.state.dart | 8 ++++++--
 .../presentation/widgets/timeline/timeline.widget.dart    | 3 +++
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/mobile/lib/presentation/pages/dev/main_timeline.page.dart b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
index 9ec8002463..7216b638e1 100644
--- a/mobile/lib/presentation/pages/dev/main_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
@@ -16,17 +16,18 @@ class MainTimelinePage extends ConsumerWidget {
     return memoryLaneProvider.when(
       data: (memories) {
         return memories.isEmpty
-            ? const Timeline()
+            ? const Timeline(showStorageIndicator: true)
             : Timeline(
                 topSliverWidget: SliverToBoxAdapter(
                   key: Key('memory-lane-${memories.first.assets.first.id}'),
                   child: DriftMemoryLane(memories: memories),
                 ),
                 topSliverWidgetHeight: 200,
+                showStorageIndicator: true,
               );
       },
-      loading: () => const Timeline(),
-      error: (error, stackTrace) => const Timeline(),
+      loading: () => const Timeline(showStorageIndicator: true),
+      error: (error, stackTrace) => const Timeline(showStorageIndicator: true),
     );
   }
 }
diff --git a/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart b/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
index df6211c338..7ac378e4f5 100644
--- a/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
+++ b/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
@@ -33,7 +33,7 @@ class DriftAssetSelectionTimelinePage extends ConsumerWidget {
             final user = ref.watch(currentUserProvider);
             if (user == null) {
               throw Exception(
-                'User must be logged in to access recently taken',
+                'User must be logged in to access asset selection timeline',
               );
             }
 
diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
index 14b1a4616d..70d8658b39 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -206,6 +206,9 @@ class _AssetTileWidget extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final lockSelection = _getLockSelectionStatus(ref);
+    final showStorageIndicator = ref.watch(
+      timelineArgsProvider.select((args) => args.showStorageIndicator),
+    );
 
     return RepaintBoundary(
       child: GestureDetector(
@@ -217,6 +220,7 @@ class _AssetTileWidget extends ConsumerWidget {
         child: ThumbnailTile(
           asset,
           lockSelection: lockSelection,
+          showStorageIndicator: showStorageIndicator,
         ),
       ),
     );
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.state.dart b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
index 629fac7831..30a4088ce2 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.state.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
@@ -14,12 +14,14 @@ class TimelineArgs {
   final double maxHeight;
   final double spacing;
   final int columnCount;
+  final bool showStorageIndicator;
 
   const TimelineArgs({
     required this.maxWidth,
     required this.maxHeight,
     this.spacing = kTimelineSpacing,
     this.columnCount = kTimelineColumnCount,
+    this.showStorageIndicator = false,
   });
 
   @override
@@ -27,7 +29,8 @@ class TimelineArgs {
     return spacing == other.spacing &&
         maxWidth == other.maxWidth &&
         maxHeight == other.maxHeight &&
-        columnCount == other.columnCount;
+        columnCount == other.columnCount &&
+        showStorageIndicator == other.showStorageIndicator;
   }
 
   @override
@@ -35,7 +38,8 @@ class TimelineArgs {
       maxWidth.hashCode ^
       maxHeight.hashCode ^
       spacing.hashCode ^
-      columnCount.hashCode;
+      columnCount.hashCode ^
+      showStorageIndicator.hashCode;
 }
 
 class TimelineState {
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 6d3351e9c2..bc1b044044 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -26,11 +26,13 @@ class Timeline extends StatelessWidget {
     super.key,
     this.topSliverWidget,
     this.topSliverWidgetHeight,
+    this.showStorageIndicator = false,
     this.appBar,
   });
 
   final Widget? topSliverWidget;
   final double? topSliverWidgetHeight;
+  final bool showStorageIndicator;
   final Widget? appBar;
 
   @override
@@ -46,6 +48,7 @@ class Timeline extends StatelessWidget {
                 columnCount: ref.watch(
                   settingsProvider.select((s) => s.get(Setting.tilesPerRow)),
                 ),
+                showStorageIndicator: showStorageIndicator,
               ),
             ),
           ],

From 39c95f12800ed63cd2709cf10e1d01481c569e19 Mon Sep 17 00:00:00 2001
From: Zack Pollard <zack@futo.org>
Date: Thu, 10 Jul 2025 18:18:51 +0100
Subject: [PATCH 173/337] refactor: rename geodata pk constraint to match
 runtime constraint name (#19856)

---
 .../1752161055253-RenameGeodataPKConstraint.ts           | 9 +++++++++
 server/src/schema/tables/geodata-places.table.ts         | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts

diff --git a/server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts b/server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts
new file mode 100644
index 0000000000..686791e201
--- /dev/null
+++ b/server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts
@@ -0,0 +1,9 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`ALTER TABLE "geodata_places" DROP CONSTRAINT IF EXISTS "PK_c29918988912ef4036f3d7fbff4";`.execute(db);
+  await sql`ALTER TABLE "geodata_places" DROP CONSTRAINT IF EXISTS "geodata_places_pkey"`.execute(db);
+  await sql`ALTER TABLE "geodata_places" ADD CONSTRAINT "geodata_places_pkey" PRIMARY KEY ("id");`.execute(db);
+}
+
+export async function down(): Promise<void> {}
diff --git a/server/src/schema/tables/geodata-places.table.ts b/server/src/schema/tables/geodata-places.table.ts
index abdc213e7c..eec2b240d0 100644
--- a/server/src/schema/tables/geodata-places.table.ts
+++ b/server/src/schema/tables/geodata-places.table.ts
@@ -1,6 +1,6 @@
 import { Column, Index, PrimaryColumn, Table, Timestamp } from 'src/sql-tools';
 
-@Table({ name: 'geodata_places' })
+@Table({ name: 'geodata_places', primaryConstraintName: 'geodata_places_pkey' })
 @Index({
   name: 'idx_geodata_places_alternate_names',
   using: 'gin',

From ed4c7817e73012841808c37f94350247a8658873 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Thu, 10 Jul 2025 13:30:10 -0400
Subject: [PATCH 174/337] feat: AssetUploadReadyV1 event (#19858)

---
 server/src/repositories/event.repository.ts |  3 ++
 server/src/services/job.service.ts          | 49 +++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/server/src/repositories/event.repository.ts b/server/src/repositories/event.repository.ts
index 307b8b0ef4..41966450ee 100644
--- a/server/src/repositories/event.repository.ts
+++ b/server/src/repositories/event.repository.ts
@@ -16,6 +16,7 @@ import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { NotificationDto } from 'src/dtos/notification.dto';
 import { ReleaseNotification, ServerVersionResponseDto } from 'src/dtos/server.dto';
+import { SyncAssetExifV1, SyncAssetV1 } from 'src/dtos/sync.dto';
 import { ImmichWorker, MetadataKey, QueueName } from 'src/enum';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
@@ -109,6 +110,8 @@ export interface ClientEventMap {
   on_new_release: [ReleaseNotification];
   on_notification: [NotificationDto];
   on_session_delete: [string];
+
+  AssetUploadReadyV1: [{ asset: SyncAssetV1; exif: SyncAssetExifV1 }];
 }
 
 export type EventItem<T extends EmitEvent> = {
diff --git a/server/src/services/job.service.ts b/server/src/services/job.service.ts
index fd573d9b97..e4b20ba37f 100644
--- a/server/src/services/job.service.ts
+++ b/server/src/services/job.service.ts
@@ -19,6 +19,7 @@ import {
 import { ArgOf, ArgsOf } from 'src/repositories/event.repository';
 import { BaseService } from 'src/services/base.service';
 import { ConcurrentQueueName, JobItem } from 'src/types';
+import { hexOrBufferToBase64 } from 'src/utils/bytes';
 
 const asJobItem = (dto: JobCreateDto): JobItem => {
   switch (dto.name) {
@@ -304,6 +305,54 @@ export class JobService extends BaseService {
         await this.jobRepository.queueAll(jobs);
         if (asset.visibility === AssetVisibility.TIMELINE || asset.visibility === AssetVisibility.ARCHIVE) {
           this.eventRepository.clientSend('on_upload_success', asset.ownerId, mapAsset(asset));
+          if (asset.exifInfo) {
+            const exif = asset.exifInfo;
+            this.eventRepository.clientSend('AssetUploadReadyV1', asset.ownerId, {
+              // TODO remove `on_upload_success` and then modify the query to select only the required fields)
+              asset: {
+                id: asset.id,
+                ownerId: asset.ownerId,
+                originalFileName: asset.originalFileName,
+                thumbhash: asset.thumbhash ? hexOrBufferToBase64(asset.thumbhash) : null,
+                checksum: hexOrBufferToBase64(asset.checksum),
+                fileCreatedAt: asset.fileCreatedAt,
+                fileModifiedAt: asset.fileModifiedAt,
+                localDateTime: asset.localDateTime,
+                duration: asset.duration,
+                type: asset.type,
+                deletedAt: asset.deletedAt,
+                isFavorite: asset.isFavorite,
+                visibility: asset.visibility,
+              },
+              exif: {
+                assetId: exif.assetId,
+                description: exif.description,
+                exifImageWidth: exif.exifImageWidth,
+                exifImageHeight: exif.exifImageHeight,
+                fileSizeInByte: exif.fileSizeInByte,
+                orientation: exif.orientation,
+                dateTimeOriginal: exif.dateTimeOriginal,
+                modifyDate: exif.modifyDate,
+                timeZone: exif.timeZone,
+                latitude: exif.latitude,
+                longitude: exif.longitude,
+                projectionType: exif.projectionType,
+                city: exif.city,
+                state: exif.state,
+                country: exif.country,
+                make: exif.make,
+                model: exif.model,
+                lensModel: exif.lensModel,
+                fNumber: exif.fNumber,
+                focalLength: exif.focalLength,
+                iso: exif.iso,
+                exposureTime: exif.exposureTime,
+                profileDescription: exif.profileDescription,
+                rating: exif.rating,
+                fps: exif.fps,
+              },
+            });
+          }
         }
 
         break;

From 55fe67dd2045637089d402aeab16643da007496f Mon Sep 17 00:00:00 2001
From: SGT <dahool@users.noreply.github.com>
Date: Thu, 10 Jul 2025 14:37:56 -0300
Subject: [PATCH 175/337] fix(server): clear activity when asset is removed
 from album (#19019)

---
 e2e/src/api/specs/activity.e2e-spec.ts        | 32 +++++++++++++++++++
 .../1750323941567-AddActivityAssetFk.ts       | 19 +++++++++++
 server/src/schema/tables/activity.table.ts    | 10 ++++++
 3 files changed, 61 insertions(+)
 create mode 100644 server/src/schema/migrations/1750323941567-AddActivityAssetFk.ts

diff --git a/e2e/src/api/specs/activity.e2e-spec.ts b/e2e/src/api/specs/activity.e2e-spec.ts
index 70c32313f1..9ce9b4b916 100644
--- a/e2e/src/api/specs/activity.e2e-spec.ts
+++ b/e2e/src/api/specs/activity.e2e-spec.ts
@@ -7,6 +7,7 @@ import {
   ReactionType,
   createActivity as create,
   createAlbum,
+  removeAssetFromAlbum,
 } from '@immich/sdk';
 import { createUserDto, uuidDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
@@ -342,5 +343,36 @@ describe('/activities', () => {
 
       expect(status).toBe(204);
     });
+
+    it('should return empty list when asset is removed', async () => {
+      const album3 = await createAlbum(
+        {
+          createAlbumDto: {
+            albumName: 'Album 3',
+            assetIds: [asset.id],
+          },
+        },
+        { headers: asBearerAuth(admin.accessToken) },
+      );
+
+      await createActivity({ albumId: album3.id, assetId: asset.id, type: ReactionType.Like });
+
+      await removeAssetFromAlbum(
+        {
+          id: album3.id,
+          bulkIdsDto: {
+            ids: [asset.id],
+          },
+        },
+        { headers: asBearerAuth(admin.accessToken) },
+      );
+
+      const { status, body } = await request(app)
+        .get('/activities')
+        .query({ albumId: album.id })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toEqual(200);
+      expect(body).toEqual([]);
+    });
   });
 });
diff --git a/server/src/schema/migrations/1750323941567-AddActivityAssetFk.ts b/server/src/schema/migrations/1750323941567-AddActivityAssetFk.ts
new file mode 100644
index 0000000000..938c716014
--- /dev/null
+++ b/server/src/schema/migrations/1750323941567-AddActivityAssetFk.ts
@@ -0,0 +1,19 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`DELETE FROM activity AS a
+          WHERE a."assetId" IS NOT NULL
+          AND NOT EXISTS (
+            SELECT 1
+              FROM albums_assets_assets AS aaa
+              WHERE a."albumId" = aaa."albumsId"
+              AND a."assetId" = aaa."assetsId"
+        );`.execute(db);
+  await sql`ALTER TABLE "activity" ADD CONSTRAINT "fk_activity_album_asset_composite" FOREIGN KEY ("albumId", "assetId") REFERENCES "albums_assets_assets" ("albumsId", "assetsId") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(db);
+  await sql`CREATE INDEX "IDX_86102d85cfa7f196073aebff68" ON "activity" ("albumId", "assetId")`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`DROP INDEX "IDX_86102d85cfa7f196073aebff68";`.execute(db);
+  await sql`ALTER TABLE "activity" DROP CONSTRAINT "fk_activity_album_asset_composite";`.execute(db);
+}
diff --git a/server/src/schema/tables/activity.table.ts b/server/src/schema/tables/activity.table.ts
index 47fca24bb1..778cfb14bb 100644
--- a/server/src/schema/tables/activity.table.ts
+++ b/server/src/schema/tables/activity.table.ts
@@ -1,4 +1,5 @@
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
+import { AlbumAssetTable } from 'src/schema/tables/album-asset.table';
 import { AlbumTable } from 'src/schema/tables/album.table';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { UserTable } from 'src/schema/tables/user.table';
@@ -7,6 +8,7 @@ import {
   Column,
   CreateDateColumn,
   ForeignKeyColumn,
+  ForeignKeyConstraint,
   Generated,
   Index,
   PrimaryGeneratedColumn,
@@ -27,6 +29,14 @@ import {
   name: 'CHK_2ab1e70f113f450eb40c1e3ec8',
   expression: `("comment" IS NULL AND "isLiked" = true) OR ("comment" IS NOT NULL AND "isLiked" = false)`,
 })
+@ForeignKeyConstraint({
+  name: 'fk_activity_album_asset_composite',
+  columns: ['albumId', 'assetId'],
+  referenceTable: () => AlbumAssetTable,
+  referenceColumns: ['albumsId', 'assetsId'],
+  onUpdate: 'NO ACTION',
+  onDelete: 'CASCADE',
+})
 export class ActivityTable {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;

From d178c52ba60e95e46233385c964b4b681fb052bd Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Thu, 10 Jul 2025 14:27:42 -0500
Subject: [PATCH 176/337] fix: cold start deep link logic (#19859)

---
 mobile/lib/main.dart | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 1f18ecdf5a..1b63e303f7 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -176,10 +176,13 @@ class ImmichAppState extends ConsumerState<ImmichApp>
     final deepLinkHandler = ref.read(deepLinkServiceProvider);
     final currentRouteName = ref.read(currentRouteNameProvider.notifier).state;
 
+    final isColdStart =
+        currentRouteName == null || currentRouteName == SplashScreenRoute.name;
+
     if (deepLink.uri.scheme == "immich") {
       final proposedRoute = await deepLinkHandler.handleScheme(
         deepLink,
-        currentRouteName == SplashScreenRoute.name,
+        isColdStart,
       );
 
       return proposedRoute;
@@ -188,7 +191,7 @@ class ImmichAppState extends ConsumerState<ImmichApp>
     if (deepLink.uri.host == "my.immich.app") {
       final proposedRoute = await deepLinkHandler.handleMyImmichApp(
         deepLink,
-        currentRouteName == SplashScreenRoute.name,
+        isColdStart,
       );
 
       return proposedRoute;

From 70b73145f10f6af93e74f96d27d83bc8f49c77c8 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 11 Jul 2025 01:51:50 +0530
Subject: [PATCH 177/337] fix: ensure buffer loaded before opening asset viewer
 (#19864)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../presentation/widgets/timeline/fixed/segment.model.dart   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
index 70d8658b39..d12f82d27d 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -159,17 +159,18 @@ class _AssetTileWidget extends ConsumerWidget {
     required this.assetIndex,
   });
 
-  void _handleOnTap(
+  Future _handleOnTap(
     BuildContext ctx,
     WidgetRef ref,
     int assetIndex,
     BaseAsset asset,
-  ) {
+  ) async {
     final multiSelectState = ref.read(multiSelectProvider);
 
     if (multiSelectState.forceEnable || multiSelectState.isEnabled) {
       ref.read(multiSelectProvider.notifier).toggleAssetSelection(asset);
     } else {
+      await ref.read(timelineServiceProvider).loadAssets(assetIndex, 1);
       ctx.pushRoute(
         AssetViewerRoute(
           initialIndex: assetIndex,

From 7d8f56b4835b5c97aa608e630d9505cf3a39429b Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 11 Jul 2025 01:55:18 +0530
Subject: [PATCH 178/337] chore: hero animations (#19860)

* remove herocontrollerscope

* handle heroOffset in new timeline

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 mobile/lib/main.dart                               |  5 +++--
 mobile/lib/pages/common/tab_controller.page.dart   | 14 +++++---------
 mobile/lib/pages/common/tab_shell.page.dart        |  8 ++------
 .../widgets/asset_viewer/asset_viewer.page.dart    |  8 ++++++--
 .../widgets/images/thumbnail_tile.widget.dart      |  5 ++++-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 1b63e303f7..bf79c28361 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -23,12 +23,12 @@ import 'package:immich_mobile/providers/theme.provider.dart';
 import 'package:immich_mobile/routing/app_navigation_observer.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/background.service.dart';
+import 'package:immich_mobile/services/deep_link.service.dart';
 import 'package:immich_mobile/services/local_notification.service.dart';
 import 'package:immich_mobile/theme/dynamic_theme.dart';
 import 'package:immich_mobile/theme/theme_data.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/cache/widgets_binding.dart';
-import 'package:immich_mobile/services/deep_link.service.dart';
 import 'package:immich_mobile/utils/download.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/utils/migration.dart';
@@ -253,7 +253,8 @@ class ImmichAppState extends ConsumerState<ImmichApp>
         ),
         routerConfig: router.config(
           deepLinkBuilder: _deepLinkBuilder,
-          navigatorObservers: () => [AppNavigationObserver(ref: ref)],
+          navigatorObservers: () =>
+              [AppNavigationObserver(ref: ref), HeroController()],
         ),
       ),
     );
diff --git a/mobile/lib/pages/common/tab_controller.page.dart b/mobile/lib/pages/common/tab_controller.page.dart
index 0188d953dc..e713b3f8da 100644
--- a/mobile/lib/pages/common/tab_controller.page.dart
+++ b/mobile/lib/pages/common/tab_controller.page.dart
@@ -4,13 +4,13 @@ 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/providers/album/album.provider.dart';
+import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/multiselect.provider.dart';
 import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/providers/asset.provider.dart';
-import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/tab.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 
 @RoutePage()
 class TabControllerPage extends HookConsumerWidget {
@@ -158,10 +158,6 @@ class TabControllerPage extends HookConsumerWidget {
       ),
       builder: (context, child) {
         final tabsRouter = AutoTabsRouter.of(context);
-        final heroedChild = HeroControllerScope(
-          controller: HeroController(),
-          child: child,
-        );
         return PopScope(
           canPop: tabsRouter.activeIndex == 0,
           onPopInvokedWithResult: (didPop, _) =>
@@ -173,10 +169,10 @@ class TabControllerPage extends HookConsumerWidget {
                     children: [
                       navigationRail(tabsRouter),
                       const VerticalDivider(),
-                      Expanded(child: heroedChild),
+                      Expanded(child: child),
                     ],
                   )
-                : heroedChild,
+                : child,
             bottomNavigationBar: multiselectEnabled || isScreenLandscape
                 ? null
                 : bottomNavigationBar(tabsRouter),
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index d5d53360b0..4eab0e32cf 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -127,10 +127,6 @@ class TabShellPage extends ConsumerWidget {
       ),
       builder: (context, child) {
         final tabsRouter = AutoTabsRouter.of(context);
-        final heroedChild = HeroControllerScope(
-          controller: HeroController(),
-          child: child,
-        );
         return PopScope(
           canPop: tabsRouter.activeIndex == 0,
           onPopInvokedWithResult: (didPop, _) =>
@@ -142,10 +138,10 @@ class TabShellPage extends ConsumerWidget {
                     children: [
                       navigationRail(tabsRouter),
                       const VerticalDivider(),
-                      Expanded(child: heroedChild),
+                      Expanded(child: child),
                     ],
                   )
-                : heroedChild,
+                : child,
             bottomNavigationBar: _BottomNavigationBar(
               tabsRouter: tabsRouter,
               destinations: navigationDestinations,
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 0f0b5a5a67..e759d6c2e0 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -71,6 +71,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   StreamSubscription? reloadSubscription;
 
   late Platform platform;
+  late final int heroOffset;
   late PhotoViewControllerValue initialPhotoViewState;
   bool? hasDraggedDown;
   bool isSnapping = false;
@@ -98,6 +99,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       _onAssetChanged(widget.initialIndex);
     });
     reloadSubscription = EventStream.shared.listen(_onEvent);
+    heroOffset = TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
   }
 
   @override
@@ -487,7 +489,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     return PhotoViewGalleryPageOptions(
       key: ValueKey(asset.heroTag),
       imageProvider: getFullImageProvider(asset, size: size),
-      heroAttributes: PhotoViewHeroAttributes(tag: asset.heroTag),
+      heroAttributes:
+          PhotoViewHeroAttributes(tag: '${asset.heroTag}_$heroOffset'),
       filterQuality: FilterQuality.high,
       tightMode: true,
       initialScale: PhotoViewComputedScale.contained * 0.999,
@@ -521,7 +524,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       onDragUpdate: _onDragUpdate,
       onDragEnd: _onDragEnd,
       onTapDown: _onTapDown,
-      heroAttributes: PhotoViewHeroAttributes(tag: asset.heroTag),
+      heroAttributes:
+          PhotoViewHeroAttributes(tag: '${asset.heroTag}_$heroOffset'),
       filterQuality: FilterQuality.high,
       initialScale: PhotoViewComputedScale.contained * 0.99,
       maxScale: 1.0,
diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index d7261c927e..7e3776adb2 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -1,3 +1,4 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -25,6 +26,8 @@ class ThumbnailTile extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final heroOffset = TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
+
     final assetContainerColor = context.isDarkTheme
         ? context.primaryColor.darken(amount: 0.4)
         : context.primaryColor.lighten(amount: 0.75);
@@ -64,7 +67,7 @@ class ThumbnailTile extends ConsumerWidget {
               children: [
                 Positioned.fill(
                   child: Hero(
-                    tag: asset.heroTag,
+                    tag: '${asset.heroTag}_$heroOffset',
                     child: Thumbnail(
                       asset: asset,
                       fit: fit,

From badd7ea2a98d28ed975b8eb1ff2772dfed9cf192 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Thu, 10 Jul 2025 18:56:04 -0400
Subject: [PATCH 179/337] chore: more missing deps (#19868)

---
 e2e/package-lock.json | 1 +
 e2e/package.json      | 1 +
 web/package-lock.json | 1 +
 web/package.json      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index 2987223fe0..781d9c28a0 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -14,6 +14,7 @@
         "@immich/cli": "file:../cli",
         "@immich/sdk": "file:../open-api/typescript-sdk",
         "@playwright/test": "^1.44.1",
+        "@socket.io/component-emitter": "^3.1.2",
         "@types/luxon": "^3.4.2",
         "@types/node": "^22.15.33",
         "@types/oidc-provider": "^9.0.0",
diff --git a/e2e/package.json b/e2e/package.json
index 4669ca0a1a..24b97bb4b7 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -24,6 +24,7 @@
     "@immich/cli": "file:../cli",
     "@immich/sdk": "file:../open-api/typescript-sdk",
     "@playwright/test": "^1.44.1",
+    "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
     "@types/node": "^22.15.33",
     "@types/oidc-provider": "^9.0.0",
diff --git a/web/package-lock.json b/web/package-lock.json
index 6af393b042..b6687769ed 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -19,6 +19,7 @@
         "@photo-sphere-viewer/resolution-plugin": "^5.11.5",
         "@photo-sphere-viewer/settings-plugin": "^5.11.5",
         "@photo-sphere-viewer/video-plugin": "^5.11.5",
+        "@zoom-image/core": "^0.41.0",
         "@zoom-image/svelte": "^0.3.0",
         "async-mutex": "^0.5.0",
         "dom-to-image": "^2.6.0",
diff --git a/web/package.json b/web/package.json
index 2ad2a8361a..a9e9bb3d79 100644
--- a/web/package.json
+++ b/web/package.json
@@ -36,6 +36,7 @@
     "@photo-sphere-viewer/resolution-plugin": "^5.11.5",
     "@photo-sphere-viewer/settings-plugin": "^5.11.5",
     "@photo-sphere-viewer/video-plugin": "^5.11.5",
+    "@zoom-image/core": "^0.41.0",
     "@zoom-image/svelte": "^0.3.0",
     "async-mutex": "^0.5.0",
     "dom-to-image": "^2.6.0",

From de345a95243f447918073d44d492a95d60e25f64 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Thu, 10 Jul 2025 21:35:39 -0400
Subject: [PATCH 180/337] chore: makefile split setup tasks (#19739)

Makefile split setup tasks
---
 .devcontainer/server/container-common.sh | 2 +-
 Makefile                                 | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/server/container-common.sh b/.devcontainer/server/container-common.sh
index e1e81a9b52..544674e169 100755
--- a/.devcontainer/server/container-common.sh
+++ b/.devcontainer/server/container-common.sh
@@ -74,7 +74,7 @@ install_dependencies() {
     (
         cd "${IMMICH_WORKSPACE}" || exit 1
         export CI=1 FROZEN=1 OFFLINE=1
-        run_cmd make setup-dev
+        run_cmd make setup-web-dev setup-server-dev
     )
     log ""
 }
diff --git a/Makefile b/Makefile
index 207665d31c..815d1a153b 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ test-medium-dev:
 	docker exec -it immich_server /bin/sh -c "npm run test:medium"
 
 build-all: $(foreach M,$(filter-out e2e .github,$(MODULES)),build-$M) ;
-install-all: $(foreach M,$(MODULES),install-$M) ;  
+install-all: $(foreach M,$(MODULES),install-$M) ;
 ci-all: $(foreach M,$(filter-out .github,$(MODULES)),ci-$M) ;
 check-all: $(foreach M,$(filter-out sdk cli docs .github,$(MODULES)),check-$M) ;
 lint-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),lint-$M) ;
@@ -106,4 +106,5 @@ clean:
 	command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
 	command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml rm -v -f || true
 
-setup-dev: install-server install-sdk build-sdk install-web
\ No newline at end of file
+setup-server-dev: install-server
+setup-web-dev: install-sdk build-sdk install-web

From d087f7c870392d41a3e5b4f477a9b7e489f148e1 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Thu, 10 Jul 2025 21:42:29 -0500
Subject: [PATCH 181/337] chore: beta flavor build (#19862)

* chore: beta flavor build

* make file

* beta flavor

* add build flavor to GHA

* add build flavor to GHA
---
 .github/workflows/build-mobile.yml            |  8 ++--
 mobile/android/app/build.gradle               | 14 ++++++
 .../android/app/src/beta/AndroidManifest.xml  |  5 ++
 .../android/app/src/main/AndroidManifest.xml  | 32 ++++++-------
 .../domain/services/sync_stream.service.dart  |  8 +++-
 mobile/lib/pages/common/tab_shell.page.dart   |  6 +++
 .../pages/dev/feat_in_development.page.dart   | 46 +++++++++++--------
 mobile/lib/widgets/common/immich_app_bar.dart |  3 +-
 .../widgets/common/immich_sliver_app_bar.dart |  5 ++
 mobile/makefile                               |  5 +-
 10 files changed, 91 insertions(+), 41 deletions(-)
 create mode 100644 mobile/android/app/src/beta/AndroidManifest.xml

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index a048536b2f..ca24e33b52 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -122,17 +122,17 @@ jobs:
           IS_MAIN: ${{ github.ref == 'refs/heads/main' }}
         run: |
           if [[ $IS_MAIN == 'true' ]]; then
-            flutter build apk --release
-            flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64
+            flutter build apk --release --flavor production
+            flutter build apk --release --flavor production --split-per-abi --target-platform android-arm,android-arm64,android-x64
           else
-            flutter build apk --debug --split-per-abi --target-platform android-arm64
+            flutter build apk --debug --flavor production --split-per-abi --target-platform android-arm64
           fi
 
       - name: Publish Android Artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: release-apk-signed
-          path: mobile/build/app/outputs/flutter-apk/*.apk
+          path: mobile/build/app/outputs/flutter-apk/**/*.apk
 
       - name: Save Gradle Cache
         id: cache-gradle-save
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 0d07228252..870e424461 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -66,6 +66,20 @@ android {
     }
   }
 
+  flavorDimensions "default"
+  productFlavors {
+    production {
+      dimension "default"
+      applicationId "app.alextran.immich"
+    }
+    
+    beta {
+      dimension "default"
+      applicationId "app.alextran.immich.beta"
+      versionNameSuffix "-BETA"
+    }
+  }
+
   buildTypes {
     debug {
       applicationIdSuffix '.debug'
diff --git a/mobile/android/app/src/beta/AndroidManifest.xml b/mobile/android/app/src/beta/AndroidManifest.xml
new file mode 100644
index 0000000000..d4f7b5bc80
--- /dev/null
+++ b/mobile/android/app/src/beta/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+  <application android:label="Immich Beta" tools:replace="android:label" />
+</manifest>
\ No newline at end of file
diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index 6a96aa68e4..cf3b7ee719 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -100,24 +100,24 @@
 
       <!-- my.immich.app deep link -->
       <intent-filter android:autoVerify="true">
-          <action android:name="android.intent.action.VIEW" />
-          <category android:name="android.intent.category.DEFAULT" />
-          <category android:name="android.intent.category.BROWSABLE" />
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
 
-          <data android:scheme="https" />
+        <data android:scheme="https" />
 
-          <data
-              android:host="my.immich.app"
-              android:path="/" />
-          <data
-              android:host="my.immich.app"
-              android:pathPrefix="/albums/" />
-          <data
-              android:host="my.immich.app"
-              android:pathPrefix="/memories/" />
-          <data
-              android:host="my.immich.app"
-              android:pathPrefix="/photos/" />
+        <data
+          android:host="my.immich.app"
+          android:path="/" />
+        <data
+          android:host="my.immich.app"
+          android:pathPrefix="/albums/" />
+        <data
+          android:host="my.immich.app"
+          android:pathPrefix="/memories/" />
+        <data
+          android:host="my.immich.app"
+          android:pathPrefix="/photos/" />
       </intent-filter>
     </activity>
 
diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index ee0ec6c44f..29066195f2 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:immich_mobile/domain/models/sync_event.model.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/presentation/pages/dev/dev_logger.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
@@ -23,7 +24,12 @@ class SyncStreamService {
 
   bool get isCancelled => _cancelChecker?.call() ?? false;
 
-  Future<void> sync() => _syncApiRepository.streamChanges(_handleEvents);
+  Future<void> sync() {
+    _logger.info("Remote sync request for userr");
+    DLog.log("Remote sync request for user");
+    // Start the sync stream and handle events
+    return _syncApiRepository.streamChanges(_handleEvents);
+  }
 
   Future<void> _handleEvents(List<SyncEvent> events, Function() abort) async {
     List<SyncEvent> items = [];
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index 4eab0e32cf..edaec6d336 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -5,6 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/album.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';
@@ -164,6 +165,11 @@ void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
     ref.read(searchInputFocusProvider).requestFocus();
   }
 
+  // Album page
+  if (index == 2) {
+    ref.read(remoteAlbumProvider.notifier).getAll();
+  }
+
   ref.read(hapticFeedbackProvider.notifier).selectionClick();
   router.setActiveIndex(index);
   ref.read(tabProvider.notifier).state = TabEnum.values[index];
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index 566c10c70a..bdb426fe22 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -17,6 +17,21 @@ import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 
 final _features = [
+  _Feature(
+    name: 'Main Timeline',
+    icon: Icons.timeline_rounded,
+    onTap: (ctx, _) => ctx.pushRoute(const TabShellRoute()),
+  ),
+  _Feature(
+    name: 'Video',
+    icon: Icons.video_collection_outlined,
+    onTap: (ctx, _) => ctx.pushRoute(const DriftVideoRoute()),
+  ),
+  _Feature(
+    name: 'Recently Taken',
+    icon: Icons.schedule_outlined,
+    onTap: (ctx, _) => ctx.pushRoute(const DriftRecentlyTakenRoute()),
+  ),
   _Feature(
     name: 'Selection Mode Timeline',
     icon: Icons.developer_mode_rounded,
@@ -42,23 +57,28 @@ final _features = [
       return Future.value();
     },
   ),
+  _Feature(
+    name: '',
+    icon: Icons.vertical_align_center_sharp,
+    onTap: (_, __) => Future.value(),
+  ),
   _Feature(
     name: 'Sync Local',
     icon: Icons.photo_album_rounded,
     onTap: (_, ref) => ref.read(backgroundSyncProvider).syncLocal(),
   ),
   _Feature(
-    name: 'Sync Local Full',
+    name: 'Sync Local Full (1)',
     icon: Icons.photo_library_rounded,
     onTap: (_, ref) => ref.read(backgroundSyncProvider).syncLocal(full: true),
   ),
   _Feature(
-    name: 'Hash Local Assets',
+    name: 'Hash Local Assets (2)',
     icon: Icons.numbers_outlined,
     onTap: (_, ref) => ref.read(backgroundSyncProvider).hashAssets(),
   ),
   _Feature(
-    name: 'Sync Remote',
+    name: 'Sync Remote (3)',
     icon: Icons.refresh_rounded,
     onTap: (_, ref) => ref.read(backgroundSyncProvider).syncRemote(),
   ),
@@ -69,6 +89,11 @@ final _features = [
         .read(driftProvider)
         .customStatement("pragma wal_checkpoint(truncate)"),
   ),
+  _Feature(
+    name: '',
+    icon: Icons.vertical_align_center_sharp,
+    onTap: (_, __) => Future.value(),
+  ),
   _Feature(
     name: 'Clear Delta Checkpoint',
     icon: Icons.delete_rounded,
@@ -122,21 +147,6 @@ final _features = [
       }
     },
   ),
-  _Feature(
-    name: 'Main Timeline',
-    icon: Icons.timeline_rounded,
-    onTap: (ctx, _) => ctx.pushRoute(const TabShellRoute()),
-  ),
-  _Feature(
-    name: 'Video',
-    icon: Icons.video_collection_outlined,
-    onTap: (ctx, _) => ctx.pushRoute(const DriftVideoRoute()),
-  ),
-  _Feature(
-    name: 'Recently Taken',
-    icon: Icons.schedule_outlined,
-    onTap: (ctx, _) => ctx.pushRoute(const DriftRecentlyTakenRoute()),
-  ),
 ];
 
 @RoutePage()
diff --git a/mobile/lib/widgets/common/immich_app_bar.dart b/mobile/lib/widgets/common/immich_app_bar.dart
index dbf088c112..799cf17f3f 100644
--- a/mobile/lib/widgets/common/immich_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_app_bar.dart
@@ -2,6 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
@@ -185,7 +186,7 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {
               child: action,
             ),
           ),
-        if (kDebugMode || kProfileMode)
+        if (kDebugMode || kProfileMode || appFlavor == 'beta')
           IconButton(
             icon: const Icon(Icons.science_rounded),
             onPressed: () => context.pushRoute(const FeatInDevRoute()),
diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
index bff1ab4bb1..c2c5b79753 100644
--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -76,6 +76,11 @@ class ImmichSliverAppBar extends ConsumerWidget {
             onPressed: () {
               ref.read(backgroundSyncProvider).syncLocal(full: true);
               ref.read(backgroundSyncProvider).syncRemote();
+
+              Future.delayed(
+                const Duration(seconds: 10),
+                () => ref.read(backgroundSyncProvider).hashAssets(),
+              );
             },
             icon: const Icon(
               Icons.sync,
diff --git a/mobile/makefile b/mobile/makefile
index 64992ec946..37d33fa817 100644
--- a/mobile/makefile
+++ b/mobile/makefile
@@ -28,4 +28,7 @@ translation:
 	dart run easy_localization:generate -S ../i18n
 	dart run bin/generate_keys.dart
 	dart format lib/generated/codegen_loader.g.dart
-	dart format lib/generated/intl_keys.g.dart
\ No newline at end of file
+	dart format lib/generated/intl_keys.g.dart
+
+build-beta:
+	flutter build apk --flavor beta --release

From 906d14c1725b782455c033970bfde57ce9c85282 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Fri, 11 Jul 2025 07:42:25 -0400
Subject: [PATCH 182/337] chore: missing @types dependency for geojson (#19870)

---
 web/package-lock.json | 1 +
 web/package.json      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/web/package-lock.json b/web/package-lock.json
index b6687769ed..14d292755f 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -19,6 +19,7 @@
         "@photo-sphere-viewer/resolution-plugin": "^5.11.5",
         "@photo-sphere-viewer/settings-plugin": "^5.11.5",
         "@photo-sphere-viewer/video-plugin": "^5.11.5",
+        "@types/geojson": "^7946.0.16",
         "@zoom-image/core": "^0.41.0",
         "@zoom-image/svelte": "^0.3.0",
         "async-mutex": "^0.5.0",
diff --git a/web/package.json b/web/package.json
index a9e9bb3d79..f2543c10b1 100644
--- a/web/package.json
+++ b/web/package.json
@@ -36,6 +36,7 @@
     "@photo-sphere-viewer/resolution-plugin": "^5.11.5",
     "@photo-sphere-viewer/settings-plugin": "^5.11.5",
     "@photo-sphere-viewer/video-plugin": "^5.11.5",
+    "@types/geojson": "^7946.0.16",
     "@zoom-image/core": "^0.41.0",
     "@zoom-image/svelte": "^0.3.0",
     "async-mutex": "^0.5.0",

From 34f0f6c8133742164d8df6e9b72e1dc9e134a5fe Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 11 Jul 2025 18:11:06 +0530
Subject: [PATCH 183/337] chore: rename new migration to execute last (#19872)

chore: rename new migration to change execution order

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 ...-AddActivityAssetFk.ts => 1752161055254-AddActivityAssetFk.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename server/src/schema/migrations/{1750323941567-AddActivityAssetFk.ts => 1752161055254-AddActivityAssetFk.ts} (100%)

diff --git a/server/src/schema/migrations/1750323941567-AddActivityAssetFk.ts b/server/src/schema/migrations/1752161055254-AddActivityAssetFk.ts
similarity index 100%
rename from server/src/schema/migrations/1750323941567-AddActivityAssetFk.ts
rename to server/src/schema/migrations/1752161055254-AddActivityAssetFk.ts

From 4b3a4725c67c96977be0b2227aab5f6530fbcd11 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 11 Jul 2025 09:38:02 -0400
Subject: [PATCH 184/337] feat: pending sync reset flag (#19861)

---
 e2e/src/responses.ts                          |   1 +
 mobile/openapi/README.md                      |   2 +
 mobile/openapi/lib/api.dart                   |   1 +
 mobile/openapi/lib/api/sessions_api.dart      |  52 +++++++++
 mobile/openapi/lib/api_client.dart            |   2 +
 .../model/session_create_response_dto.dart    |  10 +-
 .../lib/model/session_response_dto.dart       |  10 +-
 .../openapi/lib/model/session_update_dto.dart | 108 ++++++++++++++++++
 .../openapi/lib/model/sync_entity_type.dart   |   3 +
 mobile/openapi/lib/model/sync_stream_dto.dart |  19 ++-
 open-api/immich-openapi-specs.json            |  76 +++++++++++-
 open-api/typescript-sdk/src/fetch-client.ts   |  22 +++-
 server/src/controllers/session.controller.ts  |  14 ++-
 server/src/database.ts                        |   4 +-
 server/src/dtos/session.dto.ts                |   9 +-
 server/src/dtos/sync.dto.ts                   |   9 +-
 server/src/enum.ts                            |   1 +
 server/src/queries/session.repository.sql     |  13 +++
 server/src/repositories/session.repository.ts |  10 ++
 .../1752169992364-AddIsPendingSyncReset.ts    |   9 ++
 server/src/schema/tables/session.table.ts     |   3 +
 server/src/services/auth.service.spec.ts      |  16 ++-
 server/src/services/auth.service.ts           |   1 +
 server/src/services/session.service.ts        |  22 +++-
 server/src/services/sync.service.ts           |  34 ++++--
 server/test/medium.factory.ts                 |   5 +-
 .../test/medium/specs/sync/sync-reset.spec.ts |  63 ++++++++++
 server/test/small.factory.ts                  |   7 +-
 28 files changed, 499 insertions(+), 27 deletions(-)
 create mode 100644 mobile/openapi/lib/model/session_update_dto.dart
 create mode 100644 server/src/schema/migrations/1752169992364-AddIsPendingSyncReset.ts
 create mode 100644 server/test/medium/specs/sync/sync-reset.spec.ts

diff --git a/e2e/src/responses.ts b/e2e/src/responses.ts
index bb6d17a248..b14aedf895 100644
--- a/e2e/src/responses.ts
+++ b/e2e/src/responses.ts
@@ -116,6 +116,7 @@ export const deviceDto = {
     createdAt: expect.any(String),
     updatedAt: expect.any(String),
     current: true,
+    isPendingSyncReset: false,
     deviceOS: '',
     deviceType: '',
   },
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 3ba9327ec4..5b90e4a633 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -208,6 +208,7 @@ Class | Method | HTTP request | Description
 *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 | 
@@ -449,6 +450,7 @@ Class | Method | HTTP request | Description
  - [SessionCreateResponseDto](doc//SessionCreateResponseDto.md)
  - [SessionResponseDto](doc//SessionResponseDto.md)
  - [SessionUnlockDto](doc//SessionUnlockDto.md)
+ - [SessionUpdateDto](doc//SessionUpdateDto.md)
  - [SharedLinkCreateDto](doc//SharedLinkCreateDto.md)
  - [SharedLinkEditDto](doc//SharedLinkEditDto.md)
  - [SharedLinkResponseDto](doc//SharedLinkResponseDto.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index e771664827..4de0614cf6 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -232,6 +232,7 @@ part 'model/session_create_dto.dart';
 part 'model/session_create_response_dto.dart';
 part 'model/session_response_dto.dart';
 part 'model/session_unlock_dto.dart';
+part 'model/session_update_dto.dart';
 part 'model/shared_link_create_dto.dart';
 part 'model/shared_link_edit_dto.dart';
 part 'model/shared_link_response_dto.dart';
diff --git a/mobile/openapi/lib/api/sessions_api.dart b/mobile/openapi/lib/api/sessions_api.dart
index 3228d31e91..d54f520641 100644
--- a/mobile/openapi/lib/api/sessions_api.dart
+++ b/mobile/openapi/lib/api/sessions_api.dart
@@ -219,4 +219,56 @@ class SessionsApi {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
   }
+
+  /// Performs an HTTP 'PUT /sessions/{id}' operation and returns the [Response].
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  ///
+  /// * [SessionUpdateDto] sessionUpdateDto (required):
+  Future<Response> updateSessionWithHttpInfo(String id, SessionUpdateDto sessionUpdateDto,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/sessions/{id}'
+      .replaceAll('{id}', id);
+
+    // ignore: prefer_final_locals
+    Object? postBody = sessionUpdateDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'PUT',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  ///
+  /// * [SessionUpdateDto] sessionUpdateDto (required):
+  Future<SessionResponseDto?> updateSession(String id, SessionUpdateDto sessionUpdateDto,) async {
+    final response = await updateSessionWithHttpInfo(id, sessionUpdateDto,);
+    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), 'SessionResponseDto',) as SessionResponseDto;
+    
+    }
+    return null;
+  }
 }
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 8bdda3a320..26113a1115 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -520,6 +520,8 @@ class ApiClient {
           return SessionResponseDto.fromJson(value);
         case 'SessionUnlockDto':
           return SessionUnlockDto.fromJson(value);
+        case 'SessionUpdateDto':
+          return SessionUpdateDto.fromJson(value);
         case 'SharedLinkCreateDto':
           return SharedLinkCreateDto.fromJson(value);
         case 'SharedLinkEditDto':
diff --git a/mobile/openapi/lib/model/session_create_response_dto.dart b/mobile/openapi/lib/model/session_create_response_dto.dart
index ab1c4ca2d8..a4f93e8d9c 100644
--- a/mobile/openapi/lib/model/session_create_response_dto.dart
+++ b/mobile/openapi/lib/model/session_create_response_dto.dart
@@ -19,6 +19,7 @@ class SessionCreateResponseDto {
     required this.deviceType,
     this.expiresAt,
     required this.id,
+    required this.isPendingSyncReset,
     required this.token,
     required this.updatedAt,
   });
@@ -41,6 +42,8 @@ class SessionCreateResponseDto {
 
   String id;
 
+  bool isPendingSyncReset;
+
   String token;
 
   String updatedAt;
@@ -53,6 +56,7 @@ class SessionCreateResponseDto {
     other.deviceType == deviceType &&
     other.expiresAt == expiresAt &&
     other.id == id &&
+    other.isPendingSyncReset == isPendingSyncReset &&
     other.token == token &&
     other.updatedAt == updatedAt;
 
@@ -65,11 +69,12 @@ class SessionCreateResponseDto {
     (deviceType.hashCode) +
     (expiresAt == null ? 0 : expiresAt!.hashCode) +
     (id.hashCode) +
+    (isPendingSyncReset.hashCode) +
     (token.hashCode) +
     (updatedAt.hashCode);
 
   @override
-  String toString() => 'SessionCreateResponseDto[createdAt=$createdAt, current=$current, deviceOS=$deviceOS, deviceType=$deviceType, expiresAt=$expiresAt, id=$id, token=$token, updatedAt=$updatedAt]';
+  String toString() => 'SessionCreateResponseDto[createdAt=$createdAt, current=$current, deviceOS=$deviceOS, deviceType=$deviceType, expiresAt=$expiresAt, id=$id, isPendingSyncReset=$isPendingSyncReset, token=$token, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -83,6 +88,7 @@ class SessionCreateResponseDto {
     //  json[r'expiresAt'] = null;
     }
       json[r'id'] = this.id;
+      json[r'isPendingSyncReset'] = this.isPendingSyncReset;
       json[r'token'] = this.token;
       json[r'updatedAt'] = this.updatedAt;
     return json;
@@ -103,6 +109,7 @@ class SessionCreateResponseDto {
         deviceType: mapValueOfType<String>(json, r'deviceType')!,
         expiresAt: mapValueOfType<String>(json, r'expiresAt'),
         id: mapValueOfType<String>(json, r'id')!,
+        isPendingSyncReset: mapValueOfType<bool>(json, r'isPendingSyncReset')!,
         token: mapValueOfType<String>(json, r'token')!,
         updatedAt: mapValueOfType<String>(json, r'updatedAt')!,
       );
@@ -157,6 +164,7 @@ class SessionCreateResponseDto {
     'deviceOS',
     'deviceType',
     'id',
+    'isPendingSyncReset',
     'token',
     'updatedAt',
   };
diff --git a/mobile/openapi/lib/model/session_response_dto.dart b/mobile/openapi/lib/model/session_response_dto.dart
index cf9eb08a78..e76e4d48b4 100644
--- a/mobile/openapi/lib/model/session_response_dto.dart
+++ b/mobile/openapi/lib/model/session_response_dto.dart
@@ -19,6 +19,7 @@ class SessionResponseDto {
     required this.deviceType,
     this.expiresAt,
     required this.id,
+    required this.isPendingSyncReset,
     required this.updatedAt,
   });
 
@@ -40,6 +41,8 @@ class SessionResponseDto {
 
   String id;
 
+  bool isPendingSyncReset;
+
   String updatedAt;
 
   @override
@@ -50,6 +53,7 @@ class SessionResponseDto {
     other.deviceType == deviceType &&
     other.expiresAt == expiresAt &&
     other.id == id &&
+    other.isPendingSyncReset == isPendingSyncReset &&
     other.updatedAt == updatedAt;
 
   @override
@@ -61,10 +65,11 @@ class SessionResponseDto {
     (deviceType.hashCode) +
     (expiresAt == null ? 0 : expiresAt!.hashCode) +
     (id.hashCode) +
+    (isPendingSyncReset.hashCode) +
     (updatedAt.hashCode);
 
   @override
-  String toString() => 'SessionResponseDto[createdAt=$createdAt, current=$current, deviceOS=$deviceOS, deviceType=$deviceType, expiresAt=$expiresAt, id=$id, updatedAt=$updatedAt]';
+  String toString() => 'SessionResponseDto[createdAt=$createdAt, current=$current, deviceOS=$deviceOS, deviceType=$deviceType, expiresAt=$expiresAt, id=$id, isPendingSyncReset=$isPendingSyncReset, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -78,6 +83,7 @@ class SessionResponseDto {
     //  json[r'expiresAt'] = null;
     }
       json[r'id'] = this.id;
+      json[r'isPendingSyncReset'] = this.isPendingSyncReset;
       json[r'updatedAt'] = this.updatedAt;
     return json;
   }
@@ -97,6 +103,7 @@ class SessionResponseDto {
         deviceType: mapValueOfType<String>(json, r'deviceType')!,
         expiresAt: mapValueOfType<String>(json, r'expiresAt'),
         id: mapValueOfType<String>(json, r'id')!,
+        isPendingSyncReset: mapValueOfType<bool>(json, r'isPendingSyncReset')!,
         updatedAt: mapValueOfType<String>(json, r'updatedAt')!,
       );
     }
@@ -150,6 +157,7 @@ class SessionResponseDto {
     'deviceOS',
     'deviceType',
     'id',
+    'isPendingSyncReset',
     'updatedAt',
   };
 }
diff --git a/mobile/openapi/lib/model/session_update_dto.dart b/mobile/openapi/lib/model/session_update_dto.dart
new file mode 100644
index 0000000000..cd170b1baa
--- /dev/null
+++ b/mobile/openapi/lib/model/session_update_dto.dart
@@ -0,0 +1,108 @@
+//
+// 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 SessionUpdateDto {
+  /// Returns a new [SessionUpdateDto] instance.
+  SessionUpdateDto({
+    this.isPendingSyncReset,
+  });
+
+  ///
+  /// 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.
+  ///
+  bool? isPendingSyncReset;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SessionUpdateDto &&
+    other.isPendingSyncReset == isPendingSyncReset;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (isPendingSyncReset == null ? 0 : isPendingSyncReset!.hashCode);
+
+  @override
+  String toString() => 'SessionUpdateDto[isPendingSyncReset=$isPendingSyncReset]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+    if (this.isPendingSyncReset != null) {
+      json[r'isPendingSyncReset'] = this.isPendingSyncReset;
+    } else {
+    //  json[r'isPendingSyncReset'] = null;
+    }
+    return json;
+  }
+
+  /// Returns a new [SessionUpdateDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SessionUpdateDto? fromJson(dynamic value) {
+    upgradeDto(value, "SessionUpdateDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SessionUpdateDto(
+        isPendingSyncReset: mapValueOfType<bool>(json, r'isPendingSyncReset'),
+      );
+    }
+    return null;
+  }
+
+  static List<SessionUpdateDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SessionUpdateDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SessionUpdateDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SessionUpdateDto> mapFromJson(dynamic json) {
+    final map = <String, SessionUpdateDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SessionUpdateDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SessionUpdateDto-objects as value to a dart map
+  static Map<String, List<SessionUpdateDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SessionUpdateDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SessionUpdateDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_entity_type.dart b/mobile/openapi/lib/model/sync_entity_type.dart
index 60cc4da6cb..1d09a6dbe0 100644
--- a/mobile/openapi/lib/model/sync_entity_type.dart
+++ b/mobile/openapi/lib/model/sync_entity_type.dart
@@ -59,6 +59,7 @@ class SyncEntityType {
   static const personV1 = SyncEntityType._(r'PersonV1');
   static const personDeleteV1 = SyncEntityType._(r'PersonDeleteV1');
   static const syncAckV1 = SyncEntityType._(r'SyncAckV1');
+  static const syncResetV1 = SyncEntityType._(r'SyncResetV1');
 
   /// List of all possible values in this [enum][SyncEntityType].
   static const values = <SyncEntityType>[
@@ -98,6 +99,7 @@ class SyncEntityType {
     personV1,
     personDeleteV1,
     syncAckV1,
+    syncResetV1,
   ];
 
   static SyncEntityType? fromJson(dynamic value) => SyncEntityTypeTypeTransformer().decode(value);
@@ -172,6 +174,7 @@ class SyncEntityTypeTypeTransformer {
         case r'PersonV1': return SyncEntityType.personV1;
         case r'PersonDeleteV1': return SyncEntityType.personDeleteV1;
         case r'SyncAckV1': return SyncEntityType.syncAckV1;
+        case r'SyncResetV1': return SyncEntityType.syncResetV1;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');
diff --git a/mobile/openapi/lib/model/sync_stream_dto.dart b/mobile/openapi/lib/model/sync_stream_dto.dart
index 28fd3dfaee..9884eef342 100644
--- a/mobile/openapi/lib/model/sync_stream_dto.dart
+++ b/mobile/openapi/lib/model/sync_stream_dto.dart
@@ -13,25 +13,41 @@ part of openapi.api;
 class SyncStreamDto {
   /// Returns a new [SyncStreamDto] instance.
   SyncStreamDto({
+    this.reset,
     this.types = const [],
   });
 
+  ///
+  /// 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.
+  ///
+  bool? reset;
+
   List<SyncRequestType> types;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is SyncStreamDto &&
+    other.reset == reset &&
     _deepEquality.equals(other.types, types);
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
+    (reset == null ? 0 : reset!.hashCode) +
     (types.hashCode);
 
   @override
-  String toString() => 'SyncStreamDto[types=$types]';
+  String toString() => 'SyncStreamDto[reset=$reset, types=$types]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
+    if (this.reset != null) {
+      json[r'reset'] = this.reset;
+    } else {
+    //  json[r'reset'] = null;
+    }
       json[r'types'] = this.types;
     return json;
   }
@@ -45,6 +61,7 @@ class SyncStreamDto {
       final json = value.cast<String, dynamic>();
 
       return SyncStreamDto(
+        reset: mapValueOfType<bool>(json, r'reset'),
         types: SyncRequestType.listFromJson(json[r'types']),
       );
     }
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index fbd7165dd5..2e6c70adaa 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -6024,6 +6024,56 @@
         "tags": [
           "Sessions"
         ]
+      },
+      "put": {
+        "operationId": "updateSession",
+        "parameters": [
+          {
+            "name": "id",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "format": "uuid",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/SessionUpdateDto"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionResponseDto"
+                }
+              }
+            },
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "Sessions"
+        ]
       }
     },
     "/sessions/{id}/lock": {
@@ -12790,6 +12840,9 @@
           "id": {
             "type": "string"
           },
+          "isPendingSyncReset": {
+            "type": "boolean"
+          },
           "token": {
             "type": "string"
           },
@@ -12803,6 +12856,7 @@
           "deviceOS",
           "deviceType",
           "id",
+          "isPendingSyncReset",
           "token",
           "updatedAt"
         ],
@@ -12828,6 +12882,9 @@
           "id": {
             "type": "string"
           },
+          "isPendingSyncReset": {
+            "type": "boolean"
+          },
           "updatedAt": {
             "type": "string"
           }
@@ -12838,6 +12895,7 @@
           "deviceOS",
           "deviceType",
           "id",
+          "isPendingSyncReset",
           "updatedAt"
         ],
         "type": "object"
@@ -12854,6 +12912,14 @@
         },
         "type": "object"
       },
+      "SessionUpdateDto": {
+        "properties": {
+          "isPendingSyncReset": {
+            "type": "boolean"
+          }
+        },
+        "type": "object"
+      },
       "SharedLinkCreateDto": {
         "properties": {
           "albumId": {
@@ -13836,7 +13902,8 @@
           "StackDeleteV1",
           "PersonV1",
           "PersonDeleteV1",
-          "SyncAckV1"
+          "SyncAckV1",
+          "SyncResetV1"
         ],
         "type": "string"
       },
@@ -14074,6 +14141,10 @@
         ],
         "type": "string"
       },
+      "SyncResetV1": {
+        "properties": {},
+        "type": "object"
+      },
       "SyncStackDeleteV1": {
         "properties": {
           "stackId": {
@@ -14116,6 +14187,9 @@
       },
       "SyncStreamDto": {
         "properties": {
+          "reset": {
+            "type": "boolean"
+          },
           "types": {
             "items": {
               "$ref": "#/components/schemas/SyncRequestType"
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index c869510b6f..f7fc9fe61e 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1164,6 +1164,7 @@ export type SessionResponseDto = {
     deviceType: string;
     expiresAt?: string;
     id: string;
+    isPendingSyncReset: boolean;
     updatedAt: string;
 };
 export type SessionCreateDto = {
@@ -1179,9 +1180,13 @@ export type SessionCreateResponseDto = {
     deviceType: string;
     expiresAt?: string;
     id: string;
+    isPendingSyncReset: boolean;
     token: string;
     updatedAt: string;
 };
+export type SessionUpdateDto = {
+    isPendingSyncReset?: boolean;
+};
 export type SharedLinkResponseDto = {
     album?: AlbumResponseDto;
     allowDownload: boolean;
@@ -1264,6 +1269,7 @@ export type AssetFullSyncDto = {
     userId?: string;
 };
 export type SyncStreamDto = {
+    reset?: boolean;
     types: SyncRequestType[];
 };
 export type DatabaseBackupConfig = {
@@ -3170,6 +3176,19 @@ export function deleteSession({ id }: {
         method: "DELETE"
     }));
 }
+export function updateSession({ id, sessionUpdateDto }: {
+    id: string;
+    sessionUpdateDto: SessionUpdateDto;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 200;
+        data: SessionResponseDto;
+    }>(`/sessions/${encodeURIComponent(id)}`, oazapfts.json({
+        ...opts,
+        method: "PUT",
+        body: sessionUpdateDto
+    })));
+}
 export function lockSession({ id }: {
     id: string;
 }, opts?: Oazapfts.RequestOpts) {
@@ -4097,7 +4116,8 @@ export enum SyncEntityType {
     StackDeleteV1 = "StackDeleteV1",
     PersonV1 = "PersonV1",
     PersonDeleteV1 = "PersonDeleteV1",
-    SyncAckV1 = "SyncAckV1"
+    SyncAckV1 = "SyncAckV1",
+    SyncResetV1 = "SyncResetV1"
 }
 export enum SyncRequestType {
     AlbumsV1 = "AlbumsV1",
diff --git a/server/src/controllers/session.controller.ts b/server/src/controllers/session.controller.ts
index 3838d5af80..f5eb10b3dd 100644
--- a/server/src/controllers/session.controller.ts
+++ b/server/src/controllers/session.controller.ts
@@ -1,7 +1,7 @@
-import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post } from '@nestjs/common';
+import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { SessionCreateDto, SessionCreateResponseDto, SessionResponseDto } from 'src/dtos/session.dto';
+import { SessionCreateDto, SessionCreateResponseDto, SessionResponseDto, SessionUpdateDto } from 'src/dtos/session.dto';
 import { Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { SessionService } from 'src/services/session.service';
@@ -31,6 +31,16 @@ export class SessionController {
     return this.service.deleteAll(auth);
   }
 
+  @Put(':id')
+  @Authenticated({ permission: Permission.SESSION_UPDATE })
+  updateSession(
+    @Auth() auth: AuthDto,
+    @Param() { id }: UUIDParamDto,
+    @Body() dto: SessionUpdateDto,
+  ): Promise<SessionResponseDto> {
+    return this.service.update(auth, id, dto);
+  }
+
   @Delete(':id')
   @Authenticated({ permission: Permission.SESSION_DELETE })
   @HttpCode(HttpStatus.NO_CONTENT)
diff --git a/server/src/database.ts b/server/src/database.ts
index acd6980985..b9af37cc46 100644
--- a/server/src/database.ts
+++ b/server/src/database.ts
@@ -201,6 +201,7 @@ export type Album = Selectable<AlbumTable> & {
 
 export type AuthSession = {
   id: string;
+  isPendingSyncReset: boolean;
   hasElevatedPermission: boolean;
 };
 
@@ -238,6 +239,7 @@ export type Session = {
   deviceOS: string;
   deviceType: string;
   pinExpiresAt: Date | null;
+  isPendingSyncReset: boolean;
 };
 
 export type Exif = Omit<Selectable<ExifTable>, 'updatedAt' | 'updateId'>;
@@ -311,7 +313,7 @@ export const columns = {
     'users.quotaSizeInBytes',
   ],
   authApiKey: ['api_keys.id', 'api_keys.permissions'],
-  authSession: ['sessions.id', 'sessions.updatedAt', 'sessions.pinExpiresAt'],
+  authSession: ['sessions.id', 'sessions.isPendingSyncReset', 'sessions.updatedAt', 'sessions.pinExpiresAt'],
   authSharedLink: [
     'shared_links.id',
     'shared_links.userId',
diff --git a/server/src/dtos/session.dto.ts b/server/src/dtos/session.dto.ts
index f15166fbf5..0babbb9182 100644
--- a/server/src/dtos/session.dto.ts
+++ b/server/src/dtos/session.dto.ts
@@ -1,6 +1,6 @@
 import { IsInt, IsPositive, IsString } from 'class-validator';
 import { Session } from 'src/database';
-import { Optional } from 'src/validation';
+import { Optional, ValidateBoolean } from 'src/validation';
 
 export class SessionCreateDto {
   /**
@@ -20,6 +20,11 @@ export class SessionCreateDto {
   deviceOS?: string;
 }
 
+export class SessionUpdateDto {
+  @ValidateBoolean({ optional: true })
+  isPendingSyncReset?: boolean;
+}
+
 export class SessionResponseDto {
   id!: string;
   createdAt!: string;
@@ -28,6 +33,7 @@ export class SessionResponseDto {
   current!: boolean;
   deviceType!: string;
   deviceOS!: string;
+  isPendingSyncReset!: boolean;
 }
 
 export class SessionCreateResponseDto extends SessionResponseDto {
@@ -42,4 +48,5 @@ export const mapSession = (entity: Session, currentId?: string): SessionResponse
   current: currentId === entity.id,
   deviceOS: entity.deviceOS,
   deviceType: entity.deviceType,
+  isPendingSyncReset: entity.isPendingSyncReset,
 });
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index 53b0041462..ff5df03eaf 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -11,7 +11,7 @@ import {
   SyncEntityType,
   SyncRequestType,
 } from 'src/enum';
-import { Optional, ValidateDate, ValidateUUID } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
 
 export class AssetFullSyncDto {
   @ValidateUUID({ optional: true })
@@ -256,6 +256,9 @@ export class SyncPersonDeleteV1 {
 @ExtraModel()
 export class SyncAckV1 {}
 
+@ExtraModel()
+export class SyncResetV1 {}
+
 export type SyncItem = {
   [SyncEntityType.UserV1]: SyncUserV1;
   [SyncEntityType.UserDeleteV1]: SyncUserDeleteV1;
@@ -293,12 +296,16 @@ export type SyncItem = {
   [SyncEntityType.PersonV1]: SyncPersonV1;
   [SyncEntityType.PersonDeleteV1]: SyncPersonDeleteV1;
   [SyncEntityType.SyncAckV1]: SyncAckV1;
+  [SyncEntityType.SyncResetV1]: SyncResetV1;
 };
 
 export class SyncStreamDto {
   @IsEnum(SyncRequestType, { each: true })
   @ApiProperty({ enumName: 'SyncRequestType', enum: SyncRequestType, isArray: true })
   types!: SyncRequestType[];
+
+  @ValidateBoolean({ optional: true })
+  reset?: boolean;
 }
 
 export class SyncAckDto {
diff --git a/server/src/enum.ts b/server/src/enum.ts
index 81af35cf0c..6d960e1fbb 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -640,6 +640,7 @@ export enum SyncEntityType {
   PersonDeleteV1 = 'PersonDeleteV1',
 
   SyncAckV1 = 'SyncAckV1',
+  SyncResetV1 = 'SyncResetV1',
 }
 
 export enum NotificationLevel {
diff --git a/server/src/queries/session.repository.sql b/server/src/queries/session.repository.sql
index 6a9b69c2e3..315ea82112 100644
--- a/server/src/queries/session.repository.sql
+++ b/server/src/queries/session.repository.sql
@@ -13,6 +13,7 @@ where
 -- SessionRepository.getByToken
 select
   "sessions"."id",
+  "sessions"."isPendingSyncReset",
   "sessions"."updatedAt",
   "sessions"."pinExpiresAt",
   (
@@ -71,3 +72,15 @@ set
   "pinExpiresAt" = $1
 where
   "userId" = $2
+
+-- SessionRepository.resetSyncProgress
+begin
+update "sessions"
+set
+  "isPendingSyncReset" = $1
+where
+  "id" = $2
+delete from "session_sync_checkpoints"
+where
+  "sessionId" = $1
+commit
diff --git a/server/src/repositories/session.repository.ts b/server/src/repositories/session.repository.ts
index b9fa5458e4..a3d8281db5 100644
--- a/server/src/repositories/session.repository.ts
+++ b/server/src/repositories/session.repository.ts
@@ -95,4 +95,14 @@ export class SessionRepository {
   async lockAll(userId: string) {
     await this.db.updateTable('sessions').set({ pinExpiresAt: null }).where('userId', '=', userId).execute();
   }
+
+  @GenerateSql({ params: [DummyValue.UUID] })
+  async resetSyncProgress(sessionId: string) {
+    await this.db.transaction().execute((tx) => {
+      return Promise.all([
+        tx.updateTable('sessions').set({ isPendingSyncReset: false }).where('id', '=', sessionId).execute(),
+        tx.deleteFrom('session_sync_checkpoints').where('sessionId', '=', sessionId).execute(),
+      ]);
+    });
+  }
 }
diff --git a/server/src/schema/migrations/1752169992364-AddIsPendingSyncReset.ts b/server/src/schema/migrations/1752169992364-AddIsPendingSyncReset.ts
new file mode 100644
index 0000000000..6264831181
--- /dev/null
+++ b/server/src/schema/migrations/1752169992364-AddIsPendingSyncReset.ts
@@ -0,0 +1,9 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`ALTER TABLE "sessions" ADD "isPendingSyncReset" boolean NOT NULL DEFAULT false;`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`ALTER TABLE "sessions" DROP COLUMN "isPendingSyncReset";`.execute(db);
+}
diff --git a/server/src/schema/tables/session.table.ts b/server/src/schema/tables/session.table.ts
index cc05500beb..3305bcbc0b 100644
--- a/server/src/schema/tables/session.table.ts
+++ b/server/src/schema/tables/session.table.ts
@@ -45,6 +45,9 @@ export class SessionTable {
   @UpdateIdColumn({ indexName: 'IDX_sessions_update_id' })
   updateId!: Generated<string>;
 
+  @Column({ type: 'boolean', default: false })
+  isPendingSyncReset!: Generated<boolean>;
+
   @Column({ type: 'timestamp with time zone', nullable: true })
   pinExpiresAt!: Timestamp | null;
 }
diff --git a/server/src/services/auth.service.spec.ts b/server/src/services/auth.service.spec.ts
index 85c9f07815..6f180b3017 100644
--- a/server/src/services/auth.service.spec.ts
+++ b/server/src/services/auth.service.spec.ts
@@ -241,6 +241,7 @@ describe(AuthService.name, () => {
       const sessionWithToken = {
         id: session.id,
         updatedAt: session.updatedAt,
+        isPendingSyncReset: false,
         user: factory.authUser(),
         pinExpiresAt: null,
       };
@@ -255,7 +256,11 @@ describe(AuthService.name, () => {
         }),
       ).resolves.toEqual({
         user: sessionWithToken.user,
-        session: { id: session.id, hasElevatedPermission: false },
+        session: {
+          id: session.id,
+          hasElevatedPermission: false,
+          isPendingSyncReset: session.isPendingSyncReset,
+        },
       });
     });
   });
@@ -366,6 +371,7 @@ describe(AuthService.name, () => {
         id: session.id,
         updatedAt: session.updatedAt,
         user: factory.authUser(),
+        isPendingSyncReset: false,
         pinExpiresAt: null,
       };
 
@@ -379,7 +385,11 @@ describe(AuthService.name, () => {
         }),
       ).resolves.toEqual({
         user: sessionWithToken.user,
-        session: { id: session.id, hasElevatedPermission: false },
+        session: {
+          id: session.id,
+          hasElevatedPermission: false,
+          isPendingSyncReset: session.isPendingSyncReset,
+        },
       });
     });
 
@@ -389,6 +399,7 @@ describe(AuthService.name, () => {
         id: session.id,
         updatedAt: session.updatedAt,
         user: factory.authUser(),
+        isPendingSyncReset: false,
         pinExpiresAt: null,
       };
 
@@ -409,6 +420,7 @@ describe(AuthService.name, () => {
         id: session.id,
         updatedAt: session.updatedAt,
         user: factory.authUser(),
+        isPendingSyncReset: false,
         pinExpiresAt: null,
       };
 
diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
index ec3415ec8c..2d6c4b1b15 100644
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -466,6 +466,7 @@ export class AuthService extends BaseService {
         user: session.user,
         session: {
           id: session.id,
+          isPendingSyncReset: session.isPendingSyncReset,
           hasElevatedPermission,
         },
       };
diff --git a/server/src/services/session.service.ts b/server/src/services/session.service.ts
index 059ff00e16..198e380c53 100644
--- a/server/src/services/session.service.ts
+++ b/server/src/services/session.service.ts
@@ -2,7 +2,13 @@ import { BadRequestException, Injectable } from '@nestjs/common';
 import { DateTime } from 'luxon';
 import { OnJob } from 'src/decorators';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { SessionCreateDto, SessionCreateResponseDto, SessionResponseDto, mapSession } from 'src/dtos/session.dto';
+import {
+  SessionCreateDto,
+  SessionCreateResponseDto,
+  SessionResponseDto,
+  SessionUpdateDto,
+  mapSession,
+} from 'src/dtos/session.dto';
 import { JobName, JobStatus, Permission, QueueName } from 'src/enum';
 import { BaseService } from 'src/services/base.service';
 
@@ -44,6 +50,20 @@ export class SessionService extends BaseService {
     return sessions.map((session) => mapSession(session, auth.session?.id));
   }
 
+  async update(auth: AuthDto, id: string, dto: SessionUpdateDto): Promise<SessionResponseDto> {
+    await this.requireAccess({ auth, permission: Permission.SESSION_UPDATE, ids: [id] });
+
+    if (Object.values(dto).filter((prop) => prop !== undefined).length === 0) {
+      throw new BadRequestException('No fields to update');
+    }
+
+    const session = await this.sessionRepository.update(id, {
+      isPendingSyncReset: dto.isPendingSyncReset,
+    });
+
+    return mapSession(session);
+  }
+
   async delete(auth: AuthDto, id: string): Promise<void> {
     await this.requireAccess({ auth, permission: Permission.AUTH_DEVICE_DELETE, ids: [id] });
     await this.sessionRepository.delete(id);
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 5e9c679d7f..2cec72a3b5 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -22,7 +22,7 @@ import { SyncAck } from 'src/types';
 import { getMyPartnerIds } from 'src/utils/asset.util';
 import { hexOrBufferToBase64 } from 'src/utils/bytes';
 import { setIsEqual } from 'src/utils/set';
-import { fromAck, serialize, SerializeOptions, toAck } from 'src/utils/sync';
+import { fromAck, mapJsonLine, serialize, SerializeOptions, toAck } from 'src/utils/sync';
 
 type CheckpointMap = Partial<Record<SyncEntityType, SyncAck>>;
 type AssetLike = Omit<SyncAssetV1, 'checksum' | 'thumbhash'> & {
@@ -118,30 +118,42 @@ export class SyncService extends BaseService {
   }
 
   async stream(auth: AuthDto, response: Writable, dto: SyncStreamDto) {
-    const sessionId = auth.session?.id;
-    if (!sessionId) {
+    const session = auth.session;
+    if (!session) {
       return throwSessionRequired();
     }
 
-    const checkpoints = await this.syncCheckpointRepository.getAll(sessionId);
+    if (dto.reset) {
+      await this.sessionRepository.resetSyncProgress(session.id);
+      session.isPendingSyncReset = false;
+    }
+
+    if (session.isPendingSyncReset) {
+      response.write(mapJsonLine({ type: SyncEntityType.SyncResetV1, data: {} }));
+      response.end();
+      return;
+    }
+
+    const checkpoints = await this.syncCheckpointRepository.getAll(session.id);
     const checkpointMap: CheckpointMap = Object.fromEntries(checkpoints.map(({ type, ack }) => [type, fromAck(ack)]));
+
     const handlers: Record<SyncRequestType, () => Promise<void>> = {
       [SyncRequestType.UsersV1]: () => this.syncUsersV1(response, checkpointMap),
       [SyncRequestType.PartnersV1]: () => this.syncPartnersV1(response, checkpointMap, auth),
       [SyncRequestType.AssetsV1]: () => this.syncAssetsV1(response, checkpointMap, auth),
       [SyncRequestType.AssetExifsV1]: () => this.syncAssetExifsV1(response, checkpointMap, auth),
-      [SyncRequestType.PartnerAssetsV1]: () => this.syncPartnerAssetsV1(response, checkpointMap, auth, sessionId),
+      [SyncRequestType.PartnerAssetsV1]: () => this.syncPartnerAssetsV1(response, checkpointMap, auth, session.id),
       [SyncRequestType.PartnerAssetExifsV1]: () =>
-        this.syncPartnerAssetExifsV1(response, checkpointMap, auth, sessionId),
+        this.syncPartnerAssetExifsV1(response, checkpointMap, auth, session.id),
       [SyncRequestType.AlbumsV1]: () => this.syncAlbumsV1(response, checkpointMap, auth),
-      [SyncRequestType.AlbumUsersV1]: () => this.syncAlbumUsersV1(response, checkpointMap, auth, sessionId),
-      [SyncRequestType.AlbumAssetsV1]: () => this.syncAlbumAssetsV1(response, checkpointMap, auth, sessionId),
-      [SyncRequestType.AlbumToAssetsV1]: () => this.syncAlbumToAssetsV1(response, checkpointMap, auth, sessionId),
-      [SyncRequestType.AlbumAssetExifsV1]: () => this.syncAlbumAssetExifsV1(response, checkpointMap, auth, sessionId),
+      [SyncRequestType.AlbumUsersV1]: () => this.syncAlbumUsersV1(response, checkpointMap, auth, session.id),
+      [SyncRequestType.AlbumAssetsV1]: () => this.syncAlbumAssetsV1(response, checkpointMap, auth, session.id),
+      [SyncRequestType.AlbumToAssetsV1]: () => this.syncAlbumToAssetsV1(response, checkpointMap, auth, session.id),
+      [SyncRequestType.AlbumAssetExifsV1]: () => this.syncAlbumAssetExifsV1(response, checkpointMap, auth, session.id),
       [SyncRequestType.MemoriesV1]: () => this.syncMemoriesV1(response, checkpointMap, auth),
       [SyncRequestType.MemoryToAssetsV1]: () => this.syncMemoryAssetsV1(response, checkpointMap, auth),
       [SyncRequestType.StacksV1]: () => this.syncStackV1(response, checkpointMap, auth),
-      [SyncRequestType.PartnerStacksV1]: () => this.syncPartnerStackV1(response, checkpointMap, auth, sessionId),
+      [SyncRequestType.PartnerStacksV1]: () => this.syncPartnerStackV1(response, checkpointMap, auth, session.id),
       [SyncRequestType.PeopleV1]: () => this.syncPeopleV1(response, checkpointMap, auth),
     };
 
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index 44182602cd..c7f2e017a1 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -234,11 +234,11 @@ export class SyncTestContext extends MediumTestContext<SyncService> {
     });
   }
 
-  async syncStream(auth: AuthDto, types: SyncRequestType[]) {
+  async syncStream(auth: AuthDto, types: SyncRequestType[], reset?: boolean) {
     const stream = mediumFactory.syncStream();
     // Wait for 2ms to ensure all updates are available and account for setTimeout inaccuracy
     await wait(2);
-    await this.sut.stream(auth, stream, { types });
+    await this.sut.stream(auth, stream, { types, reset });
 
     return stream.getResponse();
   }
@@ -481,6 +481,7 @@ const sessionInsert = ({
   const defaults: Insertable<SessionTable> = {
     id,
     userId,
+    isPendingSyncReset: false,
     token: sha256(id),
   };
 
diff --git a/server/test/medium/specs/sync/sync-reset.spec.ts b/server/test/medium/specs/sync/sync-reset.spec.ts
new file mode 100644
index 0000000000..4cfdc8249e
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-reset.spec.ts
@@ -0,0 +1,63 @@
+import { Kysely } from 'kysely';
+import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { DB } from 'src/schema';
+import { SyncTestContext } from 'test/medium.factory';
+import { getKyselyDB } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(SyncEntityType.SyncResetV1, () => {
+  it('should work', async () => {
+    const { auth, ctx } = await setup();
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AssetsV1]);
+    expect(response).toEqual([]);
+  });
+
+  it('should detect a pending sync reset', async () => {
+    const { auth, ctx } = await setup();
+
+    auth.session!.isPendingSyncReset = true;
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AssetsV1]);
+    expect(response).toEqual([{ type: SyncEntityType.SyncResetV1, data: {} }]);
+  });
+
+  it('should not send other dtos when a reset is pending', async () => {
+    const { auth, user, ctx } = await setup();
+
+    await ctx.newAsset({ ownerId: user.id });
+
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetsV1])).resolves.toHaveLength(1);
+
+    auth.session!.isPendingSyncReset = true;
+
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetsV1])).resolves.toEqual([
+      { type: SyncEntityType.SyncResetV1, data: {} },
+    ]);
+  });
+
+  it('should allow resetting a pending reset when requesting changes ', async () => {
+    const { auth, user, ctx } = await setup();
+
+    await ctx.newAsset({ ownerId: user.id });
+
+    auth.session!.isPendingSyncReset = true;
+
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetsV1], true)).resolves.toEqual([
+      expect.objectContaining({
+        type: SyncEntityType.AssetV1,
+      }),
+    ]);
+  });
+});
diff --git a/server/test/small.factory.ts b/server/test/small.factory.ts
index 79d6d511a3..7b0ebeb86b 100644
--- a/server/test/small.factory.ts
+++ b/server/test/small.factory.ts
@@ -58,7 +58,11 @@ const authFactory = ({
   }
 
   if (session) {
-    auth.session = { id: session.id, hasElevatedPermission: false };
+    auth.session = {
+      id: session.id,
+      isPendingSyncReset: false,
+      hasElevatedPermission: false,
+    };
   }
 
   if (sharedLink) {
@@ -131,6 +135,7 @@ const sessionFactory = (session: Partial<Session> = {}) => ({
   expiresAt: null,
   userId: newUuid(),
   pinExpiresAt: newDate(),
+  isPendingSyncReset: false,
   ...session,
 });
 

From a17bba33281f4d5e6fe007e8af49d6b22b1aa6d4 Mon Sep 17 00:00:00 2001
From: Zach McGaughey <1799888+made2k@users.noreply.github.com>
Date: Fri, 11 Jul 2025 07:46:17 -0600
Subject: [PATCH 185/337] fix: allow insecure connections in iOS
 WidgetExtension (#19863)

Allow insecure connections in WidgetExtension
---
 mobile/ios/WidgetExtension/Info.plist | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mobile/ios/WidgetExtension/Info.plist b/mobile/ios/WidgetExtension/Info.plist
index 0f118fb75e..d4e598ee31 100644
--- a/mobile/ios/WidgetExtension/Info.plist
+++ b/mobile/ios/WidgetExtension/Info.plist
@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

From a625921e8f9e2376a40fb64d2448810db94c52ef Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 11 Jul 2025 20:27:46 +0530
Subject: [PATCH 186/337] refactor: timeline repo queries (#19871)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../lib/domain/services/timeline.service.dart |  95 +---
 .../repositories/timeline.repository.dart     | 524 ++++++------------
 2 files changed, 198 insertions(+), 421 deletions(-)

diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 840d260950..8204572547 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -18,6 +18,11 @@ typedef TimelineAssetSource = Future<List<BaseAsset>> Function(
 
 typedef TimelineBucketSource = Stream<List<Bucket>> Function();
 
+typedef TimelineQuery = ({
+  TimelineAssetSource assetSource,
+  TimelineBucketSource bucketSource,
+});
+
 class TimelineFactory {
   final DriftTimelineRepository _timelineRepository;
   final SettingsService _settingsService;
@@ -31,78 +36,32 @@ class TimelineFactory {
   GroupAssetsBy get groupBy =>
       GroupAssetsBy.values[_settingsService.get(Setting.groupAssetsBy)];
 
-  TimelineService main(List<String> timelineUsers) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getMainBucketAssets(timelineUsers, offset: offset, count: count),
-        bucketSource: () => _timelineRepository.watchMainBucket(
-          timelineUsers,
-          groupBy: groupBy,
-        ),
-      );
+  TimelineService main(List<String> timelineUsers) =>
+      TimelineService(_timelineRepository.main(timelineUsers, groupBy));
 
-  TimelineService localAlbum({required String albumId}) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getLocalAlbumBucketAssets(albumId, offset: offset, count: count),
-        bucketSource: () => _timelineRepository.watchLocalAlbumBucket(
-          albumId,
-          groupBy: groupBy,
-        ),
-      );
+  TimelineService localAlbum({required String albumId}) =>
+      TimelineService(_timelineRepository.localAlbum(albumId, groupBy));
 
-  TimelineService remoteAlbum({required String albumId}) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getRemoteAlbumBucketAssets(albumId, offset: offset, count: count),
-        bucketSource: () => _timelineRepository.watchRemoteAlbumBucket(
-          albumId,
-          groupBy: groupBy,
-        ),
-      );
+  TimelineService remoteAlbum({required String albumId}) =>
+      TimelineService(_timelineRepository.remoteAlbum(albumId, groupBy));
 
-  TimelineService remoteAssets(String ownerId) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getRemoteBucketAssets(ownerId, offset: offset, count: count),
-        bucketSource: () => _timelineRepository.watchRemoteBucket(
-          ownerId,
-          groupBy: GroupAssetsBy.month,
-        ),
-      );
+  TimelineService remoteAssets(String userId) =>
+      TimelineService(_timelineRepository.remote(userId, groupBy));
 
-  TimelineService favorite(String userId) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getFavoriteBucketAssets(userId, offset: offset, count: count),
-        bucketSource: () =>
-            _timelineRepository.watchFavoriteBucket(userId, groupBy: groupBy),
-      );
+  TimelineService favorite(String userId) =>
+      TimelineService(_timelineRepository.favorite(userId, groupBy));
 
-  TimelineService trash(String userId) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getTrashBucketAssets(userId, offset: offset, count: count),
-        bucketSource: () =>
-            _timelineRepository.watchTrashBucket(userId, groupBy: groupBy),
-      );
+  TimelineService trash(String userId) =>
+      TimelineService(_timelineRepository.trash(userId, groupBy));
 
-  TimelineService archive(String userId) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getArchiveBucketAssets(userId, offset: offset, count: count),
-        bucketSource: () =>
-            _timelineRepository.watchArchiveBucket(userId, groupBy: groupBy),
-      );
+  TimelineService archive(String userId) =>
+      TimelineService(_timelineRepository.archived(userId, groupBy));
 
-  TimelineService lockedFolder(String userId) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getLockedFolderBucketAssets(userId, offset: offset, count: count),
-        bucketSource: () => _timelineRepository.watchLockedFolderBucket(
-          userId,
-          groupBy: groupBy,
-        ),
-      );
+  TimelineService lockedFolder(String userId) =>
+      TimelineService(_timelineRepository.locked(userId, groupBy));
 
-  TimelineService video(String userId) => TimelineService(
-        assetSource: (offset, count) => _timelineRepository
-            .getVideoBucketAssets(userId, offset: offset, count: count),
-        bucketSource: () =>
-            _timelineRepository.watchVideoBucket(userId, groupBy: groupBy),
-      );
+  TimelineService video(String userId) =>
+      TimelineService(_timelineRepository.video(userId, groupBy));
 }
 
 class TimelineService {
@@ -116,7 +75,13 @@ class TimelineService {
   int _totalAssets = 0;
   int get totalAssets => _totalAssets;
 
-  TimelineService({
+  TimelineService(TimelineQuery query)
+      : this._(
+          assetSource: query.assetSource,
+          bucketSource: query.bucketSource,
+        );
+
+  TimelineService._({
     required TimelineAssetSource assetSource,
     required TimelineBucketSource bucketSource,
   })  : _assetSource = assetSource,
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 569df0aed8..76ad9bad8f 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -5,8 +5,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:stream_transform/stream_transform.dart';
 
@@ -30,19 +32,19 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         .map((users) => users..add(userId));
   }
 
-  List<Bucket> _generateBuckets(int count) {
-    final numBuckets = (count / kTimelineNoneSegmentSize).floor();
-    final buckets = List.generate(
-      numBuckets,
-      (_) => const Bucket(assetCount: kTimelineNoneSegmentSize),
-    );
-    if (count % kTimelineNoneSegmentSize != 0) {
-      buckets.add(Bucket(assetCount: count % kTimelineNoneSegmentSize));
-    }
-    return buckets;
-  }
+  TimelineQuery main(List<String> userIds, GroupAssetsBy groupBy) => (
+        bucketSource: () => _watchMainBucket(
+              userIds,
+              groupBy: groupBy,
+            ),
+        assetSource: (offset, count) => _getMainBucketAssets(
+              userIds,
+              offset: offset,
+              count: count,
+            ),
+      );
 
-  Stream<List<Bucket>> watchMainBucket(
+  Stream<List<Bucket>> _watchMainBucket(
     List<String> userIds, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
   }) {
@@ -62,7 +64,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         .throttle(const Duration(seconds: 3), trailing: true);
   }
 
-  Future<List<BaseAsset>> getMainBucketAssets(
+  Future<List<BaseAsset>> _getMainBucketAssets(
     List<String> userIds, {
     required int offset,
     required int count,
@@ -70,42 +72,53 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     return _db.mergedAssetDrift
         .mergedAsset(userIds, limit: Limit(count, offset))
         .map(
-      (row) {
-        return row.remoteId != null && row.ownerId != null
-            ? RemoteAsset(
-                id: row.remoteId!,
-                localId: row.localId,
-                name: row.name,
-                ownerId: row.ownerId!,
-                checksum: row.checksum,
-                type: row.type,
-                createdAt: row.createdAt,
-                updatedAt: row.updatedAt,
-                thumbHash: row.thumbHash,
-                width: row.width,
-                height: row.height,
-                isFavorite: row.isFavorite,
-                durationInSeconds: row.durationInSeconds,
-              )
-            : LocalAsset(
-                id: row.localId!,
-                remoteId: row.remoteId,
-                name: row.name,
-                checksum: row.checksum,
-                type: row.type,
-                createdAt: row.createdAt,
-                updatedAt: row.updatedAt,
-                width: row.width,
-                height: row.height,
-                isFavorite: row.isFavorite,
-                durationInSeconds: row.durationInSeconds,
-                orientation: row.orientation,
-              );
-      },
-    ).get();
+          (row) => row.remoteId != null && row.ownerId != null
+              ? RemoteAsset(
+                  id: row.remoteId!,
+                  localId: row.localId,
+                  name: row.name,
+                  ownerId: row.ownerId!,
+                  checksum: row.checksum,
+                  type: row.type,
+                  createdAt: row.createdAt,
+                  updatedAt: row.updatedAt,
+                  thumbHash: row.thumbHash,
+                  width: row.width,
+                  height: row.height,
+                  isFavorite: row.isFavorite,
+                  durationInSeconds: row.durationInSeconds,
+                )
+              : LocalAsset(
+                  id: row.localId!,
+                  remoteId: row.remoteId,
+                  name: row.name,
+                  checksum: row.checksum,
+                  type: row.type,
+                  createdAt: row.createdAt,
+                  updatedAt: row.updatedAt,
+                  width: row.width,
+                  height: row.height,
+                  isFavorite: row.isFavorite,
+                  durationInSeconds: row.durationInSeconds,
+                  orientation: row.orientation,
+                ),
+        )
+        .get();
   }
 
-  Stream<List<Bucket>> watchLocalAlbumBucket(
+  TimelineQuery localAlbum(String albumId, GroupAssetsBy groupBy) => (
+        bucketSource: () => _watchLocalAlbumBucket(
+              albumId,
+              groupBy: groupBy,
+            ),
+        assetSource: (offset, count) => _getLocalAlbumBucketAssets(
+              albumId,
+              offset: offset,
+              count: count,
+            ),
+      );
+
+  Stream<List<Bucket>> _watchLocalAlbumBucket(
     String albumId, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
   }) {
@@ -119,15 +132,14 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     final assetCountExp = _db.localAssetEntity.id.count();
     final dateExp = _db.localAssetEntity.createdAt.dateFmt(groupBy);
 
-    final query = _db.localAssetEntity.selectOnly()
+    final query = _db.localAssetEntity.selectOnly().join([
+      innerJoin(
+        _db.localAlbumAssetEntity,
+        _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
+        useColumns: false,
+      ),
+    ])
       ..addColumns([assetCountExp, dateExp])
-      ..join([
-        innerJoin(
-          _db.localAlbumAssetEntity,
-          _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
-          useColumns: false,
-        ),
-      ])
       ..where(_db.localAlbumAssetEntity.albumId.equals(albumId))
       ..groupBy([dateExp])
       ..orderBy([OrderingTerm.desc(dateExp)]);
@@ -139,7 +151,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     }).watch();
   }
 
-  Future<List<BaseAsset>> getLocalAlbumBucketAssets(
+  Future<List<BaseAsset>> _getLocalAlbumBucketAssets(
     String albumId, {
     required int offset,
     required int count,
@@ -156,12 +168,25 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       ..where(_db.localAlbumAssetEntity.albumId.equals(albumId))
       ..orderBy([OrderingTerm.desc(_db.localAssetEntity.createdAt)])
       ..limit(count, offset: offset);
+
     return query
         .map((row) => row.readTable(_db.localAssetEntity).toDto())
         .get();
   }
 
-  Stream<List<Bucket>> watchRemoteAlbumBucket(
+  TimelineQuery remoteAlbum(String albumId, GroupAssetsBy groupBy) => (
+        bucketSource: () => _watchRemoteAlbumBucket(
+              albumId,
+              groupBy: groupBy,
+            ),
+        assetSource: (offset, count) => _getRemoteAlbumBucketAssets(
+              albumId,
+              offset: offset,
+              count: count,
+            ),
+      );
+
+  Stream<List<Bucket>> _watchRemoteAlbumBucket(
     String albumId, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
   }) {
@@ -199,7 +224,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     }).watch();
   }
 
-  Future<List<BaseAsset>> getRemoteAlbumBucketAssets(
+  Future<List<BaseAsset>> _getRemoteAlbumBucketAssets(
     String albumId, {
     required int offset,
     required int count,
@@ -225,325 +250,101 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         .get();
   }
 
-  Stream<List<Bucket>> watchRemoteBucket(
-    String ownerId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.deletedAt.isNull() &
-                row.visibility.equalsValue(AssetVisibility.timeline) &
-                row.ownerId.equals(ownerId),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline) &
-            _db.remoteAssetEntity.ownerId.equals(ownerId),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getRemoteBucketAssets(
-    String ownerId, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
+  TimelineQuery remote(String ownerId, GroupAssetsBy groupBy) =>
+      _remoteQueryBuilder(
+        filter: (row) =>
             row.deletedAt.isNull() &
             row.visibility.equalsValue(AssetVisibility.timeline) &
             row.ownerId.equals(ownerId),
-      )
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(count, offset: offset);
+        groupBy: groupBy,
+      );
 
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Stream<List<Bucket>> watchFavoriteBucket(
-    String userId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.deletedAt.isNull() &
-                row.isFavorite.equals(true) &
-                row.ownerId.equals(userId),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.remoteAssetEntity.isFavorite.equals(true),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getFavoriteBucketAssets(
-    String userId, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
+  TimelineQuery favorite(String userId, GroupAssetsBy groupBy) =>
+      _remoteQueryBuilder(
+        filter: (row) =>
             row.deletedAt.isNull() &
             row.isFavorite.equals(true) &
             row.ownerId.equals(userId),
-      )
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(count, offset: offset);
+        groupBy: groupBy,
+      );
 
-    return query.map((row) => row.toDto()).get();
-  }
+  TimelineQuery trash(String userId, GroupAssetsBy groupBy) =>
+      _remoteQueryBuilder(
+        filter: (row) => row.deletedAt.isNotNull() & row.ownerId.equals(userId),
+        groupBy: groupBy,
+      );
 
-  Stream<List<Bucket>> watchTrashBucket(
-    String userId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.deletedAt.isNotNull() & row.ownerId.equals(userId),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.remoteAssetEntity.deletedAt.isNotNull(),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getTrashBucketAssets(
-    String userId, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) => row.deletedAt.isNotNull() & row.ownerId.equals(userId),
-      )
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(count, offset: offset);
-
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Stream<List<Bucket>> watchArchiveBucket(
-    String userId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.deletedAt.isNull() &
-                row.visibility.equalsValue(AssetVisibility.archive) &
-                row.ownerId.equals(userId),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.archive),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getArchiveBucketAssets(
-    String userId, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
+  TimelineQuery archived(String userId, GroupAssetsBy groupBy) =>
+      _remoteQueryBuilder(
+        filter: (row) =>
             row.deletedAt.isNull() &
             row.ownerId.equals(userId) &
             row.visibility.equalsValue(AssetVisibility.archive),
-      )
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(count, offset: offset);
+        groupBy: groupBy,
+      );
 
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Stream<List<Bucket>> watchLockedFolderBucket(
-    String userId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.deletedAt.isNull() &
-                row.visibility.equalsValue(AssetVisibility.locked) &
-                row.ownerId.equals(userId),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.locked),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getLockedFolderBucketAssets(
-    String userId, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
+  TimelineQuery locked(String userId, GroupAssetsBy groupBy) =>
+      _remoteQueryBuilder(
+        filter: (row) =>
             row.deletedAt.isNull() &
             row.visibility.equalsValue(AssetVisibility.locked) &
             row.ownerId.equals(userId),
-      )
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(count, offset: offset);
+        groupBy: groupBy,
+      );
 
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Stream<List<Bucket>> watchVideoBucket(
-    String userId, {
-    GroupAssetsBy groupBy = GroupAssetsBy.day,
-  }) {
-    if (groupBy == GroupAssetsBy.none) {
-      return _db.remoteAssetEntity
-          .count(
-            where: (row) =>
-                row.deletedAt.isNull() &
-                row.type.equalsValue(AssetType.video) &
-                row.visibility.equalsValue(AssetVisibility.timeline) &
-                row.ownerId.equals(userId),
-          )
-          .map(_generateBuckets)
-          .watchSingle();
-    }
-
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
-
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..where(
-        _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.remoteAssetEntity.type.equalsValue(AssetType.video) &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
-
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
-  }
-
-  Future<List<BaseAsset>> getVideoBucketAssets(
-    String userId, {
-    required int offset,
-    required int count,
-  }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
+  TimelineQuery video(String userId, GroupAssetsBy groupBy) =>
+      _remoteQueryBuilder(
+        filter: (row) =>
             row.deletedAt.isNull() &
             row.type.equalsValue(AssetType.video) &
             row.visibility.equalsValue(AssetVisibility.timeline) &
             row.ownerId.equals(userId),
-      )
+        groupBy: groupBy,
+      );
+
+  TimelineQuery _remoteQueryBuilder({
+    required Expression<bool> Function($RemoteAssetEntityTable row) filter,
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    return (
+      bucketSource: () => _watchRemoteBucket(filter: filter, groupBy: groupBy),
+      assetSource: (offset, count) =>
+          _getRemoteAssets(filter: filter, offset: offset, count: count),
+    );
+  }
+
+  Stream<List<Bucket>> _watchRemoteBucket({
+    required Expression<bool> Function($RemoteAssetEntityTable row) filter,
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    if (groupBy == GroupAssetsBy.none) {
+      final query = _db.remoteAssetEntity.count(where: filter);
+      return query.map(_generateBuckets).watchSingle();
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..where(filter(_db.remoteAssetEntity))
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> _getRemoteAssets({
+    required Expression<bool> Function($RemoteAssetEntityTable row) filter,
+    required int offset,
+    required int count,
+  }) {
+    final query = _db.remoteAssetEntity.select()
+      ..where(filter)
       ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
       ..limit(count, offset: offset);
 
@@ -551,6 +352,17 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
   }
 }
 
+List<Bucket> _generateBuckets(int count) {
+  final buckets = List.generate(
+    (count / kTimelineNoneSegmentSize).floor(),
+    (_) => const Bucket(assetCount: kTimelineNoneSegmentSize),
+  );
+  if (count % kTimelineNoneSegmentSize != 0) {
+    buckets.add(Bucket(assetCount: count % kTimelineNoneSegmentSize));
+  }
+  return buckets;
+}
+
 extension on Expression<DateTime> {
   Expression<String> dateFmt(GroupAssetsBy groupBy) {
     // DateTimes are stored in UTC, so we need to convert them to local time inside the query before formatting

From 1cc5ca14cae90a5ff390d3ba6ffa949bdb20876a Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 11 Jul 2025 10:58:34 -0400
Subject: [PATCH 187/337] feat: allow unordered migrations in dev (#19881)

---
 server/src/repositories/config.repository.ts       | 4 ++++
 server/src/repositories/database.repository.ts     | 1 +
 server/src/workers/api.ts                          | 6 ++----
 server/test/repositories/config.repository.mock.ts | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/src/repositories/config.repository.ts b/server/src/repositories/config.repository.ts
index 9a0a24f70f..dbb57bb141 100644
--- a/server/src/repositories/config.repository.ts
+++ b/server/src/repositories/config.repository.ts
@@ -334,6 +334,10 @@ export class ConfigRepository {
     return cached;
   }
 
+  isDev() {
+    return this.getEnv().environment === ImmichEnvironment.DEVELOPMENT;
+  }
+
   getWorker() {
     return this.worker;
   }
diff --git a/server/src/repositories/database.repository.ts b/server/src/repositories/database.repository.ts
index b611ff6c7f..b1aefe19f8 100644
--- a/server/src/repositories/database.repository.ts
+++ b/server/src/repositories/database.repository.ts
@@ -406,6 +406,7 @@ export class DatabaseRepository {
     const migrator = new Migrator({
       db: this.db,
       migrationLockTableName: 'kysely_migrations_lock',
+      allowUnorderedMigrations: this.configRepository.isDev(),
       migrationTableName: 'kysely_migrations',
       provider: new FileMigrationProvider({
         fs: { readdir },
diff --git a/server/src/workers/api.ts b/server/src/workers/api.ts
index ce1520c475..f56adf3b68 100644
--- a/server/src/workers/api.ts
+++ b/server/src/workers/api.ts
@@ -7,7 +7,6 @@ import { existsSync } from 'node:fs';
 import sirv from 'sirv';
 import { ApiModule } from 'src/app.module';
 import { excludePaths, serverVersion } from 'src/constants';
-import { ImmichEnvironment } from 'src/enum';
 import { WebSocketAdapter } from 'src/middleware/websocket.adapter';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
@@ -27,7 +26,6 @@ async function bootstrap() {
   const configRepository = app.get(ConfigRepository);
 
   const { environment, host, port, resourcePaths } = configRepository.getEnv();
-  const isDev = environment === ImmichEnvironment.DEVELOPMENT;
 
   logger.setContext('Bootstrap');
   app.useLogger(logger);
@@ -35,11 +33,11 @@ async function bootstrap() {
   app.set('etag', 'strong');
   app.use(cookieParser());
   app.use(json({ limit: '10mb' }));
-  if (isDev) {
+  if (configRepository.isDev()) {
     app.enableCors();
   }
   app.useWebSocketAdapter(new WebSocketAdapter(app));
-  useSwagger(app, { write: isDev });
+  useSwagger(app, { write: configRepository.isDev() });
 
   app.setGlobalPrefix('api', { exclude: excludePaths });
   if (existsSync(resourcePaths.web.root)) {
diff --git a/server/test/repositories/config.repository.mock.ts b/server/test/repositories/config.repository.mock.ts
index a2585e3b9e..460dfeef57 100644
--- a/server/test/repositories/config.repository.mock.ts
+++ b/server/test/repositories/config.repository.mock.ts
@@ -94,5 +94,6 @@ export const newConfigRepositoryMock = (): Mocked<RepositoryInterface<ConfigRepo
   return {
     getEnv: vitest.fn().mockReturnValue(mockEnvData({})),
     getWorker: vitest.fn().mockReturnValue(ImmichWorker.API),
+    isDev: vitest.fn().mockReturnValue(false),
   };
 };

From 2b07d7ac638385db8ab45029751c021eec3dbffb Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 11 Jul 2025 10:06:53 -0500
Subject: [PATCH 188/337] feat: remove from album action button (#19884)

* feat: remove from album action

* feat: remove from album action
---
 i18n/en.json                                  |  1 +
 .../repositories/remote_album.repository.dart |  6 +++
 ...emove_from_album_action_button.widget.dart | 42 ++++++++++++++++++-
 .../infrastructure/action.provider.dart       | 18 ++++++++
 .../drift_album_api_repository.dart           | 21 ++++++++++
 mobile/lib/services/action.service.dart       | 21 ++++++++++
 .../modules/map/map_theme_override_test.dart  |  1 +
 7 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/i18n/en.json b/i18n/en.json
index 352c8a24b6..06b3a5d599 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1501,6 +1501,7 @@
   "remove_custom_date_range": "Remove custom date range",
   "remove_deleted_assets": "Remove Deleted Assets",
   "remove_from_album": "Remove from album",
+  "remove_from_album_action_prompt": "{count} removed from the album",
   "remove_from_favorites": "Remove from favorites",
   "remove_from_lock_folder_action_prompt": "{count} removed from the locked folder",
   "remove_from_locked_folder": "Remove from locked folder",
diff --git a/mobile/lib/infrastructure/repositories/remote_album.repository.dart b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
index 49d6a2661d..b77184bce0 100644
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -98,6 +98,12 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
       }
     });
   }
+
+  Future<int> removeAssets(String albumId, List<String> assetIds) {
+    return _db.remoteAlbumAssetEntity.deleteWhere(
+      (tbl) => tbl.albumId.equals(albumId) & tbl.assetId.isIn(assetIds),
+    );
+  }
 }
 
 extension on RemoteAlbumEntityData {
diff --git a/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
index b18e10ebba..8228e27cc1 100644
--- a/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
@@ -1,16 +1,56 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class RemoveFromAlbumActionButton extends ConsumerWidget {
-  const RemoveFromAlbumActionButton({super.key});
+  final String albumId;
+  final ActionSource source;
+
+  const RemoveFromAlbumActionButton({
+    super.key,
+    required this.albumId,
+    required this.source,
+  });
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref
+        .read(actionProvider.notifier)
+        .removeFromAlbum(source, albumId);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'remove_from_album_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.remove_circle_outline,
       label: "remove_from_album".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 0c197ca683..49605e918a 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -228,6 +228,24 @@ class ActionNotifier extends Notifier<void> {
       );
     }
   }
+
+  Future<ActionResult> removeFromAlbum(
+    ActionSource source,
+    String albumId,
+  ) async {
+    final ids = _getRemoteIdsForSource(source);
+    try {
+      final removedCount = await _service.removeFromAlbum(ids, albumId);
+      return ActionResult(count: removedCount, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to remove assets from album', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
 }
 
 extension on Iterable<RemoteAsset> {
diff --git a/mobile/lib/repositories/drift_album_api_repository.dart b/mobile/lib/repositories/drift_album_api_repository.dart
index 3539012895..7ef24f1e7c 100644
--- a/mobile/lib/repositories/drift_album_api_repository.dart
+++ b/mobile/lib/repositories/drift_album_api_repository.dart
@@ -31,6 +31,27 @@ class DriftAlbumApiRepository extends ApiRepository {
 
     return responseDto.toRemoteAlbum();
   }
+
+  Future<({List<String> removed, List<String> failed})> removeAssets(
+    String albumId,
+    Iterable<String> assetIds,
+  ) async {
+    final response = await checkNull(
+      _api.removeAssetFromAlbum(
+        albumId,
+        BulkIdsDto(ids: assetIds.toList()),
+      ),
+    );
+    final List<String> removed = [], failed = [];
+    for (final dto in response) {
+      if (dto.success) {
+        removed.add(dto.id);
+      } else {
+        failed.add(dto.id);
+      }
+    }
+    return (removed: removed, failed: failed);
+  }
 }
 
 extension on AlbumResponseDto {
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index 2f4c8cc926..d7c625b981 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -2,9 +2,12 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
+import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/location_picker.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
@@ -14,16 +17,22 @@ final actionServiceProvider = Provider<ActionService>(
   (ref) => ActionService(
     ref.watch(assetApiRepositoryProvider),
     ref.watch(remoteAssetRepositoryProvider),
+    ref.watch(driftAlbumApiRepositoryProvider),
+    ref.watch(remoteAlbumRepository),
   ),
 );
 
 class ActionService {
   final AssetApiRepository _assetApiRepository;
   final RemoteAssetRepository _remoteAssetRepository;
+  final DriftAlbumApiRepository _albumApiRepository;
+  final DriftRemoteAlbumRepository _remoteAlbumRepository;
 
   const ActionService(
     this._assetApiRepository,
     this._remoteAssetRepository,
+    this._albumApiRepository,
+    this._remoteAlbumRepository,
   );
 
   Future<void> shareLink(List<String> remoteIds, BuildContext context) async {
@@ -131,4 +140,16 @@ class ActionService {
 
     return true;
   }
+
+  Future<int> removeFromAlbum(List<String> remoteIds, String albumId) async {
+    int removedCount = 0;
+    final result = await _albumApiRepository.removeAssets(albumId, remoteIds);
+
+    if (result.removed.isNotEmpty) {
+      removedCount =
+          await _remoteAlbumRepository.removeAssets(albumId, result.removed);
+    }
+
+    return removedCount;
+  }
 }
diff --git a/mobile/test/modules/map/map_theme_override_test.dart b/mobile/test/modules/map/map_theme_override_test.dart
index db133d5c34..d0a84796b4 100644
--- a/mobile/test/modules/map/map_theme_override_test.dart
+++ b/mobile/test/modules/map/map_theme_override_test.dart
@@ -1,3 +1,4 @@
+@Skip('Flaky test, needs investigation')
 @Tags(['widget'])
 library;
 

From 617a2f146df80bac67be940b824ab3029cb6f6c5 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 11 Jul 2025 11:22:38 -0400
Subject: [PATCH 189/337] fix: startup log level (#19885)

---
 server/src/services/system-config.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/services/system-config.service.ts b/server/src/services/system-config.service.ts
index 2dd8dcf0ee..4c4aa6bab7 100644
--- a/server/src/services/system-config.service.ts
+++ b/server/src/services/system-config.service.ts
@@ -27,7 +27,7 @@ export class SystemConfigService extends BaseService {
     return mapConfig(defaults);
   }
 
-  @OnEvent({ name: 'config.init' })
+  @OnEvent({ name: 'config.init', priority: -100 })
   onConfigInit({ newConfig: { logging } }: ArgOf<'config.init'>) {
     const { logLevel: envLevel } = this.configRepository.getEnv();
     const configLevel = logging.enabled ? logging.level : false;

From de4217cefc50693c25b78cafe52985bd3cd7e7c2 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 11 Jul 2025 10:34:38 -0500
Subject: [PATCH 190/337] feat: action buttons in more view (#19867)

* feat: action buttons in more view

* pr feedback
---
 .../pages/dev/drift_partner_detail.page.dart  |  29 -----
 .../pages/dev/media_stat.page.dart            |   2 +-
 .../presentation/pages/drift_album.page.dart  |   4 +-
 .../pages/{dev => }/drift_archive.page.dart   |   2 +
 .../pages/drift_create_album.page.dart        |   2 +-
 .../pages/{dev => }/drift_favorite.page.dart  |   2 +
 .../pages/drift_library.page.dart             |   5 +-
 .../{dev => }/drift_local_album.page.dart     |   0
 .../{dev => }/drift_locked_folder.page.dart   |  10 +-
 .../pages/drift_partner_detail.page.dart      | 109 ++++++++++++++++++
 .../{dev => }/drift_recently_taken.page.dart  |   0
 ...page.dart => drift_remote_album.page.dart} |   8 +-
 .../pages/{dev => }/drift_trash.page.dart     |   0
 .../pages/{dev => }/drift_video.page.dart     |   0
 .../pages/{dev => }/local_timeline.page.dart  |   2 +
 .../unarchive_action_button.widget.dart       |   4 +-
 .../asset_viewer/bottom_sheet.widget.dart     |   2 +-
 .../archive_bottom_sheet.widget.dart          |  61 ++++++++++
 .../base_bottom_sheet.widget.dart             |   0
 .../favorite_bottom_sheet.widget.dart         |  61 ++++++++++
 .../general_bottom_sheet.widget.dart}         |   9 +-
 .../local_album_bottom_sheet.widget.dart      |  24 ++++
 .../locked_folder_bottom_sheet.widget.dart    |  27 +++++
 .../partner_detail_bottom_sheet.widget.dart   |  22 ++++
 .../remote_album_bottom_sheet.widget.dart     |  68 +++++++++++
 .../widgets/timeline/timeline.widget.dart     |  10 +-
 mobile/lib/routing/router.dart                |  22 ++--
 mobile/lib/routing/router.gr.dart             |  86 +++++++-------
 28 files changed, 469 insertions(+), 102 deletions(-)
 delete mode 100644 mobile/lib/presentation/pages/dev/drift_partner_detail.page.dart
 rename mobile/lib/presentation/pages/{dev => }/drift_archive.page.dart (90%)
 rename mobile/lib/presentation/pages/{dev => }/drift_favorite.page.dart (90%)
 rename mobile/lib/presentation/pages/{dev => }/drift_local_album.page.dart (100%)
 rename mobile/lib/presentation/pages/{dev => }/drift_locked_folder.page.dart (70%)
 create mode 100644 mobile/lib/presentation/pages/drift_partner_detail.page.dart
 rename mobile/lib/presentation/pages/{dev => }/drift_recently_taken.page.dart (100%)
 rename mobile/lib/presentation/pages/{dev/remote_timeline.page.dart => drift_remote_album.page.dart} (78%)
 rename mobile/lib/presentation/pages/{dev => }/drift_trash.page.dart (100%)
 rename mobile/lib/presentation/pages/{dev => }/drift_video.page.dart (100%)
 rename mobile/lib/presentation/pages/{dev => }/local_timeline.page.dart (87%)
 create mode 100644 mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
 rename mobile/lib/presentation/widgets/{bottom_app_bar => bottom_sheet}/base_bottom_sheet.widget.dart (100%)
 create mode 100644 mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
 rename mobile/lib/presentation/widgets/{bottom_app_bar/home_bottom_app_bar.widget.dart => bottom_sheet/general_bottom_sheet.widget.dart} (92%)
 create mode 100644 mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart

diff --git a/mobile/lib/presentation/pages/dev/drift_partner_detail.page.dart b/mobile/lib/presentation/pages/dev/drift_partner_detail.page.dart
deleted file mode 100644
index 4b62387cb4..0000000000
--- a/mobile/lib/presentation/pages/dev/drift_partner_detail.page.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/widgets.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-
-@RoutePage()
-class DriftPartnerDetailPage extends StatelessWidget {
-  final String partnerId;
-
-  const DriftPartnerDetailPage({super.key, required this.partnerId});
-
-  @override
-  Widget build(BuildContext context) {
-    return ProviderScope(
-      overrides: [
-        timelineServiceProvider.overrideWith(
-          (ref) {
-            final timelineService =
-                ref.watch(timelineFactoryProvider).remoteAssets(partnerId);
-            ref.onDispose(timelineService.dispose);
-            return timelineService;
-          },
-        ),
-      ],
-      child: const Timeline(),
-    );
-  }
-}
diff --git a/mobile/lib/presentation/pages/dev/media_stat.page.dart b/mobile/lib/presentation/pages/dev/media_stat.page.dart
index 0a77d9dfe8..e61dcdf90d 100644
--- a/mobile/lib/presentation/pages/dev/media_stat.page.dart
+++ b/mobile/lib/presentation/pages/dev/media_stat.page.dart
@@ -226,7 +226,7 @@ class RemoteMediaSummaryPage extends StatelessWidget {
                         name: album.name,
                         countFuture: countFuture,
                         onTap: () => context.router.push(
-                          RemoteTimelineRoute(album: album),
+                          RemoteAlbumRoute(album: album),
                         ),
                       );
                     },
diff --git a/mobile/lib/presentation/pages/drift_album.page.dart b/mobile/lib/presentation/pages/drift_album.page.dart
index 8ae3c79138..e6d3d796a4 100644
--- a/mobile/lib/presentation/pages/drift_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_album.page.dart
@@ -568,7 +568,7 @@ class _AlbumList extends StatelessWidget {
                 ),
               ),
               onTap: () => context.router.push(
-                RemoteTimelineRoute(album: album),
+                RemoteAlbumRoute(album: album),
               ),
               leadingPadding: const EdgeInsets.only(
                 right: 16,
@@ -705,7 +705,7 @@ class _GridAlbumCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () => context.router.push(
-        RemoteTimelineRoute(album: album),
+        RemoteAlbumRoute(album: album),
       ),
       child: Card(
         elevation: 0,
diff --git a/mobile/lib/presentation/pages/dev/drift_archive.page.dart b/mobile/lib/presentation/pages/drift_archive.page.dart
similarity index 90%
rename from mobile/lib/presentation/pages/dev/drift_archive.page.dart
rename to mobile/lib/presentation/pages/drift_archive.page.dart
index fa847c74b5..90b8dcb646 100644
--- a/mobile/lib/presentation/pages/dev/drift_archive.page.dart
+++ b/mobile/lib/presentation/pages/drift_archive.page.dart
@@ -2,6 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.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/user.provider.dart';
@@ -34,6 +35,7 @@ class DriftArchivePage extends StatelessWidget {
           title: 'archive'.t(context: context),
           icon: Icons.archive_outlined,
         ),
+        bottomSheet: const ArchiveBottomSheet(),
       ),
     );
   }
diff --git a/mobile/lib/presentation/pages/drift_create_album.page.dart b/mobile/lib/presentation/pages/drift_create_album.page.dart
index 93dfb265c6..e06321413e 100644
--- a/mobile/lib/presentation/pages/drift_create_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_create_album.page.dart
@@ -203,7 +203,7 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
 
     if (album != null) {
       context.replaceRoute(
-        RemoteTimelineRoute(album: album),
+        RemoteAlbumRoute(album: album),
       );
     }
   }
diff --git a/mobile/lib/presentation/pages/dev/drift_favorite.page.dart b/mobile/lib/presentation/pages/drift_favorite.page.dart
similarity index 90%
rename from mobile/lib/presentation/pages/dev/drift_favorite.page.dart
rename to mobile/lib/presentation/pages/drift_favorite.page.dart
index 43f270574b..90a273f93b 100644
--- a/mobile/lib/presentation/pages/dev/drift_favorite.page.dart
+++ b/mobile/lib/presentation/pages/drift_favorite.page.dart
@@ -2,6 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.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/user.provider.dart';
@@ -34,6 +35,7 @@ class DriftFavoritePage extends StatelessWidget {
           title: 'favorites'.t(context: context),
           icon: Icons.favorite_outline,
         ),
+        bottomSheet: const FavoriteBottomSheet(),
       ),
     );
   }
diff --git a/mobile/lib/presentation/pages/drift_library.page.dart b/mobile/lib/presentation/pages/drift_library.page.dart
index 2b0ec191e2..1e8975dcfa 100644
--- a/mobile/lib/presentation/pages/drift_library.page.dart
+++ b/mobile/lib/presentation/pages/drift_library.page.dart
@@ -512,8 +512,9 @@ class _PartnerList extends StatelessWidget {
               fontWeight: FontWeight.w500,
             ),
           ).t(context: context, args: {'user': partner.name}),
-          onTap: () =>
-              context.pushRoute(DriftPartnerDetailRoute(partnerId: partner.id)),
+          onTap: () => context.pushRoute(
+            DriftPartnerDetailRoute(partner: partner),
+          ),
         );
       },
     );
diff --git a/mobile/lib/presentation/pages/dev/drift_local_album.page.dart b/mobile/lib/presentation/pages/drift_local_album.page.dart
similarity index 100%
rename from mobile/lib/presentation/pages/dev/drift_local_album.page.dart
rename to mobile/lib/presentation/pages/drift_local_album.page.dart
diff --git a/mobile/lib/presentation/pages/dev/drift_locked_folder.page.dart b/mobile/lib/presentation/pages/drift_locked_folder.page.dart
similarity index 70%
rename from mobile/lib/presentation/pages/dev/drift_locked_folder.page.dart
rename to mobile/lib/presentation/pages/drift_locked_folder.page.dart
index 5ab7c71347..9b42cdb103 100644
--- a/mobile/lib/presentation/pages/dev/drift_locked_folder.page.dart
+++ b/mobile/lib/presentation/pages/drift_locked_folder.page.dart
@@ -1,9 +1,12 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.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/user.provider.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 
 @RoutePage()
 class DriftLockedFolderPage extends StatelessWidget {
@@ -27,7 +30,12 @@ class DriftLockedFolderPage extends StatelessWidget {
           },
         ),
       ],
-      child: const Timeline(),
+      child: Timeline(
+        appBar: MesmerizingSliverAppBar(
+          title: 'locked_folder'.t(context: context),
+        ),
+        bottomSheet: const LockedFolderBottomSheet(),
+      ),
     );
   }
 }
diff --git a/mobile/lib/presentation/pages/drift_partner_detail.page.dart b/mobile/lib/presentation/pages/drift_partner_detail.page.dart
new file mode 100644
index 0000000000..baae893d39
--- /dev/null
+++ b/mobile/lib/presentation/pages/drift_partner_detail.page.dart
@@ -0,0 +1,109 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
+
+@RoutePage()
+class DriftPartnerDetailPage extends StatelessWidget {
+  final UserDto partner;
+
+  const DriftPartnerDetailPage({
+    super.key,
+    required this.partner,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final timelineService =
+                ref.watch(timelineFactoryProvider).remoteAssets(partner.id);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: Timeline(
+        appBar: MesmerizingSliverAppBar(
+          title: partner.name,
+          icon: Icons.person_outline,
+        ),
+        topSliverWidget: _InfoBox(
+          onTap: () => {
+            // TODO: Create DriftUserProvider/DriftUserService to handle this action
+          },
+          inTimeline: partner.inTimeline,
+        ),
+        topSliverWidgetHeight: 110,
+        bottomSheet: const PartnerDetailBottomSheet(),
+      ),
+    );
+  }
+}
+
+class _InfoBox extends StatelessWidget {
+  final VoidCallback onTap;
+  final bool inTimeline;
+
+  const _InfoBox({
+    required this.onTap,
+    required this.inTimeline,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverToBoxAdapter(
+      child: SizedBox(
+        height: 110,
+        child: Padding(
+          padding: const EdgeInsets.only(left: 8.0, right: 8.0, top: 16.0),
+          child: Container(
+            decoration: BoxDecoration(
+              border: Border.all(
+                color: context.colorScheme.onSurface.withAlpha(10),
+                width: 1,
+              ),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(20),
+              ),
+              gradient: LinearGradient(
+                colors: [
+                  context.colorScheme.primary.withAlpha(10),
+                  context.colorScheme.primary.withAlpha(15),
+                ],
+                begin: Alignment.topCenter,
+                end: Alignment.bottomCenter,
+              ),
+            ),
+            child: Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: ListTile(
+                title: Text(
+                  "Show in timeline",
+                  style: context.textTheme.titleSmall?.copyWith(
+                    color: context.colorScheme.primary,
+                  ),
+                ),
+                subtitle: Text(
+                  "Show photos and videos from this user in your timeline",
+                  style: context.textTheme.bodyMedium,
+                ),
+                trailing: Switch(
+                  value: inTimeline,
+                  onChanged: (_) => onTap(),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/dev/drift_recently_taken.page.dart b/mobile/lib/presentation/pages/drift_recently_taken.page.dart
similarity index 100%
rename from mobile/lib/presentation/pages/dev/drift_recently_taken.page.dart
rename to mobile/lib/presentation/pages/drift_recently_taken.page.dart
diff --git a/mobile/lib/presentation/pages/dev/remote_timeline.page.dart b/mobile/lib/presentation/pages/drift_remote_album.page.dart
similarity index 78%
rename from mobile/lib/presentation/pages/dev/remote_timeline.page.dart
rename to mobile/lib/presentation/pages/drift_remote_album.page.dart
index 2930a3c3d8..bbfe6ddc74 100644
--- a/mobile/lib/presentation/pages/dev/remote_timeline.page.dart
+++ b/mobile/lib/presentation/pages/drift_remote_album.page.dart
@@ -2,15 +2,16 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 
 @RoutePage()
-class RemoteTimelinePage extends StatelessWidget {
+class RemoteAlbumPage extends StatelessWidget {
   final RemoteAlbum album;
 
-  const RemoteTimelinePage({super.key, required this.album});
+  const RemoteAlbumPage({super.key, required this.album});
 
   @override
   Widget build(BuildContext context) {
@@ -31,6 +32,9 @@ class RemoteTimelinePage extends StatelessWidget {
           title: album.name,
           icon: Icons.photo_album_outlined,
         ),
+        bottomSheet: RemoteAlbumBottomSheet(
+          album: album,
+        ),
       ),
     );
   }
diff --git a/mobile/lib/presentation/pages/dev/drift_trash.page.dart b/mobile/lib/presentation/pages/drift_trash.page.dart
similarity index 100%
rename from mobile/lib/presentation/pages/dev/drift_trash.page.dart
rename to mobile/lib/presentation/pages/drift_trash.page.dart
diff --git a/mobile/lib/presentation/pages/dev/drift_video.page.dart b/mobile/lib/presentation/pages/drift_video.page.dart
similarity index 100%
rename from mobile/lib/presentation/pages/dev/drift_video.page.dart
rename to mobile/lib/presentation/pages/drift_video.page.dart
diff --git a/mobile/lib/presentation/pages/dev/local_timeline.page.dart b/mobile/lib/presentation/pages/local_timeline.page.dart
similarity index 87%
rename from mobile/lib/presentation/pages/dev/local_timeline.page.dart
rename to mobile/lib/presentation/pages/local_timeline.page.dart
index f966109289..b4df0f64e2 100644
--- a/mobile/lib/presentation/pages/dev/local_timeline.page.dart
+++ b/mobile/lib/presentation/pages/local_timeline.page.dart
@@ -2,6 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
@@ -28,6 +29,7 @@ class LocalTimelinePage extends StatelessWidget {
       ],
       child: Timeline(
         appBar: MesmerizingSliverAppBar(title: album.name),
+        bottomSheet: const LocalAlbumBottomSheet(),
       ),
     );
   }
diff --git a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
index a58d9f1ee1..e44500144c 100644
--- a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
@@ -8,10 +8,10 @@ import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
-class UnarchiveActionButton extends ConsumerWidget {
+class UnArchiveActionButton extends ConsumerWidget {
   final ActionSource source;
 
-  const UnarchiveActionButton({super.key, required this.source});
+  const UnArchiveActionButton({super.key, required this.source});
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
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 d0bdc28d10..a7a2a57ce5 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -16,7 +16,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_act
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart';
-import 'package:immich_mobile/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
new file mode 100644
index 0000000000..c23f268465
--- /dev/null
+++ b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+
+class ArchiveBottomSheet extends ConsumerWidget {
+  const ArchiveBottomSheet({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final multiselect = ref.watch(multiSelectProvider);
+    final isTrashEnable = ref.watch(
+      serverInfoProvider.select((state) => state.serverFeatures.trash),
+    );
+
+    return BaseBottomSheet(
+      initialChildSize: 0.25,
+      maxChildSize: 0.4,
+      shouldCloseOnMinExtent: false,
+      actions: [
+        const ShareActionButton(),
+        if (multiselect.hasRemote) ...[
+          const ShareLinkActionButton(source: ActionSource.timeline),
+          const UnArchiveActionButton(source: ActionSource.timeline),
+          const FavoriteActionButton(source: ActionSource.timeline),
+          const DownloadActionButton(),
+          isTrashEnable
+              ? const TrashActionButton(source: ActionSource.timeline)
+              : const DeletePermanentActionButton(
+                  source: ActionSource.timeline,
+                ),
+          const EditDateTimeActionButton(),
+          const EditLocationActionButton(source: ActionSource.timeline),
+          const MoveToLockFolderActionButton(
+            source: ActionSource.timeline,
+          ),
+          const StackActionButton(),
+        ],
+        if (multiselect.hasLocal) ...[
+          const DeleteLocalActionButton(),
+          const UploadActionButton(),
+        ],
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart
similarity index 100%
rename from mobile/lib/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart
rename to mobile/lib/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
new file mode 100644
index 0000000000..2f8208a80b
--- /dev/null
+++ b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+
+class FavoriteBottomSheet extends ConsumerWidget {
+  const FavoriteBottomSheet({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final multiselect = ref.watch(multiSelectProvider);
+    final isTrashEnable = ref.watch(
+      serverInfoProvider.select((state) => state.serverFeatures.trash),
+    );
+
+    return BaseBottomSheet(
+      initialChildSize: 0.25,
+      maxChildSize: 0.4,
+      shouldCloseOnMinExtent: false,
+      actions: [
+        const ShareActionButton(),
+        if (multiselect.hasRemote) ...[
+          const ShareLinkActionButton(source: ActionSource.timeline),
+          const UnFavoriteActionButton(source: ActionSource.timeline),
+          const ArchiveActionButton(source: ActionSource.timeline),
+          const DownloadActionButton(),
+          isTrashEnable
+              ? const TrashActionButton(source: ActionSource.timeline)
+              : const DeletePermanentActionButton(
+                  source: ActionSource.timeline,
+                ),
+          const EditDateTimeActionButton(),
+          const EditLocationActionButton(source: ActionSource.timeline),
+          const MoveToLockFolderActionButton(
+            source: ActionSource.timeline,
+          ),
+          const StackActionButton(),
+        ],
+        if (multiselect.hasLocal) ...[
+          const DeleteLocalActionButton(),
+          const UploadActionButton(),
+        ],
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
similarity index 92%
rename from mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
rename to mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
index f5ba759130..900adefd0b 100644
--- a/mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -14,12 +14,12 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_act
 import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/bottom_app_bar/base_bottom_sheet.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
-class HomeBottomAppBar extends ConsumerWidget {
-  const HomeBottomAppBar({super.key});
+class GeneralBottomSheet extends ConsumerWidget {
+  const GeneralBottomSheet({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -30,9 +30,10 @@ class HomeBottomAppBar extends ConsumerWidget {
 
     return BaseBottomSheet(
       initialChildSize: 0.25,
+      maxChildSize: 0.4,
       shouldCloseOnMinExtent: false,
       actions: [
-        if (multiselect.isEnabled) const ShareActionButton(),
+        const ShareActionButton(),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
           const ArchiveActionButton(source: ActionSource.timeline),
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
new file mode 100644
index 0000000000..3fd717f516
--- /dev/null
+++ b/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
@@ -0,0 +1,24 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
+
+class LocalAlbumBottomSheet extends ConsumerWidget {
+  const LocalAlbumBottomSheet({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return const BaseBottomSheet(
+      initialChildSize: 0.25,
+      maxChildSize: 0.4,
+      shouldCloseOnMinExtent: false,
+      actions: [
+        ShareActionButton(),
+        DeleteLocalActionButton(),
+        UploadActionButton(),
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
new file mode 100644
index 0000000000..97b2646f32
--- /dev/null
+++ b/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
+
+class LockedFolderBottomSheet extends ConsumerWidget {
+  const LockedFolderBottomSheet({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return const BaseBottomSheet(
+      initialChildSize: 0.25,
+      maxChildSize: 0.4,
+      shouldCloseOnMinExtent: false,
+      actions: [
+        ShareActionButton(),
+        DownloadActionButton(),
+        DeletePermanentActionButton(source: ActionSource.timeline),
+        RemoveFromLockFolderActionButton(source: ActionSource.timeline),
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart
new file mode 100644
index 0000000000..7af8ab7c86
--- /dev/null
+++ b/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart
@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
+
+class PartnerDetailBottomSheet extends ConsumerWidget {
+  const PartnerDetailBottomSheet({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return const BaseBottomSheet(
+      initialChildSize: 0.25,
+      maxChildSize: 0.4,
+      shouldCloseOnMinExtent: false,
+      actions: [
+        ShareActionButton(),
+        DownloadActionButton(),
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
new file mode 100644
index 0000000000..0268a2b386
--- /dev/null
+++ b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+
+class RemoteAlbumBottomSheet extends ConsumerWidget {
+  final RemoteAlbum album;
+  const RemoteAlbumBottomSheet({super.key, required this.album});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final multiselect = ref.watch(multiSelectProvider);
+    final isTrashEnable = ref.watch(
+      serverInfoProvider.select((state) => state.serverFeatures.trash),
+    );
+
+    return BaseBottomSheet(
+      initialChildSize: 0.25,
+      maxChildSize: 0.4,
+      shouldCloseOnMinExtent: false,
+      actions: [
+        const ShareActionButton(),
+        if (multiselect.hasRemote) ...[
+          const ShareLinkActionButton(source: ActionSource.timeline),
+          const ArchiveActionButton(source: ActionSource.timeline),
+          const FavoriteActionButton(source: ActionSource.timeline),
+          const DownloadActionButton(),
+          isTrashEnable
+              ? const TrashActionButton(source: ActionSource.timeline)
+              : const DeletePermanentActionButton(
+                  source: ActionSource.timeline,
+                ),
+          const EditDateTimeActionButton(),
+          const EditLocationActionButton(source: ActionSource.timeline),
+          const MoveToLockFolderActionButton(
+            source: ActionSource.timeline,
+          ),
+          const StackActionButton(),
+        ],
+        if (multiselect.hasLocal) ...[
+          const DeleteLocalActionButton(),
+          const UploadActionButton(),
+        ],
+        RemoveFromAlbumActionButton(
+          source: ActionSource.timeline,
+          albumId: album.id,
+        ),
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index bc1b044044..490f2bcff2 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -10,7 +10,7 @@ import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
@@ -28,13 +28,14 @@ class Timeline extends StatelessWidget {
     this.topSliverWidgetHeight,
     this.showStorageIndicator = false,
     this.appBar,
+    this.bottomSheet = const GeneralBottomSheet(),
   });
 
   final Widget? topSliverWidget;
   final double? topSliverWidgetHeight;
   final bool showStorageIndicator;
   final Widget? appBar;
-
+  final Widget? bottomSheet;
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -56,6 +57,7 @@ class Timeline extends StatelessWidget {
             topSliverWidget: topSliverWidget,
             topSliverWidgetHeight: topSliverWidgetHeight,
             appBar: appBar,
+            bottomSheet: bottomSheet,
           ),
         ),
       ),
@@ -68,11 +70,13 @@ class _SliverTimeline extends ConsumerStatefulWidget {
     this.topSliverWidget,
     this.topSliverWidgetHeight,
     this.appBar,
+    this.bottomSheet,
   });
 
   final Widget? topSliverWidget;
   final double? topSliverWidgetHeight;
   final Widget? appBar;
+  final Widget? bottomSheet;
 
   @override
   ConsumerState createState() => _SliverTimelineState();
@@ -197,7 +201,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                     }
                     return const SizedBox.shrink();
                   },
-                  child: const HomeBottomAppBar(),
+                  child: widget.bottomSheet,
                 ),
               ],
             ],
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 63dc194ac6..5fcd060b0c 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -69,19 +69,19 @@ import 'package:immich_mobile/pages/search/person_result.page.dart';
 import 'package:immich_mobile/pages/search/recently_taken.page.dart';
 import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/drift_favorite.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/drift_partner_detail.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/drift_local_album.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/drift_recently_taken.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/drift_video.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/drift_trash.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/drift_archive.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/drift_locked_folder.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_favorite.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_partner_detail.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_local_album.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_recently_taken.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_video.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_trash.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_archive.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_locked_folder.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/local_timeline.page.dart';
+import 'package:immich_mobile/presentation/pages/local_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/remote_timeline.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_remote_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_library.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_asset_selection_timeline.page.dart';
@@ -390,7 +390,7 @@ class AppRouter extends RootStackRouter {
       guards: [_authGuard, _duplicateGuard],
     ),
     AutoRoute(
-      page: RemoteTimelineRoute.page,
+      page: RemoteAlbumRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
     AutoRoute(
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 51d171c582..bd2b148455 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -821,11 +821,11 @@ class DriftPartnerDetailRoute
     extends PageRouteInfo<DriftPartnerDetailRouteArgs> {
   DriftPartnerDetailRoute({
     Key? key,
-    required String partnerId,
+    required UserDto partner,
     List<PageRouteInfo>? children,
   }) : super(
           DriftPartnerDetailRoute.name,
-          args: DriftPartnerDetailRouteArgs(key: key, partnerId: partnerId),
+          args: DriftPartnerDetailRouteArgs(key: key, partner: partner),
           initialChildren: children,
         );
 
@@ -835,21 +835,21 @@ class DriftPartnerDetailRoute
     name,
     builder: (data) {
       final args = data.argsAs<DriftPartnerDetailRouteArgs>();
-      return DriftPartnerDetailPage(key: args.key, partnerId: args.partnerId);
+      return DriftPartnerDetailPage(key: args.key, partner: args.partner);
     },
   );
 }
 
 class DriftPartnerDetailRouteArgs {
-  const DriftPartnerDetailRouteArgs({this.key, required this.partnerId});
+  const DriftPartnerDetailRouteArgs({this.key, required this.partner});
 
   final Key? key;
 
-  final String partnerId;
+  final UserDto partner;
 
   @override
   String toString() {
-    return 'DriftPartnerDetailRouteArgs{key: $key, partnerId: $partnerId}';
+    return 'DriftPartnerDetailRouteArgs{key: $key, partner: $partner}';
   }
 }
 
@@ -1760,6 +1760,43 @@ class RecentlyTakenRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [RemoteAlbumPage]
+class RemoteAlbumRoute extends PageRouteInfo<RemoteAlbumRouteArgs> {
+  RemoteAlbumRoute({
+    Key? key,
+    required RemoteAlbum album,
+    List<PageRouteInfo>? children,
+  }) : super(
+          RemoteAlbumRoute.name,
+          args: RemoteAlbumRouteArgs(key: key, album: album),
+          initialChildren: children,
+        );
+
+  static const String name = 'RemoteAlbumRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<RemoteAlbumRouteArgs>();
+      return RemoteAlbumPage(key: args.key, album: args.album);
+    },
+  );
+}
+
+class RemoteAlbumRouteArgs {
+  const RemoteAlbumRouteArgs({this.key, required this.album});
+
+  final Key? key;
+
+  final RemoteAlbum album;
+
+  @override
+  String toString() {
+    return 'RemoteAlbumRouteArgs{key: $key, album: $album}';
+  }
+}
+
 /// generated route for
 /// [RemoteMediaSummaryPage]
 class RemoteMediaSummaryRoute extends PageRouteInfo<void> {
@@ -1776,43 +1813,6 @@ class RemoteMediaSummaryRoute extends PageRouteInfo<void> {
   );
 }
 
-/// generated route for
-/// [RemoteTimelinePage]
-class RemoteTimelineRoute extends PageRouteInfo<RemoteTimelineRouteArgs> {
-  RemoteTimelineRoute({
-    Key? key,
-    required RemoteAlbum album,
-    List<PageRouteInfo>? children,
-  }) : super(
-          RemoteTimelineRoute.name,
-          args: RemoteTimelineRouteArgs(key: key, album: album),
-          initialChildren: children,
-        );
-
-  static const String name = 'RemoteTimelineRoute';
-
-  static PageInfo page = PageInfo(
-    name,
-    builder: (data) {
-      final args = data.argsAs<RemoteTimelineRouteArgs>();
-      return RemoteTimelinePage(key: args.key, album: args.album);
-    },
-  );
-}
-
-class RemoteTimelineRouteArgs {
-  const RemoteTimelineRouteArgs({this.key, required this.album});
-
-  final Key? key;
-
-  final RemoteAlbum album;
-
-  @override
-  String toString() {
-    return 'RemoteTimelineRouteArgs{key: $key, album: $album}';
-  }
-}
-
 /// generated route for
 /// [SearchPage]
 class SearchRoute extends PageRouteInfo<SearchRouteArgs> {

From 1d19d308e2789ef0d2d1f30f1318645adc380838 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 11 Jul 2025 21:04:49 +0530
Subject: [PATCH 191/337] chore: update flutter to 3.32.6 (#19878)

* chore: update flutter to 3.32.6

* fix lint

* fix asset viewer scroll physics

* test: change init order for map test

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 mobile/.fvmrc                                 |  2 +-
 mobile/.vscode/settings.json                  |  2 +-
 mobile/immich_lint/pubspec.lock               | 50 +++++++++----------
 mobile/lib/extensions/scroll_extensions.dart  | 12 ++---
 .../asset_viewer/asset_viewer.page.dart       |  2 +-
 mobile/pubspec.lock                           | 26 +++++-----
 mobile/pubspec.yaml                           |  4 +-
 .../modules/map/map_theme_override_test.dart  |  2 +-
 server/Dockerfile                             |  2 +-
 9 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/mobile/.fvmrc b/mobile/.fvmrc
index b987073ac6..7d2a608dfa 100644
--- a/mobile/.fvmrc
+++ b/mobile/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.29.3"
+  "flutter": "3.32.6"
 }
\ No newline at end of file
diff --git a/mobile/.vscode/settings.json b/mobile/.vscode/settings.json
index 9c5244f098..c1b3fc9ce3 100644
--- a/mobile/.vscode/settings.json
+++ b/mobile/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.29.3",
+  "dart.flutterSdkPath": ".fvm/versions/3.32.6",
   "search.exclude": {
     "**/.fvm": true
   },
diff --git a/mobile/immich_lint/pubspec.lock b/mobile/immich_lint/pubspec.lock
index e05cbb3db3..0e4b08be87 100644
--- a/mobile/immich_lint/pubspec.lock
+++ b/mobile/immich_lint/pubspec.lock
@@ -5,34 +5,34 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57
+      sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f
       url: "https://pub.dev"
     source: hosted
-    version: "80.0.0"
+    version: "82.0.0"
   analyzer:
     dependency: "direct main"
     description:
       name: analyzer
-      sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e"
+      sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0"
       url: "https://pub.dev"
     source: hosted
-    version: "7.3.0"
+    version: "7.4.5"
   analyzer_plugin:
     dependency: "direct main"
     description:
       name: analyzer_plugin
-      sha256: b3075265c5ab222f8b3188342dcb50b476286394a40323e85d1fa725035d40a4
+      sha256: ee188b6df6c85f1441497c7171c84f1392affadc0384f71089cb10a3bc508cef
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.0"
+    version: "0.13.1"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.7.0"
   async:
     dependency: transitive
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
   ci:
     dependency: transitive
     description:
@@ -125,10 +125,10 @@ packages:
     dependency: transitive
     description:
       name: custom_lint_visitor
-      sha256: "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8"
+      sha256: cba5b6d7a6217312472bf4468cdf68c949488aed7ffb0eab792cd0b6c435054d
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0+7.3.0"
+    version: "1.0.0+7.4.5"
   dart_style:
     dependency: transitive
     description:
@@ -157,10 +157,10 @@ packages:
     dependency: transitive
     description:
       name: freezed_annotation
-      sha256: c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b
+      sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.0"
   glob:
     dependency: "direct main"
     description:
@@ -213,18 +213,18 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
+      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.2.0"
   path:
     dependency: transitive
     description:
@@ -317,10 +317,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.7.6"
   typed_data:
     dependency: transitive
     description:
@@ -341,18 +341,18 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
+      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
       url: "https://pub.dev"
     source: hosted
-    version: "15.0.0"
+    version: "15.0.2"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
+      sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   yaml:
     dependency: transitive
     description:
@@ -362,4 +362,4 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.8.0-0 <4.0.0"
+  dart: ">=3.8.0 <4.0.0"
diff --git a/mobile/lib/extensions/scroll_extensions.dart b/mobile/lib/extensions/scroll_extensions.dart
index 5bbd73163a..2752d0b77a 100644
--- a/mobile/lib/extensions/scroll_extensions.dart
+++ b/mobile/lib/extensions/scroll_extensions.dart
@@ -11,9 +11,9 @@ class FastScrollPhysics extends ScrollPhysics {
 
   @override
   SpringDescription get spring => const SpringDescription(
-        mass: 40,
-        stiffness: 100,
-        damping: 1,
+        mass: 1,
+        stiffness: 402.49984375,
+        damping: 40,
       );
 }
 
@@ -31,8 +31,8 @@ class FastClampingScrollPhysics extends ClampingScrollPhysics {
         // can briefly be seen and cause a flicker effect if the video begins to initialize
         // before the animation finishes - probably a bug in PhotoViewGallery's animation handling
         // Making the animation faster is not just stylistic, but also helps to avoid this flicker
-        mass: 80,
-        stiffness: 100,
-        damping: 1,
+        mass: 1,
+        stiffness: 1601.2499609375,
+        damping: 80,
       );
 }
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 e759d6c2e0..b41d6ba2c7 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -402,7 +402,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     previousExtent = _kBottomSheetMinimumExtent;
     sheetCloseController = showBottomSheet(
       context: ctx,
-      sheetAnimationStyle: AnimationStyle(
+      sheetAnimationStyle: const AnimationStyle(
         duration: Durations.short4,
         reverseDuration: Durations.short2,
       ),
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 3be12d497c..95aa866ea3 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -53,10 +53,10 @@ packages:
     dependency: "direct main"
     description:
       name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.12.0"
+    version: "2.13.0"
   auto_route:
     dependency: "direct main"
     description:
@@ -509,10 +509,10 @@ packages:
     dependency: "direct dev"
     description:
       name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -1007,10 +1007,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.0"
+    version: "0.20.2"
   io:
     dependency: transitive
     description:
@@ -1064,10 +1064,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.8"
+    version: "10.0.9"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -2029,10 +2029,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.1"
+    version: "15.0.0"
   wakelock_plus:
     dependency: "direct main"
     description:
@@ -2085,10 +2085,10 @@ packages:
     dependency: transitive
     description:
       name: webdriver
-      sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
+      sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.4"
+    version: "3.1.0"
   win32:
     dependency: transitive
     description:
@@ -2155,4 +2155,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.7.0 <4.0.0"
-  flutter: ">=3.29.3"
+  flutter: ">=3.32.6"
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 56aa09e1df..f8059d7e3c 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -6,7 +6,7 @@ version: 1.135.3+204
 
 environment:
   sdk: '>=3.3.0 <4.0.0'
-  flutter: 3.29.3
+  flutter: 3.32.6
 
 isar_version: &isar_version 3.1.8
 
@@ -43,7 +43,7 @@ dependencies:
   home_widget: ^0.8.0
   http: ^1.3.0
   image_picker: ^1.1.2
-  intl: ^0.19.0
+  intl: ^0.20.0
   local_auth: ^2.3.0
   logging: ^1.3.0
   maplibre_gl: ^0.22.0
diff --git a/mobile/test/modules/map/map_theme_override_test.dart b/mobile/test/modules/map/map_theme_override_test.dart
index d0a84796b4..59f9b9e246 100644
--- a/mobile/test/modules/map/map_theme_override_test.dart
+++ b/mobile/test/modules/map/map_theme_override_test.dart
@@ -24,8 +24,8 @@ void main() {
   late Isar db;
 
   setUpAll(() async {
-    TestUtils.init();
     db = await TestUtils.initIsar();
+    TestUtils.init();
   });
 
   setUp(() async {
diff --git a/server/Dockerfile b/server/Dockerfile
index 2f2749ada0..1f5438d070 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -50,7 +50,7 @@ RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
 # Flutter SDK
 # https://flutter.dev/docs/development/tools/sdk/releases?tab=linux
 ENV FLUTTER_CHANNEL="stable"
-ENV FLUTTER_VERSION="3.29.3"
+ENV FLUTTER_VERSION="3.32.6"
 ENV FLUTTER_HOME=/flutter
 ENV PATH=${PATH}:${FLUTTER_HOME}/bin
 

From 9e48ae305248b483cc0b3fd7409a8d337b303024 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 11 Jul 2025 11:35:10 -0400
Subject: [PATCH 192/337] feat: naming strategy (#19848)

* feat: naming strategy

* feat: detect renames
---
 server/src/bin/migrations.ts                  | 25 +++++-
 server/src/schema/tables/stack.table.ts       |  6 +-
 .../comparers/column.comparer.spec.ts         |  1 +
 .../sql-tools/comparers/column.comparer.ts    | 31 +++++++-
 .../comparers/constraint.comparer.ts          | 33 +++++++-
 .../src/sql-tools/comparers/index.comparer.ts | 18 ++++-
 server/src/sql-tools/contexts/base-context.ts | 30 +++++++
 .../sql-tools/contexts/processor-context.ts   | 17 +---
 server/src/sql-tools/decorators/index.ts      | 22 ------
 server/src/sql-tools/helpers.ts               | 79 ++++++++++++++-----
 server/src/sql-tools/naming/default.naming.ts | 50 ++++++++++++
 server/src/sql-tools/naming/hash.naming.ts    | 51 ++++++++++++
 .../src/sql-tools/naming/naming.interface.ts  | 59 ++++++++++++++
 .../processors/check-constraint.processor.ts  |  5 +-
 .../sql-tools/processors/column.processor.ts  |  2 +-
 .../processors/database.processor.ts          |  3 +-
 .../foreign-key-column.processor.ts           | 18 +++--
 .../foreign-key-constraint.processor.ts       | 27 +++++--
 .../sql-tools/processors/index.processor.ts   | 19 ++++-
 .../primary-key-contraint.processor.ts        | 11 ++-
 .../sql-tools/processors/table.processor.ts   |  3 +-
 .../sql-tools/processors/trigger.processor.ts | 18 +++--
 .../processors/unique-constraint.processor.ts | 15 ++--
 server/src/sql-tools/public_api.ts            | 26 +++++-
 server/src/sql-tools/readers/column.reader.ts |  2 +
 server/src/sql-tools/schema-diff.spec.ts      |  6 ++
 server/src/sql-tools/schema-diff.ts           |  6 ++
 server/src/sql-tools/schema-from-code.ts      |  3 +-
 .../transformers/column.transformer.spec.ts   |  4 +
 .../transformers/column.transformer.ts        | 10 +--
 .../transformers/constraint.transformer.ts    | 16 ++--
 .../transformers/index.transformer.ts         | 10 +--
 .../transformers/table.transformer.spec.ts    |  5 ++
 server/src/sql-tools/types.ts                 | 11 ++-
 ...foreign-key-with-unique-constraint.stub.ts |  2 +-
 35 files changed, 517 insertions(+), 127 deletions(-)
 delete mode 100644 server/src/sql-tools/decorators/index.ts
 create mode 100644 server/src/sql-tools/naming/default.naming.ts
 create mode 100644 server/src/sql-tools/naming/hash.naming.ts
 create mode 100644 server/src/sql-tools/naming/naming.interface.ts

diff --git a/server/src/bin/migrations.ts b/server/src/bin/migrations.ts
index 81f5c7e0ab..a9832a14f7 100644
--- a/server/src/bin/migrations.ts
+++ b/server/src/bin/migrations.ts
@@ -9,7 +9,13 @@ import { ConfigRepository } from 'src/repositories/config.repository';
 import { DatabaseRepository } from 'src/repositories/database.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import 'src/schema';
-import { schemaDiff, schemaFromCode, schemaFromDatabase } from 'src/sql-tools';
+import {
+  DefaultNamingStrategy,
+  HashNamingStrategy,
+  schemaDiff,
+  schemaFromCode,
+  schemaFromDatabase,
+} from 'src/sql-tools';
 import { asPostgresConnectionConfig, getKyselyConfig } from 'src/utils/database';
 
 const main = async () => {
@@ -107,7 +113,22 @@ const compare = async () => {
   const { database } = configRepository.getEnv();
   const db = postgres(asPostgresConnectionConfig(database.config));
 
-  const source = schemaFromCode({ overrides: true });
+  const tables = new Set<string>();
+  const preferred = new DefaultNamingStrategy();
+  const fallback = new HashNamingStrategy();
+
+  const source = schemaFromCode({
+    overrides: true,
+    namingStrategy: {
+      getName(item) {
+        if ('tableName' in item && tables.has(item.tableName)) {
+          return preferred.getName(item);
+        }
+
+        return fallback.getName(item);
+      },
+    },
+  });
   const target = await schemaFromDatabase(db, {});
 
   console.log(source.warnings.join('\n'));
diff --git a/server/src/schema/tables/stack.table.ts b/server/src/schema/tables/stack.table.ts
index fa206f24f2..02afc2ed50 100644
--- a/server/src/schema/tables/stack.table.ts
+++ b/server/src/schema/tables/stack.table.ts
@@ -35,7 +35,11 @@ export class StackTable {
   updateId!: Generated<string>;
 
   //TODO: Add constraint to ensure primary asset exists in the assets array
-  @ForeignKeyColumn(() => AssetTable, { nullable: false, unique: true })
+  @ForeignKeyColumn(() => AssetTable, {
+    nullable: false,
+    unique: true,
+    uniqueConstraintName: 'REL_91704e101438fd0653f582426d',
+  })
   primaryAssetId!: string;
 
   @ForeignKeyColumn(() => UserTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
diff --git a/server/src/sql-tools/comparers/column.comparer.spec.ts b/server/src/sql-tools/comparers/column.comparer.spec.ts
index 25ef8543a8..fde237ad7b 100644
--- a/server/src/sql-tools/comparers/column.comparer.spec.ts
+++ b/server/src/sql-tools/comparers/column.comparer.spec.ts
@@ -5,6 +5,7 @@ import { describe, expect, it } from 'vitest';
 const testColumn: DatabaseColumn = {
   name: 'test',
   tableName: 'table1',
+  primary: false,
   nullable: false,
   isArray: false,
   type: 'character varying',
diff --git a/server/src/sql-tools/comparers/column.comparer.ts b/server/src/sql-tools/comparers/column.comparer.ts
index 5cc3f7a930..035fd6fc98 100644
--- a/server/src/sql-tools/comparers/column.comparer.ts
+++ b/server/src/sql-tools/comparers/column.comparer.ts
@@ -1,7 +1,32 @@
-import { getColumnType, isDefaultEqual } from 'src/sql-tools/helpers';
+import { asRenameKey, getColumnType, isDefaultEqual } from 'src/sql-tools/helpers';
 import { Comparer, DatabaseColumn, Reason, SchemaDiff } from 'src/sql-tools/types';
 
-export const compareColumns: Comparer<DatabaseColumn> = {
+export const compareColumns = {
+  getRenameKey: (column) => {
+    return asRenameKey([
+      column.tableName,
+      column.type,
+      column.nullable,
+      column.default,
+      column.storage,
+      column.primary,
+      column.isArray,
+      column.length,
+      column.identity,
+      column.enumName,
+      column.numericPrecision,
+      column.numericScale,
+    ]);
+  },
+  onRename: (source, target) => [
+    {
+      type: 'ColumnRename',
+      tableName: source.tableName,
+      oldName: target.name,
+      newName: source.name,
+      reason: Reason.Rename,
+    },
+  ],
   onMissing: (source) => [
     {
       type: 'ColumnAdd',
@@ -67,7 +92,7 @@ export const compareColumns: Comparer<DatabaseColumn> = {
 
     return items;
   },
-};
+} satisfies Comparer<DatabaseColumn>;
 
 const dropAndRecreateColumn = (source: DatabaseColumn, target: DatabaseColumn, reason: string): SchemaDiff[] => {
   return [
diff --git a/server/src/sql-tools/comparers/constraint.comparer.ts b/server/src/sql-tools/comparers/constraint.comparer.ts
index 0ff6fbe131..0df670ecf3 100644
--- a/server/src/sql-tools/comparers/constraint.comparer.ts
+++ b/server/src/sql-tools/comparers/constraint.comparer.ts
@@ -1,4 +1,4 @@
-import { haveEqualColumns } from 'src/sql-tools/helpers';
+import { asRenameKey, haveEqualColumns } from 'src/sql-tools/helpers';
 import {
   CompareFunction,
   Comparer,
@@ -13,6 +13,37 @@ import {
 } from 'src/sql-tools/types';
 
 export const compareConstraints: Comparer<DatabaseConstraint> = {
+  getRenameKey: (constraint) => {
+    switch (constraint.type) {
+      case ConstraintType.PRIMARY_KEY:
+      case ConstraintType.UNIQUE: {
+        return asRenameKey([constraint.type, constraint.tableName, ...constraint.columnNames.toSorted()]);
+      }
+
+      case ConstraintType.FOREIGN_KEY: {
+        return asRenameKey([
+          constraint.type,
+          constraint.tableName,
+          ...constraint.columnNames.toSorted(),
+          constraint.referenceTableName,
+          ...constraint.referenceColumnNames.toSorted(),
+        ]);
+      }
+
+      case ConstraintType.CHECK: {
+        return asRenameKey([constraint.type, constraint.tableName, constraint.expression]);
+      }
+    }
+  },
+  onRename: (source, target) => [
+    {
+      type: 'ConstraintRename',
+      tableName: target.tableName,
+      oldName: target.name,
+      newName: source.name,
+      reason: Reason.Rename,
+    },
+  ],
   onMissing: (source) => [
     {
       type: 'ConstraintAdd',
diff --git a/server/src/sql-tools/comparers/index.comparer.ts b/server/src/sql-tools/comparers/index.comparer.ts
index 99571cf61a..5625560df7 100644
--- a/server/src/sql-tools/comparers/index.comparer.ts
+++ b/server/src/sql-tools/comparers/index.comparer.ts
@@ -1,7 +1,23 @@
-import { haveEqualColumns } from 'src/sql-tools/helpers';
+import { asRenameKey, haveEqualColumns } from 'src/sql-tools/helpers';
 import { Comparer, DatabaseIndex, Reason } from 'src/sql-tools/types';
 
 export const compareIndexes: Comparer<DatabaseIndex> = {
+  getRenameKey: (index) => {
+    if (index.override) {
+      return index.override.value.sql.replace(index.name, 'INDEX_NAME');
+    }
+
+    return asRenameKey([index.tableName, ...(index.columnNames || []).toSorted(), index.unique]);
+  },
+  onRename: (source, target) => [
+    {
+      type: 'IndexRename',
+      tableName: source.tableName,
+      oldName: target.name,
+      newName: source.name,
+      reason: Reason.Rename,
+    },
+  ],
   onMissing: (source) => [
     {
       type: 'IndexCreate',
diff --git a/server/src/sql-tools/contexts/base-context.ts b/server/src/sql-tools/contexts/base-context.ts
index 620286cae3..0fa7230a00 100644
--- a/server/src/sql-tools/contexts/base-context.ts
+++ b/server/src/sql-tools/contexts/base-context.ts
@@ -1,3 +1,6 @@
+import { DefaultNamingStrategy } from 'src/sql-tools/naming/default.naming';
+import { HashNamingStrategy } from 'src/sql-tools/naming/hash.naming';
+import { NamingInterface, NamingItem } from 'src/sql-tools/naming/naming.interface';
 import {
   BaseContextOptions,
   DatabaseEnum,
@@ -11,6 +14,26 @@ import {
 
 const asOverrideKey = (type: string, name: string) => `${type}:${name}`;
 
+const isNamingInterface = (strategy: any): strategy is NamingInterface => {
+  return typeof strategy === 'object' && typeof strategy.getName === 'function';
+};
+
+const asNamingStrategy = (strategy: 'hash' | 'default' | NamingInterface): NamingInterface => {
+  if (isNamingInterface(strategy)) {
+    return strategy;
+  }
+
+  switch (strategy) {
+    case 'hash': {
+      return new HashNamingStrategy();
+    }
+
+    default: {
+      return new DefaultNamingStrategy();
+    }
+  }
+};
+
 export class BaseContext {
   databaseName: string;
   schemaName: string;
@@ -24,10 +47,17 @@ export class BaseContext {
   overrides: DatabaseOverride[] = [];
   warnings: string[] = [];
 
+  private namingStrategy: NamingInterface;
+
   constructor(options: BaseContextOptions) {
     this.databaseName = options.databaseName ?? 'postgres';
     this.schemaName = options.schemaName ?? 'public';
     this.overrideTableName = options.overrideTableName ?? 'migration_overrides';
+    this.namingStrategy = asNamingStrategy(options.namingStrategy ?? 'hash');
+  }
+
+  getNameFor(item: NamingItem) {
+    return this.namingStrategy.getName(item);
   }
 
   getTableByName(name: string) {
diff --git a/server/src/sql-tools/contexts/processor-context.ts b/server/src/sql-tools/contexts/processor-context.ts
index 562880a925..3ab196b0af 100644
--- a/server/src/sql-tools/contexts/processor-context.ts
+++ b/server/src/sql-tools/contexts/processor-context.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-function-type */
 import { BaseContext } from 'src/sql-tools/contexts/base-context';
-import { ColumnOptions, TableOptions } from 'src/sql-tools/decorators';
-import { asKey } from 'src/sql-tools/helpers';
+import { ColumnOptions } from 'src/sql-tools/decorators/column.decorator';
+import { TableOptions } from 'src/sql-tools/decorators/table.decorator';
 import { DatabaseColumn, DatabaseTable, SchemaFromCodeOptions } from 'src/sql-tools/types';
 
 type TableMetadata = { options: TableOptions; object: Function; methodToColumn: Map<string | symbol, DatabaseColumn> };
@@ -59,19 +59,6 @@ export class ProcessorContext extends BaseContext {
     tableMetadata.methodToColumn.set(propertyName, column);
   }
 
-  asIndexName(table: string, columns?: string[], where?: string) {
-    const items: string[] = [];
-    for (const columnName of columns ?? []) {
-      items.push(columnName);
-    }
-
-    if (where) {
-      items.push(where);
-    }
-
-    return asKey('IDX_', table, items);
-  }
-
   warnMissingTable(context: string, object: object, propertyName?: symbol | string) {
     const label = object.constructor.name + (propertyName ? '.' + String(propertyName) : '');
     this.warn(context, `Unable to find table (${label})`);
diff --git a/server/src/sql-tools/decorators/index.ts b/server/src/sql-tools/decorators/index.ts
deleted file mode 100644
index 86affe5002..0000000000
--- a/server/src/sql-tools/decorators/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export * from 'src/sql-tools/decorators/after-delete.decorator';
-export * from 'src/sql-tools/decorators/after-insert.decorator';
-export * from 'src/sql-tools/decorators/before-update.decorator';
-export * from 'src/sql-tools/decorators/check.decorator';
-export * from 'src/sql-tools/decorators/column.decorator';
-export * from 'src/sql-tools/decorators/configuration-parameter.decorator';
-export * from 'src/sql-tools/decorators/create-date-column.decorator';
-export * from 'src/sql-tools/decorators/database.decorator';
-export * from 'src/sql-tools/decorators/delete-date-column.decorator';
-export * from 'src/sql-tools/decorators/extension.decorator';
-export * from 'src/sql-tools/decorators/extensions.decorator';
-export * from 'src/sql-tools/decorators/foreign-key-column.decorator';
-export * from 'src/sql-tools/decorators/foreign-key-constraint.decorator';
-export * from 'src/sql-tools/decorators/generated-column.decorator';
-export * from 'src/sql-tools/decorators/index.decorator';
-export * from 'src/sql-tools/decorators/primary-column.decorator';
-export * from 'src/sql-tools/decorators/primary-generated-column.decorator';
-export * from 'src/sql-tools/decorators/table.decorator';
-export * from 'src/sql-tools/decorators/trigger-function.decorator';
-export * from 'src/sql-tools/decorators/trigger.decorator';
-export * from 'src/sql-tools/decorators/unique.decorator';
-export * from 'src/sql-tools/decorators/update-date-column.decorator';
diff --git a/server/src/sql-tools/helpers.ts b/server/src/sql-tools/helpers.ts
index afa735e282..8131f0350b 100644
--- a/server/src/sql-tools/helpers.ts
+++ b/server/src/sql-tools/helpers.ts
@@ -2,13 +2,6 @@ import { createHash } from 'node:crypto';
 import { ColumnValue } from 'src/sql-tools/decorators/column.decorator';
 import { Comparer, DatabaseColumn, DatabaseOverride, IgnoreOptions, SchemaDiff } from 'src/sql-tools/types';
 
-export const asMetadataKey = (name: string) => `sql-tools:${name}`;
-
-export const asSnakeCase = (name: string): string => name.replaceAll(/([a-z])([A-Z])/g, '$1_$2').toLowerCase();
-// match TypeORM
-export const asKey = (prefix: string, tableName: string, values: string[]) =>
-  (prefix + sha1(`${tableName}_${values.toSorted().join('_')}`)).slice(0, 30);
-
 export const asOptions = <T extends { name?: string }>(options: string | T): T => {
   if (typeof options === 'string') {
     return { name: options } as T;
@@ -79,6 +72,10 @@ export const compare = <T extends { name: string; synchronize: boolean }>(
   const items: SchemaDiff[] = [];
 
   const keys = new Set([...Object.keys(sourceMap), ...Object.keys(targetMap)]);
+  const missingKeys = new Set<string>();
+  const extraKeys = new Set<string>();
+
+  // common keys
   for (const key of keys) {
     const source = sourceMap[key];
     const target = targetMap[key];
@@ -92,22 +89,63 @@ export const compare = <T extends { name: string; synchronize: boolean }>(
     }
 
     if (source && !target) {
-      items.push(...comparer.onMissing(source));
-    } else if (!source && target) {
-      items.push(...comparer.onExtra(target));
-    } else {
-      if (
-        haveEqualOverrides(
-          source as unknown as { override?: DatabaseOverride },
-          target as unknown as { override?: DatabaseOverride },
-        )
-      ) {
+      missingKeys.add(key);
+      continue;
+    }
+
+    if (!source && target) {
+      extraKeys.add(key);
+      continue;
+    }
+
+    if (
+      haveEqualOverrides(
+        source as unknown as { override?: DatabaseOverride },
+        target as unknown as { override?: DatabaseOverride },
+      )
+    ) {
+      continue;
+    }
+
+    items.push(...comparer.onCompare(source, target));
+  }
+
+  // renames
+  if (comparer.getRenameKey && comparer.onRename) {
+    const renameMap: Record<string, string> = {};
+    for (const sourceKey of missingKeys) {
+      const source = sourceMap[sourceKey];
+      const renameKey = comparer.getRenameKey(source);
+      renameMap[renameKey] = sourceKey;
+    }
+
+    for (const targetKey of extraKeys) {
+      const target = targetMap[targetKey];
+      const renameKey = comparer.getRenameKey(target);
+      const sourceKey = renameMap[renameKey];
+      if (!sourceKey) {
         continue;
       }
-      items.push(...comparer.onCompare(source, target));
+
+      const source = sourceMap[sourceKey];
+
+      items.push(...comparer.onRename(source, target));
+
+      missingKeys.delete(sourceKey);
+      extraKeys.delete(targetKey);
     }
   }
 
+  // missing
+  for (const key of missingKeys) {
+    items.push(...comparer.onMissing(sourceMap[key]));
+  }
+
+  // extra
+  for (const key of extraKeys) {
+    items.push(...comparer.onExtra(targetMap[key]));
+  }
+
   return items;
 };
 
@@ -186,8 +224,6 @@ export const asColumnComment = (tableName: string, columnName: string, comment:
 
 export const asColumnList = (columns: string[]) => columns.map((column) => `"${column}"`).join(', ');
 
-export const asForeignKeyConstraintName = (table: string, columns: string[]) => asKey('FK_', table, [...columns]);
-
 export const asJsonString = (value: unknown): string => {
   return `'${escape(JSON.stringify(value))}'::jsonb`;
 };
@@ -202,3 +238,6 @@ const escape = (value: string) => {
     .replaceAll(/[\r]/g, String.raw`\r`)
     .replaceAll(/[\t]/g, String.raw`\t`);
 };
+
+export const asRenameKey = (values: Array<string | boolean | number | undefined>) =>
+  values.map((value) => value ?? '').join('|');
diff --git a/server/src/sql-tools/naming/default.naming.ts b/server/src/sql-tools/naming/default.naming.ts
new file mode 100644
index 0000000000..807580169d
--- /dev/null
+++ b/server/src/sql-tools/naming/default.naming.ts
@@ -0,0 +1,50 @@
+import { sha1 } from 'src/sql-tools/helpers';
+import { NamingItem } from 'src/sql-tools/naming/naming.interface';
+
+const asSnakeCase = (name: string): string => name.replaceAll(/([a-z])([A-Z])/g, '$1_$2').toLowerCase();
+
+export class DefaultNamingStrategy {
+  getName(item: NamingItem): string {
+    switch (item.type) {
+      case 'database': {
+        return asSnakeCase(item.name);
+      }
+
+      case 'table': {
+        return asSnakeCase(item.name);
+      }
+
+      case 'column': {
+        return item.name;
+      }
+
+      case 'primaryKey': {
+        return `${item.tableName}_pkey`;
+      }
+
+      case 'foreignKey': {
+        return `${item.tableName}_${item.columnNames.join('_')}_fkey`;
+      }
+
+      case 'check': {
+        return `${item.tableName}_${sha1(item.expression).slice(0, 8)}_chk`;
+      }
+
+      case 'unique': {
+        return `${item.tableName}_${item.columnNames.join('_')}_uq`;
+      }
+
+      case 'index': {
+        if (item.columnNames) {
+          return `${item.tableName}_${item.columnNames.join('_')}_idx`;
+        }
+
+        return `${item.tableName}_${sha1(item.expression || item.where || '').slice(0, 8)}_idx`;
+      }
+
+      case 'trigger': {
+        return `${item.tableName}_${item.functionName}`;
+      }
+    }
+  }
+}
diff --git a/server/src/sql-tools/naming/hash.naming.ts b/server/src/sql-tools/naming/hash.naming.ts
new file mode 100644
index 0000000000..575d0f1239
--- /dev/null
+++ b/server/src/sql-tools/naming/hash.naming.ts
@@ -0,0 +1,51 @@
+import { sha1 } from 'src/sql-tools/helpers';
+import { DefaultNamingStrategy } from 'src/sql-tools/naming/default.naming';
+import { NamingInterface, NamingItem } from 'src/sql-tools/naming/naming.interface';
+
+const fallback = new DefaultNamingStrategy();
+
+const asKey = (prefix: string, tableName: string, values: string[]) =>
+  (prefix + sha1(`${tableName}_${values.toSorted().join('_')}`)).slice(0, 30);
+
+export class HashNamingStrategy implements NamingInterface {
+  getName(item: NamingItem): string {
+    switch (item.type) {
+      case 'primaryKey': {
+        return asKey('PK_', item.tableName, item.columnNames);
+      }
+
+      case 'foreignKey': {
+        return asKey('FK_', item.tableName, item.columnNames);
+      }
+
+      case 'check': {
+        return asKey('CHK_', item.tableName, [item.expression]);
+      }
+
+      case 'unique': {
+        return asKey('UQ_', item.tableName, item.columnNames);
+      }
+
+      case 'index': {
+        const items: string[] = [];
+        for (const columnName of item.columnNames ?? []) {
+          items.push(columnName);
+        }
+
+        if (item.where) {
+          items.push(item.where);
+        }
+
+        return asKey('IDX_', item.tableName, items);
+      }
+
+      case 'trigger': {
+        return asKey('TR_', item.tableName, [...item.actions, item.scope, item.timing, item.functionName]);
+      }
+
+      default: {
+        return fallback.getName(item);
+      }
+    }
+  }
+}
diff --git a/server/src/sql-tools/naming/naming.interface.ts b/server/src/sql-tools/naming/naming.interface.ts
new file mode 100644
index 0000000000..f331a22c46
--- /dev/null
+++ b/server/src/sql-tools/naming/naming.interface.ts
@@ -0,0 +1,59 @@
+import { TriggerAction, TriggerScope, TriggerTiming } from 'src/sql-tools/types';
+
+export type NamingItem =
+  | {
+      type: 'database';
+      name: string;
+    }
+  | {
+      type: 'table';
+      name: string;
+    }
+  | {
+      type: 'column';
+      name: string;
+    }
+  | {
+      type: 'primaryKey';
+      tableName: string;
+      columnNames: string[];
+    }
+  | {
+      type: 'foreignKey';
+      tableName: string;
+      columnNames: string[];
+      referenceTableName: string;
+      referenceColumnNames: string[];
+    }
+  | {
+      type: 'check';
+      tableName: string;
+      expression: string;
+    }
+  | {
+      type: 'unique';
+      tableName: string;
+      columnNames: string[];
+    }
+  | {
+      type: 'index';
+      tableName: string;
+      columnNames?: string[];
+      expression?: string;
+      where?: string;
+    }
+  | {
+      type: 'trigger';
+      tableName: string;
+      functionName: string;
+      actions: TriggerAction[];
+      scope: TriggerScope;
+      timing: TriggerTiming;
+      columnNames?: string[];
+      expression?: string;
+      where?: string;
+    };
+
+export interface NamingInterface {
+  getName(item: NamingItem): string;
+}
diff --git a/server/src/sql-tools/processors/check-constraint.processor.ts b/server/src/sql-tools/processors/check-constraint.processor.ts
index 21ee47ccc6..5eba1015bf 100644
--- a/server/src/sql-tools/processors/check-constraint.processor.ts
+++ b/server/src/sql-tools/processors/check-constraint.processor.ts
@@ -1,4 +1,3 @@
-import { asKey } from 'src/sql-tools/helpers';
 import { ConstraintType, Processor } from 'src/sql-tools/types';
 
 export const processCheckConstraints: Processor = (ctx, items) => {
@@ -15,12 +14,10 @@ export const processCheckConstraints: Processor = (ctx, items) => {
 
     table.constraints.push({
       type: ConstraintType.CHECK,
-      name: options.name || asCheckConstraintName(tableName, options.expression),
+      name: options.name || ctx.getNameFor({ type: 'check', tableName, expression: options.expression }),
       tableName,
       expression: options.expression,
       synchronize: options.synchronize ?? true,
     });
   }
 };
-
-const asCheckConstraintName = (table: string, expression: string) => asKey('CHK_', table, [expression]);
diff --git a/server/src/sql-tools/processors/column.processor.ts b/server/src/sql-tools/processors/column.processor.ts
index 84c158a234..9b499b380b 100644
--- a/server/src/sql-tools/processors/column.processor.ts
+++ b/server/src/sql-tools/processors/column.processor.ts
@@ -13,7 +13,7 @@ export const processColumns: Processor = (ctx, items) => {
       continue;
     }
 
-    const columnName = options.name ?? String(propertyName);
+    const columnName = options.name ?? ctx.getNameFor({ type: 'column', name: String(propertyName) });
     const existingColumn = table.columns.find((column) => column.name === columnName);
     if (existingColumn) {
       // TODO log warnings if column name is not unique
diff --git a/server/src/sql-tools/processors/database.processor.ts b/server/src/sql-tools/processors/database.processor.ts
index 7158cd9494..9f2e847fd6 100644
--- a/server/src/sql-tools/processors/database.processor.ts
+++ b/server/src/sql-tools/processors/database.processor.ts
@@ -1,10 +1,9 @@
-import { asSnakeCase } from 'src/sql-tools/helpers';
 import { Processor } from 'src/sql-tools/types';
 
 export const processDatabases: Processor = (ctx, items) => {
   for (const {
     item: { object, options },
   } of items.filter((item) => item.type === 'database')) {
-    ctx.databaseName = options.name || asSnakeCase(object.name);
+    ctx.databaseName = options.name || ctx.getNameFor({ type: 'database', name: object.name });
   }
 };
diff --git a/server/src/sql-tools/processors/foreign-key-column.processor.ts b/server/src/sql-tools/processors/foreign-key-column.processor.ts
index e37b6e3f0b..6d147a78eb 100644
--- a/server/src/sql-tools/processors/foreign-key-column.processor.ts
+++ b/server/src/sql-tools/processors/foreign-key-column.processor.ts
@@ -1,4 +1,3 @@
-import { asForeignKeyConstraintName, asKey } from 'src/sql-tools/helpers';
 import { ActionType, ConstraintType, Processor } from 'src/sql-tools/types';
 
 export const processForeignKeyColumns: Processor = (ctx, items) => {
@@ -31,15 +30,24 @@ export const processForeignKeyColumns: Processor = (ctx, items) => {
       column.type = referenceColumns[0].type;
     }
 
+    const referenceTableName = referenceTable.name;
     const referenceColumnNames = referenceColumns.map((column) => column.name);
-    const name = options.constraintName || asForeignKeyConstraintName(table.name, columnNames);
+    const name =
+      options.constraintName ||
+      ctx.getNameFor({
+        type: 'foreignKey',
+        tableName: table.name,
+        columnNames,
+        referenceTableName,
+        referenceColumnNames,
+      });
 
     table.constraints.push({
       name,
       tableName: table.name,
       columnNames,
       type: ConstraintType.FOREIGN_KEY,
-      referenceTableName: referenceTable.name,
+      referenceTableName,
       referenceColumnNames,
       onUpdate: options.onUpdate as ActionType,
       onDelete: options.onDelete as ActionType,
@@ -48,7 +56,7 @@ export const processForeignKeyColumns: Processor = (ctx, items) => {
 
     if (options.unique || options.uniqueConstraintName) {
       table.constraints.push({
-        name: options.uniqueConstraintName || asRelationKeyConstraintName(table.name, columnNames),
+        name: options.uniqueConstraintName || ctx.getNameFor({ type: 'unique', tableName: table.name, columnNames }),
         tableName: table.name,
         columnNames,
         type: ConstraintType.UNIQUE,
@@ -57,5 +65,3 @@ export const processForeignKeyColumns: Processor = (ctx, items) => {
     }
   }
 };
-
-const asRelationKeyConstraintName = (table: string, columns: string[]) => asKey('REL_', table, columns);
diff --git a/server/src/sql-tools/processors/foreign-key-constraint.processor.ts b/server/src/sql-tools/processors/foreign-key-constraint.processor.ts
index 7c44ab2694..39d7508d11 100644
--- a/server/src/sql-tools/processors/foreign-key-constraint.processor.ts
+++ b/server/src/sql-tools/processors/foreign-key-constraint.processor.ts
@@ -1,4 +1,3 @@
-import { asForeignKeyConstraintName } from 'src/sql-tools/helpers';
 import { ActionType, ConstraintType, Processor } from 'src/sql-tools/types';
 
 export const processForeignKeyConstraints: Processor = (ctx, items) => {
@@ -46,18 +45,27 @@ export const processForeignKeyConstraints: Processor = (ctx, items) => {
       continue;
     }
 
-    const referenceColumns =
+    const referenceTableName = referenceTable.name;
+    const referenceColumnNames =
       options.referenceColumns || referenceTable.columns.filter(({ primary }) => primary).map(({ name }) => name);
 
-    const name = options.name || asForeignKeyConstraintName(table.name, options.columns);
+    const name =
+      options.name ||
+      ctx.getNameFor({
+        type: 'foreignKey',
+        tableName: table.name,
+        columnNames: options.columns,
+        referenceTableName,
+        referenceColumnNames,
+      });
 
     table.constraints.push({
       type: ConstraintType.FOREIGN_KEY,
       name,
       tableName: table.name,
       columnNames: options.columns,
-      referenceTableName: referenceTable.name,
-      referenceColumnNames: referenceColumns,
+      referenceTableName,
+      referenceColumnNames,
       onUpdate: options.onUpdate as ActionType,
       onDelete: options.onDelete as ActionType,
       synchronize: options.synchronize ?? true,
@@ -68,8 +76,15 @@ export const processForeignKeyConstraints: Processor = (ctx, items) => {
     }
 
     if (options.index || options.indexName || ctx.options.createForeignKeyIndexes) {
+      const indexName =
+        options.indexName ||
+        ctx.getNameFor({
+          type: 'index',
+          tableName: table.name,
+          columnNames: options.columns,
+        });
       table.indexes.push({
-        name: options.indexName || ctx.asIndexName(table.name, options.columns),
+        name: indexName,
         tableName: table.name,
         columnNames: options.columns,
         unique: false,
diff --git a/server/src/sql-tools/processors/index.processor.ts b/server/src/sql-tools/processors/index.processor.ts
index cd2ee1507e..766e83fe8b 100644
--- a/server/src/sql-tools/processors/index.processor.ts
+++ b/server/src/sql-tools/processors/index.processor.ts
@@ -10,8 +10,17 @@ export const processIndexes: Processor = (ctx, items) => {
       continue;
     }
 
+    const indexName =
+      options.name ||
+      ctx.getNameFor({
+        type: 'index',
+        tableName: table.name,
+        columnNames: options.columns,
+        where: options.where,
+      });
+
     table.indexes.push({
-      name: options.name || ctx.asIndexName(table.name, options.columns, options.where),
+      name: indexName,
       tableName: table.name,
       unique: options.unique ?? false,
       expression: options.expression,
@@ -50,7 +59,13 @@ export const processIndexes: Processor = (ctx, items) => {
       continue;
     }
 
-    const indexName = options.indexName || ctx.asIndexName(table.name, [column.name]);
+    const indexName =
+      options.indexName ||
+      ctx.getNameFor({
+        type: 'index',
+        tableName: table.name,
+        columnNames: [column.name],
+      });
 
     const isIndexPresent = table.indexes.some((index) => index.name === indexName);
     if (isIndexPresent) {
diff --git a/server/src/sql-tools/processors/primary-key-contraint.processor.ts b/server/src/sql-tools/processors/primary-key-contraint.processor.ts
index 12fc27db7e..0971bfc337 100644
--- a/server/src/sql-tools/processors/primary-key-contraint.processor.ts
+++ b/server/src/sql-tools/processors/primary-key-contraint.processor.ts
@@ -1,4 +1,3 @@
-import { asKey } from 'src/sql-tools/helpers';
 import { ConstraintType, Processor } from 'src/sql-tools/types';
 
 export const processPrimaryKeyConstraints: Processor = (ctx) => {
@@ -15,7 +14,13 @@ export const processPrimaryKeyConstraints: Processor = (ctx) => {
       const tableMetadata = ctx.getTableMetadata(table);
       table.constraints.push({
         type: ConstraintType.PRIMARY_KEY,
-        name: tableMetadata.options.primaryConstraintName || asPrimaryKeyConstraintName(table.name, columnNames),
+        name:
+          tableMetadata.options.primaryConstraintName ||
+          ctx.getNameFor({
+            type: 'primaryKey',
+            tableName: table.name,
+            columnNames,
+          }),
         tableName: table.name,
         columnNames,
         synchronize: tableMetadata.options.synchronize ?? true,
@@ -23,5 +28,3 @@ export const processPrimaryKeyConstraints: Processor = (ctx) => {
     }
   }
 };
-
-const asPrimaryKeyConstraintName = (table: string, columns: string[]) => asKey('PK_', table, columns);
diff --git a/server/src/sql-tools/processors/table.processor.ts b/server/src/sql-tools/processors/table.processor.ts
index 7fec4eb317..993c9ec45d 100644
--- a/server/src/sql-tools/processors/table.processor.ts
+++ b/server/src/sql-tools/processors/table.processor.ts
@@ -1,4 +1,3 @@
-import { asSnakeCase } from 'src/sql-tools/helpers';
 import { Processor } from 'src/sql-tools/types';
 
 export const processTables: Processor = (ctx, items) => {
@@ -14,7 +13,7 @@ export const processTables: Processor = (ctx, items) => {
 
     ctx.addTable(
       {
-        name: options.name || asSnakeCase(object.name),
+        name: options.name || ctx.getNameFor({ type: 'table', name: object.name }),
         columns: [],
         constraints: [],
         indexes: [],
diff --git a/server/src/sql-tools/processors/trigger.processor.ts b/server/src/sql-tools/processors/trigger.processor.ts
index 10b07a466a..b50b42cc49 100644
--- a/server/src/sql-tools/processors/trigger.processor.ts
+++ b/server/src/sql-tools/processors/trigger.processor.ts
@@ -1,5 +1,3 @@
-import { TriggerOptions } from 'src/sql-tools/decorators/trigger.decorator';
-import { asKey } from 'src/sql-tools/helpers';
 import { Processor } from 'src/sql-tools/types';
 
 export const processTriggers: Processor = (ctx, items) => {
@@ -12,8 +10,19 @@ export const processTriggers: Processor = (ctx, items) => {
       continue;
     }
 
+    const triggerName =
+      options.name ||
+      ctx.getNameFor({
+        type: 'trigger',
+        tableName: table.name,
+        actions: options.actions,
+        scope: options.scope,
+        timing: options.timing,
+        functionName: options.functionName,
+      });
+
     table.triggers.push({
-      name: options.name || asTriggerName(table.name, options),
+      name: triggerName,
       tableName: table.name,
       timing: options.timing,
       actions: options.actions,
@@ -26,6 +35,3 @@ export const processTriggers: Processor = (ctx, items) => {
     });
   }
 };
-
-const asTriggerName = (table: string, trigger: TriggerOptions) =>
-  asKey('TR_', table, [...trigger.actions, trigger.scope, trigger.timing, trigger.functionName]);
diff --git a/server/src/sql-tools/processors/unique-constraint.processor.ts b/server/src/sql-tools/processors/unique-constraint.processor.ts
index 4d962a0a04..0cbfc26a70 100644
--- a/server/src/sql-tools/processors/unique-constraint.processor.ts
+++ b/server/src/sql-tools/processors/unique-constraint.processor.ts
@@ -1,4 +1,3 @@
-import { asKey } from 'src/sql-tools/helpers';
 import { ConstraintType, Processor } from 'src/sql-tools/types';
 
 export const processUniqueConstraints: Processor = (ctx, items) => {
@@ -16,7 +15,7 @@ export const processUniqueConstraints: Processor = (ctx, items) => {
 
     table.constraints.push({
       type: ConstraintType.UNIQUE,
-      name: options.name || asUniqueConstraintName(tableName, columnNames),
+      name: options.name || ctx.getNameFor({ type: 'unique', tableName, columnNames }),
       tableName,
       columnNames,
       synchronize: options.synchronize ?? true,
@@ -41,9 +40,17 @@ export const processUniqueConstraints: Processor = (ctx, items) => {
     }
 
     if (type === 'column' && !options.primary && (options.unique || options.uniqueConstraintName)) {
+      const uniqueConstraintName =
+        options.uniqueConstraintName ||
+        ctx.getNameFor({
+          type: 'unique',
+          tableName: table.name,
+          columnNames: [column.name],
+        });
+
       table.constraints.push({
         type: ConstraintType.UNIQUE,
-        name: options.uniqueConstraintName || asUniqueConstraintName(table.name, [column.name]),
+        name: uniqueConstraintName,
         tableName: table.name,
         columnNames: [column.name],
         synchronize: options.synchronize ?? true,
@@ -51,5 +58,3 @@ export const processUniqueConstraints: Processor = (ctx, items) => {
     }
   }
 };
-
-const asUniqueConstraintName = (table: string, columns: string[]) => asKey('UQ_', table, columns);
diff --git a/server/src/sql-tools/public_api.ts b/server/src/sql-tools/public_api.ts
index aaef55dd8d..9e7983383e 100644
--- a/server/src/sql-tools/public_api.ts
+++ b/server/src/sql-tools/public_api.ts
@@ -1,4 +1,28 @@
-export * from 'src/sql-tools/decorators';
+export * from 'src/sql-tools/decorators/after-delete.decorator';
+export * from 'src/sql-tools/decorators/after-insert.decorator';
+export * from 'src/sql-tools/decorators/before-update.decorator';
+export * from 'src/sql-tools/decorators/check.decorator';
+export * from 'src/sql-tools/decorators/column.decorator';
+export * from 'src/sql-tools/decorators/configuration-parameter.decorator';
+export * from 'src/sql-tools/decorators/create-date-column.decorator';
+export * from 'src/sql-tools/decorators/database.decorator';
+export * from 'src/sql-tools/decorators/delete-date-column.decorator';
+export * from 'src/sql-tools/decorators/extension.decorator';
+export * from 'src/sql-tools/decorators/extensions.decorator';
+export * from 'src/sql-tools/decorators/foreign-key-column.decorator';
+export * from 'src/sql-tools/decorators/foreign-key-constraint.decorator';
+export * from 'src/sql-tools/decorators/generated-column.decorator';
+export * from 'src/sql-tools/decorators/index.decorator';
+export * from 'src/sql-tools/decorators/primary-column.decorator';
+export * from 'src/sql-tools/decorators/primary-generated-column.decorator';
+export * from 'src/sql-tools/decorators/table.decorator';
+export * from 'src/sql-tools/decorators/trigger-function.decorator';
+export * from 'src/sql-tools/decorators/trigger.decorator';
+export * from 'src/sql-tools/decorators/unique.decorator';
+export * from 'src/sql-tools/decorators/update-date-column.decorator';
+export * from 'src/sql-tools/naming/default.naming';
+export * from 'src/sql-tools/naming/hash.naming';
+export * from 'src/sql-tools/naming/naming.interface';
 export * from 'src/sql-tools/register-enum';
 export * from 'src/sql-tools/register-function';
 export { schemaDiff, schemaDiffToSql } from 'src/sql-tools/schema-diff';
diff --git a/server/src/sql-tools/readers/column.reader.ts b/server/src/sql-tools/readers/column.reader.ts
index dfd2878185..249bd77f2c 100644
--- a/server/src/sql-tools/readers/column.reader.ts
+++ b/server/src/sql-tools/readers/column.reader.ts
@@ -76,6 +76,8 @@ export const readColumns: Reader = async (ctx, db) => {
 
     const item: DatabaseColumn = {
       type: column.data_type as ColumnType,
+      // TODO infer this from PK constraints
+      primary: false,
       name: columnName,
       tableName: column.table_name,
       nullable: column.is_nullable === 'YES',
diff --git a/server/src/sql-tools/schema-diff.spec.ts b/server/src/sql-tools/schema-diff.spec.ts
index 0667d22d6b..fe249b4e29 100644
--- a/server/src/sql-tools/schema-diff.spec.ts
+++ b/server/src/sql-tools/schema-diff.spec.ts
@@ -28,6 +28,7 @@ const fromColumn = (column: Partial<Omit<DatabaseColumn, 'tableName'>>): Databas
         columns: [
           {
             name: 'column1',
+            primary: false,
             synchronize: true,
             isArray: false,
             type: 'character varying',
@@ -63,6 +64,7 @@ const fromConstraint = (constraint?: DatabaseConstraint): DatabaseSchema => {
         columns: [
           {
             name: 'column1',
+            primary: false,
             synchronize: true,
             isArray: false,
             type: 'character varying',
@@ -97,6 +99,7 @@ const fromIndex = (index?: DatabaseIndex): DatabaseSchema => {
         columns: [
           {
             name: 'column1',
+            primary: false,
             synchronize: true,
             isArray: false,
             type: 'character varying',
@@ -140,6 +143,7 @@ const newSchema = (schema: {
       columns.push({
         tableName,
         name: columnName,
+        primary: false,
         type: column.type || 'character varying',
         isArray: column.isArray ?? false,
         nullable: column.nullable ?? false,
@@ -182,6 +186,7 @@ describe(schemaDiff.name, () => {
         const column: DatabaseColumn = {
           type: 'character varying',
           tableName: 'table1',
+          primary: false,
           name: 'column1',
           isArray: false,
           nullable: false,
@@ -264,6 +269,7 @@ describe(schemaDiff.name, () => {
             column: {
               tableName: 'table1',
               isArray: false,
+              primary: false,
               name: 'column2',
               nullable: false,
               type: 'character varying',
diff --git a/server/src/sql-tools/schema-diff.ts b/server/src/sql-tools/schema-diff.ts
index 24091a0256..5dd3c26fdf 100644
--- a/server/src/sql-tools/schema-diff.ts
+++ b/server/src/sql-tools/schema-diff.ts
@@ -40,10 +40,13 @@ export const schemaDiff = (source: DatabaseSchema, target: DatabaseSchema, optio
     TableDrop: [],
     ColumnAdd: [],
     ColumnAlter: [],
+    ColumnRename: [],
     ColumnDrop: [],
     ConstraintAdd: [],
     ConstraintDrop: [],
+    ConstraintRename: [],
     IndexCreate: [],
+    IndexRename: [],
     IndexDrop: [],
     TriggerCreate: [],
     TriggerDrop: [],
@@ -72,11 +75,14 @@ export const schemaDiff = (source: DatabaseSchema, target: DatabaseSchema, optio
     ...itemMap.TableCreate,
     ...itemMap.ColumnAlter,
     ...itemMap.ColumnAdd,
+    ...itemMap.ColumnRename,
     ...constraintAdds.filter(({ constraint }) => constraint.type === ConstraintType.PRIMARY_KEY),
     ...constraintAdds.filter(({ constraint }) => constraint.type === ConstraintType.FOREIGN_KEY),
     ...constraintAdds.filter(({ constraint }) => constraint.type === ConstraintType.UNIQUE),
     ...constraintAdds.filter(({ constraint }) => constraint.type === ConstraintType.CHECK),
+    ...itemMap.ConstraintRename,
     ...itemMap.IndexCreate,
+    ...itemMap.IndexRename,
     ...itemMap.TriggerCreate,
     ...itemMap.ColumnDrop,
     ...itemMap.TableDrop,
diff --git a/server/src/sql-tools/schema-from-code.ts b/server/src/sql-tools/schema-from-code.ts
index 6b4ab93b8d..2e19f414e4 100644
--- a/server/src/sql-tools/schema-from-code.ts
+++ b/server/src/sql-tools/schema-from-code.ts
@@ -20,9 +20,9 @@ export const schemaFromCode = (options: SchemaFromCodeOptions = {}) => {
         name: ctx.overrideTableName,
         columns: [
           {
-            primary: true,
             name: 'name',
             tableName: ctx.overrideTableName,
+            primary: true,
             type: 'character varying',
             nullable: false,
             isArray: false,
@@ -31,6 +31,7 @@ export const schemaFromCode = (options: SchemaFromCodeOptions = {}) => {
           {
             name: 'value',
             tableName: ctx.overrideTableName,
+            primary: false,
             type: 'jsonb',
             nullable: false,
             isArray: false,
diff --git a/server/src/sql-tools/transformers/column.transformer.spec.ts b/server/src/sql-tools/transformers/column.transformer.spec.ts
index 1386b08c93..1e29d4bff6 100644
--- a/server/src/sql-tools/transformers/column.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/column.transformer.spec.ts
@@ -13,6 +13,7 @@ describe(transformColumns.name, () => {
           column: {
             name: 'column1',
             tableName: 'table1',
+            primary: false,
             type: 'character varying',
             nullable: false,
             isArray: false,
@@ -30,6 +31,7 @@ describe(transformColumns.name, () => {
           column: {
             name: 'column1',
             tableName: 'table1',
+            primary: false,
             type: 'character varying',
             nullable: true,
             isArray: false,
@@ -47,6 +49,7 @@ describe(transformColumns.name, () => {
           column: {
             name: 'column1',
             tableName: 'table1',
+            primary: false,
             type: 'character varying',
             enumName: 'table1_column1_enum',
             nullable: true,
@@ -65,6 +68,7 @@ describe(transformColumns.name, () => {
           column: {
             name: 'column1',
             tableName: 'table1',
+            primary: false,
             type: 'boolean',
             nullable: true,
             isArray: true,
diff --git a/server/src/sql-tools/transformers/column.transformer.ts b/server/src/sql-tools/transformers/column.transformer.ts
index 43188c24c2..ffa565e533 100644
--- a/server/src/sql-tools/transformers/column.transformer.ts
+++ b/server/src/sql-tools/transformers/column.transformer.ts
@@ -12,8 +12,12 @@ export const transformColumns: SqlTransformer = (ctx, item) => {
       return asColumnAlter(item.tableName, item.columnName, item.changes);
     }
 
+    case 'ColumnRename': {
+      return `ALTER TABLE "${item.tableName}" RENAME COLUMN "${item.oldName}" TO "${item.newName}";`;
+    }
+
     case 'ColumnDrop': {
-      return asColumnDrop(item.tableName, item.columnName);
+      return `ALTER TABLE "${item.tableName}" DROP COLUMN "${item.columnName}";`;
     }
 
     default: {
@@ -28,10 +32,6 @@ const asColumnAdd = (column: DatabaseColumn): string => {
   );
 };
 
-const asColumnDrop = (tableName: string, columnName: string): string => {
-  return `ALTER TABLE "${tableName}" DROP COLUMN "${columnName}";`;
-};
-
 export const asColumnAlter = (tableName: string, columnName: string, changes: ColumnChanges): string[] => {
   const base = `ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}"`;
   const items: string[] = [];
diff --git a/server/src/sql-tools/transformers/constraint.transformer.ts b/server/src/sql-tools/transformers/constraint.transformer.ts
index bb8b30e7ce..94421e56fa 100644
--- a/server/src/sql-tools/transformers/constraint.transformer.ts
+++ b/server/src/sql-tools/transformers/constraint.transformer.ts
@@ -5,11 +5,15 @@ import { ActionType, ConstraintType, DatabaseConstraint } from 'src/sql-tools/ty
 export const transformConstraints: SqlTransformer = (ctx, item) => {
   switch (item.type) {
     case 'ConstraintAdd': {
-      return asConstraintAdd(item.constraint);
+      return `ALTER TABLE "${item.constraint.tableName}" ADD ${asConstraintBody(item.constraint)};`;
+    }
+
+    case 'ConstraintRename': {
+      return `ALTER TABLE "${item.tableName}" RENAME CONSTRAINT "${item.oldName}" TO "${item.newName}";`;
     }
 
     case 'ConstraintDrop': {
-      return asConstraintDrop(item.tableName, item.constraintName);
+      return `ALTER TABLE "${item.tableName}" DROP CONSTRAINT "${item.constraintName}";`;
     }
     default: {
       return false;
@@ -52,11 +56,3 @@ export const asConstraintBody = (constraint: DatabaseConstraint): string => {
     }
   }
 };
-
-export const asConstraintAdd = (constraint: DatabaseConstraint): string | string[] => {
-  return `ALTER TABLE "${constraint.tableName}" ADD ${asConstraintBody(constraint)};`;
-};
-
-export const asConstraintDrop = (tableName: string, constraintName: string): string => {
-  return `ALTER TABLE "${tableName}" DROP CONSTRAINT "${constraintName}";`;
-};
diff --git a/server/src/sql-tools/transformers/index.transformer.ts b/server/src/sql-tools/transformers/index.transformer.ts
index bfdbf8e157..acd65140ee 100644
--- a/server/src/sql-tools/transformers/index.transformer.ts
+++ b/server/src/sql-tools/transformers/index.transformer.ts
@@ -8,8 +8,12 @@ export const transformIndexes: SqlTransformer = (ctx, item) => {
       return asIndexCreate(item.index);
     }
 
+    case 'IndexRename': {
+      return `ALTER INDEX "${item.oldName}" RENAME TO "${item.newName}";`;
+    }
+
     case 'IndexDrop': {
-      return asIndexDrop(item.indexName);
+      return `DROP INDEX "${item.indexName}";`;
     }
 
     default: {
@@ -50,7 +54,3 @@ export const asIndexCreate = (index: DatabaseIndex): string => {
 
   return sql + ';';
 };
-
-export const asIndexDrop = (indexName: string): string => {
-  return `DROP INDEX "${indexName}";`;
-};
diff --git a/server/src/sql-tools/transformers/table.transformer.spec.ts b/server/src/sql-tools/transformers/table.transformer.spec.ts
index 662e1ba7fd..0d89fcd278 100644
--- a/server/src/sql-tools/transformers/table.transformer.spec.ts
+++ b/server/src/sql-tools/transformers/table.transformer.spec.ts
@@ -19,6 +19,7 @@ const table1: DatabaseTable = {
     },
     {
       name: 'column2',
+      primary: false,
       tableName: 'table1',
       type: 'character varying',
       nullable: true,
@@ -106,6 +107,7 @@ describe(transformTables.name, () => {
             columns: [
               {
                 tableName: 'table1',
+                primary: false,
                 name: 'column1',
                 type: 'character varying',
                 isArray: false,
@@ -137,6 +139,7 @@ describe(transformTables.name, () => {
               {
                 tableName: 'table1',
                 name: 'column1',
+                primary: false,
                 type: 'character varying',
                 isArray: false,
                 nullable: true,
@@ -167,6 +170,7 @@ describe(transformTables.name, () => {
             columns: [
               {
                 tableName: 'table1',
+                primary: false,
                 name: 'column1',
                 type: 'character varying',
                 length: 2,
@@ -198,6 +202,7 @@ describe(transformTables.name, () => {
             columns: [
               {
                 tableName: 'table1',
+                primary: false,
                 name: 'column1',
                 type: 'character varying',
                 isArray: true,
diff --git a/server/src/sql-tools/types.ts b/server/src/sql-tools/types.ts
index 617adc0a58..9529067040 100644
--- a/server/src/sql-tools/types.ts
+++ b/server/src/sql-tools/types.ts
@@ -1,12 +1,14 @@
 import { Kysely, ColumnType as KyselyColumnType } from 'kysely';
 import { ProcessorContext } from 'src/sql-tools/contexts/processor-context';
 import { ReaderContext } from 'src/sql-tools/contexts/reader-context';
+import { NamingInterface } from 'src/sql-tools/naming/naming.interface';
 import { RegisterItem } from 'src/sql-tools/register-item';
 
 export type BaseContextOptions = {
   databaseName?: string;
   schemaName?: string;
   overrideTableName?: string;
+  namingStrategy?: 'default' | 'hash' | NamingInterface;
 };
 
 export type SchemaFromCodeOptions = BaseContextOptions & {
@@ -386,7 +388,7 @@ export type DatabaseConstraint =
   | DatabaseCheckConstraint;
 
 export type DatabaseColumn = {
-  primary?: boolean;
+  primary: boolean;
   name: string;
   tableName: string;
   comment?: string;
@@ -487,11 +489,14 @@ export type SchemaDiff = { reason: string } & (
   | { type: 'TableCreate'; table: DatabaseTable }
   | { type: 'TableDrop'; tableName: string }
   | { type: 'ColumnAdd'; column: DatabaseColumn }
+  | { type: 'ColumnRename'; tableName: string; oldName: string; newName: string }
   | { type: 'ColumnAlter'; tableName: string; columnName: string; changes: ColumnChanges }
   | { type: 'ColumnDrop'; tableName: string; columnName: string }
   | { type: 'ConstraintAdd'; constraint: DatabaseConstraint }
+  | { type: 'ConstraintRename'; tableName: string; oldName: string; newName: string }
   | { type: 'ConstraintDrop'; tableName: string; constraintName: string }
   | { type: 'IndexCreate'; index: DatabaseIndex }
+  | { type: 'IndexRename'; tableName: string; oldName: string; newName: string }
   | { type: 'IndexDrop'; indexName: string }
   | { type: 'TriggerCreate'; trigger: DatabaseTrigger }
   | { type: 'TriggerDrop'; tableName: string; triggerName: string }
@@ -509,11 +514,15 @@ export type Comparer<T> = {
   onMissing: (source: T) => SchemaDiff[];
   onExtra: (target: T) => SchemaDiff[];
   onCompare: CompareFunction<T>;
+  /** if two items have the same key, they are considered identical and can be renamed via `onRename` */
+  getRenameKey?: (item: T) => string;
+  onRename?: (source: T, target: T) => SchemaDiff[];
 };
 
 export enum Reason {
   MissingInSource = 'missing in source',
   MissingInTarget = 'missing in target',
+  Rename = 'name has changed',
 }
 
 export type Timestamp = KyselyColumnType<Date, Date | string, Date | string>;
diff --git a/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts b/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts
index c38c29cde0..288f7c6698 100644
--- a/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts
+++ b/server/test/sql-tools/foreign-key-with-unique-constraint.stub.ts
@@ -83,7 +83,7 @@ export const schema: DatabaseSchema = {
         },
         {
           type: ConstraintType.UNIQUE,
-          name: 'REL_3fcca5cc563abf256fc346e3ff',
+          name: 'UQ_3fcca5cc563abf256fc346e3ff4',
           tableName: 'table2',
           columnNames: ['parentId'],
           synchronize: true,

From df581cc0d53aae169e0ace0dededeff16f7d9b4c Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Fri, 11 Jul 2025 20:19:53 +0200
Subject: [PATCH 193/337] feat: UserMetadata sync (#19882)

* feat: UserMetadata sync

* refactor: sync table filters (#19887)
---
 mobile/openapi/README.md                      |   2 +
 mobile/openapi/lib/api.dart                   |   2 +
 mobile/openapi/lib/api_client.dart            |   4 +
 .../openapi/lib/model/sync_entity_type.dart   |   6 +
 .../openapi/lib/model/sync_request_type.dart  |   3 +
 .../model/sync_user_metadata_delete_v1.dart   | 107 +++++++++++++++
 .../lib/model/sync_user_metadata_v1.dart      | 115 ++++++++++++++++
 open-api/immich-openapi-specs.json            |  39 +++++-
 open-api/typescript-sdk/src/fetch-client.ts   |   5 +-
 server/src/dtos/sync.dto.ts                   |  17 +++
 server/src/enum.ts                            |   4 +
 server/src/queries/sync.repository.sql        |  27 ++++
 server/src/repositories/sync.repository.ts    | 115 +++++++++-------
 server/src/schema/functions.ts                |  13 ++
 server/src/schema/index.ts                    |   4 +
 .../1752250924342-UserMetadataSync.ts         |  56 ++++++++
 .../tables/user-metadata-audit.table.ts       |  17 +++
 .../src/schema/tables/user-metadata.table.ts  |  26 +++-
 server/src/services/sync.service.ts           |  18 +++
 .../specs/sync/sync-user-metadata.spec.ts     | 123 ++++++++++++++++++
 20 files changed, 653 insertions(+), 50 deletions(-)
 create mode 100644 mobile/openapi/lib/model/sync_user_metadata_delete_v1.dart
 create mode 100644 mobile/openapi/lib/model/sync_user_metadata_v1.dart
 create mode 100644 server/src/schema/migrations/1752250924342-UserMetadataSync.ts
 create mode 100644 server/src/schema/tables/user-metadata-audit.table.ts
 create mode 100644 server/test/medium/specs/sync/sync-user-metadata.spec.ts

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 5b90e4a633..5085052c05 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -490,6 +490,8 @@ Class | Method | HTTP request | Description
  - [SyncStackV1](doc//SyncStackV1.md)
  - [SyncStreamDto](doc//SyncStreamDto.md)
  - [SyncUserDeleteV1](doc//SyncUserDeleteV1.md)
+ - [SyncUserMetadataDeleteV1](doc//SyncUserMetadataDeleteV1.md)
+ - [SyncUserMetadataV1](doc//SyncUserMetadataV1.md)
  - [SyncUserV1](doc//SyncUserV1.md)
  - [SystemConfigBackupsDto](doc//SystemConfigBackupsDto.md)
  - [SystemConfigDto](doc//SystemConfigDto.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index 4de0614cf6..f30481ecce 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -272,6 +272,8 @@ part 'model/sync_stack_delete_v1.dart';
 part 'model/sync_stack_v1.dart';
 part 'model/sync_stream_dto.dart';
 part 'model/sync_user_delete_v1.dart';
+part 'model/sync_user_metadata_delete_v1.dart';
+part 'model/sync_user_metadata_v1.dart';
 part 'model/sync_user_v1.dart';
 part 'model/system_config_backups_dto.dart';
 part 'model/system_config_dto.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 26113a1115..f1cf05f110 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -600,6 +600,10 @@ class ApiClient {
           return SyncStreamDto.fromJson(value);
         case 'SyncUserDeleteV1':
           return SyncUserDeleteV1.fromJson(value);
+        case 'SyncUserMetadataDeleteV1':
+          return SyncUserMetadataDeleteV1.fromJson(value);
+        case 'SyncUserMetadataV1':
+          return SyncUserMetadataV1.fromJson(value);
         case 'SyncUserV1':
           return SyncUserV1.fromJson(value);
         case 'SystemConfigBackupsDto':
diff --git a/mobile/openapi/lib/model/sync_entity_type.dart b/mobile/openapi/lib/model/sync_entity_type.dart
index 1d09a6dbe0..61f94401c7 100644
--- a/mobile/openapi/lib/model/sync_entity_type.dart
+++ b/mobile/openapi/lib/model/sync_entity_type.dart
@@ -58,6 +58,8 @@ class SyncEntityType {
   static const stackDeleteV1 = SyncEntityType._(r'StackDeleteV1');
   static const personV1 = SyncEntityType._(r'PersonV1');
   static const personDeleteV1 = SyncEntityType._(r'PersonDeleteV1');
+  static const userMetadataV1 = SyncEntityType._(r'UserMetadataV1');
+  static const userMetadataDeleteV1 = SyncEntityType._(r'UserMetadataDeleteV1');
   static const syncAckV1 = SyncEntityType._(r'SyncAckV1');
   static const syncResetV1 = SyncEntityType._(r'SyncResetV1');
 
@@ -98,6 +100,8 @@ class SyncEntityType {
     stackDeleteV1,
     personV1,
     personDeleteV1,
+    userMetadataV1,
+    userMetadataDeleteV1,
     syncAckV1,
     syncResetV1,
   ];
@@ -173,6 +177,8 @@ class SyncEntityTypeTypeTransformer {
         case r'StackDeleteV1': return SyncEntityType.stackDeleteV1;
         case r'PersonV1': return SyncEntityType.personV1;
         case r'PersonDeleteV1': return SyncEntityType.personDeleteV1;
+        case r'UserMetadataV1': return SyncEntityType.userMetadataV1;
+        case r'UserMetadataDeleteV1': return SyncEntityType.userMetadataDeleteV1;
         case r'SyncAckV1': return SyncEntityType.syncAckV1;
         case r'SyncResetV1': return SyncEntityType.syncResetV1;
         default:
diff --git a/mobile/openapi/lib/model/sync_request_type.dart b/mobile/openapi/lib/model/sync_request_type.dart
index 0b121d96c6..75ce852f9f 100644
--- a/mobile/openapi/lib/model/sync_request_type.dart
+++ b/mobile/openapi/lib/model/sync_request_type.dart
@@ -39,6 +39,7 @@ class SyncRequestType {
   static const stacksV1 = SyncRequestType._(r'StacksV1');
   static const usersV1 = SyncRequestType._(r'UsersV1');
   static const peopleV1 = SyncRequestType._(r'PeopleV1');
+  static const userMetadataV1 = SyncRequestType._(r'UserMetadataV1');
 
   /// List of all possible values in this [enum][SyncRequestType].
   static const values = <SyncRequestType>[
@@ -58,6 +59,7 @@ class SyncRequestType {
     stacksV1,
     usersV1,
     peopleV1,
+    userMetadataV1,
   ];
 
   static SyncRequestType? fromJson(dynamic value) => SyncRequestTypeTypeTransformer().decode(value);
@@ -112,6 +114,7 @@ class SyncRequestTypeTypeTransformer {
         case r'StacksV1': return SyncRequestType.stacksV1;
         case r'UsersV1': return SyncRequestType.usersV1;
         case r'PeopleV1': return SyncRequestType.peopleV1;
+        case r'UserMetadataV1': return SyncRequestType.userMetadataV1;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');
diff --git a/mobile/openapi/lib/model/sync_user_metadata_delete_v1.dart b/mobile/openapi/lib/model/sync_user_metadata_delete_v1.dart
new file mode 100644
index 0000000000..e9dd733295
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_user_metadata_delete_v1.dart
@@ -0,0 +1,107 @@
+//
+// 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 SyncUserMetadataDeleteV1 {
+  /// Returns a new [SyncUserMetadataDeleteV1] instance.
+  SyncUserMetadataDeleteV1({
+    required this.key,
+    required this.userId,
+  });
+
+  String key;
+
+  String userId;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncUserMetadataDeleteV1 &&
+    other.key == key &&
+    other.userId == userId;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (key.hashCode) +
+    (userId.hashCode);
+
+  @override
+  String toString() => 'SyncUserMetadataDeleteV1[key=$key, userId=$userId]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'key'] = this.key;
+      json[r'userId'] = this.userId;
+    return json;
+  }
+
+  /// Returns a new [SyncUserMetadataDeleteV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncUserMetadataDeleteV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncUserMetadataDeleteV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncUserMetadataDeleteV1(
+        key: mapValueOfType<String>(json, r'key')!,
+        userId: mapValueOfType<String>(json, r'userId')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncUserMetadataDeleteV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncUserMetadataDeleteV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncUserMetadataDeleteV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncUserMetadataDeleteV1> mapFromJson(dynamic json) {
+    final map = <String, SyncUserMetadataDeleteV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncUserMetadataDeleteV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncUserMetadataDeleteV1-objects as value to a dart map
+  static Map<String, List<SyncUserMetadataDeleteV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncUserMetadataDeleteV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncUserMetadataDeleteV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'key',
+    'userId',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_user_metadata_v1.dart b/mobile/openapi/lib/model/sync_user_metadata_v1.dart
new file mode 100644
index 0000000000..0b060dc17c
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_user_metadata_v1.dart
@@ -0,0 +1,115 @@
+//
+// 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 SyncUserMetadataV1 {
+  /// Returns a new [SyncUserMetadataV1] instance.
+  SyncUserMetadataV1({
+    required this.key,
+    required this.userId,
+    required this.value,
+  });
+
+  String key;
+
+  String userId;
+
+  Object value;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncUserMetadataV1 &&
+    other.key == key &&
+    other.userId == userId &&
+    other.value == value;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (key.hashCode) +
+    (userId.hashCode) +
+    (value.hashCode);
+
+  @override
+  String toString() => 'SyncUserMetadataV1[key=$key, userId=$userId, value=$value]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'key'] = this.key;
+      json[r'userId'] = this.userId;
+      json[r'value'] = this.value;
+    return json;
+  }
+
+  /// Returns a new [SyncUserMetadataV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncUserMetadataV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncUserMetadataV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncUserMetadataV1(
+        key: mapValueOfType<String>(json, r'key')!,
+        userId: mapValueOfType<String>(json, r'userId')!,
+        value: mapValueOfType<Object>(json, r'value')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncUserMetadataV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncUserMetadataV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncUserMetadataV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncUserMetadataV1> mapFromJson(dynamic json) {
+    final map = <String, SyncUserMetadataV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncUserMetadataV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncUserMetadataV1-objects as value to a dart map
+  static Map<String, List<SyncUserMetadataV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncUserMetadataV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncUserMetadataV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'key',
+    'userId',
+    'value',
+  };
+}
+
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 2e6c70adaa..18204c21f3 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13902,6 +13902,8 @@
           "StackDeleteV1",
           "PersonV1",
           "PersonDeleteV1",
+          "UserMetadataV1",
+          "UserMetadataDeleteV1",
           "SyncAckV1",
           "SyncResetV1"
         ],
@@ -14137,7 +14139,8 @@
           "PartnerStacksV1",
           "StacksV1",
           "UsersV1",
-          "PeopleV1"
+          "PeopleV1",
+          "UserMetadataV1"
         ],
         "type": "string"
       },
@@ -14213,6 +14216,40 @@
         ],
         "type": "object"
       },
+      "SyncUserMetadataDeleteV1": {
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "userId": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "key",
+          "userId"
+        ],
+        "type": "object"
+      },
+      "SyncUserMetadataV1": {
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "userId": {
+            "type": "string"
+          },
+          "value": {
+            "type": "object"
+          }
+        },
+        "required": [
+          "key",
+          "userId",
+          "value"
+        ],
+        "type": "object"
+      },
       "SyncUserV1": {
         "properties": {
           "deletedAt": {
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index f7fc9fe61e..88dee9bf0b 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -4116,6 +4116,8 @@ export enum SyncEntityType {
     StackDeleteV1 = "StackDeleteV1",
     PersonV1 = "PersonV1",
     PersonDeleteV1 = "PersonDeleteV1",
+    UserMetadataV1 = "UserMetadataV1",
+    UserMetadataDeleteV1 = "UserMetadataDeleteV1",
     SyncAckV1 = "SyncAckV1",
     SyncResetV1 = "SyncResetV1"
 }
@@ -4135,7 +4137,8 @@ export enum SyncRequestType {
     PartnerStacksV1 = "PartnerStacksV1",
     StacksV1 = "StacksV1",
     UsersV1 = "UsersV1",
-    PeopleV1 = "PeopleV1"
+    PeopleV1 = "PeopleV1",
+    UserMetadataV1 = "UserMetadataV1"
 }
 export enum TranscodeHWAccel {
     Nvenc = "nvenc",
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index ff5df03eaf..abd7d7b694 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -10,7 +10,9 @@ import {
   MemoryType,
   SyncEntityType,
   SyncRequestType,
+  UserMetadataKey,
 } from 'src/enum';
+import { UserMetadata } from 'src/types';
 import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
 
 export class AssetFullSyncDto {
@@ -253,6 +255,19 @@ export class SyncPersonDeleteV1 {
   personId!: string;
 }
 
+@ExtraModel()
+export class SyncUserMetadataV1 {
+  userId!: string;
+  key!: string;
+  value!: UserMetadata[UserMetadataKey];
+}
+
+@ExtraModel()
+export class SyncUserMetadataDeleteV1 {
+  userId!: string;
+  key!: string;
+}
+
 @ExtraModel()
 export class SyncAckV1 {}
 
@@ -295,6 +310,8 @@ export type SyncItem = {
   [SyncEntityType.PartnerStackV1]: SyncStackV1;
   [SyncEntityType.PersonV1]: SyncPersonV1;
   [SyncEntityType.PersonDeleteV1]: SyncPersonDeleteV1;
+  [SyncEntityType.UserMetadataV1]: SyncUserMetadataV1;
+  [SyncEntityType.UserMetadataDeleteV1]: SyncUserMetadataDeleteV1;
   [SyncEntityType.SyncAckV1]: SyncAckV1;
   [SyncEntityType.SyncResetV1]: SyncResetV1;
 };
diff --git a/server/src/enum.ts b/server/src/enum.ts
index 6d960e1fbb..dca0f09555 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -589,6 +589,7 @@ export enum SyncRequestType {
   StacksV1 = 'StacksV1',
   UsersV1 = 'UsersV1',
   PeopleV1 = 'PeopleV1',
+  UserMetadataV1 = 'UserMetadataV1',
 }
 
 export enum SyncEntityType {
@@ -639,6 +640,9 @@ export enum SyncEntityType {
   PersonV1 = 'PersonV1',
   PersonDeleteV1 = 'PersonDeleteV1',
 
+  UserMetadataV1 = 'UserMetadataV1',
+  UserMetadataDeleteV1 = 'UserMetadataDeleteV1',
+
   SyncAckV1 = 'SyncAckV1',
   SyncResetV1 = 'SyncResetV1',
 }
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index f68be8c83f..ac3632ad4a 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -835,3 +835,30 @@ where
   "updatedAt" < now() - interval '1 millisecond'
 order by
   "updateId" asc
+
+-- SyncRepository.userMetadata.getDeletes
+select
+  "id",
+  "userId",
+  "key"
+from
+  "user_metadata_audit"
+where
+  "userId" = $1
+  and "deletedAt" < now() - interval '1 millisecond'
+order by
+  "id" asc
+
+-- SyncRepository.userMetadata.getUpserts
+select
+  "userId",
+  "key",
+  "value",
+  "updateId"
+from
+  "user_metadata"
+where
+  "userId" = $1
+  and "updatedAt" < now() - interval '1 millisecond'
+order by
+  "updateId" asc
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index 3bc09c97eb..f9d65f7244 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -16,7 +16,8 @@ type AuditTables =
   | 'memories_audit'
   | 'memory_assets_audit'
   | 'stacks_audit'
-  | 'person_audit';
+  | 'person_audit'
+  | 'user_metadata_audit';
 type UpsertTables =
   | 'users'
   | 'partners'
@@ -27,7 +28,8 @@ type UpsertTables =
   | 'memories'
   | 'memories_assets_assets'
   | 'asset_stack'
-  | 'person';
+  | 'person'
+  | 'user_metadata';
 
 @Injectable()
 export class SyncRepository {
@@ -47,6 +49,7 @@ export class SyncRepository {
   people: PersonSync;
   stack: StackSync;
   user: UserSync;
+  userMetadata: UserMetadataSync;
 
   constructor(@InjectKysely() private db: Kysely<DB>) {
     this.album = new AlbumSync(this.db);
@@ -65,32 +68,31 @@ export class SyncRepository {
     this.people = new PersonSync(this.db);
     this.stack = new StackSync(this.db);
     this.user = new UserSync(this.db);
+    this.userMetadata = new UserMetadataSync(this.db);
   }
 }
 
 class BaseSync {
   constructor(protected db: Kysely<DB>) {}
 
-  protected auditTableFilters<T extends keyof Pick<DB, AuditTables>, D>(
-    qb: SelectQueryBuilder<DB, T, D>,
-    ack?: SyncAck,
-  ) {
-    const builder = qb as SelectQueryBuilder<DB, AuditTables, D>;
-    return builder
-      .where('deletedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('id', '>', ack!.updateId))
-      .orderBy('id', 'asc') as SelectQueryBuilder<DB, T, D>;
+  protected auditTableFilters(ack?: SyncAck) {
+    return <T extends keyof Pick<DB, AuditTables>, D>(qb: SelectQueryBuilder<DB, T, D>) => {
+      const builder = qb as SelectQueryBuilder<DB, AuditTables, D>;
+      return builder
+        .where('deletedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+        .$if(!!ack, (qb) => qb.where('id', '>', ack!.updateId))
+        .orderBy('id', 'asc') as SelectQueryBuilder<DB, T, D>;
+    };
   }
 
-  protected upsertTableFilters<T extends keyof Pick<DB, UpsertTables>, D>(
-    qb: SelectQueryBuilder<DB, T, D>,
-    ack?: SyncAck,
-  ) {
-    const builder = qb as SelectQueryBuilder<DB, UpsertTables, D>;
-    return builder
-      .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('updateId', '>', ack!.updateId))
-      .orderBy('updateId', 'asc') as SelectQueryBuilder<DB, T, D>;
+  protected upsertTableFilters(ack?: SyncAck) {
+    return <T extends keyof Pick<DB, UpsertTables>, D>(qb: SelectQueryBuilder<DB, T, D>) => {
+      const builder = qb as SelectQueryBuilder<DB, UpsertTables, D>;
+      return builder
+        .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+        .$if(!!ack, (qb) => qb.where('updateId', '>', ack!.updateId))
+        .orderBy('updateId', 'asc') as SelectQueryBuilder<DB, T, D>;
+    };
   }
 }
 
@@ -113,7 +115,7 @@ class AlbumSync extends BaseSync {
       .selectFrom('albums_audit')
       .select(['id', 'albumId'])
       .where('userId', '=', userId)
-      .$call((qb) => this.auditTableFilters(qb, ack))
+      .$call(this.auditTableFilters(ack))
       .stream();
   }
 
@@ -246,7 +248,7 @@ class AlbumToAssetSync extends BaseSync {
             ),
         ),
       )
-      .$call((qb) => this.auditTableFilters(qb, ack))
+      .$call(this.auditTableFilters(ack))
       .stream();
   }
 
@@ -303,7 +305,7 @@ class AlbumUserSync extends BaseSync {
             ),
         ),
       )
-      .$call((qb) => this.auditTableFilters(qb, ack))
+      .$call(this.auditTableFilters(ack))
       .stream();
   }
 
@@ -345,7 +347,7 @@ class AssetSync extends BaseSync {
       .selectFrom('assets_audit')
       .select(['id', 'assetId'])
       .where('ownerId', '=', userId)
-      .$call((qb) => this.auditTableFilters(qb, ack))
+      .$call(this.auditTableFilters(ack))
       .stream();
   }
 
@@ -356,7 +358,7 @@ class AssetSync extends BaseSync {
       .select(columns.syncAsset)
       .select('assets.updateId')
       .where('ownerId', '=', userId)
-      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .$call(this.upsertTableFilters(ack))
       .stream();
   }
 }
@@ -368,7 +370,7 @@ class PersonSync extends BaseSync {
       .selectFrom('person_audit')
       .select(['id', 'personId'])
       .where('ownerId', '=', userId)
-      .$call((qb) => this.auditTableFilters(qb, ack))
+      .$call(this.auditTableFilters(ack))
       .stream();
   }
 
@@ -391,7 +393,7 @@ class PersonSync extends BaseSync {
         'faceAssetId',
       ])
       .where('ownerId', '=', userId)
-      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .$call(this.upsertTableFilters(ack))
       .stream();
   }
 }
@@ -404,7 +406,7 @@ class AssetExifSync extends BaseSync {
       .select(columns.syncAssetExif)
       .select('exif.updateId')
       .where('assetId', 'in', (eb) => eb.selectFrom('assets').select('id').where('ownerId', '=', userId))
-      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .$call(this.upsertTableFilters(ack))
       .stream();
   }
 }
@@ -416,7 +418,7 @@ class MemorySync extends BaseSync {
       .selectFrom('memories_audit')
       .select(['id', 'memoryId'])
       .where('userId', '=', userId)
-      .$call((qb) => this.auditTableFilters(qb, ack))
+      .$call(this.auditTableFilters(ack))
       .stream();
   }
 
@@ -440,7 +442,7 @@ class MemorySync extends BaseSync {
       ])
       .select('updateId')
       .where('ownerId', '=', userId)
-      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .$call(this.upsertTableFilters(ack))
       .stream();
   }
 }
@@ -452,7 +454,7 @@ class MemoryToAssetSync extends BaseSync {
       .selectFrom('memory_assets_audit')
       .select(['id', 'memoryId', 'assetId'])
       .where('memoryId', 'in', (eb) => eb.selectFrom('memories').select('id').where('ownerId', '=', userId))
-      .$call((qb) => this.auditTableFilters(qb, ack))
+      .$call(this.auditTableFilters(ack))
       .stream();
   }
 
@@ -463,7 +465,7 @@ class MemoryToAssetSync extends BaseSync {
       .select(['memoriesId as memoryId', 'assetsId as assetId'])
       .select('updateId')
       .where('memoriesId', 'in', (eb) => eb.selectFrom('memories').select('id').where('ownerId', '=', userId))
-      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .$call(this.upsertTableFilters(ack))
       .stream();
   }
 }
@@ -487,7 +489,7 @@ class PartnerSync extends BaseSync {
       .selectFrom('partners_audit')
       .select(['id', 'sharedById', 'sharedWithId'])
       .where((eb) => eb.or([eb('sharedById', '=', userId), eb('sharedWithId', '=', userId)]))
-      .$call((qb) => this.auditTableFilters(qb, ack))
+      .$call(this.auditTableFilters(ack))
       .stream();
   }
 
@@ -497,7 +499,7 @@ class PartnerSync extends BaseSync {
       .selectFrom('partners')
       .select(['sharedById', 'sharedWithId', 'inTimeline', 'updateId'])
       .where((eb) => eb.or([eb('sharedById', '=', userId), eb('sharedWithId', '=', userId)]))
-      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .$call(this.upsertTableFilters(ack))
       .stream();
   }
 }
@@ -525,7 +527,7 @@ class PartnerAssetsSync extends BaseSync {
       .where('ownerId', 'in', (eb) =>
         eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
       )
-      .$call((qb) => this.auditTableFilters(qb, ack))
+      .$call(this.auditTableFilters(ack))
       .stream();
   }
 
@@ -538,7 +540,7 @@ class PartnerAssetsSync extends BaseSync {
       .where('ownerId', 'in', (eb) =>
         eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
       )
-      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .$call(this.upsertTableFilters(ack))
       .stream();
   }
 }
@@ -573,7 +575,7 @@ class PartnerAssetExifsSync extends BaseSync {
             eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
           ),
       )
-      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .$call(this.upsertTableFilters(ack))
       .stream();
   }
 }
@@ -585,7 +587,7 @@ class StackSync extends BaseSync {
       .selectFrom('stacks_audit')
       .select(['id', 'stackId'])
       .where('userId', '=', userId)
-      .$call((qb) => this.auditTableFilters(qb, ack))
+      .$call(this.auditTableFilters(ack))
       .stream();
   }
 
@@ -596,7 +598,7 @@ class StackSync extends BaseSync {
       .select(columns.syncStack)
       .select('updateId')
       .where('ownerId', '=', userId)
-      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .$call(this.upsertTableFilters(ack))
       .stream();
   }
 }
@@ -610,7 +612,7 @@ class PartnerStackSync extends BaseSync {
       .where('userId', 'in', (eb) =>
         eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
       )
-      .$call((qb) => this.auditTableFilters(qb, ack))
+      .$call(this.auditTableFilters(ack))
       .stream();
   }
 
@@ -637,18 +639,15 @@ class PartnerStackSync extends BaseSync {
       .where('ownerId', 'in', (eb) =>
         eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
       )
-      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .$call(this.upsertTableFilters(ack))
       .stream();
   }
 }
+
 class UserSync extends BaseSync {
   @GenerateSql({ params: [], stream: true })
   getDeletes(ack?: SyncAck) {
-    return this.db
-      .selectFrom('users_audit')
-      .select(['id', 'userId'])
-      .$call((qb) => this.auditTableFilters(qb, ack))
-      .stream();
+    return this.db.selectFrom('users_audit').select(['id', 'userId']).$call(this.auditTableFilters(ack)).stream();
   }
 
   @GenerateSql({ params: [], stream: true })
@@ -656,7 +655,29 @@ class UserSync extends BaseSync {
     return this.db
       .selectFrom('users')
       .select(['id', 'name', 'email', 'deletedAt', 'updateId'])
-      .$call((qb) => this.upsertTableFilters(qb, ack))
+      .$call(this.upsertTableFilters(ack))
+      .stream();
+  }
+}
+
+class UserMetadataSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getDeletes(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('user_metadata_audit')
+      .select(['id', 'userId', 'key'])
+      .where('userId', '=', userId)
+      .$call(this.auditTableFilters(ack))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('user_metadata')
+      .select(['userId', 'key', 'value', 'updateId'])
+      .where('userId', '=', userId)
+      .$call(this.upsertTableFilters(ack))
       .stream();
   }
 }
diff --git a/server/src/schema/functions.ts b/server/src/schema/functions.ts
index 424ceb0d33..335201a6c4 100644
--- a/server/src/schema/functions.ts
+++ b/server/src/schema/functions.ts
@@ -216,3 +216,16 @@ export const person_delete_audit = registerFunction({
       RETURN NULL;
     END`,
 });
+
+export const user_metadata_audit = registerFunction({
+  name: 'user_metadata_audit',
+  returnType: 'TRIGGER',
+  language: 'PLPGSQL',
+  body: `
+    BEGIN
+      INSERT INTO user_metadata_audit ("userId", "key")
+      SELECT "userId", "key"
+      FROM OLD;
+      RETURN NULL;
+    END`,
+});
diff --git a/server/src/schema/index.ts b/server/src/schema/index.ts
index f564e8c7f0..384e47df79 100644
--- a/server/src/schema/index.ts
+++ b/server/src/schema/index.ts
@@ -57,6 +57,7 @@ import { TagAssetTable } from 'src/schema/tables/tag-asset.table';
 import { TagClosureTable } from 'src/schema/tables/tag-closure.table';
 import { TagTable } from 'src/schema/tables/tag.table';
 import { UserAuditTable } from 'src/schema/tables/user-audit.table';
+import { UserMetadataAuditTable } from 'src/schema/tables/user-metadata-audit.table';
 import { UserMetadataTable } from 'src/schema/tables/user-metadata.table';
 import { UserTable } from 'src/schema/tables/user.table';
 import { VersionHistoryTable } from 'src/schema/tables/version-history.table';
@@ -108,6 +109,7 @@ export class ImmichDatabase {
     TagClosureTable,
     UserAuditTable,
     UserMetadataTable,
+    UserMetadataAuditTable,
     UserTable,
     VersionHistoryTable,
   ];
@@ -128,6 +130,7 @@ export class ImmichDatabase {
     memory_assets_delete_audit,
     stacks_delete_audit,
     person_delete_audit,
+    users_delete_audit,
   ];
 
   enum = [assets_status_enum, asset_face_source_type, asset_visibility_enum];
@@ -182,6 +185,7 @@ export interface DB {
   tags: TagTable;
   tags_closure: TagClosureTable;
   user_metadata: UserMetadataTable;
+  user_metadata_audit: UserMetadataAuditTable;
   users: UserTable;
   users_audit: UserAuditTable;
   version_history: VersionHistoryTable;
diff --git a/server/src/schema/migrations/1752250924342-UserMetadataSync.ts b/server/src/schema/migrations/1752250924342-UserMetadataSync.ts
new file mode 100644
index 0000000000..20778d8010
--- /dev/null
+++ b/server/src/schema/migrations/1752250924342-UserMetadataSync.ts
@@ -0,0 +1,56 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`CREATE OR REPLACE FUNCTION user_metadata_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO user_metadata_audit ("userId", "key")
+      SELECT "userId", "key"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE TABLE "user_metadata_audit" (
+  "id" uuid NOT NULL DEFAULT immich_uuid_v7(),
+  "userId" uuid NOT NULL,
+  "key" character varying NOT NULL,
+  "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp(),
+  CONSTRAINT "PK_15d5cc4d65ac966233b9921acac" PRIMARY KEY ("id")
+);`.execute(db);
+  await sql`CREATE INDEX "IDX_user_metadata_audit_user_id" ON "user_metadata_audit" ("userId");`.execute(db);
+  await sql`CREATE INDEX "IDX_user_metadata_audit_key" ON "user_metadata_audit" ("key");`.execute(db);
+  await sql`CREATE INDEX "IDX_user_metadata_audit_deleted_at" ON "user_metadata_audit" ("deletedAt");`.execute(db);
+  await sql`ALTER TABLE "user_metadata" ADD "updateId" uuid NOT NULL DEFAULT immich_uuid_v7();`.execute(db);
+  await sql`ALTER TABLE "user_metadata" ADD "updatedAt" timestamp with time zone NOT NULL DEFAULT now();`.execute(db);
+  await sql`CREATE INDEX "IDX_user_metadata_update_id" ON "user_metadata" ("updateId");`.execute(db);
+  await sql`CREATE INDEX "IDX_user_metadata_updated_at" ON "user_metadata" ("updatedAt");`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "user_metadata_audit"
+  AFTER DELETE ON "user_metadata"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION user_metadata_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "user_metadata_updated_at"
+  BEFORE UPDATE ON "user_metadata"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_user_metadata_audit', '{"type":"function","name":"user_metadata_audit","sql":"CREATE OR REPLACE FUNCTION user_metadata_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO user_metadata_audit (\\"userId\\", \\"key\\")\\n      SELECT \\"userId\\", \\"key\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_user_metadata_audit', '{"type":"trigger","name":"user_metadata_audit","sql":"CREATE OR REPLACE TRIGGER \\"user_metadata_audit\\"\\n  AFTER DELETE ON \\"user_metadata\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION user_metadata_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_user_metadata_updated_at', '{"type":"trigger","name":"user_metadata_updated_at","sql":"CREATE OR REPLACE TRIGGER \\"user_metadata_updated_at\\"\\n  BEFORE UPDATE ON \\"user_metadata\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`DROP TRIGGER "user_metadata_audit" ON "user_metadata";`.execute(db);
+  await sql`DROP TRIGGER "user_metadata_updated_at" ON "user_metadata";`.execute(db);
+  await sql`DROP INDEX "IDX_user_metadata_update_id";`.execute(db);
+  await sql`DROP INDEX "IDX_user_metadata_updated_at";`.execute(db);
+  await sql`ALTER TABLE "user_metadata" DROP COLUMN "updateId";`.execute(db);
+  await sql`ALTER TABLE "user_metadata" DROP COLUMN "updatedAt";`.execute(db);
+  await sql`DROP TABLE "user_metadata_audit";`.execute(db);
+  await sql`DROP FUNCTION user_metadata_audit;`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_user_metadata_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_user_metadata_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_user_metadata_updated_at';`.execute(db);
+}
diff --git a/server/src/schema/tables/user-metadata-audit.table.ts b/server/src/schema/tables/user-metadata-audit.table.ts
new file mode 100644
index 0000000000..de7d21c874
--- /dev/null
+++ b/server/src/schema/tables/user-metadata-audit.table.ts
@@ -0,0 +1,17 @@
+import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
+import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
+
+@Table('user_metadata_audit')
+export class UserMetadataAuditTable {
+  @PrimaryGeneratedUuidV7Column()
+  id!: Generated<string>;
+
+  @Column({ type: 'uuid', indexName: 'IDX_user_metadata_audit_user_id' })
+  userId!: string;
+
+  @Column({ indexName: 'IDX_user_metadata_audit_key' })
+  key!: string;
+
+  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_user_metadata_audit_deleted_at' })
+  deletedAt!: Generated<Timestamp>;
+}
diff --git a/server/src/schema/tables/user-metadata.table.ts b/server/src/schema/tables/user-metadata.table.ts
index 04b457867f..a453ec6677 100644
--- a/server/src/schema/tables/user-metadata.table.ts
+++ b/server/src/schema/tables/user-metadata.table.ts
@@ -1,9 +1,27 @@
+import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { UserMetadataKey } from 'src/enum';
+import { user_metadata_audit } from 'src/schema/functions';
 import { UserTable } from 'src/schema/tables/user.table';
-import { Column, ForeignKeyColumn, PrimaryColumn, Table } from 'src/sql-tools';
+import {
+  AfterDeleteTrigger,
+  Column,
+  ForeignKeyColumn,
+  Generated,
+  PrimaryColumn,
+  Table,
+  Timestamp,
+  UpdateDateColumn,
+} from 'src/sql-tools';
 import { UserMetadata, UserMetadataItem } from 'src/types';
 
+@UpdatedAtTrigger('user_metadata_updated_at')
 @Table('user_metadata')
+@AfterDeleteTrigger({
+  scope: 'statement',
+  function: user_metadata_audit,
+  referencingOldTableAs: 'old',
+  when: 'pg_trigger_depth() = 0',
+})
 export class UserMetadataTable<T extends keyof UserMetadata = UserMetadataKey> implements UserMetadataItem<T> {
   @ForeignKeyColumn(() => UserTable, {
     onUpdate: 'CASCADE',
@@ -19,4 +37,10 @@ export class UserMetadataTable<T extends keyof UserMetadata = UserMetadataKey> i
 
   @Column({ type: 'jsonb' })
   value!: UserMetadata[T];
+
+  @UpdateIdColumn({ indexName: 'IDX_user_metadata_update_id' })
+  updateId!: Generated<string>;
+
+  @UpdateDateColumn({ indexName: 'IDX_user_metadata_updated_at' })
+  updatedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 2cec72a3b5..9779498d70 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -70,6 +70,7 @@ export const SYNC_TYPES_ORDER = [
   SyncRequestType.MemoriesV1,
   SyncRequestType.MemoryToAssetsV1,
   SyncRequestType.PeopleV1,
+  SyncRequestType.UserMetadataV1,
 ];
 
 const throwSessionRequired = () => {
@@ -155,6 +156,7 @@ export class SyncService extends BaseService {
       [SyncRequestType.StacksV1]: () => this.syncStackV1(response, checkpointMap, auth),
       [SyncRequestType.PartnerStacksV1]: () => this.syncPartnerStackV1(response, checkpointMap, auth, session.id),
       [SyncRequestType.PeopleV1]: () => this.syncPeopleV1(response, checkpointMap, auth),
+      [SyncRequestType.UserMetadataV1]: () => this.syncUserMetadataV1(response, checkpointMap, auth),
     };
 
     for (const type of SYNC_TYPES_ORDER.filter((type) => dto.types.includes(type))) {
@@ -604,6 +606,22 @@ export class SyncService extends BaseService {
     }
   }
 
+  private async syncUserMetadataV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
+    const deleteType = SyncEntityType.UserMetadataDeleteV1;
+    const deletes = this.syncRepository.userMetadata.getDeletes(auth.user.id, checkpointMap[deleteType]);
+
+    for await (const { id, ...data } of deletes) {
+      send(response, { type: deleteType, ids: [id], data });
+    }
+
+    const upsertType = SyncEntityType.UserMetadataV1;
+    const upserts = this.syncRepository.userMetadata.getUpserts(auth.user.id, checkpointMap[upsertType]);
+
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data });
+    }
+  }
+
   private async upsertBackfillCheckpoint(item: { type: SyncEntityType; sessionId: string; createId: string }) {
     const { type, sessionId, createId } = item;
     await this.syncCheckpointRepository.upsertAll([
diff --git a/server/test/medium/specs/sync/sync-user-metadata.spec.ts b/server/test/medium/specs/sync/sync-user-metadata.spec.ts
new file mode 100644
index 0000000000..bb4a500a60
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-user-metadata.spec.ts
@@ -0,0 +1,123 @@
+import { Kysely } from 'kysely';
+import { SyncEntityType, SyncRequestType, UserMetadataKey } from 'src/enum';
+import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
+import { SyncTestContext } from 'test/medium.factory';
+import { getKyselyDB } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(SyncEntityType.UserMetadataV1, () => {
+  it('should detect and sync new user metadata', async () => {
+    const { auth, user, ctx } = await setup();
+
+    const userRepo = ctx.get(UserRepository);
+    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.ONBOARDING, value: { isOnboarded: true } });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.UserMetadataV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          key: UserMetadataKey.ONBOARDING,
+          userId: user.id,
+          value: { isOnboarded: true },
+        },
+        type: 'UserMetadataV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.UserMetadataV1])).resolves.toEqual([]);
+  });
+
+  it('should update user metadata', async () => {
+    const { auth, user, ctx } = await setup();
+
+    const userRepo = ctx.get(UserRepository);
+    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.ONBOARDING, value: { isOnboarded: true } });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.UserMetadataV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          key: UserMetadataKey.ONBOARDING,
+          userId: user.id,
+          value: { isOnboarded: true },
+        },
+        type: 'UserMetadataV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+
+    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.ONBOARDING, value: { isOnboarded: false } });
+
+    const updatedResponse = await ctx.syncStream(auth, [SyncRequestType.UserMetadataV1]);
+    expect(updatedResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          key: UserMetadataKey.ONBOARDING,
+          userId: user.id,
+          value: { isOnboarded: false },
+        },
+        type: 'UserMetadataV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, updatedResponse);
+    await expect(ctx.syncStream(auth, [SyncRequestType.UserMetadataV1])).resolves.toEqual([]);
+  });
+});
+
+describe(SyncEntityType.UserMetadataDeleteV1, () => {
+  it('should delete and sync user metadata', async () => {
+    const { auth, user, ctx } = await setup();
+
+    const userRepo = ctx.get(UserRepository);
+    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.ONBOARDING, value: { isOnboarded: true } });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.UserMetadataV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          key: UserMetadataKey.ONBOARDING,
+          userId: user.id,
+          value: { isOnboarded: true },
+        },
+        type: 'UserMetadataV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+
+    await userRepo.deleteMetadata(auth.user.id, UserMetadataKey.ONBOARDING);
+
+    await expect(ctx.syncStream(auth, [SyncRequestType.UserMetadataV1])).resolves.toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          userId: user.id,
+          key: UserMetadataKey.ONBOARDING,
+        },
+        type: 'UserMetadataDeleteV1',
+      },
+    ]);
+  });
+});

From 47c0dc0d7ee5709fd67e47ee1045489ab5df68bd Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 11 Jul 2025 17:32:10 -0400
Subject: [PATCH 194/337] feat: nightly tasks (#19879)

---
 e2e/src/api/specs/system-config.e2e-spec.ts   |   6 -
 i18n/en.json                                  |  14 ++
 mobile/openapi/README.md                      |   1 +
 mobile/openapi/lib/api.dart                   |   1 +
 mobile/openapi/lib/api_client.dart            |   2 +
 .../openapi/lib/model/system_config_dto.dart  |  10 +-
 .../system_config_nightly_tasks_dto.dart      | 139 ++++++++++++++++++
 open-api/immich-openapi-specs.json            |  35 +++++
 open-api/typescript-sdk/src/fetch-client.ts   |   9 ++
 server/src/config.ts                          |  16 ++
 .../system-config.controller.spec.ts          |  74 ++++++++++
 server/src/dtos/system-config.dto.ts          |  27 +++-
 server/src/enum.ts                            |   6 +
 server/src/services/api.service.ts            |   7 +-
 server/src/services/job.service.spec.ts       |  10 +-
 server/src/services/job.service.ts            | 111 ++++++++++----
 server/src/services/library.service.spec.ts   |  12 +-
 server/src/services/library.service.ts        |   6 +-
 .../services/system-config.service.spec.ts    |   8 +
 .../nightly-tasks-settings.svelte             |  81 ++++++++++
 .../routes/admin/system-settings/+page.svelte |  23 ++-
 21 files changed, 538 insertions(+), 60 deletions(-)
 create mode 100644 mobile/openapi/lib/model/system_config_nightly_tasks_dto.dart
 create mode 100644 server/src/controllers/system-config.controller.spec.ts
 create mode 100644 web/src/lib/components/admin-page/settings/nightly-tasks-settings/nightly-tasks-settings.svelte

diff --git a/e2e/src/api/specs/system-config.e2e-spec.ts b/e2e/src/api/specs/system-config.e2e-spec.ts
index 060163d7c9..1bd7bdc489 100644
--- a/e2e/src/api/specs/system-config.e2e-spec.ts
+++ b/e2e/src/api/specs/system-config.e2e-spec.ts
@@ -15,12 +15,6 @@ describe('/system-config', () => {
   });
 
   describe('PUT /system-config', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put('/system-config');
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
     it('should always return the new config', async () => {
       const config = await getSystemConfig(admin.accessToken);
 
diff --git a/i18n/en.json b/i18n/en.json
index 06b3a5d599..f547a4e48d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Manage metadata settings",
     "migration_job": "Migration",
     "migration_job_description": "Migrate thumbnails for assets and faces to the latest folder structure",
+    "nightly_tasks_cluster_faces_setting_description": "Run facial recognition on newly detected faces",
+    "nightly_tasks_cluster_new_faces_setting": "Cluster new faces",
+    "nightly_tasks_database_cleanup_setting": "Database cleanup tasks",
+    "nightly_tasks_database_cleanup_setting_description": "Clean up old, expired data from the database",
+    "nightly_tasks_generate_memories_setting": "Generate memories",
+    "nightly_tasks_generate_memories_setting_description": "Create new memories from assets",
+    "nightly_tasks_missing_thumbnails_setting": "Generate missing thumbnails",
+    "nightly_tasks_missing_thumbnails_setting_description": "Queue assets without thumbnails for thumbnail generation",
+    "nightly_tasks_settings": "Nightly Tasks Settings",
+    "nightly_tasks_settings_description": "Manage nightly tasks",
+    "nightly_tasks_start_time_setting": "Start time",
+    "nightly_tasks_start_time_setting_description": "The time at which the server starts running the nightly tasks",
+    "nightly_tasks_sync_quota_usage_setting": "Sync quota usage",
+    "nightly_tasks_sync_quota_usage_setting_description": "Update user storage quota, based on current usage",
     "no_paths_added": "No paths added",
     "no_pattern_added": "No pattern added",
     "note_apply_storage_label_previous_assets": "Note: To apply the Storage Label to previously uploaded assets, run the",
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 5085052c05..28fa63ba84 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -509,6 +509,7 @@ Class | Method | HTTP request | Description
  - [SystemConfigMapDto](doc//SystemConfigMapDto.md)
  - [SystemConfigMetadataDto](doc//SystemConfigMetadataDto.md)
  - [SystemConfigNewVersionCheckDto](doc//SystemConfigNewVersionCheckDto.md)
+ - [SystemConfigNightlyTasksDto](doc//SystemConfigNightlyTasksDto.md)
  - [SystemConfigNotificationsDto](doc//SystemConfigNotificationsDto.md)
  - [SystemConfigOAuthDto](doc//SystemConfigOAuthDto.md)
  - [SystemConfigPasswordLoginDto](doc//SystemConfigPasswordLoginDto.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index f30481ecce..becafa06bf 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -291,6 +291,7 @@ part 'model/system_config_machine_learning_dto.dart';
 part 'model/system_config_map_dto.dart';
 part 'model/system_config_metadata_dto.dart';
 part 'model/system_config_new_version_check_dto.dart';
+part 'model/system_config_nightly_tasks_dto.dart';
 part 'model/system_config_notifications_dto.dart';
 part 'model/system_config_o_auth_dto.dart';
 part 'model/system_config_password_login_dto.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index f1cf05f110..603163f00e 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -638,6 +638,8 @@ class ApiClient {
           return SystemConfigMetadataDto.fromJson(value);
         case 'SystemConfigNewVersionCheckDto':
           return SystemConfigNewVersionCheckDto.fromJson(value);
+        case 'SystemConfigNightlyTasksDto':
+          return SystemConfigNightlyTasksDto.fromJson(value);
         case 'SystemConfigNotificationsDto':
           return SystemConfigNotificationsDto.fromJson(value);
         case 'SystemConfigOAuthDto':
diff --git a/mobile/openapi/lib/model/system_config_dto.dart b/mobile/openapi/lib/model/system_config_dto.dart
index 59d5f09fc9..38dbb30f0c 100644
--- a/mobile/openapi/lib/model/system_config_dto.dart
+++ b/mobile/openapi/lib/model/system_config_dto.dart
@@ -23,6 +23,7 @@ class SystemConfigDto {
     required this.map,
     required this.metadata,
     required this.newVersionCheck,
+    required this.nightlyTasks,
     required this.notifications,
     required this.oauth,
     required this.passwordLogin,
@@ -55,6 +56,8 @@ class SystemConfigDto {
 
   SystemConfigNewVersionCheckDto newVersionCheck;
 
+  SystemConfigNightlyTasksDto nightlyTasks;
+
   SystemConfigNotificationsDto notifications;
 
   SystemConfigOAuthDto oauth;
@@ -87,6 +90,7 @@ class SystemConfigDto {
     other.map == map &&
     other.metadata == metadata &&
     other.newVersionCheck == newVersionCheck &&
+    other.nightlyTasks == nightlyTasks &&
     other.notifications == notifications &&
     other.oauth == oauth &&
     other.passwordLogin == passwordLogin &&
@@ -111,6 +115,7 @@ class SystemConfigDto {
     (map.hashCode) +
     (metadata.hashCode) +
     (newVersionCheck.hashCode) +
+    (nightlyTasks.hashCode) +
     (notifications.hashCode) +
     (oauth.hashCode) +
     (passwordLogin.hashCode) +
@@ -123,7 +128,7 @@ class SystemConfigDto {
     (user.hashCode);
 
   @override
-  String toString() => 'SystemConfigDto[backup=$backup, ffmpeg=$ffmpeg, image=$image, job=$job, library_=$library_, logging=$logging, machineLearning=$machineLearning, map=$map, metadata=$metadata, newVersionCheck=$newVersionCheck, notifications=$notifications, oauth=$oauth, passwordLogin=$passwordLogin, reverseGeocoding=$reverseGeocoding, server=$server, storageTemplate=$storageTemplate, templates=$templates, theme=$theme, trash=$trash, user=$user]';
+  String toString() => 'SystemConfigDto[backup=$backup, ffmpeg=$ffmpeg, image=$image, job=$job, library_=$library_, logging=$logging, machineLearning=$machineLearning, map=$map, metadata=$metadata, newVersionCheck=$newVersionCheck, nightlyTasks=$nightlyTasks, notifications=$notifications, oauth=$oauth, passwordLogin=$passwordLogin, reverseGeocoding=$reverseGeocoding, server=$server, storageTemplate=$storageTemplate, templates=$templates, theme=$theme, trash=$trash, user=$user]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -137,6 +142,7 @@ class SystemConfigDto {
       json[r'map'] = this.map;
       json[r'metadata'] = this.metadata;
       json[r'newVersionCheck'] = this.newVersionCheck;
+      json[r'nightlyTasks'] = this.nightlyTasks;
       json[r'notifications'] = this.notifications;
       json[r'oauth'] = this.oauth;
       json[r'passwordLogin'] = this.passwordLogin;
@@ -169,6 +175,7 @@ class SystemConfigDto {
         map: SystemConfigMapDto.fromJson(json[r'map'])!,
         metadata: SystemConfigMetadataDto.fromJson(json[r'metadata'])!,
         newVersionCheck: SystemConfigNewVersionCheckDto.fromJson(json[r'newVersionCheck'])!,
+        nightlyTasks: SystemConfigNightlyTasksDto.fromJson(json[r'nightlyTasks'])!,
         notifications: SystemConfigNotificationsDto.fromJson(json[r'notifications'])!,
         oauth: SystemConfigOAuthDto.fromJson(json[r'oauth'])!,
         passwordLogin: SystemConfigPasswordLoginDto.fromJson(json[r'passwordLogin'])!,
@@ -236,6 +243,7 @@ class SystemConfigDto {
     'map',
     'metadata',
     'newVersionCheck',
+    'nightlyTasks',
     'notifications',
     'oauth',
     'passwordLogin',
diff --git a/mobile/openapi/lib/model/system_config_nightly_tasks_dto.dart b/mobile/openapi/lib/model/system_config_nightly_tasks_dto.dart
new file mode 100644
index 0000000000..ab7b4b37c2
--- /dev/null
+++ b/mobile/openapi/lib/model/system_config_nightly_tasks_dto.dart
@@ -0,0 +1,139 @@
+//
+// 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 SystemConfigNightlyTasksDto {
+  /// Returns a new [SystemConfigNightlyTasksDto] instance.
+  SystemConfigNightlyTasksDto({
+    required this.clusterNewFaces,
+    required this.databaseCleanup,
+    required this.generateMemories,
+    required this.missingThumbnails,
+    required this.startTime,
+    required this.syncQuotaUsage,
+  });
+
+  bool clusterNewFaces;
+
+  bool databaseCleanup;
+
+  bool generateMemories;
+
+  bool missingThumbnails;
+
+  String startTime;
+
+  bool syncQuotaUsage;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SystemConfigNightlyTasksDto &&
+    other.clusterNewFaces == clusterNewFaces &&
+    other.databaseCleanup == databaseCleanup &&
+    other.generateMemories == generateMemories &&
+    other.missingThumbnails == missingThumbnails &&
+    other.startTime == startTime &&
+    other.syncQuotaUsage == syncQuotaUsage;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (clusterNewFaces.hashCode) +
+    (databaseCleanup.hashCode) +
+    (generateMemories.hashCode) +
+    (missingThumbnails.hashCode) +
+    (startTime.hashCode) +
+    (syncQuotaUsage.hashCode);
+
+  @override
+  String toString() => 'SystemConfigNightlyTasksDto[clusterNewFaces=$clusterNewFaces, databaseCleanup=$databaseCleanup, generateMemories=$generateMemories, missingThumbnails=$missingThumbnails, startTime=$startTime, syncQuotaUsage=$syncQuotaUsage]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'clusterNewFaces'] = this.clusterNewFaces;
+      json[r'databaseCleanup'] = this.databaseCleanup;
+      json[r'generateMemories'] = this.generateMemories;
+      json[r'missingThumbnails'] = this.missingThumbnails;
+      json[r'startTime'] = this.startTime;
+      json[r'syncQuotaUsage'] = this.syncQuotaUsage;
+    return json;
+  }
+
+  /// Returns a new [SystemConfigNightlyTasksDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SystemConfigNightlyTasksDto? fromJson(dynamic value) {
+    upgradeDto(value, "SystemConfigNightlyTasksDto");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SystemConfigNightlyTasksDto(
+        clusterNewFaces: mapValueOfType<bool>(json, r'clusterNewFaces')!,
+        databaseCleanup: mapValueOfType<bool>(json, r'databaseCleanup')!,
+        generateMemories: mapValueOfType<bool>(json, r'generateMemories')!,
+        missingThumbnails: mapValueOfType<bool>(json, r'missingThumbnails')!,
+        startTime: mapValueOfType<String>(json, r'startTime')!,
+        syncQuotaUsage: mapValueOfType<bool>(json, r'syncQuotaUsage')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SystemConfigNightlyTasksDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SystemConfigNightlyTasksDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SystemConfigNightlyTasksDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SystemConfigNightlyTasksDto> mapFromJson(dynamic json) {
+    final map = <String, SystemConfigNightlyTasksDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SystemConfigNightlyTasksDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SystemConfigNightlyTasksDto-objects as value to a dart map
+  static Map<String, List<SystemConfigNightlyTasksDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SystemConfigNightlyTasksDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SystemConfigNightlyTasksDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'clusterNewFaces',
+    'databaseCleanup',
+    'generateMemories',
+    'missingThumbnails',
+    'startTime',
+    'syncQuotaUsage',
+  };
+}
+
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 18204c21f3..492d3cfec1 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -14318,6 +14318,9 @@
           "newVersionCheck": {
             "$ref": "#/components/schemas/SystemConfigNewVersionCheckDto"
           },
+          "nightlyTasks": {
+            "$ref": "#/components/schemas/SystemConfigNightlyTasksDto"
+          },
           "notifications": {
             "$ref": "#/components/schemas/SystemConfigNotificationsDto"
           },
@@ -14360,6 +14363,7 @@
           "map",
           "metadata",
           "newVersionCheck",
+          "nightlyTasks",
           "notifications",
           "oauth",
           "passwordLogin",
@@ -14790,6 +14794,37 @@
         ],
         "type": "object"
       },
+      "SystemConfigNightlyTasksDto": {
+        "properties": {
+          "clusterNewFaces": {
+            "type": "boolean"
+          },
+          "databaseCleanup": {
+            "type": "boolean"
+          },
+          "generateMemories": {
+            "type": "boolean"
+          },
+          "missingThumbnails": {
+            "type": "boolean"
+          },
+          "startTime": {
+            "type": "string"
+          },
+          "syncQuotaUsage": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "clusterNewFaces",
+          "databaseCleanup",
+          "generateMemories",
+          "missingThumbnails",
+          "startTime",
+          "syncQuotaUsage"
+        ],
+        "type": "object"
+      },
       "SystemConfigNotificationsDto": {
         "properties": {
           "smtp": {
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 88dee9bf0b..f60fa6dfe8 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1389,6 +1389,14 @@ export type SystemConfigMetadataDto = {
 export type SystemConfigNewVersionCheckDto = {
     enabled: boolean;
 };
+export type SystemConfigNightlyTasksDto = {
+    clusterNewFaces: boolean;
+    databaseCleanup: boolean;
+    generateMemories: boolean;
+    missingThumbnails: boolean;
+    startTime: string;
+    syncQuotaUsage: boolean;
+};
 export type SystemConfigNotificationsDto = {
     smtp: SystemConfigSmtpDto;
 };
@@ -1457,6 +1465,7 @@ export type SystemConfigDto = {
     map: SystemConfigMapDto;
     metadata: SystemConfigMetadataDto;
     newVersionCheck: SystemConfigNewVersionCheckDto;
+    nightlyTasks: SystemConfigNightlyTasksDto;
     notifications: SystemConfigNotificationsDto;
     oauth: SystemConfigOAuthDto;
     passwordLogin: SystemConfigPasswordLoginDto;
diff --git a/server/src/config.ts b/server/src/config.ts
index 1fcc2e9782..90ca2c1529 100644
--- a/server/src/config.ts
+++ b/server/src/config.ts
@@ -121,6 +121,14 @@ export interface SystemConfig {
   newVersionCheck: {
     enabled: boolean;
   };
+  nightlyTasks: {
+    startTime: string;
+    databaseCleanup: boolean;
+    missingThumbnails: boolean;
+    clusterNewFaces: boolean;
+    generateMemories: boolean;
+    syncQuotaUsage: boolean;
+  };
   trash: {
     enabled: boolean;
     days: number;
@@ -298,6 +306,14 @@ export const defaults = Object.freeze<SystemConfig>({
   newVersionCheck: {
     enabled: true,
   },
+  nightlyTasks: {
+    startTime: '00:00',
+    databaseCleanup: true,
+    generateMemories: true,
+    syncQuotaUsage: true,
+    missingThumbnails: true,
+    clusterNewFaces: true,
+  },
   trash: {
     enabled: true,
     days: 30,
diff --git a/server/src/controllers/system-config.controller.spec.ts b/server/src/controllers/system-config.controller.spec.ts
new file mode 100644
index 0000000000..48b8c1bcf0
--- /dev/null
+++ b/server/src/controllers/system-config.controller.spec.ts
@@ -0,0 +1,74 @@
+import _ from 'lodash';
+import { defaults } from 'src/config';
+import { SystemConfigController } from 'src/controllers/system-config.controller';
+import { StorageTemplateService } from 'src/services/storage-template.service';
+import { SystemConfigService } from 'src/services/system-config.service';
+import request from 'supertest';
+import { errorDto } from 'test/medium/responses';
+import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils';
+
+describe(SystemConfigController.name, () => {
+  let ctx: ControllerContext;
+  const systemConfigService = mockBaseService(SystemConfigService);
+  const templateService = mockBaseService(StorageTemplateService);
+
+  beforeAll(async () => {
+    ctx = await controllerSetup(SystemConfigController, [
+      { provide: SystemConfigService, useValue: systemConfigService },
+      { provide: StorageTemplateService, useValue: templateService },
+    ]);
+    return () => ctx.close();
+  });
+
+  beforeEach(() => {
+    systemConfigService.resetAllMocks();
+    templateService.resetAllMocks();
+    ctx.reset();
+  });
+
+  describe('GET /system-config', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).get('/system-config');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+  });
+
+  describe('GET /system-config/defaults', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).get('/system-config/defaults');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+  });
+
+  describe('PUT /system-config', () => {
+    it('should be an authenticated route', async () => {
+      await request(ctx.getHttpServer()).put('/system-config');
+      expect(ctx.authenticate).toHaveBeenCalled();
+    });
+
+    describe('nightlyTasks', () => {
+      it('should validate nightly jobs start time', async () => {
+        const config = _.cloneDeep(defaults);
+        config.nightlyTasks.startTime = 'invalid';
+        const { status, body } = await request(ctx.getHttpServer()).put('/system-config').send(config);
+        expect(status).toBe(400);
+        expect(body).toEqual(errorDto.badRequest(['nightlyTasks.startTime must be in HH:mm format']));
+      });
+
+      it('should accept a valid time', async () => {
+        const config = _.cloneDeep(defaults);
+        config.nightlyTasks.startTime = '05:05';
+        const { status } = await request(ctx.getHttpServer()).put('/system-config').send(config);
+        expect(status).toBe(200);
+      });
+
+      it('should validate a boolean field', async () => {
+        const config = _.cloneDeep(defaults);
+        (config.nightlyTasks.databaseCleanup as any) = 'invalid';
+        const { status, body } = await request(ctx.getHttpServer()).put('/system-config').send(config);
+        expect(status).toBe(400);
+        expect(body).toEqual(errorDto.badRequest(['nightlyTasks.databaseCleanup must be a boolean value']));
+      });
+    });
+  });
+});
diff --git a/server/src/dtos/system-config.dto.ts b/server/src/dtos/system-config.dto.ts
index b0385984b4..49c5e5b4e7 100644
--- a/server/src/dtos/system-config.dto.ts
+++ b/server/src/dtos/system-config.dto.ts
@@ -34,7 +34,7 @@ import {
   VideoContainer,
 } from 'src/enum';
 import { ConcurrentQueueName } from 'src/types';
-import { IsCronExpression, Optional, ValidateBoolean } from 'src/validation';
+import { IsCronExpression, IsDateStringFormat, Optional, ValidateBoolean } from 'src/validation';
 
 const isLibraryScanEnabled = (config: SystemConfigLibraryScanDto) => config.enabled;
 const isOAuthEnabled = (config: SystemConfigOAuthDto) => config.enabled;
@@ -329,6 +329,26 @@ class SystemConfigNewVersionCheckDto {
   enabled!: boolean;
 }
 
+class SystemConfigNightlyTasksDto {
+  @IsDateStringFormat('HH:mm', { message: 'startTime must be in HH:mm format' })
+  startTime!: string;
+
+  @ValidateBoolean()
+  databaseCleanup!: boolean;
+
+  @ValidateBoolean()
+  missingThumbnails!: boolean;
+
+  @ValidateBoolean()
+  clusterNewFaces!: boolean;
+
+  @ValidateBoolean()
+  generateMemories!: boolean;
+
+  @ValidateBoolean()
+  syncQuotaUsage!: boolean;
+}
+
 class SystemConfigOAuthDto {
   @ValidateBoolean()
   autoLaunch!: boolean;
@@ -638,6 +658,11 @@ export class SystemConfigDto implements SystemConfig {
   @IsObject()
   newVersionCheck!: SystemConfigNewVersionCheckDto;
 
+  @Type(() => SystemConfigNightlyTasksDto)
+  @ValidateNested()
+  @IsObject()
+  nightlyTasks!: SystemConfigNightlyTasksDto;
+
   @Type(() => SystemConfigOAuthDto)
   @ValidateNested()
   @IsObject()
diff --git a/server/src/enum.ts b/server/src/enum.ts
index dca0f09555..d7c74a71c6 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -567,6 +567,7 @@ export enum DatabaseLock {
   VersionHistory = 500,
   CLIPDimSize = 512,
   Library = 1337,
+  NightlyJobs = 600,
   GetSystemConfig = 69,
   BackupDatabase = 42,
   MemoryCreation = 777,
@@ -684,3 +685,8 @@ export enum AssetVisibility {
   HIDDEN = 'hidden',
   LOCKED = 'locked',
 }
+
+export enum CronJob {
+  LibraryScan = 'LibraryScan',
+  NightlyJobs = 'NightlyJobs',
+}
diff --git a/server/src/services/api.service.ts b/server/src/services/api.service.ts
index 064b2e268d..27a776e867 100644
--- a/server/src/services/api.service.ts
+++ b/server/src/services/api.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { Cron, CronExpression, Interval } from '@nestjs/schedule';
+import { Interval } from '@nestjs/schedule';
 import { NextFunction, Request, Response } from 'express';
 import { readFileSync } from 'node:fs';
 import sanitizeHtml from 'sanitize-html';
@@ -54,11 +54,6 @@ export class ApiService {
     await this.versionService.handleQueueVersionCheck();
   }
 
-  @Cron(CronExpression.EVERY_DAY_AT_MIDNIGHT)
-  async onNightlyJob() {
-    await this.jobService.handleNightlyJobs();
-  }
-
   ssr(excludePaths: string[]) {
     const { resourcePaths } = this.configRepository.getEnv();
 
diff --git a/server/src/services/job.service.spec.ts b/server/src/services/job.service.spec.ts
index c9020ed96a..a18eccdd8b 100644
--- a/server/src/services/job.service.spec.ts
+++ b/server/src/services/job.service.spec.ts
@@ -41,12 +41,12 @@ describe(JobService.name, () => {
         { name: JobName.USER_DELETE_CHECK },
         { name: JobName.PERSON_CLEANUP },
         { name: JobName.MEMORIES_CLEANUP },
-        { name: JobName.MEMORIES_CREATE },
-        { name: JobName.QUEUE_GENERATE_THUMBNAILS, data: { force: false } },
-        { name: JobName.CLEAN_OLD_AUDIT_LOGS },
-        { name: JobName.USER_SYNC_USAGE },
-        { name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false, nightly: true } },
         { name: JobName.CLEAN_OLD_SESSION_TOKENS },
+        { name: JobName.CLEAN_OLD_AUDIT_LOGS },
+        { name: JobName.MEMORIES_CREATE },
+        { name: JobName.USER_SYNC_USAGE },
+        { name: JobName.QUEUE_GENERATE_THUMBNAILS, data: { force: false } },
+        { name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false, nightly: true } },
       ]);
     });
   });
diff --git a/server/src/services/job.service.ts b/server/src/services/job.service.ts
index e4b20ba37f..645b22249f 100644
--- a/server/src/services/job.service.ts
+++ b/server/src/services/job.service.ts
@@ -1,6 +1,7 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { ClassConstructor } from 'class-transformer';
 import { snakeCase } from 'lodash';
+import { SystemConfig } from 'src/config';
 import { OnEvent } from 'src/decorators';
 import { mapAsset } from 'src/dtos/asset-response.dto';
 import { AllJobStatusResponseDto, JobCommandDto, JobCreateDto, JobStatusDto } from 'src/dtos/job.dto';
@@ -8,6 +9,8 @@ import {
   AssetType,
   AssetVisibility,
   BootstrapEventPriority,
+  CronJob,
+  DatabaseLock,
   ImmichWorker,
   JobCommand,
   JobName,
@@ -20,6 +23,7 @@ import { ArgOf, ArgsOf } from 'src/repositories/event.repository';
 import { BaseService } from 'src/services/base.service';
 import { ConcurrentQueueName, JobItem } from 'src/types';
 import { hexOrBufferToBase64 } from 'src/utils/bytes';
+import { handlePromiseError } from 'src/utils/misc';
 
 const asJobItem = (dto: JobCreateDto): JobItem => {
   switch (dto.name) {
@@ -53,12 +57,59 @@ const asJobItem = (dto: JobCreateDto): JobItem => {
   }
 };
 
+const asNightlyTasksCron = (config: SystemConfig) => {
+  const [hours, minutes] = config.nightlyTasks.startTime.split(':').map(Number);
+  return `${minutes} ${hours} * * *`;
+};
+
 @Injectable()
 export class JobService extends BaseService {
   private services: ClassConstructor<unknown>[] = [];
+  private nightlyJobsLock = false;
 
-  @OnEvent({ name: 'config.init', workers: [ImmichWorker.MICROSERVICES] })
-  onConfigInit({ newConfig: config }: ArgOf<'config.init'>) {
+  @OnEvent({ name: 'config.init' })
+  async onConfigInit({ newConfig: config }: ArgOf<'config.init'>) {
+    if (this.worker === ImmichWorker.MICROSERVICES) {
+      this.updateQueueConcurrency(config);
+      return;
+    }
+
+    this.nightlyJobsLock = await this.databaseRepository.tryLock(DatabaseLock.NightlyJobs);
+    if (this.nightlyJobsLock) {
+      const cronExpression = asNightlyTasksCron(config);
+      this.logger.debug(`Scheduling nightly jobs for ${cronExpression}`);
+      this.cronRepository.create({
+        name: CronJob.NightlyJobs,
+        expression: cronExpression,
+        start: true,
+        onTick: () => handlePromiseError(this.handleNightlyJobs(), this.logger),
+      });
+    }
+  }
+
+  @OnEvent({ name: 'config.update', server: true })
+  onConfigUpdate({ newConfig: config }: ArgOf<'config.update'>) {
+    if (this.worker === ImmichWorker.MICROSERVICES) {
+      this.updateQueueConcurrency(config);
+      return;
+    }
+
+    if (this.nightlyJobsLock) {
+      const cronExpression = asNightlyTasksCron(config);
+      this.logger.debug(`Scheduling nightly jobs for ${cronExpression}`);
+      this.cronRepository.update({ name: CronJob.NightlyJobs, expression: cronExpression, start: true });
+    }
+  }
+
+  @OnEvent({ name: 'app.bootstrap', priority: BootstrapEventPriority.JobService })
+  onBootstrap() {
+    this.jobRepository.setup(this.services);
+    if (this.worker === ImmichWorker.MICROSERVICES) {
+      this.jobRepository.startWorkers();
+    }
+  }
+
+  private updateQueueConcurrency(config: SystemConfig) {
     this.logger.debug(`Updating queue concurrency settings`);
     for (const queueName of Object.values(QueueName)) {
       let concurrency = 1;
@@ -70,19 +121,6 @@ export class JobService extends BaseService {
     }
   }
 
-  @OnEvent({ name: 'config.update', server: true, workers: [ImmichWorker.MICROSERVICES] })
-  onConfigUpdate({ newConfig: config }: ArgOf<'config.update'>) {
-    this.onConfigInit({ newConfig: config });
-  }
-
-  @OnEvent({ name: 'app.bootstrap', priority: BootstrapEventPriority.JobService })
-  onBootstrap() {
-    this.jobRepository.setup(this.services);
-    if (this.worker === ImmichWorker.MICROSERVICES) {
-      this.jobRepository.startWorkers();
-    }
-  }
-
   setServices(services: ClassConstructor<unknown>[]) {
     this.services = services;
   }
@@ -233,18 +271,37 @@ export class JobService extends BaseService {
   }
 
   async handleNightlyJobs() {
-    await this.jobRepository.queueAll([
-      { name: JobName.ASSET_DELETION_CHECK },
-      { name: JobName.USER_DELETE_CHECK },
-      { name: JobName.PERSON_CLEANUP },
-      { name: JobName.MEMORIES_CLEANUP },
-      { name: JobName.MEMORIES_CREATE },
-      { name: JobName.QUEUE_GENERATE_THUMBNAILS, data: { force: false } },
-      { name: JobName.CLEAN_OLD_AUDIT_LOGS },
-      { name: JobName.USER_SYNC_USAGE },
-      { name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false, nightly: true } },
-      { name: JobName.CLEAN_OLD_SESSION_TOKENS },
-    ]);
+    const config = await this.getConfig({ withCache: false });
+    const jobs: JobItem[] = [];
+
+    if (config.nightlyTasks.databaseCleanup) {
+      jobs.push(
+        { name: JobName.ASSET_DELETION_CHECK },
+        { name: JobName.USER_DELETE_CHECK },
+        { name: JobName.PERSON_CLEANUP },
+        { name: JobName.MEMORIES_CLEANUP },
+        { name: JobName.CLEAN_OLD_SESSION_TOKENS },
+        { name: JobName.CLEAN_OLD_AUDIT_LOGS },
+      );
+    }
+
+    if (config.nightlyTasks.generateMemories) {
+      jobs.push({ name: JobName.MEMORIES_CREATE });
+    }
+
+    if (config.nightlyTasks.syncQuotaUsage) {
+      jobs.push({ name: JobName.USER_SYNC_USAGE });
+    }
+
+    if (config.nightlyTasks.missingThumbnails) {
+      jobs.push({ name: JobName.QUEUE_GENERATE_THUMBNAILS, data: { force: false } });
+    }
+
+    if (config.nightlyTasks.clusterNewFaces) {
+      jobs.push({ name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false, nightly: true } });
+    }
+
+    await this.jobRepository.queueAll(jobs);
   }
 
   /**
diff --git a/server/src/services/library.service.spec.ts b/server/src/services/library.service.spec.ts
index e92cdcf200..ab69e22b99 100644
--- a/server/src/services/library.service.spec.ts
+++ b/server/src/services/library.service.spec.ts
@@ -3,7 +3,7 @@ import { Stats } from 'node:fs';
 import { defaults, SystemConfig } from 'src/config';
 import { JOBS_LIBRARY_PAGINATION_SIZE } from 'src/constants';
 import { mapLibrary } from 'src/dtos/library.dto';
-import { AssetType, ImmichWorker, JobName, JobStatus } from 'src/enum';
+import { AssetType, CronJob, ImmichWorker, JobName, JobStatus } from 'src/enum';
 import { LibraryService } from 'src/services/library.service';
 import { ILibraryBulkIdsJob, ILibraryFileJob } from 'src/types';
 import { assetStub } from 'test/fixtures/asset.stub';
@@ -56,7 +56,11 @@ describe(LibraryService.name, () => {
         } as SystemConfig,
       });
 
-      expect(mocks.cron.update).toHaveBeenCalledWith({ name: 'libraryScan', expression: '0 1 * * *', start: true });
+      expect(mocks.cron.update).toHaveBeenCalledWith({
+        name: CronJob.LibraryScan,
+        expression: '0 1 * * *',
+        start: true,
+      });
     });
 
     it('should initialize watcher for all external libraries', async () => {
@@ -128,7 +132,7 @@ describe(LibraryService.name, () => {
       });
 
       expect(mocks.cron.update).toHaveBeenCalledWith({
-        name: 'libraryScan',
+        name: CronJob.LibraryScan,
         expression: systemConfigStub.libraryScan.library.scan.cronExpression,
         start: systemConfigStub.libraryScan.library.scan.enabled,
       });
@@ -149,7 +153,7 @@ describe(LibraryService.name, () => {
       });
 
       expect(mocks.cron.update).toHaveBeenCalledWith({
-        name: 'libraryScan',
+        name: CronJob.LibraryScan,
         expression: systemConfigStub.libraryScan.library.scan.cronExpression,
         start: systemConfigStub.libraryScan.library.scan.enabled,
       });
diff --git a/server/src/services/library.service.ts b/server/src/services/library.service.ts
index 8c7f79ee5c..f6bc5b2ebb 100644
--- a/server/src/services/library.service.ts
+++ b/server/src/services/library.service.ts
@@ -17,7 +17,7 @@ import {
   ValidateLibraryImportPathResponseDto,
   ValidateLibraryResponseDto,
 } from 'src/dtos/library.dto';
-import { AssetStatus, AssetType, DatabaseLock, ImmichWorker, JobName, JobStatus, QueueName } from 'src/enum';
+import { AssetStatus, AssetType, CronJob, DatabaseLock, ImmichWorker, JobName, JobStatus, QueueName } from 'src/enum';
 import { ArgOf } from 'src/repositories/event.repository';
 import { AssetSyncResult } from 'src/repositories/library.repository';
 import { AssetTable } from 'src/schema/tables/asset.table';
@@ -45,7 +45,7 @@ export class LibraryService extends BaseService {
 
     if (this.lock) {
       this.cronRepository.create({
-        name: 'libraryScan',
+        name: CronJob.LibraryScan,
         expression: scan.cronExpression,
         onTick: () =>
           handlePromiseError(this.jobRepository.queue({ name: JobName.LIBRARY_QUEUE_SCAN_ALL }), this.logger),
@@ -65,7 +65,7 @@ export class LibraryService extends BaseService {
     }
 
     this.cronRepository.update({
-      name: 'libraryScan',
+      name: CronJob.LibraryScan,
       expression: library.scan.cronExpression,
       start: library.scan.enabled,
     });
diff --git a/server/src/services/system-config.service.spec.ts b/server/src/services/system-config.service.spec.ts
index c7b98cc990..43be323459 100644
--- a/server/src/services/system-config.service.spec.ts
+++ b/server/src/services/system-config.service.spec.ts
@@ -103,6 +103,14 @@ const updatedConfig = Object.freeze<SystemConfig>({
     lightStyle: 'https://tiles.immich.cloud/v1/style/light.json',
     darkStyle: 'https://tiles.immich.cloud/v1/style/dark.json',
   },
+  nightlyTasks: {
+    startTime: '00:00',
+    databaseCleanup: true,
+    clusterNewFaces: true,
+    missingThumbnails: true,
+    generateMemories: true,
+    syncQuotaUsage: true,
+  },
   reverseGeocoding: {
     enabled: true,
   },
diff --git a/web/src/lib/components/admin-page/settings/nightly-tasks-settings/nightly-tasks-settings.svelte b/web/src/lib/components/admin-page/settings/nightly-tasks-settings/nightly-tasks-settings.svelte
new file mode 100644
index 0000000000..af653f2473
--- /dev/null
+++ b/web/src/lib/components/admin-page/settings/nightly-tasks-settings/nightly-tasks-settings.svelte
@@ -0,0 +1,81 @@
+<script lang="ts">
+  import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
+  import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
+  import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
+  import { SettingInputFieldType } from '$lib/constants';
+  import type { SystemConfigDto } from '@immich/sdk';
+  import { isEqual } from 'lodash-es';
+  import { t } from 'svelte-i18n';
+  import { fade } from 'svelte/transition';
+  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
+
+  interface Props {
+    savedConfig: SystemConfigDto;
+    defaultConfig: SystemConfigDto;
+    config: SystemConfigDto;
+    disabled?: boolean;
+    onReset: SettingsResetEvent;
+    onSave: SettingsSaveEvent;
+  }
+
+  let { savedConfig, defaultConfig, config = $bindable(), disabled = false, onReset, onSave }: Props = $props();
+
+  const onsubmit = (event: Event) => {
+    event.preventDefault();
+  };
+</script>
+
+<div class="mt-2">
+  <div in:fade={{ duration: 500 }}>
+    <form autocomplete="off" {onsubmit} class="mx-4 mt-4">
+      <div class="ms-4 mt-4 flex flex-col gap-4">
+        <SettingInputField
+          inputType={SettingInputFieldType.TEXT}
+          label={$t('admin.nightly_tasks_start_time_setting')}
+          description={$t('admin.nightly_tasks_start_time_setting_description')}
+          bind:value={config.nightlyTasks.startTime}
+          required={true}
+          {disabled}
+          isEdited={!(config.nightlyTasks.startTime === savedConfig.nightlyTasks.startTime)}
+        />
+        <SettingSwitch
+          title={$t('admin.nightly_tasks_database_cleanup_setting')}
+          subtitle={$t('admin.nightly_tasks_database_cleanup_setting_description')}
+          bind:checked={config.nightlyTasks.databaseCleanup}
+          {disabled}
+        />
+        <SettingSwitch
+          title={$t('admin.nightly_tasks_missing_thumbnails_setting')}
+          subtitle={$t('admin.nightly_tasks_missing_thumbnails_setting_description')}
+          bind:checked={config.nightlyTasks.missingThumbnails}
+          {disabled}
+        />
+        <SettingSwitch
+          title={$t('admin.nightly_tasks_cluster_new_faces_setting')}
+          subtitle={$t('admin.nightly_tasks_cluster_faces_setting_description')}
+          bind:checked={config.nightlyTasks.clusterNewFaces}
+          {disabled}
+        />
+        <SettingSwitch
+          title={$t('admin.nightly_tasks_generate_memories_setting')}
+          subtitle={$t('admin.nightly_tasks_generate_memories_setting_description')}
+          bind:checked={config.nightlyTasks.generateMemories}
+          {disabled}
+        />
+        <SettingSwitch
+          title={$t('admin.nightly_tasks_sync_quota_usage_setting')}
+          subtitle={$t('admin.nightly_tasks_sync_quota_usage_setting_description')}
+          bind:checked={config.nightlyTasks.syncQuotaUsage}
+          {disabled}
+        />
+      </div>
+
+      <SettingButtonsRow
+        onReset={(options) => onReset({ ...options, configKeys: ['nightlyTasks'] })}
+        onSave={() => onSave({ nightlyTasks: config.nightlyTasks })}
+        showResetToDefault={!isEqual(savedConfig.nightlyTasks, defaultConfig.nightlyTasks)}
+        {disabled}
+      />
+    </form>
+  </div>
+</div>
diff --git a/web/src/routes/admin/system-settings/+page.svelte b/web/src/routes/admin/system-settings/+page.svelte
index e053eea179..3b1d68a49e 100644
--- a/web/src/routes/admin/system-settings/+page.svelte
+++ b/web/src/routes/admin/system-settings/+page.svelte
@@ -12,6 +12,7 @@
   import MapSettings from '$lib/components/admin-page/settings/map-settings/map-settings.svelte';
   import MetadataSettings from '$lib/components/admin-page/settings/metadata-settings/metadata-settings.svelte';
   import NewVersionCheckSettings from '$lib/components/admin-page/settings/new-version-check-settings/new-version-check-settings.svelte';
+  import NightlyTasksSettings from '$lib/components/admin-page/settings/nightly-tasks-settings/nightly-tasks-settings.svelte';
   import NotificationSettings from '$lib/components/admin-page/settings/notification-settings/notification-settings.svelte';
   import ServerSettings from '$lib/components/admin-page/settings/server/server-settings.svelte';
   import StorageTemplateSettings from '$lib/components/admin-page/settings/storage-template/storage-template-settings.svelte';
@@ -33,6 +34,7 @@
     mdiBackupRestore,
     mdiBellOutline,
     mdiBookshelf,
+    mdiClockOutline,
     mdiContentCopy,
     mdiDatabaseOutline,
     mdiDownload,
@@ -136,13 +138,6 @@
       key: 'job',
       icon: mdiSync,
     },
-    {
-      component: MetadataSettings,
-      title: $t('admin.metadata_settings'),
-      subtitle: $t('admin.metadata_settings_description'),
-      key: 'metadata',
-      icon: mdiDatabaseOutline,
-    },
     {
       component: LibrarySettings,
       title: $t('admin.library_settings'),
@@ -171,6 +166,20 @@
       key: 'location',
       icon: mdiMapMarkerOutline,
     },
+    {
+      component: MetadataSettings,
+      title: $t('admin.metadata_settings'),
+      subtitle: $t('admin.metadata_settings_description'),
+      key: 'metadata',
+      icon: mdiDatabaseOutline,
+    },
+    {
+      component: NightlyTasksSettings,
+      title: $t('admin.nightly_tasks_settings'),
+      subtitle: $t('admin.nightly_tasks_settings_description'),
+      key: 'nightly-tasks',
+      icon: mdiClockOutline,
+    },
     {
       component: NotificationSettings,
       title: $t('admin.notification_settings'),

From 04aab6ecce63c6020ccd568da29279c422dc09ac Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 23:32:35 +0200
Subject: [PATCH 195/337] chore(deps): update dependency vite to v7 (#19657)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
---
 cli/package-lock.json | 44 +++++++++++-----------
 cli/package.json      |  2 +-
 web/package-lock.json | 85 ++++++++++++++++++++++---------------------
 web/package.json      |  4 +-
 4 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/cli/package-lock.json b/cli/package-lock.json
index 0bb42db17c..d5884841cd 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -42,7 +42,7 @@
         "prettier-plugin-organize-imports": "^4.0.0",
         "typescript": "^5.3.3",
         "typescript-eslint": "^8.28.0",
-        "vite": "^6.0.0",
+        "vite": "^7.0.0",
         "vite-tsconfig-paths": "^5.0.0",
         "vitest": "^3.0.0",
         "vitest-fetch-mock": "^0.4.0",
@@ -3466,9 +3466,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "dev": true,
       "funding": [
         {
@@ -3486,7 +3486,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -4196,24 +4196,24 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.3.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
-      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.4.tgz",
+      "integrity": "sha512-SkaSguuS7nnmV7mfJ8l81JGBFV7Gvzp8IzgE8A8t23+AxuNX61Q5H1Tpz5efduSN7NHC8nQXD3sKQKZAu5mNEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
-        "fdir": "^6.4.4",
+        "fdir": "^6.4.6",
         "picomatch": "^4.0.2",
-        "postcss": "^8.5.3",
-        "rollup": "^4.34.9",
-        "tinyglobby": "^0.2.13"
+        "postcss": "^8.5.6",
+        "rollup": "^4.40.0",
+        "tinyglobby": "^0.2.14"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -4222,14 +4222,14 @@
         "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "@types/node": "^20.19.0 || >=22.12.0",
         "jiti": ">=1.21.0",
-        "less": "*",
+        "less": "^4.0.0",
         "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
+        "sass": "^1.70.0",
+        "sass-embedded": "^1.70.0",
+        "stylus": ">=0.54.8",
+        "sugarss": "^5.0.0",
         "terser": "^5.16.0",
         "tsx": "^4.8.1",
         "yaml": "^2.4.2"
@@ -4314,9 +4314,9 @@
       }
     },
     "node_modules/vite/node_modules/fdir": {
-      "version": "6.4.4",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
-      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
diff --git a/cli/package.json b/cli/package.json
index ca4ada2f65..e1f49475c0 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -36,7 +36,7 @@
     "prettier-plugin-organize-imports": "^4.0.0",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.28.0",
-    "vite": "^6.0.0",
+    "vite": "^7.0.0",
     "vite-tsconfig-paths": "^5.0.0",
     "vitest": "^3.0.0",
     "vitest-fetch-mock": "^0.4.0",
diff --git a/web/package-lock.json b/web/package-lock.json
index 14d292755f..6bf70e96da 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -52,7 +52,7 @@
         "@sveltejs/adapter-static": "^3.0.8",
         "@sveltejs/enhanced-img": "^0.6.0",
         "@sveltejs/kit": "^2.15.2",
-        "@sveltejs/vite-plugin-svelte": "^5.0.3",
+        "@sveltejs/vite-plugin-svelte": "^6.0.0",
         "@tailwindcss/vite": "^4.1.7",
         "@testing-library/jest-dom": "^6.4.2",
         "@testing-library/svelte": "^5.2.8",
@@ -87,7 +87,7 @@
         "tslib": "^2.6.2",
         "typescript": "^5.7.3",
         "typescript-eslint": "^8.28.0",
-        "vite": "^6.0.0",
+        "vite": "^7.0.0",
         "vitest": "^3.0.0"
       }
     },
@@ -2218,43 +2218,43 @@
       }
     },
     "node_modules/@sveltejs/vite-plugin-svelte": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-5.1.0.tgz",
-      "integrity": "sha512-wojIS/7GYnJDYIg1higWj2ROA6sSRWvcR1PO/bqEyFr/5UZah26c8Cz4u0NaqjPeVltzsVpt2Tm8d2io0V+4Tw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-6.0.0.tgz",
+      "integrity": "sha512-mma5GJ23pYiWpTNbN//g9XI3Hfob3aAlXPP42qRtvjgTAU6pfJyLyNPTdLjFuj+jfC9JslP4J3AkeiJNhjtLLA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@sveltejs/vite-plugin-svelte-inspector": "^4.0.1",
+        "@sveltejs/vite-plugin-svelte-inspector": "^5.0.0-next.1",
         "debug": "^4.4.1",
         "deepmerge": "^4.3.1",
         "kleur": "^4.1.5",
         "magic-string": "^0.30.17",
-        "vitefu": "^1.0.6"
+        "vitefu": "^1.1.1"
       },
       "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22"
+        "node": "^20.19 || ^22.12 || >=24"
       },
       "peerDependencies": {
         "svelte": "^5.0.0",
-        "vite": "^6.0.0"
+        "vite": "^6.3.0 || ^7.0.0"
       }
     },
     "node_modules/@sveltejs/vite-plugin-svelte-inspector": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-4.0.1.tgz",
-      "integrity": "sha512-J/Nmb2Q2y7mck2hyCX4ckVHcR5tu2J+MtBEQqpDrrgELZ2uvraQcK/ioCV61AqkdXFgriksOKIceDcQmqnGhVw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-5.0.0.tgz",
+      "integrity": "sha512-iwQ8Z4ET6ZFSt/gC+tVfcsSBHwsqc6RumSaiLUkAurW3BCpJam65cmHw0oOlDMTO0u+PZi9hilBRYN+LZNHTUQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "debug": "^4.3.7"
+        "debug": "^4.4.1"
       },
       "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22"
+        "node": "^20.19 || ^22.12 || >=24"
       },
       "peerDependencies": {
-        "@sveltejs/vite-plugin-svelte": "^5.0.0",
+        "@sveltejs/vite-plugin-svelte": "^6.0.0-next.0",
         "svelte": "^5.0.0",
-        "vite": "^6.0.0"
+        "vite": "^6.3.0 || ^7.0.0"
       }
     },
     "node_modules/@swc/helpers": {
@@ -5304,9 +5304,9 @@
       }
     },
     "node_modules/fdir": {
-      "version": "6.4.4",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
-      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -7601,9 +7601,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "dev": true,
       "funding": [
         {
@@ -7621,7 +7621,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -9476,24 +9476,24 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "6.3.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
-      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.4.tgz",
+      "integrity": "sha512-SkaSguuS7nnmV7mfJ8l81JGBFV7Gvzp8IzgE8A8t23+AxuNX61Q5H1Tpz5efduSN7NHC8nQXD3sKQKZAu5mNEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
-        "fdir": "^6.4.4",
+        "fdir": "^6.4.6",
         "picomatch": "^4.0.2",
-        "postcss": "^8.5.3",
-        "rollup": "^4.34.9",
-        "tinyglobby": "^0.2.13"
+        "postcss": "^8.5.6",
+        "rollup": "^4.40.0",
+        "tinyglobby": "^0.2.14"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -9502,14 +9502,14 @@
         "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "@types/node": "^20.19.0 || >=22.12.0",
         "jiti": ">=1.21.0",
-        "less": "*",
+        "less": "^4.0.0",
         "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
+        "sass": "^1.70.0",
+        "sass-embedded": "^1.70.0",
+        "stylus": ">=0.54.8",
+        "sugarss": "^5.0.0",
         "terser": "^5.16.0",
         "tsx": "^4.8.1",
         "yaml": "^2.4.2"
@@ -10021,17 +10021,18 @@
       }
     },
     "node_modules/vitefu": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.0.6.tgz",
-      "integrity": "sha512-+Rex1GlappUyNN6UfwbVZne/9cYC4+R2XDk9xkNXBKMw6HQagdX9PgZ8V2v1WUSK1wfBLp7qbI1+XSNIlB1xmA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.1.1.tgz",
+      "integrity": "sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==",
       "dev": true,
       "license": "MIT",
       "workspaces": [
         "tests/deps/*",
-        "tests/projects/*"
+        "tests/projects/*",
+        "tests/projects/workspace/packages/*"
       ],
       "peerDependencies": {
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0"
       },
       "peerDependenciesMeta": {
         "vite": {
diff --git a/web/package.json b/web/package.json
index f2543c10b1..019f651305 100644
--- a/web/package.json
+++ b/web/package.json
@@ -69,7 +69,7 @@
     "@sveltejs/adapter-static": "^3.0.8",
     "@sveltejs/enhanced-img": "^0.6.0",
     "@sveltejs/kit": "^2.15.2",
-    "@sveltejs/vite-plugin-svelte": "^5.0.3",
+    "@sveltejs/vite-plugin-svelte": "^6.0.0",
     "@tailwindcss/vite": "^4.1.7",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/svelte": "^5.2.8",
@@ -104,7 +104,7 @@
     "tslib": "^2.6.2",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.28.0",
-    "vite": "^6.0.0",
+    "vite": "^7.0.0",
     "vitest": "^3.0.0"
   },
   "volta": {

From b0098d6d238fbd22f90cb01d3aa7bf75287fc8f9 Mon Sep 17 00:00:00 2001
From: Dominik Vogel <DominikVogel@users.noreply.github.com>
Date: Sat, 12 Jul 2025 21:50:51 +0200
Subject: [PATCH 196/337] Update external-library.md (#19901)

---
 docs/docs/guides/external-library.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/guides/external-library.md b/docs/docs/guides/external-library.md
index 2ac917f930..3ad1679423 100644
--- a/docs/docs/guides/external-library.md
+++ b/docs/docs/guides/external-library.md
@@ -41,7 +41,7 @@ In the Immich web UI:
 - Click Add path
   <img src={require('./img/add-path-button.webp').default} width="50%" title="Add Path button" />
 
-- Enter **/usr/src/app/external** as the path and click Add
+- Enter **/home/user/photos1** as the path and click Add
   <img src={require('./img/add-path-field.webp').default} width="50%" title="Add Path field" />
 
 - Save the new path

From 33c29e4305ad1ccc99aee664a1535f6db1aa3e54 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Mon, 14 Jul 2025 18:02:29 +0530
Subject: [PATCH 197/337] chore: pass flavor to vscode flutter codelens
 (#19919)

---
 .vscode/launch.json | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index ed3da9f667..8682376cda 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -18,6 +18,25 @@
       "name": "Immich Workers",
       "remoteRoot": "/usr/src/app",
       "localRoot": "${workspaceFolder}/server"
+    },
+    {
+      "name": "Flavor - Production",
+      "request": "launch",
+      "type": "dart",
+      "codeLens": {
+        "for": [
+          "run-test",
+          "run-test-file",
+          "run-file",
+          "debug-test",
+          "debug-test-file",
+          "debug-file",
+        ],
+        "title": "${debugType}",
+      },
+      "args": [
+        "--flavor", "production"
+      ],
     }
   ]
 }

From c699df002a32ac175cee276b8f7a9eab1e1b4c42 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 14 Jul 2025 10:13:06 -0400
Subject: [PATCH 198/337] feat: rename schema (#19891)

---
 e2e/src/api/specs/api-key.e2e-spec.ts         |    2 +-
 e2e/src/api/specs/tag.e2e-spec.ts             |    2 +-
 e2e/src/cli/specs/upload.e2e-spec.ts          |    2 +-
 e2e/src/utils.ts                              |   24 +-
 server/src/bin/migrations.ts                  |   25 +-
 server/src/database.ts                        |  223 ++-
 server/src/queries/access.repository.sql      |  218 +--
 server/src/queries/activity.repository.sql    |   36 +-
 server/src/queries/album.repository.sql       |  202 +--
 server/src/queries/album.user.repository.sql  |    6 +-
 server/src/queries/api.key.repository.sql     |   30 +-
 server/src/queries/asset.job.repository.sql   |  426 +++---
 server/src/queries/asset.repository.sql       |  244 ++--
 server/src/queries/duplicate.repository.sql   |   60 +-
 server/src/queries/library.repository.sql     |   44 +-
 server/src/queries/map.repository.sql         |   26 +-
 server/src/queries/memory.repository.sql      |   84 +-
 .../src/queries/notification.repository.sql   |    4 +-
 server/src/queries/partner.repository.sql     |   44 +-
 server/src/queries/person.repository.sql      |  170 +--
 server/src/queries/search.repository.sql      |  166 +--
 server/src/queries/session.repository.sql     |   62 +-
 server/src/queries/shared.link.repository.sql |  180 +--
 server/src/queries/stack.repository.sql       |  172 +--
 .../queries/sync.checkpoint.repository.sql    |    4 +-
 server/src/queries/sync.repository.sql        |  672 ++++-----
 server/src/queries/tag.repository.sql         |   62 +-
 server/src/queries/trash.repository.sql       |    6 +-
 server/src/queries/user.repository.sql        |  140 +-
 server/src/queries/view.repository.sql        |   14 +-
 server/src/repositories/access.repository.ts  |  204 ++-
 .../src/repositories/activity.repository.ts   |   18 +-
 .../src/repositories/album-user.repository.ts |   10 +-
 server/src/repositories/album.repository.ts   |  192 ++-
 server/src/repositories/api-key.repository.ts |   22 +-
 .../src/repositories/asset-job.repository.ts  |  226 ++--
 server/src/repositories/asset.repository.ts   |  304 +++--
 .../src/repositories/download.repository.ts   |   20 +-
 .../src/repositories/duplicate.repository.ts  |   54 +-
 server/src/repositories/library.repository.ts |   52 +-
 server/src/repositories/map.repository.ts     |   31 +-
 server/src/repositories/memory.repository.ts  |   64 +-
 server/src/repositories/move.repository.ts    |    2 +-
 .../repositories/notification.repository.ts   |   16 +-
 server/src/repositories/partner.repository.ts |   26 +-
 server/src/repositories/person.repository.ts  |  196 +--
 server/src/repositories/search.repository.ts  |   80 +-
 server/src/repositories/session.repository.ts |   44 +-
 .../repositories/shared-link.repository.ts    |  184 +--
 server/src/repositories/stack.repository.ts   |   67 +-
 .../sync-checkpoint.repository.ts             |    6 +-
 server/src/repositories/sync.repository.ts    |  290 ++--
 server/src/repositories/tag.repository.ts     |   34 +-
 server/src/repositories/trash.repository.ts   |    8 +-
 server/src/repositories/user.repository.ts    |  133 +-
 server/src/repositories/view-repository.ts    |   10 +-
 server/src/schema/functions.ts                |   62 +-
 server/src/schema/index.ts                    |  123 +-
 .../1752267649968-StandardizeNames.ts         | 1200 +++++++++++++++++
 server/src/schema/tables/activity.table.ts    |   11 +-
 .../schema/tables/album-asset-audit.table.ts  |    8 +-
 server/src/schema/tables/album-asset.table.ts |   10 +-
 server/src/schema/tables/album-audit.table.ts |    8 +-
 .../schema/tables/album-user-audit.table.ts   |    8 +-
 server/src/schema/tables/album-user.table.ts  |   15 +-
 server/src/schema/tables/album.table.ts       |   10 +-
 server/src/schema/tables/api-key.table.ts     |    6 +-
 server/src/schema/tables/asset-audit.table.ts |    8 +-
 .../{exif.table.ts => asset-exif.table.ts}    |   14 +-
 server/src/schema/tables/asset-face.table.ts  |    5 +-
 ...set-files.table.ts => asset-file.table.ts} |   14 +-
 server/src/schema/tables/asset.table.ts       |   25 +-
 server/src/schema/tables/audit.table.ts       |    2 +-
 server/src/schema/tables/face-search.table.ts |    8 +-
 server/src/schema/tables/library.table.ts     |    6 +-
 .../schema/tables/memory-asset-audit.table.ts |   13 +-
 .../src/schema/tables/memory-asset.table.ts   |   10 +-
 .../src/schema/tables/memory-audit.table.ts   |    8 +-
 server/src/schema/tables/memory.table.ts      |   10 +-
 .../src/schema/tables/notification.table.ts   |    6 +-
 .../src/schema/tables/partner-audit.table.ts  |    8 +-
 server/src/schema/tables/partner.table.ts     |   12 +-
 .../src/schema/tables/person-audit.table.ts   |    6 +-
 server/src/schema/tables/person.table.ts      |    6 +-
 server/src/schema/tables/session.table.ts     |    6 +-
 .../schema/tables/shared-link-asset.table.ts  |    2 +-
 server/src/schema/tables/shared-link.table.ts |   13 +-
 .../src/schema/tables/smart-search.table.ts   |    8 +-
 server/src/schema/tables/stack-audit.table.ts |    4 +-
 server/src/schema/tables/stack.table.ts       |   14 +-
 .../schema/tables/sync-checkpoint.table.ts    |    6 +-
 server/src/schema/tables/tag-asset.table.ts   |    2 +-
 server/src/schema/tables/tag-closure.table.ts |    2 +-
 server/src/schema/tables/tag.table.ts         |    6 +-
 server/src/schema/tables/user-audit.table.ts  |    4 +-
 server/src/schema/tables/user.table.ts        |   12 +-
 server/src/services/metadata.service.ts       |    6 +-
 .../comparers/constraint.comparer.ts          |    3 +-
 .../src/sql-tools/comparers/index.comparer.ts |    2 +-
 server/src/sql-tools/schema-diff.ts           |   41 +-
 server/src/utils/database.ts                  |  186 ++-
 server/test/medium.factory.ts                 |    4 +-
 .../specs/services/audit.database.spec.ts     |   16 +-
 103 files changed, 4378 insertions(+), 3224 deletions(-)
 create mode 100644 server/src/schema/migrations/1752267649968-StandardizeNames.ts
 rename server/src/schema/tables/{exif.table.ts => asset-exif.table.ts} (86%)
 rename server/src/schema/tables/{asset-files.table.ts => asset-file.table.ts} (66%)

diff --git a/e2e/src/api/specs/api-key.e2e-spec.ts b/e2e/src/api/specs/api-key.e2e-spec.ts
index ad03571869..28d134a664 100644
--- a/e2e/src/api/specs/api-key.e2e-spec.ts
+++ b/e2e/src/api/specs/api-key.e2e-spec.ts
@@ -20,7 +20,7 @@ describe('/api-keys', () => {
   });
 
   beforeEach(async () => {
-    await utils.resetDatabase(['api_keys']);
+    await utils.resetDatabase(['api_key']);
   });
 
   describe('POST /api-keys', () => {
diff --git a/e2e/src/api/specs/tag.e2e-spec.ts b/e2e/src/api/specs/tag.e2e-spec.ts
index a4cbc99ed3..7b645f8bd4 100644
--- a/e2e/src/api/specs/tag.e2e-spec.ts
+++ b/e2e/src/api/specs/tag.e2e-spec.ts
@@ -37,7 +37,7 @@ describe('/tags', () => {
   beforeEach(async () => {
     //  tagging assets eventually triggers metadata extraction which can impact other tests
     await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
-    await utils.resetDatabase(['tags']);
+    await utils.resetDatabase(['tag']);
   });
 
   describe('POST /tags', () => {
diff --git a/e2e/src/cli/specs/upload.e2e-spec.ts b/e2e/src/cli/specs/upload.e2e-spec.ts
index c901a299ab..8249b9b360 100644
--- a/e2e/src/cli/specs/upload.e2e-spec.ts
+++ b/e2e/src/cli/specs/upload.e2e-spec.ts
@@ -97,7 +97,7 @@ describe(`immich upload`, () => {
   });
 
   beforeEach(async () => {
-    await utils.resetDatabase(['assets', 'albums']);
+    await utils.resetDatabase(['asset', 'album']);
   });
 
   describe(`immich upload /path/to/file.jpg`, () => {
diff --git a/e2e/src/utils.ts b/e2e/src/utils.ts
index cf9eafbf23..3fcc4ab552 100644
--- a/e2e/src/utils.ts
+++ b/e2e/src/utils.ts
@@ -154,19 +154,19 @@ export const utils = {
 
       tables = tables || [
         // TODO e2e test for deleting a stack, since it is quite complex
-        'asset_stack',
-        'libraries',
-        'shared_links',
+        'stack',
+        'library',
+        'shared_link',
         'person',
-        'albums',
-        'assets',
-        'asset_faces',
+        'album',
+        'asset',
+        'asset_face',
         'activity',
-        'api_keys',
-        'sessions',
-        'users',
+        'api_key',
+        'session',
+        'user',
         'system_metadata',
-        'tags',
+        'tag',
       ];
 
       const sql: string[] = [];
@@ -175,7 +175,7 @@ export const utils = {
         if (table === 'system_metadata') {
           sql.push(`DELETE FROM "system_metadata" where "key" NOT IN ('reverse-geocoding-state', 'system-flags');`);
         } else {
-          sql.push(`DELETE FROM ${table} CASCADE;`);
+          sql.push(`DELETE FROM "${table}" CASCADE;`);
         }
       }
 
@@ -451,7 +451,7 @@ export const utils = {
       return;
     }
 
-    await client.query('INSERT INTO asset_faces ("assetId", "personId") VALUES ($1, $2)', [assetId, personId]);
+    await client.query('INSERT INTO asset_face ("assetId", "personId") VALUES ($1, $2)', [assetId, personId]);
   },
 
   setPersonThumbnail: async (personId: string) => {
diff --git a/server/src/bin/migrations.ts b/server/src/bin/migrations.ts
index a9832a14f7..3bdfb3bbc6 100644
--- a/server/src/bin/migrations.ts
+++ b/server/src/bin/migrations.ts
@@ -9,13 +9,7 @@ import { ConfigRepository } from 'src/repositories/config.repository';
 import { DatabaseRepository } from 'src/repositories/database.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import 'src/schema';
-import {
-  DefaultNamingStrategy,
-  HashNamingStrategy,
-  schemaDiff,
-  schemaFromCode,
-  schemaFromDatabase,
-} from 'src/sql-tools';
+import { schemaDiff, schemaFromCode, schemaFromDatabase } from 'src/sql-tools';
 import { asPostgresConnectionConfig, getKyselyConfig } from 'src/utils/database';
 
 const main = async () => {
@@ -113,22 +107,7 @@ const compare = async () => {
   const { database } = configRepository.getEnv();
   const db = postgres(asPostgresConnectionConfig(database.config));
 
-  const tables = new Set<string>();
-  const preferred = new DefaultNamingStrategy();
-  const fallback = new HashNamingStrategy();
-
-  const source = schemaFromCode({
-    overrides: true,
-    namingStrategy: {
-      getName(item) {
-        if ('tableName' in item && tables.has(item.tableName)) {
-          return preferred.getName(item);
-        }
-
-        return fallback.getName(item);
-      },
-    },
-  });
+  const source = schemaFromCode({ overrides: true, namingStrategy: 'default' });
   const target = await schemaFromDatabase(db, {});
 
   console.log(source.warnings.join('\n'));
diff --git a/server/src/database.ts b/server/src/database.ts
index b9af37cc46..a89299fbeb 100644
--- a/server/src/database.ts
+++ b/server/src/database.ts
@@ -13,7 +13,7 @@ import {
   UserStatus,
 } from 'src/enum';
 import { AlbumTable } from 'src/schema/tables/album.table';
-import { ExifTable } from 'src/schema/tables/exif.table';
+import { AssetExifTable } from 'src/schema/tables/asset-exif.table';
 import { UserMetadataItem } from 'src/types';
 
 export type AuthUser = {
@@ -242,7 +242,7 @@ export type Session = {
   isPendingSyncReset: boolean;
 };
 
-export type Exif = Omit<Selectable<ExifTable>, 'updatedAt' | 'updateId'>;
+export type Exif = Omit<Selectable<AssetExifTable>, 'updatedAt' | 'updateId'>;
 
 export type Person = {
   createdAt: Date;
@@ -276,52 +276,45 @@ export type AssetFace = {
 
 const userColumns = ['id', 'name', 'email', 'avatarColor', 'profileImagePath', 'profileChangedAt'] as const;
 const userWithPrefixColumns = [
-  'users.id',
-  'users.name',
-  'users.email',
-  'users.avatarColor',
-  'users.profileImagePath',
-  'users.profileChangedAt',
+  'user2.id',
+  'user2.name',
+  'user2.email',
+  'user2.avatarColor',
+  'user2.profileImagePath',
+  'user2.profileChangedAt',
 ] as const;
 
 export const columns = {
   asset: [
-    'assets.id',
-    'assets.checksum',
-    'assets.deviceAssetId',
-    'assets.deviceId',
-    'assets.fileCreatedAt',
-    'assets.fileModifiedAt',
-    'assets.isExternal',
-    'assets.visibility',
-    'assets.libraryId',
-    'assets.livePhotoVideoId',
-    'assets.localDateTime',
-    'assets.originalFileName',
-    'assets.originalPath',
-    'assets.ownerId',
-    'assets.sidecarPath',
-    'assets.type',
+    'asset.id',
+    'asset.checksum',
+    'asset.deviceAssetId',
+    'asset.deviceId',
+    'asset.fileCreatedAt',
+    'asset.fileModifiedAt',
+    'asset.isExternal',
+    'asset.visibility',
+    'asset.libraryId',
+    'asset.livePhotoVideoId',
+    'asset.localDateTime',
+    'asset.originalFileName',
+    'asset.originalPath',
+    'asset.ownerId',
+    'asset.sidecarPath',
+    'asset.type',
   ],
-  assetFiles: ['asset_files.id', 'asset_files.path', 'asset_files.type'],
-  authUser: [
-    'users.id',
-    'users.name',
-    'users.email',
-    'users.isAdmin',
-    'users.quotaUsageInBytes',
-    'users.quotaSizeInBytes',
-  ],
-  authApiKey: ['api_keys.id', 'api_keys.permissions'],
-  authSession: ['sessions.id', 'sessions.isPendingSyncReset', 'sessions.updatedAt', 'sessions.pinExpiresAt'],
+  assetFiles: ['asset_file.id', 'asset_file.path', 'asset_file.type'],
+  authUser: ['user.id', 'user.name', 'user.email', 'user.isAdmin', 'user.quotaUsageInBytes', 'user.quotaSizeInBytes'],
+  authApiKey: ['api_key.id', 'api_key.permissions'],
+  authSession: ['session.id', 'session.isPendingSyncReset', 'session.updatedAt', 'session.pinExpiresAt'],
   authSharedLink: [
-    'shared_links.id',
-    'shared_links.userId',
-    'shared_links.expiresAt',
-    'shared_links.showExif',
-    'shared_links.allowUpload',
-    'shared_links.allowDownload',
-    'shared_links.password',
+    'shared_link.id',
+    'shared_link.userId',
+    'shared_link.expiresAt',
+    'shared_link.showExif',
+    'shared_link.allowUpload',
+    'shared_link.allowDownload',
+    'shared_link.password',
   ],
   user: userColumns,
   userWithPrefix: userWithPrefixColumns,
@@ -339,89 +332,83 @@ export const columns = {
     'quotaSizeInBytes',
     'quotaUsageInBytes',
   ],
-  tag: ['tags.id', 'tags.value', 'tags.createdAt', 'tags.updatedAt', 'tags.color', 'tags.parentId'],
+  tag: ['tag.id', 'tag.value', 'tag.createdAt', 'tag.updatedAt', 'tag.color', 'tag.parentId'],
   apiKey: ['id', 'name', 'userId', 'createdAt', 'updatedAt', 'permissions'],
   notification: ['id', 'createdAt', 'level', 'type', 'title', 'description', 'data', 'readAt'],
   syncAsset: [
-    'assets.id',
-    'assets.ownerId',
-    'assets.originalFileName',
-    'assets.thumbhash',
-    'assets.checksum',
-    'assets.fileCreatedAt',
-    'assets.fileModifiedAt',
-    'assets.localDateTime',
-    'assets.type',
-    'assets.deletedAt',
-    'assets.isFavorite',
-    'assets.visibility',
-    'assets.duration',
-  ],
-  syncAlbumUser: ['album_users.albumsId as albumId', 'album_users.usersId as userId', 'album_users.role'],
-  syncStack: [
-    'asset_stack.id',
-    'asset_stack.createdAt',
-    'asset_stack.updatedAt',
-    'asset_stack.primaryAssetId',
-    'asset_stack.ownerId',
+    'asset.id',
+    'asset.ownerId',
+    'asset.originalFileName',
+    'asset.thumbhash',
+    'asset.checksum',
+    'asset.fileCreatedAt',
+    'asset.fileModifiedAt',
+    'asset.localDateTime',
+    'asset.type',
+    'asset.deletedAt',
+    'asset.isFavorite',
+    'asset.visibility',
+    'asset.duration',
   ],
+  syncAlbumUser: ['album_user.albumsId as albumId', 'album_user.usersId as userId', 'album_user.role'],
+  syncStack: ['stack.id', 'stack.createdAt', 'stack.updatedAt', 'stack.primaryAssetId', 'stack.ownerId'],
   stack: ['stack.id', 'stack.primaryAssetId', 'ownerId'],
   syncAssetExif: [
-    'exif.assetId',
-    'exif.description',
-    'exif.exifImageWidth',
-    'exif.exifImageHeight',
-    'exif.fileSizeInByte',
-    'exif.orientation',
-    'exif.dateTimeOriginal',
-    'exif.modifyDate',
-    'exif.timeZone',
-    'exif.latitude',
-    'exif.longitude',
-    'exif.projectionType',
-    'exif.city',
-    'exif.state',
-    'exif.country',
-    'exif.make',
-    'exif.model',
-    'exif.lensModel',
-    'exif.fNumber',
-    'exif.focalLength',
-    'exif.iso',
-    'exif.exposureTime',
-    'exif.profileDescription',
-    'exif.rating',
-    'exif.fps',
+    'asset_exif.assetId',
+    'asset_exif.description',
+    'asset_exif.exifImageWidth',
+    'asset_exif.exifImageHeight',
+    'asset_exif.fileSizeInByte',
+    'asset_exif.orientation',
+    'asset_exif.dateTimeOriginal',
+    'asset_exif.modifyDate',
+    'asset_exif.timeZone',
+    'asset_exif.latitude',
+    'asset_exif.longitude',
+    'asset_exif.projectionType',
+    'asset_exif.city',
+    'asset_exif.state',
+    'asset_exif.country',
+    'asset_exif.make',
+    'asset_exif.model',
+    'asset_exif.lensModel',
+    'asset_exif.fNumber',
+    'asset_exif.focalLength',
+    'asset_exif.iso',
+    'asset_exif.exposureTime',
+    'asset_exif.profileDescription',
+    'asset_exif.rating',
+    'asset_exif.fps',
   ],
   exif: [
-    'exif.assetId',
-    'exif.autoStackId',
-    'exif.bitsPerSample',
-    'exif.city',
-    'exif.colorspace',
-    'exif.country',
-    'exif.dateTimeOriginal',
-    'exif.description',
-    'exif.exifImageHeight',
-    'exif.exifImageWidth',
-    'exif.exposureTime',
-    'exif.fileSizeInByte',
-    'exif.fNumber',
-    'exif.focalLength',
-    'exif.fps',
-    'exif.iso',
-    'exif.latitude',
-    'exif.lensModel',
-    'exif.livePhotoCID',
-    'exif.longitude',
-    'exif.make',
-    'exif.model',
-    'exif.modifyDate',
-    'exif.orientation',
-    'exif.profileDescription',
-    'exif.projectionType',
-    'exif.rating',
-    'exif.state',
-    'exif.timeZone',
+    'asset_exif.assetId',
+    'asset_exif.autoStackId',
+    'asset_exif.bitsPerSample',
+    'asset_exif.city',
+    'asset_exif.colorspace',
+    'asset_exif.country',
+    'asset_exif.dateTimeOriginal',
+    'asset_exif.description',
+    'asset_exif.exifImageHeight',
+    'asset_exif.exifImageWidth',
+    'asset_exif.exposureTime',
+    'asset_exif.fileSizeInByte',
+    'asset_exif.fNumber',
+    'asset_exif.focalLength',
+    'asset_exif.fps',
+    'asset_exif.iso',
+    'asset_exif.latitude',
+    'asset_exif.lensModel',
+    'asset_exif.livePhotoCID',
+    'asset_exif.longitude',
+    'asset_exif.make',
+    'asset_exif.model',
+    'asset_exif.modifyDate',
+    'asset_exif.orientation',
+    'asset_exif.profileDescription',
+    'asset_exif.projectionType',
+    'asset_exif.rating',
+    'asset_exif.state',
+    'asset_exif.timeZone',
   ],
 } as const;
diff --git a/server/src/queries/access.repository.sql b/server/src/queries/access.repository.sql
index 402bbdcfaf..9aecaafb52 100644
--- a/server/src/queries/access.repository.sql
+++ b/server/src/queries/access.repository.sql
@@ -14,161 +14,161 @@ select
   "activity"."id"
 from
   "activity"
-  left join "albums" on "activity"."albumId" = "albums"."id"
-  and "albums"."deletedAt" is null
+  left join "album" on "activity"."albumId" = "album"."id"
+  and "album"."deletedAt" is null
 where
   "activity"."id" in ($1)
-  and "albums"."ownerId" = $2::uuid
+  and "album"."ownerId" = $2::uuid
 
 -- AccessRepository.activity.checkCreateAccess
 select
-  "albums"."id"
+  "album"."id"
 from
-  "albums"
-  left join "albums_shared_users_users" as "albumUsers" on "albumUsers"."albumsId" = "albums"."id"
-  left join "users" on "users"."id" = "albumUsers"."usersId"
-  and "users"."deletedAt" is null
+  "album"
+  left join "album_user" as "albumUsers" on "albumUsers"."albumsId" = "album"."id"
+  left join "user" on "user"."id" = "albumUsers"."usersId"
+  and "user"."deletedAt" is null
 where
-  "albums"."id" in ($1)
-  and "albums"."isActivityEnabled" = $2
+  "album"."id" in ($1)
+  and "album"."isActivityEnabled" = $2
   and (
-    "albums"."ownerId" = $3
-    or "users"."id" = $4
+    "album"."ownerId" = $3
+    or "user"."id" = $4
   )
-  and "albums"."deletedAt" is null
+  and "album"."deletedAt" is null
 
 -- AccessRepository.album.checkOwnerAccess
 select
-  "albums"."id"
+  "album"."id"
 from
-  "albums"
+  "album"
 where
-  "albums"."id" in ($1)
-  and "albums"."ownerId" = $2
-  and "albums"."deletedAt" is null
+  "album"."id" in ($1)
+  and "album"."ownerId" = $2
+  and "album"."deletedAt" is null
 
 -- AccessRepository.album.checkSharedAlbumAccess
 select
-  "albums"."id"
+  "album"."id"
 from
-  "albums"
-  left join "albums_shared_users_users" as "albumUsers" on "albumUsers"."albumsId" = "albums"."id"
-  left join "users" on "users"."id" = "albumUsers"."usersId"
-  and "users"."deletedAt" is null
+  "album"
+  left join "album_user" on "album_user"."albumsId" = "album"."id"
+  left join "user" on "user"."id" = "album_user"."usersId"
+  and "user"."deletedAt" is null
 where
-  "albums"."id" in ($1)
-  and "albums"."deletedAt" is null
-  and "users"."id" = $2
-  and "albumUsers"."role" in ($3, $4)
+  "album"."id" in ($1)
+  and "album"."deletedAt" is null
+  and "user"."id" = $2
+  and "album_user"."role" in ($3, $4)
 
 -- AccessRepository.album.checkSharedLinkAccess
 select
-  "shared_links"."albumId"
+  "shared_link"."albumId"
 from
-  "shared_links"
+  "shared_link"
 where
-  "shared_links"."id" = $1
-  and "shared_links"."albumId" in ($2)
+  "shared_link"."id" = $1
+  and "shared_link"."albumId" in ($2)
 
 -- AccessRepository.asset.checkAlbumAccess
 select
-  "assets"."id",
-  "assets"."livePhotoVideoId"
+  "asset"."id",
+  "asset"."livePhotoVideoId"
 from
-  "albums"
-  inner join "albums_assets_assets" as "albumAssets" on "albums"."id" = "albumAssets"."albumsId"
-  inner join "assets" on "assets"."id" = "albumAssets"."assetsId"
-  and "assets"."deletedAt" is null
-  left join "albums_shared_users_users" as "albumUsers" on "albumUsers"."albumsId" = "albums"."id"
-  left join "users" on "users"."id" = "albumUsers"."usersId"
-  and "users"."deletedAt" is null
+  "album"
+  inner join "album_asset" as "albumAssets" on "album"."id" = "albumAssets"."albumsId"
+  inner join "asset" on "asset"."id" = "albumAssets"."assetsId"
+  and "asset"."deletedAt" is null
+  left join "album_user" as "albumUsers" on "albumUsers"."albumsId" = "album"."id"
+  left join "user" on "user"."id" = "albumUsers"."usersId"
+  and "user"."deletedAt" is null
 where
-  array["assets"."id", "assets"."livePhotoVideoId"] && array[$1]::uuid[]
+  array["asset"."id", "asset"."livePhotoVideoId"] && array[$1]::uuid[]
   and (
-    "albums"."ownerId" = $2
-    or "users"."id" = $3
+    "album"."ownerId" = $2
+    or "user"."id" = $3
   )
-  and "albums"."deletedAt" is null
+  and "album"."deletedAt" is null
 
 -- AccessRepository.asset.checkOwnerAccess
 select
-  "assets"."id"
+  "asset"."id"
 from
-  "assets"
+  "asset"
 where
-  "assets"."id" in ($1)
-  and "assets"."ownerId" = $2
-  and "assets"."visibility" != $3
+  "asset"."id" in ($1)
+  and "asset"."ownerId" = $2
+  and "asset"."visibility" != $3
 
 -- AccessRepository.asset.checkPartnerAccess
 select
-  "assets"."id"
+  "asset"."id"
 from
-  "partners" as "partner"
-  inner join "users" as "sharedBy" on "sharedBy"."id" = "partner"."sharedById"
+  "partner"
+  inner join "user" as "sharedBy" on "sharedBy"."id" = "partner"."sharedById"
   and "sharedBy"."deletedAt" is null
-  inner join "assets" on "assets"."ownerId" = "sharedBy"."id"
-  and "assets"."deletedAt" is null
+  inner join "asset" on "asset"."ownerId" = "sharedBy"."id"
+  and "asset"."deletedAt" is null
 where
   "partner"."sharedWithId" = $1
   and (
-    "assets"."visibility" = 'timeline'
-    or "assets"."visibility" = 'hidden'
+    "asset"."visibility" = 'timeline'
+    or "asset"."visibility" = 'hidden'
   )
-  and "assets"."id" in ($2)
+  and "asset"."id" in ($2)
 
 -- AccessRepository.asset.checkSharedLinkAccess
 select
-  "assets"."id" as "assetId",
-  "assets"."livePhotoVideoId" as "assetLivePhotoVideoId",
+  "asset"."id" as "assetId",
+  "asset"."livePhotoVideoId" as "assetLivePhotoVideoId",
   "albumAssets"."id" as "albumAssetId",
   "albumAssets"."livePhotoVideoId" as "albumAssetLivePhotoVideoId"
 from
-  "shared_links"
-  left join "albums" on "albums"."id" = "shared_links"."albumId"
-  and "albums"."deletedAt" is null
-  left join "shared_link__asset" on "shared_link__asset"."sharedLinksId" = "shared_links"."id"
-  left join "assets" on "assets"."id" = "shared_link__asset"."assetsId"
-  and "assets"."deletedAt" is null
-  left join "albums_assets_assets" on "albums_assets_assets"."albumsId" = "albums"."id"
-  left join "assets" as "albumAssets" on "albumAssets"."id" = "albums_assets_assets"."assetsId"
+  "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"
+  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"
   and "albumAssets"."deletedAt" is null
 where
-  "shared_links"."id" = $1
+  "shared_link"."id" = $1
   and array[
-    "assets"."id",
-    "assets"."livePhotoVideoId",
+    "asset"."id",
+    "asset"."livePhotoVideoId",
     "albumAssets"."id",
     "albumAssets"."livePhotoVideoId"
   ] && array[$2]::uuid[]
 
 -- AccessRepository.authDevice.checkOwnerAccess
 select
-  "sessions"."id"
+  "session"."id"
 from
-  "sessions"
+  "session"
 where
-  "sessions"."userId" = $1
-  and "sessions"."id" in ($2)
+  "session"."userId" = $1
+  and "session"."id" in ($2)
 
 -- AccessRepository.memory.checkOwnerAccess
 select
-  "memories"."id"
+  "memory"."id"
 from
-  "memories"
+  "memory"
 where
-  "memories"."id" in ($1)
-  and "memories"."ownerId" = $2
-  and "memories"."deletedAt" is null
+  "memory"."id" in ($1)
+  and "memory"."ownerId" = $2
+  and "memory"."deletedAt" is null
 
 -- AccessRepository.notification.checkOwnerAccess
 select
-  "notifications"."id"
+  "notification"."id"
 from
-  "notifications"
+  "notification"
 where
-  "notifications"."id" in ($1)
-  and "notifications"."userId" = $2
+  "notification"."id" in ($1)
+  and "notification"."userId" = $2
 
 -- AccessRepository.person.checkOwnerAccess
 select
@@ -181,56 +181,56 @@ where
 
 -- AccessRepository.person.checkFaceOwnerAccess
 select
-  "asset_faces"."id"
+  "asset_face"."id"
 from
-  "asset_faces"
-  left join "assets" on "assets"."id" = "asset_faces"."assetId"
-  and "assets"."deletedAt" is null
+  "asset_face"
+  left join "asset" on "asset"."id" = "asset_face"."assetId"
+  and "asset"."deletedAt" is null
 where
-  "asset_faces"."id" in ($1)
-  and "assets"."ownerId" = $2
+  "asset_face"."id" in ($1)
+  and "asset"."ownerId" = $2
 
 -- AccessRepository.partner.checkUpdateAccess
 select
-  "partners"."sharedById"
+  "partner"."sharedById"
 from
-  "partners"
+  "partner"
 where
-  "partners"."sharedById" in ($1)
-  and "partners"."sharedWithId" = $2
+  "partner"."sharedById" in ($1)
+  and "partner"."sharedWithId" = $2
 
 -- AccessRepository.session.checkOwnerAccess
 select
-  "sessions"."id"
+  "session"."id"
 from
-  "sessions"
+  "session"
 where
-  "sessions"."id" in ($1)
-  and "sessions"."userId" = $2
+  "session"."id" in ($1)
+  and "session"."userId" = $2
 
 -- AccessRepository.stack.checkOwnerAccess
 select
-  "stacks"."id"
+  "stack"."id"
 from
-  "asset_stack" as "stacks"
+  "stack"
 where
-  "stacks"."id" in ($1)
-  and "stacks"."ownerId" = $2
+  "stack"."id" in ($1)
+  and "stack"."ownerId" = $2
 
 -- AccessRepository.tag.checkOwnerAccess
 select
-  "tags"."id"
+  "tag"."id"
 from
-  "tags"
+  "tag"
 where
-  "tags"."id" in ($1)
-  and "tags"."userId" = $2
+  "tag"."id" in ($1)
+  and "tag"."userId" = $2
 
 -- AccessRepository.timeline.checkPartnerAccess
 select
-  "partners"."sharedById"
+  "partner"."sharedById"
 from
-  "partners"
+  "partner"
 where
-  "partners"."sharedById" in ($1)
-  and "partners"."sharedWithId" = $2
+  "partner"."sharedById" in ($1)
+  and "partner"."sharedWithId" = $2
diff --git a/server/src/queries/activity.repository.sql b/server/src/queries/activity.repository.sql
index 01c4f901cb..228e5cb0ba 100644
--- a/server/src/queries/activity.repository.sql
+++ b/server/src/queries/activity.repository.sql
@@ -6,26 +6,26 @@ select
   to_json("user") as "user"
 from
   "activity"
-  inner join "users" on "users"."id" = "activity"."userId"
-  and "users"."deletedAt" is null
+  inner join "user" as "user2" on "user2"."id" = "activity"."userId"
+  and "user2"."deletedAt" is null
   inner join lateral (
     select
-      "users"."id",
-      "users"."name",
-      "users"."email",
-      "users"."avatarColor",
-      "users"."profileImagePath",
-      "users"."profileChangedAt"
+      "user2"."id",
+      "user2"."name",
+      "user2"."email",
+      "user2"."avatarColor",
+      "user2"."profileImagePath",
+      "user2"."profileChangedAt"
     from
       (
         select
           1
       ) as "dummy"
   ) as "user" on true
-  left join "assets" on "assets"."id" = "activity"."assetId"
+  left join "asset" on "asset"."id" = "activity"."assetId"
 where
   "activity"."albumId" = $1
-  and "assets"."deletedAt" is null
+  and "asset"."deletedAt" is null
 order by
   "activity"."createdAt" asc
 
@@ -49,9 +49,9 @@ returning
           "profileImagePath",
           "profileChangedAt"
         from
-          "users"
+          "user"
         where
-          "users"."id" = "activity"."userId"
+          "user"."id" = "activity"."userId"
       ) as obj
   ) as "user"
 
@@ -72,16 +72,16 @@ select
   ) as "likes"
 from
   "activity"
-  inner join "users" on "users"."id" = "activity"."userId"
-  and "users"."deletedAt" is null
-  left join "assets" on "assets"."id" = "activity"."assetId"
+  inner join "user" on "user"."id" = "activity"."userId"
+  and "user"."deletedAt" is null
+  left join "asset" on "asset"."id" = "activity"."assetId"
 where
   "activity"."assetId" = $3
   and "activity"."albumId" = $4
   and (
     (
-      "assets"."deletedAt" is null
-      and "assets"."visibility" != 'locked'
+      "asset"."deletedAt" is null
+      and "asset"."visibility" != 'locked'
     )
-    or "assets"."id" is null
+    or "asset"."id" is null
   )
diff --git a/server/src/queries/album.repository.sql b/server/src/queries/album.repository.sql
index 26ddccbe17..36c44414db 100644
--- a/server/src/queries/album.repository.sql
+++ b/server/src/queries/album.repository.sql
@@ -2,7 +2,7 @@
 
 -- AlbumRepository.getById
 select
-  "albums".*,
+  "album".*,
   (
     select
       to_json(obj)
@@ -16,9 +16,9 @@ select
           "profileImagePath",
           "profileChangedAt"
         from
-          "users"
+          "user"
         where
-          "users"."id" = "albums"."ownerId"
+          "user"."id" = "album"."ownerId"
       ) as obj
   ) as "owner",
   (
@@ -27,7 +27,7 @@ select
     from
       (
         select
-          "album_users"."role",
+          "album_user"."role",
           (
             select
               to_json(obj)
@@ -41,15 +41,15 @@ select
                   "profileImagePath",
                   "profileChangedAt"
                 from
-                  "users"
+                  "user"
                 where
-                  "users"."id" = "album_users"."usersId"
+                  "user"."id" = "album_user"."usersId"
               ) as obj
           ) as "user"
         from
-          "albums_shared_users_users" as "album_users"
+          "album_user"
         where
-          "album_users"."albumsId" = "albums"."id"
+          "album_user"."albumsId" = "album"."id"
       ) as agg
   ) as "albumUsers",
   (
@@ -60,9 +60,9 @@ select
         select
           *
         from
-          "shared_links"
+          "shared_link"
         where
-          "shared_links"."albumId" = "albums"."id"
+          "shared_link"."albumId" = "album"."id"
       ) as agg
   ) as "sharedLinks",
   (
@@ -71,29 +71,29 @@ select
     from
       (
         select
-          "assets".*,
-          "exif" as "exifInfo"
+          "asset".*,
+          "asset_exif" as "exifInfo"
         from
-          "assets"
-          left join "exif" on "assets"."id" = "exif"."assetId"
-          inner join "albums_assets_assets" on "albums_assets_assets"."assetsId" = "assets"."id"
+          "asset"
+          left join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
+          inner join "album_asset" on "album_asset"."assetsId" = "asset"."id"
         where
-          "albums_assets_assets"."albumsId" = "albums"."id"
-          and "assets"."deletedAt" is null
-          and "assets"."visibility" in ('archive', 'timeline')
+          "album_asset"."albumsId" = "album"."id"
+          and "asset"."deletedAt" is null
+          and "asset"."visibility" in ('archive', 'timeline')
         order by
-          "assets"."fileCreatedAt" desc
+          "asset"."fileCreatedAt" desc
       ) as "asset"
   ) as "assets"
 from
-  "albums"
+  "album"
 where
-  "albums"."id" = $1
-  and "albums"."deletedAt" is null
+  "album"."id" = $1
+  and "album"."deletedAt" is null
 
 -- AlbumRepository.getByAssetId
 select
-  "albums".*,
+  "album".*,
   (
     select
       to_json(obj)
@@ -107,9 +107,9 @@ select
           "profileImagePath",
           "profileChangedAt"
         from
-          "users"
+          "user"
         where
-          "users"."id" = "albums"."ownerId"
+          "user"."id" = "album"."ownerId"
       ) as obj
   ) as "owner",
   (
@@ -118,7 +118,7 @@ select
     from
       (
         select
-          "album_users"."role",
+          "album_user"."role",
           (
             select
               to_json(obj)
@@ -132,62 +132,62 @@ select
                   "profileImagePath",
                   "profileChangedAt"
                 from
-                  "users"
+                  "user"
                 where
-                  "users"."id" = "album_users"."usersId"
+                  "user"."id" = "album_user"."usersId"
               ) as obj
           ) as "user"
         from
-          "albums_shared_users_users" as "album_users"
+          "album_user"
         where
-          "album_users"."albumsId" = "albums"."id"
+          "album_user"."albumsId" = "album"."id"
       ) as agg
   ) as "albumUsers"
 from
-  "albums"
-  inner join "albums_assets_assets" as "album_assets" on "album_assets"."albumsId" = "albums"."id"
+  "album"
+  inner join "album_asset" on "album_asset"."albumsId" = "album"."id"
 where
   (
-    "albums"."ownerId" = $1
+    "album"."ownerId" = $1
     or exists (
       select
       from
-        "albums_shared_users_users" as "album_users"
+        "album_user"
       where
-        "album_users"."albumsId" = "albums"."id"
-        and "album_users"."usersId" = $2
+        "album_user"."albumsId" = "album"."id"
+        and "album_user"."usersId" = $2
     )
   )
-  and "album_assets"."assetsId" = $3
-  and "albums"."deletedAt" is null
+  and "album_asset"."assetsId" = $3
+  and "album"."deletedAt" is null
 order by
-  "albums"."createdAt" desc,
-  "albums"."createdAt" desc
+  "album"."createdAt" desc,
+  "album"."createdAt" desc
 
 -- AlbumRepository.getMetadataForIds
 select
-  "album_assets"."albumsId" as "albumId",
+  "album_asset"."albumsId" as "albumId",
   min(
-    ("assets"."localDateTime" AT TIME ZONE 'UTC'::text)::date
+    ("asset"."localDateTime" AT TIME ZONE 'UTC'::text)::date
   ) as "startDate",
   max(
-    ("assets"."localDateTime" AT TIME ZONE 'UTC'::text)::date
+    ("asset"."localDateTime" AT TIME ZONE 'UTC'::text)::date
   ) as "endDate",
-  max("assets"."updatedAt") as "lastModifiedAssetTimestamp",
-  count("assets"."id")::int as "assetCount"
+  max("asset"."updatedAt") as "lastModifiedAssetTimestamp",
+  count("asset"."id")::int as "assetCount"
 from
-  "assets"
-  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "assets"."id"
+  "asset"
+  inner join "album_asset" on "album_asset"."assetsId" = "asset"."id"
 where
-  "assets"."visibility" in ('archive', 'timeline')
-  and "album_assets"."albumsId" in ($1)
-  and "assets"."deletedAt" is null
+  "asset"."visibility" in ('archive', 'timeline')
+  and "album_asset"."albumsId" in ($1)
+  and "asset"."deletedAt" is null
 group by
-  "album_assets"."albumsId"
+  "album_asset"."albumsId"
 
 -- AlbumRepository.getOwned
 select
-  "albums".*,
+  "album".*,
   (
     select
       to_json(obj)
@@ -201,9 +201,9 @@ select
           "profileImagePath",
           "profileChangedAt"
         from
-          "users"
+          "user"
         where
-          "users"."id" = "albums"."ownerId"
+          "user"."id" = "album"."ownerId"
       ) as obj
   ) as "owner",
   (
@@ -212,7 +212,7 @@ select
     from
       (
         select
-          "album_users"."role",
+          "album_user"."role",
           (
             select
               to_json(obj)
@@ -226,15 +226,15 @@ select
                   "profileImagePath",
                   "profileChangedAt"
                 from
-                  "users"
+                  "user"
                 where
-                  "users"."id" = "album_users"."usersId"
+                  "user"."id" = "album_user"."usersId"
               ) as obj
           ) as "user"
         from
-          "albums_shared_users_users" as "album_users"
+          "album_user"
         where
-          "album_users"."albumsId" = "albums"."id"
+          "album_user"."albumsId" = "album"."id"
       ) as agg
   ) as "albumUsers",
   (
@@ -245,29 +245,29 @@ select
         select
           *
         from
-          "shared_links"
+          "shared_link"
         where
-          "shared_links"."albumId" = "albums"."id"
+          "shared_link"."albumId" = "album"."id"
       ) as agg
   ) as "sharedLinks"
 from
-  "albums"
+  "album"
 where
-  "albums"."ownerId" = $1
-  and "albums"."deletedAt" is null
+  "album"."ownerId" = $1
+  and "album"."deletedAt" is null
 order by
-  "albums"."createdAt" desc
+  "album"."createdAt" desc
 
 -- AlbumRepository.getShared
 select
-  "albums".*,
+  "album".*,
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "album_users"."role",
+          "album_user"."role",
           (
             select
               to_json(obj)
@@ -281,15 +281,15 @@ select
                   "profileImagePath",
                   "profileChangedAt"
                 from
-                  "users"
+                  "user"
                 where
-                  "users"."id" = "album_users"."usersId"
+                  "user"."id" = "album_user"."usersId"
               ) as obj
           ) as "user"
         from
-          "albums_shared_users_users" as "album_users"
+          "album_user"
         where
-          "album_users"."albumsId" = "albums"."id"
+          "album_user"."albumsId" = "album"."id"
       ) as agg
   ) as "albumUsers",
   (
@@ -305,9 +305,9 @@ select
           "profileImagePath",
           "profileChangedAt"
         from
-          "users"
+          "user"
         where
-          "users"."id" = "albums"."ownerId"
+          "user"."id" = "album"."ownerId"
       ) as obj
   ) as "owner",
   (
@@ -318,42 +318,42 @@ select
         select
           *
         from
-          "shared_links"
+          "shared_link"
         where
-          "shared_links"."albumId" = "albums"."id"
+          "shared_link"."albumId" = "album"."id"
       ) as agg
   ) as "sharedLinks"
 from
-  "albums"
+  "album"
 where
   (
     exists (
       select
       from
-        "albums_shared_users_users" as "album_users"
+        "album_user"
       where
-        "album_users"."albumsId" = "albums"."id"
+        "album_user"."albumsId" = "album"."id"
         and (
-          "albums"."ownerId" = $1
-          or "album_users"."usersId" = $2
+          "album"."ownerId" = $1
+          or "album_user"."usersId" = $2
         )
     )
     or exists (
       select
       from
-        "shared_links"
+        "shared_link"
       where
-        "shared_links"."albumId" = "albums"."id"
-        and "shared_links"."userId" = $3
+        "shared_link"."albumId" = "album"."id"
+        and "shared_link"."userId" = $3
     )
   )
-  and "albums"."deletedAt" is null
+  and "album"."deletedAt" is null
 order by
-  "albums"."createdAt" desc
+  "album"."createdAt" desc
 
 -- AlbumRepository.getNotShared
 select
-  "albums".*,
+  "album".*,
   (
     select
       to_json(obj)
@@ -367,43 +367,43 @@ select
           "profileImagePath",
           "profileChangedAt"
         from
-          "users"
+          "user"
         where
-          "users"."id" = "albums"."ownerId"
+          "user"."id" = "album"."ownerId"
       ) as obj
   ) as "owner"
 from
-  "albums"
+  "album"
 where
-  "albums"."ownerId" = $1
-  and "albums"."deletedAt" is null
+  "album"."ownerId" = $1
+  and "album"."deletedAt" is null
   and not exists (
     select
     from
-      "albums_shared_users_users" as "album_users"
+      "album_user"
     where
-      "album_users"."albumsId" = "albums"."id"
+      "album_user"."albumsId" = "album"."id"
   )
   and not exists (
     select
     from
-      "shared_links"
+      "shared_link"
     where
-      "shared_links"."albumId" = "albums"."id"
+      "shared_link"."albumId" = "album"."id"
   )
 order by
-  "albums"."createdAt" desc
+  "album"."createdAt" desc
 
 -- AlbumRepository.removeAssetsFromAll
-delete from "albums_assets_assets"
+delete from "album_asset"
 where
-  "albums_assets_assets"."assetsId" in ($1)
+  "album_asset"."assetsId" in ($1)
 
 -- AlbumRepository.getAssetIds
 select
   *
 from
-  "albums_assets_assets"
+  "album_asset"
 where
-  "albums_assets_assets"."albumsId" = $1
-  and "albums_assets_assets"."assetsId" in ($2)
+  "album_asset"."albumsId" = $1
+  and "album_asset"."assetsId" in ($2)
diff --git a/server/src/queries/album.user.repository.sql b/server/src/queries/album.user.repository.sql
index 08f337c150..e0fc0e7b74 100644
--- a/server/src/queries/album.user.repository.sql
+++ b/server/src/queries/album.user.repository.sql
@@ -2,7 +2,7 @@
 
 -- AlbumUserRepository.create
 insert into
-  "albums_shared_users_users" ("usersId", "albumsId")
+  "album_user" ("usersId", "albumsId")
 values
   ($1, $2)
 returning
@@ -11,7 +11,7 @@ returning
   "role"
 
 -- AlbumUserRepository.update
-update "albums_shared_users_users"
+update "album_user"
 set
   "role" = $1
 where
@@ -21,7 +21,7 @@ returning
   *
 
 -- AlbumUserRepository.delete
-delete from "albums_shared_users_users"
+delete from "album_user"
 where
   "usersId" = $1
   and "albumsId" = $2
diff --git a/server/src/queries/api.key.repository.sql b/server/src/queries/api.key.repository.sql
index 35fd5d2821..43f3155ab8 100644
--- a/server/src/queries/api.key.repository.sql
+++ b/server/src/queries/api.key.repository.sql
@@ -2,31 +2,31 @@
 
 -- ApiKeyRepository.getKey
 select
-  "api_keys"."id",
-  "api_keys"."permissions",
+  "api_key"."id",
+  "api_key"."permissions",
   (
     select
       to_json(obj)
     from
       (
         select
-          "users"."id",
-          "users"."name",
-          "users"."email",
-          "users"."isAdmin",
-          "users"."quotaUsageInBytes",
-          "users"."quotaSizeInBytes"
+          "user"."id",
+          "user"."name",
+          "user"."email",
+          "user"."isAdmin",
+          "user"."quotaUsageInBytes",
+          "user"."quotaSizeInBytes"
         from
-          "users"
+          "user"
         where
-          "users"."id" = "api_keys"."userId"
-          and "users"."deletedAt" is null
+          "user"."id" = "api_key"."userId"
+          and "user"."deletedAt" is null
       ) as obj
   ) as "user"
 from
-  "api_keys"
+  "api_key"
 where
-  "api_keys"."key" = $1
+  "api_key"."key" = $1
 
 -- ApiKeyRepository.getById
 select
@@ -37,7 +37,7 @@ select
   "updatedAt",
   "permissions"
 from
-  "api_keys"
+  "api_key"
 where
   "id" = $1::uuid
   and "userId" = $2
@@ -51,7 +51,7 @@ select
   "updatedAt",
   "permissions"
 from
-  "api_keys"
+  "api_key"
 where
   "userId" = $1
 order by
diff --git a/server/src/queries/asset.job.repository.sql b/server/src/queries/asset.job.repository.sql
index 3a88642c0e..df8163be3e 100644
--- a/server/src/queries/asset.job.repository.sql
+++ b/server/src/queries/asset.job.repository.sql
@@ -10,10 +10,10 @@ select
   "visibility",
   "smart_search"."embedding"
 from
-  "assets"
-  left join "smart_search" on "assets"."id" = "smart_search"."assetId"
+  "asset"
+  left join "smart_search" on "asset"."id" = "smart_search"."assetId"
 where
-  "assets"."id" = $1::uuid
+  "asset"."id" = $1::uuid
 limit
   $2
 
@@ -28,227 +28,227 @@ select
     from
       (
         select
-          "tags"."value"
+          "tag"."value"
         from
-          "tags"
-          inner join "tag_asset" on "tags"."id" = "tag_asset"."tagsId"
+          "tag"
+          inner join "tag_asset" on "tag"."id" = "tag_asset"."tagsId"
         where
-          "assets"."id" = "tag_asset"."assetsId"
+          "asset"."id" = "tag_asset"."assetsId"
       ) as agg
   ) as "tags"
 from
-  "assets"
+  "asset"
 where
-  "assets"."id" = $1::uuid
+  "asset"."id" = $1::uuid
 limit
   $2
 
 -- AssetJobRepository.streamForThumbnailJob
 select
-  "assets"."id",
-  "assets"."thumbhash",
+  "asset"."id",
+  "asset"."thumbhash",
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "asset_files"."id",
-          "asset_files"."path",
-          "asset_files"."type"
+          "asset_file"."id",
+          "asset_file"."path",
+          "asset_file"."type"
         from
-          "asset_files"
+          "asset_file"
         where
-          "asset_files"."assetId" = "assets"."id"
+          "asset_file"."assetId" = "asset"."id"
       ) as agg
   ) as "files"
 from
-  "assets"
-  inner join "asset_job_status" on "asset_job_status"."assetId" = "assets"."id"
+  "asset"
+  inner join "asset_job_status" on "asset_job_status"."assetId" = "asset"."id"
 where
-  "assets"."deletedAt" is null
-  and "assets"."visibility" != $1
+  "asset"."deletedAt" is null
+  and "asset"."visibility" != $1
   and (
     "asset_job_status"."previewAt" is null
     or "asset_job_status"."thumbnailAt" is null
-    or "assets"."thumbhash" is null
+    or "asset"."thumbhash" is null
   )
 
 -- AssetJobRepository.getForMigrationJob
 select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."encodedVideoPath",
+  "asset"."id",
+  "asset"."ownerId",
+  "asset"."encodedVideoPath",
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "asset_files"."id",
-          "asset_files"."path",
-          "asset_files"."type"
+          "asset_file"."id",
+          "asset_file"."path",
+          "asset_file"."type"
         from
-          "asset_files"
+          "asset_file"
         where
-          "asset_files"."assetId" = "assets"."id"
+          "asset_file"."assetId" = "asset"."id"
       ) as agg
   ) as "files"
 from
-  "assets"
+  "asset"
 where
-  "assets"."id" = $1
+  "asset"."id" = $1
 
 -- AssetJobRepository.getForGenerateThumbnailJob
 select
-  "assets"."id",
-  "assets"."visibility",
-  "assets"."originalFileName",
-  "assets"."originalPath",
-  "assets"."ownerId",
-  "assets"."thumbhash",
-  "assets"."type",
+  "asset"."id",
+  "asset"."visibility",
+  "asset"."originalFileName",
+  "asset"."originalPath",
+  "asset"."ownerId",
+  "asset"."thumbhash",
+  "asset"."type",
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "asset_files"."id",
-          "asset_files"."path",
-          "asset_files"."type"
+          "asset_file"."id",
+          "asset_file"."path",
+          "asset_file"."type"
         from
-          "asset_files"
+          "asset_file"
         where
-          "asset_files"."assetId" = "assets"."id"
+          "asset_file"."assetId" = "asset"."id"
       ) as agg
   ) as "files",
-  to_json("exif") as "exifInfo"
+  to_json("asset_exif") as "exifInfo"
 from
-  "assets"
-  inner join "exif" on "assets"."id" = "exif"."assetId"
+  "asset"
+  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
-  "assets"."id" = $1
+  "asset"."id" = $1
 
 -- AssetJobRepository.getForMetadataExtraction
 select
-  "assets"."id",
-  "assets"."checksum",
-  "assets"."deviceAssetId",
-  "assets"."deviceId",
-  "assets"."fileCreatedAt",
-  "assets"."fileModifiedAt",
-  "assets"."isExternal",
-  "assets"."visibility",
-  "assets"."libraryId",
-  "assets"."livePhotoVideoId",
-  "assets"."localDateTime",
-  "assets"."originalFileName",
-  "assets"."originalPath",
-  "assets"."ownerId",
-  "assets"."sidecarPath",
-  "assets"."type",
+  "asset"."id",
+  "asset"."checksum",
+  "asset"."deviceAssetId",
+  "asset"."deviceId",
+  "asset"."fileCreatedAt",
+  "asset"."fileModifiedAt",
+  "asset"."isExternal",
+  "asset"."visibility",
+  "asset"."libraryId",
+  "asset"."livePhotoVideoId",
+  "asset"."localDateTime",
+  "asset"."originalFileName",
+  "asset"."originalPath",
+  "asset"."ownerId",
+  "asset"."sidecarPath",
+  "asset"."type",
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "asset_faces".*
+          "asset_face".*
         from
-          "asset_faces"
+          "asset_face"
         where
-          "asset_faces"."assetId" = "assets"."id"
-          and "asset_faces"."deletedAt" is null
+          "asset_face"."assetId" = "asset"."id"
+          and "asset_face"."deletedAt" is null
       ) as agg
   ) as "faces"
 from
-  "assets"
+  "asset"
 where
-  "assets"."id" = $1
+  "asset"."id" = $1
 
 -- AssetJobRepository.getAlbumThumbnailFiles
 select
-  "asset_files"."id",
-  "asset_files"."path",
-  "asset_files"."type"
+  "asset_file"."id",
+  "asset_file"."path",
+  "asset_file"."type"
 from
-  "asset_files"
+  "asset_file"
 where
-  "asset_files"."assetId" = $1
-  and "asset_files"."type" = $2
+  "asset_file"."assetId" = $1
+  and "asset_file"."type" = $2
 
 -- AssetJobRepository.streamForSearchDuplicates
 select
-  "assets"."id"
+  "asset"."id"
 from
-  "assets"
-  inner join "smart_search" on "assets"."id" = "smart_search"."assetId"
-  inner join "asset_job_status" as "job_status" on "job_status"."assetId" = "assets"."id"
+  "asset"
+  inner join "smart_search" on "asset"."id" = "smart_search"."assetId"
+  inner join "asset_job_status" as "job_status" on "job_status"."assetId" = "asset"."id"
 where
-  "assets"."deletedAt" is null
-  and "assets"."visibility" in ('archive', 'timeline')
+  "asset"."deletedAt" is null
+  and "asset"."visibility" in ('archive', 'timeline')
   and "job_status"."duplicatesDetectedAt" is null
 
 -- AssetJobRepository.streamForEncodeClip
 select
-  "assets"."id"
+  "asset"."id"
 from
-  "assets"
-  inner join "asset_job_status" as "job_status" on "assetId" = "assets"."id"
+  "asset"
+  inner join "asset_job_status" as "job_status" on "assetId" = "asset"."id"
 where
-  "assets"."visibility" != $1
-  and "assets"."deletedAt" is null
+  "asset"."visibility" != $1
+  and "asset"."deletedAt" is null
   and "job_status"."previewAt" is not null
   and not exists (
     select
     from
       "smart_search"
     where
-      "assetId" = "assets"."id"
+      "assetId" = "asset"."id"
   )
 
 -- AssetJobRepository.getForClipEncoding
 select
-  "assets"."id",
-  "assets"."visibility",
+  "asset"."id",
+  "asset"."visibility",
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "asset_files"."id",
-          "asset_files"."path",
-          "asset_files"."type"
+          "asset_file"."id",
+          "asset_file"."path",
+          "asset_file"."type"
         from
-          "asset_files"
+          "asset_file"
         where
-          "asset_files"."assetId" = "assets"."id"
-          and "asset_files"."type" = $1
+          "asset_file"."assetId" = "asset"."id"
+          and "asset_file"."type" = $1
       ) as agg
   ) as "files"
 from
-  "assets"
+  "asset"
 where
-  "assets"."id" = $2
+  "asset"."id" = $2
 
 -- AssetJobRepository.getForDetectFacesJob
 select
-  "assets"."id",
-  "assets"."visibility",
-  to_json("exif") as "exifInfo",
+  "asset"."id",
+  "asset"."visibility",
+  to_json("asset_exif") as "exifInfo",
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "asset_faces".*
+          "asset_face".*
         from
-          "asset_faces"
+          "asset_face"
         where
-          "asset_faces"."assetId" = "assets"."id"
+          "asset_face"."assetId" = "asset"."id"
       ) as agg
   ) as "faces",
   (
@@ -257,67 +257,67 @@ select
     from
       (
         select
-          "asset_files"."id",
-          "asset_files"."path",
-          "asset_files"."type"
+          "asset_file"."id",
+          "asset_file"."path",
+          "asset_file"."type"
         from
-          "asset_files"
+          "asset_file"
         where
-          "asset_files"."assetId" = "assets"."id"
-          and "asset_files"."type" = $1
+          "asset_file"."assetId" = "asset"."id"
+          and "asset_file"."type" = $1
       ) as agg
   ) as "files"
 from
-  "assets"
-  inner join "exif" on "assets"."id" = "exif"."assetId"
+  "asset"
+  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
-  "assets"."id" = $2
+  "asset"."id" = $2
 
 -- AssetJobRepository.getForSyncAssets
 select
-  "assets"."id",
-  "assets"."isOffline",
-  "assets"."libraryId",
-  "assets"."originalPath",
-  "assets"."status",
-  "assets"."fileModifiedAt"
+  "asset"."id",
+  "asset"."isOffline",
+  "asset"."libraryId",
+  "asset"."originalPath",
+  "asset"."status",
+  "asset"."fileModifiedAt"
 from
-  "assets"
+  "asset"
 where
-  "assets"."id" = any ($1::uuid[])
+  "asset"."id" = any ($1::uuid[])
 
 -- AssetJobRepository.getForAssetDeletion
 select
-  "assets"."id",
-  "assets"."visibility",
-  "assets"."libraryId",
-  "assets"."ownerId",
-  "assets"."livePhotoVideoId",
-  "assets"."sidecarPath",
-  "assets"."encodedVideoPath",
-  "assets"."originalPath",
-  to_json("exif") as "exifInfo",
+  "asset"."id",
+  "asset"."visibility",
+  "asset"."libraryId",
+  "asset"."ownerId",
+  "asset"."livePhotoVideoId",
+  "asset"."sidecarPath",
+  "asset"."encodedVideoPath",
+  "asset"."originalPath",
+  to_json("asset_exif") as "exifInfo",
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "asset_faces".*,
+          "asset_face".*,
           "person" as "person"
         from
-          "asset_faces"
+          "asset_face"
           left join lateral (
             select
               "person".*
             from
               "person"
             where
-              "asset_faces"."personId" = "person"."id"
+              "asset_face"."personId" = "person"."id"
           ) as "person" on true
         where
-          "asset_faces"."assetId" = "assets"."id"
-          and "asset_faces"."deletedAt" is null
+          "asset_face"."assetId" = "asset"."id"
+          and "asset_face"."deletedAt" is null
       ) as agg
   ) as "faces",
   (
@@ -326,156 +326,156 @@ select
     from
       (
         select
-          "asset_files"."id",
-          "asset_files"."path",
-          "asset_files"."type"
+          "asset_file"."id",
+          "asset_file"."path",
+          "asset_file"."type"
         from
-          "asset_files"
+          "asset_file"
         where
-          "asset_files"."assetId" = "assets"."id"
+          "asset_file"."assetId" = "asset"."id"
       ) as agg
   ) as "files",
   to_json("stacked_assets") as "stack"
 from
-  "assets"
-  left join "exif" on "assets"."id" = "exif"."assetId"
-  left join "asset_stack" on "asset_stack"."id" = "assets"."stackId"
+  "asset"
+  left join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
+  left join "stack" on "stack"."id" = "asset"."stackId"
   left join lateral (
     select
-      "asset_stack"."id",
-      "asset_stack"."primaryAssetId",
+      "stack"."id",
+      "stack"."primaryAssetId",
       array_agg("stacked") as "assets"
     from
-      "assets" as "stacked"
+      "asset" as "stacked"
     where
       "stacked"."deletedAt" is not null
       and "stacked"."visibility" = $1
-      and "stacked"."stackId" = "asset_stack"."id"
+      and "stacked"."stackId" = "stack"."id"
     group by
-      "asset_stack"."id"
-  ) as "stacked_assets" on "asset_stack"."id" is not null
+      "stack"."id"
+  ) as "stacked_assets" on "stack"."id" is not null
 where
-  "assets"."id" = $2
+  "asset"."id" = $2
 
 -- AssetJobRepository.streamForVideoConversion
 select
-  "assets"."id"
+  "asset"."id"
 from
-  "assets"
+  "asset"
 where
-  "assets"."type" = $1
+  "asset"."type" = $1
   and (
-    "assets"."encodedVideoPath" is null
-    or "assets"."encodedVideoPath" = $2
+    "asset"."encodedVideoPath" is null
+    or "asset"."encodedVideoPath" = $2
   )
-  and "assets"."visibility" != $3
-  and "assets"."deletedAt" is null
+  and "asset"."visibility" != $3
+  and "asset"."deletedAt" is null
 
 -- AssetJobRepository.getForVideoConversion
 select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."originalPath",
-  "assets"."encodedVideoPath"
+  "asset"."id",
+  "asset"."ownerId",
+  "asset"."originalPath",
+  "asset"."encodedVideoPath"
 from
-  "assets"
+  "asset"
 where
-  "assets"."id" = $1
-  and "assets"."type" = $2
+  "asset"."id" = $1
+  and "asset"."type" = $2
 
 -- AssetJobRepository.streamForMetadataExtraction
 select
-  "assets"."id"
+  "asset"."id"
 from
-  "assets"
-  left join "asset_job_status" on "asset_job_status"."assetId" = "assets"."id"
+  "asset"
+  left join "asset_job_status" on "asset_job_status"."assetId" = "asset"."id"
 where
   (
     "asset_job_status"."metadataExtractedAt" is null
     or "asset_job_status"."assetId" is null
   )
-  and "assets"."deletedAt" is null
+  and "asset"."deletedAt" is null
 
 -- AssetJobRepository.getForStorageTemplateJob
 select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."type",
-  "assets"."checksum",
-  "assets"."originalPath",
-  "assets"."isExternal",
-  "assets"."sidecarPath",
-  "assets"."originalFileName",
-  "assets"."livePhotoVideoId",
-  "assets"."fileCreatedAt",
-  "exif"."timeZone",
-  "exif"."fileSizeInByte"
+  "asset"."id",
+  "asset"."ownerId",
+  "asset"."type",
+  "asset"."checksum",
+  "asset"."originalPath",
+  "asset"."isExternal",
+  "asset"."sidecarPath",
+  "asset"."originalFileName",
+  "asset"."livePhotoVideoId",
+  "asset"."fileCreatedAt",
+  "asset_exif"."timeZone",
+  "asset_exif"."fileSizeInByte"
 from
-  "assets"
-  inner join "exif" on "assets"."id" = "exif"."assetId"
+  "asset"
+  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
-  "assets"."deletedAt" is null
-  and "assets"."id" = $1
+  "asset"."deletedAt" is null
+  and "asset"."id" = $1
 
 -- AssetJobRepository.streamForStorageTemplateJob
 select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."type",
-  "assets"."checksum",
-  "assets"."originalPath",
-  "assets"."isExternal",
-  "assets"."sidecarPath",
-  "assets"."originalFileName",
-  "assets"."livePhotoVideoId",
-  "assets"."fileCreatedAt",
-  "exif"."timeZone",
-  "exif"."fileSizeInByte"
+  "asset"."id",
+  "asset"."ownerId",
+  "asset"."type",
+  "asset"."checksum",
+  "asset"."originalPath",
+  "asset"."isExternal",
+  "asset"."sidecarPath",
+  "asset"."originalFileName",
+  "asset"."livePhotoVideoId",
+  "asset"."fileCreatedAt",
+  "asset_exif"."timeZone",
+  "asset_exif"."fileSizeInByte"
 from
-  "assets"
-  inner join "exif" on "assets"."id" = "exif"."assetId"
+  "asset"
+  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
-  "assets"."deletedAt" is null
+  "asset"."deletedAt" is null
 
 -- AssetJobRepository.streamForDeletedJob
 select
   "id",
   "isOffline"
 from
-  "assets"
+  "asset"
 where
-  "assets"."deletedAt" <= $1
+  "asset"."deletedAt" <= $1
 
 -- AssetJobRepository.streamForSidecar
 select
-  "assets"."id"
+  "asset"."id"
 from
-  "assets"
+  "asset"
 where
   (
-    "assets"."sidecarPath" = $1
-    or "assets"."sidecarPath" is null
+    "asset"."sidecarPath" = $1
+    or "asset"."sidecarPath" is null
   )
-  and "assets"."visibility" != $2
+  and "asset"."visibility" != $2
 
 -- AssetJobRepository.streamForDetectFacesJob
 select
-  "assets"."id"
+  "asset"."id"
 from
-  "assets"
-  inner join "asset_job_status" as "job_status" on "assetId" = "assets"."id"
+  "asset"
+  inner join "asset_job_status" as "job_status" on "assetId" = "asset"."id"
 where
-  "assets"."visibility" != $1
-  and "assets"."deletedAt" is null
+  "asset"."visibility" != $1
+  and "asset"."deletedAt" is null
   and "job_status"."previewAt" is not null
   and "job_status"."facesRecognizedAt" is null
 order by
-  "assets"."createdAt" desc
+  "asset"."createdAt" desc
 
 -- AssetJobRepository.streamForMigrationJob
 select
   "id"
 from
-  "assets"
+  "asset"
 where
-  "assets"."deletedAt" is null
+  "asset"."deletedAt" is null
diff --git a/server/src/queries/asset.repository.sql b/server/src/queries/asset.repository.sql
index a781ea8239..e482a38a9a 100644
--- a/server/src/queries/asset.repository.sql
+++ b/server/src/queries/asset.repository.sql
@@ -1,7 +1,7 @@
 -- NOTE: This file is auto generated by ./sql-generator
 
 -- AssetRepository.updateAllExif
-update "exif"
+update "asset_exif"
 set
   "model" = $1
 where
@@ -23,42 +23,42 @@ with
                   min(("localDateTime" at time zone 'UTC')::date)
                 )::int
               from
-                assets
+                asset
             ),
             date_part('year', current_date)::int - 1
           ) as "year"
       )
     select
       "a".*,
-      to_json("exif") as "exifInfo"
+      to_json("asset_exif") as "exifInfo"
     from
       "today"
       inner join lateral (
         select
-          "assets".*
+          "asset".*
         from
-          "assets"
-          inner join "asset_job_status" on "assets"."id" = "asset_job_status"."assetId"
+          "asset"
+          inner join "asset_job_status" on "asset"."id" = "asset_job_status"."assetId"
         where
           "asset_job_status"."previewAt" is not null
-          and (assets."localDateTime" at time zone 'UTC')::date = today.date
-          and "assets"."ownerId" = any ($3::uuid[])
-          and "assets"."visibility" = $4
+          and (asset."localDateTime" at time zone 'UTC')::date = today.date
+          and "asset"."ownerId" = any ($3::uuid[])
+          and "asset"."visibility" = $4
           and exists (
             select
             from
-              "asset_files"
+              "asset_file"
             where
-              "assetId" = "assets"."id"
-              and "asset_files"."type" = $5
+              "assetId" = "asset"."id"
+              and "asset_file"."type" = $5
           )
-          and "assets"."deletedAt" is null
+          and "asset"."deletedAt" is null
         order by
-          (assets."localDateTime" at time zone 'UTC')::date desc
+          (asset."localDateTime" at time zone 'UTC')::date desc
         limit
           $6
       ) as "a" on true
-      inner join "exif" on "a"."id" = "exif"."assetId"
+      inner join "asset_exif" on "a"."id" = "asset_exif"."assetId"
   )
 select
   date_part(
@@ -75,36 +75,36 @@ order by
 
 -- AssetRepository.getByIds
 select
-  "assets".*
+  "asset".*
 from
-  "assets"
+  "asset"
 where
-  "assets"."id" = any ($1::uuid[])
+  "asset"."id" = any ($1::uuid[])
 
 -- AssetRepository.getByIdsWithAllRelationsButStacks
 select
-  "assets".*,
+  "asset".*,
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "asset_faces".*,
+          "asset_face".*,
           "person" as "person"
         from
-          "asset_faces"
+          "asset_face"
           left join lateral (
             select
               "person".*
             from
               "person"
             where
-              "asset_faces"."personId" = "person"."id"
+              "asset_face"."personId" = "person"."id"
           ) as "person" on true
         where
-          "asset_faces"."assetId" = "assets"."id"
-          and "asset_faces"."deletedAt" is null
+          "asset_face"."assetId" = "asset"."id"
+          and "asset_face"."deletedAt" is null
       ) as agg
   ) as "faces",
   (
@@ -113,36 +113,36 @@ select
     from
       (
         select
-          "tags"."id",
-          "tags"."value",
-          "tags"."createdAt",
-          "tags"."updatedAt",
-          "tags"."color",
-          "tags"."parentId"
+          "tag"."id",
+          "tag"."value",
+          "tag"."createdAt",
+          "tag"."updatedAt",
+          "tag"."color",
+          "tag"."parentId"
         from
-          "tags"
-          inner join "tag_asset" on "tags"."id" = "tag_asset"."tagsId"
+          "tag"
+          inner join "tag_asset" on "tag"."id" = "tag_asset"."tagsId"
         where
-          "assets"."id" = "tag_asset"."assetsId"
+          "asset"."id" = "tag_asset"."assetsId"
       ) as agg
   ) as "tags",
-  to_json("exif") as "exifInfo"
+  to_json("asset_exif") as "exifInfo"
 from
-  "assets"
-  left join "exif" on "assets"."id" = "exif"."assetId"
+  "asset"
+  left join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
-  "assets"."id" = any ($1::uuid[])
+  "asset"."id" = any ($1::uuid[])
 
 -- AssetRepository.deleteAll
-delete from "assets"
+delete from "asset"
 where
   "ownerId" = $1
 
 -- AssetRepository.getByLibraryIdAndOriginalPath
 select
-  "assets".*
+  "asset".*
 from
-  "assets"
+  "asset"
 where
   "libraryId" = $1::uuid
   and "originalPath" = $2
@@ -153,7 +153,7 @@ limit
 select
   "deviceAssetId"
 from
-  "assets"
+  "asset"
 where
   "ownerId" = $1::uuid
   and "deviceId" = $2
@@ -164,22 +164,22 @@ where
 select
   count(*) as "count"
 from
-  "assets"
+  "asset"
 where
   "livePhotoVideoId" = $1::uuid
 
 -- AssetRepository.getById
 select
-  "assets".*
+  "asset".*
 from
-  "assets"
+  "asset"
 where
-  "assets"."id" = $1::uuid
+  "asset"."id" = $1::uuid
 limit
   $2
 
 -- AssetRepository.updateAll
-update "assets"
+update "asset"
 set
   "deviceId" = $1
 where
@@ -187,9 +187,9 @@ where
 
 -- AssetRepository.getByChecksum
 select
-  "assets".*
+  "asset".*
 from
-  "assets"
+  "asset"
 where
   "ownerId" = $1::uuid
   and "checksum" = $2
@@ -203,7 +203,7 @@ select
   "checksum",
   "deletedAt"
 from
-  "assets"
+  "asset"
 where
   "ownerId" = $1::uuid
   and "checksum" in ($2)
@@ -212,7 +212,7 @@ where
 select
   "id"
 from
-  "assets"
+  "asset"
 where
   "ownerId" = $1::uuid
   and "checksum" = $2
@@ -222,20 +222,20 @@ limit
 
 -- AssetRepository.getTimeBuckets
 with
-  "assets" as (
+  "asset" as (
     select
       date_trunc('MONTH', "localDateTime" AT TIME ZONE 'UTC') AT TIME ZONE 'UTC' as "timeBucket"
     from
-      "assets"
+      "asset"
     where
-      "assets"."deletedAt" is null
-      and "assets"."visibility" in ('archive', 'timeline')
+      "asset"."deletedAt" is null
+      and "asset"."visibility" in ('archive', 'timeline')
   )
 select
   ("timeBucket" AT TIME ZONE 'UTC')::date::text as "timeBucket",
   count(*) as "count"
 from
-  "assets"
+  "asset"
 group by
   "timeBucket"
 order by
@@ -245,37 +245,37 @@ order by
 with
   "cte" as (
     select
-      "assets"."duration",
-      "assets"."id",
-      "assets"."visibility",
-      "assets"."isFavorite",
-      assets.type = 'IMAGE' as "isImage",
-      assets."deletedAt" is not null as "isTrashed",
-      "assets"."livePhotoVideoId",
+      "asset"."duration",
+      "asset"."id",
+      "asset"."visibility",
+      "asset"."isFavorite",
+      asset.type = 'IMAGE' as "isImage",
+      asset."deletedAt" is not null as "isTrashed",
+      "asset"."livePhotoVideoId",
       extract(
         epoch
         from
           (
-            assets."localDateTime" - assets."fileCreatedAt" at time zone 'UTC'
+            asset."localDateTime" - asset."fileCreatedAt" at time zone 'UTC'
           )
       )::real / 3600 as "localOffsetHours",
-      "assets"."ownerId",
-      "assets"."status",
-      assets."fileCreatedAt" at time zone 'utc' as "fileCreatedAt",
-      encode("assets"."thumbhash", 'base64') as "thumbhash",
-      "exif"."city",
-      "exif"."country",
-      "exif"."projectionType",
+      "asset"."ownerId",
+      "asset"."status",
+      asset."fileCreatedAt" at time zone 'utc' as "fileCreatedAt",
+      encode("asset"."thumbhash", 'base64') as "thumbhash",
+      "asset_exif"."city",
+      "asset_exif"."country",
+      "asset_exif"."projectionType",
       coalesce(
         case
-          when exif."exifImageHeight" = 0
-          or exif."exifImageWidth" = 0 then 1
-          when "exif"."orientation" in ('5', '6', '7', '8', '-90', '90') then round(
-            exif."exifImageHeight"::numeric / exif."exifImageWidth"::numeric,
+          when asset_exif."exifImageHeight" = 0
+          or asset_exif."exifImageWidth" = 0 then 1
+          when "asset_exif"."orientation" in ('5', '6', '7', '8', '-90', '90') then round(
+            asset_exif."exifImageHeight"::numeric / asset_exif."exifImageWidth"::numeric,
             3
           )
           else round(
-            exif."exifImageWidth"::numeric / exif."exifImageHeight"::numeric,
+            asset_exif."exifImageWidth"::numeric / asset_exif."exifImageHeight"::numeric,
             3
           )
         end,
@@ -283,34 +283,34 @@ with
       ) as "ratio",
       "stack"
     from
-      "assets"
-      inner join "exif" on "assets"."id" = "exif"."assetId"
+      "asset"
+      inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
       left join lateral (
         select
           array[stacked."stackId"::text, count('stacked')::text] as "stack"
         from
-          "assets" as "stacked"
+          "asset" as "stacked"
         where
-          "stacked"."stackId" = "assets"."stackId"
+          "stacked"."stackId" = "asset"."stackId"
           and "stacked"."deletedAt" is null
           and "stacked"."visibility" = $1
         group by
           "stacked"."stackId"
       ) as "stacked_assets" on true
     where
-      "assets"."deletedAt" is null
-      and "assets"."visibility" in ('archive', 'timeline')
+      "asset"."deletedAt" is null
+      and "asset"."visibility" in ('archive', 'timeline')
       and date_trunc('MONTH', "localDateTime" AT TIME ZONE 'UTC') AT TIME ZONE 'UTC' = $2
       and not exists (
         select
         from
-          "asset_stack"
+          "stack"
         where
-          "asset_stack"."id" = "assets"."stackId"
-          and "asset_stack"."primaryAssetId" != "assets"."id"
+          "stack"."id" = "asset"."stackId"
+          and "stack"."primaryAssetId" != "asset"."id"
       )
     order by
-      "assets"."fileCreatedAt" desc
+      "asset"."fileCreatedAt" desc
   ),
   "agg" as (
     select
@@ -345,7 +345,7 @@ with
     select
       "city"
     from
-      "exif"
+      "asset_exif"
     where
       "city" is not null
     group by
@@ -354,12 +354,12 @@ with
       count("assetId") >= $1
   )
 select distinct
-  on ("exif"."city") "assetId" as "data",
-  "exif"."city" as "value"
+  on ("asset_exif"."city") "assetId" as "data",
+  "asset_exif"."city" as "value"
 from
-  "assets"
-  inner join "exif" on "assets"."id" = "exif"."assetId"
-  inner join "cities" on "exif"."city" = "cities"."city"
+  "asset"
+  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
+  inner join "cities" on "asset_exif"."city" = "cities"."city"
 where
   "ownerId" = $2::uuid
   and "visibility" = $3
@@ -370,63 +370,63 @@ limit
 
 -- AssetRepository.getAllForUserFullSync
 select
-  "assets".*,
-  to_json("exif") as "exifInfo",
+  "asset".*,
+  to_json("asset_exif") as "exifInfo",
   to_json("stacked_assets") as "stack"
 from
-  "assets"
-  left join "exif" on "assets"."id" = "exif"."assetId"
-  left join "asset_stack" on "asset_stack"."id" = "assets"."stackId"
+  "asset"
+  left join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
+  left join "stack" on "stack"."id" = "asset"."stackId"
   left join lateral (
     select
-      "asset_stack".*,
+      "stack".*,
       count("stacked") as "assetCount"
     from
-      "assets" as "stacked"
+      "asset" as "stacked"
     where
-      "stacked"."stackId" = "asset_stack"."id"
+      "stacked"."stackId" = "stack"."id"
     group by
-      "asset_stack"."id"
-  ) as "stacked_assets" on "asset_stack"."id" is not null
+      "stack"."id"
+  ) as "stacked_assets" on "stack"."id" is not null
 where
-  "assets"."ownerId" = $1::uuid
-  and "assets"."visibility" != $2
-  and "assets"."updatedAt" <= $3
-  and "assets"."id" > $4
+  "asset"."ownerId" = $1::uuid
+  and "asset"."visibility" != $2
+  and "asset"."updatedAt" <= $3
+  and "asset"."id" > $4
 order by
-  "assets"."id"
+  "asset"."id"
 limit
   $5
 
 -- AssetRepository.getChangedDeltaSync
 select
-  "assets".*,
-  to_json("exif") as "exifInfo",
+  "asset".*,
+  to_json("asset_exif") as "exifInfo",
   to_json("stacked_assets") as "stack"
 from
-  "assets"
-  left join "exif" on "assets"."id" = "exif"."assetId"
-  left join "asset_stack" on "asset_stack"."id" = "assets"."stackId"
+  "asset"
+  left join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
+  left join "stack" on "stack"."id" = "asset"."stackId"
   left join lateral (
     select
-      "asset_stack".*,
+      "stack".*,
       count("stacked") as "assetCount"
     from
-      "assets" as "stacked"
+      "asset" as "stacked"
     where
-      "stacked"."stackId" = "asset_stack"."id"
+      "stacked"."stackId" = "stack"."id"
     group by
-      "asset_stack"."id"
-  ) as "stacked_assets" on "asset_stack"."id" is not null
+      "stack"."id"
+  ) as "stacked_assets" on "stack"."id" is not null
 where
-  "assets"."ownerId" = any ($1::uuid[])
-  and "assets"."visibility" != $2
-  and "assets"."updatedAt" > $3
+  "asset"."ownerId" = any ($1::uuid[])
+  and "asset"."visibility" != $2
+  and "asset"."updatedAt" > $3
 limit
   $4
 
 -- AssetRepository.detectOfflineExternalAssets
-update "assets"
+update "asset"
 set
   "isOffline" = $1,
   "deletedAt" = $2
@@ -449,9 +449,9 @@ where
     select
       "originalPath"
     from
-      "assets"
+      "asset"
     where
-      "assets"."originalPath" = "path"
+      "asset"."originalPath" = "path"
       and "libraryId" = $2::uuid
       and "isExternal" = $3
   )
diff --git a/server/src/queries/duplicate.repository.sql b/server/src/queries/duplicate.repository.sql
index 727ddd5b8d..8913007dea 100644
--- a/server/src/queries/duplicate.repository.sql
+++ b/server/src/queries/duplicate.repository.sql
@@ -4,31 +4,31 @@
 with
   "duplicates" as (
     select
-      "assets"."duplicateId",
+      "asset"."duplicateId",
       json_agg(
-        "asset"
+        "asset2"
         order by
-          "assets"."localDateTime" asc
+          "asset"."localDateTime" asc
       ) as "assets"
     from
-      "assets"
+      "asset"
       left join lateral (
         select
-          "assets".*,
-          "exif" as "exifInfo"
+          "asset".*,
+          "asset_exif" as "exifInfo"
         from
-          "exif"
+          "asset_exif"
         where
-          "exif"."assetId" = "assets"."id"
-      ) as "asset" on true
+          "asset_exif"."assetId" = "asset"."id"
+      ) as "asset2" on true
     where
-      "assets"."visibility" in ('archive', 'timeline')
-      and "assets"."ownerId" = $1::uuid
-      and "assets"."duplicateId" is not null
-      and "assets"."deletedAt" is null
-      and "assets"."stackId" is null
+      "asset"."visibility" in ('archive', 'timeline')
+      and "asset"."ownerId" = $1::uuid
+      and "asset"."duplicateId" is not null
+      and "asset"."deletedAt" is null
+      and "asset"."stackId" is null
     group by
-      "assets"."duplicateId"
+      "asset"."duplicateId"
   ),
   "unique" as (
     select
@@ -39,13 +39,13 @@ with
       json_array_length("assets") = $2
   ),
   "removed_unique" as (
-    update "assets"
+    update "asset"
     set
       "duplicateId" = $3
     from
       "unique"
     where
-      "assets"."duplicateId" = "unique"."duplicateId"
+      "asset"."duplicateId" = "unique"."duplicateId"
   )
 select
   *
@@ -61,7 +61,7 @@ where
   )
 
 -- DuplicateRepository.delete
-update "assets"
+update "asset"
 set
   "duplicateId" = $1
 where
@@ -69,7 +69,7 @@ where
   and "duplicateId" = $3
 
 -- DuplicateRepository.deleteAll
-update "assets"
+update "asset"
 set
   "duplicateId" = $1
 where
@@ -83,19 +83,19 @@ set
 with
   "cte" as (
     select
-      "assets"."id" as "assetId",
-      "assets"."duplicateId",
+      "asset"."id" as "assetId",
+      "asset"."duplicateId",
       smart_search.embedding <=> $1 as "distance"
     from
-      "assets"
-      inner join "smart_search" on "assets"."id" = "smart_search"."assetId"
+      "asset"
+      inner join "smart_search" on "asset"."id" = "smart_search"."assetId"
     where
-      "assets"."visibility" in ('archive', 'timeline')
-      and "assets"."ownerId" = any ($2::uuid[])
-      and "assets"."deletedAt" is null
-      and "assets"."type" = $3
-      and "assets"."id" != $4::uuid
-      and "assets"."stackId" is null
+      "asset"."visibility" in ('archive', 'timeline')
+      and "asset"."ownerId" = any ($2::uuid[])
+      and "asset"."deletedAt" is null
+      and "asset"."type" = $3
+      and "asset"."id" != $4::uuid
+      and "asset"."stackId" is null
     order by
       "distance"
     limit
@@ -110,7 +110,7 @@ where
 commit
 
 -- DuplicateRepository.merge
-update "assets"
+update "asset"
 set
 where
   (
diff --git a/server/src/queries/library.repository.sql b/server/src/queries/library.repository.sql
index f17d9663d6..f0bd05973f 100644
--- a/server/src/queries/library.repository.sql
+++ b/server/src/queries/library.repository.sql
@@ -2,30 +2,30 @@
 
 -- LibraryRepository.get
 select
-  "libraries".*
+  "library".*
 from
-  "libraries"
+  "library"
 where
-  "libraries"."id" = $1
-  and "libraries"."deletedAt" is null
+  "library"."id" = $1
+  and "library"."deletedAt" is null
 
 -- LibraryRepository.getAll
 select
-  "libraries".*
+  "library".*
 from
-  "libraries"
+  "library"
 where
-  "libraries"."deletedAt" is null
+  "library"."deletedAt" is null
 order by
   "createdAt" asc
 
 -- LibraryRepository.getAllDeleted
 select
-  "libraries".*
+  "library".*
 from
-  "libraries"
+  "library"
 where
-  "libraries"."deletedAt" is not null
+  "library"."deletedAt" is not null
 order by
   "createdAt" asc
 
@@ -34,32 +34,32 @@ select
   count(*) filter (
     where
       (
-        "assets"."type" = $1
-        and "assets"."visibility" != $2
+        "asset"."type" = $1
+        and "asset"."visibility" != $2
       )
   ) as "photos",
   count(*) filter (
     where
       (
-        "assets"."type" = $3
-        and "assets"."visibility" != $4
+        "asset"."type" = $3
+        and "asset"."visibility" != $4
       )
   ) as "videos",
-  coalesce(sum("exif"."fileSizeInByte"), $5) as "usage"
+  coalesce(sum("asset_exif"."fileSizeInByte"), $5) as "usage"
 from
-  "libraries"
-  inner join "assets" on "assets"."libraryId" = "libraries"."id"
-  left join "exif" on "exif"."assetId" = "assets"."id"
+  "library"
+  inner join "asset" on "asset"."libraryId" = "library"."id"
+  left join "asset_exif" on "asset_exif"."assetId" = "asset"."id"
 where
-  "libraries"."id" = $6
+  "library"."id" = $6
 group by
-  "libraries"."id"
+  "library"."id"
 select
   0::int as "photos",
   0::int as "videos",
   0::int as "usage",
   0::int as "total"
 from
-  "libraries"
+  "library"
 where
-  "libraries"."id" = $1
+  "library"."id" = $1
diff --git a/server/src/queries/map.repository.sql b/server/src/queries/map.repository.sql
index edfdec13d2..df2136a422 100644
--- a/server/src/queries/map.repository.sql
+++ b/server/src/queries/map.repository.sql
@@ -3,28 +3,28 @@
 -- MapRepository.getMapMarkers
 select
   "id",
-  "exif"."latitude" as "lat",
-  "exif"."longitude" as "lon",
-  "exif"."city",
-  "exif"."state",
-  "exif"."country"
+  "asset_exif"."latitude" as "lat",
+  "asset_exif"."longitude" as "lon",
+  "asset_exif"."city",
+  "asset_exif"."state",
+  "asset_exif"."country"
 from
-  "assets"
-  inner join "exif" on "assets"."id" = "exif"."assetId"
-  and "exif"."latitude" is not null
-  and "exif"."longitude" is not null
+  "asset"
+  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
+  and "asset_exif"."latitude" is not null
+  and "asset_exif"."longitude" is not null
 where
-  "assets"."visibility" = $1
+  "asset"."visibility" = $1
   and "deletedAt" is null
   and (
     "ownerId" in ($2)
     or exists (
       select
       from
-        "albums_assets_assets"
+        "album_asset"
       where
-        "assets"."id" = "albums_assets_assets"."assetsId"
-        and "albums_assets_assets"."albumsId" in ($3)
+        "asset"."id" = "album_asset"."assetsId"
+        and "album_asset"."albumsId" in ($3)
     )
   )
 order by
diff --git a/server/src/queries/memory.repository.sql b/server/src/queries/memory.repository.sql
index 3cdda8a45c..b3cc7240ae 100644
--- a/server/src/queries/memory.repository.sql
+++ b/server/src/queries/memory.repository.sql
@@ -4,7 +4,7 @@
 select
   count(*) as "total"
 from
-  "memories"
+  "memory"
 where
   "deletedAt" is null
   and "ownerId" = $1
@@ -13,7 +13,7 @@ where
 select
   count(*) as "total"
 from
-  "memories"
+  "memory"
 where
   (
     "showAt" is null
@@ -34,21 +34,21 @@ select
     from
       (
         select
-          "assets".*
+          "asset".*
         from
-          "assets"
-          inner join "memories_assets_assets" on "assets"."id" = "memories_assets_assets"."assetsId"
+          "asset"
+          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetsId"
         where
-          "memories_assets_assets"."memoriesId" = "memories"."id"
-          and "assets"."visibility" = 'timeline'
-          and "assets"."deletedAt" is null
+          "memory_asset"."memoriesId" = "memory"."id"
+          and "asset"."visibility" = 'timeline'
+          and "asset"."deletedAt" is null
         order by
-          "assets"."fileCreatedAt" asc
+          "asset"."fileCreatedAt" asc
       ) as agg
   ) as "assets",
-  "memories".*
+  "memory".*
 from
-  "memories"
+  "memory"
 where
   "deletedAt" is null
   and "ownerId" = $1
@@ -63,21 +63,21 @@ select
     from
       (
         select
-          "assets".*
+          "asset".*
         from
-          "assets"
-          inner join "memories_assets_assets" on "assets"."id" = "memories_assets_assets"."assetsId"
+          "asset"
+          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetsId"
         where
-          "memories_assets_assets"."memoriesId" = "memories"."id"
-          and "assets"."visibility" = 'timeline'
-          and "assets"."deletedAt" is null
+          "memory_asset"."memoriesId" = "memory"."id"
+          and "asset"."visibility" = 'timeline'
+          and "asset"."deletedAt" is null
         order by
-          "assets"."fileCreatedAt" asc
+          "asset"."fileCreatedAt" asc
       ) as agg
   ) as "assets",
-  "memories".*
+  "memory".*
 from
-  "memories"
+  "memory"
 where
   (
     "showAt" is null
@@ -94,66 +94,66 @@ order by
 
 -- MemoryRepository.get
 select
-  "memories".*,
+  "memory".*,
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "assets".*
+          "asset".*
         from
-          "assets"
-          inner join "memories_assets_assets" on "assets"."id" = "memories_assets_assets"."assetsId"
+          "asset"
+          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetsId"
         where
-          "memories_assets_assets"."memoriesId" = "memories"."id"
-          and "assets"."visibility" = 'timeline'
-          and "assets"."deletedAt" is null
+          "memory_asset"."memoriesId" = "memory"."id"
+          and "asset"."visibility" = 'timeline'
+          and "asset"."deletedAt" is null
         order by
-          "assets"."fileCreatedAt" asc
+          "asset"."fileCreatedAt" asc
       ) as agg
   ) as "assets"
 from
-  "memories"
+  "memory"
 where
   "id" = $1
   and "deletedAt" is null
 
 -- MemoryRepository.update
-update "memories"
+update "memory"
 set
   "ownerId" = $1,
   "isSaved" = $2
 where
   "id" = $3
 select
-  "memories".*,
+  "memory".*,
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "assets".*
+          "asset".*
         from
-          "assets"
-          inner join "memories_assets_assets" on "assets"."id" = "memories_assets_assets"."assetsId"
+          "asset"
+          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetsId"
         where
-          "memories_assets_assets"."memoriesId" = "memories"."id"
-          and "assets"."visibility" = 'timeline'
-          and "assets"."deletedAt" is null
+          "memory_asset"."memoriesId" = "memory"."id"
+          and "asset"."visibility" = 'timeline'
+          and "asset"."deletedAt" is null
         order by
-          "assets"."fileCreatedAt" asc
+          "asset"."fileCreatedAt" asc
       ) as agg
   ) as "assets"
 from
-  "memories"
+  "memory"
 where
   "id" = $1
   and "deletedAt" is null
 
 -- MemoryRepository.delete
-delete from "memories"
+delete from "memory"
 where
   "id" = $1
 
@@ -161,13 +161,13 @@ where
 select
   "assetsId"
 from
-  "memories_assets_assets"
+  "memory_asset"
 where
   "memoriesId" = $1
   and "assetsId" in ($2)
 
 -- MemoryRepository.addAssetIds
 insert into
-  "memories_assets_assets" ("memoriesId", "assetsId")
+  "memory_asset" ("memoriesId", "assetsId")
 values
   ($1, $2)
diff --git a/server/src/queries/notification.repository.sql b/server/src/queries/notification.repository.sql
index f7e211d80a..cc704af2be 100644
--- a/server/src/queries/notification.repository.sql
+++ b/server/src/queries/notification.repository.sql
@@ -11,7 +11,7 @@ select
   "data",
   "readAt"
 from
-  "notifications"
+  "notification"
 where
   "userId" = $1
   and "deletedAt" is null
@@ -29,7 +29,7 @@ select
   "data",
   "readAt"
 from
-  "notifications"
+  "notification"
 where
   (
     "userId" = $1
diff --git a/server/src/queries/partner.repository.sql b/server/src/queries/partner.repository.sql
index 100f1bc638..213aa27d93 100644
--- a/server/src/queries/partner.repository.sql
+++ b/server/src/queries/partner.repository.sql
@@ -2,7 +2,7 @@
 
 -- PartnerRepository.getAll
 select
-  "partners".*,
+  "partner".*,
   (
     select
       to_json(obj)
@@ -16,9 +16,9 @@ select
           "profileImagePath",
           "profileChangedAt"
         from
-          "users" as "sharedBy"
+          "user" as "sharedBy"
         where
-          "sharedBy"."id" = "partners"."sharedById"
+          "sharedBy"."id" = "partner"."sharedById"
       ) as obj
   ) as "sharedBy",
   (
@@ -34,16 +34,16 @@ select
           "profileImagePath",
           "profileChangedAt"
         from
-          "users" as "sharedWith"
+          "user" as "sharedWith"
         where
-          "sharedWith"."id" = "partners"."sharedWithId"
+          "sharedWith"."id" = "partner"."sharedWithId"
       ) as obj
   ) as "sharedWith"
 from
-  "partners"
-  inner join "users" as "sharedBy" on "partners"."sharedById" = "sharedBy"."id"
+  "partner"
+  inner join "user" as "sharedBy" on "partner"."sharedById" = "sharedBy"."id"
   and "sharedBy"."deletedAt" is null
-  inner join "users" as "sharedWith" on "partners"."sharedWithId" = "sharedWith"."id"
+  inner join "user" as "sharedWith" on "partner"."sharedWithId" = "sharedWith"."id"
   and "sharedWith"."deletedAt" is null
 where
   (
@@ -53,7 +53,7 @@ where
 
 -- PartnerRepository.get
 select
-  "partners".*,
+  "partner".*,
   (
     select
       to_json(obj)
@@ -67,9 +67,9 @@ select
           "profileImagePath",
           "profileChangedAt"
         from
-          "users" as "sharedBy"
+          "user" as "sharedBy"
         where
-          "sharedBy"."id" = "partners"."sharedById"
+          "sharedBy"."id" = "partner"."sharedById"
       ) as obj
   ) as "sharedBy",
   (
@@ -85,23 +85,23 @@ select
           "profileImagePath",
           "profileChangedAt"
         from
-          "users" as "sharedWith"
+          "user" as "sharedWith"
         where
-          "sharedWith"."id" = "partners"."sharedWithId"
+          "sharedWith"."id" = "partner"."sharedWithId"
       ) as obj
   ) as "sharedWith"
 from
-  "partners"
-  inner join "users" as "sharedBy" on "partners"."sharedById" = "sharedBy"."id"
+  "partner"
+  inner join "user" as "sharedBy" on "partner"."sharedById" = "sharedBy"."id"
   and "sharedBy"."deletedAt" is null
-  inner join "users" as "sharedWith" on "partners"."sharedWithId" = "sharedWith"."id"
+  inner join "user" as "sharedWith" on "partner"."sharedWithId" = "sharedWith"."id"
   and "sharedWith"."deletedAt" is null
 where
   "sharedWithId" = $1
   and "sharedById" = $2
 
 -- PartnerRepository.update
-update "partners"
+update "partner"
 set
   "inTimeline" = $1
 where
@@ -122,9 +122,9 @@ returning
           "profileImagePath",
           "profileChangedAt"
         from
-          "users" as "sharedBy"
+          "user" as "sharedBy"
         where
-          "sharedBy"."id" = "partners"."sharedById"
+          "sharedBy"."id" = "partner"."sharedById"
       ) as obj
   ) as "sharedBy",
   (
@@ -140,14 +140,14 @@ returning
           "profileImagePath",
           "profileChangedAt"
         from
-          "users" as "sharedWith"
+          "user" as "sharedWith"
         where
-          "sharedWith"."id" = "partners"."sharedWithId"
+          "sharedWith"."id" = "partner"."sharedWithId"
       ) as obj
   ) as "sharedWith"
 
 -- PartnerRepository.remove
-delete from "partners"
+delete from "partner"
 where
   "sharedWithId" = $1
   and "sharedById" = $2
diff --git a/server/src/queries/person.repository.sql b/server/src/queries/person.repository.sql
index cbd952cd04..3e41edde9c 100644
--- a/server/src/queries/person.repository.sql
+++ b/server/src/queries/person.repository.sql
@@ -1,11 +1,11 @@
 -- NOTE: This file is auto generated by ./sql-generator
 
 -- PersonRepository.reassignFaces
-update "asset_faces"
+update "asset_face"
 set
   "personId" = $1
 where
-  "asset_faces"."personId" = $2
+  "asset_face"."personId" = $2
 
 -- PersonRepository.delete
 delete from "person"
@@ -17,26 +17,26 @@ select
   "person".*
 from
   "person"
-  inner join "asset_faces" on "asset_faces"."personId" = "person"."id"
-  inner join "assets" on "asset_faces"."assetId" = "assets"."id"
-  and "assets"."visibility" = 'timeline'
-  and "assets"."deletedAt" is null
+  inner join "asset_face" on "asset_face"."personId" = "person"."id"
+  inner join "asset" on "asset_face"."assetId" = "asset"."id"
+  and "asset"."visibility" = 'timeline'
+  and "asset"."deletedAt" is null
 where
   "person"."ownerId" = $1
-  and "asset_faces"."deletedAt" is null
+  and "asset_face"."deletedAt" is null
   and "person"."isHidden" = $2
 group by
   "person"."id"
 having
   (
     "person"."name" != $3
-    or count("asset_faces"."assetId") >= $4
+    or count("asset_face"."assetId") >= $4
   )
 order by
   "person"."isHidden" asc,
   "person"."isFavorite" desc,
   NULLIF(person.name, '') is null asc,
-  count("asset_faces"."assetId") desc,
+  count("asset_face"."assetId") desc,
   NULLIF(person.name, '') asc nulls last,
   "person"."createdAt"
 limit
@@ -49,17 +49,17 @@ select
   "person".*
 from
   "person"
-  left join "asset_faces" on "asset_faces"."personId" = "person"."id"
+  left join "asset_face" on "asset_face"."personId" = "person"."id"
 where
-  "asset_faces"."deletedAt" is null
+  "asset_face"."deletedAt" is null
 group by
   "person"."id"
 having
-  count("asset_faces"."assetId") = $1
+  count("asset_face"."assetId") = $1
 
 -- PersonRepository.getFaces
 select
-  "asset_faces".*,
+  "asset_face".*,
   (
     select
       to_json(obj)
@@ -70,20 +70,20 @@ select
         from
           "person"
         where
-          "person"."id" = "asset_faces"."personId"
+          "person"."id" = "asset_face"."personId"
       ) as obj
   ) as "person"
 from
-  "asset_faces"
+  "asset_face"
 where
-  "asset_faces"."assetId" = $1
-  and "asset_faces"."deletedAt" is null
+  "asset_face"."assetId" = $1
+  and "asset_face"."deletedAt" is null
 order by
-  "asset_faces"."boundingBoxX1" asc
+  "asset_face"."boundingBoxX1" asc
 
 -- PersonRepository.getFaceById
 select
-  "asset_faces".*,
+  "asset_face".*,
   (
     select
       to_json(obj)
@@ -94,33 +94,33 @@ select
         from
           "person"
         where
-          "person"."id" = "asset_faces"."personId"
+          "person"."id" = "asset_face"."personId"
       ) as obj
   ) as "person"
 from
-  "asset_faces"
+  "asset_face"
 where
-  "asset_faces"."id" = $1
-  and "asset_faces"."deletedAt" is null
+  "asset_face"."id" = $1
+  and "asset_face"."deletedAt" is null
 
 -- PersonRepository.getFaceForFacialRecognitionJob
 select
-  "asset_faces"."id",
-  "asset_faces"."personId",
-  "asset_faces"."sourceType",
+  "asset_face"."id",
+  "asset_face"."personId",
+  "asset_face"."sourceType",
   (
     select
       to_json(obj)
     from
       (
         select
-          "assets"."ownerId",
-          "assets"."visibility",
-          "assets"."fileCreatedAt"
+          "asset"."ownerId",
+          "asset"."visibility",
+          "asset"."fileCreatedAt"
         from
-          "assets"
+          "asset"
         where
-          "assets"."id" = "asset_faces"."assetId"
+          "asset"."id" = "asset_face"."assetId"
       ) as obj
   ) as "asset",
   (
@@ -133,51 +133,51 @@ select
         from
           "face_search"
         where
-          "face_search"."faceId" = "asset_faces"."id"
+          "face_search"."faceId" = "asset_face"."id"
       ) as obj
   ) as "faceSearch"
 from
-  "asset_faces"
+  "asset_face"
 where
-  "asset_faces"."id" = $1
-  and "asset_faces"."deletedAt" is null
+  "asset_face"."id" = $1
+  and "asset_face"."deletedAt" is null
 
 -- PersonRepository.getDataForThumbnailGenerationJob
 select
   "person"."ownerId",
-  "asset_faces"."boundingBoxX1" as "x1",
-  "asset_faces"."boundingBoxY1" as "y1",
-  "asset_faces"."boundingBoxX2" as "x2",
-  "asset_faces"."boundingBoxY2" as "y2",
-  "asset_faces"."imageWidth" as "oldWidth",
-  "asset_faces"."imageHeight" as "oldHeight",
-  "assets"."type",
-  "assets"."originalPath",
-  "exif"."orientation" as "exifOrientation",
+  "asset_face"."boundingBoxX1" as "x1",
+  "asset_face"."boundingBoxY1" as "y1",
+  "asset_face"."boundingBoxX2" as "x2",
+  "asset_face"."boundingBoxY2" as "y2",
+  "asset_face"."imageWidth" as "oldWidth",
+  "asset_face"."imageHeight" as "oldHeight",
+  "asset"."type",
+  "asset"."originalPath",
+  "asset_exif"."orientation" as "exifOrientation",
   (
     select
-      "asset_files"."path"
+      "asset_file"."path"
     from
-      "asset_files"
+      "asset_file"
     where
-      "asset_files"."assetId" = "assets"."id"
-      and "asset_files"."type" = 'preview'
+      "asset_file"."assetId" = "asset"."id"
+      and "asset_file"."type" = 'preview'
   ) as "previewPath"
 from
   "person"
-  inner join "asset_faces" on "asset_faces"."id" = "person"."faceAssetId"
-  inner join "assets" on "asset_faces"."assetId" = "assets"."id"
-  left join "exif" on "exif"."assetId" = "assets"."id"
+  inner join "asset_face" on "asset_face"."id" = "person"."faceAssetId"
+  inner join "asset" on "asset_face"."assetId" = "asset"."id"
+  left join "asset_exif" on "asset_exif"."assetId" = "asset"."id"
 where
   "person"."id" = $1
-  and "asset_faces"."deletedAt" is null
+  and "asset_face"."deletedAt" is null
 
 -- PersonRepository.reassignFace
-update "asset_faces"
+update "asset_face"
 set
   "personId" = $1
 where
-  "asset_faces"."id" = $2
+  "asset_face"."id" = $2
 
 -- PersonRepository.getByName
 select
@@ -209,15 +209,15 @@ where
 
 -- PersonRepository.getStatistics
 select
-  count(distinct ("assets"."id")) as "count"
+  count(distinct ("asset"."id")) as "count"
 from
-  "asset_faces"
-  left join "assets" on "assets"."id" = "asset_faces"."assetId"
-  and "asset_faces"."personId" = $1
-  and "assets"."visibility" = 'timeline'
-  and "assets"."deletedAt" is null
+  "asset_face"
+  left join "asset" on "asset"."id" = "asset_face"."assetId"
+  and "asset_face"."personId" = $1
+  and "asset"."visibility" = 'timeline'
+  and "asset"."deletedAt" is null
 where
-  "asset_faces"."deletedAt" is null
+  "asset_face"."deletedAt" is null
 
 -- PersonRepository.getNumberOfPeople
 select
@@ -235,18 +235,18 @@ where
   exists (
     select
     from
-      "asset_faces"
+      "asset_face"
     where
-      "asset_faces"."personId" = "person"."id"
-      and "asset_faces"."deletedAt" is null
+      "asset_face"."personId" = "person"."id"
+      and "asset_face"."deletedAt" is null
       and exists (
         select
         from
-          "assets"
+          "asset"
         where
-          "assets"."id" = "asset_faces"."assetId"
-          and "assets"."visibility" = 'timeline'
-          and "assets"."deletedAt" is null
+          "asset"."id" = "asset_face"."assetId"
+          and "asset"."visibility" = 'timeline'
+          and "asset"."deletedAt" is null
       )
   )
   and "person"."ownerId" = $2
@@ -268,18 +268,18 @@ from
 
 -- PersonRepository.getFacesByIds
 select
-  "asset_faces".*,
+  "asset_face".*,
   (
     select
       to_json(obj)
     from
       (
         select
-          "assets".*
+          "asset".*
         from
-          "assets"
+          "asset"
         where
-          "assets"."id" = "asset_faces"."assetId"
+          "asset"."id" = "asset_face"."assetId"
       ) as obj
   ) as "asset",
   (
@@ -292,24 +292,24 @@ select
         from
           "person"
         where
-          "person"."id" = "asset_faces"."personId"
+          "person"."id" = "asset_face"."personId"
       ) as obj
   ) as "person"
 from
-  "asset_faces"
+  "asset_face"
 where
-  "asset_faces"."assetId" in ($1)
-  and "asset_faces"."personId" in ($2)
-  and "asset_faces"."deletedAt" is null
+  "asset_face"."assetId" in ($1)
+  and "asset_face"."personId" in ($2)
+  and "asset_face"."deletedAt" is null
 
 -- PersonRepository.getRandomFace
 select
-  "asset_faces".*
+  "asset_face".*
 from
-  "asset_faces"
+  "asset_face"
 where
-  "asset_faces"."personId" = $1
-  and "asset_faces"."deletedAt" is null
+  "asset_face"."personId" = $1
+  and "asset_face"."deletedAt" is null
 
 -- PersonRepository.getLatestFaceDate
 select
@@ -318,16 +318,16 @@ from
   "asset_job_status"
 
 -- PersonRepository.deleteAssetFace
-delete from "asset_faces"
+delete from "asset_face"
 where
-  "asset_faces"."id" = $1
+  "asset_face"."id" = $1
 
 -- PersonRepository.softDeleteAssetFaces
-update "asset_faces"
+update "asset_face"
 set
   "deletedAt" = $1
 where
-  "asset_faces"."id" = $2
+  "asset_face"."id" = $2
 
 -- PersonRepository.getForPeopleDelete
 select
diff --git a/server/src/queries/search.repository.sql b/server/src/queries/search.repository.sql
index abbc063e8f..ef5363126f 100644
--- a/server/src/queries/search.repository.sql
+++ b/server/src/queries/search.repository.sql
@@ -2,19 +2,19 @@
 
 -- SearchRepository.searchMetadata
 select
-  "assets".*
+  "asset".*
 from
-  "assets"
-  inner join "exif" on "assets"."id" = "exif"."assetId"
+  "asset"
+  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
-  "assets"."visibility" = $1
-  and "assets"."fileCreatedAt" >= $2
-  and "exif"."lensModel" = $3
-  and "assets"."ownerId" = any ($4::uuid[])
-  and "assets"."isFavorite" = $5
-  and "assets"."deletedAt" is null
+  "asset"."visibility" = $1
+  and "asset"."fileCreatedAt" >= $2
+  and "asset_exif"."lensModel" = $3
+  and "asset"."ownerId" = any ($4::uuid[])
+  and "asset"."isFavorite" = $5
+  and "asset"."deletedAt" is null
 order by
-  "assets"."fileCreatedAt" desc
+  "asset"."fileCreatedAt" desc
 limit
   $6
 offset
@@ -24,31 +24,31 @@ offset
 select
   count(*) as "total"
 from
-  "assets"
-  inner join "exif" on "assets"."id" = "exif"."assetId"
+  "asset"
+  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
-  "assets"."visibility" = $1
-  and "assets"."fileCreatedAt" >= $2
-  and "exif"."lensModel" = $3
-  and "assets"."ownerId" = any ($4::uuid[])
-  and "assets"."isFavorite" = $5
-  and "assets"."deletedAt" is null
+  "asset"."visibility" = $1
+  and "asset"."fileCreatedAt" >= $2
+  and "asset_exif"."lensModel" = $3
+  and "asset"."ownerId" = any ($4::uuid[])
+  and "asset"."isFavorite" = $5
+  and "asset"."deletedAt" is null
 
 -- SearchRepository.searchRandom
 (
   select
-    "assets".*
+    "asset".*
   from
-    "assets"
-    inner join "exif" on "assets"."id" = "exif"."assetId"
+    "asset"
+    inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
   where
-    "assets"."visibility" = $1
-    and "assets"."fileCreatedAt" >= $2
-    and "exif"."lensModel" = $3
-    and "assets"."ownerId" = any ($4::uuid[])
-    and "assets"."isFavorite" = $5
-    and "assets"."deletedAt" is null
-    and "assets"."id" < $6
+    "asset"."visibility" = $1
+    and "asset"."fileCreatedAt" >= $2
+    and "asset_exif"."lensModel" = $3
+    and "asset"."ownerId" = any ($4::uuid[])
+    and "asset"."isFavorite" = $5
+    and "asset"."deletedAt" is null
+    and "asset"."id" < $6
   order by
     random()
   limit
@@ -57,18 +57,18 @@ where
 union all
 (
   select
-    "assets".*
+    "asset".*
   from
-    "assets"
-    inner join "exif" on "assets"."id" = "exif"."assetId"
+    "asset"
+    inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
   where
-    "assets"."visibility" = $8
-    and "assets"."fileCreatedAt" >= $9
-    and "exif"."lensModel" = $10
-    and "assets"."ownerId" = any ($11::uuid[])
-    and "assets"."isFavorite" = $12
-    and "assets"."deletedAt" is null
-    and "assets"."id" > $13
+    "asset"."visibility" = $8
+    and "asset"."fileCreatedAt" >= $9
+    and "asset_exif"."lensModel" = $10
+    and "asset"."ownerId" = any ($11::uuid[])
+    and "asset"."isFavorite" = $12
+    and "asset"."deletedAt" is null
+    and "asset"."id" > $13
   order by
     random()
   limit
@@ -82,18 +82,18 @@ begin
 set
   local vchordrq.probes = 1
 select
-  "assets".*
+  "asset".*
 from
-  "assets"
-  inner join "exif" on "assets"."id" = "exif"."assetId"
-  inner join "smart_search" on "assets"."id" = "smart_search"."assetId"
+  "asset"
+  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
+  inner join "smart_search" on "asset"."id" = "smart_search"."assetId"
 where
-  "assets"."visibility" = $1
-  and "assets"."fileCreatedAt" >= $2
-  and "exif"."lensModel" = $3
-  and "assets"."ownerId" = any ($4::uuid[])
-  and "assets"."isFavorite" = $5
-  and "assets"."deletedAt" is null
+  "asset"."visibility" = $1
+  and "asset"."fileCreatedAt" >= $2
+  and "asset_exif"."lensModel" = $3
+  and "asset"."ownerId" = any ($4::uuid[])
+  and "asset"."isFavorite" = $5
+  and "asset"."deletedAt" is null
 order by
   smart_search.embedding <=> $6
 limit
@@ -109,17 +109,17 @@ set
 with
   "cte" as (
     select
-      "asset_faces"."id",
-      "asset_faces"."personId",
+      "asset_face"."id",
+      "asset_face"."personId",
       face_search.embedding <=> $1 as "distance"
     from
-      "asset_faces"
-      inner join "assets" on "assets"."id" = "asset_faces"."assetId"
-      inner join "face_search" on "face_search"."faceId" = "asset_faces"."id"
-      left join "person" on "person"."id" = "asset_faces"."personId"
+      "asset_face"
+      inner join "asset" on "asset"."id" = "asset_face"."assetId"
+      inner join "face_search" on "face_search"."faceId" = "asset_face"."id"
+      left join "person" on "person"."id" = "asset_face"."personId"
     where
-      "assets"."ownerId" = any ($2::uuid[])
-      and "assets"."deletedAt" is null
+      "asset"."ownerId" = any ($2::uuid[])
+      and "asset"."deletedAt" is null
     order by
       "distance"
     limit
@@ -165,13 +165,13 @@ with recursive
         "city",
         "assetId"
       from
-        "exif"
-        inner join "assets" on "assets"."id" = "exif"."assetId"
+        "asset_exif"
+        inner join "asset" on "asset"."id" = "asset_exif"."assetId"
       where
-        "assets"."ownerId" = any ($1::uuid[])
-        and "assets"."visibility" = $2
-        and "assets"."type" = $3
-        and "assets"."deletedAt" is null
+        "asset"."ownerId" = any ($1::uuid[])
+        and "asset"."visibility" = $2
+        and "asset"."type" = $3
+        and "asset"."deletedAt" is null
       order by
         "city"
       limit
@@ -189,14 +189,14 @@ with recursive
             "city",
             "assetId"
           from
-            "exif"
-            inner join "assets" on "assets"."id" = "exif"."assetId"
+            "asset_exif"
+            inner join "asset" on "asset"."id" = "asset_exif"."assetId"
           where
-            "assets"."ownerId" = any ($5::uuid[])
-            and "assets"."visibility" = $6
-            and "assets"."type" = $7
-            and "assets"."deletedAt" is null
-            and "exif"."city" > "cte"."city"
+            "asset"."ownerId" = any ($5::uuid[])
+            and "asset"."visibility" = $6
+            and "asset"."type" = $7
+            and "asset"."deletedAt" is null
+            and "asset_exif"."city" > "cte"."city"
           order by
             "city"
           limit
@@ -205,21 +205,21 @@ with recursive
     )
   )
 select
-  "assets".*,
-  to_jsonb("exif") as "exifInfo"
+  "asset".*,
+  to_jsonb("asset_exif") as "exifInfo"
 from
-  "assets"
-  inner join "exif" on "assets"."id" = "exif"."assetId"
-  inner join "cte" on "assets"."id" = "cte"."assetId"
+  "asset"
+  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
+  inner join "cte" on "asset"."id" = "cte"."assetId"
 order by
-  "exif"."city"
+  "asset_exif"."city"
 
 -- SearchRepository.getStates
 select distinct
   on ("state") "state"
 from
-  "exif"
-  inner join "assets" on "assets"."id" = "exif"."assetId"
+  "asset_exif"
+  inner join "asset" on "asset"."id" = "asset_exif"."assetId"
 where
   "ownerId" = any ($1::uuid[])
   and "visibility" = $2
@@ -230,8 +230,8 @@ where
 select distinct
   on ("city") "city"
 from
-  "exif"
-  inner join "assets" on "assets"."id" = "exif"."assetId"
+  "asset_exif"
+  inner join "asset" on "asset"."id" = "asset_exif"."assetId"
 where
   "ownerId" = any ($1::uuid[])
   and "visibility" = $2
@@ -242,8 +242,8 @@ where
 select distinct
   on ("make") "make"
 from
-  "exif"
-  inner join "assets" on "assets"."id" = "exif"."assetId"
+  "asset_exif"
+  inner join "asset" on "asset"."id" = "asset_exif"."assetId"
 where
   "ownerId" = any ($1::uuid[])
   and "visibility" = $2
@@ -254,8 +254,8 @@ where
 select distinct
   on ("model") "model"
 from
-  "exif"
-  inner join "assets" on "assets"."id" = "exif"."assetId"
+  "asset_exif"
+  inner join "asset" on "asset"."id" = "asset_exif"."assetId"
 where
   "ownerId" = any ($1::uuid[])
   and "visibility" = $2
diff --git a/server/src/queries/session.repository.sql b/server/src/queries/session.repository.sql
index 315ea82112..24ffdcb5e1 100644
--- a/server/src/queries/session.repository.sql
+++ b/server/src/queries/session.repository.sql
@@ -6,68 +6,68 @@ select
   "expiresAt",
   "pinExpiresAt"
 from
-  "sessions"
+  "session"
 where
   "id" = $1
 
 -- SessionRepository.getByToken
 select
-  "sessions"."id",
-  "sessions"."isPendingSyncReset",
-  "sessions"."updatedAt",
-  "sessions"."pinExpiresAt",
+  "session"."id",
+  "session"."isPendingSyncReset",
+  "session"."updatedAt",
+  "session"."pinExpiresAt",
   (
     select
       to_json(obj)
     from
       (
         select
-          "users"."id",
-          "users"."name",
-          "users"."email",
-          "users"."isAdmin",
-          "users"."quotaUsageInBytes",
-          "users"."quotaSizeInBytes"
+          "user"."id",
+          "user"."name",
+          "user"."email",
+          "user"."isAdmin",
+          "user"."quotaUsageInBytes",
+          "user"."quotaSizeInBytes"
         from
-          "users"
+          "user"
         where
-          "users"."id" = "sessions"."userId"
-          and "users"."deletedAt" is null
+          "user"."id" = "session"."userId"
+          and "user"."deletedAt" is null
       ) as obj
   ) as "user"
 from
-  "sessions"
+  "session"
 where
-  "sessions"."token" = $1
+  "session"."token" = $1
   and (
-    "sessions"."expiresAt" is null
-    or "sessions"."expiresAt" > $2
+    "session"."expiresAt" is null
+    or "session"."expiresAt" > $2
   )
 
 -- SessionRepository.getByUserId
 select
-  "sessions".*
+  "session".*
 from
-  "sessions"
-  inner join "users" on "users"."id" = "sessions"."userId"
-  and "users"."deletedAt" is null
+  "session"
+  inner join "user" on "user"."id" = "session"."userId"
+  and "user"."deletedAt" is null
 where
-  "sessions"."userId" = $1
+  "session"."userId" = $1
   and (
-    "sessions"."expiresAt" is null
-    or "sessions"."expiresAt" > $2
+    "session"."expiresAt" is null
+    or "session"."expiresAt" > $2
   )
 order by
-  "sessions"."updatedAt" desc,
-  "sessions"."createdAt" desc
+  "session"."updatedAt" desc,
+  "session"."createdAt" desc
 
 -- SessionRepository.delete
-delete from "sessions"
+delete from "session"
 where
   "id" = $1::uuid
 
 -- SessionRepository.lockAll
-update "sessions"
+update "session"
 set
   "pinExpiresAt" = $1
 where
@@ -75,12 +75,12 @@ where
 
 -- SessionRepository.resetSyncProgress
 begin
-update "sessions"
+update "session"
 set
   "isPendingSyncReset" = $1
 where
   "id" = $2
-delete from "session_sync_checkpoints"
+delete from "session_sync_checkpoint"
 where
   "sessionId" = $1
 commit
diff --git a/server/src/queries/shared.link.repository.sql b/server/src/queries/shared.link.repository.sql
index 1044c1c883..ed3507fa2f 100644
--- a/server/src/queries/shared.link.repository.sql
+++ b/server/src/queries/shared.link.repository.sql
@@ -2,7 +2,7 @@
 
 -- SharedLinkRepository.get
 select
-  "shared_links".*,
+  "shared_link".*,
   coalesce(
     json_agg("a") filter (
       where
@@ -12,31 +12,31 @@ select
   ) as "assets",
   to_json("album") as "album"
 from
-  "shared_links"
+  "shared_link"
   left join lateral (
     select
-      "assets".*,
+      "asset".*,
       to_json("exifInfo") as "exifInfo"
     from
-      "shared_link__asset"
-      inner join "assets" on "assets"."id" = "shared_link__asset"."assetsId"
+      "shared_link_asset"
+      inner join "asset" on "asset"."id" = "shared_link_asset"."assetsId"
       inner join lateral (
         select
-          "exif".*
+          "asset_exif".*
         from
-          "exif"
+          "asset_exif"
         where
-          "exif"."assetId" = "assets"."id"
+          "asset_exif"."assetId" = "asset"."id"
       ) as "exifInfo" on true
     where
-      "shared_links"."id" = "shared_link__asset"."sharedLinksId"
-      and "assets"."deletedAt" is null
+      "shared_link"."id" = "shared_link_asset"."sharedLinksId"
+      and "asset"."deletedAt" is null
     order by
-      "assets"."fileCreatedAt" asc
+      "asset"."fileCreatedAt" asc
   ) as "a" on true
   left join lateral (
     select
-      "albums".*,
+      "album".*,
       coalesce(
         json_agg("assets") filter (
           where
@@ -46,151 +46,151 @@ from
       ) as "assets",
       to_json("owner") as "owner"
     from
-      "albums"
-      left join "albums_assets_assets" on "albums_assets_assets"."albumsId" = "albums"."id"
+      "album"
+      left join "album_asset" on "album_asset"."albumsId" = "album"."id"
       left join lateral (
         select
-          "assets".*,
-          to_json("assets_exifInfo") as "exifInfo"
+          "asset".*,
+          to_json("exifInfo") as "exifInfo"
         from
-          "assets"
+          "asset"
           inner join lateral (
             select
-              "exif".*
+              "asset_exif".*
             from
-              "exif"
+              "asset_exif"
             where
-              "exif"."assetId" = "assets"."id"
-          ) as "assets_exifInfo" on true
+              "asset_exif"."assetId" = "asset"."id"
+          ) as "exifInfo" on true
         where
-          "albums_assets_assets"."assetsId" = "assets"."id"
-          and "assets"."deletedAt" is null
+          "album_asset"."assetsId" = "asset"."id"
+          and "asset"."deletedAt" is null
         order by
-          "assets"."fileCreatedAt" asc
+          "asset"."fileCreatedAt" asc
       ) as "assets" on true
       inner join lateral (
         select
-          "users".*
+          "user".*
         from
-          "users"
+          "user"
         where
-          "users"."id" = "albums"."ownerId"
-          and "users"."deletedAt" is null
+          "user"."id" = "album"."ownerId"
+          and "user"."deletedAt" is null
       ) as "owner" on true
     where
-      "albums"."id" = "shared_links"."albumId"
-      and "albums"."deletedAt" is null
+      "album"."id" = "shared_link"."albumId"
+      and "album"."deletedAt" is null
     group by
-      "albums"."id",
+      "album"."id",
       "owner".*
   ) as "album" on true
 where
-  "shared_links"."id" = $1
-  and "shared_links"."userId" = $2
+  "shared_link"."id" = $1
+  and "shared_link"."userId" = $2
   and (
-    "shared_links"."type" = $3
+    "shared_link"."type" = $3
     or "album"."id" is not null
   )
 group by
-  "shared_links"."id",
+  "shared_link"."id",
   "album".*
 order by
-  "shared_links"."createdAt" desc
+  "shared_link"."createdAt" desc
 
 -- SharedLinkRepository.getAll
 select distinct
-  on ("shared_links"."createdAt") "shared_links".*,
+  on ("shared_link"."createdAt") "shared_link".*,
   "assets"."assets",
   to_json("album") as "album"
 from
-  "shared_links"
-  left join "shared_link__asset" on "shared_link__asset"."sharedLinksId" = "shared_links"."id"
+  "shared_link"
+  left join "shared_link_asset" on "shared_link_asset"."sharedLinksId" = "shared_link"."id"
   left join lateral (
     select
-      json_agg("assets") as "assets"
+      json_agg("asset") as "assets"
     from
-      "assets"
+      "asset"
     where
-      "assets"."id" = "shared_link__asset"."assetsId"
-      and "assets"."deletedAt" is null
+      "asset"."id" = "shared_link_asset"."assetsId"
+      and "asset"."deletedAt" is null
   ) as "assets" on true
   left join lateral (
     select
-      "albums".*,
+      "album".*,
       to_json("owner") as "owner"
     from
-      "albums"
+      "album"
       inner join lateral (
         select
-          "users"."id",
-          "users"."email",
-          "users"."createdAt",
-          "users"."profileImagePath",
-          "users"."isAdmin",
-          "users"."shouldChangePassword",
-          "users"."deletedAt",
-          "users"."oauthId",
-          "users"."updatedAt",
-          "users"."storageLabel",
-          "users"."name",
-          "users"."quotaSizeInBytes",
-          "users"."quotaUsageInBytes",
-          "users"."status",
-          "users"."profileChangedAt"
+          "user"."id",
+          "user"."email",
+          "user"."createdAt",
+          "user"."profileImagePath",
+          "user"."isAdmin",
+          "user"."shouldChangePassword",
+          "user"."deletedAt",
+          "user"."oauthId",
+          "user"."updatedAt",
+          "user"."storageLabel",
+          "user"."name",
+          "user"."quotaSizeInBytes",
+          "user"."quotaUsageInBytes",
+          "user"."status",
+          "user"."profileChangedAt"
         from
-          "users"
+          "user"
         where
-          "users"."id" = "albums"."ownerId"
-          and "users"."deletedAt" is null
+          "user"."id" = "album"."ownerId"
+          and "user"."deletedAt" is null
       ) as "owner" on true
     where
-      "albums"."id" = "shared_links"."albumId"
-      and "albums"."deletedAt" is null
+      "album"."id" = "shared_link"."albumId"
+      and "album"."deletedAt" is null
   ) as "album" on true
 where
-  "shared_links"."userId" = $1
+  "shared_link"."userId" = $1
   and (
-    "shared_links"."type" = $2
+    "shared_link"."type" = $2
     or "album"."id" is not null
   )
-  and "shared_links"."albumId" = $3
+  and "shared_link"."albumId" = $3
 order by
-  "shared_links"."createdAt" desc
+  "shared_link"."createdAt" desc
 
 -- SharedLinkRepository.getByKey
 select
-  "shared_links"."id",
-  "shared_links"."userId",
-  "shared_links"."expiresAt",
-  "shared_links"."showExif",
-  "shared_links"."allowUpload",
-  "shared_links"."allowDownload",
-  "shared_links"."password",
+  "shared_link"."id",
+  "shared_link"."userId",
+  "shared_link"."expiresAt",
+  "shared_link"."showExif",
+  "shared_link"."allowUpload",
+  "shared_link"."allowDownload",
+  "shared_link"."password",
   (
     select
       to_json(obj)
     from
       (
         select
-          "users"."id",
-          "users"."name",
-          "users"."email",
-          "users"."isAdmin",
-          "users"."quotaUsageInBytes",
-          "users"."quotaSizeInBytes"
+          "user"."id",
+          "user"."name",
+          "user"."email",
+          "user"."isAdmin",
+          "user"."quotaUsageInBytes",
+          "user"."quotaSizeInBytes"
         from
-          "users"
+          "user"
         where
-          "users"."id" = "shared_links"."userId"
+          "user"."id" = "shared_link"."userId"
       ) as obj
   ) as "user"
 from
-  "shared_links"
-  left join "albums" on "albums"."id" = "shared_links"."albumId"
+  "shared_link"
+  left join "album" on "album"."id" = "shared_link"."albumId"
 where
-  "shared_links"."key" = $1
-  and "albums"."deletedAt" is null
+  "shared_link"."key" = $1
+  and "album"."deletedAt" is null
   and (
-    "shared_links"."type" = $2
-    or "albums"."id" is not null
+    "shared_link"."type" = $2
+    or "album"."id" is not null
   )
diff --git a/server/src/queries/stack.repository.sql b/server/src/queries/stack.repository.sql
index 6d450cd435..a256cdfc76 100644
--- a/server/src/queries/stack.repository.sql
+++ b/server/src/queries/stack.repository.sql
@@ -2,66 +2,66 @@
 
 -- StackRepository.search
 select
-  "asset_stack".*,
+  "stack".*,
   (
     select
       coalesce(json_agg(agg), '[]')
     from
       (
         select
-          "assets".*,
+          "asset".*,
           to_json("exifInfo") as "exifInfo"
         from
-          "assets"
+          "asset"
           inner join lateral (
             select
-              "exif"."assetId",
-              "exif"."autoStackId",
-              "exif"."bitsPerSample",
-              "exif"."city",
-              "exif"."colorspace",
-              "exif"."country",
-              "exif"."dateTimeOriginal",
-              "exif"."description",
-              "exif"."exifImageHeight",
-              "exif"."exifImageWidth",
-              "exif"."exposureTime",
-              "exif"."fileSizeInByte",
-              "exif"."fNumber",
-              "exif"."focalLength",
-              "exif"."fps",
-              "exif"."iso",
-              "exif"."latitude",
-              "exif"."lensModel",
-              "exif"."livePhotoCID",
-              "exif"."longitude",
-              "exif"."make",
-              "exif"."model",
-              "exif"."modifyDate",
-              "exif"."orientation",
-              "exif"."profileDescription",
-              "exif"."projectionType",
-              "exif"."rating",
-              "exif"."state",
-              "exif"."timeZone"
+              "asset_exif"."assetId",
+              "asset_exif"."autoStackId",
+              "asset_exif"."bitsPerSample",
+              "asset_exif"."city",
+              "asset_exif"."colorspace",
+              "asset_exif"."country",
+              "asset_exif"."dateTimeOriginal",
+              "asset_exif"."description",
+              "asset_exif"."exifImageHeight",
+              "asset_exif"."exifImageWidth",
+              "asset_exif"."exposureTime",
+              "asset_exif"."fileSizeInByte",
+              "asset_exif"."fNumber",
+              "asset_exif"."focalLength",
+              "asset_exif"."fps",
+              "asset_exif"."iso",
+              "asset_exif"."latitude",
+              "asset_exif"."lensModel",
+              "asset_exif"."livePhotoCID",
+              "asset_exif"."longitude",
+              "asset_exif"."make",
+              "asset_exif"."model",
+              "asset_exif"."modifyDate",
+              "asset_exif"."orientation",
+              "asset_exif"."profileDescription",
+              "asset_exif"."projectionType",
+              "asset_exif"."rating",
+              "asset_exif"."state",
+              "asset_exif"."timeZone"
             from
-              "exif"
+              "asset_exif"
             where
-              "exif"."assetId" = "assets"."id"
+              "asset_exif"."assetId" = "asset"."id"
           ) as "exifInfo" on true
         where
-          "assets"."deletedAt" is null
-          and "assets"."stackId" = "asset_stack"."id"
-          and "assets"."visibility" in ('archive', 'timeline')
+          "asset"."deletedAt" is null
+          and "asset"."stackId" = "stack"."id"
+          and "asset"."visibility" in ('archive', 'timeline')
       ) as agg
   ) as "assets"
 from
-  "asset_stack"
+  "stack"
 where
-  "asset_stack"."ownerId" = $1
+  "stack"."ownerId" = $1
 
 -- StackRepository.delete
-delete from "asset_stack"
+delete from "stack"
 where
   "id" = $1::uuid
 
@@ -74,72 +74,72 @@ select
     from
       (
         select
-          "assets".*,
+          "asset".*,
           (
             select
               coalesce(json_agg(agg), '[]')
             from
               (
                 select
-                  "tags"."id",
-                  "tags"."value",
-                  "tags"."createdAt",
-                  "tags"."updatedAt",
-                  "tags"."color",
-                  "tags"."parentId"
+                  "tag"."id",
+                  "tag"."value",
+                  "tag"."createdAt",
+                  "tag"."updatedAt",
+                  "tag"."color",
+                  "tag"."parentId"
                 from
-                  "tags"
-                  inner join "tag_asset" on "tags"."id" = "tag_asset"."tagsId"
+                  "tag"
+                  inner join "tag_asset" on "tag"."id" = "tag_asset"."tagsId"
                 where
-                  "tag_asset"."assetsId" = "assets"."id"
+                  "tag_asset"."assetsId" = "asset"."id"
               ) as agg
           ) as "tags",
           to_json("exifInfo") as "exifInfo"
         from
-          "assets"
+          "asset"
           inner join lateral (
             select
-              "exif"."assetId",
-              "exif"."autoStackId",
-              "exif"."bitsPerSample",
-              "exif"."city",
-              "exif"."colorspace",
-              "exif"."country",
-              "exif"."dateTimeOriginal",
-              "exif"."description",
-              "exif"."exifImageHeight",
-              "exif"."exifImageWidth",
-              "exif"."exposureTime",
-              "exif"."fileSizeInByte",
-              "exif"."fNumber",
-              "exif"."focalLength",
-              "exif"."fps",
-              "exif"."iso",
-              "exif"."latitude",
-              "exif"."lensModel",
-              "exif"."livePhotoCID",
-              "exif"."longitude",
-              "exif"."make",
-              "exif"."model",
-              "exif"."modifyDate",
-              "exif"."orientation",
-              "exif"."profileDescription",
-              "exif"."projectionType",
-              "exif"."rating",
-              "exif"."state",
-              "exif"."timeZone"
+              "asset_exif"."assetId",
+              "asset_exif"."autoStackId",
+              "asset_exif"."bitsPerSample",
+              "asset_exif"."city",
+              "asset_exif"."colorspace",
+              "asset_exif"."country",
+              "asset_exif"."dateTimeOriginal",
+              "asset_exif"."description",
+              "asset_exif"."exifImageHeight",
+              "asset_exif"."exifImageWidth",
+              "asset_exif"."exposureTime",
+              "asset_exif"."fileSizeInByte",
+              "asset_exif"."fNumber",
+              "asset_exif"."focalLength",
+              "asset_exif"."fps",
+              "asset_exif"."iso",
+              "asset_exif"."latitude",
+              "asset_exif"."lensModel",
+              "asset_exif"."livePhotoCID",
+              "asset_exif"."longitude",
+              "asset_exif"."make",
+              "asset_exif"."model",
+              "asset_exif"."modifyDate",
+              "asset_exif"."orientation",
+              "asset_exif"."profileDescription",
+              "asset_exif"."projectionType",
+              "asset_exif"."rating",
+              "asset_exif"."state",
+              "asset_exif"."timeZone"
             from
-              "exif"
+              "asset_exif"
             where
-              "exif"."assetId" = "assets"."id"
+              "asset_exif"."assetId" = "asset"."id"
           ) as "exifInfo" on true
         where
-          "assets"."deletedAt" is null
-          and "assets"."stackId" = "asset_stack"."id"
-          and "assets"."visibility" in ('archive', 'timeline')
+          "asset"."deletedAt" is null
+          and "asset"."stackId" = "stack"."id"
+          and "asset"."visibility" in ('archive', 'timeline')
       ) as agg
   ) as "assets"
 from
-  "asset_stack"
+  "stack"
 where
   "id" = $1::uuid
diff --git a/server/src/queries/sync.checkpoint.repository.sql b/server/src/queries/sync.checkpoint.repository.sql
index 40edf0f405..018054ff79 100644
--- a/server/src/queries/sync.checkpoint.repository.sql
+++ b/server/src/queries/sync.checkpoint.repository.sql
@@ -5,11 +5,11 @@ select
   "type",
   "ack"
 from
-  "session_sync_checkpoints"
+  "session_sync_checkpoint"
 where
   "sessionId" = $1
 
 -- SyncCheckpointRepository.deleteAll
-delete from "session_sync_checkpoints"
+delete from "session_sync_checkpoint"
 where
   "sessionId" = $1
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index ac3632ad4a..2f484f6d52 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -5,7 +5,7 @@ select
   "albumsId" as "id",
   "createId"
 from
-  "albums_shared_users_users"
+  "album_user"
 where
   "usersId" = $1
   and "createId" >= $2
@@ -18,7 +18,7 @@ select
   "id",
   "albumId"
 from
-  "albums_audit"
+  "album_audit"
 where
   "userId" = $1
   and "deletedAt" < now() - interval '1 millisecond'
@@ -27,165 +27,165 @@ order by
 
 -- SyncRepository.album.getUpserts
 select distinct
-  on ("albums"."id", "albums"."updateId") "albums"."id",
-  "albums"."ownerId",
-  "albums"."albumName" as "name",
-  "albums"."description",
-  "albums"."createdAt",
-  "albums"."updatedAt",
-  "albums"."albumThumbnailAssetId" as "thumbnailAssetId",
-  "albums"."isActivityEnabled",
-  "albums"."order",
-  "albums"."updateId"
+  on ("album"."id", "album"."updateId") "album"."id",
+  "album"."ownerId",
+  "album"."albumName" as "name",
+  "album"."description",
+  "album"."createdAt",
+  "album"."updatedAt",
+  "album"."albumThumbnailAssetId" as "thumbnailAssetId",
+  "album"."isActivityEnabled",
+  "album"."order",
+  "album"."updateId"
 from
-  "albums"
-  left join "albums_shared_users_users" as "album_users" on "albums"."id" = "album_users"."albumsId"
+  "album"
+  left join "album_user" as "album_users" on "album"."id" = "album_users"."albumsId"
 where
-  "albums"."updatedAt" < now() - interval '1 millisecond'
+  "album"."updatedAt" < now() - interval '1 millisecond'
   and (
-    "albums"."ownerId" = $1
+    "album"."ownerId" = $1
     or "album_users"."usersId" = $2
   )
 order by
-  "albums"."updateId" asc
+  "album"."updateId" asc
 
 -- SyncRepository.albumAsset.getBackfill
 select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."originalFileName",
-  "assets"."thumbhash",
-  "assets"."checksum",
-  "assets"."fileCreatedAt",
-  "assets"."fileModifiedAt",
-  "assets"."localDateTime",
-  "assets"."type",
-  "assets"."deletedAt",
-  "assets"."isFavorite",
-  "assets"."visibility",
-  "assets"."duration",
-  "assets"."updateId"
+  "asset"."id",
+  "asset"."ownerId",
+  "asset"."originalFileName",
+  "asset"."thumbhash",
+  "asset"."checksum",
+  "asset"."fileCreatedAt",
+  "asset"."fileModifiedAt",
+  "asset"."localDateTime",
+  "asset"."type",
+  "asset"."deletedAt",
+  "asset"."isFavorite",
+  "asset"."visibility",
+  "asset"."duration",
+  "asset"."updateId"
 from
-  "assets"
-  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "assets"."id"
+  "asset"
+  inner join "album_asset" on "album_asset"."assetsId" = "asset"."id"
 where
-  "album_assets"."albumsId" = $1
-  and "assets"."updatedAt" < now() - interval '1 millisecond'
-  and "assets"."updateId" <= $2
-  and "assets"."updateId" >= $3
+  "album_asset"."albumsId" = $1
+  and "asset"."updatedAt" < now() - interval '1 millisecond'
+  and "asset"."updateId" <= $2
+  and "asset"."updateId" >= $3
 order by
-  "assets"."updateId" asc
+  "asset"."updateId" asc
 
 -- SyncRepository.albumAsset.getUpserts
 select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."originalFileName",
-  "assets"."thumbhash",
-  "assets"."checksum",
-  "assets"."fileCreatedAt",
-  "assets"."fileModifiedAt",
-  "assets"."localDateTime",
-  "assets"."type",
-  "assets"."deletedAt",
-  "assets"."isFavorite",
-  "assets"."visibility",
-  "assets"."duration",
-  "assets"."updateId"
+  "asset"."id",
+  "asset"."ownerId",
+  "asset"."originalFileName",
+  "asset"."thumbhash",
+  "asset"."checksum",
+  "asset"."fileCreatedAt",
+  "asset"."fileModifiedAt",
+  "asset"."localDateTime",
+  "asset"."type",
+  "asset"."deletedAt",
+  "asset"."isFavorite",
+  "asset"."visibility",
+  "asset"."duration",
+  "asset"."updateId"
 from
-  "assets"
-  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "assets"."id"
-  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
-  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
+  "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"
 where
-  "assets"."updatedAt" < now() - interval '1 millisecond'
+  "asset"."updatedAt" < now() - interval '1 millisecond'
   and (
-    "albums"."ownerId" = $1
-    or "album_users"."usersId" = $2
+    "album"."ownerId" = $1
+    or "album_user"."usersId" = $2
   )
 order by
-  "assets"."updateId" asc
+  "asset"."updateId" asc
 
 -- SyncRepository.albumAssetExif.getBackfill
 select
-  "exif"."assetId",
-  "exif"."description",
-  "exif"."exifImageWidth",
-  "exif"."exifImageHeight",
-  "exif"."fileSizeInByte",
-  "exif"."orientation",
-  "exif"."dateTimeOriginal",
-  "exif"."modifyDate",
-  "exif"."timeZone",
-  "exif"."latitude",
-  "exif"."longitude",
-  "exif"."projectionType",
-  "exif"."city",
-  "exif"."state",
-  "exif"."country",
-  "exif"."make",
-  "exif"."model",
-  "exif"."lensModel",
-  "exif"."fNumber",
-  "exif"."focalLength",
-  "exif"."iso",
-  "exif"."exposureTime",
-  "exif"."profileDescription",
-  "exif"."rating",
-  "exif"."fps",
-  "exif"."updateId"
+  "asset_exif"."assetId",
+  "asset_exif"."description",
+  "asset_exif"."exifImageWidth",
+  "asset_exif"."exifImageHeight",
+  "asset_exif"."fileSizeInByte",
+  "asset_exif"."orientation",
+  "asset_exif"."dateTimeOriginal",
+  "asset_exif"."modifyDate",
+  "asset_exif"."timeZone",
+  "asset_exif"."latitude",
+  "asset_exif"."longitude",
+  "asset_exif"."projectionType",
+  "asset_exif"."city",
+  "asset_exif"."state",
+  "asset_exif"."country",
+  "asset_exif"."make",
+  "asset_exif"."model",
+  "asset_exif"."lensModel",
+  "asset_exif"."fNumber",
+  "asset_exif"."focalLength",
+  "asset_exif"."iso",
+  "asset_exif"."exposureTime",
+  "asset_exif"."profileDescription",
+  "asset_exif"."rating",
+  "asset_exif"."fps",
+  "asset_exif"."updateId"
 from
-  "exif"
-  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "exif"."assetId"
+  "asset_exif"
+  inner join "album_asset" on "album_asset"."assetsId" = "asset_exif"."assetId"
 where
-  "album_assets"."albumsId" = $1
-  and "exif"."updatedAt" < now() - interval '1 millisecond'
-  and "exif"."updateId" <= $2
-  and "exif"."updateId" >= $3
+  "album_asset"."albumsId" = $1
+  and "asset_exif"."updatedAt" < now() - interval '1 millisecond'
+  and "asset_exif"."updateId" <= $2
+  and "asset_exif"."updateId" >= $3
 order by
-  "exif"."updateId" asc
+  "asset_exif"."updateId" asc
 
 -- SyncRepository.albumAssetExif.getUpserts
 select
-  "exif"."assetId",
-  "exif"."description",
-  "exif"."exifImageWidth",
-  "exif"."exifImageHeight",
-  "exif"."fileSizeInByte",
-  "exif"."orientation",
-  "exif"."dateTimeOriginal",
-  "exif"."modifyDate",
-  "exif"."timeZone",
-  "exif"."latitude",
-  "exif"."longitude",
-  "exif"."projectionType",
-  "exif"."city",
-  "exif"."state",
-  "exif"."country",
-  "exif"."make",
-  "exif"."model",
-  "exif"."lensModel",
-  "exif"."fNumber",
-  "exif"."focalLength",
-  "exif"."iso",
-  "exif"."exposureTime",
-  "exif"."profileDescription",
-  "exif"."rating",
-  "exif"."fps",
-  "exif"."updateId"
+  "asset_exif"."assetId",
+  "asset_exif"."description",
+  "asset_exif"."exifImageWidth",
+  "asset_exif"."exifImageHeight",
+  "asset_exif"."fileSizeInByte",
+  "asset_exif"."orientation",
+  "asset_exif"."dateTimeOriginal",
+  "asset_exif"."modifyDate",
+  "asset_exif"."timeZone",
+  "asset_exif"."latitude",
+  "asset_exif"."longitude",
+  "asset_exif"."projectionType",
+  "asset_exif"."city",
+  "asset_exif"."state",
+  "asset_exif"."country",
+  "asset_exif"."make",
+  "asset_exif"."model",
+  "asset_exif"."lensModel",
+  "asset_exif"."fNumber",
+  "asset_exif"."focalLength",
+  "asset_exif"."iso",
+  "asset_exif"."exposureTime",
+  "asset_exif"."profileDescription",
+  "asset_exif"."rating",
+  "asset_exif"."fps",
+  "asset_exif"."updateId"
 from
-  "exif"
-  inner join "albums_assets_assets" as "album_assets" on "album_assets"."assetsId" = "exif"."assetId"
-  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
-  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
+  "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"
 where
-  "exif"."updatedAt" < now() - interval '1 millisecond'
+  "asset_exif"."updatedAt" < now() - interval '1 millisecond'
   and (
-    "albums"."ownerId" = $1
-    or "album_users"."usersId" = $2
+    "album"."ownerId" = $1
+    or "album_user"."usersId" = $2
   )
 order by
-  "exif"."updateId" asc
+  "asset_exif"."updateId" asc
 
 -- SyncRepository.albumToAsset.getBackfill
 select
@@ -193,7 +193,7 @@ select
   "album_assets"."albumsId" as "albumId",
   "album_assets"."updateId"
 from
-  "albums_assets_assets" as "album_assets"
+  "album_asset" as "album_assets"
 where
   "album_assets"."albumsId" = $1
   and "album_assets"."updatedAt" < now() - interval '1 millisecond'
@@ -208,23 +208,23 @@ select
   "assetId",
   "albumId"
 from
-  "album_assets_audit"
+  "album_asset_audit"
 where
   "albumId" in (
     select
       "id"
     from
-      "albums"
+      "album"
     where
       "ownerId" = $1
     union
     (
       select
-        "albumUsers"."albumsId" as "id"
+        "album_user"."albumsId" as "id"
       from
-        "albums_shared_users_users" as "albumUsers"
+        "album_user"
       where
-        "albumUsers"."usersId" = $2
+        "album_user"."usersId" = $2
     )
   )
   and "deletedAt" < now() - interval '1 millisecond'
@@ -233,30 +233,30 @@ order by
 
 -- SyncRepository.albumToAsset.getUpserts
 select
-  "album_assets"."assetsId" as "assetId",
-  "album_assets"."albumsId" as "albumId",
-  "album_assets"."updateId"
+  "album_asset"."assetsId" as "assetId",
+  "album_asset"."albumsId" as "albumId",
+  "album_asset"."updateId"
 from
-  "albums_assets_assets" as "album_assets"
-  inner join "albums" on "albums"."id" = "album_assets"."albumsId"
-  left join "albums_shared_users_users" as "album_users" on "album_users"."albumsId" = "album_assets"."albumsId"
+  "album_asset"
+  inner join "album" on "album"."id" = "album_asset"."albumsId"
+  left join "album_user" on "album_user"."albumsId" = "album_asset"."albumsId"
 where
-  "album_assets"."updatedAt" < now() - interval '1 millisecond'
+  "album_asset"."updatedAt" < now() - interval '1 millisecond'
   and (
-    "albums"."ownerId" = $1
-    or "album_users"."usersId" = $2
+    "album"."ownerId" = $1
+    or "album_user"."usersId" = $2
   )
 order by
-  "album_assets"."updateId" asc
+  "album_asset"."updateId" asc
 
 -- SyncRepository.albumUser.getBackfill
 select
-  "album_users"."albumsId" as "albumId",
-  "album_users"."usersId" as "userId",
-  "album_users"."role",
-  "album_users"."updateId"
+  "album_user"."albumsId" as "albumId",
+  "album_user"."usersId" as "userId",
+  "album_user"."role",
+  "album_user"."updateId"
 from
-  "albums_shared_users_users" as "album_users"
+  "album_user"
 where
   "albumsId" = $1
   and "updatedAt" < now() - interval '1 millisecond'
@@ -271,23 +271,23 @@ select
   "userId",
   "albumId"
 from
-  "album_users_audit"
+  "album_user_audit"
 where
   "albumId" in (
     select
       "id"
     from
-      "albums"
+      "album"
     where
       "ownerId" = $1
     union
     (
       select
-        "albumUsers"."albumsId" as "id"
+        "album_user"."albumsId" as "id"
       from
-        "albums_shared_users_users" as "albumUsers"
+        "album_user"
       where
-        "albumUsers"."usersId" = $2
+        "album_user"."usersId" = $2
     )
   )
   and "deletedAt" < now() - interval '1 millisecond'
@@ -296,19 +296,19 @@ order by
 
 -- SyncRepository.albumUser.getUpserts
 select
-  "album_users"."albumsId" as "albumId",
-  "album_users"."usersId" as "userId",
-  "album_users"."role",
-  "album_users"."updateId"
+  "album_user"."albumsId" as "albumId",
+  "album_user"."usersId" as "userId",
+  "album_user"."role",
+  "album_user"."updateId"
 from
-  "albums_shared_users_users" as "album_users"
+  "album_user"
 where
-  "album_users"."updatedAt" < now() - interval '1 millisecond'
-  and "album_users"."albumsId" in (
+  "album_user"."updatedAt" < now() - interval '1 millisecond'
+  and "album_user"."albumsId" in (
     select
       "id"
     from
-      "albums"
+      "album"
     where
       "ownerId" = $1
     union
@@ -316,20 +316,20 @@ where
       select
         "albumUsers"."albumsId" as "id"
       from
-        "albums_shared_users_users" as "albumUsers"
+        "album_user" as "albumUsers"
       where
         "albumUsers"."usersId" = $2
     )
   )
 order by
-  "album_users"."updateId" asc
+  "album_user"."updateId" asc
 
 -- SyncRepository.asset.getDeletes
 select
   "id",
   "assetId"
 from
-  "assets_audit"
+  "asset_audit"
 where
   "ownerId" = $1
   and "deletedAt" < now() - interval '1 millisecond'
@@ -338,22 +338,22 @@ order by
 
 -- SyncRepository.asset.getUpserts
 select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."originalFileName",
-  "assets"."thumbhash",
-  "assets"."checksum",
-  "assets"."fileCreatedAt",
-  "assets"."fileModifiedAt",
-  "assets"."localDateTime",
-  "assets"."type",
-  "assets"."deletedAt",
-  "assets"."isFavorite",
-  "assets"."visibility",
-  "assets"."duration",
-  "assets"."updateId"
+  "asset"."id",
+  "asset"."ownerId",
+  "asset"."originalFileName",
+  "asset"."thumbhash",
+  "asset"."checksum",
+  "asset"."fileCreatedAt",
+  "asset"."fileModifiedAt",
+  "asset"."localDateTime",
+  "asset"."type",
+  "asset"."deletedAt",
+  "asset"."isFavorite",
+  "asset"."visibility",
+  "asset"."duration",
+  "asset"."updateId"
 from
-  "assets"
+  "asset"
 where
   "ownerId" = $1
   and "updatedAt" < now() - interval '1 millisecond'
@@ -362,40 +362,40 @@ order by
 
 -- SyncRepository.assetExif.getUpserts
 select
-  "exif"."assetId",
-  "exif"."description",
-  "exif"."exifImageWidth",
-  "exif"."exifImageHeight",
-  "exif"."fileSizeInByte",
-  "exif"."orientation",
-  "exif"."dateTimeOriginal",
-  "exif"."modifyDate",
-  "exif"."timeZone",
-  "exif"."latitude",
-  "exif"."longitude",
-  "exif"."projectionType",
-  "exif"."city",
-  "exif"."state",
-  "exif"."country",
-  "exif"."make",
-  "exif"."model",
-  "exif"."lensModel",
-  "exif"."fNumber",
-  "exif"."focalLength",
-  "exif"."iso",
-  "exif"."exposureTime",
-  "exif"."profileDescription",
-  "exif"."rating",
-  "exif"."fps",
-  "exif"."updateId"
+  "asset_exif"."assetId",
+  "asset_exif"."description",
+  "asset_exif"."exifImageWidth",
+  "asset_exif"."exifImageHeight",
+  "asset_exif"."fileSizeInByte",
+  "asset_exif"."orientation",
+  "asset_exif"."dateTimeOriginal",
+  "asset_exif"."modifyDate",
+  "asset_exif"."timeZone",
+  "asset_exif"."latitude",
+  "asset_exif"."longitude",
+  "asset_exif"."projectionType",
+  "asset_exif"."city",
+  "asset_exif"."state",
+  "asset_exif"."country",
+  "asset_exif"."make",
+  "asset_exif"."model",
+  "asset_exif"."lensModel",
+  "asset_exif"."fNumber",
+  "asset_exif"."focalLength",
+  "asset_exif"."iso",
+  "asset_exif"."exposureTime",
+  "asset_exif"."profileDescription",
+  "asset_exif"."rating",
+  "asset_exif"."fps",
+  "asset_exif"."updateId"
 from
-  "exif"
+  "asset_exif"
 where
   "assetId" in (
     select
       "id"
     from
-      "assets"
+      "asset"
     where
       "ownerId" = $1
   )
@@ -408,7 +408,7 @@ select
   "id",
   "memoryId"
 from
-  "memories_audit"
+  "memory_audit"
 where
   "userId" = $1
   and "deletedAt" < now() - interval '1 millisecond'
@@ -431,7 +431,7 @@ select
   "hideAt",
   "updateId"
 from
-  "memories"
+  "memory"
 where
   "ownerId" = $1
   and "updatedAt" < now() - interval '1 millisecond'
@@ -444,13 +444,13 @@ select
   "memoryId",
   "assetId"
 from
-  "memory_assets_audit"
+  "memory_asset_audit"
 where
   "memoryId" in (
     select
       "id"
     from
-      "memories"
+      "memory"
     where
       "ownerId" = $1
   )
@@ -464,13 +464,13 @@ select
   "assetsId" as "assetId",
   "updateId"
 from
-  "memories_assets_assets"
+  "memory_asset"
 where
   "memoriesId" in (
     select
       "id"
     from
-      "memories"
+      "memory"
     where
       "ownerId" = $1
   )
@@ -483,13 +483,13 @@ select
   "sharedById",
   "createId"
 from
-  "partners"
+  "partner"
 where
   "sharedWithId" = $1
   and "createId" >= $2
   and "createdAt" < now() - interval '1 millisecond'
 order by
-  "partners"."createId" asc
+  "partner"."createId" asc
 
 -- SyncRepository.partner.getDeletes
 select
@@ -497,7 +497,7 @@ select
   "sharedById",
   "sharedWithId"
 from
-  "partners_audit"
+  "partner_audit"
 where
   (
     "sharedById" = $1
@@ -514,7 +514,7 @@ select
   "inTimeline",
   "updateId"
 from
-  "partners"
+  "partner"
 where
   (
     "sharedById" = $1
@@ -526,22 +526,22 @@ order by
 
 -- SyncRepository.partnerAsset.getBackfill
 select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."originalFileName",
-  "assets"."thumbhash",
-  "assets"."checksum",
-  "assets"."fileCreatedAt",
-  "assets"."fileModifiedAt",
-  "assets"."localDateTime",
-  "assets"."type",
-  "assets"."deletedAt",
-  "assets"."isFavorite",
-  "assets"."visibility",
-  "assets"."duration",
-  "assets"."updateId"
+  "asset"."id",
+  "asset"."ownerId",
+  "asset"."originalFileName",
+  "asset"."thumbhash",
+  "asset"."checksum",
+  "asset"."fileCreatedAt",
+  "asset"."fileModifiedAt",
+  "asset"."localDateTime",
+  "asset"."type",
+  "asset"."deletedAt",
+  "asset"."isFavorite",
+  "asset"."visibility",
+  "asset"."duration",
+  "asset"."updateId"
 from
-  "assets"
+  "asset"
 where
   "ownerId" = $1
   and "updatedAt" < now() - interval '1 millisecond'
@@ -555,13 +555,13 @@ select
   "id",
   "assetId"
 from
-  "assets_audit"
+  "asset_audit"
 where
   "ownerId" in (
     select
       "sharedById"
     from
-      "partners"
+      "partner"
     where
       "sharedWithId" = $1
   )
@@ -571,28 +571,28 @@ order by
 
 -- SyncRepository.partnerAsset.getUpserts
 select
-  "assets"."id",
-  "assets"."ownerId",
-  "assets"."originalFileName",
-  "assets"."thumbhash",
-  "assets"."checksum",
-  "assets"."fileCreatedAt",
-  "assets"."fileModifiedAt",
-  "assets"."localDateTime",
-  "assets"."type",
-  "assets"."deletedAt",
-  "assets"."isFavorite",
-  "assets"."visibility",
-  "assets"."duration",
-  "assets"."updateId"
+  "asset"."id",
+  "asset"."ownerId",
+  "asset"."originalFileName",
+  "asset"."thumbhash",
+  "asset"."checksum",
+  "asset"."fileCreatedAt",
+  "asset"."fileModifiedAt",
+  "asset"."localDateTime",
+  "asset"."type",
+  "asset"."deletedAt",
+  "asset"."isFavorite",
+  "asset"."visibility",
+  "asset"."duration",
+  "asset"."updateId"
 from
-  "assets"
+  "asset"
 where
   "ownerId" in (
     select
       "sharedById"
     from
-      "partners"
+      "partner"
     where
       "sharedWithId" = $1
   )
@@ -602,85 +602,85 @@ order by
 
 -- SyncRepository.partnerAssetExif.getBackfill
 select
-  "exif"."assetId",
-  "exif"."description",
-  "exif"."exifImageWidth",
-  "exif"."exifImageHeight",
-  "exif"."fileSizeInByte",
-  "exif"."orientation",
-  "exif"."dateTimeOriginal",
-  "exif"."modifyDate",
-  "exif"."timeZone",
-  "exif"."latitude",
-  "exif"."longitude",
-  "exif"."projectionType",
-  "exif"."city",
-  "exif"."state",
-  "exif"."country",
-  "exif"."make",
-  "exif"."model",
-  "exif"."lensModel",
-  "exif"."fNumber",
-  "exif"."focalLength",
-  "exif"."iso",
-  "exif"."exposureTime",
-  "exif"."profileDescription",
-  "exif"."rating",
-  "exif"."fps",
-  "exif"."updateId"
+  "asset_exif"."assetId",
+  "asset_exif"."description",
+  "asset_exif"."exifImageWidth",
+  "asset_exif"."exifImageHeight",
+  "asset_exif"."fileSizeInByte",
+  "asset_exif"."orientation",
+  "asset_exif"."dateTimeOriginal",
+  "asset_exif"."modifyDate",
+  "asset_exif"."timeZone",
+  "asset_exif"."latitude",
+  "asset_exif"."longitude",
+  "asset_exif"."projectionType",
+  "asset_exif"."city",
+  "asset_exif"."state",
+  "asset_exif"."country",
+  "asset_exif"."make",
+  "asset_exif"."model",
+  "asset_exif"."lensModel",
+  "asset_exif"."fNumber",
+  "asset_exif"."focalLength",
+  "asset_exif"."iso",
+  "asset_exif"."exposureTime",
+  "asset_exif"."profileDescription",
+  "asset_exif"."rating",
+  "asset_exif"."fps",
+  "asset_exif"."updateId"
 from
-  "exif"
-  inner join "assets" on "assets"."id" = "exif"."assetId"
+  "asset_exif"
+  inner join "asset" on "asset"."id" = "asset_exif"."assetId"
 where
-  "assets"."ownerId" = $1
-  and "exif"."updatedAt" < now() - interval '1 millisecond'
-  and "exif"."updateId" <= $2
-  and "exif"."updateId" >= $3
+  "asset"."ownerId" = $1
+  and "asset_exif"."updatedAt" < now() - interval '1 millisecond'
+  and "asset_exif"."updateId" <= $2
+  and "asset_exif"."updateId" >= $3
 order by
-  "exif"."updateId" asc
+  "asset_exif"."updateId" asc
 
 -- SyncRepository.partnerAssetExif.getUpserts
 select
-  "exif"."assetId",
-  "exif"."description",
-  "exif"."exifImageWidth",
-  "exif"."exifImageHeight",
-  "exif"."fileSizeInByte",
-  "exif"."orientation",
-  "exif"."dateTimeOriginal",
-  "exif"."modifyDate",
-  "exif"."timeZone",
-  "exif"."latitude",
-  "exif"."longitude",
-  "exif"."projectionType",
-  "exif"."city",
-  "exif"."state",
-  "exif"."country",
-  "exif"."make",
-  "exif"."model",
-  "exif"."lensModel",
-  "exif"."fNumber",
-  "exif"."focalLength",
-  "exif"."iso",
-  "exif"."exposureTime",
-  "exif"."profileDescription",
-  "exif"."rating",
-  "exif"."fps",
-  "exif"."updateId"
+  "asset_exif"."assetId",
+  "asset_exif"."description",
+  "asset_exif"."exifImageWidth",
+  "asset_exif"."exifImageHeight",
+  "asset_exif"."fileSizeInByte",
+  "asset_exif"."orientation",
+  "asset_exif"."dateTimeOriginal",
+  "asset_exif"."modifyDate",
+  "asset_exif"."timeZone",
+  "asset_exif"."latitude",
+  "asset_exif"."longitude",
+  "asset_exif"."projectionType",
+  "asset_exif"."city",
+  "asset_exif"."state",
+  "asset_exif"."country",
+  "asset_exif"."make",
+  "asset_exif"."model",
+  "asset_exif"."lensModel",
+  "asset_exif"."fNumber",
+  "asset_exif"."focalLength",
+  "asset_exif"."iso",
+  "asset_exif"."exposureTime",
+  "asset_exif"."profileDescription",
+  "asset_exif"."rating",
+  "asset_exif"."fps",
+  "asset_exif"."updateId"
 from
-  "exif"
+  "asset_exif"
 where
   "assetId" in (
     select
       "id"
     from
-      "assets"
+      "asset"
     where
       "ownerId" in (
         select
           "sharedById"
         from
-          "partners"
+          "partner"
         where
           "sharedWithId" = $1
       )
@@ -694,13 +694,13 @@ select
   "id",
   "stackId"
 from
-  "stacks_audit"
+  "stack_audit"
 where
   "userId" in (
     select
       "sharedById"
     from
-      "partners"
+      "partner"
     where
       "sharedWithId" = $1
   )
@@ -710,14 +710,14 @@ order by
 
 -- SyncRepository.partnerStack.getBackfill
 select
-  "asset_stack"."id",
-  "asset_stack"."createdAt",
-  "asset_stack"."updatedAt",
-  "asset_stack"."primaryAssetId",
-  "asset_stack"."ownerId",
+  "stack"."id",
+  "stack"."createdAt",
+  "stack"."updatedAt",
+  "stack"."primaryAssetId",
+  "stack"."ownerId",
   "updateId"
 from
-  "asset_stack"
+  "stack"
 where
   "ownerId" = $1
   and "updatedAt" < now() - interval '1 millisecond'
@@ -728,20 +728,20 @@ order by
 
 -- SyncRepository.partnerStack.getUpserts
 select
-  "asset_stack"."id",
-  "asset_stack"."createdAt",
-  "asset_stack"."updatedAt",
-  "asset_stack"."primaryAssetId",
-  "asset_stack"."ownerId",
+  "stack"."id",
+  "stack"."createdAt",
+  "stack"."updatedAt",
+  "stack"."primaryAssetId",
+  "stack"."ownerId",
   "updateId"
 from
-  "asset_stack"
+  "stack"
 where
   "ownerId" in (
     select
       "sharedById"
     from
-      "partners"
+      "partner"
     where
       "sharedWithId" = $1
   )
@@ -788,7 +788,7 @@ select
   "id",
   "stackId"
 from
-  "stacks_audit"
+  "stack_audit"
 where
   "userId" = $1
   and "deletedAt" < now() - interval '1 millisecond'
@@ -797,14 +797,14 @@ order by
 
 -- SyncRepository.stack.getUpserts
 select
-  "asset_stack"."id",
-  "asset_stack"."createdAt",
-  "asset_stack"."updatedAt",
-  "asset_stack"."primaryAssetId",
-  "asset_stack"."ownerId",
+  "stack"."id",
+  "stack"."createdAt",
+  "stack"."updatedAt",
+  "stack"."primaryAssetId",
+  "stack"."ownerId",
   "updateId"
 from
-  "asset_stack"
+  "stack"
 where
   "ownerId" = $1
   and "updatedAt" < now() - interval '1 millisecond'
@@ -816,7 +816,7 @@ select
   "id",
   "userId"
 from
-  "users_audit"
+  "user_audit"
 where
   "deletedAt" < now() - interval '1 millisecond'
 order by
@@ -830,7 +830,7 @@ select
   "deletedAt",
   "updateId"
 from
-  "users"
+  "user"
 where
   "updatedAt" < now() - interval '1 millisecond'
 order by
diff --git a/server/src/queries/tag.repository.sql b/server/src/queries/tag.repository.sql
index af757d96b7..ee961f3801 100644
--- a/server/src/queries/tag.repository.sql
+++ b/server/src/queries/tag.repository.sql
@@ -2,27 +2,27 @@
 
 -- TagRepository.get
 select
-  "tags"."id",
-  "tags"."value",
-  "tags"."createdAt",
-  "tags"."updatedAt",
-  "tags"."color",
-  "tags"."parentId"
+  "tag"."id",
+  "tag"."value",
+  "tag"."createdAt",
+  "tag"."updatedAt",
+  "tag"."color",
+  "tag"."parentId"
 from
-  "tags"
+  "tag"
 where
   "id" = $1
 
 -- TagRepository.getByValue
 select
-  "tags"."id",
-  "tags"."value",
-  "tags"."createdAt",
-  "tags"."updatedAt",
-  "tags"."color",
-  "tags"."parentId"
+  "tag"."id",
+  "tag"."value",
+  "tag"."createdAt",
+  "tag"."updatedAt",
+  "tag"."color",
+  "tag"."parentId"
 from
-  "tags"
+  "tag"
 where
   "userId" = $1
   and "value" = $2
@@ -30,31 +30,31 @@ where
 -- TagRepository.upsertValue
 begin
 insert into
-  "tags" ("userId", "value", "parentId")
+  "tag" ("userId", "value", "parentId")
 values
   ($1, $2, $3)
 on conflict ("userId", "value") do update
 set
   "parentId" = $4
 returning
-  "tags"."id",
-  "tags"."value",
-  "tags"."createdAt",
-  "tags"."updatedAt",
-  "tags"."color",
-  "tags"."parentId"
+  "tag"."id",
+  "tag"."value",
+  "tag"."createdAt",
+  "tag"."updatedAt",
+  "tag"."color",
+  "tag"."parentId"
 rollback
 
 -- TagRepository.getAll
 select
-  "tags"."id",
-  "tags"."value",
-  "tags"."createdAt",
-  "tags"."updatedAt",
-  "tags"."color",
-  "tags"."parentId"
+  "tag"."id",
+  "tag"."value",
+  "tag"."createdAt",
+  "tag"."updatedAt",
+  "tag"."color",
+  "tag"."parentId"
 from
-  "tags"
+  "tag"
 where
   "userId" = $1
 order by
@@ -62,14 +62,14 @@ order by
 
 -- TagRepository.create
 insert into
-  "tags" ("userId", "color", "value")
+  "tag" ("userId", "color", "value")
 values
   ($1, $2, $3)
 returning
   *
 
 -- TagRepository.update
-update "tags"
+update "tag"
 set
   "color" = $1
 where
@@ -78,7 +78,7 @@ returning
   *
 
 -- TagRepository.delete
-delete from "tags"
+delete from "tag"
 where
   "id" = $1
 
diff --git a/server/src/queries/trash.repository.sql b/server/src/queries/trash.repository.sql
index 77c2ea51d0..57b2f32e37 100644
--- a/server/src/queries/trash.repository.sql
+++ b/server/src/queries/trash.repository.sql
@@ -1,7 +1,7 @@
 -- NOTE: This file is auto generated by ./sql-generator
 
 -- TrashRepository.restore
-update "assets"
+update "asset"
 set
   "status" = $1,
   "deletedAt" = $2
@@ -10,7 +10,7 @@ where
   and "status" = $4
 
 -- TrashRepository.empty
-update "assets"
+update "asset"
 set
   "status" = $1
 where
@@ -18,7 +18,7 @@ where
   and "status" = $3
 
 -- TrashRepository.restoreAll
-update "assets"
+update "asset"
 set
   "status" = $1,
   "deletedAt" = $2
diff --git a/server/src/queries/user.repository.sql b/server/src/queries/user.repository.sql
index 88f94c85ac..f1809464bf 100644
--- a/server/src/queries/user.repository.sql
+++ b/server/src/queries/user.repository.sql
@@ -30,14 +30,14 @@ select
         from
           "user_metadata"
         where
-          "users"."id" = "user_metadata"."userId"
+          "user"."id" = "user_metadata"."userId"
       ) as agg
   ) as "metadata"
 from
-  "users"
+  "user"
 where
-  "users"."id" = $1
-  and "users"."deletedAt" is null
+  "user"."id" = $1
+  and "user"."deletedAt" is null
 
 -- UserRepository.getAdmin
 select
@@ -69,43 +69,43 @@ select
         from
           "user_metadata"
         where
-          "users"."id" = "user_metadata"."userId"
+          "user"."id" = "user_metadata"."userId"
       ) as agg
   ) as "metadata"
 from
-  "users"
+  "user"
 where
-  "users"."isAdmin" = $1
-  and "users"."deletedAt" is null
+  "user"."isAdmin" = $1
+  and "user"."deletedAt" is null
 
 -- UserRepository.hasAdmin
 select
-  "users"."id"
+  "user"."id"
 from
-  "users"
+  "user"
 where
-  "users"."isAdmin" = $1
-  and "users"."deletedAt" is null
+  "user"."isAdmin" = $1
+  and "user"."deletedAt" is null
 
 -- UserRepository.getForPinCode
 select
-  "users"."pinCode",
-  "users"."password"
+  "user"."pinCode",
+  "user"."password"
 from
-  "users"
+  "user"
 where
-  "users"."id" = $1
-  and "users"."deletedAt" is null
+  "user"."id" = $1
+  and "user"."deletedAt" is null
 
 -- UserRepository.getForChangePassword
 select
-  "users"."id",
-  "users"."password"
+  "user"."id",
+  "user"."password"
 from
-  "users"
+  "user"
 where
-  "users"."id" = $1
-  and "users"."deletedAt" is null
+  "user"."id" = $1
+  and "user"."deletedAt" is null
 
 -- UserRepository.getByEmail
 select
@@ -137,14 +137,14 @@ select
         from
           "user_metadata"
         where
-          "users"."id" = "user_metadata"."userId"
+          "user"."id" = "user_metadata"."userId"
       ) as agg
   ) as "metadata"
 from
-  "users"
+  "user"
 where
   "email" = $1
-  and "users"."deletedAt" is null
+  and "user"."deletedAt" is null
 
 -- UserRepository.getByStorageLabel
 select
@@ -166,10 +166,10 @@ select
   "quotaSizeInBytes",
   "quotaUsageInBytes"
 from
-  "users"
+  "user"
 where
-  "users"."storageLabel" = $1
-  and "users"."deletedAt" is null
+  "user"."storageLabel" = $1
+  and "user"."deletedAt" is null
 
 -- UserRepository.getByOAuthId
 select
@@ -201,22 +201,22 @@ select
         from
           "user_metadata"
         where
-          "users"."id" = "user_metadata"."userId"
+          "user"."id" = "user_metadata"."userId"
       ) as agg
   ) as "metadata"
 from
-  "users"
+  "user"
 where
-  "users"."oauthId" = $1
-  and "users"."deletedAt" is null
+  "user"."oauthId" = $1
+  and "user"."deletedAt" is null
 
 -- UserRepository.getDeletedAfter
 select
   "id"
 from
-  "users"
+  "user"
 where
-  "users"."deletedAt" < $1
+  "user"."deletedAt" < $1
 
 -- UserRepository.getList (with deleted)
 select
@@ -248,11 +248,11 @@ select
         from
           "user_metadata"
         where
-          "users"."id" = "user_metadata"."userId"
+          "user"."id" = "user_metadata"."userId"
       ) as agg
   ) as "metadata"
 from
-  "users"
+  "user"
 order by
   "createdAt" desc
 
@@ -286,95 +286,95 @@ select
         from
           "user_metadata"
         where
-          "users"."id" = "user_metadata"."userId"
+          "user"."id" = "user_metadata"."userId"
       ) as agg
   ) as "metadata"
 from
-  "users"
+  "user"
 where
-  "users"."deletedAt" is null
+  "user"."deletedAt" is null
 order by
   "createdAt" desc
 
 -- UserRepository.getUserStats
 select
-  "users"."id" as "userId",
-  "users"."name" as "userName",
-  "users"."quotaSizeInBytes",
+  "user"."id" as "userId",
+  "user"."name" as "userName",
+  "user"."quotaSizeInBytes",
   count(*) filter (
     where
       (
-        "assets"."type" = 'IMAGE'
-        and "assets"."visibility" != 'hidden'
+        "asset"."type" = 'IMAGE'
+        and "asset"."visibility" != 'hidden'
       )
   ) as "photos",
   count(*) filter (
     where
       (
-        "assets"."type" = 'VIDEO'
-        and "assets"."visibility" != 'hidden'
+        "asset"."type" = 'VIDEO'
+        and "asset"."visibility" != 'hidden'
       )
   ) as "videos",
   coalesce(
-    sum("exif"."fileSizeInByte") filter (
+    sum("asset_exif"."fileSizeInByte") filter (
       where
-        "assets"."libraryId" is null
+        "asset"."libraryId" is null
     ),
     0
   ) as "usage",
   coalesce(
-    sum("exif"."fileSizeInByte") filter (
+    sum("asset_exif"."fileSizeInByte") filter (
       where
         (
-          "assets"."libraryId" is null
-          and "assets"."type" = 'IMAGE'
+          "asset"."libraryId" is null
+          and "asset"."type" = 'IMAGE'
         )
     ),
     0
   ) as "usagePhotos",
   coalesce(
-    sum("exif"."fileSizeInByte") filter (
+    sum("asset_exif"."fileSizeInByte") filter (
       where
         (
-          "assets"."libraryId" is null
-          and "assets"."type" = 'VIDEO'
+          "asset"."libraryId" is null
+          and "asset"."type" = 'VIDEO'
         )
     ),
     0
   ) as "usageVideos"
 from
-  "users"
-  left join "assets" on "assets"."ownerId" = "users"."id"
-  and "assets"."deletedAt" is null
-  left join "exif" on "exif"."assetId" = "assets"."id"
+  "user"
+  left join "asset" on "asset"."ownerId" = "user"."id"
+  and "asset"."deletedAt" is null
+  left join "asset_exif" on "asset_exif"."assetId" = "asset"."id"
 group by
-  "users"."id"
+  "user"."id"
 order by
-  "users"."createdAt" asc
+  "user"."createdAt" asc
 
 -- UserRepository.updateUsage
-update "users"
+update "user"
 set
   "quotaUsageInBytes" = "quotaUsageInBytes" + $1,
   "updatedAt" = $2
 where
   "id" = $3::uuid
-  and "users"."deletedAt" is null
+  and "user"."deletedAt" is null
 
 -- UserRepository.syncUsage
-update "users"
+update "user"
 set
   "quotaUsageInBytes" = (
     select
-      coalesce(sum("exif"."fileSizeInByte"), 0) as "usage"
+      coalesce(sum("asset_exif"."fileSizeInByte"), 0) as "usage"
     from
-      "assets"
-      left join "exif" on "exif"."assetId" = "assets"."id"
+      "asset"
+      left join "asset_exif" on "asset_exif"."assetId" = "asset"."id"
     where
-      "assets"."libraryId" is null
-      and "assets"."ownerId" = "users"."id"
+      "asset"."libraryId" is null
+      and "asset"."ownerId" = "user"."id"
   ),
   "updatedAt" = $1
 where
-  "users"."deletedAt" is null
-  and "users"."id" = $2::uuid
+  "user"."deletedAt" is null
+  and "user"."id" = $2::uuid
diff --git a/server/src/queries/view.repository.sql b/server/src/queries/view.repository.sql
index a2260ce5f6..81f5ca20b8 100644
--- a/server/src/queries/view.repository.sql
+++ b/server/src/queries/view.repository.sql
@@ -2,9 +2,9 @@
 
 -- ViewRepository.getUniqueOriginalPaths
 select distinct
-  substring("assets"."originalPath", $1) as "directoryPath"
+  substring("asset"."originalPath", $1) as "directoryPath"
 from
-  "assets"
+  "asset"
 where
   "ownerId" = $2::uuid
   and "visibility" = $3
@@ -15,11 +15,11 @@ where
 
 -- ViewRepository.getAssetsByOriginalPath
 select
-  "assets".*,
-  to_json("exif") as "exifInfo"
+  "asset".*,
+  to_json("asset_exif") as "exifInfo"
 from
-  "assets"
-  left join "exif" on "assets"."id" = "exif"."assetId"
+  "asset"
+  left join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
   "ownerId" = $1::uuid
   and "visibility" = $2
@@ -30,4 +30,4 @@ where
   and "originalPath" like $3
   and "originalPath" not like $4
 order by
-  regexp_replace("assets"."originalPath", $5, $6) asc
+  regexp_replace("asset"."originalPath", $5, $6) asc
diff --git a/server/src/repositories/access.repository.ts b/server/src/repositories/access.repository.ts
index 8863d117bc..14a765778e 100644
--- a/server/src/repositories/access.repository.ts
+++ b/server/src/repositories/access.repository.ts
@@ -35,9 +35,9 @@ class ActivityAccess {
     return this.db
       .selectFrom('activity')
       .select('activity.id')
-      .leftJoin('albums', (join) => join.onRef('activity.albumId', '=', 'albums.id').on('albums.deletedAt', 'is', null))
+      .leftJoin('album', (join) => join.onRef('activity.albumId', '=', 'album.id').on('album.deletedAt', 'is', null))
       .where('activity.id', 'in', [...activityIds])
-      .whereRef('albums.ownerId', '=', asUuid(userId))
+      .whereRef('album.ownerId', '=', asUuid(userId))
       .execute()
       .then((activities) => new Set(activities.map((activity) => activity.id)));
   }
@@ -50,14 +50,14 @@ class ActivityAccess {
     }
 
     return this.db
-      .selectFrom('albums')
-      .select('albums.id')
-      .leftJoin('albums_shared_users_users as albumUsers', 'albumUsers.albumsId', 'albums.id')
-      .leftJoin('users', (join) => join.onRef('users.id', '=', 'albumUsers.usersId').on('users.deletedAt', 'is', null))
-      .where('albums.id', 'in', [...albumIds])
-      .where('albums.isActivityEnabled', '=', true)
-      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('users.id', '=', userId)]))
-      .where('albums.deletedAt', 'is', null)
+      .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))
+      .where('album.id', 'in', [...albumIds])
+      .where('album.isActivityEnabled', '=', true)
+      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('user.id', '=', userId)]))
+      .where('album.deletedAt', 'is', null)
       .execute()
       .then((albums) => new Set(albums.map((album) => album.id)));
   }
@@ -74,11 +74,11 @@ class AlbumAccess {
     }
 
     return this.db
-      .selectFrom('albums')
-      .select('albums.id')
-      .where('albums.id', 'in', [...albumIds])
-      .where('albums.ownerId', '=', userId)
-      .where('albums.deletedAt', 'is', null)
+      .selectFrom('album')
+      .select('album.id')
+      .where('album.id', 'in', [...albumIds])
+      .where('album.ownerId', '=', userId)
+      .where('album.deletedAt', 'is', null)
       .execute()
       .then((albums) => new Set(albums.map((album) => album.id)));
   }
@@ -94,14 +94,14 @@ class AlbumAccess {
       access === AlbumUserRole.EDITOR ? [AlbumUserRole.EDITOR] : [AlbumUserRole.EDITOR, AlbumUserRole.VIEWER];
 
     return this.db
-      .selectFrom('albums')
-      .select('albums.id')
-      .leftJoin('albums_shared_users_users as albumUsers', 'albumUsers.albumsId', 'albums.id')
-      .leftJoin('users', (join) => join.onRef('users.id', '=', 'albumUsers.usersId').on('users.deletedAt', 'is', null))
-      .where('albums.id', 'in', [...albumIds])
-      .where('albums.deletedAt', 'is', null)
-      .where('users.id', '=', userId)
-      .where('albumUsers.role', 'in', [...accessRole])
+      .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))
+      .where('album.id', 'in', [...albumIds])
+      .where('album.deletedAt', 'is', null)
+      .where('user.id', '=', userId)
+      .where('album_user.role', 'in', [...accessRole])
       .execute()
       .then((albums) => new Set(albums.map((album) => album.id)));
   }
@@ -114,10 +114,10 @@ class AlbumAccess {
     }
 
     return this.db
-      .selectFrom('shared_links')
-      .select('shared_links.albumId')
-      .where('shared_links.id', '=', sharedLinkId)
-      .where('shared_links.albumId', 'in', [...albumIds])
+      .selectFrom('shared_link')
+      .select('shared_link.albumId')
+      .where('shared_link.id', '=', sharedLinkId)
+      .where('shared_link.albumId', 'in', [...albumIds])
       .execute()
       .then(
         (sharedLinks) => new Set(sharedLinks.flatMap((sharedLink) => (sharedLink.albumId ? [sharedLink.albumId] : []))),
@@ -136,21 +136,21 @@ class AssetAccess {
     }
 
     return this.db
-      .selectFrom('albums')
-      .innerJoin('albums_assets_assets as albumAssets', 'albums.id', 'albumAssets.albumsId')
-      .innerJoin('assets', (join) =>
-        join.onRef('assets.id', '=', 'albumAssets.assetsId').on('assets.deletedAt', 'is', null),
+      .selectFrom('album')
+      .innerJoin('album_asset as albumAssets', 'album.id', 'albumAssets.albumsId')
+      .innerJoin('asset', (join) =>
+        join.onRef('asset.id', '=', 'albumAssets.assetsId').on('asset.deletedAt', 'is', null),
       )
-      .leftJoin('albums_shared_users_users as albumUsers', 'albumUsers.albumsId', 'albums.id')
-      .leftJoin('users', (join) => join.onRef('users.id', '=', 'albumUsers.usersId').on('users.deletedAt', 'is', null))
-      .select(['assets.id', 'assets.livePhotoVideoId'])
+      .leftJoin('album_user as albumUsers', 'albumUsers.albumsId', 'album.id')
+      .leftJoin('user', (join) => join.onRef('user.id', '=', 'albumUsers.usersId').on('user.deletedAt', 'is', null))
+      .select(['asset.id', 'asset.livePhotoVideoId'])
       .where(
-        sql`array["assets"."id", "assets"."livePhotoVideoId"]`,
+        sql`array["asset"."id", "asset"."livePhotoVideoId"]`,
         '&&',
         sql`array[${sql.join([...assetIds])}]::uuid[] `,
       )
-      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('users.id', '=', userId)]))
-      .where('albums.deletedAt', 'is', null)
+      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('user.id', '=', userId)]))
+      .where('album.deletedAt', 'is', null)
       .execute()
       .then((assets) => {
         const allowedIds = new Set<string>();
@@ -174,11 +174,11 @@ class AssetAccess {
     }
 
     return this.db
-      .selectFrom('assets')
-      .select('assets.id')
-      .where('assets.id', 'in', [...assetIds])
-      .where('assets.ownerId', '=', userId)
-      .$if(!hasElevatedPermission, (eb) => eb.where('assets.visibility', '!=', AssetVisibility.LOCKED))
+      .selectFrom('asset')
+      .select('asset.id')
+      .where('asset.id', 'in', [...assetIds])
+      .where('asset.ownerId', '=', userId)
+      .$if(!hasElevatedPermission, (eb) => eb.where('asset.visibility', '!=', AssetVisibility.LOCKED))
       .execute()
       .then((assets) => new Set(assets.map((asset) => asset.id)));
   }
@@ -191,23 +191,21 @@ class AssetAccess {
     }
 
     return this.db
-      .selectFrom('partners as partner')
-      .innerJoin('users as sharedBy', (join) =>
+      .selectFrom('partner')
+      .innerJoin('user as sharedBy', (join) =>
         join.onRef('sharedBy.id', '=', 'partner.sharedById').on('sharedBy.deletedAt', 'is', null),
       )
-      .innerJoin('assets', (join) =>
-        join.onRef('assets.ownerId', '=', 'sharedBy.id').on('assets.deletedAt', 'is', null),
-      )
-      .select('assets.id')
+      .innerJoin('asset', (join) => join.onRef('asset.ownerId', '=', 'sharedBy.id').on('asset.deletedAt', 'is', null))
+      .select('asset.id')
       .where('partner.sharedWithId', '=', userId)
       .where((eb) =>
         eb.or([
-          eb('assets.visibility', '=', sql.lit(AssetVisibility.TIMELINE)),
-          eb('assets.visibility', '=', sql.lit(AssetVisibility.HIDDEN)),
+          eb('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE)),
+          eb('asset.visibility', '=', sql.lit(AssetVisibility.HIDDEN)),
         ]),
       )
 
-      .where('assets.id', 'in', [...assetIds])
+      .where('asset.id', 'in', [...assetIds])
       .execute()
       .then((assets) => new Set(assets.map((asset) => asset.id)));
   }
@@ -220,27 +218,25 @@ class AssetAccess {
     }
 
     return this.db
-      .selectFrom('shared_links')
-      .leftJoin('albums', (join) =>
-        join.onRef('albums.id', '=', 'shared_links.albumId').on('albums.deletedAt', 'is', null),
+      .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('asset', (join) =>
+        join.onRef('asset.id', '=', 'shared_link_asset.assetsId').on('asset.deletedAt', 'is', null),
       )
-      .leftJoin('shared_link__asset', 'shared_link__asset.sharedLinksId', 'shared_links.id')
-      .leftJoin('assets', (join) =>
-        join.onRef('assets.id', '=', 'shared_link__asset.assetsId').on('assets.deletedAt', 'is', null),
-      )
-      .leftJoin('albums_assets_assets', 'albums_assets_assets.albumsId', 'albums.id')
-      .leftJoin('assets as albumAssets', (join) =>
-        join.onRef('albumAssets.id', '=', 'albums_assets_assets.assetsId').on('albumAssets.deletedAt', 'is', null),
+      .leftJoin('album_asset', 'album_asset.albumsId', 'album.id')
+      .leftJoin('asset as albumAssets', (join) =>
+        join.onRef('albumAssets.id', '=', 'album_asset.assetsId').on('albumAssets.deletedAt', 'is', null),
       )
       .select([
-        'assets.id as assetId',
-        'assets.livePhotoVideoId as assetLivePhotoVideoId',
+        'asset.id as assetId',
+        'asset.livePhotoVideoId as assetLivePhotoVideoId',
         'albumAssets.id as albumAssetId',
         'albumAssets.livePhotoVideoId as albumAssetLivePhotoVideoId',
       ])
-      .where('shared_links.id', '=', sharedLinkId)
+      .where('shared_link.id', '=', sharedLinkId)
       .where(
-        sql`array["assets"."id", "assets"."livePhotoVideoId", "albumAssets"."id", "albumAssets"."livePhotoVideoId"]`,
+        sql`array["asset"."id", "asset"."livePhotoVideoId", "albumAssets"."id", "albumAssets"."livePhotoVideoId"]`,
         '&&',
         sql`array[${sql.join([...assetIds])}]::uuid[] `,
       )
@@ -277,10 +273,10 @@ class AuthDeviceAccess {
     }
 
     return this.db
-      .selectFrom('sessions')
-      .select('sessions.id')
-      .where('sessions.userId', '=', userId)
-      .where('sessions.id', 'in', [...deviceIds])
+      .selectFrom('session')
+      .select('session.id')
+      .where('session.userId', '=', userId)
+      .where('session.id', 'in', [...deviceIds])
       .execute()
       .then((tokens) => new Set(tokens.map((token) => token.id)));
   }
@@ -297,10 +293,10 @@ class NotificationAccess {
     }
 
     return this.db
-      .selectFrom('notifications')
-      .select('notifications.id')
-      .where('notifications.id', 'in', [...notificationIds])
-      .where('notifications.userId', '=', userId)
+      .selectFrom('notification')
+      .select('notification.id')
+      .where('notification.id', 'in', [...notificationIds])
+      .where('notification.userId', '=', userId)
       .execute()
       .then((stacks) => new Set(stacks.map((stack) => stack.id)));
   }
@@ -317,10 +313,10 @@ class SessionAccess {
     }
 
     return this.db
-      .selectFrom('sessions')
-      .select('sessions.id')
-      .where('sessions.id', 'in', [...sessionIds])
-      .where('sessions.userId', '=', userId)
+      .selectFrom('session')
+      .select('session.id')
+      .where('session.id', 'in', [...sessionIds])
+      .where('session.userId', '=', userId)
       .execute()
       .then((sessions) => new Set(sessions.map((session) => session.id)));
   }
@@ -336,10 +332,10 @@ class StackAccess {
     }
 
     return this.db
-      .selectFrom('asset_stack as stacks')
-      .select('stacks.id')
-      .where('stacks.id', 'in', [...stackIds])
-      .where('stacks.ownerId', '=', userId)
+      .selectFrom('stack')
+      .select('stack.id')
+      .where('stack.id', 'in', [...stackIds])
+      .where('stack.ownerId', '=', userId)
       .execute()
       .then((stacks) => new Set(stacks.map((stack) => stack.id)));
   }
@@ -356,10 +352,10 @@ class TimelineAccess {
     }
 
     return this.db
-      .selectFrom('partners')
-      .select('partners.sharedById')
-      .where('partners.sharedById', 'in', [...partnerIds])
-      .where('partners.sharedWithId', '=', userId)
+      .selectFrom('partner')
+      .select('partner.sharedById')
+      .where('partner.sharedById', 'in', [...partnerIds])
+      .where('partner.sharedWithId', '=', userId)
       .execute()
       .then((partners) => new Set(partners.map((partner) => partner.sharedById)));
   }
@@ -376,11 +372,11 @@ class MemoryAccess {
     }
 
     return this.db
-      .selectFrom('memories')
-      .select('memories.id')
-      .where('memories.id', 'in', [...memoryIds])
-      .where('memories.ownerId', '=', userId)
-      .where('memories.deletedAt', 'is', null)
+      .selectFrom('memory')
+      .select('memory.id')
+      .where('memory.id', 'in', [...memoryIds])
+      .where('memory.ownerId', '=', userId)
+      .where('memory.deletedAt', 'is', null)
       .execute()
       .then((memories) => new Set(memories.map((memory) => memory.id)));
   }
@@ -413,13 +409,11 @@ class PersonAccess {
     }
 
     return this.db
-      .selectFrom('asset_faces')
-      .select('asset_faces.id')
-      .leftJoin('assets', (join) =>
-        join.onRef('assets.id', '=', 'asset_faces.assetId').on('assets.deletedAt', 'is', null),
-      )
-      .where('asset_faces.id', 'in', [...assetFaceIds])
-      .where('assets.ownerId', '=', userId)
+      .selectFrom('asset_face')
+      .select('asset_face.id')
+      .leftJoin('asset', (join) => join.onRef('asset.id', '=', 'asset_face.assetId').on('asset.deletedAt', 'is', null))
+      .where('asset_face.id', 'in', [...assetFaceIds])
+      .where('asset.ownerId', '=', userId)
       .execute()
       .then((faces) => new Set(faces.map((face) => face.id)));
   }
@@ -436,10 +430,10 @@ class PartnerAccess {
     }
 
     return this.db
-      .selectFrom('partners')
-      .select('partners.sharedById')
-      .where('partners.sharedById', 'in', [...partnerIds])
-      .where('partners.sharedWithId', '=', userId)
+      .selectFrom('partner')
+      .select('partner.sharedById')
+      .where('partner.sharedById', 'in', [...partnerIds])
+      .where('partner.sharedWithId', '=', userId)
       .execute()
       .then((partners) => new Set(partners.map((partner) => partner.sharedById)));
   }
@@ -456,10 +450,10 @@ class TagAccess {
     }
 
     return this.db
-      .selectFrom('tags')
-      .select('tags.id')
-      .where('tags.id', 'in', [...tagIds])
-      .where('tags.userId', '=', userId)
+      .selectFrom('tag')
+      .select('tag.id')
+      .where('tag.id', 'in', [...tagIds])
+      .where('tag.userId', '=', userId)
       .execute()
       .then((tags) => new Set(tags.map((tag) => tag.id)));
   }
diff --git a/server/src/repositories/activity.repository.ts b/server/src/repositories/activity.repository.ts
index 0714d058cf..9b991ef17f 100644
--- a/server/src/repositories/activity.repository.ts
+++ b/server/src/repositories/activity.repository.ts
@@ -27,7 +27,9 @@ export class ActivityRepository {
     return this.db
       .selectFrom('activity')
       .selectAll('activity')
-      .innerJoin('users', (join) => join.onRef('users.id', '=', 'activity.userId').on('users.deletedAt', 'is', null))
+      .innerJoin('user as user2', (join) =>
+        join.onRef('user2.id', '=', 'activity.userId').on('user2.deletedAt', 'is', null),
+      )
       .innerJoinLateral(
         (eb) =>
           eb
@@ -37,13 +39,13 @@ export class ActivityRepository {
         (join) => join.onTrue(),
       )
       .select((eb) => eb.fn.toJson('user').as('user'))
-      .leftJoin('assets', 'assets.id', 'activity.assetId')
+      .leftJoin('asset', 'asset.id', 'activity.assetId')
       .$if(!!userId, (qb) => qb.where('activity.userId', '=', userId!))
       .$if(assetId === null, (qb) => qb.where('assetId', 'is', null))
       .$if(!!assetId, (qb) => qb.where('activity.assetId', '=', assetId!))
       .$if(!!albumId, (qb) => qb.where('activity.albumId', '=', albumId!))
       .$if(isLiked !== undefined, (qb) => qb.where('activity.isLiked', '=', isLiked!))
-      .where('assets.deletedAt', 'is', null)
+      .where('asset.deletedAt', 'is', null)
       .orderBy('activity.createdAt', 'asc')
       .execute();
   }
@@ -55,7 +57,7 @@ export class ActivityRepository {
       .values(activity)
       .returningAll()
       .returning((eb) =>
-        jsonObjectFrom(eb.selectFrom('users').whereRef('users.id', '=', 'activity.userId').select(columns.user)).as(
+        jsonObjectFrom(eb.selectFrom('user').whereRef('user.id', '=', 'activity.userId').select(columns.user)).as(
           'user',
         ),
       )
@@ -82,14 +84,14 @@ export class ActivityRepository {
         eb.fn.countAll<number>().filterWhere('activity.isLiked', '=', false).as('comments'),
         eb.fn.countAll<number>().filterWhere('activity.isLiked', '=', true).as('likes'),
       ])
-      .innerJoin('users', (join) => join.onRef('users.id', '=', 'activity.userId').on('users.deletedAt', 'is', null))
-      .leftJoin('assets', 'assets.id', 'activity.assetId')
+      .innerJoin('user', (join) => join.onRef('user.id', '=', 'activity.userId').on('user.deletedAt', 'is', null))
+      .leftJoin('asset', 'asset.id', 'activity.assetId')
       .$if(!!assetId, (qb) => qb.where('activity.assetId', '=', assetId!))
       .where('activity.albumId', '=', albumId)
       .where(({ or, and, eb }) =>
         or([
-          and([eb('assets.deletedAt', 'is', null), eb('assets.visibility', '!=', sql.lit(AssetVisibility.LOCKED))]),
-          eb('assets.id', 'is', null),
+          and([eb('asset.deletedAt', 'is', null), eb('asset.visibility', '!=', sql.lit(AssetVisibility.LOCKED))]),
+          eb('asset.id', 'is', null),
         ]),
       )
       .executeTakeFirstOrThrow();
diff --git a/server/src/repositories/album-user.repository.ts b/server/src/repositories/album-user.repository.ts
index 82e631a6dc..d968ed100c 100644
--- a/server/src/repositories/album-user.repository.ts
+++ b/server/src/repositories/album-user.repository.ts
@@ -18,7 +18,7 @@ export class AlbumUserRepository {
   @GenerateSql({ params: [{ usersId: DummyValue.UUID, albumsId: DummyValue.UUID }] })
   create(albumUser: Insertable<AlbumUserTable>) {
     return this.db
-      .insertInto('albums_shared_users_users')
+      .insertInto('album_user')
       .values(albumUser)
       .returning(['usersId', 'albumsId', 'role'])
       .executeTakeFirstOrThrow();
@@ -27,7 +27,7 @@ export class AlbumUserRepository {
   @GenerateSql({ params: [{ usersId: DummyValue.UUID, albumsId: DummyValue.UUID }, { role: AlbumUserRole.VIEWER }] })
   update({ usersId, albumsId }: AlbumPermissionId, dto: Updateable<AlbumUserTable>) {
     return this.db
-      .updateTable('albums_shared_users_users')
+      .updateTable('album_user')
       .set(dto)
       .where('usersId', '=', usersId)
       .where('albumsId', '=', albumsId)
@@ -37,10 +37,6 @@ export class AlbumUserRepository {
 
   @GenerateSql({ params: [{ usersId: DummyValue.UUID, albumsId: DummyValue.UUID }] })
   async delete({ usersId, albumsId }: AlbumPermissionId): Promise<void> {
-    await this.db
-      .deleteFrom('albums_shared_users_users')
-      .where('usersId', '=', usersId)
-      .where('albumsId', '=', albumsId)
-      .execute();
+    await this.db.deleteFrom('album_user').where('usersId', '=', usersId).where('albumsId', '=', albumsId).execute();
   }
 }
diff --git a/server/src/repositories/album.repository.ts b/server/src/repositories/album.repository.ts
index a52fa9c990..f077c36c41 100644
--- a/server/src/repositories/album.repository.ts
+++ b/server/src/repositories/album.repository.ts
@@ -21,47 +21,47 @@ export interface AlbumInfoOptions {
   withAssets: boolean;
 }
 
-const withOwner = (eb: ExpressionBuilder<DB, 'albums'>) => {
-  return jsonObjectFrom(eb.selectFrom('users').select(columns.user).whereRef('users.id', '=', 'albums.ownerId'))
+const withOwner = (eb: ExpressionBuilder<DB, 'album'>) => {
+  return jsonObjectFrom(eb.selectFrom('user').select(columns.user).whereRef('user.id', '=', 'album.ownerId'))
     .$notNull()
     .as('owner');
 };
 
-const withAlbumUsers = (eb: ExpressionBuilder<DB, 'albums'>) => {
+const withAlbumUsers = (eb: ExpressionBuilder<DB, 'album'>) => {
   return jsonArrayFrom(
     eb
-      .selectFrom('albums_shared_users_users as album_users')
-      .select('album_users.role')
+      .selectFrom('album_user')
+      .select('album_user.role')
       .select((eb) =>
-        jsonObjectFrom(eb.selectFrom('users').select(columns.user).whereRef('users.id', '=', 'album_users.usersId'))
+        jsonObjectFrom(eb.selectFrom('user').select(columns.user).whereRef('user.id', '=', 'album_user.usersId'))
           .$notNull()
           .as('user'),
       )
-      .whereRef('album_users.albumsId', '=', 'albums.id'),
+      .whereRef('album_user.albumsId', '=', 'album.id'),
   )
     .$notNull()
     .as('albumUsers');
 };
 
-const withSharedLink = (eb: ExpressionBuilder<DB, 'albums'>) => {
-  return jsonArrayFrom(eb.selectFrom('shared_links').selectAll().whereRef('shared_links.albumId', '=', 'albums.id')).as(
+const withSharedLink = (eb: ExpressionBuilder<DB, 'album'>) => {
+  return jsonArrayFrom(eb.selectFrom('shared_link').selectAll().whereRef('shared_link.albumId', '=', 'album.id')).as(
     'sharedLinks',
   );
 };
 
-const withAssets = (eb: ExpressionBuilder<DB, 'albums'>) => {
+const withAssets = (eb: ExpressionBuilder<DB, 'album'>) => {
   return eb
     .selectFrom((eb) =>
       eb
-        .selectFrom('assets')
-        .selectAll('assets')
-        .leftJoin('exif', 'assets.id', 'exif.assetId')
-        .select((eb) => eb.table('exif').$castTo<Exif>().as('exifInfo'))
-        .innerJoin('albums_assets_assets', 'albums_assets_assets.assetsId', 'assets.id')
-        .whereRef('albums_assets_assets.albumsId', '=', 'albums.id')
-        .where('assets.deletedAt', 'is', null)
+        .selectFrom('asset')
+        .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')
+        .where('asset.deletedAt', 'is', null)
         .$call(withDefaultVisibility)
-        .orderBy('assets.fileCreatedAt', 'desc')
+        .orderBy('asset.fileCreatedAt', 'desc')
         .as('asset'),
     )
     .select((eb) => eb.fn.jsonAgg('asset').as('assets'))
@@ -75,10 +75,10 @@ export class AlbumRepository {
   @GenerateSql({ params: [DummyValue.UUID, { withAssets: true }] })
   async getById(id: string, options: AlbumInfoOptions) {
     return this.db
-      .selectFrom('albums')
-      .selectAll('albums')
-      .where('albums.id', '=', id)
-      .where('albums.deletedAt', 'is', null)
+      .selectFrom('album')
+      .selectAll('album')
+      .where('album.id', '=', id)
+      .where('album.deletedAt', 'is', null)
       .select(withOwner)
       .select(withAlbumUsers)
       .select(withSharedLink)
@@ -90,26 +90,26 @@ export class AlbumRepository {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
   async getByAssetId(ownerId: string, assetId: string) {
     return this.db
-      .selectFrom('albums')
-      .selectAll('albums')
-      .innerJoin('albums_assets_assets as album_assets', 'album_assets.albumsId', 'albums.id')
+      .selectFrom('album')
+      .selectAll('album')
+      .innerJoin('album_asset', 'album_asset.albumsId', 'album.id')
       .where((eb) =>
         eb.or([
-          eb('albums.ownerId', '=', ownerId),
+          eb('album.ownerId', '=', ownerId),
           eb.exists(
             eb
-              .selectFrom('albums_shared_users_users as album_users')
-              .whereRef('album_users.albumsId', '=', 'albums.id')
-              .where('album_users.usersId', '=', ownerId),
+              .selectFrom('album_user')
+              .whereRef('album_user.albumsId', '=', 'album.id')
+              .where('album_user.usersId', '=', ownerId),
           ),
         ]),
       )
-      .where('album_assets.assetsId', '=', assetId)
-      .where('albums.deletedAt', 'is', null)
-      .orderBy('albums.createdAt', 'desc')
+      .where('album_asset.assetsId', '=', assetId)
+      .where('album.deletedAt', 'is', null)
+      .orderBy('album.createdAt', 'desc')
       .select(withOwner)
       .select(withAlbumUsers)
-      .orderBy('albums.createdAt', 'desc')
+      .orderBy('album.createdAt', 'desc')
       .execute();
   }
 
@@ -123,18 +123,18 @@ export class AlbumRepository {
 
     return (
       this.db
-        .selectFrom('assets')
+        .selectFrom('asset')
         .$call(withDefaultVisibility)
-        .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'assets.id')
-        .select('album_assets.albumsId as albumId')
-        .select((eb) => eb.fn.min(sql<Date>`("assets"."localDateTime" AT TIME ZONE 'UTC'::text)::date`).as('startDate'))
-        .select((eb) => eb.fn.max(sql<Date>`("assets"."localDateTime" AT TIME ZONE 'UTC'::text)::date`).as('endDate'))
+        .innerJoin('album_asset', 'album_asset.assetsId', 'asset.id')
+        .select('album_asset.albumsId 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('assets.updatedAt').as('lastModifiedAssetTimestamp'))
-        .select((eb) => sql<number>`${eb.fn.count('assets.id')}::int`.as('assetCount'))
-        .where('album_assets.albumsId', 'in', ids)
-        .where('assets.deletedAt', 'is', null)
-        .groupBy('album_assets.albumsId')
+        .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('asset.deletedAt', 'is', null)
+        .groupBy('album_asset.albumsId')
         .execute()
     );
   }
@@ -142,14 +142,14 @@ export class AlbumRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   async getOwned(ownerId: string) {
     return this.db
-      .selectFrom('albums')
-      .selectAll('albums')
+      .selectFrom('album')
+      .selectAll('album')
       .select(withOwner)
       .select(withAlbumUsers)
       .select(withSharedLink)
-      .where('albums.ownerId', '=', ownerId)
-      .where('albums.deletedAt', 'is', null)
-      .orderBy('albums.createdAt', 'desc')
+      .where('album.ownerId', '=', ownerId)
+      .where('album.deletedAt', 'is', null)
+      .orderBy('album.createdAt', 'desc')
       .execute();
   }
 
@@ -159,29 +159,29 @@ export class AlbumRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   async getShared(ownerId: string) {
     return this.db
-      .selectFrom('albums')
-      .selectAll('albums')
+      .selectFrom('album')
+      .selectAll('album')
       .where((eb) =>
         eb.or([
           eb.exists(
             eb
-              .selectFrom('albums_shared_users_users as album_users')
-              .whereRef('album_users.albumsId', '=', 'albums.id')
-              .where((eb) => eb.or([eb('albums.ownerId', '=', ownerId), eb('album_users.usersId', '=', ownerId)])),
+              .selectFrom('album_user')
+              .whereRef('album_user.albumsId', '=', 'album.id')
+              .where((eb) => eb.or([eb('album.ownerId', '=', ownerId), eb('album_user.usersId', '=', ownerId)])),
           ),
           eb.exists(
             eb
-              .selectFrom('shared_links')
-              .whereRef('shared_links.albumId', '=', 'albums.id')
-              .where('shared_links.userId', '=', ownerId),
+              .selectFrom('shared_link')
+              .whereRef('shared_link.albumId', '=', 'album.id')
+              .where('shared_link.userId', '=', ownerId),
           ),
         ]),
       )
-      .where('albums.deletedAt', 'is', null)
+      .where('album.deletedAt', 'is', null)
       .select(withAlbumUsers)
       .select(withOwner)
       .select(withSharedLink)
-      .orderBy('albums.createdAt', 'desc')
+      .orderBy('album.createdAt', 'desc')
       .execute();
   }
 
@@ -191,43 +191,33 @@ export class AlbumRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   async getNotShared(ownerId: string) {
     return this.db
-      .selectFrom('albums')
-      .selectAll('albums')
-      .where('albums.ownerId', '=', ownerId)
-      .where('albums.deletedAt', 'is', null)
-      .where((eb) =>
-        eb.not(
-          eb.exists(
-            eb
-              .selectFrom('albums_shared_users_users as album_users')
-              .whereRef('album_users.albumsId', '=', 'albums.id'),
-          ),
-        ),
-      )
-      .where((eb) =>
-        eb.not(eb.exists(eb.selectFrom('shared_links').whereRef('shared_links.albumId', '=', 'albums.id'))),
-      )
+      .selectFrom('album')
+      .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('shared_link').whereRef('shared_link.albumId', '=', 'album.id'))))
       .select(withOwner)
-      .orderBy('albums.createdAt', 'desc')
+      .orderBy('album.createdAt', 'desc')
       .execute();
   }
 
   async restoreAll(userId: string): Promise<void> {
-    await this.db.updateTable('albums').set({ deletedAt: null }).where('ownerId', '=', userId).execute();
+    await this.db.updateTable('album').set({ deletedAt: null }).where('ownerId', '=', userId).execute();
   }
 
   async softDeleteAll(userId: string): Promise<void> {
-    await this.db.updateTable('albums').set({ deletedAt: new Date() }).where('ownerId', '=', userId).execute();
+    await this.db.updateTable('album').set({ deletedAt: new Date() }).where('ownerId', '=', userId).execute();
   }
 
   async deleteAll(userId: string): Promise<void> {
-    await this.db.deleteFrom('albums').where('ownerId', '=', userId).execute();
+    await this.db.deleteFrom('album').where('ownerId', '=', userId).execute();
   }
 
   @GenerateSql({ params: [[DummyValue.UUID]] })
   @Chunked()
   async removeAssetsFromAll(assetIds: string[]): Promise<void> {
-    await this.db.deleteFrom('albums_assets_assets').where('albums_assets_assets.assetsId', 'in', assetIds).execute();
+    await this.db.deleteFrom('album_asset').where('album_asset.assetsId', 'in', assetIds).execute();
   }
 
   @Chunked({ paramIndex: 1 })
@@ -237,9 +227,9 @@ export class AlbumRepository {
     }
 
     await this.db
-      .deleteFrom('albums_assets_assets')
-      .where('albums_assets_assets.albumsId', '=', albumId)
-      .where('albums_assets_assets.assetsId', 'in', assetIds)
+      .deleteFrom('album_asset')
+      .where('album_asset.albumsId', '=', albumId)
+      .where('album_asset.assetsId', 'in', assetIds)
       .execute();
   }
 
@@ -258,10 +248,10 @@ export class AlbumRepository {
     }
 
     return this.db
-      .selectFrom('albums_assets_assets')
+      .selectFrom('album_asset')
       .selectAll()
-      .where('albums_assets_assets.albumsId', '=', albumId)
-      .where('albums_assets_assets.assetsId', 'in', assetIds)
+      .where('album_asset.albumsId', '=', albumId)
+      .where('album_asset.assetsId', 'in', assetIds)
       .execute()
       .then((results) => new Set(results.map(({ assetsId }) => assetsId)));
   }
@@ -272,7 +262,7 @@ export class AlbumRepository {
 
   create(album: Insertable<AlbumTable>, assetIds: string[], albumUsers: AlbumUserCreateDto[]) {
     return this.db.transaction().execute(async (tx) => {
-      const newAlbum = await tx.insertInto('albums').values(album).returning('albums.id').executeTakeFirst();
+      const newAlbum = await tx.insertInto('album').values(album).returning('album.id').executeTakeFirst();
 
       if (!newAlbum) {
         throw new Error('Failed to create album');
@@ -284,7 +274,7 @@ export class AlbumRepository {
 
       if (albumUsers.length > 0) {
         await tx
-          .insertInto('albums_shared_users_users')
+          .insertInto('album_user')
           .values(
             albumUsers.map((albumUser) => ({ albumsId: newAlbum.id, usersId: albumUser.userId, role: albumUser.role })),
           )
@@ -292,7 +282,7 @@ export class AlbumRepository {
       }
 
       return tx
-        .selectFrom('albums')
+        .selectFrom('album')
         .selectAll()
         .where('id', '=', newAlbum.id)
         .select(withOwner)
@@ -305,10 +295,10 @@ export class AlbumRepository {
 
   update(id: string, album: Updateable<AlbumTable>) {
     return this.db
-      .updateTable('albums')
+      .updateTable('album')
       .set(album)
       .where('id', '=', id)
-      .returningAll('albums')
+      .returningAll('album')
       .returning(withOwner)
       .returning(withSharedLink)
       .returning(withAlbumUsers)
@@ -316,7 +306,7 @@ export class AlbumRepository {
   }
 
   async delete(id: string): Promise<void> {
-    await this.db.deleteFrom('albums').where('id', '=', id).execute();
+    await this.db.deleteFrom('album').where('id', '=', id).execute();
   }
 
   @Chunked({ paramIndex: 2, chunkSize: 30_000 })
@@ -326,7 +316,7 @@ export class AlbumRepository {
     }
 
     await db
-      .insertInto('albums_assets_assets')
+      .insertInto('album_asset')
       .values(assetIds.map((assetId) => ({ albumsId: albumId, assetsId: assetId })))
       .execute();
   }
@@ -343,11 +333,11 @@ export class AlbumRepository {
     // Subquery for getting a new thumbnail.
 
     const result = await this.db
-      .updateTable('albums')
+      .updateTable('album')
       .set((eb) => ({
         albumThumbnailAssetId: this.updateThumbnailBuilder(eb)
-          .select('album_assets.assetsId')
-          .orderBy('assets.fileCreatedAt', 'desc')
+          .select('album_asset.assetsId')
+          .orderBy('asset.fileCreatedAt', 'desc')
           .limit(1),
       }))
       .where((eb) =>
@@ -362,7 +352,7 @@ export class AlbumRepository {
               eb.exists(
                 this.updateThumbnailBuilder(eb)
                   .select(sql`1`.as('1'))
-                  .whereRef('albums.albumThumbnailAssetId', '=', 'album_assets.assetsId'), // Has invalid assets
+                  .whereRef('album.albumThumbnailAssetId', '=', 'album_asset.assetsId'), // Has invalid assets
               ),
             ),
           ]),
@@ -373,12 +363,12 @@ export class AlbumRepository {
     return Number(result[0].numUpdatedRows);
   }
 
-  private updateThumbnailBuilder(eb: ExpressionBuilder<DB, 'albums'>) {
+  private updateThumbnailBuilder(eb: ExpressionBuilder<DB, 'album'>) {
     return eb
-      .selectFrom('albums_assets_assets as album_assets')
-      .innerJoin('assets', (join) =>
-        join.onRef('album_assets.assetsId', '=', 'assets.id').on('assets.deletedAt', 'is', null),
+      .selectFrom('album_asset')
+      .innerJoin('asset', (join) =>
+        join.onRef('album_asset.assetsId', '=', 'asset.id').on('asset.deletedAt', 'is', null),
       )
-      .whereRef('album_assets.albumsId', '=', 'albums.id');
+      .whereRef('album_asset.albumsId', '=', 'album.id');
   }
 }
diff --git a/server/src/repositories/api-key.repository.ts b/server/src/repositories/api-key.repository.ts
index 5f71399a38..28307d7c83 100644
--- a/server/src/repositories/api-key.repository.ts
+++ b/server/src/repositories/api-key.repository.ts
@@ -13,45 +13,45 @@ export class ApiKeyRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
   create(dto: Insertable<ApiKeyTable>) {
-    return this.db.insertInto('api_keys').values(dto).returning(columns.apiKey).executeTakeFirstOrThrow();
+    return this.db.insertInto('api_key').values(dto).returning(columns.apiKey).executeTakeFirstOrThrow();
   }
 
   async update(userId: string, id: string, dto: Updateable<ApiKeyTable>) {
     return this.db
-      .updateTable('api_keys')
+      .updateTable('api_key')
       .set(dto)
-      .where('api_keys.userId', '=', userId)
+      .where('api_key.userId', '=', userId)
       .where('id', '=', asUuid(id))
       .returning(columns.apiKey)
       .executeTakeFirstOrThrow();
   }
 
   async delete(userId: string, id: string) {
-    await this.db.deleteFrom('api_keys').where('userId', '=', userId).where('id', '=', asUuid(id)).execute();
+    await this.db.deleteFrom('api_key').where('userId', '=', userId).where('id', '=', asUuid(id)).execute();
   }
 
   @GenerateSql({ params: [DummyValue.STRING] })
   getKey(hashedToken: string) {
     return this.db
-      .selectFrom('api_keys')
+      .selectFrom('api_key')
       .select((eb) => [
         ...columns.authApiKey,
         jsonObjectFrom(
           eb
-            .selectFrom('users')
+            .selectFrom('user')
             .select(columns.authUser)
-            .whereRef('users.id', '=', 'api_keys.userId')
-            .where('users.deletedAt', 'is', null),
+            .whereRef('user.id', '=', 'api_key.userId')
+            .where('user.deletedAt', 'is', null),
         ).as('user'),
       ])
-      .where('api_keys.key', '=', hashedToken)
+      .where('api_key.key', '=', hashedToken)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
   getById(userId: string, id: string) {
     return this.db
-      .selectFrom('api_keys')
+      .selectFrom('api_key')
       .select(columns.apiKey)
       .where('id', '=', asUuid(id))
       .where('userId', '=', userId)
@@ -61,7 +61,7 @@ export class ApiKeyRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   getByUserId(userId: string) {
     return this.db
-      .selectFrom('api_keys')
+      .selectFrom('api_key')
       .select(columns.apiKey)
       .where('userId', '=', userId)
       .orderBy('createdAt', 'desc')
diff --git a/server/src/repositories/asset-job.repository.ts b/server/src/repositories/asset-job.repository.ts
index 4ae52556b4..c784ae276f 100644
--- a/server/src/repositories/asset-job.repository.ts
+++ b/server/src/repositories/asset-job.repository.ts
@@ -26,9 +26,9 @@ export class AssetJobRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   getForSearchDuplicatesJob(id: string) {
     return this.db
-      .selectFrom('assets')
-      .where('assets.id', '=', asUuid(id))
-      .leftJoin('smart_search', 'assets.id', 'smart_search.assetId')
+      .selectFrom('asset')
+      .where('asset.id', '=', asUuid(id))
+      .leftJoin('smart_search', 'asset.id', 'smart_search.assetId')
       .select(['id', 'type', 'ownerId', 'duplicateId', 'stackId', 'visibility', 'smart_search.embedding'])
       .limit(1)
       .executeTakeFirst();
@@ -37,18 +37,18 @@ export class AssetJobRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   getForSidecarWriteJob(id: string) {
     return this.db
-      .selectFrom('assets')
-      .where('assets.id', '=', asUuid(id))
+      .selectFrom('asset')
+      .where('asset.id', '=', asUuid(id))
       .select((eb) => [
         'id',
         'sidecarPath',
         'originalPath',
         jsonArrayFrom(
           eb
-            .selectFrom('tags')
-            .select(['tags.value'])
-            .innerJoin('tag_asset', 'tags.id', 'tag_asset.tagsId')
-            .whereRef('assets.id', '=', 'tag_asset.assetsId'),
+            .selectFrom('tag')
+            .select(['tag.value'])
+            .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagsId')
+            .whereRef('asset.id', '=', 'tag_asset.assetsId'),
         ).as('tags'),
       ])
       .limit(1)
@@ -58,20 +58,20 @@ export class AssetJobRepository {
   @GenerateSql({ params: [false], stream: true })
   streamForThumbnailJob(force: boolean) {
     return this.db
-      .selectFrom('assets')
-      .select(['assets.id', 'assets.thumbhash'])
+      .selectFrom('asset')
+      .select(['asset.id', 'asset.thumbhash'])
       .select(withFiles)
-      .where('assets.deletedAt', 'is', null)
-      .where('assets.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.deletedAt', 'is', null)
+      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
       .$if(!force, (qb) =>
         qb
           // If there aren't any entries, metadata extraction hasn't run yet which is required for thumbnails
-          .innerJoin('asset_job_status', 'asset_job_status.assetId', 'assets.id')
+          .innerJoin('asset_job_status', 'asset_job_status.assetId', 'asset.id')
           .where((eb) =>
             eb.or([
               eb('asset_job_status.previewAt', 'is', null),
               eb('asset_job_status.thumbnailAt', 'is', null),
-              eb('assets.thumbhash', 'is', null),
+              eb('asset.thumbhash', 'is', null),
             ]),
           ),
       )
@@ -81,72 +81,72 @@ export class AssetJobRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   getForMigrationJob(id: string) {
     return this.db
-      .selectFrom('assets')
-      .select(['assets.id', 'assets.ownerId', 'assets.encodedVideoPath'])
+      .selectFrom('asset')
+      .select(['asset.id', 'asset.ownerId', 'asset.encodedVideoPath'])
       .select(withFiles)
-      .where('assets.id', '=', id)
+      .where('asset.id', '=', id)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getForGenerateThumbnailJob(id: string) {
     return this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select([
-        'assets.id',
-        'assets.visibility',
-        'assets.originalFileName',
-        'assets.originalPath',
-        'assets.ownerId',
-        'assets.thumbhash',
-        'assets.type',
+        'asset.id',
+        'asset.visibility',
+        'asset.originalFileName',
+        'asset.originalPath',
+        'asset.ownerId',
+        'asset.thumbhash',
+        'asset.type',
       ])
       .select(withFiles)
       .$call(withExifInner)
-      .where('assets.id', '=', id)
+      .where('asset.id', '=', id)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getForMetadataExtraction(id: string) {
     return this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select(columns.asset)
       .select(withFaces)
-      .where('assets.id', '=', id)
+      .where('asset.id', '=', id)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [DummyValue.UUID, AssetFileType.THUMBNAIL] })
   getAlbumThumbnailFiles(id: string, fileType?: AssetFileType) {
     return this.db
-      .selectFrom('asset_files')
+      .selectFrom('asset_file')
       .select(columns.assetFiles)
-      .where('asset_files.assetId', '=', id)
-      .$if(!!fileType, (qb) => qb.where('asset_files.type', '=', fileType!))
+      .where('asset_file.assetId', '=', id)
+      .$if(!!fileType, (qb) => qb.where('asset_file.type', '=', fileType!))
       .execute();
   }
 
   private assetsWithPreviews() {
     return this.db
-      .selectFrom('assets')
-      .where('assets.visibility', '!=', AssetVisibility.HIDDEN)
-      .where('assets.deletedAt', 'is', null)
-      .innerJoin('asset_job_status as job_status', 'assetId', 'assets.id')
+      .selectFrom('asset')
+      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.deletedAt', 'is', null)
+      .innerJoin('asset_job_status as job_status', 'assetId', 'asset.id')
       .where('job_status.previewAt', 'is not', null);
   }
 
   @GenerateSql({ params: [], stream: true })
   streamForSearchDuplicates(force?: boolean) {
     return this.db
-      .selectFrom('assets')
-      .select(['assets.id'])
-      .where('assets.deletedAt', 'is', null)
-      .innerJoin('smart_search', 'assets.id', 'smart_search.assetId')
+      .selectFrom('asset')
+      .select(['asset.id'])
+      .where('asset.deletedAt', 'is', null)
+      .innerJoin('smart_search', 'asset.id', 'smart_search.assetId')
       .$call(withDefaultVisibility)
       .$if(!force, (qb) =>
         qb
-          .innerJoin('asset_job_status as job_status', 'job_status.assetId', 'assets.id')
+          .innerJoin('asset_job_status as job_status', 'job_status.assetId', 'asset.id')
           .where('job_status.duplicatesDetectedAt', 'is', null),
       )
       .stream();
@@ -155,11 +155,9 @@ export class AssetJobRepository {
   @GenerateSql({ params: [], stream: true })
   streamForEncodeClip(force?: boolean) {
     return this.assetsWithPreviews()
-      .select(['assets.id'])
+      .select(['asset.id'])
       .$if(!force, (qb) =>
-        qb.where((eb) =>
-          eb.not((eb) => eb.exists(eb.selectFrom('smart_search').whereRef('assetId', '=', 'assets.id'))),
-        ),
+        qb.where((eb) => eb.not((eb) => eb.exists(eb.selectFrom('smart_search').whereRef('assetId', '=', 'asset.id')))),
       )
       .stream();
   }
@@ -167,142 +165,142 @@ export class AssetJobRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   getForClipEncoding(id: string) {
     return this.db
-      .selectFrom('assets')
-      .select(['assets.id', 'assets.visibility'])
+      .selectFrom('asset')
+      .select(['asset.id', 'asset.visibility'])
       .select((eb) => withFiles(eb, AssetFileType.PREVIEW))
-      .where('assets.id', '=', id)
+      .where('asset.id', '=', id)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getForDetectFacesJob(id: string) {
     return this.db
-      .selectFrom('assets')
-      .select(['assets.id', 'assets.visibility'])
+      .selectFrom('asset')
+      .select(['asset.id', 'asset.visibility'])
       .$call(withExifInner)
       .select((eb) => withFaces(eb, true))
       .select((eb) => withFiles(eb, AssetFileType.PREVIEW))
-      .where('assets.id', '=', id)
+      .where('asset.id', '=', id)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [[DummyValue.UUID]] })
   getForSyncAssets(ids: string[]) {
     return this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select([
-        'assets.id',
-        'assets.isOffline',
-        'assets.libraryId',
-        'assets.originalPath',
-        'assets.status',
-        'assets.fileModifiedAt',
+        'asset.id',
+        'asset.isOffline',
+        'asset.libraryId',
+        'asset.originalPath',
+        'asset.status',
+        'asset.fileModifiedAt',
       ])
-      .where('assets.id', '=', anyUuid(ids))
+      .where('asset.id', '=', anyUuid(ids))
       .execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getForAssetDeletion(id: string) {
     return this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select([
-        'assets.id',
-        'assets.visibility',
-        'assets.libraryId',
-        'assets.ownerId',
-        'assets.livePhotoVideoId',
-        'assets.sidecarPath',
-        'assets.encodedVideoPath',
-        'assets.originalPath',
+        'asset.id',
+        'asset.visibility',
+        'asset.libraryId',
+        'asset.ownerId',
+        'asset.livePhotoVideoId',
+        'asset.sidecarPath',
+        'asset.encodedVideoPath',
+        'asset.originalPath',
       ])
       .$call(withExif)
       .select(withFacesAndPeople)
       .select(withFiles)
-      .leftJoin('asset_stack', 'asset_stack.id', 'assets.stackId')
+      .leftJoin('stack', 'stack.id', 'asset.stackId')
       .leftJoinLateral(
         (eb) =>
           eb
-            .selectFrom('assets as stacked')
-            .select(['asset_stack.id', 'asset_stack.primaryAssetId'])
+            .selectFrom('asset as stacked')
+            .select(['stack.id', 'stack.primaryAssetId'])
             .select((eb) => eb.fn<Asset[]>('array_agg', [eb.table('stacked')]).as('assets'))
             .where('stacked.deletedAt', 'is not', null)
             .where('stacked.visibility', '=', AssetVisibility.TIMELINE)
-            .whereRef('stacked.stackId', '=', 'asset_stack.id')
-            .groupBy('asset_stack.id')
+            .whereRef('stacked.stackId', '=', 'stack.id')
+            .groupBy('stack.id')
             .as('stacked_assets'),
-        (join) => join.on('asset_stack.id', 'is not', null),
+        (join) => join.on('stack.id', 'is not', null),
       )
       .select((eb) => toJson(eb, 'stacked_assets').as('stack'))
-      .where('assets.id', '=', id)
+      .where('asset.id', '=', id)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [], stream: true })
   streamForVideoConversion(force?: boolean) {
     return this.db
-      .selectFrom('assets')
-      .select(['assets.id'])
-      .where('assets.type', '=', AssetType.VIDEO)
+      .selectFrom('asset')
+      .select(['asset.id'])
+      .where('asset.type', '=', AssetType.VIDEO)
       .$if(!force, (qb) =>
         qb
-          .where((eb) => eb.or([eb('assets.encodedVideoPath', 'is', null), eb('assets.encodedVideoPath', '=', '')]))
-          .where('assets.visibility', '!=', AssetVisibility.HIDDEN),
+          .where((eb) => eb.or([eb('asset.encodedVideoPath', 'is', null), eb('asset.encodedVideoPath', '=', '')]))
+          .where('asset.visibility', '!=', AssetVisibility.HIDDEN),
       )
-      .where('assets.deletedAt', 'is', null)
+      .where('asset.deletedAt', 'is', null)
       .stream();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getForVideoConversion(id: string) {
     return this.db
-      .selectFrom('assets')
-      .select(['assets.id', 'assets.ownerId', 'assets.originalPath', 'assets.encodedVideoPath'])
-      .where('assets.id', '=', id)
-      .where('assets.type', '=', AssetType.VIDEO)
+      .selectFrom('asset')
+      .select(['asset.id', 'asset.ownerId', 'asset.originalPath', 'asset.encodedVideoPath'])
+      .where('asset.id', '=', id)
+      .where('asset.type', '=', AssetType.VIDEO)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [], stream: true })
   streamForMetadataExtraction(force?: boolean) {
     return this.db
-      .selectFrom('assets')
-      .select(['assets.id'])
+      .selectFrom('asset')
+      .select(['asset.id'])
       .$if(!force, (qb) =>
         qb
-          .leftJoin('asset_job_status', 'asset_job_status.assetId', 'assets.id')
+          .leftJoin('asset_job_status', 'asset_job_status.assetId', 'asset.id')
           .where((eb) =>
             eb.or([eb('asset_job_status.metadataExtractedAt', 'is', null), eb('asset_job_status.assetId', 'is', null)]),
           ),
       )
-      .where('assets.deletedAt', 'is', null)
+      .where('asset.deletedAt', 'is', null)
       .stream();
   }
 
   private storageTemplateAssetQuery() {
     return this.db
-      .selectFrom('assets')
-      .innerJoin('exif', 'assets.id', 'exif.assetId')
+      .selectFrom('asset')
+      .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
       .select([
-        'assets.id',
-        'assets.ownerId',
-        'assets.type',
-        'assets.checksum',
-        'assets.originalPath',
-        'assets.isExternal',
-        'assets.sidecarPath',
-        'assets.originalFileName',
-        'assets.livePhotoVideoId',
-        'assets.fileCreatedAt',
-        'exif.timeZone',
-        'exif.fileSizeInByte',
+        'asset.id',
+        'asset.ownerId',
+        'asset.type',
+        'asset.checksum',
+        'asset.originalPath',
+        'asset.isExternal',
+        'asset.sidecarPath',
+        'asset.originalFileName',
+        'asset.livePhotoVideoId',
+        'asset.fileCreatedAt',
+        'asset_exif.timeZone',
+        'asset_exif.fileSizeInByte',
       ])
-      .where('assets.deletedAt', 'is', null);
+      .where('asset.deletedAt', 'is', null);
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getForStorageTemplateJob(id: string): Promise<StorageAsset | undefined> {
-    return this.storageTemplateAssetQuery().where('assets.id', '=', id).executeTakeFirst() as Promise<
+    return this.storageTemplateAssetQuery().where('asset.id', '=', id).executeTakeFirst() as Promise<
       StorageAsset | undefined
     >;
   }
@@ -315,21 +313,21 @@ export class AssetJobRepository {
   @GenerateSql({ params: [DummyValue.DATE], stream: true })
   streamForDeletedJob(trashedBefore: Date) {
     return this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select(['id', 'isOffline'])
-      .where('assets.deletedAt', '<=', trashedBefore)
+      .where('asset.deletedAt', '<=', trashedBefore)
       .stream();
   }
 
   @GenerateSql({ params: [], stream: true })
   streamForSidecar(force?: boolean) {
     return this.db
-      .selectFrom('assets')
-      .select(['assets.id'])
+      .selectFrom('asset')
+      .select(['asset.id'])
       .$if(!force, (qb) =>
-        qb.where((eb) => eb.or([eb('assets.sidecarPath', '=', ''), eb('assets.sidecarPath', 'is', null)])),
+        qb.where((eb) => eb.or([eb('asset.sidecarPath', '=', ''), eb('asset.sidecarPath', 'is', null)])),
       )
-      .where('assets.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
       .stream();
   }
 
@@ -337,13 +335,13 @@ export class AssetJobRepository {
   streamForDetectFacesJob(force?: boolean) {
     return this.assetsWithPreviews()
       .$if(!force, (qb) => qb.where('job_status.facesRecognizedAt', 'is', null))
-      .select(['assets.id'])
-      .orderBy('assets.createdAt', 'desc')
+      .select(['asset.id'])
+      .orderBy('asset.createdAt', 'desc')
       .stream();
   }
 
   @GenerateSql({ params: [DummyValue.DATE], stream: true })
   streamForMigrationJob() {
-    return this.db.selectFrom('assets').select(['id']).where('assets.deletedAt', 'is', null).stream();
+    return this.db.selectFrom('asset').select(['id']).where('asset.deletedAt', 'is', null).stream();
   }
 }
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index f3e798d2b4..f00d0c170f 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -6,10 +6,10 @@ import { Stack } from 'src/database';
 import { Chunked, ChunkedArray, DummyValue, GenerateSql } from 'src/decorators';
 import { AssetFileType, AssetOrder, AssetStatus, AssetType, AssetVisibility } from 'src/enum';
 import { DB } from 'src/schema';
-import { AssetFileTable } from 'src/schema/tables/asset-files.table';
+import { AssetExifTable } from 'src/schema/tables/asset-exif.table';
+import { AssetFileTable } from 'src/schema/tables/asset-file.table';
 import { AssetJobStatusTable } from 'src/schema/tables/asset-job-status.table';
 import { AssetTable } from 'src/schema/tables/asset.table';
-import { ExifTable } from 'src/schema/tables/exif.table';
 import {
   anyUuid,
   asUuid,
@@ -114,10 +114,10 @@ interface GetByIdsRelations {
 export class AssetRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
-  async upsertExif(exif: Insertable<ExifTable>): Promise<void> {
+  async upsertExif(exif: Insertable<AssetExifTable>): Promise<void> {
     const value = { ...exif, assetId: asUuid(exif.assetId) };
     await this.db
-      .insertInto('exif')
+      .insertInto('asset_exif')
       .values(value)
       .onConflict((oc) =>
         oc.column('assetId').doUpdateSet((eb) =>
@@ -161,12 +161,12 @@ export class AssetRepository {
 
   @GenerateSql({ params: [[DummyValue.UUID], { model: DummyValue.STRING }] })
   @Chunked()
-  async updateAllExif(ids: string[], options: Updateable<ExifTable>): Promise<void> {
+  async updateAllExif(ids: string[], options: Updateable<AssetExifTable>): Promise<void> {
     if (ids.length === 0) {
       return;
     }
 
-    await this.db.updateTable('exif').set(options).where('assetId', 'in', ids).execute();
+    await this.db.updateTable('asset_exif').set(options).where('assetId', 'in', ids).execute();
   }
 
   async upsertJobStatus(...jobStatus: Insertable<AssetJobStatusTable>[]): Promise<void> {
@@ -196,11 +196,11 @@ export class AssetRepository {
   }
 
   create(asset: Insertable<AssetTable>) {
-    return this.db.insertInto('assets').values(asset).returningAll().executeTakeFirstOrThrow();
+    return this.db.insertInto('asset').values(asset).returningAll().executeTakeFirstOrThrow();
   }
 
   createAll(assets: Insertable<AssetTable>[]) {
-    return this.db.insertInto('assets').values(assets).returningAll().execute();
+    return this.db.insertInto('asset').values(assets).returningAll().execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID, { day: 1, month: 1 }] })
@@ -213,7 +213,7 @@ export class AssetRepository {
               .selectFrom((eb) =>
                 eb
                   .fn('generate_series', [
-                    sql`(select date_part('year', min(("localDateTime" at time zone 'UTC')::date))::int from assets)`,
+                    sql`(select date_part('year', min(("localDateTime" at time zone 'UTC')::date))::int from asset)`,
                     sql`date_part('year', current_date)::int - 1`,
                   ])
                   .as('year'),
@@ -224,30 +224,30 @@ export class AssetRepository {
           .innerJoinLateral(
             (qb) =>
               qb
-                .selectFrom('assets')
-                .selectAll('assets')
-                .innerJoin('asset_job_status', 'assets.id', 'asset_job_status.assetId')
+                .selectFrom('asset')
+                .selectAll('asset')
+                .innerJoin('asset_job_status', 'asset.id', 'asset_job_status.assetId')
                 .where('asset_job_status.previewAt', 'is not', null)
-                .where(sql`(assets."localDateTime" at time zone 'UTC')::date`, '=', sql`today.date`)
-                .where('assets.ownerId', '=', anyUuid(ownerIds))
-                .where('assets.visibility', '=', AssetVisibility.TIMELINE)
+                .where(sql`(asset."localDateTime" at time zone 'UTC')::date`, '=', sql`today.date`)
+                .where('asset.ownerId', '=', anyUuid(ownerIds))
+                .where('asset.visibility', '=', AssetVisibility.TIMELINE)
                 .where((eb) =>
                   eb.exists((qb) =>
                     qb
-                      .selectFrom('asset_files')
-                      .whereRef('assetId', '=', 'assets.id')
-                      .where('asset_files.type', '=', AssetFileType.PREVIEW),
+                      .selectFrom('asset_file')
+                      .whereRef('assetId', '=', 'asset.id')
+                      .where('asset_file.type', '=', AssetFileType.PREVIEW),
                   ),
                 )
-                .where('assets.deletedAt', 'is', null)
-                .orderBy(sql`(assets."localDateTime" at time zone 'UTC')::date`, 'desc')
+                .where('asset.deletedAt', 'is', null)
+                .orderBy(sql`(asset."localDateTime" at time zone 'UTC')::date`, 'desc')
                 .limit(20)
                 .as('a'),
             (join) => join.onTrue(),
           )
-          .innerJoin('exif', 'a.id', 'exif.assetId')
+          .innerJoin('asset_exif', 'a.id', 'asset_exif.assetId')
           .selectAll('a')
-          .select((eb) => eb.fn.toJson(eb.table('exif')).as('exifInfo')),
+          .select((eb) => eb.fn.toJson(eb.table('asset_exif')).as('exifInfo')),
       )
       .selectFrom('res')
       .select(sql<number>`date_part('year', ("localDateTime" at time zone 'UTC')::date)::int`.as('year'))
@@ -260,30 +260,30 @@ export class AssetRepository {
   @GenerateSql({ params: [[DummyValue.UUID]] })
   @ChunkedArray()
   getByIds(ids: string[]) {
-    return this.db.selectFrom('assets').selectAll('assets').where('assets.id', '=', anyUuid(ids)).execute();
+    return this.db.selectFrom('asset').selectAll('asset').where('asset.id', '=', anyUuid(ids)).execute();
   }
 
   @GenerateSql({ params: [[DummyValue.UUID]] })
   @ChunkedArray()
   getByIdsWithAllRelationsButStacks(ids: string[]) {
     return this.db
-      .selectFrom('assets')
-      .selectAll('assets')
+      .selectFrom('asset')
+      .selectAll('asset')
       .select(withFacesAndPeople)
       .select(withTags)
       .$call(withExif)
-      .where('assets.id', '=', anyUuid(ids))
+      .where('asset.id', '=', anyUuid(ids))
       .execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   async deleteAll(ownerId: string): Promise<void> {
-    await this.db.deleteFrom('assets').where('ownerId', '=', ownerId).execute();
+    await this.db.deleteFrom('asset').where('ownerId', '=', ownerId).execute();
   }
 
   async getByDeviceIds(ownerId: string, deviceId: string, deviceAssetIds: string[]): Promise<string[]> {
     const assets = await this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select(['deviceAssetId'])
       .where('deviceAssetId', 'in', deviceAssetIds)
       .where('deviceId', '=', deviceId)
@@ -296,8 +296,8 @@ export class AssetRepository {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.STRING] })
   getByLibraryIdAndOriginalPath(libraryId: string, originalPath: string) {
     return this.db
-      .selectFrom('assets')
-      .selectAll('assets')
+      .selectFrom('asset')
+      .selectAll('asset')
       .where('libraryId', '=', asUuid(libraryId))
       .where('originalPath', '=', originalPath)
       .limit(1)
@@ -314,7 +314,7 @@ export class AssetRepository {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.STRING] })
   async getAllByDeviceId(ownerId: string, deviceId: string): Promise<string[]> {
     const items = await this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select(['deviceAssetId'])
       .where('ownerId', '=', asUuid(ownerId))
       .where('deviceId', '=', deviceId)
@@ -328,7 +328,7 @@ export class AssetRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   async getLivePhotoCount(motionId: string): Promise<number> {
     const [{ count }] = await this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select((eb) => eb.fn.countAll<number>().as('count'))
       .where('livePhotoVideoId', '=', asUuid(motionId))
       .execute();
@@ -338,9 +338,9 @@ export class AssetRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   getById(id: string, { exifInfo, faces, files, library, owner, smartSearch, stack, tags }: GetByIdsRelations = {}) {
     return this.db
-      .selectFrom('assets')
-      .selectAll('assets')
-      .where('assets.id', '=', asUuid(id))
+      .selectFrom('asset')
+      .selectAll('asset')
+      .where('asset.id', '=', asUuid(id))
       .$if(!!exifInfo, withExif)
       .$if(!!faces, (qb) => qb.select(faces?.person ? withFacesAndPeople : withFaces).$narrowType<{ faces: NotNull }>())
       .$if(!!library, (qb) => qb.select(withLibrary))
@@ -348,25 +348,25 @@ export class AssetRepository {
       .$if(!!smartSearch, withSmartSearch)
       .$if(!!stack, (qb) =>
         qb
-          .leftJoin('asset_stack', 'asset_stack.id', 'assets.stackId')
+          .leftJoin('stack', 'stack.id', 'asset.stackId')
           .$if(!stack!.assets, (qb) =>
-            qb.select((eb) => eb.fn.toJson(eb.table('asset_stack')).$castTo<Stack | null>().as('stack')),
+            qb.select((eb) => eb.fn.toJson(eb.table('stack')).$castTo<Stack | null>().as('stack')),
           )
           .$if(!!stack!.assets, (qb) =>
             qb
               .leftJoinLateral(
                 (eb) =>
                   eb
-                    .selectFrom('assets as stacked')
-                    .selectAll('asset_stack')
+                    .selectFrom('asset as stacked')
+                    .selectAll('stack')
                     .select((eb) => eb.fn('array_agg', [eb.table('stacked')]).as('assets'))
-                    .whereRef('stacked.stackId', '=', 'asset_stack.id')
-                    .whereRef('stacked.id', '!=', 'asset_stack.primaryAssetId')
+                    .whereRef('stacked.stackId', '=', 'stack.id')
+                    .whereRef('stacked.id', '!=', 'stack.primaryAssetId')
                     .where('stacked.deletedAt', 'is', null)
                     .where('stacked.visibility', '=', AssetVisibility.TIMELINE)
-                    .groupBy('asset_stack.id')
+                    .groupBy('stack.id')
                     .as('stacked_assets'),
-                (join) => join.on('asset_stack.id', 'is not', null),
+                (join) => join.on('stack.id', 'is not', null),
               )
               .select((eb) => eb.fn.toJson(eb.table('stacked_assets')).$castTo<Stack | null>().as('stack')),
           ),
@@ -383,11 +383,11 @@ export class AssetRepository {
     if (ids.length === 0) {
       return;
     }
-    await this.db.updateTable('assets').set(options).where('id', '=', anyUuid(ids)).execute();
+    await this.db.updateTable('asset').set(options).where('id', '=', anyUuid(ids)).execute();
   }
 
   async updateByLibraryId(libraryId: string, options: Updateable<AssetTable>): Promise<void> {
-    await this.db.updateTable('assets').set(options).where('libraryId', '=', asUuid(libraryId)).execute();
+    await this.db.updateTable('asset').set(options).where('libraryId', '=', asUuid(libraryId)).execute();
   }
 
   async update(asset: Updateable<AssetTable> & { id: string }) {
@@ -395,9 +395,9 @@ export class AssetRepository {
     delete value.id;
     if (!isEmpty(value)) {
       return this.db
-        .with('assets', (qb) => qb.updateTable('assets').set(asset).where('id', '=', asUuid(asset.id)).returningAll())
-        .selectFrom('assets')
-        .selectAll('assets')
+        .with('asset', (qb) => qb.updateTable('asset').set(asset).where('id', '=', asUuid(asset.id)).returningAll())
+        .selectFrom('asset')
+        .selectAll('asset')
         .$call(withExif)
         .$call((qb) => qb.select(withFacesAndPeople))
         .executeTakeFirst();
@@ -407,14 +407,14 @@ export class AssetRepository {
   }
 
   async remove(asset: { id: string }): Promise<void> {
-    await this.db.deleteFrom('assets').where('id', '=', asUuid(asset.id)).execute();
+    await this.db.deleteFrom('asset').where('id', '=', asUuid(asset.id)).execute();
   }
 
   @GenerateSql({ params: [{ ownerId: DummyValue.UUID, libraryId: DummyValue.UUID, checksum: DummyValue.BUFFER }] })
   getByChecksum({ ownerId, libraryId, checksum }: AssetGetByChecksumOptions) {
     return this.db
-      .selectFrom('assets')
-      .selectAll('assets')
+      .selectFrom('asset')
+      .selectAll('asset')
       .where('ownerId', '=', asUuid(ownerId))
       .where('checksum', '=', checksum)
       .$call((qb) => (libraryId ? qb.where('libraryId', '=', asUuid(libraryId)) : qb.where('libraryId', 'is', null)))
@@ -425,7 +425,7 @@ export class AssetRepository {
   @GenerateSql({ params: [DummyValue.UUID, [DummyValue.BUFFER]] })
   getByChecksums(userId: string, checksums: Buffer[]) {
     return this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select(['id', 'checksum', 'deletedAt'])
       .where('ownerId', '=', asUuid(userId))
       .where('checksum', 'in', checksums)
@@ -435,7 +435,7 @@ export class AssetRepository {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.BUFFER] })
   async getUploadAssetIdByChecksum(ownerId: string, checksum: Buffer): Promise<string | undefined> {
     const asset = await this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select('id')
       .where('ownerId', '=', asUuid(ownerId))
       .where('checksum', '=', checksum)
@@ -449,37 +449,37 @@ export class AssetRepository {
   findLivePhotoMatch(options: LivePhotoSearchOptions) {
     const { ownerId, otherAssetId, livePhotoCID, type } = options;
     return this.db
-      .selectFrom('assets')
-      .select(['assets.id', 'assets.ownerId'])
-      .innerJoin('exif', 'assets.id', 'exif.assetId')
+      .selectFrom('asset')
+      .select(['asset.id', 'asset.ownerId'])
+      .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
       .where('id', '!=', asUuid(otherAssetId))
       .where('ownerId', '=', asUuid(ownerId))
       .where('type', '=', type)
-      .where('exif.livePhotoCID', '=', livePhotoCID)
+      .where('asset_exif.livePhotoCID', '=', livePhotoCID)
       .limit(1)
       .executeTakeFirst();
   }
 
   getStatistics(ownerId: string, { visibility, isFavorite, isTrashed }: AssetStatsOptions): Promise<AssetStats> {
     return this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.AUDIO).as(AssetType.AUDIO))
       .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.IMAGE).as(AssetType.IMAGE))
       .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.VIDEO).as(AssetType.VIDEO))
       .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.OTHER).as(AssetType.OTHER))
       .where('ownerId', '=', asUuid(ownerId))
       .$if(visibility === undefined, withDefaultVisibility)
-      .$if(!!visibility, (qb) => qb.where('assets.visibility', '=', visibility!))
+      .$if(!!visibility, (qb) => qb.where('asset.visibility', '=', visibility!))
       .$if(isFavorite !== undefined, (qb) => qb.where('isFavorite', '=', isFavorite!))
-      .$if(!!isTrashed, (qb) => qb.where('assets.status', '!=', AssetStatus.DELETED))
+      .$if(!!isTrashed, (qb) => qb.where('asset.status', '!=', AssetStatus.DELETED))
       .where('deletedAt', isTrashed ? 'is not' : 'is', null)
       .executeTakeFirstOrThrow();
   }
 
   getRandom(userIds: string[], take: number) {
     return this.db
-      .selectFrom('assets')
-      .selectAll('assets')
+      .selectFrom('asset')
+      .selectAll('asset')
       .$call(withExif)
       .$call(withDefaultVisibility)
       .where('ownerId', '=', anyUuid(userIds))
@@ -492,38 +492,36 @@ export class AssetRepository {
   @GenerateSql({ params: [{}] })
   async getTimeBuckets(options: TimeBucketOptions): Promise<TimeBucketItem[]> {
     return this.db
-      .with('assets', (qb) =>
+      .with('asset', (qb) =>
         qb
-          .selectFrom('assets')
+          .selectFrom('asset')
           .select(truncatedDate<Date>().as('timeBucket'))
-          .$if(!!options.isTrashed, (qb) => qb.where('assets.status', '!=', AssetStatus.DELETED))
-          .where('assets.deletedAt', options.isTrashed ? 'is not' : 'is', null)
+          .$if(!!options.isTrashed, (qb) => qb.where('asset.status', '!=', AssetStatus.DELETED))
+          .where('asset.deletedAt', options.isTrashed ? 'is not' : 'is', null)
           .$if(options.visibility === undefined, withDefaultVisibility)
-          .$if(!!options.visibility, (qb) => qb.where('assets.visibility', '=', options.visibility!))
+          .$if(!!options.visibility, (qb) => qb.where('asset.visibility', '=', options.visibility!))
           .$if(!!options.albumId, (qb) =>
             qb
-              .innerJoin('albums_assets_assets', 'assets.id', 'albums_assets_assets.assetsId')
-              .where('albums_assets_assets.albumsId', '=', asUuid(options.albumId!)),
+              .innerJoin('album_asset', 'asset.id', 'album_asset.assetsId')
+              .where('album_asset.albumsId', '=', asUuid(options.albumId!)),
           )
           .$if(!!options.personId, (qb) => hasPeople(qb, [options.personId!]))
           .$if(!!options.withStacked, (qb) =>
             qb
-              .leftJoin('asset_stack', (join) =>
-                join
-                  .onRef('asset_stack.id', '=', 'assets.stackId')
-                  .onRef('asset_stack.primaryAssetId', '=', 'assets.id'),
+              .leftJoin('stack', (join) =>
+                join.onRef('stack.id', '=', 'asset.stackId').onRef('stack.primaryAssetId', '=', 'asset.id'),
               )
-              .where((eb) => eb.or([eb('assets.stackId', 'is', null), eb(eb.table('asset_stack'), 'is not', null)])),
+              .where((eb) => eb.or([eb('asset.stackId', 'is', null), eb(eb.table('stack'), 'is not', null)])),
           )
-          .$if(!!options.userIds, (qb) => qb.where('assets.ownerId', '=', anyUuid(options.userIds!)))
-          .$if(options.isFavorite !== undefined, (qb) => qb.where('assets.isFavorite', '=', options.isFavorite!))
-          .$if(!!options.assetType, (qb) => qb.where('assets.type', '=', options.assetType!))
+          .$if(!!options.userIds, (qb) => qb.where('asset.ownerId', '=', anyUuid(options.userIds!)))
+          .$if(options.isFavorite !== undefined, (qb) => qb.where('asset.isFavorite', '=', options.isFavorite!))
+          .$if(!!options.assetType, (qb) => qb.where('asset.type', '=', options.assetType!))
           .$if(options.isDuplicate !== undefined, (qb) =>
-            qb.where('assets.duplicateId', options.isDuplicate ? 'is not' : 'is', null),
+            qb.where('asset.duplicateId', options.isDuplicate ? 'is not' : 'is', null),
           )
           .$if(!!options.tagId, (qb) => withTagId(qb, options.tagId!)),
       )
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select(sql<string>`("timeBucket" AT TIME ZONE 'UTC')::date::text`.as('timeBucket'))
       .select((eb) => eb.fn.countAll<number>().as('count'))
       .groupBy('timeBucket')
@@ -538,75 +536,75 @@ export class AssetRepository {
     const query = this.db
       .with('cte', (qb) =>
         qb
-          .selectFrom('assets')
-          .innerJoin('exif', 'assets.id', 'exif.assetId')
+          .selectFrom('asset')
+          .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
           .select((eb) => [
-            'assets.duration',
-            'assets.id',
-            'assets.visibility',
-            'assets.isFavorite',
-            sql`assets.type = 'IMAGE'`.as('isImage'),
-            sql`assets."deletedAt" is not null`.as('isTrashed'),
-            'assets.livePhotoVideoId',
-            sql`extract(epoch from (assets."localDateTime" - assets."fileCreatedAt" at time zone 'UTC'))::real / 3600`.as(
+            'asset.duration',
+            'asset.id',
+            'asset.visibility',
+            'asset.isFavorite',
+            sql`asset.type = 'IMAGE'`.as('isImage'),
+            sql`asset."deletedAt" is not null`.as('isTrashed'),
+            'asset.livePhotoVideoId',
+            sql`extract(epoch from (asset."localDateTime" - asset."fileCreatedAt" at time zone 'UTC'))::real / 3600`.as(
               'localOffsetHours',
             ),
-            'assets.ownerId',
-            'assets.status',
-            sql`assets."fileCreatedAt" at time zone 'utc'`.as('fileCreatedAt'),
-            eb.fn('encode', ['assets.thumbhash', sql.lit('base64')]).as('thumbhash'),
-            'exif.city',
-            'exif.country',
-            'exif.projectionType',
+            'asset.ownerId',
+            'asset.status',
+            sql`asset."fileCreatedAt" at time zone 'utc'`.as('fileCreatedAt'),
+            eb.fn('encode', ['asset.thumbhash', sql.lit('base64')]).as('thumbhash'),
+            'asset_exif.city',
+            'asset_exif.country',
+            'asset_exif.projectionType',
             eb.fn
               .coalesce(
                 eb
                   .case()
-                  .when(sql`exif."exifImageHeight" = 0 or exif."exifImageWidth" = 0`)
+                  .when(sql`asset_exif."exifImageHeight" = 0 or asset_exif."exifImageWidth" = 0`)
                   .then(eb.lit(1))
-                  .when('exif.orientation', 'in', sql<string>`('5', '6', '7', '8', '-90', '90')`)
-                  .then(sql`round(exif."exifImageHeight"::numeric / exif."exifImageWidth"::numeric, 3)`)
-                  .else(sql`round(exif."exifImageWidth"::numeric / exif."exifImageHeight"::numeric, 3)`)
+                  .when('asset_exif.orientation', 'in', sql<string>`('5', '6', '7', '8', '-90', '90')`)
+                  .then(sql`round(asset_exif."exifImageHeight"::numeric / asset_exif."exifImageWidth"::numeric, 3)`)
+                  .else(sql`round(asset_exif."exifImageWidth"::numeric / asset_exif."exifImageHeight"::numeric, 3)`)
                   .end(),
                 eb.lit(1),
               )
               .as('ratio'),
           ])
-          .where('assets.deletedAt', options.isTrashed ? 'is not' : 'is', null)
+          .where('asset.deletedAt', options.isTrashed ? 'is not' : 'is', null)
           .$if(options.visibility == undefined, withDefaultVisibility)
-          .$if(!!options.visibility, (qb) => qb.where('assets.visibility', '=', options.visibility!))
+          .$if(!!options.visibility, (qb) => qb.where('asset.visibility', '=', options.visibility!))
           .where(truncatedDate(), '=', timeBucket.replace(/^[+-]/, ''))
           .$if(!!options.albumId, (qb) =>
             qb.where((eb) =>
               eb.exists(
                 eb
-                  .selectFrom('albums_assets_assets')
-                  .whereRef('albums_assets_assets.assetsId', '=', 'assets.id')
-                  .where('albums_assets_assets.albumsId', '=', asUuid(options.albumId!)),
+                  .selectFrom('album_asset')
+                  .whereRef('album_asset.assetsId', '=', 'asset.id')
+                  .where('album_asset.albumsId', '=', asUuid(options.albumId!)),
               ),
             ),
           )
           .$if(!!options.personId, (qb) => hasPeople(qb, [options.personId!]))
-          .$if(!!options.userIds, (qb) => qb.where('assets.ownerId', '=', anyUuid(options.userIds!)))
-          .$if(options.isFavorite !== undefined, (qb) => qb.where('assets.isFavorite', '=', options.isFavorite!))
+          .$if(!!options.userIds, (qb) => qb.where('asset.ownerId', '=', anyUuid(options.userIds!)))
+          .$if(options.isFavorite !== undefined, (qb) => qb.where('asset.isFavorite', '=', options.isFavorite!))
           .$if(!!options.withStacked, (qb) =>
             qb
               .where((eb) =>
                 eb.not(
                   eb.exists(
                     eb
-                      .selectFrom('asset_stack')
-                      .whereRef('asset_stack.id', '=', 'assets.stackId')
-                      .whereRef('asset_stack.primaryAssetId', '!=', 'assets.id'),
+                      .selectFrom('stack')
+                      .whereRef('stack.id', '=', 'asset.stackId')
+                      .whereRef('stack.primaryAssetId', '!=', 'asset.id'),
                   ),
                 ),
               )
               .leftJoinLateral(
                 (eb) =>
                   eb
-                    .selectFrom('assets as stacked')
+                    .selectFrom('asset as stacked')
                     .select(sql`array[stacked."stackId"::text, count('stacked')::text]`.as('stack'))
-                    .whereRef('stacked.stackId', '=', 'assets.stackId')
+                    .whereRef('stacked.stackId', '=', 'asset.stackId')
                     .where('stacked.deletedAt', 'is', null)
                     .where('stacked.visibility', '=', AssetVisibility.TIMELINE)
                     .groupBy('stacked.stackId')
@@ -615,13 +613,13 @@ export class AssetRepository {
               )
               .select('stack'),
           )
-          .$if(!!options.assetType, (qb) => qb.where('assets.type', '=', options.assetType!))
+          .$if(!!options.assetType, (qb) => qb.where('asset.type', '=', options.assetType!))
           .$if(options.isDuplicate !== undefined, (qb) =>
-            qb.where('assets.duplicateId', options.isDuplicate ? 'is not' : 'is', null),
+            qb.where('asset.duplicateId', options.isDuplicate ? 'is not' : 'is', null),
           )
-          .$if(!!options.isTrashed, (qb) => qb.where('assets.status', '!=', AssetStatus.DELETED))
+          .$if(!!options.isTrashed, (qb) => qb.where('asset.status', '!=', AssetStatus.DELETED))
           .$if(!!options.tagId, (qb) => withTagId(qb, options.tagId!))
-          .orderBy('assets.fileCreatedAt', options.order ?? 'desc'),
+          .orderBy('asset.fileCreatedAt', options.order ?? 'desc'),
       )
       .with('agg', (qb) =>
         qb
@@ -660,17 +658,17 @@ export class AssetRepository {
     const items = await this.db
       .with('cities', (qb) =>
         qb
-          .selectFrom('exif')
+          .selectFrom('asset_exif')
           .select('city')
           .where('city', 'is not', null)
           .groupBy('city')
           .having((eb) => eb.fn('count', [eb.ref('assetId')]), '>=', minAssetsPerField),
       )
-      .selectFrom('assets')
-      .innerJoin('exif', 'assets.id', 'exif.assetId')
-      .innerJoin('cities', 'exif.city', 'cities.city')
-      .distinctOn('exif.city')
-      .select(['assetId as data', 'exif.city as value'])
+      .selectFrom('asset')
+      .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+      .innerJoin('cities', 'asset_exif.city', 'cities.city')
+      .distinctOn('asset_exif.city')
+      .select(['assetId as data', 'asset_exif.city as value'])
       .$narrowType<{ value: NotNull }>()
       .where('ownerId', '=', asUuid(ownerId))
       .where('visibility', '=', AssetVisibility.TIMELINE)
@@ -695,27 +693,27 @@ export class AssetRepository {
   getAllForUserFullSync(options: AssetFullSyncOptions) {
     const { ownerId, lastId, updatedUntil, limit } = options;
     return this.db
-      .selectFrom('assets')
-      .selectAll('assets')
+      .selectFrom('asset')
+      .selectAll('asset')
       .$call(withExif)
-      .leftJoin('asset_stack', 'asset_stack.id', 'assets.stackId')
+      .leftJoin('stack', 'stack.id', 'asset.stackId')
       .leftJoinLateral(
         (eb) =>
           eb
-            .selectFrom('assets as stacked')
-            .selectAll('asset_stack')
+            .selectFrom('asset as stacked')
+            .selectAll('stack')
             .select((eb) => eb.fn.count(eb.table('stacked')).as('assetCount'))
-            .whereRef('stacked.stackId', '=', 'asset_stack.id')
-            .groupBy('asset_stack.id')
+            .whereRef('stacked.stackId', '=', 'stack.id')
+            .groupBy('stack.id')
             .as('stacked_assets'),
-        (join) => join.on('asset_stack.id', 'is not', null),
+        (join) => join.on('stack.id', 'is not', null),
       )
       .select((eb) => eb.fn.toJson(eb.table('stacked_assets')).$castTo<Stack | null>().as('stack'))
-      .where('assets.ownerId', '=', asUuid(ownerId))
-      .where('assets.visibility', '!=', AssetVisibility.HIDDEN)
-      .where('assets.updatedAt', '<=', updatedUntil)
-      .$if(!!lastId, (qb) => qb.where('assets.id', '>', lastId!))
-      .orderBy('assets.id')
+      .where('asset.ownerId', '=', asUuid(ownerId))
+      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.updatedAt', '<=', updatedUntil)
+      .$if(!!lastId, (qb) => qb.where('asset.id', '>', lastId!))
+      .orderBy('asset.id')
       .limit(limit)
       .execute();
   }
@@ -723,25 +721,25 @@ export class AssetRepository {
   @GenerateSql({ params: [{ userIds: [DummyValue.UUID], updatedAfter: DummyValue.DATE, limit: 100 }] })
   async getChangedDeltaSync(options: AssetDeltaSyncOptions) {
     return this.db
-      .selectFrom('assets')
-      .selectAll('assets')
+      .selectFrom('asset')
+      .selectAll('asset')
       .$call(withExif)
-      .leftJoin('asset_stack', 'asset_stack.id', 'assets.stackId')
+      .leftJoin('stack', 'stack.id', 'asset.stackId')
       .leftJoinLateral(
         (eb) =>
           eb
-            .selectFrom('assets as stacked')
-            .selectAll('asset_stack')
+            .selectFrom('asset as stacked')
+            .selectAll('stack')
             .select((eb) => eb.fn.count(eb.table('stacked')).as('assetCount'))
-            .whereRef('stacked.stackId', '=', 'asset_stack.id')
-            .groupBy('asset_stack.id')
+            .whereRef('stacked.stackId', '=', 'stack.id')
+            .groupBy('stack.id')
             .as('stacked_assets'),
-        (join) => join.on('asset_stack.id', 'is not', null),
+        (join) => join.on('stack.id', 'is not', null),
       )
       .select((eb) => eb.fn.toJson(eb.table('stacked_assets').$castTo<Stack | null>()).as('stack'))
-      .where('assets.ownerId', '=', anyUuid(options.userIds))
-      .where('assets.visibility', '!=', AssetVisibility.HIDDEN)
-      .where('assets.updatedAt', '>', options.updatedAfter)
+      .where('asset.ownerId', '=', anyUuid(options.userIds))
+      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.updatedAt', '>', options.updatedAfter)
       .limit(options.limit)
       .execute();
   }
@@ -749,7 +747,7 @@ export class AssetRepository {
   async upsertFile(file: Pick<Insertable<AssetFileTable>, 'assetId' | 'path' | 'type'>): Promise<void> {
     const value = { ...file, assetId: asUuid(file.assetId) };
     await this.db
-      .insertInto('asset_files')
+      .insertInto('asset_file')
       .values(value)
       .onConflict((oc) =>
         oc.columns(['assetId', 'type']).doUpdateSet((eb) => ({
@@ -766,7 +764,7 @@ export class AssetRepository {
 
     const values = files.map((row) => ({ ...row, assetId: asUuid(row.assetId) }));
     await this.db
-      .insertInto('asset_files')
+      .insertInto('asset_file')
       .values(values)
       .onConflict((oc) =>
         oc.columns(['assetId', 'type']).doUpdateSet((eb) => ({
@@ -782,7 +780,7 @@ export class AssetRepository {
     }
 
     await this.db
-      .deleteFrom('asset_files')
+      .deleteFrom('asset_file')
       .where('id', '=', anyUuid(files.map((file) => file.id)))
       .execute();
   }
@@ -797,7 +795,7 @@ export class AssetRepository {
     const exclusions = exclusionPatterns.map((pattern) => globToSqlPattern(pattern));
 
     return this.db
-      .updateTable('assets')
+      .updateTable('asset')
       .set({
         isOffline: true,
         deletedAt: new Date(),
@@ -823,9 +821,9 @@ export class AssetRepository {
         eb.not(
           eb.exists(
             this.db
-              .selectFrom('assets')
+              .selectFrom('asset')
               .select('originalPath')
-              .whereRef('assets.originalPath', '=', eb.ref('path'))
+              .whereRef('asset.originalPath', '=', eb.ref('path'))
               .where('libraryId', '=', asUuid(libraryId))
               .where('isExternal', '=', true),
           ),
@@ -838,7 +836,7 @@ export class AssetRepository {
 
   async getLibraryAssetCount(libraryId: string): Promise<number> {
     const { count } = await this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select((eb) => eb.fn.countAll<number>().as('count'))
       .where('libraryId', '=', asUuid(libraryId))
       .executeTakeFirstOrThrow();
diff --git a/server/src/repositories/download.repository.ts b/server/src/repositories/download.repository.ts
index aef00f1ed1..5645ca1217 100644
--- a/server/src/repositories/download.repository.ts
+++ b/server/src/repositories/download.repository.ts
@@ -7,34 +7,34 @@ import { anyUuid } from 'src/utils/database';
 
 const builder = (db: Kysely<DB>) =>
   db
-    .selectFrom('assets')
-    .innerJoin('exif', 'assetId', 'id')
-    .select(['assets.id', 'assets.livePhotoVideoId', 'exif.fileSizeInByte as size'])
-    .where('assets.deletedAt', 'is', null);
+    .selectFrom('asset')
+    .innerJoin('asset_exif', 'assetId', 'id')
+    .select(['asset.id', 'asset.livePhotoVideoId', 'asset_exif.fileSizeInByte as size'])
+    .where('asset.deletedAt', 'is', null);
 
 @Injectable()
 export class DownloadRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
   downloadAssetIds(ids: string[]) {
-    return builder(this.db).where('assets.id', '=', anyUuid(ids)).stream();
+    return builder(this.db).where('asset.id', '=', anyUuid(ids)).stream();
   }
 
   downloadMotionAssetIds(ids: string[]) {
-    return builder(this.db).select(['assets.originalPath']).where('assets.id', '=', anyUuid(ids)).stream();
+    return builder(this.db).select(['asset.originalPath']).where('asset.id', '=', anyUuid(ids)).stream();
   }
 
   downloadAlbumId(albumId: string) {
     return builder(this.db)
-      .innerJoin('albums_assets_assets', 'assets.id', 'albums_assets_assets.assetsId')
-      .where('albums_assets_assets.albumsId', '=', albumId)
+      .innerJoin('album_asset', 'asset.id', 'album_asset.assetsId')
+      .where('album_asset.albumsId', '=', albumId)
       .stream();
   }
 
   downloadUserId(userId: string) {
     return builder(this.db)
-      .where('assets.ownerId', '=', userId)
-      .where('assets.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.ownerId', '=', userId)
+      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
       .stream();
   }
 }
diff --git a/server/src/repositories/duplicate.repository.ts b/server/src/repositories/duplicate.repository.ts
index d654e1844e..ac9e5798e5 100644
--- a/server/src/repositories/duplicate.repository.ts
+++ b/server/src/repositories/duplicate.repository.ts
@@ -32,28 +32,28 @@ export class DuplicateRepository {
       this.db
         .with('duplicates', (qb) =>
           qb
-            .selectFrom('assets')
+            .selectFrom('asset')
             .$call(withDefaultVisibility)
             .leftJoinLateral(
               (qb) =>
                 qb
-                  .selectFrom('exif')
-                  .selectAll('assets')
-                  .select((eb) => eb.table('exif').as('exifInfo'))
-                  .whereRef('exif.assetId', '=', 'assets.id')
-                  .as('asset'),
+                  .selectFrom('asset_exif')
+                  .selectAll('asset')
+                  .select((eb) => eb.table('asset_exif').as('exifInfo'))
+                  .whereRef('asset_exif.assetId', '=', 'asset.id')
+                  .as('asset2'),
               (join) => join.onTrue(),
             )
-            .select('assets.duplicateId')
+            .select('asset.duplicateId')
             .select((eb) =>
-              eb.fn.jsonAgg('asset').orderBy('assets.localDateTime', 'asc').$castTo<MapAsset[]>().as('assets'),
+              eb.fn.jsonAgg('asset2').orderBy('asset.localDateTime', 'asc').$castTo<MapAsset[]>().as('assets'),
             )
-            .where('assets.ownerId', '=', asUuid(userId))
-            .where('assets.duplicateId', 'is not', null)
+            .where('asset.ownerId', '=', asUuid(userId))
+            .where('asset.duplicateId', 'is not', null)
             .$narrowType<{ duplicateId: NotNull }>()
-            .where('assets.deletedAt', 'is', null)
-            .where('assets.stackId', 'is', null)
-            .groupBy('assets.duplicateId'),
+            .where('asset.deletedAt', 'is', null)
+            .where('asset.stackId', 'is', null)
+            .groupBy('asset.duplicateId'),
         )
         .with('unique', (qb) =>
           qb
@@ -63,10 +63,10 @@ export class DuplicateRepository {
         )
         .with('removed_unique', (qb) =>
           qb
-            .updateTable('assets')
+            .updateTable('asset')
             .set({ duplicateId: null })
             .from('unique')
-            .whereRef('assets.duplicateId', '=', 'unique.duplicateId'),
+            .whereRef('asset.duplicateId', '=', 'unique.duplicateId'),
         )
         .selectFrom('duplicates')
         .selectAll()
@@ -81,7 +81,7 @@ export class DuplicateRepository {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
   async delete(userId: string, id: string): Promise<void> {
     await this.db
-      .updateTable('assets')
+      .updateTable('asset')
       .set({ duplicateId: null })
       .where('ownerId', '=', userId)
       .where('duplicateId', '=', id)
@@ -96,7 +96,7 @@ export class DuplicateRepository {
     }
 
     await this.db
-      .updateTable('assets')
+      .updateTable('asset')
       .set({ duplicateId: null })
       .where('ownerId', '=', userId)
       .where('duplicateId', 'in', ids)
@@ -120,19 +120,19 @@ export class DuplicateRepository {
       return await trx
         .with('cte', (qb) =>
           qb
-            .selectFrom('assets')
+            .selectFrom('asset')
             .$call(withDefaultVisibility)
             .select([
-              'assets.id as assetId',
-              'assets.duplicateId',
+              'asset.id as assetId',
+              'asset.duplicateId',
               sql<number>`smart_search.embedding <=> ${embedding}`.as('distance'),
             ])
-            .innerJoin('smart_search', 'assets.id', 'smart_search.assetId')
-            .where('assets.ownerId', '=', anyUuid(userIds))
-            .where('assets.deletedAt', 'is', null)
-            .where('assets.type', '=', type)
-            .where('assets.id', '!=', asUuid(assetId))
-            .where('assets.stackId', 'is', null)
+            .innerJoin('smart_search', 'asset.id', 'smart_search.assetId')
+            .where('asset.ownerId', '=', anyUuid(userIds))
+            .where('asset.deletedAt', 'is', null)
+            .where('asset.type', '=', type)
+            .where('asset.id', '!=', asUuid(assetId))
+            .where('asset.stackId', 'is', null)
             .orderBy('distance')
             .limit(64),
         )
@@ -148,7 +148,7 @@ export class DuplicateRepository {
   })
   async merge(options: DuplicateMergeOptions): Promise<void> {
     await this.db
-      .updateTable('assets')
+      .updateTable('asset')
       .set({ duplicateId: options.targetId })
       .where((eb) =>
         eb.or([eb('duplicateId', '=', anyUuid(options.sourceIds)), eb('id', '=', anyUuid(options.assetIds))]),
diff --git a/server/src/repositories/library.repository.ts b/server/src/repositories/library.repository.ts
index 704f809689..9f26191cfb 100644
--- a/server/src/repositories/library.repository.ts
+++ b/server/src/repositories/library.repository.ts
@@ -21,50 +21,50 @@ export class LibraryRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   get(id: string, withDeleted = false) {
     return this.db
-      .selectFrom('libraries')
-      .selectAll('libraries')
-      .where('libraries.id', '=', id)
-      .$if(!withDeleted, (qb) => qb.where('libraries.deletedAt', 'is', null))
+      .selectFrom('library')
+      .selectAll('library')
+      .where('library.id', '=', id)
+      .$if(!withDeleted, (qb) => qb.where('library.deletedAt', 'is', null))
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [] })
   getAll(withDeleted = false) {
     return this.db
-      .selectFrom('libraries')
-      .selectAll('libraries')
+      .selectFrom('library')
+      .selectAll('library')
       .orderBy('createdAt', 'asc')
-      .$if(!withDeleted, (qb) => qb.where('libraries.deletedAt', 'is', null))
+      .$if(!withDeleted, (qb) => qb.where('library.deletedAt', 'is', null))
       .execute();
   }
 
   @GenerateSql()
   getAllDeleted() {
     return this.db
-      .selectFrom('libraries')
-      .selectAll('libraries')
-      .where('libraries.deletedAt', 'is not', null)
+      .selectFrom('library')
+      .selectAll('library')
+      .where('library.deletedAt', 'is not', null)
       .orderBy('createdAt', 'asc')
       .execute();
   }
 
   create(library: Insertable<LibraryTable>) {
-    return this.db.insertInto('libraries').values(library).returningAll().executeTakeFirstOrThrow();
+    return this.db.insertInto('library').values(library).returningAll().executeTakeFirstOrThrow();
   }
 
   async delete(id: string) {
-    await this.db.deleteFrom('libraries').where('libraries.id', '=', id).execute();
+    await this.db.deleteFrom('library').where('library.id', '=', id).execute();
   }
 
   async softDelete(id: string) {
-    await this.db.updateTable('libraries').set({ deletedAt: new Date() }).where('libraries.id', '=', id).execute();
+    await this.db.updateTable('library').set({ deletedAt: new Date() }).where('library.id', '=', id).execute();
   }
 
   update(id: string, library: Updateable<LibraryTable>) {
     return this.db
-      .updateTable('libraries')
+      .updateTable('library')
       .set(library)
-      .where('libraries.id', '=', id)
+      .where('library.id', '=', id)
       .returningAll()
       .executeTakeFirstOrThrow();
   }
@@ -72,14 +72,14 @@ export class LibraryRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   async getStatistics(id: string): Promise<LibraryStatsResponseDto | undefined> {
     const stats = await this.db
-      .selectFrom('libraries')
-      .innerJoin('assets', 'assets.libraryId', 'libraries.id')
-      .leftJoin('exif', 'exif.assetId', 'assets.id')
+      .selectFrom('library')
+      .innerJoin('asset', 'asset.libraryId', 'library.id')
+      .leftJoin('asset_exif', 'asset_exif.assetId', 'asset.id')
       .select((eb) =>
         eb.fn
           .countAll<number>()
           .filterWhere((eb) =>
-            eb.and([eb('assets.type', '=', AssetType.IMAGE), eb('assets.visibility', '!=', AssetVisibility.HIDDEN)]),
+            eb.and([eb('asset.type', '=', AssetType.IMAGE), eb('asset.visibility', '!=', AssetVisibility.HIDDEN)]),
           )
           .as('photos'),
       )
@@ -87,25 +87,25 @@ export class LibraryRepository {
         eb.fn
           .countAll<number>()
           .filterWhere((eb) =>
-            eb.and([eb('assets.type', '=', AssetType.VIDEO), eb('assets.visibility', '!=', AssetVisibility.HIDDEN)]),
+            eb.and([eb('asset.type', '=', AssetType.VIDEO), eb('asset.visibility', '!=', AssetVisibility.HIDDEN)]),
           )
           .as('videos'),
       )
-      .select((eb) => eb.fn.coalesce((eb) => eb.fn.sum('exif.fileSizeInByte'), eb.val(0)).as('usage'))
-      .groupBy('libraries.id')
-      .where('libraries.id', '=', id)
+      .select((eb) => eb.fn.coalesce((eb) => eb.fn.sum('asset_exif.fileSizeInByte'), eb.val(0)).as('usage'))
+      .groupBy('library.id')
+      .where('library.id', '=', id)
       .executeTakeFirst();
 
     // possibly a new library with 0 assets
     if (!stats) {
       const zero = sql<number>`0::int`;
       return this.db
-        .selectFrom('libraries')
+        .selectFrom('library')
         .select(zero.as('photos'))
         .select(zero.as('videos'))
         .select(zero.as('usage'))
         .select(zero.as('total'))
-        .where('libraries.id', '=', id)
+        .where('library.id', '=', id)
         .executeTakeFirst();
     }
 
@@ -118,6 +118,6 @@ export class LibraryRepository {
   }
 
   streamAssetIds(libraryId: string) {
-    return this.db.selectFrom('assets').select(['id']).where('libraryId', '=', libraryId).stream();
+    return this.db.selectFrom('asset').select(['id']).where('libraryId', '=', libraryId).stream();
   }
 }
diff --git a/server/src/repositories/map.repository.ts b/server/src/repositories/map.repository.ts
index 36c45bcb71..ff2e28b8d7 100644
--- a/server/src/repositories/map.repository.ts
+++ b/server/src/repositories/map.repository.ts
@@ -83,25 +83,32 @@ export class MapRepository {
     { isArchived, isFavorite, fileCreatedAfter, fileCreatedBefore }: MapMarkerSearchOptions = {},
   ) {
     return this.db
-      .selectFrom('assets')
-      .innerJoin('exif', (builder) =>
+      .selectFrom('asset')
+      .innerJoin('asset_exif', (builder) =>
         builder
-          .onRef('assets.id', '=', 'exif.assetId')
-          .on('exif.latitude', 'is not', null)
-          .on('exif.longitude', 'is not', null),
+          .onRef('asset.id', '=', 'asset_exif.assetId')
+          .on('asset_exif.latitude', 'is not', null)
+          .on('asset_exif.longitude', 'is not', null),
       )
-      .select(['id', 'exif.latitude as lat', 'exif.longitude as lon', 'exif.city', 'exif.state', 'exif.country'])
+      .select([
+        'id',
+        'asset_exif.latitude as lat',
+        'asset_exif.longitude as lon',
+        'asset_exif.city',
+        'asset_exif.state',
+        'asset_exif.country',
+      ])
       .$narrowType<{ lat: NotNull; lon: NotNull }>()
       .$if(isArchived === true, (qb) =>
         qb.where((eb) =>
           eb.or([
-            eb('assets.visibility', '=', AssetVisibility.TIMELINE),
-            eb('assets.visibility', '=', AssetVisibility.ARCHIVE),
+            eb('asset.visibility', '=', AssetVisibility.TIMELINE),
+            eb('asset.visibility', '=', AssetVisibility.ARCHIVE),
           ]),
         ),
       )
       .$if(isArchived === false || isArchived === undefined, (qb) =>
-        qb.where('assets.visibility', '=', AssetVisibility.TIMELINE),
+        qb.where('asset.visibility', '=', AssetVisibility.TIMELINE),
       )
       .$if(isFavorite !== undefined, (q) => q.where('isFavorite', '=', isFavorite!))
       .$if(fileCreatedAfter !== undefined, (q) => q.where('fileCreatedAt', '>=', fileCreatedAfter!))
@@ -118,9 +125,9 @@ export class MapRepository {
           expression.push(
             eb.exists((eb) =>
               eb
-                .selectFrom('albums_assets_assets')
-                .whereRef('assets.id', '=', 'albums_assets_assets.assetsId')
-                .where('albums_assets_assets.albumsId', 'in', albumIds),
+                .selectFrom('album_asset')
+                .whereRef('asset.id', '=', 'album_asset.assetsId')
+                .where('album_asset.albumsId', 'in', albumIds),
             ),
           );
         }
diff --git a/server/src/repositories/memory.repository.ts b/server/src/repositories/memory.repository.ts
index 65975a232d..7cf03508be 100644
--- a/server/src/repositories/memory.repository.ts
+++ b/server/src/repositories/memory.repository.ts
@@ -16,14 +16,14 @@ export class MemoryRepository implements IBulkAsset {
 
   async cleanup() {
     await this.db
-      .deleteFrom('memories_assets_assets')
-      .using('assets')
-      .whereRef('memories_assets_assets.assetsId', '=', 'assets.id')
-      .where('assets.visibility', '!=', AssetVisibility.TIMELINE)
+      .deleteFrom('memory_asset')
+      .using('asset')
+      .whereRef('memory_asset.assetsId', '=', 'asset.id')
+      .where('asset.visibility', '!=', AssetVisibility.TIMELINE)
       .execute();
 
     return this.db
-      .deleteFrom('memories')
+      .deleteFrom('memory')
       .where('createdAt', '<', DateTime.now().minus({ days: 30 }).toJSDate())
       .where('isSaved', '=', false)
       .execute();
@@ -31,7 +31,7 @@ export class MemoryRepository implements IBulkAsset {
 
   searchBuilder(ownerId: string, dto: MemorySearchDto) {
     return this.db
-      .selectFrom('memories')
+      .selectFrom('memory')
       .$if(dto.isSaved !== undefined, (qb) => qb.where('isSaved', '=', dto.isSaved!))
       .$if(dto.type !== undefined, (qb) => qb.where('type', '=', dto.type!))
       .$if(dto.for !== undefined, (qb) =>
@@ -62,16 +62,16 @@ export class MemoryRepository implements IBulkAsset {
       .select((eb) =>
         jsonArrayFrom(
           eb
-            .selectFrom('assets')
-            .selectAll('assets')
-            .innerJoin('memories_assets_assets', 'assets.id', 'memories_assets_assets.assetsId')
-            .whereRef('memories_assets_assets.memoriesId', '=', 'memories.id')
-            .orderBy('assets.fileCreatedAt', 'asc')
-            .where('assets.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
-            .where('assets.deletedAt', 'is', null),
+            .selectFrom('asset')
+            .selectAll('asset')
+            .innerJoin('memory_asset', 'asset.id', 'memory_asset.assetsId')
+            .whereRef('memory_asset.memoriesId', '=', 'memory.id')
+            .orderBy('asset.fileCreatedAt', 'asc')
+            .where('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
+            .where('asset.deletedAt', 'is', null),
         ).as('assets'),
       )
-      .selectAll('memories')
+      .selectAll('memory')
       .orderBy('memoryAt', 'desc')
       .execute();
   }
@@ -83,11 +83,11 @@ export class MemoryRepository implements IBulkAsset {
 
   async create(memory: Insertable<MemoryTable>, assetIds: Set<string>) {
     const id = await this.db.transaction().execute(async (tx) => {
-      const { id } = await tx.insertInto('memories').values(memory).returning('id').executeTakeFirstOrThrow();
+      const { id } = await tx.insertInto('memory').values(memory).returning('id').executeTakeFirstOrThrow();
 
       if (assetIds.size > 0) {
         const values = [...assetIds].map((assetId) => ({ memoriesId: id, assetsId: assetId }));
-        await tx.insertInto('memories_assets_assets').values(values).execute();
+        await tx.insertInto('memory_asset').values(values).execute();
       }
 
       return id;
@@ -98,13 +98,13 @@ export class MemoryRepository implements IBulkAsset {
 
   @GenerateSql({ params: [DummyValue.UUID, { ownerId: DummyValue.UUID, isSaved: true }] })
   async update(id: string, memory: Updateable<MemoryTable>) {
-    await this.db.updateTable('memories').set(memory).where('id', '=', id).execute();
+    await this.db.updateTable('memory').set(memory).where('id', '=', id).execute();
     return this.getByIdBuilder(id).executeTakeFirstOrThrow();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   async delete(id: string) {
-    await this.db.deleteFrom('memories').where('id', '=', id).execute();
+    await this.db.deleteFrom('memory').where('id', '=', id).execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID, [DummyValue.UUID]] })
@@ -115,7 +115,7 @@ export class MemoryRepository implements IBulkAsset {
     }
 
     const results = await this.db
-      .selectFrom('memories_assets_assets')
+      .selectFrom('memory_asset')
       .select(['assetsId'])
       .where('memoriesId', '=', id)
       .where('assetsId', 'in', assetIds)
@@ -131,7 +131,7 @@ export class MemoryRepository implements IBulkAsset {
     }
 
     await this.db
-      .insertInto('memories_assets_assets')
+      .insertInto('memory_asset')
       .values(assetIds.map((assetId) => ({ memoriesId: id, assetsId: assetId })))
       .execute();
   }
@@ -143,27 +143,23 @@ export class MemoryRepository implements IBulkAsset {
       return;
     }
 
-    await this.db
-      .deleteFrom('memories_assets_assets')
-      .where('memoriesId', '=', id)
-      .where('assetsId', 'in', assetIds)
-      .execute();
+    await this.db.deleteFrom('memory_asset').where('memoriesId', '=', id).where('assetsId', 'in', assetIds).execute();
   }
 
   private getByIdBuilder(id: string) {
     return this.db
-      .selectFrom('memories')
-      .selectAll('memories')
+      .selectFrom('memory')
+      .selectAll('memory')
       .select((eb) =>
         jsonArrayFrom(
           eb
-            .selectFrom('assets')
-            .selectAll('assets')
-            .innerJoin('memories_assets_assets', 'assets.id', 'memories_assets_assets.assetsId')
-            .whereRef('memories_assets_assets.memoriesId', '=', 'memories.id')
-            .orderBy('assets.fileCreatedAt', 'asc')
-            .where('assets.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
-            .where('assets.deletedAt', 'is', null),
+            .selectFrom('asset')
+            .selectAll('asset')
+            .innerJoin('memory_asset', 'asset.id', 'memory_asset.assetsId')
+            .whereRef('memory_asset.memoriesId', '=', 'memory.id')
+            .orderBy('asset.fileCreatedAt', 'asc')
+            .where('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
+            .where('asset.deletedAt', 'is', null),
         ).as('assets'),
       )
       .where('id', '=', id)
diff --git a/server/src/repositories/move.repository.ts b/server/src/repositories/move.repository.ts
index 3538dd4627..e416a65249 100644
--- a/server/src/repositories/move.repository.ts
+++ b/server/src/repositories/move.repository.ts
@@ -45,7 +45,7 @@ export class MoveRepository {
         eb(
           'move_history.entityId',
           'not in',
-          eb.selectFrom('assets').select('id').whereRef('assets.id', '=', 'move_history.entityId'),
+          eb.selectFrom('asset').select('id').whereRef('asset.id', '=', 'move_history.entityId'),
         ),
       )
       .where('move_history.pathType', '=', sql.lit(AssetPathType.ORIGINAL))
diff --git a/server/src/repositories/notification.repository.ts b/server/src/repositories/notification.repository.ts
index bbbd059e42..e892403416 100644
--- a/server/src/repositories/notification.repository.ts
+++ b/server/src/repositories/notification.repository.ts
@@ -12,7 +12,7 @@ export class NotificationRepository {
 
   cleanup() {
     return this.db
-      .deleteFrom('notifications')
+      .deleteFrom('notification')
       .where((eb) =>
         eb.or([
           // remove soft-deleted notifications
@@ -38,7 +38,7 @@ export class NotificationRepository {
   @GenerateSql({ params: [DummyValue.UUID, {}] }, { name: 'unread', params: [DummyValue.UUID, { unread: true }] })
   search(userId: string, dto: NotificationSearchDto) {
     return this.db
-      .selectFrom('notifications')
+      .selectFrom('notification')
       .select(columns.notification)
       .where((qb) =>
         qb.and({
@@ -56,7 +56,7 @@ export class NotificationRepository {
 
   create(notification: Insertable<NotificationTable>) {
     return this.db
-      .insertInto('notifications')
+      .insertInto('notification')
       .values(notification)
       .returning(columns.notification)
       .executeTakeFirstOrThrow();
@@ -64,7 +64,7 @@ export class NotificationRepository {
 
   get(id: string) {
     return this.db
-      .selectFrom('notifications')
+      .selectFrom('notification')
       .select(columns.notification)
       .where('id', '=', id)
       .where('deletedAt', 'is not', null)
@@ -73,7 +73,7 @@ export class NotificationRepository {
 
   update(id: string, notification: Updateable<NotificationTable>) {
     return this.db
-      .updateTable('notifications')
+      .updateTable('notification')
       .set(notification)
       .where('deletedAt', 'is', null)
       .where('id', '=', id)
@@ -82,12 +82,12 @@ export class NotificationRepository {
   }
 
   async updateAll(ids: string[], notification: Updateable<NotificationTable>) {
-    await this.db.updateTable('notifications').set(notification).where('id', 'in', ids).execute();
+    await this.db.updateTable('notification').set(notification).where('id', 'in', ids).execute();
   }
 
   async delete(id: string) {
     await this.db
-      .updateTable('notifications')
+      .updateTable('notification')
       .set({ deletedAt: DateTime.now().toJSDate() })
       .where('id', '=', id)
       .execute();
@@ -95,7 +95,7 @@ export class NotificationRepository {
 
   async deleteAll(ids: string[]) {
     await this.db
-      .updateTable('notifications')
+      .updateTable('notification')
       .set({ deletedAt: DateTime.now().toJSDate() })
       .where('id', 'in', ids)
       .execute();
diff --git a/server/src/repositories/partner.repository.ts b/server/src/repositories/partner.repository.ts
index af6d5d69c4..e386386be8 100644
--- a/server/src/repositories/partner.repository.ts
+++ b/server/src/repositories/partner.repository.ts
@@ -17,15 +17,15 @@ export enum PartnerDirection {
   SharedWith = 'shared-with',
 }
 
-const withSharedBy = (eb: ExpressionBuilder<DB, 'partners'>) => {
+const withSharedBy = (eb: ExpressionBuilder<DB, 'partner'>) => {
   return jsonObjectFrom(
-    eb.selectFrom('users as sharedBy').select(columns.user).whereRef('sharedBy.id', '=', 'partners.sharedById'),
+    eb.selectFrom('user as sharedBy').select(columns.user).whereRef('sharedBy.id', '=', 'partner.sharedById'),
   ).as('sharedBy');
 };
 
-const withSharedWith = (eb: ExpressionBuilder<DB, 'partners'>) => {
+const withSharedWith = (eb: ExpressionBuilder<DB, 'partner'>) => {
   return jsonObjectFrom(
-    eb.selectFrom('users as sharedWith').select(columns.user).whereRef('sharedWith.id', '=', 'partners.sharedWithId'),
+    eb.selectFrom('user as sharedWith').select(columns.user).whereRef('sharedWith.id', '=', 'partner.sharedWithId'),
   ).as('sharedWith');
 };
 
@@ -50,7 +50,7 @@ export class PartnerRepository {
 
   create(values: Insertable<PartnerTable>) {
     return this.db
-      .insertInto('partners')
+      .insertInto('partner')
       .values(values)
       .returningAll()
       .returning(withSharedBy)
@@ -62,7 +62,7 @@ export class PartnerRepository {
   @GenerateSql({ params: [{ sharedWithId: DummyValue.UUID, sharedById: DummyValue.UUID }, { inTimeline: true }] })
   update({ sharedWithId, sharedById }: PartnerIds, values: Updateable<PartnerTable>) {
     return this.db
-      .updateTable('partners')
+      .updateTable('partner')
       .set(values)
       .where('sharedWithId', '=', sharedWithId)
       .where('sharedById', '=', sharedById)
@@ -76,7 +76,7 @@ export class PartnerRepository {
   @GenerateSql({ params: [{ sharedWithId: DummyValue.UUID, sharedById: DummyValue.UUID }] })
   async remove({ sharedWithId, sharedById }: PartnerIds) {
     await this.db
-      .deleteFrom('partners')
+      .deleteFrom('partner')
       .where('sharedWithId', '=', sharedWithId)
       .where('sharedById', '=', sharedById)
       .execute();
@@ -84,14 +84,14 @@ export class PartnerRepository {
 
   private builder() {
     return this.db
-      .selectFrom('partners')
-      .innerJoin('users as sharedBy', (join) =>
-        join.onRef('partners.sharedById', '=', 'sharedBy.id').on('sharedBy.deletedAt', 'is', null),
+      .selectFrom('partner')
+      .innerJoin('user as sharedBy', (join) =>
+        join.onRef('partner.sharedById', '=', 'sharedBy.id').on('sharedBy.deletedAt', 'is', null),
       )
-      .innerJoin('users as sharedWith', (join) =>
-        join.onRef('partners.sharedWithId', '=', 'sharedWith.id').on('sharedWith.deletedAt', 'is', null),
+      .innerJoin('user as sharedWith', (join) =>
+        join.onRef('partner.sharedWithId', '=', 'sharedWith.id').on('sharedWith.deletedAt', 'is', null),
       )
-      .selectAll('partners')
+      .selectAll('partner')
       .select(withSharedBy)
       .select(withSharedWith);
   }
diff --git a/server/src/repositories/person.repository.ts b/server/src/repositories/person.repository.ts
index 949d39747e..1885a196ff 100644
--- a/server/src/repositories/person.repository.ts
+++ b/server/src/repositories/person.repository.ts
@@ -62,21 +62,21 @@ export type UnassignFacesOptions = DeleteFacesOptions;
 
 export type SelectFaceOptions = (keyof Selectable<AssetFaceTable>)[];
 
-const withPerson = (eb: ExpressionBuilder<DB, 'asset_faces'>) => {
+const withPerson = (eb: ExpressionBuilder<DB, 'asset_face'>) => {
   return jsonObjectFrom(
-    eb.selectFrom('person').selectAll('person').whereRef('person.id', '=', 'asset_faces.personId'),
+    eb.selectFrom('person').selectAll('person').whereRef('person.id', '=', 'asset_face.personId'),
   ).as('person');
 };
 
-const withAsset = (eb: ExpressionBuilder<DB, 'asset_faces'>) => {
-  return jsonObjectFrom(
-    eb.selectFrom('assets').selectAll('assets').whereRef('assets.id', '=', 'asset_faces.assetId'),
-  ).as('asset');
+const withAsset = (eb: ExpressionBuilder<DB, 'asset_face'>) => {
+  return jsonObjectFrom(eb.selectFrom('asset').selectAll('asset').whereRef('asset.id', '=', 'asset_face.assetId')).as(
+    'asset',
+  );
 };
 
-const withFaceSearch = (eb: ExpressionBuilder<DB, 'asset_faces'>) => {
+const withFaceSearch = (eb: ExpressionBuilder<DB, 'asset_face'>) => {
   return jsonObjectFrom(
-    eb.selectFrom('face_search').selectAll('face_search').whereRef('face_search.faceId', '=', 'asset_faces.id'),
+    eb.selectFrom('face_search').selectAll('face_search').whereRef('face_search.faceId', '=', 'asset_face.id'),
   ).as('faceSearch');
 };
 
@@ -87,10 +87,10 @@ export class PersonRepository {
   @GenerateSql({ params: [{ oldPersonId: DummyValue.UUID, newPersonId: DummyValue.UUID }] })
   async reassignFaces({ oldPersonId, faceIds, newPersonId }: UpdateFacesData): Promise<number> {
     const result = await this.db
-      .updateTable('asset_faces')
+      .updateTable('asset_face')
       .set({ personId: newPersonId })
-      .$if(!!oldPersonId, (qb) => qb.where('asset_faces.personId', '=', oldPersonId!))
-      .$if(!!faceIds, (qb) => qb.where('asset_faces.id', 'in', faceIds!))
+      .$if(!!oldPersonId, (qb) => qb.where('asset_face.personId', '=', oldPersonId!))
+      .$if(!!faceIds, (qb) => qb.where('asset_face.id', 'in', faceIds!))
       .executeTakeFirst();
 
     return Number(result.numChangedRows ?? 0);
@@ -98,9 +98,9 @@ export class PersonRepository {
 
   async unassignFaces({ sourceType }: UnassignFacesOptions): Promise<void> {
     await this.db
-      .updateTable('asset_faces')
+      .updateTable('asset_face')
       .set({ personId: null })
-      .where('asset_faces.sourceType', '=', sourceType)
+      .where('asset_face.sourceType', '=', sourceType)
       .execute();
   }
 
@@ -115,18 +115,18 @@ export class PersonRepository {
   }
 
   async deleteFaces({ sourceType }: DeleteFacesOptions): Promise<void> {
-    await this.db.deleteFrom('asset_faces').where('asset_faces.sourceType', '=', sourceType).execute();
+    await this.db.deleteFrom('asset_face').where('asset_face.sourceType', '=', sourceType).execute();
   }
 
   getAllFaces(options: GetAllFacesOptions = {}) {
     return this.db
-      .selectFrom('asset_faces')
-      .selectAll('asset_faces')
-      .$if(options.personId === null, (qb) => qb.where('asset_faces.personId', 'is', null))
-      .$if(!!options.personId, (qb) => qb.where('asset_faces.personId', '=', options.personId!))
-      .$if(!!options.sourceType, (qb) => qb.where('asset_faces.sourceType', '=', options.sourceType!))
-      .$if(!!options.assetId, (qb) => qb.where('asset_faces.assetId', '=', options.assetId!))
-      .where('asset_faces.deletedAt', 'is', null)
+      .selectFrom('asset_face')
+      .selectAll('asset_face')
+      .$if(options.personId === null, (qb) => qb.where('asset_face.personId', 'is', null))
+      .$if(!!options.personId, (qb) => qb.where('asset_face.personId', '=', options.personId!))
+      .$if(!!options.sourceType, (qb) => qb.where('asset_face.sourceType', '=', options.sourceType!))
+      .$if(!!options.assetId, (qb) => qb.where('asset_face.assetId', '=', options.assetId!))
+      .where('asset_face.deletedAt', 'is', null)
       .stream();
   }
 
@@ -147,21 +147,21 @@ export class PersonRepository {
     const items = await this.db
       .selectFrom('person')
       .selectAll('person')
-      .innerJoin('asset_faces', 'asset_faces.personId', 'person.id')
-      .innerJoin('assets', (join) =>
+      .innerJoin('asset_face', 'asset_face.personId', 'person.id')
+      .innerJoin('asset', (join) =>
         join
-          .onRef('asset_faces.assetId', '=', 'assets.id')
-          .on('assets.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
-          .on('assets.deletedAt', 'is', null),
+          .onRef('asset_face.assetId', '=', 'asset.id')
+          .on('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
+          .on('asset.deletedAt', 'is', null),
       )
       .where('person.ownerId', '=', userId)
-      .where('asset_faces.deletedAt', 'is', null)
+      .where('asset_face.deletedAt', 'is', null)
       .orderBy('person.isHidden', 'asc')
       .orderBy('person.isFavorite', 'desc')
       .having((eb) =>
         eb.or([
           eb('person.name', '!=', ''),
-          eb((innerEb) => innerEb.fn.count('asset_faces.assetId'), '>=', options?.minimumFaceCount || 1),
+          eb((innerEb) => innerEb.fn.count('asset_face.assetId'), '>=', options?.minimumFaceCount || 1),
         ]),
       )
       .groupBy('person.id')
@@ -185,7 +185,7 @@ export class PersonRepository {
       .$if(!options?.closestFaceAssetId, (qb) =>
         qb
           .orderBy(sql`NULLIF(person.name, '') is null`, 'asc')
-          .orderBy((eb) => eb.fn.count('asset_faces.assetId'), 'desc')
+          .orderBy((eb) => eb.fn.count('asset_face.assetId'), 'desc')
           .orderBy(sql`NULLIF(person.name, '')`, (om) => om.asc().nullsLast())
           .orderBy('person.createdAt'),
       )
@@ -202,9 +202,9 @@ export class PersonRepository {
     return this.db
       .selectFrom('person')
       .selectAll('person')
-      .leftJoin('asset_faces', 'asset_faces.personId', 'person.id')
-      .where('asset_faces.deletedAt', 'is', null)
-      .having((eb) => eb.fn.count('asset_faces.assetId'), '=', 0)
+      .leftJoin('asset_face', 'asset_face.personId', 'person.id')
+      .where('asset_face.deletedAt', 'is', null)
+      .having((eb) => eb.fn.count('asset_face.assetId'), '=', 0)
       .groupBy('person.id')
       .execute();
   }
@@ -212,12 +212,12 @@ export class PersonRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   getFaces(assetId: string) {
     return this.db
-      .selectFrom('asset_faces')
-      .selectAll('asset_faces')
+      .selectFrom('asset_face')
+      .selectAll('asset_face')
       .select(withPerson)
-      .where('asset_faces.assetId', '=', assetId)
-      .where('asset_faces.deletedAt', 'is', null)
-      .orderBy('asset_faces.boundingBoxX1', 'asc')
+      .where('asset_face.assetId', '=', assetId)
+      .where('asset_face.deletedAt', 'is', null)
+      .orderBy('asset_face.boundingBoxX1', 'asc')
       .execute();
   }
 
@@ -225,30 +225,30 @@ export class PersonRepository {
   getFaceById(id: string) {
     // TODO return null instead of find or fail
     return this.db
-      .selectFrom('asset_faces')
-      .selectAll('asset_faces')
+      .selectFrom('asset_face')
+      .selectAll('asset_face')
       .select(withPerson)
-      .where('asset_faces.id', '=', id)
-      .where('asset_faces.deletedAt', 'is', null)
+      .where('asset_face.id', '=', id)
+      .where('asset_face.deletedAt', 'is', null)
       .executeTakeFirstOrThrow();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getFaceForFacialRecognitionJob(id: string) {
     return this.db
-      .selectFrom('asset_faces')
-      .select(['asset_faces.id', 'asset_faces.personId', 'asset_faces.sourceType'])
+      .selectFrom('asset_face')
+      .select(['asset_face.id', 'asset_face.personId', 'asset_face.sourceType'])
       .select((eb) =>
         jsonObjectFrom(
           eb
-            .selectFrom('assets')
-            .select(['assets.ownerId', 'assets.visibility', 'assets.fileCreatedAt'])
-            .whereRef('assets.id', '=', 'asset_faces.assetId'),
+            .selectFrom('asset')
+            .select(['asset.ownerId', 'asset.visibility', 'asset.fileCreatedAt'])
+            .whereRef('asset.id', '=', 'asset_face.assetId'),
         ).as('asset'),
       )
       .select(withFaceSearch)
-      .where('asset_faces.id', '=', id)
-      .where('asset_faces.deletedAt', 'is', null)
+      .where('asset_face.id', '=', id)
+      .where('asset_face.deletedAt', 'is', null)
       .executeTakeFirst();
   }
 
@@ -256,40 +256,40 @@ export class PersonRepository {
   getDataForThumbnailGenerationJob(id: string) {
     return this.db
       .selectFrom('person')
-      .innerJoin('asset_faces', 'asset_faces.id', 'person.faceAssetId')
-      .innerJoin('assets', 'asset_faces.assetId', 'assets.id')
-      .leftJoin('exif', 'exif.assetId', 'assets.id')
+      .innerJoin('asset_face', 'asset_face.id', 'person.faceAssetId')
+      .innerJoin('asset', 'asset_face.assetId', 'asset.id')
+      .leftJoin('asset_exif', 'asset_exif.assetId', 'asset.id')
       .select([
         'person.ownerId',
-        'asset_faces.boundingBoxX1 as x1',
-        'asset_faces.boundingBoxY1 as y1',
-        'asset_faces.boundingBoxX2 as x2',
-        'asset_faces.boundingBoxY2 as y2',
-        'asset_faces.imageWidth as oldWidth',
-        'asset_faces.imageHeight as oldHeight',
-        'assets.type',
-        'assets.originalPath',
-        'exif.orientation as exifOrientation',
+        'asset_face.boundingBoxX1 as x1',
+        'asset_face.boundingBoxY1 as y1',
+        'asset_face.boundingBoxX2 as x2',
+        'asset_face.boundingBoxY2 as y2',
+        'asset_face.imageWidth as oldWidth',
+        'asset_face.imageHeight as oldHeight',
+        'asset.type',
+        'asset.originalPath',
+        'asset_exif.orientation as exifOrientation',
       ])
       .select((eb) =>
         eb
-          .selectFrom('asset_files')
-          .select('asset_files.path')
-          .whereRef('asset_files.assetId', '=', 'assets.id')
-          .where('asset_files.type', '=', sql.lit(AssetFileType.PREVIEW))
+          .selectFrom('asset_file')
+          .select('asset_file.path')
+          .whereRef('asset_file.assetId', '=', 'asset.id')
+          .where('asset_file.type', '=', sql.lit(AssetFileType.PREVIEW))
           .as('previewPath'),
       )
       .where('person.id', '=', id)
-      .where('asset_faces.deletedAt', 'is', null)
+      .where('asset_face.deletedAt', 'is', null)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
   async reassignFace(assetFaceId: string, newPersonId: string): Promise<number> {
     const result = await this.db
-      .updateTable('asset_faces')
+      .updateTable('asset_face')
       .set({ personId: newPersonId })
-      .where('asset_faces.id', '=', assetFaceId)
+      .where('asset_face.id', '=', assetFaceId)
       .executeTakeFirst();
 
     return Number(result.numChangedRows ?? 0);
@@ -336,16 +336,16 @@ export class PersonRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   async getStatistics(personId: string): Promise<PersonStatistics> {
     const result = await this.db
-      .selectFrom('asset_faces')
-      .leftJoin('assets', (join) =>
+      .selectFrom('asset_face')
+      .leftJoin('asset', (join) =>
         join
-          .onRef('assets.id', '=', 'asset_faces.assetId')
-          .on('asset_faces.personId', '=', personId)
-          .on('assets.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
-          .on('assets.deletedAt', 'is', null),
+          .onRef('asset.id', '=', 'asset_face.assetId')
+          .on('asset_face.personId', '=', personId)
+          .on('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
+          .on('asset.deletedAt', 'is', null),
       )
-      .select((eb) => eb.fn.count(eb.fn('distinct', ['assets.id'])).as('count'))
-      .where('asset_faces.deletedAt', 'is', null)
+      .select((eb) => eb.fn.count(eb.fn('distinct', ['asset.id'])).as('count'))
+      .where('asset_face.deletedAt', 'is', null)
       .executeTakeFirst();
 
     return {
@@ -361,16 +361,16 @@ export class PersonRepository {
       .where((eb) =>
         eb.exists((eb) =>
           eb
-            .selectFrom('asset_faces')
-            .whereRef('asset_faces.personId', '=', 'person.id')
-            .where('asset_faces.deletedAt', 'is', null)
+            .selectFrom('asset_face')
+            .whereRef('asset_face.personId', '=', 'person.id')
+            .where('asset_face.deletedAt', 'is', null)
             .where((eb) =>
               eb.exists((eb) =>
                 eb
-                  .selectFrom('assets')
-                  .whereRef('assets.id', '=', 'asset_faces.assetId')
-                  .where('assets.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
-                  .where('assets.deletedAt', 'is', null),
+                  .selectFrom('asset')
+                  .whereRef('asset.id', '=', 'asset_face.assetId')
+                  .where('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
+                  .where('asset.deletedAt', 'is', null),
               ),
             ),
         ),
@@ -402,12 +402,12 @@ export class PersonRepository {
   ): Promise<void> {
     let query = this.db;
     if (facesToAdd.length > 0) {
-      (query as any) = query.with('added', (db) => db.insertInto('asset_faces').values(facesToAdd));
+      (query as any) = query.with('added', (db) => db.insertInto('asset_face').values(facesToAdd));
     }
 
     if (faceIdsToRemove.length > 0) {
       (query as any) = query.with('removed', (db) =>
-        db.deleteFrom('asset_faces').where('asset_faces.id', '=', (eb) => eb.fn.any(eb.val(faceIdsToRemove))),
+        db.deleteFrom('asset_face').where('asset_face.id', '=', (eb) => eb.fn.any(eb.val(faceIdsToRemove))),
       );
     }
 
@@ -469,23 +469,23 @@ export class PersonRepository {
     }
 
     return this.db
-      .selectFrom('asset_faces')
-      .selectAll('asset_faces')
+      .selectFrom('asset_face')
+      .selectAll('asset_face')
       .select(withAsset)
       .select(withPerson)
-      .where('asset_faces.assetId', 'in', assetIds)
-      .where('asset_faces.personId', 'in', personIds)
-      .where('asset_faces.deletedAt', 'is', null)
+      .where('asset_face.assetId', 'in', assetIds)
+      .where('asset_face.personId', 'in', personIds)
+      .where('asset_face.deletedAt', 'is', null)
       .execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getRandomFace(personId: string) {
     return this.db
-      .selectFrom('asset_faces')
-      .selectAll('asset_faces')
-      .where('asset_faces.personId', '=', personId)
-      .where('asset_faces.deletedAt', 'is', null)
+      .selectFrom('asset_face')
+      .selectAll('asset_face')
+      .where('asset_face.personId', '=', personId)
+      .where('asset_face.deletedAt', 'is', null)
       .executeTakeFirst();
   }
 
@@ -500,22 +500,22 @@ export class PersonRepository {
   }
 
   async createAssetFace(face: Insertable<AssetFaceTable>): Promise<void> {
-    await this.db.insertInto('asset_faces').values(face).execute();
+    await this.db.insertInto('asset_face').values(face).execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   async deleteAssetFace(id: string): Promise<void> {
-    await this.db.deleteFrom('asset_faces').where('asset_faces.id', '=', id).execute();
+    await this.db.deleteFrom('asset_face').where('asset_face.id', '=', id).execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   async softDeleteAssetFaces(id: string): Promise<void> {
-    await this.db.updateTable('asset_faces').set({ deletedAt: new Date() }).where('asset_faces.id', '=', id).execute();
+    await this.db.updateTable('asset_face').set({ deletedAt: new Date() }).where('asset_face.id', '=', id).execute();
   }
 
   async vacuum({ reindexVectors }: { reindexVectors: boolean }): Promise<void> {
-    await sql`VACUUM ANALYZE asset_faces, face_search, person`.execute(this.db);
-    await sql`REINDEX TABLE asset_faces`.execute(this.db);
+    await sql`VACUUM ANALYZE asset_face, face_search, person`.execute(this.db);
+    await sql`REINDEX TABLE asset_face`.execute(this.db);
     await sql`REINDEX TABLE person`.execute(this.db);
     if (reindexVectors) {
       await sql`REINDEX TABLE face_search`.execute(this.db);
diff --git a/server/src/repositories/search.repository.ts b/server/src/repositories/search.repository.ts
index b354e33e57..fe8ad563bb 100644
--- a/server/src/repositories/search.repository.ts
+++ b/server/src/repositories/search.repository.ts
@@ -7,7 +7,7 @@ import { MapAsset } from 'src/dtos/asset-response.dto';
 import { AssetStatus, AssetType, AssetVisibility, VectorIndex } from 'src/enum';
 import { probes } from 'src/repositories/database.repository';
 import { DB } from 'src/schema';
-import { ExifTable } from 'src/schema/tables/exif.table';
+import { AssetExifTable } from 'src/schema/tables/asset-exif.table';
 import { anyUuid, searchAssetBuilder } from 'src/utils/database';
 import { paginationHelper } from 'src/utils/pagination';
 import { isValidInteger } from 'src/validation';
@@ -183,8 +183,8 @@ export class SearchRepository {
   async searchMetadata(pagination: SearchPaginationOptions, options: AssetSearchOptions) {
     const orderDirection = (options.orderDirection?.toLowerCase() || 'desc') as OrderByDirection;
     const items = await searchAssetBuilder(this.db, options)
-      .selectAll('assets')
-      .orderBy('assets.fileCreatedAt', orderDirection)
+      .selectAll('asset')
+      .orderBy('asset.fileCreatedAt', orderDirection)
       .limit(pagination.size + 1)
       .offset((pagination.page - 1) * pagination.size)
       .execute();
@@ -224,13 +224,13 @@ export class SearchRepository {
     const uuid = randomUUID();
     const builder = searchAssetBuilder(this.db, options);
     const lessThan = builder
-      .selectAll('assets')
-      .where('assets.id', '<', uuid)
+      .selectAll('asset')
+      .where('asset.id', '<', uuid)
       .orderBy(sql`random()`)
       .limit(size);
     const greaterThan = builder
-      .selectAll('assets')
-      .where('assets.id', '>', uuid)
+      .selectAll('asset')
+      .where('asset.id', '>', uuid)
       .orderBy(sql`random()`)
       .limit(size);
     const { rows } = await sql<MapAsset>`${lessThan} union all ${greaterThan} limit ${size}`.execute(this.db);
@@ -258,8 +258,8 @@ export class SearchRepository {
     return this.db.transaction().execute(async (trx) => {
       await sql`set local vchordrq.probes = ${sql.lit(probes[VectorIndex.CLIP])}`.execute(trx);
       const items = await searchAssetBuilder(trx, options)
-        .selectAll('assets')
-        .innerJoin('smart_search', 'assets.id', 'smart_search.assetId')
+        .selectAll('asset')
+        .innerJoin('smart_search', 'asset.id', 'smart_search.assetId')
         .orderBy(sql`smart_search.embedding <=> ${options.embedding}`)
         .limit(pagination.size + 1)
         .offset((pagination.page - 1) * pagination.size)
@@ -288,18 +288,18 @@ export class SearchRepository {
       return await trx
         .with('cte', (qb) =>
           qb
-            .selectFrom('asset_faces')
+            .selectFrom('asset_face')
             .select([
-              'asset_faces.id',
-              'asset_faces.personId',
+              'asset_face.id',
+              'asset_face.personId',
               sql<number>`face_search.embedding <=> ${embedding}`.as('distance'),
             ])
-            .innerJoin('assets', 'assets.id', 'asset_faces.assetId')
-            .innerJoin('face_search', 'face_search.faceId', 'asset_faces.id')
-            .leftJoin('person', 'person.id', 'asset_faces.personId')
-            .where('assets.ownerId', '=', anyUuid(userIds))
-            .where('assets.deletedAt', 'is', null)
-            .$if(!!hasPerson, (qb) => qb.where('asset_faces.personId', 'is not', null))
+            .innerJoin('asset', 'asset.id', 'asset_face.assetId')
+            .innerJoin('face_search', 'face_search.faceId', 'asset_face.id')
+            .leftJoin('person', 'person.id', 'asset_face.personId')
+            .where('asset.ownerId', '=', anyUuid(userIds))
+            .where('asset.deletedAt', 'is', null)
+            .$if(!!hasPerson, (qb) => qb.where('asset_face.personId', 'is not', null))
             .$if(!!minBirthDate, (qb) =>
               qb.where((eb) =>
                 eb.or([eb('person.birthDate', 'is', null), eb('person.birthDate', '<=', minBirthDate!)]),
@@ -347,13 +347,13 @@ export class SearchRepository {
     return this.db
       .withRecursive('cte', (qb) => {
         const base = qb
-          .selectFrom('exif')
+          .selectFrom('asset_exif')
           .select(['city', 'assetId'])
-          .innerJoin('assets', 'assets.id', 'exif.assetId')
-          .where('assets.ownerId', '=', anyUuid(userIds))
-          .where('assets.visibility', '=', AssetVisibility.TIMELINE)
-          .where('assets.type', '=', AssetType.IMAGE)
-          .where('assets.deletedAt', 'is', null)
+          .innerJoin('asset', 'asset.id', 'asset_exif.assetId')
+          .where('asset.ownerId', '=', anyUuid(userIds))
+          .where('asset.visibility', '=', AssetVisibility.TIMELINE)
+          .where('asset.type', '=', AssetType.IMAGE)
+          .where('asset.deletedAt', 'is', null)
           .orderBy('city')
           .limit(1);
 
@@ -363,14 +363,14 @@ export class SearchRepository {
           .innerJoinLateral(
             (qb) =>
               qb
-                .selectFrom('exif')
+                .selectFrom('asset_exif')
                 .select(['city', 'assetId'])
-                .innerJoin('assets', 'assets.id', 'exif.assetId')
-                .where('assets.ownerId', '=', anyUuid(userIds))
-                .where('assets.visibility', '=', AssetVisibility.TIMELINE)
-                .where('assets.type', '=', AssetType.IMAGE)
-                .where('assets.deletedAt', 'is', null)
-                .whereRef('exif.city', '>', 'cte.city')
+                .innerJoin('asset', 'asset.id', 'asset_exif.assetId')
+                .where('asset.ownerId', '=', anyUuid(userIds))
+                .where('asset.visibility', '=', AssetVisibility.TIMELINE)
+                .where('asset.type', '=', AssetType.IMAGE)
+                .where('asset.deletedAt', 'is', null)
+                .whereRef('asset_exif.city', '>', 'cte.city')
                 .orderBy('city')
                 .limit(1)
                 .as('l'),
@@ -379,17 +379,17 @@ export class SearchRepository {
 
         return sql<{ city: string; assetId: string }>`(${base} union all ${recursive})`;
       })
-      .selectFrom('assets')
-      .innerJoin('exif', 'assets.id', 'exif.assetId')
-      .innerJoin('cte', 'assets.id', 'cte.assetId')
-      .selectAll('assets')
+      .selectFrom('asset')
+      .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+      .innerJoin('cte', 'asset.id', 'cte.assetId')
+      .selectAll('asset')
       .select((eb) =>
         eb
-          .fn('to_jsonb', [eb.table('exif')])
-          .$castTo<Selectable<ExifTable>>()
+          .fn('to_jsonb', [eb.table('asset_exif')])
+          .$castTo<Selectable<AssetExifTable>>()
           .as('exifInfo'),
       )
-      .orderBy('exif.city')
+      .orderBy('asset_exif.city')
       .execute();
   }
 
@@ -445,10 +445,10 @@ export class SearchRepository {
 
   private getExifField<K extends 'city' | 'state' | 'country' | 'make' | 'model'>(field: K, userIds: string[]) {
     return this.db
-      .selectFrom('exif')
+      .selectFrom('asset_exif')
       .select(field)
       .distinctOn(field)
-      .innerJoin('assets', 'assets.id', 'exif.assetId')
+      .innerJoin('asset', 'asset.id', 'asset_exif.assetId')
       .where('ownerId', '=', anyUuid(userIds))
       .where('visibility', '=', AssetVisibility.TIMELINE)
       .where('deletedAt', 'is', null)
diff --git a/server/src/repositories/session.repository.ts b/server/src/repositories/session.repository.ts
index a3d8281db5..edf999e265 100644
--- a/server/src/repositories/session.repository.ts
+++ b/server/src/repositories/session.repository.ts
@@ -17,7 +17,7 @@ export class SessionRepository {
 
   cleanup() {
     return this.db
-      .deleteFrom('sessions')
+      .deleteFrom('session')
       .where((eb) =>
         eb.or([
           eb('updatedAt', '<=', DateTime.now().minus({ days: 90 }).toJSDate()),
@@ -31,7 +31,7 @@ export class SessionRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   get(id: string) {
     return this.db
-      .selectFrom('sessions')
+      .selectFrom('session')
       .select(['id', 'expiresAt', 'pinExpiresAt'])
       .where('id', '=', id)
       .executeTakeFirst();
@@ -40,20 +40,20 @@ export class SessionRepository {
   @GenerateSql({ params: [DummyValue.STRING] })
   getByToken(token: string) {
     return this.db
-      .selectFrom('sessions')
+      .selectFrom('session')
       .select((eb) => [
         ...columns.authSession,
         jsonObjectFrom(
           eb
-            .selectFrom('users')
+            .selectFrom('user')
             .select(columns.authUser)
-            .whereRef('users.id', '=', 'sessions.userId')
-            .where('users.deletedAt', 'is', null),
+            .whereRef('user.id', '=', 'session.userId')
+            .where('user.deletedAt', 'is', null),
         ).as('user'),
       ])
-      .where('sessions.token', '=', token)
+      .where('session.token', '=', token)
       .where((eb) =>
-        eb.or([eb('sessions.expiresAt', 'is', null), eb('sessions.expiresAt', '>', DateTime.now().toJSDate())]),
+        eb.or([eb('session.expiresAt', 'is', null), eb('session.expiresAt', '>', DateTime.now().toJSDate())]),
       )
       .executeTakeFirst();
   }
@@ -61,47 +61,47 @@ export class SessionRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   getByUserId(userId: string) {
     return this.db
-      .selectFrom('sessions')
-      .innerJoin('users', (join) => join.onRef('users.id', '=', 'sessions.userId').on('users.deletedAt', 'is', null))
-      .selectAll('sessions')
-      .where('sessions.userId', '=', userId)
+      .selectFrom('session')
+      .innerJoin('user', (join) => join.onRef('user.id', '=', 'session.userId').on('user.deletedAt', 'is', null))
+      .selectAll('session')
+      .where('session.userId', '=', userId)
       .where((eb) =>
-        eb.or([eb('sessions.expiresAt', 'is', null), eb('sessions.expiresAt', '>', DateTime.now().toJSDate())]),
+        eb.or([eb('session.expiresAt', 'is', null), eb('session.expiresAt', '>', DateTime.now().toJSDate())]),
       )
-      .orderBy('sessions.updatedAt', 'desc')
-      .orderBy('sessions.createdAt', 'desc')
+      .orderBy('session.updatedAt', 'desc')
+      .orderBy('session.createdAt', 'desc')
       .execute();
   }
 
   create(dto: Insertable<SessionTable>) {
-    return this.db.insertInto('sessions').values(dto).returningAll().executeTakeFirstOrThrow();
+    return this.db.insertInto('session').values(dto).returningAll().executeTakeFirstOrThrow();
   }
 
   update(id: string, dto: Updateable<SessionTable>) {
     return this.db
-      .updateTable('sessions')
+      .updateTable('session')
       .set(dto)
-      .where('sessions.id', '=', asUuid(id))
+      .where('session.id', '=', asUuid(id))
       .returningAll()
       .executeTakeFirstOrThrow();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   async delete(id: string) {
-    await this.db.deleteFrom('sessions').where('id', '=', asUuid(id)).execute();
+    await this.db.deleteFrom('session').where('id', '=', asUuid(id)).execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   async lockAll(userId: string) {
-    await this.db.updateTable('sessions').set({ pinExpiresAt: null }).where('userId', '=', userId).execute();
+    await this.db.updateTable('session').set({ pinExpiresAt: null }).where('userId', '=', userId).execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   async resetSyncProgress(sessionId: string) {
     await this.db.transaction().execute((tx) => {
       return Promise.all([
-        tx.updateTable('sessions').set({ isPendingSyncReset: false }).where('id', '=', sessionId).execute(),
-        tx.deleteFrom('session_sync_checkpoints').where('sessionId', '=', sessionId).execute(),
+        tx.updateTable('session').set({ isPendingSyncReset: false }).where('id', '=', sessionId).execute(),
+        tx.deleteFrom('session_sync_checkpoint').where('sessionId', '=', sessionId).execute(),
       ]);
     });
   }
diff --git a/server/src/repositories/shared-link.repository.ts b/server/src/repositories/shared-link.repository.ts
index 0875b535e2..d61333fcd6 100644
--- a/server/src/repositories/shared-link.repository.ts
+++ b/server/src/repositories/shared-link.repository.ts
@@ -22,61 +22,66 @@ export class SharedLinkRepository {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
   get(userId: string, id: string) {
     return this.db
-      .selectFrom('shared_links')
-      .selectAll('shared_links')
+      .selectFrom('shared_link')
+      .selectAll('shared_link')
       .leftJoinLateral(
         (eb) =>
           eb
-            .selectFrom('shared_link__asset')
-            .whereRef('shared_links.id', '=', 'shared_link__asset.sharedLinksId')
-            .innerJoin('assets', 'assets.id', 'shared_link__asset.assetsId')
-            .where('assets.deletedAt', 'is', null)
-            .selectAll('assets')
+            .selectFrom('shared_link_asset')
+            .whereRef('shared_link.id', '=', 'shared_link_asset.sharedLinksId')
+            .innerJoin('asset', 'asset.id', 'shared_link_asset.assetsId')
+            .where('asset.deletedAt', 'is', null)
+            .selectAll('asset')
             .innerJoinLateral(
-              (eb) => eb.selectFrom('exif').selectAll('exif').whereRef('exif.assetId', '=', 'assets.id').as('exifInfo'),
+              (eb) =>
+                eb
+                  .selectFrom('asset_exif')
+                  .selectAll('asset_exif')
+                  .whereRef('asset_exif.assetId', '=', 'asset.id')
+                  .as('exifInfo'),
               (join) => join.onTrue(),
             )
             .select((eb) => eb.fn.toJson('exifInfo').as('exifInfo'))
-            .orderBy('assets.fileCreatedAt', 'asc')
+            .orderBy('asset.fileCreatedAt', 'asc')
             .as('a'),
         (join) => join.onTrue(),
       )
       .leftJoinLateral(
         (eb) =>
           eb
-            .selectFrom('albums')
-            .selectAll('albums')
-            .whereRef('albums.id', '=', 'shared_links.albumId')
-            .where('albums.deletedAt', 'is', null)
-            .leftJoin('albums_assets_assets', 'albums_assets_assets.albumsId', 'albums.id')
+            .selectFrom('album')
+            .selectAll('album')
+            .whereRef('album.id', '=', 'shared_link.albumId')
+            .where('album.deletedAt', 'is', null)
+            .leftJoin('album_asset', 'album_asset.albumsId', 'album.id')
             .leftJoinLateral(
               (eb) =>
                 eb
-                  .selectFrom('assets')
-                  .selectAll('assets')
-                  .whereRef('albums_assets_assets.assetsId', '=', 'assets.id')
-                  .where('assets.deletedAt', 'is', null)
+                  .selectFrom('asset')
+                  .selectAll('asset')
+                  .whereRef('album_asset.assetsId', '=', 'asset.id')
+                  .where('asset.deletedAt', 'is', null)
                   .innerJoinLateral(
                     (eb) =>
                       eb
-                        .selectFrom('exif')
-                        .selectAll('exif')
-                        .whereRef('exif.assetId', '=', 'assets.id')
-                        .as('assets_exifInfo'),
+                        .selectFrom('asset_exif')
+                        .selectAll('asset_exif')
+                        .whereRef('asset_exif.assetId', '=', 'asset.id')
+                        .as('exifInfo'),
                     (join) => join.onTrue(),
                   )
-                  .select((eb) => eb.fn.toJson(eb.table('assets_exifInfo')).as('exifInfo'))
-                  .orderBy('assets.fileCreatedAt', 'asc')
+                  .select((eb) => eb.fn.toJson(eb.table('exifInfo')).as('exifInfo'))
+                  .orderBy('asset.fileCreatedAt', 'asc')
                   .as('assets'),
               (join) => join.onTrue(),
             )
             .innerJoinLateral(
               (eb) =>
                 eb
-                  .selectFrom('users')
-                  .selectAll('users')
-                  .whereRef('users.id', '=', 'albums.ownerId')
-                  .where('users.deletedAt', 'is', null)
+                  .selectFrom('user')
+                  .selectAll('user')
+                  .whereRef('user.id', '=', 'album.ownerId')
+                  .where('user.deletedAt', 'is', null)
                   .as('owner'),
               (join) => join.onTrue(),
             )
@@ -84,7 +89,7 @@ export class SharedLinkRepository {
               eb.fn.coalesce(eb.fn.jsonAgg('assets').filterWhere('assets.id', 'is not', null), sql`'[]'`).as('assets'),
             )
             .select((eb) => eb.fn.toJson('owner').as('owner'))
-            .groupBy(['albums.id', sql`"owner".*`])
+            .groupBy(['album.id', sql`"owner".*`])
             .as('album'),
         (join) => join.onTrue(),
       )
@@ -94,29 +99,29 @@ export class SharedLinkRepository {
           .$castTo<MapAsset[]>()
           .as('assets'),
       )
-      .groupBy(['shared_links.id', sql`"album".*`])
+      .groupBy(['shared_link.id', sql`"album".*`])
       .select((eb) => eb.fn.toJson('album').$castTo<Album | null>().as('album'))
-      .where('shared_links.id', '=', id)
-      .where('shared_links.userId', '=', userId)
-      .where((eb) => eb.or([eb('shared_links.type', '=', SharedLinkType.INDIVIDUAL), eb('album.id', 'is not', null)]))
-      .orderBy('shared_links.createdAt', 'desc')
+      .where('shared_link.id', '=', id)
+      .where('shared_link.userId', '=', userId)
+      .where((eb) => eb.or([eb('shared_link.type', '=', SharedLinkType.INDIVIDUAL), eb('album.id', 'is not', null)]))
+      .orderBy('shared_link.createdAt', 'desc')
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [{ userId: DummyValue.UUID, albumId: DummyValue.UUID }] })
   getAll({ userId, albumId }: SharedLinkSearchOptions) {
     return this.db
-      .selectFrom('shared_links')
-      .selectAll('shared_links')
-      .where('shared_links.userId', '=', userId)
-      .leftJoin('shared_link__asset', 'shared_link__asset.sharedLinksId', 'shared_links.id')
+      .selectFrom('shared_link')
+      .selectAll('shared_link')
+      .where('shared_link.userId', '=', userId)
+      .leftJoin('shared_link_asset', 'shared_link_asset.sharedLinksId', 'shared_link.id')
       .leftJoinLateral(
         (eb) =>
           eb
-            .selectFrom('assets')
-            .select((eb) => eb.fn.jsonAgg('assets').as('assets'))
-            .whereRef('assets.id', '=', 'shared_link__asset.assetsId')
-            .where('assets.deletedAt', 'is', null)
+            .selectFrom('asset')
+            .select((eb) => eb.fn.jsonAgg('asset').as('assets'))
+            .whereRef('asset.id', '=', 'shared_link_asset.assetsId')
+            .where('asset.deletedAt', 'is', null)
             .as('assets'),
         (join) => join.onTrue(),
       )
@@ -125,75 +130,75 @@ export class SharedLinkRepository {
       .leftJoinLateral(
         (eb) =>
           eb
-            .selectFrom('albums')
-            .selectAll('albums')
-            .whereRef('albums.id', '=', 'shared_links.albumId')
+            .selectFrom('album')
+            .selectAll('album')
+            .whereRef('album.id', '=', 'shared_link.albumId')
             .innerJoinLateral(
               (eb) =>
                 eb
-                  .selectFrom('users')
+                  .selectFrom('user')
                   .select([
-                    'users.id',
-                    'users.email',
-                    'users.createdAt',
-                    'users.profileImagePath',
-                    'users.isAdmin',
-                    'users.shouldChangePassword',
-                    'users.deletedAt',
-                    'users.oauthId',
-                    'users.updatedAt',
-                    'users.storageLabel',
-                    'users.name',
-                    'users.quotaSizeInBytes',
-                    'users.quotaUsageInBytes',
-                    'users.status',
-                    'users.profileChangedAt',
+                    'user.id',
+                    'user.email',
+                    'user.createdAt',
+                    'user.profileImagePath',
+                    'user.isAdmin',
+                    'user.shouldChangePassword',
+                    'user.deletedAt',
+                    'user.oauthId',
+                    'user.updatedAt',
+                    'user.storageLabel',
+                    'user.name',
+                    'user.quotaSizeInBytes',
+                    'user.quotaUsageInBytes',
+                    'user.status',
+                    'user.profileChangedAt',
                   ])
-                  .whereRef('users.id', '=', 'albums.ownerId')
-                  .where('users.deletedAt', 'is', null)
+                  .whereRef('user.id', '=', 'album.ownerId')
+                  .where('user.deletedAt', 'is', null)
                   .as('owner'),
               (join) => join.onTrue(),
             )
             .select((eb) => eb.fn.toJson('owner').as('owner'))
-            .where('albums.deletedAt', 'is', null)
+            .where('album.deletedAt', 'is', null)
             .as('album'),
         (join) => join.onTrue(),
       )
       .select((eb) => eb.fn.toJson('album').$castTo<Album | null>().as('album'))
-      .where((eb) => eb.or([eb('shared_links.type', '=', SharedLinkType.INDIVIDUAL), eb('album.id', 'is not', null)]))
-      .$if(!!albumId, (eb) => eb.where('shared_links.albumId', '=', albumId!))
-      .orderBy('shared_links.createdAt', 'desc')
-      .distinctOn(['shared_links.createdAt'])
+      .where((eb) => eb.or([eb('shared_link.type', '=', SharedLinkType.INDIVIDUAL), eb('album.id', 'is not', null)]))
+      .$if(!!albumId, (eb) => eb.where('shared_link.albumId', '=', albumId!))
+      .orderBy('shared_link.createdAt', 'desc')
+      .distinctOn(['shared_link.createdAt'])
       .execute();
   }
 
   @GenerateSql({ params: [DummyValue.BUFFER] })
   async getByKey(key: Buffer) {
     return this.db
-      .selectFrom('shared_links')
-      .where('shared_links.key', '=', key)
-      .leftJoin('albums', 'albums.id', 'shared_links.albumId')
-      .where('albums.deletedAt', 'is', null)
+      .selectFrom('shared_link')
+      .where('shared_link.key', '=', key)
+      .leftJoin('album', 'album.id', 'shared_link.albumId')
+      .where('album.deletedAt', 'is', null)
       .select((eb) => [
         ...columns.authSharedLink,
         jsonObjectFrom(
-          eb.selectFrom('users').select(columns.authUser).whereRef('users.id', '=', 'shared_links.userId'),
+          eb.selectFrom('user').select(columns.authUser).whereRef('user.id', '=', 'shared_link.userId'),
         ).as('user'),
       ])
-      .where((eb) => eb.or([eb('shared_links.type', '=', SharedLinkType.INDIVIDUAL), eb('albums.id', 'is not', null)]))
+      .where((eb) => eb.or([eb('shared_link.type', '=', SharedLinkType.INDIVIDUAL), eb('album.id', 'is not', null)]))
       .executeTakeFirst();
   }
 
   async create(entity: Insertable<SharedLinkTable> & { assetIds?: string[] }) {
     const { id } = await this.db
-      .insertInto('shared_links')
+      .insertInto('shared_link')
       .values(_.omit(entity, 'assetIds'))
       .returningAll()
       .executeTakeFirstOrThrow();
 
     if (entity.assetIds && entity.assetIds.length > 0) {
       await this.db
-        .insertInto('shared_link__asset')
+        .insertInto('shared_link_asset')
         .values(entity.assetIds!.map((assetsId) => ({ assetsId, sharedLinksId: id })))
         .execute();
     }
@@ -203,15 +208,15 @@ export class SharedLinkRepository {
 
   async update(entity: Updateable<SharedLinkTable> & { id: string; assetIds?: string[] }) {
     const { id } = await this.db
-      .updateTable('shared_links')
+      .updateTable('shared_link')
       .set(_.omit(entity, 'assets', 'album', 'assetIds'))
-      .where('shared_links.id', '=', entity.id)
+      .where('shared_link.id', '=', entity.id)
       .returningAll()
       .executeTakeFirstOrThrow();
 
     if (entity.assetIds && entity.assetIds.length > 0) {
       await this.db
-        .insertInto('shared_link__asset')
+        .insertInto('shared_link_asset')
         .values(entity.assetIds!.map((assetsId) => ({ assetsId, sharedLinksId: id })))
         .execute();
     }
@@ -220,23 +225,24 @@ export class SharedLinkRepository {
   }
 
   async remove(id: string): Promise<void> {
-    await this.db.deleteFrom('shared_links').where('shared_links.id', '=', id).execute();
+    await this.db.deleteFrom('shared_link').where('shared_link.id', '=', id).execute();
   }
 
   private getSharedLinks(id: string) {
     return this.db
-      .selectFrom('shared_links')
-      .selectAll('shared_links')
-      .where('shared_links.id', '=', id)
-      .leftJoin('shared_link__asset', 'shared_link__asset.sharedLinksId', 'shared_links.id')
+      .selectFrom('shared_link')
+      .selectAll('shared_link')
+      .where('shared_link.id', '=', id)
+      .leftJoin('shared_link_asset', 'shared_link_asset.sharedLinksId', 'shared_link.id')
       .leftJoinLateral(
         (eb) =>
           eb
-            .selectFrom('assets')
-            .whereRef('assets.id', '=', 'shared_link__asset.assetsId')
-            .selectAll('assets')
+            .selectFrom('asset')
+            .whereRef('asset.id', '=', 'shared_link_asset.assetsId')
+            .selectAll('asset')
             .innerJoinLateral(
-              (eb) => eb.selectFrom('exif').whereRef('exif.assetId', '=', 'assets.id').selectAll().as('exif'),
+              (eb) =>
+                eb.selectFrom('asset_exif').whereRef('asset_exif.assetId', '=', 'asset.id').selectAll().as('exif'),
               (join) => join.onTrue(),
             )
             .as('assets'),
@@ -248,7 +254,7 @@ export class SharedLinkRepository {
           .$castTo<MapAsset[]>()
           .as('assets'),
       )
-      .groupBy('shared_links.id')
+      .groupBy('shared_link.id')
       .executeTakeFirstOrThrow();
   }
 }
diff --git a/server/src/repositories/stack.repository.ts b/server/src/repositories/stack.repository.ts
index c049a19373..fe16c8b5eb 100644
--- a/server/src/repositories/stack.repository.ts
+++ b/server/src/repositories/stack.repository.ts
@@ -13,29 +13,34 @@ export interface StackSearch {
   primaryAssetId?: string;
 }
 
-const withAssets = (eb: ExpressionBuilder<DB, 'asset_stack'>, withTags = false) => {
+const withAssets = (eb: ExpressionBuilder<DB, 'stack'>, withTags = false) => {
   return jsonArrayFrom(
     eb
-      .selectFrom('assets')
-      .selectAll('assets')
+      .selectFrom('asset')
+      .selectAll('asset')
       .innerJoinLateral(
-        (eb) => eb.selectFrom('exif').select(columns.exif).whereRef('exif.assetId', '=', 'assets.id').as('exifInfo'),
+        (eb) =>
+          eb
+            .selectFrom('asset_exif')
+            .select(columns.exif)
+            .whereRef('asset_exif.assetId', '=', 'asset.id')
+            .as('exifInfo'),
         (join) => join.onTrue(),
       )
       .$if(withTags, (eb) =>
         eb.select((eb) =>
           jsonArrayFrom(
             eb
-              .selectFrom('tags')
+              .selectFrom('tag')
               .select(columns.tag)
-              .innerJoin('tag_asset', 'tags.id', 'tag_asset.tagsId')
-              .whereRef('tag_asset.assetsId', '=', 'assets.id'),
+              .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagsId')
+              .whereRef('tag_asset.assetsId', '=', 'asset.id'),
           ).as('tags'),
         ),
       )
       .select((eb) => eb.fn.toJson('exifInfo').as('exifInfo'))
-      .where('assets.deletedAt', 'is', null)
-      .whereRef('assets.stackId', '=', 'asset_stack.id')
+      .where('asset.deletedAt', 'is', null)
+      .whereRef('asset.stackId', '=', 'stack.id')
       .$call(withDefaultVisibility),
   ).as('assets');
 };
@@ -47,28 +52,28 @@ export class StackRepository {
   @GenerateSql({ params: [{ ownerId: DummyValue.UUID }] })
   search(query: StackSearch) {
     return this.db
-      .selectFrom('asset_stack')
-      .selectAll('asset_stack')
+      .selectFrom('stack')
+      .selectAll('stack')
       .select(withAssets)
-      .where('asset_stack.ownerId', '=', query.ownerId)
-      .$if(!!query.primaryAssetId, (eb) => eb.where('asset_stack.primaryAssetId', '=', query.primaryAssetId!))
+      .where('stack.ownerId', '=', query.ownerId)
+      .$if(!!query.primaryAssetId, (eb) => eb.where('stack.primaryAssetId', '=', query.primaryAssetId!))
       .execute();
   }
 
   async create(entity: Omit<Insertable<StackTable>, 'primaryAssetId'>, assetIds: string[]) {
     return this.db.transaction().execute(async (tx) => {
       const stacks = await tx
-        .selectFrom('asset_stack')
-        .where('asset_stack.ownerId', '=', entity.ownerId)
-        .where('asset_stack.primaryAssetId', 'in', assetIds)
-        .select('asset_stack.id')
+        .selectFrom('stack')
+        .where('stack.ownerId', '=', entity.ownerId)
+        .where('stack.primaryAssetId', 'in', assetIds)
+        .select('stack.id')
         .select((eb) =>
           jsonArrayFrom(
             eb
-              .selectFrom('assets')
-              .select('assets.id')
-              .whereRef('assets.stackId', '=', 'asset_stack.id')
-              .where('assets.deletedAt', 'is', null),
+              .selectFrom('asset')
+              .select('asset.id')
+              .whereRef('asset.stackId', '=', 'stack.id')
+              .where('asset.deletedAt', 'is', null),
           ).as('assets'),
         )
         .execute();
@@ -86,7 +91,7 @@ export class StackRepository {
 
       if (stacks.length > 0) {
         await tx
-          .deleteFrom('asset_stack')
+          .deleteFrom('stack')
           .where(
             'id',
             'in',
@@ -96,13 +101,13 @@ export class StackRepository {
       }
 
       const newRecord = await tx
-        .insertInto('asset_stack')
+        .insertInto('stack')
         .values({ ...entity, primaryAssetId: assetIds[0] })
         .returning('id')
         .executeTakeFirstOrThrow();
 
       await tx
-        .updateTable('assets')
+        .updateTable('asset')
         .set({
           stackId: newRecord.id,
           updatedAt: new Date(),
@@ -111,8 +116,8 @@ export class StackRepository {
         .execute();
 
       return tx
-        .selectFrom('asset_stack')
-        .selectAll('asset_stack')
+        .selectFrom('stack')
+        .selectAll('stack')
         .select(withAssets)
         .where('id', '=', newRecord.id)
         .executeTakeFirstOrThrow();
@@ -121,19 +126,19 @@ export class StackRepository {
 
   @GenerateSql({ params: [DummyValue.UUID] })
   async delete(id: string): Promise<void> {
-    await this.db.deleteFrom('asset_stack').where('id', '=', asUuid(id)).execute();
+    await this.db.deleteFrom('stack').where('id', '=', asUuid(id)).execute();
   }
 
   async deleteAll(ids: string[]): Promise<void> {
-    await this.db.deleteFrom('asset_stack').where('id', 'in', ids).execute();
+    await this.db.deleteFrom('stack').where('id', 'in', ids).execute();
   }
 
   update(id: string, entity: Updateable<StackTable>) {
     return this.db
-      .updateTable('asset_stack')
+      .updateTable('stack')
       .set(entity)
       .where('id', '=', asUuid(id))
-      .returningAll('asset_stack')
+      .returningAll('stack')
       .returning((eb) => withAssets(eb, true))
       .executeTakeFirstOrThrow();
   }
@@ -141,7 +146,7 @@ export class StackRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   getById(id: string) {
     return this.db
-      .selectFrom('asset_stack')
+      .selectFrom('stack')
       .selectAll()
       .select((eb) => withAssets(eb, true))
       .where('id', '=', asUuid(id))
diff --git a/server/src/repositories/sync-checkpoint.repository.ts b/server/src/repositories/sync-checkpoint.repository.ts
index 5133ba8904..65fd018136 100644
--- a/server/src/repositories/sync-checkpoint.repository.ts
+++ b/server/src/repositories/sync-checkpoint.repository.ts
@@ -13,7 +13,7 @@ export class SyncCheckpointRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   getAll(sessionId: string) {
     return this.db
-      .selectFrom('session_sync_checkpoints')
+      .selectFrom('session_sync_checkpoint')
       .select(['type', 'ack'])
       .where('sessionId', '=', sessionId)
       .execute();
@@ -21,7 +21,7 @@ export class SyncCheckpointRepository {
 
   upsertAll(items: Insertable<SessionSyncCheckpointTable>[]) {
     return this.db
-      .insertInto('session_sync_checkpoints')
+      .insertInto('session_sync_checkpoint')
       .values(items)
       .onConflict((oc) =>
         oc.columns(['sessionId', 'type']).doUpdateSet((eb) => ({
@@ -34,7 +34,7 @@ export class SyncCheckpointRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   deleteAll(sessionId: string, types?: SyncEntityType[]) {
     return this.db
-      .deleteFrom('session_sync_checkpoints')
+      .deleteFrom('session_sync_checkpoint')
       .where('sessionId', '=', sessionId)
       .$if(!!types, (qb) => qb.where('type', 'in', types!))
       .execute();
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index f9d65f7244..34c450d52d 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -7,27 +7,27 @@ import { DB } from 'src/schema';
 import { SyncAck } from 'src/types';
 
 type AuditTables =
-  | 'users_audit'
-  | 'partners_audit'
-  | 'assets_audit'
-  | 'albums_audit'
-  | 'album_users_audit'
-  | 'album_assets_audit'
-  | 'memories_audit'
-  | 'memory_assets_audit'
-  | 'stacks_audit'
+  | 'user_audit'
+  | 'partner_audit'
+  | 'asset_audit'
+  | 'album_audit'
+  | 'album_user_audit'
+  | 'album_asset_audit'
+  | 'memory_audit'
+  | 'memory_asset_audit'
+  | 'stack_audit'
   | 'person_audit'
   | 'user_metadata_audit';
 type UpsertTables =
-  | 'users'
-  | 'partners'
-  | 'assets'
-  | 'exif'
-  | 'albums'
-  | 'albums_shared_users_users'
-  | 'memories'
-  | 'memories_assets_assets'
-  | 'asset_stack'
+  | 'user'
+  | 'partner'
+  | 'asset'
+  | 'asset_exif'
+  | 'album'
+  | 'album_user'
+  | 'memory'
+  | 'memory_asset'
+  | 'stack'
   | 'person'
   | 'user_metadata';
 
@@ -100,7 +100,7 @@ class AlbumSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
   getCreatedAfter(userId: string, afterCreateId?: string) {
     return this.db
-      .selectFrom('albums_shared_users_users')
+      .selectFrom('album_user')
       .select(['albumsId as id', 'createId'])
       .where('usersId', '=', userId)
       .$if(!!afterCreateId, (qb) => qb.where('createId', '>=', afterCreateId!))
@@ -112,7 +112,7 @@ class AlbumSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getDeletes(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('albums_audit')
+      .selectFrom('album_audit')
       .select(['id', 'albumId'])
       .where('userId', '=', userId)
       .$call(this.auditTableFilters(ack))
@@ -122,24 +122,24 @@ class AlbumSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('albums')
-      .distinctOn(['albums.id', 'albums.updateId'])
-      .where('albums.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('albums.updateId', '>', ack!.updateId))
-      .orderBy('albums.updateId', 'asc')
-      .leftJoin('albums_shared_users_users as album_users', 'albums.id', 'album_users.albumsId')
-      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .selectFrom('album')
+      .distinctOn(['album.id', 'album.updateId'])
+      .where('album.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('album.updateId', '>', ack!.updateId))
+      .orderBy('album.updateId', 'asc')
+      .leftJoin('album_user as album_users', 'album.id', 'album_users.albumsId')
+      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
       .select([
-        'albums.id',
-        'albums.ownerId',
-        'albums.albumName as name',
-        'albums.description',
-        'albums.createdAt',
-        'albums.updatedAt',
-        'albums.albumThumbnailAssetId as thumbnailAssetId',
-        'albums.isActivityEnabled',
-        'albums.order',
-        'albums.updateId',
+        'album.id',
+        'album.ownerId',
+        'album.albumName as name',
+        'album.description',
+        'album.createdAt',
+        'album.updatedAt',
+        'album.albumThumbnailAssetId as thumbnailAssetId',
+        'album.isActivityEnabled',
+        'album.order',
+        'album.updateId',
       ])
       .stream();
   }
@@ -149,31 +149,31 @@ class AlbumAssetSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
   getBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
     return this.db
-      .selectFrom('assets')
-      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'assets.id')
+      .selectFrom('asset')
+      .innerJoin('album_asset', 'album_asset.assetsId', 'asset.id')
       .select(columns.syncAsset)
-      .select('assets.updateId')
-      .where('album_assets.albumsId', '=', albumId)
-      .where('assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .where('assets.updateId', '<=', beforeUpdateId)
-      .$if(!!afterUpdateId, (eb) => eb.where('assets.updateId', '>=', afterUpdateId!))
-      .orderBy('assets.updateId', 'asc')
+      .select('asset.updateId')
+      .where('album_asset.albumsId', '=', albumId)
+      .where('asset.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('asset.updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('asset.updateId', '>=', afterUpdateId!))
+      .orderBy('asset.updateId', 'asc')
       .stream();
   }
 
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('assets')
-      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'assets.id')
+      .selectFrom('asset')
+      .innerJoin('album_asset', 'album_asset.assetsId', 'asset.id')
       .select(columns.syncAsset)
-      .select('assets.updateId')
-      .where('assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('assets.updateId', '>', ack!.updateId))
-      .orderBy('assets.updateId', 'asc')
-      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
-      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
-      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .select('asset.updateId')
+      .where('asset.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('asset.updateId', '>', ack!.updateId))
+      .orderBy('asset.updateId', 'asc')
+      .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)]))
       .stream();
   }
 }
@@ -182,31 +182,31 @@ class AlbumAssetExifSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
   getBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
     return this.db
-      .selectFrom('exif')
-      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'exif.assetId')
+      .selectFrom('asset_exif')
+      .innerJoin('album_asset', 'album_asset.assetsId', 'asset_exif.assetId')
       .select(columns.syncAssetExif)
-      .select('exif.updateId')
-      .where('album_assets.albumsId', '=', albumId)
-      .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .where('exif.updateId', '<=', beforeUpdateId)
-      .$if(!!afterUpdateId, (eb) => eb.where('exif.updateId', '>=', afterUpdateId!))
-      .orderBy('exif.updateId', 'asc')
+      .select('asset_exif.updateId')
+      .where('album_asset.albumsId', '=', albumId)
+      .where('asset_exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('asset_exif.updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('asset_exif.updateId', '>=', afterUpdateId!))
+      .orderBy('asset_exif.updateId', 'asc')
       .stream();
   }
 
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('exif')
-      .innerJoin('albums_assets_assets as album_assets', 'album_assets.assetsId', 'exif.assetId')
+      .selectFrom('asset_exif')
+      .innerJoin('album_asset', 'album_asset.assetsId', 'asset_exif.assetId')
       .select(columns.syncAssetExif)
-      .select('exif.updateId')
-      .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('exif.updateId', '>', ack!.updateId))
-      .orderBy('exif.updateId', 'asc')
-      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
-      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
-      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .select('asset_exif.updateId')
+      .where('asset_exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('asset_exif.updateId', '>', ack!.updateId))
+      .orderBy('asset_exif.updateId', 'asc')
+      .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)]))
       .stream();
   }
 }
@@ -215,7 +215,7 @@ class AlbumToAssetSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
   getBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
     return this.db
-      .selectFrom('albums_assets_assets as album_assets')
+      .selectFrom('album_asset as album_assets')
       .select(['album_assets.assetsId as assetId', 'album_assets.albumsId as albumId', 'album_assets.updateId'])
       .where('album_assets.albumsId', '=', albumId)
       .where('album_assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
@@ -228,22 +228,22 @@ class AlbumToAssetSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getDeletes(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('album_assets_audit')
+      .selectFrom('album_asset_audit')
       .select(['id', 'assetId', 'albumId'])
       .where((eb) =>
         eb(
           'albumId',
           'in',
           eb
-            .selectFrom('albums')
+            .selectFrom('album')
             .select(['id'])
             .where('ownerId', '=', userId)
             .union((eb) =>
               eb.parens(
                 eb
-                  .selectFrom('albums_shared_users_users as albumUsers')
-                  .select(['albumUsers.albumsId as id'])
-                  .where('albumUsers.usersId', '=', userId),
+                  .selectFrom('album_user')
+                  .select(['album_user.albumsId as id'])
+                  .where('album_user.usersId', '=', userId),
               ),
             ),
         ),
@@ -255,14 +255,14 @@ class AlbumToAssetSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('albums_assets_assets as album_assets')
-      .select(['album_assets.assetsId as assetId', 'album_assets.albumsId as albumId', 'album_assets.updateId'])
-      .where('album_assets.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('album_assets.updateId', '>', ack!.updateId))
-      .orderBy('album_assets.updateId', 'asc')
-      .innerJoin('albums', 'albums.id', 'album_assets.albumsId')
-      .leftJoin('albums_shared_users_users as album_users', 'album_users.albumsId', 'album_assets.albumsId')
-      .where((eb) => eb.or([eb('albums.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .selectFrom('album_asset')
+      .select(['album_asset.assetsId as assetId', 'album_asset.albumsId as albumId', 'album_asset.updateId'])
+      .where('album_asset.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('album_asset.updateId', '>', ack!.updateId))
+      .orderBy('album_asset.updateId', 'asc')
+      .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)]))
       .stream();
   }
 }
@@ -271,9 +271,9 @@ class AlbumUserSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
   getBackfill(albumId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
     return this.db
-      .selectFrom('albums_shared_users_users as album_users')
+      .selectFrom('album_user')
       .select(columns.syncAlbumUser)
-      .select('album_users.updateId')
+      .select('album_user.updateId')
       .where('albumsId', '=', albumId)
       .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
       .where('updateId', '<=', beforeUpdateId)
@@ -285,22 +285,22 @@ class AlbumUserSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getDeletes(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('album_users_audit')
+      .selectFrom('album_user_audit')
       .select(['id', 'userId', 'albumId'])
       .where((eb) =>
         eb(
           'albumId',
           'in',
           eb
-            .selectFrom('albums')
+            .selectFrom('album')
             .select(['id'])
             .where('ownerId', '=', userId)
             .union((eb) =>
               eb.parens(
                 eb
-                  .selectFrom('albums_shared_users_users as albumUsers')
-                  .select(['albumUsers.albumsId as id'])
-                  .where('albumUsers.usersId', '=', userId),
+                  .selectFrom('album_user')
+                  .select(['album_user.albumsId as id'])
+                  .where('album_user.usersId', '=', userId),
               ),
             ),
         ),
@@ -312,24 +312,24 @@ class AlbumUserSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('albums_shared_users_users as album_users')
+      .selectFrom('album_user')
       .select(columns.syncAlbumUser)
-      .select('album_users.updateId')
-      .where('album_users.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .$if(!!ack, (qb) => qb.where('album_users.updateId', '>', ack!.updateId))
-      .orderBy('album_users.updateId', 'asc')
+      .select('album_user.updateId')
+      .where('album_user.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('album_user.updateId', '>', ack!.updateId))
+      .orderBy('album_user.updateId', 'asc')
       .where((eb) =>
         eb(
-          'album_users.albumsId',
+          'album_user.albumsId',
           'in',
           eb
-            .selectFrom('albums')
+            .selectFrom('album')
             .select(['id'])
             .where('ownerId', '=', userId)
             .union((eb) =>
               eb.parens(
                 eb
-                  .selectFrom('albums_shared_users_users as albumUsers')
+                  .selectFrom('album_user as albumUsers')
                   .select(['albumUsers.albumsId as id'])
                   .where('albumUsers.usersId', '=', userId),
               ),
@@ -344,7 +344,7 @@ class AssetSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getDeletes(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('assets_audit')
+      .selectFrom('asset_audit')
       .select(['id', 'assetId'])
       .where('ownerId', '=', userId)
       .$call(this.auditTableFilters(ack))
@@ -354,9 +354,9 @@ class AssetSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select(columns.syncAsset)
-      .select('assets.updateId')
+      .select('asset.updateId')
       .where('ownerId', '=', userId)
       .$call(this.upsertTableFilters(ack))
       .stream();
@@ -402,10 +402,10 @@ class AssetExifSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('exif')
+      .selectFrom('asset_exif')
       .select(columns.syncAssetExif)
-      .select('exif.updateId')
-      .where('assetId', 'in', (eb) => eb.selectFrom('assets').select('id').where('ownerId', '=', userId))
+      .select('asset_exif.updateId')
+      .where('assetId', 'in', (eb) => eb.selectFrom('asset').select('id').where('ownerId', '=', userId))
       .$call(this.upsertTableFilters(ack))
       .stream();
   }
@@ -415,7 +415,7 @@ class MemorySync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getDeletes(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('memories_audit')
+      .selectFrom('memory_audit')
       .select(['id', 'memoryId'])
       .where('userId', '=', userId)
       .$call(this.auditTableFilters(ack))
@@ -425,7 +425,7 @@ class MemorySync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('memories')
+      .selectFrom('memory')
       .select([
         'id',
         'createdAt',
@@ -451,9 +451,9 @@ class MemoryToAssetSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getDeletes(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('memory_assets_audit')
+      .selectFrom('memory_asset_audit')
       .select(['id', 'memoryId', 'assetId'])
-      .where('memoryId', 'in', (eb) => eb.selectFrom('memories').select('id').where('ownerId', '=', userId))
+      .where('memoryId', 'in', (eb) => eb.selectFrom('memory').select('id').where('ownerId', '=', userId))
       .$call(this.auditTableFilters(ack))
       .stream();
   }
@@ -461,10 +461,10 @@ class MemoryToAssetSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('memories_assets_assets')
+      .selectFrom('memory_asset')
       .select(['memoriesId as memoryId', 'assetsId as assetId'])
       .select('updateId')
-      .where('memoriesId', 'in', (eb) => eb.selectFrom('memories').select('id').where('ownerId', '=', userId))
+      .where('memoriesId', 'in', (eb) => eb.selectFrom('memory').select('id').where('ownerId', '=', userId))
       .$call(this.upsertTableFilters(ack))
       .stream();
   }
@@ -474,19 +474,19 @@ class PartnerSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
   getCreatedAfter(userId: string, afterCreateId?: string) {
     return this.db
-      .selectFrom('partners')
+      .selectFrom('partner')
       .select(['sharedById', 'createId'])
       .where('sharedWithId', '=', userId)
       .$if(!!afterCreateId, (qb) => qb.where('createId', '>=', afterCreateId!))
       .where('createdAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .orderBy('partners.createId', 'asc')
+      .orderBy('partner.createId', 'asc')
       .execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getDeletes(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('partners_audit')
+      .selectFrom('partner_audit')
       .select(['id', 'sharedById', 'sharedWithId'])
       .where((eb) => eb.or([eb('sharedById', '=', userId), eb('sharedWithId', '=', userId)]))
       .$call(this.auditTableFilters(ack))
@@ -496,7 +496,7 @@ class PartnerSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('partners')
+      .selectFrom('partner')
       .select(['sharedById', 'sharedWithId', 'inTimeline', 'updateId'])
       .where((eb) => eb.or([eb('sharedById', '=', userId), eb('sharedWithId', '=', userId)]))
       .$call(this.upsertTableFilters(ack))
@@ -508,9 +508,9 @@ class PartnerAssetsSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
   getBackfill(partnerId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
     return this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select(columns.syncAsset)
-      .select('assets.updateId')
+      .select('asset.updateId')
       .where('ownerId', '=', partnerId)
       .where('updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
       .where('updateId', '<=', beforeUpdateId)
@@ -522,10 +522,10 @@ class PartnerAssetsSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getDeletes(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('assets_audit')
+      .selectFrom('asset_audit')
       .select(['id', 'assetId'])
       .where('ownerId', 'in', (eb) =>
-        eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
+        eb.selectFrom('partner').select(['sharedById']).where('sharedWithId', '=', userId),
       )
       .$call(this.auditTableFilters(ack))
       .stream();
@@ -534,11 +534,11 @@ class PartnerAssetsSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('assets')
+      .selectFrom('asset')
       .select(columns.syncAsset)
-      .select('assets.updateId')
+      .select('asset.updateId')
       .where('ownerId', 'in', (eb) =>
-        eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
+        eb.selectFrom('partner').select(['sharedById']).where('sharedWithId', '=', userId),
       )
       .$call(this.upsertTableFilters(ack))
       .stream();
@@ -549,30 +549,30 @@ class PartnerAssetExifsSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
   getBackfill(partnerId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
     return this.db
-      .selectFrom('exif')
+      .selectFrom('asset_exif')
       .select(columns.syncAssetExif)
-      .select('exif.updateId')
-      .innerJoin('assets', 'assets.id', 'exif.assetId')
-      .where('assets.ownerId', '=', partnerId)
-      .where('exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
-      .where('exif.updateId', '<=', beforeUpdateId)
-      .$if(!!afterUpdateId, (eb) => eb.where('exif.updateId', '>=', afterUpdateId!))
-      .orderBy('exif.updateId', 'asc')
+      .select('asset_exif.updateId')
+      .innerJoin('asset', 'asset.id', 'asset_exif.assetId')
+      .where('asset.ownerId', '=', partnerId)
+      .where('asset_exif.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .where('asset_exif.updateId', '<=', beforeUpdateId)
+      .$if(!!afterUpdateId, (eb) => eb.where('asset_exif.updateId', '>=', afterUpdateId!))
+      .orderBy('asset_exif.updateId', 'asc')
       .stream();
   }
 
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('exif')
+      .selectFrom('asset_exif')
       .select(columns.syncAssetExif)
-      .select('exif.updateId')
+      .select('asset_exif.updateId')
       .where('assetId', 'in', (eb) =>
         eb
-          .selectFrom('assets')
+          .selectFrom('asset')
           .select('id')
           .where('ownerId', 'in', (eb) =>
-            eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
+            eb.selectFrom('partner').select(['sharedById']).where('sharedWithId', '=', userId),
           ),
       )
       .$call(this.upsertTableFilters(ack))
@@ -584,7 +584,7 @@ class StackSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getDeletes(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('stacks_audit')
+      .selectFrom('stack_audit')
       .select(['id', 'stackId'])
       .where('userId', '=', userId)
       .$call(this.auditTableFilters(ack))
@@ -594,7 +594,7 @@ class StackSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('asset_stack')
+      .selectFrom('stack')
       .select(columns.syncStack)
       .select('updateId')
       .where('ownerId', '=', userId)
@@ -607,11 +607,9 @@ class PartnerStackSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getDeletes(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('stacks_audit')
+      .selectFrom('stack_audit')
       .select(['id', 'stackId'])
-      .where('userId', 'in', (eb) =>
-        eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
-      )
+      .where('userId', 'in', (eb) => eb.selectFrom('partner').select(['sharedById']).where('sharedWithId', '=', userId))
       .$call(this.auditTableFilters(ack))
       .stream();
   }
@@ -619,7 +617,7 @@ class PartnerStackSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID, DummyValue.UUID], stream: true })
   getBackfill(partnerId: string, afterUpdateId: string | undefined, beforeUpdateId: string) {
     return this.db
-      .selectFrom('asset_stack')
+      .selectFrom('stack')
       .select(columns.syncStack)
       .select('updateId')
       .where('ownerId', '=', partnerId)
@@ -633,11 +631,11 @@ class PartnerStackSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
     return this.db
-      .selectFrom('asset_stack')
+      .selectFrom('stack')
       .select(columns.syncStack)
       .select('updateId')
       .where('ownerId', 'in', (eb) =>
-        eb.selectFrom('partners').select(['sharedById']).where('sharedWithId', '=', userId),
+        eb.selectFrom('partner').select(['sharedById']).where('sharedWithId', '=', userId),
       )
       .$call(this.upsertTableFilters(ack))
       .stream();
@@ -647,13 +645,13 @@ class PartnerStackSync extends BaseSync {
 class UserSync extends BaseSync {
   @GenerateSql({ params: [], stream: true })
   getDeletes(ack?: SyncAck) {
-    return this.db.selectFrom('users_audit').select(['id', 'userId']).$call(this.auditTableFilters(ack)).stream();
+    return this.db.selectFrom('user_audit').select(['id', 'userId']).$call(this.auditTableFilters(ack)).stream();
   }
 
   @GenerateSql({ params: [], stream: true })
   getUpserts(ack?: SyncAck) {
     return this.db
-      .selectFrom('users')
+      .selectFrom('user')
       .select(['id', 'name', 'email', 'deletedAt', 'updateId'])
       .$call(this.upsertTableFilters(ack))
       .stream();
diff --git a/server/src/repositories/tag.repository.ts b/server/src/repositories/tag.repository.ts
index 1c38242f53..9bbb62bd8b 100644
--- a/server/src/repositories/tag.repository.ts
+++ b/server/src/repositories/tag.repository.ts
@@ -19,13 +19,13 @@ export class TagRepository {
 
   @GenerateSql({ params: [DummyValue.UUID] })
   get(id: string) {
-    return this.db.selectFrom('tags').select(columns.tag).where('id', '=', id).executeTakeFirst();
+    return this.db.selectFrom('tag').select(columns.tag).where('id', '=', id).executeTakeFirst();
   }
 
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.STRING] })
   getByValue(userId: string, value: string) {
     return this.db
-      .selectFrom('tags')
+      .selectFrom('tag')
       .select(columns.tag)
       .where('userId', '=', userId)
       .where('value', '=', value)
@@ -37,7 +37,7 @@ export class TagRepository {
     const parentId = _parentId ?? null;
     return this.db.transaction().execute(async (tx) => {
       const tag = await this.db
-        .insertInto('tags')
+        .insertInto('tag')
         .values({ userId, value, parentId })
         .onConflict((oc) => oc.columns(['userId', 'value']).doUpdateSet({ parentId }))
         .returning(columns.tag)
@@ -45,18 +45,18 @@ export class TagRepository {
 
       // update closure table
       await tx
-        .insertInto('tags_closure')
+        .insertInto('tag_closure')
         .values({ id_ancestor: tag.id, id_descendant: tag.id })
         .onConflict((oc) => oc.doNothing())
         .execute();
 
       if (parentId) {
         await tx
-          .insertInto('tags_closure')
+          .insertInto('tag_closure')
           .columns(['id_ancestor', 'id_descendant'])
           .expression(
             this.db
-              .selectFrom('tags_closure')
+              .selectFrom('tag_closure')
               .select(['id_ancestor', sql.raw<string>(`'${tag.id}'`).as('id_descendant')])
               .where('id_descendant', '=', parentId),
           )
@@ -70,22 +70,22 @@ export class TagRepository {
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getAll(userId: string) {
-    return this.db.selectFrom('tags').select(columns.tag).where('userId', '=', userId).orderBy('value').execute();
+    return this.db.selectFrom('tag').select(columns.tag).where('userId', '=', userId).orderBy('value').execute();
   }
 
   @GenerateSql({ params: [{ userId: DummyValue.UUID, color: DummyValue.STRING, value: DummyValue.STRING }] })
   create(tag: Insertable<TagTable>) {
-    return this.db.insertInto('tags').values(tag).returningAll().executeTakeFirstOrThrow();
+    return this.db.insertInto('tag').values(tag).returningAll().executeTakeFirstOrThrow();
   }
 
   @GenerateSql({ params: [DummyValue.UUID, { color: DummyValue.STRING }] })
   update(id: string, dto: Updateable<TagTable>) {
-    return this.db.updateTable('tags').set(dto).where('id', '=', id).returningAll().executeTakeFirstOrThrow();
+    return this.db.updateTable('tag').set(dto).where('id', '=', id).returningAll().executeTakeFirstOrThrow();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   async delete(id: string) {
-    await this.db.deleteFrom('tags').where('id', '=', id).execute();
+    await this.db.deleteFrom('tag').where('id', '=', id).execute();
   }
 
   @ChunkedSet({ paramIndex: 1 })
@@ -166,17 +166,17 @@ export class TagRepository {
     // TODO rewrite as a single statement
     await this.db.transaction().execute(async (tx) => {
       const result = await tx
-        .selectFrom('assets')
-        .innerJoin('tag_asset', 'tag_asset.assetsId', 'assets.id')
-        .innerJoin('tags_closure', 'tags_closure.id_descendant', 'tag_asset.tagsId')
-        .innerJoin('tags', 'tags.id', 'tags_closure.id_descendant')
-        .select((eb) => ['tags.id', eb.fn.count<number>('assets.id').as('count')])
-        .groupBy('tags.id')
+        .selectFrom('asset')
+        .innerJoin('tag_asset', 'tag_asset.assetsId', 'asset.id')
+        .innerJoin('tag_closure', 'tag_closure.id_descendant', 'tag_asset.tagsId')
+        .innerJoin('tag', 'tag.id', 'tag_closure.id_descendant')
+        .select((eb) => ['tag.id', eb.fn.count<number>('asset.id').as('count')])
+        .groupBy('tag.id')
         .execute();
 
       const ids = result.filter(({ count }) => count === 0).map(({ id }) => id);
       if (ids.length > 0) {
-        await this.db.deleteFrom('tags').where('id', 'in', ids).execute();
+        await this.db.deleteFrom('tag').where('id', 'in', ids).execute();
         this.logger.log(`Deleted ${ids.length} empty tags`);
       }
     });
diff --git a/server/src/repositories/trash.repository.ts b/server/src/repositories/trash.repository.ts
index 3389678c50..ee6fe3ace1 100644
--- a/server/src/repositories/trash.repository.ts
+++ b/server/src/repositories/trash.repository.ts
@@ -8,13 +8,13 @@ export class TrashRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
   getDeletedIds(): AsyncIterableIterator<{ id: string }> {
-    return this.db.selectFrom('assets').select(['id']).where('status', '=', AssetStatus.DELETED).stream();
+    return this.db.selectFrom('asset').select(['id']).where('status', '=', AssetStatus.DELETED).stream();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   async restore(userId: string): Promise<number> {
     const { numUpdatedRows } = await this.db
-      .updateTable('assets')
+      .updateTable('asset')
       .where('ownerId', '=', userId)
       .where('status', '=', AssetStatus.TRASHED)
       .set({ status: AssetStatus.ACTIVE, deletedAt: null })
@@ -26,7 +26,7 @@ export class TrashRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   async empty(userId: string): Promise<number> {
     const { numUpdatedRows } = await this.db
-      .updateTable('assets')
+      .updateTable('asset')
       .where('ownerId', '=', userId)
       .where('status', '=', AssetStatus.TRASHED)
       .set({ status: AssetStatus.DELETED })
@@ -42,7 +42,7 @@ export class TrashRepository {
     }
 
     const { numUpdatedRows } = await this.db
-      .updateTable('assets')
+      .updateTable('asset')
       .where('status', '=', AssetStatus.TRASHED)
       .where('id', 'in', ids)
       .set({ status: AssetStatus.ACTIVE, deletedAt: null })
diff --git a/server/src/repositories/user.repository.ts b/server/src/repositories/user.repository.ts
index 91c4b71139..f809280d86 100644
--- a/server/src/repositories/user.repository.ts
+++ b/server/src/repositories/user.repository.ts
@@ -34,12 +34,12 @@ export interface UserFindOptions {
   withDeleted?: boolean;
 }
 
-const withMetadata = (eb: ExpressionBuilder<DB, 'users'>) => {
+const withMetadata = (eb: ExpressionBuilder<DB, 'user'>) => {
   return jsonArrayFrom(
     eb
       .selectFrom('user_metadata')
       .select(['user_metadata.key', 'user_metadata.value'])
-      .whereRef('users.id', '=', 'user_metadata.userId'),
+      .whereRef('user.id', '=', 'user_metadata.userId'),
   ).as('metadata');
 };
 
@@ -52,11 +52,11 @@ export class UserRepository {
     options = options || {};
 
     return this.db
-      .selectFrom('users')
+      .selectFrom('user')
       .select(columns.userAdmin)
       .select(withMetadata)
-      .where('users.id', '=', userId)
-      .$if(!options.withDeleted, (eb) => eb.where('users.deletedAt', 'is', null))
+      .where('user.id', '=', userId)
+      .$if(!options.withDeleted, (eb) => eb.where('user.deletedAt', 'is', null))
       .executeTakeFirst();
   }
 
@@ -71,21 +71,21 @@ export class UserRepository {
   @GenerateSql()
   getAdmin() {
     return this.db
-      .selectFrom('users')
+      .selectFrom('user')
       .select(columns.userAdmin)
       .select(withMetadata)
-      .where('users.isAdmin', '=', true)
-      .where('users.deletedAt', 'is', null)
+      .where('user.isAdmin', '=', true)
+      .where('user.deletedAt', 'is', null)
       .executeTakeFirst();
   }
 
   @GenerateSql()
   async hasAdmin(): Promise<boolean> {
     const admin = await this.db
-      .selectFrom('users')
-      .select('users.id')
-      .where('users.isAdmin', '=', true)
-      .where('users.deletedAt', 'is', null)
+      .selectFrom('user')
+      .select('user.id')
+      .where('user.isAdmin', '=', true)
+      .where('user.deletedAt', 'is', null)
       .executeTakeFirst();
 
     return !!admin;
@@ -94,59 +94,59 @@ export class UserRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   getForPinCode(id: string) {
     return this.db
-      .selectFrom('users')
-      .select(['users.pinCode', 'users.password'])
-      .where('users.id', '=', id)
-      .where('users.deletedAt', 'is', null)
+      .selectFrom('user')
+      .select(['user.pinCode', 'user.password'])
+      .where('user.id', '=', id)
+      .where('user.deletedAt', 'is', null)
       .executeTakeFirstOrThrow();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   getForChangePassword(id: string) {
     return this.db
-      .selectFrom('users')
-      .select(['users.id', 'users.password'])
-      .where('users.id', '=', id)
-      .where('users.deletedAt', 'is', null)
+      .selectFrom('user')
+      .select(['user.id', 'user.password'])
+      .where('user.id', '=', id)
+      .where('user.deletedAt', 'is', null)
       .executeTakeFirstOrThrow();
   }
 
   @GenerateSql({ params: [DummyValue.EMAIL] })
   getByEmail(email: string, options?: { withPassword?: boolean }) {
     return this.db
-      .selectFrom('users')
+      .selectFrom('user')
       .select(columns.userAdmin)
       .select(withMetadata)
       .$if(!!options?.withPassword, (eb) => eb.select('password'))
       .where('email', '=', email)
-      .where('users.deletedAt', 'is', null)
+      .where('user.deletedAt', 'is', null)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [DummyValue.STRING] })
   getByStorageLabel(storageLabel: string) {
     return this.db
-      .selectFrom('users')
+      .selectFrom('user')
       .select(columns.userAdmin)
-      .where('users.storageLabel', '=', storageLabel)
-      .where('users.deletedAt', 'is', null)
+      .where('user.storageLabel', '=', storageLabel)
+      .where('user.deletedAt', 'is', null)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [DummyValue.STRING] })
   getByOAuthId(oauthId: string) {
     return this.db
-      .selectFrom('users')
+      .selectFrom('user')
       .select(columns.userAdmin)
       .select(withMetadata)
-      .where('users.oauthId', '=', oauthId)
-      .where('users.deletedAt', 'is', null)
+      .where('user.oauthId', '=', oauthId)
+      .where('user.deletedAt', 'is', null)
       .executeTakeFirst();
   }
 
   @GenerateSql({ params: [DateTime.now().minus({ years: 1 })] })
   getDeletedAfter(target: DateTime) {
-    return this.db.selectFrom('users').select(['id']).where('users.deletedAt', '<', target.toJSDate()).execute();
+    return this.db.selectFrom('user').select(['id']).where('user.deletedAt', '<', target.toJSDate()).execute();
   }
 
   @GenerateSql(
@@ -155,18 +155,18 @@ export class UserRepository {
   )
   getList({ id, withDeleted }: UserListFilter = {}) {
     return this.db
-      .selectFrom('users')
+      .selectFrom('user')
       .select(columns.userAdmin)
       .select(withMetadata)
-      .$if(!withDeleted, (eb) => eb.where('users.deletedAt', 'is', null))
-      .$if(!!id, (eb) => eb.where('users.id', '=', id!))
+      .$if(!withDeleted, (eb) => eb.where('user.deletedAt', 'is', null))
+      .$if(!!id, (eb) => eb.where('user.id', '=', id!))
       .orderBy('createdAt', 'desc')
       .execute();
   }
 
   async create(dto: Insertable<UserTable>) {
     return this.db
-      .insertInto('users')
+      .insertInto('user')
       .values(dto)
       .returning(columns.userAdmin)
       .returning(withMetadata)
@@ -175,10 +175,10 @@ export class UserRepository {
 
   update(id: string, dto: Updateable<UserTable>) {
     return this.db
-      .updateTable('users')
+      .updateTable('user')
       .set(dto)
-      .where('users.id', '=', asUuid(id))
-      .where('users.deletedAt', 'is', null)
+      .where('user.id', '=', asUuid(id))
+      .where('user.deletedAt', 'is', null)
       .returning(columns.userAdmin)
       .returning(withMetadata)
       .executeTakeFirstOrThrow();
@@ -186,9 +186,9 @@ export class UserRepository {
 
   restore(id: string) {
     return this.db
-      .updateTable('users')
+      .updateTable('user')
       .set({ status: UserStatus.ACTIVE, deletedAt: null })
-      .where('users.id', '=', asUuid(id))
+      .where('user.id', '=', asUuid(id))
       .returning(columns.userAdmin)
       .returning(withMetadata)
       .executeTakeFirstOrThrow();
@@ -213,24 +213,24 @@ export class UserRepository {
 
   delete(user: { id: string }, hard?: boolean) {
     return hard
-      ? this.db.deleteFrom('users').where('id', '=', user.id).execute()
-      : this.db.updateTable('users').set({ deletedAt: new Date() }).where('id', '=', user.id).execute();
+      ? this.db.deleteFrom('user').where('id', '=', user.id).execute()
+      : this.db.updateTable('user').set({ deletedAt: new Date() }).where('id', '=', user.id).execute();
   }
 
   @GenerateSql()
   getUserStats() {
     return this.db
-      .selectFrom('users')
-      .leftJoin('assets', (join) => join.onRef('assets.ownerId', '=', 'users.id').on('assets.deletedAt', 'is', null))
-      .leftJoin('exif', 'exif.assetId', 'assets.id')
-      .select(['users.id as userId', 'users.name as userName', 'users.quotaSizeInBytes'])
+      .selectFrom('user')
+      .leftJoin('asset', (join) => join.onRef('asset.ownerId', '=', 'user.id').on('asset.deletedAt', 'is', null))
+      .leftJoin('asset_exif', 'asset_exif.assetId', 'asset.id')
+      .select(['user.id as userId', 'user.name as userName', 'user.quotaSizeInBytes'])
       .select((eb) => [
         eb.fn
           .countAll<number>()
           .filterWhere((eb) =>
             eb.and([
-              eb('assets.type', '=', sql.lit(AssetType.IMAGE)),
-              eb('assets.visibility', '!=', sql.lit(AssetVisibility.HIDDEN)),
+              eb('asset.type', '=', sql.lit(AssetType.IMAGE)),
+              eb('asset.visibility', '!=', sql.lit(AssetVisibility.HIDDEN)),
             ]),
           )
           .as('photos'),
@@ -238,20 +238,23 @@ export class UserRepository {
           .countAll<number>()
           .filterWhere((eb) =>
             eb.and([
-              eb('assets.type', '=', sql.lit(AssetType.VIDEO)),
-              eb('assets.visibility', '!=', sql.lit(AssetVisibility.HIDDEN)),
+              eb('asset.type', '=', sql.lit(AssetType.VIDEO)),
+              eb('asset.visibility', '!=', sql.lit(AssetVisibility.HIDDEN)),
             ]),
           )
           .as('videos'),
         eb.fn
-          .coalesce(eb.fn.sum<number>('exif.fileSizeInByte').filterWhere('assets.libraryId', 'is', null), eb.lit(0))
+          .coalesce(
+            eb.fn.sum<number>('asset_exif.fileSizeInByte').filterWhere('asset.libraryId', 'is', null),
+            eb.lit(0),
+          )
           .as('usage'),
         eb.fn
           .coalesce(
             eb.fn
-              .sum<number>('exif.fileSizeInByte')
+              .sum<number>('asset_exif.fileSizeInByte')
               .filterWhere((eb) =>
-                eb.and([eb('assets.libraryId', 'is', null), eb('assets.type', '=', sql.lit(AssetType.IMAGE))]),
+                eb.and([eb('asset.libraryId', 'is', null), eb('asset.type', '=', sql.lit(AssetType.IMAGE))]),
               ),
             eb.lit(0),
           )
@@ -259,45 +262,45 @@ export class UserRepository {
         eb.fn
           .coalesce(
             eb.fn
-              .sum<number>('exif.fileSizeInByte')
+              .sum<number>('asset_exif.fileSizeInByte')
               .filterWhere((eb) =>
-                eb.and([eb('assets.libraryId', 'is', null), eb('assets.type', '=', sql.lit(AssetType.VIDEO))]),
+                eb.and([eb('asset.libraryId', 'is', null), eb('asset.type', '=', sql.lit(AssetType.VIDEO))]),
               ),
             eb.lit(0),
           )
           .as('usageVideos'),
       ])
-      .groupBy('users.id')
-      .orderBy('users.createdAt', 'asc')
+      .groupBy('user.id')
+      .orderBy('user.createdAt', 'asc')
       .execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.NUMBER] })
   async updateUsage(id: string, delta: number): Promise<void> {
     await this.db
-      .updateTable('users')
+      .updateTable('user')
       .set({ quotaUsageInBytes: sql`"quotaUsageInBytes" + ${delta}`, updatedAt: new Date() })
       .where('id', '=', asUuid(id))
-      .where('users.deletedAt', 'is', null)
+      .where('user.deletedAt', 'is', null)
       .execute();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
   async syncUsage(id?: string) {
     const query = this.db
-      .updateTable('users')
+      .updateTable('user')
       .set({
         quotaUsageInBytes: (eb) =>
           eb
-            .selectFrom('assets')
-            .leftJoin('exif', 'exif.assetId', 'assets.id')
-            .select((eb) => eb.fn.coalesce(eb.fn.sum<number>('exif.fileSizeInByte'), eb.lit(0)).as('usage'))
-            .where('assets.libraryId', 'is', null)
-            .where('assets.ownerId', '=', eb.ref('users.id')),
+            .selectFrom('asset')
+            .leftJoin('asset_exif', 'asset_exif.assetId', 'asset.id')
+            .select((eb) => eb.fn.coalesce(eb.fn.sum<number>('asset_exif.fileSizeInByte'), eb.lit(0)).as('usage'))
+            .where('asset.libraryId', 'is', null)
+            .where('asset.ownerId', '=', eb.ref('user.id')),
         updatedAt: new Date(),
       })
-      .where('users.deletedAt', 'is', null)
-      .$if(id != undefined, (eb) => eb.where('users.id', '=', asUuid(id!)));
+      .where('user.deletedAt', 'is', null)
+      .$if(id != undefined, (eb) => eb.where('user.id', '=', asUuid(id!)));
 
     await query.execute();
   }
diff --git a/server/src/repositories/view-repository.ts b/server/src/repositories/view-repository.ts
index d0d4983e09..0fd74d299f 100644
--- a/server/src/repositories/view-repository.ts
+++ b/server/src/repositories/view-repository.ts
@@ -11,8 +11,8 @@ export class ViewRepository {
   @GenerateSql({ params: [DummyValue.UUID] })
   async getUniqueOriginalPaths(userId: string) {
     const results = await this.db
-      .selectFrom('assets')
-      .select((eb) => eb.fn<string>('substring', ['assets.originalPath', eb.val('^(.*/)[^/]*$')]).as('directoryPath'))
+      .selectFrom('asset')
+      .select((eb) => eb.fn<string>('substring', ['asset.originalPath', eb.val('^(.*/)[^/]*$')]).as('directoryPath'))
       .distinct()
       .where('ownerId', '=', asUuid(userId))
       .where('visibility', '=', AssetVisibility.TIMELINE)
@@ -30,8 +30,8 @@ export class ViewRepository {
     const normalizedPath = partialPath.replaceAll(/\/$/g, '');
 
     return this.db
-      .selectFrom('assets')
-      .selectAll('assets')
+      .selectFrom('asset')
+      .selectAll('asset')
       .$call(withExif)
       .where('ownerId', '=', asUuid(userId))
       .where('visibility', '=', AssetVisibility.TIMELINE)
@@ -42,7 +42,7 @@ export class ViewRepository {
       .where('originalPath', 'like', `%${normalizedPath}/%`)
       .where('originalPath', 'not like', `%${normalizedPath}/%/%`)
       .orderBy(
-        (eb) => eb.fn('regexp_replace', ['assets.originalPath', eb.val('.*/(.+)'), eb.val(String.raw`\1`)]),
+        (eb) => eb.fn('regexp_replace', ['asset.originalPath', eb.val('.*/(.+)'), eb.val(String.raw`\1`)]),
         'asc',
       )
       .execute();
diff --git a/server/src/schema/functions.ts b/server/src/schema/functions.ts
index 335201a6c4..5577169227 100644
--- a/server/src/schema/functions.ts
+++ b/server/src/schema/functions.ts
@@ -28,7 +28,7 @@ export const album_user_after_insert = registerFunction({
   language: 'PLPGSQL',
   body: `
     BEGIN
-      UPDATE albums SET "updatedAt" = clock_timestamp(), "updateId" = immich_uuid_v7(clock_timestamp())
+      UPDATE album SET "updatedAt" = clock_timestamp(), "updateId" = immich_uuid_v7(clock_timestamp())
       WHERE "id" IN (SELECT DISTINCT "albumsId" FROM inserted_rows);
       RETURN NULL;
     END`,
@@ -80,83 +80,83 @@ export const ll_to_earth_public = registerFunction({
   body: `SELECT public.cube(public.cube(public.cube(public.earth()*cos(radians(latitude))*cos(radians(longitude))),public.earth()*cos(radians(latitude))*sin(radians(longitude))),public.earth()*sin(radians(latitude)))::public.earth`,
 });
 
-export const users_delete_audit = registerFunction({
-  name: 'users_delete_audit',
+export const user_delete_audit = registerFunction({
+  name: 'user_delete_audit',
   returnType: 'TRIGGER',
   language: 'PLPGSQL',
   body: `
     BEGIN
-      INSERT INTO users_audit ("userId")
+      INSERT INTO user_audit ("userId")
       SELECT "id"
       FROM OLD;
       RETURN NULL;
     END`,
 });
 
-export const partners_delete_audit = registerFunction({
-  name: 'partners_delete_audit',
+export const partner_delete_audit = registerFunction({
+  name: 'partner_delete_audit',
   returnType: 'TRIGGER',
   language: 'PLPGSQL',
   body: `
     BEGIN
-      INSERT INTO partners_audit ("sharedById", "sharedWithId")
+      INSERT INTO partner_audit ("sharedById", "sharedWithId")
       SELECT "sharedById", "sharedWithId"
       FROM OLD;
       RETURN NULL;
     END`,
 });
 
-export const assets_delete_audit = registerFunction({
-  name: 'assets_delete_audit',
+export const asset_delete_audit = registerFunction({
+  name: 'asset_delete_audit',
   returnType: 'TRIGGER',
   language: 'PLPGSQL',
   body: `
     BEGIN
-      INSERT INTO assets_audit ("assetId", "ownerId")
+      INSERT INTO asset_audit ("assetId", "ownerId")
       SELECT "id", "ownerId"
       FROM OLD;
       RETURN NULL;
     END`,
 });
 
-export const albums_delete_audit = registerFunction({
-  name: 'albums_delete_audit',
+export const album_delete_audit = registerFunction({
+  name: 'album_delete_audit',
   returnType: 'TRIGGER',
   language: 'PLPGSQL',
   body: `
     BEGIN
-      INSERT INTO albums_audit ("albumId", "userId")
+      INSERT INTO album_audit ("albumId", "userId")
       SELECT "id", "ownerId"
       FROM OLD;
       RETURN NULL;
     END`,
 });
 
-export const album_assets_delete_audit = registerFunction({
-  name: 'album_assets_delete_audit',
+export const album_asset_delete_audit = registerFunction({
+  name: 'album_asset_delete_audit',
   returnType: 'TRIGGER',
   language: 'PLPGSQL',
   body: `
     BEGIN
-      INSERT INTO album_assets_audit ("albumId", "assetId")
+      INSERT INTO album_asset_audit ("albumId", "assetId")
       SELECT "albumsId", "assetsId" FROM OLD
-      WHERE "albumsId" IN (SELECT "id" FROM albums WHERE "id" IN (SELECT "albumsId" FROM OLD));
+      WHERE "albumsId" IN (SELECT "id" FROM album WHERE "id" IN (SELECT "albumsId" FROM OLD));
       RETURN NULL;
     END`,
 });
 
-export const album_users_delete_audit = registerFunction({
-  name: 'album_users_delete_audit',
+export const album_user_delete_audit = registerFunction({
+  name: 'album_user_delete_audit',
   returnType: 'TRIGGER',
   language: 'PLPGSQL',
   body: `
     BEGIN
-      INSERT INTO albums_audit ("albumId", "userId")
+      INSERT INTO album_audit ("albumId", "userId")
       SELECT "albumsId", "usersId"
       FROM OLD;
 
       IF pg_trigger_depth() = 1 THEN
-        INSERT INTO album_users_audit ("albumId", "userId")
+        INSERT INTO album_user_audit ("albumId", "userId")
         SELECT "albumsId", "usersId"
         FROM OLD;
       END IF;
@@ -165,39 +165,39 @@ export const album_users_delete_audit = registerFunction({
     END`,
 });
 
-export const memories_delete_audit = registerFunction({
-  name: 'memories_delete_audit',
+export const memory_delete_audit = registerFunction({
+  name: 'memory_delete_audit',
   returnType: 'TRIGGER',
   language: 'PLPGSQL',
   body: `
     BEGIN
-      INSERT INTO memories_audit ("memoryId", "userId")
+      INSERT INTO memory_audit ("memoryId", "userId")
       SELECT "id", "ownerId"
       FROM OLD;
       RETURN NULL;
     END`,
 });
 
-export const memory_assets_delete_audit = registerFunction({
-  name: 'memory_assets_delete_audit',
+export const memory_asset_delete_audit = registerFunction({
+  name: 'memory_asset_delete_audit',
   returnType: 'TRIGGER',
   language: 'PLPGSQL',
   body: `
     BEGIN
-      INSERT INTO memory_assets_audit ("memoryId", "assetId")
+      INSERT INTO memory_asset_audit ("memoryId", "assetId")
       SELECT "memoriesId", "assetsId" FROM OLD
-      WHERE "memoriesId" IN (SELECT "id" FROM memories WHERE "id" IN (SELECT "memoriesId" FROM OLD));
+      WHERE "memoriesId" IN (SELECT "id" FROM memory WHERE "id" IN (SELECT "memoriesId" FROM OLD));
       RETURN NULL;
     END`,
 });
 
-export const stacks_delete_audit = registerFunction({
-  name: 'stacks_delete_audit',
+export const stack_delete_audit = registerFunction({
+  name: 'stack_delete_audit',
   returnType: 'TRIGGER',
   language: 'PLPGSQL',
   body: `
     BEGIN
-      INSERT INTO stacks_audit ("stackId", "userId")
+      INSERT INTO stack_audit ("stackId", "userId")
       SELECT "id", "ownerId"
       FROM OLD;
       RETURN NULL;
diff --git a/server/src/schema/index.ts b/server/src/schema/index.ts
index 384e47df79..ba25a65d4d 100644
--- a/server/src/schema/index.ts
+++ b/server/src/schema/index.ts
@@ -1,20 +1,21 @@
 import { asset_face_source_type, asset_visibility_enum, assets_status_enum } from 'src/schema/enums';
 import {
+  album_delete_audit,
   album_user_after_insert,
-  album_users_delete_audit,
-  albums_delete_audit,
-  assets_delete_audit,
+  album_user_delete_audit,
+  asset_delete_audit,
   f_concat_ws,
   f_unaccent,
   immich_uuid_v7,
   ll_to_earth_public,
-  memories_delete_audit,
-  memory_assets_delete_audit,
-  partners_delete_audit,
+  memory_asset_delete_audit,
+  memory_delete_audit,
+  partner_delete_audit,
   person_delete_audit,
-  stacks_delete_audit,
+  stack_delete_audit,
   updated_at,
-  users_delete_audit,
+  user_delete_audit,
+  user_metadata_audit,
 } from 'src/schema/functions';
 import { ActivityTable } from 'src/schema/tables/activity.table';
 import { AlbumAssetAuditTable } from 'src/schema/tables/album-asset-audit.table';
@@ -25,12 +26,12 @@ import { AlbumUserTable } from 'src/schema/tables/album-user.table';
 import { AlbumTable } from 'src/schema/tables/album.table';
 import { ApiKeyTable } from 'src/schema/tables/api-key.table';
 import { AssetAuditTable } from 'src/schema/tables/asset-audit.table';
+import { AssetExifTable } from 'src/schema/tables/asset-exif.table';
 import { AssetFaceTable } from 'src/schema/tables/asset-face.table';
-import { AssetFileTable } from 'src/schema/tables/asset-files.table';
+import { AssetFileTable } from 'src/schema/tables/asset-file.table';
 import { AssetJobStatusTable } from 'src/schema/tables/asset-job-status.table';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { AuditTable } from 'src/schema/tables/audit.table';
-import { ExifTable } from 'src/schema/tables/exif.table';
 import { FaceSearchTable } from 'src/schema/tables/face-search.table';
 import { GeodataPlacesTable } from 'src/schema/tables/geodata-places.table';
 import { LibraryTable } from 'src/schema/tables/library.table';
@@ -81,7 +82,7 @@ export class ImmichDatabase {
     AssetTable,
     AssetFileTable,
     AuditTable,
-    ExifTable,
+    AssetExifTable,
     FaceSearchTable,
     GeodataPlacesTable,
     LibraryTable,
@@ -120,17 +121,17 @@ export class ImmichDatabase {
     f_concat_ws,
     f_unaccent,
     ll_to_earth_public,
-    users_delete_audit,
-    partners_delete_audit,
-    assets_delete_audit,
-    albums_delete_audit,
+    user_delete_audit,
+    partner_delete_audit,
+    asset_delete_audit,
+    album_delete_audit,
     album_user_after_insert,
-    album_users_delete_audit,
-    memories_delete_audit,
-    memory_assets_delete_audit,
-    stacks_delete_audit,
+    album_user_delete_audit,
+    memory_delete_audit,
+    memory_asset_delete_audit,
+    stack_delete_audit,
     person_delete_audit,
-    users_delete_audit,
+    user_metadata_audit,
   ];
 
   enum = [assets_status_enum, asset_face_source_type, asset_visibility_enum];
@@ -144,49 +145,71 @@ export interface Migrations {
 
 export interface DB {
   activity: ActivityTable;
-  albums: AlbumTable;
-  albums_audit: AlbumAuditTable;
-  albums_assets_assets: AlbumAssetTable;
-  album_assets_audit: AlbumAssetAuditTable;
-  albums_shared_users_users: AlbumUserTable;
-  album_users_audit: AlbumUserAuditTable;
-  api_keys: ApiKeyTable;
-  asset_faces: AssetFaceTable;
-  asset_files: AssetFileTable;
+
+  album: AlbumTable;
+  album_audit: AlbumAuditTable;
+  album_asset: AlbumAssetTable;
+  album_asset_audit: AlbumAssetAuditTable;
+  album_user: AlbumUserTable;
+  album_user_audit: AlbumUserAuditTable;
+
+  api_key: ApiKeyTable;
+
+  asset: AssetTable;
+  asset_exif: AssetExifTable;
+  asset_face: AssetFaceTable;
+  asset_file: AssetFileTable;
   asset_job_status: AssetJobStatusTable;
-  asset_stack: StackTable;
-  assets: AssetTable;
-  assets_audit: AssetAuditTable;
+  asset_audit: AssetAuditTable;
+
   audit: AuditTable;
-  exif: ExifTable;
+
   face_search: FaceSearchTable;
+
   geodata_places: GeodataPlacesTable;
-  libraries: LibraryTable;
-  memories: MemoryTable;
-  memories_audit: MemoryAuditTable;
-  memories_assets_assets: MemoryAssetTable;
-  memory_assets_audit: MemoryAssetAuditTable;
+
+  library: LibraryTable;
+
+  memory: MemoryTable;
+  memory_audit: MemoryAuditTable;
+  memory_asset: MemoryAssetTable;
+  memory_asset_audit: MemoryAssetAuditTable;
+
   migrations: Migrations;
-  notifications: NotificationTable;
+
+  notification: NotificationTable;
+
   move_history: MoveTable;
+
   naturalearth_countries: NaturalEarthCountriesTable;
-  partners_audit: PartnerAuditTable;
-  partners: PartnerTable;
+
+  partner: PartnerTable;
+  partner_audit: PartnerAuditTable;
+
   person: PersonTable;
   person_audit: PersonAuditTable;
-  sessions: SessionTable;
-  session_sync_checkpoints: SessionSyncCheckpointTable;
-  shared_link__asset: SharedLinkAssetTable;
-  shared_links: SharedLinkTable;
+
+  session: SessionTable;
+  session_sync_checkpoint: SessionSyncCheckpointTable;
+
+  shared_link: SharedLinkTable;
+  shared_link_asset: SharedLinkAssetTable;
+
   smart_search: SmartSearchTable;
-  stacks_audit: StackAuditTable;
+
+  stack: StackTable;
+  stack_audit: StackAuditTable;
+
   system_metadata: SystemMetadataTable;
+
+  tag: TagTable;
   tag_asset: TagAssetTable;
-  tags: TagTable;
-  tags_closure: TagClosureTable;
+  tag_closure: TagClosureTable;
+
+  user: UserTable;
+  user_audit: UserAuditTable;
   user_metadata: UserMetadataTable;
   user_metadata_audit: UserMetadataAuditTable;
-  users: UserTable;
-  users_audit: UserAuditTable;
+
   version_history: VersionHistoryTable;
 }
diff --git a/server/src/schema/migrations/1752267649968-StandardizeNames.ts b/server/src/schema/migrations/1752267649968-StandardizeNames.ts
new file mode 100644
index 0000000000..991c9d3ce2
--- /dev/null
+++ b/server/src/schema/migrations/1752267649968-StandardizeNames.ts
@@ -0,0 +1,1200 @@
+import { Kysely, sql } from 'kysely';
+
+type RenameItem = { oldName: string; newName: string };
+
+const tables: RenameItem[] = [
+  { oldName: 'album_assets_audit', newName: 'album_asset_audit' },
+  { oldName: 'albums_assets_assets', newName: 'album_asset' },
+  { oldName: 'albums_audit', newName: 'album_audit' },
+  { oldName: 'album_users_audit', newName: 'album_user_audit' },
+  { oldName: 'albums_shared_users_users', newName: 'album_user' },
+  { oldName: 'albums', newName: 'album' },
+  { oldName: 'api_keys', newName: 'api_key' },
+  { oldName: 'assets_audit', newName: 'asset_audit' },
+  { oldName: 'assets', newName: 'asset' },
+  { oldName: 'asset_faces', newName: 'asset_face' },
+  { oldName: 'asset_files', newName: 'asset_file' },
+  { oldName: 'exif', newName: 'asset_exif' },
+  { oldName: 'libraries', newName: 'library' },
+  { oldName: 'memory_assets_audit', newName: 'memory_asset_audit' },
+  { oldName: 'memories_assets_assets', newName: 'memory_asset' },
+  { oldName: 'memories_audit', newName: 'memory_audit' },
+  { oldName: 'memories', newName: 'memory' },
+  { oldName: 'notifications', newName: 'notification' },
+  { oldName: 'partners_audit', newName: 'partner_audit' },
+  { oldName: 'partners', newName: 'partner' },
+  { oldName: 'sessions', newName: 'session' },
+  { oldName: 'shared_link__asset', newName: 'shared_link_asset' },
+  { oldName: 'shared_links', newName: 'shared_link' },
+  { oldName: 'stacks_audit', newName: 'stack_audit' },
+  { oldName: 'asset_stack', newName: 'stack' },
+  { oldName: 'session_sync_checkpoints', newName: 'session_sync_checkpoint' },
+  { oldName: 'tags_closure', newName: 'tag_closure' },
+  { oldName: 'tags', newName: 'tag' },
+  { oldName: 'users_audit', newName: 'user_audit' },
+  { oldName: 'users', newName: 'user' },
+];
+
+export async function up(db: Kysely<any>): Promise<void> {
+  for (const { oldName, newName } of tables) {
+    await sql.raw(`ALTER TABLE "${oldName}" RENAME TO "${newName}"`).execute(db);
+  }
+  
+  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 "albumsId" FROM inserted_rows);
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION user_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO user_audit ("userId")
+      SELECT "id"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION partner_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO partner_audit ("sharedById", "sharedWithId")
+      SELECT "sharedById", "sharedWithId"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION asset_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO asset_audit ("assetId", "ownerId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION album_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO album_audit ("albumId", "userId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      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 "albumsId", "assetsId" FROM OLD
+      WHERE "albumsId" IN (SELECT "id" FROM album WHERE "id" IN (SELECT "albumsId" 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 "albumsId", "usersId"
+      FROM OLD;
+
+      IF pg_trigger_depth() = 1 THEN
+        INSERT INTO album_user_audit ("albumId", "userId")
+        SELECT "albumsId", "usersId"
+        FROM OLD;
+      END IF;
+
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION memory_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO memory_audit ("memoryId", "userId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      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", "assetsId" FROM OLD
+      WHERE "memoriesId" IN (SELECT "id" FROM memory WHERE "id" IN (SELECT "memoriesId" FROM OLD));
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION stack_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO stack_audit ("stackId", "userId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`DROP TRIGGER "users_delete_audit" ON "user";`.execute(db);
+  await sql`DROP TRIGGER "users_updated_at" ON "user";`.execute(db);
+  await sql`DROP TRIGGER "libraries_updated_at" ON "library";`.execute(db);
+  await sql`DROP TRIGGER "stacks_delete_audit" ON "stack";`.execute(db);
+  await sql`DROP TRIGGER "stacks_updated_at" ON "stack";`.execute(db);
+  await sql`DROP TRIGGER "assets_delete_audit" ON "asset";`.execute(db);
+  await sql`DROP TRIGGER "assets_updated_at" ON "asset";`.execute(db);
+  await sql`DROP TRIGGER "albums_updated_at" ON "album";`.execute(db);
+  await sql`DROP TRIGGER "albums_delete_audit" ON "album";`.execute(db);
+  await sql`DROP TRIGGER "album_assets_updated_at" ON "album_asset";`.execute(db);
+  await sql`DROP TRIGGER "album_assets_delete_audit" ON "album_asset";`.execute(db);
+  await sql`DROP TRIGGER "activity_updated_at" ON "activity";`.execute(db);
+  await sql`DROP TRIGGER "album_users_delete_audit" ON "album_user";`.execute(db);
+  await sql`DROP TRIGGER "album_users_updated_at" ON "album_user";`.execute(db);
+  await sql`DROP TRIGGER "api_keys_updated_at" ON "api_key";`.execute(db);
+  await sql`DROP TRIGGER "asset_exif_updated_at" ON "asset_exif";`.execute(db);
+  await sql`DROP TRIGGER "person_updated_at" ON "person";`.execute(db);
+  await sql`DROP TRIGGER "asset_files_updated_at" ON "asset_file";`.execute(db);
+  await sql`DROP TRIGGER "memories_updated_at" ON "memory";`.execute(db);
+  await sql`DROP TRIGGER "memories_delete_audit" ON "memory";`.execute(db);
+  await sql`DROP TRIGGER "memory_assets_updated_at" ON "memory_asset";`.execute(db);
+  await sql`DROP TRIGGER "memory_assets_delete_audit" ON "memory_asset";`.execute(db);
+  await sql`DROP TRIGGER "notifications_updated_at" ON "notification";`.execute(db);
+  await sql`DROP TRIGGER "partners_delete_audit" ON "partner";`.execute(db);
+  await sql`DROP TRIGGER "partners_updated_at" ON "partner";`.execute(db);
+  await sql`DROP TRIGGER "sessions_updated_at" ON "session";`.execute(db);
+  await sql`DROP TRIGGER "session_sync_checkpoints_updated_at" ON "session_sync_checkpoint";`.execute(db);
+  await sql`DROP TRIGGER "tags_updated_at" ON "tag";`.execute(db);
+  await sql`ALTER TABLE "user_metadata_audit" RENAME CONSTRAINT "PK_15d5cc4d65ac966233b9921acac" TO "user_metadata_audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "user" RENAME CONSTRAINT "PK_a3ffb1c0c8416b9fc6f907b7433" TO "user_pkey";`.execute(db);
+  await sql`ALTER TABLE "user" RENAME CONSTRAINT "UQ_97672ac88f789774dd47f7c8be3" TO "user_email_uq";`.execute(db);
+  await sql`ALTER TABLE "user" RENAME CONSTRAINT "UQ_b309cf34fa58137c416b32cea3a" TO "user_storageLabel_uq";`.execute(db);
+  await sql`ALTER TABLE "library" RENAME CONSTRAINT "PK_505fedfcad00a09b3734b4223de" TO "library_pkey";`.execute(db);
+  await sql`ALTER TABLE "library" RENAME CONSTRAINT "FK_0f6fc2fb195f24d19b0fb0d57c1" TO "library_ownerId_fkey";`.execute(db);
+  await sql`ALTER TABLE "stack" RENAME CONSTRAINT "PK_74a27e7fcbd5852463d0af3034b" TO "stack_pkey";`.execute(db);
+  await sql`ALTER TABLE "stack" RENAME CONSTRAINT "FK_91704e101438fd0653f582426dc" TO "stack_primaryAssetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "stack" RENAME CONSTRAINT "FK_c05079e542fd74de3b5ecb5c1c8" TO "stack_ownerId_fkey";`.execute(db);
+  await sql`ALTER TABLE "stack" RENAME CONSTRAINT "REL_91704e101438fd0653f582426d" TO "stack_primaryAssetId_uq";`.execute(db);
+  await sql`ALTER TABLE "asset" RENAME CONSTRAINT "PK_da96729a8b113377cfb6a62439c" TO "asset_pkey";`.execute(db);
+  await sql`ALTER TABLE "asset" RENAME CONSTRAINT "FK_2c5ac0d6fb58b238fd2068de67d" TO "asset_ownerId_fkey";`.execute(db);
+  await sql`ALTER TABLE "asset" RENAME CONSTRAINT "FK_16294b83fa8c0149719a1f631ef" TO "asset_livePhotoVideoId_fkey";`.execute(db);
+  await sql`ALTER TABLE "asset" RENAME CONSTRAINT "FK_9977c3c1de01c3d848039a6b90c" TO "asset_libraryId_fkey";`.execute(db);
+  await sql`ALTER TABLE "asset" RENAME CONSTRAINT "FK_f15d48fa3ea5e4bda05ca8ab207" TO "asset_stackId_fkey";`.execute(db);
+  await sql`ALTER TABLE "album" RENAME CONSTRAINT "PK_7f71c7b5bc7c87b8f94c9a93a00" TO "album_pkey";`.execute(db);
+  await sql`ALTER TABLE "album" RENAME CONSTRAINT "FK_b22c53f35ef20c28c21637c85f4" TO "album_ownerId_fkey";`.execute(db);
+  await sql`ALTER TABLE "album" RENAME CONSTRAINT "FK_05895aa505a670300d4816debce" TO "album_albumThumbnailAssetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "album_asset" RENAME CONSTRAINT "PK_c67bc36fa845fb7b18e0e398180" TO "album_asset_pkey";`.execute(db);
+  await sql`ALTER TABLE "album_asset" RENAME CONSTRAINT "FK_e590fa396c6898fcd4a50e40927" TO "album_asset_albumsId_fkey";`.execute(db);
+  await sql`ALTER TABLE "album_asset" RENAME CONSTRAINT "FK_4bd1303d199f4e72ccdf998c621" TO "album_asset_assetsId_fkey";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "PK_24625a1d6b1b089c8ae206fe467" TO "activity_pkey";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "FK_1af8519996fbfb3684b58df280b" TO "activity_albumId_fkey";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "FK_3571467bcbe021f66e2bdce96ea" TO "activity_userId_fkey";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "FK_8091ea76b12338cb4428d33d782" TO "activity_assetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "CHK_2ab1e70f113f450eb40c1e3ec8" TO "activity_like_check";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "fk_activity_album_asset_composite" TO "activity_albumId_assetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "album_asset_audit" RENAME CONSTRAINT "PK_32969b576ec8f78d84f37c2eb2d" TO "album_asset_audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "album_asset_audit" RENAME CONSTRAINT "FK_8047b44b812619a3c75a2839b0d" TO "album_asset_audit_albumId_fkey";`.execute(db);
+  await sql`ALTER TABLE "album_audit" RENAME CONSTRAINT "PK_c75efea8d4dce316ad29b851a8b" TO "album_audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "album_user_audit" RENAME CONSTRAINT "PK_f479a2e575b7ebc9698362c1688" TO "album_user_audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "album_user" RENAME CONSTRAINT "PK_7df55657e0b2e8b626330a0ebc8" TO "album_user_pkey";`.execute(db);
+  await sql`ALTER TABLE "album_user" RENAME CONSTRAINT "FK_427c350ad49bd3935a50baab737" TO "album_user_albumsId_fkey";`.execute(db);
+  await sql`ALTER TABLE "album_user" RENAME CONSTRAINT "FK_f48513bf9bccefd6ff3ad30bd06" TO "album_user_usersId_fkey";`.execute(db);
+  await sql`ALTER TABLE "api_key" RENAME CONSTRAINT "PK_5c8a79801b44bd27b79228e1dad" TO "api_key_pkey";`.execute(db);
+  await sql`ALTER TABLE "api_key" RENAME CONSTRAINT "FK_6c2e267ae764a9413b863a29342" TO "api_key_userId_fkey";`.execute(db);
+  await sql`ALTER TABLE "asset_audit" RENAME CONSTRAINT "PK_99bd5c015f81a641927a32b4212" TO "asset_audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "asset_exif" RENAME CONSTRAINT "PK_c0117fdbc50b917ef9067740c44" TO "asset_exif_pkey";`.execute(db);
+  await sql`ALTER TABLE "asset_exif" RENAME CONSTRAINT "FK_c0117fdbc50b917ef9067740c44" TO "asset_exif_assetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "person" RENAME CONSTRAINT "PK_5fdaf670315c4b7e70cce85daa3" TO "person_pkey";`.execute(db);
+  await sql`ALTER TABLE "person" RENAME CONSTRAINT "FK_5527cc99f530a547093f9e577b6" TO "person_ownerId_fkey";`.execute(db);
+  await sql`ALTER TABLE "person" RENAME CONSTRAINT "FK_2bbabe31656b6778c6b87b61023" TO "person_faceAssetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "person" RENAME CONSTRAINT "CHK_b0f82b0ed662bfc24fbb58bb45" TO "person_birthDate_chk";`.execute(db);
+  await sql`ALTER TABLE "asset_face" RENAME CONSTRAINT "PK_6df76ab2eb6f5b57b7c2f1fc684" TO "asset_face_pkey";`.execute(db);
+  await sql`ALTER TABLE "asset_face" RENAME CONSTRAINT "FK_02a43fd0b3c50fb6d7f0cb7282c" TO "asset_face_assetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "asset_face" RENAME CONSTRAINT "FK_95ad7106dd7b484275443f580f9" TO "asset_face_personId_fkey";`.execute(db);
+  await sql`ALTER TABLE "asset_file" RENAME CONSTRAINT "PK_c41dc3e9ef5e1c57ca5a08a0004" TO "asset_file_pkey";`.execute(db);
+  await sql`ALTER TABLE "asset_file" RENAME CONSTRAINT "FK_e3e103a5f1d8bc8402999286040" TO "asset_file_assetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "asset_file" RENAME CONSTRAINT "UQ_assetId_type" TO "asset_file_assetId_type_uq";`.execute(db);
+  await sql`ALTER TABLE "asset_job_status" RENAME CONSTRAINT "PK_420bec36fc02813bddf5c8b73d4" TO "asset_job_status_pkey";`.execute(db);
+  await sql`ALTER TABLE "asset_job_status" RENAME CONSTRAINT "FK_420bec36fc02813bddf5c8b73d4" TO "asset_job_status_assetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "audit" RENAME CONSTRAINT "PK_1d3d120ddaf7bc9b1ed68ed463a" TO "audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "memory" RENAME CONSTRAINT "PK_aaa0692d9496fe827b0568612f8" TO "memory_pkey";`.execute(db);
+  await sql`ALTER TABLE "memory" RENAME CONSTRAINT "FK_575842846f0c28fa5da46c99b19" TO "memory_ownerId_fkey";`.execute(db);
+  await sql`ALTER TABLE "memory_asset_audit" RENAME CONSTRAINT "PK_35ef16910228f980e0766dcc59b" TO "memory_asset_audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "memory_asset_audit" RENAME CONSTRAINT "FK_225a204afcb0bd6de015080fb03" TO "memory_asset_audit_memoryId_fkey";`.execute(db);
+  await sql`ALTER TABLE "memory_asset" RENAME CONSTRAINT "PK_fcaf7112a013d1703c011c6793d" TO "memory_asset_pkey";`.execute(db);
+  await sql`ALTER TABLE "memory_asset" RENAME CONSTRAINT "FK_984e5c9ab1f04d34538cd32334e" TO "memory_asset_memoriesId_fkey";`.execute(db);
+  await sql`ALTER TABLE "memory_asset" RENAME CONSTRAINT "FK_6942ecf52d75d4273de19d2c16f" TO "memory_asset_assetsId_fkey";`.execute(db);
+  await sql`ALTER TABLE "memory_audit" RENAME CONSTRAINT "PK_19de798c033a710dcfa5c72f81b" TO "memory_audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "move_history" RENAME CONSTRAINT "PK_af608f132233acf123f2949678d" TO "move_history_pkey";`.execute(db);
+  await sql`ALTER TABLE "notification" RENAME CONSTRAINT "PK_6a72c3c0f683f6462415e653c3a" TO "notification_pkey";`.execute(db);
+  await sql`ALTER TABLE "notification" RENAME CONSTRAINT "FK_692a909ee0fa9383e7859f9b406" TO "notification_userId_fkey";`.execute(db);
+  await sql`ALTER TABLE "partner_audit" RENAME CONSTRAINT "PK_952b50217ff78198a7e380f0359" TO "partner_audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "partner" RENAME CONSTRAINT "PK_f1cc8f73d16b367f426261a8736" TO "partner_pkey";`.execute(db);
+  await sql`ALTER TABLE "partner" RENAME CONSTRAINT "FK_7e077a8b70b3530138610ff5e04" TO "partner_sharedById_fkey";`.execute(db);
+  await sql`ALTER TABLE "partner" RENAME CONSTRAINT "FK_d7e875c6c60e661723dbf372fd3" TO "partner_sharedWithId_fkey";`.execute(db);
+  await sql`ALTER TABLE "person_audit" RENAME CONSTRAINT "PK_46c1ad23490b9312ffaa052aa59" TO "person_audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "session" RENAME CONSTRAINT "PK_48cb6b5c20faa63157b3c1baf7f" TO "session_pkey";`.execute(db);
+  await sql`ALTER TABLE "session" RENAME CONSTRAINT "FK_57de40bc620f456c7311aa3a1e6" TO "session_userId_fkey";`.execute(db);
+  await sql`ALTER TABLE "session" RENAME CONSTRAINT "FK_afbbabbd7daf5b91de4dca84de8" TO "session_parentId_fkey";`.execute(db);
+  await sql`ALTER TABLE "shared_link" RENAME CONSTRAINT "PK_642e2b0f619e4876e5f90a43465" TO "shared_link_pkey";`.execute(db);
+  await sql`ALTER TABLE "shared_link" RENAME CONSTRAINT "FK_66fe3837414c5a9f1c33ca49340" TO "shared_link_userId_fkey";`.execute(db);
+  await sql`ALTER TABLE "shared_link" RENAME CONSTRAINT "FK_0c6ce9058c29f07cdf7014eac66" TO "shared_link_albumId_fkey";`.execute(db);
+  await sql`ALTER TABLE "shared_link" RENAME CONSTRAINT "UQ_sharedlink_key" TO "shared_link_key_uq";`.execute(db);
+  await sql`ALTER TABLE "shared_link_asset" RENAME CONSTRAINT "PK_9b4f3687f9b31d1e311336b05e3" TO "shared_link_asset_pkey";`.execute(db);
+  await sql`ALTER TABLE "shared_link_asset" RENAME CONSTRAINT "FK_5b7decce6c8d3db9593d6111a66" TO "shared_link_asset_assetsId_fkey";`.execute(db);
+  await sql`ALTER TABLE "shared_link_asset" RENAME CONSTRAINT "FK_c9fab4aa97ffd1b034f3d6581ab" TO "shared_link_asset_sharedLinksId_fkey";`.execute(db);
+  await sql`ALTER TABLE "stack_audit" RENAME CONSTRAINT "PK_dbe4ec648fa032e8973297de07e" TO "stack_audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "session_sync_checkpoint" RENAME CONSTRAINT "PK_b846ab547a702863ef7cd9412fb" TO "session_sync_checkpoint_pkey";`.execute(db);
+  await sql`ALTER TABLE "session_sync_checkpoint" RENAME CONSTRAINT "FK_d8ddd9d687816cc490432b3d4bc" TO "session_sync_checkpoint_sessionId_fkey";`.execute(db);
+  await sql`ALTER TABLE "system_metadata" RENAME CONSTRAINT "PK_fa94f6857470fb5b81ec6084465" TO "system_metadata_pkey";`.execute(db);
+  await sql`ALTER TABLE "tag" RENAME CONSTRAINT "PK_e7dc17249a1148a1970748eda99" TO "tag_pkey";`.execute(db);
+  await sql`ALTER TABLE "tag" RENAME CONSTRAINT "FK_92e67dc508c705dd66c94615576" TO "tag_userId_fkey";`.execute(db);
+  await sql`ALTER TABLE "tag" RENAME CONSTRAINT "FK_9f9590cc11561f1f48ff034ef99" TO "tag_parentId_fkey";`.execute(db);
+  await sql`ALTER TABLE "tag" RENAME CONSTRAINT "UQ_79d6f16e52bb2c7130375246793" TO "tag_userId_value_uq";`.execute(db);
+  await sql`ALTER TABLE "tag_asset" RENAME CONSTRAINT "PK_ef5346fe522b5fb3bc96454747e" TO "tag_asset_pkey";`.execute(db);
+  await sql`ALTER TABLE "tag_asset" RENAME CONSTRAINT "FK_f8e8a9e893cb5c54907f1b798e9" TO "tag_asset_assetsId_fkey";`.execute(db);
+  await sql`ALTER TABLE "tag_asset" RENAME CONSTRAINT "FK_e99f31ea4cdf3a2c35c7287eb42" TO "tag_asset_tagsId_fkey";`.execute(db);
+  await sql`ALTER TABLE "tag_closure" RENAME CONSTRAINT "PK_eab38eb12a3ec6df8376c95477c" TO "tag_closure_pkey";`.execute(db);
+  await sql`ALTER TABLE "tag_closure" RENAME CONSTRAINT "FK_15fbcbc67663c6bfc07b354c22c" TO "tag_closure_id_ancestor_fkey";`.execute(db);
+  await sql`ALTER TABLE "tag_closure" RENAME CONSTRAINT "FK_b1a2a7ed45c29179b5ad51548a1" TO "tag_closure_id_descendant_fkey";`.execute(db);
+  await sql`ALTER TABLE "user_audit" RENAME CONSTRAINT "PK_e9b2bdfd90e7eb5961091175180" TO "user_audit_pkey";`.execute(db);
+  await sql`ALTER TABLE "user_metadata" RENAME CONSTRAINT "PK_5931462150b3438cbc83277fe5a" TO "user_metadata_pkey";`.execute(db);
+  await sql`ALTER TABLE "user_metadata" RENAME CONSTRAINT "FK_6afb43681a21cf7815932bc38ac" TO "user_metadata_userId_fkey";`.execute(db);
+  await sql`ALTER TABLE "version_history" RENAME CONSTRAINT "PK_5db259cbb09ce82c0d13cfd1b23" TO "version_history_pkey";`.execute(db);
+  await sql`ALTER INDEX "IDX_users_updated_at_asc_id_asc" RENAME TO "user_updatedAt_id_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_users_update_id" RENAME TO "user_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_0f6fc2fb195f24d19b0fb0d57c" RENAME TO "library_ownerId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_libraries_update_id" RENAME TO "library_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_c05079e542fd74de3b5ecb5c1c" RENAME TO "stack_ownerId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_91704e101438fd0653f582426d" RENAME TO "stack_primaryAssetId_idx";`.execute(db);
+  await sql`ALTER INDEX "idx_local_date_time" RENAME TO "asset_localDateTime_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_9977c3c1de01c3d848039a6b90" RENAME TO "asset_libraryId_idx";`.execute(db);
+  await sql`ALTER INDEX "UQ_assets_owner_library_checksum" RENAME TO "asset_ownerId_libraryId_checksum_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_asset_id_stackId" RENAME TO "asset_id_stackId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_f15d48fa3ea5e4bda05ca8ab20" RENAME TO "asset_stackId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_originalPath_libraryId" RENAME TO "asset_originalPath_libraryId_idx";`.execute(db);
+  await sql`ALTER INDEX "idx_local_date_time_month" RENAME TO "asset_localDateTime_month_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_4d66e76dada1ca180f67a205dc" RENAME TO "asset_originalFileName_idx";`.execute(db);
+  await sql`ALTER INDEX "idx_originalfilename_trigram" RENAME TO "asset_originalFilename_trigram_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_16294b83fa8c0149719a1f631e" RENAME TO "asset_livePhotoVideoId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_2c5ac0d6fb58b238fd2068de67" RENAME TO "asset_ownerId_idx";`.execute(db);
+  await sql`ALTER INDEX "idx_asset_file_created_at" RENAME TO "asset_fileCreatedAt_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_8d3efe36c0755849395e6ea866" RENAME TO "asset_checksum_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_assets_duplicateId" RENAME TO "asset_duplicateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_assets_update_id" RENAME TO "asset_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_albums_update_id" RENAME TO "album_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_b22c53f35ef20c28c21637c85f" RENAME TO "album_ownerId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_05895aa505a670300d4816debc" RENAME TO "album_albumThumbnailAssetId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_album_assets_update_id" RENAME TO "album_asset_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_e590fa396c6898fcd4a50e4092" RENAME TO "album_asset_albumsId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_4bd1303d199f4e72ccdf998c62" RENAME TO "album_asset_assetsId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_activity_like" RENAME TO "activity_like_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_86102d85cfa7f196073aebff68" RENAME TO "activity_albumId_assetId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_3571467bcbe021f66e2bdce96e" RENAME TO "activity_userId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_1af8519996fbfb3684b58df280" RENAME TO "activity_albumId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_8091ea76b12338cb4428d33d78" RENAME TO "activity_assetId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_activity_update_id" RENAME TO "activity_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_album_assets_audit_album_id" RENAME TO "album_asset_audit_albumId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_album_assets_audit_deleted_at" RENAME TO "album_asset_audit_deletedAt_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_album_assets_audit_asset_id" RENAME TO "album_asset_audit_assetId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_albums_audit_deleted_at" RENAME TO "album_audit_deletedAt_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_albums_audit_album_id" RENAME TO "album_audit_albumId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_albums_audit_user_id" RENAME TO "album_audit_userId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_album_users_audit_user_id" RENAME TO "album_user_audit_userId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_album_users_audit_album_id" RENAME TO "album_user_audit_albumId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_album_users_audit_deleted_at" RENAME TO "album_user_audit_deletedAt_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_album_users_update_id" RENAME TO "album_user_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_album_users_create_id" RENAME TO "album_user_createId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_f48513bf9bccefd6ff3ad30bd0" RENAME TO "album_user_usersId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_427c350ad49bd3935a50baab73" RENAME TO "album_user_albumsId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_6c2e267ae764a9413b863a2934" RENAME TO "api_key_userId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_api_keys_update_id" RENAME TO "api_key_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_assets_audit_asset_id" RENAME TO "asset_audit_assetId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_assets_audit_deleted_at" RENAME TO "asset_audit_deletedAt_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_assets_audit_owner_id" RENAME TO "asset_audit_ownerId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_asset_exif_update_id" RENAME TO "asset_exif_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "exif_city" RENAME TO "asset_exif_city_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_auto_stack_id" RENAME TO "asset_exif_autoStackId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_live_photo_cid" RENAME TO "asset_exif_livePhotoCID_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_person_update_id" RENAME TO "person_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_5527cc99f530a547093f9e577b" RENAME TO "person_ownerId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_2bbabe31656b6778c6b87b6102" RENAME TO "person_faceAssetId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_bf339a24070dac7e71304ec530" RENAME TO "asset_face_personId_assetId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_asset_faces_assetId_personId" RENAME TO "asset_face_assetId_personId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_asset_files_assetId" RENAME TO "asset_file_assetId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_asset_files_update_id" RENAME TO "asset_file_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_ownerId_createdAt" RENAME TO "audit_ownerId_createdAt_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_memories_update_id" RENAME TO "memory_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_575842846f0c28fa5da46c99b1" RENAME TO "memory_ownerId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_memory_assets_audit_memory_id" RENAME TO "memory_asset_audit_memoryId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_memory_assets_audit_asset_id" RENAME TO "memory_asset_audit_assetId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_memory_assets_audit_deleted_at" RENAME TO "memory_asset_audit_deletedAt_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_6942ecf52d75d4273de19d2c16" RENAME TO "memory_asset_assetsId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_memory_assets_update_id" RENAME TO "memory_asset_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_984e5c9ab1f04d34538cd32334" RENAME TO "memory_asset_memoriesId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_memories_audit_deleted_at" RENAME TO "memory_audit_deletedAt_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_memories_audit_user_id" RENAME TO "memory_audit_userId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_memories_audit_memory_id" RENAME TO "memory_audit_memoryId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_notifications_update_id" RENAME TO "notification_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_692a909ee0fa9383e7859f9b40" RENAME TO "notification_userId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_partners_audit_shared_with_id" RENAME TO "partner_audit_sharedWithId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_partners_audit_deleted_at" RENAME TO "partner_audit_deletedAt_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_partners_audit_shared_by_id" RENAME TO "partner_audit_sharedById_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_d7e875c6c60e661723dbf372fd" RENAME TO "partner_sharedWithId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_partners_create_id" RENAME TO "partner_createId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_partners_update_id" RENAME TO "partner_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_person_audit_owner_id" RENAME TO "person_audit_ownerId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_person_audit_deleted_at" RENAME TO "person_audit_deletedAt_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_person_audit_person_id" RENAME TO "person_audit_personId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_sessions_update_id" RENAME TO "session_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_57de40bc620f456c7311aa3a1e" RENAME TO "session_userId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_afbbabbd7daf5b91de4dca84de" RENAME TO "session_parentId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_sharedlink_key" RENAME TO "shared_link_key_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_sharedlink_albumId" RENAME TO "shared_link_albumId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_66fe3837414c5a9f1c33ca4934" RENAME TO "shared_link_userId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_c9fab4aa97ffd1b034f3d6581a" RENAME TO "shared_link_asset_sharedLinksId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_5b7decce6c8d3db9593d6111a6" RENAME TO "shared_link_asset_assetsId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_stacks_audit_deleted_at" RENAME TO "stack_audit_deletedAt_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_d8ddd9d687816cc490432b3d4b" RENAME TO "session_sync_checkpoint_sessionId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_session_sync_checkpoints_update_id" RENAME TO "session_sync_checkpoint_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_9f9590cc11561f1f48ff034ef9" RENAME TO "tag_parentId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_tags_update_id" RENAME TO "tag_updateId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_f8e8a9e893cb5c54907f1b798e" RENAME TO "tag_asset_assetsId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_e99f31ea4cdf3a2c35c7287eb4" RENAME TO "tag_asset_tagsId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_tag_asset_assetsId_tagsId" RENAME TO "tag_asset_assetsId_tagsId_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_15fbcbc67663c6bfc07b354c22" RENAME TO "tag_closure_id_ancestor_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_b1a2a7ed45c29179b5ad51548a" RENAME TO "tag_closure_id_descendant_idx";`.execute(db);
+  await sql`ALTER INDEX "IDX_users_audit_deleted_at" RENAME TO "user_audit_deletedAt_idx";`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "user_delete_audit"
+  AFTER DELETE ON "user"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION user_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "user_updatedAt"
+  BEFORE UPDATE ON "user"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "library_updatedAt"
+  BEFORE UPDATE ON "library"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "stack_delete_audit"
+  AFTER DELETE ON "stack"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION stack_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "stack_updatedAt"
+  BEFORE UPDATE ON "stack"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_delete_audit"
+  AFTER DELETE ON "asset"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION asset_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_updatedAt"
+  BEFORE UPDATE ON "asset"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_delete_audit"
+  AFTER DELETE ON "album"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION album_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_updatedAt"
+  BEFORE UPDATE ON "album"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_asset_delete_audit"
+  AFTER DELETE ON "album_asset"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() <= 1)
+  EXECUTE FUNCTION album_asset_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_asset_updatedAt"
+  BEFORE UPDATE ON "album_asset"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "activity_updatedAt"
+  BEFORE UPDATE ON "activity"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_user_delete_audit"
+  AFTER DELETE ON "album_user"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() <= 1)
+  EXECUTE FUNCTION album_user_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_user_updatedAt"
+  BEFORE UPDATE ON "album_user"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "api_key_updatedAt"
+  BEFORE UPDATE ON "api_key"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_exif_updatedAt"
+  BEFORE UPDATE ON "asset_exif"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "person_updatedAt"
+  BEFORE UPDATE ON "person"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_file_updatedAt"
+  BEFORE UPDATE ON "asset_file"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "memory_delete_audit"
+  AFTER DELETE ON "memory"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION memory_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "memory_updatedAt"
+  BEFORE UPDATE ON "memory"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "memory_asset_delete_audit"
+  AFTER DELETE ON "memory_asset"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() <= 1)
+  EXECUTE FUNCTION memory_asset_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "memory_asset_updatedAt"
+  BEFORE UPDATE ON "memory_asset"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "notification_updatedAt"
+  BEFORE UPDATE ON "notification"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "partner_delete_audit"
+  AFTER DELETE ON "partner"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION partner_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "partner_updatedAt"
+  BEFORE UPDATE ON "partner"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "session_updatedAt"
+  BEFORE UPDATE ON "session"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "session_sync_checkpoint_updatedAt"
+  BEFORE UPDATE ON "session_sync_checkpoint"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "tag_updatedAt"
+  BEFORE UPDATE ON "tag"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`DROP FUNCTION users_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION partners_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION assets_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION albums_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION album_users_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION album_assets_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION memories_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION memory_assets_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION stacks_delete_audit;`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_user_delete_audit', '{"type":"function","name":"user_delete_audit","sql":"CREATE OR REPLACE FUNCTION user_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO user_audit (\\"userId\\")\\n      SELECT \\"id\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_partner_delete_audit', '{"type":"function","name":"partner_delete_audit","sql":"CREATE OR REPLACE FUNCTION partner_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO partner_audit (\\"sharedById\\", \\"sharedWithId\\")\\n      SELECT \\"sharedById\\", \\"sharedWithId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_asset_delete_audit', '{"type":"function","name":"asset_delete_audit","sql":"CREATE OR REPLACE FUNCTION asset_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO asset_audit (\\"assetId\\", \\"ownerId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_album_delete_audit', '{"type":"function","name":"album_delete_audit","sql":"CREATE OR REPLACE FUNCTION album_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO album_audit (\\"albumId\\", \\"userId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_album_asset_delete_audit', '{"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 \\"albumsId\\", \\"assetsId\\" FROM OLD\\n      WHERE \\"albumsId\\" IN (SELECT \\"id\\" FROM album WHERE \\"id\\" IN (SELECT \\"albumsId\\" FROM OLD));\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_album_user_delete_audit', '{"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 \\"albumsId\\", \\"usersId\\"\\n      FROM OLD;\\n\\n      IF pg_trigger_depth() = 1 THEN\\n        INSERT INTO album_user_audit (\\"albumId\\", \\"userId\\")\\n        SELECT \\"albumsId\\", \\"usersId\\"\\n        FROM OLD;\\n      END IF;\\n\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_memory_delete_audit', '{"type":"function","name":"memory_delete_audit","sql":"CREATE OR REPLACE FUNCTION memory_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO memory_audit (\\"memoryId\\", \\"userId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_memory_asset_delete_audit', '{"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\\", \\"assetsId\\" FROM OLD\\n      WHERE \\"memoriesId\\" IN (SELECT \\"id\\" FROM memory WHERE \\"id\\" IN (SELECT \\"memoriesId\\" FROM OLD));\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_stack_delete_audit', '{"type":"function","name":"stack_delete_audit","sql":"CREATE OR REPLACE FUNCTION stack_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO stack_audit (\\"stackId\\", \\"userId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_user_delete_audit', '{"type":"trigger","name":"user_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"user_delete_audit\\"\\n  AFTER DELETE ON \\"user\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION user_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_user_updatedAt', '{"type":"trigger","name":"user_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"user_updatedAt\\"\\n  BEFORE UPDATE ON \\"user\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_library_updatedAt', '{"type":"trigger","name":"library_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"library_updatedAt\\"\\n  BEFORE UPDATE ON \\"library\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_stack_delete_audit', '{"type":"trigger","name":"stack_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"stack_delete_audit\\"\\n  AFTER DELETE ON \\"stack\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION stack_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_stack_updatedAt', '{"type":"trigger","name":"stack_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"stack_updatedAt\\"\\n  BEFORE UPDATE ON \\"stack\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_delete_audit', '{"type":"trigger","name":"asset_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"asset_delete_audit\\"\\n  AFTER DELETE ON \\"asset\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION asset_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_updatedAt', '{"type":"trigger","name":"asset_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"asset_updatedAt\\"\\n  BEFORE UPDATE ON \\"asset\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_asset_originalFilename_trigram_idx', '{"type":"index","name":"asset_originalFilename_trigram_idx","sql":"CREATE INDEX \\"asset_originalFilename_trigram_idx\\" ON \\"asset\\" USING gin (f_unaccent(\\"originalFileName\\") gin_trgm_ops);"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_asset_localDateTime_month_idx', '{"type":"index","name":"asset_localDateTime_month_idx","sql":"CREATE INDEX \\"asset_localDateTime_month_idx\\" ON \\"asset\\" ((date_trunc(''MONTH''::text, (\\"localDateTime\\" AT TIME ZONE ''UTC''::text)) AT TIME ZONE ''UTC''::text));"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_asset_localDateTime_idx', '{"type":"index","name":"asset_localDateTime_idx","sql":"CREATE INDEX \\"asset_localDateTime_idx\\" ON \\"asset\\" (((\\"localDateTime\\" at time zone ''UTC'')::date));"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_asset_ownerId_libraryId_checksum_idx', '{"type":"index","name":"asset_ownerId_libraryId_checksum_idx","sql":"CREATE UNIQUE INDEX \\"asset_ownerId_libraryId_checksum_idx\\" ON \\"asset\\" (\\"ownerId\\", \\"libraryId\\", \\"checksum\\") WHERE (\\"libraryId\\" IS NOT NULL);"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_delete_audit', '{"type":"trigger","name":"album_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"album_delete_audit\\"\\n  AFTER DELETE ON \\"album\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION album_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_updatedAt', '{"type":"trigger","name":"album_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"album_updatedAt\\"\\n  BEFORE UPDATE ON \\"album\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_asset_delete_audit', '{"type":"trigger","name":"album_asset_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"album_asset_delete_audit\\"\\n  AFTER DELETE ON \\"album_asset\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() <= 1)\\n  EXECUTE FUNCTION album_asset_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_asset_updatedAt', '{"type":"trigger","name":"album_asset_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"album_asset_updatedAt\\"\\n  BEFORE UPDATE ON \\"album_asset\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_activity_updatedAt', '{"type":"trigger","name":"activity_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"activity_updatedAt\\"\\n  BEFORE UPDATE ON \\"activity\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_activity_like_idx', '{"type":"index","name":"activity_like_idx","sql":"CREATE UNIQUE INDEX \\"activity_like_idx\\" ON \\"activity\\" (\\"assetId\\", \\"userId\\", \\"albumId\\") WHERE (\\"isLiked\\" = true);"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_user_delete_audit', '{"type":"trigger","name":"album_user_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"album_user_delete_audit\\"\\n  AFTER DELETE ON \\"album_user\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() <= 1)\\n  EXECUTE FUNCTION album_user_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_user_updatedAt', '{"type":"trigger","name":"album_user_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"album_user_updatedAt\\"\\n  BEFORE UPDATE ON \\"album_user\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_api_key_updatedAt', '{"type":"trigger","name":"api_key_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"api_key_updatedAt\\"\\n  BEFORE UPDATE ON \\"api_key\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_exif_updatedAt', '{"type":"trigger","name":"asset_exif_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"asset_exif_updatedAt\\"\\n  BEFORE UPDATE ON \\"asset_exif\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_person_updatedAt', '{"type":"trigger","name":"person_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"person_updatedAt\\"\\n  BEFORE UPDATE ON \\"person\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_file_updatedAt', '{"type":"trigger","name":"asset_file_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"asset_file_updatedAt\\"\\n  BEFORE UPDATE ON \\"asset_file\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memory_delete_audit', '{"type":"trigger","name":"memory_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"memory_delete_audit\\"\\n  AFTER DELETE ON \\"memory\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION memory_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memory_updatedAt', '{"type":"trigger","name":"memory_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"memory_updatedAt\\"\\n  BEFORE UPDATE ON \\"memory\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memory_asset_delete_audit', '{"type":"trigger","name":"memory_asset_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"memory_asset_delete_audit\\"\\n  AFTER DELETE ON \\"memory_asset\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() <= 1)\\n  EXECUTE FUNCTION memory_asset_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memory_asset_updatedAt', '{"type":"trigger","name":"memory_asset_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"memory_asset_updatedAt\\"\\n  BEFORE UPDATE ON \\"memory_asset\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_notification_updatedAt', '{"type":"trigger","name":"notification_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"notification_updatedAt\\"\\n  BEFORE UPDATE ON \\"notification\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_partner_delete_audit', '{"type":"trigger","name":"partner_delete_audit","sql":"CREATE OR REPLACE TRIGGER \\"partner_delete_audit\\"\\n  AFTER DELETE ON \\"partner\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION partner_delete_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_partner_updatedAt', '{"type":"trigger","name":"partner_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"partner_updatedAt\\"\\n  BEFORE UPDATE ON \\"partner\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_session_updatedAt', '{"type":"trigger","name":"session_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"session_updatedAt\\"\\n  BEFORE UPDATE ON \\"session\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_session_sync_checkpoint_updatedAt', '{"type":"trigger","name":"session_sync_checkpoint_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"session_sync_checkpoint_updatedAt\\"\\n  BEFORE UPDATE ON \\"session_sync_checkpoint\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_tag_updatedAt', '{"type":"trigger","name":"tag_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"tag_updatedAt\\"\\n  BEFORE UPDATE ON \\"tag\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+  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 \\"albumsId\\" 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":"index","name":"UQ_assets_owner_checksum","sql":"CREATE UNIQUE INDEX \\"UQ_assets_owner_checksum\\" ON \\"asset\\" (\\"ownerId\\", \\"checksum\\") WHERE (\\"libraryId\\" IS NULL);"}'::jsonb WHERE "name" = 'index_UQ_assets_owner_checksum';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"trigger","name":"album_user_after_insert","sql":"CREATE OR REPLACE TRIGGER \\"album_user_after_insert\\"\\n  AFTER INSERT ON \\"album_user\\"\\n  REFERENCING NEW TABLE AS \\"inserted_rows\\"\\n  FOR EACH STATEMENT\\n  EXECUTE FUNCTION album_user_after_insert();"}'::jsonb WHERE "name" = 'trigger_album_user_after_insert';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_users_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_partners_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_assets_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_albums_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_album_assets_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_album_users_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_memories_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_memory_assets_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_stacks_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_users_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_users_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_libraries_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_stacks_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_stacks_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_assets_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_assets_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_albums_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_albums_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_activity_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_album_assets_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_album_assets_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_album_users_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_album_users_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_api_keys_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_person_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_files_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_exif_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_memories_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_memories_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_memory_assets_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_memory_assets_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_notifications_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_partners_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_partners_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_sessions_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_session_sync_checkpoints_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_tags_updated_at';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'index_idx_originalfilename_trigram';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'index_idx_local_date_time_month';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'index_idx_local_date_time';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'index_UQ_assets_owner_library_checksum';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'index_IDX_activity_like';`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  for (const { oldName, newName } of tables) {
+    await sql.raw(`ALTER TABLE "${newName}" RENAME TO "${oldName}"`).execute(db);
+  }
+  await sql`CREATE OR REPLACE FUNCTION public.album_user_after_insert()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      UPDATE albums SET "updatedAt" = clock_timestamp(), "updateId" = immich_uuid_v7(clock_timestamp())
+      WHERE "id" IN (SELECT DISTINCT "albumsId" FROM inserted_rows);
+      RETURN NULL;
+    END
+  $function$
+`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION public.users_delete_audit()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      INSERT INTO users_audit ("userId")
+      SELECT "id"
+      FROM OLD;
+      RETURN NULL;
+    END;
+  $function$
+`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION public.partners_delete_audit()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      INSERT INTO partners_audit ("sharedById", "sharedWithId")
+      SELECT "sharedById", "sharedWithId"
+      FROM OLD;
+      RETURN NULL;
+    END;
+  $function$
+`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION public.assets_delete_audit()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      INSERT INTO assets_audit ("assetId", "ownerId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END;
+  $function$
+`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION public.albums_delete_audit()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      INSERT INTO albums_audit ("albumId", "userId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $function$
+`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION public.album_users_delete_audit()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      INSERT INTO albums_audit ("albumId", "userId")
+      SELECT "albumsId", "usersId"
+      FROM OLD;
+
+      IF pg_trigger_depth() = 1 THEN
+        INSERT INTO album_users_audit ("albumId", "userId")
+        SELECT "albumsId", "usersId"
+        FROM OLD;
+      END IF;
+
+      RETURN NULL;
+    END
+  $function$
+`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION public.album_assets_delete_audit()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      INSERT INTO album_assets_audit ("albumId", "assetId")
+      SELECT "albumsId", "assetsId" FROM OLD
+      WHERE "albumsId" IN (SELECT "id" FROM albums WHERE "id" IN (SELECT "albumsId" FROM OLD));
+      RETURN NULL;
+    END
+  $function$
+`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION public.memories_delete_audit()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      INSERT INTO memories_audit ("memoryId", "userId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $function$
+`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION public.memory_assets_delete_audit()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      INSERT INTO memory_assets_audit ("memoryId", "assetId")
+      SELECT "memoriesId", "assetsId" FROM OLD
+      WHERE "memoriesId" IN (SELECT "id" FROM memories WHERE "id" IN (SELECT "memoriesId" FROM OLD));
+      RETURN NULL;
+    END
+  $function$
+`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION public.stacks_delete_audit()
+ RETURNS trigger
+ LANGUAGE plpgsql
+AS $function$
+    BEGIN
+      INSERT INTO stacks_audit ("stackId", "userId")
+      SELECT "id", "ownerId"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $function$
+`.execute(db);
+  await sql`DROP TRIGGER "activity_updatedAt" ON "activity";`.execute(db);
+  await sql`DROP TRIGGER "person_updatedAt" ON "person";`.execute(db);
+  await sql`DROP TRIGGER "album_asset_delete_audit" ON "album_asset";`.execute(db);
+  await sql`DROP TRIGGER "album_asset_updatedAt" ON "album_asset";`.execute(db);
+  await sql`DROP TRIGGER "album_user_delete_audit" ON "album_user";`.execute(db);
+  await sql`DROP TRIGGER "album_user_updatedAt" ON "album_user";`.execute(db);
+  await sql`DROP TRIGGER "album_delete_audit" ON "album";`.execute(db);
+  await sql`DROP TRIGGER "album_updatedAt" ON "album";`.execute(db);
+  await sql`DROP TRIGGER "api_key_updatedAt" ON "api_key";`.execute(db);
+  await sql`DROP TRIGGER "asset_delete_audit" ON "asset";`.execute(db);
+  await sql`DROP TRIGGER "asset_updatedAt" ON "asset";`.execute(db);
+  await sql`DROP TRIGGER "asset_file_updatedAt" ON "asset_file";`.execute(db);
+  await sql`DROP TRIGGER "asset_exif_updatedAt" ON "asset_exif";`.execute(db);
+  await sql`DROP TRIGGER "library_updatedAt" ON "library";`.execute(db);
+  await sql`DROP TRIGGER "memory_asset_delete_audit" ON "memory_asset";`.execute(db);
+  await sql`DROP TRIGGER "memory_asset_updatedAt" ON "memory_asset";`.execute(db);
+  await sql`DROP TRIGGER "memory_delete_audit" ON "memory";`.execute(db);
+  await sql`DROP TRIGGER "memory_updatedAt" ON "memory";`.execute(db);
+  await sql`DROP TRIGGER "notification_updatedAt" ON "notification";`.execute(db);
+  await sql`DROP TRIGGER "partner_delete_audit" ON "partner";`.execute(db);
+  await sql`DROP TRIGGER "partner_updatedAt" ON "partner";`.execute(db);
+  await sql`DROP TRIGGER "session_updatedAt" ON "session";`.execute(db);
+  await sql`DROP TRIGGER "stack_delete_audit" ON "stack";`.execute(db);
+  await sql`DROP TRIGGER "stack_updatedAt" ON "stack";`.execute(db);
+  await sql`DROP TRIGGER "session_sync_checkpoint_updatedAt" ON "session_sync_checkpoint";`.execute(db);
+  await sql`DROP TRIGGER "tag_updatedAt" ON "tag";`.execute(db);
+  await sql`DROP TRIGGER "user_delete_audit" ON "user";`.execute(db);
+  await sql`DROP TRIGGER "user_updatedAt" ON "user";`.execute(db);
+  await sql`ALTER TABLE "asset_audit" RENAME CONSTRAINT "asset_audit_pkey" TO "PK_99bd5c015f81a641927a32b4212";`.execute(db);
+  await sql`ALTER TABLE "audit" RENAME CONSTRAINT "audit_pkey" TO "PK_1d3d120ddaf7bc9b1ed68ed463a";`.execute(db);
+  await sql`ALTER TABLE "move_history" RENAME CONSTRAINT "move_history_pkey" TO "PK_af608f132233acf123f2949678d";`.execute(db);
+  await sql`ALTER TABLE "partner_audit" RENAME CONSTRAINT "partner_audit_pkey" TO "PK_952b50217ff78198a7e380f0359";`.execute(db);
+  await sql`ALTER TABLE "user_audit" RENAME CONSTRAINT "user_audit_pkey" TO "PK_e9b2bdfd90e7eb5961091175180";`.execute(db);
+  await sql`ALTER TABLE "system_metadata" RENAME CONSTRAINT "system_metadata_pkey" TO "PK_fa94f6857470fb5b81ec6084465";`.execute(db);
+  await sql`ALTER TABLE "version_history" RENAME CONSTRAINT "version_history_pkey" TO "PK_5db259cbb09ce82c0d13cfd1b23";`.execute(db);
+  await sql`ALTER TABLE "asset_job_status" RENAME CONSTRAINT "asset_job_status_assetId_fkey" TO "FK_420bec36fc02813bddf5c8b73d4";`.execute(db);
+  await sql`ALTER TABLE "asset_job_status" RENAME CONSTRAINT "asset_job_status_pkey" TO "PK_420bec36fc02813bddf5c8b73d4";`.execute(db);
+  await sql`ALTER TABLE "tag_asset" RENAME CONSTRAINT "tag_asset_assetsId_fkey" TO "FK_f8e8a9e893cb5c54907f1b798e9";`.execute(db);
+  await sql`ALTER TABLE "tag_asset" RENAME CONSTRAINT "tag_asset_tagsId_fkey" TO "FK_e99f31ea4cdf3a2c35c7287eb42";`.execute(db);
+  await sql`ALTER TABLE "tag_asset" RENAME CONSTRAINT "tag_asset_pkey" TO "PK_ef5346fe522b5fb3bc96454747e";`.execute(db);
+  await sql`ALTER TABLE "user_metadata" RENAME CONSTRAINT "user_metadata_userId_fkey" TO "FK_6afb43681a21cf7815932bc38ac";`.execute(db);
+  await sql`ALTER TABLE "user_metadata" RENAME CONSTRAINT "user_metadata_pkey" TO "PK_5931462150b3438cbc83277fe5a";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "activity_albumId_fkey" TO "FK_1af8519996fbfb3684b58df280b";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "activity_userId_fkey" TO "FK_3571467bcbe021f66e2bdce96ea";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "activity_assetId_fkey" TO "FK_8091ea76b12338cb4428d33d782";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "activity_albumId_assetId_fkey" TO "fk_activity_album_asset_composite";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "activity_like_check" TO "CHK_2ab1e70f113f450eb40c1e3ec8";`.execute(db);
+  await sql`ALTER TABLE "activity" RENAME CONSTRAINT "activity_pkey" TO "PK_24625a1d6b1b089c8ae206fe467";`.execute(db);
+  await sql`ALTER TABLE "person" RENAME CONSTRAINT "person_ownerId_fkey" TO "FK_5527cc99f530a547093f9e577b6";`.execute(db);
+  await sql`ALTER TABLE "person" RENAME CONSTRAINT "person_faceAssetId_fkey" TO "FK_2bbabe31656b6778c6b87b61023";`.execute(db);
+  await sql`ALTER TABLE "person" RENAME CONSTRAINT "person_birthDate_chk" TO "CHK_b0f82b0ed662bfc24fbb58bb45";`.execute(db);
+  await sql`ALTER TABLE "person" RENAME CONSTRAINT "person_pkey" TO "PK_5fdaf670315c4b7e70cce85daa3";`.execute(db);
+  await sql`ALTER TABLE "person_audit" RENAME CONSTRAINT "person_audit_pkey" TO "PK_46c1ad23490b9312ffaa052aa59";`.execute(db);
+  await sql`ALTER TABLE "album_asset_audit" RENAME CONSTRAINT "album_asset_audit_albumId_fkey" TO "FK_8047b44b812619a3c75a2839b0d";`.execute(db);
+  await sql`ALTER TABLE "album_asset_audit" RENAME CONSTRAINT "album_asset_audit_pkey" TO "PK_32969b576ec8f78d84f37c2eb2d";`.execute(db);
+  await sql`ALTER TABLE "album_asset" RENAME CONSTRAINT "album_asset_albumsId_fkey" TO "FK_e590fa396c6898fcd4a50e40927";`.execute(db);
+  await sql`ALTER TABLE "album_asset" RENAME CONSTRAINT "album_asset_assetsId_fkey" TO "FK_4bd1303d199f4e72ccdf998c621";`.execute(db);
+  await sql`ALTER TABLE "album_asset" RENAME CONSTRAINT "album_asset_pkey" TO "PK_c67bc36fa845fb7b18e0e398180";`.execute(db);
+  await sql`ALTER TABLE "album_audit" RENAME CONSTRAINT "album_audit_pkey" TO "PK_c75efea8d4dce316ad29b851a8b";`.execute(db);
+  await sql`ALTER TABLE "album_user_audit" RENAME CONSTRAINT "album_user_audit_pkey" TO "PK_f479a2e575b7ebc9698362c1688";`.execute(db);
+  await sql`ALTER TABLE "album_user" RENAME CONSTRAINT "album_user_albumsId_fkey" TO "FK_427c350ad49bd3935a50baab737";`.execute(db);
+  await sql`ALTER TABLE "album_user" RENAME CONSTRAINT "album_user_usersId_fkey" TO "FK_f48513bf9bccefd6ff3ad30bd06";`.execute(db);
+  await sql`ALTER TABLE "album_user" RENAME CONSTRAINT "album_user_pkey" TO "PK_7df55657e0b2e8b626330a0ebc8";`.execute(db);
+  await sql`ALTER TABLE "album" RENAME CONSTRAINT "album_ownerId_fkey" TO "FK_b22c53f35ef20c28c21637c85f4";`.execute(db);
+  await sql`ALTER TABLE "album" RENAME CONSTRAINT "album_albumThumbnailAssetId_fkey" TO "FK_05895aa505a670300d4816debce";`.execute(db);
+  await sql`ALTER TABLE "album" RENAME CONSTRAINT "album_pkey" TO "PK_7f71c7b5bc7c87b8f94c9a93a00";`.execute(db);
+  await sql`ALTER TABLE "api_key" RENAME CONSTRAINT "api_key_userId_fkey" TO "FK_6c2e267ae764a9413b863a29342";`.execute(db);
+  await sql`ALTER TABLE "api_key" RENAME CONSTRAINT "api_key_pkey" TO "PK_5c8a79801b44bd27b79228e1dad";`.execute(db);
+  await sql`ALTER TABLE "asset" RENAME CONSTRAINT "asset_ownerId_fkey" TO "FK_2c5ac0d6fb58b238fd2068de67d";`.execute(db);
+  await sql`ALTER TABLE "asset" RENAME CONSTRAINT "asset_livePhotoVideoId_fkey" TO "FK_16294b83fa8c0149719a1f631ef";`.execute(db);
+  await sql`ALTER TABLE "asset" RENAME CONSTRAINT "asset_libraryId_fkey" TO "FK_9977c3c1de01c3d848039a6b90c";`.execute(db);
+  await sql`ALTER TABLE "asset" RENAME CONSTRAINT "asset_stackId_fkey" TO "FK_f15d48fa3ea5e4bda05ca8ab207";`.execute(db);
+  await sql`ALTER TABLE "asset" RENAME CONSTRAINT "asset_pkey" TO "PK_da96729a8b113377cfb6a62439c";`.execute(db);
+  await sql`ALTER TABLE "asset_face" RENAME CONSTRAINT "asset_face_assetId_fkey" TO "FK_02a43fd0b3c50fb6d7f0cb7282c";`.execute(db);
+  await sql`ALTER TABLE "asset_face" RENAME CONSTRAINT "asset_face_personId_fkey" TO "FK_95ad7106dd7b484275443f580f9";`.execute(db);
+  await sql`ALTER TABLE "asset_face" RENAME CONSTRAINT "asset_face_pkey" TO "PK_6df76ab2eb6f5b57b7c2f1fc684";`.execute(db);
+  await sql`ALTER TABLE "asset_file" RENAME CONSTRAINT "asset_file_assetId_fkey" TO "FK_e3e103a5f1d8bc8402999286040";`.execute(db);
+  await sql`ALTER TABLE "asset_file" RENAME CONSTRAINT "asset_file_assetId_type_uq" TO "UQ_assetId_type";`.execute(db);
+  await sql`ALTER TABLE "asset_file" RENAME CONSTRAINT "asset_file_pkey" TO "PK_c41dc3e9ef5e1c57ca5a08a0004";`.execute(db);
+  await sql`ALTER TABLE "asset_exif" RENAME CONSTRAINT "asset_exif_assetId_fkey" TO "FK_c0117fdbc50b917ef9067740c44";`.execute(db);
+  await sql`ALTER TABLE "asset_exif" RENAME CONSTRAINT "asset_exif_pkey" TO "PK_c0117fdbc50b917ef9067740c44";`.execute(db);
+  await sql`ALTER TABLE "library" RENAME CONSTRAINT "library_ownerId_fkey" TO "FK_0f6fc2fb195f24d19b0fb0d57c1";`.execute(db);
+  await sql`ALTER TABLE "library" RENAME CONSTRAINT "library_pkey" TO "PK_505fedfcad00a09b3734b4223de";`.execute(db);
+  await sql`ALTER TABLE "memory_asset_audit" RENAME CONSTRAINT "memory_asset_audit_memoryId_fkey" TO "FK_225a204afcb0bd6de015080fb03";`.execute(db);
+  await sql`ALTER TABLE "memory_asset_audit" RENAME CONSTRAINT "memory_asset_audit_pkey" TO "PK_35ef16910228f980e0766dcc59b";`.execute(db);
+  await sql`ALTER TABLE "memory_asset" RENAME CONSTRAINT "memory_asset_memoriesId_fkey" TO "FK_984e5c9ab1f04d34538cd32334e";`.execute(db);
+  await sql`ALTER TABLE "memory_asset" RENAME CONSTRAINT "memory_asset_assetsId_fkey" TO "FK_6942ecf52d75d4273de19d2c16f";`.execute(db);
+  await sql`ALTER TABLE "memory_asset" RENAME CONSTRAINT "memory_asset_pkey" TO "PK_fcaf7112a013d1703c011c6793d";`.execute(db);
+  await sql`ALTER TABLE "memory_audit" RENAME CONSTRAINT "memory_audit_pkey" TO "PK_19de798c033a710dcfa5c72f81b";`.execute(db);
+  await sql`ALTER TABLE "memory" RENAME CONSTRAINT "memory_ownerId_fkey" TO "FK_575842846f0c28fa5da46c99b19";`.execute(db);
+  await sql`ALTER TABLE "memory" RENAME CONSTRAINT "memory_pkey" TO "PK_aaa0692d9496fe827b0568612f8";`.execute(db);
+  await sql`ALTER TABLE "notification" RENAME CONSTRAINT "notification_userId_fkey" TO "FK_692a909ee0fa9383e7859f9b406";`.execute(db);
+  await sql`ALTER TABLE "notification" RENAME CONSTRAINT "notification_pkey" TO "PK_6a72c3c0f683f6462415e653c3a";`.execute(db);
+  await sql`ALTER TABLE "partner" RENAME CONSTRAINT "partner_sharedById_fkey" TO "FK_7e077a8b70b3530138610ff5e04";`.execute(db);
+  await sql`ALTER TABLE "partner" RENAME CONSTRAINT "partner_sharedWithId_fkey" TO "FK_d7e875c6c60e661723dbf372fd3";`.execute(db);
+  await sql`ALTER TABLE "partner" RENAME CONSTRAINT "partner_pkey" TO "PK_f1cc8f73d16b367f426261a8736";`.execute(db);
+  await sql`ALTER TABLE "session" RENAME CONSTRAINT "session_userId_fkey" TO "FK_57de40bc620f456c7311aa3a1e6";`.execute(db);
+  await sql`ALTER TABLE "session" RENAME CONSTRAINT "session_parentId_fkey" TO "FK_afbbabbd7daf5b91de4dca84de8";`.execute(db);
+  await sql`ALTER TABLE "session" RENAME CONSTRAINT "session_pkey" TO "PK_48cb6b5c20faa63157b3c1baf7f";`.execute(db);
+  await sql`ALTER TABLE "shared_link_asset" RENAME CONSTRAINT "shared_link_asset_assetsId_fkey" TO "FK_5b7decce6c8d3db9593d6111a66";`.execute(db);
+  await sql`ALTER TABLE "shared_link_asset" RENAME CONSTRAINT "shared_link_asset_sharedLinksId_fkey" TO "FK_c9fab4aa97ffd1b034f3d6581ab";`.execute(db);
+  await sql`ALTER TABLE "shared_link_asset" RENAME CONSTRAINT "shared_link_asset_pkey" TO "PK_9b4f3687f9b31d1e311336b05e3";`.execute(db);
+  await sql`ALTER TABLE "shared_link" RENAME CONSTRAINT "shared_link_userId_fkey" TO "FK_66fe3837414c5a9f1c33ca49340";`.execute(db);
+  await sql`ALTER TABLE "shared_link" RENAME CONSTRAINT "shared_link_albumId_fkey" TO "FK_0c6ce9058c29f07cdf7014eac66";`.execute(db);
+  await sql`ALTER TABLE "shared_link" RENAME CONSTRAINT "shared_link_key_uq" TO "UQ_sharedlink_key";`.execute(db);
+  await sql`ALTER TABLE "shared_link" RENAME CONSTRAINT "shared_link_pkey" TO "PK_642e2b0f619e4876e5f90a43465";`.execute(db);
+  await sql`ALTER TABLE "stack_audit" RENAME CONSTRAINT "stack_audit_pkey" TO "PK_dbe4ec648fa032e8973297de07e";`.execute(db);
+  await sql`ALTER TABLE "stack" RENAME CONSTRAINT "stack_primaryAssetId_fkey" TO "FK_91704e101438fd0653f582426dc";`.execute(db);
+  await sql`ALTER TABLE "stack" RENAME CONSTRAINT "stack_primaryAssetId_uq" TO "REL_91704e101438fd0653f582426d";`.execute(db);
+  await sql`ALTER TABLE "stack" RENAME CONSTRAINT "stack_ownerId_fkey" TO "FK_c05079e542fd74de3b5ecb5c1c8";`.execute(db);
+  await sql`ALTER TABLE "stack" RENAME CONSTRAINT "stack_pkey" TO "PK_74a27e7fcbd5852463d0af3034b";`.execute(db);
+  await sql`ALTER TABLE "session_sync_checkpoint" RENAME CONSTRAINT "session_sync_checkpoint_sessionId_fkey" TO "FK_d8ddd9d687816cc490432b3d4bc";`.execute(db);
+  await sql`ALTER TABLE "session_sync_checkpoint" RENAME CONSTRAINT "session_sync_checkpoint_pkey" TO "PK_b846ab547a702863ef7cd9412fb";`.execute(db);
+  await sql`ALTER TABLE "tag_closure" RENAME CONSTRAINT "tag_closure_id_ancestor_fkey" TO "FK_15fbcbc67663c6bfc07b354c22c";`.execute(db);
+  await sql`ALTER TABLE "tag_closure" RENAME CONSTRAINT "tag_closure_id_descendant_fkey" TO "FK_b1a2a7ed45c29179b5ad51548a1";`.execute(db);
+  await sql`ALTER TABLE "tag_closure" RENAME CONSTRAINT "tag_closure_pkey" TO "PK_eab38eb12a3ec6df8376c95477c";`.execute(db);
+  await sql`ALTER TABLE "tag" RENAME CONSTRAINT "tag_userId_fkey" TO "FK_92e67dc508c705dd66c94615576";`.execute(db);
+  await sql`ALTER TABLE "tag" RENAME CONSTRAINT "tag_parentId_fkey" TO "FK_9f9590cc11561f1f48ff034ef99";`.execute(db);
+  await sql`ALTER TABLE "tag" RENAME CONSTRAINT "tag_userId_value_uq" TO "UQ_79d6f16e52bb2c7130375246793";`.execute(db);
+  await sql`ALTER TABLE "tag" RENAME CONSTRAINT "tag_pkey" TO "PK_e7dc17249a1148a1970748eda99";`.execute(db);
+  await sql`ALTER TABLE "user" RENAME CONSTRAINT "user_email_uq" TO "UQ_97672ac88f789774dd47f7c8be3";`.execute(db);
+  await sql`ALTER TABLE "user" RENAME CONSTRAINT "user_storageLabel_uq" TO "UQ_b309cf34fa58137c416b32cea3a";`.execute(db);
+  await sql`ALTER TABLE "user" RENAME CONSTRAINT "user_pkey" TO "PK_a3ffb1c0c8416b9fc6f907b7433";`.execute(db);
+  await sql`ALTER TABLE "user_metadata_audit" RENAME CONSTRAINT "user_metadata_audit_pkey" TO "PK_15d5cc4d65ac966233b9921acac";`.execute(db);
+  await sql`ALTER INDEX "asset_audit_assetId_idx" RENAME TO "IDX_assets_audit_asset_id";`.execute(db);
+  await sql`ALTER INDEX "asset_audit_ownerId_idx" RENAME TO "IDX_assets_audit_owner_id";`.execute(db);
+  await sql`ALTER INDEX "asset_audit_deletedAt_idx" RENAME TO "IDX_assets_audit_deleted_at";`.execute(db);
+  await sql`ALTER INDEX "audit_ownerId_createdAt_idx" RENAME TO "IDX_ownerId_createdAt";`.execute(db);
+  await sql`ALTER INDEX "partner_audit_sharedById_idx" RENAME TO "IDX_partners_audit_shared_by_id";`.execute(db);
+  await sql`ALTER INDEX "partner_audit_sharedWithId_idx" RENAME TO "IDX_partners_audit_shared_with_id";`.execute(db);
+  await sql`ALTER INDEX "partner_audit_deletedAt_idx" RENAME TO "IDX_partners_audit_deleted_at";`.execute(db);
+  await sql`ALTER INDEX "user_audit_deletedAt_idx" RENAME TO "IDX_users_audit_deleted_at";`.execute(db);
+  await sql`ALTER INDEX "tag_asset_assetsId_tagsId_idx" RENAME TO "IDX_tag_asset_assetsId_tagsId";`.execute(db);
+  await sql`ALTER INDEX "tag_asset_assetsId_idx" RENAME TO "IDX_f8e8a9e893cb5c54907f1b798e";`.execute(db);
+  await sql`ALTER INDEX "tag_asset_tagsId_idx" RENAME TO "IDX_e99f31ea4cdf3a2c35c7287eb4";`.execute(db);
+  await sql`ALTER INDEX "activity_albumId_assetId_idx" RENAME TO "IDX_86102d85cfa7f196073aebff68";`.execute(db);
+  await sql`ALTER INDEX "activity_like_idx" RENAME TO "IDX_activity_like";`.execute(db);
+  await sql`ALTER INDEX "activity_albumId_idx" RENAME TO "IDX_1af8519996fbfb3684b58df280";`.execute(db);
+  await sql`ALTER INDEX "activity_userId_idx" RENAME TO "IDX_3571467bcbe021f66e2bdce96e";`.execute(db);
+  await sql`ALTER INDEX "activity_assetId_idx" RENAME TO "IDX_8091ea76b12338cb4428d33d78";`.execute(db);
+  await sql`ALTER INDEX "activity_updateId_idx" RENAME TO "IDX_activity_update_id";`.execute(db);
+  await sql`ALTER INDEX "person_ownerId_idx" RENAME TO "IDX_5527cc99f530a547093f9e577b";`.execute(db);
+  await sql`ALTER INDEX "person_faceAssetId_idx" RENAME TO "IDX_2bbabe31656b6778c6b87b6102";`.execute(db);
+  await sql`ALTER INDEX "person_updateId_idx" RENAME TO "IDX_person_update_id";`.execute(db);
+  await sql`ALTER INDEX "person_audit_personId_idx" RENAME TO "IDX_person_audit_person_id";`.execute(db);
+  await sql`ALTER INDEX "person_audit_ownerId_idx" RENAME TO "IDX_person_audit_owner_id";`.execute(db);
+  await sql`ALTER INDEX "person_audit_deletedAt_idx" RENAME TO "IDX_person_audit_deleted_at";`.execute(db);
+  await sql`ALTER INDEX "album_asset_audit_albumId_idx" RENAME TO "IDX_album_assets_audit_album_id";`.execute(db);
+  await sql`ALTER INDEX "album_asset_audit_assetId_idx" RENAME TO "IDX_album_assets_audit_asset_id";`.execute(db);
+  await sql`ALTER INDEX "album_asset_audit_deletedAt_idx" RENAME TO "IDX_album_assets_audit_deleted_at";`.execute(db);
+  await sql`ALTER INDEX "album_asset_albumsId_idx" RENAME TO "IDX_e590fa396c6898fcd4a50e4092";`.execute(db);
+  await sql`ALTER INDEX "album_asset_assetsId_idx" RENAME TO "IDX_4bd1303d199f4e72ccdf998c62";`.execute(db);
+  await sql`ALTER INDEX "album_asset_updateId_idx" RENAME TO "IDX_album_assets_update_id";`.execute(db);
+  await sql`ALTER INDEX "album_audit_albumId_idx" RENAME TO "IDX_albums_audit_album_id";`.execute(db);
+  await sql`ALTER INDEX "album_audit_userId_idx" RENAME TO "IDX_albums_audit_user_id";`.execute(db);
+  await sql`ALTER INDEX "album_audit_deletedAt_idx" RENAME TO "IDX_albums_audit_deleted_at";`.execute(db);
+  await sql`ALTER INDEX "album_user_audit_albumId_idx" RENAME TO "IDX_album_users_audit_album_id";`.execute(db);
+  await sql`ALTER INDEX "album_user_audit_userId_idx" RENAME TO "IDX_album_users_audit_user_id";`.execute(db);
+  await sql`ALTER INDEX "album_user_audit_deletedAt_idx" RENAME TO "IDX_album_users_audit_deleted_at";`.execute(db);
+  await sql`ALTER INDEX "album_user_albumsId_idx" RENAME TO "IDX_427c350ad49bd3935a50baab73";`.execute(db);
+  await sql`ALTER INDEX "album_user_usersId_idx" RENAME TO "IDX_f48513bf9bccefd6ff3ad30bd0";`.execute(db);
+  await sql`ALTER INDEX "album_user_createId_idx" RENAME TO "IDX_album_users_create_id";`.execute(db);
+  await sql`ALTER INDEX "album_user_updateId_idx" RENAME TO "IDX_album_users_update_id";`.execute(db);
+  await sql`ALTER INDEX "album_ownerId_idx" RENAME TO "IDX_b22c53f35ef20c28c21637c85f";`.execute(db);
+  await sql`ALTER INDEX "album_albumThumbnailAssetId_idx" RENAME TO "IDX_05895aa505a670300d4816debc";`.execute(db);
+  await sql`ALTER INDEX "album_updateId_idx" RENAME TO "IDX_albums_update_id";`.execute(db);
+  await sql`ALTER INDEX "api_key_userId_idx" RENAME TO "IDX_6c2e267ae764a9413b863a2934";`.execute(db);
+  await sql`ALTER INDEX "api_key_updateId_idx" RENAME TO "IDX_api_keys_update_id";`.execute(db);
+  await sql`ALTER INDEX "asset_originalFilename_trigram_idx" RENAME TO "idx_originalfilename_trigram";`.execute(db);
+  await sql`ALTER INDEX "asset_id_stackId_idx" RENAME TO "IDX_asset_id_stackId";`.execute(db);
+  await sql`ALTER INDEX "asset_originalPath_libraryId_idx" RENAME TO "IDX_originalPath_libraryId";`.execute(db);
+  await sql`ALTER INDEX "asset_localDateTime_month_idx" RENAME TO "idx_local_date_time_month";`.execute(db);
+  await sql`ALTER INDEX "asset_localDateTime_idx" RENAME TO "idx_local_date_time";`.execute(db);
+  await sql`ALTER INDEX "asset_ownerId_libraryId_checksum_idx" RENAME TO "UQ_assets_owner_library_checksum";`.execute(db);
+  await sql`ALTER INDEX "asset_ownerId_idx" RENAME TO "IDX_2c5ac0d6fb58b238fd2068de67";`.execute(db);
+  await sql`ALTER INDEX "asset_fileCreatedAt_idx" RENAME TO "idx_asset_file_created_at";`.execute(db);
+  await sql`ALTER INDEX "asset_checksum_idx" RENAME TO "IDX_8d3efe36c0755849395e6ea866";`.execute(db);
+  await sql`ALTER INDEX "asset_livePhotoVideoId_idx" RENAME TO "IDX_16294b83fa8c0149719a1f631e";`.execute(db);
+  await sql`ALTER INDEX "asset_originalFileName_idx" RENAME TO "IDX_4d66e76dada1ca180f67a205dc";`.execute(db);
+  await sql`ALTER INDEX "asset_libraryId_idx" RENAME TO "IDX_9977c3c1de01c3d848039a6b90";`.execute(db);
+  await sql`ALTER INDEX "asset_stackId_idx" RENAME TO "IDX_f15d48fa3ea5e4bda05ca8ab20";`.execute(db);
+  await sql`ALTER INDEX "asset_duplicateId_idx" RENAME TO "IDX_assets_duplicateId";`.execute(db);
+  await sql`ALTER INDEX "asset_updateId_idx" RENAME TO "IDX_assets_update_id";`.execute(db);
+  await sql`ALTER INDEX "asset_face_assetId_personId_idx" RENAME TO "IDX_asset_faces_assetId_personId";`.execute(db);
+  await sql`ALTER INDEX "asset_file_assetId_idx" RENAME TO "IDX_asset_files_assetId";`.execute(db);
+  await sql`ALTER INDEX "asset_file_updateId_idx" RENAME TO "IDX_asset_files_update_id";`.execute(db);
+  await sql`ALTER INDEX "asset_exif_city_idx" RENAME TO "exif_city";`.execute(db);
+  await sql`ALTER INDEX "asset_exif_livePhotoCID_idx" RENAME TO "IDX_live_photo_cid";`.execute(db);
+  await sql`ALTER INDEX "asset_exif_autoStackId_idx" RENAME TO "IDX_auto_stack_id";`.execute(db);
+  await sql`ALTER INDEX "asset_exif_updateId_idx" RENAME TO "IDX_asset_exif_update_id";`.execute(db);
+  await sql`ALTER INDEX "library_ownerId_idx" RENAME TO "IDX_0f6fc2fb195f24d19b0fb0d57c";`.execute(db);
+  await sql`ALTER INDEX "library_updateId_idx" RENAME TO "IDX_libraries_update_id";`.execute(db);
+  await sql`ALTER INDEX "memory_asset_audit_memoryId_idx" RENAME TO "IDX_memory_assets_audit_memory_id";`.execute(db);
+  await sql`ALTER INDEX "memory_asset_audit_assetId_idx" RENAME TO "IDX_memory_assets_audit_asset_id";`.execute(db);
+  await sql`ALTER INDEX "memory_asset_audit_deletedAt_idx" RENAME TO "IDX_memory_assets_audit_deleted_at";`.execute(db);
+  await sql`ALTER INDEX "memory_asset_memoriesId_idx" RENAME TO "IDX_984e5c9ab1f04d34538cd32334";`.execute(db);
+  await sql`ALTER INDEX "memory_asset_assetsId_idx" RENAME TO "IDX_6942ecf52d75d4273de19d2c16";`.execute(db);
+  await sql`ALTER INDEX "memory_asset_updateId_idx" RENAME TO "IDX_memory_assets_update_id";`.execute(db);
+  await sql`ALTER INDEX "memory_audit_memoryId_idx" RENAME TO "IDX_memories_audit_memory_id";`.execute(db);
+  await sql`ALTER INDEX "memory_audit_userId_idx" RENAME TO "IDX_memories_audit_user_id";`.execute(db);
+  await sql`ALTER INDEX "memory_audit_deletedAt_idx" RENAME TO "IDX_memories_audit_deleted_at";`.execute(db);
+  await sql`ALTER INDEX "memory_ownerId_idx" RENAME TO "IDX_575842846f0c28fa5da46c99b1";`.execute(db);
+  await sql`ALTER INDEX "memory_updateId_idx" RENAME TO "IDX_memories_update_id";`.execute(db);
+  await sql`ALTER INDEX "notification_updateId_idx" RENAME TO "IDX_notifications_update_id";`.execute(db);
+  await sql`ALTER INDEX "notification_userId_idx" RENAME TO "IDX_692a909ee0fa9383e7859f9b40";`.execute(db);
+  await sql`ALTER INDEX "partner_sharedWithId_idx" RENAME TO "IDX_d7e875c6c60e661723dbf372fd";`.execute(db);
+  await sql`ALTER INDEX "partner_createId_idx" RENAME TO "IDX_partners_create_id";`.execute(db);
+  await sql`ALTER INDEX "partner_updateId_idx" RENAME TO "IDX_partners_update_id";`.execute(db);
+  await sql`ALTER INDEX "session_userId_idx" RENAME TO "IDX_57de40bc620f456c7311aa3a1e";`.execute(db);
+  await sql`ALTER INDEX "session_parentId_idx" RENAME TO "IDX_afbbabbd7daf5b91de4dca84de";`.execute(db);
+  await sql`ALTER INDEX "session_updateId_idx" RENAME TO "IDX_sessions_update_id";`.execute(db);
+  await sql`ALTER INDEX "shared_link_asset_assetsId_idx" RENAME TO "IDX_5b7decce6c8d3db9593d6111a6";`.execute(db);
+  await sql`ALTER INDEX "shared_link_asset_sharedLinksId_idx" RENAME TO "IDX_c9fab4aa97ffd1b034f3d6581a";`.execute(db);
+  await sql`ALTER INDEX "shared_link_userId_idx" RENAME TO "IDX_66fe3837414c5a9f1c33ca4934";`.execute(db);
+  await sql`ALTER INDEX "shared_link_key_idx" RENAME TO "IDX_sharedlink_key";`.execute(db);
+  await sql`ALTER INDEX "shared_link_albumId_idx" RENAME TO "IDX_sharedlink_albumId";`.execute(db);
+  await sql`ALTER INDEX "stack_audit_deletedAt_idx" RENAME TO "IDX_stacks_audit_deleted_at";`.execute(db);
+  await sql`ALTER INDEX "stack_primaryAssetId_idx" RENAME TO "IDX_91704e101438fd0653f582426d";`.execute(db);
+  await sql`ALTER INDEX "stack_ownerId_idx" RENAME TO "IDX_c05079e542fd74de3b5ecb5c1c";`.execute(db);
+  await sql`ALTER INDEX "session_sync_checkpoint_sessionId_idx" RENAME TO "IDX_d8ddd9d687816cc490432b3d4b";`.execute(db);
+  await sql`ALTER INDEX "session_sync_checkpoint_updateId_idx" RENAME TO "IDX_session_sync_checkpoints_update_id";`.execute(db);
+  await sql`ALTER INDEX "tag_closure_id_ancestor_idx" RENAME TO "IDX_15fbcbc67663c6bfc07b354c22";`.execute(db);
+  await sql`ALTER INDEX "tag_closure_id_descendant_idx" RENAME TO "IDX_b1a2a7ed45c29179b5ad51548a";`.execute(db);
+  await sql`ALTER INDEX "tag_parentId_idx" RENAME TO "IDX_9f9590cc11561f1f48ff034ef9";`.execute(db);
+  await sql`ALTER INDEX "tag_updateId_idx" RENAME TO "IDX_tags_update_id";`.execute(db);
+  await sql`ALTER INDEX "user_updateId_idx" RENAME TO "IDX_users_update_id";`.execute(db);
+  await sql`ALTER INDEX "user_updatedAt_id_idx" RENAME TO "IDX_users_updated_at_asc_id_asc";`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "activity_updated_at"
+  BEFORE UPDATE ON "activity"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "person_updated_at"
+  BEFORE UPDATE ON "person"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_assets_updated_at"
+  BEFORE UPDATE ON "album_asset"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_assets_delete_audit"
+  AFTER DELETE ON "album_asset"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN ((pg_trigger_depth() <= 1))
+  EXECUTE FUNCTION album_assets_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_users_delete_audit"
+  AFTER DELETE ON "album_user"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN ((pg_trigger_depth() <= 1))
+  EXECUTE FUNCTION album_users_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "album_users_updated_at"
+  BEFORE UPDATE ON "album_user"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "albums_updated_at"
+  BEFORE UPDATE ON "album"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "albums_delete_audit"
+  AFTER DELETE ON "album"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN ((pg_trigger_depth() = 0))
+  EXECUTE FUNCTION albums_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "api_keys_updated_at"
+  BEFORE UPDATE ON "api_key"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "assets_delete_audit"
+  AFTER DELETE ON "asset"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN ((pg_trigger_depth() = 0))
+  EXECUTE FUNCTION assets_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "assets_updated_at"
+  BEFORE UPDATE ON "asset"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_files_updated_at"
+  BEFORE UPDATE ON "asset_file"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_exif_updated_at"
+  BEFORE UPDATE ON "asset_exif"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "libraries_updated_at"
+  BEFORE UPDATE ON "library"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "memory_assets_updated_at"
+  BEFORE UPDATE ON "memory_asset"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "memory_assets_delete_audit"
+  AFTER DELETE ON "memory_asset"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN ((pg_trigger_depth() <= 1))
+  EXECUTE FUNCTION memory_assets_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "memories_updated_at"
+  BEFORE UPDATE ON "memory"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "memories_delete_audit"
+  AFTER DELETE ON "memory"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN ((pg_trigger_depth() = 0))
+  EXECUTE FUNCTION memories_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "notifications_updated_at"
+  BEFORE UPDATE ON "notification"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "partners_delete_audit"
+  AFTER DELETE ON "partner"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN ((pg_trigger_depth() = 0))
+  EXECUTE FUNCTION partners_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "partners_updated_at"
+  BEFORE UPDATE ON "partner"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "sessions_updated_at"
+  BEFORE UPDATE ON "session"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "stacks_delete_audit"
+  AFTER DELETE ON "stack"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN ((pg_trigger_depth() = 0))
+  EXECUTE FUNCTION stacks_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "stacks_updated_at"
+  BEFORE UPDATE ON "stack"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "session_sync_checkpoints_updated_at"
+  BEFORE UPDATE ON "session_sync_checkpoint"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "tags_updated_at"
+  BEFORE UPDATE ON "tag"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "users_delete_audit"
+  AFTER DELETE ON "user"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN ((pg_trigger_depth() = 0))
+  EXECUTE FUNCTION users_delete_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "users_updated_at"
+  BEFORE UPDATE ON "user"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`DROP FUNCTION user_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION partner_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION asset_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION album_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION album_asset_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION album_user_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION memory_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION memory_asset_delete_audit;`.execute(db);
+  await sql`DROP FUNCTION stack_delete_audit;`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_users_delete_audit', '{"sql":"CREATE OR REPLACE FUNCTION users_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO users_audit (\\"userId\\")\\n      SELECT \\"id\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;","name":"users_delete_audit","type":"function"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_partners_delete_audit', '{"sql":"CREATE OR REPLACE FUNCTION partners_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO partners_audit (\\"sharedById\\", \\"sharedWithId\\")\\n      SELECT \\"sharedById\\", \\"sharedWithId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;","name":"partners_delete_audit","type":"function"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_assets_delete_audit', '{"sql":"CREATE OR REPLACE FUNCTION assets_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO assets_audit (\\"assetId\\", \\"ownerId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;","name":"assets_delete_audit","type":"function"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_albums_delete_audit', '{"sql":"CREATE OR REPLACE FUNCTION albums_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO albums_audit (\\"albumId\\", \\"userId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;","name":"albums_delete_audit","type":"function"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_album_assets_delete_audit', '{"sql":"CREATE OR REPLACE FUNCTION album_assets_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO album_assets_audit (\\"albumId\\", \\"assetId\\")\\n      SELECT \\"albumsId\\", \\"assetsId\\" FROM OLD\\n      WHERE \\"albumsId\\" IN (SELECT \\"id\\" FROM albums WHERE \\"id\\" IN (SELECT \\"albumsId\\" FROM OLD));\\n      RETURN NULL;\\n    END\\n  $$;","name":"album_assets_delete_audit","type":"function"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_album_users_delete_audit', '{"sql":"CREATE OR REPLACE FUNCTION album_users_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO albums_audit (\\"albumId\\", \\"userId\\")\\n      SELECT \\"albumsId\\", \\"usersId\\"\\n      FROM OLD;\\n\\n      IF pg_trigger_depth() = 1 THEN\\n        INSERT INTO album_users_audit (\\"albumId\\", \\"userId\\")\\n        SELECT \\"albumsId\\", \\"usersId\\"\\n        FROM OLD;\\n      END IF;\\n\\n      RETURN NULL;\\n    END\\n  $$;","name":"album_users_delete_audit","type":"function"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_memories_delete_audit', '{"sql":"CREATE OR REPLACE FUNCTION memories_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO memories_audit (\\"memoryId\\", \\"userId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;","name":"memories_delete_audit","type":"function"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_memory_assets_delete_audit', '{"sql":"CREATE OR REPLACE FUNCTION memory_assets_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO memory_assets_audit (\\"memoryId\\", \\"assetId\\")\\n      SELECT \\"memoriesId\\", \\"assetsId\\" FROM OLD\\n      WHERE \\"memoriesId\\" IN (SELECT \\"id\\" FROM memories WHERE \\"id\\" IN (SELECT \\"memoriesId\\" FROM OLD));\\n      RETURN NULL;\\n    END\\n  $$;","name":"memory_assets_delete_audit","type":"function"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_stacks_delete_audit', '{"sql":"CREATE OR REPLACE FUNCTION stacks_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO stacks_audit (\\"stackId\\", \\"userId\\")\\n      SELECT \\"id\\", \\"ownerId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;","name":"stacks_delete_audit","type":"function"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_users_delete_audit', '{"sql":"CREATE OR REPLACE TRIGGER \\"users_delete_audit\\"\\n  AFTER DELETE ON \\"users\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION users_delete_audit();","name":"users_delete_audit","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_users_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"users_updated_at\\"\\n  BEFORE UPDATE ON \\"users\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"users_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_libraries_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"libraries_updated_at\\"\\n  BEFORE UPDATE ON \\"libraries\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"libraries_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_stacks_delete_audit', '{"sql":"CREATE OR REPLACE TRIGGER \\"stacks_delete_audit\\"\\n  AFTER DELETE ON \\"asset_stack\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION stacks_delete_audit();","name":"stacks_delete_audit","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_stacks_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"stacks_updated_at\\"\\n  BEFORE UPDATE ON \\"asset_stack\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"stacks_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_assets_delete_audit', '{"sql":"CREATE OR REPLACE TRIGGER \\"assets_delete_audit\\"\\n  AFTER DELETE ON \\"assets\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION assets_delete_audit();","name":"assets_delete_audit","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_assets_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"assets_updated_at\\"\\n  BEFORE UPDATE ON \\"assets\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"assets_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_albums_delete_audit', '{"sql":"CREATE OR REPLACE TRIGGER \\"albums_delete_audit\\"\\n  AFTER DELETE ON \\"albums\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION albums_delete_audit();","name":"albums_delete_audit","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_albums_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"albums_updated_at\\"\\n  BEFORE UPDATE ON \\"albums\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"albums_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_activity_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"activity_updated_at\\"\\n  BEFORE UPDATE ON \\"activity\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"activity_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_assets_delete_audit', '{"sql":"CREATE OR REPLACE TRIGGER \\"album_assets_delete_audit\\"\\n  AFTER DELETE ON \\"albums_assets_assets\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() <= 1)\\n  EXECUTE FUNCTION album_assets_delete_audit();","name":"album_assets_delete_audit","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_assets_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"album_assets_updated_at\\"\\n  BEFORE UPDATE ON \\"albums_assets_assets\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"album_assets_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_users_delete_audit', '{"sql":"CREATE OR REPLACE TRIGGER \\"album_users_delete_audit\\"\\n  AFTER DELETE ON \\"albums_shared_users_users\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() <= 1)\\n  EXECUTE FUNCTION album_users_delete_audit();","name":"album_users_delete_audit","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_album_users_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"album_users_updated_at\\"\\n  BEFORE UPDATE ON \\"albums_shared_users_users\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"album_users_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_api_keys_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"api_keys_updated_at\\"\\n  BEFORE UPDATE ON \\"api_keys\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"api_keys_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_person_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"person_updated_at\\"\\n  BEFORE UPDATE ON \\"person\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"person_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_files_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"asset_files_updated_at\\"\\n  BEFORE UPDATE ON \\"asset_files\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"asset_files_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_exif_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"asset_exif_updated_at\\"\\n  BEFORE UPDATE ON \\"exif\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"asset_exif_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memories_delete_audit', '{"sql":"CREATE OR REPLACE TRIGGER \\"memories_delete_audit\\"\\n  AFTER DELETE ON \\"memories\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION memories_delete_audit();","name":"memories_delete_audit","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memories_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"memories_updated_at\\"\\n  BEFORE UPDATE ON \\"memories\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"memories_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memory_assets_delete_audit', '{"sql":"CREATE OR REPLACE TRIGGER \\"memory_assets_delete_audit\\"\\n  AFTER DELETE ON \\"memories_assets_assets\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() <= 1)\\n  EXECUTE FUNCTION memory_assets_delete_audit();","name":"memory_assets_delete_audit","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_memory_assets_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"memory_assets_updated_at\\"\\n  BEFORE UPDATE ON \\"memories_assets_assets\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"memory_assets_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_notifications_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"notifications_updated_at\\"\\n  BEFORE UPDATE ON \\"notifications\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"notifications_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_partners_delete_audit', '{"sql":"CREATE OR REPLACE TRIGGER \\"partners_delete_audit\\"\\n  AFTER DELETE ON \\"partners\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION partners_delete_audit();","name":"partners_delete_audit","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_partners_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"partners_updated_at\\"\\n  BEFORE UPDATE ON \\"partners\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"partners_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_sessions_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"sessions_updated_at\\"\\n  BEFORE UPDATE ON \\"sessions\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"sessions_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_session_sync_checkpoints_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"session_sync_checkpoints_updated_at\\"\\n  BEFORE UPDATE ON \\"session_sync_checkpoints\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"session_sync_checkpoints_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_tags_updated_at', '{"sql":"CREATE OR REPLACE TRIGGER \\"tags_updated_at\\"\\n  BEFORE UPDATE ON \\"tags\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();","name":"tags_updated_at","type":"trigger"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_idx_originalfilename_trigram', '{"sql":"CREATE INDEX \\"idx_originalfilename_trigram\\" ON \\"assets\\" USING gin (f_unaccent(\\"originalFileName\\") gin_trgm_ops);","name":"idx_originalfilename_trigram","type":"index"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_idx_local_date_time_month', '{"sql":"CREATE INDEX \\"idx_local_date_time_month\\" ON \\"assets\\" ((date_trunc(''MONTH''::text, (\\"localDateTime\\" AT TIME ZONE ''UTC''::text)) AT TIME ZONE ''UTC''::text));","name":"idx_local_date_time_month","type":"index"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_idx_local_date_time', '{"sql":"CREATE INDEX \\"idx_local_date_time\\" ON \\"assets\\" (((\\"localDateTime\\" at time zone ''UTC'')::date));","name":"idx_local_date_time","type":"index"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_UQ_assets_owner_library_checksum', '{"sql":"CREATE UNIQUE INDEX \\"UQ_assets_owner_library_checksum\\" ON \\"assets\\" (\\"ownerId\\", \\"libraryId\\", \\"checksum\\") WHERE (\\"libraryId\\" IS NOT NULL);","name":"UQ_assets_owner_library_checksum","type":"index"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('index_IDX_activity_like', '{"sql":"CREATE UNIQUE INDEX \\"IDX_activity_like\\" ON \\"activity\\" (\\"assetId\\", \\"userId\\", \\"albumId\\") WHERE (\\"isLiked\\" = true);","name":"IDX_activity_like","type":"index"}'::jsonb);`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE OR REPLACE FUNCTION album_user_after_insert()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      UPDATE albums SET \\"updatedAt\\" = clock_timestamp(), \\"updateId\\" = immich_uuid_v7(clock_timestamp())\\n      WHERE \\"id\\" IN (SELECT DISTINCT \\"albumsId\\" FROM inserted_rows);\\n      RETURN NULL;\\n    END\\n  $$;","name":"album_user_after_insert","type":"function"}'::jsonb WHERE "name" = 'function_album_user_after_insert';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE OR REPLACE TRIGGER \\"album_user_after_insert\\"\\n  AFTER INSERT ON \\"albums_shared_users_users\\"\\n  REFERENCING NEW TABLE AS \\"inserted_rows\\"\\n  FOR EACH STATEMENT\\n  EXECUTE FUNCTION album_user_after_insert();","name":"album_user_after_insert","type":"trigger"}'::jsonb WHERE "name" = 'trigger_album_user_after_insert';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"sql":"CREATE UNIQUE INDEX \\"UQ_assets_owner_checksum\\" ON \\"assets\\" (\\"ownerId\\", \\"checksum\\") WHERE (\\"libraryId\\" IS NULL);","name":"UQ_assets_owner_checksum","type":"index"}'::jsonb WHERE "name" = 'index_UQ_assets_owner_checksum';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_user_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_partner_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_asset_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_album_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_album_asset_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_album_user_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_memory_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_memory_asset_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_stack_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_user_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_user_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_library_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_stack_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_stack_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'index_asset_originalFilename_trigram_idx';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'index_asset_localDateTime_month_idx';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'index_asset_localDateTime_idx';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'index_asset_ownerId_libraryId_checksum_idx';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_album_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_album_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_album_asset_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_album_asset_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_activity_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'index_activity_like_idx';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_album_user_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_album_user_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_api_key_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_exif_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_person_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_file_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_memory_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_memory_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_memory_asset_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_memory_asset_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_notification_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_partner_delete_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_partner_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_session_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_session_sync_checkpoint_updatedAt';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_tag_updatedAt';`.execute(db);
+
+
+}
diff --git a/server/src/schema/tables/activity.table.ts b/server/src/schema/tables/activity.table.ts
index 778cfb14bb..128cf2eabd 100644
--- a/server/src/schema/tables/activity.table.ts
+++ b/server/src/schema/tables/activity.table.ts
@@ -18,19 +18,18 @@ import {
 } from 'src/sql-tools';
 
 @Table('activity')
-@UpdatedAtTrigger('activity_updated_at')
+@UpdatedAtTrigger('activity_updatedAt')
 @Index({
-  name: 'IDX_activity_like',
+  name: 'activity_like_idx',
   columns: ['assetId', 'userId', 'albumId'],
   unique: true,
   where: '("isLiked" = true)',
 })
 @Check({
-  name: 'CHK_2ab1e70f113f450eb40c1e3ec8',
-  expression: `("comment" IS NULL AND "isLiked" = true) OR ("comment" IS NOT NULL AND "isLiked" = false)`,
+  name: 'activity_like_check',
+  expression: `(comment IS NULL AND "isLiked" = true) OR (comment IS NOT NULL AND "isLiked" = false)`,
 })
 @ForeignKeyConstraint({
-  name: 'fk_activity_album_asset_composite',
   columns: ['albumId', 'assetId'],
   referenceTable: () => AlbumAssetTable,
   referenceColumns: ['albumsId', 'assetsId'],
@@ -62,6 +61,6 @@ export class ActivityTable {
   @Column({ type: 'boolean', default: false })
   isLiked!: Generated<boolean>;
 
-  @UpdateIdColumn({ indexName: 'IDX_activity_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/album-asset-audit.table.ts b/server/src/schema/tables/album-asset-audit.table.ts
index 7c8da313c0..ab8fd9ae89 100644
--- a/server/src/schema/tables/album-asset-audit.table.ts
+++ b/server/src/schema/tables/album-asset-audit.table.ts
@@ -2,22 +2,20 @@ import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
 import { AlbumTable } from 'src/schema/tables/album.table';
 import { Column, CreateDateColumn, ForeignKeyColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
-@Table('album_assets_audit')
+@Table('album_asset_audit')
 export class AlbumAssetAuditTable {
   @PrimaryGeneratedUuidV7Column()
   id!: Generated<string>;
 
   @ForeignKeyColumn(() => AlbumTable, {
-    type: 'uuid',
-    indexName: 'IDX_album_assets_audit_album_id',
     onDelete: 'CASCADE',
     onUpdate: 'CASCADE',
   })
   albumId!: string;
 
-  @Column({ type: 'uuid', indexName: 'IDX_album_assets_audit_asset_id' })
+  @Column({ type: 'uuid', index: true })
   assetId!: string;
 
-  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_album_assets_audit_deleted_at' })
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
   deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/album-asset.table.ts b/server/src/schema/tables/album-asset.table.ts
index 9b97db7ea0..c34546c3f3 100644
--- a/server/src/schema/tables/album-asset.table.ts
+++ b/server/src/schema/tables/album-asset.table.ts
@@ -1,5 +1,5 @@
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
-import { album_assets_delete_audit } from 'src/schema/functions';
+import { album_asset_delete_audit } from 'src/schema/functions';
 import { AlbumTable } from 'src/schema/tables/album.table';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import {
@@ -12,11 +12,11 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table({ name: 'albums_assets_assets', primaryConstraintName: 'PK_c67bc36fa845fb7b18e0e398180' })
-@UpdatedAtTrigger('album_assets_updated_at')
+@Table({ name: 'album_asset' })
+@UpdatedAtTrigger('album_asset_updatedAt')
 @AfterDeleteTrigger({
   scope: 'statement',
-  function: album_assets_delete_audit,
+  function: album_asset_delete_audit,
   referencingOldTableAs: 'old',
   when: 'pg_trigger_depth() <= 1',
 })
@@ -33,6 +33,6 @@ export class AlbumAssetTable {
   @UpdateDateColumn()
   updatedAt!: Generated<Timestamp>;
 
-  @UpdateIdColumn({ indexName: 'IDX_album_assets_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/album-audit.table.ts b/server/src/schema/tables/album-audit.table.ts
index 3dd2682232..432c51c36a 100644
--- a/server/src/schema/tables/album-audit.table.ts
+++ b/server/src/schema/tables/album-audit.table.ts
@@ -1,17 +1,17 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
 import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
-@Table('albums_audit')
+@Table('album_audit')
 export class AlbumAuditTable {
   @PrimaryGeneratedUuidV7Column()
   id!: Generated<string>;
 
-  @Column({ type: 'uuid', indexName: 'IDX_albums_audit_album_id' })
+  @Column({ type: 'uuid', index: true })
   albumId!: string;
 
-  @Column({ type: 'uuid', indexName: 'IDX_albums_audit_user_id' })
+  @Column({ type: 'uuid', index: true })
   userId!: string;
 
-  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_albums_audit_deleted_at' })
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
   deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/album-user-audit.table.ts b/server/src/schema/tables/album-user-audit.table.ts
index 01ad991a52..2259511bdd 100644
--- a/server/src/schema/tables/album-user-audit.table.ts
+++ b/server/src/schema/tables/album-user-audit.table.ts
@@ -1,17 +1,17 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
 import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
-@Table('album_users_audit')
+@Table('album_user_audit')
 export class AlbumUserAuditTable {
   @PrimaryGeneratedUuidV7Column()
   id!: Generated<string>;
 
-  @Column({ type: 'uuid', indexName: 'IDX_album_users_audit_album_id' })
+  @Column({ type: 'uuid', index: true })
   albumId!: string;
 
-  @Column({ type: 'uuid', indexName: 'IDX_album_users_audit_user_id' })
+  @Column({ type: 'uuid', index: true })
   userId!: string;
 
-  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_album_users_audit_deleted_at' })
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
   deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/album-user.table.ts b/server/src/schema/tables/album-user.table.ts
index e8ed720eef..6f20e25d90 100644
--- a/server/src/schema/tables/album-user.table.ts
+++ b/server/src/schema/tables/album-user.table.ts
@@ -1,6 +1,6 @@
 import { CreateIdColumn, UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { AlbumUserRole } from 'src/enum';
-import { album_user_after_insert, album_users_delete_audit } from 'src/schema/functions';
+import { album_user_after_insert, album_user_delete_audit } from 'src/schema/functions';
 import { AlbumTable } from 'src/schema/tables/album.table';
 import { UserTable } from 'src/schema/tables/user.table';
 import {
@@ -10,17 +10,14 @@ import {
   CreateDateColumn,
   ForeignKeyColumn,
   Generated,
-  Index,
   Table,
   Timestamp,
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table({ name: 'albums_shared_users_users', primaryConstraintName: 'PK_7df55657e0b2e8b626330a0ebc8' })
+@Table({ name: 'album_user' })
 // Pre-existing indices from original album <--> user ManyToMany mapping
-@Index({ name: 'IDX_427c350ad49bd3935a50baab73', columns: ['albumsId'] })
-@Index({ name: 'IDX_f48513bf9bccefd6ff3ad30bd0', columns: ['usersId'] })
-@UpdatedAtTrigger('album_users_updated_at')
+@UpdatedAtTrigger('album_user_updatedAt')
 @AfterInsertTrigger({
   name: 'album_user_after_insert',
   scope: 'statement',
@@ -29,7 +26,7 @@ import {
 })
 @AfterDeleteTrigger({
   scope: 'statement',
-  function: album_users_delete_audit,
+  function: album_user_delete_audit,
   referencingOldTableAs: 'old',
   when: 'pg_trigger_depth() <= 1',
 })
@@ -53,13 +50,13 @@ export class AlbumUserTable {
   @Column({ type: 'character varying', default: AlbumUserRole.EDITOR })
   role!: Generated<AlbumUserRole>;
 
-  @CreateIdColumn({ indexName: 'IDX_album_users_create_id' })
+  @CreateIdColumn({ index: true })
   createId!: Generated<string>;
 
   @CreateDateColumn()
   createdAt!: Generated<Timestamp>;
 
-  @UpdateIdColumn({ indexName: 'IDX_album_users_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 
   @UpdateDateColumn()
diff --git a/server/src/schema/tables/album.table.ts b/server/src/schema/tables/album.table.ts
index e4cad8f469..bca15d520b 100644
--- a/server/src/schema/tables/album.table.ts
+++ b/server/src/schema/tables/album.table.ts
@@ -1,6 +1,6 @@
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { AssetOrder } from 'src/enum';
-import { albums_delete_audit } from 'src/schema/functions';
+import { album_delete_audit } from 'src/schema/functions';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { UserTable } from 'src/schema/tables/user.table';
 import {
@@ -16,11 +16,11 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table({ name: 'albums', primaryConstraintName: 'PK_7f71c7b5bc7c87b8f94c9a93a00' })
-@UpdatedAtTrigger('albums_updated_at')
+@Table({ name: 'album' })
+@UpdatedAtTrigger('album_updatedAt')
 @AfterDeleteTrigger({
   scope: 'statement',
-  function: albums_delete_audit,
+  function: album_delete_audit,
   referencingOldTableAs: 'old',
   when: 'pg_trigger_depth() = 0',
 })
@@ -60,6 +60,6 @@ export class AlbumTable {
   @Column({ default: AssetOrder.DESC })
   order!: Generated<AssetOrder>;
 
-  @UpdateIdColumn({ indexName: 'IDX_albums_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/api-key.table.ts b/server/src/schema/tables/api-key.table.ts
index 4bcd4beae8..efbf18afaa 100644
--- a/server/src/schema/tables/api-key.table.ts
+++ b/server/src/schema/tables/api-key.table.ts
@@ -12,8 +12,8 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table('api_keys')
-@UpdatedAtTrigger('api_keys_updated_at')
+@Table('api_key')
+@UpdatedAtTrigger('api_key_updatedAt')
 export class ApiKeyTable {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;
@@ -36,6 +36,6 @@ export class ApiKeyTable {
   @Column({ array: true, type: 'character varying' })
   permissions!: Permission[];
 
-  @UpdateIdColumn({ indexName: 'IDX_api_keys_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/asset-audit.table.ts b/server/src/schema/tables/asset-audit.table.ts
index 8ca6aa956d..86c3f6f28b 100644
--- a/server/src/schema/tables/asset-audit.table.ts
+++ b/server/src/schema/tables/asset-audit.table.ts
@@ -1,17 +1,17 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
 import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
-@Table('assets_audit')
+@Table('asset_audit')
 export class AssetAuditTable {
   @PrimaryGeneratedUuidV7Column()
   id!: Generated<string>;
 
-  @Column({ type: 'uuid', indexName: 'IDX_assets_audit_asset_id' })
+  @Column({ type: 'uuid', index: true })
   assetId!: string;
 
-  @Column({ type: 'uuid', indexName: 'IDX_assets_audit_owner_id' })
+  @Column({ type: 'uuid', index: true })
   ownerId!: string;
 
-  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_assets_audit_deleted_at' })
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
   deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/exif.table.ts b/server/src/schema/tables/asset-exif.table.ts
similarity index 86%
rename from server/src/schema/tables/exif.table.ts
rename to server/src/schema/tables/asset-exif.table.ts
index 668f215776..f28735a2db 100644
--- a/server/src/schema/tables/exif.table.ts
+++ b/server/src/schema/tables/asset-exif.table.ts
@@ -2,9 +2,9 @@ import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { Column, ForeignKeyColumn, Generated, Int8, Table, Timestamp, UpdateDateColumn } from 'src/sql-tools';
 
-@Table('exif')
-@UpdatedAtTrigger('asset_exif_updated_at')
-export class ExifTable {
+@Table('asset_exif')
+@UpdatedAtTrigger('asset_exif_updatedAt')
+export class AssetExifTable {
   @ForeignKeyColumn(() => AssetTable, { onDelete: 'CASCADE', primary: true })
   assetId!: string;
 
@@ -50,7 +50,7 @@ export class ExifTable {
   @Column({ type: 'double precision', nullable: true })
   longitude!: number | null;
 
-  @Column({ type: 'character varying', nullable: true, indexName: 'exif_city' })
+  @Column({ type: 'character varying', nullable: true, index: true })
   city!: string | null;
 
   @Column({ type: 'character varying', nullable: true })
@@ -68,7 +68,7 @@ export class ExifTable {
   @Column({ type: 'character varying', nullable: true })
   exposureTime!: string | null;
 
-  @Column({ type: 'character varying', nullable: true, indexName: 'IDX_live_photo_cid' })
+  @Column({ type: 'character varying', nullable: true, index: true })
   livePhotoCID!: string | null;
 
   @Column({ type: 'character varying', nullable: true })
@@ -86,7 +86,7 @@ export class ExifTable {
   @Column({ type: 'integer', nullable: true })
   bitsPerSample!: number | null;
 
-  @Column({ type: 'character varying', nullable: true, indexName: 'IDX_auto_stack_id' })
+  @Column({ type: 'character varying', nullable: true, index: true })
   autoStackId!: string | null;
 
   @Column({ type: 'integer', nullable: true })
@@ -95,6 +95,6 @@ export class ExifTable {
   @UpdateDateColumn({ default: () => 'clock_timestamp()' })
   updatedAt!: Generated<Date>;
 
-  @UpdateIdColumn({ indexName: 'IDX_asset_exif_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/asset-face.table.ts b/server/src/schema/tables/asset-face.table.ts
index 329783d6df..483d655768 100644
--- a/server/src/schema/tables/asset-face.table.ts
+++ b/server/src/schema/tables/asset-face.table.ts
@@ -13,8 +13,9 @@ import {
   Timestamp,
 } from 'src/sql-tools';
 
-@Table({ name: 'asset_faces' })
-@Index({ name: 'IDX_asset_faces_assetId_personId', columns: ['assetId', 'personId'] })
+@Table({ name: 'asset_face' })
+// schemaFromDatabase does not preserve column order
+@Index({ name: 'asset_face_assetId_personId_idx', columns: ['assetId', 'personId'] })
 @Index({ columns: ['personId', 'assetId'] })
 export class AssetFaceTable {
   @PrimaryGeneratedColumn()
diff --git a/server/src/schema/tables/asset-files.table.ts b/server/src/schema/tables/asset-file.table.ts
similarity index 66%
rename from server/src/schema/tables/asset-files.table.ts
rename to server/src/schema/tables/asset-file.table.ts
index d0721e5b91..6456d1d535 100644
--- a/server/src/schema/tables/asset-files.table.ts
+++ b/server/src/schema/tables/asset-file.table.ts
@@ -13,18 +13,14 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table('asset_files')
-@Unique({ name: 'UQ_assetId_type', columns: ['assetId', 'type'] })
-@UpdatedAtTrigger('asset_files_updated_at')
+@Table('asset_file')
+@Unique({ columns: ['assetId', 'type'] })
+@UpdatedAtTrigger('asset_file_updatedAt')
 export class AssetFileTable {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;
 
-  @ForeignKeyColumn(() => AssetTable, {
-    onDelete: 'CASCADE',
-    onUpdate: 'CASCADE',
-    indexName: 'IDX_asset_files_assetId',
-  })
+  @ForeignKeyColumn(() => AssetTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
   assetId!: string;
 
   @CreateDateColumn()
@@ -39,6 +35,6 @@ export class AssetFileTable {
   @Column()
   path!: string;
 
-  @UpdateIdColumn({ indexName: 'IDX_asset_files_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/asset.table.ts b/server/src/schema/tables/asset.table.ts
index de7dea2b57..4e1d073848 100644
--- a/server/src/schema/tables/asset.table.ts
+++ b/server/src/schema/tables/asset.table.ts
@@ -1,7 +1,7 @@
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { AssetStatus, AssetType, AssetVisibility } from 'src/enum';
 import { asset_visibility_enum, assets_status_enum } from 'src/schema/enums';
-import { assets_delete_audit } from 'src/schema/functions';
+import { asset_delete_audit } from 'src/schema/functions';
 import { LibraryTable } from 'src/schema/tables/library.table';
 import { StackTable } from 'src/schema/tables/stack.table';
 import { UserTable } from 'src/schema/tables/user.table';
@@ -20,11 +20,11 @@ import {
 } from 'src/sql-tools';
 import { ASSET_CHECKSUM_CONSTRAINT } from 'src/utils/database';
 
-@Table('assets')
-@UpdatedAtTrigger('assets_updated_at')
+@Table('asset')
+@UpdatedAtTrigger('asset_updatedAt')
 @AfterDeleteTrigger({
   scope: 'statement',
-  function: assets_delete_audit,
+  function: asset_delete_audit,
   referencingOldTableAs: 'old',
   when: 'pg_trigger_depth() = 0',
 })
@@ -36,23 +36,22 @@ import { ASSET_CHECKSUM_CONSTRAINT } from 'src/utils/database';
   where: '("libraryId" IS NULL)',
 })
 @Index({
-  name: 'UQ_assets_owner_library_checksum' + '',
   columns: ['ownerId', 'libraryId', 'checksum'],
   unique: true,
   where: '("libraryId" IS NOT NULL)',
 })
 @Index({
-  name: 'idx_local_date_time',
+  name: 'asset_localDateTime_idx',
   expression: `(("localDateTime" at time zone 'UTC')::date)`,
 })
 @Index({
-  name: 'idx_local_date_time_month',
+  name: 'asset_localDateTime_month_idx',
   expression: `(date_trunc('MONTH'::text, ("localDateTime" AT TIME ZONE 'UTC'::text)) AT TIME ZONE 'UTC'::text)`,
 })
-@Index({ name: 'IDX_originalPath_libraryId', columns: ['originalPath', 'libraryId'] })
-@Index({ name: 'IDX_asset_id_stackId', columns: ['id', 'stackId'] })
+@Index({ columns: ['originalPath', 'libraryId'] })
+@Index({ columns: ['id', 'stackId'] })
 @Index({
-  name: 'idx_originalfilename_trigram',
+  name: 'asset_originalFilename_trigram_idx',
   using: 'gin',
   expression: 'f_unaccent("originalFileName") gin_trgm_ops',
 })
@@ -76,7 +75,7 @@ export class AssetTable {
   @Column()
   originalPath!: string;
 
-  @Column({ type: 'timestamp with time zone', indexName: 'idx_asset_file_created_at' })
+  @Column({ type: 'timestamp with time zone', index: true })
   fileCreatedAt!: Timestamp;
 
   @Column({ type: 'timestamp with time zone' })
@@ -130,13 +129,13 @@ export class AssetTable {
   @ForeignKeyColumn(() => StackTable, { nullable: true, onDelete: 'SET NULL', onUpdate: 'CASCADE' })
   stackId!: string | null;
 
-  @Column({ type: 'uuid', nullable: true, indexName: 'IDX_assets_duplicateId' })
+  @Column({ type: 'uuid', nullable: true, index: true })
   duplicateId!: string | null;
 
   @Column({ enum: assets_status_enum, default: AssetStatus.ACTIVE })
   status!: Generated<AssetStatus>;
 
-  @UpdateIdColumn({ indexName: 'IDX_assets_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 
   @Column({ enum: asset_visibility_enum, default: AssetVisibility.TIMELINE })
diff --git a/server/src/schema/tables/audit.table.ts b/server/src/schema/tables/audit.table.ts
index 049bba9a1b..15b4990814 100644
--- a/server/src/schema/tables/audit.table.ts
+++ b/server/src/schema/tables/audit.table.ts
@@ -2,7 +2,7 @@ import { DatabaseAction, EntityType } from 'src/enum';
 import { Column, CreateDateColumn, Generated, Index, PrimaryColumn, Table, Timestamp } from 'src/sql-tools';
 
 @Table('audit')
-@Index({ name: 'IDX_ownerId_createdAt', columns: ['ownerId', 'createdAt'] })
+@Index({ columns: ['ownerId', 'createdAt'] })
 export class AuditTable {
   @PrimaryColumn({ type: 'serial', synchronize: false })
   id!: Generated<number>;
diff --git a/server/src/schema/tables/face-search.table.ts b/server/src/schema/tables/face-search.table.ts
index 600a08833e..ff63879404 100644
--- a/server/src/schema/tables/face-search.table.ts
+++ b/server/src/schema/tables/face-search.table.ts
@@ -1,7 +1,7 @@
 import { AssetFaceTable } from 'src/schema/tables/asset-face.table';
 import { Column, ForeignKeyColumn, Index, Table } from 'src/sql-tools';
 
-@Table({ name: 'face_search', primaryConstraintName: 'face_search_pkey' })
+@Table({ name: 'face_search' })
 @Index({
   name: 'face_index',
   using: 'hnsw',
@@ -9,11 +9,7 @@ import { Column, ForeignKeyColumn, Index, Table } from 'src/sql-tools';
   with: 'ef_construction = 300, m = 16',
 })
 export class FaceSearchTable {
-  @ForeignKeyColumn(() => AssetFaceTable, {
-    onDelete: 'CASCADE',
-    primary: true,
-    constraintName: 'face_search_faceId_fkey',
-  })
+  @ForeignKeyColumn(() => AssetFaceTable, { onDelete: 'CASCADE', primary: true })
   faceId!: string;
 
   @Column({ type: 'vector', length: 512, synchronize: false })
diff --git a/server/src/schema/tables/library.table.ts b/server/src/schema/tables/library.table.ts
index 0bf7e8ea82..57ad144c8e 100644
--- a/server/src/schema/tables/library.table.ts
+++ b/server/src/schema/tables/library.table.ts
@@ -12,8 +12,8 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table('libraries')
-@UpdatedAtTrigger('libraries_updated_at')
+@Table('library')
+@UpdatedAtTrigger('library_updatedAt')
 export class LibraryTable {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;
@@ -42,6 +42,6 @@ export class LibraryTable {
   @Column({ type: 'timestamp with time zone', nullable: true })
   refreshedAt!: Timestamp | null;
 
-  @UpdateIdColumn({ indexName: 'IDX_libraries_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/memory-asset-audit.table.ts b/server/src/schema/tables/memory-asset-audit.table.ts
index ecb72f6270..77a889b455 100644
--- a/server/src/schema/tables/memory-asset-audit.table.ts
+++ b/server/src/schema/tables/memory-asset-audit.table.ts
@@ -2,22 +2,17 @@ import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
 import { MemoryTable } from 'src/schema/tables/memory.table';
 import { Column, CreateDateColumn, ForeignKeyColumn, Table } from 'src/sql-tools';
 
-@Table('memory_assets_audit')
+@Table('memory_asset_audit')
 export class MemoryAssetAuditTable {
   @PrimaryGeneratedUuidV7Column()
   id!: string;
 
-  @ForeignKeyColumn(() => MemoryTable, {
-    type: 'uuid',
-    indexName: 'IDX_memory_assets_audit_memory_id',
-    onDelete: 'CASCADE',
-    onUpdate: 'CASCADE',
-  })
+  @ForeignKeyColumn(() => MemoryTable, { type: 'uuid', onDelete: 'CASCADE', onUpdate: 'CASCADE' })
   memoryId!: string;
 
-  @Column({ type: 'uuid', indexName: 'IDX_memory_assets_audit_asset_id' })
+  @Column({ type: 'uuid', index: true })
   assetId!: string;
 
-  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_memory_assets_audit_deleted_at' })
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
   deletedAt!: Date;
 }
diff --git a/server/src/schema/tables/memory-asset.table.ts b/server/src/schema/tables/memory-asset.table.ts
index 7ccdcdc13d..f535155233 100644
--- a/server/src/schema/tables/memory-asset.table.ts
+++ b/server/src/schema/tables/memory-asset.table.ts
@@ -1,5 +1,5 @@
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
-import { memory_assets_delete_audit } from 'src/schema/functions';
+import { memory_asset_delete_audit } from 'src/schema/functions';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { MemoryTable } from 'src/schema/tables/memory.table';
 import {
@@ -12,11 +12,11 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table('memories_assets_assets')
-@UpdatedAtTrigger('memory_assets_updated_at')
+@Table('memory_asset')
+@UpdatedAtTrigger('memory_asset_updatedAt')
 @AfterDeleteTrigger({
   scope: 'statement',
-  function: memory_assets_delete_audit,
+  function: memory_asset_delete_audit,
   referencingOldTableAs: 'old',
   when: 'pg_trigger_depth() <= 1',
 })
@@ -33,6 +33,6 @@ export class MemoryAssetTable {
   @UpdateDateColumn()
   updatedAt!: Generated<Timestamp>;
 
-  @UpdateIdColumn({ indexName: 'IDX_memory_assets_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/memory-audit.table.ts b/server/src/schema/tables/memory-audit.table.ts
index d84573a023..167caf8e6e 100644
--- a/server/src/schema/tables/memory-audit.table.ts
+++ b/server/src/schema/tables/memory-audit.table.ts
@@ -1,17 +1,17 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
 import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
-@Table('memories_audit')
+@Table('memory_audit')
 export class MemoryAuditTable {
   @PrimaryGeneratedUuidV7Column()
   id!: Generated<string>;
 
-  @Column({ type: 'uuid', indexName: 'IDX_memories_audit_memory_id' })
+  @Column({ type: 'uuid', index: true })
   memoryId!: string;
 
-  @Column({ type: 'uuid', indexName: 'IDX_memories_audit_user_id' })
+  @Column({ type: 'uuid', index: true })
   userId!: string;
 
-  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_memories_audit_deleted_at' })
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
   deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/memory.table.ts b/server/src/schema/tables/memory.table.ts
index 30aef7e0a4..408f7bca19 100644
--- a/server/src/schema/tables/memory.table.ts
+++ b/server/src/schema/tables/memory.table.ts
@@ -1,6 +1,6 @@
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { MemoryType } from 'src/enum';
-import { memories_delete_audit } from 'src/schema/functions';
+import { memory_delete_audit } from 'src/schema/functions';
 import { UserTable } from 'src/schema/tables/user.table';
 import {
   AfterDeleteTrigger,
@@ -15,11 +15,11 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table('memories')
-@UpdatedAtTrigger('memories_updated_at')
+@Table('memory')
+@UpdatedAtTrigger('memory_updatedAt')
 @AfterDeleteTrigger({
   scope: 'statement',
-  function: memories_delete_audit,
+  function: memory_delete_audit,
   referencingOldTableAs: 'old',
   when: 'pg_trigger_depth() = 0',
 })
@@ -63,6 +63,6 @@ export class MemoryTable {
   @Column({ type: 'timestamp with time zone', nullable: true })
   hideAt!: Timestamp | null;
 
-  @UpdateIdColumn({ indexName: 'IDX_memories_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/notification.table.ts b/server/src/schema/tables/notification.table.ts
index aa6cc60be9..01a93a73e5 100644
--- a/server/src/schema/tables/notification.table.ts
+++ b/server/src/schema/tables/notification.table.ts
@@ -13,8 +13,8 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table('notifications')
-@UpdatedAtTrigger('notifications_updated_at')
+@Table('notification')
+@UpdatedAtTrigger('notification_updatedAt')
 export class NotificationTable {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;
@@ -28,7 +28,7 @@ export class NotificationTable {
   @DeleteDateColumn()
   deletedAt!: Timestamp | null;
 
-  @UpdateIdColumn({ indexName: 'IDX_notifications_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 
   @ForeignKeyColumn(() => UserTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: true })
diff --git a/server/src/schema/tables/partner-audit.table.ts b/server/src/schema/tables/partner-audit.table.ts
index 35595e47b4..fa2f0c27cc 100644
--- a/server/src/schema/tables/partner-audit.table.ts
+++ b/server/src/schema/tables/partner-audit.table.ts
@@ -1,17 +1,17 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
 import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
-@Table('partners_audit')
+@Table('partner_audit')
 export class PartnerAuditTable {
   @PrimaryGeneratedUuidV7Column()
   id!: Generated<string>;
 
-  @Column({ type: 'uuid', indexName: 'IDX_partners_audit_shared_by_id' })
+  @Column({ type: 'uuid', index: true })
   sharedById!: string;
 
-  @Column({ type: 'uuid', indexName: 'IDX_partners_audit_shared_with_id' })
+  @Column({ type: 'uuid', index: true })
   sharedWithId!: string;
 
-  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_partners_audit_deleted_at' })
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
   deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/partner.table.ts b/server/src/schema/tables/partner.table.ts
index dd5024832f..8fc332cb12 100644
--- a/server/src/schema/tables/partner.table.ts
+++ b/server/src/schema/tables/partner.table.ts
@@ -1,5 +1,5 @@
 import { CreateIdColumn, UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
-import { partners_delete_audit } from 'src/schema/functions';
+import { partner_delete_audit } from 'src/schema/functions';
 import { UserTable } from 'src/schema/tables/user.table';
 import {
   AfterDeleteTrigger,
@@ -12,11 +12,11 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table('partners')
-@UpdatedAtTrigger('partners_updated_at')
+@Table('partner')
+@UpdatedAtTrigger('partner_updatedAt')
 @AfterDeleteTrigger({
   scope: 'statement',
-  function: partners_delete_audit,
+  function: partner_delete_audit,
   referencingOldTableAs: 'old',
   when: 'pg_trigger_depth() = 0',
 })
@@ -35,7 +35,7 @@ export class PartnerTable {
   @CreateDateColumn()
   createdAt!: Generated<Timestamp>;
 
-  @CreateIdColumn({ indexName: 'IDX_partners_create_id' })
+  @CreateIdColumn({ index: true })
   createId!: Generated<string>;
 
   @UpdateDateColumn()
@@ -44,6 +44,6 @@ export class PartnerTable {
   @Column({ type: 'boolean', default: false })
   inTimeline!: Generated<boolean>;
 
-  @UpdateIdColumn({ indexName: 'IDX_partners_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/person-audit.table.ts b/server/src/schema/tables/person-audit.table.ts
index f5790629d8..8a899a1808 100644
--- a/server/src/schema/tables/person-audit.table.ts
+++ b/server/src/schema/tables/person-audit.table.ts
@@ -6,12 +6,12 @@ export class PersonAuditTable {
   @PrimaryGeneratedUuidV7Column()
   id!: Generated<string>;
 
-  @Column({ type: 'uuid', indexName: 'IDX_person_audit_person_id' })
+  @Column({ type: 'uuid', index: true })
   personId!: string;
 
-  @Column({ type: 'uuid', indexName: 'IDX_person_audit_owner_id' })
+  @Column({ type: 'uuid', index: true })
   ownerId!: string;
 
-  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_person_audit_deleted_at' })
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
   deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/person.table.ts b/server/src/schema/tables/person.table.ts
index 193ecb8921..3b523a39d2 100644
--- a/server/src/schema/tables/person.table.ts
+++ b/server/src/schema/tables/person.table.ts
@@ -16,14 +16,14 @@ import {
 } from 'src/sql-tools';
 
 @Table('person')
-@UpdatedAtTrigger('person_updated_at')
+@UpdatedAtTrigger('person_updatedAt')
 @AfterDeleteTrigger({
   scope: 'statement',
   function: person_delete_audit,
   referencingOldTableAs: 'old',
   when: 'pg_trigger_depth() = 0',
 })
-@Check({ name: 'CHK_b0f82b0ed662bfc24fbb58bb45', expression: `"birthDate" <= CURRENT_DATE` })
+@Check({ name: 'person_birthDate_chk', expression: `"birthDate" <= CURRENT_DATE` })
 export class PersonTable {
   @PrimaryGeneratedColumn('uuid')
   id!: Generated<string>;
@@ -58,6 +58,6 @@ export class PersonTable {
   @Column({ type: 'character varying', nullable: true, default: null })
   color!: string | null;
 
-  @UpdateIdColumn({ indexName: 'IDX_person_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/session.table.ts b/server/src/schema/tables/session.table.ts
index 3305bcbc0b..706abdf887 100644
--- a/server/src/schema/tables/session.table.ts
+++ b/server/src/schema/tables/session.table.ts
@@ -11,8 +11,8 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table({ name: 'sessions', primaryConstraintName: 'PK_48cb6b5c20faa63157b3c1baf7f' })
-@UpdatedAtTrigger('sessions_updated_at')
+@Table({ name: 'session' })
+@UpdatedAtTrigger('session_updatedAt')
 export class SessionTable {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;
@@ -42,7 +42,7 @@ export class SessionTable {
   @Column({ default: '' })
   deviceOS!: Generated<string>;
 
-  @UpdateIdColumn({ indexName: 'IDX_sessions_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 
   @Column({ type: 'boolean', default: false })
diff --git a/server/src/schema/tables/shared-link-asset.table.ts b/server/src/schema/tables/shared-link-asset.table.ts
index 66c9068441..37b652c4ab 100644
--- a/server/src/schema/tables/shared-link-asset.table.ts
+++ b/server/src/schema/tables/shared-link-asset.table.ts
@@ -2,7 +2,7 @@ import { AssetTable } from 'src/schema/tables/asset.table';
 import { SharedLinkTable } from 'src/schema/tables/shared-link.table';
 import { ForeignKeyColumn, Table } from 'src/sql-tools';
 
-@Table('shared_link__asset')
+@Table('shared_link_asset')
 export class SharedLinkAssetTable {
   @ForeignKeyColumn(() => AssetTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE', primary: true })
   assetsId!: string;
diff --git a/server/src/schema/tables/shared-link.table.ts b/server/src/schema/tables/shared-link.table.ts
index 0670a7c5f5..40fd2bf6a9 100644
--- a/server/src/schema/tables/shared-link.table.ts
+++ b/server/src/schema/tables/shared-link.table.ts
@@ -9,11 +9,9 @@ import {
   PrimaryGeneratedColumn,
   Table,
   Timestamp,
-  Unique,
 } from 'src/sql-tools';
 
-@Table('shared_links')
-@Unique({ name: 'UQ_sharedlink_key', columns: ['key'] })
+@Table('shared_link')
 export class SharedLinkTable {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;
@@ -24,7 +22,7 @@ export class SharedLinkTable {
   @ForeignKeyColumn(() => UserTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
   userId!: string;
 
-  @Column({ type: 'bytea', indexName: 'IDX_sharedlink_key' })
+  @Column({ type: 'bytea', index: true, unique: true })
   key!: Buffer; // use to access the individual asset
 
   @Column()
@@ -39,12 +37,7 @@ export class SharedLinkTable {
   @Column({ type: 'boolean', default: false })
   allowUpload!: boolean;
 
-  @ForeignKeyColumn(() => AlbumTable, {
-    nullable: true,
-    onDelete: 'CASCADE',
-    onUpdate: 'CASCADE',
-    indexName: 'IDX_sharedlink_albumId',
-  })
+  @ForeignKeyColumn(() => AlbumTable, { nullable: true, onDelete: 'CASCADE', onUpdate: 'CASCADE' })
   albumId!: string | null;
 
   @Column({ type: 'boolean', default: true })
diff --git a/server/src/schema/tables/smart-search.table.ts b/server/src/schema/tables/smart-search.table.ts
index 09362b9dda..dc140efb2f 100644
--- a/server/src/schema/tables/smart-search.table.ts
+++ b/server/src/schema/tables/smart-search.table.ts
@@ -1,7 +1,7 @@
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { Column, ForeignKeyColumn, Index, Table } from 'src/sql-tools';
 
-@Table({ name: 'smart_search', primaryConstraintName: 'smart_search_pkey' })
+@Table({ name: 'smart_search' })
 @Index({
   name: 'clip_index',
   using: 'hnsw',
@@ -10,11 +10,7 @@ import { Column, ForeignKeyColumn, Index, Table } from 'src/sql-tools';
   synchronize: false,
 })
 export class SmartSearchTable {
-  @ForeignKeyColumn(() => AssetTable, {
-    onDelete: 'CASCADE',
-    primary: true,
-    constraintName: 'smart_search_assetId_fkey',
-  })
+  @ForeignKeyColumn(() => AssetTable, { onDelete: 'CASCADE', primary: true })
   assetId!: string;
 
   @Column({ type: 'vector', length: 512, storage: 'external', synchronize: false })
diff --git a/server/src/schema/tables/stack-audit.table.ts b/server/src/schema/tables/stack-audit.table.ts
index 01b628d081..d46ff95e57 100644
--- a/server/src/schema/tables/stack-audit.table.ts
+++ b/server/src/schema/tables/stack-audit.table.ts
@@ -1,7 +1,7 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
 import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
-@Table('stacks_audit')
+@Table('stack_audit')
 export class StackAuditTable {
   @PrimaryGeneratedUuidV7Column()
   id!: Generated<string>;
@@ -12,6 +12,6 @@ export class StackAuditTable {
   @Column({ type: 'uuid' })
   userId!: string;
 
-  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_stacks_audit_deleted_at' })
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
   deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/stack.table.ts b/server/src/schema/tables/stack.table.ts
index 02afc2ed50..9c9eb81373 100644
--- a/server/src/schema/tables/stack.table.ts
+++ b/server/src/schema/tables/stack.table.ts
@@ -1,5 +1,5 @@
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
-import { stacks_delete_audit } from 'src/schema/functions';
+import { stack_delete_audit } from 'src/schema/functions';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { UserTable } from 'src/schema/tables/user.table';
 import {
@@ -13,11 +13,11 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table('asset_stack')
-@UpdatedAtTrigger('stacks_updated_at')
+@Table('stack')
+@UpdatedAtTrigger('stack_updatedAt')
 @AfterDeleteTrigger({
   scope: 'statement',
-  function: stacks_delete_audit,
+  function: stack_delete_audit,
   referencingOldTableAs: 'old',
   when: 'pg_trigger_depth() = 0',
 })
@@ -35,11 +35,7 @@ export class StackTable {
   updateId!: Generated<string>;
 
   //TODO: Add constraint to ensure primary asset exists in the assets array
-  @ForeignKeyColumn(() => AssetTable, {
-    nullable: false,
-    unique: true,
-    uniqueConstraintName: 'REL_91704e101438fd0653f582426d',
-  })
+  @ForeignKeyColumn(() => AssetTable, { nullable: false, unique: true })
   primaryAssetId!: string;
 
   @ForeignKeyColumn(() => UserTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
diff --git a/server/src/schema/tables/sync-checkpoint.table.ts b/server/src/schema/tables/sync-checkpoint.table.ts
index a5ae9181e3..6ad4c54a86 100644
--- a/server/src/schema/tables/sync-checkpoint.table.ts
+++ b/server/src/schema/tables/sync-checkpoint.table.ts
@@ -12,8 +12,8 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table('session_sync_checkpoints')
-@UpdatedAtTrigger('session_sync_checkpoints_updated_at')
+@Table('session_sync_checkpoint')
+@UpdatedAtTrigger('session_sync_checkpoint_updatedAt')
 export class SessionSyncCheckpointTable {
   @ForeignKeyColumn(() => SessionTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE', primary: true })
   sessionId!: string;
@@ -30,6 +30,6 @@ export class SessionSyncCheckpointTable {
   @Column()
   ack!: string;
 
-  @UpdateIdColumn({ indexName: 'IDX_session_sync_checkpoints_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/tag-asset.table.ts b/server/src/schema/tables/tag-asset.table.ts
index 8793af0a8a..bc02129217 100644
--- a/server/src/schema/tables/tag-asset.table.ts
+++ b/server/src/schema/tables/tag-asset.table.ts
@@ -2,7 +2,7 @@ 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({ name: 'IDX_tag_asset_assetsId_tagsId', columns: ['assetsId', 'tagsId'] })
+@Index({ columns: ['assetsId', 'tagsId'] })
 @Table('tag_asset')
 export class TagAssetTable {
   @ForeignKeyColumn(() => AssetTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE', primary: true, index: true })
diff --git a/server/src/schema/tables/tag-closure.table.ts b/server/src/schema/tables/tag-closure.table.ts
index 8829e802e1..aeb8c8cf11 100644
--- a/server/src/schema/tables/tag-closure.table.ts
+++ b/server/src/schema/tables/tag-closure.table.ts
@@ -1,7 +1,7 @@
 import { TagTable } from 'src/schema/tables/tag.table';
 import { ForeignKeyColumn, Table } from 'src/sql-tools';
 
-@Table('tags_closure')
+@Table('tag_closure')
 export class TagClosureTable {
   @ForeignKeyColumn(() => TagTable, { primary: true, onDelete: 'CASCADE', onUpdate: 'NO ACTION', index: true })
   id_ancestor!: string;
diff --git a/server/src/schema/tables/tag.table.ts b/server/src/schema/tables/tag.table.ts
index 55abe0a852..dc1fa2947b 100644
--- a/server/src/schema/tables/tag.table.ts
+++ b/server/src/schema/tables/tag.table.ts
@@ -12,8 +12,8 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table('tags')
-@UpdatedAtTrigger('tags_updated_at')
+@Table('tag')
+@UpdatedAtTrigger('tag_updatedAt')
 @Unique({ columns: ['userId', 'value'] })
 export class TagTable {
   @PrimaryGeneratedColumn()
@@ -42,6 +42,6 @@ export class TagTable {
   @ForeignKeyColumn(() => TagTable, { nullable: true, onDelete: 'CASCADE' })
   parentId!: string | null;
 
-  @UpdateIdColumn({ indexName: 'IDX_tags_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/schema/tables/user-audit.table.ts b/server/src/schema/tables/user-audit.table.ts
index 0c20323a54..084b42fb65 100644
--- a/server/src/schema/tables/user-audit.table.ts
+++ b/server/src/schema/tables/user-audit.table.ts
@@ -1,7 +1,7 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
 import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
-@Table('users_audit')
+@Table('user_audit')
 export class UserAuditTable {
   @PrimaryGeneratedUuidV7Column()
   id!: Generated<string>;
@@ -9,6 +9,6 @@ export class UserAuditTable {
   @Column({ type: 'uuid' })
   userId!: string;
 
-  @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_users_audit_deleted_at' })
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
   deletedAt!: Generated<Timestamp>;
 }
diff --git a/server/src/schema/tables/user.table.ts b/server/src/schema/tables/user.table.ts
index 76b60521ac..97ac0ff295 100644
--- a/server/src/schema/tables/user.table.ts
+++ b/server/src/schema/tables/user.table.ts
@@ -1,7 +1,7 @@
 import { ColumnType } from 'kysely';
 import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { UserAvatarColor, UserStatus } from 'src/enum';
-import { users_delete_audit } from 'src/schema/functions';
+import { user_delete_audit } from 'src/schema/functions';
 import {
   AfterDeleteTrigger,
   Column,
@@ -15,15 +15,15 @@ import {
   UpdateDateColumn,
 } from 'src/sql-tools';
 
-@Table('users')
-@UpdatedAtTrigger('users_updated_at')
+@Table('user')
+@UpdatedAtTrigger('user_updatedAt')
 @AfterDeleteTrigger({
   scope: 'statement',
-  function: users_delete_audit,
+  function: user_delete_audit,
   referencingOldTableAs: 'old',
   when: 'pg_trigger_depth() = 0',
 })
-@Index({ name: 'IDX_users_updated_at_asc_id_asc', columns: ['updatedAt', 'id'] })
+@Index({ columns: ['updatedAt', 'id'] })
 export class UserTable {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;
@@ -79,6 +79,6 @@ export class UserTable {
   @Column({ type: 'timestamp with time zone', default: () => 'now()' })
   profileChangedAt!: Generated<Timestamp>;
 
-  @UpdateIdColumn({ indexName: 'IDX_users_update_id' })
+  @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 }
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
index 3212d150f6..9804be9ea4 100644
--- a/server/src/services/metadata.service.ts
+++ b/server/src/services/metadata.service.ts
@@ -24,8 +24,8 @@ import {
 import { ArgOf } from 'src/repositories/event.repository';
 import { ReverseGeocodeResult } from 'src/repositories/map.repository';
 import { ImmichTags } from 'src/repositories/metadata.repository';
+import { AssetExifTable } from 'src/schema/tables/asset-exif.table';
 import { AssetFaceTable } from 'src/schema/tables/asset-face.table';
-import { ExifTable } from 'src/schema/tables/exif.table';
 import { PersonTable } from 'src/schema/tables/person.table';
 import { BaseService } from 'src/services/base.service';
 import { JobItem, JobOf } from 'src/types';
@@ -164,7 +164,7 @@ export class MetadataService extends BaseService {
 
   private async linkLivePhotos(
     asset: { id: string; type: AssetType; ownerId: string; libraryId: string | null },
-    exifInfo: Insertable<ExifTable>,
+    exifInfo: Insertable<AssetExifTable>,
   ): Promise<void> {
     if (!exifInfo.livePhotoCID) {
       return;
@@ -242,7 +242,7 @@ export class MetadataService extends BaseService {
       }
     }
 
-    const exifData: Insertable<ExifTable> = {
+    const exifData: Insertable<AssetExifTable> = {
       assetId: asset.id,
 
       // dates
diff --git a/server/src/sql-tools/comparers/constraint.comparer.ts b/server/src/sql-tools/comparers/constraint.comparer.ts
index 0df670ecf3..dda184039f 100644
--- a/server/src/sql-tools/comparers/constraint.comparer.ts
+++ b/server/src/sql-tools/comparers/constraint.comparer.ts
@@ -31,7 +31,8 @@ export const compareConstraints: Comparer<DatabaseConstraint> = {
       }
 
       case ConstraintType.CHECK: {
-        return asRenameKey([constraint.type, constraint.tableName, constraint.expression]);
+        const expression = constraint.expression.replaceAll('(', '').replaceAll(')', '');
+        return asRenameKey([constraint.type, constraint.tableName, expression]);
       }
     }
   },
diff --git a/server/src/sql-tools/comparers/index.comparer.ts b/server/src/sql-tools/comparers/index.comparer.ts
index 5625560df7..a3db9a61e0 100644
--- a/server/src/sql-tools/comparers/index.comparer.ts
+++ b/server/src/sql-tools/comparers/index.comparer.ts
@@ -7,7 +7,7 @@ export const compareIndexes: Comparer<DatabaseIndex> = {
       return index.override.value.sql.replace(index.name, 'INDEX_NAME');
     }
 
-    return asRenameKey([index.tableName, ...(index.columnNames || []).toSorted(), index.unique]);
+    return asRenameKey([index.tableName, ...(index.columnNames || []), index.unique]);
   },
   onRename: (source, target) => [
     {
diff --git a/server/src/sql-tools/schema-diff.ts b/server/src/sql-tools/schema-diff.ts
index 5dd3c26fdf..bca58c3228 100644
--- a/server/src/sql-tools/schema-diff.ts
+++ b/server/src/sql-tools/schema-diff.ts
@@ -30,28 +30,35 @@ export const schemaDiff = (source: DatabaseSchema, target: DatabaseSchema, optio
 
   type SchemaName = SchemaDiff['type'];
   const itemMap: Record<SchemaName, SchemaDiff[]> = {
-    EnumCreate: [],
-    EnumDrop: [],
-    ExtensionCreate: [],
-    ExtensionDrop: [],
-    FunctionCreate: [],
-    FunctionDrop: [],
-    TableCreate: [],
-    TableDrop: [],
-    ColumnAdd: [],
-    ColumnAlter: [],
     ColumnRename: [],
-    ColumnDrop: [],
-    ConstraintAdd: [],
-    ConstraintDrop: [],
     ConstraintRename: [],
-    IndexCreate: [],
     IndexRename: [],
-    IndexDrop: [],
-    TriggerCreate: [],
-    TriggerDrop: [],
+
+    ExtensionDrop: [],
+    ExtensionCreate: [],
+
     ParameterSet: [],
     ParameterReset: [],
+
+    FunctionDrop: [],
+    FunctionCreate: [],
+
+    EnumDrop: [],
+    EnumCreate: [],
+
+    TriggerDrop: [],
+    ConstraintDrop: [],
+    TableDrop: [],
+    ColumnDrop: [],
+    ColumnAdd: [],
+    ColumnAlter: [],
+    TableCreate: [],
+    ConstraintAdd: [],
+    TriggerCreate: [],
+
+    IndexCreate: [],
+    IndexDrop: [],
+
     OverrideCreate: [],
     OverrideUpdate: [],
     OverrideDrop: [],
diff --git a/server/src/utils/database.ts b/server/src/utils/database.ts
index 3d6f7b12a5..f23a3deb35 100644
--- a/server/src/utils/database.ts
+++ b/server/src/utils/database.ts
@@ -153,128 +153,128 @@ export function toJson<DB, TB extends keyof DB & string, T extends TB | Expressi
 
 export const ASSET_CHECKSUM_CONSTRAINT = 'UQ_assets_owner_checksum';
 
-export function withDefaultVisibility<O>(qb: SelectQueryBuilder<DB, 'assets', O>) {
-  return qb.where('assets.visibility', 'in', [sql.lit(AssetVisibility.ARCHIVE), sql.lit(AssetVisibility.TIMELINE)]);
+export function withDefaultVisibility<O>(qb: SelectQueryBuilder<DB, 'asset', O>) {
+  return qb.where('asset.visibility', 'in', [sql.lit(AssetVisibility.ARCHIVE), sql.lit(AssetVisibility.TIMELINE)]);
 }
 
 // TODO come up with a better query that only selects the fields we need
-export function withExif<O>(qb: SelectQueryBuilder<DB, 'assets', O>) {
+export function withExif<O>(qb: SelectQueryBuilder<DB, 'asset', O>) {
   return qb
-    .leftJoin('exif', 'assets.id', 'exif.assetId')
-    .select((eb) => eb.fn.toJson(eb.table('exif')).$castTo<Exif | null>().as('exifInfo'));
+    .leftJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+    .select((eb) => eb.fn.toJson(eb.table('asset_exif')).$castTo<Exif | null>().as('exifInfo'));
 }
 
-export function withExifInner<O>(qb: SelectQueryBuilder<DB, 'assets', O>) {
+export function withExifInner<O>(qb: SelectQueryBuilder<DB, 'asset', O>) {
   return qb
-    .innerJoin('exif', 'assets.id', 'exif.assetId')
-    .select((eb) => eb.fn.toJson(eb.table('exif')).$castTo<Exif>().as('exifInfo'));
+    .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+    .select((eb) => eb.fn.toJson(eb.table('asset_exif')).$castTo<Exif>().as('exifInfo'));
 }
 
-export function withSmartSearch<O>(qb: SelectQueryBuilder<DB, 'assets', O>) {
+export function withSmartSearch<O>(qb: SelectQueryBuilder<DB, 'asset', O>) {
   return qb
-    .leftJoin('smart_search', 'assets.id', 'smart_search.assetId')
+    .leftJoin('smart_search', 'asset.id', 'smart_search.assetId')
     .select((eb) => toJson(eb, 'smart_search').as('smartSearch'));
 }
 
-export function withFaces(eb: ExpressionBuilder<DB, 'assets'>, withDeletedFace?: boolean) {
+export function withFaces(eb: ExpressionBuilder<DB, 'asset'>, withDeletedFace?: boolean) {
   return jsonArrayFrom(
     eb
-      .selectFrom('asset_faces')
-      .selectAll('asset_faces')
-      .whereRef('asset_faces.assetId', '=', 'assets.id')
-      .$if(!withDeletedFace, (qb) => qb.where('asset_faces.deletedAt', 'is', null)),
+      .selectFrom('asset_face')
+      .selectAll('asset_face')
+      .whereRef('asset_face.assetId', '=', 'asset.id')
+      .$if(!withDeletedFace, (qb) => qb.where('asset_face.deletedAt', 'is', null)),
   ).as('faces');
 }
 
-export function withFiles(eb: ExpressionBuilder<DB, 'assets'>, type?: AssetFileType) {
+export function withFiles(eb: ExpressionBuilder<DB, 'asset'>, type?: AssetFileType) {
   return jsonArrayFrom(
     eb
-      .selectFrom('asset_files')
+      .selectFrom('asset_file')
       .select(columns.assetFiles)
-      .whereRef('asset_files.assetId', '=', 'assets.id')
-      .$if(!!type, (qb) => qb.where('asset_files.type', '=', type!)),
+      .whereRef('asset_file.assetId', '=', 'asset.id')
+      .$if(!!type, (qb) => qb.where('asset_file.type', '=', type!)),
   ).as('files');
 }
 
-export function withFacesAndPeople(eb: ExpressionBuilder<DB, 'assets'>, withDeletedFace?: boolean) {
+export function withFacesAndPeople(eb: ExpressionBuilder<DB, 'asset'>, withDeletedFace?: boolean) {
   return jsonArrayFrom(
     eb
-      .selectFrom('asset_faces')
+      .selectFrom('asset_face')
       .leftJoinLateral(
         (eb) =>
-          eb.selectFrom('person').selectAll('person').whereRef('asset_faces.personId', '=', 'person.id').as('person'),
+          eb.selectFrom('person').selectAll('person').whereRef('asset_face.personId', '=', 'person.id').as('person'),
         (join) => join.onTrue(),
       )
-      .selectAll('asset_faces')
+      .selectAll('asset_face')
       .select((eb) => eb.table('person').$castTo<Person>().as('person'))
-      .whereRef('asset_faces.assetId', '=', 'assets.id')
-      .$if(!withDeletedFace, (qb) => qb.where('asset_faces.deletedAt', 'is', null)),
+      .whereRef('asset_face.assetId', '=', 'asset.id')
+      .$if(!withDeletedFace, (qb) => qb.where('asset_face.deletedAt', 'is', null)),
   ).as('faces');
 }
 
-export function hasPeople<O>(qb: SelectQueryBuilder<DB, 'assets', O>, personIds: string[]) {
+export function hasPeople<O>(qb: SelectQueryBuilder<DB, 'asset', O>, personIds: string[]) {
   return qb.innerJoin(
     (eb) =>
       eb
-        .selectFrom('asset_faces')
+        .selectFrom('asset_face')
         .select('assetId')
         .where('personId', '=', anyUuid(personIds!))
         .where('deletedAt', 'is', null)
         .groupBy('assetId')
         .having((eb) => eb.fn.count('personId').distinct(), '=', personIds.length)
         .as('has_people'),
-    (join) => join.onRef('has_people.assetId', '=', 'assets.id'),
+    (join) => join.onRef('has_people.assetId', '=', 'asset.id'),
   );
 }
 
-export function inAlbums<O>(qb: SelectQueryBuilder<DB, 'assets', O>, albumIds: string[]) {
+export function inAlbums<O>(qb: SelectQueryBuilder<DB, 'asset', O>, albumIds: string[]) {
   return qb.innerJoin(
     (eb) =>
       eb
-        .selectFrom('albums_assets_assets')
+        .selectFrom('album_asset')
         .select('assetsId')
         .where('albumsId', '=', anyUuid(albumIds!))
         .groupBy('assetsId')
         .having((eb) => eb.fn.count('albumsId').distinct(), '=', albumIds.length)
         .as('has_album'),
-    (join) => join.onRef('has_album.assetsId', '=', 'assets.id'),
+    (join) => join.onRef('has_album.assetsId', '=', 'asset.id'),
   );
 }
 
-export function hasTags<O>(qb: SelectQueryBuilder<DB, 'assets', O>, tagIds: string[]) {
+export function hasTags<O>(qb: SelectQueryBuilder<DB, 'asset', O>, tagIds: string[]) {
   return qb.innerJoin(
     (eb) =>
       eb
         .selectFrom('tag_asset')
         .select('assetsId')
-        .innerJoin('tags_closure', 'tag_asset.tagsId', 'tags_closure.id_descendant')
-        .where('tags_closure.id_ancestor', '=', anyUuid(tagIds))
+        .innerJoin('tag_closure', 'tag_asset.tagsId', 'tag_closure.id_descendant')
+        .where('tag_closure.id_ancestor', '=', anyUuid(tagIds))
         .groupBy('assetsId')
-        .having((eb) => eb.fn.count('tags_closure.id_ancestor').distinct(), '>=', tagIds.length)
+        .having((eb) => eb.fn.count('tag_closure.id_ancestor').distinct(), '>=', tagIds.length)
         .as('has_tags'),
-    (join) => join.onRef('has_tags.assetsId', '=', 'assets.id'),
+    (join) => join.onRef('has_tags.assetsId', '=', 'asset.id'),
   );
 }
 
-export function withOwner(eb: ExpressionBuilder<DB, 'assets'>) {
-  return jsonObjectFrom(eb.selectFrom('users').select(columns.user).whereRef('users.id', '=', 'assets.ownerId')).as(
+export function withOwner(eb: ExpressionBuilder<DB, 'asset'>) {
+  return jsonObjectFrom(eb.selectFrom('user').select(columns.user).whereRef('user.id', '=', 'asset.ownerId')).as(
     'owner',
   );
 }
 
-export function withLibrary(eb: ExpressionBuilder<DB, 'assets'>) {
+export function withLibrary(eb: ExpressionBuilder<DB, 'asset'>) {
   return jsonObjectFrom(
-    eb.selectFrom('libraries').selectAll('libraries').whereRef('libraries.id', '=', 'assets.libraryId'),
+    eb.selectFrom('library').selectAll('library').whereRef('library.id', '=', 'asset.libraryId'),
   ).as('library');
 }
 
-export function withTags(eb: ExpressionBuilder<DB, 'assets'>) {
+export function withTags(eb: ExpressionBuilder<DB, 'asset'>) {
   return jsonArrayFrom(
     eb
-      .selectFrom('tags')
+      .selectFrom('tag')
       .select(columns.tag)
-      .innerJoin('tag_asset', 'tags.id', 'tag_asset.tagsId')
-      .whereRef('assets.id', '=', 'tag_asset.assetsId'),
+      .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagsId')
+      .whereRef('asset.id', '=', 'tag_asset.assetsId'),
   ).as('tags');
 }
 
@@ -282,14 +282,14 @@ export function truncatedDate<O>() {
   return sql<O>`date_trunc(${sql.lit('MONTH')}, "localDateTime" AT TIME ZONE 'UTC') AT TIME ZONE 'UTC'`;
 }
 
-export function withTagId<O>(qb: SelectQueryBuilder<DB, 'assets', O>, tagId: string) {
+export function withTagId<O>(qb: SelectQueryBuilder<DB, 'asset', O>, tagId: string) {
   return qb.where((eb) =>
     eb.exists(
       eb
-        .selectFrom('tags_closure')
-        .innerJoin('tag_asset', 'tag_asset.tagsId', 'tags_closure.id_descendant')
-        .whereRef('tag_asset.assetsId', '=', 'assets.id')
-        .where('tags_closure.id_ancestor', '=', tagId),
+        .selectFrom('tag_closure')
+        .innerJoin('tag_asset', 'tag_asset.tagsId', 'tag_closure.id_descendant')
+        .whereRef('tag_asset.assetsId', '=', 'asset.id')
+        .where('tag_closure.id_ancestor', '=', tagId),
     ),
   );
 }
@@ -303,96 +303,94 @@ export function searchAssetBuilder(kysely: Kysely<DB>, options: AssetSearchBuild
 
   return kysely
     .withPlugin(joinDeduplicationPlugin)
-    .selectFrom('assets')
-    .where('assets.visibility', '=', visibility)
+    .selectFrom('asset')
+    .where('asset.visibility', '=', visibility)
     .$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', '=', 'assets.id')))),
+      qb.where((eb) => eb.not(eb.exists((eb) => eb.selectFrom('tag_asset').whereRef('assetsId', '=', 'asset.id')))),
     )
     .$if(!!options.personIds && options.personIds.length > 0, (qb) => hasPeople(qb, options.personIds!))
-    .$if(!!options.createdBefore, (qb) => qb.where('assets.createdAt', '<=', options.createdBefore!))
-    .$if(!!options.createdAfter, (qb) => qb.where('assets.createdAt', '>=', options.createdAfter!))
-    .$if(!!options.updatedBefore, (qb) => qb.where('assets.updatedAt', '<=', options.updatedBefore!))
-    .$if(!!options.updatedAfter, (qb) => qb.where('assets.updatedAt', '>=', options.updatedAfter!))
-    .$if(!!options.trashedBefore, (qb) => qb.where('assets.deletedAt', '<=', options.trashedBefore!))
-    .$if(!!options.trashedAfter, (qb) => qb.where('assets.deletedAt', '>=', options.trashedAfter!))
-    .$if(!!options.takenBefore, (qb) => qb.where('assets.fileCreatedAt', '<=', options.takenBefore!))
-    .$if(!!options.takenAfter, (qb) => qb.where('assets.fileCreatedAt', '>=', options.takenAfter!))
+    .$if(!!options.createdBefore, (qb) => qb.where('asset.createdAt', '<=', options.createdBefore!))
+    .$if(!!options.createdAfter, (qb) => qb.where('asset.createdAt', '>=', options.createdAfter!))
+    .$if(!!options.updatedBefore, (qb) => qb.where('asset.updatedAt', '<=', options.updatedBefore!))
+    .$if(!!options.updatedAfter, (qb) => qb.where('asset.updatedAt', '>=', options.updatedAfter!))
+    .$if(!!options.trashedBefore, (qb) => qb.where('asset.deletedAt', '<=', options.trashedBefore!))
+    .$if(!!options.trashedAfter, (qb) => qb.where('asset.deletedAt', '>=', options.trashedAfter!))
+    .$if(!!options.takenBefore, (qb) => qb.where('asset.fileCreatedAt', '<=', options.takenBefore!))
+    .$if(!!options.takenAfter, (qb) => qb.where('asset.fileCreatedAt', '>=', options.takenAfter!))
     .$if(options.city !== undefined, (qb) =>
       qb
-        .innerJoin('exif', 'assets.id', 'exif.assetId')
-        .where('exif.city', options.city === null ? 'is' : '=', options.city!),
+        .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+        .where('asset_exif.city', options.city === null ? 'is' : '=', options.city!),
     )
     .$if(options.state !== undefined, (qb) =>
       qb
-        .innerJoin('exif', 'assets.id', 'exif.assetId')
-        .where('exif.state', options.state === null ? 'is' : '=', options.state!),
+        .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+        .where('asset_exif.state', options.state === null ? 'is' : '=', options.state!),
     )
     .$if(options.country !== undefined, (qb) =>
       qb
-        .innerJoin('exif', 'assets.id', 'exif.assetId')
-        .where('exif.country', options.country === null ? 'is' : '=', options.country!),
+        .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+        .where('asset_exif.country', options.country === null ? 'is' : '=', options.country!),
     )
     .$if(options.make !== undefined, (qb) =>
       qb
-        .innerJoin('exif', 'assets.id', 'exif.assetId')
-        .where('exif.make', options.make === null ? 'is' : '=', options.make!),
+        .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+        .where('asset_exif.make', options.make === null ? 'is' : '=', options.make!),
     )
     .$if(options.model !== undefined, (qb) =>
       qb
-        .innerJoin('exif', 'assets.id', 'exif.assetId')
-        .where('exif.model', options.model === null ? 'is' : '=', options.model!),
+        .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+        .where('asset_exif.model', options.model === null ? 'is' : '=', options.model!),
     )
     .$if(options.lensModel !== undefined, (qb) =>
       qb
-        .innerJoin('exif', 'assets.id', 'exif.assetId')
-        .where('exif.lensModel', options.lensModel === null ? 'is' : '=', options.lensModel!),
+        .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+        .where('asset_exif.lensModel', options.lensModel === null ? 'is' : '=', options.lensModel!),
     )
     .$if(options.rating !== undefined, (qb) =>
       qb
-        .innerJoin('exif', 'assets.id', 'exif.assetId')
-        .where('exif.rating', options.rating === null ? 'is' : '=', options.rating!),
+        .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+        .where('asset_exif.rating', options.rating === null ? 'is' : '=', options.rating!),
     )
-    .$if(!!options.checksum, (qb) => qb.where('assets.checksum', '=', options.checksum!))
-    .$if(!!options.deviceAssetId, (qb) => qb.where('assets.deviceAssetId', '=', options.deviceAssetId!))
-    .$if(!!options.deviceId, (qb) => qb.where('assets.deviceId', '=', options.deviceId!))
-    .$if(!!options.id, (qb) => qb.where('assets.id', '=', asUuid(options.id!)))
-    .$if(!!options.libraryId, (qb) => qb.where('assets.libraryId', '=', asUuid(options.libraryId!)))
-    .$if(!!options.userIds, (qb) => qb.where('assets.ownerId', '=', anyUuid(options.userIds!)))
-    .$if(!!options.encodedVideoPath, (qb) => qb.where('assets.encodedVideoPath', '=', options.encodedVideoPath!))
+    .$if(!!options.checksum, (qb) => qb.where('asset.checksum', '=', options.checksum!))
+    .$if(!!options.deviceAssetId, (qb) => qb.where('asset.deviceAssetId', '=', options.deviceAssetId!))
+    .$if(!!options.deviceId, (qb) => qb.where('asset.deviceId', '=', options.deviceId!))
+    .$if(!!options.id, (qb) => qb.where('asset.id', '=', asUuid(options.id!)))
+    .$if(!!options.libraryId, (qb) => qb.where('asset.libraryId', '=', asUuid(options.libraryId!)))
+    .$if(!!options.userIds, (qb) => qb.where('asset.ownerId', '=', anyUuid(options.userIds!)))
+    .$if(!!options.encodedVideoPath, (qb) => qb.where('asset.encodedVideoPath', '=', options.encodedVideoPath!))
     .$if(!!options.originalPath, (qb) =>
-      qb.where(sql`f_unaccent(assets."originalPath")`, 'ilike', sql`'%' || f_unaccent(${options.originalPath}) || '%'`),
+      qb.where(sql`f_unaccent(asset."originalPath")`, 'ilike', sql`'%' || f_unaccent(${options.originalPath}) || '%'`),
     )
     .$if(!!options.originalFileName, (qb) =>
       qb.where(
-        sql`f_unaccent(assets."originalFileName")`,
+        sql`f_unaccent(asset."originalFileName")`,
         'ilike',
         sql`'%' || f_unaccent(${options.originalFileName}) || '%'`,
       ),
     )
     .$if(!!options.description, (qb) =>
       qb
-        .innerJoin('exif', 'assets.id', 'exif.assetId')
-        .where(sql`f_unaccent(exif.description)`, 'ilike', sql`'%' || f_unaccent(${options.description}) || '%'`),
+        .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+        .where(sql`f_unaccent(asset_exif.description)`, 'ilike', sql`'%' || f_unaccent(${options.description}) || '%'`),
     )
-    .$if(!!options.type, (qb) => qb.where('assets.type', '=', options.type!))
-    .$if(options.isFavorite !== undefined, (qb) => qb.where('assets.isFavorite', '=', options.isFavorite!))
-    .$if(options.isOffline !== undefined, (qb) => qb.where('assets.isOffline', '=', options.isOffline!))
+    .$if(!!options.type, (qb) => qb.where('asset.type', '=', options.type!))
+    .$if(options.isFavorite !== undefined, (qb) => qb.where('asset.isFavorite', '=', options.isFavorite!))
+    .$if(options.isOffline !== undefined, (qb) => qb.where('asset.isOffline', '=', options.isOffline!))
     .$if(options.isEncoded !== undefined, (qb) =>
-      qb.where('assets.encodedVideoPath', options.isEncoded ? 'is not' : 'is', null),
+      qb.where('asset.encodedVideoPath', options.isEncoded ? 'is not' : 'is', null),
     )
     .$if(options.isMotion !== undefined, (qb) =>
-      qb.where('assets.livePhotoVideoId', options.isMotion ? 'is not' : 'is', null),
+      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('albums_assets_assets').whereRef('assetsId', '=', 'assets.id'))),
-      ),
+      qb.where((eb) => eb.not(eb.exists((eb) => eb.selectFrom('album_asset').whereRef('assetsId', '=', 'asset.id')))),
     )
     .$if(!!options.withExif, withExifInner)
     .$if(!!(options.withFaces || options.withPeople || options.personIds), (qb) => qb.select(withFacesAndPeople))
-    .$if(!options.withDeleted, (qb) => qb.where('assets.deletedAt', 'is', null));
+    .$if(!options.withDeleted, (qb) => qb.where('asset.deletedAt', 'is', null));
 }
 
 export type ReindexVectorIndexOptions = { indexName: string; lists?: number };
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index c7f2e017a1..9c1032663f 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -34,9 +34,9 @@ import { UserRepository } from 'src/repositories/user.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
 import { DB } from 'src/schema';
 import { AlbumTable } from 'src/schema/tables/album.table';
+import { AssetExifTable } from 'src/schema/tables/asset-exif.table';
 import { AssetJobStatusTable } from 'src/schema/tables/asset-job-status.table';
 import { AssetTable } from 'src/schema/tables/asset.table';
-import { ExifTable } from 'src/schema/tables/exif.table';
 import { FaceSearchTable } from 'src/schema/tables/face-search.table';
 import { MemoryTable } from 'src/schema/tables/memory.table';
 import { PersonTable } from 'src/schema/tables/person.table';
@@ -165,7 +165,7 @@ export class MediumTestContext<S extends BaseService = BaseService> {
     return { memoryAsset: dto, result };
   }
 
-  async newExif(dto: Insertable<ExifTable>) {
+  async newExif(dto: Insertable<AssetExifTable>) {
     const result = await this.get(AssetRepository).upsertExif(dto);
     return { result };
   }
diff --git a/server/test/medium/specs/services/audit.database.spec.ts b/server/test/medium/specs/services/audit.database.spec.ts
index 8ca68cdb4a..7506fcf2c3 100644
--- a/server/test/medium/specs/services/audit.database.spec.ts
+++ b/server/test/medium/specs/services/audit.database.spec.ts
@@ -1,7 +1,7 @@
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { PartnerRepository } from 'src/repositories/partner.repository';
 import { UserRepository } from 'src/repositories/user.repository';
-import { partners_delete_audit, stacks_delete_audit } from 'src/schema/functions';
+import { partner_delete_audit, stack_delete_audit } from 'src/schema/functions';
 import { BaseService } from 'src/services/base.service';
 import { MediumTestContext } from 'test/medium.factory';
 import { getKyselyDB } from 'test/utils';
@@ -17,7 +17,7 @@ describe('audit', () => {
     });
   });
 
-  describe(partners_delete_audit.name, () => {
+  describe(partner_delete_audit.name, () => {
     it('should not cascade user deletes to partners_audit', async () => {
       const partnerRepo = ctx.get(PartnerRepository);
       const userRepo = ctx.get(UserRepository);
@@ -26,12 +26,12 @@ describe('audit', () => {
       await partnerRepo.create({ sharedById: user1.id, sharedWithId: user2.id });
       await userRepo.delete(user1, true);
       await expect(
-        ctx.database.selectFrom('partners_audit').select(['id']).where('sharedById', '=', user1.id).execute(),
+        ctx.database.selectFrom('partner_audit').select(['id']).where('sharedById', '=', user1.id).execute(),
       ).resolves.toHaveLength(0);
     });
   });
 
-  describe(stacks_delete_audit.name, () => {
+  describe(stack_delete_audit.name, () => {
     it('should not cascade user deletes to stacks_audit', async () => {
       const userRepo = ctx.get(UserRepository);
       const { user } = await ctx.newUser();
@@ -40,7 +40,7 @@ describe('audit', () => {
       await ctx.newStack({ ownerId: user.id }, [asset1.id, asset2.id]);
       await userRepo.delete(user, true);
       await expect(
-        ctx.database.selectFrom('stacks_audit').select(['id']).where('userId', '=', user.id).execute(),
+        ctx.database.selectFrom('stack_audit').select(['id']).where('userId', '=', user.id).execute(),
       ).resolves.toHaveLength(0);
     });
   });
@@ -52,7 +52,7 @@ describe('audit', () => {
       const { asset } = await ctx.newAsset({ ownerId: user.id });
       await userRepo.delete(user, true);
       await expect(
-        ctx.database.selectFrom('assets_audit').select(['id']).where('assetId', '=', asset.id).execute(),
+        ctx.database.selectFrom('asset_audit').select(['id']).where('assetId', '=', asset.id).execute(),
       ).resolves.toHaveLength(0);
     });
   });
@@ -64,7 +64,7 @@ describe('audit', () => {
       await ctx.newExif({ assetId: asset.id, make: 'Canon' });
 
       const before = await ctx.database
-        .selectFrom('exif')
+        .selectFrom('asset_exif')
         .select(['updatedAt', 'updateId'])
         .where('assetId', '=', asset.id)
         .executeTakeFirstOrThrow();
@@ -72,7 +72,7 @@ describe('audit', () => {
       await ctx.newExif({ assetId: asset.id, make: 'Canon 2' });
 
       const after = await ctx.database
-        .selectFrom('exif')
+        .selectFrom('asset_exif')
         .select(['updatedAt', 'updateId'])
         .where('assetId', '=', asset.id)
         .executeTakeFirstOrThrow();

From a97ba4862fe7a10dd28e1effe45eaca64913349b Mon Sep 17 00:00:00 2001
From: Sergey Katsubo <skatsubo@gmail.com>
Date: Mon, 14 Jul 2025 17:24:34 +0300
Subject: [PATCH 199/337] fix(docs): Nightly Tasks Settings (#19907)

* Document new Nightly Tasks Settings

* Add a link to the settings

* List jobs that are configured in their own System Settings sections
---
 .../administration/img/admin-nightly-tasks.webp | Bin 0 -> 34122 bytes
 docs/docs/administration/jobs-workers.md        |  10 ++++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 docs/docs/administration/img/admin-nightly-tasks.webp

diff --git a/docs/docs/administration/img/admin-nightly-tasks.webp b/docs/docs/administration/img/admin-nightly-tasks.webp
new file mode 100644
index 0000000000000000000000000000000000000000..b3d8f13cb6260fdfe1c5bd912e1a7fd38e1ac35d
GIT binary patch
literal 34122
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

literal 0
HcmV?d00001

diff --git a/docs/docs/administration/jobs-workers.md b/docs/docs/administration/jobs-workers.md
index 75f97de982..4634151b9a 100644
--- a/docs/docs/administration/jobs-workers.md
+++ b/docs/docs/administration/jobs-workers.md
@@ -46,6 +46,12 @@ services:
 
 When a new asset is uploaded it kicks off a series of jobs, which include metadata extraction, thumbnail generation, machine learning tasks, and storage template migration, if enabled. To view the status of a job navigate to the Administration -> Jobs page.
 
-Additionally, some jobs run on a schedule, which is every night at midnight. This schedule, with the exception of [External Libraries](/docs/features/libraries) scanning, cannot be changed.
-
 <img src={require('./img/admin-jobs.webp').default} width="60%" title="Admin jobs" />
+
+Additionally, some jobs (such as memories generation) run on a schedule, which is every night at midnight by default. To change when they run or enable/disable a job navigate to System Settings -> [Nightly Tasks Settings](https://my.immich.app/admin/system-settings?isOpen=nightly-tasks).
+
+<img src={require('./img/admin-nightly-tasks.webp').default} width="60%" title="Admin nightly tasks" />
+
+:::note
+Some jobs ([External Libraries](/docs/features/libraries) scanning, Database Dump) are configured in their own sections in System Settings.
+:::

From 805ec3e351e29c4dada714d35097199d0db81d4b Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 14 Jul 2025 11:57:25 -0400
Subject: [PATCH 200/337] chore: asset sync FKs (#19927)

---
 mobile/openapi/lib/model/sync_asset_v1.dart   | 26 ++++++++++++++++++-
 open-api/immich-openapi-specs.json            | 10 +++++++
 server/src/database.ts                        |  2 ++
 server/src/dtos/sync.dto.ts                   |  2 ++
 server/src/queries/sync.repository.sql        | 10 +++++++
 server/src/services/job.service.ts            |  2 ++
 .../specs/sync/sync-album-asset.spec.ts       |  4 +++
 .../test/medium/specs/sync/sync-asset.spec.ts |  2 ++
 .../specs/sync/sync-partner-asset.spec.ts     |  2 ++
 9 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/mobile/openapi/lib/model/sync_asset_v1.dart b/mobile/openapi/lib/model/sync_asset_v1.dart
index 1ca6e20cff..4c42d08a5f 100644
--- a/mobile/openapi/lib/model/sync_asset_v1.dart
+++ b/mobile/openapi/lib/model/sync_asset_v1.dart
@@ -20,9 +20,11 @@ class SyncAssetV1 {
     required this.fileModifiedAt,
     required this.id,
     required this.isFavorite,
+    required this.livePhotoVideoId,
     required this.localDateTime,
     required this.originalFileName,
     required this.ownerId,
+    required this.stackId,
     required this.thumbhash,
     required this.type,
     required this.visibility,
@@ -42,12 +44,16 @@ class SyncAssetV1 {
 
   bool isFavorite;
 
+  String? livePhotoVideoId;
+
   DateTime? localDateTime;
 
   String originalFileName;
 
   String ownerId;
 
+  String? stackId;
+
   String? thumbhash;
 
   AssetTypeEnum type;
@@ -63,9 +69,11 @@ class SyncAssetV1 {
     other.fileModifiedAt == fileModifiedAt &&
     other.id == id &&
     other.isFavorite == isFavorite &&
+    other.livePhotoVideoId == livePhotoVideoId &&
     other.localDateTime == localDateTime &&
     other.originalFileName == originalFileName &&
     other.ownerId == ownerId &&
+    other.stackId == stackId &&
     other.thumbhash == thumbhash &&
     other.type == type &&
     other.visibility == visibility;
@@ -80,15 +88,17 @@ class SyncAssetV1 {
     (fileModifiedAt == null ? 0 : fileModifiedAt!.hashCode) +
     (id.hashCode) +
     (isFavorite.hashCode) +
+    (livePhotoVideoId == null ? 0 : livePhotoVideoId!.hashCode) +
     (localDateTime == null ? 0 : localDateTime!.hashCode) +
     (originalFileName.hashCode) +
     (ownerId.hashCode) +
+    (stackId == null ? 0 : stackId!.hashCode) +
     (thumbhash == null ? 0 : thumbhash!.hashCode) +
     (type.hashCode) +
     (visibility.hashCode);
 
   @override
-  String toString() => 'SyncAssetV1[checksum=$checksum, deletedAt=$deletedAt, duration=$duration, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, id=$id, isFavorite=$isFavorite, localDateTime=$localDateTime, originalFileName=$originalFileName, ownerId=$ownerId, thumbhash=$thumbhash, type=$type, visibility=$visibility]';
+  String toString() => 'SyncAssetV1[checksum=$checksum, deletedAt=$deletedAt, duration=$duration, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, id=$id, isFavorite=$isFavorite, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, ownerId=$ownerId, stackId=$stackId, thumbhash=$thumbhash, type=$type, visibility=$visibility]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -115,6 +125,11 @@ class SyncAssetV1 {
     }
       json[r'id'] = this.id;
       json[r'isFavorite'] = this.isFavorite;
+    if (this.livePhotoVideoId != null) {
+      json[r'livePhotoVideoId'] = this.livePhotoVideoId;
+    } else {
+    //  json[r'livePhotoVideoId'] = null;
+    }
     if (this.localDateTime != null) {
       json[r'localDateTime'] = this.localDateTime!.toUtc().toIso8601String();
     } else {
@@ -122,6 +137,11 @@ class SyncAssetV1 {
     }
       json[r'originalFileName'] = this.originalFileName;
       json[r'ownerId'] = this.ownerId;
+    if (this.stackId != null) {
+      json[r'stackId'] = this.stackId;
+    } else {
+    //  json[r'stackId'] = null;
+    }
     if (this.thumbhash != null) {
       json[r'thumbhash'] = this.thumbhash;
     } else {
@@ -148,9 +168,11 @@ class SyncAssetV1 {
         fileModifiedAt: mapDateTime(json, r'fileModifiedAt', r''),
         id: mapValueOfType<String>(json, r'id')!,
         isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
+        livePhotoVideoId: mapValueOfType<String>(json, r'livePhotoVideoId'),
         localDateTime: mapDateTime(json, r'localDateTime', r''),
         originalFileName: mapValueOfType<String>(json, r'originalFileName')!,
         ownerId: mapValueOfType<String>(json, r'ownerId')!,
+        stackId: mapValueOfType<String>(json, r'stackId'),
         thumbhash: mapValueOfType<String>(json, r'thumbhash'),
         type: AssetTypeEnum.fromJson(json[r'type'])!,
         visibility: AssetVisibility.fromJson(json[r'visibility'])!,
@@ -208,9 +230,11 @@ class SyncAssetV1 {
     'fileModifiedAt',
     'id',
     'isFavorite',
+    'livePhotoVideoId',
     'localDateTime',
     'originalFileName',
     'ownerId',
+    'stackId',
     'thumbhash',
     'type',
     'visibility',
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 492d3cfec1..71329c3f75 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13818,6 +13818,10 @@
           "isFavorite": {
             "type": "boolean"
           },
+          "livePhotoVideoId": {
+            "nullable": true,
+            "type": "string"
+          },
           "localDateTime": {
             "format": "date-time",
             "nullable": true,
@@ -13829,6 +13833,10 @@
           "ownerId": {
             "type": "string"
           },
+          "stackId": {
+            "nullable": true,
+            "type": "string"
+          },
           "thumbhash": {
             "nullable": true,
             "type": "string"
@@ -13856,9 +13864,11 @@
           "fileModifiedAt",
           "id",
           "isFavorite",
+          "livePhotoVideoId",
           "localDateTime",
           "originalFileName",
           "ownerId",
+          "stackId",
           "thumbhash",
           "type",
           "visibility"
diff --git a/server/src/database.ts b/server/src/database.ts
index a89299fbeb..d42b2618a4 100644
--- a/server/src/database.ts
+++ b/server/src/database.ts
@@ -349,6 +349,8 @@ export const columns = {
     'asset.isFavorite',
     'asset.visibility',
     'asset.duration',
+    'asset.livePhotoVideoId',
+    'asset.stackId',
   ],
   syncAlbumUser: ['album_user.albumsId as albumId', 'album_user.usersId as userId', 'album_user.role'],
   syncStack: ['stack.id', 'stack.createdAt', 'stack.updatedAt', 'stack.primaryAssetId', 'stack.ownerId'],
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index abd7d7b694..8ba73271e6 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -96,6 +96,8 @@ export class SyncAssetV1 {
   isFavorite!: boolean;
   @ApiProperty({ enumName: 'AssetVisibility', enum: AssetVisibility })
   visibility!: AssetVisibility;
+  livePhotoVideoId!: string | null;
+  stackId!: string | null;
 }
 
 @ExtraModel()
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index 2f484f6d52..4782eedf1d 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -64,6 +64,8 @@ select
   "asset"."isFavorite",
   "asset"."visibility",
   "asset"."duration",
+  "asset"."livePhotoVideoId",
+  "asset"."stackId",
   "asset"."updateId"
 from
   "asset"
@@ -91,6 +93,8 @@ select
   "asset"."isFavorite",
   "asset"."visibility",
   "asset"."duration",
+  "asset"."livePhotoVideoId",
+  "asset"."stackId",
   "asset"."updateId"
 from
   "asset"
@@ -351,6 +355,8 @@ select
   "asset"."isFavorite",
   "asset"."visibility",
   "asset"."duration",
+  "asset"."livePhotoVideoId",
+  "asset"."stackId",
   "asset"."updateId"
 from
   "asset"
@@ -539,6 +545,8 @@ select
   "asset"."isFavorite",
   "asset"."visibility",
   "asset"."duration",
+  "asset"."livePhotoVideoId",
+  "asset"."stackId",
   "asset"."updateId"
 from
   "asset"
@@ -584,6 +592,8 @@ select
   "asset"."isFavorite",
   "asset"."visibility",
   "asset"."duration",
+  "asset"."livePhotoVideoId",
+  "asset"."stackId",
   "asset"."updateId"
 from
   "asset"
diff --git a/server/src/services/job.service.ts b/server/src/services/job.service.ts
index 645b22249f..37a66706c0 100644
--- a/server/src/services/job.service.ts
+++ b/server/src/services/job.service.ts
@@ -380,6 +380,8 @@ export class JobService extends BaseService {
                 deletedAt: asset.deletedAt,
                 isFavorite: asset.isFavorite,
                 visibility: asset.visibility,
+                livePhotoVideoId: asset.livePhotoVideoId,
+                stackId: asset.stackId,
               },
               exif: {
                 assetId: exif.assetId,
diff --git a/server/test/medium/specs/sync/sync-album-asset.spec.ts b/server/test/medium/specs/sync/sync-album-asset.spec.ts
index 6bfb6b5d27..41700d29d4 100644
--- a/server/test/medium/specs/sync/sync-album-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-asset.spec.ts
@@ -36,6 +36,8 @@ describe(SyncRequestType.AlbumAssetsV1, () => {
       localDateTime: date,
       deletedAt: null,
       duration: '0:10:00.00000',
+      livePhotoVideoId: null,
+      stackId: null,
     });
     const { album } = await ctx.newAlbum({ ownerId: user2.id });
     await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
@@ -60,6 +62,8 @@ describe(SyncRequestType.AlbumAssetsV1, () => {
           type: asset.type,
           visibility: asset.visibility,
           duration: asset.duration,
+          livePhotoVideoId: asset.livePhotoVideoId,
+          stackId: asset.stackId,
         },
         type: SyncEntityType.AlbumAssetV1,
       },
diff --git a/server/test/medium/specs/sync/sync-asset.spec.ts b/server/test/medium/specs/sync/sync-asset.spec.ts
index 8603296028..52d6bcb524 100644
--- a/server/test/medium/specs/sync/sync-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-asset.spec.ts
@@ -57,6 +57,8 @@ describe(SyncEntityType.AssetV1, () => {
           type: asset.type,
           visibility: asset.visibility,
           duration: asset.duration,
+          stackId: null,
+          livePhotoVideoId: null,
         },
         type: 'AssetV1',
       },
diff --git a/server/test/medium/specs/sync/sync-partner-asset.spec.ts b/server/test/medium/specs/sync/sync-partner-asset.spec.ts
index d9655add57..2daa750bf3 100644
--- a/server/test/medium/specs/sync/sync-partner-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-partner-asset.spec.ts
@@ -63,6 +63,8 @@ describe(SyncRequestType.PartnerAssetsV1, () => {
           type: asset.type,
           visibility: asset.visibility,
           duration: asset.duration,
+          stackId: null,
+          livePhotoVideoId: null,
         },
         type: SyncEntityType.PartnerAssetV1,
       },

From 9abb95d34ae0175a5cb4e39b4e4f38cdbe5d0cf6 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Tue, 15 Jul 2025 00:53:24 +0530
Subject: [PATCH 201/337] feat: handle live photos on new asset viewer (#19926)

sync and handle livePhotoVideoId in asset viewer

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../drift_schemas/main/drift_schema_v1.json   |  2 +-
 .../domain/models/asset/base_asset.model.dart |  2 +
 .../models/asset/remote_asset.model.dart      |  2 +
 .../entities/merged_asset.drift               |  2 +
 .../entities/merged_asset.drift.dart          |  5 +-
 .../entities/remote_asset.entity.dart         |  3 +
 .../entities/remote_asset.entity.drift.dart   | 61 +++++++++++++++++++
 .../repositories/sync_stream.repository.dart  |  3 +-
 .../repositories/timeline.repository.dart     |  1 +
 .../motion_photo_action_button.widget.dart    | 25 ++++++++
 .../asset_viewer/asset_viewer.page.dart       | 12 +++-
 .../asset_viewer/top_app_bar.widget.dart      |  2 +
 .../asset_viewer/video_viewer.widget.dart     |  7 +--
 .../widgets/timeline/fixed/segment.model.dart |  2 +
 14 files changed, 119 insertions(+), 10 deletions(-)
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart

diff --git a/mobile/drift_schemas/main/drift_schema_v1.json b/mobile/drift_schemas/main/drift_schema_v1.json
index 4960cd0a0d..9fc7d17d56 100644
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
@@ -1 +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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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":14,"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":15,"references":[1,14],"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":16,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}}]}
\ No newline at end of file
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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":14,"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":15,"references":[1,14],"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":16,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}}]}
\ No newline at end of file
diff --git a/mobile/lib/domain/models/asset/base_asset.model.dart b/mobile/lib/domain/models/asset/base_asset.model.dart
index fad1f1961a..356b64cffc 100644
--- a/mobile/lib/domain/models/asset/base_asset.model.dart
+++ b/mobile/lib/domain/models/asset/base_asset.model.dart
@@ -43,6 +43,8 @@ sealed class BaseAsset {
   bool get isImage => type == AssetType.image;
   bool get isVideo => type == AssetType.video;
 
+  bool get isMotionPhoto => livePhotoVideoId != null;
+
   Duration get duration {
     final durationInSeconds = this.durationInSeconds;
     if (durationInSeconds != null) {
diff --git a/mobile/lib/domain/models/asset/remote_asset.model.dart b/mobile/lib/domain/models/asset/remote_asset.model.dart
index 587eabc00b..9e4cfa1f19 100644
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -94,6 +94,7 @@ class RemoteAsset extends BaseAsset {
     bool? isFavorite,
     String? thumbHash,
     AssetVisibility? visibility,
+    String? livePhotoVideoId,
   }) {
     return RemoteAsset(
       id: id ?? this.id,
@@ -110,6 +111,7 @@ class RemoteAsset extends BaseAsset {
       isFavorite: isFavorite ?? this.isFavorite,
       thumbHash: thumbHash ?? this.thumbHash,
       visibility: visibility ?? this.visibility,
+      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
     );
   }
 }
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift b/mobile/lib/infrastructure/entities/merged_asset.drift
index d6451db8d8..e07edbc0c8 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -17,6 +17,7 @@ mergedAsset: SELECT * FROM
 		rae.thumb_hash,
 		rae.checksum,
 		rae.owner_id,
+		rae.live_photo_video_id,
 		0 as orientation
 	FROM
 		remote_asset_entity rae
@@ -39,6 +40,7 @@ mergedAsset: SELECT * FROM
 		NULL as thumb_hash,
 		lae.checksum,
 		NULL as owner_id,
+		NULL as live_photo_video_id,
 		lae.orientation
 	FROM
 		local_asset_entity lae
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift.dart b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
index b289083a2b..4ee0643706 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift.dart
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
@@ -18,7 +18,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
     final generatedlimit = $write(limit, startIndex: $arrayStartIndex);
     $arrayStartIndex += generatedlimit.amountOfVariables;
     return customSelect(
-        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, 0 AS orientation FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, lae.orientation FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
+        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
         variables: [
           for (var $ in var1) i0.Variable<String>($),
           ...generatedlimit.introducedVariables
@@ -42,6 +42,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
           thumbHash: row.readNullable<String>('thumb_hash'),
           checksum: row.readNullable<String>('checksum'),
           ownerId: row.readNullable<String>('owner_id'),
+          livePhotoVideoId: row.readNullable<String>('live_photo_video_id'),
           orientation: row.read<int>('orientation'),
         ));
   }
@@ -88,6 +89,7 @@ class MergedAssetResult {
   final String? thumbHash;
   final String? checksum;
   final String? ownerId;
+  final String? livePhotoVideoId;
   final int orientation;
   MergedAssetResult({
     this.remoteId,
@@ -103,6 +105,7 @@ class MergedAssetResult {
     this.thumbHash,
     this.checksum,
     this.ownerId,
+    this.livePhotoVideoId,
     required this.orientation,
   });
 }
diff --git a/mobile/lib/infrastructure/entities/remote_asset.entity.dart b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
index c08401356c..96193e0415 100644
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
@@ -30,6 +30,8 @@ class RemoteAssetEntity extends Table
 
   DateTimeColumn get deletedAt => dateTime().nullable()();
 
+  TextColumn get livePhotoVideoId => text().nullable()();
+
   IntColumn get visibility => intEnum<AssetVisibility>()();
 
   @override
@@ -51,6 +53,7 @@ extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
         width: width,
         thumbHash: thumbHash,
         visibility: visibility,
+        livePhotoVideoId: livePhotoVideoId,
         localId: null,
       );
 }
diff --git a/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart b/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
index 4a13b74f5d..2bb7cffe59 100644
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
@@ -27,6 +27,7 @@ typedef $$RemoteAssetEntityTableCreateCompanionBuilder
   i0.Value<DateTime?> localDateTime,
   i0.Value<String?> thumbHash,
   i0.Value<DateTime?> deletedAt,
+  i0.Value<String?> livePhotoVideoId,
   required i2.AssetVisibility visibility,
 });
 typedef $$RemoteAssetEntityTableUpdateCompanionBuilder
@@ -45,6 +46,7 @@ typedef $$RemoteAssetEntityTableUpdateCompanionBuilder
   i0.Value<DateTime?> localDateTime,
   i0.Value<String?> thumbHash,
   i0.Value<DateTime?> deletedAt,
+  i0.Value<String?> livePhotoVideoId,
   i0.Value<i2.AssetVisibility> visibility,
 });
 
@@ -134,6 +136,10 @@ class $$RemoteAssetEntityTableFilterComposer
   i0.ColumnFilters<DateTime> get deletedAt => $composableBuilder(
       column: $table.deletedAt, builder: (column) => i0.ColumnFilters(column));
 
+  i0.ColumnFilters<String> get livePhotoVideoId => $composableBuilder(
+      column: $table.livePhotoVideoId,
+      builder: (column) => i0.ColumnFilters(column));
+
   i0.ColumnWithTypeConverterFilters<i2.AssetVisibility, i2.AssetVisibility, int>
       get visibility => $composableBuilder(
           column: $table.visibility,
@@ -217,6 +223,10 @@ class $$RemoteAssetEntityTableOrderingComposer
       column: $table.deletedAt,
       builder: (column) => i0.ColumnOrderings(column));
 
+  i0.ColumnOrderings<String> get livePhotoVideoId => $composableBuilder(
+      column: $table.livePhotoVideoId,
+      builder: (column) => i0.ColumnOrderings(column));
+
   i0.ColumnOrderings<int> get visibility => $composableBuilder(
       column: $table.visibility,
       builder: (column) => i0.ColumnOrderings(column));
@@ -292,6 +302,9 @@ class $$RemoteAssetEntityTableAnnotationComposer
   i0.GeneratedColumn<DateTime> get deletedAt =>
       $composableBuilder(column: $table.deletedAt, builder: (column) => column);
 
+  i0.GeneratedColumn<String> get livePhotoVideoId => $composableBuilder(
+      column: $table.livePhotoVideoId, builder: (column) => column);
+
   i0.GeneratedColumnWithTypeConverter<i2.AssetVisibility, int> get visibility =>
       $composableBuilder(
           column: $table.visibility, builder: (column) => column);
@@ -358,6 +371,7 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             i0.Value<DateTime?> localDateTime = const i0.Value.absent(),
             i0.Value<String?> thumbHash = const i0.Value.absent(),
             i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+            i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
             i0.Value<i2.AssetVisibility> visibility = const i0.Value.absent(),
           }) =>
               i1.RemoteAssetEntityCompanion(
@@ -375,6 +389,7 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             localDateTime: localDateTime,
             thumbHash: thumbHash,
             deletedAt: deletedAt,
+            livePhotoVideoId: livePhotoVideoId,
             visibility: visibility,
           ),
           createCompanionCallback: ({
@@ -392,6 +407,7 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             i0.Value<DateTime?> localDateTime = const i0.Value.absent(),
             i0.Value<String?> thumbHash = const i0.Value.absent(),
             i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+            i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
             required i2.AssetVisibility visibility,
           }) =>
               i1.RemoteAssetEntityCompanion.insert(
@@ -409,6 +425,7 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             localDateTime: localDateTime,
             thumbHash: thumbHash,
             deletedAt: deletedAt,
+            livePhotoVideoId: livePhotoVideoId,
             visibility: visibility,
           ),
           withReferenceMapper: (p0) => p0
@@ -573,6 +590,12 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
   late final i0.GeneratedColumn<DateTime> deletedAt =
       i0.GeneratedColumn<DateTime>('deleted_at', aliasedName, true,
           type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
+  static const i0.VerificationMeta _livePhotoVideoIdMeta =
+      const i0.VerificationMeta('livePhotoVideoId');
+  @override
+  late final i0.GeneratedColumn<String> livePhotoVideoId =
+      i0.GeneratedColumn<String>('live_photo_video_id', aliasedName, true,
+          type: i0.DriftSqlType.string, requiredDuringInsert: false);
   @override
   late final i0.GeneratedColumnWithTypeConverter<i2.AssetVisibility, int>
       visibility = i0.GeneratedColumn<int>('visibility', aliasedName, false,
@@ -595,6 +618,7 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
         localDateTime,
         thumbHash,
         deletedAt,
+        livePhotoVideoId,
         visibility
       ];
   @override
@@ -673,6 +697,12 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
       context.handle(_deletedAtMeta,
           deletedAt.isAcceptableOrUnknown(data['deleted_at']!, _deletedAtMeta));
     }
+    if (data.containsKey('live_photo_video_id')) {
+      context.handle(
+          _livePhotoVideoIdMeta,
+          livePhotoVideoId.isAcceptableOrUnknown(
+              data['live_photo_video_id']!, _livePhotoVideoIdMeta));
+    }
     return context;
   }
 
@@ -712,6 +742,9 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
           .read(i0.DriftSqlType.string, data['${effectivePrefix}thumb_hash']),
       deletedAt: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}deleted_at']),
+      livePhotoVideoId: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.string,
+          data['${effectivePrefix}live_photo_video_id']),
       visibility: i1.$RemoteAssetEntityTable.$convertervisibility.fromSql(
           attachedDatabase.typeMapping.read(
               i0.DriftSqlType.int, data['${effectivePrefix}visibility'])!),
@@ -750,6 +783,7 @@ class RemoteAssetEntityData extends i0.DataClass
   final DateTime? localDateTime;
   final String? thumbHash;
   final DateTime? deletedAt;
+  final String? livePhotoVideoId;
   final i2.AssetVisibility visibility;
   const RemoteAssetEntityData(
       {required this.name,
@@ -766,6 +800,7 @@ class RemoteAssetEntityData extends i0.DataClass
       this.localDateTime,
       this.thumbHash,
       this.deletedAt,
+      this.livePhotoVideoId,
       required this.visibility});
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -799,6 +834,9 @@ class RemoteAssetEntityData extends i0.DataClass
     if (!nullToAbsent || deletedAt != null) {
       map['deleted_at'] = i0.Variable<DateTime>(deletedAt);
     }
+    if (!nullToAbsent || livePhotoVideoId != null) {
+      map['live_photo_video_id'] = i0.Variable<String>(livePhotoVideoId);
+    }
     {
       map['visibility'] = i0.Variable<int>(
           i1.$RemoteAssetEntityTable.$convertervisibility.toSql(visibility));
@@ -825,6 +863,7 @@ class RemoteAssetEntityData extends i0.DataClass
       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: i1.$RemoteAssetEntityTable.$convertervisibility
           .fromJson(serializer.fromJson<int>(json['visibility'])),
     );
@@ -848,6 +887,7 @@ class RemoteAssetEntityData extends i0.DataClass
       'localDateTime': serializer.toJson<DateTime?>(localDateTime),
       'thumbHash': serializer.toJson<String?>(thumbHash),
       'deletedAt': serializer.toJson<DateTime?>(deletedAt),
+      'livePhotoVideoId': serializer.toJson<String?>(livePhotoVideoId),
       'visibility': serializer.toJson<int>(
           i1.$RemoteAssetEntityTable.$convertervisibility.toJson(visibility)),
     };
@@ -868,6 +908,7 @@ class RemoteAssetEntityData extends i0.DataClass
           i0.Value<DateTime?> localDateTime = const i0.Value.absent(),
           i0.Value<String?> thumbHash = const i0.Value.absent(),
           i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+          i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
           i2.AssetVisibility? visibility}) =>
       i1.RemoteAssetEntityData(
         name: name ?? this.name,
@@ -887,6 +928,9 @@ class RemoteAssetEntityData extends i0.DataClass
             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,
       );
   RemoteAssetEntityData copyWithCompanion(i1.RemoteAssetEntityCompanion data) {
@@ -910,6 +954,9 @@ class RemoteAssetEntityData extends i0.DataClass
           : 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,
     );
@@ -932,6 +979,7 @@ class RemoteAssetEntityData extends i0.DataClass
           ..write('localDateTime: $localDateTime, ')
           ..write('thumbHash: $thumbHash, ')
           ..write('deletedAt: $deletedAt, ')
+          ..write('livePhotoVideoId: $livePhotoVideoId, ')
           ..write('visibility: $visibility')
           ..write(')'))
         .toString();
@@ -953,6 +1001,7 @@ class RemoteAssetEntityData extends i0.DataClass
       localDateTime,
       thumbHash,
       deletedAt,
+      livePhotoVideoId,
       visibility);
   @override
   bool operator ==(Object other) =>
@@ -972,6 +1021,7 @@ class RemoteAssetEntityData extends i0.DataClass
           other.localDateTime == this.localDateTime &&
           other.thumbHash == this.thumbHash &&
           other.deletedAt == this.deletedAt &&
+          other.livePhotoVideoId == this.livePhotoVideoId &&
           other.visibility == this.visibility);
 }
 
@@ -991,6 +1041,7 @@ class RemoteAssetEntityCompanion
   final i0.Value<DateTime?> localDateTime;
   final i0.Value<String?> thumbHash;
   final i0.Value<DateTime?> deletedAt;
+  final i0.Value<String?> livePhotoVideoId;
   final i0.Value<i2.AssetVisibility> visibility;
   const RemoteAssetEntityCompanion({
     this.name = const i0.Value.absent(),
@@ -1007,6 +1058,7 @@ class RemoteAssetEntityCompanion
     this.localDateTime = const i0.Value.absent(),
     this.thumbHash = const i0.Value.absent(),
     this.deletedAt = const i0.Value.absent(),
+    this.livePhotoVideoId = const i0.Value.absent(),
     this.visibility = const i0.Value.absent(),
   });
   RemoteAssetEntityCompanion.insert({
@@ -1024,6 +1076,7 @@ class RemoteAssetEntityCompanion
     this.localDateTime = const i0.Value.absent(),
     this.thumbHash = const i0.Value.absent(),
     this.deletedAt = const i0.Value.absent(),
+    this.livePhotoVideoId = const i0.Value.absent(),
     required i2.AssetVisibility visibility,
   })  : name = i0.Value(name),
         type = i0.Value(type),
@@ -1046,6 +1099,7 @@ class RemoteAssetEntityCompanion
     i0.Expression<DateTime>? localDateTime,
     i0.Expression<String>? thumbHash,
     i0.Expression<DateTime>? deletedAt,
+    i0.Expression<String>? livePhotoVideoId,
     i0.Expression<int>? visibility,
   }) {
     return i0.RawValuesInsertable({
@@ -1063,6 +1117,7 @@ class RemoteAssetEntityCompanion
       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,
     });
   }
@@ -1082,6 +1137,7 @@ class RemoteAssetEntityCompanion
       i0.Value<DateTime?>? localDateTime,
       i0.Value<String?>? thumbHash,
       i0.Value<DateTime?>? deletedAt,
+      i0.Value<String?>? livePhotoVideoId,
       i0.Value<i2.AssetVisibility>? visibility}) {
     return i1.RemoteAssetEntityCompanion(
       name: name ?? this.name,
@@ -1098,6 +1154,7 @@ class RemoteAssetEntityCompanion
       localDateTime: localDateTime ?? this.localDateTime,
       thumbHash: thumbHash ?? this.thumbHash,
       deletedAt: deletedAt ?? this.deletedAt,
+      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
       visibility: visibility ?? this.visibility,
     );
   }
@@ -1148,6 +1205,9 @@ class RemoteAssetEntityCompanion
     if (deletedAt.present) {
       map['deleted_at'] = i0.Variable<DateTime>(deletedAt.value);
     }
+    if (livePhotoVideoId.present) {
+      map['live_photo_video_id'] = i0.Variable<String>(livePhotoVideoId.value);
+    }
     if (visibility.present) {
       map['visibility'] = i0.Variable<int>(i1
           .$RemoteAssetEntityTable.$convertervisibility
@@ -1173,6 +1233,7 @@ class RemoteAssetEntityCompanion
           ..write('localDateTime: $localDateTime, ')
           ..write('thumbHash: $thumbHash, ')
           ..write('deletedAt: $deletedAt, ')
+          ..write('livePhotoVideoId: $livePhotoVideoId, ')
           ..write('visibility: $visibility')
           ..write(')'))
         .toString();
diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index 89f5c2f59a..dc3b466f01 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -5,13 +5,13 @@ 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/domain/models/memory.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
@@ -134,6 +134,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             thumbHash: Value(asset.thumbhash),
             deletedAt: Value(asset.deletedAt),
             visibility: Value(asset.visibility.toAssetVisibility()),
+            livePhotoVideoId: Value(asset.livePhotoVideoId),
           );
 
           batch.insert(
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 76ad9bad8f..4db1d03d57 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -87,6 +87,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                   height: row.height,
                   isFavorite: row.isFavorite,
                   durationInSeconds: row.durationInSeconds,
+                  livePhotoVideoId: row.livePhotoVideoId,
                 )
               : LocalAsset(
                   id: row.localId!,
diff --git a/mobile/lib/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart
new file mode 100644
index 0000000000..47f797c166
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart
@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
+
+class MotionPhotoActionButton extends ConsumerWidget {
+  const MotionPhotoActionButton({super.key, this.menuItem = true});
+
+  final bool menuItem;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isPlaying = ref.watch(isPlayingMotionVideoProvider);
+
+    return BaseActionButton(
+      iconData: isPlaying
+          ? Icons.motion_photos_pause_outlined
+          : Icons.play_circle_outline_rounded,
+      label: "play_motion_photo".t(context: context),
+      onPressed: ref.read(isPlayingMotionVideoProvider.notifier).toggle,
+      menuItem: menuItem,
+    );
+  }
+}
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 b41d6ba2c7..dfc0023685 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -15,6 +15,7 @@ import 'package:immich_mobile/presentation/widgets/asset_viewer/top_app_bar.widg
 import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
@@ -165,7 +166,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   void _onAssetChanged(int index) {
     final asset = ref.read(timelineServiceProvider).getAsset(index);
     ref.read(currentAssetNotifier.notifier).setAsset(asset);
-    if (asset.isVideo) {
+    if (asset.isVideo || asset.isMotionPhoto) {
       ref.read(videoPlaybackValueProvider.notifier).reset();
       ref.read(videoPlayerControlsProvider.notifier).pause();
     }
@@ -473,11 +474,16 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     }
   }
 
+  void _onLongPress(_, __, ___) {
+    ref.read(isPlayingMotionVideoProvider.notifier).playing = true;
+  }
+
   PhotoViewGalleryPageOptions _assetBuilder(BuildContext ctx, int index) {
     scaffoldContext ??= ctx;
     final asset = ref.read(timelineServiceProvider).getAsset(index);
+    final isPlayingMotionVideo = ref.read(isPlayingMotionVideoProvider);
 
-    if (asset.isImage) {
+    if (asset.isImage && !isPlayingMotionVideo) {
       return _imageBuilder(ctx, asset);
     }
 
@@ -500,6 +506,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       onDragUpdate: _onDragUpdate,
       onDragEnd: _onDragEnd,
       onTapDown: _onTapDown,
+      onLongPressStart: asset.isMotionPhoto ? _onLongPress : null,
       errorBuilder: (_, __, ___) => Container(
         width: ctx.width,
         height: ctx.height,
@@ -561,6 +568,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     // Using multiple selectors to avoid unnecessary rebuilds for other state changes
     ref.watch(assetViewerProvider.select((s) => s.showingBottomSheet));
     ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity));
+    ref.watch(isPlayingMotionVideoProvider);
 
     // Currently it is not possible to scroll the asset when the bottom sheet is open all the way.
     // Issue: https://github.com/flutter/flutter/issues/109037
diff --git a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
index b7e8477073..0f3d46f673 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
@@ -6,6 +6,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
@@ -44,6 +45,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
           source: ActionSource.viewer,
           menuItem: true,
         ),
+      if (asset.isMotionPhoto) const MotionPhotoActionButton(menuItem: true),
       const _KebabMenu(),
     ];
 
diff --git a/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
index 60cb61b255..17880da3e7 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
@@ -270,10 +270,7 @@ class NativeVideoViewer extends HookConsumerWidget {
         return;
       }
 
-      if (videoController.playbackInfo?.status == PlaybackStatus.stopped &&
-          !ref
-              .read(appSettingsServiceProvider)
-              .getSetting<bool>(AppSettingsEnum.loopVideo)) {
+      if (videoController.playbackInfo?.status == PlaybackStatus.stopped) {
         ref.read(isPlayingMotionVideoProvider.notifier).playing = false;
       }
     }
@@ -310,7 +307,7 @@ class NativeVideoViewer extends HookConsumerWidget {
       final loopVideo = ref
           .read(appSettingsServiceProvider)
           .getSetting<bool>(AppSettingsEnum.loopVideo);
-      nc.setLoop(loopVideo);
+      nc.setLoop(!asset.isMotionPhoto && loopVideo);
 
       controller.value = nc;
       Timer(const Duration(milliseconds: 200), checkIfBuffering);
diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
index d12f82d27d..7fff6d7d2d 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -10,6 +10,7 @@ import 'package:immich_mobile/presentation/widgets/timeline/header.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment_builder.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
+import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -171,6 +172,7 @@ class _AssetTileWidget extends ConsumerWidget {
       ref.read(multiSelectProvider.notifier).toggleAssetSelection(asset);
     } else {
       await ref.read(timelineServiceProvider).loadAssets(assetIndex, 1);
+      ref.read(isPlayingMotionVideoProvider.notifier).playing = false;
       ctx.pushRoute(
         AssetViewerRoute(
           initialIndex: assetIndex,

From 5f10a4cae7c24c468521362e1fd9189f9b4648ca Mon Sep 17 00:00:00 2001
From: Lukas <lukas@slucky.de>
Date: Mon, 14 Jul 2025 21:24:32 +0200
Subject: [PATCH 202/337] fix(web): allow renaming person without merging
 (#19923)

* fix(web): allow renaming person without merging

* improve return type
---
 .../[[photos=photos]]/[[assetId=id]]/+page.svelte | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 70fe6a41d2..a4a0050de6 100644
--- a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -221,9 +221,9 @@
     viewMode = PersonPageViewMode.VIEW_ASSETS;
   };
 
-  const handleMergeSuggestion = async () => {
+  const handleMergeSuggestion = async (): Promise<{ merged: boolean }> => {
     if (!personMerge1 || !personMerge2) {
-      return;
+      return { merged: false };
     }
 
     const result = await modalManager.show(PersonMergeSuggestionModal, {
@@ -233,7 +233,7 @@
     });
 
     if (!result) {
-      return;
+      return { merged: false };
     }
 
     const [personToMerge, personToBeMergedInto] = result;
@@ -241,9 +241,10 @@
     people = people.filter((person: PersonResponseDto) => person.id !== personToMerge.id);
     if (personToBeMergedInto.name != personName && person.id === personToBeMergedInto.id) {
       await updateAssetCount();
-      return;
+      return { merged: true };
     }
     await goto(`${AppRoute.PEOPLE}/${personToBeMergedInto.id}`, { replaceState: true });
+    return { merged: true };
   };
 
   const handleSuggestPeople = async (person2: PersonResponseDto) => {
@@ -317,8 +318,10 @@
             !person.isHidden,
         )
         .slice(0, 3);
-      await handleMergeSuggestion();
-      return;
+      const { merged } = await handleMergeSuggestion();
+      if (merged) {
+        return;
+      }
     }
     await changeName();
   };

From ccd0c35ca1ea107684b67a2a10aec78080b304e4 Mon Sep 17 00:00:00 2001
From: Lukas <lukas@slucky.de>
Date: Tue, 15 Jul 2025 00:05:34 +0200
Subject: [PATCH 203/337] fix(web): adjust button size in person side panel
 (#19924)

* fix(web): adjust button size in person side panel

* round edit button
---
 .../faces-page/person-side-panel.svelte         | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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 b2e1382a57..154927194e 100644
--- a/web/src/lib/components/faces-page/person-side-panel.svelte
+++ b/web/src/lib/components/faces-page/person-side-panel.svelte
@@ -20,6 +20,7 @@
     type AssetFaceResponseDto,
     type PersonResponseDto,
   } from '@immich/sdk';
+  import { IconButton } from '@immich/ui';
   import { mdiAccountOff, mdiArrowLeftThin, mdiPencil, mdiRestart, mdiTrashCan } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
@@ -28,7 +29,6 @@
   import ImageThumbnail from '../assets/thumbnail/image-thumbnail.svelte';
   import { NotificationType, notificationController } from '../shared-components/notification/notification';
   import AssignFaceSidePanel from './assign-face-side-panel.svelte';
-  import { IconButton } from '@immich/ui';
 
   interface Props {
     assetId: string;
@@ -309,7 +309,7 @@
                 </p>
               {/if}
 
-              <div class="absolute -end-[5px] -top-[5px] h-[20px] w-[20px] rounded-full">
+              <div class="absolute -end-[3px] -top-[3px] h-[20px] w-[20px] rounded-full">
                 {#if selectedPersonToCreate[face.id] || selectedPersonToReassign[face.id]}
                   <IconButton
                     shape="round"
@@ -317,38 +317,39 @@
                     color="primary"
                     icon={mdiRestart}
                     aria-label={$t('reset')}
-                    size="medium"
+                    size="small"
                     class="absolute start-1/2 top-1/2 translate-x-[-50%] translate-y-[-50%] transform"
                     onclick={() => handleReset(face.id)}
                   />
                 {:else}
                   <IconButton
+                    shape="round"
                     color="primary"
                     icon={mdiPencil}
                     aria-label={$t('select_new_face')}
-                    size="medium"
+                    size="small"
                     class="absolute start-1/2 top-1/2 translate-x-[-50%] translate-y-[-50%] transform"
                     onclick={() => handleFacePicker(face)}
                   />
                 {/if}
               </div>
-              <div class="absolute end-[25px] -top-[5px] h-[20px] w-[20px] rounded-full">
+              <div class="absolute end-[33px] -top-[3px] h-[20px] w-[20px] 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"
                   >
-                    <Icon color="primary" path={mdiAccountOff} ariaHidden size="18" />
+                    <Icon color="primary" path={mdiAccountOff} ariaHidden size="24" />
                   </div>
                 {/if}
               </div>
               {#if face.person != null}
-                <div class="absolute -end-[5px] top-[25px] h-[20px] w-[20px] rounded-full">
+                <div class="absolute -end-[3px] top-[33px] h-[20px] w-[20px] rounded-full">
                   <IconButton
                     shape="round"
                     color="danger"
                     icon={mdiTrashCan}
                     aria-label={$t('delete_face')}
-                    size="medium"
+                    size="small"
                     class="absolute start-1/2 top-1/2 translate-x-[-50%] translate-y-[-50%] transform"
                     onclick={() => deleteAssetFace(face)}
                   />

From 3a854d77ac5f101967993492da9465fa07bb7ad1 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Tue, 15 Jul 2025 00:08:29 +0200
Subject: [PATCH 204/337] fix: use IMMICH_HOST env var in ML healthcheck
 (#19844)

Fixes #19843
---
 machine-learning/scripts/healthcheck.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/machine-learning/scripts/healthcheck.py b/machine-learning/scripts/healthcheck.py
index 8a4ec897f0..82c6cad790 100644
--- a/machine-learning/scripts/healthcheck.py
+++ b/machine-learning/scripts/healthcheck.py
@@ -4,9 +4,12 @@ import sys
 import requests
 
 port = os.getenv("IMMICH_PORT", 3003)
+host = os.getenv("IMMICH_HOST", "0.0.0.0")
+
+host = "localhost" if host == "0.0.0.0" else host
 
 try:
-    response = requests.get(f"http://localhost:{port}/ping", timeout=2)
+    response = requests.get(f"http://{host}:{port}/ping", timeout=2)
     if response.status_code == 200:
         sys.exit(0)
     sys.exit(1)

From 82c3165247aed8dcc224b39329c92c4aa8e8aa54 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 22:30:39 +0000
Subject: [PATCH 205/337] fix(deps): update typescript-projects (#19808)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
---
 cli/package-lock.json    |  118 +-
 e2e/package-lock.json    |  140 +-
 server/package-lock.json | 2785 ++++++++++++++++++++++++++------------
 server/package.json      |   16 +-
 web/package-lock.json    |  763 ++++++++---
 web/package.json         |    2 +-
 6 files changed, 2626 insertions(+), 1198 deletions(-)

diff --git a/cli/package-lock.json b/cli/package-lock.json
index d5884841cd..7c87c3be2e 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -1365,17 +1365,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
-      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.36.0.tgz",
+      "integrity": "sha512-lZNihHUVB6ZZiPBNgOQGSxUASI7UJWhT8nHyUGCnaQ28XFCw98IfrMCG3rUl1uwUWoAvodJQby2KTs79UTcrAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/type-utils": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/type-utils": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -1389,7 +1389,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.35.1",
+        "@typescript-eslint/parser": "^8.36.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
@@ -1405,16 +1405,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
-      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.36.0.tgz",
+      "integrity": "sha512-FuYgkHwZLuPbZjQHzJXrtXreJdFMKl16BFYyRrLxDhWr6Qr7Kbcu2s1Yhu8tsiMXw1S0W1pjfFfYEt+R604s+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/typescript-estree": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1430,14 +1430,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
-      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
+      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.1",
-        "@typescript-eslint/types": "^8.35.1",
+        "@typescript-eslint/tsconfig-utils": "^8.36.0",
+        "@typescript-eslint/types": "^8.36.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1452,14 +1452,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
-      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
+      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1"
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1470,9 +1470,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
-      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
+      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1487,14 +1487,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
-      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.36.0.tgz",
+      "integrity": "sha512-5aaGYG8cVDd6cxfk/ynpYzxBRZJk7w/ymto6uiyUFtdCozQIsQWh7M28/6r57Fwkbweng8qAzoMCPwSJfWlmsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -1511,9 +1511,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
-      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
+      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1525,16 +1525,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
-      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
+      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.35.1",
-        "@typescript-eslint/tsconfig-utils": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/project-service": "8.36.0",
+        "@typescript-eslint/tsconfig-utils": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -1580,16 +1580,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
-      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz",
+      "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1"
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/typescript-estree": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1604,13 +1604,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
-      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
+      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/types": "8.36.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -4125,15 +4125,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.1.tgz",
-      "integrity": "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.36.0.tgz",
+      "integrity": "sha512-fTCqxthY+h9QbEgSIBfL9iV6CvKDFuoxg6bHPNpJ9HIUzS+jy2lCEyCmGyZRWEBSaykqcDPf1SJ+BfCI8DRopA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.35.1",
-        "@typescript-eslint/parser": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1"
+        "@typescript-eslint/eslint-plugin": "8.36.0",
+        "@typescript-eslint/parser": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index 781d9c28a0..1e2f8b47e1 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -83,7 +83,7 @@
         "prettier-plugin-organize-imports": "^4.0.0",
         "typescript": "^5.3.3",
         "typescript-eslint": "^8.28.0",
-        "vite": "^6.0.0",
+        "vite": "^7.0.0",
         "vite-tsconfig-paths": "^5.0.0",
         "vitest": "^3.0.0",
         "vitest-fetch-mock": "^0.4.0",
@@ -2101,17 +2101,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
-      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.36.0.tgz",
+      "integrity": "sha512-lZNihHUVB6ZZiPBNgOQGSxUASI7UJWhT8nHyUGCnaQ28XFCw98IfrMCG3rUl1uwUWoAvodJQby2KTs79UTcrAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/type-utils": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/type-utils": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -2125,7 +2125,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.35.1",
+        "@typescript-eslint/parser": "^8.36.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
@@ -2141,16 +2141,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
-      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.36.0.tgz",
+      "integrity": "sha512-FuYgkHwZLuPbZjQHzJXrtXreJdFMKl16BFYyRrLxDhWr6Qr7Kbcu2s1Yhu8tsiMXw1S0W1pjfFfYEt+R604s+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/typescript-estree": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2166,14 +2166,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
-      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
+      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.1",
-        "@typescript-eslint/types": "^8.35.1",
+        "@typescript-eslint/tsconfig-utils": "^8.36.0",
+        "@typescript-eslint/types": "^8.36.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2188,14 +2188,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
-      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
+      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1"
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2206,9 +2206,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
-      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
+      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2223,14 +2223,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
-      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.36.0.tgz",
+      "integrity": "sha512-5aaGYG8cVDd6cxfk/ynpYzxBRZJk7w/ymto6uiyUFtdCozQIsQWh7M28/6r57Fwkbweng8qAzoMCPwSJfWlmsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -2247,9 +2247,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
-      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
+      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2261,16 +2261,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
-      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
+      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.35.1",
-        "@typescript-eslint/tsconfig-utils": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/project-service": "8.36.0",
+        "@typescript-eslint/tsconfig-utils": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -2316,16 +2316,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
-      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz",
+      "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1"
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/typescript-estree": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2340,13 +2340,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
-      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
+      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/types": "8.36.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -4812,9 +4812,9 @@
       "license": "ISC"
     },
     "node_modules/luxon": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
-      "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz",
+      "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6430,9 +6430,9 @@
       }
     },
     "node_modules/superagent": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.2.1.tgz",
-      "integrity": "sha512-O+PCv11lgTNJUzy49teNAWLjBZfc+A1enOwTpLlH6/rsvKcTwcdTT8m9azGkVqM7HBl5jpyZ7KTPhHweokBcdg==",
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.2.2.tgz",
+      "integrity": "sha512-vWMq11OwWCC84pQaFPzF/VO3BrjkCeewuvJgt1jfV0499Z1QSAWN4EqfMM5WlFDDX9/oP8JjlDKpblrmEoyu4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6451,14 +6451,14 @@
       }
     },
     "node_modules/supertest": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.1.tgz",
-      "integrity": "sha512-aI59HBTlG9e2wTjxGJV+DygfNLgnWbGdZxiA/sgrnNNikIW8lbDvCtF6RnhZoJ82nU7qv7ZLjrvWqCEm52fAmw==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.3.tgz",
+      "integrity": "sha512-ORY0gPa6ojmg/C74P/bDoS21WL6FMXq5I8mawkEz30/zkwdu0gOeqstFy316vHG6OKxqQ+IbGneRemHI8WraEw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "methods": "^1.1.2",
-        "superagent": "^10.2.1"
+        "superagent": "^10.2.2"
       },
       "engines": {
         "node": ">=14.18.0"
@@ -6778,15 +6778,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.1.tgz",
-      "integrity": "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.36.0.tgz",
+      "integrity": "sha512-fTCqxthY+h9QbEgSIBfL9iV6CvKDFuoxg6bHPNpJ9HIUzS+jy2lCEyCmGyZRWEBSaykqcDPf1SJ+BfCI8DRopA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.35.1",
-        "@typescript-eslint/parser": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1"
+        "@typescript-eslint/eslint-plugin": "8.36.0",
+        "@typescript-eslint/parser": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/server/package-lock.json b/server/package-lock.json
index ea45d89257..46dfa8fd37 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -19,18 +19,18 @@
         "@nestjs/swagger": "^11.0.2",
         "@nestjs/websockets": "^11.0.4",
         "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/auto-instrumentations-node": "^0.60.0",
+        "@opentelemetry/auto-instrumentations-node": "^0.62.0",
         "@opentelemetry/context-async-hooks": "^2.0.0",
-        "@opentelemetry/exporter-prometheus": "^0.202.0",
-        "@opentelemetry/instrumentation-http": "^0.202.0",
-        "@opentelemetry/instrumentation-ioredis": "^0.50.0",
-        "@opentelemetry/instrumentation-nestjs-core": "^0.48.0",
-        "@opentelemetry/instrumentation-pg": "^0.54.0",
+        "@opentelemetry/exporter-prometheus": "^0.203.0",
+        "@opentelemetry/instrumentation-http": "^0.203.0",
+        "@opentelemetry/instrumentation-ioredis": "^0.51.0",
+        "@opentelemetry/instrumentation-nestjs-core": "^0.49.0",
+        "@opentelemetry/instrumentation-pg": "^0.55.0",
         "@opentelemetry/resources": "^2.0.1",
         "@opentelemetry/sdk-metrics": "^2.0.1",
-        "@opentelemetry/sdk-node": "^0.202.0",
+        "@opentelemetry/sdk-node": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.34.0",
-        "@react-email/components": "^0.1.0",
+        "@react-email/components": "^0.2.0",
         "@react-email/render": "^1.1.2",
         "@socket.io/redis-adapter": "^8.3.0",
         "archiver": "^7.0.0",
@@ -3106,140 +3106,6 @@
         }
       }
     },
-    "node_modules/@next/env": {
-      "version": "15.3.4",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.3.4.tgz",
-      "integrity": "sha512-ZkdYzBseS6UjYzz6ylVKPOK+//zLWvD6Ta+vpoye8cW11AjiQjGYVibF0xuvT4L0iJfAPfZLFidaEzAOywyOAQ==",
-      "license": "MIT"
-    },
-    "node_modules/@next/swc-darwin-arm64": {
-      "version": "15.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.3.4.tgz",
-      "integrity": "sha512-z0qIYTONmPRbwHWvpyrFXJd5F9YWLCsw3Sjrzj2ZvMYy9NPQMPZ1NjOJh4ojr4oQzcGYwgJKfidzehaNa1BpEg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-darwin-x64": {
-      "version": "15.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.3.4.tgz",
-      "integrity": "sha512-Z0FYJM8lritw5Wq+vpHYuCIzIlEMjewG2aRkc3Hi2rcbULknYL/xqfpBL23jQnCSrDUGAo/AEv0Z+s2bff9Zkw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "15.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.3.4.tgz",
-      "integrity": "sha512-l8ZQOCCg7adwmsnFm8m5q9eIPAHdaB2F3cxhufYtVo84pymwKuWfpYTKcUiFcutJdp9xGHC+F1Uq3xnFU1B/7g==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "15.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.3.4.tgz",
-      "integrity": "sha512-wFyZ7X470YJQtpKot4xCY3gpdn8lE9nTlldG07/kJYexCUpX1piX+MBfZdvulo+t1yADFVEuzFfVHfklfEx8kw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "15.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.3.4.tgz",
-      "integrity": "sha512-gEbH9rv9o7I12qPyvZNVTyP/PWKqOp8clvnoYZQiX800KkqsaJZuOXkWgMa7ANCCh/oEN2ZQheh3yH8/kWPSEg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "15.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.3.4.tgz",
-      "integrity": "sha512-Cf8sr0ufuC/nu/yQ76AnarbSAXcwG/wj+1xFPNbyNo8ltA6kw5d5YqO8kQuwVIxk13SBdtgXrNyom3ZosHAy4A==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "15.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.3.4.tgz",
-      "integrity": "sha512-ay5+qADDN3rwRbRpEhTOreOn1OyJIXS60tg9WMYTWCy3fB6rGoyjLVxc4dR9PYjEdR2iDYsaF5h03NA+XuYPQQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "15.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.3.4.tgz",
-      "integrity": "sha512-4kDt31Bc9DGyYs41FTL1/kNpDeHyha2TC0j5sRRoKCyrhNcfZ/nRQkAUlF27mETwm8QyHqIjHJitfcza2Iykfg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@noble/hashes": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
@@ -3343,10 +3209,73 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/@opentelemetry/api-logs": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.202.0.tgz",
-      "integrity": "sha512-fTBjMqKCfotFWfLzaKyhjLvyEyq5vDKTTFfBmx21btv3gvy8Lq6N5Dh2OzqeuN4DjtpSvNT1uNVfg08eD2Rfxw==",
+    "node_modules/@opentelemetry/auto-instrumentations-node": {
+      "version": "0.62.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/auto-instrumentations-node/-/auto-instrumentations-node-0.62.0.tgz",
+      "integrity": "sha512-h5g+VNJjiyX6u/IQpn36ZCHOENg1QW0GgBOHBcFGnHBBhmTww4R3brExdeuYbvLj3UQY09n+UHFEoMOqkhq07A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
+        "@opentelemetry/instrumentation-amqplib": "^0.50.0",
+        "@opentelemetry/instrumentation-aws-lambda": "^0.54.0",
+        "@opentelemetry/instrumentation-aws-sdk": "^0.56.0",
+        "@opentelemetry/instrumentation-bunyan": "^0.49.0",
+        "@opentelemetry/instrumentation-cassandra-driver": "^0.49.0",
+        "@opentelemetry/instrumentation-connect": "^0.47.0",
+        "@opentelemetry/instrumentation-cucumber": "^0.18.0",
+        "@opentelemetry/instrumentation-dataloader": "^0.21.0",
+        "@opentelemetry/instrumentation-dns": "^0.47.0",
+        "@opentelemetry/instrumentation-express": "^0.52.0",
+        "@opentelemetry/instrumentation-fastify": "^0.48.0",
+        "@opentelemetry/instrumentation-fs": "^0.23.0",
+        "@opentelemetry/instrumentation-generic-pool": "^0.47.0",
+        "@opentelemetry/instrumentation-graphql": "^0.51.0",
+        "@opentelemetry/instrumentation-grpc": "^0.203.0",
+        "@opentelemetry/instrumentation-hapi": "^0.50.0",
+        "@opentelemetry/instrumentation-http": "^0.203.0",
+        "@opentelemetry/instrumentation-ioredis": "^0.51.0",
+        "@opentelemetry/instrumentation-kafkajs": "^0.12.0",
+        "@opentelemetry/instrumentation-knex": "^0.48.0",
+        "@opentelemetry/instrumentation-koa": "^0.51.0",
+        "@opentelemetry/instrumentation-lru-memoizer": "^0.48.0",
+        "@opentelemetry/instrumentation-memcached": "^0.47.0",
+        "@opentelemetry/instrumentation-mongodb": "^0.56.0",
+        "@opentelemetry/instrumentation-mongoose": "^0.50.0",
+        "@opentelemetry/instrumentation-mysql": "^0.49.0",
+        "@opentelemetry/instrumentation-mysql2": "^0.49.0",
+        "@opentelemetry/instrumentation-nestjs-core": "^0.49.0",
+        "@opentelemetry/instrumentation-net": "^0.47.0",
+        "@opentelemetry/instrumentation-oracledb": "^0.29.0",
+        "@opentelemetry/instrumentation-pg": "^0.55.0",
+        "@opentelemetry/instrumentation-pino": "^0.50.0",
+        "@opentelemetry/instrumentation-redis": "^0.51.0",
+        "@opentelemetry/instrumentation-restify": "^0.49.0",
+        "@opentelemetry/instrumentation-router": "^0.48.0",
+        "@opentelemetry/instrumentation-runtime-node": "^0.17.0",
+        "@opentelemetry/instrumentation-socket.io": "^0.50.0",
+        "@opentelemetry/instrumentation-tedious": "^0.22.0",
+        "@opentelemetry/instrumentation-undici": "^0.14.0",
+        "@opentelemetry/instrumentation-winston": "^0.48.0",
+        "@opentelemetry/resource-detector-alibaba-cloud": "^0.31.3",
+        "@opentelemetry/resource-detector-aws": "^2.3.0",
+        "@opentelemetry/resource-detector-azure": "^0.10.0",
+        "@opentelemetry/resource-detector-container": "^0.7.3",
+        "@opentelemetry/resource-detector-gcp": "^0.37.0",
+        "@opentelemetry/resources": "^2.0.0",
+        "@opentelemetry/sdk-node": "^0.203.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.4.1",
+        "@opentelemetry/core": "^2.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/api": "^1.3.0"
@@ -3355,68 +3284,21 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/@opentelemetry/auto-instrumentations-node": {
-      "version": "0.60.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/auto-instrumentations-node/-/auto-instrumentations-node-0.60.1.tgz",
-      "integrity": "sha512-oMBVXiun0qWhj693Y24Ie+75q45YXHRFeH9vX/XBWKRNJIM/02ufjmNvmOdoHY0EPxU9rBmWCW82Uidf54iSPA==",
+    "node_modules/@opentelemetry/auto-instrumentations-node/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
-        "@opentelemetry/instrumentation-amqplib": "^0.49.0",
-        "@opentelemetry/instrumentation-aws-lambda": "^0.53.0",
-        "@opentelemetry/instrumentation-aws-sdk": "^0.54.0",
-        "@opentelemetry/instrumentation-bunyan": "^0.48.0",
-        "@opentelemetry/instrumentation-cassandra-driver": "^0.48.0",
-        "@opentelemetry/instrumentation-connect": "^0.46.0",
-        "@opentelemetry/instrumentation-cucumber": "^0.17.0",
-        "@opentelemetry/instrumentation-dataloader": "^0.19.0",
-        "@opentelemetry/instrumentation-dns": "^0.46.0",
-        "@opentelemetry/instrumentation-express": "^0.51.0",
-        "@opentelemetry/instrumentation-fastify": "^0.47.0",
-        "@opentelemetry/instrumentation-fs": "^0.22.0",
-        "@opentelemetry/instrumentation-generic-pool": "^0.46.0",
-        "@opentelemetry/instrumentation-graphql": "^0.50.0",
-        "@opentelemetry/instrumentation-grpc": "^0.202.0",
-        "@opentelemetry/instrumentation-hapi": "^0.49.0",
-        "@opentelemetry/instrumentation-http": "^0.202.0",
-        "@opentelemetry/instrumentation-ioredis": "^0.50.0",
-        "@opentelemetry/instrumentation-kafkajs": "^0.11.0",
-        "@opentelemetry/instrumentation-knex": "^0.47.0",
-        "@opentelemetry/instrumentation-koa": "^0.50.1",
-        "@opentelemetry/instrumentation-lru-memoizer": "^0.47.0",
-        "@opentelemetry/instrumentation-memcached": "^0.46.0",
-        "@opentelemetry/instrumentation-mongodb": "^0.55.1",
-        "@opentelemetry/instrumentation-mongoose": "^0.49.0",
-        "@opentelemetry/instrumentation-mysql": "^0.48.0",
-        "@opentelemetry/instrumentation-mysql2": "^0.48.0",
-        "@opentelemetry/instrumentation-nestjs-core": "^0.48.0",
-        "@opentelemetry/instrumentation-net": "^0.46.1",
-        "@opentelemetry/instrumentation-oracledb": "^0.28.0",
-        "@opentelemetry/instrumentation-pg": "^0.54.0",
-        "@opentelemetry/instrumentation-pino": "^0.49.0",
-        "@opentelemetry/instrumentation-redis": "^0.49.1",
-        "@opentelemetry/instrumentation-redis-4": "^0.49.0",
-        "@opentelemetry/instrumentation-restify": "^0.48.1",
-        "@opentelemetry/instrumentation-router": "^0.47.0",
-        "@opentelemetry/instrumentation-runtime-node": "^0.16.0",
-        "@opentelemetry/instrumentation-socket.io": "^0.49.0",
-        "@opentelemetry/instrumentation-tedious": "^0.21.0",
-        "@opentelemetry/instrumentation-undici": "^0.13.1",
-        "@opentelemetry/instrumentation-winston": "^0.47.0",
-        "@opentelemetry/resource-detector-alibaba-cloud": "^0.31.2",
-        "@opentelemetry/resource-detector-aws": "^2.2.0",
-        "@opentelemetry/resource-detector-azure": "^0.9.0",
-        "@opentelemetry/resource-detector-container": "^0.7.2",
-        "@opentelemetry/resource-detector-gcp": "^0.36.0",
-        "@opentelemetry/resources": "^2.0.0",
-        "@opentelemetry/sdk-node": "^0.202.0"
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
       },
       "peerDependencies": {
-        "@opentelemetry/api": "^1.4.1",
-        "@opentelemetry/core": "^2.0.0"
+        "@opentelemetry/api": "^1.3.0"
       }
     },
     "node_modules/@opentelemetry/context-async-hooks": {
@@ -3447,17 +3329,17 @@
       }
     },
     "node_modules/@opentelemetry/exporter-logs-otlp-grpc": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-grpc/-/exporter-logs-otlp-grpc-0.202.0.tgz",
-      "integrity": "sha512-Y84L8Yja/A2qjGEzC/To0yrMUXHrtwJzHtZ2za1/ulZplRe5QFsLNyHixIS42ZYUKuNyWMDgOFhnN2Pz5uThtg==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-grpc/-/exporter-logs-otlp-grpc-0.203.0.tgz",
+      "integrity": "sha512-g/2Y2noc/l96zmM+g0LdeuyYKINyBwN6FJySoU15LHPLcMN/1a0wNk2SegwKcxrRdE7Xsm7fkIR5n6XFe3QpPw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@grpc/grpc-js": "^1.7.1",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-grpc-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-transformer": "0.202.0",
-        "@opentelemetry/sdk-logs": "0.202.0"
+        "@opentelemetry/otlp-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-grpc-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-transformer": "0.203.0",
+        "@opentelemetry/sdk-logs": "0.203.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3467,16 +3349,16 @@
       }
     },
     "node_modules/@opentelemetry/exporter-logs-otlp-http": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-http/-/exporter-logs-otlp-http-0.202.0.tgz",
-      "integrity": "sha512-mJWLkmoG+3r+SsYQC+sbWoy1rjowJhMhFvFULeIPTxSI+EZzKPya0+NZ3+vhhgx2UTybGQlye3FBtCH3o6Rejg==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-http/-/exporter-logs-otlp-http-0.203.0.tgz",
+      "integrity": "sha512-s0hys1ljqlMTbXx2XiplmMJg9wG570Z5lH7wMvrZX6lcODI56sG4HL03jklF63tBeyNwK2RV1/ntXGo3HgG4Qw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.202.0",
+        "@opentelemetry/api-logs": "0.203.0",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-transformer": "0.202.0",
-        "@opentelemetry/sdk-logs": "0.202.0"
+        "@opentelemetry/otlp-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-transformer": "0.203.0",
+        "@opentelemetry/sdk-logs": "0.203.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3485,18 +3367,30 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/exporter-logs-otlp-proto": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-proto/-/exporter-logs-otlp-proto-0.202.0.tgz",
-      "integrity": "sha512-qYwbmNWPkP7AbzX8o4DRu5bb/a0TWYNcpZc1NEAOhuV7pgBpAUPEClxRWPN94ulIia+PfQjzFGMaRwmLGmNP6g==",
+    "node_modules/@opentelemetry/exporter-logs-otlp-http/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/exporter-logs-otlp-proto": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-proto/-/exporter-logs-otlp-proto-0.203.0.tgz",
+      "integrity": "sha512-nl/7S91MXn5R1aIzoWtMKGvqxgJgepB/sH9qW0rZvZtabnsjbf8OQ1uSx3yogtvLr0GzwD596nQKz2fV7q2RBw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-transformer": "0.202.0",
+        "@opentelemetry/otlp-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-transformer": "0.203.0",
         "@opentelemetry/resources": "2.0.1",
-        "@opentelemetry/sdk-logs": "0.202.0",
+        "@opentelemetry/sdk-logs": "0.203.0",
         "@opentelemetry/sdk-trace-base": "2.0.1"
       },
       "engines": {
@@ -3506,18 +3400,30 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/exporter-logs-otlp-proto/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/@opentelemetry/exporter-metrics-otlp-grpc": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-grpc/-/exporter-metrics-otlp-grpc-0.202.0.tgz",
-      "integrity": "sha512-/dq/rf4KCkTYoP+NyPXTE+5wjvfhAHSqK62vRsJ/IalG61VPQvwaL18yWcavbI+44ImQwtMeZxfIJSox7oQL0w==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-grpc/-/exporter-metrics-otlp-grpc-0.203.0.tgz",
+      "integrity": "sha512-FCCj9nVZpumPQSEI57jRAA89hQQgONuoC35Lt+rayWY/mzCAc6BQT7RFyFaZKJ2B7IQ8kYjOCPsF/HGFWjdQkQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@grpc/grpc-js": "^1.7.1",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/exporter-metrics-otlp-http": "0.202.0",
-        "@opentelemetry/otlp-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-grpc-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-transformer": "0.202.0",
+        "@opentelemetry/exporter-metrics-otlp-http": "0.203.0",
+        "@opentelemetry/otlp-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-grpc-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-transformer": "0.203.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-metrics": "2.0.1"
       },
@@ -3529,14 +3435,14 @@
       }
     },
     "node_modules/@opentelemetry/exporter-metrics-otlp-http": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-http/-/exporter-metrics-otlp-http-0.202.0.tgz",
-      "integrity": "sha512-ooYcrf/m9ZuVGpQnER7WRH+JZbDPD389HG7VS/EnvIEF5WpNYEqf+NdmtaAcs51d81QrytTYAubc5bVWi//28w==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-http/-/exporter-metrics-otlp-http-0.203.0.tgz",
+      "integrity": "sha512-HFSW10y8lY6BTZecGNpV3GpoSy7eaO0Z6GATwZasnT4bEsILp8UJXNG5OmEsz4SdwCSYvyCbTJdNbZP3/8LGCQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-transformer": "0.202.0",
+        "@opentelemetry/otlp-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-transformer": "0.203.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-metrics": "2.0.1"
       },
@@ -3548,15 +3454,15 @@
       }
     },
     "node_modules/@opentelemetry/exporter-metrics-otlp-proto": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-proto/-/exporter-metrics-otlp-proto-0.202.0.tgz",
-      "integrity": "sha512-X0RpPpPjyCAmIq9tySZm0Hk3Ltw8KWsqeNq5I7gS9AR9RzbVHb/l+eiMI1CqSRvW9R47HXcUu/epmEzY8ebFAg==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-proto/-/exporter-metrics-otlp-proto-0.203.0.tgz",
+      "integrity": "sha512-OZnhyd9npU7QbyuHXFEPVm3LnjZYifuKpT3kTnF84mXeEQ84pJJZgyLBpU4FSkSwUkt/zbMyNAI7y5+jYTWGIg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/exporter-metrics-otlp-http": "0.202.0",
-        "@opentelemetry/otlp-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-transformer": "0.202.0",
+        "@opentelemetry/exporter-metrics-otlp-http": "0.203.0",
+        "@opentelemetry/otlp-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-transformer": "0.203.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-metrics": "2.0.1"
       },
@@ -3568,9 +3474,9 @@
       }
     },
     "node_modules/@opentelemetry/exporter-prometheus": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-prometheus/-/exporter-prometheus-0.202.0.tgz",
-      "integrity": "sha512-6RvQqZHAPFiwL1OKRJe4ta6SgJx/g8or41B+OovVVEie3HeCDhDGL9S1VJNkBozUz6wTY8a47fQwdMrCOUdMhQ==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-prometheus/-/exporter-prometheus-0.203.0.tgz",
+      "integrity": "sha512-2jLuNuw5m4sUj/SncDf/mFPabUxMZmmYetx5RKIMIQyPnl6G6ooFzfeE8aXNRf8YD1ZXNlCnRPcISxjveGJHNg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
@@ -3585,16 +3491,16 @@
       }
     },
     "node_modules/@opentelemetry/exporter-trace-otlp-grpc": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-grpc/-/exporter-trace-otlp-grpc-0.202.0.tgz",
-      "integrity": "sha512-d5wLdbNA3ahpSeD0I34vbDFMTh4vPsXemH0bKDXLeCVULCAjOJXuZmEiuRammiDgVvvX7CAb/IGLDz8d2QHvoA==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-grpc/-/exporter-trace-otlp-grpc-0.203.0.tgz",
+      "integrity": "sha512-322coOTf81bm6cAA8+ML6A+m4r2xTCdmAZzGNTboPXRzhwPt4JEmovsFAs+grpdarObd68msOJ9FfH3jxM6wqA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@grpc/grpc-js": "^1.7.1",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-grpc-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-transformer": "0.202.0",
+        "@opentelemetry/otlp-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-grpc-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-transformer": "0.203.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-trace-base": "2.0.1"
       },
@@ -3606,14 +3512,14 @@
       }
     },
     "node_modules/@opentelemetry/exporter-trace-otlp-http": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.202.0.tgz",
-      "integrity": "sha512-/hKE8DaFCJuaQqE1IxpgkcjOolUIwgi3TgHElPVKGdGRBSmJMTmN/cr6vWa55pCJIXPyhKvcMrbrya7DZ3VmzA==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.203.0.tgz",
+      "integrity": "sha512-ZDiaswNYo0yq/cy1bBLJFe691izEJ6IgNmkjm4C6kE9ub/OMQqDXORx2D2j8fzTBTxONyzusbaZlqtfmyqURPw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-transformer": "0.202.0",
+        "@opentelemetry/otlp-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-transformer": "0.203.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-trace-base": "2.0.1"
       },
@@ -3625,14 +3531,14 @@
       }
     },
     "node_modules/@opentelemetry/exporter-trace-otlp-proto": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-proto/-/exporter-trace-otlp-proto-0.202.0.tgz",
-      "integrity": "sha512-z3vzdMclCETGIn8uUBgpz7w651ftCiH2qh3cewhBk+rF0EYPNQ3mJvyxktLnKIBZ/ci0zUknAzzYC7LIIZmggQ==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-proto/-/exporter-trace-otlp-proto-0.203.0.tgz",
+      "integrity": "sha512-1xwNTJ86L0aJmWRwENCJlH4LULMG2sOXWIVw+Szta4fkqKVY50Eo4HoVKKq6U9QEytrWCr8+zjw0q/ZOeXpcAQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-transformer": "0.202.0",
+        "@opentelemetry/otlp-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-transformer": "0.203.0",
         "@opentelemetry/resources": "2.0.1",
         "@opentelemetry/sdk-trace-base": "2.0.1"
       },
@@ -3676,13 +3582,42 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.202.0.tgz",
-      "integrity": "sha512-Uz3BxZWPgDwgHM2+vCKEQRh0R8WKrd/q6Tus1vThRClhlPO39Dyz7mDrOr6KuqGXAlBQ1e5Tnymzri4RMZNaWA==",
+    "node_modules/@opentelemetry/instrumentation-amqplib": {
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.50.0.tgz",
+      "integrity": "sha512-kwNs/itehHG/qaQBcVrLNcvXVPW0I4FCOVtw3LHMLdYIqD7GJ6Yv2nX+a4YHjzbzIeRYj8iyMp0Bl7tlkidq5w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.202.0",
+        "@opentelemetry/core": "^2.0.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
+        "@opentelemetry/semantic-conventions": "^1.27.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-amqplib/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-amqplib/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
         "import-in-the-middle": "^1.8.1",
         "require-in-the-middle": "^7.1.1"
       },
@@ -3693,15 +3628,15 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-amqplib": {
-      "version": "0.49.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.49.0.tgz",
-      "integrity": "sha512-OCGkE+1JoUN+gOzs3u0GSa7GV//KX6NMKzaPchedae7ZwFVyyBQ8VECJngHgW3k/FLABFnq9Oiym2WZGiWugVQ==",
+    "node_modules/@opentelemetry/instrumentation-aws-lambda": {
+      "version": "0.54.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-aws-lambda/-/instrumentation-aws-lambda-0.54.0.tgz",
+      "integrity": "sha512-uiYI+kcMUJ/H9cxAwB8c9CaG8behLRgcYSOEA8M/tMQ54Y1ZmzAuEE3QKOi21/s30x5Q+by9g7BwiVfDtqzeMA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0",
-        "@opentelemetry/semantic-conventions": "^1.27.0"
+        "@opentelemetry/instrumentation": "^0.203.0",
+        "@opentelemetry/semantic-conventions": "^1.27.0",
+        "@types/aws-lambda": "8.10.150"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3710,15 +3645,27 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-aws-lambda": {
-      "version": "0.53.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-aws-lambda/-/instrumentation-aws-lambda-0.53.0.tgz",
-      "integrity": "sha512-dZywDIc4t7o28eU9W4QMB+mNhRdH5/kVxVmxRtB46/diHg8Im6RFncuiCVJ1l9ig/RUtwR3dU9LX1huFBwxkPw==",
+    "node_modules/@opentelemetry/instrumentation-aws-lambda/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
-        "@opentelemetry/semantic-conventions": "^1.27.0",
-        "@types/aws-lambda": "8.10.147"
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-aws-lambda/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3728,15 +3675,44 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-aws-sdk": {
-      "version": "0.54.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-aws-sdk/-/instrumentation-aws-sdk-0.54.0.tgz",
-      "integrity": "sha512-4XnXfpACX8fpOnt/D8d/1AFg3uOwBTG9TopQBuikDZJYUrLUSdT7UiotCFqAM/Z6hQJh72Jy3591C/OrmKct7A==",
+      "version": "0.56.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-aws-sdk/-/instrumentation-aws-sdk-0.56.0.tgz",
+      "integrity": "sha512-Jl2B/FYEb6tBCk9G31CMomKPikGU2g+CEhrGddDI0o1YeNpg3kAO9dExF+w489/IJUGZX6/wudyNvV7z4k9NjQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0",
-        "@opentelemetry/propagation-utils": "^0.31.2",
-        "@opentelemetry/semantic-conventions": "^1.31.0"
+        "@opentelemetry/instrumentation": "^0.203.0",
+        "@opentelemetry/propagation-utils": "^0.31.3",
+        "@opentelemetry/semantic-conventions": "^1.34.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-aws-sdk/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-aws-sdk/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3746,13 +3722,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-bunyan": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-bunyan/-/instrumentation-bunyan-0.48.0.tgz",
-      "integrity": "sha512-Q6ay5CXIKuyejadPoLboz+jKumB3Zuxyk35ycFh9vfIeww3+mNRyMVj6KxHRS0Imbv9zhNbP3uyrUpvEMMyHuw==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-bunyan/-/instrumentation-bunyan-0.49.0.tgz",
+      "integrity": "sha512-ky5Am1y6s3Ex/3RygHxB/ZXNG07zPfg9Z6Ora+vfeKcr/+I6CJbWXWhSBJor3gFgKN3RvC11UWVURnmDpBS6Pg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "^0.202.0",
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/api-logs": "^0.203.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@types/bunyan": "1.8.11"
       },
       "engines": {
@@ -3762,13 +3738,42 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-cassandra-driver": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-cassandra-driver/-/instrumentation-cassandra-driver-0.48.0.tgz",
-      "integrity": "sha512-0dcX8Kx0S6ZAOknrbA+BBh1j5lg5F20W18m5VYoGUxkuLIUbWkQA3uaqeTfqbOwmnBmb1upDPUWPR+g5N12B4Q==",
+    "node_modules/@opentelemetry/instrumentation-bunyan/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-bunyan/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-cassandra-driver": {
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-cassandra-driver/-/instrumentation-cassandra-driver-0.49.0.tgz",
+      "integrity": "sha512-BNIvqldmLkeikfI5w5Rlm9vG5NnQexfPoxOgEMzfDVOEF+vS6351I6DzWLLgWWR9CNF/jQJJi/lr6am2DLp0Rw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -3778,14 +3783,43 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-cassandra-driver/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-cassandra-driver/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-connect": {
-      "version": "0.46.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.46.0.tgz",
-      "integrity": "sha512-YNq/7M1JXnWRkpKPC9dbYZA36cg547gY0p1bijW7vuZJ9t5f3alo6w8TWtZwV/hOFtBGHDXVhKVfp2Mh6zVHjQ==",
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.47.0.tgz",
+      "integrity": "sha512-pjenvjR6+PMRb6/4X85L4OtkQCootgb/Jzh/l/Utu3SJHBid1F+gk9sTGU2FWuhhEfV6P7MZ7BmCdHXQjgJ42g==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@types/connect": "3.4.38"
       },
@@ -3796,13 +3830,42 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-cucumber": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-cucumber/-/instrumentation-cucumber-0.17.0.tgz",
-      "integrity": "sha512-TTfQ9DmUlbeBsYZjNdJqs8mlcn1uY3t/AsTsALDBEFg6tWV+S1ADM9kVmKnscfbCwcQX2x17f/6a1Kpq5p91ww==",
+    "node_modules/@opentelemetry/instrumentation-connect/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-connect/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-cucumber": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-cucumber/-/instrumentation-cucumber-0.18.0.tgz",
+      "integrity": "sha512-i+cUbLHvRShuevtM0NwjQR9wnABhmYw8+dbgD57LNBde7xkuSDot0CTzX+pYn32djtQ1bPYZiLf+uwS0JsMUrw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -3812,13 +3875,71 @@
         "@opentelemetry/api": "^1.0.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-dataloader": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.19.0.tgz",
-      "integrity": "sha512-zIVRnRs3zDZCqStQcpIdRx3Dz9WXFSVj9qimqI7CRuKao9qnrZYUVQHvvVlLZX3JAg+nDC6JRS95zvbq50hj4A==",
+    "node_modules/@opentelemetry/instrumentation-cucumber/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0"
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-cucumber/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-dataloader": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.21.0.tgz",
+      "integrity": "sha512-Xu4CZ1bfhdkV3G6iVHFgKTgHx8GbKSqrTU01kcIJRGHpowVnyOPEv1CW5ow+9GU2X4Eki8zoNuVUenFc3RluxQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-dataloader/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-dataloader/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3828,12 +3949,41 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-dns": {
-      "version": "0.46.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-dns/-/instrumentation-dns-0.46.0.tgz",
-      "integrity": "sha512-m8u72x2fSIjhP1ITJX9Ims3eR4Qn8ze+QWy9NHYO01JlmiMamoc9TfIOd4dyOtxVja4tjnkWceKQdlEH9F9BoA==",
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-dns/-/instrumentation-dns-0.47.0.tgz",
+      "integrity": "sha512-775fOnewWkTF4iXMGKgwvOGqEmPrU1PZpXjjqvTrEErYBJe7Fz1WlEeUStHepyKOdld7Ghv7TOF/kE3QDctvrg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0"
+        "@opentelemetry/instrumentation": "^0.203.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-dns/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-dns/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3843,13 +3993,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-express": {
-      "version": "0.51.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.51.0.tgz",
-      "integrity": "sha512-v1mgfvyeQh7yfsZ8wZlr+jgFGk9FxzLfNH0EH0UYGO9das8fCIkixsEasZMWhjwAJKjlf+ElTZ2jE2pT7I3DyQ==",
+      "version": "0.52.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.52.0.tgz",
+      "integrity": "sha512-W7pizN0Wh1/cbNhhTf7C62NpyYw7VfCFTYg0DYieSTrtPBT1vmoSZei19wfKLnrMsz3sHayCg0HxCVL2c+cz5w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -3859,14 +4009,43 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-express/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-express/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-fastify": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.47.0.tgz",
-      "integrity": "sha512-dLld0pI63WR1BXvNiGKFWzqrnhgItiIDNsRf/vVOhKV20HQNUQk5FfzcX0eUyiJtW/+u95Txh/vdfeQRwLELcA==",
+      "version": "0.48.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.48.0.tgz",
+      "integrity": "sha512-3zQlE/DoVfVH6/ycuTv7vtR/xib6WOa0aLFfslYcvE62z0htRu/ot8PV/zmMZfnzpTQj8S/4ULv36R6UIbpJIg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -3876,14 +4055,72 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-fastify/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-fastify/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-fs": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.22.0.tgz",
-      "integrity": "sha512-ktQVFD6pd8eAIW6t2DtDuXj2lxq+wnQ8WUkJLNZzl3rEE2TZEiHg7wIkWVoxl4Cz4pJ2YZJbdU2fHAizuDebDw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.23.0.tgz",
+      "integrity": "sha512-Puan+QopWHA/KNYvDfOZN6M/JtF6buXEyD934vrb8WhsX1/FuM7OtoMlQyIqAadnE8FqqDL4KDPiEfCQH6pQcQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0"
+        "@opentelemetry/instrumentation": "^0.203.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-fs/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-fs/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3893,12 +4130,41 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-generic-pool": {
-      "version": "0.46.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.46.0.tgz",
-      "integrity": "sha512-QJUH9n5Ld0xz54gX1k3L2RDoSyJjeZaASA17Zvm0uVa40v+s8oMfCa1/4y9TONFSVbL0fPbAGojVsRRtg6dJ5w==",
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.47.0.tgz",
+      "integrity": "sha512-UfHqf3zYK+CwDwEtTjaD12uUqGGTswZ7ofLBEdQ4sEJp9GHSSJMQ2hT3pgBxyKADzUdoxQAv/7NqvL42ZI+Qbw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0"
+        "@opentelemetry/instrumentation": "^0.203.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-generic-pool/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-generic-pool/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3908,12 +4174,41 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-graphql": {
-      "version": "0.50.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.50.0.tgz",
-      "integrity": "sha512-Nn3vBS5T0Dv4+9WF1dGR0Lgsxuz6ztQmTsxoHvesm6YAAXiHffnwsxBEJUKEJcjxfXzjO1SVuLDkv1bAeQ3NFw==",
+      "version": "0.51.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.51.0.tgz",
+      "integrity": "sha512-LchkOu9X5DrXAnPI1+Z06h/EH/zC7D6sA86hhPrk3evLlsJTz0grPrkL/yUJM9Ty0CL/y2HSvmWQCjbJEz/ADg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0"
+        "@opentelemetry/instrumentation": "^0.203.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-graphql/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-graphql/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -3923,12 +4218,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-grpc": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-grpc/-/instrumentation-grpc-0.202.0.tgz",
-      "integrity": "sha512-dWvefHNAyAfaHVmxQ/ySLQSI2hGKLgK1sBtvae4w9xruqU08bBMtvmVeGMA/5whfiUDU8ftp1/84U4Zoe5N56A==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-grpc/-/instrumentation-grpc-0.203.0.tgz",
+      "integrity": "sha512-Qmjx2iwccHYRLoE4RFS46CvQE9JG9Pfeae4EPaNZjvIuJxb/pZa2R9VWzRlTehqQWpAvto/dGhtkw8Tv+o0LTg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "0.202.0",
+        "@opentelemetry/instrumentation": "0.203.0",
         "@opentelemetry/semantic-conventions": "^1.29.0"
       },
       "engines": {
@@ -3938,14 +4233,43 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-grpc/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-grpc/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-hapi": {
-      "version": "0.49.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.49.0.tgz",
-      "integrity": "sha512-d4BcCjbW7Pfg4FpbAAF0cK/ue3dN02WMw0uO2G792KzDjxj05MtZm3eBTz672j3ejV9hM0HvPPhUHUsIC0H6Gw==",
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.50.0.tgz",
+      "integrity": "sha512-5xGusXOFQXKacrZmDbpHQzqYD1gIkrMWuwvlrEPkYOsjUqGUjl1HbxCsn5Y9bUXOCgP1Lj6A4PcKt1UiJ2MujA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -3955,14 +4279,43 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-hapi/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-hapi/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-http": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.202.0.tgz",
-      "integrity": "sha512-oX+jyY2KBg4/nVH3vZhSWDbhywkHgE0fq3YinhUBx0jv+YUWC2UKA7qLkxr/CSzfKsFi/Km0NKV+llH17yYGKw==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.203.0.tgz",
+      "integrity": "sha512-y3uQAcCOAwnO6vEuNVocmpVzG3PER6/YZqbPbbffDdJ9te5NkHEkfSMNzlC3+v7KlE+WinPGc3N7MR30G1HY2g==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/instrumentation": "0.202.0",
+        "@opentelemetry/instrumentation": "0.203.0",
         "@opentelemetry/semantic-conventions": "^1.29.0",
         "forwarded-parse": "2.1.2"
       },
@@ -3973,14 +4326,43 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-ioredis": {
-      "version": "0.50.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.50.0.tgz",
-      "integrity": "sha512-f2e+3xPxMRdlt1rjZpRhxuqrfumlWe3NX0Y+W857RBBV11HhbeZZaYbO5MMaxV3xBZv4dwPSGx96GjExUWY0WA==",
+    "node_modules/@opentelemetry/instrumentation-http/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
-        "@opentelemetry/redis-common": "^0.37.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-http/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-ioredis": {
+      "version": "0.51.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.51.0.tgz",
+      "integrity": "sha512-9IUws0XWCb80NovS+17eONXsw1ZJbHwYYMXiwsfR9TSurkLV5UNbRSKb9URHO+K+pIJILy9wCxvyiOneMr91Ig==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
+        "@opentelemetry/redis-common": "^0.38.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -3990,13 +4372,51 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-kafkajs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.11.0.tgz",
-      "integrity": "sha512-+i9VqVEPNObB1tkwcLV6zAafnve72h2Iwo48E11M/kVXMNXlgGhiYckYCmzba8c2u5XD/V98XZDrCIyO8CLCNA==",
+    "node_modules/@opentelemetry/instrumentation-ioredis/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-ioredis/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-ioredis/node_modules/@opentelemetry/redis-common": {
+      "version": "0.38.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/redis-common/-/redis-common-0.38.0.tgz",
+      "integrity": "sha512-4Wc0AWURII2cfXVVoZ6vDqK+s5n4K5IssdrlVrvGsx6OEOKdghKtJZqXAHWFiZv4nTDLH2/2fldjIHY8clMOjQ==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-kafkajs": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.12.0.tgz",
+      "integrity": "sha512-bIe4aSAAxytp88nzBstgr6M7ZiEpW6/D1/SuKXdxxuprf18taVvFL2H5BDNGZ7A14K27haHqzYqtCTqFXHZOYg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.30.0"
       },
       "engines": {
@@ -4006,13 +4426,42 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-knex": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.47.0.tgz",
-      "integrity": "sha512-OjqjnzXD5+FXVGkOznbRAz9yByb4UWzIUhXjuHvOQ50IUY8mv3rM2Gj6Ar7m5JsENiS5DtAy2Vfwk4e9zNC0ng==",
+    "node_modules/@opentelemetry/instrumentation-kafkajs/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-kafkajs/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-knex": {
+      "version": "0.48.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.48.0.tgz",
+      "integrity": "sha512-V5wuaBPv/lwGxuHjC6Na2JFRjtPgstw19jTFl1B1b6zvaX8zVDYUDaR5hL7glnQtUSCMktPttQsgK4dhXpddcA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.33.1"
       },
       "engines": {
@@ -4022,14 +4471,43 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-knex/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-knex/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-koa": {
-      "version": "0.50.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.50.1.tgz",
-      "integrity": "sha512-HoQ9OuzLx4z6/BfA4medM6cj5+UXWQWakQVCd/Xd+gU+gA1eCxwdoECH44p+mTl3GFS7/icgfGE1if/lguaG0Q==",
+      "version": "0.51.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.51.0.tgz",
+      "integrity": "sha512-XNLWeMTMG1/EkQBbgPYzCeBD0cwOrfnn8ao4hWgLv0fNCFQu1kCsJYygz2cvKuCs340RlnG4i321hX7R8gj3Rg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4039,13 +4517,71 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-lru-memoizer": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.47.0.tgz",
-      "integrity": "sha512-UJ2UlCAIF+N4zNkiHdMr4O0caN0K6YboAso3/zaFdG1QiPR2zqZcbWAGFBikZ9HSByU+NwbxTXDzlpkcDZIqWg==",
+    "node_modules/@opentelemetry/instrumentation-koa/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0"
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-koa/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-lru-memoizer": {
+      "version": "0.48.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.48.0.tgz",
+      "integrity": "sha512-KUW29wfMlTPX1wFz+NNrmE7IzN7NWZDrmFWHM/VJcmFEuQGnnBuTIdsP55CnBDxKgQ/qqYFp4udQFNtjeFosPw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-lru-memoizer/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-lru-memoizer/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4055,12 +4591,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-memcached": {
-      "version": "0.46.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-memcached/-/instrumentation-memcached-0.46.0.tgz",
-      "integrity": "sha512-FFDcOVJUxZQqbg57gVskZGXRfEsZXwOvCaPv6/qIZRw5glLXPTulpnfG/s8NAltsj2buXSvS4eKFo+0HKH0apw==",
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-memcached/-/instrumentation-memcached-0.47.0.tgz",
+      "integrity": "sha512-vXDs/l4hlWy1IepPG1S6aYiIZn+tZDI24kAzwKKJmR2QEJRL84PojmALAEJGazIOLl/VdcCPZdMb0U2K0VzojA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@types/memcached": "^2.2.6"
       },
@@ -4071,13 +4607,42 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-mongodb": {
-      "version": "0.55.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.55.1.tgz",
-      "integrity": "sha512-Wb13YixWm8nB27ZSQW3h070UWkivoh6bjeyDUY6lLimSUulALr+YHBn0t71U1aTcUeaZv3IBNaPRimFXhz6gBA==",
+    "node_modules/@opentelemetry/instrumentation-memcached/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-memcached/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-mongodb": {
+      "version": "0.56.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.56.0.tgz",
+      "integrity": "sha512-YG5IXUUmxX3Md2buVMvxm9NWlKADrnavI36hbJsihqqvBGsWnIfguf0rUP5Srr0pfPqhQjUP+agLMsvu0GmUpA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4087,14 +4652,43 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-mongodb/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-mongodb/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-mongoose": {
-      "version": "0.49.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.49.0.tgz",
-      "integrity": "sha512-nF+43QFe8IoW20TmTJZdxZhnVZGEglODUvzAo3fRmaBFAkwUXRGzRgABS255PCjIbScEaRRDCXc6EAsSkwRNPg==",
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.50.0.tgz",
+      "integrity": "sha512-Am8pk1Ct951r4qCiqkBcGmPIgGhoDiFcRtqPSLbJrUZqEPUsigjtMjoWDRLG1Ki1NHgOF7D0H7d+suWz1AAizw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4104,15 +4698,73 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-mysql": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.48.0.tgz",
-      "integrity": "sha512-o7DwkkRn3eLWfzJdbXrlCS1EhbIOgB0W74eucbP+5Lk0XDGixy4yURTkmNclCcsemgzRZfEq0YvYQV29Yhpo5A==",
+    "node_modules/@opentelemetry/instrumentation-mongoose/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-mongoose/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-mysql": {
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.49.0.tgz",
+      "integrity": "sha512-QU9IUNqNsrlfE3dJkZnFHqLjlndiU39ll/YAAEvWE40sGOCi9AtOF6rmEGzJ1IswoZ3oyePV7q2MP8SrhJfVAA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
-        "@types/mysql": "2.15.26"
+        "@types/mysql": "2.15.27"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-mysql/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-mysql/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4122,12 +4774,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-mysql2": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.48.0.tgz",
-      "integrity": "sha512-eCRpv0WV2s0Pa6CpjPWzZiLZDqx8kqZJopJESd4ywoUwtijXzBiTRidp/8aL9k+kl4drhm2GVNr4thUCMlEOSA==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.49.0.tgz",
+      "integrity": "sha512-dCub9wc02mkJWNyHdVEZ7dvRzy295SmNJa+LrAJY2a/+tIiVBQqEAajFzKwp9zegVVnel9L+WORu34rGLQDzxA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@opentelemetry/sql-common": "^0.41.0"
       },
@@ -4138,13 +4790,42 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-nestjs-core": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.48.0.tgz",
-      "integrity": "sha512-ytK4ABSkWcD9vyMU8GpinvodAGaRxBFuxybP/m7sgLtEboXMJjdWnEHb7lH/CX1ICiVKRXWdYg9npdu6yBCW5Q==",
+    "node_modules/@opentelemetry/instrumentation-mysql2/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-mysql2/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-nestjs-core": {
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.49.0.tgz",
+      "integrity": "sha512-1R/JFwdmZIk3T/cPOCkVvFQeKYzbbUvDxVH3ShXamUwBlGkdEu5QJitlRMyVNZaHkKZKWgYrBarGQsqcboYgaw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.30.0"
       },
       "engines": {
@@ -4154,13 +4835,42 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-net": {
-      "version": "0.46.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-net/-/instrumentation-net-0.46.1.tgz",
-      "integrity": "sha512-r7Buqem+odrTTPlWfT7EqS24QnDAL4U+c4e38RzcRtdZF00Z34oqEpge7TZcQLo0vEASWbHQ/WjWNR7ZYKFKBA==",
+    "node_modules/@opentelemetry/instrumentation-nestjs-core/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-nestjs-core/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-net": {
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-net/-/instrumentation-net-0.47.0.tgz",
+      "integrity": "sha512-csoJ++Njpf7C09JH+0HNGenuNbDZBqO1rFhMRo6s0rAmJwNh9zY3M/urzptmKlqbKnf4eH0s+CKHy/+M8fbFsQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4170,13 +4880,42 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-oracledb": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-oracledb/-/instrumentation-oracledb-0.28.0.tgz",
-      "integrity": "sha512-VObbQRd3g8nDLLOeGjm5l6TnB9dtEaJoedLfLwMGrlD6lkai+hdfalYh6FOF5dce+dJouZdW6NUUAaBj4f4KcA==",
+    "node_modules/@opentelemetry/instrumentation-net/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-net/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-oracledb": {
+      "version": "0.29.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-oracledb/-/instrumentation-oracledb-0.29.0.tgz",
+      "integrity": "sha512-2aHLiJdkyiUbooIUm7FaZf+O4jyqEl+RfFpgud1dxT87QeeYM216wi+xaMNzsb5yKtRBqbA3qeHBCyenYrOZwA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@types/oracledb": "6.5.2"
       },
@@ -4187,17 +4926,46 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-oracledb/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-oracledb/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-pg": {
-      "version": "0.54.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.54.0.tgz",
-      "integrity": "sha512-KQnEGwm65p1zFZGjKGw+oMilGcR4l1q3qgRmETO7ySEfMddH3t6jwlbqmcjO3N3bVcPkYgjioGVQGvdpvz7O1w==",
+      "version": "0.55.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.55.0.tgz",
+      "integrity": "sha512-yfJ5bYE7CnkW/uNsnrwouG/FR7nmg09zdk2MSs7k0ZOMkDDAE3WBGpVFFApGgNu2U+gtzLgEzOQG4I/X+60hXw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@opentelemetry/sql-common": "^0.41.0",
-        "@types/pg": "8.15.1",
+        "@types/pg": "8.15.4",
         "@types/pg-pool": "2.0.6"
       },
       "engines": {
@@ -4207,15 +4975,73 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-pino": {
-      "version": "0.49.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pino/-/instrumentation-pino-0.49.0.tgz",
-      "integrity": "sha512-nngcqUnIeVnDvRMf6fixYwlMbTNzCVGv93CacyR/8TL/pjyumje020PC5q7b6CfcTdToiD5GMTMKvWBiTd08cA==",
+    "node_modules/@opentelemetry/instrumentation-pg/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "^0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-pg/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-pino": {
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pino/-/instrumentation-pino-0.50.0.tgz",
+      "integrity": "sha512-Pi0cWGp4f2gresq2xqef4IsuunLdebJ9n9tZxytDz2ci4euIfW36ILpszQmRNhwCVDCZLmUgGDKZGj4PXyPd0w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "^0.203.0",
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0"
+        "@opentelemetry/instrumentation": "^0.203.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-pino/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-pino/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4225,13 +5051,13 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-redis": {
-      "version": "0.49.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis/-/instrumentation-redis-0.49.1.tgz",
-      "integrity": "sha512-Ds5Ke9qE9kTlDThqLSJJntkIvuMQCBPiFKwHntocb/3q/9q5D47BNwawO5Mj9sVMV6zkld5M5Pb9Av39iieuOg==",
+      "version": "0.51.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis/-/instrumentation-redis-0.51.0.tgz",
+      "integrity": "sha512-uL/GtBA0u72YPPehwOvthAe+Wf8k3T+XQPBssJmTYl6fzuZjNq8zTfxVFhl9nRFjFVEe+CtiYNT0Q3AyqW1Z0A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
-        "@opentelemetry/redis-common": "^0.37.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
+        "@opentelemetry/redis-common": "^0.38.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4241,15 +5067,27 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-redis-4": {
-      "version": "0.49.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.49.0.tgz",
-      "integrity": "sha512-i+Wsl7M2LXEDA2yXouNJ3fttSzzb5AhlehvSBVRIFuinY51XrrKSH66biO0eox+pYQMwAlPxJ778XcMQffN78A==",
+    "node_modules/@opentelemetry/instrumentation-redis/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
-        "@opentelemetry/redis-common": "^0.37.0",
-        "@opentelemetry/semantic-conventions": "^1.27.0"
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-redis/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4258,14 +5096,23 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-redis/node_modules/@opentelemetry/redis-common": {
+      "version": "0.38.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/redis-common/-/redis-common-0.38.0.tgz",
+      "integrity": "sha512-4Wc0AWURII2cfXVVoZ6vDqK+s5n4K5IssdrlVrvGsx6OEOKdghKtJZqXAHWFiZv4nTDLH2/2fldjIHY8clMOjQ==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-restify": {
-      "version": "0.48.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-restify/-/instrumentation-restify-0.48.1.tgz",
-      "integrity": "sha512-0KY7mWpm0TJJ8ajhsNsLUmsBE/yNr70o128Crn30eDmnyRQkG7uS0xfDi6keExjF7SKzXQabs3Gtx7SuFmE80Q==",
+      "version": "0.49.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-restify/-/instrumentation-restify-0.49.0.tgz",
+      "integrity": "sha512-tsGZZhS4mVZH7omYxw5jpsrD3LhWizqWc0PYtAnzpFUvL5ZINHE+cm57bssTQ2AK/GtZMxu9LktwCvIIf3dSmw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4275,13 +5122,42 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-restify/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-restify/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-router": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-router/-/instrumentation-router-0.47.0.tgz",
-      "integrity": "sha512-U0zA1LTDqtTWyd5e4SdoqQA/8QUOhc4LDv9U7b+8FMFTty95OF84apUdatl09Dzc51XeWPWIV7VutmSCd/zsUg==",
+      "version": "0.48.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-router/-/instrumentation-router-0.48.0.tgz",
+      "integrity": "sha512-Wixrc8CchuJojXpaS/dCQjFOMc+3OEil1H21G+WLYQb8PcKt5kzW9zDBT19nyjjQOx/D/uHPfgbrT+Dc7cfJ9w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4291,13 +5167,71 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-router/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-router/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-runtime-node": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-runtime-node/-/instrumentation-runtime-node-0.16.0.tgz",
-      "integrity": "sha512-Q/GB9LsKLrRCEIPLAQTDQvydnLmLXBSRkYkWzwKzY/LCkOs+Cl8YiJG08p6D4CaJ6lvP0iG4kwPHk1ydNbdehg==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-runtime-node/-/instrumentation-runtime-node-0.17.0.tgz",
+      "integrity": "sha512-O+xc0woqrSjue5IgpCCMvlgsuDrq6DDEfiHW3S3vRMCjXE1ZoPjaDE/K6EURorN+tjnzZQN1gOMSrscSGAbjHg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0"
+        "@opentelemetry/instrumentation": "^0.203.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-runtime-node/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-runtime-node/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4307,12 +5241,12 @@
       }
     },
     "node_modules/@opentelemetry/instrumentation-socket.io": {
-      "version": "0.49.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-socket.io/-/instrumentation-socket.io-0.49.0.tgz",
-      "integrity": "sha512-DpMtNBEcaLCcbP1WVBPCSgRiBs31igTQkal1gUm40VL/XAv5GUqRAUnvHZrQh3yPipOqzV65pdb0jJXdps/tug==",
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-socket.io/-/instrumentation-socket.io-0.50.0.tgz",
+      "integrity": "sha512-6JN6lnKN9ZuZtZdMQIR+no1qHzQvXSZUsNe3sSWMgqmNRyEXuDUWBIyKKeG0oHRHtR4xE4QhJyD4D5kKRPWZFA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0"
       },
       "engines": {
@@ -4322,13 +5256,42 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-tedious": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.21.0.tgz",
-      "integrity": "sha512-pt37kHYGQ8D2vBOQwyB/TKUqLPF8Q4rfTNu3whZsPOsc6QHDPXpfQISIupWAnMjAaeujF/Spg6IA04W6jXrzRQ==",
+    "node_modules/@opentelemetry/instrumentation-socket.io/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-socket.io/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-tedious": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.22.0.tgz",
+      "integrity": "sha512-XrrNSUCyEjH1ax9t+Uo6lv0S2FCCykcF7hSxBMxKf7Xn0bPRxD3KyFUZy25aQXzbbbUHhtdxj3r2h88SfEM3aA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/instrumentation": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.27.0",
         "@types/tedious": "^4.0.14"
       },
@@ -4339,14 +5302,43 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/instrumentation-tedious/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-tedious/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/instrumentation-undici": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.13.1.tgz",
-      "integrity": "sha512-w0e7q983oNa+dQiWOEgU+1R6H48ks6mICZKrIxY08KqZPFroPUYbH4Db7X6p8m4QhuHgI2/wEAgLf9h03ILzcg==",
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.14.0.tgz",
+      "integrity": "sha512-2HN+7ztxAReXuxzrtA3WboAKlfP5OsPA57KQn2AdYZbJ3zeRPcLXyW4uO/jpLE6PLm0QRtmeGCmfYpqRlwgSwg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
-        "@opentelemetry/instrumentation": "^0.202.0"
+        "@opentelemetry/instrumentation": "^0.203.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4355,14 +5347,72 @@
         "@opentelemetry/api": "^1.7.0"
       }
     },
-    "node_modules/@opentelemetry/instrumentation-winston": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-winston/-/instrumentation-winston-0.47.0.tgz",
-      "integrity": "sha512-r+GqnZU/aFldQyB5QdOlxsMlH9KZ4+zJfnYplz3lbC9f9ozAIlVAeoshvWTtbv7Oxp2NnK64EfnNP1pClaGEqA==",
+    "node_modules/@opentelemetry/instrumentation-undici/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "^0.202.0",
-        "@opentelemetry/instrumentation": "^0.202.0"
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-undici/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-winston": {
+      "version": "0.48.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-winston/-/instrumentation-winston-0.48.0.tgz",
+      "integrity": "sha512-QuKbswAaQfRULhtlYbeNC9gOAXPxOSCE4BjIzuY1oEsc84kIsHUjn3yvY9Q83s3eg3j0JycNcAMi8u0yTl5PIQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "^0.203.0",
+        "@opentelemetry/instrumentation": "^0.203.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-winston/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation-winston/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4372,13 +5422,13 @@
       }
     },
     "node_modules/@opentelemetry/otlp-exporter-base": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.202.0.tgz",
-      "integrity": "sha512-nMEOzel+pUFYuBJg2znGmHJWbmvMbdX5/RhoKNKowguMbURhz0fwik5tUKplLcUtl8wKPL1y9zPnPxeBn65N0Q==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.203.0.tgz",
+      "integrity": "sha512-Wbxf7k+87KyvxFr5D7uOiSq/vHXWommvdnNE7vECO3tAhsA2GfOlpWINCMWUEPdHZ7tCXxw6Epp3vgx3jU7llQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-transformer": "0.202.0"
+        "@opentelemetry/otlp-transformer": "0.203.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4388,15 +5438,15 @@
       }
     },
     "node_modules/@opentelemetry/otlp-grpc-exporter-base": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-grpc-exporter-base/-/otlp-grpc-exporter-base-0.202.0.tgz",
-      "integrity": "sha512-yIEHVxFA5dmYif7lZbbB66qulLLhrklj6mI2X3cuGW5hYPyUErztEmbroM+6teu/XobBi9bLHid2VT4NIaRuGg==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-grpc-exporter-base/-/otlp-grpc-exporter-base-0.203.0.tgz",
+      "integrity": "sha512-te0Ze1ueJF+N/UOFl5jElJW4U0pZXQ8QklgSfJ2linHN0JJsuaHG8IabEUi2iqxY8ZBDlSiz1Trfv5JcjWWWwQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@grpc/grpc-js": "^1.7.1",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/otlp-exporter-base": "0.202.0",
-        "@opentelemetry/otlp-transformer": "0.202.0"
+        "@opentelemetry/otlp-exporter-base": "0.203.0",
+        "@opentelemetry/otlp-transformer": "0.203.0"
       },
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4406,15 +5456,15 @@
       }
     },
     "node_modules/@opentelemetry/otlp-transformer": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.202.0.tgz",
-      "integrity": "sha512-5XO77QFzs9WkexvJQL9ksxL8oVFb/dfi9NWQSq7Sv0Efr9x3N+nb1iklP1TeVgxqJ7m1xWiC/Uv3wupiQGevMw==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.203.0.tgz",
+      "integrity": "sha512-Y8I6GgoCna0qDQ2W6GCRtaF24SnvqvA8OfeTi7fqigD23u8Jpb4R5KFv/pRvrlGagcCLICMIyh9wiejp4TXu/A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.202.0",
+        "@opentelemetry/api-logs": "0.203.0",
         "@opentelemetry/core": "2.0.1",
         "@opentelemetry/resources": "2.0.1",
-        "@opentelemetry/sdk-logs": "0.202.0",
+        "@opentelemetry/sdk-logs": "0.203.0",
         "@opentelemetry/sdk-metrics": "2.0.1",
         "@opentelemetry/sdk-trace-base": "2.0.1",
         "protobufjs": "^7.3.0"
@@ -4426,10 +5476,22 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/@opentelemetry/propagation-utils": {
-      "version": "0.31.2",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/propagation-utils/-/propagation-utils-0.31.2.tgz",
-      "integrity": "sha512-FlJzdZ0cQY8qqOsJ/A+L/t05LvZtnsMq6vbamunVMYRi9TAy+xq37t+nT/dx3dKJ/2k409jDj9eA0Yhj9RtTug==",
+      "version": "0.31.3",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/propagation-utils/-/propagation-utils-0.31.3.tgz",
+      "integrity": "sha512-ZI6LKjyo+QYYZY5SO8vfoCQ9A69r1/g+pyjvtu5RSK38npINN1evEmwqbqhbg2CdcIK3a4PN6pDAJz/yC5/gAA==",
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.19.0 || >=20.6.0"
@@ -4468,19 +5530,10 @@
         "@opentelemetry/api": ">=1.0.0 <1.10.0"
       }
     },
-    "node_modules/@opentelemetry/redis-common": {
-      "version": "0.37.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/redis-common/-/redis-common-0.37.0.tgz",
-      "integrity": "sha512-tJwgE6jt32bLs/9J6jhQRKU2EZnsD8qaO13aoFyXwF6s4LhpT7YFHf3Z03MqdILk6BA2BFUhoyh7k9fj9i032A==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      }
-    },
     "node_modules/@opentelemetry/resource-detector-alibaba-cloud": {
-      "version": "0.31.2",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-alibaba-cloud/-/resource-detector-alibaba-cloud-0.31.2.tgz",
-      "integrity": "sha512-Itp6duMXkAIQzmDHIf1kc6Llj/fa0BxilaELp0K6Fp9y+b0ex9LksNAQfTDFPHNine7tFoXauvvHbJFXIB6mqw==",
+      "version": "0.31.3",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-alibaba-cloud/-/resource-detector-alibaba-cloud-0.31.3.tgz",
+      "integrity": "sha512-I556LHcLVsBXEgnbPgQISP/JezDt5OfpgOaJNR1iVJl202r+K145OSSOxnH5YOc/KvrydBD0FOE03F7x0xnVTw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
@@ -4495,9 +5548,9 @@
       }
     },
     "node_modules/@opentelemetry/resource-detector-aws": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-aws/-/resource-detector-aws-2.2.0.tgz",
-      "integrity": "sha512-6k7//RWAv4U1PeZhv0Too0Sv7sp7/A6s6g9h5ZYauPcroh2t4gOmkQSspSLYCynn34YZwn3FGbuaMwTDjHEJig==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-aws/-/resource-detector-aws-2.3.0.tgz",
+      "integrity": "sha512-PkD/lyXG3B3REq1Y6imBLckljkJYXavtqGYSryAeJYvGOf5Ds3doR+BCGjmKeF6ObAtI5MtpBeUStTDtGtBsWA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
@@ -4512,9 +5565,9 @@
       }
     },
     "node_modules/@opentelemetry/resource-detector-azure": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-azure/-/resource-detector-azure-0.9.0.tgz",
-      "integrity": "sha512-5wJwAAW2vhbqIhgaRisU1y0F5mUco59F/dKgmnnnT6YNbxjrbdUZYxKF5Wl7deJoACVdL5wi/3N97GCXPEwwCQ==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-azure/-/resource-detector-azure-0.10.0.tgz",
+      "integrity": "sha512-5cNAiyPBg53Uxe/CW7hsCq8HiKNAUGH+gi65TtgpzSR9bhJG4AEbuZhbJDFwe97tn2ifAD1JTkbc/OFuaaFWbA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
@@ -4529,9 +5582,9 @@
       }
     },
     "node_modules/@opentelemetry/resource-detector-container": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-container/-/resource-detector-container-0.7.2.tgz",
-      "integrity": "sha512-St3Krrbpvq7k0UoUNlm7Z4Xqf9HdS9R5yPslwl/WPaZpj/Bf/54WZTPmNQat+93Ey6PTX0ISKg26DfcjPemUhg==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-container/-/resource-detector-container-0.7.3.tgz",
+      "integrity": "sha512-SK+xUFw6DKYbQniaGmIFsFxAZsr8RpRSRWxKi5/ZJAoqqPnjcyGI/SeUx8zzPk4XLO084zyM4pRHgir0hRTaSQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
@@ -4546,9 +5599,9 @@
       }
     },
     "node_modules/@opentelemetry/resource-detector-gcp": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-gcp/-/resource-detector-gcp-0.36.0.tgz",
-      "integrity": "sha512-mWnEcg4tA+IDPrkETWo42psEsDN20dzYZSm4ZH8m8uiQALnNksVmf5C3An0GUEj5zrrxMasjSuv4zEH1gI40XQ==",
+      "version": "0.37.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resource-detector-gcp/-/resource-detector-gcp-0.37.0.tgz",
+      "integrity": "sha512-LGpJBECIMsVKhiulb4nxUw++m1oF4EiDDPmFGW2aqYaAF0oUvJNv8Z/55CAzcZ7SxvlTgUwzewXDBsuCup7iqw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@opentelemetry/core": "^2.0.0",
@@ -4580,12 +5633,12 @@
       }
     },
     "node_modules/@opentelemetry/sdk-logs": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.202.0.tgz",
-      "integrity": "sha512-pv8QiQLQzk4X909YKm0lnW4hpuQg4zHwJ4XBd5bZiXcd9urvrJNoNVKnxGHPiDVX/GiLFvr5DMYsDBQbZCypRQ==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.203.0.tgz",
+      "integrity": "sha512-vM2+rPq0Vi3nYA5akQD2f3QwossDnTDLvKbea6u/A2NZ3XDkPxMfo/PNrDoXhDUD/0pPo2CdH5ce/thn9K0kLw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.202.0",
+        "@opentelemetry/api-logs": "0.203.0",
         "@opentelemetry/core": "2.0.1",
         "@opentelemetry/resources": "2.0.1"
       },
@@ -4596,6 +5649,18 @@
         "@opentelemetry/api": ">=1.4.0 <1.10.0"
       }
     },
+    "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/@opentelemetry/sdk-metrics": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.0.1.tgz",
@@ -4613,29 +5678,29 @@
       }
     },
     "node_modules/@opentelemetry/sdk-node": {
-      "version": "0.202.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-node/-/sdk-node-0.202.0.tgz",
-      "integrity": "sha512-SF9vXWVd9I5CZ69mW3GfwfLI2SHgyvEqntcg0en5y8kRp5+2PPoa3Mkgj0WzFLrbSgTw4PsXn7c7H6eSdrtV0w==",
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-node/-/sdk-node-0.203.0.tgz",
+      "integrity": "sha512-zRMvrZGhGVMvAbbjiNQW3eKzW/073dlrSiAKPVWmkoQzah9wfynpVPeL55f9fVIm0GaBxTLcPeukWGy0/Wj7KQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/api-logs": "0.202.0",
+        "@opentelemetry/api-logs": "0.203.0",
         "@opentelemetry/core": "2.0.1",
-        "@opentelemetry/exporter-logs-otlp-grpc": "0.202.0",
-        "@opentelemetry/exporter-logs-otlp-http": "0.202.0",
-        "@opentelemetry/exporter-logs-otlp-proto": "0.202.0",
-        "@opentelemetry/exporter-metrics-otlp-grpc": "0.202.0",
-        "@opentelemetry/exporter-metrics-otlp-http": "0.202.0",
-        "@opentelemetry/exporter-metrics-otlp-proto": "0.202.0",
-        "@opentelemetry/exporter-prometheus": "0.202.0",
-        "@opentelemetry/exporter-trace-otlp-grpc": "0.202.0",
-        "@opentelemetry/exporter-trace-otlp-http": "0.202.0",
-        "@opentelemetry/exporter-trace-otlp-proto": "0.202.0",
+        "@opentelemetry/exporter-logs-otlp-grpc": "0.203.0",
+        "@opentelemetry/exporter-logs-otlp-http": "0.203.0",
+        "@opentelemetry/exporter-logs-otlp-proto": "0.203.0",
+        "@opentelemetry/exporter-metrics-otlp-grpc": "0.203.0",
+        "@opentelemetry/exporter-metrics-otlp-http": "0.203.0",
+        "@opentelemetry/exporter-metrics-otlp-proto": "0.203.0",
+        "@opentelemetry/exporter-prometheus": "0.203.0",
+        "@opentelemetry/exporter-trace-otlp-grpc": "0.203.0",
+        "@opentelemetry/exporter-trace-otlp-http": "0.203.0",
+        "@opentelemetry/exporter-trace-otlp-proto": "0.203.0",
         "@opentelemetry/exporter-zipkin": "2.0.1",
-        "@opentelemetry/instrumentation": "0.202.0",
+        "@opentelemetry/instrumentation": "0.203.0",
         "@opentelemetry/propagator-b3": "2.0.1",
         "@opentelemetry/propagator-jaeger": "2.0.1",
         "@opentelemetry/resources": "2.0.1",
-        "@opentelemetry/sdk-logs": "0.202.0",
+        "@opentelemetry/sdk-logs": "0.203.0",
         "@opentelemetry/sdk-metrics": "2.0.1",
         "@opentelemetry/sdk-trace-base": "2.0.1",
         "@opentelemetry/sdk-trace-node": "2.0.1",
@@ -4648,6 +5713,35 @@
         "@opentelemetry/api": ">=1.3.0 <1.10.0"
       }
     },
+    "node_modules/@opentelemetry/sdk-node/node_modules/@opentelemetry/api-logs": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.203.0.tgz",
+      "integrity": "sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-node/node_modules/@opentelemetry/instrumentation": {
+      "version": "0.203.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.203.0.tgz",
+      "integrity": "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.203.0",
+        "import-in-the-middle": "^1.8.1",
+        "require-in-the-middle": "^7.1.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
     "node_modules/@opentelemetry/sdk-trace-base": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.0.1.tgz",
@@ -4825,9 +5919,9 @@
       }
     },
     "node_modules/@react-email/button": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@react-email/button/-/button-0.1.0.tgz",
-      "integrity": "sha512-fg4LtgTu5zXxaRSly9cuv6sHVF/hi1lElbRaIA8EPx5coWOBhCto6rCPfawcXpaN2oER7rNHUrcNBkI+lz5F9A==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@react-email/button/-/button-0.2.0.tgz",
+      "integrity": "sha512-8i+v6cMxr2emz4ihCrRiYJPp2/sdYsNNsBzXStlcA+/B9Umpm5Jj3WJKYpgTPM+aeyiqlG/MMI1AucnBm4f1oQ==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
@@ -4876,13 +5970,13 @@
       }
     },
     "node_modules/@react-email/components": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@react-email/components/-/components-0.1.1.tgz",
-      "integrity": "sha512-NyPuoqd1o77HL4+58pBrpk3e5/0UZLNU11/OBnE59F2MCZ8IaZX+55Ce+HR5itKTMdqlgfncz7sGA1TDITo41g==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@react-email/components/-/components-0.2.0.tgz",
+      "integrity": "sha512-y45D+oYDgvL1fuFnauwUk8MwT54l0hWwnUAzzP0bVuwhsmVJFelKOGGMCRch0pcgyINilVlAEk0Xjtcu0Su4cw==",
       "license": "MIT",
       "dependencies": {
         "@react-email/body": "0.0.11",
-        "@react-email/button": "0.1.0",
+        "@react-email/button": "0.2.0",
         "@react-email/code-block": "0.1.0",
         "@react-email/code-inline": "0.0.5",
         "@react-email/column": "0.0.13",
@@ -4899,7 +5993,7 @@
         "@react-email/render": "1.1.3",
         "@react-email/row": "0.0.12",
         "@react-email/section": "0.0.16",
-        "@react-email/tailwind": "1.0.5",
+        "@react-email/tailwind": "1.1.0",
         "@react-email/text": "0.1.5"
       },
       "engines": {
@@ -5072,9 +6166,9 @@
       }
     },
     "node_modules/@react-email/tailwind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@react-email/tailwind/-/tailwind-1.0.5.tgz",
-      "integrity": "sha512-BH00cZSeFfP9HiDASl+sPHi7Hh77W5nzDgdnxtsVr/m3uQD9g180UwxcE3PhOfx0vRdLzQUU8PtmvvDfbztKQg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@react-email/tailwind/-/tailwind-1.1.0.tgz",
+      "integrity": "sha512-m4sh5d1c8P9TPA6Ea8qHrboE5s9PmRQREIreYMn1l5ca0pCV/UBEY15e1RgoaseAzy2cy+gwI+nKhMwqUJsD1g==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
@@ -5472,9 +6566,9 @@
       "license": "MIT"
     },
     "node_modules/@swc/core": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.12.9.tgz",
-      "integrity": "sha512-O+LfT2JlVMsIMWG9x+rdxg8GzpzeGtCZQfXV7cKc1PjIKUkLFf1QJ7okuseA4f/9vncu37dQ2ZcRrPKy0Ndd5g==",
+      "version": "1.12.11",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.12.11.tgz",
+      "integrity": "sha512-P3GM+0lqjFctcp5HhR9mOcvLSX3SptI9L1aux0Fuvgt8oH4f92rCUrkodAa0U2ktmdjcyIiG37xg2mb/dSCYSA==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
@@ -5490,16 +6584,16 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.12.9",
-        "@swc/core-darwin-x64": "1.12.9",
-        "@swc/core-linux-arm-gnueabihf": "1.12.9",
-        "@swc/core-linux-arm64-gnu": "1.12.9",
-        "@swc/core-linux-arm64-musl": "1.12.9",
-        "@swc/core-linux-x64-gnu": "1.12.9",
-        "@swc/core-linux-x64-musl": "1.12.9",
-        "@swc/core-win32-arm64-msvc": "1.12.9",
-        "@swc/core-win32-ia32-msvc": "1.12.9",
-        "@swc/core-win32-x64-msvc": "1.12.9"
+        "@swc/core-darwin-arm64": "1.12.11",
+        "@swc/core-darwin-x64": "1.12.11",
+        "@swc/core-linux-arm-gnueabihf": "1.12.11",
+        "@swc/core-linux-arm64-gnu": "1.12.11",
+        "@swc/core-linux-arm64-musl": "1.12.11",
+        "@swc/core-linux-x64-gnu": "1.12.11",
+        "@swc/core-linux-x64-musl": "1.12.11",
+        "@swc/core-win32-arm64-msvc": "1.12.11",
+        "@swc/core-win32-ia32-msvc": "1.12.11",
+        "@swc/core-win32-x64-msvc": "1.12.11"
       },
       "peerDependencies": {
         "@swc/helpers": ">=0.5.17"
@@ -5511,9 +6605,9 @@
       }
     },
     "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.12.9.tgz",
-      "integrity": "sha512-GACFEp4nD6V+TZNR2JwbMZRHB+Yyvp14FrcmB6UCUYmhuNWjkxi+CLnEvdbuiKyQYv0zA+TRpCHZ+whEs6gwfA==",
+      "version": "1.12.11",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.12.11.tgz",
+      "integrity": "sha512-J19Jj9Y5x/N0loExH7W0OI9OwwoVyxutDdkyq1o/kgXyBqmmzV7Y/Q9QekI2Fm/qc5mNeAdP7aj4boY4AY/JPw==",
       "cpu": [
         "arm64"
       ],
@@ -5528,9 +6622,9 @@
       }
     },
     "node_modules/@swc/core-darwin-x64": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.12.9.tgz",
-      "integrity": "sha512-hv2kls7Ilkm2EpeJz+I9MCil7pGS3z55ZAgZfxklEuYsxpICycxeH+RNRv4EraggN44ms+FWCjtZFu0LGg2V3g==",
+      "version": "1.12.11",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.12.11.tgz",
+      "integrity": "sha512-PTuUQrfStQ6cjW+uprGO2lpQHy84/l0v+GqRqq8s/jdK55rFRjMfCeyf6FAR0l6saO5oNOQl+zWR1aNpj8pMQw==",
       "cpu": [
         "x64"
       ],
@@ -5545,9 +6639,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.12.9.tgz",
-      "integrity": "sha512-od9tDPiG+wMU9wKtd6y3nYJdNqgDOyLdgRRcrj1/hrbHoUPOM8wZQZdwQYGarw63iLXGgsw7t5HAF9Yc51ilFA==",
+      "version": "1.12.11",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.12.11.tgz",
+      "integrity": "sha512-poxBq152HsupOtnZilenvHmxZ9a8SRj4LtfxUnkMDNOGrZR9oxbQNwEzNKfi3RXEcXz+P8c0Rai1ubBazXv8oQ==",
       "cpu": [
         "arm"
       ],
@@ -5562,9 +6656,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.12.9.tgz",
-      "integrity": "sha512-6qx1ka9LHcLzxIgn2Mros+CZLkHK2TawlXzi/h7DJeNnzi8F1Hw0Yzjp8WimxNCg6s2n+o3jnmin1oXB7gg8rw==",
+      "version": "1.12.11",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.12.11.tgz",
+      "integrity": "sha512-y1HNamR/D0Hc8xIE910ysyLe269UYiGaQPoLjQS0phzWFfWdMj9bHM++oydVXZ4RSWycO7KyJ3uvw4NilvyMKQ==",
       "cpu": [
         "arm64"
       ],
@@ -5579,9 +6673,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.12.9.tgz",
-      "integrity": "sha512-yghFZWKPVVGbUdqiD7ft23G0JX6YFGDJPz9YbLLAwGuKZ9th3/jlWoQDAw1Naci31LQhVC+oIji6ozihSuwB2A==",
+      "version": "1.12.11",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.12.11.tgz",
+      "integrity": "sha512-LlBxPh/32pyQsu2emMEOFRm7poEFLsw12Y1mPY7FWZiZeptomKSOSHRzKDz9EolMiV4qhK1caP1lvW4vminYgQ==",
       "cpu": [
         "arm64"
       ],
@@ -5596,9 +6690,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.12.9.tgz",
-      "integrity": "sha512-SFUxyhWLZRNL8QmgGNqdi2Q43PNyFVkRZ2zIif30SOGFSxnxcf2JNeSeBgKIGVgaLSuk6xFVVCtJ3KIeaStgRg==",
+      "version": "1.12.11",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.12.11.tgz",
+      "integrity": "sha512-bOjiZB8O/1AzHkzjge1jqX62HGRIpOHqFUrGPfAln/NC6NR+Z2A78u3ixV7k5KesWZFhCV0YVGJL+qToL27myA==",
       "cpu": [
         "x64"
       ],
@@ -5613,9 +6707,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.12.9.tgz",
-      "integrity": "sha512-9FB0wM+6idCGTI20YsBNBg9xSWtkDBymnpaTCsZM3qDc0l4uOpJMqbfWhQvp17x7r/ulZfb2QY8RDvQmCL6AcQ==",
+      "version": "1.12.11",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.12.11.tgz",
+      "integrity": "sha512-4dzAtbT/m3/UjF045+33gLiHd8aSXJDoqof7gTtu4q0ZyAf7XJ3HHspz+/AvOJLVo4FHHdFcdXhmo/zi1nFn8A==",
       "cpu": [
         "x64"
       ],
@@ -5630,9 +6724,9 @@
       }
     },
     "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.12.9.tgz",
-      "integrity": "sha512-zHOusMVbOH9ik5RtRrMiGzLpKwxrPXgXkBm3SbUCa65HAdjV33NZ0/R9Rv1uPESALtEl2tzMYLUxYA5ECFDFhA==",
+      "version": "1.12.11",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.12.11.tgz",
+      "integrity": "sha512-h8HiwBZErKvCAmjW92JvQp0iOqm6bncU4ac5jxBGkRApabpUenNJcj3h2g5O6GL5K6T9/WhnXE5gyq/s1fhPQg==",
       "cpu": [
         "arm64"
       ],
@@ -5647,9 +6741,9 @@
       }
     },
     "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.12.9.tgz",
-      "integrity": "sha512-aWZf0PqE0ot7tCuhAjRkDFf41AzzSQO0x2xRfTbnhpROp57BRJ/N5eee1VULO/UA2PIJRG7GKQky5bSGBYlFug==",
+      "version": "1.12.11",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.12.11.tgz",
+      "integrity": "sha512-1pwr325mXRNUhxTtXmx1IokV5SiRL+6iDvnt3FRXj+X5UvXXKtg2zeyftk+03u8v8v8WUr5I32hIypVJPTNxNg==",
       "cpu": [
         "ia32"
       ],
@@ -5664,9 +6758,9 @@
       }
     },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.12.9.tgz",
-      "integrity": "sha512-C25fYftXOras3P3anSUeXXIpxmEkdAcsIL9yrr0j1xepTZ/yKwpnQ6g3coj8UXdeJy4GTVlR6+Ow/QiBgZQNOg==",
+      "version": "1.12.11",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.12.11.tgz",
+      "integrity": "sha512-5gggWo690Gvs7XiPxAmb5tHwzB9RTVXUV7AWoGb6bmyUd1OXYaebQF0HAOtade5jIoNhfQMQJ7QReRgt/d2jAA==",
       "cpu": [
         "x64"
       ],
@@ -5684,6 +6778,7 @@
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
       "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+      "dev": true,
       "license": "Apache-2.0"
     },
     "node_modules/@swc/helpers": {
@@ -5709,23 +6804,23 @@
       }
     },
     "node_modules/@testcontainers/postgresql": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/@testcontainers/postgresql/-/postgresql-11.0.3.tgz",
-      "integrity": "sha512-nMq0lBLguZecp9JDV4J8nlPWwxOQ4XiXUIGkV5Lvj1CMdVqbqQJe4eVrNHVC3rIM/w8nadNp5ecEoxnwkhG33w==",
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/@testcontainers/postgresql/-/postgresql-11.2.1.tgz",
+      "integrity": "sha512-u0XLsjUmAHaUmB9Q1bitBu8uoxRKteDI65S5/zpJ6TeZabx9qB4EENwKqzuqEwOCzzlko9at7ZY4frwRcchgvA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "testcontainers": "^11.0.3"
+        "testcontainers": "^11.2.1"
       }
     },
     "node_modules/@testcontainers/redis": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/@testcontainers/redis/-/redis-11.0.3.tgz",
-      "integrity": "sha512-0TTXdnzvH55nMc7wj5s+3e/h29M5EEZ7cQAoCR16ZzQgzcLlXFTCIzSi02EkSZYrxayaToXrBdWCc6skisFzZw==",
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/@testcontainers/redis/-/redis-11.2.1.tgz",
+      "integrity": "sha512-Q5j+irNw0BLec3he30s2E0fhE06Zr9ROVutkyKUgcwQoZxEVW3xV69ke2AFCT5teEcIvTKqevObN4UDkq33Qow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "testcontainers": "^11.0.3"
+        "testcontainers": "^11.2.1"
       }
     },
     "node_modules/@tokenizer/inflate": {
@@ -5813,9 +6908,9 @@
       "license": "MIT"
     },
     "node_modules/@types/aws-lambda": {
-      "version": "8.10.147",
-      "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.147.tgz",
-      "integrity": "sha512-nD0Z9fNIZcxYX5Mai2CTmFD7wX7UldCkW2ezCF8D1T5hdiLsnTWDGRpfRYntU6VjTdLQjOvyszru7I1c1oCQew==",
+      "version": "8.10.150",
+      "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.150.tgz",
+      "integrity": "sha512-AX+AbjH/rH5ezX1fbK8onC/a+HyQHo7QGmvoxAE42n22OsciAxvZoZNEr22tbXs8WfP1nIsBjKDpgPm3HjOZbA==",
       "license": "MIT"
     },
     "node_modules/@types/bcrypt": {
@@ -5923,9 +7018,9 @@
       }
     },
     "node_modules/@types/dockerode": {
-      "version": "3.3.41",
-      "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.41.tgz",
-      "integrity": "sha512-5kOi6bcnEjqfJ68ZNV/bBvSMLNIucc0XbRmBO4hg5OoFCoP99eSRcbMysjkzV7ZxQEmmc/zMnv4A7odwuKFzDA==",
+      "version": "3.3.42",
+      "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.42.tgz",
+      "integrity": "sha512-U1jqHMShibMEWHdxYhj3rCMNCiLx5f35i4e3CEUuW+JSSszc/tVqc6WCAPdhwBymG5R/vgbcceagK0St7Cq6Eg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6093,9 +7188,9 @@
       }
     },
     "node_modules/@types/mysql": {
-      "version": "2.15.26",
-      "resolved": "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.26.tgz",
-      "integrity": "sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==",
+      "version": "2.15.27",
+      "resolved": "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.27.tgz",
+      "integrity": "sha512-YfWiV16IY0OeBfBCk8+hXKmdTKrKlwKN1MNKAPBu5JYxLwBEZl7QzeEpGnlZb3VMGJrrGmB84gXiH+ofs/TezA==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -6140,14 +7235,14 @@
       }
     },
     "node_modules/@types/pg": {
-      "version": "8.15.1",
-      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.15.1.tgz",
-      "integrity": "sha512-YKHrkGWBX5+ivzvOQ66I0fdqsQTsvxqM0AGP2i0XrVZ9DP5VA/deEbTf7VuLPGpY7fJB9uGbkZ6KjVhuHcrTkQ==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.15.4.tgz",
+      "integrity": "sha512-I6UNVBAoYbvuWkkU3oosC8yxqH21f4/Jc4DK71JLG3dT2mdlGe1z+ep/LQGXaKaOgcvUrsQoPRqfgtMcvZiJhg==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "pg-protocol": "*",
-        "pg-types": "^4.0.1"
+        "pg-types": "^2.2.0"
       }
     },
     "node_modules/@types/pg-pool": {
@@ -6344,17 +7439,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
-      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.36.0.tgz",
+      "integrity": "sha512-lZNihHUVB6ZZiPBNgOQGSxUASI7UJWhT8nHyUGCnaQ28XFCw98IfrMCG3rUl1uwUWoAvodJQby2KTs79UTcrAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/type-utils": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/type-utils": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -6368,7 +7463,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.35.1",
+        "@typescript-eslint/parser": "^8.36.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
@@ -6384,16 +7479,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
-      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.36.0.tgz",
+      "integrity": "sha512-FuYgkHwZLuPbZjQHzJXrtXreJdFMKl16BFYyRrLxDhWr6Qr7Kbcu2s1Yhu8tsiMXw1S0W1pjfFfYEt+R604s+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/typescript-estree": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6409,14 +7504,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
-      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
+      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.1",
-        "@typescript-eslint/types": "^8.35.1",
+        "@typescript-eslint/tsconfig-utils": "^8.36.0",
+        "@typescript-eslint/types": "^8.36.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -6431,14 +7526,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
-      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
+      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1"
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6449,9 +7544,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
-      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
+      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6466,14 +7561,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
-      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.36.0.tgz",
+      "integrity": "sha512-5aaGYG8cVDd6cxfk/ynpYzxBRZJk7w/ymto6uiyUFtdCozQIsQWh7M28/6r57Fwkbweng8qAzoMCPwSJfWlmsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -6490,9 +7585,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
-      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
+      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6504,16 +7599,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
-      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
+      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.35.1",
-        "@typescript-eslint/tsconfig-utils": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/project-service": "8.36.0",
+        "@typescript-eslint/tsconfig-utils": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -6559,16 +7654,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
-      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz",
+      "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1"
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/typescript-estree": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6583,13 +7678,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
-      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
+      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/types": "8.36.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -7749,9 +8844,9 @@
       }
     },
     "node_modules/bullmq": {
-      "version": "5.56.0",
-      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.56.0.tgz",
-      "integrity": "sha512-j5ct2tdc9M8PKcjhJw+euO24BsO1wXBAkNGXYI1R1qvh7FvRldZ5wtLixLWqQ4/crafj0Vrwi+y1kXFXMwBJFA==",
+      "version": "5.56.2",
+      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.56.2.tgz",
+      "integrity": "sha512-bq0PSxPCWeNlFBc5yjBs3eR+e6GxIEIeHY0xxq6WELzG65GPjL+A2ni1NS7NroKsur0C3UJdabw51IswiSTSYw==",
       "license": "MIT",
       "dependencies": {
         "cron-parser": "^4.9.0",
@@ -7958,6 +9053,7 @@
       "version": "1.0.30001724",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001724.tgz",
       "integrity": "sha512-WqJo7p0TbHDOythNTqYujmaJTvtYRZrjpP8TCvH6Vb9CYJerJNKamKzIWOM4BkQatWj9H2lYulpdAQNBe7QhNA==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -8096,6 +9192,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/citty": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/citty/-/citty-0.1.6.tgz",
+      "integrity": "sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==",
+      "license": "MIT",
+      "dependencies": {
+        "consola": "^3.2.3"
+      }
+    },
     "node_modules/cjs-module-lexer": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
@@ -8192,12 +9297,6 @@
         "node": ">= 12"
       }
     },
-    "node_modules/client-only": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz",
-      "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==",
-      "license": "MIT"
-    },
     "node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -8464,6 +9563,12 @@
         "node": ">= 6"
       }
     },
+    "node_modules/confbox": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.2.tgz",
+      "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==",
+      "license": "MIT"
+    },
     "node_modules/consola": {
       "version": "3.4.2",
       "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz",
@@ -8669,6 +9774,15 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/cron/node_modules/luxon": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
+      "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -9967,6 +11081,12 @@
         "node": ">=6.6.0"
       }
     },
+    "node_modules/exsolve": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.7.tgz",
+      "integrity": "sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==",
+      "license": "MIT"
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -11683,6 +12803,15 @@
         "json-buffer": "3.0.1"
       }
     },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/kysely": {
       "version": "0.28.2",
       "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.28.2.tgz",
@@ -11919,9 +13048,9 @@
       "license": "ISC"
     },
     "node_modules/luxon": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
-      "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz",
+      "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -12716,69 +13845,6 @@
         "@nestjs/core": ">= 11 < 12"
       }
     },
-    "node_modules/next": {
-      "version": "15.3.4",
-      "resolved": "https://registry.npmjs.org/next/-/next-15.3.4.tgz",
-      "integrity": "sha512-mHKd50C+mCjam/gcnwqL1T1vPx/XQNFlXqFIVdgQdVAFY9iIQtY0IfaVflEYzKiqjeA7B0cYYMaCrmAYFjs4rA==",
-      "license": "MIT",
-      "dependencies": {
-        "@next/env": "15.3.4",
-        "@swc/counter": "0.1.3",
-        "@swc/helpers": "0.5.15",
-        "busboy": "1.6.0",
-        "caniuse-lite": "^1.0.30001579",
-        "postcss": "8.4.31",
-        "styled-jsx": "5.1.6"
-      },
-      "bin": {
-        "next": "dist/bin/next"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
-      },
-      "optionalDependencies": {
-        "@next/swc-darwin-arm64": "15.3.4",
-        "@next/swc-darwin-x64": "15.3.4",
-        "@next/swc-linux-arm64-gnu": "15.3.4",
-        "@next/swc-linux-arm64-musl": "15.3.4",
-        "@next/swc-linux-x64-gnu": "15.3.4",
-        "@next/swc-linux-x64-musl": "15.3.4",
-        "@next/swc-win32-arm64-msvc": "15.3.4",
-        "@next/swc-win32-x64-msvc": "15.3.4",
-        "sharp": "^0.34.1"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.1.0",
-        "@playwright/test": "^1.41.2",
-        "babel-plugin-react-compiler": "*",
-        "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0",
-        "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0",
-        "sass": "^1.3.0"
-      },
-      "peerDependenciesMeta": {
-        "@opentelemetry/api": {
-          "optional": true
-        },
-        "@playwright/test": {
-          "optional": true
-        },
-        "babel-plugin-react-compiler": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/next/node_modules/@swc/helpers": {
-      "version": "0.5.15",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz",
-      "integrity": "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.8.0"
-      }
-    },
     "node_modules/node-abi": {
       "version": "3.75.0",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz",
@@ -12944,9 +14010,9 @@
       "license": "MIT"
     },
     "node_modules/nodemailer": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.4.tgz",
-      "integrity": "sha512-9O00Vh89/Ld2EcVCqJ/etd7u20UhME0f/NToPfArwPEe1Don1zy4mAIz6ariRr7mJ2RDxtaDzN0WJVdVXPtZaw==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.5.tgz",
+      "integrity": "sha512-nsrh2lO3j4GkLLXoeEksAMgAOqxOv6QumNRVQTJwKH4nuiww6iC2y7GyANs9kRAxCexg3+lTWM3PZ91iLlVjfg==",
       "license": "MIT-0",
       "engines": {
         "node": ">=6.0.0"
@@ -13006,6 +14072,25 @@
       "optional": true,
       "peer": true
     },
+    "node_modules/nypm": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.0.tgz",
+      "integrity": "sha512-mn8wBFV9G9+UFHIrq+pZ2r2zL4aPau/by3kJb3cM7+5tQHMt6HGQB8FDIeKFYp8o0D2pnH6nVsO88N4AmUxIWg==",
+      "license": "MIT",
+      "dependencies": {
+        "citty": "^0.1.6",
+        "consola": "^3.4.0",
+        "pathe": "^2.0.3",
+        "pkg-types": "^2.0.0",
+        "tinyexec": "^0.3.2"
+      },
+      "bin": {
+        "nypm": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": "^14.16.0 || >=16.10.0"
+      }
+    },
     "node_modules/oauth4webapi": {
       "version": "3.5.5",
       "resolved": "https://registry.npmjs.org/oauth4webapi/-/oauth4webapi-3.5.5.tgz",
@@ -13051,12 +14136,6 @@
       "integrity": "sha512-42CPE9AhahZRsMNslczq0ctAEtqk8Eka26QofnqC346BZdHDySk3LWka23LI7ULIw11NmltpiLagIq8gBozxTw==",
       "license": "MIT"
     },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "license": "MIT"
-    },
     "node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
@@ -13417,7 +14496,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
       "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/pathval": {
@@ -13501,15 +14579,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/pg-numeric": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pg-numeric/-/pg-numeric-1.0.2.tgz",
-      "integrity": "sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/pg-pool": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz",
@@ -13526,24 +14595,6 @@
       "license": "MIT"
     },
     "node_modules/pg-types": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-4.0.2.tgz",
-      "integrity": "sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng==",
-      "license": "MIT",
-      "dependencies": {
-        "pg-int8": "1.0.1",
-        "pg-numeric": "1.0.2",
-        "postgres-array": "~3.0.1",
-        "postgres-bytea": "~3.0.0",
-        "postgres-date": "~2.1.0",
-        "postgres-interval": "^3.0.0",
-        "postgres-range": "^1.1.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/pg/node_modules/pg-types": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
       "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
@@ -13559,45 +14610,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/pg/node_modules/postgres-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
-      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pg/node_modules/postgres-bytea": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
-      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pg/node_modules/postgres-date": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
-      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pg/node_modules/postgres-interval": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
-      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
-      "license": "MIT",
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/pgpass": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
@@ -13643,6 +14655,17 @@
         "node": ">= 6"
       }
     },
+    "node_modules/pkg-types": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz",
+      "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==",
+      "license": "MIT",
+      "dependencies": {
+        "confbox": "^0.2.2",
+        "exsolve": "^1.0.7",
+        "pathe": "^2.0.3"
+      }
+    },
     "node_modules/pluralize": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
@@ -13829,50 +14852,44 @@
       }
     },
     "node_modules/postgres-array": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-3.0.4.tgz",
-      "integrity": "sha512-nAUSGfSDGOaOAEGwqsRY27GPOea7CNipJPOA7lPbdEpx5Kg3qzdP0AaWC5MlhTWV9s4hFX39nomVZ+C4tnGOJQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
       "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=4"
       }
     },
     "node_modules/postgres-bytea": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-3.0.0.tgz",
-      "integrity": "sha512-CNd4jim9RFPkObHSjVHlVrxoVQXz7quwNFpz7RY1okNNme49+sVyiTvTRobiLV548Hx/hb1BG+iE7h9493WzFw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
       "license": "MIT",
-      "dependencies": {
-        "obuf": "~1.1.2"
-      },
       "engines": {
-        "node": ">= 6"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/postgres-date": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-2.1.0.tgz",
-      "integrity": "sha512-K7Juri8gtgXVcDfZttFKVmhglp7epKb1K4pgrkLxehjqkrgPhfG6OO8LHLkfaqkbpjNRnra018XwAr1yQFWGcA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
       "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/postgres-interval": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-3.0.0.tgz",
-      "integrity": "sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
       "license": "MIT",
+      "dependencies": {
+        "xtend": "^4.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/postgres-range": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/postgres-range/-/postgres-range-1.1.4.tgz",
-      "integrity": "sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==",
-      "license": "MIT"
-    },
     "node_modules/prebuild-install": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
@@ -14055,6 +15072,19 @@
         "node": ">=10"
       }
     },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "license": "MIT",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/proper-lockfile": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz",
@@ -14306,9 +15336,9 @@
       }
     },
     "node_modules/react-email": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/react-email/-/react-email-4.0.17.tgz",
-      "integrity": "sha512-Wppdxgio/QKNe3piccIhk6jvgiLwfOTAwud5t/NlWL8wepsirgXo09OyZCz62Qb9flFNBw+Hz5ahOkpk3JaizQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/react-email/-/react-email-4.1.0.tgz",
+      "integrity": "sha512-UvG5z1/gNOsLNwKPO87vgMoF7tdzUGd0kIy4fozzdBBsyLUju7hNVLBRm9j+Li/CwP5CXFT8Y5jZBtIFvSyr0w==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.27.0",
@@ -14319,16 +15349,18 @@
         "debounce": "^2.0.0",
         "esbuild": "^0.25.0",
         "glob": "^11.0.0",
+        "jiti": "2.4.2",
         "log-symbols": "^7.0.0",
         "mime-types": "^3.0.0",
-        "next": "^15.3.1",
         "normalize-path": "^3.0.0",
+        "nypm": "0.6.0",
         "ora": "^8.0.0",
+        "prompts": "2.4.2",
         "socket.io": "^4.8.1",
         "tsconfig-paths": "4.2.0"
       },
       "bin": {
-        "email": "dist/cli/index.mjs"
+        "email": "dist/index.js"
       },
       "engines": {
         "node": ">=18.0.0"
@@ -14400,6 +15432,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/react-email/node_modules/jiti": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
+      "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
+      "license": "MIT",
+      "bin": {
+        "jiti": "lib/jiti-cli.mjs"
+      }
+    },
     "node_modules/react-email/node_modules/log-symbols": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-7.0.1.tgz",
@@ -15399,6 +16440,12 @@
         "node": ">=18"
       }
     },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "license": "MIT"
+    },
     "node_modules/slice-source": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/slice-source/-/slice-source-0.4.1.tgz",
@@ -15989,29 +17036,6 @@
         "url": "https://github.com/sponsors/Borewit"
       }
     },
-    "node_modules/styled-jsx": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.6.tgz",
-      "integrity": "sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==",
-      "license": "MIT",
-      "dependencies": {
-        "client-only": "0.0.1"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "peerDependencies": {
-        "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "babel-plugin-macros": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/sucrase": {
       "version": "3.35.0",
       "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
@@ -16110,9 +17134,9 @@
       }
     },
     "node_modules/superagent": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.2.1.tgz",
-      "integrity": "sha512-O+PCv11lgTNJUzy49teNAWLjBZfc+A1enOwTpLlH6/rsvKcTwcdTT8m9azGkVqM7HBl5jpyZ7KTPhHweokBcdg==",
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.2.2.tgz",
+      "integrity": "sha512-vWMq11OwWCC84pQaFPzF/VO3BrjkCeewuvJgt1jfV0499Z1QSAWN4EqfMM5WlFDDX9/oP8JjlDKpblrmEoyu4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16131,14 +17155,14 @@
       }
     },
     "node_modules/supertest": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.1.tgz",
-      "integrity": "sha512-aI59HBTlG9e2wTjxGJV+DygfNLgnWbGdZxiA/sgrnNNikIW8lbDvCtF6RnhZoJ82nU7qv7ZLjrvWqCEm52fAmw==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.3.tgz",
+      "integrity": "sha512-ORY0gPa6ojmg/C74P/bDoS21WL6FMXq5I8mawkEz30/zkwdu0gOeqstFy316vHG6OKxqQ+IbGneRemHI8WraEw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "methods": "^1.1.2",
-        "superagent": "^10.2.1"
+        "superagent": "^10.2.2"
       },
       "engines": {
         "node": ">=14.18.0"
@@ -16441,9 +17465,9 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.10.tgz",
-      "integrity": "sha512-C1SwlQGNLe/jPNqapK8epDsXME7CAJR5RL3GcE6KWx1d9OUByzoHVcbu1VPI8tevg9H8Alae0AApHHFGzrD5zA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.0.tgz",
+      "integrity": "sha512-5Mty5y/sOF1YWj1J6GiBodjlDc05CUR8PKXrsnFAiSG0xA+GHeWLovaZPYUDXkH/1iKRf2+M5+OrRgzC7O9b7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16714,14 +17738,14 @@
       }
     },
     "node_modules/testcontainers": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-11.0.3.tgz",
-      "integrity": "sha512-Xu6ZAaE1FaLyHzFSYdCsd+xMPxUegUjkum0r6zgO8SinnFDHRX/PllIHMt1D+DVUmJqBvPQI6vge/J5jgE5vng==",
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-11.2.1.tgz",
+      "integrity": "sha512-KJALGi8ButKDZgzHr0PtJUVNBOSlSFncumZ34MCQTN4VEU9AK4tWTn9gCcAFzG4zBmzzC2aEbHMFUujqkbDvBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@balena/dockerignore": "^1.0.2",
-        "@types/dockerode": "^3.3.39",
+        "@types/dockerode": "^3.3.42",
         "archiver": "^7.0.1",
         "async-lock": "^1.4.1",
         "byline": "^5.0.0",
@@ -16732,9 +17756,9 @@
         "proper-lockfile": "^4.1.2",
         "properties-reader": "^2.3.0",
         "ssh-remote-port-forward": "^1.0.4",
-        "tar-fs": "^3.0.9",
+        "tar-fs": "^3.1.0",
         "tmp": "^0.2.3",
-        "undici": "^7.10.0"
+        "undici": "^7.11.0"
       }
     },
     "node_modules/testcontainers/node_modules/tmp": {
@@ -16807,7 +17831,6 @@
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
       "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
@@ -17363,15 +18386,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.1.tgz",
-      "integrity": "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.36.0.tgz",
+      "integrity": "sha512-fTCqxthY+h9QbEgSIBfL9iV6CvKDFuoxg6bHPNpJ9HIUzS+jy2lCEyCmGyZRWEBSaykqcDPf1SJ+BfCI8DRopA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.35.1",
-        "@typescript-eslint/parser": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1"
+        "@typescript-eslint/eslint-plugin": "8.36.0",
+        "@typescript-eslint/parser": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -17485,9 +18508,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "7.10.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.10.0.tgz",
-      "integrity": "sha512-u5otvFBOBZvmdjWLVW+5DAc9Nkq8f24g0O9oY7qw2JVIF1VocIFoyz9JFkuVOS2j41AufeO0xnlweJ2RLT8nGw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.11.0.tgz",
+      "integrity": "sha512-heTSIac3iLhsmZhUCjyS3JQEkZELateufzZuBaVM5RHXdSBMb1LPMQf5x+FH7qjsZYDP0ttAc3nnVpUB+wYbOg==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/server/package.json b/server/package.json
index ab8424329f..c765786960 100644
--- a/server/package.json
+++ b/server/package.json
@@ -44,18 +44,18 @@
     "@nestjs/swagger": "^11.0.2",
     "@nestjs/websockets": "^11.0.4",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.60.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.62.0",
     "@opentelemetry/context-async-hooks": "^2.0.0",
-    "@opentelemetry/exporter-prometheus": "^0.202.0",
-    "@opentelemetry/instrumentation-http": "^0.202.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.50.0",
-    "@opentelemetry/instrumentation-nestjs-core": "^0.48.0",
-    "@opentelemetry/instrumentation-pg": "^0.54.0",
+    "@opentelemetry/exporter-prometheus": "^0.203.0",
+    "@opentelemetry/instrumentation-http": "^0.203.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.51.0",
+    "@opentelemetry/instrumentation-nestjs-core": "^0.49.0",
+    "@opentelemetry/instrumentation-pg": "^0.55.0",
     "@opentelemetry/resources": "^2.0.1",
     "@opentelemetry/sdk-metrics": "^2.0.1",
-    "@opentelemetry/sdk-node": "^0.202.0",
+    "@opentelemetry/sdk-node": "^0.203.0",
     "@opentelemetry/semantic-conventions": "^1.34.0",
-    "@react-email/components": "^0.1.0",
+    "@react-email/components": "^0.2.0",
     "@react-email/render": "^1.1.2",
     "@socket.io/redis-adapter": "^8.3.0",
     "archiver": "^7.0.0",
diff --git a/web/package-lock.json b/web/package-lock.json
index 6bf70e96da..9a23ec249b 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -68,7 +68,7 @@
         "dotenv": "^16.4.7",
         "eslint": "^9.18.0",
         "eslint-config-prettier": "^10.0.0",
-        "eslint-p": "^0.24.0",
+        "eslint-p": "^0.25.0",
         "eslint-plugin-compat": "^6.0.2",
         "eslint-plugin-svelte": "^3.9.0",
         "eslint-plugin-unicorn": "^59.0.0",
@@ -666,31 +666,6 @@
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@eslint/config-array": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
-      "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@eslint/object-schema": "^2.1.6",
-        "debug": "^4.3.1",
-        "minimatch": "^3.1.2"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
-    "node_modules/@eslint/config-helpers": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
-      "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
     "node_modules/@eslint/core": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
@@ -2185,9 +2160,9 @@
       }
     },
     "node_modules/@sveltejs/kit": {
-      "version": "2.22.2",
-      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.22.2.tgz",
-      "integrity": "sha512-2MvEpSYabUrsJAoq5qCOBGAlkICjfjunrnLcx3YAk2XV7TvAIhomlKsAgR4H/4uns5rAfYmj7Wet5KRtc8dPIg==",
+      "version": "2.22.4",
+      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.22.4.tgz",
+      "integrity": "sha512-BXK9hTbP8AeQIfoz6+P3uoyVYStVHc5CIKqoTSF7hXm3Q5P9BwFMdEus4jsQuhaYmXGHzukcGlxe2QrsE8BJfQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2202,8 +2177,7 @@
         "mrmime": "^2.0.0",
         "sade": "^1.8.1",
         "set-cookie-parser": "^2.6.0",
-        "sirv": "^3.0.0",
-        "vitefu": "^1.0.6"
+        "sirv": "^3.0.0"
       },
       "bin": {
         "svelte-kit": "svelte-kit.js"
@@ -2944,17 +2918,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
-      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.36.0.tgz",
+      "integrity": "sha512-lZNihHUVB6ZZiPBNgOQGSxUASI7UJWhT8nHyUGCnaQ28XFCw98IfrMCG3rUl1uwUWoAvodJQby2KTs79UTcrAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/type-utils": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/type-utils": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -2968,11 +2942,187 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.35.1",
+        "@typescript-eslint/parser": "^8.36.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/project-service": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
+      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.36.0",
+        "@typescript-eslint/types": "^8.36.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
+      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
+      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.36.0.tgz",
+      "integrity": "sha512-5aaGYG8cVDd6cxfk/ynpYzxBRZJk7w/ymto6uiyUFtdCozQIsQWh7M28/6r57Fwkbweng8qAzoMCPwSJfWlmsg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
+      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
+      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.36.0",
+        "@typescript-eslint/tsconfig-utils": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz",
+      "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/typescript-estree": "8.36.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
+      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.36.0",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
       "version": "7.0.5",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
@@ -2983,17 +3133,33 @@
         "node": ">= 4"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
-      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.36.0.tgz",
+      "integrity": "sha512-FuYgkHwZLuPbZjQHzJXrtXreJdFMKl16BFYyRrLxDhWr6Qr7Kbcu2s1Yhu8tsiMXw1S0W1pjfFfYEt+R604s+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/typescript-estree": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3008,15 +3174,159 @@
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
-    "node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
-      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
+      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.1",
-        "@typescript-eslint/types": "^8.35.1",
+        "@typescript-eslint/tsconfig-utils": "^8.36.0",
+        "@typescript-eslint/types": "^8.36.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
+      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
+      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
+      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
+      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.36.0",
+        "@typescript-eslint/tsconfig-utils": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
+      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.36.0",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.37.0.tgz",
+      "integrity": "sha512-BIUXYsbkl5A1aJDdYJCBAo8rCEbAvdquQ8AnLb6z5Lp1u3x5PNgSSx9A/zqYc++Xnr/0DVpls8iQ2cJs/izTXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.37.0",
+        "@typescript-eslint/types": "^8.37.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3031,14 +3341,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
-      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.37.0.tgz",
+      "integrity": "sha512-0vGq0yiU1gbjKob2q691ybTg9JX6ShiVXAAfm2jGf3q0hdP6/BruaFjL/ManAR/lj05AvYCH+5bbVo0VtzmjOA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1"
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3049,9 +3359,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
-      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.37.0.tgz",
+      "integrity": "sha512-1/YHvAVTimMM9mmlPvTec9NP4bobA1RkDbMydxG8omqwJJLEW/Iy2C4adsAESIXU3WGLXFHSZUU+C9EoFWl4Zg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3066,14 +3376,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
-      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.37.0.tgz",
+      "integrity": "sha512-SPkXWIkVZxhgwSwVq9rqj/4VFo7MnWwVaRNznfQDc/xPYHjXnPfLWn+4L6FF1cAz6e7dsqBeMawgl7QjUMj4Ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -3090,9 +3401,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
-      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz",
+      "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3104,16 +3415,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
-      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.37.0.tgz",
+      "integrity": "sha512-zuWDMDuzMRbQOM+bHyU4/slw27bAUEcKSKKs3hcv2aNnc/tvE/h7w60dwVw8vnal2Pub6RT1T7BI8tFZ1fE+yg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.35.1",
-        "@typescript-eslint/tsconfig-utils": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/project-service": "8.37.0",
+        "@typescript-eslint/tsconfig-utils": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -3159,16 +3470,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
-      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.37.0.tgz",
+      "integrity": "sha512-TSFvkIW6gGjN2p6zbXo20FzCABbyUAuq6tBvNRGsKdsSQ6a7rnV6ADfZ7f4iI3lIiXc4F4WWvtUfDw9CJ9pO5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1"
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3183,13 +3494,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
-      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.37.0.tgz",
+      "integrity": "sha512-YzfhzcTnZVPiLfP/oeKtDp2evwvHLMe0LOy7oe+hb9KKIumLNohYS9Hgp1ifwpu42YWxhZE8yieggz6JpqO/1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/types": "8.37.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -4796,13 +5107,13 @@
       }
     },
     "node_modules/eslint-p": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/eslint-p/-/eslint-p-0.24.0.tgz",
-      "integrity": "sha512-I0UgYBOqckfo9RQSIgwL+fhOG+Nllo18YyCA8qBL0rgrTh3ZFPRCm8/eJQry5I+EQzL0TnGpY/dfbUvf1Ozx5g==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/eslint-p/-/eslint-p-0.25.0.tgz",
+      "integrity": "sha512-e7oYgXN/tgtoaR3tZ0R2dKyPJtf5J41hYKsgpsBtwpi0t2Cxjf3l8G2QwrXCDwQTFVXW1hmD55hAqQZxiId1XA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "eslint": "9.28.0"
+        "eslint": "9.30.1"
       },
       "bin": {
         "eslint-p": "lib/eslint-p.js"
@@ -4811,80 +5122,6 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/eslint-p/node_modules/@eslint/js": {
-      "version": "9.28.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.28.0.tgz",
-      "integrity": "sha512-fnqSjGWd/CoIp4EXIxWVK/sHA6DOHN4+8Ix2cX5ycOY7LG0UY8nHCU5pIp2eaE1Mc7Qd8kHspYNzYXT2ojPLzg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://eslint.org/donate"
-      }
-    },
-    "node_modules/eslint-p/node_modules/eslint": {
-      "version": "9.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.28.0.tgz",
-      "integrity": "sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.0",
-        "@eslint/config-helpers": "^0.2.1",
-        "@eslint/core": "^0.14.0",
-        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.28.0",
-        "@eslint/plugin-kit": "^0.3.1",
-        "@humanfs/node": "^0.16.6",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.4.2",
-        "@types/estree": "^1.0.6",
-        "@types/json-schema": "^7.0.15",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.6",
-        "debug": "^4.3.2",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
-        "esquery": "^1.5.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^8.0.0",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://eslint.org/donate"
-      },
-      "peerDependencies": {
-        "jiti": "*"
-      },
-      "peerDependenciesMeta": {
-        "jiti": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/eslint-plugin-compat": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-6.0.2.tgz",
@@ -6795,9 +7032,9 @@
       }
     },
     "node_modules/luxon": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
-      "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz",
+      "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -8800,9 +9037,9 @@
       }
     },
     "node_modules/svelte": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.35.0.tgz",
-      "integrity": "sha512-zgtdzln2aPYbsyeeFSjiQVrojZZU2iPYu07FRzfNme7NCBWo00Xn3B5JP/wMhhYG7nK8BZfrqREfoJRHYAOA5w==",
+      "version": "5.35.5",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.35.5.tgz",
+      "integrity": "sha512-KuRvI82rhh0RMz1EKsUJD96gZyHJ+h2+8zrwO8iqE/p/CmcNKvIItDUAeUePhuCDgtegDJmF8IKThbHIfmTgTA==",
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
@@ -8814,7 +9051,7 @@
         "axobject-query": "^4.1.0",
         "clsx": "^2.1.1",
         "esm-env": "^1.2.1",
-        "esrap": "^2.0.0",
+        "esrap": "^2.1.0",
         "is-reference": "^3.0.3",
         "locate-character": "^3.0.0",
         "magic-string": "^0.30.11",
@@ -8908,9 +9145,9 @@
       }
     },
     "node_modules/svelte-maplibre": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/svelte-maplibre/-/svelte-maplibre-1.1.0.tgz",
-      "integrity": "sha512-Qo6ASfa2vCaqShlFP7rDbXxBTrI4iP0jsyRhLXryLS5WOD/G0XI6ByW4kMTydcgMqdox7CmsKZLKT9V3hQ3VCA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/svelte-maplibre/-/svelte-maplibre-1.2.0.tgz",
+      "integrity": "sha512-JKYzL0glnqCJ7LwkdDAMb3jdZdFl8ZDHEZyc043BV624kG9ZVaXlIPgjb8sNktqx1D0rQBNrYNt5rR4XszNCiQ==",
       "license": "MIT",
       "dependencies": {
         "d3-geo": "^3.1.0",
@@ -9364,15 +9601,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.1.tgz",
-      "integrity": "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==",
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.36.0.tgz",
+      "integrity": "sha512-fTCqxthY+h9QbEgSIBfL9iV6CvKDFuoxg6bHPNpJ9HIUzS+jy2lCEyCmGyZRWEBSaykqcDPf1SJ+BfCI8DRopA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.35.1",
-        "@typescript-eslint/parser": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1"
+        "@typescript-eslint/eslint-plugin": "8.36.0",
+        "@typescript-eslint/parser": "8.36.0",
+        "@typescript-eslint/utils": "8.36.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9386,6 +9623,174 @@
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/project-service": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
+      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.36.0",
+        "@typescript-eslint/types": "^8.36.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
+      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
+      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/types": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
+      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
+      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.36.0",
+        "@typescript-eslint/tsconfig-utils": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/visitor-keys": "8.36.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/utils": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz",
+      "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.36.0",
+        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/typescript-estree": "8.36.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.36.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
+      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.36.0",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/typescript-eslint/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/uglify-js": {
       "version": "3.19.3",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
diff --git a/web/package.json b/web/package.json
index 019f651305..3436a75ca1 100644
--- a/web/package.json
+++ b/web/package.json
@@ -85,7 +85,7 @@
     "dotenv": "^16.4.7",
     "eslint": "^9.18.0",
     "eslint-config-prettier": "^10.0.0",
-    "eslint-p": "^0.24.0",
+    "eslint-p": "^0.25.0",
     "eslint-plugin-compat": "^6.0.2",
     "eslint-plugin-svelte": "^3.9.0",
     "eslint-plugin-unicorn": "^59.0.0",

From daea57f7d290e4abfd999d6367c389fa0264e136 Mon Sep 17 00:00:00 2001
From: Hamish <133548095+Hamster45105@users.noreply.github.com>
Date: Tue, 15 Jul 2025 23:32:43 +1000
Subject: [PATCH 206/337] feat(web): better coordinate parsing (#19832)

feat: better coordinate parsing
---
 web/package-lock.json                         |  7 ++++++
 web/package.json                              |  1 +
 .../coordinates-input.svelte                  | 25 ++++++++++---------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index 9a23ec249b..2bd5409903 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -25,6 +25,7 @@
         "async-mutex": "^0.5.0",
         "dom-to-image": "^2.6.0",
         "fabric": "^6.5.4",
+        "geo-coordinates-parser": "^1.7.4",
         "geojson": "^0.5.0",
         "handlebars": "^4.7.8",
         "happy-dom": "^18.0.1",
@@ -5778,6 +5779,12 @@
         "node": ">=10"
       }
     },
+    "node_modules/geo-coordinates-parser": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/geo-coordinates-parser/-/geo-coordinates-parser-1.7.4.tgz",
+      "integrity": "sha512-gVGxBW+s1csexXVMf5bIwz3TH9n4sCEglOOOqmrPk8YazUI5f79jCowKjTw05m/0h1//3+Z2m/nv8IIozgZyUw==",
+      "license": "MIT"
+    },
     "node_modules/geojson": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/geojson/-/geojson-0.5.0.tgz",
diff --git a/web/package.json b/web/package.json
index 3436a75ca1..c63c52a916 100644
--- a/web/package.json
+++ b/web/package.json
@@ -42,6 +42,7 @@
     "async-mutex": "^0.5.0",
     "dom-to-image": "^2.6.0",
     "fabric": "^6.5.4",
+    "geo-coordinates-parser": "^1.7.4",
     "geojson": "^0.5.0",
     "handlebars": "^4.7.8",
     "happy-dom": "^18.0.1",
diff --git a/web/src/lib/components/shared-components/coordinates-input.svelte b/web/src/lib/components/shared-components/coordinates-input.svelte
index b3170e3ecf..9e71197dd5 100644
--- a/web/src/lib/components/shared-components/coordinates-input.svelte
+++ b/web/src/lib/components/shared-components/coordinates-input.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import NumberRangeInput from '$lib/components/shared-components/number-range-input.svelte';
   import { generateId } from '$lib/utils/generate-id';
+  import { convert } from 'geo-coordinates-parser';
   import { t } from 'svelte-i18n';
 
   interface Props {
@@ -20,22 +21,22 @@
   };
 
   const onPaste = (event: ClipboardEvent) => {
-    const coords = event.clipboardData?.getData('text/plain')?.split(',');
-    if (!coords || coords.length !== 2) {
+    const pastedText = event.clipboardData?.getData('text/plain');
+    if (!pastedText) {
       return;
     }
 
-    const [latitude, longitude] = coords.map((coord) => Number.parseFloat(coord));
-    if (Number.isNaN(latitude) || latitude < -90 || latitude > 90) {
-      return;
+    try {
+      const parsed = convert(pastedText);
+      if (parsed) {
+        event.preventDefault();
+        lat = parsed.decimalLatitude;
+        lng = parsed.decimalLongitude;
+        onInput();
+      }
+    } catch {
+      // Invalid coordinate format, do nothing (let the default paste behavior occur)
     }
-    if (Number.isNaN(longitude) || longitude < -180 || longitude > 180) {
-      return;
-    }
-
-    event.preventDefault();
-    [lat, lng] = [latitude, longitude];
-    onInput();
   };
 </script>
 

From 0acbf1199a2575cebdae87bd0aae7684537ed9df Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 15 Jul 2025 22:17:35 +0800
Subject: [PATCH 207/337] feat(mobile): drift user metadata sync (#19894)

* feat(mobile): drift user metadata sync

* change text to jsonb

* update primary key

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../drift_schemas/main/drift_schema_v1.json   |   2 +-
 .../domain/models/user_metadata.model.dart    | 226 +++++++++++++++-
 .../domain/services/sync_stream.service.dart  |   8 +
 .../entities/user_metadata.entity.dart        |  14 +-
 .../entities/user_metadata.entity.drift.dart  | 241 +++++++++++-------
 .../repositories/sync_api.repository.dart     |   3 +
 .../repositories/sync_stream.repository.dart  |  58 +++++
 .../user_metadata.repository.dart             |  38 +++
 .../user_metadata.provider.dart               |   7 +
 .../services/sync_stream_service_test.dart    |   4 +
 10 files changed, 495 insertions(+), 106 deletions(-)
 create mode 100644 mobile/lib/infrastructure/repositories/user_metadata.repository.dart
 create mode 100644 mobile/lib/providers/infrastructure/user_metadata.provider.dart

diff --git a/mobile/drift_schemas/main/drift_schema_v1.json b/mobile/drift_schemas/main/drift_schema_v1.json
index 9fc7d17d56..03656ce0b4 100644
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
@@ -1 +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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":"preferences","getter_name":"preferences","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userPreferenceConverter","dart_type_name":"UserPreferences"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id"]}},{"id":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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":14,"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":15,"references":[1,14],"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":16,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}}]}
\ No newline at end of file
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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":14,"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":15,"references":[1,14],"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":16,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}}]}
\ No newline at end of file
diff --git a/mobile/lib/domain/models/user_metadata.model.dart b/mobile/lib/domain/models/user_metadata.model.dart
index 1586384422..c5c63cad5e 100644
--- a/mobile/lib/domain/models/user_metadata.model.dart
+++ b/mobile/lib/domain/models/user_metadata.model.dart
@@ -1,5 +1,12 @@
 import 'dart:ui';
 
+enum UserMetadataKey {
+  // do not change this order!
+  onboarding,
+  preferences,
+  license,
+}
+
 enum AvatarColor {
   // do not change this order or reuse indices for other purposes, adding is OK
   primary("primary"),
@@ -31,7 +38,45 @@ enum AvatarColor {
       };
 }
 
-class UserPreferences {
+class Onboarding {
+  final bool isOnboarded;
+
+  const Onboarding({required this.isOnboarded});
+
+  Onboarding copyWith({bool? isOnboarded}) {
+    return Onboarding(isOnboarded: isOnboarded ?? this.isOnboarded);
+  }
+
+  Map<String, Object?> toMap() {
+    final onboarding = <String, Object?>{};
+    onboarding["isOnboarded"] = isOnboarded;
+    return onboarding;
+  }
+
+  factory Onboarding.fromMap(Map<String, Object?> map) {
+    return Onboarding(isOnboarded: map["isOnboarded"] as bool);
+  }
+
+  @override
+  String toString() {
+    return '''Onboarding {
+isOnboarded: $isOnboarded,
+}''';
+  }
+
+  @override
+  bool operator ==(covariant Onboarding other) {
+    if (identical(this, other)) return true;
+
+    return isOnboarded == other.isOnboarded;
+  }
+
+  @override
+  int get hashCode => isOnboarded.hashCode;
+}
+
+// TODO: wait to be overwritten
+class Preferences {
   final bool foldersEnabled;
   final bool memoriesEnabled;
   final bool peopleEnabled;
@@ -41,7 +86,7 @@ class UserPreferences {
   final AvatarColor userAvatarColor;
   final bool showSupportBadge;
 
-  const UserPreferences({
+  const Preferences({
     this.foldersEnabled = false,
     this.memoriesEnabled = true,
     this.peopleEnabled = true,
@@ -52,7 +97,7 @@ class UserPreferences {
     this.showSupportBadge = true,
   });
 
-  UserPreferences copyWith({
+  Preferences copyWith({
     bool? foldersEnabled,
     bool? memoriesEnabled,
     bool? peopleEnabled,
@@ -62,7 +107,7 @@ class UserPreferences {
     AvatarColor? userAvatarColor,
     bool? showSupportBadge,
   }) {
-    return UserPreferences(
+    return Preferences(
       foldersEnabled: foldersEnabled ?? this.foldersEnabled,
       memoriesEnabled: memoriesEnabled ?? this.memoriesEnabled,
       peopleEnabled: peopleEnabled ?? this.peopleEnabled,
@@ -87,8 +132,8 @@ class UserPreferences {
     return preferences;
   }
 
-  factory UserPreferences.fromMap(Map<String, Object?> map) {
-    return UserPreferences(
+  factory Preferences.fromMap(Map<String, Object?> map) {
+    return Preferences(
       foldersEnabled: map["folders-Enabled"] as bool? ?? false,
       memoriesEnabled: map["memories-Enabled"] as bool? ?? true,
       peopleEnabled: map["people-Enabled"] as bool? ?? true,
@@ -102,4 +147,173 @@ class UserPreferences {
       showSupportBadge: map["purchase-ShowSupportBadge"] as bool? ?? true,
     );
   }
+
+  @override
+  String toString() {
+    return '''Preferences: {
+foldersEnabled: $foldersEnabled,
+memoriesEnabled: $memoriesEnabled,
+peopleEnabled: $peopleEnabled,
+ratingsEnabled: $ratingsEnabled,
+sharedLinksEnabled: $sharedLinksEnabled,
+tagsEnabled: $tagsEnabled,
+userAvatarColor: $userAvatarColor,
+showSupportBadge: $showSupportBadge,
+}''';
+  }
+
+  @override
+  bool operator ==(covariant Preferences other) {
+    if (identical(this, other)) return true;
+
+    return other.foldersEnabled == foldersEnabled &&
+        other.memoriesEnabled == memoriesEnabled &&
+        other.peopleEnabled == peopleEnabled &&
+        other.ratingsEnabled == ratingsEnabled &&
+        other.sharedLinksEnabled == sharedLinksEnabled &&
+        other.tagsEnabled == tagsEnabled &&
+        other.userAvatarColor == userAvatarColor &&
+        other.showSupportBadge == showSupportBadge;
+  }
+
+  @override
+  int get hashCode {
+    return foldersEnabled.hashCode ^
+        memoriesEnabled.hashCode ^
+        peopleEnabled.hashCode ^
+        ratingsEnabled.hashCode ^
+        sharedLinksEnabled.hashCode ^
+        tagsEnabled.hashCode ^
+        userAvatarColor.hashCode ^
+        showSupportBadge.hashCode;
+  }
+}
+
+class License {
+  final DateTime activatedAt;
+  final String activationKey;
+  final String licenseKey;
+
+  const License({
+    required this.activatedAt,
+    required this.activationKey,
+    required this.licenseKey,
+  });
+
+  License copyWith({
+    DateTime? activatedAt,
+    String? activationKey,
+    String? licenseKey,
+  }) {
+    return License(
+      activatedAt: activatedAt ?? this.activatedAt,
+      activationKey: activationKey ?? this.activationKey,
+      licenseKey: licenseKey ?? this.licenseKey,
+    );
+  }
+
+  Map<String, Object?> toMap() {
+    final license = <String, Object?>{};
+    license["activatedAt"] = activatedAt;
+    license["activationKey"] = activationKey;
+    license["licenseKey"] = licenseKey;
+    return license;
+  }
+
+  factory License.fromMap(Map<String, Object?> map) {
+    return License(
+      activatedAt: map["activatedAt"] as DateTime,
+      activationKey: map["activationKey"] as String,
+      licenseKey: map["licenseKey"] as String,
+    );
+  }
+
+  @override
+  String toString() {
+    return '''License {
+activatedAt: $activatedAt,
+activationKey: $activationKey,
+licenseKey: $licenseKey,
+}''';
+  }
+
+  @override
+  bool operator ==(covariant License other) {
+    if (identical(this, other)) return true;
+
+    return activatedAt == other.activatedAt &&
+        activationKey == other.activationKey &&
+        licenseKey == other.licenseKey;
+  }
+
+  @override
+  int get hashCode =>
+      activatedAt.hashCode ^ activationKey.hashCode ^ licenseKey.hashCode;
+}
+
+// Model for a user metadata stored in the server
+class UserMetadata {
+  final String userId;
+  final UserMetadataKey key;
+  final Onboarding? onboarding;
+  final Preferences? preferences;
+  final License? license;
+
+  const UserMetadata({
+    required this.userId,
+    required this.key,
+    this.onboarding,
+    this.preferences,
+    this.license,
+  }) : assert(
+          onboarding != null || preferences != null || license != null,
+          'One of onboarding, preferences and license must be provided',
+        );
+
+  UserMetadata copyWith({
+    String? userId,
+    UserMetadataKey? key,
+    Onboarding? onboarding,
+    Preferences? preferences,
+    License? license,
+  }) {
+    return UserMetadata(
+      userId: userId ?? this.userId,
+      key: key ?? this.key,
+      onboarding: onboarding ?? this.onboarding,
+      preferences: preferences ?? this.preferences,
+      license: license ?? this.license,
+    );
+  }
+
+  @override
+  String toString() {
+    return '''UserMetadata: {
+userId: $userId,
+key: $key,
+onboarding: ${onboarding ?? "<NA>"},
+preferences: ${preferences ?? "<NA>"},
+license: ${license ?? "<NA>"},
+}''';
+  }
+
+  @override
+  bool operator ==(covariant UserMetadata other) {
+    if (identical(this, other)) return true;
+
+    return other.userId == userId &&
+        other.key == key &&
+        other.onboarding == onboarding &&
+        other.preferences == preferences &&
+        other.license == license;
+  }
+
+  @override
+  int get hashCode {
+    return userId.hashCode ^
+        key.hashCode ^
+        onboarding.hashCode ^
+        preferences.hashCode ^
+        license.hashCode;
+  }
 }
diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index 29066195f2..48cf318a8b 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -179,6 +179,14 @@ class SyncStreamService {
           data.cast(),
           debugLabel: 'partner',
         );
+      case SyncEntityType.userMetadataV1:
+        return _syncStreamRepository.updateUserMetadatasV1(
+          data.cast(),
+        );
+      case SyncEntityType.userMetadataDeleteV1:
+        return _syncStreamRepository.deleteUserMetadatasV1(
+          data.cast(),
+        );
       default:
         _logger.warning("Unknown sync data type: $type");
     }
diff --git a/mobile/lib/infrastructure/entities/user_metadata.entity.dart b/mobile/lib/infrastructure/entities/user_metadata.entity.dart
index 302a9ffce1..f9a411e3de 100644
--- a/mobile/lib/infrastructure/entities/user_metadata.entity.dart
+++ b/mobile/lib/infrastructure/entities/user_metadata.entity.dart
@@ -8,14 +8,16 @@ class UserMetadataEntity extends Table with DriftDefaultsMixin {
 
   TextColumn get userId =>
       text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
-  TextColumn get preferences => text().map(userPreferenceConverter)();
+
+  IntColumn get key => intEnum<UserMetadataKey>()();
+
+  BlobColumn get value => blob().map(userMetadataConverter)();
 
   @override
-  Set<Column> get primaryKey => {userId};
+  Set<Column> get primaryKey => {userId, key};
 }
 
-final JsonTypeConverter2<UserPreferences, String, Object?>
-    userPreferenceConverter = TypeConverter.json2(
-  fromJson: (json) => UserPreferences.fromMap(json as Map<String, Object?>),
-  toJson: (pref) => pref.toMap(),
+final JsonTypeConverter2<Map<String, Object?>, Uint8List, Object?>
+    userMetadataConverter = TypeConverter.jsonb(
+  fromJson: (json) => json as Map<String, Object?>,
 );
diff --git a/mobile/lib/infrastructure/entities/user_metadata.entity.drift.dart b/mobile/lib/infrastructure/entities/user_metadata.entity.drift.dart
index 95ab63ebf6..a13ea5c04e 100644
--- a/mobile/lib/infrastructure/entities/user_metadata.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/user_metadata.entity.drift.dart
@@ -4,21 +4,24 @@ import 'package:drift/drift.dart' as i0;
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
     as i1;
 import 'package:immich_mobile/domain/models/user_metadata.model.dart' as i2;
+import 'dart:typed_data' as i3;
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart'
-    as i3;
-import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
     as i4;
-import 'package:drift/internal/modular.dart' as i5;
+import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
+    as i5;
+import 'package:drift/internal/modular.dart' as i6;
 
 typedef $$UserMetadataEntityTableCreateCompanionBuilder
     = i1.UserMetadataEntityCompanion Function({
   required String userId,
-  required i2.UserPreferences preferences,
+  required i2.UserMetadataKey key,
+  required Map<String, Object?> value,
 });
 typedef $$UserMetadataEntityTableUpdateCompanionBuilder
     = i1.UserMetadataEntityCompanion Function({
   i0.Value<String> userId,
-  i0.Value<i2.UserPreferences> preferences,
+  i0.Value<i2.UserMetadataKey> key,
+  i0.Value<Map<String, Object?>> value,
 });
 
 final class $$UserMetadataEntityTableReferences extends i0.BaseReferences<
@@ -28,26 +31,26 @@ final class $$UserMetadataEntityTableReferences extends i0.BaseReferences<
   $$UserMetadataEntityTableReferences(
       super.$_db, super.$_table, super.$_typedResult);
 
-  static i4.$UserEntityTable _userIdTable(i0.GeneratedDatabase db) =>
-      i5.ReadDatabaseContainer(db)
-          .resultSet<i4.$UserEntityTable>('user_entity')
+  static i5.$UserEntityTable _userIdTable(i0.GeneratedDatabase db) =>
+      i6.ReadDatabaseContainer(db)
+          .resultSet<i5.$UserEntityTable>('user_entity')
           .createAlias(i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(db)
+              i6.ReadDatabaseContainer(db)
                   .resultSet<i1.$UserMetadataEntityTable>(
                       'user_metadata_entity')
                   .userId,
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i4.$UserEntityTable>('user_entity')
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i5.$UserEntityTable>('user_entity')
                   .id));
 
-  i4.$$UserEntityTableProcessedTableManager get userId {
+  i5.$$UserEntityTableProcessedTableManager get userId {
     final $_column = $_itemColumn<String>('user_id')!;
 
-    final manager = i4
+    final manager = i5
         .$$UserEntityTableTableManager(
             $_db,
-            i5.ReadDatabaseContainer($_db)
-                .resultSet<i4.$UserEntityTable>('user_entity'))
+            i6.ReadDatabaseContainer($_db)
+                .resultSet<i5.$UserEntityTable>('user_entity'))
         .filter((f) => f.id.sqlEquals($_column));
     final item = $_typedResult.readTableOrNull(_userIdTable($_db));
     if (item == null) return manager;
@@ -65,26 +68,31 @@ class $$UserMetadataEntityTableFilterComposer
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  i0.ColumnWithTypeConverterFilters<i2.UserPreferences, i2.UserPreferences,
-          String>
-      get preferences => $composableBuilder(
-          column: $table.preferences,
+  i0.ColumnWithTypeConverterFilters<i2.UserMetadataKey, i2.UserMetadataKey, int>
+      get key => $composableBuilder(
+          column: $table.key,
           builder: (column) => i0.ColumnWithTypeConverterFilters(column));
 
-  i4.$$UserEntityTableFilterComposer get userId {
-    final i4.$$UserEntityTableFilterComposer composer = $composerBuilder(
+  i0.ColumnWithTypeConverterFilters<Map<String, Object?>, Map<String, Object>,
+          i3.Uint8List>
+      get value => $composableBuilder(
+          column: $table.value,
+          builder: (column) => i0.ColumnWithTypeConverterFilters(column));
+
+  i5.$$UserEntityTableFilterComposer get userId {
+    final i5.$$UserEntityTableFilterComposer composer = $composerBuilder(
         composer: this,
         getCurrentColumn: (t) => t.userId,
-        referencedTable: i5.ReadDatabaseContainer($db)
-            .resultSet<i4.$UserEntityTable>('user_entity'),
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
         getReferencedColumn: (t) => t.id,
         builder: (joinBuilder,
                 {$addJoinBuilderToRootComposer,
                 $removeJoinBuilderFromRootComposer}) =>
-            i4.$$UserEntityTableFilterComposer(
+            i5.$$UserEntityTableFilterComposer(
               $db: $db,
-              $table: i5.ReadDatabaseContainer($db)
-                  .resultSet<i4.$UserEntityTable>('user_entity'),
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
               $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
               joinBuilder: joinBuilder,
               $removeJoinBuilderFromRootComposer:
@@ -103,24 +111,26 @@ class $$UserMetadataEntityTableOrderingComposer
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  i0.ColumnOrderings<String> get preferences => $composableBuilder(
-      column: $table.preferences,
-      builder: (column) => i0.ColumnOrderings(column));
+  i0.ColumnOrderings<int> get key => $composableBuilder(
+      column: $table.key, builder: (column) => i0.ColumnOrderings(column));
 
-  i4.$$UserEntityTableOrderingComposer get userId {
-    final i4.$$UserEntityTableOrderingComposer composer = $composerBuilder(
+  i0.ColumnOrderings<i3.Uint8List> get value => $composableBuilder(
+      column: $table.value, builder: (column) => i0.ColumnOrderings(column));
+
+  i5.$$UserEntityTableOrderingComposer get userId {
+    final i5.$$UserEntityTableOrderingComposer composer = $composerBuilder(
         composer: this,
         getCurrentColumn: (t) => t.userId,
-        referencedTable: i5.ReadDatabaseContainer($db)
-            .resultSet<i4.$UserEntityTable>('user_entity'),
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
         getReferencedColumn: (t) => t.id,
         builder: (joinBuilder,
                 {$addJoinBuilderToRootComposer,
                 $removeJoinBuilderFromRootComposer}) =>
-            i4.$$UserEntityTableOrderingComposer(
+            i5.$$UserEntityTableOrderingComposer(
               $db: $db,
-              $table: i5.ReadDatabaseContainer($db)
-                  .resultSet<i4.$UserEntityTable>('user_entity'),
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
               $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
               joinBuilder: joinBuilder,
               $removeJoinBuilderFromRootComposer:
@@ -139,24 +149,27 @@ class $$UserMetadataEntityTableAnnotationComposer
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  i0.GeneratedColumnWithTypeConverter<i2.UserPreferences, String>
-      get preferences => $composableBuilder(
-          column: $table.preferences, builder: (column) => column);
+  i0.GeneratedColumnWithTypeConverter<i2.UserMetadataKey, int> get key =>
+      $composableBuilder(column: $table.key, builder: (column) => column);
 
-  i4.$$UserEntityTableAnnotationComposer get userId {
-    final i4.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
+  i0.GeneratedColumnWithTypeConverter<Map<String, Object?>, i3.Uint8List>
+      get value =>
+          $composableBuilder(column: $table.value, builder: (column) => column);
+
+  i5.$$UserEntityTableAnnotationComposer get userId {
+    final i5.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
         composer: this,
         getCurrentColumn: (t) => t.userId,
-        referencedTable: i5.ReadDatabaseContainer($db)
-            .resultSet<i4.$UserEntityTable>('user_entity'),
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
         getReferencedColumn: (t) => t.id,
         builder: (joinBuilder,
                 {$addJoinBuilderToRootComposer,
                 $removeJoinBuilderFromRootComposer}) =>
-            i4.$$UserEntityTableAnnotationComposer(
+            i5.$$UserEntityTableAnnotationComposer(
               $db: $db,
-              $table: i5.ReadDatabaseContainer($db)
-                  .resultSet<i4.$UserEntityTable>('user_entity'),
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
               $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
               joinBuilder: joinBuilder,
               $removeJoinBuilderFromRootComposer:
@@ -193,19 +206,23 @@ class $$UserMetadataEntityTableTableManager extends i0.RootTableManager<
                   $db: db, $table: table),
           updateCompanionCallback: ({
             i0.Value<String> userId = const i0.Value.absent(),
-            i0.Value<i2.UserPreferences> preferences = const i0.Value.absent(),
+            i0.Value<i2.UserMetadataKey> key = const i0.Value.absent(),
+            i0.Value<Map<String, Object?>> value = const i0.Value.absent(),
           }) =>
               i1.UserMetadataEntityCompanion(
             userId: userId,
-            preferences: preferences,
+            key: key,
+            value: value,
           ),
           createCompanionCallback: ({
             required String userId,
-            required i2.UserPreferences preferences,
+            required i2.UserMetadataKey key,
+            required Map<String, Object?> value,
           }) =>
               i1.UserMetadataEntityCompanion.insert(
             userId: userId,
-            preferences: preferences,
+            key: key,
+            value: value,
           ),
           withReferenceMapper: (p0) => p0
               .map((e) => (
@@ -266,7 +283,7 @@ typedef $$UserMetadataEntityTableProcessedTableManager
         i1.UserMetadataEntityData,
         i0.PrefetchHooks Function({bool userId})>;
 
-class $UserMetadataEntityTable extends i3.UserMetadataEntity
+class $UserMetadataEntityTable extends i4.UserMetadataEntity
     with i0.TableInfo<$UserMetadataEntityTable, i1.UserMetadataEntityData> {
   @override
   final i0.GeneratedDatabase attachedDatabase;
@@ -282,14 +299,20 @@ class $UserMetadataEntityTable extends i3.UserMetadataEntity
       defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
           'REFERENCES user_entity (id) ON DELETE CASCADE'));
   @override
-  late final i0.GeneratedColumnWithTypeConverter<i2.UserPreferences, String>
-      preferences = i0.GeneratedColumn<String>(
-              'preferences', aliasedName, false,
-              type: i0.DriftSqlType.string, requiredDuringInsert: true)
-          .withConverter<i2.UserPreferences>(
-              i1.$UserMetadataEntityTable.$converterpreferences);
+  late final i0.GeneratedColumnWithTypeConverter<i2.UserMetadataKey, int> key =
+      i0.GeneratedColumn<int>('key', aliasedName, false,
+              type: i0.DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<i2.UserMetadataKey>(
+              i1.$UserMetadataEntityTable.$converterkey);
   @override
-  List<i0.GeneratedColumn> get $columns => [userId, preferences];
+  late final i0
+      .GeneratedColumnWithTypeConverter<Map<String, Object?>, i3.Uint8List>
+      value = i0.GeneratedColumn<i3.Uint8List>('value', aliasedName, false,
+              type: i0.DriftSqlType.blob, requiredDuringInsert: true)
+          .withConverter<Map<String, Object?>>(
+              i1.$UserMetadataEntityTable.$convertervalue);
+  @override
+  List<i0.GeneratedColumn> get $columns => [userId, key, value];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -311,7 +334,7 @@ class $UserMetadataEntityTable extends i3.UserMetadataEntity
   }
 
   @override
-  Set<i0.GeneratedColumn> get $primaryKey => {userId};
+  Set<i0.GeneratedColumn> get $primaryKey => {userId, key};
   @override
   i1.UserMetadataEntityData map(Map<String, dynamic> data,
       {String? tablePrefix}) {
@@ -319,9 +342,12 @@ class $UserMetadataEntityTable extends i3.UserMetadataEntity
     return i1.UserMetadataEntityData(
       userId: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.string, data['${effectivePrefix}user_id'])!,
-      preferences: i1.$UserMetadataEntityTable.$converterpreferences.fromSql(
-          attachedDatabase.typeMapping.read(
-              i0.DriftSqlType.string, data['${effectivePrefix}preferences'])!),
+      key: i1.$UserMetadataEntityTable.$converterkey.fromSql(attachedDatabase
+          .typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}key'])!),
+      value: i1.$UserMetadataEntityTable.$convertervalue.fromSql(
+          attachedDatabase.typeMapping
+              .read(i0.DriftSqlType.blob, data['${effectivePrefix}value'])!),
     );
   }
 
@@ -330,8 +356,11 @@ class $UserMetadataEntityTable extends i3.UserMetadataEntity
     return $UserMetadataEntityTable(attachedDatabase, alias);
   }
 
-  static i0.JsonTypeConverter2<i2.UserPreferences, String, Object?>
-      $converterpreferences = i3.userPreferenceConverter;
+  static i0.JsonTypeConverter2<i2.UserMetadataKey, int, int> $converterkey =
+      const i0.EnumIndexConverter<i2.UserMetadataKey>(
+          i2.UserMetadataKey.values);
+  static i0.JsonTypeConverter2<Map<String, Object?>, i3.Uint8List, Object?>
+      $convertervalue = i4.userMetadataConverter;
   @override
   bool get withoutRowId => true;
   @override
@@ -341,16 +370,21 @@ class $UserMetadataEntityTable extends i3.UserMetadataEntity
 class UserMetadataEntityData extends i0.DataClass
     implements i0.Insertable<i1.UserMetadataEntityData> {
   final String userId;
-  final i2.UserPreferences preferences;
+  final i2.UserMetadataKey key;
+  final Map<String, Object?> value;
   const UserMetadataEntityData(
-      {required this.userId, required this.preferences});
+      {required this.userId, required this.key, required this.value});
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
     final map = <String, i0.Expression>{};
     map['user_id'] = i0.Variable<String>(userId);
     {
-      map['preferences'] = i0.Variable<String>(
-          i1.$UserMetadataEntityTable.$converterpreferences.toSql(preferences));
+      map['key'] = i0.Variable<int>(
+          i1.$UserMetadataEntityTable.$converterkey.toSql(key));
+    }
+    {
+      map['value'] = i0.Variable<i3.Uint8List>(
+          i1.$UserMetadataEntityTable.$convertervalue.toSql(value));
     }
     return map;
   }
@@ -360,8 +394,10 @@ class UserMetadataEntityData extends i0.DataClass
     serializer ??= i0.driftRuntimeOptions.defaultSerializer;
     return UserMetadataEntityData(
       userId: serializer.fromJson<String>(json['userId']),
-      preferences: i1.$UserMetadataEntityTable.$converterpreferences
-          .fromJson(serializer.fromJson<Object?>(json['preferences'])),
+      key: i1.$UserMetadataEntityTable.$converterkey
+          .fromJson(serializer.fromJson<int>(json['key'])),
+      value: i1.$UserMetadataEntityTable.$convertervalue
+          .fromJson(serializer.fromJson<Object?>(json['value'])),
     );
   }
   @override
@@ -369,24 +405,28 @@ class UserMetadataEntityData extends i0.DataClass
     serializer ??= i0.driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
       'userId': serializer.toJson<String>(userId),
-      'preferences': serializer.toJson<Object?>(i1
-          .$UserMetadataEntityTable.$converterpreferences
-          .toJson(preferences)),
+      'key': serializer
+          .toJson<int>(i1.$UserMetadataEntityTable.$converterkey.toJson(key)),
+      'value': serializer.toJson<Object?>(
+          i1.$UserMetadataEntityTable.$convertervalue.toJson(value)),
     };
   }
 
   i1.UserMetadataEntityData copyWith(
-          {String? userId, i2.UserPreferences? preferences}) =>
+          {String? userId,
+          i2.UserMetadataKey? key,
+          Map<String, Object?>? value}) =>
       i1.UserMetadataEntityData(
         userId: userId ?? this.userId,
-        preferences: preferences ?? this.preferences,
+        key: key ?? this.key,
+        value: value ?? this.value,
       );
   UserMetadataEntityData copyWithCompanion(
       i1.UserMetadataEntityCompanion data) {
     return UserMetadataEntityData(
       userId: data.userId.present ? data.userId.value : this.userId,
-      preferences:
-          data.preferences.present ? data.preferences.value : this.preferences,
+      key: data.key.present ? data.key.value : this.key,
+      value: data.value.present ? data.value.value : this.value,
     );
   }
 
@@ -394,49 +434,60 @@ class UserMetadataEntityData extends i0.DataClass
   String toString() {
     return (StringBuffer('UserMetadataEntityData(')
           ..write('userId: $userId, ')
-          ..write('preferences: $preferences')
+          ..write('key: $key, ')
+          ..write('value: $value')
           ..write(')'))
         .toString();
   }
 
   @override
-  int get hashCode => Object.hash(userId, preferences);
+  int get hashCode => Object.hash(userId, key, value);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
       (other is i1.UserMetadataEntityData &&
           other.userId == this.userId &&
-          other.preferences == this.preferences);
+          other.key == this.key &&
+          other.value == this.value);
 }
 
 class UserMetadataEntityCompanion
     extends i0.UpdateCompanion<i1.UserMetadataEntityData> {
   final i0.Value<String> userId;
-  final i0.Value<i2.UserPreferences> preferences;
+  final i0.Value<i2.UserMetadataKey> key;
+  final i0.Value<Map<String, Object?>> value;
   const UserMetadataEntityCompanion({
     this.userId = const i0.Value.absent(),
-    this.preferences = const i0.Value.absent(),
+    this.key = const i0.Value.absent(),
+    this.value = const i0.Value.absent(),
   });
   UserMetadataEntityCompanion.insert({
     required String userId,
-    required i2.UserPreferences preferences,
+    required i2.UserMetadataKey key,
+    required Map<String, Object?> value,
   })  : userId = i0.Value(userId),
-        preferences = i0.Value(preferences);
+        key = i0.Value(key),
+        value = i0.Value(value);
   static i0.Insertable<i1.UserMetadataEntityData> custom({
     i0.Expression<String>? userId,
-    i0.Expression<String>? preferences,
+    i0.Expression<int>? key,
+    i0.Expression<i3.Uint8List>? value,
   }) {
     return i0.RawValuesInsertable({
       if (userId != null) 'user_id': userId,
-      if (preferences != null) 'preferences': preferences,
+      if (key != null) 'key': key,
+      if (value != null) 'value': value,
     });
   }
 
   i1.UserMetadataEntityCompanion copyWith(
-      {i0.Value<String>? userId, i0.Value<i2.UserPreferences>? preferences}) {
+      {i0.Value<String>? userId,
+      i0.Value<i2.UserMetadataKey>? key,
+      i0.Value<Map<String, Object?>>? value}) {
     return i1.UserMetadataEntityCompanion(
       userId: userId ?? this.userId,
-      preferences: preferences ?? this.preferences,
+      key: key ?? this.key,
+      value: value ?? this.value,
     );
   }
 
@@ -446,10 +497,13 @@ class UserMetadataEntityCompanion
     if (userId.present) {
       map['user_id'] = i0.Variable<String>(userId.value);
     }
-    if (preferences.present) {
-      map['preferences'] = i0.Variable<String>(i1
-          .$UserMetadataEntityTable.$converterpreferences
-          .toSql(preferences.value));
+    if (key.present) {
+      map['key'] = i0.Variable<int>(
+          i1.$UserMetadataEntityTable.$converterkey.toSql(key.value));
+    }
+    if (value.present) {
+      map['value'] = i0.Variable<i3.Uint8List>(
+          i1.$UserMetadataEntityTable.$convertervalue.toSql(value.value));
     }
     return map;
   }
@@ -458,7 +512,8 @@ class UserMetadataEntityCompanion
   String toString() {
     return (StringBuffer('UserMetadataEntityCompanion(')
           ..write('userId: $userId, ')
-          ..write('preferences: $preferences')
+          ..write('key: $key, ')
+          ..write('value: $value')
           ..write(')'))
         .toString();
   }
diff --git a/mobile/lib/infrastructure/repositories/sync_api.repository.dart b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
index d43f786a29..d1ecbd580c 100644
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -56,6 +56,7 @@ class SyncApiRepository {
           SyncRequestType.memoryToAssetsV1,
           SyncRequestType.stacksV1,
           SyncRequestType.partnerStacksV1,
+          SyncRequestType.userMetadataV1,
         ],
       ).toJson(),
     );
@@ -170,6 +171,8 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.partnerStackV1: SyncStackV1.fromJson,
   SyncEntityType.partnerStackBackfillV1: SyncStackV1.fromJson,
   SyncEntityType.partnerStackDeleteV1: SyncStackDeleteV1.fromJson,
+  SyncEntityType.userMetadataV1: SyncUserMetadataV1.fromJson,
+  SyncEntityType.userMetadataDeleteV1: SyncUserMetadataDeleteV1.fromJson,
 };
 
 class _SyncAckV1 {
diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index dc3b466f01..f3f26bb01f 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -4,6 +4,7 @@ import 'package:drift/drift.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/domain/models/memory.model.dart';
+import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart';
@@ -14,6 +15,7 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.d
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart' as api show AssetVisibility, AlbumUserRole;
@@ -461,6 +463,53 @@ class SyncStreamRepository extends DriftDatabaseRepository {
       rethrow;
     }
   }
+
+  Future<void> updateUserMetadatasV1(
+    Iterable<SyncUserMetadataV1> data,
+  ) async {
+    try {
+      await _db.batch((batch) {
+        for (final userMetadata in data) {
+          final companion = UserMetadataEntityCompanion(
+            value: Value(userMetadata.value as Map<String, Object?>),
+          );
+
+          batch.insert(
+            _db.userMetadataEntity,
+            companion.copyWith(
+              userId: Value(userMetadata.userId),
+              key: Value(userMetadata.key.toUserMetadataKey()),
+            ),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: deleteUserMetadatasV1', error, stack);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteUserMetadatasV1(
+    Iterable<SyncUserMetadataDeleteV1> data,
+  ) async {
+    try {
+      await _db.batch((batch) {
+        for (final userMetadata in data) {
+          batch.delete(
+            _db.userMetadataEntity,
+            UserMetadataEntityCompanion(
+              userId: Value(userMetadata.userId),
+              key: Value(userMetadata.key.toUserMetadataKey()),
+            ),
+          );
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: deleteUserMetadatasV1', error, stack);
+      rethrow;
+    }
+  }
 }
 
 extension on AssetTypeEnum {
@@ -506,6 +555,15 @@ extension on api.AssetVisibility {
       };
 }
 
+extension on String {
+  UserMetadataKey toUserMetadataKey() => switch (this) {
+        "onboarding" => UserMetadataKey.onboarding,
+        "preferences" => UserMetadataKey.preferences,
+        "license" => UserMetadataKey.license,
+        _ => throw Exception('Unknown UserMetadataKey value: $this'),
+      };
+}
+
 extension on String {
   Duration? toDuration() {
     try {
diff --git a/mobile/lib/infrastructure/repositories/user_metadata.repository.dart b/mobile/lib/infrastructure/repositories/user_metadata.repository.dart
new file mode 100644
index 0000000000..19364afb43
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/user_metadata.repository.dart
@@ -0,0 +1,38 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/user_metadata.model.dart';
+import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class DriftUserMetadataRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftUserMetadataRepository(this._db) : super(_db);
+
+  Future<List<UserMetadata>> getUserMetadata(String userId) {
+    final query = _db.userMetadataEntity.select()
+      ..where((e) => e.userId.equals(userId));
+
+    return query.map((userMetadata) {
+      return userMetadata.toDto();
+    }).get();
+  }
+}
+
+extension on UserMetadataEntityData {
+  UserMetadata toDto() => switch (key) {
+        UserMetadataKey.onboarding => UserMetadata(
+            userId: userId,
+            key: key,
+            onboarding: Onboarding.fromMap(value),
+          ),
+        UserMetadataKey.preferences => UserMetadata(
+            userId: userId,
+            key: key,
+            preferences: Preferences.fromMap(value),
+          ),
+        UserMetadataKey.license => UserMetadata(
+            userId: userId,
+            key: key,
+            license: License.fromMap(value),
+          ),
+      };
+}
diff --git a/mobile/lib/providers/infrastructure/user_metadata.provider.dart b/mobile/lib/providers/infrastructure/user_metadata.provider.dart
new file mode 100644
index 0000000000..2e2ae7555b
--- /dev/null
+++ b/mobile/lib/providers/infrastructure/user_metadata.provider.dart
@@ -0,0 +1,7 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/infrastructure/repositories/user_metadata.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+
+final userMetadataRepository = Provider<DriftUserMetadataRepository>(
+  (ref) => DriftUserMetadataRepository(ref.watch(driftProvider)),
+);
diff --git a/mobile/test/domain/services/sync_stream_service_test.dart b/mobile/test/domain/services/sync_stream_service_test.dart
index 27cd8c5b21..c9fd8104e4 100644
--- a/mobile/test/domain/services/sync_stream_service_test.dart
+++ b/mobile/test/domain/services/sync_stream_service_test.dart
@@ -101,6 +101,10 @@ void main() {
         debugLabel: any(named: 'debugLabel'),
       ),
     ).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updateUserMetadatasV1(any()))
+        .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deleteUserMetadatasV1(any()))
+        .thenAnswer(successHandler);
 
     sut = SyncStreamService(
       syncApiRepository: mockSyncApiRepo,

From 59e7754bdce044bc880806cc1f63187ff27a8fa8 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 15 Jul 2025 09:38:28 -0500
Subject: [PATCH 208/337] feat: websocket background sync (#19888)

* feat: websocket background sync

* batch websocket

* pr feedback
---
 .../domain/services/sync_stream.service.dart  | 53 +++++++++++++++++++
 mobile/lib/domain/utils/background_sync.dart  | 22 ++++++++
 mobile/lib/providers/websocket.provider.dart  | 42 ++++++++++++++-
 3 files changed, 116 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index 48cf318a8b..6183865041 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -31,6 +31,59 @@ class SyncStreamService {
     return _syncApiRepository.streamChanges(_handleEvents);
   }
 
+  Future<void> handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) async {
+    if (batchData.isEmpty) return;
+
+    _logger.info(
+      'Processing batch of ${batchData.length} AssetUploadReadyV1 events',
+    );
+
+    final List<SyncAssetV1> assets = [];
+    final List<SyncAssetExifV1> exifs = [];
+
+    try {
+      for (final data in batchData) {
+        if (data is! Map<String, dynamic>) {
+          continue;
+        }
+
+        final payload = data;
+        final assetData = payload['asset'];
+        final exifData = payload['exif'];
+
+        if (assetData == null || exifData == null) {
+          continue;
+        }
+
+        final asset = SyncAssetV1.fromJson(assetData);
+        final exif = SyncAssetExifV1.fromJson(exifData);
+
+        if (asset != null && exif != null) {
+          assets.add(asset);
+          exifs.add(exif);
+        }
+      }
+
+      if (assets.isNotEmpty && exifs.isNotEmpty) {
+        await _syncStreamRepository.updateAssetsV1(
+          assets,
+          debugLabel: 'websocket-batch',
+        );
+        await _syncStreamRepository.updateAssetsExifV1(
+          exifs,
+          debugLabel: 'websocket-batch',
+        );
+        _logger.info('Successfully processed ${assets.length} assets in batch');
+      }
+    } catch (error, stackTrace) {
+      _logger.severe(
+        "Error processing AssetUploadReadyV1 websocket batch events",
+        error,
+        stackTrace,
+      );
+    }
+  }
+
   Future<void> _handleEvents(List<SyncEvent> events, Function() abort) async {
     List<SyncEvent> items = [];
     for (final event in events) {
diff --git a/mobile/lib/domain/utils/background_sync.dart b/mobile/lib/domain/utils/background_sync.dart
index c8d2e2b624..c71f1a8315 100644
--- a/mobile/lib/domain/utils/background_sync.dart
+++ b/mobile/lib/domain/utils/background_sync.dart
@@ -6,6 +6,7 @@ import 'package:worker_manager/worker_manager.dart';
 
 class BackgroundSyncManager {
   Cancelable<void>? _syncTask;
+  Cancelable<void>? _syncWebsocketTask;
   Cancelable<void>? _deviceAlbumSyncTask;
   Cancelable<void>? _hashTask;
 
@@ -20,6 +21,12 @@ class BackgroundSyncManager {
     _syncTask?.cancel();
     _syncTask = null;
 
+    if (_syncWebsocketTask != null) {
+      futures.add(_syncWebsocketTask!.future);
+    }
+    _syncWebsocketTask?.cancel();
+    _syncWebsocketTask = null;
+
     return Future.wait(futures);
   }
 
@@ -72,4 +79,19 @@ class BackgroundSyncManager {
       _syncTask = null;
     });
   }
+
+  Future<void> syncWebsocketBatch(List<dynamic> batchData) {
+    if (_syncWebsocketTask != null) {
+      return _syncWebsocketTask!.future;
+    }
+
+    _syncWebsocketTask = runInIsolateGentle(
+      computation: (ref) => ref
+          .read(syncStreamServiceProvider)
+          .handleWsAssetUploadReadyV1Batch(batchData),
+    );
+    return _syncWebsocketTask!.whenComplete(() {
+      _syncWebsocketTask = null;
+    });
+  }
 }
diff --git a/mobile/lib/providers/websocket.provider.dart b/mobile/lib/providers/websocket.provider.dart
index 2600c6d8ee..d9db831776 100644
--- a/mobile/lib/providers/websocket.provider.dart
+++ b/mobile/lib/providers/websocket.provider.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 
 import 'package:collection/collection.dart';
@@ -10,6 +11,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/models/server_info/server_version.model.dart';
 import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
+import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
@@ -106,6 +108,18 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
   final Debouncer _debounce =
       Debouncer(interval: const Duration(milliseconds: 500));
 
+  final Debouncer _batchDebouncer = Debouncer(
+    interval: const Duration(seconds: 5),
+    maxWaitTime: const Duration(seconds: 10),
+  );
+  final List<dynamic> _batchedAssetUploadReady = [];
+
+  @override
+  void dispose() {
+    _batchDebouncer.dispose();
+    super.dispose();
+  }
+
   /// Connects websocket to server unless already connected
   void connect() {
     if (state.isConnected) return;
@@ -171,6 +185,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
         socket.on('on_asset_stack_update', _handleServerUpdates);
         socket.on('on_asset_hidden', _handleOnAssetHidden);
         socket.on('on_new_release', _handleReleaseUpdates);
+        socket.on('AssetUploadReadyV1', _handleSyncAssetUploadReady);
       } catch (e) {
         debugPrint("[WEBSOCKET] Catch Websocket Error - ${e.toString()}");
       }
@@ -180,6 +195,8 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
   void disconnect() {
     debugPrint("Attempting to disconnect from websocket");
 
+    _batchedAssetUploadReady.clear();
+
     var socket = state.socket?.disconnect();
 
     if (socket?.disconnected == true) {
@@ -288,7 +305,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     }
   }
 
-  void handlePendingChanges() async {
+  Future<void> handlePendingChanges() async {
     await _handlePendingUploaded();
     await _handlePendingDeletes();
     await _handlingPendingHidden();
@@ -347,6 +364,29 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
         .read(serverInfoProvider.notifier)
         .handleNewRelease(serverVersion, releaseVersion);
   }
+
+  void _handleSyncAssetUploadReady(dynamic data) {
+    _batchedAssetUploadReady.add(data);
+    _batchDebouncer.run(_processBatchedAssetUploadReady);
+  }
+
+  void _processBatchedAssetUploadReady() {
+    if (_batchedAssetUploadReady.isEmpty) {
+      return;
+    }
+
+    try {
+      unawaited(
+        _ref
+            .read(backgroundSyncProvider)
+            .syncWebsocketBatch(_batchedAssetUploadReady.toList()),
+      );
+    } catch (error) {
+      _log.severe("Error processing batched AssetUploadReadyV1 events: $error");
+    }
+
+    _batchedAssetUploadReady.clear();
+  }
 }
 
 final websocketProvider =

From ba262fbaa859101724645c01b6c262f7bc2e9248 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 15 Jul 2025 23:10:12 +0800
Subject: [PATCH 209/337] feat(mobile): drift place page (#19914)

* feat(mobile): drift place page

* merge main

* feat(mobile): drift place detail page (#19915)

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 mobile/ios/Runner.xcodeproj/project.pbxproj   |  12 +-
 .../xcshareddata/xcschemes/Runner.xcscheme    |   2 +
 mobile/lib/domain/services/asset.service.dart |   4 +
 .../lib/domain/services/timeline.service.dart |   3 +
 .../repositories/remote_asset.repository.dart |  36 ++++
 .../repositories/timeline.repository.dart     |  78 +++++++
 .../pages/drift_library.page.dart             |   4 +-
 .../presentation/pages/drift_place.page.dart  | 190 ++++++++++++++++++
 .../pages/drift_place_detail.page.dart        |  38 ++++
 .../infrastructure/asset.provider.dart        |   7 +
 mobile/lib/routing/router.dart                |  11 +-
 mobile/lib/routing/router.gr.dart             |  79 ++++++++
 .../common/mesmerizing_sliver_app_bar.dart    |   4 +-
 13 files changed, 453 insertions(+), 15 deletions(-)
 create mode 100644 mobile/lib/presentation/pages/drift_place.page.dart
 create mode 100644 mobile/lib/presentation/pages/drift_place_detail.page.dart

diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index 1a39f98db3..fb0908e8b6 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 */
@@ -117,6 +117,8 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -471,14 +473,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";
@@ -507,14 +505,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/xcshareddata/xcschemes/Runner.xcscheme b/mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 656d278d6d..2367c52b97 100644
--- a/mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -43,6 +44,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       disableMainThreadChecker = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dart
index a210c3d991..2c9b493187 100644
--- a/mobile/lib/domain/services/asset.service.dart
+++ b/mobile/lib/domain/services/asset.service.dart
@@ -61,4 +61,8 @@ class AssetService {
 
     return 1.0;
   }
+
+  Future<List<(String, String)>> getPlaces() {
+    return _remoteAssetRepository.getPlaces();
+  }
 }
diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 8204572547..14a854a760 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -62,6 +62,9 @@ class TimelineFactory {
 
   TimelineService video(String userId) =>
       TimelineService(_timelineRepository.video(userId, groupBy));
+
+  TimelineService place(String place) =>
+      TimelineService(_timelineRepository.place(place, groupBy));
 }
 
 class TimelineService {
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index 95de34d1b4..1f6f1b0891 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -56,6 +56,42 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
         .getSingleOrNull();
   }
 
+  Future<List<(String, String)>> getPlaces() {
+    final asset = Subquery(
+      _db.remoteAssetEntity.select()
+        ..orderBy([(row) => OrderingTerm.desc(row.createdAt)]),
+      "asset",
+    );
+
+    final query = asset.selectOnly().join([
+      innerJoin(
+        _db.remoteExifEntity,
+        _db.remoteExifEntity.assetId
+            .equalsExp(asset.ref(_db.remoteAssetEntity.id)),
+        useColumns: false,
+      ),
+    ])
+      ..addColumns([
+        _db.remoteExifEntity.city,
+        _db.remoteExifEntity.assetId,
+      ])
+      ..where(
+        _db.remoteExifEntity.city.isNotNull() &
+            asset.ref(_db.remoteAssetEntity.deletedAt).isNull() &
+            asset
+                .ref(_db.remoteAssetEntity.visibility)
+                .equals(AssetVisibility.timeline.index),
+      )
+      ..groupBy([_db.remoteExifEntity.city])
+      ..orderBy([OrderingTerm.asc(_db.remoteExifEntity.city)]);
+
+    return query.map((row) {
+      final assetId = row.read(_db.remoteExifEntity.assetId);
+      final city = row.read(_db.remoteExifEntity.city);
+      return (city!, assetId!);
+    }).get();
+  }
+
   Future<void> updateFavorite(List<String> ids, bool isFavorite) {
     return _db.batch((batch) async {
       for (final id in ids) {
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 4db1d03d57..c3c7fc71ab 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -303,6 +303,84 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         groupBy: groupBy,
       );
 
+  TimelineQuery place(String place, GroupAssetsBy groupBy) => (
+        bucketSource: () => _watchPlaceBucket(
+              place,
+              groupBy: groupBy,
+            ),
+        assetSource: (offset, count) => _getPlaceBucketAssets(
+              place,
+              offset: offset,
+              count: count,
+            ),
+      );
+
+  Stream<List<Bucket>> _watchPlaceBucket(
+    String place, {
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    if (groupBy == GroupAssetsBy.none) {
+      // TODO: implement GroupAssetBy for place
+      throw UnsupportedError(
+        "GroupAssetsBy.none is not supported for watchPlaceBucket",
+      );
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..join([
+        innerJoin(
+          _db.remoteExifEntity,
+          _db.remoteExifEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
+          useColumns: false,
+        ),
+      ])
+      ..where(
+        _db.remoteExifEntity.city.equals(place) &
+            _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.visibility
+                .equalsValue(AssetVisibility.timeline),
+      )
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> _getPlaceBucketAssets(
+    String place, {
+    required int offset,
+    required int count,
+  }) {
+    final query = _db.remoteAssetEntity.select().join(
+      [
+        innerJoin(
+          _db.remoteExifEntity,
+          _db.remoteExifEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
+          useColumns: false,
+        ),
+      ],
+    )
+      ..where(
+        _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.visibility
+                .equalsValue(AssetVisibility.timeline) &
+            _db.remoteExifEntity.city.equals(place),
+      )
+      ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
+      ..limit(count, offset: offset);
+    return query
+        .map((row) => row.readTable(_db.remoteAssetEntity).toDto())
+        .get();
+  }
+
   TimelineQuery _remoteQueryBuilder({
     required Expression<bool> Function($RemoteAssetEntityTable row) filter,
     GroupAssetsBy groupBy = GroupAssetsBy.day,
diff --git a/mobile/lib/presentation/pages/drift_library.page.dart b/mobile/lib/presentation/pages/drift_library.page.dart
index 1e8975dcfa..552733980e 100644
--- a/mobile/lib/presentation/pages/drift_library.page.dart
+++ b/mobile/lib/presentation/pages/drift_library.page.dart
@@ -256,9 +256,7 @@ class _PlacesCollectionCard extends StatelessWidget {
 
         return GestureDetector(
           onTap: () => context.pushRoute(
-            PlacesCollectionRoute(
-              currentLocation: null,
-            ),
+            DriftPlaceRoute(currentLocation: null),
           ),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/mobile/lib/presentation/pages/drift_place.page.dart b/mobile/lib/presentation/pages/drift_place.page.dart
new file mode 100644
index 0000000000..5e5b932f60
--- /dev/null
+++ b/mobile/lib/presentation/pages/drift_place.page.dart
@@ -0,0 +1,190 @@
+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/translate_extensions.dart';
+import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/common/search_field.dart';
+import 'package:immich_mobile/widgets/map/map_thumbnail.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
+
+@RoutePage()
+class DriftPlacePage extends StatelessWidget {
+  const DriftPlacePage({super.key, this.currentLocation});
+
+  final LatLng? currentLocation;
+
+  @override
+  Widget build(BuildContext context) {
+    final ValueNotifier<String?> search = ValueNotifier(null);
+
+    return Scaffold(
+      body: CustomScrollView(
+        slivers: [
+          _PlaceSliverAppBar(search: search),
+          _Map(search: search, currentLocation: currentLocation),
+          _PlaceList(search: search),
+        ],
+      ),
+    );
+  }
+}
+
+class _PlaceSliverAppBar extends StatelessWidget {
+  const _PlaceSliverAppBar({required this.search});
+
+  final ValueNotifier<String?> search;
+
+  @override
+  Widget build(BuildContext context) {
+    final searchFocusNode = FocusNode();
+
+    return SliverAppBar(
+      floating: true,
+      pinned: true,
+      snap: false,
+      backgroundColor: context.colorScheme.surfaceContainer,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(Radius.circular(5)),
+      ),
+      automaticallyImplyLeading: search.value == null,
+      centerTitle: true,
+      title: search.value != null
+          ? SearchField(
+              focusNode: searchFocusNode,
+              onTapOutside: (_) => searchFocusNode.unfocus(),
+              onChanged: (value) => search.value = value,
+              filled: true,
+              hintText: 'filter_places'.t(context: context),
+              autofocus: true,
+            )
+          : Text('places'.t(context: context)),
+      actions: [
+        IconButton(
+          icon: Icon(search.value != null ? Icons.close : Icons.search),
+          onPressed: () {
+            search.value = search.value == null ? '' : null;
+          },
+        ),
+      ],
+    );
+  }
+}
+
+class _Map extends StatelessWidget {
+  const _Map({required this.search, this.currentLocation});
+
+  final ValueNotifier<String?> search;
+  final LatLng? currentLocation;
+
+  @override
+  Widget build(BuildContext context) {
+    return search.value == null
+        ? SliverPadding(
+            padding: const EdgeInsets.all(16.0),
+            sliver: SliverToBoxAdapter(
+              child: SizedBox(
+                height: 200,
+                width: context.width,
+                // TODO: migrate to DriftMapRoute after merging #19898
+                child: MapThumbnail(
+                  onTap: (_, __) => context
+                      .pushRoute(MapRoute(initialLocation: currentLocation)),
+                  zoom: 8,
+                  centre: currentLocation ??
+                      const LatLng(
+                        21.44950,
+                        -157.91959,
+                      ),
+                  showAttribution: false,
+                  themeMode:
+                      context.isDarkTheme ? ThemeMode.dark : ThemeMode.light,
+                ),
+              ),
+            ),
+          )
+        : const SizedBox.shrink();
+  }
+}
+
+class _PlaceList extends ConsumerWidget {
+  const _PlaceList({required this.search});
+
+  final ValueNotifier<String?> search;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final places = ref.watch(placesProvider);
+
+    return places.when(
+      loading: () => const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: CircularProgressIndicator(),
+          ),
+        ),
+      ),
+      error: (error, stack) => SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(20.0),
+            child: Text(
+              'Error loading places: $error, stack: $stack',
+              style: TextStyle(
+                color: context.colorScheme.error,
+              ),
+            ),
+          ),
+        ),
+      ),
+      data: (places) {
+        if (search.value != null) {
+          places = places.where((place) {
+            return place.$1.toLowerCase().contains(search.value!.toLowerCase());
+          }).toList();
+        }
+
+        return SliverList.builder(
+          itemCount: places.length,
+          itemBuilder: (context, index) {
+            final place = places[index];
+            return _PlaceTile(place: place);
+          },
+        );
+      },
+    );
+  }
+}
+
+class _PlaceTile extends StatelessWidget {
+  const _PlaceTile({required this.place});
+
+  final (String, String) place;
+
+  @override
+  Widget build(BuildContext context) {
+    return LargeLeadingTile(
+      onTap: () => context.pushRoute(DriftPlaceDetailRoute(place: place.$1)),
+      title: Text(
+        place.$1,
+        style: context.textTheme.titleMedium?.copyWith(
+          fontWeight: FontWeight.w500,
+        ),
+      ),
+      leading: ClipRRect(
+        borderRadius: const BorderRadius.all(
+          Radius.circular(20),
+        ),
+        child: Thumbnail(
+          size: const Size(80, 80),
+          fit: BoxFit.cover,
+          remoteId: place.$2,
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/drift_place_detail.page.dart b/mobile/lib/presentation/pages/drift_place_detail.page.dart
new file mode 100644
index 0000000000..9999d35297
--- /dev/null
+++ b/mobile/lib/presentation/pages/drift_place_detail.page.dart
@@ -0,0 +1,38 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
+
+@RoutePage()
+class DriftPlaceDetailPage extends StatelessWidget {
+  final String place;
+
+  const DriftPlaceDetailPage({
+    super.key,
+    required this.place,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final timelineService =
+                ref.watch(timelineFactoryProvider).place(place);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: Timeline(
+        appBar: MesmerizingSliverAppBar(
+          title: place,
+          icon: Icons.location_on,
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/providers/infrastructure/asset.provider.dart b/mobile/lib/providers/infrastructure/asset.provider.dart
index 0015986243..102e6aa60c 100644
--- a/mobile/lib/providers/infrastructure/asset.provider.dart
+++ b/mobile/lib/providers/infrastructure/asset.provider.dart
@@ -18,3 +18,10 @@ final assetServiceProvider = Provider(
     localAssetRepository: ref.watch(localAssetRepository),
   ),
 );
+
+final placesProvider = FutureProvider<List<(String, String)>>(
+  (ref) => AssetService(
+    remoteAssetRepository: ref.watch(remoteAssetRepositoryProvider),
+    localAssetRepository: ref.watch(localAssetRepository),
+  ).getPlaces(),
+);
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 5fcd060b0c..7cd628606b 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -72,6 +72,8 @@ import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_favorite.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_partner_detail.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_local_album.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_place.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_place_detail.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_recently_taken.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_video.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_trash.page.dart';
@@ -453,7 +455,14 @@ class AppRouter extends RootStackRouter {
       page: DriftCreateAlbumRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
-
+    AutoRoute(
+      page: DriftPlaceRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
+    AutoRoute(
+      page: DriftPlaceDetailRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index bd2b148455..e4719697c2 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -853,6 +853,85 @@ class DriftPartnerDetailRouteArgs {
   }
 }
 
+/// generated route for
+/// [DriftPlaceDetailPage]
+class DriftPlaceDetailRoute extends PageRouteInfo<DriftPlaceDetailRouteArgs> {
+  DriftPlaceDetailRoute({
+    Key? key,
+    required String place,
+    List<PageRouteInfo>? children,
+  }) : super(
+          DriftPlaceDetailRoute.name,
+          args: DriftPlaceDetailRouteArgs(key: key, place: place),
+          initialChildren: children,
+        );
+
+  static const String name = 'DriftPlaceDetailRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<DriftPlaceDetailRouteArgs>();
+      return DriftPlaceDetailPage(key: args.key, place: args.place);
+    },
+  );
+}
+
+class DriftPlaceDetailRouteArgs {
+  const DriftPlaceDetailRouteArgs({this.key, required this.place});
+
+  final Key? key;
+
+  final String place;
+
+  @override
+  String toString() {
+    return 'DriftPlaceDetailRouteArgs{key: $key, place: $place}';
+  }
+}
+
+/// generated route for
+/// [DriftPlacePage]
+class DriftPlaceRoute extends PageRouteInfo<DriftPlaceRouteArgs> {
+  DriftPlaceRoute({
+    Key? key,
+    LatLng? currentLocation,
+    List<PageRouteInfo>? children,
+  }) : super(
+          DriftPlaceRoute.name,
+          args: DriftPlaceRouteArgs(key: key, currentLocation: currentLocation),
+          initialChildren: children,
+        );
+
+  static const String name = 'DriftPlaceRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<DriftPlaceRouteArgs>(
+        orElse: () => const DriftPlaceRouteArgs(),
+      );
+      return DriftPlacePage(
+        key: args.key,
+        currentLocation: args.currentLocation,
+      );
+    },
+  );
+}
+
+class DriftPlaceRouteArgs {
+  const DriftPlaceRouteArgs({this.key, this.currentLocation});
+
+  final Key? key;
+
+  final LatLng? currentLocation;
+
+  @override
+  String toString() {
+    return 'DriftPlaceRouteArgs{key: $key, currentLocation: $currentLocation}';
+  }
+}
+
 /// generated route for
 /// [DriftRecentlyTakenPage]
 class DriftRecentlyTakenRoute extends PageRouteInfo<void> {
diff --git a/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
index 36f944dbcd..faaccfa51a 100644
--- a/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
@@ -482,10 +482,10 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground>
       builder: (context, child) {
         return Transform.scale(
           scale: _zoomAnimation.value,
-          filterQuality: FilterQuality.low,
+          filterQuality: Platform.isAndroid ? FilterQuality.low : null,
           child: Transform.translate(
             offset: _panAnimation.value,
-            filterQuality: FilterQuality.low,
+            filterQuality: Platform.isAndroid ? FilterQuality.low : null,
             child: Stack(
               fit: StackFit.expand,
               children: [

From c18f167e294bfc858ff5875fa62b4216f6151101 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 16:42:49 +0100
Subject: [PATCH 210/337] chore(deps): update immich-app/devtools action to
 v0.1.1 (#19938)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7bb7f72b51..03f74dd7a3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -131,7 +131,7 @@ jobs:
             tag-suffix: '-rocm'
             platforms: linux/amd64
             runner-mapping: '{"linux/amd64": "mich"}'
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@094bfb927b8cd75b343abaac27b3241be0fccfe9 # multi-runner-build-workflow-0.1.0
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@129aeda75a450666ce96e8bc8126652e717917a7 # multi-runner-build-workflow-0.1.1
     permissions:
       contents: read
       actions: read
@@ -154,7 +154,7 @@ jobs:
     name: Build and Push Server
     needs: pre-job
     if: ${{ needs.pre-job.outputs.should_run_server == 'true' }}
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@094bfb927b8cd75b343abaac27b3241be0fccfe9 # multi-runner-build-workflow-0.1.0
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@129aeda75a450666ce96e8bc8126652e717917a7 # multi-runner-build-workflow-0.1.1
     permissions:
       contents: read
       actions: read

From b359eea124daf400d65f7f96e9698ab17500d904 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 16:43:14 +0100
Subject: [PATCH 211/337] chore(deps): update prom/prometheus docker digest to
 63805eb (#19933)

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 bf70c43e4a..fb1312e862 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:7a34573f0b9c952286b33d537f233cd5b708e12263733aa646e50c33f598f16c
+    image: prom/prometheus@sha256:63805ebb8d2b3920190daf1cb14a60871b16fd38bed42b857a3182bc621f4996
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - prometheus-data:/prometheus

From eca54871d06aba7489305354a4bd4f8aa12305db Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 15:43:36 +0000
Subject: [PATCH 212/337] chore(deps): update
 docker.io/valkey/valkey:8-bookworm docker digest to facc1d2 (#19932)

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

diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 0694bf57f2..56d1817317 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -116,7 +116,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8-bookworm@sha256:fec42f399876eb6faf9e008570597741c87ff7662a54185593e74b09ce83d177
+    image: docker.io/valkey/valkey:8-bookworm@sha256:facc1d2c3462975c34e10fccb167bfa92b0e0dbd992fc282c29a61c3243afb11
     healthcheck:
       test: redis-cli ping || exit 1
 
diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
index fb1312e862..a025ff4cc5 100644
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -56,7 +56,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8-bookworm@sha256:fec42f399876eb6faf9e008570597741c87ff7662a54185593e74b09ce83d177
+    image: docker.io/valkey/valkey:8-bookworm@sha256:facc1d2c3462975c34e10fccb167bfa92b0e0dbd992fc282c29a61c3243afb11
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 95d375ccd6..6af0e0aa2a 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -49,7 +49,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8-bookworm@sha256:fec42f399876eb6faf9e008570597741c87ff7662a54185593e74b09ce83d177
+    image: docker.io/valkey/valkey:8-bookworm@sha256:facc1d2c3462975c34e10fccb167bfa92b0e0dbd992fc282c29a61c3243afb11
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always

From 68f249bc03a44f486a238c0657d9e9554c38aa19 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Tue, 15 Jul 2025 12:23:41 -0400
Subject: [PATCH 213/337] feat: improve geodata import speed (#19906)

chore(deps): update dependency vite to v7 (#19657)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
---
 server/src/repositories/map.repository.ts | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/server/src/repositories/map.repository.ts b/server/src/repositories/map.repository.ts
index ff2e28b8d7..64c8a6229d 100644
--- a/server/src/repositories/map.repository.ts
+++ b/server/src/repositories/map.repository.ts
@@ -265,6 +265,9 @@ export class MapRepository {
       throw new Error(`Geodata file ${cities500} not found`);
     }
 
+    this.logger.log(`Starting geodata import`);
+    const startTime = performance.now();
+
     const input = createReadStream(cities500, { highWaterMark: 512 * 1024 * 1024 });
     let bufferGeodata = [];
     const lineReader = readLine.createInterface({ input });
@@ -314,7 +317,20 @@ export class MapRepository {
       }
     }
 
-    await this.db.insertInto('geodata_places').values(bufferGeodata).execute();
+    if (bufferGeodata.length > 0) {
+      await this.db.insertInto('geodata_places').values(bufferGeodata).execute();
+      count += bufferGeodata.length;
+    }
+
+    await Promise.all(futures);
+
+    const duration = performance.now() - startTime;
+    const seconds = duration / 1000;
+    const recordsPerSecond = Math.round(count / seconds);
+
+    this.logger.log(
+      `Successfully imported ${count} geodata records in ${seconds.toFixed(2)}s (${recordsPerSecond} records/second)`,
+    );
   }
 
   private async loadAdmin(filePath: string) {

From 351701c4d66689d35cccc43a4fc81f6efb783840 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 15 Jul 2025 13:14:57 -0400
Subject: [PATCH 214/337] refactor: validate enum (#19943)

---
 .../controllers/api-key.controller.spec.ts    |  7 +++
 server/src/dtos/activity.dto.ts               | 17 ++----
 server/src/dtos/album.dto.ts                  | 22 +++----
 server/src/dtos/api-key.dto.ts                | 14 ++---
 server/src/dtos/asset-media-response.dto.ts   |  4 +-
 server/src/dtos/asset-media.dto.ts            | 10 ++-
 server/src/dtos/asset-response.dto.ts         |  5 +-
 server/src/dtos/asset.dto.ts                  | 10 ++-
 server/src/dtos/job.dto.ts                    | 14 ++---
 server/src/dtos/memory.dto.ts                 | 13 ++--
 server/src/dtos/notification.dto.ts           | 26 +++-----
 server/src/dtos/onboarding.dto.ts             |  5 +-
 server/src/dtos/partner.dto.ts                |  7 +--
 server/src/dtos/person.dto.ts                 |  3 +-
 server/src/dtos/search.dto.ts                 | 18 ++----
 server/src/dtos/shared-link.dto.ts            |  9 ++-
 server/src/dtos/sync.dto.ts                   | 23 +++----
 server/src/dtos/system-config.dto.ts          | 61 +++++++------------
 server/src/dtos/system-metadata.dto.ts        |  5 +-
 server/src/dtos/time-bucket.dto.ts            | 21 ++++---
 server/src/dtos/user-preferences.dto.ts       | 14 ++---
 server/src/dtos/user.dto.ts                   | 29 +++------
 server/src/validation.ts                      | 49 ++++++++-------
 23 files changed, 161 insertions(+), 225 deletions(-)

diff --git a/server/src/controllers/api-key.controller.spec.ts b/server/src/controllers/api-key.controller.spec.ts
index 434fa2b7aa..f58a53723a 100644
--- a/server/src/controllers/api-key.controller.spec.ts
+++ b/server/src/controllers/api-key.controller.spec.ts
@@ -59,6 +59,13 @@ describe(APIKeyController.name, () => {
       expect(status).toBe(400);
       expect(body).toEqual(factory.responses.badRequest(['id must be a UUID']));
     });
+
+    it('should allow updating just the name', async () => {
+      const { status } = await request(ctx.getHttpServer())
+        .put(`/api-keys/${factory.uuid()}`)
+        .send({ name: 'new name' });
+      expect(status).toBe(200);
+    });
   });
 
   describe('DELETE /api-keys/:id', () => {
diff --git a/server/src/dtos/activity.dto.ts b/server/src/dtos/activity.dto.ts
index d11fe8da7e..4b11a16e14 100644
--- a/server/src/dtos/activity.dto.ts
+++ b/server/src/dtos/activity.dto.ts
@@ -1,8 +1,8 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsNotEmpty, IsString, ValidateIf } from 'class-validator';
+import { IsNotEmpty, IsString, ValidateIf } from 'class-validator';
 import { Activity } from 'src/database';
 import { mapUser, UserResponseDto } from 'src/dtos/user.dto';
-import { Optional, ValidateUUID } from 'src/validation';
+import { ValidateEnum, ValidateUUID } from 'src/validation';
 
 export enum ReactionType {
   COMMENT = 'comment',
@@ -19,7 +19,7 @@ export type MaybeDuplicate<T> = { duplicate: boolean; value: T };
 export class ActivityResponseDto {
   id!: string;
   createdAt!: Date;
-  @ApiProperty({ enumName: 'ReactionType', enum: ReactionType })
+  @ValidateEnum({ enum: ReactionType, name: 'ReactionType' })
   type!: ReactionType;
   user!: UserResponseDto;
   assetId!: string | null;
@@ -43,14 +43,10 @@ export class ActivityDto {
 }
 
 export class ActivitySearchDto extends ActivityDto {
-  @IsEnum(ReactionType)
-  @Optional()
-  @ApiProperty({ enumName: 'ReactionType', enum: ReactionType })
+  @ValidateEnum({ enum: ReactionType, name: 'ReactionType', optional: true })
   type?: ReactionType;
 
-  @IsEnum(ReactionLevel)
-  @Optional()
-  @ApiProperty({ enumName: 'ReactionLevel', enum: ReactionLevel })
+  @ValidateEnum({ enum: ReactionLevel, name: 'ReactionLevel', optional: true })
   level?: ReactionLevel;
 
   @ValidateUUID({ optional: true })
@@ -60,8 +56,7 @@ export class ActivitySearchDto extends ActivityDto {
 const isComment = (dto: ActivityCreateDto) => dto.type === ReactionType.COMMENT;
 
 export class ActivityCreateDto extends ActivityDto {
-  @IsEnum(ReactionType)
-  @ApiProperty({ enumName: 'ReactionType', enum: ReactionType })
+  @ValidateEnum({ enum: ReactionType, name: 'ReactionType' })
   type!: ReactionType;
 
   @ValidateIf(isComment)
diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts
index 40e51ef729..c6cde0894f 100644
--- a/server/src/dtos/album.dto.ts
+++ b/server/src/dtos/album.dto.ts
@@ -1,13 +1,13 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
-import { ArrayNotEmpty, IsArray, IsEnum, IsString, ValidateNested } from 'class-validator';
+import { ArrayNotEmpty, IsArray, IsString, ValidateNested } from 'class-validator';
 import _ from 'lodash';
 import { AlbumUser, AuthSharedLink, User } from 'src/database';
 import { AssetResponseDto, MapAsset, mapAsset } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { AlbumUserRole, AssetOrder } from 'src/enum';
-import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateEnum, ValidateUUID } from 'src/validation';
 
 export class AlbumInfoDto {
   @ValidateBoolean({ optional: true })
@@ -18,8 +18,7 @@ export class AlbumUserAddDto {
   @ValidateUUID()
   userId!: string;
 
-  @IsEnum(AlbumUserRole)
-  @ApiProperty({ enum: AlbumUserRole, enumName: 'AlbumUserRole', default: AlbumUserRole.EDITOR })
+  @ValidateEnum({ enum: AlbumUserRole, name: 'AlbumUserRole', default: AlbumUserRole.EDITOR })
   role?: AlbumUserRole;
 }
 
@@ -32,8 +31,7 @@ export class AlbumUserCreateDto {
   @ValidateUUID()
   userId!: string;
 
-  @IsEnum(AlbumUserRole)
-  @ApiProperty({ enum: AlbumUserRole, enumName: 'AlbumUserRole' })
+  @ValidateEnum({ enum: AlbumUserRole, name: 'AlbumUserRole' })
   role!: AlbumUserRole;
 }
 
@@ -71,9 +69,7 @@ export class UpdateAlbumDto {
   @ValidateBoolean({ optional: true })
   isActivityEnabled?: boolean;
 
-  @IsEnum(AssetOrder)
-  @Optional()
-  @ApiProperty({ enum: AssetOrder, enumName: 'AssetOrder' })
+  @ValidateEnum({ enum: AssetOrder, name: 'AssetOrder', optional: true })
   order?: AssetOrder;
 }
 
@@ -107,14 +103,13 @@ export class AlbumStatisticsResponseDto {
 }
 
 export class UpdateAlbumUserDto {
-  @IsEnum(AlbumUserRole)
-  @ApiProperty({ enum: AlbumUserRole, enumName: 'AlbumUserRole' })
+  @ValidateEnum({ enum: AlbumUserRole, name: 'AlbumUserRole' })
   role!: AlbumUserRole;
 }
 
 export class AlbumUserResponseDto {
   user!: UserResponseDto;
-  @ApiProperty({ enum: AlbumUserRole, enumName: 'AlbumUserRole' })
+  @ValidateEnum({ enum: AlbumUserRole, name: 'AlbumUserRole' })
   role!: AlbumUserRole;
 }
 
@@ -137,8 +132,7 @@ export class AlbumResponseDto {
   startDate?: Date;
   endDate?: Date;
   isActivityEnabled!: boolean;
-  @Optional()
-  @ApiProperty({ enumName: 'AssetOrder', enum: AssetOrder })
+  @ValidateEnum({ enum: AssetOrder, name: 'AssetOrder', optional: true })
   order?: AssetOrder;
 }
 
diff --git a/server/src/dtos/api-key.dto.ts b/server/src/dtos/api-key.dto.ts
index c790ea613d..c9475fa2b1 100644
--- a/server/src/dtos/api-key.dto.ts
+++ b/server/src/dtos/api-key.dto.ts
@@ -1,15 +1,13 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { ArrayMinSize, IsEnum, IsNotEmpty, IsString } from 'class-validator';
+import { ArrayMinSize, IsNotEmpty, IsString } from 'class-validator';
 import { Permission } from 'src/enum';
-import { Optional } from 'src/validation';
+import { Optional, ValidateEnum } from 'src/validation';
 export class APIKeyCreateDto {
   @IsString()
   @IsNotEmpty()
   @Optional()
   name?: string;
 
-  @IsEnum(Permission, { each: true })
-  @ApiProperty({ enum: Permission, enumName: 'Permission', isArray: true })
+  @ValidateEnum({ enum: Permission, name: 'Permission', each: true })
   @ArrayMinSize(1)
   permissions!: Permission[];
 }
@@ -20,9 +18,7 @@ export class APIKeyUpdateDto {
   @IsNotEmpty()
   name?: string;
 
-  @Optional()
-  @IsEnum(Permission, { each: true })
-  @ApiProperty({ enum: Permission, enumName: 'Permission', isArray: true })
+  @ValidateEnum({ enum: Permission, name: 'Permission', each: true, optional: true })
   @ArrayMinSize(1)
   permissions?: Permission[];
 }
@@ -37,6 +33,6 @@ export class APIKeyResponseDto {
   name!: string;
   createdAt!: Date;
   updatedAt!: Date;
-  @ApiProperty({ enum: Permission, enumName: 'Permission', isArray: true })
+  @ValidateEnum({ enum: Permission, name: 'Permission', each: true })
   permissions!: Permission[];
 }
diff --git a/server/src/dtos/asset-media-response.dto.ts b/server/src/dtos/asset-media-response.dto.ts
index 5cd9b7e7d9..887762dbdd 100644
--- a/server/src/dtos/asset-media-response.dto.ts
+++ b/server/src/dtos/asset-media-response.dto.ts
@@ -1,4 +1,4 @@
-import { ApiProperty } from '@nestjs/swagger';
+import { ValidateEnum } from 'src/validation';
 
 export enum AssetMediaStatus {
   CREATED = 'created',
@@ -6,7 +6,7 @@ export enum AssetMediaStatus {
   DUPLICATE = 'duplicate',
 }
 export class AssetMediaResponseDto {
-  @ApiProperty({ enum: AssetMediaStatus, enumName: 'AssetMediaStatus' })
+  @ValidateEnum({ enum: AssetMediaStatus, name: 'AssetMediaStatus' })
   status!: AssetMediaStatus;
   id!: string;
 }
diff --git a/server/src/dtos/asset-media.dto.ts b/server/src/dtos/asset-media.dto.ts
index 92e1302864..ea86e087d8 100644
--- a/server/src/dtos/asset-media.dto.ts
+++ b/server/src/dtos/asset-media.dto.ts
@@ -1,8 +1,8 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
-import { ArrayNotEmpty, IsArray, IsEnum, IsNotEmpty, IsString, ValidateNested } from 'class-validator';
+import { ArrayNotEmpty, IsArray, IsNotEmpty, IsString, ValidateNested } from 'class-validator';
 import { AssetVisibility } from 'src/enum';
-import { Optional, ValidateAssetVisibility, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateDate, ValidateEnum, ValidateUUID } from 'src/validation';
 
 export enum AssetMediaSize {
   /**
@@ -15,9 +15,7 @@ export enum AssetMediaSize {
 }
 
 export class AssetMediaOptionsDto {
-  @Optional()
-  @IsEnum(AssetMediaSize)
-  @ApiProperty({ enumName: 'AssetMediaSize', enum: AssetMediaSize })
+  @ValidateEnum({ enum: AssetMediaSize, name: 'AssetMediaSize', optional: true })
   size?: AssetMediaSize;
 }
 
@@ -60,7 +58,7 @@ export class AssetMediaCreateDto extends AssetMediaBase {
   @ValidateBoolean({ optional: true })
   isFavorite?: boolean;
 
-  @ValidateAssetVisibility({ optional: true })
+  @ValidateEnum({ enum: AssetVisibility, name: 'AssetVisibility', optional: true })
   visibility?: AssetVisibility;
 
   @ValidateUUID({ optional: true })
diff --git a/server/src/dtos/asset-response.dto.ts b/server/src/dtos/asset-response.dto.ts
index 1e214c3860..5b587e59ba 100644
--- a/server/src/dtos/asset-response.dto.ts
+++ b/server/src/dtos/asset-response.dto.ts
@@ -15,10 +15,11 @@ import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { AssetStatus, AssetType, AssetVisibility } from 'src/enum';
 import { hexOrBufferToBase64 } from 'src/utils/bytes';
 import { mimeTypes } from 'src/utils/mime-types';
+import { ValidateEnum } from 'src/validation';
 
 export class SanitizedAssetResponseDto {
   id!: string;
-  @ApiProperty({ enumName: 'AssetTypeEnum', enum: AssetType })
+  @ValidateEnum({ enum: AssetType, name: 'AssetTypeEnum' })
   type!: AssetType;
   thumbhash!: string | null;
   originalMimeType?: string;
@@ -72,7 +73,7 @@ export class AssetResponseDto extends SanitizedAssetResponseDto {
   isArchived!: boolean;
   isTrashed!: boolean;
   isOffline!: boolean;
-  @ApiProperty({ enum: AssetVisibility, enumName: 'AssetVisibility' })
+  @ValidateEnum({ enum: AssetVisibility, name: 'AssetVisibility' })
   visibility!: AssetVisibility;
   exifInfo?: ExifResponseDto;
   tags?: TagResponseDto[];
diff --git a/server/src/dtos/asset.dto.ts b/server/src/dtos/asset.dto.ts
index 940cfbf9cc..727ab1625d 100644
--- a/server/src/dtos/asset.dto.ts
+++ b/server/src/dtos/asset.dto.ts
@@ -2,7 +2,6 @@ import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
 import {
   IsDateString,
-  IsEnum,
   IsInt,
   IsLatitude,
   IsLongitude,
@@ -16,7 +15,7 @@ import {
 import { BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AssetType, AssetVisibility } from 'src/enum';
 import { AssetStats } from 'src/repositories/asset.repository';
-import { Optional, ValidateAssetVisibility, ValidateBoolean, ValidateUUID } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateEnum, ValidateUUID } from 'src/validation';
 
 export class DeviceIdDto {
   @IsNotEmpty()
@@ -32,7 +31,7 @@ export class UpdateAssetBase {
   @ValidateBoolean({ optional: true })
   isFavorite?: boolean;
 
-  @ValidateAssetVisibility({ optional: true })
+  @ValidateEnum({ enum: AssetVisibility, name: 'AssetVisibility', optional: true })
   visibility?: AssetVisibility;
 
   @Optional()
@@ -99,13 +98,12 @@ export enum AssetJobName {
 }
 
 export class AssetJobsDto extends AssetIdsDto {
-  @ApiProperty({ enumName: 'AssetJobName', enum: AssetJobName })
-  @IsEnum(AssetJobName)
+  @ValidateEnum({ enum: AssetJobName, name: 'AssetJobName' })
   name!: AssetJobName;
 }
 
 export class AssetStatsDto {
-  @ValidateAssetVisibility({ optional: true })
+  @ValidateEnum({ enum: AssetVisibility, name: 'AssetVisibility', optional: true })
   visibility?: AssetVisibility;
 
   @ValidateBoolean({ optional: true })
diff --git a/server/src/dtos/job.dto.ts b/server/src/dtos/job.dto.ts
index ce6aad4c06..60124c877a 100644
--- a/server/src/dtos/job.dto.ts
+++ b/server/src/dtos/job.dto.ts
@@ -1,19 +1,14 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsNotEmpty } from 'class-validator';
 import { JobCommand, ManualJobName, QueueName } from 'src/enum';
-import { ValidateBoolean } from 'src/validation';
+import { ValidateBoolean, ValidateEnum } from 'src/validation';
 
 export class JobIdParamDto {
-  @IsNotEmpty()
-  @IsEnum(QueueName)
-  @ApiProperty({ type: String, enum: QueueName, enumName: 'JobName' })
+  @ValidateEnum({ enum: QueueName, name: 'JobName' })
   id!: QueueName;
 }
 
 export class JobCommandDto {
-  @IsNotEmpty()
-  @IsEnum(JobCommand)
-  @ApiProperty({ type: 'string', enum: JobCommand, enumName: 'JobCommand' })
+  @ValidateEnum({ enum: JobCommand, name: 'JobCommand' })
   command!: JobCommand;
 
   @ValidateBoolean({ optional: true })
@@ -21,8 +16,7 @@ export class JobCommandDto {
 }
 
 export class JobCreateDto {
-  @IsEnum(ManualJobName)
-  @ApiProperty({ type: 'string', enum: ManualJobName, enumName: 'ManualJobName' })
+  @ValidateEnum({ enum: ManualJobName, name: 'ManualJobName' })
   name!: ManualJobName;
 }
 
diff --git a/server/src/dtos/memory.dto.ts b/server/src/dtos/memory.dto.ts
index 675039363b..e92e11bdfb 100644
--- a/server/src/dtos/memory.dto.ts
+++ b/server/src/dtos/memory.dto.ts
@@ -1,11 +1,11 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
-import { IsEnum, IsInt, IsObject, IsPositive, ValidateNested } from 'class-validator';
+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 { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
+import { ValidateBoolean, ValidateDate, ValidateEnum, ValidateUUID } from 'src/validation';
 
 class MemoryBaseDto {
   @ValidateBoolean({ optional: true })
@@ -16,9 +16,7 @@ class MemoryBaseDto {
 }
 
 export class MemorySearchDto {
-  @Optional()
-  @IsEnum(MemoryType)
-  @ApiProperty({ enum: MemoryType, enumName: 'MemoryType' })
+  @ValidateEnum({ enum: MemoryType, name: 'MemoryType', optional: true })
   type?: MemoryType;
 
   @ValidateDate({ optional: true })
@@ -45,8 +43,7 @@ export class MemoryUpdateDto extends MemoryBaseDto {
 }
 
 export class MemoryCreateDto extends MemoryBaseDto {
-  @IsEnum(MemoryType)
-  @ApiProperty({ enum: MemoryType, enumName: 'MemoryType' })
+  @ValidateEnum({ enum: MemoryType, name: 'MemoryType' })
   type!: MemoryType;
 
   @IsObject()
@@ -86,7 +83,7 @@ export class MemoryResponseDto {
   showAt?: Date;
   hideAt?: Date;
   ownerId!: string;
-  @ApiProperty({ enumName: 'MemoryType', enum: MemoryType })
+  @ValidateEnum({ enum: MemoryType, name: 'MemoryType' })
   type!: MemoryType;
   data!: MemoryData;
   isSaved!: boolean;
diff --git a/server/src/dtos/notification.dto.ts b/server/src/dtos/notification.dto.ts
index d9847cda17..e83ba7315f 100644
--- a/server/src/dtos/notification.dto.ts
+++ b/server/src/dtos/notification.dto.ts
@@ -1,7 +1,6 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsString } from 'class-validator';
+import { IsString } from 'class-validator';
 import { NotificationLevel, NotificationType } from 'src/enum';
-import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateDate, ValidateEnum, ValidateUUID } from 'src/validation';
 
 export class TestEmailResponseDto {
   messageId!: string;
@@ -19,9 +18,9 @@ export class NotificationDto {
   id!: string;
   @ValidateDate()
   createdAt!: Date;
-  @ApiProperty({ enum: NotificationLevel, enumName: 'NotificationLevel' })
+  @ValidateEnum({ enum: NotificationLevel, name: 'NotificationLevel' })
   level!: NotificationLevel;
-  @ApiProperty({ enum: NotificationType, enumName: 'NotificationType' })
+  @ValidateEnum({ enum: NotificationType, name: 'NotificationType' })
   type!: NotificationType;
   title!: string;
   description?: string;
@@ -30,18 +29,13 @@ export class NotificationDto {
 }
 
 export class NotificationSearchDto {
-  @Optional()
   @ValidateUUID({ optional: true })
   id?: string;
 
-  @IsEnum(NotificationLevel)
-  @Optional()
-  @ApiProperty({ enum: NotificationLevel, enumName: 'NotificationLevel' })
+  @ValidateEnum({ enum: NotificationLevel, name: 'NotificationLevel', optional: true })
   level?: NotificationLevel;
 
-  @IsEnum(NotificationType)
-  @Optional()
-  @ApiProperty({ enum: NotificationType, enumName: 'NotificationType' })
+  @ValidateEnum({ enum: NotificationType, name: 'NotificationType', optional: true })
   type?: NotificationType;
 
   @ValidateBoolean({ optional: true })
@@ -49,14 +43,10 @@ export class NotificationSearchDto {
 }
 
 export class NotificationCreateDto {
-  @Optional()
-  @IsEnum(NotificationLevel)
-  @ApiProperty({ enum: NotificationLevel, enumName: 'NotificationLevel' })
+  @ValidateEnum({ enum: NotificationLevel, name: 'NotificationLevel', optional: true })
   level?: NotificationLevel;
 
-  @IsEnum(NotificationType)
-  @Optional()
-  @ApiProperty({ enum: NotificationType, enumName: 'NotificationType' })
+  @ValidateEnum({ enum: NotificationType, name: 'NotificationType', optional: true })
   type?: NotificationType;
 
   @IsString()
diff --git a/server/src/dtos/onboarding.dto.ts b/server/src/dtos/onboarding.dto.ts
index 0028fca006..47a3992784 100644
--- a/server/src/dtos/onboarding.dto.ts
+++ b/server/src/dtos/onboarding.dto.ts
@@ -1,8 +1,7 @@
-import { IsBoolean, IsNotEmpty } from 'class-validator';
+import { ValidateBoolean } from 'src/validation';
 
 export class OnboardingDto {
-  @IsBoolean()
-  @IsNotEmpty()
+  @ValidateBoolean()
   isOnboarded!: boolean;
 }
 
diff --git a/server/src/dtos/partner.dto.ts b/server/src/dtos/partner.dto.ts
index 9d86415dc3..28d4adf8b7 100644
--- a/server/src/dtos/partner.dto.ts
+++ b/server/src/dtos/partner.dto.ts
@@ -1,7 +1,7 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsNotEmpty } from 'class-validator';
+import { IsNotEmpty } from 'class-validator';
 import { UserResponseDto } from 'src/dtos/user.dto';
 import { PartnerDirection } from 'src/repositories/partner.repository';
+import { ValidateEnum } from 'src/validation';
 
 export class UpdatePartnerDto {
   @IsNotEmpty()
@@ -9,8 +9,7 @@ export class UpdatePartnerDto {
 }
 
 export class PartnerSearchDto {
-  @IsEnum(PartnerDirection)
-  @ApiProperty({ enum: PartnerDirection, enumName: 'PartnerDirection' })
+  @ValidateEnum({ enum: PartnerDirection, name: 'PartnerDirection' })
   direction!: PartnerDirection;
 }
 
diff --git a/server/src/dtos/person.dto.ts b/server/src/dtos/person.dto.ts
index 18da39b6d4..f9b41627d9 100644
--- a/server/src/dtos/person.dto.ts
+++ b/server/src/dtos/person.dto.ts
@@ -14,6 +14,7 @@ import {
   MaxDateString,
   Optional,
   ValidateBoolean,
+  ValidateEnum,
   ValidateHexColor,
   ValidateUUID,
 } from 'src/validation';
@@ -137,7 +138,7 @@ export class AssetFaceWithoutPersonResponseDto {
   boundingBoxY1!: number;
   @ApiProperty({ type: 'integer' })
   boundingBoxY2!: number;
-  @ApiProperty({ enum: SourceType, enumName: 'SourceType' })
+  @ValidateEnum({ enum: SourceType, name: 'SourceType' })
   sourceType?: SourceType;
 }
 
diff --git a/server/src/dtos/search.dto.ts b/server/src/dtos/search.dto.ts
index 0024a1b34e..85c6fbf0de 100644
--- a/server/src/dtos/search.dto.ts
+++ b/server/src/dtos/search.dto.ts
@@ -1,12 +1,12 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
-import { IsEnum, IsInt, IsNotEmpty, IsString, Max, Min } from 'class-validator';
+import { IsInt, IsNotEmpty, IsString, Max, Min } from 'class-validator';
 import { Place } from 'src/database';
 import { PropertyLifecycle } from 'src/decorators';
 import { AlbumResponseDto } from 'src/dtos/album.dto';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AssetOrder, AssetType, AssetVisibility } from 'src/enum';
-import { Optional, ValidateAssetVisibility, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateDate, ValidateEnum, ValidateUUID } from 'src/validation';
 
 class BaseSearchDto {
   @ValidateUUID({ optional: true, nullable: true })
@@ -17,9 +17,7 @@ class BaseSearchDto {
   @Optional()
   deviceId?: string;
 
-  @IsEnum(AssetType)
-  @Optional()
-  @ApiProperty({ enumName: 'AssetTypeEnum', enum: AssetType })
+  @ValidateEnum({ enum: AssetType, name: 'AssetTypeEnum', optional: true })
   type?: AssetType;
 
   @ValidateBoolean({ optional: true })
@@ -34,7 +32,7 @@ class BaseSearchDto {
   @ValidateBoolean({ optional: true })
   isOffline?: boolean;
 
-  @ValidateAssetVisibility({ optional: true })
+  @ValidateEnum({ enum: AssetVisibility, name: 'AssetVisibility', optional: true })
   visibility?: AssetVisibility;
 
   @ValidateDate({ optional: true })
@@ -172,9 +170,7 @@ export class MetadataSearchDto extends RandomSearchDto {
   @Optional()
   encodedVideoPath?: string;
 
-  @IsEnum(AssetOrder)
-  @Optional()
-  @ApiProperty({ enumName: 'AssetOrder', enum: AssetOrder, default: AssetOrder.DESC })
+  @ValidateEnum({ enum: AssetOrder, name: 'AssetOrder', optional: true, default: AssetOrder.DESC })
   order?: AssetOrder;
 
   @IsInt()
@@ -250,9 +246,7 @@ export enum SearchSuggestionType {
 }
 
 export class SearchSuggestionRequestDto {
-  @IsEnum(SearchSuggestionType)
-  @IsNotEmpty()
-  @ApiProperty({ enumName: 'SearchSuggestionType', enum: SearchSuggestionType })
+  @ValidateEnum({ enum: SearchSuggestionType, name: 'SearchSuggestionType' })
   type!: SearchSuggestionType;
 
   @IsString()
diff --git a/server/src/dtos/shared-link.dto.ts b/server/src/dtos/shared-link.dto.ts
index 8d373b40b6..299590c0e3 100644
--- a/server/src/dtos/shared-link.dto.ts
+++ b/server/src/dtos/shared-link.dto.ts
@@ -1,11 +1,11 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsString } from 'class-validator';
+import { IsString } from 'class-validator';
 import _ from 'lodash';
 import { SharedLink } from 'src/database';
 import { AlbumResponseDto, mapAlbumWithoutAssets } from 'src/dtos/album.dto';
 import { AssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
 import { SharedLinkType } from 'src/enum';
-import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateDate, ValidateEnum, ValidateUUID } from 'src/validation';
 
 export class SharedLinkSearchDto {
   @ValidateUUID({ optional: true })
@@ -13,8 +13,7 @@ export class SharedLinkSearchDto {
 }
 
 export class SharedLinkCreateDto {
-  @IsEnum(SharedLinkType)
-  @ApiProperty({ enum: SharedLinkType, enumName: 'SharedLinkType' })
+  @ValidateEnum({ enum: SharedLinkType, name: 'SharedLinkType' })
   type!: SharedLinkType;
 
   @ValidateUUID({ each: true, optional: true })
@@ -90,7 +89,7 @@ export class SharedLinkResponseDto {
   userId!: string;
   key!: string;
 
-  @ApiProperty({ enumName: 'SharedLinkType', enum: SharedLinkType })
+  @ValidateEnum({ enum: SharedLinkType, name: 'SharedLinkType' })
   type!: SharedLinkType;
   createdAt!: Date;
   expiresAt!: Date | null;
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index 8ba73271e6..9725539e3d 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-function-type */
 import { ApiProperty } from '@nestjs/swagger';
-import { ArrayMaxSize, IsEnum, IsInt, IsPositive, IsString } from 'class-validator';
+import { ArrayMaxSize, IsInt, IsPositive, IsString } from 'class-validator';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import {
   AlbumUserRole,
@@ -13,7 +13,7 @@ import {
   UserMetadataKey,
 } from 'src/enum';
 import { UserMetadata } from 'src/types';
-import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
+import { ValidateBoolean, ValidateDate, ValidateEnum, ValidateUUID } from 'src/validation';
 
 export class AssetFullSyncDto {
   @ValidateUUID({ optional: true })
@@ -90,11 +90,11 @@ export class SyncAssetV1 {
   fileModifiedAt!: Date | null;
   localDateTime!: Date | null;
   duration!: string | null;
-  @ApiProperty({ enumName: 'AssetTypeEnum', enum: AssetType })
+  @ValidateEnum({ enum: AssetType, name: 'AssetTypeEnum' })
   type!: AssetType;
   deletedAt!: Date | null;
   isFavorite!: boolean;
-  @ApiProperty({ enumName: 'AssetVisibility', enum: AssetVisibility })
+  @ValidateEnum({ enum: AssetVisibility, name: 'AssetVisibility' })
   visibility!: AssetVisibility;
   livePhotoVideoId!: string | null;
   stackId!: string | null;
@@ -159,7 +159,7 @@ export class SyncAlbumUserDeleteV1 {
 export class SyncAlbumUserV1 {
   albumId!: string;
   userId!: string;
-  @ApiProperty({ enumName: 'AlbumUserRole', enum: AlbumUserRole })
+  @ValidateEnum({ enum: AlbumUserRole, name: 'AlbumUserRole' })
   role!: AlbumUserRole;
 }
 
@@ -173,7 +173,7 @@ export class SyncAlbumV1 {
   updatedAt!: Date;
   thumbnailAssetId!: string | null;
   isActivityEnabled!: boolean;
-  @ApiProperty({ enumName: 'AssetOrder', enum: AssetOrder })
+  @ValidateEnum({ enum: AssetOrder, name: 'AssetOrder' })
   order!: AssetOrder;
 }
 
@@ -196,7 +196,7 @@ export class SyncMemoryV1 {
   updatedAt!: Date;
   deletedAt!: Date | null;
   ownerId!: string;
-  @ApiProperty({ enumName: 'MemoryType', enum: MemoryType })
+  @ValidateEnum({ enum: MemoryType, name: 'MemoryType' })
   type!: MemoryType;
   data!: object;
   isSaved!: boolean;
@@ -319,8 +319,7 @@ export type SyncItem = {
 };
 
 export class SyncStreamDto {
-  @IsEnum(SyncRequestType, { each: true })
-  @ApiProperty({ enumName: 'SyncRequestType', enum: SyncRequestType, isArray: true })
+  @ValidateEnum({ enum: SyncRequestType, name: 'SyncRequestType', each: true })
   types!: SyncRequestType[];
 
   @ValidateBoolean({ optional: true })
@@ -328,7 +327,7 @@ export class SyncStreamDto {
 }
 
 export class SyncAckDto {
-  @ApiProperty({ enumName: 'SyncEntityType', enum: SyncEntityType })
+  @ValidateEnum({ enum: SyncEntityType, name: 'SyncEntityType' })
   type!: SyncEntityType;
   ack!: string;
 }
@@ -340,8 +339,6 @@ export class SyncAckSetDto {
 }
 
 export class SyncAckDeleteDto {
-  @IsEnum(SyncEntityType, { each: true })
-  @ApiProperty({ enumName: 'SyncEntityType', enum: SyncEntityType, isArray: true })
-  @Optional()
+  @ValidateEnum({ enum: SyncEntityType, name: 'SyncEntityType', optional: true, each: true })
   types?: SyncEntityType[];
 }
diff --git a/server/src/dtos/system-config.dto.ts b/server/src/dtos/system-config.dto.ts
index 49c5e5b4e7..809f381dd6 100644
--- a/server/src/dtos/system-config.dto.ts
+++ b/server/src/dtos/system-config.dto.ts
@@ -2,8 +2,6 @@ import { ApiProperty } from '@nestjs/swagger';
 import { Exclude, Transform, Type } from 'class-transformer';
 import {
   ArrayMinSize,
-  IsBoolean,
-  IsEnum,
   IsInt,
   IsNotEmpty,
   IsNumber,
@@ -34,7 +32,7 @@ import {
   VideoContainer,
 } from 'src/enum';
 import { ConcurrentQueueName } from 'src/types';
-import { IsCronExpression, IsDateStringFormat, Optional, ValidateBoolean } from 'src/validation';
+import { IsCronExpression, IsDateStringFormat, Optional, ValidateBoolean, ValidateEnum } from 'src/validation';
 
 const isLibraryScanEnabled = (config: SystemConfigLibraryScanDto) => config.enabled;
 const isOAuthEnabled = (config: SystemConfigOAuthDto) => config.enabled;
@@ -82,24 +80,19 @@ export class SystemConfigFFmpegDto {
   @IsString()
   preset!: string;
 
-  @IsEnum(VideoCodec)
-  @ApiProperty({ enumName: 'VideoCodec', enum: VideoCodec })
+  @ValidateEnum({ enum: VideoCodec, name: 'VideoCodec' })
   targetVideoCodec!: VideoCodec;
 
-  @IsEnum(VideoCodec, { each: true })
-  @ApiProperty({ enumName: 'VideoCodec', enum: VideoCodec, isArray: true })
+  @ValidateEnum({ enum: VideoCodec, name: 'VideoCodec', each: true })
   acceptedVideoCodecs!: VideoCodec[];
 
-  @IsEnum(AudioCodec)
-  @ApiProperty({ enumName: 'AudioCodec', enum: AudioCodec })
+  @ValidateEnum({ enum: AudioCodec, name: 'AudioCodec' })
   targetAudioCodec!: AudioCodec;
 
-  @IsEnum(AudioCodec, { each: true })
-  @ApiProperty({ enumName: 'AudioCodec', enum: AudioCodec, isArray: true })
+  @ValidateEnum({ enum: AudioCodec, name: 'AudioCodec', each: true })
   acceptedAudioCodecs!: AudioCodec[];
 
-  @IsEnum(VideoContainer, { each: true })
-  @ApiProperty({ enumName: 'VideoContainer', enum: VideoContainer, isArray: true })
+  @ValidateEnum({ enum: VideoContainer, name: 'VideoContainer', each: true })
   acceptedContainers!: VideoContainer[];
 
   @IsString()
@@ -131,8 +124,7 @@ export class SystemConfigFFmpegDto {
   @ValidateBoolean()
   temporalAQ!: boolean;
 
-  @IsEnum(CQMode)
-  @ApiProperty({ enumName: 'CQMode', enum: CQMode })
+  @ValidateEnum({ enum: CQMode, name: 'CQMode' })
   cqMode!: CQMode;
 
   @ValidateBoolean()
@@ -141,19 +133,16 @@ export class SystemConfigFFmpegDto {
   @IsString()
   preferredHwDevice!: string;
 
-  @IsEnum(TranscodePolicy)
-  @ApiProperty({ enumName: 'TranscodePolicy', enum: TranscodePolicy })
+  @ValidateEnum({ enum: TranscodePolicy, name: 'TranscodePolicy' })
   transcode!: TranscodePolicy;
 
-  @IsEnum(TranscodeHWAccel)
-  @ApiProperty({ enumName: 'TranscodeHWAccel', enum: TranscodeHWAccel })
+  @ValidateEnum({ enum: TranscodeHWAccel, name: 'TranscodeHWAccel' })
   accel!: TranscodeHWAccel;
 
   @ValidateBoolean()
   accelDecode!: boolean;
 
-  @IsEnum(ToneMapping)
-  @ApiProperty({ enumName: 'ToneMapping', enum: ToneMapping })
+  @ValidateEnum({ enum: ToneMapping, name: 'ToneMapping' })
   tonemap!: ToneMapping;
 }
 
@@ -264,8 +253,7 @@ class SystemConfigLoggingDto {
   @ValidateBoolean()
   enabled!: boolean;
 
-  @ApiProperty({ enum: LogLevel, enumName: 'LogLevel' })
-  @IsEnum(LogLevel)
+  @ValidateEnum({ enum: LogLevel, name: 'LogLevel' })
   level!: LogLevel;
 }
 
@@ -306,8 +294,7 @@ enum MapTheme {
 }
 
 export class MapThemeDto {
-  @IsEnum(MapTheme)
-  @ApiProperty({ enum: MapTheme, enumName: 'MapTheme' })
+  @ValidateEnum({ enum: MapTheme, name: 'MapTheme' })
   theme!: MapTheme;
 }
 
@@ -368,8 +355,7 @@ class SystemConfigOAuthDto {
   @IsString()
   clientSecret!: string;
 
-  @IsEnum(OAuthTokenEndpointAuthMethod)
-  @ApiProperty({ enum: OAuthTokenEndpointAuthMethod, enumName: 'OAuthTokenEndpointAuthMethod' })
+  @ValidateEnum({ enum: OAuthTokenEndpointAuthMethod, name: 'OAuthTokenEndpointAuthMethod' })
   tokenEndpointAuthMethod!: OAuthTokenEndpointAuthMethod;
 
   @IsInt()
@@ -431,7 +417,7 @@ class SystemConfigReverseGeocodingDto {
 }
 
 class SystemConfigFacesDto {
-  @IsBoolean()
+  @ValidateBoolean()
   import!: boolean;
 }
 
@@ -450,12 +436,12 @@ class SystemConfigServerDto {
   @IsString()
   loginPageMessage!: string;
 
-  @IsBoolean()
+  @ValidateBoolean()
   publicUsers!: boolean;
 }
 
 class SystemConfigSmtpTransportDto {
-  @IsBoolean()
+  @ValidateBoolean()
   ignoreCert!: boolean;
 
   @IsNotEmpty()
@@ -475,7 +461,7 @@ class SystemConfigSmtpTransportDto {
 }
 
 export class SystemConfigSmtpDto {
-  @IsBoolean()
+  @ValidateBoolean()
   enabled!: boolean;
 
   @ValidateIf(isEmailNotificationEnabled)
@@ -548,8 +534,7 @@ export class SystemConfigThemeDto {
 }
 
 class SystemConfigGeneratedImageDto {
-  @IsEnum(ImageFormat)
-  @ApiProperty({ enumName: 'ImageFormat', enum: ImageFormat })
+  @ValidateEnum({ enum: ImageFormat, name: 'ImageFormat' })
   format!: ImageFormat;
 
   @IsInt()
@@ -567,13 +552,10 @@ class SystemConfigGeneratedImageDto {
 }
 
 class SystemConfigGeneratedFullsizeImageDto {
-  @IsBoolean()
-  @Type(() => Boolean)
-  @ApiProperty({ type: 'boolean' })
+  @ValidateBoolean()
   enabled!: boolean;
 
-  @IsEnum(ImageFormat)
-  @ApiProperty({ enumName: 'ImageFormat', enum: ImageFormat })
+  @ValidateEnum({ enum: ImageFormat, name: 'ImageFormat' })
   format!: ImageFormat;
 
   @IsInt()
@@ -600,8 +582,7 @@ export class SystemConfigImageDto {
   @IsObject()
   fullsize!: SystemConfigGeneratedFullsizeImageDto;
 
-  @IsEnum(Colorspace)
-  @ApiProperty({ enumName: 'Colorspace', enum: Colorspace })
+  @ValidateEnum({ enum: Colorspace, name: 'Colorspace' })
   colorspace!: Colorspace;
 
   @ValidateBoolean()
diff --git a/server/src/dtos/system-metadata.dto.ts b/server/src/dtos/system-metadata.dto.ts
index c8e64f2300..0005aee7eb 100644
--- a/server/src/dtos/system-metadata.dto.ts
+++ b/server/src/dtos/system-metadata.dto.ts
@@ -1,11 +1,12 @@
-import { IsBoolean } from 'class-validator';
+import { ValidateBoolean } from 'src/validation';
 
 export class AdminOnboardingUpdateDto {
-  @IsBoolean()
+  @ValidateBoolean()
   isOnboarded!: boolean;
 }
 
 export class AdminOnboardingResponseDto {
+  @ValidateBoolean()
   isOnboarded!: boolean;
 }
 
diff --git a/server/src/dtos/time-bucket.dto.ts b/server/src/dtos/time-bucket.dto.ts
index af2eae7e72..449cec3207 100644
--- a/server/src/dtos/time-bucket.dto.ts
+++ b/server/src/dtos/time-bucket.dto.ts
@@ -1,8 +1,8 @@
 import { ApiProperty } from '@nestjs/swagger';
 
-import { IsEnum, IsString } from 'class-validator';
+import { IsString } from 'class-validator';
 import { AssetOrder, AssetVisibility } from 'src/enum';
-import { Optional, ValidateAssetVisibility, ValidateBoolean, ValidateUUID } from 'src/validation';
+import { ValidateBoolean, ValidateEnum, ValidateUUID } from 'src/validation';
 
 export class TimeBucketDto {
   @ValidateUUID({ optional: true, description: 'Filter assets by specific user ID' })
@@ -38,16 +38,17 @@ export class TimeBucketDto {
   @ValidateBoolean({ optional: true, description: 'Include assets shared by partners' })
   withPartners?: boolean;
 
-  @IsEnum(AssetOrder)
-  @Optional()
-  @ApiProperty({
+  @ValidateEnum({
     enum: AssetOrder,
-    enumName: 'AssetOrder',
+    name: 'AssetOrder',
     description: 'Sort order for assets within time buckets (ASC for oldest first, DESC for newest first)',
+    optional: true,
   })
   order?: AssetOrder;
 
-  @ValidateAssetVisibility({
+  @ValidateEnum({
+    enum: AssetVisibility,
+    name: 'AssetVisibility',
     optional: true,
     description: 'Filter by asset visibility status (ARCHIVE, TIMELINE, HIDDEN, LOCKED)',
   })
@@ -93,10 +94,10 @@ export class TimeBucketAssetResponseDto {
   })
   isFavorite!: boolean[];
 
-  @ApiProperty({
+  @ValidateEnum({
     enum: AssetVisibility,
-    enumName: 'AssetVisibility',
-    isArray: true,
+    name: 'AssetVisibility',
+    each: true,
     description: 'Array of visibility statuses for each asset (e.g., ARCHIVE, TIMELINE, HIDDEN, LOCKED)',
   })
   visibility!: AssetVisibility[];
diff --git a/server/src/dtos/user-preferences.dto.ts b/server/src/dtos/user-preferences.dto.ts
index 6765df9f73..d165438061 100644
--- a/server/src/dtos/user-preferences.dto.ts
+++ b/server/src/dtos/user-preferences.dto.ts
@@ -1,14 +1,12 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
-import { IsDateString, IsEnum, IsInt, IsPositive, ValidateNested } from 'class-validator';
+import { IsDateString, IsInt, IsPositive, ValidateNested } from 'class-validator';
 import { AssetOrder, UserAvatarColor } from 'src/enum';
 import { UserPreferences } from 'src/types';
-import { Optional, ValidateBoolean } from 'src/validation';
+import { Optional, ValidateBoolean, ValidateEnum } from 'src/validation';
 
 class AvatarUpdate {
-  @Optional()
-  @IsEnum(UserAvatarColor)
-  @ApiProperty({ enumName: 'UserAvatarColor', enum: UserAvatarColor })
+  @ValidateEnum({ enum: UserAvatarColor, name: 'UserAvatarColor', optional: true })
   color?: UserAvatarColor;
 }
 
@@ -23,8 +21,7 @@ class RatingsUpdate {
 }
 
 class AlbumsUpdate {
-  @IsEnum(AssetOrder)
-  @ApiProperty({ enumName: 'AssetOrder', enum: AssetOrder })
+  @ValidateEnum({ enum: AssetOrder, name: 'AssetOrder', optional: true })
   defaultAssetOrder?: AssetOrder;
 }
 
@@ -159,8 +156,7 @@ export class UserPreferencesUpdateDto {
 }
 
 class AlbumsResponse {
-  @IsEnum(AssetOrder)
-  @ApiProperty({ enumName: 'AssetOrder', enum: AssetOrder })
+  @ValidateEnum({ enum: AssetOrder, name: 'AssetOrder' })
   defaultAssetOrder: AssetOrder = AssetOrder.DESC;
 }
 
diff --git a/server/src/dtos/user.dto.ts b/server/src/dtos/user.dto.ts
index ed08f7534d..3e3a92d42e 100644
--- a/server/src/dtos/user.dto.ts
+++ b/server/src/dtos/user.dto.ts
@@ -1,10 +1,10 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
-import { IsBoolean, IsEmail, IsEnum, IsNotEmpty, IsNumber, IsString, Min } from 'class-validator';
+import { IsEmail, IsNotEmpty, IsNumber, IsString, Min } from 'class-validator';
 import { User, UserAdmin } from 'src/database';
 import { UserAvatarColor, UserMetadataKey, UserStatus } from 'src/enum';
 import { UserMetadataItem } from 'src/types';
-import { Optional, PinCode, ValidateBoolean, ValidateUUID, toEmail, toSanitized } from 'src/validation';
+import { Optional, PinCode, ValidateBoolean, ValidateEnum, ValidateUUID, toEmail, toSanitized } from 'src/validation';
 
 export class UserUpdateMeDto {
   @Optional()
@@ -23,9 +23,7 @@ export class UserUpdateMeDto {
   @IsNotEmpty()
   name?: string;
 
-  @Optional({ nullable: true })
-  @IsEnum(UserAvatarColor)
-  @ApiProperty({ enumName: 'UserAvatarColor', enum: UserAvatarColor })
+  @ValidateEnum({ enum: UserAvatarColor, name: 'UserAvatarColor', optional: true, nullable: true })
   avatarColor?: UserAvatarColor | null;
 }
 
@@ -34,7 +32,7 @@ export class UserResponseDto {
   name!: string;
   email!: string;
   profileImagePath!: string;
-  @ApiProperty({ enumName: 'UserAvatarColor', enum: UserAvatarColor })
+  @ValidateEnum({ enum: UserAvatarColor, name: 'UserAvatarColor' })
   avatarColor!: UserAvatarColor;
   profileChangedAt!: Date;
 }
@@ -84,9 +82,7 @@ export class UserAdminCreateDto {
   @IsString()
   name!: string;
 
-  @Optional({ nullable: true })
-  @IsEnum(UserAvatarColor)
-  @ApiProperty({ enumName: 'UserAvatarColor', enum: UserAvatarColor })
+  @ValidateEnum({ enum: UserAvatarColor, name: 'UserAvatarColor', optional: true, nullable: true })
   avatarColor?: UserAvatarColor | null;
 
   @Optional({ nullable: true })
@@ -103,12 +99,10 @@ export class UserAdminCreateDto {
   @ValidateBoolean({ optional: true })
   shouldChangePassword?: boolean;
 
-  @Optional()
-  @IsBoolean()
+  @ValidateBoolean({ optional: true })
   notify?: boolean;
 
-  @Optional()
-  @IsBoolean()
+  @ValidateBoolean({ optional: true })
   isAdmin?: boolean;
 }
 
@@ -131,9 +125,7 @@ export class UserAdminUpdateDto {
   @IsNotEmpty()
   name?: string;
 
-  @Optional({ nullable: true })
-  @IsEnum(UserAvatarColor)
-  @ApiProperty({ enumName: 'UserAvatarColor', enum: UserAvatarColor })
+  @ValidateEnum({ enum: UserAvatarColor, name: 'UserAvatarColor', optional: true, nullable: true })
   avatarColor?: UserAvatarColor | null;
 
   @Optional({ nullable: true })
@@ -150,8 +142,7 @@ export class UserAdminUpdateDto {
   @ApiProperty({ type: 'integer', format: 'int64' })
   quotaSizeInBytes?: number | null;
 
-  @Optional()
-  @IsBoolean()
+  @ValidateBoolean({ optional: true })
   isAdmin?: boolean;
 }
 
@@ -172,7 +163,7 @@ export class UserAdminResponseDto extends UserResponseDto {
   quotaSizeInBytes!: number | null;
   @ApiProperty({ type: 'integer', format: 'int64' })
   quotaUsageInBytes!: number | null;
-  @ApiProperty({ enumName: 'UserStatus', enum: UserStatus })
+  @ValidateEnum({ enum: UserStatus, name: 'UserStatus' })
   status!: string;
   license!: UserLicense | null;
 }
diff --git a/server/src/validation.ts b/server/src/validation.ts
index bacf4b6f5a..049b5432d6 100644
--- a/server/src/validation.ts
+++ b/server/src/validation.ts
@@ -31,7 +31,6 @@ import {
 import { CronJob } from 'cron';
 import { DateTime } from 'luxon';
 import sanitize from 'sanitize-filename';
-import { AssetVisibility } from 'src/enum';
 import { isIP, isIPRange } from 'validator';
 
 @Injectable()
@@ -181,23 +180,9 @@ export const ValidateDate = (options?: DateOptions & ApiPropertyOptions) => {
   return applyDecorators(...decorators);
 };
 
-type AssetVisibilityOptions = { optional?: boolean };
-export const ValidateAssetVisibility = (options?: AssetVisibilityOptions & ApiPropertyOptions) => {
-  const { optional, ...apiPropertyOptions } = { optional: false, ...options };
-  const decorators = [
-    IsEnum(AssetVisibility),
-    ApiProperty({ enumName: 'AssetVisibility', enum: AssetVisibility, ...apiPropertyOptions }),
-  ];
-
-  if (optional) {
-    decorators.push(Optional());
-  }
-  return applyDecorators(...decorators);
-};
-
-type BooleanOptions = { optional?: boolean };
+type BooleanOptions = { optional?: boolean; nullable?: boolean };
 export const ValidateBoolean = (options?: BooleanOptions & ApiPropertyOptions) => {
-  const { optional, ...apiPropertyOptions } = { optional: false, ...options };
+  const { optional, nullable, ...apiPropertyOptions } = options || {};
   const decorators = [
     ApiProperty(apiPropertyOptions),
     IsBoolean(),
@@ -209,15 +194,37 @@ export const ValidateBoolean = (options?: BooleanOptions & ApiPropertyOptions) =
       }
       return value;
     }),
+    optional ? Optional({ nullable }) : IsNotEmpty(),
   ];
 
-  if (optional) {
-    decorators.push(Optional());
-  }
-
   return applyDecorators(...decorators);
 };
 
+type EnumOptions<T> = {
+  enum: T;
+  name: string;
+  each?: boolean;
+  optional?: boolean;
+  nullable?: boolean;
+  default?: T[keyof T];
+  description?: string;
+};
+export const ValidateEnum = <T extends object>({
+  name,
+  enum: value,
+  each,
+  optional,
+  nullable,
+  default: defaultValue,
+  description,
+}: EnumOptions<T>) => {
+  return applyDecorators(
+    optional ? Optional({ nullable }) : IsNotEmpty(),
+    IsEnum(value, { each }),
+    ApiProperty({ enumName: name, enum: value, isArray: each, default: defaultValue, description }),
+  );
+};
+
 @ValidatorConstraint({ name: 'cronValidator' })
 class CronValidator implements ValidatorConstraintInterface {
   validate(expression: string): boolean {

From 920d7de349aee154f0ac6dc3f9365a9a4e6563ec Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 15 Jul 2025 13:41:19 -0400
Subject: [PATCH 215/337] refactor: event names (#19945)

---
 server/src/app.module.ts                      |  4 +-
 server/src/repositories/event.repository.ts   | 56 +++++++-------
 server/src/repositories/job.repository.ts     |  2 +-
 server/src/services/album.service.spec.ts     |  8 +-
 server/src/services/album.service.ts          |  6 +-
 server/src/services/asset-media.service.ts    |  2 +-
 server/src/services/asset.service.spec.ts     | 12 +--
 server/src/services/asset.service.ts          |  7 +-
 server/src/services/auth.service.spec.ts      |  2 +-
 server/src/services/auth.service.ts           |  2 +-
 server/src/services/backup.service.ts         |  8 +-
 server/src/services/database.service.ts       |  2 +-
 server/src/services/job.service.ts            | 16 ++--
 server/src/services/library.service.ts        | 10 +--
 server/src/services/media.service.ts          |  2 +-
 server/src/services/metadata.service.spec.ts  |  4 +-
 server/src/services/metadata.service.ts       | 24 +++---
 .../src/services/notification.service.spec.ts |  2 +-
 server/src/services/notification.service.ts   | 74 +++++++++----------
 server/src/services/server.service.ts         |  2 +-
 server/src/services/smart-info.service.ts     | 12 +--
 server/src/services/stack.service.spec.ts     |  8 +-
 server/src/services/stack.service.ts          |  8 +-
 .../src/services/storage-template.service.ts  | 20 ++---
 server/src/services/storage.service.ts        |  2 +-
 .../services/system-config.service.spec.ts    |  2 +-
 server/src/services/system-config.service.ts  | 20 ++---
 server/src/services/tag.service.ts            |  6 +-
 server/src/services/trash.service.ts          |  4 +-
 server/src/services/user-admin.service.ts     |  2 +-
 server/src/services/version.service.ts        |  6 +-
 server/src/utils/asset.util.ts                |  4 +-
 32 files changed, 171 insertions(+), 168 deletions(-)

diff --git a/server/src/app.module.ts b/server/src/app.module.ts
index 153b525fe5..c06087edea 100644
--- a/server/src/app.module.ts
+++ b/server/src/app.module.ts
@@ -73,11 +73,11 @@ class BaseModule implements OnModuleInit, OnModuleDestroy {
     );
 
     this.eventRepository.setup({ services });
-    await this.eventRepository.emit('app.bootstrap');
+    await this.eventRepository.emit('AppBootstrap');
   }
 
   async onModuleDestroy() {
-    await this.eventRepository.emit('app.shutdown');
+    await this.eventRepository.emit('AppShutdown');
     await teardownTelemetry();
   }
 }
diff --git a/server/src/repositories/event.repository.ts b/server/src/repositories/event.repository.ts
index 41966450ee..04494d5547 100644
--- a/server/src/repositories/event.repository.ts
+++ b/server/src/repositories/event.repository.ts
@@ -35,59 +35,59 @@ type Item<T extends EmitEvent> = {
 
 type EventMap = {
   // app events
-  'app.bootstrap': [];
-  'app.shutdown': [];
+  AppBootstrap: [];
+  AppShutdown: [];
 
-  'config.init': [{ newConfig: SystemConfig }];
+  ConfigInit: [{ newConfig: SystemConfig }];
   // config events
-  'config.update': [
+  ConfigUpdate: [
     {
       newConfig: SystemConfig;
       oldConfig: SystemConfig;
     },
   ];
-  'config.validate': [{ newConfig: SystemConfig; oldConfig: SystemConfig }];
+  ConfigValidate: [{ newConfig: SystemConfig; oldConfig: SystemConfig }];
 
   // album events
-  'album.update': [{ id: string; recipientId: string }];
-  'album.invite': [{ id: string; userId: string }];
+  AlbumUpdate: [{ id: string; recipientId: string }];
+  AlbumInvite: [{ id: string; userId: string }];
 
   // asset events
-  'asset.tag': [{ assetId: string }];
-  'asset.untag': [{ assetId: string }];
-  'asset.hide': [{ assetId: string; userId: string }];
-  'asset.show': [{ assetId: string; userId: string }];
-  'asset.trash': [{ assetId: string; userId: string }];
-  'asset.delete': [{ assetId: string; userId: string }];
-  'asset.metadataExtracted': [{ assetId: string; userId: string; source?: JobSource }];
+  AssetTag: [{ assetId: string }];
+  AssetUntag: [{ assetId: string }];
+  AssetHide: [{ assetId: string; userId: string }];
+  AssetShow: [{ assetId: string; userId: string }];
+  AssetTrash: [{ assetId: string; userId: string }];
+  AssetDelete: [{ assetId: string; userId: string }];
+  AssetMetadataExtracted: [{ assetId: string; userId: string; source?: JobSource }];
 
   // asset bulk events
-  'assets.trash': [{ assetIds: string[]; userId: string }];
-  'assets.delete': [{ assetIds: string[]; userId: string }];
-  'assets.restore': [{ assetIds: string[]; userId: string }];
+  AssetTrashAll: [{ assetIds: string[]; userId: string }];
+  AssetDeleteAll: [{ assetIds: string[]; userId: string }];
+  AssetRestoreAll: [{ assetIds: string[]; userId: string }];
 
-  'job.start': [QueueName, JobItem];
-  'job.failed': [{ job: JobItem; error: Error | any }];
+  JobStart: [QueueName, JobItem];
+  JobFailed: [{ job: JobItem; error: Error | any }];
 
   // session events
-  'session.delete': [{ sessionId: string }];
+  SessionDelete: [{ sessionId: string }];
 
   // stack events
-  'stack.create': [{ stackId: string; userId: string }];
-  'stack.update': [{ stackId: string; userId: string }];
-  'stack.delete': [{ stackId: string; userId: string }];
+  StackCreate: [{ stackId: string; userId: string }];
+  StackUpdate: [{ stackId: string; userId: string }];
+  StackDelete: [{ stackId: string; userId: string }];
 
   // stack bulk events
-  'stacks.delete': [{ stackIds: string[]; userId: string }];
+  StackDeleteAll: [{ stackIds: string[]; userId: string }];
 
   // user events
-  'user.signup': [{ notify: boolean; id: string; tempPassword?: string }];
+  UserSignup: [{ notify: boolean; id: string; tempPassword?: string }];
 
   // websocket events
-  'websocket.connect': [{ userId: string }];
+  WebsocketConnect: [{ userId: string }];
 };
 
-export const serverEvents = ['config.update'] as const;
+export const serverEvents = ['ConfigUpdate'] as const;
 export type ServerEvents = (typeof serverEvents)[number];
 
 export type EmitEvent = keyof EventMap;
@@ -213,7 +213,7 @@ export class EventRepository implements OnGatewayConnection, OnGatewayDisconnect
       if (auth.session) {
         await client.join(auth.session.id);
       }
-      await this.onEvent({ name: 'websocket.connect', args: [{ userId: auth.user.id }], server: false });
+      await this.onEvent({ name: 'WebsocketConnect', args: [{ userId: auth.user.id }], server: false });
     } catch (error: Error | any) {
       this.logger.error(`Websocket connection error: ${error}`, error?.stack);
       client.emit('error', 'unauthorized');
diff --git a/server/src/repositories/job.repository.ts b/server/src/repositories/job.repository.ts
index 32a4f75d67..27c623cc89 100644
--- a/server/src/repositories/job.repository.ts
+++ b/server/src/repositories/job.repository.ts
@@ -89,7 +89,7 @@ export class JobRepository {
       this.logger.debug(`Starting worker for queue: ${queueName}`);
       this.workers[queueName] = new Worker(
         queueName,
-        (job) => this.eventRepository.emit('job.start', queueName, job as JobItem),
+        (job) => this.eventRepository.emit('JobStart', queueName, job as JobItem),
         { ...bull.config, concurrency: 1 },
       );
     }
diff --git a/server/src/services/album.service.spec.ts b/server/src/services/album.service.spec.ts
index b42225613d..cdace249c0 100644
--- a/server/src/services/album.service.spec.ts
+++ b/server/src/services/album.service.spec.ts
@@ -166,7 +166,7 @@ describe(AlbumService.name, () => {
       expect(mocks.user.get).toHaveBeenCalledWith('user-id', {});
       expect(mocks.user.getMetadata).toHaveBeenCalledWith(authStub.admin.user.id);
       expect(mocks.access.asset.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['123']), false);
-      expect(mocks.event.emit).toHaveBeenCalledWith('album.invite', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('AlbumInvite', {
         id: albumStub.empty.id,
         userId: 'user-id',
       });
@@ -209,7 +209,7 @@ describe(AlbumService.name, () => {
       expect(mocks.user.get).toHaveBeenCalledWith('user-id', {});
       expect(mocks.user.getMetadata).toHaveBeenCalledWith(authStub.admin.user.id);
       expect(mocks.access.asset.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['123']), false);
-      expect(mocks.event.emit).toHaveBeenCalledWith('album.invite', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('AlbumInvite', {
         id: albumStub.empty.id,
         userId: 'user-id',
       });
@@ -413,7 +413,7 @@ describe(AlbumService.name, () => {
         usersId: authStub.user2.user.id,
         albumsId: albumStub.sharedWithAdmin.id,
       });
-      expect(mocks.event.emit).toHaveBeenCalledWith('album.invite', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('AlbumInvite', {
         id: albumStub.sharedWithAdmin.id,
         userId: userStub.user2.id,
       });
@@ -662,7 +662,7 @@ describe(AlbumService.name, () => {
         albumThumbnailAssetId: 'asset-1',
       });
       expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
-      expect(mocks.event.emit).toHaveBeenCalledWith('album.update', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('AlbumUpdate', {
         id: 'album-123',
         recipientId: 'admin_id',
       });
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index e49d4bc5fe..9008685e81 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -122,7 +122,7 @@ export class AlbumService extends BaseService {
     );
 
     for (const { userId } of albumUsers) {
-      await this.eventRepository.emit('album.invite', { id: album.id, userId });
+      await this.eventRepository.emit('AlbumInvite', { id: album.id, userId });
     }
 
     return mapAlbumWithAssets(album);
@@ -179,7 +179,7 @@ export class AlbumService extends BaseService {
       );
 
       for (const recipientId of allUsersExceptUs) {
-        await this.eventRepository.emit('album.update', { id, recipientId });
+        await this.eventRepository.emit('AlbumUpdate', { id, recipientId });
       }
     }
 
@@ -225,7 +225,7 @@ export class AlbumService extends BaseService {
       }
 
       await this.albumUserRepository.create({ usersId: userId, albumsId: id, role });
-      await this.eventRepository.emit('album.invite', { id, userId });
+      await this.eventRepository.emit('AlbumInvite', { id, userId });
     }
 
     return this.findOrFail(id, { withAssets: true }).then(mapAlbumWithoutAssets);
diff --git a/server/src/services/asset-media.service.ts b/server/src/services/asset-media.service.ts
index b56641947d..6fc438481d 100644
--- a/server/src/services/asset-media.service.ts
+++ b/server/src/services/asset-media.service.ts
@@ -180,7 +180,7 @@ export class AssetMediaService extends BaseService {
       const copiedPhoto = await this.createCopy(asset);
       // and immediate trash it
       await this.assetRepository.updateAll([copiedPhoto.id], { deletedAt: new Date(), status: AssetStatus.TRASHED });
-      await this.eventRepository.emit('asset.trash', { assetId: copiedPhoto.id, userId: auth.user.id });
+      await this.eventRepository.emit('AssetTrash', { assetId: copiedPhoto.id, userId: auth.user.id });
 
       await this.userRepository.updateUsage(auth.user.id, file.size);
 
diff --git a/server/src/services/asset.service.spec.ts b/server/src/services/asset.service.spec.ts
index 333f4530de..65b14ca2da 100755
--- a/server/src/services/asset.service.spec.ts
+++ b/server/src/services/asset.service.spec.ts
@@ -255,7 +255,7 @@ describe(AssetService.name, () => {
         id: assetStub.livePhotoMotionAsset.id,
         visibility: AssetVisibility.TIMELINE,
       });
-      expect(mocks.event.emit).not.toHaveBeenCalledWith('asset.show', {
+      expect(mocks.event.emit).not.toHaveBeenCalledWith('AssetShow', {
         assetId: assetStub.livePhotoMotionAsset.id,
         userId: userStub.admin.id,
       });
@@ -279,7 +279,7 @@ describe(AssetService.name, () => {
         id: assetStub.livePhotoMotionAsset.id,
         visibility: AssetVisibility.TIMELINE,
       });
-      expect(mocks.event.emit).not.toHaveBeenCalledWith('asset.show', {
+      expect(mocks.event.emit).not.toHaveBeenCalledWith('AssetShow', {
         assetId: assetStub.livePhotoMotionAsset.id,
         userId: userStub.admin.id,
       });
@@ -303,7 +303,7 @@ describe(AssetService.name, () => {
         id: assetStub.livePhotoMotionAsset.id,
         visibility: AssetVisibility.TIMELINE,
       });
-      expect(mocks.event.emit).not.toHaveBeenCalledWith('asset.show', {
+      expect(mocks.event.emit).not.toHaveBeenCalledWith('AssetShow', {
         assetId: assetStub.livePhotoMotionAsset.id,
         userId: userStub.admin.id,
       });
@@ -327,7 +327,7 @@ describe(AssetService.name, () => {
         id: assetStub.livePhotoMotionAsset.id,
         visibility: AssetVisibility.HIDDEN,
       });
-      expect(mocks.event.emit).toHaveBeenCalledWith('asset.hide', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('AssetHide', {
         assetId: assetStub.livePhotoMotionAsset.id,
         userId: userStub.admin.id,
       });
@@ -360,7 +360,7 @@ describe(AssetService.name, () => {
         id: assetStub.livePhotoMotionAsset.id,
         visibility: assetStub.livePhotoStillAsset.visibility,
       });
-      expect(mocks.event.emit).toHaveBeenCalledWith('asset.show', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('AssetShow', {
         assetId: assetStub.livePhotoMotionAsset.id,
         userId: userStub.admin.id,
       });
@@ -484,7 +484,7 @@ describe(AssetService.name, () => {
 
       await sut.deleteAll(authStub.user1, { ids: ['asset1', 'asset2'], force: true });
 
-      expect(mocks.event.emit).toHaveBeenCalledWith('assets.delete', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('AssetDeleteAll', {
         assetIds: ['asset1', 'asset2'],
         userId: 'user-id',
       });
diff --git a/server/src/services/asset.service.ts b/server/src/services/asset.service.ts
index 55906bf0a6..351e8827dd 100644
--- a/server/src/services/asset.service.ts
+++ b/server/src/services/asset.service.ts
@@ -208,7 +208,7 @@ export class AssetService extends BaseService {
       await this.userRepository.updateUsage(asset.ownerId, -(asset.exifInfo?.fileSizeInByte || 0));
     }
 
-    await this.eventRepository.emit('asset.delete', { assetId: id, userId: asset.ownerId });
+    await this.eventRepository.emit('AssetDelete', { assetId: id, userId: asset.ownerId });
 
     // delete the motion if it is not used by another asset
     if (asset.livePhotoVideoId) {
@@ -241,7 +241,10 @@ export class AssetService extends BaseService {
       deletedAt: new Date(),
       status: force ? AssetStatus.DELETED : AssetStatus.TRASHED,
     });
-    await this.eventRepository.emit(force ? 'assets.delete' : 'assets.trash', { assetIds: ids, userId: auth.user.id });
+    await this.eventRepository.emit(force ? 'AssetDeleteAll' : 'AssetTrashAll', {
+      assetIds: ids,
+      userId: auth.user.id,
+    });
   }
 
   async run(auth: AuthDto, dto: AssetJobsDto) {
diff --git a/server/src/services/auth.service.spec.ts b/server/src/services/auth.service.spec.ts
index 6f180b3017..93bd265ba0 100644
--- a/server/src/services/auth.service.spec.ts
+++ b/server/src/services/auth.service.spec.ts
@@ -179,7 +179,7 @@ describe(AuthService.name, () => {
       });
 
       expect(mocks.session.delete).toHaveBeenCalledWith('token123');
-      expect(mocks.event.emit).toHaveBeenCalledWith('session.delete', { sessionId: 'token123' });
+      expect(mocks.event.emit).toHaveBeenCalledWith('SessionDelete', { sessionId: 'token123' });
     });
 
     it('should return the default redirect if auth type is OAUTH but oauth is not enabled', async () => {
diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
index 2d6c4b1b15..a7b0cb3259 100644
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -80,7 +80,7 @@ export class AuthService extends BaseService {
   async logout(auth: AuthDto, authType: AuthType): Promise<LogoutResponseDto> {
     if (auth.session) {
       await this.sessionRepository.delete(auth.session.id);
-      await this.eventRepository.emit('session.delete', { sessionId: auth.session.id });
+      await this.eventRepository.emit('SessionDelete', { sessionId: auth.session.id });
     }
 
     return {
diff --git a/server/src/services/backup.service.ts b/server/src/services/backup.service.ts
index afef497e59..79c5deee57 100644
--- a/server/src/services/backup.service.ts
+++ b/server/src/services/backup.service.ts
@@ -14,12 +14,12 @@ import { handlePromiseError } from 'src/utils/misc';
 export class BackupService extends BaseService {
   private backupLock = false;
 
-  @OnEvent({ name: 'config.init', workers: [ImmichWorker.MICROSERVICES] })
+  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.MICROSERVICES] })
   async onConfigInit({
     newConfig: {
       backup: { database },
     },
-  }: ArgOf<'config.init'>) {
+  }: ArgOf<'ConfigInit'>) {
     this.backupLock = await this.databaseRepository.tryLock(DatabaseLock.BackupDatabase);
 
     if (this.backupLock) {
@@ -32,8 +32,8 @@ export class BackupService extends BaseService {
     }
   }
 
-  @OnEvent({ name: 'config.update', server: true })
-  onConfigUpdate({ newConfig: { backup } }: ArgOf<'config.update'>) {
+  @OnEvent({ name: 'ConfigUpdate', server: true })
+  onConfigUpdate({ newConfig: { backup } }: ArgOf<'ConfigUpdate'>) {
     if (!this.backupLock) {
       return;
     }
diff --git a/server/src/services/database.service.ts b/server/src/services/database.service.ts
index 7470c0bf8f..fd59e3aa67 100644
--- a/server/src/services/database.service.ts
+++ b/server/src/services/database.service.ts
@@ -57,7 +57,7 @@ const messages = {
 
 @Injectable()
 export class DatabaseService extends BaseService {
-  @OnEvent({ name: 'app.bootstrap', priority: BootstrapEventPriority.DatabaseService })
+  @OnEvent({ name: 'AppBootstrap', priority: BootstrapEventPriority.DatabaseService })
   async onBootstrap() {
     const version = await this.databaseRepository.getPostgresVersion();
     const current = semver.coerce(version);
diff --git a/server/src/services/job.service.ts b/server/src/services/job.service.ts
index 37a66706c0..f0bbefc8f0 100644
--- a/server/src/services/job.service.ts
+++ b/server/src/services/job.service.ts
@@ -67,8 +67,8 @@ export class JobService extends BaseService {
   private services: ClassConstructor<unknown>[] = [];
   private nightlyJobsLock = false;
 
-  @OnEvent({ name: 'config.init' })
-  async onConfigInit({ newConfig: config }: ArgOf<'config.init'>) {
+  @OnEvent({ name: 'ConfigInit' })
+  async onConfigInit({ newConfig: config }: ArgOf<'ConfigInit'>) {
     if (this.worker === ImmichWorker.MICROSERVICES) {
       this.updateQueueConcurrency(config);
       return;
@@ -87,8 +87,8 @@ export class JobService extends BaseService {
     }
   }
 
-  @OnEvent({ name: 'config.update', server: true })
-  onConfigUpdate({ newConfig: config }: ArgOf<'config.update'>) {
+  @OnEvent({ name: 'ConfigUpdate', server: true })
+  onConfigUpdate({ newConfig: config }: ArgOf<'ConfigUpdate'>) {
     if (this.worker === ImmichWorker.MICROSERVICES) {
       this.updateQueueConcurrency(config);
       return;
@@ -101,7 +101,7 @@ export class JobService extends BaseService {
     }
   }
 
-  @OnEvent({ name: 'app.bootstrap', priority: BootstrapEventPriority.JobService })
+  @OnEvent({ name: 'AppBootstrap', priority: BootstrapEventPriority.JobService })
   onBootstrap() {
     this.jobRepository.setup(this.services);
     if (this.worker === ImmichWorker.MICROSERVICES) {
@@ -243,8 +243,8 @@ export class JobService extends BaseService {
     }
   }
 
-  @OnEvent({ name: 'job.start' })
-  async onJobStart(...[queueName, job]: ArgsOf<'job.start'>) {
+  @OnEvent({ name: 'JobStart' })
+  async onJobStart(...[queueName, job]: ArgsOf<'JobStart'>) {
     const queueMetric = `immich.queues.${snakeCase(queueName)}.active`;
     this.telemetryRepository.jobs.addToGauge(queueMetric, 1);
     try {
@@ -255,7 +255,7 @@ export class JobService extends BaseService {
         await this.onDone(job);
       }
     } catch (error: Error | any) {
-      await this.eventRepository.emit('job.failed', { job, error });
+      await this.eventRepository.emit('JobFailed', { job, error });
     } finally {
       this.telemetryRepository.jobs.addToGauge(queueMetric, -1);
     }
diff --git a/server/src/services/library.service.ts b/server/src/services/library.service.ts
index f6bc5b2ebb..911ea3b702 100644
--- a/server/src/services/library.service.ts
+++ b/server/src/services/library.service.ts
@@ -32,12 +32,12 @@ export class LibraryService extends BaseService {
   private lock = false;
   private watchers: Record<string, () => Promise<void>> = {};
 
-  @OnEvent({ name: 'config.init', workers: [ImmichWorker.MICROSERVICES] })
+  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.MICROSERVICES] })
   async onConfigInit({
     newConfig: {
       library: { watch, scan },
     },
-  }: ArgOf<'config.init'>) {
+  }: ArgOf<'ConfigInit'>) {
     // This ensures that library watching only occurs in one microservice
     this.lock = await this.databaseRepository.tryLock(DatabaseLock.Library);
 
@@ -58,8 +58,8 @@ export class LibraryService extends BaseService {
     }
   }
 
-  @OnEvent({ name: 'config.update', server: true })
-  async onConfigUpdate({ newConfig: { library } }: ArgOf<'config.update'>) {
+  @OnEvent({ name: 'ConfigUpdate', server: true })
+  async onConfigUpdate({ newConfig: { library } }: ArgOf<'ConfigUpdate'>) {
     if (!this.lock) {
       return;
     }
@@ -155,7 +155,7 @@ export class LibraryService extends BaseService {
     }
   }
 
-  @OnEvent({ name: 'app.shutdown' })
+  @OnEvent({ name: 'AppShutdown' })
   async onShutdown() {
     await this.unwatchAll();
   }
diff --git a/server/src/services/media.service.ts b/server/src/services/media.service.ts
index d11ba6d60a..452e4df5eb 100644
--- a/server/src/services/media.service.ts
+++ b/server/src/services/media.service.ts
@@ -51,7 +51,7 @@ interface UpsertFileOptions {
 export class MediaService extends BaseService {
   videoInterfaces: VideoInterfaces = { dri: [], mali: false };
 
-  @OnEvent({ name: 'app.bootstrap' })
+  @OnEvent({ name: 'AppBootstrap' })
   async onBootstrap() {
     const [dri, mali] = await Promise.all([this.getDevices(), this.hasMaliOpenCL()]);
     this.videoInterfaces = { dri, mali };
diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.ts
index 5386b5fb12..881f25d5dd 100644
--- a/server/src/services/metadata.service.spec.ts
+++ b/server/src/services/metadata.service.spec.ts
@@ -1368,7 +1368,7 @@ describe(MetadataService.name, () => {
 
       await sut.handleMetadataExtraction({ id: assetStub.livePhotoStillAsset.id });
 
-      expect(mocks.event.emit).toHaveBeenCalledWith('asset.hide', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('AssetHide', {
         userId: assetStub.livePhotoMotionAsset.ownerId,
         assetId: assetStub.livePhotoMotionAsset.id,
       });
@@ -1384,7 +1384,7 @@ describe(MetadataService.name, () => {
 
       await sut.handleMetadataExtraction({ id: assetStub.livePhotoStillAsset.id });
 
-      expect(mocks.event.emit).toHaveBeenCalledWith('asset.metadataExtracted', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('AssetMetadataExtracted', {
         assetId: assetStub.livePhotoStillAsset.id,
         userId: assetStub.livePhotoStillAsset.ownerId,
       });
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
index 9804be9ea4..ea3f810fa4 100644
--- a/server/src/services/metadata.service.ts
+++ b/server/src/services/metadata.service.ts
@@ -126,24 +126,24 @@ type Dates = {
 
 @Injectable()
 export class MetadataService extends BaseService {
-  @OnEvent({ name: 'app.bootstrap', workers: [ImmichWorker.MICROSERVICES] })
+  @OnEvent({ name: 'AppBootstrap', workers: [ImmichWorker.MICROSERVICES] })
   async onBootstrap() {
     this.logger.log('Bootstrapping metadata service');
     await this.init();
   }
 
-  @OnEvent({ name: 'app.shutdown' })
+  @OnEvent({ name: 'AppShutdown' })
   async onShutdown() {
     await this.metadataRepository.teardown();
   }
 
-  @OnEvent({ name: 'config.init', workers: [ImmichWorker.MICROSERVICES] })
-  onConfigInit({ newConfig }: ArgOf<'config.init'>) {
+  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.MICROSERVICES] })
+  onConfigInit({ newConfig }: ArgOf<'ConfigInit'>) {
     this.metadataRepository.setMaxConcurrency(newConfig.job.metadataExtraction.concurrency);
   }
 
-  @OnEvent({ name: 'config.update', workers: [ImmichWorker.MICROSERVICES], server: true })
-  onConfigUpdate({ newConfig }: ArgOf<'config.update'>) {
+  @OnEvent({ name: 'ConfigUpdate', workers: [ImmichWorker.MICROSERVICES], server: true })
+  onConfigUpdate({ newConfig }: ArgOf<'ConfigUpdate'>) {
     this.metadataRepository.setMaxConcurrency(newConfig.job.metadataExtraction.concurrency);
   }
 
@@ -190,7 +190,7 @@ export class MetadataService extends BaseService {
       this.albumRepository.removeAssetsFromAll([motionAsset.id]),
     ]);
 
-    await this.eventRepository.emit('asset.hide', { assetId: motionAsset.id, userId: motionAsset.ownerId });
+    await this.eventRepository.emit('AssetHide', { assetId: motionAsset.id, userId: motionAsset.ownerId });
   }
 
   @OnJob({ name: JobName.QUEUE_METADATA_EXTRACTION, queue: QueueName.METADATA_EXTRACTION })
@@ -313,7 +313,7 @@ export class MetadataService extends BaseService {
 
     await this.assetRepository.upsertJobStatus({ assetId: asset.id, metadataExtractedAt: new Date() });
 
-    await this.eventRepository.emit('asset.metadataExtracted', {
+    await this.eventRepository.emit('AssetMetadataExtracted', {
       assetId: asset.id,
       userId: asset.ownerId,
       source: data.source,
@@ -351,13 +351,13 @@ export class MetadataService extends BaseService {
     return this.processSidecar(id, false);
   }
 
-  @OnEvent({ name: 'asset.tag' })
-  async handleTagAsset({ assetId }: ArgOf<'asset.tag'>) {
+  @OnEvent({ name: 'AssetTag' })
+  async handleTagAsset({ assetId }: ArgOf<'AssetTag'>) {
     await this.jobRepository.queue({ name: JobName.SIDECAR_WRITE, data: { id: assetId, tags: true } });
   }
 
-  @OnEvent({ name: 'asset.untag' })
-  async handleUntagAsset({ assetId }: ArgOf<'asset.untag'>) {
+  @OnEvent({ name: 'AssetUntag' })
+  async handleUntagAsset({ assetId }: ArgOf<'AssetUntag'>) {
     await this.jobRepository.queue({ name: JobName.SIDECAR_WRITE, data: { id: assetId, tags: true } });
   }
 
diff --git a/server/src/services/notification.service.spec.ts b/server/src/services/notification.service.spec.ts
index c2a7712521..bca7074194 100644
--- a/server/src/services/notification.service.spec.ts
+++ b/server/src/services/notification.service.spec.ts
@@ -64,7 +64,7 @@ describe(NotificationService.name, () => {
       const update = { oldConfig: defaults, newConfig: defaults };
       expect(sut.onConfigUpdate(update)).toBeUndefined();
       expect(mocks.event.clientBroadcast).toHaveBeenCalledWith('on_config_update');
-      expect(mocks.event.serverSend).toHaveBeenCalledWith('config.update', update);
+      expect(mocks.event.serverSend).toHaveBeenCalledWith('ConfigUpdate', update);
     });
   });
 
diff --git a/server/src/services/notification.service.ts b/server/src/services/notification.service.ts
index e72f77ad4f..80a20195a1 100644
--- a/server/src/services/notification.service.ts
+++ b/server/src/services/notification.service.ts
@@ -77,8 +77,8 @@ export class NotificationService extends BaseService {
     await this.notificationRepository.cleanup();
   }
 
-  @OnEvent({ name: 'job.failed' })
-  async onJobFailed({ job, error }: ArgOf<'job.failed'>) {
+  @OnEvent({ name: 'JobFailed' })
+  async onJobFailed({ job, error }: ArgOf<'JobFailed'>) {
     const admin = await this.userRepository.getAdmin();
     if (!admin) {
       return;
@@ -107,14 +107,14 @@ export class NotificationService extends BaseService {
     }
   }
 
-  @OnEvent({ name: 'config.update' })
-  onConfigUpdate({ oldConfig, newConfig }: ArgOf<'config.update'>) {
+  @OnEvent({ name: 'ConfigUpdate' })
+  onConfigUpdate({ oldConfig, newConfig }: ArgOf<'ConfigUpdate'>) {
     this.eventRepository.clientBroadcast('on_config_update');
-    this.eventRepository.serverSend('config.update', { oldConfig, newConfig });
+    this.eventRepository.serverSend('ConfigUpdate', { oldConfig, newConfig });
   }
 
-  @OnEvent({ name: 'config.validate', priority: -100 })
-  async onConfigValidate({ oldConfig, newConfig }: ArgOf<'config.validate'>) {
+  @OnEvent({ name: 'ConfigValidate', priority: -100 })
+  async onConfigValidate({ oldConfig, newConfig }: ArgOf<'ConfigValidate'>) {
     try {
       if (
         newConfig.notifications.smtp.enabled &&
@@ -128,33 +128,33 @@ export class NotificationService extends BaseService {
     }
   }
 
-  @OnEvent({ name: 'asset.hide' })
-  onAssetHide({ assetId, userId }: ArgOf<'asset.hide'>) {
+  @OnEvent({ name: 'AssetHide' })
+  onAssetHide({ assetId, userId }: ArgOf<'AssetHide'>) {
     this.eventRepository.clientSend('on_asset_hidden', userId, assetId);
   }
 
-  @OnEvent({ name: 'asset.show' })
-  async onAssetShow({ assetId }: ArgOf<'asset.show'>) {
+  @OnEvent({ name: 'AssetShow' })
+  async onAssetShow({ assetId }: ArgOf<'AssetShow'>) {
     await this.jobRepository.queue({ name: JobName.GENERATE_THUMBNAILS, data: { id: assetId, notify: true } });
   }
 
-  @OnEvent({ name: 'asset.trash' })
-  onAssetTrash({ assetId, userId }: ArgOf<'asset.trash'>) {
+  @OnEvent({ name: 'AssetTrash' })
+  onAssetTrash({ assetId, userId }: ArgOf<'AssetTrash'>) {
     this.eventRepository.clientSend('on_asset_trash', userId, [assetId]);
   }
 
-  @OnEvent({ name: 'asset.delete' })
-  onAssetDelete({ assetId, userId }: ArgOf<'asset.delete'>) {
+  @OnEvent({ name: 'AssetDelete' })
+  onAssetDelete({ assetId, userId }: ArgOf<'AssetDelete'>) {
     this.eventRepository.clientSend('on_asset_delete', userId, assetId);
   }
 
-  @OnEvent({ name: 'assets.trash' })
-  onAssetsTrash({ assetIds, userId }: ArgOf<'assets.trash'>) {
+  @OnEvent({ name: 'AssetTrashAll' })
+  onAssetsTrash({ assetIds, userId }: ArgOf<'AssetTrashAll'>) {
     this.eventRepository.clientSend('on_asset_trash', userId, assetIds);
   }
 
-  @OnEvent({ name: 'asset.metadataExtracted' })
-  async onAssetMetadataExtracted({ assetId, userId, source }: ArgOf<'asset.metadataExtracted'>) {
+  @OnEvent({ name: 'AssetMetadataExtracted' })
+  async onAssetMetadataExtracted({ assetId, userId, source }: ArgOf<'AssetMetadataExtracted'>) {
     if (source !== 'sidecar-write') {
       return;
     }
@@ -165,40 +165,40 @@ export class NotificationService extends BaseService {
     }
   }
 
-  @OnEvent({ name: 'assets.restore' })
-  onAssetsRestore({ assetIds, userId }: ArgOf<'assets.restore'>) {
+  @OnEvent({ name: 'AssetRestoreAll' })
+  onAssetsRestore({ assetIds, userId }: ArgOf<'AssetRestoreAll'>) {
     this.eventRepository.clientSend('on_asset_restore', userId, assetIds);
   }
 
-  @OnEvent({ name: 'stack.create' })
-  onStackCreate({ userId }: ArgOf<'stack.create'>) {
+  @OnEvent({ name: 'StackCreate' })
+  onStackCreate({ userId }: ArgOf<'StackCreate'>) {
     this.eventRepository.clientSend('on_asset_stack_update', userId);
   }
 
-  @OnEvent({ name: 'stack.update' })
-  onStackUpdate({ userId }: ArgOf<'stack.update'>) {
+  @OnEvent({ name: 'StackUpdate' })
+  onStackUpdate({ userId }: ArgOf<'StackUpdate'>) {
     this.eventRepository.clientSend('on_asset_stack_update', userId);
   }
 
-  @OnEvent({ name: 'stack.delete' })
-  onStackDelete({ userId }: ArgOf<'stack.delete'>) {
+  @OnEvent({ name: 'StackDelete' })
+  onStackDelete({ userId }: ArgOf<'StackDelete'>) {
     this.eventRepository.clientSend('on_asset_stack_update', userId);
   }
 
-  @OnEvent({ name: 'stacks.delete' })
-  onStacksDelete({ userId }: ArgOf<'stacks.delete'>) {
+  @OnEvent({ name: 'StackDeleteAll' })
+  onStacksDelete({ userId }: ArgOf<'StackDeleteAll'>) {
     this.eventRepository.clientSend('on_asset_stack_update', userId);
   }
 
-  @OnEvent({ name: 'user.signup' })
-  async onUserSignup({ notify, id, tempPassword }: ArgOf<'user.signup'>) {
+  @OnEvent({ name: 'UserSignup' })
+  async onUserSignup({ notify, id, tempPassword }: ArgOf<'UserSignup'>) {
     if (notify) {
       await this.jobRepository.queue({ name: JobName.NOTIFY_SIGNUP, data: { id, tempPassword } });
     }
   }
 
-  @OnEvent({ name: 'album.update' })
-  async onAlbumUpdate({ id, recipientId }: ArgOf<'album.update'>) {
+  @OnEvent({ name: 'AlbumUpdate' })
+  async onAlbumUpdate({ id, recipientId }: ArgOf<'AlbumUpdate'>) {
     await this.jobRepository.removeJob(JobName.NOTIFY_ALBUM_UPDATE, `${id}/${recipientId}`);
     await this.jobRepository.queue({
       name: JobName.NOTIFY_ALBUM_UPDATE,
@@ -206,13 +206,13 @@ export class NotificationService extends BaseService {
     });
   }
 
-  @OnEvent({ name: 'album.invite' })
-  async onAlbumInvite({ id, userId }: ArgOf<'album.invite'>) {
+  @OnEvent({ name: 'AlbumInvite' })
+  async onAlbumInvite({ id, userId }: ArgOf<'AlbumInvite'>) {
     await this.jobRepository.queue({ name: JobName.NOTIFY_ALBUM_INVITE, data: { id, recipientId: userId } });
   }
 
-  @OnEvent({ name: 'session.delete' })
-  onSessionDelete({ sessionId }: ArgOf<'session.delete'>) {
+  @OnEvent({ name: 'SessionDelete' })
+  onSessionDelete({ sessionId }: ArgOf<'SessionDelete'>) {
     // after the response is sent
     setTimeout(() => this.eventRepository.clientSend('on_session_delete', sessionId, sessionId), 500);
   }
diff --git a/server/src/services/server.service.ts b/server/src/services/server.service.ts
index bada717f4a..5ad93b40ef 100644
--- a/server/src/services/server.service.ts
+++ b/server/src/services/server.service.ts
@@ -23,7 +23,7 @@ import { isDuplicateDetectionEnabled, isFacialRecognitionEnabled, isSmartSearchE
 
 @Injectable()
 export class ServerService extends BaseService {
-  @OnEvent({ name: 'app.bootstrap' })
+  @OnEvent({ name: 'AppBootstrap' })
   async onBootstrap(): Promise<void> {
     const featureFlags = await this.getFeatures();
     if (featureFlags.configFile) {
diff --git a/server/src/services/smart-info.service.ts b/server/src/services/smart-info.service.ts
index 705e8ed2e5..d6e30c6d86 100644
--- a/server/src/services/smart-info.service.ts
+++ b/server/src/services/smart-info.service.ts
@@ -10,18 +10,18 @@ import { getCLIPModelInfo, isSmartSearchEnabled } from 'src/utils/misc';
 
 @Injectable()
 export class SmartInfoService extends BaseService {
-  @OnEvent({ name: 'config.init', workers: [ImmichWorker.MICROSERVICES] })
-  async onConfigInit({ newConfig }: ArgOf<'config.init'>) {
+  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.MICROSERVICES] })
+  async onConfigInit({ newConfig }: ArgOf<'ConfigInit'>) {
     await this.init(newConfig);
   }
 
-  @OnEvent({ name: 'config.update', workers: [ImmichWorker.MICROSERVICES], server: true })
-  async onConfigUpdate({ oldConfig, newConfig }: ArgOf<'config.update'>) {
+  @OnEvent({ name: 'ConfigUpdate', workers: [ImmichWorker.MICROSERVICES], server: true })
+  async onConfigUpdate({ oldConfig, newConfig }: ArgOf<'ConfigUpdate'>) {
     await this.init(newConfig, oldConfig);
   }
 
-  @OnEvent({ name: 'config.validate' })
-  onConfigValidate({ newConfig }: ArgOf<'config.validate'>) {
+  @OnEvent({ name: 'ConfigValidate' })
+  onConfigValidate({ newConfig }: ArgOf<'ConfigValidate'>) {
     try {
       getCLIPModelInfo(newConfig.machineLearning.clip.modelName);
     } catch {
diff --git a/server/src/services/stack.service.spec.ts b/server/src/services/stack.service.spec.ts
index f6da8bcac7..5c7b505cd9 100644
--- a/server/src/services/stack.service.spec.ts
+++ b/server/src/services/stack.service.spec.ts
@@ -52,7 +52,7 @@ describe(StackService.name, () => {
         ],
       });
 
-      expect(mocks.event.emit).toHaveBeenCalledWith('stack.create', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('StackCreate', {
         stackId: 'stack-id',
         userId: authStub.admin.user.id,
       });
@@ -138,7 +138,7 @@ describe(StackService.name, () => {
         id: 'stack-id',
         primaryAssetId: assetStub.image1.id,
       });
-      expect(mocks.event.emit).toHaveBeenCalledWith('stack.update', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('StackUpdate', {
         stackId: 'stack-id',
         userId: authStub.admin.user.id,
       });
@@ -160,7 +160,7 @@ describe(StackService.name, () => {
       await sut.delete(authStub.admin, 'stack-id');
 
       expect(mocks.stack.delete).toHaveBeenCalledWith('stack-id');
-      expect(mocks.event.emit).toHaveBeenCalledWith('stack.delete', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('StackDelete', {
         stackId: 'stack-id',
         userId: authStub.admin.user.id,
       });
@@ -182,7 +182,7 @@ describe(StackService.name, () => {
       await sut.deleteAll(authStub.admin, { ids: ['stack-id'] });
 
       expect(mocks.stack.deleteAll).toHaveBeenCalledWith(['stack-id']);
-      expect(mocks.event.emit).toHaveBeenCalledWith('stacks.delete', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('StackDeleteAll', {
         stackIds: ['stack-id'],
         userId: authStub.admin.user.id,
       });
diff --git a/server/src/services/stack.service.ts b/server/src/services/stack.service.ts
index 831755fefb..b2ac47274f 100644
--- a/server/src/services/stack.service.ts
+++ b/server/src/services/stack.service.ts
@@ -21,7 +21,7 @@ export class StackService extends BaseService {
 
     const stack = await this.stackRepository.create({ ownerId: auth.user.id }, dto.assetIds);
 
-    await this.eventRepository.emit('stack.create', { stackId: stack.id, userId: auth.user.id });
+    await this.eventRepository.emit('StackCreate', { stackId: stack.id, userId: auth.user.id });
 
     return mapStack(stack, { auth });
   }
@@ -41,7 +41,7 @@ export class StackService extends BaseService {
 
     const updatedStack = await this.stackRepository.update(id, { id, primaryAssetId: dto.primaryAssetId });
 
-    await this.eventRepository.emit('stack.update', { stackId: id, userId: auth.user.id });
+    await this.eventRepository.emit('StackUpdate', { stackId: id, userId: auth.user.id });
 
     return mapStack(updatedStack, { auth });
   }
@@ -49,13 +49,13 @@ export class StackService extends BaseService {
   async delete(auth: AuthDto, id: string): Promise<void> {
     await this.requireAccess({ auth, permission: Permission.STACK_DELETE, ids: [id] });
     await this.stackRepository.delete(id);
-    await this.eventRepository.emit('stack.delete', { stackId: id, userId: auth.user.id });
+    await this.eventRepository.emit('StackDelete', { stackId: id, userId: auth.user.id });
   }
 
   async deleteAll(auth: AuthDto, dto: BulkIdsDto): Promise<void> {
     await this.requireAccess({ auth, permission: Permission.STACK_DELETE, ids: dto.ids });
     await this.stackRepository.deleteAll(dto.ids);
-    await this.eventRepository.emit('stacks.delete', { stackIds: dto.ids, userId: auth.user.id });
+    await this.eventRepository.emit('StackDeleteAll', { stackIds: dto.ids, userId: auth.user.id });
   }
 
   private async findOrFail(id: string) {
diff --git a/server/src/services/storage-template.service.ts b/server/src/services/storage-template.service.ts
index fcba497fa6..a286d518d6 100644
--- a/server/src/services/storage-template.service.ts
+++ b/server/src/services/storage-template.service.ts
@@ -75,8 +75,8 @@ export class StorageTemplateService extends BaseService {
     return this._template;
   }
 
-  @OnEvent({ name: 'config.init' })
-  onConfigInit({ newConfig }: ArgOf<'config.init'>) {
+  @OnEvent({ name: 'ConfigInit' })
+  onConfigInit({ newConfig }: ArgOf<'ConfigInit'>) {
     const template = newConfig.storageTemplate.template;
     if (!this._template || template !== this.template.raw) {
       this.logger.debug(`Compiling new storage template: ${template}`);
@@ -84,13 +84,13 @@ export class StorageTemplateService extends BaseService {
     }
   }
 
-  @OnEvent({ name: 'config.update', server: true })
-  onConfigUpdate({ newConfig }: ArgOf<'config.update'>) {
+  @OnEvent({ name: 'ConfigUpdate', server: true })
+  onConfigUpdate({ newConfig }: ArgOf<'ConfigUpdate'>) {
     this.onConfigInit({ newConfig });
   }
 
-  @OnEvent({ name: 'config.validate' })
-  onConfigValidate({ newConfig }: ArgOf<'config.validate'>) {
+  @OnEvent({ name: 'ConfigValidate' })
+  onConfigValidate({ newConfig }: ArgOf<'ConfigValidate'>) {
     try {
       const { compiled } = this.compile(newConfig.storageTemplate.template);
       this.render(compiled, {
@@ -116,8 +116,8 @@ export class StorageTemplateService extends BaseService {
     return { ...storageTokens, presetOptions: storagePresets };
   }
 
-  @OnEvent({ name: 'asset.metadataExtracted' })
-  async onAssetMetadataExtracted({ source, assetId }: ArgOf<'asset.metadataExtracted'>) {
+  @OnEvent({ name: 'AssetMetadataExtracted' })
+  async onAssetMetadataExtracted({ source, assetId }: ArgOf<'AssetMetadataExtracted'>) {
     await this.jobRepository.queue({ name: JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE, data: { source, id: assetId } });
   }
 
@@ -182,8 +182,8 @@ export class StorageTemplateService extends BaseService {
     return JobStatus.SUCCESS;
   }
 
-  @OnEvent({ name: 'asset.delete' })
-  async handleMoveHistoryCleanup({ assetId }: ArgOf<'asset.delete'>) {
+  @OnEvent({ name: 'AssetDelete' })
+  async handleMoveHistoryCleanup({ assetId }: ArgOf<'AssetDelete'>) {
     this.logger.debug(`Cleaning up move history for asset ${assetId}`);
     await this.moveRepository.cleanMoveHistorySingle(assetId);
   }
diff --git a/server/src/services/storage.service.ts b/server/src/services/storage.service.ts
index 3861f84815..e9ca10f08a 100644
--- a/server/src/services/storage.service.ts
+++ b/server/src/services/storage.service.ts
@@ -11,7 +11,7 @@ const docsMessage = `Please see https://immich.app/docs/administration/system-in
 
 @Injectable()
 export class StorageService extends BaseService {
-  @OnEvent({ name: 'app.bootstrap' })
+  @OnEvent({ name: 'AppBootstrap' })
   async onBootstrap() {
     const envData = this.configRepository.getEnv();
 
diff --git a/server/src/services/system-config.service.spec.ts b/server/src/services/system-config.service.spec.ts
index 43be323459..582c50ed8a 100644
--- a/server/src/services/system-config.service.spec.ts
+++ b/server/src/services/system-config.service.spec.ts
@@ -412,7 +412,7 @@ describe(SystemConfigService.name, () => {
       mocks.systemMetadata.get.mockResolvedValue(partialConfig);
       await expect(sut.updateSystemConfig(updatedConfig)).resolves.toEqual(updatedConfig);
       expect(mocks.event.emit).toHaveBeenCalledWith(
-        'config.update',
+        'ConfigUpdate',
         expect.objectContaining({ oldConfig: expect.any(Object), newConfig: updatedConfig }),
       );
     });
diff --git a/server/src/services/system-config.service.ts b/server/src/services/system-config.service.ts
index 4c4aa6bab7..d046b0317a 100644
--- a/server/src/services/system-config.service.ts
+++ b/server/src/services/system-config.service.ts
@@ -12,10 +12,10 @@ import { toPlainObject } from 'src/utils/object';
 
 @Injectable()
 export class SystemConfigService extends BaseService {
-  @OnEvent({ name: 'app.bootstrap', priority: BootstrapEventPriority.SystemConfig })
+  @OnEvent({ name: 'AppBootstrap', priority: BootstrapEventPriority.SystemConfig })
   async onBootstrap() {
     const config = await this.getConfig({ withCache: false });
-    await this.eventRepository.emit('config.init', { newConfig: config });
+    await this.eventRepository.emit('ConfigInit', { newConfig: config });
   }
 
   async getSystemConfig(): Promise<SystemConfigDto> {
@@ -27,8 +27,8 @@ export class SystemConfigService extends BaseService {
     return mapConfig(defaults);
   }
 
-  @OnEvent({ name: 'config.init', priority: -100 })
-  onConfigInit({ newConfig: { logging } }: ArgOf<'config.init'>) {
+  @OnEvent({ name: 'ConfigInit', priority: -100 })
+  onConfigInit({ newConfig: { logging } }: ArgOf<'ConfigInit'>) {
     const { logLevel: envLevel } = this.configRepository.getEnv();
     const configLevel = logging.enabled ? logging.level : false;
     const level = envLevel ?? configLevel;
@@ -36,14 +36,14 @@ export class SystemConfigService extends BaseService {
     this.logger.log(`LogLevel=${level} ${envLevel ? '(set via IMMICH_LOG_LEVEL)' : '(set via system config)'}`);
   }
 
-  @OnEvent({ name: 'config.update', server: true })
-  onConfigUpdate({ newConfig }: ArgOf<'config.update'>) {
+  @OnEvent({ name: 'ConfigUpdate', server: true })
+  onConfigUpdate({ newConfig }: ArgOf<'ConfigUpdate'>) {
     this.onConfigInit({ newConfig });
     clearConfigCache();
   }
 
-  @OnEvent({ name: 'config.validate' })
-  onConfigValidate({ newConfig, oldConfig }: ArgOf<'config.validate'>) {
+  @OnEvent({ name: 'ConfigValidate' })
+  onConfigValidate({ newConfig, oldConfig }: ArgOf<'ConfigValidate'>) {
     const { logLevel } = this.configRepository.getEnv();
     if (!_.isEqual(instanceToPlain(newConfig.logging), oldConfig.logging) && logLevel) {
       throw new Error('Logging cannot be changed while the environment variable IMMICH_LOG_LEVEL is set.');
@@ -59,7 +59,7 @@ export class SystemConfigService extends BaseService {
     const oldConfig = await this.getConfig({ withCache: false });
 
     try {
-      await this.eventRepository.emit('config.validate', { newConfig: toPlainObject(dto), oldConfig });
+      await this.eventRepository.emit('ConfigValidate', { newConfig: toPlainObject(dto), oldConfig });
     } catch (error) {
       this.logger.warn(`Unable to save system config due to a validation error: ${error}`);
       throw new BadRequestException(error instanceof Error ? error.message : error);
@@ -67,7 +67,7 @@ export class SystemConfigService extends BaseService {
 
     const newConfig = await this.updateConfig(dto);
 
-    await this.eventRepository.emit('config.update', { newConfig, oldConfig });
+    await this.eventRepository.emit('ConfigUpdate', { newConfig, oldConfig });
 
     return mapConfig(newConfig);
   }
diff --git a/server/src/services/tag.service.ts b/server/src/services/tag.service.ts
index 5e8b2b4057..e975fc3980 100644
--- a/server/src/services/tag.service.ts
+++ b/server/src/services/tag.service.ts
@@ -90,7 +90,7 @@ export class TagService extends BaseService {
 
     const results = await this.tagRepository.upsertAssetIds(items);
     for (const assetId of new Set(results.map((item) => item.assetsId))) {
-      await this.eventRepository.emit('asset.tag', { assetId });
+      await this.eventRepository.emit('AssetTag', { assetId });
     }
 
     return { count: results.length };
@@ -107,7 +107,7 @@ export class TagService extends BaseService {
 
     for (const { id: assetId, success } of results) {
       if (success) {
-        await this.eventRepository.emit('asset.tag', { assetId });
+        await this.eventRepository.emit('AssetTag', { assetId });
       }
     }
 
@@ -125,7 +125,7 @@ export class TagService extends BaseService {
 
     for (const { id: assetId, success } of results) {
       if (success) {
-        await this.eventRepository.emit('asset.untag', { assetId });
+        await this.eventRepository.emit('AssetUntag', { assetId });
       }
     }
 
diff --git a/server/src/services/trash.service.ts b/server/src/services/trash.service.ts
index f33b249823..a7447ab890 100644
--- a/server/src/services/trash.service.ts
+++ b/server/src/services/trash.service.ts
@@ -17,7 +17,7 @@ export class TrashService extends BaseService {
 
     await this.requireAccess({ auth, permission: Permission.ASSET_DELETE, ids });
     await this.trashRepository.restoreAll(ids);
-    await this.eventRepository.emit('assets.restore', { assetIds: ids, userId: auth.user.id });
+    await this.eventRepository.emit('AssetRestoreAll', { assetIds: ids, userId: auth.user.id });
 
     this.logger.log(`Restored ${ids.length} asset(s) from trash`);
 
@@ -40,7 +40,7 @@ export class TrashService extends BaseService {
     return { count };
   }
 
-  @OnEvent({ name: 'assets.delete' })
+  @OnEvent({ name: 'AssetDeleteAll' })
   async onAssetsDelete() {
     await this.jobRepository.queue({ name: JobName.QUEUE_TRASH_EMPTY, data: {} });
   }
diff --git a/server/src/services/user-admin.service.ts b/server/src/services/user-admin.service.ts
index 332496a95e..180471bb44 100644
--- a/server/src/services/user-admin.service.ts
+++ b/server/src/services/user-admin.service.ts
@@ -35,7 +35,7 @@ export class UserAdminService extends BaseService {
 
     const user = await this.createUser(userDto);
 
-    await this.eventRepository.emit('user.signup', {
+    await this.eventRepository.emit('UserSignup', {
       notify: !!notify,
       id: user.id,
       tempPassword: user.shouldChangePassword ? userDto.password : undefined,
diff --git a/server/src/services/version.service.ts b/server/src/services/version.service.ts
index 869acc269c..51d31b623f 100644
--- a/server/src/services/version.service.ts
+++ b/server/src/services/version.service.ts
@@ -20,7 +20,7 @@ const asNotification = ({ checkedAt, releaseVersion }: VersionCheckMetadata): Re
 
 @Injectable()
 export class VersionService extends BaseService {
-  @OnEvent({ name: 'app.bootstrap' })
+  @OnEvent({ name: 'AppBootstrap' })
   async onBootstrap(): Promise<void> {
     await this.handleVersionCheck();
 
@@ -102,8 +102,8 @@ export class VersionService extends BaseService {
     return JobStatus.SUCCESS;
   }
 
-  @OnEvent({ name: 'websocket.connect' })
-  async onWebsocketConnection({ userId }: ArgOf<'websocket.connect'>) {
+  @OnEvent({ name: 'WebsocketConnect' })
+  async onWebsocketConnection({ userId }: ArgOf<'WebsocketConnect'>) {
     this.eventRepository.clientSend('on_server_version', userId, serverVersion);
     const metadata = await this.systemMetadataRepository.get(SystemMetadataKey.VERSION_CHECK_STATE);
     if (metadata) {
diff --git a/server/src/utils/asset.util.ts b/server/src/utils/asset.util.ts
index 0f5432da4d..85bc6cd2e5 100644
--- a/server/src/utils/asset.util.ts
+++ b/server/src/utils/asset.util.ts
@@ -152,7 +152,7 @@ export const onBeforeLink = async (
 
   if (motionAsset && motionAsset.visibility === AssetVisibility.TIMELINE) {
     await assetRepository.update({ id: livePhotoVideoId, visibility: AssetVisibility.HIDDEN });
-    await eventRepository.emit('asset.hide', { assetId: motionAsset.id, userId });
+    await eventRepository.emit('AssetHide', { assetId: motionAsset.id, userId });
   }
 };
 
@@ -177,7 +177,7 @@ export const onAfterUnlink = async (
   { userId, livePhotoVideoId, visibility }: { userId: string; livePhotoVideoId: string; visibility: AssetVisibility },
 ) => {
   await assetRepository.update({ id: livePhotoVideoId, visibility });
-  await eventRepository.emit('asset.show', { assetId: livePhotoVideoId, userId });
+  await eventRepository.emit('AssetShow', { assetId: livePhotoVideoId, userId });
 };
 
 export function mapToUploadFile(file: ImmichFile): UploadFile {

From e73abe076238461066e5fde32c82de4f7867d0da Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 15 Jul 2025 14:50:13 -0400
Subject: [PATCH 216/337] refactor: enum casing (#19946)

---
 server/src/app.module.ts                      |   4 +-
 server/src/config.ts                          |  50 +-
 server/src/constants.ts                       |  10 +-
 server/src/controllers/activity.controller.ts |   8 +-
 server/src/controllers/album.controller.ts    |  12 +-
 .../controllers/api-key.controller.spec.ts    |   2 +-
 server/src/controllers/api-key.controller.ts  |  10 +-
 .../src/controllers/asset-media.controller.ts |   4 +-
 server/src/controllers/asset.controller.ts    |   2 +-
 server/src/controllers/auth.controller.ts     |  14 +-
 server/src/controllers/face.controller.ts     |   8 +-
 server/src/controllers/library.controller.ts  |  14 +-
 server/src/controllers/memory.controller.ts   |  12 +-
 .../controllers/notification.controller.ts    |  12 +-
 server/src/controllers/oauth.controller.ts    |  14 +-
 server/src/controllers/partner.controller.ts  |   8 +-
 server/src/controllers/person.controller.ts   |  22 +-
 server/src/controllers/session.controller.ts  |  12 +-
 .../src/controllers/shared-link.controller.ts |  14 +-
 server/src/controllers/stack.controller.ts    |  12 +-
 .../controllers/system-config.controller.ts   |   8 +-
 .../controllers/system-metadata.controller.ts |   8 +-
 server/src/controllers/tag.controller.ts      |  18 +-
 server/src/controllers/timeline.controller.ts |   4 +-
 server/src/controllers/trash.controller.ts    |   6 +-
 .../src/controllers/user-admin.controller.ts  |  18 +-
 server/src/controllers/user.controller.ts     |   2 +-
 server/src/cores/storage.core.ts              |  42 +-
 server/src/decorators.ts                      |   6 +-
 server/src/dtos/album.dto.ts                  |   2 +-
 server/src/dtos/asset-response.dto.ts         |   2 +-
 server/src/dtos/asset.dto.ts                  |   4 +-
 server/src/dtos/auth.dto.ts                   |   2 +-
 server/src/dtos/job.dto.ts                    |  30 +-
 server/src/dtos/memory.dto.ts                 |   2 +-
 server/src/dtos/search.dto.ts                 |   2 +-
 server/src/dtos/system-config.dto.ts          |  28 +-
 server/src/dtos/user-preferences.dto.ts       |   2 +-
 server/src/dtos/user.dto.ts                   |   2 +-
 server/src/enum.ts                            | 655 +++++++++---------
 server/src/main.ts                            |   6 +-
 .../middleware/asset-upload.interceptor.ts    |   2 +-
 server/src/middleware/auth.guard.ts           |   8 +-
 .../src/middleware/file-upload.interceptor.ts |   4 +-
 .../1718486162779-AddFaceSearchRelation.ts    |   4 +-
 server/src/repositories/access.repository.ts  |   8 +-
 .../src/repositories/activity.repository.ts   |   2 +-
 .../src/repositories/album-user.repository.ts |   2 +-
 .../src/repositories/asset-job.repository.ts  |  20 +-
 server/src/repositories/asset.repository.ts   |  32 +-
 server/src/repositories/audit.repository.ts   |   2 +-
 .../repositories/config.repository.spec.ts    |   4 +-
 server/src/repositories/config.repository.ts  |  22 +-
 .../src/repositories/database.repository.ts   |  36 +-
 .../src/repositories/download.repository.ts   |   2 +-
 .../src/repositories/duplicate.repository.ts  |   4 +-
 server/src/repositories/event.repository.ts   |   2 +-
 server/src/repositories/job.repository.ts     |  14 +-
 server/src/repositories/library.repository.ts |   4 +-
 .../repositories/logging.repository.spec.ts   |   4 +-
 server/src/repositories/logging.repository.ts |  32 +-
 server/src/repositories/map.repository.ts     |  10 +-
 server/src/repositories/media.repository.ts   |  12 +-
 server/src/repositories/memory.repository.ts  |   6 +-
 server/src/repositories/move.repository.ts    |   4 +-
 server/src/repositories/oauth.repository.ts   |   4 +-
 server/src/repositories/person.repository.ts  |   8 +-
 server/src/repositories/search.repository.ts  |  14 +-
 .../repositories/shared-link.repository.ts    |   6 +-
 .../src/repositories/telemetry.repository.ts  |  12 +-
 server/src/repositories/trash.repository.ts   |  14 +-
 server/src/repositories/user.repository.ts    |  14 +-
 server/src/repositories/view-repository.ts    |   4 +-
 .../1744910873969-InitialMigration.ts         | 420 ++++++++---
 .../1749067526135-UserOnboardingDefault.ts    |   4 +-
 server/src/schema/tables/album-user.table.ts  |   2 +-
 server/src/schema/tables/album.table.ts       |   2 +-
 server/src/schema/tables/asset-face.table.ts  |   2 +-
 server/src/schema/tables/asset.table.ts       |   4 +-
 server/src/schema/tables/user.table.ts        |   2 +-
 server/src/services/activity.service.ts       |   8 +-
 server/src/services/album.service.spec.ts     |  26 +-
 server/src/services/album.service.ts          |  20 +-
 server/src/services/api-key.service.spec.ts   |  18 +-
 .../src/services/asset-media.service.spec.ts  |  38 +-
 server/src/services/asset-media.service.ts    |  36 +-
 server/src/services/asset.service.spec.ts     |  64 +-
 server/src/services/asset.service.ts          |  46 +-
 server/src/services/audit.service.spec.ts     |   2 +-
 server/src/services/audit.service.ts          |   4 +-
 server/src/services/auth.service.spec.ts      |  10 +-
 server/src/services/auth.service.ts           |  22 +-
 server/src/services/backup.service.spec.ts    |  18 +-
 server/src/services/backup.service.ts         |  14 +-
 server/src/services/database.service.spec.ts  |  40 +-
 server/src/services/database.service.ts       |   8 +-
 server/src/services/download.service.ts       |   8 +-
 server/src/services/duplicate.service.spec.ts |  32 +-
 server/src/services/duplicate.service.ts      |  32 +-
 server/src/services/job.service.spec.ts       | 160 ++---
 server/src/services/job.service.ts            | 154 ++--
 server/src/services/library.service.spec.ts   |  78 +--
 server/src/services/library.service.ts        |  99 ++-
 server/src/services/media.service.spec.ts     | 346 ++++-----
 server/src/services/media.service.ts          | 172 ++---
 server/src/services/memory.service.ts         |  24 +-
 server/src/services/metadata.service.spec.ts  |  80 +--
 server/src/services/metadata.service.ts       | 100 +--
 .../src/services/notification.service.spec.ts |  76 +-
 server/src/services/notification.service.ts   |  74 +-
 server/src/services/partner.service.ts        |   2 +-
 server/src/services/person.service.spec.ts    |  76 +-
 server/src/services/person.service.ts         | 146 ++--
 server/src/services/search.service.ts         |   8 +-
 server/src/services/server.service.spec.ts    |   2 +-
 server/src/services/server.service.ts         |  14 +-
 server/src/services/session.service.spec.ts   |   2 +-
 server/src/services/session.service.ts        |  10 +-
 .../src/services/shared-link.service.spec.ts  |  20 +-
 server/src/services/shared-link.service.ts    |  14 +-
 .../src/services/smart-info.service.spec.ts   |  18 +-
 server/src/services/smart-info.service.ts     |  30 +-
 server/src/services/stack.service.ts          |  10 +-
 .../services/storage-template.service.spec.ts |  68 +-
 .../src/services/storage-template.service.ts  |  32 +-
 server/src/services/storage.service.spec.ts   |   4 +-
 server/src/services/storage.service.ts        |  10 +-
 server/src/services/sync.service.ts           |  10 +-
 .../services/system-config.service.spec.ts    |  48 +-
 .../services/system-metadata.service.spec.ts  |   4 +-
 .../src/services/system-metadata.service.ts   |   8 +-
 server/src/services/tag.service.spec.ts       |   2 +-
 server/src/services/tag.service.ts            |  22 +-
 server/src/services/timeline.service.spec.ts  |  10 +-
 server/src/services/timeline.service.ts       |  14 +-
 server/src/services/trash.service.spec.ts     |   8 +-
 server/src/services/trash.service.ts          |  12 +-
 .../src/services/user-admin.service.spec.ts   |   6 +-
 server/src/services/user-admin.service.ts     |   6 +-
 server/src/services/user.service.spec.ts      |  12 +-
 server/src/services/user.service.ts           |  48 +-
 server/src/services/version.service.spec.ts   |  20 +-
 server/src/services/version.service.ts        |  24 +-
 server/src/types.ts                           | 136 ++--
 server/src/utils/access.ts                    | 116 ++--
 server/src/utils/asset.util.ts                |  16 +-
 server/src/utils/config.ts                    |   4 +-
 server/src/utils/database.ts                  |  10 +-
 server/src/utils/file.ts                      |   6 +-
 server/src/utils/media.ts                     |  52 +-
 server/src/utils/mime-types.ts                |   6 +-
 server/src/utils/misc.ts                      |   6 +-
 server/src/utils/preferences.ts               |   4 +-
 server/src/utils/response.ts                  |  12 +-
 server/test/fixtures/album.stub.ts            |  22 +-
 server/test/fixtures/asset.stub.ts            | 140 ++--
 server/test/fixtures/face.stub.ts             |  16 +-
 server/test/fixtures/person.stub.ts           |  14 +-
 server/test/fixtures/shared-link.stub.ts      |  32 +-
 server/test/fixtures/user.stub.ts             |   6 +-
 server/test/medium.factory.ts                 |  10 +-
 .../specs/services/auth.service.spec.ts       |   4 +-
 .../specs/services/memory.service.spec.ts     |  14 +-
 .../specs/services/timeline.service.spec.ts   |   2 +-
 .../specs/services/user.service.spec.ts       |  14 +-
 .../specs/services/version.service.spec.ts    |   2 +-
 .../specs/sync/sync-album-asset-exif.spec.ts  |   8 +-
 .../specs/sync/sync-album-asset.spec.ts       |   8 +-
 .../specs/sync/sync-album-to-asset.spec.ts    |   4 +-
 .../medium/specs/sync/sync-album-user.spec.ts |  42 +-
 .../test/medium/specs/sync/sync-album.spec.ts |  10 +-
 .../specs/sync/sync-user-metadata.spec.ts     |  20 +-
 .../repositories/config.repository.mock.ts    |   8 +-
 server/test/small.factory.ts                  |  16 +-
 174 files changed, 2675 insertions(+), 2459 deletions(-)

diff --git a/server/src/app.module.ts b/server/src/app.module.ts
index c06087edea..9ea75d78c4 100644
--- a/server/src/app.module.ts
+++ b/server/src/app.module.ts
@@ -85,13 +85,13 @@ class BaseModule implements OnModuleInit, OnModuleDestroy {
 @Module({
   imports: [...imports, ScheduleModule.forRoot()],
   controllers: [...controllers],
-  providers: [...common, ...middleware, { provide: IWorker, useValue: ImmichWorker.API }],
+  providers: [...common, ...middleware, { provide: IWorker, useValue: ImmichWorker.Api }],
 })
 export class ApiModule extends BaseModule {}
 
 @Module({
   imports: [...imports],
-  providers: [...common, { provide: IWorker, useValue: ImmichWorker.MICROSERVICES }, SchedulerRegistry],
+  providers: [...common, { provide: IWorker, useValue: ImmichWorker.Microservices }, SchedulerRegistry],
 })
 export class MicroservicesModule extends BaseModule {}
 
diff --git a/server/src/config.ts b/server/src/config.ts
index 90ca2c1529..33a6f19ba1 100644
--- a/server/src/config.ts
+++ b/server/src/config.ts
@@ -8,7 +8,7 @@ import {
   OAuthTokenEndpointAuthMethod,
   QueueName,
   ToneMapping,
-  TranscodeHWAccel,
+  TranscodeHardwareAcceleration,
   TranscodePolicy,
   VideoCodec,
   VideoContainer,
@@ -42,7 +42,7 @@ export interface SystemConfig {
     twoPass: boolean;
     preferredHwDevice: string;
     transcode: TranscodePolicy;
-    accel: TranscodeHWAccel;
+    accel: TranscodeHardwareAcceleration;
     accelDecode: boolean;
     tonemap: ToneMapping;
   };
@@ -190,39 +190,39 @@ export const defaults = Object.freeze<SystemConfig>({
     preset: 'ultrafast',
     targetVideoCodec: VideoCodec.H264,
     acceptedVideoCodecs: [VideoCodec.H264],
-    targetAudioCodec: AudioCodec.AAC,
-    acceptedAudioCodecs: [AudioCodec.AAC, AudioCodec.MP3, AudioCodec.LIBOPUS, AudioCodec.PCMS16LE],
-    acceptedContainers: [VideoContainer.MOV, VideoContainer.OGG, VideoContainer.WEBM],
+    targetAudioCodec: AudioCodec.Aac,
+    acceptedAudioCodecs: [AudioCodec.Aac, AudioCodec.Mp3, AudioCodec.LibOpus, AudioCodec.PcmS16le],
+    acceptedContainers: [VideoContainer.Mov, VideoContainer.Ogg, VideoContainer.Webm],
     targetResolution: '720',
     maxBitrate: '0',
     bframes: -1,
     refs: 0,
     gopSize: 0,
     temporalAQ: false,
-    cqMode: CQMode.AUTO,
+    cqMode: CQMode.Auto,
     twoPass: false,
     preferredHwDevice: 'auto',
-    transcode: TranscodePolicy.REQUIRED,
-    tonemap: ToneMapping.HABLE,
-    accel: TranscodeHWAccel.DISABLED,
+    transcode: TranscodePolicy.Required,
+    tonemap: ToneMapping.Hable,
+    accel: TranscodeHardwareAcceleration.Disabled,
     accelDecode: false,
   },
   job: {
-    [QueueName.BACKGROUND_TASK]: { concurrency: 5 },
-    [QueueName.SMART_SEARCH]: { concurrency: 2 },
-    [QueueName.METADATA_EXTRACTION]: { concurrency: 5 },
-    [QueueName.FACE_DETECTION]: { concurrency: 2 },
-    [QueueName.SEARCH]: { concurrency: 5 },
-    [QueueName.SIDECAR]: { concurrency: 5 },
-    [QueueName.LIBRARY]: { concurrency: 5 },
-    [QueueName.MIGRATION]: { concurrency: 5 },
-    [QueueName.THUMBNAIL_GENERATION]: { concurrency: 3 },
-    [QueueName.VIDEO_CONVERSION]: { concurrency: 1 },
-    [QueueName.NOTIFICATION]: { concurrency: 5 },
+    [QueueName.BackgroundTask]: { concurrency: 5 },
+    [QueueName.SmartSearch]: { concurrency: 2 },
+    [QueueName.MetadataExtraction]: { concurrency: 5 },
+    [QueueName.FaceDetection]: { concurrency: 2 },
+    [QueueName.Search]: { concurrency: 5 },
+    [QueueName.Sidecar]: { concurrency: 5 },
+    [QueueName.Library]: { concurrency: 5 },
+    [QueueName.Migration]: { concurrency: 5 },
+    [QueueName.ThumbnailGeneration]: { concurrency: 3 },
+    [QueueName.VideoConversion]: { concurrency: 1 },
+    [QueueName.Notification]: { concurrency: 5 },
   },
   logging: {
     enabled: true,
-    level: LogLevel.LOG,
+    level: LogLevel.Log,
   },
   machineLearning: {
     enabled: process.env.IMMICH_MACHINE_LEARNING_ENABLED !== 'false',
@@ -273,7 +273,7 @@ export const defaults = Object.freeze<SystemConfig>({
     storageLabelClaim: 'preferred_username',
     storageQuotaClaim: 'immich_quota',
     roleClaim: 'immich_role',
-    tokenEndpointAuthMethod: OAuthTokenEndpointAuthMethod.CLIENT_SECRET_POST,
+    tokenEndpointAuthMethod: OAuthTokenEndpointAuthMethod.ClientSecretPost,
     timeout: 30_000,
   },
   passwordLogin: {
@@ -286,12 +286,12 @@ export const defaults = Object.freeze<SystemConfig>({
   },
   image: {
     thumbnail: {
-      format: ImageFormat.WEBP,
+      format: ImageFormat.Webp,
       size: 250,
       quality: 80,
     },
     preview: {
-      format: ImageFormat.JPEG,
+      format: ImageFormat.Jpeg,
       size: 1440,
       quality: 80,
     },
@@ -299,7 +299,7 @@ export const defaults = Object.freeze<SystemConfig>({
     extractEmbedded: false,
     fullsize: {
       enabled: false,
-      format: ImageFormat.JPEG,
+      format: ImageFormat.Jpeg,
       quality: 80,
     },
   },
diff --git a/server/src/constants.ts b/server/src/constants.ts
index 2e25797938..447d8a09c9 100644
--- a/server/src/constants.ts
+++ b/server/src/constants.ts
@@ -25,14 +25,14 @@ export const EXTENSION_NAMES: Record<DatabaseExtension, string> = {
 } as const;
 
 export const VECTOR_EXTENSIONS = [
-  DatabaseExtension.VECTORCHORD,
-  DatabaseExtension.VECTORS,
-  DatabaseExtension.VECTOR,
+  DatabaseExtension.VectorChord,
+  DatabaseExtension.Vectors,
+  DatabaseExtension.Vector,
 ] as const;
 
 export const VECTOR_INDEX_TABLES = {
-  [VectorIndex.CLIP]: 'smart_search',
-  [VectorIndex.FACE]: 'face_search',
+  [VectorIndex.Clip]: 'smart_search',
+  [VectorIndex.Face]: 'face_search',
 } as const;
 
 export const VECTORCHORD_LIST_SLACK_FACTOR = 1.2;
diff --git a/server/src/controllers/activity.controller.ts b/server/src/controllers/activity.controller.ts
index b91f2902d5..d2d34da102 100644
--- a/server/src/controllers/activity.controller.ts
+++ b/server/src/controllers/activity.controller.ts
@@ -20,13 +20,13 @@ export class ActivityController {
   constructor(private service: ActivityService) {}
 
   @Get()
-  @Authenticated({ permission: Permission.ACTIVITY_READ })
+  @Authenticated({ permission: Permission.ActivityRead })
   getActivities(@Auth() auth: AuthDto, @Query() dto: ActivitySearchDto): Promise<ActivityResponseDto[]> {
     return this.service.getAll(auth, dto);
   }
 
   @Post()
-  @Authenticated({ permission: Permission.ACTIVITY_CREATE })
+  @Authenticated({ permission: Permission.ActivityCreate })
   async createActivity(
     @Auth() auth: AuthDto,
     @Body() dto: ActivityCreateDto,
@@ -40,14 +40,14 @@ export class ActivityController {
   }
 
   @Get('statistics')
-  @Authenticated({ permission: Permission.ACTIVITY_STATISTICS })
+  @Authenticated({ permission: Permission.ActivityStatistics })
   getActivityStatistics(@Auth() auth: AuthDto, @Query() dto: ActivityDto): Promise<ActivityStatisticsResponseDto> {
     return this.service.getStatistics(auth, dto);
   }
 
   @Delete(':id')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated({ permission: Permission.ACTIVITY_DELETE })
+  @Authenticated({ permission: Permission.ActivityDelete })
   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 49ec5a82ea..2e6d1e7e43 100644
--- a/server/src/controllers/album.controller.ts
+++ b/server/src/controllers/album.controller.ts
@@ -23,24 +23,24 @@ export class AlbumController {
   constructor(private service: AlbumService) {}
 
   @Get()
-  @Authenticated({ permission: Permission.ALBUM_READ })
+  @Authenticated({ permission: Permission.AlbumRead })
   getAllAlbums(@Auth() auth: AuthDto, @Query() query: GetAlbumsDto): Promise<AlbumResponseDto[]> {
     return this.service.getAll(auth, query);
   }
 
   @Post()
-  @Authenticated({ permission: Permission.ALBUM_CREATE })
+  @Authenticated({ permission: Permission.AlbumCreate })
   createAlbum(@Auth() auth: AuthDto, @Body() dto: CreateAlbumDto): Promise<AlbumResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Get('statistics')
-  @Authenticated({ permission: Permission.ALBUM_STATISTICS })
+  @Authenticated({ permission: Permission.AlbumStatistics })
   getAlbumStatistics(@Auth() auth: AuthDto): Promise<AlbumStatisticsResponseDto> {
     return this.service.getStatistics(auth);
   }
 
-  @Authenticated({ permission: Permission.ALBUM_READ, sharedLink: true })
+  @Authenticated({ permission: Permission.AlbumRead, sharedLink: true })
   @Get(':id')
   getAlbumInfo(
     @Auth() auth: AuthDto,
@@ -51,7 +51,7 @@ export class AlbumController {
   }
 
   @Patch(':id')
-  @Authenticated({ permission: Permission.ALBUM_UPDATE })
+  @Authenticated({ permission: Permission.AlbumUpdate })
   updateAlbumInfo(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -61,7 +61,7 @@ export class AlbumController {
   }
 
   @Delete(':id')
-  @Authenticated({ permission: Permission.ALBUM_DELETE })
+  @Authenticated({ permission: Permission.AlbumDelete })
   deleteAlbum(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto) {
     return this.service.delete(auth, id);
   }
diff --git a/server/src/controllers/api-key.controller.spec.ts b/server/src/controllers/api-key.controller.spec.ts
index f58a53723a..993ad012cc 100644
--- a/server/src/controllers/api-key.controller.spec.ts
+++ b/server/src/controllers/api-key.controller.spec.ts
@@ -55,7 +55,7 @@ describe(APIKeyController.name, () => {
     it('should require a valid uuid', async () => {
       const { status, body } = await request(ctx.getHttpServer())
         .put(`/api-keys/123`)
-        .send({ name: 'new name', permissions: [Permission.ALL] });
+        .send({ name: 'new name', permissions: [Permission.All] });
       expect(status).toBe(400);
       expect(body).toEqual(factory.responses.badRequest(['id must be a UUID']));
     });
diff --git a/server/src/controllers/api-key.controller.ts b/server/src/controllers/api-key.controller.ts
index 08efd753cf..6347a1274a 100644
--- a/server/src/controllers/api-key.controller.ts
+++ b/server/src/controllers/api-key.controller.ts
@@ -13,25 +13,25 @@ export class APIKeyController {
   constructor(private service: ApiKeyService) {}
 
   @Post()
-  @Authenticated({ permission: Permission.API_KEY_CREATE })
+  @Authenticated({ permission: Permission.ApiKeyCreate })
   createApiKey(@Auth() auth: AuthDto, @Body() dto: APIKeyCreateDto): Promise<APIKeyCreateResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Get()
-  @Authenticated({ permission: Permission.API_KEY_READ })
+  @Authenticated({ permission: Permission.ApiKeyRead })
   getApiKeys(@Auth() auth: AuthDto): Promise<APIKeyResponseDto[]> {
     return this.service.getAll(auth);
   }
 
   @Get(':id')
-  @Authenticated({ permission: Permission.API_KEY_READ })
+  @Authenticated({ permission: Permission.ApiKeyRead })
   getApiKey(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<APIKeyResponseDto> {
     return this.service.getById(auth, id);
   }
 
   @Put(':id')
-  @Authenticated({ permission: Permission.API_KEY_UPDATE })
+  @Authenticated({ permission: Permission.ApiKeyUpdate })
   updateApiKey(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -42,7 +42,7 @@ export class APIKeyController {
 
   @Delete(':id')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated({ permission: Permission.API_KEY_DELETE })
+  @Authenticated({ permission: Permission.ApiKeyDelete })
   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 b2c9397580..ea6c9602c8 100644
--- a/server/src/controllers/asset-media.controller.ts
+++ b/server/src/controllers/asset-media.controller.ts
@@ -45,7 +45,7 @@ import { ImmichFileResponse, sendFile } from 'src/utils/file';
 import { FileNotEmptyValidator, UUIDParamDto } from 'src/validation';
 
 @ApiTags('Assets')
-@Controller(RouteKey.ASSET)
+@Controller(RouteKey.Asset)
 export class AssetMediaController {
   constructor(
     private logger: LoggingRepository,
@@ -56,7 +56,7 @@ export class AssetMediaController {
   @UseInterceptors(AssetUploadInterceptor, FileUploadInterceptor)
   @ApiConsumes('multipart/form-data')
   @ApiHeader({
-    name: ImmichHeader.CHECKSUM,
+    name: ImmichHeader.Checksum,
     description: 'sha1 checksum that can be used for duplicate detection before the file is uploaded',
     required: false,
   })
diff --git a/server/src/controllers/asset.controller.ts b/server/src/controllers/asset.controller.ts
index 925b64c8a8..bb17daddf3 100644
--- a/server/src/controllers/asset.controller.ts
+++ b/server/src/controllers/asset.controller.ts
@@ -19,7 +19,7 @@ import { AssetService } from 'src/services/asset.service';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Assets')
-@Controller(RouteKey.ASSET)
+@Controller(RouteKey.Asset)
 export class AssetController {
   constructor(private service: AssetService) {}
 
diff --git a/server/src/controllers/auth.controller.ts b/server/src/controllers/auth.controller.ts
index 78c611d761..9bc5fd0fbb 100644
--- a/server/src/controllers/auth.controller.ts
+++ b/server/src/controllers/auth.controller.ts
@@ -36,9 +36,9 @@ export class AuthController {
     return respondWithCookie(res, body, {
       isSecure: loginDetails.isSecure,
       values: [
-        { key: ImmichCookie.ACCESS_TOKEN, value: body.accessToken },
-        { key: ImmichCookie.AUTH_TYPE, value: AuthType.PASSWORD },
-        { key: ImmichCookie.IS_AUTHENTICATED, value: 'true' },
+        { key: ImmichCookie.AccessToken, value: body.accessToken },
+        { key: ImmichCookie.AuthType, value: AuthType.Password },
+        { key: ImmichCookie.IsAuthenticated, value: 'true' },
       ],
     });
   }
@@ -70,13 +70,13 @@ export class AuthController {
     @Res({ passthrough: true }) res: Response,
     @Auth() auth: AuthDto,
   ): Promise<LogoutResponseDto> {
-    const authType = (request.cookies || {})[ImmichCookie.AUTH_TYPE];
+    const authType = (request.cookies || {})[ImmichCookie.AuthType];
 
     const body = await this.service.logout(auth, authType);
     return respondWithoutCookie(res, body, [
-      ImmichCookie.ACCESS_TOKEN,
-      ImmichCookie.AUTH_TYPE,
-      ImmichCookie.IS_AUTHENTICATED,
+      ImmichCookie.AccessToken,
+      ImmichCookie.AuthType,
+      ImmichCookie.IsAuthenticated,
     ]);
   }
 
diff --git a/server/src/controllers/face.controller.ts b/server/src/controllers/face.controller.ts
index d94cd532f7..20b6db6039 100644
--- a/server/src/controllers/face.controller.ts
+++ b/server/src/controllers/face.controller.ts
@@ -19,19 +19,19 @@ export class FaceController {
   constructor(private service: PersonService) {}
 
   @Post()
-  @Authenticated({ permission: Permission.FACE_CREATE })
+  @Authenticated({ permission: Permission.FaceCreate })
   createFace(@Auth() auth: AuthDto, @Body() dto: AssetFaceCreateDto) {
     return this.service.createFace(auth, dto);
   }
 
   @Get()
-  @Authenticated({ permission: Permission.FACE_READ })
+  @Authenticated({ permission: Permission.FaceRead })
   getFaces(@Auth() auth: AuthDto, @Query() dto: FaceDto): Promise<AssetFaceResponseDto[]> {
     return this.service.getFacesById(auth, dto);
   }
 
   @Put(':id')
-  @Authenticated({ permission: Permission.FACE_UPDATE })
+  @Authenticated({ permission: Permission.FaceUpdate })
   reassignFacesById(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -41,7 +41,7 @@ export class FaceController {
   }
 
   @Delete(':id')
-  @Authenticated({ permission: Permission.FACE_DELETE })
+  @Authenticated({ permission: Permission.FaceDelete })
   deleteFace(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto, @Body() dto: AssetFaceDeleteDto) {
     return this.service.deleteFace(auth, id, dto);
   }
diff --git a/server/src/controllers/library.controller.ts b/server/src/controllers/library.controller.ts
index b8959ca288..e090586f57 100644
--- a/server/src/controllers/library.controller.ts
+++ b/server/src/controllers/library.controller.ts
@@ -19,32 +19,32 @@ export class LibraryController {
   constructor(private service: LibraryService) {}
 
   @Get()
-  @Authenticated({ permission: Permission.LIBRARY_READ, admin: true })
+  @Authenticated({ permission: Permission.LibraryRead, admin: true })
   getAllLibraries(): Promise<LibraryResponseDto[]> {
     return this.service.getAll();
   }
 
   @Post()
-  @Authenticated({ permission: Permission.LIBRARY_CREATE, admin: true })
+  @Authenticated({ permission: Permission.LibraryCreate, admin: true })
   createLibrary(@Body() dto: CreateLibraryDto): Promise<LibraryResponseDto> {
     return this.service.create(dto);
   }
 
   @Get(':id')
-  @Authenticated({ permission: Permission.LIBRARY_READ, admin: true })
+  @Authenticated({ permission: Permission.LibraryRead, admin: true })
   getLibrary(@Param() { id }: UUIDParamDto): Promise<LibraryResponseDto> {
     return this.service.get(id);
   }
 
   @Put(':id')
-  @Authenticated({ permission: Permission.LIBRARY_UPDATE, admin: true })
+  @Authenticated({ permission: Permission.LibraryUpdate, admin: true })
   updateLibrary(@Param() { id }: UUIDParamDto, @Body() dto: UpdateLibraryDto): Promise<LibraryResponseDto> {
     return this.service.update(id, dto);
   }
 
   @Delete(':id')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated({ permission: Permission.LIBRARY_DELETE, admin: true })
+  @Authenticated({ permission: Permission.LibraryDelete, admin: true })
   deleteLibrary(@Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(id);
   }
@@ -58,14 +58,14 @@ export class LibraryController {
   }
 
   @Get(':id/statistics')
-  @Authenticated({ permission: Permission.LIBRARY_STATISTICS, admin: true })
+  @Authenticated({ permission: Permission.LibraryStatistics, admin: true })
   getLibraryStatistics(@Param() { id }: UUIDParamDto): Promise<LibraryStatsResponseDto> {
     return this.service.getStatistics(id);
   }
 
   @Post(':id/scan')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated({ permission: Permission.LIBRARY_UPDATE, admin: true })
+  @Authenticated({ permission: Permission.LibraryUpdate, admin: true })
   scanLibrary(@Param() { id }: UUIDParamDto) {
     return this.service.queueScan(id);
   }
diff --git a/server/src/controllers/memory.controller.ts b/server/src/controllers/memory.controller.ts
index d33c5ec22c..a5bbbd7411 100644
--- a/server/src/controllers/memory.controller.ts
+++ b/server/src/controllers/memory.controller.ts
@@ -20,31 +20,31 @@ export class MemoryController {
   constructor(private service: MemoryService) {}
 
   @Get()
-  @Authenticated({ permission: Permission.MEMORY_READ })
+  @Authenticated({ permission: Permission.MemoryRead })
   searchMemories(@Auth() auth: AuthDto, @Query() dto: MemorySearchDto): Promise<MemoryResponseDto[]> {
     return this.service.search(auth, dto);
   }
 
   @Post()
-  @Authenticated({ permission: Permission.MEMORY_CREATE })
+  @Authenticated({ permission: Permission.MemoryCreate })
   createMemory(@Auth() auth: AuthDto, @Body() dto: MemoryCreateDto): Promise<MemoryResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Get('statistics')
-  @Authenticated({ permission: Permission.MEMORY_READ })
+  @Authenticated({ permission: Permission.MemoryRead })
   memoriesStatistics(@Auth() auth: AuthDto, @Query() dto: MemorySearchDto): Promise<MemoryStatisticsResponseDto> {
     return this.service.statistics(auth, dto);
   }
 
   @Get(':id')
-  @Authenticated({ permission: Permission.MEMORY_READ })
+  @Authenticated({ permission: Permission.MemoryRead })
   getMemory(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<MemoryResponseDto> {
     return this.service.get(auth, id);
   }
 
   @Put(':id')
-  @Authenticated({ permission: Permission.MEMORY_UPDATE })
+  @Authenticated({ permission: Permission.MemoryUpdate })
   updateMemory(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -55,7 +55,7 @@ export class MemoryController {
 
   @Delete(':id')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated({ permission: Permission.MEMORY_DELETE })
+  @Authenticated({ permission: Permission.MemoryDelete })
   deleteMemory(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.remove(auth, id);
   }
diff --git a/server/src/controllers/notification.controller.ts b/server/src/controllers/notification.controller.ts
index c64f786850..af4eb198b6 100644
--- a/server/src/controllers/notification.controller.ts
+++ b/server/src/controllers/notification.controller.ts
@@ -19,31 +19,31 @@ export class NotificationController {
   constructor(private service: NotificationService) {}
 
   @Get()
-  @Authenticated({ permission: Permission.NOTIFICATION_READ })
+  @Authenticated({ permission: Permission.NotificationRead })
   getNotifications(@Auth() auth: AuthDto, @Query() dto: NotificationSearchDto): Promise<NotificationDto[]> {
     return this.service.search(auth, dto);
   }
 
   @Put()
-  @Authenticated({ permission: Permission.NOTIFICATION_UPDATE })
+  @Authenticated({ permission: Permission.NotificationUpdate })
   updateNotifications(@Auth() auth: AuthDto, @Body() dto: NotificationUpdateAllDto): Promise<void> {
     return this.service.updateAll(auth, dto);
   }
 
   @Delete()
-  @Authenticated({ permission: Permission.NOTIFICATION_DELETE })
+  @Authenticated({ permission: Permission.NotificationDelete })
   deleteNotifications(@Auth() auth: AuthDto, @Body() dto: NotificationDeleteAllDto): Promise<void> {
     return this.service.deleteAll(auth, dto);
   }
 
   @Get(':id')
-  @Authenticated({ permission: Permission.NOTIFICATION_READ })
+  @Authenticated({ permission: Permission.NotificationRead })
   getNotification(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<NotificationDto> {
     return this.service.get(auth, id);
   }
 
   @Put(':id')
-  @Authenticated({ permission: Permission.NOTIFICATION_UPDATE })
+  @Authenticated({ permission: Permission.NotificationUpdate })
   updateNotification(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -53,7 +53,7 @@ export class NotificationController {
   }
 
   @Delete(':id')
-  @Authenticated({ permission: Permission.NOTIFICATION_DELETE })
+  @Authenticated({ permission: Permission.NotificationDelete })
   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 23ddff5ddc..7da75f573a 100644
--- a/server/src/controllers/oauth.controller.ts
+++ b/server/src/controllers/oauth.controller.ts
@@ -41,8 +41,8 @@ export class OAuthController {
       {
         isSecure: loginDetails.isSecure,
         values: [
-          { key: ImmichCookie.OAUTH_STATE, value: state },
-          { key: ImmichCookie.OAUTH_CODE_VERIFIER, value: codeVerifier },
+          { key: ImmichCookie.OAuthState, value: state },
+          { key: ImmichCookie.OAuthCodeVerifier, value: codeVerifier },
         ],
       },
     );
@@ -56,14 +56,14 @@ export class OAuthController {
     @GetLoginDetails() loginDetails: LoginDetails,
   ): Promise<LoginResponseDto> {
     const body = await this.service.callback(dto, request.headers, loginDetails);
-    res.clearCookie(ImmichCookie.OAUTH_STATE);
-    res.clearCookie(ImmichCookie.OAUTH_CODE_VERIFIER);
+    res.clearCookie(ImmichCookie.OAuthState);
+    res.clearCookie(ImmichCookie.OAuthCodeVerifier);
     return respondWithCookie(res, body, {
       isSecure: loginDetails.isSecure,
       values: [
-        { key: ImmichCookie.ACCESS_TOKEN, value: body.accessToken },
-        { key: ImmichCookie.AUTH_TYPE, value: AuthType.OAUTH },
-        { key: ImmichCookie.IS_AUTHENTICATED, value: 'true' },
+        { key: ImmichCookie.AccessToken, value: body.accessToken },
+        { key: ImmichCookie.AuthType, value: AuthType.OAuth },
+        { key: ImmichCookie.IsAuthenticated, value: 'true' },
       ],
     });
   }
diff --git a/server/src/controllers/partner.controller.ts b/server/src/controllers/partner.controller.ts
index 6830fdd52f..6b6efaa570 100644
--- a/server/src/controllers/partner.controller.ts
+++ b/server/src/controllers/partner.controller.ts
@@ -13,19 +13,19 @@ export class PartnerController {
   constructor(private service: PartnerService) {}
 
   @Get()
-  @Authenticated({ permission: Permission.PARTNER_READ })
+  @Authenticated({ permission: Permission.PartnerRead })
   getPartners(@Auth() auth: AuthDto, @Query() dto: PartnerSearchDto): Promise<PartnerResponseDto[]> {
     return this.service.search(auth, dto);
   }
 
   @Post(':id')
-  @Authenticated({ permission: Permission.PARTNER_CREATE })
+  @Authenticated({ permission: Permission.PartnerCreate })
   createPartner(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<PartnerResponseDto> {
     return this.service.create(auth, id);
   }
 
   @Put(':id')
-  @Authenticated({ permission: Permission.PARTNER_UPDATE })
+  @Authenticated({ permission: Permission.PartnerUpdate })
   updatePartner(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -35,7 +35,7 @@ export class PartnerController {
   }
 
   @Delete(':id')
-  @Authenticated({ permission: Permission.PARTNER_DELETE })
+  @Authenticated({ permission: Permission.PartnerDelete })
   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 a9f6616426..ec66f7a9ca 100644
--- a/server/src/controllers/person.controller.ts
+++ b/server/src/controllers/person.controller.ts
@@ -45,38 +45,38 @@ export class PersonController {
   }
 
   @Get()
-  @Authenticated({ permission: Permission.PERSON_READ })
+  @Authenticated({ permission: Permission.PersonRead })
   getAllPeople(@Auth() auth: AuthDto, @Query() options: PersonSearchDto): Promise<PeopleResponseDto> {
     return this.service.getAll(auth, options);
   }
 
   @Post()
-  @Authenticated({ permission: Permission.PERSON_CREATE })
+  @Authenticated({ permission: Permission.PersonCreate })
   createPerson(@Auth() auth: AuthDto, @Body() dto: PersonCreateDto): Promise<PersonResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Put()
-  @Authenticated({ permission: Permission.PERSON_UPDATE })
+  @Authenticated({ permission: Permission.PersonUpdate })
   updatePeople(@Auth() auth: AuthDto, @Body() dto: PeopleUpdateDto): Promise<BulkIdResponseDto[]> {
     return this.service.updateAll(auth, dto);
   }
 
   @Delete()
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated({ permission: Permission.PERSON_DELETE })
+  @Authenticated({ permission: Permission.PersonDelete })
   deletePeople(@Auth() auth: AuthDto, @Body() dto: BulkIdsDto): Promise<void> {
     return this.service.deleteAll(auth, dto);
   }
 
   @Get(':id')
-  @Authenticated({ permission: Permission.PERSON_READ })
+  @Authenticated({ permission: Permission.PersonRead })
   getPerson(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<PersonResponseDto> {
     return this.service.getById(auth, id);
   }
 
   @Put(':id')
-  @Authenticated({ permission: Permission.PERSON_UPDATE })
+  @Authenticated({ permission: Permission.PersonUpdate })
   updatePerson(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -87,20 +87,20 @@ export class PersonController {
 
   @Delete(':id')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated({ permission: Permission.PERSON_DELETE })
+  @Authenticated({ permission: Permission.PersonDelete })
   deletePerson(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
 
   @Get(':id/statistics')
-  @Authenticated({ permission: Permission.PERSON_STATISTICS })
+  @Authenticated({ permission: Permission.PersonStatistics })
   getPersonStatistics(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<PersonStatisticsResponseDto> {
     return this.service.getStatistics(auth, id);
   }
 
   @Get(':id/thumbnail')
   @FileResponse()
-  @Authenticated({ permission: Permission.PERSON_READ })
+  @Authenticated({ permission: Permission.PersonRead })
   async getPersonThumbnail(
     @Res() res: Response,
     @Next() next: NextFunction,
@@ -111,7 +111,7 @@ export class PersonController {
   }
 
   @Put(':id/reassign')
-  @Authenticated({ permission: Permission.PERSON_REASSIGN })
+  @Authenticated({ permission: Permission.PersonReassign })
   reassignFaces(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -121,7 +121,7 @@ export class PersonController {
   }
 
   @Post(':id/merge')
-  @Authenticated({ permission: Permission.PERSON_MERGE })
+  @Authenticated({ permission: Permission.PersonMerge })
   mergePerson(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
diff --git a/server/src/controllers/session.controller.ts b/server/src/controllers/session.controller.ts
index f5eb10b3dd..cbe8158fee 100644
--- a/server/src/controllers/session.controller.ts
+++ b/server/src/controllers/session.controller.ts
@@ -13,26 +13,26 @@ export class SessionController {
   constructor(private service: SessionService) {}
 
   @Post()
-  @Authenticated({ permission: Permission.SESSION_CREATE })
+  @Authenticated({ permission: Permission.SessionCreate })
   createSession(@Auth() auth: AuthDto, @Body() dto: SessionCreateDto): Promise<SessionCreateResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Get()
-  @Authenticated({ permission: Permission.SESSION_READ })
+  @Authenticated({ permission: Permission.SessionRead })
   getSessions(@Auth() auth: AuthDto): Promise<SessionResponseDto[]> {
     return this.service.getAll(auth);
   }
 
   @Delete()
-  @Authenticated({ permission: Permission.SESSION_DELETE })
+  @Authenticated({ permission: Permission.SessionDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
   deleteAllSessions(@Auth() auth: AuthDto): Promise<void> {
     return this.service.deleteAll(auth);
   }
 
   @Put(':id')
-  @Authenticated({ permission: Permission.SESSION_UPDATE })
+  @Authenticated({ permission: Permission.SessionUpdate })
   updateSession(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -42,14 +42,14 @@ export class SessionController {
   }
 
   @Delete(':id')
-  @Authenticated({ permission: Permission.SESSION_DELETE })
+  @Authenticated({ permission: Permission.SessionDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
   deleteSession(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
 
   @Post(':id/lock')
-  @Authenticated({ permission: Permission.SESSION_LOCK })
+  @Authenticated({ permission: Permission.SessionLock })
   @HttpCode(HttpStatus.NO_CONTENT)
   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 ca978f03da..273d625ca7 100644
--- a/server/src/controllers/shared-link.controller.ts
+++ b/server/src/controllers/shared-link.controller.ts
@@ -24,7 +24,7 @@ export class SharedLinkController {
   constructor(private service: SharedLinkService) {}
 
   @Get()
-  @Authenticated({ permission: Permission.SHARED_LINK_READ })
+  @Authenticated({ permission: Permission.SharedLinkRead })
   getAllSharedLinks(@Auth() auth: AuthDto, @Query() dto: SharedLinkSearchDto): Promise<SharedLinkResponseDto[]> {
     return this.service.getAll(auth, dto);
   }
@@ -38,31 +38,31 @@ export class SharedLinkController {
     @Res({ passthrough: true }) res: Response,
     @GetLoginDetails() loginDetails: LoginDetails,
   ): Promise<SharedLinkResponseDto> {
-    const sharedLinkToken = request.cookies?.[ImmichCookie.SHARED_LINK_TOKEN];
+    const sharedLinkToken = request.cookies?.[ImmichCookie.SharedLinkToken];
     if (sharedLinkToken) {
       dto.token = sharedLinkToken;
     }
     const body = await this.service.getMine(auth, dto);
     return respondWithCookie(res, body, {
       isSecure: loginDetails.isSecure,
-      values: body.token ? [{ key: ImmichCookie.SHARED_LINK_TOKEN, value: body.token }] : [],
+      values: body.token ? [{ key: ImmichCookie.SharedLinkToken, value: body.token }] : [],
     });
   }
 
   @Get(':id')
-  @Authenticated({ permission: Permission.SHARED_LINK_READ })
+  @Authenticated({ permission: Permission.SharedLinkRead })
   getSharedLinkById(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<SharedLinkResponseDto> {
     return this.service.get(auth, id);
   }
 
   @Post()
-  @Authenticated({ permission: Permission.SHARED_LINK_CREATE })
+  @Authenticated({ permission: Permission.SharedLinkCreate })
   createSharedLink(@Auth() auth: AuthDto, @Body() dto: SharedLinkCreateDto) {
     return this.service.create(auth, dto);
   }
 
   @Patch(':id')
-  @Authenticated({ permission: Permission.SHARED_LINK_UPDATE })
+  @Authenticated({ permission: Permission.SharedLinkUpdate })
   updateSharedLink(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -72,7 +72,7 @@ export class SharedLinkController {
   }
 
   @Delete(':id')
-  @Authenticated({ permission: Permission.SHARED_LINK_DELETE })
+  @Authenticated({ permission: Permission.SharedLinkDelete })
   removeSharedLink(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.remove(auth, id);
   }
diff --git a/server/src/controllers/stack.controller.ts b/server/src/controllers/stack.controller.ts
index 188952eba5..238753734c 100644
--- a/server/src/controllers/stack.controller.ts
+++ b/server/src/controllers/stack.controller.ts
@@ -14,32 +14,32 @@ export class StackController {
   constructor(private service: StackService) {}
 
   @Get()
-  @Authenticated({ permission: Permission.STACK_READ })
+  @Authenticated({ permission: Permission.StackRead })
   searchStacks(@Auth() auth: AuthDto, @Query() query: StackSearchDto): Promise<StackResponseDto[]> {
     return this.service.search(auth, query);
   }
 
   @Post()
-  @Authenticated({ permission: Permission.STACK_CREATE })
+  @Authenticated({ permission: Permission.StackCreate })
   createStack(@Auth() auth: AuthDto, @Body() dto: StackCreateDto): Promise<StackResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Delete()
-  @Authenticated({ permission: Permission.STACK_DELETE })
+  @Authenticated({ permission: Permission.StackDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
   deleteStacks(@Auth() auth: AuthDto, @Body() dto: BulkIdsDto): Promise<void> {
     return this.service.deleteAll(auth, dto);
   }
 
   @Get(':id')
-  @Authenticated({ permission: Permission.STACK_READ })
+  @Authenticated({ permission: Permission.StackRead })
   getStack(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<StackResponseDto> {
     return this.service.get(auth, id);
   }
 
   @Put(':id')
-  @Authenticated({ permission: Permission.STACK_UPDATE })
+  @Authenticated({ permission: Permission.StackUpdate })
   updateStack(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -50,7 +50,7 @@ export class StackController {
 
   @Delete(':id')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated({ permission: Permission.STACK_DELETE })
+  @Authenticated({ permission: Permission.StackDelete })
   deleteStack(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
diff --git a/server/src/controllers/system-config.controller.ts b/server/src/controllers/system-config.controller.ts
index 58e8bde87b..69117f4d45 100644
--- a/server/src/controllers/system-config.controller.ts
+++ b/server/src/controllers/system-config.controller.ts
@@ -15,25 +15,25 @@ export class SystemConfigController {
   ) {}
 
   @Get()
-  @Authenticated({ permission: Permission.SYSTEM_CONFIG_READ, admin: true })
+  @Authenticated({ permission: Permission.SystemConfigRead, admin: true })
   getConfig(): Promise<SystemConfigDto> {
     return this.service.getSystemConfig();
   }
 
   @Get('defaults')
-  @Authenticated({ permission: Permission.SYSTEM_CONFIG_READ, admin: true })
+  @Authenticated({ permission: Permission.SystemConfigRead, admin: true })
   getConfigDefaults(): SystemConfigDto {
     return this.service.getDefaults();
   }
 
   @Put()
-  @Authenticated({ permission: Permission.SYSTEM_CONFIG_UPDATE, admin: true })
+  @Authenticated({ permission: Permission.SystemConfigUpdate, admin: true })
   updateConfig(@Body() dto: SystemConfigDto): Promise<SystemConfigDto> {
     return this.service.updateSystemConfig(dto);
   }
 
   @Get('storage-template-options')
-  @Authenticated({ permission: Permission.SYSTEM_CONFIG_READ, admin: true })
+  @Authenticated({ permission: Permission.SystemConfigRead, admin: true })
   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 71c37d02c4..ad2245a391 100644
--- a/server/src/controllers/system-metadata.controller.ts
+++ b/server/src/controllers/system-metadata.controller.ts
@@ -15,26 +15,26 @@ export class SystemMetadataController {
   constructor(private service: SystemMetadataService) {}
 
   @Get('admin-onboarding')
-  @Authenticated({ permission: Permission.SYSTEM_METADATA_READ, admin: true })
+  @Authenticated({ permission: Permission.SystemMetadataRead, admin: true })
   getAdminOnboarding(): Promise<AdminOnboardingUpdateDto> {
     return this.service.getAdminOnboarding();
   }
 
   @Post('admin-onboarding')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated({ permission: Permission.SYSTEM_METADATA_UPDATE, admin: true })
+  @Authenticated({ permission: Permission.SystemMetadataUpdate, admin: true })
   updateAdminOnboarding(@Body() dto: AdminOnboardingUpdateDto): Promise<void> {
     return this.service.updateAdminOnboarding(dto);
   }
 
   @Get('reverse-geocoding-state')
-  @Authenticated({ permission: Permission.SYSTEM_METADATA_READ, admin: true })
+  @Authenticated({ permission: Permission.SystemMetadataRead, admin: true })
   getReverseGeocodingState(): Promise<ReverseGeocodingStateResponseDto> {
     return this.service.getReverseGeocodingState();
   }
 
   @Get('version-check-state')
-  @Authenticated({ permission: Permission.SYSTEM_METADATA_READ, admin: true })
+  @Authenticated({ permission: Permission.SystemMetadataRead, admin: true })
   getVersionCheckState(): Promise<VersionCheckStateResponseDto> {
     return this.service.getVersionCheckState();
   }
diff --git a/server/src/controllers/tag.controller.ts b/server/src/controllers/tag.controller.ts
index cf6b8ac695..4906bc0c6e 100644
--- a/server/src/controllers/tag.controller.ts
+++ b/server/src/controllers/tag.controller.ts
@@ -21,50 +21,50 @@ export class TagController {
   constructor(private service: TagService) {}
 
   @Post()
-  @Authenticated({ permission: Permission.TAG_CREATE })
+  @Authenticated({ permission: Permission.TagCreate })
   createTag(@Auth() auth: AuthDto, @Body() dto: TagCreateDto): Promise<TagResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Get()
-  @Authenticated({ permission: Permission.TAG_READ })
+  @Authenticated({ permission: Permission.TagRead })
   getAllTags(@Auth() auth: AuthDto): Promise<TagResponseDto[]> {
     return this.service.getAll(auth);
   }
 
   @Put()
-  @Authenticated({ permission: Permission.TAG_CREATE })
+  @Authenticated({ permission: Permission.TagCreate })
   upsertTags(@Auth() auth: AuthDto, @Body() dto: TagUpsertDto): Promise<TagResponseDto[]> {
     return this.service.upsert(auth, dto);
   }
 
   @Put('assets')
-  @Authenticated({ permission: Permission.TAG_ASSET })
+  @Authenticated({ permission: Permission.TagAsset })
   bulkTagAssets(@Auth() auth: AuthDto, @Body() dto: TagBulkAssetsDto): Promise<TagBulkAssetsResponseDto> {
     return this.service.bulkTagAssets(auth, dto);
   }
 
   @Get(':id')
-  @Authenticated({ permission: Permission.TAG_READ })
+  @Authenticated({ permission: Permission.TagRead })
   getTagById(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<TagResponseDto> {
     return this.service.get(auth, id);
   }
 
   @Put(':id')
-  @Authenticated({ permission: Permission.TAG_UPDATE })
+  @Authenticated({ permission: Permission.TagUpdate })
   updateTag(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto, @Body() dto: TagUpdateDto): Promise<TagResponseDto> {
     return this.service.update(auth, id, dto);
   }
 
   @Delete(':id')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated({ permission: Permission.TAG_DELETE })
+  @Authenticated({ permission: Permission.TagDelete })
   deleteTag(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.remove(auth, id);
   }
 
   @Put(':id/assets')
-  @Authenticated({ permission: Permission.TAG_ASSET })
+  @Authenticated({ permission: Permission.TagAsset })
   tagAssets(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -74,7 +74,7 @@ export class TagController {
   }
 
   @Delete(':id/assets')
-  @Authenticated({ permission: Permission.TAG_ASSET })
+  @Authenticated({ permission: Permission.TagAsset })
   untagAssets(
     @Auth() auth: AuthDto,
     @Body() dto: BulkIdsDto,
diff --git a/server/src/controllers/timeline.controller.ts b/server/src/controllers/timeline.controller.ts
index b4ee042625..8cab840ec8 100644
--- a/server/src/controllers/timeline.controller.ts
+++ b/server/src/controllers/timeline.controller.ts
@@ -12,13 +12,13 @@ export class TimelineController {
   constructor(private service: TimelineService) {}
 
   @Get('buckets')
-  @Authenticated({ permission: Permission.ASSET_READ, sharedLink: true })
+  @Authenticated({ permission: Permission.AssetRead, sharedLink: true })
   getTimeBuckets(@Auth() auth: AuthDto, @Query() dto: TimeBucketDto) {
     return this.service.getTimeBuckets(auth, dto);
   }
 
   @Get('bucket')
-  @Authenticated({ permission: Permission.ASSET_READ, sharedLink: true })
+  @Authenticated({ permission: Permission.AssetRead, sharedLink: true })
   @ApiOkResponse({ type: TimeBucketAssetResponseDto })
   @Header('Content-Type', 'application/json')
   getTimeBucket(@Auth() auth: AuthDto, @Query() dto: TimeBucketAssetDto) {
diff --git a/server/src/controllers/trash.controller.ts b/server/src/controllers/trash.controller.ts
index dfcdfa6ba2..1bb46e4f98 100644
--- a/server/src/controllers/trash.controller.ts
+++ b/server/src/controllers/trash.controller.ts
@@ -14,21 +14,21 @@ export class TrashController {
 
   @Post('empty')
   @HttpCode(HttpStatus.OK)
-  @Authenticated({ permission: Permission.ASSET_DELETE })
+  @Authenticated({ permission: Permission.AssetDelete })
   emptyTrash(@Auth() auth: AuthDto): Promise<TrashResponseDto> {
     return this.service.empty(auth);
   }
 
   @Post('restore')
   @HttpCode(HttpStatus.OK)
-  @Authenticated({ permission: Permission.ASSET_DELETE })
+  @Authenticated({ permission: Permission.AssetDelete })
   restoreTrash(@Auth() auth: AuthDto): Promise<TrashResponseDto> {
     return this.service.restore(auth);
   }
 
   @Post('restore/assets')
   @HttpCode(HttpStatus.OK)
-  @Authenticated({ permission: Permission.ASSET_DELETE })
+  @Authenticated({ permission: Permission.AssetDelete })
   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 83d7caef08..d50bd174ad 100644
--- a/server/src/controllers/user-admin.controller.ts
+++ b/server/src/controllers/user-admin.controller.ts
@@ -21,25 +21,25 @@ export class UserAdminController {
   constructor(private service: UserAdminService) {}
 
   @Get()
-  @Authenticated({ permission: Permission.ADMIN_USER_READ, admin: true })
+  @Authenticated({ permission: Permission.AdminUserRead, admin: true })
   searchUsersAdmin(@Auth() auth: AuthDto, @Query() dto: UserAdminSearchDto): Promise<UserAdminResponseDto[]> {
     return this.service.search(auth, dto);
   }
 
   @Post()
-  @Authenticated({ permission: Permission.ADMIN_USER_CREATE, admin: true })
+  @Authenticated({ permission: Permission.AdminUserCreate, admin: true })
   createUserAdmin(@Body() createUserDto: UserAdminCreateDto): Promise<UserAdminResponseDto> {
     return this.service.create(createUserDto);
   }
 
   @Get(':id')
-  @Authenticated({ permission: Permission.ADMIN_USER_READ, admin: true })
+  @Authenticated({ permission: Permission.AdminUserRead, admin: true })
   getUserAdmin(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<UserAdminResponseDto> {
     return this.service.get(auth, id);
   }
 
   @Put(':id')
-  @Authenticated({ permission: Permission.ADMIN_USER_UPDATE, admin: true })
+  @Authenticated({ permission: Permission.AdminUserUpdate, admin: true })
   updateUserAdmin(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -49,7 +49,7 @@ export class UserAdminController {
   }
 
   @Delete(':id')
-  @Authenticated({ permission: Permission.ADMIN_USER_DELETE, admin: true })
+  @Authenticated({ permission: Permission.AdminUserDelete, admin: true })
   deleteUserAdmin(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -59,7 +59,7 @@ export class UserAdminController {
   }
 
   @Get(':id/statistics')
-  @Authenticated({ permission: Permission.ADMIN_USER_READ, admin: true })
+  @Authenticated({ permission: Permission.AdminUserRead, admin: true })
   getUserStatisticsAdmin(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -69,13 +69,13 @@ export class UserAdminController {
   }
 
   @Get(':id/preferences')
-  @Authenticated({ permission: Permission.ADMIN_USER_READ, admin: true })
+  @Authenticated({ permission: Permission.AdminUserRead, admin: true })
   getUserPreferencesAdmin(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<UserPreferencesResponseDto> {
     return this.service.getPreferences(auth, id);
   }
 
   @Put(':id/preferences')
-  @Authenticated({ permission: Permission.ADMIN_USER_UPDATE, admin: true })
+  @Authenticated({ permission: Permission.AdminUserUpdate, admin: true })
   updateUserPreferencesAdmin(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -85,7 +85,7 @@ export class UserAdminController {
   }
 
   @Post(':id/restore')
-  @Authenticated({ permission: Permission.ADMIN_USER_DELETE, admin: true })
+  @Authenticated({ permission: Permission.AdminUserDelete, admin: true })
   @HttpCode(HttpStatus.OK)
   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 6c6eae15ff..76d2cf4c5a 100644
--- a/server/src/controllers/user.controller.ts
+++ b/server/src/controllers/user.controller.ts
@@ -30,7 +30,7 @@ import { sendFile } from 'src/utils/file';
 import { UUIDParamDto } from 'src/validation';
 
 @ApiTags('Users')
-@Controller(RouteKey.USER)
+@Controller(RouteKey.User)
 export class UserController {
   constructor(
     private service: UserService,
diff --git a/server/src/cores/storage.core.ts b/server/src/cores/storage.core.ts
index 1a8e31e86b..6576b397e3 100644
--- a/server/src/cores/storage.core.ts
+++ b/server/src/cores/storage.core.ts
@@ -25,8 +25,8 @@ export interface MoveRequest {
   };
 }
 
-export type GeneratedImageType = AssetPathType.PREVIEW | AssetPathType.THUMBNAIL | AssetPathType.FULLSIZE;
-export type GeneratedAssetType = GeneratedImageType | AssetPathType.ENCODED_VIDEO;
+export type GeneratedImageType = AssetPathType.Preview | AssetPathType.Thumbnail | AssetPathType.FullSize;
+export type GeneratedAssetType = GeneratedImageType | AssetPathType.EncodedVideo;
 
 export type ThumbnailPathEntity = { id: string; ownerId: string };
 
@@ -79,7 +79,7 @@ export class StorageCore {
   }
 
   static getLibraryFolder(user: { storageLabel: string | null; id: string }) {
-    return join(StorageCore.getBaseFolder(StorageFolder.LIBRARY), user.storageLabel || user.id);
+    return join(StorageCore.getBaseFolder(StorageFolder.Library), user.storageLabel || user.id);
   }
 
   static getBaseFolder(folder: StorageFolder) {
@@ -87,23 +87,23 @@ export class StorageCore {
   }
 
   static getPersonThumbnailPath(person: ThumbnailPathEntity) {
-    return StorageCore.getNestedPath(StorageFolder.THUMBNAILS, person.ownerId, `${person.id}.jpeg`);
+    return StorageCore.getNestedPath(StorageFolder.Thumbnails, person.ownerId, `${person.id}.jpeg`);
   }
 
   static getImagePath(asset: ThumbnailPathEntity, type: GeneratedImageType, format: 'jpeg' | 'webp') {
-    return StorageCore.getNestedPath(StorageFolder.THUMBNAILS, asset.ownerId, `${asset.id}-${type}.${format}`);
+    return StorageCore.getNestedPath(StorageFolder.Thumbnails, asset.ownerId, `${asset.id}-${type}.${format}`);
   }
 
   static getEncodedVideoPath(asset: ThumbnailPathEntity) {
-    return StorageCore.getNestedPath(StorageFolder.ENCODED_VIDEO, asset.ownerId, `${asset.id}.mp4`);
+    return StorageCore.getNestedPath(StorageFolder.EncodedVideo, asset.ownerId, `${asset.id}.mp4`);
   }
 
   static getAndroidMotionPath(asset: ThumbnailPathEntity, uuid: string) {
-    return StorageCore.getNestedPath(StorageFolder.ENCODED_VIDEO, asset.ownerId, `${uuid}-MP.mp4`);
+    return StorageCore.getNestedPath(StorageFolder.EncodedVideo, asset.ownerId, `${uuid}-MP.mp4`);
   }
 
   static isAndroidMotionPath(originalPath: string) {
-    return originalPath.startsWith(StorageCore.getBaseFolder(StorageFolder.ENCODED_VIDEO));
+    return originalPath.startsWith(StorageCore.getBaseFolder(StorageFolder.EncodedVideo));
   }
 
   static isImmichPath(path: string) {
@@ -130,7 +130,7 @@ export class StorageCore {
   async moveAssetVideo(asset: StorageAsset) {
     return this.moveFile({
       entityId: asset.id,
-      pathType: AssetPathType.ENCODED_VIDEO,
+      pathType: AssetPathType.EncodedVideo,
       oldPath: asset.encodedVideoPath,
       newPath: StorageCore.getEncodedVideoPath(asset),
     });
@@ -139,7 +139,7 @@ export class StorageCore {
   async movePersonFile(person: { id: string; ownerId: string; thumbnailPath: string }, pathType: PersonPathType) {
     const { id: entityId, thumbnailPath } = person;
     switch (pathType) {
-      case PersonPathType.FACE: {
+      case PersonPathType.Face: {
         await this.moveFile({
           entityId,
           pathType,
@@ -188,7 +188,7 @@ export class StorageCore {
       move = await this.moveRepository.create({ entityId, pathType, oldPath, newPath });
     }
 
-    if (pathType === AssetPathType.ORIGINAL && !assetInfo) {
+    if (pathType === AssetPathType.Original && !assetInfo) {
       this.logger.warn(`Unable to complete move. Missing asset info for ${entityId}`);
       return;
     }
@@ -274,25 +274,25 @@ export class StorageCore {
 
   private savePath(pathType: PathType, id: string, newPath: string) {
     switch (pathType) {
-      case AssetPathType.ORIGINAL: {
+      case AssetPathType.Original: {
         return this.assetRepository.update({ id, originalPath: newPath });
       }
-      case AssetPathType.FULLSIZE: {
-        return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.FULLSIZE, path: newPath });
+      case AssetPathType.FullSize: {
+        return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.FullSize, path: newPath });
       }
-      case AssetPathType.PREVIEW: {
-        return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.PREVIEW, path: newPath });
+      case AssetPathType.Preview: {
+        return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.Preview, path: newPath });
       }
-      case AssetPathType.THUMBNAIL: {
-        return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.THUMBNAIL, path: newPath });
+      case AssetPathType.Thumbnail: {
+        return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.Thumbnail, path: newPath });
       }
-      case AssetPathType.ENCODED_VIDEO: {
+      case AssetPathType.EncodedVideo: {
         return this.assetRepository.update({ id, encodedVideoPath: newPath });
       }
-      case AssetPathType.SIDECAR: {
+      case AssetPathType.Sidecar: {
         return this.assetRepository.update({ id, sidecarPath: newPath });
       }
-      case PersonPathType.FACE: {
+      case PersonPathType.Face: {
         return this.personRepository.update({ id, thumbnailPath: newPath });
       }
     }
diff --git a/server/src/decorators.ts b/server/src/decorators.ts
index 766e7c70b9..b88f2d2d7e 100644
--- a/server/src/decorators.ts
+++ b/server/src/decorators.ts
@@ -131,7 +131,7 @@ export interface GenerateSqlQueries {
 }
 
 export const Telemetry = (options: { enabled?: boolean }) =>
-  SetMetadata(MetadataKey.TELEMETRY_ENABLED, options?.enabled ?? true);
+  SetMetadata(MetadataKey.TelemetryEnabled, options?.enabled ?? true);
 
 /** Decorator to enable versioning/tracking of generated Sql */
 export const GenerateSql = (...options: GenerateSqlQueries[]) => SetMetadata(GENERATE_SQL_KEY, options);
@@ -145,13 +145,13 @@ export type EventConfig = {
   /** register events for these workers, defaults to all workers */
   workers?: ImmichWorker[];
 };
-export const OnEvent = (config: EventConfig) => SetMetadata(MetadataKey.EVENT_CONFIG, config);
+export const OnEvent = (config: EventConfig) => SetMetadata(MetadataKey.EventConfig, config);
 
 export type JobConfig = {
   name: JobName;
   queue: QueueName;
 };
-export const OnJob = (config: JobConfig) => SetMetadata(MetadataKey.JOB_CONFIG, config);
+export const OnJob = (config: JobConfig) => SetMetadata(MetadataKey.JobConfig, config);
 
 type LifecycleRelease = 'NEXT_RELEASE' | string;
 type LifecycleMetadata = {
diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts
index c6cde0894f..3a88ba5be3 100644
--- a/server/src/dtos/album.dto.ts
+++ b/server/src/dtos/album.dto.ts
@@ -18,7 +18,7 @@ export class AlbumUserAddDto {
   @ValidateUUID()
   userId!: string;
 
-  @ValidateEnum({ enum: AlbumUserRole, name: 'AlbumUserRole', default: AlbumUserRole.EDITOR })
+  @ValidateEnum({ enum: AlbumUserRole, name: 'AlbumUserRole', default: AlbumUserRole.Editor })
   role?: AlbumUserRole;
 }
 
diff --git a/server/src/dtos/asset-response.dto.ts b/server/src/dtos/asset-response.dto.ts
index 5b587e59ba..98ed8669f0 100644
--- a/server/src/dtos/asset-response.dto.ts
+++ b/server/src/dtos/asset-response.dto.ts
@@ -205,7 +205,7 @@ export function mapAsset(entity: MapAsset, options: AssetMapOptions = {}): Asset
     localDateTime: entity.localDateTime,
     updatedAt: entity.updatedAt,
     isFavorite: options.auth?.user.id === entity.ownerId ? entity.isFavorite : false,
-    isArchived: entity.visibility === AssetVisibility.ARCHIVE,
+    isArchived: entity.visibility === AssetVisibility.Archive,
     isTrashed: !!entity.deletedAt,
     visibility: entity.visibility,
     duration: entity.duration ?? '0:00:00.00000',
diff --git a/server/src/dtos/asset.dto.ts b/server/src/dtos/asset.dto.ts
index 727ab1625d..5728d21646 100644
--- a/server/src/dtos/asset.dto.ts
+++ b/server/src/dtos/asset.dto.ts
@@ -126,8 +126,8 @@ export class AssetStatsResponseDto {
 
 export const mapStats = (stats: AssetStats): AssetStatsResponseDto => {
   return {
-    images: stats[AssetType.IMAGE],
-    videos: stats[AssetType.VIDEO],
+    images: stats[AssetType.Image],
+    videos: stats[AssetType.Video],
     total: Object.values(stats).reduce((total, value) => total + value, 0),
   };
 };
diff --git a/server/src/dtos/auth.dto.ts b/server/src/dtos/auth.dto.ts
index e94818b2b5..2bb98b34a5 100644
--- a/server/src/dtos/auth.dto.ts
+++ b/server/src/dtos/auth.dto.ts
@@ -45,7 +45,7 @@ export class LoginResponseDto {
 
 export function mapLoginResponse(entity: UserAdmin, accessToken: string): LoginResponseDto {
   const onboardingMetadata = entity.metadata.find(
-    (item): item is UserMetadataItem<UserMetadataKey.ONBOARDING> => item.key === UserMetadataKey.ONBOARDING,
+    (item): item is UserMetadataItem<UserMetadataKey.Onboarding> => item.key === UserMetadataKey.Onboarding,
   )?.value;
 
   return {
diff --git a/server/src/dtos/job.dto.ts b/server/src/dtos/job.dto.ts
index 60124c877a..2123b65878 100644
--- a/server/src/dtos/job.dto.ts
+++ b/server/src/dtos/job.dto.ts
@@ -50,47 +50,47 @@ export class JobStatusDto {
 
 export class AllJobStatusResponseDto implements Record<QueueName, JobStatusDto> {
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.THUMBNAIL_GENERATION]!: JobStatusDto;
+  [QueueName.ThumbnailGeneration]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.METADATA_EXTRACTION]!: JobStatusDto;
+  [QueueName.MetadataExtraction]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.VIDEO_CONVERSION]!: JobStatusDto;
+  [QueueName.VideoConversion]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.SMART_SEARCH]!: JobStatusDto;
+  [QueueName.SmartSearch]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.STORAGE_TEMPLATE_MIGRATION]!: JobStatusDto;
+  [QueueName.StorageTemplateMigration]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.MIGRATION]!: JobStatusDto;
+  [QueueName.Migration]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.BACKGROUND_TASK]!: JobStatusDto;
+  [QueueName.BackgroundTask]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.SEARCH]!: JobStatusDto;
+  [QueueName.Search]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.DUPLICATE_DETECTION]!: JobStatusDto;
+  [QueueName.DuplicateDetection]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.FACE_DETECTION]!: JobStatusDto;
+  [QueueName.FaceDetection]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.FACIAL_RECOGNITION]!: JobStatusDto;
+  [QueueName.FacialRecognition]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.SIDECAR]!: JobStatusDto;
+  [QueueName.Sidecar]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.LIBRARY]!: JobStatusDto;
+  [QueueName.Library]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.NOTIFICATION]!: JobStatusDto;
+  [QueueName.Notification]!: JobStatusDto;
 
   @ApiProperty({ type: JobStatusDto })
-  [QueueName.BACKUP_DATABASE]!: JobStatusDto;
+  [QueueName.BackupDatabase]!: JobStatusDto;
 }
diff --git a/server/src/dtos/memory.dto.ts b/server/src/dtos/memory.dto.ts
index e92e11bdfb..a79511c73e 100644
--- a/server/src/dtos/memory.dto.ts
+++ b/server/src/dtos/memory.dto.ts
@@ -50,7 +50,7 @@ export class MemoryCreateDto extends MemoryBaseDto {
   @ValidateNested()
   @Type((options) => {
     switch (options?.object.type) {
-      case MemoryType.ON_THIS_DAY: {
+      case MemoryType.OnThisDay: {
         return OnThisDayDto;
       }
 
diff --git a/server/src/dtos/search.dto.ts b/server/src/dtos/search.dto.ts
index 85c6fbf0de..aef78e51ea 100644
--- a/server/src/dtos/search.dto.ts
+++ b/server/src/dtos/search.dto.ts
@@ -170,7 +170,7 @@ export class MetadataSearchDto extends RandomSearchDto {
   @Optional()
   encodedVideoPath?: string;
 
-  @ValidateEnum({ enum: AssetOrder, name: 'AssetOrder', optional: true, default: AssetOrder.DESC })
+  @ValidateEnum({ enum: AssetOrder, name: 'AssetOrder', optional: true, default: AssetOrder.Desc })
   order?: AssetOrder;
 
   @IsInt()
diff --git a/server/src/dtos/system-config.dto.ts b/server/src/dtos/system-config.dto.ts
index 809f381dd6..8a58995de7 100644
--- a/server/src/dtos/system-config.dto.ts
+++ b/server/src/dtos/system-config.dto.ts
@@ -26,7 +26,7 @@ import {
   OAuthTokenEndpointAuthMethod,
   QueueName,
   ToneMapping,
-  TranscodeHWAccel,
+  TranscodeHardwareAcceleration,
   TranscodePolicy,
   VideoCodec,
   VideoContainer,
@@ -136,8 +136,8 @@ export class SystemConfigFFmpegDto {
   @ValidateEnum({ enum: TranscodePolicy, name: 'TranscodePolicy' })
   transcode!: TranscodePolicy;
 
-  @ValidateEnum({ enum: TranscodeHWAccel, name: 'TranscodeHWAccel' })
-  accel!: TranscodeHWAccel;
+  @ValidateEnum({ enum: TranscodeHardwareAcceleration, name: 'TranscodeHWAccel' })
+  accel!: TranscodeHardwareAcceleration;
 
   @ValidateBoolean()
   accelDecode!: boolean;
@@ -158,67 +158,67 @@ class SystemConfigJobDto implements Record<ConcurrentQueueName, JobSettingsDto>
   @ValidateNested()
   @IsObject()
   @Type(() => JobSettingsDto)
-  [QueueName.THUMBNAIL_GENERATION]!: JobSettingsDto;
+  [QueueName.ThumbnailGeneration]!: JobSettingsDto;
 
   @ApiProperty({ type: JobSettingsDto })
   @ValidateNested()
   @IsObject()
   @Type(() => JobSettingsDto)
-  [QueueName.METADATA_EXTRACTION]!: JobSettingsDto;
+  [QueueName.MetadataExtraction]!: JobSettingsDto;
 
   @ApiProperty({ type: JobSettingsDto })
   @ValidateNested()
   @IsObject()
   @Type(() => JobSettingsDto)
-  [QueueName.VIDEO_CONVERSION]!: JobSettingsDto;
+  [QueueName.VideoConversion]!: JobSettingsDto;
 
   @ApiProperty({ type: JobSettingsDto })
   @ValidateNested()
   @IsObject()
   @Type(() => JobSettingsDto)
-  [QueueName.SMART_SEARCH]!: JobSettingsDto;
+  [QueueName.SmartSearch]!: JobSettingsDto;
 
   @ApiProperty({ type: JobSettingsDto })
   @ValidateNested()
   @IsObject()
   @Type(() => JobSettingsDto)
-  [QueueName.MIGRATION]!: JobSettingsDto;
+  [QueueName.Migration]!: JobSettingsDto;
 
   @ApiProperty({ type: JobSettingsDto })
   @ValidateNested()
   @IsObject()
   @Type(() => JobSettingsDto)
-  [QueueName.BACKGROUND_TASK]!: JobSettingsDto;
+  [QueueName.BackgroundTask]!: JobSettingsDto;
 
   @ApiProperty({ type: JobSettingsDto })
   @ValidateNested()
   @IsObject()
   @Type(() => JobSettingsDto)
-  [QueueName.SEARCH]!: JobSettingsDto;
+  [QueueName.Search]!: JobSettingsDto;
 
   @ApiProperty({ type: JobSettingsDto })
   @ValidateNested()
   @IsObject()
   @Type(() => JobSettingsDto)
-  [QueueName.FACE_DETECTION]!: JobSettingsDto;
+  [QueueName.FaceDetection]!: JobSettingsDto;
 
   @ApiProperty({ type: JobSettingsDto })
   @ValidateNested()
   @IsObject()
   @Type(() => JobSettingsDto)
-  [QueueName.SIDECAR]!: JobSettingsDto;
+  [QueueName.Sidecar]!: JobSettingsDto;
 
   @ApiProperty({ type: JobSettingsDto })
   @ValidateNested()
   @IsObject()
   @Type(() => JobSettingsDto)
-  [QueueName.LIBRARY]!: JobSettingsDto;
+  [QueueName.Library]!: JobSettingsDto;
 
   @ApiProperty({ type: JobSettingsDto })
   @ValidateNested()
   @IsObject()
   @Type(() => JobSettingsDto)
-  [QueueName.NOTIFICATION]!: JobSettingsDto;
+  [QueueName.Notification]!: JobSettingsDto;
 }
 
 class SystemConfigLibraryScanDto {
diff --git a/server/src/dtos/user-preferences.dto.ts b/server/src/dtos/user-preferences.dto.ts
index d165438061..b258158ae2 100644
--- a/server/src/dtos/user-preferences.dto.ts
+++ b/server/src/dtos/user-preferences.dto.ts
@@ -157,7 +157,7 @@ export class UserPreferencesUpdateDto {
 
 class AlbumsResponse {
   @ValidateEnum({ enum: AssetOrder, name: 'AssetOrder' })
-  defaultAssetOrder: AssetOrder = AssetOrder.DESC;
+  defaultAssetOrder: AssetOrder = AssetOrder.Desc;
 }
 
 class RatingsResponse {
diff --git a/server/src/dtos/user.dto.ts b/server/src/dtos/user.dto.ts
index 3e3a92d42e..0da86bfcb5 100644
--- a/server/src/dtos/user.dto.ts
+++ b/server/src/dtos/user.dto.ts
@@ -171,7 +171,7 @@ export class UserAdminResponseDto extends UserResponseDto {
 export function mapUserAdmin(entity: UserAdmin): UserAdminResponseDto {
   const metadata = entity.metadata || [];
   const license = metadata.find(
-    (item): item is UserMetadataItem<UserMetadataKey.LICENSE> => item.key === UserMetadataKey.LICENSE,
+    (item): item is UserMetadataItem<UserMetadataKey.License> => item.key === UserMetadataKey.License,
   )?.value;
   return {
     ...mapUser(entity),
diff --git a/server/src/enum.ts b/server/src/enum.ts
index d7c74a71c6..1d8b8645d1 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -1,402 +1,397 @@
 export enum AuthType {
-  PASSWORD = 'password',
-  OAUTH = 'oauth',
+  Password = 'password',
+  OAuth = 'oauth',
 }
 
 export enum ImmichCookie {
-  ACCESS_TOKEN = 'immich_access_token',
-  AUTH_TYPE = 'immich_auth_type',
-  IS_AUTHENTICATED = 'immich_is_authenticated',
-  SHARED_LINK_TOKEN = 'immich_shared_link_token',
-  OAUTH_STATE = 'immich_oauth_state',
-  OAUTH_CODE_VERIFIER = 'immich_oauth_code_verifier',
+  AccessToken = 'immich_access_token',
+  AuthType = 'immich_auth_type',
+  IsAuthenticated = 'immich_is_authenticated',
+  SharedLinkToken = 'immich_shared_link_token',
+  OAuthState = 'immich_oauth_state',
+  OAuthCodeVerifier = 'immich_oauth_code_verifier',
 }
 
 export enum ImmichHeader {
-  API_KEY = 'x-api-key',
-  USER_TOKEN = 'x-immich-user-token',
-  SESSION_TOKEN = 'x-immich-session-token',
-  SHARED_LINK_KEY = 'x-immich-share-key',
-  CHECKSUM = 'x-immich-checksum',
-  CID = 'x-immich-cid',
+  ApiKey = 'x-api-key',
+  UserToken = 'x-immich-user-token',
+  SessionToken = 'x-immich-session-token',
+  SharedLinkKey = 'x-immich-share-key',
+  Checksum = 'x-immich-checksum',
+  Cid = 'x-immich-cid',
 }
 
 export enum ImmichQuery {
-  SHARED_LINK_KEY = 'key',
-  API_KEY = 'apiKey',
-  SESSION_KEY = 'sessionKey',
+  SharedLinkKey = 'key',
+  ApiKey = 'apiKey',
+  SessionKey = 'sessionKey',
 }
 
 export enum AssetType {
-  IMAGE = 'IMAGE',
-  VIDEO = 'VIDEO',
-  AUDIO = 'AUDIO',
-  OTHER = 'OTHER',
+  Image = 'IMAGE',
+  Video = 'VIDEO',
+  Audio = 'AUDIO',
+  Other = 'OTHER',
 }
 
 export enum AssetFileType {
   /**
    * An full/large-size image extracted/converted from RAW photos
    */
-  FULLSIZE = 'fullsize',
-  PREVIEW = 'preview',
-  THUMBNAIL = 'thumbnail',
+  FullSize = 'fullsize',
+  Preview = 'preview',
+  Thumbnail = 'thumbnail',
 }
 
 export enum AlbumUserRole {
-  EDITOR = 'editor',
-  VIEWER = 'viewer',
+  Editor = 'editor',
+  Viewer = 'viewer',
 }
 
 export enum AssetOrder {
-  ASC = 'asc',
-  DESC = 'desc',
+  Asc = 'asc',
+  Desc = 'desc',
 }
 
 export enum DatabaseAction {
-  CREATE = 'CREATE',
-  UPDATE = 'UPDATE',
-  DELETE = 'DELETE',
+  Create = 'CREATE',
+  Update = 'UPDATE',
+  Delete = 'DELETE',
 }
 
 export enum EntityType {
-  ASSET = 'ASSET',
-  ALBUM = 'ALBUM',
+  Asset = 'ASSET',
+  Album = 'ALBUM',
 }
 
 export enum MemoryType {
   /** pictures taken on this day X years ago */
-  ON_THIS_DAY = 'on_this_day',
+  OnThisDay = 'on_this_day',
 }
 
 export enum Permission {
-  ALL = 'all',
+  All = 'all',
 
-  ACTIVITY_CREATE = 'activity.create',
-  ACTIVITY_READ = 'activity.read',
-  ACTIVITY_UPDATE = 'activity.update',
-  ACTIVITY_DELETE = 'activity.delete',
-  ACTIVITY_STATISTICS = 'activity.statistics',
+  ActivityCreate = 'activity.create',
+  ActivityRead = 'activity.read',
+  ActivityUpdate = 'activity.update',
+  ActivityDelete = 'activity.delete',
+  ActivityStatistics = 'activity.statistics',
 
-  API_KEY_CREATE = 'apiKey.create',
-  API_KEY_READ = 'apiKey.read',
-  API_KEY_UPDATE = 'apiKey.update',
-  API_KEY_DELETE = 'apiKey.delete',
+  ApiKeyCreate = 'apiKey.create',
+  ApiKeyRead = 'apiKey.read',
+  ApiKeyUpdate = 'apiKey.update',
+  ApiKeyDelete = 'apiKey.delete',
 
   // ASSET_CREATE = 'asset.create',
-  ASSET_READ = 'asset.read',
-  ASSET_UPDATE = 'asset.update',
-  ASSET_DELETE = 'asset.delete',
-  ASSET_SHARE = 'asset.share',
-  ASSET_VIEW = 'asset.view',
-  ASSET_DOWNLOAD = 'asset.download',
-  ASSET_UPLOAD = 'asset.upload',
+  AssetRead = 'asset.read',
+  AssetUpdate = 'asset.update',
+  AssetDelete = 'asset.delete',
+  AssetShare = 'asset.share',
+  AssetView = 'asset.view',
+  AssetDownload = 'asset.download',
+  AssetUpload = 'asset.upload',
 
-  ALBUM_CREATE = 'album.create',
-  ALBUM_READ = 'album.read',
-  ALBUM_UPDATE = 'album.update',
-  ALBUM_DELETE = 'album.delete',
-  ALBUM_STATISTICS = 'album.statistics',
+  AlbumCreate = 'album.create',
+  AlbumRead = 'album.read',
+  AlbumUpdate = 'album.update',
+  AlbumDelete = 'album.delete',
+  AlbumStatistics = 'album.statistics',
 
-  ALBUM_ADD_ASSET = 'album.addAsset',
-  ALBUM_REMOVE_ASSET = 'album.removeAsset',
-  ALBUM_SHARE = 'album.share',
-  ALBUM_DOWNLOAD = 'album.download',
+  AlbumAddAsset = 'album.addAsset',
+  AlbumRemoveAsset = 'album.removeAsset',
+  AlbumShare = 'album.share',
+  AlbumDownload = 'album.download',
 
-  AUTH_DEVICE_DELETE = 'authDevice.delete',
+  AuthDeviceDelete = 'authDevice.delete',
 
-  ARCHIVE_READ = 'archive.read',
+  ArchiveRead = 'archive.read',
 
-  FACE_CREATE = 'face.create',
-  FACE_READ = 'face.read',
-  FACE_UPDATE = 'face.update',
-  FACE_DELETE = 'face.delete',
+  FaceCreate = 'face.create',
+  FaceRead = 'face.read',
+  FaceUpdate = 'face.update',
+  FaceDelete = 'face.delete',
 
-  LIBRARY_CREATE = 'library.create',
-  LIBRARY_READ = 'library.read',
-  LIBRARY_UPDATE = 'library.update',
-  LIBRARY_DELETE = 'library.delete',
-  LIBRARY_STATISTICS = 'library.statistics',
+  LibraryCreate = 'library.create',
+  LibraryRead = 'library.read',
+  LibraryUpdate = 'library.update',
+  LibraryDelete = 'library.delete',
+  LibraryStatistics = 'library.statistics',
 
-  TIMELINE_READ = 'timeline.read',
-  TIMELINE_DOWNLOAD = 'timeline.download',
+  TimelineRead = 'timeline.read',
+  TimelineDownload = 'timeline.download',
 
-  MEMORY_CREATE = 'memory.create',
-  MEMORY_READ = 'memory.read',
-  MEMORY_UPDATE = 'memory.update',
-  MEMORY_DELETE = 'memory.delete',
+  MemoryCreate = 'memory.create',
+  MemoryRead = 'memory.read',
+  MemoryUpdate = 'memory.update',
+  MemoryDelete = 'memory.delete',
 
-  NOTIFICATION_CREATE = 'notification.create',
-  NOTIFICATION_READ = 'notification.read',
-  NOTIFICATION_UPDATE = 'notification.update',
-  NOTIFICATION_DELETE = 'notification.delete',
+  NotificationCreate = 'notification.create',
+  NotificationRead = 'notification.read',
+  NotificationUpdate = 'notification.update',
+  NotificationDelete = 'notification.delete',
 
-  PARTNER_CREATE = 'partner.create',
-  PARTNER_READ = 'partner.read',
-  PARTNER_UPDATE = 'partner.update',
-  PARTNER_DELETE = 'partner.delete',
+  PartnerCreate = 'partner.create',
+  PartnerRead = 'partner.read',
+  PartnerUpdate = 'partner.update',
+  PartnerDelete = 'partner.delete',
 
-  PERSON_CREATE = 'person.create',
-  PERSON_READ = 'person.read',
-  PERSON_UPDATE = 'person.update',
-  PERSON_DELETE = 'person.delete',
-  PERSON_STATISTICS = 'person.statistics',
-  PERSON_MERGE = 'person.merge',
-  PERSON_REASSIGN = 'person.reassign',
+  PersonCreate = 'person.create',
+  PersonRead = 'person.read',
+  PersonUpdate = 'person.update',
+  PersonDelete = 'person.delete',
+  PersonStatistics = 'person.statistics',
+  PersonMerge = 'person.merge',
+  PersonReassign = 'person.reassign',
 
-  SESSION_CREATE = 'session.create',
-  SESSION_READ = 'session.read',
-  SESSION_UPDATE = 'session.update',
-  SESSION_DELETE = 'session.delete',
-  SESSION_LOCK = 'session.lock',
+  SessionCreate = 'session.create',
+  SessionRead = 'session.read',
+  SessionUpdate = 'session.update',
+  SessionDelete = 'session.delete',
+  SessionLock = 'session.lock',
 
-  SHARED_LINK_CREATE = 'sharedLink.create',
-  SHARED_LINK_READ = 'sharedLink.read',
-  SHARED_LINK_UPDATE = 'sharedLink.update',
-  SHARED_LINK_DELETE = 'sharedLink.delete',
+  SharedLinkCreate = 'sharedLink.create',
+  SharedLinkRead = 'sharedLink.read',
+  SharedLinkUpdate = 'sharedLink.update',
+  SharedLinkDelete = 'sharedLink.delete',
 
-  STACK_CREATE = 'stack.create',
-  STACK_READ = 'stack.read',
-  STACK_UPDATE = 'stack.update',
-  STACK_DELETE = 'stack.delete',
+  StackCreate = 'stack.create',
+  StackRead = 'stack.read',
+  StackUpdate = 'stack.update',
+  StackDelete = 'stack.delete',
 
-  SYSTEM_CONFIG_READ = 'systemConfig.read',
-  SYSTEM_CONFIG_UPDATE = 'systemConfig.update',
+  SystemConfigRead = 'systemConfig.read',
+  SystemConfigUpdate = 'systemConfig.update',
 
-  SYSTEM_METADATA_READ = 'systemMetadata.read',
-  SYSTEM_METADATA_UPDATE = 'systemMetadata.update',
+  SystemMetadataRead = 'systemMetadata.read',
+  SystemMetadataUpdate = 'systemMetadata.update',
 
-  TAG_CREATE = 'tag.create',
-  TAG_READ = 'tag.read',
-  TAG_UPDATE = 'tag.update',
-  TAG_DELETE = 'tag.delete',
-  TAG_ASSET = 'tag.asset',
+  TagCreate = 'tag.create',
+  TagRead = 'tag.read',
+  TagUpdate = 'tag.update',
+  TagDelete = 'tag.delete',
+  TagAsset = 'tag.asset',
 
-  ADMIN_USER_CREATE = 'admin.user.create',
-  ADMIN_USER_READ = 'admin.user.read',
-  ADMIN_USER_UPDATE = 'admin.user.update',
-  ADMIN_USER_DELETE = 'admin.user.delete',
+  AdminUserCreate = 'admin.user.create',
+  AdminUserRead = 'admin.user.read',
+  AdminUserUpdate = 'admin.user.update',
+  AdminUserDelete = 'admin.user.delete',
 }
 
 export enum SharedLinkType {
-  ALBUM = 'ALBUM',
+  Album = 'ALBUM',
 
   /**
    * Individual asset
    * or group of assets that are not in an album
    */
-  INDIVIDUAL = 'INDIVIDUAL',
+  Individual = 'INDIVIDUAL',
 }
 
 export enum StorageFolder {
-  ENCODED_VIDEO = 'encoded-video',
-  LIBRARY = 'library',
-  UPLOAD = 'upload',
-  PROFILE = 'profile',
-  THUMBNAILS = 'thumbs',
-  BACKUPS = 'backups',
+  EncodedVideo = 'encoded-video',
+  Library = 'library',
+  Upload = 'upload',
+  Profile = 'profile',
+  Thumbnails = 'thumbs',
+  Backups = 'backups',
 }
 
 export enum SystemMetadataKey {
-  REVERSE_GEOCODING_STATE = 'reverse-geocoding-state',
-  FACIAL_RECOGNITION_STATE = 'facial-recognition-state',
-  MEMORIES_STATE = 'memories-state',
-  ADMIN_ONBOARDING = 'admin-onboarding',
-  SYSTEM_CONFIG = 'system-config',
-  SYSTEM_FLAGS = 'system-flags',
-  VERSION_CHECK_STATE = 'version-check-state',
-  LICENSE = 'license',
+  ReverseGeocodingState = 'reverse-geocoding-state',
+  FacialRecognitionState = 'facial-recognition-state',
+  MemoriesState = 'memories-state',
+  AdminOnboarding = 'admin-onboarding',
+  SystemConfig = 'system-config',
+  SystemFlags = 'system-flags',
+  VersionCheckState = 'version-check-state',
+  License = 'license',
 }
 
 export enum UserMetadataKey {
-  PREFERENCES = 'preferences',
-  LICENSE = 'license',
-  ONBOARDING = 'onboarding',
+  Preferences = 'preferences',
+  License = 'license',
+  Onboarding = 'onboarding',
 }
 
 export enum UserAvatarColor {
-  PRIMARY = 'primary',
-  PINK = 'pink',
-  RED = 'red',
-  YELLOW = 'yellow',
-  BLUE = 'blue',
-  GREEN = 'green',
-  PURPLE = 'purple',
-  ORANGE = 'orange',
-  GRAY = 'gray',
-  AMBER = 'amber',
+  Primary = 'primary',
+  Pink = 'pink',
+  Red = 'red',
+  Yellow = 'yellow',
+  Blue = 'blue',
+  Green = 'green',
+  Purple = 'purple',
+  Orange = 'orange',
+  Gray = 'gray',
+  Amber = 'amber',
 }
 
 export enum UserStatus {
-  ACTIVE = 'active',
-  REMOVING = 'removing',
-  DELETED = 'deleted',
+  Active = 'active',
+  Removing = 'removing',
+  Deleted = 'deleted',
 }
 
 export enum AssetStatus {
-  ACTIVE = 'active',
-  TRASHED = 'trashed',
-  DELETED = 'deleted',
+  Active = 'active',
+  Trashed = 'trashed',
+  Deleted = 'deleted',
 }
 
 export enum SourceType {
-  MACHINE_LEARNING = 'machine-learning',
-  EXIF = 'exif',
-  MANUAL = 'manual',
+  MachineLearning = 'machine-learning',
+  Exif = 'exif',
+  Manual = 'manual',
 }
 
 export enum ManualJobName {
-  PERSON_CLEANUP = 'person-cleanup',
-  TAG_CLEANUP = 'tag-cleanup',
-  USER_CLEANUP = 'user-cleanup',
-  MEMORY_CLEANUP = 'memory-cleanup',
-  MEMORY_CREATE = 'memory-create',
-  BACKUP_DATABASE = 'backup-database',
+  PersonCleanup = 'person-cleanup',
+  TagCleanup = 'tag-cleanup',
+  UserCleanup = 'user-cleanup',
+  MemoryCleanup = 'memory-cleanup',
+  MemoryCreate = 'memory-create',
+  BackupDatabase = 'backup-database',
 }
 
 export enum AssetPathType {
-  ORIGINAL = 'original',
-  FULLSIZE = 'fullsize',
-  PREVIEW = 'preview',
-  THUMBNAIL = 'thumbnail',
-  ENCODED_VIDEO = 'encoded_video',
-  SIDECAR = 'sidecar',
+  Original = 'original',
+  FullSize = 'fullsize',
+  Preview = 'preview',
+  Thumbnail = 'thumbnail',
+  EncodedVideo = 'encoded_video',
+  Sidecar = 'sidecar',
 }
 
 export enum PersonPathType {
-  FACE = 'face',
+  Face = 'face',
 }
 
 export enum UserPathType {
-  PROFILE = 'profile',
+  Profile = 'profile',
 }
 
 export type PathType = AssetPathType | PersonPathType | UserPathType;
 
 export enum TranscodePolicy {
-  ALL = 'all',
-  OPTIMAL = 'optimal',
-  BITRATE = 'bitrate',
-  REQUIRED = 'required',
-  DISABLED = 'disabled',
+  All = 'all',
+  Optimal = 'optimal',
+  Bitrate = 'bitrate',
+  Required = 'required',
+  Disabled = 'disabled',
 }
 
 export enum TranscodeTarget {
-  NONE,
-  AUDIO,
-  VIDEO,
-  ALL,
+  None = 'NONE',
+  Audio = 'AUDIO',
+  Video = 'VIDEO',
+  All = 'ALL',
 }
 
 export enum VideoCodec {
   H264 = 'h264',
-  HEVC = 'hevc',
-  VP9 = 'vp9',
-  AV1 = 'av1',
+  Hevc = 'hevc',
+  Vp9 = 'vp9',
+  Av1 = 'av1',
 }
 
 export enum AudioCodec {
-  MP3 = 'mp3',
-  AAC = 'aac',
-  LIBOPUS = 'libopus',
-  PCMS16LE = 'pcm_s16le',
+  Mp3 = 'mp3',
+  Aac = 'aac',
+  LibOpus = 'libopus',
+  PcmS16le = 'pcm_s16le',
 }
 
 export enum VideoContainer {
-  MOV = 'mov',
-  MP4 = 'mp4',
-  OGG = 'ogg',
-  WEBM = 'webm',
+  Mov = 'mov',
+  Mp4 = 'mp4',
+  Ogg = 'ogg',
+  Webm = 'webm',
 }
 
-export enum TranscodeHWAccel {
-  NVENC = 'nvenc',
-  QSV = 'qsv',
-  VAAPI = 'vaapi',
-  RKMPP = 'rkmpp',
-  DISABLED = 'disabled',
+export enum TranscodeHardwareAcceleration {
+  Nvenc = 'nvenc',
+  Qsv = 'qsv',
+  Vaapi = 'vaapi',
+  Rkmpp = 'rkmpp',
+  Disabled = 'disabled',
 }
 
 export enum ToneMapping {
-  HABLE = 'hable',
-  MOBIUS = 'mobius',
-  REINHARD = 'reinhard',
-  DISABLED = 'disabled',
+  Hable = 'hable',
+  Mobius = 'mobius',
+  Reinhard = 'reinhard',
+  Disabled = 'disabled',
 }
 
 export enum CQMode {
-  AUTO = 'auto',
-  CQP = 'cqp',
-  ICQ = 'icq',
+  Auto = 'auto',
+  Cqp = 'cqp',
+  Icq = 'icq',
 }
 
 export enum Colorspace {
-  SRGB = 'srgb',
+  Srgb = 'srgb',
   P3 = 'p3',
 }
 
 export enum ImageFormat {
-  JPEG = 'jpeg',
-  WEBP = 'webp',
+  Jpeg = 'jpeg',
+  Webp = 'webp',
 }
 
 export enum RawExtractedFormat {
-  JPEG = 'jpeg',
-  JXL = 'jxl',
+  Jpeg = 'jpeg',
+  Jxl = 'jxl',
 }
 
 export enum LogLevel {
-  VERBOSE = 'verbose',
-  DEBUG = 'debug',
-  LOG = 'log',
-  WARN = 'warn',
-  ERROR = 'error',
-  FATAL = 'fatal',
+  Verbose = 'verbose',
+  Debug = 'debug',
+  Log = 'log',
+  Warn = 'warn',
+  Error = 'error',
+  Fatal = 'fatal',
 }
 
 export enum MetadataKey {
-  AUTH_ROUTE = 'auth_route',
-  ADMIN_ROUTE = 'admin_route',
-  SHARED_ROUTE = 'shared_route',
-  API_KEY_SECURITY = 'api_key',
-  EVENT_CONFIG = 'event_config',
-  JOB_CONFIG = 'job_config',
-  TELEMETRY_ENABLED = 'telemetry_enabled',
+  AuthRoute = 'auth_route',
+  AdminRoute = 'admin_route',
+  SharedRoute = 'shared_route',
+  ApiKeySecurity = 'api_key',
+  EventConfig = 'event_config',
+  JobConfig = 'job_config',
+  TelemetryEnabled = 'telemetry_enabled',
 }
 
 export enum RouteKey {
-  ASSET = 'assets',
-  USER = 'users',
+  Asset = 'assets',
+  User = 'users',
 }
 
 export enum CacheControl {
-  PRIVATE_WITH_CACHE = 'private_with_cache',
-  PRIVATE_WITHOUT_CACHE = 'private_without_cache',
-  NONE = 'none',
-}
-
-export enum PaginationMode {
-  LIMIT_OFFSET = 'limit-offset',
-  SKIP_TAKE = 'skip-take',
+  PrivateWithCache = 'private_with_cache',
+  PrivateWithoutCache = 'private_without_cache',
+  None = 'none',
 }
 
 export enum ImmichEnvironment {
-  DEVELOPMENT = 'development',
-  TESTING = 'testing',
-  PRODUCTION = 'production',
+  Development = 'development',
+  Testing = 'testing',
+  Production = 'production',
 }
 
 export enum ImmichWorker {
-  API = 'api',
-  MICROSERVICES = 'microservices',
+  Api = 'api',
+  Microservices = 'microservices',
 }
 
 export enum ImmichTelemetry {
-  HOST = 'host',
-  API = 'api',
-  IO = 'io',
-  REPO = 'repo',
-  JOB = 'job',
+  Host = 'host',
+  Api = 'api',
+  Io = 'io',
+  Repo = 'repo',
+  Job = 'job',
 }
 
 export enum ExifOrientation {
@@ -411,11 +406,11 @@ export enum ExifOrientation {
 }
 
 export enum DatabaseExtension {
-  CUBE = 'cube',
-  EARTH_DISTANCE = 'earthdistance',
-  VECTOR = 'vector',
-  VECTORS = 'vectors',
-  VECTORCHORD = 'vchord',
+  Cube = 'cube',
+  EarthDistance = 'earthdistance',
+  Vector = 'vector',
+  Vectors = 'vectors',
+  VectorChord = 'vchord',
 }
 
 export enum BootstrapEventPriority {
@@ -428,135 +423,135 @@ export enum BootstrapEventPriority {
 }
 
 export enum QueueName {
-  THUMBNAIL_GENERATION = 'thumbnailGeneration',
-  METADATA_EXTRACTION = 'metadataExtraction',
-  VIDEO_CONVERSION = 'videoConversion',
-  FACE_DETECTION = 'faceDetection',
-  FACIAL_RECOGNITION = 'facialRecognition',
-  SMART_SEARCH = 'smartSearch',
-  DUPLICATE_DETECTION = 'duplicateDetection',
-  BACKGROUND_TASK = 'backgroundTask',
-  STORAGE_TEMPLATE_MIGRATION = 'storageTemplateMigration',
-  MIGRATION = 'migration',
-  SEARCH = 'search',
-  SIDECAR = 'sidecar',
-  LIBRARY = 'library',
-  NOTIFICATION = 'notifications',
-  BACKUP_DATABASE = 'backupDatabase',
+  ThumbnailGeneration = 'thumbnailGeneration',
+  MetadataExtraction = 'metadataExtraction',
+  VideoConversion = 'videoConversion',
+  FaceDetection = 'faceDetection',
+  FacialRecognition = 'facialRecognition',
+  SmartSearch = 'smartSearch',
+  DuplicateDetection = 'duplicateDetection',
+  BackgroundTask = 'backgroundTask',
+  StorageTemplateMigration = 'storageTemplateMigration',
+  Migration = 'migration',
+  Search = 'search',
+  Sidecar = 'sidecar',
+  Library = 'library',
+  Notification = 'notifications',
+  BackupDatabase = 'backupDatabase',
 }
 
 export enum JobName {
   //backups
-  BACKUP_DATABASE = 'database-backup',
+  BackupDatabase = 'database-backup',
 
   // conversion
-  QUEUE_VIDEO_CONVERSION = 'queue-video-conversion',
-  VIDEO_CONVERSION = 'video-conversion',
+  QueueVideoConversion = 'queue-video-conversion',
+  VideoConversation = 'video-conversion',
 
   // thumbnails
-  QUEUE_GENERATE_THUMBNAILS = 'queue-generate-thumbnails',
-  GENERATE_THUMBNAILS = 'generate-thumbnails',
-  GENERATE_PERSON_THUMBNAIL = 'generate-person-thumbnail',
+  QueueGenerateThumbnails = 'queue-generate-thumbnails',
+  GenerateThumbnails = 'generate-thumbnails',
+  GeneratePersonThumbnail = 'generate-person-thumbnail',
 
   // metadata
-  QUEUE_METADATA_EXTRACTION = 'queue-metadata-extraction',
-  METADATA_EXTRACTION = 'metadata-extraction',
+  QueueMetadataExtraction = 'queue-metadata-extraction',
+  MetadataExtraction = 'metadata-extraction',
 
   // user
-  USER_DELETION = 'user-deletion',
-  USER_DELETE_CHECK = 'user-delete-check',
-  USER_SYNC_USAGE = 'user-sync-usage',
+  UserDeletion = 'user-deletion',
+  UserDeleteCheck = 'user-delete-check',
+  userSyncUsage = 'user-sync-usage',
 
   // asset
-  ASSET_DELETION = 'asset-deletion',
-  ASSET_DELETION_CHECK = 'asset-deletion-check',
+  AssetDeletion = 'asset-deletion',
+  AssetDeletionCheck = 'asset-deletion-check',
 
   // storage template
-  STORAGE_TEMPLATE_MIGRATION = 'storage-template-migration',
-  STORAGE_TEMPLATE_MIGRATION_SINGLE = 'storage-template-migration-single',
+  StorageTemplateMigration = 'storage-template-migration',
+  StorageTemplateMigrationSingle = 'storage-template-migration-single',
 
   // tags
-  TAG_CLEANUP = 'tag-cleanup',
+  TagCleanup = 'tag-cleanup',
 
   // migration
-  QUEUE_MIGRATION = 'queue-migration',
-  MIGRATE_ASSET = 'migrate-asset',
-  MIGRATE_PERSON = 'migrate-person',
+  QueueMigration = 'queue-migration',
+  MigrateAsset = 'migrate-asset',
+  MigratePerson = 'migrate-person',
 
   // facial recognition
-  PERSON_CLEANUP = 'person-cleanup',
-  QUEUE_FACE_DETECTION = 'queue-face-detection',
-  FACE_DETECTION = 'face-detection',
-  QUEUE_FACIAL_RECOGNITION = 'queue-facial-recognition',
-  FACIAL_RECOGNITION = 'facial-recognition',
+  PersonCleanup = 'person-cleanup',
+  QueueFaceDetection = 'queue-face-detection',
+  FaceDetection = 'face-detection',
+  QueueFacialRecognition = 'queue-facial-recognition',
+  FacialRecognition = 'facial-recognition',
 
   // library management
-  LIBRARY_QUEUE_SYNC_FILES = 'library-queue-sync-files',
-  LIBRARY_QUEUE_SYNC_ASSETS = 'library-queue-sync-assets',
-  LIBRARY_SYNC_FILES = 'library-sync-files',
-  LIBRARY_SYNC_ASSETS = 'library-sync-assets',
-  LIBRARY_ASSET_REMOVAL = 'handle-library-file-deletion',
-  LIBRARY_DELETE = 'library-delete',
-  LIBRARY_QUEUE_SCAN_ALL = 'library-queue-scan-all',
-  LIBRARY_QUEUE_CLEANUP = 'library-queue-cleanup',
+  LibraryQueueSyncFiles = 'library-queue-sync-files',
+  LibraryQueueSyncAssets = 'library-queue-sync-assets',
+  LibrarySyncFiles = 'library-sync-files',
+  LibrarySyncAssets = 'library-sync-assets',
+  LibraryAssetRemoval = 'handle-library-file-deletion',
+  LibraryDelete = 'library-delete',
+  LibraryQueueScanAll = 'library-queue-scan-all',
+  LibraryQueueCleanup = 'library-queue-cleanup',
 
   // cleanup
-  DELETE_FILES = 'delete-files',
-  CLEAN_OLD_AUDIT_LOGS = 'clean-old-audit-logs',
-  CLEAN_OLD_SESSION_TOKENS = 'clean-old-session-tokens',
+  DeleteFiles = 'delete-files',
+  CleanOldAuditLogs = 'clean-old-audit-logs',
+  CleanOldSessionTokens = 'clean-old-session-tokens',
 
   // memories
-  MEMORIES_CLEANUP = 'memories-cleanup',
-  MEMORIES_CREATE = 'memories-create',
+  MemoriesCleanup = 'memories-cleanup',
+  MemoriesCreate = 'memories-create',
 
   // smart search
-  QUEUE_SMART_SEARCH = 'queue-smart-search',
-  SMART_SEARCH = 'smart-search',
+  QueueSmartSearch = 'queue-smart-search',
+  SmartSearch = 'smart-search',
 
-  QUEUE_TRASH_EMPTY = 'queue-trash-empty',
+  QueueTrashEmpty = 'queue-trash-empty',
 
   // duplicate detection
-  QUEUE_DUPLICATE_DETECTION = 'queue-duplicate-detection',
-  DUPLICATE_DETECTION = 'duplicate-detection',
+  QueueDuplicateDetection = 'queue-duplicate-detection',
+  DuplicateDetection = 'duplicate-detection',
 
   // XMP sidecars
-  QUEUE_SIDECAR = 'queue-sidecar',
-  SIDECAR_DISCOVERY = 'sidecar-discovery',
-  SIDECAR_SYNC = 'sidecar-sync',
-  SIDECAR_WRITE = 'sidecar-write',
+  QueueSidecar = 'queue-sidecar',
+  SidecarDiscovery = 'sidecar-discovery',
+  SidecarSync = 'sidecar-sync',
+  SidecarWrite = 'sidecar-write',
 
   // Notification
-  NOTIFY_SIGNUP = 'notify-signup',
-  NOTIFY_ALBUM_INVITE = 'notify-album-invite',
-  NOTIFY_ALBUM_UPDATE = 'notify-album-update',
-  NOTIFICATIONS_CLEANUP = 'notifications-cleanup',
-  SEND_EMAIL = 'notification-send-email',
+  NotifySignup = 'notify-signup',
+  NotifyAlbumInvite = 'notify-album-invite',
+  NotifyAlbumUpdate = 'notify-album-update',
+  NotificationsCleanup = 'notifications-cleanup',
+  SendMail = 'notification-send-email',
 
   // Version check
-  VERSION_CHECK = 'version-check',
+  VersionCheck = 'version-check',
 }
 
 export enum JobCommand {
-  START = 'start',
-  PAUSE = 'pause',
-  RESUME = 'resume',
-  EMPTY = 'empty',
-  CLEAR_FAILED = 'clear-failed',
+  Start = 'start',
+  Pause = 'pause',
+  Resume = 'resume',
+  Empty = 'empty',
+  ClearFailed = 'clear-failed',
 }
 
 export enum JobStatus {
-  SUCCESS = 'success',
-  FAILED = 'failed',
-  SKIPPED = 'skipped',
+  Success = 'success',
+  Failed = 'failed',
+  Skipped = 'skipped',
 }
 
 export enum QueueCleanType {
-  FAILED = 'failed',
+  Failed = 'failed',
 }
 
 export enum VectorIndex {
-  CLIP = 'clip_index',
-  FACE = 'face_index',
+  Clip = 'clip_index',
+  Face = 'face_index',
 }
 
 export enum DatabaseLock {
@@ -663,8 +658,8 @@ export enum NotificationType {
 }
 
 export enum OAuthTokenEndpointAuthMethod {
-  CLIENT_SECRET_POST = 'client_secret_post',
-  CLIENT_SECRET_BASIC = 'client_secret_basic',
+  ClientSecretPost = 'client_secret_post',
+  ClientSecretBasic = 'client_secret_basic',
 }
 
 export enum DatabaseSslMode {
@@ -676,14 +671,14 @@ export enum DatabaseSslMode {
 }
 
 export enum AssetVisibility {
-  ARCHIVE = 'archive',
-  TIMELINE = 'timeline',
+  Archive = 'archive',
+  Timeline = 'timeline',
 
   /**
    * Video part of the LivePhotos and MotionPhotos
    */
-  HIDDEN = 'hidden',
-  LOCKED = 'locked',
+  Hidden = 'hidden',
+  Locked = 'locked',
 }
 
 export enum CronJob {
diff --git a/server/src/main.ts b/server/src/main.ts
index 95b35c6915..591fc156d9 100644
--- a/server/src/main.ts
+++ b/server/src/main.ts
@@ -20,7 +20,7 @@ const onExit = (name: string, exitCode: number | null) => {
   if (exitCode !== 0) {
     console.error(`${name} worker exited with code ${exitCode}`);
 
-    if (apiProcess && name !== ImmichWorker.API) {
+    if (apiProcess && name !== ImmichWorker.Api) {
       console.error('Killing api process');
       apiProcess.kill('SIGTERM');
       apiProcess = undefined;
@@ -34,7 +34,7 @@ function bootstrapWorker(name: ImmichWorker) {
   console.log(`Starting ${name} worker`);
 
   let worker: Worker | ChildProcess;
-  if (name === ImmichWorker.API) {
+  if (name === ImmichWorker.Api) {
     worker = fork(`./dist/workers/${name}.js`, [], {
       execArgv: process.execArgv.map((arg) => (arg.startsWith('--inspect') ? '--inspect=0.0.0.0:9231' : arg)),
     });
@@ -50,7 +50,7 @@ function bootstrapWorker(name: ImmichWorker) {
 function bootstrap() {
   if (immichApp === 'immich-admin') {
     process.title = 'immich_admin_cli';
-    process.env.IMMICH_LOG_LEVEL = LogLevel.WARN;
+    process.env.IMMICH_LOG_LEVEL = LogLevel.Warn;
     return CommandFactory.run(ImmichAdminModule);
   }
 
diff --git a/server/src/middleware/asset-upload.interceptor.ts b/server/src/middleware/asset-upload.interceptor.ts
index bc403ee562..0f1eaa4ce5 100644
--- a/server/src/middleware/asset-upload.interceptor.ts
+++ b/server/src/middleware/asset-upload.interceptor.ts
@@ -15,7 +15,7 @@ export class AssetUploadInterceptor implements NestInterceptor {
     const req = context.switchToHttp().getRequest<AuthenticatedRequest>();
     const res = context.switchToHttp().getResponse<Response<AssetMediaResponseDto>>();
 
-    const checksum = fromMaybeArray(req.headers[ImmichHeader.CHECKSUM]);
+    const checksum = fromMaybeArray(req.headers[ImmichHeader.Checksum]);
     const response = await this.service.getUploadAssetIdByChecksum(req.user, checksum);
     if (response) {
       res.status(200);
diff --git a/server/src/middleware/auth.guard.ts b/server/src/middleware/auth.guard.ts
index 438843436b..238f99257a 100644
--- a/server/src/middleware/auth.guard.ts
+++ b/server/src/middleware/auth.guard.ts
@@ -23,12 +23,12 @@ export const Authenticated = (options?: AuthenticatedOptions): MethodDecorator =
   const decorators: MethodDecorator[] = [
     ApiBearerAuth(),
     ApiCookieAuth(),
-    ApiSecurity(MetadataKey.API_KEY_SECURITY),
-    SetMetadata(MetadataKey.AUTH_ROUTE, options || {}),
+    ApiSecurity(MetadataKey.ApiKeySecurity),
+    SetMetadata(MetadataKey.AuthRoute, options || {}),
   ];
 
   if ((options as SharedLinkRoute)?.sharedLink) {
-    decorators.push(ApiQuery({ name: ImmichQuery.SHARED_LINK_KEY, type: String, required: false }));
+    decorators.push(ApiQuery({ name: ImmichQuery.SharedLinkKey, type: String, required: false }));
   }
 
   return applyDecorators(...decorators);
@@ -76,7 +76,7 @@ export class AuthGuard implements CanActivate {
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const targets = [context.getHandler()];
 
-    const options = this.reflector.getAllAndOverride<AuthenticatedOptions | undefined>(MetadataKey.AUTH_ROUTE, targets);
+    const options = this.reflector.getAllAndOverride<AuthenticatedOptions | undefined>(MetadataKey.AuthRoute, targets);
     if (!options) {
       return true;
     }
diff --git a/server/src/middleware/file-upload.interceptor.ts b/server/src/middleware/file-upload.interceptor.ts
index b6f37dbbd2..59c28849e1 100644
--- a/server/src/middleware/file-upload.interceptor.ts
+++ b/server/src/middleware/file-upload.interceptor.ts
@@ -154,11 +154,11 @@ export class FileUploadInterceptor implements NestInterceptor {
 
   private getHandler(route: RouteKey) {
     switch (route) {
-      case RouteKey.ASSET: {
+      case RouteKey.Asset: {
         return this.handlers.assetUpload;
       }
 
-      case RouteKey.USER: {
+      case RouteKey.User: {
         return this.handlers.userProfile;
       }
 
diff --git a/server/src/migrations/1718486162779-AddFaceSearchRelation.ts b/server/src/migrations/1718486162779-AddFaceSearchRelation.ts
index 68e1618775..2bd1acad34 100644
--- a/server/src/migrations/1718486162779-AddFaceSearchRelation.ts
+++ b/server/src/migrations/1718486162779-AddFaceSearchRelation.ts
@@ -6,7 +6,7 @@ import { MigrationInterface, QueryRunner } from 'typeorm';
 export class AddFaceSearchRelation1718486162779 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
     const vectorExtension = await getVectorExtension(queryRunner);
-    if (vectorExtension === DatabaseExtension.VECTORS) {
+    if (vectorExtension === DatabaseExtension.Vectors) {
       await queryRunner.query(`SET search_path TO "$user", public, vectors`);
     }
 
@@ -52,7 +52,7 @@ export class AddFaceSearchRelation1718486162779 implements MigrationInterface {
 
   public async down(queryRunner: QueryRunner): Promise<void> {
     const vectorExtension = await getVectorExtension(queryRunner);
-    if (vectorExtension === DatabaseExtension.VECTORS) {
+    if (vectorExtension === DatabaseExtension.Vectors) {
       await queryRunner.query(`SET search_path TO "$user", public, vectors`);
     }
 
diff --git a/server/src/repositories/access.repository.ts b/server/src/repositories/access.repository.ts
index 14a765778e..5cceb6dbe0 100644
--- a/server/src/repositories/access.repository.ts
+++ b/server/src/repositories/access.repository.ts
@@ -91,7 +91,7 @@ class AlbumAccess {
     }
 
     const accessRole =
-      access === AlbumUserRole.EDITOR ? [AlbumUserRole.EDITOR] : [AlbumUserRole.EDITOR, AlbumUserRole.VIEWER];
+      access === AlbumUserRole.Editor ? [AlbumUserRole.Editor] : [AlbumUserRole.Editor, AlbumUserRole.Viewer];
 
     return this.db
       .selectFrom('album')
@@ -178,7 +178,7 @@ class AssetAccess {
       .select('asset.id')
       .where('asset.id', 'in', [...assetIds])
       .where('asset.ownerId', '=', userId)
-      .$if(!hasElevatedPermission, (eb) => eb.where('asset.visibility', '!=', AssetVisibility.LOCKED))
+      .$if(!hasElevatedPermission, (eb) => eb.where('asset.visibility', '!=', AssetVisibility.Locked))
       .execute()
       .then((assets) => new Set(assets.map((asset) => asset.id)));
   }
@@ -200,8 +200,8 @@ class AssetAccess {
       .where('partner.sharedWithId', '=', userId)
       .where((eb) =>
         eb.or([
-          eb('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE)),
-          eb('asset.visibility', '=', sql.lit(AssetVisibility.HIDDEN)),
+          eb('asset.visibility', '=', sql.lit(AssetVisibility.Timeline)),
+          eb('asset.visibility', '=', sql.lit(AssetVisibility.Hidden)),
         ]),
       )
 
diff --git a/server/src/repositories/activity.repository.ts b/server/src/repositories/activity.repository.ts
index 9b991ef17f..1a1104b118 100644
--- a/server/src/repositories/activity.repository.ts
+++ b/server/src/repositories/activity.repository.ts
@@ -90,7 +90,7 @@ export class ActivityRepository {
       .where('activity.albumId', '=', albumId)
       .where(({ or, and, eb }) =>
         or([
-          and([eb('asset.deletedAt', 'is', null), eb('asset.visibility', '!=', sql.lit(AssetVisibility.LOCKED))]),
+          and([eb('asset.deletedAt', 'is', null), eb('asset.visibility', '!=', sql.lit(AssetVisibility.Locked))]),
           eb('asset.id', 'is', null),
         ]),
       )
diff --git a/server/src/repositories/album-user.repository.ts b/server/src/repositories/album-user.repository.ts
index d968ed100c..2fce797aff 100644
--- a/server/src/repositories/album-user.repository.ts
+++ b/server/src/repositories/album-user.repository.ts
@@ -24,7 +24,7 @@ export class AlbumUserRepository {
       .executeTakeFirstOrThrow();
   }
 
-  @GenerateSql({ params: [{ usersId: DummyValue.UUID, albumsId: DummyValue.UUID }, { role: AlbumUserRole.VIEWER }] })
+  @GenerateSql({ params: [{ usersId: DummyValue.UUID, albumsId: DummyValue.UUID }, { role: AlbumUserRole.Viewer }] })
   update({ usersId, albumsId }: AlbumPermissionId, dto: Updateable<AlbumUserTable>) {
     return this.db
       .updateTable('album_user')
diff --git a/server/src/repositories/asset-job.repository.ts b/server/src/repositories/asset-job.repository.ts
index c784ae276f..0500bb867f 100644
--- a/server/src/repositories/asset-job.repository.ts
+++ b/server/src/repositories/asset-job.repository.ts
@@ -62,7 +62,7 @@ export class AssetJobRepository {
       .select(['asset.id', 'asset.thumbhash'])
       .select(withFiles)
       .where('asset.deletedAt', 'is', null)
-      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.visibility', '!=', AssetVisibility.Hidden)
       .$if(!force, (qb) =>
         qb
           // If there aren't any entries, metadata extraction hasn't run yet which is required for thumbnails
@@ -117,7 +117,7 @@ export class AssetJobRepository {
       .executeTakeFirst();
   }
 
-  @GenerateSql({ params: [DummyValue.UUID, AssetFileType.THUMBNAIL] })
+  @GenerateSql({ params: [DummyValue.UUID, AssetFileType.Thumbnail] })
   getAlbumThumbnailFiles(id: string, fileType?: AssetFileType) {
     return this.db
       .selectFrom('asset_file')
@@ -130,7 +130,7 @@ export class AssetJobRepository {
   private assetsWithPreviews() {
     return this.db
       .selectFrom('asset')
-      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.visibility', '!=', AssetVisibility.Hidden)
       .where('asset.deletedAt', 'is', null)
       .innerJoin('asset_job_status as job_status', 'assetId', 'asset.id')
       .where('job_status.previewAt', 'is not', null);
@@ -167,7 +167,7 @@ export class AssetJobRepository {
     return this.db
       .selectFrom('asset')
       .select(['asset.id', 'asset.visibility'])
-      .select((eb) => withFiles(eb, AssetFileType.PREVIEW))
+      .select((eb) => withFiles(eb, AssetFileType.Preview))
       .where('asset.id', '=', id)
       .executeTakeFirst();
   }
@@ -179,7 +179,7 @@ export class AssetJobRepository {
       .select(['asset.id', 'asset.visibility'])
       .$call(withExifInner)
       .select((eb) => withFaces(eb, true))
-      .select((eb) => withFiles(eb, AssetFileType.PREVIEW))
+      .select((eb) => withFiles(eb, AssetFileType.Preview))
       .where('asset.id', '=', id)
       .executeTakeFirst();
   }
@@ -225,7 +225,7 @@ export class AssetJobRepository {
             .select(['stack.id', 'stack.primaryAssetId'])
             .select((eb) => eb.fn<Asset[]>('array_agg', [eb.table('stacked')]).as('assets'))
             .where('stacked.deletedAt', 'is not', null)
-            .where('stacked.visibility', '=', AssetVisibility.TIMELINE)
+            .where('stacked.visibility', '=', AssetVisibility.Timeline)
             .whereRef('stacked.stackId', '=', 'stack.id')
             .groupBy('stack.id')
             .as('stacked_assets'),
@@ -241,11 +241,11 @@ export class AssetJobRepository {
     return this.db
       .selectFrom('asset')
       .select(['asset.id'])
-      .where('asset.type', '=', AssetType.VIDEO)
+      .where('asset.type', '=', AssetType.Video)
       .$if(!force, (qb) =>
         qb
           .where((eb) => eb.or([eb('asset.encodedVideoPath', 'is', null), eb('asset.encodedVideoPath', '=', '')]))
-          .where('asset.visibility', '!=', AssetVisibility.HIDDEN),
+          .where('asset.visibility', '!=', AssetVisibility.Hidden),
       )
       .where('asset.deletedAt', 'is', null)
       .stream();
@@ -257,7 +257,7 @@ export class AssetJobRepository {
       .selectFrom('asset')
       .select(['asset.id', 'asset.ownerId', 'asset.originalPath', 'asset.encodedVideoPath'])
       .where('asset.id', '=', id)
-      .where('asset.type', '=', AssetType.VIDEO)
+      .where('asset.type', '=', AssetType.Video)
       .executeTakeFirst();
   }
 
@@ -327,7 +327,7 @@ export class AssetJobRepository {
       .$if(!force, (qb) =>
         qb.where((eb) => eb.or([eb('asset.sidecarPath', '=', ''), eb('asset.sidecarPath', 'is', null)])),
       )
-      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.visibility', '!=', AssetVisibility.Hidden)
       .stream();
   }
 
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index f00d0c170f..cb7e804f6f 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -230,13 +230,13 @@ export class AssetRepository {
                 .where('asset_job_status.previewAt', 'is not', null)
                 .where(sql`(asset."localDateTime" at time zone 'UTC')::date`, '=', sql`today.date`)
                 .where('asset.ownerId', '=', anyUuid(ownerIds))
-                .where('asset.visibility', '=', AssetVisibility.TIMELINE)
+                .where('asset.visibility', '=', AssetVisibility.Timeline)
                 .where((eb) =>
                   eb.exists((qb) =>
                     qb
                       .selectFrom('asset_file')
                       .whereRef('assetId', '=', 'asset.id')
-                      .where('asset_file.type', '=', AssetFileType.PREVIEW),
+                      .where('asset_file.type', '=', AssetFileType.Preview),
                   ),
                 )
                 .where('asset.deletedAt', 'is', null)
@@ -318,7 +318,7 @@ export class AssetRepository {
       .select(['deviceAssetId'])
       .where('ownerId', '=', asUuid(ownerId))
       .where('deviceId', '=', deviceId)
-      .where('visibility', '!=', AssetVisibility.HIDDEN)
+      .where('visibility', '!=', AssetVisibility.Hidden)
       .where('deletedAt', 'is', null)
       .execute();
 
@@ -363,7 +363,7 @@ export class AssetRepository {
                     .whereRef('stacked.stackId', '=', 'stack.id')
                     .whereRef('stacked.id', '!=', 'stack.primaryAssetId')
                     .where('stacked.deletedAt', 'is', null)
-                    .where('stacked.visibility', '=', AssetVisibility.TIMELINE)
+                    .where('stacked.visibility', '=', AssetVisibility.Timeline)
                     .groupBy('stack.id')
                     .as('stacked_assets'),
                 (join) => join.on('stack.id', 'is not', null),
@@ -463,15 +463,15 @@ export class AssetRepository {
   getStatistics(ownerId: string, { visibility, isFavorite, isTrashed }: AssetStatsOptions): Promise<AssetStats> {
     return this.db
       .selectFrom('asset')
-      .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.AUDIO).as(AssetType.AUDIO))
-      .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.IMAGE).as(AssetType.IMAGE))
-      .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.VIDEO).as(AssetType.VIDEO))
-      .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.OTHER).as(AssetType.OTHER))
+      .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.Audio).as(AssetType.Audio))
+      .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.Image).as(AssetType.Image))
+      .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.Video).as(AssetType.Video))
+      .select((eb) => eb.fn.countAll<number>().filterWhere('type', '=', AssetType.Other).as(AssetType.Other))
       .where('ownerId', '=', asUuid(ownerId))
       .$if(visibility === undefined, withDefaultVisibility)
       .$if(!!visibility, (qb) => qb.where('asset.visibility', '=', visibility!))
       .$if(isFavorite !== undefined, (qb) => qb.where('isFavorite', '=', isFavorite!))
-      .$if(!!isTrashed, (qb) => qb.where('asset.status', '!=', AssetStatus.DELETED))
+      .$if(!!isTrashed, (qb) => qb.where('asset.status', '!=', AssetStatus.Deleted))
       .where('deletedAt', isTrashed ? 'is not' : 'is', null)
       .executeTakeFirstOrThrow();
   }
@@ -496,7 +496,7 @@ export class AssetRepository {
         qb
           .selectFrom('asset')
           .select(truncatedDate<Date>().as('timeBucket'))
-          .$if(!!options.isTrashed, (qb) => qb.where('asset.status', '!=', AssetStatus.DELETED))
+          .$if(!!options.isTrashed, (qb) => qb.where('asset.status', '!=', AssetStatus.Deleted))
           .where('asset.deletedAt', options.isTrashed ? 'is not' : 'is', null)
           .$if(options.visibility === undefined, withDefaultVisibility)
           .$if(!!options.visibility, (qb) => qb.where('asset.visibility', '=', options.visibility!))
@@ -606,7 +606,7 @@ export class AssetRepository {
                     .select(sql`array[stacked."stackId"::text, count('stacked')::text]`.as('stack'))
                     .whereRef('stacked.stackId', '=', 'asset.stackId')
                     .where('stacked.deletedAt', 'is', null)
-                    .where('stacked.visibility', '=', AssetVisibility.TIMELINE)
+                    .where('stacked.visibility', '=', AssetVisibility.Timeline)
                     .groupBy('stacked.stackId')
                     .as('stacked_assets'),
                 (join) => join.onTrue(),
@@ -617,7 +617,7 @@ export class AssetRepository {
           .$if(options.isDuplicate !== undefined, (qb) =>
             qb.where('asset.duplicateId', options.isDuplicate ? 'is not' : 'is', null),
           )
-          .$if(!!options.isTrashed, (qb) => qb.where('asset.status', '!=', AssetStatus.DELETED))
+          .$if(!!options.isTrashed, (qb) => qb.where('asset.status', '!=', AssetStatus.Deleted))
           .$if(!!options.tagId, (qb) => withTagId(qb, options.tagId!))
           .orderBy('asset.fileCreatedAt', options.order ?? 'desc'),
       )
@@ -671,8 +671,8 @@ export class AssetRepository {
       .select(['assetId as data', 'asset_exif.city as value'])
       .$narrowType<{ value: NotNull }>()
       .where('ownerId', '=', asUuid(ownerId))
-      .where('visibility', '=', AssetVisibility.TIMELINE)
-      .where('type', '=', AssetType.IMAGE)
+      .where('visibility', '=', AssetVisibility.Timeline)
+      .where('type', '=', AssetType.Image)
       .where('deletedAt', 'is', null)
       .limit(maxFields)
       .execute();
@@ -710,7 +710,7 @@ export class AssetRepository {
       )
       .select((eb) => eb.fn.toJson(eb.table('stacked_assets')).$castTo<Stack | null>().as('stack'))
       .where('asset.ownerId', '=', asUuid(ownerId))
-      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.visibility', '!=', AssetVisibility.Hidden)
       .where('asset.updatedAt', '<=', updatedUntil)
       .$if(!!lastId, (qb) => qb.where('asset.id', '>', lastId!))
       .orderBy('asset.id')
@@ -738,7 +738,7 @@ export class AssetRepository {
       )
       .select((eb) => eb.fn.toJson(eb.table('stacked_assets').$castTo<Stack | null>()).as('stack'))
       .where('asset.ownerId', '=', anyUuid(options.userIds))
-      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.visibility', '!=', AssetVisibility.Hidden)
       .where('asset.updatedAt', '>', options.updatedAfter)
       .limit(options.limit)
       .execute();
diff --git a/server/src/repositories/audit.repository.ts b/server/src/repositories/audit.repository.ts
index 85ca4a79f8..2d56eddc9a 100644
--- a/server/src/repositories/audit.repository.ts
+++ b/server/src/repositories/audit.repository.ts
@@ -18,7 +18,7 @@ export class AuditRepository {
   @GenerateSql({
     params: [
       DummyValue.DATE,
-      { action: DatabaseAction.CREATE, entityType: EntityType.ASSET, userIds: [DummyValue.UUID] },
+      { action: DatabaseAction.Create, entityType: EntityType.Asset, userIds: [DummyValue.UUID] },
     ],
   })
   async getAfter(since: Date, options: AuditSearch): Promise<string[]> {
diff --git a/server/src/repositories/config.repository.spec.ts b/server/src/repositories/config.repository.spec.ts
index 238b48bcef..a096c6a4bc 100644
--- a/server/src/repositories/config.repository.spec.ts
+++ b/server/src/repositories/config.repository.spec.ts
@@ -275,14 +275,14 @@ describe('getEnv', () => {
       process.env.IMMICH_TELEMETRY_EXCLUDE = 'job';
       const { telemetry } = getEnv();
       expect(telemetry.metrics).toEqual(
-        new Set([ImmichTelemetry.API, ImmichTelemetry.HOST, ImmichTelemetry.IO, ImmichTelemetry.REPO]),
+        new Set([ImmichTelemetry.Api, ImmichTelemetry.Host, ImmichTelemetry.Io, ImmichTelemetry.Repo]),
       );
     });
 
     it('should run with specific telemetry metrics', () => {
       process.env.IMMICH_TELEMETRY_INCLUDE = 'io, host, api';
       const { telemetry } = getEnv();
-      expect(telemetry.metrics).toEqual(new Set([ImmichTelemetry.API, ImmichTelemetry.HOST, ImmichTelemetry.IO]));
+      expect(telemetry.metrics).toEqual(new Set([ImmichTelemetry.Api, ImmichTelemetry.Host, ImmichTelemetry.Io]));
     });
   });
 });
diff --git a/server/src/repositories/config.repository.ts b/server/src/repositories/config.repository.ts
index dbb57bb141..7038338927 100644
--- a/server/src/repositories/config.repository.ts
+++ b/server/src/repositories/config.repository.ts
@@ -136,7 +136,7 @@ const getEnv = (): EnvData => {
     );
   }
 
-  const includedWorkers = asSet(dto.IMMICH_WORKERS_INCLUDE, [ImmichWorker.API, ImmichWorker.MICROSERVICES]);
+  const includedWorkers = asSet(dto.IMMICH_WORKERS_INCLUDE, [ImmichWorker.Api, ImmichWorker.Microservices]);
   const excludedWorkers = asSet(dto.IMMICH_WORKERS_EXCLUDE, []);
   const workers = [...setDifference(includedWorkers, excludedWorkers)];
   for (const worker of workers) {
@@ -145,8 +145,8 @@ const getEnv = (): EnvData => {
     }
   }
 
-  const environment = dto.IMMICH_ENV || ImmichEnvironment.PRODUCTION;
-  const isProd = environment === ImmichEnvironment.PRODUCTION;
+  const environment = dto.IMMICH_ENV || ImmichEnvironment.Production;
+  const isProd = environment === ImmichEnvironment.Production;
   const buildFolder = dto.IMMICH_BUILD_DATA || '/build';
   const folders = {
     geodata: join(buildFolder, 'geodata'),
@@ -199,15 +199,15 @@ const getEnv = (): EnvData => {
   let vectorExtension: VectorExtension | undefined;
   switch (dto.DB_VECTOR_EXTENSION) {
     case 'pgvector': {
-      vectorExtension = DatabaseExtension.VECTOR;
+      vectorExtension = DatabaseExtension.Vector;
       break;
     }
     case 'pgvecto.rs': {
-      vectorExtension = DatabaseExtension.VECTORS;
+      vectorExtension = DatabaseExtension.Vectors;
       break;
     }
     case 'vectorchord': {
-      vectorExtension = DatabaseExtension.VECTORCHORD;
+      vectorExtension = DatabaseExtension.VectorChord;
       break;
     }
   }
@@ -254,11 +254,11 @@ const getEnv = (): EnvData => {
           mount: true,
           generateId: true,
           setup: (cls, req: Request, res: Response) => {
-            const headerValues = req.headers[ImmichHeader.CID];
+            const headerValues = req.headers[ImmichHeader.Cid];
             const headerValue = Array.isArray(headerValues) ? headerValues[0] : headerValues;
             const cid = headerValue || cls.get(CLS_ID);
             cls.set(CLS_ID, cid);
-            res.header(ImmichHeader.CID, cid);
+            res.header(ImmichHeader.Cid, cid);
           },
         },
       },
@@ -278,9 +278,9 @@ const getEnv = (): EnvData => {
 
     otel: {
       metrics: {
-        hostMetrics: telemetries.has(ImmichTelemetry.HOST),
+        hostMetrics: telemetries.has(ImmichTelemetry.Host),
         apiMetrics: {
-          enable: telemetries.has(ImmichTelemetry.API),
+          enable: telemetries.has(ImmichTelemetry.Api),
           ignoreRoutes: excludePaths,
         },
       },
@@ -335,7 +335,7 @@ export class ConfigRepository {
   }
 
   isDev() {
-    return this.getEnv().environment === ImmichEnvironment.DEVELOPMENT;
+    return this.getEnv().environment === ImmichEnvironment.Development;
   }
 
   getWorker() {
diff --git a/server/src/repositories/database.repository.ts b/server/src/repositories/database.repository.ts
index b1aefe19f8..8b5c728ce4 100644
--- a/server/src/repositories/database.repository.ts
+++ b/server/src/repositories/database.repository.ts
@@ -53,8 +53,8 @@ export async function getVectorExtension(runner: Kysely<DB> | QueryRunner): Prom
 }
 
 export const probes: Record<VectorIndex, number> = {
-  [VectorIndex.CLIP]: 1,
-  [VectorIndex.FACE]: 1,
+  [VectorIndex.Clip]: 1,
+  [VectorIndex.Face]: 1,
 };
 
 @Injectable()
@@ -77,7 +77,7 @@ export class DatabaseRepository {
     return getVectorExtension(this.db);
   }
 
-  @GenerateSql({ params: [[DatabaseExtension.VECTORS]] })
+  @GenerateSql({ params: [[DatabaseExtension.Vectors]] })
   async getExtensionVersions(extensions: readonly DatabaseExtension[]): Promise<ExtensionVersion[]> {
     const { rows } = await sql<ExtensionVersion>`
       SELECT name, default_version as "availableVersion", installed_version as "installedVersion"
@@ -89,13 +89,13 @@ export class DatabaseRepository {
 
   getExtensionVersionRange(extension: VectorExtension): string {
     switch (extension) {
-      case DatabaseExtension.VECTORCHORD: {
+      case DatabaseExtension.VectorChord: {
         return VECTORCHORD_VERSION_RANGE;
       }
-      case DatabaseExtension.VECTORS: {
+      case DatabaseExtension.Vectors: {
         return VECTORS_VERSION_RANGE;
       }
-      case DatabaseExtension.VECTOR: {
+      case DatabaseExtension.Vector: {
         return VECTOR_VERSION_RANGE;
       }
       default: {
@@ -117,7 +117,7 @@ export class DatabaseRepository {
   async createExtension(extension: DatabaseExtension): Promise<void> {
     this.logger.log(`Creating ${EXTENSION_NAMES[extension]} extension`);
     await sql`CREATE EXTENSION IF NOT EXISTS ${sql.raw(extension)} CASCADE`.execute(this.db);
-    if (extension === DatabaseExtension.VECTORCHORD) {
+    if (extension === DatabaseExtension.VectorChord) {
       const dbName = sql.id(await this.getDatabaseName());
       await sql`ALTER DATABASE ${dbName} SET vchordrq.probes = 1`.execute(this.db);
       await sql`SET vchordrq.probes = 1`.execute(this.db);
@@ -147,8 +147,8 @@ export class DatabaseRepository {
     }
 
     await Promise.all([
-      this.db.schema.dropIndex(VectorIndex.CLIP).ifExists().execute(),
-      this.db.schema.dropIndex(VectorIndex.FACE).ifExists().execute(),
+      this.db.schema.dropIndex(VectorIndex.Clip).ifExists().execute(),
+      this.db.schema.dropIndex(VectorIndex.Face).ifExists().execute(),
     ]);
 
     await this.db.transaction().execute(async (tx) => {
@@ -156,14 +156,14 @@ export class DatabaseRepository {
 
       await sql`ALTER EXTENSION ${sql.raw(extension)} UPDATE TO ${sql.lit(targetVersion)}`.execute(tx);
 
-      if (extension === DatabaseExtension.VECTORS && (diff === 'major' || diff === 'minor')) {
+      if (extension === DatabaseExtension.Vectors && (diff === 'major' || diff === 'minor')) {
         await sql`SELECT pgvectors_upgrade()`.execute(tx);
         restartRequired = true;
       }
     });
 
     if (!restartRequired) {
-      await Promise.all([this.reindexVectors(VectorIndex.CLIP), this.reindexVectors(VectorIndex.FACE)]);
+      await Promise.all([this.reindexVectors(VectorIndex.Clip), this.reindexVectors(VectorIndex.Face)]);
     }
 
     return { restartRequired };
@@ -171,7 +171,7 @@ export class DatabaseRepository {
 
   async prewarm(index: VectorIndex): Promise<void> {
     const vectorExtension = await getVectorExtension(this.db);
-    if (vectorExtension !== DatabaseExtension.VECTORCHORD) {
+    if (vectorExtension !== DatabaseExtension.VectorChord) {
       return;
     }
     this.logger.debug(`Prewarming ${index}`);
@@ -196,19 +196,19 @@ export class DatabaseRepository {
       }
 
       switch (vectorExtension) {
-        case DatabaseExtension.VECTOR: {
+        case DatabaseExtension.Vector: {
           if (!row.indexdef.toLowerCase().includes('using hnsw')) {
             promises.push(this.reindexVectors(indexName));
           }
           break;
         }
-        case DatabaseExtension.VECTORS: {
+        case DatabaseExtension.Vectors: {
           if (!row.indexdef.toLowerCase().includes('using vectors')) {
             promises.push(this.reindexVectors(indexName));
           }
           break;
         }
-        case DatabaseExtension.VECTORCHORD: {
+        case DatabaseExtension.VectorChord: {
           const matches = row.indexdef.match(/(?<=lists = \[)\d+/g);
           const lists = matches && matches.length > 0 ? Number(matches[0]) : 1;
           promises.push(
@@ -264,7 +264,7 @@ export class DatabaseRepository {
         await sql`ALTER TABLE ${sql.raw(table)} ADD COLUMN embedding real[] NOT NULL`.execute(tx);
       }
       await sql`ALTER TABLE ${sql.raw(table)} ALTER COLUMN embedding SET DATA TYPE real[]`.execute(tx);
-      const schema = vectorExtension === DatabaseExtension.VECTORS ? 'vectors.' : '';
+      const schema = vectorExtension === DatabaseExtension.Vectors ? 'vectors.' : '';
       await sql`
         ALTER TABLE ${sql.raw(table)}
         ALTER COLUMN embedding
@@ -329,11 +329,11 @@ export class DatabaseRepository {
         .alterColumn('embedding', (col) => col.setDataType(sql.raw(`vector(${dimSize})`)))
         .execute();
       await sql
-        .raw(vectorIndexQuery({ vectorExtension, table: 'smart_search', indexName: VectorIndex.CLIP }))
+        .raw(vectorIndexQuery({ vectorExtension, table: 'smart_search', indexName: VectorIndex.Clip }))
         .execute(trx);
       await trx.schema.alterTable('smart_search').dropConstraint('dim_size_constraint').ifExists().execute();
     });
-    probes[VectorIndex.CLIP] = 1;
+    probes[VectorIndex.Clip] = 1;
 
     await sql`vacuum analyze ${sql.table('smart_search')}`.execute(this.db);
   }
diff --git a/server/src/repositories/download.repository.ts b/server/src/repositories/download.repository.ts
index 5645ca1217..ecc1e4d3ab 100644
--- a/server/src/repositories/download.repository.ts
+++ b/server/src/repositories/download.repository.ts
@@ -34,7 +34,7 @@ export class DownloadRepository {
   downloadUserId(userId: string) {
     return builder(this.db)
       .where('asset.ownerId', '=', userId)
-      .where('asset.visibility', '!=', AssetVisibility.HIDDEN)
+      .where('asset.visibility', '!=', AssetVisibility.Hidden)
       .stream();
   }
 }
diff --git a/server/src/repositories/duplicate.repository.ts b/server/src/repositories/duplicate.repository.ts
index ac9e5798e5..140c42a643 100644
--- a/server/src/repositories/duplicate.repository.ts
+++ b/server/src/repositories/duplicate.repository.ts
@@ -109,14 +109,14 @@ export class DuplicateRepository {
         assetId: DummyValue.UUID,
         embedding: DummyValue.VECTOR,
         maxDistance: 0.6,
-        type: AssetType.IMAGE,
+        type: AssetType.Image,
         userIds: [DummyValue.UUID],
       },
     ],
   })
   search({ assetId, embedding, maxDistance, type, userIds }: DuplicateSearch) {
     return this.db.transaction().execute(async (trx) => {
-      await sql`set local vchordrq.probes = ${sql.lit(probes[VectorIndex.CLIP])}`.execute(trx);
+      await sql`set local vchordrq.probes = ${sql.lit(probes[VectorIndex.Clip])}`.execute(trx);
       return await trx
         .with('cte', (qb) =>
           qb
diff --git a/server/src/repositories/event.repository.ts b/server/src/repositories/event.repository.ts
index 04494d5547..c1b26d5dde 100644
--- a/server/src/repositories/event.repository.ts
+++ b/server/src/repositories/event.repository.ts
@@ -166,7 +166,7 @@ export class EventRepository implements OnGatewayConnection, OnGatewayDisconnect
           continue;
         }
 
-        const event = reflector.get<EventConfig>(MetadataKey.EVENT_CONFIG, handler);
+        const event = reflector.get<EventConfig>(MetadataKey.EventConfig, handler);
         if (!event) {
           continue;
         }
diff --git a/server/src/repositories/job.repository.ts b/server/src/repositories/job.repository.ts
index 27c623cc89..3550529bfc 100644
--- a/server/src/repositories/job.repository.ts
+++ b/server/src/repositories/job.repository.ts
@@ -41,7 +41,7 @@ export class JobRepository {
       const instance = this.moduleRef.get<any>(Service);
       for (const methodName of getMethodNames(instance)) {
         const handler = instance[methodName];
-        const config = reflector.get<JobConfig>(MetadataKey.JOB_CONFIG, handler);
+        const config = reflector.get<JobConfig>(MetadataKey.JobConfig, handler);
         if (!config) {
           continue;
         }
@@ -99,7 +99,7 @@ export class JobRepository {
     const item = this.handlers[name as JobName];
     if (!item) {
       this.logger.warn(`Skipping unknown job: "${name}"`);
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     return item.handler(data);
@@ -205,20 +205,20 @@ export class JobRepository {
 
   private getJobOptions(item: JobItem): JobsOptions | null {
     switch (item.name) {
-      case JobName.NOTIFY_ALBUM_UPDATE: {
+      case JobName.NotifyAlbumUpdate: {
         return {
           jobId: `${item.data.id}/${item.data.recipientId}`,
           delay: item.data?.delay,
         };
       }
-      case JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE: {
+      case JobName.StorageTemplateMigrationSingle: {
         return { jobId: item.data.id };
       }
-      case JobName.GENERATE_PERSON_THUMBNAIL: {
+      case JobName.GeneratePersonThumbnail: {
         return { priority: 1 };
       }
-      case JobName.QUEUE_FACIAL_RECOGNITION: {
-        return { jobId: JobName.QUEUE_FACIAL_RECOGNITION };
+      case JobName.QueueFacialRecognition: {
+        return { jobId: JobName.QueueFacialRecognition };
       }
       default: {
         return null;
diff --git a/server/src/repositories/library.repository.ts b/server/src/repositories/library.repository.ts
index 9f26191cfb..68102ab765 100644
--- a/server/src/repositories/library.repository.ts
+++ b/server/src/repositories/library.repository.ts
@@ -79,7 +79,7 @@ export class LibraryRepository {
         eb.fn
           .countAll<number>()
           .filterWhere((eb) =>
-            eb.and([eb('asset.type', '=', AssetType.IMAGE), eb('asset.visibility', '!=', AssetVisibility.HIDDEN)]),
+            eb.and([eb('asset.type', '=', AssetType.Image), eb('asset.visibility', '!=', AssetVisibility.Hidden)]),
           )
           .as('photos'),
       )
@@ -87,7 +87,7 @@ export class LibraryRepository {
         eb.fn
           .countAll<number>()
           .filterWhere((eb) =>
-            eb.and([eb('asset.type', '=', AssetType.VIDEO), eb('asset.visibility', '!=', AssetVisibility.HIDDEN)]),
+            eb.and([eb('asset.type', '=', AssetType.Video), eb('asset.visibility', '!=', AssetVisibility.Hidden)]),
           )
           .as('videos'),
       )
diff --git a/server/src/repositories/logging.repository.spec.ts b/server/src/repositories/logging.repository.spec.ts
index 393eeb9496..99bb1dbf18 100644
--- a/server/src/repositories/logging.repository.spec.ts
+++ b/server/src/repositories/logging.repository.spec.ts
@@ -22,7 +22,7 @@ describe(LoggingRepository.name, () => {
     describe('formatContext', () => {
       it('should use colors', () => {
         sut = new LoggingRepository(clsMock, configMock);
-        sut.setAppName(ImmichWorker.API);
+        sut.setAppName(ImmichWorker.Api);
 
         const logger = new MyConsoleLogger(clsMock, { color: true });
 
@@ -31,7 +31,7 @@ describe(LoggingRepository.name, () => {
 
       it('should not use colors when color is false', () => {
         sut = new LoggingRepository(clsMock, configMock);
-        sut.setAppName(ImmichWorker.API);
+        sut.setAppName(ImmichWorker.Api);
 
         const logger = new MyConsoleLogger(clsMock, { color: false });
 
diff --git a/server/src/repositories/logging.repository.ts b/server/src/repositories/logging.repository.ts
index 2ac3715a50..1833168f3e 100644
--- a/server/src/repositories/logging.repository.ts
+++ b/server/src/repositories/logging.repository.ts
@@ -8,7 +8,7 @@ import { ConfigRepository } from 'src/repositories/config.repository';
 type LogDetails = any;
 type LogFunction = () => string;
 
-const LOG_LEVELS = [LogLevel.VERBOSE, LogLevel.DEBUG, LogLevel.LOG, LogLevel.WARN, LogLevel.ERROR, LogLevel.FATAL];
+const LOG_LEVELS = [LogLevel.Verbose, LogLevel.Debug, LogLevel.Log, LogLevel.Warn, LogLevel.Error, LogLevel.Fatal];
 
 enum LogColor {
   RED = 31,
@@ -20,7 +20,7 @@ enum LogColor {
 }
 
 let appName: string | undefined;
-let logLevels: LogLevel[] = [LogLevel.LOG, LogLevel.WARN, LogLevel.ERROR, LogLevel.FATAL];
+let logLevels: LogLevel[] = [LogLevel.Log, LogLevel.Warn, LogLevel.Error, LogLevel.Fatal];
 
 export class MyConsoleLogger extends ConsoleLogger {
   private isColorEnabled: boolean;
@@ -106,35 +106,35 @@ export class LoggingRepository {
   }
 
   verbose(message: string, ...details: LogDetails) {
-    this.handleMessage(LogLevel.VERBOSE, message, details);
+    this.handleMessage(LogLevel.Verbose, message, details);
   }
 
   verboseFn(message: LogFunction, ...details: LogDetails) {
-    this.handleFunction(LogLevel.VERBOSE, message, details);
+    this.handleFunction(LogLevel.Verbose, message, details);
   }
 
   debug(message: string, ...details: LogDetails) {
-    this.handleMessage(LogLevel.DEBUG, message, details);
+    this.handleMessage(LogLevel.Debug, message, details);
   }
 
   debugFn(message: LogFunction, ...details: LogDetails) {
-    this.handleFunction(LogLevel.DEBUG, message, details);
+    this.handleFunction(LogLevel.Debug, message, details);
   }
 
   log(message: string, ...details: LogDetails) {
-    this.handleMessage(LogLevel.LOG, message, details);
+    this.handleMessage(LogLevel.Log, message, details);
   }
 
   warn(message: string, ...details: LogDetails) {
-    this.handleMessage(LogLevel.WARN, message, details);
+    this.handleMessage(LogLevel.Warn, message, details);
   }
 
   error(message: string | Error, ...details: LogDetails) {
-    this.handleMessage(LogLevel.ERROR, message, details);
+    this.handleMessage(LogLevel.Error, message, details);
   }
 
   fatal(message: string, ...details: LogDetails) {
-    this.handleMessage(LogLevel.FATAL, message, details);
+    this.handleMessage(LogLevel.Fatal, message, details);
   }
 
   private handleFunction(level: LogLevel, message: LogFunction, details: LogDetails[]) {
@@ -145,32 +145,32 @@ export class LoggingRepository {
 
   private handleMessage(level: LogLevel, message: string | Error, details: LogDetails[]) {
     switch (level) {
-      case LogLevel.VERBOSE: {
+      case LogLevel.Verbose: {
         this.logger.verbose(message, ...details);
         break;
       }
 
-      case LogLevel.DEBUG: {
+      case LogLevel.Debug: {
         this.logger.debug(message, ...details);
         break;
       }
 
-      case LogLevel.LOG: {
+      case LogLevel.Log: {
         this.logger.log(message, ...details);
         break;
       }
 
-      case LogLevel.WARN: {
+      case LogLevel.Warn: {
         this.logger.warn(message, ...details);
         break;
       }
 
-      case LogLevel.ERROR: {
+      case LogLevel.Error: {
         this.logger.error(message, ...details);
         break;
       }
 
-      case LogLevel.FATAL: {
+      case LogLevel.Fatal: {
         this.logger.fatal(message, ...details);
         break;
       }
diff --git a/server/src/repositories/map.repository.ts b/server/src/repositories/map.repository.ts
index 64c8a6229d..d1f60791c3 100644
--- a/server/src/repositories/map.repository.ts
+++ b/server/src/repositories/map.repository.ts
@@ -61,14 +61,14 @@ export class MapRepository {
     const geodataDate = await readFile(resourcePaths.geodata.dateFile, 'utf8');
 
     // TODO move to service init
-    const geocodingMetadata = await this.metadataRepository.get(SystemMetadataKey.REVERSE_GEOCODING_STATE);
+    const geocodingMetadata = await this.metadataRepository.get(SystemMetadataKey.ReverseGeocodingState);
     if (geocodingMetadata?.lastUpdate === geodataDate) {
       return;
     }
 
     await Promise.all([this.importGeodata(), this.importNaturalEarthCountries()]);
 
-    await this.metadataRepository.set(SystemMetadataKey.REVERSE_GEOCODING_STATE, {
+    await this.metadataRepository.set(SystemMetadataKey.ReverseGeocodingState, {
       lastUpdate: geodataDate,
       lastImportFileName: citiesFile,
     });
@@ -102,13 +102,13 @@ export class MapRepository {
       .$if(isArchived === true, (qb) =>
         qb.where((eb) =>
           eb.or([
-            eb('asset.visibility', '=', AssetVisibility.TIMELINE),
-            eb('asset.visibility', '=', AssetVisibility.ARCHIVE),
+            eb('asset.visibility', '=', AssetVisibility.Timeline),
+            eb('asset.visibility', '=', AssetVisibility.Archive),
           ]),
         ),
       )
       .$if(isArchived === false || isArchived === undefined, (qb) =>
-        qb.where('asset.visibility', '=', AssetVisibility.TIMELINE),
+        qb.where('asset.visibility', '=', AssetVisibility.Timeline),
       )
       .$if(isFavorite !== undefined, (q) => q.where('isFavorite', '=', isFavorite!))
       .$if(fileCreatedAfter !== undefined, (q) => q.where('fileCreatedAt', '>=', fileCreatedAfter!))
diff --git a/server/src/repositories/media.repository.ts b/server/src/repositories/media.repository.ts
index 33cf4e3e03..6266acf0ed 100644
--- a/server/src/repositories/media.repository.ts
+++ b/server/src/repositories/media.repository.ts
@@ -55,28 +55,28 @@ export class MediaRepository {
   async extract(input: string): Promise<ExtractResult | null> {
     try {
       const buffer = await exiftool.extractBinaryTagToBuffer('JpgFromRaw2', input);
-      return { buffer, format: RawExtractedFormat.JPEG };
+      return { buffer, format: RawExtractedFormat.Jpeg };
     } catch (error: any) {
       this.logger.debug('Could not extract JpgFromRaw2 buffer from image, trying JPEG from RAW next', error.message);
     }
 
     try {
       const buffer = await exiftool.extractBinaryTagToBuffer('JpgFromRaw', input);
-      return { buffer, format: RawExtractedFormat.JPEG };
+      return { buffer, format: RawExtractedFormat.Jpeg };
     } catch (error: any) {
       this.logger.debug('Could not extract JPEG buffer from image, trying PreviewJXL next', error.message);
     }
 
     try {
       const buffer = await exiftool.extractBinaryTagToBuffer('PreviewJXL', input);
-      return { buffer, format: RawExtractedFormat.JXL };
+      return { buffer, format: RawExtractedFormat.Jxl };
     } catch (error: any) {
       this.logger.debug('Could not extract PreviewJXL buffer from image, trying PreviewImage next', error.message);
     }
 
     try {
       const buffer = await exiftool.extractBinaryTagToBuffer('PreviewImage', input);
-      return { buffer, format: RawExtractedFormat.JPEG };
+      return { buffer, format: RawExtractedFormat.Jpeg };
     } catch (error: any) {
       this.logger.debug('Could not extract preview buffer from image', error.message);
       return null;
@@ -142,7 +142,7 @@ export class MediaRepository {
       limitInputPixels: false,
       raw: options.raw,
     })
-      .pipelineColorspace(options.colorspace === Colorspace.SRGB ? 'srgb' : 'rgb16')
+      .pipelineColorspace(options.colorspace === Colorspace.Srgb ? 'srgb' : 'rgb16')
       .withIccProfile(options.colorspace);
 
     if (!options.raw) {
@@ -267,7 +267,7 @@ export class MediaRepository {
 
     const { frameCount, percentInterval } = options.progress;
     const frameInterval = Math.ceil(frameCount / (100 / percentInterval));
-    if (this.logger.isLevelEnabled(LogLevel.DEBUG) && frameCount && frameInterval) {
+    if (this.logger.isLevelEnabled(LogLevel.Debug) && frameCount && frameInterval) {
       let lastProgressFrame: number = 0;
       ffmpegCall.on('progress', (progress: ProgressEvent) => {
         if (progress.frames - lastProgressFrame < frameInterval) {
diff --git a/server/src/repositories/memory.repository.ts b/server/src/repositories/memory.repository.ts
index 7cf03508be..65b4cb3df7 100644
--- a/server/src/repositories/memory.repository.ts
+++ b/server/src/repositories/memory.repository.ts
@@ -19,7 +19,7 @@ export class MemoryRepository implements IBulkAsset {
       .deleteFrom('memory_asset')
       .using('asset')
       .whereRef('memory_asset.assetsId', '=', 'asset.id')
-      .where('asset.visibility', '!=', AssetVisibility.TIMELINE)
+      .where('asset.visibility', '!=', AssetVisibility.Timeline)
       .execute();
 
     return this.db
@@ -67,7 +67,7 @@ export class MemoryRepository implements IBulkAsset {
             .innerJoin('memory_asset', 'asset.id', 'memory_asset.assetsId')
             .whereRef('memory_asset.memoriesId', '=', 'memory.id')
             .orderBy('asset.fileCreatedAt', 'asc')
-            .where('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
+            .where('asset.visibility', '=', sql.lit(AssetVisibility.Timeline))
             .where('asset.deletedAt', 'is', null),
         ).as('assets'),
       )
@@ -158,7 +158,7 @@ export class MemoryRepository implements IBulkAsset {
             .innerJoin('memory_asset', 'asset.id', 'memory_asset.assetsId')
             .whereRef('memory_asset.memoriesId', '=', 'memory.id')
             .orderBy('asset.fileCreatedAt', 'asc')
-            .where('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
+            .where('asset.visibility', '=', sql.lit(AssetVisibility.Timeline))
             .where('asset.deletedAt', 'is', null),
         ).as('assets'),
       )
diff --git a/server/src/repositories/move.repository.ts b/server/src/repositories/move.repository.ts
index e416a65249..2ea69eba27 100644
--- a/server/src/repositories/move.repository.ts
+++ b/server/src/repositories/move.repository.ts
@@ -48,7 +48,7 @@ export class MoveRepository {
           eb.selectFrom('asset').select('id').whereRef('asset.id', '=', 'move_history.entityId'),
         ),
       )
-      .where('move_history.pathType', '=', sql.lit(AssetPathType.ORIGINAL))
+      .where('move_history.pathType', '=', sql.lit(AssetPathType.Original))
       .execute();
   }
 
@@ -56,7 +56,7 @@ export class MoveRepository {
   async cleanMoveHistorySingle(assetId: string): Promise<void> {
     await this.db
       .deleteFrom('move_history')
-      .where('move_history.pathType', '=', sql.lit(AssetPathType.ORIGINAL))
+      .where('move_history.pathType', '=', sql.lit(AssetPathType.Original))
       .where('entityId', '=', assetId)
       .execute();
   }
diff --git a/server/src/repositories/oauth.repository.ts b/server/src/repositories/oauth.repository.ts
index 357b52a77a..9a436e4b9a 100644
--- a/server/src/repositories/oauth.repository.ts
+++ b/server/src/repositories/oauth.repository.ts
@@ -138,11 +138,11 @@ export class OAuthRepository {
     }
 
     switch (tokenEndpointAuthMethod) {
-      case OAuthTokenEndpointAuthMethod.CLIENT_SECRET_POST: {
+      case OAuthTokenEndpointAuthMethod.ClientSecretPost: {
         return ClientSecretPost(clientSecret);
       }
 
-      case OAuthTokenEndpointAuthMethod.CLIENT_SECRET_BASIC: {
+      case OAuthTokenEndpointAuthMethod.ClientSecretBasic: {
         return ClientSecretBasic(clientSecret);
       }
 
diff --git a/server/src/repositories/person.repository.ts b/server/src/repositories/person.repository.ts
index 1885a196ff..5b7d1d3700 100644
--- a/server/src/repositories/person.repository.ts
+++ b/server/src/repositories/person.repository.ts
@@ -151,7 +151,7 @@ export class PersonRepository {
       .innerJoin('asset', (join) =>
         join
           .onRef('asset_face.assetId', '=', 'asset.id')
-          .on('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
+          .on('asset.visibility', '=', sql.lit(AssetVisibility.Timeline))
           .on('asset.deletedAt', 'is', null),
       )
       .where('person.ownerId', '=', userId)
@@ -276,7 +276,7 @@ export class PersonRepository {
           .selectFrom('asset_file')
           .select('asset_file.path')
           .whereRef('asset_file.assetId', '=', 'asset.id')
-          .where('asset_file.type', '=', sql.lit(AssetFileType.PREVIEW))
+          .where('asset_file.type', '=', sql.lit(AssetFileType.Preview))
           .as('previewPath'),
       )
       .where('person.id', '=', id)
@@ -341,7 +341,7 @@ export class PersonRepository {
         join
           .onRef('asset.id', '=', 'asset_face.assetId')
           .on('asset_face.personId', '=', personId)
-          .on('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
+          .on('asset.visibility', '=', sql.lit(AssetVisibility.Timeline))
           .on('asset.deletedAt', 'is', null),
       )
       .select((eb) => eb.fn.count(eb.fn('distinct', ['asset.id'])).as('count'))
@@ -369,7 +369,7 @@ export class PersonRepository {
                 eb
                   .selectFrom('asset')
                   .whereRef('asset.id', '=', 'asset_face.assetId')
-                  .where('asset.visibility', '=', sql.lit(AssetVisibility.TIMELINE))
+                  .where('asset.visibility', '=', sql.lit(AssetVisibility.Timeline))
                   .where('asset.deletedAt', 'is', null),
               ),
             ),
diff --git a/server/src/repositories/search.repository.ts b/server/src/repositories/search.repository.ts
index fe8ad563bb..61e0cc1e29 100644
--- a/server/src/repositories/search.repository.ts
+++ b/server/src/repositories/search.repository.ts
@@ -256,7 +256,7 @@ export class SearchRepository {
     }
 
     return this.db.transaction().execute(async (trx) => {
-      await sql`set local vchordrq.probes = ${sql.lit(probes[VectorIndex.CLIP])}`.execute(trx);
+      await sql`set local vchordrq.probes = ${sql.lit(probes[VectorIndex.Clip])}`.execute(trx);
       const items = await searchAssetBuilder(trx, options)
         .selectAll('asset')
         .innerJoin('smart_search', 'asset.id', 'smart_search.assetId')
@@ -284,7 +284,7 @@ export class SearchRepository {
     }
 
     return this.db.transaction().execute(async (trx) => {
-      await sql`set local vchordrq.probes = ${sql.lit(probes[VectorIndex.FACE])}`.execute(trx);
+      await sql`set local vchordrq.probes = ${sql.lit(probes[VectorIndex.Face])}`.execute(trx);
       return await trx
         .with('cte', (qb) =>
           qb
@@ -351,8 +351,8 @@ export class SearchRepository {
           .select(['city', 'assetId'])
           .innerJoin('asset', 'asset.id', 'asset_exif.assetId')
           .where('asset.ownerId', '=', anyUuid(userIds))
-          .where('asset.visibility', '=', AssetVisibility.TIMELINE)
-          .where('asset.type', '=', AssetType.IMAGE)
+          .where('asset.visibility', '=', AssetVisibility.Timeline)
+          .where('asset.type', '=', AssetType.Image)
           .where('asset.deletedAt', 'is', null)
           .orderBy('city')
           .limit(1);
@@ -367,8 +367,8 @@ export class SearchRepository {
                 .select(['city', 'assetId'])
                 .innerJoin('asset', 'asset.id', 'asset_exif.assetId')
                 .where('asset.ownerId', '=', anyUuid(userIds))
-                .where('asset.visibility', '=', AssetVisibility.TIMELINE)
-                .where('asset.type', '=', AssetType.IMAGE)
+                .where('asset.visibility', '=', AssetVisibility.Timeline)
+                .where('asset.type', '=', AssetType.Image)
                 .where('asset.deletedAt', 'is', null)
                 .whereRef('asset_exif.city', '>', 'cte.city')
                 .orderBy('city')
@@ -450,7 +450,7 @@ export class SearchRepository {
       .distinctOn(field)
       .innerJoin('asset', 'asset.id', 'asset_exif.assetId')
       .where('ownerId', '=', anyUuid(userIds))
-      .where('visibility', '=', AssetVisibility.TIMELINE)
+      .where('visibility', '=', AssetVisibility.Timeline)
       .where('deletedAt', 'is', null)
       .where(field, 'is not', null);
   }
diff --git a/server/src/repositories/shared-link.repository.ts b/server/src/repositories/shared-link.repository.ts
index d61333fcd6..d5fb3be47d 100644
--- a/server/src/repositories/shared-link.repository.ts
+++ b/server/src/repositories/shared-link.repository.ts
@@ -103,7 +103,7 @@ export class SharedLinkRepository {
       .select((eb) => eb.fn.toJson('album').$castTo<Album | null>().as('album'))
       .where('shared_link.id', '=', id)
       .where('shared_link.userId', '=', userId)
-      .where((eb) => eb.or([eb('shared_link.type', '=', SharedLinkType.INDIVIDUAL), eb('album.id', 'is not', null)]))
+      .where((eb) => eb.or([eb('shared_link.type', '=', SharedLinkType.Individual), eb('album.id', 'is not', null)]))
       .orderBy('shared_link.createdAt', 'desc')
       .executeTakeFirst();
   }
@@ -165,7 +165,7 @@ export class SharedLinkRepository {
         (join) => join.onTrue(),
       )
       .select((eb) => eb.fn.toJson('album').$castTo<Album | null>().as('album'))
-      .where((eb) => eb.or([eb('shared_link.type', '=', SharedLinkType.INDIVIDUAL), eb('album.id', 'is not', null)]))
+      .where((eb) => eb.or([eb('shared_link.type', '=', SharedLinkType.Individual), eb('album.id', 'is not', null)]))
       .$if(!!albumId, (eb) => eb.where('shared_link.albumId', '=', albumId!))
       .orderBy('shared_link.createdAt', 'desc')
       .distinctOn(['shared_link.createdAt'])
@@ -185,7 +185,7 @@ export class SharedLinkRepository {
           eb.selectFrom('user').select(columns.authUser).whereRef('user.id', '=', 'shared_link.userId'),
         ).as('user'),
       ])
-      .where((eb) => eb.or([eb('shared_link.type', '=', SharedLinkType.INDIVIDUAL), eb('album.id', 'is not', null)]))
+      .where((eb) => eb.or([eb('shared_link.type', '=', SharedLinkType.Individual), eb('album.id', 'is not', null)]))
       .executeTakeFirst();
   }
 
diff --git a/server/src/repositories/telemetry.repository.ts b/server/src/repositories/telemetry.repository.ts
index fc680ddcc5..5fbbb76cf7 100644
--- a/server/src/repositories/telemetry.repository.ts
+++ b/server/src/repositories/telemetry.repository.ts
@@ -112,21 +112,21 @@ export class TelemetryRepository {
     const { telemetry } = this.configRepository.getEnv();
     const { metrics } = telemetry;
 
-    this.api = new MetricGroupRepository(metricService).configure({ enabled: metrics.has(ImmichTelemetry.API) });
-    this.host = new MetricGroupRepository(metricService).configure({ enabled: metrics.has(ImmichTelemetry.HOST) });
-    this.jobs = new MetricGroupRepository(metricService).configure({ enabled: metrics.has(ImmichTelemetry.JOB) });
-    this.repo = new MetricGroupRepository(metricService).configure({ enabled: metrics.has(ImmichTelemetry.REPO) });
+    this.api = new MetricGroupRepository(metricService).configure({ enabled: metrics.has(ImmichTelemetry.Api) });
+    this.host = new MetricGroupRepository(metricService).configure({ enabled: metrics.has(ImmichTelemetry.Host) });
+    this.jobs = new MetricGroupRepository(metricService).configure({ enabled: metrics.has(ImmichTelemetry.Job) });
+    this.repo = new MetricGroupRepository(metricService).configure({ enabled: metrics.has(ImmichTelemetry.Repo) });
   }
 
   setup({ repositories }: { repositories: ClassConstructor<unknown>[] }) {
     const { telemetry } = this.configRepository.getEnv();
     const { metrics } = telemetry;
-    if (!metrics.has(ImmichTelemetry.REPO)) {
+    if (!metrics.has(ImmichTelemetry.Repo)) {
       return;
     }
 
     for (const Repository of repositories) {
-      const isEnabled = this.reflect.get(MetadataKey.TELEMETRY_ENABLED, Repository) ?? true;
+      const isEnabled = this.reflect.get(MetadataKey.TelemetryEnabled, Repository) ?? true;
       if (!isEnabled) {
         this.logger.debug(`Telemetry disabled for ${Repository.name}`);
         continue;
diff --git a/server/src/repositories/trash.repository.ts b/server/src/repositories/trash.repository.ts
index ee6fe3ace1..f6f13188d4 100644
--- a/server/src/repositories/trash.repository.ts
+++ b/server/src/repositories/trash.repository.ts
@@ -8,7 +8,7 @@ export class TrashRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
   getDeletedIds(): AsyncIterableIterator<{ id: string }> {
-    return this.db.selectFrom('asset').select(['id']).where('status', '=', AssetStatus.DELETED).stream();
+    return this.db.selectFrom('asset').select(['id']).where('status', '=', AssetStatus.Deleted).stream();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
@@ -16,8 +16,8 @@ export class TrashRepository {
     const { numUpdatedRows } = await this.db
       .updateTable('asset')
       .where('ownerId', '=', userId)
-      .where('status', '=', AssetStatus.TRASHED)
-      .set({ status: AssetStatus.ACTIVE, deletedAt: null })
+      .where('status', '=', AssetStatus.Trashed)
+      .set({ status: AssetStatus.Active, deletedAt: null })
       .executeTakeFirst();
 
     return Number(numUpdatedRows);
@@ -28,8 +28,8 @@ export class TrashRepository {
     const { numUpdatedRows } = await this.db
       .updateTable('asset')
       .where('ownerId', '=', userId)
-      .where('status', '=', AssetStatus.TRASHED)
-      .set({ status: AssetStatus.DELETED })
+      .where('status', '=', AssetStatus.Trashed)
+      .set({ status: AssetStatus.Deleted })
       .executeTakeFirst();
 
     return Number(numUpdatedRows);
@@ -43,9 +43,9 @@ export class TrashRepository {
 
     const { numUpdatedRows } = await this.db
       .updateTable('asset')
-      .where('status', '=', AssetStatus.TRASHED)
+      .where('status', '=', AssetStatus.Trashed)
       .where('id', 'in', ids)
-      .set({ status: AssetStatus.ACTIVE, deletedAt: null })
+      .set({ status: AssetStatus.Active, deletedAt: null })
       .executeTakeFirst();
 
     return Number(numUpdatedRows);
diff --git a/server/src/repositories/user.repository.ts b/server/src/repositories/user.repository.ts
index f809280d86..715aa2dc32 100644
--- a/server/src/repositories/user.repository.ts
+++ b/server/src/repositories/user.repository.ts
@@ -187,7 +187,7 @@ export class UserRepository {
   restore(id: string) {
     return this.db
       .updateTable('user')
-      .set({ status: UserStatus.ACTIVE, deletedAt: null })
+      .set({ status: UserStatus.Active, deletedAt: null })
       .where('user.id', '=', asUuid(id))
       .returning(columns.userAdmin)
       .returning(withMetadata)
@@ -229,8 +229,8 @@ export class UserRepository {
           .countAll<number>()
           .filterWhere((eb) =>
             eb.and([
-              eb('asset.type', '=', sql.lit(AssetType.IMAGE)),
-              eb('asset.visibility', '!=', sql.lit(AssetVisibility.HIDDEN)),
+              eb('asset.type', '=', sql.lit(AssetType.Image)),
+              eb('asset.visibility', '!=', sql.lit(AssetVisibility.Hidden)),
             ]),
           )
           .as('photos'),
@@ -238,8 +238,8 @@ export class UserRepository {
           .countAll<number>()
           .filterWhere((eb) =>
             eb.and([
-              eb('asset.type', '=', sql.lit(AssetType.VIDEO)),
-              eb('asset.visibility', '!=', sql.lit(AssetVisibility.HIDDEN)),
+              eb('asset.type', '=', sql.lit(AssetType.Video)),
+              eb('asset.visibility', '!=', sql.lit(AssetVisibility.Hidden)),
             ]),
           )
           .as('videos'),
@@ -254,7 +254,7 @@ export class UserRepository {
             eb.fn
               .sum<number>('asset_exif.fileSizeInByte')
               .filterWhere((eb) =>
-                eb.and([eb('asset.libraryId', 'is', null), eb('asset.type', '=', sql.lit(AssetType.IMAGE))]),
+                eb.and([eb('asset.libraryId', 'is', null), eb('asset.type', '=', sql.lit(AssetType.Image))]),
               ),
             eb.lit(0),
           )
@@ -264,7 +264,7 @@ export class UserRepository {
             eb.fn
               .sum<number>('asset_exif.fileSizeInByte')
               .filterWhere((eb) =>
-                eb.and([eb('asset.libraryId', 'is', null), eb('asset.type', '=', sql.lit(AssetType.VIDEO))]),
+                eb.and([eb('asset.libraryId', 'is', null), eb('asset.type', '=', sql.lit(AssetType.Video))]),
               ),
             eb.lit(0),
           )
diff --git a/server/src/repositories/view-repository.ts b/server/src/repositories/view-repository.ts
index 0fd74d299f..93c1280191 100644
--- a/server/src/repositories/view-repository.ts
+++ b/server/src/repositories/view-repository.ts
@@ -15,7 +15,7 @@ export class ViewRepository {
       .select((eb) => eb.fn<string>('substring', ['asset.originalPath', eb.val('^(.*/)[^/]*$')]).as('directoryPath'))
       .distinct()
       .where('ownerId', '=', asUuid(userId))
-      .where('visibility', '=', AssetVisibility.TIMELINE)
+      .where('visibility', '=', AssetVisibility.Timeline)
       .where('deletedAt', 'is', null)
       .where('fileCreatedAt', 'is not', null)
       .where('fileModifiedAt', 'is not', null)
@@ -34,7 +34,7 @@ export class ViewRepository {
       .selectAll('asset')
       .$call(withExif)
       .where('ownerId', '=', asUuid(userId))
-      .where('visibility', '=', AssetVisibility.TIMELINE)
+      .where('visibility', '=', AssetVisibility.Timeline)
       .where('deletedAt', 'is', null)
       .where('fileCreatedAt', 'is not', null)
       .where('fileModifiedAt', 'is not', null)
diff --git a/server/src/schema/migrations/1744910873969-InitialMigration.ts b/server/src/schema/migrations/1744910873969-InitialMigration.ts
index 63625a69ad..53a55d860e 100644
--- a/server/src/schema/migrations/1744910873969-InitialMigration.ts
+++ b/server/src/schema/migrations/1744910873969-InitialMigration.ts
@@ -16,9 +16,7 @@ export async function up(db: Kysely<any>): Promise<void> {
       rows: [lastMigration],
     } = await lastMigrationSql.execute(db);
     if (lastMigration?.name !== 'AddMissingIndex1744910873956') {
-      throw new Error(
-        'Invalid upgrade path. For more information, see https://immich.app/errors#typeorm-upgrade',
-      );
+      throw new Error('Invalid upgrade path. For more information, see https://immich.app/errors#typeorm-upgrade');
     }
     logger.log('Database has up to date TypeORM migrations, skipping initial Kysely migration');
     return;
@@ -108,152 +106,344 @@ export async function up(db: Kysely<any>): Promise<void> {
       RETURN NULL;
     END;
   $$;`.execute(db);
-  if (vectorExtension === DatabaseExtension.VECTORS) {
+  if (vectorExtension === DatabaseExtension.Vectors) {
     await sql`SET search_path TO "$user", public, vectors`.execute(db);
   }
   await sql`CREATE TYPE "assets_status_enum" AS ENUM ('active','trashed','deleted');`.execute(db);
   await sql`CREATE TYPE "sourcetype" AS ENUM ('machine-learning','exif','manual');`.execute(db);
-  await sql`CREATE TABLE "users" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "email" character varying NOT NULL, "password" character varying NOT NULL DEFAULT '', "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "profileImagePath" character varying NOT NULL DEFAULT '', "isAdmin" boolean NOT NULL DEFAULT false, "shouldChangePassword" boolean NOT NULL DEFAULT true, "deletedAt" timestamp with time zone, "oauthId" character varying NOT NULL DEFAULT '', "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "storageLabel" character varying, "name" character varying NOT NULL DEFAULT '', "quotaSizeInBytes" bigint, "quotaUsageInBytes" bigint NOT NULL DEFAULT 0, "status" character varying NOT NULL DEFAULT 'active', "profileChangedAt" timestamp with time zone NOT NULL DEFAULT now(), "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
-  await sql`CREATE TABLE "libraries" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "name" character varying NOT NULL, "ownerId" uuid NOT NULL, "importPaths" text[] NOT NULL, "exclusionPatterns" text[] NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "deletedAt" timestamp with time zone, "refreshedAt" timestamp with time zone, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
-  await sql`CREATE TABLE "asset_stack" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "primaryAssetId" uuid NOT NULL, "ownerId" uuid NOT NULL);`.execute(db);
-  await sql`CREATE TABLE "assets" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "deviceAssetId" character varying NOT NULL, "ownerId" uuid NOT NULL, "deviceId" character varying NOT NULL, "type" character varying NOT NULL, "originalPath" character varying NOT NULL, "fileCreatedAt" timestamp with time zone NOT NULL, "fileModifiedAt" timestamp with time zone NOT NULL, "isFavorite" boolean NOT NULL DEFAULT false, "duration" character varying, "encodedVideoPath" character varying DEFAULT '', "checksum" bytea NOT NULL, "isVisible" boolean NOT NULL DEFAULT true, "livePhotoVideoId" uuid, "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "isArchived" boolean NOT NULL DEFAULT false, "originalFileName" character varying NOT NULL, "sidecarPath" character varying, "thumbhash" bytea, "isOffline" boolean NOT NULL DEFAULT false, "libraryId" uuid, "isExternal" boolean NOT NULL DEFAULT false, "deletedAt" timestamp with time zone, "localDateTime" timestamp with time zone NOT NULL, "stackId" uuid, "duplicateId" uuid, "status" assets_status_enum NOT NULL DEFAULT 'active', "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
-  await sql`CREATE TABLE "albums" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "ownerId" uuid NOT NULL, "albumName" character varying NOT NULL DEFAULT 'Untitled Album', "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "albumThumbnailAssetId" uuid, "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "description" text NOT NULL DEFAULT '', "deletedAt" timestamp with time zone, "isActivityEnabled" boolean NOT NULL DEFAULT true, "order" character varying NOT NULL DEFAULT 'desc', "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
+  await sql`CREATE TABLE "users" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "email" character varying NOT NULL, "password" character varying NOT NULL DEFAULT '', "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "profileImagePath" character varying NOT NULL DEFAULT '', "isAdmin" boolean NOT NULL DEFAULT false, "shouldChangePassword" boolean NOT NULL DEFAULT true, "deletedAt" timestamp with time zone, "oauthId" character varying NOT NULL DEFAULT '', "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "storageLabel" character varying, "name" character varying NOT NULL DEFAULT '', "quotaSizeInBytes" bigint, "quotaUsageInBytes" bigint NOT NULL DEFAULT 0, "status" character varying NOT NULL DEFAULT 'active', "profileChangedAt" timestamp with time zone NOT NULL DEFAULT now(), "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "libraries" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "name" character varying NOT NULL, "ownerId" uuid NOT NULL, "importPaths" text[] NOT NULL, "exclusionPatterns" text[] NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "deletedAt" timestamp with time zone, "refreshedAt" timestamp with time zone, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "asset_stack" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "primaryAssetId" uuid NOT NULL, "ownerId" uuid NOT NULL);`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "assets" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "deviceAssetId" character varying NOT NULL, "ownerId" uuid NOT NULL, "deviceId" character varying NOT NULL, "type" character varying NOT NULL, "originalPath" character varying NOT NULL, "fileCreatedAt" timestamp with time zone NOT NULL, "fileModifiedAt" timestamp with time zone NOT NULL, "isFavorite" boolean NOT NULL DEFAULT false, "duration" character varying, "encodedVideoPath" character varying DEFAULT '', "checksum" bytea NOT NULL, "isVisible" boolean NOT NULL DEFAULT true, "livePhotoVideoId" uuid, "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "isArchived" boolean NOT NULL DEFAULT false, "originalFileName" character varying NOT NULL, "sidecarPath" character varying, "thumbhash" bytea, "isOffline" boolean NOT NULL DEFAULT false, "libraryId" uuid, "isExternal" boolean NOT NULL DEFAULT false, "deletedAt" timestamp with time zone, "localDateTime" timestamp with time zone NOT NULL, "stackId" uuid, "duplicateId" uuid, "status" assets_status_enum NOT NULL DEFAULT 'active', "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "albums" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "ownerId" uuid NOT NULL, "albumName" character varying NOT NULL DEFAULT 'Untitled Album', "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "albumThumbnailAssetId" uuid, "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "description" text NOT NULL DEFAULT '', "deletedAt" timestamp with time zone, "isActivityEnabled" boolean NOT NULL DEFAULT true, "order" character varying NOT NULL DEFAULT 'desc', "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
   await sql`COMMENT ON COLUMN "albums"."albumThumbnailAssetId" IS 'Asset ID to be used as thumbnail';`.execute(db);
-  await sql`CREATE TABLE "activity" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "albumId" uuid NOT NULL, "userId" uuid NOT NULL, "assetId" uuid, "comment" text, "isLiked" boolean NOT NULL DEFAULT false, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
-  await sql`CREATE TABLE "albums_assets_assets" ("albumsId" uuid NOT NULL, "assetsId" uuid NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now());`.execute(db);
-  await sql`CREATE TABLE "albums_shared_users_users" ("albumsId" uuid NOT NULL, "usersId" uuid NOT NULL, "role" character varying NOT NULL DEFAULT 'editor');`.execute(db);
-  await sql`CREATE TABLE "api_keys" ("name" character varying NOT NULL, "key" character varying NOT NULL, "userId" uuid NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "id" uuid NOT NULL DEFAULT uuid_generate_v4(), "permissions" character varying[] NOT NULL, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
-  await sql`CREATE TABLE "assets_audit" ("id" uuid NOT NULL DEFAULT immich_uuid_v7(), "assetId" uuid NOT NULL, "ownerId" uuid NOT NULL, "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp());`.execute(db);
-  await sql`CREATE TABLE "person" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "ownerId" uuid NOT NULL, "name" character varying NOT NULL DEFAULT '', "thumbnailPath" character varying NOT NULL DEFAULT '', "isHidden" boolean NOT NULL DEFAULT false, "birthDate" date, "faceAssetId" uuid, "isFavorite" boolean NOT NULL DEFAULT false, "color" character varying, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
-  await sql`CREATE TABLE "asset_faces" ("assetId" uuid NOT NULL, "personId" uuid, "imageWidth" integer NOT NULL DEFAULT 0, "imageHeight" integer NOT NULL DEFAULT 0, "boundingBoxX1" integer NOT NULL DEFAULT 0, "boundingBoxY1" integer NOT NULL DEFAULT 0, "boundingBoxX2" integer NOT NULL DEFAULT 0, "boundingBoxY2" integer NOT NULL DEFAULT 0, "id" uuid NOT NULL DEFAULT uuid_generate_v4(), "sourceType" sourcetype NOT NULL DEFAULT 'machine-learning', "deletedAt" timestamp with time zone);`.execute(db);
-  await sql`CREATE TABLE "asset_files" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "assetId" uuid NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "type" character varying NOT NULL, "path" character varying NOT NULL, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
-  await sql`CREATE TABLE "asset_job_status" ("assetId" uuid NOT NULL, "facesRecognizedAt" timestamp with time zone, "metadataExtractedAt" timestamp with time zone, "duplicatesDetectedAt" timestamp with time zone, "previewAt" timestamp with time zone, "thumbnailAt" timestamp with time zone);`.execute(db);
-  await sql`CREATE TABLE "audit" ("id" serial NOT NULL, "entityType" character varying NOT NULL, "entityId" uuid NOT NULL, "action" character varying NOT NULL, "ownerId" uuid NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now());`.execute(db);
-  await sql`CREATE TABLE "exif" ("assetId" uuid NOT NULL, "make" character varying, "model" character varying, "exifImageWidth" integer, "exifImageHeight" integer, "fileSizeInByte" bigint, "orientation" character varying, "dateTimeOriginal" timestamp with time zone, "modifyDate" timestamp with time zone, "lensModel" character varying, "fNumber" double precision, "focalLength" double precision, "iso" integer, "latitude" double precision, "longitude" double precision, "city" character varying, "state" character varying, "country" character varying, "description" text NOT NULL DEFAULT '', "fps" double precision, "exposureTime" character varying, "livePhotoCID" character varying, "timeZone" character varying, "projectionType" character varying, "profileDescription" character varying, "colorspace" character varying, "bitsPerSample" integer, "autoStackId" character varying, "rating" integer, "updatedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp(), "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
+  await sql`CREATE TABLE "activity" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "albumId" uuid NOT NULL, "userId" uuid NOT NULL, "assetId" uuid, "comment" text, "isLiked" boolean NOT NULL DEFAULT false, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "albums_assets_assets" ("albumsId" uuid NOT NULL, "assetsId" uuid NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "albums_shared_users_users" ("albumsId" uuid NOT NULL, "usersId" uuid NOT NULL, "role" character varying NOT NULL DEFAULT 'editor');`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "api_keys" ("name" character varying NOT NULL, "key" character varying NOT NULL, "userId" uuid NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "id" uuid NOT NULL DEFAULT uuid_generate_v4(), "permissions" character varying[] NOT NULL, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "assets_audit" ("id" uuid NOT NULL DEFAULT immich_uuid_v7(), "assetId" uuid NOT NULL, "ownerId" uuid NOT NULL, "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "person" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "ownerId" uuid NOT NULL, "name" character varying NOT NULL DEFAULT '', "thumbnailPath" character varying NOT NULL DEFAULT '', "isHidden" boolean NOT NULL DEFAULT false, "birthDate" date, "faceAssetId" uuid, "isFavorite" boolean NOT NULL DEFAULT false, "color" character varying, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "asset_faces" ("assetId" uuid NOT NULL, "personId" uuid, "imageWidth" integer NOT NULL DEFAULT 0, "imageHeight" integer NOT NULL DEFAULT 0, "boundingBoxX1" integer NOT NULL DEFAULT 0, "boundingBoxY1" integer NOT NULL DEFAULT 0, "boundingBoxX2" integer NOT NULL DEFAULT 0, "boundingBoxY2" integer NOT NULL DEFAULT 0, "id" uuid NOT NULL DEFAULT uuid_generate_v4(), "sourceType" sourcetype NOT NULL DEFAULT 'machine-learning', "deletedAt" timestamp with time zone);`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "asset_files" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "assetId" uuid NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "type" character varying NOT NULL, "path" character varying NOT NULL, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "asset_job_status" ("assetId" uuid NOT NULL, "facesRecognizedAt" timestamp with time zone, "metadataExtractedAt" timestamp with time zone, "duplicatesDetectedAt" timestamp with time zone, "previewAt" timestamp with time zone, "thumbnailAt" timestamp with time zone);`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "audit" ("id" serial NOT NULL, "entityType" character varying NOT NULL, "entityId" uuid NOT NULL, "action" character varying NOT NULL, "ownerId" uuid NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "exif" ("assetId" uuid NOT NULL, "make" character varying, "model" character varying, "exifImageWidth" integer, "exifImageHeight" integer, "fileSizeInByte" bigint, "orientation" character varying, "dateTimeOriginal" timestamp with time zone, "modifyDate" timestamp with time zone, "lensModel" character varying, "fNumber" double precision, "focalLength" double precision, "iso" integer, "latitude" double precision, "longitude" double precision, "city" character varying, "state" character varying, "country" character varying, "description" text NOT NULL DEFAULT '', "fps" double precision, "exposureTime" character varying, "livePhotoCID" character varying, "timeZone" character varying, "projectionType" character varying, "profileDescription" character varying, "colorspace" character varying, "bitsPerSample" integer, "autoStackId" character varying, "rating" integer, "updatedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp(), "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
   await sql`CREATE TABLE "face_search" ("faceId" uuid NOT NULL, "embedding" vector(512) NOT NULL);`.execute(db);
-  await sql`CREATE TABLE "geodata_places" ("id" integer NOT NULL, "name" character varying(200) NOT NULL, "longitude" double precision NOT NULL, "latitude" double precision NOT NULL, "countryCode" character(2) NOT NULL, "admin1Code" character varying(20), "admin2Code" character varying(80), "modificationDate" date NOT NULL, "admin1Name" character varying, "admin2Name" character varying, "alternateNames" character varying);`.execute(db);
-  await sql`CREATE TABLE "memories" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "deletedAt" timestamp with time zone, "ownerId" uuid NOT NULL, "type" character varying NOT NULL, "data" jsonb NOT NULL, "isSaved" boolean NOT NULL DEFAULT false, "memoryAt" timestamp with time zone NOT NULL, "seenAt" timestamp with time zone, "showAt" timestamp with time zone, "hideAt" timestamp with time zone, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
+  await sql`CREATE TABLE "geodata_places" ("id" integer NOT NULL, "name" character varying(200) NOT NULL, "longitude" double precision NOT NULL, "latitude" double precision NOT NULL, "countryCode" character(2) NOT NULL, "admin1Code" character varying(20), "admin2Code" character varying(80), "modificationDate" date NOT NULL, "admin1Name" character varying, "admin2Name" character varying, "alternateNames" character varying);`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "memories" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "deletedAt" timestamp with time zone, "ownerId" uuid NOT NULL, "type" character varying NOT NULL, "data" jsonb NOT NULL, "isSaved" boolean NOT NULL DEFAULT false, "memoryAt" timestamp with time zone NOT NULL, "seenAt" timestamp with time zone, "showAt" timestamp with time zone, "hideAt" timestamp with time zone, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
   await sql`CREATE TABLE "memories_assets_assets" ("memoriesId" uuid NOT NULL, "assetsId" uuid NOT NULL);`.execute(db);
-  await sql`CREATE TABLE "move_history" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "entityId" uuid NOT NULL, "pathType" character varying NOT NULL, "oldPath" character varying NOT NULL, "newPath" character varying NOT NULL);`.execute(db);
-  await sql`CREATE TABLE "naturalearth_countries" ("id" integer NOT NULL GENERATED ALWAYS AS IDENTITY, "admin" character varying(50) NOT NULL, "admin_a3" character varying(3) NOT NULL, "type" character varying(50) NOT NULL, "coordinates" polygon NOT NULL);`.execute(db);
-  await sql`CREATE TABLE "partners_audit" ("id" uuid NOT NULL DEFAULT immich_uuid_v7(), "sharedById" uuid NOT NULL, "sharedWithId" uuid NOT NULL, "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp());`.execute(db);
-  await sql`CREATE TABLE "partners" ("sharedById" uuid NOT NULL, "sharedWithId" uuid NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "inTimeline" boolean NOT NULL DEFAULT false, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
-  await sql`CREATE TABLE "sessions" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "token" character varying NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "userId" uuid NOT NULL, "deviceType" character varying NOT NULL DEFAULT '', "deviceOS" character varying NOT NULL DEFAULT '', "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
-  await sql`CREATE TABLE "shared_links" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "description" character varying, "userId" uuid NOT NULL, "key" bytea NOT NULL, "type" character varying NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "expiresAt" timestamp with time zone, "allowUpload" boolean NOT NULL DEFAULT false, "albumId" uuid, "allowDownload" boolean NOT NULL DEFAULT true, "showExif" boolean NOT NULL DEFAULT true, "password" character varying);`.execute(db);
+  await sql`CREATE TABLE "move_history" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "entityId" uuid NOT NULL, "pathType" character varying NOT NULL, "oldPath" character varying NOT NULL, "newPath" character varying NOT NULL);`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "naturalearth_countries" ("id" integer NOT NULL GENERATED ALWAYS AS IDENTITY, "admin" character varying(50) NOT NULL, "admin_a3" character varying(3) NOT NULL, "type" character varying(50) NOT NULL, "coordinates" polygon NOT NULL);`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "partners_audit" ("id" uuid NOT NULL DEFAULT immich_uuid_v7(), "sharedById" uuid NOT NULL, "sharedWithId" uuid NOT NULL, "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "partners" ("sharedById" uuid NOT NULL, "sharedWithId" uuid NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "inTimeline" boolean NOT NULL DEFAULT false, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "sessions" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "token" character varying NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "userId" uuid NOT NULL, "deviceType" character varying NOT NULL DEFAULT '', "deviceOS" character varying NOT NULL DEFAULT '', "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "shared_links" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "description" character varying, "userId" uuid NOT NULL, "key" bytea NOT NULL, "type" character varying NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "expiresAt" timestamp with time zone, "allowUpload" boolean NOT NULL DEFAULT false, "albumId" uuid, "allowDownload" boolean NOT NULL DEFAULT true, "showExif" boolean NOT NULL DEFAULT true, "password" character varying);`.execute(
+    db,
+  );
   await sql`CREATE TABLE "shared_link__asset" ("assetsId" uuid NOT NULL, "sharedLinksId" uuid NOT NULL);`.execute(db);
   await sql`CREATE TABLE "smart_search" ("assetId" uuid NOT NULL, "embedding" vector(512) NOT NULL);`.execute(db);
   await sql`ALTER TABLE "smart_search" ALTER COLUMN "embedding" SET STORAGE EXTERNAL;`.execute(db);
-  await sql`CREATE TABLE "session_sync_checkpoints" ("sessionId" uuid NOT NULL, "type" character varying NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "ack" character varying NOT NULL, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
+  await sql`CREATE TABLE "session_sync_checkpoints" ("sessionId" uuid NOT NULL, "type" character varying NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "ack" character varying NOT NULL, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
   await sql`CREATE TABLE "system_metadata" ("key" character varying NOT NULL, "value" jsonb NOT NULL);`.execute(db);
-  await sql`CREATE TABLE "tags" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "userId" uuid NOT NULL, "value" character varying NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "color" character varying, "parentId" uuid, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
+  await sql`CREATE TABLE "tags" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "userId" uuid NOT NULL, "value" character varying NOT NULL, "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "updatedAt" timestamp with time zone NOT NULL DEFAULT now(), "color" character varying, "parentId" uuid, "updateId" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
   await sql`CREATE TABLE "tag_asset" ("assetsId" uuid NOT NULL, "tagsId" uuid NOT NULL);`.execute(db);
   await sql`CREATE TABLE "tags_closure" ("id_ancestor" uuid NOT NULL, "id_descendant" uuid NOT NULL);`.execute(db);
-  await sql`CREATE TABLE "users_audit" ("userId" uuid NOT NULL, "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp(), "id" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(db);
-  await sql`CREATE TABLE "user_metadata" ("userId" uuid NOT NULL, "key" character varying NOT NULL, "value" jsonb NOT NULL);`.execute(db);
-  await sql`CREATE TABLE "version_history" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "version" character varying NOT NULL);`.execute(db);
+  await sql`CREATE TABLE "users_audit" ("userId" uuid NOT NULL, "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp(), "id" uuid NOT NULL DEFAULT immich_uuid_v7());`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "user_metadata" ("userId" uuid NOT NULL, "key" character varying NOT NULL, "value" jsonb NOT NULL);`.execute(
+    db,
+  );
+  await sql`CREATE TABLE "version_history" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" timestamp with time zone NOT NULL DEFAULT now(), "version" character varying NOT NULL);`.execute(
+    db,
+  );
   await sql`ALTER TABLE "users" ADD CONSTRAINT "PK_a3ffb1c0c8416b9fc6f907b7433" PRIMARY KEY ("id");`.execute(db);
   await sql`ALTER TABLE "libraries" ADD CONSTRAINT "PK_505fedfcad00a09b3734b4223de" PRIMARY KEY ("id");`.execute(db);
   await sql`ALTER TABLE "asset_stack" ADD CONSTRAINT "PK_74a27e7fcbd5852463d0af3034b" PRIMARY KEY ("id");`.execute(db);
   await sql`ALTER TABLE "assets" ADD CONSTRAINT "PK_da96729a8b113377cfb6a62439c" PRIMARY KEY ("id");`.execute(db);
   await sql`ALTER TABLE "albums" ADD CONSTRAINT "PK_7f71c7b5bc7c87b8f94c9a93a00" PRIMARY KEY ("id");`.execute(db);
   await sql`ALTER TABLE "activity" ADD CONSTRAINT "PK_24625a1d6b1b089c8ae206fe467" PRIMARY KEY ("id");`.execute(db);
-  await sql`ALTER TABLE "albums_assets_assets" ADD CONSTRAINT "PK_c67bc36fa845fb7b18e0e398180" PRIMARY KEY ("albumsId", "assetsId");`.execute(db);
-  await sql`ALTER TABLE "albums_shared_users_users" ADD CONSTRAINT "PK_7df55657e0b2e8b626330a0ebc8" PRIMARY KEY ("albumsId", "usersId");`.execute(db);
+  await sql`ALTER TABLE "albums_assets_assets" ADD CONSTRAINT "PK_c67bc36fa845fb7b18e0e398180" PRIMARY KEY ("albumsId", "assetsId");`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "albums_shared_users_users" ADD CONSTRAINT "PK_7df55657e0b2e8b626330a0ebc8" PRIMARY KEY ("albumsId", "usersId");`.execute(
+    db,
+  );
   await sql`ALTER TABLE "api_keys" ADD CONSTRAINT "PK_5c8a79801b44bd27b79228e1dad" PRIMARY KEY ("id");`.execute(db);
   await sql`ALTER TABLE "assets_audit" ADD CONSTRAINT "PK_99bd5c015f81a641927a32b4212" PRIMARY KEY ("id");`.execute(db);
   await sql`ALTER TABLE "person" ADD CONSTRAINT "PK_5fdaf670315c4b7e70cce85daa3" PRIMARY KEY ("id");`.execute(db);
   await sql`ALTER TABLE "asset_faces" ADD CONSTRAINT "PK_6df76ab2eb6f5b57b7c2f1fc684" PRIMARY KEY ("id");`.execute(db);
   await sql`ALTER TABLE "asset_files" ADD CONSTRAINT "PK_c41dc3e9ef5e1c57ca5a08a0004" PRIMARY KEY ("id");`.execute(db);
-  await sql`ALTER TABLE "asset_job_status" ADD CONSTRAINT "PK_420bec36fc02813bddf5c8b73d4" PRIMARY KEY ("assetId");`.execute(db);
+  await sql`ALTER TABLE "asset_job_status" ADD CONSTRAINT "PK_420bec36fc02813bddf5c8b73d4" PRIMARY KEY ("assetId");`.execute(
+    db,
+  );
   await sql`ALTER TABLE "audit" ADD CONSTRAINT "PK_1d3d120ddaf7bc9b1ed68ed463a" PRIMARY KEY ("id");`.execute(db);
   await sql`ALTER TABLE "exif" ADD CONSTRAINT "PK_c0117fdbc50b917ef9067740c44" PRIMARY KEY ("assetId");`.execute(db);
   await sql`ALTER TABLE "face_search" ADD CONSTRAINT "face_search_pkey" PRIMARY KEY ("faceId");`.execute(db);
-  await sql`ALTER TABLE "geodata_places" ADD CONSTRAINT "PK_c29918988912ef4036f3d7fbff4" PRIMARY KEY ("id");`.execute(db);
+  await sql`ALTER TABLE "geodata_places" ADD CONSTRAINT "PK_c29918988912ef4036f3d7fbff4" PRIMARY KEY ("id");`.execute(
+    db,
+  );
   await sql`ALTER TABLE "memories" ADD CONSTRAINT "PK_aaa0692d9496fe827b0568612f8" PRIMARY KEY ("id");`.execute(db);
-  await sql`ALTER TABLE "memories_assets_assets" ADD CONSTRAINT "PK_fcaf7112a013d1703c011c6793d" PRIMARY KEY ("memoriesId", "assetsId");`.execute(db);
+  await sql`ALTER TABLE "memories_assets_assets" ADD CONSTRAINT "PK_fcaf7112a013d1703c011c6793d" PRIMARY KEY ("memoriesId", "assetsId");`.execute(
+    db,
+  );
   await sql`ALTER TABLE "move_history" ADD CONSTRAINT "PK_af608f132233acf123f2949678d" PRIMARY KEY ("id");`.execute(db);
-  await sql`ALTER TABLE "naturalearth_countries" ADD CONSTRAINT "PK_21a6d86d1ab5d841648212e5353" PRIMARY KEY ("id");`.execute(db);
-  await sql`ALTER TABLE "partners_audit" ADD CONSTRAINT "PK_952b50217ff78198a7e380f0359" PRIMARY KEY ("id");`.execute(db);
-  await sql`ALTER TABLE "partners" ADD CONSTRAINT "PK_f1cc8f73d16b367f426261a8736" PRIMARY KEY ("sharedById", "sharedWithId");`.execute(db);
+  await sql`ALTER TABLE "naturalearth_countries" ADD CONSTRAINT "PK_21a6d86d1ab5d841648212e5353" PRIMARY KEY ("id");`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "partners_audit" ADD CONSTRAINT "PK_952b50217ff78198a7e380f0359" PRIMARY KEY ("id");`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "partners" ADD CONSTRAINT "PK_f1cc8f73d16b367f426261a8736" PRIMARY KEY ("sharedById", "sharedWithId");`.execute(
+    db,
+  );
   await sql`ALTER TABLE "sessions" ADD CONSTRAINT "PK_48cb6b5c20faa63157b3c1baf7f" PRIMARY KEY ("id");`.execute(db);
   await sql`ALTER TABLE "shared_links" ADD CONSTRAINT "PK_642e2b0f619e4876e5f90a43465" PRIMARY KEY ("id");`.execute(db);
-  await sql`ALTER TABLE "shared_link__asset" ADD CONSTRAINT "PK_9b4f3687f9b31d1e311336b05e3" PRIMARY KEY ("assetsId", "sharedLinksId");`.execute(db);
+  await sql`ALTER TABLE "shared_link__asset" ADD CONSTRAINT "PK_9b4f3687f9b31d1e311336b05e3" PRIMARY KEY ("assetsId", "sharedLinksId");`.execute(
+    db,
+  );
   await sql`ALTER TABLE "smart_search" ADD CONSTRAINT "smart_search_pkey" PRIMARY KEY ("assetId");`.execute(db);
-  await sql`ALTER TABLE "session_sync_checkpoints" ADD CONSTRAINT "PK_b846ab547a702863ef7cd9412fb" PRIMARY KEY ("sessionId", "type");`.execute(db);
-  await sql`ALTER TABLE "system_metadata" ADD CONSTRAINT "PK_fa94f6857470fb5b81ec6084465" PRIMARY KEY ("key");`.execute(db);
+  await sql`ALTER TABLE "session_sync_checkpoints" ADD CONSTRAINT "PK_b846ab547a702863ef7cd9412fb" PRIMARY KEY ("sessionId", "type");`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "system_metadata" ADD CONSTRAINT "PK_fa94f6857470fb5b81ec6084465" PRIMARY KEY ("key");`.execute(
+    db,
+  );
   await sql`ALTER TABLE "tags" ADD CONSTRAINT "PK_e7dc17249a1148a1970748eda99" PRIMARY KEY ("id");`.execute(db);
-  await sql`ALTER TABLE "tag_asset" ADD CONSTRAINT "PK_ef5346fe522b5fb3bc96454747e" PRIMARY KEY ("assetsId", "tagsId");`.execute(db);
-  await sql`ALTER TABLE "tags_closure" ADD CONSTRAINT "PK_eab38eb12a3ec6df8376c95477c" PRIMARY KEY ("id_ancestor", "id_descendant");`.execute(db);
+  await sql`ALTER TABLE "tag_asset" ADD CONSTRAINT "PK_ef5346fe522b5fb3bc96454747e" PRIMARY KEY ("assetsId", "tagsId");`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "tags_closure" ADD CONSTRAINT "PK_eab38eb12a3ec6df8376c95477c" PRIMARY KEY ("id_ancestor", "id_descendant");`.execute(
+    db,
+  );
   await sql`ALTER TABLE "users_audit" ADD CONSTRAINT "PK_e9b2bdfd90e7eb5961091175180" PRIMARY KEY ("id");`.execute(db);
-  await sql`ALTER TABLE "user_metadata" ADD CONSTRAINT "PK_5931462150b3438cbc83277fe5a" PRIMARY KEY ("userId", "key");`.execute(db);
-  await sql`ALTER TABLE "version_history" ADD CONSTRAINT "PK_5db259cbb09ce82c0d13cfd1b23" PRIMARY KEY ("id");`.execute(db);
-  await sql`ALTER TABLE "libraries" ADD CONSTRAINT "FK_0f6fc2fb195f24d19b0fb0d57c1" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "asset_stack" ADD CONSTRAINT "FK_91704e101438fd0653f582426dc" FOREIGN KEY ("primaryAssetId") REFERENCES "assets" ("id") ON UPDATE NO ACTION ON DELETE NO ACTION;`.execute(db);
-  await sql`ALTER TABLE "asset_stack" ADD CONSTRAINT "FK_c05079e542fd74de3b5ecb5c1c8" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "assets" ADD CONSTRAINT "FK_2c5ac0d6fb58b238fd2068de67d" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "assets" ADD CONSTRAINT "FK_16294b83fa8c0149719a1f631ef" FOREIGN KEY ("livePhotoVideoId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE SET NULL;`.execute(db);
-  await sql`ALTER TABLE "assets" ADD CONSTRAINT "FK_9977c3c1de01c3d848039a6b90c" FOREIGN KEY ("libraryId") REFERENCES "libraries" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "assets" ADD CONSTRAINT "FK_f15d48fa3ea5e4bda05ca8ab207" FOREIGN KEY ("stackId") REFERENCES "asset_stack" ("id") ON UPDATE CASCADE ON DELETE SET NULL;`.execute(db);
-  await sql`ALTER TABLE "albums" ADD CONSTRAINT "FK_b22c53f35ef20c28c21637c85f4" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "albums" ADD CONSTRAINT "FK_05895aa505a670300d4816debce" FOREIGN KEY ("albumThumbnailAssetId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE SET NULL;`.execute(db);
-  await sql`ALTER TABLE "activity" ADD CONSTRAINT "FK_1af8519996fbfb3684b58df280b" FOREIGN KEY ("albumId") REFERENCES "albums" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "activity" ADD CONSTRAINT "FK_3571467bcbe021f66e2bdce96ea" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "activity" ADD CONSTRAINT "FK_8091ea76b12338cb4428d33d782" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "albums_assets_assets" ADD CONSTRAINT "FK_e590fa396c6898fcd4a50e40927" FOREIGN KEY ("albumsId") REFERENCES "albums" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "albums_assets_assets" ADD CONSTRAINT "FK_4bd1303d199f4e72ccdf998c621" FOREIGN KEY ("assetsId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "albums_shared_users_users" ADD CONSTRAINT "FK_427c350ad49bd3935a50baab737" FOREIGN KEY ("albumsId") REFERENCES "albums" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "albums_shared_users_users" ADD CONSTRAINT "FK_f48513bf9bccefd6ff3ad30bd06" FOREIGN KEY ("usersId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "api_keys" ADD CONSTRAINT "FK_6c2e267ae764a9413b863a29342" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "person" ADD CONSTRAINT "FK_5527cc99f530a547093f9e577b6" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "person" ADD CONSTRAINT "FK_2bbabe31656b6778c6b87b61023" FOREIGN KEY ("faceAssetId") REFERENCES "asset_faces" ("id") ON UPDATE NO ACTION ON DELETE SET NULL;`.execute(db);
-  await sql`ALTER TABLE "asset_faces" ADD CONSTRAINT "FK_02a43fd0b3c50fb6d7f0cb7282c" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "asset_faces" ADD CONSTRAINT "FK_95ad7106dd7b484275443f580f9" FOREIGN KEY ("personId") REFERENCES "person" ("id") ON UPDATE CASCADE ON DELETE SET NULL;`.execute(db);
-  await sql`ALTER TABLE "asset_files" ADD CONSTRAINT "FK_e3e103a5f1d8bc8402999286040" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "asset_job_status" ADD CONSTRAINT "FK_420bec36fc02813bddf5c8b73d4" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "exif" ADD CONSTRAINT "FK_c0117fdbc50b917ef9067740c44" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "face_search" ADD CONSTRAINT "face_search_faceId_fkey" FOREIGN KEY ("faceId") REFERENCES "asset_faces" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "memories" ADD CONSTRAINT "FK_575842846f0c28fa5da46c99b19" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "memories_assets_assets" ADD CONSTRAINT "FK_984e5c9ab1f04d34538cd32334e" FOREIGN KEY ("memoriesId") REFERENCES "memories" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "memories_assets_assets" ADD CONSTRAINT "FK_6942ecf52d75d4273de19d2c16f" FOREIGN KEY ("assetsId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "partners" ADD CONSTRAINT "FK_7e077a8b70b3530138610ff5e04" FOREIGN KEY ("sharedById") REFERENCES "users" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "partners" ADD CONSTRAINT "FK_d7e875c6c60e661723dbf372fd3" FOREIGN KEY ("sharedWithId") REFERENCES "users" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "sessions" ADD CONSTRAINT "FK_57de40bc620f456c7311aa3a1e6" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "shared_links" ADD CONSTRAINT "FK_66fe3837414c5a9f1c33ca49340" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "shared_links" ADD CONSTRAINT "FK_0c6ce9058c29f07cdf7014eac66" FOREIGN KEY ("albumId") REFERENCES "albums" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "shared_link__asset" ADD CONSTRAINT "FK_5b7decce6c8d3db9593d6111a66" FOREIGN KEY ("assetsId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "shared_link__asset" ADD CONSTRAINT "FK_c9fab4aa97ffd1b034f3d6581ab" FOREIGN KEY ("sharedLinksId") REFERENCES "shared_links" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "smart_search" ADD CONSTRAINT "smart_search_assetId_fkey" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "session_sync_checkpoints" ADD CONSTRAINT "FK_d8ddd9d687816cc490432b3d4bc" FOREIGN KEY ("sessionId") REFERENCES "sessions" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "tags" ADD CONSTRAINT "FK_92e67dc508c705dd66c94615576" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "tags" ADD CONSTRAINT "FK_9f9590cc11561f1f48ff034ef99" FOREIGN KEY ("parentId") REFERENCES "tags" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "tag_asset" ADD CONSTRAINT "FK_f8e8a9e893cb5c54907f1b798e9" FOREIGN KEY ("assetsId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "tag_asset" ADD CONSTRAINT "FK_e99f31ea4cdf3a2c35c7287eb42" FOREIGN KEY ("tagsId") REFERENCES "tags" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "tags_closure" ADD CONSTRAINT "FK_15fbcbc67663c6bfc07b354c22c" FOREIGN KEY ("id_ancestor") REFERENCES "tags" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "tags_closure" ADD CONSTRAINT "FK_b1a2a7ed45c29179b5ad51548a1" FOREIGN KEY ("id_descendant") REFERENCES "tags" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(db);
-  await sql`ALTER TABLE "user_metadata" ADD CONSTRAINT "FK_6afb43681a21cf7815932bc38ac" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(db);
+  await sql`ALTER TABLE "user_metadata" ADD CONSTRAINT "PK_5931462150b3438cbc83277fe5a" PRIMARY KEY ("userId", "key");`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "version_history" ADD CONSTRAINT "PK_5db259cbb09ce82c0d13cfd1b23" PRIMARY KEY ("id");`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "libraries" ADD CONSTRAINT "FK_0f6fc2fb195f24d19b0fb0d57c1" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "asset_stack" ADD CONSTRAINT "FK_91704e101438fd0653f582426dc" FOREIGN KEY ("primaryAssetId") REFERENCES "assets" ("id") ON UPDATE NO ACTION ON DELETE NO ACTION;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "asset_stack" ADD CONSTRAINT "FK_c05079e542fd74de3b5ecb5c1c8" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "assets" ADD CONSTRAINT "FK_2c5ac0d6fb58b238fd2068de67d" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "assets" ADD CONSTRAINT "FK_16294b83fa8c0149719a1f631ef" FOREIGN KEY ("livePhotoVideoId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE SET NULL;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "assets" ADD CONSTRAINT "FK_9977c3c1de01c3d848039a6b90c" FOREIGN KEY ("libraryId") REFERENCES "libraries" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "assets" ADD CONSTRAINT "FK_f15d48fa3ea5e4bda05ca8ab207" FOREIGN KEY ("stackId") REFERENCES "asset_stack" ("id") ON UPDATE CASCADE ON DELETE SET NULL;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "albums" ADD CONSTRAINT "FK_b22c53f35ef20c28c21637c85f4" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "albums" ADD CONSTRAINT "FK_05895aa505a670300d4816debce" FOREIGN KEY ("albumThumbnailAssetId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE SET NULL;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "activity" ADD CONSTRAINT "FK_1af8519996fbfb3684b58df280b" FOREIGN KEY ("albumId") REFERENCES "albums" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "activity" ADD CONSTRAINT "FK_3571467bcbe021f66e2bdce96ea" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "activity" ADD CONSTRAINT "FK_8091ea76b12338cb4428d33d782" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "albums_assets_assets" ADD CONSTRAINT "FK_e590fa396c6898fcd4a50e40927" FOREIGN KEY ("albumsId") REFERENCES "albums" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "albums_assets_assets" ADD CONSTRAINT "FK_4bd1303d199f4e72ccdf998c621" FOREIGN KEY ("assetsId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "albums_shared_users_users" ADD CONSTRAINT "FK_427c350ad49bd3935a50baab737" FOREIGN KEY ("albumsId") REFERENCES "albums" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "albums_shared_users_users" ADD CONSTRAINT "FK_f48513bf9bccefd6ff3ad30bd06" FOREIGN KEY ("usersId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "api_keys" ADD CONSTRAINT "FK_6c2e267ae764a9413b863a29342" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "person" ADD CONSTRAINT "FK_5527cc99f530a547093f9e577b6" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "person" ADD CONSTRAINT "FK_2bbabe31656b6778c6b87b61023" FOREIGN KEY ("faceAssetId") REFERENCES "asset_faces" ("id") ON UPDATE NO ACTION ON DELETE SET NULL;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "asset_faces" ADD CONSTRAINT "FK_02a43fd0b3c50fb6d7f0cb7282c" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "asset_faces" ADD CONSTRAINT "FK_95ad7106dd7b484275443f580f9" FOREIGN KEY ("personId") REFERENCES "person" ("id") ON UPDATE CASCADE ON DELETE SET NULL;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "asset_files" ADD CONSTRAINT "FK_e3e103a5f1d8bc8402999286040" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "asset_job_status" ADD CONSTRAINT "FK_420bec36fc02813bddf5c8b73d4" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "exif" ADD CONSTRAINT "FK_c0117fdbc50b917ef9067740c44" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "face_search" ADD CONSTRAINT "face_search_faceId_fkey" FOREIGN KEY ("faceId") REFERENCES "asset_faces" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "memories" ADD CONSTRAINT "FK_575842846f0c28fa5da46c99b19" FOREIGN KEY ("ownerId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "memories_assets_assets" ADD CONSTRAINT "FK_984e5c9ab1f04d34538cd32334e" FOREIGN KEY ("memoriesId") REFERENCES "memories" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "memories_assets_assets" ADD CONSTRAINT "FK_6942ecf52d75d4273de19d2c16f" FOREIGN KEY ("assetsId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "partners" ADD CONSTRAINT "FK_7e077a8b70b3530138610ff5e04" FOREIGN KEY ("sharedById") REFERENCES "users" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "partners" ADD CONSTRAINT "FK_d7e875c6c60e661723dbf372fd3" FOREIGN KEY ("sharedWithId") REFERENCES "users" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "sessions" ADD CONSTRAINT "FK_57de40bc620f456c7311aa3a1e6" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "shared_links" ADD CONSTRAINT "FK_66fe3837414c5a9f1c33ca49340" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "shared_links" ADD CONSTRAINT "FK_0c6ce9058c29f07cdf7014eac66" FOREIGN KEY ("albumId") REFERENCES "albums" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "shared_link__asset" ADD CONSTRAINT "FK_5b7decce6c8d3db9593d6111a66" FOREIGN KEY ("assetsId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "shared_link__asset" ADD CONSTRAINT "FK_c9fab4aa97ffd1b034f3d6581ab" FOREIGN KEY ("sharedLinksId") REFERENCES "shared_links" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "smart_search" ADD CONSTRAINT "smart_search_assetId_fkey" FOREIGN KEY ("assetId") REFERENCES "assets" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "session_sync_checkpoints" ADD CONSTRAINT "FK_d8ddd9d687816cc490432b3d4bc" FOREIGN KEY ("sessionId") REFERENCES "sessions" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "tags" ADD CONSTRAINT "FK_92e67dc508c705dd66c94615576" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "tags" ADD CONSTRAINT "FK_9f9590cc11561f1f48ff034ef99" FOREIGN KEY ("parentId") REFERENCES "tags" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "tag_asset" ADD CONSTRAINT "FK_f8e8a9e893cb5c54907f1b798e9" FOREIGN KEY ("assetsId") REFERENCES "assets" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "tag_asset" ADD CONSTRAINT "FK_e99f31ea4cdf3a2c35c7287eb42" FOREIGN KEY ("tagsId") REFERENCES "tags" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "tags_closure" ADD CONSTRAINT "FK_15fbcbc67663c6bfc07b354c22c" FOREIGN KEY ("id_ancestor") REFERENCES "tags" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "tags_closure" ADD CONSTRAINT "FK_b1a2a7ed45c29179b5ad51548a1" FOREIGN KEY ("id_descendant") REFERENCES "tags" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "user_metadata" ADD CONSTRAINT "FK_6afb43681a21cf7815932bc38ac" FOREIGN KEY ("userId") REFERENCES "users" ("id") ON UPDATE CASCADE ON DELETE CASCADE;`.execute(
+    db,
+  );
   await sql`ALTER TABLE "users" ADD CONSTRAINT "UQ_97672ac88f789774dd47f7c8be3" UNIQUE ("email");`.execute(db);
   await sql`ALTER TABLE "users" ADD CONSTRAINT "UQ_b309cf34fa58137c416b32cea3a" UNIQUE ("storageLabel");`.execute(db);
-  await sql`ALTER TABLE "asset_stack" ADD CONSTRAINT "REL_91704e101438fd0653f582426d" UNIQUE ("primaryAssetId");`.execute(db);
+  await sql`ALTER TABLE "asset_stack" ADD CONSTRAINT "REL_91704e101438fd0653f582426d" UNIQUE ("primaryAssetId");`.execute(
+    db,
+  );
   await sql`ALTER TABLE "asset_files" ADD CONSTRAINT "UQ_assetId_type" UNIQUE ("assetId", "type");`.execute(db);
   await sql`ALTER TABLE "move_history" ADD CONSTRAINT "UQ_newPath" UNIQUE ("newPath");`.execute(db);
-  await sql`ALTER TABLE "move_history" ADD CONSTRAINT "UQ_entityId_pathType" UNIQUE ("entityId", "pathType");`.execute(db);
+  await sql`ALTER TABLE "move_history" ADD CONSTRAINT "UQ_entityId_pathType" UNIQUE ("entityId", "pathType");`.execute(
+    db,
+  );
   await sql`ALTER TABLE "shared_links" ADD CONSTRAINT "UQ_sharedlink_key" UNIQUE ("key");`.execute(db);
   await sql`ALTER TABLE "tags" ADD CONSTRAINT "UQ_79d6f16e52bb2c7130375246793" UNIQUE ("userId", "value");`.execute(db);
-  await sql`ALTER TABLE "activity" ADD CONSTRAINT "CHK_2ab1e70f113f450eb40c1e3ec8" CHECK (("comment" IS NULL AND "isLiked" = true) OR ("comment" IS NOT NULL AND "isLiked" = false));`.execute(db);
-  await sql`ALTER TABLE "person" ADD CONSTRAINT "CHK_b0f82b0ed662bfc24fbb58bb45" CHECK ("birthDate" <= CURRENT_DATE);`.execute(db);
+  await sql`ALTER TABLE "activity" ADD CONSTRAINT "CHK_2ab1e70f113f450eb40c1e3ec8" CHECK (("comment" IS NULL AND "isLiked" = true) OR ("comment" IS NOT NULL AND "isLiked" = false));`.execute(
+    db,
+  );
+  await sql`ALTER TABLE "person" ADD CONSTRAINT "CHK_b0f82b0ed662bfc24fbb58bb45" CHECK ("birthDate" <= CURRENT_DATE);`.execute(
+    db,
+  );
   await sql`CREATE INDEX "IDX_users_updated_at_asc_id_asc" ON "users" ("updatedAt", "id")`.execute(db);
   await sql`CREATE INDEX "IDX_users_update_id" ON "users" ("updateId")`.execute(db);
   await sql`CREATE INDEX "IDX_0f6fc2fb195f24d19b0fb0d57c" ON "libraries" ("ownerId")`.execute(db);
   await sql`CREATE INDEX "IDX_libraries_update_id" ON "libraries" ("updateId")`.execute(db);
   await sql`CREATE INDEX "IDX_91704e101438fd0653f582426d" ON "asset_stack" ("primaryAssetId")`.execute(db);
   await sql`CREATE INDEX "IDX_c05079e542fd74de3b5ecb5c1c" ON "asset_stack" ("ownerId")`.execute(db);
-  await sql`CREATE INDEX "idx_originalfilename_trigram" ON "assets" USING gin (f_unaccent("originalFileName") gin_trgm_ops)`.execute(db);
+  await sql`CREATE INDEX "idx_originalfilename_trigram" ON "assets" USING gin (f_unaccent("originalFileName") gin_trgm_ops)`.execute(
+    db,
+  );
   await sql`CREATE INDEX "IDX_asset_id_stackId" ON "assets" ("id", "stackId")`.execute(db);
   await sql`CREATE INDEX "IDX_originalPath_libraryId" ON "assets" ("originalPath", "libraryId")`.execute(db);
-  await sql`CREATE INDEX "idx_local_date_time_month" ON "assets" ((date_trunc('MONTH'::text, ("localDateTime" AT TIME ZONE 'UTC'::text)) AT TIME ZONE 'UTC'::text))`.execute(db);
+  await sql`CREATE INDEX "idx_local_date_time_month" ON "assets" ((date_trunc('MONTH'::text, ("localDateTime" AT TIME ZONE 'UTC'::text)) AT TIME ZONE 'UTC'::text))`.execute(
+    db,
+  );
   await sql`CREATE INDEX "idx_local_date_time" ON "assets" ((("localDateTime" at time zone 'UTC')::date))`.execute(db);
-  await sql`CREATE UNIQUE INDEX "UQ_assets_owner_library_checksum" ON "assets" ("ownerId", "libraryId", "checksum") WHERE ("libraryId" IS NOT NULL)`.execute(db);
-  await sql`CREATE UNIQUE INDEX "UQ_assets_owner_checksum" ON "assets" ("ownerId", "checksum") WHERE ("libraryId" IS NULL)`.execute(db);
+  await sql`CREATE UNIQUE INDEX "UQ_assets_owner_library_checksum" ON "assets" ("ownerId", "libraryId", "checksum") WHERE ("libraryId" IS NOT NULL)`.execute(
+    db,
+  );
+  await sql`CREATE UNIQUE INDEX "UQ_assets_owner_checksum" ON "assets" ("ownerId", "checksum") WHERE ("libraryId" IS NULL)`.execute(
+    db,
+  );
   await sql`CREATE INDEX "IDX_2c5ac0d6fb58b238fd2068de67" ON "assets" ("ownerId")`.execute(db);
   await sql`CREATE INDEX "idx_asset_file_created_at" ON "assets" ("fileCreatedAt")`.execute(db);
   await sql`CREATE INDEX "IDX_8d3efe36c0755849395e6ea866" ON "assets" ("checksum")`.execute(db);
@@ -266,7 +456,9 @@ export async function up(db: Kysely<any>): Promise<void> {
   await sql`CREATE INDEX "IDX_b22c53f35ef20c28c21637c85f" ON "albums" ("ownerId")`.execute(db);
   await sql`CREATE INDEX "IDX_05895aa505a670300d4816debc" ON "albums" ("albumThumbnailAssetId")`.execute(db);
   await sql`CREATE INDEX "IDX_albums_update_id" ON "albums" ("updateId")`.execute(db);
-  await sql`CREATE UNIQUE INDEX "IDX_activity_like" ON "activity" ("assetId", "userId", "albumId") WHERE ("isLiked" = true)`.execute(db);
+  await sql`CREATE UNIQUE INDEX "IDX_activity_like" ON "activity" ("assetId", "userId", "albumId") WHERE ("isLiked" = true)`.execute(
+    db,
+  );
   await sql`CREATE INDEX "IDX_1af8519996fbfb3684b58df280" ON "activity" ("albumId")`.execute(db);
   await sql`CREATE INDEX "IDX_3571467bcbe021f66e2bdce96e" ON "activity" ("userId")`.execute(db);
   await sql`CREATE INDEX "IDX_8091ea76b12338cb4428d33d78" ON "activity" ("assetId")`.execute(db);
@@ -295,11 +487,21 @@ export async function up(db: Kysely<any>): Promise<void> {
   await sql`CREATE INDEX "IDX_auto_stack_id" ON "exif" ("autoStackId")`.execute(db);
   await sql`CREATE INDEX "IDX_asset_exif_update_id" ON "exif" ("updateId")`.execute(db);
   await sql.raw(vectorIndexQuery({ vectorExtension, table: 'face_search', indexName: 'face_index' })).execute(db);
-  await sql`CREATE INDEX "IDX_geodata_gist_earthcoord" ON "geodata_places" (ll_to_earth_public(latitude, longitude))`.execute(db);
-  await sql`CREATE INDEX "idx_geodata_places_name" ON "geodata_places" USING gin (f_unaccent("name") gin_trgm_ops)`.execute(db);
-  await sql`CREATE INDEX "idx_geodata_places_admin2_name" ON "geodata_places" USING gin (f_unaccent("admin2Name") gin_trgm_ops)`.execute(db);
-  await sql`CREATE INDEX "idx_geodata_places_admin1_name" ON "geodata_places" USING gin (f_unaccent("admin1Name") gin_trgm_ops)`.execute(db);
-  await sql`CREATE INDEX "idx_geodata_places_alternate_names" ON "geodata_places" USING gin (f_unaccent("alternateNames") gin_trgm_ops)`.execute(db);
+  await sql`CREATE INDEX "IDX_geodata_gist_earthcoord" ON "geodata_places" (ll_to_earth_public(latitude, longitude))`.execute(
+    db,
+  );
+  await sql`CREATE INDEX "idx_geodata_places_name" ON "geodata_places" USING gin (f_unaccent("name") gin_trgm_ops)`.execute(
+    db,
+  );
+  await sql`CREATE INDEX "idx_geodata_places_admin2_name" ON "geodata_places" USING gin (f_unaccent("admin2Name") gin_trgm_ops)`.execute(
+    db,
+  );
+  await sql`CREATE INDEX "idx_geodata_places_admin1_name" ON "geodata_places" USING gin (f_unaccent("admin1Name") gin_trgm_ops)`.execute(
+    db,
+  );
+  await sql`CREATE INDEX "idx_geodata_places_alternate_names" ON "geodata_places" USING gin (f_unaccent("alternateNames") gin_trgm_ops)`.execute(
+    db,
+  );
   await sql`CREATE INDEX "IDX_575842846f0c28fa5da46c99b1" ON "memories" ("ownerId")`.execute(db);
   await sql`CREATE INDEX "IDX_memories_update_id" ON "memories" ("updateId")`.execute(db);
   await sql`CREATE INDEX "IDX_984e5c9ab1f04d34538cd32334" ON "memories_assets_assets" ("memoriesId")`.execute(db);
@@ -319,7 +521,9 @@ export async function up(db: Kysely<any>): Promise<void> {
   await sql`CREATE INDEX "IDX_c9fab4aa97ffd1b034f3d6581a" ON "shared_link__asset" ("sharedLinksId")`.execute(db);
   await sql.raw(vectorIndexQuery({ vectorExtension, table: 'smart_search', indexName: 'clip_index' })).execute(db);
   await sql`CREATE INDEX "IDX_d8ddd9d687816cc490432b3d4b" ON "session_sync_checkpoints" ("sessionId")`.execute(db);
-  await sql`CREATE INDEX "IDX_session_sync_checkpoints_update_id" ON "session_sync_checkpoints" ("updateId")`.execute(db);
+  await sql`CREATE INDEX "IDX_session_sync_checkpoints_update_id" ON "session_sync_checkpoints" ("updateId")`.execute(
+    db,
+  );
   await sql`CREATE INDEX "IDX_92e67dc508c705dd66c9461557" ON "tags" ("userId")`.execute(db);
   await sql`CREATE INDEX "IDX_9f9590cc11561f1f48ff034ef9" ON "tags" ("parentId")`.execute(db);
   await sql`CREATE INDEX "IDX_tags_update_id" ON "tags" ("updateId")`.execute(db);
@@ -407,5 +611,5 @@ export async function up(db: Kysely<any>): Promise<void> {
 }
 
 export async function down(): Promise<void> {
-// not implemented
+  // not implemented
 }
diff --git a/server/src/schema/migrations/1749067526135-UserOnboardingDefault.ts b/server/src/schema/migrations/1749067526135-UserOnboardingDefault.ts
index 376541410f..e6aabec27d 100644
--- a/server/src/schema/migrations/1749067526135-UserOnboardingDefault.ts
+++ b/server/src/schema/migrations/1749067526135-UserOnboardingDefault.ts
@@ -2,11 +2,11 @@ import { Kysely, sql } from 'kysely';
 import { UserMetadataKey } from 'src/enum';
 
 export async function up(db: Kysely<any>): Promise<void> {
-  await sql`INSERT INTO user_metadata SELECT id, ${UserMetadataKey.ONBOARDING}, '{"isOnboarded": true}' FROM users
+  await sql`INSERT INTO user_metadata SELECT id, ${UserMetadataKey.Onboarding}, '{"isOnboarded": true}' FROM users
     ON CONFLICT ("userId", key) DO NOTHING
   `.execute(db);
 }
 
 export async function down(db: Kysely<any>): Promise<void> {
-  await sql`DELETE FROM user_metadata WHERE key = ${UserMetadataKey.ONBOARDING}`.execute(db);
+  await sql`DELETE FROM user_metadata WHERE key = ${UserMetadataKey.Onboarding}`.execute(db);
 }
diff --git a/server/src/schema/tables/album-user.table.ts b/server/src/schema/tables/album-user.table.ts
index 6f20e25d90..94383218da 100644
--- a/server/src/schema/tables/album-user.table.ts
+++ b/server/src/schema/tables/album-user.table.ts
@@ -47,7 +47,7 @@ export class AlbumUserTable {
   })
   usersId!: string;
 
-  @Column({ type: 'character varying', default: AlbumUserRole.EDITOR })
+  @Column({ type: 'character varying', default: AlbumUserRole.Editor })
   role!: Generated<AlbumUserRole>;
 
   @CreateIdColumn({ index: true })
diff --git a/server/src/schema/tables/album.table.ts b/server/src/schema/tables/album.table.ts
index bca15d520b..5628db3d03 100644
--- a/server/src/schema/tables/album.table.ts
+++ b/server/src/schema/tables/album.table.ts
@@ -57,7 +57,7 @@ export class AlbumTable {
   @Column({ type: 'boolean', default: true })
   isActivityEnabled!: Generated<boolean>;
 
-  @Column({ default: AssetOrder.DESC })
+  @Column({ default: AssetOrder.Desc })
   order!: Generated<AssetOrder>;
 
   @UpdateIdColumn({ index: true })
diff --git a/server/src/schema/tables/asset-face.table.ts b/server/src/schema/tables/asset-face.table.ts
index 483d655768..6e45a3a64d 100644
--- a/server/src/schema/tables/asset-face.table.ts
+++ b/server/src/schema/tables/asset-face.table.ts
@@ -56,7 +56,7 @@ export class AssetFaceTable {
   @Column({ default: 0, type: 'integer' })
   boundingBoxY2!: Generated<number>;
 
-  @Column({ default: SourceType.MACHINE_LEARNING, enum: asset_face_source_type })
+  @Column({ default: SourceType.MachineLearning, enum: asset_face_source_type })
   sourceType!: Generated<SourceType>;
 
   @DeleteDateColumn()
diff --git a/server/src/schema/tables/asset.table.ts b/server/src/schema/tables/asset.table.ts
index 4e1d073848..e92e01a1bd 100644
--- a/server/src/schema/tables/asset.table.ts
+++ b/server/src/schema/tables/asset.table.ts
@@ -132,12 +132,12 @@ export class AssetTable {
   @Column({ type: 'uuid', nullable: true, index: true })
   duplicateId!: string | null;
 
-  @Column({ enum: assets_status_enum, default: AssetStatus.ACTIVE })
+  @Column({ enum: assets_status_enum, default: AssetStatus.Active })
   status!: Generated<AssetStatus>;
 
   @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
 
-  @Column({ enum: asset_visibility_enum, default: AssetVisibility.TIMELINE })
+  @Column({ enum: asset_visibility_enum, default: AssetVisibility.Timeline })
   visibility!: Generated<AssetVisibility>;
 }
diff --git a/server/src/schema/tables/user.table.ts b/server/src/schema/tables/user.table.ts
index 97ac0ff295..46d6656382 100644
--- a/server/src/schema/tables/user.table.ts
+++ b/server/src/schema/tables/user.table.ts
@@ -73,7 +73,7 @@ export class UserTable {
   @Column({ type: 'bigint', default: 0 })
   quotaUsageInBytes!: Generated<ColumnType<number>>;
 
-  @Column({ type: 'character varying', default: UserStatus.ACTIVE })
+  @Column({ type: 'character varying', default: UserStatus.Active })
   status!: Generated<UserStatus>;
 
   @Column({ type: 'timestamp with time zone', default: () => 'now()' })
diff --git a/server/src/services/activity.service.ts b/server/src/services/activity.service.ts
index 8256a34f02..b1c25f8286 100644
--- a/server/src/services/activity.service.ts
+++ b/server/src/services/activity.service.ts
@@ -18,7 +18,7 @@ import { BaseService } from 'src/services/base.service';
 @Injectable()
 export class ActivityService extends BaseService {
   async getAll(auth: AuthDto, dto: ActivitySearchDto): Promise<ActivityResponseDto[]> {
-    await this.requireAccess({ auth, permission: Permission.ALBUM_READ, ids: [dto.albumId] });
+    await this.requireAccess({ auth, permission: Permission.AlbumRead, ids: [dto.albumId] });
     const activities = await this.activityRepository.search({
       userId: dto.userId,
       albumId: dto.albumId,
@@ -30,12 +30,12 @@ export class ActivityService extends BaseService {
   }
 
   async getStatistics(auth: AuthDto, dto: ActivityDto): Promise<ActivityStatisticsResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.ALBUM_READ, ids: [dto.albumId] });
+    await this.requireAccess({ auth, permission: Permission.AlbumRead, ids: [dto.albumId] });
     return await this.activityRepository.getStatistics({ albumId: dto.albumId, assetId: dto.assetId });
   }
 
   async create(auth: AuthDto, dto: ActivityCreateDto): Promise<MaybeDuplicate<ActivityResponseDto>> {
-    await this.requireAccess({ auth, permission: Permission.ACTIVITY_CREATE, ids: [dto.albumId] });
+    await this.requireAccess({ auth, permission: Permission.ActivityCreate, ids: [dto.albumId] });
 
     const common = {
       userId: auth.user.id,
@@ -69,7 +69,7 @@ export class ActivityService extends BaseService {
   }
 
   async delete(auth: AuthDto, id: string): Promise<void> {
-    await this.requireAccess({ auth, permission: Permission.ACTIVITY_DELETE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.ActivityDelete, ids: [id] });
     await this.activityRepository.delete(id);
   }
 }
diff --git a/server/src/services/album.service.spec.ts b/server/src/services/album.service.spec.ts
index cdace249c0..6f07a31dd9 100644
--- a/server/src/services/album.service.spec.ts
+++ b/server/src/services/album.service.spec.ts
@@ -146,7 +146,7 @@ describe(AlbumService.name, () => {
 
       await sut.create(authStub.admin, {
         albumName: 'Empty album',
-        albumUsers: [{ userId: 'user-id', role: AlbumUserRole.EDITOR }],
+        albumUsers: [{ userId: 'user-id', role: AlbumUserRole.Editor }],
         description: '',
         assetIds: ['123'],
       });
@@ -160,7 +160,7 @@ describe(AlbumService.name, () => {
           albumThumbnailAssetId: '123',
         },
         ['123'],
-        [{ userId: 'user-id', role: AlbumUserRole.EDITOR }],
+        [{ userId: 'user-id', role: AlbumUserRole.Editor }],
       );
 
       expect(mocks.user.get).toHaveBeenCalledWith('user-id', {});
@@ -177,10 +177,10 @@ describe(AlbumService.name, () => {
       mocks.user.get.mockResolvedValue(userStub.user1);
       mocks.user.getMetadata.mockResolvedValue([
         {
-          key: UserMetadataKey.PREFERENCES,
+          key: UserMetadataKey.Preferences,
           value: {
             albums: {
-              defaultAssetOrder: AssetOrder.ASC,
+              defaultAssetOrder: AssetOrder.Asc,
             },
           },
         },
@@ -189,7 +189,7 @@ describe(AlbumService.name, () => {
 
       await sut.create(authStub.admin, {
         albumName: 'Empty album',
-        albumUsers: [{ userId: 'user-id', role: AlbumUserRole.EDITOR }],
+        albumUsers: [{ userId: 'user-id', role: AlbumUserRole.Editor }],
         description: '',
         assetIds: ['123'],
       });
@@ -203,7 +203,7 @@ describe(AlbumService.name, () => {
           albumThumbnailAssetId: '123',
         },
         ['123'],
-        [{ userId: 'user-id', role: AlbumUserRole.EDITOR }],
+        [{ userId: 'user-id', role: AlbumUserRole.Editor }],
       );
 
       expect(mocks.user.get).toHaveBeenCalledWith('user-id', {});
@@ -220,7 +220,7 @@ describe(AlbumService.name, () => {
       await expect(
         sut.create(authStub.admin, {
           albumName: 'Empty album',
-          albumUsers: [{ userId: 'user-3', role: AlbumUserRole.EDITOR }],
+          albumUsers: [{ userId: 'user-3', role: AlbumUserRole.Editor }],
         }),
       ).rejects.toBeInstanceOf(BadRequestException);
       expect(mocks.user.get).toHaveBeenCalledWith('user-3', {});
@@ -262,7 +262,7 @@ describe(AlbumService.name, () => {
       await expect(
         sut.create(authStub.admin, {
           albumName: 'Empty album',
-          albumUsers: [{ userId: userStub.admin.id, role: AlbumUserRole.EDITOR }],
+          albumUsers: [{ userId: userStub.admin.id, role: AlbumUserRole.Editor }],
         }),
       ).rejects.toBeInstanceOf(BadRequestException);
       expect(mocks.album.create).not.toHaveBeenCalled();
@@ -404,7 +404,7 @@ describe(AlbumService.name, () => {
       mocks.albumUser.create.mockResolvedValue({
         usersId: userStub.user2.id,
         albumsId: albumStub.sharedWithAdmin.id,
-        role: AlbumUserRole.EDITOR,
+        role: AlbumUserRole.Editor,
       });
       await sut.addUsers(authStub.user1, albumStub.sharedWithAdmin.id, {
         albumUsers: [{ userId: authStub.user2.user.id }],
@@ -512,11 +512,11 @@ describe(AlbumService.name, () => {
       mocks.albumUser.update.mockResolvedValue(null as any);
 
       await sut.updateUser(authStub.user1, albumStub.sharedWithAdmin.id, userStub.admin.id, {
-        role: AlbumUserRole.EDITOR,
+        role: AlbumUserRole.Editor,
       });
       expect(mocks.albumUser.update).toHaveBeenCalledWith(
         { albumsId: albumStub.sharedWithAdmin.id, usersId: userStub.admin.id },
-        { role: AlbumUserRole.EDITOR },
+        { role: AlbumUserRole.Editor },
       );
     });
   });
@@ -585,7 +585,7 @@ describe(AlbumService.name, () => {
       expect(mocks.access.album.checkSharedAlbumAccess).toHaveBeenCalledWith(
         authStub.user1.user.id,
         new Set(['album-123']),
-        AlbumUserRole.VIEWER,
+        AlbumUserRole.Viewer,
       );
     });
 
@@ -596,7 +596,7 @@ describe(AlbumService.name, () => {
       expect(mocks.access.album.checkSharedAlbumAccess).toHaveBeenCalledWith(
         authStub.admin.user.id,
         new Set(['album-123']),
-        AlbumUserRole.VIEWER,
+        AlbumUserRole.Viewer,
       );
     });
   });
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index 9008685e81..e4f2a44bfd 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -71,7 +71,7 @@ export class AlbumService extends BaseService {
   }
 
   async get(auth: AuthDto, id: string, dto: AlbumInfoDto): Promise<AlbumResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.ALBUM_READ, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AlbumRead, ids: [id] });
     await this.albumRepository.updateThumbnails();
     const withAssets = dto.withoutAssets === undefined ? true : !dto.withoutAssets;
     const album = await this.findOrFail(id, { withAssets });
@@ -102,7 +102,7 @@ export class AlbumService extends BaseService {
 
     const allowedAssetIdsSet = await this.checkAccess({
       auth,
-      permission: Permission.ASSET_SHARE,
+      permission: Permission.AssetShare,
       ids: dto.assetIds || [],
     });
     const assetIds = [...allowedAssetIdsSet].map((id) => id);
@@ -129,7 +129,7 @@ export class AlbumService extends BaseService {
   }
 
   async update(auth: AuthDto, id: string, dto: UpdateAlbumDto): Promise<AlbumResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.ALBUM_UPDATE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AlbumUpdate, ids: [id] });
 
     const album = await this.findOrFail(id, { withAssets: true });
 
@@ -152,13 +152,13 @@ export class AlbumService extends BaseService {
   }
 
   async delete(auth: AuthDto, id: string): Promise<void> {
-    await this.requireAccess({ auth, permission: Permission.ALBUM_DELETE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AlbumDelete, ids: [id] });
     await this.albumRepository.delete(id);
   }
 
   async addAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {
     const album = await this.findOrFail(id, { withAssets: false });
-    await this.requireAccess({ auth, permission: Permission.ALBUM_ADD_ASSET, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AlbumAddAsset, ids: [id] });
 
     const results = await addAssets(
       auth,
@@ -187,13 +187,13 @@ export class AlbumService extends BaseService {
   }
 
   async removeAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {
-    await this.requireAccess({ auth, permission: Permission.ALBUM_REMOVE_ASSET, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AlbumRemoveAsset, ids: [id] });
 
     const album = await this.findOrFail(id, { withAssets: false });
     const results = await removeAssets(
       auth,
       { access: this.accessRepository, bulk: this.albumRepository },
-      { parentId: id, assetIds: dto.ids, canAlwaysRemove: Permission.ALBUM_DELETE },
+      { parentId: id, assetIds: dto.ids, canAlwaysRemove: Permission.AlbumDelete },
     );
 
     const removedIds = results.filter(({ success }) => success).map(({ id }) => id);
@@ -205,7 +205,7 @@ export class AlbumService extends BaseService {
   }
 
   async addUsers(auth: AuthDto, id: string, { albumUsers }: AddUsersDto): Promise<AlbumResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.ALBUM_SHARE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AlbumShare, ids: [id] });
 
     const album = await this.findOrFail(id, { withAssets: false });
 
@@ -249,14 +249,14 @@ export class AlbumService extends BaseService {
 
     // non-admin can remove themselves
     if (auth.user.id !== userId) {
-      await this.requireAccess({ auth, permission: Permission.ALBUM_SHARE, ids: [id] });
+      await this.requireAccess({ auth, permission: Permission.AlbumShare, ids: [id] });
     }
 
     await this.albumUserRepository.delete({ albumsId: id, usersId: userId });
   }
 
   async updateUser(auth: AuthDto, id: string, userId: string, dto: UpdateAlbumUserDto): Promise<void> {
-    await this.requireAccess({ auth, permission: Permission.ALBUM_SHARE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AlbumShare, ids: [id] });
     await this.albumUserRepository.update({ albumsId: id, usersId: userId }, { role: dto.role });
   }
 
diff --git a/server/src/services/api-key.service.spec.ts b/server/src/services/api-key.service.spec.ts
index 3448b4330f..fffe7bb536 100644
--- a/server/src/services/api-key.service.spec.ts
+++ b/server/src/services/api-key.service.spec.ts
@@ -15,7 +15,7 @@ describe(ApiKeyService.name, () => {
   describe('create', () => {
     it('should create a new key', async () => {
       const auth = factory.auth();
-      const apiKey = factory.apiKey({ userId: auth.user.id, permissions: [Permission.ALL] });
+      const apiKey = factory.apiKey({ userId: auth.user.id, permissions: [Permission.All] });
       const key = 'super-secret';
 
       mocks.crypto.randomBytesAsText.mockReturnValue(key);
@@ -41,12 +41,12 @@ describe(ApiKeyService.name, () => {
       mocks.crypto.randomBytesAsText.mockReturnValue(key);
       mocks.apiKey.create.mockResolvedValue(apiKey);
 
-      await sut.create(auth, { permissions: [Permission.ALL] });
+      await sut.create(auth, { permissions: [Permission.All] });
 
       expect(mocks.apiKey.create).toHaveBeenCalledWith({
         key: 'super-secret (hashed)',
         name: 'API Key',
-        permissions: [Permission.ALL],
+        permissions: [Permission.All],
         userId: auth.user.id,
       });
       expect(mocks.crypto.randomBytesAsText).toHaveBeenCalled();
@@ -54,9 +54,9 @@ describe(ApiKeyService.name, () => {
     });
 
     it('should throw an error if the api key does not have sufficient permissions', async () => {
-      const auth = factory.auth({ apiKey: { permissions: [Permission.ASSET_READ] } });
+      const auth = factory.auth({ apiKey: { permissions: [Permission.AssetRead] } });
 
-      await expect(sut.create(auth, { permissions: [Permission.ASSET_UPDATE] })).rejects.toBeInstanceOf(
+      await expect(sut.create(auth, { permissions: [Permission.AssetUpdate] })).rejects.toBeInstanceOf(
         BadRequestException,
       );
     });
@@ -69,7 +69,7 @@ describe(ApiKeyService.name, () => {
 
       mocks.apiKey.getById.mockResolvedValue(void 0);
 
-      await expect(sut.update(auth, id, { name: 'New Name', permissions: [Permission.ALL] })).rejects.toBeInstanceOf(
+      await expect(sut.update(auth, id, { name: 'New Name', permissions: [Permission.All] })).rejects.toBeInstanceOf(
         BadRequestException,
       );
 
@@ -84,18 +84,18 @@ describe(ApiKeyService.name, () => {
       mocks.apiKey.getById.mockResolvedValue(apiKey);
       mocks.apiKey.update.mockResolvedValue(apiKey);
 
-      await sut.update(auth, apiKey.id, { name: newName, permissions: [Permission.ALL] });
+      await sut.update(auth, apiKey.id, { name: newName, permissions: [Permission.All] });
 
       expect(mocks.apiKey.update).toHaveBeenCalledWith(auth.user.id, apiKey.id, {
         name: newName,
-        permissions: [Permission.ALL],
+        permissions: [Permission.All],
       });
     });
 
     it('should update permissions', async () => {
       const auth = factory.auth();
       const apiKey = factory.apiKey({ userId: auth.user.id });
-      const newPermissions = [Permission.ACTIVITY_CREATE, Permission.ACTIVITY_READ, Permission.ACTIVITY_UPDATE];
+      const newPermissions = [Permission.ActivityCreate, Permission.ActivityRead, Permission.ActivityUpdate];
 
       mocks.apiKey.getById.mockResolvedValue(apiKey);
       mocks.apiKey.update.mockResolvedValue(apiKey);
diff --git a/server/src/services/asset-media.service.spec.ts b/server/src/services/asset-media.service.spec.ts
index bb8f7115b8..c881ebb497 100644
--- a/server/src/services/asset-media.service.spec.ts
+++ b/server/src/services/asset-media.service.spec.ts
@@ -157,7 +157,7 @@ const assetEntity = Object.freeze({
   ownerId: 'user_id_1',
   deviceAssetId: 'device_asset_id_1',
   deviceId: 'device_id_1',
-  type: AssetType.VIDEO,
+  type: AssetType.Video,
   originalPath: 'fake_path/asset_1.jpeg',
   fileModifiedAt: new Date('2022-06-19T23:41:36.910Z'),
   fileCreatedAt: new Date('2022-06-19T23:41:36.910Z'),
@@ -177,7 +177,7 @@ const assetEntity = Object.freeze({
 const existingAsset = Object.freeze({
   ...assetEntity,
   duration: null,
-  type: AssetType.IMAGE,
+  type: AssetType.Image,
   checksum: Buffer.from('_getExistingAsset', 'utf8'),
   libraryId: 'libraryId',
   originalFileName: 'existing-filename.jpeg',
@@ -384,7 +384,7 @@ describe(AssetMediaService.name, () => {
       });
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.DELETE_FILES,
+        name: JobName.DeleteFiles,
         data: { files: ['fake_path/asset_1.jpeg', undefined] },
       });
       expect(mocks.user.updateUsage).not.toHaveBeenCalled();
@@ -409,7 +409,7 @@ describe(AssetMediaService.name, () => {
       );
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.DELETE_FILES,
+        name: JobName.DeleteFiles,
         data: { files: ['fake_path/asset_1.jpeg', undefined] },
       });
       expect(mocks.user.updateUsage).not.toHaveBeenCalled();
@@ -437,7 +437,7 @@ describe(AssetMediaService.name, () => {
     it('should hide the linked motion asset', async () => {
       mocks.asset.getById.mockResolvedValueOnce({
         ...assetStub.livePhotoMotionAsset,
-        visibility: AssetVisibility.TIMELINE,
+        visibility: AssetVisibility.Timeline,
       });
       mocks.asset.create.mockResolvedValueOnce(assetStub.livePhotoStillAsset);
 
@@ -455,7 +455,7 @@ describe(AssetMediaService.name, () => {
       expect(mocks.asset.getById).toHaveBeenCalledWith('live-photo-motion-asset');
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: 'live-photo-motion-asset',
-        visibility: AssetVisibility.HIDDEN,
+        visibility: AssetVisibility.Hidden,
       });
     });
 
@@ -506,7 +506,7 @@ describe(AssetMediaService.name, () => {
         new ImmichFileResponse({
           path: '/original/path.jpg',
           contentType: 'image/jpeg',
-          cacheControl: CacheControl.PRIVATE_WITH_CACHE,
+          cacheControl: CacheControl.PrivateWithCache,
         }),
       );
     });
@@ -546,7 +546,7 @@ describe(AssetMediaService.name, () => {
           {
             id: '42',
             path: '/path/to/preview',
-            type: AssetFileType.THUMBNAIL,
+            type: AssetFileType.Thumbnail,
           },
         ],
       });
@@ -563,7 +563,7 @@ describe(AssetMediaService.name, () => {
           {
             id: '42',
             path: '/path/to/preview.jpg',
-            type: AssetFileType.PREVIEW,
+            type: AssetFileType.Preview,
           },
         ],
       });
@@ -573,7 +573,7 @@ describe(AssetMediaService.name, () => {
       ).resolves.toEqual(
         new ImmichFileResponse({
           path: '/path/to/preview.jpg',
-          cacheControl: CacheControl.PRIVATE_WITH_CACHE,
+          cacheControl: CacheControl.PrivateWithCache,
           contentType: 'image/jpeg',
           fileName: 'asset-id_thumbnail.jpg',
         }),
@@ -588,7 +588,7 @@ describe(AssetMediaService.name, () => {
       ).resolves.toEqual(
         new ImmichFileResponse({
           path: '/uploads/user-id/thumbs/path.jpg',
-          cacheControl: CacheControl.PRIVATE_WITH_CACHE,
+          cacheControl: CacheControl.PrivateWithCache,
           contentType: 'image/jpeg',
           fileName: 'asset-id_preview.jpg',
         }),
@@ -603,7 +603,7 @@ describe(AssetMediaService.name, () => {
       ).resolves.toEqual(
         new ImmichFileResponse({
           path: '/uploads/user-id/webp/path.ext',
-          cacheControl: CacheControl.PRIVATE_WITH_CACHE,
+          cacheControl: CacheControl.PrivateWithCache,
           contentType: 'application/octet-stream',
           fileName: 'asset-id_thumbnail.ext',
         }),
@@ -640,7 +640,7 @@ describe(AssetMediaService.name, () => {
       await expect(sut.playbackVideo(authStub.admin, assetStub.hasEncodedVideo.id)).resolves.toEqual(
         new ImmichFileResponse({
           path: assetStub.hasEncodedVideo.encodedVideoPath!,
-          cacheControl: CacheControl.PRIVATE_WITH_CACHE,
+          cacheControl: CacheControl.PrivateWithCache,
           contentType: 'video/mp4',
         }),
       );
@@ -653,7 +653,7 @@ describe(AssetMediaService.name, () => {
       await expect(sut.playbackVideo(authStub.admin, assetStub.video.id)).resolves.toEqual(
         new ImmichFileResponse({
           path: assetStub.video.originalPath,
-          cacheControl: CacheControl.PRIVATE_WITH_CACHE,
+          cacheControl: CacheControl.PrivateWithCache,
           contentType: 'application/octet-stream',
         }),
       );
@@ -723,7 +723,7 @@ describe(AssetMediaService.name, () => {
 
       expect(mocks.asset.updateAll).toHaveBeenCalledWith([copiedAsset.id], {
         deletedAt: expect.any(Date),
-        status: AssetStatus.TRASHED,
+        status: AssetStatus.Trashed,
       });
       expect(mocks.user.updateUsage).toHaveBeenCalledWith(authStub.user1.user.id, updatedFile.size);
       expect(mocks.storage.utimes).toHaveBeenCalledWith(
@@ -754,7 +754,7 @@ describe(AssetMediaService.name, () => {
 
       expect(mocks.asset.updateAll).toHaveBeenCalledWith([copiedAsset.id], {
         deletedAt: expect.any(Date),
-        status: AssetStatus.TRASHED,
+        status: AssetStatus.Trashed,
       });
       expect(mocks.user.updateUsage).toHaveBeenCalledWith(authStub.user1.user.id, updatedFile.size);
       expect(mocks.storage.utimes).toHaveBeenCalledWith(
@@ -783,7 +783,7 @@ describe(AssetMediaService.name, () => {
 
       expect(mocks.asset.updateAll).toHaveBeenCalledWith([copiedAsset.id], {
         deletedAt: expect.any(Date),
-        status: AssetStatus.TRASHED,
+        status: AssetStatus.Trashed,
       });
       expect(mocks.user.updateUsage).toHaveBeenCalledWith(authStub.user1.user.id, updatedFile.size);
       expect(mocks.storage.utimes).toHaveBeenCalledWith(
@@ -815,7 +815,7 @@ describe(AssetMediaService.name, () => {
       expect(mocks.asset.create).not.toHaveBeenCalled();
       expect(mocks.asset.updateAll).not.toHaveBeenCalled();
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.DELETE_FILES,
+        name: JobName.DeleteFiles,
         data: { files: [updatedFile.originalPath, undefined] },
       });
       expect(mocks.user.updateUsage).not.toHaveBeenCalled();
@@ -912,7 +912,7 @@ describe(AssetMediaService.name, () => {
       await sut.onUploadError(request, file);
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.DELETE_FILES,
+        name: JobName.DeleteFiles,
         data: { files: ['upload/upload/user-id/ra/nd/random-uuid.jpg'] },
       });
     });
diff --git a/server/src/services/asset-media.service.ts b/server/src/services/asset-media.service.ts
index 6fc438481d..127fdbe8eb 100644
--- a/server/src/services/asset-media.service.ts
+++ b/server/src/services/asset-media.service.ts
@@ -106,9 +106,9 @@ export class AssetMediaService extends BaseService {
   getUploadFolder({ auth, fieldName, file }: UploadRequest): string {
     auth = requireUploadAccess(auth);
 
-    let folder = StorageCore.getNestedFolder(StorageFolder.UPLOAD, auth.user.id, file.uuid);
+    let folder = StorageCore.getNestedFolder(StorageFolder.Upload, auth.user.id, file.uuid);
     if (fieldName === UploadFieldName.PROFILE_DATA) {
-      folder = StorageCore.getFolderLocation(StorageFolder.PROFILE, auth.user.id);
+      folder = StorageCore.getFolderLocation(StorageFolder.Profile, auth.user.id);
     }
 
     this.storageRepository.mkdirSync(folder);
@@ -121,7 +121,7 @@ export class AssetMediaService extends BaseService {
     const uploadFolder = this.getUploadFolder(asRequest(request, file));
     const uploadPath = `${uploadFolder}/${uploadFilename}`;
 
-    await this.jobRepository.queue({ name: JobName.DELETE_FILES, data: { files: [uploadPath] } });
+    await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files: [uploadPath] } });
   }
 
   async uploadAsset(
@@ -133,7 +133,7 @@ export class AssetMediaService extends BaseService {
     try {
       await this.requireAccess({
         auth,
-        permission: Permission.ASSET_UPLOAD,
+        permission: Permission.AssetUpload,
         // do not need an id here, but the interface requires it
         ids: [auth.user.id],
       });
@@ -164,7 +164,7 @@ export class AssetMediaService extends BaseService {
     sidecarFile?: UploadFile,
   ): Promise<AssetMediaResponseDto> {
     try {
-      await this.requireAccess({ auth, permission: Permission.ASSET_UPDATE, ids: [id] });
+      await this.requireAccess({ auth, permission: Permission.AssetUpdate, ids: [id] });
       const asset = await this.assetRepository.getById(id);
 
       if (!asset) {
@@ -179,7 +179,7 @@ export class AssetMediaService extends BaseService {
       // but the local variable holds the original file data paths.
       const copiedPhoto = await this.createCopy(asset);
       // and immediate trash it
-      await this.assetRepository.updateAll([copiedPhoto.id], { deletedAt: new Date(), status: AssetStatus.TRASHED });
+      await this.assetRepository.updateAll([copiedPhoto.id], { deletedAt: new Date(), status: AssetStatus.Trashed });
       await this.eventRepository.emit('AssetTrash', { assetId: copiedPhoto.id, userId: auth.user.id });
 
       await this.userRepository.updateUsage(auth.user.id, file.size);
@@ -191,14 +191,14 @@ export class AssetMediaService extends BaseService {
   }
 
   async downloadOriginal(auth: AuthDto, id: string): Promise<ImmichFileResponse> {
-    await this.requireAccess({ auth, permission: Permission.ASSET_DOWNLOAD, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AssetDownload, ids: [id] });
 
     const asset = await this.findOrFail(id);
 
     return new ImmichFileResponse({
       path: asset.originalPath,
       contentType: mimeTypes.lookup(asset.originalPath),
-      cacheControl: CacheControl.PRIVATE_WITH_CACHE,
+      cacheControl: CacheControl.PrivateWithCache,
     });
   }
 
@@ -207,7 +207,7 @@ export class AssetMediaService extends BaseService {
     id: string,
     dto: AssetMediaOptionsDto,
   ): Promise<ImmichFileResponse | AssetMediaRedirectResponse> {
-    await this.requireAccess({ auth, permission: Permission.ASSET_VIEW, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AssetView, ids: [id] });
 
     const asset = await this.findOrFail(id);
     const size = dto.size ?? AssetMediaSize.THUMBNAIL;
@@ -240,16 +240,16 @@ export class AssetMediaService extends BaseService {
       fileName,
       path: filepath,
       contentType: mimeTypes.lookup(filepath),
-      cacheControl: CacheControl.PRIVATE_WITH_CACHE,
+      cacheControl: CacheControl.PrivateWithCache,
     });
   }
 
   async playbackVideo(auth: AuthDto, id: string): Promise<ImmichFileResponse> {
-    await this.requireAccess({ auth, permission: Permission.ASSET_VIEW, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AssetView, ids: [id] });
 
     const asset = await this.findOrFail(id);
 
-    if (asset.type !== AssetType.VIDEO) {
+    if (asset.type !== AssetType.Video) {
       throw new BadRequestException('Asset is not a video');
     }
 
@@ -258,7 +258,7 @@ export class AssetMediaService extends BaseService {
     return new ImmichFileResponse({
       path: filepath,
       contentType: mimeTypes.lookup(filepath),
-      cacheControl: CacheControl.PRIVATE_WITH_CACHE,
+      cacheControl: CacheControl.PrivateWithCache,
     });
   }
 
@@ -312,7 +312,7 @@ export class AssetMediaService extends BaseService {
   ): Promise<AssetMediaResponseDto> {
     // clean up files
     await this.jobRepository.queue({
-      name: JobName.DELETE_FILES,
+      name: JobName.DeleteFiles,
       data: { files: [file.originalPath, sidecarFile?.originalPath] },
     });
 
@@ -365,7 +365,7 @@ export class AssetMediaService extends BaseService {
     await this.storageRepository.utimes(file.originalPath, new Date(), new Date(dto.fileModifiedAt));
     await this.assetRepository.upsertExif({ assetId, fileSizeInByte: file.size });
     await this.jobRepository.queue({
-      name: JobName.METADATA_EXTRACTION,
+      name: JobName.MetadataExtraction,
       data: { id: assetId, source: 'upload' },
     });
   }
@@ -394,7 +394,7 @@ export class AssetMediaService extends BaseService {
 
     const { size } = await this.storageRepository.stat(created.originalPath);
     await this.assetRepository.upsertExif({ assetId: created.id, fileSizeInByte: size });
-    await this.jobRepository.queue({ name: JobName.METADATA_EXTRACTION, data: { id: created.id, source: 'copy' } });
+    await this.jobRepository.queue({ name: JobName.MetadataExtraction, data: { id: created.id, source: 'copy' } });
     return created;
   }
 
@@ -416,7 +416,7 @@ export class AssetMediaService extends BaseService {
       type: mimeTypes.assetType(file.originalPath),
       isFavorite: dto.isFavorite,
       duration: dto.duration || null,
-      visibility: dto.visibility ?? AssetVisibility.TIMELINE,
+      visibility: dto.visibility ?? AssetVisibility.Timeline,
       livePhotoVideoId: dto.livePhotoVideoId,
       originalFileName: dto.filename || file.originalName,
       sidecarPath: sidecarFile?.originalPath,
@@ -427,7 +427,7 @@ export class AssetMediaService extends BaseService {
     }
     await this.storageRepository.utimes(file.originalPath, new Date(), new Date(dto.fileModifiedAt));
     await this.assetRepository.upsertExif({ assetId: asset.id, fileSizeInByte: file.size });
-    await this.jobRepository.queue({ name: JobName.METADATA_EXTRACTION, data: { id: asset.id, source: 'upload' } });
+    await this.jobRepository.queue({ name: JobName.MetadataExtraction, data: { id: asset.id, source: 'upload' } });
 
     return asset;
   }
diff --git a/server/src/services/asset.service.spec.ts b/server/src/services/asset.service.spec.ts
index 65b14ca2da..606c93eab8 100755
--- a/server/src/services/asset.service.spec.ts
+++ b/server/src/services/asset.service.spec.ts
@@ -13,10 +13,10 @@ import { factory } from 'test/small.factory';
 import { makeStream, newTestService, ServiceMocks } from 'test/utils';
 
 const stats: AssetStats = {
-  [AssetType.IMAGE]: 10,
-  [AssetType.VIDEO]: 23,
-  [AssetType.AUDIO]: 0,
-  [AssetType.OTHER]: 0,
+  [AssetType.Image]: 10,
+  [AssetType.Video]: 23,
+  [AssetType.Audio]: 0,
+  [AssetType.Other]: 0,
 };
 
 const statResponse: AssetStatsResponseDto = {
@@ -46,21 +46,21 @@ describe(AssetService.name, () => {
   describe('getStatistics', () => {
     it('should get the statistics for a user, excluding archived assets', async () => {
       mocks.asset.getStatistics.mockResolvedValue(stats);
-      await expect(sut.getStatistics(authStub.admin, { visibility: AssetVisibility.TIMELINE })).resolves.toEqual(
+      await expect(sut.getStatistics(authStub.admin, { visibility: AssetVisibility.Timeline })).resolves.toEqual(
         statResponse,
       );
       expect(mocks.asset.getStatistics).toHaveBeenCalledWith(authStub.admin.user.id, {
-        visibility: AssetVisibility.TIMELINE,
+        visibility: AssetVisibility.Timeline,
       });
     });
 
     it('should get the statistics for a user for archived assets', async () => {
       mocks.asset.getStatistics.mockResolvedValue(stats);
-      await expect(sut.getStatistics(authStub.admin, { visibility: AssetVisibility.ARCHIVE })).resolves.toEqual(
+      await expect(sut.getStatistics(authStub.admin, { visibility: AssetVisibility.Archive })).resolves.toEqual(
         statResponse,
       );
       expect(mocks.asset.getStatistics).toHaveBeenCalledWith(authStub.admin.user.id, {
-        visibility: AssetVisibility.ARCHIVE,
+        visibility: AssetVisibility.Archive,
       });
     });
 
@@ -202,7 +202,7 @@ describe(AssetService.name, () => {
   describe('update', () => {
     it('should require asset write access for the id', async () => {
       await expect(
-        sut.update(authStub.admin, 'asset-1', { visibility: AssetVisibility.TIMELINE }),
+        sut.update(authStub.admin, 'asset-1', { visibility: AssetVisibility.Timeline }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
       expect(mocks.asset.update).not.toHaveBeenCalled();
@@ -253,7 +253,7 @@ describe(AssetService.name, () => {
       });
       expect(mocks.asset.update).not.toHaveBeenCalledWith({
         id: assetStub.livePhotoMotionAsset.id,
-        visibility: AssetVisibility.TIMELINE,
+        visibility: AssetVisibility.Timeline,
       });
       expect(mocks.event.emit).not.toHaveBeenCalledWith('AssetShow', {
         assetId: assetStub.livePhotoMotionAsset.id,
@@ -277,7 +277,7 @@ describe(AssetService.name, () => {
       });
       expect(mocks.asset.update).not.toHaveBeenCalledWith({
         id: assetStub.livePhotoMotionAsset.id,
-        visibility: AssetVisibility.TIMELINE,
+        visibility: AssetVisibility.Timeline,
       });
       expect(mocks.event.emit).not.toHaveBeenCalledWith('AssetShow', {
         assetId: assetStub.livePhotoMotionAsset.id,
@@ -301,7 +301,7 @@ describe(AssetService.name, () => {
       });
       expect(mocks.asset.update).not.toHaveBeenCalledWith({
         id: assetStub.livePhotoMotionAsset.id,
-        visibility: AssetVisibility.TIMELINE,
+        visibility: AssetVisibility.Timeline,
       });
       expect(mocks.event.emit).not.toHaveBeenCalledWith('AssetShow', {
         assetId: assetStub.livePhotoMotionAsset.id,
@@ -314,7 +314,7 @@ describe(AssetService.name, () => {
       mocks.asset.getById.mockResolvedValueOnce({
         ...assetStub.livePhotoMotionAsset,
         ownerId: authStub.admin.user.id,
-        visibility: AssetVisibility.TIMELINE,
+        visibility: AssetVisibility.Timeline,
       });
       mocks.asset.getById.mockResolvedValueOnce(assetStub.image);
       mocks.asset.update.mockResolvedValue(assetStub.image);
@@ -325,7 +325,7 @@ describe(AssetService.name, () => {
 
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.livePhotoMotionAsset.id,
-        visibility: AssetVisibility.HIDDEN,
+        visibility: AssetVisibility.Hidden,
       });
       expect(mocks.event.emit).toHaveBeenCalledWith('AssetHide', {
         assetId: assetStub.livePhotoMotionAsset.id,
@@ -392,10 +392,10 @@ describe(AssetService.name, () => {
     it('should update all assets', async () => {
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
 
-      await sut.updateAll(authStub.admin, { ids: ['asset-1', 'asset-2'], visibility: AssetVisibility.ARCHIVE });
+      await sut.updateAll(authStub.admin, { ids: ['asset-1', 'asset-2'], visibility: AssetVisibility.Archive });
 
       expect(mocks.asset.updateAll).toHaveBeenCalledWith(['asset-1', 'asset-2'], {
-        visibility: AssetVisibility.ARCHIVE,
+        visibility: AssetVisibility.Archive,
       });
     });
 
@@ -428,7 +428,7 @@ describe(AssetService.name, () => {
       expect(mocks.asset.updateAll).toHaveBeenCalled();
       expect(mocks.asset.updateAllExif).toHaveBeenCalledWith(['asset-1'], { latitude: 0, longitude: 0 });
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.SIDECAR_WRITE, data: { id: 'asset-1', latitude: 0, longitude: 0 } },
+        { name: JobName.SidecarWrite, data: { id: 'asset-1', latitude: 0, longitude: 0 } },
       ]);
     });
 
@@ -451,7 +451,7 @@ describe(AssetService.name, () => {
         longitude: 50,
       });
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.SIDECAR_WRITE, data: { id: 'asset-1', dateTimeOriginal, latitude: 30, longitude: 50 } },
+        { name: JobName.SidecarWrite, data: { id: 'asset-1', dateTimeOriginal, latitude: 30, longitude: 50 } },
       ]);
     });
 
@@ -497,7 +497,7 @@ describe(AssetService.name, () => {
 
       expect(mocks.asset.updateAll).toHaveBeenCalledWith(['asset1', 'asset2'], {
         deletedAt: expect.any(Date),
-        status: AssetStatus.TRASHED,
+        status: AssetStatus.Trashed,
       });
       expect(mocks.job.queue.mock.calls).toEqual([]);
     });
@@ -518,11 +518,11 @@ describe(AssetService.name, () => {
       mocks.assetJob.streamForDeletedJob.mockReturnValue(makeStream([asset]));
       mocks.systemMetadata.get.mockResolvedValue({ trash: { enabled: false } });
 
-      await expect(sut.handleAssetDeletionCheck()).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleAssetDeletionCheck()).resolves.toBe(JobStatus.Success);
 
       expect(mocks.assetJob.streamForDeletedJob).toHaveBeenCalledWith(new Date());
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.ASSET_DELETION, data: { id: asset.id, deleteOnDisk: true } },
+        { name: JobName.AssetDeletion, data: { id: asset.id, deleteOnDisk: true } },
       ]);
     });
 
@@ -532,11 +532,11 @@ describe(AssetService.name, () => {
       mocks.assetJob.streamForDeletedJob.mockReturnValue(makeStream([asset]));
       mocks.systemMetadata.get.mockResolvedValue({ trash: { enabled: true, days: 7 } });
 
-      await expect(sut.handleAssetDeletionCheck()).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleAssetDeletionCheck()).resolves.toBe(JobStatus.Success);
 
       expect(mocks.assetJob.streamForDeletedJob).toHaveBeenCalledWith(DateTime.now().minus({ days: 7 }).toJSDate());
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.ASSET_DELETION, data: { id: asset.id, deleteOnDisk: true } },
+        { name: JobName.AssetDeletion, data: { id: asset.id, deleteOnDisk: true } },
       ]);
     });
   });
@@ -552,7 +552,7 @@ describe(AssetService.name, () => {
       expect(mocks.job.queue.mock.calls).toEqual([
         [
           {
-            name: JobName.DELETE_FILES,
+            name: JobName.DeleteFiles,
             data: {
               files: [
                 '/uploads/user-id/webp/path.ext',
@@ -606,7 +606,7 @@ describe(AssetService.name, () => {
       expect(mocks.job.queue.mock.calls).toEqual([
         [
           {
-            name: JobName.ASSET_DELETION,
+            name: JobName.AssetDeletion,
             data: {
               id: assetStub.livePhotoMotionAsset.id,
               deleteOnDisk: true,
@@ -615,7 +615,7 @@ describe(AssetService.name, () => {
         ],
         [
           {
-            name: JobName.DELETE_FILES,
+            name: JobName.DeleteFiles,
             data: {
               files: [
                 '/uploads/user-id/webp/path.ext',
@@ -643,7 +643,7 @@ describe(AssetService.name, () => {
       expect(mocks.job.queue.mock.calls).toEqual([
         [
           {
-            name: JobName.DELETE_FILES,
+            name: JobName.DeleteFiles,
             data: {
               files: [
                 '/uploads/user-id/webp/path.ext',
@@ -668,7 +668,7 @@ describe(AssetService.name, () => {
     it('should fail if asset could not be found', async () => {
       mocks.assetJob.getForAssetDeletion.mockResolvedValue(void 0);
       await expect(sut.handleAssetDeletion({ id: assetStub.image.id, deleteOnDisk: true })).resolves.toBe(
-        JobStatus.FAILED,
+        JobStatus.Failed,
       );
     });
   });
@@ -679,7 +679,7 @@ describe(AssetService.name, () => {
 
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REFRESH_FACES });
 
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.FACE_DETECTION, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.FaceDetection, data: { id: 'asset-1' } }]);
     });
 
     it('should run the refresh metadata job', async () => {
@@ -687,7 +687,7 @@ describe(AssetService.name, () => {
 
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REFRESH_METADATA });
 
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.METADATA_EXTRACTION, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.MetadataExtraction, data: { id: 'asset-1' } }]);
     });
 
     it('should run the refresh thumbnails job', async () => {
@@ -695,7 +695,7 @@ describe(AssetService.name, () => {
 
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REGENERATE_THUMBNAIL });
 
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.GenerateThumbnails, data: { id: 'asset-1' } }]);
     });
 
     it('should run the transcode video', async () => {
@@ -703,7 +703,7 @@ describe(AssetService.name, () => {
 
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.TRANSCODE_VIDEO });
 
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.VIDEO_CONVERSION, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.VideoConversation, data: { id: 'asset-1' } }]);
     });
   });
 
diff --git a/server/src/services/asset.service.ts b/server/src/services/asset.service.ts
index 351e8827dd..d9b0527d5b 100644
--- a/server/src/services/asset.service.ts
+++ b/server/src/services/asset.service.ts
@@ -23,7 +23,7 @@ import { getAssetFiles, getMyPartnerIds, onAfterUnlink, onBeforeLink, onBeforeUn
 @Injectable()
 export class AssetService extends BaseService {
   async getStatistics(auth: AuthDto, dto: AssetStatsDto) {
-    if (dto.visibility === AssetVisibility.LOCKED) {
+    if (dto.visibility === AssetVisibility.Locked) {
       requireElevatedPermission(auth);
     }
 
@@ -46,7 +46,7 @@ export class AssetService extends BaseService {
   }
 
   async get(auth: AuthDto, id: string): Promise<AssetResponseDto | SanitizedAssetResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.ASSET_READ, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AssetRead, ids: [id] });
 
     const asset = await this.assetRepository.getById(id, {
       exifInfo: true,
@@ -78,7 +78,7 @@ export class AssetService extends BaseService {
   }
 
   async update(auth: AuthDto, id: string, dto: UpdateAssetDto): Promise<AssetResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.ASSET_UPDATE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AssetUpdate, ids: [id] });
 
     const { description, dateTimeOriginal, latitude, longitude, rating, ...rest } = dto;
     const repos = { asset: this.assetRepository, event: this.eventRepository };
@@ -114,7 +114,7 @@ export class AssetService extends BaseService {
 
   async updateAll(auth: AuthDto, dto: AssetBulkUpdateDto): Promise<void> {
     const { ids, description, dateTimeOriginal, latitude, longitude, ...options } = dto;
-    await this.requireAccess({ auth, permission: Permission.ASSET_UPDATE, ids });
+    await this.requireAccess({ auth, permission: Permission.AssetUpdate, ids });
 
     if (
       description !== undefined ||
@@ -125,7 +125,7 @@ export class AssetService extends BaseService {
       await this.assetRepository.updateAllExif(ids, { description, dateTimeOriginal, latitude, longitude });
       await this.jobRepository.queueAll(
         ids.map((id) => ({
-          name: JobName.SIDECAR_WRITE,
+          name: JobName.SidecarWrite,
           data: { id, description, dateTimeOriginal, latitude, longitude },
         })),
       );
@@ -139,13 +139,13 @@ export class AssetService extends BaseService {
     ) {
       await this.assetRepository.updateAll(ids, options);
 
-      if (options.visibility === AssetVisibility.LOCKED) {
+      if (options.visibility === AssetVisibility.Locked) {
         await this.albumRepository.removeAssetsFromAll(ids);
       }
     }
   }
 
-  @OnJob({ name: JobName.ASSET_DELETION_CHECK, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.AssetDeletionCheck, queue: QueueName.BackgroundTask })
   async handleAssetDeletionCheck(): Promise<JobStatus> {
     const config = await this.getConfig({ withCache: false });
     const trashedDays = config.trash.enabled ? config.trash.days : 0;
@@ -158,7 +158,7 @@ export class AssetService extends BaseService {
       if (chunk.length > 0) {
         await this.jobRepository.queueAll(
           chunk.map(({ id, isOffline }) => ({
-            name: JobName.ASSET_DELETION,
+            name: JobName.AssetDeletion,
             data: { id, deleteOnDisk: !isOffline },
           })),
         );
@@ -176,17 +176,17 @@ export class AssetService extends BaseService {
 
     await queueChunk();
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.ASSET_DELETION, queue: QueueName.BACKGROUND_TASK })
-  async handleAssetDeletion(job: JobOf<JobName.ASSET_DELETION>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetDeletion, queue: QueueName.BackgroundTask })
+  async handleAssetDeletion(job: JobOf<JobName.AssetDeletion>): Promise<JobStatus> {
     const { id, deleteOnDisk } = job;
 
     const asset = await this.assetJobRepository.getForAssetDeletion(id);
 
     if (!asset) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     // Replace the parent of the stack children with a new asset
@@ -215,7 +215,7 @@ export class AssetService extends BaseService {
       const count = await this.assetRepository.getLivePhotoCount(asset.livePhotoVideoId);
       if (count === 0) {
         await this.jobRepository.queue({
-          name: JobName.ASSET_DELETION,
+          name: JobName.AssetDeletion,
           data: { id: asset.livePhotoVideoId, deleteOnDisk },
         });
       }
@@ -228,18 +228,18 @@ export class AssetService extends BaseService {
       files.push(asset.sidecarPath, asset.originalPath);
     }
 
-    await this.jobRepository.queue({ name: JobName.DELETE_FILES, data: { files } });
+    await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files } });
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   async deleteAll(auth: AuthDto, dto: AssetBulkDeleteDto): Promise<void> {
     const { ids, force } = dto;
 
-    await this.requireAccess({ auth, permission: Permission.ASSET_DELETE, ids });
+    await this.requireAccess({ auth, permission: Permission.AssetDelete, ids });
     await this.assetRepository.updateAll(ids, {
       deletedAt: new Date(),
-      status: force ? AssetStatus.DELETED : AssetStatus.TRASHED,
+      status: force ? AssetStatus.Deleted : AssetStatus.Trashed,
     });
     await this.eventRepository.emit(force ? 'AssetDeleteAll' : 'AssetTrashAll', {
       assetIds: ids,
@@ -248,29 +248,29 @@ export class AssetService extends BaseService {
   }
 
   async run(auth: AuthDto, dto: AssetJobsDto) {
-    await this.requireAccess({ auth, permission: Permission.ASSET_UPDATE, ids: dto.assetIds });
+    await this.requireAccess({ auth, permission: Permission.AssetUpdate, ids: dto.assetIds });
 
     const jobs: JobItem[] = [];
 
     for (const id of dto.assetIds) {
       switch (dto.name) {
         case AssetJobName.REFRESH_FACES: {
-          jobs.push({ name: JobName.FACE_DETECTION, data: { id } });
+          jobs.push({ name: JobName.FaceDetection, data: { id } });
           break;
         }
 
         case AssetJobName.REFRESH_METADATA: {
-          jobs.push({ name: JobName.METADATA_EXTRACTION, data: { id } });
+          jobs.push({ name: JobName.MetadataExtraction, data: { id } });
           break;
         }
 
         case AssetJobName.REGENERATE_THUMBNAIL: {
-          jobs.push({ name: JobName.GENERATE_THUMBNAILS, data: { id } });
+          jobs.push({ name: JobName.GenerateThumbnails, data: { id } });
           break;
         }
 
         case AssetJobName.TRANSCODE_VIDEO: {
-          jobs.push({ name: JobName.VIDEO_CONVERSION, data: { id } });
+          jobs.push({ name: JobName.VideoConversation, data: { id } });
           break;
         }
       }
@@ -292,7 +292,7 @@ export class AssetService extends BaseService {
     const writes = _.omitBy({ description, dateTimeOriginal, latitude, longitude, rating }, _.isUndefined);
     if (Object.keys(writes).length > 0) {
       await this.assetRepository.upsertExif({ assetId: id, ...writes });
-      await this.jobRepository.queue({ name: JobName.SIDECAR_WRITE, data: { id, ...writes } });
+      await this.jobRepository.queue({ name: JobName.SidecarWrite, data: { id, ...writes } });
     }
   }
 }
diff --git a/server/src/services/audit.service.spec.ts b/server/src/services/audit.service.spec.ts
index 381b2ec7e8..7363ea74e1 100644
--- a/server/src/services/audit.service.spec.ts
+++ b/server/src/services/audit.service.spec.ts
@@ -18,7 +18,7 @@ describe(AuditService.name, () => {
     it('should delete old audit entries', async () => {
       mocks.audit.removeBefore.mockResolvedValue();
 
-      await expect(sut.handleCleanup()).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleCleanup()).resolves.toBe(JobStatus.Success);
 
       expect(mocks.audit.removeBefore).toHaveBeenCalledWith(expect.any(Date));
     });
diff --git a/server/src/services/audit.service.ts b/server/src/services/audit.service.ts
index 7c9a070dd0..eaa48de1f4 100644
--- a/server/src/services/audit.service.ts
+++ b/server/src/services/audit.service.ts
@@ -7,9 +7,9 @@ import { BaseService } from 'src/services/base.service';
 
 @Injectable()
 export class AuditService extends BaseService {
-  @OnJob({ name: JobName.CLEAN_OLD_AUDIT_LOGS, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.CleanOldAuditLogs, queue: QueueName.BackgroundTask })
   async handleCleanup(): Promise<JobStatus> {
     await this.auditRepository.removeBefore(DateTime.now().minus(AUDIT_LOG_MAX_DURATION).toJSDate());
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 }
diff --git a/server/src/services/auth.service.spec.ts b/server/src/services/auth.service.spec.ts
index 93bd265ba0..f52fd9dd81 100644
--- a/server/src/services/auth.service.spec.ts
+++ b/server/src/services/auth.service.spec.ts
@@ -154,7 +154,7 @@ describe(AuthService.name, () => {
 
       mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.enabled);
 
-      await expect(sut.logout(auth, AuthType.OAUTH)).resolves.toEqual({
+      await expect(sut.logout(auth, AuthType.OAuth)).resolves.toEqual({
         successful: true,
         redirectUri: 'http://end-session-endpoint',
       });
@@ -163,7 +163,7 @@ describe(AuthService.name, () => {
     it('should return the default redirect', async () => {
       const auth = factory.auth();
 
-      await expect(sut.logout(auth, AuthType.PASSWORD)).resolves.toEqual({
+      await expect(sut.logout(auth, AuthType.Password)).resolves.toEqual({
         successful: true,
         redirectUri: '/auth/login?autoLaunch=0',
       });
@@ -173,7 +173,7 @@ describe(AuthService.name, () => {
       const auth = { user: { id: '123' }, session: { id: 'token123' } } as AuthDto;
       mocks.session.delete.mockResolvedValue();
 
-      await expect(sut.logout(auth, AuthType.PASSWORD)).resolves.toEqual({
+      await expect(sut.logout(auth, AuthType.Password)).resolves.toEqual({
         successful: true,
         redirectUri: '/auth/login?autoLaunch=0',
       });
@@ -185,7 +185,7 @@ describe(AuthService.name, () => {
     it('should return the default redirect if auth type is OAUTH but oauth is not enabled', async () => {
       const auth = { user: { id: '123' } } as AuthDto;
 
-      await expect(sut.logout(auth, AuthType.OAUTH)).resolves.toEqual({
+      await expect(sut.logout(auth, AuthType.OAuth)).resolves.toEqual({
         successful: true,
         redirectUri: '/auth/login?autoLaunch=0',
       });
@@ -463,7 +463,7 @@ describe(AuthService.name, () => {
         sut.authenticate({
           headers: { 'x-api-key': 'auth_token' },
           queryParams: {},
-          metadata: { adminRoute: false, sharedLinkRoute: false, uri: 'test', permission: Permission.ASSET_READ },
+          metadata: { adminRoute: false, sharedLinkRoute: false, uri: 'test', permission: Permission.AssetRead },
         }),
       ).rejects.toBeInstanceOf(ForbiddenException);
     });
diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
index a7b0cb3259..00b7c1e9aa 100644
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -194,13 +194,13 @@ export class AuthService extends BaseService {
   }
 
   private async validate({ headers, queryParams }: Omit<ValidateRequest, 'metadata'>): Promise<AuthDto> {
-    const shareKey = (headers[ImmichHeader.SHARED_LINK_KEY] || queryParams[ImmichQuery.SHARED_LINK_KEY]) as string;
-    const session = (headers[ImmichHeader.USER_TOKEN] ||
-      headers[ImmichHeader.SESSION_TOKEN] ||
-      queryParams[ImmichQuery.SESSION_KEY] ||
+    const shareKey = (headers[ImmichHeader.SharedLinkKey] || queryParams[ImmichQuery.SharedLinkKey]) as string;
+    const session = (headers[ImmichHeader.UserToken] ||
+      headers[ImmichHeader.SessionToken] ||
+      queryParams[ImmichQuery.SessionKey] ||
       this.getBearerToken(headers) ||
       this.getCookieToken(headers)) as string;
-    const apiKey = (headers[ImmichHeader.API_KEY] || queryParams[ImmichQuery.API_KEY]) as string;
+    const apiKey = (headers[ImmichHeader.ApiKey] || queryParams[ImmichQuery.ApiKey]) as string;
 
     if (shareKey) {
       return this.validateSharedLink(shareKey);
@@ -321,7 +321,7 @@ export class AuthService extends BaseService {
       const { contentType, data } = await this.oauthRepository.getProfilePicture(url);
       const extensionWithDot = mimeTypes.toExtension(contentType || 'image/jpeg') ?? 'jpg';
       const profileImagePath = join(
-        StorageCore.getFolderLocation(StorageFolder.PROFILE, user.id),
+        StorageCore.getFolderLocation(StorageFolder.Profile, user.id),
         `${this.cryptoRepository.randomUUID()}${extensionWithDot}`,
       );
 
@@ -330,7 +330,7 @@ export class AuthService extends BaseService {
       await this.userRepository.update(user.id, { profileImagePath, profileChangedAt: new Date() });
 
       if (oldPath) {
-        await this.jobRepository.queue({ name: JobName.DELETE_FILES, data: { files: [oldPath] } });
+        await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files: [oldPath] } });
       }
     } catch (error: Error | any) {
       this.logger.warn(`Unable to sync oauth profile picture: ${error}`, error?.stack);
@@ -366,7 +366,7 @@ export class AuthService extends BaseService {
   }
 
   private async getLogoutEndpoint(authType: AuthType): Promise<string> {
-    if (authType !== AuthType.OAUTH) {
+    if (authType !== AuthType.OAuth) {
       return LOGIN_URL;
     }
 
@@ -389,17 +389,17 @@ export class AuthService extends BaseService {
 
   private getCookieToken(headers: IncomingHttpHeaders): string | null {
     const cookies = parse(headers.cookie || '');
-    return cookies[ImmichCookie.ACCESS_TOKEN] || null;
+    return cookies[ImmichCookie.AccessToken] || null;
   }
 
   private getCookieOauthState(headers: IncomingHttpHeaders): string | null {
     const cookies = parse(headers.cookie || '');
-    return cookies[ImmichCookie.OAUTH_STATE] || null;
+    return cookies[ImmichCookie.OAuthState] || null;
   }
 
   private getCookieCodeVerifier(headers: IncomingHttpHeaders): string | null {
     const cookies = parse(headers.cookie || '');
-    return cookies[ImmichCookie.OAUTH_CODE_VERIFIER] || null;
+    return cookies[ImmichCookie.OAuthCodeVerifier] || null;
   }
 
   async validateSharedLink(key: string | string[]): Promise<AuthDto> {
diff --git a/server/src/services/backup.service.spec.ts b/server/src/services/backup.service.spec.ts
index aa72fd588a..e36f699f53 100644
--- a/server/src/services/backup.service.spec.ts
+++ b/server/src/services/backup.service.spec.ts
@@ -38,7 +38,7 @@ describe(BackupService.name, () => {
     });
 
     it('should not initialise backup database job when running on microservices', async () => {
-      mocks.config.getWorker.mockReturnValue(ImmichWorker.MICROSERVICES);
+      mocks.config.getWorker.mockReturnValue(ImmichWorker.Microservices);
       await sut.onConfigInit({ newConfig: systemConfigStub.backupEnabled as SystemConfig });
 
       expect(mocks.cron.create).not.toHaveBeenCalled();
@@ -98,10 +98,10 @@ describe(BackupService.name, () => {
       await sut.cleanupDatabaseBackups();
       expect(mocks.storage.unlink).toHaveBeenCalledTimes(2);
       expect(mocks.storage.unlink).toHaveBeenCalledWith(
-        `${StorageCore.getBaseFolder(StorageFolder.BACKUPS)}/immich-db-backup-123.sql.gz.tmp`,
+        `${StorageCore.getBaseFolder(StorageFolder.Backups)}/immich-db-backup-123.sql.gz.tmp`,
       );
       expect(mocks.storage.unlink).toHaveBeenCalledWith(
-        `${StorageCore.getBaseFolder(StorageFolder.BACKUPS)}/immich-db-backup-345.sql.gz.tmp`,
+        `${StorageCore.getBaseFolder(StorageFolder.Backups)}/immich-db-backup-345.sql.gz.tmp`,
       );
     });
 
@@ -111,7 +111,7 @@ describe(BackupService.name, () => {
       await sut.cleanupDatabaseBackups();
       expect(mocks.storage.unlink).toHaveBeenCalledTimes(1);
       expect(mocks.storage.unlink).toHaveBeenCalledWith(
-        `${StorageCore.getBaseFolder(StorageFolder.BACKUPS)}/immich-db-backup-1.sql.gz`,
+        `${StorageCore.getBaseFolder(StorageFolder.Backups)}/immich-db-backup-1.sql.gz`,
       );
     });
 
@@ -125,10 +125,10 @@ describe(BackupService.name, () => {
       await sut.cleanupDatabaseBackups();
       expect(mocks.storage.unlink).toHaveBeenCalledTimes(2);
       expect(mocks.storage.unlink).toHaveBeenCalledWith(
-        `${StorageCore.getBaseFolder(StorageFolder.BACKUPS)}/immich-db-backup-1.sql.gz.tmp`,
+        `${StorageCore.getBaseFolder(StorageFolder.Backups)}/immich-db-backup-1.sql.gz.tmp`,
       );
       expect(mocks.storage.unlink).toHaveBeenCalledWith(
-        `${StorageCore.getBaseFolder(StorageFolder.BACKUPS)}/immich-db-backup-2.sql.gz`,
+        `${StorageCore.getBaseFolder(StorageFolder.Backups)}/immich-db-backup-2.sql.gz`,
       );
     });
   });
@@ -145,13 +145,13 @@ describe(BackupService.name, () => {
 
     it('should run a database backup successfully', async () => {
       const result = await sut.handleBackupDatabase();
-      expect(result).toBe(JobStatus.SUCCESS);
+      expect(result).toBe(JobStatus.Success);
       expect(mocks.storage.createWriteStream).toHaveBeenCalled();
     });
 
     it('should rename file on success', async () => {
       const result = await sut.handleBackupDatabase();
-      expect(result).toBe(JobStatus.SUCCESS);
+      expect(result).toBe(JobStatus.Success);
       expect(mocks.storage.rename).toHaveBeenCalled();
     });
 
@@ -219,7 +219,7 @@ describe(BackupService.name, () => {
       mocks.database.getPostgresVersion.mockResolvedValue(postgresVersion);
       const result = await sut.handleBackupDatabase();
       expect(mocks.process.spawn).not.toHaveBeenCalled();
-      expect(result).toBe(JobStatus.FAILED);
+      expect(result).toBe(JobStatus.Failed);
     });
   });
 });
diff --git a/server/src/services/backup.service.ts b/server/src/services/backup.service.ts
index 79c5deee57..a5882b4f80 100644
--- a/server/src/services/backup.service.ts
+++ b/server/src/services/backup.service.ts
@@ -14,7 +14,7 @@ import { handlePromiseError } from 'src/utils/misc';
 export class BackupService extends BaseService {
   private backupLock = false;
 
-  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.MICROSERVICES] })
+  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.Microservices] })
   async onConfigInit({
     newConfig: {
       backup: { database },
@@ -26,7 +26,7 @@ export class BackupService extends BaseService {
       this.cronRepository.create({
         name: 'backupDatabase',
         expression: database.cronExpression,
-        onTick: () => handlePromiseError(this.jobRepository.queue({ name: JobName.BACKUP_DATABASE }), this.logger),
+        onTick: () => handlePromiseError(this.jobRepository.queue({ name: JobName.BackupDatabase }), this.logger),
         start: database.enabled,
       });
     }
@@ -51,7 +51,7 @@ export class BackupService extends BaseService {
       backup: { database: config },
     } = await this.getConfig({ withCache: false });
 
-    const backupsFolder = StorageCore.getBaseFolder(StorageFolder.BACKUPS);
+    const backupsFolder = StorageCore.getBaseFolder(StorageFolder.Backups);
     const files = await this.storageRepository.readdir(backupsFolder);
     const failedBackups = files.filter((file) => file.match(/immich-db-backup-\d+\.sql\.gz\.tmp$/));
     const backups = files
@@ -68,7 +68,7 @@ export class BackupService extends BaseService {
     this.logger.debug(`Database Backup Cleanup Finished, deleted ${toDelete.length} backups`);
   }
 
-  @OnJob({ name: JobName.BACKUP_DATABASE, queue: QueueName.BACKUP_DATABASE })
+  @OnJob({ name: JobName.BackupDatabase, queue: QueueName.BackupDatabase })
   async handleBackupDatabase(): Promise<JobStatus> {
     this.logger.debug(`Database Backup Started`);
     const { database } = this.configRepository.getEnv();
@@ -92,7 +92,7 @@ export class BackupService extends BaseService {
     databaseParams.push('--clean', '--if-exists');
     const databaseVersion = await this.databaseRepository.getPostgresVersion();
     const backupFilePath = path.join(
-      StorageCore.getBaseFolder(StorageFolder.BACKUPS),
+      StorageCore.getBaseFolder(StorageFolder.Backups),
       `immich-db-backup-${DateTime.now().toFormat("yyyyLLdd'T'HHmmss")}-v${serverVersion.toString()}-pg${databaseVersion.split(' ')[0]}.sql.gz.tmp`,
     );
     const databaseSemver = semver.coerce(databaseVersion);
@@ -100,7 +100,7 @@ export class BackupService extends BaseService {
 
     if (!databaseMajorVersion || !databaseSemver || !semver.satisfies(databaseSemver, '>=14.0.0 <18.0.0')) {
       this.logger.error(`Database Backup Failure: Unsupported PostgreSQL version: ${databaseVersion}`);
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     this.logger.log(`Database Backup Starting. Database Version: ${databaseMajorVersion}`);
@@ -179,6 +179,6 @@ export class BackupService extends BaseService {
 
     this.logger.log(`Database Backup Success`);
     await this.cleanupDatabaseBackups();
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 }
diff --git a/server/src/services/database.service.spec.ts b/server/src/services/database.service.spec.ts
index 09b22dfd5e..b4022ee864 100644
--- a/server/src/services/database.service.spec.ts
+++ b/server/src/services/database.service.spec.ts
@@ -19,7 +19,7 @@ describe(DatabaseService.name, () => {
     ({ sut, mocks } = newTestService(DatabaseService));
 
     extensionRange = '0.2.x';
-    mocks.database.getVectorExtension.mockResolvedValue(DatabaseExtension.VECTORCHORD);
+    mocks.database.getVectorExtension.mockResolvedValue(DatabaseExtension.VectorChord);
     mocks.database.getExtensionVersionRange.mockReturnValue(extensionRange);
 
     versionBelowRange = '0.1.0';
@@ -28,7 +28,7 @@ describe(DatabaseService.name, () => {
     versionAboveRange = '0.3.0';
     mocks.database.getExtensionVersions.mockResolvedValue([
       {
-        name: DatabaseExtension.VECTORCHORD,
+        name: DatabaseExtension.VectorChord,
         installedVersion: null,
         availableVersion: minVersionInRange,
       },
@@ -49,9 +49,9 @@ describe(DatabaseService.name, () => {
     });
 
     describe.each(<Array<{ extension: VectorExtension; extensionName: string }>>[
-      { extension: DatabaseExtension.VECTOR, extensionName: EXTENSION_NAMES[DatabaseExtension.VECTOR] },
-      { extension: DatabaseExtension.VECTORS, extensionName: EXTENSION_NAMES[DatabaseExtension.VECTORS] },
-      { extension: DatabaseExtension.VECTORCHORD, extensionName: EXTENSION_NAMES[DatabaseExtension.VECTORCHORD] },
+      { extension: DatabaseExtension.Vector, extensionName: EXTENSION_NAMES[DatabaseExtension.Vector] },
+      { extension: DatabaseExtension.Vectors, extensionName: EXTENSION_NAMES[DatabaseExtension.Vectors] },
+      { extension: DatabaseExtension.VectorChord, extensionName: EXTENSION_NAMES[DatabaseExtension.VectorChord] },
     ])('should work with $extensionName', ({ extension, extensionName }) => {
       beforeEach(() => {
         mocks.database.getExtensionVersions.mockResolvedValue([
@@ -292,8 +292,8 @@ describe(DatabaseService.name, () => {
         await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
         expect(mocks.database.reindexVectorsIfNeeded).toHaveBeenCalledExactlyOnceWith([
-          VectorIndex.CLIP,
-          VectorIndex.FACE,
+          VectorIndex.Clip,
+          VectorIndex.Face,
         ]);
         expect(mocks.database.reindexVectorsIfNeeded).toHaveBeenCalledTimes(1);
         expect(mocks.database.runMigrations).toHaveBeenCalledTimes(1);
@@ -306,8 +306,8 @@ describe(DatabaseService.name, () => {
         await expect(sut.onBootstrap()).rejects.toBeDefined();
 
         expect(mocks.database.reindexVectorsIfNeeded).toHaveBeenCalledExactlyOnceWith([
-          VectorIndex.CLIP,
-          VectorIndex.FACE,
+          VectorIndex.Clip,
+          VectorIndex.Face,
         ]);
         expect(mocks.database.runMigrations).not.toHaveBeenCalled();
         expect(mocks.logger.fatal).not.toHaveBeenCalled();
@@ -330,7 +330,7 @@ describe(DatabaseService.name, () => {
               database: 'immich',
             },
             skipMigrations: true,
-            vectorExtension: DatabaseExtension.VECTORS,
+            vectorExtension: DatabaseExtension.Vectors,
           },
         }),
       );
@@ -356,12 +356,12 @@ describe(DatabaseService.name, () => {
     it(`should drop unused extension`, async () => {
       mocks.database.getExtensionVersions.mockResolvedValue([
         {
-          name: DatabaseExtension.VECTORS,
+          name: DatabaseExtension.Vectors,
           installedVersion: minVersionInRange,
           availableVersion: minVersionInRange,
         },
         {
-          name: DatabaseExtension.VECTORCHORD,
+          name: DatabaseExtension.VectorChord,
           installedVersion: null,
           availableVersion: minVersionInRange,
         },
@@ -369,19 +369,19 @@ describe(DatabaseService.name, () => {
 
       await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-      expect(mocks.database.createExtension).toHaveBeenCalledExactlyOnceWith(DatabaseExtension.VECTORCHORD);
-      expect(mocks.database.dropExtension).toHaveBeenCalledExactlyOnceWith(DatabaseExtension.VECTORS);
+      expect(mocks.database.createExtension).toHaveBeenCalledExactlyOnceWith(DatabaseExtension.VectorChord);
+      expect(mocks.database.dropExtension).toHaveBeenCalledExactlyOnceWith(DatabaseExtension.Vectors);
     });
 
     it(`should warn if unused extension could not be dropped`, async () => {
       mocks.database.getExtensionVersions.mockResolvedValue([
         {
-          name: DatabaseExtension.VECTORS,
+          name: DatabaseExtension.Vectors,
           installedVersion: minVersionInRange,
           availableVersion: minVersionInRange,
         },
         {
-          name: DatabaseExtension.VECTORCHORD,
+          name: DatabaseExtension.VectorChord,
           installedVersion: null,
           availableVersion: minVersionInRange,
         },
@@ -390,8 +390,8 @@ describe(DatabaseService.name, () => {
 
       await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-      expect(mocks.database.createExtension).toHaveBeenCalledExactlyOnceWith(DatabaseExtension.VECTORCHORD);
-      expect(mocks.database.dropExtension).toHaveBeenCalledExactlyOnceWith(DatabaseExtension.VECTORS);
+      expect(mocks.database.createExtension).toHaveBeenCalledExactlyOnceWith(DatabaseExtension.VectorChord);
+      expect(mocks.database.dropExtension).toHaveBeenCalledExactlyOnceWith(DatabaseExtension.Vectors);
       expect(mocks.logger.warn).toHaveBeenCalledTimes(1);
       expect(mocks.logger.warn.mock.calls[0][0]).toContain('DROP EXTENSION vectors');
     });
@@ -399,12 +399,12 @@ describe(DatabaseService.name, () => {
     it(`should not try to drop pgvector when using vectorchord`, async () => {
       mocks.database.getExtensionVersions.mockResolvedValue([
         {
-          name: DatabaseExtension.VECTOR,
+          name: DatabaseExtension.Vector,
           installedVersion: minVersionInRange,
           availableVersion: minVersionInRange,
         },
         {
-          name: DatabaseExtension.VECTORCHORD,
+          name: DatabaseExtension.VectorChord,
           installedVersion: minVersionInRange,
           availableVersion: minVersionInRange,
         },
diff --git a/server/src/services/database.service.ts b/server/src/services/database.service.ts
index fd59e3aa67..e54be28fc2 100644
--- a/server/src/services/database.service.ts
+++ b/server/src/services/database.service.ts
@@ -100,7 +100,7 @@ export class DatabaseService extends BaseService {
       }
 
       try {
-        await this.databaseRepository.reindexVectorsIfNeeded([VectorIndex.CLIP, VectorIndex.FACE]);
+        await this.databaseRepository.reindexVectorsIfNeeded([VectorIndex.Clip, VectorIndex.Face]);
       } catch (error) {
         this.logger.warn(
           'Could not run vector reindexing checks. If the extension was updated, please restart the Postgres instance. If you are upgrading directly from a version below 1.107.2, please upgrade to 1.107.2 first.',
@@ -109,7 +109,7 @@ export class DatabaseService extends BaseService {
       }
 
       for (const { name: dbName, installedVersion } of extensionVersions) {
-        const isDepended = dbName === DatabaseExtension.VECTOR && extension === DatabaseExtension.VECTORCHORD;
+        const isDepended = dbName === DatabaseExtension.Vector && extension === DatabaseExtension.VectorChord;
         if (dbName !== extension && installedVersion && !isDepended) {
           await this.dropExtension(dbName);
         }
@@ -120,8 +120,8 @@ export class DatabaseService extends BaseService {
         await this.databaseRepository.runMigrations();
       }
       await Promise.all([
-        this.databaseRepository.prewarm(VectorIndex.CLIP),
-        this.databaseRepository.prewarm(VectorIndex.FACE),
+        this.databaseRepository.prewarm(VectorIndex.Clip),
+        this.databaseRepository.prewarm(VectorIndex.Face),
       ]);
     });
   }
diff --git a/server/src/services/download.service.ts b/server/src/services/download.service.ts
index 02711b9bfd..a5f734e59c 100644
--- a/server/src/services/download.service.ts
+++ b/server/src/services/download.service.ts
@@ -17,15 +17,15 @@ export class DownloadService extends BaseService {
 
     if (dto.assetIds) {
       const assetIds = dto.assetIds;
-      await this.requireAccess({ auth, permission: Permission.ASSET_DOWNLOAD, ids: assetIds });
+      await this.requireAccess({ auth, permission: Permission.AssetDownload, ids: assetIds });
       assets = this.downloadRepository.downloadAssetIds(assetIds);
     } else if (dto.albumId) {
       const albumId = dto.albumId;
-      await this.requireAccess({ auth, permission: Permission.ALBUM_DOWNLOAD, ids: [albumId] });
+      await this.requireAccess({ auth, permission: Permission.AlbumDownload, ids: [albumId] });
       assets = this.downloadRepository.downloadAlbumId(albumId);
     } else if (dto.userId) {
       const userId = dto.userId;
-      await this.requireAccess({ auth, permission: Permission.TIMELINE_DOWNLOAD, ids: [userId] });
+      await this.requireAccess({ auth, permission: Permission.TimelineDownload, ids: [userId] });
       assets = this.downloadRepository.downloadUserId(userId);
     } else {
       throw new BadRequestException('assetIds, albumId, or userId is required');
@@ -81,7 +81,7 @@ export class DownloadService extends BaseService {
   }
 
   async downloadArchive(auth: AuthDto, dto: AssetIdsDto): Promise<ImmichReadStream> {
-    await this.requireAccess({ auth, permission: Permission.ASSET_DOWNLOAD, ids: dto.assetIds });
+    await this.requireAccess({ auth, permission: Permission.AssetDownload, ids: dto.assetIds });
 
     const zip = this.storageRepository.createZipStream();
     const assets = await this.assetRepository.getByIds(dto.assetIds);
diff --git a/server/src/services/duplicate.service.spec.ts b/server/src/services/duplicate.service.spec.ts
index b7d6d5fc96..0a2243e322 100644
--- a/server/src/services/duplicate.service.spec.ts
+++ b/server/src/services/duplicate.service.spec.ts
@@ -12,10 +12,10 @@ const hasEmbedding = {
   id: 'asset-1',
   ownerId: 'user-id',
   stackId: null,
-  type: AssetType.IMAGE,
+  type: AssetType.Image,
   duplicateId: null,
   embedding: '[1, 2, 3, 4]',
-  visibility: AssetVisibility.TIMELINE,
+  visibility: AssetVisibility.Timeline,
 };
 
 const hasDupe = {
@@ -78,7 +78,7 @@ describe(SearchService.name, () => {
         },
       });
 
-      await expect(sut.handleQueueSearchDuplicates({})).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleQueueSearchDuplicates({})).resolves.toBe(JobStatus.Skipped);
       expect(mocks.job.queue).not.toHaveBeenCalled();
       expect(mocks.job.queueAll).not.toHaveBeenCalled();
       expect(mocks.systemMetadata.get).toHaveBeenCalled();
@@ -94,7 +94,7 @@ describe(SearchService.name, () => {
         },
       });
 
-      await expect(sut.handleQueueSearchDuplicates({})).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleQueueSearchDuplicates({})).resolves.toBe(JobStatus.Skipped);
       expect(mocks.job.queue).not.toHaveBeenCalled();
       expect(mocks.job.queueAll).not.toHaveBeenCalled();
       expect(mocks.systemMetadata.get).toHaveBeenCalled();
@@ -108,7 +108,7 @@ describe(SearchService.name, () => {
       expect(mocks.assetJob.streamForSearchDuplicates).toHaveBeenCalledWith(undefined);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.DUPLICATE_DETECTION,
+          name: JobName.DuplicateDetection,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -122,7 +122,7 @@ describe(SearchService.name, () => {
       expect(mocks.assetJob.streamForSearchDuplicates).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.DUPLICATE_DETECTION,
+          name: JobName.DuplicateDetection,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -154,7 +154,7 @@ describe(SearchService.name, () => {
 
       const result = await sut.handleSearchDuplicates({ id });
 
-      expect(result).toBe(JobStatus.SKIPPED);
+      expect(result).toBe(JobStatus.Skipped);
       expect(mocks.assetJob.getForSearchDuplicatesJob).not.toHaveBeenCalled();
     });
 
@@ -171,7 +171,7 @@ describe(SearchService.name, () => {
 
       const result = await sut.handleSearchDuplicates({ id });
 
-      expect(result).toBe(JobStatus.SKIPPED);
+      expect(result).toBe(JobStatus.Skipped);
       expect(mocks.assetJob.getForSearchDuplicatesJob).not.toHaveBeenCalled();
     });
 
@@ -180,7 +180,7 @@ describe(SearchService.name, () => {
 
       const result = await sut.handleSearchDuplicates({ id: assetStub.image.id });
 
-      expect(result).toBe(JobStatus.FAILED);
+      expect(result).toBe(JobStatus.Failed);
       expect(mocks.logger.error).toHaveBeenCalledWith(`Asset ${assetStub.image.id} not found`);
     });
 
@@ -190,7 +190,7 @@ describe(SearchService.name, () => {
 
       const result = await sut.handleSearchDuplicates({ id });
 
-      expect(result).toBe(JobStatus.SKIPPED);
+      expect(result).toBe(JobStatus.Skipped);
       expect(mocks.logger.debug).toHaveBeenCalledWith(`Asset ${id} is part of a stack, skipping`);
     });
 
@@ -198,12 +198,12 @@ describe(SearchService.name, () => {
       const id = assetStub.livePhotoMotionAsset.id;
       mocks.assetJob.getForSearchDuplicatesJob.mockResolvedValue({
         ...hasEmbedding,
-        visibility: AssetVisibility.HIDDEN,
+        visibility: AssetVisibility.Hidden,
       });
 
       const result = await sut.handleSearchDuplicates({ id });
 
-      expect(result).toBe(JobStatus.SKIPPED);
+      expect(result).toBe(JobStatus.Skipped);
       expect(mocks.logger.debug).toHaveBeenCalledWith(`Asset ${id} is not visible, skipping`);
     });
 
@@ -212,7 +212,7 @@ describe(SearchService.name, () => {
 
       const result = await sut.handleSearchDuplicates({ id: assetStub.image.id });
 
-      expect(result).toBe(JobStatus.FAILED);
+      expect(result).toBe(JobStatus.Failed);
       expect(mocks.logger.debug).toHaveBeenCalledWith(`Asset ${assetStub.image.id} is missing embedding`);
     });
 
@@ -226,7 +226,7 @@ describe(SearchService.name, () => {
 
       const result = await sut.handleSearchDuplicates({ id: hasEmbedding.id });
 
-      expect(result).toBe(JobStatus.SUCCESS);
+      expect(result).toBe(JobStatus.Success);
       expect(mocks.duplicateRepository.search).toHaveBeenCalledWith({
         assetId: hasEmbedding.id,
         embedding: hasEmbedding.embedding,
@@ -253,7 +253,7 @@ describe(SearchService.name, () => {
 
       const result = await sut.handleSearchDuplicates({ id: hasEmbedding.id });
 
-      expect(result).toBe(JobStatus.SUCCESS);
+      expect(result).toBe(JobStatus.Success);
       expect(mocks.duplicateRepository.search).toHaveBeenCalledWith({
         assetId: hasEmbedding.id,
         embedding: hasEmbedding.embedding,
@@ -277,7 +277,7 @@ describe(SearchService.name, () => {
 
       const result = await sut.handleSearchDuplicates({ id: hasDupe.id });
 
-      expect(result).toBe(JobStatus.SUCCESS);
+      expect(result).toBe(JobStatus.Success);
       expect(mocks.asset.update).toHaveBeenCalledWith({ id: hasDupe.id, duplicateId: null });
       expect(mocks.asset.upsertJobStatus).toHaveBeenCalledWith({
         assetId: hasDupe.id,
diff --git a/server/src/services/duplicate.service.ts b/server/src/services/duplicate.service.ts
index 99674d4c36..1699cf73f6 100644
--- a/server/src/services/duplicate.service.ts
+++ b/server/src/services/duplicate.service.ts
@@ -29,11 +29,11 @@ export class DuplicateService extends BaseService {
     await this.duplicateRepository.deleteAll(auth.user.id, dto.ids);
   }
 
-  @OnJob({ name: JobName.QUEUE_DUPLICATE_DETECTION, queue: QueueName.DUPLICATE_DETECTION })
-  async handleQueueSearchDuplicates({ force }: JobOf<JobName.QUEUE_DUPLICATE_DETECTION>): Promise<JobStatus> {
+  @OnJob({ name: JobName.QueueDuplicateDetection, queue: QueueName.DuplicateDetection })
+  async handleQueueSearchDuplicates({ force }: JobOf<JobName.QueueDuplicateDetection>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: false });
     if (!isDuplicateDetectionEnabled(machineLearning)) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     let jobs: JobItem[] = [];
@@ -44,7 +44,7 @@ export class DuplicateService extends BaseService {
 
     const assets = this.assetJobRepository.streamForSearchDuplicates(force);
     for await (const asset of assets) {
-      jobs.push({ name: JobName.DUPLICATE_DETECTION, data: { id: asset.id } });
+      jobs.push({ name: JobName.DuplicateDetection, data: { id: asset.id } });
       if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await queueAll();
       }
@@ -52,40 +52,40 @@ export class DuplicateService extends BaseService {
 
     await queueAll();
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.DUPLICATE_DETECTION, queue: QueueName.DUPLICATE_DETECTION })
-  async handleSearchDuplicates({ id }: JobOf<JobName.DUPLICATE_DETECTION>): Promise<JobStatus> {
+  @OnJob({ name: JobName.DuplicateDetection, queue: QueueName.DuplicateDetection })
+  async handleSearchDuplicates({ id }: JobOf<JobName.DuplicateDetection>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: true });
     if (!isDuplicateDetectionEnabled(machineLearning)) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const asset = await this.assetJobRepository.getForSearchDuplicatesJob(id);
     if (!asset) {
       this.logger.error(`Asset ${id} not found`);
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     if (asset.stackId) {
       this.logger.debug(`Asset ${id} is part of a stack, skipping`);
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
-    if (asset.visibility === AssetVisibility.HIDDEN) {
+    if (asset.visibility === AssetVisibility.Hidden) {
       this.logger.debug(`Asset ${id} is not visible, skipping`);
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
-    if (asset.visibility === AssetVisibility.LOCKED) {
+    if (asset.visibility === AssetVisibility.Locked) {
       this.logger.debug(`Asset ${id} is locked, skipping`);
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     if (!asset.embedding) {
       this.logger.debug(`Asset ${id} is missing embedding`);
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     const duplicateAssets = await this.duplicateRepository.search({
@@ -110,7 +110,7 @@ export class DuplicateService extends BaseService {
     const duplicatesDetectedAt = new Date();
     await this.assetRepository.upsertJobStatus(...assetIds.map((assetId) => ({ assetId, duplicatesDetectedAt })));
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private async updateDuplicates(
diff --git a/server/src/services/job.service.spec.ts b/server/src/services/job.service.spec.ts
index a18eccdd8b..497d81b4ca 100644
--- a/server/src/services/job.service.spec.ts
+++ b/server/src/services/job.service.spec.ts
@@ -13,7 +13,7 @@ describe(JobService.name, () => {
   beforeEach(() => {
     ({ sut, mocks } = newTestService(JobService, {}));
 
-    mocks.config.getWorker.mockReturnValue(ImmichWorker.MICROSERVICES);
+    mocks.config.getWorker.mockReturnValue(ImmichWorker.Microservices);
   });
 
   it('should work', () => {
@@ -25,10 +25,10 @@ describe(JobService.name, () => {
       sut.onConfigUpdate({ newConfig: defaults, oldConfig: {} as SystemConfig });
 
       expect(mocks.job.setConcurrency).toHaveBeenCalledTimes(15);
-      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(5, QueueName.FACIAL_RECOGNITION, 1);
-      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(7, QueueName.DUPLICATE_DETECTION, 1);
-      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(8, QueueName.BACKGROUND_TASK, 5);
-      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(9, QueueName.STORAGE_TEMPLATE_MIGRATION, 1);
+      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(5, QueueName.FacialRecognition, 1);
+      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(7, QueueName.DuplicateDetection, 1);
+      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(8, QueueName.BackgroundTask, 5);
+      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(9, QueueName.StorageTemplateMigration, 1);
     });
   });
 
@@ -37,16 +37,16 @@ describe(JobService.name, () => {
       await sut.handleNightlyJobs();
 
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.ASSET_DELETION_CHECK },
-        { name: JobName.USER_DELETE_CHECK },
-        { name: JobName.PERSON_CLEANUP },
-        { name: JobName.MEMORIES_CLEANUP },
-        { name: JobName.CLEAN_OLD_SESSION_TOKENS },
-        { name: JobName.CLEAN_OLD_AUDIT_LOGS },
-        { name: JobName.MEMORIES_CREATE },
-        { name: JobName.USER_SYNC_USAGE },
-        { name: JobName.QUEUE_GENERATE_THUMBNAILS, data: { force: false } },
-        { name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false, nightly: true } },
+        { name: JobName.AssetDeletionCheck },
+        { name: JobName.UserDeleteCheck },
+        { name: JobName.PersonCleanup },
+        { name: JobName.MemoriesCleanup },
+        { name: JobName.CleanOldSessionTokens },
+        { name: JobName.CleanOldAuditLogs },
+        { name: JobName.MemoriesCreate },
+        { name: JobName.userSyncUsage },
+        { name: JobName.QueueGenerateThumbnails, data: { force: false } },
+        { name: JobName.QueueFacialRecognition, data: { force: false, nightly: true } },
       ]);
     });
   });
@@ -82,49 +82,49 @@ describe(JobService.name, () => {
       };
 
       await expect(sut.getAllJobsStatus()).resolves.toEqual({
-        [QueueName.BACKGROUND_TASK]: expectedJobStatus,
-        [QueueName.DUPLICATE_DETECTION]: expectedJobStatus,
-        [QueueName.SMART_SEARCH]: expectedJobStatus,
-        [QueueName.METADATA_EXTRACTION]: expectedJobStatus,
-        [QueueName.SEARCH]: expectedJobStatus,
-        [QueueName.STORAGE_TEMPLATE_MIGRATION]: expectedJobStatus,
-        [QueueName.MIGRATION]: expectedJobStatus,
-        [QueueName.THUMBNAIL_GENERATION]: expectedJobStatus,
-        [QueueName.VIDEO_CONVERSION]: expectedJobStatus,
-        [QueueName.FACE_DETECTION]: expectedJobStatus,
-        [QueueName.FACIAL_RECOGNITION]: expectedJobStatus,
-        [QueueName.SIDECAR]: expectedJobStatus,
-        [QueueName.LIBRARY]: expectedJobStatus,
-        [QueueName.NOTIFICATION]: expectedJobStatus,
-        [QueueName.BACKUP_DATABASE]: expectedJobStatus,
+        [QueueName.BackgroundTask]: expectedJobStatus,
+        [QueueName.DuplicateDetection]: expectedJobStatus,
+        [QueueName.SmartSearch]: expectedJobStatus,
+        [QueueName.MetadataExtraction]: expectedJobStatus,
+        [QueueName.Search]: expectedJobStatus,
+        [QueueName.StorageTemplateMigration]: expectedJobStatus,
+        [QueueName.Migration]: expectedJobStatus,
+        [QueueName.ThumbnailGeneration]: expectedJobStatus,
+        [QueueName.VideoConversion]: expectedJobStatus,
+        [QueueName.FaceDetection]: expectedJobStatus,
+        [QueueName.FacialRecognition]: expectedJobStatus,
+        [QueueName.Sidecar]: expectedJobStatus,
+        [QueueName.Library]: expectedJobStatus,
+        [QueueName.Notification]: expectedJobStatus,
+        [QueueName.BackupDatabase]: expectedJobStatus,
       });
     });
   });
 
   describe('handleCommand', () => {
     it('should handle a pause command', async () => {
-      await sut.handleCommand(QueueName.METADATA_EXTRACTION, { command: JobCommand.PAUSE, force: false });
+      await sut.handleCommand(QueueName.MetadataExtraction, { command: JobCommand.Pause, force: false });
 
-      expect(mocks.job.pause).toHaveBeenCalledWith(QueueName.METADATA_EXTRACTION);
+      expect(mocks.job.pause).toHaveBeenCalledWith(QueueName.MetadataExtraction);
     });
 
     it('should handle a resume command', async () => {
-      await sut.handleCommand(QueueName.METADATA_EXTRACTION, { command: JobCommand.RESUME, force: false });
+      await sut.handleCommand(QueueName.MetadataExtraction, { command: JobCommand.Resume, force: false });
 
-      expect(mocks.job.resume).toHaveBeenCalledWith(QueueName.METADATA_EXTRACTION);
+      expect(mocks.job.resume).toHaveBeenCalledWith(QueueName.MetadataExtraction);
     });
 
     it('should handle an empty command', async () => {
-      await sut.handleCommand(QueueName.METADATA_EXTRACTION, { command: JobCommand.EMPTY, force: false });
+      await sut.handleCommand(QueueName.MetadataExtraction, { command: JobCommand.Empty, force: false });
 
-      expect(mocks.job.empty).toHaveBeenCalledWith(QueueName.METADATA_EXTRACTION);
+      expect(mocks.job.empty).toHaveBeenCalledWith(QueueName.MetadataExtraction);
     });
 
     it('should not start a job that is already running', async () => {
       mocks.job.getQueueStatus.mockResolvedValue({ isActive: true, isPaused: false });
 
       await expect(
-        sut.handleCommand(QueueName.VIDEO_CONVERSION, { command: JobCommand.START, force: false }),
+        sut.handleCommand(QueueName.VideoConversion, { command: JobCommand.Start, force: false }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
       expect(mocks.job.queue).not.toHaveBeenCalled();
@@ -134,80 +134,80 @@ describe(JobService.name, () => {
     it('should handle a start video conversion command', async () => {
       mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
-      await sut.handleCommand(QueueName.VIDEO_CONVERSION, { command: JobCommand.START, force: false });
+      await sut.handleCommand(QueueName.VideoConversion, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_VIDEO_CONVERSION, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueVideoConversion, data: { force: false } });
     });
 
     it('should handle a start storage template migration command', async () => {
       mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
-      await sut.handleCommand(QueueName.STORAGE_TEMPLATE_MIGRATION, { command: JobCommand.START, force: false });
+      await sut.handleCommand(QueueName.StorageTemplateMigration, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.STORAGE_TEMPLATE_MIGRATION });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.StorageTemplateMigration });
     });
 
     it('should handle a start smart search command', async () => {
       mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
-      await sut.handleCommand(QueueName.SMART_SEARCH, { command: JobCommand.START, force: false });
+      await sut.handleCommand(QueueName.SmartSearch, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_SMART_SEARCH, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueSmartSearch, data: { force: false } });
     });
 
     it('should handle a start metadata extraction command', async () => {
       mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
-      await sut.handleCommand(QueueName.METADATA_EXTRACTION, { command: JobCommand.START, force: false });
+      await sut.handleCommand(QueueName.MetadataExtraction, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_METADATA_EXTRACTION, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueMetadataExtraction, data: { force: false } });
     });
 
     it('should handle a start sidecar command', async () => {
       mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
-      await sut.handleCommand(QueueName.SIDECAR, { command: JobCommand.START, force: false });
+      await sut.handleCommand(QueueName.Sidecar, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_SIDECAR, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueSidecar, data: { force: false } });
     });
 
     it('should handle a start thumbnail generation command', async () => {
       mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
-      await sut.handleCommand(QueueName.THUMBNAIL_GENERATION, { command: JobCommand.START, force: false });
+      await sut.handleCommand(QueueName.ThumbnailGeneration, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_GENERATE_THUMBNAILS, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueGenerateThumbnails, data: { force: false } });
     });
 
     it('should handle a start face detection command', async () => {
       mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
-      await sut.handleCommand(QueueName.FACE_DETECTION, { command: JobCommand.START, force: false });
+      await sut.handleCommand(QueueName.FaceDetection, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_FACE_DETECTION, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueFaceDetection, data: { force: false } });
     });
 
     it('should handle a start facial recognition command', async () => {
       mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
-      await sut.handleCommand(QueueName.FACIAL_RECOGNITION, { command: JobCommand.START, force: false });
+      await sut.handleCommand(QueueName.FacialRecognition, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueFacialRecognition, data: { force: false } });
     });
 
     it('should handle a start backup database command', async () => {
       mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
-      await sut.handleCommand(QueueName.BACKUP_DATABASE, { command: JobCommand.START, force: false });
+      await sut.handleCommand(QueueName.BackupDatabase, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.BACKUP_DATABASE, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.BackupDatabase, data: { force: false } });
     });
 
     it('should throw a bad request when an invalid queue is used', async () => {
       mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
       await expect(
-        sut.handleCommand(QueueName.BACKGROUND_TASK, { command: JobCommand.START, force: false }),
+        sut.handleCommand(QueueName.BackgroundTask, { command: JobCommand.Start, force: false }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
       expect(mocks.job.queue).not.toHaveBeenCalled();
@@ -217,10 +217,10 @@ describe(JobService.name, () => {
 
   describe('onJobStart', () => {
     it('should process a successful job', async () => {
-      mocks.job.run.mockResolvedValue(JobStatus.SUCCESS);
+      mocks.job.run.mockResolvedValue(JobStatus.Success);
 
-      await sut.onJobStart(QueueName.BACKGROUND_TASK, {
-        name: JobName.DELETE_FILES,
+      await sut.onJobStart(QueueName.BackgroundTask, {
+        name: JobName.DeleteFiles,
         data: { files: ['path/to/file'] },
       });
 
@@ -232,55 +232,55 @@ describe(JobService.name, () => {
 
     const tests: Array<{ item: JobItem; jobs: JobName[]; stub?: any }> = [
       {
-        item: { name: JobName.SIDECAR_SYNC, data: { id: 'asset-1' } },
-        jobs: [JobName.METADATA_EXTRACTION],
+        item: { name: JobName.SidecarSync, data: { id: 'asset-1' } },
+        jobs: [JobName.MetadataExtraction],
       },
       {
-        item: { name: JobName.SIDECAR_DISCOVERY, data: { id: 'asset-1' } },
-        jobs: [JobName.METADATA_EXTRACTION],
+        item: { name: JobName.SidecarDiscovery, data: { id: 'asset-1' } },
+        jobs: [JobName.MetadataExtraction],
       },
       {
-        item: { name: JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE, data: { id: 'asset-1', source: 'upload' } },
-        jobs: [JobName.GENERATE_THUMBNAILS],
+        item: { name: JobName.StorageTemplateMigrationSingle, data: { id: 'asset-1', source: 'upload' } },
+        jobs: [JobName.GenerateThumbnails],
       },
       {
-        item: { name: JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE, data: { id: 'asset-1' } },
+        item: { name: JobName.StorageTemplateMigrationSingle, data: { id: 'asset-1' } },
         jobs: [],
       },
       {
-        item: { name: JobName.GENERATE_PERSON_THUMBNAIL, data: { id: 'asset-1' } },
+        item: { name: JobName.GeneratePersonThumbnail, data: { id: 'asset-1' } },
         jobs: [],
       },
       {
-        item: { name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1' } },
+        item: { name: JobName.GenerateThumbnails, data: { id: 'asset-1' } },
         jobs: [],
         stub: [assetStub.image],
       },
       {
-        item: { name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1' } },
+        item: { name: JobName.GenerateThumbnails, data: { id: 'asset-1' } },
         jobs: [],
         stub: [assetStub.video],
       },
       {
-        item: { name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1', source: 'upload' } },
-        jobs: [JobName.SMART_SEARCH, JobName.FACE_DETECTION],
+        item: { name: JobName.GenerateThumbnails, data: { id: 'asset-1', source: 'upload' } },
+        jobs: [JobName.SmartSearch, JobName.FaceDetection],
         stub: [assetStub.livePhotoStillAsset],
       },
       {
-        item: { name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1', source: 'upload' } },
-        jobs: [JobName.SMART_SEARCH, JobName.FACE_DETECTION, JobName.VIDEO_CONVERSION],
+        item: { name: JobName.GenerateThumbnails, data: { id: 'asset-1', source: 'upload' } },
+        jobs: [JobName.SmartSearch, JobName.FaceDetection, JobName.VideoConversation],
         stub: [assetStub.video],
       },
       {
-        item: { name: JobName.SMART_SEARCH, data: { id: 'asset-1' } },
+        item: { name: JobName.SmartSearch, data: { id: 'asset-1' } },
         jobs: [],
       },
       {
-        item: { name: JobName.FACE_DETECTION, data: { id: 'asset-1' } },
+        item: { name: JobName.FaceDetection, data: { id: 'asset-1' } },
         jobs: [],
       },
       {
-        item: { name: JobName.FACIAL_RECOGNITION, data: { id: 'asset-1' } },
+        item: { name: JobName.FacialRecognition, data: { id: 'asset-1' } },
         jobs: [],
       },
     ];
@@ -291,9 +291,9 @@ describe(JobService.name, () => {
           mocks.asset.getByIdsWithAllRelationsButStacks.mockResolvedValue(stub);
         }
 
-        mocks.job.run.mockResolvedValue(JobStatus.SUCCESS);
+        mocks.job.run.mockResolvedValue(JobStatus.Success);
 
-        await sut.onJobStart(QueueName.BACKGROUND_TASK, item);
+        await sut.onJobStart(QueueName.BackgroundTask, item);
 
         if (jobs.length > 1) {
           expect(mocks.job.queueAll).toHaveBeenCalledWith(
@@ -308,9 +308,9 @@ describe(JobService.name, () => {
       });
 
       it(`should not queue any jobs when ${item.name} fails`, async () => {
-        mocks.job.run.mockResolvedValue(JobStatus.FAILED);
+        mocks.job.run.mockResolvedValue(JobStatus.Failed);
 
-        await sut.onJobStart(QueueName.BACKGROUND_TASK, item);
+        await sut.onJobStart(QueueName.BackgroundTask, item);
 
         expect(mocks.job.queueAll).not.toHaveBeenCalled();
       });
diff --git a/server/src/services/job.service.ts b/server/src/services/job.service.ts
index f0bbefc8f0..73254b9f38 100644
--- a/server/src/services/job.service.ts
+++ b/server/src/services/job.service.ts
@@ -27,28 +27,28 @@ import { handlePromiseError } from 'src/utils/misc';
 
 const asJobItem = (dto: JobCreateDto): JobItem => {
   switch (dto.name) {
-    case ManualJobName.TAG_CLEANUP: {
-      return { name: JobName.TAG_CLEANUP };
+    case ManualJobName.TagCleanup: {
+      return { name: JobName.TagCleanup };
     }
 
-    case ManualJobName.PERSON_CLEANUP: {
-      return { name: JobName.PERSON_CLEANUP };
+    case ManualJobName.PersonCleanup: {
+      return { name: JobName.PersonCleanup };
     }
 
-    case ManualJobName.USER_CLEANUP: {
-      return { name: JobName.USER_DELETE_CHECK };
+    case ManualJobName.UserCleanup: {
+      return { name: JobName.UserDeleteCheck };
     }
 
-    case ManualJobName.MEMORY_CLEANUP: {
-      return { name: JobName.MEMORIES_CLEANUP };
+    case ManualJobName.MemoryCleanup: {
+      return { name: JobName.MemoriesCleanup };
     }
 
-    case ManualJobName.MEMORY_CREATE: {
-      return { name: JobName.MEMORIES_CREATE };
+    case ManualJobName.MemoryCreate: {
+      return { name: JobName.MemoriesCreate };
     }
 
-    case ManualJobName.BACKUP_DATABASE: {
-      return { name: JobName.BACKUP_DATABASE };
+    case ManualJobName.BackupDatabase: {
+      return { name: JobName.BackupDatabase };
     }
 
     default: {
@@ -69,7 +69,7 @@ export class JobService extends BaseService {
 
   @OnEvent({ name: 'ConfigInit' })
   async onConfigInit({ newConfig: config }: ArgOf<'ConfigInit'>) {
-    if (this.worker === ImmichWorker.MICROSERVICES) {
+    if (this.worker === ImmichWorker.Microservices) {
       this.updateQueueConcurrency(config);
       return;
     }
@@ -89,7 +89,7 @@ export class JobService extends BaseService {
 
   @OnEvent({ name: 'ConfigUpdate', server: true })
   onConfigUpdate({ newConfig: config }: ArgOf<'ConfigUpdate'>) {
-    if (this.worker === ImmichWorker.MICROSERVICES) {
+    if (this.worker === ImmichWorker.Microservices) {
       this.updateQueueConcurrency(config);
       return;
     }
@@ -104,7 +104,7 @@ export class JobService extends BaseService {
   @OnEvent({ name: 'AppBootstrap', priority: BootstrapEventPriority.JobService })
   onBootstrap() {
     this.jobRepository.setup(this.services);
-    if (this.worker === ImmichWorker.MICROSERVICES) {
+    if (this.worker === ImmichWorker.Microservices) {
       this.jobRepository.startWorkers();
     }
   }
@@ -133,28 +133,28 @@ export class JobService extends BaseService {
     this.logger.debug(`Handling command: queue=${queueName},command=${dto.command},force=${dto.force}`);
 
     switch (dto.command) {
-      case JobCommand.START: {
+      case JobCommand.Start: {
         await this.start(queueName, dto);
         break;
       }
 
-      case JobCommand.PAUSE: {
+      case JobCommand.Pause: {
         await this.jobRepository.pause(queueName);
         break;
       }
 
-      case JobCommand.RESUME: {
+      case JobCommand.Resume: {
         await this.jobRepository.resume(queueName);
         break;
       }
 
-      case JobCommand.EMPTY: {
+      case JobCommand.Empty: {
         await this.jobRepository.empty(queueName);
         break;
       }
 
-      case JobCommand.CLEAR_FAILED: {
-        const failedJobs = await this.jobRepository.clear(queueName, QueueCleanType.FAILED);
+      case JobCommand.ClearFailed: {
+        const failedJobs = await this.jobRepository.clear(queueName, QueueCleanType.Failed);
         this.logger.debug(`Cleared failed jobs: ${failedJobs}`);
         break;
       }
@@ -189,52 +189,52 @@ export class JobService extends BaseService {
     this.telemetryRepository.jobs.addToCounter(`immich.queues.${snakeCase(name)}.started`, 1);
 
     switch (name) {
-      case QueueName.VIDEO_CONVERSION: {
-        return this.jobRepository.queue({ name: JobName.QUEUE_VIDEO_CONVERSION, data: { force } });
+      case QueueName.VideoConversion: {
+        return this.jobRepository.queue({ name: JobName.QueueVideoConversion, data: { force } });
       }
 
-      case QueueName.STORAGE_TEMPLATE_MIGRATION: {
-        return this.jobRepository.queue({ name: JobName.STORAGE_TEMPLATE_MIGRATION });
+      case QueueName.StorageTemplateMigration: {
+        return this.jobRepository.queue({ name: JobName.StorageTemplateMigration });
       }
 
-      case QueueName.MIGRATION: {
-        return this.jobRepository.queue({ name: JobName.QUEUE_MIGRATION });
+      case QueueName.Migration: {
+        return this.jobRepository.queue({ name: JobName.QueueMigration });
       }
 
-      case QueueName.SMART_SEARCH: {
-        return this.jobRepository.queue({ name: JobName.QUEUE_SMART_SEARCH, data: { force } });
+      case QueueName.SmartSearch: {
+        return this.jobRepository.queue({ name: JobName.QueueSmartSearch, data: { force } });
       }
 
-      case QueueName.DUPLICATE_DETECTION: {
-        return this.jobRepository.queue({ name: JobName.QUEUE_DUPLICATE_DETECTION, data: { force } });
+      case QueueName.DuplicateDetection: {
+        return this.jobRepository.queue({ name: JobName.QueueDuplicateDetection, data: { force } });
       }
 
-      case QueueName.METADATA_EXTRACTION: {
-        return this.jobRepository.queue({ name: JobName.QUEUE_METADATA_EXTRACTION, data: { force } });
+      case QueueName.MetadataExtraction: {
+        return this.jobRepository.queue({ name: JobName.QueueMetadataExtraction, data: { force } });
       }
 
-      case QueueName.SIDECAR: {
-        return this.jobRepository.queue({ name: JobName.QUEUE_SIDECAR, data: { force } });
+      case QueueName.Sidecar: {
+        return this.jobRepository.queue({ name: JobName.QueueSidecar, data: { force } });
       }
 
-      case QueueName.THUMBNAIL_GENERATION: {
-        return this.jobRepository.queue({ name: JobName.QUEUE_GENERATE_THUMBNAILS, data: { force } });
+      case QueueName.ThumbnailGeneration: {
+        return this.jobRepository.queue({ name: JobName.QueueGenerateThumbnails, data: { force } });
       }
 
-      case QueueName.FACE_DETECTION: {
-        return this.jobRepository.queue({ name: JobName.QUEUE_FACE_DETECTION, data: { force } });
+      case QueueName.FaceDetection: {
+        return this.jobRepository.queue({ name: JobName.QueueFaceDetection, data: { force } });
       }
 
-      case QueueName.FACIAL_RECOGNITION: {
-        return this.jobRepository.queue({ name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force } });
+      case QueueName.FacialRecognition: {
+        return this.jobRepository.queue({ name: JobName.QueueFacialRecognition, data: { force } });
       }
 
-      case QueueName.LIBRARY: {
-        return this.jobRepository.queue({ name: JobName.LIBRARY_QUEUE_SCAN_ALL, data: { force } });
+      case QueueName.Library: {
+        return this.jobRepository.queue({ name: JobName.LibraryQueueScanAll, data: { force } });
       }
 
-      case QueueName.BACKUP_DATABASE: {
-        return this.jobRepository.queue({ name: JobName.BACKUP_DATABASE, data: { force } });
+      case QueueName.BackupDatabase: {
+        return this.jobRepository.queue({ name: JobName.BackupDatabase, data: { force } });
       }
 
       default: {
@@ -251,7 +251,7 @@ export class JobService extends BaseService {
       const status = await this.jobRepository.run(job);
       const jobMetric = `immich.jobs.${job.name.replaceAll('-', '_')}.${status}`;
       this.telemetryRepository.jobs.addToCounter(jobMetric, 1);
-      if (status === JobStatus.SUCCESS || status == JobStatus.SKIPPED) {
+      if (status === JobStatus.Success || status == JobStatus.Skipped) {
         await this.onDone(job);
       }
     } catch (error: Error | any) {
@@ -263,10 +263,10 @@ export class JobService extends BaseService {
 
   private isConcurrentQueue(name: QueueName): name is ConcurrentQueueName {
     return ![
-      QueueName.FACIAL_RECOGNITION,
-      QueueName.STORAGE_TEMPLATE_MIGRATION,
-      QueueName.DUPLICATE_DETECTION,
-      QueueName.BACKUP_DATABASE,
+      QueueName.FacialRecognition,
+      QueueName.StorageTemplateMigration,
+      QueueName.DuplicateDetection,
+      QueueName.BackupDatabase,
     ].includes(name);
   }
 
@@ -276,29 +276,29 @@ export class JobService extends BaseService {
 
     if (config.nightlyTasks.databaseCleanup) {
       jobs.push(
-        { name: JobName.ASSET_DELETION_CHECK },
-        { name: JobName.USER_DELETE_CHECK },
-        { name: JobName.PERSON_CLEANUP },
-        { name: JobName.MEMORIES_CLEANUP },
-        { name: JobName.CLEAN_OLD_SESSION_TOKENS },
-        { name: JobName.CLEAN_OLD_AUDIT_LOGS },
+        { name: JobName.AssetDeletionCheck },
+        { name: JobName.UserDeleteCheck },
+        { name: JobName.PersonCleanup },
+        { name: JobName.MemoriesCleanup },
+        { name: JobName.CleanOldSessionTokens },
+        { name: JobName.CleanOldAuditLogs },
       );
     }
 
     if (config.nightlyTasks.generateMemories) {
-      jobs.push({ name: JobName.MEMORIES_CREATE });
+      jobs.push({ name: JobName.MemoriesCreate });
     }
 
     if (config.nightlyTasks.syncQuotaUsage) {
-      jobs.push({ name: JobName.USER_SYNC_USAGE });
+      jobs.push({ name: JobName.userSyncUsage });
     }
 
     if (config.nightlyTasks.missingThumbnails) {
-      jobs.push({ name: JobName.QUEUE_GENERATE_THUMBNAILS, data: { force: false } });
+      jobs.push({ name: JobName.QueueGenerateThumbnails, data: { force: false } });
     }
 
     if (config.nightlyTasks.clusterNewFaces) {
-      jobs.push({ name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false, nightly: true } });
+      jobs.push({ name: JobName.QueueFacialRecognition, data: { force: false, nightly: true } });
     }
 
     await this.jobRepository.queueAll(jobs);
@@ -309,28 +309,28 @@ export class JobService extends BaseService {
    */
   private async onDone(item: JobItem) {
     switch (item.name) {
-      case JobName.SIDECAR_SYNC:
-      case JobName.SIDECAR_DISCOVERY: {
-        await this.jobRepository.queue({ name: JobName.METADATA_EXTRACTION, data: item.data });
+      case JobName.SidecarSync:
+      case JobName.SidecarDiscovery: {
+        await this.jobRepository.queue({ name: JobName.MetadataExtraction, data: item.data });
         break;
       }
 
-      case JobName.SIDECAR_WRITE: {
+      case JobName.SidecarWrite: {
         await this.jobRepository.queue({
-          name: JobName.METADATA_EXTRACTION,
+          name: JobName.MetadataExtraction,
           data: { id: item.data.id, source: 'sidecar-write' },
         });
         break;
       }
 
-      case JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE: {
+      case JobName.StorageTemplateMigrationSingle: {
         if (item.data.source === 'upload' || item.data.source === 'copy') {
-          await this.jobRepository.queue({ name: JobName.GENERATE_THUMBNAILS, data: item.data });
+          await this.jobRepository.queue({ name: JobName.GenerateThumbnails, data: item.data });
         }
         break;
       }
 
-      case JobName.GENERATE_PERSON_THUMBNAIL: {
+      case JobName.GeneratePersonThumbnail: {
         const { id } = item.data;
         const person = await this.personRepository.getById(id);
         if (person) {
@@ -339,7 +339,7 @@ export class JobService extends BaseService {
         break;
       }
 
-      case JobName.GENERATE_THUMBNAILS: {
+      case JobName.GenerateThumbnails: {
         if (!item.data.notify && item.data.source !== 'upload') {
           break;
         }
@@ -351,16 +351,16 @@ export class JobService extends BaseService {
         }
 
         const jobs: JobItem[] = [
-          { name: JobName.SMART_SEARCH, data: item.data },
-          { name: JobName.FACE_DETECTION, data: item.data },
+          { name: JobName.SmartSearch, data: item.data },
+          { name: JobName.FaceDetection, data: item.data },
         ];
 
-        if (asset.type === AssetType.VIDEO) {
-          jobs.push({ name: JobName.VIDEO_CONVERSION, data: item.data });
+        if (asset.type === AssetType.Video) {
+          jobs.push({ name: JobName.VideoConversation, data: item.data });
         }
 
         await this.jobRepository.queueAll(jobs);
-        if (asset.visibility === AssetVisibility.TIMELINE || asset.visibility === AssetVisibility.ARCHIVE) {
+        if (asset.visibility === AssetVisibility.Timeline || asset.visibility === AssetVisibility.Archive) {
           this.eventRepository.clientSend('on_upload_success', asset.ownerId, mapAsset(asset));
           if (asset.exifInfo) {
             const exif = asset.exifInfo;
@@ -417,14 +417,14 @@ export class JobService extends BaseService {
         break;
       }
 
-      case JobName.SMART_SEARCH: {
+      case JobName.SmartSearch: {
         if (item.data.source === 'upload') {
-          await this.jobRepository.queue({ name: JobName.DUPLICATE_DETECTION, data: item.data });
+          await this.jobRepository.queue({ name: JobName.DuplicateDetection, data: item.data });
         }
         break;
       }
 
-      case JobName.USER_DELETION: {
+      case JobName.UserDeletion: {
         this.eventRepository.clientBroadcast('on_user_delete', item.data.id);
         break;
       }
diff --git a/server/src/services/library.service.spec.ts b/server/src/services/library.service.spec.ts
index ab69e22b99..aa2b80d928 100644
--- a/server/src/services/library.service.spec.ts
+++ b/server/src/services/library.service.spec.ts
@@ -27,7 +27,7 @@ describe(LibraryService.name, () => {
     ({ sut, mocks } = newTestService(LibraryService, {}));
 
     mocks.database.tryLock.mockResolvedValue(true);
-    mocks.config.getWorker.mockReturnValue(ImmichWorker.MICROSERVICES);
+    mocks.config.getWorker.mockReturnValue(ImmichWorker.Microservices);
   });
 
   it('should work', () => {
@@ -173,7 +173,7 @@ describe(LibraryService.name, () => {
       await sut.handleQueueSyncFiles({ id: library.id });
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.LIBRARY_SYNC_FILES,
+        name: JobName.LibrarySyncFiles,
         data: {
           libraryId: library.id,
           paths: ['/data/user1/photo.jpg'],
@@ -185,7 +185,7 @@ describe(LibraryService.name, () => {
     it('should fail when library is not found', async () => {
       const library = factory.library({ importPaths: ['/foo', '/bar'] });
 
-      await expect(sut.handleQueueSyncFiles({ id: library.id })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleQueueSyncFiles({ id: library.id })).resolves.toBe(JobStatus.Skipped);
     });
 
     it('should ignore import paths that do not exist', async () => {
@@ -228,7 +228,7 @@ describe(LibraryService.name, () => {
       await sut.handleQueueSyncFiles({ id: library.id });
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.LIBRARY_SYNC_FILES,
+        name: JobName.LibrarySyncFiles,
         data: {
           libraryId: library.id,
           paths: ['/data/user1/photo.jpg'],
@@ -240,7 +240,7 @@ describe(LibraryService.name, () => {
     it("should fail when library can't be found", async () => {
       const library = factory.library({ importPaths: ['/foo', '/bar'] });
 
-      await expect(sut.handleQueueSyncFiles({ id: library.id })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleQueueSyncFiles({ id: library.id })).resolves.toBe(JobStatus.Skipped);
     });
 
     it('should ignore import paths that do not exist', async () => {
@@ -282,7 +282,7 @@ describe(LibraryService.name, () => {
 
       const response = await sut.handleQueueSyncAssets({ id: library.id });
 
-      expect(response).toBe(JobStatus.SUCCESS);
+      expect(response).toBe(JobStatus.Success);
       expect(mocks.asset.detectOfflineExternalAssets).toHaveBeenCalledWith(
         library.id,
         library.importPaths,
@@ -300,7 +300,7 @@ describe(LibraryService.name, () => {
 
       const response = await sut.handleQueueSyncAssets({ id: library.id });
 
-      expect(response).toBe(JobStatus.SUCCESS);
+      expect(response).toBe(JobStatus.Success);
       expect(mocks.asset.detectOfflineExternalAssets).not.toHaveBeenCalled();
     });
 
@@ -317,7 +317,7 @@ describe(LibraryService.name, () => {
       const response = await sut.handleQueueSyncAssets({ id: library.id });
 
       expect(mocks.job.queue).toBeCalledWith({
-        name: JobName.LIBRARY_SYNC_ASSETS,
+        name: JobName.LibrarySyncAssets,
         data: {
           libraryId: library.id,
           importPaths: library.importPaths,
@@ -328,7 +328,7 @@ describe(LibraryService.name, () => {
         },
       });
 
-      expect(response).toBe(JobStatus.SUCCESS);
+      expect(response).toBe(JobStatus.Success);
       expect(mocks.asset.detectOfflineExternalAssets).toHaveBeenCalledWith(
         library.id,
         library.importPaths,
@@ -337,7 +337,7 @@ describe(LibraryService.name, () => {
     });
 
     it("should fail if library can't be found", async () => {
-      await expect(sut.handleQueueSyncAssets({ id: newUuid() })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleQueueSyncAssets({ id: newUuid() })).resolves.toBe(JobStatus.Skipped);
     });
   });
 
@@ -355,7 +355,7 @@ describe(LibraryService.name, () => {
       mocks.assetJob.getForSyncAssets.mockResolvedValue([assetStub.external]);
       mocks.storage.stat.mockRejectedValue(new Error('ENOENT, no such file or directory'));
 
-      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.Success);
 
       expect(mocks.asset.updateAll).toHaveBeenCalledWith([assetStub.external.id], {
         isOffline: true,
@@ -376,7 +376,7 @@ describe(LibraryService.name, () => {
       mocks.assetJob.getForSyncAssets.mockResolvedValue([assetStub.external]);
       mocks.storage.stat.mockRejectedValue(new Error('Could not read file'));
 
-      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.Success);
 
       expect(mocks.asset.updateAll).toHaveBeenCalledWith([assetStub.external.id], {
         isOffline: true,
@@ -397,7 +397,7 @@ describe(LibraryService.name, () => {
       mocks.assetJob.getForSyncAssets.mockResolvedValue([assetStub.trashedOffline]);
       mocks.storage.stat.mockRejectedValue(new Error('Could not read file'));
 
-      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.Success);
 
       expect(mocks.asset.updateAll).not.toHaveBeenCalled();
     });
@@ -415,7 +415,7 @@ describe(LibraryService.name, () => {
       mocks.assetJob.getForSyncAssets.mockResolvedValue([assetStub.trashedOffline]);
       mocks.storage.stat.mockResolvedValue({ mtime: assetStub.external.fileModifiedAt } as Stats);
 
-      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.Success);
 
       expect(mocks.asset.updateAll).toHaveBeenCalledWith([assetStub.external.id], {
         isOffline: false,
@@ -436,7 +436,7 @@ describe(LibraryService.name, () => {
       mocks.assetJob.getForSyncAssets.mockResolvedValue([assetStub.trashedOffline]);
       mocks.storage.stat.mockResolvedValue({ mtime: assetStub.external.fileModifiedAt } as Stats);
 
-      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.Success);
 
       expect(mocks.asset.updateAll).not.toHaveBeenCalled();
 
@@ -456,7 +456,7 @@ describe(LibraryService.name, () => {
       mocks.assetJob.getForSyncAssets.mockResolvedValue([assetStub.trashedOffline]);
       mocks.storage.stat.mockResolvedValue({ mtime: assetStub.external.fileModifiedAt } as Stats);
 
-      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.Success);
 
       expect(mocks.asset.updateAll).not.toHaveBeenCalled();
 
@@ -476,7 +476,7 @@ describe(LibraryService.name, () => {
       mocks.assetJob.getForSyncAssets.mockResolvedValue([assetStub.external]);
       mocks.storage.stat.mockResolvedValue({ mtime: assetStub.external.fileModifiedAt } as Stats);
 
-      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.Success);
 
       expect(mocks.asset.updateAll).not.toHaveBeenCalled();
     });
@@ -494,7 +494,7 @@ describe(LibraryService.name, () => {
       mocks.assetJob.getForSyncAssets.mockResolvedValue([assetStub.trashedOffline]);
       mocks.storage.stat.mockResolvedValue({ mtime: assetStub.trashedOffline.fileModifiedAt } as Stats);
 
-      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.Success);
 
       expect(mocks.asset.updateAll).toHaveBeenCalledWith(
         [assetStub.trashedOffline.id],
@@ -523,11 +523,11 @@ describe(LibraryService.name, () => {
       mocks.assetJob.getForSyncAssets.mockResolvedValue([assetStub.external]);
       mocks.storage.stat.mockResolvedValue({ mtime } as Stats);
 
-      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSyncAssets(mockAssetJob)).resolves.toBe(JobStatus.Success);
 
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.SIDECAR_DISCOVERY,
+          name: JobName.SidecarDiscovery,
           data: {
             id: assetStub.external.id,
             source: 'upload',
@@ -557,7 +557,7 @@ describe(LibraryService.name, () => {
       mocks.asset.createAll.mockResolvedValue([assetStub.image]);
       mocks.library.get.mockResolvedValue(library);
 
-      await expect(sut.handleSyncFiles(mockLibraryJob)).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSyncFiles(mockLibraryJob)).resolves.toBe(JobStatus.Success);
 
       expect(mocks.asset.createAll).toHaveBeenCalledWith([
         expect.objectContaining({
@@ -565,7 +565,7 @@ describe(LibraryService.name, () => {
           libraryId: library.id,
           originalPath: '/data/user1/photo.jpg',
           deviceId: 'Library Import',
-          type: AssetType.IMAGE,
+          type: AssetType.Image,
           originalFileName: 'photo.jpg',
           isExternal: true,
         }),
@@ -573,7 +573,7 @@ describe(LibraryService.name, () => {
 
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.SIDECAR_DISCOVERY,
+          name: JobName.SidecarDiscovery,
           data: {
             id: assetStub.image.id,
             source: 'upload',
@@ -592,7 +592,7 @@ describe(LibraryService.name, () => {
 
       mocks.library.get.mockResolvedValue(library);
 
-      await expect(sut.handleSyncFiles(mockLibraryJob)).resolves.toBe(JobStatus.FAILED);
+      await expect(sut.handleSyncFiles(mockLibraryJob)).resolves.toBe(JobStatus.Failed);
 
       expect(mocks.asset.createAll.mock.calls).toEqual([]);
     });
@@ -607,7 +607,7 @@ describe(LibraryService.name, () => {
 
       await sut.delete(library.id);
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.LIBRARY_DELETE, data: { id: library.id } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.LibraryDelete, data: { id: library.id } });
       expect(mocks.library.softDelete).toHaveBeenCalledWith(library.id);
     });
 
@@ -620,7 +620,7 @@ describe(LibraryService.name, () => {
       await sut.delete(library.id);
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.LIBRARY_DELETE,
+        name: JobName.LibraryDelete,
         data: { id: library.id },
       });
 
@@ -838,11 +838,11 @@ describe(LibraryService.name, () => {
       const library2 = factory.library({ deletedAt: new Date() });
 
       mocks.library.getAllDeleted.mockResolvedValue([library1, library2]);
-      await expect(sut.handleQueueCleanup()).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleQueueCleanup()).resolves.toBe(JobStatus.Success);
 
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.LIBRARY_DELETE, data: { id: library1.id } },
-        { name: JobName.LIBRARY_DELETE, data: { id: library2.id } },
+        { name: JobName.LibraryDelete, data: { id: library1.id } },
+        { name: JobName.LibraryDelete, data: { id: library2.id } },
       ]);
     });
   });
@@ -968,7 +968,7 @@ describe(LibraryService.name, () => {
         await sut.watchAll();
 
         expect(mocks.job.queue).toHaveBeenCalledWith({
-          name: JobName.LIBRARY_SYNC_FILES,
+          name: JobName.LibrarySyncFiles,
           data: {
             libraryId: library.id,
             paths: ['/foo/photo.jpg'],
@@ -989,7 +989,7 @@ describe(LibraryService.name, () => {
         await sut.watchAll();
 
         expect(mocks.job.queue).toHaveBeenCalledWith({
-          name: JobName.LIBRARY_SYNC_FILES,
+          name: JobName.LibrarySyncFiles,
           data: {
             libraryId: library.id,
             paths: ['/foo/photo.jpg'],
@@ -1010,7 +1010,7 @@ describe(LibraryService.name, () => {
         await sut.watchAll();
 
         expect(mocks.job.queue).toHaveBeenCalledWith({
-          name: JobName.LIBRARY_ASSET_REMOVAL,
+          name: JobName.LibraryAssetRemoval,
           data: {
             libraryId: library.id,
             paths: [assetStub.image.originalPath],
@@ -1106,7 +1106,7 @@ describe(LibraryService.name, () => {
       mocks.library.get.mockResolvedValue(library);
       mocks.library.streamAssetIds.mockReturnValue(makeStream([]));
 
-      await expect(sut.handleDeleteLibrary({ id: library.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleDeleteLibrary({ id: library.id })).resolves.toBe(JobStatus.Success);
 
       expect(mocks.library.delete).toHaveBeenCalled();
     });
@@ -1117,7 +1117,7 @@ describe(LibraryService.name, () => {
       mocks.library.get.mockResolvedValue(library);
       mocks.library.streamAssetIds.mockReturnValue(makeStream([assetStub.image1]));
 
-      await expect(sut.handleDeleteLibrary({ id: library.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleDeleteLibrary({ id: library.id })).resolves.toBe(JobStatus.Success);
     });
   });
 
@@ -1131,11 +1131,11 @@ describe(LibraryService.name, () => {
 
       expect(mocks.job.queue).toHaveBeenCalledTimes(2);
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.LIBRARY_QUEUE_SYNC_FILES,
+        name: JobName.LibraryQueueSyncFiles,
         data: { id: library.id },
       });
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.LIBRARY_QUEUE_SYNC_ASSETS,
+        name: JobName.LibraryQueueSyncAssets,
         data: { id: library.id },
       });
     });
@@ -1147,14 +1147,14 @@ describe(LibraryService.name, () => {
 
       mocks.library.getAll.mockResolvedValue([library]);
 
-      await expect(sut.handleQueueScanAll()).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleQueueScanAll()).resolves.toBe(JobStatus.Success);
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.LIBRARY_QUEUE_CLEANUP,
+        name: JobName.LibraryQueueCleanup,
         data: {},
       });
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.LIBRARY_QUEUE_SYNC_FILES, data: { id: library.id } },
+        { name: JobName.LibraryQueueSyncFiles, data: { id: library.id } },
       ]);
     });
   });
diff --git a/server/src/services/library.service.ts b/server/src/services/library.service.ts
index 911ea3b702..f8377081fa 100644
--- a/server/src/services/library.service.ts
+++ b/server/src/services/library.service.ts
@@ -32,7 +32,7 @@ export class LibraryService extends BaseService {
   private lock = false;
   private watchers: Record<string, () => Promise<void>> = {};
 
-  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.MICROSERVICES] })
+  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.Microservices] })
   async onConfigInit({
     newConfig: {
       library: { watch, scan },
@@ -47,8 +47,7 @@ export class LibraryService extends BaseService {
       this.cronRepository.create({
         name: CronJob.LibraryScan,
         expression: scan.cronExpression,
-        onTick: () =>
-          handlePromiseError(this.jobRepository.queue({ name: JobName.LIBRARY_QUEUE_SCAN_ALL }), this.logger),
+        onTick: () => handlePromiseError(this.jobRepository.queue({ name: JobName.LibraryQueueScanAll }), this.logger),
         start: scan.enabled,
       });
     }
@@ -103,7 +102,7 @@ export class LibraryService extends BaseService {
       if (matcher(path)) {
         this.logger.debug(`File ${event} event received for ${path} in library ${library.id}}`);
         await this.jobRepository.queue({
-          name: JobName.LIBRARY_SYNC_FILES,
+          name: JobName.LibrarySyncFiles,
           data: { libraryId: library.id, paths: [path] },
         });
       } else {
@@ -114,7 +113,7 @@ export class LibraryService extends BaseService {
     const deletionHandler = async (path: string) => {
       this.logger.debug(`File unlink event received for ${path} in library ${library.id}}`);
       await this.jobRepository.queue({
-        name: JobName.LIBRARY_ASSET_REMOVAL,
+        name: JobName.LibraryAssetRemoval,
         data: { libraryId: library.id, paths: [path] },
       });
     };
@@ -199,7 +198,7 @@ export class LibraryService extends BaseService {
     return libraries.map((library) => mapLibrary(library));
   }
 
-  @OnJob({ name: JobName.LIBRARY_QUEUE_CLEANUP, queue: QueueName.LIBRARY })
+  @OnJob({ name: JobName.LibraryQueueCleanup, queue: QueueName.Library })
   async handleQueueCleanup(): Promise<JobStatus> {
     this.logger.log('Checking for any libraries pending deletion...');
     const pendingDeletions = await this.libraryRepository.getAllDeleted();
@@ -208,11 +207,11 @@ export class LibraryService extends BaseService {
       this.logger.log(`Found ${pendingDeletions.length} ${libraryString} pending deletion, cleaning up...`);
 
       await this.jobRepository.queueAll(
-        pendingDeletions.map((libraryToDelete) => ({ name: JobName.LIBRARY_DELETE, data: { id: libraryToDelete.id } })),
+        pendingDeletions.map((libraryToDelete) => ({ name: JobName.LibraryDelete, data: { id: libraryToDelete.id } })),
       );
     }
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   async create(dto: CreateLibraryDto): Promise<LibraryResponseDto> {
@@ -225,16 +224,16 @@ export class LibraryService extends BaseService {
     return mapLibrary(library);
   }
 
-  @OnJob({ name: JobName.LIBRARY_SYNC_FILES, queue: QueueName.LIBRARY })
-  async handleSyncFiles(job: JobOf<JobName.LIBRARY_SYNC_FILES>): Promise<JobStatus> {
+  @OnJob({ name: JobName.LibrarySyncFiles, queue: QueueName.Library })
+  async handleSyncFiles(job: JobOf<JobName.LibrarySyncFiles>): Promise<JobStatus> {
     const library = await this.libraryRepository.get(job.libraryId);
     // We need to check if the library still exists as it could have been deleted after the scan was queued
     if (!library) {
       this.logger.debug(`Library ${job.libraryId} not found, skipping file import`);
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     } else if (library.deletedAt) {
       this.logger.debug(`Library ${job.libraryId} is deleted, won't import assets into it`);
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     const assetImports: Insertable<AssetTable>[] = [];
@@ -263,7 +262,7 @@ export class LibraryService extends BaseService {
 
     await this.queuePostSyncJobs(assetIds);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private async validateImportPath(importPath: string): Promise<ValidateLibraryImportPathResponseDto> {
@@ -339,11 +338,11 @@ export class LibraryService extends BaseService {
     }
 
     await this.libraryRepository.softDelete(id);
-    await this.jobRepository.queue({ name: JobName.LIBRARY_DELETE, data: { id } });
+    await this.jobRepository.queue({ name: JobName.LibraryDelete, data: { id } });
   }
 
-  @OnJob({ name: JobName.LIBRARY_DELETE, queue: QueueName.LIBRARY })
-  async handleDeleteLibrary(job: JobOf<JobName.LIBRARY_DELETE>): Promise<JobStatus> {
+  @OnJob({ name: JobName.LibraryDelete, queue: QueueName.Library })
+  async handleDeleteLibrary(job: JobOf<JobName.LibraryDelete>): Promise<JobStatus> {
     const libraryId = job.id;
 
     await this.assetRepository.updateByLibraryId(libraryId, { deletedAt: new Date() });
@@ -356,7 +355,7 @@ export class LibraryService extends BaseService {
         assetsFound = true;
         this.logger.debug(`Queueing deletion of ${chunk.length} asset(s) in library ${libraryId}`);
         await this.jobRepository.queueAll(
-          chunk.map((id) => ({ name: JobName.ASSET_DELETION, data: { id, deleteOnDisk: false } })),
+          chunk.map((id) => ({ name: JobName.AssetDeletion, data: { id, deleteOnDisk: false } })),
         );
         chunk = [];
       }
@@ -379,7 +378,7 @@ export class LibraryService extends BaseService {
       await this.libraryRepository.delete(libraryId);
     }
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private async processEntity(filePath: string, ownerId: string, libraryId: string) {
@@ -398,7 +397,7 @@ export class LibraryService extends BaseService {
       // TODO: device asset id is deprecated, remove it
       deviceAssetId: `${basename(assetPath)}`.replaceAll(/\s+/g, ''),
       deviceId: 'Library Import',
-      type: mimeTypes.isVideo(assetPath) ? AssetType.VIDEO : AssetType.IMAGE,
+      type: mimeTypes.isVideo(assetPath) ? AssetType.Video : AssetType.Image,
       originalFileName: parse(assetPath).base,
       isExternal: true,
       livePhotoVideoId: null,
@@ -411,7 +410,7 @@ export class LibraryService extends BaseService {
     // We queue a sidecar discovery which, in turn, queues metadata extraction
     await this.jobRepository.queueAll(
       assetIds.map((assetId) => ({
-        name: JobName.SIDECAR_DISCOVERY,
+        name: JobName.SidecarDiscovery,
         data: { id: assetId, source: 'upload' },
       })),
     );
@@ -423,30 +422,30 @@ export class LibraryService extends BaseService {
     this.logger.log(`Starting to scan library ${id}`);
 
     await this.jobRepository.queue({
-      name: JobName.LIBRARY_QUEUE_SYNC_FILES,
+      name: JobName.LibraryQueueSyncFiles,
       data: {
         id,
       },
     });
 
-    await this.jobRepository.queue({ name: JobName.LIBRARY_QUEUE_SYNC_ASSETS, data: { id } });
+    await this.jobRepository.queue({ name: JobName.LibraryQueueSyncAssets, data: { id } });
   }
 
   async queueScanAll() {
-    await this.jobRepository.queue({ name: JobName.LIBRARY_QUEUE_SCAN_ALL, data: {} });
+    await this.jobRepository.queue({ name: JobName.LibraryQueueScanAll, data: {} });
   }
 
-  @OnJob({ name: JobName.LIBRARY_QUEUE_SCAN_ALL, queue: QueueName.LIBRARY })
+  @OnJob({ name: JobName.LibraryQueueScanAll, queue: QueueName.Library })
   async handleQueueScanAll(): Promise<JobStatus> {
     this.logger.log(`Initiating scan of all external libraries...`);
 
-    await this.jobRepository.queue({ name: JobName.LIBRARY_QUEUE_CLEANUP, data: {} });
+    await this.jobRepository.queue({ name: JobName.LibraryQueueCleanup, data: {} });
 
     const libraries = await this.libraryRepository.getAll(true);
 
     await this.jobRepository.queueAll(
       libraries.map((library) => ({
-        name: JobName.LIBRARY_QUEUE_SYNC_FILES,
+        name: JobName.LibraryQueueSyncFiles,
         data: {
           id: library.id,
         },
@@ -454,18 +453,18 @@ export class LibraryService extends BaseService {
     );
     await this.jobRepository.queueAll(
       libraries.map((library) => ({
-        name: JobName.LIBRARY_QUEUE_SYNC_ASSETS,
+        name: JobName.LibraryQueueSyncAssets,
         data: {
           id: library.id,
         },
       })),
     );
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.LIBRARY_SYNC_ASSETS, queue: QueueName.LIBRARY })
-  async handleSyncAssets(job: JobOf<JobName.LIBRARY_SYNC_ASSETS>): Promise<JobStatus> {
+  @OnJob({ name: JobName.LibrarySyncAssets, queue: QueueName.Library })
+  async handleSyncAssets(job: JobOf<JobName.LibrarySyncAssets>): Promise<JobStatus> {
     const assets = await this.assetJobRepository.getForSyncAssets(job.assetIds);
 
     const assetIdsToOffline: string[] = [];
@@ -486,7 +485,7 @@ export class LibraryService extends BaseService {
       const action = this.checkExistingAsset(asset, stat);
       switch (action) {
         case AssetSyncResult.OFFLINE: {
-          if (asset.status === AssetStatus.TRASHED) {
+          if (asset.status === AssetStatus.Trashed) {
             trashedAssetIdsToOffline.push(asset.id);
           } else {
             assetIdsToOffline.push(asset.id);
@@ -511,7 +510,7 @@ export class LibraryService extends BaseService {
 
           if (!isExcluded) {
             this.logger.debug(`Offline asset ${asset.originalPath} is now online in library ${job.libraryId}`);
-            if (asset.status === AssetStatus.TRASHED) {
+            if (asset.status === AssetStatus.Trashed) {
               trashedAssetIdsToOnline.push(asset.id);
             } else {
               assetIdsToOnline.push(asset.id);
@@ -557,7 +556,7 @@ export class LibraryService extends BaseService {
       `Checked existing asset(s): ${assetIdsToOffline.length + trashedAssetIdsToOffline.length} offlined, ${assetIdsToOnline.length + trashedAssetIdsToOnline.length} onlined, ${assetIdsToUpdate.length} updated, ${remainingCount} unchanged of current batch of ${assets.length} (Total progress: ${job.progressCounter} of ${job.totalAssets}, ${cumulativePercentage} %) in library ${job.libraryId}.`,
     );
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private checkExistingAsset(
@@ -585,7 +584,7 @@ export class LibraryService extends BaseService {
       return AssetSyncResult.OFFLINE;
     }
 
-    if (asset.isOffline && asset.status !== AssetStatus.DELETED) {
+    if (asset.isOffline && asset.status !== AssetStatus.Deleted) {
       // Only perform the expensive check if the asset is offline
       return AssetSyncResult.CHECK_OFFLINE;
     }
@@ -599,12 +598,12 @@ export class LibraryService extends BaseService {
     return AssetSyncResult.DO_NOTHING;
   }
 
-  @OnJob({ name: JobName.LIBRARY_QUEUE_SYNC_FILES, queue: QueueName.LIBRARY })
-  async handleQueueSyncFiles(job: JobOf<JobName.LIBRARY_QUEUE_SYNC_FILES>): Promise<JobStatus> {
+  @OnJob({ name: JobName.LibraryQueueSyncFiles, queue: QueueName.Library })
+  async handleQueueSyncFiles(job: JobOf<JobName.LibraryQueueSyncFiles>): Promise<JobStatus> {
     const library = await this.libraryRepository.get(job.id);
     if (!library) {
       this.logger.debug(`Library ${job.id} not found, skipping refresh`);
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     this.logger.debug(`Validating import paths for library ${library.id}...`);
@@ -623,7 +622,7 @@ export class LibraryService extends BaseService {
     if (validImportPaths.length === 0) {
       this.logger.warn(`No valid import paths found for library ${library.id}`);
 
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const pathsOnDisk = this.storageRepository.walk({
@@ -646,7 +645,7 @@ export class LibraryService extends BaseService {
         importCount += paths.length;
 
         await this.jobRepository.queue({
-          name: JobName.LIBRARY_SYNC_FILES,
+          name: JobName.LibrarySyncFiles,
           data: {
             libraryId: library.id,
             paths,
@@ -666,11 +665,11 @@ export class LibraryService extends BaseService {
 
     await this.libraryRepository.update(job.id, { refreshedAt: new Date() });
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.LIBRARY_ASSET_REMOVAL, queue: QueueName.LIBRARY })
-  async handleAssetRemoval(job: JobOf<JobName.LIBRARY_ASSET_REMOVAL>): Promise<JobStatus> {
+  @OnJob({ name: JobName.LibraryAssetRemoval, queue: QueueName.Library })
+  async handleAssetRemoval(job: JobOf<JobName.LibraryAssetRemoval>): Promise<JobStatus> {
     // This is only for handling file unlink events via the file watcher
     this.logger.verbose(`Deleting asset(s) ${job.paths} from library ${job.libraryId}`);
     for (const assetPath of job.paths) {
@@ -680,20 +679,20 @@ export class LibraryService extends BaseService {
       }
     }
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.LIBRARY_QUEUE_SYNC_ASSETS, queue: QueueName.LIBRARY })
-  async handleQueueSyncAssets(job: JobOf<JobName.LIBRARY_QUEUE_SYNC_ASSETS>): Promise<JobStatus> {
+  @OnJob({ name: JobName.LibraryQueueSyncAssets, queue: QueueName.Library })
+  async handleQueueSyncAssets(job: JobOf<JobName.LibraryQueueSyncAssets>): Promise<JobStatus> {
     const library = await this.libraryRepository.get(job.id);
     if (!library) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const assetCount = await this.assetRepository.getLibraryAssetCount(job.id);
     if (!assetCount) {
       this.logger.log(`Library ${library.id} is empty, no need to check assets`);
-      return JobStatus.SUCCESS;
+      return JobStatus.Success;
     }
 
     this.logger.log(
@@ -713,7 +712,7 @@ export class LibraryService extends BaseService {
     );
 
     if (affectedAssetCount === assetCount) {
-      return JobStatus.SUCCESS;
+      return JobStatus.Success;
     }
 
     let chunk: string[] = [];
@@ -724,7 +723,7 @@ export class LibraryService extends BaseService {
         count += chunk.length;
 
         await this.jobRepository.queue({
-          name: JobName.LIBRARY_SYNC_ASSETS,
+          name: JobName.LibrarySyncAssets,
           data: {
             libraryId: library.id,
             importPaths: library.importPaths,
@@ -758,7 +757,7 @@ export class LibraryService extends BaseService {
 
     this.logger.log(`Finished queuing ${count} asset check(s) for library ${library.id}`);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private async findOrFail(id: string) {
diff --git a/server/src/services/media.service.spec.ts b/server/src/services/media.service.spec.ts
index 3b9eafde8f..f535bb65ff 100644
--- a/server/src/services/media.service.spec.ts
+++ b/server/src/services/media.service.spec.ts
@@ -12,7 +12,7 @@ import {
   JobName,
   JobStatus,
   RawExtractedFormat,
-  TranscodeHWAccel,
+  TranscodeHardwareAcceleration,
   TranscodePolicy,
   VideoCodec,
 } from 'src/enum';
@@ -49,7 +49,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GENERATE_THUMBNAILS,
+          name: JobName.GenerateThumbnails,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -57,7 +57,7 @@ describe(MediaService.name, () => {
       expect(mocks.person.getAll).toHaveBeenCalledWith(undefined);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GENERATE_PERSON_THUMBNAIL,
+          name: JobName.GeneratePersonThumbnail,
           data: { id: personStub.newThumbnail.id },
         },
       ]);
@@ -72,7 +72,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GENERATE_THUMBNAILS,
+          name: JobName.GenerateThumbnails,
           data: { id: assetStub.trashed.id },
         },
       ]);
@@ -87,7 +87,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GENERATE_THUMBNAILS,
+          name: JobName.GenerateThumbnails,
           data: { id: assetStub.archived.id },
         },
       ]);
@@ -106,7 +106,7 @@ describe(MediaService.name, () => {
       expect(mocks.person.update).toHaveBeenCalledTimes(1);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GENERATE_PERSON_THUMBNAIL,
+          name: JobName.GeneratePersonThumbnail,
           data: {
             id: personStub.newThumbnail.id,
           },
@@ -122,7 +122,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(false);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GENERATE_THUMBNAILS,
+          name: JobName.GenerateThumbnails,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -138,7 +138,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(false);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GENERATE_THUMBNAILS,
+          name: JobName.GenerateThumbnails,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -154,7 +154,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(false);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GENERATE_THUMBNAILS,
+          name: JobName.GenerateThumbnails,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -169,14 +169,14 @@ describe(MediaService.name, () => {
       mocks.job.getJobCounts.mockResolvedValue({ active: 1, waiting: 0 } as JobCounts);
       mocks.person.getAll.mockReturnValue(makeStream([personStub.withName]));
 
-      await expect(sut.handleQueueMigration()).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleQueueMigration()).resolves.toBe(JobStatus.Success);
 
       expect(mocks.storage.removeEmptyDirs).toHaveBeenCalledTimes(2);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.MIGRATE_ASSET, data: { id: assetStub.image.id } },
+        { name: JobName.MigrateAsset, data: { id: assetStub.image.id } },
       ]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.MIGRATE_PERSON, data: { id: personStub.withName.id } },
+        { name: JobName.MigratePerson, data: { id: personStub.withName.id } },
       ]);
     });
   });
@@ -184,7 +184,7 @@ describe(MediaService.name, () => {
   describe('handleAssetMigration', () => {
     it('should fail if asset does not exist', async () => {
       mocks.assetJob.getForMigrationJob.mockResolvedValue(void 0);
-      await expect(sut.handleAssetMigration({ id: assetStub.image.id })).resolves.toBe(JobStatus.FAILED);
+      await expect(sut.handleAssetMigration({ id: assetStub.image.id })).resolves.toBe(JobStatus.Failed);
 
       expect(mocks.move.getByEntity).not.toHaveBeenCalled();
     });
@@ -196,25 +196,25 @@ describe(MediaService.name, () => {
         id: 'move-id',
         newPath: '/new/path',
         oldPath: '/old/path',
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
       });
 
-      await expect(sut.handleAssetMigration({ id: assetStub.image.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleAssetMigration({ id: assetStub.image.id })).resolves.toBe(JobStatus.Success);
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: assetStub.image.id,
-        pathType: AssetPathType.FULLSIZE,
+        pathType: AssetPathType.FullSize,
         oldPath: '/uploads/user-id/fullsize/path.webp',
         newPath: 'upload/thumbs/user-id/as/se/asset-id-fullsize.jpeg',
       });
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: assetStub.image.id,
-        pathType: AssetPathType.PREVIEW,
+        pathType: AssetPathType.Preview,
         oldPath: '/uploads/user-id/thumbs/path.jpg',
         newPath: 'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
       });
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: assetStub.image.id,
-        pathType: AssetPathType.THUMBNAIL,
+        pathType: AssetPathType.Thumbnail,
         oldPath: '/uploads/user-id/webp/path.ext',
         newPath: 'upload/thumbs/user-id/as/se/asset-id-thumbnail.webp',
       });
@@ -253,7 +253,7 @@ describe(MediaService.name, () => {
     it('should skip thumbnail generation if asset type is unknown', async () => {
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue({ ...assetStub.image, type: 'foo' as AssetType });
 
-      await expect(sut.handleGenerateThumbnails({ id: assetStub.image.id })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleGenerateThumbnails({ id: assetStub.image.id })).resolves.toBe(JobStatus.Skipped);
       expect(mocks.media.probe).not.toHaveBeenCalled();
       expect(mocks.media.generateThumbnail).not.toHaveBeenCalled();
       expect(mocks.asset.update).not.toHaveBeenCalledWith();
@@ -270,14 +270,14 @@ describe(MediaService.name, () => {
     it('should skip invisible assets', async () => {
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.livePhotoMotionAsset);
 
-      expect(await sut.handleGenerateThumbnails({ id: assetStub.livePhotoMotionAsset.id })).toEqual(JobStatus.SKIPPED);
+      expect(await sut.handleGenerateThumbnails({ id: assetStub.livePhotoMotionAsset.id })).toEqual(JobStatus.Skipped);
 
       expect(mocks.media.generateThumbnail).not.toHaveBeenCalled();
       expect(mocks.asset.update).not.toHaveBeenCalledWith();
     });
 
     it('should delete previous preview if different path', async () => {
-      mocks.systemMetadata.get.mockResolvedValue({ image: { thumbnail: { format: ImageFormat.WEBP } } });
+      mocks.systemMetadata.get.mockResolvedValue({ image: { thumbnail: { format: ImageFormat.Webp } } });
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.image);
 
       await sut.handleGenerateThumbnails({ id: assetStub.image.id });
@@ -309,7 +309,7 @@ describe(MediaService.name, () => {
         rawBuffer,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           size: 1440,
           quality: 80,
           processInvalidImages: false,
@@ -321,7 +321,7 @@ describe(MediaService.name, () => {
         rawBuffer,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.WEBP,
+          format: ImageFormat.Webp,
           size: 250,
           quality: 80,
           processInvalidImages: false,
@@ -340,12 +340,12 @@ describe(MediaService.name, () => {
       expect(mocks.asset.upsertFiles).toHaveBeenCalledWith([
         {
           assetId: 'asset-id',
-          type: AssetFileType.PREVIEW,
+          type: AssetFileType.Preview,
           path: 'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
         },
         {
           assetId: 'asset-id',
-          type: AssetFileType.THUMBNAIL,
+          type: AssetFileType.Thumbnail,
           path: 'upload/thumbs/user-id/as/se/asset-id-thumbnail.webp',
         },
       ]);
@@ -376,12 +376,12 @@ describe(MediaService.name, () => {
       expect(mocks.asset.upsertFiles).toHaveBeenCalledWith([
         {
           assetId: 'asset-id',
-          type: AssetFileType.PREVIEW,
+          type: AssetFileType.Preview,
           path: 'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
         },
         {
           assetId: 'asset-id',
-          type: AssetFileType.THUMBNAIL,
+          type: AssetFileType.Thumbnail,
           path: 'upload/thumbs/user-id/as/se/asset-id-thumbnail.webp',
         },
       ]);
@@ -411,12 +411,12 @@ describe(MediaService.name, () => {
       expect(mocks.asset.upsertFiles).toHaveBeenCalledWith([
         {
           assetId: 'asset-id',
-          type: AssetFileType.PREVIEW,
+          type: AssetFileType.Preview,
           path: 'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
         },
         {
           assetId: 'asset-id',
-          type: AssetFileType.THUMBNAIL,
+          type: AssetFileType.Thumbnail,
           path: 'upload/thumbs/user-id/as/se/asset-id-thumbnail.webp',
         },
       ]);
@@ -465,7 +465,7 @@ describe(MediaService.name, () => {
 
     it('should use scaling divisible by 2 even when using quick sync', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream2160p);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.QSV } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv } });
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.video);
       await sut.handleGenerateThumbnails({ id: assetStub.video.id });
 
@@ -493,7 +493,7 @@ describe(MediaService.name, () => {
       expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/thumbs/user-id/as/se');
       expect(mocks.media.decodeImage).toHaveBeenCalledOnce();
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(assetStub.image.originalPath, {
-        colorspace: Colorspace.SRGB,
+        colorspace: Colorspace.Srgb,
         processInvalidImages: false,
         size: 1440,
       });
@@ -502,7 +502,7 @@ describe(MediaService.name, () => {
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         rawBuffer,
         {
-          colorspace: Colorspace.SRGB,
+          colorspace: Colorspace.Srgb,
           format,
           size: 1440,
           quality: 80,
@@ -514,8 +514,8 @@ describe(MediaService.name, () => {
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         rawBuffer,
         {
-          colorspace: Colorspace.SRGB,
-          format: ImageFormat.WEBP,
+          colorspace: Colorspace.Srgb,
+          format: ImageFormat.Webp,
           size: 250,
           quality: 80,
           processInvalidImages: false,
@@ -538,7 +538,7 @@ describe(MediaService.name, () => {
       expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/thumbs/user-id/as/se');
       expect(mocks.media.decodeImage).toHaveBeenCalledOnce();
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(assetStub.image.originalPath, {
-        colorspace: Colorspace.SRGB,
+        colorspace: Colorspace.Srgb,
         processInvalidImages: false,
         size: 1440,
       });
@@ -547,8 +547,8 @@ describe(MediaService.name, () => {
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         rawBuffer,
         {
-          colorspace: Colorspace.SRGB,
-          format: ImageFormat.JPEG,
+          colorspace: Colorspace.Srgb,
+          format: ImageFormat.Jpeg,
           size: 1440,
           quality: 80,
           processInvalidImages: false,
@@ -559,7 +559,7 @@ describe(MediaService.name, () => {
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         rawBuffer,
         {
-          colorspace: Colorspace.SRGB,
+          colorspace: Colorspace.Srgb,
           format,
           size: 250,
           quality: 80,
@@ -571,7 +571,7 @@ describe(MediaService.name, () => {
     });
 
     it('should delete previous thumbnail if different path', async () => {
-      mocks.systemMetadata.get.mockResolvedValue({ image: { thumbnail: { format: ImageFormat.WEBP } } });
+      mocks.systemMetadata.get.mockResolvedValue({ image: { thumbnail: { format: ImageFormat.Webp } } });
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.image);
 
       await sut.handleGenerateThumbnails({ id: assetStub.image.id });
@@ -580,7 +580,7 @@ describe(MediaService.name, () => {
     });
 
     it('should extract embedded image if enabled and available', async () => {
-      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.JPEG });
+      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.Jpeg });
       mocks.media.getImageDimensions.mockResolvedValue({ width: 3840, height: 2160 });
       mocks.systemMetadata.get.mockResolvedValue({ image: { extractEmbedded: true } });
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.imageDng);
@@ -596,7 +596,7 @@ describe(MediaService.name, () => {
     });
 
     it('should resize original image if embedded image is too small', async () => {
-      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.JPEG });
+      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.Jpeg });
       mocks.media.getImageDimensions.mockResolvedValue({ width: 1000, height: 1000 });
       mocks.systemMetadata.get.mockResolvedValue({ image: { extractEmbedded: true } });
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.imageDng);
@@ -678,9 +678,9 @@ describe(MediaService.name, () => {
 
     it('should extract full-size JPEG preview from RAW', async () => {
       mocks.systemMetadata.get.mockResolvedValue({
-        image: { fullsize: { enabled: true, format: ImageFormat.WEBP }, extractEmbedded: true },
+        image: { fullsize: { enabled: true, format: ImageFormat.Webp }, extractEmbedded: true },
       });
-      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.JPEG });
+      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.Jpeg });
       mocks.media.getImageDimensions.mockResolvedValue({ width: 3840, height: 2160 });
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.imageDng);
 
@@ -698,7 +698,7 @@ describe(MediaService.name, () => {
         fullsizeBuffer,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           size: 1440,
           quality: 80,
           processInvalidImages: false,
@@ -710,9 +710,9 @@ describe(MediaService.name, () => {
 
     it('should convert full-size WEBP preview from JXL preview of RAW', async () => {
       mocks.systemMetadata.get.mockResolvedValue({
-        image: { fullsize: { enabled: true, format: ImageFormat.WEBP }, extractEmbedded: true },
+        image: { fullsize: { enabled: true, format: ImageFormat.Webp }, extractEmbedded: true },
       });
-      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.JXL });
+      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.Jxl });
       mocks.media.getImageDimensions.mockResolvedValue({ width: 3840, height: 2160 });
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.imageDng);
 
@@ -729,7 +729,7 @@ describe(MediaService.name, () => {
         fullsizeBuffer,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.WEBP,
+          format: ImageFormat.Webp,
           quality: 80,
           processInvalidImages: false,
           raw: rawInfo,
@@ -740,7 +740,7 @@ describe(MediaService.name, () => {
         fullsizeBuffer,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           size: 1440,
           quality: 80,
           processInvalidImages: false,
@@ -752,7 +752,7 @@ describe(MediaService.name, () => {
 
     it('should generate full-size preview directly from RAW images when extractEmbedded is false', async () => {
       mocks.systemMetadata.get.mockResolvedValue({ image: { fullsize: { enabled: true }, extractEmbedded: false } });
-      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.JPEG });
+      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.Jpeg });
       mocks.media.getImageDimensions.mockResolvedValue({ width: 3840, height: 2160 });
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.imageDng);
 
@@ -769,7 +769,7 @@ describe(MediaService.name, () => {
         rawBuffer,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           quality: 80,
           processInvalidImages: false,
           raw: rawInfo,
@@ -780,7 +780,7 @@ describe(MediaService.name, () => {
         rawBuffer,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           quality: 80,
           size: 1440,
           processInvalidImages: false,
@@ -792,7 +792,7 @@ describe(MediaService.name, () => {
 
     it('should generate full-size preview from non-web-friendly images', async () => {
       mocks.systemMetadata.get.mockResolvedValue({ image: { fullsize: { enabled: true } } });
-      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.JPEG });
+      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.Jpeg });
       mocks.media.getImageDimensions.mockResolvedValue({ width: 3840, height: 2160 });
       // HEIF/HIF image taken by cameras are not web-friendly, only has limited support on Safari.
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.imageHif);
@@ -810,7 +810,7 @@ describe(MediaService.name, () => {
         rawBuffer,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           quality: 80,
           processInvalidImages: false,
           raw: rawInfo,
@@ -821,7 +821,7 @@ describe(MediaService.name, () => {
 
     it('should skip generating full-size preview for web-friendly images', async () => {
       mocks.systemMetadata.get.mockResolvedValue({ image: { fullsize: { enabled: true } } });
-      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.JPEG });
+      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.Jpeg });
       mocks.media.getImageDimensions.mockResolvedValue({ width: 3840, height: 2160 });
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.image);
 
@@ -829,7 +829,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.decodeImage).toHaveBeenCalledOnce();
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(assetStub.image.originalPath, {
-        colorspace: Colorspace.SRGB,
+        colorspace: Colorspace.Srgb,
         processInvalidImages: false,
         size: 1440,
       });
@@ -844,9 +844,9 @@ describe(MediaService.name, () => {
 
     it('should respect encoding options when generating full-size preview', async () => {
       mocks.systemMetadata.get.mockResolvedValue({
-        image: { fullsize: { enabled: true, format: ImageFormat.WEBP, quality: 90 } },
+        image: { fullsize: { enabled: true, format: ImageFormat.Webp, quality: 90 } },
       });
-      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.JPEG });
+      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.Jpeg });
       mocks.media.getImageDimensions.mockResolvedValue({ width: 3840, height: 2160 });
       // HEIF/HIF image taken by cameras are not web-friendly, only has limited support on Safari.
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.imageHif);
@@ -864,7 +864,7 @@ describe(MediaService.name, () => {
         rawBuffer,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.WEBP,
+          format: ImageFormat.Webp,
           quality: 90,
           processInvalidImages: false,
           raw: rawInfo,
@@ -878,7 +878,7 @@ describe(MediaService.name, () => {
     it('should skip if machine learning is disabled', async () => {
       mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.machineLearningDisabled);
 
-      await expect(sut.handleGeneratePersonThumbnail({ id: 'person-1' })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleGeneratePersonThumbnail({ id: 'person-1' })).resolves.toBe(JobStatus.Skipped);
       expect(mocks.asset.getByIds).not.toHaveBeenCalled();
       expect(mocks.systemMetadata.get).toHaveBeenCalled();
     });
@@ -907,7 +907,7 @@ describe(MediaService.name, () => {
       mocks.media.decodeImage.mockResolvedValue({ data, info });
 
       await expect(sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id })).resolves.toBe(
-        JobStatus.SUCCESS,
+        JobStatus.Success,
       );
 
       expect(mocks.person.getDataForThumbnailGenerationJob).toHaveBeenCalledWith(personStub.primaryPerson.id);
@@ -921,7 +921,7 @@ describe(MediaService.name, () => {
         data,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           quality: 80,
           crop: {
             left: 238,
@@ -949,7 +949,7 @@ describe(MediaService.name, () => {
       mocks.media.decodeImage.mockResolvedValue({ data, info });
 
       await expect(sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id })).resolves.toBe(
-        JobStatus.SUCCESS,
+        JobStatus.Success,
       );
 
       expect(mocks.person.getDataForThumbnailGenerationJob).toHaveBeenCalledWith(personStub.primaryPerson.id);
@@ -963,7 +963,7 @@ describe(MediaService.name, () => {
         data,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           quality: 80,
           crop: {
             left: 238,
@@ -991,7 +991,7 @@ describe(MediaService.name, () => {
       mocks.media.decodeImage.mockResolvedValue({ data, info });
 
       await expect(sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id })).resolves.toBe(
-        JobStatus.SUCCESS,
+        JobStatus.Success,
       );
 
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(personThumbnailStub.newThumbnailStart.originalPath, {
@@ -1003,7 +1003,7 @@ describe(MediaService.name, () => {
         data,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           quality: 80,
           crop: {
             left: 0,
@@ -1028,7 +1028,7 @@ describe(MediaService.name, () => {
       mocks.media.decodeImage.mockResolvedValue({ data, info });
 
       await expect(sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id })).resolves.toBe(
-        JobStatus.SUCCESS,
+        JobStatus.Success,
       );
 
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(personThumbnailStub.newThumbnailEnd.originalPath, {
@@ -1040,7 +1040,7 @@ describe(MediaService.name, () => {
         data,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           quality: 80,
           crop: {
             left: 591,
@@ -1065,7 +1065,7 @@ describe(MediaService.name, () => {
       mocks.media.decodeImage.mockResolvedValue({ data, info });
 
       await expect(sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id })).resolves.toBe(
-        JobStatus.SUCCESS,
+        JobStatus.Success,
       );
 
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(personThumbnailStub.negativeCoordinate.originalPath, {
@@ -1077,7 +1077,7 @@ describe(MediaService.name, () => {
         data,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           quality: 80,
           crop: {
             left: 0,
@@ -1102,7 +1102,7 @@ describe(MediaService.name, () => {
       mocks.media.decodeImage.mockResolvedValue({ data, info });
 
       await expect(sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id })).resolves.toBe(
-        JobStatus.SUCCESS,
+        JobStatus.Success,
       );
 
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(personThumbnailStub.overflowingCoordinate.originalPath, {
@@ -1114,7 +1114,7 @@ describe(MediaService.name, () => {
         data,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           quality: 80,
           crop: {
             left: 4485,
@@ -1138,12 +1138,12 @@ describe(MediaService.name, () => {
       const extracted = Buffer.from('');
       const data = Buffer.from('');
       const info = { width: 2160, height: 3840 } as OutputInfo;
-      mocks.media.extract.mockResolvedValue({ buffer: extracted, format: RawExtractedFormat.JPEG });
+      mocks.media.extract.mockResolvedValue({ buffer: extracted, format: RawExtractedFormat.Jpeg });
       mocks.media.decodeImage.mockResolvedValue({ data, info });
       mocks.media.getImageDimensions.mockResolvedValue(info);
 
       await expect(sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id })).resolves.toBe(
-        JobStatus.SUCCESS,
+        JobStatus.Success,
       );
 
       expect(mocks.media.extract).toHaveBeenCalledWith(personThumbnailStub.rawEmbeddedThumbnail.originalPath);
@@ -1156,7 +1156,7 @@ describe(MediaService.name, () => {
         data,
         {
           colorspace: Colorspace.P3,
-          format: ImageFormat.JPEG,
+          format: ImageFormat.Jpeg,
           quality: 80,
           crop: {
             height: 844,
@@ -1180,7 +1180,7 @@ describe(MediaService.name, () => {
       mocks.media.decodeImage.mockResolvedValue({ data, info });
 
       await expect(sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id })).resolves.toBe(
-        JobStatus.SUCCESS,
+        JobStatus.Success,
       );
 
       expect(mocks.media.extract).not.toHaveBeenCalled();
@@ -1196,7 +1196,7 @@ describe(MediaService.name, () => {
       mocks.media.decodeImage.mockResolvedValue({ data, info });
 
       await expect(sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id })).resolves.toBe(
-        JobStatus.SUCCESS,
+        JobStatus.Success,
       );
 
       expect(mocks.media.extract).toHaveBeenCalledWith(personThumbnailStub.rawEmbeddedThumbnail.originalPath);
@@ -1216,11 +1216,11 @@ describe(MediaService.name, () => {
       const data = Buffer.from('');
       const info = { width: 1000, height: 1000 } as OutputInfo;
       mocks.media.decodeImage.mockResolvedValue({ data, info });
-      mocks.media.extract.mockResolvedValue({ buffer: extracted, format: RawExtractedFormat.JPEG });
+      mocks.media.extract.mockResolvedValue({ buffer: extracted, format: RawExtractedFormat.Jpeg });
       mocks.media.getImageDimensions.mockResolvedValue(info);
 
       await expect(sut.handleGeneratePersonThumbnail({ id: personStub.primaryPerson.id })).resolves.toBe(
-        JobStatus.SUCCESS,
+        JobStatus.Success,
       );
 
       expect(mocks.media.extract).toHaveBeenCalledWith(personThumbnailStub.rawEmbeddedThumbnail.originalPath);
@@ -1243,7 +1243,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForVideoConversion).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.VIDEO_CONVERSION,
+          name: JobName.VideoConversation,
           data: { id: assetStub.video.id },
         },
       ]);
@@ -1257,7 +1257,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForVideoConversion).toHaveBeenCalledWith(void 0);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.VIDEO_CONVERSION,
+          name: JobName.VideoConversation,
           data: { id: assetStub.video.id },
         },
       ]);
@@ -1340,17 +1340,17 @@ describe(MediaService.name, () => {
     it('should throw an error if transcoding fails and hw acceleration is disabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.multipleVideoStreams);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { transcode: TranscodePolicy.ALL, accel: TranscodeHWAccel.DISABLED },
+        ffmpeg: { transcode: TranscodePolicy.All, accel: TranscodeHardwareAcceleration.Disabled },
       });
       mocks.media.transcode.mockRejectedValue(new Error('Error transcoding video'));
 
-      await expect(sut.handleVideoConversion({ id: assetStub.video.id })).resolves.toBe(JobStatus.FAILED);
+      await expect(sut.handleVideoConversion({ id: assetStub.video.id })).resolves.toBe(JobStatus.Failed);
       expect(mocks.media.transcode).toHaveBeenCalledTimes(1);
     });
 
     it('should transcode when set to all', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.multipleVideoStreams);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.ALL } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.All } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1365,7 +1365,7 @@ describe(MediaService.name, () => {
 
     it('should transcode when optimal and too big', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream2160p);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.OPTIMAL } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Optimal } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1380,7 +1380,7 @@ describe(MediaService.name, () => {
 
     it('should transcode when policy bitrate and bitrate higher than max bitrate', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream40Mbps);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.BITRATE, maxBitrate: '30M' } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Bitrate, maxBitrate: '30M' } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1395,7 +1395,7 @@ describe(MediaService.name, () => {
 
     it('should transcode when max bitrate is not a number', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream40Mbps);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.BITRATE, maxBitrate: 'foo' } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Bitrate, maxBitrate: 'foo' } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1411,7 +1411,7 @@ describe(MediaService.name, () => {
     it('should not scale resolution if no target resolution', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream2160p);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { transcode: TranscodePolicy.ALL, targetResolution: 'original' },
+        ffmpeg: { transcode: TranscodePolicy.All, targetResolution: 'original' },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -1427,7 +1427,7 @@ describe(MediaService.name, () => {
 
     it('should scale horizontally when video is horizontal', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream2160p);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.OPTIMAL } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Optimal } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1442,7 +1442,7 @@ describe(MediaService.name, () => {
 
     it('should scale vertically when video is vertical', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamVertical2160p);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.OPTIMAL } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Optimal } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1458,7 +1458,7 @@ describe(MediaService.name, () => {
     it('should always scale video if height is uneven', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamOddHeight);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { transcode: TranscodePolicy.ALL, targetResolution: 'original' },
+        ffmpeg: { transcode: TranscodePolicy.All, targetResolution: 'original' },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -1475,7 +1475,7 @@ describe(MediaService.name, () => {
     it('should always scale video if width is uneven', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamOddWidth);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { transcode: TranscodePolicy.ALL, targetResolution: 'original' },
+        ffmpeg: { transcode: TranscodePolicy.All, targetResolution: 'original' },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -1492,7 +1492,7 @@ describe(MediaService.name, () => {
     it('should copy video stream when video matches target', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { targetVideoCodec: VideoCodec.HEVC, acceptedAudioCodecs: [AudioCodec.AAC] },
+        ffmpeg: { targetVideoCodec: VideoCodec.Hevc, acceptedAudioCodecs: [AudioCodec.Aac] },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -1510,9 +1510,9 @@ describe(MediaService.name, () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamH264);
       mocks.systemMetadata.get.mockResolvedValue({
         ffmpeg: {
-          targetVideoCodec: VideoCodec.HEVC,
-          acceptedVideoCodecs: [VideoCodec.H264, VideoCodec.HEVC],
-          acceptedAudioCodecs: [AudioCodec.AAC],
+          targetVideoCodec: VideoCodec.Hevc,
+          acceptedVideoCodecs: [VideoCodec.H264, VideoCodec.Hevc],
+          acceptedAudioCodecs: [AudioCodec.Aac],
         },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -1531,9 +1531,9 @@ describe(MediaService.name, () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
         ffmpeg: {
-          targetVideoCodec: VideoCodec.HEVC,
-          acceptedVideoCodecs: [VideoCodec.H264, VideoCodec.HEVC],
-          acceptedAudioCodecs: [AudioCodec.AAC],
+          targetVideoCodec: VideoCodec.Hevc,
+          acceptedVideoCodecs: [VideoCodec.H264, VideoCodec.Hevc],
+          acceptedAudioCodecs: [AudioCodec.Aac],
         },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -1550,7 +1550,7 @@ describe(MediaService.name, () => {
 
     it('should copy audio stream when audio matches target', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.audioStreamAac);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.OPTIMAL } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Optimal } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1587,14 +1587,14 @@ describe(MediaService.name, () => {
 
     it('should not transcode if transcoding is disabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream2160p);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.DISABLED } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Disabled } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).not.toHaveBeenCalled();
     });
 
     it('should not remux when input is not an accepted container and transcoding is disabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.DISABLED } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Disabled } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).not.toHaveBeenCalled();
     });
@@ -1609,14 +1609,14 @@ describe(MediaService.name, () => {
     it('should delete existing transcode if current policy does not require transcoding', async () => {
       const asset = assetStub.hasEncodedVideo;
       mocks.media.probe.mockResolvedValue(probeStub.videoStream2160p);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.DISABLED } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Disabled } });
       mocks.assetJob.getForVideoConversion.mockResolvedValue(asset);
 
       await sut.handleVideoConversion({ id: asset.id });
 
       expect(mocks.media.transcode).not.toHaveBeenCalled();
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.DELETE_FILES,
+        name: JobName.DeleteFiles,
         data: { files: [asset.encodedVideoPath] },
       });
     });
@@ -1687,7 +1687,7 @@ describe(MediaService.name, () => {
         ffmpeg: {
           maxBitrate: '4500k',
           twoPass: true,
-          targetVideoCodec: VideoCodec.VP9,
+          targetVideoCodec: VideoCodec.Vp9,
         },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -1708,7 +1708,7 @@ describe(MediaService.name, () => {
         ffmpeg: {
           maxBitrate: '0',
           twoPass: true,
-          targetVideoCodec: VideoCodec.VP9,
+          targetVideoCodec: VideoCodec.Vp9,
         },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -1725,7 +1725,7 @@ describe(MediaService.name, () => {
 
     it('should configure preset for vp9', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.VP9, preset: 'slow' } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.Vp9, preset: 'slow' } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1740,7 +1740,7 @@ describe(MediaService.name, () => {
 
     it('should not configure preset for vp9 if invalid', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { preset: 'invalid', targetVideoCodec: VideoCodec.VP9 } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { preset: 'invalid', targetVideoCodec: VideoCodec.Vp9 } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1755,7 +1755,7 @@ describe(MediaService.name, () => {
 
     it('should configure threads if above 0', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.VP9, threads: 2 } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.Vp9, threads: 2 } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1800,7 +1800,7 @@ describe(MediaService.name, () => {
 
     it('should disable thread pooling for hevc if thread limit is 1', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamVp9);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { threads: 1, targetVideoCodec: VideoCodec.HEVC } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { threads: 1, targetVideoCodec: VideoCodec.Hevc } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1815,7 +1815,7 @@ describe(MediaService.name, () => {
 
     it('should omit thread flags for hevc if thread limit is at or below 0', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamVp9);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { threads: 0, targetVideoCodec: VideoCodec.HEVC } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { threads: 0, targetVideoCodec: VideoCodec.Hevc } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1830,7 +1830,7 @@ describe(MediaService.name, () => {
 
     it('should use av1 if specified', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamVp9);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.AV1 } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.Av1 } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1855,7 +1855,7 @@ describe(MediaService.name, () => {
 
     it('should map `veryslow` preset to 4 for av1', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamVp9);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.AV1, preset: 'veryslow' } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.Av1, preset: 'veryslow' } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1870,7 +1870,7 @@ describe(MediaService.name, () => {
 
     it('should set max bitrate for av1 if specified', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamVp9);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.AV1, maxBitrate: '2M' } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.Av1, maxBitrate: '2M' } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1885,7 +1885,7 @@ describe(MediaService.name, () => {
 
     it('should set threads for av1 if specified', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamVp9);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.AV1, threads: 4 } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { targetVideoCodec: VideoCodec.Av1, threads: 4 } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1901,7 +1901,7 @@ describe(MediaService.name, () => {
     it('should set both bitrate and threads for av1 if specified', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamVp9);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { targetVideoCodec: VideoCodec.AV1, threads: 4, maxBitrate: '2M' },
+        ffmpeg: { targetVideoCodec: VideoCodec.Av1, threads: 4, maxBitrate: '2M' },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -1919,8 +1919,8 @@ describe(MediaService.name, () => {
       mocks.media.probe.mockResolvedValue(probeStub.noAudioStreams);
       mocks.systemMetadata.get.mockResolvedValue({
         ffmpeg: {
-          targetVideoCodec: VideoCodec.HEVC,
-          transcode: TranscodePolicy.OPTIMAL,
+          targetVideoCodec: VideoCodec.Hevc,
+          transcode: TranscodePolicy.Optimal,
           targetResolution: '1080p',
         },
       });
@@ -1931,7 +1931,7 @@ describe(MediaService.name, () => {
     it('should fail if hwaccel is enabled for an unsupported codec', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.NVENC, targetVideoCodec: VideoCodec.VP9 },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Nvenc, targetVideoCodec: VideoCodec.Vp9 },
       });
       await expect(sut.handleVideoConversion({ id: assetStub.video.id })).rejects.toThrowError();
       expect(mocks.media.transcode).not.toHaveBeenCalled();
@@ -1946,7 +1946,7 @@ describe(MediaService.name, () => {
 
     it('should set options for nvenc', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.NVENC } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Nvenc } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -1979,7 +1979,7 @@ describe(MediaService.name, () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
         ffmpeg: {
-          accel: TranscodeHWAccel.NVENC,
+          accel: TranscodeHardwareAcceleration.Nvenc,
           maxBitrate: '10000k',
           twoPass: true,
         },
@@ -1998,7 +1998,9 @@ describe(MediaService.name, () => {
 
     it('should set vbr options for nvenc when max bitrate is enabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.NVENC, maxBitrate: '10000k' } });
+      mocks.systemMetadata.get.mockResolvedValue({
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Nvenc, maxBitrate: '10000k' },
+      });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2013,7 +2015,9 @@ describe(MediaService.name, () => {
 
     it('should set cq options for nvenc when max bitrate is disabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.NVENC, maxBitrate: '10000k' } });
+      mocks.systemMetadata.get.mockResolvedValue({
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Nvenc, maxBitrate: '10000k' },
+      });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2028,7 +2032,9 @@ describe(MediaService.name, () => {
 
     it('should omit preset for nvenc if invalid', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.NVENC, preset: 'invalid' } });
+      mocks.systemMetadata.get.mockResolvedValue({
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Nvenc, preset: 'invalid' },
+      });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2043,7 +2049,7 @@ describe(MediaService.name, () => {
 
     it('should ignore two pass for nvenc if max bitrate is disabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.NVENC } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Nvenc } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2059,7 +2065,7 @@ describe(MediaService.name, () => {
     it('should use hardware decoding for nvenc if enabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.NVENC, accelDecode: true },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Nvenc, accelDecode: true },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -2081,7 +2087,7 @@ describe(MediaService.name, () => {
     it('should use hardware tone-mapping for nvenc if hardware decoding is enabled and should tone map', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamHDR);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.NVENC, accelDecode: true },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Nvenc, accelDecode: true },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -2102,7 +2108,7 @@ describe(MediaService.name, () => {
     it('should set format to nv12 for nvenc if input is not yuv420p', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream10Bit);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.NVENC, accelDecode: true },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Nvenc, accelDecode: true },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -2118,7 +2124,9 @@ describe(MediaService.name, () => {
 
     it('should set options for qsv', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.QSV, maxBitrate: '10000k' } });
+      mocks.systemMetadata.get.mockResolvedValue({
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv, maxBitrate: '10000k' },
+      });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2154,7 +2162,7 @@ describe(MediaService.name, () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
         ffmpeg: {
-          accel: TranscodeHWAccel.QSV,
+          accel: TranscodeHardwareAcceleration.Qsv,
           maxBitrate: '10000k',
           preferredHwDevice: '/dev/dri/renderD128',
         },
@@ -2176,7 +2184,9 @@ describe(MediaService.name, () => {
 
     it('should omit preset for qsv if invalid', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.QSV, preset: 'invalid' } });
+      mocks.systemMetadata.get.mockResolvedValue({
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv, preset: 'invalid' },
+      });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2195,7 +2205,7 @@ describe(MediaService.name, () => {
     it('should set low power mode for qsv if target video codec is vp9', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.QSV, targetVideoCodec: VideoCodec.VP9 },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv, targetVideoCodec: VideoCodec.Vp9 },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -2215,7 +2225,7 @@ describe(MediaService.name, () => {
     it('should fail for qsv if no hw devices', async () => {
       sut.videoInterfaces = { dri: [], mali: false };
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.QSV } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv } });
 
       await expect(sut.handleVideoConversion({ id: assetStub.video.id })).rejects.toThrowError();
 
@@ -2225,7 +2235,7 @@ describe(MediaService.name, () => {
     it('should prefer higher index renderD* device for qsv', async () => {
       sut.videoInterfaces = { dri: ['card1', 'renderD129', 'card0', 'renderD128'], mali: false };
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.QSV } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2244,7 +2254,7 @@ describe(MediaService.name, () => {
     it('should use hardware decoding for qsv if enabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.QSV, accelDecode: true },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv, accelDecode: true },
       });
 
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -2270,7 +2280,7 @@ describe(MediaService.name, () => {
     it('should use hardware tone-mapping for qsv if hardware decoding is enabled and should tone map', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamHDR);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.QSV, accelDecode: true },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv, accelDecode: true },
       });
 
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -2299,7 +2309,7 @@ describe(MediaService.name, () => {
       sut.videoInterfaces = { dri: ['renderD128', 'renderD129', 'renderD130'], mali: false };
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.QSV, accelDecode: true, preferredHwDevice: 'renderD129' },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv, accelDecode: true, preferredHwDevice: 'renderD129' },
       });
 
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -2317,7 +2327,7 @@ describe(MediaService.name, () => {
     it('should set format to nv12 for qsv if input is not yuv420p', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream10Bit);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.QSV, accelDecode: true },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv, accelDecode: true },
       });
 
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -2340,7 +2350,7 @@ describe(MediaService.name, () => {
 
     it('should set options for vaapi', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.VAAPI } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2370,7 +2380,9 @@ describe(MediaService.name, () => {
 
     it('should set vbr options for vaapi when max bitrate is enabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.VAAPI, maxBitrate: '10000k' } });
+      mocks.systemMetadata.get.mockResolvedValue({
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi, maxBitrate: '10000k' },
+      });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2394,7 +2406,7 @@ describe(MediaService.name, () => {
 
     it('should set cq options for vaapi when max bitrate is disabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.VAAPI } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2418,7 +2430,9 @@ describe(MediaService.name, () => {
 
     it('should omit preset for vaapi if invalid', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.VAAPI, preset: 'invalid' } });
+      mocks.systemMetadata.get.mockResolvedValue({
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi, preset: 'invalid' },
+      });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2437,7 +2451,7 @@ describe(MediaService.name, () => {
     it('should prefer higher index renderD* device for vaapi', async () => {
       sut.videoInterfaces = { dri: ['card1', 'renderD129', 'card0', 'renderD128'], mali: false };
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.VAAPI } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2457,7 +2471,7 @@ describe(MediaService.name, () => {
       sut.videoInterfaces = { dri: ['renderD129', 'card1', 'card0', 'renderD128'], mali: false };
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.VAAPI, preferredHwDevice: '/dev/dri/renderD128' },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi, preferredHwDevice: '/dev/dri/renderD128' },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -2477,7 +2491,7 @@ describe(MediaService.name, () => {
     it('should use hardware decoding for vaapi if enabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.VAAPI, accelDecode: true },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi, accelDecode: true },
       });
 
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -2502,7 +2516,7 @@ describe(MediaService.name, () => {
     it('should use hardware tone-mapping for vaapi if hardware decoding is enabled and should tone map', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamHDR);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.VAAPI, accelDecode: true },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi, accelDecode: true },
       });
 
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -2525,7 +2539,7 @@ describe(MediaService.name, () => {
     it('should set format to nv12 for vaapi if input is not yuv420p', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream10Bit);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.VAAPI, accelDecode: true },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi, accelDecode: true },
       });
 
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -2545,7 +2559,7 @@ describe(MediaService.name, () => {
       sut.videoInterfaces = { dri: ['renderD128', 'renderD129', 'renderD130'], mali: false };
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.VAAPI, accelDecode: true, preferredHwDevice: 'renderD129' },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi, accelDecode: true, preferredHwDevice: 'renderD129' },
       });
 
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -2562,7 +2576,9 @@ describe(MediaService.name, () => {
 
     it('should fallback to hw encoding and sw decoding if hw transcoding fails and hw decoding is enabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.VAAPI, accelDecode: true } });
+      mocks.systemMetadata.get.mockResolvedValue({
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi, accelDecode: true },
+      });
       mocks.media.transcode.mockRejectedValueOnce(new Error('error'));
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledTimes(2);
@@ -2582,7 +2598,9 @@ describe(MediaService.name, () => {
 
     it('should fallback to sw decoding if fallback to sw decoding + hw encoding fails', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.VAAPI, accelDecode: true } });
+      mocks.systemMetadata.get.mockResolvedValue({
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi, accelDecode: true },
+      });
       mocks.media.transcode.mockRejectedValueOnce(new Error('error'));
       mocks.media.transcode.mockRejectedValueOnce(new Error('error'));
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -2600,7 +2618,7 @@ describe(MediaService.name, () => {
 
     it('should fallback to sw transcoding if hw transcoding fails and hw decoding is disabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.VAAPI } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi } });
       mocks.media.transcode.mockRejectedValueOnce(new Error('error'));
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledTimes(2);
@@ -2618,14 +2636,16 @@ describe(MediaService.name, () => {
     it('should fail for vaapi if no hw devices', async () => {
       sut.videoInterfaces = { dri: [], mali: true };
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.VAAPI } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Vaapi } });
       await expect(sut.handleVideoConversion({ id: assetStub.video.id })).rejects.toThrowError();
       expect(mocks.media.transcode).not.toHaveBeenCalled();
     });
 
     it('should set options for rkmpp', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHWAccel.RKMPP, accelDecode: true } });
+      mocks.systemMetadata.get.mockResolvedValue({
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Rkmpp, accelDecode: true },
+      });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2660,10 +2680,10 @@ describe(MediaService.name, () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamVp9);
       mocks.systemMetadata.get.mockResolvedValue({
         ffmpeg: {
-          accel: TranscodeHWAccel.RKMPP,
+          accel: TranscodeHardwareAcceleration.Rkmpp,
           accelDecode: true,
           maxBitrate: '10000k',
-          targetVideoCodec: VideoCodec.HEVC,
+          targetVideoCodec: VideoCodec.Hevc,
         },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
@@ -2681,7 +2701,7 @@ describe(MediaService.name, () => {
     it('should set cqp options for rkmpp when max bitrate is disabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.RKMPP, accelDecode: true, crf: 30, maxBitrate: '0' },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Rkmpp, accelDecode: true, crf: 30, maxBitrate: '0' },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -2698,7 +2718,7 @@ describe(MediaService.name, () => {
     it('should set OpenCL tonemapping options for rkmpp when OpenCL is available', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamHDR);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.RKMPP, accelDecode: true, crf: 30, maxBitrate: '0' },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Rkmpp, accelDecode: true, crf: 30, maxBitrate: '0' },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -2720,7 +2740,7 @@ describe(MediaService.name, () => {
       sut.videoInterfaces = { dri: ['renderD128'], mali: false };
       mocks.media.probe.mockResolvedValue(probeStub.noAudioStreams);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.RKMPP, accelDecode: true, crf: 30, maxBitrate: '0' },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Rkmpp, accelDecode: true, crf: 30, maxBitrate: '0' },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -2739,7 +2759,7 @@ describe(MediaService.name, () => {
     it('should use software decoding and tone-mapping if hardware decoding is disabled', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamHDR);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.RKMPP, accelDecode: false, crf: 30, maxBitrate: '0' },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Rkmpp, accelDecode: false, crf: 30, maxBitrate: '0' },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -2761,7 +2781,7 @@ describe(MediaService.name, () => {
       sut.videoInterfaces = { dri: ['renderD128'], mali: false };
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamHDR);
       mocks.systemMetadata.get.mockResolvedValue({
-        ffmpeg: { accel: TranscodeHWAccel.RKMPP, accelDecode: true, crf: 30, maxBitrate: '0' },
+        ffmpeg: { accel: TranscodeHardwareAcceleration.Rkmpp, accelDecode: true, crf: 30, maxBitrate: '0' },
       });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
@@ -2781,7 +2801,7 @@ describe(MediaService.name, () => {
 
     it('should tonemap when policy is required and video is hdr', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamHDR);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.REQUIRED } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Required } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2800,7 +2820,7 @@ describe(MediaService.name, () => {
 
     it('should tonemap when policy is optimal and video is hdr', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamHDR);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.OPTIMAL } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Optimal } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2819,7 +2839,7 @@ describe(MediaService.name, () => {
 
     it('should transcode when policy is required and video is not yuv420p', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream10Bit);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.REQUIRED } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Required } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
@@ -2834,7 +2854,7 @@ describe(MediaService.name, () => {
 
     it('should convert to yuv420p when scaling without tone-mapping', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream4K10Bit);
-      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.REQUIRED } });
+      mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { transcode: TranscodePolicy.Required } });
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
diff --git a/server/src/services/media.service.ts b/server/src/services/media.service.ts
index 452e4df5eb..b48df3797a 100644
--- a/server/src/services/media.service.ts
+++ b/server/src/services/media.service.ts
@@ -18,7 +18,7 @@ import {
   QueueName,
   RawExtractedFormat,
   StorageFolder,
-  TranscodeHWAccel,
+  TranscodeHardwareAcceleration,
   TranscodePolicy,
   TranscodeTarget,
   VideoCodec,
@@ -57,8 +57,8 @@ export class MediaService extends BaseService {
     this.videoInterfaces = { dri, mali };
   }
 
-  @OnJob({ name: JobName.QUEUE_GENERATE_THUMBNAILS, queue: QueueName.THUMBNAIL_GENERATION })
-  async handleQueueGenerateThumbnails({ force }: JobOf<JobName.QUEUE_GENERATE_THUMBNAILS>): Promise<JobStatus> {
+  @OnJob({ name: JobName.QueueGenerateThumbnails, queue: QueueName.ThumbnailGeneration })
+  async handleQueueGenerateThumbnails({ force }: JobOf<JobName.QueueGenerateThumbnails>): Promise<JobStatus> {
     let jobs: JobItem[] = [];
 
     const queueAll = async () => {
@@ -70,7 +70,7 @@ export class MediaService extends BaseService {
       const { previewFile, thumbnailFile } = getAssetFiles(asset.files);
 
       if (!previewFile || !thumbnailFile || !asset.thumbhash || force) {
-        jobs.push({ name: JobName.GENERATE_THUMBNAILS, data: { id: asset.id } });
+        jobs.push({ name: JobName.GenerateThumbnails, data: { id: asset.id } });
       }
 
       if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
@@ -92,7 +92,7 @@ export class MediaService extends BaseService {
         await this.personRepository.update({ id: person.id, faceAssetId: face.id });
       }
 
-      jobs.push({ name: JobName.GENERATE_PERSON_THUMBNAIL, data: { id: person.id } });
+      jobs.push({ name: JobName.GeneratePersonThumbnail, data: { id: person.id } });
       if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await queueAll();
       }
@@ -100,21 +100,21 @@ export class MediaService extends BaseService {
 
     await queueAll();
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.QUEUE_MIGRATION, queue: QueueName.MIGRATION })
+  @OnJob({ name: JobName.QueueMigration, queue: QueueName.Migration })
   async handleQueueMigration(): Promise<JobStatus> {
-    const { active, waiting } = await this.jobRepository.getJobCounts(QueueName.MIGRATION);
+    const { active, waiting } = await this.jobRepository.getJobCounts(QueueName.Migration);
     if (active === 1 && waiting === 0) {
-      await this.storageCore.removeEmptyDirs(StorageFolder.THUMBNAILS);
-      await this.storageCore.removeEmptyDirs(StorageFolder.ENCODED_VIDEO);
+      await this.storageCore.removeEmptyDirs(StorageFolder.Thumbnails);
+      await this.storageCore.removeEmptyDirs(StorageFolder.EncodedVideo);
     }
 
     let jobs: JobItem[] = [];
     const assets = this.assetJobRepository.streamForMigrationJob();
     for await (const asset of assets) {
-      jobs.push({ name: JobName.MIGRATE_ASSET, data: { id: asset.id } });
+      jobs.push({ name: JobName.MigrateAsset, data: { id: asset.id } });
       if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(jobs);
         jobs = [];
@@ -125,7 +125,7 @@ export class MediaService extends BaseService {
     jobs = [];
 
     for await (const person of this.personRepository.getAll()) {
-      jobs.push({ name: JobName.MIGRATE_PERSON, data: { id: person.id } });
+      jobs.push({ name: JobName.MigratePerson, data: { id: person.id } });
 
       if (jobs.length === JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(jobs);
@@ -135,36 +135,36 @@ export class MediaService extends BaseService {
 
     await this.jobRepository.queueAll(jobs);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.MIGRATE_ASSET, queue: QueueName.MIGRATION })
-  async handleAssetMigration({ id }: JobOf<JobName.MIGRATE_ASSET>): Promise<JobStatus> {
+  @OnJob({ name: JobName.MigrateAsset, queue: QueueName.Migration })
+  async handleAssetMigration({ id }: JobOf<JobName.MigrateAsset>): Promise<JobStatus> {
     const { image } = await this.getConfig({ withCache: true });
     const asset = await this.assetJobRepository.getForMigrationJob(id);
     if (!asset) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
-    await this.storageCore.moveAssetImage(asset, AssetPathType.FULLSIZE, image.fullsize.format);
-    await this.storageCore.moveAssetImage(asset, AssetPathType.PREVIEW, image.preview.format);
-    await this.storageCore.moveAssetImage(asset, AssetPathType.THUMBNAIL, image.thumbnail.format);
+    await this.storageCore.moveAssetImage(asset, AssetPathType.FullSize, image.fullsize.format);
+    await this.storageCore.moveAssetImage(asset, AssetPathType.Preview, image.preview.format);
+    await this.storageCore.moveAssetImage(asset, AssetPathType.Thumbnail, image.thumbnail.format);
     await this.storageCore.moveAssetVideo(asset);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.GENERATE_THUMBNAILS, queue: QueueName.THUMBNAIL_GENERATION })
-  async handleGenerateThumbnails({ id }: JobOf<JobName.GENERATE_THUMBNAILS>): Promise<JobStatus> {
+  @OnJob({ name: JobName.GenerateThumbnails, queue: QueueName.ThumbnailGeneration })
+  async handleGenerateThumbnails({ id }: JobOf<JobName.GenerateThumbnails>): Promise<JobStatus> {
     const asset = await this.assetJobRepository.getForGenerateThumbnailJob(id);
     if (!asset) {
       this.logger.warn(`Thumbnail generation failed for asset ${id}: not found`);
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
-    if (asset.visibility === AssetVisibility.HIDDEN) {
+    if (asset.visibility === AssetVisibility.Hidden) {
       this.logger.verbose(`Thumbnail generation skipped for asset ${id}: not visible`);
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     let generated: {
@@ -173,27 +173,27 @@ export class MediaService extends BaseService {
       fullsizePath?: string;
       thumbhash: Buffer;
     };
-    if (asset.type === AssetType.VIDEO || asset.originalFileName.toLowerCase().endsWith('.gif')) {
+    if (asset.type === AssetType.Video || asset.originalFileName.toLowerCase().endsWith('.gif')) {
       generated = await this.generateVideoThumbnails(asset);
-    } else if (asset.type === AssetType.IMAGE) {
+    } else if (asset.type === AssetType.Image) {
       generated = await this.generateImageThumbnails(asset);
     } else {
       this.logger.warn(`Skipping thumbnail generation for asset ${id}: ${asset.type} is not an image or video`);
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const { previewFile, thumbnailFile, fullsizeFile } = getAssetFiles(asset.files);
     const toUpsert: UpsertFileOptions[] = [];
     if (previewFile?.path !== generated.previewPath) {
-      toUpsert.push({ assetId: asset.id, path: generated.previewPath, type: AssetFileType.PREVIEW });
+      toUpsert.push({ assetId: asset.id, path: generated.previewPath, type: AssetFileType.Preview });
     }
 
     if (thumbnailFile?.path !== generated.thumbnailPath) {
-      toUpsert.push({ assetId: asset.id, path: generated.thumbnailPath, type: AssetFileType.THUMBNAIL });
+      toUpsert.push({ assetId: asset.id, path: generated.thumbnailPath, type: AssetFileType.Thumbnail });
     }
 
     if (generated.fullsizePath && fullsizeFile?.path !== generated.fullsizePath) {
-      toUpsert.push({ assetId: asset.id, path: generated.fullsizePath, type: AssetFileType.FULLSIZE });
+      toUpsert.push({ assetId: asset.id, path: generated.fullsizePath, type: AssetFileType.FullSize });
     }
 
     if (toUpsert.length > 0) {
@@ -230,7 +230,7 @@ export class MediaService extends BaseService {
 
     await this.assetRepository.upsertJobStatus({ assetId: asset.id, previewAt: new Date(), thumbnailAt: new Date() });
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private async extractImage(originalPath: string, minSize: number) {
@@ -244,7 +244,7 @@ export class MediaService extends BaseService {
 
   private async decodeImage(thumbSource: string | Buffer, exifInfo: Exif, targetSize?: number) {
     const { image } = await this.getConfig({ withCache: true });
-    const colorspace = this.isSRGB(exifInfo) ? Colorspace.SRGB : image.colorspace;
+    const colorspace = this.isSRGB(exifInfo) ? Colorspace.Srgb : image.colorspace;
     const decodeOptions: DecodeToBufferOptions = {
       colorspace,
       processInvalidImages: process.env.IMMICH_PROCESS_INVALID_IMAGES === 'true',
@@ -264,8 +264,8 @@ export class MediaService extends BaseService {
     exifInfo: Exif;
   }) {
     const { image } = await this.getConfig({ withCache: true });
-    const previewPath = StorageCore.getImagePath(asset, AssetPathType.PREVIEW, image.preview.format);
-    const thumbnailPath = StorageCore.getImagePath(asset, AssetPathType.THUMBNAIL, image.thumbnail.format);
+    const previewPath = StorageCore.getImagePath(asset, AssetPathType.Preview, image.preview.format);
+    const thumbnailPath = StorageCore.getImagePath(asset, AssetPathType.Thumbnail, image.thumbnail.format);
     this.storageCore.ensureFolders(previewPath);
 
     // Handle embedded preview extraction for RAW files
@@ -294,11 +294,11 @@ export class MediaService extends BaseService {
 
     if (convertFullsize) {
       // convert a new fullsize image from the same source as the thumbnail
-      fullsizePath = StorageCore.getImagePath(asset, AssetPathType.FULLSIZE, image.fullsize.format);
+      fullsizePath = StorageCore.getImagePath(asset, AssetPathType.FullSize, image.fullsize.format);
       const fullsizeOptions = { format: image.fullsize.format, quality: image.fullsize.quality, ...thumbnailOptions };
       promises.push(this.mediaRepository.generateThumbnail(data, fullsizeOptions, fullsizePath));
-    } else if (generateFullsize && extracted && extracted.format === RawExtractedFormat.JPEG) {
-      fullsizePath = StorageCore.getImagePath(asset, AssetPathType.FULLSIZE, extracted.format);
+    } else if (generateFullsize && extracted && extracted.format === RawExtractedFormat.Jpeg) {
+      fullsizePath = StorageCore.getImagePath(asset, AssetPathType.FullSize, extracted.format);
       this.storageCore.ensureFolders(fullsizePath);
 
       // Write the buffer to disk with essential EXIF data
@@ -317,25 +317,25 @@ export class MediaService extends BaseService {
     return { previewPath, thumbnailPath, fullsizePath, thumbhash: outputs[0] as Buffer };
   }
 
-  @OnJob({ name: JobName.GENERATE_PERSON_THUMBNAIL, queue: QueueName.THUMBNAIL_GENERATION })
-  async handleGeneratePersonThumbnail({ id }: JobOf<JobName.GENERATE_PERSON_THUMBNAIL>): Promise<JobStatus> {
+  @OnJob({ name: JobName.GeneratePersonThumbnail, queue: QueueName.ThumbnailGeneration })
+  async handleGeneratePersonThumbnail({ id }: JobOf<JobName.GeneratePersonThumbnail>): Promise<JobStatus> {
     const { machineLearning, metadata, image } = await this.getConfig({ withCache: true });
     if (!isFacialRecognitionEnabled(machineLearning) && !isFaceImportEnabled(metadata)) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const data = await this.personRepository.getDataForThumbnailGenerationJob(id);
     if (!data) {
       this.logger.error(`Could not generate person thumbnail for ${id}: missing data`);
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     const { ownerId, x1, y1, x2, y2, oldWidth, oldHeight, exifOrientation, previewPath, originalPath } = data;
     let inputImage: string | Buffer;
-    if (data.type === AssetType.VIDEO) {
+    if (data.type === AssetType.Video) {
       if (!previewPath) {
         this.logger.error(`Could not generate person thumbnail for video ${id}: missing preview path`);
-        return JobStatus.FAILED;
+        return JobStatus.Failed;
       }
       inputImage = previewPath;
     } else if (image.extractEmbedded && mimeTypes.isRaw(originalPath)) {
@@ -357,7 +357,7 @@ export class MediaService extends BaseService {
 
     const thumbnailOptions = {
       colorspace: image.colorspace,
-      format: ImageFormat.JPEG,
+      format: ImageFormat.Jpeg,
       raw: info,
       quality: image.thumbnail.quality,
       crop: this.getCrop(
@@ -371,7 +371,7 @@ export class MediaService extends BaseService {
     await this.mediaRepository.generateThumbnail(decodedImage, thumbnailOptions, thumbnailPath);
     await this.personRepository.update({ id, thumbnailPath });
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private getCrop(dims: { old: ImageDimensions; new: ImageDimensions }, { x1, y1, x2, y2 }: BoundingBox): CropOptions {
@@ -411,8 +411,8 @@ export class MediaService extends BaseService {
 
   private async generateVideoThumbnails(asset: ThumbnailPathEntity & { originalPath: string }) {
     const { image, ffmpeg } = await this.getConfig({ withCache: true });
-    const previewPath = StorageCore.getImagePath(asset, AssetPathType.PREVIEW, image.preview.format);
-    const thumbnailPath = StorageCore.getImagePath(asset, AssetPathType.THUMBNAIL, image.thumbnail.format);
+    const previewPath = StorageCore.getImagePath(asset, AssetPathType.Preview, image.preview.format);
+    const thumbnailPath = StorageCore.getImagePath(asset, AssetPathType.Thumbnail, image.thumbnail.format);
     this.storageCore.ensureFolders(previewPath);
 
     const { format, audioStreams, videoStreams } = await this.mediaRepository.probe(asset.originalPath);
@@ -424,9 +424,9 @@ export class MediaService extends BaseService {
 
     const previewConfig = ThumbnailConfig.create({ ...ffmpeg, targetResolution: image.preview.size.toString() });
     const thumbnailConfig = ThumbnailConfig.create({ ...ffmpeg, targetResolution: image.thumbnail.size.toString() });
-    const previewOptions = previewConfig.getCommand(TranscodeTarget.VIDEO, mainVideoStream, mainAudioStream, format);
+    const previewOptions = previewConfig.getCommand(TranscodeTarget.Video, mainVideoStream, mainAudioStream, format);
     const thumbnailOptions = thumbnailConfig.getCommand(
-      TranscodeTarget.VIDEO,
+      TranscodeTarget.Video,
       mainVideoStream,
       mainAudioStream,
       format,
@@ -443,13 +443,13 @@ export class MediaService extends BaseService {
     return { previewPath, thumbnailPath, thumbhash };
   }
 
-  @OnJob({ name: JobName.QUEUE_VIDEO_CONVERSION, queue: QueueName.VIDEO_CONVERSION })
-  async handleQueueVideoConversion(job: JobOf<JobName.QUEUE_VIDEO_CONVERSION>): Promise<JobStatus> {
+  @OnJob({ name: JobName.QueueVideoConversion, queue: QueueName.VideoConversion })
+  async handleQueueVideoConversion(job: JobOf<JobName.QueueVideoConversion>): Promise<JobStatus> {
     const { force } = job;
 
-    let queue: { name: JobName.VIDEO_CONVERSION; data: { id: string } }[] = [];
+    let queue: { name: JobName.VideoConversation; data: { id: string } }[] = [];
     for await (const asset of this.assetJobRepository.streamForVideoConversion(force)) {
-      queue.push({ name: JobName.VIDEO_CONVERSION, data: { id: asset.id } });
+      queue.push({ name: JobName.VideoConversation, data: { id: asset.id } });
 
       if (queue.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(queue);
@@ -459,14 +459,14 @@ export class MediaService extends BaseService {
 
     await this.jobRepository.queueAll(queue);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.VIDEO_CONVERSION, queue: QueueName.VIDEO_CONVERSION })
-  async handleVideoConversion({ id }: JobOf<JobName.VIDEO_CONVERSION>): Promise<JobStatus> {
+  @OnJob({ name: JobName.VideoConversation, queue: QueueName.VideoConversion })
+  async handleVideoConversion({ id }: JobOf<JobName.VideoConversation>): Promise<JobStatus> {
     const asset = await this.assetJobRepository.getForVideoConversion(id);
     if (!asset) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     const input = asset.originalPath;
@@ -474,35 +474,35 @@ export class MediaService extends BaseService {
     this.storageCore.ensureFolders(output);
 
     const { videoStreams, audioStreams, format } = await this.mediaRepository.probe(input, {
-      countFrames: this.logger.isLevelEnabled(LogLevel.DEBUG), // makes frame count more reliable for progress logs
+      countFrames: this.logger.isLevelEnabled(LogLevel.Debug), // makes frame count more reliable for progress logs
     });
     const videoStream = this.getMainStream(videoStreams);
     const audioStream = this.getMainStream(audioStreams);
     if (!videoStream || !format.formatName) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     if (!videoStream.height || !videoStream.width) {
       this.logger.warn(`Skipped transcoding for asset ${asset.id}: no video streams found`);
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     let { ffmpeg } = await this.getConfig({ withCache: true });
     const target = this.getTranscodeTarget(ffmpeg, videoStream, audioStream);
-    if (target === TranscodeTarget.NONE && !this.isRemuxRequired(ffmpeg, format)) {
+    if (target === TranscodeTarget.None && !this.isRemuxRequired(ffmpeg, format)) {
       if (asset.encodedVideoPath) {
         this.logger.log(`Transcoded video exists for asset ${asset.id}, but is no longer required. Deleting...`);
-        await this.jobRepository.queue({ name: JobName.DELETE_FILES, data: { files: [asset.encodedVideoPath] } });
+        await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files: [asset.encodedVideoPath] } });
         await this.assetRepository.update({ id: asset.id, encodedVideoPath: null });
       } else {
         this.logger.verbose(`Asset ${asset.id} does not require transcoding based on current policy, skipping`);
       }
 
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const command = BaseConfig.create(ffmpeg, this.videoInterfaces).getCommand(target, videoStream, audioStream);
-    if (ffmpeg.accel === TranscodeHWAccel.DISABLED) {
+    if (ffmpeg.accel === TranscodeHardwareAcceleration.Disabled) {
       this.logger.log(`Transcoding video ${asset.id} without hardware acceleration`);
     } else {
       this.logger.log(
@@ -514,8 +514,8 @@ export class MediaService extends BaseService {
       await this.mediaRepository.transcode(input, output, command);
     } catch (error: any) {
       this.logger.error(`Error occurred during transcoding: ${error.message}`);
-      if (ffmpeg.accel === TranscodeHWAccel.DISABLED) {
-        return JobStatus.FAILED;
+      if (ffmpeg.accel === TranscodeHardwareAcceleration.Disabled) {
+        return JobStatus.Failed;
       }
 
       let partialFallbackSuccess = false;
@@ -533,7 +533,7 @@ export class MediaService extends BaseService {
 
       if (!partialFallbackSuccess) {
         this.logger.error(`Retrying with ${ffmpeg.accel.toUpperCase()} acceleration disabled`);
-        ffmpeg = { ...ffmpeg, accel: TranscodeHWAccel.DISABLED };
+        ffmpeg = { ...ffmpeg, accel: TranscodeHardwareAcceleration.Disabled };
         const command = BaseConfig.create(ffmpeg, this.videoInterfaces).getCommand(target, videoStream, audioStream);
         await this.mediaRepository.transcode(input, output, command);
       }
@@ -543,7 +543,7 @@ export class MediaService extends BaseService {
 
     await this.assetRepository.update({ id: asset.id, encodedVideoPath: output });
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private getMainStream<T extends VideoStreamInfo | AudioStreamInfo>(streams: T[]): T {
@@ -561,18 +561,18 @@ export class MediaService extends BaseService {
     const isVideoTranscodeRequired = this.isVideoTranscodeRequired(config, videoStream);
 
     if (isAudioTranscodeRequired && isVideoTranscodeRequired) {
-      return TranscodeTarget.ALL;
+      return TranscodeTarget.All;
     }
 
     if (isAudioTranscodeRequired) {
-      return TranscodeTarget.AUDIO;
+      return TranscodeTarget.Audio;
     }
 
     if (isVideoTranscodeRequired) {
-      return TranscodeTarget.VIDEO;
+      return TranscodeTarget.Video;
     }
 
-    return TranscodeTarget.NONE;
+    return TranscodeTarget.None;
   }
 
   private isAudioTranscodeRequired(ffmpegConfig: SystemConfigFFmpegDto, stream?: AudioStreamInfo): boolean {
@@ -581,15 +581,15 @@ export class MediaService extends BaseService {
     }
 
     switch (ffmpegConfig.transcode) {
-      case TranscodePolicy.DISABLED: {
+      case TranscodePolicy.Disabled: {
         return false;
       }
-      case TranscodePolicy.ALL: {
+      case TranscodePolicy.All: {
         return true;
       }
-      case TranscodePolicy.REQUIRED:
-      case TranscodePolicy.OPTIMAL:
-      case TranscodePolicy.BITRATE: {
+      case TranscodePolicy.Required:
+      case TranscodePolicy.Optimal:
+      case TranscodePolicy.Bitrate: {
         return !ffmpegConfig.acceptedAudioCodecs.includes(stream.codecName as AudioCodec);
       }
       default: {
@@ -608,19 +608,19 @@ export class MediaService extends BaseService {
     const isRequired = !isTargetVideoCodec || !stream.pixelFormat.endsWith('420p');
 
     switch (ffmpegConfig.transcode) {
-      case TranscodePolicy.DISABLED: {
+      case TranscodePolicy.Disabled: {
         return false;
       }
-      case TranscodePolicy.ALL: {
+      case TranscodePolicy.All: {
         return true;
       }
-      case TranscodePolicy.REQUIRED: {
+      case TranscodePolicy.Required: {
         return isRequired;
       }
-      case TranscodePolicy.OPTIMAL: {
+      case TranscodePolicy.Optimal: {
         return isRequired || isLargerThanTargetRes;
       }
-      case TranscodePolicy.BITRATE: {
+      case TranscodePolicy.Bitrate: {
         return isRequired || isLargerThanTargetBitrate;
       }
       default: {
@@ -630,12 +630,12 @@ export class MediaService extends BaseService {
   }
 
   private isRemuxRequired(ffmpegConfig: SystemConfigFFmpegDto, { formatName, formatLongName }: VideoFormat): boolean {
-    if (ffmpegConfig.transcode === TranscodePolicy.DISABLED) {
+    if (ffmpegConfig.transcode === TranscodePolicy.Disabled) {
       return false;
     }
 
-    const name = formatLongName === 'QuickTime / MOV' ? VideoContainer.MOV : (formatName as VideoContainer);
-    return name !== VideoContainer.MP4 && !ffmpegConfig.acceptedContainers.includes(name);
+    const name = formatLongName === 'QuickTime / MOV' ? VideoContainer.Mov : (formatName as VideoContainer);
+    return name !== VideoContainer.Mp4 && !ffmpegConfig.acceptedContainers.includes(name);
   }
 
   isSRGB({ colorspace, profileDescription, bitsPerSample }: Exif): boolean {
diff --git a/server/src/services/memory.service.ts b/server/src/services/memory.service.ts
index b0ea697edb..ff88b9029c 100644
--- a/server/src/services/memory.service.ts
+++ b/server/src/services/memory.service.ts
@@ -12,7 +12,7 @@ const DAYS = 3;
 
 @Injectable()
 export class MemoryService extends BaseService {
-  @OnJob({ name: JobName.MEMORIES_CREATE, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.MemoriesCreate, queue: QueueName.BackgroundTask })
   async onMemoriesCreate() {
     const users = await this.userRepository.getList({ withDeleted: false });
     const usersIds = await Promise.all(
@@ -26,7 +26,7 @@ export class MemoryService extends BaseService {
     );
 
     await this.databaseRepository.withLock(DatabaseLock.MemoryCreation, async () => {
-      const state = await this.systemMetadataRepository.get(SystemMetadataKey.MEMORIES_STATE);
+      const state = await this.systemMetadataRepository.get(SystemMetadataKey.MemoriesState);
       const start = DateTime.utc().startOf('day').minus({ days: DAYS });
       const lastOnThisDayDate = state?.lastOnThisDayDate ? DateTime.fromISO(state.lastOnThisDayDate) : start;
 
@@ -43,7 +43,7 @@ export class MemoryService extends BaseService {
           this.logger.error(`Failed to create memories for ${target.toISO()}`, error);
         }
         // update system metadata even when there is an error to minimize the chance of duplicates
-        await this.systemMetadataRepository.set(SystemMetadataKey.MEMORIES_STATE, {
+        await this.systemMetadataRepository.set(SystemMetadataKey.MemoriesState, {
           ...state,
           lastOnThisDayDate: target.toISO(),
         });
@@ -60,7 +60,7 @@ export class MemoryService extends BaseService {
         this.memoryRepository.create(
           {
             ownerId,
-            type: MemoryType.ON_THIS_DAY,
+            type: MemoryType.OnThisDay,
             data: { year },
             memoryAt: target.set({ year }).toISO()!,
             showAt,
@@ -72,7 +72,7 @@ export class MemoryService extends BaseService {
     );
   }
 
-  @OnJob({ name: JobName.MEMORIES_CLEANUP, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.MemoriesCleanup, queue: QueueName.BackgroundTask })
   async onMemoriesCleanup() {
     await this.memoryRepository.cleanup();
   }
@@ -87,7 +87,7 @@ export class MemoryService extends BaseService {
   }
 
   async get(auth: AuthDto, id: string): Promise<MemoryResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.MEMORY_READ, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.MemoryRead, ids: [id] });
     const memory = await this.findOrFail(id);
     return mapMemory(memory, auth);
   }
@@ -98,7 +98,7 @@ export class MemoryService extends BaseService {
     const assetIds = dto.assetIds || [];
     const allowedAssetIds = await this.checkAccess({
       auth,
-      permission: Permission.ASSET_SHARE,
+      permission: Permission.AssetShare,
       ids: assetIds,
     });
     const memory = await this.memoryRepository.create(
@@ -117,7 +117,7 @@ export class MemoryService extends BaseService {
   }
 
   async update(auth: AuthDto, id: string, dto: MemoryUpdateDto): Promise<MemoryResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.MEMORY_UPDATE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.MemoryUpdate, ids: [id] });
 
     const memory = await this.memoryRepository.update(id, {
       isSaved: dto.isSaved,
@@ -129,12 +129,12 @@ export class MemoryService extends BaseService {
   }
 
   async remove(auth: AuthDto, id: string): Promise<void> {
-    await this.requireAccess({ auth, permission: Permission.MEMORY_DELETE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.MemoryDelete, ids: [id] });
     await this.memoryRepository.delete(id);
   }
 
   async addAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {
-    await this.requireAccess({ auth, permission: Permission.MEMORY_READ, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.MemoryRead, ids: [id] });
 
     const repos = { access: this.accessRepository, bulk: this.memoryRepository };
     const results = await addAssets(auth, repos, { parentId: id, assetIds: dto.ids });
@@ -148,13 +148,13 @@ export class MemoryService extends BaseService {
   }
 
   async removeAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {
-    await this.requireAccess({ auth, permission: Permission.MEMORY_UPDATE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.MemoryUpdate, ids: [id] });
 
     const repos = { access: this.accessRepository, bulk: this.memoryRepository };
     const results = await removeAssets(auth, repos, {
       parentId: id,
       assetIds: dto.ids,
-      canAlwaysRemove: Permission.MEMORY_DELETE,
+      canAlwaysRemove: Permission.MemoryDelete,
     });
 
     const hasSuccess = results.find(({ success }) => success);
diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.ts
index 881f25d5dd..23884256ea 100644
--- a/server/src/services/metadata.service.spec.ts
+++ b/server/src/services/metadata.service.spec.ts
@@ -50,7 +50,7 @@ describe(MetadataService.name, () => {
 
     mockReadTags();
 
-    mocks.config.getWorker.mockReturnValue(ImmichWorker.MICROSERVICES);
+    mocks.config.getWorker.mockReturnValue(ImmichWorker.Microservices);
 
     delete process.env.TZ;
   });
@@ -102,11 +102,11 @@ describe(MetadataService.name, () => {
     it('should queue metadata extraction for all assets without exif values', async () => {
       mocks.assetJob.streamForMetadataExtraction.mockReturnValue(makeStream([assetStub.image]));
 
-      await expect(sut.handleQueueMetadataExtraction({ force: false })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleQueueMetadataExtraction({ force: false })).resolves.toBe(JobStatus.Success);
       expect(mocks.assetJob.streamForMetadataExtraction).toHaveBeenCalledWith(false);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.METADATA_EXTRACTION,
+          name: JobName.MetadataExtraction,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -115,11 +115,11 @@ describe(MetadataService.name, () => {
     it('should queue metadata extraction for all assets', async () => {
       mocks.assetJob.streamForMetadataExtraction.mockReturnValue(makeStream([assetStub.image]));
 
-      await expect(sut.handleQueueMetadataExtraction({ force: true })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleQueueMetadataExtraction({ force: true })).resolves.toBe(JobStatus.Success);
       expect(mocks.assetJob.streamForMetadataExtraction).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.METADATA_EXTRACTION,
+          name: JobName.MetadataExtraction,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -506,7 +506,7 @@ describe(MetadataService.name, () => {
     it('should not apply motion photos if asset is video', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue({
         ...assetStub.livePhotoMotionAsset,
-        visibility: AssetVisibility.TIMELINE,
+        visibility: AssetVisibility.Timeline,
       });
       mocks.media.probe.mockResolvedValue(probeStub.matroskaContainer);
 
@@ -516,7 +516,7 @@ describe(MetadataService.name, () => {
       expect(mocks.job.queue).not.toHaveBeenCalled();
       expect(mocks.job.queueAll).not.toHaveBeenCalled();
       expect(mocks.asset.update).not.toHaveBeenCalledWith(
-        expect.objectContaining({ assetType: AssetType.VIDEO, visibility: AssetVisibility.HIDDEN }),
+        expect.objectContaining({ assetType: AssetType.Video, visibility: AssetVisibility.Hidden }),
       );
     });
 
@@ -583,13 +583,13 @@ describe(MetadataService.name, () => {
         fileCreatedAt: assetStub.livePhotoWithOriginalFileName.fileCreatedAt,
         fileModifiedAt: assetStub.livePhotoWithOriginalFileName.fileModifiedAt,
         id: fileStub.livePhotoMotion.uuid,
-        visibility: AssetVisibility.HIDDEN,
+        visibility: AssetVisibility.Hidden,
         libraryId: assetStub.livePhotoWithOriginalFileName.libraryId,
         localDateTime: assetStub.livePhotoWithOriginalFileName.fileCreatedAt,
         originalFileName: 'asset_1.mp4',
         originalPath: 'upload/encoded-video/user-id/li/ve/live-photo-motion-asset-MP.mp4',
         ownerId: assetStub.livePhotoWithOriginalFileName.ownerId,
-        type: AssetType.VIDEO,
+        type: AssetType.Video,
       });
       expect(mocks.user.updateUsage).toHaveBeenCalledWith(assetStub.livePhotoMotionAsset.ownerId, 512);
       expect(mocks.storage.createFile).toHaveBeenCalledWith(assetStub.livePhotoMotionAsset.originalPath, video);
@@ -599,7 +599,7 @@ describe(MetadataService.name, () => {
       });
       expect(mocks.asset.update).toHaveBeenCalledTimes(3);
       expect(mocks.job.queue).toHaveBeenCalledExactlyOnceWith({
-        name: JobName.VIDEO_CONVERSION,
+        name: JobName.VideoConversation,
         data: { id: assetStub.livePhotoMotionAsset.id },
       });
     });
@@ -641,13 +641,13 @@ describe(MetadataService.name, () => {
         fileCreatedAt: assetStub.livePhotoWithOriginalFileName.fileCreatedAt,
         fileModifiedAt: assetStub.livePhotoWithOriginalFileName.fileModifiedAt,
         id: fileStub.livePhotoMotion.uuid,
-        visibility: AssetVisibility.HIDDEN,
+        visibility: AssetVisibility.Hidden,
         libraryId: assetStub.livePhotoWithOriginalFileName.libraryId,
         localDateTime: assetStub.livePhotoWithOriginalFileName.fileCreatedAt,
         originalFileName: 'asset_1.mp4',
         originalPath: 'upload/encoded-video/user-id/li/ve/live-photo-motion-asset-MP.mp4',
         ownerId: assetStub.livePhotoWithOriginalFileName.ownerId,
-        type: AssetType.VIDEO,
+        type: AssetType.Video,
       });
       expect(mocks.user.updateUsage).toHaveBeenCalledWith(assetStub.livePhotoMotionAsset.ownerId, 512);
       expect(mocks.storage.createFile).toHaveBeenCalledWith(assetStub.livePhotoMotionAsset.originalPath, video);
@@ -657,7 +657,7 @@ describe(MetadataService.name, () => {
       });
       expect(mocks.asset.update).toHaveBeenCalledTimes(3);
       expect(mocks.job.queue).toHaveBeenCalledExactlyOnceWith({
-        name: JobName.VIDEO_CONVERSION,
+        name: JobName.VideoConversation,
         data: { id: assetStub.livePhotoMotionAsset.id },
       });
     });
@@ -699,13 +699,13 @@ describe(MetadataService.name, () => {
         fileCreatedAt: assetStub.livePhotoWithOriginalFileName.fileCreatedAt,
         fileModifiedAt: assetStub.livePhotoWithOriginalFileName.fileModifiedAt,
         id: fileStub.livePhotoMotion.uuid,
-        visibility: AssetVisibility.HIDDEN,
+        visibility: AssetVisibility.Hidden,
         libraryId: assetStub.livePhotoWithOriginalFileName.libraryId,
         localDateTime: assetStub.livePhotoWithOriginalFileName.fileCreatedAt,
         originalFileName: 'asset_1.mp4',
         originalPath: 'upload/encoded-video/user-id/li/ve/live-photo-motion-asset-MP.mp4',
         ownerId: assetStub.livePhotoWithOriginalFileName.ownerId,
-        type: AssetType.VIDEO,
+        type: AssetType.Video,
       });
       expect(mocks.user.updateUsage).toHaveBeenCalledWith(assetStub.livePhotoMotionAsset.ownerId, 512);
       expect(mocks.storage.createFile).toHaveBeenCalledWith(assetStub.livePhotoMotionAsset.originalPath, video);
@@ -715,7 +715,7 @@ describe(MetadataService.name, () => {
       });
       expect(mocks.asset.update).toHaveBeenCalledTimes(3);
       expect(mocks.job.queue).toHaveBeenCalledExactlyOnceWith({
-        name: JobName.VIDEO_CONVERSION,
+        name: JobName.VideoConversation,
         data: { id: assetStub.livePhotoMotionAsset.id },
       });
     });
@@ -737,7 +737,7 @@ describe(MetadataService.name, () => {
 
       await sut.handleMetadataExtraction({ id: assetStub.livePhotoWithOriginalFileName.id });
       expect(mocks.job.queue).toHaveBeenNthCalledWith(1, {
-        name: JobName.ASSET_DELETION,
+        name: JobName.AssetDeletion,
         data: { id: assetStub.livePhotoWithOriginalFileName.livePhotoVideoId, deleteOnDisk: true },
       });
     });
@@ -778,7 +778,7 @@ describe(MetadataService.name, () => {
       mocks.crypto.hashSha1.mockReturnValue(randomBytes(512));
       mocks.asset.getByChecksum.mockResolvedValue({
         ...assetStub.livePhotoMotionAsset,
-        visibility: AssetVisibility.TIMELINE,
+        visibility: AssetVisibility.Timeline,
       });
       const video = randomBytes(512);
       mocks.storage.readFile.mockResolvedValue(video);
@@ -786,7 +786,7 @@ describe(MetadataService.name, () => {
       await sut.handleMetadataExtraction({ id: assetStub.livePhotoStillAsset.id });
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.livePhotoMotionAsset.id,
-        visibility: AssetVisibility.HIDDEN,
+        visibility: AssetVisibility.Hidden,
       });
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.livePhotoStillAsset.id,
@@ -1106,7 +1106,7 @@ describe(MetadataService.name, () => {
             boundingBoxX2: 200,
             boundingBoxY1: 20,
             boundingBoxY2: 60,
-            sourceType: SourceType.EXIF,
+            sourceType: SourceType.Exif,
           },
         ],
         [],
@@ -1116,7 +1116,7 @@ describe(MetadataService.name, () => {
       ]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GENERATE_PERSON_THUMBNAIL,
+          name: JobName.GeneratePersonThumbnail,
           data: { id: personStub.withName.id },
         },
       ]);
@@ -1145,7 +1145,7 @@ describe(MetadataService.name, () => {
             boundingBoxX2: 200,
             boundingBoxY1: 20,
             boundingBoxY2: 60,
-            sourceType: SourceType.EXIF,
+            sourceType: SourceType.Exif,
           },
         ],
         [],
@@ -1234,7 +1234,7 @@ describe(MetadataService.name, () => {
                 boundingBoxX2: x2,
                 boundingBoxY1: y1,
                 boundingBoxY2: y2,
-                sourceType: SourceType.EXIF,
+                sourceType: SourceType.Exif,
               },
             ],
             [],
@@ -1244,7 +1244,7 @@ describe(MetadataService.name, () => {
           ]);
           expect(mocks.job.queueAll).toHaveBeenCalledWith([
             {
-              name: JobName.GENERATE_PERSON_THUMBNAIL,
+              name: JobName.GeneratePersonThumbnail,
               data: { id: personStub.withName.id },
             },
           ]);
@@ -1308,7 +1308,7 @@ describe(MetadataService.name, () => {
       expect(mocks.assetJob.getForMetadataExtraction).toHaveBeenCalledWith(assetStub.image.id);
       expect(mocks.asset.findLivePhotoMatch).not.toHaveBeenCalled();
       expect(mocks.asset.update).not.toHaveBeenCalledWith(
-        expect.objectContaining({ visibility: AssetVisibility.HIDDEN }),
+        expect.objectContaining({ visibility: AssetVisibility.Hidden }),
       );
       expect(mocks.album.removeAssetsFromAll).not.toHaveBeenCalled();
     });
@@ -1326,10 +1326,10 @@ describe(MetadataService.name, () => {
         ownerId: assetStub.livePhotoMotionAsset.ownerId,
         otherAssetId: assetStub.livePhotoMotionAsset.id,
         libraryId: null,
-        type: AssetType.IMAGE,
+        type: AssetType.Image,
       });
       expect(mocks.asset.update).not.toHaveBeenCalledWith(
-        expect.objectContaining({ visibility: AssetVisibility.HIDDEN }),
+        expect.objectContaining({ visibility: AssetVisibility.Hidden }),
       );
       expect(mocks.album.removeAssetsFromAll).not.toHaveBeenCalled();
     });
@@ -1346,7 +1346,7 @@ describe(MetadataService.name, () => {
         livePhotoCID: 'CID',
         ownerId: assetStub.livePhotoStillAsset.ownerId,
         otherAssetId: assetStub.livePhotoStillAsset.id,
-        type: AssetType.VIDEO,
+        type: AssetType.Video,
       });
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.livePhotoStillAsset.id,
@@ -1354,7 +1354,7 @@ describe(MetadataService.name, () => {
       });
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.livePhotoMotionAsset.id,
-        visibility: AssetVisibility.HIDDEN,
+        visibility: AssetVisibility.Hidden,
       });
       expect(mocks.album.removeAssetsFromAll).toHaveBeenCalledWith([assetStub.livePhotoMotionAsset.id]);
     });
@@ -1457,7 +1457,7 @@ describe(MetadataService.name, () => {
 
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.SIDECAR_SYNC,
+          name: JobName.SidecarSync,
           data: { id: assetStub.sidecar.id },
         },
       ]);
@@ -1471,7 +1471,7 @@ describe(MetadataService.name, () => {
       expect(mocks.assetJob.streamForSidecar).toHaveBeenCalledWith(false);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.SIDECAR_DISCOVERY,
+          name: JobName.SidecarDiscovery,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -1481,13 +1481,13 @@ describe(MetadataService.name, () => {
   describe('handleSidecarSync', () => {
     it('should do nothing if asset could not be found', async () => {
       mocks.asset.getByIds.mockResolvedValue([]);
-      await expect(sut.handleSidecarSync({ id: assetStub.image.id })).resolves.toBe(JobStatus.FAILED);
+      await expect(sut.handleSidecarSync({ id: assetStub.image.id })).resolves.toBe(JobStatus.Failed);
       expect(mocks.asset.update).not.toHaveBeenCalled();
     });
 
     it('should do nothing if asset has no sidecar path', async () => {
       mocks.asset.getByIds.mockResolvedValue([assetStub.image]);
-      await expect(sut.handleSidecarSync({ id: assetStub.image.id })).resolves.toBe(JobStatus.FAILED);
+      await expect(sut.handleSidecarSync({ id: assetStub.image.id })).resolves.toBe(JobStatus.Failed);
       expect(mocks.asset.update).not.toHaveBeenCalled();
     });
 
@@ -1495,7 +1495,7 @@ describe(MetadataService.name, () => {
       mocks.asset.getByIds.mockResolvedValue([assetStub.sidecar]);
       mocks.storage.checkFileExists.mockResolvedValue(true);
 
-      await expect(sut.handleSidecarSync({ id: assetStub.sidecar.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSidecarSync({ id: assetStub.sidecar.id })).resolves.toBe(JobStatus.Success);
       expect(mocks.storage.checkFileExists).toHaveBeenCalledWith(
         `${assetStub.sidecar.originalPath}.xmp`,
         constants.R_OK,
@@ -1511,7 +1511,7 @@ describe(MetadataService.name, () => {
       mocks.storage.checkFileExists.mockResolvedValueOnce(false);
       mocks.storage.checkFileExists.mockResolvedValueOnce(true);
 
-      await expect(sut.handleSidecarSync({ id: assetStub.sidecarWithoutExt.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSidecarSync({ id: assetStub.sidecarWithoutExt.id })).resolves.toBe(JobStatus.Success);
       expect(mocks.storage.checkFileExists).toHaveBeenNthCalledWith(
         2,
         assetStub.sidecarWithoutExt.sidecarPath,
@@ -1528,7 +1528,7 @@ describe(MetadataService.name, () => {
       mocks.storage.checkFileExists.mockResolvedValueOnce(true);
       mocks.storage.checkFileExists.mockResolvedValueOnce(true);
 
-      await expect(sut.handleSidecarSync({ id: assetStub.sidecar.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSidecarSync({ id: assetStub.sidecar.id })).resolves.toBe(JobStatus.Success);
       expect(mocks.storage.checkFileExists).toHaveBeenNthCalledWith(1, assetStub.sidecar.sidecarPath, constants.R_OK);
       expect(mocks.storage.checkFileExists).toHaveBeenNthCalledWith(
         2,
@@ -1545,7 +1545,7 @@ describe(MetadataService.name, () => {
       mocks.asset.getByIds.mockResolvedValue([assetStub.sidecar]);
       mocks.storage.checkFileExists.mockResolvedValue(false);
 
-      await expect(sut.handleSidecarSync({ id: assetStub.sidecar.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSidecarSync({ id: assetStub.sidecar.id })).resolves.toBe(JobStatus.Success);
       expect(mocks.storage.checkFileExists).toHaveBeenCalledWith(
         `${assetStub.sidecar.originalPath}.xmp`,
         constants.R_OK,
@@ -1603,14 +1603,14 @@ describe(MetadataService.name, () => {
   describe('handleSidecarWrite', () => {
     it('should skip assets that do not exist anymore', async () => {
       mocks.assetJob.getForSidecarWriteJob.mockResolvedValue(void 0);
-      await expect(sut.handleSidecarWrite({ id: 'asset-123' })).resolves.toBe(JobStatus.FAILED);
+      await expect(sut.handleSidecarWrite({ id: 'asset-123' })).resolves.toBe(JobStatus.Failed);
       expect(mocks.metadata.writeTags).not.toHaveBeenCalled();
     });
 
     it('should skip jobs with no metadata', async () => {
       const asset = factory.jobAssets.sidecarWrite();
       mocks.assetJob.getForSidecarWriteJob.mockResolvedValue(asset);
-      await expect(sut.handleSidecarWrite({ id: asset.id })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleSidecarWrite({ id: asset.id })).resolves.toBe(JobStatus.Skipped);
       expect(mocks.metadata.writeTags).not.toHaveBeenCalled();
     });
 
@@ -1629,7 +1629,7 @@ describe(MetadataService.name, () => {
           longitude: gps,
           dateTimeOriginal: date,
         }),
-      ).resolves.toBe(JobStatus.SUCCESS);
+      ).resolves.toBe(JobStatus.Success);
       expect(mocks.metadata.writeTags).toHaveBeenCalledWith(asset.sidecarPath, {
         Description: description,
         ImageDescription: description,
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
index ea3f810fa4..037bab3633 100644
--- a/server/src/services/metadata.service.ts
+++ b/server/src/services/metadata.service.ts
@@ -126,7 +126,7 @@ type Dates = {
 
 @Injectable()
 export class MetadataService extends BaseService {
-  @OnEvent({ name: 'AppBootstrap', workers: [ImmichWorker.MICROSERVICES] })
+  @OnEvent({ name: 'AppBootstrap', workers: [ImmichWorker.Microservices] })
   async onBootstrap() {
     this.logger.log('Bootstrapping metadata service');
     await this.init();
@@ -137,12 +137,12 @@ export class MetadataService extends BaseService {
     await this.metadataRepository.teardown();
   }
 
-  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.MICROSERVICES] })
+  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.Microservices] })
   onConfigInit({ newConfig }: ArgOf<'ConfigInit'>) {
     this.metadataRepository.setMaxConcurrency(newConfig.job.metadataExtraction.concurrency);
   }
 
-  @OnEvent({ name: 'ConfigUpdate', workers: [ImmichWorker.MICROSERVICES], server: true })
+  @OnEvent({ name: 'ConfigUpdate', workers: [ImmichWorker.Microservices], server: true })
   onConfigUpdate({ newConfig }: ArgOf<'ConfigUpdate'>) {
     this.metadataRepository.setMaxConcurrency(newConfig.job.metadataExtraction.concurrency);
   }
@@ -151,9 +151,9 @@ export class MetadataService extends BaseService {
     this.logger.log('Initializing metadata service');
 
     try {
-      await this.jobRepository.pause(QueueName.METADATA_EXTRACTION);
+      await this.jobRepository.pause(QueueName.MetadataExtraction);
       await this.databaseRepository.withLock(DatabaseLock.GeodataImport, () => this.mapRepository.init());
-      await this.jobRepository.resume(QueueName.METADATA_EXTRACTION);
+      await this.jobRepository.resume(QueueName.MetadataExtraction);
 
       this.logger.log(`Initialized local reverse geocoder`);
     } catch (error: Error | any) {
@@ -170,7 +170,7 @@ export class MetadataService extends BaseService {
       return;
     }
 
-    const otherType = asset.type === AssetType.VIDEO ? AssetType.IMAGE : AssetType.VIDEO;
+    const otherType = asset.type === AssetType.Video ? AssetType.Image : AssetType.Video;
     const match = await this.assetRepository.findLivePhotoMatch({
       livePhotoCID: exifInfo.livePhotoCID,
       ownerId: asset.ownerId,
@@ -183,23 +183,23 @@ export class MetadataService extends BaseService {
       return;
     }
 
-    const [photoAsset, motionAsset] = asset.type === AssetType.IMAGE ? [asset, match] : [match, asset];
+    const [photoAsset, motionAsset] = asset.type === AssetType.Image ? [asset, match] : [match, asset];
     await Promise.all([
       this.assetRepository.update({ id: photoAsset.id, livePhotoVideoId: motionAsset.id }),
-      this.assetRepository.update({ id: motionAsset.id, visibility: AssetVisibility.HIDDEN }),
+      this.assetRepository.update({ id: motionAsset.id, visibility: AssetVisibility.Hidden }),
       this.albumRepository.removeAssetsFromAll([motionAsset.id]),
     ]);
 
     await this.eventRepository.emit('AssetHide', { assetId: motionAsset.id, userId: motionAsset.ownerId });
   }
 
-  @OnJob({ name: JobName.QUEUE_METADATA_EXTRACTION, queue: QueueName.METADATA_EXTRACTION })
-  async handleQueueMetadataExtraction(job: JobOf<JobName.QUEUE_METADATA_EXTRACTION>): Promise<JobStatus> {
+  @OnJob({ name: JobName.QueueMetadataExtraction, queue: QueueName.MetadataExtraction })
+  async handleQueueMetadataExtraction(job: JobOf<JobName.QueueMetadataExtraction>): Promise<JobStatus> {
     const { force } = job;
 
-    let queue: { name: JobName.METADATA_EXTRACTION; data: { id: string } }[] = [];
+    let queue: { name: JobName.MetadataExtraction; data: { id: string } }[] = [];
     for await (const asset of this.assetJobRepository.streamForMetadataExtraction(force)) {
-      queue.push({ name: JobName.METADATA_EXTRACTION, data: { id: asset.id } });
+      queue.push({ name: JobName.MetadataExtraction, data: { id: asset.id } });
 
       if (queue.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(queue);
@@ -208,11 +208,11 @@ export class MetadataService extends BaseService {
     }
 
     await this.jobRepository.queueAll(queue);
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.METADATA_EXTRACTION, queue: QueueName.METADATA_EXTRACTION })
-  async handleMetadataExtraction(data: JobOf<JobName.METADATA_EXTRACTION>) {
+  @OnJob({ name: JobName.MetadataExtraction, queue: QueueName.MetadataExtraction })
+  async handleMetadataExtraction(data: JobOf<JobName.MetadataExtraction>) {
     const [{ metadata, reverseGeocoding }, asset] = await Promise.all([
       this.getConfig({ withCache: true }),
       this.assetJobRepository.getForMetadataExtraction(data.id),
@@ -320,8 +320,8 @@ export class MetadataService extends BaseService {
     });
   }
 
-  @OnJob({ name: JobName.QUEUE_SIDECAR, queue: QueueName.SIDECAR })
-  async handleQueueSidecar({ force }: JobOf<JobName.QUEUE_SIDECAR>): Promise<JobStatus> {
+  @OnJob({ name: JobName.QueueSidecar, queue: QueueName.Sidecar })
+  async handleQueueSidecar({ force }: JobOf<JobName.QueueSidecar>): Promise<JobStatus> {
     let jobs: JobItem[] = [];
     const queueAll = async () => {
       await this.jobRepository.queueAll(jobs);
@@ -330,7 +330,7 @@ export class MetadataService extends BaseService {
 
     const assets = this.assetJobRepository.streamForSidecar(force);
     for await (const asset of assets) {
-      jobs.push({ name: force ? JobName.SIDECAR_SYNC : JobName.SIDECAR_DISCOVERY, data: { id: asset.id } });
+      jobs.push({ name: force ? JobName.SidecarSync : JobName.SidecarDiscovery, data: { id: asset.id } });
       if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await queueAll();
       }
@@ -338,35 +338,35 @@ export class MetadataService extends BaseService {
 
     await queueAll();
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.SIDECAR_SYNC, queue: QueueName.SIDECAR })
-  handleSidecarSync({ id }: JobOf<JobName.SIDECAR_SYNC>): Promise<JobStatus> {
+  @OnJob({ name: JobName.SidecarSync, queue: QueueName.Sidecar })
+  handleSidecarSync({ id }: JobOf<JobName.SidecarSync>): Promise<JobStatus> {
     return this.processSidecar(id, true);
   }
 
-  @OnJob({ name: JobName.SIDECAR_DISCOVERY, queue: QueueName.SIDECAR })
-  handleSidecarDiscovery({ id }: JobOf<JobName.SIDECAR_DISCOVERY>): Promise<JobStatus> {
+  @OnJob({ name: JobName.SidecarDiscovery, queue: QueueName.Sidecar })
+  handleSidecarDiscovery({ id }: JobOf<JobName.SidecarDiscovery>): Promise<JobStatus> {
     return this.processSidecar(id, false);
   }
 
   @OnEvent({ name: 'AssetTag' })
   async handleTagAsset({ assetId }: ArgOf<'AssetTag'>) {
-    await this.jobRepository.queue({ name: JobName.SIDECAR_WRITE, data: { id: assetId, tags: true } });
+    await this.jobRepository.queue({ name: JobName.SidecarWrite, data: { id: assetId, tags: true } });
   }
 
   @OnEvent({ name: 'AssetUntag' })
   async handleUntagAsset({ assetId }: ArgOf<'AssetUntag'>) {
-    await this.jobRepository.queue({ name: JobName.SIDECAR_WRITE, data: { id: assetId, tags: true } });
+    await this.jobRepository.queue({ name: JobName.SidecarWrite, data: { id: assetId, tags: true } });
   }
 
-  @OnJob({ name: JobName.SIDECAR_WRITE, queue: QueueName.SIDECAR })
-  async handleSidecarWrite(job: JobOf<JobName.SIDECAR_WRITE>): Promise<JobStatus> {
+  @OnJob({ name: JobName.SidecarWrite, queue: QueueName.Sidecar })
+  async handleSidecarWrite(job: JobOf<JobName.SidecarWrite>): Promise<JobStatus> {
     const { id, description, dateTimeOriginal, latitude, longitude, rating, tags } = job;
     const asset = await this.assetJobRepository.getForSidecarWriteJob(id);
     if (!asset) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     const tagsList = (asset.tags || []).map((tag) => tag.value);
@@ -386,7 +386,7 @@ export class MetadataService extends BaseService {
     );
 
     if (Object.keys(exif).length === 0) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     await this.metadataRepository.writeTags(sidecarPath, exif);
@@ -395,7 +395,7 @@ export class MetadataService extends BaseService {
       await this.assetRepository.update({ id, sidecarPath });
     }
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private getImageDimensions(exifTags: ImmichTags): { width?: number; height?: number } {
@@ -416,7 +416,7 @@ export class MetadataService extends BaseService {
     sidecarPath: string | null;
     type: AssetType;
   }): Promise<ImmichTags> {
-    if (!asset.sidecarPath && asset.type === AssetType.IMAGE) {
+    if (!asset.sidecarPath && asset.type === AssetType.Image) {
       return this.metadataRepository.readTags(asset.originalPath);
     }
 
@@ -431,7 +431,7 @@ export class MetadataService extends BaseService {
     const [mediaTags, sidecarTags, videoTags] = await Promise.all([
       this.metadataRepository.readTags(asset.originalPath),
       asset.sidecarPath ? this.metadataRepository.readTags(asset.sidecarPath) : null,
-      asset.type === AssetType.VIDEO ? this.getVideoTags(asset.originalPath) : null,
+      asset.type === AssetType.Video ? this.getVideoTags(asset.originalPath) : null,
     ]);
 
     // prefer dates from sidecar tags
@@ -488,7 +488,7 @@ export class MetadataService extends BaseService {
   }
 
   private isMotionPhoto(asset: { type: AssetType }, tags: ImmichTags): boolean {
-    return asset.type === AssetType.IMAGE && !!(tags.MotionPhoto || tags.MicroVideo);
+    return asset.type === AssetType.Image && !!(tags.MotionPhoto || tags.MicroVideo);
   }
 
   private async applyMotionPhotos(asset: Asset, tags: ImmichTags, dates: Dates, stats: Stats) {
@@ -558,10 +558,10 @@ export class MetadataService extends BaseService {
         });
 
         // Hide the motion photo video asset if it's not already hidden to prepare for linking
-        if (motionAsset.visibility === AssetVisibility.TIMELINE) {
+        if (motionAsset.visibility === AssetVisibility.Timeline) {
           await this.assetRepository.update({
             id: motionAsset.id,
-            visibility: AssetVisibility.HIDDEN,
+            visibility: AssetVisibility.Hidden,
           });
           this.logger.log(`Hid unlinked motion photo video asset (${motionAsset.id})`);
         }
@@ -570,7 +570,7 @@ export class MetadataService extends BaseService {
         motionAsset = await this.assetRepository.create({
           id: motionAssetId,
           libraryId: asset.libraryId,
-          type: AssetType.VIDEO,
+          type: AssetType.Video,
           fileCreatedAt: dates.dateTimeOriginal,
           fileModifiedAt: stats.mtime,
           localDateTime: dates.localDateTime,
@@ -578,7 +578,7 @@ export class MetadataService extends BaseService {
           ownerId: asset.ownerId,
           originalPath: StorageCore.getAndroidMotionPath(asset, motionAssetId),
           originalFileName: `${path.parse(asset.originalFileName).name}.mp4`,
-          visibility: AssetVisibility.HIDDEN,
+          visibility: AssetVisibility.Hidden,
           deviceAssetId: 'NONE',
           deviceId: 'NONE',
         });
@@ -597,7 +597,7 @@ export class MetadataService extends BaseService {
         // note asset.livePhotoVideoId is not motionAsset.id yet
         if (asset.livePhotoVideoId) {
           await this.jobRepository.queue({
-            name: JobName.ASSET_DELETION,
+            name: JobName.AssetDeletion,
             data: { id: asset.livePhotoVideoId, deleteOnDisk: true },
           });
           this.logger.log(`Removed old motion photo video asset (${asset.livePhotoVideoId})`);
@@ -612,7 +612,7 @@ export class MetadataService extends BaseService {
         this.logger.log(`Wrote motion photo video to ${motionAsset.originalPath}`);
 
         await this.handleMetadataExtraction({ id: motionAsset.id });
-        await this.jobRepository.queue({ name: JobName.VIDEO_CONVERSION, data: { id: motionAsset.id } });
+        await this.jobRepository.queue({ name: JobName.VideoConversation, data: { id: motionAsset.id } });
       }
 
       this.logger.debug(`Finished motion photo video extraction for asset ${asset.id}: ${asset.originalPath}`);
@@ -740,7 +740,7 @@ export class MetadataService extends BaseService {
         boundingBoxY1: Math.floor((region.Area.Y - region.Area.H / 2) * imageHeight),
         boundingBoxX2: Math.floor((region.Area.X + region.Area.W / 2) * imageWidth),
         boundingBoxY2: Math.floor((region.Area.Y + region.Area.H / 2) * imageHeight),
-        sourceType: SourceType.EXIF,
+        sourceType: SourceType.Exif,
       };
 
       facesToAdd.push(face);
@@ -753,11 +753,11 @@ export class MetadataService extends BaseService {
     if (missing.length > 0) {
       this.logger.debugFn(() => `Creating missing persons: ${missing.map((p) => `${p.name}/${p.id}`)}`);
       const newPersonIds = await this.personRepository.createAll(missing);
-      const jobs = newPersonIds.map((id) => ({ name: JobName.GENERATE_PERSON_THUMBNAIL, data: { id } }) as const);
+      const jobs = newPersonIds.map((id) => ({ name: JobName.GeneratePersonThumbnail, data: { id } }) as const);
       await this.jobRepository.queueAll(jobs);
     }
 
-    const facesToRemove = asset.faces.filter((face) => face.sourceType === SourceType.EXIF).map((face) => face.id);
+    const facesToRemove = asset.faces.filter((face) => face.sourceType === SourceType.Exif).map((face) => face.id);
     if (facesToRemove.length > 0) {
       this.logger.debug(`Removing ${facesToRemove.length} faces for asset ${asset.id}: ${asset.originalPath}`);
     }
@@ -894,15 +894,15 @@ export class MetadataService extends BaseService {
     const [asset] = await this.assetRepository.getByIds([id]);
 
     if (!asset) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     if (isSync && !asset.sidecarPath) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
-    if (!isSync && (asset.visibility === AssetVisibility.HIDDEN || asset.sidecarPath) && !asset.isExternal) {
-      return JobStatus.FAILED;
+    if (!isSync && (asset.visibility === AssetVisibility.Hidden || asset.sidecarPath) && !asset.isExternal) {
+      return JobStatus.Failed;
     }
 
     // XMP sidecars can come in two filename formats. For a photo named photo.ext, the filenames are photo.ext.xmp and photo.xmp
@@ -927,22 +927,22 @@ export class MetadataService extends BaseService {
       if (sidecarPath !== asset.sidecarPath) {
         await this.assetRepository.update({ id: asset.id, sidecarPath });
       }
-      return JobStatus.SUCCESS;
+      return JobStatus.Success;
     }
 
     if (sidecarPath) {
       this.logger.debug(`Detected sidecar at '${sidecarPath}' for asset ${asset.id}: ${asset.originalPath}`);
       await this.assetRepository.update({ id: asset.id, sidecarPath });
-      return JobStatus.SUCCESS;
+      return JobStatus.Success;
     }
 
     if (!isSync) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     this.logger.debug(`No sidecar found for asset ${asset.id}: ${asset.originalPath}`);
     await this.assetRepository.update({ id: asset.id, sidecarPath: null });
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 }
diff --git a/server/src/services/notification.service.spec.ts b/server/src/services/notification.service.spec.ts
index bca7074194..97e5ddf106 100644
--- a/server/src/services/notification.service.spec.ts
+++ b/server/src/services/notification.service.spec.ts
@@ -131,7 +131,7 @@ describe(NotificationService.name, () => {
     it('should queue the generate thumbnail job', async () => {
       await sut.onAssetShow({ assetId: 'asset-id', userId: 'user-id' });
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.GENERATE_THUMBNAILS,
+        name: JobName.GenerateThumbnails,
         data: { id: 'asset-id', notify: true },
       });
     });
@@ -146,7 +146,7 @@ describe(NotificationService.name, () => {
     it('should queue notify signup event if notify is true', async () => {
       await sut.onUserSignup({ id: '', notify: true });
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.NOTIFY_SIGNUP,
+        name: JobName.NotifySignup,
         data: { id: '', tempPassword: undefined },
       });
     });
@@ -156,7 +156,7 @@ describe(NotificationService.name, () => {
     it('should queue notify album update event', async () => {
       await sut.onAlbumUpdate({ id: 'album', recipientId: '42' });
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.NOTIFY_ALBUM_UPDATE,
+        name: JobName.NotifyAlbumUpdate,
         data: { id: 'album', recipientId: '42', delay: 300_000 },
       });
     });
@@ -166,7 +166,7 @@ describe(NotificationService.name, () => {
     it('should queue notify album invite event', async () => {
       await sut.onAlbumInvite({ id: '', userId: '42' });
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.NOTIFY_ALBUM_INVITE,
+        name: JobName.NotifyAlbumInvite,
         data: { id: '', recipientId: '42' },
       });
     });
@@ -242,7 +242,7 @@ describe(NotificationService.name, () => {
 
   describe('handleUserSignup', () => {
     it('should skip if user could not be found', async () => {
-      await expect(sut.handleUserSignup({ id: '' })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleUserSignup({ id: '' })).resolves.toBe(JobStatus.Skipped);
     });
 
     it('should be successful', async () => {
@@ -250,9 +250,9 @@ describe(NotificationService.name, () => {
       mocks.systemMetadata.get.mockResolvedValue({ server: {} });
       mocks.email.renderEmail.mockResolvedValue({ html: '', text: '' });
 
-      await expect(sut.handleUserSignup({ id: '' })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleUserSignup({ id: '' })).resolves.toBe(JobStatus.Success);
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.SEND_EMAIL,
+        name: JobName.SendMail,
         data: expect.objectContaining({ subject: 'Welcome to Immich' }),
       });
     });
@@ -260,14 +260,14 @@ describe(NotificationService.name, () => {
 
   describe('handleAlbumInvite', () => {
     it('should skip if album could not be found', async () => {
-      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.Skipped);
       expect(mocks.user.get).not.toHaveBeenCalled();
     });
 
     it('should skip if recipient could not be found', async () => {
       mocks.album.getById.mockResolvedValue(albumStub.empty);
 
-      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.Skipped);
       expect(mocks.job.queue).not.toHaveBeenCalled();
     });
 
@@ -277,13 +277,13 @@ describe(NotificationService.name, () => {
         ...userStub.user1,
         metadata: [
           {
-            key: UserMetadataKey.PREFERENCES,
+            key: UserMetadataKey.Preferences,
             value: { emailNotifications: { enabled: false, albumInvite: true } },
           },
         ],
       });
 
-      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.Skipped);
     });
 
     it('should skip if the recipient has email notifications for album invite disabled', async () => {
@@ -292,13 +292,13 @@ describe(NotificationService.name, () => {
         ...userStub.user1,
         metadata: [
           {
-            key: UserMetadataKey.PREFERENCES,
+            key: UserMetadataKey.Preferences,
             value: { emailNotifications: { enabled: true, albumInvite: false } },
           },
         ],
       });
 
-      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.Skipped);
     });
 
     it('should send invite email', async () => {
@@ -307,7 +307,7 @@ describe(NotificationService.name, () => {
         ...userStub.user1,
         metadata: [
           {
-            key: UserMetadataKey.PREFERENCES,
+            key: UserMetadataKey.Preferences,
             value: { emailNotifications: { enabled: true, albumInvite: true } },
           },
         ],
@@ -315,9 +315,9 @@ describe(NotificationService.name, () => {
       mocks.systemMetadata.get.mockResolvedValue({ server: {} });
       mocks.email.renderEmail.mockResolvedValue({ html: '', text: '' });
 
-      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.Success);
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.SEND_EMAIL,
+        name: JobName.SendMail,
         data: expect.objectContaining({ subject: expect.stringContaining('You have been added to a shared album') }),
       });
     });
@@ -328,7 +328,7 @@ describe(NotificationService.name, () => {
         ...userStub.user1,
         metadata: [
           {
-            key: UserMetadataKey.PREFERENCES,
+            key: UserMetadataKey.Preferences,
             value: { emailNotifications: { enabled: true, albumInvite: true } },
           },
         ],
@@ -337,13 +337,13 @@ describe(NotificationService.name, () => {
       mocks.email.renderEmail.mockResolvedValue({ html: '', text: '' });
       mocks.assetJob.getAlbumThumbnailFiles.mockResolvedValue([]);
 
-      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.Success);
       expect(mocks.assetJob.getAlbumThumbnailFiles).toHaveBeenCalledWith(
         albumStub.emptyWithValidThumbnail.albumThumbnailAssetId,
-        AssetFileType.THUMBNAIL,
+        AssetFileType.Thumbnail,
       );
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.SEND_EMAIL,
+        name: JobName.SendMail,
         data: expect.objectContaining({
           subject: expect.stringContaining('You have been added to a shared album'),
           imageAttachments: undefined,
@@ -357,7 +357,7 @@ describe(NotificationService.name, () => {
         ...userStub.user1,
         metadata: [
           {
-            key: UserMetadataKey.PREFERENCES,
+            key: UserMetadataKey.Preferences,
             value: { emailNotifications: { enabled: true, albumInvite: true } },
           },
         ],
@@ -365,16 +365,16 @@ describe(NotificationService.name, () => {
       mocks.systemMetadata.get.mockResolvedValue({ server: {} });
       mocks.email.renderEmail.mockResolvedValue({ html: '', text: '' });
       mocks.assetJob.getAlbumThumbnailFiles.mockResolvedValue([
-        { id: '1', type: AssetFileType.THUMBNAIL, path: 'path-to-thumb.jpg' },
+        { id: '1', type: AssetFileType.Thumbnail, path: 'path-to-thumb.jpg' },
       ]);
 
-      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.Success);
       expect(mocks.assetJob.getAlbumThumbnailFiles).toHaveBeenCalledWith(
         albumStub.emptyWithValidThumbnail.albumThumbnailAssetId,
-        AssetFileType.THUMBNAIL,
+        AssetFileType.Thumbnail,
       );
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.SEND_EMAIL,
+        name: JobName.SendMail,
         data: expect.objectContaining({
           subject: expect.stringContaining('You have been added to a shared album'),
           imageAttachments: [{ filename: 'album-thumbnail.jpg', path: expect.anything(), cid: expect.anything() }],
@@ -388,7 +388,7 @@ describe(NotificationService.name, () => {
         ...userStub.user1,
         metadata: [
           {
-            key: UserMetadataKey.PREFERENCES,
+            key: UserMetadataKey.Preferences,
             value: { emailNotifications: { enabled: true, albumInvite: true } },
           },
         ],
@@ -397,13 +397,13 @@ describe(NotificationService.name, () => {
       mocks.email.renderEmail.mockResolvedValue({ html: '', text: '' });
       mocks.assetJob.getAlbumThumbnailFiles.mockResolvedValue([assetStub.image.files[2]]);
 
-      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.Success);
       expect(mocks.assetJob.getAlbumThumbnailFiles).toHaveBeenCalledWith(
         albumStub.emptyWithValidThumbnail.albumThumbnailAssetId,
-        AssetFileType.THUMBNAIL,
+        AssetFileType.Thumbnail,
       );
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.SEND_EMAIL,
+        name: JobName.SendMail,
         data: expect.objectContaining({
           subject: expect.stringContaining('You have been added to a shared album'),
           imageAttachments: [{ filename: 'album-thumbnail.ext', path: expect.anything(), cid: expect.anything() }],
@@ -414,14 +414,14 @@ describe(NotificationService.name, () => {
 
   describe('handleAlbumUpdate', () => {
     it('should skip if album could not be found', async () => {
-      await expect(sut.handleAlbumUpdate({ id: '', recipientId: '1' })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleAlbumUpdate({ id: '', recipientId: '1' })).resolves.toBe(JobStatus.Skipped);
       expect(mocks.user.get).not.toHaveBeenCalled();
     });
 
     it('should skip if owner could not be found', async () => {
       mocks.album.getById.mockResolvedValue(albumStub.emptyWithValidThumbnail);
 
-      await expect(sut.handleAlbumUpdate({ id: '', recipientId: '1' })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleAlbumUpdate({ id: '', recipientId: '1' })).resolves.toBe(JobStatus.Skipped);
       expect(mocks.systemMetadata.get).not.toHaveBeenCalled();
     });
 
@@ -448,7 +448,7 @@ describe(NotificationService.name, () => {
         ...userStub.user1,
         metadata: [
           {
-            key: UserMetadataKey.PREFERENCES,
+            key: UserMetadataKey.Preferences,
             value: { emailNotifications: { enabled: false, albumUpdate: true } },
           },
         ],
@@ -470,7 +470,7 @@ describe(NotificationService.name, () => {
         ...userStub.user1,
         metadata: [
           {
-            key: UserMetadataKey.PREFERENCES,
+            key: UserMetadataKey.Preferences,
             value: { emailNotifications: { enabled: true, albumUpdate: false } },
           },
         ],
@@ -500,9 +500,9 @@ describe(NotificationService.name, () => {
 
     it('should add new recipients for new images if job is already queued', async () => {
       await sut.onAlbumUpdate({ id: '1', recipientId: '2' } as INotifyAlbumUpdateJob);
-      expect(mocks.job.removeJob).toHaveBeenCalledWith(JobName.NOTIFY_ALBUM_UPDATE, '1/2');
+      expect(mocks.job.removeJob).toHaveBeenCalledWith(JobName.NotifyAlbumUpdate, '1/2');
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.NOTIFY_ALBUM_UPDATE,
+        name: JobName.NotifyAlbumUpdate,
         data: {
           id: '1',
           delay: 300_000,
@@ -515,7 +515,7 @@ describe(NotificationService.name, () => {
   describe('handleSendEmail', () => {
     it('should skip if smtp notifications are disabled', async () => {
       mocks.systemMetadata.get.mockResolvedValue({ notifications: { smtp: { enabled: false } } });
-      await expect(sut.handleSendEmail({ html: '', subject: '', text: '', to: '' })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleSendEmail({ html: '', subject: '', text: '', to: '' })).resolves.toBe(JobStatus.Skipped);
     });
 
     it('should send mail successfully', async () => {
@@ -524,7 +524,7 @@ describe(NotificationService.name, () => {
       });
       mocks.email.sendEmail.mockResolvedValue({ messageId: '', response: '' });
 
-      await expect(sut.handleSendEmail({ html: '', subject: '', text: '', to: '' })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSendEmail({ html: '', subject: '', text: '', to: '' })).resolves.toBe(JobStatus.Success);
       expect(mocks.email.sendEmail).toHaveBeenCalledWith(expect.objectContaining({ replyTo: 'test@immich.app' }));
     });
 
@@ -534,7 +534,7 @@ describe(NotificationService.name, () => {
       });
       mocks.email.sendEmail.mockResolvedValue({ messageId: '', response: '' });
 
-      await expect(sut.handleSendEmail({ html: '', subject: '', text: '', to: '' })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleSendEmail({ html: '', subject: '', text: '', to: '' })).resolves.toBe(JobStatus.Success);
       expect(mocks.email.sendEmail).toHaveBeenCalledWith(expect.objectContaining({ replyTo: 'demo@immich.app' }));
     });
   });
diff --git a/server/src/services/notification.service.ts b/server/src/services/notification.service.ts
index 80a20195a1..90a3b63ac5 100644
--- a/server/src/services/notification.service.ts
+++ b/server/src/services/notification.service.ts
@@ -39,19 +39,19 @@ export class NotificationService extends BaseService {
   }
 
   async updateAll(auth: AuthDto, dto: NotificationUpdateAllDto) {
-    await this.requireAccess({ auth, ids: dto.ids, permission: Permission.NOTIFICATION_UPDATE });
+    await this.requireAccess({ auth, ids: dto.ids, permission: Permission.NotificationUpdate });
     await this.notificationRepository.updateAll(dto.ids, {
       readAt: dto.readAt,
     });
   }
 
   async deleteAll(auth: AuthDto, dto: NotificationDeleteAllDto) {
-    await this.requireAccess({ auth, ids: dto.ids, permission: Permission.NOTIFICATION_DELETE });
+    await this.requireAccess({ auth, ids: dto.ids, permission: Permission.NotificationDelete });
     await this.notificationRepository.deleteAll(dto.ids);
   }
 
   async get(auth: AuthDto, id: string) {
-    await this.requireAccess({ auth, ids: [id], permission: Permission.NOTIFICATION_READ });
+    await this.requireAccess({ auth, ids: [id], permission: Permission.NotificationRead });
     const item = await this.notificationRepository.get(id);
     if (!item) {
       throw new BadRequestException('Notification not found');
@@ -60,7 +60,7 @@ export class NotificationService extends BaseService {
   }
 
   async update(auth: AuthDto, id: string, dto: NotificationUpdateDto) {
-    await this.requireAccess({ auth, ids: [id], permission: Permission.NOTIFICATION_UPDATE });
+    await this.requireAccess({ auth, ids: [id], permission: Permission.NotificationUpdate });
     const item = await this.notificationRepository.update(id, {
       readAt: dto.readAt,
     });
@@ -68,11 +68,11 @@ export class NotificationService extends BaseService {
   }
 
   async delete(auth: AuthDto, id: string) {
-    await this.requireAccess({ auth, ids: [id], permission: Permission.NOTIFICATION_DELETE });
+    await this.requireAccess({ auth, ids: [id], permission: Permission.NotificationDelete });
     await this.notificationRepository.delete(id);
   }
 
-  @OnJob({ name: JobName.NOTIFICATIONS_CLEANUP, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.NotificationsCleanup, queue: QueueName.BackgroundTask })
   async onNotificationsCleanup() {
     await this.notificationRepository.cleanup();
   }
@@ -87,7 +87,7 @@ export class NotificationService extends BaseService {
     this.logger.error(`Unable to run job handler (${job.name}): ${error}`, error?.stack, JSON.stringify(job.data));
 
     switch (job.name) {
-      case JobName.BACKUP_DATABASE: {
+      case JobName.BackupDatabase: {
         const errorMessage = error instanceof Error ? error.message : error;
         const item = await this.notificationRepository.create({
           userId: admin.id,
@@ -135,7 +135,7 @@ export class NotificationService extends BaseService {
 
   @OnEvent({ name: 'AssetShow' })
   async onAssetShow({ assetId }: ArgOf<'AssetShow'>) {
-    await this.jobRepository.queue({ name: JobName.GENERATE_THUMBNAILS, data: { id: assetId, notify: true } });
+    await this.jobRepository.queue({ name: JobName.GenerateThumbnails, data: { id: assetId, notify: true } });
   }
 
   @OnEvent({ name: 'AssetTrash' })
@@ -193,22 +193,22 @@ export class NotificationService extends BaseService {
   @OnEvent({ name: 'UserSignup' })
   async onUserSignup({ notify, id, tempPassword }: ArgOf<'UserSignup'>) {
     if (notify) {
-      await this.jobRepository.queue({ name: JobName.NOTIFY_SIGNUP, data: { id, tempPassword } });
+      await this.jobRepository.queue({ name: JobName.NotifySignup, data: { id, tempPassword } });
     }
   }
 
   @OnEvent({ name: 'AlbumUpdate' })
   async onAlbumUpdate({ id, recipientId }: ArgOf<'AlbumUpdate'>) {
-    await this.jobRepository.removeJob(JobName.NOTIFY_ALBUM_UPDATE, `${id}/${recipientId}`);
+    await this.jobRepository.removeJob(JobName.NotifyAlbumUpdate, `${id}/${recipientId}`);
     await this.jobRepository.queue({
-      name: JobName.NOTIFY_ALBUM_UPDATE,
+      name: JobName.NotifyAlbumUpdate,
       data: { id, recipientId, delay: NotificationService.albumUpdateEmailDelayMs },
     });
   }
 
   @OnEvent({ name: 'AlbumInvite' })
   async onAlbumInvite({ id, userId }: ArgOf<'AlbumInvite'>) {
-    await this.jobRepository.queue({ name: JobName.NOTIFY_ALBUM_INVITE, data: { id, recipientId: userId } });
+    await this.jobRepository.queue({ name: JobName.NotifyAlbumInvite, data: { id, recipientId: userId } });
   }
 
   @OnEvent({ name: 'SessionDelete' })
@@ -313,11 +313,11 @@ export class NotificationService extends BaseService {
     return { name, html: templateResponse };
   }
 
-  @OnJob({ name: JobName.NOTIFY_SIGNUP, queue: QueueName.NOTIFICATION })
-  async handleUserSignup({ id, tempPassword }: JobOf<JobName.NOTIFY_SIGNUP>) {
+  @OnJob({ name: JobName.NotifySignup, queue: QueueName.Notification })
+  async handleUserSignup({ id, tempPassword }: JobOf<JobName.NotifySignup>) {
     const user = await this.userRepository.get(id, { withDeleted: false });
     if (!user) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const { server, templates } = await this.getConfig({ withCache: true });
@@ -333,7 +333,7 @@ export class NotificationService extends BaseService {
     });
 
     await this.jobRepository.queue({
-      name: JobName.SEND_EMAIL,
+      name: JobName.SendMail,
       data: {
         to: user.email,
         subject: 'Welcome to Immich',
@@ -342,25 +342,25 @@ export class NotificationService extends BaseService {
       },
     });
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.NOTIFY_ALBUM_INVITE, queue: QueueName.NOTIFICATION })
-  async handleAlbumInvite({ id, recipientId }: JobOf<JobName.NOTIFY_ALBUM_INVITE>) {
+  @OnJob({ name: JobName.NotifyAlbumInvite, queue: QueueName.Notification })
+  async handleAlbumInvite({ id, recipientId }: JobOf<JobName.NotifyAlbumInvite>) {
     const album = await this.albumRepository.getById(id, { withAssets: false });
     if (!album) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const recipient = await this.userRepository.get(recipientId, { withDeleted: false });
     if (!recipient) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const { emailNotifications } = getPreferences(recipient.metadata);
 
     if (!emailNotifications.enabled || !emailNotifications.albumInvite) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const attachment = await this.getAlbumThumbnailAttachment(album);
@@ -380,7 +380,7 @@ export class NotificationService extends BaseService {
     });
 
     await this.jobRepository.queue({
-      name: JobName.SEND_EMAIL,
+      name: JobName.SendMail,
       data: {
         to: recipient.email,
         subject: `You have been added to a shared album - ${album.albumName}`,
@@ -390,20 +390,20 @@ export class NotificationService extends BaseService {
       },
     });
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.NOTIFY_ALBUM_UPDATE, queue: QueueName.NOTIFICATION })
-  async handleAlbumUpdate({ id, recipientId }: JobOf<JobName.NOTIFY_ALBUM_UPDATE>) {
+  @OnJob({ name: JobName.NotifyAlbumUpdate, queue: QueueName.Notification })
+  async handleAlbumUpdate({ id, recipientId }: JobOf<JobName.NotifyAlbumUpdate>) {
     const album = await this.albumRepository.getById(id, { withAssets: false });
 
     if (!album) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const owner = await this.userRepository.get(album.ownerId, { withDeleted: false });
     if (!owner) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const attachment = await this.getAlbumThumbnailAttachment(album);
@@ -412,13 +412,13 @@ export class NotificationService extends BaseService {
 
     const user = await this.userRepository.get(recipientId, { withDeleted: false });
     if (!user) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const { emailNotifications } = getPreferences(user.metadata);
 
     if (!emailNotifications.enabled || !emailNotifications.albumUpdate) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const { html, text } = await this.emailRepository.renderEmail({
@@ -434,7 +434,7 @@ export class NotificationService extends BaseService {
     });
 
     await this.jobRepository.queue({
-      name: JobName.SEND_EMAIL,
+      name: JobName.SendMail,
       data: {
         to: user.email,
         subject: `New media has been added to an album - ${album.albumName}`,
@@ -444,14 +444,14 @@ export class NotificationService extends BaseService {
       },
     });
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.SEND_EMAIL, queue: QueueName.NOTIFICATION })
-  async handleSendEmail(data: JobOf<JobName.SEND_EMAIL>): Promise<JobStatus> {
+  @OnJob({ name: JobName.SendMail, queue: QueueName.Notification })
+  async handleSendEmail(data: JobOf<JobName.SendMail>): Promise<JobStatus> {
     const { notifications } = await this.getConfig({ withCache: false });
     if (!notifications.smtp.enabled) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const { to, subject, html, text: plain } = data;
@@ -468,7 +468,7 @@ export class NotificationService extends BaseService {
 
     this.logger.log(`Sent mail with id: ${response.messageId} status: ${response.response}`);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private async getAlbumThumbnailAttachment(album: {
@@ -480,7 +480,7 @@ export class NotificationService extends BaseService {
 
     const albumThumbnailFiles = await this.assetJobRepository.getAlbumThumbnailFiles(
       album.albumThumbnailAssetId,
-      AssetFileType.THUMBNAIL,
+      AssetFileType.Thumbnail,
     );
 
     if (albumThumbnailFiles.length !== 1) {
diff --git a/server/src/services/partner.service.ts b/server/src/services/partner.service.ts
index 3723634948..755b688397 100644
--- a/server/src/services/partner.service.ts
+++ b/server/src/services/partner.service.ts
@@ -40,7 +40,7 @@ export class PartnerService extends BaseService {
   }
 
   async update(auth: AuthDto, sharedById: string, dto: UpdatePartnerDto): Promise<PartnerResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.PARTNER_UPDATE, ids: [sharedById] });
+    await this.requireAccess({ auth, permission: Permission.PartnerUpdate, ids: [sharedById] });
     const partnerId: PartnerIds = { sharedById, sharedWithId: auth.user.id };
 
     const entity = await this.partnerRepository.update(partnerId, { inTimeline: dto.inTimeline });
diff --git a/server/src/services/person.service.spec.ts b/server/src/services/person.service.spec.ts
index d9df2225f4..8fbf8b20dd 100644
--- a/server/src/services/person.service.spec.ts
+++ b/server/src/services/person.service.spec.ts
@@ -182,7 +182,7 @@ describe(PersonService.name, () => {
         new ImmichFileResponse({
           path: '/path/to/thumbnail.jpg',
           contentType: 'image/jpeg',
-          cacheControl: CacheControl.PRIVATE_WITHOUT_CACHE,
+          cacheControl: CacheControl.PrivateWithoutCache,
         }),
       );
       expect(mocks.access.person.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['person-1']));
@@ -276,7 +276,7 @@ describe(PersonService.name, () => {
         },
       ]);
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.GENERATE_PERSON_THUMBNAIL,
+        name: JobName.GeneratePersonThumbnail,
         data: { id: 'person-1' },
       });
       expect(mocks.access.person.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['person-1']));
@@ -337,7 +337,7 @@ describe(PersonService.name, () => {
 
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GENERATE_PERSON_THUMBNAIL,
+          name: JobName.GeneratePersonThumbnail,
           data: { id: personStub.newThumbnail.id },
         },
       ]);
@@ -346,7 +346,7 @@ describe(PersonService.name, () => {
 
   describe('handlePersonMigration', () => {
     it('should not move person files', async () => {
-      await expect(sut.handlePersonMigration(personStub.noName)).resolves.toBe(JobStatus.FAILED);
+      await expect(sut.handlePersonMigration(personStub.noName)).resolves.toBe(JobStatus.Failed);
     });
   });
 
@@ -373,7 +373,7 @@ describe(PersonService.name, () => {
       await sut.createNewFeaturePhoto([personStub.newThumbnail.id]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GENERATE_PERSON_THUMBNAIL,
+          name: JobName.GeneratePersonThumbnail,
           data: { id: personStub.newThumbnail.id },
         },
       ]);
@@ -447,7 +447,7 @@ describe(PersonService.name, () => {
     it('should skip if machine learning is disabled', async () => {
       mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.machineLearningDisabled);
 
-      await expect(sut.handleQueueDetectFaces({})).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleQueueDetectFaces({})).resolves.toBe(JobStatus.Skipped);
       expect(mocks.job.queue).not.toHaveBeenCalled();
       expect(mocks.job.queueAll).not.toHaveBeenCalled();
       expect(mocks.systemMetadata.get).toHaveBeenCalled();
@@ -462,7 +462,7 @@ describe(PersonService.name, () => {
       expect(mocks.person.vacuum).not.toHaveBeenCalled();
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FACE_DETECTION,
+          name: JobName.FaceDetection,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -474,14 +474,14 @@ describe(PersonService.name, () => {
 
       await sut.handleQueueDetectFaces({ force: true });
 
-      expect(mocks.person.deleteFaces).toHaveBeenCalledWith({ sourceType: SourceType.MACHINE_LEARNING });
+      expect(mocks.person.deleteFaces).toHaveBeenCalledWith({ sourceType: SourceType.MachineLearning });
       expect(mocks.person.delete).toHaveBeenCalledWith([personStub.withName.id]);
       expect(mocks.person.vacuum).toHaveBeenCalledWith({ reindexVectors: true });
       expect(mocks.storage.unlink).toHaveBeenCalledWith(personStub.withName.thumbnailPath);
       expect(mocks.assetJob.streamForDetectFacesJob).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FACE_DETECTION,
+          name: JobName.FaceDetection,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -499,11 +499,11 @@ describe(PersonService.name, () => {
       expect(mocks.assetJob.streamForDetectFacesJob).toHaveBeenCalledWith(undefined);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FACE_DETECTION,
+          name: JobName.FaceDetection,
           data: { id: assetStub.image.id },
         },
       ]);
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.PERSON_CLEANUP });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.PersonCleanup });
     });
 
     it('should delete existing people and faces if forced', async () => {
@@ -518,7 +518,7 @@ describe(PersonService.name, () => {
       expect(mocks.assetJob.streamForDetectFacesJob).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FACE_DETECTION,
+          name: JobName.FaceDetection,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -540,7 +540,7 @@ describe(PersonService.name, () => {
       });
       mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.machineLearningDisabled);
 
-      await expect(sut.handleQueueRecognizeFaces({})).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleQueueRecognizeFaces({})).resolves.toBe(JobStatus.Skipped);
       expect(mocks.job.queueAll).not.toHaveBeenCalled();
       expect(mocks.systemMetadata.get).toHaveBeenCalled();
       expect(mocks.systemMetadata.set).not.toHaveBeenCalled();
@@ -556,7 +556,7 @@ describe(PersonService.name, () => {
         delayed: 0,
       });
 
-      await expect(sut.handleQueueRecognizeFaces({})).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleQueueRecognizeFaces({})).resolves.toBe(JobStatus.Skipped);
       expect(mocks.job.queueAll).not.toHaveBeenCalled();
       expect(mocks.systemMetadata.set).not.toHaveBeenCalled();
     });
@@ -577,15 +577,15 @@ describe(PersonService.name, () => {
 
       expect(mocks.person.getAllFaces).toHaveBeenCalledWith({
         personId: null,
-        sourceType: SourceType.MACHINE_LEARNING,
+        sourceType: SourceType.MachineLearning,
       });
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FACIAL_RECOGNITION,
+          name: JobName.FacialRecognition,
           data: { id: faceStub.face1.id, deferred: false },
         },
       ]);
-      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.FACIAL_RECOGNITION_STATE, {
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.FacialRecognitionState, {
         lastRun: expect.any(String),
       });
       expect(mocks.person.vacuum).not.toHaveBeenCalled();
@@ -609,11 +609,11 @@ describe(PersonService.name, () => {
       expect(mocks.person.getAllFaces).toHaveBeenCalledWith(undefined);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FACIAL_RECOGNITION,
+          name: JobName.FacialRecognition,
           data: { id: faceStub.face1.id, deferred: false },
         },
       ]);
-      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.FACIAL_RECOGNITION_STATE, {
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.FacialRecognitionState, {
         lastRun: expect.any(String),
       });
       expect(mocks.person.vacuum).toHaveBeenCalledWith({ reindexVectors: false });
@@ -637,19 +637,19 @@ describe(PersonService.name, () => {
 
       await sut.handleQueueRecognizeFaces({ force: false, nightly: true });
 
-      expect(mocks.systemMetadata.get).toHaveBeenCalledWith(SystemMetadataKey.FACIAL_RECOGNITION_STATE);
+      expect(mocks.systemMetadata.get).toHaveBeenCalledWith(SystemMetadataKey.FacialRecognitionState);
       expect(mocks.person.getLatestFaceDate).toHaveBeenCalledOnce();
       expect(mocks.person.getAllFaces).toHaveBeenCalledWith({
         personId: null,
-        sourceType: SourceType.MACHINE_LEARNING,
+        sourceType: SourceType.MachineLearning,
       });
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FACIAL_RECOGNITION,
+          name: JobName.FacialRecognition,
           data: { id: faceStub.face1.id, deferred: false },
         },
       ]);
-      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.FACIAL_RECOGNITION_STATE, {
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.FacialRecognitionState, {
         lastRun: expect.any(String),
       });
       expect(mocks.person.vacuum).not.toHaveBeenCalled();
@@ -665,7 +665,7 @@ describe(PersonService.name, () => {
 
       await sut.handleQueueRecognizeFaces({ force: true, nightly: true });
 
-      expect(mocks.systemMetadata.get).toHaveBeenCalledWith(SystemMetadataKey.FACIAL_RECOGNITION_STATE);
+      expect(mocks.systemMetadata.get).toHaveBeenCalledWith(SystemMetadataKey.FacialRecognitionState);
       expect(mocks.person.getLatestFaceDate).toHaveBeenCalledOnce();
       expect(mocks.person.getAllFaces).not.toHaveBeenCalled();
       expect(mocks.job.queueAll).not.toHaveBeenCalled();
@@ -690,10 +690,10 @@ describe(PersonService.name, () => {
       await sut.handleQueueRecognizeFaces({ force: true });
 
       expect(mocks.person.deleteFaces).not.toHaveBeenCalled();
-      expect(mocks.person.unassignFaces).toHaveBeenCalledWith({ sourceType: SourceType.MACHINE_LEARNING });
+      expect(mocks.person.unassignFaces).toHaveBeenCalledWith({ sourceType: SourceType.MachineLearning });
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FACIAL_RECOGNITION,
+          name: JobName.FacialRecognition,
           data: { id: faceStub.face1.id, deferred: false },
         },
       ]);
@@ -711,7 +711,7 @@ describe(PersonService.name, () => {
     it('should skip if machine learning is disabled', async () => {
       mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.machineLearningDisabled);
 
-      await expect(sut.handleDetectFaces({ id: 'foo' })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleDetectFaces({ id: 'foo' })).resolves.toBe(JobStatus.Skipped);
       expect(mocks.asset.getByIds).not.toHaveBeenCalled();
       expect(mocks.systemMetadata.get).toHaveBeenCalled();
     });
@@ -754,8 +754,8 @@ describe(PersonService.name, () => {
 
       expect(mocks.person.refreshFaces).toHaveBeenCalledWith([face], [], [faceSearch]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false } },
-        { name: JobName.FACIAL_RECOGNITION, data: { id: faceId } },
+        { name: JobName.QueueFacialRecognition, data: { force: false } },
+        { name: JobName.FacialRecognition, data: { id: faceId } },
       ]);
       expect(mocks.person.reassignFace).not.toHaveBeenCalled();
       expect(mocks.person.reassignFaces).not.toHaveBeenCalled();
@@ -790,8 +790,8 @@ describe(PersonService.name, () => {
 
       expect(mocks.person.refreshFaces).toHaveBeenCalledWith([face], [faceStub.primaryFace1.id], [faceSearch]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false } },
-        { name: JobName.FACIAL_RECOGNITION, data: { id: faceId } },
+        { name: JobName.QueueFacialRecognition, data: { force: false } },
+        { name: JobName.FacialRecognition, data: { id: faceId } },
       ]);
       expect(mocks.person.reassignFace).not.toHaveBeenCalled();
       expect(mocks.person.reassignFaces).not.toHaveBeenCalled();
@@ -830,8 +830,8 @@ describe(PersonService.name, () => {
 
       expect(mocks.person.refreshFaces).toHaveBeenCalledWith([face], [], [faceSearch]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false } },
-        { name: JobName.FACIAL_RECOGNITION, data: { id: faceId } },
+        { name: JobName.QueueFacialRecognition, data: { force: false } },
+        { name: JobName.FacialRecognition, data: { id: faceId } },
       ]);
       expect(mocks.person.reassignFace).not.toHaveBeenCalled();
       expect(mocks.person.reassignFaces).not.toHaveBeenCalled();
@@ -840,7 +840,7 @@ describe(PersonService.name, () => {
 
   describe('handleRecognizeFaces', () => {
     it('should fail if face does not exist', async () => {
-      expect(await sut.handleRecognizeFaces({ id: faceStub.face1.id })).toBe(JobStatus.FAILED);
+      expect(await sut.handleRecognizeFaces({ id: faceStub.face1.id })).toBe(JobStatus.Failed);
 
       expect(mocks.person.reassignFaces).not.toHaveBeenCalled();
       expect(mocks.person.create).not.toHaveBeenCalled();
@@ -850,7 +850,7 @@ describe(PersonService.name, () => {
       const face = { ...faceStub.face1, asset: null };
       mocks.person.getFaceForFacialRecognitionJob.mockResolvedValue(face);
 
-      expect(await sut.handleRecognizeFaces({ id: faceStub.face1.id })).toBe(JobStatus.FAILED);
+      expect(await sut.handleRecognizeFaces({ id: faceStub.face1.id })).toBe(JobStatus.Failed);
 
       expect(mocks.person.reassignFaces).not.toHaveBeenCalled();
       expect(mocks.person.create).not.toHaveBeenCalled();
@@ -859,7 +859,7 @@ describe(PersonService.name, () => {
     it('should skip if face already has an assigned person', async () => {
       mocks.person.getFaceForFacialRecognitionJob.mockResolvedValue(faceStub.face1);
 
-      expect(await sut.handleRecognizeFaces({ id: faceStub.face1.id })).toBe(JobStatus.SKIPPED);
+      expect(await sut.handleRecognizeFaces({ id: faceStub.face1.id })).toBe(JobStatus.Skipped);
 
       expect(mocks.person.reassignFaces).not.toHaveBeenCalled();
       expect(mocks.person.create).not.toHaveBeenCalled();
@@ -1008,7 +1008,7 @@ describe(PersonService.name, () => {
       await sut.handleRecognizeFaces({ id: faceStub.noPerson1.id });
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.FACIAL_RECOGNITION,
+        name: JobName.FacialRecognition,
         data: { id: faceStub.noPerson1.id, deferred: true },
       });
       expect(mocks.search.searchFaces).toHaveBeenCalledTimes(1);
@@ -1161,7 +1161,7 @@ describe(PersonService.name, () => {
         id: faceStub.face1.id,
         imageHeight: 1024,
         imageWidth: 1024,
-        sourceType: SourceType.MACHINE_LEARNING,
+        sourceType: SourceType.MachineLearning,
         person: mapPerson(personStub.withName),
       });
     });
diff --git a/server/src/services/person.service.ts b/server/src/services/person.service.ts
index af34e6eda9..d8925578d4 100644
--- a/server/src/services/person.service.ts
+++ b/server/src/services/person.service.ts
@@ -78,7 +78,7 @@ export class PersonService extends BaseService {
   }
 
   async reassignFaces(auth: AuthDto, personId: string, dto: AssetFaceUpdateDto): Promise<PersonResponseDto[]> {
-    await this.requireAccess({ auth, permission: Permission.PERSON_UPDATE, ids: [personId] });
+    await this.requireAccess({ auth, permission: Permission.PersonUpdate, ids: [personId] });
     const person = await this.findOrFail(personId);
     const result: PersonResponseDto[] = [];
     const changeFeaturePhoto: string[] = [];
@@ -86,7 +86,7 @@ export class PersonService extends BaseService {
       const faces = await this.personRepository.getFacesByIds([{ personId: data.personId, assetId: data.assetId }]);
 
       for (const face of faces) {
-        await this.requireAccess({ auth, permission: Permission.PERSON_CREATE, ids: [face.id] });
+        await this.requireAccess({ auth, permission: Permission.PersonCreate, ids: [face.id] });
         if (person.faceAssetId === null) {
           changeFeaturePhoto.push(person.id);
         }
@@ -107,8 +107,8 @@ export class PersonService extends BaseService {
   }
 
   async reassignFacesById(auth: AuthDto, personId: string, dto: FaceDto): Promise<PersonResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.PERSON_UPDATE, ids: [personId] });
-    await this.requireAccess({ auth, permission: Permission.PERSON_CREATE, ids: [dto.id] });
+    await this.requireAccess({ auth, permission: Permission.PersonUpdate, ids: [personId] });
+    await this.requireAccess({ auth, permission: Permission.PersonCreate, ids: [dto.id] });
     const face = await this.personRepository.getFaceById(dto.id);
     const person = await this.findOrFail(personId);
 
@@ -124,7 +124,7 @@ export class PersonService extends BaseService {
   }
 
   async getFacesById(auth: AuthDto, dto: FaceDto): Promise<AssetFaceResponseDto[]> {
-    await this.requireAccess({ auth, permission: Permission.ASSET_READ, ids: [dto.id] });
+    await this.requireAccess({ auth, permission: Permission.AssetRead, ids: [dto.id] });
     const faces = await this.personRepository.getFaces(dto.id);
     return faces.map((asset) => mapFaces(asset, auth));
   }
@@ -140,7 +140,7 @@ export class PersonService extends BaseService {
 
       if (assetFace) {
         await this.personRepository.update({ id: personId, faceAssetId: assetFace.id });
-        jobs.push({ name: JobName.GENERATE_PERSON_THUMBNAIL, data: { id: personId } });
+        jobs.push({ name: JobName.GeneratePersonThumbnail, data: { id: personId } });
       }
     }
 
@@ -148,17 +148,17 @@ export class PersonService extends BaseService {
   }
 
   async getById(auth: AuthDto, id: string): Promise<PersonResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.PERSON_READ, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.PersonRead, ids: [id] });
     return this.findOrFail(id).then(mapPerson);
   }
 
   async getStatistics(auth: AuthDto, id: string): Promise<PersonStatisticsResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.PERSON_READ, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.PersonRead, ids: [id] });
     return this.personRepository.getStatistics(id);
   }
 
   async getThumbnail(auth: AuthDto, id: string): Promise<ImmichFileResponse> {
-    await this.requireAccess({ auth, permission: Permission.PERSON_READ, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.PersonRead, ids: [id] });
     const person = await this.personRepository.getById(id);
     if (!person || !person.thumbnailPath) {
       throw new NotFoundException();
@@ -167,7 +167,7 @@ export class PersonService extends BaseService {
     return new ImmichFileResponse({
       path: person.thumbnailPath,
       contentType: mimeTypes.lookup(person.thumbnailPath),
-      cacheControl: CacheControl.PRIVATE_WITHOUT_CACHE,
+      cacheControl: CacheControl.PrivateWithoutCache,
     });
   }
 
@@ -185,13 +185,13 @@ export class PersonService extends BaseService {
   }
 
   async update(auth: AuthDto, id: string, dto: PersonUpdateDto): Promise<PersonResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.PERSON_UPDATE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.PersonUpdate, ids: [id] });
 
     const { name, birthDate, isHidden, featureFaceAssetId: assetId, isFavorite, color } = dto;
     // TODO: set by faceId directly
     let faceId: string | undefined = undefined;
     if (assetId) {
-      await this.requireAccess({ auth, permission: Permission.ASSET_READ, ids: [assetId] });
+      await this.requireAccess({ auth, permission: Permission.AssetRead, ids: [assetId] });
       const [face] = await this.personRepository.getFacesByIds([{ personId: id, assetId }]);
       if (!face) {
         throw new BadRequestException('Invalid assetId for feature face');
@@ -211,7 +211,7 @@ export class PersonService extends BaseService {
     });
 
     if (assetId) {
-      await this.jobRepository.queue({ name: JobName.GENERATE_PERSON_THUMBNAIL, data: { id } });
+      await this.jobRepository.queue({ name: JobName.GeneratePersonThumbnail, data: { id } });
     }
 
     return mapPerson(person);
@@ -242,7 +242,7 @@ export class PersonService extends BaseService {
   }
 
   async deleteAll(auth: AuthDto, { ids }: BulkIdsDto): Promise<void> {
-    await this.requireAccess({ auth, permission: Permission.PERSON_DELETE, ids });
+    await this.requireAccess({ auth, permission: Permission.PersonDelete, ids });
     const people = await this.personRepository.getForPeopleDelete(ids);
     await this.removeAllPeople(people);
   }
@@ -254,22 +254,22 @@ export class PersonService extends BaseService {
     this.logger.debug(`Deleted ${people.length} people`);
   }
 
-  @OnJob({ name: JobName.PERSON_CLEANUP, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.PersonCleanup, queue: QueueName.BackgroundTask })
   async handlePersonCleanup(): Promise<JobStatus> {
     const people = await this.personRepository.getAllWithoutFaces();
     await this.removeAllPeople(people);
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.QUEUE_FACE_DETECTION, queue: QueueName.FACE_DETECTION })
-  async handleQueueDetectFaces({ force }: JobOf<JobName.QUEUE_FACE_DETECTION>): Promise<JobStatus> {
+  @OnJob({ name: JobName.QueueFaceDetection, queue: QueueName.FaceDetection })
+  async handleQueueDetectFaces({ force }: JobOf<JobName.QueueFaceDetection>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: false });
     if (!isFacialRecognitionEnabled(machineLearning)) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     if (force) {
-      await this.personRepository.deleteFaces({ sourceType: SourceType.MACHINE_LEARNING });
+      await this.personRepository.deleteFaces({ sourceType: SourceType.MachineLearning });
       await this.handlePersonCleanup();
       await this.personRepository.vacuum({ reindexVectors: true });
     }
@@ -277,7 +277,7 @@ export class PersonService extends BaseService {
     let jobs: JobItem[] = [];
     const assets = this.assetJobRepository.streamForDetectFacesJob(force);
     for await (const asset of assets) {
-      jobs.push({ name: JobName.FACE_DETECTION, data: { id: asset.id } });
+      jobs.push({ name: JobName.FaceDetection, data: { id: asset.id } });
 
       if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(jobs);
@@ -288,27 +288,27 @@ export class PersonService extends BaseService {
     await this.jobRepository.queueAll(jobs);
 
     if (force === undefined) {
-      await this.jobRepository.queue({ name: JobName.PERSON_CLEANUP });
+      await this.jobRepository.queue({ name: JobName.PersonCleanup });
     }
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.FACE_DETECTION, queue: QueueName.FACE_DETECTION })
-  async handleDetectFaces({ id }: JobOf<JobName.FACE_DETECTION>): Promise<JobStatus> {
+  @OnJob({ name: JobName.FaceDetection, queue: QueueName.FaceDetection })
+  async handleDetectFaces({ id }: JobOf<JobName.FaceDetection>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: true });
     if (!isFacialRecognitionEnabled(machineLearning)) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const asset = await this.assetJobRepository.getForDetectFacesJob(id);
     const previewFile = asset?.files[0];
     if (!asset || asset.files.length !== 1 || !previewFile) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
-    if (asset.visibility === AssetVisibility.HIDDEN) {
-      return JobStatus.SKIPPED;
+    if (asset.visibility === AssetVisibility.Hidden) {
+      return JobStatus.Skipped;
     }
 
     const { imageHeight, imageWidth, faces } = await this.machineLearningRepository.detectFaces(
@@ -323,7 +323,7 @@ export class PersonService extends BaseService {
     const mlFaceIds = new Set<string>();
 
     for (const face of asset.faces) {
-      if (face.sourceType === SourceType.MACHINE_LEARNING) {
+      if (face.sourceType === SourceType.MachineLearning) {
         mlFaceIds.add(face.id);
       }
     }
@@ -368,15 +368,15 @@ export class PersonService extends BaseService {
 
     if (facesToAdd.length > 0) {
       this.logger.log(`Detected ${facesToAdd.length} new faces in asset ${id}`);
-      const jobs = facesToAdd.map((face) => ({ name: JobName.FACIAL_RECOGNITION, data: { id: face.id } }) as const);
-      await this.jobRepository.queueAll([{ name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false } }, ...jobs]);
+      const jobs = facesToAdd.map((face) => ({ name: JobName.FacialRecognition, data: { id: face.id } }) as const);
+      await this.jobRepository.queueAll([{ name: JobName.QueueFacialRecognition, data: { force: false } }, ...jobs]);
     } else if (embeddings.length > 0) {
       this.logger.log(`Added ${embeddings.length} face embeddings for asset ${id}`);
     }
 
     await this.assetRepository.upsertJobStatus({ assetId: asset.id, facesRecognizedAt: new Date() });
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private iou(
@@ -396,50 +396,50 @@ export class PersonService extends BaseService {
     return intersection / union;
   }
 
-  @OnJob({ name: JobName.QUEUE_FACIAL_RECOGNITION, queue: QueueName.FACIAL_RECOGNITION })
-  async handleQueueRecognizeFaces({ force, nightly }: JobOf<JobName.QUEUE_FACIAL_RECOGNITION>): Promise<JobStatus> {
+  @OnJob({ name: JobName.QueueFacialRecognition, queue: QueueName.FacialRecognition })
+  async handleQueueRecognizeFaces({ force, nightly }: JobOf<JobName.QueueFacialRecognition>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: false });
     if (!isFacialRecognitionEnabled(machineLearning)) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
-    await this.jobRepository.waitForQueueCompletion(QueueName.THUMBNAIL_GENERATION, QueueName.FACE_DETECTION);
+    await this.jobRepository.waitForQueueCompletion(QueueName.ThumbnailGeneration, QueueName.FaceDetection);
 
     if (nightly) {
       const [state, latestFaceDate] = await Promise.all([
-        this.systemMetadataRepository.get(SystemMetadataKey.FACIAL_RECOGNITION_STATE),
+        this.systemMetadataRepository.get(SystemMetadataKey.FacialRecognitionState),
         this.personRepository.getLatestFaceDate(),
       ]);
 
       if (state?.lastRun && latestFaceDate && state.lastRun > latestFaceDate) {
         this.logger.debug('Skipping facial recognition nightly since no face has been added since the last run');
-        return JobStatus.SKIPPED;
+        return JobStatus.Skipped;
       }
     }
 
-    const { waiting } = await this.jobRepository.getJobCounts(QueueName.FACIAL_RECOGNITION);
+    const { waiting } = await this.jobRepository.getJobCounts(QueueName.FacialRecognition);
 
     if (force) {
-      await this.personRepository.unassignFaces({ sourceType: SourceType.MACHINE_LEARNING });
+      await this.personRepository.unassignFaces({ sourceType: SourceType.MachineLearning });
       await this.handlePersonCleanup();
       await this.personRepository.vacuum({ reindexVectors: false });
     } else if (waiting) {
       this.logger.debug(
         `Skipping facial recognition queueing because ${waiting} job${waiting > 1 ? 's are' : ' is'} already queued`,
       );
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
-    await this.databaseRepository.prewarm(VectorIndex.FACE);
+    await this.databaseRepository.prewarm(VectorIndex.Face);
 
     const lastRun = new Date().toISOString();
     const facePagination = this.personRepository.getAllFaces(
-      force ? undefined : { personId: null, sourceType: SourceType.MACHINE_LEARNING },
+      force ? undefined : { personId: null, sourceType: SourceType.MachineLearning },
     );
 
-    let jobs: { name: JobName.FACIAL_RECOGNITION; data: { id: string; deferred: false } }[] = [];
+    let jobs: { name: JobName.FacialRecognition; data: { id: string; deferred: false } }[] = [];
     for await (const face of facePagination) {
-      jobs.push({ name: JobName.FACIAL_RECOGNITION, data: { id: face.id, deferred: false } });
+      jobs.push({ name: JobName.FacialRecognition, data: { id: face.id, deferred: false } });
 
       if (jobs.length === JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(jobs);
@@ -449,37 +449,37 @@ export class PersonService extends BaseService {
 
     await this.jobRepository.queueAll(jobs);
 
-    await this.systemMetadataRepository.set(SystemMetadataKey.FACIAL_RECOGNITION_STATE, { lastRun });
+    await this.systemMetadataRepository.set(SystemMetadataKey.FacialRecognitionState, { lastRun });
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.FACIAL_RECOGNITION, queue: QueueName.FACIAL_RECOGNITION })
-  async handleRecognizeFaces({ id, deferred }: JobOf<JobName.FACIAL_RECOGNITION>): Promise<JobStatus> {
+  @OnJob({ name: JobName.FacialRecognition, queue: QueueName.FacialRecognition })
+  async handleRecognizeFaces({ id, deferred }: JobOf<JobName.FacialRecognition>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: true });
     if (!isFacialRecognitionEnabled(machineLearning)) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const face = await this.personRepository.getFaceForFacialRecognitionJob(id);
     if (!face || !face.asset) {
       this.logger.warn(`Face ${id} not found`);
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
-    if (face.sourceType !== SourceType.MACHINE_LEARNING) {
+    if (face.sourceType !== SourceType.MachineLearning) {
       this.logger.warn(`Skipping face ${id} due to source ${face.sourceType}`);
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     if (!face.faceSearch?.embedding) {
       this.logger.warn(`Face ${id} does not have an embedding`);
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     if (face.personId) {
       this.logger.debug(`Face ${id} already has a person assigned`);
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const matches = await this.searchRepository.searchFaces({
@@ -493,18 +493,18 @@ export class PersonService extends BaseService {
     // `matches` also includes the face itself
     if (machineLearning.facialRecognition.minFaces > 1 && matches.length <= 1) {
       this.logger.debug(`Face ${id} only matched the face itself, skipping`);
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     this.logger.debug(`Face ${id} has ${matches.length} matches`);
 
     const isCore =
       matches.length >= machineLearning.facialRecognition.minFaces &&
-      face.asset.visibility === AssetVisibility.TIMELINE;
+      face.asset.visibility === AssetVisibility.Timeline;
     if (!isCore && !deferred) {
       this.logger.debug(`Deferring non-core face ${id} for later processing`);
-      await this.jobRepository.queue({ name: JobName.FACIAL_RECOGNITION, data: { id, deferred: true } });
-      return JobStatus.SKIPPED;
+      await this.jobRepository.queue({ name: JobName.FacialRecognition, data: { id, deferred: true } });
+      return JobStatus.Skipped;
     }
 
     let personId = matches.find((match) => match.personId)?.personId;
@@ -526,7 +526,7 @@ export class PersonService extends BaseService {
     if (isCore && !personId) {
       this.logger.log(`Creating new person for face ${id}`);
       const newPerson = await this.personRepository.create({ ownerId: face.asset.ownerId, faceAssetId: face.id });
-      await this.jobRepository.queue({ name: JobName.GENERATE_PERSON_THUMBNAIL, data: { id: newPerson.id } });
+      await this.jobRepository.queue({ name: JobName.GeneratePersonThumbnail, data: { id: newPerson.id } });
       personId = newPerson.id;
     }
 
@@ -535,19 +535,19 @@ export class PersonService extends BaseService {
       await this.personRepository.reassignFaces({ faceIds: [id], newPersonId: personId });
     }
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.MIGRATE_PERSON, queue: QueueName.MIGRATION })
-  async handlePersonMigration({ id }: JobOf<JobName.MIGRATE_PERSON>): Promise<JobStatus> {
+  @OnJob({ name: JobName.MigratePerson, queue: QueueName.Migration })
+  async handlePersonMigration({ id }: JobOf<JobName.MigratePerson>): Promise<JobStatus> {
     const person = await this.personRepository.getById(id);
     if (!person) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
-    await this.storageCore.movePersonFile(person, PersonPathType.FACE);
+    await this.storageCore.movePersonFile(person, PersonPathType.Face);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   async mergePerson(auth: AuthDto, id: string, dto: MergePersonDto): Promise<BulkIdResponseDto[]> {
@@ -556,7 +556,7 @@ export class PersonService extends BaseService {
       throw new BadRequestException('Cannot merge a person into themselves');
     }
 
-    await this.requireAccess({ auth, permission: Permission.PERSON_UPDATE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.PersonUpdate, ids: [id] });
     let primaryPerson = await this.findOrFail(id);
     const primaryName = primaryPerson.name || primaryPerson.id;
 
@@ -564,7 +564,7 @@ export class PersonService extends BaseService {
 
     const allowedIds = await this.checkAccess({
       auth,
-      permission: Permission.PERSON_MERGE,
+      permission: Permission.PersonMerge,
       ids: mergeIds,
     });
 
@@ -623,8 +623,8 @@ export class PersonService extends BaseService {
   // TODO return a asset face response
   async createFace(auth: AuthDto, dto: AssetFaceCreateDto): Promise<void> {
     await Promise.all([
-      this.requireAccess({ auth, permission: Permission.ASSET_READ, ids: [dto.assetId] }),
-      this.requireAccess({ auth, permission: Permission.PERSON_READ, ids: [dto.personId] }),
+      this.requireAccess({ auth, permission: Permission.AssetRead, ids: [dto.assetId] }),
+      this.requireAccess({ auth, permission: Permission.PersonRead, ids: [dto.personId] }),
     ]);
 
     await this.personRepository.createAssetFace({
@@ -636,12 +636,12 @@ export class PersonService extends BaseService {
       boundingBoxX2: dto.x + dto.width,
       boundingBoxY1: dto.y,
       boundingBoxY2: dto.y + dto.height,
-      sourceType: SourceType.MANUAL,
+      sourceType: SourceType.Manual,
     });
   }
 
   async deleteFace(auth: AuthDto, id: string, dto: AssetFaceDeleteDto): Promise<void> {
-    await this.requireAccess({ auth, permission: Permission.FACE_DELETE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.FaceDelete, ids: [id] });
 
     return dto.force ? this.personRepository.deleteAssetFace(id) : this.personRepository.softDeleteAssetFaces(id);
   }
diff --git a/server/src/services/search.service.ts b/server/src/services/search.service.ts
index a10c01e8d3..1c75c4a434 100644
--- a/server/src/services/search.service.ts
+++ b/server/src/services/search.service.ts
@@ -46,7 +46,7 @@ export class SearchService extends BaseService {
   }
 
   async searchMetadata(auth: AuthDto, dto: MetadataSearchDto): Promise<SearchResponseDto> {
-    if (dto.visibility === AssetVisibility.LOCKED) {
+    if (dto.visibility === AssetVisibility.Locked) {
       requireElevatedPermission(auth);
     }
 
@@ -65,7 +65,7 @@ export class SearchService extends BaseService {
         ...dto,
         checksum,
         userIds,
-        orderDirection: dto.order ?? AssetOrder.DESC,
+        orderDirection: dto.order ?? AssetOrder.Desc,
       },
     );
 
@@ -82,7 +82,7 @@ export class SearchService extends BaseService {
   }
 
   async searchRandom(auth: AuthDto, dto: RandomSearchDto): Promise<AssetResponseDto[]> {
-    if (dto.visibility === AssetVisibility.LOCKED) {
+    if (dto.visibility === AssetVisibility.Locked) {
       requireElevatedPermission(auth);
     }
 
@@ -92,7 +92,7 @@ export class SearchService extends BaseService {
   }
 
   async searchSmart(auth: AuthDto, dto: SmartSearchDto): Promise<SearchResponseDto> {
-    if (dto.visibility === AssetVisibility.LOCKED) {
+    if (dto.visibility === AssetVisibility.Locked) {
       requireElevatedPermission(auth);
     }
 
diff --git a/server/src/services/server.service.spec.ts b/server/src/services/server.service.spec.ts
index 05ebda6a94..0ddf3d69b1 100644
--- a/server/src/services/server.service.spec.ts
+++ b/server/src/services/server.service.spec.ts
@@ -256,7 +256,7 @@ describe(ServerService.name, () => {
       const license = { licenseKey: 'IMSV-license-key', activationKey: 'activation-key' };
       await sut.setLicense(license);
 
-      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.LICENSE, expect.any(Object));
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.License, expect.any(Object));
     });
 
     it('should not save license if invalid', async () => {
diff --git a/server/src/services/server.service.ts b/server/src/services/server.service.ts
index 5ad93b40ef..dae484cce8 100644
--- a/server/src/services/server.service.ts
+++ b/server/src/services/server.service.ts
@@ -27,7 +27,7 @@ export class ServerService extends BaseService {
   async onBootstrap(): Promise<void> {
     const featureFlags = await this.getFeatures();
     if (featureFlags.configFile) {
-      await this.systemMetadataRepository.set(SystemMetadataKey.ADMIN_ONBOARDING, {
+      await this.systemMetadataRepository.set(SystemMetadataKey.AdminOnboarding, {
         isOnboarded: true,
       });
     }
@@ -38,7 +38,7 @@ export class ServerService extends BaseService {
     const version = `v${serverVersion.toString()}`;
     const { buildMetadata } = this.configRepository.getEnv();
     const buildVersions = await this.serverInfoRepository.getBuildVersions();
-    const licensed = await this.systemMetadataRepository.get(SystemMetadataKey.LICENSE);
+    const licensed = await this.systemMetadataRepository.get(SystemMetadataKey.License);
 
     return {
       version,
@@ -60,7 +60,7 @@ export class ServerService extends BaseService {
   }
 
   async getStorage(): Promise<ServerStorageResponseDto> {
-    const libraryBase = StorageCore.getBaseFolder(StorageFolder.LIBRARY);
+    const libraryBase = StorageCore.getBaseFolder(StorageFolder.Library);
     const diskInfo = await this.storageRepository.checkDiskUsage(libraryBase);
 
     const usagePercentage = (((diskInfo.total - diskInfo.free) / diskInfo.total) * 100).toFixed(2);
@@ -111,7 +111,7 @@ export class ServerService extends BaseService {
   async getSystemConfig(): Promise<ServerConfigDto> {
     const config = await this.getConfig({ withCache: false });
     const isInitialized = await this.userRepository.hasAdmin();
-    const onboarding = await this.systemMetadataRepository.get(SystemMetadataKey.ADMIN_ONBOARDING);
+    const onboarding = await this.systemMetadataRepository.get(SystemMetadataKey.AdminOnboarding);
 
     return {
       loginPageMessage: config.server.loginPageMessage,
@@ -163,11 +163,11 @@ export class ServerService extends BaseService {
   }
 
   async deleteLicense(): Promise<void> {
-    await this.systemMetadataRepository.delete(SystemMetadataKey.LICENSE);
+    await this.systemMetadataRepository.delete(SystemMetadataKey.License);
   }
 
   async getLicense(): Promise<LicenseResponseDto> {
-    const license = await this.systemMetadataRepository.get(SystemMetadataKey.LICENSE);
+    const license = await this.systemMetadataRepository.get(SystemMetadataKey.License);
     if (!license) {
       throw new NotFoundException();
     }
@@ -186,7 +186,7 @@ export class ServerService extends BaseService {
 
     const licenseData = { ...dto, activatedAt: new Date() };
 
-    await this.systemMetadataRepository.set(SystemMetadataKey.LICENSE, licenseData);
+    await this.systemMetadataRepository.set(SystemMetadataKey.License, licenseData);
 
     return licenseData;
   }
diff --git a/server/src/services/session.service.spec.ts b/server/src/services/session.service.spec.ts
index 7ac338da80..3cbad28389 100644
--- a/server/src/services/session.service.spec.ts
+++ b/server/src/services/session.service.spec.ts
@@ -19,7 +19,7 @@ describe('SessionService', () => {
   describe('handleCleanup', () => {
     it('should clean sessions', async () => {
       mocks.session.cleanup.mockResolvedValue([]);
-      await expect(sut.handleCleanup()).resolves.toEqual(JobStatus.SUCCESS);
+      await expect(sut.handleCleanup()).resolves.toEqual(JobStatus.Success);
     });
   });
 
diff --git a/server/src/services/session.service.ts b/server/src/services/session.service.ts
index 198e380c53..b7bb5cb6fa 100644
--- a/server/src/services/session.service.ts
+++ b/server/src/services/session.service.ts
@@ -14,7 +14,7 @@ import { BaseService } from 'src/services/base.service';
 
 @Injectable()
 export class SessionService extends BaseService {
-  @OnJob({ name: JobName.CLEAN_OLD_SESSION_TOKENS, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.CleanOldSessionTokens, queue: QueueName.BackgroundTask })
   async handleCleanup(): Promise<JobStatus> {
     const sessions = await this.sessionRepository.cleanup();
     for (const session of sessions) {
@@ -23,7 +23,7 @@ export class SessionService extends BaseService {
 
     this.logger.log(`Deleted ${sessions.length} expired session tokens`);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   async create(auth: AuthDto, dto: SessionCreateDto): Promise<SessionCreateResponseDto> {
@@ -51,7 +51,7 @@ export class SessionService extends BaseService {
   }
 
   async update(auth: AuthDto, id: string, dto: SessionUpdateDto): Promise<SessionResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.SESSION_UPDATE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.SessionUpdate, ids: [id] });
 
     if (Object.values(dto).filter((prop) => prop !== undefined).length === 0) {
       throw new BadRequestException('No fields to update');
@@ -65,12 +65,12 @@ export class SessionService extends BaseService {
   }
 
   async delete(auth: AuthDto, id: string): Promise<void> {
-    await this.requireAccess({ auth, permission: Permission.AUTH_DEVICE_DELETE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AuthDeviceDelete, ids: [id] });
     await this.sessionRepository.delete(id);
   }
 
   async lock(auth: AuthDto, id: string): Promise<void> {
-    await this.requireAccess({ auth, permission: Permission.SESSION_LOCK, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.SessionLock, ids: [id] });
     await this.sessionRepository.update(id, { pinExpiresAt: null });
   }
 
diff --git a/server/src/services/shared-link.service.spec.ts b/server/src/services/shared-link.service.spec.ts
index b3b4c4b1cf..8e09580d55 100644
--- a/server/src/services/shared-link.service.spec.ts
+++ b/server/src/services/shared-link.service.spec.ts
@@ -95,26 +95,26 @@ describe(SharedLinkService.name, () => {
 
   describe('create', () => {
     it('should not allow an album shared link without an albumId', async () => {
-      await expect(sut.create(authStub.admin, { type: SharedLinkType.ALBUM, assetIds: [] })).rejects.toBeInstanceOf(
+      await expect(sut.create(authStub.admin, { type: SharedLinkType.Album, assetIds: [] })).rejects.toBeInstanceOf(
         BadRequestException,
       );
     });
 
     it('should not allow non-owners to create album shared links', async () => {
       await expect(
-        sut.create(authStub.admin, { type: SharedLinkType.ALBUM, assetIds: [], albumId: 'album-1' }),
+        sut.create(authStub.admin, { type: SharedLinkType.Album, assetIds: [], albumId: 'album-1' }),
       ).rejects.toBeInstanceOf(BadRequestException);
     });
 
     it('should not allow individual shared links with no assets', async () => {
       await expect(
-        sut.create(authStub.admin, { type: SharedLinkType.INDIVIDUAL, assetIds: [] }),
+        sut.create(authStub.admin, { type: SharedLinkType.Individual, assetIds: [] }),
       ).rejects.toBeInstanceOf(BadRequestException);
     });
 
     it('should require asset ownership to make an individual shared link', async () => {
       await expect(
-        sut.create(authStub.admin, { type: SharedLinkType.INDIVIDUAL, assetIds: ['asset-1'] }),
+        sut.create(authStub.admin, { type: SharedLinkType.Individual, assetIds: ['asset-1'] }),
       ).rejects.toBeInstanceOf(BadRequestException);
     });
 
@@ -122,14 +122,14 @@ describe(SharedLinkService.name, () => {
       mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.oneAsset.id]));
       mocks.sharedLink.create.mockResolvedValue(sharedLinkStub.valid);
 
-      await sut.create(authStub.admin, { type: SharedLinkType.ALBUM, albumId: albumStub.oneAsset.id });
+      await sut.create(authStub.admin, { type: SharedLinkType.Album, albumId: albumStub.oneAsset.id });
 
       expect(mocks.access.album.checkOwnerAccess).toHaveBeenCalledWith(
         authStub.admin.user.id,
         new Set([albumStub.oneAsset.id]),
       );
       expect(mocks.sharedLink.create).toHaveBeenCalledWith({
-        type: SharedLinkType.ALBUM,
+        type: SharedLinkType.Album,
         userId: authStub.admin.user.id,
         albumId: albumStub.oneAsset.id,
         allowDownload: true,
@@ -146,7 +146,7 @@ describe(SharedLinkService.name, () => {
       mocks.sharedLink.create.mockResolvedValue(sharedLinkStub.individual);
 
       await sut.create(authStub.admin, {
-        type: SharedLinkType.INDIVIDUAL,
+        type: SharedLinkType.Individual,
         assetIds: [assetStub.image.id],
         showMetadata: true,
         allowDownload: true,
@@ -159,7 +159,7 @@ describe(SharedLinkService.name, () => {
         false,
       );
       expect(mocks.sharedLink.create).toHaveBeenCalledWith({
-        type: SharedLinkType.INDIVIDUAL,
+        type: SharedLinkType.Individual,
         userId: authStub.admin.user.id,
         albumId: null,
         allowDownload: true,
@@ -177,7 +177,7 @@ describe(SharedLinkService.name, () => {
       mocks.sharedLink.create.mockResolvedValue(sharedLinkStub.individual);
 
       await sut.create(authStub.admin, {
-        type: SharedLinkType.INDIVIDUAL,
+        type: SharedLinkType.Individual,
         assetIds: [assetStub.image.id],
         showMetadata: false,
         allowDownload: true,
@@ -190,7 +190,7 @@ describe(SharedLinkService.name, () => {
         false,
       );
       expect(mocks.sharedLink.create).toHaveBeenCalledWith({
-        type: SharedLinkType.INDIVIDUAL,
+        type: SharedLinkType.Individual,
         userId: authStub.admin.user.id,
         albumId: null,
         allowDownload: false,
diff --git a/server/src/services/shared-link.service.ts b/server/src/services/shared-link.service.ts
index c70b31a3a1..9f8e238c43 100644
--- a/server/src/services/shared-link.service.ts
+++ b/server/src/services/shared-link.service.ts
@@ -45,20 +45,20 @@ export class SharedLinkService extends BaseService {
 
   async create(auth: AuthDto, dto: SharedLinkCreateDto): Promise<SharedLinkResponseDto> {
     switch (dto.type) {
-      case SharedLinkType.ALBUM: {
+      case SharedLinkType.Album: {
         if (!dto.albumId) {
           throw new BadRequestException('Invalid albumId');
         }
-        await this.requireAccess({ auth, permission: Permission.ALBUM_SHARE, ids: [dto.albumId] });
+        await this.requireAccess({ auth, permission: Permission.AlbumShare, ids: [dto.albumId] });
         break;
       }
 
-      case SharedLinkType.INDIVIDUAL: {
+      case SharedLinkType.Individual: {
         if (!dto.assetIds || dto.assetIds.length === 0) {
           throw new BadRequestException('Invalid assetIds');
         }
 
-        await this.requireAccess({ auth, permission: Permission.ASSET_SHARE, ids: dto.assetIds });
+        await this.requireAccess({ auth, permission: Permission.AssetShare, ids: dto.assetIds });
 
         break;
       }
@@ -113,7 +113,7 @@ export class SharedLinkService extends BaseService {
   async addAssets(auth: AuthDto, id: string, dto: AssetIdsDto): Promise<AssetIdsResponseDto[]> {
     const sharedLink = await this.findOrFail(auth.user.id, id);
 
-    if (sharedLink.type !== SharedLinkType.INDIVIDUAL) {
+    if (sharedLink.type !== SharedLinkType.Individual) {
       throw new BadRequestException('Invalid shared link type');
     }
 
@@ -121,7 +121,7 @@ export class SharedLinkService extends BaseService {
     const notPresentAssetIds = dto.assetIds.filter((assetId) => !existingAssetIds.has(assetId));
     const allowedAssetIds = await this.checkAccess({
       auth,
-      permission: Permission.ASSET_SHARE,
+      permission: Permission.AssetShare,
       ids: notPresentAssetIds,
     });
 
@@ -153,7 +153,7 @@ export class SharedLinkService extends BaseService {
   async removeAssets(auth: AuthDto, id: string, dto: AssetIdsDto): Promise<AssetIdsResponseDto[]> {
     const sharedLink = await this.findOrFail(auth.user.id, id);
 
-    if (sharedLink.type !== SharedLinkType.INDIVIDUAL) {
+    if (sharedLink.type !== SharedLinkType.Individual) {
       throw new BadRequestException('Invalid shared link type');
     }
 
diff --git a/server/src/services/smart-info.service.spec.ts b/server/src/services/smart-info.service.spec.ts
index a6529fa623..edd9f4663a 100644
--- a/server/src/services/smart-info.service.spec.ts
+++ b/server/src/services/smart-info.service.spec.ts
@@ -14,7 +14,7 @@ describe(SmartInfoService.name, () => {
     ({ sut, mocks } = newTestService(SmartInfoService));
 
     mocks.asset.getByIds.mockResolvedValue([assetStub.image]);
-    mocks.config.getWorker.mockReturnValue(ImmichWorker.MICROSERVICES);
+    mocks.config.getWorker.mockReturnValue(ImmichWorker.Microservices);
   });
 
   it('should work', () => {
@@ -160,7 +160,7 @@ describe(SmartInfoService.name, () => {
       await sut.handleQueueEncodeClip({ force: false });
 
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.SMART_SEARCH, data: { id: assetStub.image.id } },
+        { name: JobName.SmartSearch, data: { id: assetStub.image.id } },
       ]);
       expect(mocks.assetJob.streamForEncodeClip).toHaveBeenCalledWith(false);
       expect(mocks.database.setDimensionSize).not.toHaveBeenCalled();
@@ -172,7 +172,7 @@ describe(SmartInfoService.name, () => {
       await sut.handleQueueEncodeClip({ force: true });
 
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.SMART_SEARCH, data: { id: assetStub.image.id } },
+        { name: JobName.SmartSearch, data: { id: assetStub.image.id } },
       ]);
       expect(mocks.assetJob.streamForEncodeClip).toHaveBeenCalledWith(true);
       expect(mocks.database.setDimensionSize).toHaveBeenCalledExactlyOnceWith(512);
@@ -183,7 +183,7 @@ describe(SmartInfoService.name, () => {
     it('should do nothing if machine learning is disabled', async () => {
       mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.machineLearningDisabled);
 
-      expect(await sut.handleEncodeClip({ id: '123' })).toEqual(JobStatus.SKIPPED);
+      expect(await sut.handleEncodeClip({ id: '123' })).toEqual(JobStatus.Skipped);
 
       expect(mocks.asset.getByIds).not.toHaveBeenCalled();
       expect(mocks.machineLearning.encodeImage).not.toHaveBeenCalled();
@@ -192,7 +192,7 @@ describe(SmartInfoService.name, () => {
     it('should skip assets without a resize path', async () => {
       mocks.assetJob.getForClipEncoding.mockResolvedValue({ ...assetStub.noResizePath, files: [] });
 
-      expect(await sut.handleEncodeClip({ id: assetStub.noResizePath.id })).toEqual(JobStatus.FAILED);
+      expect(await sut.handleEncodeClip({ id: assetStub.noResizePath.id })).toEqual(JobStatus.Failed);
 
       expect(mocks.search.upsert).not.toHaveBeenCalled();
       expect(mocks.machineLearning.encodeImage).not.toHaveBeenCalled();
@@ -202,7 +202,7 @@ describe(SmartInfoService.name, () => {
       mocks.machineLearning.encodeImage.mockResolvedValue('[0.01, 0.02, 0.03]');
       mocks.assetJob.getForClipEncoding.mockResolvedValue({ ...assetStub.image, files: [assetStub.image.files[1]] });
 
-      expect(await sut.handleEncodeClip({ id: assetStub.image.id })).toEqual(JobStatus.SUCCESS);
+      expect(await sut.handleEncodeClip({ id: assetStub.image.id })).toEqual(JobStatus.Success);
 
       expect(mocks.machineLearning.encodeImage).toHaveBeenCalledWith(
         ['http://immich-machine-learning:3003'],
@@ -218,7 +218,7 @@ describe(SmartInfoService.name, () => {
         files: [assetStub.image.files[1]],
       });
 
-      expect(await sut.handleEncodeClip({ id: assetStub.livePhotoMotionAsset.id })).toEqual(JobStatus.SKIPPED);
+      expect(await sut.handleEncodeClip({ id: assetStub.livePhotoMotionAsset.id })).toEqual(JobStatus.Skipped);
 
       expect(mocks.machineLearning.encodeImage).not.toHaveBeenCalled();
       expect(mocks.search.upsert).not.toHaveBeenCalled();
@@ -227,7 +227,7 @@ describe(SmartInfoService.name, () => {
     it('should fail if asset could not be found', async () => {
       mocks.assetJob.getForClipEncoding.mockResolvedValue(void 0);
 
-      expect(await sut.handleEncodeClip({ id: assetStub.image.id })).toEqual(JobStatus.FAILED);
+      expect(await sut.handleEncodeClip({ id: assetStub.image.id })).toEqual(JobStatus.Failed);
 
       expect(mocks.machineLearning.encodeImage).not.toHaveBeenCalled();
       expect(mocks.search.upsert).not.toHaveBeenCalled();
@@ -238,7 +238,7 @@ describe(SmartInfoService.name, () => {
       mocks.database.isBusy.mockReturnValue(true);
       mocks.assetJob.getForClipEncoding.mockResolvedValue({ ...assetStub.image, files: [assetStub.image.files[1]] });
 
-      expect(await sut.handleEncodeClip({ id: assetStub.image.id })).toEqual(JobStatus.SUCCESS);
+      expect(await sut.handleEncodeClip({ id: assetStub.image.id })).toEqual(JobStatus.Success);
 
       expect(mocks.database.wait).toHaveBeenCalledWith(512);
       expect(mocks.machineLearning.encodeImage).toHaveBeenCalledWith(
diff --git a/server/src/services/smart-info.service.ts b/server/src/services/smart-info.service.ts
index d6e30c6d86..5ce47593f4 100644
--- a/server/src/services/smart-info.service.ts
+++ b/server/src/services/smart-info.service.ts
@@ -10,12 +10,12 @@ import { getCLIPModelInfo, isSmartSearchEnabled } from 'src/utils/misc';
 
 @Injectable()
 export class SmartInfoService extends BaseService {
-  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.MICROSERVICES] })
+  @OnEvent({ name: 'ConfigInit', workers: [ImmichWorker.Microservices] })
   async onConfigInit({ newConfig }: ArgOf<'ConfigInit'>) {
     await this.init(newConfig);
   }
 
-  @OnEvent({ name: 'ConfigUpdate', workers: [ImmichWorker.MICROSERVICES], server: true })
+  @OnEvent({ name: 'ConfigUpdate', workers: [ImmichWorker.Microservices], server: true })
   async onConfigUpdate({ oldConfig, newConfig }: ArgOf<'ConfigUpdate'>) {
     await this.init(newConfig, oldConfig);
   }
@@ -64,11 +64,11 @@ export class SmartInfoService extends BaseService {
     });
   }
 
-  @OnJob({ name: JobName.QUEUE_SMART_SEARCH, queue: QueueName.SMART_SEARCH })
-  async handleQueueEncodeClip({ force }: JobOf<JobName.QUEUE_SMART_SEARCH>): Promise<JobStatus> {
+  @OnJob({ name: JobName.QueueSmartSearch, queue: QueueName.SmartSearch })
+  async handleQueueEncodeClip({ force }: JobOf<JobName.QueueSmartSearch>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: false });
     if (!isSmartSearchEnabled(machineLearning)) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     if (force) {
@@ -80,7 +80,7 @@ export class SmartInfoService extends BaseService {
     let queue: JobItem[] = [];
     const assets = this.assetJobRepository.streamForEncodeClip(force);
     for await (const asset of assets) {
-      queue.push({ name: JobName.SMART_SEARCH, data: { id: asset.id } });
+      queue.push({ name: JobName.SmartSearch, data: { id: asset.id } });
       if (queue.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(queue);
         queue = [];
@@ -89,23 +89,23 @@ export class SmartInfoService extends BaseService {
 
     await this.jobRepository.queueAll(queue);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.SMART_SEARCH, queue: QueueName.SMART_SEARCH })
-  async handleEncodeClip({ id }: JobOf<JobName.SMART_SEARCH>): Promise<JobStatus> {
+  @OnJob({ name: JobName.SmartSearch, queue: QueueName.SmartSearch })
+  async handleEncodeClip({ id }: JobOf<JobName.SmartSearch>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: true });
     if (!isSmartSearchEnabled(machineLearning)) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const asset = await this.assetJobRepository.getForClipEncoding(id);
     if (!asset || asset.files.length !== 1) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
-    if (asset.visibility === AssetVisibility.HIDDEN) {
-      return JobStatus.SKIPPED;
+    if (asset.visibility === AssetVisibility.Hidden) {
+      return JobStatus.Skipped;
     }
 
     const embedding = await this.machineLearningRepository.encodeImage(
@@ -122,11 +122,11 @@ export class SmartInfoService extends BaseService {
     const newConfig = await this.getConfig({ withCache: true });
     if (machineLearning.clip.modelName !== newConfig.machineLearning.clip.modelName) {
       // Skip the job if the the model has changed since the embedding was generated.
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     await this.searchRepository.upsert(asset.id, embedding);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 }
diff --git a/server/src/services/stack.service.ts b/server/src/services/stack.service.ts
index b2ac47274f..18600abd12 100644
--- a/server/src/services/stack.service.ts
+++ b/server/src/services/stack.service.ts
@@ -17,7 +17,7 @@ export class StackService extends BaseService {
   }
 
   async create(auth: AuthDto, dto: StackCreateDto): Promise<StackResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.ASSET_UPDATE, ids: dto.assetIds });
+    await this.requireAccess({ auth, permission: Permission.AssetUpdate, ids: dto.assetIds });
 
     const stack = await this.stackRepository.create({ ownerId: auth.user.id }, dto.assetIds);
 
@@ -27,13 +27,13 @@ export class StackService extends BaseService {
   }
 
   async get(auth: AuthDto, id: string): Promise<StackResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.STACK_READ, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.StackRead, ids: [id] });
     const stack = await this.findOrFail(id);
     return mapStack(stack, { auth });
   }
 
   async update(auth: AuthDto, id: string, dto: StackUpdateDto): Promise<StackResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.STACK_UPDATE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.StackUpdate, ids: [id] });
     const stack = await this.findOrFail(id);
     if (dto.primaryAssetId && !stack.assets.some(({ id }) => id === dto.primaryAssetId)) {
       throw new BadRequestException('Primary asset must be in the stack');
@@ -47,13 +47,13 @@ export class StackService extends BaseService {
   }
 
   async delete(auth: AuthDto, id: string): Promise<void> {
-    await this.requireAccess({ auth, permission: Permission.STACK_DELETE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.StackDelete, ids: [id] });
     await this.stackRepository.delete(id);
     await this.eventRepository.emit('StackDelete', { stackId: id, userId: auth.user.id });
   }
 
   async deleteAll(auth: AuthDto, dto: BulkIdsDto): Promise<void> {
-    await this.requireAccess({ auth, permission: Permission.STACK_DELETE, ids: dto.ids });
+    await this.requireAccess({ auth, permission: Permission.StackDelete, ids: dto.ids });
     await this.stackRepository.deleteAll(dto.ids);
     await this.eventRepository.emit('StackDeleteAll', { stackIds: dto.ids, userId: auth.user.id });
   }
diff --git a/server/src/services/storage-template.service.spec.ts b/server/src/services/storage-template.service.spec.ts
index 9c4fe02f3e..2751651dbf 100644
--- a/server/src/services/storage-template.service.spec.ts
+++ b/server/src/services/storage-template.service.spec.ts
@@ -96,7 +96,7 @@ describe(StorageTemplateService.name, () => {
     it('should skip when storage template is disabled', async () => {
       mocks.systemMetadata.get.mockResolvedValue({ storageTemplate: { enabled: false } });
 
-      await expect(sut.handleMigrationSingle({ id: testAsset.id })).resolves.toBe(JobStatus.SKIPPED);
+      await expect(sut.handleMigrationSingle({ id: testAsset.id })).resolves.toBe(JobStatus.Skipped);
 
       expect(mocks.asset.getByIds).not.toHaveBeenCalled();
       expect(mocks.storage.checkFileExists).not.toHaveBeenCalled();
@@ -119,7 +119,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValueOnce({
         id: '123',
         entityId: stillAsset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: stillAsset.originalPath,
         newPath: newStillPicturePath,
       });
@@ -127,12 +127,12 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValueOnce({
         id: '124',
         entityId: motionAsset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: motionAsset.originalPath,
         newPath: newMotionPicturePath,
       });
 
-      await expect(sut.handleMigrationSingle({ id: stillAsset.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleMigrationSingle({ id: stillAsset.id })).resolves.toBe(JobStatus.Success);
 
       expect(mocks.storage.checkFileExists).toHaveBeenCalledTimes(2);
       expect(mocks.asset.update).toHaveBeenCalledWith({ id: stillAsset.id, originalPath: newStillPicturePath });
@@ -152,13 +152,13 @@ describe(StorageTemplateService.name, () => {
       mocks.assetJob.getForStorageTemplateJob.mockResolvedValueOnce(asset);
       mocks.album.getByAssetId.mockResolvedValueOnce([album]);
 
-      expect(await sut.handleMigrationSingle({ id: asset.id })).toBe(JobStatus.SUCCESS);
+      expect(await sut.handleMigrationSingle({ id: asset.id })).toBe(JobStatus.Success);
 
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: asset.id,
         newPath: `upload/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/${album.albumName}/${asset.originalFileName}`,
         oldPath: asset.originalPath,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
       });
     });
 
@@ -172,14 +172,14 @@ describe(StorageTemplateService.name, () => {
       mocks.user.get.mockResolvedValue(user);
       mocks.assetJob.getForStorageTemplateJob.mockResolvedValueOnce(asset);
 
-      expect(await sut.handleMigrationSingle({ id: asset.id })).toBe(JobStatus.SUCCESS);
+      expect(await sut.handleMigrationSingle({ id: asset.id })).toBe(JobStatus.Success);
 
       const month = (asset.fileCreatedAt.getMonth() + 1).toString().padStart(2, '0');
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: asset.id,
         newPath: `upload/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/other/${month}/${asset.originalFileName}`,
         oldPath: asset.originalPath,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
       });
     });
 
@@ -206,14 +206,14 @@ describe(StorageTemplateService.name, () => {
         },
       ]);
 
-      expect(await sut.handleMigrationSingle({ id: asset.id })).toBe(JobStatus.SUCCESS);
+      expect(await sut.handleMigrationSingle({ id: asset.id })).toBe(JobStatus.Success);
 
       const month = (asset.fileCreatedAt.getMonth() + 1).toString().padStart(2, '0');
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: asset.id,
         newPath: `upload/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/${month} - ${album.albumName}/${asset.originalFileName}`,
         oldPath: asset.originalPath,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
       });
     });
 
@@ -229,14 +229,14 @@ describe(StorageTemplateService.name, () => {
       mocks.user.get.mockResolvedValue(user);
       mocks.assetJob.getForStorageTemplateJob.mockResolvedValueOnce(asset);
 
-      expect(await sut.handleMigrationSingle({ id: asset.id })).toBe(JobStatus.SUCCESS);
+      expect(await sut.handleMigrationSingle({ id: asset.id })).toBe(JobStatus.Success);
 
       const month = (asset.fileCreatedAt.getMonth() + 1).toString().padStart(2, '0');
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: asset.id,
         newPath: `upload/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/${month}/${asset.originalFileName}`,
         oldPath: asset.originalPath,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
       });
     });
 
@@ -251,7 +251,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.getByEntity.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: asset.originalPath,
         newPath: previousFailedNewPath,
       });
@@ -259,12 +259,12 @@ describe(StorageTemplateService.name, () => {
       mocks.move.update.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: asset.originalPath,
         newPath,
       });
 
-      await expect(sut.handleMigrationSingle({ id: asset.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleMigrationSingle({ id: asset.id })).resolves.toBe(JobStatus.Success);
 
       expect(mocks.assetJob.getForStorageTemplateJob).toHaveBeenCalledWith(asset.id);
       expect(mocks.storage.checkFileExists).toHaveBeenCalledTimes(3);
@@ -293,7 +293,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.getByEntity.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: asset.originalPath,
         newPath: previousFailedNewPath,
       });
@@ -301,12 +301,12 @@ describe(StorageTemplateService.name, () => {
       mocks.move.update.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: previousFailedNewPath,
         newPath,
       });
 
-      await expect(sut.handleMigrationSingle({ id: asset.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleMigrationSingle({ id: asset.id })).resolves.toBe(JobStatus.Success);
 
       expect(mocks.assetJob.getForStorageTemplateJob).toHaveBeenCalledWith(asset.id);
       expect(mocks.storage.checkFileExists).toHaveBeenCalledTimes(3);
@@ -328,19 +328,19 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValue({
         id: '123',
         entityId: testAsset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: testAsset.originalPath,
         newPath,
       });
 
-      await expect(sut.handleMigrationSingle({ id: testAsset.id })).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleMigrationSingle({ id: testAsset.id })).resolves.toBe(JobStatus.Success);
 
       expect(mocks.assetJob.getForStorageTemplateJob).toHaveBeenCalledWith(testAsset.id);
       expect(mocks.storage.checkFileExists).toHaveBeenCalledTimes(1);
       expect(mocks.storage.stat).toHaveBeenCalledWith(newPath);
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: testAsset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: testAsset.originalPath,
         newPath,
       });
@@ -370,7 +370,7 @@ describe(StorageTemplateService.name, () => {
         mocks.move.getByEntity.mockResolvedValue({
           id: '123',
           entityId: testAsset.id,
-          pathType: AssetPathType.ORIGINAL,
+          pathType: AssetPathType.Original,
           oldPath: testAsset.originalPath,
           newPath: previousFailedNewPath,
         });
@@ -378,12 +378,12 @@ describe(StorageTemplateService.name, () => {
         mocks.move.update.mockResolvedValue({
           id: '123',
           entityId: testAsset.id,
-          pathType: AssetPathType.ORIGINAL,
+          pathType: AssetPathType.Original,
           oldPath: previousFailedNewPath,
           newPath,
         });
 
-        await expect(sut.handleMigrationSingle({ id: testAsset.id })).resolves.toBe(JobStatus.SUCCESS);
+        await expect(sut.handleMigrationSingle({ id: testAsset.id })).resolves.toBe(JobStatus.Success);
 
         expect(mocks.assetJob.getForStorageTemplateJob).toHaveBeenCalledWith(testAsset.id);
         expect(mocks.storage.checkFileExists).toHaveBeenCalledTimes(3);
@@ -417,7 +417,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath,
         newPath,
       });
@@ -472,7 +472,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValue({
         id: '123',
         entityId: assetStub.image.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: assetStub.image.originalPath,
         newPath,
       });
@@ -492,7 +492,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: asset.originalPath,
         newPath: `upload/library/${user.storageLabel}/2023/2023-02-23/${asset.originalFileName}`,
       });
@@ -520,7 +520,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath,
         newPath,
       });
@@ -559,7 +559,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: asset.originalPath,
         newPath: `upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`,
       });
@@ -592,7 +592,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValue({
         id: 'move-123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: asset.originalPath,
         newPath: '',
       });
@@ -622,7 +622,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: `upload/library/${user.id}/2022/2022-06-19/IMG_7065.heic`,
         newPath: `upload/library/${user.id}/2023/2023-02-23/IMG_7065.heic`,
       });
@@ -648,7 +648,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: `upload/library/${user.id}/2022/2022-06-19/IMG_7065.HEIC`,
         newPath: `upload/library/${user.id}/2023/2023-02-23/IMG_7065.heic`,
       });
@@ -674,7 +674,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: `upload/library/${user.id}/2022/2022-06-19/IMG_7065.JPEG`,
         newPath: `upload/library/${user.id}/2023/2023-02-23/IMG_7065.jpg`,
       });
@@ -700,7 +700,7 @@ describe(StorageTemplateService.name, () => {
       mocks.move.create.mockResolvedValue({
         id: '123',
         entityId: asset.id,
-        pathType: AssetPathType.ORIGINAL,
+        pathType: AssetPathType.Original,
         oldPath: `upload/library/${user.id}/2022/2022-06-19/IMG_7065.JPG`,
         newPath: `upload/library/${user.id}/2023/2023-02-23/IMG_7065.jpg`,
       });
diff --git a/server/src/services/storage-template.service.ts b/server/src/services/storage-template.service.ts
index a286d518d6..6086d62809 100644
--- a/server/src/services/storage-template.service.ts
+++ b/server/src/services/storage-template.service.ts
@@ -97,7 +97,7 @@ export class StorageTemplateService extends BaseService {
         asset: {
           fileCreatedAt: new Date(),
           originalPath: '/upload/test/IMG_123.jpg',
-          type: AssetType.IMAGE,
+          type: AssetType.Image,
           id: 'd587e44b-f8c0-4832-9ba3-43268bbf5d4e',
         } as StorageAsset,
         filename: 'IMG_123',
@@ -118,20 +118,20 @@ export class StorageTemplateService extends BaseService {
 
   @OnEvent({ name: 'AssetMetadataExtracted' })
   async onAssetMetadataExtracted({ source, assetId }: ArgOf<'AssetMetadataExtracted'>) {
-    await this.jobRepository.queue({ name: JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE, data: { source, id: assetId } });
+    await this.jobRepository.queue({ name: JobName.StorageTemplateMigrationSingle, data: { source, id: assetId } });
   }
 
-  @OnJob({ name: JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE, queue: QueueName.STORAGE_TEMPLATE_MIGRATION })
-  async handleMigrationSingle({ id }: JobOf<JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE>): Promise<JobStatus> {
+  @OnJob({ name: JobName.StorageTemplateMigrationSingle, queue: QueueName.StorageTemplateMigration })
+  async handleMigrationSingle({ id }: JobOf<JobName.StorageTemplateMigrationSingle>): Promise<JobStatus> {
     const config = await this.getConfig({ withCache: true });
     const storageTemplateEnabled = config.storageTemplate.enabled;
     if (!storageTemplateEnabled) {
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     const asset = await this.assetJobRepository.getForStorageTemplateJob(id);
     if (!asset) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     const user = await this.userRepository.get(asset.ownerId, {});
@@ -143,22 +143,22 @@ export class StorageTemplateService extends BaseService {
     if (asset.livePhotoVideoId) {
       const livePhotoVideo = await this.assetJobRepository.getForStorageTemplateJob(asset.livePhotoVideoId);
       if (!livePhotoVideo) {
-        return JobStatus.FAILED;
+        return JobStatus.Failed;
       }
       const motionFilename = getLivePhotoMotionFilename(filename, livePhotoVideo.originalPath);
       await this.moveAsset(livePhotoVideo, { storageLabel, filename: motionFilename });
     }
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.STORAGE_TEMPLATE_MIGRATION, queue: QueueName.STORAGE_TEMPLATE_MIGRATION })
+  @OnJob({ name: JobName.StorageTemplateMigration, queue: QueueName.StorageTemplateMigration })
   async handleMigration(): Promise<JobStatus> {
     this.logger.log('Starting storage template migration');
     const { storageTemplate } = await this.getConfig({ withCache: true });
     const { enabled } = storageTemplate;
     if (!enabled) {
       this.logger.log('Storage template migration disabled, skipping');
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     await this.moveRepository.cleanMoveHistory();
@@ -174,12 +174,12 @@ export class StorageTemplateService extends BaseService {
     }
 
     this.logger.debug('Cleaning up empty directories...');
-    const libraryFolder = StorageCore.getBaseFolder(StorageFolder.LIBRARY);
+    const libraryFolder = StorageCore.getBaseFolder(StorageFolder.Library);
     await this.storageRepository.removeEmptyDirs(libraryFolder);
 
     this.logger.log('Finished storage template migration');
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   @OnEvent({ name: 'AssetDelete' })
@@ -208,7 +208,7 @@ export class StorageTemplateService extends BaseService {
       try {
         await this.storageCore.moveFile({
           entityId: id,
-          pathType: AssetPathType.ORIGINAL,
+          pathType: AssetPathType.Original,
           oldPath,
           newPath,
           assetInfo: { sizeInBytes: fileSizeInByte, checksum },
@@ -216,7 +216,7 @@ export class StorageTemplateService extends BaseService {
         if (sidecarPath) {
           await this.storageCore.moveFile({
             entityId: id,
-            pathType: AssetPathType.SIDECAR,
+            pathType: AssetPathType.Sidecar,
             oldPath: sidecarPath,
             newPath: `${newPath}.xmp`,
           });
@@ -357,8 +357,8 @@ export class StorageTemplateService extends BaseService {
     const substitutions: Record<string, string> = {
       filename,
       ext: extension,
-      filetype: asset.type == AssetType.IMAGE ? 'IMG' : 'VID',
-      filetypefull: asset.type == AssetType.IMAGE ? 'IMAGE' : 'VIDEO',
+      filetype: asset.type == AssetType.Image ? 'IMG' : 'VID',
+      filetypefull: asset.type == AssetType.Image ? 'IMAGE' : 'VIDEO',
       assetId: asset.id,
       assetIdShort: asset.id.slice(-12),
       //just throw into the root if it doesn't belong to an album
diff --git a/server/src/services/storage.service.spec.ts b/server/src/services/storage.service.spec.ts
index 2d28489fae..0e051f2642 100644
--- a/server/src/services/storage.service.spec.ts
+++ b/server/src/services/storage.service.spec.ts
@@ -22,7 +22,7 @@ describe(StorageService.name, () => {
 
       await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.SYSTEM_FLAGS, {
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.SystemFlags, {
         mountChecks: {
           backups: true,
           'encoded-video': true,
@@ -60,7 +60,7 @@ describe(StorageService.name, () => {
 
       await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.SYSTEM_FLAGS, {
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.SystemFlags, {
         mountChecks: {
           backups: true,
           'encoded-video': true,
diff --git a/server/src/services/storage.service.ts b/server/src/services/storage.service.ts
index e9ca10f08a..d8804665da 100644
--- a/server/src/services/storage.service.ts
+++ b/server/src/services/storage.service.ts
@@ -17,7 +17,7 @@ export class StorageService extends BaseService {
 
     await this.databaseRepository.withLock(DatabaseLock.SystemFileMounts, async () => {
       const flags =
-        (await this.systemMetadataRepository.get(SystemMetadataKey.SYSTEM_FLAGS)) ||
+        (await this.systemMetadataRepository.get(SystemMetadataKey.SystemFlags)) ||
         ({ mountChecks: {} } as SystemFlags);
 
       if (!flags.mountChecks) {
@@ -46,7 +46,7 @@ export class StorageService extends BaseService {
         }
 
         if (updated) {
-          await this.systemMetadataRepository.set(SystemMetadataKey.SYSTEM_FLAGS, flags);
+          await this.systemMetadataRepository.set(SystemMetadataKey.SystemFlags, flags);
           this.logger.log('Successfully enabled system mount folders checks');
         }
 
@@ -62,8 +62,8 @@ export class StorageService extends BaseService {
     });
   }
 
-  @OnJob({ name: JobName.DELETE_FILES, queue: QueueName.BACKGROUND_TASK })
-  async handleDeleteFiles(job: JobOf<JobName.DELETE_FILES>): Promise<JobStatus> {
+  @OnJob({ name: JobName.DeleteFiles, queue: QueueName.BackgroundTask })
+  async handleDeleteFiles(job: JobOf<JobName.DeleteFiles>): Promise<JobStatus> {
     const { files } = job;
 
     // TODO: one job per file
@@ -79,7 +79,7 @@ export class StorageService extends BaseService {
       }
     }
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private async verifyReadAccess(folder: StorageFolder) {
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 9779498d70..4463ab0d76 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -640,7 +640,7 @@ export class SyncService extends BaseService {
   async getFullSync(auth: AuthDto, dto: AssetFullSyncDto): Promise<AssetResponseDto[]> {
     // mobile implementation is faster if this is a single id
     const userId = dto.userId || auth.user.id;
-    await this.requireAccess({ auth, permission: Permission.TIMELINE_READ, ids: [userId] });
+    await this.requireAccess({ auth, permission: Permission.TimelineRead, ids: [userId] });
     const assets = await this.assetRepository.getAllForUserFullSync({
       ownerId: userId,
       updatedUntil: dto.updatedUntil,
@@ -664,7 +664,7 @@ export class SyncService extends BaseService {
       return FULL_SYNC;
     }
 
-    await this.requireAccess({ auth, permission: Permission.TIMELINE_READ, ids: dto.userIds });
+    await this.requireAccess({ auth, permission: Permission.TimelineRead, ids: dto.userIds });
 
     const limit = 10_000;
     const upserted = await this.assetRepository.getChangedDeltaSync({ limit, updatedAfter: dto.updatedAfter, userIds });
@@ -676,8 +676,8 @@ export class SyncService extends BaseService {
 
     const deleted = await this.auditRepository.getAfter(dto.updatedAfter, {
       userIds,
-      entityType: EntityType.ASSET,
-      action: DatabaseAction.DELETE,
+      entityType: EntityType.Asset,
+      action: DatabaseAction.Delete,
     });
 
     const result = {
@@ -686,7 +686,7 @@ export class SyncService extends BaseService {
         // do not return archived assets for partner users
         .filter(
           (a) =>
-            a.ownerId === auth.user.id || (a.ownerId !== auth.user.id && a.visibility === AssetVisibility.TIMELINE),
+            a.ownerId === auth.user.id || (a.ownerId !== auth.user.id && a.visibility === AssetVisibility.Timeline),
         )
         .map((a) =>
           mapAsset(a, {
diff --git a/server/src/services/system-config.service.spec.ts b/server/src/services/system-config.service.spec.ts
index 582c50ed8a..20127bab15 100644
--- a/server/src/services/system-config.service.spec.ts
+++ b/server/src/services/system-config.service.spec.ts
@@ -9,7 +9,7 @@ import {
   OAuthTokenEndpointAuthMethod,
   QueueName,
   ToneMapping,
-  TranscodeHWAccel,
+  TranscodeHardwareAcceleration,
   TranscodePolicy,
   VideoCodec,
   VideoContainer,
@@ -28,17 +28,17 @@ const partialConfig = {
 
 const updatedConfig = Object.freeze<SystemConfig>({
   job: {
-    [QueueName.BACKGROUND_TASK]: { concurrency: 5 },
-    [QueueName.SMART_SEARCH]: { concurrency: 2 },
-    [QueueName.METADATA_EXTRACTION]: { concurrency: 5 },
-    [QueueName.FACE_DETECTION]: { concurrency: 2 },
-    [QueueName.SEARCH]: { concurrency: 5 },
-    [QueueName.SIDECAR]: { concurrency: 5 },
-    [QueueName.LIBRARY]: { concurrency: 5 },
-    [QueueName.MIGRATION]: { concurrency: 5 },
-    [QueueName.THUMBNAIL_GENERATION]: { concurrency: 3 },
-    [QueueName.VIDEO_CONVERSION]: { concurrency: 1 },
-    [QueueName.NOTIFICATION]: { concurrency: 5 },
+    [QueueName.BackgroundTask]: { concurrency: 5 },
+    [QueueName.SmartSearch]: { concurrency: 2 },
+    [QueueName.MetadataExtraction]: { concurrency: 5 },
+    [QueueName.FaceDetection]: { concurrency: 2 },
+    [QueueName.Search]: { concurrency: 5 },
+    [QueueName.Sidecar]: { concurrency: 5 },
+    [QueueName.Library]: { concurrency: 5 },
+    [QueueName.Migration]: { concurrency: 5 },
+    [QueueName.ThumbnailGeneration]: { concurrency: 3 },
+    [QueueName.VideoConversion]: { concurrency: 1 },
+    [QueueName.Notification]: { concurrency: 5 },
   },
   backup: {
     database: {
@@ -51,28 +51,28 @@ const updatedConfig = Object.freeze<SystemConfig>({
     crf: 30,
     threads: 0,
     preset: 'ultrafast',
-    targetAudioCodec: AudioCodec.AAC,
-    acceptedAudioCodecs: [AudioCodec.AAC, AudioCodec.MP3, AudioCodec.LIBOPUS, AudioCodec.PCMS16LE],
+    targetAudioCodec: AudioCodec.Aac,
+    acceptedAudioCodecs: [AudioCodec.Aac, AudioCodec.Mp3, AudioCodec.LibOpus, AudioCodec.PcmS16le],
     targetResolution: '720',
     targetVideoCodec: VideoCodec.H264,
     acceptedVideoCodecs: [VideoCodec.H264],
-    acceptedContainers: [VideoContainer.MOV, VideoContainer.OGG, VideoContainer.WEBM],
+    acceptedContainers: [VideoContainer.Mov, VideoContainer.Ogg, VideoContainer.Webm],
     maxBitrate: '0',
     bframes: -1,
     refs: 0,
     gopSize: 0,
     temporalAQ: false,
-    cqMode: CQMode.AUTO,
+    cqMode: CQMode.Auto,
     twoPass: false,
     preferredHwDevice: 'auto',
-    transcode: TranscodePolicy.REQUIRED,
-    accel: TranscodeHWAccel.DISABLED,
+    transcode: TranscodePolicy.Required,
+    accel: TranscodeHardwareAcceleration.Disabled,
     accelDecode: false,
-    tonemap: ToneMapping.HABLE,
+    tonemap: ToneMapping.Hable,
   },
   logging: {
     enabled: true,
-    level: LogLevel.LOG,
+    level: LogLevel.Log,
   },
   metadata: {
     faces: {
@@ -128,7 +128,7 @@ const updatedConfig = Object.freeze<SystemConfig>({
     scope: 'openid email profile',
     signingAlgorithm: 'RS256',
     profileSigningAlgorithm: 'none',
-    tokenEndpointAuthMethod: OAuthTokenEndpointAuthMethod.CLIENT_SECRET_POST,
+    tokenEndpointAuthMethod: OAuthTokenEndpointAuthMethod.ClientSecretPost,
     timeout: 30_000,
     storageLabelClaim: 'preferred_username',
     storageQuotaClaim: 'immich_quota',
@@ -150,15 +150,15 @@ const updatedConfig = Object.freeze<SystemConfig>({
   image: {
     thumbnail: {
       size: 250,
-      format: ImageFormat.WEBP,
+      format: ImageFormat.Webp,
       quality: 80,
     },
     preview: {
       size: 1440,
-      format: ImageFormat.JPEG,
+      format: ImageFormat.Jpeg,
       quality: 80,
     },
-    fullsize: { enabled: false, format: ImageFormat.JPEG, quality: 80 },
+    fullsize: { enabled: false, format: ImageFormat.Jpeg, quality: 80 },
     colorspace: Colorspace.P3,
     extractEmbedded: false,
   },
diff --git a/server/src/services/system-metadata.service.spec.ts b/server/src/services/system-metadata.service.spec.ts
index a8d6c0cdcc..f5bdcde7b4 100644
--- a/server/src/services/system-metadata.service.spec.ts
+++ b/server/src/services/system-metadata.service.spec.ts
@@ -30,12 +30,12 @@ describe(SystemMetadataService.name, () => {
   describe('updateAdminOnboarding', () => {
     it('should update isOnboarded to true', async () => {
       await expect(sut.updateAdminOnboarding({ isOnboarded: true })).resolves.toBeUndefined();
-      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.ADMIN_ONBOARDING, { isOnboarded: true });
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.AdminOnboarding, { isOnboarded: true });
     });
 
     it('should update isOnboarded to false', async () => {
       await expect(sut.updateAdminOnboarding({ isOnboarded: false })).resolves.toBeUndefined();
-      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.ADMIN_ONBOARDING, { isOnboarded: false });
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.AdminOnboarding, { isOnboarded: false });
     });
   });
 
diff --git a/server/src/services/system-metadata.service.ts b/server/src/services/system-metadata.service.ts
index 750e6b1d0b..30af715379 100644
--- a/server/src/services/system-metadata.service.ts
+++ b/server/src/services/system-metadata.service.ts
@@ -11,23 +11,23 @@ import { BaseService } from 'src/services/base.service';
 @Injectable()
 export class SystemMetadataService extends BaseService {
   async getAdminOnboarding(): Promise<AdminOnboardingResponseDto> {
-    const value = await this.systemMetadataRepository.get(SystemMetadataKey.ADMIN_ONBOARDING);
+    const value = await this.systemMetadataRepository.get(SystemMetadataKey.AdminOnboarding);
     return { isOnboarded: false, ...value };
   }
 
   async updateAdminOnboarding(dto: AdminOnboardingUpdateDto): Promise<void> {
-    await this.systemMetadataRepository.set(SystemMetadataKey.ADMIN_ONBOARDING, {
+    await this.systemMetadataRepository.set(SystemMetadataKey.AdminOnboarding, {
       isOnboarded: dto.isOnboarded,
     });
   }
 
   async getReverseGeocodingState(): Promise<ReverseGeocodingStateResponseDto> {
-    const value = await this.systemMetadataRepository.get(SystemMetadataKey.REVERSE_GEOCODING_STATE);
+    const value = await this.systemMetadataRepository.get(SystemMetadataKey.ReverseGeocodingState);
     return { lastUpdate: null, lastImportFileName: null, ...value };
   }
 
   async getVersionCheckState(): Promise<VersionCheckStateResponseDto> {
-    const value = await this.systemMetadataRepository.get(SystemMetadataKey.VERSION_CHECK_STATE);
+    const value = await this.systemMetadataRepository.get(SystemMetadataKey.VersionCheckState);
     return { checkedAt: null, releaseVersion: null, ...value };
   }
 }
diff --git a/server/src/services/tag.service.spec.ts b/server/src/services/tag.service.spec.ts
index 70507ab433..6699c61970 100644
--- a/server/src/services/tag.service.spec.ts
+++ b/server/src/services/tag.service.spec.ts
@@ -278,7 +278,7 @@ describe(TagService.name, () => {
     it('should delete empty tags', async () => {
       mocks.tag.deleteEmptyTags.mockResolvedValue();
 
-      await expect(sut.handleTagCleanup()).resolves.toBe(JobStatus.SUCCESS);
+      await expect(sut.handleTagCleanup()).resolves.toBe(JobStatus.Success);
 
       expect(mocks.tag.deleteEmptyTags).toHaveBeenCalled();
     });
diff --git a/server/src/services/tag.service.ts b/server/src/services/tag.service.ts
index e975fc3980..2fae4b55d0 100644
--- a/server/src/services/tag.service.ts
+++ b/server/src/services/tag.service.ts
@@ -26,7 +26,7 @@ export class TagService extends BaseService {
   }
 
   async get(auth: AuthDto, id: string): Promise<TagResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.TAG_READ, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.TagRead, ids: [id] });
     const tag = await this.findOrFail(id);
     return mapTag(tag);
   }
@@ -34,7 +34,7 @@ export class TagService extends BaseService {
   async create(auth: AuthDto, dto: TagCreateDto) {
     let parent;
     if (dto.parentId) {
-      await this.requireAccess({ auth, permission: Permission.TAG_READ, ids: [dto.parentId] });
+      await this.requireAccess({ auth, permission: Permission.TagRead, ids: [dto.parentId] });
       parent = await this.tagRepository.get(dto.parentId);
       if (!parent) {
         throw new BadRequestException('Tag not found');
@@ -55,7 +55,7 @@ export class TagService extends BaseService {
   }
 
   async update(auth: AuthDto, id: string, dto: TagUpdateDto): Promise<TagResponseDto> {
-    await this.requireAccess({ auth, permission: Permission.TAG_UPDATE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.TagUpdate, ids: [id] });
 
     const { color } = dto;
     const tag = await this.tagRepository.update(id, { color });
@@ -68,7 +68,7 @@ export class TagService extends BaseService {
   }
 
   async remove(auth: AuthDto, id: string): Promise<void> {
-    await this.requireAccess({ auth, permission: Permission.TAG_DELETE, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.TagDelete, ids: [id] });
 
     // TODO sync tag changes for affected assets
 
@@ -77,8 +77,8 @@ export class TagService extends BaseService {
 
   async bulkTagAssets(auth: AuthDto, dto: TagBulkAssetsDto): Promise<TagBulkAssetsResponseDto> {
     const [tagIds, assetIds] = await Promise.all([
-      this.checkAccess({ auth, permission: Permission.TAG_ASSET, ids: dto.tagIds }),
-      this.checkAccess({ auth, permission: Permission.ASSET_UPDATE, ids: dto.assetIds }),
+      this.checkAccess({ auth, permission: Permission.TagAsset, ids: dto.tagIds }),
+      this.checkAccess({ auth, permission: Permission.AssetUpdate, ids: dto.assetIds }),
     ]);
 
     const items: Insertable<TagAssetTable>[] = [];
@@ -97,7 +97,7 @@ export class TagService extends BaseService {
   }
 
   async addAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {
-    await this.requireAccess({ auth, permission: Permission.TAG_ASSET, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.TagAsset, ids: [id] });
 
     const results = await addAssets(
       auth,
@@ -115,12 +115,12 @@ export class TagService extends BaseService {
   }
 
   async removeAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {
-    await this.requireAccess({ auth, permission: Permission.TAG_ASSET, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.TagAsset, ids: [id] });
 
     const results = await removeAssets(
       auth,
       { access: this.accessRepository, bulk: this.tagRepository },
-      { parentId: id, assetIds: dto.ids, canAlwaysRemove: Permission.TAG_DELETE },
+      { parentId: id, assetIds: dto.ids, canAlwaysRemove: Permission.TagDelete },
     );
 
     for (const { id: assetId, success } of results) {
@@ -132,10 +132,10 @@ export class TagService extends BaseService {
     return results;
   }
 
-  @OnJob({ name: JobName.TAG_CLEANUP, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.TagCleanup, queue: QueueName.BackgroundTask })
   async handleTagCleanup() {
     await this.tagRepository.deleteEmptyTags();
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private async findOrFail(id: string) {
diff --git a/server/src/services/timeline.service.spec.ts b/server/src/services/timeline.service.spec.ts
index 1669b1eac7..11df30a7d4 100644
--- a/server/src/services/timeline.service.spec.ts
+++ b/server/src/services/timeline.service.spec.ts
@@ -49,7 +49,7 @@ describe(TimelineService.name, () => {
       await expect(
         sut.getTimeBucket(authStub.admin, {
           timeBucket: 'bucket',
-          visibility: AssetVisibility.ARCHIVE,
+          visibility: AssetVisibility.Archive,
           userId: authStub.admin.user.id,
         }),
       ).resolves.toEqual(json);
@@ -57,7 +57,7 @@ describe(TimelineService.name, () => {
         'bucket',
         expect.objectContaining({
           timeBucket: 'bucket',
-          visibility: AssetVisibility.ARCHIVE,
+          visibility: AssetVisibility.Archive,
           userIds: [authStub.admin.user.id],
         }),
       );
@@ -71,14 +71,14 @@ describe(TimelineService.name, () => {
       await expect(
         sut.getTimeBucket(authStub.admin, {
           timeBucket: 'bucket',
-          visibility: AssetVisibility.TIMELINE,
+          visibility: AssetVisibility.Timeline,
           userId: authStub.admin.user.id,
           withPartners: true,
         }),
       ).resolves.toEqual(json);
       expect(mocks.asset.getTimeBucket).toHaveBeenCalledWith('bucket', {
         timeBucket: 'bucket',
-        visibility: AssetVisibility.TIMELINE,
+        visibility: AssetVisibility.Timeline,
         withPartners: true,
         userIds: [authStub.admin.user.id],
       });
@@ -126,7 +126,7 @@ describe(TimelineService.name, () => {
       await expect(
         sut.getTimeBucket(authStub.admin, {
           timeBucket: 'bucket',
-          visibility: AssetVisibility.ARCHIVE,
+          visibility: AssetVisibility.Archive,
           withPartners: true,
           userId: authStub.admin.user.id,
         }),
diff --git a/server/src/services/timeline.service.ts b/server/src/services/timeline.service.ts
index abd536a97e..d8cac3a205 100644
--- a/server/src/services/timeline.service.ts
+++ b/server/src/services/timeline.service.ts
@@ -45,29 +45,29 @@ export class TimelineService extends BaseService {
   }
 
   private async timeBucketChecks(auth: AuthDto, dto: TimeBucketDto) {
-    if (dto.visibility === AssetVisibility.LOCKED) {
+    if (dto.visibility === AssetVisibility.Locked) {
       requireElevatedPermission(auth);
     }
 
     if (dto.albumId) {
-      await this.requireAccess({ auth, permission: Permission.ALBUM_READ, ids: [dto.albumId] });
+      await this.requireAccess({ auth, permission: Permission.AlbumRead, ids: [dto.albumId] });
     } else {
       dto.userId = dto.userId || auth.user.id;
     }
 
     if (dto.userId) {
-      await this.requireAccess({ auth, permission: Permission.TIMELINE_READ, ids: [dto.userId] });
-      if (dto.visibility === AssetVisibility.ARCHIVE) {
-        await this.requireAccess({ auth, permission: Permission.ARCHIVE_READ, ids: [dto.userId] });
+      await this.requireAccess({ auth, permission: Permission.TimelineRead, ids: [dto.userId] });
+      if (dto.visibility === AssetVisibility.Archive) {
+        await this.requireAccess({ auth, permission: Permission.ArchiveRead, ids: [dto.userId] });
       }
     }
 
     if (dto.tagId) {
-      await this.requireAccess({ auth, permission: Permission.TAG_READ, ids: [dto.tagId] });
+      await this.requireAccess({ auth, permission: Permission.TagRead, ids: [dto.tagId] });
     }
 
     if (dto.withPartners) {
-      const requestedArchived = dto.visibility === AssetVisibility.ARCHIVE || dto.visibility === undefined;
+      const requestedArchived = dto.visibility === AssetVisibility.Archive || dto.visibility === undefined;
       const requestedFavorite = dto.isFavorite === true || dto.isFavorite === false;
       const requestedTrash = dto.isTrashed === true;
 
diff --git a/server/src/services/trash.service.spec.ts b/server/src/services/trash.service.spec.ts
index b3bee90815..f742ce8757 100644
--- a/server/src/services/trash.service.spec.ts
+++ b/server/src/services/trash.service.spec.ts
@@ -77,24 +77,24 @@ describe(TrashService.name, () => {
       mocks.trash.empty.mockResolvedValue(1);
       await expect(sut.empty(authStub.user1)).resolves.toEqual({ count: 1 });
       expect(mocks.trash.empty).toHaveBeenCalledWith('user-id');
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_TRASH_EMPTY, data: {} });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueTrashEmpty, data: {} });
     });
   });
 
   describe('onAssetsDelete', () => {
     it('should queue the empty trash job', async () => {
       await expect(sut.onAssetsDelete()).resolves.toBeUndefined();
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_TRASH_EMPTY, data: {} });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueTrashEmpty, data: {} });
     });
   });
 
   describe('handleQueueEmptyTrash', () => {
     it('should queue asset delete jobs', async () => {
       mocks.trash.getDeletedIds.mockReturnValue(makeAssetIdStream(1));
-      await expect(sut.handleQueueEmptyTrash()).resolves.toEqual(JobStatus.SUCCESS);
+      await expect(sut.handleQueueEmptyTrash()).resolves.toEqual(JobStatus.Success);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.ASSET_DELETION,
+          name: JobName.AssetDeletion,
           data: { id: 'asset-1', deleteOnDisk: true },
         },
       ]);
diff --git a/server/src/services/trash.service.ts b/server/src/services/trash.service.ts
index a7447ab890..858feacd39 100644
--- a/server/src/services/trash.service.ts
+++ b/server/src/services/trash.service.ts
@@ -15,7 +15,7 @@ export class TrashService extends BaseService {
       return { count: 0 };
     }
 
-    await this.requireAccess({ auth, permission: Permission.ASSET_DELETE, ids });
+    await this.requireAccess({ auth, permission: Permission.AssetDelete, ids });
     await this.trashRepository.restoreAll(ids);
     await this.eventRepository.emit('AssetRestoreAll', { assetIds: ids, userId: auth.user.id });
 
@@ -35,17 +35,17 @@ export class TrashService extends BaseService {
   async empty(auth: AuthDto): Promise<TrashResponseDto> {
     const count = await this.trashRepository.empty(auth.user.id);
     if (count > 0) {
-      await this.jobRepository.queue({ name: JobName.QUEUE_TRASH_EMPTY, data: {} });
+      await this.jobRepository.queue({ name: JobName.QueueTrashEmpty, data: {} });
     }
     return { count };
   }
 
   @OnEvent({ name: 'AssetDeleteAll' })
   async onAssetsDelete() {
-    await this.jobRepository.queue({ name: JobName.QUEUE_TRASH_EMPTY, data: {} });
+    await this.jobRepository.queue({ name: JobName.QueueTrashEmpty, data: {} });
   }
 
-  @OnJob({ name: JobName.QUEUE_TRASH_EMPTY, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.QueueTrashEmpty, queue: QueueName.BackgroundTask })
   async handleQueueEmptyTrash() {
     const assets = this.trashRepository.getDeletedIds();
 
@@ -67,14 +67,14 @@ export class TrashService extends BaseService {
 
     this.logger.log(`Queued ${count} asset(s) for deletion from the trash`);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private async handleBatch(ids: string[]) {
     this.logger.debug(`Queueing ${ids.length} asset(s) for deletion from the trash`);
     await this.jobRepository.queueAll(
       ids.map((assetId) => ({
-        name: JobName.ASSET_DELETION,
+        name: JobName.AssetDeletion,
         data: {
           id: assetId,
           deleteOnDisk: true,
diff --git a/server/src/services/user-admin.service.spec.ts b/server/src/services/user-admin.service.spec.ts
index 85cbb8238a..8854ade8e3 100644
--- a/server/src/services/user-admin.service.spec.ts
+++ b/server/src/services/user-admin.service.spec.ts
@@ -140,7 +140,7 @@ describe(UserAdminService.name, () => {
 
       await expect(sut.delete(authStub.admin, userStub.user1.id, {})).resolves.toEqual(mapUserAdmin(userStub.user1));
       expect(mocks.user.update).toHaveBeenCalledWith(userStub.user1.id, {
-        status: UserStatus.DELETED,
+        status: UserStatus.Deleted,
         deletedAt: expect.any(Date),
       });
     });
@@ -154,11 +154,11 @@ describe(UserAdminService.name, () => {
       );
 
       expect(mocks.user.update).toHaveBeenCalledWith(userStub.user1.id, {
-        status: UserStatus.REMOVING,
+        status: UserStatus.Removing,
         deletedAt: expect.any(Date),
       });
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.USER_DELETION,
+        name: JobName.UserDeletion,
         data: { id: userStub.user1.id, force: true },
       });
     });
diff --git a/server/src/services/user-admin.service.ts b/server/src/services/user-admin.service.ts
index 180471bb44..91e21b6bb5 100644
--- a/server/src/services/user-admin.service.ts
+++ b/server/src/services/user-admin.service.ts
@@ -100,11 +100,11 @@ export class UserAdminService extends BaseService {
 
     await this.albumRepository.softDeleteAll(id);
 
-    const status = force ? UserStatus.REMOVING : UserStatus.DELETED;
+    const status = force ? UserStatus.Removing : UserStatus.Deleted;
     const user = await this.userRepository.update(id, { status, deletedAt: new Date() });
 
     if (force) {
-      await this.jobRepository.queue({ name: JobName.USER_DELETION, data: { id: user.id, force } });
+      await this.jobRepository.queue({ name: JobName.UserDeletion, data: { id: user.id, force } });
     }
 
     return mapUserAdmin(user);
@@ -134,7 +134,7 @@ export class UserAdminService extends BaseService {
     const newPreferences = mergePreferences(getPreferences(metadata), dto);
 
     await this.userRepository.upsertMetadata(id, {
-      key: UserMetadataKey.PREFERENCES,
+      key: UserMetadataKey.Preferences,
       value: getPreferencesPartial(newPreferences),
     });
 
diff --git a/server/src/services/user.service.spec.ts b/server/src/services/user.service.spec.ts
index 4ee92fc3d3..6ae6bc85b6 100644
--- a/server/src/services/user.service.spec.ts
+++ b/server/src/services/user.service.spec.ts
@@ -122,7 +122,7 @@ describe(UserService.name, () => {
 
       await sut.createProfileImage(authStub.admin, file);
 
-      expect(mocks.job.queue.mock.calls).toEqual([[{ name: JobName.DELETE_FILES, data: { files } }]]);
+      expect(mocks.job.queue.mock.calls).toEqual([[{ name: JobName.DeleteFiles, data: { files } }]]);
     });
 
     it('should not delete the profile image if it has not been set', async () => {
@@ -156,7 +156,7 @@ describe(UserService.name, () => {
 
       await sut.deleteProfileImage(authStub.admin);
 
-      expect(mocks.job.queue.mock.calls).toEqual([[{ name: JobName.DELETE_FILES, data: { files } }]]);
+      expect(mocks.job.queue.mock.calls).toEqual([[{ name: JobName.DeleteFiles, data: { files } }]]);
     });
   });
 
@@ -185,7 +185,7 @@ describe(UserService.name, () => {
         new ImmichFileResponse({
           path: '/path/to/profile.jpg',
           contentType: 'image/jpeg',
-          cacheControl: CacheControl.NONE,
+          cacheControl: CacheControl.None,
         }),
       );
 
@@ -211,7 +211,7 @@ describe(UserService.name, () => {
       await sut.handleUserDeleteCheck();
 
       expect(mocks.user.getDeletedAfter).toHaveBeenCalled();
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.USER_DELETION, data: { id: user.id } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.UserDeletion, data: { id: user.id } }]);
     });
   });
 
@@ -266,7 +266,7 @@ describe(UserService.name, () => {
       await sut.setLicense(authStub.user1, license);
 
       expect(mocks.user.upsertMetadata).toHaveBeenCalledWith(authStub.user1.user.id, {
-        key: UserMetadataKey.LICENSE,
+        key: UserMetadataKey.License,
         value: expect.any(Object),
       });
     });
@@ -279,7 +279,7 @@ describe(UserService.name, () => {
       await sut.setLicense(authStub.user1, license);
 
       expect(mocks.user.upsertMetadata).toHaveBeenCalledWith(authStub.user1.user.id, {
-        key: UserMetadataKey.LICENSE,
+        key: UserMetadataKey.License,
         value: expect.any(Object),
       });
     });
diff --git a/server/src/services/user.service.ts b/server/src/services/user.service.ts
index 78f49fd7ae..4a65e4ab9f 100644
--- a/server/src/services/user.service.ts
+++ b/server/src/services/user.service.ts
@@ -78,7 +78,7 @@ export class UserService extends BaseService {
     const updated = mergePreferences(getPreferences(metadata), dto);
 
     await this.userRepository.upsertMetadata(auth.user.id, {
-      key: UserMetadataKey.PREFERENCES,
+      key: UserMetadataKey.Preferences,
       value: getPreferencesPartial(updated),
     });
 
@@ -99,7 +99,7 @@ export class UserService extends BaseService {
     });
 
     if (oldpath !== '') {
-      await this.jobRepository.queue({ name: JobName.DELETE_FILES, data: { files: [oldpath] } });
+      await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files: [oldpath] } });
     }
 
     return {
@@ -115,7 +115,7 @@ export class UserService extends BaseService {
       throw new BadRequestException("Can't delete a missing profile Image");
     }
     await this.userRepository.update(auth.user.id, { profileImagePath: '', profileChangedAt: new Date() });
-    await this.jobRepository.queue({ name: JobName.DELETE_FILES, data: { files: [user.profileImagePath] } });
+    await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files: [user.profileImagePath] } });
   }
 
   async getProfileImage(id: string): Promise<ImmichFileResponse> {
@@ -127,7 +127,7 @@ export class UserService extends BaseService {
     return new ImmichFileResponse({
       path: user.profileImagePath,
       contentType: 'image/jpeg',
-      cacheControl: CacheControl.NONE,
+      cacheControl: CacheControl.None,
     });
   }
 
@@ -135,7 +135,7 @@ export class UserService extends BaseService {
     const metadata = await this.userRepository.getMetadata(auth.user.id);
 
     const license = metadata.find(
-      (item): item is UserMetadataItem<UserMetadataKey.LICENSE> => item.key === UserMetadataKey.LICENSE,
+      (item): item is UserMetadataItem<UserMetadataKey.License> => item.key === UserMetadataKey.License,
     );
     if (!license) {
       throw new NotFoundException();
@@ -144,7 +144,7 @@ export class UserService extends BaseService {
   }
 
   async deleteLicense({ user }: AuthDto): Promise<void> {
-    await this.userRepository.deleteMetadata(user.id, UserMetadataKey.LICENSE);
+    await this.userRepository.deleteMetadata(user.id, UserMetadataKey.License);
   }
 
   async setLicense(auth: AuthDto, license: LicenseKeyDto): Promise<LicenseResponseDto> {
@@ -173,7 +173,7 @@ export class UserService extends BaseService {
     const activatedAt = new Date();
 
     await this.userRepository.upsertMetadata(auth.user.id, {
-      key: UserMetadataKey.LICENSE,
+      key: UserMetadataKey.License,
       value: { ...license, activatedAt: activatedAt.toISOString() },
     });
 
@@ -184,7 +184,7 @@ export class UserService extends BaseService {
     const metadata = await this.userRepository.getMetadata(auth.user.id);
 
     const onboardingData = metadata.find(
-      (item): item is UserMetadataItem<UserMetadataKey.ONBOARDING> => item.key === UserMetadataKey.ONBOARDING,
+      (item): item is UserMetadataItem<UserMetadataKey.Onboarding> => item.key === UserMetadataKey.Onboarding,
     )?.value;
 
     if (!onboardingData) {
@@ -197,12 +197,12 @@ export class UserService extends BaseService {
   }
 
   async deleteOnboarding({ user }: AuthDto): Promise<void> {
-    await this.userRepository.deleteMetadata(user.id, UserMetadataKey.ONBOARDING);
+    await this.userRepository.deleteMetadata(user.id, UserMetadataKey.Onboarding);
   }
 
   async setOnboarding(auth: AuthDto, onboarding: OnboardingDto): Promise<OnboardingResponseDto> {
     await this.userRepository.upsertMetadata(auth.user.id, {
-      key: UserMetadataKey.ONBOARDING,
+      key: UserMetadataKey.Onboarding,
       value: {
         isOnboarded: onboarding.isOnboarded,
       },
@@ -213,42 +213,42 @@ export class UserService extends BaseService {
     };
   }
 
-  @OnJob({ name: JobName.USER_SYNC_USAGE, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.userSyncUsage, queue: QueueName.BackgroundTask })
   async handleUserSyncUsage(): Promise<JobStatus> {
     await this.userRepository.syncUsage();
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.USER_DELETE_CHECK, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.UserDeleteCheck, queue: QueueName.BackgroundTask })
   async handleUserDeleteCheck(): Promise<JobStatus> {
     const config = await this.getConfig({ withCache: false });
     const users = await this.userRepository.getDeletedAfter(DateTime.now().minus({ days: config.user.deleteDelay }));
-    await this.jobRepository.queueAll(users.map((user) => ({ name: JobName.USER_DELETION, data: { id: user.id } })));
-    return JobStatus.SUCCESS;
+    await this.jobRepository.queueAll(users.map((user) => ({ name: JobName.UserDeletion, data: { id: user.id } })));
+    return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.USER_DELETION, queue: QueueName.BACKGROUND_TASK })
-  async handleUserDelete({ id, force }: JobOf<JobName.USER_DELETION>): Promise<JobStatus> {
+  @OnJob({ name: JobName.UserDeletion, queue: QueueName.BackgroundTask })
+  async handleUserDelete({ id, force }: JobOf<JobName.UserDeletion>): Promise<JobStatus> {
     const config = await this.getConfig({ withCache: false });
     const user = await this.userRepository.get(id, { withDeleted: true });
     if (!user) {
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
     // just for extra protection here
     if (!force && !this.isReadyForDeletion(user, config.user.deleteDelay)) {
       this.logger.warn(`Skipped user that was not ready for deletion: id=${id}`);
-      return JobStatus.SKIPPED;
+      return JobStatus.Skipped;
     }
 
     this.logger.log(`Deleting user: ${user.id}`);
 
     const folders = [
       StorageCore.getLibraryFolder(user),
-      StorageCore.getFolderLocation(StorageFolder.UPLOAD, user.id),
-      StorageCore.getFolderLocation(StorageFolder.PROFILE, user.id),
-      StorageCore.getFolderLocation(StorageFolder.THUMBNAILS, user.id),
-      StorageCore.getFolderLocation(StorageFolder.ENCODED_VIDEO, user.id),
+      StorageCore.getFolderLocation(StorageFolder.Upload, user.id),
+      StorageCore.getFolderLocation(StorageFolder.Profile, user.id),
+      StorageCore.getFolderLocation(StorageFolder.Thumbnails, user.id),
+      StorageCore.getFolderLocation(StorageFolder.EncodedVideo, user.id),
     ];
 
     for (const folder of folders) {
@@ -260,7 +260,7 @@ export class UserService extends BaseService {
     await this.albumRepository.deleteAll(user.id);
     await this.userRepository.delete(user, true);
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   private isReadyForDeletion(user: { id: string; deletedAt?: Date | null }, deleteDelay: number): boolean {
diff --git a/server/src/services/version.service.spec.ts b/server/src/services/version.service.spec.ts
index a83d9f85b6..73794275ea 100644
--- a/server/src/services/version.service.spec.ts
+++ b/server/src/services/version.service.spec.ts
@@ -72,18 +72,18 @@ describe(VersionService.name, () => {
   describe('handQueueVersionCheck', () => {
     it('should queue a version check job', async () => {
       await expect(sut.handleQueueVersionCheck()).resolves.toBeUndefined();
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.VERSION_CHECK, data: {} });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.VersionCheck, data: {} });
     });
   });
 
   describe('handVersionCheck', () => {
     beforeEach(() => {
-      mocks.config.getEnv.mockReturnValue(mockEnvData({ environment: ImmichEnvironment.PRODUCTION }));
+      mocks.config.getEnv.mockReturnValue(mockEnvData({ environment: ImmichEnvironment.Production }));
     });
 
     it('should not run in dev mode', async () => {
-      mocks.config.getEnv.mockReturnValue(mockEnvData({ environment: ImmichEnvironment.DEVELOPMENT }));
-      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.SKIPPED);
+      mocks.config.getEnv.mockReturnValue(mockEnvData({ environment: ImmichEnvironment.Development }));
+      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.Skipped);
     });
 
     it('should not run if the last check was < 60 minutes ago', async () => {
@@ -91,12 +91,12 @@ describe(VersionService.name, () => {
         checkedAt: DateTime.utc().minus({ minutes: 5 }).toISO(),
         releaseVersion: '1.0.0',
       });
-      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.SKIPPED);
+      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.Skipped);
     });
 
     it('should not run if version check is disabled', async () => {
       mocks.systemMetadata.get.mockResolvedValue({ newVersionCheck: { enabled: false } });
-      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.SKIPPED);
+      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.Skipped);
     });
 
     it('should run if it has been > 60 minutes', async () => {
@@ -105,7 +105,7 @@ describe(VersionService.name, () => {
         checkedAt: DateTime.utc().minus({ minutes: 65 }).toISO(),
         releaseVersion: '1.0.0',
       });
-      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.SUCCESS);
+      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.Success);
       expect(mocks.systemMetadata.set).toHaveBeenCalled();
       expect(mocks.logger.log).toHaveBeenCalled();
       expect(mocks.event.clientBroadcast).toHaveBeenCalled();
@@ -113,8 +113,8 @@ describe(VersionService.name, () => {
 
     it('should not notify if the version is equal', async () => {
       mocks.serverInfo.getGitHubRelease.mockResolvedValue(mockRelease(serverVersion.toString()));
-      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.SUCCESS);
-      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.VERSION_CHECK_STATE, {
+      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.Success);
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.VersionCheckState, {
         checkedAt: expect.any(String),
         releaseVersion: serverVersion.toString(),
       });
@@ -123,7 +123,7 @@ describe(VersionService.name, () => {
 
     it('should handle a github error', async () => {
       mocks.serverInfo.getGitHubRelease.mockRejectedValue(new Error('GitHub is down'));
-      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.FAILED);
+      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.Failed);
       expect(mocks.systemMetadata.set).not.toHaveBeenCalled();
       expect(mocks.event.clientBroadcast).not.toHaveBeenCalled();
       expect(mocks.logger.warn).toHaveBeenCalled();
diff --git a/server/src/services/version.service.ts b/server/src/services/version.service.ts
index 51d31b623f..5d2f87c2bf 100644
--- a/server/src/services/version.service.ts
+++ b/server/src/services/version.service.ts
@@ -41,7 +41,7 @@ export class VersionService extends BaseService {
 
         const needsNewMemories = semver.lt(previousVersion, '1.129.0');
         if (needsNewMemories) {
-          await this.jobRepository.queue({ name: JobName.MEMORIES_CREATE });
+          await this.jobRepository.queue({ name: JobName.MemoriesCreate });
         }
       }
     });
@@ -56,31 +56,31 @@ export class VersionService extends BaseService {
   }
 
   async handleQueueVersionCheck() {
-    await this.jobRepository.queue({ name: JobName.VERSION_CHECK, data: {} });
+    await this.jobRepository.queue({ name: JobName.VersionCheck, data: {} });
   }
 
-  @OnJob({ name: JobName.VERSION_CHECK, queue: QueueName.BACKGROUND_TASK })
+  @OnJob({ name: JobName.VersionCheck, queue: QueueName.BackgroundTask })
   async handleVersionCheck(): Promise<JobStatus> {
     try {
       this.logger.debug('Running version check');
 
       const { environment } = this.configRepository.getEnv();
-      if (environment === ImmichEnvironment.DEVELOPMENT) {
-        return JobStatus.SKIPPED;
+      if (environment === ImmichEnvironment.Development) {
+        return JobStatus.Skipped;
       }
 
       const { newVersionCheck } = await this.getConfig({ withCache: true });
       if (!newVersionCheck.enabled) {
-        return JobStatus.SKIPPED;
+        return JobStatus.Skipped;
       }
 
-      const versionCheck = await this.systemMetadataRepository.get(SystemMetadataKey.VERSION_CHECK_STATE);
+      const versionCheck = await this.systemMetadataRepository.get(SystemMetadataKey.VersionCheckState);
       if (versionCheck?.checkedAt) {
         const lastUpdate = DateTime.fromISO(versionCheck.checkedAt);
         const elapsedTime = DateTime.now().diff(lastUpdate).as('minutes');
         // check once per hour (max)
         if (elapsedTime < 60) {
-          return JobStatus.SKIPPED;
+          return JobStatus.Skipped;
         }
       }
 
@@ -88,7 +88,7 @@ export class VersionService extends BaseService {
         await this.serverInfoRepository.getGitHubRelease();
       const metadata: VersionCheckMetadata = { checkedAt: DateTime.utc().toISO(), releaseVersion };
 
-      await this.systemMetadataRepository.set(SystemMetadataKey.VERSION_CHECK_STATE, metadata);
+      await this.systemMetadataRepository.set(SystemMetadataKey.VersionCheckState, metadata);
 
       if (semver.gt(releaseVersion, serverVersion)) {
         this.logger.log(`Found ${releaseVersion}, released at ${new Date(publishedAt).toLocaleString()}`);
@@ -96,16 +96,16 @@ export class VersionService extends BaseService {
       }
     } catch (error: Error | any) {
       this.logger.warn(`Unable to run version check: ${error}`, error?.stack);
-      return JobStatus.FAILED;
+      return JobStatus.Failed;
     }
 
-    return JobStatus.SUCCESS;
+    return JobStatus.Success;
   }
 
   @OnEvent({ name: 'WebsocketConnect' })
   async onWebsocketConnection({ userId }: ArgOf<'WebsocketConnect'>) {
     this.eventRepository.clientSend('on_server_version', userId, serverVersion);
-    const metadata = await this.systemMetadataRepository.get(SystemMetadataKey.VERSION_CHECK_STATE);
+    const metadata = await this.systemMetadataRepository.get(SystemMetadataKey.VersionCheckState);
     if (metadata) {
       this.eventRepository.clientSend('on_new_release', userId, asNotification(metadata));
     }
diff --git a/server/src/types.ts b/server/src/types.ts
index 6776604078..6873613c30 100644
--- a/server/src/types.ts
+++ b/server/src/types.ts
@@ -161,10 +161,10 @@ export interface VideoInterfaces {
 
 export type ConcurrentQueueName = Exclude<
   QueueName,
-  | QueueName.STORAGE_TEMPLATE_MIGRATION
-  | QueueName.FACIAL_RECOGNITION
-  | QueueName.DUPLICATE_DETECTION
-  | QueueName.BACKUP_DATABASE
+  | QueueName.StorageTemplateMigration
+  | QueueName.FacialRecognition
+  | QueueName.DuplicateDetection
+  | QueueName.BackupDatabase
 >;
 
 export type Jobs = { [K in JobItem['name']]: (JobItem & { name: K })['data'] };
@@ -273,96 +273,96 @@ export interface QueueStatus {
 
 export type JobItem =
   // Backups
-  | { name: JobName.BACKUP_DATABASE; data?: IBaseJob }
+  | { name: JobName.BackupDatabase; data?: IBaseJob }
 
   // Transcoding
-  | { name: JobName.QUEUE_VIDEO_CONVERSION; data: IBaseJob }
-  | { name: JobName.VIDEO_CONVERSION; data: IEntityJob }
+  | { name: JobName.QueueVideoConversion; data: IBaseJob }
+  | { name: JobName.VideoConversation; data: IEntityJob }
 
   // Thumbnails
-  | { name: JobName.QUEUE_GENERATE_THUMBNAILS; data: IBaseJob }
-  | { name: JobName.GENERATE_THUMBNAILS; data: IEntityJob }
+  | { name: JobName.QueueGenerateThumbnails; data: IBaseJob }
+  | { name: JobName.GenerateThumbnails; data: IEntityJob }
 
   // User
-  | { name: JobName.USER_DELETE_CHECK; data?: IBaseJob }
-  | { name: JobName.USER_DELETION; data: IEntityJob }
-  | { name: JobName.USER_SYNC_USAGE; data?: IBaseJob }
+  | { name: JobName.UserDeleteCheck; data?: IBaseJob }
+  | { name: JobName.UserDeletion; data: IEntityJob }
+  | { name: JobName.userSyncUsage; data?: IBaseJob }
 
   // Storage Template
-  | { name: JobName.STORAGE_TEMPLATE_MIGRATION; data?: IBaseJob }
-  | { name: JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE; data: IEntityJob }
+  | { name: JobName.StorageTemplateMigration; data?: IBaseJob }
+  | { name: JobName.StorageTemplateMigrationSingle; data: IEntityJob }
 
   // Migration
-  | { name: JobName.QUEUE_MIGRATION; data?: IBaseJob }
-  | { name: JobName.MIGRATE_ASSET; data: IEntityJob }
-  | { name: JobName.MIGRATE_PERSON; data: IEntityJob }
+  | { name: JobName.QueueMigration; data?: IBaseJob }
+  | { name: JobName.MigrateAsset; data: IEntityJob }
+  | { name: JobName.MigratePerson; data: IEntityJob }
 
   // Metadata Extraction
-  | { name: JobName.QUEUE_METADATA_EXTRACTION; data: IBaseJob }
-  | { name: JobName.METADATA_EXTRACTION; data: IEntityJob }
+  | { name: JobName.QueueMetadataExtraction; data: IBaseJob }
+  | { name: JobName.MetadataExtraction; data: IEntityJob }
 
   // Notifications
-  | { name: JobName.NOTIFICATIONS_CLEANUP; data?: IBaseJob }
+  | { name: JobName.NotificationsCleanup; data?: IBaseJob }
 
   // Sidecar Scanning
-  | { name: JobName.QUEUE_SIDECAR; data: IBaseJob }
-  | { name: JobName.SIDECAR_DISCOVERY; data: IEntityJob }
-  | { name: JobName.SIDECAR_SYNC; data: IEntityJob }
-  | { name: JobName.SIDECAR_WRITE; data: ISidecarWriteJob }
+  | { name: JobName.QueueSidecar; data: IBaseJob }
+  | { name: JobName.SidecarDiscovery; data: IEntityJob }
+  | { name: JobName.SidecarSync; data: IEntityJob }
+  | { name: JobName.SidecarWrite; data: ISidecarWriteJob }
 
   // Facial Recognition
-  | { name: JobName.QUEUE_FACE_DETECTION; data: IBaseJob }
-  | { name: JobName.FACE_DETECTION; data: IEntityJob }
-  | { name: JobName.QUEUE_FACIAL_RECOGNITION; data: INightlyJob }
-  | { name: JobName.FACIAL_RECOGNITION; data: IDeferrableJob }
-  | { name: JobName.GENERATE_PERSON_THUMBNAIL; data: IEntityJob }
+  | { name: JobName.QueueFaceDetection; data: IBaseJob }
+  | { name: JobName.FaceDetection; data: IEntityJob }
+  | { name: JobName.QueueFacialRecognition; data: INightlyJob }
+  | { name: JobName.FacialRecognition; data: IDeferrableJob }
+  | { name: JobName.GeneratePersonThumbnail; data: IEntityJob }
 
   // Smart Search
-  | { name: JobName.QUEUE_SMART_SEARCH; data: IBaseJob }
-  | { name: JobName.SMART_SEARCH; data: IEntityJob }
-  | { name: JobName.QUEUE_TRASH_EMPTY; data?: IBaseJob }
+  | { name: JobName.QueueSmartSearch; data: IBaseJob }
+  | { name: JobName.SmartSearch; data: IEntityJob }
+  | { name: JobName.QueueTrashEmpty; data?: IBaseJob }
 
   // Duplicate Detection
-  | { name: JobName.QUEUE_DUPLICATE_DETECTION; data: IBaseJob }
-  | { name: JobName.DUPLICATE_DETECTION; data: IEntityJob }
+  | { name: JobName.QueueDuplicateDetection; data: IBaseJob }
+  | { name: JobName.DuplicateDetection; data: IEntityJob }
 
   // Memories
-  | { name: JobName.MEMORIES_CLEANUP; data?: IBaseJob }
-  | { name: JobName.MEMORIES_CREATE; data?: IBaseJob }
+  | { name: JobName.MemoriesCleanup; data?: IBaseJob }
+  | { name: JobName.MemoriesCreate; data?: IBaseJob }
 
   // Filesystem
-  | { name: JobName.DELETE_FILES; data: IDeleteFilesJob }
+  | { name: JobName.DeleteFiles; data: IDeleteFilesJob }
 
   // Cleanup
-  | { name: JobName.CLEAN_OLD_AUDIT_LOGS; data?: IBaseJob }
-  | { name: JobName.CLEAN_OLD_SESSION_TOKENS; data?: IBaseJob }
+  | { name: JobName.CleanOldAuditLogs; data?: IBaseJob }
+  | { name: JobName.CleanOldSessionTokens; data?: IBaseJob }
 
   // Tags
-  | { name: JobName.TAG_CLEANUP; data?: IBaseJob }
+  | { name: JobName.TagCleanup; data?: IBaseJob }
 
   // Asset Deletion
-  | { name: JobName.PERSON_CLEANUP; data?: IBaseJob }
-  | { name: JobName.ASSET_DELETION; data: IAssetDeleteJob }
-  | { name: JobName.ASSET_DELETION_CHECK; data?: IBaseJob }
+  | { name: JobName.PersonCleanup; data?: IBaseJob }
+  | { name: JobName.AssetDeletion; data: IAssetDeleteJob }
+  | { name: JobName.AssetDeletionCheck; data?: IBaseJob }
 
   // Library Management
-  | { name: JobName.LIBRARY_SYNC_FILES; data: ILibraryFileJob }
-  | { name: JobName.LIBRARY_QUEUE_SYNC_FILES; data: IEntityJob }
-  | { name: JobName.LIBRARY_QUEUE_SYNC_ASSETS; data: IEntityJob }
-  | { name: JobName.LIBRARY_SYNC_ASSETS; data: ILibraryBulkIdsJob }
-  | { name: JobName.LIBRARY_ASSET_REMOVAL; data: ILibraryFileJob }
-  | { name: JobName.LIBRARY_DELETE; data: IEntityJob }
-  | { name: JobName.LIBRARY_QUEUE_SCAN_ALL; data?: IBaseJob }
-  | { name: JobName.LIBRARY_QUEUE_CLEANUP; data: IBaseJob }
+  | { name: JobName.LibrarySyncFiles; data: ILibraryFileJob }
+  | { name: JobName.LibraryQueueSyncFiles; data: IEntityJob }
+  | { name: JobName.LibraryQueueSyncAssets; data: IEntityJob }
+  | { name: JobName.LibrarySyncAssets; data: ILibraryBulkIdsJob }
+  | { name: JobName.LibraryAssetRemoval; data: ILibraryFileJob }
+  | { name: JobName.LibraryDelete; data: IEntityJob }
+  | { name: JobName.LibraryQueueScanAll; data?: IBaseJob }
+  | { name: JobName.LibraryQueueCleanup; data: IBaseJob }
 
   // Notification
-  | { name: JobName.SEND_EMAIL; data: IEmailJob }
-  | { name: JobName.NOTIFY_ALBUM_INVITE; data: INotifyAlbumInviteJob }
-  | { name: JobName.NOTIFY_ALBUM_UPDATE; data: INotifyAlbumUpdateJob }
-  | { name: JobName.NOTIFY_SIGNUP; data: INotifySignupJob }
+  | { name: JobName.SendMail; data: IEmailJob }
+  | { name: JobName.NotifyAlbumInvite; data: INotifyAlbumInviteJob }
+  | { name: JobName.NotifyAlbumUpdate; data: INotifyAlbumUpdateJob }
+  | { name: JobName.NotifySignup; data: INotifySignupJob }
 
   // Version check
-  | { name: JobName.VERSION_CHECK; data: IBaseJob };
+  | { name: JobName.VersionCheck; data: IBaseJob };
 
 export type VectorExtension = (typeof VECTOR_EXTENSIONS)[number];
 
@@ -442,7 +442,7 @@ export type StorageAsset = {
 export type OnThisDayData = { year: number };
 
 export interface MemoryData {
-  [MemoryType.ON_THIS_DAY]: OnThisDayData;
+  [MemoryType.OnThisDay]: OnThisDayData;
 }
 
 export type VersionCheckMetadata = { checkedAt: string; releaseVersion: string };
@@ -453,14 +453,14 @@ export type MemoriesState = {
 };
 
 export interface SystemMetadata extends Record<SystemMetadataKey, Record<string, any>> {
-  [SystemMetadataKey.ADMIN_ONBOARDING]: { isOnboarded: boolean };
-  [SystemMetadataKey.FACIAL_RECOGNITION_STATE]: { lastRun?: string };
-  [SystemMetadataKey.LICENSE]: { licenseKey: string; activationKey: string; activatedAt: Date };
-  [SystemMetadataKey.REVERSE_GEOCODING_STATE]: { lastUpdate?: string; lastImportFileName?: string };
-  [SystemMetadataKey.SYSTEM_CONFIG]: DeepPartial<SystemConfig>;
-  [SystemMetadataKey.SYSTEM_FLAGS]: DeepPartial<SystemFlags>;
-  [SystemMetadataKey.VERSION_CHECK_STATE]: VersionCheckMetadata;
-  [SystemMetadataKey.MEMORIES_STATE]: MemoriesState;
+  [SystemMetadataKey.AdminOnboarding]: { isOnboarded: boolean };
+  [SystemMetadataKey.FacialRecognitionState]: { lastRun?: string };
+  [SystemMetadataKey.License]: { licenseKey: string; activationKey: string; activatedAt: Date };
+  [SystemMetadataKey.ReverseGeocodingState]: { lastUpdate?: string; lastImportFileName?: string };
+  [SystemMetadataKey.SystemConfig]: DeepPartial<SystemConfig>;
+  [SystemMetadataKey.SystemFlags]: DeepPartial<SystemFlags>;
+  [SystemMetadataKey.VersionCheckState]: VersionCheckMetadata;
+  [SystemMetadataKey.MemoriesState]: MemoriesState;
 }
 
 export type UserMetadataItem<T extends keyof UserMetadata = UserMetadataKey> = {
@@ -513,7 +513,7 @@ export interface UserPreferences {
 }
 
 export interface UserMetadata extends Record<UserMetadataKey, Record<string, any>> {
-  [UserMetadataKey.PREFERENCES]: DeepPartial<UserPreferences>;
-  [UserMetadataKey.LICENSE]: { licenseKey: string; activationKey: string; activatedAt: string };
-  [UserMetadataKey.ONBOARDING]: { isOnboarded: boolean };
+  [UserMetadataKey.Preferences]: DeepPartial<UserPreferences>;
+  [UserMetadataKey.License]: { licenseKey: string; activationKey: string; activatedAt: string };
+  [UserMetadataKey.Onboarding]: { isOnboarded: boolean };
 }
diff --git a/server/src/utils/access.ts b/server/src/utils/access.ts
index b639643b6f..08ff81e840 100644
--- a/server/src/utils/access.ts
+++ b/server/src/utils/access.ts
@@ -11,7 +11,7 @@ export type GrantedRequest = {
 };
 
 export const isGranted = ({ requested, current }: GrantedRequest) => {
-  if (current.includes(Permission.ALL)) {
+  if (current.includes(Permission.All)) {
     return true;
   }
 
@@ -63,36 +63,36 @@ const checkSharedLinkAccess = async (
   const sharedLinkId = sharedLink.id;
 
   switch (permission) {
-    case Permission.ASSET_READ: {
+    case Permission.AssetRead: {
       return await access.asset.checkSharedLinkAccess(sharedLinkId, ids);
     }
 
-    case Permission.ASSET_VIEW: {
+    case Permission.AssetView: {
       return await access.asset.checkSharedLinkAccess(sharedLinkId, ids);
     }
 
-    case Permission.ASSET_DOWNLOAD: {
+    case Permission.AssetDownload: {
       return sharedLink.allowDownload ? await access.asset.checkSharedLinkAccess(sharedLinkId, ids) : new Set();
     }
 
-    case Permission.ASSET_UPLOAD: {
+    case Permission.AssetUpload: {
       return sharedLink.allowUpload ? ids : new Set();
     }
 
-    case Permission.ASSET_SHARE: {
+    case Permission.AssetShare: {
       // TODO: fix this to not use sharedLink.userId for access control
       return await access.asset.checkOwnerAccess(sharedLink.userId, ids, false);
     }
 
-    case Permission.ALBUM_READ: {
+    case Permission.AlbumRead: {
       return await access.album.checkSharedLinkAccess(sharedLinkId, ids);
     }
 
-    case Permission.ALBUM_DOWNLOAD: {
+    case Permission.AlbumDownload: {
       return sharedLink.allowDownload ? await access.album.checkSharedLinkAccess(sharedLinkId, ids) : new Set();
     }
 
-    case Permission.ALBUM_ADD_ASSET: {
+    case Permission.AlbumAddAsset: {
       return sharedLink.allowUpload ? await access.album.checkSharedLinkAccess(sharedLinkId, ids) : new Set();
     }
 
@@ -107,190 +107,190 @@ const checkOtherAccess = async (access: AccessRepository, request: OtherAccessRe
 
   switch (permission) {
     // uses album id
-    case Permission.ACTIVITY_CREATE: {
+    case Permission.ActivityCreate: {
       return await access.activity.checkCreateAccess(auth.user.id, ids);
     }
 
     // uses activity id
-    case Permission.ACTIVITY_DELETE: {
+    case Permission.ActivityDelete: {
       const isOwner = await access.activity.checkOwnerAccess(auth.user.id, ids);
       const isAlbumOwner = await access.activity.checkAlbumOwnerAccess(auth.user.id, setDifference(ids, isOwner));
       return setUnion(isOwner, isAlbumOwner);
     }
 
-    case Permission.ASSET_READ: {
+    case Permission.AssetRead: {
       const isOwner = await access.asset.checkOwnerAccess(auth.user.id, ids, auth.session?.hasElevatedPermission);
       const isAlbum = await access.asset.checkAlbumAccess(auth.user.id, setDifference(ids, isOwner));
       const isPartner = await access.asset.checkPartnerAccess(auth.user.id, setDifference(ids, isOwner, isAlbum));
       return setUnion(isOwner, isAlbum, isPartner);
     }
 
-    case Permission.ASSET_SHARE: {
+    case Permission.AssetShare: {
       const isOwner = await access.asset.checkOwnerAccess(auth.user.id, ids, false);
       const isPartner = await access.asset.checkPartnerAccess(auth.user.id, setDifference(ids, isOwner));
       return setUnion(isOwner, isPartner);
     }
 
-    case Permission.ASSET_VIEW: {
+    case Permission.AssetView: {
       const isOwner = await access.asset.checkOwnerAccess(auth.user.id, ids, auth.session?.hasElevatedPermission);
       const isAlbum = await access.asset.checkAlbumAccess(auth.user.id, setDifference(ids, isOwner));
       const isPartner = await access.asset.checkPartnerAccess(auth.user.id, setDifference(ids, isOwner, isAlbum));
       return setUnion(isOwner, isAlbum, isPartner);
     }
 
-    case Permission.ASSET_DOWNLOAD: {
+    case Permission.AssetDownload: {
       const isOwner = await access.asset.checkOwnerAccess(auth.user.id, ids, auth.session?.hasElevatedPermission);
       const isAlbum = await access.asset.checkAlbumAccess(auth.user.id, setDifference(ids, isOwner));
       const isPartner = await access.asset.checkPartnerAccess(auth.user.id, setDifference(ids, isOwner, isAlbum));
       return setUnion(isOwner, isAlbum, isPartner);
     }
 
-    case Permission.ASSET_UPDATE: {
+    case Permission.AssetUpdate: {
       return await access.asset.checkOwnerAccess(auth.user.id, ids, auth.session?.hasElevatedPermission);
     }
 
-    case Permission.ASSET_DELETE: {
+    case Permission.AssetDelete: {
       return await access.asset.checkOwnerAccess(auth.user.id, ids, auth.session?.hasElevatedPermission);
     }
 
-    case Permission.ALBUM_READ: {
+    case Permission.AlbumRead: {
       const isOwner = await access.album.checkOwnerAccess(auth.user.id, ids);
       const isShared = await access.album.checkSharedAlbumAccess(
         auth.user.id,
         setDifference(ids, isOwner),
-        AlbumUserRole.VIEWER,
+        AlbumUserRole.Viewer,
       );
       return setUnion(isOwner, isShared);
     }
 
-    case Permission.ALBUM_ADD_ASSET: {
+    case Permission.AlbumAddAsset: {
       const isOwner = await access.album.checkOwnerAccess(auth.user.id, ids);
       const isShared = await access.album.checkSharedAlbumAccess(
         auth.user.id,
         setDifference(ids, isOwner),
-        AlbumUserRole.EDITOR,
+        AlbumUserRole.Editor,
       );
       return setUnion(isOwner, isShared);
     }
 
-    case Permission.ALBUM_UPDATE: {
+    case Permission.AlbumUpdate: {
       return await access.album.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.ALBUM_DELETE: {
+    case Permission.AlbumDelete: {
       return await access.album.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.ALBUM_SHARE: {
+    case Permission.AlbumShare: {
       return await access.album.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.ALBUM_DOWNLOAD: {
+    case Permission.AlbumDownload: {
       const isOwner = await access.album.checkOwnerAccess(auth.user.id, ids);
       const isShared = await access.album.checkSharedAlbumAccess(
         auth.user.id,
         setDifference(ids, isOwner),
-        AlbumUserRole.VIEWER,
+        AlbumUserRole.Viewer,
       );
       return setUnion(isOwner, isShared);
     }
 
-    case Permission.ALBUM_REMOVE_ASSET: {
+    case Permission.AlbumRemoveAsset: {
       const isOwner = await access.album.checkOwnerAccess(auth.user.id, ids);
       const isShared = await access.album.checkSharedAlbumAccess(
         auth.user.id,
         setDifference(ids, isOwner),
-        AlbumUserRole.EDITOR,
+        AlbumUserRole.Editor,
       );
       return setUnion(isOwner, isShared);
     }
 
-    case Permission.ASSET_UPLOAD: {
+    case Permission.AssetUpload: {
       return ids.has(auth.user.id) ? new Set([auth.user.id]) : new Set<string>();
     }
 
-    case Permission.ARCHIVE_READ: {
+    case Permission.ArchiveRead: {
       return ids.has(auth.user.id) ? new Set([auth.user.id]) : new Set();
     }
 
-    case Permission.AUTH_DEVICE_DELETE: {
+    case Permission.AuthDeviceDelete: {
       return await access.authDevice.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.FACE_DELETE: {
+    case Permission.FaceDelete: {
       return access.person.checkFaceOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.NOTIFICATION_READ:
-    case Permission.NOTIFICATION_UPDATE:
-    case Permission.NOTIFICATION_DELETE: {
+    case Permission.NotificationRead:
+    case Permission.NotificationUpdate:
+    case Permission.NotificationDelete: {
       return access.notification.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.TAG_ASSET:
-    case Permission.TAG_READ:
-    case Permission.TAG_UPDATE:
-    case Permission.TAG_DELETE: {
+    case Permission.TagAsset:
+    case Permission.TagRead:
+    case Permission.TagUpdate:
+    case Permission.TagDelete: {
       return await access.tag.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.TIMELINE_READ: {
+    case Permission.TimelineRead: {
       const isOwner = ids.has(auth.user.id) ? new Set([auth.user.id]) : new Set<string>();
       const isPartner = await access.timeline.checkPartnerAccess(auth.user.id, setDifference(ids, isOwner));
       return setUnion(isOwner, isPartner);
     }
 
-    case Permission.TIMELINE_DOWNLOAD: {
+    case Permission.TimelineDownload: {
       return ids.has(auth.user.id) ? new Set([auth.user.id]) : new Set();
     }
 
-    case Permission.MEMORY_READ: {
+    case Permission.MemoryRead: {
       return access.memory.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.MEMORY_UPDATE: {
+    case Permission.MemoryUpdate: {
       return access.memory.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.MEMORY_DELETE: {
+    case Permission.MemoryDelete: {
       return access.memory.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.PERSON_CREATE: {
+    case Permission.PersonCreate: {
       return access.person.checkFaceOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.PERSON_READ:
-    case Permission.PERSON_UPDATE:
-    case Permission.PERSON_DELETE:
-    case Permission.PERSON_MERGE: {
+    case Permission.PersonRead:
+    case Permission.PersonUpdate:
+    case Permission.PersonDelete:
+    case Permission.PersonMerge: {
       return await access.person.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.PERSON_REASSIGN: {
+    case Permission.PersonReassign: {
       return access.person.checkFaceOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.PARTNER_UPDATE: {
+    case Permission.PartnerUpdate: {
       return await access.partner.checkUpdateAccess(auth.user.id, ids);
     }
 
-    case Permission.SESSION_READ:
-    case Permission.SESSION_UPDATE:
-    case Permission.SESSION_DELETE:
-    case Permission.SESSION_LOCK: {
+    case Permission.SessionRead:
+    case Permission.SessionUpdate:
+    case Permission.SessionDelete:
+    case Permission.SessionLock: {
       return access.session.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.STACK_READ: {
+    case Permission.StackRead: {
       return access.stack.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.STACK_UPDATE: {
+    case Permission.StackUpdate: {
       return access.stack.checkOwnerAccess(auth.user.id, ids);
     }
 
-    case Permission.STACK_DELETE: {
+    case Permission.StackDelete: {
       return access.stack.checkOwnerAccess(auth.user.id, ids);
     }
 
diff --git a/server/src/utils/asset.util.ts b/server/src/utils/asset.util.ts
index 85bc6cd2e5..1b9e12c1cd 100644
--- a/server/src/utils/asset.util.ts
+++ b/server/src/utils/asset.util.ts
@@ -18,9 +18,9 @@ export const getAssetFile = (files: AssetFile[], type: AssetFileType | Generated
 };
 
 export const getAssetFiles = (files: AssetFile[]) => ({
-  fullsizeFile: getAssetFile(files, AssetFileType.FULLSIZE),
-  previewFile: getAssetFile(files, AssetFileType.PREVIEW),
-  thumbnailFile: getAssetFile(files, AssetFileType.THUMBNAIL),
+  fullsizeFile: getAssetFile(files, AssetFileType.FullSize),
+  previewFile: getAssetFile(files, AssetFileType.Preview),
+  thumbnailFile: getAssetFile(files, AssetFileType.Thumbnail),
 });
 
 export const addAssets = async (
@@ -33,7 +33,7 @@ export const addAssets = async (
   const notPresentAssetIds = dto.assetIds.filter((id) => !existingAssetIds.has(id));
   const allowedAssetIds = await checkAccess(access, {
     auth,
-    permission: Permission.ASSET_SHARE,
+    permission: Permission.AssetShare,
     ids: notPresentAssetIds,
   });
 
@@ -75,7 +75,7 @@ export const removeAssets = async (
   const existingAssetIds = await bulk.getAssetIds(dto.parentId, dto.assetIds);
   const allowedAssetIds = canAlwaysRemove.has(dto.parentId)
     ? existingAssetIds
-    : await checkAccess(access, { auth, permission: Permission.ASSET_SHARE, ids: existingAssetIds });
+    : await checkAccess(access, { auth, permission: Permission.AssetShare, ids: existingAssetIds });
 
   const results: BulkIdResponseDto[] = [];
   for (const assetId of dto.assetIds) {
@@ -143,15 +143,15 @@ export const onBeforeLink = async (
   if (!motionAsset) {
     throw new BadRequestException('Live photo video not found');
   }
-  if (motionAsset.type !== AssetType.VIDEO) {
+  if (motionAsset.type !== AssetType.Video) {
     throw new BadRequestException('Live photo video must be a video');
   }
   if (motionAsset.ownerId !== userId) {
     throw new BadRequestException('Live photo video does not belong to the user');
   }
 
-  if (motionAsset && motionAsset.visibility === AssetVisibility.TIMELINE) {
-    await assetRepository.update({ id: livePhotoVideoId, visibility: AssetVisibility.HIDDEN });
+  if (motionAsset && motionAsset.visibility === AssetVisibility.Timeline) {
+    await assetRepository.update({ id: livePhotoVideoId, visibility: AssetVisibility.Hidden });
     await eventRepository.emit('AssetHide', { assetId: motionAsset.id, userId });
   }
 };
diff --git a/server/src/utils/config.ts b/server/src/utils/config.ts
index bc1d2dae1b..a669af31cf 100644
--- a/server/src/utils/config.ts
+++ b/server/src/utils/config.ts
@@ -60,7 +60,7 @@ export const updateConfig = async (repos: RepoDeps, newConfig: SystemConfig): Pr
     _.set(partialConfig, property, newValue);
   }
 
-  await metadataRepo.set(SystemMetadataKey.SYSTEM_CONFIG, partialConfig);
+  await metadataRepo.set(SystemMetadataKey.SystemConfig, partialConfig);
 
   return getConfig(repos, { withCache: false });
 };
@@ -83,7 +83,7 @@ const buildConfig = async (repos: RepoDeps) => {
   // load partial
   const partial = configFile
     ? await loadFromFile(repos, configFile)
-    : await metadataRepo.get(SystemMetadataKey.SYSTEM_CONFIG);
+    : await metadataRepo.get(SystemMetadataKey.SystemConfig);
 
   // merge with defaults
   const rawConfig = _.cloneDeep(defaults);
diff --git a/server/src/utils/database.ts b/server/src/utils/database.ts
index f23a3deb35..1ef9b8e926 100644
--- a/server/src/utils/database.ts
+++ b/server/src/utils/database.ts
@@ -154,7 +154,7 @@ export function toJson<DB, TB extends keyof DB & string, T extends TB | Expressi
 export const ASSET_CHECKSUM_CONSTRAINT = 'UQ_assets_owner_checksum';
 
 export function withDefaultVisibility<O>(qb: SelectQueryBuilder<DB, 'asset', O>) {
-  return qb.where('asset.visibility', 'in', [sql.lit(AssetVisibility.ARCHIVE), sql.lit(AssetVisibility.TIMELINE)]);
+  return qb.where('asset.visibility', 'in', [sql.lit(AssetVisibility.Archive), sql.lit(AssetVisibility.Timeline)]);
 }
 
 // TODO come up with a better query that only selects the fields we need
@@ -299,7 +299,7 @@ const joinDeduplicationPlugin = new DeduplicateJoinsPlugin();
 
 export function searchAssetBuilder(kysely: Kysely<DB>, options: AssetSearchBuilderOptions) {
   options.withDeleted ||= !!(options.trashedAfter || options.trashedBefore || options.isOffline);
-  const visibility = options.visibility == null ? AssetVisibility.TIMELINE : options.visibility;
+  const visibility = options.visibility == null ? AssetVisibility.Timeline : options.visibility;
 
   return kysely
     .withPlugin(joinDeduplicationPlugin)
@@ -399,7 +399,7 @@ type VectorIndexQueryOptions = { table: string; vectorExtension: VectorExtension
 
 export function vectorIndexQuery({ vectorExtension, table, indexName, lists }: VectorIndexQueryOptions): string {
   switch (vectorExtension) {
-    case DatabaseExtension.VECTORCHORD: {
+    case DatabaseExtension.VectorChord: {
       return `
         CREATE INDEX IF NOT EXISTS ${indexName} ON ${table} USING vchordrq (embedding vector_cosine_ops) WITH (options = $$
         residual_quantization = false
@@ -410,7 +410,7 @@ export function vectorIndexQuery({ vectorExtension, table, indexName, lists }: V
         sampling_factor = 1024
         $$)`;
     }
-    case DatabaseExtension.VECTORS: {
+    case DatabaseExtension.Vectors: {
       return `
         CREATE INDEX IF NOT EXISTS ${indexName} ON ${table}
         USING vectors (embedding vector_cos_ops) WITH (options = $$
@@ -420,7 +420,7 @@ export function vectorIndexQuery({ vectorExtension, table, indexName, lists }: V
         ef_construction = 300
         $$)`;
     }
-    case DatabaseExtension.VECTOR: {
+    case DatabaseExtension.Vector: {
       return `
         CREATE INDEX IF NOT EXISTS ${indexName} ON ${table}
         USING hnsw (embedding vector_cosine_ops)
diff --git a/server/src/utils/file.ts b/server/src/utils/file.ts
index 716e0b1957..3e1a1b7f68 100644
--- a/server/src/utils/file.ts
+++ b/server/src/utils/file.ts
@@ -34,9 +34,9 @@ type SendFile = Parameters<Response['sendFile']>;
 type SendFileOptions = SendFile[1];
 
 const cacheControlHeaders: Record<CacheControl, string | null> = {
-  [CacheControl.PRIVATE_WITH_CACHE]: 'private, max-age=86400, no-transform',
-  [CacheControl.PRIVATE_WITHOUT_CACHE]: 'private, no-cache, no-transform',
-  [CacheControl.NONE]: null, // falsy value to prevent adding Cache-Control header
+  [CacheControl.PrivateWithCache]: 'private, max-age=86400, no-transform',
+  [CacheControl.PrivateWithoutCache]: 'private, no-cache, no-transform',
+  [CacheControl.None]: null, // falsy value to prevent adding Cache-Control header
 };
 
 export const sendFile = async (
diff --git a/server/src/utils/media.ts b/server/src/utils/media.ts
index b00eb652ef..e43ecba49f 100644
--- a/server/src/utils/media.ts
+++ b/server/src/utils/media.ts
@@ -1,5 +1,5 @@
 import { SystemConfigFFmpegDto } from 'src/dtos/system-config.dto';
-import { CQMode, ToneMapping, TranscodeHWAccel, TranscodeTarget, VideoCodec } from 'src/enum';
+import { CQMode, ToneMapping, TranscodeHardwareAcceleration, TranscodeTarget, VideoCodec } from 'src/enum';
 import {
   AudioStreamInfo,
   BitrateDistribution,
@@ -16,7 +16,7 @@ export class BaseConfig implements VideoCodecSWConfig {
   protected constructor(protected config: SystemConfigFFmpegDto) {}
 
   static create(config: SystemConfigFFmpegDto, interfaces: VideoInterfaces): VideoCodecSWConfig {
-    if (config.accel === TranscodeHWAccel.DISABLED) {
+    if (config.accel === TranscodeHardwareAcceleration.Disabled) {
       return this.getSWCodecConfig(config);
     }
     return this.getHWCodecConfig(config, interfaces);
@@ -27,13 +27,13 @@ export class BaseConfig implements VideoCodecSWConfig {
       case VideoCodec.H264: {
         return new H264Config(config);
       }
-      case VideoCodec.HEVC: {
+      case VideoCodec.Hevc: {
         return new HEVCConfig(config);
       }
-      case VideoCodec.VP9: {
+      case VideoCodec.Vp9: {
         return new VP9Config(config);
       }
-      case VideoCodec.AV1: {
+      case VideoCodec.Av1: {
         return new AV1Config(config);
       }
       default: {
@@ -45,25 +45,25 @@ export class BaseConfig implements VideoCodecSWConfig {
   private static getHWCodecConfig(config: SystemConfigFFmpegDto, interfaces: VideoInterfaces) {
     let handler: VideoCodecHWConfig;
     switch (config.accel) {
-      case TranscodeHWAccel.NVENC: {
+      case TranscodeHardwareAcceleration.Nvenc: {
         handler = config.accelDecode
           ? new NvencHwDecodeConfig(config, interfaces)
           : new NvencSwDecodeConfig(config, interfaces);
         break;
       }
-      case TranscodeHWAccel.QSV: {
+      case TranscodeHardwareAcceleration.Qsv: {
         handler = config.accelDecode
           ? new QsvHwDecodeConfig(config, interfaces)
           : new QsvSwDecodeConfig(config, interfaces);
         break;
       }
-      case TranscodeHWAccel.VAAPI: {
+      case TranscodeHardwareAcceleration.Vaapi: {
         handler = config.accelDecode
           ? new VaapiHwDecodeConfig(config, interfaces)
           : new VaapiSwDecodeConfig(config, interfaces);
         break;
       }
-      case TranscodeHWAccel.RKMPP: {
+      case TranscodeHardwareAcceleration.Rkmpp: {
         handler = config.accelDecode
           ? new RkmppHwDecodeConfig(config, interfaces)
           : new RkmppSwDecodeConfig(config, interfaces);
@@ -94,7 +94,7 @@ export class BaseConfig implements VideoCodecSWConfig {
       twoPass: this.eligibleForTwoPass(),
       progress: { frameCount: videoStream.frameCount, percentInterval: 5 },
     } as TranscodeCommand;
-    if ([TranscodeTarget.ALL, TranscodeTarget.VIDEO].includes(target)) {
+    if ([TranscodeTarget.All, TranscodeTarget.Video].includes(target)) {
       const filters = this.getFilterOptions(videoStream);
       if (filters.length > 0) {
         options.outputOptions.push(`-vf ${filters.join(',')}`);
@@ -116,8 +116,8 @@ export class BaseConfig implements VideoCodecSWConfig {
   }
 
   getBaseOutputOptions(target: TranscodeTarget, videoStream: VideoStreamInfo, audioStream?: AudioStreamInfo) {
-    const videoCodec = [TranscodeTarget.ALL, TranscodeTarget.VIDEO].includes(target) ? this.getVideoCodec() : 'copy';
-    const audioCodec = [TranscodeTarget.ALL, TranscodeTarget.AUDIO].includes(target) ? this.getAudioCodec() : 'copy';
+    const videoCodec = [TranscodeTarget.All, TranscodeTarget.Video].includes(target) ? this.getVideoCodec() : 'copy';
+    const audioCodec = [TranscodeTarget.All, TranscodeTarget.Audio].includes(target) ? this.getAudioCodec() : 'copy';
 
     const options = [
       `-c:v ${videoCodec}`,
@@ -146,7 +146,7 @@ export class BaseConfig implements VideoCodecSWConfig {
     }
 
     if (
-      this.config.targetVideoCodec === VideoCodec.HEVC &&
+      this.config.targetVideoCodec === VideoCodec.Hevc &&
       (videoCodec !== 'copy' || videoStream.codecName === 'hevc')
     ) {
       options.push('-tag:v hvc1');
@@ -207,7 +207,7 @@ export class BaseConfig implements VideoCodecSWConfig {
   }
 
   eligibleForTwoPass() {
-    if (!this.config.twoPass || this.config.accel !== TranscodeHWAccel.DISABLED) {
+    if (!this.config.twoPass || this.config.accel !== TranscodeHardwareAcceleration.Disabled) {
       return false;
     }
 
@@ -244,7 +244,7 @@ export class BaseConfig implements VideoCodecSWConfig {
   }
 
   shouldToneMap(videoStream: VideoStreamInfo) {
-    return videoStream.isHDR && this.config.tonemap !== ToneMapping.DISABLED;
+    return videoStream.isHDR && this.config.tonemap !== ToneMapping.Disabled;
   }
 
   getScaling(videoStream: VideoStreamInfo, mult = 2) {
@@ -326,7 +326,7 @@ export class BaseConfig implements VideoCodecSWConfig {
   }
 
   useCQP() {
-    return this.config.cqMode === CQMode.CQP;
+    return this.config.cqMode === CQMode.Cqp;
   }
 }
 
@@ -344,7 +344,7 @@ export class BaseHWConfig extends BaseConfig implements VideoCodecHWConfig {
   }
 
   getSupportedCodecs() {
-    return [VideoCodec.H264, VideoCodec.HEVC];
+    return [VideoCodec.H264, VideoCodec.Hevc];
   }
 
   validateDevices(devices: string[]) {
@@ -526,7 +526,7 @@ export class NvencSwDecodeConfig extends BaseHWConfig {
   }
 
   getSupportedCodecs() {
-    return [VideoCodec.H264, VideoCodec.HEVC, VideoCodec.AV1];
+    return [VideoCodec.H264, VideoCodec.Hevc, VideoCodec.Av1];
   }
 
   getBaseInputOptions() {
@@ -658,7 +658,7 @@ export class QsvSwDecodeConfig extends BaseHWConfig {
   getBaseOutputOptions(target: TranscodeTarget, videoStream: VideoStreamInfo, audioStream?: AudioStreamInfo) {
     const options = super.getBaseOutputOptions(target, videoStream, audioStream);
     // VP9 requires enabling low power mode https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/33583803e107b6d532def0f9d949364b01b6ad5a
-    if (this.config.targetVideoCodec === VideoCodec.VP9) {
+    if (this.config.targetVideoCodec === VideoCodec.Vp9) {
       options.push('-low_power 1');
     }
     return options;
@@ -693,7 +693,7 @@ export class QsvSwDecodeConfig extends BaseHWConfig {
   }
 
   getSupportedCodecs() {
-    return [VideoCodec.H264, VideoCodec.HEVC, VideoCodec.VP9, VideoCodec.AV1];
+    return [VideoCodec.H264, VideoCodec.Hevc, VideoCodec.Vp9, VideoCodec.Av1];
   }
 
   // recommended from https://github.com/intel/media-delivery/blob/master/doc/benchmarks/intel-iris-xe-max-graphics/intel-iris-xe-max-graphics.md
@@ -712,7 +712,7 @@ export class QsvSwDecodeConfig extends BaseHWConfig {
   }
 
   useCQP() {
-    return this.config.cqMode === CQMode.CQP || this.config.targetVideoCodec === VideoCodec.VP9;
+    return this.config.cqMode === CQMode.Cqp || this.config.targetVideoCodec === VideoCodec.Vp9;
   }
 
   getScaling(videoStream: VideoStreamInfo): string {
@@ -802,7 +802,7 @@ export class VaapiSwDecodeConfig extends BaseHWConfig {
     const bitrates = this.getBitrateDistribution();
     const options = [];
 
-    if (this.config.targetVideoCodec === VideoCodec.VP9) {
+    if (this.config.targetVideoCodec === VideoCodec.Vp9) {
       options.push('-bsf:v vp9_raw_reorder,vp9_superframe');
     }
 
@@ -824,11 +824,11 @@ export class VaapiSwDecodeConfig extends BaseHWConfig {
   }
 
   getSupportedCodecs() {
-    return [VideoCodec.H264, VideoCodec.HEVC, VideoCodec.VP9, VideoCodec.AV1];
+    return [VideoCodec.H264, VideoCodec.Hevc, VideoCodec.Vp9, VideoCodec.Av1];
   }
 
   useCQP() {
-    return this.config.cqMode !== CQMode.ICQ || this.config.targetVideoCodec === VideoCodec.VP9;
+    return this.config.cqMode !== CQMode.Icq || this.config.targetVideoCodec === VideoCodec.Vp9;
   }
 }
 
@@ -900,7 +900,7 @@ export class RkmppSwDecodeConfig extends BaseHWConfig {
         // from ffmpeg_mpp help, commonly referred to as H264 level 5.1
         return ['-level 51'];
       }
-      case VideoCodec.HEVC: {
+      case VideoCodec.Hevc: {
         // from ffmpeg_mpp help, commonly referred to as HEVC level 5.1
         return ['-level 153'];
       }
@@ -921,7 +921,7 @@ export class RkmppSwDecodeConfig extends BaseHWConfig {
   }
 
   getSupportedCodecs() {
-    return [VideoCodec.H264, VideoCodec.HEVC];
+    return [VideoCodec.H264, VideoCodec.Hevc];
   }
 
   getVideoCodec(): string {
diff --git a/server/src/utils/mime-types.ts b/server/src/utils/mime-types.ts
index 6aad418d9f..6b9392146d 100644
--- a/server/src/utils/mime-types.ts
+++ b/server/src/utils/mime-types.ts
@@ -129,11 +129,11 @@ export const mimeTypes = {
   assetType: (filename: string) => {
     const contentType = lookup(filename);
     if (contentType.startsWith('image/')) {
-      return AssetType.IMAGE;
+      return AssetType.Image;
     } else if (contentType.startsWith('video/')) {
-      return AssetType.VIDEO;
+      return AssetType.Video;
     }
-    return AssetType.OTHER;
+    return AssetType.Other;
   },
   getSupportedFileExtensions: () => [...Object.keys(image), ...Object.keys(video)],
 };
diff --git a/server/src/utils/misc.ts b/server/src/utils/misc.ts
index 742e98c1c3..3acb72b663 100644
--- a/server/src/utils/misc.ts
+++ b/server/src/utils/misc.ts
@@ -234,14 +234,14 @@ export const useSwagger = (app: INestApplication, { write }: { write: boolean })
       scheme: 'Bearer',
       in: 'header',
     })
-    .addCookieAuth(ImmichCookie.ACCESS_TOKEN)
+    .addCookieAuth(ImmichCookie.AccessToken)
     .addApiKey(
       {
         type: 'apiKey',
         in: 'header',
-        name: ImmichHeader.API_KEY,
+        name: ImmichHeader.ApiKey,
       },
-      MetadataKey.API_KEY_SECURITY,
+      MetadataKey.ApiKeySecurity,
     )
     .addServer('/api')
     .build();
diff --git a/server/src/utils/preferences.ts b/server/src/utils/preferences.ts
index 9bd3dedd52..121bf2826d 100644
--- a/server/src/utils/preferences.ts
+++ b/server/src/utils/preferences.ts
@@ -8,7 +8,7 @@ import { getKeysDeep } from 'src/utils/misc';
 const getDefaultPreferences = (): UserPreferences => {
   return {
     albums: {
-      defaultAssetOrder: AssetOrder.DESC,
+      defaultAssetOrder: AssetOrder.Desc,
     },
     folders: {
       enabled: false,
@@ -53,7 +53,7 @@ const getDefaultPreferences = (): UserPreferences => {
 
 export const getPreferences = (metadata: UserMetadataItem[]): UserPreferences => {
   const preferences = getDefaultPreferences();
-  const item = metadata.find(({ key }) => key === UserMetadataKey.PREFERENCES);
+  const item = metadata.find(({ key }) => key === UserMetadataKey.Preferences);
   const partial = item?.value || {};
   for (const property of getKeysDeep(partial)) {
     _.set(preferences, property, _.get(partial, property));
diff --git a/server/src/utils/response.ts b/server/src/utils/response.ts
index a50e86a4ff..c5f51c385c 100644
--- a/server/src/utils/response.ts
+++ b/server/src/utils/response.ts
@@ -13,13 +13,13 @@ export const respondWithCookie = <T>(res: Response, body: T, { isSecure, values
   };
 
   const cookieOptions: Record<ImmichCookie, CookieOptions> = {
-    [ImmichCookie.AUTH_TYPE]: defaults,
-    [ImmichCookie.ACCESS_TOKEN]: defaults,
-    [ImmichCookie.OAUTH_STATE]: defaults,
-    [ImmichCookie.OAUTH_CODE_VERIFIER]: defaults,
+    [ImmichCookie.AuthType]: defaults,
+    [ImmichCookie.AccessToken]: defaults,
+    [ImmichCookie.OAuthState]: defaults,
+    [ImmichCookie.OAuthCodeVerifier]: defaults,
     // no httpOnly so that the client can know the auth state
-    [ImmichCookie.IS_AUTHENTICATED]: { ...defaults, httpOnly: false },
-    [ImmichCookie.SHARED_LINK_TOKEN]: { ...defaults, maxAge: Duration.fromObject({ days: 1 }).toMillis() },
+    [ImmichCookie.IsAuthenticated]: { ...defaults, httpOnly: false },
+    [ImmichCookie.SharedLinkToken]: { ...defaults, maxAge: Duration.fromObject({ days: 1 }).toMillis() },
   };
 
   for (const { key, value } of values) {
diff --git a/server/test/fixtures/album.stub.ts b/server/test/fixtures/album.stub.ts
index fd6a8678a0..d36989bbcf 100644
--- a/server/test/fixtures/album.stub.ts
+++ b/server/test/fixtures/album.stub.ts
@@ -19,7 +19,7 @@ export const albumStub = {
     sharedLinks: [],
     albumUsers: [],
     isActivityEnabled: true,
-    order: AssetOrder.DESC,
+    order: AssetOrder.Desc,
     updateId: '42',
   }),
   sharedWithUser: Object.freeze({
@@ -38,11 +38,11 @@ export const albumStub = {
     albumUsers: [
       {
         user: userStub.user1,
-        role: AlbumUserRole.EDITOR,
+        role: AlbumUserRole.Editor,
       },
     ],
     isActivityEnabled: true,
-    order: AssetOrder.DESC,
+    order: AssetOrder.Desc,
     updateId: '42',
   }),
   sharedWithMultiple: Object.freeze({
@@ -61,15 +61,15 @@ export const albumStub = {
     albumUsers: [
       {
         user: userStub.user1,
-        role: AlbumUserRole.EDITOR,
+        role: AlbumUserRole.Editor,
       },
       {
         user: userStub.user2,
-        role: AlbumUserRole.EDITOR,
+        role: AlbumUserRole.Editor,
       },
     ],
     isActivityEnabled: true,
-    order: AssetOrder.DESC,
+    order: AssetOrder.Desc,
     updateId: '42',
   }),
   sharedWithAdmin: Object.freeze({
@@ -88,11 +88,11 @@ export const albumStub = {
     albumUsers: [
       {
         user: userStub.admin,
-        role: AlbumUserRole.EDITOR,
+        role: AlbumUserRole.Editor,
       },
     ],
     isActivityEnabled: true,
-    order: AssetOrder.DESC,
+    order: AssetOrder.Desc,
     updateId: '42',
   }),
   oneAsset: Object.freeze({
@@ -110,7 +110,7 @@ export const albumStub = {
     sharedLinks: [],
     albumUsers: [],
     isActivityEnabled: true,
-    order: AssetOrder.DESC,
+    order: AssetOrder.Desc,
     updateId: '42',
   }),
   twoAssets: Object.freeze({
@@ -128,7 +128,7 @@ export const albumStub = {
     sharedLinks: [],
     albumUsers: [],
     isActivityEnabled: true,
-    order: AssetOrder.DESC,
+    order: AssetOrder.Desc,
     updateId: '42',
   }),
   emptyWithValidThumbnail: Object.freeze({
@@ -146,7 +146,7 @@ export const albumStub = {
     sharedLinks: [],
     albumUsers: [],
     isActivityEnabled: true,
-    order: AssetOrder.DESC,
+    order: AssetOrder.Desc,
     updateId: '42',
   }),
 };
diff --git a/server/test/fixtures/asset.stub.ts b/server/test/fixtures/asset.stub.ts
index aa38a520ee..991c5d2c4f 100644
--- a/server/test/fixtures/asset.stub.ts
+++ b/server/test/fixtures/asset.stub.ts
@@ -8,19 +8,19 @@ import { userStub } from 'test/fixtures/user.stub';
 
 export const previewFile: AssetFile = {
   id: 'file-1',
-  type: AssetFileType.PREVIEW,
+  type: AssetFileType.Preview,
   path: '/uploads/user-id/thumbs/path.jpg',
 };
 
 const thumbnailFile: AssetFile = {
   id: 'file-2',
-  type: AssetFileType.THUMBNAIL,
+  type: AssetFileType.Thumbnail,
   path: '/uploads/user-id/webp/path.ext',
 };
 
 const fullsizeFile: AssetFile = {
   id: 'file-3',
-  type: AssetFileType.FULLSIZE,
+  type: AssetFileType.FullSize,
   path: '/uploads/user-id/fullsize/path.webp',
 };
 
@@ -44,7 +44,7 @@ export const assetStub = {
     id: 'asset-id',
     ownerId: 'user-id',
     livePhotoVideoId: null,
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     isExternal: false,
     checksum: Buffer.from('file hash'),
     timeZone: null,
@@ -57,7 +57,7 @@ export const assetStub = {
   }),
   noResizePath: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     originalFileName: 'IMG_123.jpg',
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -68,7 +68,7 @@ export const assetStub = {
     originalPath: 'upload/library/IMG_123.jpg',
     files: [thumbnailFile],
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
     createdAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -89,12 +89,12 @@ export const assetStub = {
     libraryId: null,
     stackId: null,
     updateId: '42',
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   noWebpPath: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -104,7 +104,7 @@ export const assetStub = {
     originalPath: 'upload/library/IMG_456.jpg',
     files: [previewFile],
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
     createdAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -128,12 +128,12 @@ export const assetStub = {
     libraryId: null,
     stackId: null,
     updateId: '42',
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   noThumbhash: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -143,7 +143,7 @@ export const assetStub = {
     originalPath: '/original/path.ext',
     files,
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     thumbhash: null,
     encodedVideoPath: null,
     createdAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -164,12 +164,12 @@ export const assetStub = {
     libraryId: null,
     stackId: null,
     updateId: '42',
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   primaryImage: Object.freeze({
     id: 'primary-asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -179,7 +179,7 @@ export const assetStub = {
     originalPath: '/original/path.jpg',
     checksum: Buffer.from('file hash', 'utf8'),
     files,
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
     createdAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -210,12 +210,12 @@ export const assetStub = {
     isOffline: false,
     updateId: '42',
     libraryId: null,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   image: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -225,7 +225,7 @@ export const assetStub = {
     originalPath: '/original/path.jpg',
     files,
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
     createdAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -256,7 +256,7 @@ export const assetStub = {
     projectionType: null,
     height: 3840,
     width: 2160,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   trashed: Object.freeze({
@@ -269,7 +269,7 @@ export const assetStub = {
     deviceId: 'device-id',
     originalPath: '/original/path.jpg',
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     files,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
@@ -293,16 +293,16 @@ export const assetStub = {
     } as Exif,
     duplicateId: null,
     isOffline: false,
-    status: AssetStatus.TRASHED,
+    status: AssetStatus.Trashed,
     libraryId: null,
     stackId: null,
     updateId: '42',
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   trashedOffline: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -311,7 +311,7 @@ export const assetStub = {
     deviceId: 'device-id',
     originalPath: '/original/path.jpg',
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     files,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
@@ -338,11 +338,11 @@ export const assetStub = {
     isOffline: true,
     stackId: null,
     updateId: '42',
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
   archived: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -351,7 +351,7 @@ export const assetStub = {
     deviceId: 'device-id',
     originalPath: '/original/path.jpg',
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     files,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
@@ -378,12 +378,12 @@ export const assetStub = {
     libraryId: null,
     stackId: null,
     updateId: '42',
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   external: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -392,7 +392,7 @@ export const assetStub = {
     deviceId: 'device-id',
     originalPath: '/data/user1/photo.jpg',
     checksum: Buffer.from('path hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     files,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
@@ -418,12 +418,12 @@ export const assetStub = {
     updateId: '42',
     stackId: null,
     stack: null,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   image1: Object.freeze({
     id: 'asset-id-1',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -432,7 +432,7 @@ export const assetStub = {
     deviceId: 'device-id',
     originalPath: '/original/path.ext',
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     files,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
@@ -458,12 +458,12 @@ export const assetStub = {
     stackId: null,
     libraryId: null,
     stack: null,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   imageFrom2015: Object.freeze({
     id: 'asset-id-1',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2015-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2015-02-23T05:06:29.716Z'),
@@ -473,7 +473,7 @@ export const assetStub = {
     originalPath: '/original/path.ext',
     files,
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
     createdAt: new Date('2015-02-23T05:06:29.716Z'),
@@ -494,12 +494,12 @@ export const assetStub = {
     deletedAt: null,
     duplicateId: null,
     isOffline: false,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   video: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     originalFileName: 'asset-id.ext',
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -509,7 +509,7 @@ export const assetStub = {
     deviceId: 'device-id',
     originalPath: '/original/path.ext',
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.VIDEO,
+    type: AssetType.Video,
     files: [previewFile],
     thumbhash: null,
     encodedVideoPath: null,
@@ -535,15 +535,15 @@ export const assetStub = {
     updateId: '42',
     libraryId: null,
     stackId: null,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   livePhotoMotionAsset: Object.freeze({
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     id: fileStub.livePhotoMotion.uuid,
     originalPath: fileStub.livePhotoMotion.originalPath,
     ownerId: authStub.user1.user.id,
-    type: AssetType.VIDEO,
+    type: AssetType.Video,
     fileModifiedAt: new Date('2022-06-19T23:41:36.910Z'),
     fileCreatedAt: new Date('2022-06-19T23:41:36.910Z'),
     exifInfo: {
@@ -551,15 +551,15 @@ export const assetStub = {
       timeZone: `America/New_York`,
     },
     libraryId: null,
-    visibility: AssetVisibility.HIDDEN,
+    visibility: AssetVisibility.Hidden,
   } as MapAsset & { faces: AssetFace[]; files: AssetFile[]; exifInfo: Exif }),
 
   livePhotoStillAsset: Object.freeze({
     id: 'live-photo-still-asset',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     originalPath: fileStub.livePhotoStill.originalPath,
     ownerId: authStub.user1.user.id,
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     livePhotoVideoId: 'live-photo-motion-asset',
     fileModifiedAt: new Date('2022-06-19T23:41:36.910Z'),
     fileCreatedAt: new Date('2022-06-19T23:41:36.910Z'),
@@ -569,16 +569,16 @@ export const assetStub = {
     },
     files,
     faces: [] as AssetFace[],
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   } as MapAsset & { faces: AssetFace[] }),
 
   livePhotoWithOriginalFileName: Object.freeze({
     id: 'live-photo-still-asset',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     originalPath: fileStub.livePhotoStill.originalPath,
     originalFileName: fileStub.livePhotoStill.originalName,
     ownerId: authStub.user1.user.id,
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     livePhotoVideoId: 'live-photo-motion-asset',
     fileModifiedAt: new Date('2022-06-19T23:41:36.910Z'),
     fileCreatedAt: new Date('2022-06-19T23:41:36.910Z'),
@@ -588,12 +588,12 @@ export const assetStub = {
     },
     libraryId: null,
     faces: [] as AssetFace[],
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   } as MapAsset & { faces: AssetFace[] }),
 
   withLocation: Object.freeze({
     id: 'asset-with-favorite-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-22T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-22T05:06:29.716Z'),
@@ -603,7 +603,7 @@ export const assetStub = {
     checksum: Buffer.from('file hash', 'utf8'),
     originalPath: '/original/path.ext',
     sidecarPath: null,
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     files: [previewFile],
     thumbhash: null,
     encodedVideoPath: null,
@@ -633,12 +633,12 @@ export const assetStub = {
     duplicateId: null,
     isOffline: false,
     tags: [],
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   sidecar: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -648,7 +648,7 @@ export const assetStub = {
     originalPath: '/original/path.ext',
     thumbhash: null,
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     files: [previewFile],
     encodedVideoPath: null,
     createdAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -669,12 +669,12 @@ export const assetStub = {
     updateId: 'foo',
     libraryId: null,
     stackId: null,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   sidecarWithoutExt: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -684,7 +684,7 @@ export const assetStub = {
     originalPath: '/original/path.ext',
     thumbhash: null,
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     files: [previewFile],
     encodedVideoPath: null,
     createdAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -702,12 +702,12 @@ export const assetStub = {
     deletedAt: null,
     duplicateId: null,
     isOffline: false,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   hasEncodedVideo: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     originalFileName: 'asset-id.ext',
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -717,7 +717,7 @@ export const assetStub = {
     deviceId: 'device-id',
     originalPath: '/original/path.ext',
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.VIDEO,
+    type: AssetType.Video,
     files: [previewFile],
     thumbhash: null,
     encodedVideoPath: '/encoded/video/path.mp4',
@@ -742,12 +742,12 @@ export const assetStub = {
     libraryId: null,
     stackId: null,
     stack: null,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   hasFileExtension: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -756,7 +756,7 @@ export const assetStub = {
     deviceId: 'device-id',
     originalPath: '/data/user1/photo.jpg',
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     files,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
@@ -779,12 +779,12 @@ export const assetStub = {
     } as Exif,
     duplicateId: null,
     isOffline: false,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   imageDng: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -793,7 +793,7 @@ export const assetStub = {
     deviceId: 'device-id',
     originalPath: '/original/path.dng',
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     files,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
@@ -820,12 +820,12 @@ export const assetStub = {
     updateId: '42',
     libraryId: null,
     stackId: null,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 
   imageHif: Object.freeze({
     id: 'asset-id',
-    status: AssetStatus.ACTIVE,
+    status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2023-02-23T05:06:29.716Z'),
     fileCreatedAt: new Date('2023-02-23T05:06:29.716Z'),
@@ -834,7 +834,7 @@ export const assetStub = {
     deviceId: 'device-id',
     originalPath: '/original/path.hif',
     checksum: Buffer.from('file hash', 'utf8'),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     files,
     thumbhash: Buffer.from('blablabla', 'base64'),
     encodedVideoPath: null,
@@ -861,6 +861,6 @@ export const assetStub = {
     updateId: '42',
     libraryId: null,
     stackId: null,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   }),
 };
diff --git a/server/test/fixtures/face.stub.ts b/server/test/fixtures/face.stub.ts
index fe5cbb9a56..beecf7c69e 100644
--- a/server/test/fixtures/face.stub.ts
+++ b/server/test/fixtures/face.stub.ts
@@ -20,7 +20,7 @@ export const faceStub = {
     boundingBoxY2: 1,
     imageHeight: 1024,
     imageWidth: 1024,
-    sourceType: SourceType.MACHINE_LEARNING,
+    sourceType: SourceType.MachineLearning,
     faceSearch: { faceId: 'assetFaceId1', embedding: '[1, 2, 3, 4]' },
     deletedAt: new Date(),
   }),
@@ -36,7 +36,7 @@ export const faceStub = {
     boundingBoxY2: 1,
     imageHeight: 1024,
     imageWidth: 1024,
-    sourceType: SourceType.MACHINE_LEARNING,
+    sourceType: SourceType.MachineLearning,
     faceSearch: { faceId: 'assetFaceId2', embedding: '[1, 2, 3, 4]' },
     deletedAt: null,
   }),
@@ -52,7 +52,7 @@ export const faceStub = {
     boundingBoxY2: 1,
     imageHeight: 1024,
     imageWidth: 1024,
-    sourceType: SourceType.MACHINE_LEARNING,
+    sourceType: SourceType.MachineLearning,
     faceSearch: { faceId: 'assetFaceId3', embedding: '[1, 2, 3, 4]' },
     deletedAt: null,
   }),
@@ -68,7 +68,7 @@ export const faceStub = {
     boundingBoxY2: 1,
     imageHeight: 1024,
     imageWidth: 1024,
-    sourceType: SourceType.MACHINE_LEARNING,
+    sourceType: SourceType.MachineLearning,
     faceSearch: { faceId: 'assetFaceId8', embedding: '[1, 2, 3, 4]' },
     deletedAt: null,
   }),
@@ -84,7 +84,7 @@ export const faceStub = {
     boundingBoxY2: 1,
     imageHeight: 1024,
     imageWidth: 1024,
-    sourceType: SourceType.MACHINE_LEARNING,
+    sourceType: SourceType.MachineLearning,
     faceSearch: { faceId: 'assetFaceId9', embedding: '[1, 2, 3, 4]' },
     deletedAt: null,
   }),
@@ -100,7 +100,7 @@ export const faceStub = {
     boundingBoxY2: 200,
     imageHeight: 500,
     imageWidth: 400,
-    sourceType: SourceType.EXIF,
+    sourceType: SourceType.Exif,
     deletedAt: null,
   }),
   fromExif2: Object.freeze({
@@ -115,7 +115,7 @@ export const faceStub = {
     boundingBoxY2: 1,
     imageHeight: 1024,
     imageWidth: 1024,
-    sourceType: SourceType.EXIF,
+    sourceType: SourceType.Exif,
     deletedAt: null,
   }),
   withBirthDate: Object.freeze({
@@ -130,7 +130,7 @@ export const faceStub = {
     boundingBoxY2: 1,
     imageHeight: 1024,
     imageWidth: 1024,
-    sourceType: SourceType.MACHINE_LEARNING,
+    sourceType: SourceType.MachineLearning,
     deletedAt: null,
   }),
 };
diff --git a/server/test/fixtures/person.stub.ts b/server/test/fixtures/person.stub.ts
index 86f3bcde21..35a7a8ed7d 100644
--- a/server/test/fixtures/person.stub.ts
+++ b/server/test/fixtures/person.stub.ts
@@ -176,7 +176,7 @@ export const personThumbnailStub = {
     y2: 505,
     oldHeight: 2880,
     oldWidth: 2160,
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     originalPath: '/original/path.jpg',
     exifOrientation: '1',
     previewPath: previewFile.path,
@@ -189,7 +189,7 @@ export const personThumbnailStub = {
     y2: 200,
     oldHeight: 500,
     oldWidth: 400,
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     originalPath: '/original/path.jpg',
     exifOrientation: '1',
     previewPath: previewFile.path,
@@ -202,7 +202,7 @@ export const personThumbnailStub = {
     y2: 495,
     oldHeight: 500,
     oldWidth: 500,
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     originalPath: '/original/path.jpg',
     exifOrientation: '1',
     previewPath: previewFile.path,
@@ -215,7 +215,7 @@ export const personThumbnailStub = {
     y2: 200,
     oldHeight: 500,
     oldWidth: 400,
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     originalPath: '/original/path.dng',
     exifOrientation: '1',
     previewPath: previewFile.path,
@@ -228,7 +228,7 @@ export const personThumbnailStub = {
     y2: 251,
     oldHeight: 1440,
     oldWidth: 2162,
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     originalPath: '/original/path.jpg',
     exifOrientation: '1',
     previewPath: previewFile.path,
@@ -241,7 +241,7 @@ export const personThumbnailStub = {
     y2: 152,
     oldHeight: 1440,
     oldWidth: 2162,
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     originalPath: '/original/path.jpg',
     exifOrientation: '1',
     previewPath: previewFile.path,
@@ -254,7 +254,7 @@ export const personThumbnailStub = {
     y2: 200,
     oldHeight: 500,
     oldWidth: 400,
-    type: AssetType.VIDEO,
+    type: AssetType.Video,
     originalPath: '/original/path.mp4',
     exifOrientation: '1',
     previewPath: previewFile.path,
diff --git a/server/test/fixtures/shared-link.stub.ts b/server/test/fixtures/shared-link.stub.ts
index f3096280d9..47201a5b3b 100644
--- a/server/test/fixtures/shared-link.stub.ts
+++ b/server/test/fixtures/shared-link.stub.ts
@@ -49,7 +49,7 @@ const assetResponse: AssetResponseDto = {
   deviceAssetId: 'device_asset_id_1',
   ownerId: 'user_id_1',
   deviceId: 'device_id_1',
-  type: AssetType.VIDEO,
+  type: AssetType.Video,
   originalMimeType: 'image/jpeg',
   originalPath: 'fake_path/jpeg',
   originalFileName: 'asset_1.jpeg',
@@ -70,12 +70,12 @@ const assetResponse: AssetResponseDto = {
   isTrashed: false,
   libraryId: 'library-id',
   hasMetadata: true,
-  visibility: AssetVisibility.TIMELINE,
+  visibility: AssetVisibility.Timeline,
 };
 
 const assetResponseWithoutMetadata = {
   id: 'id_1',
-  type: AssetType.VIDEO,
+  type: AssetType.Video,
   originalMimeType: 'image/jpeg',
   thumbhash: null,
   localDateTime: today,
@@ -99,7 +99,7 @@ const albumResponse: AlbumResponseDto = {
   assets: [],
   assetCount: 1,
   isActivityEnabled: true,
-  order: AssetOrder.DESC,
+  order: AssetOrder.Desc,
 };
 
 export const sharedLinkStub = {
@@ -107,7 +107,7 @@ export const sharedLinkStub = {
     id: '123',
     userId: authStub.admin.user.id,
     key: sharedLinkBytes,
-    type: SharedLinkType.INDIVIDUAL,
+    type: SharedLinkType.Individual,
     createdAt: today,
     expiresAt: tomorrow,
     allowUpload: true,
@@ -124,7 +124,7 @@ export const sharedLinkStub = {
     userId: authStub.admin.user.id,
     user: userStub.admin,
     key: sharedLinkBytes,
-    type: SharedLinkType.ALBUM,
+    type: SharedLinkType.Album,
     createdAt: today,
     expiresAt: tomorrow,
     allowUpload: true,
@@ -141,7 +141,7 @@ export const sharedLinkStub = {
     userId: authStub.admin.user.id,
     user: userStub.admin,
     key: sharedLinkBytes,
-    type: SharedLinkType.ALBUM,
+    type: SharedLinkType.Album,
     createdAt: today,
     expiresAt: yesterday,
     allowUpload: true,
@@ -157,7 +157,7 @@ export const sharedLinkStub = {
     id: '123',
     userId: authStub.admin.user.id,
     key: sharedLinkBytes,
-    type: SharedLinkType.ALBUM,
+    type: SharedLinkType.Album,
     createdAt: today,
     expiresAt: tomorrow,
     allowUpload: false,
@@ -182,16 +182,16 @@ export const sharedLinkStub = {
       albumUsers: [],
       sharedLinks: [],
       isActivityEnabled: true,
-      order: AssetOrder.DESC,
+      order: AssetOrder.Desc,
       assets: [
         {
           id: 'id_1',
-          status: AssetStatus.ACTIVE,
+          status: AssetStatus.Active,
           owner: undefined as unknown as UserAdmin,
           ownerId: 'user_id_1',
           deviceAssetId: 'device_asset_id_1',
           deviceId: 'device_id_1',
-          type: AssetType.VIDEO,
+          type: AssetType.Video,
           originalPath: 'fake_path/jpeg',
           checksum: Buffer.from('file hash', 'utf8'),
           fileModifiedAt: today,
@@ -251,7 +251,7 @@ export const sharedLinkStub = {
           updateId: '42',
           libraryId: null,
           stackId: null,
-          visibility: AssetVisibility.TIMELINE,
+          visibility: AssetVisibility.Timeline,
         },
       ],
     },
@@ -260,7 +260,7 @@ export const sharedLinkStub = {
     id: '123',
     userId: authStub.admin.user.id,
     key: sharedLinkBytes,
-    type: SharedLinkType.ALBUM,
+    type: SharedLinkType.Album,
     createdAt: today,
     expiresAt: tomorrow,
     allowUpload: true,
@@ -286,7 +286,7 @@ export const sharedLinkResponseStub = {
     id: '123',
     key: sharedLinkBytes.toString('base64url'),
     showMetadata: true,
-    type: SharedLinkType.ALBUM,
+    type: SharedLinkType.Album,
     userId: 'admin_id',
   }),
   expired: Object.freeze<SharedLinkResponseDto>({
@@ -301,14 +301,14 @@ export const sharedLinkResponseStub = {
     id: '123',
     key: sharedLinkBytes.toString('base64url'),
     showMetadata: true,
-    type: SharedLinkType.ALBUM,
+    type: SharedLinkType.Album,
     userId: 'admin_id',
   }),
   readonlyNoMetadata: Object.freeze<SharedLinkResponseDto>({
     id: '123',
     userId: 'admin_id',
     key: sharedLinkBytes.toString('base64url'),
-    type: SharedLinkType.ALBUM,
+    type: SharedLinkType.Album,
     createdAt: today,
     expiresAt: tomorrow,
     description: null,
diff --git a/server/test/fixtures/user.stub.ts b/server/test/fixtures/user.stub.ts
index 0db58e2eed..807da5197f 100644
--- a/server/test/fixtures/user.stub.ts
+++ b/server/test/fixtures/user.stub.ts
@@ -5,7 +5,7 @@ import { authStub } from 'test/fixtures/auth.stub';
 export const userStub = {
   admin: <UserAdmin>{
     ...authStub.admin.user,
-    status: UserStatus.ACTIVE,
+    status: UserStatus.Active,
     profileChangedAt: new Date('2021-01-01'),
     name: 'admin_name',
     id: 'admin_id',
@@ -23,7 +23,7 @@ export const userStub = {
   },
   user1: <UserAdmin>{
     ...authStub.user1.user,
-    status: UserStatus.ACTIVE,
+    status: UserStatus.Active,
     profileChangedAt: new Date('2021-01-01'),
     name: 'immich_name',
     storageLabel: null,
@@ -40,7 +40,7 @@ export const userStub = {
   },
   user2: <UserAdmin>{
     ...authStub.user2.user,
-    status: UserStatus.ACTIVE,
+    status: UserStatus.Active,
     profileChangedAt: new Date('2021-01-01'),
     metadata: [],
     name: 'immich_name',
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index 9c1032663f..4d13264fa2 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -182,7 +182,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 { albumId, userId, role = AlbumUserRole.Editor } = dto;
     const result = await this.get(AlbumUserRepository).create({ albumsId: albumId, usersId: userId, role });
     return { albumUser: { albumId, userId, role }, result };
   }
@@ -370,14 +370,14 @@ const assetInsert = (asset: Partial<Insertable<AssetTable>> = {}) => {
     deviceId: '',
     originalFileName: '',
     checksum: randomBytes(32),
-    type: AssetType.IMAGE,
+    type: AssetType.Image,
     originalPath: '/path/to/something.jpg',
     ownerId: '@immich.cloud',
     isFavorite: false,
     fileCreatedAt: now,
     fileModifiedAt: now,
     localDateTime: now,
-    visibility: AssetVisibility.TIMELINE,
+    visibility: AssetVisibility.Timeline,
   };
 
   return {
@@ -423,7 +423,7 @@ const assetFaceInsert = (assetFace: Partial<AssetFace> & { assetId: string }) =>
     imageHeight: assetFace.imageHeight ?? 10,
     imageWidth: assetFace.imageWidth ?? 10,
     personId: assetFace.personId ?? null,
-    sourceType: assetFace.sourceType ?? SourceType.MACHINE_LEARNING,
+    sourceType: assetFace.sourceType ?? SourceType.MachineLearning,
   };
 
   return {
@@ -516,7 +516,7 @@ const memoryInsert = (memory: Partial<Insertable<MemoryTable>> = {}) => {
     createdAt: date,
     updatedAt: date,
     deletedAt: null,
-    type: MemoryType.ON_THIS_DAY,
+    type: MemoryType.OnThisDay,
     data: { year: 2025 },
     showAt: null,
     hideAt: null,
diff --git a/server/test/medium/specs/services/auth.service.spec.ts b/server/test/medium/specs/services/auth.service.spec.ts
index f1d50ce841..14ea1451f2 100644
--- a/server/test/medium/specs/services/auth.service.spec.ts
+++ b/server/test/medium/specs/services/auth.service.spec.ts
@@ -102,7 +102,7 @@ describe(AuthService.name, () => {
     it('should logout', async () => {
       const { sut } = setup();
       const auth = factory.auth();
-      await expect(sut.logout(auth, AuthType.PASSWORD)).resolves.toEqual({
+      await expect(sut.logout(auth, AuthType.Password)).resolves.toEqual({
         successful: true,
         redirectUri: '/auth/login?autoLaunch=0',
       });
@@ -118,7 +118,7 @@ describe(AuthService.name, () => {
       eventRepo.emit.mockResolvedValue();
 
       await expect(sessionRepo.get(session.id)).resolves.toEqual(expect.objectContaining({ id: session.id }));
-      await expect(sut.logout(auth, AuthType.PASSWORD)).resolves.toEqual({
+      await expect(sut.logout(auth, AuthType.Password)).resolves.toEqual({
         successful: true,
         redirectUri: '/auth/login?autoLaunch=0',
       });
diff --git a/server/test/medium/specs/services/memory.service.spec.ts b/server/test/medium/specs/services/memory.service.spec.ts
index bdd06b4a3f..12df2f130e 100644
--- a/server/test/medium/specs/services/memory.service.spec.ts
+++ b/server/test/medium/specs/services/memory.service.spec.ts
@@ -45,7 +45,7 @@ describe(MemoryService.name, () => {
       const { user } = await ctx.newUser();
       const auth = factory.auth({ user });
       const dto = {
-        type: MemoryType.ON_THIS_DAY,
+        type: MemoryType.OnThisDay,
         data: { year: 2021 },
         memoryAt: new Date(2021),
       };
@@ -70,7 +70,7 @@ describe(MemoryService.name, () => {
       const { asset: asset2 } = await ctx.newAsset({ ownerId: user.id });
       const auth = factory.auth({ user });
       const dto = {
-        type: MemoryType.ON_THIS_DAY,
+        type: MemoryType.OnThisDay,
         data: { year: 2021 },
         memoryAt: new Date(2021),
         assetIds: [asset1.id, asset2.id],
@@ -92,7 +92,7 @@ describe(MemoryService.name, () => {
       const { asset: asset2 } = await ctx.newAsset({ ownerId: user2.id });
       const auth = factory.auth({ user: user1 });
       const dto = {
-        type: MemoryType.ON_THIS_DAY,
+        type: MemoryType.OnThisDay,
         data: { year: 2021 },
         memoryAt: new Date(2021),
         assetIds: [asset1.id, asset2.id],
@@ -124,8 +124,8 @@ describe(MemoryService.name, () => {
         ctx.newExif({ assetId: asset.id, make: 'Canon' }),
         ctx.newJobStatus({ assetId: asset.id }),
         assetRepo.upsertFiles([
-          { assetId: asset.id, type: AssetFileType.PREVIEW, path: '/path/to/preview.jpg' },
-          { assetId: asset.id, type: AssetFileType.THUMBNAIL, path: '/path/to/thumbnail.jpg' },
+          { assetId: asset.id, type: AssetFileType.Preview, path: '/path/to/preview.jpg' },
+          { assetId: asset.id, type: AssetFileType.Thumbnail, path: '/path/to/thumbnail.jpg' },
         ]),
       ]);
 
@@ -178,8 +178,8 @@ describe(MemoryService.name, () => {
           ctx.newExif({ assetId: asset.id, make: 'Canon' }),
           ctx.newJobStatus({ assetId: asset.id }),
           assetRepo.upsertFiles([
-            { assetId: asset.id, type: AssetFileType.PREVIEW, path: '/path/to/preview.jpg' },
-            { assetId: asset.id, type: AssetFileType.THUMBNAIL, path: '/path/to/thumbnail.jpg' },
+            { assetId: asset.id, type: AssetFileType.Preview, path: '/path/to/preview.jpg' },
+            { assetId: asset.id, type: AssetFileType.Thumbnail, path: '/path/to/thumbnail.jpg' },
           ]),
         ]);
       }
diff --git a/server/test/medium/specs/services/timeline.service.spec.ts b/server/test/medium/specs/services/timeline.service.spec.ts
index 6af936eb49..fa4a75e869 100644
--- a/server/test/medium/specs/services/timeline.service.spec.ts
+++ b/server/test/medium/specs/services/timeline.service.spec.ts
@@ -46,7 +46,7 @@ describe(TimelineService.name, () => {
     it('should return error if time bucket is requested with partners asset and archived', async () => {
       const { sut } = setup();
       const auth = factory.auth();
-      const response1 = sut.getTimeBuckets(auth, { withPartners: true, visibility: AssetVisibility.ARCHIVE });
+      const response1 = sut.getTimeBuckets(auth, { withPartners: true, visibility: AssetVisibility.Archive });
       await expect(response1).rejects.toBeInstanceOf(BadRequestException);
       await expect(response1).rejects.toThrow(
         'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
diff --git a/server/test/medium/specs/services/user.service.spec.ts b/server/test/medium/specs/services/user.service.spec.ts
index 535ac30aec..f5bddca196 100644
--- a/server/test/medium/specs/services/user.service.spec.ts
+++ b/server/test/medium/specs/services/user.service.spec.ts
@@ -16,7 +16,7 @@ import { getKyselyDB } from 'test/utils';
 let defaultDatabase: Kysely<DB>;
 
 const setup = (db?: Kysely<DB>) => {
-  process.env.IMMICH_ENV = ImmichEnvironment.TESTING;
+  process.env.IMMICH_ENV = ImmichEnvironment.Testing;
 
   return newMediumService(UserService, {
     database: db || defaultDatabase,
@@ -140,7 +140,7 @@ describe(UserService.name, () => {
       const { sut, ctx } = setup();
       const jobMock = ctx.getMock(JobRepository);
       jobMock.queueAll.mockResolvedValue(void 0);
-      await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.SUCCESS);
+      await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.Success);
       expect(jobMock.queueAll).toHaveBeenCalledExactlyOnceWith([]);
     });
 
@@ -149,10 +149,8 @@ describe(UserService.name, () => {
       const jobMock = ctx.getMock(JobRepository);
       const { user } = await ctx.newUser({ deletedAt: DateTime.now().minus({ days: 60 }).toJSDate() });
       jobMock.queueAll.mockResolvedValue(void 0);
-      await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.SUCCESS);
-      expect(jobMock.queueAll).toHaveBeenCalledExactlyOnceWith([
-        { name: JobName.USER_DELETION, data: { id: user.id } },
-      ]);
+      await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.Success);
+      expect(jobMock.queueAll).toHaveBeenCalledExactlyOnceWith([{ name: JobName.UserDeletion, data: { id: user.id } }]);
     });
 
     it('should skip a recently deleted user', async () => {
@@ -160,7 +158,7 @@ describe(UserService.name, () => {
       const jobMock = ctx.getMock(JobRepository);
       await ctx.newUser({ deletedAt: DateTime.now().minus({ days: 5 }).toJSDate() });
       jobMock.queueAll.mockResolvedValue(void 0);
-      await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.SUCCESS);
+      await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.Success);
       expect(jobMock.queueAll).toHaveBeenCalledExactlyOnceWith([]);
     });
 
@@ -172,7 +170,7 @@ describe(UserService.name, () => {
       const config = await sut.getConfig({ withCache: false });
       config.user.deleteDelay = 30;
       await sut.updateConfig(config);
-      await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.SUCCESS);
+      await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.Success);
       expect(jobMock.queueAll).toHaveBeenCalledExactlyOnceWith([]);
     });
   });
diff --git a/server/test/medium/specs/services/version.service.spec.ts b/server/test/medium/specs/services/version.service.spec.ts
index 9feda5b8c4..2d0c57667b 100644
--- a/server/test/medium/specs/services/version.service.spec.ts
+++ b/server/test/medium/specs/services/version.service.spec.ts
@@ -53,7 +53,7 @@ describe(VersionService.name, () => {
       await versionHistoryRepo.create({ version: 'v1.128.0' });
       await sut.onBootstrap();
 
-      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.MEMORIES_CREATE });
+      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.MemoriesCreate });
     });
 
     it('should not queue memory creation when upgrading from 1.129.0', async () => {
diff --git a/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts b/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
index 2c6b98e949..808a4785ce 100644
--- a/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-asset-exif.spec.ts
@@ -25,7 +25,7 @@ describe(SyncRequestType.AlbumAssetExifsV1, () => {
     await ctx.newExif({ assetId: asset.id, make: 'Canon' });
     const { album } = await ctx.newAlbum({ ownerId: user2.id });
     await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
-    await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+    await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
     const response = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1]);
     expect(response).toHaveLength(1);
@@ -86,7 +86,7 @@ describe(SyncRequestType.AlbumAssetExifsV1, () => {
     await ctx.newExif({ assetId: asset.id, make: 'Canon' });
     const { album } = await ctx.newAlbum({ ownerId: user2.id });
     await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
-    await ctx.newAlbumUser({ albumId: album.id, userId: user3.id, role: AlbumUserRole.EDITOR });
+    await ctx.newAlbumUser({ albumId: album.id, userId: user3.id, role: AlbumUserRole.Editor });
     const { session } = await ctx.newSession({ userId: user3.id });
     const authUser3 = factory.auth({ session, user: user3 });
 
@@ -110,7 +110,7 @@ describe(SyncRequestType.AlbumAssetExifsV1, () => {
     await ctx.newExif({ assetId: asset3User2.id, make: 'asset3User2' });
     const { album: album1 } = await ctx.newAlbum({ ownerId: user2.id });
     await ctx.newAlbumAsset({ albumId: album1.id, assetId: asset2User2.id });
-    await ctx.newAlbumUser({ albumId: album1.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+    await ctx.newAlbumUser({ albumId: album1.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
     const response = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1]);
     expect(response).toHaveLength(1);
@@ -134,7 +134,7 @@ describe(SyncRequestType.AlbumAssetExifsV1, () => {
         ctx.newAlbumAsset({ albumId: album2.id, assetId }),
       ),
     );
-    await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+    await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
     // should backfill the album user
     const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetExifsV1]);
diff --git a/server/test/medium/specs/sync/sync-album-asset.spec.ts b/server/test/medium/specs/sync/sync-album-asset.spec.ts
index 41700d29d4..9a42c0f027 100644
--- a/server/test/medium/specs/sync/sync-album-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-asset.spec.ts
@@ -41,7 +41,7 @@ describe(SyncRequestType.AlbumAssetsV1, () => {
     });
     const { album } = await ctx.newAlbum({ ownerId: user2.id });
     await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
-    await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+    await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
     const response = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetsV1]);
     expect(response).toHaveLength(1);
@@ -90,7 +90,7 @@ describe(SyncRequestType.AlbumAssetsV1, () => {
     const { asset } = await ctx.newAsset({ ownerId: user3.id });
     const { album } = await ctx.newAlbum({ ownerId: user2.id });
     await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
-    await ctx.newAlbumUser({ albumId: album.id, userId: user3.id, role: AlbumUserRole.EDITOR });
+    await ctx.newAlbumUser({ albumId: album.id, userId: user3.id, role: AlbumUserRole.Editor });
     const { session } = await ctx.newSession({ userId: user3.id });
     const authUser3 = factory.auth({ session, user: user3 });
 
@@ -111,7 +111,7 @@ describe(SyncRequestType.AlbumAssetsV1, () => {
     await wait(2);
     const { album: album1 } = await ctx.newAlbum({ ownerId: user2.id });
     await ctx.newAlbumAsset({ albumId: album1.id, assetId: asset2User2.id });
-    await ctx.newAlbumUser({ albumId: album1.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+    await ctx.newAlbumUser({ albumId: album1.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
     const response = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetsV1]);
     expect(response).toHaveLength(1);
@@ -135,7 +135,7 @@ describe(SyncRequestType.AlbumAssetsV1, () => {
         ctx.newAlbumAsset({ albumId: album2.id, assetId }),
       ),
     );
-    await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+    await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
     // should backfill the album user
     const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumAssetsV1]);
diff --git a/server/test/medium/specs/sync/sync-album-to-asset.spec.ts b/server/test/medium/specs/sync/sync-album-to-asset.spec.ts
index a0c1d413a0..ee529c5001 100644
--- a/server/test/medium/specs/sync/sync-album-to-asset.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-to-asset.spec.ts
@@ -73,7 +73,7 @@ describe(SyncRequestType.AlbumToAssetsV1, () => {
     const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
     const { album } = await ctx.newAlbum({ ownerId: user2.id });
     await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
-    await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+    await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
     const response = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
     expect(response).toHaveLength(1);
@@ -130,7 +130,7 @@ describe(SyncRequestType.AlbumToAssetsV1, () => {
     await ctx.syncAckAll(auth, response);
 
     // add user to backfill album
-    await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+    await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
     // should backfill the album to asset relation
     const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
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 798b3d607d..e3d8a21493 100644
--- a/server/test/medium/specs/sync/sync-album-user.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-user.spec.ts
@@ -22,7 +22,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
     const { auth, ctx } = await setup();
     const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
     const { user } = await ctx.newUser();
-    const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user.id, role: AlbumUserRole.EDITOR });
+    const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user.id, role: AlbumUserRole.Editor });
 
     await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([
       {
@@ -42,7 +42,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       const { auth, ctx } = await setup();
       const { user: user1 } = await ctx.newUser();
       const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
-      const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user1.id, role: AlbumUserRole.EDITOR });
+      const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user1.id, role: AlbumUserRole.Editor });
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(response).toHaveLength(1);
@@ -67,13 +67,13 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       const albumUserRepo = ctx.get(AlbumUserRepository);
       const { user: user1 } = await ctx.newUser();
       const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
-      const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user1.id, role: AlbumUserRole.EDITOR });
+      const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user1.id, role: AlbumUserRole.Editor });
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       await ctx.syncAckAll(auth, response);
       await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
 
-      await albumUserRepo.update({ albumsId: album.id, usersId: user1.id }, { role: AlbumUserRole.VIEWER });
+      await albumUserRepo.update({ albumsId: album.id, usersId: user1.id }, { role: AlbumUserRole.Viewer });
       const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(newResponse).toHaveLength(1);
       expect(newResponse).toEqual([
@@ -81,7 +81,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
           ack: expect.any(String),
           data: expect.objectContaining({
             albumId: albumUser.albumId,
-            role: AlbumUserRole.VIEWER,
+            role: AlbumUserRole.Viewer,
             userId: albumUser.userId,
           }),
           type: SyncEntityType.AlbumUserV1,
@@ -97,7 +97,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       const albumUserRepo = ctx.get(AlbumUserRepository);
       const { user: user1 } = await ctx.newUser();
       const { album } = await ctx.newAlbum({ ownerId: auth.user.id });
-      const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user1.id, role: AlbumUserRole.EDITOR });
+      const { albumUser } = await ctx.newAlbumUser({ albumId: album.id, userId: user1.id, role: AlbumUserRole.Editor });
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(response).toHaveLength(1);
@@ -130,7 +130,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       const { albumUser } = await ctx.newAlbumUser({
         albumId: album.id,
         userId: auth.user.id,
-        role: AlbumUserRole.EDITOR,
+        role: AlbumUserRole.Editor,
       });
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
@@ -157,8 +157,8 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       const { user: owner } = await ctx.newUser();
       const { user: user } = await ctx.newUser();
       const { album } = await ctx.newAlbum({ ownerId: owner.id });
-      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
-      await ctx.newAlbumUser({ albumId: album.id, userId: user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.Editor });
+      await ctx.newAlbumUser({ albumId: album.id, userId: user.id, role: AlbumUserRole.Editor });
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(response).toHaveLength(2);
@@ -166,14 +166,14 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       await ctx.syncAckAll(auth, response);
       await expect(ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1])).resolves.toEqual([]);
 
-      await albumUserRepo.update({ albumsId: album.id, usersId: user.id }, { role: AlbumUserRole.VIEWER });
+      await albumUserRepo.update({ albumsId: album.id, usersId: user.id }, { role: AlbumUserRole.Viewer });
       const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(newResponse).toEqual([
         {
           ack: expect.any(String),
           data: expect.objectContaining({
             albumId: album.id,
-            role: AlbumUserRole.VIEWER,
+            role: AlbumUserRole.Viewer,
             userId: user.id,
           }),
           type: SyncEntityType.AlbumUserV1,
@@ -190,8 +190,8 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       const { user: owner } = await ctx.newUser();
       const { user: user } = await ctx.newUser();
       const { album } = await ctx.newAlbum({ ownerId: owner.id });
-      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
-      await ctx.newAlbumUser({ albumId: album.id, userId: user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.Editor });
+      await ctx.newAlbumUser({ albumId: album.id, userId: user.id, role: AlbumUserRole.Editor });
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(response).toHaveLength(2);
@@ -223,13 +223,13 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       const { album: album1 } = await ctx.newAlbum({ ownerId: user1.id });
       const { album: album2 } = await ctx.newAlbum({ ownerId: user1.id });
       // backfill album user
-      await ctx.newAlbumUser({ albumId: album1.id, userId: user1.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album1.id, userId: user1.id, role: AlbumUserRole.Editor });
       await wait(2);
       // initial album user
-      await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album2.id, userId: auth.user.id, role: AlbumUserRole.Editor });
       await wait(2);
       // post checkpoint album user
-      await ctx.newAlbumUser({ albumId: album1.id, userId: user2.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album1.id, userId: user2.id, role: AlbumUserRole.Editor });
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(response).toHaveLength(1);
@@ -238,7 +238,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
           ack: expect.any(String),
           data: expect.objectContaining({
             albumId: album2.id,
-            role: AlbumUserRole.EDITOR,
+            role: AlbumUserRole.Editor,
             userId: auth.user.id,
           }),
           type: SyncEntityType.AlbumUserV1,
@@ -248,7 +248,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       // ack initial user
       await ctx.syncAckAll(auth, response);
       // get access to the backfill album user
-      await ctx.newAlbumUser({ albumId: album1.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album1.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
       // should backfill the album user
       const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
@@ -257,7 +257,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
           ack: expect.any(String),
           data: expect.objectContaining({
             albumId: album1.id,
-            role: AlbumUserRole.EDITOR,
+            role: AlbumUserRole.Editor,
             userId: user1.id,
           }),
           type: SyncEntityType.AlbumUserBackfillV1,
@@ -271,7 +271,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
           ack: expect.any(String),
           data: expect.objectContaining({
             albumId: album1.id,
-            role: AlbumUserRole.EDITOR,
+            role: AlbumUserRole.Editor,
             userId: user2.id,
           }),
           type: SyncEntityType.AlbumUserV1,
@@ -280,7 +280,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
           ack: expect.any(String),
           data: expect.objectContaining({
             albumId: album1.id,
-            role: AlbumUserRole.EDITOR,
+            role: AlbumUserRole.Editor,
             userId: auth.user.id,
           }),
           type: SyncEntityType.AlbumUserV1,
diff --git a/server/test/medium/specs/sync/sync-album.spec.ts b/server/test/medium/specs/sync/sync-album.spec.ts
index 83e9f12651..9f44e617e3 100644
--- a/server/test/medium/specs/sync/sync-album.spec.ts
+++ b/server/test/medium/specs/sync/sync-album.spec.ts
@@ -101,7 +101,7 @@ describe(SyncRequestType.AlbumsV1, () => {
       const { auth, ctx } = await setup();
       const { user: user2 } = await ctx.newUser();
       const { album } = await ctx.newAlbum({ ownerId: user2.id });
-      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
       expect(response).toHaveLength(1);
@@ -121,7 +121,7 @@ describe(SyncRequestType.AlbumsV1, () => {
       const { auth, ctx } = await setup();
       const { user: user2 } = await ctx.newUser();
       const { album } = await ctx.newAlbum({ ownerId: user2.id });
-      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
       expect(response).toHaveLength(1);
@@ -153,7 +153,7 @@ describe(SyncRequestType.AlbumsV1, () => {
       ]);
 
       await ctx.syncAckAll(auth, response);
-      await ctx.newAlbumUser({ userId: auth.user.id, albumId: user2Album.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ userId: auth.user.id, albumId: user2Album.id, role: AlbumUserRole.Editor });
 
       const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
       expect(newResponse).toHaveLength(1);
@@ -174,7 +174,7 @@ describe(SyncRequestType.AlbumsV1, () => {
       const albumRepo = ctx.get(AlbumRepository);
       const { user: user2 } = await ctx.newUser();
       const { album } = await ctx.newAlbum({ ownerId: user2.id });
-      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
       expect(response).toHaveLength(1);
@@ -202,7 +202,7 @@ describe(SyncRequestType.AlbumsV1, () => {
       const albumUserRepo = ctx.get(AlbumUserRepository);
       const { user: user2 } = await ctx.newUser();
       const { album } = await ctx.newAlbum({ ownerId: user2.id });
-      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.EDITOR });
+      await ctx.newAlbumUser({ albumId: album.id, userId: auth.user.id, role: AlbumUserRole.Editor });
 
       const response = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
       expect(response).toHaveLength(1);
diff --git a/server/test/medium/specs/sync/sync-user-metadata.spec.ts b/server/test/medium/specs/sync/sync-user-metadata.spec.ts
index bb4a500a60..7cd53e76e3 100644
--- a/server/test/medium/specs/sync/sync-user-metadata.spec.ts
+++ b/server/test/medium/specs/sync/sync-user-metadata.spec.ts
@@ -22,7 +22,7 @@ describe(SyncEntityType.UserMetadataV1, () => {
     const { auth, user, ctx } = await setup();
 
     const userRepo = ctx.get(UserRepository);
-    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.ONBOARDING, value: { isOnboarded: true } });
+    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.Onboarding, value: { isOnboarded: true } });
 
     const response = await ctx.syncStream(auth, [SyncRequestType.UserMetadataV1]);
     expect(response).toHaveLength(1);
@@ -30,7 +30,7 @@ describe(SyncEntityType.UserMetadataV1, () => {
       {
         ack: expect.any(String),
         data: {
-          key: UserMetadataKey.ONBOARDING,
+          key: UserMetadataKey.Onboarding,
           userId: user.id,
           value: { isOnboarded: true },
         },
@@ -46,7 +46,7 @@ describe(SyncEntityType.UserMetadataV1, () => {
     const { auth, user, ctx } = await setup();
 
     const userRepo = ctx.get(UserRepository);
-    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.ONBOARDING, value: { isOnboarded: true } });
+    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.Onboarding, value: { isOnboarded: true } });
 
     const response = await ctx.syncStream(auth, [SyncRequestType.UserMetadataV1]);
     expect(response).toHaveLength(1);
@@ -54,7 +54,7 @@ describe(SyncEntityType.UserMetadataV1, () => {
       {
         ack: expect.any(String),
         data: {
-          key: UserMetadataKey.ONBOARDING,
+          key: UserMetadataKey.Onboarding,
           userId: user.id,
           value: { isOnboarded: true },
         },
@@ -64,14 +64,14 @@ describe(SyncEntityType.UserMetadataV1, () => {
 
     await ctx.syncAckAll(auth, response);
 
-    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.ONBOARDING, value: { isOnboarded: false } });
+    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.Onboarding, value: { isOnboarded: false } });
 
     const updatedResponse = await ctx.syncStream(auth, [SyncRequestType.UserMetadataV1]);
     expect(updatedResponse).toEqual([
       {
         ack: expect.any(String),
         data: {
-          key: UserMetadataKey.ONBOARDING,
+          key: UserMetadataKey.Onboarding,
           userId: user.id,
           value: { isOnboarded: false },
         },
@@ -89,7 +89,7 @@ describe(SyncEntityType.UserMetadataDeleteV1, () => {
     const { auth, user, ctx } = await setup();
 
     const userRepo = ctx.get(UserRepository);
-    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.ONBOARDING, value: { isOnboarded: true } });
+    await userRepo.upsertMetadata(user.id, { key: UserMetadataKey.Onboarding, value: { isOnboarded: true } });
 
     const response = await ctx.syncStream(auth, [SyncRequestType.UserMetadataV1]);
     expect(response).toHaveLength(1);
@@ -97,7 +97,7 @@ describe(SyncEntityType.UserMetadataDeleteV1, () => {
       {
         ack: expect.any(String),
         data: {
-          key: UserMetadataKey.ONBOARDING,
+          key: UserMetadataKey.Onboarding,
           userId: user.id,
           value: { isOnboarded: true },
         },
@@ -107,14 +107,14 @@ describe(SyncEntityType.UserMetadataDeleteV1, () => {
 
     await ctx.syncAckAll(auth, response);
 
-    await userRepo.deleteMetadata(auth.user.id, UserMetadataKey.ONBOARDING);
+    await userRepo.deleteMetadata(auth.user.id, UserMetadataKey.Onboarding);
 
     await expect(ctx.syncStream(auth, [SyncRequestType.UserMetadataV1])).resolves.toEqual([
       {
         ack: expect.any(String),
         data: {
           userId: user.id,
-          key: UserMetadataKey.ONBOARDING,
+          key: UserMetadataKey.Onboarding,
         },
         type: 'UserMetadataDeleteV1',
       },
diff --git a/server/test/repositories/config.repository.mock.ts b/server/test/repositories/config.repository.mock.ts
index 460dfeef57..e31e1a3348 100644
--- a/server/test/repositories/config.repository.mock.ts
+++ b/server/test/repositories/config.repository.mock.ts
@@ -5,7 +5,7 @@ import { Mocked, vitest } from 'vitest';
 
 const envData: EnvData = {
   port: 2283,
-  environment: ImmichEnvironment.PRODUCTION,
+  environment: ImmichEnvironment.Production,
 
   buildMetadata: {},
   bull: {
@@ -31,7 +31,7 @@ const envData: EnvData = {
     },
 
     skipMigrations: false,
-    vectorExtension: DatabaseExtension.VECTORS,
+    vectorExtension: DatabaseExtension.Vectors,
   },
 
   licensePublicKey: {
@@ -84,7 +84,7 @@ const envData: EnvData = {
     metrics: new Set(),
   },
 
-  workers: [ImmichWorker.API, ImmichWorker.MICROSERVICES],
+  workers: [ImmichWorker.Api, ImmichWorker.Microservices],
 
   noColor: false,
 };
@@ -93,7 +93,7 @@ export const mockEnvData = (config: Partial<EnvData>) => ({ ...envData, ...confi
 export const newConfigRepositoryMock = (): Mocked<RepositoryInterface<ConfigRepository>> => {
   return {
     getEnv: vitest.fn().mockReturnValue(mockEnvData({})),
-    getWorker: vitest.fn().mockReturnValue(ImmichWorker.API),
+    getWorker: vitest.fn().mockReturnValue(ImmichWorker.Api),
     isDev: vitest.fn().mockReturnValue(false),
   };
 };
diff --git a/server/test/small.factory.ts b/server/test/small.factory.ts
index 7b0ebeb86b..6929924c3e 100644
--- a/server/test/small.factory.ts
+++ b/server/test/small.factory.ts
@@ -88,7 +88,7 @@ const authSharedLinkFactory = (sharedLink: Partial<AuthSharedLink> = {}) => {
 
 const authApiKeyFactory = (apiKey: Partial<AuthApiKey> = {}) => ({
   id: newUuid(),
-  permissions: [Permission.ALL],
+  permissions: [Permission.All],
   ...apiKey,
 });
 
@@ -154,7 +154,7 @@ const userFactory = (user: Partial<User> = {}) => ({
   profileChangedAt: newDate(),
   metadata: [
     {
-      key: UserMetadataKey.ONBOARDING,
+      key: UserMetadataKey.Onboarding,
       value: 'true',
     },
   ] as UserMetadataItem[],
@@ -178,7 +178,7 @@ const userAdminFactory = (user: Partial<UserAdmin> = {}) => {
     oauthId = '',
     quotaSizeInBytes = null,
     quotaUsageInBytes = 0,
-    status = UserStatus.ACTIVE,
+    status = UserStatus.Active,
     metadata = [],
   } = user;
   return {
@@ -208,7 +208,7 @@ const assetFactory = (asset: Partial<MapAsset> = {}) => ({
   updatedAt: newDate(),
   deletedAt: null,
   updateId: newUuidV7(),
-  status: AssetStatus.ACTIVE,
+  status: AssetStatus.Active,
   checksum: newSha1(),
   deviceAssetId: '',
   deviceId: '',
@@ -229,8 +229,8 @@ const assetFactory = (asset: Partial<MapAsset> = {}) => ({
   sidecarPath: null,
   stackId: null,
   thumbhash: null,
-  type: AssetType.IMAGE,
-  visibility: AssetVisibility.TIMELINE,
+  type: AssetType.Image,
+  visibility: AssetVisibility.Timeline,
   ...asset,
 });
 
@@ -258,7 +258,7 @@ const apiKeyFactory = (apiKey: Partial<ApiKey> = {}) => ({
   updatedAt: newDate(),
   updateId: newUuidV7(),
   name: 'Api Key',
-  permissions: [Permission.ALL],
+  permissions: [Permission.All],
   ...apiKey,
 });
 
@@ -284,7 +284,7 @@ const memoryFactory = (memory: Partial<Memory> = {}) => ({
   updateId: newUuidV7(),
   deletedAt: null,
   ownerId: newUuid(),
-  type: MemoryType.ON_THIS_DAY,
+  type: MemoryType.OnThisDay,
   data: { year: 2024 } as OnThisDayData,
   isSaved: false,
   memoryAt: newDate(),

From bcb968e3d1d57d258df4d2dfd524f80dae90dc1f Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 15 Jul 2025 18:39:00 -0400
Subject: [PATCH 217/337] refactor: job names (#19949)

---
 server/src/enum.ts                            | 123 ++++++++----------
 server/src/repositories/job.repository.ts     |   6 +-
 .../src/services/asset-media.service.spec.ts  |   8 +-
 server/src/services/asset-media.service.ts    |  10 +-
 server/src/services/asset.service.spec.ts     |  24 ++--
 server/src/services/asset.service.ts          |  20 +--
 server/src/services/audit.service.ts          |   2 +-
 server/src/services/auth.service.ts           |   2 +-
 server/src/services/backup.service.ts         |   4 +-
 server/src/services/duplicate.service.spec.ts |   4 +-
 server/src/services/duplicate.service.ts      |  10 +-
 server/src/services/job.service.spec.ts       |  64 ++++-----
 server/src/services/job.service.ts            |  64 ++++-----
 server/src/services/library.service.spec.ts   |  10 +-
 server/src/services/library.service.ts        |  34 ++---
 server/src/services/media.service.spec.ts     |  26 ++--
 server/src/services/media.service.ts          |  40 +++---
 server/src/services/memory.service.ts         |   4 +-
 server/src/services/metadata.service.spec.ts  |  16 +--
 server/src/services/metadata.service.ts       |  22 ++--
 .../src/services/notification.service.spec.ts |   4 +-
 server/src/services/notification.service.ts   |  10 +-
 server/src/services/person.service.spec.ts    |  20 +--
 server/src/services/person.service.ts         |  26 ++--
 server/src/services/session.service.ts        |   2 +-
 server/src/services/smart-info.service.ts     |   4 +-
 server/src/services/storage.service.ts        |   4 +-
 server/src/services/trash.service.spec.ts     |   8 +-
 server/src/services/trash.service.ts          |  10 +-
 .../src/services/user-admin.service.spec.ts   |   2 +-
 server/src/services/user-admin.service.ts     |   2 +-
 server/src/services/user.service.spec.ts      |   6 +-
 server/src/services/user.service.ts           |  12 +-
 server/src/services/version.service.ts        |   2 +-
 server/src/types.ts                           |  68 +++++-----
 .../specs/services/user.service.spec.ts       |   2 +-
 .../specs/services/version.service.spec.ts    |   2 +-
 37 files changed, 334 insertions(+), 343 deletions(-)

diff --git a/server/src/enum.ts b/server/src/enum.ts
index 1d8b8645d1..587a76126f 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -441,94 +441,75 @@ export enum QueueName {
 }
 
 export enum JobName {
-  //backups
-  BackupDatabase = 'database-backup',
+  AssetDelete = 'AssetDelete',
+  AssetDeleteCheck = 'AssetDeleteCheck',
+  AssetDetectFacesQueueAll = 'AssetDetectFacesQueueAll',
+  AssetDetectFaces = 'AssetDetectFaces',
+  AssetDetectDuplicatesQueueAll = 'AssetDetectDuplicatesQueueAll',
+  AssetDetectDuplicates = 'AssetDetectDuplicates',
+  AssetEncodeVideoQueueAll = 'AssetEncodeVideoQueueAll',
+  AssetEncodeVideo = 'AssetEncodeVideo',
+  AssetEmptyTrash = 'AssetEmptyTrash',
+  AssetExtractMetadataQueueAll = 'AssetExtractMetadataQueueAll',
+  AssetExtractMetadata = 'AssetExtractMetadata',
+  AssetFileMigration = 'AssetFileMigration',
+  AssetGenerateThumbnailsQueueAll = 'AssetGenerateThumbnailsQueueAll',
+  AssetGenerateThumbnails = 'AssetGenerateThumbnails',
 
-  // conversion
-  QueueVideoConversion = 'queue-video-conversion',
-  VideoConversation = 'video-conversion',
+  AuditLogCleanup = 'AuditLogCleanup',
 
-  // thumbnails
-  QueueGenerateThumbnails = 'queue-generate-thumbnails',
-  GenerateThumbnails = 'generate-thumbnails',
-  GeneratePersonThumbnail = 'generate-person-thumbnail',
+  DatabaseBackup = 'DatabaseBackup',
 
-  // metadata
-  QueueMetadataExtraction = 'queue-metadata-extraction',
-  MetadataExtraction = 'metadata-extraction',
+  FacialRecognitionQueueAll = 'FacialRecognitionQueueAll',
+  FacialRecognition = 'FacialRecognition',
 
-  // user
-  UserDeletion = 'user-deletion',
-  UserDeleteCheck = 'user-delete-check',
-  userSyncUsage = 'user-sync-usage',
+  FileDelete = 'FileDelete',
+  FileMigrationQueueAll = 'FileMigrationQueueAll',
 
-  // asset
-  AssetDeletion = 'asset-deletion',
-  AssetDeletionCheck = 'asset-deletion-check',
+  LibraryDeleteCheck = 'LibraryDeleteCheck',
+  LibraryDelete = 'LibraryDelete',
+  LibraryRemoveAsset = 'LibraryRemoveAsset',
+  LibrarySyncAssetsQueueAll = 'LibraryScanAssetsQueueAll',
+  LibrarySyncAssets = 'LibrarySyncAssets',
+  LibrarySyncFilesQueueAll = 'LibrarySyncFilesQueueAll',
+  LibrarySyncFiles = 'LibrarySyncFiles',
+  LibraryScanQueueAll = 'LibraryScanQueueAll',
 
-  // storage template
-  StorageTemplateMigration = 'storage-template-migration',
-  StorageTemplateMigrationSingle = 'storage-template-migration-single',
+  MemoryCleanup = 'MemoryCleanup',
+  MemoryGenerate = 'MemoryGenerate',
 
-  // tags
-  TagCleanup = 'tag-cleanup',
+  NotificationsCleanup = 'NotificationsCleanup',
 
-  // migration
-  QueueMigration = 'queue-migration',
-  MigrateAsset = 'migrate-asset',
-  MigratePerson = 'migrate-person',
+  NotifyUserSignup = 'NotifyUserSignup',
+  NotifyAlbumInvite = 'NotifyAlbumInvite',
+  NotifyAlbumUpdate = 'NotifyAlbumUpdate',
 
-  // facial recognition
-  PersonCleanup = 'person-cleanup',
-  QueueFaceDetection = 'queue-face-detection',
-  FaceDetection = 'face-detection',
-  QueueFacialRecognition = 'queue-facial-recognition',
-  FacialRecognition = 'facial-recognition',
+  UserDelete = 'UserDelete',
+  UserDeleteCheck = 'UserDeleteCheck',
+  UserSyncUsage = 'UserSyncUsage',
 
-  // library management
-  LibraryQueueSyncFiles = 'library-queue-sync-files',
-  LibraryQueueSyncAssets = 'library-queue-sync-assets',
-  LibrarySyncFiles = 'library-sync-files',
-  LibrarySyncAssets = 'library-sync-assets',
-  LibraryAssetRemoval = 'handle-library-file-deletion',
-  LibraryDelete = 'library-delete',
-  LibraryQueueScanAll = 'library-queue-scan-all',
-  LibraryQueueCleanup = 'library-queue-cleanup',
+  PersonCleanup = 'PersonCleanup',
+  PersonFileMigration = 'PersonFileMigration',
+  PersonGenerateThumbnail = 'PersonGenerateThumbnail',
 
-  // cleanup
-  DeleteFiles = 'delete-files',
-  CleanOldAuditLogs = 'clean-old-audit-logs',
-  CleanOldSessionTokens = 'clean-old-session-tokens',
+  SessionCleanup = 'SessionCleanup',
 
-  // memories
-  MemoriesCleanup = 'memories-cleanup',
-  MemoriesCreate = 'memories-create',
+  SendMail = 'SendMail',
 
-  // smart search
-  QueueSmartSearch = 'queue-smart-search',
-  SmartSearch = 'smart-search',
+  SidecarQueueAll = 'SidecarQueueAll',
+  SidecarDiscovery = 'SidecarDiscovery',
+  SidecarSync = 'SidecarSync',
+  SidecarWrite = 'SidecarWrite',
 
-  QueueTrashEmpty = 'queue-trash-empty',
+  SmartSearchQueueAll = 'SmartSearchQueueAll',
+  SmartSearch = 'SmartSearch',
 
-  // duplicate detection
-  QueueDuplicateDetection = 'queue-duplicate-detection',
-  DuplicateDetection = 'duplicate-detection',
+  StorageTemplateMigration = 'StorageTemplateMigration',
+  StorageTemplateMigrationSingle = 'StorageTemplateMigrationSingle',
 
-  // XMP sidecars
-  QueueSidecar = 'queue-sidecar',
-  SidecarDiscovery = 'sidecar-discovery',
-  SidecarSync = 'sidecar-sync',
-  SidecarWrite = 'sidecar-write',
+  TagCleanup = 'TagCleanup',
 
-  // Notification
-  NotifySignup = 'notify-signup',
-  NotifyAlbumInvite = 'notify-album-invite',
-  NotifyAlbumUpdate = 'notify-album-update',
-  NotificationsCleanup = 'notifications-cleanup',
-  SendMail = 'notification-send-email',
-
-  // Version check
-  VersionCheck = 'version-check',
+  VersionCheck = 'VersionCheck',
 }
 
 export enum JobCommand {
diff --git a/server/src/repositories/job.repository.ts b/server/src/repositories/job.repository.ts
index 3550529bfc..5acd8d5746 100644
--- a/server/src/repositories/job.repository.ts
+++ b/server/src/repositories/job.repository.ts
@@ -214,11 +214,11 @@ export class JobRepository {
       case JobName.StorageTemplateMigrationSingle: {
         return { jobId: item.data.id };
       }
-      case JobName.GeneratePersonThumbnail: {
+      case JobName.PersonGenerateThumbnail: {
         return { priority: 1 };
       }
-      case JobName.QueueFacialRecognition: {
-        return { jobId: JobName.QueueFacialRecognition };
+      case JobName.FacialRecognitionQueueAll: {
+        return { jobId: JobName.FacialRecognitionQueueAll };
       }
       default: {
         return null;
diff --git a/server/src/services/asset-media.service.spec.ts b/server/src/services/asset-media.service.spec.ts
index c881ebb497..dccb79c585 100644
--- a/server/src/services/asset-media.service.spec.ts
+++ b/server/src/services/asset-media.service.spec.ts
@@ -384,7 +384,7 @@ describe(AssetMediaService.name, () => {
       });
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.DeleteFiles,
+        name: JobName.FileDelete,
         data: { files: ['fake_path/asset_1.jpeg', undefined] },
       });
       expect(mocks.user.updateUsage).not.toHaveBeenCalled();
@@ -409,7 +409,7 @@ describe(AssetMediaService.name, () => {
       );
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.DeleteFiles,
+        name: JobName.FileDelete,
         data: { files: ['fake_path/asset_1.jpeg', undefined] },
       });
       expect(mocks.user.updateUsage).not.toHaveBeenCalled();
@@ -815,7 +815,7 @@ describe(AssetMediaService.name, () => {
       expect(mocks.asset.create).not.toHaveBeenCalled();
       expect(mocks.asset.updateAll).not.toHaveBeenCalled();
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.DeleteFiles,
+        name: JobName.FileDelete,
         data: { files: [updatedFile.originalPath, undefined] },
       });
       expect(mocks.user.updateUsage).not.toHaveBeenCalled();
@@ -912,7 +912,7 @@ describe(AssetMediaService.name, () => {
       await sut.onUploadError(request, file);
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.DeleteFiles,
+        name: JobName.FileDelete,
         data: { files: ['upload/upload/user-id/ra/nd/random-uuid.jpg'] },
       });
     });
diff --git a/server/src/services/asset-media.service.ts b/server/src/services/asset-media.service.ts
index 127fdbe8eb..080774d038 100644
--- a/server/src/services/asset-media.service.ts
+++ b/server/src/services/asset-media.service.ts
@@ -121,7 +121,7 @@ export class AssetMediaService extends BaseService {
     const uploadFolder = this.getUploadFolder(asRequest(request, file));
     const uploadPath = `${uploadFolder}/${uploadFilename}`;
 
-    await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files: [uploadPath] } });
+    await this.jobRepository.queue({ name: JobName.FileDelete, data: { files: [uploadPath] } });
   }
 
   async uploadAsset(
@@ -312,7 +312,7 @@ export class AssetMediaService extends BaseService {
   ): Promise<AssetMediaResponseDto> {
     // clean up files
     await this.jobRepository.queue({
-      name: JobName.DeleteFiles,
+      name: JobName.FileDelete,
       data: { files: [file.originalPath, sidecarFile?.originalPath] },
     });
 
@@ -365,7 +365,7 @@ export class AssetMediaService extends BaseService {
     await this.storageRepository.utimes(file.originalPath, new Date(), new Date(dto.fileModifiedAt));
     await this.assetRepository.upsertExif({ assetId, fileSizeInByte: file.size });
     await this.jobRepository.queue({
-      name: JobName.MetadataExtraction,
+      name: JobName.AssetExtractMetadata,
       data: { id: assetId, source: 'upload' },
     });
   }
@@ -394,7 +394,7 @@ export class AssetMediaService extends BaseService {
 
     const { size } = await this.storageRepository.stat(created.originalPath);
     await this.assetRepository.upsertExif({ assetId: created.id, fileSizeInByte: size });
-    await this.jobRepository.queue({ name: JobName.MetadataExtraction, data: { id: created.id, source: 'copy' } });
+    await this.jobRepository.queue({ name: JobName.AssetExtractMetadata, data: { id: created.id, source: 'copy' } });
     return created;
   }
 
@@ -427,7 +427,7 @@ export class AssetMediaService extends BaseService {
     }
     await this.storageRepository.utimes(file.originalPath, new Date(), new Date(dto.fileModifiedAt));
     await this.assetRepository.upsertExif({ assetId: asset.id, fileSizeInByte: file.size });
-    await this.jobRepository.queue({ name: JobName.MetadataExtraction, data: { id: asset.id, source: 'upload' } });
+    await this.jobRepository.queue({ name: JobName.AssetExtractMetadata, data: { id: asset.id, source: 'upload' } });
 
     return asset;
   }
diff --git a/server/src/services/asset.service.spec.ts b/server/src/services/asset.service.spec.ts
index 606c93eab8..6461735976 100755
--- a/server/src/services/asset.service.spec.ts
+++ b/server/src/services/asset.service.spec.ts
@@ -522,7 +522,7 @@ describe(AssetService.name, () => {
 
       expect(mocks.assetJob.streamForDeletedJob).toHaveBeenCalledWith(new Date());
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.AssetDeletion, data: { id: asset.id, deleteOnDisk: true } },
+        { name: JobName.AssetDelete, data: { id: asset.id, deleteOnDisk: true } },
       ]);
     });
 
@@ -536,7 +536,7 @@ describe(AssetService.name, () => {
 
       expect(mocks.assetJob.streamForDeletedJob).toHaveBeenCalledWith(DateTime.now().minus({ days: 7 }).toJSDate());
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.AssetDeletion, data: { id: asset.id, deleteOnDisk: true } },
+        { name: JobName.AssetDelete, data: { id: asset.id, deleteOnDisk: true } },
       ]);
     });
   });
@@ -552,7 +552,7 @@ describe(AssetService.name, () => {
       expect(mocks.job.queue.mock.calls).toEqual([
         [
           {
-            name: JobName.DeleteFiles,
+            name: JobName.FileDelete,
             data: {
               files: [
                 '/uploads/user-id/webp/path.ext',
@@ -606,7 +606,7 @@ describe(AssetService.name, () => {
       expect(mocks.job.queue.mock.calls).toEqual([
         [
           {
-            name: JobName.AssetDeletion,
+            name: JobName.AssetDelete,
             data: {
               id: assetStub.livePhotoMotionAsset.id,
               deleteOnDisk: true,
@@ -615,7 +615,7 @@ describe(AssetService.name, () => {
         ],
         [
           {
-            name: JobName.DeleteFiles,
+            name: JobName.FileDelete,
             data: {
               files: [
                 '/uploads/user-id/webp/path.ext',
@@ -643,7 +643,7 @@ describe(AssetService.name, () => {
       expect(mocks.job.queue.mock.calls).toEqual([
         [
           {
-            name: JobName.DeleteFiles,
+            name: JobName.FileDelete,
             data: {
               files: [
                 '/uploads/user-id/webp/path.ext',
@@ -679,7 +679,7 @@ describe(AssetService.name, () => {
 
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REFRESH_FACES });
 
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.FaceDetection, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.AssetDetectFaces, data: { id: 'asset-1' } }]);
     });
 
     it('should run the refresh metadata job', async () => {
@@ -687,7 +687,9 @@ describe(AssetService.name, () => {
 
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REFRESH_METADATA });
 
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.MetadataExtraction, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([
+        { name: JobName.AssetExtractMetadata, data: { id: 'asset-1' } },
+      ]);
     });
 
     it('should run the refresh thumbnails job', async () => {
@@ -695,7 +697,9 @@ describe(AssetService.name, () => {
 
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REGENERATE_THUMBNAIL });
 
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.GenerateThumbnails, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([
+        { name: JobName.AssetGenerateThumbnails, data: { id: 'asset-1' } },
+      ]);
     });
 
     it('should run the transcode video', async () => {
@@ -703,7 +707,7 @@ describe(AssetService.name, () => {
 
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.TRANSCODE_VIDEO });
 
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.VideoConversation, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.AssetEncodeVideo, data: { id: 'asset-1' } }]);
     });
   });
 
diff --git a/server/src/services/asset.service.ts b/server/src/services/asset.service.ts
index d9b0527d5b..864a9cc512 100644
--- a/server/src/services/asset.service.ts
+++ b/server/src/services/asset.service.ts
@@ -145,7 +145,7 @@ export class AssetService extends BaseService {
     }
   }
 
-  @OnJob({ name: JobName.AssetDeletionCheck, queue: QueueName.BackgroundTask })
+  @OnJob({ name: JobName.AssetDeleteCheck, queue: QueueName.BackgroundTask })
   async handleAssetDeletionCheck(): Promise<JobStatus> {
     const config = await this.getConfig({ withCache: false });
     const trashedDays = config.trash.enabled ? config.trash.days : 0;
@@ -158,7 +158,7 @@ export class AssetService extends BaseService {
       if (chunk.length > 0) {
         await this.jobRepository.queueAll(
           chunk.map(({ id, isOffline }) => ({
-            name: JobName.AssetDeletion,
+            name: JobName.AssetDelete,
             data: { id, deleteOnDisk: !isOffline },
           })),
         );
@@ -179,8 +179,8 @@ export class AssetService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.AssetDeletion, queue: QueueName.BackgroundTask })
-  async handleAssetDeletion(job: JobOf<JobName.AssetDeletion>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetDelete, queue: QueueName.BackgroundTask })
+  async handleAssetDeletion(job: JobOf<JobName.AssetDelete>): Promise<JobStatus> {
     const { id, deleteOnDisk } = job;
 
     const asset = await this.assetJobRepository.getForAssetDeletion(id);
@@ -215,7 +215,7 @@ export class AssetService extends BaseService {
       const count = await this.assetRepository.getLivePhotoCount(asset.livePhotoVideoId);
       if (count === 0) {
         await this.jobRepository.queue({
-          name: JobName.AssetDeletion,
+          name: JobName.AssetDelete,
           data: { id: asset.livePhotoVideoId, deleteOnDisk },
         });
       }
@@ -228,7 +228,7 @@ export class AssetService extends BaseService {
       files.push(asset.sidecarPath, asset.originalPath);
     }
 
-    await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files } });
+    await this.jobRepository.queue({ name: JobName.FileDelete, data: { files } });
 
     return JobStatus.Success;
   }
@@ -255,22 +255,22 @@ export class AssetService extends BaseService {
     for (const id of dto.assetIds) {
       switch (dto.name) {
         case AssetJobName.REFRESH_FACES: {
-          jobs.push({ name: JobName.FaceDetection, data: { id } });
+          jobs.push({ name: JobName.AssetDetectFaces, data: { id } });
           break;
         }
 
         case AssetJobName.REFRESH_METADATA: {
-          jobs.push({ name: JobName.MetadataExtraction, data: { id } });
+          jobs.push({ name: JobName.AssetExtractMetadata, data: { id } });
           break;
         }
 
         case AssetJobName.REGENERATE_THUMBNAIL: {
-          jobs.push({ name: JobName.GenerateThumbnails, data: { id } });
+          jobs.push({ name: JobName.AssetGenerateThumbnails, data: { id } });
           break;
         }
 
         case AssetJobName.TRANSCODE_VIDEO: {
-          jobs.push({ name: JobName.VideoConversation, data: { id } });
+          jobs.push({ name: JobName.AssetEncodeVideo, data: { id } });
           break;
         }
       }
diff --git a/server/src/services/audit.service.ts b/server/src/services/audit.service.ts
index eaa48de1f4..498d99b82c 100644
--- a/server/src/services/audit.service.ts
+++ b/server/src/services/audit.service.ts
@@ -7,7 +7,7 @@ import { BaseService } from 'src/services/base.service';
 
 @Injectable()
 export class AuditService extends BaseService {
-  @OnJob({ name: JobName.CleanOldAuditLogs, queue: QueueName.BackgroundTask })
+  @OnJob({ name: JobName.AuditLogCleanup, queue: QueueName.BackgroundTask })
   async handleCleanup(): Promise<JobStatus> {
     await this.auditRepository.removeBefore(DateTime.now().minus(AUDIT_LOG_MAX_DURATION).toJSDate());
     return JobStatus.Success;
diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
index 00b7c1e9aa..a5b0de25cd 100644
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -330,7 +330,7 @@ export class AuthService extends BaseService {
       await this.userRepository.update(user.id, { profileImagePath, profileChangedAt: new Date() });
 
       if (oldPath) {
-        await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files: [oldPath] } });
+        await this.jobRepository.queue({ name: JobName.FileDelete, data: { files: [oldPath] } });
       }
     } catch (error: Error | any) {
       this.logger.warn(`Unable to sync oauth profile picture: ${error}`, error?.stack);
diff --git a/server/src/services/backup.service.ts b/server/src/services/backup.service.ts
index a5882b4f80..9daa2c3aea 100644
--- a/server/src/services/backup.service.ts
+++ b/server/src/services/backup.service.ts
@@ -26,7 +26,7 @@ export class BackupService extends BaseService {
       this.cronRepository.create({
         name: 'backupDatabase',
         expression: database.cronExpression,
-        onTick: () => handlePromiseError(this.jobRepository.queue({ name: JobName.BackupDatabase }), this.logger),
+        onTick: () => handlePromiseError(this.jobRepository.queue({ name: JobName.DatabaseBackup }), this.logger),
         start: database.enabled,
       });
     }
@@ -68,7 +68,7 @@ export class BackupService extends BaseService {
     this.logger.debug(`Database Backup Cleanup Finished, deleted ${toDelete.length} backups`);
   }
 
-  @OnJob({ name: JobName.BackupDatabase, queue: QueueName.BackupDatabase })
+  @OnJob({ name: JobName.DatabaseBackup, queue: QueueName.BackupDatabase })
   async handleBackupDatabase(): Promise<JobStatus> {
     this.logger.debug(`Database Backup Started`);
     const { database } = this.configRepository.getEnv();
diff --git a/server/src/services/duplicate.service.spec.ts b/server/src/services/duplicate.service.spec.ts
index 0a2243e322..e5ac9f82ba 100644
--- a/server/src/services/duplicate.service.spec.ts
+++ b/server/src/services/duplicate.service.spec.ts
@@ -108,7 +108,7 @@ describe(SearchService.name, () => {
       expect(mocks.assetJob.streamForSearchDuplicates).toHaveBeenCalledWith(undefined);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.DuplicateDetection,
+          name: JobName.AssetDetectDuplicates,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -122,7 +122,7 @@ describe(SearchService.name, () => {
       expect(mocks.assetJob.streamForSearchDuplicates).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.DuplicateDetection,
+          name: JobName.AssetDetectDuplicates,
           data: { id: assetStub.image.id },
         },
       ]);
diff --git a/server/src/services/duplicate.service.ts b/server/src/services/duplicate.service.ts
index 1699cf73f6..618754ff74 100644
--- a/server/src/services/duplicate.service.ts
+++ b/server/src/services/duplicate.service.ts
@@ -29,8 +29,8 @@ export class DuplicateService extends BaseService {
     await this.duplicateRepository.deleteAll(auth.user.id, dto.ids);
   }
 
-  @OnJob({ name: JobName.QueueDuplicateDetection, queue: QueueName.DuplicateDetection })
-  async handleQueueSearchDuplicates({ force }: JobOf<JobName.QueueDuplicateDetection>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetDetectDuplicatesQueueAll, queue: QueueName.DuplicateDetection })
+  async handleQueueSearchDuplicates({ force }: JobOf<JobName.AssetDetectDuplicatesQueueAll>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: false });
     if (!isDuplicateDetectionEnabled(machineLearning)) {
       return JobStatus.Skipped;
@@ -44,7 +44,7 @@ export class DuplicateService extends BaseService {
 
     const assets = this.assetJobRepository.streamForSearchDuplicates(force);
     for await (const asset of assets) {
-      jobs.push({ name: JobName.DuplicateDetection, data: { id: asset.id } });
+      jobs.push({ name: JobName.AssetDetectDuplicates, data: { id: asset.id } });
       if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await queueAll();
       }
@@ -55,8 +55,8 @@ export class DuplicateService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.DuplicateDetection, queue: QueueName.DuplicateDetection })
-  async handleSearchDuplicates({ id }: JobOf<JobName.DuplicateDetection>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetDetectDuplicates, queue: QueueName.DuplicateDetection })
+  async handleSearchDuplicates({ id }: JobOf<JobName.AssetDetectDuplicates>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: true });
     if (!isDuplicateDetectionEnabled(machineLearning)) {
       return JobStatus.Skipped;
diff --git a/server/src/services/job.service.spec.ts b/server/src/services/job.service.spec.ts
index 497d81b4ca..a57db736af 100644
--- a/server/src/services/job.service.spec.ts
+++ b/server/src/services/job.service.spec.ts
@@ -37,16 +37,16 @@ describe(JobService.name, () => {
       await sut.handleNightlyJobs();
 
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.AssetDeletionCheck },
+        { name: JobName.AssetDeleteCheck },
         { name: JobName.UserDeleteCheck },
         { name: JobName.PersonCleanup },
-        { name: JobName.MemoriesCleanup },
-        { name: JobName.CleanOldSessionTokens },
-        { name: JobName.CleanOldAuditLogs },
-        { name: JobName.MemoriesCreate },
-        { name: JobName.userSyncUsage },
-        { name: JobName.QueueGenerateThumbnails, data: { force: false } },
-        { name: JobName.QueueFacialRecognition, data: { force: false, nightly: true } },
+        { name: JobName.MemoryCleanup },
+        { name: JobName.SessionCleanup },
+        { name: JobName.AuditLogCleanup },
+        { name: JobName.MemoryGenerate },
+        { name: JobName.UserSyncUsage },
+        { name: JobName.AssetGenerateThumbnailsQueueAll, data: { force: false } },
+        { name: JobName.FacialRecognitionQueueAll, data: { force: false, nightly: true } },
       ]);
     });
   });
@@ -136,7 +136,7 @@ describe(JobService.name, () => {
 
       await sut.handleCommand(QueueName.VideoConversion, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueVideoConversion, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.AssetEncodeVideoQueueAll, data: { force: false } });
     });
 
     it('should handle a start storage template migration command', async () => {
@@ -152,7 +152,7 @@ describe(JobService.name, () => {
 
       await sut.handleCommand(QueueName.SmartSearch, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueSmartSearch, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.SmartSearchQueueAll, data: { force: false } });
     });
 
     it('should handle a start metadata extraction command', async () => {
@@ -160,7 +160,10 @@ describe(JobService.name, () => {
 
       await sut.handleCommand(QueueName.MetadataExtraction, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueMetadataExtraction, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({
+        name: JobName.AssetExtractMetadataQueueAll,
+        data: { force: false },
+      });
     });
 
     it('should handle a start sidecar command', async () => {
@@ -168,7 +171,7 @@ describe(JobService.name, () => {
 
       await sut.handleCommand(QueueName.Sidecar, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueSidecar, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.SidecarQueueAll, data: { force: false } });
     });
 
     it('should handle a start thumbnail generation command', async () => {
@@ -176,7 +179,10 @@ describe(JobService.name, () => {
 
       await sut.handleCommand(QueueName.ThumbnailGeneration, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueGenerateThumbnails, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({
+        name: JobName.AssetGenerateThumbnailsQueueAll,
+        data: { force: false },
+      });
     });
 
     it('should handle a start face detection command', async () => {
@@ -184,7 +190,7 @@ describe(JobService.name, () => {
 
       await sut.handleCommand(QueueName.FaceDetection, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueFaceDetection, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.AssetDetectFacesQueueAll, data: { force: false } });
     });
 
     it('should handle a start facial recognition command', async () => {
@@ -192,7 +198,7 @@ describe(JobService.name, () => {
 
       await sut.handleCommand(QueueName.FacialRecognition, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueFacialRecognition, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.FacialRecognitionQueueAll, data: { force: false } });
     });
 
     it('should handle a start backup database command', async () => {
@@ -200,7 +206,7 @@ describe(JobService.name, () => {
 
       await sut.handleCommand(QueueName.BackupDatabase, { command: JobCommand.Start, force: false });
 
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.BackupDatabase, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.DatabaseBackup, data: { force: false } });
     });
 
     it('should throw a bad request when an invalid queue is used', async () => {
@@ -220,55 +226,55 @@ describe(JobService.name, () => {
       mocks.job.run.mockResolvedValue(JobStatus.Success);
 
       await sut.onJobStart(QueueName.BackgroundTask, {
-        name: JobName.DeleteFiles,
+        name: JobName.FileDelete,
         data: { files: ['path/to/file'] },
       });
 
       expect(mocks.telemetry.jobs.addToGauge).toHaveBeenCalledWith('immich.queues.background_task.active', 1);
       expect(mocks.telemetry.jobs.addToGauge).toHaveBeenCalledWith('immich.queues.background_task.active', -1);
-      expect(mocks.telemetry.jobs.addToCounter).toHaveBeenCalledWith('immich.jobs.delete_files.success', 1);
+      expect(mocks.telemetry.jobs.addToCounter).toHaveBeenCalledWith('immich.jobs.file_delete.success', 1);
       expect(mocks.logger.error).not.toHaveBeenCalled();
     });
 
     const tests: Array<{ item: JobItem; jobs: JobName[]; stub?: any }> = [
       {
         item: { name: JobName.SidecarSync, data: { id: 'asset-1' } },
-        jobs: [JobName.MetadataExtraction],
+        jobs: [JobName.AssetExtractMetadata],
       },
       {
         item: { name: JobName.SidecarDiscovery, data: { id: 'asset-1' } },
-        jobs: [JobName.MetadataExtraction],
+        jobs: [JobName.AssetExtractMetadata],
       },
       {
         item: { name: JobName.StorageTemplateMigrationSingle, data: { id: 'asset-1', source: 'upload' } },
-        jobs: [JobName.GenerateThumbnails],
+        jobs: [JobName.AssetGenerateThumbnails],
       },
       {
         item: { name: JobName.StorageTemplateMigrationSingle, data: { id: 'asset-1' } },
         jobs: [],
       },
       {
-        item: { name: JobName.GeneratePersonThumbnail, data: { id: 'asset-1' } },
+        item: { name: JobName.PersonGenerateThumbnail, data: { id: 'asset-1' } },
         jobs: [],
       },
       {
-        item: { name: JobName.GenerateThumbnails, data: { id: 'asset-1' } },
+        item: { name: JobName.AssetGenerateThumbnails, data: { id: 'asset-1' } },
         jobs: [],
         stub: [assetStub.image],
       },
       {
-        item: { name: JobName.GenerateThumbnails, data: { id: 'asset-1' } },
+        item: { name: JobName.AssetGenerateThumbnails, data: { id: 'asset-1' } },
         jobs: [],
         stub: [assetStub.video],
       },
       {
-        item: { name: JobName.GenerateThumbnails, data: { id: 'asset-1', source: 'upload' } },
-        jobs: [JobName.SmartSearch, JobName.FaceDetection],
+        item: { name: JobName.AssetGenerateThumbnails, data: { id: 'asset-1', source: 'upload' } },
+        jobs: [JobName.SmartSearch, JobName.AssetDetectFaces],
         stub: [assetStub.livePhotoStillAsset],
       },
       {
-        item: { name: JobName.GenerateThumbnails, data: { id: 'asset-1', source: 'upload' } },
-        jobs: [JobName.SmartSearch, JobName.FaceDetection, JobName.VideoConversation],
+        item: { name: JobName.AssetGenerateThumbnails, data: { id: 'asset-1', source: 'upload' } },
+        jobs: [JobName.SmartSearch, JobName.AssetDetectFaces, JobName.AssetEncodeVideo],
         stub: [assetStub.video],
       },
       {
@@ -276,7 +282,7 @@ describe(JobService.name, () => {
         jobs: [],
       },
       {
-        item: { name: JobName.FaceDetection, data: { id: 'asset-1' } },
+        item: { name: JobName.AssetDetectFaces, data: { id: 'asset-1' } },
         jobs: [],
       },
       {
diff --git a/server/src/services/job.service.ts b/server/src/services/job.service.ts
index 73254b9f38..c67f3af39f 100644
--- a/server/src/services/job.service.ts
+++ b/server/src/services/job.service.ts
@@ -40,15 +40,15 @@ const asJobItem = (dto: JobCreateDto): JobItem => {
     }
 
     case ManualJobName.MemoryCleanup: {
-      return { name: JobName.MemoriesCleanup };
+      return { name: JobName.MemoryCleanup };
     }
 
     case ManualJobName.MemoryCreate: {
-      return { name: JobName.MemoriesCreate };
+      return { name: JobName.MemoryGenerate };
     }
 
     case ManualJobName.BackupDatabase: {
-      return { name: JobName.BackupDatabase };
+      return { name: JobName.DatabaseBackup };
     }
 
     default: {
@@ -190,7 +190,7 @@ export class JobService extends BaseService {
 
     switch (name) {
       case QueueName.VideoConversion: {
-        return this.jobRepository.queue({ name: JobName.QueueVideoConversion, data: { force } });
+        return this.jobRepository.queue({ name: JobName.AssetEncodeVideoQueueAll, data: { force } });
       }
 
       case QueueName.StorageTemplateMigration: {
@@ -198,43 +198,43 @@ export class JobService extends BaseService {
       }
 
       case QueueName.Migration: {
-        return this.jobRepository.queue({ name: JobName.QueueMigration });
+        return this.jobRepository.queue({ name: JobName.FileMigrationQueueAll });
       }
 
       case QueueName.SmartSearch: {
-        return this.jobRepository.queue({ name: JobName.QueueSmartSearch, data: { force } });
+        return this.jobRepository.queue({ name: JobName.SmartSearchQueueAll, data: { force } });
       }
 
       case QueueName.DuplicateDetection: {
-        return this.jobRepository.queue({ name: JobName.QueueDuplicateDetection, data: { force } });
+        return this.jobRepository.queue({ name: JobName.AssetDetectDuplicatesQueueAll, data: { force } });
       }
 
       case QueueName.MetadataExtraction: {
-        return this.jobRepository.queue({ name: JobName.QueueMetadataExtraction, data: { force } });
+        return this.jobRepository.queue({ name: JobName.AssetExtractMetadataQueueAll, data: { force } });
       }
 
       case QueueName.Sidecar: {
-        return this.jobRepository.queue({ name: JobName.QueueSidecar, data: { force } });
+        return this.jobRepository.queue({ name: JobName.SidecarQueueAll, data: { force } });
       }
 
       case QueueName.ThumbnailGeneration: {
-        return this.jobRepository.queue({ name: JobName.QueueGenerateThumbnails, data: { force } });
+        return this.jobRepository.queue({ name: JobName.AssetGenerateThumbnailsQueueAll, data: { force } });
       }
 
       case QueueName.FaceDetection: {
-        return this.jobRepository.queue({ name: JobName.QueueFaceDetection, data: { force } });
+        return this.jobRepository.queue({ name: JobName.AssetDetectFacesQueueAll, data: { force } });
       }
 
       case QueueName.FacialRecognition: {
-        return this.jobRepository.queue({ name: JobName.QueueFacialRecognition, data: { force } });
+        return this.jobRepository.queue({ name: JobName.FacialRecognitionQueueAll, data: { force } });
       }
 
       case QueueName.Library: {
-        return this.jobRepository.queue({ name: JobName.LibraryQueueScanAll, data: { force } });
+        return this.jobRepository.queue({ name: JobName.LibraryScanQueueAll, data: { force } });
       }
 
       case QueueName.BackupDatabase: {
-        return this.jobRepository.queue({ name: JobName.BackupDatabase, data: { force } });
+        return this.jobRepository.queue({ name: JobName.DatabaseBackup, data: { force } });
       }
 
       default: {
@@ -249,7 +249,7 @@ export class JobService extends BaseService {
     this.telemetryRepository.jobs.addToGauge(queueMetric, 1);
     try {
       const status = await this.jobRepository.run(job);
-      const jobMetric = `immich.jobs.${job.name.replaceAll('-', '_')}.${status}`;
+      const jobMetric = `immich.jobs.${snakeCase(job.name)}.${status}`;
       this.telemetryRepository.jobs.addToCounter(jobMetric, 1);
       if (status === JobStatus.Success || status == JobStatus.Skipped) {
         await this.onDone(job);
@@ -276,29 +276,29 @@ export class JobService extends BaseService {
 
     if (config.nightlyTasks.databaseCleanup) {
       jobs.push(
-        { name: JobName.AssetDeletionCheck },
+        { name: JobName.AssetDeleteCheck },
         { name: JobName.UserDeleteCheck },
         { name: JobName.PersonCleanup },
-        { name: JobName.MemoriesCleanup },
-        { name: JobName.CleanOldSessionTokens },
-        { name: JobName.CleanOldAuditLogs },
+        { name: JobName.MemoryCleanup },
+        { name: JobName.SessionCleanup },
+        { name: JobName.AuditLogCleanup },
       );
     }
 
     if (config.nightlyTasks.generateMemories) {
-      jobs.push({ name: JobName.MemoriesCreate });
+      jobs.push({ name: JobName.MemoryGenerate });
     }
 
     if (config.nightlyTasks.syncQuotaUsage) {
-      jobs.push({ name: JobName.userSyncUsage });
+      jobs.push({ name: JobName.UserSyncUsage });
     }
 
     if (config.nightlyTasks.missingThumbnails) {
-      jobs.push({ name: JobName.QueueGenerateThumbnails, data: { force: false } });
+      jobs.push({ name: JobName.AssetGenerateThumbnailsQueueAll, data: { force: false } });
     }
 
     if (config.nightlyTasks.clusterNewFaces) {
-      jobs.push({ name: JobName.QueueFacialRecognition, data: { force: false, nightly: true } });
+      jobs.push({ name: JobName.FacialRecognitionQueueAll, data: { force: false, nightly: true } });
     }
 
     await this.jobRepository.queueAll(jobs);
@@ -311,13 +311,13 @@ export class JobService extends BaseService {
     switch (item.name) {
       case JobName.SidecarSync:
       case JobName.SidecarDiscovery: {
-        await this.jobRepository.queue({ name: JobName.MetadataExtraction, data: item.data });
+        await this.jobRepository.queue({ name: JobName.AssetExtractMetadata, data: item.data });
         break;
       }
 
       case JobName.SidecarWrite: {
         await this.jobRepository.queue({
-          name: JobName.MetadataExtraction,
+          name: JobName.AssetExtractMetadata,
           data: { id: item.data.id, source: 'sidecar-write' },
         });
         break;
@@ -325,12 +325,12 @@ export class JobService extends BaseService {
 
       case JobName.StorageTemplateMigrationSingle: {
         if (item.data.source === 'upload' || item.data.source === 'copy') {
-          await this.jobRepository.queue({ name: JobName.GenerateThumbnails, data: item.data });
+          await this.jobRepository.queue({ name: JobName.AssetGenerateThumbnails, data: item.data });
         }
         break;
       }
 
-      case JobName.GeneratePersonThumbnail: {
+      case JobName.PersonGenerateThumbnail: {
         const { id } = item.data;
         const person = await this.personRepository.getById(id);
         if (person) {
@@ -339,7 +339,7 @@ export class JobService extends BaseService {
         break;
       }
 
-      case JobName.GenerateThumbnails: {
+      case JobName.AssetGenerateThumbnails: {
         if (!item.data.notify && item.data.source !== 'upload') {
           break;
         }
@@ -352,11 +352,11 @@ export class JobService extends BaseService {
 
         const jobs: JobItem[] = [
           { name: JobName.SmartSearch, data: item.data },
-          { name: JobName.FaceDetection, data: item.data },
+          { name: JobName.AssetDetectFaces, data: item.data },
         ];
 
         if (asset.type === AssetType.Video) {
-          jobs.push({ name: JobName.VideoConversation, data: item.data });
+          jobs.push({ name: JobName.AssetEncodeVideo, data: item.data });
         }
 
         await this.jobRepository.queueAll(jobs);
@@ -419,12 +419,12 @@ export class JobService extends BaseService {
 
       case JobName.SmartSearch: {
         if (item.data.source === 'upload') {
-          await this.jobRepository.queue({ name: JobName.DuplicateDetection, data: item.data });
+          await this.jobRepository.queue({ name: JobName.AssetDetectDuplicates, data: item.data });
         }
         break;
       }
 
-      case JobName.UserDeletion: {
+      case JobName.UserDelete: {
         this.eventRepository.clientBroadcast('on_user_delete', item.data.id);
         break;
       }
diff --git a/server/src/services/library.service.spec.ts b/server/src/services/library.service.spec.ts
index aa2b80d928..dac2b64ebc 100644
--- a/server/src/services/library.service.spec.ts
+++ b/server/src/services/library.service.spec.ts
@@ -1010,7 +1010,7 @@ describe(LibraryService.name, () => {
         await sut.watchAll();
 
         expect(mocks.job.queue).toHaveBeenCalledWith({
-          name: JobName.LibraryAssetRemoval,
+          name: JobName.LibraryRemoveAsset,
           data: {
             libraryId: library.id,
             paths: [assetStub.image.originalPath],
@@ -1131,11 +1131,11 @@ describe(LibraryService.name, () => {
 
       expect(mocks.job.queue).toHaveBeenCalledTimes(2);
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.LibraryQueueSyncFiles,
+        name: JobName.LibrarySyncFilesQueueAll,
         data: { id: library.id },
       });
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.LibraryQueueSyncAssets,
+        name: JobName.LibrarySyncAssetsQueueAll,
         data: { id: library.id },
       });
     });
@@ -1150,11 +1150,11 @@ describe(LibraryService.name, () => {
       await expect(sut.handleQueueScanAll()).resolves.toBe(JobStatus.Success);
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.LibraryQueueCleanup,
+        name: JobName.LibraryDeleteCheck,
         data: {},
       });
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.LibraryQueueSyncFiles, data: { id: library.id } },
+        { name: JobName.LibrarySyncFilesQueueAll, data: { id: library.id } },
       ]);
     });
   });
diff --git a/server/src/services/library.service.ts b/server/src/services/library.service.ts
index f8377081fa..4c96ad0062 100644
--- a/server/src/services/library.service.ts
+++ b/server/src/services/library.service.ts
@@ -47,7 +47,7 @@ export class LibraryService extends BaseService {
       this.cronRepository.create({
         name: CronJob.LibraryScan,
         expression: scan.cronExpression,
-        onTick: () => handlePromiseError(this.jobRepository.queue({ name: JobName.LibraryQueueScanAll }), this.logger),
+        onTick: () => handlePromiseError(this.jobRepository.queue({ name: JobName.LibraryScanQueueAll }), this.logger),
         start: scan.enabled,
       });
     }
@@ -113,7 +113,7 @@ export class LibraryService extends BaseService {
     const deletionHandler = async (path: string) => {
       this.logger.debug(`File unlink event received for ${path} in library ${library.id}}`);
       await this.jobRepository.queue({
-        name: JobName.LibraryAssetRemoval,
+        name: JobName.LibraryRemoveAsset,
         data: { libraryId: library.id, paths: [path] },
       });
     };
@@ -198,7 +198,7 @@ export class LibraryService extends BaseService {
     return libraries.map((library) => mapLibrary(library));
   }
 
-  @OnJob({ name: JobName.LibraryQueueCleanup, queue: QueueName.Library })
+  @OnJob({ name: JobName.LibraryDeleteCheck, queue: QueueName.Library })
   async handleQueueCleanup(): Promise<JobStatus> {
     this.logger.log('Checking for any libraries pending deletion...');
     const pendingDeletions = await this.libraryRepository.getAllDeleted();
@@ -355,7 +355,7 @@ export class LibraryService extends BaseService {
         assetsFound = true;
         this.logger.debug(`Queueing deletion of ${chunk.length} asset(s) in library ${libraryId}`);
         await this.jobRepository.queueAll(
-          chunk.map((id) => ({ name: JobName.AssetDeletion, data: { id, deleteOnDisk: false } })),
+          chunk.map((id) => ({ name: JobName.AssetDelete, data: { id, deleteOnDisk: false } })),
         );
         chunk = [];
       }
@@ -422,30 +422,30 @@ export class LibraryService extends BaseService {
     this.logger.log(`Starting to scan library ${id}`);
 
     await this.jobRepository.queue({
-      name: JobName.LibraryQueueSyncFiles,
+      name: JobName.LibrarySyncFilesQueueAll,
       data: {
         id,
       },
     });
 
-    await this.jobRepository.queue({ name: JobName.LibraryQueueSyncAssets, data: { id } });
+    await this.jobRepository.queue({ name: JobName.LibrarySyncAssetsQueueAll, data: { id } });
   }
 
   async queueScanAll() {
-    await this.jobRepository.queue({ name: JobName.LibraryQueueScanAll, data: {} });
+    await this.jobRepository.queue({ name: JobName.LibraryScanQueueAll, data: {} });
   }
 
-  @OnJob({ name: JobName.LibraryQueueScanAll, queue: QueueName.Library })
+  @OnJob({ name: JobName.LibraryScanQueueAll, queue: QueueName.Library })
   async handleQueueScanAll(): Promise<JobStatus> {
     this.logger.log(`Initiating scan of all external libraries...`);
 
-    await this.jobRepository.queue({ name: JobName.LibraryQueueCleanup, data: {} });
+    await this.jobRepository.queue({ name: JobName.LibraryDeleteCheck, data: {} });
 
     const libraries = await this.libraryRepository.getAll(true);
 
     await this.jobRepository.queueAll(
       libraries.map((library) => ({
-        name: JobName.LibraryQueueSyncFiles,
+        name: JobName.LibrarySyncFilesQueueAll,
         data: {
           id: library.id,
         },
@@ -453,7 +453,7 @@ export class LibraryService extends BaseService {
     );
     await this.jobRepository.queueAll(
       libraries.map((library) => ({
-        name: JobName.LibraryQueueSyncAssets,
+        name: JobName.LibrarySyncAssetsQueueAll,
         data: {
           id: library.id,
         },
@@ -598,8 +598,8 @@ export class LibraryService extends BaseService {
     return AssetSyncResult.DO_NOTHING;
   }
 
-  @OnJob({ name: JobName.LibraryQueueSyncFiles, queue: QueueName.Library })
-  async handleQueueSyncFiles(job: JobOf<JobName.LibraryQueueSyncFiles>): Promise<JobStatus> {
+  @OnJob({ name: JobName.LibrarySyncFilesQueueAll, queue: QueueName.Library })
+  async handleQueueSyncFiles(job: JobOf<JobName.LibrarySyncFilesQueueAll>): Promise<JobStatus> {
     const library = await this.libraryRepository.get(job.id);
     if (!library) {
       this.logger.debug(`Library ${job.id} not found, skipping refresh`);
@@ -668,8 +668,8 @@ export class LibraryService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.LibraryAssetRemoval, queue: QueueName.Library })
-  async handleAssetRemoval(job: JobOf<JobName.LibraryAssetRemoval>): Promise<JobStatus> {
+  @OnJob({ name: JobName.LibraryRemoveAsset, queue: QueueName.Library })
+  async handleAssetRemoval(job: JobOf<JobName.LibraryRemoveAsset>): Promise<JobStatus> {
     // This is only for handling file unlink events via the file watcher
     this.logger.verbose(`Deleting asset(s) ${job.paths} from library ${job.libraryId}`);
     for (const assetPath of job.paths) {
@@ -682,8 +682,8 @@ export class LibraryService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.LibraryQueueSyncAssets, queue: QueueName.Library })
-  async handleQueueSyncAssets(job: JobOf<JobName.LibraryQueueSyncAssets>): Promise<JobStatus> {
+  @OnJob({ name: JobName.LibrarySyncAssetsQueueAll, queue: QueueName.Library })
+  async handleQueueSyncAssets(job: JobOf<JobName.LibrarySyncAssetsQueueAll>): Promise<JobStatus> {
     const library = await this.libraryRepository.get(job.id);
     if (!library) {
       return JobStatus.Skipped;
diff --git a/server/src/services/media.service.spec.ts b/server/src/services/media.service.spec.ts
index f535bb65ff..d3c361bb8a 100644
--- a/server/src/services/media.service.spec.ts
+++ b/server/src/services/media.service.spec.ts
@@ -49,7 +49,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GenerateThumbnails,
+          name: JobName.AssetGenerateThumbnails,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -57,7 +57,7 @@ describe(MediaService.name, () => {
       expect(mocks.person.getAll).toHaveBeenCalledWith(undefined);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GeneratePersonThumbnail,
+          name: JobName.PersonGenerateThumbnail,
           data: { id: personStub.newThumbnail.id },
         },
       ]);
@@ -72,7 +72,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GenerateThumbnails,
+          name: JobName.AssetGenerateThumbnails,
           data: { id: assetStub.trashed.id },
         },
       ]);
@@ -87,7 +87,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GenerateThumbnails,
+          name: JobName.AssetGenerateThumbnails,
           data: { id: assetStub.archived.id },
         },
       ]);
@@ -106,7 +106,7 @@ describe(MediaService.name, () => {
       expect(mocks.person.update).toHaveBeenCalledTimes(1);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GeneratePersonThumbnail,
+          name: JobName.PersonGenerateThumbnail,
           data: {
             id: personStub.newThumbnail.id,
           },
@@ -122,7 +122,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(false);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GenerateThumbnails,
+          name: JobName.AssetGenerateThumbnails,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -138,7 +138,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(false);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GenerateThumbnails,
+          name: JobName.AssetGenerateThumbnails,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -154,7 +154,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForThumbnailJob).toHaveBeenCalledWith(false);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GenerateThumbnails,
+          name: JobName.AssetGenerateThumbnails,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -173,10 +173,10 @@ describe(MediaService.name, () => {
 
       expect(mocks.storage.removeEmptyDirs).toHaveBeenCalledTimes(2);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.MigrateAsset, data: { id: assetStub.image.id } },
+        { name: JobName.AssetFileMigration, data: { id: assetStub.image.id } },
       ]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.MigratePerson, data: { id: personStub.withName.id } },
+        { name: JobName.PersonFileMigration, data: { id: personStub.withName.id } },
       ]);
     });
   });
@@ -1243,7 +1243,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForVideoConversion).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.VideoConversation,
+          name: JobName.AssetEncodeVideo,
           data: { id: assetStub.video.id },
         },
       ]);
@@ -1257,7 +1257,7 @@ describe(MediaService.name, () => {
       expect(mocks.assetJob.streamForVideoConversion).toHaveBeenCalledWith(void 0);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.VideoConversation,
+          name: JobName.AssetEncodeVideo,
           data: { id: assetStub.video.id },
         },
       ]);
@@ -1616,7 +1616,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.transcode).not.toHaveBeenCalled();
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.DeleteFiles,
+        name: JobName.FileDelete,
         data: { files: [asset.encodedVideoPath] },
       });
     });
diff --git a/server/src/services/media.service.ts b/server/src/services/media.service.ts
index b48df3797a..a2c3c5ed42 100644
--- a/server/src/services/media.service.ts
+++ b/server/src/services/media.service.ts
@@ -57,8 +57,8 @@ export class MediaService extends BaseService {
     this.videoInterfaces = { dri, mali };
   }
 
-  @OnJob({ name: JobName.QueueGenerateThumbnails, queue: QueueName.ThumbnailGeneration })
-  async handleQueueGenerateThumbnails({ force }: JobOf<JobName.QueueGenerateThumbnails>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetGenerateThumbnailsQueueAll, queue: QueueName.ThumbnailGeneration })
+  async handleQueueGenerateThumbnails({ force }: JobOf<JobName.AssetGenerateThumbnailsQueueAll>): Promise<JobStatus> {
     let jobs: JobItem[] = [];
 
     const queueAll = async () => {
@@ -70,7 +70,7 @@ export class MediaService extends BaseService {
       const { previewFile, thumbnailFile } = getAssetFiles(asset.files);
 
       if (!previewFile || !thumbnailFile || !asset.thumbhash || force) {
-        jobs.push({ name: JobName.GenerateThumbnails, data: { id: asset.id } });
+        jobs.push({ name: JobName.AssetGenerateThumbnails, data: { id: asset.id } });
       }
 
       if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
@@ -92,7 +92,7 @@ export class MediaService extends BaseService {
         await this.personRepository.update({ id: person.id, faceAssetId: face.id });
       }
 
-      jobs.push({ name: JobName.GeneratePersonThumbnail, data: { id: person.id } });
+      jobs.push({ name: JobName.PersonGenerateThumbnail, data: { id: person.id } });
       if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await queueAll();
       }
@@ -103,7 +103,7 @@ export class MediaService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.QueueMigration, queue: QueueName.Migration })
+  @OnJob({ name: JobName.FileMigrationQueueAll, queue: QueueName.Migration })
   async handleQueueMigration(): Promise<JobStatus> {
     const { active, waiting } = await this.jobRepository.getJobCounts(QueueName.Migration);
     if (active === 1 && waiting === 0) {
@@ -114,7 +114,7 @@ export class MediaService extends BaseService {
     let jobs: JobItem[] = [];
     const assets = this.assetJobRepository.streamForMigrationJob();
     for await (const asset of assets) {
-      jobs.push({ name: JobName.MigrateAsset, data: { id: asset.id } });
+      jobs.push({ name: JobName.AssetFileMigration, data: { id: asset.id } });
       if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(jobs);
         jobs = [];
@@ -125,7 +125,7 @@ export class MediaService extends BaseService {
     jobs = [];
 
     for await (const person of this.personRepository.getAll()) {
-      jobs.push({ name: JobName.MigratePerson, data: { id: person.id } });
+      jobs.push({ name: JobName.PersonFileMigration, data: { id: person.id } });
 
       if (jobs.length === JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(jobs);
@@ -138,8 +138,8 @@ export class MediaService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.MigrateAsset, queue: QueueName.Migration })
-  async handleAssetMigration({ id }: JobOf<JobName.MigrateAsset>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetFileMigration, queue: QueueName.Migration })
+  async handleAssetMigration({ id }: JobOf<JobName.AssetFileMigration>): Promise<JobStatus> {
     const { image } = await this.getConfig({ withCache: true });
     const asset = await this.assetJobRepository.getForMigrationJob(id);
     if (!asset) {
@@ -154,8 +154,8 @@ export class MediaService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.GenerateThumbnails, queue: QueueName.ThumbnailGeneration })
-  async handleGenerateThumbnails({ id }: JobOf<JobName.GenerateThumbnails>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetGenerateThumbnails, queue: QueueName.ThumbnailGeneration })
+  async handleGenerateThumbnails({ id }: JobOf<JobName.AssetGenerateThumbnails>): Promise<JobStatus> {
     const asset = await this.assetJobRepository.getForGenerateThumbnailJob(id);
     if (!asset) {
       this.logger.warn(`Thumbnail generation failed for asset ${id}: not found`);
@@ -317,8 +317,8 @@ export class MediaService extends BaseService {
     return { previewPath, thumbnailPath, fullsizePath, thumbhash: outputs[0] as Buffer };
   }
 
-  @OnJob({ name: JobName.GeneratePersonThumbnail, queue: QueueName.ThumbnailGeneration })
-  async handleGeneratePersonThumbnail({ id }: JobOf<JobName.GeneratePersonThumbnail>): Promise<JobStatus> {
+  @OnJob({ name: JobName.PersonGenerateThumbnail, queue: QueueName.ThumbnailGeneration })
+  async handleGeneratePersonThumbnail({ id }: JobOf<JobName.PersonGenerateThumbnail>): Promise<JobStatus> {
     const { machineLearning, metadata, image } = await this.getConfig({ withCache: true });
     if (!isFacialRecognitionEnabled(machineLearning) && !isFaceImportEnabled(metadata)) {
       return JobStatus.Skipped;
@@ -443,13 +443,13 @@ export class MediaService extends BaseService {
     return { previewPath, thumbnailPath, thumbhash };
   }
 
-  @OnJob({ name: JobName.QueueVideoConversion, queue: QueueName.VideoConversion })
-  async handleQueueVideoConversion(job: JobOf<JobName.QueueVideoConversion>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetEncodeVideoQueueAll, queue: QueueName.VideoConversion })
+  async handleQueueVideoConversion(job: JobOf<JobName.AssetEncodeVideoQueueAll>): Promise<JobStatus> {
     const { force } = job;
 
-    let queue: { name: JobName.VideoConversation; data: { id: string } }[] = [];
+    let queue: { name: JobName.AssetEncodeVideo; data: { id: string } }[] = [];
     for await (const asset of this.assetJobRepository.streamForVideoConversion(force)) {
-      queue.push({ name: JobName.VideoConversation, data: { id: asset.id } });
+      queue.push({ name: JobName.AssetEncodeVideo, data: { id: asset.id } });
 
       if (queue.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(queue);
@@ -462,8 +462,8 @@ export class MediaService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.VideoConversation, queue: QueueName.VideoConversion })
-  async handleVideoConversion({ id }: JobOf<JobName.VideoConversation>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetEncodeVideo, queue: QueueName.VideoConversion })
+  async handleVideoConversion({ id }: JobOf<JobName.AssetEncodeVideo>): Promise<JobStatus> {
     const asset = await this.assetJobRepository.getForVideoConversion(id);
     if (!asset) {
       return JobStatus.Failed;
@@ -492,7 +492,7 @@ export class MediaService extends BaseService {
     if (target === TranscodeTarget.None && !this.isRemuxRequired(ffmpeg, format)) {
       if (asset.encodedVideoPath) {
         this.logger.log(`Transcoded video exists for asset ${asset.id}, but is no longer required. Deleting...`);
-        await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files: [asset.encodedVideoPath] } });
+        await this.jobRepository.queue({ name: JobName.FileDelete, data: { files: [asset.encodedVideoPath] } });
         await this.assetRepository.update({ id: asset.id, encodedVideoPath: null });
       } else {
         this.logger.verbose(`Asset ${asset.id} does not require transcoding based on current policy, skipping`);
diff --git a/server/src/services/memory.service.ts b/server/src/services/memory.service.ts
index ff88b9029c..7bf9deab4b 100644
--- a/server/src/services/memory.service.ts
+++ b/server/src/services/memory.service.ts
@@ -12,7 +12,7 @@ const DAYS = 3;
 
 @Injectable()
 export class MemoryService extends BaseService {
-  @OnJob({ name: JobName.MemoriesCreate, queue: QueueName.BackgroundTask })
+  @OnJob({ name: JobName.MemoryGenerate, queue: QueueName.BackgroundTask })
   async onMemoriesCreate() {
     const users = await this.userRepository.getList({ withDeleted: false });
     const usersIds = await Promise.all(
@@ -72,7 +72,7 @@ export class MemoryService extends BaseService {
     );
   }
 
-  @OnJob({ name: JobName.MemoriesCleanup, queue: QueueName.BackgroundTask })
+  @OnJob({ name: JobName.MemoryCleanup, queue: QueueName.BackgroundTask })
   async onMemoriesCleanup() {
     await this.memoryRepository.cleanup();
   }
diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.ts
index 23884256ea..77f0b50a0a 100644
--- a/server/src/services/metadata.service.spec.ts
+++ b/server/src/services/metadata.service.spec.ts
@@ -106,7 +106,7 @@ describe(MetadataService.name, () => {
       expect(mocks.assetJob.streamForMetadataExtraction).toHaveBeenCalledWith(false);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.MetadataExtraction,
+          name: JobName.AssetExtractMetadata,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -119,7 +119,7 @@ describe(MetadataService.name, () => {
       expect(mocks.assetJob.streamForMetadataExtraction).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.MetadataExtraction,
+          name: JobName.AssetExtractMetadata,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -599,7 +599,7 @@ describe(MetadataService.name, () => {
       });
       expect(mocks.asset.update).toHaveBeenCalledTimes(3);
       expect(mocks.job.queue).toHaveBeenCalledExactlyOnceWith({
-        name: JobName.VideoConversation,
+        name: JobName.AssetEncodeVideo,
         data: { id: assetStub.livePhotoMotionAsset.id },
       });
     });
@@ -657,7 +657,7 @@ describe(MetadataService.name, () => {
       });
       expect(mocks.asset.update).toHaveBeenCalledTimes(3);
       expect(mocks.job.queue).toHaveBeenCalledExactlyOnceWith({
-        name: JobName.VideoConversation,
+        name: JobName.AssetEncodeVideo,
         data: { id: assetStub.livePhotoMotionAsset.id },
       });
     });
@@ -715,7 +715,7 @@ describe(MetadataService.name, () => {
       });
       expect(mocks.asset.update).toHaveBeenCalledTimes(3);
       expect(mocks.job.queue).toHaveBeenCalledExactlyOnceWith({
-        name: JobName.VideoConversation,
+        name: JobName.AssetEncodeVideo,
         data: { id: assetStub.livePhotoMotionAsset.id },
       });
     });
@@ -737,7 +737,7 @@ describe(MetadataService.name, () => {
 
       await sut.handleMetadataExtraction({ id: assetStub.livePhotoWithOriginalFileName.id });
       expect(mocks.job.queue).toHaveBeenNthCalledWith(1, {
-        name: JobName.AssetDeletion,
+        name: JobName.AssetDelete,
         data: { id: assetStub.livePhotoWithOriginalFileName.livePhotoVideoId, deleteOnDisk: true },
       });
     });
@@ -1116,7 +1116,7 @@ describe(MetadataService.name, () => {
       ]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GeneratePersonThumbnail,
+          name: JobName.PersonGenerateThumbnail,
           data: { id: personStub.withName.id },
         },
       ]);
@@ -1244,7 +1244,7 @@ describe(MetadataService.name, () => {
           ]);
           expect(mocks.job.queueAll).toHaveBeenCalledWith([
             {
-              name: JobName.GeneratePersonThumbnail,
+              name: JobName.PersonGenerateThumbnail,
               data: { id: personStub.withName.id },
             },
           ]);
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
index 037bab3633..32a3d98f4e 100644
--- a/server/src/services/metadata.service.ts
+++ b/server/src/services/metadata.service.ts
@@ -193,13 +193,13 @@ export class MetadataService extends BaseService {
     await this.eventRepository.emit('AssetHide', { assetId: motionAsset.id, userId: motionAsset.ownerId });
   }
 
-  @OnJob({ name: JobName.QueueMetadataExtraction, queue: QueueName.MetadataExtraction })
-  async handleQueueMetadataExtraction(job: JobOf<JobName.QueueMetadataExtraction>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetExtractMetadataQueueAll, queue: QueueName.MetadataExtraction })
+  async handleQueueMetadataExtraction(job: JobOf<JobName.AssetExtractMetadataQueueAll>): Promise<JobStatus> {
     const { force } = job;
 
-    let queue: { name: JobName.MetadataExtraction; data: { id: string } }[] = [];
+    let queue: { name: JobName.AssetExtractMetadata; data: { id: string } }[] = [];
     for await (const asset of this.assetJobRepository.streamForMetadataExtraction(force)) {
-      queue.push({ name: JobName.MetadataExtraction, data: { id: asset.id } });
+      queue.push({ name: JobName.AssetExtractMetadata, data: { id: asset.id } });
 
       if (queue.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(queue);
@@ -211,8 +211,8 @@ export class MetadataService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.MetadataExtraction, queue: QueueName.MetadataExtraction })
-  async handleMetadataExtraction(data: JobOf<JobName.MetadataExtraction>) {
+  @OnJob({ name: JobName.AssetExtractMetadata, queue: QueueName.MetadataExtraction })
+  async handleMetadataExtraction(data: JobOf<JobName.AssetExtractMetadata>) {
     const [{ metadata, reverseGeocoding }, asset] = await Promise.all([
       this.getConfig({ withCache: true }),
       this.assetJobRepository.getForMetadataExtraction(data.id),
@@ -320,8 +320,8 @@ export class MetadataService extends BaseService {
     });
   }
 
-  @OnJob({ name: JobName.QueueSidecar, queue: QueueName.Sidecar })
-  async handleQueueSidecar({ force }: JobOf<JobName.QueueSidecar>): Promise<JobStatus> {
+  @OnJob({ name: JobName.SidecarQueueAll, queue: QueueName.Sidecar })
+  async handleQueueSidecar({ force }: JobOf<JobName.SidecarQueueAll>): Promise<JobStatus> {
     let jobs: JobItem[] = [];
     const queueAll = async () => {
       await this.jobRepository.queueAll(jobs);
@@ -597,7 +597,7 @@ export class MetadataService extends BaseService {
         // note asset.livePhotoVideoId is not motionAsset.id yet
         if (asset.livePhotoVideoId) {
           await this.jobRepository.queue({
-            name: JobName.AssetDeletion,
+            name: JobName.AssetDelete,
             data: { id: asset.livePhotoVideoId, deleteOnDisk: true },
           });
           this.logger.log(`Removed old motion photo video asset (${asset.livePhotoVideoId})`);
@@ -612,7 +612,7 @@ export class MetadataService extends BaseService {
         this.logger.log(`Wrote motion photo video to ${motionAsset.originalPath}`);
 
         await this.handleMetadataExtraction({ id: motionAsset.id });
-        await this.jobRepository.queue({ name: JobName.VideoConversation, data: { id: motionAsset.id } });
+        await this.jobRepository.queue({ name: JobName.AssetEncodeVideo, data: { id: motionAsset.id } });
       }
 
       this.logger.debug(`Finished motion photo video extraction for asset ${asset.id}: ${asset.originalPath}`);
@@ -753,7 +753,7 @@ export class MetadataService extends BaseService {
     if (missing.length > 0) {
       this.logger.debugFn(() => `Creating missing persons: ${missing.map((p) => `${p.name}/${p.id}`)}`);
       const newPersonIds = await this.personRepository.createAll(missing);
-      const jobs = newPersonIds.map((id) => ({ name: JobName.GeneratePersonThumbnail, data: { id } }) as const);
+      const jobs = newPersonIds.map((id) => ({ name: JobName.PersonGenerateThumbnail, data: { id } }) as const);
       await this.jobRepository.queueAll(jobs);
     }
 
diff --git a/server/src/services/notification.service.spec.ts b/server/src/services/notification.service.spec.ts
index 97e5ddf106..eef1c4f8b2 100644
--- a/server/src/services/notification.service.spec.ts
+++ b/server/src/services/notification.service.spec.ts
@@ -131,7 +131,7 @@ describe(NotificationService.name, () => {
     it('should queue the generate thumbnail job', async () => {
       await sut.onAssetShow({ assetId: 'asset-id', userId: 'user-id' });
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.GenerateThumbnails,
+        name: JobName.AssetGenerateThumbnails,
         data: { id: 'asset-id', notify: true },
       });
     });
@@ -146,7 +146,7 @@ describe(NotificationService.name, () => {
     it('should queue notify signup event if notify is true', async () => {
       await sut.onUserSignup({ id: '', notify: true });
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.NotifySignup,
+        name: JobName.NotifyUserSignup,
         data: { id: '', tempPassword: undefined },
       });
     });
diff --git a/server/src/services/notification.service.ts b/server/src/services/notification.service.ts
index 90a3b63ac5..1a257309b2 100644
--- a/server/src/services/notification.service.ts
+++ b/server/src/services/notification.service.ts
@@ -87,7 +87,7 @@ export class NotificationService extends BaseService {
     this.logger.error(`Unable to run job handler (${job.name}): ${error}`, error?.stack, JSON.stringify(job.data));
 
     switch (job.name) {
-      case JobName.BackupDatabase: {
+      case JobName.DatabaseBackup: {
         const errorMessage = error instanceof Error ? error.message : error;
         const item = await this.notificationRepository.create({
           userId: admin.id,
@@ -135,7 +135,7 @@ export class NotificationService extends BaseService {
 
   @OnEvent({ name: 'AssetShow' })
   async onAssetShow({ assetId }: ArgOf<'AssetShow'>) {
-    await this.jobRepository.queue({ name: JobName.GenerateThumbnails, data: { id: assetId, notify: true } });
+    await this.jobRepository.queue({ name: JobName.AssetGenerateThumbnails, data: { id: assetId, notify: true } });
   }
 
   @OnEvent({ name: 'AssetTrash' })
@@ -193,7 +193,7 @@ export class NotificationService extends BaseService {
   @OnEvent({ name: 'UserSignup' })
   async onUserSignup({ notify, id, tempPassword }: ArgOf<'UserSignup'>) {
     if (notify) {
-      await this.jobRepository.queue({ name: JobName.NotifySignup, data: { id, tempPassword } });
+      await this.jobRepository.queue({ name: JobName.NotifyUserSignup, data: { id, tempPassword } });
     }
   }
 
@@ -313,8 +313,8 @@ export class NotificationService extends BaseService {
     return { name, html: templateResponse };
   }
 
-  @OnJob({ name: JobName.NotifySignup, queue: QueueName.Notification })
-  async handleUserSignup({ id, tempPassword }: JobOf<JobName.NotifySignup>) {
+  @OnJob({ name: JobName.NotifyUserSignup, queue: QueueName.Notification })
+  async handleUserSignup({ id, tempPassword }: JobOf<JobName.NotifyUserSignup>) {
     const user = await this.userRepository.get(id, { withDeleted: false });
     if (!user) {
       return JobStatus.Skipped;
diff --git a/server/src/services/person.service.spec.ts b/server/src/services/person.service.spec.ts
index 8fbf8b20dd..13c3128317 100644
--- a/server/src/services/person.service.spec.ts
+++ b/server/src/services/person.service.spec.ts
@@ -276,7 +276,7 @@ describe(PersonService.name, () => {
         },
       ]);
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.GeneratePersonThumbnail,
+        name: JobName.PersonGenerateThumbnail,
         data: { id: 'person-1' },
       });
       expect(mocks.access.person.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['person-1']));
@@ -337,7 +337,7 @@ describe(PersonService.name, () => {
 
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GeneratePersonThumbnail,
+          name: JobName.PersonGenerateThumbnail,
           data: { id: personStub.newThumbnail.id },
         },
       ]);
@@ -373,7 +373,7 @@ describe(PersonService.name, () => {
       await sut.createNewFeaturePhoto([personStub.newThumbnail.id]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.GeneratePersonThumbnail,
+          name: JobName.PersonGenerateThumbnail,
           data: { id: personStub.newThumbnail.id },
         },
       ]);
@@ -462,7 +462,7 @@ describe(PersonService.name, () => {
       expect(mocks.person.vacuum).not.toHaveBeenCalled();
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FaceDetection,
+          name: JobName.AssetDetectFaces,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -481,7 +481,7 @@ describe(PersonService.name, () => {
       expect(mocks.assetJob.streamForDetectFacesJob).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FaceDetection,
+          name: JobName.AssetDetectFaces,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -499,7 +499,7 @@ describe(PersonService.name, () => {
       expect(mocks.assetJob.streamForDetectFacesJob).toHaveBeenCalledWith(undefined);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FaceDetection,
+          name: JobName.AssetDetectFaces,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -518,7 +518,7 @@ describe(PersonService.name, () => {
       expect(mocks.assetJob.streamForDetectFacesJob).toHaveBeenCalledWith(true);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.FaceDetection,
+          name: JobName.AssetDetectFaces,
           data: { id: assetStub.image.id },
         },
       ]);
@@ -754,7 +754,7 @@ describe(PersonService.name, () => {
 
       expect(mocks.person.refreshFaces).toHaveBeenCalledWith([face], [], [faceSearch]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.QueueFacialRecognition, data: { force: false } },
+        { name: JobName.FacialRecognitionQueueAll, data: { force: false } },
         { name: JobName.FacialRecognition, data: { id: faceId } },
       ]);
       expect(mocks.person.reassignFace).not.toHaveBeenCalled();
@@ -790,7 +790,7 @@ describe(PersonService.name, () => {
 
       expect(mocks.person.refreshFaces).toHaveBeenCalledWith([face], [faceStub.primaryFace1.id], [faceSearch]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.QueueFacialRecognition, data: { force: false } },
+        { name: JobName.FacialRecognitionQueueAll, data: { force: false } },
         { name: JobName.FacialRecognition, data: { id: faceId } },
       ]);
       expect(mocks.person.reassignFace).not.toHaveBeenCalled();
@@ -830,7 +830,7 @@ describe(PersonService.name, () => {
 
       expect(mocks.person.refreshFaces).toHaveBeenCalledWith([face], [], [faceSearch]);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.QueueFacialRecognition, data: { force: false } },
+        { name: JobName.FacialRecognitionQueueAll, data: { force: false } },
         { name: JobName.FacialRecognition, data: { id: faceId } },
       ]);
       expect(mocks.person.reassignFace).not.toHaveBeenCalled();
diff --git a/server/src/services/person.service.ts b/server/src/services/person.service.ts
index d8925578d4..d0c43c3dad 100644
--- a/server/src/services/person.service.ts
+++ b/server/src/services/person.service.ts
@@ -140,7 +140,7 @@ export class PersonService extends BaseService {
 
       if (assetFace) {
         await this.personRepository.update({ id: personId, faceAssetId: assetFace.id });
-        jobs.push({ name: JobName.GeneratePersonThumbnail, data: { id: personId } });
+        jobs.push({ name: JobName.PersonGenerateThumbnail, data: { id: personId } });
       }
     }
 
@@ -211,7 +211,7 @@ export class PersonService extends BaseService {
     });
 
     if (assetId) {
-      await this.jobRepository.queue({ name: JobName.GeneratePersonThumbnail, data: { id } });
+      await this.jobRepository.queue({ name: JobName.PersonGenerateThumbnail, data: { id } });
     }
 
     return mapPerson(person);
@@ -261,8 +261,8 @@ export class PersonService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.QueueFaceDetection, queue: QueueName.FaceDetection })
-  async handleQueueDetectFaces({ force }: JobOf<JobName.QueueFaceDetection>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetDetectFacesQueueAll, queue: QueueName.FaceDetection })
+  async handleQueueDetectFaces({ force }: JobOf<JobName.AssetDetectFacesQueueAll>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: false });
     if (!isFacialRecognitionEnabled(machineLearning)) {
       return JobStatus.Skipped;
@@ -277,7 +277,7 @@ export class PersonService extends BaseService {
     let jobs: JobItem[] = [];
     const assets = this.assetJobRepository.streamForDetectFacesJob(force);
     for await (const asset of assets) {
-      jobs.push({ name: JobName.FaceDetection, data: { id: asset.id } });
+      jobs.push({ name: JobName.AssetDetectFaces, data: { id: asset.id } });
 
       if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
         await this.jobRepository.queueAll(jobs);
@@ -294,8 +294,8 @@ export class PersonService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.FaceDetection, queue: QueueName.FaceDetection })
-  async handleDetectFaces({ id }: JobOf<JobName.FaceDetection>): Promise<JobStatus> {
+  @OnJob({ name: JobName.AssetDetectFaces, queue: QueueName.FaceDetection })
+  async handleDetectFaces({ id }: JobOf<JobName.AssetDetectFaces>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: true });
     if (!isFacialRecognitionEnabled(machineLearning)) {
       return JobStatus.Skipped;
@@ -369,7 +369,7 @@ export class PersonService extends BaseService {
     if (facesToAdd.length > 0) {
       this.logger.log(`Detected ${facesToAdd.length} new faces in asset ${id}`);
       const jobs = facesToAdd.map((face) => ({ name: JobName.FacialRecognition, data: { id: face.id } }) as const);
-      await this.jobRepository.queueAll([{ name: JobName.QueueFacialRecognition, data: { force: false } }, ...jobs]);
+      await this.jobRepository.queueAll([{ name: JobName.FacialRecognitionQueueAll, data: { force: false } }, ...jobs]);
     } else if (embeddings.length > 0) {
       this.logger.log(`Added ${embeddings.length} face embeddings for asset ${id}`);
     }
@@ -396,8 +396,8 @@ export class PersonService extends BaseService {
     return intersection / union;
   }
 
-  @OnJob({ name: JobName.QueueFacialRecognition, queue: QueueName.FacialRecognition })
-  async handleQueueRecognizeFaces({ force, nightly }: JobOf<JobName.QueueFacialRecognition>): Promise<JobStatus> {
+  @OnJob({ name: JobName.FacialRecognitionQueueAll, queue: QueueName.FacialRecognition })
+  async handleQueueRecognizeFaces({ force, nightly }: JobOf<JobName.FacialRecognitionQueueAll>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: false });
     if (!isFacialRecognitionEnabled(machineLearning)) {
       return JobStatus.Skipped;
@@ -526,7 +526,7 @@ export class PersonService extends BaseService {
     if (isCore && !personId) {
       this.logger.log(`Creating new person for face ${id}`);
       const newPerson = await this.personRepository.create({ ownerId: face.asset.ownerId, faceAssetId: face.id });
-      await this.jobRepository.queue({ name: JobName.GeneratePersonThumbnail, data: { id: newPerson.id } });
+      await this.jobRepository.queue({ name: JobName.PersonGenerateThumbnail, data: { id: newPerson.id } });
       personId = newPerson.id;
     }
 
@@ -538,8 +538,8 @@ export class PersonService extends BaseService {
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.MigratePerson, queue: QueueName.Migration })
-  async handlePersonMigration({ id }: JobOf<JobName.MigratePerson>): Promise<JobStatus> {
+  @OnJob({ name: JobName.PersonFileMigration, queue: QueueName.Migration })
+  async handlePersonMigration({ id }: JobOf<JobName.PersonFileMigration>): Promise<JobStatus> {
     const person = await this.personRepository.getById(id);
     if (!person) {
       return JobStatus.Failed;
diff --git a/server/src/services/session.service.ts b/server/src/services/session.service.ts
index b7bb5cb6fa..a9c7e92fcb 100644
--- a/server/src/services/session.service.ts
+++ b/server/src/services/session.service.ts
@@ -14,7 +14,7 @@ import { BaseService } from 'src/services/base.service';
 
 @Injectable()
 export class SessionService extends BaseService {
-  @OnJob({ name: JobName.CleanOldSessionTokens, queue: QueueName.BackgroundTask })
+  @OnJob({ name: JobName.SessionCleanup, queue: QueueName.BackgroundTask })
   async handleCleanup(): Promise<JobStatus> {
     const sessions = await this.sessionRepository.cleanup();
     for (const session of sessions) {
diff --git a/server/src/services/smart-info.service.ts b/server/src/services/smart-info.service.ts
index 5ce47593f4..3b8e2d1fc3 100644
--- a/server/src/services/smart-info.service.ts
+++ b/server/src/services/smart-info.service.ts
@@ -64,8 +64,8 @@ export class SmartInfoService extends BaseService {
     });
   }
 
-  @OnJob({ name: JobName.QueueSmartSearch, queue: QueueName.SmartSearch })
-  async handleQueueEncodeClip({ force }: JobOf<JobName.QueueSmartSearch>): Promise<JobStatus> {
+  @OnJob({ name: JobName.SmartSearchQueueAll, queue: QueueName.SmartSearch })
+  async handleQueueEncodeClip({ force }: JobOf<JobName.SmartSearchQueueAll>): Promise<JobStatus> {
     const { machineLearning } = await this.getConfig({ withCache: false });
     if (!isSmartSearchEnabled(machineLearning)) {
       return JobStatus.Skipped;
diff --git a/server/src/services/storage.service.ts b/server/src/services/storage.service.ts
index d8804665da..6e3ef4820a 100644
--- a/server/src/services/storage.service.ts
+++ b/server/src/services/storage.service.ts
@@ -62,8 +62,8 @@ export class StorageService extends BaseService {
     });
   }
 
-  @OnJob({ name: JobName.DeleteFiles, queue: QueueName.BackgroundTask })
-  async handleDeleteFiles(job: JobOf<JobName.DeleteFiles>): Promise<JobStatus> {
+  @OnJob({ name: JobName.FileDelete, queue: QueueName.BackgroundTask })
+  async handleDeleteFiles(job: JobOf<JobName.FileDelete>): Promise<JobStatus> {
     const { files } = job;
 
     // TODO: one job per file
diff --git a/server/src/services/trash.service.spec.ts b/server/src/services/trash.service.spec.ts
index f742ce8757..e43c49e543 100644
--- a/server/src/services/trash.service.spec.ts
+++ b/server/src/services/trash.service.spec.ts
@@ -77,24 +77,24 @@ describe(TrashService.name, () => {
       mocks.trash.empty.mockResolvedValue(1);
       await expect(sut.empty(authStub.user1)).resolves.toEqual({ count: 1 });
       expect(mocks.trash.empty).toHaveBeenCalledWith('user-id');
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueTrashEmpty, data: {} });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.AssetEmptyTrash, data: {} });
     });
   });
 
   describe('onAssetsDelete', () => {
     it('should queue the empty trash job', async () => {
       await expect(sut.onAssetsDelete()).resolves.toBeUndefined();
-      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QueueTrashEmpty, data: {} });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.AssetEmptyTrash, data: {} });
     });
   });
 
   describe('handleQueueEmptyTrash', () => {
     it('should queue asset delete jobs', async () => {
       mocks.trash.getDeletedIds.mockReturnValue(makeAssetIdStream(1));
-      await expect(sut.handleQueueEmptyTrash()).resolves.toEqual(JobStatus.Success);
+      await expect(sut.handleEmptyTrash()).resolves.toEqual(JobStatus.Success);
       expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
-          name: JobName.AssetDeletion,
+          name: JobName.AssetDelete,
           data: { id: 'asset-1', deleteOnDisk: true },
         },
       ]);
diff --git a/server/src/services/trash.service.ts b/server/src/services/trash.service.ts
index 858feacd39..f1d368111e 100644
--- a/server/src/services/trash.service.ts
+++ b/server/src/services/trash.service.ts
@@ -35,18 +35,18 @@ export class TrashService extends BaseService {
   async empty(auth: AuthDto): Promise<TrashResponseDto> {
     const count = await this.trashRepository.empty(auth.user.id);
     if (count > 0) {
-      await this.jobRepository.queue({ name: JobName.QueueTrashEmpty, data: {} });
+      await this.jobRepository.queue({ name: JobName.AssetEmptyTrash, data: {} });
     }
     return { count };
   }
 
   @OnEvent({ name: 'AssetDeleteAll' })
   async onAssetsDelete() {
-    await this.jobRepository.queue({ name: JobName.QueueTrashEmpty, data: {} });
+    await this.jobRepository.queue({ name: JobName.AssetEmptyTrash, data: {} });
   }
 
-  @OnJob({ name: JobName.QueueTrashEmpty, queue: QueueName.BackgroundTask })
-  async handleQueueEmptyTrash() {
+  @OnJob({ name: JobName.AssetEmptyTrash, queue: QueueName.BackgroundTask })
+  async handleEmptyTrash() {
     const assets = this.trashRepository.getDeletedIds();
 
     let count = 0;
@@ -74,7 +74,7 @@ export class TrashService extends BaseService {
     this.logger.debug(`Queueing ${ids.length} asset(s) for deletion from the trash`);
     await this.jobRepository.queueAll(
       ids.map((assetId) => ({
-        name: JobName.AssetDeletion,
+        name: JobName.AssetDelete,
         data: {
           id: assetId,
           deleteOnDisk: true,
diff --git a/server/src/services/user-admin.service.spec.ts b/server/src/services/user-admin.service.spec.ts
index 8854ade8e3..d8e13fcfbd 100644
--- a/server/src/services/user-admin.service.spec.ts
+++ b/server/src/services/user-admin.service.spec.ts
@@ -158,7 +158,7 @@ describe(UserAdminService.name, () => {
         deletedAt: expect.any(Date),
       });
       expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.UserDeletion,
+        name: JobName.UserDelete,
         data: { id: userStub.user1.id, force: true },
       });
     });
diff --git a/server/src/services/user-admin.service.ts b/server/src/services/user-admin.service.ts
index 91e21b6bb5..3ae9d429eb 100644
--- a/server/src/services/user-admin.service.ts
+++ b/server/src/services/user-admin.service.ts
@@ -104,7 +104,7 @@ export class UserAdminService extends BaseService {
     const user = await this.userRepository.update(id, { status, deletedAt: new Date() });
 
     if (force) {
-      await this.jobRepository.queue({ name: JobName.UserDeletion, data: { id: user.id, force } });
+      await this.jobRepository.queue({ name: JobName.UserDelete, data: { id: user.id, force } });
     }
 
     return mapUserAdmin(user);
diff --git a/server/src/services/user.service.spec.ts b/server/src/services/user.service.spec.ts
index 6ae6bc85b6..3a85389ace 100644
--- a/server/src/services/user.service.spec.ts
+++ b/server/src/services/user.service.spec.ts
@@ -122,7 +122,7 @@ describe(UserService.name, () => {
 
       await sut.createProfileImage(authStub.admin, file);
 
-      expect(mocks.job.queue.mock.calls).toEqual([[{ name: JobName.DeleteFiles, data: { files } }]]);
+      expect(mocks.job.queue.mock.calls).toEqual([[{ name: JobName.FileDelete, data: { files } }]]);
     });
 
     it('should not delete the profile image if it has not been set', async () => {
@@ -156,7 +156,7 @@ describe(UserService.name, () => {
 
       await sut.deleteProfileImage(authStub.admin);
 
-      expect(mocks.job.queue.mock.calls).toEqual([[{ name: JobName.DeleteFiles, data: { files } }]]);
+      expect(mocks.job.queue.mock.calls).toEqual([[{ name: JobName.FileDelete, data: { files } }]]);
     });
   });
 
@@ -211,7 +211,7 @@ describe(UserService.name, () => {
       await sut.handleUserDeleteCheck();
 
       expect(mocks.user.getDeletedAfter).toHaveBeenCalled();
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.UserDeletion, data: { id: user.id } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.UserDelete, data: { id: user.id } }]);
     });
   });
 
diff --git a/server/src/services/user.service.ts b/server/src/services/user.service.ts
index 4a65e4ab9f..6849b17ac3 100644
--- a/server/src/services/user.service.ts
+++ b/server/src/services/user.service.ts
@@ -99,7 +99,7 @@ export class UserService extends BaseService {
     });
 
     if (oldpath !== '') {
-      await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files: [oldpath] } });
+      await this.jobRepository.queue({ name: JobName.FileDelete, data: { files: [oldpath] } });
     }
 
     return {
@@ -115,7 +115,7 @@ export class UserService extends BaseService {
       throw new BadRequestException("Can't delete a missing profile Image");
     }
     await this.userRepository.update(auth.user.id, { profileImagePath: '', profileChangedAt: new Date() });
-    await this.jobRepository.queue({ name: JobName.DeleteFiles, data: { files: [user.profileImagePath] } });
+    await this.jobRepository.queue({ name: JobName.FileDelete, data: { files: [user.profileImagePath] } });
   }
 
   async getProfileImage(id: string): Promise<ImmichFileResponse> {
@@ -213,7 +213,7 @@ export class UserService extends BaseService {
     };
   }
 
-  @OnJob({ name: JobName.userSyncUsage, queue: QueueName.BackgroundTask })
+  @OnJob({ name: JobName.UserSyncUsage, queue: QueueName.BackgroundTask })
   async handleUserSyncUsage(): Promise<JobStatus> {
     await this.userRepository.syncUsage();
     return JobStatus.Success;
@@ -223,12 +223,12 @@ export class UserService extends BaseService {
   async handleUserDeleteCheck(): Promise<JobStatus> {
     const config = await this.getConfig({ withCache: false });
     const users = await this.userRepository.getDeletedAfter(DateTime.now().minus({ days: config.user.deleteDelay }));
-    await this.jobRepository.queueAll(users.map((user) => ({ name: JobName.UserDeletion, data: { id: user.id } })));
+    await this.jobRepository.queueAll(users.map((user) => ({ name: JobName.UserDelete, data: { id: user.id } })));
     return JobStatus.Success;
   }
 
-  @OnJob({ name: JobName.UserDeletion, queue: QueueName.BackgroundTask })
-  async handleUserDelete({ id, force }: JobOf<JobName.UserDeletion>): Promise<JobStatus> {
+  @OnJob({ name: JobName.UserDelete, queue: QueueName.BackgroundTask })
+  async handleUserDelete({ id, force }: JobOf<JobName.UserDelete>): Promise<JobStatus> {
     const config = await this.getConfig({ withCache: false });
     const user = await this.userRepository.get(id, { withDeleted: true });
     if (!user) {
diff --git a/server/src/services/version.service.ts b/server/src/services/version.service.ts
index 5d2f87c2bf..c4d7e9974d 100644
--- a/server/src/services/version.service.ts
+++ b/server/src/services/version.service.ts
@@ -41,7 +41,7 @@ export class VersionService extends BaseService {
 
         const needsNewMemories = semver.lt(previousVersion, '1.129.0');
         if (needsNewMemories) {
-          await this.jobRepository.queue({ name: JobName.MemoriesCreate });
+          await this.jobRepository.queue({ name: JobName.MemoryGenerate });
         }
       }
     });
diff --git a/server/src/types.ts b/server/src/types.ts
index 6873613c30..79aeedd47d 100644
--- a/server/src/types.ts
+++ b/server/src/types.ts
@@ -273,93 +273,93 @@ export interface QueueStatus {
 
 export type JobItem =
   // Backups
-  | { name: JobName.BackupDatabase; data?: IBaseJob }
+  | { name: JobName.DatabaseBackup; data?: IBaseJob }
 
   // Transcoding
-  | { name: JobName.QueueVideoConversion; data: IBaseJob }
-  | { name: JobName.VideoConversation; data: IEntityJob }
+  | { name: JobName.AssetEncodeVideoQueueAll; data: IBaseJob }
+  | { name: JobName.AssetEncodeVideo; data: IEntityJob }
 
   // Thumbnails
-  | { name: JobName.QueueGenerateThumbnails; data: IBaseJob }
-  | { name: JobName.GenerateThumbnails; data: IEntityJob }
+  | { name: JobName.AssetGenerateThumbnailsQueueAll; data: IBaseJob }
+  | { name: JobName.AssetGenerateThumbnails; data: IEntityJob }
 
   // User
   | { name: JobName.UserDeleteCheck; data?: IBaseJob }
-  | { name: JobName.UserDeletion; data: IEntityJob }
-  | { name: JobName.userSyncUsage; data?: IBaseJob }
+  | { name: JobName.UserDelete; data: IEntityJob }
+  | { name: JobName.UserSyncUsage; data?: IBaseJob }
 
   // Storage Template
   | { name: JobName.StorageTemplateMigration; data?: IBaseJob }
   | { name: JobName.StorageTemplateMigrationSingle; data: IEntityJob }
 
   // Migration
-  | { name: JobName.QueueMigration; data?: IBaseJob }
-  | { name: JobName.MigrateAsset; data: IEntityJob }
-  | { name: JobName.MigratePerson; data: IEntityJob }
+  | { name: JobName.FileMigrationQueueAll; data?: IBaseJob }
+  | { name: JobName.AssetFileMigration; data: IEntityJob }
+  | { name: JobName.PersonFileMigration; data: IEntityJob }
 
   // Metadata Extraction
-  | { name: JobName.QueueMetadataExtraction; data: IBaseJob }
-  | { name: JobName.MetadataExtraction; data: IEntityJob }
+  | { name: JobName.AssetExtractMetadataQueueAll; data: IBaseJob }
+  | { name: JobName.AssetExtractMetadata; data: IEntityJob }
 
   // Notifications
   | { name: JobName.NotificationsCleanup; data?: IBaseJob }
 
   // Sidecar Scanning
-  | { name: JobName.QueueSidecar; data: IBaseJob }
+  | { name: JobName.SidecarQueueAll; data: IBaseJob }
   | { name: JobName.SidecarDiscovery; data: IEntityJob }
   | { name: JobName.SidecarSync; data: IEntityJob }
   | { name: JobName.SidecarWrite; data: ISidecarWriteJob }
 
   // Facial Recognition
-  | { name: JobName.QueueFaceDetection; data: IBaseJob }
-  | { name: JobName.FaceDetection; data: IEntityJob }
-  | { name: JobName.QueueFacialRecognition; data: INightlyJob }
+  | { name: JobName.AssetDetectFacesQueueAll; data: IBaseJob }
+  | { name: JobName.AssetDetectFaces; data: IEntityJob }
+  | { name: JobName.FacialRecognitionQueueAll; data: INightlyJob }
   | { name: JobName.FacialRecognition; data: IDeferrableJob }
-  | { name: JobName.GeneratePersonThumbnail; data: IEntityJob }
+  | { name: JobName.PersonGenerateThumbnail; data: IEntityJob }
 
   // Smart Search
-  | { name: JobName.QueueSmartSearch; data: IBaseJob }
+  | { name: JobName.SmartSearchQueueAll; data: IBaseJob }
   | { name: JobName.SmartSearch; data: IEntityJob }
-  | { name: JobName.QueueTrashEmpty; data?: IBaseJob }
+  | { name: JobName.AssetEmptyTrash; data?: IBaseJob }
 
   // Duplicate Detection
-  | { name: JobName.QueueDuplicateDetection; data: IBaseJob }
-  | { name: JobName.DuplicateDetection; data: IEntityJob }
+  | { name: JobName.AssetDetectDuplicatesQueueAll; data: IBaseJob }
+  | { name: JobName.AssetDetectDuplicates; data: IEntityJob }
 
   // Memories
-  | { name: JobName.MemoriesCleanup; data?: IBaseJob }
-  | { name: JobName.MemoriesCreate; data?: IBaseJob }
+  | { name: JobName.MemoryCleanup; data?: IBaseJob }
+  | { name: JobName.MemoryGenerate; data?: IBaseJob }
 
   // Filesystem
-  | { name: JobName.DeleteFiles; data: IDeleteFilesJob }
+  | { name: JobName.FileDelete; data: IDeleteFilesJob }
 
   // Cleanup
-  | { name: JobName.CleanOldAuditLogs; data?: IBaseJob }
-  | { name: JobName.CleanOldSessionTokens; data?: IBaseJob }
+  | { name: JobName.AuditLogCleanup; data?: IBaseJob }
+  | { name: JobName.SessionCleanup; data?: IBaseJob }
 
   // Tags
   | { name: JobName.TagCleanup; data?: IBaseJob }
 
   // Asset Deletion
   | { name: JobName.PersonCleanup; data?: IBaseJob }
-  | { name: JobName.AssetDeletion; data: IAssetDeleteJob }
-  | { name: JobName.AssetDeletionCheck; data?: IBaseJob }
+  | { name: JobName.AssetDelete; data: IAssetDeleteJob }
+  | { name: JobName.AssetDeleteCheck; data?: IBaseJob }
 
   // Library Management
   | { name: JobName.LibrarySyncFiles; data: ILibraryFileJob }
-  | { name: JobName.LibraryQueueSyncFiles; data: IEntityJob }
-  | { name: JobName.LibraryQueueSyncAssets; data: IEntityJob }
+  | { name: JobName.LibrarySyncFilesQueueAll; data: IEntityJob }
+  | { name: JobName.LibrarySyncAssetsQueueAll; data: IEntityJob }
   | { name: JobName.LibrarySyncAssets; data: ILibraryBulkIdsJob }
-  | { name: JobName.LibraryAssetRemoval; data: ILibraryFileJob }
+  | { name: JobName.LibraryRemoveAsset; data: ILibraryFileJob }
   | { name: JobName.LibraryDelete; data: IEntityJob }
-  | { name: JobName.LibraryQueueScanAll; data?: IBaseJob }
-  | { name: JobName.LibraryQueueCleanup; data: IBaseJob }
+  | { name: JobName.LibraryScanQueueAll; data?: IBaseJob }
+  | { name: JobName.LibraryDeleteCheck; data: IBaseJob }
 
   // Notification
   | { name: JobName.SendMail; data: IEmailJob }
   | { name: JobName.NotifyAlbumInvite; data: INotifyAlbumInviteJob }
   | { name: JobName.NotifyAlbumUpdate; data: INotifyAlbumUpdateJob }
-  | { name: JobName.NotifySignup; data: INotifySignupJob }
+  | { name: JobName.NotifyUserSignup; data: INotifySignupJob }
 
   // Version check
   | { name: JobName.VersionCheck; data: IBaseJob };
diff --git a/server/test/medium/specs/services/user.service.spec.ts b/server/test/medium/specs/services/user.service.spec.ts
index f5bddca196..7643be292e 100644
--- a/server/test/medium/specs/services/user.service.spec.ts
+++ b/server/test/medium/specs/services/user.service.spec.ts
@@ -150,7 +150,7 @@ describe(UserService.name, () => {
       const { user } = await ctx.newUser({ deletedAt: DateTime.now().minus({ days: 60 }).toJSDate() });
       jobMock.queueAll.mockResolvedValue(void 0);
       await expect(sut.handleUserDeleteCheck()).resolves.toEqual(JobStatus.Success);
-      expect(jobMock.queueAll).toHaveBeenCalledExactlyOnceWith([{ name: JobName.UserDeletion, data: { id: user.id } }]);
+      expect(jobMock.queueAll).toHaveBeenCalledExactlyOnceWith([{ name: JobName.UserDelete, data: { id: user.id } }]);
     });
 
     it('should skip a recently deleted user', async () => {
diff --git a/server/test/medium/specs/services/version.service.spec.ts b/server/test/medium/specs/services/version.service.spec.ts
index 2d0c57667b..3e81429382 100644
--- a/server/test/medium/specs/services/version.service.spec.ts
+++ b/server/test/medium/specs/services/version.service.spec.ts
@@ -53,7 +53,7 @@ describe(VersionService.name, () => {
       await versionHistoryRepo.create({ version: 'v1.128.0' });
       await sut.onBootstrap();
 
-      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.MemoriesCreate });
+      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.MemoryGenerate });
     });
 
     it('should not queue memory creation when upgrading from 1.129.0', async () => {

From 34620e1e9ae214b9d9c2392f6a4bde99c18771b5 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 15 Jul 2025 20:37:44 -0500
Subject: [PATCH 218/337] feat: album edit (#19936)

---
 i18n/en.json                                  |   1 +
 .../lib/domain/models/album/album.model.dart  |  28 +
 .../domain/services/remote_album.service.dart |  72 ++
 .../lib/extensions/datetime_extensions.dart   |  56 ++
 .../repositories/remote_album.repository.dart | 164 +++++
 .../repositories/timeline.repository.dart     | 101 ++-
 .../lib/pages/album/album_control_button.dart |  50 +-
 mobile/lib/pages/album/album_viewer.dart      |  16 +-
 .../presentation/pages/drift_album.page.dart  |  27 +-
 .../pages/drift_create_album.page.dart        |   2 +
 .../pages/drift_remote_album.page.dart        | 422 ++++++++++-
 .../pages/drift_user_selection.page.dart      | 215 ++++++
 .../drift_album_option.widget.dart            | 118 +++
 .../current_album.provider.dart               |  39 +
 .../infrastructure/remote_album.provider.dart | 107 ++-
 .../drift_album_api_repository.dart           |  71 ++
 mobile/lib/routing/router.dart                |   6 +
 mobile/lib/routing/router.gr.dart             |  38 +
 .../album/remote_album_shared_user_icons.dart |  50 ++
 .../common/remote_album_sliver_app_bar.dart   | 687 ++++++++++++++++++
 .../widgets/common/user_circle_avatar.dart    |  54 +-
 .../extensions/datetime_extensions_test.dart  |  49 ++
 22 files changed, 2271 insertions(+), 102 deletions(-)
 create mode 100644 mobile/lib/presentation/pages/drift_user_selection.page.dart
 create mode 100644 mobile/lib/presentation/widgets/remote_album/drift_album_option.widget.dart
 create mode 100644 mobile/lib/providers/infrastructure/current_album.provider.dart
 create mode 100644 mobile/lib/widgets/album/remote_album_shared_user_icons.dart
 create mode 100644 mobile/lib/widgets/common/remote_album_sliver_app_bar.dart
 create mode 100644 mobile/test/modules/extensions/datetime_extensions_test.dart

diff --git a/i18n/en.json b/i18n/en.json
index f547a4e48d..d2acfcc58f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1938,6 +1938,7 @@
   "user_usage_stats_description": "View account usage statistics",
   "username": "Username",
   "users": "Users",
+  "users_added_to_album_count": "Added {count, plural, one {# user} other {# users}} to the album",
   "utilities": "Utilities",
   "validate": "Validate",
   "validate_endpoint_error": "Please enter a valid URL",
diff --git a/mobile/lib/domain/models/album/album.model.dart b/mobile/lib/domain/models/album/album.model.dart
index 7cafca9116..a199bce129 100644
--- a/mobile/lib/domain/models/album/album.model.dart
+++ b/mobile/lib/domain/models/album/album.model.dart
@@ -86,4 +86,32 @@ class RemoteAlbum {
         assetCount.hashCode ^
         ownerName.hashCode;
   }
+
+  RemoteAlbum copyWith({
+    String? id,
+    String? name,
+    String? ownerId,
+    String? description,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    String? thumbnailAssetId,
+    bool? isActivityEnabled,
+    AlbumAssetOrder? order,
+    int? assetCount,
+    String? ownerName,
+  }) {
+    return RemoteAlbum(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      ownerId: ownerId ?? this.ownerId,
+      description: description ?? this.description,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      thumbnailAssetId: thumbnailAssetId ?? this.thumbnailAssetId,
+      isActivityEnabled: isActivityEnabled ?? this.isActivityEnabled,
+      order: order ?? this.order,
+      assetCount: assetCount ?? this.assetCount,
+      ownerName: ownerName ?? this.ownerName,
+    );
+  }
 }
diff --git a/mobile/lib/domain/services/remote_album.service.dart b/mobile/lib/domain/services/remote_album.service.dart
index ae9e8b5336..ebb24d5fe5 100644
--- a/mobile/lib/domain/services/remote_album.service.dart
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -1,4 +1,8 @@
+import 'dart:async';
+
 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/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
@@ -10,6 +14,10 @@ class RemoteAlbumService {
 
   const RemoteAlbumService(this._repository, this._albumApiRepository);
 
+  Stream<RemoteAlbum?> watchAlbum(String albumId) {
+    return _repository.watchAlbum(albumId);
+  }
+
   Future<List<RemoteAlbum>> getAll() {
     return _repository.getAll();
   }
@@ -75,4 +83,68 @@ class RemoteAlbumService {
 
     return album;
   }
+
+  Future<RemoteAlbum> updateAlbum(
+    String albumId, {
+    String? name,
+    String? description,
+    String? thumbnailAssetId,
+    bool? isActivityEnabled,
+    AlbumAssetOrder? order,
+  }) async {
+    final updatedAlbum = await _albumApiRepository.updateAlbum(
+      albumId,
+      name: name,
+      description: description,
+      thumbnailAssetId: thumbnailAssetId,
+      isActivityEnabled: isActivityEnabled,
+      order: order,
+    );
+
+    // Update the local database
+    await _repository.update(updatedAlbum);
+
+    return updatedAlbum;
+  }
+
+  FutureOr<(DateTime, DateTime)> getDateRange(String albumId) {
+    return _repository.getDateRange(albumId);
+  }
+
+  Future<List<UserDto>> getSharedUsers(String albumId) {
+    return _repository.getSharedUsers(albumId);
+  }
+
+  Future<List<RemoteAsset>> getAssets(String albumId) {
+    return _repository.getAssets(albumId);
+  }
+
+  Future<int> addAssets({
+    required String albumId,
+    required List<String> assetIds,
+  }) async {
+    final album = await _albumApiRepository.addAssets(
+      albumId,
+      assetIds,
+    );
+
+    await _repository.addAssets(albumId, album.added);
+
+    return album.added.length;
+  }
+
+  Future<void> deleteAlbum(String albumId) async {
+    await _albumApiRepository.deleteAlbum(albumId);
+
+    await _repository.deleteAlbum(albumId);
+  }
+
+  Future<void> addUsers({
+    required String albumId,
+    required List<String> userIds,
+  }) async {
+    await _albumApiRepository.addUsers(albumId, userIds);
+
+    return _repository.addUsers(albumId, userIds);
+  }
 }
diff --git a/mobile/lib/extensions/datetime_extensions.dart b/mobile/lib/extensions/datetime_extensions.dart
index 14d89e2755..e23bf5210f 100644
--- a/mobile/lib/extensions/datetime_extensions.dart
+++ b/mobile/lib/extensions/datetime_extensions.dart
@@ -1,3 +1,6 @@
+import 'dart:ui';
+import 'package:easy_localization/easy_localization.dart';
+
 extension TimeAgoExtension on DateTime {
   /// Displays the time difference of this [DateTime] object to the current time as a [String]
   String timeAgo({bool numericDates = true}) {
@@ -35,3 +38,56 @@ extension TimeAgoExtension on DateTime {
     return '${(difference.inDays / 365).floor()} years ago';
   }
 }
+
+/// Extension to format date ranges according to UI requirements
+extension DateRangeFormatting on DateTime {
+  /// Formats a date range according to specific rules:
+  /// - Single date of this year: "Aug 28"
+  /// - Single date of other year: "Aug 28, 2023"
+  /// - Date range of this year: "Mar 23-May 31"
+  /// - Date range of other year: "Aug 28 - Sep 30, 2023"
+  /// - Date range over multiple years: "Apr 17, 2021 - Apr 9, 2022"
+  static String formatDateRange(
+    DateTime startDate,
+    DateTime endDate,
+    Locale? locale,
+  ) {
+    final now = DateTime.now();
+    final currentYear = now.year;
+    final localeString = locale?.toString() ?? 'en_US';
+
+    // Check if it's a single date (same day)
+    if (startDate.year == endDate.year &&
+        startDate.month == endDate.month &&
+        startDate.day == endDate.day) {
+      if (startDate.year == currentYear) {
+        // Single date of this year: "Aug 28"
+        return DateFormat.MMMd(localeString).format(startDate);
+      } else {
+        // Single date of other year: "Aug 28, 2023"
+        return DateFormat.yMMMd(localeString).format(startDate);
+      }
+    }
+
+    // It's a date range
+    if (startDate.year == endDate.year) {
+      // Same year
+      if (startDate.year == currentYear) {
+        // Date range of this year: "Mar 23-May 31"
+        final startFormatted = DateFormat.MMMd(localeString).format(startDate);
+        final endFormatted = DateFormat.MMMd(localeString).format(endDate);
+        return '$startFormatted - $endFormatted';
+      } else {
+        // Date range of other year: "Aug 28 - Sep 30, 2023"
+        final startFormatted = DateFormat.MMMd(localeString).format(startDate);
+        final endFormatted = DateFormat.MMMd(localeString).format(endDate);
+        return '$startFormatted - $endFormatted, ${startDate.year}';
+      }
+    } else {
+      // Date range over multiple years: "Apr 17, 2021 - Apr 9, 2022"
+      final startFormatted = DateFormat.yMMMd(localeString).format(startDate);
+      final endFormatted = DateFormat.yMMMd(localeString).format(endDate);
+      return '$startFormatted - $endFormatted';
+    }
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/remote_album.repository.dart b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
index b77184bce0..c3c4570559 100644
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -1,7 +1,13 @@
+import 'dart:async';
+
 import 'package:drift/drift.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/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
 enum SortRemoteAlbumsBy { id, updatedAt }
@@ -99,11 +105,169 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
     });
   }
 
+  Future<void> update(RemoteAlbum album) async {
+    await _db.remoteAlbumEntity.update().replace(
+          RemoteAlbumEntityCompanion(
+            id: Value(album.id),
+            name: Value(album.name),
+            ownerId: Value(album.ownerId),
+            createdAt: Value(album.createdAt),
+            updatedAt: Value(album.updatedAt),
+            description: Value(album.description),
+            thumbnailAssetId: Value(album.thumbnailAssetId),
+            isActivityEnabled: Value(album.isActivityEnabled),
+            order: Value(album.order),
+          ),
+        );
+  }
+
   Future<int> removeAssets(String albumId, List<String> assetIds) {
     return _db.remoteAlbumAssetEntity.deleteWhere(
       (tbl) => tbl.albumId.equals(albumId) & tbl.assetId.isIn(assetIds),
     );
   }
+
+  FutureOr<(DateTime, DateTime)> getDateRange(String albumId) {
+    final query = _db.remoteAlbumAssetEntity.selectOnly()
+      ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId))
+      ..addColumns([
+        _db.remoteAssetEntity.createdAt.min(),
+        _db.remoteAssetEntity.createdAt.max(),
+      ])
+      ..join([
+        innerJoin(
+          _db.remoteAssetEntity,
+          _db.remoteAssetEntity.id
+              .equalsExp(_db.remoteAlbumAssetEntity.assetId),
+        ),
+      ]);
+
+    return query.map((row) {
+      final minDate = row.read(_db.remoteAssetEntity.createdAt.min());
+      final maxDate = row.read(_db.remoteAssetEntity.createdAt.max());
+      return (minDate ?? DateTime.now(), maxDate ?? DateTime.now());
+    }).getSingle();
+  }
+
+  Future<List<UserDto>> getSharedUsers(String albumId) async {
+    final albumUserRows = await (_db.select(_db.remoteAlbumUserEntity)
+          ..where((row) => row.albumId.equals(albumId)))
+        .get();
+
+    if (albumUserRows.isEmpty) {
+      return [];
+    }
+
+    final userIds = albumUserRows.map((row) => row.userId);
+
+    return (_db.select(_db.userEntity)..where((row) => row.id.isIn(userIds)))
+        .map(
+          (user) => UserDto(
+            id: user.id,
+            email: user.email,
+            name: user.name,
+            profileImagePath: user.profileImagePath?.isEmpty == true
+                ? null
+                : user.profileImagePath,
+            isAdmin: user.isAdmin,
+            updatedAt: user.updatedAt,
+            quotaSizeInBytes: user.quotaSizeInBytes ?? 0,
+            quotaUsageInBytes: user.quotaUsageInBytes,
+            memoryEnabled: true,
+            inTimeline: false,
+            isPartnerSharedBy: false,
+            isPartnerSharedWith: false,
+          ),
+        )
+        .get();
+  }
+
+  Future<List<RemoteAsset>> getAssets(String albumId) {
+    final query = _db.remoteAlbumAssetEntity.select().join([
+      innerJoin(
+        _db.remoteAssetEntity,
+        _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId),
+      ),
+    ])
+      ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId));
+
+    return query
+        .map((row) => row.readTable(_db.remoteAssetEntity).toDto())
+        .get();
+  }
+
+  Future<int> addAssets(String albumId, List<String> assetIds) async {
+    final albumAssets = assetIds.map(
+      (assetId) => RemoteAlbumAssetEntityCompanion(
+        albumId: Value(albumId),
+        assetId: Value(assetId),
+      ),
+    );
+
+    await _db.batch((batch) {
+      batch.insertAll(
+        _db.remoteAlbumAssetEntity,
+        albumAssets,
+      );
+    });
+
+    return assetIds.length;
+  }
+
+  Future<void> addUsers(String albumId, List<String> userIds) {
+    final albumUsers = userIds.map(
+      (assetId) => RemoteAlbumUserEntityCompanion(
+        albumId: Value(albumId),
+        userId: Value(assetId),
+        role: const Value(AlbumUserRole.editor),
+      ),
+    );
+
+    return _db.batch((batch) {
+      batch.insertAll(
+        _db.remoteAlbumUserEntity,
+        albumUsers,
+      );
+    });
+  }
+
+  Future<void> deleteAlbum(String albumId) async {
+    return _db.transaction(() async {
+      await _db.remoteAlbumEntity.deleteWhere(
+        (table) => table.id.equals(albumId),
+      );
+    });
+  }
+
+  Stream<RemoteAlbum?> watchAlbum(String albumId) {
+    final query = _db.remoteAlbumEntity.select().join([
+      leftOuterJoin(
+        _db.remoteAlbumAssetEntity,
+        _db.remoteAlbumAssetEntity.albumId.equalsExp(_db.remoteAlbumEntity.id),
+        useColumns: false,
+      ),
+      leftOuterJoin(
+        _db.remoteAssetEntity,
+        _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId),
+        useColumns: false,
+      ),
+      leftOuterJoin(
+        _db.userEntity,
+        _db.userEntity.id.equalsExp(_db.remoteAlbumEntity.ownerId),
+        useColumns: false,
+      ),
+    ])
+      ..where(_db.remoteAlbumEntity.id.equals(albumId))
+      ..addColumns([_db.userEntity.name])
+      ..groupBy([_db.remoteAlbumEntity.id]);
+
+    return query.map((row) {
+      final album = row.readTable(_db.remoteAlbumEntity).toDto(
+            ownerName: row.read(_db.userEntity.name)!,
+          );
+      return album;
+    }).watchSingleOrNull();
+  }
 }
 
 extension on RemoteAlbumEntityData {
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index c3c7fc71ab..a125d87d8d 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:drift/drift.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:immich_mobile/constants/constants.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/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
@@ -195,41 +196,75 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       return _db.remoteAlbumAssetEntity
           .count(where: (row) => row.albumId.equals(albumId))
           .map(_generateBuckets)
-          .watchSingle();
+          .watch()
+          .map((results) => results.isNotEmpty ? results.first : <Bucket>[])
+          .handleError((error) {
+        return [];
+      });
     }
 
-    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+    return (_db.remoteAlbumEntity.select()
+          ..where((row) => row.id.equals(albumId)))
+        .watch()
+        .switchMap((albums) {
+      if (albums.isEmpty) {
+        return Stream.value(<Bucket>[]);
+      }
 
-    final query = _db.remoteAssetEntity.selectOnly()
-      ..addColumns([assetCountExp, dateExp])
-      ..join([
-        innerJoin(
-          _db.remoteAlbumAssetEntity,
-          _db.remoteAlbumAssetEntity.assetId
-              .equalsExp(_db.remoteAssetEntity.id),
-          useColumns: false,
-        ),
-      ])
-      ..where(
-        _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAlbumAssetEntity.albumId.equals(albumId),
-      )
-      ..groupBy([dateExp])
-      ..orderBy([OrderingTerm.desc(dateExp)]);
+      final album = albums.first;
+      final isAscending = album.order == AlbumAssetOrder.asc;
+      final assetCountExp = _db.remoteAssetEntity.id.count();
+      final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
 
-    return query.map((row) {
-      final timeline = row.read(dateExp)!.dateFmt(groupBy);
-      final assetCount = row.read(assetCountExp)!;
-      return TimeBucket(date: timeline, assetCount: assetCount);
-    }).watch();
+      final query = _db.remoteAssetEntity.selectOnly()
+        ..addColumns([assetCountExp, dateExp])
+        ..join([
+          innerJoin(
+            _db.remoteAlbumAssetEntity,
+            _db.remoteAlbumAssetEntity.assetId
+                .equalsExp(_db.remoteAssetEntity.id),
+            useColumns: false,
+          ),
+        ])
+        ..where(
+          _db.remoteAssetEntity.deletedAt.isNull() &
+              _db.remoteAlbumAssetEntity.albumId.equals(albumId),
+        )
+        ..groupBy([dateExp]);
+
+      if (isAscending) {
+        query.orderBy([OrderingTerm.asc(dateExp)]);
+      } else {
+        query.orderBy([OrderingTerm.desc(dateExp)]);
+      }
+
+      return query.map((row) {
+        final timeline = row.read(dateExp)!.dateFmt(groupBy);
+        final assetCount = row.read(assetCountExp)!;
+        return TimeBucket(date: timeline, assetCount: assetCount);
+      }).watch();
+    }).handleError((error) {
+      // If there's an error (e.g., album was deleted), return empty buckets
+      return <Bucket>[];
+    });
   }
 
   Future<List<BaseAsset>> _getRemoteAlbumBucketAssets(
     String albumId, {
     required int offset,
     required int count,
-  }) {
+  }) async {
+    final albumData = await (_db.remoteAlbumEntity.select()
+          ..where((row) => row.id.equals(albumId)))
+        .getSingleOrNull();
+
+    // If album doesn't exist (was deleted), return empty list
+    if (albumData == null) {
+      return <BaseAsset>[];
+    }
+
+    final isAscending = albumData.order == AlbumAssetOrder.asc;
+
     final query = _db.remoteAssetEntity.select().join(
       [
         innerJoin(
@@ -239,13 +274,19 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
           useColumns: false,
         ),
       ],
-    )
-      ..where(
+    )..where(
         _db.remoteAssetEntity.deletedAt.isNull() &
             _db.remoteAlbumAssetEntity.albumId.equals(albumId),
-      )
-      ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
-      ..limit(count, offset: offset);
+      );
+
+    if (isAscending) {
+      query.orderBy([OrderingTerm.asc(_db.remoteAssetEntity.createdAt)]);
+    } else {
+      query.orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)]);
+    }
+
+    query.limit(count, offset: offset);
+
     return query
         .map((row) => row.readTable(_db.remoteAssetEntity).toDto())
         .get();
diff --git a/mobile/lib/pages/album/album_control_button.dart b/mobile/lib/pages/album/album_control_button.dart
index b2100946e6..c453ace618 100644
--- a/mobile/lib/pages/album/album_control_button.dart
+++ b/mobile/lib/pages/album/album_control_button.dart
@@ -1,52 +1,40 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/providers/album/current_album.provider.dart';
-import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/widgets/album/album_action_filled_button.dart';
 
-// ignore: must_be_immutable
 class AlbumControlButton extends ConsumerWidget {
-  void Function() onAddPhotosPressed;
-  void Function() onAddUsersPressed;
+  final void Function()? onAddPhotosPressed;
+  final void Function()? onAddUsersPressed;
 
-  AlbumControlButton({
+  const AlbumControlButton({
     super.key,
-    required this.onAddPhotosPressed,
-    required this.onAddUsersPressed,
+    this.onAddPhotosPressed,
+    this.onAddUsersPressed,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final userId = ref.watch(authProvider).userId;
-    final isOwner = ref.watch(
-      currentAlbumProvider.select((album) {
-        return album?.ownerId == userId;
-      }),
-    );
-
-    return Padding(
-      padding: const EdgeInsets.only(left: 16.0),
-      child: SizedBox(
-        height: 36,
-        child: ListView(
-          scrollDirection: Axis.horizontal,
-          children: [
+    return SizedBox(
+      height: 36,
+      child: ListView(
+        scrollDirection: Axis.horizontal,
+        children: [
+          if (onAddPhotosPressed != null)
             AlbumActionFilledButton(
               key: const ValueKey('add_photos_button'),
               iconData: Icons.add_photo_alternate_outlined,
               onPressed: onAddPhotosPressed,
               labelText: "add_photos".tr(),
             ),
-            if (isOwner)
-              AlbumActionFilledButton(
-                key: const ValueKey('add_users_button'),
-                iconData: Icons.person_add_alt_rounded,
-                onPressed: onAddUsersPressed,
-                labelText: "album_viewer_page_share_add_users".tr(),
-              ),
-          ],
-        ),
+          if (onAddUsersPressed != null)
+            AlbumActionFilledButton(
+              key: const ValueKey('add_users_button'),
+              iconData: Icons.person_add_alt_rounded,
+              onPressed: onAddUsersPressed,
+              labelText: "album_viewer_page_share_add_users".tr(),
+            ),
+        ],
       ),
     );
   }
diff --git a/mobile/lib/pages/album/album_viewer.dart b/mobile/lib/pages/album/album_viewer.dart
index 86b23fba30..2edf6082ac 100644
--- a/mobile/lib/pages/album/album_viewer.dart
+++ b/mobile/lib/pages/album/album_viewer.dart
@@ -41,6 +41,11 @@ class AlbumViewer extends HookConsumerWidget {
     final userId = ref.watch(authProvider).userId;
     final isMultiselecting = ref.watch(multiselectProvider);
     final isProcessing = useProcessingOverlay();
+    final isOwner = ref.watch(
+      currentAlbumProvider.select((album) {
+        return album?.ownerId == userId;
+      }),
+    );
 
     Future<bool> onRemoveFromAlbumPressed(Iterable<Asset> assets) async {
       final bool isSuccess =
@@ -138,10 +143,13 @@ class AlbumViewer extends HookConsumerWidget {
                 ),
                 const AlbumSharedUserIcons(),
                 if (album.isRemote)
-                  AlbumControlButton(
-                    key: const ValueKey("albumControlButton"),
-                    onAddPhotosPressed: onAddPhotosPressed,
-                    onAddUsersPressed: onAddUsersPressed,
+                  Padding(
+                    padding: const EdgeInsets.only(left: 16.0),
+                    child: AlbumControlButton(
+                      key: const ValueKey("albumControlButton"),
+                      onAddPhotosPressed: onAddPhotosPressed,
+                      onAddUsersPressed: isOwner ? onAddUsersPressed : null,
+                    ),
                   ),
                 const SizedBox(height: 8),
               ],
diff --git a/mobile/lib/presentation/pages/drift_album.page.dart b/mobile/lib/presentation/pages/drift_album.page.dart
index e6d3d796a4..d59f734c79 100644
--- a/mobile/lib/presentation/pages/drift_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_album.page.dart
@@ -13,6 +13,7 @@ import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/pages/common/large_leading_tile.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/remote_album.utils.dart';
@@ -478,7 +479,7 @@ class _QuickSortAndViewMode extends StatelessWidget {
   }
 }
 
-class _AlbumList extends StatelessWidget {
+class _AlbumList extends ConsumerWidget {
   const _AlbumList({
     required this.isLoading,
     required this.error,
@@ -492,7 +493,7 @@ class _AlbumList extends StatelessWidget {
   final String? userId;
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     if (isLoading) {
       return const SliverToBoxAdapter(
         child: Center(
@@ -567,9 +568,12 @@ class _AlbumList extends StatelessWidget {
                   color: context.colorScheme.onSurfaceSecondary,
                 ),
               ),
-              onTap: () => context.router.push(
-                RemoteAlbumRoute(album: album),
-              ),
+              onTap: () {
+                ref.read(currentRemoteAlbumProvider.notifier).setAlbum(album);
+                context.router.push(
+                  RemoteAlbumRoute(album: album),
+                );
+              },
               leadingPadding: const EdgeInsets.only(
                 right: 16,
               ),
@@ -692,7 +696,7 @@ class _AlbumGrid extends StatelessWidget {
   }
 }
 
-class _GridAlbumCard extends StatelessWidget {
+class _GridAlbumCard extends ConsumerWidget {
   const _GridAlbumCard({
     required this.album,
     required this.userId,
@@ -702,11 +706,14 @@ class _GridAlbumCard extends StatelessWidget {
   final String? userId;
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     return GestureDetector(
-      onTap: () => context.router.push(
-        RemoteAlbumRoute(album: album),
-      ),
+      onTap: () {
+        ref.read(currentRemoteAlbumProvider.notifier).setAlbum(album);
+        context.router.push(
+          RemoteAlbumRoute(album: album),
+        );
+      },
       child: Card(
         elevation: 0,
         color: context.colorScheme.surfaceBright,
diff --git a/mobile/lib/presentation/pages/drift_create_album.page.dart b/mobile/lib/presentation/pages/drift_create_album.page.dart
index e06321413e..f6ba98f61c 100644
--- a/mobile/lib/presentation/pages/drift_create_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_create_album.page.dart
@@ -6,6 +6,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/album/album_action_filled_button.dart';
 
@@ -202,6 +203,7 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
         );
 
     if (album != null) {
+      ref.read(currentRemoteAlbumProvider.notifier).setAlbum(album);
       context.replaceRoute(
         RemoteAlbumRoute(album: album),
       );
diff --git a/mobile/lib/presentation/pages/drift_remote_album.page.dart b/mobile/lib/presentation/pages/drift_remote_album.page.dart
index bbfe6ddc74..6b68bfcd4e 100644
--- a/mobile/lib/presentation/pages/drift_remote_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_remote_album.page.dart
@@ -1,17 +1,237 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 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/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart';
+import 'package:immich_mobile/presentation/widgets/remote_album/drift_album_option.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+import 'package:immich_mobile/widgets/common/remote_album_sliver_app_bar.dart';
 
 @RoutePage()
-class RemoteAlbumPage extends StatelessWidget {
+class RemoteAlbumPage extends ConsumerStatefulWidget {
   final RemoteAlbum album;
 
-  const RemoteAlbumPage({super.key, required this.album});
+  const RemoteAlbumPage({
+    super.key,
+    required this.album,
+  });
+
+  @override
+  ConsumerState<RemoteAlbumPage> createState() => _RemoteAlbumPageState();
+}
+
+class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  Future<void> addAssets(BuildContext context) async {
+    final albumAssets =
+        await ref.read(remoteAlbumProvider.notifier).getAssets(widget.album.id);
+
+    final newAssets = await context.pushRoute<Set<BaseAsset>>(
+      DriftAssetSelectionTimelineRoute(
+        lockedSelectionAssets: albumAssets.toSet(),
+      ),
+    );
+
+    if (newAssets == null || newAssets.isEmpty) {
+      return;
+    }
+
+    final added = await ref.read(remoteAlbumProvider.notifier).addAssets(
+          widget.album.id,
+          newAssets.map((asset) {
+            final remoteAsset = asset as RemoteAsset;
+            return remoteAsset.id;
+          }).toList(),
+        );
+
+    if (added > 0) {
+      ImmichToast.show(
+        context: context,
+        msg: "assets_added_to_album_count".t(
+          context: context,
+          args: {
+            'count': added.toString(),
+          },
+        ),
+        toastType: ToastType.success,
+      );
+    }
+  }
+
+  Future<void> addUsers(BuildContext context) async {
+    final newUsers = await context.pushRoute<List<String>>(
+      DriftUserSelectionRoute(album: widget.album),
+    );
+
+    if (newUsers == null || newUsers.isEmpty) {
+      return;
+    }
+
+    try {
+      await ref
+          .read(remoteAlbumProvider.notifier)
+          .addUsers(widget.album.id, newUsers);
+
+      if (newUsers.isNotEmpty) {
+        ImmichToast.show(
+          context: context,
+          msg: "users_added_to_album_count".t(
+            context: context,
+            args: {
+              'count': newUsers.length,
+            },
+          ),
+          toastType: ToastType.success,
+        );
+      }
+
+      ref.invalidate(remoteAlbumSharedUsersProvider(widget.album.id));
+    } catch (e) {
+      ImmichToast.show(
+        context: context,
+        msg: "Failed to add users to album: ${e.toString()}",
+        toastType: ToastType.error,
+      );
+    }
+  }
+
+  Future<void> toggleAlbumOrder() async {
+    await ref.read(remoteAlbumProvider.notifier).toggleAlbumOrder(
+          widget.album.id,
+        );
+
+    ref.invalidate(timelineServiceProvider);
+  }
+
+  Future<void> deleteAlbum(BuildContext context) async {
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text('delete_album'.t(context: context)),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Text(
+                'album_delete_confirmation'.t(
+                  context: context,
+                  args: {'album': widget.album.name},
+                ),
+              ),
+              const SizedBox(height: 8),
+              Text(
+                'album_delete_confirmation_description'.t(context: context),
+              ),
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(false),
+              child: Text('cancel'.t(context: context)),
+            ),
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(true),
+              style: TextButton.styleFrom(
+                foregroundColor: Theme.of(context).colorScheme.error,
+              ),
+              child: Text('delete_album'.t(context: context)),
+            ),
+          ],
+        );
+      },
+    );
+
+    if (confirmed == true) {
+      try {
+        await ref
+            .read(remoteAlbumProvider.notifier)
+            .deleteAlbum(widget.album.id);
+
+        ImmichToast.show(
+          context: context,
+          msg: 'library_deleted'
+              .t(context: context), // Using existing success message
+          toastType: ToastType.success,
+        );
+
+        context.pushRoute(const DriftAlbumsRoute());
+      } catch (e) {
+        ImmichToast.show(
+          context: context,
+          msg: 'album_viewer_appbar_share_err_delete'.t(context: context),
+          toastType: ToastType.error,
+        );
+      }
+    }
+  }
+
+  Future<void> showEditTitleAndDescription(BuildContext context) async {
+    final result = await showDialog<_EditAlbumData?>(
+      context: context,
+      barrierDismissible: true,
+      builder: (context) => _EditAlbumDialog(album: widget.album),
+    );
+
+    if (result != null && context.mounted) {
+      HapticFeedback.mediumImpact();
+    }
+  }
+
+  void showOptionSheet(BuildContext context) {
+    final user = ref.watch(currentUserProvider);
+    final isOwner = user != null ? user.id == widget.album.ownerId : false;
+
+    showModalBottomSheet(
+      context: context,
+      backgroundColor: context.colorScheme.surface,
+      isScrollControlled: false,
+      builder: (context) {
+        return DriftRemoteAlbumOption(
+          onDeleteAlbum: isOwner
+              ? () async {
+                  await deleteAlbum(context);
+                  if (context.mounted) {
+                    context.pop();
+                  }
+                }
+              : null,
+          onAddUsers: isOwner
+              ? () async {
+                  await addUsers(context);
+                  context.pop();
+                }
+              : null,
+          onAddPhotos: () async {
+            await addAssets(context);
+            context.pop();
+          },
+          onToggleAlbumOrder: () async {
+            await toggleAlbumOrder();
+            context.pop();
+          },
+          onEditAlbum: () async {
+            context.pop();
+            await showEditTitleAndDescription(context);
+          },
+        );
+      },
+    );
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -21,19 +241,207 @@ class RemoteAlbumPage extends StatelessWidget {
           (ref) {
             final timelineService = ref
                 .watch(timelineFactoryProvider)
-                .remoteAlbum(albumId: album.id);
+                .remoteAlbum(albumId: widget.album.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
         ),
       ],
       child: Timeline(
-        appBar: MesmerizingSliverAppBar(
-          title: album.name,
+        appBar: RemoteAlbumSliverAppBar(
           icon: Icons.photo_album_outlined,
+          onShowOptions: () => showOptionSheet(context),
+          onToggleAlbumOrder: () => toggleAlbumOrder(),
+          onEditTitle: () => showEditTitleAndDescription(context),
         ),
         bottomSheet: RemoteAlbumBottomSheet(
-          album: album,
+          album: widget.album,
+        ),
+      ),
+    );
+  }
+}
+
+class _EditAlbumData {
+  final String name;
+  final String? description;
+
+  const _EditAlbumData({
+    required this.name,
+    this.description,
+  });
+}
+
+class _EditAlbumDialog extends ConsumerStatefulWidget {
+  final RemoteAlbum album;
+
+  const _EditAlbumDialog({
+    required this.album,
+  });
+
+  @override
+  ConsumerState<_EditAlbumDialog> createState() => _EditAlbumDialogState();
+}
+
+class _EditAlbumDialogState extends ConsumerState<_EditAlbumDialog> {
+  late final TextEditingController titleController;
+  late final TextEditingController descriptionController;
+  final formKey = GlobalKey<FormState>();
+
+  @override
+  void initState() {
+    super.initState();
+    titleController = TextEditingController(text: widget.album.name);
+    descriptionController = TextEditingController(
+      text: widget.album.description.isEmpty ? '' : widget.album.description,
+    );
+  }
+
+  @override
+  void dispose() {
+    titleController.dispose();
+    descriptionController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _handleSave() async {
+    if (formKey.currentState?.validate() != true) return;
+
+    try {
+      final newTitle = titleController.text.trim();
+      final newDescription = descriptionController.text.trim();
+
+      await ref.read(remoteAlbumProvider.notifier).updateAlbum(
+            widget.album.id,
+            name: newTitle,
+            description: newDescription.isEmpty ? null : newDescription,
+          );
+
+      if (mounted) {
+        Navigator.of(context).pop(
+          _EditAlbumData(
+            name: newTitle,
+            description: newDescription.isEmpty ? null : newDescription,
+          ),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        ImmichToast.show(
+          context: context,
+          msg: 'album_update_error'.t(context: context),
+          toastType: ToastType.error,
+        );
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Dialog(
+      insetPadding: const EdgeInsets.all(24),
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(
+          Radius.circular(16),
+        ),
+      ),
+      child: SingleChildScrollView(
+        child: Container(
+          padding: const EdgeInsets.all(16),
+          constraints: const BoxConstraints(maxWidth: 550),
+          child: Form(
+            key: formKey,
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                Row(
+                  children: [
+                    Icon(
+                      Icons.edit_outlined,
+                      color: context.colorScheme.primary,
+                      size: 24,
+                    ),
+                    const SizedBox(width: 12),
+                    Text(
+                      'edit_album'.t(context: context),
+                      style: context.textTheme.titleMedium,
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 24),
+
+                // Album Name
+                Text(
+                  'album_name'.t(context: context).toUpperCase(),
+                  style: context.textTheme.labelSmall?.copyWith(
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const SizedBox(height: 4),
+                TextFormField(
+                  controller: titleController,
+                  maxLines: 1,
+                  textCapitalization: TextCapitalization.sentences,
+                  decoration: InputDecoration(
+                    border: const OutlineInputBorder(
+                      borderRadius: BorderRadius.all(Radius.circular(12)),
+                    ),
+                    filled: true,
+                    fillColor: context.colorScheme.surface,
+                  ),
+                  validator: (value) {
+                    if (value == null || value.trim().isEmpty) {
+                      return 'album_name_required'.t(context: context);
+                    }
+
+                    return null;
+                  },
+                ),
+                const SizedBox(height: 18),
+
+                // Description
+                Text(
+                  'description'.t(context: context).toUpperCase(),
+                  style: context.textTheme.labelSmall?.copyWith(
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const SizedBox(height: 4),
+                TextFormField(
+                  controller: descriptionController,
+                  maxLines: 4,
+                  textCapitalization: TextCapitalization.sentences,
+                  decoration: InputDecoration(
+                    border: const OutlineInputBorder(
+                      borderRadius: BorderRadius.all(
+                        Radius.circular(12),
+                      ),
+                    ),
+                    filled: true,
+                    fillColor: context.colorScheme.surface,
+                  ),
+                ),
+                const SizedBox(height: 24),
+
+                // Action Buttons
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: [
+                    TextButton(
+                      onPressed: () => Navigator.of(context).pop(null),
+                      child: Text('cancel'.t(context: context)),
+                    ),
+                    const SizedBox(width: 12),
+                    FilledButton(
+                      onPressed: _handleSave,
+                      child: Text('save'.t(context: context)),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
         ),
       ),
     );
diff --git a/mobile/lib/presentation/pages/drift_user_selection.page.dart b/mobile/lib/presentation/pages/drift_user_selection.page.dart
new file mode 100644
index 0000000000..6f5c4c3e2b
--- /dev/null
+++ b/mobile/lib/presentation/pages/drift_user_selection.page.dart
@@ -0,0 +1,215 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/domain/models/user_metadata.model.dart';
+import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
+
+// TODO: Refactor this provider when we have user provider/service/repository pattern in place
+final driftUsersProvider =
+    FutureProvider.autoDispose<List<UserDto>>((ref) async {
+  final drift = ref.watch(driftProvider);
+  final currentUser = ref.watch(currentUserProvider);
+
+  final userEntities = await drift.managers.userEntity.get();
+
+  final users = userEntities
+      .map(
+        (entity) => UserDto(
+          id: entity.id,
+          name: entity.name,
+          email: entity.email,
+          isAdmin: entity.isAdmin,
+          profileImagePath: entity.profileImagePath,
+          updatedAt: entity.updatedAt,
+          quotaSizeInBytes: entity.quotaSizeInBytes ?? 0,
+          quotaUsageInBytes: entity.quotaUsageInBytes,
+          isPartnerSharedBy: false,
+          isPartnerSharedWith: false,
+          avatarColor: AvatarColor.primary,
+          memoryEnabled: true,
+          inTimeline: true,
+        ),
+      )
+      .toList();
+
+  users.removeWhere((u) => currentUser?.id == u.id);
+
+  return users;
+});
+
+@RoutePage()
+class DriftUserSelectionPage extends HookConsumerWidget {
+  final RemoteAlbum album;
+
+  const DriftUserSelectionPage({
+    super.key,
+    required this.album,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final AsyncValue<List<UserDto>> suggestedShareUsers =
+        ref.watch(driftUsersProvider);
+    final sharedUsersList = useState<Set<UserDto>>({});
+
+    addNewUsersHandler() {
+      context.maybePop(sharedUsersList.value.map((e) => e.id).toList());
+    }
+
+    buildTileIcon(UserDto user) {
+      if (sharedUsersList.value.contains(user)) {
+        return CircleAvatar(
+          backgroundColor: context.primaryColor,
+          child: const Icon(
+            Icons.check_rounded,
+            size: 25,
+          ),
+        );
+      } else {
+        return UserCircleAvatar(
+          user: user,
+        );
+      }
+    }
+
+    buildUserList(List<UserDto> users) {
+      List<Widget> usersChip = [];
+
+      for (var user in sharedUsersList.value) {
+        usersChip.add(
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 8.0),
+            child: Chip(
+              backgroundColor: context.primaryColor.withValues(alpha: 0.15),
+              label: Text(
+                user.name,
+                style: const TextStyle(
+                  fontSize: 12,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ),
+          ),
+        );
+      }
+      return ListView(
+        children: [
+          Wrap(
+            children: [...usersChip],
+          ),
+          Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: Text(
+              'suggestions'.tr(),
+              style: const TextStyle(
+                fontSize: 14,
+                color: Colors.grey,
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+          ),
+          ListView.builder(
+            primary: false,
+            shrinkWrap: true,
+            itemBuilder: ((context, index) {
+              return ListTile(
+                leading: buildTileIcon(users[index]),
+                dense: true,
+                title: Text(
+                  users[index].name,
+                  style: const TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                subtitle: Text(
+                  users[index].email,
+                  style: const TextStyle(
+                    fontSize: 12,
+                  ),
+                ),
+                onTap: () {
+                  if (sharedUsersList.value.contains(users[index])) {
+                    sharedUsersList.value = sharedUsersList.value
+                        .where(
+                          (selectedUser) => selectedUser.id != users[index].id,
+                        )
+                        .toSet();
+                  } else {
+                    sharedUsersList.value = {
+                      ...sharedUsersList.value,
+                      users[index],
+                    };
+                  }
+                },
+              );
+            }),
+            itemCount: users.length,
+          ),
+        ],
+      );
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text(
+          'invite_to_album',
+        ).tr(),
+        elevation: 0,
+        centerTitle: false,
+        leading: IconButton(
+          icon: const Icon(Icons.close_rounded),
+          onPressed: () {
+            context.maybePop(null);
+          },
+        ),
+        actions: [
+          TextButton(
+            onPressed:
+                sharedUsersList.value.isEmpty ? null : addNewUsersHandler,
+            child: const Text(
+              "add",
+              style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
+            ).tr(),
+          ),
+        ],
+      ),
+      body: suggestedShareUsers.widgetWhen(
+        onData: (users) {
+          // Get shared users for this album from the database
+          final sharedUsers =
+              ref.watch(remoteAlbumSharedUsersProvider(album.id));
+
+          return sharedUsers.when(
+            data: (albumSharedUsers) {
+              // Filter out users that are already shared with this album and the owner
+              final filteredUsers = users.where((user) {
+                return !albumSharedUsers
+                        .any((sharedUser) => sharedUser.id == user.id) &&
+                    user.id != album.ownerId;
+              }).toList();
+
+              return buildUserList(filteredUsers);
+            },
+            loading: () => const Center(child: CircularProgressIndicator()),
+            error: (error, stack) {
+              // If we can't load shared users, just filter out the owner
+              final filteredUsers =
+                  users.where((user) => user.id != album.ownerId).toList();
+              return buildUserList(filteredUsers);
+            },
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/remote_album/drift_album_option.widget.dart b/mobile/lib/presentation/widgets/remote_album/drift_album_option.widget.dart
new file mode 100644
index 0000000000..d32608a8b4
--- /dev/null
+++ b/mobile/lib/presentation/widgets/remote_album/drift_album_option.widget.dart
@@ -0,0 +1,118 @@
+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/translate_extensions.dart';
+
+class DriftRemoteAlbumOption extends ConsumerWidget {
+  const DriftRemoteAlbumOption({
+    super.key,
+    this.onAddPhotos,
+    this.onAddUsers,
+    this.onDeleteAlbum,
+    this.onLeaveAlbum,
+    this.onCreateSharedLink,
+    this.onToggleAlbumOrder,
+    this.onEditAlbum,
+  });
+
+  final VoidCallback? onAddPhotos;
+  final VoidCallback? onAddUsers;
+  final VoidCallback? onDeleteAlbum;
+  final VoidCallback? onLeaveAlbum;
+  final VoidCallback? onCreateSharedLink;
+  final VoidCallback? onToggleAlbumOrder;
+  final VoidCallback? onEditAlbum;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    TextStyle textStyle = Theme.of(context).textTheme.bodyLarge!.copyWith(
+          fontWeight: FontWeight.w600,
+        );
+
+    return SafeArea(
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 24.0),
+        child: ListView(
+          shrinkWrap: true,
+          children: [
+            if (onEditAlbum != null)
+              ListTile(
+                leading: const Icon(Icons.edit),
+                title: Text(
+                  'edit_album'.t(context: context),
+                  style: textStyle,
+                ),
+                onTap: onEditAlbum,
+              ),
+            if (onAddPhotos != null)
+              ListTile(
+                leading: const Icon(Icons.add_a_photo),
+                title: Text(
+                  'add_photos'.t(context: context),
+                  style: textStyle,
+                ),
+                onTap: onAddPhotos,
+              ),
+            if (onAddUsers != null)
+              ListTile(
+                leading: const Icon(Icons.group_add),
+                title: Text(
+                  'album_viewer_page_share_add_users'.t(context: context),
+                  style: textStyle,
+                ),
+                onTap: onAddUsers,
+              ),
+            if (onLeaveAlbum != null)
+              ListTile(
+                leading: const Icon(Icons.person_remove_rounded),
+                title: Text(
+                  'leave_album'.t(context: context),
+                  style: textStyle,
+                ),
+                onTap: onLeaveAlbum,
+              ),
+            if (onToggleAlbumOrder != null)
+              ListTile(
+                leading: const Icon(Icons.swap_vert_rounded),
+                title: Text(
+                  'change_display_order'.t(context: context),
+                  style: textStyle,
+                ),
+                onTap: onToggleAlbumOrder,
+              ),
+            if (onCreateSharedLink != null)
+              ListTile(
+                leading: const Icon(Icons.link),
+                title: Text(
+                  'create_shared_link'.t(context: context),
+                  style: textStyle,
+                ),
+                onTap: onCreateSharedLink,
+              ),
+            if (onDeleteAlbum != null) ...[
+              const Divider(
+                indent: 16,
+                endIndent: 16,
+              ),
+              ListTile(
+                leading: Icon(
+                  Icons.delete,
+                  color:
+                      context.isDarkTheme ? Colors.red[400] : Colors.red[800],
+                ),
+                title: Text(
+                  'delete_album'.t(context: context),
+                  style: textStyle.copyWith(
+                    color:
+                        context.isDarkTheme ? Colors.red[400] : Colors.red[800],
+                  ),
+                ),
+                onTap: onDeleteAlbum,
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/providers/infrastructure/current_album.provider.dart b/mobile/lib/providers/infrastructure/current_album.provider.dart
new file mode 100644
index 0000000000..ece188ee15
--- /dev/null
+++ b/mobile/lib/providers/infrastructure/current_album.provider.dart
@@ -0,0 +1,39 @@
+import 'dart:async';
+
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+
+final currentRemoteAlbumProvider =
+    AutoDisposeNotifierProvider<CurrentAlbumNotifier, RemoteAlbum?>(
+  CurrentAlbumNotifier.new,
+);
+
+class CurrentAlbumNotifier extends AutoDisposeNotifier<RemoteAlbum?> {
+  KeepAliveLink? _keepAliveLink;
+  StreamSubscription<RemoteAlbum?>? _assetSubscription;
+
+  @override
+  RemoteAlbum? build() => null;
+
+  void setAlbum(RemoteAlbum album) {
+    _keepAliveLink?.close();
+    _assetSubscription?.cancel();
+    state = album;
+
+    _assetSubscription = ref
+        .watch(remoteAlbumServiceProvider)
+        .watchAlbum(album.id)
+        .listen((updatedAlbum) {
+      if (updatedAlbum != null) {
+        state = updatedAlbum;
+      }
+    });
+    _keepAliveLink = ref.keepAlive();
+  }
+
+  void dispose() {
+    _keepAliveLink?.close();
+    _assetSubscription?.cancel();
+  }
+}
diff --git a/mobile/lib/providers/infrastructure/remote_album.provider.dart b/mobile/lib/providers/infrastructure/remote_album.provider.dart
index 84db53ab9f..14badd58ed 100644
--- a/mobile/lib/providers/infrastructure/remote_album.provider.dart
+++ b/mobile/lib/providers/infrastructure/remote_album.provider.dart
@@ -1,5 +1,8 @@
 import 'package:collection/collection.dart';
+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/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/remote_album.service.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/utils/remote_album.utils.dart';
@@ -58,7 +61,7 @@ class RemoteAlbumState {
 }
 
 class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
-  late final RemoteAlbumService _remoteAlbumService;
+  late RemoteAlbumService _remoteAlbumService;
 
   @override
   RemoteAlbumState build() {
@@ -145,4 +148,106 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
       rethrow;
     }
   }
+
+  Future<RemoteAlbum?> updateAlbum(
+    String albumId, {
+    String? name,
+    String? description,
+    String? thumbnailAssetId,
+    bool? isActivityEnabled,
+    AlbumAssetOrder? order,
+  }) async {
+    state = state.copyWith(isLoading: true, error: null);
+
+    try {
+      final updatedAlbum = await _remoteAlbumService.updateAlbum(
+        albumId,
+        name: name,
+        description: description,
+        thumbnailAssetId: thumbnailAssetId,
+        isActivityEnabled: isActivityEnabled,
+        order: order,
+      );
+
+      final updatedAlbums = state.albums.map((album) {
+        return album.id == albumId ? updatedAlbum : album;
+      }).toList();
+
+      final updatedFilteredAlbums = state.filteredAlbums.map((album) {
+        return album.id == albumId ? updatedAlbum : album;
+      }).toList();
+
+      state = state.copyWith(
+        albums: updatedAlbums,
+        filteredAlbums: updatedFilteredAlbums,
+        isLoading: false,
+      );
+
+      return updatedAlbum;
+    } catch (e) {
+      state = state.copyWith(isLoading: false, error: e.toString());
+      rethrow;
+    }
+  }
+
+  Future<RemoteAlbum?> toggleAlbumOrder(String albumId) async {
+    final currentAlbum =
+        state.albums.firstWhere((album) => album.id == albumId);
+
+    final newOrder = currentAlbum.order == AlbumAssetOrder.asc
+        ? AlbumAssetOrder.desc
+        : AlbumAssetOrder.asc;
+
+    return updateAlbum(albumId, order: newOrder);
+  }
+
+  Future<void> deleteAlbum(String albumId) async {
+    await _remoteAlbumService.deleteAlbum(albumId);
+
+    final updatedAlbums =
+        state.albums.where((album) => album.id != albumId).toList();
+    final updatedFilteredAlbums =
+        state.filteredAlbums.where((album) => album.id != albumId).toList();
+
+    state = state.copyWith(
+      albums: updatedAlbums,
+      filteredAlbums: updatedFilteredAlbums,
+    );
+  }
+
+  Future<List<RemoteAsset>> getAssets(String albumId) {
+    return _remoteAlbumService.getAssets(albumId);
+  }
+
+  Future<int> addAssets(String albumId, List<String> assetIds) {
+    return _remoteAlbumService.addAssets(
+      albumId: albumId,
+      assetIds: assetIds,
+    );
+  }
+
+  Future<void> addUsers(String albumId, List<String> userIds) {
+    return _remoteAlbumService.addUsers(
+      albumId: albumId,
+      userIds: userIds,
+    );
+  }
 }
+
+final remoteAlbumDateRangeProvider =
+    FutureProvider.family<(DateTime, DateTime), String>(
+  (ref, albumId) async {
+    final service = ref.watch(remoteAlbumServiceProvider);
+    return service.getDateRange(albumId);
+  },
+);
+
+final remoteAlbumSharedUsersProvider =
+    FutureProvider.autoDispose.family<List<UserDto>, String>(
+  (ref, albumId) async {
+    final link = ref.keepAlive();
+    ref.onDispose(() => link.close());
+    final service = ref.watch(remoteAlbumServiceProvider);
+    return service.getSharedUsers(albumId);
+  },
+);
diff --git a/mobile/lib/repositories/drift_album_api_repository.dart b/mobile/lib/repositories/drift_album_api_repository.dart
index 7ef24f1e7c..26b55fbef6 100644
--- a/mobile/lib/repositories/drift_album_api_repository.dart
+++ b/mobile/lib/repositories/drift_album_api_repository.dart
@@ -52,6 +52,77 @@ class DriftAlbumApiRepository extends ApiRepository {
     }
     return (removed: removed, failed: failed);
   }
+
+  Future<({List<String> added, List<String> failed})> addAssets(
+    String albumId,
+    Iterable<String> assetIds,
+  ) async {
+    final response = await checkNull(
+      _api.addAssetsToAlbum(
+        albumId,
+        BulkIdsDto(ids: assetIds.toList()),
+      ),
+    );
+    final List<String> added = [], failed = [];
+    for (final dto in response) {
+      if (dto.success) {
+        added.add(dto.id);
+      } else {
+        failed.add(dto.id);
+      }
+    }
+
+    return (added: added, failed: failed);
+  }
+
+  Future<RemoteAlbum> updateAlbum(
+    String albumId, {
+    String? name,
+    String? description,
+    String? thumbnailAssetId,
+    bool? isActivityEnabled,
+    AlbumAssetOrder? order,
+  }) async {
+    AssetOrder? apiOrder;
+    if (order != null) {
+      apiOrder =
+          order == AlbumAssetOrder.asc ? AssetOrder.asc : AssetOrder.desc;
+    }
+
+    final responseDto = await checkNull(
+      _api.updateAlbumInfo(
+        albumId,
+        UpdateAlbumDto(
+          albumName: name,
+          description: description,
+          albumThumbnailAssetId: thumbnailAssetId,
+          isActivityEnabled: isActivityEnabled,
+          order: apiOrder,
+        ),
+      ),
+    );
+
+    return responseDto.toRemoteAlbum();
+  }
+
+  Future<void> deleteAlbum(String albumId) {
+    return _api.deleteAlbum(albumId);
+  }
+
+  Future<RemoteAlbum> addUsers(
+    String albumId,
+    Iterable<String> userIds,
+  ) async {
+    final albumUsers =
+        userIds.map((userId) => AlbumUserAddDto(userId: userId)).toList();
+    final response = await checkNull(
+      _api.addUsersToAlbum(
+        albumId,
+        AddUsersDto(albumUsers: albumUsers),
+      ),
+    );
+    return response.toRemoteAlbum();
+  }
 }
 
 extension on AlbumResponseDto {
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 7cd628606b..ddd630727d 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -75,6 +75,7 @@ import 'package:immich_mobile/presentation/pages/drift_local_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_place.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_place_detail.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_recently_taken.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_user_selection.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_video.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_trash.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_archive.page.dart';
@@ -463,6 +464,11 @@ class AppRouter extends RootStackRouter {
       page: DriftPlaceDetailRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftUserSelectionRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
+
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index e4719697c2..a8a26836c7 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -964,6 +964,44 @@ class DriftTrashRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftUserSelectionPage]
+class DriftUserSelectionRoute
+    extends PageRouteInfo<DriftUserSelectionRouteArgs> {
+  DriftUserSelectionRoute({
+    Key? key,
+    required RemoteAlbum album,
+    List<PageRouteInfo>? children,
+  }) : super(
+          DriftUserSelectionRoute.name,
+          args: DriftUserSelectionRouteArgs(key: key, album: album),
+          initialChildren: children,
+        );
+
+  static const String name = 'DriftUserSelectionRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<DriftUserSelectionRouteArgs>();
+      return DriftUserSelectionPage(key: args.key, album: args.album);
+    },
+  );
+}
+
+class DriftUserSelectionRouteArgs {
+  const DriftUserSelectionRouteArgs({this.key, required this.album});
+
+  final Key? key;
+
+  final RemoteAlbum album;
+
+  @override
+  String toString() {
+    return 'DriftUserSelectionRouteArgs{key: $key, album: $album}';
+  }
+}
+
 /// generated route for
 /// [DriftVideoPage]
 class DriftVideoRoute extends PageRouteInfo<void> {
diff --git a/mobile/lib/widgets/album/remote_album_shared_user_icons.dart b/mobile/lib/widgets/album/remote_album_shared_user_icons.dart
new file mode 100644
index 0000000000..dd1a64abe0
--- /dev/null
+++ b/mobile/lib/widgets/album/remote_album_shared_user_icons.dart
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
+import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
+
+class RemoteAlbumSharedUserIcons extends ConsumerWidget {
+  const RemoteAlbumSharedUserIcons({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final currentAlbum = ref.watch(currentRemoteAlbumProvider);
+    if (currentAlbum == null) {
+      return const SizedBox();
+    }
+
+    final sharedUsersAsync =
+        ref.watch(remoteAlbumSharedUsersProvider(currentAlbum.id));
+
+    return sharedUsersAsync.maybeWhen(
+      data: (sharedUsers) {
+        if (sharedUsers.isEmpty) {
+          return const SizedBox();
+        }
+
+        return SizedBox(
+          height: 50,
+          child: ListView.builder(
+            scrollDirection: Axis.horizontal,
+            itemBuilder: ((context, index) {
+              return Padding(
+                padding: const EdgeInsets.only(right: 4.0),
+                child: UserCircleAvatar(
+                  user: sharedUsers[index],
+                  radius: 18,
+                  size: 36,
+                  hasBorder: true,
+                ),
+              );
+            }),
+            itemCount: sharedUsers.length,
+          ),
+        );
+      },
+      orElse: () => const SizedBox(),
+    );
+  }
+}
diff --git a/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart b/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart
new file mode 100644
index 0000000000..2d35a6702b
--- /dev/null
+++ b/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart
@@ -0,0 +1,687 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:ui';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/datetime_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/album/remote_album_shared_user_icons.dart';
+
+class RemoteAlbumSliverAppBar extends ConsumerStatefulWidget {
+  const RemoteAlbumSliverAppBar({
+    super.key,
+    this.icon = Icons.camera,
+    this.onShowOptions,
+    this.onToggleAlbumOrder,
+    this.onEditTitle,
+  });
+
+  final IconData icon;
+  final void Function()? onShowOptions;
+  final void Function()? onToggleAlbumOrder;
+  final void Function()? onEditTitle;
+
+  @override
+  ConsumerState<RemoteAlbumSliverAppBar> createState() =>
+      _MesmerizingSliverAppBarState();
+}
+
+class _MesmerizingSliverAppBarState
+    extends ConsumerState<RemoteAlbumSliverAppBar> {
+  double _scrollProgress = 0.0;
+
+  double _calculateScrollProgress(FlexibleSpaceBarSettings? settings) {
+    if (settings?.maxExtent == null || settings?.minExtent == null) {
+      return 1.0;
+    }
+
+    final deltaExtent = settings!.maxExtent - settings.minExtent;
+    if (deltaExtent <= 0.0) {
+      return 1.0;
+    }
+
+    return (1.0 - (settings.currentExtent - settings.minExtent) / deltaExtent)
+        .clamp(0.0, 1.0);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isMultiSelectEnabled =
+        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
+
+    final currentAlbum = ref.watch(currentRemoteAlbumProvider);
+    if (currentAlbum == null) {
+      return const SliverToBoxAdapter(child: SizedBox.shrink());
+    }
+
+    Color? actionIconColor = Color.lerp(
+      Colors.white,
+      context.primaryColor,
+      _scrollProgress,
+    );
+
+    List<Shadow> actionIconShadows = [
+      if (_scrollProgress < 0.95)
+        Shadow(
+          offset: const Offset(0, 2),
+          blurRadius: 5,
+          color: Colors.black.withValues(alpha: 0.5),
+        )
+      else
+        const Shadow(
+          offset: Offset(0, 2),
+          blurRadius: 0,
+          color: Colors.transparent,
+        ),
+    ];
+
+    return isMultiSelectEnabled
+        ? SliverToBoxAdapter(
+            child: switch (_scrollProgress) {
+              < 0.8 => const SizedBox(height: 120),
+              _ => const SizedBox(height: 452),
+            },
+          )
+        : SliverAppBar(
+            expandedHeight: 400.0,
+            floating: false,
+            pinned: true,
+            snap: false,
+            elevation: 0,
+            leading: IconButton(
+              icon: Icon(
+                Platform.isIOS
+                    ? Icons.arrow_back_ios_new_rounded
+                    : Icons.arrow_back,
+                color: actionIconColor,
+                shadows: actionIconShadows,
+              ),
+              onPressed: () {
+                ref.read(remoteAlbumProvider.notifier).refresh();
+                context.pop();
+              },
+            ),
+            actions: [
+              if (widget.onToggleAlbumOrder != null)
+                IconButton(
+                  icon: Icon(
+                    Icons.swap_vert_rounded,
+                    color: actionIconColor,
+                    shadows: actionIconShadows,
+                  ),
+                  onPressed: widget.onToggleAlbumOrder,
+                ),
+              if (widget.onShowOptions != null)
+                IconButton(
+                  icon: Icon(
+                    Icons.more_vert,
+                    color: actionIconColor,
+                    shadows: actionIconShadows,
+                  ),
+                  onPressed: widget.onShowOptions,
+                ),
+            ],
+            flexibleSpace: Builder(
+              builder: (context) {
+                final settings = context.dependOnInheritedWidgetOfExactType<
+                    FlexibleSpaceBarSettings>();
+                final scrollProgress = _calculateScrollProgress(settings);
+
+                // Update scroll progress for the leading button
+                WidgetsBinding.instance.addPostFrameCallback((_) {
+                  if (mounted && _scrollProgress != scrollProgress) {
+                    setState(() {
+                      _scrollProgress = scrollProgress;
+                    });
+                  }
+                });
+
+                return FlexibleSpaceBar(
+                  centerTitle: true,
+                  title: AnimatedSwitcher(
+                    duration: const Duration(milliseconds: 200),
+                    child: scrollProgress > 0.95
+                        ? Text(
+                            currentAlbum.name,
+                            style: TextStyle(
+                              color: context.primaryColor,
+                              fontWeight: FontWeight.w600,
+                              fontSize: 18,
+                            ),
+                          )
+                        : null,
+                  ),
+                  background: _ExpandedBackground(
+                    scrollProgress: scrollProgress,
+                    icon: widget.icon,
+                    onEditTitle: widget.onEditTitle,
+                  ),
+                );
+              },
+            ),
+          );
+  }
+}
+
+class _ExpandedBackground extends ConsumerStatefulWidget {
+  final double scrollProgress;
+  final IconData icon;
+  final void Function()? onEditTitle;
+
+  const _ExpandedBackground({
+    required this.scrollProgress,
+    required this.icon,
+    this.onEditTitle,
+  });
+
+  @override
+  ConsumerState<_ExpandedBackground> createState() =>
+      _ExpandedBackgroundState();
+}
+
+class _ExpandedBackgroundState extends ConsumerState<_ExpandedBackground>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _slideController;
+  late Animation<Offset> _slideAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _slideController = AnimationController(
+      duration: const Duration(milliseconds: 800),
+      vsync: this,
+    );
+
+    _slideAnimation = Tween<Offset>(
+      begin: const Offset(0, 1.5),
+      end: Offset.zero,
+    ).animate(
+      CurvedAnimation(
+        parent: _slideController,
+        curve: Curves.easeOutCubic,
+      ),
+    );
+
+    Future.delayed(const Duration(milliseconds: 100), () {
+      if (mounted) {
+        _slideController.forward();
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _slideController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final timelineService = ref.watch(timelineServiceProvider);
+    final currentAlbum = ref.watch(currentRemoteAlbumProvider);
+
+    if (currentAlbum == null) {
+      return const SizedBox.shrink();
+    }
+
+    final dateRange = ref.watch(
+      remoteAlbumDateRangeProvider(currentAlbum.id),
+    );
+    return Stack(
+      fit: StackFit.expand,
+      children: [
+        Transform.translate(
+          offset: Offset(0, widget.scrollProgress * 50),
+          child: Transform.scale(
+            scale: 1.4 - (widget.scrollProgress * 0.2),
+            child: _RandomAssetBackground(
+              timelineService: timelineService,
+              icon: widget.icon,
+            ),
+          ),
+        ),
+        ClipRect(
+          child: BackdropFilter(
+            filter: ImageFilter.blur(
+              sigmaX: widget.scrollProgress * 2.0,
+              sigmaY: widget.scrollProgress * 2.0,
+            ),
+            child: Container(
+              decoration: BoxDecoration(
+                gradient: LinearGradient(
+                  begin: Alignment.topCenter,
+                  end: Alignment.bottomCenter,
+                  colors: [
+                    Colors.black.withValues(alpha: 0.05),
+                    Colors.transparent,
+                    Colors.black.withValues(alpha: 0.3),
+                    Colors.black.withValues(
+                      alpha: 0.6 + (widget.scrollProgress * 0.25),
+                    ),
+                  ],
+                  stops: const [0.0, 0.15, 0.55, 1.0],
+                ),
+              ),
+            ),
+          ),
+        ),
+        Positioned(
+          bottom: 16,
+          left: 16,
+          right: 16,
+          child: SlideTransition(
+            position: _slideAnimation,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Row(
+                  children: [
+                    if (dateRange.hasValue)
+                      Text(
+                        DateRangeFormatting.formatDateRange(
+                          dateRange.value!.$1.toLocal(),
+                          dateRange.value!.$2.toLocal(),
+                          context.locale,
+                        ),
+                        style: const TextStyle(
+                          color: Colors.white,
+                          shadows: [
+                            Shadow(
+                              offset: Offset(0, 2),
+                              blurRadius: 12,
+                              color: Colors.black87,
+                            ),
+                          ],
+                        ),
+                      ),
+                    const Text(
+                      " • ",
+                      style: TextStyle(
+                        color: Colors.white,
+                        shadows: [
+                          Shadow(
+                            offset: Offset(0, 2),
+                            blurRadius: 12,
+                            color: Colors.black87,
+                          ),
+                        ],
+                      ),
+                    ),
+                    AnimatedContainer(
+                      duration: const Duration(milliseconds: 300),
+                      child: const _ItemCountText(),
+                    ),
+                  ],
+                ),
+                GestureDetector(
+                  onTap: widget.onEditTitle,
+                  child: SizedBox(
+                    width: double.infinity,
+                    child: SingleChildScrollView(
+                      scrollDirection: Axis.horizontal,
+                      child: Text(
+                        currentAlbum.name,
+                        maxLines: 1,
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 36,
+                          fontWeight: FontWeight.bold,
+                          letterSpacing: 0.5,
+                          shadows: [
+                            Shadow(
+                              offset: Offset(0, 2),
+                              blurRadius: 12,
+                              color: Colors.black54,
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+                if (currentAlbum.description.isNotEmpty)
+                  GestureDetector(
+                    onTap: widget.onEditTitle,
+                    child: ConstrainedBox(
+                      constraints: const BoxConstraints(
+                        maxHeight: 80,
+                      ),
+                      child: SingleChildScrollView(
+                        child: Text(
+                          currentAlbum.description,
+                          style: const TextStyle(
+                            color: Colors.white,
+                            fontSize: 14,
+                            shadows: [
+                              Shadow(
+                                offset: Offset(0, 2),
+                                blurRadius: 8,
+                                color: Colors.black54,
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                const Padding(
+                  padding: EdgeInsets.only(top: 8.0),
+                  child: RemoteAlbumSharedUserIcons(),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _ItemCountText extends ConsumerStatefulWidget {
+  const _ItemCountText();
+
+  @override
+  ConsumerState<_ItemCountText> createState() => _ItemCountTextState();
+}
+
+class _ItemCountTextState extends ConsumerState<_ItemCountText> {
+  StreamSubscription? _reloadSubscription;
+
+  @override
+  void initState() {
+    super.initState();
+    _reloadSubscription =
+        EventStream.shared.listen<TimelineReloadEvent>((_) => setState(() {}));
+  }
+
+  @override
+  void dispose() {
+    _reloadSubscription?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final assetCount = ref.watch(
+      timelineServiceProvider.select((s) => s.totalAssets),
+    );
+
+    return Text(
+      'items_count'.t(
+        context: context,
+        args: {"count": assetCount},
+      ),
+      style: context.textTheme.labelLarge?.copyWith(
+        color: Colors.white,
+        shadows: [
+          const Shadow(
+            offset: Offset(0, 2),
+            blurRadius: 12,
+            color: Colors.black87,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _RandomAssetBackground extends StatefulWidget {
+  final TimelineService timelineService;
+  final IconData icon;
+
+  const _RandomAssetBackground({
+    required this.timelineService,
+    required this.icon,
+  });
+
+  @override
+  State<_RandomAssetBackground> createState() => _RandomAssetBackgroundState();
+}
+
+class _RandomAssetBackgroundState extends State<_RandomAssetBackground>
+    with TickerProviderStateMixin {
+  late AnimationController _zoomController;
+  late AnimationController _crossFadeController;
+  late Animation<double> _zoomAnimation;
+  late Animation<Offset> _panAnimation;
+  late Animation<double> _crossFadeAnimation;
+  BaseAsset? _currentAsset;
+  BaseAsset? _nextAsset;
+  bool _isZoomingIn = true;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _zoomController = AnimationController(
+      duration: const Duration(seconds: 12),
+      vsync: this,
+    );
+
+    _crossFadeController = AnimationController(
+      duration: const Duration(milliseconds: 1200),
+      vsync: this,
+    );
+
+    _zoomAnimation = Tween<double>(
+      begin: 1.0,
+      end: 1.2,
+    ).animate(
+      CurvedAnimation(
+        parent: _zoomController,
+        curve: Curves.easeInOut,
+      ),
+    );
+
+    _panAnimation = Tween<Offset>(
+      begin: Offset.zero,
+      end: const Offset(0.5, -0.5),
+    ).animate(
+      CurvedAnimation(
+        parent: _zoomController,
+        curve: Curves.easeInOut,
+      ),
+    );
+
+    _crossFadeAnimation = Tween<double>(
+      begin: 0.0,
+      end: 1.0,
+    ).animate(
+      CurvedAnimation(
+        parent: _crossFadeController,
+        curve: Curves.easeInOutCubic,
+      ),
+    );
+
+    Future.delayed(
+      Durations.medium1,
+      () => _loadFirstAsset(),
+    );
+  }
+
+  @override
+  void dispose() {
+    _zoomController.dispose();
+    _crossFadeController.dispose();
+    super.dispose();
+  }
+
+  void _startAnimationCycle() {
+    if (_isZoomingIn) {
+      _zoomController.forward().then((_) {
+        _loadNextAsset();
+      });
+    } else {
+      _zoomController.reverse().then((_) {
+        _loadNextAsset();
+      });
+    }
+  }
+
+  Future<void> _loadFirstAsset() async {
+    if (!mounted) {
+      return;
+    }
+
+    if (widget.timelineService.totalAssets == 0) {
+      setState(() {
+        _currentAsset = null;
+      });
+
+      return;
+    }
+
+    setState(() {
+      _currentAsset = widget.timelineService.getRandomAsset();
+    });
+
+    await _crossFadeController.forward();
+
+    if (_zoomController.status == AnimationStatus.dismissed) {
+      if (_isZoomingIn) {
+        _zoomController.reset();
+      } else {
+        _zoomController.value = 1.0;
+      }
+      _startAnimationCycle();
+    }
+  }
+
+  Future<void> _loadNextAsset() async {
+    if (!mounted) {
+      return;
+    }
+
+    try {
+      if (widget.timelineService.totalAssets > 1) {
+        // Load next asset while keeping current one visible
+        final nextAsset = widget.timelineService.getRandomAsset();
+
+        setState(() {
+          _nextAsset = nextAsset;
+        });
+
+        await _crossFadeController.reverse();
+        setState(() {
+          _currentAsset = _nextAsset;
+          _nextAsset = null;
+        });
+
+        _crossFadeController.value = 1.0;
+
+        _isZoomingIn = !_isZoomingIn;
+
+        _startAnimationCycle();
+      }
+    } catch (e) {
+      _zoomController.reset();
+      _startAnimationCycle();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.timelineService.totalAssets == 0) {
+      return const SizedBox.shrink();
+    }
+
+    return AnimatedBuilder(
+      animation: Listenable.merge(
+        [_zoomAnimation, _panAnimation, _crossFadeAnimation],
+      ),
+      builder: (context, child) {
+        return Transform.scale(
+          scale: _zoomAnimation.value,
+          filterQuality: Platform.isAndroid ? FilterQuality.low : null,
+          child: Transform.translate(
+            offset: _panAnimation.value,
+            filterQuality: Platform.isAndroid ? FilterQuality.low : null,
+            child: Stack(
+              fit: StackFit.expand,
+              children: [
+                // Current image
+                if (_currentAsset != null)
+                  Opacity(
+                    opacity: _crossFadeAnimation.value,
+                    child: SizedBox(
+                      width: double.infinity,
+                      height: double.infinity,
+                      child: Image(
+                        alignment: Alignment.topRight,
+                        image: getFullImageProvider(_currentAsset!),
+                        fit: BoxFit.cover,
+                        frameBuilder:
+                            (context, child, frame, wasSynchronouslyLoaded) {
+                          if (wasSynchronouslyLoaded || frame != null) {
+                            return child;
+                          }
+                          return Container();
+                        },
+                        errorBuilder: (context, error, stackTrace) {
+                          return SizedBox(
+                            width: double.infinity,
+                            height: double.infinity,
+                            child: Icon(
+                              Icons.error_outline_rounded,
+                              size: 24,
+                              color: Colors.red[300],
+                            ),
+                          );
+                        },
+                      ),
+                    ),
+                  ),
+
+                if (_nextAsset != null)
+                  Opacity(
+                    opacity: 1.0 - _crossFadeAnimation.value,
+                    child: SizedBox(
+                      width: double.infinity,
+                      height: double.infinity,
+                      child: Image(
+                        alignment: Alignment.topRight,
+                        image: getFullImageProvider(_nextAsset!),
+                        fit: BoxFit.cover,
+                        frameBuilder:
+                            (context, child, frame, wasSynchronouslyLoaded) {
+                          if (wasSynchronouslyLoaded || frame != null) {
+                            return child;
+                          }
+                          return const SizedBox.shrink();
+                        },
+                        errorBuilder: (context, error, stackTrace) {
+                          return SizedBox(
+                            width: double.infinity,
+                            height: double.infinity,
+                            child: Icon(
+                              Icons.error_outline_rounded,
+                              size: 24,
+                              color: Colors.red[300],
+                            ),
+                          );
+                        },
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/mobile/lib/widgets/common/user_circle_avatar.dart b/mobile/lib/widgets/common/user_circle_avatar.dart
index e8501f1184..479c30d6da 100644
--- a/mobile/lib/widgets/common/user_circle_avatar.dart
+++ b/mobile/lib/widgets/common/user_circle_avatar.dart
@@ -14,11 +14,13 @@ class UserCircleAvatar extends ConsumerWidget {
   final UserDto user;
   double radius;
   double size;
+  bool hasBorder;
 
   UserCircleAvatar({
     super.key,
     this.radius = 22,
     this.size = 44,
+    this.hasBorder = false,
     required this.user,
   });
 
@@ -38,25 +40,39 @@ class UserCircleAvatar extends ConsumerWidget {
       ),
       child: Text(user.name[0].toUpperCase()),
     );
-    return CircleAvatar(
-      backgroundColor: userAvatarColor,
-      radius: radius,
-      child: user.profileImagePath == null
-          ? textIcon
-          : ClipRRect(
-              borderRadius: const BorderRadius.all(Radius.circular(50)),
-              child: CachedNetworkImage(
-                fit: BoxFit.cover,
-                cacheKey: user.profileImagePath,
-                width: size,
-                height: size,
-                placeholder: (_, __) => Image.memory(kTransparentImage),
-                imageUrl: profileImageUrl,
-                httpHeaders: ApiService.getRequestHeaders(),
-                fadeInDuration: const Duration(milliseconds: 300),
-                errorWidget: (context, error, stackTrace) => textIcon,
-              ),
-            ),
+    return Tooltip(
+      message: user.name,
+      child: Container(
+        decoration: BoxDecoration(
+          shape: BoxShape.circle,
+          border: hasBorder
+              ? Border.all(
+                  color: Colors.grey[500]!,
+                  width: 1,
+                )
+              : null,
+        ),
+        child: CircleAvatar(
+          backgroundColor: userAvatarColor,
+          radius: radius,
+          child: user.profileImagePath == null
+              ? textIcon
+              : ClipRRect(
+                  borderRadius: const BorderRadius.all(Radius.circular(50)),
+                  child: CachedNetworkImage(
+                    fit: BoxFit.cover,
+                    cacheKey: user.profileImagePath,
+                    width: size,
+                    height: size,
+                    placeholder: (_, __) => Image.memory(kTransparentImage),
+                    imageUrl: profileImageUrl,
+                    httpHeaders: ApiService.getRequestHeaders(),
+                    fadeInDuration: const Duration(milliseconds: 300),
+                    errorWidget: (context, error, stackTrace) => textIcon,
+                  ),
+                ),
+        ),
+      ),
     );
   }
 }
diff --git a/mobile/test/modules/extensions/datetime_extensions_test.dart b/mobile/test/modules/extensions/datetime_extensions_test.dart
new file mode 100644
index 0000000000..412d946b1f
--- /dev/null
+++ b/mobile/test/modules/extensions/datetime_extensions_test.dart
@@ -0,0 +1,49 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/extensions/datetime_extensions.dart';
+import 'package:intl/date_symbol_data_local.dart';
+
+void main() {
+  setUpAll(() async {
+    await initializeDateFormatting();
+  });
+
+  group('DateRangeFormatting.formatDateRange', () {
+    final currentYear = DateTime.now().year;
+
+    test('returns single date format for this year', () {
+      final date = DateTime(currentYear, 8, 28); // Aug 28 this year
+      final result = DateRangeFormatting.formatDateRange(date, date, null);
+      expect(result, 'Aug 28');
+    });
+
+    test('returns single date format for other year', () {
+      final date = DateTime(2023, 8, 28); // Aug 28, 2023
+      final result = DateRangeFormatting.formatDateRange(date, date, null);
+      expect(result, 'Aug 28, 2023');
+    });
+
+    test('returns date range format for this year', () {
+      final startDate = DateTime(currentYear, 3, 23); // Mar 23
+      final endDate = DateTime(currentYear, 5, 31); // May 31
+      final result =
+          DateRangeFormatting.formatDateRange(startDate, endDate, null);
+      expect(result, 'Mar 23 - May 31');
+    });
+
+    test('returns date range format for other year (same year)', () {
+      final startDate = DateTime(2023, 8, 28); // Aug 28
+      final endDate = DateTime(2023, 9, 30); // Sep 30
+      final result =
+          DateRangeFormatting.formatDateRange(startDate, endDate, null);
+      expect(result, 'Aug 28 - Sep 30, 2023');
+    });
+
+    test('returns date range format over multiple years', () {
+      final startDate = DateTime(2021, 4, 17); // Apr 17, 2021
+      final endDate = DateTime(2022, 4, 9); // Apr 9, 2022
+      final result =
+          DateRangeFormatting.formatDateRange(startDate, endDate, null);
+      expect(result, 'Apr 17, 2021 - Apr 9, 2022');
+    });
+  });
+}

From 743b6644e96366a4e32e4c0182bf6f478bf3a32c Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Tue, 15 Jul 2025 21:17:24 -0500
Subject: [PATCH 219/337] feat(widgets): iOS widget improvements (#19893)

* improvements to error handling, ability to select "Favorites" as a virtual album, fix widgets not showing image when tinting homescreen

* dont include isFavorite all the time

* remove check for if the album exists

this will never run because we default to Album.NONE and its impossible to distinguish between no album selected and album DNE (we dont know what the store ID is, only what iOS gives)
---
 mobile/ios/WidgetExtension/ImageEntry.swift   | 39 +++------
 .../ios/WidgetExtension/ImageWidgetView.swift | 15 ++++
 mobile/ios/WidgetExtension/ImmichAPI.swift    | 61 ++++++++++----
 .../widgets/MemoryWidget.swift                | 51 +++++------
 .../widgets/RandomWidget.swift                | 84 ++++++++-----------
 5 files changed, 130 insertions(+), 120 deletions(-)

diff --git a/mobile/ios/WidgetExtension/ImageEntry.swift b/mobile/ios/WidgetExtension/ImageEntry.swift
index 5239702d4b..ee371703a8 100644
--- a/mobile/ios/WidgetExtension/ImageEntry.swift
+++ b/mobile/ios/WidgetExtension/ImageEntry.swift
@@ -14,19 +14,6 @@ struct ImageEntry: TimelineEntry {
     var deepLink: URL? = nil
   }
 
-  // Resizes the stored image to a maximum width of 450 pixels
-  mutating func resize() {
-    if image == nil || image!.size.height < 450 || image!.size.width < 450 {
-      return
-    }
-
-    image = image?.resized(toWidth: 450)
-
-    if image == nil {
-      metadata.error = .unableToResize
-    }
-  }
-
   static func build(
     api: ImmichAPI,
     asset: Asset,
@@ -83,7 +70,10 @@ struct ImageEntry: TimelineEntry {
 
       guard let imageData = try? Data(contentsOf: imageURL),
         let metadataJSON = try? Data(contentsOf: metadataURL),
-        let decodedMetadata = try? JSONDecoder().decode(Metadata.self, from: metadataJSON)
+        let decodedMetadata = try? JSONDecoder().decode(
+          Metadata.self,
+          from: metadataJSON
+        )
       else {
         return nil
       }
@@ -98,7 +88,7 @@ struct ImageEntry: TimelineEntry {
     return nil
   }
 
-  static func handleCacheFallback(
+  static func handleError(
     for key: String,
     error: WidgetError = .fetchFailed
   ) -> Timeline<ImageEntry> {
@@ -108,35 +98,32 @@ struct ImageEntry: TimelineEntry {
       metadata: EntryMetadata(error: error)
     )
 
-    // skip cache if album not found or no login
-    // we want to show these errors to the user since without intervention,
+    // use cache if generic failed error
+    // we want to show the other errors to the user since without intervention,
     // it will never succeed
-    if error != .noLogin && error != .albumNotFound {
-      if let cachedEntry = ImageEntry.loadCached(for: key) {
-        timelineEntry = cachedEntry
-      }
+    if error == .fetchFailed, let cachedEntry = ImageEntry.loadCached(for: key)
+    {
+      timelineEntry = cachedEntry
     }
 
     return Timeline(entries: [timelineEntry], policy: .atEnd)
   }
+
 }
 
 func generateRandomEntries(
   api: ImmichAPI,
   now: Date,
   count: Int,
-  albumId: String? = nil,
+  filter: SearchFilter = Album.NONE.filter,
   subtitle: String? = nil
 )
   async throws -> [ImageEntry]
 {
 
   var entries: [ImageEntry] = []
-  let albumIds = albumId != nil ? [albumId!] : []
 
-  let randomAssets = try await api.fetchSearchResults(
-    with: SearchFilters(size: count, albumIds: albumIds)
-  )
+  let randomAssets = try await api.fetchSearchResults(with: filter)
 
   await withTaskGroup(of: ImageEntry?.self) { group in
     for (dateOffset, asset) in randomAssets.enumerated() {
diff --git a/mobile/ios/WidgetExtension/ImageWidgetView.swift b/mobile/ios/WidgetExtension/ImageWidgetView.swift
index 24072b0607..8e810b051e 100644
--- a/mobile/ios/WidgetExtension/ImageWidgetView.swift
+++ b/mobile/ios/WidgetExtension/ImageWidgetView.swift
@@ -1,6 +1,18 @@
 import SwiftUI
 import WidgetKit
 
+extension Image {
+  @ViewBuilder
+  func tintedWidgetImageModifier() -> some View {
+    if #available(iOS 18.0, *) {
+      self
+        .widgetAccentedRenderingMode(.accentedDesaturated)
+    } else {
+      self
+    }
+  }
+}
+
 struct ImmichWidgetView: View {
   var entry: ImageEntry
 
@@ -8,6 +20,7 @@ struct ImmichWidgetView: View {
     if entry.image == nil {
       VStack {
         Image("LaunchImage")
+          .tintedWidgetImageModifier()
         Text(entry.metadata.error?.errorDescription ?? "")
           .minimumScaleFactor(0.25)
           .multilineTextAlignment(.center)
@@ -19,7 +32,9 @@ struct ImmichWidgetView: View {
         Color.clear.overlay(
           Image(uiImage: entry.image!)
             .resizable()
+            .tintedWidgetImageModifier()
             .scaledToFill()
+
         )
         VStack {
           Spacer()
diff --git a/mobile/ios/WidgetExtension/ImmichAPI.swift b/mobile/ios/WidgetExtension/ImmichAPI.swift
index 7cefd9d5ee..36758b824c 100644
--- a/mobile/ios/WidgetExtension/ImmichAPI.swift
+++ b/mobile/ios/WidgetExtension/ImmichAPI.swift
@@ -2,14 +2,20 @@ import Foundation
 import SwiftUI
 import WidgetKit
 
+let IMMICH_SHARE_GROUP = "group.app.immich.share"
+
 enum WidgetError: Error, Codable {
   case noLogin
   case fetchFailed
-  case unknown
   case albumNotFound
+  case noAssetsAvailable
+}
+
+enum FetchError: Error {
   case unableToResize
   case invalidImage
   case invalidURL
+  case fetchFailed
 }
 
 extension WidgetError: LocalizedError {
@@ -24,14 +30,8 @@ extension WidgetError: LocalizedError {
     case .albumNotFound:
       return "Album not found"
 
-    case .invalidURL:
-      return "An invalid URL was used"
-
-    case .invalidImage:
-      return "An invalid image was received"
-
-    default:
-      return "An unknown error occured"
+    case .noAssetsAvailable:
+      return "No assets available"
     }
   }
 }
@@ -52,10 +52,11 @@ struct Asset: Codable {
   }
 }
 
-struct SearchFilters: Codable {
-  var type: AssetType = .image
-  let size: Int
+struct SearchFilter: Codable {
+  var type = AssetType.image
+  var size = 1
   var albumIds: [String] = []
+  var isFavorite: Bool? = nil
 }
 
 struct MemoryResult: Codable {
@@ -70,12 +71,35 @@ struct MemoryResult: Codable {
   let data: MemoryData
 }
 
-struct Album: Codable {
+struct Album: Codable, Equatable {
   let id: String
   let albumName: String
-}
 
-let IMMICH_SHARE_GROUP = "group.app.immich.share"
+  static let NONE = Album(id: "NONE", albumName: "None")
+  static let FAVORITES = Album(id: "FAVORITES", albumName: "Favorites")
+
+  var filter: SearchFilter {
+    switch self {
+    case Album.NONE:
+      return SearchFilter()
+    case Album.FAVORITES:
+      return SearchFilter(isFavorite: true)
+
+    // regular album
+    default:
+      return SearchFilter(albumIds: [id])
+    }
+  }
+
+  var isVirtual: Bool {
+    switch self {
+    case Album.NONE, Album.FAVORITES:
+      return true
+    default:
+      return false
+    }
+  }
+}
 
 // MARK: API
 
@@ -132,7 +156,8 @@ class ImmichAPI {
     return components?.url
   }
 
-  func fetchSearchResults(with filters: SearchFilters) async throws
+  func fetchSearchResults(with filters: SearchFilter = Album.NONE.filter)
+    async throws
     -> [Asset]
   {
     // get URL
@@ -178,7 +203,7 @@ class ImmichAPI {
     return try JSONDecoder().decode([MemoryResult].self, from: data)
   }
 
-  func fetchImage(asset: Asset) async throws(WidgetError) -> UIImage {
+  func fetchImage(asset: Asset) async throws(FetchError) -> UIImage {
     let thumbnailParams = [URLQueryItem(name: "size", value: "preview")]
     let assetEndpoint = "/assets/" + asset.id + "/thumbnail"
 
@@ -199,7 +224,7 @@ class ImmichAPI {
 
     let decodeOptions: [NSString: Any] = [
       kCGImageSourceCreateThumbnailFromImageAlways: true,
-      kCGImageSourceThumbnailMaxPixelSize: 400,
+      kCGImageSourceThumbnailMaxPixelSize: 512,
       kCGImageSourceCreateThumbnailWithTransform: true,
     ]
 
diff --git a/mobile/ios/WidgetExtension/widgets/MemoryWidget.swift b/mobile/ios/WidgetExtension/widgets/MemoryWidget.swift
index da7b887c37..d0a3e8c29d 100644
--- a/mobile/ios/WidgetExtension/widgets/MemoryWidget.swift
+++ b/mobile/ios/WidgetExtension/widgets/MemoryWidget.swift
@@ -23,26 +23,27 @@ struct ImmichMemoryProvider: TimelineProvider {
 
     Task {
       guard let api = try? await ImmichAPI() else {
-        completion(ImageEntry.handleCacheFallback(for: cacheKey, error: .noLogin).entries.first!)
+        completion(
+          ImageEntry.handleError(for: cacheKey, error: .noLogin).entries.first!
+        )
         return
       }
 
       guard let memories = try? await api.fetchMemory(for: Date.now)
       else {
-        completion(ImageEntry.handleCacheFallback(for: cacheKey).entries.first!)
+        completion(ImageEntry.handleError(for: cacheKey).entries.first!)
         return
       }
 
       for memory in memories {
         if let asset = memory.assets.first(where: { $0.type == .image }),
-          var entry = try? await ImageEntry.build(
+          let entry = try? await ImageEntry.build(
             api: api,
             asset: asset,
             dateOffset: 0,
             subtitle: getYearDifferenceSubtitle(assetYear: memory.data.year)
           )
         {
-          entry.resize()
           completion(entry)
           return
         }
@@ -50,20 +51,17 @@ struct ImmichMemoryProvider: TimelineProvider {
 
       // fallback to random image
       guard
-        let randomImage = try? await api.fetchSearchResults(
-          with: SearchFilters(size: 1)
-        ).first,
-        var imageEntry = try? await ImageEntry.build(
+        let randomImage = try? await api.fetchSearchResults().first,
+        let imageEntry = try? await ImageEntry.build(
           api: api,
           asset: randomImage,
           dateOffset: 0
         )
       else {
-        completion(ImageEntry.handleCacheFallback(for: cacheKey).entries.first!)
+        completion(ImageEntry.handleError(for: cacheKey).entries.first!)
         return
       }
 
-      imageEntry.resize()
       completion(imageEntry)
     }
   }
@@ -80,7 +78,7 @@ struct ImmichMemoryProvider: TimelineProvider {
 
       guard let api = try? await ImmichAPI() else {
         completion(
-          ImageEntry.handleCacheFallback(for: cacheKey, error: .noLogin)
+          ImageEntry.handleError(for: cacheKey, error: .noLogin)
         )
         return
       }
@@ -119,25 +117,28 @@ struct ImmichMemoryProvider: TimelineProvider {
       // If we didnt add any memory images (some failure occured or no images in memory),
       // default to 12 hours of random photos
       if entries.count == 0 {
-        entries.append(
-          contentsOf: (try? await generateRandomEntries(
+        // this must be a do/catch since we need to
+        // distinguish between a network fail and an empty search
+        do {
+          let search = try await generateRandomEntries(
             api: api,
             now: now,
             count: 12
-          )) ?? []
-        )
-      }
+          )
 
-      // If we fail to fetch images, we still want to add an entry
-      // with a nil image and an error
-      if entries.count == 0 {
-        completion(ImageEntry.handleCacheFallback(for: cacheKey))
-        return
-      }
+          // Load or save a cached asset for when network conditions are bad
+          if search.count == 0 {
+            completion(
+              ImageEntry.handleError(for: cacheKey, error: .noAssetsAvailable)
+            )
+            return
+          }
 
-      // Resize all images to something that can be stored by iOS
-      for i in entries.indices {
-        entries[i].resize()
+          entries.append(contentsOf: search)
+        } catch {
+          completion(ImageEntry.handleError(for: cacheKey))
+          return
+        }
       }
 
       // cache the last image
diff --git a/mobile/ios/WidgetExtension/widgets/RandomWidget.swift b/mobile/ios/WidgetExtension/widgets/RandomWidget.swift
index 8f9143cedd..37f3c5e596 100644
--- a/mobile/ios/WidgetExtension/widgets/RandomWidget.swift
+++ b/mobile/ios/WidgetExtension/widgets/RandomWidget.swift
@@ -8,20 +8,21 @@ extension Album: @unchecked Sendable, AppEntity, Identifiable {
 
   struct AlbumQuery: EntityQuery {
     func entities(for identifiers: [Album.ID]) async throws -> [Album] {
-      // use cached albums to search
-      var albums = (try? await AlbumCache.shared.getAlbums()) ?? []
-      albums.insert(NO_ALBUM, at: 0)
-
-      return albums.filter {
+      return await suggestedEntities().filter {
         identifiers.contains($0.id)
       }
     }
 
-    func suggestedEntities() async throws -> [Album] {
-      var albums = (try? await AlbumCache.shared.getAlbums(refresh: true)) ?? []
-      albums.insert(NO_ALBUM, at: 0)
+    func suggestedEntities() async -> [Album] {
+      let albums = (try? await AlbumCache.shared.getAlbums()) ?? []
 
-      return albums
+      let options =
+        [
+          NONE,
+          FAVORITES,
+        ] + albums
+
+      return options
     }
   }
 
@@ -35,8 +36,6 @@ extension Album: @unchecked Sendable, AppEntity, Identifiable {
   }
 }
 
-let NO_ALBUM = Album(id: "NONE", albumName: "None")
-
 struct RandomConfigurationAppIntent: WidgetConfigurationIntent {
   static var title: LocalizedStringResource { "Select Album" }
   static var description: IntentDescription {
@@ -64,26 +63,25 @@ struct ImmichRandomProvider: AppIntentTimelineProvider {
     -> ImageEntry
   {
     let cacheKey = "random_none_\(context.family.rawValue)"
-    
+
     guard let api = try? await ImmichAPI() else {
-      return ImageEntry.handleCacheFallback(for: cacheKey, error: .noLogin).entries.first!
+      return ImageEntry.handleError(for: cacheKey, error: .noLogin).entries
+        .first!
     }
 
     guard
       let randomImage = try? await api.fetchSearchResults(
-        with: SearchFilters(size: 1)
+        with: Album.NONE.filter
       ).first,
-      var entry = try? await ImageEntry.build(
+      let entry = try? await ImageEntry.build(
         api: api,
         asset: randomImage,
         dateOffset: 0
       )
     else {
-      return ImageEntry.handleCacheFallback(for: cacheKey).entries.first!
+      return ImageEntry.handleError(for: cacheKey).entries.first!
     }
 
-    entry.resize()
-
     return entry
   }
 
@@ -97,52 +95,36 @@ struct ImmichRandomProvider: AppIntentTimelineProvider {
     let now = Date()
 
     // nil if album is NONE or nil
-    let albumId =
-      configuration.album?.id != "NONE" ? configuration.album?.id : nil
-    let albumName: String? =
-      albumId != nil ? configuration.album?.albumName : nil
+    let album = configuration.album ?? Album.NONE
+    let albumName = album.isVirtual ? nil : album.albumName
 
-    let cacheKey = "random_\(albumId ?? "none")_\(context.family.rawValue)"
+    let cacheKey = "random_\(album.id)_\(context.family.rawValue)"
 
     // If we don't have a server config, return an entry with an error
     guard let api = try? await ImmichAPI() else {
-      return ImageEntry.handleCacheFallback(for: cacheKey, error: .noLogin)
-    }
-
-    if albumId != nil {
-      // make sure the album exists on server, otherwise show error
-      guard let albums = try? await api.fetchAlbums() else {
-        return ImageEntry.handleCacheFallback(for: cacheKey)
-      }
-
-      if !albums.contains(where: { $0.id == albumId }) {
-        return ImageEntry.handleCacheFallback(
-          for: cacheKey,
-          error: .albumNotFound
-        )
-      }
+      return ImageEntry.handleError(for: cacheKey, error: .noLogin)
     }
 
     // build entries
-    entries.append(
-      contentsOf: (try? await generateRandomEntries(
+    // this must be a do/catch since we need to
+    // distinguish between a network fail and an empty search
+    do {
+      let search = try await generateRandomEntries(
         api: api,
         now: now,
         count: 12,
-        albumId: albumId,
+        filter: album.filter,
         subtitle: configuration.showAlbumName ? albumName : nil
-      ))
-        ?? []
-    )
+      )
 
-    // Load or save a cached asset for when network conditions are bad
-    if entries.count == 0 {
-      return ImageEntry.handleCacheFallback(for: cacheKey)
-    }
+      // Load or save a cached asset for when network conditions are bad
+      if search.count == 0 {
+        return ImageEntry.handleError(for: cacheKey, error: .noAssetsAvailable)
+      }
 
-    // Resize all images to something that can be stored by iOS
-    for i in entries.indices {
-      entries[i].resize()
+      entries.append(contentsOf: search)
+    } catch {
+      return ImageEntry.handleError(for: cacheKey)
     }
 
     // cache the last image

From 32f23b8d383fa6214f83c29150ca4d5cb97af068 Mon Sep 17 00:00:00 2001
From: evan314159 <110177090+evan314159@users.noreply.github.com>
Date: Wed, 16 Jul 2025 22:34:45 +0800
Subject: [PATCH 220/337] fix(web): prevent flashing white background in dark
 mode on page load/reload (#19934)

* prevent flashing white background in dark mode on page load/reload, tested with Safari and Chrome on macOS

* integrate into existing FOUC-prevention

---------

Co-authored-by: Evan <evan@MacBook-Pro.local>
---
 web/src/app.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/web/src/app.html b/web/src/app.html
index 776764850f..ec8c4393ff 100644
--- a/web/src/app.html
+++ b/web/src/app.html
@@ -21,6 +21,11 @@
       html {
         height: 100%;
         width: 100%;
+        background-color: rgb(255, 255, 255);
+      }
+
+      html.dark {
+        background-color: rgb(10, 10, 10);
       }
 
       body,
@@ -29,6 +34,10 @@
         padding: 0;
       }
 
+      body {
+        transition: background-color 0.15s ease;
+      }
+
       @keyframes delayedVisibility {
         to {
           visibility: visible;

From d9891f759eb8331256698fce22ed73c8f0598371 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Wed, 16 Jul 2025 16:35:36 +0200
Subject: [PATCH 221/337] chore: use upstream setup-dcm action (#19963)

---
 .github/workflows/static_analysis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index 0344189043..4cb788f5fa 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -61,8 +61,7 @@ jobs:
         run: dart pub get
 
       - name: Install DCM
-        # TODO: Move to upstream after https://github.com/CQLabs/setup-dcm/pull/235 merges
-        uses: bo0tzz/setup-dcm@b4952ab813659c03513b57bd78bfe3f634171f8a
+        uses: CQLabs/setup-dcm@8697ae0790c0852e964a6ef1d768d62a6675481a # v2.0.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           version: auto

From bfceed15da6e00d505722a0391a09101688c2d9a Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Wed, 16 Jul 2025 20:06:17 +0530
Subject: [PATCH 222/337] feat: add license page to app bar dialog (#19971)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 i18n/en.json                                  |  1 +
 mobile/lib/main.dart                          | 12 ++++++
 mobile/lib/utils/licenses.dart                | 42 +++++++++++++++++++
 .../common/app_bar_dialog/app_bar_dialog.dart | 24 +++++++++++
 4 files changed, 79 insertions(+)
 create mode 100644 mobile/lib/utils/licenses.dart

diff --git a/i18n/en.json b/i18n/en.json
index d2acfcc58f..6b9a0bffe6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1146,6 +1146,7 @@
   "library_page_sort_created": "Created date",
   "library_page_sort_last_modified": "Last modified",
   "library_page_sort_title": "Album title",
+  "licenses": "Licenses",
   "light": "Light",
   "like_deleted": "Like deleted",
   "link_motion_video": "Link motion video",
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index bf79c28361..f67767f767 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -31,6 +31,7 @@ import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/cache/widgets_binding.dart';
 import 'package:immich_mobile/utils/download.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
+import 'package:immich_mobile/utils/licenses.dart';
 import 'package:immich_mobile/utils/migration.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:logging/logging.dart';
@@ -98,6 +99,17 @@ Future<void> initApp() async {
   );
 
   await FileDownloader().trackTasks();
+
+  LicenseRegistry.addLicense(
+    () async* {
+      for (final license in nonPubLicenses.entries) {
+        yield LicenseEntryWithLineBreaks(
+          [license.key],
+          license.value,
+        );
+      }
+    },
+  );
 }
 
 class ImmichApp extends ConsumerStatefulWidget {
diff --git a/mobile/lib/utils/licenses.dart b/mobile/lib/utils/licenses.dart
new file mode 100644
index 0000000000..5ebc2c7b1a
--- /dev/null
+++ b/mobile/lib/utils/licenses.dart
@@ -0,0 +1,42 @@
+const nonPubLicenses = {
+  'aves': '''
+BSD 3-Clause License
+
+Copyright (c) 2020, Thibault Deckers
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+''',
+  'photo_view': '''
+Copyright 2024 Renan C. Araújo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+''',
+};
diff --git a/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart b/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart
index 9d8be7c6ce..388f202b6d 100644
--- a/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart
+++ b/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart
@@ -17,6 +17,8 @@ import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:immich_mobile/widgets/common/app_bar_dialog/app_bar_profile_info.dart';
 import 'package:immich_mobile/widgets/common/app_bar_dialog/app_bar_server_info.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
+import 'package:immich_mobile/widgets/common/immich_logo.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class ImmichAppBarDialog extends HookConsumerWidget {
@@ -255,6 +257,28 @@ class ImmichAppBarDialog extends HookConsumerWidget {
                 style: context.textTheme.bodySmall,
               ).tr(),
             ),
+            const SizedBox(
+              width: 20,
+              child: Text(
+                "•",
+                textAlign: TextAlign.center,
+              ),
+            ),
+            InkWell(
+              onTap: () async {
+                context.pop();
+                final packageInfo = await PackageInfo.fromPlatform();
+                showLicensePage(
+                  context: context,
+                  applicationIcon: const Padding(
+                    padding: EdgeInsetsGeometry.symmetric(vertical: 10),
+                    child: ImmichLogo(size: 40),
+                  ),
+                  applicationVersion: packageInfo.version,
+                );
+              },
+              child: Text("licenses", style: context.textTheme.bodySmall).tr(),
+            ),
           ],
         ),
       );

From eae2471ab516a1b4aa21dd2283b50b089261589a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 16:22:33 -0500
Subject: [PATCH 223/337] chore(deps): update base-image to v202507162011
 (major) (#19983)

chore(deps): update base-image to v202507162011

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

diff --git a/server/Dockerfile b/server/Dockerfile
index 1f5438d070..0b3b864c95 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,5 +1,5 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:202507091427@sha256:733e510024e03bc2450608a1f3622f45bf287b70d89a06e60acbccea4bf4fd8c AS dev
+FROM ghcr.io/immich-app/base-server-dev:202507162011@sha256:85d4230c2208646bd6c528db41b2213d780b11b7a311397ca6a2aaba7cf697c8 AS dev
 
 WORKDIR /usr/src/app
 COPY server/package.json server/package-lock.json ./
@@ -98,7 +98,7 @@ RUN npm run build
 
 
 # prod build
-FROM ghcr.io/immich-app/base-server-prod:202507091427@sha256:ad10451acd8eda05a006a2586b6b0425cdaaca97c413fb4c1a10896712528bdc
+FROM ghcr.io/immich-app/base-server-prod:202507162011@sha256:636f3ddb6106628ef851d51c23f3fa2c6e4829390cc315b27b38c288c82b23a7
 
 WORKDIR /usr/src/app
 ENV NODE_ENV=production \

From 649221176c201b14e596323205f16b9dbcfdddf2 Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Thu, 17 Jul 2025 00:25:41 +0300
Subject: [PATCH 224/337] refactor(mobile): delete local button in new timeline
 (#19961)

* delete local action button

* include source

* move prompt

* batch
---
 i18n/en.json                                  |  1 +
 .../repositories/local_asset.repository.dart  | 13 +++++++
 .../delete_local_action_button.widget.dart    | 35 ++++++++++++++++-
 .../asset_viewer/bottom_sheet.widget.dart     |  2 +-
 .../archive_bottom_sheet.widget.dart          |  2 +-
 .../favorite_bottom_sheet.widget.dart         |  2 +-
 .../general_bottom_sheet.widget.dart          |  2 +-
 .../local_album_bottom_sheet.widget.dart      |  3 +-
 .../remote_album_bottom_sheet.widget.dart     |  2 +-
 .../infrastructure/action.provider.dart       | 38 +++++++++++++++----
 mobile/lib/services/action.service.dart       | 13 +++++++
 11 files changed, 99 insertions(+), 14 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 6b9a0bffe6..175399c7ab 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -749,6 +749,7 @@
   "delete_key": "Delete key",
   "delete_library": "Delete Library",
   "delete_link": "Delete link",
+  "delete_local_action_prompt": "{count} deleted locally",
   "delete_local_dialog_ok_backed_up_only": "Delete Backed Up Only",
   "delete_local_dialog_ok_force": "Delete Anyway",
   "delete_others": "Delete others",
diff --git a/mobile/lib/infrastructure/repositories/local_asset.repository.dart b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
index cb6871cd22..31a11f7047 100644
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
@@ -43,4 +44,16 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
       }
     });
   }
+
+  Future<void> delete(List<String> ids) {
+    if (ids.isEmpty) {
+      return Future.value();
+    }
+
+    return _db.batch((batch) {
+      for (final slice in ids.slices(32000)) {
+        batch.deleteWhere(_db.localAssetEntity, (e) => e.id.isIn(slice));
+      }
+    });
+  }
 }
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
index dfc84b4190..90534ca68c 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
@@ -1,10 +1,42 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class DeleteLocalActionButton extends ConsumerWidget {
-  const DeleteLocalActionButton({super.key});
+  final ActionSource source;
+
+  const DeleteLocalActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).deleteLocal(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'delete_local_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -12,6 +44,7 @@ class DeleteLocalActionButton extends ConsumerWidget {
       maxWidth: 95.0,
       iconData: Icons.no_cell_outlined,
       label: "control_bottom_app_bar_delete_from_local".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
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 a7a2a57ce5..0ad87e05e8 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -58,7 +58,7 @@ class AssetDetailBottomSheet extends ConsumerWidget {
         ),
       ],
       if (asset.storage == AssetState.local) ...[
-        const DeleteLocalActionButton(),
+        const DeleteLocalActionButton(source: ActionSource.viewer),
         const UploadActionButton(),
       ],
     ];
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
index c23f268465..3c21630d2e 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
@@ -52,7 +52,7 @@ class ArchiveBottomSheet extends ConsumerWidget {
           const StackActionButton(),
         ],
         if (multiselect.hasLocal) ...[
-          const DeleteLocalActionButton(),
+          const DeleteLocalActionButton(source: ActionSource.timeline),
           const UploadActionButton(),
         ],
       ],
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
index 2f8208a80b..d73d3c22e0 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
@@ -52,7 +52,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
           const StackActionButton(),
         ],
         if (multiselect.hasLocal) ...[
-          const DeleteLocalActionButton(),
+          const DeleteLocalActionButton(source: ActionSource.timeline),
           const UploadActionButton(),
         ],
       ],
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
index 900adefd0b..6726f18246 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -52,7 +52,7 @@ class GeneralBottomSheet extends ConsumerWidget {
           const StackActionButton(),
         ],
         if (multiselect.hasLocal) ...[
-          const DeleteLocalActionButton(),
+          const DeleteLocalActionButton(source: ActionSource.timeline),
           const UploadActionButton(),
         ],
       ],
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
index 3fd717f516..d41f8ecb96 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
@@ -16,7 +17,7 @@ class LocalAlbumBottomSheet extends ConsumerWidget {
       shouldCloseOnMinExtent: false,
       actions: [
         ShareActionButton(),
-        DeleteLocalActionButton(),
+        DeleteLocalActionButton(source: ActionSource.timeline),
         UploadActionButton(),
       ],
     );
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
index 0268a2b386..1ed662884a 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
@@ -55,7 +55,7 @@ class RemoteAlbumBottomSheet extends ConsumerWidget {
           const StackActionButton(),
         ],
         if (multiselect.hasLocal) ...[
-          const DeleteLocalActionButton(),
+          const DeleteLocalActionButton(source: ActionSource.timeline),
           const UploadActionButton(),
         ],
         RemoveFromAlbumActionButton(
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 49605e918a..25b5783137 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -41,7 +41,13 @@ class ActionNotifier extends Notifier<void> {
   }
 
   List<String> _getRemoteIdsForSource(ActionSource source) {
-    return _getIdsForSource<RemoteAsset>(source).toIds().toList();
+    return _getIdsForSource<RemoteAsset>(source)
+        .toIds()
+        .toList(growable: false);
+  }
+
+  List<String> _getLocalIdsForSource(ActionSource source) {
+    return _getIdsForSource<LocalAsset>(source).toIds().toList(growable: false);
   }
 
   List<String> _getOwnedRemoteForSource(ActionSource source) {
@@ -49,23 +55,22 @@ class ActionNotifier extends Notifier<void> {
     return _getIdsForSource<RemoteAsset>(source)
         .ownedAssets(ownerId)
         .toIds()
-        .toList();
+        .toList(growable: false);
   }
 
   Iterable<T> _getIdsForSource<T extends BaseAsset>(ActionSource source) {
     final Set<BaseAsset> assets = switch (source) {
-      ActionSource.timeline =>
-        ref.read(multiSelectProvider.select((s) => s.selectedAssets)),
+      ActionSource.timeline => ref.read(multiSelectProvider).selectedAssets,
       ActionSource.viewer => switch (ref.read(currentAssetNotifier)) {
           BaseAsset asset => {asset},
-          null => {},
+          null => const {},
         },
     };
 
     return switch (T) {
       const (RemoteAsset) => assets.whereType<RemoteAsset>(),
       const (LocalAsset) => assets.whereType<LocalAsset>(),
-      _ => <T>[],
+      _ => const [],
     } as Iterable<T>;
   }
 
@@ -207,6 +212,21 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
+  Future<ActionResult> deleteLocal(ActionSource source) async {
+    final ids = _getLocalIdsForSource(source);
+    try {
+      await _service.deleteLocal(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to delete assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
   Future<ActionResult?> editLocation(
     ActionSource source,
     BuildContext context,
@@ -252,7 +272,11 @@ extension on Iterable<RemoteAsset> {
   Iterable<String> toIds() => map((e) => e.id);
 
   Iterable<RemoteAsset> ownedAssets(String? ownerId) {
-    if (ownerId == null) return [];
+    if (ownerId == null) return const [];
     return whereType<RemoteAsset>().where((a) => a.ownerId == ownerId);
   }
 }
+
+extension on Iterable<LocalAsset> {
+  Iterable<String> toIds() => map((e) => e.id);
+}
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index d7c625b981..bb2e1514e8 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -2,11 +2,13 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/location_picker.dart';
@@ -17,22 +19,28 @@ final actionServiceProvider = Provider<ActionService>(
   (ref) => ActionService(
     ref.watch(assetApiRepositoryProvider),
     ref.watch(remoteAssetRepositoryProvider),
+    ref.watch(localAssetRepository),
     ref.watch(driftAlbumApiRepositoryProvider),
     ref.watch(remoteAlbumRepository),
+    ref.watch(assetMediaRepositoryProvider),
   ),
 );
 
 class ActionService {
   final AssetApiRepository _assetApiRepository;
   final RemoteAssetRepository _remoteAssetRepository;
+  final DriftLocalAssetRepository _localAssetRepository;
   final DriftAlbumApiRepository _albumApiRepository;
   final DriftRemoteAlbumRepository _remoteAlbumRepository;
+  final AssetMediaRepository _assetMediaRepository;
 
   const ActionService(
     this._assetApiRepository,
     this._remoteAssetRepository,
+    this._localAssetRepository,
     this._albumApiRepository,
     this._remoteAlbumRepository,
+    this._assetMediaRepository,
   );
 
   Future<void> shareLink(List<String> remoteIds, BuildContext context) async {
@@ -107,6 +115,11 @@ class ActionService {
     await _remoteAssetRepository.delete(remoteIds);
   }
 
+  Future<void> deleteLocal(List<String> localIds) async {
+    await _assetMediaRepository.deleteAll(localIds);
+    await _localAssetRepository.delete(localIds);
+  }
+
   Future<bool> editLocation(
     List<String> remoteIds,
     BuildContext context,

From 184c7390a1ab74e133f3cebf5418b7d00d68673d Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Thu, 17 Jul 2025 04:14:58 +0200
Subject: [PATCH 225/337] chore: also redirect docs/ with trailing slash
 (#19965)

Cause I keep running into that lol
---
 docs/static/_redirects | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/static/_redirects b/docs/static/_redirects
index 6683c78077..7b01d1e3bb 100644
--- a/docs/static/_redirects
+++ b/docs/static/_redirects
@@ -1,4 +1,5 @@
-/docs /docs/overview/introduction 307
+/docs /docs/overview/welcome 307
+/docs/ /docs/overview/welcome 307
 /docs/mobile-app-beta-program /docs/features/mobile-app 307
 /docs/contribution-guidelines /docs/overview/support-the-project#contributing 307
 /docs/install /docs/install/docker-compose 307
@@ -30,4 +31,4 @@
 /docs/guides/api-album-sync /docs/community-projects 307
 /docs/guides/remove-offline-files /docs/community-projects 307
 /milestones /roadmap 307
-/docs/overview/introduction /docs/overview/welcome 307
\ No newline at end of file
+/docs/overview/introduction /docs/overview/welcome 307

From 238dc7c0859cd6fadfa74c4f86cd019e660af423 Mon Sep 17 00:00:00 2001
From: Lucas Correia <98816628+lcs-crr@users.noreply.github.com>
Date: Thu, 17 Jul 2025 15:40:49 +0200
Subject: [PATCH 226/337] chore: adjust setting subtitle to less clumsy
 expression (#19970)

---
 i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i18n/en.json b/i18n/en.json
index 175399c7ab..fb0c15d9fc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -376,7 +376,7 @@
   "advanced_settings_enable_alternate_media_filter_subtitle": "Use this option to filter media during sync based on alternate criteria. Only try this if you have issues with the app detecting all albums.",
   "advanced_settings_enable_alternate_media_filter_title": "[EXPERIMENTAL] Use alternate device album sync filter",
   "advanced_settings_log_level_title": "Log level: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Some devices are painfully slow to load thumbnails from assets on the device. Activate this setting to load remote images instead.",
+  "advanced_settings_prefer_remote_subtitle": "Some devices are painfully slow to load thumbnails from local assets. Activate this setting to load remote images instead.",
   "advanced_settings_prefer_remote_title": "Prefer remote images",
   "advanced_settings_proxy_headers_subtitle": "Define proxy headers Immich should send with each network request",
   "advanced_settings_proxy_headers_title": "Proxy Headers",

From b256c51b6b3ed70cdf67d2fa7d9a362941c1be0a Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Thu, 17 Jul 2025 10:49:55 -0400
Subject: [PATCH 227/337] docs: update devcontainer docs (#19237)

---
 docs/docs/developer/devcontainers.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/docs/developer/devcontainers.md b/docs/docs/developer/devcontainers.md
index 1aab5ad327..c4c5396466 100644
--- a/docs/docs/developer/devcontainers.md
+++ b/docs/docs/developer/devcontainers.md
@@ -7,7 +7,7 @@ sidebar_position: 3
 
 Dev Containers provide a consistent, reproducible development environment using Docker containers. With a single click, you can get started with an Immich development environment on Mac, Linux, Windows, or in the cloud using GitHub Codespaces.
 
-[![Open in VSCode Containers](https://img.shields.io/static/v1?label=VSCode%20DevContainer&message=Immich&color=blue)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/immich-app/immich/)
+Get started fast!
 
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/immich-app/immich/)
 
@@ -71,7 +71,7 @@ cd immich
 
 The immich dev containers read environment variables from your shell environment, not from `.env` files. This allows them to work in cloud environments without pre-configuration.
 
-:::important Required Configuration
+:::important Configuration
 When running locally, and if you want to create (or use an existing) DB and/or photo storage folder, you must set the `UPLOAD_LOCATION` variable in your shell environment before launching the Dev Container. This determines where uploaded files are stored and also where the DB stores it data.
 
 ```bash
@@ -88,6 +88,10 @@ source ~/.bashrc
 
 ### Step 3: Launch the Dev Container
 
+:::tip
+Immich development makes extensive use of specialized [base images](https://github.com/immich-app/base-images) for its docker-compose based development. For this reason, you won't be able to use VSCode's **_Clone Repository in a Container Volume_** command.
+:::
+
 #### Using VS Code UI:
 
 1. Open the cloned repository in VS Code

From 531515daf9c94442a75888e3b5ed4656dce90087 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Thu, 17 Jul 2025 21:42:29 +0530
Subject: [PATCH 228/337] feat: add toggle to switch between Isar and Sqlite
 (#19953)

---
 i18n/en.json                                  |    2 +
 .../drift_schemas/main/drift_schema_v2.json   |    1 +
 mobile/lib/domain/models/store.model.dart     |    4 +-
 mobile/lib/domain/services/store.service.dart |    2 +
 .../repositories/db.repository.dart           |   30 +-
 .../repositories/db.repository.steps.dart     |  864 +++
 .../pages/common/change_experience.page.dart  |  126 +
 mobile/lib/pages/common/settings.page.dart    |   97 +-
 .../lib/pages/common/splash_screen.page.dart  |   10 +-
 mobile/lib/pages/common/tab_shell.page.dart   |   19 +-
 .../pages/share_intent/share_intent.page.dart |    5 +-
 .../providers/app_life_cycle.provider.dart    |  112 +-
 .../providers/infrastructure/db.provider.dart |    1 +
 mobile/lib/repositories/auth.repository.dart  |   31 +-
 mobile/lib/routing/router.dart                |   34 +-
 mobile/lib/routing/router.gr.dart             |   43 +
 mobile/lib/services/app_settings.service.dart |    1 +
 mobile/lib/utils/isolate.dart                 |   16 +-
 mobile/lib/utils/migration.dart               |   64 +-
 .../widgets/common/immich_sliver_app_bar.dart |   51 +-
 .../lib/widgets/forms/login/login_form.dart   |   22 +-
 .../settings/beta_timeline_list_tile.dart     |  269 +
 mobile/pubspec.yaml                           |    1 -
 mobile/test/drift/main/generated/schema.dart  |   23 +
 .../test/drift/main/generated/schema_v1.dart  | 4638 ++++++++++++++++
 .../test/drift/main/generated/schema_v2.dart  | 4672 +++++++++++++++++
 mobile/test/drift/main/migration_test.dart    |   38 +
 27 files changed, 11016 insertions(+), 160 deletions(-)
 create mode 100644 mobile/drift_schemas/main/drift_schema_v2.json
 create mode 100644 mobile/lib/infrastructure/repositories/db.repository.steps.dart
 create mode 100644 mobile/lib/pages/common/change_experience.page.dart
 create mode 100644 mobile/lib/widgets/settings/beta_timeline_list_tile.dart
 create mode 100644 mobile/test/drift/main/generated/schema.dart
 create mode 100644 mobile/test/drift/main/generated/schema_v1.dart
 create mode 100644 mobile/test/drift/main/generated/schema_v2.dart
 create mode 100644 mobile/test/drift/main/migration_test.dart

diff --git a/i18n/en.json b/i18n/en.json
index fb0c15d9fc..6cabcecf7d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -373,6 +373,8 @@
   "admin_password": "Admin Password",
   "administration": "Administration",
   "advanced": "Advanced",
+  "advanced_settings_beta_timeline_subtitle": "Try the new app experience.",
+  "advanced_settings_beta_timeline_title": "Beta Timeline",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Use this option to filter media during sync based on alternate criteria. Only try this if you have issues with the app detecting all albums.",
   "advanced_settings_enable_alternate_media_filter_title": "[EXPERIMENTAL] Use alternate device album sync filter",
   "advanced_settings_log_level_title": "Log level: {level}",
diff --git a/mobile/drift_schemas/main/drift_schema_v2.json b/mobile/drift_schemas/main/drift_schema_v2.json
new file mode 100644
index 0000000000..4c1e3d68a1
--- /dev/null
+++ b/mobile/drift_schemas/main/drift_schema_v2.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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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":14,"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":15,"references":[1,14],"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":16,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}}]}
\ No newline at end of file
diff --git a/mobile/lib/domain/models/store.model.dart b/mobile/lib/domain/models/store.model.dart
index a96e8d3bce..61c5807ba8 100644
--- a/mobile/lib/domain/models/store.model.dart
+++ b/mobile/lib/domain/models/store.model.dart
@@ -68,7 +68,9 @@ enum StoreKey<T> {
   manageLocalMediaAndroid<bool>._(137),
 
   // Experimental stuff
-  photoManagerCustomFilter<bool>._(1000);
+  photoManagerCustomFilter<bool>._(1000),
+  betaPromptShown<bool>._(1001),
+  betaTimeline<bool>._(1002);
 
   const StoreKey._(this.id);
   final int id;
diff --git a/mobile/lib/domain/services/store.service.dart b/mobile/lib/domain/services/store.service.dart
index 359ce8cf60..b1e991b348 100644
--- a/mobile/lib/domain/services/store.service.dart
+++ b/mobile/lib/domain/services/store.service.dart
@@ -93,6 +93,8 @@ class StoreService {
     await _storeRepository.deleteAll();
     _cache.clear();
   }
+
+  bool get isBetaTimelineEnabled => tryGet(StoreKey.betaTimeline) ?? false;
 }
 
 class StoreKeyNotFoundException implements Exception {
diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/lib/infrastructure/repositories/db.repository.dart
index a7920cf7b2..200ec47516 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
+import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/domain/interfaces/db.interface.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
@@ -17,6 +18,7 @@ import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.dart';
 import 'package:isar/isar.dart';
 
 import 'db.repository.drift.dart';
@@ -68,10 +70,36 @@ class Drift extends $Drift implements IDatabaseRepository {
         );
 
   @override
-  int get schemaVersion => 1;
+  int get schemaVersion => 2;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
+        onUpgrade: (m, from, to) async {
+          // Run migration steps without foreign keys and re-enable them later
+          await customStatement('PRAGMA foreign_keys = OFF');
+
+          await m.runMigrationSteps(
+            from: from,
+            to: to,
+            steps: migrationSteps(
+              from1To2: (m, _) async {
+                for (final entity in allSchemaEntities) {
+                  await m.drop(entity);
+                  await m.create(entity);
+                }
+              },
+            ),
+          );
+
+          if (kDebugMode) {
+            // Fail if the migration broke foreign keys
+            final wrongFKs =
+                await customSelect('PRAGMA foreign_key_check').get();
+            assert(wrongFKs.isEmpty, '${wrongFKs.map((e) => e.data)}');
+          }
+
+          await customStatement('PRAGMA foreign_keys = ON;');
+        },
         beforeOpen: (details) async {
           await customStatement('PRAGMA foreign_keys = ON');
           await customStatement('PRAGMA synchronous = NORMAL');
diff --git a/mobile/lib/infrastructure/repositories/db.repository.steps.dart b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
new file mode 100644
index 0000000000..5815d31978
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -0,0 +1,864 @@
+// dart format width=80
+import 'package:drift/internal/versioned_schema.dart' as i0;
+import 'package:drift/drift.dart' as i1;
+import 'dart:typed_data' as i2;
+import 'package:drift/drift.dart'; // ignore_for_file: type=lint,unused_import
+
+// GENERATED BY drift_dev, DO NOT MODIFY.
+final class Schema2 extends i0.VersionedSchema {
+  Schema2({required super.database}) : super(version: 2);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    localAssetEntity,
+    idxLocalAssetChecksum,
+    uQRemoteAssetOwnerChecksum,
+    idxRemoteAssetChecksum,
+    userMetadataEntity,
+    partnerEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    remoteExifEntity,
+    remoteAlbumEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    stackEntity,
+  ];
+  late final Shape0 userEntity = Shape0(
+      source: i0.VersionedTable(
+        entityName: 'user_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(id)',
+        ],
+        columns: [
+          _column_0,
+          _column_1,
+          _column_2,
+          _column_3,
+          _column_4,
+          _column_5,
+          _column_6,
+          _column_7,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape1 remoteAssetEntity = Shape1(
+      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,
+        ],
+        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_21,
+          _column_14,
+          _column_22,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  final i1.Index idxLocalAssetChecksum = i1.Index('idx_local_asset_checksum',
+      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  final i1.Index uQRemoteAssetOwnerChecksum = i1.Index(
+      'UQ_remote_asset_owner_checksum',
+      'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
+  final i1.Index idxRemoteAssetChecksum = i1.Index('idx_remote_asset_checksum',
+      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  late final Shape3 userMetadataEntity = Shape3(
+      source: i0.VersionedTable(
+        entityName: 'user_metadata_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(user_id, "key")',
+        ],
+        columns: [
+          _column_23,
+          _column_24,
+          _column_25,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape4 partnerEntity = Shape4(
+      source: i0.VersionedTable(
+        entityName: 'partner_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(shared_by_id, shared_with_id)',
+        ],
+        columns: [
+          _column_26,
+          _column_27,
+          _column_28,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape5 localAlbumEntity = Shape5(
+      source: i0.VersionedTable(
+        entityName: 'local_album_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(id)',
+        ],
+        columns: [
+          _column_0,
+          _column_1,
+          _column_5,
+          _column_29,
+          _column_30,
+          _column_31,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape6 localAlbumAssetEntity = Shape6(
+      source: i0.VersionedTable(
+        entityName: 'local_album_asset_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(asset_id, album_id)',
+        ],
+        columns: [
+          _column_32,
+          _column_33,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape7 remoteExifEntity = Shape7(
+      source: i0.VersionedTable(
+        entityName: 'remote_exif_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(asset_id)',
+        ],
+        columns: [
+          _column_34,
+          _column_35,
+          _column_36,
+          _column_37,
+          _column_38,
+          _column_39,
+          _column_11,
+          _column_10,
+          _column_40,
+          _column_41,
+          _column_42,
+          _column_43,
+          _column_44,
+          _column_45,
+          _column_46,
+          _column_47,
+          _column_48,
+          _column_49,
+          _column_50,
+          _column_51,
+          _column_52,
+          _column_53,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape8 remoteAlbumEntity = Shape8(
+      source: i0.VersionedTable(
+        entityName: 'remote_album_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(id)',
+        ],
+        columns: [
+          _column_0,
+          _column_1,
+          _column_54,
+          _column_9,
+          _column_5,
+          _column_15,
+          _column_55,
+          _column_56,
+          _column_57,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape6 remoteAlbumAssetEntity = Shape6(
+      source: i0.VersionedTable(
+        entityName: 'remote_album_asset_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(asset_id, album_id)',
+        ],
+        columns: [
+          _column_34,
+          _column_58,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape9 remoteAlbumUserEntity = Shape9(
+      source: i0.VersionedTable(
+        entityName: 'remote_album_user_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(album_id, user_id)',
+        ],
+        columns: [
+          _column_58,
+          _column_23,
+          _column_59,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape10 memoryEntity = Shape10(
+      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_60,
+          _column_61,
+          _column_62,
+          _column_63,
+          _column_64,
+          _column_65,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape11 memoryAssetEntity = Shape11(
+      source: i0.VersionedTable(
+        entityName: 'memory_asset_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(asset_id, memory_id)',
+        ],
+        columns: [
+          _column_34,
+          _column_66,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape12 stackEntity = Shape12(
+      source: i0.VersionedTable(
+        entityName: 'stack_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(id)',
+        ],
+        columns: [
+          _column_0,
+          _column_9,
+          _column_5,
+          _column_15,
+          _column_67,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+}
+
+class Shape0 extends i0.VersionedTable {
+  Shape0({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isAdmin =>
+      columnsByName['is_admin']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get email =>
+      columnsByName['email']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get profileImagePath =>
+      columnsByName['profile_image_path']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get updatedAt =>
+      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<int> get quotaSizeInBytes =>
+      columnsByName['quota_size_in_bytes']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get quotaUsageInBytes =>
+      columnsByName['quota_usage_in_bytes']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<String> _column_0(String aliasedName) =>
+    i1.GeneratedColumn<String>('id', aliasedName, false,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_1(String aliasedName) =>
+    i1.GeneratedColumn<String>('name', aliasedName, false,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<bool> _column_2(String aliasedName) =>
+    i1.GeneratedColumn<bool>('is_admin', aliasedName, false,
+        type: i1.DriftSqlType.bool,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'CHECK ("is_admin" IN (0, 1))'),
+        defaultValue: const CustomExpression('0'));
+i1.GeneratedColumn<String> _column_3(String aliasedName) =>
+    i1.GeneratedColumn<String>('email', aliasedName, false,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_4(String aliasedName) =>
+    i1.GeneratedColumn<String>('profile_image_path', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<DateTime> _column_5(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('updated_at', aliasedName, false,
+        type: i1.DriftSqlType.dateTime,
+        defaultValue: const CustomExpression('CURRENT_TIMESTAMP'));
+i1.GeneratedColumn<int> _column_6(String aliasedName) =>
+    i1.GeneratedColumn<int>('quota_size_in_bytes', aliasedName, true,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<int> _column_7(String aliasedName) =>
+    i1.GeneratedColumn<int>('quota_usage_in_bytes', aliasedName, false,
+        type: i1.DriftSqlType.int, defaultValue: const CustomExpression('0'));
+
+class Shape1 extends i0.VersionedTable {
+  Shape1({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 checksum =>
+      columnsByName['checksum']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isFavorite =>
+      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get ownerId =>
+      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get localDateTime =>
+      columnsByName['local_date_time']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<String> get thumbHash =>
+      columnsByName['thumb_hash']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get deletedAt =>
+      columnsByName['deleted_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<String> get livePhotoVideoId =>
+      columnsByName['live_photo_video_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get visibility =>
+      columnsByName['visibility']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<int> _column_8(String aliasedName) =>
+    i1.GeneratedColumn<int>('type', aliasedName, false,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<DateTime> _column_9(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('created_at', aliasedName, false,
+        type: i1.DriftSqlType.dateTime,
+        defaultValue: const CustomExpression('CURRENT_TIMESTAMP'));
+i1.GeneratedColumn<int> _column_10(String aliasedName) =>
+    i1.GeneratedColumn<int>('width', aliasedName, true,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<int> _column_11(String aliasedName) =>
+    i1.GeneratedColumn<int>('height', aliasedName, true,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<int> _column_12(String aliasedName) =>
+    i1.GeneratedColumn<int>('duration_in_seconds', aliasedName, true,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<String> _column_13(String aliasedName) =>
+    i1.GeneratedColumn<String>('checksum', aliasedName, false,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<bool> _column_14(String aliasedName) =>
+    i1.GeneratedColumn<bool>('is_favorite', aliasedName, false,
+        type: i1.DriftSqlType.bool,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'CHECK ("is_favorite" IN (0, 1))'),
+        defaultValue: const CustomExpression('0'));
+i1.GeneratedColumn<String> _column_15(String aliasedName) =>
+    i1.GeneratedColumn<String>('owner_id', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES user_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<DateTime> _column_16(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('local_date_time', aliasedName, true,
+        type: i1.DriftSqlType.dateTime);
+i1.GeneratedColumn<String> _column_17(String aliasedName) =>
+    i1.GeneratedColumn<String>('thumb_hash', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<DateTime> _column_18(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('deleted_at', aliasedName, true,
+        type: i1.DriftSqlType.dateTime);
+i1.GeneratedColumn<String> _column_19(String aliasedName) =>
+    i1.GeneratedColumn<String>('live_photo_video_id', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<int> _column_20(String aliasedName) =>
+    i1.GeneratedColumn<int>('visibility', aliasedName, false,
+        type: i1.DriftSqlType.int);
+
+class Shape2 extends i0.VersionedTable {
+  Shape2({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 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_21(String aliasedName) =>
+    i1.GeneratedColumn<String>('checksum', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<int> _column_22(String aliasedName) =>
+    i1.GeneratedColumn<int>('orientation', aliasedName, false,
+        type: i1.DriftSqlType.int, defaultValue: const CustomExpression('0'));
+
+class Shape3 extends i0.VersionedTable {
+  Shape3({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get userId =>
+      columnsByName['user_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get key =>
+      columnsByName['key']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<i2.Uint8List> get value =>
+      columnsByName['value']! as i1.GeneratedColumn<i2.Uint8List>;
+}
+
+i1.GeneratedColumn<String> _column_23(String aliasedName) =>
+    i1.GeneratedColumn<String>('user_id', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES user_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<int> _column_24(String aliasedName) =>
+    i1.GeneratedColumn<int>('key', aliasedName, false,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<i2.Uint8List> _column_25(String aliasedName) =>
+    i1.GeneratedColumn<i2.Uint8List>('value', aliasedName, false,
+        type: i1.DriftSqlType.blob);
+
+class Shape4 extends i0.VersionedTable {
+  Shape4({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get sharedById =>
+      columnsByName['shared_by_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get sharedWithId =>
+      columnsByName['shared_with_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get inTimeline =>
+      columnsByName['in_timeline']! as i1.GeneratedColumn<bool>;
+}
+
+i1.GeneratedColumn<String> _column_26(String aliasedName) =>
+    i1.GeneratedColumn<String>('shared_by_id', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES user_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<String> _column_27(String aliasedName) =>
+    i1.GeneratedColumn<String>('shared_with_id', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES user_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<bool> _column_28(String aliasedName) =>
+    i1.GeneratedColumn<bool>('in_timeline', aliasedName, false,
+        type: i1.DriftSqlType.bool,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'CHECK ("in_timeline" IN (0, 1))'),
+        defaultValue: const CustomExpression('0'));
+
+class Shape5 extends i0.VersionedTable {
+  Shape5({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get updatedAt =>
+      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<int> get backupSelection =>
+      columnsByName['backup_selection']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<bool> get isIosSharedAlbum =>
+      columnsByName['is_ios_shared_album']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<bool> get marker_ =>
+      columnsByName['marker']! as i1.GeneratedColumn<bool>;
+}
+
+i1.GeneratedColumn<int> _column_29(String aliasedName) =>
+    i1.GeneratedColumn<int>('backup_selection', aliasedName, false,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<bool> _column_30(String aliasedName) =>
+    i1.GeneratedColumn<bool>('is_ios_shared_album', aliasedName, false,
+        type: i1.DriftSqlType.bool,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'CHECK ("is_ios_shared_album" IN (0, 1))'),
+        defaultValue: const CustomExpression('0'));
+i1.GeneratedColumn<bool> _column_31(String aliasedName) =>
+    i1.GeneratedColumn<bool>('marker', aliasedName, true,
+        type: i1.DriftSqlType.bool,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'CHECK ("marker" IN (0, 1))'));
+
+class Shape6 extends i0.VersionedTable {
+  Shape6({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get assetId =>
+      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get albumId =>
+      columnsByName['album_id']! as i1.GeneratedColumn<String>;
+}
+
+i1.GeneratedColumn<String> _column_32(String aliasedName) =>
+    i1.GeneratedColumn<String>('asset_id', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES local_asset_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<String> _column_33(String aliasedName) =>
+    i1.GeneratedColumn<String>('album_id', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES local_album_entity (id) ON DELETE CASCADE'));
+
+class Shape7 extends i0.VersionedTable {
+  Shape7({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get assetId =>
+      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get city =>
+      columnsByName['city']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get state =>
+      columnsByName['state']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get country =>
+      columnsByName['country']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get dateTimeOriginal =>
+      columnsByName['date_time_original']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<String> get description =>
+      columnsByName['description']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get height =>
+      columnsByName['height']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get width =>
+      columnsByName['width']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get exposureTime =>
+      columnsByName['exposure_time']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<double> get fNumber =>
+      columnsByName['f_number']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<int> get fileSize =>
+      columnsByName['file_size']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<double> get focalLength =>
+      columnsByName['focal_length']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get latitude =>
+      columnsByName['latitude']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get longitude =>
+      columnsByName['longitude']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<int> get iso =>
+      columnsByName['iso']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get make =>
+      columnsByName['make']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get model =>
+      columnsByName['model']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get lens =>
+      columnsByName['lens']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get orientation =>
+      columnsByName['orientation']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get timeZone =>
+      columnsByName['time_zone']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get rating =>
+      columnsByName['rating']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get projectionType =>
+      columnsByName['projection_type']! as i1.GeneratedColumn<String>;
+}
+
+i1.GeneratedColumn<String> _column_34(String aliasedName) =>
+    i1.GeneratedColumn<String>('asset_id', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES remote_asset_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<String> _column_35(String aliasedName) =>
+    i1.GeneratedColumn<String>('city', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_36(String aliasedName) =>
+    i1.GeneratedColumn<String>('state', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_37(String aliasedName) =>
+    i1.GeneratedColumn<String>('country', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<DateTime> _column_38(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('date_time_original', aliasedName, true,
+        type: i1.DriftSqlType.dateTime);
+i1.GeneratedColumn<String> _column_39(String aliasedName) =>
+    i1.GeneratedColumn<String>('description', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_40(String aliasedName) =>
+    i1.GeneratedColumn<String>('exposure_time', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<double> _column_41(String aliasedName) =>
+    i1.GeneratedColumn<double>('f_number', aliasedName, true,
+        type: i1.DriftSqlType.double);
+i1.GeneratedColumn<int> _column_42(String aliasedName) =>
+    i1.GeneratedColumn<int>('file_size', aliasedName, true,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<double> _column_43(String aliasedName) =>
+    i1.GeneratedColumn<double>('focal_length', aliasedName, true,
+        type: i1.DriftSqlType.double);
+i1.GeneratedColumn<double> _column_44(String aliasedName) =>
+    i1.GeneratedColumn<double>('latitude', aliasedName, true,
+        type: i1.DriftSqlType.double);
+i1.GeneratedColumn<double> _column_45(String aliasedName) =>
+    i1.GeneratedColumn<double>('longitude', aliasedName, true,
+        type: i1.DriftSqlType.double);
+i1.GeneratedColumn<int> _column_46(String aliasedName) =>
+    i1.GeneratedColumn<int>('iso', aliasedName, true,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<String> _column_47(String aliasedName) =>
+    i1.GeneratedColumn<String>('make', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_48(String aliasedName) =>
+    i1.GeneratedColumn<String>('model', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_49(String aliasedName) =>
+    i1.GeneratedColumn<String>('lens', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_50(String aliasedName) =>
+    i1.GeneratedColumn<String>('orientation', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_51(String aliasedName) =>
+    i1.GeneratedColumn<String>('time_zone', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<int> _column_52(String aliasedName) =>
+    i1.GeneratedColumn<int>('rating', aliasedName, true,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<String> _column_53(String aliasedName) =>
+    i1.GeneratedColumn<String>('projection_type', aliasedName, true,
+        type: i1.DriftSqlType.string);
+
+class Shape8 extends i0.VersionedTable {
+  Shape8({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get description =>
+      columnsByName['description']! as i1.GeneratedColumn<String>;
+  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<String> get ownerId =>
+      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get thumbnailAssetId =>
+      columnsByName['thumbnail_asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isActivityEnabled =>
+      columnsByName['is_activity_enabled']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<int> get order =>
+      columnsByName['order']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<String> _column_54(String aliasedName) =>
+    i1.GeneratedColumn<String>('description', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultValue: const CustomExpression('\'\''));
+i1.GeneratedColumn<String> _column_55(String aliasedName) =>
+    i1.GeneratedColumn<String>('thumbnail_asset_id', aliasedName, true,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES remote_asset_entity (id) ON DELETE SET NULL'));
+i1.GeneratedColumn<bool> _column_56(String aliasedName) =>
+    i1.GeneratedColumn<bool>('is_activity_enabled', aliasedName, false,
+        type: i1.DriftSqlType.bool,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'CHECK ("is_activity_enabled" IN (0, 1))'),
+        defaultValue: const CustomExpression('1'));
+i1.GeneratedColumn<int> _column_57(String aliasedName) =>
+    i1.GeneratedColumn<int>('order', aliasedName, false,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<String> _column_58(String aliasedName) =>
+    i1.GeneratedColumn<String>('album_id', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
+
+class Shape9 extends i0.VersionedTable {
+  Shape9({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get albumId =>
+      columnsByName['album_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get userId =>
+      columnsByName['user_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get role =>
+      columnsByName['role']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<int> _column_59(String aliasedName) =>
+    i1.GeneratedColumn<int>('role', aliasedName, false,
+        type: i1.DriftSqlType.int);
+
+class Shape10 extends i0.VersionedTable {
+  Shape10({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  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<DateTime> get deletedAt =>
+      columnsByName['deleted_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<String> get ownerId =>
+      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get type =>
+      columnsByName['type']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get data =>
+      columnsByName['data']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isSaved =>
+      columnsByName['is_saved']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<DateTime> get memoryAt =>
+      columnsByName['memory_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get seenAt =>
+      columnsByName['seen_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get showAt =>
+      columnsByName['show_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get hideAt =>
+      columnsByName['hide_at']! as i1.GeneratedColumn<DateTime>;
+}
+
+i1.GeneratedColumn<String> _column_60(String aliasedName) =>
+    i1.GeneratedColumn<String>('data', aliasedName, false,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<bool> _column_61(String aliasedName) =>
+    i1.GeneratedColumn<bool>('is_saved', aliasedName, false,
+        type: i1.DriftSqlType.bool,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'CHECK ("is_saved" IN (0, 1))'),
+        defaultValue: const CustomExpression('0'));
+i1.GeneratedColumn<DateTime> _column_62(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('memory_at', aliasedName, false,
+        type: i1.DriftSqlType.dateTime);
+i1.GeneratedColumn<DateTime> _column_63(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('seen_at', aliasedName, true,
+        type: i1.DriftSqlType.dateTime);
+i1.GeneratedColumn<DateTime> _column_64(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('show_at', aliasedName, true,
+        type: i1.DriftSqlType.dateTime);
+i1.GeneratedColumn<DateTime> _column_65(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('hide_at', aliasedName, true,
+        type: i1.DriftSqlType.dateTime);
+
+class Shape11 extends i0.VersionedTable {
+  Shape11({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get assetId =>
+      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get memoryId =>
+      columnsByName['memory_id']! as i1.GeneratedColumn<String>;
+}
+
+i1.GeneratedColumn<String> _column_66(String aliasedName) =>
+    i1.GeneratedColumn<String>('memory_id', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES memory_entity (id) ON DELETE CASCADE'));
+
+class Shape12 extends i0.VersionedTable {
+  Shape12({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  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<String> get ownerId =>
+      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get primaryAssetId =>
+      columnsByName['primary_asset_id']! as i1.GeneratedColumn<String>;
+}
+
+i1.GeneratedColumn<String> _column_67(String aliasedName) =>
+    i1.GeneratedColumn<String>('primary_asset_id', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES remote_asset_entity (id)'));
+i0.MigrationStepWithVersion migrationSteps({
+  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
+}) {
+  return (currentVersion, database) async {
+    switch (currentVersion) {
+      case 1:
+        final schema = Schema2(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from1To2(migrator, schema);
+        return 2;
+      default:
+        throw ArgumentError.value('Unknown migration from $currentVersion');
+    }
+  };
+}
+
+i1.OnUpgrade stepByStep({
+  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
+}) =>
+    i0.VersionedSchema.stepByStepHelper(
+        step: migrationSteps(
+      from1To2: from1To2,
+    ));
diff --git a/mobile/lib/pages/common/change_experience.page.dart b/mobile/lib/pages/common/change_experience.page.dart
new file mode 100644
index 0000000000..c54f627b61
--- /dev/null
+++ b/mobile/lib/pages/common/change_experience.page.dart
@@ -0,0 +1,126 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/album/album.provider.dart';
+import 'package:immich_mobile/providers/asset.provider.dart';
+import 'package:immich_mobile/providers/background_sync.provider.dart';
+import 'package:immich_mobile/providers/gallery_permission.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/migration.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+@RoutePage()
+class ChangeExperiencePage extends ConsumerStatefulWidget {
+  final bool switchingToBeta;
+
+  const ChangeExperiencePage({super.key, required this.switchingToBeta});
+
+  @override
+  ConsumerState createState() => _ChangeExperiencePageState();
+}
+
+class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
+  bool hasMigrated = false;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) => _handleMigration());
+  }
+
+  Future<void> _handleMigration() async {
+    if (widget.switchingToBeta) {
+      final assetNotifier = ref.read(assetProvider.notifier);
+      if (assetNotifier.mounted) {
+        assetNotifier.dispose();
+      }
+      final albumNotifier = ref.read(albumProvider.notifier);
+      if (albumNotifier.mounted) {
+        albumNotifier.dispose();
+      }
+
+      final permission = await ref
+          .read(galleryPermissionNotifier.notifier)
+          .requestGalleryPermission();
+
+      if (permission.isGranted) {
+        await ref.read(backgroundSyncProvider).syncLocal(full: true);
+        await migrateDeviceAssetToSqlite(
+          ref.read(isarProvider),
+          ref.read(driftProvider),
+        );
+      }
+    } else {
+      await ref.read(backgroundSyncProvider).cancel();
+    }
+
+    Future.delayed(const Duration(seconds: 3), () {
+      context.replaceRoute(
+        widget.switchingToBeta
+            ? const TabShellRoute()
+            : const TabControllerRoute(),
+      );
+    });
+
+    if (mounted) {
+      setState(() {
+        HapticFeedback.heavyImpact();
+        hasMigrated = true;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            AnimatedSwitcher(
+              duration: Durations.long4,
+              child: hasMigrated
+                  ? const Icon(
+                      Icons.check_circle_rounded,
+                      color: Colors.green,
+                      size: 48.0,
+                    )
+                  : const SizedBox(
+                      width: 50.0,
+                      height: 50.0,
+                      child: CircularProgressIndicator(),
+                    ),
+            ),
+            const SizedBox(height: 16.0),
+            Center(
+              child: Column(
+                children: [
+                  SizedBox(
+                    width: 300.0,
+                    child: AnimatedSwitcher(
+                      duration: Durations.long4,
+                      child: hasMigrated
+                          ? Text(
+                              "Migration success. Navigating to the new timeline...",
+                              style: context.textTheme.titleMedium,
+                              textAlign: TextAlign.center,
+                            )
+                          : Text(
+                              "Data migration in progress...\nPlease wait and don't close this page",
+                              style: context.textTheme.titleMedium,
+                              textAlign: TextAlign.center,
+                            ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/pages/common/settings.page.dart b/mobile/lib/pages/common/settings.page.dart
index 6fc4cf5d88..42d555a2ee 100644
--- a/mobile/lib/pages/common/settings.page.dart
+++ b/mobile/lib/pages/common/settings.page.dart
@@ -8,6 +8,7 @@ import 'package:immich_mobile/widgets/settings/advanced_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_list_settings/asset_list_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_viewer_settings/asset_viewer_settings.dart';
 import 'package:immich_mobile/widgets/settings/backup_settings/backup_settings.dart';
+import 'package:immich_mobile/widgets/settings/beta_timeline_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/language_settings.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/networking_settings.dart';
 import 'package:immich_mobile/widgets/settings/notification_setting.dart';
@@ -94,55 +95,59 @@ class _MobileLayout extends StatelessWidget {
   const _MobileLayout();
   @override
   Widget build(BuildContext context) {
+    final List<Widget> settings = SettingSection.values
+        .map(
+          (setting) => Padding(
+            padding: const EdgeInsets.symmetric(
+              horizontal: 16.0,
+            ),
+            child: Card(
+              elevation: 0,
+              clipBehavior: Clip.antiAlias,
+              color: context.colorScheme.surfaceContainer,
+              shape: const RoundedRectangleBorder(
+                borderRadius: BorderRadius.all(Radius.circular(16)),
+              ),
+              margin: const EdgeInsets.symmetric(vertical: 4.0),
+              child: ListTile(
+                contentPadding: const EdgeInsets.symmetric(
+                  horizontal: 16.0,
+                ),
+                leading: Container(
+                  decoration: BoxDecoration(
+                    borderRadius: const BorderRadius.all(Radius.circular(16)),
+                    color: context.isDarkTheme
+                        ? Colors.black26
+                        : Colors.white.withAlpha(100),
+                  ),
+                  padding: const EdgeInsets.all(16.0),
+                  child: Icon(setting.icon, color: context.primaryColor),
+                ),
+                title: Text(
+                  setting.title,
+                  style: context.textTheme.titleMedium!.copyWith(
+                    fontWeight: FontWeight.w600,
+                    color: context.primaryColor,
+                  ),
+                ).tr(),
+                subtitle: Text(
+                  setting.subtitle,
+                  style: context.textTheme.labelLarge,
+                ).tr(),
+                onTap: () =>
+                    context.pushRoute(SettingsSubRoute(section: setting)),
+              ),
+            ),
+          ),
+        )
+        .toList();
     return ListView(
       physics: const ClampingScrollPhysics(),
       padding: const EdgeInsets.symmetric(vertical: 10.0),
-      children: SettingSection.values
-          .map(
-            (setting) => Padding(
-              padding: const EdgeInsets.symmetric(
-                horizontal: 16.0,
-              ),
-              child: Card(
-                elevation: 0,
-                clipBehavior: Clip.antiAlias,
-                color: context.colorScheme.surfaceContainer,
-                shape: const RoundedRectangleBorder(
-                  borderRadius: BorderRadius.all(Radius.circular(16)),
-                ),
-                margin: const EdgeInsets.symmetric(vertical: 4.0),
-                child: ListTile(
-                  contentPadding: const EdgeInsets.symmetric(
-                    horizontal: 16.0,
-                  ),
-                  leading: Container(
-                    decoration: BoxDecoration(
-                      borderRadius: const BorderRadius.all(Radius.circular(16)),
-                      color: context.isDarkTheme
-                          ? Colors.black26
-                          : Colors.white.withAlpha(100),
-                    ),
-                    padding: const EdgeInsets.all(16.0),
-                    child: Icon(setting.icon, color: context.primaryColor),
-                  ),
-                  title: Text(
-                    setting.title,
-                    style: context.textTheme.titleMedium!.copyWith(
-                      fontWeight: FontWeight.w600,
-                      color: context.primaryColor,
-                    ),
-                  ).tr(),
-                  subtitle: Text(
-                    setting.subtitle,
-                    style: context.textTheme.labelLarge,
-                  ).tr(),
-                  onTap: () =>
-                      context.pushRoute(SettingsSubRoute(section: setting)),
-                ),
-              ),
-            ),
-          )
-          .toList(),
+      children: [
+        const BetaTimelineListTile(),
+        ...settings,
+      ],
     );
   }
 }
diff --git a/mobile/lib/pages/common/splash_screen.page.dart b/mobile/lib/pages/common/splash_screen.page.dart
index 4b7a10d612..598e920651 100644
--- a/mobile/lib/pages/common/splash_screen.page.dart
+++ b/mobile/lib/pages/common/splash_screen.page.dart
@@ -73,7 +73,15 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     }
 
     if (context.router.current.name == SplashScreenRoute.name) {
-      context.replaceRoute(const TabControllerRoute());
+      context.replaceRoute(
+        Store.isBetaTimelineEnabled
+            ? const TabShellRoute()
+            : const TabControllerRoute(),
+      );
+    }
+
+    if (Store.isBetaTimelineEnabled) {
+      return;
     }
 
     final hasPermission =
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index edaec6d336..c8ca7ea061 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -10,13 +10,28 @@ 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';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/migration.dart';
 
 @RoutePage()
-class TabShellPage extends ConsumerWidget {
+class TabShellPage extends ConsumerStatefulWidget {
   const TabShellPage({super.key});
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  ConsumerState<TabShellPage> createState() => _TabShellPageState();
+}
+
+class _TabShellPageState extends ConsumerState<TabShellPage> {
+  @override
+  void initState() {
+    super.initState();
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      runNewSync(ref, full: true);
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
     final isScreenLandscape = context.orientation == Orientation.landscape;
 
     Widget buildIcon({required Widget icon, required bool isProcessing}) {
diff --git a/mobile/lib/pages/share_intent/share_intent.page.dart b/mobile/lib/pages/share_intent/share_intent.page.dart
index 3ff1b0c8ce..11c114e4a6 100644
--- a/mobile/lib/pages/share_intent/share_intent.page.dart
+++ b/mobile/lib/pages/share_intent/share_intent.page.dart
@@ -3,6 +3,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/upload/share_intent_attachment.model.dart';
 import 'package:immich_mobile/pages/common/large_leading_tile.dart';
@@ -75,7 +76,9 @@ class ShareIntentPage extends HookConsumerWidget {
         leading: IconButton(
           onPressed: () {
             context.navigateTo(
-              const TabControllerRoute(),
+              Store.isBetaTimelineEnabled
+                  ? const TabShellRoute()
+                  : const TabControllerRoute(),
             );
           },
           icon: const Icon(Icons.arrow_back),
diff --git a/mobile/lib/providers/app_life_cycle.provider.dart b/mobile/lib/providers/app_life_cycle.provider.dart
index 3ec7813e2f..b4b7b0d406 100644
--- a/mobile/lib/providers/app_life_cycle.provider.dart
+++ b/mobile/lib/providers/app_life_cycle.provider.dart
@@ -3,10 +3,12 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/models/backup/backup_state.model.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
 import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
+import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/backup/ios_background_settings.provider.dart';
 import 'package:immich_mobile/providers/backup/manual_upload.provider.dart';
@@ -18,6 +20,7 @@ import 'package:immich_mobile/providers/tab.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/services/background.service.dart';
 import 'package:isar/isar.dart';
+import 'package:logging/logging.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 enum AppLifeCycleEnum {
@@ -57,29 +60,59 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
         debugPrint("Using server URL: $endpoint");
       }
 
-      final permission = _ref.watch(galleryPermissionNotifier);
-      if (permission.isGranted || permission.isLimited) {
-        await _ref.read(backupProvider.notifier).resumeBackup();
-        await _ref.read(backgroundServiceProvider).resumeServiceIfEnabled();
+      if (!Store.isBetaTimelineEnabled) {
+        final permission = _ref.watch(galleryPermissionNotifier);
+        if (permission.isGranted || permission.isLimited) {
+          await _ref.read(backupProvider.notifier).resumeBackup();
+          await _ref.read(backgroundServiceProvider).resumeServiceIfEnabled();
+        }
       }
 
       await _ref.read(serverInfoProvider.notifier).getServerVersion();
     }
 
-    switch (_ref.read(tabProvider)) {
-      case TabEnum.home:
-        await _ref.read(assetProvider.notifier).getAllAsset();
-        break;
-      case TabEnum.search:
-        // nothing to do
-        break;
+    if (!Store.isBetaTimelineEnabled) {
+      switch (_ref.read(tabProvider)) {
+        case TabEnum.home:
+          await _ref.read(assetProvider.notifier).getAllAsset();
+          break;
+        case TabEnum.search:
+          // nothing to do
+          break;
 
-      case TabEnum.albums:
-        await _ref.read(albumProvider.notifier).refreshRemoteAlbums();
-        break;
-      case TabEnum.library:
-        // nothing to do
-        break;
+        case TabEnum.albums:
+          await _ref.read(albumProvider.notifier).refreshRemoteAlbums();
+          break;
+        case TabEnum.library:
+          // nothing to do
+          break;
+      }
+    } else {
+      _ref.read(backupProvider.notifier).cancelBackup();
+
+      final backgroundManager = _ref.read(backgroundSyncProvider);
+      // Ensure proper cleanup before starting new background tasks
+      try {
+        await Future.wait([
+          backgroundManager.syncLocal().then(
+            (_) {
+              Logger("AppLifeCycleNotifier")
+                  .fine("Hashing assets after syncLocal");
+              // Check if app is still active before hashing
+              if (state == AppLifeCycleEnum.resumed) {
+                backgroundManager.hashAssets();
+              }
+            },
+          ),
+          backgroundManager.syncRemote(),
+        ]);
+      } catch (e, stackTrace) {
+        Logger("AppLifeCycleNotifier").severe(
+          "Error during background sync",
+          e,
+          stackTrace,
+        );
+      }
     }
 
     _ref.read(websocketProvider.notifier).connect();
@@ -92,9 +125,11 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
         .read(galleryPermissionNotifier.notifier)
         .getGalleryPermissionStatus();
 
-    await _ref.read(iOSBackgroundSettingsProvider.notifier).refresh();
+    if (!Store.isBetaTimelineEnabled) {
+      await _ref.read(iOSBackgroundSettingsProvider.notifier).refresh();
 
-    _ref.invalidate(memoryFutureProvider);
+      _ref.invalidate(memoryFutureProvider);
+    }
   }
 
   void handleAppInactivity() {
@@ -106,7 +141,8 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
     state = AppLifeCycleEnum.paused;
     _wasPaused = true;
 
-    if (_ref.read(authProvider).isAuthenticated) {
+    if (!Store.isBetaTimelineEnabled &&
+        _ref.read(authProvider).isAuthenticated) {
       // Do not cancel backup if manual upload is in progress
       if (_ref.read(backupProvider.notifier).backupProgress !=
           BackUpProgressEnum.manualInProgress) {
@@ -115,15 +151,43 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
       _ref.read(websocketProvider.notifier).disconnect();
     }
 
-    LogService.I.flush();
+    try {
+      LogService.I.flush();
+    } catch (e) {
+      // Ignore flush errors during pause
+    }
   }
 
   Future<void> handleAppDetached() async {
     state = AppLifeCycleEnum.detached;
-    LogService.I.flush();
-    await Isar.getInstance()?.close();
+
+    // Flush logs before closing database
+    try {
+      LogService.I.flush();
+    } catch (e) {
+      // Ignore flush errors during shutdown
+    }
+
+    // Close Isar database safely
+    try {
+      final isar = Isar.getInstance();
+      if (isar != null && isar.isOpen) {
+        await isar.close();
+      }
+    } catch (e) {
+      // Ignore close errors during shutdown
+    }
+
+    if (Store.isBetaTimelineEnabled) {
+      return;
+    }
+
     // no guarantee this is called at all
-    _ref.read(manualUploadProvider.notifier).cancelBackup();
+    try {
+      _ref.read(manualUploadProvider.notifier).cancelBackup();
+    } catch (e) {
+      // Ignore errors during shutdown
+    }
   }
 
   void handleAppHidden() {
diff --git a/mobile/lib/providers/infrastructure/db.provider.dart b/mobile/lib/providers/infrastructure/db.provider.dart
index 4eefbc556c..cdf934e508 100644
--- a/mobile/lib/providers/infrastructure/db.provider.dart
+++ b/mobile/lib/providers/infrastructure/db.provider.dart
@@ -13,5 +13,6 @@ Isar isar(Ref ref) => throw UnimplementedError('isar');
 final driftProvider = Provider<Drift>((ref) {
   final drift = Drift();
   ref.onDispose(() => unawaited(drift.close()));
+  ref.keepAlive();
   return drift;
 });
diff --git a/mobile/lib/repositories/auth.repository.dart b/mobile/lib/repositories/auth.repository.dart
index 4ee4d8c131..eb86e1809f 100644
--- a/mobile/lib/repositories/auth.repository.dart
+++ b/mobile/lib/repositories/auth.repository.dart
@@ -24,7 +24,25 @@ class AuthRepository extends DatabaseRepository {
 
   const AuthRepository(super.db, this._drift);
 
-  Future<void> clearLocalData() {
+  Future<void> clearLocalData() async {
+    // Drift deletions - child entities first (those with foreign keys)
+    await Future.wait([
+      _drift.memoryAssetEntity.deleteAll(),
+      _drift.remoteAlbumAssetEntity.deleteAll(),
+      _drift.remoteAlbumUserEntity.deleteAll(),
+      _drift.remoteExifEntity.deleteAll(),
+      _drift.userMetadataEntity.deleteAll(),
+      _drift.partnerEntity.deleteAll(),
+      _drift.stackEntity.deleteAll(),
+    ]);
+    // Drift deletions - parent entities
+    await Future.wait([
+      _drift.memoryEntity.deleteAll(),
+      _drift.remoteAlbumEntity.deleteAll(),
+      _drift.remoteAssetEntity.deleteAll(),
+      _drift.userEntity.deleteAll(),
+    ]);
+
     return db.writeTxn(() {
       return Future.wait([
         db.assets.clear(),
@@ -32,17 +50,6 @@ class AuthRepository extends DatabaseRepository {
         db.albums.clear(),
         db.eTags.clear(),
         db.users.clear(),
-        _drift.remoteAssetEntity.deleteAll(),
-        _drift.remoteExifEntity.deleteAll(),
-        _drift.userEntity.deleteAll(),
-        _drift.userMetadataEntity.deleteAll(),
-        _drift.partnerEntity.deleteAll(),
-        _drift.remoteAlbumEntity.deleteAll(),
-        _drift.remoteAlbumAssetEntity.deleteAll(),
-        _drift.remoteAlbumUserEntity.deleteAll(),
-        _drift.memoryEntity.deleteAll(),
-        _drift.memoryAssetEntity.deleteAll(),
-        _drift.stackEntity.deleteAll(),
       ]);
     });
   }
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index ddd630727d..a6666ec6eb 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -29,6 +29,7 @@ import 'package:immich_mobile/pages/backup/failed_backup_status.page.dart';
 import 'package:immich_mobile/pages/common/activities.page.dart';
 import 'package:immich_mobile/pages/common/app_log.page.dart';
 import 'package:immich_mobile/pages/common/app_log_detail.page.dart';
+import 'package:immich_mobile/pages/common/change_experience.page.dart';
 import 'package:immich_mobile/pages/common/create_album.page.dart';
 import 'package:immich_mobile/pages/common/gallery_viewer.page.dart';
 import 'package:immich_mobile/pages/common/headers_settings.page.dart';
@@ -69,27 +70,27 @@ import 'package:immich_mobile/pages/search/person_result.page.dart';
 import 'package:immich_mobile/pages/search/recently_taken.page.dart';
 import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_archive.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_asset_selection_timeline.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_create_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_favorite.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_partner_detail.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_library.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_local_album.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_locked_folder.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_memory.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_partner_detail.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_place.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_place_detail.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_recently_taken.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_user_selection.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_video.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_trash.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_archive.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_locked_folder.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.dart';
-import 'package:immich_mobile/presentation/pages/local_timeline.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_remote_album.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_library.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_asset_selection_timeline.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_create_album.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_memory.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_trash.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_video.page.dart';
+import 'package:immich_mobile/presentation/pages/local_timeline.page.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.page.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
@@ -103,7 +104,6 @@ import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/local_auth.service.dart';
 import 'package:immich_mobile/services/secure_storage.service.dart';
 import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
-
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 part 'router.gr.dart';
@@ -469,6 +469,10 @@ class AppRouter extends RootStackRouter {
       guards: [_authGuard, _duplicateGuard],
     ),
 
+    AutoRoute(
+      page: ChangeExperienceRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index a8a26836c7..7412e1dee5 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -503,6 +503,49 @@ class BackupOptionsRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [ChangeExperiencePage]
+class ChangeExperienceRoute extends PageRouteInfo<ChangeExperienceRouteArgs> {
+  ChangeExperienceRoute({
+    Key? key,
+    required bool switchingToBeta,
+    List<PageRouteInfo>? children,
+  }) : super(
+          ChangeExperienceRoute.name,
+          args: ChangeExperienceRouteArgs(
+            key: key,
+            switchingToBeta: switchingToBeta,
+          ),
+          initialChildren: children,
+        );
+
+  static const String name = 'ChangeExperienceRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<ChangeExperienceRouteArgs>();
+      return ChangeExperiencePage(
+        key: args.key,
+        switchingToBeta: args.switchingToBeta,
+      );
+    },
+  );
+}
+
+class ChangeExperienceRouteArgs {
+  const ChangeExperienceRouteArgs({this.key, required this.switchingToBeta});
+
+  final Key? key;
+
+  final bool switchingToBeta;
+
+  @override
+  String toString() {
+    return 'ChangeExperienceRouteArgs{key: $key, switchingToBeta: $switchingToBeta}';
+  }
+}
+
 /// generated route for
 /// [ChangePasswordPage]
 class ChangePasswordRoute extends PageRouteInfo<void> {
diff --git a/mobile/lib/services/app_settings.service.dart b/mobile/lib/services/app_settings.service.dart
index 8d1f7c24a5..982dab1cae 100644
--- a/mobile/lib/services/app_settings.service.dart
+++ b/mobile/lib/services/app_settings.service.dart
@@ -90,6 +90,7 @@ enum AppSettingsEnum<T> {
     null,
     true,
   ),
+  betaTimeline<bool>(StoreKey.betaTimeline, null, false),
   ;
 
   const AppSettingsEnum(this.storeKey, this.hiveKey, this.defaultValue);
diff --git a/mobile/lib/utils/isolate.dart b/mobile/lib/utils/isolate.dart
index 6b20fa7f37..2263bf3d76 100644
--- a/mobile/lib/utils/isolate.dart
+++ b/mobile/lib/utils/isolate.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:ui';
 
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
@@ -59,9 +60,18 @@ Cancelable<T?> runInIsolateGentle<T>({
         stack,
       );
     } finally {
-      await LogService.I.flushBuffer();
-      ref.read(driftProvider).close();
-      ref.read(isarProvider).close();
+      try {
+        await LogService.I.flushBuffer();
+        await ref.read(driftProvider).close();
+        await ref.read(isarProvider).close();
+        ref.dispose();
+      } catch (error) {
+        debugPrint("Error closing resources in isolate: $error");
+      } finally {
+        ref.dispose();
+        // Delay to ensure all resources are released
+        await Future.delayed(const Duration(seconds: 2));
+      }
     }
     return null;
   });
diff --git a/mobile/lib/utils/migration.dart b/mobile/lib/utils/migration.dart
index 3ec8ce5bbc..d09f2b9978 100644
--- a/mobile/lib/utils/migration.dart
+++ b/mobile/lib/utils/migration.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:drift/drift.dart';
 import 'package:flutter/foundation.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
@@ -18,12 +19,15 @@ import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.d
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/providers/background_sync.provider.dart';
+import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:isar/isar.dart';
+import 'package:logging/logging.dart';
 // ignore: import_rule_photo_manager
 import 'package:photo_manager/photo_manager.dart';
 
-const int targetVersion = 13;
+const int targetVersion = 14;
 
 Future<void> migrateDatabaseIfNeeded(Isar db) async {
   final int version = Store.get(StoreKey.version, targetVersion);
@@ -48,18 +52,22 @@ Future<void> migrateDatabaseIfNeeded(Isar db) async {
     await _migrateDeviceAsset(db);
   }
 
-  if (version < 12 && (!kReleaseMode)) {
+  if (version < 13) {
+    await Store.put(StoreKey.photoManagerCustomFilter, true);
+  }
+
+  if (version < 14) {
+    if (!Store.isBetaTimelineEnabled) {
+      // Try again when beta timeline is enabled and the app is restarted
+      return;
+    }
     final backgroundSync = BackgroundSyncManager();
     await backgroundSync.syncLocal();
     final drift = Drift();
-    await _migrateDeviceAssetToSqlite(db, drift);
+    await migrateDeviceAssetToSqlite(db, drift);
     await drift.close();
   }
 
-  if (version < 13) {
-    await Store.put(StoreKey.photoManagerCustomFilter, true);
-  }
-
   if (targetVersion >= 12) {
     await Store.put(StoreKey.version, targetVersion);
     return;
@@ -175,33 +183,24 @@ Future<void> _migrateDeviceAsset(Isar db) async {
   });
 }
 
-Future<void> _migrateDeviceAssetToSqlite(Isar db, Drift drift) async {
+Future<void> migrateDeviceAssetToSqlite(Isar db, Drift drift) async {
   try {
-    final isarDeviceAssets =
-        await db.deviceAssetEntitys.where().sortByAssetId().findAll();
+    final isarDeviceAssets = await db.deviceAssetEntitys.where().findAll();
     await drift.batch((batch) {
       for (final deviceAsset in isarDeviceAssets) {
-        final companion = LocalAssetEntityCompanion(
-          updatedAt: Value(deviceAsset.modifiedTime),
-          id: Value(deviceAsset.assetId),
-          checksum: Value(base64.encode(deviceAsset.hash)),
-        );
-        batch.insert<$LocalAssetEntityTable, LocalAssetEntityData>(
+        batch.update(
           drift.localAssetEntity,
-          companion,
-          onConflict: DoUpdate(
-            (_) => companion,
-            where: (old) => old.updatedAt.equals(deviceAsset.modifiedTime),
+          LocalAssetEntityCompanion(
+            checksum: Value(base64.encode(deviceAsset.hash)),
           ),
+          where: (t) => t.id.equals(deviceAsset.assetId),
         );
       }
     });
   } catch (error) {
-    if (kDebugMode) {
-      debugPrint(
-        "[MIGRATION] Error while migrating device assets to SQLite: $error",
-      );
-    }
+    debugPrint(
+      "[MIGRATION] Error while migrating device assets to SQLite: $error",
+    );
   }
 }
 
@@ -212,3 +211,18 @@ class _DeviceAsset {
 
   const _DeviceAsset({required this.assetId, this.hash, this.dateTime});
 }
+
+Future<void> runNewSync(WidgetRef ref, {bool full = false}) async {
+  ref.read(backupProvider.notifier).cancelBackup();
+
+  final backgroundManager = ref.read(backgroundSyncProvider);
+  Future.wait([
+    backgroundManager.syncLocal(full: full).then(
+      (_) {
+        Logger("runNewSync").fine("Hashing assets after syncLocal");
+        backgroundManager.hashAssets();
+      },
+    ),
+    backgroundManager.syncRemote(),
+  ]);
+}
diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
index c2c5b79753..5ab60c913c 100644
--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -6,7 +6,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/backup/backup_state.model.dart';
 import 'package:immich_mobile/models/server_info/server_info.model.dart';
-import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
@@ -51,7 +50,6 @@ class ImmichSliverAppBar extends ConsumerWidget {
         pinned: pinned,
         snap: snap,
         expandedHeight: expandedHeight,
-        backgroundColor: context.colorScheme.surfaceContainer,
         shape: const RoundedRectangleBorder(
           borderRadius: BorderRadius.all(
             Radius.circular(5),
@@ -68,24 +66,6 @@ class ImmichSliverAppBar extends ConsumerWidget {
                 child: action,
               ),
             ),
-          IconButton(
-            icon: const Icon(Icons.swipe_left_alt_rounded),
-            onPressed: () => context.pop(),
-          ),
-          IconButton(
-            onPressed: () {
-              ref.read(backgroundSyncProvider).syncLocal(full: true);
-              ref.read(backgroundSyncProvider).syncRemote();
-
-              Future.delayed(
-                const Duration(seconds: 10),
-                () => ref.read(backgroundSyncProvider).hashAssets(),
-              );
-            },
-            icon: const Icon(
-              Icons.sync,
-            ),
-          ),
           if (isCasting)
             Padding(
               padding: const EdgeInsets.only(right: 12),
@@ -127,13 +107,30 @@ class _ImmichLogoWithText extends StatelessWidget {
           children: [
             Builder(
               builder: (context) {
-                return Padding(
-                  padding: const EdgeInsets.only(top: 3.0),
-                  child: SvgPicture.asset(
-                    context.isDarkTheme
-                        ? 'assets/immich-logo-inline-dark.svg'
-                        : 'assets/immich-logo-inline-light.svg',
-                    height: 40,
+                return Badge(
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 6, vertical: 4),
+                  backgroundColor: context.primaryColor,
+                  alignment: Alignment.centerRight,
+                  offset: const Offset(16, -8),
+                  label: Text(
+                    'β',
+                    style: TextStyle(
+                      fontSize: 11,
+                      color: context.colorScheme.onPrimary,
+                      fontWeight: FontWeight.bold,
+                      fontFamily: 'OverpassMono',
+                      height: 1.2,
+                    ),
+                  ),
+                  child: Padding(
+                    padding: const EdgeInsets.only(top: 3.0),
+                    child: SvgPicture.asset(
+                      context.isDarkTheme
+                          ? 'assets/immich-logo-inline-dark.svg'
+                          : 'assets/immich-logo-inline-light.svg',
+                      height: 40,
+                    ),
                   ),
                 );
               },
diff --git a/mobile/lib/widgets/forms/login/login_form.dart b/mobile/lib/widgets/forms/login/login_form.dart
index 8ccd69930a..24a73b2cbc 100644
--- a/mobile/lib/widgets/forms/login/login_form.dart
+++ b/mobile/lib/widgets/forms/login/login_form.dart
@@ -10,6 +10,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
@@ -17,6 +18,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/routing/router.dart';
+import 'package:immich_mobile/utils/migration.dart';
 import 'package:immich_mobile/utils/provider_utils.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
 import 'package:immich_mobile/utils/version_compatibility.dart';
@@ -192,6 +194,15 @@ class LoginForm extends HookConsumerWidget {
         if (result.shouldChangePassword && !result.isAdmin) {
           context.pushRoute(const ChangePasswordRoute());
         } else {
+          final isBeta = Store.isBetaTimelineEnabled;
+          if (isBeta) {
+            await ref
+                .read(galleryPermissionNotifier.notifier)
+                .requestGalleryPermission();
+            await runNewSync(ref);
+            context.replaceRoute(const TabShellRoute());
+            return;
+          }
           context.replaceRoute(const TabControllerRoute());
         }
       } catch (error) {
@@ -292,9 +303,18 @@ class LoginForm extends HookConsumerWidget {
           if (isSuccess) {
             isLoading.value = false;
             final permission = ref.watch(galleryPermissionNotifier);
-            if (permission.isGranted || permission.isLimited) {
+            final isBeta = Store.isBetaTimelineEnabled;
+            if (!isBeta && (permission.isGranted || permission.isLimited)) {
               ref.watch(backupProvider.notifier).resumeBackup();
             }
+            if (isBeta) {
+              await ref
+                  .read(galleryPermissionNotifier.notifier)
+                  .requestGalleryPermission();
+              await runNewSync(ref);
+              context.replaceRoute(const TabShellRoute());
+              return;
+            }
             context.replaceRoute(const TabControllerRoute());
           }
         } catch (error, stack) {
diff --git a/mobile/lib/widgets/settings/beta_timeline_list_tile.dart b/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
new file mode 100644
index 0000000000..967c7f3e13
--- /dev/null
+++ b/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
@@ -0,0 +1,269 @@
+import 'dart:math' as math;
+
+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/translate_extensions.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
+
+class BetaTimelineListTile extends ConsumerStatefulWidget {
+  const BetaTimelineListTile({
+    super.key,
+  });
+
+  @override
+  ConsumerState<BetaTimelineListTile> createState() =>
+      _BetaTimelineListTileState();
+}
+
+class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _animationController;
+  late Animation<double> _rotationAnimation;
+  late Animation<double> _pulseAnimation;
+  late Animation<double> _gradientAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+    _animationController = AnimationController(
+      duration: const Duration(seconds: 3),
+      vsync: this,
+    );
+
+    _rotationAnimation = Tween<double>(begin: 0, end: 2 * math.pi).animate(
+      CurvedAnimation(
+        parent: _animationController,
+        curve: Curves.linear,
+      ),
+    );
+
+    _pulseAnimation = Tween<double>(begin: 1, end: 1.1).animate(
+      CurvedAnimation(
+        parent: _animationController,
+        curve: Curves.easeInOut,
+      ),
+    );
+
+    _gradientAnimation = Tween<double>(begin: 0, end: 1).animate(
+      CurvedAnimation(
+        parent: _animationController,
+        curve: Curves.easeInOut,
+      ),
+    );
+
+    _animationController.repeat(reverse: true);
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final betaTimelineValue = ref
+        .watch(appSettingsServiceProvider)
+        .getSetting<bool>(AppSettingsEnum.betaTimeline);
+
+    return AnimatedBuilder(
+      animation: _animationController,
+      builder: (context, child) {
+        void onSwitchChanged(bool value) {
+          showDialog(
+            context: context,
+            builder: (context) {
+              return AlertDialog(
+                title: value
+                    ? const Text("Enable Beta Timeline")
+                    : const Text("Disable Beta Timeline"),
+                content: value
+                    ? const Text(
+                        "Are you sure you want to enable the beta timeline?",
+                      )
+                    : const Text(
+                        "Are you sure you want to disable the beta timeline?",
+                      ),
+                actions: [
+                  TextButton(
+                    onPressed: () async {
+                      Navigator.of(context).pop();
+                      await ref.read(appSettingsServiceProvider).setSetting(
+                            AppSettingsEnum.betaTimeline,
+                            value,
+                          );
+                      context.router.replaceAll(
+                        [ChangeExperienceRoute(switchingToBeta: value)],
+                      );
+                    },
+                    child: const Text("Yes"),
+                  ),
+                  TextButton(
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                    child: const Text("No"),
+                  ),
+                ],
+              );
+            },
+          );
+        }
+
+        final gradientColors = [
+          Color.lerp(
+            context.primaryColor.withValues(alpha: 0.3),
+            context.primaryColor.withValues(alpha: 0.1),
+            _gradientAnimation.value,
+          )!,
+          Color.lerp(
+            context.primaryColor.withValues(alpha: 0.2),
+            context.primaryColor.withValues(alpha: 0.4),
+            _gradientAnimation.value,
+          )!,
+          Color.lerp(
+            context.primaryColor.withValues(alpha: 0.1),
+            context.primaryColor.withValues(alpha: 0.3),
+            _gradientAnimation.value,
+          )!,
+        ];
+
+        return Container(
+          margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+          decoration: BoxDecoration(
+            borderRadius: const BorderRadius.all(Radius.circular(12)),
+            gradient: LinearGradient(
+              colors: gradientColors,
+              stops: const [0.0, 0.5, 1.0],
+              begin: Alignment.topLeft,
+              end: Alignment.bottomRight,
+              transform: GradientRotation(_rotationAnimation.value * 0.1),
+            ),
+            boxShadow: [
+              BoxShadow(
+                color: context.primaryColor.withValues(alpha: 0.1),
+                blurRadius: 8,
+                offset: const Offset(0, 2),
+              ),
+            ],
+          ),
+          child: Container(
+            margin: const EdgeInsets.all(1.5),
+            decoration: BoxDecoration(
+              borderRadius: const BorderRadius.all(Radius.circular(10.5)),
+              color: context.scaffoldBackgroundColor,
+            ),
+            child: Material(
+              color: Colors.transparent,
+              borderRadius: const BorderRadius.all(Radius.circular(10.5)),
+              child: InkWell(
+                borderRadius: const BorderRadius.all(Radius.circular(10.5)),
+                onTap: () => onSwitchChanged(!betaTimelineValue),
+                child: Padding(
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
+                  child: Row(
+                    children: [
+                      Transform.scale(
+                        scale: _pulseAnimation.value,
+                        child: Transform.rotate(
+                          angle: _rotationAnimation.value * 0.02,
+                          child: Container(
+                            padding: const EdgeInsets.all(8),
+                            decoration: BoxDecoration(
+                              shape: BoxShape.circle,
+                              gradient: LinearGradient(
+                                colors: [
+                                  context.primaryColor.withValues(alpha: 0.2),
+                                  context.primaryColor.withValues(alpha: 0.1),
+                                ],
+                              ),
+                            ),
+                            child: Icon(
+                              Icons.auto_awesome,
+                              color: context.primaryColor,
+                              size: 20,
+                            ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(width: 16),
+                      Expanded(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Row(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                Text(
+                                  "advanced_settings_beta_timeline_title"
+                                      .t(context: context),
+                                  style:
+                                      context.textTheme.titleMedium?.copyWith(
+                                    fontWeight: FontWeight.w600,
+                                  ),
+                                ),
+                                const SizedBox(width: 8),
+                                Container(
+                                  padding: const EdgeInsets.symmetric(
+                                    horizontal: 6,
+                                    vertical: 2,
+                                  ),
+                                  decoration: BoxDecoration(
+                                    borderRadius: const BorderRadius.all(
+                                      Radius.circular(8),
+                                    ),
+                                    gradient: LinearGradient(
+                                      colors: [
+                                        context.primaryColor
+                                            .withValues(alpha: 0.8),
+                                        context.primaryColor
+                                            .withValues(alpha: 0.6),
+                                      ],
+                                    ),
+                                  ),
+                                  child: Text(
+                                    'NEW',
+                                    style:
+                                        context.textTheme.labelSmall?.copyWith(
+                                      color: Colors.white,
+                                      fontWeight: FontWeight.bold,
+                                      fontSize: 10,
+                                      height: 1.2,
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
+                            const SizedBox(height: 4),
+                            Text(
+                              "advanced_settings_beta_timeline_subtitle"
+                                  .t(context: context),
+                              style: context.textTheme.labelLarge?.copyWith(
+                                color: context.textTheme.labelLarge?.color
+                                    ?.withValues(alpha: 0.7),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      Switch.adaptive(
+                        value: betaTimelineValue,
+                        onChanged: onSwitchChanged,
+                        activeColor: context.primaryColor,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index f8059d7e3c..bbffb9f51b 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -139,7 +139,6 @@ flutter:
     - family: OverpassMono
       fonts:
         - asset: fonts/overpass/OverpassMono.ttf
-
 flutter_launcher_icons:
   image_path_android: 'assets/immich-logo.png'
   adaptive_icon_background: '#ffffff'
diff --git a/mobile/test/drift/main/generated/schema.dart b/mobile/test/drift/main/generated/schema.dart
new file mode 100644
index 0000000000..b2b7404b5a
--- /dev/null
+++ b/mobile/test/drift/main/generated/schema.dart
@@ -0,0 +1,23 @@
+// dart format width=80
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart';
+import 'package:drift/internal/migrations.dart';
+import 'schema_v1.dart' as v1;
+import 'schema_v2.dart' as v2;
+
+class GeneratedHelper implements SchemaInstantiationHelper {
+  @override
+  GeneratedDatabase databaseForVersion(QueryExecutor db, int version) {
+    switch (version) {
+      case 1:
+        return v1.DatabaseAtV1(db);
+      case 2:
+        return v2.DatabaseAtV2(db);
+      default:
+        throw MissingSchemaException(version, versions);
+    }
+  }
+
+  static const versions = const [1, 2];
+}
diff --git a/mobile/test/drift/main/generated/schema_v1.dart b/mobile/test/drift/main/generated/schema_v1.dart
new file mode 100644
index 0000000000..0172201921
--- /dev/null
+++ b/mobile/test/drift/main/generated/schema_v1.dart
@@ -0,0 +1,4638 @@
+// 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<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<String> email = GeneratedColumn<String>(
+      'email', aliasedName, false,
+      type: DriftSqlType.string, requiredDuringInsert: true);
+  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>(
+      'profile_image_path', aliasedName, true,
+      type: DriftSqlType.string, requiredDuringInsert: false);
+  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> quotaSizeInBytes = GeneratedColumn<int>(
+      'quota_size_in_bytes', aliasedName, true,
+      type: DriftSqlType.int, requiredDuringInsert: false);
+  late final GeneratedColumn<int> quotaUsageInBytes = GeneratedColumn<int>(
+      'quota_usage_in_bytes', aliasedName, false,
+      type: DriftSqlType.int,
+      requiredDuringInsert: false,
+      defaultValue: const CustomExpression('0'));
+  @override
+  List<GeneratedColumn> get $columns => [
+        id,
+        name,
+        isAdmin,
+        email,
+        profileImagePath,
+        updatedAt,
+        quotaSizeInBytes,
+        quotaUsageInBytes
+      ];
+  @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'])!,
+      isAdmin: attachedDatabase.typeMapping
+          .read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
+      email: attachedDatabase.typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}email'])!,
+      profileImagePath: attachedDatabase.typeMapping.read(
+          DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
+      updatedAt: attachedDatabase.typeMapping
+          .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      quotaSizeInBytes: attachedDatabase.typeMapping.read(
+          DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
+      quotaUsageInBytes: attachedDatabase.typeMapping.read(
+          DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
+    );
+  }
+
+  @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 bool isAdmin;
+  final String email;
+  final String? profileImagePath;
+  final DateTime updatedAt;
+  final int? quotaSizeInBytes;
+  final int quotaUsageInBytes;
+  const UserEntityData(
+      {required this.id,
+      required this.name,
+      required this.isAdmin,
+      required this.email,
+      this.profileImagePath,
+      required this.updatedAt,
+      this.quotaSizeInBytes,
+      required this.quotaUsageInBytes});
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['name'] = Variable<String>(name);
+    map['is_admin'] = Variable<bool>(isAdmin);
+    map['email'] = Variable<String>(email);
+    if (!nullToAbsent || profileImagePath != null) {
+      map['profile_image_path'] = Variable<String>(profileImagePath);
+    }
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || quotaSizeInBytes != null) {
+      map['quota_size_in_bytes'] = Variable<int>(quotaSizeInBytes);
+    }
+    map['quota_usage_in_bytes'] = Variable<int>(quotaUsageInBytes);
+    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']),
+      isAdmin: serializer.fromJson<bool>(json['isAdmin']),
+      email: serializer.fromJson<String>(json['email']),
+      profileImagePath: serializer.fromJson<String?>(json['profileImagePath']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      quotaSizeInBytes: serializer.fromJson<int?>(json['quotaSizeInBytes']),
+      quotaUsageInBytes: serializer.fromJson<int>(json['quotaUsageInBytes']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'name': serializer.toJson<String>(name),
+      'isAdmin': serializer.toJson<bool>(isAdmin),
+      'email': serializer.toJson<String>(email),
+      'profileImagePath': serializer.toJson<String?>(profileImagePath),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'quotaSizeInBytes': serializer.toJson<int?>(quotaSizeInBytes),
+      'quotaUsageInBytes': serializer.toJson<int>(quotaUsageInBytes),
+    };
+  }
+
+  UserEntityData copyWith(
+          {String? id,
+          String? name,
+          bool? isAdmin,
+          String? email,
+          Value<String?> profileImagePath = const Value.absent(),
+          DateTime? updatedAt,
+          Value<int?> quotaSizeInBytes = const Value.absent(),
+          int? quotaUsageInBytes}) =>
+      UserEntityData(
+        id: id ?? this.id,
+        name: name ?? this.name,
+        isAdmin: isAdmin ?? this.isAdmin,
+        email: email ?? this.email,
+        profileImagePath: profileImagePath.present
+            ? profileImagePath.value
+            : this.profileImagePath,
+        updatedAt: updatedAt ?? this.updatedAt,
+        quotaSizeInBytes: quotaSizeInBytes.present
+            ? quotaSizeInBytes.value
+            : this.quotaSizeInBytes,
+        quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+      );
+  UserEntityData copyWithCompanion(UserEntityCompanion data) {
+    return UserEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      name: data.name.present ? data.name.value : this.name,
+      isAdmin: data.isAdmin.present ? data.isAdmin.value : this.isAdmin,
+      email: data.email.present ? data.email.value : this.email,
+      profileImagePath: data.profileImagePath.present
+          ? data.profileImagePath.value
+          : this.profileImagePath,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      quotaSizeInBytes: data.quotaSizeInBytes.present
+          ? data.quotaSizeInBytes.value
+          : this.quotaSizeInBytes,
+      quotaUsageInBytes: data.quotaUsageInBytes.present
+          ? data.quotaUsageInBytes.value
+          : this.quotaUsageInBytes,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserEntityData(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('email: $email, ')
+          ..write('profileImagePath: $profileImagePath, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, name, isAdmin, email, profileImagePath,
+      updatedAt, quotaSizeInBytes, quotaUsageInBytes);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserEntityData &&
+          other.id == this.id &&
+          other.name == this.name &&
+          other.isAdmin == this.isAdmin &&
+          other.email == this.email &&
+          other.profileImagePath == this.profileImagePath &&
+          other.updatedAt == this.updatedAt &&
+          other.quotaSizeInBytes == this.quotaSizeInBytes &&
+          other.quotaUsageInBytes == this.quotaUsageInBytes);
+}
+
+class UserEntityCompanion extends UpdateCompanion<UserEntityData> {
+  final Value<String> id;
+  final Value<String> name;
+  final Value<bool> isAdmin;
+  final Value<String> email;
+  final Value<String?> profileImagePath;
+  final Value<DateTime> updatedAt;
+  final Value<int?> quotaSizeInBytes;
+  final Value<int> quotaUsageInBytes;
+  const UserEntityCompanion({
+    this.id = const Value.absent(),
+    this.name = const Value.absent(),
+    this.isAdmin = const Value.absent(),
+    this.email = const Value.absent(),
+    this.profileImagePath = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.quotaSizeInBytes = const Value.absent(),
+    this.quotaUsageInBytes = const Value.absent(),
+  });
+  UserEntityCompanion.insert({
+    required String id,
+    required String name,
+    this.isAdmin = const Value.absent(),
+    required String email,
+    this.profileImagePath = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.quotaSizeInBytes = const Value.absent(),
+    this.quotaUsageInBytes = const Value.absent(),
+  })  : id = Value(id),
+        name = Value(name),
+        email = Value(email);
+  static Insertable<UserEntityData> custom({
+    Expression<String>? id,
+    Expression<String>? name,
+    Expression<bool>? isAdmin,
+    Expression<String>? email,
+    Expression<String>? profileImagePath,
+    Expression<DateTime>? updatedAt,
+    Expression<int>? quotaSizeInBytes,
+    Expression<int>? quotaUsageInBytes,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (name != null) 'name': name,
+      if (isAdmin != null) 'is_admin': isAdmin,
+      if (email != null) 'email': email,
+      if (profileImagePath != null) 'profile_image_path': profileImagePath,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (quotaSizeInBytes != null) 'quota_size_in_bytes': quotaSizeInBytes,
+      if (quotaUsageInBytes != null) 'quota_usage_in_bytes': quotaUsageInBytes,
+    });
+  }
+
+  UserEntityCompanion copyWith(
+      {Value<String>? id,
+      Value<String>? name,
+      Value<bool>? isAdmin,
+      Value<String>? email,
+      Value<String?>? profileImagePath,
+      Value<DateTime>? updatedAt,
+      Value<int?>? quotaSizeInBytes,
+      Value<int>? quotaUsageInBytes}) {
+    return UserEntityCompanion(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      isAdmin: isAdmin ?? this.isAdmin,
+      email: email ?? this.email,
+      profileImagePath: profileImagePath ?? this.profileImagePath,
+      updatedAt: updatedAt ?? this.updatedAt,
+      quotaSizeInBytes: quotaSizeInBytes ?? this.quotaSizeInBytes,
+      quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+    );
+  }
+
+  @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 (isAdmin.present) {
+      map['is_admin'] = Variable<bool>(isAdmin.value);
+    }
+    if (email.present) {
+      map['email'] = Variable<String>(email.value);
+    }
+    if (profileImagePath.present) {
+      map['profile_image_path'] = Variable<String>(profileImagePath.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.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);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('email: $email, ')
+          ..write('profileImagePath: $profileImagePath, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes')
+          ..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<int> visibility = GeneratedColumn<int>(
+      'visibility', aliasedName, false,
+      type: DriftSqlType.int, requiredDuringInsert: true);
+  @override
+  List<GeneratedColumn> get $columns => [
+        name,
+        type,
+        createdAt,
+        updatedAt,
+        width,
+        height,
+        durationInSeconds,
+        id,
+        checksum,
+        isFavorite,
+        ownerId,
+        localDateTime,
+        thumbHash,
+        deletedAt,
+        visibility
+      ];
+  @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']),
+      visibility: attachedDatabase.typeMapping
+          .read(DriftSqlType.int, data['${effectivePrefix}visibility'])!,
+    );
+  }
+
+  @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 int visibility;
+  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,
+      required this.visibility});
+  @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);
+    }
+    map['visibility'] = Variable<int>(visibility);
+    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']),
+      visibility: serializer.fromJson<int>(json['visibility']),
+    );
+  }
+  @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),
+      'visibility': serializer.toJson<int>(visibility),
+    };
+  }
+
+  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(),
+          int? visibility}) =>
+      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,
+        visibility: visibility ?? this.visibility,
+      );
+  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,
+      visibility:
+          data.visibility.present ? data.visibility.value : this.visibility,
+    );
+  }
+
+  @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('visibility: $visibility')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      name,
+      type,
+      createdAt,
+      updatedAt,
+      width,
+      height,
+      durationInSeconds,
+      id,
+      checksum,
+      isFavorite,
+      ownerId,
+      localDateTime,
+      thumbHash,
+      deletedAt,
+      visibility);
+  @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.visibility == this.visibility);
+}
+
+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<int> visibility;
+  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.visibility = 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(),
+    required int visibility,
+  })  : 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<int>? visibility,
+  }) {
+    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 (visibility != null) 'visibility': visibility,
+    });
+  }
+
+  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<int>? visibility}) {
+    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,
+      visibility: visibility ?? this.visibility,
+    );
+  }
+
+  @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 (visibility.present) {
+      map['visibility'] = Variable<int>(visibility.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('visibility: $visibility')
+          ..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 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 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<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, 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'])!,
+      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 bool? marker_;
+  const LocalAlbumEntityData(
+      {required this.id,
+      required this.name,
+      required this.updatedAt,
+      required this.backupSelection,
+      required this.isIosSharedAlbum,
+      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 || 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']),
+      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),
+      'marker_': serializer.toJson<bool?>(marker_),
+    };
+  }
+
+  LocalAlbumEntityData copyWith(
+          {String? id,
+          String? name,
+          DateTime? updatedAt,
+          int? backupSelection,
+          bool? isIosSharedAlbum,
+          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,
+        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,
+      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('marker_: $marker_')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      id, name, updatedAt, backupSelection, isIosSharedAlbum, 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.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<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.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.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<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 (marker_ != null) 'marker': marker_,
+    });
+  }
+
+  LocalAlbumEntityCompanion copyWith(
+      {Value<String>? id,
+      Value<String>? name,
+      Value<DateTime>? updatedAt,
+      Value<int>? backupSelection,
+      Value<bool>? isIosSharedAlbum,
+      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,
+      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 (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('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'));
+  @override
+  List<GeneratedColumn> get $columns => [assetId, albumId];
+  @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'])!,
+    );
+  }
+
+  @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;
+  const LocalAlbumAssetEntityData(
+      {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 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']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'albumId': serializer.toJson<String>(albumId),
+    };
+  }
+
+  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
+      LocalAlbumAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        albumId: albumId ?? this.albumId,
+      );
+  LocalAlbumAssetEntityData copyWithCompanion(
+      LocalAlbumAssetEntityCompanion data) {
+    return LocalAlbumAssetEntityData(
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      albumId: data.albumId.present ? data.albumId.value : this.albumId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LocalAlbumAssetEntityData(')
+          ..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 LocalAlbumAssetEntityData &&
+          other.assetId == this.assetId &&
+          other.albumId == this.albumId);
+}
+
+class LocalAlbumAssetEntityCompanion
+    extends UpdateCompanion<LocalAlbumAssetEntityData> {
+  final Value<String> assetId;
+  final Value<String> albumId;
+  const LocalAlbumAssetEntityCompanion({
+    this.assetId = const Value.absent(),
+    this.albumId = const Value.absent(),
+  });
+  LocalAlbumAssetEntityCompanion.insert({
+    required String assetId,
+    required String albumId,
+  })  : assetId = Value(assetId),
+        albumId = Value(albumId);
+  static Insertable<LocalAlbumAssetEntityData> custom({
+    Expression<String>? assetId,
+    Expression<String>? albumId,
+  }) {
+    return RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (albumId != null) 'album_id': albumId,
+    });
+  }
+
+  LocalAlbumAssetEntityCompanion copyWith(
+      {Value<String>? assetId, Value<String>? albumId}) {
+    return LocalAlbumAssetEntityCompanion(
+      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('LocalAlbumAssetEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('albumId: $albumId')
+          ..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 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 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 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,
+      defaultConstraints: GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_asset_entity (id)'));
+  @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 DatabaseAtV1 extends GeneratedDatabase {
+  DatabaseAtV1(QueryExecutor e) : super(e);
+  late final UserEntity userEntity = UserEntity(this);
+  late final RemoteAssetEntity remoteAssetEntity = RemoteAssetEntity(this);
+  late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
+  late final Index idxLocalAssetChecksum = Index('idx_local_asset_checksum',
+      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  late final Index uQRemoteAssetOwnerChecksum = Index(
+      'UQ_remote_asset_owner_checksum',
+      'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
+  late final Index idxRemoteAssetChecksum = Index('idx_remote_asset_checksum',
+      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this);
+  late final PartnerEntity partnerEntity = PartnerEntity(this);
+  late final LocalAlbumEntity localAlbumEntity = LocalAlbumEntity(this);
+  late final LocalAlbumAssetEntity localAlbumAssetEntity =
+      LocalAlbumAssetEntity(this);
+  late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this);
+  late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(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 StackEntity stackEntity = StackEntity(this);
+  @override
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  @override
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+        userEntity,
+        remoteAssetEntity,
+        localAssetEntity,
+        idxLocalAssetChecksum,
+        uQRemoteAssetOwnerChecksum,
+        idxRemoteAssetChecksum,
+        userMetadataEntity,
+        partnerEntity,
+        localAlbumEntity,
+        localAlbumAssetEntity,
+        remoteExifEntity,
+        remoteAlbumEntity,
+        remoteAlbumAssetEntity,
+        remoteAlbumUserEntity,
+        memoryEntity,
+        memoryAssetEntity,
+        stackEntity
+      ];
+  @override
+  int get schemaVersion => 1;
+  @override
+  DriftDatabaseOptions get options =>
+      const DriftDatabaseOptions(storeDateTimeAsText: true);
+}
diff --git a/mobile/test/drift/main/generated/schema_v2.dart b/mobile/test/drift/main/generated/schema_v2.dart
new file mode 100644
index 0000000000..bdba8db557
--- /dev/null
+++ b/mobile/test/drift/main/generated/schema_v2.dart
@@ -0,0 +1,4672 @@
+// 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<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<String> email = GeneratedColumn<String>(
+      'email', aliasedName, false,
+      type: DriftSqlType.string, requiredDuringInsert: true);
+  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>(
+      'profile_image_path', aliasedName, true,
+      type: DriftSqlType.string, requiredDuringInsert: false);
+  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> quotaSizeInBytes = GeneratedColumn<int>(
+      'quota_size_in_bytes', aliasedName, true,
+      type: DriftSqlType.int, requiredDuringInsert: false);
+  late final GeneratedColumn<int> quotaUsageInBytes = GeneratedColumn<int>(
+      'quota_usage_in_bytes', aliasedName, false,
+      type: DriftSqlType.int,
+      requiredDuringInsert: false,
+      defaultValue: const CustomExpression('0'));
+  @override
+  List<GeneratedColumn> get $columns => [
+        id,
+        name,
+        isAdmin,
+        email,
+        profileImagePath,
+        updatedAt,
+        quotaSizeInBytes,
+        quotaUsageInBytes
+      ];
+  @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'])!,
+      isAdmin: attachedDatabase.typeMapping
+          .read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
+      email: attachedDatabase.typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}email'])!,
+      profileImagePath: attachedDatabase.typeMapping.read(
+          DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
+      updatedAt: attachedDatabase.typeMapping
+          .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      quotaSizeInBytes: attachedDatabase.typeMapping.read(
+          DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
+      quotaUsageInBytes: attachedDatabase.typeMapping.read(
+          DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
+    );
+  }
+
+  @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 bool isAdmin;
+  final String email;
+  final String? profileImagePath;
+  final DateTime updatedAt;
+  final int? quotaSizeInBytes;
+  final int quotaUsageInBytes;
+  const UserEntityData(
+      {required this.id,
+      required this.name,
+      required this.isAdmin,
+      required this.email,
+      this.profileImagePath,
+      required this.updatedAt,
+      this.quotaSizeInBytes,
+      required this.quotaUsageInBytes});
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['name'] = Variable<String>(name);
+    map['is_admin'] = Variable<bool>(isAdmin);
+    map['email'] = Variable<String>(email);
+    if (!nullToAbsent || profileImagePath != null) {
+      map['profile_image_path'] = Variable<String>(profileImagePath);
+    }
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || quotaSizeInBytes != null) {
+      map['quota_size_in_bytes'] = Variable<int>(quotaSizeInBytes);
+    }
+    map['quota_usage_in_bytes'] = Variable<int>(quotaUsageInBytes);
+    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']),
+      isAdmin: serializer.fromJson<bool>(json['isAdmin']),
+      email: serializer.fromJson<String>(json['email']),
+      profileImagePath: serializer.fromJson<String?>(json['profileImagePath']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      quotaSizeInBytes: serializer.fromJson<int?>(json['quotaSizeInBytes']),
+      quotaUsageInBytes: serializer.fromJson<int>(json['quotaUsageInBytes']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'name': serializer.toJson<String>(name),
+      'isAdmin': serializer.toJson<bool>(isAdmin),
+      'email': serializer.toJson<String>(email),
+      'profileImagePath': serializer.toJson<String?>(profileImagePath),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'quotaSizeInBytes': serializer.toJson<int?>(quotaSizeInBytes),
+      'quotaUsageInBytes': serializer.toJson<int>(quotaUsageInBytes),
+    };
+  }
+
+  UserEntityData copyWith(
+          {String? id,
+          String? name,
+          bool? isAdmin,
+          String? email,
+          Value<String?> profileImagePath = const Value.absent(),
+          DateTime? updatedAt,
+          Value<int?> quotaSizeInBytes = const Value.absent(),
+          int? quotaUsageInBytes}) =>
+      UserEntityData(
+        id: id ?? this.id,
+        name: name ?? this.name,
+        isAdmin: isAdmin ?? this.isAdmin,
+        email: email ?? this.email,
+        profileImagePath: profileImagePath.present
+            ? profileImagePath.value
+            : this.profileImagePath,
+        updatedAt: updatedAt ?? this.updatedAt,
+        quotaSizeInBytes: quotaSizeInBytes.present
+            ? quotaSizeInBytes.value
+            : this.quotaSizeInBytes,
+        quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+      );
+  UserEntityData copyWithCompanion(UserEntityCompanion data) {
+    return UserEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      name: data.name.present ? data.name.value : this.name,
+      isAdmin: data.isAdmin.present ? data.isAdmin.value : this.isAdmin,
+      email: data.email.present ? data.email.value : this.email,
+      profileImagePath: data.profileImagePath.present
+          ? data.profileImagePath.value
+          : this.profileImagePath,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      quotaSizeInBytes: data.quotaSizeInBytes.present
+          ? data.quotaSizeInBytes.value
+          : this.quotaSizeInBytes,
+      quotaUsageInBytes: data.quotaUsageInBytes.present
+          ? data.quotaUsageInBytes.value
+          : this.quotaUsageInBytes,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserEntityData(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('email: $email, ')
+          ..write('profileImagePath: $profileImagePath, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, name, isAdmin, email, profileImagePath,
+      updatedAt, quotaSizeInBytes, quotaUsageInBytes);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserEntityData &&
+          other.id == this.id &&
+          other.name == this.name &&
+          other.isAdmin == this.isAdmin &&
+          other.email == this.email &&
+          other.profileImagePath == this.profileImagePath &&
+          other.updatedAt == this.updatedAt &&
+          other.quotaSizeInBytes == this.quotaSizeInBytes &&
+          other.quotaUsageInBytes == this.quotaUsageInBytes);
+}
+
+class UserEntityCompanion extends UpdateCompanion<UserEntityData> {
+  final Value<String> id;
+  final Value<String> name;
+  final Value<bool> isAdmin;
+  final Value<String> email;
+  final Value<String?> profileImagePath;
+  final Value<DateTime> updatedAt;
+  final Value<int?> quotaSizeInBytes;
+  final Value<int> quotaUsageInBytes;
+  const UserEntityCompanion({
+    this.id = const Value.absent(),
+    this.name = const Value.absent(),
+    this.isAdmin = const Value.absent(),
+    this.email = const Value.absent(),
+    this.profileImagePath = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.quotaSizeInBytes = const Value.absent(),
+    this.quotaUsageInBytes = const Value.absent(),
+  });
+  UserEntityCompanion.insert({
+    required String id,
+    required String name,
+    this.isAdmin = const Value.absent(),
+    required String email,
+    this.profileImagePath = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.quotaSizeInBytes = const Value.absent(),
+    this.quotaUsageInBytes = const Value.absent(),
+  })  : id = Value(id),
+        name = Value(name),
+        email = Value(email);
+  static Insertable<UserEntityData> custom({
+    Expression<String>? id,
+    Expression<String>? name,
+    Expression<bool>? isAdmin,
+    Expression<String>? email,
+    Expression<String>? profileImagePath,
+    Expression<DateTime>? updatedAt,
+    Expression<int>? quotaSizeInBytes,
+    Expression<int>? quotaUsageInBytes,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (name != null) 'name': name,
+      if (isAdmin != null) 'is_admin': isAdmin,
+      if (email != null) 'email': email,
+      if (profileImagePath != null) 'profile_image_path': profileImagePath,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (quotaSizeInBytes != null) 'quota_size_in_bytes': quotaSizeInBytes,
+      if (quotaUsageInBytes != null) 'quota_usage_in_bytes': quotaUsageInBytes,
+    });
+  }
+
+  UserEntityCompanion copyWith(
+      {Value<String>? id,
+      Value<String>? name,
+      Value<bool>? isAdmin,
+      Value<String>? email,
+      Value<String?>? profileImagePath,
+      Value<DateTime>? updatedAt,
+      Value<int?>? quotaSizeInBytes,
+      Value<int>? quotaUsageInBytes}) {
+    return UserEntityCompanion(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      isAdmin: isAdmin ?? this.isAdmin,
+      email: email ?? this.email,
+      profileImagePath: profileImagePath ?? this.profileImagePath,
+      updatedAt: updatedAt ?? this.updatedAt,
+      quotaSizeInBytes: quotaSizeInBytes ?? this.quotaSizeInBytes,
+      quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+    );
+  }
+
+  @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 (isAdmin.present) {
+      map['is_admin'] = Variable<bool>(isAdmin.value);
+    }
+    if (email.present) {
+      map['email'] = Variable<String>(email.value);
+    }
+    if (profileImagePath.present) {
+      map['profile_image_path'] = Variable<String>(profileImagePath.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.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);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('email: $email, ')
+          ..write('profileImagePath: $profileImagePath, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes')
+          ..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);
+  @override
+  List<GeneratedColumn> get $columns => [
+        name,
+        type,
+        createdAt,
+        updatedAt,
+        width,
+        height,
+        durationInSeconds,
+        id,
+        checksum,
+        isFavorite,
+        ownerId,
+        localDateTime,
+        thumbHash,
+        deletedAt,
+        livePhotoVideoId,
+        visibility
+      ];
+  @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'])!,
+    );
+  }
+
+  @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;
+  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});
+  @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);
+    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']),
+    );
+  }
+  @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),
+    };
+  }
+
+  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}) =>
+      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,
+      );
+  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,
+    );
+  }
+
+  @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(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      name,
+      type,
+      createdAt,
+      updatedAt,
+      width,
+      height,
+      durationInSeconds,
+      id,
+      checksum,
+      isFavorite,
+      ownerId,
+      localDateTime,
+      thumbHash,
+      deletedAt,
+      livePhotoVideoId,
+      visibility);
+  @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);
+}
+
+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;
+  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(),
+  });
+  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,
+  })  : 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,
+  }) {
+    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,
+    });
+  }
+
+  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}) {
+    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,
+    );
+  }
+
+  @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);
+    }
+    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(')'))
+        .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 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 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<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, 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'])!,
+      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 bool? marker_;
+  const LocalAlbumEntityData(
+      {required this.id,
+      required this.name,
+      required this.updatedAt,
+      required this.backupSelection,
+      required this.isIosSharedAlbum,
+      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 || 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']),
+      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),
+      'marker_': serializer.toJson<bool?>(marker_),
+    };
+  }
+
+  LocalAlbumEntityData copyWith(
+          {String? id,
+          String? name,
+          DateTime? updatedAt,
+          int? backupSelection,
+          bool? isIosSharedAlbum,
+          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,
+        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,
+      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('marker_: $marker_')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      id, name, updatedAt, backupSelection, isIosSharedAlbum, 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.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<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.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.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<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 (marker_ != null) 'marker': marker_,
+    });
+  }
+
+  LocalAlbumEntityCompanion copyWith(
+      {Value<String>? id,
+      Value<String>? name,
+      Value<DateTime>? updatedAt,
+      Value<int>? backupSelection,
+      Value<bool>? isIosSharedAlbum,
+      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,
+      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 (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('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'));
+  @override
+  List<GeneratedColumn> get $columns => [assetId, albumId];
+  @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'])!,
+    );
+  }
+
+  @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;
+  const LocalAlbumAssetEntityData(
+      {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 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']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'albumId': serializer.toJson<String>(albumId),
+    };
+  }
+
+  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
+      LocalAlbumAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        albumId: albumId ?? this.albumId,
+      );
+  LocalAlbumAssetEntityData copyWithCompanion(
+      LocalAlbumAssetEntityCompanion data) {
+    return LocalAlbumAssetEntityData(
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      albumId: data.albumId.present ? data.albumId.value : this.albumId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LocalAlbumAssetEntityData(')
+          ..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 LocalAlbumAssetEntityData &&
+          other.assetId == this.assetId &&
+          other.albumId == this.albumId);
+}
+
+class LocalAlbumAssetEntityCompanion
+    extends UpdateCompanion<LocalAlbumAssetEntityData> {
+  final Value<String> assetId;
+  final Value<String> albumId;
+  const LocalAlbumAssetEntityCompanion({
+    this.assetId = const Value.absent(),
+    this.albumId = const Value.absent(),
+  });
+  LocalAlbumAssetEntityCompanion.insert({
+    required String assetId,
+    required String albumId,
+  })  : assetId = Value(assetId),
+        albumId = Value(albumId);
+  static Insertable<LocalAlbumAssetEntityData> custom({
+    Expression<String>? assetId,
+    Expression<String>? albumId,
+  }) {
+    return RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (albumId != null) 'album_id': albumId,
+    });
+  }
+
+  LocalAlbumAssetEntityCompanion copyWith(
+      {Value<String>? assetId, Value<String>? albumId}) {
+    return LocalAlbumAssetEntityCompanion(
+      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('LocalAlbumAssetEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('albumId: $albumId')
+          ..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 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 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 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,
+      defaultConstraints: GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_asset_entity (id)'));
+  @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 DatabaseAtV2 extends GeneratedDatabase {
+  DatabaseAtV2(QueryExecutor e) : super(e);
+  late final UserEntity userEntity = UserEntity(this);
+  late final RemoteAssetEntity remoteAssetEntity = RemoteAssetEntity(this);
+  late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
+  late final Index idxLocalAssetChecksum = Index('idx_local_asset_checksum',
+      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  late final Index uQRemoteAssetOwnerChecksum = Index(
+      'UQ_remote_asset_owner_checksum',
+      'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
+  late final Index idxRemoteAssetChecksum = Index('idx_remote_asset_checksum',
+      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this);
+  late final PartnerEntity partnerEntity = PartnerEntity(this);
+  late final LocalAlbumEntity localAlbumEntity = LocalAlbumEntity(this);
+  late final LocalAlbumAssetEntity localAlbumAssetEntity =
+      LocalAlbumAssetEntity(this);
+  late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this);
+  late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(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 StackEntity stackEntity = StackEntity(this);
+  @override
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  @override
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+        userEntity,
+        remoteAssetEntity,
+        localAssetEntity,
+        idxLocalAssetChecksum,
+        uQRemoteAssetOwnerChecksum,
+        idxRemoteAssetChecksum,
+        userMetadataEntity,
+        partnerEntity,
+        localAlbumEntity,
+        localAlbumAssetEntity,
+        remoteExifEntity,
+        remoteAlbumEntity,
+        remoteAlbumAssetEntity,
+        remoteAlbumUserEntity,
+        memoryEntity,
+        memoryAssetEntity,
+        stackEntity
+      ];
+  @override
+  int get schemaVersion => 2;
+  @override
+  DriftDatabaseOptions get options =>
+      const DriftDatabaseOptions(storeDateTimeAsText: true);
+}
diff --git a/mobile/test/drift/main/migration_test.dart b/mobile/test/drift/main/migration_test.dart
new file mode 100644
index 0000000000..74467492ae
--- /dev/null
+++ b/mobile/test/drift/main/migration_test.dart
@@ -0,0 +1,38 @@
+// dart format width=80
+// ignore_for_file: unused_local_variable, unused_import
+import 'package:drift/drift.dart';
+import 'package:drift_dev/api/migrations_native.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+import 'generated/schema.dart';
+import 'generated/schema_v1.dart' as v1;
+import 'generated/schema_v2.dart' as v2;
+
+void main() {
+  driftRuntimeOptions.dontWarnAboutMultipleDatabases = true;
+  late SchemaVerifier verifier;
+
+  setUpAll(() {
+    verifier = SchemaVerifier(GeneratedHelper());
+  });
+
+  group('simple database migrations', () {
+    // These simple tests verify all possible schema updates with a simple (no
+    // data) migration. This is a quick way to ensure that written database
+    // migrations properly alter the schema.
+    const versions = GeneratedHelper.versions;
+    for (final (i, fromVersion) in versions.indexed) {
+      group('from $fromVersion', () {
+        for (final toVersion in versions.skip(i + 1)) {
+          test('to $toVersion', () async {
+            final schema = await verifier.schemaAt(fromVersion);
+            final db = Drift(schema.newConnection());
+            await verifier.migrateAndValidate(db, toVersion);
+            await db.close();
+          });
+        }
+      });
+    }
+  });
+}

From 055b93006668bd4660664a75e124e9128f78c72d Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Thu, 17 Jul 2025 19:41:30 +0300
Subject: [PATCH 229/337] refactor(mobile): share action button in new timeline
 (#19967)

* share asset button

* include source

* move to repository

* formatting
---
 i18n/en.json                                  |  1 +
 .../share_action_button.widget.dart           | 40 ++++++++-
 .../asset_viewer/bottom_bar.widget.dart       |  2 +-
 .../asset_viewer/bottom_sheet.widget.dart     |  2 +-
 .../archive_bottom_sheet.widget.dart          |  2 +-
 .../favorite_bottom_sheet.widget.dart         |  2 +-
 .../general_bottom_sheet.widget.dart          |  2 +-
 .../local_album_bottom_sheet.widget.dart      |  2 +-
 .../locked_folder_bottom_sheet.widget.dart    |  2 +-
 .../partner_detail_bottom_sheet.widget.dart   |  3 +-
 .../remote_album_bottom_sheet.widget.dart     |  2 +-
 .../infrastructure/action.provider.dart       | 23 ++++-
 .../repositories/asset_api.repository.dart    |  5 ++
 .../repositories/asset_media.repository.dart  | 84 +++++++++++++++++--
 mobile/lib/services/action.service.dart       | 10 ++-
 15 files changed, 158 insertions(+), 24 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 6cabcecf7d..11df6fc3d3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1693,6 +1693,7 @@
   "settings_saved": "Settings saved",
   "setup_pin_code": "Setup a PIN code",
   "share": "Share",
+  "share_action_prompt": "Shared {count} assets",
   "share_add_photos": "Add photos",
   "share_assets_selected": "{count} selected",
   "share_dialog_preparing": "Preparing...",
diff --git a/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
index 6a8864c14f..1b1553dabc 100644
--- a/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
@@ -1,12 +1,49 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class ShareActionButton extends ConsumerWidget {
-  const ShareActionButton({super.key});
+  final ActionSource source;
+
+  const ShareActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).shareAssets(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    if (!context.mounted) {
+      return;
+    }
+
+    if (!result.success) {
+      ImmichToast.show(
+        context: context,
+        msg: 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: ToastType.error,
+      );
+    } else if (result.count > 0) {
+      ImmichToast.show(
+        context: context,
+        msg: 'share_action_prompt'
+            .t(context: context, args: {'count': result.count.toString()}),
+        gravity: ToastGravity.BOTTOM,
+        toastType: ToastType.success,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -14,6 +51,7 @@ class ShareActionButton extends ConsumerWidget {
       iconData:
           Platform.isAndroid ? Icons.share_rounded : Icons.ios_share_rounded,
       label: 'share'.t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
index a28d5eafa4..9237c3bcdb 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
@@ -38,7 +38,7 @@ class ViewerBottomBar extends ConsumerWidget {
     }
 
     final actions = <Widget>[
-      const ShareActionButton(),
+      const ShareActionButton(source: ActionSource.viewer),
       const _EditActionButton(),
       if (asset.hasRemote && isOwner)
         const ArchiveActionButton(source: ActionSource.viewer),
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 0ad87e05e8..6695022d1e 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -45,7 +45,7 @@ class AssetDetailBottomSheet extends ConsumerWidget {
     );
 
     final actions = <Widget>[
-      const ShareActionButton(),
+      const ShareActionButton(source: ActionSource.viewer),
       if (asset.hasRemote) ...[
         const ShareLinkActionButton(source: ActionSource.viewer),
         const ArchiveActionButton(source: ActionSource.viewer),
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
index 3c21630d2e..7b1175e8be 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
@@ -33,7 +33,7 @@ class ArchiveBottomSheet extends ConsumerWidget {
       maxChildSize: 0.4,
       shouldCloseOnMinExtent: false,
       actions: [
-        const ShareActionButton(),
+        const ShareActionButton(source: ActionSource.timeline),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
           const UnArchiveActionButton(source: ActionSource.timeline),
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
index d73d3c22e0..0615a857a9 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
@@ -33,7 +33,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
       maxChildSize: 0.4,
       shouldCloseOnMinExtent: false,
       actions: [
-        const ShareActionButton(),
+        const ShareActionButton(source: ActionSource.timeline),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
           const UnFavoriteActionButton(source: ActionSource.timeline),
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
index 6726f18246..61414252da 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -33,7 +33,7 @@ class GeneralBottomSheet extends ConsumerWidget {
       maxChildSize: 0.4,
       shouldCloseOnMinExtent: false,
       actions: [
-        const ShareActionButton(),
+        const ShareActionButton(source: ActionSource.timeline),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
           const ArchiveActionButton(source: ActionSource.timeline),
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
index d41f8ecb96..2ad0fe7485 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
@@ -16,7 +16,7 @@ class LocalAlbumBottomSheet extends ConsumerWidget {
       maxChildSize: 0.4,
       shouldCloseOnMinExtent: false,
       actions: [
-        ShareActionButton(),
+        ShareActionButton(source: ActionSource.timeline),
         DeleteLocalActionButton(source: ActionSource.timeline),
         UploadActionButton(),
       ],
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
index 97b2646f32..ef71f3a3a3 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
@@ -17,7 +17,7 @@ class LockedFolderBottomSheet extends ConsumerWidget {
       maxChildSize: 0.4,
       shouldCloseOnMinExtent: false,
       actions: [
-        ShareActionButton(),
+        ShareActionButton(source: ActionSource.timeline),
         DownloadActionButton(),
         DeletePermanentActionButton(source: ActionSource.timeline),
         RemoveFromLockFolderActionButton(source: ActionSource.timeline),
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart
index 7af8ab7c86..1cdf6f28d6 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
@@ -14,7 +15,7 @@ class PartnerDetailBottomSheet extends ConsumerWidget {
       maxChildSize: 0.4,
       shouldCloseOnMinExtent: false,
       actions: [
-        ShareActionButton(),
+        ShareActionButton(source: ActionSource.timeline),
         DownloadActionButton(),
       ],
     );
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
index 1ed662884a..c2d0d5c85a 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
@@ -36,7 +36,7 @@ class RemoteAlbumBottomSheet extends ConsumerWidget {
       maxChildSize: 0.4,
       shouldCloseOnMinExtent: false,
       actions: [
-        const ShareActionButton(),
+        const ShareActionButton(source: ActionSource.timeline),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
           const ArchiveActionButton(source: ActionSource.timeline),
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 25b5783137..b53417d021 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -58,15 +58,18 @@ class ActionNotifier extends Notifier<void> {
         .toList(growable: false);
   }
 
-  Iterable<T> _getIdsForSource<T extends BaseAsset>(ActionSource source) {
-    final Set<BaseAsset> assets = switch (source) {
+  Set<BaseAsset> _getAssets(ActionSource source) {
+    return switch (source) {
       ActionSource.timeline => ref.read(multiSelectProvider).selectedAssets,
       ActionSource.viewer => switch (ref.read(currentAssetNotifier)) {
           BaseAsset asset => {asset},
           null => const {},
         },
     };
+  }
 
+  Iterable<T> _getIdsForSource<T extends BaseAsset>(ActionSource source) {
+    final Set<BaseAsset> assets = _getAssets(source);
     return switch (T) {
       const (RemoteAsset) => assets.whereType<RemoteAsset>(),
       const (LocalAsset) => assets.whereType<LocalAsset>(),
@@ -266,6 +269,22 @@ class ActionNotifier extends Notifier<void> {
       );
     }
   }
+
+  Future<ActionResult> shareAssets(ActionSource source) async {
+    final ids = _getAssets(source).toList(growable: false);
+
+    try {
+      final count = await _service.shareAssets(ids);
+      return ActionResult(count: count, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to share assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
 }
 
 extension on Iterable<RemoteAsset> {
diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dart
index 0dff309172..cd49369a2a 100644
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -1,4 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:http/http.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
@@ -83,6 +84,10 @@ class AssetApiRepository extends ApiRepository {
     );
   }
 
+  Future<Response> downloadAsset(String id) {
+    return _api.downloadAssetWithHttpInfo(id);
+  }
+
   _mapVisibility(AssetVisibilityEnum visibility) => switch (visibility) {
         AssetVisibilityEnum.timeline => AssetVisibility.timeline,
         AssetVisibilityEnum.hidden => AssetVisibility.hidden,
diff --git a/mobile/lib/repositories/asset_media.repository.dart b/mobile/lib/repositories/asset_media.repository.dart
index bb1e6f414f..8708ce9cfd 100644
--- a/mobile/lib/repositories/asset_media.repository.dart
+++ b/mobile/lib/repositories/asset_media.repository.dart
@@ -1,27 +1,40 @@
+import 'dart:io';
+
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/entities/asset.entity.dart' as asset_entity;
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:immich_mobile/utils/hash.dart';
-import 'package:photo_manager/photo_manager.dart' hide AssetType;
+import 'package:logging/logging.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:photo_manager/photo_manager.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/response_extensions.dart';
+import 'package:share_plus/share_plus.dart';
 
-final assetMediaRepositoryProvider =
-    Provider((ref) => const AssetMediaRepository());
+final assetMediaRepositoryProvider = Provider(
+  (ref) => AssetMediaRepository(ref.watch(assetApiRepositoryProvider)),
+);
 
 class AssetMediaRepository {
-  const AssetMediaRepository();
+  final AssetApiRepository _assetApiRepository;
+  static final Logger _log = Logger("AssetMediaRepository");
+
+  const AssetMediaRepository(this._assetApiRepository);
+
   Future<List<String>> deleteAll(List<String> ids) =>
       PhotoManager.editor.deleteWithIds(ids);
 
-  Future<Asset?> get(String id) async {
+  Future<asset_entity.Asset?> get(String id) async {
     final entity = await AssetEntity.fromId(id);
     return toAsset(entity);
   }
 
-  static Asset? toAsset(AssetEntity? local) {
+  static asset_entity.Asset? toAsset(AssetEntity? local) {
     if (local == null) return null;
-    final Asset asset = Asset(
+    final asset_entity.Asset asset = asset_entity.Asset(
       checksum: "",
       localId: local.id,
       ownerId: fastHash(Store.get(StoreKey.currentUser).id),
@@ -29,7 +42,7 @@ class AssetMediaRepository {
       fileModifiedAt: local.modifiedDateTime,
       updatedAt: local.modifiedDateTime,
       durationInSeconds: local.duration,
-      type: AssetType.values[local.typeInt],
+      type: asset_entity.AssetType.values[local.typeInt],
       fileName: local.title!,
       width: local.width,
       height: local.height,
@@ -57,4 +70,57 @@ class AssetMediaRepository {
     // otherwise using the `entity.title` would return a random GUID
     return await entity.titleAsync;
   }
+
+  // TODO: make this more efficient
+  Future<int> shareAssets(List<BaseAsset> assets) async {
+    final downloadedXFiles = <XFile>[];
+
+    for (var asset in assets) {
+      final localId = (asset is LocalAsset)
+          ? asset.id
+          : asset is RemoteAsset
+              ? asset.localId
+              : null;
+      if (localId != null) {
+        File? f =
+            await AssetEntity(id: localId, width: 1, height: 1, typeInt: 0)
+                .originFile;
+        downloadedXFiles.add(XFile(f!.path));
+      } else if (asset is RemoteAsset) {
+        final tempDir = await getTemporaryDirectory();
+        final name = asset.name;
+        final tempFile = await File('${tempDir.path}/$name').create();
+        final res = await _assetApiRepository.downloadAsset(asset.id);
+
+        if (res.statusCode != 200) {
+          _log.severe("Download for $name failed", res.toLoggerString());
+          continue;
+        }
+
+        await tempFile.writeAsBytes(res.bodyBytes);
+        downloadedXFiles.add(XFile(tempFile.path));
+      } else {
+        _log.warning("Asset type not supported for sharing: $asset");
+        continue;
+      }
+    }
+
+    if (downloadedXFiles.isEmpty) {
+      _log.warning("No asset can be retrieved for share");
+      return 0;
+    }
+
+    final result = await Share.shareXFiles(downloadedXFiles);
+
+    for (var file in downloadedXFiles) {
+      try {
+        await File(file.path).delete();
+      } catch (e) {
+        _log.warning("Failed to delete temporary file: ${file.path}", e);
+      }
+    }
+    return result.status == ShareResultStatus.success
+        ? downloadedXFiles.length
+        : 0;
+  }
 }
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index bb2e1514e8..9559c5d316 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -12,7 +12,7 @@ import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/location_picker.dart';
-import 'package:maplibre_gl/maplibre_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart' as maplibre;
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 final actionServiceProvider = Provider<ActionService>(
@@ -124,12 +124,12 @@ class ActionService {
     List<String> remoteIds,
     BuildContext context,
   ) async {
-    LatLng? initialLatLng;
+    maplibre.LatLng? initialLatLng;
     if (remoteIds.length == 1) {
       final exif = await _remoteAssetRepository.getExif(remoteIds[0]);
 
       if (exif?.latitude != null && exif?.longitude != null) {
-        initialLatLng = LatLng(exif!.latitude!, exif.longitude!);
+        initialLatLng = maplibre.LatLng(exif!.latitude!, exif.longitude!);
       }
     }
 
@@ -165,4 +165,8 @@ class ActionService {
 
     return removedCount;
   }
+
+  Future<int> shareAssets(List<BaseAsset> assets) {
+    return _assetMediaRepository.shareAssets(assets);
+  }
 }

From 03ff425664de4e5568474f441efc9ab4961c1f4a Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Thu, 17 Jul 2025 12:08:32 -0500
Subject: [PATCH 230/337] chore(mobile): update casting to new asset viewer
 (#19994)

* update casting to new asset viewer

* handle websocket

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../lib/pages/common/gallery_viewer.page.dart |  4 +-
 mobile/lib/pages/common/tab_shell.page.dart   |  3 +-
 .../base_action_button.widget.dart            |  5 +-
 .../cast_action_button.widget.dart            | 32 ++++++++++++
 .../asset_viewer/asset_viewer.page.dart       | 49 +++++++++++++++++++
 .../asset_viewer/top_app_bar.widget.dart      | 13 +++++
 .../providers/app_life_cycle.provider.dart    | 14 +++---
 mobile/lib/providers/cast.provider.dart       | 24 ++++++++-
 mobile/lib/services/gcast.service.dart        | 17 +++----
 .../custom_video_player_controls.dart         |  2 +-
 10 files changed, 140 insertions(+), 23 deletions(-)
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/cast_action_button.widget.dart

diff --git a/mobile/lib/pages/common/gallery_viewer.page.dart b/mobile/lib/pages/common/gallery_viewer.page.dart
index 6fdbecced1..539406365a 100644
--- a/mobile/lib/pages/common/gallery_viewer.page.dart
+++ b/mobile/lib/pages/common/gallery_viewer.page.dart
@@ -125,7 +125,7 @@ class GalleryViewerPage extends HookConsumerWidget {
       final asset = loadAsset(currentIndex.value);
 
       if (asset.isRemote) {
-        ref.read(castProvider.notifier).loadMedia(asset, false);
+        ref.read(castProvider.notifier).loadMediaOld(asset, false);
       } else {
         if (isCasting) {
           WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -394,7 +394,7 @@ class GalleryViewerPage extends HookConsumerWidget {
 
                 // send image to casting if the server has it
                 if (newAsset.isRemote) {
-                  ref.read(castProvider.notifier).loadMedia(newAsset, false);
+                  ref.read(castProvider.notifier).loadMediaOld(newAsset, false);
                 } else {
                   context.scaffoldMessenger.clearSnackBars();
 
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index c8ca7ea061..007dc4c9d6 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -9,6 +9,7 @@ import 'package:immich_mobile/providers/infrastructure/album.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';
+import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/migration.dart';
 
@@ -24,8 +25,8 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
   @override
   void initState() {
     super.initState();
-
     WidgetsBinding.instance.addPostFrameCallback((_) {
+      ref.read(websocketProvider.notifier).connect();
       runNewSync(ref, full: true);
     });
   }
diff --git a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
index 94e3610a57..2ad285326c 100644
--- a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
@@ -6,6 +6,7 @@ class BaseActionButton extends StatelessWidget {
     super.key,
     required this.label,
     required this.iconData,
+    this.iconColor,
     this.onPressed,
     this.onLongPressed,
     this.maxWidth = 90.0,
@@ -15,6 +16,7 @@ class BaseActionButton extends StatelessWidget {
 
   final String label;
   final IconData iconData;
+  final Color? iconColor;
   final double maxWidth;
   final double? minWidth;
   final bool menuItem;
@@ -27,7 +29,8 @@ class BaseActionButton extends StatelessWidget {
         minWidth ?? (context.isMobile ? context.width / 4.5 : 75.0);
     final iconTheme = IconTheme.of(context);
     final iconSize = iconTheme.size ?? 24.0;
-    final iconColor = iconTheme.color ?? context.themeData.iconTheme.color;
+    final iconColor =
+        this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;
     final textColor = context.themeData.textTheme.labelLarge?.color;
 
     if (menuItem) {
diff --git a/mobile/lib/presentation/widgets/action_buttons/cast_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/cast_action_button.widget.dart
new file mode 100644
index 0000000000..2900d55834
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/cast_action_button.widget.dart
@@ -0,0 +1,32 @@
+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/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/cast.provider.dart';
+import 'package:immich_mobile/widgets/asset_viewer/cast_dialog.dart';
+
+class CastActionButton extends ConsumerWidget {
+  const CastActionButton({super.key, this.menuItem = true});
+
+  final bool menuItem;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
+
+    return BaseActionButton(
+      iconData: isCasting ? Icons.cast_connected_rounded : Icons.cast_rounded,
+      iconColor:
+          isCasting ? context.primaryColor : null, // null = default color
+      label: "cast".t(context: context),
+      onPressed: () {
+        showDialog(
+          context: context,
+          builder: (context) => const CastDialog(),
+        );
+      },
+      menuItem: menuItem,
+    );
+  }
+}
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 dfc0023685..1c0f28413a 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 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/domain/models/asset/base_asset.model.dart';
@@ -18,6 +19,7 @@ import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart'
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
+import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
@@ -184,6 +186,40 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       }
     });
     _delayedOperations.add(timer);
+
+    _handleCasting(asset);
+  }
+
+  void _handleCasting(BaseAsset asset) {
+    if (!ref.read(castProvider).isCasting) return;
+
+    // hide any casting snackbars if they exist
+    context.scaffoldMessenger.hideCurrentSnackBar();
+
+    // send image to casting if the server has it
+    if (asset.hasRemote) {
+      final remoteAsset = asset as RemoteAsset;
+
+      ref.read(castProvider.notifier).loadMedia(remoteAsset, false);
+    } else {
+      // casting cannot show local assets
+      context.scaffoldMessenger.clearSnackBars();
+
+      if (ref.read(castProvider).isCasting) {
+        ref.read(castProvider.notifier).stop();
+        context.scaffoldMessenger.showSnackBar(
+          SnackBar(
+            duration: const Duration(seconds: 2),
+            content: Text(
+              "local_asset_cast_failed".tr(),
+              style: context.textTheme.bodyLarge?.copyWith(
+                color: context.primaryColor,
+              ),
+            ),
+          ),
+        );
+      }
+    }
   }
 
   void _onPageBuild(PhotoViewControllerBase controller) {
@@ -570,6 +606,19 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity));
     ref.watch(isPlayingMotionVideoProvider);
 
+    // Listen for casting changes and send initial asset to the cast provider
+    ref.listen(castProvider.select((value) => value.isCasting),
+        (_, isCasting) async {
+      if (!isCasting) return;
+
+      final asset = ref.read(currentAssetNotifier);
+      if (asset == null) return;
+
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _handleCasting(asset);
+      });
+    });
+
     // Currently it is not possible to scroll the asset when the bottom sheet is open all the way.
     // Issue: https://github.com/flutter/flutter/issues/109037
     // TODO: Add a custom scrum builder once the fix lands on stable
diff --git a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
index 0f3d46f673..c85c4390ae 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
@@ -5,12 +5,15 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/cast_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/providers/websocket.provider.dart';
 
 class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
   const ViewerTopAppBar({super.key});
@@ -37,7 +40,17 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
       opacity = 0;
     }
 
+    final isCasting = ref.watch(
+      castProvider.select((c) => c.isCasting),
+    );
+    final websocketConnected =
+        ref.watch(websocketProvider.select((c) => c.isConnected));
+
     final actions = <Widget>[
+      if (isCasting || (asset.hasRemote && websocketConnected))
+        const CastActionButton(
+          menuItem: true,
+        ),
       if (asset.hasRemote && isOwner && !asset.isFavorite)
         const FavoriteActionButton(source: ActionSource.viewer, menuItem: true),
       if (asset.hasRemote && isOwner && asset.isFavorite)
diff --git a/mobile/lib/providers/app_life_cycle.provider.dart b/mobile/lib/providers/app_life_cycle.provider.dart
index b4b7b0d406..997058d763 100644
--- a/mobile/lib/providers/app_life_cycle.provider.dart
+++ b/mobile/lib/providers/app_life_cycle.provider.dart
@@ -141,13 +141,15 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
     state = AppLifeCycleEnum.paused;
     _wasPaused = true;
 
-    if (!Store.isBetaTimelineEnabled &&
-        _ref.read(authProvider).isAuthenticated) {
-      // Do not cancel backup if manual upload is in progress
-      if (_ref.read(backupProvider.notifier).backupProgress !=
-          BackUpProgressEnum.manualInProgress) {
-        _ref.read(backupProvider.notifier).cancelBackup();
+    if (_ref.read(authProvider).isAuthenticated) {
+      if (!Store.isBetaTimelineEnabled) {
+        // Do not cancel backup if manual upload is in progress
+        if (_ref.read(backupProvider.notifier).backupProgress !=
+            BackUpProgressEnum.manualInProgress) {
+          _ref.read(backupProvider.notifier).cancelBackup();
+        }
       }
+
       _ref.read(websocketProvider.notifier).disconnect();
     }
 
diff --git a/mobile/lib/providers/cast.provider.dart b/mobile/lib/providers/cast.provider.dart
index f70bdad9dc..11cdcd54c5 100644
--- a/mobile/lib/providers/cast.provider.dart
+++ b/mobile/lib/providers/cast.provider.dart
@@ -1,5 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/entities/asset.entity.dart' as old_asset_entity;
 import 'package:immich_mobile/models/cast/cast_manager_state.dart';
 import 'package:immich_mobile/services/gcast.service.dart';
 
@@ -50,10 +51,29 @@ class CastNotifier extends StateNotifier<CastManagerState> {
     state = state.copyWith(castState: castState);
   }
 
-  void loadMedia(Asset asset, bool reload) {
+  void loadMedia(RemoteAsset asset, bool reload) {
     _gCastService.loadMedia(asset, reload);
   }
 
+  // TODO: remove this when we migrate to new timeline
+  void loadMediaOld(old_asset_entity.Asset asset, bool reload) {
+    final remoteAsset = RemoteAsset(
+      id: asset.remoteId.toString(),
+      name: asset.name,
+      ownerId: asset.ownerId.toString(),
+      checksum: asset.checksum,
+      type: asset.type == old_asset_entity.AssetType.image
+          ? AssetType.image
+          : asset.type == old_asset_entity.AssetType.video
+              ? AssetType.video
+              : AssetType.other,
+      createdAt: asset.fileCreatedAt,
+      updatedAt: asset.updatedAt,
+    );
+
+    _gCastService.loadMedia(remoteAsset, reload);
+  }
+
   Future<void> connect(CastDestinationType type, dynamic device) async {
     switch (type) {
       case CastDestinationType.googleCast:
diff --git a/mobile/lib/services/gcast.service.dart b/mobile/lib/services/gcast.service.dart
index 5a8c27b0db..6d6646fe50 100644
--- a/mobile/lib/services/gcast.service.dart
+++ b/mobile/lib/services/gcast.service.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:cast/session.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/models/cast/cast_manager_state.dart';
 import 'package:immich_mobile/models/sessions/session_create_response.model.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
@@ -156,12 +156,10 @@ class GCastService {
     return bufferedExpiration.isAfter(DateTime.now());
   }
 
-  void loadMedia(Asset asset, bool reload) async {
+  void loadMedia(RemoteAsset asset, bool reload) async {
     if (!isConnected) {
       return;
-    } else if (asset.remoteId == null) {
-      return;
-    } else if (asset.remoteId == currentAssetId && !reload) {
+    } else if (asset.id == currentAssetId && !reload) {
       return;
     }
 
@@ -176,10 +174,10 @@ class GCastService {
 
     final unauthenticatedUrl = asset.isVideo
         ? getPlaybackUrlForRemoteId(
-            asset.remoteId!,
+            asset.id,
           )
         : getThumbnailUrlForRemoteId(
-            asset.remoteId!,
+            asset.id,
             type: AssetMediaSize.fullsize,
           );
 
@@ -187,8 +185,7 @@ class GCastService {
         "$unauthenticatedUrl&sessionKey=${sessionKey?.token}";
 
     // get image mime type
-    final mimeType =
-        await _assetApiRepository.getAssetMIMEType(asset.remoteId!);
+    final mimeType = await _assetApiRepository.getAssetMIMEType(asset.id);
 
     if (mimeType == null) {
       return;
@@ -205,7 +202,7 @@ class GCastService {
       "autoplay": true,
     });
 
-    currentAssetId = asset.remoteId;
+    currentAssetId = asset.id;
 
     // we need to poll for media status since the cast device does not
     // send a message when the media is loaded for whatever reason
diff --git a/mobile/lib/widgets/asset_viewer/custom_video_player_controls.dart b/mobile/lib/widgets/asset_viewer/custom_video_player_controls.dart
index d64e507170..18565c8332 100644
--- a/mobile/lib/widgets/asset_viewer/custom_video_player_controls.dart
+++ b/mobile/lib/widgets/asset_viewer/custom_video_player_controls.dart
@@ -76,7 +76,7 @@ class CustomVideoPlayerControls extends HookConsumerWidget {
           if (asset == null) {
             return;
           }
-          ref.read(castProvider.notifier).loadMedia(asset, true);
+          ref.read(castProvider.notifier).loadMediaOld(asset, true);
         }
         return;
       }

From 2046dcc5b4bcaca87e2d430e7ad9015d7c002991 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Thu, 17 Jul 2025 22:43:21 +0530
Subject: [PATCH 231/337] fix: mobile storage status check (#19986)

* fix: _shouldUseLocalAsset check

* show storage indicators in local album view

* update local thumb provider to work with remote asset

* update checks

* do not show upload button when selection is only merged assets

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../repositories/timeline.repository.dart     | 16 ++++-
 .../pages/local_timeline.page.dart            |  1 +
 .../bottom_sheet/location_details.widget.dart |  2 +-
 .../widgets/images/image_provider.dart        | 18 +++++-
 .../widgets/images/local_image_provider.dart  | 61 +++++++++++--------
 5 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index a125d87d8d..4ec8a93b8d 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -165,15 +165,25 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
           _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
           useColumns: false,
         ),
+        leftOuterJoin(
+          _db.remoteAssetEntity,
+          _db.localAssetEntity.checksum
+              .equalsExp(_db.remoteAssetEntity.checksum),
+          useColumns: false,
+        ),
       ],
     )
+      ..addColumns([_db.remoteAssetEntity.id])
       ..where(_db.localAlbumAssetEntity.albumId.equals(albumId))
       ..orderBy([OrderingTerm.desc(_db.localAssetEntity.createdAt)])
       ..limit(count, offset: offset);
 
-    return query
-        .map((row) => row.readTable(_db.localAssetEntity).toDto())
-        .get();
+    return query.map((row) {
+      final asset = row.readTable(_db.localAssetEntity).toDto();
+      return asset.copyWith(
+        remoteId: row.read(_db.remoteAssetEntity.id),
+      );
+    }).get();
   }
 
   TimelineQuery remoteAlbum(String albumId, GroupAssetsBy groupBy) => (
diff --git a/mobile/lib/presentation/pages/local_timeline.page.dart b/mobile/lib/presentation/pages/local_timeline.page.dart
index b4df0f64e2..fd4e44616b 100644
--- a/mobile/lib/presentation/pages/local_timeline.page.dart
+++ b/mobile/lib/presentation/pages/local_timeline.page.dart
@@ -30,6 +30,7 @@ class LocalTimelinePage extends StatelessWidget {
       child: Timeline(
         appBar: MesmerizingSliverAppBar(title: album.name),
         bottomSheet: const LocalAlbumBottomSheet(),
+        showStorageIndicator: true,
       ),
     );
   }
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
index 2d22d063bd..2bf52bd094 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
@@ -72,7 +72,7 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
 
     // Guard no lat/lng
     if (!hasCoordinates ||
-        (asset is LocalAsset && !(asset as LocalAsset).hasRemote)) {
+        (asset != null && asset is LocalAsset && asset!.hasRemote)) {
       return const SizedBox.shrink();
     }
 
diff --git a/mobile/lib/presentation/widgets/images/image_provider.dart b/mobile/lib/presentation/widgets/images/image_provider.dart
index e79665baf7..970bb581cf 100644
--- a/mobile/lib/presentation/widgets/images/image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/image_provider.dart
@@ -12,7 +12,13 @@ ImageProvider getFullImageProvider(
   // Create new provider and cache it
   final ImageProvider provider;
   if (_shouldUseLocalAsset(asset)) {
-    provider = LocalFullImageProvider(asset: asset as LocalAsset, size: size);
+    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).localId!;
+    provider = LocalFullImageProvider(
+      id: id,
+      name: asset.name,
+      size: size,
+      type: asset.type,
+    );
   } else {
     final String assetId;
     if (asset is LocalAsset && asset.hasRemote) {
@@ -43,7 +49,13 @@ ImageProvider getThumbnailImageProvider({
   }
 
   if (_shouldUseLocalAsset(asset!)) {
-    return LocalThumbProvider(asset: asset as LocalAsset, size: size);
+    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).localId!;
+    return LocalThumbProvider(
+      id: id,
+      updatedAt: asset.updatedAt,
+      name: asset.name,
+      size: size,
+    );
   }
 
   final String assetId;
@@ -59,5 +71,5 @@ ImageProvider getThumbnailImageProvider({
 }
 
 bool _shouldUseLocalAsset(BaseAsset asset) =>
-    asset is LocalAsset &&
+    asset.hasLocal &&
     (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage));
diff --git a/mobile/lib/presentation/widgets/images/local_image_provider.dart b/mobile/lib/presentation/widgets/images/local_image_provider.dart
index f046fcad47..65311de48a 100644
--- a/mobile/lib/presentation/widgets/images/local_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/local_image_provider.dart
@@ -21,11 +21,15 @@ class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
       const AssetMediaRepository();
   final CacheManager? cacheManager;
 
-  final LocalAsset asset;
+  final String id;
+  final DateTime updatedAt;
+  final String name;
   final Size size;
 
   const LocalThumbProvider({
-    required this.asset,
+    required this.id,
+    required this.updatedAt,
+    required this.name,
     this.size = const Size.square(kTimelineFixedTileExtent),
     this.cacheManager,
   });
@@ -46,7 +50,10 @@ class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
       scale: 1.0,
       informationCollector: () => <DiagnosticsNode>[
         DiagnosticsProperty<ImageProvider>('Image provider', this),
-        DiagnosticsProperty<LocalAsset>('Asset', key.asset),
+        DiagnosticsProperty<String>('Id', key.id),
+        DiagnosticsProperty<DateTime>('Updated at', key.updatedAt),
+        DiagnosticsProperty<String>('Name', key.name),
+        DiagnosticsProperty<Size>('Size', key.size),
       ],
     );
   }
@@ -57,7 +64,7 @@ class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
     ImageDecoderCallback decode,
   ) async {
     final cacheKey =
-        '${key.asset.id}-${key.asset.updatedAt}-${key.size.width}x${key.size.height}';
+        '${key.id}-${key.updatedAt}-${key.size.width}x${key.size.height}';
 
     final fileFromCache = await cache.getFileFromCache(cacheKey);
     if (fileFromCache != null) {
@@ -69,11 +76,11 @@ class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
     }
 
     final thumbnailBytes =
-        await _assetMediaRepository.getThumbnail(key.asset.id, size: key.size);
+        await _assetMediaRepository.getThumbnail(key.id, size: key.size);
     if (thumbnailBytes == null) {
       PaintingBinding.instance.imageCache.evict(key);
       throw StateError(
-        "Loading thumb for local photo ${key.asset.name} failed",
+        "Loading thumb for local photo ${key.name} failed",
       );
     }
 
@@ -86,14 +93,13 @@ class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is LocalThumbProvider) {
-      return asset.id == other.asset.id &&
-          asset.updatedAt == other.asset.updatedAt;
+      return id == other.id && updatedAt == other.updatedAt;
     }
     return false;
   }
 
   @override
-  int get hashCode => asset.id.hashCode ^ asset.updatedAt.hashCode;
+  int get hashCode => id.hashCode ^ updatedAt.hashCode;
 }
 
 class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
@@ -101,12 +107,16 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
       const AssetMediaRepository();
   final StorageRepository _storageRepository = const StorageRepository();
 
-  final LocalAsset asset;
+  final String id;
+  final String name;
   final Size size;
+  final AssetType type;
 
   const LocalFullImageProvider({
-    required this.asset,
+    required this.id,
+    required this.name,
     required this.size,
+    required this.type,
   });
 
   @override
@@ -123,7 +133,7 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
       codec: _codec(key, decode),
       scale: 1.0,
       informationCollector: () sync* {
-        yield ErrorDescription(asset.name);
+        yield ErrorDescription(name);
       },
     );
   }
@@ -134,24 +144,24 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
     ImageDecoderCallback decode,
   ) async* {
     try {
-      switch (key.asset.type) {
+      switch (key.type) {
         case AssetType.image:
           yield* _decodeProgressive(key, decode);
           break;
         case AssetType.video:
           final codec = await _getThumbnailCodec(key, decode);
           if (codec == null) {
-            throw StateError("Failed to load preview for ${key.asset.name}");
+            throw StateError("Failed to load preview for ${key.name}");
           }
           yield codec;
           break;
         case AssetType.other:
         case AssetType.audio:
-          throw StateError('Unsupported asset type ${key.asset.type}');
+          throw StateError('Unsupported asset type ${key.type}');
       }
     } catch (error, stack) {
       Logger('ImmichLocalImageProvider')
-          .severe('Error loading local image ${key.asset.name}', error, stack);
+          .severe('Error loading local image ${key.name}', error, stack);
       throw const ImageLoadingException(
         'Could not load image from local storage',
       );
@@ -163,7 +173,7 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
     ImageDecoderCallback decode,
   ) async {
     final thumbBytes =
-        await _assetMediaRepository.getThumbnail(key.asset.id, size: key.size);
+        await _assetMediaRepository.getThumbnail(key.id, size: key.size);
     if (thumbBytes == null) {
       return null;
     }
@@ -175,9 +185,9 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
     LocalFullImageProvider key,
     ImageDecoderCallback decode,
   ) async* {
-    final file = await _storageRepository.getFileForAsset(key.asset.id);
+    final file = await _storageRepository.getFileForAsset(key.id);
     if (file == null) {
-      throw StateError("Opening file for asset ${key.asset.name} failed");
+      throw StateError("Opening file for asset ${key.name} failed");
     }
 
     final fileSize = await file.length();
@@ -195,7 +205,7 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
           (key.size.height * progressiveMultiplier).clamp(256, 1024),
         );
         final mediumThumb =
-            await _assetMediaRepository.getThumbnail(key.asset.id, size: size);
+            await _assetMediaRepository.getThumbnail(key.id, size: size);
         if (mediumThumb != null) {
           final mediumBuffer = await ImmutableBuffer.fromUint8List(mediumThumb);
           yield await decode(mediumBuffer);
@@ -212,7 +222,7 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
         (key.size.height * progressiveMultiplier).clamp(512, 2048),
       );
       final highThumb =
-          await _assetMediaRepository.getThumbnail(key.asset.id, size: size);
+          await _assetMediaRepository.getThumbnail(key.id, size: size);
       if (highThumb != null) {
         final highBuffer = await ImmutableBuffer.fromUint8List(highThumb);
         yield await decode(highBuffer);
@@ -228,14 +238,15 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is LocalFullImageProvider) {
-      return asset.id == other.asset.id &&
-          asset.updatedAt == other.asset.updatedAt &&
-          size == other.size;
+      return id == other.id &&
+          size == other.size &&
+          type == other.type &&
+          name == other.name;
     }
     return false;
   }
 
   @override
   int get hashCode =>
-      asset.id.hashCode ^ asset.updatedAt.hashCode ^ size.hashCode;
+      id.hashCode ^ size.hashCode ^ type.hashCode ^ name.hashCode;
 }

From 8491fe459dd6770fdf98d7504498d1802f4f3cb8 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Fri, 18 Jul 2025 04:25:25 +0800
Subject: [PATCH 232/337] feat(mobile): drift search page (#19811)

* feat(mobile): drift search page

* migrate to drift page

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 mobile/analysis_options.yaml                  |   1 +
 .../domain/models/search_result.model.dart    |  38 +
 .../lib/domain/services/search.service.dart   |  92 ++
 .../lib/domain/services/timeline.service.dart |   3 +
 .../repositories/search_api.repository.dart   |  87 ++
 .../repositories/timeline.repository.dart     |   6 +
 mobile/lib/pages/common/tab_shell.page.dart   |   2 +-
 .../pages/dev/feat_in_development.page.dart   |  10 -
 .../pages/search/drift_search.page.dart       | 925 ++++++++++++++++++
 .../search/paginated_search.provider.dart     |  40 +
 .../widgets/timeline/timeline.state.dart      |  13 +-
 .../widgets/timeline/timeline.widget.dart     |  61 +-
 .../infrastructure/search.provider.dart       |  12 +
 mobile/lib/routing/router.dart                |   3 +-
 mobile/lib/routing/router.gr.dart             |  39 +
 mobile/lib/services/search.service.dart       |  80 +-
 mobile/lib/utils/provider_utils.dart          |   2 +
 17 files changed, 1305 insertions(+), 109 deletions(-)
 create mode 100644 mobile/lib/domain/models/search_result.model.dart
 create mode 100644 mobile/lib/domain/services/search.service.dart
 create mode 100644 mobile/lib/infrastructure/repositories/search_api.repository.dart
 create mode 100644 mobile/lib/presentation/pages/search/drift_search.page.dart
 create mode 100644 mobile/lib/presentation/pages/search/paginated_search.provider.dart
 create mode 100644 mobile/lib/providers/infrastructure/search.provider.dart

diff --git a/mobile/analysis_options.yaml b/mobile/analysis_options.yaml
index 2c52595a26..7a03b54a95 100644
--- a/mobile/analysis_options.yaml
+++ b/mobile/analysis_options.yaml
@@ -106,6 +106,7 @@ custom_lint:
         - lib/utils/{image_url_builder,openapi_patching}.dart # utils are fine
         - test/modules/utils/openapi_patching_test.dart # filename is self-explanatory...
         - lib/domain/services/sync_stream.service.dart # Making sure to comply with the type from database
+        - lib/domain/services/search.service.dart
 
         # refactor
         - lib/models/map/map_marker.model.dart
diff --git a/mobile/lib/domain/models/search_result.model.dart b/mobile/lib/domain/models/search_result.model.dart
new file mode 100644
index 0000000000..e8c9429432
--- /dev/null
+++ b/mobile/lib/domain/models/search_result.model.dart
@@ -0,0 +1,38 @@
+import 'package:collection/collection.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+
+class SearchResult {
+  final List<BaseAsset> assets;
+  final int? nextPage;
+
+  const SearchResult({
+    required this.assets,
+    this.nextPage,
+  });
+
+  int get totalAssets => assets.length;
+
+  SearchResult copyWith({
+    List<BaseAsset>? assets,
+    int? nextPage,
+  }) {
+    return SearchResult(
+      assets: assets ?? this.assets,
+      nextPage: nextPage ?? this.nextPage,
+    );
+  }
+
+  @override
+  String toString() => 'SearchResult(assets: $assets, nextPage: $nextPage)';
+
+  @override
+  bool operator ==(covariant SearchResult other) {
+    if (identical(this, other)) return true;
+    final listEquals = const DeepCollectionEquality().equals;
+
+    return listEquals(other.assets, assets) && other.nextPage == nextPage;
+  }
+
+  @override
+  int get hashCode => assets.hashCode ^ nextPage.hashCode;
+}
diff --git a/mobile/lib/domain/services/search.service.dart b/mobile/lib/domain/services/search.service.dart
new file mode 100644
index 0000000000..052a2ca9da
--- /dev/null
+++ b/mobile/lib/domain/services/search.service.dart
@@ -0,0 +1,92 @@
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/search_result.model.dart';
+import 'package:immich_mobile/extensions/string_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/search_api.repository.dart';
+import 'package:immich_mobile/models/search/search_filter.model.dart';
+import 'package:logging/logging.dart';
+import 'package:openapi/api.dart' as api show AssetVisibility;
+import 'package:openapi/api.dart' hide AssetVisibility;
+
+class SearchService {
+  final _log = Logger("SearchService");
+  final SearchApiRepository _searchApiRepository;
+
+  SearchService(this._searchApiRepository);
+
+  Future<List<String>?> getSearchSuggestions(
+    SearchSuggestionType type, {
+    String? country,
+    String? state,
+    String? make,
+    String? model,
+  }) async {
+    try {
+      return await _searchApiRepository.getSearchSuggestions(
+        type,
+        country: country,
+        state: state,
+        make: make,
+        model: model,
+      );
+    } catch (e) {
+      _log.warning("Failed to get search suggestions", e);
+    }
+    return [];
+  }
+
+  Future<SearchResult?> search(SearchFilter filter, int page) async {
+    try {
+      final response = await _searchApiRepository.search(filter, page);
+
+      if (response == null || response.assets.items.isEmpty) {
+        return null;
+      }
+
+      return SearchResult(
+        assets: response.assets.items.map((e) => e.toDto()).toList(),
+        nextPage: response.assets.nextPage?.toInt(),
+      );
+    } catch (error, stackTrace) {
+      _log.severe("Failed to search for assets", error, stackTrace);
+    }
+    return null;
+  }
+}
+
+extension on AssetResponseDto {
+  RemoteAsset toDto() {
+    return RemoteAsset(
+      id: id,
+      name: originalFileName,
+      checksum: checksum,
+      createdAt: fileCreatedAt,
+      updatedAt: updatedAt,
+      ownerId: ownerId,
+      visibility: switch (visibility) {
+        api.AssetVisibility.timeline => AssetVisibility.timeline,
+        api.AssetVisibility.hidden => AssetVisibility.hidden,
+        api.AssetVisibility.archive => AssetVisibility.archive,
+        api.AssetVisibility.locked => AssetVisibility.locked,
+        _ => AssetVisibility.timeline,
+      },
+      durationInSeconds: duration.toDuration()?.inSeconds ?? 0,
+      height: exifInfo?.exifImageHeight?.toInt(),
+      width: exifInfo?.exifImageWidth?.toInt(),
+      isFavorite: isFavorite,
+      livePhotoVideoId: livePhotoVideoId,
+      thumbHash: thumbhash,
+      localId: null,
+      type: type.toAssetType(),
+    );
+  }
+}
+
+extension on AssetTypeEnum {
+  AssetType toAssetType() => switch (this) {
+        AssetTypeEnum.IMAGE => AssetType.image,
+        AssetTypeEnum.VIDEO => AssetType.video,
+        AssetTypeEnum.AUDIO => AssetType.audio,
+        AssetTypeEnum.OTHER => AssetType.other,
+        _ => throw Exception('Unknown AssetType value: $this'),
+      };
+}
diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 14a854a760..0d31f06e74 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -65,6 +65,9 @@ class TimelineFactory {
 
   TimelineService place(String place) =>
       TimelineService(_timelineRepository.place(place, groupBy));
+
+  TimelineService fromAssets(List<BaseAsset> assets) =>
+      TimelineService(_timelineRepository.fromAssets(assets));
 }
 
 class TimelineService {
diff --git a/mobile/lib/infrastructure/repositories/search_api.repository.dart b/mobile/lib/infrastructure/repositories/search_api.repository.dart
new file mode 100644
index 0000000000..55604b885c
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/search_api.repository.dart
@@ -0,0 +1,87 @@
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart'
+    hide AssetVisibility;
+import 'package:immich_mobile/infrastructure/repositories/api.repository.dart';
+import 'package:immich_mobile/models/search/search_filter.model.dart';
+import 'package:openapi/api.dart';
+
+class SearchApiRepository extends ApiRepository {
+  final SearchApi _api;
+  const SearchApiRepository(this._api);
+
+  Future<SearchResponseDto?> search(SearchFilter filter, int page) {
+    AssetTypeEnum? type;
+    if (filter.mediaType.index == AssetType.image.index) {
+      type = AssetTypeEnum.IMAGE;
+    } else if (filter.mediaType.index == AssetType.video.index) {
+      type = AssetTypeEnum.VIDEO;
+    }
+
+    if (filter.context != null && filter.context!.isNotEmpty) {
+      return _api.searchSmart(
+        SmartSearchDto(
+          query: filter.context!,
+          language: filter.language,
+          country: filter.location.country,
+          state: filter.location.state,
+          city: filter.location.city,
+          make: filter.camera.make,
+          model: filter.camera.model,
+          takenAfter: filter.date.takenAfter,
+          takenBefore: filter.date.takenBefore,
+          visibility: filter.display.isArchive
+              ? AssetVisibility.archive
+              : AssetVisibility.timeline,
+          isFavorite: filter.display.isFavorite ? true : null,
+          isNotInAlbum: filter.display.isNotInAlbum ? true : null,
+          personIds: filter.people.map((e) => e.id).toList(),
+          type: type,
+          page: page,
+          size: 1000,
+        ),
+      );
+    }
+
+    return _api.searchAssets(
+      MetadataSearchDto(
+        originalFileName: filter.filename != null && filter.filename!.isNotEmpty
+            ? filter.filename
+            : null,
+        country: filter.location.country,
+        description:
+            filter.description != null && filter.description!.isNotEmpty
+                ? filter.description
+                : null,
+        state: filter.location.state,
+        city: filter.location.city,
+        make: filter.camera.make,
+        model: filter.camera.model,
+        takenAfter: filter.date.takenAfter,
+        takenBefore: filter.date.takenBefore,
+        visibility: filter.display.isArchive
+            ? AssetVisibility.archive
+            : AssetVisibility.timeline,
+        isFavorite: filter.display.isFavorite ? true : null,
+        isNotInAlbum: filter.display.isNotInAlbum ? true : null,
+        personIds: filter.people.map((e) => e.id).toList(),
+        type: type,
+        page: page,
+        size: 1000,
+      ),
+    );
+  }
+
+  Future<List<String>?> getSearchSuggestions(
+    SearchSuggestionType type, {
+    String? country,
+    String? state,
+    String? make,
+    String? model,
+  }) =>
+      _api.getSearchSuggestions(
+        type,
+        country: country,
+        state: state,
+        make: make,
+        model: model,
+      );
+}
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 4ec8a93b8d..a6d89b5e8e 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -302,6 +302,12 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         .get();
   }
 
+  TimelineQuery fromAssets(List<BaseAsset> assets) => (
+        bucketSource: () => Stream.value(_generateBuckets(assets.length)),
+        assetSource: (offset, count) =>
+            Future.value(assets.skip(offset).take(count).toList()),
+      );
+
   TimelineQuery remote(String ownerId, GroupAssetsBy groupBy) =>
       _remoteQueryBuilder(
         filter: (row) =>
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index 007dc4c9d6..24efff143f 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -133,7 +133,7 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
     return AutoTabsRouter(
       routes: [
         const MainTimelineRoute(),
-        SearchRoute(),
+        DriftSearchRoute(),
         const DriftAlbumsRoute(),
         const DriftLibraryRoute(),
       ],
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index bdb426fe22..2815b2db83 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -22,16 +22,6 @@ final _features = [
     icon: Icons.timeline_rounded,
     onTap: (ctx, _) => ctx.pushRoute(const TabShellRoute()),
   ),
-  _Feature(
-    name: 'Video',
-    icon: Icons.video_collection_outlined,
-    onTap: (ctx, _) => ctx.pushRoute(const DriftVideoRoute()),
-  ),
-  _Feature(
-    name: 'Recently Taken',
-    icon: Icons.schedule_outlined,
-    onTap: (ctx, _) => ctx.pushRoute(const DriftRecentlyTakenRoute()),
-  ),
   _Feature(
     name: 'Selection Mode Timeline',
     icon: Icons.developer_mode_rounded,
diff --git a/mobile/lib/presentation/pages/search/drift_search.page.dart b/mobile/lib/presentation/pages/search/drift_search.page.dart
new file mode 100644
index 0000000000..5a5eb44b3b
--- /dev/null
+++ b/mobile/lib/presentation/pages/search/drift_search.page.dart
@@ -0,0 +1,925 @@
+import 'dart:async';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/person.model.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.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/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/common/search_field.dart';
+import 'package:immich_mobile/widgets/search/search_filter/camera_picker.dart';
+import 'package:immich_mobile/widgets/search/search_filter/display_option_picker.dart';
+import 'package:immich_mobile/widgets/search/search_filter/filter_bottom_sheet_scaffold.dart';
+import 'package:immich_mobile/widgets/search/search_filter/location_picker.dart';
+import 'package:immich_mobile/widgets/search/search_filter/media_type_picker.dart';
+import 'package:immich_mobile/widgets/search/search_filter/people_picker.dart';
+import 'package:immich_mobile/widgets/search/search_filter/search_filter_chip.dart';
+import 'package:immich_mobile/widgets/search/search_filter/search_filter_utils.dart';
+
+@RoutePage()
+class DriftSearchPage extends HookConsumerWidget {
+  const DriftSearchPage({super.key, this.preFilter});
+
+  final SearchFilter? preFilter;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final textSearchType = useState<TextSearchType>(TextSearchType.context);
+    final searchHintText =
+        useState<String>('sunrise_on_the_beach'.t(context: context));
+    final textSearchController = useTextEditingController();
+    final filter = useState<SearchFilter>(
+      SearchFilter(
+        people: preFilter?.people ?? {},
+        location: preFilter?.location ?? SearchLocationFilter(),
+        camera: preFilter?.camera ?? SearchCameraFilter(),
+        date: preFilter?.date ?? SearchDateFilter(),
+        display: preFilter?.display ??
+            SearchDisplayFilters(
+              isNotInAlbum: false,
+              isArchive: false,
+              isFavorite: false,
+            ),
+        mediaType: preFilter?.mediaType ?? AssetType.other,
+        language:
+            "${context.locale.languageCode}-${context.locale.countryCode}",
+      ),
+    );
+
+    final previousFilter = useState<SearchFilter?>(null);
+
+    final peopleCurrentFilterWidget = useState<Widget?>(null);
+    final dateRangeCurrentFilterWidget = useState<Widget?>(null);
+    final cameraCurrentFilterWidget = useState<Widget?>(null);
+    final locationCurrentFilterWidget = useState<Widget?>(null);
+    final mediaTypeCurrentFilterWidget = useState<Widget?>(null);
+    final displayOptionCurrentFilterWidget = useState<Widget?>(null);
+
+    final isSearching = useState(false);
+
+    SnackBar searchInfoSnackBar(String message) {
+      return SnackBar(
+        content: Text(
+          message,
+          style: context.textTheme.labelLarge,
+        ),
+        showCloseIcon: true,
+        behavior: SnackBarBehavior.fixed,
+        closeIconColor: context.colorScheme.onSurface,
+      );
+    }
+
+    search() async {
+      if (filter.value.isEmpty) {
+        return;
+      }
+
+      if (preFilter == null && filter.value == previousFilter.value) {
+        return;
+      }
+
+      isSearching.value = true;
+      ref.watch(paginatedSearchProvider.notifier).clear();
+      final hasResult = await ref
+          .watch(paginatedSearchProvider.notifier)
+          .search(filter.value);
+
+      if (!hasResult) {
+        context.showSnackBar(
+          searchInfoSnackBar('search_no_result'.t(context: context)),
+        );
+      }
+
+      previousFilter.value = filter.value;
+      isSearching.value = false;
+    }
+
+    loadMoreSearchResult() async {
+      isSearching.value = true;
+      final hasResult = await ref
+          .watch(paginatedSearchProvider.notifier)
+          .search(filter.value);
+
+      if (!hasResult) {
+        context.showSnackBar(
+          searchInfoSnackBar('search_no_more_result'.t(context: context)),
+        );
+      }
+
+      isSearching.value = false;
+    }
+
+    searchPreFilter() {
+      if (preFilter != null) {
+        Future.delayed(
+          Duration.zero,
+          () {
+            search();
+
+            if (preFilter!.location.city != null) {
+              locationCurrentFilterWidget.value = Text(
+                preFilter!.location.city!,
+                style: context.textTheme.labelLarge,
+              );
+            }
+          },
+        );
+      }
+    }
+
+    useEffect(
+      () {
+        Future.microtask(
+          () => ref.invalidate(paginatedSearchProvider),
+        );
+        searchPreFilter();
+
+        return null;
+      },
+      [],
+    );
+
+    showPeoplePicker() {
+      handleOnSelect(Set<Person> value) {
+        filter.value = filter.value.copyWith(
+          people: value,
+        );
+
+        peopleCurrentFilterWidget.value = Text(
+          value
+              .map((e) => e.name != '' ? e.name : 'no_name'.t(context: context))
+              .join(', '),
+          style: context.textTheme.labelLarge,
+        );
+      }
+
+      handleClear() {
+        filter.value = filter.value.copyWith(
+          people: {},
+        );
+
+        peopleCurrentFilterWidget.value = null;
+        search();
+      }
+
+      showFilterBottomSheet(
+        context: context,
+        isScrollControlled: true,
+        child: FractionallySizedBox(
+          heightFactor: 0.8,
+          child: FilterBottomSheetScaffold(
+            title: 'search_filter_people_title'.t(context: context),
+            expanded: true,
+            onSearch: search,
+            onClear: handleClear,
+            child: PeoplePicker(
+              onSelect: handleOnSelect,
+              filter: filter.value.people,
+            ),
+          ),
+        ),
+      );
+    }
+
+    showLocationPicker() {
+      handleOnSelect(Map<String, String?> value) {
+        filter.value = filter.value.copyWith(
+          location: SearchLocationFilter(
+            country: value['country'],
+            city: value['city'],
+            state: value['state'],
+          ),
+        );
+
+        final locationText = <String>[];
+        if (value['country'] != null) {
+          locationText.add(value['country']!);
+        }
+
+        if (value['state'] != null) {
+          locationText.add(value['state']!);
+        }
+
+        if (value['city'] != null) {
+          locationText.add(value['city']!);
+        }
+
+        locationCurrentFilterWidget.value = Text(
+          locationText.join(', '),
+          style: context.textTheme.labelLarge,
+        );
+      }
+
+      handleClear() {
+        filter.value = filter.value.copyWith(
+          location: SearchLocationFilter(),
+        );
+
+        locationCurrentFilterWidget.value = null;
+        search();
+      }
+
+      showFilterBottomSheet(
+        context: context,
+        isScrollControlled: true,
+        isDismissible: true,
+        child: FilterBottomSheetScaffold(
+          title: 'search_filter_location_title'.t(context: context),
+          onSearch: search,
+          onClear: handleClear,
+          child: Padding(
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
+            child: Container(
+              padding: EdgeInsets.only(
+                bottom: context.viewInsets.bottom,
+              ),
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                child: LocationPicker(
+                  onSelected: handleOnSelect,
+                  filter: filter.value.location,
+                ),
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    showCameraPicker() {
+      handleOnSelect(Map<String, String?> value) {
+        filter.value = filter.value.copyWith(
+          camera: SearchCameraFilter(
+            make: value['make'],
+            model: value['model'],
+          ),
+        );
+
+        cameraCurrentFilterWidget.value = Text(
+          '${value['make'] ?? ''} ${value['model'] ?? ''}',
+          style: context.textTheme.labelLarge,
+        );
+      }
+
+      handleClear() {
+        filter.value = filter.value.copyWith(
+          camera: SearchCameraFilter(),
+        );
+
+        cameraCurrentFilterWidget.value = null;
+        search();
+      }
+
+      showFilterBottomSheet(
+        context: context,
+        isScrollControlled: true,
+        isDismissible: true,
+        child: FilterBottomSheetScaffold(
+          title: 'search_filter_camera_title'.t(context: context),
+          onSearch: search,
+          onClear: handleClear,
+          child: Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: CameraPicker(
+              onSelect: handleOnSelect,
+              filter: filter.value.camera,
+            ),
+          ),
+        ),
+      );
+    }
+
+    showDatePicker() async {
+      final firstDate = DateTime(1900);
+      final lastDate = DateTime.now();
+
+      final date = await showDateRangePicker(
+        context: context,
+        firstDate: firstDate,
+        lastDate: lastDate,
+        currentDate: DateTime.now(),
+        initialDateRange: DateTimeRange(
+          start: filter.value.date.takenAfter ?? lastDate,
+          end: filter.value.date.takenBefore ?? lastDate,
+        ),
+        helpText: 'search_filter_date_title'.t(context: context),
+        cancelText: 'cancel'.t(context: context),
+        confirmText: 'select'.t(context: context),
+        saveText: 'save'.t(context: context),
+        errorFormatText: 'invalid_date_format'.t(context: context),
+        errorInvalidText: 'invalid_date'.t(context: context),
+        fieldStartHintText: 'start_date'.t(context: context),
+        fieldEndHintText: 'end_date'.t(context: context),
+        initialEntryMode: DatePickerEntryMode.calendar,
+        keyboardType: TextInputType.text,
+      );
+
+      if (date == null) {
+        filter.value = filter.value.copyWith(
+          date: SearchDateFilter(),
+        );
+
+        dateRangeCurrentFilterWidget.value = null;
+        search();
+        return;
+      }
+
+      filter.value = filter.value.copyWith(
+        date: SearchDateFilter(
+          takenAfter: date.start,
+          takenBefore: date.end.add(
+            const Duration(
+              hours: 23,
+              minutes: 59,
+              seconds: 59,
+            ),
+          ),
+        ),
+      );
+
+      // If date range is less than 24 hours, set the end date to the end of the day
+      if (date.end.difference(date.start).inHours < 24) {
+        dateRangeCurrentFilterWidget.value = Text(
+          DateFormat.yMMMd().format(date.start.toLocal()),
+          style: context.textTheme.labelLarge,
+        );
+      } 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()),
+            },
+          ),
+          style: context.textTheme.labelLarge,
+        );
+      }
+
+      search();
+    }
+
+    // MEDIA PICKER
+    showMediaTypePicker() {
+      handleOnSelected(AssetType assetType) {
+        filter.value = filter.value.copyWith(
+          mediaType: assetType,
+        );
+
+        mediaTypeCurrentFilterWidget.value = Text(
+          assetType == AssetType.image
+              ? 'image'.t(context: context)
+              : assetType == AssetType.video
+                  ? 'video'.t(context: context)
+                  : 'all'.t(context: context),
+          style: context.textTheme.labelLarge,
+        );
+      }
+
+      handleClear() {
+        filter.value = filter.value.copyWith(
+          mediaType: AssetType.other,
+        );
+
+        mediaTypeCurrentFilterWidget.value = null;
+        search();
+      }
+
+      showFilterBottomSheet(
+        context: context,
+        child: FilterBottomSheetScaffold(
+          title: 'search_filter_media_type_title'.t(context: context),
+          onSearch: search,
+          onClear: handleClear,
+          child: MediaTypePicker(
+            onSelect: handleOnSelected,
+            filter: filter.value.mediaType,
+          ),
+        ),
+      );
+    }
+
+    // DISPLAY OPTION
+    showDisplayOptionPicker() {
+      handleOnSelect(Map<DisplayOption, bool> value) {
+        final filterText = <String>[];
+        value.forEach((key, value) {
+          switch (key) {
+            case DisplayOption.notInAlbum:
+              filter.value = filter.value.copyWith(
+                display: filter.value.display.copyWith(
+                  isNotInAlbum: value,
+                ),
+              );
+              if (value) {
+                filterText.add(
+                  'search_filter_display_option_not_in_album'
+                      .t(context: context),
+                );
+              }
+              break;
+            case DisplayOption.archive:
+              filter.value = filter.value.copyWith(
+                display: filter.value.display.copyWith(
+                  isArchive: value,
+                ),
+              );
+              if (value) {
+                filterText.add('archive'.t(context: context));
+              }
+              break;
+            case DisplayOption.favorite:
+              filter.value = filter.value.copyWith(
+                display: filter.value.display.copyWith(
+                  isFavorite: value,
+                ),
+              );
+              if (value) {
+                filterText.add('favorite'.t(context: context));
+              }
+              break;
+          }
+        });
+
+        if (filterText.isEmpty) {
+          displayOptionCurrentFilterWidget.value = null;
+          return;
+        }
+
+        displayOptionCurrentFilterWidget.value = Text(
+          filterText.join(', '),
+          style: context.textTheme.labelLarge,
+        );
+      }
+
+      handleClear() {
+        filter.value = filter.value.copyWith(
+          display: SearchDisplayFilters(
+            isNotInAlbum: false,
+            isArchive: false,
+            isFavorite: false,
+          ),
+        );
+
+        displayOptionCurrentFilterWidget.value = null;
+        search();
+      }
+
+      showFilterBottomSheet(
+        context: context,
+        child: FilterBottomSheetScaffold(
+          title: 'display_options'.t(context: context),
+          onSearch: search,
+          onClear: handleClear,
+          child: DisplayOptionPicker(
+            onSelect: handleOnSelect,
+            filter: filter.value.display,
+          ),
+        ),
+      );
+    }
+
+    handleTextSubmitted(String value) {
+      switch (textSearchType.value) {
+        case TextSearchType.context:
+          filter.value = filter.value.copyWith(
+            filename: '',
+            context: value,
+            description: '',
+          );
+
+          break;
+        case TextSearchType.filename:
+          filter.value = filter.value.copyWith(
+            filename: value,
+            context: '',
+            description: '',
+          );
+
+          break;
+        case TextSearchType.description:
+          filter.value = filter.value.copyWith(
+            filename: '',
+            context: '',
+            description: value,
+          );
+          break;
+      }
+
+      search();
+    }
+
+    IconData getSearchPrefixIcon() => switch (textSearchType.value) {
+          TextSearchType.context => Icons.image_search_rounded,
+          TextSearchType.filename => Icons.abc_rounded,
+          TextSearchType.description => Icons.text_snippet_outlined,
+        };
+
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      appBar: AppBar(
+        automaticallyImplyLeading: true,
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 16.0),
+            child: MenuAnchor(
+              style: MenuStyle(
+                elevation: const WidgetStatePropertyAll(1),
+                shape: WidgetStateProperty.all(
+                  const RoundedRectangleBorder(
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(24),
+                    ),
+                  ),
+                ),
+                padding: const WidgetStatePropertyAll(
+                  EdgeInsets.all(4),
+                ),
+              ),
+              builder: (
+                BuildContext context,
+                MenuController controller,
+                Widget? child,
+              ) {
+                return IconButton(
+                  onPressed: () {
+                    if (controller.isOpen) {
+                      controller.close();
+                    } else {
+                      controller.open();
+                    }
+                  },
+                  icon: const Icon(Icons.more_vert_rounded),
+                  tooltip: 'Show text search menu',
+                );
+              },
+              menuChildren: [
+                MenuItemButton(
+                  child: ListTile(
+                    leading: const Icon(Icons.image_search_rounded),
+                    title: Text(
+                      'search_by_context'.t(context: context),
+                      style: context.textTheme.bodyLarge?.copyWith(
+                        fontWeight: FontWeight.w500,
+                        color: textSearchType.value == TextSearchType.context
+                            ? context.colorScheme.primary
+                            : null,
+                      ),
+                    ),
+                    selectedColor: context.colorScheme.primary,
+                    selected: textSearchType.value == TextSearchType.context,
+                  ),
+                  onPressed: () {
+                    textSearchType.value = TextSearchType.context;
+                    searchHintText.value =
+                        'sunrise_on_the_beach'.t(context: context);
+                  },
+                ),
+                MenuItemButton(
+                  child: ListTile(
+                    leading: const Icon(Icons.abc_rounded),
+                    title: Text(
+                      'search_filter_filename'.t(context: context),
+                      style: context.textTheme.bodyLarge?.copyWith(
+                        fontWeight: FontWeight.w500,
+                        color: textSearchType.value == TextSearchType.filename
+                            ? context.colorScheme.primary
+                            : null,
+                      ),
+                    ),
+                    selectedColor: context.colorScheme.primary,
+                    selected: textSearchType.value == TextSearchType.filename,
+                  ),
+                  onPressed: () {
+                    textSearchType.value = TextSearchType.filename;
+                    searchHintText.value =
+                        'file_name_or_extension'.t(context: context);
+                  },
+                ),
+                MenuItemButton(
+                  child: ListTile(
+                    leading: const Icon(Icons.text_snippet_outlined),
+                    title: Text(
+                      'search_by_description'.t(context: context),
+                      style: context.textTheme.bodyLarge?.copyWith(
+                        fontWeight: FontWeight.w500,
+                        color:
+                            textSearchType.value == TextSearchType.description
+                                ? context.colorScheme.primary
+                                : null,
+                      ),
+                    ),
+                    selectedColor: context.colorScheme.primary,
+                    selected:
+                        textSearchType.value == TextSearchType.description,
+                  ),
+                  onPressed: () {
+                    textSearchType.value = TextSearchType.description;
+                    searchHintText.value =
+                        'search_by_description_example'.t(context: context);
+                  },
+                ),
+              ],
+            ),
+          ),
+        ],
+        title: Container(
+          decoration: BoxDecoration(
+            border: Border.all(
+              color: context.colorScheme.onSurface.withAlpha(0),
+              width: 0,
+            ),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(24),
+            ),
+            gradient: LinearGradient(
+              colors: [
+                context.colorScheme.primary.withValues(alpha: 0.075),
+                context.colorScheme.primary.withValues(alpha: 0.09),
+                context.colorScheme.primary.withValues(alpha: 0.075),
+              ],
+              begin: Alignment.topLeft,
+              end: Alignment.bottomRight,
+            ),
+          ),
+          child: SearchField(
+            hintText: searchHintText.value,
+            key: const Key('search_text_field'),
+            controller: textSearchController,
+            contentPadding: preFilter != null
+                ? const EdgeInsets.only(left: 24)
+                : const EdgeInsets.all(8),
+            prefixIcon: preFilter != null
+                ? null
+                : Icon(
+                    getSearchPrefixIcon(),
+                    color: context.colorScheme.primary,
+                  ),
+            onSubmitted: handleTextSubmitted,
+            focusNode: ref.watch(searchInputFocusProvider),
+          ),
+        ),
+      ),
+      body: CustomScrollView(
+        slivers: [
+          SliverPadding(
+            padding: const EdgeInsets.only(top: 12.0),
+            sliver: SliverToBoxAdapter(
+              child: SizedBox(
+                height: 50,
+                child: ListView(
+                  key: const Key('search_filter_chip_list'),
+                  shrinkWrap: true,
+                  scrollDirection: Axis.horizontal,
+                  padding: const EdgeInsets.symmetric(horizontal: 16),
+                  children: [
+                    SearchFilterChip(
+                      icon: Icons.people_alt_outlined,
+                      onTap: showPeoplePicker,
+                      label: 'people'.t(context: context),
+                      currentFilter: peopleCurrentFilterWidget.value,
+                    ),
+                    SearchFilterChip(
+                      icon: Icons.location_on_outlined,
+                      onTap: showLocationPicker,
+                      label: 'search_filter_location'.t(context: context),
+                      currentFilter: locationCurrentFilterWidget.value,
+                    ),
+                    SearchFilterChip(
+                      icon: Icons.camera_alt_outlined,
+                      onTap: showCameraPicker,
+                      label: 'camera'.t(context: context),
+                      currentFilter: cameraCurrentFilterWidget.value,
+                    ),
+                    SearchFilterChip(
+                      icon: Icons.date_range_outlined,
+                      onTap: showDatePicker,
+                      label: 'search_filter_date'.t(context: context),
+                      currentFilter: dateRangeCurrentFilterWidget.value,
+                    ),
+                    SearchFilterChip(
+                      key: const Key('media_type_chip'),
+                      icon: Icons.video_collection_outlined,
+                      onTap: showMediaTypePicker,
+                      label: 'search_filter_media_type'.t(context: context),
+                      currentFilter: mediaTypeCurrentFilterWidget.value,
+                    ),
+                    SearchFilterChip(
+                      icon: Icons.display_settings_outlined,
+                      onTap: showDisplayOptionPicker,
+                      label:
+                          'search_filter_display_options'.t(context: context),
+                      currentFilter: displayOptionCurrentFilterWidget.value,
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+          if (isSearching.value)
+            const SliverFillRemaining(
+              hasScrollBody: false,
+              child: Center(child: CircularProgressIndicator()),
+            )
+          else
+            _SearchResultGrid(onScrollEnd: loadMoreSearchResult),
+        ],
+      ),
+    );
+  }
+}
+
+class _SearchResultGrid extends ConsumerWidget {
+  final VoidCallback onScrollEnd;
+
+  const _SearchResultGrid({required this.onScrollEnd});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final searchResult = ref.watch(paginatedSearchProvider);
+
+    if (searchResult.totalAssets == 0) {
+      return const _SearchEmptyContent();
+    }
+
+    return NotificationListener<ScrollEndNotification>(
+      onNotification: (notification) {
+        final isBottomSheetNotification = notification.context
+                ?.findAncestorWidgetOfExactType<DraggableScrollableSheet>() !=
+            null;
+
+        final metrics = notification.metrics;
+        final isVerticalScroll = metrics.axis == Axis.vertical;
+
+        if (metrics.pixels >= metrics.maxScrollExtent &&
+            isVerticalScroll &&
+            !isBottomSheetNotification) {
+          onScrollEnd();
+        }
+
+        return true;
+      },
+      child: SliverFillRemaining(
+        child: ProviderScope(
+          overrides: [
+            timelineServiceProvider.overrideWith(
+              (ref) {
+                final timelineService = ref
+                    .watch(timelineFactoryProvider)
+                    .fromAssets(searchResult.assets);
+                ref.onDispose(timelineService.dispose);
+                return timelineService;
+              },
+            ),
+          ],
+          child: Timeline(
+            key: ValueKey(searchResult.totalAssets),
+            appBar: null,
+            groupBy: GroupAssetsBy.none,
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _SearchEmptyContent extends StatelessWidget {
+  const _SearchEmptyContent();
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverToBoxAdapter(
+      child: ListView(
+        shrinkWrap: true,
+        children: [
+          const SizedBox(height: 40),
+          Center(
+            child: Image.asset(
+              context.isDarkTheme
+                  ? 'assets/polaroid-dark.png'
+                  : 'assets/polaroid-light.png',
+              height: 125,
+            ),
+          ),
+          const SizedBox(height: 16),
+          Center(
+            child: Text(
+              'search_page_search_photos_videos'.t(context: context),
+              style: context.textTheme.labelLarge,
+            ),
+          ),
+          const SizedBox(height: 32),
+          const Padding(
+            padding: EdgeInsets.symmetric(horizontal: 16),
+            child: _QuickLinkList(),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _QuickLinkList extends StatelessWidget {
+  const _QuickLinkList();
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        borderRadius: const BorderRadius.all(
+          Radius.circular(20),
+        ),
+        border: Border.all(
+          color: context.colorScheme.outline.withAlpha(10),
+          width: 1,
+        ),
+        gradient: LinearGradient(
+          colors: [
+            context.colorScheme.primary.withAlpha(10),
+            context.colorScheme.primary.withAlpha(15),
+            context.colorScheme.primary.withAlpha(20),
+          ],
+          begin: Alignment.topCenter,
+          end: Alignment.bottomCenter,
+        ),
+      ),
+      child: ListView(
+        shrinkWrap: true,
+        physics: const NeverScrollableScrollPhysics(),
+        children: [
+          _QuickLink(
+            title: 'recently_taken'.t(context: context),
+            icon: Icons.schedule_outlined,
+            isTop: true,
+            onTap: () => context.pushRoute(const DriftRecentlyTakenRoute()),
+          ),
+          _QuickLink(
+            title: 'videos'.t(context: context),
+            icon: Icons.play_circle_outline_rounded,
+            onTap: () => context.pushRoute(const DriftVideoRoute()),
+          ),
+          _QuickLink(
+            title: 'favorites'.t(context: context),
+            icon: Icons.favorite_border_rounded,
+            isBottom: true,
+            onTap: () => context.pushRoute(const DriftFavoriteRoute()),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _QuickLink extends StatelessWidget {
+  final String title;
+  final IconData icon;
+  final VoidCallback onTap;
+  final bool isTop;
+  final bool isBottom;
+
+  const _QuickLink({
+    required this.title,
+    required this.icon,
+    required this.onTap,
+    this.isTop = false,
+    this.isBottom = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final borderRadius = BorderRadius.only(
+      topLeft: Radius.circular(isTop ? 20 : 0),
+      topRight: Radius.circular(isTop ? 20 : 0),
+      bottomLeft: Radius.circular(isBottom ? 20 : 0),
+      bottomRight: Radius.circular(isBottom ? 20 : 0),
+    );
+
+    return ListTile(
+      shape: RoundedRectangleBorder(
+        borderRadius: borderRadius,
+      ),
+      leading: Icon(
+        icon,
+        size: 26,
+      ),
+      title: Text(
+        title,
+        style: context.textTheme.titleSmall?.copyWith(
+          fontWeight: FontWeight.w500,
+        ),
+      ),
+      onTap: onTap,
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/search/paginated_search.provider.dart b/mobile/lib/presentation/pages/search/paginated_search.provider.dart
new file mode 100644
index 0000000000..84635fd0b9
--- /dev/null
+++ b/mobile/lib/presentation/pages/search/paginated_search.provider.dart
@@ -0,0 +1,40 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/search_result.model.dart';
+import 'package:immich_mobile/domain/services/search.service.dart';
+import 'package:immich_mobile/models/search/search_filter.model.dart';
+import 'package:immich_mobile/providers/infrastructure/search.provider.dart';
+
+final paginatedSearchProvider =
+    StateNotifierProvider<PaginatedSearchNotifier, SearchResult>(
+  (ref) => PaginatedSearchNotifier(ref.watch(searchServiceProvider)),
+);
+
+class PaginatedSearchNotifier extends StateNotifier<SearchResult> {
+  final SearchService _searchService;
+
+  PaginatedSearchNotifier(this._searchService)
+      : super(const SearchResult(assets: [], nextPage: 1));
+
+  Future<bool> search(SearchFilter filter) async {
+    if (state.nextPage == null) {
+      return false;
+    }
+
+    final result = await _searchService.search(filter, state.nextPage!);
+
+    if (result == null) {
+      return false;
+    }
+
+    state = SearchResult(
+      assets: [...state.assets, ...result.assets],
+      nextPage: result.nextPage,
+    );
+
+    return true;
+  }
+
+  clear() {
+    state = const SearchResult(assets: [], nextPage: 1);
+  }
+}
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.state.dart b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
index 30a4088ce2..91003fb1a1 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.state.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
@@ -15,6 +15,7 @@ class TimelineArgs {
   final double spacing;
   final int columnCount;
   final bool showStorageIndicator;
+  final GroupAssetsBy? groupBy;
 
   const TimelineArgs({
     required this.maxWidth,
@@ -22,6 +23,7 @@ class TimelineArgs {
     this.spacing = kTimelineSpacing,
     this.columnCount = kTimelineColumnCount,
     this.showStorageIndicator = false,
+    this.groupBy,
   });
 
   @override
@@ -30,7 +32,8 @@ class TimelineArgs {
         maxWidth == other.maxWidth &&
         maxHeight == other.maxHeight &&
         columnCount == other.columnCount &&
-        showStorageIndicator == other.showStorageIndicator;
+        showStorageIndicator == other.showStorageIndicator &&
+        groupBy == other.groupBy;
   }
 
   @override
@@ -39,7 +42,8 @@ class TimelineArgs {
       maxHeight.hashCode ^
       spacing.hashCode ^
       columnCount.hashCode ^
-      showStorageIndicator.hashCode;
+      showStorageIndicator.hashCode ^
+      groupBy.hashCode;
 }
 
 class TimelineState {
@@ -97,8 +101,9 @@ final timelineSegmentProvider = StreamProvider.autoDispose<List<Segment>>(
     final availableTileWidth = args.maxWidth - (spacing * (columnCount - 1));
     final tileExtent = math.max(0, availableTileWidth) / columnCount;
 
-    final groupBy = GroupAssetsBy
-        .values[ref.watch(settingsProvider).get(Setting.groupAssetsBy)];
+    final groupBy = args.groupBy ??
+        GroupAssetsBy
+            .values[ref.watch(settingsProvider).get(Setting.groupAssetsBy)];
 
     final timelineService = ref.watch(timelineServiceProvider);
     yield* timelineService.watchBuckets().map((buckets) {
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 490f2bcff2..d279937417 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
@@ -27,8 +28,13 @@ class Timeline extends StatelessWidget {
     this.topSliverWidget,
     this.topSliverWidgetHeight,
     this.showStorageIndicator = false,
-    this.appBar,
+    this.appBar = const ImmichSliverAppBar(
+      floating: true,
+      pinned: false,
+      snap: false,
+    ),
     this.bottomSheet = const GeneralBottomSheet(),
+    this.groupBy,
   });
 
   final Widget? topSliverWidget;
@@ -36,6 +42,8 @@ class Timeline extends StatelessWidget {
   final bool showStorageIndicator;
   final Widget? appBar;
   final Widget? bottomSheet;
+  final GroupAssetsBy? groupBy;
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -50,6 +58,7 @@ class Timeline extends StatelessWidget {
                   settingsProvider.select((s) => s.get(Setting.tilesPerRow)),
                 ),
                 showStorageIndicator: showStorageIndicator,
+                groupBy: groupBy,
               ),
             ),
           ],
@@ -112,13 +121,17 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
     return asyncSegments.widgetWhen(
       onData: (segments) {
         final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
-        final statusBarHeight = context.padding.top;
         final double appBarExpandedHeight =
             widget.appBar != null && widget.appBar is MesmerizingSliverAppBar
                 ? 200
                 : 0;
-        final totalAppBarHeight = statusBarHeight + kToolbarHeight;
+        final topPadding = context.padding.top +
+            (widget.appBar == null ? 0 : kToolbarHeight) +
+            10;
+
         const scrubberBottomPadding = 100.0;
+        final bottomPadding = context.padding.bottom +
+            (widget.appBar == null ? 0 : scrubberBottomPadding);
 
         return PrimaryScrollController(
           controller: _scrollController,
@@ -127,8 +140,8 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
               Scrubber(
                 layoutSegments: segments,
                 timelineHeight: maxHeight,
-                topPadding: totalAppBarHeight + 10,
-                bottomPadding: context.padding.bottom + scrubberBottomPadding,
+                topPadding: topPadding,
+                bottomPadding: bottomPadding,
                 monthSegmentSnappingOffset:
                     widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
                 child: CustomScrollView(
@@ -137,13 +150,8 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                   slivers: [
                     if (isSelectionMode)
                       const SelectionSliverAppBar()
-                    else
-                      widget.appBar ??
-                          const ImmichSliverAppBar(
-                            floating: true,
-                            pinned: false,
-                            snap: false,
-                          ),
+                    else if (widget.appBar != null)
+                      widget.appBar!,
                     if (widget.topSliverWidget != null) widget.topSliverWidget!,
                     _SliverSegmentedList(
                       segments: segments,
@@ -188,21 +196,22 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                     child: _MultiSelectStatusButton(),
                   ),
                 ),
-                Consumer(
-                  builder: (_, consumerRef, child) {
-                    final isMultiSelectEnabled = consumerRef.watch(
-                      multiSelectProvider.select(
-                        (s) => s.isEnabled,
-                      ),
-                    );
+                if (widget.bottomSheet != null)
+                  Consumer(
+                    builder: (_, consumerRef, child) {
+                      final isMultiSelectEnabled = consumerRef.watch(
+                        multiSelectProvider.select(
+                          (s) => s.isEnabled,
+                        ),
+                      );
 
-                    if (isMultiSelectEnabled) {
-                      return child!;
-                    }
-                    return const SizedBox.shrink();
-                  },
-                  child: widget.bottomSheet,
-                ),
+                      if (isMultiSelectEnabled) {
+                        return child!;
+                      }
+                      return const SizedBox.shrink();
+                    },
+                    child: widget.bottomSheet,
+                  ),
               ],
             ],
           ),
diff --git a/mobile/lib/providers/infrastructure/search.provider.dart b/mobile/lib/providers/infrastructure/search.provider.dart
new file mode 100644
index 0000000000..cdcd3ee43b
--- /dev/null
+++ b/mobile/lib/providers/infrastructure/search.provider.dart
@@ -0,0 +1,12 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/services/search.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/search_api.repository.dart';
+import 'package:immich_mobile/providers/api.provider.dart';
+
+final searchApiRepositoryProvider = Provider(
+  (ref) => SearchApiRepository(ref.watch(apiServiceProvider).searchApi),
+);
+
+final searchServiceProvider = Provider(
+  (ref) => SearchService(ref.watch(searchApiRepositoryProvider)),
+);
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index a6666ec6eb..94e3437d66 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -91,6 +91,7 @@ import 'package:immich_mobile/presentation/pages/drift_remote_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_trash.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_video.page.dart';
 import 'package:immich_mobile/presentation/pages/local_timeline.page.dart';
+import 'package:immich_mobile/presentation/pages/search/drift_search.page.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.page.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
@@ -189,7 +190,7 @@ class AppRouter extends RootStackRouter {
           guards: [_authGuard, _duplicateGuard],
         ),
         AutoRoute(
-          page: SearchRoute.page,
+          page: DriftSearchRoute.page,
           guards: [_authGuard, _duplicateGuard],
           maintainState: false,
         ),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 7412e1dee5..716d5ef89a 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -991,6 +991,45 @@ class DriftRecentlyTakenRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftSearchPage]
+class DriftSearchRoute extends PageRouteInfo<DriftSearchRouteArgs> {
+  DriftSearchRoute({
+    Key? key,
+    SearchFilter? preFilter,
+    List<PageRouteInfo>? children,
+  }) : super(
+          DriftSearchRoute.name,
+          args: DriftSearchRouteArgs(key: key, preFilter: preFilter),
+          initialChildren: children,
+        );
+
+  static const String name = 'DriftSearchRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<DriftSearchRouteArgs>(
+        orElse: () => const DriftSearchRouteArgs(),
+      );
+      return DriftSearchPage(key: args.key, preFilter: args.preFilter);
+    },
+  );
+}
+
+class DriftSearchRouteArgs {
+  const DriftSearchRouteArgs({this.key, this.preFilter});
+
+  final Key? key;
+
+  final SearchFilter? preFilter;
+
+  @override
+  String toString() {
+    return 'DriftSearchRouteArgs{key: $key, preFilter: $preFilter}';
+  }
+}
+
 /// generated route for
 /// [DriftTrashPage]
 class DriftTrashRoute extends PageRouteInfo<void> {
diff --git a/mobile/lib/services/search.service.dart b/mobile/lib/services/search.service.dart
index 5d3b08aaed..aa72a7908b 100644
--- a/mobile/lib/services/search.service.dart
+++ b/mobile/lib/services/search.service.dart
@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/string_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/search_api.repository.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/models/search/search_result.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/search.provider.dart';
 import 'package:immich_mobile/repositories/asset.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:logging/logging.dart';
@@ -14,15 +15,21 @@ final searchServiceProvider = Provider(
   (ref) => SearchService(
     ref.watch(apiServiceProvider),
     ref.watch(assetRepositoryProvider),
+    ref.watch(searchApiRepositoryProvider),
   ),
 );
 
 class SearchService {
   final ApiService _apiService;
   final AssetRepository _assetRepository;
+  final SearchApiRepository _searchApiRepository;
 
   final _log = Logger("SearchService");
-  SearchService(this._apiService, this._assetRepository);
+  SearchService(
+    this._apiService,
+    this._assetRepository,
+    this._searchApiRepository,
+  );
 
   Future<List<String>?> getSearchSuggestions(
     SearchSuggestionType type, {
@@ -32,7 +39,7 @@ class SearchService {
     String? model,
   }) async {
     try {
-      return await _apiService.searchApi.getSearchSuggestions(
+      return await _searchApiRepository.getSearchSuggestions(
         type,
         country: country,
         state: state,
@@ -47,76 +54,15 @@ class SearchService {
 
   Future<SearchResult?> search(SearchFilter filter, int page) async {
     try {
-      SearchResponseDto? response;
-      AssetTypeEnum? type;
-      if (filter.mediaType == AssetType.image) {
-        type = AssetTypeEnum.IMAGE;
-      } else if (filter.mediaType == AssetType.video) {
-        type = AssetTypeEnum.VIDEO;
-      }
-
-      if (filter.context != null && filter.context!.isNotEmpty) {
-        response = await _apiService.searchApi.searchSmart(
-          SmartSearchDto(
-            query: filter.context!,
-            language: filter.language,
-            country: filter.location.country,
-            state: filter.location.state,
-            city: filter.location.city,
-            make: filter.camera.make,
-            model: filter.camera.model,
-            takenAfter: filter.date.takenAfter,
-            takenBefore: filter.date.takenBefore,
-            visibility: filter.display.isArchive
-                ? AssetVisibility.archive
-                : AssetVisibility.timeline,
-            isFavorite: filter.display.isFavorite ? true : null,
-            isNotInAlbum: filter.display.isNotInAlbum ? true : null,
-            personIds: filter.people.map((e) => e.id).toList(),
-            type: type,
-            page: page,
-            size: 1000,
-          ),
-        );
-      } else {
-        response = await _apiService.searchApi.searchAssets(
-          MetadataSearchDto(
-            originalFileName:
-                filter.filename != null && filter.filename!.isNotEmpty
-                    ? filter.filename
-                    : null,
-            country: filter.location.country,
-            description:
-                filter.description != null && filter.description!.isNotEmpty
-                    ? filter.description
-                    : null,
-            state: filter.location.state,
-            city: filter.location.city,
-            make: filter.camera.make,
-            model: filter.camera.model,
-            takenAfter: filter.date.takenAfter,
-            takenBefore: filter.date.takenBefore,
-            visibility: filter.display.isArchive
-                ? AssetVisibility.archive
-                : AssetVisibility.timeline,
-            isFavorite: filter.display.isFavorite ? true : null,
-            isNotInAlbum: filter.display.isNotInAlbum ? true : null,
-            personIds: filter.people.map((e) => e.id).toList(),
-            type: type,
-            page: page,
-            size: 1000,
-          ),
-        );
-      }
+      final response = await _searchApiRepository.search(filter, page);
 
       if (response == null || response.assets.items.isEmpty) {
         return null;
       }
 
       return SearchResult(
-        assets: await _assetRepository.getAllByRemoteId(
-          response.assets.items.map((e) => e.id),
-        ),
+        assets: await _assetRepository
+            .getAllByRemoteId(response.assets.items.map((e) => e.id)),
         nextPage: response.assets.nextPage?.toInt(),
       );
     } catch (error, stackTrace) {
diff --git a/mobile/lib/utils/provider_utils.dart b/mobile/lib/utils/provider_utils.dart
index bf18d24213..7af0e61d3c 100644
--- a/mobile/lib/utils/provider_utils.dart
+++ b/mobile/lib/utils/provider_utils.dart
@@ -1,4 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/providers/infrastructure/search.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/repositories/activity_api.repository.dart';
 import 'package:immich_mobile/repositories/album_api.repository.dart';
@@ -15,4 +16,5 @@ void invalidateAllApiRepositoryProviders(WidgetRef ref) {
   ref.invalidate(personApiRepositoryProvider);
   ref.invalidate(assetApiRepositoryProvider);
   ref.invalidate(timelineRepositoryProvider);
+  ref.invalidate(searchApiRepositoryProvider);
 }

From 546f841b2cc1b91226975a9bbe67d8c43dfffb79 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Thu, 17 Jul 2025 15:58:55 -0500
Subject: [PATCH 233/337] chore: migration continue button (#20000)

* feat: add toggle to switch between Isar and Sqlite

* reset sqlite on beta

* start sync on app open in new timeline

* fix lint

* migrate hashes when new timeline is selected

* migrate hashes immediately after beta is enabled

* show loading indicator in change timeline page

* some stylings

* fix some styling issue

* release resources on isolate close

* replace route and styling

* handle migration back to old timeline

* check if a provider is mounted before calling dispose on it

* styling

* styling and button

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 i18n/en.json                                  |  2 +-
 .../pages/common/change_experience.page.dart  | 24 ++++++++++-------
 mobile/lib/pages/common/settings.page.dart    |  2 +-
 mobile/lib/providers/asset.provider.dart      |  4 ++-
 .../settings/beta_timeline_list_tile.dart     | 26 ++++++++++++++-----
 5 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 11df6fc3d3..89780f62b1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -373,7 +373,7 @@
   "admin_password": "Admin Password",
   "administration": "Administration",
   "advanced": "Advanced",
-  "advanced_settings_beta_timeline_subtitle": "Try the new app experience.",
+  "advanced_settings_beta_timeline_subtitle": "Try the new app experience",
   "advanced_settings_beta_timeline_title": "Beta Timeline",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Use this option to filter media during sync based on alternate criteria. Only try this if you have issues with the app detecting all albums.",
   "advanced_settings_enable_alternate_media_filter_title": "[EXPERIMENTAL] Use alternate device album sync filter",
diff --git a/mobile/lib/pages/common/change_experience.page.dart b/mobile/lib/pages/common/change_experience.page.dart
index c54f627b61..74c3116962 100644
--- a/mobile/lib/pages/common/change_experience.page.dart
+++ b/mobile/lib/pages/common/change_experience.page.dart
@@ -57,14 +57,6 @@ class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
       await ref.read(backgroundSyncProvider).cancel();
     }
 
-    Future.delayed(const Duration(seconds: 3), () {
-      context.replaceRoute(
-        widget.switchingToBeta
-            ? const TabShellRoute()
-            : const TabControllerRoute(),
-      );
-    });
-
     if (mounted) {
       setState(() {
         HapticFeedback.heavyImpact();
@@ -104,7 +96,7 @@ class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
                       duration: Durations.long4,
                       child: hasMigrated
                           ? Text(
-                              "Migration success. Navigating to the new timeline...",
+                              "Migration success!",
                               style: context.textTheme.titleMedium,
                               textAlign: TextAlign.center,
                             )
@@ -115,6 +107,20 @@ class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
                             ),
                     ),
                   ),
+                  if (hasMigrated)
+                    Padding(
+                      padding: const EdgeInsets.only(top: 16.0),
+                      child: ElevatedButton(
+                        onPressed: () {
+                          context.replaceRoute(
+                            widget.switchingToBeta
+                                ? const TabShellRoute()
+                                : const TabControllerRoute(),
+                          );
+                        },
+                        child: const Text("Continue"),
+                      ),
+                    ),
                 ],
               ),
             ),
diff --git a/mobile/lib/pages/common/settings.page.dart b/mobile/lib/pages/common/settings.page.dart
index 42d555a2ee..e45001270c 100644
--- a/mobile/lib/pages/common/settings.page.dart
+++ b/mobile/lib/pages/common/settings.page.dart
@@ -143,7 +143,7 @@ class _MobileLayout extends StatelessWidget {
         .toList();
     return ListView(
       physics: const ClampingScrollPhysics(),
-      padding: const EdgeInsets.symmetric(vertical: 10.0),
+      padding: const EdgeInsets.only(top: 10.0, bottom: 56),
       children: [
         const BetaTimelineListTile(),
         ...settings,
diff --git a/mobile/lib/providers/asset.provider.dart b/mobile/lib/providers/asset.provider.dart
index 5b77da90f3..7fbacc3afb 100644
--- a/mobile/lib/providers/asset.provider.dart
+++ b/mobile/lib/providers/asset.provider.dart
@@ -81,7 +81,9 @@ class AssetNotifier extends StateNotifier<bool> {
       await _albumService.refreshDeviceAlbums();
     } finally {
       _getAllAssetInProgress = false;
-      state = false;
+      if (mounted) {
+        state = false;
+      }
     }
   }
 
diff --git a/mobile/lib/widgets/settings/beta_timeline_list_tile.dart b/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
index 967c7f3e13..1de3a6e7ab 100644
--- a/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
+++ b/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
@@ -100,13 +100,27 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
                         [ChangeExperienceRoute(switchingToBeta: value)],
                       );
                     },
-                    child: const Text("Yes"),
+                    child: Text(
+                      "YES",
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                        color: context.primaryColor,
+                      ),
+                    ),
                   ),
                   TextButton(
                     onPressed: () {
-                      Navigator.of(context).pop();
+                      context.pop();
                     },
-                    child: const Text("No"),
+                    child: Text(
+                      "NO",
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                        color: context.colorScheme.outline,
+                      ),
+                    ),
                   ),
                 ],
               );
@@ -116,18 +130,18 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
 
         final gradientColors = [
           Color.lerp(
+            context.primaryColor.withValues(alpha: 0.5),
             context.primaryColor.withValues(alpha: 0.3),
-            context.primaryColor.withValues(alpha: 0.1),
             _gradientAnimation.value,
           )!,
           Color.lerp(
-            context.primaryColor.withValues(alpha: 0.2),
             context.primaryColor.withValues(alpha: 0.4),
+            context.primaryColor.withValues(alpha: 0.6),
             _gradientAnimation.value,
           )!,
           Color.lerp(
-            context.primaryColor.withValues(alpha: 0.1),
             context.primaryColor.withValues(alpha: 0.3),
+            context.primaryColor.withValues(alpha: 0.5),
             _gradientAnimation.value,
           )!,
         ];

From f32cd74232a62b63fbbade4231c892b78e8bca46 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 18 Jul 2025 10:01:04 +0530
Subject: [PATCH 234/337] feat: show stacks in asset viewer (#19935)

* feat: show stacks in asset viewer

* fix: global key issue and flash on stack asset change

* feat(mobile): stack and unstack action (#19941)

* feat(mobile): stack and unstack action

* add custom model

* use stackId from ActionSource

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

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

---------

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

* fix: lint

* fix: bad merge

* fix: test

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
Co-authored-by: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Co-authored-by: wuzihao051119 <wuzihao051119@outlook.com>
---
 i18n/en.json                                  |   2 +
 .../drift_schemas/main/drift_schema_v1.json   |   2 +-
 .../drift_schemas/main/drift_schema_v2.json   |   2 +-
 .../lib/immich_mobile_immich_lint.dart        |   2 +-
 .../models/asset/local_asset.model.dart       |   1 +
 .../models/asset/remote_asset.model.dart      |  21 +-
 mobile/lib/domain/models/stack.model.dart     |  24 +
 mobile/lib/domain/models/timeline.model.dart  |   6 +
 mobile/lib/domain/services/asset.service.dart |  11 +
 mobile/lib/domain/utils/event_stream.dart     |  10 +-
 .../entities/merged_asset.drift               |  39 +-
 .../entities/merged_asset.drift.dart          |  17 +-
 .../entities/remote_asset.entity.dart         |   3 +
 .../entities/remote_asset.entity.drift.dart   |  68 +-
 .../repositories/db.repository.drift.dart     | 138 ++--
 .../repositories/db.repository.steps.dart     | 280 +++++----
 .../repositories/remote_asset.repository.dart | 100 ++-
 .../repositories/sync_stream.repository.dart  |   1 +
 .../repositories/timeline.repository.dart     |   2 +
 .../pages/dev/main_timeline.page.dart         |   5 +-
 .../stack_action_button.widget.dart           |  42 +-
 .../unstack_action_button.widget.dart         |  49 ++
 .../asset_viewer/asset_stack.provider.dart    |  24 +
 .../asset_viewer/asset_stack.widget.dart      | 119 ++++
 .../asset_viewer/asset_viewer.page.dart       |  37 +-
 .../asset_viewer/asset_viewer.state.dart      |  30 +-
 .../archive_bottom_sheet.widget.dart          |   2 +-
 .../favorite_bottom_sheet.widget.dart         |   2 +-
 .../general_bottom_sheet.widget.dart          |   2 +-
 .../remote_album_bottom_sheet.widget.dart     |   2 +-
 .../widgets/images/thumbnail_tile.widget.dart |  54 +-
 .../widgets/timeline/timeline.state.dart      |   4 +
 .../widgets/timeline/timeline.widget.dart     |   3 +
 .../infrastructure/action.provider.dart       |  72 ++-
 .../repositories/asset_api.repository.dart    |  26 +-
 mobile/lib/services/action.service.dart       |  10 +
 .../common/mesmerizing_sliver_app_bar.dart    |   1 +
 .../common/remote_album_sliver_app_bar.dart   |   1 +
 mobile/lib/widgets/map/map_thumbnail.dart     |  10 +-
 .../test/drift/main/generated/schema_v1.dart  | 590 ++++++++++--------
 .../test/drift/main/generated/schema_v2.dart  | 556 +++++++++--------
 41 files changed, 1568 insertions(+), 802 deletions(-)
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/unstack_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart
 create mode 100644 mobile/lib/presentation/widgets/asset_viewer/asset_stack.widget.dart

diff --git a/i18n/en.json b/i18n/en.json
index 89780f62b1..dfe2954c9f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1795,6 +1795,7 @@
   "sort_title": "Title",
   "source": "Source",
   "stack": "Stack",
+  "stack_action_prompt": "{count} stacked",
   "stack_duplicates": "Stack duplicates",
   "stack_select_one_photo": "Select one main photo for the stack",
   "stack_selected_photos": "Stack selected photos",
@@ -1905,6 +1906,7 @@
   "unselect_all_duplicates": "Unselect all duplicates",
   "unselect_all_in": "Unselect all in {group}",
   "unstack": "Un-stack",
+  "unstack_action_prompt": "{count} unstacked",
   "unstacked_assets_count": "Un-stacked {count, plural, one {# asset} other {# assets}}",
   "untagged": "Untagged",
   "up_next": "Up next",
diff --git a/mobile/drift_schemas/main/drift_schema_v1.json b/mobile/drift_schemas/main/drift_schema_v1.json
index 03656ce0b4..c19bcfb945 100644
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
@@ -1 +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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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":14,"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":15,"references":[1,14],"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":16,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}}]}
\ No newline at end of file
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":4,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":6,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":7,"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":8,"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":9,"references":[],"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":"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":10,"references":[2,9],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":11,"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":12,"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":13,"references":[1,12],"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":14,"references":[12,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":15,"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":16,"references":[1,15],"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"]}}]}
\ No newline at end of file
diff --git a/mobile/drift_schemas/main/drift_schema_v2.json b/mobile/drift_schemas/main/drift_schema_v2.json
index 4c1e3d68a1..c19bcfb945 100644
--- a/mobile/drift_schemas/main/drift_schema_v2.json
+++ b/mobile/drift_schemas/main/drift_schema_v2.json
@@ -1 +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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":4,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":6,"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":7,"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":8,"references":[],"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":"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":9,"references":[2,8],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":10,"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":11,"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":12,"references":[1,11],"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":13,"references":[11,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":14,"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":15,"references":[1,14],"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":16,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}}]}
\ No newline at end of file
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":4,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":6,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":7,"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":8,"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":9,"references":[],"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":"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":10,"references":[2,9],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":11,"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":12,"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":13,"references":[1,12],"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":14,"references":[12,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":15,"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":16,"references":[1,15],"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"]}}]}
\ No newline at end of file
diff --git a/mobile/immich_lint/lib/immich_mobile_immich_lint.dart b/mobile/immich_lint/lib/immich_mobile_immich_lint.dart
index e2622fadd1..7d3ed4757e 100644
--- a/mobile/immich_lint/lib/immich_mobile_immich_lint.dart
+++ b/mobile/immich_lint/lib/immich_mobile_immich_lint.dart
@@ -23,7 +23,7 @@ class ImmichLinter extends PluginBase {
     return rules;
   }
 
-  static makeCode(String name, LintOptions options) => LintCode(
+  static LintCode makeCode(String name, LintOptions options) => LintCode(
         name: name,
         problemMessage: options.json["message"] as String,
         errorSeverity: ErrorSeverity.WARNING,
diff --git a/mobile/lib/domain/models/asset/local_asset.model.dart b/mobile/lib/domain/models/asset/local_asset.model.dart
index 0c3e8fa942..3466a0f25b 100644
--- a/mobile/lib/domain/models/asset/local_asset.model.dart
+++ b/mobile/lib/domain/models/asset/local_asset.model.dart
@@ -45,6 +45,7 @@ class LocalAsset extends BaseAsset {
  }''';
   }
 
+  // Not checking for remoteId here
   @override
   bool operator ==(Object other) {
     if (other is! LocalAsset) return false;
diff --git a/mobile/lib/domain/models/asset/remote_asset.model.dart b/mobile/lib/domain/models/asset/remote_asset.model.dart
index 9e4cfa1f19..760a16170b 100644
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -14,6 +14,8 @@ class RemoteAsset extends BaseAsset {
   final String? thumbHash;
   final AssetVisibility visibility;
   final String ownerId;
+  final String? stackId;
+  final int stackCount;
 
   const RemoteAsset({
     required this.id,
@@ -31,6 +33,8 @@ class RemoteAsset extends BaseAsset {
     this.thumbHash,
     this.visibility = AssetVisibility.timeline,
     super.livePhotoVideoId,
+    this.stackId,
+    this.stackCount = 0,
   });
 
   @override
@@ -56,9 +60,14 @@ class RemoteAsset extends BaseAsset {
     isFavorite: $isFavorite,
     thumbHash: ${thumbHash ?? "<NA>"},
     visibility: $visibility,
+    stackId: ${stackId ?? "<NA>"},
+    stackCount: $stackCount,
+    checksum: $checksum,
+    livePhotoVideoId: ${livePhotoVideoId ?? "<NA>"},
  }''';
   }
 
+  // Not checking for localId here
   @override
   bool operator ==(Object other) {
     if (other is! RemoteAsset) return false;
@@ -67,7 +76,9 @@ class RemoteAsset extends BaseAsset {
         id == other.id &&
         ownerId == other.ownerId &&
         thumbHash == other.thumbHash &&
-        visibility == other.visibility;
+        visibility == other.visibility &&
+        stackId == other.stackId &&
+        stackCount == other.stackCount;
   }
 
   @override
@@ -77,7 +88,9 @@ class RemoteAsset extends BaseAsset {
       ownerId.hashCode ^
       localId.hashCode ^
       thumbHash.hashCode ^
-      visibility.hashCode;
+      visibility.hashCode ^
+      stackId.hashCode ^
+      stackCount.hashCode;
 
   RemoteAsset copyWith({
     String? id,
@@ -95,6 +108,8 @@ class RemoteAsset extends BaseAsset {
     String? thumbHash,
     AssetVisibility? visibility,
     String? livePhotoVideoId,
+    String? stackId,
+    int? stackCount,
   }) {
     return RemoteAsset(
       id: id ?? this.id,
@@ -112,6 +127,8 @@ class RemoteAsset extends BaseAsset {
       thumbHash: thumbHash ?? this.thumbHash,
       visibility: visibility ?? this.visibility,
       livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
+      stackId: stackId ?? this.stackId,
+      stackCount: stackCount ?? this.stackCount,
     );
   }
 }
diff --git a/mobile/lib/domain/models/stack.model.dart b/mobile/lib/domain/models/stack.model.dart
index 5404eb8f42..d7faf07a22 100644
--- a/mobile/lib/domain/models/stack.model.dart
+++ b/mobile/lib/domain/models/stack.model.dart
@@ -82,3 +82,27 @@ class Stack {
         primaryAssetId.hashCode;
   }
 }
+
+class StackResponse {
+  final String id;
+  final String primaryAssetId;
+  final List<String> assetIds;
+
+  const StackResponse({
+    required this.id,
+    required this.primaryAssetId,
+    required this.assetIds,
+  });
+
+  @override
+  bool operator ==(covariant StackResponse other) {
+    if (identical(this, other)) return true;
+
+    return other.id == id &&
+        other.primaryAssetId == primaryAssetId &&
+        other.assetIds == assetIds;
+  }
+
+  @override
+  int get hashCode => id.hashCode ^ primaryAssetId.hashCode ^ assetIds.hashCode;
+}
diff --git a/mobile/lib/domain/models/timeline.model.dart b/mobile/lib/domain/models/timeline.model.dart
index 4a49708b74..f3b688b8b8 100644
--- a/mobile/lib/domain/models/timeline.model.dart
+++ b/mobile/lib/domain/models/timeline.model.dart
@@ -1,3 +1,5 @@
+import 'package:immich_mobile/domain/utils/event_stream.dart';
+
 enum GroupAssetsBy {
   day,
   month,
@@ -38,3 +40,7 @@ class TimeBucket extends Bucket {
   @override
   int get hashCode => super.hashCode ^ date.hashCode;
 }
+
+class TimelineReloadEvent extends Event {
+  const TimelineReloadEvent();
+}
diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dart
index 2c9b493187..63b1aad8c1 100644
--- a/mobile/lib/domain/services/asset.service.dart
+++ b/mobile/lib/domain/services/asset.service.dart
@@ -24,6 +24,17 @@ class AssetService {
         : _remoteAssetRepository.watchAsset(id);
   }
 
+  Future<List<RemoteAsset>> getStack(RemoteAsset asset) async {
+    if (asset.stackId == null) {
+      return [];
+    }
+
+    return _remoteAssetRepository.getStackChildren(asset).then((assets) {
+      // Include the primary asset in the stack as the first item
+      return [asset, ...assets];
+    });
+  }
+
   Future<ExifInfo?> getExif(BaseAsset asset) async {
     if (!asset.hasRemote) {
       return null;
diff --git a/mobile/lib/domain/utils/event_stream.dart b/mobile/lib/domain/utils/event_stream.dart
index 65ee17e12b..e728ece58b 100644
--- a/mobile/lib/domain/utils/event_stream.dart
+++ b/mobile/lib/domain/utils/event_stream.dart
@@ -1,17 +1,9 @@
 import 'dart:async';
 
-sealed class Event {
+class Event {
   const Event();
 }
 
-class TimelineReloadEvent extends Event {
-  const TimelineReloadEvent();
-}
-
-class ViewerOpenBottomSheetEvent extends Event {
-  const ViewerOpenBottomSheetEvent();
-}
-
 class EventStream {
   EventStream._();
 
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift b/mobile/lib/infrastructure/entities/merged_asset.drift
index e07edbc0c8..3dc7221c15 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -1,5 +1,6 @@
 import 'remote_asset.entity.dart';
 import 'local_asset.entity.dart';
+import 'stack.entity.dart';
 
 mergedAsset: SELECT * FROM
 (
@@ -18,13 +19,33 @@ mergedAsset: SELECT * FROM
 		rae.checksum,
 		rae.owner_id,
 		rae.live_photo_video_id,
-		0 as orientation
+		0 as orientation,
+		rae.stack_id,
+		COALESCE(stack_count.total_count, 0) AS stack_count
 	FROM
 		remote_asset_entity rae
 	LEFT JOIN
 		local_asset_entity lae ON rae.checksum  = lae.checksum
+	LEFT JOIN
+        stack_entity se ON rae.stack_id = se.id
+	LEFT JOIN
+        (SELECT 
+            stack_id,
+            COUNT(*) AS total_count
+         FROM remote_asset_entity 
+         WHERE deleted_at IS NULL 
+           AND visibility = 0
+           AND stack_id IS NOT NULL
+         GROUP BY stack_id
+        ) AS stack_count ON rae.stack_id = stack_count.stack_id
 	WHERE
-		rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ?
+		rae.deleted_at IS NULL
+		AND rae.visibility = 0
+		AND rae.owner_id in ?
+		AND (
+			rae.stack_id IS NULL
+			OR rae.id = se.primary_asset_id
+		)
 	UNION ALL
 	SELECT
 		NULL as remote_id,
@@ -41,7 +62,9 @@ mergedAsset: SELECT * FROM
 		lae.checksum,
 		NULL as owner_id,
 		NULL as live_photo_video_id,
-		lae.orientation
+		lae.orientation,
+		NULL as stack_id,
+		0 AS stack_count
 	FROM
 		local_asset_entity lae
 	LEFT JOIN
@@ -68,8 +91,16 @@ FROM
 		remote_asset_entity rae
 	LEFT JOIN
 		local_asset_entity lae  ON rae.checksum  = lae.checksum
+	LEFT JOIN
+        stack_entity se ON rae.stack_id = se.id
 	WHERE
-		rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id in ?
+		rae.deleted_at IS NULL
+		AND rae.visibility = 0
+		AND rae.owner_id in ?
+		AND (
+			rae.stack_id IS NULL
+			OR rae.id = se.primary_asset_id
+		)
 	UNION ALL
 	SELECT
 		lae.name,
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift.dart b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
index 4ee0643706..ac3db868e1 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift.dart
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
@@ -7,6 +7,8 @@ import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.
     as i3;
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart'
     as i4;
+import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart'
+    as i5;
 
 class MergedAssetDrift extends i1.ModularAccessor {
   MergedAssetDrift(i0.GeneratedDatabase db) : super(db);
@@ -18,7 +20,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
     final generatedlimit = $write(limit, startIndex: $arrayStartIndex);
     $arrayStartIndex += generatedlimit.amountOfVariables;
     return customSelect(
-        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
+        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, COALESCE(stack_count.total_count, 0) AS stack_count FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum LEFT JOIN stack_entity AS se ON rae.stack_id = se.id LEFT JOIN (SELECT stack_id, COUNT(*) AS total_count FROM remote_asset_entity WHERE deleted_at IS NULL AND visibility = 0 AND stack_id IS NOT NULL GROUP BY stack_id) AS stack_count ON rae.stack_id = stack_count.stack_id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, 0 AS stack_count FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
         variables: [
           for (var $ in var1) i0.Variable<String>($),
           ...generatedlimit.introducedVariables
@@ -26,6 +28,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
         readsFrom: {
           remoteAssetEntity,
           localAssetEntity,
+          stackEntity,
           ...generatedlimit.watchedTables,
         }).map((i0.QueryRow row) => MergedAssetResult(
           remoteId: row.readNullable<String>('remote_id'),
@@ -44,6 +47,8 @@ class MergedAssetDrift extends i1.ModularAccessor {
           ownerId: row.readNullable<String>('owner_id'),
           livePhotoVideoId: row.readNullable<String>('live_photo_video_id'),
           orientation: row.read<int>('orientation'),
+          stackId: row.readNullable<String>('stack_id'),
+          stackCount: row.read<int>('stack_count'),
         ));
   }
 
@@ -53,7 +58,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
     final expandedvar2 = $expandVar($arrayStartIndex, var2.length);
     $arrayStartIndex += var2.length;
     return customSelect(
-        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at, \'localtime\') WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at, \'localtime\') END AS bucket_date FROM (SELECT rae.name, rae.created_at FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) UNION ALL SELECT lae.name, lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) GROUP BY bucket_date ORDER BY bucket_date DESC',
+        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at, \'localtime\') WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at, \'localtime\') END AS bucket_date FROM (SELECT rae.name, rae.created_at FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT lae.name, lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) GROUP BY bucket_date ORDER BY bucket_date DESC',
         variables: [
           i0.Variable<int>(groupBy),
           for (var $ in var2) i0.Variable<String>($)
@@ -61,6 +66,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
         readsFrom: {
           remoteAssetEntity,
           localAssetEntity,
+          stackEntity,
         }).map((i0.QueryRow row) => MergedBucketResult(
           assetCount: row.read<int>('asset_count'),
           bucketDate: row.read<String>('bucket_date'),
@@ -73,6 +79,9 @@ class MergedAssetDrift extends i1.ModularAccessor {
   i4.$LocalAssetEntityTable get localAssetEntity =>
       i1.ReadDatabaseContainer(attachedDatabase)
           .resultSet<i4.$LocalAssetEntityTable>('local_asset_entity');
+  i5.$StackEntityTable get stackEntity =>
+      i1.ReadDatabaseContainer(attachedDatabase)
+          .resultSet<i5.$StackEntityTable>('stack_entity');
 }
 
 class MergedAssetResult {
@@ -91,6 +100,8 @@ class MergedAssetResult {
   final String? ownerId;
   final String? livePhotoVideoId;
   final int orientation;
+  final String? stackId;
+  final int stackCount;
   MergedAssetResult({
     this.remoteId,
     this.localId,
@@ -107,6 +118,8 @@ class MergedAssetResult {
     this.ownerId,
     this.livePhotoVideoId,
     required this.orientation,
+    this.stackId,
+    required this.stackCount,
   });
 }
 
diff --git a/mobile/lib/infrastructure/entities/remote_asset.entity.dart b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
index 96193e0415..0b2896538e 100644
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
@@ -34,6 +34,8 @@ class RemoteAssetEntity extends Table
 
   IntColumn get visibility => intEnum<AssetVisibility>()();
 
+  TextColumn get stackId => text().nullable()();
+
   @override
   Set<Column> get primaryKey => {id};
 }
@@ -55,5 +57,6 @@ extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
         visibility: visibility,
         livePhotoVideoId: livePhotoVideoId,
         localId: null,
+        stackId: stackId,
       );
 }
diff --git a/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart b/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
index 2bb7cffe59..543ed65985 100644
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
@@ -29,6 +29,7 @@ typedef $$RemoteAssetEntityTableCreateCompanionBuilder
   i0.Value<DateTime?> deletedAt,
   i0.Value<String?> livePhotoVideoId,
   required i2.AssetVisibility visibility,
+  i0.Value<String?> stackId,
 });
 typedef $$RemoteAssetEntityTableUpdateCompanionBuilder
     = i1.RemoteAssetEntityCompanion Function({
@@ -48,6 +49,7 @@ typedef $$RemoteAssetEntityTableUpdateCompanionBuilder
   i0.Value<DateTime?> deletedAt,
   i0.Value<String?> livePhotoVideoId,
   i0.Value<i2.AssetVisibility> visibility,
+  i0.Value<String?> stackId,
 });
 
 final class $$RemoteAssetEntityTableReferences extends i0.BaseReferences<
@@ -145,6 +147,9 @@ class $$RemoteAssetEntityTableFilterComposer
           column: $table.visibility,
           builder: (column) => i0.ColumnWithTypeConverterFilters(column));
 
+  i0.ColumnFilters<String> get stackId => $composableBuilder(
+      column: $table.stackId, builder: (column) => i0.ColumnFilters(column));
+
   i5.$$UserEntityTableFilterComposer get ownerId {
     final i5.$$UserEntityTableFilterComposer composer = $composerBuilder(
         composer: this,
@@ -231,6 +236,9 @@ class $$RemoteAssetEntityTableOrderingComposer
       column: $table.visibility,
       builder: (column) => i0.ColumnOrderings(column));
 
+  i0.ColumnOrderings<String> get stackId => $composableBuilder(
+      column: $table.stackId, builder: (column) => i0.ColumnOrderings(column));
+
   i5.$$UserEntityTableOrderingComposer get ownerId {
     final i5.$$UserEntityTableOrderingComposer composer = $composerBuilder(
         composer: this,
@@ -309,6 +317,9 @@ class $$RemoteAssetEntityTableAnnotationComposer
       $composableBuilder(
           column: $table.visibility, builder: (column) => column);
 
+  i0.GeneratedColumn<String> get stackId =>
+      $composableBuilder(column: $table.stackId, builder: (column) => column);
+
   i5.$$UserEntityTableAnnotationComposer get ownerId {
     final i5.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
         composer: this,
@@ -373,6 +384,7 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
             i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
             i0.Value<i2.AssetVisibility> visibility = const i0.Value.absent(),
+            i0.Value<String?> stackId = const i0.Value.absent(),
           }) =>
               i1.RemoteAssetEntityCompanion(
             name: name,
@@ -391,6 +403,7 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             deletedAt: deletedAt,
             livePhotoVideoId: livePhotoVideoId,
             visibility: visibility,
+            stackId: stackId,
           ),
           createCompanionCallback: ({
             required String name,
@@ -409,6 +422,7 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
             i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
             required i2.AssetVisibility visibility,
+            i0.Value<String?> stackId = const i0.Value.absent(),
           }) =>
               i1.RemoteAssetEntityCompanion.insert(
             name: name,
@@ -427,6 +441,7 @@ class $$RemoteAssetEntityTableTableManager extends i0.RootTableManager<
             deletedAt: deletedAt,
             livePhotoVideoId: livePhotoVideoId,
             visibility: visibility,
+            stackId: stackId,
           ),
           withReferenceMapper: (p0) => p0
               .map((e) => (
@@ -602,6 +617,12 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
               type: i0.DriftSqlType.int, requiredDuringInsert: true)
           .withConverter<i2.AssetVisibility>(
               i1.$RemoteAssetEntityTable.$convertervisibility);
+  static const i0.VerificationMeta _stackIdMeta =
+      const i0.VerificationMeta('stackId');
+  @override
+  late final i0.GeneratedColumn<String> stackId = i0.GeneratedColumn<String>(
+      'stack_id', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
   @override
   List<i0.GeneratedColumn> get $columns => [
         name,
@@ -619,7 +640,8 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
         thumbHash,
         deletedAt,
         livePhotoVideoId,
-        visibility
+        visibility,
+        stackId
       ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -703,6 +725,10 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
           livePhotoVideoId.isAcceptableOrUnknown(
               data['live_photo_video_id']!, _livePhotoVideoIdMeta));
     }
+    if (data.containsKey('stack_id')) {
+      context.handle(_stackIdMeta,
+          stackId.isAcceptableOrUnknown(data['stack_id']!, _stackIdMeta));
+    }
     return context;
   }
 
@@ -748,6 +774,8 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
       visibility: i1.$RemoteAssetEntityTable.$convertervisibility.fromSql(
           attachedDatabase.typeMapping.read(
               i0.DriftSqlType.int, data['${effectivePrefix}visibility'])!),
+      stackId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}stack_id']),
     );
   }
 
@@ -785,6 +813,7 @@ class RemoteAssetEntityData extends i0.DataClass
   final DateTime? deletedAt;
   final String? livePhotoVideoId;
   final i2.AssetVisibility visibility;
+  final String? stackId;
   const RemoteAssetEntityData(
       {required this.name,
       required this.type,
@@ -801,7 +830,8 @@ class RemoteAssetEntityData extends i0.DataClass
       this.thumbHash,
       this.deletedAt,
       this.livePhotoVideoId,
-      required this.visibility});
+      required this.visibility,
+      this.stackId});
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
     final map = <String, i0.Expression>{};
@@ -841,6 +871,9 @@ class RemoteAssetEntityData extends i0.DataClass
       map['visibility'] = i0.Variable<int>(
           i1.$RemoteAssetEntityTable.$convertervisibility.toSql(visibility));
     }
+    if (!nullToAbsent || stackId != null) {
+      map['stack_id'] = i0.Variable<String>(stackId);
+    }
     return map;
   }
 
@@ -866,6 +899,7 @@ class RemoteAssetEntityData extends i0.DataClass
       livePhotoVideoId: serializer.fromJson<String?>(json['livePhotoVideoId']),
       visibility: i1.$RemoteAssetEntityTable.$convertervisibility
           .fromJson(serializer.fromJson<int>(json['visibility'])),
+      stackId: serializer.fromJson<String?>(json['stackId']),
     );
   }
   @override
@@ -890,6 +924,7 @@ class RemoteAssetEntityData extends i0.DataClass
       'livePhotoVideoId': serializer.toJson<String?>(livePhotoVideoId),
       'visibility': serializer.toJson<int>(
           i1.$RemoteAssetEntityTable.$convertervisibility.toJson(visibility)),
+      'stackId': serializer.toJson<String?>(stackId),
     };
   }
 
@@ -909,7 +944,8 @@ class RemoteAssetEntityData extends i0.DataClass
           i0.Value<String?> thumbHash = const i0.Value.absent(),
           i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
           i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
-          i2.AssetVisibility? visibility}) =>
+          i2.AssetVisibility? visibility,
+          i0.Value<String?> stackId = const i0.Value.absent()}) =>
       i1.RemoteAssetEntityData(
         name: name ?? this.name,
         type: type ?? this.type,
@@ -932,6 +968,7 @@ class RemoteAssetEntityData extends i0.DataClass
             ? livePhotoVideoId.value
             : this.livePhotoVideoId,
         visibility: visibility ?? this.visibility,
+        stackId: stackId.present ? stackId.value : this.stackId,
       );
   RemoteAssetEntityData copyWithCompanion(i1.RemoteAssetEntityCompanion data) {
     return RemoteAssetEntityData(
@@ -959,6 +996,7 @@ class RemoteAssetEntityData extends i0.DataClass
           : this.livePhotoVideoId,
       visibility:
           data.visibility.present ? data.visibility.value : this.visibility,
+      stackId: data.stackId.present ? data.stackId.value : this.stackId,
     );
   }
 
@@ -980,7 +1018,8 @@ class RemoteAssetEntityData extends i0.DataClass
           ..write('thumbHash: $thumbHash, ')
           ..write('deletedAt: $deletedAt, ')
           ..write('livePhotoVideoId: $livePhotoVideoId, ')
-          ..write('visibility: $visibility')
+          ..write('visibility: $visibility, ')
+          ..write('stackId: $stackId')
           ..write(')'))
         .toString();
   }
@@ -1002,7 +1041,8 @@ class RemoteAssetEntityData extends i0.DataClass
       thumbHash,
       deletedAt,
       livePhotoVideoId,
-      visibility);
+      visibility,
+      stackId);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -1022,7 +1062,8 @@ class RemoteAssetEntityData extends i0.DataClass
           other.thumbHash == this.thumbHash &&
           other.deletedAt == this.deletedAt &&
           other.livePhotoVideoId == this.livePhotoVideoId &&
-          other.visibility == this.visibility);
+          other.visibility == this.visibility &&
+          other.stackId == this.stackId);
 }
 
 class RemoteAssetEntityCompanion
@@ -1043,6 +1084,7 @@ class RemoteAssetEntityCompanion
   final i0.Value<DateTime?> deletedAt;
   final i0.Value<String?> livePhotoVideoId;
   final i0.Value<i2.AssetVisibility> visibility;
+  final i0.Value<String?> stackId;
   const RemoteAssetEntityCompanion({
     this.name = const i0.Value.absent(),
     this.type = const i0.Value.absent(),
@@ -1060,6 +1102,7 @@ class RemoteAssetEntityCompanion
     this.deletedAt = const i0.Value.absent(),
     this.livePhotoVideoId = const i0.Value.absent(),
     this.visibility = const i0.Value.absent(),
+    this.stackId = const i0.Value.absent(),
   });
   RemoteAssetEntityCompanion.insert({
     required String name,
@@ -1078,6 +1121,7 @@ class RemoteAssetEntityCompanion
     this.deletedAt = const i0.Value.absent(),
     this.livePhotoVideoId = const i0.Value.absent(),
     required i2.AssetVisibility visibility,
+    this.stackId = const i0.Value.absent(),
   })  : name = i0.Value(name),
         type = i0.Value(type),
         id = i0.Value(id),
@@ -1101,6 +1145,7 @@ class RemoteAssetEntityCompanion
     i0.Expression<DateTime>? deletedAt,
     i0.Expression<String>? livePhotoVideoId,
     i0.Expression<int>? visibility,
+    i0.Expression<String>? stackId,
   }) {
     return i0.RawValuesInsertable({
       if (name != null) 'name': name,
@@ -1119,6 +1164,7 @@ class RemoteAssetEntityCompanion
       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,
     });
   }
 
@@ -1138,7 +1184,8 @@ class RemoteAssetEntityCompanion
       i0.Value<String?>? thumbHash,
       i0.Value<DateTime?>? deletedAt,
       i0.Value<String?>? livePhotoVideoId,
-      i0.Value<i2.AssetVisibility>? visibility}) {
+      i0.Value<i2.AssetVisibility>? visibility,
+      i0.Value<String?>? stackId}) {
     return i1.RemoteAssetEntityCompanion(
       name: name ?? this.name,
       type: type ?? this.type,
@@ -1156,6 +1203,7 @@ class RemoteAssetEntityCompanion
       deletedAt: deletedAt ?? this.deletedAt,
       livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
       visibility: visibility ?? this.visibility,
+      stackId: stackId ?? this.stackId,
     );
   }
 
@@ -1213,6 +1261,9 @@ class RemoteAssetEntityCompanion
           .$RemoteAssetEntityTable.$convertervisibility
           .toSql(visibility.value));
     }
+    if (stackId.present) {
+      map['stack_id'] = i0.Variable<String>(stackId.value);
+    }
     return map;
   }
 
@@ -1234,7 +1285,8 @@ class RemoteAssetEntityCompanion
           ..write('thumbHash: $thumbHash, ')
           ..write('deletedAt: $deletedAt, ')
           ..write('livePhotoVideoId: $livePhotoVideoId, ')
-          ..write('visibility: $visibility')
+          ..write('visibility: $visibility, ')
+          ..write('stackId: $stackId')
           ..write(')'))
         .toString();
   }
diff --git a/mobile/lib/infrastructure/repositories/db.repository.drift.dart b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
index 15d445d226..3b826c209b 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -7,27 +7,27 @@ import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.
     as i2;
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart'
     as i3;
-import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
-    as i4;
-import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
-    as i5;
-import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart'
-    as i6;
-import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart'
-    as i7;
-import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
-    as i8;
-import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
-    as i9;
-import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'
-    as i10;
-import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
-    as i11;
-import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
-    as i12;
-import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
-    as i13;
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart'
+    as i4;
+import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
+    as i5;
+import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
+    as i6;
+import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart'
+    as i7;
+import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart'
+    as i8;
+import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
+    as i9;
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
+    as i10;
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'
+    as i11;
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
+    as i12;
+import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
+    as i13;
+import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
     as i14;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
     as i15;
@@ -41,26 +41,26 @@ abstract class $Drift extends i0.GeneratedDatabase {
       i2.$RemoteAssetEntityTable(this);
   late final i3.$LocalAssetEntityTable localAssetEntity =
       i3.$LocalAssetEntityTable(this);
-  late final i4.$UserMetadataEntityTable userMetadataEntity =
-      i4.$UserMetadataEntityTable(this);
-  late final i5.$PartnerEntityTable partnerEntity =
-      i5.$PartnerEntityTable(this);
-  late final i6.$LocalAlbumEntityTable localAlbumEntity =
-      i6.$LocalAlbumEntityTable(this);
-  late final i7.$LocalAlbumAssetEntityTable localAlbumAssetEntity =
-      i7.$LocalAlbumAssetEntityTable(this);
-  late final i8.$RemoteExifEntityTable remoteExifEntity =
-      i8.$RemoteExifEntityTable(this);
-  late final i9.$RemoteAlbumEntityTable remoteAlbumEntity =
-      i9.$RemoteAlbumEntityTable(this);
-  late final i10.$RemoteAlbumAssetEntityTable remoteAlbumAssetEntity =
-      i10.$RemoteAlbumAssetEntityTable(this);
-  late final i11.$RemoteAlbumUserEntityTable remoteAlbumUserEntity =
-      i11.$RemoteAlbumUserEntityTable(this);
-  late final i12.$MemoryEntityTable memoryEntity = i12.$MemoryEntityTable(this);
-  late final i13.$MemoryAssetEntityTable memoryAssetEntity =
-      i13.$MemoryAssetEntityTable(this);
-  late final i14.$StackEntityTable stackEntity = i14.$StackEntityTable(this);
+  late final i4.$StackEntityTable stackEntity = i4.$StackEntityTable(this);
+  late final i5.$UserMetadataEntityTable userMetadataEntity =
+      i5.$UserMetadataEntityTable(this);
+  late final i6.$PartnerEntityTable partnerEntity =
+      i6.$PartnerEntityTable(this);
+  late final i7.$LocalAlbumEntityTable localAlbumEntity =
+      i7.$LocalAlbumEntityTable(this);
+  late final i8.$LocalAlbumAssetEntityTable localAlbumAssetEntity =
+      i8.$LocalAlbumAssetEntityTable(this);
+  late final i9.$RemoteExifEntityTable remoteExifEntity =
+      i9.$RemoteExifEntityTable(this);
+  late final i10.$RemoteAlbumEntityTable remoteAlbumEntity =
+      i10.$RemoteAlbumEntityTable(this);
+  late final i11.$RemoteAlbumAssetEntityTable remoteAlbumAssetEntity =
+      i11.$RemoteAlbumAssetEntityTable(this);
+  late final i12.$RemoteAlbumUserEntityTable remoteAlbumUserEntity =
+      i12.$RemoteAlbumUserEntityTable(this);
+  late final i13.$MemoryEntityTable memoryEntity = i13.$MemoryEntityTable(this);
+  late final i14.$MemoryAssetEntityTable memoryAssetEntity =
+      i14.$MemoryAssetEntityTable(this);
   i15.MergedAssetDrift get mergedAssetDrift => i16.ReadDatabaseContainer(this)
       .accessor<i15.MergedAssetDrift>(i15.MergedAssetDrift.new);
   @override
@@ -71,6 +71,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
         userEntity,
         remoteAssetEntity,
         localAssetEntity,
+        stackEntity,
         i3.idxLocalAssetChecksum,
         i2.uQRemoteAssetOwnerChecksum,
         i2.idxRemoteAssetChecksum,
@@ -83,8 +84,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
         remoteAlbumAssetEntity,
         remoteAlbumUserEntity,
         memoryEntity,
-        memoryAssetEntity,
-        stackEntity
+        memoryAssetEntity
       ];
   @override
   i0.StreamQueryUpdateRules get streamUpdateRules =>
@@ -97,6 +97,13 @@ abstract class $Drift extends i0.GeneratedDatabase {
               i0.TableUpdate('remote_asset_entity', kind: i0.UpdateKind.delete),
             ],
           ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('user_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('stack_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
           i0.WritePropagation(
             on: i0.TableUpdateQuery.onTableName('user_entity',
                 limitUpdateKind: i0.UpdateKind.delete),
@@ -209,13 +216,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
               i0.TableUpdate('memory_asset_entity', kind: i0.UpdateKind.delete),
             ],
           ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('user_entity',
-                limitUpdateKind: i0.UpdateKind.delete),
-            result: [
-              i0.TableUpdate('stack_entity', kind: i0.UpdateKind.delete),
-            ],
-          ),
         ],
       );
   @override
@@ -232,27 +232,27 @@ class $DriftManager {
       i2.$$RemoteAssetEntityTableTableManager(_db, _db.remoteAssetEntity);
   i3.$$LocalAssetEntityTableTableManager get localAssetEntity =>
       i3.$$LocalAssetEntityTableTableManager(_db, _db.localAssetEntity);
-  i4.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
-      i4.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
-  i5.$$PartnerEntityTableTableManager get partnerEntity =>
-      i5.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
-  i6.$$LocalAlbumEntityTableTableManager get localAlbumEntity =>
-      i6.$$LocalAlbumEntityTableTableManager(_db, _db.localAlbumEntity);
-  i7.$$LocalAlbumAssetEntityTableTableManager get localAlbumAssetEntity => i7
+  i4.$$StackEntityTableTableManager get stackEntity =>
+      i4.$$StackEntityTableTableManager(_db, _db.stackEntity);
+  i5.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
+      i5.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
+  i6.$$PartnerEntityTableTableManager get partnerEntity =>
+      i6.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
+  i7.$$LocalAlbumEntityTableTableManager get localAlbumEntity =>
+      i7.$$LocalAlbumEntityTableTableManager(_db, _db.localAlbumEntity);
+  i8.$$LocalAlbumAssetEntityTableTableManager get localAlbumAssetEntity => i8
       .$$LocalAlbumAssetEntityTableTableManager(_db, _db.localAlbumAssetEntity);
-  i8.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
-      i8.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
-  i9.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity =>
-      i9.$$RemoteAlbumEntityTableTableManager(_db, _db.remoteAlbumEntity);
-  i10.$$RemoteAlbumAssetEntityTableTableManager get remoteAlbumAssetEntity =>
-      i10.$$RemoteAlbumAssetEntityTableTableManager(
+  i9.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
+      i9.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
+  i10.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity =>
+      i10.$$RemoteAlbumEntityTableTableManager(_db, _db.remoteAlbumEntity);
+  i11.$$RemoteAlbumAssetEntityTableTableManager get remoteAlbumAssetEntity =>
+      i11.$$RemoteAlbumAssetEntityTableTableManager(
           _db, _db.remoteAlbumAssetEntity);
-  i11.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i11
+  i12.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i12
       .$$RemoteAlbumUserEntityTableTableManager(_db, _db.remoteAlbumUserEntity);
-  i12.$$MemoryEntityTableTableManager get memoryEntity =>
-      i12.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
-  i13.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
-      i13.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
-  i14.$$StackEntityTableTableManager get stackEntity =>
-      i14.$$StackEntityTableTableManager(_db, _db.stackEntity);
+  i13.$$MemoryEntityTableTableManager get memoryEntity =>
+      i13.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
+  i14.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
+      i14.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
 }
diff --git a/mobile/lib/infrastructure/repositories/db.repository.steps.dart b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
index 5815d31978..4b27ce830c 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -12,6 +12,7 @@ final class Schema2 extends i0.VersionedSchema {
     userEntity,
     remoteAssetEntity,
     localAssetEntity,
+    stackEntity,
     idxLocalAssetChecksum,
     uQRemoteAssetOwnerChecksum,
     idxRemoteAssetChecksum,
@@ -25,7 +26,6 @@ final class Schema2 extends i0.VersionedSchema {
     remoteAlbumUserEntity,
     memoryEntity,
     memoryAssetEntity,
-    stackEntity,
   ];
   late final Shape0 userEntity = Shape0(
       source: i0.VersionedTable(
@@ -73,6 +73,7 @@ final class Schema2 extends i0.VersionedSchema {
           _column_18,
           _column_19,
           _column_20,
+          _column_21,
         ],
         attachedDatabase: database,
       ),
@@ -94,9 +95,27 @@ final class Schema2 extends i0.VersionedSchema {
           _column_11,
           _column_12,
           _column_0,
-          _column_21,
-          _column_14,
           _column_22,
+          _column_14,
+          _column_23,
+        ],
+        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_24,
         ],
         attachedDatabase: database,
       ),
@@ -108,7 +127,7 @@ final class Schema2 extends i0.VersionedSchema {
       'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
   final i1.Index idxRemoteAssetChecksum = i1.Index('idx_remote_asset_checksum',
       'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
-  late final Shape3 userMetadataEntity = Shape3(
+  late final Shape4 userMetadataEntity = Shape4(
       source: i0.VersionedTable(
         entityName: 'user_metadata_entity',
         withoutRowId: true,
@@ -117,14 +136,14 @@ final class Schema2 extends i0.VersionedSchema {
           'PRIMARY KEY(user_id, "key")',
         ],
         columns: [
-          _column_23,
-          _column_24,
           _column_25,
+          _column_26,
+          _column_27,
         ],
         attachedDatabase: database,
       ),
       alias: null);
-  late final Shape4 partnerEntity = Shape4(
+  late final Shape5 partnerEntity = Shape5(
       source: i0.VersionedTable(
         entityName: 'partner_entity',
         withoutRowId: true,
@@ -133,14 +152,14 @@ final class Schema2 extends i0.VersionedSchema {
           'PRIMARY KEY(shared_by_id, shared_with_id)',
         ],
         columns: [
-          _column_26,
-          _column_27,
           _column_28,
+          _column_29,
+          _column_30,
         ],
         attachedDatabase: database,
       ),
       alias: null);
-  late final Shape5 localAlbumEntity = Shape5(
+  late final Shape6 localAlbumEntity = Shape6(
       source: i0.VersionedTable(
         entityName: 'local_album_entity',
         withoutRowId: true,
@@ -152,14 +171,14 @@ final class Schema2 extends i0.VersionedSchema {
           _column_0,
           _column_1,
           _column_5,
-          _column_29,
-          _column_30,
           _column_31,
+          _column_32,
+          _column_33,
         ],
         attachedDatabase: database,
       ),
       alias: null);
-  late final Shape6 localAlbumAssetEntity = Shape6(
+  late final Shape7 localAlbumAssetEntity = Shape7(
       source: i0.VersionedTable(
         entityName: 'local_album_asset_entity',
         withoutRowId: true,
@@ -168,13 +187,13 @@ final class Schema2 extends i0.VersionedSchema {
           'PRIMARY KEY(asset_id, album_id)',
         ],
         columns: [
-          _column_32,
-          _column_33,
+          _column_34,
+          _column_35,
         ],
         attachedDatabase: database,
       ),
       alias: null);
-  late final Shape7 remoteExifEntity = Shape7(
+  late final Shape8 remoteExifEntity = Shape8(
       source: i0.VersionedTable(
         entityName: 'remote_exif_entity',
         withoutRowId: true,
@@ -183,16 +202,14 @@ final class Schema2 extends i0.VersionedSchema {
           'PRIMARY KEY(asset_id)',
         ],
         columns: [
-          _column_34,
-          _column_35,
           _column_36,
           _column_37,
           _column_38,
           _column_39,
-          _column_11,
-          _column_10,
           _column_40,
           _column_41,
+          _column_11,
+          _column_10,
           _column_42,
           _column_43,
           _column_44,
@@ -205,11 +222,13 @@ final class Schema2 extends i0.VersionedSchema {
           _column_51,
           _column_52,
           _column_53,
+          _column_54,
+          _column_55,
         ],
         attachedDatabase: database,
       ),
       alias: null);
-  late final Shape8 remoteAlbumEntity = Shape8(
+  late final Shape9 remoteAlbumEntity = Shape9(
       source: i0.VersionedTable(
         entityName: 'remote_album_entity',
         withoutRowId: true,
@@ -220,18 +239,18 @@ final class Schema2 extends i0.VersionedSchema {
         columns: [
           _column_0,
           _column_1,
-          _column_54,
+          _column_56,
           _column_9,
           _column_5,
           _column_15,
-          _column_55,
-          _column_56,
           _column_57,
+          _column_58,
+          _column_59,
         ],
         attachedDatabase: database,
       ),
       alias: null);
-  late final Shape6 remoteAlbumAssetEntity = Shape6(
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
       source: i0.VersionedTable(
         entityName: 'remote_album_asset_entity',
         withoutRowId: true,
@@ -240,13 +259,13 @@ final class Schema2 extends i0.VersionedSchema {
           'PRIMARY KEY(asset_id, album_id)',
         ],
         columns: [
-          _column_34,
-          _column_58,
+          _column_36,
+          _column_60,
         ],
         attachedDatabase: database,
       ),
       alias: null);
-  late final Shape9 remoteAlbumUserEntity = Shape9(
+  late final Shape10 remoteAlbumUserEntity = Shape10(
       source: i0.VersionedTable(
         entityName: 'remote_album_user_entity',
         withoutRowId: true,
@@ -255,14 +274,14 @@ final class Schema2 extends i0.VersionedSchema {
           'PRIMARY KEY(album_id, user_id)',
         ],
         columns: [
-          _column_58,
-          _column_23,
-          _column_59,
+          _column_60,
+          _column_25,
+          _column_61,
         ],
         attachedDatabase: database,
       ),
       alias: null);
-  late final Shape10 memoryEntity = Shape10(
+  late final Shape11 memoryEntity = Shape11(
       source: i0.VersionedTable(
         entityName: 'memory_entity',
         withoutRowId: true,
@@ -277,17 +296,17 @@ final class Schema2 extends i0.VersionedSchema {
           _column_18,
           _column_15,
           _column_8,
-          _column_60,
-          _column_61,
           _column_62,
           _column_63,
           _column_64,
           _column_65,
+          _column_66,
+          _column_67,
         ],
         attachedDatabase: database,
       ),
       alias: null);
-  late final Shape11 memoryAssetEntity = Shape11(
+  late final Shape12 memoryAssetEntity = Shape12(
       source: i0.VersionedTable(
         entityName: 'memory_asset_entity',
         withoutRowId: true,
@@ -296,26 +315,8 @@ final class Schema2 extends i0.VersionedSchema {
           'PRIMARY KEY(asset_id, memory_id)',
         ],
         columns: [
-          _column_34,
-          _column_66,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape12 stackEntity = Shape12(
-      source: i0.VersionedTable(
-        entityName: 'stack_entity',
-        withoutRowId: true,
-        isStrict: true,
-        tableConstraints: [
-          'PRIMARY KEY(id)',
-        ],
-        columns: [
-          _column_0,
-          _column_9,
-          _column_5,
-          _column_15,
-          _column_67,
+          _column_36,
+          _column_68,
         ],
         attachedDatabase: database,
       ),
@@ -405,6 +406,8 @@ class Shape1 extends i0.VersionedTable {
       columnsByName['live_photo_video_id']! as i1.GeneratedColumn<String>;
   i1.GeneratedColumn<int> get visibility =>
       columnsByName['visibility']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get stackId =>
+      columnsByName['stack_id']! as i1.GeneratedColumn<String>;
 }
 
 i1.GeneratedColumn<int> _column_8(String aliasedName) =>
@@ -452,6 +455,9 @@ i1.GeneratedColumn<String> _column_19(String aliasedName) =>
 i1.GeneratedColumn<int> _column_20(String aliasedName) =>
     i1.GeneratedColumn<int>('visibility', aliasedName, false,
         type: i1.DriftSqlType.int);
+i1.GeneratedColumn<String> _column_21(String aliasedName) =>
+    i1.GeneratedColumn<String>('stack_id', aliasedName, true,
+        type: i1.DriftSqlType.string);
 
 class Shape2 extends i0.VersionedTable {
   Shape2({required super.source, required super.alias}) : super.aliased();
@@ -479,15 +485,35 @@ class Shape2 extends i0.VersionedTable {
       columnsByName['orientation']! as i1.GeneratedColumn<int>;
 }
 
-i1.GeneratedColumn<String> _column_21(String aliasedName) =>
+i1.GeneratedColumn<String> _column_22(String aliasedName) =>
     i1.GeneratedColumn<String>('checksum', aliasedName, true,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<int> _column_22(String aliasedName) =>
+i1.GeneratedColumn<int> _column_23(String aliasedName) =>
     i1.GeneratedColumn<int>('orientation', aliasedName, false,
         type: i1.DriftSqlType.int, defaultValue: const CustomExpression('0'));
 
 class Shape3 extends i0.VersionedTable {
   Shape3({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  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<String> get ownerId =>
+      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get primaryAssetId =>
+      columnsByName['primary_asset_id']! as i1.GeneratedColumn<String>;
+}
+
+i1.GeneratedColumn<String> _column_24(String aliasedName) =>
+    i1.GeneratedColumn<String>('primary_asset_id', aliasedName, false,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES remote_asset_entity (id)'));
+
+class Shape4 extends i0.VersionedTable {
+  Shape4({required super.source, required super.alias}) : super.aliased();
   i1.GeneratedColumn<String> get userId =>
       columnsByName['user_id']! as i1.GeneratedColumn<String>;
   i1.GeneratedColumn<int> get key =>
@@ -496,20 +522,20 @@ class Shape3 extends i0.VersionedTable {
       columnsByName['value']! as i1.GeneratedColumn<i2.Uint8List>;
 }
 
-i1.GeneratedColumn<String> _column_23(String aliasedName) =>
+i1.GeneratedColumn<String> _column_25(String aliasedName) =>
     i1.GeneratedColumn<String>('user_id', aliasedName, false,
         type: i1.DriftSqlType.string,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'REFERENCES user_entity (id) ON DELETE CASCADE'));
-i1.GeneratedColumn<int> _column_24(String aliasedName) =>
+i1.GeneratedColumn<int> _column_26(String aliasedName) =>
     i1.GeneratedColumn<int>('key', aliasedName, false,
         type: i1.DriftSqlType.int);
-i1.GeneratedColumn<i2.Uint8List> _column_25(String aliasedName) =>
+i1.GeneratedColumn<i2.Uint8List> _column_27(String aliasedName) =>
     i1.GeneratedColumn<i2.Uint8List>('value', aliasedName, false,
         type: i1.DriftSqlType.blob);
 
-class Shape4 extends i0.VersionedTable {
-  Shape4({required super.source, required super.alias}) : super.aliased();
+class Shape5 extends i0.VersionedTable {
+  Shape5({required super.source, required super.alias}) : super.aliased();
   i1.GeneratedColumn<String> get sharedById =>
       columnsByName['shared_by_id']! as i1.GeneratedColumn<String>;
   i1.GeneratedColumn<String> get sharedWithId =>
@@ -518,25 +544,25 @@ class Shape4 extends i0.VersionedTable {
       columnsByName['in_timeline']! as i1.GeneratedColumn<bool>;
 }
 
-i1.GeneratedColumn<String> _column_26(String aliasedName) =>
+i1.GeneratedColumn<String> _column_28(String aliasedName) =>
     i1.GeneratedColumn<String>('shared_by_id', aliasedName, false,
         type: i1.DriftSqlType.string,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'REFERENCES user_entity (id) ON DELETE CASCADE'));
-i1.GeneratedColumn<String> _column_27(String aliasedName) =>
+i1.GeneratedColumn<String> _column_29(String aliasedName) =>
     i1.GeneratedColumn<String>('shared_with_id', aliasedName, false,
         type: i1.DriftSqlType.string,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'REFERENCES user_entity (id) ON DELETE CASCADE'));
-i1.GeneratedColumn<bool> _column_28(String aliasedName) =>
+i1.GeneratedColumn<bool> _column_30(String aliasedName) =>
     i1.GeneratedColumn<bool>('in_timeline', aliasedName, false,
         type: i1.DriftSqlType.bool,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'CHECK ("in_timeline" IN (0, 1))'),
         defaultValue: const CustomExpression('0'));
 
-class Shape5 extends i0.VersionedTable {
-  Shape5({required super.source, required super.alias}) : super.aliased();
+class Shape6 extends i0.VersionedTable {
+  Shape6({required super.source, required super.alias}) : super.aliased();
   i1.GeneratedColumn<String> get id =>
       columnsByName['id']! as i1.GeneratedColumn<String>;
   i1.GeneratedColumn<String> get name =>
@@ -551,42 +577,42 @@ class Shape5 extends i0.VersionedTable {
       columnsByName['marker']! as i1.GeneratedColumn<bool>;
 }
 
-i1.GeneratedColumn<int> _column_29(String aliasedName) =>
+i1.GeneratedColumn<int> _column_31(String aliasedName) =>
     i1.GeneratedColumn<int>('backup_selection', aliasedName, false,
         type: i1.DriftSqlType.int);
-i1.GeneratedColumn<bool> _column_30(String aliasedName) =>
+i1.GeneratedColumn<bool> _column_32(String aliasedName) =>
     i1.GeneratedColumn<bool>('is_ios_shared_album', aliasedName, false,
         type: i1.DriftSqlType.bool,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'CHECK ("is_ios_shared_album" IN (0, 1))'),
         defaultValue: const CustomExpression('0'));
-i1.GeneratedColumn<bool> _column_31(String aliasedName) =>
+i1.GeneratedColumn<bool> _column_33(String aliasedName) =>
     i1.GeneratedColumn<bool>('marker', aliasedName, true,
         type: i1.DriftSqlType.bool,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'CHECK ("marker" IN (0, 1))'));
 
-class Shape6 extends i0.VersionedTable {
-  Shape6({required super.source, required super.alias}) : super.aliased();
+class Shape7 extends i0.VersionedTable {
+  Shape7({required super.source, required super.alias}) : super.aliased();
   i1.GeneratedColumn<String> get assetId =>
       columnsByName['asset_id']! as i1.GeneratedColumn<String>;
   i1.GeneratedColumn<String> get albumId =>
       columnsByName['album_id']! as i1.GeneratedColumn<String>;
 }
 
-i1.GeneratedColumn<String> _column_32(String aliasedName) =>
+i1.GeneratedColumn<String> _column_34(String aliasedName) =>
     i1.GeneratedColumn<String>('asset_id', aliasedName, false,
         type: i1.DriftSqlType.string,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'REFERENCES local_asset_entity (id) ON DELETE CASCADE'));
-i1.GeneratedColumn<String> _column_33(String aliasedName) =>
+i1.GeneratedColumn<String> _column_35(String aliasedName) =>
     i1.GeneratedColumn<String>('album_id', aliasedName, false,
         type: i1.DriftSqlType.string,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'REFERENCES local_album_entity (id) ON DELETE CASCADE'));
 
-class Shape7 extends i0.VersionedTable {
-  Shape7({required super.source, required super.alias}) : super.aliased();
+class Shape8 extends i0.VersionedTable {
+  Shape8({required super.source, required super.alias}) : super.aliased();
   i1.GeneratedColumn<String> get assetId =>
       columnsByName['asset_id']! as i1.GeneratedColumn<String>;
   i1.GeneratedColumn<String> get city =>
@@ -633,71 +659,71 @@ class Shape7 extends i0.VersionedTable {
       columnsByName['projection_type']! as i1.GeneratedColumn<String>;
 }
 
-i1.GeneratedColumn<String> _column_34(String aliasedName) =>
+i1.GeneratedColumn<String> _column_36(String aliasedName) =>
     i1.GeneratedColumn<String>('asset_id', aliasedName, false,
         type: i1.DriftSqlType.string,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'REFERENCES remote_asset_entity (id) ON DELETE CASCADE'));
-i1.GeneratedColumn<String> _column_35(String aliasedName) =>
+i1.GeneratedColumn<String> _column_37(String aliasedName) =>
     i1.GeneratedColumn<String>('city', aliasedName, true,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<String> _column_36(String aliasedName) =>
+i1.GeneratedColumn<String> _column_38(String aliasedName) =>
     i1.GeneratedColumn<String>('state', aliasedName, true,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<String> _column_37(String aliasedName) =>
+i1.GeneratedColumn<String> _column_39(String aliasedName) =>
     i1.GeneratedColumn<String>('country', aliasedName, true,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<DateTime> _column_38(String aliasedName) =>
+i1.GeneratedColumn<DateTime> _column_40(String aliasedName) =>
     i1.GeneratedColumn<DateTime>('date_time_original', aliasedName, true,
         type: i1.DriftSqlType.dateTime);
-i1.GeneratedColumn<String> _column_39(String aliasedName) =>
+i1.GeneratedColumn<String> _column_41(String aliasedName) =>
     i1.GeneratedColumn<String>('description', aliasedName, true,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<String> _column_40(String aliasedName) =>
+i1.GeneratedColumn<String> _column_42(String aliasedName) =>
     i1.GeneratedColumn<String>('exposure_time', aliasedName, true,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<double> _column_41(String aliasedName) =>
+i1.GeneratedColumn<double> _column_43(String aliasedName) =>
     i1.GeneratedColumn<double>('f_number', aliasedName, true,
         type: i1.DriftSqlType.double);
-i1.GeneratedColumn<int> _column_42(String aliasedName) =>
+i1.GeneratedColumn<int> _column_44(String aliasedName) =>
     i1.GeneratedColumn<int>('file_size', aliasedName, true,
         type: i1.DriftSqlType.int);
-i1.GeneratedColumn<double> _column_43(String aliasedName) =>
+i1.GeneratedColumn<double> _column_45(String aliasedName) =>
     i1.GeneratedColumn<double>('focal_length', aliasedName, true,
         type: i1.DriftSqlType.double);
-i1.GeneratedColumn<double> _column_44(String aliasedName) =>
+i1.GeneratedColumn<double> _column_46(String aliasedName) =>
     i1.GeneratedColumn<double>('latitude', aliasedName, true,
         type: i1.DriftSqlType.double);
-i1.GeneratedColumn<double> _column_45(String aliasedName) =>
+i1.GeneratedColumn<double> _column_47(String aliasedName) =>
     i1.GeneratedColumn<double>('longitude', aliasedName, true,
         type: i1.DriftSqlType.double);
-i1.GeneratedColumn<int> _column_46(String aliasedName) =>
+i1.GeneratedColumn<int> _column_48(String aliasedName) =>
     i1.GeneratedColumn<int>('iso', aliasedName, true,
         type: i1.DriftSqlType.int);
-i1.GeneratedColumn<String> _column_47(String aliasedName) =>
+i1.GeneratedColumn<String> _column_49(String aliasedName) =>
     i1.GeneratedColumn<String>('make', aliasedName, true,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<String> _column_48(String aliasedName) =>
+i1.GeneratedColumn<String> _column_50(String aliasedName) =>
     i1.GeneratedColumn<String>('model', aliasedName, true,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<String> _column_49(String aliasedName) =>
+i1.GeneratedColumn<String> _column_51(String aliasedName) =>
     i1.GeneratedColumn<String>('lens', aliasedName, true,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<String> _column_50(String aliasedName) =>
+i1.GeneratedColumn<String> _column_52(String aliasedName) =>
     i1.GeneratedColumn<String>('orientation', aliasedName, true,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<String> _column_51(String aliasedName) =>
+i1.GeneratedColumn<String> _column_53(String aliasedName) =>
     i1.GeneratedColumn<String>('time_zone', aliasedName, true,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<int> _column_52(String aliasedName) =>
+i1.GeneratedColumn<int> _column_54(String aliasedName) =>
     i1.GeneratedColumn<int>('rating', aliasedName, true,
         type: i1.DriftSqlType.int);
-i1.GeneratedColumn<String> _column_53(String aliasedName) =>
+i1.GeneratedColumn<String> _column_55(String aliasedName) =>
     i1.GeneratedColumn<String>('projection_type', aliasedName, true,
         type: i1.DriftSqlType.string);
 
-class Shape8 extends i0.VersionedTable {
-  Shape8({required super.source, required super.alias}) : super.aliased();
+class Shape9 extends i0.VersionedTable {
+  Shape9({required super.source, required super.alias}) : super.aliased();
   i1.GeneratedColumn<String> get id =>
       columnsByName['id']! as i1.GeneratedColumn<String>;
   i1.GeneratedColumn<String> get name =>
@@ -718,32 +744,32 @@ class Shape8 extends i0.VersionedTable {
       columnsByName['order']! as i1.GeneratedColumn<int>;
 }
 
-i1.GeneratedColumn<String> _column_54(String aliasedName) =>
+i1.GeneratedColumn<String> _column_56(String aliasedName) =>
     i1.GeneratedColumn<String>('description', aliasedName, false,
         type: i1.DriftSqlType.string,
         defaultValue: const CustomExpression('\'\''));
-i1.GeneratedColumn<String> _column_55(String aliasedName) =>
+i1.GeneratedColumn<String> _column_57(String aliasedName) =>
     i1.GeneratedColumn<String>('thumbnail_asset_id', aliasedName, true,
         type: i1.DriftSqlType.string,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'REFERENCES remote_asset_entity (id) ON DELETE SET NULL'));
-i1.GeneratedColumn<bool> _column_56(String aliasedName) =>
+i1.GeneratedColumn<bool> _column_58(String aliasedName) =>
     i1.GeneratedColumn<bool>('is_activity_enabled', aliasedName, false,
         type: i1.DriftSqlType.bool,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'CHECK ("is_activity_enabled" IN (0, 1))'),
         defaultValue: const CustomExpression('1'));
-i1.GeneratedColumn<int> _column_57(String aliasedName) =>
+i1.GeneratedColumn<int> _column_59(String aliasedName) =>
     i1.GeneratedColumn<int>('order', aliasedName, false,
         type: i1.DriftSqlType.int);
-i1.GeneratedColumn<String> _column_58(String aliasedName) =>
+i1.GeneratedColumn<String> _column_60(String aliasedName) =>
     i1.GeneratedColumn<String>('album_id', aliasedName, false,
         type: i1.DriftSqlType.string,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
 
-class Shape9 extends i0.VersionedTable {
-  Shape9({required super.source, required super.alias}) : super.aliased();
+class Shape10 extends i0.VersionedTable {
+  Shape10({required super.source, required super.alias}) : super.aliased();
   i1.GeneratedColumn<String> get albumId =>
       columnsByName['album_id']! as i1.GeneratedColumn<String>;
   i1.GeneratedColumn<String> get userId =>
@@ -752,12 +778,12 @@ class Shape9 extends i0.VersionedTable {
       columnsByName['role']! as i1.GeneratedColumn<int>;
 }
 
-i1.GeneratedColumn<int> _column_59(String aliasedName) =>
+i1.GeneratedColumn<int> _column_61(String aliasedName) =>
     i1.GeneratedColumn<int>('role', aliasedName, false,
         type: i1.DriftSqlType.int);
 
-class Shape10 extends i0.VersionedTable {
-  Shape10({required super.source, required super.alias}) : super.aliased();
+class Shape11 extends i0.VersionedTable {
+  Shape11({required super.source, required super.alias}) : super.aliased();
   i1.GeneratedColumn<String> get id =>
       columnsByName['id']! as i1.GeneratedColumn<String>;
   i1.GeneratedColumn<DateTime> get createdAt =>
@@ -784,61 +810,41 @@ class Shape10 extends i0.VersionedTable {
       columnsByName['hide_at']! as i1.GeneratedColumn<DateTime>;
 }
 
-i1.GeneratedColumn<String> _column_60(String aliasedName) =>
+i1.GeneratedColumn<String> _column_62(String aliasedName) =>
     i1.GeneratedColumn<String>('data', aliasedName, false,
         type: i1.DriftSqlType.string);
-i1.GeneratedColumn<bool> _column_61(String aliasedName) =>
+i1.GeneratedColumn<bool> _column_63(String aliasedName) =>
     i1.GeneratedColumn<bool>('is_saved', aliasedName, false,
         type: i1.DriftSqlType.bool,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'CHECK ("is_saved" IN (0, 1))'),
         defaultValue: const CustomExpression('0'));
-i1.GeneratedColumn<DateTime> _column_62(String aliasedName) =>
+i1.GeneratedColumn<DateTime> _column_64(String aliasedName) =>
     i1.GeneratedColumn<DateTime>('memory_at', aliasedName, false,
         type: i1.DriftSqlType.dateTime);
-i1.GeneratedColumn<DateTime> _column_63(String aliasedName) =>
+i1.GeneratedColumn<DateTime> _column_65(String aliasedName) =>
     i1.GeneratedColumn<DateTime>('seen_at', aliasedName, true,
         type: i1.DriftSqlType.dateTime);
-i1.GeneratedColumn<DateTime> _column_64(String aliasedName) =>
+i1.GeneratedColumn<DateTime> _column_66(String aliasedName) =>
     i1.GeneratedColumn<DateTime>('show_at', aliasedName, true,
         type: i1.DriftSqlType.dateTime);
-i1.GeneratedColumn<DateTime> _column_65(String aliasedName) =>
+i1.GeneratedColumn<DateTime> _column_67(String aliasedName) =>
     i1.GeneratedColumn<DateTime>('hide_at', aliasedName, true,
         type: i1.DriftSqlType.dateTime);
 
-class Shape11 extends i0.VersionedTable {
-  Shape11({required super.source, required super.alias}) : super.aliased();
+class Shape12 extends i0.VersionedTable {
+  Shape12({required super.source, required super.alias}) : super.aliased();
   i1.GeneratedColumn<String> get assetId =>
       columnsByName['asset_id']! as i1.GeneratedColumn<String>;
   i1.GeneratedColumn<String> get memoryId =>
       columnsByName['memory_id']! as i1.GeneratedColumn<String>;
 }
 
-i1.GeneratedColumn<String> _column_66(String aliasedName) =>
+i1.GeneratedColumn<String> _column_68(String aliasedName) =>
     i1.GeneratedColumn<String>('memory_id', aliasedName, false,
         type: i1.DriftSqlType.string,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'REFERENCES memory_entity (id) ON DELETE CASCADE'));
-
-class Shape12 extends i0.VersionedTable {
-  Shape12({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  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<String> get ownerId =>
-      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get primaryAssetId =>
-      columnsByName['primary_asset_id']! as i1.GeneratedColumn<String>;
-}
-
-i1.GeneratedColumn<String> _column_67(String aliasedName) =>
-    i1.GeneratedColumn<String>('primary_asset_id', aliasedName, false,
-        type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES remote_asset_entity (id)'));
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
 }) {
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index 1f6f1b0891..28c229b46b 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -1,11 +1,13 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/domain/models/stack.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
     hide ExifInfo;
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
@@ -30,25 +32,66 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
   }
 
   Stream<RemoteAsset?> watchAsset(String id) {
-    final query = _db.remoteAssetEntity
-        .select()
-        .addColumns([_db.localAssetEntity.id]).join([
+    final stackCountRef = _db.stackEntity.id.count();
+
+    final query = _db.remoteAssetEntity.select().addColumns([
+      _db.localAssetEntity.id,
+      _db.stackEntity.primaryAssetId,
+      stackCountRef,
+    ]).join([
       leftOuterJoin(
         _db.localAssetEntity,
         _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
         useColumns: false,
       ),
+      leftOuterJoin(
+        _db.stackEntity,
+        _db.stackEntity.primaryAssetId.equalsExp(_db.remoteAssetEntity.id),
+        useColumns: false,
+      ),
+      leftOuterJoin(
+        _db.remoteAssetEntity.createAlias('stacked_assets'),
+        _db.stackEntity.id.equalsExp(
+          _db.remoteAssetEntity.createAlias('stacked_assets').stackId,
+        ),
+        useColumns: false,
+      ),
     ])
-      ..where(_db.remoteAssetEntity.id.equals(id));
+      ..where(_db.remoteAssetEntity.id.equals(id))
+      ..groupBy([
+        _db.remoteAssetEntity.id,
+        _db.localAssetEntity.id,
+        _db.stackEntity.primaryAssetId,
+      ]);
 
     return query.map((row) {
       final asset = row.readTable(_db.remoteAssetEntity).toDto();
+      final primaryAssetId = row.read(_db.stackEntity.primaryAssetId);
+      final stackCount =
+          primaryAssetId == id ? (row.read(stackCountRef) ?? 0) : 0;
+
       return asset.copyWith(
         localId: row.read(_db.localAssetEntity.id),
+        stackCount: stackCount,
       );
     }).watchSingleOrNull();
   }
 
+  Future<List<RemoteAsset>> getStackChildren(RemoteAsset asset) {
+    if (asset.stackId == null) {
+      return Future.value([]);
+    }
+
+    final query = _db.remoteAssetEntity.select()
+      ..where(
+        (row) =>
+            row.stackId.equals(asset.stackId!) & row.id.equals(asset.id).not(),
+      )
+      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)]);
+
+    return query.map((row) => row.toDto()).get();
+  }
+
   Future<ExifInfo?> getExif(String id) {
     return _db.managers.remoteExifEntity
         .filter((row) => row.assetId.id.equals(id))
@@ -146,4 +189,53 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
       }
     });
   }
+
+  Future<void> stack(String userId, StackResponse stack) {
+    return _db.transaction(() async {
+      final stackIds = await _db.managers.stackEntity
+          .filter((row) => row.primaryAssetId.id.isIn(stack.assetIds))
+          .map((row) => row.id)
+          .get();
+
+      await _db.stackEntity.deleteWhere((row) => row.id.isIn(stackIds));
+
+      await _db.batch((batch) {
+        final companion = StackEntityCompanion(
+          ownerId: Value(userId),
+          primaryAssetId: Value(stack.primaryAssetId),
+        );
+
+        batch.insert(
+          _db.stackEntity,
+          companion.copyWith(id: Value(stack.id)),
+          onConflict: DoUpdate((_) => companion),
+        );
+
+        for (final assetId in stack.assetIds) {
+          batch.update(
+            _db.remoteAssetEntity,
+            RemoteAssetEntityCompanion(
+              stackId: Value(stack.id),
+            ),
+            where: (e) => e.id.equals(assetId),
+          );
+        }
+      });
+    });
+  }
+
+  Future<void> unStack(List<String> stackIds) {
+    return _db.transaction(() async {
+      await _db.stackEntity.deleteWhere((row) => row.id.isIn(stackIds));
+
+      // TODO: delete this after adding foreign key on stackId
+      await _db.batch((batch) {
+        batch.update(
+          _db.remoteAssetEntity,
+          const RemoteAssetEntityCompanion(stackId: Value(null)),
+          where: (e) => e.stackId.isIn(stackIds),
+        );
+      });
+    });
+  }
 }
diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index f3f26bb01f..d28c68ed78 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -137,6 +137,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             deletedAt: Value(asset.deletedAt),
             visibility: Value(asset.visibility.toAssetVisibility()),
             livePhotoVideoId: Value(asset.livePhotoVideoId),
+            stackId: Value(asset.stackId),
           );
 
           batch.insert(
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index a6d89b5e8e..0c3eee59af 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -89,6 +89,8 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                   isFavorite: row.isFavorite,
                   durationInSeconds: row.durationInSeconds,
                   livePhotoVideoId: row.livePhotoVideoId,
+                  stackId: row.stackId,
+                  stackCount: row.stackCount,
                 )
               : LocalAsset(
                   id: row.localId!,
diff --git a/mobile/lib/presentation/pages/dev/main_timeline.page.dart b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
index 7216b638e1..0582399eaf 100644
--- a/mobile/lib/presentation/pages/dev/main_timeline.page.dart
+++ b/mobile/lib/presentation/pages/dev/main_timeline.page.dart
@@ -13,7 +13,7 @@ class MainTimelinePage extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final memoryLaneProvider = ref.watch(driftMemoryFutureProvider);
 
-    return memoryLaneProvider.when(
+    return memoryLaneProvider.maybeWhen(
       data: (memories) {
         return memories.isEmpty
             ? const Timeline(showStorageIndicator: true)
@@ -26,8 +26,7 @@ class MainTimelinePage extends ConsumerWidget {
                 showStorageIndicator: true,
               );
       },
-      loading: () => const Timeline(showStorageIndicator: true),
-      error: (error, stackTrace) => const Timeline(showStorageIndicator: true),
+      orElse: () => const Timeline(showStorageIndicator: true),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart
index dc42eb96f1..13782c0098 100644
--- a/mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart
@@ -1,16 +1,56 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class StackActionButton extends ConsumerWidget {
-  const StackActionButton({super.key});
+  final ActionSource source;
+
+  const StackActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final user = ref.watch(currentUserProvider);
+    if (user == null) {
+      throw Exception('User must be logged in to access stack action');
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).stack(user.id, source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'stack_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.filter_none_rounded,
       label: "stack".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/action_buttons/unstack_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unstack_action_button.widget.dart
new file mode 100644
index 0000000000..c2757043a3
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/unstack_action_button.widget.dart
@@ -0,0 +1,49 @@
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+class UnStackActionButton extends ConsumerWidget {
+  final ActionSource source;
+
+  const UnStackActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).unStack(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'unstack_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.filter_none_rounded,
+      label: "unstack".t(context: context),
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart
new file mode 100644
index 0000000000..cb4e02b56c
--- /dev/null
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart
@@ -0,0 +1,24 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+
+class StackChildrenNotifier
+    extends AutoDisposeFamilyAsyncNotifier<List<RemoteAsset>, BaseAsset?> {
+  @override
+  Future<List<RemoteAsset>> build(BaseAsset? asset) async {
+    if (asset == null ||
+        asset is! RemoteAsset ||
+        asset.stackId == null ||
+        // The stackCount check is to ensure we only fetch stacks for timelines that have stacks
+        asset.stackCount == 0) {
+      return const [];
+    }
+
+    return ref.watch(assetServiceProvider).getStack(asset);
+  }
+}
+
+final stackChildrenNotifier = AsyncNotifierProvider.autoDispose
+    .family<StackChildrenNotifier, List<RemoteAsset>, BaseAsset?>(
+  StackChildrenNotifier.new,
+);
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_stack.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_stack.widget.dart
new file mode 100644
index 0000000000..8b3d0c6575
--- /dev/null
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_stack.widget.dart
@@ -0,0 +1,119 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.provider.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+
+class AssetStackRow extends ConsumerWidget {
+  const AssetStackRow({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    int opacity = ref.watch(
+      assetViewerProvider.select((state) => state.backgroundOpacity),
+    );
+    final showControls =
+        ref.watch(assetViewerProvider.select((s) => s.showingControls));
+
+    if (!showControls) {
+      opacity = 0;
+    }
+
+    final asset = ref.watch(assetViewerProvider.select((s) => s.currentAsset));
+
+    return IgnorePointer(
+      ignoring: opacity < 255,
+      child: AnimatedOpacity(
+        opacity: opacity / 255,
+        duration: Durations.short2,
+        child: ref.watch(stackChildrenNotifier(asset)).when(
+              data: (state) => SizedBox.square(
+                dimension: 80,
+                child: _StackList(stack: state),
+              ),
+              error: (_, __) => const SizedBox.shrink(),
+              loading: () => const SizedBox.shrink(),
+            ),
+      ),
+    );
+  }
+}
+
+class _StackList extends ConsumerWidget {
+  final List<RemoteAsset> stack;
+
+  const _StackList({required this.stack});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return ListView.builder(
+      scrollDirection: Axis.horizontal,
+      padding: const EdgeInsets.only(
+        left: 5,
+        right: 5,
+        bottom: 30,
+      ),
+      itemCount: stack.length,
+      itemBuilder: (ctx, index) {
+        final asset = stack[index];
+        return Padding(
+          padding: const EdgeInsets.only(right: 5),
+          child: GestureDetector(
+            onTap: () {
+              ref.read(assetViewerProvider.notifier).setStackIndex(index);
+              ref.read(currentAssetNotifier.notifier).setAsset(asset);
+            },
+            child: Container(
+              height: 60,
+              width: 60,
+              decoration: index ==
+                      ref.watch(assetViewerProvider.select((s) => s.stackIndex))
+                  ? const BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.all(Radius.circular(6)),
+                      border: Border.fromBorderSide(
+                        BorderSide(color: Colors.white, width: 2),
+                      ),
+                    )
+                  : const BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.all(Radius.circular(6)),
+                      border: null,
+                    ),
+              child: ClipRRect(
+                borderRadius: const BorderRadius.all(Radius.circular(4)),
+                child: Stack(
+                  fit: StackFit.expand,
+                  children: [
+                    Image(
+                      fit: BoxFit.cover,
+                      image: getThumbnailImageProvider(
+                        remoteId: asset.id,
+                        size: const Size.square(60),
+                      ),
+                    ),
+                    if (asset.isVideo)
+                      const Icon(
+                        Icons.play_circle_outline_rounded,
+                        color: Colors.white,
+                        size: 16,
+                        shadows: [
+                          Shadow(
+                            blurRadius: 5.0,
+                            color: Color.fromRGBO(0, 0, 0, 0.6),
+                            offset: Offset(0.0, 0.0),
+                          ),
+                        ],
+                      ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
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 1c0f28413a..50f4a09197 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -5,10 +5,13 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/scroll_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.provider.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_bar.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet.widget.dart';
@@ -85,6 +88,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   double previousExtent = _kBottomSheetMinimumExtent;
   Offset dragDownPosition = Offset.zero;
   int totalAssets = 0;
+  int stackIndex = 0;
   BuildContext? scaffoldContext;
   Map<String, GlobalKey> videoPlayerKeys = {};
 
@@ -167,6 +171,10 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   void _onAssetChanged(int index) {
     final asset = ref.read(timelineServiceProvider).getAsset(index);
+    // Always holds the current asset from the timeline
+    ref.read(assetViewerProvider.notifier).setAsset(asset);
+    // The currentAssetNotifier actually holds the current asset that is displayed
+    // which could be stack children as well
     ref.read(currentAssetNotifier.notifier).setAsset(asset);
     if (asset.isVideo || asset.isMotionPhoto) {
       ref.read(videoPlaybackValueProvider.notifier).reset();
@@ -488,7 +496,12 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     ImageChunkEvent? progress,
     int index,
   ) {
-    final asset = ref.read(timelineServiceProvider).getAsset(index);
+    BaseAsset asset = ref.read(timelineServiceProvider).getAsset(index);
+    final stackChildren = ref.read(stackChildrenNotifier(asset)).valueOrNull;
+    if (stackChildren != null && stackChildren.isNotEmpty) {
+      asset = stackChildren
+          .elementAt(ref.read(assetViewerProvider.select((s) => s.stackIndex)));
+    }
     return Container(
       width: double.infinity,
       height: double.infinity,
@@ -516,9 +529,14 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   PhotoViewGalleryPageOptions _assetBuilder(BuildContext ctx, int index) {
     scaffoldContext ??= ctx;
-    final asset = ref.read(timelineServiceProvider).getAsset(index);
-    final isPlayingMotionVideo = ref.read(isPlayingMotionVideoProvider);
+    BaseAsset asset = ref.read(timelineServiceProvider).getAsset(index);
+    final stackChildren = ref.read(stackChildrenNotifier(asset)).valueOrNull;
+    if (stackChildren != null && stackChildren.isNotEmpty) {
+      asset = stackChildren
+          .elementAt(ref.read(assetViewerProvider.select((s) => s.stackIndex)));
+    }
 
+    final isPlayingMotionVideo = ref.read(isPlayingMotionVideoProvider);
     if (asset.isImage && !isPlayingMotionVideo) {
       return _imageBuilder(ctx, asset);
     }
@@ -604,6 +622,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     // Using multiple selectors to avoid unnecessary rebuilds for other state changes
     ref.watch(assetViewerProvider.select((s) => s.showingBottomSheet));
     ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity));
+    ref.watch(assetViewerProvider.select((s) => s.stackIndex));
     ref.watch(isPlayingMotionVideoProvider);
 
     // Listen for casting changes and send initial asset to the cast provider
@@ -645,7 +664,17 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
           backgroundDecoration: BoxDecoration(color: backgroundColor),
           enablePanAlways: true,
         ),
-        bottomNavigationBar: const ViewerBottomBar(),
+        bottomNavigationBar: showingBottomSheet
+            ? const SizedBox.shrink()
+            : const Column(
+                mainAxisSize: MainAxisSize.min,
+                mainAxisAlignment: MainAxisAlignment.end,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  AssetStackRow(),
+                  ViewerBottomBar(),
+                ],
+              ),
       ),
     );
   }
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
index 020d1d9b2c..825b637e8d 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
@@ -1,26 +1,40 @@
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
+class ViewerOpenBottomSheetEvent extends Event {
+  const ViewerOpenBottomSheetEvent();
+}
+
 class AssetViewerState {
   final int backgroundOpacity;
   final bool showingBottomSheet;
   final bool showingControls;
+  final BaseAsset? currentAsset;
+  final int stackIndex;
 
   const AssetViewerState({
     this.backgroundOpacity = 255,
     this.showingBottomSheet = false,
     this.showingControls = true,
+    this.currentAsset,
+    this.stackIndex = 0,
   });
 
   AssetViewerState copyWith({
     int? backgroundOpacity,
     bool? showingBottomSheet,
     bool? showingControls,
+    BaseAsset? currentAsset,
+    int? stackIndex,
   }) {
     return AssetViewerState(
       backgroundOpacity: backgroundOpacity ?? this.backgroundOpacity,
       showingBottomSheet: showingBottomSheet ?? this.showingBottomSheet,
       showingControls: showingControls ?? this.showingControls,
+      currentAsset: currentAsset ?? this.currentAsset,
+      stackIndex: stackIndex ?? this.stackIndex,
     );
   }
 
@@ -36,14 +50,18 @@ class AssetViewerState {
     return other is AssetViewerState &&
         other.backgroundOpacity == backgroundOpacity &&
         other.showingBottomSheet == showingBottomSheet &&
-        other.showingControls == showingControls;
+        other.showingControls == showingControls &&
+        other.currentAsset == currentAsset &&
+        other.stackIndex == stackIndex;
   }
 
   @override
   int get hashCode =>
       backgroundOpacity.hashCode ^
       showingBottomSheet.hashCode ^
-      showingControls.hashCode;
+      showingControls.hashCode ^
+      currentAsset.hashCode ^
+      stackIndex.hashCode;
 }
 
 class AssetViewerStateNotifier extends AutoDisposeNotifier<AssetViewerState> {
@@ -52,6 +70,10 @@ class AssetViewerStateNotifier extends AutoDisposeNotifier<AssetViewerState> {
     return const AssetViewerState();
   }
 
+  void setAsset(BaseAsset? asset) {
+    state = state.copyWith(currentAsset: asset, stackIndex: 0);
+  }
+
   void setOpacity(int opacity) {
     state = state.copyWith(
       backgroundOpacity: opacity,
@@ -76,6 +98,10 @@ class AssetViewerStateNotifier extends AutoDisposeNotifier<AssetViewerState> {
   void toggleControls() {
     state = state.copyWith(showingControls: !state.showingControls);
   }
+
+  void setStackIndex(int index) {
+    state = state.copyWith(stackIndex: index);
+  }
 }
 
 final assetViewerProvider =
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
index 7b1175e8be..a3d24ec8ee 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
@@ -49,7 +49,7 @@ class ArchiveBottomSheet extends ConsumerWidget {
           const MoveToLockFolderActionButton(
             source: ActionSource.timeline,
           ),
-          const StackActionButton(),
+          const StackActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.hasLocal) ...[
           const DeleteLocalActionButton(source: ActionSource.timeline),
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
index 0615a857a9..eefe19194c 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
@@ -49,7 +49,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
           const MoveToLockFolderActionButton(
             source: ActionSource.timeline,
           ),
-          const StackActionButton(),
+          const StackActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.hasLocal) ...[
           const DeleteLocalActionButton(source: ActionSource.timeline),
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
index 61414252da..f9a9dd3203 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -49,7 +49,7 @@ class GeneralBottomSheet extends ConsumerWidget {
           const MoveToLockFolderActionButton(
             source: ActionSource.timeline,
           ),
-          const StackActionButton(),
+          const StackActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.hasLocal) ...[
           const DeleteLocalActionButton(source: ActionSource.timeline),
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
index c2d0d5c85a..b5fecdf7a4 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
@@ -52,7 +52,7 @@ class RemoteAlbumBottomSheet extends ConsumerWidget {
           const MoveToLockFolderActionButton(
             source: ActionSource.timeline,
           ),
-          const StackActionButton(),
+          const StackActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.hasLocal) ...[
           const DeleteLocalActionButton(source: ActionSource.timeline),
diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index 7e3776adb2..ce3d39629f 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -53,6 +53,9 @@ class ThumbnailTile extends ConsumerWidget {
               )
             : const BoxDecoration();
 
+    final hasStack =
+        asset is RemoteAsset && (asset as RemoteAsset).stackCount > 0;
+
     return Stack(
       children: [
         AnimatedContainer(
@@ -75,6 +78,19 @@ class ThumbnailTile extends ConsumerWidget {
                     ),
                   ),
                 ),
+                if (hasStack)
+                  Align(
+                    alignment: Alignment.topRight,
+                    child: Padding(
+                      padding: EdgeInsets.only(
+                        right: 10.0,
+                        top: asset.isVideo ? 24.0 : 6.0,
+                      ),
+                      child: _StackIndicator(
+                        stackCount: (asset as RemoteAsset).stackCount,
+                      ),
+                    ),
+                  ),
                 if (asset.isVideo)
                   Align(
                     alignment: Alignment.topRight,
@@ -182,6 +198,40 @@ class _SelectionIndicator extends StatelessWidget {
   }
 }
 
+class _StackIndicator extends StatelessWidget {
+  final int stackCount;
+
+  const _StackIndicator({required this.stackCount});
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      spacing: 3,
+      mainAxisSize: MainAxisSize.min,
+      mainAxisAlignment: MainAxisAlignment.end,
+      // CrossAxisAlignment.start looks more centered vertically than CrossAxisAlignment.center
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          stackCount.toString(),
+          style: const TextStyle(
+            color: Colors.white,
+            fontSize: 12,
+            fontWeight: FontWeight.bold,
+            shadows: [
+              Shadow(
+                blurRadius: 5.0,
+                color: Color.fromRGBO(0, 0, 0, 0.6),
+              ),
+            ],
+          ),
+        ),
+        const _TileOverlayIcon(Icons.burst_mode_rounded),
+      ],
+    );
+  }
+}
+
 class _VideoIndicator extends StatelessWidget {
   final Duration duration;
   const _VideoIndicator(this.duration);
@@ -192,8 +242,8 @@ class _VideoIndicator extends StatelessWidget {
       spacing: 3,
       mainAxisSize: MainAxisSize.min,
       mainAxisAlignment: MainAxisAlignment.end,
-      // CrossAxisAlignment.end looks more centered vertically than CrossAxisAlignment.center
-      crossAxisAlignment: CrossAxisAlignment.end,
+      // CrossAxisAlignment.start looks more centered vertically than CrossAxisAlignment.center
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Text(
           duration.format(),
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.state.dart b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
index 91003fb1a1..6faa4da9f7 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.state.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
@@ -15,6 +15,7 @@ class TimelineArgs {
   final double spacing;
   final int columnCount;
   final bool showStorageIndicator;
+  final bool withStack;
   final GroupAssetsBy? groupBy;
 
   const TimelineArgs({
@@ -23,6 +24,7 @@ class TimelineArgs {
     this.spacing = kTimelineSpacing,
     this.columnCount = kTimelineColumnCount,
     this.showStorageIndicator = false,
+    this.withStack = false,
     this.groupBy,
   });
 
@@ -33,6 +35,7 @@ class TimelineArgs {
         maxHeight == other.maxHeight &&
         columnCount == other.columnCount &&
         showStorageIndicator == other.showStorageIndicator &&
+        withStack == other.withStack &&
         groupBy == other.groupBy;
   }
 
@@ -43,6 +46,7 @@ class TimelineArgs {
       spacing.hashCode ^
       columnCount.hashCode ^
       showStorageIndicator.hashCode ^
+      withStack.hashCode ^
       groupBy.hashCode;
 }
 
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index d279937417..873908832b 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -28,6 +28,7 @@ class Timeline extends StatelessWidget {
     this.topSliverWidget,
     this.topSliverWidgetHeight,
     this.showStorageIndicator = false,
+    this.withStack = false,
     this.appBar = const ImmichSliverAppBar(
       floating: true,
       pinned: false,
@@ -42,6 +43,7 @@ class Timeline extends StatelessWidget {
   final bool showStorageIndicator;
   final Widget? appBar;
   final Widget? bottomSheet;
+  final bool withStack;
   final GroupAssetsBy? groupBy;
 
   @override
@@ -58,6 +60,7 @@ class Timeline extends StatelessWidget {
                   settingsProvider.select((s) => s.get(Setting.tilesPerRow)),
                 ),
                 showStorageIndicator: showStorageIndicator,
+                withStack: withStack,
                 groupBy: groupBy,
               ),
             ),
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index b53417d021..456b072a39 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -50,7 +50,7 @@ class ActionNotifier extends Notifier<void> {
     return _getIdsForSource<LocalAsset>(source).toIds().toList(growable: false);
   }
 
-  List<String> _getOwnedRemoteForSource(ActionSource source) {
+  List<String> _getOwnedRemoteIdsForSource(ActionSource source) {
     final ownerId = ref.read(currentUserProvider)?.id;
     return _getIdsForSource<RemoteAsset>(source)
         .ownedAssets(ownerId)
@@ -58,6 +58,20 @@ class ActionNotifier extends Notifier<void> {
         .toList(growable: false);
   }
 
+  List<RemoteAsset> _getOwnedRemoteAssetsForSource(ActionSource source) {
+    final ownerId = ref.read(currentUserProvider)?.id;
+    return _getIdsForSource<RemoteAsset>(source).ownedAssets(ownerId).toList();
+  }
+
+  Iterable<T> _getIdsForSource<T extends BaseAsset>(ActionSource source) {
+    final Set<BaseAsset> assets = _getAssets(source);
+    return switch (T) {
+      const (RemoteAsset) => assets.whereType<RemoteAsset>(),
+      const (LocalAsset) => assets.whereType<LocalAsset>(),
+      _ => const [],
+    } as Iterable<T>;
+  }
+
   Set<BaseAsset> _getAssets(ActionSource source) {
     return switch (source) {
       ActionSource.timeline => ref.read(multiSelectProvider).selectedAssets,
@@ -68,15 +82,6 @@ class ActionNotifier extends Notifier<void> {
     };
   }
 
-  Iterable<T> _getIdsForSource<T extends BaseAsset>(ActionSource source) {
-    final Set<BaseAsset> assets = _getAssets(source);
-    return switch (T) {
-      const (RemoteAsset) => assets.whereType<RemoteAsset>(),
-      const (LocalAsset) => assets.whereType<LocalAsset>(),
-      _ => const [],
-    } as Iterable<T>;
-  }
-
   Future<ActionResult> shareLink(
     ActionSource source,
     BuildContext context,
@@ -96,7 +101,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> favorite(ActionSource source) async {
-    final ids = _getOwnedRemoteForSource(source);
+    final ids = _getOwnedRemoteIdsForSource(source);
     try {
       await _service.favorite(ids);
       return ActionResult(count: ids.length, success: true);
@@ -111,7 +116,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> unFavorite(ActionSource source) async {
-    final ids = _getOwnedRemoteForSource(source);
+    final ids = _getOwnedRemoteIdsForSource(source);
     try {
       await _service.unFavorite(ids);
       return ActionResult(count: ids.length, success: true);
@@ -126,7 +131,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> archive(ActionSource source) async {
-    final ids = _getOwnedRemoteForSource(source);
+    final ids = _getOwnedRemoteIdsForSource(source);
     try {
       await _service.archive(ids);
       return ActionResult(count: ids.length, success: true);
@@ -141,7 +146,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> unArchive(ActionSource source) async {
-    final ids = _getOwnedRemoteForSource(source);
+    final ids = _getOwnedRemoteIdsForSource(source);
     try {
       await _service.unArchive(ids);
       return ActionResult(count: ids.length, success: true);
@@ -156,7 +161,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> moveToLockFolder(ActionSource source) async {
-    final ids = _getOwnedRemoteForSource(source);
+    final ids = _getOwnedRemoteIdsForSource(source);
     try {
       await _service.moveToLockFolder(ids);
       return ActionResult(count: ids.length, success: true);
@@ -171,7 +176,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> removeFromLockFolder(ActionSource source) async {
-    final ids = _getOwnedRemoteForSource(source);
+    final ids = _getOwnedRemoteIdsForSource(source);
     try {
       await _service.removeFromLockFolder(ids);
       return ActionResult(count: ids.length, success: true);
@@ -186,7 +191,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> trash(ActionSource source) async {
-    final ids = _getOwnedRemoteForSource(source);
+    final ids = _getOwnedRemoteIdsForSource(source);
     try {
       await _service.trash(ids);
       return ActionResult(count: ids.length, success: true);
@@ -201,7 +206,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> delete(ActionSource source) async {
-    final ids = _getOwnedRemoteForSource(source);
+    final ids = _getOwnedRemoteIdsForSource(source);
     try {
       await _service.delete(ids);
       return ActionResult(count: ids.length, success: true);
@@ -234,7 +239,7 @@ class ActionNotifier extends Notifier<void> {
     ActionSource source,
     BuildContext context,
   ) async {
-    final ids = _getOwnedRemoteForSource(source);
+    final ids = _getOwnedRemoteIdsForSource(source);
     try {
       final isEdited = await _service.editLocation(ids, context);
       if (!isEdited) {
@@ -270,6 +275,35 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
+  Future<ActionResult> stack(String userId, ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    try {
+      await _service.stack(userId, ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to stack assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult> unStack(ActionSource source) async {
+    final assets = _getOwnedRemoteAssetsForSource(source);
+    try {
+      await _service.unStack(assets.map((e) => e.stackId).nonNulls.toList());
+      return ActionResult(count: assets.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to unstack assets', error, stack);
+      return ActionResult(
+        count: assets.length,
+        success: false,
+      );
+    }
+  }
+
   Future<ActionResult> shareAssets(ActionSource source) async {
     final ids = _getAssets(source).toList(growable: false);
 
diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dart
index cd49369a2a..4c854973b1 100644
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -1,6 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:http/http.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/stack.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/api.repository.dart';
@@ -11,14 +12,16 @@ final assetApiRepositoryProvider = Provider(
   (ref) => AssetApiRepository(
     ref.watch(apiServiceProvider).assetsApi,
     ref.watch(apiServiceProvider).searchApi,
+    ref.watch(apiServiceProvider).stacksApi,
   ),
 );
 
 class AssetApiRepository extends ApiRepository {
   final AssetsApi _api;
   final SearchApi _searchApi;
+  final StacksApi _stacksApi;
 
-  AssetApiRepository(this._api, this._searchApi);
+  AssetApiRepository(this._api, this._searchApi, this._stacksApi);
 
   Future<Asset> update(String id, {String? description}) async {
     final response = await checkNull(
@@ -84,6 +87,17 @@ class AssetApiRepository extends ApiRepository {
     );
   }
 
+  Future<StackResponse> stack(List<String> ids) async {
+    final responseDto =
+        await checkNull(_stacksApi.createStack(StackCreateDto(assetIds: ids)));
+
+    return responseDto.toStack();
+  }
+
+  Future<void> unStack(List<String> ids) async {
+    return _stacksApi.deleteStacks(BulkIdsDto(ids: ids));
+  }
+
   Future<Response> downloadAsset(String id) {
     return _api.downloadAssetWithHttpInfo(id);
   }
@@ -102,3 +116,13 @@ class AssetApiRepository extends ApiRepository {
     return response.originalMimeType;
   }
 }
+
+extension on StackResponseDto {
+  StackResponse toStack() {
+    return StackResponse(
+      id: id,
+      primaryAssetId: primaryAssetId,
+      assetIds: assets.map((asset) => asset.id).toList(),
+    );
+  }
+}
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index 9559c5d316..adefd5da16 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -166,6 +166,16 @@ class ActionService {
     return removedCount;
   }
 
+  Future<void> stack(String userId, List<String> remoteIds) async {
+    final stack = await _assetApiRepository.stack(remoteIds);
+    await _remoteAssetRepository.stack(userId, stack);
+  }
+
+  Future<void> unStack(List<String> stackIds) async {
+    await _remoteAssetRepository.unStack(stackIds);
+    await _assetApiRepository.unStack(stackIds);
+  }
+
   Future<int> shareAssets(List<BaseAsset> assets) {
     return _assetMediaRepository.shareAssets(assets);
   }
diff --git a/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
index faaccfa51a..eace57fe5c 100644
--- a/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
diff --git a/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart b/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart
index 2d35a6702b..41eed09d8c 100644
--- a/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart
@@ -6,6 +6,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
diff --git a/mobile/lib/widgets/map/map_thumbnail.dart b/mobile/lib/widgets/map/map_thumbnail.dart
index 06935cd4b5..1e4b061be6 100644
--- a/mobile/lib/widgets/map/map_thumbnail.dart
+++ b/mobile/lib/widgets/map/map_thumbnail.dart
@@ -63,8 +63,14 @@ class MapThumbnail extends HookConsumerWidget {
     }
 
     Future<void> onStyleLoaded() async {
-      if (showMarkerPin && controller.value != null) {
-        await controller.value?.addMarkerAtLatLng(centre);
+      try {
+        if (showMarkerPin && controller.value != null) {
+          await controller.value?.addMarkerAtLatLng(centre);
+        }
+      } finally {
+        // Calling methods on the controller after it is disposed will throw an error
+        // We do not have a way to check if the controller is disposed for now
+        // https://github.com/maplibre/flutter-maplibre-gl/issues/192
       }
       styleLoaded.value = true;
     }
diff --git a/mobile/test/drift/main/generated/schema_v1.dart b/mobile/test/drift/main/generated/schema_v1.dart
index 0172201921..38dbb9f827 100644
--- a/mobile/test/drift/main/generated/schema_v1.dart
+++ b/mobile/test/drift/main/generated/schema_v1.dart
@@ -410,9 +410,15 @@ class RemoteAssetEntity extends Table
   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);
   @override
   List<GeneratedColumn> get $columns => [
         name,
@@ -429,7 +435,9 @@ class RemoteAssetEntity extends Table
         localDateTime,
         thumbHash,
         deletedAt,
-        visibility
+        livePhotoVideoId,
+        visibility,
+        stackId
       ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -470,8 +478,12 @@ class RemoteAssetEntity extends Table
           .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']),
     );
   }
 
@@ -502,7 +514,9 @@ class RemoteAssetEntityData extends DataClass
   final DateTime? localDateTime;
   final String? thumbHash;
   final DateTime? deletedAt;
+  final String? livePhotoVideoId;
   final int visibility;
+  final String? stackId;
   const RemoteAssetEntityData(
       {required this.name,
       required this.type,
@@ -518,7 +532,9 @@ class RemoteAssetEntityData extends DataClass
       this.localDateTime,
       this.thumbHash,
       this.deletedAt,
-      required this.visibility});
+      this.livePhotoVideoId,
+      required this.visibility,
+      this.stackId});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -548,7 +564,13 @@ class RemoteAssetEntityData extends DataClass
     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);
+    }
     return map;
   }
 
@@ -570,7 +592,9 @@ class RemoteAssetEntityData extends DataClass
       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']),
     );
   }
   @override
@@ -591,7 +615,9 @@ class RemoteAssetEntityData extends DataClass
       '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),
     };
   }
 
@@ -610,7 +636,9 @@ class RemoteAssetEntityData extends DataClass
           Value<DateTime?> localDateTime = const Value.absent(),
           Value<String?> thumbHash = const Value.absent(),
           Value<DateTime?> deletedAt = const Value.absent(),
-          int? visibility}) =>
+          Value<String?> livePhotoVideoId = const Value.absent(),
+          int? visibility,
+          Value<String?> stackId = const Value.absent()}) =>
       RemoteAssetEntityData(
         name: name ?? this.name,
         type: type ?? this.type,
@@ -629,7 +657,11 @@ class RemoteAssetEntityData extends DataClass
             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,
       );
   RemoteAssetEntityData copyWithCompanion(RemoteAssetEntityCompanion data) {
     return RemoteAssetEntityData(
@@ -652,8 +684,12 @@ class RemoteAssetEntityData extends DataClass
           : 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,
     );
   }
 
@@ -674,7 +710,9 @@ class RemoteAssetEntityData extends DataClass
           ..write('localDateTime: $localDateTime, ')
           ..write('thumbHash: $thumbHash, ')
           ..write('deletedAt: $deletedAt, ')
-          ..write('visibility: $visibility')
+          ..write('livePhotoVideoId: $livePhotoVideoId, ')
+          ..write('visibility: $visibility, ')
+          ..write('stackId: $stackId')
           ..write(')'))
         .toString();
   }
@@ -695,7 +733,9 @@ class RemoteAssetEntityData extends DataClass
       localDateTime,
       thumbHash,
       deletedAt,
-      visibility);
+      livePhotoVideoId,
+      visibility,
+      stackId);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -714,7 +754,9 @@ class RemoteAssetEntityData extends DataClass
           other.localDateTime == this.localDateTime &&
           other.thumbHash == this.thumbHash &&
           other.deletedAt == this.deletedAt &&
-          other.visibility == this.visibility);
+          other.livePhotoVideoId == this.livePhotoVideoId &&
+          other.visibility == this.visibility &&
+          other.stackId == this.stackId);
 }
 
 class RemoteAssetEntityCompanion
@@ -733,7 +775,9 @@ class RemoteAssetEntityCompanion
   final Value<DateTime?> localDateTime;
   final Value<String?> thumbHash;
   final Value<DateTime?> deletedAt;
+  final Value<String?> livePhotoVideoId;
   final Value<int> visibility;
+  final Value<String?> stackId;
   const RemoteAssetEntityCompanion({
     this.name = const Value.absent(),
     this.type = const Value.absent(),
@@ -749,7 +793,9 @@ class RemoteAssetEntityCompanion
     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(),
   });
   RemoteAssetEntityCompanion.insert({
     required String name,
@@ -766,7 +812,9 @@ class RemoteAssetEntityCompanion
     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(),
   })  : name = Value(name),
         type = Value(type),
         id = Value(id),
@@ -788,7 +836,9 @@ class RemoteAssetEntityCompanion
     Expression<DateTime>? localDateTime,
     Expression<String>? thumbHash,
     Expression<DateTime>? deletedAt,
+    Expression<String>? livePhotoVideoId,
     Expression<int>? visibility,
+    Expression<String>? stackId,
   }) {
     return RawValuesInsertable({
       if (name != null) 'name': name,
@@ -805,7 +855,9 @@ class RemoteAssetEntityCompanion
       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,
     });
   }
 
@@ -824,7 +876,9 @@ class RemoteAssetEntityCompanion
       Value<DateTime?>? localDateTime,
       Value<String?>? thumbHash,
       Value<DateTime?>? deletedAt,
-      Value<int>? visibility}) {
+      Value<String?>? livePhotoVideoId,
+      Value<int>? visibility,
+      Value<String?>? stackId}) {
     return RemoteAssetEntityCompanion(
       name: name ?? this.name,
       type: type ?? this.type,
@@ -840,7 +894,9 @@ class RemoteAssetEntityCompanion
       localDateTime: localDateTime ?? this.localDateTime,
       thumbHash: thumbHash ?? this.thumbHash,
       deletedAt: deletedAt ?? this.deletedAt,
+      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
       visibility: visibility ?? this.visibility,
+      stackId: stackId ?? this.stackId,
     );
   }
 
@@ -889,9 +945,15 @@ class RemoteAssetEntityCompanion
     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);
+    }
     return map;
   }
 
@@ -912,7 +974,9 @@ class RemoteAssetEntityCompanion
           ..write('localDateTime: $localDateTime, ')
           ..write('thumbHash: $thumbHash, ')
           ..write('deletedAt: $deletedAt, ')
-          ..write('visibility: $visibility')
+          ..write('livePhotoVideoId: $livePhotoVideoId, ')
+          ..write('visibility: $visibility, ')
+          ..write('stackId: $stackId')
           ..write(')'))
         .toString();
   }
@@ -1351,6 +1415,258 @@ class LocalAssetEntityCompanion extends UpdateCompanion<LocalAssetEntityData> {
   }
 }
 
+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,
+      defaultConstraints: GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_asset_entity (id)'));
+  @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 UserMetadataEntity extends Table
     with TableInfo<UserMetadataEntity, UserMetadataEntityData> {
   @override
@@ -4329,263 +4645,12 @@ class MemoryAssetEntityCompanion
   }
 }
 
-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,
-      defaultConstraints: GeneratedColumn.constraintIsAlways(
-          'REFERENCES remote_asset_entity (id)'));
-  @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 DatabaseAtV1 extends GeneratedDatabase {
   DatabaseAtV1(QueryExecutor e) : super(e);
   late final UserEntity userEntity = UserEntity(this);
   late final RemoteAssetEntity remoteAssetEntity = RemoteAssetEntity(this);
   late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
+  late final StackEntity stackEntity = StackEntity(this);
   late final Index idxLocalAssetChecksum = Index('idx_local_asset_checksum',
       'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
   late final Index uQRemoteAssetOwnerChecksum = Index(
@@ -4606,7 +4671,6 @@ class DatabaseAtV1 extends GeneratedDatabase {
       RemoteAlbumUserEntity(this);
   late final MemoryEntity memoryEntity = MemoryEntity(this);
   late final MemoryAssetEntity memoryAssetEntity = MemoryAssetEntity(this);
-  late final StackEntity stackEntity = StackEntity(this);
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>
       allSchemaEntities.whereType<TableInfo<Table, Object?>>();
@@ -4615,6 +4679,7 @@ class DatabaseAtV1 extends GeneratedDatabase {
         userEntity,
         remoteAssetEntity,
         localAssetEntity,
+        stackEntity,
         idxLocalAssetChecksum,
         uQRemoteAssetOwnerChecksum,
         idxRemoteAssetChecksum,
@@ -4627,8 +4692,7 @@ class DatabaseAtV1 extends GeneratedDatabase {
         remoteAlbumAssetEntity,
         remoteAlbumUserEntity,
         memoryEntity,
-        memoryAssetEntity,
-        stackEntity
+        memoryAssetEntity
       ];
   @override
   int get schemaVersion => 1;
diff --git a/mobile/test/drift/main/generated/schema_v2.dart b/mobile/test/drift/main/generated/schema_v2.dart
index bdba8db557..8345cef906 100644
--- a/mobile/test/drift/main/generated/schema_v2.dart
+++ b/mobile/test/drift/main/generated/schema_v2.dart
@@ -416,6 +416,9 @@ class RemoteAssetEntity extends Table
   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);
   @override
   List<GeneratedColumn> get $columns => [
         name,
@@ -433,7 +436,8 @@ class RemoteAssetEntity extends Table
         thumbHash,
         deletedAt,
         livePhotoVideoId,
-        visibility
+        visibility,
+        stackId
       ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -478,6 +482,8 @@ class RemoteAssetEntity extends Table
           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']),
     );
   }
 
@@ -510,6 +516,7 @@ class RemoteAssetEntityData extends DataClass
   final DateTime? deletedAt;
   final String? livePhotoVideoId;
   final int visibility;
+  final String? stackId;
   const RemoteAssetEntityData(
       {required this.name,
       required this.type,
@@ -526,7 +533,8 @@ class RemoteAssetEntityData extends DataClass
       this.thumbHash,
       this.deletedAt,
       this.livePhotoVideoId,
-      required this.visibility});
+      required this.visibility,
+      this.stackId});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -560,6 +568,9 @@ class RemoteAssetEntityData extends DataClass
       map['live_photo_video_id'] = Variable<String>(livePhotoVideoId);
     }
     map['visibility'] = Variable<int>(visibility);
+    if (!nullToAbsent || stackId != null) {
+      map['stack_id'] = Variable<String>(stackId);
+    }
     return map;
   }
 
@@ -583,6 +594,7 @@ class RemoteAssetEntityData extends DataClass
       deletedAt: serializer.fromJson<DateTime?>(json['deletedAt']),
       livePhotoVideoId: serializer.fromJson<String?>(json['livePhotoVideoId']),
       visibility: serializer.fromJson<int>(json['visibility']),
+      stackId: serializer.fromJson<String?>(json['stackId']),
     );
   }
   @override
@@ -605,6 +617,7 @@ class RemoteAssetEntityData extends DataClass
       'deletedAt': serializer.toJson<DateTime?>(deletedAt),
       'livePhotoVideoId': serializer.toJson<String?>(livePhotoVideoId),
       'visibility': serializer.toJson<int>(visibility),
+      'stackId': serializer.toJson<String?>(stackId),
     };
   }
 
@@ -624,7 +637,8 @@ class RemoteAssetEntityData extends DataClass
           Value<String?> thumbHash = const Value.absent(),
           Value<DateTime?> deletedAt = const Value.absent(),
           Value<String?> livePhotoVideoId = const Value.absent(),
-          int? visibility}) =>
+          int? visibility,
+          Value<String?> stackId = const Value.absent()}) =>
       RemoteAssetEntityData(
         name: name ?? this.name,
         type: type ?? this.type,
@@ -647,6 +661,7 @@ class RemoteAssetEntityData extends DataClass
             ? livePhotoVideoId.value
             : this.livePhotoVideoId,
         visibility: visibility ?? this.visibility,
+        stackId: stackId.present ? stackId.value : this.stackId,
       );
   RemoteAssetEntityData copyWithCompanion(RemoteAssetEntityCompanion data) {
     return RemoteAssetEntityData(
@@ -674,6 +689,7 @@ class RemoteAssetEntityData extends DataClass
           : this.livePhotoVideoId,
       visibility:
           data.visibility.present ? data.visibility.value : this.visibility,
+      stackId: data.stackId.present ? data.stackId.value : this.stackId,
     );
   }
 
@@ -695,7 +711,8 @@ class RemoteAssetEntityData extends DataClass
           ..write('thumbHash: $thumbHash, ')
           ..write('deletedAt: $deletedAt, ')
           ..write('livePhotoVideoId: $livePhotoVideoId, ')
-          ..write('visibility: $visibility')
+          ..write('visibility: $visibility, ')
+          ..write('stackId: $stackId')
           ..write(')'))
         .toString();
   }
@@ -717,7 +734,8 @@ class RemoteAssetEntityData extends DataClass
       thumbHash,
       deletedAt,
       livePhotoVideoId,
-      visibility);
+      visibility,
+      stackId);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -737,7 +755,8 @@ class RemoteAssetEntityData extends DataClass
           other.thumbHash == this.thumbHash &&
           other.deletedAt == this.deletedAt &&
           other.livePhotoVideoId == this.livePhotoVideoId &&
-          other.visibility == this.visibility);
+          other.visibility == this.visibility &&
+          other.stackId == this.stackId);
 }
 
 class RemoteAssetEntityCompanion
@@ -758,6 +777,7 @@ class RemoteAssetEntityCompanion
   final Value<DateTime?> deletedAt;
   final Value<String?> livePhotoVideoId;
   final Value<int> visibility;
+  final Value<String?> stackId;
   const RemoteAssetEntityCompanion({
     this.name = const Value.absent(),
     this.type = const Value.absent(),
@@ -775,6 +795,7 @@ class RemoteAssetEntityCompanion
     this.deletedAt = const Value.absent(),
     this.livePhotoVideoId = const Value.absent(),
     this.visibility = const Value.absent(),
+    this.stackId = const Value.absent(),
   });
   RemoteAssetEntityCompanion.insert({
     required String name,
@@ -793,6 +814,7 @@ class RemoteAssetEntityCompanion
     this.deletedAt = const Value.absent(),
     this.livePhotoVideoId = const Value.absent(),
     required int visibility,
+    this.stackId = const Value.absent(),
   })  : name = Value(name),
         type = Value(type),
         id = Value(id),
@@ -816,6 +838,7 @@ class RemoteAssetEntityCompanion
     Expression<DateTime>? deletedAt,
     Expression<String>? livePhotoVideoId,
     Expression<int>? visibility,
+    Expression<String>? stackId,
   }) {
     return RawValuesInsertable({
       if (name != null) 'name': name,
@@ -834,6 +857,7 @@ class RemoteAssetEntityCompanion
       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,
     });
   }
 
@@ -853,7 +877,8 @@ class RemoteAssetEntityCompanion
       Value<String?>? thumbHash,
       Value<DateTime?>? deletedAt,
       Value<String?>? livePhotoVideoId,
-      Value<int>? visibility}) {
+      Value<int>? visibility,
+      Value<String?>? stackId}) {
     return RemoteAssetEntityCompanion(
       name: name ?? this.name,
       type: type ?? this.type,
@@ -871,6 +896,7 @@ class RemoteAssetEntityCompanion
       deletedAt: deletedAt ?? this.deletedAt,
       livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
       visibility: visibility ?? this.visibility,
+      stackId: stackId ?? this.stackId,
     );
   }
 
@@ -925,6 +951,9 @@ class RemoteAssetEntityCompanion
     if (visibility.present) {
       map['visibility'] = Variable<int>(visibility.value);
     }
+    if (stackId.present) {
+      map['stack_id'] = Variable<String>(stackId.value);
+    }
     return map;
   }
 
@@ -946,7 +975,8 @@ class RemoteAssetEntityCompanion
           ..write('thumbHash: $thumbHash, ')
           ..write('deletedAt: $deletedAt, ')
           ..write('livePhotoVideoId: $livePhotoVideoId, ')
-          ..write('visibility: $visibility')
+          ..write('visibility: $visibility, ')
+          ..write('stackId: $stackId')
           ..write(')'))
         .toString();
   }
@@ -1385,6 +1415,258 @@ class LocalAssetEntityCompanion extends UpdateCompanion<LocalAssetEntityData> {
   }
 }
 
+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,
+      defaultConstraints: GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_asset_entity (id)'));
+  @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 UserMetadataEntity extends Table
     with TableInfo<UserMetadataEntity, UserMetadataEntityData> {
   @override
@@ -4363,263 +4645,12 @@ class MemoryAssetEntityCompanion
   }
 }
 
-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,
-      defaultConstraints: GeneratedColumn.constraintIsAlways(
-          'REFERENCES remote_asset_entity (id)'));
-  @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 DatabaseAtV2 extends GeneratedDatabase {
   DatabaseAtV2(QueryExecutor e) : super(e);
   late final UserEntity userEntity = UserEntity(this);
   late final RemoteAssetEntity remoteAssetEntity = RemoteAssetEntity(this);
   late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
+  late final StackEntity stackEntity = StackEntity(this);
   late final Index idxLocalAssetChecksum = Index('idx_local_asset_checksum',
       'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
   late final Index uQRemoteAssetOwnerChecksum = Index(
@@ -4640,7 +4671,6 @@ class DatabaseAtV2 extends GeneratedDatabase {
       RemoteAlbumUserEntity(this);
   late final MemoryEntity memoryEntity = MemoryEntity(this);
   late final MemoryAssetEntity memoryAssetEntity = MemoryAssetEntity(this);
-  late final StackEntity stackEntity = StackEntity(this);
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>
       allSchemaEntities.whereType<TableInfo<Table, Object?>>();
@@ -4649,6 +4679,7 @@ class DatabaseAtV2 extends GeneratedDatabase {
         userEntity,
         remoteAssetEntity,
         localAssetEntity,
+        stackEntity,
         idxLocalAssetChecksum,
         uQRemoteAssetOwnerChecksum,
         idxRemoteAssetChecksum,
@@ -4661,8 +4692,7 @@ class DatabaseAtV2 extends GeneratedDatabase {
         remoteAlbumAssetEntity,
         remoteAlbumUserEntity,
         memoryEntity,
-        memoryAssetEntity,
-        stackEntity
+        memoryAssetEntity
       ];
   @override
   int get schemaVersion => 2;

From 53acf0826318a9b30d1f83ebe3afd1966b13a182 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 18 Jul 2025 12:08:57 +0200
Subject: [PATCH 235/337] fix(deps): update dependency multer to v2.0.2
 [security] (#20003)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 server/package-lock.json | 67 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index 46dfa8fd37..11be49ecb6 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -2882,6 +2882,67 @@
         "@nestjs/core": "^11.0.0"
       }
     },
+    "node_modules/@nestjs/platform-express/node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/@nestjs/platform-express/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/@nestjs/platform-express/node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/@nestjs/platform-express/node_modules/multer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
+      "integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "append-field": "^1.0.0",
+        "busboy": "^1.6.0",
+        "concat-stream": "^2.0.0",
+        "mkdirp": "^0.5.6",
+        "object-assign": "^4.1.1",
+        "type-is": "^1.6.18",
+        "xtend": "^4.0.2"
+      },
+      "engines": {
+        "node": ">= 10.16.0"
+      }
+    },
+    "node_modules/@nestjs/platform-express/node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "license": "MIT",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/@nestjs/platform-socket.io": {
       "version": "11.1.3",
       "resolved": "https://registry.npmjs.org/@nestjs/platform-socket.io/-/platform-socket.io-11.1.3.tgz",
@@ -13595,9 +13656,9 @@
       }
     },
     "node_modules/multer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
-      "integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz",
+      "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==",
       "license": "MIT",
       "dependencies": {
         "append-field": "^1.0.0",

From 137f0d48c080145c620fab5b14d8ccd31ec7369b Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 18 Jul 2025 08:36:29 -0500
Subject: [PATCH 236/337] chore: styling for asset_viewer bottom sheet (#20006)

bottom sheet styling
---
 .../pages/drift_recently_taken.page.dart      |  6 ++-
 .../presentation/pages/drift_video.page.dart  |  6 ++-
 .../asset_viewer/bottom_bar.widget.dart       | 15 -------
 .../asset_viewer/bottom_sheet.widget.dart     | 39 +++++++++++--------
 .../bottom_sheet/location_details.widget.dart | 13 ++++---
 .../base_bottom_sheet.widget.dart             |  6 ++-
 6 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/mobile/lib/presentation/pages/drift_recently_taken.page.dart b/mobile/lib/presentation/pages/drift_recently_taken.page.dart
index e2972fad56..df303e7b31 100644
--- a/mobile/lib/presentation/pages/drift_recently_taken.page.dart
+++ b/mobile/lib/presentation/pages/drift_recently_taken.page.dart
@@ -1,9 +1,11 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.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/user.provider.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 
 @RoutePage()
 class DriftRecentlyTakenPage extends StatelessWidget {
@@ -29,7 +31,9 @@ class DriftRecentlyTakenPage extends StatelessWidget {
           },
         ),
       ],
-      child: const Timeline(),
+      child: Timeline(
+        appBar: MesmerizingSliverAppBar(title: 'recently_taken'.t()),
+      ),
     );
   }
 }
diff --git a/mobile/lib/presentation/pages/drift_video.page.dart b/mobile/lib/presentation/pages/drift_video.page.dart
index 488d027177..8c0e8e6911 100644
--- a/mobile/lib/presentation/pages/drift_video.page.dart
+++ b/mobile/lib/presentation/pages/drift_video.page.dart
@@ -1,9 +1,11 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.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/user.provider.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 
 @RoutePage()
 class DriftVideoPage extends StatelessWidget {
@@ -27,7 +29,9 @@ class DriftVideoPage extends StatelessWidget {
           },
         ),
       ],
-      child: const Timeline(),
+      child: Timeline(
+        appBar: MesmerizingSliverAppBar(title: 'videos'.t()),
+      ),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
index 9237c3bcdb..d35a315f48 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
@@ -3,9 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
@@ -39,7 +37,6 @@ class ViewerBottomBar extends ConsumerWidget {
 
     final actions = <Widget>[
       const ShareActionButton(source: ActionSource.viewer),
-      const _EditActionButton(),
       if (asset.hasRemote && isOwner)
         const ArchiveActionButton(source: ActionSource.viewer),
     ];
@@ -86,15 +83,3 @@ class ViewerBottomBar extends ConsumerWidget {
     );
   }
 }
-
-class _EditActionButton extends ConsumerWidget {
-  const _EditActionButton();
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.tune_outlined,
-      label: 'edit'.t(context: context),
-    );
-  }
-}
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 6695022d1e..ea6dece942 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -73,6 +73,7 @@ class AssetDetailBottomSheet extends ConsumerWidget {
       expand: false,
       shouldCloseOnMinExtent: false,
       resizeOnScroll: false,
+      backgroundColor: context.isDarkTheme ? Colors.black : Colors.white,
     );
   }
 }
@@ -84,14 +85,18 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
     final dateTime = asset.createdAt.toLocal();
     final date = DateFormat.yMMMEd(ctx.locale.toLanguageTag()).format(dateTime);
     final time = DateFormat.jm(ctx.locale.toLanguageTag()).format(dateTime);
-    return '$date$_kSeparator$time';
+    final timezone = dateTime.timeZoneOffset.isNegative
+        ? 'UTC-${dateTime.timeZoneOffset.inHours.abs().toString().padLeft(2, '0')}:${(dateTime.timeZoneOffset.inMinutes.abs() % 60).toString().padLeft(2, '0')}'
+        : 'UTC+${dateTime.timeZoneOffset.inHours.toString().padLeft(2, '0')}:${(dateTime.timeZoneOffset.inMinutes.abs() % 60).toString().padLeft(2, '0')}';
+    return '$date$_kSeparator$time $timezone';
   }
 
   String _getFileInfo(BaseAsset asset, ExifInfo? exifInfo) {
     final height = asset.height ?? exifInfo?.height;
     final width = asset.width ?? exifInfo?.width;
-    final resolution =
-        (width != null && height != null) ? "$width x $height" : null;
+    final resolution = (width != null && height != null)
+        ? "${width.toInt()} x ${height.toInt()}"
+        : null;
     final fileSize =
         exifInfo?.fileSize != null ? formatBytes(exifInfo!.fileSize!) : null;
 
@@ -150,46 +155,46 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
         // Asset Date and Time
         _SheetTile(
           title: _getDateTime(context, asset),
-          titleStyle: context.textTheme.bodyLarge?.copyWith(
-            fontWeight: FontWeight.w500,
-            fontSize: 16,
+          titleStyle: context.textTheme.bodyMedium?.copyWith(
+            fontWeight: FontWeight.w600,
           ),
         ),
         const SheetLocationDetails(),
         // Details header
         _SheetTile(
           title: 'exif_bottom_sheet_details'.t(context: context),
-          titleStyle: context.textTheme.labelLarge,
+          titleStyle: context.textTheme.labelMedium?.copyWith(
+            color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            fontWeight: FontWeight.w600,
+          ),
         ),
         // File info
         _SheetTile(
           title: asset.name,
-          titleStyle: context.textTheme.labelLarge
-              ?.copyWith(fontWeight: FontWeight.w600),
+          titleStyle: context.textTheme.labelLarge,
           leading: Icon(
             asset.isImage ? Icons.image_outlined : Icons.videocam_outlined,
-            size: 30,
+            size: 24,
             color: context.textTheme.labelLarge?.color,
           ),
           subtitle: _getFileInfo(asset, exifInfo),
-          subtitleStyle: context.textTheme.labelLarge?.copyWith(
-            color: context.textTheme.labelLarge?.color?.withAlpha(200),
+          subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+            color: context.textTheme.bodyMedium?.color?.withAlpha(155),
           ),
         ),
         // Camera info
         if (cameraTitle != null)
           _SheetTile(
             title: cameraTitle,
-            titleStyle: context.textTheme.labelLarge
-                ?.copyWith(fontWeight: FontWeight.w600),
+            titleStyle: context.textTheme.labelLarge,
             leading: Icon(
               Icons.camera_outlined,
-              size: 30,
+              size: 24,
               color: context.textTheme.labelLarge?.color,
             ),
             subtitle: _getCameraInfoSubtitle(exifInfo),
-            subtitleStyle: context.textTheme.labelLarge?.copyWith(
-              color: context.textTheme.labelLarge?.color?.withAlpha(200),
+            subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+              color: context.textTheme.bodyMedium?.color?.withAlpha(155),
             ),
           ),
       ],
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
index 2bf52bd094..855328ebde 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
@@ -95,7 +95,10 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
             padding: const EdgeInsets.only(bottom: 16),
             child: Text(
               "exif_bottom_sheet_location".t(context: context),
-              style: context.textTheme.labelLarge,
+              style: context.textTheme.labelMedium?.copyWith(
+                color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                fontWeight: FontWeight.w600,
+              ),
             ),
           ),
           ExifMap(
@@ -109,15 +112,13 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
               padding: const EdgeInsets.only(bottom: 4.0),
               child: Text(
                 locationName,
-                style: context.textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.w500,
-                ),
+                style: context.textTheme.labelLarge,
               ),
             ),
           Text(
             coordinates,
-            style: context.textTheme.labelLarge?.copyWith(
-              color: context.textTheme.labelLarge?.color?.withAlpha(150),
+            style: context.textTheme.labelMedium?.copyWith(
+              color: context.textTheme.labelMedium?.color?.withAlpha(150),
             ),
           ),
         ],
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 2db8ae2b4c..e172eec03b 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
@@ -14,6 +14,7 @@ class BaseBottomSheet extends ConsumerStatefulWidget {
   final bool expand;
   final bool shouldCloseOnMinExtent;
   final bool resizeOnScroll;
+  final Color? backgroundColor;
 
   const BaseBottomSheet({
     super.key,
@@ -26,6 +27,7 @@ class BaseBottomSheet extends ConsumerStatefulWidget {
     this.expand = true,
     this.shouldCloseOnMinExtent = true,
     this.resizeOnScroll = true,
+    this.backgroundColor,
   });
 
   @override
@@ -69,8 +71,8 @@ class _BaseDraggableScrollableSheetState
       shouldCloseOnMinExtent: widget.shouldCloseOnMinExtent,
       builder: (BuildContext context, ScrollController scrollController) {
         return Card(
-          color: context.colorScheme.surfaceContainerHigh,
-          surfaceTintColor: context.colorScheme.surfaceContainerHigh,
+          color: widget.backgroundColor ??
+              context.colorScheme.surfaceContainerHigh,
           borderOnForeground: false,
           clipBehavior: Clip.antiAlias,
           elevation: 6.0,

From 2e63b9d9518361bc1463c3b75c8a1096a9be3749 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 18 Jul 2025 08:39:28 -0500
Subject: [PATCH 237/337] chore: add sync indicator and better album state
 management (#20004)

* album list rerendering

* sync indicator

* sync indicator

* fix: lint
---
 mobile/lib/domain/utils/background_sync.dart  |  19 ++-
 mobile/lib/pages/common/tab_shell.page.dart   |  53 ++------
 .../presentation/pages/drift_album.page.dart  |  75 +-----------
 .../providers/background_sync.provider.dart   |   8 +-
 .../infrastructure/remote_album.provider.dart |  48 ++------
 .../lib/providers/sync_status.provider.dart   |  68 +++++++++++
 .../widgets/common/immich_sliver_app_bar.dart | 113 ++++++++++++++++--
 7 files changed, 226 insertions(+), 158 deletions(-)
 create mode 100644 mobile/lib/providers/sync_status.provider.dart

diff --git a/mobile/lib/domain/utils/background_sync.dart b/mobile/lib/domain/utils/background_sync.dart
index c71f1a8315..7ab2989354 100644
--- a/mobile/lib/domain/utils/background_sync.dart
+++ b/mobile/lib/domain/utils/background_sync.dart
@@ -4,13 +4,24 @@ import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
 import 'package:immich_mobile/utils/isolate.dart';
 import 'package:worker_manager/worker_manager.dart';
 
+typedef SyncCallback = void Function();
+typedef SyncErrorCallback = void Function(String error);
+
 class BackgroundSyncManager {
+  final SyncCallback? onRemoteSyncStart;
+  final SyncCallback? onRemoteSyncComplete;
+  final SyncErrorCallback? onRemoteSyncError;
+
   Cancelable<void>? _syncTask;
   Cancelable<void>? _syncWebsocketTask;
   Cancelable<void>? _deviceAlbumSyncTask;
   Cancelable<void>? _hashTask;
 
-  BackgroundSyncManager();
+  BackgroundSyncManager({
+    this.onRemoteSyncStart,
+    this.onRemoteSyncComplete,
+    this.onRemoteSyncError,
+  });
 
   Future<void> cancel() {
     final futures = <Future>[];
@@ -72,10 +83,16 @@ class BackgroundSyncManager {
       return _syncTask!.future;
     }
 
+    onRemoteSyncStart?.call();
+
     _syncTask = runInIsolateGentle(
       computation: (ref) => ref.read(syncStreamServiceProvider).sync(),
     );
     return _syncTask!.whenComplete(() {
+      onRemoteSyncComplete?.call();
+      _syncTask = null;
+    }).catchError((error) {
+      onRemoteSyncError?.call(error.toString());
       _syncTask = null;
     });
   }
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index 24efff143f..671c1a6156 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -35,42 +35,15 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
   Widget build(BuildContext context) {
     final isScreenLandscape = context.orientation == Orientation.landscape;
 
-    Widget buildIcon({required Widget icon, required bool isProcessing}) {
-      if (!isProcessing) return icon;
-      return Stack(
-        alignment: Alignment.center,
-        clipBehavior: Clip.none,
-        children: [
-          icon,
-          Positioned(
-            right: -18,
-            child: SizedBox(
-              height: 20,
-              width: 20,
-              child: CircularProgressIndicator(
-                strokeWidth: 2,
-                valueColor: AlwaysStoppedAnimation<Color>(
-                  context.primaryColor,
-                ),
-              ),
-            ),
-          ),
-        ],
-      );
-    }
-
     final navigationDestinations = [
       NavigationDestination(
         label: 'photos'.tr(),
         icon: const Icon(
           Icons.photo_library_outlined,
         ),
-        selectedIcon: buildIcon(
-          isProcessing: false,
-          icon: Icon(
-            Icons.photo_library,
-            color: context.primaryColor,
-          ),
+        selectedIcon: Icon(
+          Icons.photo_library,
+          color: context.primaryColor,
         ),
       ),
       NavigationDestination(
@@ -88,12 +61,9 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
         icon: const Icon(
           Icons.photo_album_outlined,
         ),
-        selectedIcon: buildIcon(
-          isProcessing: false,
-          icon: Icon(
-            Icons.photo_album_rounded,
-            color: context.primaryColor,
-          ),
+        selectedIcon: Icon(
+          Icons.photo_album_rounded,
+          color: context.primaryColor,
         ),
       ),
       NavigationDestination(
@@ -101,12 +71,9 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
         icon: const Icon(
           Icons.space_dashboard_outlined,
         ),
-        selectedIcon: buildIcon(
-          isProcessing: false,
-          icon: Icon(
-            Icons.space_dashboard_rounded,
-            color: context.primaryColor,
-          ),
+        selectedIcon: Icon(
+          Icons.space_dashboard_rounded,
+          color: context.primaryColor,
         ),
       ),
     ];
@@ -183,7 +150,7 @@ void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
 
   // Album page
   if (index == 2) {
-    ref.read(remoteAlbumProvider.notifier).getAll();
+    ref.read(remoteAlbumProvider.notifier).refresh();
   }
 
   ref.read(hapticFeedbackProvider.notifier).selectionClick();
diff --git a/mobile/lib/presentation/pages/drift_album.page.dart b/mobile/lib/presentation/pages/drift_album.page.dart
index d59f734c79..fbdf1ef116 100644
--- a/mobile/lib/presentation/pages/drift_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_album.page.dart
@@ -40,7 +40,7 @@ class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
 
     // Load albums when component mounts
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      ref.read(remoteAlbumProvider.notifier).getAll();
+      ref.read(remoteAlbumProvider.notifier).refresh();
     });
 
     searchController.addListener(() {
@@ -88,10 +88,9 @@ class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
 
   @override
   Widget build(BuildContext context) {
-    final albumState = ref.watch(remoteAlbumProvider);
-    final albums = albumState.filteredAlbums;
-    final isLoading = albumState.isLoading;
-    final error = albumState.error;
+    final albums =
+        ref.watch(remoteAlbumProvider.select((s) => s.filteredAlbums));
+
     final userId = ref.watch(currentUserProvider)?.id;
 
     return RefreshIndicator(
@@ -133,14 +132,10 @@ class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
               ? _AlbumGrid(
                   albums: albums,
                   userId: userId,
-                  isLoading: isLoading,
-                  error: error,
                 )
               : _AlbumList(
                   albums: albums,
                   userId: userId,
-                  isLoading: isLoading,
-                  error: error,
                 ),
         ],
       ),
@@ -481,46 +476,15 @@ class _QuickSortAndViewMode extends StatelessWidget {
 
 class _AlbumList extends ConsumerWidget {
   const _AlbumList({
-    required this.isLoading,
-    required this.error,
     required this.albums,
     required this.userId,
   });
 
-  final bool isLoading;
-  final String? error;
   final List<RemoteAlbum> albums;
   final String? userId;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    if (isLoading) {
-      return const SliverToBoxAdapter(
-        child: Center(
-          child: Padding(
-            padding: EdgeInsets.all(20.0),
-            child: CircularProgressIndicator(),
-          ),
-        ),
-      );
-    }
-
-    if (error != null) {
-      return SliverToBoxAdapter(
-        child: Center(
-          child: Padding(
-            padding: const EdgeInsets.all(20.0),
-            child: Text(
-              'Error loading albums: $error',
-              style: TextStyle(
-                color: context.colorScheme.error,
-              ),
-            ),
-          ),
-        ),
-      );
-    }
-
     if (albums.isEmpty) {
       return const SliverToBoxAdapter(
         child: Center(
@@ -623,44 +587,13 @@ class _AlbumGrid extends StatelessWidget {
   const _AlbumGrid({
     required this.albums,
     required this.userId,
-    required this.isLoading,
-    required this.error,
   });
 
   final List<RemoteAlbum> albums;
   final String? userId;
-  final bool isLoading;
-  final String? error;
 
   @override
   Widget build(BuildContext context) {
-    if (isLoading) {
-      return const SliverToBoxAdapter(
-        child: Center(
-          child: Padding(
-            padding: EdgeInsets.all(20.0),
-            child: CircularProgressIndicator(),
-          ),
-        ),
-      );
-    }
-
-    if (error != null) {
-      return SliverToBoxAdapter(
-        child: Center(
-          child: Padding(
-            padding: const EdgeInsets.all(20.0),
-            child: Text(
-              'Error loading albums: $error',
-              style: TextStyle(
-                color: context.colorScheme.error,
-              ),
-            ),
-          ),
-        ),
-      );
-    }
-
     if (albums.isEmpty) {
       return const SliverToBoxAdapter(
         child: Center(
diff --git a/mobile/lib/providers/background_sync.provider.dart b/mobile/lib/providers/background_sync.provider.dart
index 83d103bb3b..dc9cc0d59f 100644
--- a/mobile/lib/providers/background_sync.provider.dart
+++ b/mobile/lib/providers/background_sync.provider.dart
@@ -1,8 +1,14 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
+import 'package:immich_mobile/providers/sync_status.provider.dart';
 
 final backgroundSyncProvider = Provider<BackgroundSyncManager>((ref) {
-  final manager = BackgroundSyncManager();
+  final syncStatusNotifier = ref.read(syncStatusProvider.notifier);
+  final manager = BackgroundSyncManager(
+    onRemoteSyncStart: syncStatusNotifier.startRemoteSync,
+    onRemoteSyncComplete: syncStatusNotifier.completeRemoteSync,
+    onRemoteSyncError: syncStatusNotifier.errorRemoteSync,
+  );
   ref.onDispose(manager.cancel);
   return manager;
 });
diff --git a/mobile/lib/providers/infrastructure/remote_album.provider.dart b/mobile/lib/providers/infrastructure/remote_album.provider.dart
index 14badd58ed..2ce10d7cbd 100644
--- a/mobile/lib/providers/infrastructure/remote_album.provider.dart
+++ b/mobile/lib/providers/infrastructure/remote_album.provider.dart
@@ -6,6 +6,7 @@ import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/remote_album.service.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/utils/remote_album.utils.dart';
+import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import 'album.provider.dart';
@@ -13,33 +14,25 @@ import 'album.provider.dart';
 class RemoteAlbumState {
   final List<RemoteAlbum> albums;
   final List<RemoteAlbum> filteredAlbums;
-  final bool isLoading;
-  final String? error;
 
   const RemoteAlbumState({
     required this.albums,
     List<RemoteAlbum>? filteredAlbums,
-    this.isLoading = false,
-    this.error,
   }) : filteredAlbums = filteredAlbums ?? albums;
 
   RemoteAlbumState copyWith({
     List<RemoteAlbum>? albums,
     List<RemoteAlbum>? filteredAlbums,
-    bool? isLoading,
-    String? error,
   }) {
     return RemoteAlbumState(
       albums: albums ?? this.albums,
       filteredAlbums: filteredAlbums ?? this.filteredAlbums,
-      isLoading: isLoading ?? this.isLoading,
-      error: error ?? this.error,
     );
   }
 
   @override
   String toString() =>
-      'RemoteAlbumState(albums: ${albums.length}, filteredAlbums: ${filteredAlbums.length}, isLoading: $isLoading, error: $error)';
+      'RemoteAlbumState(albums: ${albums.length}, filteredAlbums: ${filteredAlbums.length})';
 
   @override
   bool operator ==(covariant RemoteAlbumState other) {
@@ -47,47 +40,38 @@ class RemoteAlbumState {
     final listEquals = const DeepCollectionEquality().equals;
 
     return listEquals(other.albums, albums) &&
-        listEquals(other.filteredAlbums, filteredAlbums) &&
-        other.isLoading == isLoading &&
-        other.error == error;
+        listEquals(other.filteredAlbums, filteredAlbums);
   }
 
   @override
-  int get hashCode =>
-      albums.hashCode ^
-      filteredAlbums.hashCode ^
-      isLoading.hashCode ^
-      error.hashCode;
+  int get hashCode => albums.hashCode ^ filteredAlbums.hashCode;
 }
 
 class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
   late RemoteAlbumService _remoteAlbumService;
-
+  final _logger = Logger('RemoteAlbumNotifier');
   @override
   RemoteAlbumState build() {
     _remoteAlbumService = ref.read(remoteAlbumServiceProvider);
     return const RemoteAlbumState(albums: [], filteredAlbums: []);
   }
 
-  Future<List<RemoteAlbum>> getAll() async {
-    state = state.copyWith(isLoading: true, error: null);
-
+  Future<List<RemoteAlbum>> _getAll() async {
     try {
       final albums = await _remoteAlbumService.getAll();
       state = state.copyWith(
         albums: albums,
         filteredAlbums: albums,
-        isLoading: false,
       );
       return albums;
-    } catch (e) {
-      state = state.copyWith(isLoading: false, error: e.toString());
+    } catch (error, stack) {
+      _logger.severe('Failed to fetch albums', error, stack);
       rethrow;
     }
   }
 
   Future<void> refresh() async {
-    await getAll();
+    await _getAll();
   }
 
   void searchAlbums(
@@ -127,8 +111,6 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
     String? description,
     List<String> assetIds = const [],
   }) async {
-    state = state.copyWith(isLoading: true, error: null);
-
     try {
       final album = await _remoteAlbumService.createAlbum(
         title: title,
@@ -141,10 +123,9 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
         filteredAlbums: [...state.filteredAlbums, album],
       );
 
-      state = state.copyWith(isLoading: false);
       return album;
-    } catch (e) {
-      state = state.copyWith(isLoading: false, error: e.toString());
+    } catch (error, stack) {
+      _logger.severe('Failed to create album', error, stack);
       rethrow;
     }
   }
@@ -157,8 +138,6 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
     bool? isActivityEnabled,
     AlbumAssetOrder? order,
   }) async {
-    state = state.copyWith(isLoading: true, error: null);
-
     try {
       final updatedAlbum = await _remoteAlbumService.updateAlbum(
         albumId,
@@ -180,12 +159,11 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
       state = state.copyWith(
         albums: updatedAlbums,
         filteredAlbums: updatedFilteredAlbums,
-        isLoading: false,
       );
 
       return updatedAlbum;
-    } catch (e) {
-      state = state.copyWith(isLoading: false, error: e.toString());
+    } catch (error, stack) {
+      _logger.severe('Failed to update album', error, stack);
       rethrow;
     }
   }
diff --git a/mobile/lib/providers/sync_status.provider.dart b/mobile/lib/providers/sync_status.provider.dart
new file mode 100644
index 0000000000..18d851aa19
--- /dev/null
+++ b/mobile/lib/providers/sync_status.provider.dart
@@ -0,0 +1,68 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+enum SyncStatus {
+  idle,
+  syncing,
+  success,
+  error,
+}
+
+class SyncStatusState {
+  final SyncStatus remoteSyncStatus;
+  final String? errorMessage;
+
+  const SyncStatusState({
+    this.remoteSyncStatus = SyncStatus.idle,
+    this.errorMessage,
+  });
+
+  SyncStatusState copyWith({
+    SyncStatus? remoteSyncStatus,
+    String? errorMessage,
+  }) {
+    return SyncStatusState(
+      remoteSyncStatus: remoteSyncStatus ?? this.remoteSyncStatus,
+      errorMessage: errorMessage ?? this.errorMessage,
+    );
+  }
+
+  bool get isRemoteSyncing => remoteSyncStatus == SyncStatus.syncing;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    return other is SyncStatusState &&
+        other.remoteSyncStatus == remoteSyncStatus &&
+        other.errorMessage == errorMessage;
+  }
+
+  @override
+  int get hashCode => Object.hash(remoteSyncStatus, errorMessage);
+}
+
+class SyncStatusNotifier extends Notifier<SyncStatusState> {
+  @override
+  SyncStatusState build() {
+    return const SyncStatusState(
+      errorMessage: null,
+      remoteSyncStatus: SyncStatus.idle,
+    );
+  }
+
+  void setRemoteSyncStatus(SyncStatus status, [String? errorMessage]) {
+    state = state.copyWith(
+      remoteSyncStatus: status,
+      errorMessage: status == SyncStatus.error ? errorMessage : null,
+    );
+  }
+
+  void startRemoteSync() => setRemoteSyncStatus(SyncStatus.syncing);
+  void completeRemoteSync() => setRemoteSyncStatus(SyncStatus.success);
+  void errorRemoteSync(String error) =>
+      setRemoteSyncStatus(SyncStatus.error, error);
+}
+
+final syncStatusProvider =
+    NotifierProvider<SyncStatusNotifier, SyncStatusState>(
+  SyncStatusNotifier.new,
+);
diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
index 5ab60c913c..b58a1ad6f9 100644
--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -9,6 +9,7 @@ import 'package:immich_mobile/models/server_info/server_info.model.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/providers/sync_status.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -59,13 +60,6 @@ class ImmichSliverAppBar extends ConsumerWidget {
         centerTitle: false,
         title: title ?? const _ImmichLogoWithText(),
         actions: [
-          if (actions != null)
-            ...actions!.map(
-              (action) => Padding(
-                padding: const EdgeInsets.only(right: 16),
-                child: action,
-              ),
-            ),
           if (isCasting)
             Padding(
               padding: const EdgeInsets.only(right: 12),
@@ -81,6 +75,14 @@ class ImmichSliverAppBar extends ConsumerWidget {
                 ),
               ),
             ),
+          const _SyncStatusIndicator(),
+          if (actions != null)
+            ...actions!.map(
+              (action) => Padding(
+                padding: const EdgeInsets.only(right: 16),
+                child: action,
+              ),
+            ),
           if (showUploadButton)
             const Padding(
               padding: EdgeInsets.only(right: 20),
@@ -273,3 +275,100 @@ class _BackupIndicator extends ConsumerWidget {
     return null;
   }
 }
+
+class _SyncStatusIndicator extends ConsumerStatefulWidget {
+  const _SyncStatusIndicator();
+
+  @override
+  ConsumerState<_SyncStatusIndicator> createState() =>
+      _SyncStatusIndicatorState();
+}
+
+class _SyncStatusIndicatorState extends ConsumerState<_SyncStatusIndicator>
+    with TickerProviderStateMixin {
+  late AnimationController _rotationController;
+  late AnimationController _dismissalController;
+  late Animation<double> _rotationAnimation;
+  late Animation<double> _dismissalAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+    _rotationController = AnimationController(
+      duration: const Duration(seconds: 2),
+      vsync: this,
+    );
+    _dismissalController = AnimationController(
+      duration: const Duration(milliseconds: 300),
+      vsync: this,
+    );
+    _rotationAnimation = Tween<double>(
+      begin: 0.0,
+      end: 1.0,
+    ).animate(_rotationController);
+    _dismissalAnimation = Tween<double>(
+      begin: 1.0,
+      end: 0.0,
+    ).animate(
+      CurvedAnimation(
+        parent: _dismissalController,
+        curve: Curves.easeOutQuart,
+      ),
+    );
+  }
+
+  @override
+  void dispose() {
+    _rotationController.dispose();
+    _dismissalController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final syncStatus = ref.watch(syncStatusProvider);
+    final isSyncing = syncStatus.isRemoteSyncing;
+
+    // Control animations based on sync status
+    if (isSyncing) {
+      if (!_rotationController.isAnimating) {
+        _rotationController.repeat();
+      }
+      _dismissalController.reset();
+    } else {
+      _rotationController.stop();
+      if (_dismissalController.status == AnimationStatus.dismissed) {
+        _dismissalController.forward();
+      }
+    }
+
+    // Don't show anything if not syncing and dismissal animation is complete
+    if (!isSyncing &&
+        _dismissalController.status == AnimationStatus.completed) {
+      return const SizedBox.shrink();
+    }
+
+    return AnimatedBuilder(
+      animation: Listenable.merge([_rotationAnimation, _dismissalAnimation]),
+      builder: (context, child) {
+        return Padding(
+          padding: EdgeInsets.only(right: isSyncing ? 16 : 0),
+          child: Transform.scale(
+            scale: isSyncing ? 1.0 : _dismissalAnimation.value,
+            child: Opacity(
+              opacity: isSyncing ? 1.0 : _dismissalAnimation.value,
+              child: Transform.rotate(
+                angle: _rotationAnimation.value * 2 * 3.14159,
+                child: Icon(
+                  Icons.sync,
+                  size: 24,
+                  color: context.primaryColor,
+                ),
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}

From 7bae49ebd51e0c4d465f1f9c9d00af02481da205 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Fri, 18 Jul 2025 22:21:39 +0800
Subject: [PATCH 238/337] feat(mobile): people sync (#19777)

* feat(mobile): drift people sync

* merge main

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../drift_schemas/main/drift_schema_v1.json   |   2 +-
 .../drift_schemas/main/drift_schema_v2.json   |   2 +-
 mobile/lib/domain/models/memory.model.dart    |  16 +-
 mobile/lib/domain/models/person.model.dart    | 125 ++-
 mobile/lib/domain/models/stack.model.dart     |  35 +-
 .../domain/services/sync_stream.service.dart  |   4 +
 .../entities/person.entity.dart               |  34 +
 .../entities/person.entity.drift.dart         | 933 ++++++++++++++++++
 .../repositories/db.repository.dart           |   2 +
 .../repositories/db.repository.drift.dart     |  23 +-
 .../repositories/db.repository.steps.dart     |  74 ++
 .../repositories/person.repository.dart       |  36 +
 .../repositories/sync_api.repository.dart     |   3 +
 .../repositories/sync_stream.repository.dart  |  43 +
 .../models/search/search_filter.model.dart    |   4 +-
 mobile/lib/pages/search/search.page.dart      |   2 +-
 .../pages/dev/feat_in_development.page.dart   |   1 +
 .../pages/dev/media_stat.page.dart            |   4 +
 .../pages/search/drift_search.page.dart       |   2 +-
 .../infrastructure/person.provider.dart       |   7 +
 .../{ => infrastructure}/stack.provider.dart  |   0
 .../lib/providers/search/people.provider.dart |   2 +-
 .../providers/search/people.provider.g.dart   |   7 +-
 mobile/lib/repositories/auth.repository.dart  |   1 +
 .../repositories/person_api.repository.dart   |   6 +-
 mobile/lib/services/person.service.dart       |   4 +-
 .../search/search_filter/people_picker.dart   |   6 +-
 .../services/sync_stream_service_test.dart    |   4 +
 .../test/drift/main/generated/schema_v1.dart  | 439 +++++++-
 .../test/drift/main/generated/schema_v2.dart  | 439 +++++++-
 30 files changed, 2197 insertions(+), 63 deletions(-)
 create mode 100644 mobile/lib/infrastructure/entities/person.entity.dart
 create mode 100644 mobile/lib/infrastructure/entities/person.entity.drift.dart
 create mode 100644 mobile/lib/infrastructure/repositories/person.repository.dart
 create mode 100644 mobile/lib/providers/infrastructure/person.provider.dart
 rename mobile/lib/providers/{ => infrastructure}/stack.provider.dart (100%)

diff --git a/mobile/drift_schemas/main/drift_schema_v1.json b/mobile/drift_schemas/main/drift_schema_v1.json
index c19bcfb945..978a9ba8ad 100644
--- a/mobile/drift_schemas/main/drift_schema_v1.json
+++ b/mobile/drift_schemas/main/drift_schema_v1.json
@@ -1 +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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":4,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":6,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":7,"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":8,"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":9,"references":[],"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":"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":10,"references":[2,9],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":11,"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":12,"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":13,"references":[1,12],"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":14,"references":[12,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":15,"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":16,"references":[1,15],"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"]}}]}
\ No newline at end of file
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":4,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":6,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":7,"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":8,"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":9,"references":[],"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":"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":10,"references":[2,9],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":11,"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":12,"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":13,"references":[1,12],"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":14,"references":[12,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":15,"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":16,"references":[1,15],"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":17,"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":"thumbnail_path","getter_name":"thumbnailPath","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":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"]}}]}
\ No newline at end of file
diff --git a/mobile/drift_schemas/main/drift_schema_v2.json b/mobile/drift_schemas/main/drift_schema_v2.json
index c19bcfb945..978a9ba8ad 100644
--- a/mobile/drift_schemas/main/drift_schema_v2.json
+++ b/mobile/drift_schemas/main/drift_schema_v2.json
@@ -1 +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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":4,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":6,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":7,"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":8,"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":9,"references":[],"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":"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":10,"references":[2,9],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":11,"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":12,"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":13,"references":[1,12],"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":14,"references":[12,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":15,"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":16,"references":[1,15],"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"]}}]}
\ No newline at end of file
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"references":[0,1],"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,"defaultConstraints":"REFERENCES remote_asset_entity (id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id)"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":4,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":6,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":7,"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":8,"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":9,"references":[],"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":"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":10,"references":[2,9],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":11,"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":12,"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":13,"references":[1,12],"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":14,"references":[12,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":15,"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":16,"references":[1,15],"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":17,"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":"thumbnail_path","getter_name":"thumbnailPath","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":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"]}}]}
\ No newline at end of file
diff --git a/mobile/lib/domain/models/memory.model.dart b/mobile/lib/domain/models/memory.model.dart
index ba2a43428f..38d1c7ef7d 100644
--- a/mobile/lib/domain/models/memory.model.dart
+++ b/mobile/lib/domain/models/memory.model.dart
@@ -124,7 +124,21 @@ class DriftMemory {
 
   @override
   String toString() {
-    return 'Memory(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, ownerId: $ownerId, type: $type, data: $data, isSaved: $isSaved, memoryAt: $memoryAt, seenAt: $seenAt, showAt: $showAt, hideAt: $hideAt, assets: $assets)';
+    return '''Memory {
+    id: $id,
+    createdAt: $createdAt,
+    updatedAt: $updatedAt,
+    deletedAt: ${deletedAt ?? "<NA>"},
+    ownerId: $ownerId,
+    type: $type,
+    data: $data,
+    isSaved: $isSaved,
+    memoryAt: $memoryAt,
+    seenAt: ${seenAt ?? "<NA>"},
+    showAt: ${showAt ?? "<NA>"},
+    hideAt: ${hideAt ?? "<NA>"},
+    assets: $assets
+}''';
   }
 
   @override
diff --git a/mobile/lib/domain/models/person.model.dart b/mobile/lib/domain/models/person.model.dart
index 10453f768d..d9eee9ae06 100644
--- a/mobile/lib/domain/models/person.model.dart
+++ b/mobile/lib/domain/models/person.model.dart
@@ -1,7 +1,8 @@
 import 'dart:convert';
 
-class Person {
-  const Person({
+// TODO: Remove PersonDto once Isar is removed
+class PersonDto {
+  const PersonDto({
     required this.id,
     this.birthDate,
     required this.isHidden,
@@ -22,7 +23,7 @@ class Person {
     return 'Person(id: $id, birthDate: $birthDate, isHidden: $isHidden, name: $name, thumbnailPath: $thumbnailPath, updatedAt: $updatedAt)';
   }
 
-  Person copyWith({
+  PersonDto copyWith({
     String? id,
     DateTime? birthDate,
     bool? isHidden,
@@ -30,7 +31,7 @@ class Person {
     String? thumbnailPath,
     DateTime? updatedAt,
   }) {
-    return Person(
+    return PersonDto(
       id: id ?? this.id,
       birthDate: birthDate ?? this.birthDate,
       isHidden: isHidden ?? this.isHidden,
@@ -51,8 +52,8 @@ class Person {
     };
   }
 
-  factory Person.fromMap(Map<String, dynamic> map) {
-    return Person(
+  factory PersonDto.fromMap(Map<String, dynamic> map) {
+    return PersonDto(
       id: map['id'] as String,
       birthDate: map['birthDate'] != null
           ? DateTime.fromMillisecondsSinceEpoch(map['birthDate'] as int)
@@ -68,11 +69,11 @@ class Person {
 
   String toJson() => json.encode(toMap());
 
-  factory Person.fromJson(String source) =>
-      Person.fromMap(json.decode(source) as Map<String, dynamic>);
+  factory PersonDto.fromJson(String source) =>
+      PersonDto.fromMap(json.decode(source) as Map<String, dynamic>);
 
   @override
-  bool operator ==(covariant Person other) {
+  bool operator ==(covariant PersonDto other) {
     if (identical(this, other)) return true;
 
     return other.id == id &&
@@ -93,3 +94,109 @@ class Person {
         updatedAt.hashCode;
   }
 }
+
+// Model for a person stored in the server
+class Person {
+  final String id;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final String ownerId;
+  final String name;
+  final String? faceAssetId;
+  final String thumbnailPath;
+  final bool isFavorite;
+  final bool isHidden;
+  final String? color;
+  final DateTime? birthDate;
+
+  const Person({
+    required this.id,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.ownerId,
+    required this.name,
+    this.faceAssetId,
+    required this.thumbnailPath,
+    required this.isFavorite,
+    required this.isHidden,
+    required this.color,
+    this.birthDate,
+  });
+
+  Person copyWith({
+    String? id,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    String? ownerId,
+    String? name,
+    String? faceAssetId,
+    String? thumbnailPath,
+    bool? isFavorite,
+    bool? isHidden,
+    String? color,
+    DateTime? birthDate,
+  }) {
+    return Person(
+      id: id ?? this.id,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      ownerId: ownerId ?? this.ownerId,
+      name: name ?? this.name,
+      faceAssetId: faceAssetId ?? this.faceAssetId,
+      thumbnailPath: thumbnailPath ?? this.thumbnailPath,
+      isFavorite: isFavorite ?? this.isFavorite,
+      isHidden: isHidden ?? this.isHidden,
+      color: color ?? this.color,
+      birthDate: birthDate ?? this.birthDate,
+    );
+  }
+
+  @override
+  String toString() {
+    return '''Person {
+    id: $id,
+    createdAt: $createdAt,
+    updatedAt: $updatedAt,
+    ownerId: $ownerId,
+    name: $name,
+    faceAssetId: ${faceAssetId ?? "<NA>"},
+    thumbnailPath: $thumbnailPath,
+    isFavorite: $isFavorite,
+    isHidden: $isHidden,
+    color: ${color ?? "<NA>"},
+    birthDate: ${birthDate ?? "<NA>"}
+}''';
+  }
+
+  @override
+  bool operator ==(covariant Person other) {
+    if (identical(this, other)) return true;
+
+    return other.id == id &&
+        other.createdAt == createdAt &&
+        other.updatedAt == updatedAt &&
+        other.ownerId == ownerId &&
+        other.name == name &&
+        other.faceAssetId == faceAssetId &&
+        other.thumbnailPath == thumbnailPath &&
+        other.isFavorite == isFavorite &&
+        other.isHidden == isHidden &&
+        other.color == color &&
+        other.birthDate == birthDate;
+  }
+
+  @override
+  int get hashCode {
+    return id.hashCode ^
+        createdAt.hashCode ^
+        updatedAt.hashCode ^
+        ownerId.hashCode ^
+        name.hashCode ^
+        faceAssetId.hashCode ^
+        thumbnailPath.hashCode ^
+        isFavorite.hashCode ^
+        isHidden.hashCode ^
+        color.hashCode ^
+        birthDate.hashCode;
+  }
+}
diff --git a/mobile/lib/domain/models/stack.model.dart b/mobile/lib/domain/models/stack.model.dart
index d7faf07a22..6a449a1eb8 100644
--- a/mobile/lib/domain/models/stack.model.dart
+++ b/mobile/lib/domain/models/stack.model.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 // Model for a stack stored in the server
 class Stack {
   final String id;
@@ -32,34 +30,15 @@ class Stack {
     );
   }
 
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'id': id,
-      'createdAt': createdAt.millisecondsSinceEpoch,
-      'updatedAt': updatedAt.millisecondsSinceEpoch,
-      'ownerId': ownerId,
-      'primaryAssetId': primaryAssetId,
-    };
-  }
-
-  factory Stack.fromMap(Map<String, dynamic> map) {
-    return Stack(
-      id: map['id'] as String,
-      createdAt: DateTime.fromMillisecondsSinceEpoch(map['createdAt'] as int),
-      updatedAt: DateTime.fromMillisecondsSinceEpoch(map['updatedAt'] as int),
-      ownerId: map['ownerId'] as String,
-      primaryAssetId: map['primaryAssetId'] as String,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory Stack.fromJson(String source) =>
-      Stack.fromMap(json.decode(source) as Map<String, dynamic>);
-
   @override
   String toString() {
-    return 'Stack(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, ownerId: $ownerId, primaryAssetId: $primaryAssetId)';
+    return '''Stack {
+    id: $id,
+    createdAt: $createdAt,
+    updatedAt: $updatedAt,
+    ownerId: $ownerId,
+    primaryAssetId: $primaryAssetId
+}''';
   }
 
   @override
diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index 6183865041..9a7d91ced9 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -240,6 +240,10 @@ class SyncStreamService {
         return _syncStreamRepository.deleteUserMetadatasV1(
           data.cast(),
         );
+      case SyncEntityType.personV1:
+        return _syncStreamRepository.updatePeopleV1(data.cast());
+      case SyncEntityType.personDeleteV1:
+        return _syncStreamRepository.deletePeopleV1(data.cast());
       default:
         _logger.warning("Unknown sync data type: $type");
     }
diff --git a/mobile/lib/infrastructure/entities/person.entity.dart b/mobile/lib/infrastructure/entities/person.entity.dart
new file mode 100644
index 0000000000..68dd04cb5f
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/person.entity.dart
@@ -0,0 +1,34 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class PersonEntity extends Table with DriftDefaultsMixin {
+  const PersonEntity();
+
+  TextColumn get id => text()();
+
+  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+
+  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+
+  TextColumn get ownerId =>
+      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get name => text()();
+
+  // TODO: foreign key refering to asset faces
+  TextColumn get faceAssetId => text().nullable()();
+
+  TextColumn get thumbnailPath => text()();
+
+  BoolColumn get isFavorite => boolean()();
+
+  BoolColumn get isHidden => boolean()();
+
+  TextColumn get color => text().nullable()();
+
+  DateTimeColumn get birthDate => dateTime().nullable()();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}
diff --git a/mobile/lib/infrastructure/entities/person.entity.drift.dart b/mobile/lib/infrastructure/entities/person.entity.drift.dart
new file mode 100644
index 0000000000..f0ced63f0e
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/person.entity.drift.dart
@@ -0,0 +1,933 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/person.entity.dart' as i2;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
+import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
+    as i4;
+import 'package:drift/internal/modular.dart' as i5;
+
+typedef $$PersonEntityTableCreateCompanionBuilder = i1.PersonEntityCompanion
+    Function({
+  required String id,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  required String ownerId,
+  required String name,
+  i0.Value<String?> faceAssetId,
+  required String thumbnailPath,
+  required bool isFavorite,
+  required bool isHidden,
+  i0.Value<String?> color,
+  i0.Value<DateTime?> birthDate,
+});
+typedef $$PersonEntityTableUpdateCompanionBuilder = i1.PersonEntityCompanion
+    Function({
+  i0.Value<String> id,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  i0.Value<String> ownerId,
+  i0.Value<String> name,
+  i0.Value<String?> faceAssetId,
+  i0.Value<String> thumbnailPath,
+  i0.Value<bool> isFavorite,
+  i0.Value<bool> isHidden,
+  i0.Value<String?> color,
+  i0.Value<DateTime?> birthDate,
+});
+
+final class $$PersonEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase, i1.$PersonEntityTable, i1.PersonEntityData> {
+  $$PersonEntityTableReferences(super.$_db, super.$_table, super.$_typedResult);
+
+  static i4.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
+      i5.ReadDatabaseContainer(db)
+          .resultSet<i4.$UserEntityTable>('user_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$PersonEntityTable>('person_entity')
+                  .ownerId,
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i4.$UserEntityTable>('user_entity')
+                  .id));
+
+  i4.$$UserEntityTableProcessedTableManager get ownerId {
+    final $_column = $_itemColumn<String>('owner_id')!;
+
+    final manager = i4
+        .$$UserEntityTableTableManager(
+            $_db,
+            i5.ReadDatabaseContainer($_db)
+                .resultSet<i4.$UserEntityTable>('user_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_ownerIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$PersonEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$PersonEntityTable> {
+  $$PersonEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnFilters(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<String> get name => $composableBuilder(
+      column: $table.name, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get faceAssetId => $composableBuilder(
+      column: $table.faceAssetId,
+      builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get thumbnailPath => $composableBuilder(
+      column: $table.thumbnailPath,
+      builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<bool> get isFavorite => $composableBuilder(
+      column: $table.isFavorite, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<bool> get isHidden => $composableBuilder(
+      column: $table.isHidden, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get color => $composableBuilder(
+      column: $table.color, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get birthDate => $composableBuilder(
+      column: $table.birthDate, builder: (column) => i0.ColumnFilters(column));
+
+  i4.$$UserEntityTableFilterComposer get ownerId {
+    final i4.$$UserEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i4.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i4.$$UserEntityTableFilterComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i4.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$PersonEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$PersonEntityTable> {
+  $$PersonEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get id => $composableBuilder(
+      column: $table.id, 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<String> get name => $composableBuilder(
+      column: $table.name, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get faceAssetId => $composableBuilder(
+      column: $table.faceAssetId,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get thumbnailPath => $composableBuilder(
+      column: $table.thumbnailPath,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<bool> get isFavorite => $composableBuilder(
+      column: $table.isFavorite,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<bool> get isHidden => $composableBuilder(
+      column: $table.isHidden, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get color => $composableBuilder(
+      column: $table.color, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get birthDate => $composableBuilder(
+      column: $table.birthDate,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i4.$$UserEntityTableOrderingComposer get ownerId {
+    final i4.$$UserEntityTableOrderingComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i4.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i4.$$UserEntityTableOrderingComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i4.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$PersonEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$PersonEntityTable> {
+  $$PersonEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get id =>
+      $composableBuilder(column: $table.id, 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<String> get name =>
+      $composableBuilder(column: $table.name, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get faceAssetId => $composableBuilder(
+      column: $table.faceAssetId, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get thumbnailPath => $composableBuilder(
+      column: $table.thumbnailPath, builder: (column) => column);
+
+  i0.GeneratedColumn<bool> get isFavorite => $composableBuilder(
+      column: $table.isFavorite, builder: (column) => column);
+
+  i0.GeneratedColumn<bool> get isHidden =>
+      $composableBuilder(column: $table.isHidden, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get color =>
+      $composableBuilder(column: $table.color, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get birthDate =>
+      $composableBuilder(column: $table.birthDate, builder: (column) => column);
+
+  i4.$$UserEntityTableAnnotationComposer get ownerId {
+    final i4.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i4.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i4.$$UserEntityTableAnnotationComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i4.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$PersonEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$PersonEntityTable,
+    i1.PersonEntityData,
+    i1.$$PersonEntityTableFilterComposer,
+    i1.$$PersonEntityTableOrderingComposer,
+    i1.$$PersonEntityTableAnnotationComposer,
+    $$PersonEntityTableCreateCompanionBuilder,
+    $$PersonEntityTableUpdateCompanionBuilder,
+    (i1.PersonEntityData, i1.$$PersonEntityTableReferences),
+    i1.PersonEntityData,
+    i0.PrefetchHooks Function({bool ownerId})> {
+  $$PersonEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$PersonEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$PersonEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$PersonEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$PersonEntityTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> id = const i0.Value.absent(),
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<String> ownerId = const i0.Value.absent(),
+            i0.Value<String> name = const i0.Value.absent(),
+            i0.Value<String?> faceAssetId = const i0.Value.absent(),
+            i0.Value<String> thumbnailPath = const i0.Value.absent(),
+            i0.Value<bool> isFavorite = const i0.Value.absent(),
+            i0.Value<bool> isHidden = const i0.Value.absent(),
+            i0.Value<String?> color = const i0.Value.absent(),
+            i0.Value<DateTime?> birthDate = const i0.Value.absent(),
+          }) =>
+              i1.PersonEntityCompanion(
+            id: id,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            ownerId: ownerId,
+            name: name,
+            faceAssetId: faceAssetId,
+            thumbnailPath: thumbnailPath,
+            isFavorite: isFavorite,
+            isHidden: isHidden,
+            color: color,
+            birthDate: birthDate,
+          ),
+          createCompanionCallback: ({
+            required String id,
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            required String ownerId,
+            required String name,
+            i0.Value<String?> faceAssetId = const i0.Value.absent(),
+            required String thumbnailPath,
+            required bool isFavorite,
+            required bool isHidden,
+            i0.Value<String?> color = const i0.Value.absent(),
+            i0.Value<DateTime?> birthDate = const i0.Value.absent(),
+          }) =>
+              i1.PersonEntityCompanion.insert(
+            id: id,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            ownerId: ownerId,
+            name: name,
+            faceAssetId: faceAssetId,
+            thumbnailPath: thumbnailPath,
+            isFavorite: isFavorite,
+            isHidden: isHidden,
+            color: color,
+            birthDate: birthDate,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$PersonEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({ownerId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (ownerId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.ownerId,
+                    referencedTable:
+                        i1.$$PersonEntityTableReferences._ownerIdTable(db),
+                    referencedColumn:
+                        i1.$$PersonEntityTableReferences._ownerIdTable(db).id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$PersonEntityTableProcessedTableManager = i0.ProcessedTableManager<
+    i0.GeneratedDatabase,
+    i1.$PersonEntityTable,
+    i1.PersonEntityData,
+    i1.$$PersonEntityTableFilterComposer,
+    i1.$$PersonEntityTableOrderingComposer,
+    i1.$$PersonEntityTableAnnotationComposer,
+    $$PersonEntityTableCreateCompanionBuilder,
+    $$PersonEntityTableUpdateCompanionBuilder,
+    (i1.PersonEntityData, i1.$$PersonEntityTableReferences),
+    i1.PersonEntityData,
+    i0.PrefetchHooks Function({bool ownerId})>;
+
+class $PersonEntityTable extends i2.PersonEntity
+    with i0.TableInfo<$PersonEntityTable, i1.PersonEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $PersonEntityTable(this.attachedDatabase, [this._alias]);
+  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 _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: i3.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: i3.currentDateAndTime);
+  static const i0.VerificationMeta _ownerIdMeta =
+      const i0.VerificationMeta('ownerId');
+  @override
+  late final i0.GeneratedColumn<String> ownerId = i0.GeneratedColumn<String>(
+      'owner_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES user_entity (id) ON DELETE CASCADE'));
+  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);
+  static const i0.VerificationMeta _faceAssetIdMeta =
+      const i0.VerificationMeta('faceAssetId');
+  @override
+  late final i0.GeneratedColumn<String> faceAssetId =
+      i0.GeneratedColumn<String>('face_asset_id', aliasedName, true,
+          type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  static const i0.VerificationMeta _thumbnailPathMeta =
+      const i0.VerificationMeta('thumbnailPath');
+  @override
+  late final i0.GeneratedColumn<String> thumbnailPath =
+      i0.GeneratedColumn<String>('thumbnail_path', aliasedName, false,
+          type: i0.DriftSqlType.string, requiredDuringInsert: true);
+  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: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'CHECK ("is_favorite" IN (0, 1))'));
+  static const i0.VerificationMeta _isHiddenMeta =
+      const i0.VerificationMeta('isHidden');
+  @override
+  late final i0.GeneratedColumn<bool> isHidden = i0.GeneratedColumn<bool>(
+      'is_hidden', aliasedName, false,
+      type: i0.DriftSqlType.bool,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'CHECK ("is_hidden" IN (0, 1))'));
+  static const i0.VerificationMeta _colorMeta =
+      const i0.VerificationMeta('color');
+  @override
+  late final i0.GeneratedColumn<String> color = i0.GeneratedColumn<String>(
+      'color', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  static const i0.VerificationMeta _birthDateMeta =
+      const i0.VerificationMeta('birthDate');
+  @override
+  late final i0.GeneratedColumn<DateTime> birthDate =
+      i0.GeneratedColumn<DateTime>('birth_date', aliasedName, true,
+          type: i0.DriftSqlType.dateTime, requiredDuringInsert: false);
+  @override
+  List<i0.GeneratedColumn> get $columns => [
+        id,
+        createdAt,
+        updatedAt,
+        ownerId,
+        name,
+        faceAssetId,
+        thumbnailPath,
+        isFavorite,
+        isHidden,
+        color,
+        birthDate
+      ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'person_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.PersonEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    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('owner_id')) {
+      context.handle(_ownerIdMeta,
+          ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta));
+    } else if (isInserting) {
+      context.missing(_ownerIdMeta);
+    }
+    if (data.containsKey('name')) {
+      context.handle(
+          _nameMeta, name.isAcceptableOrUnknown(data['name']!, _nameMeta));
+    } else if (isInserting) {
+      context.missing(_nameMeta);
+    }
+    if (data.containsKey('face_asset_id')) {
+      context.handle(
+          _faceAssetIdMeta,
+          faceAssetId.isAcceptableOrUnknown(
+              data['face_asset_id']!, _faceAssetIdMeta));
+    }
+    if (data.containsKey('thumbnail_path')) {
+      context.handle(
+          _thumbnailPathMeta,
+          thumbnailPath.isAcceptableOrUnknown(
+              data['thumbnail_path']!, _thumbnailPathMeta));
+    } else if (isInserting) {
+      context.missing(_thumbnailPathMeta);
+    }
+    if (data.containsKey('is_favorite')) {
+      context.handle(
+          _isFavoriteMeta,
+          isFavorite.isAcceptableOrUnknown(
+              data['is_favorite']!, _isFavoriteMeta));
+    } else if (isInserting) {
+      context.missing(_isFavoriteMeta);
+    }
+    if (data.containsKey('is_hidden')) {
+      context.handle(_isHiddenMeta,
+          isHidden.isAcceptableOrUnknown(data['is_hidden']!, _isHiddenMeta));
+    } else if (isInserting) {
+      context.missing(_isHiddenMeta);
+    }
+    if (data.containsKey('color')) {
+      context.handle(
+          _colorMeta, color.isAcceptableOrUnknown(data['color']!, _colorMeta));
+    }
+    if (data.containsKey('birth_date')) {
+      context.handle(_birthDateMeta,
+          birthDate.isAcceptableOrUnknown(data['birth_date']!, _birthDateMeta));
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.PersonEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.PersonEntityData(
+      id: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}id'])!,
+      createdAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
+      updatedAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      ownerId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}owner_id'])!,
+      name: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}name'])!,
+      faceAssetId: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.string, data['${effectivePrefix}face_asset_id']),
+      thumbnailPath: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!,
+      isFavorite: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.bool, data['${effectivePrefix}is_favorite'])!,
+      isHidden: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.bool, data['${effectivePrefix}is_hidden'])!,
+      color: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}color']),
+      birthDate: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.dateTime, data['${effectivePrefix}birth_date']),
+    );
+  }
+
+  @override
+  $PersonEntityTable createAlias(String alias) {
+    return $PersonEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class PersonEntityData extends i0.DataClass
+    implements i0.Insertable<i1.PersonEntityData> {
+  final String id;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final String ownerId;
+  final String name;
+  final String? faceAssetId;
+  final String thumbnailPath;
+  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.thumbnailPath,
+      required this.isFavorite,
+      required this.isHidden,
+      this.color,
+      this.birthDate});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<String>(id);
+    map['created_at'] = i0.Variable<DateTime>(createdAt);
+    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    map['owner_id'] = i0.Variable<String>(ownerId);
+    map['name'] = i0.Variable<String>(name);
+    if (!nullToAbsent || faceAssetId != null) {
+      map['face_asset_id'] = i0.Variable<String>(faceAssetId);
+    }
+    map['thumbnail_path'] = i0.Variable<String>(thumbnailPath);
+    map['is_favorite'] = i0.Variable<bool>(isFavorite);
+    map['is_hidden'] = i0.Variable<bool>(isHidden);
+    if (!nullToAbsent || color != null) {
+      map['color'] = i0.Variable<String>(color);
+    }
+    if (!nullToAbsent || birthDate != null) {
+      map['birth_date'] = i0.Variable<DateTime>(birthDate);
+    }
+    return map;
+  }
+
+  factory PersonEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.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']),
+      thumbnailPath: serializer.fromJson<String>(json['thumbnailPath']),
+      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({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.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),
+      'thumbnailPath': serializer.toJson<String>(thumbnailPath),
+      'isFavorite': serializer.toJson<bool>(isFavorite),
+      'isHidden': serializer.toJson<bool>(isHidden),
+      'color': serializer.toJson<String?>(color),
+      'birthDate': serializer.toJson<DateTime?>(birthDate),
+    };
+  }
+
+  i1.PersonEntityData copyWith(
+          {String? id,
+          DateTime? createdAt,
+          DateTime? updatedAt,
+          String? ownerId,
+          String? name,
+          i0.Value<String?> faceAssetId = const i0.Value.absent(),
+          String? thumbnailPath,
+          bool? isFavorite,
+          bool? isHidden,
+          i0.Value<String?> color = const i0.Value.absent(),
+          i0.Value<DateTime?> birthDate = const i0.Value.absent()}) =>
+      i1.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,
+        thumbnailPath: thumbnailPath ?? this.thumbnailPath,
+        isFavorite: isFavorite ?? this.isFavorite,
+        isHidden: isHidden ?? this.isHidden,
+        color: color.present ? color.value : this.color,
+        birthDate: birthDate.present ? birthDate.value : this.birthDate,
+      );
+  PersonEntityData copyWithCompanion(i1.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,
+      thumbnailPath: data.thumbnailPath.present
+          ? data.thumbnailPath.value
+          : this.thumbnailPath,
+      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('thumbnailPath: $thumbnailPath, ')
+          ..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, thumbnailPath, isFavorite, isHidden, color, birthDate);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.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.thumbnailPath == this.thumbnailPath &&
+          other.isFavorite == this.isFavorite &&
+          other.isHidden == this.isHidden &&
+          other.color == this.color &&
+          other.birthDate == this.birthDate);
+}
+
+class PersonEntityCompanion extends i0.UpdateCompanion<i1.PersonEntityData> {
+  final i0.Value<String> id;
+  final i0.Value<DateTime> createdAt;
+  final i0.Value<DateTime> updatedAt;
+  final i0.Value<String> ownerId;
+  final i0.Value<String> name;
+  final i0.Value<String?> faceAssetId;
+  final i0.Value<String> thumbnailPath;
+  final i0.Value<bool> isFavorite;
+  final i0.Value<bool> isHidden;
+  final i0.Value<String?> color;
+  final i0.Value<DateTime?> birthDate;
+  const PersonEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    this.ownerId = const i0.Value.absent(),
+    this.name = const i0.Value.absent(),
+    this.faceAssetId = const i0.Value.absent(),
+    this.thumbnailPath = const i0.Value.absent(),
+    this.isFavorite = const i0.Value.absent(),
+    this.isHidden = const i0.Value.absent(),
+    this.color = const i0.Value.absent(),
+    this.birthDate = const i0.Value.absent(),
+  });
+  PersonEntityCompanion.insert({
+    required String id,
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    required String ownerId,
+    required String name,
+    this.faceAssetId = const i0.Value.absent(),
+    required String thumbnailPath,
+    required bool isFavorite,
+    required bool isHidden,
+    this.color = const i0.Value.absent(),
+    this.birthDate = const i0.Value.absent(),
+  })  : id = i0.Value(id),
+        ownerId = i0.Value(ownerId),
+        name = i0.Value(name),
+        thumbnailPath = i0.Value(thumbnailPath),
+        isFavorite = i0.Value(isFavorite),
+        isHidden = i0.Value(isHidden);
+  static i0.Insertable<i1.PersonEntityData> custom({
+    i0.Expression<String>? id,
+    i0.Expression<DateTime>? createdAt,
+    i0.Expression<DateTime>? updatedAt,
+    i0.Expression<String>? ownerId,
+    i0.Expression<String>? name,
+    i0.Expression<String>? faceAssetId,
+    i0.Expression<String>? thumbnailPath,
+    i0.Expression<bool>? isFavorite,
+    i0.Expression<bool>? isHidden,
+    i0.Expression<String>? color,
+    i0.Expression<DateTime>? birthDate,
+  }) {
+    return i0.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 (thumbnailPath != null) 'thumbnail_path': thumbnailPath,
+      if (isFavorite != null) 'is_favorite': isFavorite,
+      if (isHidden != null) 'is_hidden': isHidden,
+      if (color != null) 'color': color,
+      if (birthDate != null) 'birth_date': birthDate,
+    });
+  }
+
+  i1.PersonEntityCompanion copyWith(
+      {i0.Value<String>? id,
+      i0.Value<DateTime>? createdAt,
+      i0.Value<DateTime>? updatedAt,
+      i0.Value<String>? ownerId,
+      i0.Value<String>? name,
+      i0.Value<String?>? faceAssetId,
+      i0.Value<String>? thumbnailPath,
+      i0.Value<bool>? isFavorite,
+      i0.Value<bool>? isHidden,
+      i0.Value<String?>? color,
+      i0.Value<DateTime?>? birthDate}) {
+    return i1.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,
+      thumbnailPath: thumbnailPath ?? this.thumbnailPath,
+      isFavorite: isFavorite ?? this.isFavorite,
+      isHidden: isHidden ?? this.isHidden,
+      color: color ?? this.color,
+      birthDate: birthDate ?? this.birthDate,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<String>(id.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
+    }
+    if (ownerId.present) {
+      map['owner_id'] = i0.Variable<String>(ownerId.value);
+    }
+    if (name.present) {
+      map['name'] = i0.Variable<String>(name.value);
+    }
+    if (faceAssetId.present) {
+      map['face_asset_id'] = i0.Variable<String>(faceAssetId.value);
+    }
+    if (thumbnailPath.present) {
+      map['thumbnail_path'] = i0.Variable<String>(thumbnailPath.value);
+    }
+    if (isFavorite.present) {
+      map['is_favorite'] = i0.Variable<bool>(isFavorite.value);
+    }
+    if (isHidden.present) {
+      map['is_hidden'] = i0.Variable<bool>(isHidden.value);
+    }
+    if (color.present) {
+      map['color'] = i0.Variable<String>(color.value);
+    }
+    if (birthDate.present) {
+      map['birth_date'] = i0.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('thumbnailPath: $thumbnailPath, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('isHidden: $isHidden, ')
+          ..write('color: $color, ')
+          ..write('birthDate: $birthDate')
+          ..write(')'))
+        .toString();
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/lib/infrastructure/repositories/db.repository.dart
index 200ec47516..0a763c91cc 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -11,6 +11,7 @@ import 'package:immich_mobile/infrastructure/entities/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';
+import 'package:immich_mobile/infrastructure/entities/person.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart';
@@ -54,6 +55,7 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     MemoryEntity,
     MemoryAssetEntity,
     StackEntity,
+    PersonEntity,
   ],
   include: {
     'package:immich_mobile/infrastructure/entities/merged_asset.drift',
diff --git a/mobile/lib/infrastructure/repositories/db.repository.drift.dart b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
index 3b826c209b..0f822e57eb 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -29,9 +29,11 @@ import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
     as i13;
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
     as i14;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart'
     as i15;
-import 'package:drift/internal/modular.dart' as i16;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i16;
+import 'package:drift/internal/modular.dart' as i17;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -61,8 +63,9 @@ abstract class $Drift extends i0.GeneratedDatabase {
   late final i13.$MemoryEntityTable memoryEntity = i13.$MemoryEntityTable(this);
   late final i14.$MemoryAssetEntityTable memoryAssetEntity =
       i14.$MemoryAssetEntityTable(this);
-  i15.MergedAssetDrift get mergedAssetDrift => i16.ReadDatabaseContainer(this)
-      .accessor<i15.MergedAssetDrift>(i15.MergedAssetDrift.new);
+  late final i15.$PersonEntityTable personEntity = i15.$PersonEntityTable(this);
+  i16.MergedAssetDrift get mergedAssetDrift => i17.ReadDatabaseContainer(this)
+      .accessor<i16.MergedAssetDrift>(i16.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -84,7 +87,8 @@ abstract class $Drift extends i0.GeneratedDatabase {
         remoteAlbumAssetEntity,
         remoteAlbumUserEntity,
         memoryEntity,
-        memoryAssetEntity
+        memoryAssetEntity,
+        personEntity
       ];
   @override
   i0.StreamQueryUpdateRules get streamUpdateRules =>
@@ -216,6 +220,13 @@ abstract class $Drift extends i0.GeneratedDatabase {
               i0.TableUpdate('memory_asset_entity', kind: i0.UpdateKind.delete),
             ],
           ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('user_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('person_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
         ],
       );
   @override
@@ -255,4 +266,6 @@ class $DriftManager {
       i13.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
   i14.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
       i14.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
+  i15.$$PersonEntityTableTableManager get personEntity =>
+      i15.$$PersonEntityTableTableManager(_db, _db.personEntity);
 }
diff --git a/mobile/lib/infrastructure/repositories/db.repository.steps.dart b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
index 4b27ce830c..76e5df76d0 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -26,6 +26,7 @@ final class Schema2 extends i0.VersionedSchema {
     remoteAlbumUserEntity,
     memoryEntity,
     memoryAssetEntity,
+    personEntity,
   ];
   late final Shape0 userEntity = Shape0(
       source: i0.VersionedTable(
@@ -321,6 +322,30 @@ final class Schema2 extends i0.VersionedSchema {
         attachedDatabase: database,
       ),
       alias: null);
+  late final Shape13 personEntity = Shape13(
+      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_70,
+          _column_71,
+          _column_72,
+          _column_73,
+          _column_74,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
 }
 
 class Shape0 extends i0.VersionedTable {
@@ -845,6 +870,55 @@ i1.GeneratedColumn<String> _column_68(String aliasedName) =>
         type: i1.DriftSqlType.string,
         defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
             'REFERENCES memory_entity (id) ON DELETE CASCADE'));
+
+class Shape13 extends i0.VersionedTable {
+  Shape13({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  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<String> get ownerId =>
+      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get faceAssetId =>
+      columnsByName['face_asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get thumbnailPath =>
+      columnsByName['thumbnail_path']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isFavorite =>
+      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<bool> get isHidden =>
+      columnsByName['is_hidden']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get color =>
+      columnsByName['color']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get birthDate =>
+      columnsByName['birth_date']! as i1.GeneratedColumn<DateTime>;
+}
+
+i1.GeneratedColumn<String> _column_69(String aliasedName) =>
+    i1.GeneratedColumn<String>('face_asset_id', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_70(String aliasedName) =>
+    i1.GeneratedColumn<String>('thumbnail_path', aliasedName, false,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<bool> _column_71(String aliasedName) =>
+    i1.GeneratedColumn<bool>('is_favorite', aliasedName, false,
+        type: i1.DriftSqlType.bool,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'CHECK ("is_favorite" IN (0, 1))'));
+i1.GeneratedColumn<bool> _column_72(String aliasedName) =>
+    i1.GeneratedColumn<bool>('is_hidden', aliasedName, false,
+        type: i1.DriftSqlType.bool,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'CHECK ("is_hidden" IN (0, 1))'));
+i1.GeneratedColumn<String> _column_73(String aliasedName) =>
+    i1.GeneratedColumn<String>('color', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<DateTime> _column_74(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('birth_date', aliasedName, true,
+        type: i1.DriftSqlType.dateTime);
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
 }) {
diff --git a/mobile/lib/infrastructure/repositories/person.repository.dart b/mobile/lib/infrastructure/repositories/person.repository.dart
new file mode 100644
index 0000000000..859765d63b
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/person.repository.dart
@@ -0,0 +1,36 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/person.model.dart';
+import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class DriftPersonRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftPersonRepository(this._db) : super(_db);
+
+  Future<List<Person>> getAll(String userId) {
+    final query = _db.personEntity.select()
+      ..where((e) => e.ownerId.equals(userId));
+
+    return query.map((person) {
+      return person.toDto();
+    }).get();
+  }
+}
+
+extension on PersonEntityData {
+  Person toDto() {
+    return Person(
+      id: id,
+      createdAt: createdAt,
+      updatedAt: updatedAt,
+      ownerId: ownerId,
+      name: name,
+      faceAssetId: faceAssetId,
+      thumbnailPath: thumbnailPath,
+      isFavorite: isFavorite,
+      isHidden: isHidden,
+      color: color,
+      birthDate: birthDate,
+    );
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/sync_api.repository.dart b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
index d1ecbd580c..11d58663e0 100644
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -57,6 +57,7 @@ class SyncApiRepository {
           SyncRequestType.stacksV1,
           SyncRequestType.partnerStacksV1,
           SyncRequestType.userMetadataV1,
+          SyncRequestType.peopleV1,
         ],
       ).toJson(),
     );
@@ -173,6 +174,8 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.partnerStackDeleteV1: SyncStackDeleteV1.fromJson,
   SyncEntityType.userMetadataV1: SyncUserMetadataV1.fromJson,
   SyncEntityType.userMetadataDeleteV1: SyncUserMetadataDeleteV1.fromJson,
+  SyncEntityType.personV1: SyncPersonV1.fromJson,
+  SyncEntityType.personDeleteV1: SyncPersonDeleteV1.fromJson,
 };
 
 class _SyncAckV1 {
diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index d28c68ed78..fb5c7fdb3c 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -9,6 +9,7 @@ import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
@@ -511,6 +512,48 @@ class SyncStreamRepository extends DriftDatabaseRepository {
       rethrow;
     }
   }
+
+  Future<void> updatePeopleV1(Iterable<SyncPersonV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final person in data) {
+          final companion = PersonEntityCompanion(
+            createdAt: Value(person.createdAt),
+            updatedAt: Value(person.updatedAt),
+            ownerId: Value(person.ownerId),
+            name: Value(person.name),
+            faceAssetId: Value(person.faceAssetId),
+            thumbnailPath: Value(person.thumbnailPath),
+            isFavorite: Value(person.isFavorite),
+            isHidden: Value(person.isHidden),
+            color: Value(person.color),
+            birthDate: Value(person.birthDate),
+          );
+
+          batch.insert(
+            _db.personEntity,
+            companion.copyWith(id: Value(person.id)),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: updatePeopleV1', error, stack);
+      rethrow;
+    }
+  }
+
+  Future<void> deletePeopleV1(
+    Iterable<SyncPersonDeleteV1> data,
+  ) async {
+    try {
+      await _db.personEntity.deleteWhere(
+        (row) => row.id.isIn(data.map((e) => e.personId)),
+      );
+    } catch (error, stack) {
+      _logger.severe('Error: deletePeopleV1', error, stack);
+    }
+  }
 }
 
 extension on AssetTypeEnum {
diff --git a/mobile/lib/models/search/search_filter.model.dart b/mobile/lib/models/search/search_filter.model.dart
index 835e6aff8f..efe6f923ad 100644
--- a/mobile/lib/models/search/search_filter.model.dart
+++ b/mobile/lib/models/search/search_filter.model.dart
@@ -237,7 +237,7 @@ class SearchFilter {
   String? filename;
   String? description;
   String? language;
-  Set<Person> people;
+  Set<PersonDto> people;
   SearchLocationFilter location;
   SearchCameraFilter camera;
   SearchDateFilter date;
@@ -282,7 +282,7 @@ class SearchFilter {
     String? filename,
     String? description,
     String? language,
-    Set<Person>? people,
+    Set<PersonDto>? people,
     SearchLocationFilter? location,
     SearchCameraFilter? camera,
     SearchDateFilter? date,
diff --git a/mobile/lib/pages/search/search.page.dart b/mobile/lib/pages/search/search.page.dart
index dba3199fac..3e5c153f88 100644
--- a/mobile/lib/pages/search/search.page.dart
+++ b/mobile/lib/pages/search/search.page.dart
@@ -147,7 +147,7 @@ class SearchPage extends HookConsumerWidget {
     );
 
     showPeoplePicker() {
-      handleOnSelect(Set<Person> value) {
+      handleOnSelect(Set<PersonDto> value) {
         filter.value = filter.value.copyWith(
           people: value,
         );
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index 2815b2db83..e94329acd2 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -112,6 +112,7 @@ final _features = [
       await db.memoryEntity.deleteAll();
       await db.memoryAssetEntity.deleteAll();
       await db.stackEntity.deleteAll();
+      await db.personEntity.deleteAll();
     },
   ),
   _Feature(
diff --git a/mobile/lib/presentation/pages/dev/media_stat.page.dart b/mobile/lib/presentation/pages/dev/media_stat.page.dart
index e61dcdf90d..acd7b219b3 100644
--- a/mobile/lib/presentation/pages/dev/media_stat.page.dart
+++ b/mobile/lib/presentation/pages/dev/media_stat.page.dart
@@ -166,6 +166,10 @@ final _remoteStats = [
     name: 'Stacks',
     load: (db) => db.managers.stackEntity.count(),
   ),
+  _Stat(
+    name: 'People',
+    load: (db) => db.managers.personEntity.count(),
+  ),
 ];
 
 @RoutePage()
diff --git a/mobile/lib/presentation/pages/search/drift_search.page.dart b/mobile/lib/presentation/pages/search/drift_search.page.dart
index 5a5eb44b3b..7101a42b01 100644
--- a/mobile/lib/presentation/pages/search/drift_search.page.dart
+++ b/mobile/lib/presentation/pages/search/drift_search.page.dart
@@ -151,7 +151,7 @@ class DriftSearchPage extends HookConsumerWidget {
     );
 
     showPeoplePicker() {
-      handleOnSelect(Set<Person> value) {
+      handleOnSelect(Set<PersonDto> value) {
         filter.value = filter.value.copyWith(
           people: value,
         );
diff --git a/mobile/lib/providers/infrastructure/person.provider.dart b/mobile/lib/providers/infrastructure/person.provider.dart
new file mode 100644
index 0000000000..a733104b33
--- /dev/null
+++ b/mobile/lib/providers/infrastructure/person.provider.dart
@@ -0,0 +1,7 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/infrastructure/repositories/person.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+
+final driftPersonProvider = Provider<DriftPersonRepository>(
+  (ref) => DriftPersonRepository(ref.watch(driftProvider)),
+);
diff --git a/mobile/lib/providers/stack.provider.dart b/mobile/lib/providers/infrastructure/stack.provider.dart
similarity index 100%
rename from mobile/lib/providers/stack.provider.dart
rename to mobile/lib/providers/infrastructure/stack.provider.dart
diff --git a/mobile/lib/providers/search/people.provider.dart b/mobile/lib/providers/search/people.provider.dart
index d03d533aaf..f6ac9d1125 100644
--- a/mobile/lib/providers/search/people.provider.dart
+++ b/mobile/lib/providers/search/people.provider.dart
@@ -9,7 +9,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'people.provider.g.dart';
 
 @riverpod
-Future<List<Person>> getAllPeople(
+Future<List<PersonDto>> getAllPeople(
   Ref ref,
 ) async {
   final PersonService personService = ref.read(personServiceProvider);
diff --git a/mobile/lib/providers/search/people.provider.g.dart b/mobile/lib/providers/search/people.provider.g.dart
index 391edd362c..4625891abb 100644
--- a/mobile/lib/providers/search/people.provider.g.dart
+++ b/mobile/lib/providers/search/people.provider.g.dart
@@ -6,11 +6,12 @@ part of 'people.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$getAllPeopleHash() => r'226947af3b09ce62224916543958dd1d5e2ba651';
+String _$getAllPeopleHash() => r'2c5e6a207683f15ab209650615fdf9cb7f76c736';
 
 /// See also [getAllPeople].
 @ProviderFor(getAllPeople)
-final getAllPeopleProvider = AutoDisposeFutureProvider<List<Person>>.internal(
+final getAllPeopleProvider =
+    AutoDisposeFutureProvider<List<PersonDto>>.internal(
   getAllPeople,
   name: r'getAllPeopleProvider',
   debugGetCreateSourceHash:
@@ -21,7 +22,7 @@ final getAllPeopleProvider = AutoDisposeFutureProvider<List<Person>>.internal(
 
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
-typedef GetAllPeopleRef = AutoDisposeFutureProviderRef<List<Person>>;
+typedef GetAllPeopleRef = AutoDisposeFutureProviderRef<List<PersonDto>>;
 String _$personAssetsHash() => r'c1d35ee0e024bd6915e21bc724be4b458a14bc24';
 
 /// Copied from Dart SDK
diff --git a/mobile/lib/repositories/auth.repository.dart b/mobile/lib/repositories/auth.repository.dart
index eb86e1809f..5cf357d5a4 100644
--- a/mobile/lib/repositories/auth.repository.dart
+++ b/mobile/lib/repositories/auth.repository.dart
@@ -34,6 +34,7 @@ class AuthRepository extends DatabaseRepository {
       _drift.userMetadataEntity.deleteAll(),
       _drift.partnerEntity.deleteAll(),
       _drift.stackEntity.deleteAll(),
+      _drift.personEntity.deleteAll(),
     ]);
     // Drift deletions - parent entities
     await Future.wait([
diff --git a/mobile/lib/repositories/person_api.repository.dart b/mobile/lib/repositories/person_api.repository.dart
index a2a6e2489b..26f11dd51d 100644
--- a/mobile/lib/repositories/person_api.repository.dart
+++ b/mobile/lib/repositories/person_api.repository.dart
@@ -13,19 +13,19 @@ class PersonApiRepository extends ApiRepository {
 
   PersonApiRepository(this._api);
 
-  Future<List<Person>> getAll() async {
+  Future<List<PersonDto>> getAll() async {
     final dto = await checkNull(_api.getAllPeople());
     return dto.people.map(_toPerson).toList();
   }
 
-  Future<Person> update(String id, {String? name}) async {
+  Future<PersonDto> update(String id, {String? name}) async {
     final dto = await checkNull(
       _api.updatePerson(id, PersonUpdateDto(name: name)),
     );
     return _toPerson(dto);
   }
 
-  static Person _toPerson(PersonResponseDto dto) => Person(
+  static PersonDto _toPerson(PersonResponseDto dto) => PersonDto(
         birthDate: dto.birthDate,
         id: dto.id,
         isHidden: dto.isHidden,
diff --git a/mobile/lib/services/person.service.dart b/mobile/lib/services/person.service.dart
index a591ad4f27..08b18dfd10 100644
--- a/mobile/lib/services/person.service.dart
+++ b/mobile/lib/services/person.service.dart
@@ -28,7 +28,7 @@ class PersonService {
     this._assetRepository,
   );
 
-  Future<List<Person>> getAllPeople() async {
+  Future<List<PersonDto>> getAllPeople() async {
     try {
       return await _personApiRepository.getAll();
     } catch (error, stack) {
@@ -48,7 +48,7 @@ class PersonService {
     return [];
   }
 
-  Future<Person?> updateName(String id, String name) async {
+  Future<PersonDto?> updateName(String id, String name) async {
     try {
       return await _personApiRepository.update(id, name: name);
     } catch (error, stack) {
diff --git a/mobile/lib/widgets/search/search_filter/people_picker.dart b/mobile/lib/widgets/search/search_filter/people_picker.dart
index 44d01d274e..05f699b44b 100644
--- a/mobile/lib/widgets/search/search_filter/people_picker.dart
+++ b/mobile/lib/widgets/search/search_filter/people_picker.dart
@@ -14,8 +14,8 @@ import 'package:immich_mobile/widgets/common/search_field.dart';
 class PeoplePicker extends HookConsumerWidget {
   const PeoplePicker({super.key, required this.onSelect, this.filter});
 
-  final Function(Set<Person>) onSelect;
-  final Set<Person>? filter;
+  final Function(Set<PersonDto>) onSelect;
+  final Set<PersonDto>? filter;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -24,7 +24,7 @@ class PeoplePicker extends HookConsumerWidget {
     final searchQuery = useState('');
     final people = ref.watch(getAllPeopleProvider);
     final headers = ApiService.getRequestHeaders();
-    final selectedPeople = useState<Set<Person>>(filter ?? {});
+    final selectedPeople = useState<Set<PersonDto>>(filter ?? {});
 
     return Column(
       children: [
diff --git a/mobile/test/domain/services/sync_stream_service_test.dart b/mobile/test/domain/services/sync_stream_service_test.dart
index c9fd8104e4..deb19dfcf8 100644
--- a/mobile/test/domain/services/sync_stream_service_test.dart
+++ b/mobile/test/domain/services/sync_stream_service_test.dart
@@ -105,6 +105,10 @@ void main() {
         .thenAnswer(successHandler);
     when(() => mockSyncStreamRepo.deleteUserMetadatasV1(any()))
         .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updatePeopleV1(any()))
+        .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deletePeopleV1(any()))
+        .thenAnswer(successHandler);
 
     sut = SyncStreamService(
       syncApiRepository: mockSyncApiRepo,
diff --git a/mobile/test/drift/main/generated/schema_v1.dart b/mobile/test/drift/main/generated/schema_v1.dart
index 38dbb9f827..d7b88ea3cf 100644
--- a/mobile/test/drift/main/generated/schema_v1.dart
+++ b/mobile/test/drift/main/generated/schema_v1.dart
@@ -4645,6 +4645,441 @@ class MemoryAssetEntityCompanion
   }
 }
 
+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<String> thumbnailPath = GeneratedColumn<String>(
+      'thumbnail_path', aliasedName, false,
+      type: DriftSqlType.string, requiredDuringInsert: true);
+  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,
+        thumbnailPath,
+        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']),
+      thumbnailPath: attachedDatabase.typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!,
+      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 String thumbnailPath;
+  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.thumbnailPath,
+      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['thumbnail_path'] = Variable<String>(thumbnailPath);
+    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']),
+      thumbnailPath: serializer.fromJson<String>(json['thumbnailPath']),
+      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),
+      'thumbnailPath': serializer.toJson<String>(thumbnailPath),
+      '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(),
+          String? thumbnailPath,
+          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,
+        thumbnailPath: thumbnailPath ?? this.thumbnailPath,
+        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,
+      thumbnailPath: data.thumbnailPath.present
+          ? data.thumbnailPath.value
+          : this.thumbnailPath,
+      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('thumbnailPath: $thumbnailPath, ')
+          ..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, thumbnailPath, 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.thumbnailPath == this.thumbnailPath &&
+          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<String> thumbnailPath;
+  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.thumbnailPath = 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 String thumbnailPath,
+    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),
+        thumbnailPath = Value(thumbnailPath),
+        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<String>? thumbnailPath,
+    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 (thumbnailPath != null) 'thumbnail_path': thumbnailPath,
+      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<String>? thumbnailPath,
+      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,
+      thumbnailPath: thumbnailPath ?? this.thumbnailPath,
+      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 (thumbnailPath.present) {
+      map['thumbnail_path'] = Variable<String>(thumbnailPath.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('thumbnailPath: $thumbnailPath, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('isHidden: $isHidden, ')
+          ..write('color: $color, ')
+          ..write('birthDate: $birthDate')
+          ..write(')'))
+        .toString();
+  }
+}
+
 class DatabaseAtV1 extends GeneratedDatabase {
   DatabaseAtV1(QueryExecutor e) : super(e);
   late final UserEntity userEntity = UserEntity(this);
@@ -4671,6 +5106,7 @@ class DatabaseAtV1 extends GeneratedDatabase {
       RemoteAlbumUserEntity(this);
   late final MemoryEntity memoryEntity = MemoryEntity(this);
   late final MemoryAssetEntity memoryAssetEntity = MemoryAssetEntity(this);
+  late final PersonEntity personEntity = PersonEntity(this);
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>
       allSchemaEntities.whereType<TableInfo<Table, Object?>>();
@@ -4692,7 +5128,8 @@ class DatabaseAtV1 extends GeneratedDatabase {
         remoteAlbumAssetEntity,
         remoteAlbumUserEntity,
         memoryEntity,
-        memoryAssetEntity
+        memoryAssetEntity,
+        personEntity
       ];
   @override
   int get schemaVersion => 1;
diff --git a/mobile/test/drift/main/generated/schema_v2.dart b/mobile/test/drift/main/generated/schema_v2.dart
index 8345cef906..e3edac3501 100644
--- a/mobile/test/drift/main/generated/schema_v2.dart
+++ b/mobile/test/drift/main/generated/schema_v2.dart
@@ -4645,6 +4645,441 @@ class MemoryAssetEntityCompanion
   }
 }
 
+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<String> thumbnailPath = GeneratedColumn<String>(
+      'thumbnail_path', aliasedName, false,
+      type: DriftSqlType.string, requiredDuringInsert: true);
+  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,
+        thumbnailPath,
+        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']),
+      thumbnailPath: attachedDatabase.typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!,
+      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 String thumbnailPath;
+  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.thumbnailPath,
+      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['thumbnail_path'] = Variable<String>(thumbnailPath);
+    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']),
+      thumbnailPath: serializer.fromJson<String>(json['thumbnailPath']),
+      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),
+      'thumbnailPath': serializer.toJson<String>(thumbnailPath),
+      '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(),
+          String? thumbnailPath,
+          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,
+        thumbnailPath: thumbnailPath ?? this.thumbnailPath,
+        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,
+      thumbnailPath: data.thumbnailPath.present
+          ? data.thumbnailPath.value
+          : this.thumbnailPath,
+      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('thumbnailPath: $thumbnailPath, ')
+          ..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, thumbnailPath, 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.thumbnailPath == this.thumbnailPath &&
+          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<String> thumbnailPath;
+  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.thumbnailPath = 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 String thumbnailPath,
+    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),
+        thumbnailPath = Value(thumbnailPath),
+        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<String>? thumbnailPath,
+    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 (thumbnailPath != null) 'thumbnail_path': thumbnailPath,
+      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<String>? thumbnailPath,
+      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,
+      thumbnailPath: thumbnailPath ?? this.thumbnailPath,
+      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 (thumbnailPath.present) {
+      map['thumbnail_path'] = Variable<String>(thumbnailPath.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('thumbnailPath: $thumbnailPath, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('isHidden: $isHidden, ')
+          ..write('color: $color, ')
+          ..write('birthDate: $birthDate')
+          ..write(')'))
+        .toString();
+  }
+}
+
 class DatabaseAtV2 extends GeneratedDatabase {
   DatabaseAtV2(QueryExecutor e) : super(e);
   late final UserEntity userEntity = UserEntity(this);
@@ -4671,6 +5106,7 @@ class DatabaseAtV2 extends GeneratedDatabase {
       RemoteAlbumUserEntity(this);
   late final MemoryEntity memoryEntity = MemoryEntity(this);
   late final MemoryAssetEntity memoryAssetEntity = MemoryAssetEntity(this);
+  late final PersonEntity personEntity = PersonEntity(this);
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>
       allSchemaEntities.whereType<TableInfo<Table, Object?>>();
@@ -4692,7 +5128,8 @@ class DatabaseAtV2 extends GeneratedDatabase {
         remoteAlbumAssetEntity,
         remoteAlbumUserEntity,
         memoryEntity,
-        memoryAssetEntity
+        memoryAssetEntity,
+        personEntity
       ];
   @override
   int get schemaVersion => 2;

From f32d4f15b63112309f6b89bec73ba367f7c26f61 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Fri, 18 Jul 2025 09:37:07 -0500
Subject: [PATCH 239/337] feat(mobile): android widgets (#19310)

* wip

* wip widgets

* more wip changes

* latest changes

* working random widget

* cleanup

* add configurable widget

* add memory widget and cleanup of codebase

* album name handling

* add deeplinks

* finish minor refactoring and add some polish :)

* fix single shot type on random widget

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

* switch to ExposedDropdownMenuBox for random configure activity

* handle empty album and no connection edge cases

* android project cleanup

* fix proguard and gson issues

* fix deletion handling

* fix proguard stripping for widget model classes/enums

* change random configuration activity close to a checkmark on right side

---------

Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
---
 mobile/android/app/build.gradle               |  19 ++
 mobile/android/app/proguard-rules.pro         |   9 +-
 .../android/app/src/main/AndroidManifest.xml  |  38 ++-
 .../app/alextran/immich/widget/BitmapUtils.kt |  33 +++
 .../immich/widget/ImageDownloadWorker.kt      | 241 ++++++++++++++++++
 .../app/alextran/immich/widget/ImmichAPI.kt   | 103 ++++++++
 .../alextran/immich/widget/MemoryReceiver.kt  |  56 ++++
 .../app/alextran/immich/widget/PhotoWidget.kt | 124 +++++++++
 .../alextran/immich/widget/RandomReceiver.kt  |  55 ++++
 .../immich/widget/configure/Dropdown.kt       |  64 +++++
 .../immich/widget/configure/LightDarkTheme.kt |  28 ++
 .../widget/configure/RandomConfigure.kt       | 210 +++++++++++++++
 .../app/alextran/immich/widget/model/Model.kt |  79 ++++++
 .../res/drawable-nodpi/memory_preview.png     | Bin 0 -> 246192 bytes
 .../res/drawable-nodpi/random_preview.png     | Bin 0 -> 250040 bytes
 .../app/src/main/res/values/strings.xml       |   8 +
 .../app/src/main/res/xml/memory_widget.xml    |   9 +
 .../app/src/main/res/xml/random_widget.xml    |  13 +
 mobile/lib/constants/constants.dart           |   7 +-
 .../lib/repositories/widget.repository.dart   |   7 +-
 mobile/lib/services/widget.service.dart       |   7 +-
 21 files changed, 1098 insertions(+), 12 deletions(-)
 create mode 100644 mobile/android/app/src/main/kotlin/app/alextran/immich/widget/BitmapUtils.kt
 create mode 100644 mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImageDownloadWorker.kt
 create mode 100644 mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImmichAPI.kt
 create mode 100644 mobile/android/app/src/main/kotlin/app/alextran/immich/widget/MemoryReceiver.kt
 create mode 100644 mobile/android/app/src/main/kotlin/app/alextran/immich/widget/PhotoWidget.kt
 create mode 100644 mobile/android/app/src/main/kotlin/app/alextran/immich/widget/RandomReceiver.kt
 create mode 100644 mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/Dropdown.kt
 create mode 100644 mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/LightDarkTheme.kt
 create mode 100644 mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/RandomConfigure.kt
 create mode 100644 mobile/android/app/src/main/kotlin/app/alextran/immich/widget/model/Model.kt
 create mode 100644 mobile/android/app/src/main/res/drawable-nodpi/memory_preview.png
 create mode 100644 mobile/android/app/src/main/res/drawable-nodpi/random_preview.png
 create mode 100644 mobile/android/app/src/main/res/values/strings.xml
 create mode 100644 mobile/android/app/src/main/res/xml/memory_widget.xml
 create mode 100644 mobile/android/app/src/main/res/xml/random_widget.xml

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 870e424461..8b4dc42b7e 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -3,6 +3,8 @@ plugins {
   id "kotlin-android"
   id "dev.flutter.flutter-gradle-plugin"
   id 'com.google.devtools.ksp'
+  id 'org.jetbrains.kotlin.plugin.compose' version '2.0.20' // this version matches your Kotlin version
+
 }
 
 def localProperties = new Properties()
@@ -45,6 +47,10 @@ android {
     main.java.srcDirs += 'src/main/kotlin'
   }
 
+  buildFeatures {
+    compose true
+  }
+
   defaultConfig {
     applicationId "app.alextran.immich"
     minSdkVersion 26
@@ -105,6 +111,8 @@ dependencies {
   def guava_version = '33.3.1-android'
   def glide_version = '4.16.0'
   def serialization_version = '1.8.1'
+  def compose_version = '1.1.1'
+  def gson_version = '2.10.1'
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
@@ -116,6 +124,17 @@ dependencies {
 
   ksp "com.github.bumptech.glide:ksp:$glide_version"
   coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
+
+  //Glance Widget
+  implementation "androidx.glance:glance-appwidget:$compose_version"
+  implementation "com.google.code.gson:gson:$gson_version"
+
+  // Glance Configure
+  implementation "androidx.activity:activity-compose:1.8.2"
+  implementation "androidx.compose.ui:ui:$compose_version"
+  implementation "androidx.compose.ui:ui-tooling:$compose_version"
+  implementation "androidx.compose.material3:material3:1.2.1"
+  implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
 }
 
 // This is uncommented in F-Droid build script
diff --git a/mobile/android/app/proguard-rules.pro b/mobile/android/app/proguard-rules.pro
index ea6dd795b5..898caee06c 100644
--- a/mobile/android/app/proguard-rules.pro
+++ b/mobile/android/app/proguard-rules.pro
@@ -25,8 +25,15 @@
   @com.google.gson.annotations.SerializedName <fields>;
 }
 
+# TypeToken preventions
+-keep class com.google.gson.reflect.TypeToken { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
+
 # Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
 -keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
 -keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
 
-##---------------End: proguard configuration for Gson  ----------
\ No newline at end of file
+##---------------End: proguard configuration for Gson  ----------
+
+# Keep all widget model classes and their fields for Gson
+-keep class app.alextran.immich.widget.model.** { *; }
\ No newline at end of file
diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index cf3b7ee719..3aa72d2876 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -141,6 +141,42 @@
       android:name="androidx.startup.InitializationProvider"
       android:authorities="${applicationId}.androidx-startup"
       tools:node="remove" />
+
+
+    <!-- Widgets -->
+    <receiver
+      android:name=".widget.RandomReceiver"
+      android:exported="true"
+      android:label="@string/random_widget_title">
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+      </intent-filter>
+      <meta-data
+        android:name="android.appwidget.provider"
+        android:resource="@xml/random_widget" />
+    </receiver>
+
+    <receiver
+      android:name=".widget.MemoryReceiver"
+      android:exported="true"
+      android:label="@string/memory_widget_title">
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+      </intent-filter>
+      <meta-data
+        android:name="android.appwidget.provider"
+        android:resource="@xml/memory_widget" />
+    </receiver>
+
+    <activity android:name=".widget.configure.RandomConfigure"
+      android:exported="true"
+      android:theme="@style/Theme.Material3.DayNight.NoActionBar">
+      >
+
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
+      </intent-filter>
+    </activity>
   </application>
 
 
@@ -154,4 +190,4 @@
       <data android:scheme="geo" />
     </intent>
   </queries>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/BitmapUtils.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/BitmapUtils.kt
new file mode 100644
index 0000000000..9188df1700
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/BitmapUtils.kt
@@ -0,0 +1,33 @@
+package app.alextran.immich.widget
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import java.io.File
+
+fun loadScaledBitmap(file: File, reqWidth: Int, reqHeight: Int): Bitmap? {
+  val options = BitmapFactory.Options().apply {
+    inJustDecodeBounds = true
+  }
+  BitmapFactory.decodeFile(file.absolutePath, options)
+
+  options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight)
+  options.inJustDecodeBounds = false
+
+  return BitmapFactory.decodeFile(file.absolutePath, options)
+}
+
+fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int {
+  val (height: Int, width: Int) = options.run { outHeight to outWidth }
+  var inSampleSize = 1
+
+  if (height > reqHeight || width > reqWidth) {
+    val halfHeight: Int = height / 2
+    val halfWidth: Int = width / 2
+
+    while ((halfHeight / inSampleSize) >= reqHeight && (halfWidth / inSampleSize) >= reqWidth) {
+      inSampleSize *= 2
+    }
+  }
+
+  return inSampleSize
+}
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImageDownloadWorker.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImageDownloadWorker.kt
new file mode 100644
index 0000000000..2a23d0ecbd
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImageDownloadWorker.kt
@@ -0,0 +1,241 @@
+package app.alextran.immich.widget
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.util.Log
+import androidx.datastore.preferences.core.Preferences
+import androidx.glance.*
+import androidx.glance.appwidget.GlanceAppWidgetManager
+import androidx.glance.appwidget.state.updateAppWidgetState
+import androidx.work.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.io.FileOutputStream
+import java.util.UUID
+import java.util.concurrent.TimeUnit
+import androidx.glance.appwidget.state.getAppWidgetState
+import androidx.glance.state.PreferencesGlanceStateDefinition
+import app.alextran.immich.widget.model.*
+import java.time.LocalDate
+
+class ImageDownloadWorker(
+  private val context: Context,
+  workerParameters: WorkerParameters
+) : CoroutineWorker(context, workerParameters) {
+
+  companion object {
+
+    private val uniqueWorkName = ImageDownloadWorker::class.java.simpleName
+
+    private fun buildConstraints(): Constraints {
+      return Constraints.Builder()
+        .setRequiredNetworkType(NetworkType.CONNECTED)
+        .build()
+    }
+
+    private fun buildInputData(appWidgetId: Int, widgetType: WidgetType): Data {
+      return Data.Builder()
+        .putString(kWorkerWidgetType, widgetType.toString())
+        .putInt(kWorkerWidgetID, appWidgetId)
+        .build()
+    }
+
+    fun enqueuePeriodic(context: Context, appWidgetId: Int, widgetType: WidgetType) {
+      val manager = WorkManager.getInstance(context)
+
+      val workRequest = PeriodicWorkRequestBuilder<ImageDownloadWorker>(
+        20, TimeUnit.MINUTES
+      )
+        .setConstraints(buildConstraints())
+        .setInputData(buildInputData(appWidgetId, widgetType))
+        .addTag(appWidgetId.toString())
+        .build()
+
+      manager.enqueueUniquePeriodicWork(
+        "$uniqueWorkName-$appWidgetId",
+        ExistingPeriodicWorkPolicy.UPDATE,
+        workRequest
+      )
+    }
+
+    fun singleShot(context: Context, appWidgetId: Int, widgetType: WidgetType) {
+      val manager = WorkManager.getInstance(context)
+
+      val workRequest = OneTimeWorkRequestBuilder<ImageDownloadWorker>()
+        .setConstraints(buildConstraints())
+        .setInputData(buildInputData(appWidgetId, widgetType))
+        .addTag(appWidgetId.toString())
+        .build()
+
+      manager.enqueueUniqueWork(
+        "$uniqueWorkName-$appWidgetId",
+        ExistingWorkPolicy.REPLACE,
+        workRequest
+      )
+    }
+
+    suspend fun cancel(context: Context, appWidgetId: Int) {
+      WorkManager.getInstance(context).cancelAllWorkByTag("$uniqueWorkName-$appWidgetId")
+
+      // delete cached image
+      val glanceId = GlanceAppWidgetManager(context).getGlanceIdBy(appWidgetId)
+      val widgetConfig = getAppWidgetState(context, PreferencesGlanceStateDefinition, glanceId)
+      val currentImgUUID = widgetConfig[kImageUUID]
+
+      if (!currentImgUUID.isNullOrEmpty()) {
+        val file = File(context.cacheDir, imageFilename(currentImgUUID))
+        file.delete()
+      }
+    }
+  }
+
+  override suspend fun doWork(): Result {
+    return try {
+      val widgetType = WidgetType.valueOf(inputData.getString(kWorkerWidgetType) ?: "")
+      val widgetId = inputData.getInt(kWorkerWidgetID, -1)
+      val glanceId = GlanceAppWidgetManager(context).getGlanceIdBy(widgetId)
+      val widgetConfig = getAppWidgetState(context, PreferencesGlanceStateDefinition, glanceId)
+      val currentImgUUID = widgetConfig[kImageUUID]
+
+      val serverConfig = ImmichAPI.getServerConfig(context)
+
+      // clear any image caches and go to "login" state if no credentials
+      if (serverConfig == null) {
+        if (!currentImgUUID.isNullOrEmpty()) {
+          deleteImage(currentImgUUID)
+          updateWidget(
+            glanceId,
+            "",
+            "",
+            "immich://",
+            WidgetState.LOG_IN
+          )
+        }
+
+        return Result.success()
+      }
+
+      // fetch new image
+      val entry = when (widgetType) {
+        WidgetType.RANDOM -> fetchRandom(serverConfig, widgetConfig)
+        WidgetType.MEMORIES -> fetchMemory(serverConfig)
+      }
+
+      // clear current image if it exists
+      if (!currentImgUUID.isNullOrEmpty()) {
+        deleteImage(currentImgUUID)
+      }
+
+      // save a new image
+      val imgUUID = UUID.randomUUID().toString()
+      saveImage(entry.image, imgUUID)
+
+      // trigger the update routine with new image uuid
+      updateWidget(glanceId, imgUUID, entry.subtitle, entry.deeplink)
+
+      Result.success()
+    } catch (e: Exception) {
+      Log.e(uniqueWorkName, "Error while loading image", e)
+      if (runAttemptCount < 10) {
+        Result.retry()
+      } else {
+        Result.failure()
+      }
+    }
+  }
+
+  private suspend fun updateWidget(
+    glanceId: GlanceId,
+    imageUUID: String,
+    subtitle: String?,
+    deeplink: String?,
+    widgetState: WidgetState = WidgetState.SUCCESS
+  ) {
+    updateAppWidgetState(context, glanceId) { prefs ->
+      prefs[kNow] = System.currentTimeMillis()
+      prefs[kImageUUID] = imageUUID
+      prefs[kWidgetState] = widgetState.toString()
+      prefs[kSubtitleText] = subtitle ?: ""
+      prefs[kDeeplinkURL] = deeplink ?: ""
+    }
+
+    PhotoWidget().update(context,glanceId)
+  }
+
+  private suspend fun fetchRandom(
+    serverConfig: ServerConfig,
+    widgetConfig: Preferences
+  ): WidgetEntry {
+    val api = ImmichAPI(serverConfig)
+
+    val filters = SearchFilters(AssetType.IMAGE)
+    val albumId = widgetConfig[kSelectedAlbum]
+    val showSubtitle = widgetConfig[kShowAlbumName]
+    val albumName = widgetConfig[kSelectedAlbumName]
+    var subtitle: String? = if (showSubtitle == true) albumName else ""
+
+    if (albumId != null) {
+      filters.albumIds = listOf(albumId)
+    }
+
+    var randomSearch = api.fetchSearchResults(filters)
+
+    // handle an empty album, fallback to random
+    if (randomSearch.isEmpty() && albumId != null) {
+      randomSearch = api.fetchSearchResults(SearchFilters(AssetType.IMAGE))
+      subtitle = ""
+    }
+
+    val random = randomSearch.first()
+    val image = api.fetchImage(random)
+
+    return WidgetEntry(
+      image,
+      subtitle,
+      assetDeeplink(random)
+    )
+  }
+
+  private suspend fun fetchMemory(
+    serverConfig: ServerConfig
+  ): WidgetEntry {
+    val api = ImmichAPI(serverConfig)
+
+    val today = LocalDate.now()
+    val memories = api.fetchMemory(today)
+    val asset: Asset
+    var subtitle: String? = null
+
+    if (memories.isNotEmpty()) {
+      // pick a random asset from a random memory
+      val memory = memories.random()
+      asset = memory.assets.random()
+
+      val yearDiff = today.year - memory.data.year
+      subtitle = "$yearDiff ${if (yearDiff == 1) "year" else "years"} ago"
+    } else {
+      val filters = SearchFilters(AssetType.IMAGE, size=1)
+      asset = api.fetchSearchResults(filters).first()
+    }
+
+    val image = api.fetchImage(asset)
+    return WidgetEntry(
+      image,
+      subtitle,
+      assetDeeplink(asset)
+    )
+  }
+
+  private suspend fun deleteImage(uuid: String) = withContext(Dispatchers.IO) {
+    val file = File(context.cacheDir, imageFilename(uuid))
+    file.delete()
+  }
+
+  private suspend fun saveImage(bitmap: Bitmap, uuid: String) = withContext(Dispatchers.IO) {
+    val file = File(context.cacheDir, imageFilename(uuid))
+    FileOutputStream(file).use { out ->
+      bitmap.compress(Bitmap.CompressFormat.JPEG, 90, out)
+    }
+  }
+}
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImmichAPI.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImmichAPI.kt
new file mode 100644
index 0000000000..42f5fb4b1b
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImmichAPI.kt
@@ -0,0 +1,103 @@
+package app.alextran.immich.widget
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import app.alextran.immich.widget.model.*
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import es.antonborri.home_widget.HomeWidgetPlugin
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.OutputStreamWriter
+import java.net.HttpURLConnection
+import java.net.URL
+import java.net.URLEncoder
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class ImmichAPI(cfg: ServerConfig) {
+
+  companion object {
+    fun getServerConfig(context: Context): ServerConfig? {
+      val prefs = HomeWidgetPlugin.getData(context)
+
+      val serverURL = prefs.getString("widget_server_url", "") ?: ""
+      val sessionKey = prefs.getString("widget_auth_token", "") ?: ""
+
+      if (serverURL.isBlank() || sessionKey.isBlank()) {
+        return null
+      }
+
+      return ServerConfig(
+        serverURL,
+        sessionKey
+      )
+    }
+  }
+
+
+  private val gson = Gson()
+  private val serverConfig = cfg
+
+  private fun buildRequestURL(endpoint: String, params: List<Pair<String, String>> = emptyList()): URL {
+    val urlString = StringBuilder("${serverConfig.serverEndpoint}$endpoint?sessionKey=${serverConfig.sessionKey}")
+
+    for ((key, value) in params) {
+      urlString.append("&${URLEncoder.encode(key, "UTF-8")}=${URLEncoder.encode(value, "UTF-8")}")
+    }
+
+    return URL(urlString.toString())
+  }
+
+  suspend fun fetchSearchResults(filters: SearchFilters): List<Asset> = withContext(Dispatchers.IO) {
+    val url = buildRequestURL("/search/random")
+    val connection = (url.openConnection() as HttpURLConnection).apply {
+      requestMethod = "POST"
+      setRequestProperty("Content-Type", "application/json")
+      doOutput = true
+    }
+
+    connection.outputStream.use {
+      OutputStreamWriter(it).use { writer ->
+        writer.write(gson.toJson(filters))
+        writer.flush()
+      }
+    }
+
+    val response = connection.inputStream.bufferedReader().readText()
+    val type = object : TypeToken<List<Asset>>() {}.type
+    gson.fromJson(response, type)
+  }
+
+  suspend fun fetchMemory(date: LocalDate): List<MemoryResult> = withContext(Dispatchers.IO) {
+    val iso8601 = date.format(DateTimeFormatter.ISO_LOCAL_DATE)
+    val url = buildRequestURL("/memories", listOf("for" to iso8601))
+    val connection = (url.openConnection() as HttpURLConnection).apply {
+      requestMethod = "GET"
+    }
+
+    val response = connection.inputStream.bufferedReader().readText()
+    val type = object : TypeToken<List<MemoryResult>>() {}.type
+    gson.fromJson(response, type)
+  }
+
+  suspend fun fetchImage(asset: Asset): Bitmap = withContext(Dispatchers.IO) {
+    val url = buildRequestURL("/assets/${asset.id}/thumbnail", listOf("size" to "preview"))
+    val connection = url.openConnection()
+    val data = connection.getInputStream().readBytes()
+    BitmapFactory.decodeByteArray(data, 0, data.size)
+      ?: throw Exception("Invalid image data")
+  }
+
+  suspend fun fetchAlbums(): List<Album> = withContext(Dispatchers.IO) {
+    val url = buildRequestURL("/albums")
+    val connection = (url.openConnection() as HttpURLConnection).apply {
+      requestMethod = "GET"
+    }
+
+    val response = connection.inputStream.bufferedReader().readText()
+    val type = object : TypeToken<List<Album>>() {}.type
+    gson.fromJson(response, type)
+  }
+}
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/MemoryReceiver.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/MemoryReceiver.kt
new file mode 100644
index 0000000000..7721af7d6f
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/MemoryReceiver.kt
@@ -0,0 +1,56 @@
+package app.alextran.immich.widget
+
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import androidx.glance.appwidget.GlanceAppWidgetReceiver
+import app.alextran.immich.widget.model.*
+import es.antonborri.home_widget.HomeWidgetPlugin
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class MemoryReceiver : GlanceAppWidgetReceiver() {
+  override val glanceAppWidget = PhotoWidget()
+
+  override fun onUpdate(
+    context: Context,
+    appWidgetManager: AppWidgetManager,
+    appWidgetIds: IntArray
+  ) {
+    super.onUpdate(context, appWidgetManager, appWidgetIds)
+
+    appWidgetIds.forEach { widgetID ->
+      ImageDownloadWorker.enqueuePeriodic(context, widgetID, WidgetType.MEMORIES)
+    }
+  }
+
+  override fun onReceive(context: Context, intent: Intent) {
+    val fromMainApp = intent.getBooleanExtra(HomeWidgetPlugin.TRIGGERED_FROM_HOME_WIDGET, false)
+
+    // Launch coroutine to setup a single shot if the app requested the update
+    if (fromMainApp) {
+      CoroutineScope(Dispatchers.Default).launch {
+        val provider = ComponentName(context, MemoryReceiver::class.java)
+        val glanceIds = AppWidgetManager.getInstance(context).getAppWidgetIds(provider)
+
+        glanceIds.forEach { widgetID ->
+          ImageDownloadWorker.singleShot(context, widgetID, WidgetType.MEMORIES)
+        }
+      }
+    }
+
+    super.onReceive(context, intent)
+  }
+
+  override fun onDeleted(context: Context, appWidgetIds: IntArray) {
+    super.onDeleted(context, appWidgetIds)
+    CoroutineScope(Dispatchers.Default).launch {
+      appWidgetIds.forEach { id ->
+        ImageDownloadWorker.cancel(context, id)
+      }
+    }
+  }
+}
+
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/PhotoWidget.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/PhotoWidget.kt
new file mode 100644
index 0000000000..b1a0a9de31
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/PhotoWidget.kt
@@ -0,0 +1,124 @@
+package app.alextran.immich.widget
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.*
+import androidx.core.net.toUri
+import androidx.datastore.preferences.core.MutablePreferences
+import androidx.glance.appwidget.*
+import androidx.glance.*
+import androidx.glance.action.clickable
+import androidx.glance.layout.*
+import androidx.glance.state.GlanceStateDefinition
+import androidx.glance.state.PreferencesGlanceStateDefinition
+import androidx.glance.text.Text
+import androidx.glance.text.TextAlign
+import androidx.glance.text.TextStyle
+import androidx.glance.unit.ColorProvider
+import app.alextran.immich.R
+import app.alextran.immich.widget.model.*
+import java.io.File
+
+class PhotoWidget : GlanceAppWidget() {
+  override var stateDefinition: GlanceStateDefinition<*> = PreferencesGlanceStateDefinition
+
+  override suspend fun provideGlance(context: Context, id: GlanceId) {
+    provideContent {
+      val prefs = currentState<MutablePreferences>()
+
+      val imageUUID = prefs[kImageUUID]
+      val subtitle = prefs[kSubtitleText]
+      val deeplinkURL = prefs[kDeeplinkURL]?.toUri()
+      val widgetState = prefs[kWidgetState]
+      var bitmap: Bitmap? = null
+
+      if (imageUUID != null) {
+        // fetch a random photo from server
+        val file = File(context.cacheDir, imageFilename(imageUUID))
+
+        if (file.exists()) {
+          bitmap = loadScaledBitmap(file, 500, 500)
+        }
+      }
+
+      // WIDGET CONTENT
+      Box(
+        modifier = GlanceModifier
+          .fillMaxSize()
+          .background(GlanceTheme.colors.background)
+          .clickable {
+            val intent = Intent(Intent.ACTION_VIEW, deeplinkURL ?: "immich://".toUri())
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            context.startActivity(intent)
+          }
+      ) {
+        if (bitmap != null) {
+          Image(
+            provider = ImageProvider(bitmap),
+            contentDescription = "Widget Image",
+            contentScale = ContentScale.Crop,
+            modifier = GlanceModifier.fillMaxSize()
+          )
+
+          if (!subtitle.isNullOrBlank()) {
+            Column(
+              verticalAlignment = Alignment.Bottom,
+              horizontalAlignment = Alignment.Start,
+              modifier = GlanceModifier
+                .fillMaxSize()
+                .padding(12.dp)
+            ) {
+              Text(
+                text = subtitle,
+                style = TextStyle(
+                  color = ColorProvider(Color.White),
+                  fontSize = 16.sp
+                ),
+                modifier = GlanceModifier
+                  .background(ColorProvider(Color(0x99000000))) // 60% black
+                  .padding(8.dp)
+                  .cornerRadius(8.dp)
+              )
+            }
+          }
+        } else {
+          Column(
+            modifier = GlanceModifier.fillMaxSize(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalAlignment = Alignment.CenterHorizontally
+          ) {
+            Image(
+              provider = ImageProvider(R.drawable.splash),
+              contentDescription = null,
+            )
+
+            if (widgetState == WidgetState.LOG_IN.toString()) {
+              Box(
+                modifier = GlanceModifier.fillMaxWidth().padding(16.dp),
+                contentAlignment = Alignment.Center
+              ) {
+                Text("Log in to your Immich server", style = TextStyle(textAlign = TextAlign.Center, color = GlanceTheme.colors.primary))
+              }
+            } else {
+              Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalAlignment = Alignment.CenterHorizontally,
+                modifier = GlanceModifier.fillMaxWidth().padding(16.dp)
+              ) {
+                CircularProgressIndicator(
+                  modifier = GlanceModifier.size(12.dp)
+                )
+
+                Spacer(modifier = GlanceModifier.width(8.dp))
+
+                Text("Loading widget...", style = TextStyle(textAlign = TextAlign.Center, color = GlanceTheme.colors.primary))
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/RandomReceiver.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/RandomReceiver.kt
new file mode 100644
index 0000000000..39afd76c35
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/RandomReceiver.kt
@@ -0,0 +1,55 @@
+package app.alextran.immich.widget
+
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import es.antonborri.home_widget.HomeWidgetPlugin
+import androidx.glance.appwidget.GlanceAppWidgetReceiver
+import app.alextran.immich.widget.model.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class RandomReceiver : GlanceAppWidgetReceiver() {
+  override val glanceAppWidget = PhotoWidget()
+
+  override fun onUpdate(
+    context: Context,
+    appWidgetManager: AppWidgetManager,
+    appWidgetIds: IntArray
+  ) {
+    super.onUpdate(context, appWidgetManager, appWidgetIds)
+
+    appWidgetIds.forEach { widgetID ->
+      ImageDownloadWorker.enqueuePeriodic(context, widgetID, WidgetType.RANDOM)
+    }
+  }
+
+  override fun onReceive(context: Context, intent: Intent) {
+    val fromMainApp = intent.getBooleanExtra(HomeWidgetPlugin.TRIGGERED_FROM_HOME_WIDGET, false)
+
+    // Launch coroutine to setup a single shot if the app requested the update
+    if (fromMainApp) {
+      CoroutineScope(Dispatchers.Default).launch {
+        val provider = ComponentName(context, RandomReceiver::class.java)
+        val glanceIds = AppWidgetManager.getInstance(context).getAppWidgetIds(provider)
+
+        glanceIds.forEach { widgetID ->
+          ImageDownloadWorker.singleShot(context, widgetID, WidgetType.RANDOM)
+        }
+      }
+    }
+
+    super.onReceive(context, intent)
+  }
+
+  override fun onDeleted(context: Context, appWidgetIds: IntArray) {
+    super.onDeleted(context, appWidgetIds)
+    CoroutineScope(Dispatchers.Default).launch {
+      appWidgetIds.forEach { id ->
+        ImageDownloadWorker.cancel(context, id)
+      }
+    }
+  }
+}
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/Dropdown.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/Dropdown.kt
new file mode 100644
index 0000000000..74686ee0b8
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/Dropdown.kt
@@ -0,0 +1,64 @@
+package app.alextran.immich.widget.configure
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.*
+
+
+data class DropdownItem (
+  val label: String,
+  val id: String,
+)
+
+// Creating a composable to display a drop down menu
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun Dropdown(items: List<DropdownItem>,
+             selectedItem: DropdownItem?,
+             onItemSelected: (DropdownItem) -> Unit,
+             enabled: Boolean = true
+) {
+
+  var expanded by remember { mutableStateOf(false) }
+  var selectedOption by remember { mutableStateOf(selectedItem?.label ?: items[0].label) }
+
+    ExposedDropdownMenuBox(
+      expanded = expanded,
+      onExpandedChange = { expanded = !expanded && enabled },
+    ) {
+
+      TextField(
+        value = selectedOption,
+        onValueChange = {},
+        readOnly = true,
+        enabled = enabled,
+        trailingIcon = {
+          ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded)
+        },
+        colors = ExposedDropdownMenuDefaults.textFieldColors(),
+        modifier = Modifier
+          .fillMaxWidth()
+          .menuAnchor()
+      )
+
+      ExposedDropdownMenu(
+        expanded = expanded,
+        onDismissRequest = { expanded = false }
+      ) {
+        items.forEach { option ->
+          DropdownMenuItem(
+            text = { Text(option.label, color = MaterialTheme.colorScheme.onSurface) },
+            onClick = {
+              selectedOption = option.label
+              onItemSelected(option)
+
+              expanded = false
+            },
+            contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding
+          )
+        }
+      }
+    }
+  }
+
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/LightDarkTheme.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/LightDarkTheme.kt
new file mode 100644
index 0000000000..efdcc41540
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/LightDarkTheme.kt
@@ -0,0 +1,28 @@
+package app.alextran.immich.widget.configure
+
+import android.os.Build
+import androidx.compose.foundation.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+
+@Composable
+fun LightDarkTheme(
+  content: @Composable () -> Unit
+) {
+  val context = LocalContext.current
+  val isDarkTheme = isSystemInDarkTheme()
+
+  val colorScheme = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && isDarkTheme ->
+      dynamicDarkColorScheme(context)
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !isDarkTheme ->
+      dynamicLightColorScheme(context)
+    isDarkTheme -> darkColorScheme()
+    else -> lightColorScheme()
+  }
+  MaterialTheme(
+    colorScheme = colorScheme,
+    content = content
+  )
+}
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/RandomConfigure.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/RandomConfigure.kt
new file mode 100644
index 0000000000..d0490c023e
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/RandomConfigure.kt
@@ -0,0 +1,210 @@
+package app.alextran.immich.widget.configure
+
+import android.appwidget.AppWidgetManager
+import android.content.Context
+import android.os.Bundle
+import android.util.Log
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.Warning
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.dp
+import androidx.glance.GlanceId
+import androidx.glance.appwidget.GlanceAppWidgetManager
+import androidx.glance.appwidget.state.getAppWidgetState
+import androidx.glance.appwidget.state.updateAppWidgetState
+import androidx.glance.state.PreferencesGlanceStateDefinition
+import app.alextran.immich.widget.ImageDownloadWorker
+import app.alextran.immich.widget.ImmichAPI
+import app.alextran.immich.widget.model.*
+import kotlinx.coroutines.launch
+import java.io.FileNotFoundException
+
+class RandomConfigure : ComponentActivity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    // Get widget ID from intent
+    val appWidgetId = intent?.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
+      AppWidgetManager.INVALID_APPWIDGET_ID)
+      ?: AppWidgetManager.INVALID_APPWIDGET_ID
+
+    if (appWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
+      finish()
+      return
+    }
+
+    val glanceId = GlanceAppWidgetManager(applicationContext)
+      .getGlanceIdBy(appWidgetId)
+
+    setContent {
+      LightDarkTheme {
+        RandomConfiguration(applicationContext, appWidgetId, glanceId, onDone = {
+          finish()
+          Log.w("WIDGET_ACTIVITY", "SAVING")
+        })
+      }
+    }
+  }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun RandomConfiguration(context: Context, appWidgetId: Int, glanceId: GlanceId, onDone: () -> Unit) {
+
+  var selectedAlbum by remember { mutableStateOf<DropdownItem?>(null) }
+  var showAlbumName by remember { mutableStateOf(false) }
+  var availableAlbums by remember { mutableStateOf<List<DropdownItem>>(listOf()) }
+  var state by remember { mutableStateOf(WidgetConfigState.LOADING) }
+
+  val scope = rememberCoroutineScope()
+
+  LaunchedEffect(Unit) {
+    // get albums from server
+    val serverCfg = ImmichAPI.getServerConfig(context)
+
+    if (serverCfg == null) {
+      state = WidgetConfigState.LOG_IN
+      return@LaunchedEffect
+    }
+
+    val api = ImmichAPI(serverCfg)
+
+    val currentState = getAppWidgetState(context, PreferencesGlanceStateDefinition, glanceId)
+    val currentAlbumId = currentState[kSelectedAlbum] ?: "NONE"
+    val currentAlbumName = currentState[kSelectedAlbumName] ?: "None"
+    var albumItems: List<DropdownItem>
+
+    try {
+      albumItems = api.fetchAlbums().map {
+        DropdownItem(it.albumName, it.id)
+      }
+
+      state = WidgetConfigState.SUCCESS
+    } catch (e: FileNotFoundException) {
+      Log.e("WidgetWorker", "Error fetching albums: ${e.message}")
+
+      state = WidgetConfigState.NO_CONNECTION
+      albumItems = listOf(DropdownItem(currentAlbumName, currentAlbumId))
+    }
+
+    availableAlbums = listOf(DropdownItem("None", "NONE")) + albumItems
+
+    // load selected configuration
+    val albumEntity = availableAlbums.firstOrNull { it.id == currentAlbumId }
+    selectedAlbum = albumEntity ?: availableAlbums.first()
+
+    // load showAlbumName
+    showAlbumName = currentState[kShowAlbumName] == true
+  }
+
+  suspend fun saveConfiguration() {
+    updateAppWidgetState(context, glanceId) { prefs ->
+      prefs[kSelectedAlbum] = selectedAlbum?.id ?: ""
+      prefs[kSelectedAlbumName] = selectedAlbum?.label ?: ""
+      prefs[kShowAlbumName] = showAlbumName
+    }
+
+    ImageDownloadWorker.singleShot(context, appWidgetId, WidgetType.RANDOM)
+  }
+
+  Scaffold(
+    topBar = {
+      TopAppBar (
+        title = { Text("Widget Configuration") },
+        actions = {
+          IconButton(onClick = {
+            scope.launch {
+              saveConfiguration()
+              onDone()
+            }
+          }) {
+            Icon(Icons.Default.Check, contentDescription = "Close", tint = MaterialTheme.colorScheme.primary)
+          }
+        }
+      )
+    }
+  ) { innerPadding ->
+    Surface(
+      modifier = Modifier
+        .fillMaxSize()
+        .padding(innerPadding), // Respect the top bar
+      color = MaterialTheme.colorScheme.background
+    ) {
+      Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) {
+        when (state) {
+          WidgetConfigState.LOADING -> CircularProgressIndicator(modifier = Modifier.size(48.dp))
+          WidgetConfigState.LOG_IN -> Text("You must log in inside the Immich App to configure this widget.")
+          else -> {
+            Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+              Text("View a random image from your library or a specific album.", style = MaterialTheme.typography.bodyMedium)
+
+              // no connection warning
+              if (state == WidgetConfigState.NO_CONNECTION) {
+                Row(
+                  modifier = Modifier
+                    .fillMaxWidth()
+                    .clip(RoundedCornerShape(12.dp))
+                    .background(MaterialTheme.colorScheme.errorContainer)
+                    .padding(12.dp),
+                  verticalAlignment = Alignment.CenterVertically
+                ) {
+                  Icon(
+                    imageVector = Icons.Default.Warning,
+                    contentDescription = "Warning",
+                    modifier = Modifier.size(24.dp)
+                  )
+                  Spacer(modifier = Modifier.width(12.dp))
+                  Text(
+                    text = "No connection to the server is available. Please try again later.",
+                    style = MaterialTheme.typography.bodyMedium
+                  )
+                }
+              }
+
+              Column(
+                modifier = Modifier
+                  .clip(RoundedCornerShape(12.dp))
+                  .background(MaterialTheme.colorScheme.surfaceContainer)
+                  .padding(16.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+              ) {
+                Text("Album")
+                Dropdown(
+                  items = availableAlbums,
+                  selectedItem = selectedAlbum,
+                  onItemSelected = { selectedAlbum = it },
+                  enabled = (state != WidgetConfigState.NO_CONNECTION)
+                )
+
+                Row(
+                  verticalAlignment = Alignment.CenterVertically,
+                  horizontalArrangement = Arrangement.SpaceBetween,
+                  modifier = Modifier.fillMaxWidth()
+                ) {
+                  Text(text = "Show Album Name")
+                  Switch(
+                    checked = showAlbumName,
+                    onCheckedChange = { showAlbumName = it },
+                    enabled = (state != WidgetConfigState.NO_CONNECTION)
+                  )
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/model/Model.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/model/Model.kt
new file mode 100644
index 0000000000..2337de0612
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/model/Model.kt
@@ -0,0 +1,79 @@
+package app.alextran.immich.widget.model
+
+import android.graphics.Bitmap
+import androidx.datastore.preferences.core.*
+
+// MARK: Immich Entities
+
+enum class AssetType {
+  IMAGE, VIDEO, AUDIO, OTHER
+}
+
+data class Asset(
+  val id: String,
+  val type: AssetType,
+)
+
+data class SearchFilters(
+  var type: AssetType = AssetType.IMAGE,
+  val size: Int = 1,
+  var albumIds: List<String> = listOf()
+)
+
+data class MemoryResult(
+  val id: String,
+  var assets: List<Asset>,
+  val type: String,
+  val data: MemoryData
+) {
+  data class MemoryData(val year: Int)
+}
+
+data class Album(
+  val id: String,
+  val albumName: String
+)
+
+// MARK: Widget Specific
+
+enum class WidgetType {
+  RANDOM, MEMORIES;
+}
+
+enum class WidgetState {
+  LOADING, SUCCESS, LOG_IN;
+}
+
+enum class WidgetConfigState {
+  LOADING, SUCCESS, LOG_IN, NO_CONNECTION
+}
+
+data class WidgetEntry (
+  val image: Bitmap,
+  val subtitle: String?,
+  val deeplink: String?
+)
+
+data class ServerConfig(val serverEndpoint: String, val sessionKey: String)
+
+// MARK: Widget State Keys
+val kImageUUID = stringPreferencesKey("uuid")
+val kSubtitleText = stringPreferencesKey("subtitle")
+val kNow = longPreferencesKey("now")
+val kWidgetState = stringPreferencesKey("state")
+val kSelectedAlbum = stringPreferencesKey("albumID")
+val kSelectedAlbumName = stringPreferencesKey("albumName")
+val kShowAlbumName = booleanPreferencesKey("showAlbumName")
+val kDeeplinkURL = stringPreferencesKey("deeplink")
+
+const val kWorkerWidgetType = "widgetType"
+const val kWorkerWidgetID = "widgetId"
+const val kTriggeredFromApp = "triggeredFromApp"
+
+fun imageFilename(id: String): String {
+  return "widget_image_$id.jpg"
+}
+
+fun assetDeeplink(asset: Asset): String {
+  return "immich://asset?id=${asset.id}"
+}
diff --git a/mobile/android/app/src/main/res/drawable-nodpi/memory_preview.png b/mobile/android/app/src/main/res/drawable-nodpi/memory_preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..97aceb3ef6a1f91071af9c4f444f0f77254bf255
GIT binary patch
literal 246192
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%0Dn-*Y
zdC4QK;j#ppy3P2Wk6*VgiA`7Ya9^|ADn9@8z}>E(Dm|Yb8h-Sn9Y6Y_r78@=aY5ON
zrta8pwv5Y+vxZ&QuxT6CbZr48yd|WF)ml2Hrl74Wv^JE5!#a&Mie(nY{NaAfepk~}
zj;g6>Hzg#^>&r<ribhcvmU)SIzx+?;U;OL8`!7^g`IqFy7Lp`M@$%uB-FC}74&3i|
z6wVMspeYMtO3XR^Bqa%a=%*1wVhSsl(Tf$vI;;{rYFkzmP5^0FldsPRmb$E&<I0*9
z$k$tB@qxN3S!OR}flB5bYgkdqU`)xl3<!cB+OEU<z&!hmZ)sQ-LHn*TX7Qi8LG*oC
zSmu?@wq*^_bsc3{$b*@zSd#hyln^joAufNd4bwcyaD4rkzxPq${!tx&tz7zXqA-$z
z{qlOr0z8T2LS>ec54Y6heBx0x0^D1}$4et6gP~yPCk}@@`tgD_j%k!zOsqcFTUj2`
zqOwf$B-^iX$@(5?FO(86oX}N8AnCnSoJz|8{Q7yE(X2typBG+V2A-cURCPhqi7Z2g
zv)7rNED)~dcNwzFR%=~h9wjnLTWJaV%fjKXXPzVhx-3cxR|s|0fU^Z}-dLQTc{sG(
z-C2I^R}TEvuiW$Ln;ph#{^$Skf8~ciedKgfBt6UVs|>Ht11ae&XEC%*DOA--=mN_k
zE$O_>nHLY6ZADSRI4z_UbA_|g_aj#VYEfiof)T^GF^0M<Noge^muOoz9PVq%Lb1$)
zfEJ1P82S3!7f$_xu?3HhTS`|^m6q3+BOjj5L_{4QvKjpvLSc=fDy4lV$9lzV?l+mH
zTGb85lPm;`hU2McUK1&bm8aWiHl309HLWo=Qsf9etu=@3hR27BU;gC>Hk%5QB7PjO
zrr`eWfI;!$>6u{(`MD8(e_5D}`Y{kC+cAN7lY?{|0NtjhC=@A*CNd!sjN{oeF9BmL
zMd7F#!EJ{%{(bW|{@FkGub$7Bf9lIGzhqqlo6Ux@u(YkL+OH4Yyo?lughHs>3oCtX
z@Dgy^RSm;9vnIpr6UjK7Q4~fZf~=5D<hGjUn>}L6p%iINpbY)6Fw8PgoW_}Uvte9j
zl1gmama3|WDH3C#E*#rUi`L>7blE-v*~hiY%U0IHzaoi1@^b0LGGH}{n5zi+Wlht>
zet+O}Iz!5l^$8S?;ALi3*N(DqIYdHn4W0O|SoF$*_hH7B&|l7^>>Ir4vy7o11cwrQ
zybUR@QBGozt(j-R0`2x2){r<~MyAmV)>+HEY8;lEiCSXL<U-L}Q&u7xtg4!6l;7Qz
z65*V@#MdQ(RCw32UiePen5mQx8}EI#S1fF{EvS#t=eNJVaCv+5F<M<(@0qf66s5Qx
z1kJLbP=X?gD&u@4z@gg;;p22V@teQ#mN)k`cRPnkf&0y#!d4hla=-8R?6VC^F#KQt
z@Ey|{7zWQciny`uDmJZ13arza^r}HC=0#*LRaMF2ph#@DEkmxr%fc{E9_uWA@i&c~
zbtbp0DN6}tsC~sJFUykCoW!zIIYrad#H4vXPUxzWkl-NC#mjTgho=#R!3Qq@$~?dZ
zIh3wJ5%z{5{&-==u-@br{V=fR=P9ic-?ezp<3r2a$CkHmHatGGtazM}!#5#cA48%l
zOUkn3d>N=K!)9aHZ5xiqp5Wyfh$)GzAwgl}_oPjclcRl}tI2z<lnl_t2Q8YnaT;MI
zLmUfUUwWn`YZ()?Z6(ZiVQl@8`OClm^M7Nz+5A#n*BDdq|Nf(Y%<0(k`tm}Zo#gW}
zvxb??rXzSy3?7wMqO!c6Cm_<cElUteflez*MNXHVB|r!ZRar_-TVXT4MG=CmenU)n
zR%S0M=F7Y=dM`pWFJYsVF}K9uZd(!4Lf4APGp>=ozfiXu>5&z5wWQBVgu9~JKvkEw
z*0CrYA<S%d4Jm0-v?vwX@3-vt8-~8;<@t<p1;$$DVPOuLO`Q~BiG(#T6tsjAjHBeQ
zC9Q8sH>ES&KkleoN77;<_Upp5EF`or=_@1If+&JtSmSy-cw#n@7Nw!<I;zqUyzqsZ
zw#va75^QiS`P;U=J;2^ei&$iXY78;YrDn>uW?DUCW?U7vU|ogGAqsCN9HZ<a(Av<{
znVPCqPM}%oFFqrkGvQ#0S?8rN#<9$z%QD7g7XF%zv;l2aE<<3R(#=;Y7moZLzxwN+
z@px#M=D@ZN{P0c9)L;0OpZ<(D_XlDqh<cA-9UsnT9zXwt|LVW~-#863eIM{4vV@ho
zv=oIQMHwG_S4Vdlg6Py5M_q}hF8CE=^5@r<^RNgEFiNGLNW?4@cCNrWLshmI<GA!Q
zjdOhRxaalw446!QRlND+6VBtvyAMa4t>{k|>bB$IaL?=MLQytswiWw*%dh_IbJj5O
z+DmmPnSnXpD_<U<@G-H31s!DpKn_?<fL}eXfU;1KR+`dM7BYe<to%Hz77v86vZR`Z
z1&k6zPf+Nn*zOzZ(z5sy!)3wGvMgDah08cg_$r!VnmG+4ewBl@Dh#f0T>1g;JqAnH
z7Hl?-!kRpoPi%J$=d*CV`hLJTMO6ve#e0uYmSvv5HGlZKKl`^8yq%^=W>QVb8YFY?
zbUtF8+{|@V^ZI(q^9zf0j;EKiq#ai-A3T9J^Q@v$gapenQ#i%0Ylv|r22Wj;9FHef
zB#9WMvc^P)**>eqlVo0@P!vYdwhd)jvMdYx{Z0m-eNR=j6lKMSmsd!Msw#N6zbB={
z>^;Ur%0@)1SH}2~u_)VZON@!r>xH_OTioQp)_L|MV46lr#mQ}&&Z)PkkF4t@&-$)6
z;q`wZv%iy)!>7%Bub88_q!O{WhtX9fg)MJ9E~TKV3#!Ud*EJzbY`Y!D(*+;=$M$x)
z>c{vF!ser0NYaE#rbU$H>naZXq!e{kO3<kSV+9jjmL=DmKJO(c_c~+i+Lrz@Ffa1r
zOAeu<C`}$Vi&5A*@k-9ql0UNubBz(xuB_EP{kSmCft1$UjHRqf>bfLyM(c$)_gjAY
z#RH#ya*wr^m)94mTwTp&6vF7!(-VL1@BN>wljY~X`G#-5K62P?DXkcujd2o1r45T;
zK}oA2q*h1a<g*$hzn^g$Gh{N|kj_`b^o=wMMDMe`L<zW0X)eQ=rmJ{-+|zWHyKO^L
z)hs?TjNd|Ga{vG!07*naR5K}QX?a}1>GhJM?Gk_bC+`>s&%38rzI}QnDMvrfND7ZU
z5XOkh<NCAG8tT&V_-0GjmS|hhkAonZcQr);ZysCTesW;5X=uBeWsxMQ-FAyLqQP5z
zU>YWjaTLyxVq_jYRVj3n^Dv@q$Lq1jhrsD{!RU&RWWc^=^?XF$3+Ehb2n@qS(>4Mi
zunyw{Lb=SIP1oTH$N4<nc=*~{S?V+;+fBzj&&*3ACI<6Y|KR8U&YEK5ec%^g{V7#Z
z@bGXz>BQmwj=mr0F9Q;@CX6Dj4If^PocfVn+fg}-RaSavB||r@G#codf~K~#Wx?VD
zMIpa{fME_R<2<9CA+9SiK~Xe}!z{?+lxWMEu5G#7Z?nC@;mU#!&o8*5z*t#DD<y|w
zVKr4z^86ycM;{|iSD|dg2ce#dGFtKQuqP$)NI~AXI9U}hv!`ilQVdwD8AhpmNU}T-
zU5bGBW0W;;QW=>`6uPE@qH+|K@Rf)_5^K!R4;bT!NsPGOueX2=Yb-GYeD(x}uu@er
zT#acZ23Y)hYu~D>Vw?udbuod;!+Y{~0zL$sE3#T!!di!6z`6o!63$8W3+cw|n&+8$
zT0|aV4Ru{JjH7IMmz8mpDp4VaYf*>-{3EgAYBP%BHT4p{>s$d!b2{}5!xb@YGY!IK
zcwe9>43CdBZyq<S%ZxEAbMU0Ja@ao*Vm2ffV)$KSk2R5>{Op0pN6U}Dc%&@ha92~5
z9q*o`+L234hR{-Ri)}1MNzs|-S*kpxa=Mea2LyS%W`LdO360UTbuEsIVZ4PhXk%Es
z&j*B~Z5k0;e|V8RLt|*Fiu2`+wH05#f2Qvze(9$_=IgJYn0;hg62l-lk14lyBHfUU
zt2ROb-86#7sVjN*-@l#-api8`vD;O2ZONt+R=qZI%B~Su6@K;%W1ly|p0>$pKIyuC
zQMAnlYYeMWeEa@_b0xcd$@x4mjbg~YZcdlHe3J2j;CUoJL5aJ=CbpX{XAcOsOyoC8
z$R9B?6k?!lO3vpCpcv=KGzVk;;-CM~zlTzkRmqz-kC=SWEFtjq*I!E%lX1M9E===G
z+cr$&BwoL$xcE_YGHawCr+nfonySDV(dZausSC%rNW}MfTsU23X{9O=c1n5aQOJx5
zr3I3g&A3*pthXYI)3gBSQbH+nYegR)??r_h<?xu61#K0|$qj}w_|<3JjHEMrpJ=<5
z%Vk2V#BR6el0}#?Cd#6uZcD1t<=0=~eGvGXv5XnNqOCy6zMK75RxWenVVM>RSKt@V
zHQ_m|BF>CgR+bM0FY^?E_<?nf{jTBh;Q&OYDR8-r+#T+iXAz2SHZAA#z_P4@=qXG3
zVa$h<RIV<k?8aQK$0$JvRasJ2R$7Bw%$den$2bcAN^6-}7$?=VF_u63`W<nVEuP6l
zSlRT28+|o|bW7ohF;TcielN4cbIsn1Cd!J@{c26BtD3SXs4Iimf?${f$Kwl!yNzTn
zmaY69(TNpALtPoZefOSWSnz&iv+bCMp8w~Mo+OyT2g<6vS!Ies1jEK?t{k%)Pu~Z$
zzH<F#{#F$QDHA?bu1G;%I%_P`B=f<dkicH~xoD<w!Us=XH8f2_@QX0sNrILs8>-rI
z*tfK8%ggbM5MlNAEMO^K({nV&YFuF;ddkvJIzv^~ynFvlQx}w_rY<d2DV2^fny%Y$
zxd;%jFyOL|uxYA%d0P5m#5sqtl5>eRocasXw2*@0{_&nU3^-f!@-h(NW`g!1$JFJ)
zy|@~jbQw`%*yhFKeGm*%SV>7*!#M<&MV2*(yDsa)5=z;uK+vuEgWvh--<GJNmhE=K
z`E=xRy6}3upp>C$D*9n!x8LKJg%|>d!yV%|Q8%p&-Pa(g%T3GJ_q3IxE)3hQVa%|#
z7(7Z_d`K)Iv4j<)plTeiFC$f1$);?{Ec0v&(N<Kwei~W)l#P)ibzP$r%+s9h58^xO
z`=005BgTr&B9bvFnUX4oY-v48SKdM(%CaOy8FY^0NL4ji<Oahqv8I`@dW>-&Tdus$
zwN7J<;^DCqWK58X!WfIO5`OA^#A-{5F>}J?1(~M#Mt!(OLm4X!Z;APms!}VdPRD5^
zMG*~3lv!dN2l+fj!?FbCWudBsEGkA_(T~Z)F2l@l6}pm`Gv{Ar&bJ&$CeP9wAp|zt
zE-x}lq7Q)Pa-LY`z_`q4V{t}+gphI?QN%g%DE1d=HO}XO)9J#wzc7h+2r}t4T?wyw
z7NZo5W6x$&bJ&zvt!bK?`$LOLnt2wgLA$x*a_Q;&Gv1GU^68GSE>w->>u*0$xQcgA
zk#Q9Lm{wP5fH2O=(&g$Uw_7*gqg*P|COSFjjbogb99I=kq#Hl#x=`ubmfdd08WOLs
z16nCIT|?7K@WkR54tIB)&S#pg!)V7>-#qd5&5qr!;dmN2oqMTH_(=M=Ztt%D7^7+G
ziZ_q<C?(N$-bdoHihH3jSR-n80aH3Yd^qvp>4<aCwE_W<WE)K+F^p5zgGzNZE-TaQ
zMeCTfyi8%{`Srx?;pMp}qO+P^bdFbzSV~FoGbv%Mk`5(rl3jkTK*kvgkq(6bO;^x1
zC71J=gvkNPih1#vzxIc}`L|`RAb|jzuH*gtZ*Pw5<MAllKrOV-{k9`T@&2gjshq)C
z8E_}1=<0&DDsDGbKTa~Eib_EHLAHN|E6_R-lE>nxDvh(2&89)vex6NRBQ8D>tKA*8
z8F?d)@2V;o`i1x3yywls1B(~Kq%mcdF{~t|s2YbYG=51L_gvGo4VTLx_7i1zJ)b!Z
zvp@-}g7fJtH#iBuO52x$qAF?>in^&eU9mPO%Gz+ZtEelvvFo<PIn6ML!dwQ`8l$eQ
zQj$PdEhrMP=*aitoXuOe>&+hMhn2Ap#Avzn7uv4OdLYgDG*FZkS_!9IX~Qs2a$qV!
zydbo|JZR0TY1FMX(nd?ta6V*2Uls{r$pj9~FaG2m(-5e#-^^-<)g?<55p7jix{b^#
ztrgC`wF+Z_WGTy%<GH8pI_kR4sz{+z#%x`&*5FFZkACz>*C>wX6Q6u~&u5=)*t7;`
z9pAot;`#MLyWMi?dyZ$1a}~=xa{qA0pMCRzfB1iY;Q#msN808s|NGzniVrVC{$4cm
zv}DAyj5tt=!b;vGF_FCBrmc0NG}oG@uH{fwF%wh+yWKXM=Cz0(Nob=XCi=^T-EPav
z>oY}J^WnoYPftf)Ue1)xQa3Gs{HI?N0&KT6%QVwpdYZQ3!}FQ*sVBvh<wWr|8@<}x
zB!)||={C&sSuU!1CMLzQ3Q~HFo~CPsFd8!A=Xhqj+u;nNk1~d3^4T3AI;u56S&3h8
z4wB@Ivh?FjX)Df`k*e)LX`Y`)hG~)NIBV_J9PX>MCMoHNoRQ}~_?e&n_<@+Am#(N7
zrkSv=RIZ?I9BpS<29LHC!!Qw6*-&evF@NFDeg3zrO146$(}^_%io!By)Wgt^x1q2x
zhN17X7faO9iw{z6X6;Aqj38-p$YaRg)N39rk`gMZoIR*%D{zIA)-eUzs$dP$CaAPh
z7MAEeDw}tOa4AZ5S@~C(d;o;i)6}h$rCHhTW5N~!ty`9eG6HBD`hm1+vG=6FxQK~5
z_=UUu9+F|`7a<{(PFC8+GL2&vHA=OzB6gIjhSCWwLfec`Mz(ov)82;jWl?5|!N;g?
zd0{~(CBj3U=U__R4mV@u&a3N!?XIOL9d%Wsl%~(HwwNoZVVv_;&SJE>xfHI%M}5T)
z=Rtp5bK8*;RavvfD6L~&E6WR_83)ho16o7dGz|UBI4-xmKcgh$QSuM1R3t?X|A<<G
zT?-321z5bAK4Vj4<0XoC&}QKWpH%$nPY*2P#B)Eegv2m;&i%@E+c8fgF-Fe41aUNV
zi4UH69C`P&@bt3s{4((FodEeZo91Q&mcPs7??EPgSGf(yY;s;a^DKvNSvuikDUk@2
zMZu-N<p18>0DHy=YGqy|Dco8uBw6E7+F>p1?>4-Deq|U|{y(nXY{{}Dz0Ui5*z*}<
z$g!rbZZt?jARtOKNhX<Oy3||M6Y@?FWg-ZmyKBgZj5yPteY?9Zem^G@OtZY`uCj`V
z6MMV=!&={JstuThsxYiJ8^*C^y{Z7uc3ab|YA)yLriHuyxweIMU1C$Vr5N@_zHvon
zUrs%XLp;1%+V@pmQWf$uU6%xWRduRp>8FWv+mUC5coxT)Y*`b(JfAt89n-XMX$MI2
zYdHhb7{glep{DO!Bg?K$lk@#|Ysyk3X~&QPU_`Q^73?=#4wnv%WlD4i9|Lt!V*cm9
z{q85FBb&{dp=+tjlJlwMw_k;&9yItE87@O=aWaXV51?(vFwV?wk<frlr(08`7n!xV
zMS+*wY;sZ_mW8Z4gCBT&+)<f~d0MFQ`j%%_WaaG;3_(dLilrOnu-dE}rg7ro{+`u3
z$9u=q>k(s(q;b?Mx_)4C3j}G?&?@1KB@Rg}2cBtMaMJ?bLI??YGNZKUofHZ;FDzbS
z!et;UWQX8`@Re#2)Xs}%7(7ESs_Lp<G0ii<3*3-2gSZ;2-RyBntSL&1k17V4T`bNa
zetR*EY7LuhBP=c-DD#ZEs^taqp1P?qR<J3v^MXlE>uQ4-WDQc~g|yKzTJjt-V?}_d
zr78?T2K~c0(N7XNudU(IcBvW?gL^-=lzEAF3+Jv+8?cZ#>>_8-I^*2-L{w6-yIVV*
zWtq$sokO81E6d^|%k261VTIB#jx%lNIUL)RPHi|JPdq+6@L&J(Ga(wPs-zpv{L?@G
zjLIc>yD2q~`-a2I!2Yhm=s=`ko+W4^%j6|T1&me%uW&J9GvPihiyS)Q0FbS*Y)nbK
z^1ybpqNy{A%%G!Z(=>@_P+=6}+ZzXzGBkC@W>eF414K*k654xzx5l}J&8j5JMDG=&
zLXq+M(h|aQvu#~lEs}_IoM$we5Eg>h*j$F^^W^EeS!lY!v)|={ellY2Hd+qn?RFz#
z?SRluRq`h;5u*&}wxwwr@M1<D=b4vJJzW<#o=1EXD#>+(K#*24Actd&Qrt(c`NNM7
z5(QUS=21BE=XNAB8oV4<3dQI~&c_*>8Ls&O<LEI)VgBaFyPvY6WSV9+>xSp&XO71+
z<2Z3?TblKnuI&h9ocn>?+N2<#B`V0|pyUP2GZD<yb;WAkq=&wwDhui=mraD%#OP=m
z!?tc%+=5XW=OaeLrY@;VS*hx%=qEAyibP^2D>6U`hILi4ZW@L`)X8O5aOpdSW#Q8I
zjA<Jr;iaCcu5Mup@;jH|xlY?X@tuhp-x}f2FW%#v!1?5Ala;m)vI{iUidr`c3~!zm
z>RM=(*4p&)2aJ|En@MW;YgD~L<6}rfcF2ruRGOy7`{lMezwxz{WFGE!JL;<B<>i&K
ztjV&Bt{<7FnW7W}v~#iykm@c_WEn=qq-<BWpXn-ewb|9k?UJcmF-@N1sbg`T%;xmn
zAfI>i1ivIF{}p;D1G4LY7r;l^Xu7nKyE*~950Y~@h~ZTRv?-4<T&o4eFTb4m`4`Da
ze7N5-4n5kyH}4(+#jh`2YSS0yX<-~Z=i|)j*fWli)#d@4Im)u3EDO%(K`cl5npz~-
zYMo5QK8j#hYkhMK$iXTy4AgZYVMJG0id5p^anF9Y;@!JPVpw?da7SGg98YJQllki1
z!<zG{Lu*T(ix<|ph1208g6753cC&<8p!oFk%Bh|3NFi{os$!JTGi@|gUSKWcxusqe
zltsns>m|`#J>P!!MntP#@I0tM-AH?zWjU{}7nV8V7IClSMFBBwb(e+RekThWsf)Rs
zM=mF6JtI*TLrLf?p4J7DukpGn*BaKVjP(}E!cf%;h2<ar%NbjUGoWcQHk(M(Xu2UV
zPqHkU(}4c!+OW|F{`60OVp$^FO~q!j=6t@e-`~*<BQMV<?(SD~moxJ`Fu06<oDc-B
zqU|n}rM!$TLY`7!%2LeH-6$1GL>}&;8z>tgn!Y|Axxd@Wntbux*EPy&Cby6qgH;e)
zxd90dO~6=3k(IbHFlsNR+brjB=s2EQ%Ccl!M&>2)dNNPlR9spo=olkz@@0wGyueQr
z&I=`=EOMCvhe)%kd3t)Hs#hEj!xtu&)dcTTbr#VXpd(pcG4zgk4vf>8y2_~=5vr=i
zFbB}uvP?5??p91bqKr^5GbJKXt4;bH>s!v9(HYi&Tjm=*;N!>dSeAvCL(lO%P%nmI
z=&&|pv)R#gEm}d5S&3Xyil7v`?G|f88s5(wjxBCZfwQTF@M&HUJWPXZS)EfvKP9ac
zH^uV%w{MunmxP;6OA;+iZlV$QKxP<IsI2%rU0N_KgsABU3CPVdE#68Wu-aji=IQCc
z_usu|yPqK#y5Yk2@9uG7Mp?M@6RK!r?zqbF(~K>0UQQ>fvc%?r|MZ{!0o01)<uk;{
z928b5R8aUJgX<-RTT32;Ca55qG^1H&`DY?qiNZ}QWkc<w;c%MJcn0U#)|S4XxO5Y*
z=bsZy(30n{-)}j5zTlTgRpg9AFA3(!+SPXA9O$}Hx`_zm6jFt;+_r8vT^(Sx;@#tp
zaqLh;tO*Q#mjW{^`?~_A9NNJ7(vs(zk4c|MS<|*7;~co#%K_#WP1_Evnt~-^o%_D0
zOu3D1JEN#jW=iN7!R@+5#uekRP}iEKDmflI&=wa(ueRG|JU*1H>zvt55G@}+ME>yO
z2b@2XWtL{OW}Gem_di@XynLqXWhYY<WpYa>%r|@e)8Yf;Ff$A-Wl<4BV6)!P^#hl#
z7t2n)64m=OCn23DOG8VWaH#UIX6$ww+#+*>h`Lo9MjN)<hV5p>%ku#rV6|S+T`tsh
zO_A61P6TR`lexs?q^-Cnte8v$dXw`kZl)|OZl36d8I%mbBcQDyTtkrPdD8Ijnw+AI
zsBc4%`GwewOcKyJvRoq>e>QDQQifr&naHNiOW<x0AD#@brA-u7Uu0J|MC;|qUPhWC
z<3IlQ|AtFHa_)M;rzp`fNm%Qbs;BRJRN{MTbM+=>eE$5xIF6zSHeVvKthGEpKa*wR
zCa~6|HM63$mfTv#VPsikE+YvuUnr|Sd<k3CnuKL(X#4Kg!rg2~sgn8<nXXdRCasiw
zcG8ZjRKb!yXO)D)F^Ur3xfv94!6-#lS{@&3e)!=Y!c6p{h5Ptn#qWRr$l*Bh{JEp;
z7cS?C$9s``48y|VJfO5>THfDnSv57k{_;d!uZiAc^wl7KEdUfzNf-x7O)etYATk>z
z^QjP*8wbj!^cx{Q1T;d`Rmj11Jjw5^EOH(m3f{agA$n}SaQ|r8?MjZPGfFE~>zvcE
z6IqX&lfhdvPV>#;bp1ZR#uka(#`59a14XIXY*s`<Lc2)yT-BD%rlD<H?)N+H?{}cJ
z%s7Koy+&JEa>c;n4Q<=Aq|8a1>6^7`N^yNfX&Hy<hLRD9Pq^Wg-o3pe%NO3f-GK7+
z-Ara9fB5~Lst9Nk&?>Uo6@35Q7NuG?+mg+;0$_IV=RaTQd!PJ=$!MQ8rRJ}{S^sqH
z6Z0(Nd_JSK;dDBs1Q3nU!UD?6Jn3vi{Fm7*iR=X0wq8}#O-bF9Xf2u~=K}LIk>w&B
zH7XFDr)wv=+0ir=CWR!N$A!bWW0)q1{qiAYy_s7NFaLjPGh9Nn&I?5$q=(nzk!cYX
zZ)P(&U}8!zPA_FhTe7SAS|#<fPY^wc$|`P9xGb|oL>Ax{Cz11rn_pg14N*XO%i<FQ
zNHk8?YW~mv?LYGSAHJt4GCsV!qbxMD3p~9XFxsR<WNuzPne&x5<^T02GgcVjiWE5(
zBW}Ke3uW^vs&)wga0wu1l;W;w(zZ`g6lJR5<lvoC2!?2xq}|!>8X^-94|g1nXNp`}
z)ku1QQ1Wu6Ht=hKzr1KFrL)L?bH08rMl3#l@!~<9W#;9*PqGSyM$vX7;~2o?T)Kz~
zp5OiOo`3qsXI>9yl+FoQUY}1qzPY3C2QF>kbRN=tW<=}2<3q!CyP_x}Ri$X^4edpc
zHacO1WvLM5Qi9uO$W;g&BeP2tuSq;~A8s74>wyAtU{|G~Sy_t0;O3d4P*k;{tl{mO
znpIO$)gt=Mvz#l}Dk32c*L=+Dko|fokiIve*`}?ThKQtEA5SM1ADE{_cwCuq=kM<x
zXfJ2lON)=1ZV(8fHD9**AqD{q9xqs%-)46qB)UbA3b`ocx$1f$2}h+8z|gYYu5e4o
z{X@-WTkz&_!#ocB`2C*8`;4kElI9&#mEU))Rx9#6OG~|s&!1a<{<UMA{7t&yQ`V;f
z%)k47_fw2wO76Oj^?J=T&kzH3SzvS~?)hu*;~<FCVHi<p=Ec)ZGfKhY7pkU4C;N`c
zEYmoWWtR13MSB_e_33~@(Ub*;wr9Iru}_2KB}BTmW7RYm1^exmX&PvUi6ux6t&I4$
zio8S_ML&wUw5&_U*)c8w?<4QtzU6Q@q=Ut<f7tW#`g&tng&+rX@Lt-05Yb9_+#wC)
ztGfD1wJk5(JTF8<0wP!zjZLOe5o5~6&o6Qyx@n>^@ZbI0zvkNyAIU64G*u-=@xJXL
zX;qX?H>eL^UXE0Gr8z6aYn7rCaByLo#@oYftW7VDVj3s3l5`!L>2w=9rfFgrCA7Aw
zE8OBxM&V{Ll<#&KKmPc@hmUKvo0?C*edhPS|3GFfLnjy;Aw7JNXvq6?#p_(Z)*^iN
zL0CsbMeylC)RuXgSg#tUNiH5unk6NyafmXMmoU$Xb35_;{K~uckBq~@`P`Fb1x2A~
znibAz2qIf3$`YUG6K-)#W57Gb;ndT$Q>w47$w5*fUn`ocMlMFa%m7m)+|7~`C5Bxg
zgL6<k-0yh%uHnsN&fR@MQ;VBIDabOpKtDg9F(wBkjt655O;a+@6aC;A=jle;xNheE
z+iZbb<hv4j#JXNdD|+$#_UV{7>J~*{o@Sn(Uzo-m=SsSEW|{?3c{*KCN^`jk)J=^x
zGFx>{u-}W9i@&OBSr|pBJOzPWa=J{6NvJGSHP6Gt3Y(DO)7<msal>|P@nHfqV=n^J
zz8|nznck(;`eHd9d+r~%DF?!*ueorI%rn1xTl@s(_Kg5v5{`qX>l2kBw~WJ#QaO(g
z4}A08d;a|MC$W5#BKjPbi2%6CbGh_H1x;1S%wrlE`Wd4XhqlEb9IN1GmSyD9^;j)^
zc~jNod5(^-1dj`F8OEe=Pq}{~vIIfcE^g+0J`3G3J**);Xy1JE4VTM>cOTzzI-PE&
zVxbiXK=1mn8l76g5HQv-yID4TG2Sq~bzaer6A`g(IOkb{+;H<eC2L8%MK3+v?fL%O
z_w2SCh>GoYMGTR@{QN6_`pYk9Wmz>VR0NwFIryFUDzA|LYddhgb+7gj?>+nd9;Fd`
z&NShcg=rMnoH5cCD-_)@G9@9cGKMVA(P^$Fs%9%N!$NU)x27yDRh9AM_wU*5_RN0Z
z^XDUO{<46$Eh4yTguV{$NIu5&Z!BKClh#U1{WQ&3Yv}tvCF#Ul+j+ITh*DlQb3gw6
z4S)IbD}VJ@AKC5KOyk1kGN3eMnH<iZiLe-6U(bM0B|blQI2ZZt(}l}L!Yw5A=*!=)
z=^EFz_xks1`UFU-%-6G|Yub)TgF5c-bLz%OMQQ{0_gfCHXR1n2*=4aIM$7Tg$^hRW
zLf@h!Bz@nK7-`qv{k5{Xeh>2X4c2I?y5#j)vO1Tz@b>*KiLb>!>ixpQ!vmj>2fCrB
zZzJucORe#O))~_{r{B?nF*)<(B%wXe@r#JL=UF~Cg<-v}(bjW3jrbtzBBf$VS@&s6
zJ);$@HX$+dWFcjYrmPBzT&zl~)tYhWQOYnZ>AgI49FLB1N<q8n=T%B!{>Q(5^V2vl
z5aHdMJKQ{B^p)={S9(+AEMB%~&U<Djh}-Xf_=ah?&<=uM5rHSvbwgd3WO>Hvbe8z4
zm~*+b43lGVUN%J2#CCT_nb+b8%LLSQyo`+VER}<`#3(wQ*#NLXPrfZ=T2mJ}+jYbF
zB-<mh9G66vLSK}5LRl1qu#goQnGv2>h@um@Rt8$DbUOs13TQ3fKBB^V2uqYXkC(F4
z*bJ><aZ@_nWyYouwQ!#2_~=<xId!2q9Hh0*tfg76m|f&>Z29wFe&ui($jg$&%g?&o
zZMa+pgw*-v<@x%ibs^G^BT<X+*m+@;`DLLW7V^AAD@A6t*iNjb$aG5AwKR2sih)ck
zwsp<Ww`{j-0pwYD_hFB<qILV`<M%v$K4OgK_4Q0$)iiaLD#C!V8luQZTnyqrk~fN|
zWR`e)*%g?iu^Ojq8<^%oe!1a&Azez6{3RkrV?fVrwk7v(Do~2&=L<1mX!0yWDLEvj
zVa6|kVUDzYAbR0{g^)2NOOa1Tds1!i-?m;~w_n!->+64h&F;Li{^gk)c=xbkyDd^6
zOJca6JG_U(VPIJ_<K$AJk7ijk(*Si{&@>g7OHZZ+pMBko@zrOjzEa}HAi`fadFBvk
zHU&R^f5&$p*8Kht_q=(tCeL8i6nuEMC&ZEdGSiJCN=uG`wK;u1GR}@+5?RFIa7Gy~
znF@m>5B0-{)_LOB1*SQ0I!(0gL=3V`_KPRe3l9$~q7scnWeqBLqMDN)O$5~EQ%h8q
zws%Y}60lr)$21|HLMNo&%v##Z0I85rN@4!~kK3O%>qdeH((NYh?a1Us)oc_*ZRmyp
zAAJ%l4k$eLcYDsm$TUxsx%@Zo_B*C=AV#rRNY&yb6muG>iVSNMb=@#eGxIcJjH0Y7
z+HS-J>E-|Gul|a%C}cQjEj~&hYn~gXdEmpx_l$1D#0bGlm_Tlm$56y;T5I}I=&0m^
z;Mo8GAOJ~3K~!36#(7E_q(n+ckxkb>3YF-XA<dSqx2-`bn*@#m@$*SvrjuSwYx$aZ
z&%4JxfB5kO+oqwmmSLLMY&IgKEpqyy$GefL5R&DtUQurvUOr1w^)+<h`oLZ{L${!c
zulU~6JSSU&gkr>GZxKsGMxJLfC{8WV<KrDlc~(uuZnqW#>b%g810l@Z-EDaH?k#QG
zrV!eK?RL-G_gi9c<hiD48eU(|#I)WHF=EonKaH^e)yr>lO_rHkRi^Zp!{Q5}Ro}kH
zEXyR~X|4J0yA`{AgS93}4K#h{l14936e)P2YZ=FYbI=WrX_j2evMex}LhHbff4IlF
zIniR_x=gwL`MUM`Z^LlECdpnG3|ebeYsKSZ!~K0NzR?hq@?FLk<G7^XgQaOi&Ons8
zu~w3bJdPvIMcTHftQy)@TJNt9tE)BV_FM$%igvq#H*ah1?<|jx4ckr4Joc<t75iPu
zy0P5dt$2J~bLnTgZc6eMFIJqCLT%GCx8AI|#>`#ki{g6lEPm$s(}l}rl5m&Qx@xVt
zzb~k2jaCaym9g8dP&(2y;tp9Bag6MDcN|Y6&MCs8>G~P(4S8mGeQoInM^)xnZFoI&
z1a&oHgZW?o{@b5QTgr<)i0QE`3;J>7)H@0!(SqoO!4sw3S=_=fNHt(H&)81_{R@t|
zDk!pyp&LcGnEW+)ky8}8q>^~q3X#h0Q#<qWdSSb}Lo3KKuy&!)h7TX!611W3TB=53
z$3qm7sS6A1BBw4(w9T1aU|s@C@cd8z%m0A2n&a^xt=r;xxZ5$012F^%xmY}ImH{e8
z-OS%aS#1+#;BR#rh^LoKd{FYh*i2qV6)k@86d4q`9O`ARdHen?RberO<PjbY2R{A!
z3lF<3?dimJv*lr1^L)BU3JNLEG=`fF==$PlC8AQDUT%S>8Ni^8&{UN&;@NZ_A3WnU
z2^XozXqudNZy(sM8=gPEFpdkERU9rI)@VL_*izP_pniGz%r_suqpAvqe&+epk>j!B
zaP0W`*H_%lVK2}(oerrqen!P8H)WoSWkqfTK?q0Lh(;ny&{9#E6tqfYb|X!l^X-Rw
zVhj|y#)p}QyFJfOFT^BXt?Nc4Gd?hTP1i5fWs`C;gG6&hv5^@K@87S<jLefX2=Gov
zV*GM&ebI`2A;*4Qg#m;`k!O~&gv}~ry~(Lc#1=I!#Hh)Pv_@rFkn4<>PY1LuB!wy+
z1bHs=$hLF*`sv6t2l_!os@FsR`gOm)z+_;baeud=X(GFQ&YSHW(>O48BUQbkEDNf_
z2*++-&<M}X%_5SHI<ncX&?&xto<>%y8f~QWnCC_2u+CwNT<9g<GxmYSC-{JuVA}ip
zhWmYq)`9)Lrl~AGIGl@gt+*!U83LBmWni2n^U?=!2|;u?PYlySTs-gI-(w5UdcCGS
z$c8c+h57qGzW-@<LY|!FnayUy@q8j`gI{1>71VWp8?aw<)<Tq-#j-5P|E39(6E}M@
z_#O^Nh)Tqhi^pigX0u_OX7LCG;eaa@nU}y6G(SH*GfWfPRYjE>j;|*!?S)G}%KAMh
zymPD?8T>CHppvcQbK5b@VoWWooIn5hPxSqmBDx3ay5Y)Tzg7ZEictc<`<rUlBs@w8
zBx}jF(h`~gaNC$_ou$g*N|unYiNE{%za#p{&p-dl;ndO86{ph~fFFPNyJRH4W3#H5
zy~8WZ;UEmMWpVh$-&%lcHDQeYvXN7y?WG)Qk#K8Mu74Ik-!_caW&&CqC)(2mZ6pf*
zhwr}S>GKQdz~h@eWm)q1`IXgb$2@sLR2)x7x_;!h-;O*zpYdLfrRxi<wP1Fy|NHvl
z+sxhssq(UUymu0dl@+*Y;{L8+-IOAR)aoW3vDWhPdZg_J-o1OnYF)B8XfG3GA!h7l
zSr~>nSzk&%efpK6$S8`EVVqdp%yzxvn{V$a%ZfaA_~5v^->}&=6s4i-<i+`#1p9T>
z_4S_{DZwa;Li6#PN1Db`){45SIA1O(EPfG>WM(V;0tCZ62DHs@2Vhl|NJ6(*n%Zs_
zM}_-R<$e8Getm!`1*>(&?#}T2w~y?%Yr1pKX8l0dJBmERxt`2sX`v*QxsTE&I~T}v
z1IjaWvj7Fkg0d`bnTGT1smg|-pE;ffyw@BKo$%F@02>9XRe?4k#l1<0Nel|5Ez|57
zMu*lpLrQWUhKUdqWzo=f16m8!x4ZNd*0S5x*gT@rJZu;Syk7`WVZOODKjqfqy`!p2
z0+JyXd|=(w=oryPxYoyZWQh@lB2yY`Bn>Be&u&w&U#%!}3+n18lgMy|SQMOFxEwDO
zMaAeGzkGUTx7|@@8JBhh4^>$)yIB%`qlm`D&M~n}Gt0bC6jmI)QBl_`R!xmtJm+4L
zSc=l{@!Jji`;3p@yr&-y#I&^v2p4Nv0xHGFhY-n(L47rB4XKhOL<B5n(i1DcB=J*9
zww)*9m%w_f`1a$D%{Id=jz9h7=Ol!*5_41tT4wAAhGAs0+3<Qiak(5B7tgQ19oTLg
zRx3+U2Bu*FEZ)yVr4wHrP+FqLgKRXlk+Q`vQjw(@_^l!<GMkVpAz@BD+wGpJ$S5m`
z-U=bI+wC}=4oq(5?*4&!_I!GJ6;Y+uR8@&qfwHuCFE18Bp_KnhBJd^c8YP@0ZB)vv
z^W;{u-RJ!9yB$q4^YNQC-+jA5D`>lc?Pf#Y3k^a7IvjU*TZX>n({sz=*wGI@S$QJM
z0?td^*5y31T32XeB~!p?Hmh2QUCPn-19@IEPm1GFwuLHc&TXGAo@<WYzn)k9>y}XF
zR}s(Sn;lBe)OCinvia23Qdc$8wBQ_w)+`WZ@s2GDypK2K|LjDeA7kKrmT;1gWD5}z
z?La4uVMrS_MUm(H@coYW?@My6aMR4X5)bSzKmVE4szBkXD!JI#b<OTBdGyj|6ok>H
zwI(le_PZ@z*P?XJ;czBKeG?c@lf=yVkgP%Iqybcvxn{dBAx83|z-Y@b%n9%)hvPIw
zhQUcy9X0bz0sv~Zn~L>1=euvWeEaPlr2|%H!idAOTIJ+<$>ls?{{4@4KUGD^b|=En
zejF(4in1t~rh)x#LtPg{rJ1}ZB%`D;hAPjn#?Vv+cl$L>SrQ4%i$LUKP{|l8@c$4c
zoYH%rHdO^Wij&(bh+*OF+k4zR(07BxMNKnp-;-xK)@Ep{*{mw6B4eB#$5V$fk#QEp
zjY8&JyE~yl)OCeh1Z{FSoG9z^rsev28)Op~=o;B|h3TcSC!`?IYr;&7B8tqcMd`qL
zo$<#%zU9rEhL7)eY&H#bRZ&(oc~-I6tay5U=HdQ9W&-n!Up!BrpYdp#P0gh}^7}u$
zLz|hm@3*|ZUhr|@<2U!5y9;mLN&<_q5(*lE%-ZrapStn8uj_B6D2t4`Dk%y}o(bzn
zX~WPDY}O5#)pYI1@!T;^J$0S4S~omBy$Duhn%Qi(eERiQBEk?WtBSg*sH-CJ*#&+V
zqyASfI8nfXs0do5A8#Lb_%N|q7p$6s?RL$o$_Y!Ls@FU{9dI**kSeVhQY4#Wo;8<V
zT4rMcMV?7`>?GTzp&tkV`hH;?9A#ON85u>CWqxB+<#~Ztnj#kqlg%@#swOKGm-B=%
z5}@$4;Pp#ecC8=-t940Pnlw*@^Qje7ib^?(LDFHA(qu|#6~BD?#L)NDiG?KzPoC3h
z;^n0kr-2r;aGuFLvdD8{bhpYngh12eeE<C&yKP0LbKX8Yg4UGQ@cZ9?M^rMhsH&Pb
zZ{AQA1^?xr|HA3wa7(1UOk(a=88%aFwk5_y^1{-rDzuLHFmq{p@lB=;?sYG0t!T8e
zO!IKRqN;34rIJW5g`_>tlSiwJzL(0YC<T}>&n|KOGghlizP2?qO~K@5W)~&3YPDjV
zX1Z?Xe3~$S`@6fJtTpWSTOJ-CIUJAdcDv;0SA6&FJKleMgIhdL&!4%B(@iWFoJ+&e
zj64&|in*oA3an2C?*=zdtT!8G@8$MWn*04OF{U(mm9e-9W5wv}7Gb=HD7U9A3eIhh
zvMO!9GTLFLsA~K&u`HgVlz#jEeuL5rHY=H?4pd;8d}357jMkVWDwUgBVbTkxl)@*y
ziEJIyVIV6nsT!0@+aXKcWIQ~q`R=<d+qLFySCMCtzHKS8f~TifUJe)T_8Z*n*zNYb
zzP?HTs9)%Zo=?xO*gSCe&@j0ZA3xsHtTHa=mJi>&p{yaxEsu|K5H@v9*NrGd2JvvW
zyM+vhZ_y-SptS0FmQht%3Ny`_rYZd>Qk|VH1FwfOZ{F@$mVx8x3`(<JZ^-k4w{PDP
zqX#0^T8_sP%4mwh06yuOMCS0X4lE@Mq%5~dL>hVbc7u?dql^z?B)3^wh$uo(Of$?$
z>1|SMmev`U%S2OeXjX>pwuBJ5v_11A0Lrq;7{|!iM-hj*KnN44g{rC$dTW#<o2HRO
z9%FERPX5^io8@F#s=T9wD}1eex^4(jk*dn6E6Hipscp}Tf@u<^e^FMHWi3B@5b4Qk
zyTw>Tj6O*`49~A;UOvk~*{n(mD~ULd4?B!<{PB+;@zK-uVmHe&&D-}owp)?(5Dg}J
zG~nXG)8}WD^3+YqrS0g4kzb!*c{$9?GY~VLpUyZJnJ3S~<A$n{=UZ#=!O^TNb(53j
zCGB|>IgI*3i;#s$;NfvkkqKR7Sp;ztJ(NX-bAe%ym_BPV%Az152X9ektkxA-25;VM
ziBVA7(=^Hw$wmAknTpfsIA40Y)?@zqWAl?T3e>{m`*#$j+-6~Me0=u~Q|3&wqrb=t
zsFY!Gj@)KgZ72#!{9SK0%(JM-t(JqsDbKt_G80*C_Po3tg&&mGqw_pb*OeT2#xTyJ
z_+HgDWoFr~Dk3n>j-V`V@yvc<at?)MzuPhUjy%g)H3dym(w+wvFLNumNK3cd?ouRr
zWEvg2?Uu)fJ%__9F-V46BuZ)zqRaA$d`Y@tmt-K;#@^bV$H$ue4&J`4+3j-b+)!6F
zSyrKR&cFQ2uPi~c+c#`h8E@Zw<RAa*&$z`=6b1kFPk-jk+jso%yKkB14r2oAb%V9w
zoTsWpzM+wWbLd;N_8bo#(+GKC`0<Cg{PiEdkr|@*vK-L{MIZ(_#C`D0i_j1rb~RvV
zyGe}S#xN({&o~W&+ws@rU#UjC_bh(oFF*gxZnvjxCuygY=(!dz5W6dE?kdU@QH+?3
ztI}|PSF>6HI95$b(^PD?TZ(ea;necmFP~A$aJlp>i&(0RQRGD?UdnNz$|6PK$!*EY
z%Zak67?*&}m28<_PIUc*TO4JT@%Uyhnz~V9->wUcp&w96vDs{x#+InE#8T6;BvR6P
z&GT}ruC9NxOw-g-VTQOQjh?|~1#LUv7tQh5k{6|X6hU(Ovdr>wej(3GhH)m#4Ciyt
z^HUGerpkX|x2<^peotP&!@~yfEVE=GIJb~xil)xVtdK1Xk+Lc2`-NX$Ub$R)imIaR
zdyL6>J@ov;|N9%xMf!fC>t*Q$f$grMZVbjoSVaB5S{LL+#@J89Afc}=p|`)x)UGpL
z0Zyv41Or9%CS@E%x_$&SWu^J>aVHCzs3~$wQ7FK%-|um5!Q_T%hNq{NrrvVCjQr*2
z&#X5af-=0k_L%?UKmPEORz~8Zg1nGrSuzdcv%B;yMOl&?MNx?gHhN(XtyeYcO`TTX
zIpgd(w;kg!h>>#~)3zis^b>h5AGjp+7>XjNsw!+|L{;uQ^DLT;{dPs)w_Ms0on=gu
zRC6(Ulvecfh|!uH(3u7m82gDLm(}tTBEvAT*{pbZK7+oB07b#v_dVZz{D9FqLGvXO
zO)3K|Ywxt67oS~PFQ=dfVcr+~_=gRTcQtjDqm?N9>uN33(#EphY$z*(8yA5MzMj(N
z)G$plSMgyXE5uN&loAhNw8S91D5Vr-RkGi2u?1L@)AtiuZu#!px72mX=g$X}&VVbz
zMHKqRioL<woUnL?zGuDOFpfi#KyWM9wU*G3*)7yn$!5FebUIO%B}xTWtCaxg@&-2x
z_T_jui%i4`#Z@Kqcu08XypWbdTC0FD3%lJm5m9s8oUz^9aXxh@Em8ojZ5qr=(odFY
z^1|@u@sa(V1d*H$6W$w)f!W1G*Hn_;lNmzFdmQHlw?yhvBn821y0&NNNBVB$a_NXV
zB!>RgrgIgG%H?&P$zA_uSrQogg)CR(nc!?*Kev**7sPr3k#QWUi;^;zmUIpaF~H&V
zj8dAzYs)asfcRkDGP7P6<fTwhRn*K=BC}$|ovQ+G-t3v@k<8|->w?p%r5{GJJY&Ca
zs8TGv#LZjAdBGUP(0k739*t(Rk;6(SG<Kdml2vsjNl0!$Q5a5V!G+&+VDaj0mCw4a
zDvH9UQGlS4j8)`?VZEubHZt@h3dNW%kD?Ni%ID`3ZjmnNavm6maJw9evY>7XW*2#R
z=`jD-|Nb{Wp`dMhbi(>xlX=mayeQaicjzo<UKTFrGj3W^43cOpio$Za^!O!kI=8gL
zMAQZn<Zg2EgZ9HfnKI$zfmPH^MV5<3Lv&P{Rh5%v7LQ`~ktHr<w!kBD1)GU{VHySW
zCs<%lKf*9i%-&Pg1w|pe_Swn2X|vg5jls<$%i_>R7*>5d5WQ4Xi}$D~H;p_Txy-Lr
z;G2*4JUo;XxsVgzzhAMb6@?Lpx_5$p&C|<cjiM~UFEgjs@$1uPrfK5M<Bt7S;<8qC
z!#EF&<1A6<82Vu$V#)GSY)U30dQFT%6qOgqQ<WLbs=?0_#K`BD1FNQ{s^w;{>x%rE
zhNDH>q_Tn~MEZU}8$&<H+J727%4ob78%dsPz@rc*eN{_(Ql6C@k0)HxvrUs{9%Wk!
zUs@)4;4JG^$>T%AdY!Xg<z!i&!eTX>)t(}2xO69m!Ex@}<QdhJmH6#!uE`3GR+ee%
z@FB|9cNz%<#t;Y#1g}uZv5{q(x~?(G5Ee&n6}w%T0F;h#5IALC6oQ}D67%L3p=9VZ
z&%6$%zgEC&B^)x1Vjf2x?jD8aFfD?cDJ-j|AkPhDQJ}QogO+8YtaHxoK-&%&ohPrN
zW}0OyT2|8H=NV+i-nQy7Mn1osIh+Q9hc|E5tecG7=4h>P-t+p}iMZPZoQr^G_KIN%
zoVyEP7)QtKa;C|lO=Pz%sY=7$-I})VDKfF#xKtG6g`qBmx8I(7<^`-xAfza!eWK#=
zVS`eMnWkmFjS_lkW-YU8X{r*UVi;zD814#|#q;tiv|Q(ed*^1cu7yC_*uykAUSH3Q
zW5oQMZ#F+!n~`TZlUvyC_OdlA3eZyeUKO@6Mk1m{_W{2B=6xE_nKX=)NcyWvS03s#
zyfzuySb|^p_~AWG)8O1pUDvGFE2b2AUe~1rQDzy>FR#?~nrU$yUOP~lre1M6p2;#%
z2OCBDMFfn^=mtS2`yi0EuIq_Gd~cthKhx9|A3l6QQd`=T*zv_|dKJuFTbhuD^V%rZ
zYt7&M%}3TvK~)>>A1caBv0Janvy7%(@!fadr4?+Dz)hpY*{(GAj}KI(Bx{Q`VI<2G
zHY=FtNj!5dN_t6Cv)}J2vWlUf_|u<%#`~C7<t17RfUfUa+IA$%YgCL>Wg!R3;;HM3
z^+uzuXSG_Rl=v)%WPU9x*=|{TwS+7(TdFKgEraUQsY7ewL4^>=P0l#XG>rs7EK5lK
z%P+U0Y?0(Mck@Vyl0qXk8UYuUMakvTl4X|j<-qZHyhV(?z8pE9dxpW`oX9j5Hz(m~
zVs}}EGL}obK*C7R(@Y2<NihOidv@EB-LAgH$jKZ|ljns16rH2(W=^M`DaEdd_)~<E
zehD`{R+eSdMMh>VbzLW-g-Qzk$aa^p-V{_-Eg`jehE3Ji<R*L+>&w;9u61B`3vD|R
zgJcIbO?BfyWj4qAg?XMiUnYhrpp@s`+dV~Y*=)9qqsRn|DHta&qS{`zaeePN9y_Md
zGmVP#X=E5@rfFimu98VxfQHL5Q&$CLnG5K0@yXO|$O^?0;Cz{G8)&U`GT{fwm((dl
zM#=p5s$<heQP%|uF<9qWPEls8R~6GJ+r!nm1|Z8N+!iI;LdgM;NIH{coX->H-+jCJ
z>FM<qn~SKk>jW`VmKApo5B%v*f8l&Sb2`6pxm@^v{_{Wb{QN>yNh$oF|Gz)+dTt4B
zCR$Hb7>djaYGZU%RUwjtbH^AZBFRU^ub-ZHe7xuF+ed!;^u+NnayYjvA#gmMF}C9M
z(DB>nR+vIMVvWXFX)DKZq{uYy-n`}W;gxn8sH&AjELp?k=9Ea2iACtxV>3%XPU8L!
zp04jDH&82lSO{KTG!@k?gHUj~u-X*twguizeDmE~%F=VUZ`iI%@*-ouzvJ!0TVe=|
z)66i6fHNy34B~JYczQapIQaRO1Hb(GL{%0vo08|xXKW6Omjs-<`<>7tY$n-qn>Fu0
ze&FTxg>f8cJJE6-4;@+75D84v#5_vEh+8C;#<`Ine%$lTw_A+XOp{O-HtT}B`-Z!_
znyS>aL(4dL{33{xqOfF{$O^8JUv<3#W%-wXdgkHrp7Z6*JS|MqKv7CXC#dDG2k(K^
z#!4REreaxUw!4NrliT%&-~EnZ99Y#g^Bk~Q&EfUL+xPDn#*uy)2tHs;&Z?;ew0Kp1
zYmJ*1hIY6O#X}V2OF(jMw(FV@mvlKU48tT4$jqYkm$YuTMEXG}pMu><B#dRbg(euQ
z(K>LyFDdJS5TiH}Y=)0f48bXvV0N=eO;jWVM_J@pV{sm=&Y31bBUx>kC$YtBb~QyV
zhk&t~qR1uwZFab1yNV%Fl{xR<Z}DC}d*>t%(`X5kaBczR(Z<pbGm8`A>(D#;UZ}51
z2X?!Ly38SnjL91LOcv)Q6DS&<etQ9>sLGP#Ys>jO0rut<MG4WNEW{a8mX@L@={t$2
z6Mtx6vuVgO(uE}&!(m*o*0A4INq`>kG0^ujWxXau%crL!Z{9pmR1xRkav3mx^WE;J
zq7rrc<C{m;>ov1;6m^X!G7TejU7?j{x837r$M@fV;CDZK!+-gwKQlQIkxpR|Sf3JI
zkDDEf3yh0TsO5})oGENZ+X~<=w-#*`heOBtGI2=xg4!5{d1eldVRVd>W3yU`p*g~v
zH*e{>3wOIMm*WYIqFJr@^!%BoX_)32YjcXClz1RyPE$7(I_a&Ny5jNSEe{X(xFryR
zPnH;)Y!`APTt~;t;(2^nv%6cN<HEWsv1p2_#AvBdXSayKbQol9TMBV<948Kkjx4MB
z{JCQo97Qf|@%h*@EeqBvHk*dks!0{9VVq_%YdM`R$y_aSsqJ=4o@dl4`C14LmY2hs
z<N1vD4r?PtWpT@bUuO3E6?b=Aw!4gGZK!IY1XOj#;ti+cz&trZ^q|$vO>m{ic6|px
z+jWWcKXT>9&$GxhVoa1#AIWpY{=Q<pk#wWQiNLmN$7H^hpG#}QJPkw)=W~a1j_1#Z
zTji#;Wf~o2nI#QRq$mrfQHHuw$C)&1l$0QA)omG6H4WV`kXe&jQK+hlw(V18qsVg6
zA-Opuf$nlUbY<rvZSHy{<Xo+dNJ=8fK<^2`Q{)*6&Egf)xS+5YlW{qBJUzGk^2;lq
zU(U?VOY7gy0)mW!fmt<Ws$eAco~W3nh4Z<Sg9d|Q=7%5Np`xPiBwJuv7V4{zdI{<9
zvI*p82;STlT<Az$XVg_8b3!ZsuIMGT&@J3T44QfNH!^BdH*8iLKEJj%o7i<*e*K&z
zd{_=vnRjW?w&Ad<U~z$YmcS8h^0ZNv^92-_%S7Kfo}SN~PaWQSic<0*XBRkMCd_~M
zt2aM={N@csB|(rOMzTET*H6F6z%j%$lTchP7h+r}3(Y_O%bz%127DBf=4;n8&NHZt
z^SQ%jq84`%#>p{97-x?~v1)2|yDihuQ>`kVKD`P$7O{FLo1v`b<#6DBCpm+|FjD3@
zlk>862T74mX)#J0)YZ3`28K(5*M+o3T@qx?TEjd!j>jW?*K_H5#v$>20_mXQMpaZw
z(m?jRnmjkmQ_pr?6QiQ*dX~}M*i&uW-Sj%s>`+E0Zh1y~8R&<ey3V+N*b+nJavsTx
zjAe1;g?wLa+Y*B?m!?r-#}+>)T7qXvD}OgnXl<FD#~MpS{AqQav%hcH->t|?L*3*k
zJWW$k<#p0Hh1=(PI`_POZi!K_HqMK#4W+3H*%DvF6!Jn;*;-l7=ZmzF@fw?c4c|~?
z8PqFTP{bISM!|{@VYAsW-U3=hpEZt71fTuDdbMU8My!!QTZv&a6h+1`jx<%xJUQlR
zk=U*%htcF@OP%G4rpeJ7oR`qs!e#>7(~#$RYWGA3)%6!SblsIL5pM0Luo#7=y4}`<
z^fkiu=bC4VBBN<4GOa`h*3Hb5r)>xNe&YG*OxrCu7g_xE#rAZ=h)eCUH~^N^-svQ`
zHH`gCk=J<dsmhXf?>4Mf1>>-AI<;79*=#mx?rcT>6~zxM#E*s7<0bvfvLx7US7KmK
zizI7h0XC1)WlX8Hbc@8g`4E_<naXBdx{=w1Bu$aSeDNN%I4+11(joIaNslT^%i^@)
zemu-`V44D#OGmS=IUJ814jr=-g3JBgma^2M-tR=_a5?u3gU9^)KivPMwV~?;DF551
zC#t$)o@a(`<o)~iJUxHr>G?DFZ|>=bj%jv$dO8rIY_UQN4D*7q8RHx{wKJ1jP&z@s
z@|+l9iIFmwjh_#Zs*(Zq*bkE3*3{TM=hF8$@5!=~sT+BGxTCxD63t{XGLtb6<4xIp
zXfIs)iFsON=CF9myhKI#+rRr;UOvBIEX=bPeM}+Fb8RxZZcNEKXDa{zAOJ~3K~#1l
zSX@jSE<wzMq`@)9uv%Mw|NBP@ZON==y%q*h2x75l>Xq=WFS30r>lz;em$svAyOiA+
zsp^`tDmb4nO#RHe_iyEPIkz;cl5y~<Ez6nbnb+4d>-Cy(8gMiCMNyVDms1b1<kQoc
zt{cg1A##x=@bI{$S?3tLP?b5xNQkVl1>Q-EbiT-twyJCLOza|BlTv@vMm2#BgOB97
z<S}Za8TwJUVAlgZN(EAu7Of)6$gnlba_XwaFX1+bx0$3C1s|!Znmo^N^N3Q=Uj}yD
zEtkuQyZv3l0vkzXj$dq3WnSQ1km0q-5?`NWvyx22BC}Ydu~|;n4rqjRHqYZtp>0f-
za6_75T$18H5Td^U9F<ng^Oyw10u_>UZ*IS*%!oiY&&-z!No%yVXp{5$dd6R)=94)2
z`q^qFY<RJ`Xnc(56dY=eX6#21qiW4Kk8IWz<LG3&Nu;U^R;wDf%yivA+xE907lAtl
z`e|n9XT0}pHw{@z*G36_q$)EMks_BWtsiD0aA{k#wpdeA<_+tnVBO^W`gEeGY+_Vt
zuEDuwky92zGg)scnpG)7`Y6CnsgOml*S9lmJ24C+ZLc^SMttz>?<!U+!`p{7`(4H9
zc;@kbO^lJgbD00|Z{Phij-IE_uNWh(O^k54oRiNfzpcl!+;BV|vASfM7EIbwcq2)@
z!5C&2=##grE(`Kfb3FBA%3y6lk;&TGSVLW9*x*@j>$DxIc{v_ITPEiiCqZ+t1Xk-c
zT5G03M5nv;magj=!a`6QZE}`bh@nMUB(GP&=a<i-35kKl3E@$;Nia^cECQlfb@scv
z8=qWE&R+r}>e_IBS5X!=RShy2J)c|hyx@4c5En(?4V>EnZ7rAXBI(6dg)$1TJUzXl
zwPA50^(e}m=jVff=t_lio@Q0EEc4CHAEP+__jenXWx8#G+zi9${(rLGtI4t}P0xFl
z-R77)nORv?02*zEJw_ZVL~$a>;OK@5-AWe<{UQ8FDo9;uIBbJPnKZ|2yPPh*bq+wP
zA`sE&s7hqz*?X<eyzlc8SBPuDSg@|XSURJ0!5Uu&qr!|@l4S0A>(SQKxckiE-qUZk
zgb+BL2WfjsruAN!V=>ZoUPz{EBqeJ4cgAQz!R!tjQjTnQ4aR7eIq>#&#CwmmA_ds*
z?uaRHxZk6YmM5$W+A6H_P;F7`D(w<FSBZlpBgxmYgf$Y@%s9-1u&~)|Z&+btEjcEM
z3`??!y~dzvEpw`r3hNpfhCyPxT8W2~RGci8n+9bHzA<dN9;KBq#d4-`9#zGpB?Vcu
z<RDS)N)`gj82<9<Gs_}=)&HKl0F_K(ZS|*C`A3oDq<OB8%r$bESLTr9f^7_K*KoJr
zu;2H1FQKzB%5!-ooGk0gvSfy7Aq8oLwT?34saT(`Yni42XD#y>Yc!jsZ9R=|Xqqkm
z^iO~0d^)k+8V=iz=a&m1U&BY_vQk<R;&OXtau(6}G6zzsfgO!!o|c-bJ~K}uGtxG(
z-B}(U_gDv;ji!`^heOZre)CAl1F0xsy#390yB{`fgKHd@De#9s{>U)Sx1rzb@s;hi
zBj(8K+Z!nxw01l`KCmn^``w0;3J<%Ed5|i{XxQ&MhG`<sB1t$e6J9Ai1w*3s4sQfI
z62d~sj?c%DOI+x^=bMk;Fw6_nB0fJ|BI`1-+4iIoSmVl?GL3C`_xQlm{*L46f;9$1
z!5U$8Urm}R{>;M`(xbh>;gphS@#FC<EoH2+N9AWAa4Cg(&8+Ln-QAuwEi3`%rHJOl
zc;3zuVtN@z)+7XhwrgcWg&=iegy*kktlRK%Jks|&a?UkLIE#(QO5_wsXv2Pg$MJZ^
z*ED6VwQMc-BC&9estqdj;g|eE0WykY!FgY|b|QpamQ@xMb;Fx8SWBHH35~RCoh&b^
z)xx+UbO9uLZ(U{)<TeJ^8LZdr4?95+8B0ovzLl&-5yG}?ckNASe+#@QmU$`|S9pGX
zWf(K(^CGJB##Nr0LYs`Yu*`|DWV+TfoF{Uj8g>N`XsgEWil|mfasf*zjMF4Rx4kFD
z%;_|<MhInve9eG#a<FKPMhS^F$6F$G-}e#{S}RedEippMnrTVQOX75#`Sj_HWllFs
z%@z80-KJV=@r{=1v3@=09NLJFH5YjXj58u?RT^VFUDse#MiJTVTNH-Zmow8OTe@Xg
z$q7QxoGz=RtZPYV-|QMT+l~}hnNuy9##!2?XI>@sxosS4Sny5&i$xW_`Q`&TXD;V~
zxAVXnuNAF~7ji0;B#eHF4EDFXPR!h~kW*lu1J5rbC_~PPyM0IB3(w3{8cNQIZSQ${
z`oK62IIU@2$Cu}cWht0{`>%fW!+yWx`Sn$PI9j7AJlr3MLHuqx1}>MCuG{kY^NaA<
zhk@_Ddw=7JH?6z13ENFi>kP{@Vof6$8KY52*yI_-a2e3RX1n2h9@+0UoW~jMEJSLi
z;EJo|vaTDPaUQsTIFM6h({+$C=W)bpL#p<X&8Fk<aA2G!LW;C)TUk6myYO>P5`57#
zH@ah3>)}=z*VnXNrNk2!L*o6@4y_U~MqXad)jA?3UGF`r6xo_-%W$4+u!9_u5>`9$
z_IBZPnz&pR<~e|_|E(;4b{ZtM>`H(Im_{k@+qP$2BInCl*jvaZQ*1i2j#fI;^$kj0
zTe(z~<1$>mCOK;(8G*~ZG7ghuFlx)`G|+X847#<wRVNb08Dx{Dplu!VBGD$hU58LU
zMN>3Q3tGvxxa~Z<T~EqViCkaauIp&L&;hJ<yuF<$SqnWO$xu7xgw`U$)VgrD-!e^s
zbdypT<~3E3XS!8j*Dc+qjyF;&^+0F<nXzaiGMRauiCI^p`}H#yo62>MuawNb6gAB|
zixD}-$hyi>W?EL3HQ*|}HAZ=ku9Bdu%HCSxcgd{k_7UIYG&xsTow3A_nI^HG$)N^e
zU9rZn-)%`LNh^4s7>0ntRGETg77pVqnSWZU@35pg(1xy+RGs_7p;ok-%Vn(0wZt;7
z+}#~Go=3r)Z##bc`pRYe#X*(Jt(sCw0&}kywbrGEp?KO({HF6FRqUoFqc@GidBeI&
zTWPFfohOWzdGz67&t}*0(@!Tku>Rfu^vw_2W~{M%`paMFThHBoOWS&4oN27)r_Zl^
z{d~l_%-{e0U*TNFduY6;?_1WeLV#ghi0i_;!$D{YIkSd}UX3f;O@~qv6ltwRdCL+a
z&i9-yGY^kD(h{o%B-1w@tE76c-lJ-OfpFPHWS3MV5Sf-hDuMmoj_-f_8!(2i&o9iY
zL~@afu#c3zCCyqRFM+kL&aDzcjxRTVq0;Kcl|mIhe%$ln<40az-^ggJhOXI2X{#*r
z60p9xZIJ%*(+erdP<R*u<FufZ7rd{LV2p8EX}W7j?R4`97UTt7*R>valE;{HX1m#N
zzMNT?1X&*bagxly#(SK%gplalp2mB?GS4g5v~F!IT3KFS1~P_qEtF*W{P`8@95F2@
zechA_hNSI1ZR;pxd~;36$*f5Zm6C-lT9WYDjWS#=XL5<RD#CjQN-m3a$^7(}XSUld
z)>{7b;}^zhWxwy3ml<uu;2u-LSwqSS=Qorrl_V65RpO|q8o;J?IHv&_FiQxL`-Lf4
zlA2}RuPG(*?%|#k#Rz;w%vdWFS4kEsRe>+F7?i@+FbWAZQB31nXH=?I#XF{H1XMko
zswcH-x_p(6h%Z;@3C0LsJ5~O@Yy~wjq^taitRzZ)7$%ywV_p*DMbe$L5=+-G7cS#k
z0eh90p%Pu&vD<WP`nGO672bQ6D3_si*R3d3&Z8+>^V8=yK;he-mzN9k6v#27uAbst
zByp<9!s9vv9LJ?{u!I_tV#eU<dyV(1=7Fkuktq7!i2W#L<|W{pmNg_UW90Mm8{6F$
z^AG>>!w-kU9);X^hr_O#4+Gn6&$6tfta$%;$FINr70)jxUS3Ze4p01-|N4nfpI-Ux
zZ@%Yrd}F`6=iR$^%=3)V!V@QF42Aus$7oGV3w__vb{=D`#0tg0yLXR#{`@Kk6D=B-
zzVD?BcaF<ttecLt!to1JoM?Jq0~WyghWGD3@OnD(U;g>OGOrR|A!=rcVv<%*qMWSL
zXe-tS$;-RmfO7L`t0*eVT%$nKIR5@${g&siZ+!lABF4hw!{J8vETvS4e-xb$ijd^b
zw@t%tw__Y<e){PdkjNyZ1XnXpE7LHtuCb;|iv>hn@fm9zr9j(y35`&&+wJhKrEP>L
zYK-G}Jkxazg+$jiHM&e9)7n;&g+q{h!>iG>>vk;5%BN3X$wf9b+EA@0EucwBtQI8~
ztZ}mOiUp0wC^@WJ?`XV4l;;GJf&*RO{KCfvTB)1X$y(WL$p*_;?9P_96@$07GVe56
zDu>H(!fFZDSQg>9U25*YcDt>z6u~iH37YF1YejG+l!{RIN<2NE2Xdj3FQq~hS%l0%
zjj<FWIseR8mnyMfy|lL5ZBNSbqI&0Ut)H>3TFQPwU#%5j2y)2D1+0EP(6qjV`(ABM
zsp6+^7=1LuFp{!t^~Q0bB>7sGaVGzwS_If`C2W_H31O|MAk8#S6lB|qO6>P{oX;0P
zF<d65IWt@$!!Yw!X%r&RO_VxfQAXO?_wQT2`_%)-w}ta*xD_X*$mUwo&P6cWG%~bL
zHT1=MN7wl(*cJQU>2zT@&#Y@^v)S<c^$qin|N3`7Xr=0dvXPshWEyXHJDxGxa5|m%
z_Wgn5Q8?Nm1deYf{_@is^SqLC<h$>F#UKClBR~E0g>hU6YeZq#be>J;(OCi{TW|2r
z5rfbirX^7*Y&RXJ^C&?PPOvrS%Mq((gA;RNUPm_jhIZpnrhqRLozdD-6qJ%Vo?h#L
zD-Y+q22#v)O<M=I;=nih8aFR^7GbE%0U<B8MJo~H+4_Op-SybU@bWV7`ZlpFnR!ht
z>xyp#kcSe&rU?3E3zu@LUb~D|j<_aDk&O){)oMp<8cIRaY7Y0?o4Q&n5d?}%!_c;^
zFz%OCpoS#Yu#keVzA~V#Atp)rbyiS5>pE9`kPLf8RO?yhz~wU3RkxJ-n~IN-^y^5|
zI*c{wqG|kwaa@?Ez%;Hbvp^HAk%?aj(vqxI4$(9X^E}hGj?;0dK@N&ivm6Brq&S`~
zl%nf%XPKs{E<HSPm4l-18l3fH3ftY5%WxsbM9HasPb<b~y0#IYXu75m{oHy9MKj*!
zm21kxtg2GG+Kcqn7bz9DR`RuCh&b=q?cn2wo_9|j6vJj?@omrfd}dh!>l&-RPhP<P
zo?wcSgWJ}aFJlZf&l$2*$5&9KRB>1BQ}t6PiNT8@GtCPq!?H%sm#N~P)qnHPx-Kls
z%ERG~Qlz7r=LO$*P;!VmBes6;tY`pTS7D9(e0Uaq@qJvGXNAA|{YO5$>)G}VKmPGt
zfr#QCmDW}CSu)GCSgVC1T3bqMEiukm>u7x^0m*HP_YLDE@Om7HYr_18fBQE-<dkYa
zYN#%9&*S|aO>1#pFs%3YcdS7;R^B@1X=1nSX}tt=zP%oK_w>a1GRQ*$mD{wS$v3{U
z)`}@a&PzmD%Mub+Yr57l46^|5jH{TK1EplfIf7EW|L{mQiDC*xRhx<vNdl-En47WA
z65}csohYi@6e6+Cs!Eob(HbHO5l4#o*VK8Bu(fW<B|yqBjuZ2;RGI@dvRyOG1NV=6
z8t;By^=nDJSr$=O_gzQMg=vm7O~b>(f&HCquhx)6l939=6n48!9ad(>ajFY~SYy4?
ztwPb2r#%cSN=b`y8E0ay8?bSqZ3L+kg3R&&x^7deHSyPl5X1x5Z<&_0TA8F;(8|=O
zQ;W#bi0;QZ%Q%jNI=5_FN#1e3z4-}a5MEL#MNrJnGEEDcO;0IePCp(mvi)5G<Fv9Y
z5v#34rj;TuRL#uOMqVbR6w^2}j1z6w6W5i-dl6(739#5~I%%Ji7<FadBL7@dgk`A_
ziG>;|l`G@F)Y;O{xr8|tnpRVY91eRveAx5uaZ5@I&TG2P^X1DKrF^B4l>g?x`Ae~-
zxyIlbQ$NFUJGkZ9Nm!Tg9+q_>MJfq_8v^MXo_kG`k%KMQBpm(!JFrR-8Od(bq7+<)
z5#tQ5F{D@|lcC)bQz0hB@ig)BHZafOzp2!2U%Lpn@tbcC{O#X-L*FSHFQb*P!ZeBH
z&3h-$pq9`N>r};MUpJ+>x(J|gEhR&&p{$!t14>9BB1Ud7|M2(U{vcnpA*PkS+i*M$
zGGw%wOrh;PAD_M@BRAq7{_qFx_Inzq`SAV`RWvz8{`luV^6T$^!@NvT1D?FIbggH%
ztuIGTyk2I`YvMdlP&7Hni#3empDMZFz2*7kD_SY$B{I!{^Kc@TwU(d~oFHaeneDW#
zqiLOp+`3jgNm*gE41ZI~LhY<X$*%9P&Q=7g3`5m__rciOdMITuS}Fs%v6J}G>aDrm
zwz#Sj`Xz>WT?3oG9@ff|v$SY;_gg{`k>L3<5mvd4K74$~a2}Y(1?O9=5ujSCmr6>~
z>V+T?^i9+7`Z_X=3n@js?>HU@x^_e3#e}=vYyed=79~JKwrY}rxY@Og<G{oH6JI`m
z#TZEp&RN8s%M$7)EEAVdT>y!kVvSu>SZBydWEmyP|8KO+;*?UHkF&T8RKa;6vNpcs
z>(@69hdsv1g(bO)nsFQ@tdwiIj#y@l7TRX0D}JTKxsY-awR#9>t=R9jgjEQ%x9wXM
z^lGgn*mo7OX-uh#T5Cd)m2l9KRh=;@8fSTU*K)VtkaD2p1+6nr?;mjvUS2OeKTkCo
zrqopEUqp3fiIHpCRt~GGyuV(G;$)Dv`{TzAzxnNZ4)?N@IG>i=hVdGEC9Q8YB2$SX
zmEop!O(6P3g{TmMsWVcw&r85KE&jbl1jJvS2QKG@=hrjilqgkaiTas$f35l`h0WIT
zw}1By?;kqivJjHAZpJ9aVPTE30Bfs61cck4Vj=`-L%p{*FQ&}RB;cd#gm31(j5^w`
z<9Hb`zyE&s!{Po;QjnvZV#nhvPw(Hc-R>BM1%;vC?rGYV7$YB^p3qv6L%?W7DhX|<
zar1_!caKc-%3K9#+Bz=d#OwJ&Lg7tA37L6X=-Ng~&}qduPexvHRWyz3(ay?17csn=
z#*;IW;t|9pFLNNpv}D#<a@345ToZhqq?e+MLTMuySLayPh0En4x}2ElnohPbwS>Rk
zWB{=~(3@R<^O*_LKCsS`jb|)`s<fA3t7RHTQj+g?zuhqmk_o4j=5)RgW1=W0!rh!X
zolX(~Z;j|-8Z9kljF3edVYOzr>)CEMeE#&c{=SAU&qrw~sD#%%%fBkH+SYK_hEhb6
zb3UHgbQ_9MeEa?*(>il^cZW7o9fpvxx*@KaHH0dI(BuTuxX|}K!!VGdsvL6a0|(w|
z`b~2S<Sbb@Qrn%F+b_e!I0uw+lq|`@YfS8R8^(EM2?B#`8=2jeB!o(%<nIr%5uK)~
zR`eQGtCYLDowV3h$?k70dggMT&`y&ntTD1i+3p&n@ZRB^rEmM&%h@%awzZ&Ev@Uq3
z*lrEqeD}cqt|MmQ%m3*QFRX!EbyYQ@KUXG7SBgOm6hWL6C`t1%I^ewF{l^`@`^^Wm
zl1n(nMB`iGwPo3wT?g?YhH5F3wDJ-Q3CT_nzQ4Seg^1CPP3zFki<ZkdPRBE+<AiTL
z1;;W8a{AZbep5}}ipw|&p8Ix*OPQBb<neLC!@G@GfV9E6u40Wd<0t_X7|=!ts$#pV
zDc99OA{%Z5&E%w*a9)EF1^(;t!skz~T!tA{Eao5o&F_9tst^`gm3r@St>@{RZ}`)n
zKGS*`mbtED4lDPEJt?h(b>ZpVBgSZU`z_WQK0du8uM2Ak43pSZrZvlpi6&{su&j_1
zkGl<7K?;kc^`?SOnPpwM%rk3B49mhiFB07pSK7{_43*dj^DId{Ym_{`^En7jRLc)$
z7zWS+{wq0Sto-k3oW%Q937S@$I<J!TvsQw4r6}<tmY;=wD4}G@11RxcP1CZ!Yp|wj
zZAz6!<b-h!Usd;wZ`kejIOpoNPKK_hVId~4+M%^n0?yeQk0de#As2wNR|JV81Tk5U
z!-{p#v>V28sxN_vIVqZ~1%cD|eVxxa5kjJ9`i?JOo@s1@wwlZN!trh7bd+u7JTDS7
zQoWCTw;_gzMw7E9MHyn>DhZ$zQ%R#T2$z=A5F>bJZinGG2DEY<_Pd%@nefgtP7BK_
z9#Cr}>v7Wyo>vvAx~6$1gc{O;46BzQt99#4#RvuQ3zm#F(u%#D=WFqSx>YSg|GY{*
zQf;e@R(J<ZqxkmQM~seq{Pv!{*I1{xoM+bAGL9>EcXtd!r~$DeA1POpFi3T&f6hJB
zO4o#Q&HhgFtM4B9^>-goc?Fg0;UF!m^+{X_T}v)XY-A-$%TzCk_aE+g*mOLP15miz
z^gJH+a)Cxc2DOc07)MYAW5h`Atmkr>xePP0;>)M;f-;&Ag_dz$3S6Za08OL0J8bB>
zj%f<4VdZ$9ndiU|f>@6(>rKjGv^Yje7K@jw@pwwfb1^T0T)UjM6NB`+X2MeV`0*PW
z>uGF*`IrCV{s*l!=gUCnEy^f-E2d%JdSU_FYMk%*^Phi|4VBh41xHMy!#Lx$VZ02?
zG4kiXd}2+7^Egvb#Ds8&mI>n>Da*|;uLb8Dys=_QFqSzb<~6d$Oh|>Clnl<ZU|6qP
zqm;y@?rg(&naD~p2a#K}jje}@!D!)98S9{2<Hu!YppYB!s=cZgAgM&O)2wmD8@UZo
ziX{e&Gq<)cXYr}|MmDTunRRGonP<t*lNJ)G7L64kUgucWku?;Cb0C#OSVGkt$;}&L
z5Hq&URgVKP2HIAZBG!sCK83>ZIB_}8Kw`h!5N4@RjW&dut!S)4YspdU`<{7OIGxVC
zy`Go{nGp`-$mP7;4k6j9l{(8&C^RL_?6!M;``f?b_4!$54k^|xYyD+aO<IcdeNRe-
z<LmSb(yYi!mdf=u&hY$lx`iXGbD*SxO3=E7zVURu<L*vW-4gg9o5RLer$P#VyijdT
zEY79iy=RJRr5Ko7N|LI^T#4DLq*QIilUWi?>&Qhaz8GY)hJsQO#unx&ld~l!xy(+-
znIHf1N>1`zTsMO`=E{!p7=2y%R91Uy=z4g(-_tY-h0M@2@@y6YeeY`L<Js&wat`F6
zxVvlF?e~(}tTVs*_Kxqr`@rYVZy4v<Z97U9s!7O-r-SGBfAbAbPaO~Uy~tIRW?E+E
zRsOyj0a>mHS1y6*_+sEn+06y|*6?uOi{&dMjFC;iJV%~iCdMIiJPs&ph`FGx!%DA(
zF-m-hDq)=G`R#;4-$c$iuUJ><!qv@iI-V#Q-cAGNU;qC74^C^|Jv_*;H$`@LcdS9o
z!Rxy6^z@FWcOQ6seB=u6A|>XUW7stf^D^=2<r(WdbBL@#hNpAg*tJf9Z7QoMp{-#!
zFQPXonQ2*Q`i|i;h%Tzs!F{cIoU<5v?aKvSW3-j8r4+en)>u<q>Ws?!>j@qyCDHX=
zb+?Dxoa&d!zSo05l0FKJZ-w=aw28S$(oT%2(m};w8rH}#PQ*FYYDb8lC5vl+p2TmN
zbEffCxTqE9>W@4R6039-UTP)k^JyFj)s!ohT!YpkhAgH242;kwrLw6UqA27Et>sWq
z+Ef{b!Mm!|=8AyP%=1L!d%pYlf!CKeycack2to8xtFW93k^93P_Yd#z-thkYBVWFL
zVhySOj78hjZ#tYa>~|Xu_Xm04iX8OQw9qu2T!@Xwdq*xSAcJ)0YFbK>xz29ak@AW$
z^71@B-dAthT1CquI@MYeb5)fWiA7&m`MHM}>d#T!2iMe@Uq;S@EK*dRC*9WeX=T4}
zDTt0sbVrGl<#S)dHGpCyXIV6G4HvEKcdZpUM>ac0+nO6Ms_P98j~$zhuO@QMX48qr
zv6U*$ng(lRm>qLq92T0U<=bx`xZm$-ox^Ksvp)Uwf_9d9nT2iT4g13#AtiqQS0CBm
zd1B18ZOid(kOfUlSX<cdJHooqw&HME*T6h2q;RzrQGJ$~u8{=sQknPHK;hGI<;#~d
zONgW>Gdr0(LaACZYZbfQ1`x~M8nW2voMy9WP|C{eGK;r21}QLpdVXb|0_K1G{o@at
zyE}$y;`DZsHei|=hYPLusM>SR(*-E}r~mZ-u-|VnP7`CmdW*G+V&HhW$c8Ruj^m7O
zIwS-uh;$&!${izIs?LJ92IC~ANE^*qc|~1g3Co1B4&Mm0UqAo_>mAb)XuPc5L(Jr;
z*mRB*#RgM~W*S2^%!;>coEAc=VG7P-jj5}5k8rTKRbVO0uvb$*C{@r(@&^l&{$Z_>
z+l3-GrxG$l&V}K;^7ZS;={&L7b&{-Y6xtecvh-U~V0-UH2NY$l5rUwBoijLRZ>SFM
zC84@$ELzJAKh1%=y8~aoJl}?{T4}c19i?RX^D5TVW1&5M_w5r(DUPQT^CY;Mk`13e
zJ%cqUWBK&yGbuEk^;ers(|~J0vEpvUEw~hScQ3(;1$TEIDDD!1dw~{rm*NtvP=Z5o
zcZU|f`~Bhj1Cp~RXR|vqJ9Ax-_G(Bp`k>8i2P}y8GOA{3DlDT-MV{Y~ktZ70RaKhd
zD?4xe9^l)<R06Q8JRfsviEAQjtUFE=G&O|pBH5U&b_EOKdYXP4SJ>%?m^GY~#|UdE
zeX|#iFe^D4bP?v*WEtUF(>XMskcybhG=%VT@U(qfLZB%9f@U=lOG71l8txI(KEBU!
zzbs4i31wqqR`poOtz{P1^hXKzg(iabeEfPWvN!_n&j*GR$!?z_nw?38NaA-l%#>#j
zh4c|Kbv}_=^>xR~AFO%lk%DekQOuQcOj18WVSS|NPaQ{zGF$)O3m}?)1^kIbXF=)S
z%$f?FTsVDwPRq3imRvKpY+QZm9P;=H0MGVcVC)_8S?9DkLTXgw5OgXuOkfvo)?#nl
zl~&oGbjV$8M*4OS{!Ug*yb3MRn~apB6I6x%)WsMvZkyv9n60Q7w1(Wa@5Y=n#o7-s
z%Xzybu(rlfnqeC^4Ad0vTEqv4@Bi+gQ;7!vmYTvetGv%~bp<>0hwU)<PT$@73m`Nr
zc{dfVo-gJKd^P#H#3$|%3{<EYF(c{OfJgM7uiDJKlfQiBw=m%KXbY7FEarr(aphqD
z(#H`kSlXFcu>3r~%9hbnqLf-hDZ$$V-65CNyvidqrQ*sVVBQ(^$cTa_s~wq;z)h`Q
zP4=Zz4k3r!nBwFhyH#XA_}N;YE5?kkjOplr&us!lM?oo8;8gbC^TF(AIzEF}P6*+w
zQXGaBchC2gTuOxmH%N1HaZcxJTnU$VLb+4iFF#sx#?{9hclC5iZ3C-*qCxesMw45J
z9vX@iSvtEZ1u50d|Ll~HA<XaNC829v3cD-yGrUDiUv_0HIit8%KIIJwYXP#%;cP-h
z{9WC|Z*%cthh330(q|cFS&*;3U;80k+=kZsOL=D4G`-wamG*?BU%kw&=Gz}p9RtPi
zANbvQJ*(IaO^zzZt4A(Ze#e{t=riBqU3QdSwrlUE-+3k2u<ThG8|Ke4kl-eyMoeoF
z+aW#G-_iBwXI0_F^vwrrzad4DSf$>L>C{*Up{lkIMY<)-md)7|#>*}OE6JBi<H=Js
zz$KPo?uV7^nOjF7=OfZ}dHo#Hth%y(w+$k?1&S{@^M;SNyjA4tec5&$$Y&IA+|2m_
zfpL&Kw!!J#ig6HOb4(9+{Q=~tr`mqUKvCe5w1Q3s0^~dbQO<QY;p;CqZ+jl+B09RZ
zYI#J~?u<-0Fr+P`qiu8Abe2Zv4!y*tpfufIEHHM1AAk<b^PRG(>#Bl}&wsbR_=x6Z
zrl$c*=$E{fx)N~jj_d5syNG9+%+Ftc)ekYyK%5VY2Ull&U{dNdDvuheI?H-YSL2OO
z{?5Lhq`l3ph`#9ThhQqPU`c5X7@YHp$9ZcV)!E%S_jYo$|Co18F)npKKFiPk2O4c^
z)B`<TWAf{#n?ZKLt<JAn=T#0Czthgqb<=5F8jfz&KfI%sp1e{Tm9xZB64?DLdvmja
zuKbant!1|~m2B{Exzq*xdB_z2NUotb-wWmF-kgsrHZwaO?Joh=0N@P~=3C`X;?%%b
zf)B5s_F}U)Dgo6Xu+LWF>FJl@I`bRhp=MdTEXbW%gFoyaKUyN_c1<%OR=>I-`iP&M
zyQKLH9QEaC#}B+I755spl4bv^6?k91nV_*|LNYN){6;5z*z8!lS%s67O|bgwz=L{E
z>VI2f9O&q(`qb46)}BA>(VsPD<JMyd58xqXWzsn}CTJvVBmUq`cI%&rK&?UpN?v=U
zz=`Co?(g-KOXq7n%xk?gbg{A3)fmTBi2XG0y)J5AwbS!_rEUXajumXRW&2ke4obnc
z2>yWW+Ktn!Gr`HEv{v!YtKZ{8SQEDPcQ;Bw6)GyMn<u9>@nfg#W><mPCQ6;QiQ=#U
zQ<BKouoi{`P^oKCLB;9R8q1tvTDW<~>hB9_hSG6}k^X#CA6H~}^{4CHoz<;~FM&OK
z9cSJFcM}o)z4gmXogAIPhYz<FaOa-&hQ-Fe2XK;<s!_ws^$%P)7KA2ZsE&NQ^XiW%
zRiJ7vmDB->L35i=6!3P96uO!S`im{~d_Xmc*Ec4B$wWRi#c19wbpFo7ODG;U-sxTH
zFMY<j$T?#B+R6H%pAhmzM}D`rq{^BxR|0F$_W9;N8ygZI(AP$-sOKKbwnLo_1T*w(
z-`+k^Fpr(gdIxr??jRZInXw%B84ln>CJr$WBrvA!krX!q3M;5vOE1s+*HUDjJXK?z
zC5JUi<=3wto|R#X>D7Nr;Ib)EIaexMQbV<2KjBv&8<GyG|AGzQ{(fEE5YsRD2DOuD
z?XkX+M!0P)=!U<OyVKH&r~;;FWhw|<hCBxLAD%?}!2`9-=tKZfsQhpGSo1br)pzcK
zZ3+ICuQIzSTTmBOIE1)va@L0x{=q`AE``~h8c`>qgnE`cF5vt~)-MvB$4KyN+%w*y
z#qk%iEAB`BQt0=-@f+(02?8yX4NooVC@jt$p@Jff7#hZC%~{eR#qnQg7ri%*{j1ew
zXKWpg+KyVylpm9^sMZVlK<<{AwCS@WtunkZt83@i8z0t*mk@xRrGIIlrl)If8SCtR
z>g6F{Fdn@-?LRboQpI;Q0S}%8pXDWsc7UhF;VqIQGC%@OTj?UCXzH-+1!$!AjNZr*
zc|9f6j(=mCo8Jfms>2jR3YH7Av$Xl*!6l9qfoH8fJ;hAPtKU8n&Exht&IVv|DSm#b
zY94?RqnQ0k-0HK<(3djLdjmvx!8cE51uC8XEA=O$a6g(V$&c^bTmapQlojb))gzz`
zJ|g~aw!wo;FD0oOHwGF$br#nr9RINXd~p`UnMQVV(T``3pSU296YW~EJw7`tnlBz$
zvh2{7!?^4F$Ghi=&nz04!Kv3fKJ}t`$*1MARgC$NTzx@Y#jMNWcGE$?+us?(Kf;&8
z5gO8^f=4}uxyp+<M4I3%--xR^vl_$-c2UzirG8I=iy>Qe9SG+}F$WD0LrMv8;q3|)
zV;r0N74BlzW<^B2<sS(Mb-Lo7!Clq(Lz179XFgY@eb15&)*|4aYoUKLgZ)OfYGqyY
zVk=+VU2Gy}60Z#YvypCydJLoFyTPbJNkP2NZuOBRstR#t`h#9+x*hvdN#h?DCSzE5
z(Iwk^>Y*qWWP8zBUL3oH6RTNGB^k0pPMhMx<Fh?bw-#N;^l!ISA)KEPvJEPDS8fEp
zR*%(?4qIlf`bCEdE%0|Fdki;!2I{yxj<-i3<v7n=MUrSbR`bP$m4UDGXVkUTKUhx6
zlw`ki_8L4?Q`fIGdhEb{lvM;N>qurs4vUs3VCavQP<qLoubRv@Msz#Bmt;pe6Wt%b
z;B^ZywEzBt;AunzJ!Ys{MD%2uVT-)db$ct4vH2eb)1nWD<h7q5{w{N&?i>0dxK>OO
zT2X-b@Rp{QMIJ|vI_t~D%QLO>a3;LgMG!M?OGV#0=%&Ki$ET(6h<wP(>nU%z?Crmy
zq^p=a7&d*uU`K?O9wn8x%8^TKtuo)PiXm!N+F)-J0rW2H&15zj4b<#!ma=gQlbFcK
zsLC~2?46tKo@JfV9Jp*G2i8_AGl*|$KqCj~V~PDxveWn5)4!r=A8on0w^MkZ3ITop
z14x-Sc~#<Oe>!!vp<XS;mn{37-cqcAySvFB{-zUUb?@{KCxT|jMG|>)v5C@P+`)O=
z%2~FZuPy49%+eUP`+RY8+@z$V8{@6PpAp0rkt3^*Cq|}QklM`RzK#T3h#|s3SnG{5
z1%RS@NdVXb%wwEtH?L-rE@S!%;_r_vdCcubK_Dhc<Qn2)Cj&+cOZF1o!tXIkdVk6n
z1tN5+aF9ySxfD!8Zn&4-Zmsb^U@P9}fzFs;LW7{Ms+R6(eZ)Y70BxKMTuy1gep4N(
z8KbC>ty$h>WGQCVR6fq2I*C(Ul2U7sT>t9#qn^8WOE0OdYnf-SK^<%)KOL>XG6Y6e
z;yM(=$PMA0=9l_3XOr`b2~-|MG0L>xCF7gM@}`t>lM9|>2}ZQ%LJK}zq(MBm@WZfn
zDvRtXo*Y@TwP}^ZYn9k~Kq*iV6ioX@hj)u91kG)6L>5nbAS)m11WN1u6w%G|tu>}t
zKUQ@6*{t7tox(==Yeg1U$v9gqHhI4<wcMb-J000)pcIrhF?99ZpHMnygG5iCcY1aZ
zFbp9cEjf1+idjV)es=0#?Hb<i`}a@uO2idXJgR4OZ|l4l&1VCU(lR4l^DK?De(hkL
z-5uY?{F`i8<yX1-k0)!x!z}mhw*iPsSb@)TJ1~v2=tR~&0jv39@^COEACa1IN`N#^
zTnSrI5iI^a#nz-}<9@<DpuBKLL3;n(AsToFE)B0fVInC#Q0c)Dw^h*{=um20B<1=2
zD#JCdlR}<_L-NCD`^gktC2l|(0Gqn_@?48dVpGVrd=l~05lD|e;&r$>8{$hs(m!ss
zo&@~xL4VPJ7-Ef1fEtP4pDpgNJNfl@yA0{_p<fa|ma47<Vm2B#IqJs*WWIk+B2-xV
z;9kMb9ij7XI7@r?-xh6*LKLe3_(O;2{{RdMESzjKY{WyaOF)QGp{4fntZuhB*nf!4
z*#^XB{Gfp0GFWqL8O?om?!&kE2j5ei%_@p$E?ioLzrvvf6D#F-Tlmm%(rt#(Ouu5`
zfK`0OES2wz&Y368{iL$&IQFtc5LOgX(2=8K@IP=GjopF$Q#nAxbL!W%-uLG)BkE9%
zFS;z?Zay4bLVR8d+a`YV$@PSLs&#C?z4|VG2GA$8ni(Ht5uTMedZZcr=>n8>ol%N+
zLgLWNFSr%TxnL{J@d6#Q23IMo^JlB|D6_(&W#F^i;{!~`*}Gn~#I*OBIfpCtV-{|c
zMF&gXq3#jc-2eXhD;ky><>LNGAsYBFcPF|xtD>(=fix1}+Rza2G(mxNc1xaEBeJqy
zx7c{x%oh1CVMs8573I0v`C+%8c2?v9$VcLw!1iUFsv$Y}Tnab!)!`gd)+Xzv*@otn
zdj^3@=oR=PT|HZ;)8^l2l6|2Cxb}i8&IeBswv(Nm@54(Rf#$0<lPM<45bb*N22Y1(
zM^&VBLJsRp(KQFTs05aDkXaR%Y1QV28GN<35Q=lB*t7u9D@YbWvLZd@rg4lizpP6u
zNg~6y;A1=WDMcX1>KR;c)_b=yXz0W8*;$bOW?##CU_b9WEi};8_yez2T(SLj@1lnx
zY)49ow&Uy8h9a*d#~1c6zUkY{$THzd9<7ubRF944g0_yceIwTACh}>7OE(5!_M}JA
z;kFF({g&i11m(W!)DhQCR>ddP^<BE+2GBQm<5yv`qGbp1`uP2goE$}JL}lG_*`eNg
z_j+Ts$hMkJN}FhXcvR$2rU>OK3^?g~LGAj|-&|38e2qLTIK?Ri#G_-{m#^(hDyB39
z44CQbT0o&fIPesQqE2Va??05P8hMwyOB~slOZ`UB1kH^<SHhxvJmP<_aFe;|-S4^y
z*zYzCjS3Gt?YZh*-JeU0;heF-MR?SSDsdb$oOuxo%je+E=z5SQpQT<sKGI+7#_<@~
z(j{=xEO}<SR%?kjG`bG4XlWQB_g=7kYd=|%+eR`_gruXfSo2p|%=$O7d*o8H7X}5Q
z%WC~hbbc#1dS}{c-r}gpHG}xLT#<Vy1e;c}3XS*vq@PolMGQgqZ;J}DZMfN{5u5X!
z{I9AikU=)H#Fkc{+=5~~$X%TsyEMdEENH;MN7$HiQd_IYU3i!Na!*|3DnMjwd3>wG
zztr_7$>0MWNd!01c#GGINBjAu5H=wWZVfeOO>)K|kEB`ff?M!<alAz)owjL$i=U{4
zMwsW1TR!Ck*5wYEXR>|+u#Dv!N@(LDcZ*KkmX78^Nwb@{Jz4G*LFVau*OH@nAKNB5
z3;p?!ezPe76+Q%L#*gGv&Tyu!QkY$~n_O7E_`iFWka{KlCskVaQ`dy|S6s8+AFhJ`
zoxMB*Z91-$^ZMp0yjAx*oy{J(KbIpm`uaO49IXdQxiB4?4dX@unRsbB+Y~S+CNgPL
z@vys0ad)?AQ-%+NY`UzUpZ*IewZA{#NG2wt^fH9m_Sq>~f~_|)m5EDNhT?JSOt~VG
z!hgGn<@xvpOdVVf;nFYC4#=oz%_**B%7_h?_t&3V%RMxW8}I7VzvpgIdNT~mOeCD$
zSAEn_XRAV@7v`|Yjo<%*(Nl7)#H^Rz?y!XL(=Yrf5biwCp;!IkFUw@Z5W-Qf+SfHJ
z=WFeGJT1a#D8;hamO!AYcBn9|$i7m?A->r5UAuJ`HU><0Ae4JJ=}<#Mq#l1142=Fd
z-xK_3zOGv8%5ttzI<2?{ydk=gdRp{6<Db;6)s#Yc%b6E+^mLUJiv}78^1f8C+m)Pj
z20T03ODHxW*H$M(>0-*4n^#tyFLGgy7LzKvG?(YC7N`x_Scj4Ye0)(deV-$#HK62|
z0MVp(X62lze&oIV&SuTk$>Jz|{d$YaETE#@35br<E<7<Tb)~M3UUiB@WWrPKFK<Si
z=4YA`e8H{3B1uX#^a4~w0Ty<w-w&Q(Ip}3q1MLc&u9KhN)(bFI;su|~&PvuUagFVz
za6hen*kemK`$?=Wc>xr65xzl>aH6czDoSNk@-?Rx@^uE2JateS*`0D`q<c&$&Sgb8
z+J8rH_Agd*8z1P4Jxn`Rxl~g?)vwN2Nj}lWmeTXo%*+U%y{Eo>6v8eZCu-6Zm>(M{
zVAom`U%UA9vN@j-eC16QyfB9Vx`V@O^1s|)&&EO*1*aVhVVs3V$QJkgRN}7f@62J9
z4gYedC7!yiGxYM-R`HZ&$mo}IGQjgHJ&xsiW0#L^W_ebf^ZHc)r(mg+*4npqknf`*
zeWTBa0c*1Mm;g*8#92<;{AaV;_;j1XHntmjwK6oYC`C`&HgHR6jvd^bplgBjJ6+2_
z99m5#Zv4+CtBA(f+D2Hq$Fbl&gC3b`oU&si8j|XqWmGuh?s8!n3%a8H1gS*{DH8%h
z;8CY{Z44-g16oOqcHoL`8fY`s0`_#~old#<52Y0;A!QC2*$8g+2I!@6;#gMC!%@$!
zdhqjwoa3v9z^4v2fO~Zbl`ewnD8AQ1_**N^i8WSVN<|OS$9N7cl&8B5v}*iU-Gcj=
zOs~v|{9^`YiyT%^(D*LghIWMN3<HtYE{MykA?e;G!*2cH+hmLxg!$Tn7vYoB#G6}s
zP;f?upih;e*8Q7QX_40YT8g2xue9a(mcqb(sk9>UD{iJ@pl|k&h5dcZO!NdI=2f%h
z?&78T%US+TQGLviVW%?}KhI=lD8?yz7WO>Lw>dXc7+@u@Am<V!*F<gv=B*@xC`+6Q
zs(3p6y@zL?P@th^BC{=8vY)yqze;aEKWoku4kb%%?A*jRI|6n%PgJP+bi0dCLT7gj
zl{TTuBSZKDJz{Ao!k$T0g;fdCoGm&_tdB5~cF_6PVGuxzGSe9&=5F#Cp=0SDx3jY|
zzLVnXEBbbxy>w*AVASPHag^`QzuDJU9ayVaQ_k|c5J(;of^V8HzCg*H0Y{U4_BsV)
zw$V^+FWD8Awp+TcB&;14BcPVzNUXj4ypi|x)OC-Xj)WP;r@`InA0Qux=l$e(qZXa7
z;`CR6J*kah-biqs`^-gd_7VAvjjIO4wHeTVz`f!^y5_$tSQIzlVvIvO&&0Svd9W<a
z>}ccJP3sn>B~BN!!X(Ie>&+JVw2Dcv!do>E<F7p5#CN4ZQ{2eE|HUSxx}mn>V<Jt(
z5$lz(o_HQtR;lM^Lq*X~C@z8oKL+xlmF2%NK|Df5#$IT?;w#Ug!lu7sdnJ#Gg0uW=
zSB>@6Zv|z6HcxcbWz$^pEVu8T#P-fPK^K0C!jxa5AoIF(Wb>9KN3y25RakzqA{=#S
zl1%{#My@}9bmJGLS3F~FK<AXD0M)CL^eAb#RV%2oQzd7rzT_<@;iJ-L%p;|FR9Ul@
zGnsb=hKEK;=*~FK8>A`UZU<E61=o7kug+VC4Y^>k#GhH<P@Y-dx>YBAtIP`~U7wd{
zipkLicfmyB;<k=;i>iXIVKch0zIMWhh5?sBI^&;LSF#^7wDGARCeCcP?Z`0QoYy74
zT~K@t+K?j^6r4<ZfWerv1xLTUJW6JT%NDIHvkVfHUkJfHlHq{|5uK|C1#OGAU0Yx~
z4e+8!DO{@mJ2qbBj*Sbm)5eYSPz%3$2<2-Q;-UKmwn~;-PUBa{^#bbNO1Ae0vt+YS
z!F<AmVa*S$)w;D&bAfzy_Ejzj&AzaQQ_Yw2zx?Nyew+QXc>OLL{j;K1^_<rGeu?&I
z)QpukBH}%0Sj+luzdF0)fB^;x>qbSJ6Rsii+&#Cp-_4bO$b1U`m~i*Yvp;~I_<LW*
z1DGYRJbK#_wtSO*MnT^<smp(ctH46OY+<h1RKjXU%`J1Q4m(E;42>@&x~)zIv#pQq
zFx#qI-I>2JUC7bH54$d^n*$$9%UB5BIp-$fe=|<$pGTxsWLVa)m}$>lYiX?t$oAZ8
zSSHes1r?NbHQq4H=1el?@IiBAr%D<NMC|xY)VLj-NYPm~mm^p|b^V}I)D8@T3!y61
zo^20)2&q-Oc7!*tyLaZ;8V=T50#WF7puC#akLbVBOHH;Jqq51k_!tO5QjX<MVE>Bz
zQIwW^<<KHjvot}7=7OI;kxW!OC<XSr1@ng=xia&yx1n$0&<HQmqR14D8$nbdZi@Vo
zv!ksFI^dFyLZ^od83!edn0|^@_-%tCJ6%N8(^Y26_pcO^XQkEt1`9IVrgs<WPGd?L
zL9z$x_vu}d0`By?iwjARF;LmWWF|z+0lZm+Pu65ZHG0Ph1(&T_*~bP-`+Wl(X>EKi
zIrj7rpx=r48P~hgiRgIF@}%<~RJNfN{NeY)V_2Vy7*?h7ACJyj5GMu?7h$hZneO>O
zc0#kWuYcEw!w+29fzf1pL&hFUVv|Gj({c(RreQ2gD-Gq*hE7>D*pfv2Y=4)RPh|2%
zZb*=uLlOCm&-wRvm0#iAS1ao`4*sJI`mpHW`}`M_90RVGy_bu#;8t>V5%Sv{HKNnA
z7II2{04?0_vvKZ$(#~1++L3gU2&d{MP@X*`boVNqmRkPwj;uX?4?bTbusn7??#-(@
zbp+3ZL<c<bo=?5}joxzIJQ0}o5G_~uQ*xJ=V`}_uhDrB$!3M{lf2|m(8SI?a?sdj_
zbi`}0X`1_Mm>)4SZ!}6QDCLsvfd1X_<=IqmfY<pXl3|m!&17(=<(NW2B`glPKZN$^
z+3lO3<T~RJq+AkM?vPYrCB^M>Rh+M01nG$Malu7%PgUvJ7=mFk=@^<kWv*X*6de-@
zSH1-oqHz3C<vty>aQ7Ldc7$nHaT2E*&a6R;zLG%+K9>?pRib)g5~TOy(QnfQ@Gb0I
zJb&CMS1!21gf|vw3b3V1k85s|;g6U$S}iv@EXhrO<N~UT^brH3DV%dvm8Dg4xCB(P
z1I*X&jRj38@`L;~vh3V_d|D^E+tn1X5MaM~?#X0@>Q<=KEDI&2e_R^<NP9$ka+O3U
z_PH8Alo=8cOI)hyqKd1;To|`4z;A;5z)Y|-^vhG&BrmbviX)tud(tm}HoLa@s1*Y*
zySwCw--x{!L~N&_gb@R8brVsIYLtetAcUk;I=fVJ0HYIp@Yba#9lb@2Rm+8C$hM7w
za1xyJ^~6MFLj!nF2B&8>+dI>(y5=Yzv`;|G9dcNH%`2586va50W#SIQ2bP!r)2r<{
zVgYWajuU;@0qiu_z3@Vh`)y?_=fHl?^nHY@{$Y+bZflyBh&a~0ToPOflEdHBm7ehP
z`}mialf0M2s!#UKM+#Hdc{zyIVV*Z1e`Z!jYgHU;$-_@v*6(MCo?mxgQEj}q3oL#3
z(Lq<fQ%-}5+n;$`yPKBTeedS10qYfzeD|T3rz-aW^X#d!#)N$|esA!KAX{~^f~duz
zJQVIYSeD=2w_p3>rE6_2avf7G9Et|mYjk2<DP1#%7D6MRzWOx#Jw#OMH8s8+a|`x1
z&DkL{NTUa$K58YawXRin5j7j`zaXa1KQNRYyBQmj=j^EMO=v~WY+KvG_zT1%SKLh=
zZdXl?v7fP1XLyh=D0d+Yq1q*x!^xwu^-F^Ogwc7+-7-k@lK_XIEZ@Y<wMpU!Nmbl}
z+b+o-@8@||#1T?*bp80igqVUydZX&$F^5Mc1H2@B42|{c7TAPt7vII~8*YrX7c4{e
zOQ(<8a^oH}f6k89{*TvBCik`N9G79Otb^bDF_ncT+uZ2d?15_BBPLaZ7=gf)-~fa~
zb-7L-G-9M8reNDte5X@V+v>nF+{7*MQ^sYe&IIJT^nQY7Bsd*n`&>3i2&n|Uk!S>S
zUG!dx45Lh$t-IX?B_i|;WB|NT(abn?OrZdr9;1(xfohS8PS2siGvIa+vmzc35{Nr#
z_ZE^_jN7P@61{VN%QHS|;z?s}Q-$+dE6Jg|+M>%ui?FXfT_R$ZT%LZNsnh>XM#8Ki
zu21koBy#%BsECLHnIrdFx3BqeVY%f92Mjd0`Xma#y)vvaQS6E{$~KIE?v1!QIRV`U
zojY00Z}jq}b)fU0?L)uVeB{f%vA?|IIX_e742QT}f?vY8%;nwLEqaKoo|$=D?d8|H
z0k5ld&P46xh(MnVe>O{DOo_p*Sy8pJ+O{T_Oum#EpX{l|Lc>b04SczUDy7&%rxHdm
zm2X^>TSVetsi`A7w3lD4&*oO>J1&~3>yWOz>srL3bb;3$(EQgcgT^eyt$_*R4nX$j
ziPFiv-tyP%Kfz7~7#eMRd1IU`+gPGpX{K0iJLGmXG_`jL&-^2(L-s02sZcJpQVB+p
zzSvbe&qHI$QvrZ4&V+=?_NFYlR@NkS!JLFKu@Sq^%BX*5%4@rG+mAoQFy^e!GW#$L
zWS~I_xHMS~tedK^b4{sl<$Rw$)6Xx*OmNe3C_i8K8&-1=23-F_nq-OSrfv|-ocKnU
zCu>Oab&soRluZt<F~1Pi&^DfuV!827qJi{qMd4$qn}Edy^-Obo?Ow4C*A{2#Il_oP
zQYL1mXf<w>Z%m=wsf)=qlOCJdUh$S7t(#%WzOJ1qRx6@AKfKP;m^y;v|9b&=!$>SB
zlu*#JwXI;|q>s%w_VI|64gvqa_&<2yJF@gVd7RN`#=bcr#FnEPyICtFF_ko*>J>$9
zx%JuL^pVoavk7t9GPcqiZrthAoh)_R*nB?vRV<awypfXR?=>5Y(?Ca|JM9c`mGUvb
zzpOX}j@BZ3{0OKW&$&iLCN-~2Of(QN&TfQoWlfj>qv`O!4Tblx#r`er$We?T@F~>?
z2Lvl9nH!!dy}g<(ngzP3qk-s}=0b?A!MMB>U=y5Vjo+o1jjPb|J1)@{Q{&NpTM5-v
zb%<Xc6k<wmw86W?Zzru<F;F$<k~xvGzB(lD0khjwynZqh(^GNMef(uQ-$qe-4{YM=
zNFuFXHGa&A!k2|{6Mv(D&nQUP=L$t7iA5;s&it^0#nzw56}gFsQhp?D)|Jc^ZdM+y
z*qb-1M2lXeJ-?_RIEtq)S_JX>+7d^=va{Kw=L<X&_%;9JOjTbx)5|+b`aAe6oxG=n
z!I7v{wjrZWPZa%s+B#P>5GCKE9p%pP;E?3sL%3&b7a~;)B8~J7NJpx&;8@z=hBnhI
zxyNpGvJBqJ*yP&<4Jd4Q_-(8Zt$RTev=X5JO1fW5DHp=?3r*xM!}Yj?VzaTMJ{>;{
z;pD_hGmc5Ae6X${hz++O6>hHJ;{up$`i}gSFcNB&oXc6dMzh_EgP)v!P@1&!$If0n
zf@Ue2O^8*=>~T30n$&xI-w4ez7WENire9)Udsjp<k>C(=xsWyGFmL1M6e=PSE`ywj
z>7|R~2X~XMztE=+iZywY?#GOiL3%7K;YCV0R<*yb40M<MeqbIoyx~$j#mGBrtR3d>
zlJ}-OG93KW@fa^@z2IorotfH6wN70>eiV>Rm$is=beRL(p6B5fmEukXy0P)3W%3Go
zWaW$_)CTjgQnRX!IXHlo-by5o0OLRNYi(ctYtBq1`jLq7?;73UD}#GV?7Ww#uioYJ
zsoFqqrkZZ8qH<h@0v`AL;bX)~TcbX<`M`6lMNhu$O@c+sa-9Jb0EsB|n|&&ZFLD%m
zzWiseSCQkVDOql^%k0vFCybcwe=BEwd^hoMHQ}Dw!#DABI*~Vi#C5Ew=*W;Tmb4_G
z?^vdpNE!NJlyV0Zl~Gg;&E<!i(1fz6?g=nvWL~%VyurnWf!{wJE7*RLA(y`tq?NO#
zvddjLs)a%wP~Kly=;*gNNjM1p#5BjqJ4{%NX}pftH{OuV>SpiyW9;QRHBs=F*|6{S
z?PA1)f$PeR4O!cQ0Rp|>N|%A$b5Ok|c-OpxIt=w{{bl!X`AhIK7f}U)rf+9{+kzAE
zaP-Y>N~y4U)w{1ne|&68jI)3zDj2cDOr(s)OgmDI0Hr)E7X5bk?dr5L#KQBi>aA=t
zqi^UwEMXW~+lQS!Kbq^e+|R9)jxQy=(7E;jK{FIVi!iLUTYPW?Pl}Me11zEhmyhA?
zAu|QbMrEZQ^`c&9850lU2o1ugK1{KsuLsYXYyU_ygcu(^S-HUrq|$sZ&l;9Af?cNX
zMxC|vEfb9zdl&C{@Ec5KSLnNh3CQQ+kl^Vbt*2%Zm|ikf&*uH5i;yO&@CL7AP4z`X
z(fIs|Sn!aS|L7G_{vQX$dH?70mf&Gt*|n}f6ivLqZ&ZG9<q%a$`LXdnauSBt&IQ0`
z<v6?9AEx!1$|?Z+DLlrU1%_EGZ<`1wf9-ioek(R|*nSsR%-};?h>Rs))Z7Y^CyC{c
zC@=pprZm3z;}D~_0bC`+pUf=wbdB_KnLa;GJ>!WdhZJ}9J2tMu+R!Qgi~Gu%%@Z9q
z0yaL{HxT);Z}?+mHP<GuK9nGnXS;2XfP^XgT{Vp%D)paB74t194F~sHr@!g`U@o9{
z@HNw~L61W{K)Q*Djb%G>9331?@vAGax60c3*if=kC;UFSn8}_p|2D4Jnp6~_KPE!U
zA`9Lt`jc-(s5@xa2K2x)ZpW;kePtsG@16}=5!|ed8k=r>`_xZKh1+^A6NBVnHEJ}G
z=)9KGq}@NQsfz>w|Kcse)@LKy_KiqVXPeCWmYaRhp1Gxoe6)O$<(oIj{sHx{76cRY
zME(-^7-Rj3NX58+;s$2jGH+y3%{-QaO|Z4X6OV@#`OmlEI}`}yfIE#K{V4Pg<1R1+
zKX^q%X3}khm&y5Z^m6IFjsO(D8TZdO!dYI}_OVSy#!l}WtVu;I);9ptI-l{>YJc7>
z(<psKTA20-+w3ekV*-kqko<1gUl(G>9~EfnirEYe=)EOO1ix7JCbB6K6NTeKxNB1A
zrE$HlXv#qJjoKxRsa{E1&1e3jJ!EnLc4d|gZc1F4lb0c>*jkTHsUlWV`YTSKY<A95
zGiv@3le8!Eq`ARH%1aO4n@KUN!^%98Eurja)LuhOz2vXhamb|J>!S=QQH!GBK-X4R
zHPZzr?c!kIIBpsje5UO2G`%BqvFB~{=iBucd9M!GQ>6d%qx17m=b$Id#6+yl`+a&~
zZsyar@8Fd4+U3oB&*tMU$?^#)g_+1Hcs?P0io-?1iq|{QpVFJnMp_e;StgOEsMMmH
zH7*FnOro?j(`I(aqtDg&Mr9o$+J0Q=&Qh*4J&&k2Vo&{}G0^Ut$8+7q*_jKHHiB_s
zuvN(R-pmmMKhEA2&{3|1{oE-x2Xic%m?Wi>bgbgZ!me7K2WSOQZl9#x*lkJ$6&Akd
zkD`MQx78ff84XHZhISj?^M`$u{5kZCT=-G!y(!oC>lGg{Ki~LYc>vk{qSe~JuJjDc
z(l-GCw2*Z87g1Sr;zC-M`J!PPv#~}rhp!mKx1>dQzL$5(5Ff^Hbl+zT4-2Ed<&Tcu
z#aIRe%h~59t`5kqQpAIHO+`#Bh3pu3k;OXFWwn3sJ~?K|GW>2{6`T;de>mQV=lY`+
z+QtVHN#{S`HpAd5m5o-K^VuG}L4xmu5{p1IYfWk()w=kK>csC|w|xQztg>w0>LDEh
zKfpvNwiP8M7CG6Jl|OZCl947X!OV&2^1p|U;Fp~i=d)Aarz?N2$gh=k7BW9RO7WgB
zU4@?bjaoHH*uzh!IVZWJR-DqeOWuWy6{ry}Gw7mDTK#7lPDOQR!`7Zz<e^3AZJ`B?
z%>svoW`S6346%e1u$<ZQB(8ZNFl{2p(miqIFHm_FL!qKtO1Lj<dV01>Yp&@%9iFVF
zd6|bD+~KlX@N`Z5*InP7&~YO1mVVVd`7O$>pwe`O`)|)lbIl}((mN*ugE(7!_>iK_
zzBRRE9`{xwA%VXPmnzPlTV;a)=A>Of#xFg@jj!hUXj#5i8s8ErfXcWFcwDS$ZGDW&
zUM327m`e}1Tudjwm0$aNO?!5_W)TPJTD!bp%-7-|tZX4WEH47Nt-V}}PF2G&9KUM1
z)R|1j#YhWtKaDI*jcfn(C*J!>E-DMw#E%#(5{k8qXU(*p;FK%<NRTjN?*DL~s{Z{j
ztNN(5vwd@LxW?ysQ!w@hO*~$|_{Z2A^FQVd8@F~ya>bZN#*V%Zmx49He=~_Gj6X?)
zEyrT!cX!gm-6_3LD82nd^8tKUY3}|K);sj@_nyPOaE5wpHgzze4#X9ftnf1wBSGB}
zD&uBbD32jIlE-|UKHzQ$;u)KvUuj|(BJnWI!*^WPn%7P7u>nHFV=oFNvLRb&EgtQE
z-PAw2BI~S`UP)SDIL>N*CioKkkG|jMo9%}<M#(Zlb43`0JR4?~vH!FY@S4b1avjUs
z-*Em8J1q=-isz<Ci6X=_bqGI=kt7Wl3)X>=lAy#nNKN5F_vO2fYMCuz*4LRgB**^k
zCP5#Jms128xlEQgOL3;jQ5xg#1vJw(4|w@68^uejSTHP1^W=fy*!@Dm$@@Q?N)|zP
zJ3B49x;P@_*|cKg0gnf)?9KLs@R;C-bn(Kb&E3b8?xWc_E1HOm=J)gl${ErFW!O5*
z!?LZ28Sl5g3@xW-90sh8Nk%<_bT*$&_vOpW`ydI6D5t0S8U{T6nh38^zv7}1^7`=&
ztug0yER3xj2LdW7255?1MRf_mjKWf-_^O?Ca*@OLzPJTZmT1o}pmg%=h!a0_&4|X$
zUc4%`t|Y^T>T)P<)$~wcffO+tc?s_eE>6+D$98Z0!1q)P36ao>iHKM@AoAi&$P2zZ
z3z|CXeh}?>d~7i?TCZPPajEMvt23%wG^$$`Jzsx55(mHnS1*IdkW+nKzV!6Z+rG@p
zN}o+DH&4{XUAqj<Pfw$*&^m*c8qP%LTUu~+GE-`rxVB|8DG?*vjEeHNA+}oA(h{6{
zMegmbt#suQx*Ydsz)f%TWj)V*SM2H0zS^l83?llD4eZ0VjD)>tnuhOxz>a#A2)?Pj
z^~>jfZyi5z$MZmvHPe9O_-3BFg3d+6>-+cC*3NAo2VXy-6l)}lF}p@R6BX+JJY!g*
zU3jbk=T0*LELFptwjat(ntFyqpEizaU5sRr#K{N<N>OE&O7}K4P^&;EuBAtQh@+St
zZdy12wTg<g1QNQf4<_!zPXCKMl|aO|E<0C*OJLwc|JGa8_2eC-z;(0S!S5qC69iaT
zi5~wXz=Vpw1$pB0ikLG0hS4xw)F`$~_j6)gTQK(jwP3|D998qO8_k7hO!DGPP2XYs
z8{zb6cQPf9Yz%~EwAkjQn6TCw{8sS#Z>yMy<9t?OKKi#sml1Z~NVhO|WXOacb!19@
z=AObjN`!4GJ9=DbI}4z76FK#}l~*5dIcBVMPjKql;;0EWfARPu{+t*rZ!A<=XcmL_
z<=^hS(U&iHkHErwRzxrU9;Q^Bz{GCJvr!nFM;hY%bT3a&M3qLT)s!3t?Tmk6$>)js
zPtI<ItZK(P66ofpLP#deB#0u)-5MuG$N}o&)_l)H&Q|x<O`@}H+B-~)v8}BE&e-ij
z4;SJA=_V7Bh@kE1c*UurN%pI{lWA%t7L9h2NLw*&=2t_#?%&ElbYcew2hpXrOz@N)
zx6ut3(~d>#Hv*p-WL;?qv)yeN4{l-QRlvRfE4FO;AdE^!QSx-(;6i0Ln~&p5;DA>b
z-F=7?&})8Gv*1uY(qLf41)jX!M7FSeA}*4bN0;0fP8N_CQzcM~OD?bE9CDeaU`2Y_
z5dX*c{CDc*=jY%n|A3L7F!K+eq}I=}Xy=#tUQRmBY?fi`&!^rZr(W06{ry{bp1K;J
zS>u|GOdLptlM_t>$IpW9gok_!Y!i;X<ztNA#R4n0Yv^T>%_GA9GWvSmQ?wy}@e@yY
zw9(p{sd73^uTqXZQ?sCwd{*hk*~|Txkugj?pq61|^5yCumN-{DUP}wn%KG{iUeU0i
z{QM0FhHhj9h7zPwy{A6EzJ_8mrrNX=b!IpgW!hEE?)@35&)HpwN$nj8wy4~gn7V_8
zTQyYQZ>OevI7(-*WsjL(QJy7MrW1T7n%YlTPbG_;<OZ0mFPCNW8GYPwmk&8h(?v|a
zK0XB?bd#=tL4gmvj{O2tKaBZpKkUiEOu5IT<fy4WAm~;P=ogJDE{GyE%ctWk@@Ql=
zfALe8;S$b!b)-4A-(mDifJ>{~lir<M2*0YwAVmgac&;X~Ba`Iwt|n(!C{t3NE{ckp
z{f@Nmrb+<j+lLl3^<Y6F-$Lmx?`!*aXp+Zb<2d1v%g5n6k5uy*!u8vk$)J~h;ha#S
zPxAqPFX>-~fiBQ!((cE<7CE7X!JAXTkHG`>W%wLUP8U}y*LY^60%E9N_7D9A&AdN0
z2yzkg!;!?sp}MNel&HNITZzu#%1?kAqC9d{n*~x_V*fVs_G7-st|hI&sQ~X=_NjCC
zZyp6u8DX3^fp=lX4g(Gq1nkJ6$$WpODFk0XLQ~St2d&^8Pu?<g?|H+b60mikV+wmY
ztviVwnXz!v68y6>QmYryiY4G>U09qhax1yKyrl0pWjKUf{_m(Z0Uh1!aFk^IADJj6
zZcmgAeeeY5IC&z47?ar3-+3SLi_N)VhnCMXYG(t@*Ei13r1r{xMX-w(BKV2yO@b~^
zi9Qp7=IyJioxmVH{cN13LJy=#@NU}xMDP<;AhOJ3_ux_va~#IMF!gqFYqlq|-N9I*
zPM_ycktsp)I{>Wa8tAWV4832R^}tkO2IkD~o<u(biuPO{wR(-#&hE_yj-Dcxbb&z9
zO2e$xuR0Y%@?;B6cF;HCCCXba-$npGq;;0nn4PLHM&rrrY-Tavhq#UolnBL*uN$`W
zxJ4yrR%2toJX6N10A%M+r!3b@RWBxh4^vh?hJQ`=j-FRNuJ}E#aUMVz&(9&C$<}Z!
z8pmY!cKFQaTbNl&A!{~D?y(h8U%m)(LsTGf+2!>txHuq*p42NCTgCM&SkY^unUacx
zg;bn`)_;GvN)&hTt+UEQ-u<ZdpTKBII+39GOF+6-S5>25u{kksHoCk9&v0q+2)c%O
zAxUb8D63oOJn!)B@n$WewDCF>OYeIpO*Q6%ifJMPy&MWiGxjUpIAv#_KzzPcLTcZX
zu-*}pu5lqMc><<yve{LfQkoHig~$BuLLYYjxLZS!qlmQlMYZ!H=yPYs8LA|&r~A6L
z9)YH<gRwOeFru<MoFB|E#XW6~_pl}Yk0+C@4&ml->k+6tucp#3p()_>#i)*yHj{ub
zMGv-GCn^7xy4HZh=jA?3j{)q3?|qi%0+z!F@y*f5#E^Vl3dRX2us3MOfE{Tq(V=91
zy(#+06JZr>*<et(sZg8MEINj1BO{x)Lz0Q>`1_z)f;qzV&+aZj`#Iy1Q<>tDgXvCO
z_*k|rOn-=!=?}}!R^F|H^ax}3spOzbamJxKAewm4P`jaXo#aZMJ4|Q`XYFBi$uKD=
zC*>#>92r@OBkr%5p_#T>$W$A<53HT}oIj7{qv9L!euQU~;uH^v6*9u-b})_BYV~X0
zkJdWGy-k&3HkaKk7=heVpsEB#d?y|bsU}M62y<cTeyCW-GyhmaxD8gDz5RWITjuUy
zf^#F29F~r-^5LNG!g6`qq<36CZ+Y1WPSO)#9j*LmyFk^}(NWBzjHmzvd12t)48Z)I
zUhw&7fzKbRXS3sTcbm{#h8UD9Jt&j$#dALRw@Qhcq3}n>x{e=(;5^{ZBD${xuhXo6
zre5geqPQovn5pqcRGKE5Z^Kvkbbf)<*Wn`b`W0c8ZuornH#;$A4$LtGs<RtLy;fa2
z3t}_;v}=I9L{KKSnWQGzPkFw1+*V9?7XUeX@2{lnMYOMQKK|TTnDKlIHlfD>g)x~g
zj4#S8<odQ=9eZ22Y0{}XVXMp@aK`lJbmcSR_A_@K$fP$J^l6sTHQ|tH)EE75p>(vt
zHDL~1Z_dU<7(7<*T)4{TrR3{X5Ck%Q>F;g>nEGaMR>XAgebGXy2@I5B3T=$vRM+o7
zgwa0;Xl`$<;Iq#^yO*^&xCvw9us2RmDTtQo)v>xvsp=I<2+0%KvQ-tkm^7A(&ckd*
z>ffC3I1vg?j_ejw$Vb5f#m$Ps+znWrPW|e>Ibz|q;Pb-$Ld=TD<QlzNGq@6A*rdN6
z$C>|SMC`apE~9&39C0C+zDmVX`Nh*Lnx2hG75u>baz1?ao{2vjfX!TIRlp4ocTyI`
zN5@%w+Jk<Q4h!(=1CJ@`D`%9g{ytLnOyw~_m)ATqLP&KXI=b;%5nF|jF6NmeuQvqD
za08cN1cPoDId_?%Bk9{K3>oSin5<-6o^{KVBzWkX+h>zq$02-NIHe=$D`5w{5$WjO
zG(PO<Atl-J!2|I|HeKC9JQe3#Mw&2c<+$rgCKq2x@u;&|8-FqKE0JNr;XV|0?nqrh
zP1&sKew$2hh;N{Yg91AH=ASA<PE}Ex=yamD9h=XmlmymBdVg||E%qZbi3=Qs;wBHC
zz*628bgbyR7t-yT;w*wPcf$C8>QjQqZHM#9s|9Z{k03~zyR10is3=GIVw4FH);4U=
zc1iCPY#KFcTF@4=3CG4#xTSSGWe4Y4K?lu|E?s>zEd~GPb+P-d=>enc?3mH<;FWI7
zD4v`lSg2GG;Hvl2U3lM=Zys<KG-9Oh6>x%wo;p4eTgZSa(;CallJqP|Agc<5_*YCY
zvc(jd>}%$NwAv$!xW>RpJ;J?9UT)NAuR`LP@Dg0OqlyUV!N**Ts4|Z6T|6>(h41sR
z5^i?~VF{l!mG6=_5F8+d)KU2?eA1Z<wI$d8;v_&W<dw+wB>fRi0D+kCUmL@LWd5lA
zn|d~v+%MG-*9@-UyQlRaGF{UK@Wo>!6-1)hz}45a*ERUh<6(+#9`Rl@H;<8neRQ!{
zTxU?=RM7mT$G%T+iv=;VrflNdikp-`_w9viojKgJY0`e)P3b=i<ll*;qH-9h33PlT
z_#>K6qSvIa9X_E$xyMtXr;v^5u^C>9r&UTRsazjmp*HWN${MA9j6A!@*uuBAiqBWA
z9~RQniO3VHGBQ$O1B{n;^DQ7fzF83oDDn42l*%_%80zXMIqnYp_P0-fAq?%-^*XM2
z#r*1+1f}i7qn=~@%67qNQl&(MV-$|I1*#DX8r=I5Kz+20%@m7k%@ad2+y)BSvMjd9
zeQ!6&O+!%LKo2%CH-<Sd?p7X)>ta%YKrn5};-=HTdh_U&p4+~Xc|>pQc|sMLFVTu+
z<sn*+)3dYMe!+6<cL$Pqh?M&^ZpA>whZym{=c3|&ccvH@aE<3V{Wk(q%c-f7RQ~h*
z24WqnFEWX?=H*~PRPf~oTyphK^IV6H15xK<Y%5N|n6lXe77rw|5Py&DL}09Q_$k`#
z7!PZrfTs1@JW+Ed?=L8AaBwH(hM^3!{Zs=jsH6Yyx3(^1j4+90X&PP3st&}Y%$U{0
z$)g%UOn{Z>k8^A%oh&?5CyqxFHy39yHG3MJM9448o+t7kq`eIL_C}QlyR&hHh6HU-
z@K7LTeOljBEKUt|zeqjxq?$=h#)*b`{!O9C9zhPF{DD2MEy6nK_Wa@^+3Zr}1S{b3
zfbo*&yIa)%K+<=2cYpt0O_6_K1Mm7=T|I?i=O47g2I~oVf^^4zuEX`}ncR|dnd%-g
zPVb+Wt>%k#x98wQHpPpT^B^L0SS&sDq|MGRy*eWh-OP`C+w9lS(i6GL2@>l>^~Nx6
zcgrEp#J6p%`w^7lqk2v`yE4ur0>?;8Y1S~}ceO1BY@DQzK;vQLujFp3+Ob+DbRciB
z4gO|}63yZ*#eHq2Bw#o_i4#q}tcEQpS=2dJUwSYEl@l#$O#6vW-%Px>ot?Uq>C-WU
zYHvA6)){aL)|<W+HJ$-CRgLG$@Uijm<d4q*ZXEMV5gZJU(Ejj`ezo0a=S+lfdX7AC
z>!!7_Ck=dAW(Owvu>b1IxfG`u6kuGUHkVRUZiVP!_}^bCBq?0mI8HUb#||#2V>k2C
z!EI{SIgM>O3**`du!k!J<uELj3Od`Vi*TILR_w%dGEF&tZPL3|`wxppmYO)t+xg2^
zG?Cy79PxjDk@NqALz+zQJg}RC!CGvDKsEs!)t}Qp3mo}8-LmP@pICP37c`c#DDQ&l
z=yCQtD635Cm^9=z7;|$_UY}Wz-siCsO-w7_?g}K}a_xnq&UuP*^?4cA>bEtB>tU>z
zQrv^LF_c)dN+s<x+gKp2J^to7fL5y1QBG<)u3sW5rr-4=T&eVjcp_#LP42WDyN|tN
z--XSiQ_=V=1_&-oQ>f~e6`&BNC4?PX0E@3<#-@*&uvZ8n-~CE?;xRqMl*N<jJevK-
zQB8$E+7R80!A~)mh4q)dBCJ@$HgbDR;NWy^U9{GqW)xl8n85mDp_+@B{SMf$hLvQ_
zM|B?a@_3&Kx>N}*f5HmBI%v5P;8M@Co~qVoPY0gJ8G&7XMD@j8pqYt6<JZMihwzYO
z(eEmr@wKgbsZM7(izYyWac7ZRI<hn9Sc!qs<k|;Edv<U_j1{Fax$V<A6eu*xmhcJ5
z5ysMMi)#@G4tIU@Qk~HlWYX8Qr*HGRrlcya4V99iCri-EYCf1AD!p^PmB882BQ3*Y
z&?5#LkhKRXu>{f{{gI;?*KkvY9NekSnyI2ipT9+rJO(LkWJq0uD#*oy75)fzRkaw3
zJsqPvRXdNwh88g~$A*@JQu&ATSSv*oKWH#>(!{_eTCdrEwOFp<N)HGIiqWahprKm2
zSWhO8+dtpD_2`SuSySW5nay@*x9wnw>HJo0cUUf#T`#WjQ|mG5PDNXOo)UHTr=6zu
z9D#FCkbh}X1n~%WG+MUB_HFTAWs4!~s7WV4w%4xf8xtBkd$Y<G6N)FS&Y%YTdnV$p
z>s~0|*jXRsHsopw0Bi{3l2^p5*rdg0n*fwZfQ=(=ogNFQc(Bj?$wAc^q61;q82CsK
z%f$&~Zm?VXI{jpb6q#t#NTRxbsb&;qkpyGr8e_c*PvY0@_urs2_G&@{9+|I#)LwU`
zzQRlk<)qy|H?vfFS)ZL!k4{0(uWy6SsBC>CD6OYrso*WcYmvhZWAF-4I3L!gXLwY^
z;mfvUtVdvf#kf`f6#xO_T3GJ;51G+Tp`B7uYT7Zt!;|dd$Q#SflH;hLjeUxVyIuH-
zv4bhiIE@<1Y8g`|pzgGH1cP%ouyRmq>k8+T1q<d5T~MbpD)Er!D+g-7au(a{IN-4D
z6jpm%p*tav@CJuR?U+lmPMDnDQ*gtD8n^RLAiPtC6<+5oVH;u6-76Q}Hb)|xydzN6
z*4AyF;};>B#9@Fwf4JaLP-37ILb>e;i>RXs;?biV!|TFP>tv0N!adQm>@wLflAA|e
zx6TVMVUx^O%y1F&*hXP%aW$<Q16SEEZAnDo5fLeuhb^9)&|$EM(hU*oEh~3F9@;x)
z=b_sEe=mS@UY&l`XoHFYdlmB~OOtNff;%>Vgt@E@Bc94gQgAyc>tPL{gqab$uv-vY
zra8r{Qa2s0MC3Nhm6h*bTbGHaZ#+hdw;W)nv8X-=){6}?(ZFZduYyX?$R4|Qo>u`7
z@AFjHA9~K;Le0y{S*3%5s`HBB+U$1xM203J!IFUO3IQA%g+~U98kC7Dvvl?U2ZTX;
zz7gyA=;g~ZbWdrEHBc488lT32da)qOjcjr!SvCyA#4yZ4BLKQyG(jQAi`W`NUTCha
zOZ?=?bBD{aly)rY@2(ZchIJVa_fJ%1o$?7B{m|pG3_od%fq4ovZA;S}xx8AkSr<5~
zuqixu90h%&M2CEq+lWI$D%jws1Vt2wMB8@aa}5e@mHceuDYr8utrdyJVK{{W8+!`f
z)n|phu;W5vf61XGGd=m)Y9r6Ogp(weo08YeiDn^Ejakx~tbx>3WQC$EZJG}%%CZtb
zVM=&5MiV{EGsLvr%yWkiil1NKVNJndKVYiNe7ip!*|jZ?5BIX(C-V6C#PQIxTrRLC
z<Mo?&te4A#LiG&eoaQi*ewvuZk)SljNZGAb#_`x=bH`!V;e+_$ip*h+cmexCG*A6J
zv1<-wDXh|`G~!dMaeaBovMOoXmagkK9FJ0tmN{LQqJfO283MyNG5eXKv}A<>BLl>;
zEQBH&gl0OYAEfs&MWKuRMH`tn_1%D<JvY}|g6}~Yj5P^@SDopL*2tDCbB1F(5{X=2
zuUKz||31$XmsczD0^Yvcp+YV&KP!}k{c*(QCAZI>$&0GUDYKHQtf}h-CM&R3p#R#)
z=O8n&6P!;T0HY=KNLo3$Ih}KfVtUeiS?=!cSkz0=iz#(}QJh-ClWpmj|CSr@!@>2-
z>hRQ)M#Lcz(u+lIcHv=7V^2FAP!aClyryXnEEbET5zEpg6L@@jBzQyH_gr0H@#Pm^
z;%r7;FHkDdcRg=@{+Z+Mz~Qjxu;0;j4ZFuDJdrPc^%cwIlDaNA9(H889Mba?=m(*U
z>>eA4^8G6d2T^8RVFn)+7=uTufZQ3j+mgDrC@lfN$D?d(`))|7Lq-BR=0KJ^#%aV@
z&GFDPjgYyLAAfi&iRc*Wh2hzYt0Xg-$qUDJv*79Jz&z=5BF>b=)Tc^Feg?An>xYSX
z5@E8RKV%0+6iHw&fXhhI8HRL0gUvKbnO{^@;xLdImHgaJlv((YY=jbP)+wxaN_M6g
zg9L~q1XPUi%rnb##l=-kQ5pJ90zR~n`EyxT30RpYSV4w$il&#~l!$QgrZKRn*L?Tg
zpK+$ZY*zN$7tgnRbbG^BU;m09zW+0;<%-v@-}A%wZ~5u{J=zw0^z0e)IMernZ=I%@
z$%_|GDOfI-<O=F4$7NzDU9Xqv3zwWT8FmW%Ya9o1n@Or{I;rc-pyCJhIjQBEhk?a%
z2}<*{+ll9F9Lb#Mo`xwhB;##}k$`8hDzQ$)kmDHApz_r2nG_BoC398hxZJQ<u09w#
zeZW}D#~<Brb+N*0nEk*!dsG?<8f6I6Oo-{>vNC{NuQS$L*luf~nC5~*-tT*^uNPER
zhRY4jaU{=czWn-YE-x?Tz%q`qT2Pg>w1Qb7o=dC$ReN@>hSCgA91>|xr2-*N41FgN
zYl);f&oisl>O7Ou30orAX?qS_J+HUZ0Q$rbJAF+4RduP(FR0UC_H@7*Bk^io-_YzI
z*xlc8e}Bg`OBDP5(DBEA{AV6_Ph8*JuwHMud)Nbk>)RWyZ*CJ$KJxPqKk&m}{=(zK
zo_XwP_6Jmu7v^?VF?0<<TR!>tV-(^Y-R%zC-|gtzD5TPH5=Tael)1x1PhFM_(=0)u
zbBfQ>4kBm*H#aM67Kl+y-4fc6%c%ftwhN~5RI#gMj-NR;lISg3Jh=?YT2g<!hr^*c
zw{5R~x@R0MeJ7)t807yWmx@MV(kxPDQu7oNAvXnoWWpZP3hFu|crRO3rP7S{L$xdM
z_M8Xv){5IgDU+5AiK=R(;?hPWIL6BF6(24xpCaU{DyJ;-^D;^_n-e#;YqCN~5u^;W
zpU;wu(=#M6f+)bsLd?-mj}6Wi41MJ7+b7C$C0$(r^X#(tcD2lT_3VnDUjInjd5-PK
z`*-*Bec;$m?Ds9*@yONHmaFZCX&UK<9<3w+SsO40#<8a;9g8Zb&K-5((3wPf#W|1}
zO+O5jMaH@=u_)B6us~rfxkc<A+7go|PzQxlfqobmgXYl5z)~wAF;+!+2EWaz_m$9v
zoH5ZBGgp9$41<?#NqRvRWzKS)<1#~*Ta=QB@DKx4<#=|x;_mUl{nH+;JT@iloPcUl
z-p2F;S1gwB$;TIjdE)kF%W5sw2xkp`Qe14ethO1b$T&nYms3>^S6H?eH>{Vk>~Pi*
zh~%ZTyIKBk=Se5Tj#!UevLc=SN$mWnur50vIL?XYPG%gQ*^915r3cd*moohH`C;<j
z^Z)ltSn1(>NS)q(S&?b2ndXVU-7)kHK6tX+QdJe!INrQ_&--@|Xl?lVS6^W=!`;Js
zE^n^+{EIJ=#%SQXfBHv$`uQ#G;Zf!&!E>|Gyt-Wyhn{D*HT^VW%LO;Lx8!BXYQ5&}
z{R7i9vaBomVWcvK%tW-+k{RFwPJ<7YDVQ@oLB~j*S{LsJs#=nV<_Ua=GE_DS>#PJx
z_z1{M$JvVa?{`>hsp?!})-yv?VjEj5D~5hz=w+c(78QqfVCZ8CP7UX_&03eXbTJ{e
z72}XXQGy6I^U`p8yJoej332A5S6edYxwx#UYuQ$YSuW>OqW7tqI;9q!^=E<Pbxa49
zJw@)F@)YE<7y5~$jvH&R8B~jm)p9{pJ?l-zW-Fp=6%FIyG1ke~HqR7gPE{3&+#(qO
zJ_HP!Jd>Eft{K?xI+|WG2W*ycXeZ47{=fat-?mN9)OS>M%}+nSXBbAFKYK>kiao@8
zPxLcQbD$_3&tBY+7mmYzhmMFNUki%Z84-*1^GHap?xB|`r##Q_%v@h?Sl6;WR7$g4
z*CMP86PtR?)Fn$nh!_RSMak%A-rYT5on!2K=5eIRb22A{QjBIehg&MF({z1@_nO1L
z6aG?RnJ2|O&F9r^S?2sQieAj1hN>)Rk1cJN@(G7Iv7Ewr3+MfuXq-~TESEW#*Ew}1
zb2DdZy0#~G71}78=9sopAsJ5x$-m1oE-o%uuP!Ldk}S)~i-J7QaPEVk@AP&~lRh6F
z{Hyn$<`Q{PCWE(0#pJ1_ldV%#RftmkL^zN(5+zmF>0$o2A1|H{E0vZHr$0Y^A5Vwg
zI1Y?M%P<TAjEi!iC@rX=s$B5NXRo-r-ll3m^ZBQr(;ko9y}#q<AAaEd+qd9b3hOBg
zsPlr`%Z;=j<IJ0<4p*)C&F}u2%galOyd=+Z#$jOh_`qsW%LaP0pePH`6Ge$V$TLef
zctYCfiVa3)E!Nm`P;0%YQifq_i;%FBc@|egUMP%_=V`w`fQl5Q$aVx}Eiwe}Jwxy5
zJMqUI4h>BsV+@7JDoz~z(<Ly^Gt(sPpKQZZ^j)sFx~{P<vRW_DdS<b-TwT}lEM6^G
zEHZ|%6Y(cH$zk;QXLhQ-q72PawJhl35S8e!lt3bZba+X`nFLq}-``px_g-AA@Uy0E
zN4l;<5zk8+Yb`d(D2gHz?pKiD)I85ITB<u0A`knK$HT<#&@#?&Y#KJJ3iChx;p=Z7
z?(bMExBSyT{+W+o-r~n2T_Xt}W#({N5wvErU2zIpy}h~S)vITCHM4J9q7upe7-FI<
zMvAfkAMvxq%@ZTfE|(}BF)pXfg`n6RTjpt!RXZ9#2YE;eE9BDP2|@DK7MWvNl@R3S
zu{LAudNE}>;g)M_P|89yOo?+e^g}AG=W{Sd2ns)|bfcZ3(^V>$6_2~axqTXknK{I?
zp#x(rT|XwFqufGmGf2x&<{S>5qAEowSe10$Nc4uu2Ob_CF-Eai)~r?w#<7EW;`-`_
zEGwzXiri(Ws1tTqV#|J6MxV0j<l!L^AFX_DTC?BpDbs;vtxY^`&f8TVBF1L8EEnyS
zvvmEyDXsbJJyWNlZ#>H%PQNSx6;7Fs>bxmBZ4!eISZ&Z&SXj%|iaf8dSxG=M%rjqp
z{Ux`z7sMF(r|<s4*PnmRAOGR+dHd6Ay5pYl_{hgMTXHopP9u}|<YmQv0LnGL`~4sI
z;#c4Bt6%??XV0JGTqZ#q)(~Rghrj%p^>RVe_FO%C&dX0e<MQHyr}uBcM~o_1US9CD
zYmm$n#cHv{8Y{~DAjs+EvSOYl+O9|GnC3YeKZ910x~}nlrm9Pt?nsg62?agS_aiZi
z<YgKr^336!W`AsX_i#MVYC|&PpCl-9I7G5svOs+Zlx4={b(swGvLP*;BYMwrrK!rC
zzH3vbA>!E0cEKDB$KxQ>P$TKhr2NcNwS`fbOc35#(ql=+X24G}3W-scR3S=Gvat$h
zBoud1TVhlU!%Xys)v7|9D7Gj9m+KWpmZ4Q7bF!5cUcGz_qXN?aZyq{+`1zium*9$3
zRq*1)HDwOwi;ouHwrxv{igB25PVx2EpOHC((IQ<4(c_H4Pa_u>8;-~0nX0)v92h3a
z!aMPHj8T-isB5iJ;%m}kBUmm=l-4}$4;-3~rtQ+hF*3(U^m33GX9#|#Oes3zJ(Ds#
zrr~Z;mV_YT0Z~CbF|d@vr+95;QusrZL|JRCoaSj`A}_>vPBcDw>CP!7>7doh;NvOW
z^_1$Iwu;D2Se6-A*Bc-*^fTU1Y%gl|`yF{!p_Rxx%Ce-c7x-D)5^FMwe1SHG?e>zg
zEXlJX2}Muy1oN*d9QoL3c$!+V(`G3INr6r$-1%!dai31DrSO|hLv$#L>KBLF2aAe)
zJbnIsj4^GB(<UoQD=k~2)2;m>(kn)}fI{%(Sw>Nm6lKZwVoOz3bnTJ0Z8_`@{MWz#
zzd7#ina7SWk6dgQ^uqy6#uzo%FFxk0U;Pzde*Ig1`^{f*`|JhR*Vk+|8?r1T%Ulw%
zcKCVb^$*|Ute}d2`^`5zfBua7cW)WmR_2S^(oYj8k-HEgo6QDm4NcP!LZm1)5sBa$
zM*%@rbwODcNpmL;N(eHHKP?{=uvpfFK$4wUydNowoDjr{*7YIDQvyn;foY+0vcPC;
zBBVNJDXWt0#R7%Q*s4k_Z^kHQKcvcE%+yWOlV=q%T8_t&aSZ>qwGT2!lP=0*l#E0|
zkf^s44c1vhSr#ZQ3#!Z-w(A9Tm2-KyrcAWqage|3XV|Q3N|(bN$xQ}IrwR*-GH04+
z0`hT)il&+Q>CGb#53M*KJglmm&8lRz5|Xh!whhOo!_RPiwV^6A?%u!W=K6~L?uo^+
zM5&6Z%#%GKqpb22f~i<7Rt%G69}YwXi@IV}<>)xEtji=qG}yk!YL{9d%QTOm9o9);
zL{%@ax#QvegA5v@4627T;GdI*s2@fN$;>kHWXv3cpgHC!B1f$>#u<ub$>ZV3*iD?0
zb5H2lc@7e+5Je0r0hW^1Ga&&0SzZWQWAa!7%9!-xlQ%-Z8Hb++lune(X=a)|O*4|`
zIS=;@MNx}rb{@{H*Tch(c~ngEB%z(L;Ob^(9J+L{g!3BtWGngQ7LWAEf|TPQDkAm4
zz=~9Y#u&mZ+PB$D^_!&uJCH<ymQ$?LY4LDUQvb4bIKBV04V2fI98~%jw2ByG3d5De
zAgc`_EmHcv<LT*%ah^aczWb+t<}ZKxj_%N5v>1f@eh`}Mab&sKvcA6Nn^&K(y}aT2
z`Z<}C!%1rm!AlF{Q_R;qvtF)n*7DnLzTvxn{3Fj^ykNE7fP(GSB~_8}{h$9r-}Mar
zL|w0_>jh)qbJ*{hLpp?0B_5*;uw@%4P6ClofYFxO&s60?Hh-C1AYDI5#2K(&t$BEO
zq&-d?_eZ8_W`Ah$XsKcpSQIf~Zp5vjQ!b?}b9|6PZ5n1)%L=oufmviQ)}W0z7d(-1
z2sm4Df8Vj&i9q|8t-V%~G-V8gFcZSevMexG<D)E`{7IsM<a8JV>$0LKGmJ9SRn7kJ
zB;WrSczm3AeB5(=wPm@fs9cU#;EEcQq8~?QJXKw$4Rd6@uISpCyY~m~9y|8CR$|SR
zA~Tws>r28sFwPT)X24FtQ!Q%3G|{&YTwT0mvL$(*vshHbRtSaHH*y<3K0UEotr&)Z
zaq`^n?%3^GtP_!^jsXo=SMazyvZ@zE2A1_Q`Ro)*D=xMx4$Xj8j((gu9FDAvX0cj`
zv)xJ(iLn`3xuDq}iPJ0zEotyP4g(4p5>P)zgveM3)K4qVs;=m@r#~@%(rq%&p5W8A
z&87jOk>qKV3_rWBK`V)pALstu>YOSo(tz8CK$Z^C5I||ga=Bm_M)J%OyrOA^IC(rC
z&{|-4vU0YJ1H>rw$G-0w`i`*_dyBU2T-lrs5^HTb7=9VkDxSlW)F1@$Zhkm$Qsj8%
z65{5=FPSf#82G1__?KCD9}Xco;65DMF(7ULB?n)OsnbaOs5!OdF$9b<O!GwM3KsQ}
zL%ZkuAAaEP|NbAywY>Njt2Jf4U>qhs`}}j(mp8n4`7!mPCUXVO<sT}*5L3l#KzT@h
zIYqKHImd7R>aW>eT~b$TzWeSwmaCGR=O59xErZwm_~Q>0#&dafNk9U0kNZ8x;}H`j
z1xRM#DOb^16q>FT!|^=NES43E<$~x%6soOZ7-SCn^mIt`8OzX*jN?q#wrFjs%Sr^Z
zq@{<_w7$bAS&Hc7fy}dvypk?t>eCFYZ7B-N)zwxKeg=^P2#io99Q%FCpZ@d)WAp!)
zuJ>%RB+1S*A9oKOaaF34EoKG-3<!_}xiGGA`RDq_?S5QBabe^PhTu%As;sQcydt!V
z{ct>P-fn<tRyI9ZSyyGm@pInuikE}L3ynv(ve6UXJG2t!zET0KXZDjg$R>h4=b53b
z5+S<APP1zt$nuO35{}0sE*MtpO?({|O(uDwN{JrSJG$;bSr!~m6SEcmr??Dvbc5h#
zOL%Zu<tPoqJoEWSfoIGw-qzok1nzEbNDOQ?E4r@5IY(XB99!|BIUe`ab<N|`fh;Td
zhyV7E^bSU+Ii60ud-ICSJBqyI^W%v_JFq_uWLie9V>|Nk(<4bDBr{2M@jN~~<C27K
z9Jt=B&vKL5N?P!t@99TLq*h8rR|aAGE-^(@+^nbt3kaUPNYMtYi|IDY4HiL6=cL1u
z0`O7@F4w(TmY)mUk^p>Zcow3BMoI0WstSryG6UzxnkNRZ?yjzQcz6H|r&EhkP}ikw
z>nu1sF^n^LUa;L=i54#t!st%{bt$ZBNdS)DTYQz4t==VHN{Wr6ZBMK>>j;7-=f9Kp
z_7V<zS(IMh?+bNdF@!TZIXh^IxuF2pTzp0lFj_@-1<3PK!V3r-Pe*?L-+xP<rrh1#
z@n?VW@A=Dr_aFGnfA`n?;#Ysd*T4J~zx>r-Q05JFvm(nXl0=*`O^onbC@NZO6d^7p
z9J7@`TOW||b9cp?H*bW@q@vA_HoSTFo}w;!|J9dNtA=jq$%-61%`vFfFxx?>1ICbM
zvZ0f4UI1t7MrJF9gIShwfB!_+N%C@<rc_nM=Z8n~JePwkhT)#abFIh{4N*XilFeC~
znX?a8UP4wF#@?NOuX!$qk9Tu)B;m~B7Z=hLYl-roSzsKk(Mo{yC8twsNK<`=LK2e+
z;I0C7Eh6u(9qHPRv7Z@+j-sg0Y6-CLSSzZMG)<X?o-!44&Bfv=FJ(+`Rwaqa`1J5Z
z+s>R06Z`#youMBG(WNGWqt;bTduj<mGh4X2-e7+9_3j&df}MMQ@%8&S55H`kY;d%v
zAxc9slo3#^ZD*eMd)zqir@wy7)o#UZTjTAFb2DAnV@U9JCQS?cG_z`I0jW*KJbQNA
z9qYO#%L?*b%<j;dVVoIe%Zx**L<Ges$*T*2$vPy$%8PIrut7p6QHUZxNjP=`^DOQ5
z;^&hlsRV=0bG)%6^(9G-tg?Mz9)$p!Xhnz{wU-oVe=bsfw(|dtbS2X?vRa9aFeDhA
z5|n5YKYsX((K++v(I!QwDTiZ6Kg@)nMWYpFwwn#_-o0bJ-jO8PS(mq5+`=D|3(hUt
zL~AAGcpk9xBK1hl9oaHMZnis&&VItBS^_&4>}%<?LJ$ec@@M&b@5Q=C*w}G24xkfZ
zV=o2tvd9`Eqnk-Ilk-g0@^^ptxBU3S5B%wGe#8Iq*MH6JtG8@78{U8UHM?sm*iF46
zD@u|qJ!5F+f_+gGwJ~^n>_{|y*YmuWvF;!L@gMo}{TGyZPLby{RZUe?G<C(*c1xNh
z4E=xtiaZA&I2~H<KYd0S6A8NsMoR}f&yLNyCd;K;48f6@jCm3lgL&@7Rb&!9-!#qi
z{Xm|j*um1bEm<75Mr#GHHKM^2tz||Uh0a=wr@vgIfjlWGa!r;QnkJ{NGn}6Ru`HUV
zKAsVZ^=c!z0^XwWs1R_o$0#kXyMd^Th}f`R;DuBU7Y)iN=E*XSlW^36re2p+%}Uah
z;`Vg37NreUp5r1f@oKlFsVjzI;?u(u_fG;lo!X8ce|*4`@a^}XI35SaX{Mb9uz}P>
zxgCM7@8X73Ts5wDE6mk4`(~a7uCLdWWkOk|)K$rPy<)rDfKhC>J2smYbtASi&WnZc
zdX=%=RJ^{uCee!T{`dn;U9ei`Y&Q)zSKHXl%v{|xRAqwJ35UZ`tXD#y9S7QBq^=Tz
zN$G}xQ$I3UVZ4icL_-j%N$}t!4~od7_Q=gOOdb_ee?_$U;?*<H!t_;m0m<VpHZg`@
zynDs%u8}1}^bZOS@j*&ns008;34?gKT|$&FXl>9&)Ab|HD%#V?Y&}_8(06mpTGTkJ
zm}VE5|49_;I!u!B`t=*`UcI3xD%P8=Fx`_E(X!T>R7=!*2(o-uN-@o|#C1J=r0-5t
ztF?Sy7r2*5c9Pfuh4c1rd2h?exsU;^wG6{>c5MA=0g_R|%`-R`neLp6$j{mELS|h$
z2*-~<{zz3-{MBFmdzz+Uz1dM#6?vAi+3ra5iaf7ksAu|<75oe1UY*zFN{QVt8pe6z
zcfbEFfB*M?!{_^t{Mm2*oTjeHk`$wLl!Ybdj#4SbIF96bPF)Lk=>Gl_$KwfWXNpon
zU%?SnkZvT=!of3wKP^#mX`0}yVV=QxNiDZlLT{T=u5IrO)9fQAn=sEprpyXMS*4Vv
zbk)u~@jQ#~(Ilb`&2uQqjJ%M5*$_NgnsYjx*lbtg;M?|R)4e1WFRS)6MbYsKD?XgN
zW`sZ-8TKX~)Gqj#)sVAU7pzw$(+qt#K=4r$32ir$Wg2H?DzjeUtwSpaM$z^?{W$aO
zkN1ShvAeqB<EKv?Pdy6px1XFt2eGor3vv381&S;h-hXjRmO|3c4re^acI0|=jAkZX
zWqjW6$@7ZIIm&v)_05)#A3yTu^;@dynI&B$&vS<Uz^R@2(?9(R?<bxQC%UeeBwGz>
znp5VLsMSe%|J4_qx;^bM(RCv>ct$s)LdNMd<E(s&$`~Q25pXfFgIFxaaVF7%ouK6O
z%hD8_!%osYX_GOGjwA`-Wt)~|DeHAcdwM4Lgw5uPVeGkH?`Wzm51)S*u`P`?1~tcR
zO`2YeT@!U(;^qj*>L?J6>tSmxt93;Pfwq?uA{#74k>H&Cy||q!in0W6$<mzN_By(S
zZe&>z3&b*t5fm<Hd7fCX=XsV*E>JaV{^7s=E$h2?812cmh@pQ{Ky)~dBg@wd`2Hfw
z4k4Tk)-FfO1(;U^#!>PN6RpwyWxM!u&KB}3A~?_K_{^#)sH$tSte~pa5<TD4&=5DA
z8BV#laZU+AvB<i8EVPToN|4GONvb{1hbP+8o*%yZj<@gL(===9vJv*b_oRAR9@sON
z?B?d?yg>yhtDK_D7{@?WHryWv1_IU%T;J4S9Nx*oCeJd4!7=of)@q5Xi<{~8II`KU
zndXi$PiUH)PlqEmCO&DUC<_^#R&|N>6WVAJj~D_J(!B&6Ri?0`C!|H(#EFe_npBL#
z$P~BYbxf!cuXQ<q^C~AvEK1J=uW?F%_99QjJy>gk)(}$C1ST9=B6OxC_3U;H<LJ46
zc*X%mW+a`btoY-%5*?<|Bxxy}K9f=uDU%&h9$w$=`2NR7(VXUn?Yidqx#CH+jDA9U
zL#9%!cJ%W|UP#i;JkRGz;p4}9zWVYl=HLDKn{Q-}4z#Bec~P*~aD4y$_vB?snr58Z
zBOwGH_fI?>BrDA*%^&~xN38Xfxxs}X;RfAAnr1vdKT47Do-9>-eAx5p@xbADU~-nH
zr;gxL4krnjoUQmt&9jI=MP?I0<hbg+L`RZD+S@s}h^<Jv@@k#4yRJzKkDVu+B@#kY
zMmylb!1YbTyEnJ={gHZA@y8!N@UTBH^&>_pbRr^55no3POAGI&ta8dCMwgjH=nh^u
zM|qx;WztO<BXkSr995aob-i?X5l0y(F|Di1in?z2^{;=;YPDsv*-@4iN*hTgR$}8K
zfv5@><xJ<!D9CtbvV_;KUJIrKa`DFwZJ{pwq=>{qbQUZxBUT(Gg~XcugyL{^?~H$x
zHY{G~m&NW(e~ACqS<5i?{P^RKynXvFVuS^0l1s;P(Mev4tS`mbCb~!nh6g5wI@no4
z7bHy7^6u?>rpfZ3{?q?S-w$lp8*vyhX^f2v@zC(JZ7U8O@iS}Nmb$K)rkSUwXR%QZ
zf?I*6?_1uyz7dxM8$cyId~BJ<K-W&pv%e6wr#LHCHr{%QtRzFOWg9IatdsE4erSbV
zt~2Jz(e+{x?9W>|O`gNh%l5ghO42Nieq@GW8W~3kD4uOV>lBnU4ZK+Z03ZNKL_t)+
z&TxPK#Mp~Z`s@SiX2tt=xBSJw`87&;{?lLodv=?ewmpgiES5AgG)*n3+C!l0I&nYI
zn$3DeQ{{AB&-3$<x~kDQvaA$AdnU#PMV3=nm2|^Sprq$+<i`)6@BvAdBFF|F(Ij47
zt+>9r`WFXYQC4J$!TjRO^*7H?&s256X0-tVNt&^4HYlC&@F>ol;~-?q^?J?z(DJ{&
z{lI7)?Km^ep4;mN2pmrXpPo+4PWUYAQXC(Xyg{L{Q%6ze43lFR#XHAEG4f*Ffl}g0
zge1zKWV<IfNE|biSaHZ(l}(NZ>Q%~WlhM>UbzPuP6orYQpq8d7*zH!*mHEI|U%toM
z7L~+NPX(Hlq<?4yc(G;?7W3kK5XY+6PN(N>oWfcsURfw+E2GzXy&?D+g~$_x!JaUW
zK@9rRl%}b<d-aN&>l>P8MVe+}qm!g(UEd-K_2;HOQXZCQGY22<f8clj?Qh7^gx$@J
z0P{-pU{Z9J|9u&+E(_RY(R$%vz0esh3!GB=#k1+6ATG}#FVo}fjI$HR<AJ+ZZ^`mp
zwtaDw@*%vK0%{#eu0cfJT9TZ#dZBYHgjOv;+L@6LnzAT)em?NUmtS#xbw@vRRHfK1
z>v&KEFOa}AP5kkX-|{#A^>5Bj9BG<Hi{9kS!wO-M!vstcSZ}WQ@L^BiE85mGPokHV
z6mEmoDRsS~sv5L191ll^ZXm&MI-P_>n(D}vS9C*9)vQR3fX$QhI4_GLlL}_#y(7yr
zR!xC(mVTT#wkOJ}pz9_U?=q9f&p$oynOz`wg&hOqFp=dc+9<yM@*V&2ul|x|Rq?A|
ze$D$gZ+QLcj%jT9;p06)3sll|1J1%cJM8Qt5H6Vu)&{zM!Z}Y>l>`NOCc!R6nbY+>
z3QgPg<Ymp%{=_g^o({dlcsa-HEJ<S6tXE>CyegzfdQaaEaWNOri8M#^JY)Xk7gyiB
zdG%VD;z&2pb|>;Ar|mo1ex&O<ytBM{^M*7l`0l%V<|(j0oy255HyFe`O?;;X;46}p
zBunTf$1q!pJmv28O6+Wh5$^?Way~@gs0DXfDyw2iusx3?XDmg<aS+br$waZcuGnl#
zv<@P_36SN6yc7!$6&zKSFwZ07;Q9RYnWib&t~Zz@u-Voz4qjvJD4Q5-(J9>CZE^EV
zQREn{Fj_1@Tm-g*C#E8+xQP+0Nvo(Qw2G$Lh$P2(R;wLvUccepn>W$CZ^L@MrO2z8
zAhNiJ#)5MOO3ynx7XK>m1#~O&j5JMo_2xZ!QLz}M$>;a-IqHjX^Ac}b!1YU+&Hwf*
zVprxo0{%-Hgz{qk)^<m#DmtP@3`u@mo%M^$Yf1Er?-r4cVeK3bs|C+{c`rVCqNS;b
z>ib^8LDEdzT8F-+ES9XmWtre{!E-nq`0fArAMAEJ5un#KAVkm2X3K{UAIWo}1<2Ax
z^ZDV#JWCv0*AC}}KvUP}_u+krg*<*P-jkYyG|5m}Q~|^w;SldT?_r$9O+-b~s7VY(
z8SPvG!jeyN`e7h1av($|J#4lWKKQ6V)TC*FwKHxCY_}WM>kUdd{_S7<Id9*-Vi*S2
zt2Jd_kmor?k@MgF@xSA}it@3TO=vAf8;U|ky>T%hJj(dHUNsVFmk|B)L}%;fnW}2|
z@y8E*cz9-rB5|!{IU~y~MIQNdA;1troacFFwlis#$%b<nSTzl%%<MOIocP7pU$Uxe
zR;!wE?3riBIL$mhABBOv-H;>+Py3dC{-1x~?&cMT<1vmwfpxRyyYIw|t!dWaz)dqB
zAD?)9ZaEx;b^Gc5Bib18ZZ`|ZD4z1_42O%K72@wBD{IbH!&-~8q6AAu&ad}4EZdy~
zGa4hFTO!{P7sjTkSg%Sp+nU5EybV-MNx;({PHeVYj;9XmCYn{rYE?<{vWY-vE}@WF
zVsLK4IS65qq{z+ZoQvtXDmq(Os;VK&a;j=WmX&Cwshc(L-hRPmv*YcX*SvoHn(NzJ
znr2N^H8Ex>iw+a<<_wFpd8t^^<s`9t80~=8hTYXGvZBJ6^ept28|eZBKi8ZW6St*%
zx-4Lq9oOa9s4fd0FN}DW??k4zlDjuv#3}P+&j9^W)EAQL*%jilCI&goOd?u5t&*Q?
zA<w}Q@(4I5jPkN9U!*I!#Ja_XOcn-SUdJ#D41Ld^{pL69cH4NPSdPad0kKNiANJ?Z
zAc-)*^2a%kKa*wMOA+<{Y&4kVnQ#U}pznmw=aCI!p6Ag&eUcRL*)mLG02mP1BTbVt
zJzyMWiTR4l1_;p+LeupF`{#kldAwDe4lUk$np&9gt5w5){x5&cs;+o`dZH`~w%ZNQ
zkB_8T%D3PBz=!(>##tyo`V1Mk7<-m5jsvUJio>yGj6VBiDdS<1XxdIl)LE8+ml(Ul
z{z%);%(DkAG@>*U8>A%W84v=av-o8LA2-u3QZJ0s(kQGq={KJr2Y&eBp2K0!x~@?w
z;p4-R4<DZS;r<EdJnL1(IL)Lc$NL$jE&t)){y9|%^Ehxi4%|PqSO@F%6~F!cKl5-n
zaCdvhs=ngsc;xADpdTfCz&V+Rt+kBNT6wv^RgeocPZNT-f=?&~f@sN1oanQ<-FhV>
zp@ynyFj~={dcbfxjv}QfM4VYy2}PbU4kJ}<*linT3wfFnyk;0DZtt$+N!>>cl}JmP
zx?vbQ0-n0A**~9TEgf-@ah5#Az>AHvG6`?qykmF!itY6^@87-W?YsAsWySk1-*bI)
z#d>{3QPvb?Nm<ksMJa{aXtYVs)B}P#OJEizx^S@)vb-Qo67gzJ(=%APbgPSC`GuEt
zfr054V(NL^TUOtZNA@CSUTjWcsKdqRc>dXQ5tHXJQGb{uDar^Qqm@4YTP|*LIgDPY
zTs|^U7e6N*J1hYV<h3SePMM0u+mPpljAu%Sp65+skj?Hq3u}F{GxwkFdHv=MNtQ5-
zW0a!>zWwey9zH(^2{tMvmdzq8gxf?!{z#`cO~Q#1Z+g!#i;lLcYTDBg=N-d1k{3Bi
zY8b~}To9C!MXE&fkY<^TaM5c^MnniE!K*-36?hjo#mFx2JxP{eOiu9X%qdJrc>n$l
z^Eh&Md&_pc;{E&gXrtNfL_q%gfBGHA?!^E7|NOrUQ8TDjK*wd)dfi0&nmUKCJRdqx
zQn0f$VH_v=A({|OGpAFJNfHi+1LGuzPFdz8(X7uH@WBev7NK>Z4E-RZpadvO(I3Yt
zstFusyH3Ax0c`YK_Z~h!JW^F#9zP$c))h(xjB+$h!^6X8eDD-SMwWpxo}24i8GEvv
zEY0}%;hwU{xxU(RfB%X0)YHccT_gV4-V6W9M!RD1mlBr%B2!v4Z$fI!vLvqJ1-n{S
z@ZQNUQd)coG);{LuP`QKzu&W3)oivYO;e(^=J{#Qo7a-JcQ_n4wFBGrn)cLV(v*Ja
zNRosiFHp$HRY$Ac#iUFrP2b4}>B9@*Z_(Ll3_5<uMN#nXi}$>G^@{asMUp1GefN&_
zdPP~5Y<E{wbuGlxqCR&_B9DmTWAvH9F8<jIWx>QYTZn(MUe96?SxnbB7ps5m&w_6)
z9ajiG>I7d#uce!ksIvSFz%O)<5Q2nwC<*@%k1%((u30)aqeZ5pwHU`KEwrDXa;zd!
z7wH#D2M9)pzKg9jPP(a7aIG^>Esl~BI3WuG711K^g|49>UU!au7*GnXudm6AoW2(>
zQxPqy7wj%eGFB@|bJ1Ey-D1Xiy%vf}BFy!17|%eubsjs5GjF05^EA>lk`dYUCw5nB
zv{7s}E2=7|S)~+(K_%jUCX%UmP>kY|I!ps)nd6<M?|SOGMr%cT5<Zi)Gi}?l*=*$g
zu%6Ekdw%uHuPMut)9FA}Rg`7Ux8Hut>3C$l-thg8Kk(I8zv6%V?w?@6JGGYl!(58Y
zG)**3!!Qiddrt1tGM6z?7%s9naLzOKBXw0HK!!Z#5JNGRWFqGr(>%!%YMjwV$ks_B
zq~xZmqjQLt*!!Dx`b`LqG!b=!Qks64m?LLHhro7SGR~UE=M$%P#05*es`&83C)Q0v
zndh{po_6e6uWC%HxxfF!FTeVl$x2kvJX^U?l@Y^yy~I9gW;{BGm51<KBo{F=hN8&W
zZ5mVvsNh*g9nw5m#z|~J!ZIZVNRt?Kl%-LXo>Ek~5YoKFNsW`^cx<t5#v}z_zI{)k
z75zL2_a-X|ftX|>TbWlkH@I2SgR(5=bnNh6;k?B=8%NaWDHS`CezfPCI?pohZg07}
zyJNjxQ`a@C)rKs~X_|(jD5<KAU{+d_W`z(glMJN-O2u3`7SE|=11AN?`<J!+Qh2mB
z(att%EcGRx_2M12bTigUk&&WE?6Q8kK|Fi5hwzhP<-HeuS}b%b3ZX@`tu6?x^1P@8
zxACH%a~2;g<Ji)+2ecA}#2lp{Dvp^Z6+P$DamjX1I$+6w<cx*R(?pgSmL^W2n7w<E
z!WapBT~#$rRbx=((ThxLi8#Bu+F|X?>3Af|6SUIY-Q5BLoLe`MCgPG%#KUZ|kd>7<
z+d4;*CQQSC^H8PHqFHB5R@%_4Fw{+j^OCZYWrlv3n8px``GV(q>N+7!brcTBfu^K2
zqibiJUEl-Avz#x#e8<gh4Q`HEqHl1{k!EsFWNAV_4V3wYzx%s?z|9jTc5GReMG)M^
zWFkwNiS)-#p5SaO#FJo|iSPs$$_QQz6=a%%!OCG?6lvt3IaC}er&;W>RS1OWcemNB
z>DnGptT!pERZjB$)fFlj^0MZ5I^vvV=zDtKp_D<cv4Rv$-*<p#v%BWu!vhkDHPN3w
z<Gf;3uKDocBg$l0o$wF8|DPBuX}(LlpCn?3k|YX)NCDEcV3^$5ZJ{V~0R(qf*l7SC
zNVTVIqyrh^xaHztut3n>J5I+DLIpuG*@OUSNkUDMD*9nWX~Q%-c2_kjIOb_!e{30s
zk(-;Vm{bj?gXqEDzrE%8`E!)pqzuD|Hj33+*0}9SI>tQD#SublW-Bt8vMjl}y5dj%
z<WIQ0y*+m;bzKWFGD)cGm7FN4jFZmV=+E>bLSBHKh36%0=nG#(M~j=KI7r7L>v*jU
zEVP68SWB^y&y928xuheA1v5V(pk97m;#ykk#jS(|d|yVk%b&f(#xDK6LI?yKn5~G)
zA0Hm%MDBZ<W<_3BWN8jgs3Xh2lg~r0uhZ#7mZjvmX!H(;1L;mY<(K6|WkkbiXN8ZN
zwIqtmm*QMi75yNRw5DlTuh-aH8TIDf%zC}%bZXA_zT-HaJFg_wq^DN4dRdO0G<`Rs
z2_!n@b2QY`%9AC5ER#;-`uZCEBz{-JFbT=n*?35aGe-y^hVKd|&&Lpw{l1q`Hy{UY
zk&1lH2kd0|<yUV=6GNJbOz7jskC98~DWbOYx4-?L?Du=g7YssU2za`_MJvNRjbw?6
zn_N$pK?rf|G=_1W3C@wFIa(|FPKdM9I7wG-L}6jHU{~VkAPcIcIL-_8Xts>g#57K5
zt=aGQKuKW2l==A0*I)mFAHV;B=chfv!+Nzs8^lXzmC{rd$JTK=_TV*#eTPyRE?E2o
zAD<3<KAvcrny06uB+Z~0`kra>barBz0-LHv`9PT$C?BZHLIOlJ%u|o`V(*a{#m)7O
z-PM-E^O0>`@b=XmPoF>2R5iz8;Ls0pdSwRdq;O>>A$YjExkaPtP9wYR3Znzh`y<ob
zQ&sgjbV4>TIcZYz`RS2i7&z>E(xgNwP1m<v?XD#3VD7nlbtm3klcg+j#-S%KDmj6i
zlQz8_879XV1*o^zH~g3X>pye%>NQ!GQx*kHU6YuUG?VPVBriy!+$Bj;vb2mkN6BJa
z+|z!(!81#$v%c)07P^Ay4VSU%g*o+7_+EUjUMLOncu~5ef4V^g>0+0~$K`8U;>{Mn
zEgvZ=OVPRnqc5L-`QA8=%yY-#u#ZAsA$N9t&oobT-HGFA&pb{fMoW@RqR(vb%OYq@
z5`p&uyknXrFELHU|I6qoQa2*I30|Shi!Z(Kx<slIoTn;E?(XiWs*1N?ykVF|s!}Km
z+szJ>3T~K2>!NuWakC{c!Y@0WTINaQWRj5GQ`LsDkkJnfr}jkGONQsr4R{yC(iupz
zECSIUqY|`|JijDWk?o$~L!e1>VbxbF-rU{r=GBg?O~W`0;+&xr`~5+jI<%%JN;caq
z-+ucC?(aY11Dx6;^E9II)Mbu}_pzHDiIHWJb5^iOBi&M}QxctEf+NpTA*@EBI4Y23
zf~Oj#m~hy5(4=uYm}in?q<o+(3i@#(HyP6~(f2dX8N8oR+GGCgS9jn1_~S>)LT*x-
z{Z+J%X{c+#D`w~D`YzgfWH{%zy}9P&rw7_$qADtm$7f8E^8B<XD~gCQ380<nXrmDv
z>&=RQBTXgvAu$P6S%67MlY~SmZm+KR_`{F9fA@x0H(Qhvhs;ykaq46fl4((}mxV#&
z7$=G3J|2%TyDbA8&8j450j{gEU>rxTuCD333D8W#K$d5`efyR?D{)So4%X{6(>QZH
z9x-Xo{l^C+Jy|$0^E}hG9iXDmx1lIXCTl@ynr6kXe*Guhy?VuNx8v&SN}NQ?5|gG>
z^$L>;4dExnhRe;~xq&>7bK^LkZ|ch%|I&~BJf59{1N=`4*1y(KT{=SiYaJED?$5gm
z3{9V(f7uo;k0HhB1+>2`mZH5BT=TepraPVJ`t}TJ+vq-e*_COnndXVMJ90Se**`z?
z{PalQc643GJdMob#Qy1t$H&iX)@!mXCrMI%_q*T92wvnOgpVFwA%yr@$+~^<pjt%a
zX_}s|Bk!GT!cHx9T~SpfN)z2-<#DHZrdc)Qg}BBlBsgN}76i8)sOyX@Gi<kOnw3au
z#&MJa?tJvFQfFT?MI;<EO6;DJrN}(RFjD{*n5?BcwXB+o+uJLyuXYqgK~WWSeUG&w
z%CD-5ah&+!#~&bghGAlVIFTd?yX~5)ECdUjE!)lR?B|7dl9`zrnj*(fQ?x_R>Bl*4
zQ8gxZwAQ+p(LXwwoVWcf_DRuieu{p2Dgo;#vXo<Y!o@Xgl0br2TwQG`^OCOXXzGf2
zny_Bcx{fTXnZ_dlLsOTu-AD+sH9Q<n_#lKjZ)Nkc-L9#sN-QY)ktE4jRXIhHQ8guf
zccN)Bn#zzS8f#~s_R==ibxD6X^8WQJ60Nz~Y<TtR8tlaVhkLBGG4wHrX`lC)B;)q3
zVH{_k_AS>}JKEETchVk*kn-WfXOz+0-CeWaAGp1_<;NdBG0u*!zkbKix2)DHoQ2=~
z*>Cu#-~XPbsd;{SqAm+=udiu`F>W3eMIl8z%L@A5$w{G74*LUFyDe2+(~p*$n>&i4
zL?thdl4&NLRg$EUxt*Pj`DJ=C@xlxd54sq+F1AzhJ$13+GZ#1ZV)hq)Qka(i{`uFL
z4C<HS_(B3*{vKj?q*Ppfn7DQq36Wfwk$}oYAyX>8m)Hpg&g=4F9_ZQ=-DxicZo$GX
zMnza`dF45lFxtgIH3Vqe(|IE)=68bU{r>kI&Wru<!{-Nn{p&x4utdNq=|Yukt3p5|
zLC&4k0dtI?S{yx+L{S*S+t+sl#O+{=B;h>E&_<INxtKDhDW~>?o}~Lp(v&1knfn1B
zBi3ASw0(~n`g8G~CXdo7+E|PRXC?I}iP7?#?TVZ0YwkZiaX55jMkF*^X9TYpCP%i)
zSZ~&3dBNiRYiBuRAw+Db<)8oX9Y6f|iC_KVOUBXBtk$H7Vd_t0NyhOsptV3CMjNs;
zA<HU)b)?LciQ#IuAukH1Y39@wbnS@umd$p<sXd(=`^8~ovNm2H@s}6C&O+-5!0FVn
zuGje4Qq>i@Zm<FN{lGMW*;e|Swr!;aPBd96=@!bQ%vMy>O(i^uEX}Y^qT!7WG26~W
zp{*y0Id@G}@YR>^ST_~xrXb4%-x&Iy-DbsR-B9I4RQBt*Hiq49&8w>&MtSnguxe^P
ze)`0xhtHH%Nl_N0St?}B2teMwF4=AqZg01&ni8dg%+gtcQXU<ve38j7YrEU<@UW+C
zr<g=NvD>V%*72u*@*Dow|M~;3U)`Ng*4y1xqzf2M$D@dtmH43N(cLlx$IuTXCS|i(
zb8~wu9^6jG&Z?<cuU2uRW6rk4OJ}t(#Zk%G?SO>?bK#x7occ-$e`UF`v{tcQ59coH
z=bOMKo_zWDOGlOb++7vv$}WrB(%pFPNuyv}xKrwa0wLr`g$REaK3(wsC$Gy+6W$3`
zMWW_AoVQH#Bn3T9e^Ow7URc$+bBqD42ra{T*)~~c&++cgJH~mY?*_d0JUu_tMlY)8
z=VyjtkmPD54EK4Sndj+@hgoYQE|%fFBQ?=jG77oHy~3S0TEjGQeSJ-q<|K)sC<~sR
zp4cCrCGa9onZ_Z;uX`S!p2R*zFB~?_=`e8WCY%>%kk_}j=XCSLXtbHR+O8?`46Qud
zZ4(QY6yU?*$o2J=kX@r$-Y^W<*>Y@Krg4lL-3jM4|NWo-!1v$X^Za~*AREhfuWt!H
zV6CE`Y$RL*N)r&w&j73SnywppI`kZlEyEmr;Jt(&ACE1G$ruNVXF1Gd@#dY2WO2FH
zwKmedJHauVy5MTJ<=A#$RHPni%*{6ah9G0eG#)7mnL8x_RpZ>mZnHW^lDED1Q?Htu
zJd-3`7i5-QHwAW{`0~p)oK6pn<B>1FcrBJ1nXrJbw;RU3=Xt-UY*tw7d40PhG0-1d
zZmu`jx##Zo8fQmNZI8}U4$n^%ML}6sJU$;N$_lS~)>nboH#K>xN%M*<O*oxSa#6S`
zj!->H8&<2D4<GIs2Zzxa*3VRRL25MPIP&4g4|wm{ANG9u^ocLN_=2a;kNn{ee_)s-
zr1R-Xf-v$-V$8G_{H3aEHtVbS3($Oi+OykTql}`eDw?{ct{P12j`BP|>*8KUy7XU+
zVT;Gr;-KK1BTZ9@vCpyyJnQHS&i}SxDP?3+n<SAa%Gsa&r8o$cV5wY7=XF^yUK|@<
zG>R_j@)pqD`blUF!7~mc0ReI6dB#qoSZq%N-cNY{0*EhkglU>2PcT}GEOx<CsFR<J
zuRq7qmd@_-brwZQ-H3nF>>T_3fuZl{yOyV?ClW2s``vfn(GTK>etx~yMvB0Uj}i50
z>|7ReJE7fVRCUe%d5?7AMYM*IbRw}B&Z(=Kr>D=fCx=lf+w1(im9y5-brZ+KBw;0!
z<MH8%z8|n|X1Ck%{);<-Pn4yo67lH@&{QR}70#A;aFuv(BP~P;0Ph`r-}CwNXN)#{
zxPRc-PIQAMD8tou%g}dBLno9To!|+qRy73CB{r)D6%=_<acl>M+0)H1Sp`X8u#U0s
z*={!U{U}BP+Axli;^b_=S<h_61vrU01OQE5(v%g)Q_pB;91<hgO*3F|PGPRM`8Q>e
zkY~c?mQ-Ploh@BIGkURx&GMAC@6Oi3At=(gV$KpRt9+xlxw+wR?D@mD_v{Y?r$bLw
zmK^s7R!z<BYD-q+)T^5Hsu2BAH}Q+Ff5GkbHP5FbMb&Ws`I*Q4fx51^Y6|M6LM1sL
zA3jl4IkO$88WGNRt*0Ly(<tf73dLr<MUhC`oQieG=g&_Jy%lk?B2o}i(2Lzm%IqxT
zED0~a{oOw?O%gsqECy*Dfm8@=nu@B(sf&_TQ!v|!&3Yq*QWr>#;pWvXX)aOfd09}G
zweWJ1M2M71ktM0nB7%&2lA;^qy0wbqj$F{o4Y>g33qu{k`DVVvkzN4v7lP;|?sW#!
zBgnmM8ZYswOIw*s#{3!kf~W`7%x;V~pJg0Jv=PCuwIfL)k?D&pXXz?b<g7^)+xQ}|
zjzwuHoJ&WuSV#-K;U#hS^5>Th+0T~XJVxc@S%KGD2)P6j4Z&MZUCZak&&+Pdc`sN`
zbWcrVCk%nSEYSpv(j=)t8F~L@QH#dZNDy#Q=2UehE}YIs|9(qZlmzc7iV7cQP!_E+
zx_01nwDi4Y=wX~xJirzLrDL_K`PJ92De{EA?PzMbf8N}^LwRU&3EaK^{LJyxljjxB
zhmOOkr*B)aK6Z|FI`ZM;XTJOJ$j6UI2-*3b7URpDpbe|-HJjar*LOD<quC!%k;WtL
zBsO@Q7Xw41O{DceW)c*sB!MRqDW|oHTs%h-uW!j6mEW7u2`V_!)G#|KXo-<5(^MxI
z6d@Q=1Lk&@f0JlMQxzmaR$+D?qlJMwOanSen4?8-u(HXr!C|LS+I(wey>3M<emEY{
zCZVotiYy~dG<jACcpn`tx4R9~B#)Wsl<&U#j?epN%A#O@IPvMzBUxIoUN`JEYg7V{
z&wG+02Q9Cws&nid@K%!~#Y;eim(Yl5a^!g#38F3Y?9TQm%Q$p8ov3PwAMd*!r4X%O
z^ndS8JxVF^TvHSoRaHoI{XAi(8Kq<fM=5k-@DBEe7NsRArff>CuCH0GR;<@+nzE+M
z3zBpRm@s5I6`qlK!EKg;b6G6TG4Zh*xhyz8=U819l%N0H&%3Xs!}8w6#|;sHe(7MA
z=ll6%T}FWgF9oD+Pk_i?>bho(W6<N{BSoH{Q(^>g)#nR(=^mYP=cU5Z2`+rLrC=@3
zKMcdUm@Thy;ZT)D8C^p)AxTN|JhHeW`B=drI*%-g-gRA{52qv%&fv$7AKCApMee0i
zP$6>sqEm%R&S^thYtl^c$%TGVRaL~X5;QMFU+XM=-*W0K;}95!fOVivg4U3vn%%DE
z>ZYcybDCPNz5B-p>Q%|rb`50I#Ttd;kKg@3&?&p!HC0vd-48$V{SWu#dB)-S$RGaj
z9nbAZ*9GjX(JBMdC~p%^o1JH>vSJuUrg7w1@sq{?03ZNKL_t*b>pOu)?ryNNV;Jq3
zmSD7IibC;aw37oz?yFa??qp#Vu}t|r$=I(DNtQ8k4OUgb&=1VB$E4DYYNc=yv{%}Y
z<py(mTYjUB;?3(<I1~@hEl;O`!CE$}6@!f-5MJR)#274Ufn2Z*lf#%mo@c^m@tz{j
zNsQ)dyCG4U!?BG*;R!cdg0)<2*KAi?o<BdaA4amW<o4ALt%Yd2-R(${g8PSij{S*Q
zdrX>eIJWfTB;rw(@cH3HH_x295k*4Ri%)!>X7qhWUexi%wd7gBG}~x<>{%4<Ns=&6
zE_!d9NJbQVD};cJvGk`?N1i3DR}D%BhIvG%(jj#17=cm4I0|>Bs%y%+X0zL|Y8qB`
zO_`SzOJ3l@|4~8K>s*5C3wXY4u9CA9WD$x6ucG6@3oiBZZQSy8slEI8*Gpkoz<hK5
zY<^zUE(@Tj>U$P1dG9C2all$9#K380UDb?3&pcTYEi3sDqD!c^=L19vrayOQ3ubm%
zh$LA_I^l(UycD_1LVV_D%`-YN^pnLTlKwJH)A>EjvtzTlA~h*hS(6pz`FR#PgHl@b
zg!?_u`)8i_2XvBBmi75s5xe1+bnMiKH`>q->>{4DTCGGkI0=z5%QNa`#r4fARM1g7
zDu=FgoB^#o*VilRRmys`BFzkCnzCtD;$oUMXaJ!>UcPI1{Pakc73^+a@$~q>S6|%m
z{P@Jjhdlwqet(kRr_N~ygVGs_M4WGpCP~csn$jktA18)sW*BFTO8NeWk9e;*9FNRi
z!eo6AC}@hywxDKw5I0=s#gA*dThR{#)@smN0+5po>jN$pN$oXBngOB=Ad-9~??5sO
zlwJ-ig}K@!-_&)<hlh_mJ&V`)X0zgSYAMTHVz`n-h-5*yQ+A#O-M1d^G)W>cSz0N|
zvSgfQj>i^-=!)=xn;WscJ?{7HuC^3~Y-B!t`ot79T75V0&)<G0@jotbI(9U>6(*I9
z(lpN;PhBL)S-jV@r;)l@p;bbE8c`}Ck3Q(bFmgKevdIY|ldy}7B}=%w+cHiaeK#}o
zBWY$BhW?C~WHCccYb{zP>o~PTB%h|Vr<P5<jvY`+Ka3ci#6(+9Q5Ed2uDQOxmhP&q
zDU15t>Mt=_TE$W8XGQ0-OIkXs^OzTvm$JG0srMB8bTjxO5`GyGFMsxu8};*ow-k=0
z%e!Q^FEoHe8wdgKg{)bYa!44XnMd*H59imh6i^lAC;seix-1r!BDHKom#<+M@Zn{1
zxDacXu-Onoq##6Y*D&IP+)#_v^nwZc5Xd4G!K5iJytpe^>&UbGymqguil(XK--#eP
z%QCL6uBBVN@B;$~US3C@=V!2a**113@!OIv%*b}Uswm5nvZ`3G*90tS25B0|GR=Cu
zBFhv_ol|5v*Voq!gX8c1_WxtI*^(H;_4PIT!-=4v$TDtkUvuh5LQrH`E#erH;evR9
zEuLaZ!D_WScghQHx5R%v?~iyiZ6{3qw(F!@ih^xzv_Kj<#k;^16UVhylvPgGb~r0I
znzfe2mRZGXKqZDU&#`u9o`sy-G&S=qCYQ?vvvjcLFaOP(Z?w_$o%q;X?bf8JX1!X;
zhRVxL^X}#fr93YBR*ln4+w~~#Sl2aWQA!H)G~>NOJlElAe`LMcaX3CpOm&u0R~5&j
z_yRRe&Hm8RG$kfcBuS1_!iC9Fm|Tm=HBLFQqU8CxBQJBxIwwgpk|gEv@j%;lwCx}t
ztaY?)i?t4A#Di*@W~}q)LL`Ya24_d{S=X9ZZ?DiM5OBEQNKzBmubRn@_~0<9Sl~WB
z?zz3YMFr0|TVX-Zj$v>Zol;a4N-H+I9oM(F5<8V<lx2m9ao@{L4C-umymUFsO?SzW
zx(t~h7A?8Z{JF6FB-!VGQ<yG`*Yf?#qP7&PpZ~Geo*fpPbtnbL!x2AE1n(L84ha14
z-S^~K3i0u@(HGBg!LWDndWsismK8CTTMjH|9nK2?-gRB%Va04klai&`*?6xgBxPuU
z9G0&|nv`Y586R8T&p3``S$5tCF5PQl60Gx_jz?7R%+bL%%fx1897hhv6OYf&yn6jQ
zcE{r1CB-R?BcBuHV-Vb{$n&VqP*~^BLTw#MoES}-8;ph`(`;7N*=gkJs^RUMS16}&
zvqGyJKRSx6<m2N5vvYiWIC1PJ9-fc<aDPwRwS=G`q>*4Ml#;}V`DBtLtkx_3>OcMm
z@;nvN_<BuM6{K0hdcC1ptx1wpaO~`5#4TflpH>Oh#VITrT^5DFKUyjBvShFprJ^uD
z5r2MR8pH$A2a0@IQb5(ny_6;?nuwjofDZHKF8e0Sins-^TwU$x`;NBl=%ef5^5F-s
zAZT&+^y0B|bG4z!a^`6!Npl{ao={@f8L<WtsVXg%be>0=)r!Z*M@*723=`vIdHw2!
zsxEnYI`H}NAO+1ik|JetRzUS>B8{8LX>!=v;~nC`9+t3#*kPcU7iUM1tg}GWImr(V
z<G|hRHC0_w*Cj?G1F5Q-p&tooaffu4s?IQp2&#u+B1we!XYEMviaamqyAd$VaZ_W`
zlvl4_b9H@9o@QiOPP(`+2osP+NbPySO)mLYOYvAXX0mpFDO#6I^2;sWzo0c-6sn&W
zuAdjM%YyZDih&)+Scsgkr=3S#2&~U84(F}j3-)z6mM)^=q9}w@rGmI-P9ww6F-;?q
zC}bmvR0@oDlFhdW<Cmhe{7g|4=hv`oVUsK)Sci8`uH*QgMAD?sY2e~}_2L7Trl|y?
zY845Q^0?xc9$h}CiMpxfT3<Tah&85ZD%79Y4}0fG^NeX0f~5<dEYC@d_&<rAO^2I1
z65~lz*j;U?>XfD^$kUYDt6Q{6X%9zsyDe2+aT<D_o}YO*4xkj)O}u(_&1zMVBpFq;
z;?><PH#gVOw@Qk<bB;Wh;*@6zc_!hoX_k`b8Ff|3H5)(2W%TymQ<Q}iKy6s98}cF}
z$x?=4IRE~wwS4`{U-0nxGf9%OxW_I_pT+A=Yl(vkfO7#GEW<R5wG5J<DDJ~x{_S79
z|7M;h+O`vWVk;3`O<hYj5L1~?-Gp;7s35MMop+4GfOVEMN!hm@E?S`2*|J)%$P-PG
zWjr5*=b?>;XvF57oHTvkadWdn8HIO&t{dd^oo8kg=#;kWDe{W8ZJ8#^&<j(#Z3j%E
zS+5&8y~7gSu40hojMfR`U_lvXJDqtu+wGcFQ<0>GQ+uNC18qCvTwok0imb%Wl7=mT
znF7vw8#uKsn@ugLy+q1DnzMgC;#?pvE6S?m_3Jn6BA2U(%x7bCv`JnFq6;B3d9jk=
zr&_%b!g;j4q%KH@v@n5_e^IE;g~y90eh4oc&oe9jVg$V`Sj$CyY2@dvh-0-eV*L^n
zgym<5zWIxVh+sT{DCaTy>{GuKv?W@s?>ok65R2b=mINilYit=m0KvhGAxqN;+RB(W
z3<GT|*^f(D?NTtT^JntnFp1ZBmWhl-I$Ak!#7#DhpQ%Wn&;o+nd1lddW?4qpcPOnn
z9*^wzd+zV=Nu!<0a=<91m`4$BFG=A^CY|9t&(V2RmRqNjJWk)Y<e9kJrm4mUOI2lL
zMtq~3^_)%}S(4JM8?3UFRm11c4-gV=ueMy@tZABzfF{c;@~n!TlSquFX+&#9(=;?q
zO;M!6DU6P!%Yi6K*Os;wipMlbtbCFrC@m~}Yb6+Yvt7|ND-QcTX$)lPhk-A@c+bPr
zBWaTV<Up0{J0Z_xiDsQcCjyHsgldJPAq8NvmMqUPiEh7X>WbB-!3WL#r$<77u9f)u
z;KTVQ>P{Vbo=7`q#1huJAR0iWaY~4ev$dc#le1)rfbF06Ewc{{lZ{GrX(NwqOO=cD
zOPUmnea~jyFi!)=<B`#Uv!316n*F|I=snwQiJf5_C80S4;Q>{Zh>>lK-zv+JpghAM
z)mj^k(w?AvELJ6Ld*slLcohB6pI6!QJV(!<97#q=**~A8s3e;8Mojh|9}g6H%{)7f
zr;#L0QAtW(R=j%kn%mo3io7^m32U{`6vBB7oadP|OZoeM_*-7Te#634UqI#M#+F~W
zIiG9`adY8KEo}Ff3*v&)<u3fHezs9u3e@twe+`&FcODT`B|0dyr_-4O7KF%-NyL90
zt<IkONiGTBL)SBn66b!oVH_tRH}+k3-max-N>C~m#`yeNVUic(t&hKF*$ie8@K2e>
zi6xaLD@uYg1f?m<imGam<YsXZSrUbe(dXwLh5?gE()oFdmZY&*^(4_$FNDC=)fG=q
zPmIIJ{rx@O2imsf-Me=$i8or2#7<CaMV_YED3pKRKXE)BVp2?C)nqZ!U9RoL?P2J9
zybriw>HCh&&6e-)zh|>q^Zv`XtTr{18)()wL*LU)nlx?5@{-MZjfs)>WtsEUS6}h|
z{W}haJw=ft^0F*KCTUEbvXKBS1<aU)yhy3)>dc>7FjS=s?de3Br%}EZvB6<toF|OQ
z&Yjod&o5FXp^q4o$g)Bks<MjPK^yNCC77aCnB7(Vjn<08@x<}i#r9evvJR((8LJqE
zkvz+U%^XkdVHo2@tQb|mp`y}y#(GOT^f(O9r;Z{M-*boNaBAb0VMeEhtKAmoE#Lm}
zBZ*1*{`(KO0M}PHq@~>G$F^hWg>z$4kDbN+aTo@QyvEvqcZ$47DN9+^c74lsw?3P-
zRaL^P*BiFmhN2WE{L|Aj$CGSsZtu3FsrV<=brB1}L{a2;m(X_;3PYA_j1D|J92f_M
zoyAD)bQ;NXxgqMN=JxiM&1NG4=Xir9CW$wmL7m4YS%bfM{T8j0bHTbKNM05Vk*0Wp
zm6UDNi<tPb@LU!wA703p=$AsZeDCL7+vW2w&pl1TMi-nY&<_JfYm8dN$4hjSCIrRe
z8X1BZxQ)ZeJjpe)bm>bsGtJ|<fC1;5r;3)vE_N&n9c3BMmJvmYRvH~@Unn4>ouiF+
zafS`f0Pe+m77XiU+qXRSG>g73ON)4O>T`f^nx-^O!{Klc%ygQi<8y(Bhex)%U5vsC
zeER$#?x#^>I}YQSAbUI>&)8X-DbiG=Kw2Y*@H`NZMnI#<^Mdty#r?wv9uE)XnPHmy
zxHPhKqX?CYdQH=;qXtm0HI!UKUDq<r6DBd|1;NsxFT`SzDe3>8t~Xnf>&mjk)*0{Y
zLwH1BA_*jG$}V-4+N@0VsBcjJ5&o%uL2dOQ>()y>q`EViNft<eKny<J>5O{V=UjKN
zrAUL3NCFY=*YDkD@3q%JxrLHLYq{XREN$~h_^yEnltqcYA5bXb6$;MLPxSkMoFaV*
z2EINF35chHmaT)@wuQ3+0Ed*cSP|cUd;4DLWIwvB$WvlXpr|cy4i`LhdYD`ik8%#w
zx_}SF?w-?z!G{3rJQx$y-9!g21?sATa~|_-z@<RjQ6g<ymtdUX)2|2OZ?zSi2{;~l
zRAm8Y9D(?O?1zVes0m%yVxEW#C8fYH7?c&mtJhnUg+ieVY<DGIzS^SiXRJ3JW;2ti
zzVnD&V4Nq+mSHv#r{f-*ZG&-|a6XSH$_hE#*}DiKIqIrP@n#jw>@f}$hN)DE5P+^*
zVYOc2#mkqty}d<!g#&O-qo7RMLBS*>r`UNR6@Bnm9Z&`&Dg5A)Dl^YB<?Ml7w0U65
zpZP7=&N+?gc`d|w@|W@vApz<B3fDpe1zRwd*xf06Fh<%435IDJlP^uA5K|!`7`0d|
zjj#E25KG@+n#l&mI+D*^lUt3QX;TP+^=bnlBu>XO7$Vu1Bw=taaJirYSa2@#qoPqp
zY9c_AM>s8KNLq9m`8en4`$jltKz2$APfCl7Uw{3)*gDsBgL6-I$wg5l5@dkl0(Ds}
zqw{QL_~7vCufM_=OU8fGxD;2V6soGmJWUIu{&YG)NzxsLNYW?gEToXMg=7N5G(c*N
z&3c1EYxLuQVVEJc#`!$M2L>%GR8@_lUXj0=kWfm3^SHQg2th?kDY-E6rIe`a>MQFW
zI?(8T<wB6VNm(NMrR6SINu5OI68-UrqAZf-4;@x_cQ-iq^FrqREno1Gki@asY%on^
zjA@Nc&cbAq#2AM(#=s;ONgq6U0gWV^xE@7V1S|{SJ|>GufU}6e1IB3rBuBUs%;uA_
zX$vS_LWv58=RJhr*xjx%&jzQSe5Cr50b8Zb%@lAt9T7sr@qB`=3xJW~J#m(jNk3zF
ze0(IXM$8Opj(Lpu;eUL>n>Rb$>?jgF1P5J22+1&xbi(vQkGAc=SqUjUZKq6tnFH#o
zL0Lr7ktqo~Uj)6z8X$5!KJ1sOpF5v?O64_s{xC9VnOE-gAk$4@i~(12Aw*KgC9jIj
zg`AmfZv_}6<BML8Glua0u@%f;nY~UoV4@~OvYn2}51*2o6UKEl5>huoacf#@#1PP*
zkI5OMpr0Rzi>5>d)Gf%}ASS^wxqWiZ;gUa6elOQItdtT`=%n&@%eBiRN$z^`^~~3}
zC<^3o*PN_lt)&%z!l|4K%g@YM)#8p29Gs&Ok_s6yxCv&U@QS>BoTdq7SwbnD9$JYx
zoG}c;a;;+|Z#43m`tNAlHifZXd5bZQuIsSh@A2^PfN>mAl{M@<CDN%zUDv1!jcFcX
z&5^pi=wSSWMpU#}D+?Tt1FVhUf&z>qB&uc&V`ExQNQATn%?bpT=o<N6<D6VnjUn=P
zzV;bY<ouF8el3q83PcL6K!hrE8u4e+{&C`%NjV~W?O&6E^WhN_E#~Rz34+UHGN`~<
zQZO*WYDHVI_ndRYr1$YLzy=E&DAgmnfZ!>m)_I#wYDW2Zh#0MfNT*kb^dLI#z$Gz$
zSL*`78r*Cf2n954x1^keKqS4>WHC)6#(u_O>R}lJ;}X+k$g|ygFj-(2W{fsMY6Tx0
zw61YZvI8yztn*2*&8bRDiLR?)=NY%#9nQx+*6R+#cp|Jg(245Yfao1zAJ(8-)fh&~
zXshZ9<7`lt4XV0@Hv#iBqG?JZfO4^%-hvBss}-8ALDzNYx(+JIg6g_iwj=<Sj>~xi
znJ___!&4JJ!~k%~!BcVJoI~*>niibWdZYx8B<~TbKqh<Un@|W2Yv<)eydD?nrUL>a
z&eZh{lwW5C&aIs=jXm7d!_FqHvt8nb5$QChQ`rTN5ItgWu+s#=C_C`C!LY`d#Db=q
zQgD(?MUd!TDzOxqX_^**+NA^5q|T%$3Jk*l7U`PN_qN0d0*5h#mkz_QjB<<t(?pxW
zd7kj)%NGbHlFvK{H!?F$=OdiAiEQi%JcfWSiezX>Nlv+-an2K&mbhHbc$`l?zJ2!{
z_J;%h>;Ls%@#f7pu*Txy;Q@d6!yjN~hx@x1C@ZoS4iRX(HI%L}8%Nx}c?P(E792pp
zzJJDf9x%-o`y(ajRCNpM7<PAWP*)AQx<OS{U;vt?NnMpn7Re>*x<;n?T#wmp+tNMT
z)PUgNQb38z=t$S^;tVqM6BRKeyekI8=+U;6{&XFhk(YQmO6}{7vPMqPPB%h2U}+<*
z3k7kz(eHf>n2kl=mJ1;;j}xN1gbdKBnB%$An2~;1Hs_Cw+Rm!3p;Mc=T{r037Pq?<
zs;0ri;|ZtJfN7d9;$IdpTTgNFpwturpslK9bU2SAA_I)`Pz7-~g3s%G8ViboJcaJ=
zwuq6qS8c2C^8N*0zkZ1-jh;nW;O_noQgM*{i*!&SP!zco9II}H*%$~gOyh*Ux3rx}
zH~>#p%;Pk|Iba%Ra4xaCy~TR7!R_6BGJR`M*ENcw{E8!_R3a8ek{#p}mfU?U8$JM$
z5q$v+bn~RPT}t}!RiWvINT54nSh}x_*<9mdOP9yVUOJoZWtj^}FUWcJcsv0BbfK`{
zKf^kU5F=DUeoy2$Dd`??<Y(lACnBIR@Rle8IaxW2o3CjTA#E9zq|^C$I;5=>o%Wf7
zB?J*v^WV?H=u6ikFpgu2p^DgUcQ~K>gioooNj!mbhH)IBwL;$$2aEinrc@}25q~;U
zG#S~<<nB4M>gk#K@Zkfxre59~<qpOLr(+=O=*ORa!eM{F_uqeyx~}odFTbE`TYUNQ
z1=Bb$3K9TNg+ftK_c|K`=RH>423@zoYPE$)p%hxy*gy5Cn>B84U!bnnXxlBys)ZC1
zQV{2fw*7Sd=zZ%%X(*6oOu5so>v}0%jB!*oiR^E-+eLzxvA8@o(qsTQZy}Y!JWZ&p
zYH`Dz=NaQ{misXOEFfc*v=9=sr%Bg0MfpV{C}&Nrc)2a!3z=q4P~q{8xGsp-G7OKh
zuE3>OVo_w$2=P>fLnM1+a4hl)Gfk+=5@s3^L&U?wAw_)A_RU(0x}d^!JWbGrf-@dn
z+aWl=L}*Rcf`N<#d0NxkiOlOsH)tW!NHR?`qy%<%4esu5aXR<-_1BN2SBrt-$s`9C
z49*%91x0w#het^u(`d1OI%B(CQ-xt9fTiFB2Biud4?S-0b_h;DDT%J_uv)LN+3nD+
zSI|nMN*^3g@`BuDDWz!J7HPx66R(I}rO8nD0Z{0x1>*^L_i;&&QA&Z!B*tZ&utjk(
z@w@z7k{ey;`Q@)nT_7uA%EF6*j0&5YguRF3KDkB&lvNFNHQvT}#We~Z)=nuClD3K_
zJ#^Rfh>MUq+0n!ZDM?OcEjeSD<dBg^G8)kudVL^LV%O0+y(mh|(}-c{aeIGHSpo?|
z$vQ#C7>1#T)+(7GQUFEnp3FQUM&jp{Wr?aR2sc$U%2ZViW5^gXcnX);tT!0WRMdwQ
zV37^!rg?%74&yu#UN+4*9*>wN3O$ih;_2xL`~8vLpZCxOg+5eOmGDkQoGnjGbuLOY
zt2OF+gX3|8F~EQNPydYj``6gry+KvABpH%~H)qmrPFl)NAB8S1Sn8Edl`$eQkLmDg
z+7?0xR7HiND2X?gigw-zYc1)yO|BhM>(u=o6U#v2bna0%4YDa?HbbnNiZUEj=Iha<
zLKGM>p5#KHsw;vC?$+wPNsQtJ14%Fjg_TC~;gNvUYPmrp!*UUjH$>@zFh;9q?>*LS
zgWzUx2<)~un9Yn~m=Hm3qnvXZ`QQ-(d16yyGDmPO1w#gy<ew7|P$&g&$f?u@BD6Y7
zI8C-WdGYcN=kp226Se23^9(S7&z~PrmJJvL0qN<1uInnTsyzhfm_`HdIOf?vX@w92
zbirv4#)$QNI1Vtz!dn`x%A!KswWvF4sk1w4p8K!2BT6fBh)CTP-2_BB6ik4FK}nf9
zr2un9$jiZ{EOBDMF1d);js-~c2`P!l3w9}3*LYWcT~efYFhOxPoC{QCmF!l|3A>@O
zGh;^dm4Ny{=6Tl63&GXe3;vdIylWyW@%reqqoU+f@%{SGWZXlj0(IRYrY_YOi}Sfp
z8%u_=D#3&VxrtnUR@NLI4*O+Om(BXF9a}TTms#tXcg8@LzImjfO(XI3Tv`}ZO@rg<
zM57dA>7FS_hUJOBRaF)K@gM&YF_PuZAOHAAn3*hgv@Wo_*}<oL!~8Qgn=KWfgex(o
z@y(le_}%aR26ffp{>4k&+}x2vg5X4#;lv#z7ln&WkM|ye%hVlvWP$rNTws%1NQf67
zHYKtOfEtsW%AIk~EIs0!te9gADRn5qItOFjGCfe8kkExhRb56*`n-XnR47Zm_`NU0
zbpYb^ZT;T3oK}4Kbs77}5~8dMK%@;#Vq)7w=3<Ny(bJP$!=;(Csw%vBeFx40-n@Q|
z{b3KO1nQ>6G)`zcS_zZZh<w1kcQDrDpZ@8e@av~fi0K9U^k5+ZO;y8Nw{&%gxeG*!
z{R%L%#n8{NGf+1g`{xPXF+4o%A%w!vk7(Kk&(C`t_C1DvLWubWmY634@2H!J5n#fD
z^N96ojTnLR`Hb~ygAjnzo>Hu>ovGj`g`zB=q)Lgp<-(NCqnuWH8K<NwmIs-0v82S1
zt0(cS1Ou$0H8gck<fdS~UA(elyjUh*Fb2NhYe4*}uwBz601{J^bqt4hVIisxLl31i
z5NV9`{*nfii%N`0aZEJwWtsvORyqN`TI>JG^D4j2>_auDj${}Hgg^lWN>do=XdJ4h
z!7vOsolc7aAiV*CGm^kKMAEosjUZzjzx?v^0ybacHvpCmp4K}3J%P=7Mcodg%*y@Y
zkd`G>KxsQkfwdHtKpQ?%CD`RNch2G6+jsbffA|Od_~VawdV0bSKm3s5vFJf>8qzDS
z)~m&NBrkHNX+mAs=ubxs=NV6rd%Sx68VJBJl1(?4#B1`NHs=h06fBLpmqRLex~DQx
zIgizODI}6ZE@uq0Aw$C=36wcw`02+V(KZc~kO-dclk1{)I2<sW8Ew~KwO-R5oZMN<
zk~Wb#rCQ|?Ghcg=MDa0(bbnpq<QQWR-|njSr7lrwiK^B#ODAbfaHREe&O;Vz84<Ir
z0#P6s59=Km0*!+asH*~XrO<UH=Kc%@2CX>SW`oa<Pq6cZyX^}5;{i?GrS1V}O9kr#
zBA591=_6wF`2Fwy7S7Kw-oaT9r9D>b7Q-|Ff!vgwGbl>|_(=Ms#1E;;3NARTH!U7M
z?cst$QI;5n34%*JKT+{ouQ!lVQS3MbtZ|8pMh=^1nxTt=I7pMjG+OG=Jdsj|kxc5Q
zc}BNdVZH9KTDNFgqBN9s^VNxT0pAmuHOY0Bf|bGxm`L;kM(&)n*dXS1O#h_7g#y|9
zZyC|pZ#$`rRZT8dl#)!&44H?-82Oqp2As|(xHO)H?6BZTtW6wLGJcF9zy}ALmNL^g
z!6nR7Nxfh@M53ffGAc}Np%9P&dQPe1q$OlvXxfIhfJ#G`6~*0a4V&Nsp=en#juR@K
zf*`a^vGx>Hnwi}|#CpB{sz^>Lfhs6>001BWNkl<Z9S6u8Q7S@pQ$eI`gOECY&VZ(_
zpbJILx7NUW2c<<CYpGK|9*^jn25r?qYNAm{rRdKDpj&nL(;xqY^J&1%b_b;-b)?B8
zuv@Pdxlvu$%XnOtB?P1NW$zt+`sqj14YAm#X~O;OJ?w0fT#88FWEq`B%@%!s#{Te3
z)QYl#xE9o>?uRpmd79wUW>FQ?RU=)SoTjZ)5sRF|q&WG!EpOWvx+uYfpnOJSFi#`u
zrb{#nn!<`gLu-ZLe8Q{)gw~LW{vd@|f<~lN5by4a_YfRBIEa`&<iw%STp&79#fyTr
zHMy;f5fmcoJ-7;3t!lj7tYO@QvQl{W-5cC(H;V~<U6uIq<p~e_9%Z3$yJ^wS6NYgF
zizx?<Q*3>R5r9XtuCUov2y8;%8_dSy#j6dfN~7<41kaZ0t(8Cwap6RYgmW<jjJ<)g
zfOQ5{-B8wGSuR+{wcvN2=fs`|g##2EOfa~K6zm8QERtm5*I%Dt=CF)=bzR}jn>R4i
zfI=&5Rx1c4P?RN<PzyyQ+W;@F5Jg4&AjX#DX13s0ga`iNzyAUM_HX}&-ENDzX;IZ3
zvhX*?uXTaB>&fF@esBNtD9DykE8n!)Ba9RS_JVgMLVc=z@YZ6S2RNT1nao7-XPhH=
zM;I1>912@i#8Xn5x&`MPoVP%XP&#eoPDf~6qHWvDn5qcxJC7qtIGlqqE_H?iLUKq!
zz_QG-U9y0W6x2(McE1#AW6V;pmT}|C$u;W>WAxBc!p<{PT`!!duC2iUSZff2$MJZC
zb9U)YG8wi|8qd$qP@3ooS}8b7t{@>Dgwr&lt}C3*N9v-J^XhC3%Boxz4V%q|93GTH
zlguB7(+OWb{R+uBUcGsZ`}_OFXDb)r-};6v*EG>4Wa^{@mkIA=%jPb3UGb`e_TIx9
zgRbkA@8i5%Y`tUJE|cRzOE_&LxwoCCRDc`8iv|6xvMdnObXO=%m}|n)8IU~c2v46T
z1MzBGy$3vYyB(tUFo8C4!C2H%A+i9W(|Xw_*$r|B9sy2)loYty;@dZG@bTx5P*PJY
z);L0!0_Hs7sXqgVczJ)1AAkISrtYxr)-b~i4nQfO)KtxlxA^PdzkzjU1bC$IUbJfs
zFphDg)0`^5hte9}IVdHek|@?W2Og=&2$@KX0my#bB$e<OCkiSc%UOwerpT_Uq=enF
zEGY0o2xwg{5AeEMrNB=jly24y#^H>cn+@8wM%9oZT%ilvG6|g&?*fbo6cx!Plq?nv
zB>7&I33yCy44w+O5Dc$gy+&Eq$;U`74_r*!lzf9;7es31MUt2h;7JAT;vYrWm_me4
z!1qNYE`&(37XpSuaPToeNrmWgXW-$T1>yxD=SehN6eSo#+D<w2L%)E*xgJs%7f{tD
zZ15P(jL0~&P}m=yNlp`alH7>I?IBl>veZzD2+dp)8J7+ghB74=$HaLPkrox%A!3@R
zg!53?t>7HdJ2X{=h=6n712Lc~D8P4|hQxShXqpDzIn3h-4qE6ar2rq$_dQW}VocNm
zj=mqrPP?jcv%Nt`I?C;KOFzFXP?QClx&n)Ux0Hb6tVLNASa)km4_~eD>h)`!haRuL
z`4%@fJ3Kr*LZ{rpd<b0=K(7y_x~>7vG0qdDB;qF(E}k&soXGB}@FzzQ#_4+Idn@sl
z^N9)XJ({M0iynp2gvCno_F|D-B37#oLK3r}C}`VQ>cpc<c(}I?W|~Q2mt<&#E-(%w
z#6Nz&dta3dzyI6sX)9wLv=mT^L6n;8V$!PDS`s-UlFKHG9Ki(?r9xAc=xQ=R+ice9
z!a4l#!%tw0;qBY+ux(1byt%<N3~<)q)yvoT%b)&?*#r~?wal||Fy7$)^$J2wiO|QE
zWSO$o=!Xd|Q6P+&NeIiySpm2Z(Evc})Tw}S=S&iJ3n8y~I5Xzi!nuf|6lsLjX>6jF
znjyO;P<t+=#NluxrmxnBF<`x3!5D+z{qB3bc=-xtRiUaH033Bq!KnmX6L_2Pze^6_
zMRAZN6tsZ@>ZZp1{XNREUdAz^m|TdL%Z-%2zP6g7nD=b9x8NB|#~i@{eE$5AFokpj
z+Js?bHhG9{p#mtafIu#wecvxaW|7)>>nx15P^y4Puhn_GfU^rHO{VuO1j?$$FpNp#
z2mIxSKjWKk-ynja?}ubzA{VNJ5VV}}&M!f?nV3p+1ch-Nz!*?fCCqHd86Xf}$Qna@
zs?;4YM)7tL0eyd7nAyAC4W6H$mIET=aHOdvd~TelrGrL{=!YIv+D>vtn4FXnUDqMT
zh{NH4!{LB8Z{E;i=ybyU{XNd-6JEc5jlcW5ze8D;c>DG(wAOg}@)cgbe1Wno@rOVB
z0pET1HsL{fffzDY`0?Y%#pWe<eb<g0#!{!LQkTORmJye5HM%F}EILn}mlPLL^J2%7
zxN=GnW=qbyv@8QBwtQVwczJ)1H{X1dLPCJD)JZ5Wmd-chu@|#N>I$tP$UywBf4h4h
zAaOVj`1J6Ey6q6t+I%(!Z9^fSU!I;(Dh1*Z10nj9<`FSji|uL!$r-w?#^3z)Ut=0Z
zRE5UF!xI`+qS6AIGrZW{fQ5kF_67_Q2oYLWcs}kCoPhHdb;t4M?GB822wtJAY9fJd
z8te~yaGqkWS%6fe=$BHH!F}?XGTwnPg>EIlAt4n>9)@woYE@#MW-!i@D*zBkeFEob
zwH(v`vXo}OKY~RGDaq%nA7(_Z(6$|RyA4*W4liH5z_)L|#p~DKV!gRR*RD`jHHxBI
zBoJIlBHnV^!eyxl1A|N%g^XwaD>91{Qj$haNB|rnbygXS%)oOV>8?lI%P%Yi>RMW1
zjG^xhhOs|m=ueP}WD$&A82pS;XsL4(a-2N_!})YhSeRU}xoI9TO%z^Aq(5@+n9K}s
zFQbOF4onCLsR7QRlHSz0ux!oBvVu|t`mx8UKPRb)x@iBLgBD`(R3b^ojA^Ey%{9j~
zkErSr!*E_koYU!m2#<Lhk?m4AC=n`KeXmw4_!!_rz-$fLwj~%hITZ*duwJd<>`Xez
zv|V$~qHY@qDHkBVtV*obD^yjzu=o%AJ%kYW`0*pY|NeXIc01hP-(l6Q(9{hC=Xm?>
zT^b2nATk_J2mJAmKj1(7{(qs(ppaOv*Ax&dE(BHp3#s;cxsnfCB@~*9=nZtu?Xm<}
zHl>1-Cl%w%Jt@S+Q6W1}n0ZFu_X|6|EX#!#Syd&x_4xV22Ymea5xmf->Kan=WdoUU
z#M}{H2d?A-YYi1r@%O)L-#;JEczQaZA7-4+XBg)pxIiftScn+<84jKT8#C93b1($F
zzP~|NYKZ93b`3s$`b3>hjMzUv<959vPwzruy=oCti!6i$69Qj8KSGx^hG|6b3{r8d
zZ(0aNl!6c#9v}9YW^#_?oZLU9q!n>y<c{M6DI{XdoRegVUvLN(QB-m%X5FfWQpLg*
zixJ6$pTyNZ(8G|i0O}kf#$iTTP^US~7F-girE6Q<-rk`sHEwpd`26Jo3>>@NE$XI0
zSyX8&LR!MS{bB5aFL5pwe#>vWM9z6u)_nDM=+q2L+kefZ&qeCD%=TQAv+tI*7S>G5
zR;kbm504KxpL>vfF>N3HLRYY$<qgp;5DDDMV_;DfL?BHp<gzT&L+oLlg?Ax+&j1%f
zBEgEKJIfDDCbKG~Xrvc>8H2L`Hv|vHB9xHnh8GF=_0Wo_DAr%Rv@(g&dyCl+XNo#P
z($vk<gtl$dLSRN!*O)B@X=DOx?mUK`Mz#I^8OPHJ&Xb0gJlhD*$|CDbpP-JP*7(CP
zU>pW~|NZxPdU^r?{QckmhsBw8v)&M7k^I|Mt2G3dIGv8TyS-2HFF`)}WhN4fg$tFp
zZvgQ0^t4bhmP3t22t}g%u<-Ewg5}YONPIlOi7JstX@ExEd8P!Ue6MB#DrZy}>3UE2
z@Zkea$0M9`*zflXOp>3!e623hA(Jq(%Q$OhvbPcc`#*pG{=2vDaC5swQ8ox6qA5#w
zA8;H8xJdrXN^%rRLMW=N&U>^~fpw$tx9{HJyKi5iUAMTuy+`nI@dbLh+W{=#{&okM
z{I14{Y>hvEc>w1UhvNwmG(&4e@$nH@gsWxQP}IB$*lstN<{8sOD)(WSXjHHsT5>e4
zhEkfkE+MhIS)pkq>bk&?tZlnh4bC~9pZ8dA*09zj(x^aPH)O4wJ}6q_2NVTE(`X{E
zT9N=|+0E|e7BNKp-~a8u;mgAVzI*!)-+cQmv@W322uP!wTw2_VZ+aFkEAsPZ7kANX
z94f}kc$mMkwC1-wFP2!?x!7G7th^r1zpSw^cEU7IczS$7S!z5zKA~+_%Tj`zKP{Xi
zw+3S6izO{3V`tY&e33|xnKeC}2Mpr?r8MSw!Z=N^E_Y^fIZb0EgS>GZldY~tnT+(L
zlxUiE8GpxdfR+**L_RHw5<ma)Gqk1<)6@9`m&Vm`B=B~cFE-1Wda#VU$*j>@i`8mH
z-3r4Js5;Lxcp9-X{lZuST^3Y~{Uzl%ulk7+!Dx{&&kIQv>5!RIcj6pvuwUH2Kv5Lv
zhXLa_qAW}FeUInoJ%)aOQWD$k7E&pkPA5D(JOBvGL7hLFMW>pW?3p@{U0J165GvUn
zr9=6;u;z{|AA&Od*+^z{m}i4A5oK)}jhm+V%5lS4i*X`xcU6{)+k{{ot9AF)QXsSM
zhhe}pnnm@IJNNVH1Rp$v#`yl>%L8Kc`26_`+NMSH0mD3Fv<^01;G$sAMIL7atRaGB
zRhOu%l1?)-<9Ij$0eF5sV4e-m!x4Y;_FK&38Bz$8RfDI)0X_uOO^abVgYk&y1ImJ<
zZBmpHm(WFpK1nUAroopldz||oP1~R>3ry35@4o#joKBQGxZ72D^`=Q$CWCLj*+FWH
z^_E(BDHYn4M%y*mKkczuZ*e{yv07DN%%N>7ATspl0olq`@bqBDh@wykiAs<S?C$Pv
z$)Hbbe0lf+M1~hHU*PWL3y75E*rknL#;q<A1rEu`_edzYJcyUEE#}IE7$T-&`l?tl
zeu>^%2%^+?U3Fo<HBI~4-`%H;UW}B-sI-RQ0%PA}7<$5b(gVR6$LV}pnEOgAxD;KU
zk~WvlC}$0ZKrKH>sXUBxh>YRf_fSc+46tQ!V2oK9?lDG6-EkI-3n--*`4Dw<B<YZn
zisNWT?Cy4$?Tk}T<KOXkgb)JLG%de!x0NM6`8v;LhVu^7JRvf&<jGQ-OnQwzz@@*N
z@s}atY5D87-AarRS}DL2Wx!dBzV8>lR~AYiPABN1KwVeZY&OWc#4Nxj3V=?cU=A}+
z7^fbqRZG0T)X_aZKP|Xcew`VYLMl#5N+KqQOFUX#*NHPIztRf=#IYOt9)&JQbe)9o
z<1j2rf@=fGd=H;b2aE$zDOTMIP1Axgnhf&zn(z5>Bq$+o$1@&lt;Nvy7{>wP-J6^D
z^EiQ$JPP#Z5y!rV@g7~bhEMHf)0F9^XK*%<=d#uah}a(wIQ0X9GdQ0HJU%_cT8B4p
z-r#n-#_@PSRTfySRtOQW-Y=PD#!S@l2!_Z!xQHl<5|cHMg~B+_^uRK*ctNC7kaN=e
zefsnT#u5Pf@@0t^FI&8RbBAsv@apvjoC8v5?Dq$}e0h(^0v^6RBL<1!Jl?#14JIwR
zu7+~~rxWScy0*pnctV&hSOg_^_?X6m04Wrup6qsL+75NoV6|RhcYBNP-o8aykubU{
zD@abfDy<2t`Kt3_gk2$l=UM)eKg4C*<2_7fd#CP(UGb_GcKcPq%0=s1aD4S2s6eC`
za${)JtLuiWO}r<aq@^3)SqCKqB4f0gPFBP^d8CEp2$2EUToj#83~NW7hb}9e&*w!J
z;+%suZs`Dki$_;p(PxbA8k^%%LMj6HdHOp(hNYloV(K+P_L_f{Ut<R6^TTsKpO>GX
z$EfULP?qJQWz4VF7(;eB>ECmgl1H=U=YpXqE(JHnxX=~)zE1%g^#5&EYmgS!AoId<
zw=pM8US2S**DHkJQI-`L1G48-#?CTMlnZGt(AQl#$&RY8y7AxMGZ`DLs`@KehkVdn
ze`eW2ngKYUkMQ21X&Pd?gW>u4Ic*u)B1q?)Uu~E9R|mHD9{uq|&B9Hm-YZ#R7%iTk
zkJ#OBp-KT&X>b{#3JJ!O?@<hJF(UGa01p<3i*=qyL<HRLZegs06dYY!(yyA*G+YE$
zn=PDoC<;a7PUldUWzvBelvSG?8a%8I7$*aOh>F9>!5a_86s!r5qQK+hBe<Xut!fxv
zzwW>|OE(Usg%oLHQI!ooef$iL5?U6xz1^THIT&-8Cxi2;2a7cNZq^lI@US!4l`zin
zd^o0PE)DA<$XZu`3yqg=UZGueczL(On>R_%r4(^zQVf(7<U-0gC)Rix?v$ozFfOvk
zH5Hr~0}uiPV#3(yhUMwsNpG0!@<{JYq&voGv+FMm_G_6-h!nw;^;~&dM2SZYvUysF
zftde-V!6PGSXehLD2O)cycnR8HBAOi^UVm5-ZTbUh7i4h(da7#W@B(ZozmxX$*sJ$
zXbB*KEKl!qW)9<Uh7tt0BSy$X+{|NT?w~S8lK+|QXEL~aov59^^3Tn-DvMXV(iqM?
zPD77=9MF#go}QoSJtQ1w(Tb-0f<ja01V)YyAp~??N8;?%CFTr9r4-7d!1;8-r%#`-
zT6Ie?U9DE|-lOX})OAbJEJhTS3oYe3F`PQ*Yk&JJ&d$XrcTsr@x;TM~9PdWhE_Lu!
zjOw~Zp(`jY7wJ`g-}$}dZk7re89nxWkNu&?X&Nycj!Dog5Rl2p#AvscUf*OW#xF$j
zLOUIf7<)?X60dIS_a+&tsk+5+I6)|Z(HKB*%q9R#z&juW4(rKwhNV#kpmnj73~i;+
z)D7CE!8hN$qV9%s)D>+^=oBKa9nKim-HP}XX2vub{QU6~a!#E~<3sQq&P5nYI73mD
z%PcO0g14kGYP$kTki3W3xHW$H`2pL_7Kjq#WU$@b;l;~46s1B44v2)iw5u9Lp_2a5
z!g&v+O3af*S&|j(d2r+=;Q=#S)OCa1ZUe@E?QVz7c8#X0ASH=a%OrX(lt!Uxd&PxV
z!c#AuMB2MvVOJp#4=e;v+e5||cT$l$DzZE=OJ{@h;d_@fmw`sOr39uMcAjS1@;Zm$
z9lWy`h8~CGJ{cRjbh>%6_eh&esSD_$K+_QZXXXj>G%SS5>-PlC^NtndBPNiu?*fa^
zQbTirU|q6T4k$E<!HuCT$V^S}i6F{2gEs@*;R$9kBnWmM-Z_9>2%#Cb$(yILEEg-2
zJU-{bmN#f$cc)l7l1nqnFb)HzX~H?-P5A-MolEX?sYsKAtk4>T)==sC5M$kbRYb4p
z9r<TFXK_3pv0jt#K2t^Jc~02yWx;a2E%yH6FD3+E@U)Av;UYl4?yxT2V+FEZl9`F*
zs&xSd(wSCez1(|qB7)`)GJnnUjOXWP)HPvuKY#d${yboqCPZTwsU2B~XK7trI=C$P
zOE)d1am4=lnH*e%fOv6VzxRPGOnjK2RCd7Bm_kH!jA#TtU@{I<Ivu2th#6os2CWvT
zivm&z_z>{r%OjrmM|5?CvTV_{D?B|uAw*zy4onI(mB#UO!0d<v!Z=T>V}ZxR01E+$
z0KwTstjRcD-oHQy0gsQ*>9q=26Jad956(3NqvVfaG~hy_Dj0tL<ujaR&|1Q}8MARD
zshJG=GwI&Okz^d4QQ_EZI;#GWqaO_A*9i#*hTEGRR$T+73vAXKlw}Q-!VL;V(gi7~
zum)JDf(WE6=CMX6cDuL$;xQ&nDFK(kgGq|V;+$c&2G$!|p=WwT0w^N@>&c!vg4|+b
zByD9r2^oN3Jvm``hoL_&ZllC^6AQo}V}y_4%7O+^y2Lb$n8p$Pd4Ns=<2-(4TNUqI
zBHMl)-WmhhB}=WK%L2}OR5j67ve{pL2pMB2v?iHPl4fv8ihztQmIdLb`97%Y8fKan
z|9A!>V3wMagzKt8RhC$F-J(&<pmfG<LI{fnF>}6#aa<fHuDzo&Zj(DPA;>8~Nd?I`
z3SB@*fvRobV*ng=leuvAeUIQG@s^SSfej8Wc(h#$9)Y^5QwJWFP*%dIE(V9x-BQ<e
zao@Ns0dn_uIqWZ6@aN}e>g2jLaRUJe$tis~bwE;TN`{)w;GE+;49h)eodrwIqyZ7S
zB8>CnhhGrAM}O{NC$i8fl4Vp`73kUyO3EdEZ8-qE2T%9u)8i9-jC6oo2eI3z_oNqe
zmk)poL?(bhzU_Iwr<N@z+yXA07WcO+yt%)@+wa~$N{+5;aesG<X&RuVz~kdHtoI~@
zWHFtV6y+mSf#ZpYh^y5)C8mskx7e*#nA0knMd~iBb@)I2^MA&R7ccRL|L1?C@r6E=
zX$Tm{8FfX(y+8lyXY6+O`1!*})NPG7Z{FaSkDt)BYy9%_XE;YrqY=O~QTxg{M^%=n
zsv4_x3(h0vX~r~DxCM(0l950;#)!JEasTpVVuKfpC35x*l1byIwL(!=R9xuTUJA|i
z$c9v~^2n0G@eo`Buuo7*koSCg4T3Q+786cHe-4pBFybd&ys<)(JpoLR!J;bEf_LNx
zG{2VX2NEFMZ5}5CZvX^ZN{CBBb3SpeN3BdK%-usC*T|-({2JV4d~s5^7FT=kAq9hy
zw0tOvf^ar#QIy5vDsVoZh)|mD%iL)Q!LNcUh$w7~!H~wjTxhSmt32LjFRt7{Wy~cL
zWpl@pyUS&>mcnHLq#z6Gq|S#^x=$KJ&^A4?fN>sEw~S>|*|sfiZ+28<lI2YH$-2gU
za(A0QgWRDm+s|<E^UpBBHP30u=@e|?&lxkP=RHEJB3b@8IA_U;x6sS>G~XNfGqc7Z
z_<;U&LVrHvbUM*;VIfV^;n(-WQn<7DKVxoE2>kl#BT6NqI1#yxGZ6PT#e0@01zFY4
zIOXJp7?)5AY9EuYa&AQ>afj}=8@#^VqHP*9b&HS+!FscS)|49EPZO-O7_GrH&e(2m
z@YBbiF&m5RW}8gzNM|OPKwW5fJ0qqy!9in&)Ef6MUf}=yFaHIH;~60`#KbKM2&gK`
zRvXS15hV`$1FEXR!{Z)OFtlxrKmYgvo9#WyQehlU39KZcCDMmI&l7cj6IrB`r9j(M
zn0pHjq9|}F(XBgdw>K%FC!(xM)K!HdkwAr@T)etzNc+dK#~3GpGrNeQ^VSZLicDVf
za?bJa@ENn2uxfWGG;K5U!<EI}&QoWj1d$rWm5uTOKF63QP)00ttr7eM@A)n1^tS-G
znfqm2?T0hCAe~o!DDqeS``6#^x)=cDD@Lq%y8ztISun<zkW-O#W(W>i(JG!Qek9Rs
zAa_y@wm7$59?S^F>CaJQm0b)4LnPt(b@zGgzja-N@`Ihbs9fN(?l4~`ox>McjxysY
zN*bkSYnJ81FpkiLMz>m}ahqOup|jNrO&ZoZOw)*OzWa{6vQlTnSh|Lhq)lcr3yVH?
zhq+MYVxq1nCVA|>E_}IQ#2B$Z9F{`3xZ5TN1#9h6w1dCU5_0F3Kj(Rz;H|?c(VKF{
zV^NZ)R*W7>>Eu>&aWcu|)Z^g*XAA_3s6>Rb<bo{jx5fK>3SDMl(sd!l5zVtjR`%yv
zIz0x60EV7g@8{zgA3l79ohfOCagNP;g>Kcsx-{oAj)$jb*gytx-D(Y+PTk}Ah}k#{
z)12@g(xOp^$6>vLbq+uN_#=HNffV~mmkX`Pd~g4B#JSI#iU_4R#?fG$2Fz2Bx?SNf
z|Nb+z*KG~XWAf#p0@5@!nzlw+65+EfHOf+A)wSr)4&Fx!hHYwes|GjQ8+2WVX4Qc)
zfwpc?S5;aQ*C?wBGI@Y64>RXW#CiUp$RFF&dOe+#$Kw(I@-P2_4<A0@KmNym0L5&1
zjN=)`kOc~*Ze`Al0%s!mImIl&Tng523(_!*IG+#TT%-^ZfowpRxkQ&PFCYf;D2rF$
zL#BMX3uo+-W|L3-jFsf=64HTqot#q?H2%dvV-pn&>Ik%wFlItz#M6r5!bvN%CRTM>
zrG-Qql>$u!L`o%6aQ+acX#y7l!!#xk_(EX39`Eu)pNszWrm-x`t5Ajr$pt9{t~w5u
zH=PNf_JIzKaU9b_oC94ryd_?mcl7+defJi(cX#;k^M_@0%G*imwnv=LXB>|wlFTq%
zgyrd)XJ9>#vDf%q#*OlO&tEy0FfU1RN0whR`QcM{T4)MT&DSM=d1sT8ibLHrlm##h
zB#*NOi~)r%(A3Rxh+i}E$9@1JNYEY)jB^-g2l4W@dY^B!ypqlQ4Iw4$Jd$<o0)z_8
zvw=w$Zx{w}DKS}tFNXtI<aqb(H|V+oH@91`BsSe_cQ_mlh+z2n%V#`1KVj@g01PpW
z4~O%B!{Ln2PX`QUMyX5m!;qu^8sjvkSVhWC^MTmWF`a}w#$>HQt+LWIHVDCBeMD6j
zsHy^oQ;*|uL~y|QctqP(34l$Zjb=tjzCuDWAbJeL1f@zmJyQI)(i&~o;?=8rRAr5}
zYq45yu-)WNvrgZWL8Y*Ud>SzjKpw%CaVc-@TzWtGX8ZW@BmVVY{}t0TV!z)*Dv2*&
ze#K8e{eao@P^w&Pm^mX5KZ~3ZDLmr;uVB%G7BJ5PNs?5F%%smu^*r7!MJO)=(%;v*
zpl<VuUU5AV<_Dj?XFyCiOcu^&JszV9M!xU~Cls7QKgcgUE;yZYZUMBfJ*TcWVKK&J
z(K`cRi%n7vL={3nXtiKKnTil&{0hsuCQn||O!Duq3mwOWpqo3jd_D3gu9aT4cbOg#
zV?fh1#4Jx6DY0`k001BWNkl<ZwAs)IHVgxvpP%vK#fv5AqA1AjdFcB@NTq8am0ZZ2
zxvR;=>KaGP6VmnT&-fTQC|n#f7F_a*0S^GfFye4H&_Ug`3$uMGS}~aqDT#g<@ci&d
zF>wHPyB+@eul@>kQ`2TV9da?<AI4e?=N^a=j72yzB18cn8N@d)yZ8B2EF{SwoO6V6
zNQvkHiHHz@$T*3PLtH{1SRz$&E@5VaZ(rO(gc--v3CGh3H=8ZWvc&V@3C2#?ZdZ^T
zXv!L8V%BphP`3osjk6_ZOv&--%QLtVm}UzX16&||o6-W~*rO^+AOKaRAs7JSIHpxH
z$2{32*Ad_Vic-Tzj&UT<>Bq-sY;Sh>^0>z|8*rg<JoOkS3m+I}6EF|tKu|Xgo*oCB
zk7U!aS~Yn4yKnLC-8+2u_8oS+9X8t=tXAs<V+k=r7Zm~sG|vz2h46V9Ut%h@+157W
z5Km7J_~x58xVhQjpa1!P!`rvN!_CbtUcGvQ_4+2Q#HkfGhB#}S0gulQsOk#d<|Leu
zgu~ekjY9~AVLal)Pk$y7r&QE4GnQmgaT!7KLty6_F#tj+6h#fK3WVeZwE+89<6i_}
zGLtcgh~(@Le3Ea`P3^5iQ`Z0}$pr|oW`b7a62U+OQfnQebqLAwC>Q%Y$~8^1JcK#%
z#k&aa$lu>Nw{&0D(_$jCv~wqw3(+-sHy7V)o>KlSvz<!Uby&3&JhI(x0RZDTE`n^8
zNS|d%oxCvyhy8(yP>jhbA*RWOoFp=l(prn6EYoMp(6${8hXXkyIESh#pfweE!P&Az
zxyF^UBWNB8GoF`=RQ~U|&@CIg#8Jx!LtZ+RWl1ukt|Ld$^gTleC>2>qTW9g**UyL{
zKx+~+msNpx@7`h>XZ-M|KNBS+QnBpMJx-?+o*oV`#)At6As9v*;B17q4&rvB-e*%T
zo|<e5d&pp9L{k=!3`?>uC8T6@1SrxdB{^`rZm{lZY<D-fyT6AL)XMe)g|wc}=k!2W
zbgLB@r_G$T21;{87T}|UNWgMYDF_M7cEZhW1@8mpt|bkcwH{K_3~VO9$PTj11(9?}
zMWIkN1)le(<YA@BC@#>Ae%MdQy221*0)GP)Mfk)Snqe);AKF!iZ@>En-+%u-ilU^=
zP0^&5-obm9X8P3iFpg;=Ns-b;V$!p(I)iLCV(f+Ky;^lxtyUxeaY2s0BK00k(?W>M
zp&_F*@5uyj9ET*HrqM8_6eBPOnKqN)l<}q{;Xe<LpW&T>E+|*=ngy?vTE?#Y{~0qP
zL{Eb3B*MPf)nwgeTGBWQ(;cUYy1hV~&K$^^<GH@t3Km7WeiS)ZBq41cX;|uJOp?tA
zaS2XXIvsuqT<H6LS>ubu30vOJRR@t@he_@f*V3qK4PNdbGFZJ@tu9%65nqAF`5FpA
zo@jMlV@S_|G34e7L};Oi2@jG=2_ev}x~1@DedGCj#{JzL9v>fZdwYwbpt!NJtN=!b
zqW5Hh%+lY@yt3btLWK|*hGDsG`LoCe0D<;CkyYmf|GK7g<neVj^Mdmsb;?<uWKyh~
z;1p}N*>14iZt=%I{jgl?aTxLZ^o+hA&@>IE$t<tmrHHX<80nyY{jzz_kbpAlDBg<&
zD8XR^AOf(eG_({DF@W(%;SJ8F_$dMJ(>6$wZ&Xpz2s!j4BBRg;E=xEcVO_*H8gy-o
zu|Gpefyr2mlYuBS91OT}&;`YOwOxs}Bb>>5>LQ9#A|k+AgR+zf3n8O0E=h|>orH(r
zAh!Tm^u5JlZxAA7(MieSU4+yeHZ2OOsz%@UhyV`9Q?j~X2%h6`nh-q&y|$|ccQ0O`
z>$+rE)=_bbgs7d*C$bh1B6$XJG8!z4MfjX=p4{R3K+XV!6VPgWo*mk5jjp2<-(eU?
z1|cK_leAeY%Cw#@G0!7_fb1liu||S#=x1;sWe6ss<v5e{MRH_6cBF?Xf^4rBv%n-W
zRw<k`ruWMjhYxn?wz9xkrcI?%3J{vCp(CROL3D85K_wRoCM5yn97!mCvChfcMlQq>
z?vTefA;e;(@>`eAWklo@u8{xPv<(E~sEQICWF8k2?W5EMbqone&qXj7tPsdMt1e13
zb&cRXs-j$EEm<U;yD}na78v^h|Ni4o@XnLpztU*yhRE2ArLh;NntFM^x$x$KzFw`q
z+WHAWDuoy$OtO{+Bko&SUTv*ag&63%>h%7eo}Q3n+9+8^E+cHVs#!YbRN(W$17H!8
zJAdJ0X{{6WhJ4Q$BWKa7siDgP92}p1`Glu04-jAwjI6#T3-Gg{!+*0%_$-G`ow5`P
zZ5bi%Zp!zIm5NAG5f-5sgR!Yg@D^27rCFZ?EUnT(ihZAnb0K1~L$ZAFP=&@}e?mV_
zi=^OiI9|H6=y5n4Ad*Im31FHANS(-visUdM(D?BDe8e|zzQsHl4E?yw=d<ycCkG*r
zbXH{gMVNt1ZE(QxG|@vGJ=xM411U7DvuK(MLr=xP7>{YP(5iso0fjE`_;|)N61KA2
zZSd~hTU0gK)7EuEf@@DQru}}8-R%wlB|1~w4XupJs$5RwYXiM&j49_5W^G>6Ht>!%
zX`9Uk&(F^&i!zOmq)|k2RLD2nJQJ9m!$CbFkWxs<TP)!4yod9atbh~F;k}15CTZR%
zl}M&;iq_3}lX$Vz%`y__?N^&YfRqrN^Ti5Uio9i}L(hA9c-QL<g`9x4o_W=s*XGwF
z8HKVE<;FQj+`V|wQf6LQ7Ad!FOKDG__;bdnK#9cryJmjpu7(M|{65nOuG!%?39HOm
zeHrYg0&+?H$*-%d8+`fv88&Gp=b3m(FJHbyyI$dW|BPuEQzt_>PR8M~{?U7naTxHI
zzx-ucV#G+}GA%C>fSzLFC`zsb;w2=Ni=+)qg=n=}q3c#xTWY^>=W>^nF*xepE&(L@
ze(~|5N6gnhXEWx4pGmsL80?>)VU1m0M^#s_W&#+&7S0AlPxxxiL>P}fe4HR|Z;JQ9
zN75211r`D{7m$oWbAdw84Kz7&AFK<Fc^K0=l0q;ka*9DKg>|jatSBb@ILt6<J6P2v
z9v>bNA&80)BW5#!D+S{s;b9^|7ZO}>V%km<rjb_f(K~$q{aZ3)1C2C&Khj)WRCxK~
z4u_t?PdD2Y=4pWB0;Mj&nZP_dFeVUL!YTyeA9>~p$rMlNNbKo^JNXa*Ch_^9M+C=i
zv%&5CE$;5`@Xec7=r)@~Y7|gX!Fvbe44Sr027MH_rF4-p-Ut(lAz&H@XkDZekzYV+
zP9}o6ohP>hy3q@*p%jOi$0d;^CYlA~j6O%LAyfKv^eG>YUsmn&JfkWpIammZ{b5gb
zB|;#0muM1hF)dU=LP>IT<@_RS%@U%8oS1?isMDd-w=60WG^ZO7F<UW{6R8jix+s&s
z6eWxcAyF0;I3vrH{1D^^g?<)^kPA&jM<vPjCj<AxK!RjlmDCvk3l|F@jHpO7fegIo
zhgwRBx~iZR5lgQD_+`Wr97S28tSfpDor5(7RaGsRk5USO0qe~g<1k@=I70Fizs4A>
zBd`0_W&^DhcDFl}RgogP_|nDX(R8!fAclbLc8g&cuu4&3nctQL`!wPu&J$0Ig%lH)
z$Ke>s3?SPbXIe)d+xxy>Mn)k7W^2GXgAzp={TL=Qf-CyWybB9Nlu5*bQ{e2sfB5%h
zl>hbD&p02?3y_~PG)b=JAee%)3`L=^KR#oe26$tkv;<%w1?Q0IRF2+|_6<mDTMb02
zq&l_R!C7k4tV2~O1TFwcV7d1JyUjhEH#nXL48}o8hTUq7b=%?CPhgx{?b!+h?=c&T
z^O$DY{eY%X&;^k&85D|wqtGRaW`%K>p`=Wy9}JrfX{@Y?czSw-Rt08b@%h&$XelAY
zB^{=!G=!s=Fvb`{Ocub2jZF_BV2n$kH`0Supg&LWF_L{vL-^Uv-5t8k7IwC%iiXVQ
zsuCYRe#FaHufc@^1vp~qI_QQcpDqqSNliXnY4uJWkw}}eiywQgtc(%alnaRviC3hx
zfKcSBN~0QeDT2`$=rw~#>vO8i3~jTfO)w0eemx*Uzz13($4HrURDi|uI%r&Cu+}VC
z$Zt*77|X#25mFT3rCi1b5rI-`Jni>ivC5G-ZCn7+FVZCf)MFxMT;wkq=Q74X78=G|
z_&H)uuZud85g`(ro?nqFbLW>gdV*i@oP6!8s=_#q^bp4YCIn8WQz~+o&%;^^UwE9)
zXE4TyhvzQ3zz_nI*3gJ3tBN$Xk|Tz!uMA+BAnQC<-3rzjn87aBG8a-HC8VEDkjbN-
zcv^Nb8qC1CwKmal2t>DTLWq~oA$L-F^O?Ir@}Zhh6a`MF6Inc`YjREQ4a_gr#X>2V
zdBB%nKclW!5LzyUKlAH?56Q4k;_>kj`@;cBN?1EXN?QCNM(p<o6otU14sg-pa2#m?
zXdNP(!G*`0+ZDu%8~wi48Z3I0S|K=#BIOVE=RSRK5p7wZF6l&`X0p9)3xz6gAyW9J
zoeiE2M;J$<)vhVgHZ{iH;51BNDJ6IqCs-RWOb(0_Rf2*SI6?%xONMN-#W0M}y1=iW
zAISWxEV0>c(KIz?Go!AlB|e^0#}Y^bSJx#NlbDT#^==^xvP3jph>@Vvj=C<wW1OQc
zlGXwt(5cTLaI@KBd$YxMyT$JA9$nj^X-L8T^M{{tcXyAvX^G01x+^3x>2=}BEjt<b
zU&2foW7H8Pmq$dTj5)ppOoDMxKHdbz*+RTqKzzm!IY&r^lJPvg0f=OR7h=TY(<8n-
zJOGTOPZ0qj@$F=~QKd{4(8<arKm3{Nb1hcRfvMw2R>5FIE>v2P_%}(ivMF8WqiIF|
zoiHg4Auf#P+00k;fGe&SB5Vr4u+Cz(7Li2?Fi2ddsw&AaFO9PqGt6`j>K0S<8AD1L
z&t{5pafQv1Yu8>;*U|I<ksY;CB-`SA@zTl<a0mh8G%k*^xquW&@O(NRaXg=}*=%Tx
z_k_vjdsGOq1UpRAgw19H#uy$S9~WDg7^!n4J|RsARHHBcYWW_^U0cTe^6!b>VHYxK
zRo7_S4ggIaB*!7BwkivpPe&MIDZesdl~Rz9-=zhZQWA&#0sH+P##kT_@3CnrC?zor
zQ+gd9t&UKR_*y<P2(F+dhY%L40ubN5YTkEMmB_;(U35y&nCA&qRU?9o&qhO5u!1XC
z;~@o57ZuL)3>E`!R`jB+BOtca9CcA*HU^LTQ&QhE^!<n!>Es{BiAbBttll~YAti(q
zD60zniLkHP%xQhR!Y{vk#MAQ;)_KIp(4P<Rft*aGp!8-bI8J?!ew<+)xn^=s!K5*Q
zSksIV85RPQwNQ#J4;p<D_M!`wa3X<kzWWw$-+qU?+gohb+eLHs|FZRFy^>|wecx~I
zea0B?kT>V*s;(v*%@*BiNd!qjq-4Db5)A8W_`&`R`BC^W<R?QgV1S}+iZo4;Y_hwn
zy1T0K=AB|X;~xC5_C9ek%?l)Qj))s^&f07J*MHb<w`4kJyV)W(#z_#YaMAQmI;<p6
zmC@H^=j}@fVR90fcui*ZSi$4n7%ib?q;1=y2uY&{RVrF(oJ$Ll5RzMiBOt8!<T8*>
z(u9Es4MN7Yyed&T!;K<cn%}UgtxvewIEw#&P%-sHan7yuBfTByqQhrq43CcwtXC_x
z>-DsalwuyDzt;Q)^XzuJ3B;C&wGJ^?Jd2o}^HfDC?hl9vc}xe^jHZyt&o1(Qd<YU%
z6`ca4hZm7}@PbX+SeVn+5|~D^uIpuUn&<5HI}XRA6w}xRC4y|q{2PWLj=b_X&N;Nn
zsLG1#t83QlH7@3bdhf-?Xu0J5?Rz%c4U2k#i-*Q`yN&pAGKyq6pc1(?jeF<CL6{0=
z8hP`qj5b4p3nl|flV#vNRqSkohoZ=0W}##O$N^v&oukYOaXT5ry6Eo12X?zXeJh7g
zRpb;!#xPpiwx{m~7K<fa+tT$tb(vF?87erO8$fwhbxxiK%=63oog4bNfe{=^l6d8t
z>4q_iICE^Y0dX!+Rtq6~4wk`N7IlSIlDOl1AUB#kH@M!>j3doxX@?P%;?$hTazop7
z48w?u7v`}!N*i5@)$7B3OCH<C{bA2`yW!#CiLzMGHkJ?fJFJJ`dO}bf4y{OZLcj(W
zW3&alH<{S6Bm;cuI^<+L9#1l+#^~~*G?bOFdF=?NQ_Jbl^Ww!zKL7lCTwPsG)QYk!
zr<;DYT*r$tIy1yYMBq%GRME3&zRpkhLDGNC35SVUEZV&w#n8w}p3;Ov2$8_~ae%6f
z^<^wFVLC}gD>h7{T)OF$ieBYLljQ}~LQcSOw5T9ChN-JaI7KRO`~6-{<x<4HGCq#j
zIKBrZY2kUEQx+B8j`Zz`Jku-}EApzu+2L%zt<GJR6p3;AKBeo2t{-XJj<P6FN|S3N
z9j%wcsVb|9we8|TQP=f!FkD_<enfUm7-Hf+nM~jj>3-c5fFU+73s$QY+wB&Gc%L_I
zLtWP~`s-}<oZhqa!#NkD>GF>VsCkx6TE1}{xxT)dI?SXYyu7^R;o*UC7^l~fmIDd5
z3PG%x%c6>A24T`?rcrabSW*^Mgg$h%ZWa%Hp#({mVqGt#X^Dr^qFRs{kx-@A)*M9(
ztW8ExqC7~S+1Fox&Hep7Wm$3a?1t^C<oWfMdQtM>!##a(sq0#TU`8<)IJP5Qv*&VK
zp&7WoT%wfa*bJEKb^gxeB~3SgHw?YU1%(a@hX!4M59mxJIz?I2v@OPfR+g&DDYBfV
zYiS2bvhmiFX{d68^?`mwLQjK?M8h!B_o5l=`abekN`jB+%^tc=NU7G3)Kx}iM5J5h
z3my-Tm^@&u;3YcG2ujhm@|c-1c&iarhj`6jUtGp<N3mGQ2kE^BEd<kKhn!^v&dCj4
zFNCSy94$q)<Ojd?1D-v<;rYv#ES5_NBPc}=CB|mutXLVeik2CKX=|BU?^Gz}TDtkR
zFkv;Ru*o~8B`PeJ81M8v-pfUI2B_zh2|b;>>B4Q>mMqKo^FROd>4Hxhw#dX2?oe4V
zq}OKS2&B$z^WfZ+cbCQqqjlW=*(fCuYig}Cib4VjR1noco(t}>iXB1-XHTo5D5iD3
z@S~(NGg@M)`mV#famt|-g}-dMtHlDHY0!$H8|jBmQgw!rejFx=iM3X=tFx^aKyJ*m
zMNIsw5cy*l7Z(8R_dAY<Bf-OVwWY3wy`SuzQ`b7jFXyasH`<s5cxId%Bcr&pmM*?V
z={zJjwQXD6FrEWWXZ$ePV#W?j8L>dBYld++cX!6%Y@jMCOk7ep=gISu^?JqOc!*)A
zHAP-wOv!S+=HdR9hx>c19jU4X>-8FfSRi}v*=$#Q{q<K2qi40;pp9X$BfH&>`@4I_
z(TN{>W*EBzFRpKJql8qfmKC=jZn0kUpt%WbmNi~w98L~`<LaUm5_i{OUS8GjWaZvt
zkk)W?lJwh-BN`ZcG2(CA7M+#sjwgb!MhL;sk0YykO<7lwGm(*HhO*2FUZHdz+ioum
z`DkyOTGT9lu*ak17M^1CcH2tJDI!bp>)9VWy53@njG^z@Y&JB_Nj5i1NR0KOrfUc4
zMTt^5yQc%Yr-!&Li9**=f?2CPkJyNg7>2~Or|nzY^cYj|_Os8(^Nb(=_{UQlpH|%|
z+%iiE&awEZn12`u)5VmEK?+z%YkH9bo!j*Ecj-db5zk^K|Ikt1F<<F_Dr!w%>Bi_f
zVNah<$C%`E9;XB_6HG_g^8r5$xbfVLdFRLr!N82x)2Ng>g(m97x?X}+%d*4=$2bT;
zUls*<mSMD{I&ZgIG3e7;Hb%3qZ7y>;e?QW>bus-|DJ5YRc}^C!nX)a7P8UJZw5RD1
z@WFrd-lP#T{W^revR+IhZdwpz`Nu@x)9Dn~{sVp2%LuE)k~w__^Nu(DNCnG|<AjYR
zoGKAL(`TRTlk+^6EJv*+2QfO&dhgk8x3f+?S`yiT`@35LXL>|>J;@Wl>)J?fk<=<{
zNB-<j|2KZ~tDkc?HKMcKY(T+Z{^g(39(R2A-8bUJKMq`7UlBrJwOZnx<8*590XESs
zwP{Y=-rmwjLr$$#+`<YF-?nYs4(2>QJ`vE=RY7Lpx8B~cKRnWng5@q2MP&3>m>;~_
zyfe!42fzO>I312urO@ivn-ybxW9q7;DC;<GG1=V?gJX!+G#=<q1Kr@zStd5ez1T!F
z(Tm(DjZ%`vOc2eVR*JmL80`o_F$RYn12|AVkQX@tGsW4rryjgV1p#c22U+i)PAz!D
zIQA?T3!3H>&C+C~$*U5F<P2(^LDKOl(It8U>$;-I3~mgJL!c^_wC%w4^%d6_mwfZ<
z-|&MkzE4$@^i9L<`)_%9^WtoqQ3!~R(kRTCkEEC|r-T#DFVuvKq~zXtv6}xn%SAdP
z#q@0AmL4aK8%i;O$EmCG4y+qF9e3=W9thr1RuxxQ*B^I%@p00Is%Z`kqpZwRCva*S
zTnK2BlNAM{8yVe*4-T}(`A7|kBvNg3^bQw4{Hm(O#UQE?lt<d?DBew9>HX6xvFZ(8
zLECo>qvS|xokJ$?d5Bxo<R2fRlVxJ!OXU68(IH7z(uS?BC08@g#qUgMO;#4u|4Hf9
zMNx1(HX;d;7fL&%STp}oflXuKxmY<elZiETJaAGmNyT$w^(%?cs;i3USI^K0G*T1=
z7Z(>Fb)k#JVp>cTc{U08o2FqL2a0NqHsZWcFBcS9&OiL@@7Om_tX4IL<Bq#;Z@GWC
z#r6Yjdm`Ydijx25FaDAY$LX-gBMYlVy=J?)!WdCZ9HZuOzu)onwBxYbGxp<zai#+!
z%L;bUOY8N^=PYu=*bjIQx$@-7;@rr^c7qBIt>JVyVoJ|p95A2VEZ-@mczSw*$hRPz
zeXxtN<ofc0o98dMy1HVB)~I5W8(1zEtXDOCFRTBm%z1Ww&A<J(|CVpQ`G&r2Q6?iR
z<bt=(MbWRMAX{s>+H7c#Vxtm}ZH<b&E-7$f>IBlso8=~+woX2fqG0GPeJ?RVFJHdk
zbULB6;9+@WP$#f90o#4wqr99H$vHD1^n<SJcy{xQ&1S<t{mDP&`Sa&Ie}2Q8H*fga
z&wj?^(*v(xy<r*2h}wuFgH}oqTP5Ii5;LccK`!F+O5H}xa4sSFv>2riJbn1{aU&I*
zwrxJ@7S4}vBk1nv`;MolNBO%<<RD4>tCX4;?%sPzi0RunQm6?>8J(LXB*vJjYfHeZ
zq^k&BWVEtX%8ZZ)m&+ApS&CiA*vrkTW4@w0Z>JLZ@ZsTs<w{uCAq0-iDT4l%eh`p6
zi#ScLL8Ww|v`HK#4LrTCDegXT$r9-_bvH^WhOR&Jz2asxkv)@0y6gJ$ffNs=#6X|>
zf2GfLlC7w~I9Tyki$ybukyEjnlW&v7P+1f_d-jaO@gTaz&4%T2$!4>eKI^XQL_}>e
z%A#Z(EoD`TXZu1lj(GvQ-6P+A^K1UwU;hPNv*WvOe$C(hx4+?dIFRL<<!VjacI*#F
z?(ZMi?{_R}p(+T;yXR@YM;Xm`@4w}5|L$+_gQXjLd~`h>#{oN@?RwH?Ie0ITekjIX
zCassRUvWG<V*4X+US9HaIIuq+D2g0wJL)oH7(Igpb8}U{%d}W^9Qz&{WS#0_E14EH
zclRH-zrTx2XOA6ws=6R}JFQZ^5?Mpvwe0qL1~;;(7yOf-{DkIsqG@}{^HUm0Jc-+h
z09TinEEY9g*G?oeV>AjGJ%kxgy!j>GDsgPmskm6wjDzq*(uLpm168y{PPVZ?1j{XD
z1hj(-gdldq!{8aMY=%Dn;&Xob)1PvE^Nf1A;QIO*P1Eqb&p+qOAN)YbcdJcYXG;-H
zqhE+GSjAChe%k6ZzRU_z0$1mMJ|8XS1^ZKGaVk=B)9Lu*{O6)m>tivJf0KeBd~yNJ
zWTZA)95jUf5tC)SjEO!76W@j)n1T^!0c%|x?S#9PWkRNP&atS4hf@{>oAp|{pWyI5
zB?$+ScZ9QeT0TEfE%d!;%f@J5-Sq;_3c(WbqX>#JHy@2z$zy96WHhzbVqFS%IFHGb
zWz4Lra}mDy)J(7}B{IEhJJCEwDufT>w($|>I4eBo=aNxVb0)&hM^rJ=6Hj~_yAu<M
ztYukoIP52kFA2WWHIwI}AQ;D<wrfyYu;IF12<g;~eErqW_>2Gh&$#{OYqTGDdbp!5
zGmg7Q+-Q0E>W1D9?Dl)<79&J-+U-~^mkidEX9d=ce7O6-hYugH!$5m#$jV56aUz>b
zhJ>k*%hp>kx^Wme9#4Gx-Ft>%;PuUxi$%ua@QBV!+OB7@r~%8(^GhE0C&r*KFRsgX
zCQ~ezOAgHu>nues8H9_)g4{?;U1k!{&_}sJRaRt?aG6%OsYB5U#<64UJM1{}i(men
z_H>k7GLvJi!x%{ycFv=-g8QdE`_oa9F|t&M0vh2mbzO%-*0Dl(J2QaggIiFRCXxn;
zH=E4Bc_DfwI|?YTLZB!zR*Ql<&&i5hnAKWQ*DI`*n|iz5@}uAR9lreXONy%G%O8Bn
z-G@7FZf=0UI65x2SJRdza6U;>aX}?d^Yba6UUvfG=U;Ph_EWHSzWtjQthqDkoaZ&a
zah><L7#}auSOSncYa#e4)S~Y@6h!i>sO-D06OyZzPT7r?F2>Mzy~v$XuxC+}QTZUN
z?(3_os8<txBY|n-N01_j3KK3f->iXR=p9vAQB=`h$jkel#^+(|$+U@bC$ZKENSAwN
z<DVyngkefr(LBph$#O|4lotD-)b-3cZr*#^QyY0wa)7F6D40IKIgxhWVWlmtbF#rU
zSsYJrkpKW707*naRECS8uc_NA%W?|TO|1L$yqnF2<cg7?g4E5)zY(l7b=AUD&qN?y
zR@~p;^8Pp9&>Rm0J7NcspH)QxA+T5oE$DPS5IiianzrjGs}d8H7Y~nnv3QP+ivn^b
z+i+7znosZ^Nc0_1S0s=Aw2{Vpa9%P7f<uRnn~McO1@507nW!yF^SD1!)C(YBK7U!g
zYX;%i<fTv>G=bHkqVKzjp0KP8b&-=-3r6d3QO~8drmjVao~aBMJnhhu>A<timdqH8
zQ7jjgaDsw>^(M~S0ob(zHb4jp>zQV8t#xFzi??}Mmbi#VD9!+|buMzH93ep8kJC*p
zvDpK4EkTZTS&2=BQsfydih|Ylg1#HsY%T~vb2yxM^Y*QrtU+;kam9<5FF2l#TwPw0
zWf_OVfs5@GbuF=2N|3pa3KkF@T+K&Yor#APZ<cu=!N=_ObCH^Z&}YjR^-;lsk0Y|u
zm>^`-ggbT<7bxk(l=pGFH$?YQ3BM4pDm^)4q}ww1z!*ozVN4c2^887eKiycfO=v3C
zqG!zGmaxP*JF%_j*q-+RqjQwj?DkI)lWF6~C`@!~Ep;j5k2V>~h&OF20H0Ds#z+Xx
z%=t4(W0*^yL+o(Q3lG_zdhf*=*+zRDA-j>Ly;L~nzn-UApCwH)5oja&&pgV+lIuiz
zuhOWlwPsP*TwY${z2oZYYASBq?RM(0(u7(RC9<3`F)vUyf{W#X?|t?;1kXSG{Xft)
zvgqlWp1=RuFVIDXw<F32PWuy2505Ms(KFvhi*s~LI0B=h;paF?o~en>z%DIM&UBIK
z{U1lhVZe=+MOi`!6xy*Y0)&p67dJfaA1SMhV|$_>15djSho{Oj%olIg??$ibhJg%6
zrVY+Y#MbfDu&V2LLmBqR6N9yMLr-sqiQ81xhOX;zK>*3FA8=?Mc1QNd1ARZTTGXf@
z5k9##<VK;jSlDJd$0)&<G>R!|%7e9WbPN{n#S=$#yfQ9UWsVC{7}}=6d+`J6M@vx_
zSl5wfIo&Wu4VR9muVYbGI4|T(?-bwN-ihG5stCZBKllMn*Yd@eUr-eVmlu~T7fZ%*
z6ryNu;>z1hK@#&3plKSaN&*&wi@_bS<4W?UIY|34iSyiT$zz_kM*`e`+)d33Tq2@M
zXXS9C<#gI{IPAm&-Fv*XxS=OF%Wk)m<Rc@wcS&_0Lck7U)>zjIvLdJJJ4PoPF7G^f
zCh_H>TN5?EHX5T0g~`Z^Z0eqhq7Y0-F)0pACfjG(0@WW`qFC!Nc}Cl{tQN~ScE?zH
zCI0?eX^f6srU>fixfCJ-C=7!e8SEed331H)$1uU5m~5-lD3~;XMj3KlkY{nr9lV$Y
z=(98FKX%}x&oupc`fTO>CBh>fjb^bFib-8nl6>T3X{F=q5i6T=8nFaZJPYX4&&i=e
zg#1J7+9c!yB|m@o@E$^-E-UVy_PqJ*dwl!NZ#W)WuCA`Qeg7TW1P;4<Ufo<%mC$!b
zc6aYF4D24C$g6_U^^8MHy;)+NI5%jdIkMJ9BSK;OyFnaYoV6GQnf7?su+SrU3A@vY
zraQ7)Z8$VNz4cU!1*f(JozXjod498a2OeW`a8a=7<$_->mvZ_VLpN9)5DaXtx7grf
znnp%%ors!^;$i=U%5nw=t#@pfE3`6L*GHkV<;(AX!NbEn&I^4Y*K#UqBNud{RfNbA
z7uk$K>kMOZ>?l}MZnC(xRVW{D!IBwSohmKPjKPg$S~HCCjf@vko{Rr>QIr&QMca<_
z!-#Y6`@jDOaf5cnfBlQU;D<l_A?wv@3e!v?TCp_I=(y5P&W;HuTP~MkaEQgkFbd^A
zX0N9UZ9c-KqBH+licz{5l5^<!VolvwDwyfQt;>?b{+@p5BgPTOHSckDoNlOeQ>6=B
zBuh-(uF(<w^<$S5pTm1EvaYHW;e4KPIPL*YRTfh>mqwygbQ3t8GWt^Y1?Mmf31f(?
ze>8)&91q8+f3p-tPLUZhBbb}U3rX0>XCsd#n^kMiCUo=nYW_YaKs|k>zfVHmJTIo`
zbul_Ti?W5(T70w}oIh?FFB8`;b#+O1xU3fuFgH_IGT$<$&utN%Y|{ZSf6eK2q>eik
z{^Yta3<E`8ay;y~yT9e>@saJt1>1`SCWF^6USskMZ%R(RMdu|iUcIIpEMNcnmfQDt
zxUr*cTD<Eqe&n*sam^8Bd%D(<7qT2PneYNPn>F59%DiOgdr6f)omkcxLwCg4hM)Y-
z7u-I6NAENk&9OOR0UM!;aU7?{!aTpJ-Z}3X?MRg?G9&qL)=FBdCdhv*3T*HM6UZ_{
z)11Uw29I@M@{GZWD}ZDO%Bj(gJtKjBv^2fAJ2p)_0jyeSG6hB}lpbmN0T<MS3nlWN
zCKfEj&7iJoG6lKLBEL&V2h?<t#I%~s;8B!WhEa+l%Y?0OEm@XR6g8{$1<k3YR3)43
zhRtR}-*vov@q+8?>nP1ACo-g*{sKORkZ`uMq$l0<;wmumn{R&2Y85R!^tt$adO^;M
zl>oTsz>n08&9N%cik)RQM(J3H#0DhKGMeVd)BYj)9T}XHE;Tqmd9$bIo`{Hr94yv*
ztQSC=*olaZt&3PsvN$1*xME#X7R7`i&GmQbhEBhpe`y^@PbFQbM}jqrqCiDlB{L!v
z4@f5^cxOi6H<D`@Z_>?XBZmPV8*C)*>gnd5zt^8?1kV%`_Yn|YRwYd*A*#|Po~@G8
zzfF%b|2$LSONA&MP?^renL-<iyqLPH`5~1!U{ZJsuCH!HKpnT5S(Z)MQ2IXRzn&9D
zg^F=xv8cI!c;xZni89M2l_n3A<$}|oxV(N&@FOM!?%v-~)JsBEuvl$bZm-Cz4W?XC
z)it~Qfye!Ue&`6kr%(gK@s6?W=-VShdtzu?0uB`<-Rg8aV(kd7XHhAP>N#}>_NSJ*
zHjK`5--@Is(^|y+Cd4op$dZM`IF5{YN$`Pw6pl^^f!=vWYq_{su)E*0td}@MW}&kz
zMs16fLB~~n-^)cj3_V#EPckQo!-|oza&hd)#k)qyY3@cxS!7g7{GAjs5@yOw*i|1x
z3M8yj#J8&WSdE^?t}V~RR--Z*BN9LK`uR(CPfuKKwhUGhkG)fr#gez5zs76D+qZ8i
zih{%8z{{5}0eJQ5)eM6PVnpZ9vD$f_<6*Mp*hHf>=R7Z7ya1A33{;TVE^E)2lN7P@
zX!j8q%o!7#yAC8VvW(9j74taH=5dOL#|I!IxkSvLV=mQ5&nc%f)A!_@Tx`}kLL5=#
z2GnRY7Z(>C4+pt%w7j-e>_*egKMylaR=Vj+eAmZw;Rq5#-$wnNb50oRQMxqP<hkXi
zVv*%J^RJX<lYXSt`n-!uH~ezBJg30;v%T}2h?_>_!{IP>gQ>8jqA(|-&X*?XeNIJf
z!WWH}T!8pqrEWW2V@X1kq(htan#;=zKHR+*Oe>CipL)xuU#H^Lbsc%0)3)vOUO#{S
zoS*;0&v@ML*b^{$0Sv6xE1?3Rc>VS*y>q<3y(QCz>z6OlTC-eAe!zF%e2eonRb4`v
z(?-&99~#>3$iw{ut3^SXD=ro*+UAMUIb8d|vMkB4EVGQPTrem@@C`<5j>90>mh)`a
zE4CLav{rnZJ@R)yzsJ0Iws@z|TtB<u&>RUth<{}*9n}zey3x^%EvwCfEK^if&T_Tl
z*a%zIc@NsK-!+&_V~o)338Km_@|?kXyd38YR@_a4*7Vkkd!!P4E6at5HjX_$h+~7C
zIK(!ZDTZuxo)EL~RDf{|6xy&ZauynvC~T0fs&8AKUq1)u`0d~NEgl~38J%UZtg%DK
zzxv~U#b$j0A@IAu`@39TU&R0n9mnGZWm!>`3nW?Q%yF{biB>Mi+IzFvOc%b^24nKL
zMH5lE0MbrytVnnaFr_+An94`(y`L4RIA$n4xjD!pLKN@L$*A|$SHGm|8=)AeIBJa1
z=*?&$>neHPzVGScDtxq}vLA*4JNY`DS>n=B88njgVvHg;8jS$HnaRajLdim=iov1j
z#!Vp%sj#LIbV_@+fv)XwRwxWcX9N|d)Mc^G9dK5hQIlLq1@O+JGfhxI-is7Y8fiM8
zTKryITyQ#_rh+(kVHjcz{V)vd_xtJp&5PC~N&0B}`*C<f>gLYfvloCp%co$D)M<Y@
zwob)UNrF&Wm88tV#JEq%J)go7N(p!FbUICiS02}}T5V89vsf({9g~~r=o}$4l#3;s
z%PaDt;P%5U&F+9wn$31aciOSLdr#M#=&YDvYMr4>fi7y+SI<~pTtczH>xwR9^zF#w
z{zz{fd2l?xUb5NLsLb%~ceg07X+}+N6}}y*i;A+Sxx3v_=?aBqQRJ96uj+Ru%Q&4H
zOrDV^sZ6{Hs;Z(|lo%t0YPDL>wmr@Uw8<hkDUOu{LzWwY3ZOGaCytv<+e4Uj2TDZ?
zTv6BK&zQ)>T}mG^I!X@Cj)>`|)mn3Td5N<gjlAaEXtG!cM&~iH&HnPsFSxtCgXoTV
zJnYE}&33({s27;L;OGDF6@UHLe@$K#JbQkF_nyP<iMMZGv)Noso0-HSPL7*{9peaV
zNVc}gnR2@5ax*2-q?TWy(R!9u$j4vP7EjG+63jSPF7cKkCgny#aFZ9e802ZLudg}m
zL^7fk=l4-ZTb;y+_c5v|X838NCuY45@xX|$O>iAqTPNVzMTwCy;-(<dnR7Rny1#^H
zB`|&pV6_3Q3|-qq+`?j`L}rYRtEm%`j$TEvwD@TyI!xDh(MjOk0Vjd^JfJqYVy3RR
zX`1Od66TXS_f(XUTkO0r&G~Ng?n^24Q3sT|s1U+r+2iav9xJ^MsemUqAa!a*DF%aA
zS64XaI2;Zv7K`aUoF8(@zBt9Ir7^Oq#LzNCBJlpOi^_x)L*^%g0O#b|y1KsPus^cj
z?-@o%tv%K7#OrOzdR1~5Rb1v+#&N&}7p=GzI>68l3~t10MU@3i=vgmCfBdxDqm;zU
zwazgNj;qZj%}Ew5&RRw*R_V`gwwTX9TfY<kBH6YO+x-xj#F40xo114?H&Em`heOLa
z$f>W5qAcYC9|tcwE+06YI*iE~UBG!+h5MKzC?q#Am2*yHHr57Gs<hU!&GV7!Kp?Jc
zg&&o?ixlwc)oXtAqyLWE+dD2VHrS!3$TGUVC$AS1p4FXB;Drm+b`4cku-z=NL(k32
zH=LR-dT%v+cYDhh-~T>8{NWGz`QQF6%6XQX4S8O$UacaJCX4na4yB`wZc$NImB?6}
zqfLK5ad6IBIfWEFaY2m*dNxK(+#x5OSh7qOsO-FEPr9_=JiGk^-@X5a`@4JDHr3MY
z-QM1^-|Z#|ic1`#;K_^;A+h&S`om<0qqLbEM59zL#=D9BQmZqqLV$4}qt4Gj^k|3a
zMoinlc{fl+S(7#fYdyQ&6MYP52*Hc3QP(iU(I{B~r%u~B(Q2MfCzOeuR_wY{H<Y@X
z)J3JvC%vY5C-f;;o`m740L|I#shG^ar}SeEe5c>fi_&@g7V5{Gz$yjn+&CoSZdKJ>
zUtiI-E&KicyqvHfho+_<b7E@BgiHn5WQKs4HJ+M=A_lh<r8wXwIN)?Rk{K<O1|Mjj
z4nh_;5VXeXj8H6Mag)r2L}$p*9Cv%{*rB~+Xb)ViOD;EJt~rh)mlqe}9y^Taq7tJ+
zgaf*$OUgXw*f!i;ZzxKIxw)?2)zy-|>#?J-kLAhbgj}sFHrpk^iv?^5(iu4K;|3^j
zI`ssfGmet6=G>XZKJ=EZ6%VJp%&6-UV<c~`@9lZsCs37VvYv!O1QcfKDngJ=6>&Vt
zOvWGn!5{HI{m=gkfBbL$d%pPIEB^Gq{3-p=#W7%@u9t#SoKCDZ6?I**S}xdZ*7RM=
zn>TMTlzj2Um%P9G!2WOot@*`QzvK`9@DKUtKlx`AMa8jcxOw(mZe$dhkqo%iYDKlE
zDa#s#!8?hRYMK@sqrT^St90rnHoDe|poEu}zCK!oOY152P!Z^s4c>XYNTSzzA;ogB
ztoZutUvO$pxN*eU#0C18{qCcEavFosnk+9dS%HgDUP-tb#u1!jbfU7?@iosiaCs*D
zsO0}oEQ%uE>88Y(#1Bh1f75kh=`!>jj(bjRBO5|z8AhSAOm;XC@DEWd=$*ttC1=va
z>6)Y<@c>BM$n+!q`FyiFr-;n;hI2mG912Jy=DbLy&+gMdOV4rU%*_a-+I&<n&qYTp
zgo20lddtnt3%ahE+%{4nol_dL*5?$Tc&(++ejEq7uBEIB9v&Y!wGCY_)=VniQ+bgy
zI4eG3eMfgXk{QEty<riB&JVjip<I%$pYi&O-=ZHZmzS3jzwRkbjtids!xLR|VC)X4
z(37j4pZw?xo^~G?Z7+we9SP2Id2vD8ceuf#f@8C;DRV_XG+b^s1n*d_7MQy5@0@cn
zX@tmu3S8f8c=Psx!Je?A`1fqL+eoIgl%-;{Jz5zgUCyAjM1i5TNN}`fj76|s<R~p`
z?<_OeQLJjT);Jrb5^C;&glwlG8E!hUIFB^Jd%pVWYyRk8{~P|~PyU4e>(BlV9v<$|
z@v#Irm5aSDE8f0+&C}z9w5^et`qQ8Ol<)uer+ogyAMwBc=l@LKkGy^Rmhb=IOPq6D
z-duBNPAnG-Qe;*#?Ms_2lNDs<9F{P*4mNSCGaoO~md~W*=Qu7Ud}Y2341Q`a<$F)y
zs&f;7oyHF5Er-K_-~8s+91eS|9fi0WH%{}%{j@vCGBKYkt2&CtP5e8-#>QU2+dPgX
zS_#oI*|bPUQjjtd6T3Yx@{hpg)EOi_XV-O%)^c}uM-v?o5;!leogahX#EvsWC_y7B
zIO+OG-ChFK6X2Zivedn%;xJ!&d|WI(9{Un6ZEje2UT&NL_w;_wyQ_IY{IsAIML|lf
zO0Q?W<qknG!|Us7hGC%XPE%)<mJVrrOvZxg{hJcD{W%Er>gq~9gQDPcI?2D0cAG?u
zO-auC-Hs43N21=dSk_d_C1th1d(Fe+9+cFE-~avJ<Jq%oKD_@xHw-j~J!PQ@eM6=P
zUR<rXfB2fwrq9TbWg0MaZO^jGDD#ZxFD}RoVq~yffD)oD%442w%Xdl}v>^h-j_aER
z&u(f$u;jVKIjz=9s=8!<IK)^j%W|>BS|`5i<$|u2Rz8sr#qXwIwJIa9STYP&=m#q0
z*?Fp>z^HWNo}DAd(M>VzDNj!5FK2NrO7XM5{VV?A@BfCUhdo7>6O@jt??6%JXacB#
z{qB+FLOi>lJ$uf}H*Z<2ulb#y{2u@7fBH|@v6qYEMn2Tte$S78_a|5<$vHj*9v<&v
zMquRP7=zKp#Nr*s9v`guRYh!P%6**S5m_ctWz#lvl+Xv~M#iB<>zGQEi%Tk6MQMw0
zf~M#!t+C#Lg3%6~jz>1D6{q8YBF`xDQZ#^GtY3;Un<x_r{O<=xwOAqnrhP0xv8XC}
z9jk?;0edG3`rsXPy@<i5!~;({wLCA_?{_FISWw@~$)21(opX%V()R*#9}foxYw<qX
z6lXbsq|ZBV&dyW=`P>6j^9@=$zSO~`8#UdO^HF==O?~?3^FlRO7R)=A^#4<&SQ=H8
zml1xlla5pqLck3pMrlTO#;j5-m=B&JJ9kA|Wn|Ik-h0p0)g?+n*EfXVsUw*?6`}bk
znb`GneX7>y<e%P-sA<9xjB6MN@+_PFf7>*ZKU`HWaM6gsJ6S3ec@YoEgs(!=H0+)p
zC~_k~$EPEAcXwzvuqr&yH-dNVk0*>aEUPNs)0(bnWQ@!TR+|mzOs)qsMUjzZj@725
zZAZ-YMe$DbebKL|R=j?5fl^}57JQDgDuQ^H!=WKFCDw*mm>lcnhN{d_%EVJbvED3E
zTJWo(?_;M0;}9Td87rLxKd2zAX(D?%fq!SfovC1@lX|hJDaxF_>)G%3;?n3Ho*1jH
z0^7}sy2wyCs=|=x8C6}eS#RkFizzCyVnOc)e*W{n7hC1SeoD3eAOGWj<mIc^JU%|g
z^x9(T+S1KblvRv)R}mxVrY&09`lQo&PE(l152Y|@@E)x^&i3?uJ7ElYE?z)SPfu~X
z7T4|ZLY!y9fn-3c0E>D-9yOA~FmgQYX`0h?BG36oN{Joy_ToBjMP-x?5x1)AnyL`a
zPm)Kqt=N`mtr%m6JVuS+>2&1r>4DSfFx?a>)U>W^9v>g&Ge!#6Xh#`)O-@kiqvgcB
zdy&q_pfiKX#3}^>nNsIXX)Hns)SoYD=J?cn>`sMf4sy@O!_+yauk!-rY%%Pd!`nFS
z`M5Zmea=3<?`oC;G+h@;C^$qxwrtwv=jYFFgtO>I`o5h2`8iK4Z9$WFR^Rv2YfYVJ
z>I#V(+ccu5@2e`yC`u30bz7DtBob~A;qs>#YwGS3;r#u#-|?HTzGCP)at%vk`Oz1z
z$#hRuDonYcRE9!ljNa2bktS^yOT1Bd4Das_JRVv`YkB$nin`7vydz&=t}pX<!!SZz
ziQ7?eI*yc8jSH6J$x$tG9v&LXav`(rF!1WtHA5$xBpaFOT5Fo76=_Uw={k##I>$WE
z!AC5?xhNhLqM@@ko-#`8K}as02szb>=XP0%O>>qjd>C;97*&D}k&9!aJ&LEy4J4+t
zkxiV*a-6knw;PV96UAap?|Smga6IgBgA~|t7(pBU-M{}2K*sTDM_J^UTzs_3LTpy{
z#{(CaS7dn+FNAZVOuA50d!8<Y)G<u|20a=6Nhfs<HjpKRp-_t3_rKxh>UpFx$O%5i
zi%lV;bCDN(``ve(PDhsOC0#Fyd8HJ`{hl(HBx<b;MoXTdPzDrvQKFP#y_RHY;b$2Z
zbuFEkvr&iV5UXT)?ZE}=MaA9Sop9s`v_mT?HmOqy(03!j2kt-IN{6V=GzlNH=m53I
zj#5XO@S*fxYOTRrsyw4G8ATRlICVM0YRoilrW-XCq4|iH(rxDBU%J8PKz(}5RJ7)i
z?WyZaMN!Xi#Z>GPog!`Dj5<fJ6?raN%RECFg^J;^f(Pcpe9sK~{VqzG&K+L**;-56
zHUQIt;EW}U4OF6)WSNjv$6@60{$3UiaeL@Pn8v~&d>ecSRH<vTvZyf_ob$AOhgXrY
z?*nyJL2l@p6a8r*j7RM8j#ULp_2>Yr#hTyT9w>5=+ErzNa$a0M@{E8*tAd9^Bc6P#
z75n{>$H#`<sb{bbbA6G&lda16L+FQ*<LSh9v*y%xgxIw_J?_a&Mc+CUkt+n)QP|ZI
z-l^#Nk$&)ugRqj*g-1|?FmqYVBA+SUphiVI5E&^&>?s%Udc7i#tXKI^9NrI@!peve
zM50q<8D*YR<QdhfVo_yexyIU_vXErqr^iR?dcmO?`271{uv)EU=5GZzsp}fF;&*=h
zyL|8SFW5glk>?qwrkM(W)`soHC1tgUYkWu7wbMnPPHS=ZJh5CZ@!n5kfau){DHxH)
z5pZaglNTjgXO!ha;02`!)?=-7Ym$s?CXU)!(JyYRSJ#*9cRSjqfp|e?ML}Mc(*+2K
zJ#{SPmzP&mRmJ=F-(rlRs>I`Lx4UD%e_|LqKHS~TZs0&!m9oW)V7l`X6tUay>HChc
zAL!ebrtQd!Qk4Hi0a2P%<bvO%l$kjl;8PN9`Z>!)3@s`GPgR$bXH{|ynRl^sEGa!l
zDnzMJ%~|N5g5+~PR2pg12sVF?N!0rZK{Qb$(uOvDC0k<&uK3vFe^D*Cyu8F1NqtU*
zF=14x$V&Hq)?Oz3IRv6>L&p3ob-TB>w}jv$T}29&*21Z?(K07p$LFy*j?nlBKiEj~
z$R=9M=tjn-!S*f6cVya96^e_^il_aNyN5@*lSIzvWyNx}rYIM@`0V>U9q%cY3r?p2
zQ`C{rd!ni&WO=Y7S)P%lxH{q02<c2|Mb`{G+z%YPkt`EUSWzlY&B)M=+`M>(vjg2Q
z;73bQ)a;KZGLxfpMwSPB=w<HJIUY%kHr`M6Ejq}Wezjh3*zd5tqgdorbw$&(D8&R;
z55vHETT|6FT{}{gvJJ~}=o<m!$HC(wc3_7<=SLQ~qAm-HT#U@dp=YsLV7+CzzGP9=
z91aIb3GQ0)5i&w<{ql=17}}2g(>?t-#BE?jKXf8ObwX5>LZc_orE~$On_;<JezfM6
zn@0S%loC)|97<%gNudV9trACz<#xmIc%b$pnaX5Kr=&9>p3cr$7In?H-~L*PVo{Lk
zjL|u45Vy<Y;mB&eWqYyZvMjj2zZ1TT^BfL$G|iE|YfxI#oKB)I&2rklWxW+bELzcb
zJ%h7&@8q>A2zbh>l<qGcQr0@L$5tAz0y;C(0-(2J%rQJ~?&d}2Q%=*F%M@+1L*RI{
zs7z1ABo&GId!0B)sYoTTJKgwcgqjmW)AJ>Ecp5Jgpq~m>DsbaC65QFWE_HH=37<x<
zxkTwxZKYNc<F?&yIUbK^dD@I{JEuP+ib{G<61Qx<+Q$E5u`ZEeWiz?o?_#0V<R-(8
z7C#e%E2Snw#Y95Q^Bkw5rB7xE&dRnwi+WQdLVxE5Of*Own<JabvZ|MSdv{9+2I~Ts
z+XX5wI5tOirxW*2Cp!NNe(=L*biuOkJDS$>^mN2%&HmUBa6Ef{$uK(1tDDuk;6-~D
z5d1<ZS+yVb4Q)Guistpzg43~|I5E53j$x2Bvm`W^IPW<ePe5AVD<PVCp*zgB_h=I+
zD?@Yac>U@bhy5wC$}8$cLBR3+`4wGvV!f%@Zr3px8aA7nqR80qPn2an6@<JnXrma?
zhg#(*0@iv?O-mnR==;%8R7-AeZ&__NynXwYufF<~a9j?17K;^s{K)&VD*yl>07*na
zR7d}sU;N^i{Oaq!XMZ@bTrEifpK`$qS4lb@7=~`TsOKkUB9l&JSS4(C6*CL97M3`Q
zSg>ZRb_C<lMpIRFv>FaFN=81`=v-W2fOl5Xeo|<J5pIneCG;~lhV8`_o9(5H;dv=(
zCm}ElJ-eqzhM}ix8;sFp@!~BP)l`J`hdoW(Fhqd9A9~uZogU-VG<01*9fT?Z<k}d)
zCY2KWGqUc*Q1HC9n*-i+j7i9{f)#mhr}sic(&I-(Dn0jn+)IC!iXku+l=OG=F)(3$
zDJnkwS;D*KBVh<}W9iSif2jjYMGgepOyKtP>**SiM4rCuCMJ8r<K{X=@BNfoH0M^O
z&Ml>y3&q1u9Kffir-}70@4NU}r7bJd^NH`eF=s38dB>aHzx4Xcyokix6W&_Ju4R#V
zt~MnXn>F``10U}9tg4(c(;V8Cyew#jk=`q^(oohJ-C#MK8aCT4506iDz0fPNBE$KS
zw(H4O%O$6iY_&{~Q^*4$5*m%s>>eA+N@GVj9!{9d@c6hFV0*izJ2i|p5C#c&?0d`c
z*n$o$tBSHLI5j;w*M#863xjjgqF!IGXpRGI)AI7wHC;Pk-N5B$&Ew+(tIaiE)Gr8l
zc25VYD(CXD#s^2&I)ayg2ATaeDAD<iqX@B!x}-2Lv?Ie1=v!&eO$PmU-?3V)ur^6=
z<m5l>4}@U&<u8AUbDlSEUUPB%oTh8BqsVQ9j-ct<j&&hH3+bkk6ZGt^FyC~62wsyQ
z7nP#vMSH1(@NZO1jW$X=COqP>8K%}eOyD%$rydO(Pu%P4YYvAayPY^x)@4b1N<js3
zV|AURct7o)uy*8hItZQ^T}PYKi87PzXBgB3t}3NO%NDs!>4s?<;Rq#TM(<@*DawN2
z&*7^fh=^JT1@0^)P6a^59HtvIjlBes7Nu@%;_%J7gEYp#dE+;yG0exg)D2C*_>5|h
znC<hB(L|Ln#(b1=bS_Ni$4##<ai!8mZ~k284oVaz7Z+FTqt(xpJ{@0A8dp=nbdlDQ
zM$36;X{{JlI%gTiAu{-T`o8CMI!(`;uFGy582W)c7A8B4g3y=@otuw};T*tEAuO(w
zgQv(cKHS}r`;n?LC@iP8;dnSwmJ1ejPKF^U$*3$A73)gl!$5QD30kvQ=Ab)_@tCR-
z9J|P|R&oW*Kl{;}cMnf{iJJF9!jte#KpDiR8^%#EDutphD~5iI?t*Y^d#oi!Da9?6
z0*}Glk=Jjp$V<)XIN+^iyIBC1&7$VB?`;_Sk;A^BUIk1RSg$LFp=Y_Q*<P$D%bdrD
zBUM#UR&oQkt>f`w$6{GhuWLM32%VXPPGng|SrxQxC-(#b%=cYSS=U%EHmzTN`6X@~
z`R<!<I37>fAutXjo9&kW@IU-}4#&MX7ML8Arm9!uMMc*SWU+fGi=1)nIh_tP%}ID>
z)?)1_BulL(ev<N_5WlF*#7Hn?oo`d_Uo1id4@#r59Ak1B6(jEBykl?!KE$xi5F*JF
ztnI|lyQmmq;!QjB=*)2Q{3X}d*AhjgpzT_k=E!dUAUqePDB=xit(}skla)#;I^KDT
zOnkmv@RQ~)bu1x73u`STV>$8N8I%qI6~wRKq!3trmbPSZQ>KB!NR*k2?`f<MQ`g~a
zq%@snP?QfB#pw<u7wPWqmhNr@q(h`z8j+S<771zT?hfhh?(SSd`hET%-p|a=F!OBO
zd(Sz)6FQ34*Oso*XW#MX_lVy<#y=pKNX+9v99$evJ7&gYGV>O_Qos8Kj&c?n3{sdC
zq4%Db8G_pIi-?M<eDu>vX7KQ=W{5I>yf2>2-=Ig7(2$1|sLM+)&o-!F<O(25j-rmv
z8(zyNp}K5wO21fLN^B<RgS7P0)_ZQhvDW{+CGip_I~SX5#9Z47R>ocx`3$Y{mDEz-
zPh-)#8LwV0vs;VMiM8<U5>huD931J3+R3pxg!dP&F@k{WyWTC^j*7ocop?PJ*nrOD
zHq>|bDEnPf{iMW{>j<ZqAAWH%oF{o0&oto3a>Phk<`IYG0AUOCu$+UrXv`k(?Xgn(
zV@Wq3gX_}=NXhhH>Cd|?DZoVgJ};%s&x4hDKKG+NEN=L^MEv-dW~1@1=}HFm#8R0<
z4ZGeSB&;kGbW8||QjrcwcMc0~&w)$k;@5@02;*++es^hlS)JWjAxghk-WcdPxN%ao
zdwGlqsn?UL_#a6AB;*SJKJ-m^>)n@NOA{$1rui*&^o(+FC5@Ad%Px0_eS{~@3w+U5
zfEQgD5FHle3%x~vQq$cq%JbXVRHj7d__fza7w~%v4IO>o2BS>JVFM8S;PASPVJ{_;
zT>)JD^_^rqRbqdRpo^|O>!<3&`7~xJ4wul_JX?b3hs{;($#z0UZN>Z48B9NvH{0$<
zcQ<}|_W~>?{NFbZ1?P@ze-t*Pj(3CX{K`%~2xmm=d~=%F86&4|R>*fedOS|6IMFX(
zm;wC?P+rT7Eqy7=K2e=Ek~RxKq5M|+I|bfuiyQm!MLR;&pA9uU+CBUoBhdkRa@_ht
zulPt!%*>U1?S_j8iNIObpt5QGpgtS?m|ZwDvxbZ6gop*wrR63~^!~+0Mq<G*O>2b1
zP_+;^K6@xb_R9E`s(&e1E;(%kQfP&h?uAKhY~~I&ak#o5{Z3+(iFlL*7m#Nx1{JYf
ztL)xOk^5KGbr)gqW309{<r;cJlIa&jCq9epq)zCUr~Hj8VOq8}Z6E)4F02vC4*3v*
z#L|tZ8jhPsJh^;%v&ex_b2sk#lMix6H?YjYM?;IoidCc=RRo3qeQR6TWKsc=3!fqa
z;?osYAW`=9wp>Br5(qusvngUZsB&Vc&8T4+{3(ezu!!EeYA_H_d@Pbzf)*Bx`bi$f
z34(8lHi?wt6GI?Odh#vv92jn}0G}sN*AQJxt+Gl-`z%@7bR3Hu>M@;@CZNbhfZiNj
zXUmSsVL0GfyR~Jf)?7q?%D}D&cX|4NjulQ?xWgIi7@H%Qoson>Pftm6)SuDTo)N<v
z-6zQdHd&9ZJ67Y5-3;T56nqdacKbJwfgF}tp%@M$8#S2^V7!KBYtO%O{Tg7+p*!MC
zLNR{-*C(2f{AvI6_Q8ApzTI7sbKc)%5W&}Bg8CHWpVzoqctSR=Nh)XES{<UQ@m$7r
zJldz+ulXnsrKP2|bC$gUf*~hSF?+6kU+R08<l{C!UWWKvS3?y@f8mL9_XW`U*>~8=
z|F&il8tNGMmSFTJ5SOX~BpETAm%*W5H|}hBh?_beqY~W!S+zxx>b(-__hK1|=@?N@
zl}zp0&fRx!Bz%k-2DSG+#9%ifw~cTbWJ`0#V4bnBXF0ftO@0b5L=skKgWDfjSn+DD
zu<;Vf9#PI9hOglSJ81-6|5JHnz?VN!Ut&8}Ak0tBW;~KUZ-taFH8mT$KD`EMLguW;
z0KvU~5HUG5ZKpb?A_e#rKr}rCiuG_VddIH4Ne(}3*_T7mYeutqzBZ;<Hbch3xThff
z7IJC}Sku3E!>IVppSDA-HX7h1y1%s3c&n|%x&OwCIlD^~|CjQX7+y$^)e7o10Rv(&
z<8et0-|$en|M-Ifp)5+Gm}R*Y$QL~QtE}r6@Pd$$k<z2Lz}q>!XQ2P+?hV_WAO+n(
zCvK`jpPBa|wlID17sk(gwhi%BXwynC*H?bR3{_0;-d^?*0g^jB8QGc4#fwZ(?kU{}
zR}{lH6~c?UKR^2{Kyob=eONn|J!PYUWfJq(9xU{xU~~6v1Kt!^T4lx&E_aAUjmR=#
z)*1-Mk(*q~)nfaI9Sfcc3o=2ON?kBvx;{r6V)5utrS|ROXvGn(Q!6;#aoyQ7{<o52
zjM$2PVa1n3>;$@a7r0R^+j6%=_aw9-fJ<q8bu;~ExD(%IB|zY6?dfv@;ZU=*j6tej
z<xvp$$}xkC-#^f;SpB$W+Bd-@@X>2#kc@_vIh0~vfzmXB?9GSHqWqrZ9yvA~exN6|
zK=i7#vcv4~&hKgoQi3P-9cI@mY}oB_irZUh#e+qUH_yYp{bz><yi9VQ%I2|a^n6tJ
zoj2UZ`nu+B+BZ86@z>We;S1XJ7JFaL1Afgi*#izm9t$gknw<beu`c;*o)2}`Whr4<
zuj}?9#7mCoSjZ#yCQkp>0<WWtJf7#VKVRpO`wv}JMU%<Kj#-bLPi}vgXDcb$t=e$&
z_m?TaY+Z{Ca28o5ubOx9sV=BMbHVfoE*zjAt}*Yl_Xd{X^w@WJJ*HFrRqcS^2hpG3
z9GSkY2F4&$;aing+si4kNZ=jSa-RIZ<IgXhfwWz2GcNxAKS?cF#<+Uc)<`$}pv0LQ
zZ4rg)QNi~KtSq5=fY{IrIiI!cL*RnPYxe%y?stVF?j6+@?+8n@CCj{Hjpp%=ow+(n
zbtgB%Ms&wH*8z*<KD@YyK!%m&k;S5RjmsUdV!#T!pOT-;Fzb$hqEogHLkb(=^J;&M
zPGToM8{<9n8eTlcmQ?iF@%7uy$q4#f)2}DIld@|0<@Bmam>9Im6G$_ECzqFbZ&?uk
zSH$4#pLXRHS`Aft)KFU$O_!gccM<o!JYqGaViPzT=KkiH(zF$pn*06u^5Nl^>i4*c
zLHBJa`4=u7sLI+YH%5m4rHfB)(;6H!6oCP}ca4W#;M5C90|&l9-;xSjoq(>+gV{`d
zHuj>DFVlYurp7_v(b1Cd5iWp=2wX?rLeo(>Q-d~la#HmW<KKuI^UDnHaY<?!lpr2`
zGmZlRjR)Q$)Ae##ab7WNnS>Me>ut-<0vWcx2Aer>KF#3!cWN46Ak0gu7oKu}r=~`-
zu6to21;ZkmE4Xa1h>*5ar@Qt9eaoz)-Js({PH98I*A6UcSEY($y-%4n?@RIf8Md6Z
zYTZ^P!KTf}x7)nf`>A33{;ltmBOB9t+j@<`0n0IBYfo(WfZTAdd9zVoUBLzNT{s{%
zug89!x2MthW7=%Q)e;<JQ>~xFTLvM{6!q<H-1u+Yt}Y@3`Vm|Oc=QVkqJ#D2!=|op
z>TEQ0aEx+f$PY3O7CiyBFBUST*gof}4w__t;KPjgUhRcHS-FKJb*=^SEDt8oGC|D7
zUP*I4YOpG>-ClK8PD;;gcBK6Xa;EqlbbrKCzQd=XQkbS+gK@(t$6<VW)IU#`q>`&R
zr3I<5Z*F~w{rq}OsO>?^$F67=4toHvV?08Y8=u}Cn+r)%)oDo!DkT3V%gldaX^i9a
z9MFJ2dsPb^*IF=l)F-f-&9t_O3W|RCKGe?BvG1N&n9g9Pf*Rwg$_1|+56|_^{9|dl
zP^ES}PCu8IjR16QzhOG)Uf-s$r;lcIUeExqPecEClxCfY=<v_qBnB*~st|tRtYCm4
z%S?^ASPg+p_uk$fMmSFU=ZMNJp!L)#;MNVW*cPMr&FqNAjiDwH57$WM&;dJEvQK}`
z&e4$_)#SMF+$`(3%$;3vyvd0l0#+>}6Y7u(B-jg3%;Lz!F2^c6_ItuVWt=s)lxUP#
zfIg{?eH0hE@|?gNGevBKt5Fu4*m23e0FKV~QJT=VDF84~Piqjc!A^DOC!6RsJ~~{M
zqhvgXvsy!0N~zR9`4Kw=u@e;bl0V@po(|g%dT06Z*tOJt^a!hs2799JAmXwoYS9L&
zn~u88h3!+|Po-P7CC-o^L)QNO@`1xuXb#V3=(SFcInKvNrvty5H(K^I4h1(vo1W^p
z;5JE1)A|k$6m4mBDYEXh8hE^P@vZLoVS6mG?{C%GR|AKvEseH-m#_+A@5QsB8u?%I
zpd_=H0v4-0Op8fkHHwK|hj|dNEJvzkkuj9gDo`1<^qC`)r8OM%jS#Y=B)3VIAGX4l
zYqb#{wPw=r_zX<BISRJ~06xdTnhfj<z^OtGfNBpPGgH_<SFfA_uD?HB*vcW(h7ptF
zks<KvyNKh4rvlmFEM@s}{A&S}d-f4@*wHVC=DM2NGqMe;X~PGG?ls+r+=>%N?rHrm
zgg=xH!(%%xicWAXHZ*kqC@;iVANu0_8M@vM3A^W0XXEPEDAK{rHS9U^%git`=K#s2
z7JVrvg8#6L{6&?(R?#jkviq1JuCkus9s9KYf?-CKCaXAo@ID^D+iDk-MFAE`V=5N8
zyR9r*$oz_ToVyfMM|TLPSP`y}De`KhrbtYBdiE!L2d={bBzs(t86t&Y>w+tHC;4nV
zI%&?4&i}R(oMz=pq10gcgZs-s<iK$TU}<-I+PUYr%TUE$%o*_M>p7#pYZWylzOMOY
zE9RB8?&5X--u?%gr7~A?J2Z&5vmdJLNp^Vvv$zP%Iyk_C*r@I7w0LtKcyI@stSwqh
zXQn$aKC747re&6<Gj|W!kz$Dveyik&jVd_TFIRf3kU3!i*H1P~2QrsN_2%C+<T0U-
zmbg1Xwael%H_FsM670I13DlSn<SWPu-!bed{8T=`u~0{$S7}b*8Is5SsURD01^q8S
zji!Dxzhm@w;%&Qfk}0`(g2UDKKB!(Y`z{~oWr;0J1Bd}1Tq<F^@9G@FH6xWNl0k+y
zFY-F55w#U7rrAV6(S_WKks(3%QyUybumWo0Lg4o@<1Td=785%=!8}9N^U#-j@tQT0
ztLr`>=j02p1oGT~2t%$`O_^!!dSU^i_{)(RaGs2rkD9F|^aHz1?Ta`M|1~d~pg$ED
z)aJyO`;y>FRAmy;^)iW!N)k;h%gHQ{TSiK6liYD)yUgw2TOgQammU@XPH4E{K#G|v
z<NpL4nSiws_;V}4C69{A0&0pf9=_1H3hR=Zu4y?ghTgmQlh!8GJv>!-Kk4E3NA?A&
z0#Zs1R74e++3H}+?d3@FkBN$xKXJ=_6cT^grXvYu-WkOo%C9pnxnAR8l5;m5UHm;!
z&^|5U6vUYzhE{)3-*V<ORGX>QzwSe|!zlAGhF<TD9Nkyb6T(a4(Z}@s`jsGK+w-lx
z-%!Z_LN%6jK$+Lz=lv#1zTrP`{wn(PM4IL3bTw~wjo2Cv*ht+(NS8?OZj9CZg`npH
zPE%;(IlUy0!3FIRbmNhmoD}}+S<#(YJk!<&yI<=6VpBV;ISYu?1g-{q)u|{Y{x#2G
zaKkj5@rZSF&K4z@U;trW^Wf%;HrRkd3Nn$(al*P23C*o>V5^umVJn^Z5*MGhPf8nC
z&Vcjjzmd<+c)}5eUAe=HWec|KU&1Y_JlL;eSUB^G_xDTw7QN5w6)qpus{2qJCl_!%
zhyHr*wQ=27y0FRhdgm0VR<B>>+jP)+5%|&0W#T<^85pQFOaz@@#Db_Hx6`3cP0J=0
z%Ci2BmuOLK+kO>3(8nM8R&l{!5^NzOhzw&dYnd~}l<YXyt2<?X4@2ulL1jDMB|rvX
zs{z9<t#;)MFa~7+0oTgF7yH+lH)xjk)iz=tzQVFJJ&l4Q&ht^n%iSkN<M7}qteIk3
zTq;5sZ;6&hhof*Td*qf5Lb<h%rH3unf9E2C%$=_>U3(bdB6avwwH7cOq*mr<$0952
zi%!zQ!;z_~Jeu`$J^q?ECk|;QP9pLIY&6c^`XnNf4I~6$V7ycj!ImiMBP5C%f2hrs
zCklozDg^ltB4Iai_;S|4Oqon1;w7a8RRp$BQpt017c-E0+X)U*I@^VO&#v8)go{mL
zH$@}i965Rl&}{tWv<TAQC-!-DBEcF}>hSg*MJp{y`zG%b)HEtlph9ggg2hgy!aN-i
z+GvnnPdNg7jP9Qg-u?wbz3(%zFJ40%MEeaop0|}6(lObFe3}B^sr=)S_=8%w6Pa_t
z2o2rYqA*Ex0G>jNM1=yzFDMJMDyM~yKqr>lb(3aPX(_Xyw{H&P8QHn_s_0}rtCV>B
ze&!feHx24{s5j=E>kt04vccWU8Z4*1&-Q&N{3AI18oMRH)5<$j&>VQ+aTUAO7q8KW
z+(-@d7=M3A54=ulJZRYSJGDLL*3)CY9=&|L<xW_?jZLZK6FAV<Mda6GUY)Ep0YC5F
zVn&N>J&Zx9v>3d$vtFS5&oiB`X=4SOBYF#~XTlwC&J%|u;vIn#FE7D1{Om)ui7!|3
zCg5EpXUze6A4&13z|{Ip79N!@Vn)~zOk*W;Je9S0Iy)2!R6xu35*1L=u`biYcbG{m
z_|wG>rXRuU7vQr;4WpaNFWx@>77TS3!pcug9WD|$)25SO&M)RTNv2o8tTgGg1ept7
z*BvoQaO9jAwuKG6P%BD^-<0Vpr8VT(%RDLeZ|;O9q!l<aMNQ$;(B(OfYsv1O4hrz@
ziQ0W(P-1k-JFSxXuIK)pV(F=3-w$UgrN9AHj>t-+lxek1dVs2Xo505{2UcQ?n$|xt
z&_<uu9-MTj>e5_BV1l%Nb^V=0LzH)&^Z@r-?1!P4V85mCjXYc^*Y#az!AJOCFq1DL
zdDDiM3KGv$Fk0+L<j{dsT)(#*oFmtNMsOZ}&qwuz(<?V9IU+c_7I*FfBn9gbtq>I{
z&Lgisb~s!O)a2{!7J*)J{)^CWzEb`I(^&AvUb!U@k#lUxacsp374CStv|fhCiUY5}
z`_D@(H9@ZAL=GH2Q*fI)uhV{U5?|KkGCqI*Wq0d8@vR*)x>oP*pyDs)Dncee+B+Yh
zV@Hr|+I)Wg>AI#jAIS<QtzjU~S#<_GcB-4>2G2@0jdr^ti72*^z$WLS+i>g<Z{7a5
zKqfVDr@H%j<n6W4iExCMTr6O_4{8r^Qs_psOgg^x&)r1@9Qs^sr=_2;PGmVOv83cj
zZWD?>p~4ZcI_J@=;M7P$_eXvzzl$Zk5T9KQ`1)@r>l}`^C(nI&t%urn%$1g2&B=E%
z?Wq;FP;0=m)vUf`QB*{I0nUC>(apCN_lf0V(9Lc%svyo(@A*)^ZgzRu79bKW=zYQ|
zpIWZf2WPL=ZGttaxSCivP|NiAN$$!iLRVBn(ZVzLTq6~Jz`cL+S{IJt%V{nyB-76D
zQ=xvU(l{>Iy1GhuyZ-#Dn^7${@<5Sq?|^gMlA5-3wVQmTpDl|JZ@N)`V@%&o1J1Ea
zOR$m2rvF13kzb~3zg$r`s3Z~#wD0cz^Ul6_L{*|yaToL-aLjfRer!lbSrXz@OFJXn
zQ~jZ<s6H+9Q7EJE%$H^Q(hu#viNU=Wh8G)QUCF`(;eupb30LHixF3eYO2WvLh7&zv
z;Z$=S1)JNN-%U{wL-Xp^{}r0i3CaO+`bLi({Yn5wAEWYX6h{MLOM<Alc70ZMWR1ko
zh9A2z2Q!(i;c>rc%)9~z0A)o$Er9?}M^RiK63y$?=w<sSL?S$XWTnNdGcbSDO?M=5
z-7t~IrV1V_E>^aKyUk#<Y=7aam`u!@u8s^Oa{8;k*i=2M=b<2JoPhlhPM_y*b(%1@
znLI6tBVQI{@y)VBqu;TtR;l4z@OUzki72R_ET{g6CRm}9dD+yB3uM`6=y0Lbn7*zA
zK0i9F+_;ZL0#JpJzT91B5hTI*F#gYNy~0w7`Cl7LC)M$Hi+PY`7E4cjr&+ePv?kVG
zx>~VWJ70F_vBJZ~8Z6r<{jMGb85n;q7xW2wzdnbxwj%eht0&{fwc`5Qe~&52Ar|qk
zJZ#l9SuvwWSuuU6Gx_W$;PH!xQUT9l!BvP<fGiFeuoG#x-Tjp`tb3=LGfFa9xM?C8
zd_E+Z#_Yeo23I5u4V^d9t7%qLR!klBtqGQ}S=&iw;;XT=QF%MZ#?WQ70j`RT*E=tk
z6!i5rpRuu95BW-R0kXTr>b_9SV@by1x_=8lEe5XY3ds#G^NRAe2Wt~WDmm!z+YIQ2
zKg@*5jOvh+I~Lm~sE94lx8&dpSMsFJqKvDkh{s4e0yA*O6`mER3RYjFFACguK!IAw
zm9<m(5QY}D*xH)i-_2l`>udA9CKzAP{sOTgNPhP)8`avnoBA%X?e<W5I1)fvZE~{T
zYmb)QAQ}<DPx^%jPE>8zeSK}VGT>VyP#RhE%e1lgQ6D9J3eGtx%ux>Y?Zuf!5-~hY
z`AO-U@YS)4c#`gqolq5IZH?7RqlSr@;Dq<>%IOV8s%LH=tsEn+klHT649v4YPVSlC
zRqR-#`>Bnqdr7h2yn(!M!m@&wptf|PzH6HzpGAo$_ReqHU2G<kco~}d=qwFeY85pf
z#iaI;c)XC?CqY9SUGukD-In+1k&s*_Q4Iz`G{)W!gPisrip>LUfbvi3FoS+D|I^4J
z1x$29`YZ5ZBH;CIZ$wXDxXO@Kidxf19<Z!3iv>K(uhmI#esrnFe=sfY8+EB&n&bi8
z+y5;(Y8Hc3%tdOL!$dgc3?twM(nG-606F!HWB3h_)7R-lR(~6OMhstT={D>$ug)cx
z#d@Ot&}Utn&wvIH8ka#eW!qb?A6M=%UV{E2nHJ`iNXvTGO@k^*u2E^t;Hbh}T3J4-
zXklY~r)GAofFmelQMw!GL3sVdLI4P8c8O8T68gKIVFa0U2C6^oOeV~$cLCf7@ZJG_
zm!lO`_e;;Xbw_vswW`<Byw#HZ=9deJAc?0pyDO{1in58PU7AWe#X)~078eFQAiB4R
zX(2h3b`bWgv{V$5&1Cdb8mj3^?<I!vC>5t$PfN!|8;3l}h>!IS)m$^+=YO{rpc&G(
zye|7*77umQd{KYLHM?nj#-?&5|NN6!o|)C;`&OD78wac-7e<feZ~O~xY;VHVg)Avb
zb0mCzXO=UIIHrz;e|}xFjUzQ*C2M^HImaT13`Z}c-kn-%igLw<yx6aV?Hth%^>HK?
zqNeJC5cgcWdtPI_AXzWh<X0;jf%Gq>(i+LMD$H5Mp1hTv-hFemHtyg1erTEy+qu}z
zCIxqA4C7V~h&)9tP)xYBG!!^|c?8af!e7NFXL-lJ0UvbXfiH|<R5Fm-BBtdAdIj!l
zk(?5osL^<kj81a3cGLg80JN5ru#<{OOz$D9<bAY4%)P(YXf7YeFm;kAJwy+_^**lv
zX%;7$?>2o`i_St>P0h{w=~=HlAO*!Gt~>Zjla5?+xoMU>a^!QdwXOD;)e+Zj$Ie1>
zr2g)!fBI1GqNPSr5B|hL+Jl{h8la0CtDL59?LzfezG<g;;(qRD<E&51o~Dh$iGKuj
zCaccFDKolUGAa(kGpD`{bK&;7x==<Aho!7*&D2TQNzmDfQ4AtpP-jovng{<?&-zrS
z0Dx$$s|~YpdTMPZ^x0C%AWBhfz{2k=!54Liuc9SM?7#IGNmz8rQbK!DAKyMB{b9t)
z0Obe0g2HqR5AFf6q(Q<TM*oEw4_+o9MH&gSzU#TY3Qk?rpffT=XS{oW5&{;e2Y0M*
z&`d4=%w0!nZ)XtFsVRL6_Q#oqcUC1*`?=OcgWwkmg9gqI<)Ib~+c8`&<I^!yXmlgn
zM5r&tlLKi5esJ9{wMfn)M&>Y}{wu0f(eJXonFc@$#eLkLulXarUAXwz`>C5E&SQc>
z(6A@m3>-qd7ZLkNn5jkFmQ}~9yxj`718Ntws2DXlXU05Y*;o~|dc$C--@iJkKSU-!
z+X6gg7WhTh*PwGLl|HYhg4B%Pzw>m07U}w7;Oa<ag_8$yAuM$~+a6izL;YMW71$X5
z%;s<wgNot7W`{lx+W<=5IyE|P)>T7Y8*xp*9QH)^nu=Nl(@;1@L)xpN!o!;$x0`2f
z*WgG0&e`DPTp0w>Ah+lwcE^Q=aU_a|f$|&syN8n#)_Ebw2>$257tH(ndlE8QXaBZV
z`Vl37b2w4qBnc)cPJDSC92>)I%<}YWTbYU#yPUzxI>&AcXtpNV+Ib?Cwb8#gT25$L
zLN7{;BJX?)t&hs_5-1hO8VBVaJtb5C*ao!69C!q1k`?2KPM-i4-cnTVC{UW#a3<-q
z*;BNUjoa-H^t=ot(P$JYH)$w-iqf>u{Mj>eE1Irt3hVN|K;Z*S451!z!q^pq*OWw5
z1uagzbPK@+=WtLsjlS)ihl&oXd{PFBt*h_>hXuvD;S}TFk&_3%#3UL{7+)^e7=j98
zf01f^7WrrrNupZuQ=rumhd=3_>JfsJ95nWAtjCcsWDztxhHwE71MmSUxGu<j{IcEc
z{3uwXUBzSAARnq3u>DY}r+K3W@t@s7u1SVrLdumSt0MjQT~HQMI=ym(geTB;Zljho
zSF2<+U<es^{;gJvMEREq9&$59^qYbL`HSU3Rmicw)3;pAi&7GN&P-BZrQ}SbVLXh^
zoR!$OniXe~60d9XdkGOqxJ}0n1EA_*ErMIK_zH9tr&sSdWQV6jQuq`XjDvFAZWjZK
z@M11Lt>@L*8NpZ(BPwJ{<`t>Y6Qoj(;rcn*r3HJ24oH1h#F&$`_$Ej}XazEi`HShf
zTq}OoyxvA91-*KqE`r>C8@kmQn)AerXmMEcqggs56U>bLF97pjfwHKco;@nu2=Drc
zz|B}XzmbDsz`rdyNAUnj#vY((y~m5ZbH{lRx|bp@QH*r}2I*wjkM~3<a-k$L_Sh1Y
zAKdLwJDgp0V2><0J0d5}CeUGGw+>8JsVFFS+Y%cL(rj&GYQxH!mdDIiHlp`yD8>M0
z%1&{PSm3`>5qHl~OLi5@8iIy&G=gPf>6f*JLeE#pF7pqyr#y4bIt<J8SqNq}_I%ic
zKJGI*eFgZCL1vjYNv+kKNXerzlO$F;9I>J*T07{2rC$;sRA#g-3&ZJbwPniQ#prTL
zThQqD^|LWVtpZ=V29Ro#N*|Hm25fcN8?`Yl_L;evQejgKq|v$Nz8-x$TS0DY;Dy{o
zQ}-_B)aYkLzt38!c)Rj7Jbgb2_DH{<X~>W%%UV~3zH9GwzoYty4A2hTnj~0`64h(^
z74jR^f)f-biKDX&Mnm?mS*~D)Yhre;1pGa#r884@vydmfS2E<EeRM&AgbS*>cVpc3
z54YU?*?vJLi@`lR@D3{)tn+3qy0yzjNxMoh^JM_PRyg(v*|DR8k}}*}Dl-xzQI`oc
zW~iAo*+9>x_mAp~BrvmbN082uWWe+#Sze}&aI8)y0o8+@w~QaZB*3(q;jlHWXNv1z
za8Glg(LRfw*_Y^CJ6W?>gc&p^WXK4(Kz#a^+W0dR+UYGJj^VEI{g!bq*YXce$LkOh
zbmRGW?$ZInZi6AK_uZ+iB35~RDyVJW(dpu{YlM(p@D%&>KCaCNig?hn-&5!-wzjcD
za*9pw`9vN0KHfH0!~kM0k`asP38OMOt;(Z_%vv-R?R&H7!d4`7Y<jUrImTm^97U(g
zru?K=nW+UvwMsRs+xK3z0A?6)erk|niq4S0;B2LXaEvM(oeY6S0--ddbDGO&abv{0
zo&mjNFXZ;ym}@i5gd1dp*GE^G%Fm8T7OUp{X`O(CQMrVRSeBJ!oxUpZp`TbDm?sur
zVomc$SiPG!v%%o2^T3gNll;-KC7QR(HGwaiW=lkl%nT3MN=C0SQS?LKk>9?bn2Kws
z|He!sso}`2SR?6utMQ;0jqledEU=#}ox&u;kqgn0OW#4Vim+-rp^UouJD387VlJ!b
zkbJbX&#zQf{1aeVdv>NjwaSdSE2ObzhlN2z@Dhmya28jg(+20b!5L5t&e*d9(F$*e
z{hEHaHcda$D<|^}=S;J{uV2ORBKCCr%Kl~2gZ<(?rVKY3PsSiD6ZFm5Q>~Hft^%1b
z|CabaL!ZQ7B1=601330q{)xeBk_%QLCC(g-u{soln;os0IlFDah<*d@(4PyYC7?9i
zvt|hDxqy1s1jB-sRc7a7A9KJ1;8i{&Bl;Guz~eEq!vg*>NH%92UN43*v1`f}6*|^H
zGlrx5g`pID+wd_wc>Pd1kqGl-FREme^KHBHX=$ZM=5@OdoiF_-gF)Cj&`P^=HMrx*
zPR_^n)ww4eJImWo;2Ib**Y1LMf92qVQz>~(pMtqm7`ap+zl!g(lY`L1%}g=cX+|RI
zr!9GM=I^((R*mq>=4lNI<TYgs_Cst8^(c!Nf!ZG0M}6agcMLQKT0iTje#j*iJj@EK
z4@XE!eIV45HDD7Y{V@Q}H-Gnzu!ZM>xrPUwUjLLF(Y#zWf`|SOl?WxK0G(QzC4!Gw
z87ZB=Lmsup@{a6?02=+&j$IlQjLGn)DzDE+aESVh-mwmS_|qZf$X>{t>lg<{Mmje(
zHnzwq8J(L(d<`b804pg0JIV*6es;o00@LgKXopb2GkC8dF&c~aUv*|N0<T#)H4gb7
zLy|(!-Mef>5lO5Klt#_NT)Y#vq?3^CcG3B{;Z!XQ_^@?3sgpKM#262Dc)T-t$9zpW
z55ZP~32i$LoE&4^QxjL8p)4$So!dLTTnk7ffIGxpWlZ1>R1Q%3Kw+7m1E84LaoBab
zz+1F3(~0pK;iSIE!;l$OipjUw;S)*90r=p`U5efEd`k66x<=zi?cYd;R)RbppG>YB
zQseeQWzzn8u)*K^jSbf_;TmZTR_>`tbdz+M1Wf`#y>!G84@y2)#hhe|L!p+)3y^VZ
zo?@kS-QUH*TJX$63=o=Kd%N^(Uc8=5`J7}!i+vwAdjJ8t!J+9J&!o{`6nIMFWAXvS
zJ1|Uezh|w5<jd=`>46Psjkr&aWCxnh)rBO8esVH8@S9qN4^u&|-sM4IRW1z5`6E~g
z|IIV9YEdRdJ-ejQXeIf!n^2$?aXAR{^Qt&oA(7L>?bWCEqIYZhOlv3Yp}tH;Hk$EI
z&ca9cMU{@Z0mhw2?K}~@WYFh9p2;dBHic<~Kl{;YH2{LQ=suvq8Sy09X3xFl{)OYV
zvmw27b3*{l3HPU0joqKPS#eHed@Qo0kYc|o*H4hWX&yNjkC&J+&k=xx>I)7DUyE&R
z6~+qp9~}H;3ilo%HJ{MFoUupaL(ggeQ|dQeH=zMM?fT5qlF7gD2yqKSU95066R6js
ze+kVue|B4<DO0vaS<b&7IAob$q6hX`<AT#}5J$*WWaEL4n9GTIB%!atdm16amgqgR
zwm^)6tJ}UvXdCG}_#F|7@$Z%x0o8B(7s-7CNl%f;e{D&D#E{T$p9Ypi79N?z>#y~&
z4gz7)IklNHITi-qRq#yZw)fa&1WM!O_^41*#smNOpBf>1$H*GQWMzMxgq5jiprbV1
zJk0|XHw_*3F8&itN=-|;wr3B=(S)nyaWwtaz?F6Y(sM<UcADAe8mR|w08w6Dlu5{S
z&Nmq65C|T&)tD!h8@N)3Pur{cNG!MDo-si`+W98_n$l>zpt4!@%YigbuA~HK($ZEH
zV#O%%N7ehsKpvRMK*QPBccM@Yn?%j#xFDsV88@VkbK72)Lo0%OIrPU>#HWgothc@i
zK{9M<LHxW#j;U64Dk}fIbH@SK>c3%PswQ|^S^tF*1pw69NJt0y6<G~Up=0mZ04_nI
zqU~|;UWs}AYP?nM1Z}W{Y#A9aKxjuZT{5H+9L?rY!O2ro)MkN^DGHWS0<?)970LJw
zI51y8O;)H5E1Rn_FpjF1?FgmOE>gYEyE5Hh>i5@L$pugQf^P3-3NJ~F7yaP&dr=t$
z*`tmg`!Fbkl=Wm_=^R&;6u!53v-fXOEzQU{tNEl-J?hsmGBVb;=ub}gGP^iDFX>VE
z%jGl|!c0ws!uHtgWc2(f)<<YFw5RtNUsUJoS6&e3+qdXSwW+9nqY0PdBV}?!3=^dA
z=;%M-hzB)o+edVNdnHM!r*%#hQINbF%O{!gojgHHDx{&?Qg8e>m4uJF<o!3VSv=EL
zR=9jbew6IHpp5atjSBPXkXdgWWKYt4W|E4P7eflf6DfUr<=o}11Sv6v?mhfF%A~p!
z`c2qTrMfHR+0$iiu-!H&P*~g*j3<jA(HcAENje+dN^wPl!xI;W9Httyv2un6?F0^A
zx1Jiw8LEYLSM+w0L`{ma(cs~y6}9Kf9pP8##%mZMdsc0SVL~!uq%M%O->4DKuuF%v
zz+p^qf0v3*{RuzULnQULTMElaxU6k%@d-5@{=;kl$rKYPCYEY29137-o?1yi``=<3
zFKpHq9to4(%ME|&e!9=H^^LC2ePOdfUtJf=1*7_-r=nr@44&r{*cm1wkdb4H1bRwk
z($C&XRB2KwU8C`xoVicS{!kA2t^$#5y^46>vMA>xeJ=u;<yx-C6`V7C?>TbK661|X
zPC$wBopdrXKC?bxnId+tM9(x4eD+Q0Q`W;)xD#V3VqU$->3Owh{-9DS2`05a{de?a
z#XLSC*a`ludBY;s^=^*s0S#>&oF!#0v#56ADn3aWIPoz-*vK%DB{JpQ4&t2Ak4@On
zfFI8yNN&JESq4jhlS*<#Ce=*R{*%&&3c>LllI=Tg!zn1*=EMWfgdt->(9jb*QjAX}
zQ^3SXlMfvTJIjY7J*Cm5d{D_vEz<_=n6jzAGj(2%Dz#11)xb}{sPP2TPD8^toD0dq
z6|BW!NJbXtja^zJ%^0nSljsL)GOO5zU4k*s<q79biaho3B|Yp*bN1P%X#v`pnehT^
z5}~k$JW+AYf)D(&e$Y9kupC191Wxc=)Jw6A^WQsVt?vq!PJ~vpaR=~Td}DSiv1WDd
zYYcxrXYRDba?NPVNUYod3wbWii!ikEZBE>$HPA1c!PT=>?zm<D%4Oop{jcH3*+ATl
z|3vFOIndGP)a2tSl?Wn;#wo{?TCk8?Jj3!fk2=|z)$Ly~<YWT<?qLp>k=|~LP7_Yi
zDjw9#abgHo0)-~ofGNy0CizJF^KJ7k*Qf8y1E%<>4_ai3LuabZNLY>6a_}t;&=`*0
z1_W9-eup$19r+d~MNe<GJJ&R%^Nv{c0T+E1r78yHGz}em850qrmoKy*uAyU&F+5ub
zU%j_r8nlMC;CJC@d?yw2n!qGG0+V;SNJQK-R1^7ed#5}#1j)0Q3c!oe!_0OE$OAXs
z#s2d~0;jd7o&ZTZ?3b=1BPGVoJTdTZ*(a!2biOzmF$T}nm)y}%cZOdHO_S<giyz_Q
zUKB4vTxEWREEyCO0YSZ(aTT_YoG48c(}WI(^#oJGS6!_z!~+t~m@+w%HGeA{3dIZ%
zyuMu&;y7j&53e*?YF%CIOAHta2eTEjvoCam@Uh;%>~dOgq**j<OW-0SLNWXUHWphG
z=OraGQ8OKM6dP6qfy!$EX4h#&2@`@cK4S3rKj%O>ph)<%>)ah@#?T5RC(OIFvusqk
z0O;=t#Y1jK{uR1O#S!yDe*M%3JCP#Xeplw*l>rZkg*~K&ZqZ)q`+^SQ&aEra50&+n
zGQ+OM)3=ZUM+Hq>CTz}okM$%3n*x@k7#1}x-O?Wn(F{lV-z1Ox1R|s^$=_~RfoXE)
zD0Di_m2z+MOa1owIo2fr)NU+W_>@5?(cW<3L*nV~FkoFTnGSZFx%L)NA(Wy;i!s01
zuE@1;b|qs(+C?OyZcl7DAB0KzfC0NCvUr)2=z(fUad73_YkP>CI{$kj*PG*p`os6@
zw7HsI!I7R9>Qcbv1rV+RG&MkS6P{Y}2gT|d&x2e4KI-hTl++(K9|&HE`QaG5pG=P8
z$!N?JlW5GO+`QE^Jel;jRFnKlvZZcPXN3J{a58DgS3ecy@~-fVM!`1S^NX#0IS9#T
zeeR12L`UG_;qsLfAWd}%F`hX&IUN~xXWp)XGH0lo=s7R^G|hi}{3A8b#gPlX$-&_P
zh@1g6Y4l&^`}$BM?O>hyrxW7s9+srlDx&q5pPbKrDwr?-{52>xrhVK}z@j8^GQcv3
z@b!~3g|1-|A)>dMxXCxy>S|G}l%tdbDh2^;h?|hgs3)7sKj%RzD=1CZKLbHfVQRH@
z?Bi$Xskc~uMC!E>w#j2OPH0LguLbZ08$1=+m95%K#5jiVW{o57T9dOAa35(?yf<9O
z;6_?-K}BXK=e(}yiKk*T%!R>zJ*kvjYyxN~yqF5P8snVHWEXB}Zc_XxKfhKpT<vrf
zzt0U!L=kFdKu@dKTE+M}f3o=(!NguwMe37R*#df0jcHwMgOfoDB2a>x8%kXE1k)1G
z`}{~av5^_e`}6`^{wsqAsOkE%^{b%HVTAqdnmoZO<abrxp0~)<4ZN%!u!$Czgg|!^
zUXDU<bN7DJAte!)-NAAc7O0$;W9Rw)n9u$R46ItSvIM@lJW@`yxafoW+Ci8MRb*+N
z6cd`g^>mX0WmXz{mZ@Klq0N{E$#f$)(=4bZaPbF>D^{`)fkYM=v*u+s1?AyMiE0MH
z-{TApixrg&(2PBE%58hA$f=>EB*BoY0>-6TdTxmjT0q;0t)S!5ncikD`Xk6n-`aH7
zKT6LRkte0*cTS@KXvYn9O}_s^r=tkjO|CC5yBr&LY{Z`g0pCSWLBdC~x_+dUG8a%t
zx+?--RGHh20+*~(ydL2R3t@q>khS4x=mt1G?=0rwqDR}C&7R6UC<v`)fFW4YI~sjL
z>|&{Jlp5l~>B|+F8ZnJ^B>Dv*8c&I*oL7;!Wj}^gIFV<-o|pG+$4#1d*5|X`deZc;
zT9&<b;V&B{EdqiXtu{=(t80<0lypwpv5_97X7*=wWc`rq%1-bp8x~!}FD6tW1qk%N
z821eOhV#>r96>s9B2D21`v-#^0r`is_kBk8%`F|>f)iWLn{^vztzivfoOi4ZXO|ro
z^`juUk^8Lk!NeGu%pBbBip*&Rg=egJ(<0|_-g`u42n`J<y@GAzcE@A~yjBLl5xbZ;
z=loWRT02)dCRHW37p55*dhs?9_~hAYoP+7j%*Jhy3Ehw8KfU+GacJu3*dMqDyjp3w
z@BZ3}WB5J2cxk8F@<bMW>Tf<H`nriii==spYMPh&cN9l>Fd&<X&k{TolJFWaJMYF*
zC1+<B5I3Kgk~=r+MXIM4GEP2_uvbH)Kq6yTbV7C@y`W%s*aG{9LS^r}>I}jjtAVw2
zbU<^qVLssU$x!-te3CVI^xGOwMleAlPj6MggoFP|H~?@<sZL1a(T!+o<5TtT*}eVU
zZbz?RvijBEtYAQ80?%36F7Q@RY#Uu~{2iKW*s>PYwdoW9C7$Nl14{bv#h)*!$Bnt_
zrNd7d?(nEf0y-WdXrr<4w`hf@DR(A0^#`omT6xwEXs_CqNJg?*z=+GCNwW%@QC45t
zoK68ja{%?w$KPL+xBVxlR>491z?4L%sC8^YtBpH_sr^rnE5R2$n1d`E3^X@$=VxX1
zuGvDe2+qZKaE2^DG*arX1V=48Jh$s3d%!dbU7)gi8dxFj0lz+8Z9Ma?FUX7!9}|+%
z?|#c<iF3~TR(uYOydOfK1R=TT-Hk_XD>C@rKZ)KxNat?W1@_*F+HF@i<T2nyTgkXN
z9s-yv^dx7YxKk`re|y2qPpa*5M=>X7Lb*Q9<Kd@^5e)gnhrq@AMu1+O0`qI5-YIz;
zhSWsq0zXMCd?7UGVdHJ>?U|rbUss7N7TNLQd@v+p<-xB&FgpEW=SaF<KM^Fg!pEYg
zRMDX4*Y+a6;IZqYm=@J0z4CJlOr{~(Bj=Nf(Z?egVC$_B8?&=R!)XSa?kqF{$H|mq
zWCf1KIAH~@)*N?b{LDDi`kB>$cLmJDf0I|}AR#D|NvEwuWM^Xlb3+>@f@>>PFRxHX
zs{(jCs*SAmZ3G)x*-Zi>`Eu=&X;4>6?WaZ1(V6%bEoSD_vX#}GIaRs0q;!*6zKkWU
zC*L#!5WRO?ZU$^cB}`wzX4{@)PxL;SYIla$&mYQh`nxrC(M$S5Hr`(EZydhYLde%&
zf;i24)2xVE!+rZNn`Y{UA0`)dlAhkr4E)hBVQCgo4hRXInDk9(jl@}b|3l2d6u%;w
zhCT-Y52|+pACJ?#amYq72BLZFNZD_OZr5-b9?zuCxek46&J|qHlAUfeMhPXf{D$#p
ztcNT@Ntt~~6P=#7U_sGzL;OjT`lA`(GltTjjA17$?c<JkL3cTx+A4WftZjmir@d2@
z=YA&SEvvvXs|s1fM_cW3U}5Z_$O2O$3UBP}ldlONin~^ufn?Jfx*uSLg(yh?46Xn(
z%~OF`B5l0)ST(t~OYQd3EnGiDTFMMZH5};=ewHUPl9fRPy6nZJNkU;-dMTWr9E9%1
z(X^RKpGEVU3el>mb1mr?iEup?T*T^k_+gQqnX};akO#mRDeljVRAloQxdr^pEnx!X
z_NKKaGajTXCnqqtwv0;Mc>Vxw;cMfk^}uByiwlwIeu~RFloQkeBRTB}Z;P8(N*OnF
z?+zvw{5@Wv%fGKpLJ(1ai?;ePA5}Bl{pp&8lKaDtJUgW8zg0^W0$CqEY9)u=T1%uc
zMsZn?u<S5kk<w}8+es!fU*lcl)o9OT%HZc1T77jgiT@+0GE-wzK{KbCM6aUBc(r>a
zD?It%ZZpY4Zx?2**|N5=k@xd!*vt`+l!}rp7lx<|WqepoSyB223%r4ygd%ey;-{<G
ziJGr1?H6)6SopN1b737PjL{<RDuf$WSQV9Kpe~K+TtEJinS0`66a1N_ncL1&avLN8
z&o{Y9BRlUKu`41jt8)?W;W`_LJs-qp7Th|fF{pB+OuULa?$Rh&ej|BCpmyH{at>*H
zR~f4!*fhoq6#H~j++2OWSKK_0j3O4X(s4`E4}Ms^$NCLJ`)O)g2i>+}cE9h7GckCq
z!_}X?Ogj4KC0Ty#_(l)E!!0%a7Ppp^=v&tv<Vm7YU|HW`{^mTg^@=+(msXm7!0_iN
zJk}+?2Op(`6bEHZK;05mYG$fAVKin_cv#y44}gIeoE?(Jn0(!<tRRdTPoM(=dKpg%
zw@j2HeV2OK?>_J=c6zoiRRxMndTK6XfA0|jl8`ZZ^qlD9D$MGMZ%3b>AIoQgpkE<M
z{T=jEQMX@$YpDxc_Dk72@urJn(e<kX{d$?bS4jm)K7|G3p9`IPh8JIK`8gM%a+Ra8
zH7w2}DJq6c$JQtgqLZ?0YK1MLuyB=;>Kn5TMdAG+UH+(pPqUmv6ZJ)7>ee-((n;5w
zWM?vZ6xy);xRh2P9Hb=pJ8k6X55B^-{yq|rj&RQ(RtoD*Ac#8S+u8z@HfZI;+C_lU
z1~!Wx^ZW^>_eelzk7e_X8V)z_b}b8bhEzfxXJkedKrZc1c=YQR8Zbpn-!H?&bO&Vc
zwrrHBLUYminTEApd%~aC+dM!qfl!0Kw%M|QCM$t$-h=lOEO`5yZ_l}zT$*j#<LH&U
z^jHn0(^}|i*1f)DE7FL}9`|Y0ByP)%#<sQFx(e<<)6w&+<pWF4zcK|<{>|qGAL~>r
zqTA+v0}U!(x~=^_w?~b~Vhw-Fj?5xAe5*ogEEW5Ng7ImD6QR2Il0xH%ydfh{g)jz1
z90L=1#B6Q#AMb8qEv%`2WCbe~o@|q>-<ri-x+e-?dqO|*hYR;!M65*-dA7+WSmU|a
za8iPv#6D_hYD2il$OXyI4IE6=9TlU#N+b|s%$vin(nHpECi7e}#(DYE;l2*2nHbd?
z>*%jo{O)07Rn=n3JMzs?1GU7SoFz)zfk+ql5e)@fJhMlmVL-?yJO)fUAjM~S4ZC+x
zx7mZ>mz-3(>ix0wYX{>6Epm(6rHJJ`LV~~rY)Kc8+;TyV<EL>Ir8FBFyT3b*6K6ft
zjraHNJza}&nsEKm<FumId=1Id9QsLxhII?*)w($0BumdDI<gwO?ov`3AZ57pF<_^W
z*CE*T>E{@Xe13j_&<qKZj<<PV!5xr<`;VOsAoov&cH;hkKVVrm0DDSOen8?%(gX_{
z3RX1GMk`huRp?i)bHqUIFT~^j@v(LP-wSX+3vl6=Z{}R_Ps=r<vK!v<E6ng{X*H4e
z!sObeZ6Y2N)G%-cRy60=gRJ{abVl>dhaQ@R0A1^Fo8Hn#!9d6F@dot|&&e&s>Fu8!
zkpBA#g{-W6Ixaw!#fB|+_`$|W-l)V!!k2_ad{tX!N~XOXmX@Nam3rfo{fOMLPpk9%
zMvv)6yYBCxH3Ak?@wq+5ci2$Tz2cng-;&E;mu4%dCp0Yr-=HW-L=vRbQs?3GQzkUV
zTD)-DHYi!AAQ~JpFw!`LxqoB77Lrz6dCJz_5;Yux8F~=Euo&BbJ{$JEei~)ku_3E1
z6G%R9Ige!gf)FXI;%hHQu$Nd?1bPZ<3D{k_!xU1eTIarj_t(#oGL;I-6BB`pRlfDR
z`tp<XgU`jhc_Iym1WxQhW*c6RPcE-Q39u-9N!8%5_x@P$aC&P{hbkbe`Pl6yRBs+<
zV;OR84C1r<>Gc7+2fcRCAkeD4cX=E9Qoq|5eIRmvw<;1CHXUW*Uoh&5rPAZ{`s!6j
z{rut-IPmyIN-G*NEikT%OiJiCSYl0{AM^KzgV|Y-0?M{EqoGoyS$Hsunt`^UqHq+K
zRjqL~gWL6Jd|_B+=OgMt%lpVp5gQWLfgV9q+h4oUwG>NCS|4N*ZDZc=R`P{a6YH0|
zaxfYTt0xmF6ih`*(WlKlqQ?N<+D?o6%dT(ryEfu4jOk;#LG^`cy}uL!8IY16hJ=!t
z6r2Z953g%jiYE>fic|?$>l}JGq)A3)5ZFt^M?C<yOJby%uDT8&`A0#I2F>0g<~1`>
zw?u%_!C>;hXHH9x?&=k>J(%%MbEy82(&rOs=R;d>^W|)YvxKPHCTdoozZh+FV_z4)
z9%}hXnqH+zEug7BJkpY}$4XFENn1;_y+Wnnb2F1$Fg*LskT8BOR-vfki}GHy$M61*
zzo}hC;pxJH>r{~W&YTL9S$m(Cmmu4gsiAS_D!OmAcCbM68h}+DA=+#<|2@W47H|q9
zm7y4&KV?>s7wZzA9x`%`J$NhC>u<?d`^&ji*gZL-dCy~sv>IB(?4+|-7DW}+y>Cj(
zLrB@ViqJ!{M>Y}fq#T+4nD1%nBbjKqsKGOpzZ}1LUS4HDMm|mw$Ll?`JRmU%+ry!W
zhlt%uJ)rfUefTlDahU<|UPb7pRb1G$LQ2md;;&o6Vyph!Y8(D)YqMn~h=Jek0W=MK
zmZKMi=BHWuU`zmWP}2oR$o!t(j@-!9&vuor*xI)~+mMDP)eQ74VFxAC*~)+egVZXu
z+At-i`@WJ%Dd4p>OG^iRJ+Mv2zWabi)(?+buj1m<G)<omr#pCoe#6c>gwp!&!|Y5f
zWX<B|G|~J|+q}tT_%!pYjJ<0l{#cQ7GJS1)D_W!?sSOJ{(tFEe_TEZRQQLje_IJ7d
zRy`oRzX?Z5$JU?AkZBs8NZ}*WC>A%72hJ@~WOTYt9P?C4BiLOE8MBU_j|HB7!U6w(
zYM{^CD{1QhX^1~J_wi(w4PW)H7N`1;`x_tUClRGz^AZ`0Kj@y?nxEeYo5U_2dKb6~
zt7d;P6p&#d+p!3f!(@a3=CoWegXLh@oy6ZqD)%D1Y(JO{lS2_h1#t}u@-UiqPzK7{
zu*Dh0(uF_}PN2+BwC|M7s<DfOnzp=osEA_u;J<;d9S4_@-o8e_;^(6tCEB^znTA{(
ziMmPRKU@ES=3V8&r{w~x_L6^BPZvcikP33RiR9ve<JAaa;pfH6xs!U+nih@3cjU>8
zno%{|vzXdCj6&zIM-><X?Az%u^PhQMYk6`Q@^>pvC>fj%k6vAJ*E~eq7eS^SKDB<r
zi)J{#YUi)6_n5`}{tZ6eHx`Ku<TW*~n@>Jp+6@${`GRrjJp3z&WZ46@jv2$h<gy|l
z_~Cr<4W?%xC=KEHPJ`G@6jqS$hKnwyfI+9h0+I1{n|8BHhrGOYofQgC^Cb1{_QIGp
zmo+sn<<_J94HQ){FJN8pV11bk$Hg1B8QD6uMOHH*ph@jtNnirH_(INZnM?Y(JKoNP
z%|?lP?l%JC_)t%7=_r2AS(3fy*F{L|uVLo%q&}STooKGu)5coB@Rn@&-HI{r1h#sR
z2C3S!A_wDKd#v#23n%X7T3nRn6(cs@0Ad}hCrLrf`9#Pli|Lq;0~Cg<^9=eFKo<11
z*TbJ+bw7^NNqXS=7<%yA6cILwAEPJqmH*gW5|G#XRLcqZb8-j&^pQ8YjmQ0x#w}kz
znCYhZ9{^=Rn!X4>ronI|$_*vP&<z9K&|_^U2EslPpM%;&0O8_;aE^mGL3S=cRsc5!
zugY)&DD^a(oR@>}RHJH++nW?J!WxOU#eb*kAMW1-JFaoGjDu+T_kGXZ{f=M!>`QLH
z`<BDtsGFM8;lMCR#-?$&q36q2H{^PttV#}tqqs)_qqTJ1KsS!$ixo}Va=$y^y^<D5
zW*BXcQko*q>BoU_7zNyI0`_niSyW5fVUPgTUtm1K^XwUWB|X$-*1xTm3zX6vPBlOL
z_@2ARM^4Sa|NFZ?@$j(cad%`K2Ttw4x8HrhdBy0gScnJYdd#Zg0*njIBnhcW$P>}U
zaq>w5kmiPAXjv=@l!B_<kS2k{)DIkw4Z|qeksU2v-{Pzm?X1CacmIIGFb34`-R*(<
zyEAw9M`?oRh9VcRYu^pw0;FL9G0`c~%-{wlJdjD@+0}->{Q7Hd@9%kdJaK*Vg1fu>
ziK>tn1;6^$Ur|<Kt2OWa#Gc(805~V##t)*Y&kQrZVO3QC)3hsY!hEJgT2&QQRZRv5
zaw<znt+WXGfk+TX;`ICX@Awb@;s4_AfBRqQ`%YwYlBn=-$*}&R(&Y1L*XQNiJRAGG
zVLtW1LZ<b3$v2<GeV%2^gWmjFGTO;tqAE+0&)N-hN{a|gxezSGJT^`nW2PE|eth1j
zI5AEA6ez72hCr0okQW6mw)TJog;NUelVGbQj@Q!IcZ_2%>IkuK1)=;D!D#QE2J_E9
zhj^`G&+7BuRul)EPZDDm=bd8=y=BQpqsu$Ab;~d~{`iMK@sEG?7kv2sTe_ykj-GMs
zNR-EQ9bPH&#BsG061}xfC_xyk^>|}M>A^#9;n%<VD_*>K$?<e#7^Sr%Vv{3zmV+lq
z%xDh#ny#}L?KwQ2=*ONk&&l$XyfBo7#;B3H5hjTFC;#Zp+v}Ta9v&X}aCg9AIP6b6
zJnTucilHAF2SM|``|%T_6YR`{)0ut65@o*7@llv8>VL;<ScTMdNl^+mYQH~E6OPSh
z%P?5ZZO`G@pn<ZiWaMd~X~acm7(|6Z>ie9&vpA<X9?rCl_#2jsgszQJui{=TK_l?<
zii|YXj8=sKfMQ){Y^s7|cfy#2)%FG8XuAQtV)wXbdv(QXwLxo{PVM)5BF!T%__)C4
zsAlIxI(Ob6o@ZzC1^Br!XH*-AKMVFqf_zzt5^GsjIOqBF=@WnW!|!lzq%2C_y?Zxp
z&KNZ33w)k!%s<EZSG0SYmmE`LcedH$MhiblrZsCQ$E@jde%^dC_IVc9wk<`F)roi|
z;LkFXDZAH!MWHW(d+|EPz!g~ru^Nbdp$Xa$5E+A&HbYtDPX+;6iEge};-MM)Qv#b1
zdeJxzazb7%O$c1F8|?TrL;buN@0^=Ty%@aaOo2F&{WCa-n+H0Pk0G=k(nL&N+jEW1
z7X0bkKk?VU`Wo*Bc84b52uF;Tw#R4(#=b!-VOw|$Z9B;R3sjuPW5>A}`0)Nc_31?4
z4V=%B_bI^Ex*2%5KVY5b@YwL__C(h@(nN`vWoGC)QPlM~p1-L0>wo+Or@lcegZbsx
z+qd7pzh$tVTzQH@gtx|!(b!R_9Cg#;wF<fiU;+nFPG?DdW!<UiXYV1^icBZrq!O7K
zr9_9vS)ut@hnzOvQI!kM=a$pCX0#)1D+}oQx(b0oXep;-$7Z|1TF2=i<z1SHFkRHm
z9y-gp>2XeT?w#19hiRn=jrTN7z&VOSQx!ri#wj+-f+QKKiVE8|l+~7RzWyb5cXza{
z<#1?t_x>H%H_uotmbC4eZfHX=$)*PR1Uw9?22lbz3Gje<IS@B}nrAqm9|o>BSFDyR
zvOMQ>l7T{=7c`CNI;BaDF_OU*<&r!X7vb~y%;9jLKA-vU?j7HL_w6K|5;yETdzw%6
zVy90Vg9`njsD~A^khtM5IJt{f)aL;Z<o@$PMEv`yEOnl-X|eqP!8!U#PiL?KTL>0o
z@sNnGCvMpJ^U8VoRPr|lnk-Glqc5V|ozT9b2i}~Dl$iwYZNLj=)5JSGs04<v7nJva
zV(=DhRIRYm?NvZPzF*L@iqT%Q?B@X|2Kd;Uip}>J#OBh>^Rm%fCuP^rPu`lg7ha~o
zibS%;2QaG1WKDek!#jTY^;eAbf%m&J0Etc*?7*{4#kPVxNpYhO972f)P1n*48i(QW
zaALWrz*(#nySS$AL!Y_l{^5j2QI-{_(}2+x<sv076OL^|Y7AMPVaJ|jRj@1#i)F%#
z>lIEL%&&j(=Ix@aaHC~a6pS8@b=3V1Q#>OV)&)*mq76J*2>)=|Aa7X9oAfg6>Bmtf
zFG4%TdjW|FhtZ-`Leq4NgYcz9I#pAIslxfx1Zyip-?tcTIG-Dm#L)Mix^AWg?7hdN
zMoJ^40Y|D8X)5KLILwHIPLfCn9)rPYktJlA!H!{56a`;@{c9fgXPTzrZ~o?=^Wo!1
z`hMii>n|o1&^#}RR`&Dj(e@pu^I5=@)=k;XeCiW7;V_PqHdU1iNVn}e>RM3RS(Z`P
zBD-vK60G9IVK?Hklu}$@-%u7MKl$n_4#z#a-R=pBdLCRR7=sFpm00RA3u5zA-+R!4
z`HFnOxZ&nsQ(1$b`grpUE(R{|{y)OrtXYyJyUzREJ?0!vo*M7mXaEg@1W8E*X_U+)
zlgacb(~Evl{V%@JjCvO-hyc}Wpc~!y)^vs(V)j7~+dVSQxdkZAj@7BE%#4W4@a=oA
zz4ltNq12m38Zy~4cbeGVo~?Znq|$q>C1KX3D)@zLD;SkDIFt|AX@+nekRC?yC2-!7
zBzz>pm>0R9<dCx_s9MB;BeCZ34v$BBPf)TMM{4~OypFgrICsT+*BRm(lUkdGJjaPs
zwskELV^$UaeH=&p<gVA9tk96AfOi%@kBkof_Ba2PfA!z~1z|kXb|W|Y4KH5YphL@{
zDbR5=$XdT_Y@^ql+6f4Zvn4M!^uvV73i@&8)b^BRMwaDtLnkGAkYr)D17(wwm5}FR
zRGeiBu)Mt8a(igR$fC+IVZ^-Lg?C!b{PKr46x$8&Ki^3<6+~NFVWfqLBhN$uL8Bx8
zBtA!_F^t6HNz?1Xb3v;GSk8=Sp^I&{hM>`ikX&ABDe0UeC@+eY1U8#oSh8gJpc#jW
zd7c2z@pvSUvb~RY$M{+pr<tOxsp=wHSIu!TJ85Z~Ko&nBuN+|p=6Dl1Phm7Va}<Tc
z&YoOXWYr$1`Sj`c{PypDq;GqE^{YQ)ce9V5MaFKor>+{blI)=GJNmxE1;L+mB5S%N
zbDS@2_si+bZo8vxTkrulTON;(G@FJzmlVDza;mCc)CI(CNXzk!fXS!hF#_uuL*Mc5
z|NXz`@BZ#@mon-(i2i)DSxTLlS*;n}>xXwT$N44j{CU74$mhCr$6^Mwlvl=}O&rV8
z*Ezlv6y{mFaz#-*kwQ+75W<4#rE!+j<pRkT#lgw3Z8qfkYW|?J<gOis`E-s}Sv+UK
zx{Ma}(h#M6)?H7PWWNzL+=a>!Czpg3uYdO0q+mnvf@yhT#S#CGi{#A2$Mf<1p5mkP
zI0<G+z)iD|wS&m@ggBBz%p!vmwc4OOld}Y)(Ow4OwfAI2$@zTZpZ)otaC-R2{r!bz
zvnRNY{idcnU6><X#d?^$;&SfTZ8n%pVX~b2$0H#q9#1X9=$U34H@Cpc*9Ducn8vu^
zIoxjWeqy&du-j!6Ca3FKzWL@Qc`jw-(DyWTO?w$IfB7$ec(>a%Y&Q)<*UQb1@E{VP
zJ53XLW@2|r0!0>wRWqZn<5aO`*V-%@vv*DidQWzhIFFX}rJW238=cX$y}UL8<Agw2
z3dYrU6XPgDoz6N;CK^9OKjB?q^p3p9shSF<B6T9uvHq8AN-ITC=Hx}Zws|7U@+cYO
zC<@J{DJaUocR##hw-fSPZuabNzoxDape&z0-t((J`xAckXMeW1>m<;897o#jOxv}D
zgxzFMJAF#AbWQudM=3==jtf?j8PSrjVy2b&NH%J7ACD(Co2_VUMQiyo4!<g+$%>qZ
zhX?-ZKmAAk_V4~S^3SfN;95!ZdDkxezV0Bd0pRtY>*s!{TlhT4$@j084CYH6$mhoi
z5nosb*5|KT<8s$h(nlVeY!WI2F)6Ji*e5@}K;oO}Xx|pGM(4=Vd9K{7U5NK@OfeG2
zY<4!5l`dvL;b&RV^M*pol%y=>n!R$(WRsk9Tw+g3+<Bgvrx_mvT%Vl`GdpW>lZ~B0
z0pqobT{$cALf%=7_cTQ&pN)5H>WcQ#@#)hie)#S?&X+SuipbfS(K@^ns%IcDJ6X4O
zo+)w}t1Duh5N$UTgRw>_OVwobokc0Z`0Bc*s!HlcakDMSv<8*&@NiFEl{A}zEYp$d
z1m-V(_3B-j72F;UT+S_bcMnl+LU!wZNPcZ0k~4)DBqdLrvX5Vw)@solm-JkbXELjm
zFcH!3j_$z9M4pOh8ujhSi`xV9JVqw40xem{<=iul(wz|gN1*El%A#Z#C#K2K4n1Cp
z=zURSC`8CUFEX*J$})W9SV4#_Y{9iMquDeW+sfeWNYiAP+(&`JKvi!Uri`20w>&<6
zqVGofz7+}SsD*wyiIRY1e~=uK(+t|0CXmzxQug4zrys>Wei(+>sgnQ8OHnk)^Bf&p
z_jyrpzFZK;qnffRMN!g=wY=7v-~8q`{HOo;e=Q~8da!og1o%>L`BD&D|NHZRA)Vs*
z++=bZ$-1eFyn5l1Vf|wPYh5BG!fL{FQi+yIruCG-I$)vVTw$tTtRpK6@fk??9e&}Q
z37J;Nzg1O|7t%EhDsHs#Iv1^ZB8?$kqY~=EIuNCj^-Dqh>CEJFz@6wEE)yffOIS~h
zjKe4;o^y=z%<P;DkI$l-k<5aZ?&xCl;85PNZwi8&MP_DpWLfO&XBp?qk=qwHj6=_C
zCtUDcx(I$7wJ0!X6)8M;Hci9lyL;sDilUH77AHCely$){ScY+w&(H@#uxz(EWrRz{
z*<y5ocb3<$_E;ySy2&!kU;f2+@9MH*97lfro8NN#@&)s3g-&2JCeJ1NF;QE(D#Sud
z1rE2{Snp>~>ihHsh$M-Cl_6-Rd6qVCB%Q@9Tw1}_W0c{WZ{Lc4U{x`UqsRhJmf#F_
z7V;i3Gb@Tb8a@PqRy4aNelY^5XSt!Qgo{*^Mr4k0@kUO>NR9I1kb|{Ug_Nj1h@oX&
z)YMhM<Yu(q^Ue2v%!l{CXXqw={p(+2t>>o?A7VE~Zj9}=VYk~y=DX}LE{bvcg-tEI
zl;iP8*L6$DlN2=*SgMU#f#6d5eZIS+?K-yGtvLB?Hj;%|&vvtAo*n<;|NIa9)nEM;
zn(#CEn>CK~9CLiWp#CAg)t9mzw2mz3aAm}=GKBa{8G=^V0Q5XKt{3=n41euFrl6ZZ
z{Pdc2xtp@sYlbBOCrhdcIw?nl$V^W`R6$Ur*-vq8Qp@muDrtlFONQmW7vDu6aPv%X
zF<`B(X<fpl&wSmH6pk6!W5k9)3QRIeCRvcPmds?Lw$OD^$##@M@>o)8WDIGVXHZ1z
z_+jxIFiLYcY=u9DxM@2dFnJ);f-jk@;CQ-lv%le{%A_P5CT<T0lnQun*=`zw3uHzy
z%+gh?s~U%9c9w6xddr))uW)w4qZr2-=OD`suV3BLlsVf?O;u@B5WszZvt`p%G<Av6
zFi#d26#Xz@{)d0{C+~uv`1ZSR&?aY^XFlHvi#;z2#%Vw)xV_y`*Cn%?@ZPf9ZSa1k
zstUY=ahxK>AkCje&oz^}OX=^|Vc(FtB~jcC7u6Svg45-~i<dXFT`MXCD-%rbMaN3U
zBLED_1hzK~S*9g0#V$%wNcKZ81jGS1c$g*&L9uDJ%%e!X6uBWYIS=<|cDtJW%@!3r
zCWES}`0j^4=euA08UOEp`OiGYZpZugAIZy-?RLwH7cbfEcI@|iDKjIOpU8Sa!RdTn
z@Rn(u77By+o}0q~?>%kXE|MXK!(pK{%=65L4<FH5b2^>q`<}LKMSUU!UL0QVcYpVH
z{JVem@A&lT6T#c)GW7ExwFbVQmtW6=)R#)b=fNt=vL(YxiU!Z$S6;7UQ~4^Km!6k`
z&zf|c0#uxKSuD5`^F8U3tvhE4A5=;J^z`0ZYqB6^l*zLtAc*9jT4pOvmb2MxWwJs)
z<D5nO!@FyzFhtNiI2RqKeZtrmwb6BHm;zMll3u%iKc_ULhjlZauxPA<678!9s#|MC
zPRu$HFf=C85uCUM#YS3|XG@oq;Ba=t+t>m#;w%*=&-vVP=?2<%Waus1GVu1RTOJ<H
zTrOwEX^5VlfjkpB&}MVs4?n#}A@bdqZs2r0(X}0$TKq)&VWKQ6vRq@dBhNhbreL=(
za5K?~Thn$Al$GJ};mq;jLRpt=HXF>p{+D09tIAr8QvJw0jub`7rE9Tv<i(2}yKPNj
z49EM9O_lNX^$V)9klCuqGR-WYyL7Q~LXdI{tz?i=i;<&2)F89W(3BOEo3ToP4wQ9{
z$_zmV>TRH`3Qk9n1TKr5G*)4ZVVdTsBASsE1$A9g)FKAx5*MZ@aI<IV?SjdT<4B$t
zI2%wZW1dHhk^nnTmP<P@xxhSo%B%pb877%Z|M=-6fAmLx0R(0@iV-XsyZs(QpzjCX
zzI{tkl=OYie!u5<JW4k+6F@lG(LX#qke3B{QPA~00RepbzNcv#Zf|e7xw)aLs)dX7
z<M02#(DjQOPfGL4JfkWLF71iG{+s`Y<KsOV5oBYPd8{+6e+V!7S(*1NXk8T<qQYnh
zm;@**nP3P?TKGW|Wo6Xr_vN5Zj<LqUG=h<+6#TeSAl6;Zl!>Lsy3;Aw5F#S0P|kxB
zUHWMp1)9)`nGmz!*Z|TII1h<dLBwB#BH`jWC$Ynn33}(4oEP&271{04qRYGVSs~c0
z3z2AjmD5>$Bu@g>(g}=;yFv@nI4{!+^EfWviz;TfWl>7tw4PucV=tLiRTXG0VwPHY
zsw_i01<I3UaM)E;c|n#*pf57bpZ@U+K7aZ|Q|D}RMONe(?Rj;3pel3hG%(L0%GmT2
zWr@KMoTthPdTUX}&_%C>mxmivuzdCECYGH&hnqclRzkG9t12l;=W$}U+2UqP(HQF7
zVg8T*{a?S^Z}z--^NPGMG)=?#a%QvL@apA({idR+a;DiqP`rNq3Tr3Yu49@!&IZOw
zcCqzN_f(HaW8-{aE*uH+IG<%qM!Cr`227bV+6m`Jas%V&nPNM($W!M>%2EZCrOe!+
zw6NfnjYLe(Jb94|3Bo$I)>74_bSIpnYx}sEHFlDq*!N;wkmngjDf)9uRp*pdLEnwE
zeaD~t>R+IB$?5dK&`+FBo#;<j6=hX(dwWY+R-Di0rOh6KCojvzJ^6Gx(Y7shUB?W`
zE_&Vxo6%Y?mSyRDfBW0t;k_d-3brvw8Y6U!zy9mL=6ApQ9q-@2U&;ur^#UmWLjmhc
z<=68ae*Nb{g<wrt@SxQ)ceuvMo&)*o$NHF0O4FZX_rMiUUzdjKQt*0>i7<LqNLArF
zL|oT(46MjKpc0_2e)jozAMioS`9Pe~2mwD!H+#)MchP)BXbMjm>q+ZAQCb#I-Ct#6
zlBC7+?;wQ0Y_G&;5NVldoUS}JB%4d;pT>2jF-}tWq>L-ycT?r;w>5Z6UP9dz-0b(l
zWAqN^<lKrv$g_uiNmDnB(@gN5&9-2>Yv_lGyT^{vI!Xh1USWOU+_qBQRRta^<9o=S
zH4H6*fQ@?alk*(UGg&6rc8Z26qJV0sYQwh4xZM|+zx<1D-f0AE>yIsu4`&`uJ-gc%
z^uxqBTh47yQ#aI2$?t#qz~iaM1&#A?JhiJ@JT6cll@=kIX9@u7=b5H7G*yAM6J?o8
zl*V&&v%wgPQI^9^MUm&sL%b+wDXW}3Gu*y7L}OPOmyiyQp(<<oen16{9j)y8k&SD#
zVV(m7kI^~jQ-{_W!!R+84xA?V4AA7c;p?|A(JD}uRlKI0{mqX3c1L?W@rytDV}AT_
zN8fgQ{(R3o%~H$ziOcy!W-^ot+}?_ImbHRm1?M>*#mLl!>sW<SV!&CLoWsolJ6k@!
z|3FhWSnK%h?|w&FRebvJL3D>=rzhbSpFVux)2C0IPA9qHBQ~eaHBhC;^98vMOwWVM
zb9`(4{D5Q$E)5V9es-Motls)~Yi4-}fh?$HfO&D>Sv}Sz>>5B$|F_N{l}faTOeiE;
zBz#fP&{z2wa}?SXOk<K!`8jPvu+GHEiUF3Se;<VhofGGw2ycXlHA!Ib!Z*~bk)}wB
z4XY9{ZEQAXfI|IAl#IA`f@hjWLJYjqI7Rk+h_j2=Ccrd~gt*BqO$!Z0k+H36vM^I9
zO<5@N%Jb^QEAXD}rsi<7V|RPt<HH@F?;phAc$|4SK42;N_3u8C*EKJ<HDf<=ci(av
zELmPsHVysQu_<#hBi((JVrW}-FZMFokSVINqVFBYu4DIN$HQaK`%fpq-Nc`Yak8{s
zi#DESQ{nwc+m9Gc_wN3_<@5cSA3q#XWySsJ$nSsu2QHV(Qr66)3|*S6#2BfAyRIj>
z4$IEx%dKAk03ZNKL_t&+*}h!y370S@rP!1OW$Yq0P0c(Fn7ZK7pV)3o%1ZRyt15?J
zm_`rU^77@LECZ7%hH+$`Y`g&!H#aw&FKwJ&w}^ABLj}Y6+zMzn%g|?*i59)lSGyyS
zdS4cgN9(|U^Dq7-51-Gx|LHSXrg?aH;OlQ*Nk_^Ce)*^WjQ1ZNF-G&#j~@`1UW?Z7
z%{Slj_1E9>>GMat_f+);QFQGWa9wADN$vOhh1BT1u#=0TU>FA8zkko&-5ujJ$u2Za
zeE8`n^5Q!7ljQ|J{`4cCKYm&^jprS}=h)TyXT3Xr3Ag%EM{E6_+B~(UO0Qi9n&*Ii
z3Oei8=v89%yj)#B(j4bM)<96H>%3%l3KgQ$I0~(WucS?eiU7QIa|FCs9o*|x1J8z#
z=VVhB;RlxpqSuV+dXGN+Y_C|BU%BZ-{r@;J=8_eccdP76czM=}p~dpr5U%F35zhj#
z!jt!P*A0e%cM~sf_iURA7cAd?`wi1LMB;VF$4?*l?N9GHoi3;l`2MRKZg(4$)=WO|
z`FLiSJL)`R7%i3zlNTJ1M;=cWKRe1g$K)ASDaJXVOh#Tt4KgKGdJo47Wsx&Qiq7F6
zqL`V<*zY#W_j$OzmBw1gczo<IhfVQr94((do%nEfVi<Z%W;op5$dIg2>~>p**<xo)
zKaN;uBY7@;nZl(qk$`8kaGlCB$Gg}O%MAObW*TM3DszL*GdBC0!=Yl+6!h&Ncv+Ei
zJ`Ln~g~=6VW$5}YYUE^0lbBVcKs1cA*c%0rHlCwNsP|&|<b7Czr*&e^>Ly{_E3L_O
zbaK}4%U^!Ws~3AdfBcE|>@lU~)tfy^dHUf*krn*WFaJ6HVDZ*Q%_<Rh+in{`Xa>z@
z!|`;_<HM1<sX3lc4CAz@dhYl8Wwd1R(es`n%NeH$r8S>Fe?|f0F!19~??s8A?<tF%
z%jLqy_wPBMPRx^~$P1Fx^13s%UexRVdkTa<Ed^8dvj)T?LqOg`E0obcCzK{2J+Nfh
z1OaptzM^AECHRySVkXiCo^%|)@OVzo_=g$*DO)mHh^R|<Qi0L|v_UM@qPw#Zef|V`
zD<#2*AZ>RW148gAs|tdS1r<w1_oPYSeTV{pIcW-H{aIf>`xJCMv%8kv&RIef(TpA$
zqBb$lOSkmejhBtiyTCY%;#uiD<1|WUhh&t}`BZYP3bvbyo0}~+H(ScGU>ZldUfj-y
zVZu!lZ(rU}W%9byr5DD3m6K-~U%h&P(uTXo6PL?{O|u81d3mU)o07rKwA0Lam}tj|
zvXag_N}QnEeqw*9DYA^L*rJVQ+hmNxNR~yLH7Da~cXur=7`nk@zI&Cu6Q;QkyL=#8
z@_6zh<8(S>ou|DFVlXj?3rz?rW)?ymlSgzEA)tfIEu~$vDNBO09JV{WpD0R2QDvYl
zbyeV<W4qZ<R}~Kr7lz4FHPWTrY)UTYiJ=#!Z&4cZLR3SCK?DHtmOL+I4s6+hB?_f%
z%sZhk%#*a9m6G#A3rIZ8BlFyHfB%tR{NgLV|M~|`-961VXXsj9zB*78@YPp8u-(7m
zr=NbL>sl_CR?c&~iFJP^lnx!D)_9H!;ubQ^Gg(w#SghyMELjL#`i^sZVVY+0qTu&`
z|M$Fq|DL`Ra;VXU_R`aLJ$9B>xMWL#EPtwW@I0ehKi0U^bNQMt;Yv~-A!(3NPs*Gp
z$CGf8Ld5mY7&wBz&MYS4rqWND?a$BoDOJY&?ElxeSy7ZvfOs7@rKR*TYN4|bbj+#(
zDCuB2XJcnD2#?9RIO1X>T_Li~op1?5AeL_;!JIy%6gZy}(AFEpm6tWgA>$BbXnZ;j
zf#jrZXZZ<S2bvRxHc!{_oe;tz6CHe@EM@kw$P0{t+(2Dq4DE@-&7RGs!cH^OFwk`^
znaN-t`RdJqx-`^9!{yTAT;OK6<Mn>e*RNjU96UTck{QJx{qQ~a4@dGSirCE)!!$E{
zk4ID28}d?9H5FBv3&s~<cgXnovE$*P#m<gzzJ0^#+_K&7X}gKzgBZbn_|$QK>?q3u
z^S}Ks|Lk3!X^e*5u3@wu>t*&0G{ZPE&X!CSwEc+l#91PT_u%Ymek<;vxi(}<QI{pC
z5F15G3_OBkvn$x%)Z~?@dS*sCWmT0i^fUJlEt}nrt~>JP?JM#kBY07X3<P%jCMrcr
zmi7Ae4L3JioD;B7#w%3p#K<`k)FQ+tyFJSd<s%+*d$^&h3`z(3_KcfHUc5QrT~D4H
zLa@|j;QhzX{L?@GxBTvRzY~DmB#w?|9%uS~00l*vGY$h;w1O`ynY&99_NhE7@|=Dc
zWCW<HQCf33pQ)>g<MAjeqakHHEE!`OgHo|`D!jD$N!vVSR_i~X0O~QANI)R|Je>yw
zaQJ1^MCmoxX|*8LRl!3kwX9YBh1aYD4_uk*PfEoV%>k~Sna|ZE)&WdJ;1Z}UWahpf
zn4)}gmM7^L;akc1uml1L6e*L6gT*00%rH|28kI)R)HPE|V{B?2s-I?!Pt-BuIr<<D
z=606gBiAeUsPjHT5su*Eko7!Evf#zUAqA}Ty{7=JjTStM5Gx+TVO#R;*ROeTxM5S*
zG<C)0e3tCZId<DESdX7AnK4}2p4%5MaI?6fXN93EOWuEeq-i!7M7iZM^lXX(s}!>m
zxWZ%^ZP(Lx1Jy>731=sE`wdEYin`|U*z)S-4dXQMc)l>rp02Z;FFmhczF@nl`FP)R
z?j{cV4d#FSAOG~->Hf$#dmc|GyjRS@M^2Szwu#Utvb<U){qYR%yv(n8aV9oKW3;9)
zMvN78pol4GRb*s2m>gcdIgpiL@*J%+mu|!>jdzOk<--0@b9=j?X~f0({_eyy3P@j;
zC2iY56#Lulw?Gi`sui9JAqdaJUw1m|Jb5ky1yxl=&Pu#7gF)oDEnvlM*(ol=$bbKD
z{}sRe&2MPxjH;};TzY~J>~?QywmZCcoZAywCP7l`jP~3yIg3XzbUl6+p~J7g`)=vn
zBqfKcs<6&7+nMd|Mwr5%K5=*VnZED&_~Aob6j$*1I@S_*<hY=-+_2qlpQsqDf$)S|
zEi-IdFGIuxvEkB6<D*qhSS1MyE=Fp}UmdQOax)!As|EO1DUd0(3bJ3GVSJtiO2=2m
zo>IU{5;4h2e*HS{J@Y&+0J+Elj|{`K42Xwdr9y~`1>QT6e~E{-&SI1>uBUmvDrGv4
z^+FR!4UGVc>WF*=5@@c<7edYu4fiMu6Rg;eMGVW^fb$N!)P5=Bh7bd=WL+XTJtkKi
zFFug-D$`072`OQNIHt#8|6D1Ia=gCXa{u{`;4Nd{V&@rc6x-dF-KL@{3%X$-&kIn7
z*Kb}iP958AL)Q+}l^Cl`<G^mer5{J$fBcBb3|Ud(a7?}9(sg+4MgIy-*GsoP&k8P=
z7L&<mit_CCH384qJ2uUZ({Us(44bCp{_zo=<@CeM&`+5E>EHa~U4NMfDx>W>OkUzu
zWRcsM{dSL5imo4GXGV4;2$2h<DKmp6kSjx(7v$QI=i=g$XNo-2SUd66*SC~qKpBV5
zBzo6%O+U?OG{5-8FKC*E)2ZeD{)G3Mt{o|hiaeTAWSI!n6@?5nOZp#Z+m5y!7M-Y+
zVT{v+7*86?GLGnI;fZ7>6JA!CvE3CkjV9B%Fn%-HjsNDaeoa%BOA}xiz`22sA3yTy
z%?}L2#4ufO)>2nZ1S^FcJ3F!GuF8^m6621lt{M8_S`I|HTZl7=?S-yu*=#o4-rhop
zUWfK-?y%-0rLLRSn%PcI+-j~1=V^A60CSUNG))snhcq4+t+@P?V3J;&f*{DOqe&g%
zRZx7MMMV^Rab<q~oD^u*=e7=5snkis-YK{}r%kMbc^xg+`@YB8S%``m1Y{&-=%w41
zHjOckU$t$&;6d|jg~t@pxHOidF({oqDKqVybl{%z*&vw*J8MO{D2Qq*PFU&UAa$id
z2sJ@ebtk)W$+n3?A)Ks~rO)$>;%Z9az38S3MkraXbC%b)J6`WLG@F`Wt*EHPa?vZ#
z=lgp?5Z9d7FJIHtwWydBIfuiZhr4@ryPNAqXcXu3iD?|!Z1>dLigxH|#}PXlf)<R^
zJBQJt)`GHV6{zcirl|-((`@l>X1gos+mY^KX)gmII40|OJUTvqKB7%7QaJzQmv7zy
zl%-+YY<PLIrBH#wC=Q#3;4E$53+GNrv^H9iDTQ~E&6LVeWH~B$>QY>1G6Q9qvD;SU
zx#9I!2Odukc$1SCB~4vQ8yih<im$(Z!^cnWnWhnK6dsLI8JkUs50=@gMRPg?$BUN-
z&ZkH4(hd$@1JeCV96{^iFm`4rO3^-d)-7etWM{00vW{{v5eG8jM8-UMl-J}&b3R)c
zybg}0-r=3){fGZbUS_myM_q660X}}b!+S@TX_}&B><9KcnG*Q%$M@u>Ak&8Sa>2)d
zl{B)PbzCkNrg6kh6GPv#*=&T(JWNkYi*;6#c2<*JO&EYBpsk<#gjue{pwrH?*ei+W
z{F9)vEIyv{tX|%}Sc0jYWFe~6d#?kL4_|OhdiF?xYTa2&izEF!571A}GqKB2jN?Sx
zwkV~k>n2{4i<N+kk4@9eIL_pGfl~Ts7FkLu@<JLJ)<w005b#8bLlm;K*2d<8UjppY
z&%iOy6JeEoc`u`A-bEcQWMR9N)>Q~WSnJl~t&ag}ibKFQGTvi3>;02b(*}o8icA|+
z5ZtpUG?SaCs|>9@byL%gBY*hmJ*QJoJB<A1$De4sp5P|lym`&<|L}X-z6A}3m#@%9
z?Byo!xC{fsG*eU+!!)2UoQD}>G8|Gyi*l)aCup(kGe*p7FXxH-`<7v_RAolrPdq-3
zpfvTaMjK5xOjswSZIKIg#(Z_i-_4WkDs`OQ(Z+CTJ1H&52uf4}g7@+zdQXw(<T^tI
zs0xvpP2)3FDF7eJQx+mNmlvA4sX1R-`tCwm7M$9F4<FBzMaFC=cKdzIgbI{VT+U~<
z8)<P`XUU5kr4^^gj?-~u(`<2mWE|tJ6}967qH87IfJIE<WsF01&lznDd7eephm5??
zWSRwhwUg)J{!Cdmlv&0!jbef3#VDgap9o=~swFVq-Q5w;XeDg=I;w)EEaiB5WSC~g
zY2xAGQN#(yaUlZ^!@$rFOQ1<37fMMf-nIR*2)<NO0a2^mJqZBMhn&|L)0)-*;G(5^
z!jsm(Jdx*<Mm@@+;B-84xm*^tfYjQ5{@M_(3-fs}eBPy8U*o#uOo2Fru-J6@)k00B
zXUa&DZrGaMFilSIMHI$l%loV;A<5%WN=_+RLd=Rn2)OteJlCO0W)ms9Uw_8ypV^As
zigP{=CyT~cdcXB|lCr2V4hq}Z;bV{tX*4MC<e2I8Wv=+{+c&&8+{8dE+2c5#Io#|8
zgAR&e5R0_C`+Mx{xY^dcJlx1ozO`&N8>U$_*^9hnoM(2MhCra}JCuUmzQH+*MKIGg
ziA&}gT1#d-PCjnRF!VFdit&WCfjrN+yF1c#g4Y#AhSCyfg_Ept^URAEJIp`%#hZ7*
z&u9%r(Xica*zY!Mng(kp9*-9;=M!l8ati|5J9H4-D$g`UW|+s3JQu;VEHgM~*=!rO
zwTuDGe!v*bc3ZI9Z7GTk@9*v~M)UUV3tsFuK+dV_xpX~t6iFKs)gZDW=k1%9XoMW7
zl;U{q@XE2>Z5gK?Klzv*Up@a!CJrYVV&|ol$mB>+X|TgU@DrO_#O0=Oj@+n%)3F!x
z*gUY?*OYa|Fp8zrWG8NJ8+LnzpJb=LzdP~$_umunoG%xOe8a>21LyOFBF`DRE-HbZ
zrQ@Tni^N*XG>q)FTSClS(hXl#)pB0zM=BB1!b^$Enn;;$;&oQD&a~ExOC-<(S{R|x
zhfRijeVi3GD1!40ea{#JE&+->7k<;aOe0buo*n0TH*$R~T5GDRiUuUva-NBUm4a9*
zfkdv?FIw!0RJx`;v~5cpt?c*v{i3Ip&Lcg4O-hxZky!4jD;V+IXTe3TDO^iQXP1AQ
zt#rgfv;~{z<jQQBor|M8KMyzwE^yxCLSVF3a4&Zal-DsSAK?HwZcz%!`iF17<M+S+
zJ?+$?HBuSrjA@#w@|;}M`v`t!v)S<Nw{O`u4OV6R`nP{iz1^a7&E4Z8-O!Wg8SVMP
zt5>i2_WQ5t`m?B6D9xvbBUuiUb13C-Ruo4(fvgav;kw?C<poL`@}iJx&A@DD%Bn)T
z_9kxBCN{JrqqTNKYlZpqKYIJ_aI@#_S1<YdzyBS5-}B=iKG63Qv-Om9O`aDNMuW4|
zdB(P`#QZbM2`-T5TGTnyjiba){N`rIrZJSY;_cV3D63pr#z-0W>g`u3rRlmBl@)xv
zy91O=dq<t~<QkJ@1^4$4gy7h08j2$4{_%vu@bGxX2Zb_*IjV~$LaTH0ay}shhH;D*
z>W*oeansCp*HD(i@3Pinw1B&1nX$X6C`&_bM7PSIqbh^!9+{EFotujD#nQHe&?_d(
z$4~dnacrq=FO1VfKa7ats({)FbDHOwrmE5U>TBp@hp6v+rs?WKmmVn~r5pI#PQUK<
z&%x|3;Zn>0#d2$nhb+9I*yVd(+G#EKK@!4C@4GxAw`pwxx(-_FpY)#V%wp}YmrCD-
z77;=DJO!B5buIvOG@Ga*SiH_g(tA7~Oita^*$U)A1kMvL>Urk0T+>1>mGaX$CnQtr
znC5B0#ZuQ#rXQXMKEHhL&N-%eW?rd>ih!U5_N3ryqhe~p(X4gYY2x^J4@%=_3wS}|
z{6xTkw`@1kpvjAZZXDTEC6A{gzx(Mumwv!HOYk#?!$GwC$B{g8H2Z$w{fAG~RU>$F
zkWwz!`69BYO-9#`WKmvb=;x(dYpqlQ5-%iBciqT53Bg<LZ7BzvrlE`qG3Hm_zj*iY
z{ZAZjw!C@!n(cOn_n;9bd)xJRG`aTFb%{oyRUp&iH&|vehEhbWaqm54mT}l^AXu7>
zp{Q~uC&F^O{Q(~W!!U9Gcw)QTF^&`6U}?Lad7Rm8cOo~d4D;+6hFQp>SrIMl#b6*a
zIo1Yd8&FClM0^N~?zZ!eJQoRJZS<lmrHxnz1s^b4$Z29HFI_%kGMc8KtTcHc^|yDP
z$vTV{CORmb4``$K?(G|1y?n!uA5Yxf9jU5@o0|jEIMNS;w5IKhQX21x?lvO*(f2*Z
z7&djoX187BLeip4fg_DsJa3gJa91gD%1MjxI#By`WM-YsJm*n`AVk|#RtG{Xwd3Me
zSK7jQ!JEh!5BleHg(S6-0%saUT9>Kmz19MQ>HkvpxK<JU`Sq~y!k%D2J}G<TKMRy=
zZr3`nCo-niS~fK2W%G+Tocn?(--1m=)dta=vJt?Sv8-tldn*^Qs&%mPL3rpsgcz8j
z>O?FTQ_1MPU$n;HO82nN(lixSF4az+Y3edZ5tyfmTxl``Mg{6xvu|p;e&BRzCChVG
z*646SWw6;bytqA3R|PL$ZLxNsscXujqG=jFe)`0Aci?zxx%>P`-%qH#<nDMc9)iv?
zS&^t3$BCw?IiGu!HWWq4G+L~)LbWJzPzJ3G*3ApXoU&=_T%@H8<VBA8{#E|&kAL|C
z?dinb!vk&G(KI#FFtFP;T)LjN8^x-Aw&Yq<N2LH2d^A24y(8}|yX}@-Yo@W|u-}lE
zIdiaLju<l9R>-GH8`@r+YG1s3!KV**1gE$?ydVT|#p(Kyhx;?HU%wTpjF?vDnW!v4
z;M{gtCpWf@JC{<z@J$A!d9D{-qrUHjN?<JtsOy5wwk9tOMIoYkT8q)DQbdlHW}2-G
zfEz`#ZO9A5<Kso7objB_7m9k%G|lWb`#56LLx6D-LT*yDOy@X8!%hO+9&VZJB&1e<
zT|CxW5e1x*$6=D6Rw$haow8`wowK!c2|NY0Q}*?<V6_CA5Lw~k`Wz5Yc<nIrBw)n%
z_X)!au|>baex7G@DM+Pbr$5)h?YX{HI(`D*)8`Xlxt?_pTEG6eqs$ur@-8ZHS}|VD
zj8qHKwQXa-OTfM-_^Yh3_g3f$UdlVko>pe2PO_y$Jy_0ReI7o@Y^f71D;qVftQY!&
zUwtlyr?{nz!iguR3G$h%;4xaLM7j2OH*wP#np#uU1;KgxX~L<1Q{oym3@xTK4D*N&
zo?+}UIeh!W4PSrziec>O+ffn@@9Bq;m#<#)>GK^Q?~Yu?0b_FNW<%F?m^>GJILf0}
zO-TrDp~RF$5i6B~uI+J7aB=TNc0C2{ER*@(x~b*)fB8?}yfc|1Gm3HaJUkvL@{D;N
z08c+!tb-yeFj-Ea6;)YKMLT$lC(lG-pf1Wqe>u+#RaM|{bVG~vfj}nu&d5w)Syi-c
zOW$>XVZXl-556Mf=5QNt+C1VH@&%nvCr+m$uU;S6?RPvLrOr>3i&Rq8btO~jbrlz&
z@Wi~oN|j{BP!>7bc<G$fh3F1BFM3ucW1i*rJQJQ$QB?#yWtlOL7D7fh_4MONt_w_1
zB%eeb0^Km7&`(&%iHsQHqTKKIoK7dEd7^7O%CZ#0j%YvL_fa-_9e5BM@P)Lx3Ow-C
zUJO_)tx~Xgu7J7DG}dM0l`fzc9@M&gOT+HcL5uI_!gVnBS)h9U`*YC!dGK0igDLZR
zK4!G;g02lG(tAA#POCt%5O}?eS$XHglp(4vcpnzuLgxkW)}+B@30%QB5ukJ;=klZ^
z^lq68e4f#z??B95!&36ePl!__!fb!iU5y!*G3GicfyYH{IO{zso`ZKYFArOkw;Z;H
z+e1x12SToe8`+cugpgX*1;=i{I%qZ(FJJBW<)3`b-SIv5?E{-#!~Me<6GV$_oCd0@
zV4OzU*>fH{Y_#>-)FpLMQRD@;w|nW38i82m*^(C-=TncfvQ`q5aeQn=sz!GA=y0Cl
zgGitoV=({xPrrJXD>xi(DROu`^?dkrWV_jNIi9dSqcnzGd8%9(>{=;tIH_w<S#%;j
z(+wAt3N&RI4NNEMrlKhu`oS>_6Lnql`t~*NfB#b?>1hg6@{4c2;dnao)!R3K=F?}v
zf9h?+<MB*pWbDGDshTapE8OfD?7%pR#H%p9Js^YFZQD~d6*}{a9CDr;oR8!^=NRUh
zO;e(k1nDBLXxn~a@N1QZQKh64sR+lb7q`56aX_me*x6`N7{2-Dd&;80S;sVuQ9jvX
z<E$56G0hXhJmI|}1kGmKV2ony2gY$)u$$BA%;g+Ma26K&nyoH>H##F}$ET7i>1d^e
zpKk6H4E`aC!8&NHpPzzd%5a{r&|^882H%8SdgU&q$8-E_eY_Mz*5%;3oJ*L_`v2EH
znCs&_k$g$`UJxxc>n4cuz<4iO=1LKeA0LFUDH}z{IP{D|kF(-bY$FJshWf3G?fZE}
z-1L&M5kefd5rVQ($@efhoU5pjC5??#KI0rJsXwI82%%Dp^NjPBJeSck=PfF-&9zc!
z@2HBLOb7Ox63qn4^Ww0>x<EJ10=w)sG>wp!%QB;>3U+l#kr!AuVT{K)>FUk1W^8Ag
z&4x0o*lrq>_FUQ{FJ2zVaz)z?1Vo^(?=3+o&X*(BTZUm|o(#choSUiZN&=NqDCO}^
zC`9uVArEyO!IBt}W35N2fcYQ(yFYoC8_lOrpD@PI_A}im1I1aMqe2jNYp&Q-Wwe(T
ztRXi>YH{StI_!4RTK1kY&oP<e+z#SYqYTc<PLL_Xa2c3q*i>7#WySsdJ=1LCNJ_!^
z@_^AE>*4)RpTR@lkG%hM$KBnT<FVs(yiiv;mu`wTu#f;la4X$;KsmB3U+r|M;}b_L
zaB<jD$ZlC?D2fcNB`ApevnZ>2XJZ$1CZuvL&h!y7UfjN=t~WSmIouv-yMgoN!Z1il
z>tl8`JBxE+nHUfn!vrY$uIF?*MezM;#&eYgPTr3yc1?dyDM;DLm$I965c$&Y>maoT
zxz}o*UwZzR0^k4N@t$L9DI-c5Q_2?CG>-KAq9_(kv2@%g$_nv)L}y(Byb4e4w(Lq3
zAqAK9@lrOEj_bX2>q4BANVrzY+I$>9PW}V&g9N3>s*-*ja4|qDD~hKf1cH+wx-<`z
zP)*X@ptqKJ9LS=ZR5ECdAOS@V1d9nHWfo{^!!!wo)Q^_qr2`$fx!Kc=QRHB|$61-~
z$bi0|uwmlGt33|SI4O3`t>A8M;`Zj2V|&6Wk<__A-ec{^-Tj&NGGm=%=v*Z5R>Ufm
zzPHSyr6@(d+}er5VNct3be&*@Ne?VlN=gYc-np>I<Ct#``MX!IZg}zX1@{jv$MZ!N
zpYqsX+2+Mk7cYxFjt&&L&<@I6_!865vuSE_lW}QV^1LE1rGwP>17%*wtX(@Y_0rAD
zGf^;<0OC*@#&M=DcZ{9q@$Moe#vB;NiP3qii(sTvOtbK7k}qIY)ig~(QR-MS83>wr
zwiuHwh7<ERa<ko0l?vjRg#e&3!lO~x8Og}3!x))moM+Lx&$K}Yxp4-kI9@Jdj;dwW
z@x`l`Y_?mxhxT$oblpYT#2De2SQi*aAq0-Y#L$mSlLWFvEL<<-HC5pXzIy`K@-Jm7
za4j2Bpm~lxr3IdXU6LY6Df*Y@57)=}$Fj432(L=rtS^yA*V$4k^HSE8FsUS;vgW9H
zpG5JZ%EIbgmUAWHJ!<LDCTpy9kV_?dlC4hJX~NH(x47A1CmYQlJTA!nH_vvFNe)4R
z$daX!I$<X{H=DGqo|cNs#^hz_dKv{ko~M}*C6bz^AlHy7z|HvJ;ypWX*lG5SVpHd2
zxyE{jodezE$P2N6Z?*-^X3MtOp@8jfM{c0Xa$daL(rh!fH(T!R2hK<ECN>oS03ZNK
zL_t&`FBe5YQ*Qa`(+5<cn8pr`<K@c(A3olLgSMX_<d`go8HSa03WlP9qK=ah%Aky7
z&13IyPC*dA18pQ>knCDfl!`o8;+zu#=70V-fBx>r51;ty;~jr^|427kMr+Bmp~?&z
zQ4+1n;);hDO=iq8QsP{oX)2mcwcPli*ladDo*vn5w=xJFJjcgJw2@(8neWRX&MNl(
z9HmqZ4|n&BeVhZ!3o;Ww{E#|jEWl_{Y4$fY#)t`Hz%AvAjR1FQf!C!t$|x<juE`Wt
zwCBn)A(Q5L78ii%T<3W~+A5V&3*T&>M%*l>lDkboT^0muxtv=z+dX+v;=RLYO+U0u
zvw-a0$&RVCT1*4h!_d#khwH_heqRCzS8V2aHkHO`5{D_3N^k|KWl{g*HeJs%8zJPD
zKPxj+KuUlAQVIGTvswqSl%YIVKuuh=1iYuLCtc$;TYBm~v&O5|+EW6Cy9E|VrDwwU
zQjkpNI1Iz$9qEHx3@2=y5?HW1A1NmOYHGS<d$BvX-|d)&IVv)QpM7Twwq|9%^oq$z
zlWU#_GDCE&j`yPpl;uoQIlg&)!!$}DZTn$qbd9rQPcA5qr}N@l*j~<@PG_nj=iBeT
zWp}&h;dsZx@yO%x%wfMltH8s<k@MpjuN0-JIcyH#6uGI$Dn(Ui98ZqEp9n!oDePdL
z9NsHXhO(%s>yq7W6R8*q=aks=Ef}qsXOv~hX0yXPVE|0?Kwa0EB3#~~4VO#LFs7EX
zk(xdPoQI+;P;RCyizOYcvW&7Ua6w8WajD5DtCE*5Z>bw0XKI}>j1xL5XzC3&H@7s+
zCejNcXUkf;zK@O?!T`>crYv%d)(ri~VB-!KuGocA!tTxrxq+)XU(`5doI~MUAkQm8
z5R##dWuOlZlPl1UzMm<I0;OkR4%_I00`x;Gk$sWlRpQO)6gQhK=XPWme6+SVbX`l=
z_x$0fpZNIkCw%afRY{(Uo6bB;gvF}NQ)C8Z#Edos3+SKS#Loj(%8Eeh`n2HJ8P*zT
zUURb6pzr$q)|nORsdfGO_z8zefo~mnzJw>OgWmf0FJ)+ny09j`u4xX|ih_Xb9Wh|X
zZc^&3Mt*=~TH%Txd2b`m2eX}`>Zg1UK3q49HP~;h7?s%BF0=_hiDR;h)rQta__bE<
z+jYQw@@LGJ$6=1-QnzG)X|iBFH<&0D)=SoAbf7Ts;>DH>Pp&<hiA@!Fb>n&cqM*zT
z&W`N1J4A7{VCXIA3^0s#W}IfKs==v%wG-QVgNYma=hKPFPZUK)U6;JP-P2SxhI-*-
zHbu^_|K>-2e1D|tE!|+5>`ZX*w|{$2-_N3fw{)ptv)R%0J#9BESgSyvLLHeWFUG@O
z<_uFOdguqH$uiHDo5L29S+bzCh}k<4#UlkO7Z_cDN-TiNJZGFNd4`PMAYx#s9P1t9
zXcv%o9EW8vy3i$;%Z2;92We%-v^UH1MYDXIXKrq8gu3qpKrHhjViz;MfzhWqDF|6E
zqW*Y-@>GpvK+`-%kXB@9jaG|0jbKw5^JEz(p+sbvrYI}4@mN2TYnhzK%W$tYnyRV+
zDN}`Sq!{`@XD0}nEYHcpOxI5s>mof*F-<bS*>)F9R??I;uU@^vgj?=D9hqi_Q<}b;
zA$a7Y%&?P8{)cca55B~sA`YSZRhF{GozlWfBQ5LyPXS?F3MHm|2muoW;Pw2xbX#Xy
z&r7@K!EK!-J%7$Ru&v9*^&=fa&e6qBHa<6HC@OY6SE?0XDt!}UJ;@K1Wf_|lf!U5r
zW|LU(@;RDCj$7+ks^~0c2eK%ibX!+}`e$6NkV;$^yI;kUJtcDNY-NyHXBun(@2K*E
zB9r+)=O*$@?m0jAZ1)+j4i#mg30gA_a*cNOoK7vqR3g``G$=<|7vy;+)C>nI%jl+&
zOp7Q$9u!??De@VmJ-gkOOgH@a`N;j_neV>;22F+~=kYx8*S~#FQ&+q`RFt_{5{`Lx
zB;i1%G;Q1BqjYuOjr83_RBXg23QusD9JafXzHezZrQG9aF?`J}uixx2-@U5eg%HT{
zOj5Ln;{*c1iTYw4zZhloQcEf&CDjnEga}ePdgrL>k`ToD%X`muw<XtxeiWT3rC^*!
z%BrUCI}V2%6bd`fVox;BIBU6F&VXLV8x+zJ(`gdiTe8AXR#M8vbu2s%8+EF@+~&eC
zj$f#As31Y0D6(j}3UyTpdl(jAJ!wu&qo-|qyw?n!Wt=?9XtbKxZ5m9L^VoLGR%j4P
zAsJ_Fuy!WQBi@OuOx-km_4QlEX`*X;@+_lia;kd6*pK2Y{Dt!Dc`!&KZ|lryU52F+
zY5|^O)|K8zDJ1}N%rufdlL-o(fYX?tgZa+`&vSe#J$GHw{X^IA^J{u~-RYdo0^LQC
zz!=D63gBwaa1B<{tz7t7L12ois-(0qV)NykW471VFI0i}d1jHagLhPgY>Y}N%A%ww
zO1aL&e_Nfmyf#}XDn?%oUaNSY6?snIi+Qfd<|O4)p(W&5hEY(L1zL%!0&Yf!nIgA*
z^`>E0$?WgLMKr%q8hpk)!#I1oexw^G>ZZix;?iz1!C*o2c<H!1UN~J^nF-b^TEv%3
z(@fVo{^qZL%Wl8t;qk)%{a62$$t$`}h|HqHFJ`aZ5Vgn@%LbS>L2blT_0`J*$H$Ig
za*-5n*)%l(VL_h0huaNJlhZUgo1Nk7Zw}nPs4&Lz{SR-*b3;)E%vZ09cPX8oXD3I{
z3KfL0ezU8n3&FCQIu4x%=!O9kXZ<phW25kxR+7$TdB%3Tq3>D<!jgae@|HKRUo(vZ
zWu9}oocQ7UuhC&fg}~Ge1n1aPRkV77w7ccT;OB`l;z{0F^1_gn1$Al2v^YGE!-Q6n
zWp&+vb6gb|LlC{LJf~?2_J@+9FbrK}mis7p=GOzn66~A<I}1NXDabMb1nWj7`lop!
zD;lf|!prfNqRIsSFp95UZ7_sb_653rkPgnK5kWRPG7qu5&IMzW-TNtKb^Sdp&TBAP
zbF5rsOiL_~Mbfq{!!*$k1LxC81nFYeQTRM@u?3IAFVeq>gS9Rt)A>Bdtkyy2OEiXc
z(0ZP2Juhj~zX{hXWt<X-d@T8{bChb)%%82uc#C<10~KgCJDSY~qlA>0I<xaU3->N&
zSkp8`x`JE4Ztq0&u`Vi17SADwnu6$|XN$A<dX_OgBp6;<{yt)ssUk^=9o;xGP7_)=
zX=v#{o(U;5HxTShQ)>1b&CTARRiJ9Ny#M@&&J3f2*=Zr7qIkRv4AwIT&*&#i24yXS
z%i}cDb^|&qnS<x{_CQnBy#4Am|M|cChD+x;oo60T1LN$(s%voEA3M6PXPPWUoFeIm
zo=e{&+^OsQZ<5wA#!yv??|(S(_HBVSj_-bWO<ssv$n9-I-GB;~Jkz{+v!g79d|u`S
z^I(~#9ycq@w{MzvAQ!37F->#ixuMK+0*=Bc@+?Q`>!?OqmUwG1MpIR#MAJA`uZ_lJ
zhN`M~{raU`R6lS$9;0im&<(1pVxA|;%wRC&CZ{SZhCvwc`~6<ByIHUuMF1xzs7fKC
z;6PsJCF{zvf}x+#+QbavI>(k~%7$S86;L|L?rM=Qxtz`zT`~@S;d7ZxZZu~@44wgP
zps7pBBE!ZGQC^kIlZ!X40Kr9BV!h+0%GnlTW~mF0(iwT)@YUB}k>>^8TfEC6W*C_4
z%xqnZMbD***Ua%}U9q?ji6xzY^76cKoZ@B^OUT%Emw=eKYeJS>Obq~nrzna=FfV0s
z&$FU*{3QfE%e4NnV3o3^_49xJ{!jJl*Wh}}ijoYCxCLE<XjN6qcan&l({$y#&30P;
z9)g%XxR~V=5Zx+79I~v-YxgjkQ4p=#*E5(Yvt5i`!}VHRWVFxDGCPZnbD}P84!cbW
z-qTbWO|1xiWZPsAW~zGP)r*F*D0n#ae0*%NN{bT3>=<Xy6db31#4Cf1h4k%hO;P4d
zE?@;fVzVhwk(7Bn4TM=#e2?drEU)<V`NEGMj&$R|<uY*CHq0^%AVE1cshpc5jFC2~
zr>eHb7~X!<u-j+kx#7jF;pMGjTPt3_-17MUvGra(c4cXr-m}d1``9qFX{&O2db-9z
z8cBczNjC!Yv+}<UAV7BlG}Eo=uCA)CG$ezJh-0@~P8Z)khpe6<KqQ&W2u8-)XRXh?
z@AE$I$um7aV=}KBr=C1hv~4Ma_$Z&(tk=blL8lqUHm~fn46UKa4W*rp#A!azNOEuy
z=TcV!1Z-w$7Ylh{ti)6&rO_mg$K#x6^VyUvJ|TI7=_C(>_ajP0%Bo<Rp>0aZ!+IJ6
z<0J;*$xkE&g|RcqQQFs-W(eC%New=dl14=h1TIKr?-NyRWvj>Rk&BnMSgK5GHPbYp
z(Dc2>yIDAC<^$5mEuUE#^v9UU^Nbk%XH&8l|Dg|1lo?&uvwt4A+m=kOXSd%`)(uT2
zt#mXI@6$Z+SF^A0@(^6MqY4lq<b@y}g9so^QsVVQ9;yo@?h*qP=lP&DhN>*Nzulsc
zt)EU3o*8C=WlEyxHpWmCC2IctWm^~1=PK$_38|FCKs^gEV-f<yrEUG^2iLXrnm>lQ
z6}lWq^5>Ur+QpW1nc0O|h7o55J6tSEMqBb+M37~XW9CitrG(UaPRdE57m6WBtA!@|
zaFr%#rSR^uwGAjGitykZ(K&{p6AEdP*XD9aUBG}}9_%p+rz*}V-4PLi%7G?PcEpLg
z%E(McZas@S@?rx;9!P4WZ7l1B0i_v7H*fC?nCC@PRQTDcrL~bz*92viflm0qb<U)f
z&>M`Ex%D`BLh`(NwWh8U1{nK+wk~;dzoDrzybJW>MB8ZYZ)@&uYTC-+r^GZVY^Eh|
z^vd;;CCFyGV!1Tr*{ta!k{ivkEomCV-OGj-_chCvV$qi5wxBKx%Bp667&sn1Dk+l6
zFfU)UKN=ONvWzRvH3<9avJuo;WDHrBq0Q%&xi&@+Fqx&SB*i%-v86Q4l6SwppTD7s
zuHSQadqb9qhbYT4@*-osUR)Kvxt%MlzGK<e_;H}0E_|!VI7;r|<OR)<8w)Nl`Xq7N
zO5uHy^w~>#ZKkLzOK!7SkqyoTvRqRX1zq3cCmBL!xc~qKshiKyN1hbrKmr-wO5kjX
zwQ`eRY(p|oHP<(n3~&S9Cq_5%_Vt=q_bo+T^72JZ400eEQ;=nr!~P&XvI`<NrrFT^
zxuQ@?E(?XIqg4_RpGJXE*Fe+jo70G1>~p2SY{;GPejv*XWp26MF4!M-R~P-|$E78^
zL`X?;%*<k%+n_64Z_XA3&?#Y}49Vjc=hT<2;kC_8kVS}E4k&fiQ_U&R>T&|h8}Q3{
z)n&$Ysr)W;BXKoIa41RwFTSjP;(Rz>=6Jz7B$fHIMMlj-;gk|6PmF#h9z+OpqH+kh
z5U<|1%h&VIzcv#17_QHH@E*JftU+uvb*3q^45Fi{BDY(^vQFfsCeIa3X=t04v7dxI
zp%Uk5q<0atp0g3<HBU-23=^x>l7vU>k4omvavjdIK#g~fGB3E@F4=BN>cV1lWV5c>
zY;)>5a(`E1R79(Ws_@)y8Vr#|Q?gnuICp2xlcz2uJ-Qo5ViE~dh@Q+E(OKz0Rc5S~
ztyG{PP}dnsMJav)eA*3k{lsqH;U<`-KvOlGy9x8nUHxNn$b*surX>}SQ2wgi(pDA5
zX!^dxSlJ3Htr^CVyex?`|Ho)3@(k}h``t5TVcBkP@ZM7|SJZWZcaFp1ATU5Hv#-3!
zY1)R(&COgx2&C<F6pKur6|-SDV~U~_&ohe;)7-WwViGKj6c&!mCbSacv&{`gO8|w<
zEXF`^k*V`&?7UnsKp@48aR?N7h6_E@Fjo*JVQeDL#Sb+O6J=STwUP~@RiGSolW{ss
zxLKbi(h83NLlsZ^0}t<?7>6^-OW^GO+%ft{S;+7|%QE4K`+!xm<_1{=jFVIaGTgLi
z0zoVMY?5`}6QUy|hfiV&Qb1B-mBG!J5e4hbnxatnDe%q98-95_5?zEKmJeg?9CQ#+
zE)tz+jO4JA3M$4(R8UqW)`;g$&j#&CB5DO+Zp-2&JxBg&m4ufhg~V?qCAVo(7a$5D
zUiev`iJq4r2<Js;8xz>Fq-q*;Cf`S`gh3xepzk}WAfsm-2d;U2DdERStW^nyejr2-
zN_?NzNJ3MU8_wNPHito;U283V5_bYI&=2DMywGE#pGBuJe#Y|zxa3%-6v;A!#>uw3
zta0wd-8!Qz5>0CvoGi7LP0PBh<glgW{jTTvIO0MgVi^WS@QR|eBqfrI$zOtc<@=!Z
z=L=5eO&K8|awZL3cj9ilL?Is&Q>3mnKYYERTqvr_VD-TN_}_iaH*ad%)}XEBd>kl?
zmebi$76l>p+^-ih*D?le!CDx{0bArWxnlHz<BVO89!>*v`#oimv);&%eH=%0vfQn1
z__#lk=N0Cw7xj;_d68jaJ~MXm+*0JybH;gCZLOW5{Ar$DiBL4pti*pSx&5+Cc<Zax
zg1$dvt>M$-6U;_wV<arW7<(N=?)Q5RhXdWYBgRCQ=YoaN^1x+z#<}lEbJ*lX{5dDw
z&GH6|%|-fO6#2||2Wv9A^B|R%hO!VdbC}o2O2?Ue5b$9l%cP<jdU@e&mMBX@mK%!7
zvRG8uT$AO7t{dl}w4o>}qR(c1j%;J(p_D`1>YV=MdHd!CbyZLnC97qN@6TkpWxLtn
zMknoYxFB=q_GlJ48Y9M4lE-_;v6~pD;TlaY$YLk0%#7A0am_<aDN<J%ukSZJet5_I
z=7!;PWV5MxemXE+Bp*tke8C3{%rWd~9;>PAfIcOuqI81WyIWqrc_WPUd2k)C*?X7u
z{#;q{U;pqIfoHrRSK{^KzFa)W>u<=iVy^HcoTMmAITJ3+fg}gR<r%vu*e`9{WxLq*
zJs||9(J^^pN3GT?Qi>QW+B=n!j5=Ikv1p}A(VB6ZICt{>5AhP(d%?)eI;<J99A!v2
zOC&TY$w6_yT@fZHS}W@*b4^)kkuYdMmmg1o$79c9=a~|-)hE!l6(NfF(#`%nqczSY
zLR7@4(K?e$Jum|RW;cgXjAK6=<H1de!}&m275Fq!HJWd}x<?Ulqhq<OS+^zDMw+H%
zv8bubjJ$w;JYlWo+<8<=yu7=ksEawzq37$jchse2xu_YPr|Uf_N(%JD$4}hetXM58
z+P1-Fj@8O?f49c_iQK~BsYCmOd3#^~m{2$uF-l4}Z3H=?=fSqM7Bz1(K8Hgx!@n%W
zoU<nz0ZRyCagfc_i7e0M_Cz9=LXg|*^HwFJY1(;xZ5a9yV=R*!Wo?>7b>(BYN*sa@
zlvOpiFp8ui^(vEuStC9qLC9EAQUov2-NAdBrX;0FZq6!4DX8iUW0(htlGZa#V#zT^
zW>#fc$n3~KURbQn==zSjD#`MUaSS{?9#D$w$Ax*g9erdRJzYPblEclqwcFb@mCc#b
zM0Y&SG3Q!Ls9r1%7nXWvt)QumV$tR(6FD3ve4K=W8HJ_qCWrT8VY;LUp+6rob(!<_
z<(fsAGn@|GtQ%08)2XK@EWi2Y4Y^SiRmJgeB(pLP32Cm>k`f&9Mg1RTM6g&d=Yw&^
zi15Xb{*nkYbI4H_zXI1oDO?V#%Yiiy+rJ#b>v^eRtZ>UNE#Rd^lol^uTi445@XPqK
z%P{;3N1T^3lM@D&Xc2|WuZ_XGNw(Ot6{l@mhH>QFbqwQ#^O9RQIZxmB^PzdEc12O{
zW`qqvHgawnA$nPASVdzM(|D$>Gh!U5YKzIV@bXbilVRUEY}v9uNTrwM7MsZ!BSuX>
zdWLDjO#!7XlZ#B=b2^>zF3#hPfYM2xb#r+I65}8e0~Y`dRjt`>3Jk)c(<GLQnxas&
zO)IQ9t1%`KljH5%7u?<E6h(`lS^0<4k)|p5?(18uno!B3f%E7&o<x*uOk~;CEb0Om
z<nn0BiZajm^zp>s{oP0Ea?R_z6>VN&-o9A;=v=(&tg=iH#M&5q5<_N8kXwVX=Bj0y
zCfVW{Ba#C-r7!Vduv#to{qO&g<$5jl7;QwfIm%icC0oDUZYPJ+B*6hiUI>S%>t^_u
zto^MPE6?E4^=pXpAlMp%wu#OCf^f;yn>TDRUgF6j3Yo=Kl_e__%VmQEo*ImeXyeIj
zNq3h1TPuyRTo0}oL8<JjFDc7v7H`g|U6T`nziQQDkd`kc4M{>Rl@e6X*iTGe2%_)a
zJrK1bGm5&YWGkE5`RmHW^l3yNrnSZS6U$Y``E=mijn@h$M914VH)x&c`f<KQ0yfX^
z^PALIi$<Z6qbdw<U%#NqHGlZ!kr%fwu^MviSu7eRpLl#e&@`>QSubL^Yppfc<r>V4
zuNj76Zj;h1zBSjwLaMQ=5CfFhf-c+XOU~bgSeX|&bzNPxQ&m+_<T=KEX0?B5guZCX
zF24?QeA=b58iwIYbG>W|ua=(~^&ICxwE!YDUEg1qMu+p6JkRO-p51QG<Q&83t`?eM
z7zx4CG&OxcO3TcJmf<L~oam($)C7!z6eH*JiMBMfZB7US+na`FQE?u6l9ej%aO?>|
z-UCHmkdRrfHi@drnA{|t$c$M^L~Lf5gT`2|7vhK2iC3>TXe-aN{7@(?Wer{Lq@yyC
zmv>8YE!+ItyEU8T8inQg`GhqU34_*#uAeCKLNYzE=wx}`AMq&=;>34fuerZ3$uotq
zntq&!F{3{XY`20?S4q*29-Ea6li}0TiC^9yd3f}k`ov*(X0ZgbS(_i#T)`+STy7T}
zNh^E|WJ-p}R?FJ^@}Sgp%{UI+-b#APFo*|GAoB9SEtgC7rz1sKayp$Q>Uv&}D`aja
zx1ZchalRF`HuD3l=m%kO4_!~wEI4+Otl>lWe8Vd!TSK#|2{Cdycbrcnd0ufkp66Rw
zRPRNRQC60s&<w*kTOd4DBciq7Bj;`;2C!BPq(;l!OWp`ZXcR@k<m9keuLWv$IPNLR
zjA}+5J2wYb%$1!|3Y?<IOCpNRdQI1zxY$6lG9xpQ?W$tYRN?_N1%4VCCK&?X-7hKX
zp3SXhvuRo1R;-$w!)c(d3f{h1aqb7a6T|m<(=v`i%<$eb1z93^KXS8Ob9g$iT($i4
z%R8P9X9hQLceBR%!1Ml$3-Z8reJ|3NIj>&0fig-6N?Ldo!)yo+SB+Dg1;tsO&FGRq
zND*TVZPQ51SeB9H`BhvgxtAAm>F4wx;JW(%=Z5afpI?XG^9K4$$wJ@v*TXY}@cF><
z0d=9{%m-F*o@qGqvbDr%;PK=rs+QL;?|AXz1tEA&rxV_X>(^qloUgw6iid{>6mrmT
zS(tbaF$uvI&$6j!pg@=}IEQmRb(67LRh-U8@}eY6j>2Ymm7%g?_Rmgeqp6yT^}5B{
z$nE`_%qX^-#mp@mX)DXi`-ayq*CZWrzT>N}UNiZVbVx4FmApqOi?)fR65qaA@GrjI
zaI-F$CeP#J6LnpnfsYS+yqB)WhY?ULS6fb}j=V0J+=wv^SzgeOBg<t?T}2kH%w>y8
zbGO}cIGky!jJom|o6+}T8yd%npFf=V`Q47?vW3avUC&PsN5&~(w#(wj`Rc}G8f_78
zn-Myu^Ak;8Vzr{KOU%4E%rncfX*nM|g7;Dxb%RJDN=wq3zx(~4D5?S%0_ScbD}>Qh
zlqDfX;j-^L5*lkPZC%d<N!iUNq%|0wqbO=jW_jH0NJ=CG0mT$Nd0~k@QPeHLMS_RS
zW*naOtk)&R1Tq80CPMU7wIxP}wHebSTZ^F^Ft+4)9EoAh?K9vePgz-vO*Cymh!a}F
zcDtgkjKmKmnIVW|LtiyI))v>fQwo}KNK8{?a1$YTR0^OXRauCH!3AQFu!2M&qydE`
z&q|8Qu-O!>H;O!uSPL<Z)TQR!ojD!@-+Xn4H9b|8v1k>qUoW}6-SF<iPUeDHCR;bH
z2qCgsEzsK2^^un^Z#Z-VI%<Y7us=<_`}jnNaOyjfmI3%@O_-W7*+y(wO88{S3u(fI
zK!EGkFwKMdtSYJMn!2i}%2Fz%E2hPX5t}$0vcC|bCb>9b;yQA;T5)`sGyl>x_%y|Y
zn?_+;jU&S_d^YPlKhqX2MrP@n#jz{0kNL}`&Mm9$hVQ?5$^DBJZ|*ky^z$D$_j`)G
zz}kw*Nf#1a<o&x3vu#H@6{96hDl-bDBSv{%-EJArd+N#(rV~YBXe!Ii&63lp<M}Yq
zPk_!?Z*F<ooe5DWp*|>v37U05+enhLiiylXt^-YFSS@l^E6HN4tDIpR(Z;Y^HuPhU
z=nF4PCRvsVc1*KuO5WU7XagZC`oWRqrNrhrOKxiMB8CLY(mT%-4UbPfZW_sK!%sgw
z;+><eEKOtB?e^47NmXa$+7QB-Z(c9>o4<O=&AQ~n`vXrWF_OP|wWg^p%eLmbZx`I$
zS4<($whcGi8gsWTf0PzSQ8kwmTk`xAiMAGUrVJ28qa)CNaC2XrWfIWP)D2l?utml%
z4-e#3bG20T-N<IMnNcf=;2qH?z|64wfExztvf^+!GC4tk7_G3za_Ai&cRT!Cfh8o(
z*=Ck3lTF>wIi}tdrod|1GWm(JR@~k%h#~Ou^@flJR;z}pE^#iQl;D<&qF@{&heJ<h
zgv1zvqit)7(xP-E%N5(3B`G;lax>C3ay&YA&nMjEQOa=GcW5Pw-)WR#ZVWI@5u**u
zWka56%G^*l1sY2~OdR$ntTBvZkBgqfoGF)OES5QUw=GZm2eLwRWa6ibv~9yUMm9H=
zs?dbwDT<s=4@ds+kM9|$FXl~Y4k(>xMT@rKPrrO(RaYcG1vBCx001BWNkl<ZqO+Ra
z?!-6=6D`exV4dd3`I(1ittB%VnUM`tiV5W*DkWH7L`xCAplx1eQ&}cCkX#k*7v0ro
z^2C>|-bK;@T*;h&K|+{^+s;XXv-hH2ABO(3`u$51gOYfws|>+kjL0H1jxz<M8%91n
z?fLoBGe7<O5#<wk9(Z{CfU=UM*LR<-JX#rwqM%(=)U`-eE?vpwJZ)2O(^gDlPtpnR
z2kvhc6uBbL0yoPw$$ReZUh(I5pO~WJ)8n2HHCdrCSX_t<qoXKbv#!v}F^!&f(U4_|
zqRi1c&VRR5P|wdt9zII79DHIL1K!J)+qp<)<$y*R`mSTOs5zg{w2Kx}q^@ge6{EqJ
zjOW7<V@n=)9p^6b`02=Uxu!dheEN98X7cfQZZIm+R!h$3BR+UutV_QA`Xwq%tQQ3@
z?^pcx``_>%|F8d#-~4b#W*pmXfz=t#d4B!%nbQdtExdYJU|!tRKU!rV28ueHZ?-^D
z2%S?!O;Cze+tBp`nb8CvIGoP-X&|4&9qPJfzuS=)A|^eadch)JR;Y7QO?U1v7)XY}
z`8m!!VXWYji`-&$#xzL|TW&Q)o`X)L=(*djW;nluPZ(_|vy7NDDJiDOk(C+AMv79g
z-K_C0^7>7KF_AJa2tG0N?rNcFn^syl9~k-`ZJ}vOK&rsJFc>^WDT*v3Glr(BAZb2+
z+@Z8cCuB2ea8u-ToaoLInJqaT2l6ZvF{%?SQ&Z*?x#n~@^Sqy!CdbXTrl@j?DrdQF
z`Skd}`P6f_-4KJPZA<ot6WVyRcJoFzaqc`sSS<_ohcjhn$umt;i#M#WR_qeW5RjEU
zN|QpMFcE7-nEB1Cd;b29|HL%UHa45J+|Ej2vs?tlW~PoJtnM_o_6l$*lGK;px(l!B
zGs4C@Cs9@2&*D!Ra!XqkuNpL^uOs=ZaC4g6^`O<V)@2&UdAyK5M_{Eym?Q*Za+5Hn
zrrB7WG~Kzss{GTu{dB<z7KX?a9Z|{9Tu29+$t8B@GyBs>(?)bim=tMRLqKurI-C#K
zBIEXU$-nvQzaotTejEtVk&?%|iS<IVElG~;vH<U9wwJ}`irulJ56}%AH`^6K1#a(e
z>H1N`(nY~AcH}l=yIEp$1qeGz&kFP4BMNgpl&t}6a;#P?7mMo!t&_!%il`zsli&(t
zl;m_~H8(d6-La!CD;}TDxET4gJJL-KV+z~=`{xd&v#Wo0iiXFB<7_)?@IkZNpKvMB
zEHsNn#c{tA*-}5EO@Y+|RaK*uVVpeQzJ9^aKY!$KP88Kj00GMJZ~y8Z^YXU&F$I|m
zxDd#)QeMmuFv?(+Mk~ehxg#?fHmP|-kx^GUi>6_m6LX~!Xc@<mv7aPW21RbOnQEvB
zZeqD=IUEldBmOk+rg=*QZki-AEKZcAD0#Kks2I6fuZ6*`4Tr-CpXOPH6FpYf3%95r
zJKlbCL$i!{Kk>~sZ*fkxH@CNUJU<`Nsvyg=Yfywzio@}YHWs5Zy7LH0(q@YSmdlcq
z0ubh)$HaQGoGm^O!i3SeXm>KHREIvyXjf@@i$bIjZBt=w#{M+Xjk2}5+2piM!*aDm
zYsia?7cXA0+%)XFJs}11*0SF}p;Wp?JS`VXp7(pS&cxrCYnp}O=C+}35-(m>+-z&U
z`Q{aW`s1%8?2I0<td|S^xBuxsP#DW<x#Zo$Bj0}gHBZk^R87V6?g^A^;hdLn(i8$Z
zeLhUYX+KLBtVm!k75hK0lD@38Ac-nE1iTB^;kV3!K6~*l)*G2y8HwKdyj79c{|n=?
z55kg~#!>PkhiQ&^7j2TgECJ@qPJDy@FRVQNTH(!kgE5lp#CoGyZ8OftGdH&luU>7q
z**0uf6>bcS-2_3jdfWAy?tCT^8T%fi%v|LLRG4^myCC9u+&RW*8NFh+pEwQUJm$!G
z`T8Xx1@`;>Y%enOeK(U(6pKYW8@MNmBD>n=jIs=)qi&Y6(M@nXcdXV+LKrZHYpPDW
zC<$?zp`3Eybp!nUKfIUiv^Jm%j^`1gCZX{@Qk50!<%Vh2Q4T{d9hU<)2Hw7X%`^>k
z^VZb+iN$ioIEkd8$Z}T86|41z-~V*v|Neh|;={u;`;+7Cn>&8~u%{c~`RPDeR3z{C
z>8BlLv&w#qQDVlU7oT1+hfSmqsEeH7XKP3j3ye`hJKU@{?00*7U{=Fx@<I&AK1fU8
zyvJzaJ(XEbQgdL0QuO^euemiYM$k}X8AX<%RYqPWo}SJ`5`{H#n;OOG)Z-(JGud(3
zE;$YT%;pB08x||g?TZCXS<rO{7R`e7W=%g#JU^e<?|Ooty>re(GW7jKRS9&@If*q#
zd0xI=(Vb7M)-`oi&swu=o(<%Dc)ue>HJh$QV{<<DWJXf2(>$*;Rt(y*P1fuVCz8_q
z@SE5C=9{;4L!|3F7K@s)E<g!$z8lUQhLKOtPbd>uEE{5)Sg%{kvLMe4R*UFyxvH^Q
z!QtrW&WY#{;cbizXBek|oi||KN1mRKJnv8Z`KO;Ss^oau^WuI*cj|cVJf+D*q$y@G
z!3!(7h_2@6B+i#hBJ!7q(`6tnZ-y_nQcBH3Z$E3u{1=1zFLMz;v&hn1iC>267tK?g
zTSVr=P2?1F73bsZ`J40lLYQqu7sBV~Ih&-87fj=X(HcdVw|<(%BICt<$+AlG0q#&L
z;ljvp>e+5;ZdWb;=5M|yHxq6+ay}n1nWgVL5iy&bbyG;iY6H$C&JKn#F^oZE2Sk?Z
z8s`HKA0J6tk>ysT2_a!@hRu?I2drjvj;hGeMgnfNHk`(Z-L7M|J9F+QPNzAjMH#|4
zp@F6@F^J0lLN|#7rZLfVBgT|;XUAgE^8Ujo#y&BHIm|VI(MAdt=Sjhn8%x(4{_Y?C
zNL7`b4hI&ChP=q=x--M5dH-S0ukVhGUU7ea%c<-5`Q0b}@Y56f!$?^bWLe37`p+Nu
z)1MAJ?>gE=O+UyX``hognDxT^c##0e4Hf7+X<_QzQe_#zB_=nCPfaT_Ysj>K%@PO^
zbQaiYZ8;v#VhPbQ->B+xp3RK&?UooOPuGtqV*p7F8K#M0a`+V4?@v^<Wtf7b%gl#S
zR?MLL(F?CjNq}lnuv{-VcPC;T`S$xes?stH9WP$ovsx{9_x_QGhfk!a8OOlscw(`r
z&?aNIJJQth4bDqNyC?urZ8xo@X{4t<oktlq&anN5hXZ9<U3FW2t^mAK41=^iLbWhb
zi6JwTJhSAbw12<+@<5gq4AVfSHEp|~>(7KVi7<AyLdgb3(bOenA$~al{Clb@qs&WI
z>jg17d2?$`e|7|~Id?td;8-kbsw$&t<S>2O9ck-=-+uQsDT!8SRhJx&9Uo64H%rl0
zU5Eq#K1Fo;Eay<Os{OLr{cjqhzo@dV8^23B%oml{>>|3_k}g?)BoPXG|6ki)(tH?Q
zjmYzsP?Q&+G0K-}EhQmpBqes4x~}F54`Or_xn{XEeD(E`BJcQDfAf+zZx(DfmKXOG
zRn>4joLH|KG7DLr&?XAF@z-}~#NT>8^}M>@^22Z5uvui(g=RQDbGt1GN%7$@u^YU!
zi@{MB8H;7jILl9LZc#=wQ`TgXY;7$u4WeXs10h6~O+}0n2S1Jpe97@Nh*mDi_b#DX
zFIME%uxJ}DhWNUw89E1OilV~1k)kLWM@QF9oX-<^(a?7zw>KM7lu?9MqHR1JPHa|N
znyTT?51%j!{`C*P<=jo63qI}kRLufoa;(Xy+a(`A?eRhL)32ZCMhS5_oCktaJUyLx
z{Nx$NfH9JF>b;^rJ61KAm)q(`KXa8XKN1Ry;&#0x*9JHH`C<qV#ou)SkwLn0f>2_v
zoF+*a(MDbQQf_oG&%Z)M4kmvIRDh%sDQQL@m|_6Tyjjtl&OK#j<!gxYKjLFz-wzmT
z=_XMx5965_9p8TUf_9-Oip!eZ^6=>+kB?`{qDE^`*yn}e=61vR+))%2d0z1N>4|ah
z91j!D2`s;EWZRM1isR8S3=Wh<Da+H-iD~o{MRk>Qh=f4C$)c2&0lYGjC79)zRIA8C
zejXC1W6x?`v0W{Q0d~h7HW!?2jDaFIY}QMrX+ps~zY>A$(2qDbO2SWYc$b*^$obHd
zqQSW!D*WWp1oBK1qsRHk<PyLA_6^oTSy}43<>BK4uU@_7>1l_x8OL)!Q#qxrk8`yZ
z=i8Q)h{!<xa$tp-*qUZP;U&KPv;08Xt>D9aC^K7PkZLQ&Ya17XY+XrQW8!80IOBe_
zNKHscs?7Xx%sM^N=h!npy9Xl7^jS^Q2p!k^L{Td4ZX53I3fk85-B-6PmlE(G=}Li=
zJd3uVtusRCXxaj8B~d3POCKVShmL+y{PCZD;n?jds)^hC4gdPLf5qFkTm0Cglc%jR
zRE)fS@tVzc!#JHuN)r*Ybx~%Z0x4>`ejv{bd12-Q4C<<)E(^}*j&X{7{J5j*54?W4
zqN(7;{g&fyhYJ~xpPqU9`ZdlEGw)3RkLy)UQjYE<-dkl0yo(H@XSeUk^M+v<sB_E9
zyA8`ml>Wg-^1K8r&yPE97fV)k&2b$0+dur7pC6t$>`x3+LZ!&LJ9FyJkSvGe#PRHS
z+V`AKp3xbO`;p!AATv@eul3{Ok?!pH?%NIj_TRt6+;7VtmHwQBlSoum!Mdqf)+NeF
z+Dv8*-g)Y(fCSoDiaet(bFpfq1T)WQoE#}dsw!icJmWAhBJGILhS3K`FNb7N3Z})(
z2Un40r~qx56J|$xT~!R-z-ewZ^Gw8hhtY$Q;0L9Zz|!)_cfZ|IH5ubHaeI5m`}dDL
zKX-ikv}5;tV6j*LverMJ&tm`ak$#v6A>kb;%)DKKei*pftQn_?4<F8ipm}`U3vm_2
zaX%1z!udgTSEmtihbY;a+6yEwky)7uPLq?x!Q?4&LtPrafAf-Y=ww)#Je@mJl|~*~
zM6sM(p%7?gIG;MPlT7kvuA74373cGW(K6$D@!|%f74LrjfL5NxvO*jA`^O;?oFccP
zivPnOf97~PlVvr}Pmlcj-~GV*hex_8p@>&*mb8EgKZ_#uyya7KMxs`F#!O2U<^5-(
z!9}Vd)Xs4IdEua64m4r$GXo`);Ee!-VssPzG%!w+NF<}ope8@f<Wc#2F$qETVrc$y
z19=g^D$?inlEiXpSuYDhII~&R7!xoCPKTbV$x#G0%LS`NNmFHP)-BF^c88uUE3n4k
z{eV>#Hw9esY_<)ygee4mdU((O`(J+MAAbLl<Tbzf?lu4OfB1LcC;tAAKQjyi7o4{Q
zQFut2sx0Zdan2vS7_9}@eeMQgocQ+Z4L6&L-~H|@Uf-{HdB0@6C}_$I5<ERkESd#P
zYk1xt=*N+wuvCTR*d1w?HAPYI{^5y~6nS2-TDFoZooC!^7h?PJ38M_%xre0K?M_s6
z!~JH>7#xGD+3io<-)?#M_((rFnyO~CTJrGlfz@(D2$2i>-5A5rotZ{)LS)v?-I=;t
ziVnMz1hn37s~^WX5yWbP(UQei6^4KL!*~4g&wnN+v2)}zBTLT^JguV)8=Yfvj?K-M
z{oz0emvB|j-~*?@F-5LktAL`LoCGmChn>szs;E%&xTG6;s=A`kMg(`6V3Cs+3qn6m
zbS|KjnbFRIzkT(l=Kkf9kI#?9l=$1f{U;_j8<<tbYPCiw*lad(Yt;3e8D}^iWrj73
z;|#yogrJ#*C~3YyaoBrOko9gNGV~6RMSwAqix{r)?1~HO*cu5EKqa!wTxk_HGrYcA
z@clQhXsd?X+Z&F@Bkw=Hr(IPvO)jv)tU~LI#bWUnbD})YX_}Iv%uraKo_3@dDXWa4
zu=K;gufIG~mUb2`PQ>VC?d@eI<zix(9CzD$v@#sJ5uf1s`I(nDYkvLkf#rIE^Ai^%
z!JKtDZ{EZ*!zI*J8G^s?s=f?{xcvSzZ~iim`f~1dsfND%Z!R0a6eCl(c>ZPpq58}4
zjxSL*AznD?7mm6DC9|<hmS0u~)geU%3^Yx~a#>QA8aMT<*Gr6*z}*-ptks;3C+eoA
zEDMHiz?z)Hv7;yzSuVtk?$}WnOS8(zvVbxHn<=JA5p{+t4G+5~{?p(8nO{D9#JNOK
zh;VehS_sBT$#bohEGWvV5CnN<$#YFv=Ab<P_IF?N@<qjFRY|h?JZ~1tZ@@;_Zd%5v
zqir(I-H6Q<){5EPW|pKzV$5(pP}LQSw#H9Axm6sFd!maxKcASUL{rzSmJ8Z;L7Ibt
z`+nlokNoGq|3|!!EEhFRQ*$_;87Idujr_ZR_dDLbdry{C^xY_nE^8=sMpB9_%W2AL
z_LD~RZ1r<7v1r$rAHHAzIF1v}O(Y_vu`G(5rnIcqOHRjL4zU<9O5?qV9)&%mISn$i
zQAS~ll0UqEz!*ze=Qtn8>xOsx9zRYPYZ;tl^br>lSuU|#QGwA3KZ<SP+;{Y&L)nbl
z%1wCeod^=Whb-s$)T6bXgD}OtZ*9T;cpx)5Dq6hPynp8y$AmS|wAH*(DH!^R<6+|G
zpFZ)tKT(tgF+@(Mju;iwD6wE!CPVaL^h~3pszjruHRAP~WTk8~2=me+1mQ?!xt$4&
z!h+B9LUbujGvj+AfAyQM`4_)^%erl;svH*+fB5Br({N(FEa*nZ=)fj;^ZFKTCbW{7
zmeuMi4pc;95*593j>WRZTIdd*srQsc;$~Ch-Nbg&Qe=@Aw=1mjXf%sOOPK}6X~NB0
zGmNG!3{7o$JPf30W~-63c`6BgAu3?@g{G+H`F!Fpgr8gjA>#FRmDH4U{ddw*K?r`{
z{K<(}w#|%j@nR2}Tf>Vb>A#v!`7bOw^MfCKxE^>)8;Y``sx-HE8OudZRpt;THp_yW
zWl2*jw4PYDCEG=X&J>RykGL^W<Sj~>nGY7&u4?k!aOlLx=Uk+za_U0SHWsA=m^42J
zIX*hjBTXxgkanYKw>kBqp?4!HGdw&U`Sdt2^e}W0?__>lEi5nY7rcJa^76K&Dw0@e
zG9ZaG$7Yt~C9e<_SuRT+_X8gvcPti~^}1yWA_pn6T#Wo#M(~P{pGNv#x`5<8b<yHo
zA}Wo};KgRcdc8y`%P<5!J?`lHktqb?<nhUJ930QPJ>%$blgDbyF!VCu_nseq^9@>g
z31v<SH%)At6(M=<HVe+ZJcDjV9r@r;BtAVJFyDT)_|YiE&1OYN%qG>qX0sqf2R_g=
zC1IvCd`Z9bF%XiX%rjDq4AaP=>sc<A?2db|7MocnH}S9j`dfyv!)6y>TO>wDZY>H;
zoC4*{$S$&+wk)Z0$zLmqf^kk_o}9SS2j?h^99SVms<I?0c>_G}Iv$@U_D9d|X<!%w
zew^6ew8RkUd&hov;=}s`WwF4AiNn4ZLPb$<I(A$FOpDUYb0|yO)>28pbw)!{SIT7!
zUncroc;=TkxR{zFUXoChrXL+$-}CZrLzx%+^y?#k`so9ocF*Jm)U}o&vQMZG*ld=J
zV~-^31UB0RO<SOtlbDr}12-i$+XY3bX{t&9|Hkv;)t0<evoRaii=3v7Gk{PMgvDJT
zGew(a#4)m6FZuMm$ITU;Kovj#)LN7N0x+ol;?KXVo<jIC@brtU%b18^BFz=i1<S1G
zO;$=`m`^cX2jrK}{Uv`Y#u?r?5A@^Z@QYsvQj>hXyhyx!T@w5t2l-9S=EhPMi9CnJ
zvZSdq%B<vRC$p9;EBW;C8KVlqq<DD$ECHt>@^t7}t+pHwBi1OK>)D+;qET2gKMzW=
zSQIpEfe%48$AuhzC`n-^DW*}vd$pF9mneq&MWb0Y1!Z9gLF69ZMM#FjX-}CIq!?K=
z1&g*|y>4h0Ij6I<jwwbaH`3HC2`x4$t*PsVj}J#aemt|^kMknU^5Nkl+S)k}u_V)x
z<!T}Jw{th6bRx`o4}FL{e0m1peC{dojIQfYD7M=Ti>hF^d*b!WdzS5j!}E^KqT>E`
zOG5GR@rhybvxUlEUo#NwlKIV7s~_LqZt&65KlK<qZEeXc5G5S()8i8^Djf1~mrW@Z
zlyf8%XqGkI*mLeqtm}%+dc|pU?0d)UO*P|{1^LpSJJ!o3ZBt^5W*j?)K~CYyC~|8d
zI4ps>%ox4QKvasj=m_&RDtb@b<gBV3mBg~)y{9f4+z4(;^rs0QB1S{gG(0~a$n%=6
z8$o3ZgXeHKvRW;P0rt;g7_OTVH%*j9gVK?_&}3PX1f3-9hqY$5xCqK+7{opzq|HEz
zo`fUMEoG_k9wry&IiV7<AfN(#|Lt2&UC;0T@lQ-XaT<0kR|UBZWHx8f7TEdV)+m~)
zBFpq_8V^i^Ck5ySnH|2kUt_dbTC-e%nt1i<CEJ@dS)L1j-db+&wj9q#8XZwaVU(sQ
zpe_yTc7ckKkTUvl;&zqOPYOG4i4&KghBV9PWeM@+L2_x?K5MZA1&|W+g>Z=}6LM$_
z0c8tNiozCxd`_Z7?}tG?#|8a7^S>@J=iWyG()uY;gp#6&eMzD*iZeMODS?cwmzw*V
zTw>bW9Ai9914SX|mapEvLWRIEz;QP*45Dc=L36XX<8T-VSk_I&)CY8-I2{H){dy*;
zM6?l1juyWgRcWz$B7}*$l}bIONWjyb9eLiOmFDB)nWv|oX@bR~Br5`WQ7}!BWs^~q
z!a{e>v065~fBy_RaJ#M0rhswax8Hw-Hj)B#I-J<t-as0;-7a|Z`VM^J)5A#A3ZpU(
z`xAM-VsxJS`&(iR^!-S^*zoXiPm`A{n>A<|<nMNS9v}CZtYFujc{rYV_wETp;(R=i
z*#d2>&`GoeP!xGiP?6`uiOtQH)v{$gpZMY1uQ4j|=U;y&sf^JH`PR-lJ+0+A&U1_T
z-~an>f86i)s4US|CF}Kyw#ljLj6ePSD=s9={1*ih!#J>LYF2fF$ug3H(puWO5xS^W
z+}_<VO#|!IlDoSNKmYQ9yvXL6OUcKFPbd`U<B^v)TQZ}mtf4AO#&Hx}OD13J<V9Lw
zj1dT$Hdk#|TUI0z!z5cHZS588A5#={cM>)H>3F2BMRh(70XIeZexxWWv`%;z#HQm1
zl$KdR2%f6WXqt?o%rM3>^y6$@`keU(nxUT<`d(Vo!ctWwRb9!OMa%qU8ZN_SMP1cw
zw<~V93try8z?h7>sX3f?)Gg%3bF*nl5$<nakY{#=oe4VHW*MOAx{eTY`hFzKa~8{z
zs>&&f{4<-ZYWVc=naMffn?<QSrg0>M#NGDgJj02zo@XMrikt0<yplM!<i$RP79PK`
zb{>q+=_tnjH!G`)q(FX3RM%yWB|#FBZWLp{D#g-te6<yO%g5c3rfunmVb%f~%#7Oc
zK3s?TpQ|{>CA;SGcV4!dTBjL#BbvdgQf$|TDi1;x2o7VUA|3i^PJoW=_9rGkQWrIM
z>sx;P`4@6!`1;jbo<2SD^8N+dN`}D4=aJp>iOD;ng26?GewxL_fkm5hcekEda~W-$
zvuZ70zrLBby(g+db2#>-B-`b>$uY*EFw|{^QNlBmEnOlePgNV%o0{!r!7xm;?UJYc
zp8dYVyU6j-^X`{V{O)glVAEReZWio!Js&?g`bk2Q-4vM469&Vv?+7t4InS@}J~FvT
zKMWksJ*VTDwpsG?yN`5JV)BXI;XsNSmlUVdi64IR9U+PkTPg9b)^$mqNhpi88PCsq
zo<2Tsf3qZdCrMjb&ExLO<V1|>y_fDqOJqGsVg84|x&85OvtYAmDe{8-^MUR>@%VTo
z>H=kDMIE&SpK1l`MN3mw!lVw4yX|_0%?W?#dH>8`{mUPC_2QoA!-1w*%!bvGmoM(|
z&T~GUS=J4eH6-svSZD1VF(xb1ZWxIuNTOv5DRLeKVNz8ErLp)J@ewiG&h5zsmS&7-
zm;^&?u_ou-IfhZVTHcA-*3Nm1T0xcz5~Z#SjEyXp1yxm0<R!$!<l>d3B(oAhE_)~a
zwzcwxRu=L?eqH2(Lph&DViMA0-w(tPc=Prp!{GQY|L}WGUC-hC$lYB{Q(M});MM&-
z%E8U;9f#uy?_^+J6dBG1cDp0Tqg0YU$Xa@}YKb$rZW<%Q5Fjbm>m>kf+pyWJAVr=Z
zpE>Q$V&70&(yXJyy8$0YR+}|#)AI2CJzu?f!O-_8mB{mgei(^p^gO_hGue{#<pABu
zJWO)KQ1i?(MhRIct9(u{_I!J5_&@)b?<uV3AO7?}pK=N-K*VVZGxkWh?#_9ss)DHI
zQxpNIPO~>|Hbz@5avY;IMk`66$r77Y&U$I*o7>EvbFK#GcE3CKIPYi|HDL-I_DBB3
zcfaBLZ@yvoydwno_1E`ows-vf@BhS~{^=Q|G^WrD&NDg5zHHi(vd+jesS;93f*)5B
zVO8ZCH+9@?7i_mJ&B{v4=wy7MlqE(@Q6_F~YLRx#{>Q2=82X+(6ZF%=hffrxp6xyw
zHw<hyTOiVwIj>&6U>YY@n+3M8+}^I}&W@&D@VoE-8mAKDGzg`{8hjLZqxS*lWt5ZI
zjK|%c!+GFz9^|!ffq8+<>2zYZKh1b=eWh(&z=4aVX5F;>@ZHyZ_4);q_dM<P{Fguc
zEG#b~c_zBQER&RYd4?3`|M*}3`p2j=4<8RaKJG|KW-C}r(u$zsjK~0#;?0XY>bjz;
zYas>R-4K%J_U4ABshB~$)NM<D?l_)LVwdT9zW(|(!}-KG3dys!hAKA{Sx!^e#Nbd`
zlVv&6JeUt!5tJMRn|8s6-GQ>ID6E8LjKhGQ@y7wlRlKO8FDb^Cc3>Q*F9y3p1X!(F
zhH)T8SgwTA9%G=YEbDbiRa%<5<$N3&S*+wb001BWNkl<ZhmjbC!*%t(dC?8Uh_Jyj
z5&RWpj?(fXl0d7(FgTPFJJHY&^xcFu8K0h?`13FCWFrzMiZUanh>wb@EcyPcugOfo
zr>7?lhn}XXQ97cLR#PQQmgjVR&&|z}A~$$1$ezQo<FGr^w6(C4%9<iCxtNVDim?wE
zoqdj9_oA>*3H&s2KJ7?JF}aa4hvjl5V#EZ_hwH{IB>h=d5TxD7teL%ja%fl#F^$x@
z=ew_3UTsR$bmXtUd&zNsBu4o4)5t%)ADDvSd_HlBJBv}&)|ViK3qdue2}PvJ4Vj8;
zR||?lf>boJb}n;GktIy#c=Kw>YMC)kXR<<LwH$!X1^VGcmMiMIkS(s6TM-mxRk5fm
z_Q#H2A9g%E?Rk7U@bui_lLZY^oG`gqpRCc8Wk!~3h@RXUT;EewB`G*=H*2P`r!0it
zS>$@Q6;0%sVdxdV{Bq>5a}481)0Sjb<PJrVv-<y;db1`=j`Te9@g?>+OP-T^?Lapg
z-DEd8A}LX_p~-B18UECmjTvtwvoVSiDUz)wdqX!0KyA65{lx0-;kxk1gkXjX)J35x
z^JIkk_r34)%nAl?nG`7(7jw!?adkH5)yoUgSQ9D9*>Zu_lIb)eFH&}+w#yD-$+q8j
zeEWXQ?d_K1u?q9ANeMzwHFZFxD~%rl`^*gkQUxyCaTLCY5pWQ$>tLOK3Ijh{q@?u3
zu^`uq`K07znsG8I>6<oG&9rAaFNkC~?M};_>7=0UTAUY*XAji*#C-Mf_Q1RM4`b!P
z5~qRw*9`_gzSSPDW#^|0>b9XXJ&G{EJvJRz*B7i;tMH+WVwTHu4o%I=XBVVNjPow=
z)um#++7hXVX&Nz@7Hd3p6~q&f)*Pw|=fjhIbF46UaE4Sx?2W<oJ@c{*UbYd_Jm6`q
z!&uAmbcvKQd;@$K=spg5A7?D#dF@G)ge*<Q4x2?v&vcrxI4KxxMV1%rc1NrUo4K|R
zRg$8}#|I%}!8E3r#3(IBa;2p#Gx{!MP@D_-m5|8x<AY0cJT?d=u!A2<s&K3ux;`A`
z@t*Uu6SPV=)D>MH3cn}w2}(g#)x^4>>sr!0Wim;y&XB|bA8brdo=-;johH&L)9HNN
zs11Dh?j6U2Wq+s<!+3r3glGqzVQ4XZN7q5ywk&2jc{Ujzf+byR!)HXOa78oWf%hoS
z5Q8O8Q=G9VA@RQ9%QtiW;!n=`@yim#kz*C{?$e69+VjWvH6QPfc$F~t9xF8S>72Gb
z;=RN^4eQ5Xs1H8~X&O-^8rL0}mN{(`e)yCKm9dwvQcjkFtLr6$+kvo@lQJwJB;jhy
zz{{7H<VA##Zj5mV(kwz+OV@PFmoxs?ufFEp`)%+6MiGa7&t_Y*ULDz178z?y-!LsR
z(jsASJ!Kk^B@riOLYgO-uH|$-r#|kHDm>J6B-vLjrgg+|z=+pf2o#?zN}_ncIYr+Y
ztm!F=kgv*8&3v9PF9fG26O{6pu0smRet)1WOA-}P*Opz?vfUp!KbsM!1%Lk!zoRuN
zn{CbM*$L0iFL_w6X!?%2t~gyTL(^sCu{rPQ`<AZl={kpVesnedAUS^e`4T_48c)wA
zEN3M@dG&_PX2bEgXFi#rbi{xCZ~v2@eEEuMwL*J%`RWCeGNtQU>=>bml*ZZt_1X3G
zD<vZGEEzdX;kap>#Vd_a0c`*5e97QC+~DZ?j@NHqb9r&fYP}}QQ@k7K>W-_cYmDjX
z`iA+m<apSjqzovHvojtZR!obO7Z+z}0ZM7IJm5HzJjOaO-GCQ@I7^sJCZti!dbekg
z0ZCGpVU6rZWb(0Y8Bo|kAeE%GUAQXxVdPl{jH}WTB?A^&t4EBnMyfy)IGLA0@E}9t
zIm=VJ&eFGGP<yOu`hGylfbQsfLsf-qYc`3HS|YVXD2;Q02+`Mus%ppDh+=Rd3@3yj
zFT%rRc{1brdO?~iz%ZLl@ZR#``8jW1%&=DS>0!k$|Me|(XIRWj(pa%S)U3A$lA<Jz
zB1|8Gq*8_=?0$bBO>(j<9}O~^K@8!A(>K_@W4qdOI5?`tjgZEHI2B~63d*G<VsMr;
zj~OJi4NS{~&PsN>n%)gTu{I1K1<v>MrVaBXB`9LgX#ufvoJ=)8eYM~huV?ga&wu$J
z-|*q1<MyHB(0H5~f|1yR)WM;r8EES;)3Med#zFieibhBg77`+&Z!K9KV@*$IEINr<
zF3(`tGe4Ikxx~4itVl?+n1K#!Ya~#XS*RX~fxhkOyPmV<ocT0kTI5KrIUH+_ZNsO#
zhJ8H{M-jHSbb~`h5knjiMPb(BtfHzd$GYOh^Ce$?zT~qPOMdj?f-;MkO$u&qZa6=?
zps70|Et#AYWN}Ph#uP<{_bt~~3s(0PHy>;6?<%5502*syHZ3u28}L42VCW@Tra2rs
zn$}{>z+!Pik|<m+c=zF+Je#nb=dAA@D9e(6`lk=vuNq!nJtK=WURXpLvp*byg~~Yg
zha*uOjX6Vu3(}zRFc473QLLHGrnGJK6l>91krydNk<iu^<+SAEhfj3Fz{zZi(wcW4
zZiu3ortT<<oH$9??sn8&&;9y9-v?30<8ns5J}<wD69o*YwBT5^w0%!D$&fm9uHslT
zpJtq&pOF^@ZPRjhcSjT{w!1CoXJ=IV1M}&O)oR6JxkM;I(=^Oa3gRTD@54sv?&Bw(
zot`7yz+_s6ZJQd%vxNQONY@%bQA{TYC0VaGVQ@RfDate=5<?&~jOqHiwa7>^D2q_?
z>B<-C8e+Wbhe4+?VHlqzAy_FD=x7K;(Lqp7V`lTf2tVvQtPvaz9iZvQ+1KMq?Xfg!
zohL~&o?vc{qZl!Sh=?84_09_hul^52ilgg7aMjualZnQQ9@Bg3I><G3Bx!rkzy0PT
zlQPCyNt6}zeTQ=cn|*_m2@)T4Q9}@6R8{k|+Rw6_NGEuFxFR+kcdHGX&7OK+6M4m<
z3LLLIl}Ht~Yg&Z>aijveIm?1ExgSJebIYL7GA@|5tuff%(G9`HD3N4Q%(JEBv+E_+
z1h3wHyJN8M_Wh2#y`k$<tbkMwe14hn#p?^U+a0kUNVK7|VvIDjK`HMn-WUdJM{0#8
z%Od0$VgNot!M=?n$<_HOP17KypxSK_H0UhgqT99~XFh^y5%Kc*8L?7m5hS*4dmv2`
zk~loDweqaC4;+pieXqH@t9e+}^kzUPNo8!%%psq;mBtKX)I^~Z$+Odvzx?SNhPp%e
z02@439bM;X>W;}Y=j3FL6g{yHwX?eIL(WjfeEaQ+hx?W^&u|Xv+Hg3wNF~U!0)b&N
zEik47ui31Ey=Qs4;84|JM4@BSQgKp-S#VM0Y^yusY{Kt;zrl@mXD=mp_je#AdR+8G
zaYWnoA#O3^$wR362lt|oFe@iKzkbI3!#a2%#x446Hs@kFqi+m%+aqmjuwB5<ynFY7
zs_v0mV>?5ZWo!;D58Dba!WP`Q@N;gRNBz~$uf9@Igj9-mcYB(yCZA-8*zw4E?|aAH
zeQ5C)vEX8PMyxcMRt&~aq{;ZU3%uq4pU-I83L!!T=2yS^J<Hhw;S47ybCzeP3?kGy
z&Mqz(2!OjZOPMWZ9FBYH<AE4OIzDKuX_-&bKrA((@z_}xq7DlBA?TEv-e3lgl+nmX
z3jEvU>6A2=MDZiB(vf8u(=sKF!XUgX6Vg)9b%L9lmZ~;*B*#NT-}xtmvm4=qT^9<<
zSso*W1~G(fnh#yKx(N@oZUo5T9YThOosfd%MZ)XnOPp)MtU!dXp+Mq$!Fp@xdWXX>
znN2Xq2B`(@5J;i6_w=155|V6Wcx73PREoR14U_2<>kPYH!)9BtoRn<WJ3ifPIqWUY
z$2j9gn~+4sfg@k{4l5K*>(NopzB;hm8FZ|un-(1@=JQLmw!~VJ78y-f<84P4!^KI&
z^-1W5y}v!O>w-~be-wOwyF<khU%t7bs%vbw=jB<(pMQ4FByPxNnrEj4S7%ec{dC8n
z=>za_7_i=sG7C!*N8kqrYlvfs7J{P4!j{f-2-i}ij??oJsU^;MtP66GB9AybEjS(;
znzlzMPo782rzMM%f+SHO8d4oGbQ<p?(pVz2V-SkEGbo)<HwL9gA+HB10*6gWFs38U
z(qLWEo=9hW_w73_ub2GuKfa~!B_a}hy4eJzP@HhH+R*i$-La!F@bPwwwTg#_hG7W!
zoIFp-vIuJi+#s3HBGN2ok|#8sVY_WPzdT3BF^64`?ON)-CrJwS$A;Qiw)=|j-dp~^
zzx|pt%Bfnzr_Gk*amUs58Brwg*pSI{ArNew!<vw{3t2dUM+O$1)Et`wNv8SvpT6OE
z*kSsCILWB%1M9;cKfrO<gXp=qo>7!JZSUAt9dTB&-5)~HKhYRJP<K6D*MpMSadxc!
z;%8T1?e^8kXF4DwK~^M46+mE8O8g+hn=FpGJU>MV#ix&-`0<ZEC(m=zEM~J_Bc))!
z-x0?t>-CoB&!4m1J&>j;i_=rK>jz#we;zd3+YLfW=JPpaS%&J33*oR&pKj>djx0@y
zq(Vqf?*=XwbF>6+!$#-Oc1RtnLQ*SqlF;=AJNS{$9f$=|O1$;-rbBDN#l?c6%<<z~
zEsj-4;tnp54URo^<?&9l-R{vk8ewr3>w;b7QBmgH5KdTW^7MCTTNhT!PCf-2)#&Go
z$Bm(okVKNc?KxY{NYfPSdZbqP!IEYPLaK4V?8wsabx>jmF%uWo#fN>(&4&&1X@+ND
zw`o|d4pfb$sRlNOirv29>$i8THZ`@eoSvOg<T-Jgb8~->F+-?44I$6e_LgJaqT+;M
zfV=w@gVW4rDQ7dq>0-w1{hIZrMTmjvd`1$-tTzX|A2^*Q{OEGZpS)c17k}~@>&+c`
z;%ST_FG6*s>kQk&fzRG7`TX@1Idpve_J+RiX?xH2w-0QN4Y%u%tFmL=$v8_ICr<>6
zN32X)=A^NtI&P_t8zO0uzNbtTI&$>Z(9{)3O>bI?JSQ|FWBNXv#=H%)zwK&ElEl1u
zb<X)>$zTOiIG$b4(WziMov}Z3?Dh>wl7~{cgfvl<lQfJs(hO$>`(s6sM@&-9>+2;y
z`Ozyry?@VcU9mVVIlU-&{ql+;i-=W-_Vli&t_@Y~7`)*AZb#RLhew_jfDM{?8FYKz
zJL<MYih-h-VF!hAg16t_al1P3<1c?gb2yO12@k6k$2RAm{`HoB`Q<H2<P>>I-FA4P
z5koMA*KMHWN)fT$RIIjJ(l`$AOw)yJIHQzz@EB_t22Wep6nV;@{`{vj?G`_TAazrB
zfvtt(`STa_t>fdTPpC*B6<F8fTtrjXG{&&mRzy*Tkb<UbaYJYdsGq(nzKWxSND2D3
zA<ZIm8ilSH8hpT^4A!yV9oeq8NF=Mf2O_N~vw}R2Y1*1Y({M7IW31s&RXls~0vK(`
zeK6nTMS+)s)3XcCFE44kj>9JKs+zju?&c<#dR&0zMM~2chcPV|^J$=yMlr|Mu<tuM
z<LJ5}6syN|wvq}Z6_Vg#lcSP5iXqY=w3((c!(cGBC(;p8I<7A-IMg-PI*L3YO#`0U
zx!_P!Iv{eq7f%7wFq86hy`^tDj{BOvv*Q)elg1Hoq{nX@K{lJj6lu_L|J7gq2R?lI
zNN;N9^O7uy>D!v~)3X4d^8#x}!|uG~`Sk@&-LhJ3#{zRlRfjoJta6M~+&)yi`?#U$
z1UI(_cKe1w1XWkl)T~wqKHaX_?<)oZo~L&MU2lofIBY2iI2RdfvN8`qM?El`q-YOi
zk@DfghRL*~J{*xavPg4zwj@#D`kwvnz~Q*(&5Ls;lL#w%bQ-#0UPNKWh^0Or_;71D
zwvOvpFZq|>Kk&^>&BNAU%s8(a_0eklH{^2&Q2`~xNQ0h8d5SEeX=<`OC1@-)UWKoF
zq$37rNVAmP;Yina#LDyeiwjO>DNPkHO0S+RxmZm3_U$`%s{^l}Uy>IY-+s5|n{RK~
z?K|9{aYGoVct4P)8fWTI)7e#68_cD75$rXWXH%9Znk<<xoz8jl=7MKe1!Wd9n-oM!
zF_|XJW+l6Q%{Sj{1I;ti=&^QHRUO`2PL~rVWsH;#Ij;T(;Mnv$tasF{!#YLN8tzwz
z(A%}}?aiM5|G$0DAO3j63yso}$z;N6v!d<|S(@{3f8=<qkxEfF9bIp5t|y8jvMiu!
zlv3kd_OaX$O7Cf!QP&M!cjU9ruE4c{TI``ZhHd(4y`^ef(p*twF-k@3>ONF_#_O<g
zfn;K>Lyz$#0QLX;^^d=bqJ+Nhxn7*%z2{ifVW8R$C<M5HSZX8^={>e>N0@vthj=`v
zr{~<<++wYvoKDD!golSaj#bUcBtuI@b*#90cFlA;4N(N=&^ls$_rUkxeNWr9h%pB6
zXb4tHv#mP@YnT@q&JXMk6`dVu2Rou}!<Mb<Lu??5;wLNdxNt=X!F*9No8@$UOOnKN
zeMgeSqp>=s?^~iMT&JY)2<gY1mOu(cn#ROQz<TgR)nu&2$nnn{ViZaT0)-gErBS4w
z6iiA=o<Dy^k_ei16WH##4*4f*I9)DqW+2N-HrqV}KPE{UAr*KbkxB=9iVVN+Zqra5
zJ2v|xcMm(-*3z^c9`RJANfSjJYpnHSk1xR60<|+h20fvcQ<ND4j~TOpC<=qtrm+}j
zKnR?TLYiJH&d--zpJzO~nvtb3W>9?hY0uXmw|w()!#AHQZZ`urH(T0npl%H~&&hO7
z)fv|No||>YZ@;<W*an_`uzGu<C>{g4o>+;IXbMpzNn%B;29y{`;;`v!NBvfB9ZhG#
zyvP`=10ft`nKF1!-PGtvQsxO|BAHH8qBvzzM!bA>#_3{4(;CiBPnnh(>s>`%cSLbU
zYdm#hY5R~f3tLw~7Av$Aco(+NT8H^&(>R=InU(`WE4I5emzO6DKHMZ$4=Xz7+1LA^
zv+F&-{@pFk3Hp9O3=X8EY5I^Y6d`rL+a0k3XdPpELDvUPl^PdAA!IwS-8S5<!nJ<2
z?y0H{YkH8w6VbIFotOeK(p$tB`pk%<FvH#MjyzIWAIY&ENfbwc17<@e>u@|G{J`_8
zOZvV>#hU%T8u8hX=925{6Kvmy?d7rK$(%XTUc;PtqzaEhV)Y;Y{MA>h^`6akN89uq
zyN<fE^nEDvMndB4Ks;{fVgWC&uMy+mu9!^tc=Nz|v*kyhz2ejDEjM@f%w`jkSaEm1
z;_7t9>Df7p<q{o5%;yWd3t!AX{^4utL(nBT7xE=Rk!4U)Qul^KT{A0lmh&l9(_q{{
z)pVdFv5pvAAW<F;HCkz=(-}#c249?UBU)g<n1*2pM208{-J>Lq0zHzzzG}Ljx(Zjr
z?e@U>q2;je@fbSOk!LY!o{U+ePykn2jXzxB%^&Ct;gsincnhhK6(vWMPaH*5)t31}
z^ZfFR`_&zb#hle@O_pX%CUZ8M9g|t8K}2yl>9u`;7dCBASriNdoJ=R&-X3T=$Fb??
zM<j3@C!wnrsZpU7hScNMdF=It?OYUvKevDUi-@pcZ5x9W0g$M)#0gJb8LDHTO&SXl
zc=_TP!i9u*)pq>)_wU%$o*ozURALx^Z_Q+q2NhLo>D!K~x73}ZZadr%g33~b7ot}B
z>BW#F5or{KudNoukwoK|7lDtjw50F5K%+Io7>xl(m|q#=IJ=mVWl_kWX~p&R6>YU=
zk{2iiZs>XW{G3^t()S%g2oA@JrgrE!2t=B$rku?Abics?NfZE&7v~YL-^@8bm%My6
z;pM9dmlru{BKiJZO_m9M^k&8&94}v9u-~olLgBn8Nm34NL(@AvlDdU=-|wkvgS7-d
zrX7%8j@|$h=A1)_6AX4>x2vft%VF1rO<~iH1YJ*O6vxWY96h^3i!lR9thv5Aqp6#x
z?Bn19pbx@^(2lHoB|}~>P*_|jp^xDpJLcr_I7W>Ru&_ad{cgkA#T22!@+8j^>|mJ9
z6K2x{{D83zFFa`+PR;*k1WC#er+SnltMgg()$QGeUENT(mSbyZOlZ?bQV|I;4g@1k
zXA_DvBF_`1vx3d8p`6e7_R}q^-2tTy<zzzB4P#NY<IA7?h~>$G)pkqMHe^|ecb?sP
zgEIlwsz+OgK(gMf=!^xSX}gXnNobA-E*B+Qil^hEiW9Op!FFA+M@NsFqVSgZvtRrf
zcQ?0q=g~@1P88EJ!&pn2CTI;^+Y!exS_dy)6h};^3*LRVCW;cuNlKFD91e9TLMJgE
zsH=*i$ipd4=uu!`8AfS^Aj}rDmJFk52rt14tg}Qq;CtS@ykdEpbEr0)%%_;H;dF7z
ze72<PdT#FSS#Nfnou8q!VzaK;Y#OSg32d)zP2V}vILA7}_SiFw4^6GZ8&)eh;$##$
zQV1afcV6p|B1X`4pd&?`gxMM%q9_T~859T@7=q-ov-F*yYr&yty&#o}&346dIU&tb
zyilyxD^8YE#L$yO2}P`!&q{=|6q!c&K3w;NqwWGs&<&%!LWG)-@Sw+xk|cz0W2H&P
zd0rYzvIw#?Jd~TZq3e6>FsAHAd}-U7z;$zuJc~FzpK&}?WLe7KIwBRZTJ72GYOozI
zu9n16Onq!vE|&cFzyA#%ZflGY{O0%Xu@2Vj9S^IHD4p`^I^)f&lFwgHI3DhJ^Xim~
zvkA@|Fnx`VVw};OOeHU0rg#(|Ki-nW5g%^0yt}#Q<YY-2D}Mj>1FNm#zyJLo=-Y5|
zi<AsKQ74fI=Cgw3a!QuQC@Hu+KOs%SNxJJ>j1@GkBg<pbI6=w?LFjF6*E>+5rEs<=
zk*=og4R|otP!t(iR&qQZ$D2baY+LJboh4Rb8|vIxlJ_G{$auQGqsRiX+qph`exewm
zA}&sH&K6UQt(Z)6lz=i%Fnz;|=jU9XXJiQo9g~fM7h`^4?JGt{<+6}p_14oGOPu5!
zO;7Izq!&mp$<k0=(BAUpk6!cY#Wi`6usC1xzkd4`rzQ8>11L=rSr%t!JgoMdoXq(0
zC!cXLFWK!I(kx**ow7JtvRQB0uGYN${T~p6r>>jP87FXq<YBd?>kWBP($o!$>4fu1
z0V4DU2O&eezzo4U9Y=u~qyn_g7{kNEil2V@Q@XAN9Fw^odszyl83*ohaMm@3w&|(s
zj{CbUb!`#SBV-^-l;s5Hz&cA37t~dcb0Oibv>Ht^0^|_N+dTHxhNoovBO^;l!TEf`
z>*uGWsb#mh!;gRFX;JXAFMrBzcVM;NaB*=(q&0opP&EyG3&&%F)=3!39xYAd*sPCa
zMH)7m-apA|L#NU`9qofHC;TASbxTuQl#FnLp_nA3sb(0$^<X-kVqH%Z2V{vy1wv`x
z6YG%ax?P9i{<6%OObT8+zhJ-Lvs&FDhL$28C{j)2Ob~N;i*y6H4yiyzNhli2n65Jj
zsfptl7wCt;58_@Ap+e&w9!ru4@<dUln#m-_^gV8T;}3|SkGCP#g4gter?(d08~VNr
zM(qUR)RDxYH#(b4C^F4wudcDZ=i~bozx<a!aDQ(>C+v?$tkgImNV1GLDcJ0G{P~wN
zUcE}WzL;@wI_K(a#`2^jO%xXw=Y0Bj!=L}+k|ZtpfB*J|-+Xh&paf^jDTlh{cI8Ra
zg6RZwHsf#q>+k7|Buit`L{Jt9vw4c}j;=Q#EMT#=CyEt^wq|#%D6^a|fAngECt9wr
zm-Jm5Mj`|f#4tebJW6_AKU<P$1CeGrn-Hgp{kCSmKRyLO!!1HE43=0$#6kuVh7U0i
z@5Apt3?3)JI76=B<+BSGvjRW#w0+I<^99ybym@^^T^}eX1xiY0^Mb4M39qg*k~rdz
zZ*SRdgGGw*il~CcIGpq@7tvSK$%Ht`I8=cZ{TRlZ6k#xYv7F)Ez_B`@CDeUOGMn)A
zci(Y(x@5IlBZQ&rS}xBQq<UadWK5?s+O|U=IlH*z=F=S?zyC;eIHI*CjU&3QMapp8
zKXx5e-HgT*Pj#$tUNS8*5CdJ?BcvqJ8tq;9y``q=42P~oh1K9_A2ui{X!{Nrn4iQL
z+mfb|D0-ZKg!F7(dz!{kP71PIvETKhDoK)NF>TkPq@ddOs3aPR5kXqv?7)CU3QZoX
zaJteVxH$|1)(in>OOPFSKVV##dqlBjvd9?*Lz*V^wuM1bWHYw=1Gno3CS^u%Ec?Bo
zt{R*bVVyn3E2I}sgoq@IpXL^UzZL#l>j>||;y{Q{zLp}v^l;eMBuPXZLz;$CZ5nB=
zFBY_QhxLv)if~?1RV{U8NMp^c3|mnhMMQc)sf@q-$KO#k6-nwjU1pTIAc;NC&QHkH
zKpHCs9BCSd3ddj>tmAAkC5{weNwlEIvp^{&bjY0dXbp1kOeUH<kz|P=PhpXV+2WyY
zgO#bb7#k>+N~&-|Z`;6J(~4LMrt<`?2Zq5iEpuE~@#=cce43J{ibxBZrlqcXgiNTa
z9e??Mea;s@K4UUV__yDD#3I-{?D+XFUT}SxQ6G=gb&u&gPR~w9+e^WEU7=*j;aKsH
z|8vF1+nNs_Dh>z1@7}KYaNFa2%pbpdz!`}bF>n94MoUO@MVd&;X-X7%@-pJ;Jm++o
zf(RMErZv>nKwZJ%(6Zg{Nn*{Uh=|p|`Eo{{CTw>VeP;s7yRUfte8%}j$*~E{_(RpQ
z*|hXs5O!!CJ#E4Lph9#e0<FT;v^CIlc9hM8&$W=ANNRd7v99CvqztFLBE?$6u{N}I
z$LYxwYdWm=RIS6Co{Q6*=NBmto0`rNwxWYX2|ePo3FDW)`Kup)Wf}NzyTbagI@C%M
z>k#vo44f@yoSiP1mMLF+@w<I>od5tJ07*naRAVdy%kwj`M6;NeSUWJEmCPmui}{o|
zk}MYsHk&nz`59T366u)V{`z;EEte!oLR}qkwtW%{v~5e0M7Z8ydy9~Ys%z-mV6$!7
z9wBt#X;~YN^F!b!^>)0DMd5Vw2<x}j5+z|!U6g?kT28ZYM;?NG$MhaID4M3jSx-5O
zuqGgS<2Ye|Y$+xMheL=d^v+;xaNa2yhy~7!9Ha4#^XR-|M7-LOj;XZ<>xh$--R{U?
zcL*K7$UWhrgW*_WTu+iGY&Q-2ZAG3>h@u#cLJ2{UBq$N08`e9Fa{=pYd*V2HdNTzs
zRItUwi9!k;PKZ{76QT;yiDD9?HRId}k_2=VaXj|ywhh}|%P?rt$AGMIO!ADj@9<Ld
z{^Ko!)8GwB;wf^8R)L=`BZVCtQI^m-i*XjI1+!UBl1qfI$>Tucm=r0oQY4WIxS7$~
zQ)Y^bWy$QMr0;9eND)a-SwuW+JN8viV;r6J7&EfR#v*;1YLpLZt2EJMg=Vps5XC_t
z8WQaVQRK){O%h8kFD^Lj4<t(P#gDHzznCIbO;#lQ;SX!tE?iY!y_{j1n(fZgH-^tX
zd&X{a<l$k*v2N*F!){mc@xJHwzU4pt`<JZOdsaKc_F#C}G~C^^tX4g5-)(sN{d;0v
zAZ0K`PbWqA{N@S5I+V~s%wPrvFRA;1&8B8DNlDWnBI&w@#mSr`)+9+BdXZ`1($D5o
zibS!PPw1`T-TPYx;*b}#Va^!G!B092fyU8weZbi`kMNS-Ge(E})3z{>OUA9dhd7ov
z40TsyoFNin))nTj9m|s`QVP1ZAx?DIux~c}<co8%GUMB~L2W06<k3_vr9@pX)K?$x
z4*?WsI+PA1$s$r@3H<o8=gejk-hKBSr)LYQuBLN_&341(=@N<O`}a4j9@hNXPe0@A
z?1Zw&7@Xtf%U9q$oAm}~49@fvc}CkdWJyXS6wX>UyOz4{*liD7pPv$`P@Z1z15~ew
zBt<djP&X7=$;Z1josi6noM{m;otBuc4FZVXQX9)412gN`RTvl6;?{L!`GArU_xF49
ze8Q)XhtS4%9j4c8)(y+k2?HK4WBRrmOPmo+)6m<2EJ=xFpcDukItn7m!5Op;EN{HT
z^!BNxjtDF!6-!>exMWhqRL6>{aYzhB5wWjZR@*IgU9&&#X}Xr(L(6{C(N-N=YKkHw
ziWHN{l*7IzO;ThW%Hh@yBdR&1(vu{ns*d4A#Xu5gRCP$nCvk#zf#08|k|dEVmj!7W
z1PIOxya*AHI8hX3hEkrvgo;Fxg>rD)1R^RPA^}a?Gc5!~8e_UJ6a93%rFAiAjU7)+
zQu|OgSDr<gaJrmux7vm`ybCAvJW&*59__R1k|Ix7uhv9bP^6kf2_7~(YAZ1|v>Te*
z()SjnVw6m=wqss|xnim_wug!+i!nHy^?dQ>jCbFE%XZguHV>%kS(%}=;{5WII8i*i
zyx`<?fg1!LZdWwzz~FkcYIyeSlKYznA`hQ^{({x|p3VM%9R!E%k@M4>FTQ-m-~Gb}
ziag=PRnEhzrRfHeNRdYg#+mRk%_UmLJZ$$|T+ApkjWLF<HApX*&!*&AjP;Jq{=l&c
zvpMfQpTB;M^k$@kBs6_PYYnUIo=Ki@dXjQ=en!<+SQB2TLPQ)6Eyv2yHsj2RFte5_
zELr^E>G~ca)M&d3c`Ii_a92rzmJ$g>D#VJcH(Xwolx0xPr;$X-n3H*cf;tPwW6kMe
zP8=z^rsK1hORg>ii<1d|{Q5ica?18-aLyy`K%9=V;j3l-Rn_(34ID>gaZD^jU+nqS
zB~o~@EThazvOMAar&}I2drmJdFs7wyYF@v3#dMORq~&yZMwXR)`f$sqPj_T#%67ZO
zTFYXwV87c_RTZm;2Q-R@hZRj{XqtvR&ynNW|Je4dwtJ>|j`NQ7A=qRG53RGTc3ZM2
zY|e(>p;d%dF~=?(HI>#dZWaRixDBDv%Pa2g_Gp<?Rfglf$2mt?l<fC=?5K6``+#WG
z>haVPBZOiQ4y^~0D8vJ1^DG>R8HjZph!FO1<x6-0@I&ERN`b^v*GGQ-^FQU`?w%}9
z$n%`-wx>E8OzTOKlEEw1_uFs{v;nAAReQA79QHeAlLF^@T5HC2^rKpB2stzF0?l;{
zgg&B)tqEJ7`8>nA7NtSRfv#&v)8vWp*mq$tZj1>Ga2<~4Q4D1n(bOGv-67QgIBai%
z_~LvtX*)q@C2ok&afHKShwxB~;}E4u(~RSOPirh*XtGREl$xeJkfsqy?D+iI36ojE
z&8G*H@S)t?R?JT3n8DK9Fqey>WL(1sgK^U~Xsvkp{1T<YdOs-P3_=B8;mJwN;v~lp
z3Z;8=6mkEs=TLX}0bag%&h~gfDn*v2C?U8wE%@`Fzv9j7Q~vnvAGx}`CXN(&3Sx-y
zR<K-@ESEV^l=9nu`z=5F+2<6Q#=C~Jm~d>nV7<u`kYPkIo8}}*Oq`@B>4+jRE`?&|
z(+N^|_J@i?-C&$Ust7L>%h{BhhZ~Hwcmab8y;*A<gSE_-6O>Std7yyow+HZ{WN(Zo
z&GP`)8%;&Q;vA$daTEupx(U8Vt@Ma`4ztC_t@z_VkA>&O$&^UKv@D2Y#lyn}ttC+`
zXuFP+*^H_>(seCEUvaufNg}~~UXT}-%d3dDzuVJxmJWd$=b37riLW|4JkbaQki?oI
zPne_$i{*^va>4oe8BwB{El>D#|3Ggo&!0V`sv9;Bw=7O(TwX4TqJ+Dfd(tGMs*Wt?
zb7r#{gS8wEM<S)4yk=EZhtAvJ$1hF*e6?*y)wGylV4B1@5p?2Nnv!V6w8+Slm{=+D
zEJgZ&2kD)s?pji%iKRpk27_@NG}y!7`R1EjcDtVKt___g6TTUJXU7MM4sSH2L53d$
zAthZK?6@kDltn@sg)(eWq#+5<K-Y#J*ffpNkqB4Z(R%WzMT=vNv5wAIw%ZNQFU~Q}
zvE4Pif4{+5O_olG;+(c0a3&Ofm5hQxg@A~WQjlhG=*x{>xj-BMAp?ggI1=Sk#Nm-t
zA*3KLGZxE|<)UO5EJ+dvVt|rpB^ca*=^b$#6X_T!qp{A^2MT7acvQG6B|^6BddkJ+
z6iJ8`G{&>rceK3&C5X}_$V`U;rDKlOxNK1phX|707<BAO(+KY!Z(d$;GLh_#?YMpy
zBzcU8Bz4=-^cG{sT3Bn)%2Q4>c^<wmeb-~GK?kxmN=Kx51mleM<+B;f#f0s)=Imn5
zZf|(|?ty*Xu{d3jM4DfJ{SEgI59Dda>0(Jy3O?N2bH6&0PfmFM{)R-y>>u_xQ}gqm
zzoDvjv`x+R#Tk=4#ruxqVMmrm+}v+DRu+Mvn1=ag97kkHOp?aLkqj>p5l$_xw<A3S
zdar5wjwFpScA#lH+Rn0=O_}8dZgA*WGntgcDq=b<sM{kEj(MqBE@tGBB96kyWWbXs
zPnrtKOox*ea-3m>Yhu?u%11&L?uY!L7~?t+!n5JQB^6IHm%3|EvF7x2K{+WnT^2|L
zhw4BSOT6v5zL@j;#f*88<DKF2SFgBzx8ZO8!*l-Riz|Nl>pPtDXcePgo)urYA=FKz
z5EyGhE+mdPJ3R@x3F|<(Q9%?w@WbF)&KKla!JAhvn3N?_dcOVkJ@3BzNR}kLcz(^N
zPoILB*Mt*Rq9eQ;=)0b}9?h|1CZ=urP^v`ITgQvbOVUJ=CNT<08VAjiARMQagh*?I
z4oYo5-l0$O0<A)-J(iMv*J7-tu3H8#Mj%-DJBTsw5mu<`X$HoaB~dEC{{}baPNaC!
zd>3UF;sY+6MnI6JDN>Gi`SFC;b#@$rM@SWR?NJ;v_+a|&dqa`USZ_kp{aDqkHe2?G
z3fp!hI->7eloBi#Cs=FPA8S^-9c^zJoWR*3<iWfjSzwH`i699XM$7Rqgp5-h$5h8X
zvq?^tM;OyHos?vGM3RI8x9JDk-ccR8@x$v_oR(x+LRB^Ny&;Mf^La{=L~Pa-hkb`c
z)7ycn?I|Zy5Fq2=)AN1^NFEa~F>xBuxyD+I4Y?;bIN~TqNl6mN2r;nPRlND^8FhEW
zdKbd8IwFeGz@GP(EXzq!!L*EjV4=wnYMho?ppy>Zg(b-%lE^cg=4`e#-@n_U<AQI#
zzoB=U&93HlwWDqfzx(=oT05YW=9}+6^3T8eJ-_;6#byt8>n&e=enF89<cZ|3|I;t1
zjvFq|Pk8<6nmiSpE~hlT;nSyz=dVhNvLud5-oFoR1SLb*^H3eok!Cb?lB6+N9CI?6
zk|xl1@bP{Vg2=G|uXtEB<FMS&n4U?g(RjS=m`)SCGek=9#pf5CF3M2t@`mfnbDXo}
zS;X~4L0%|+^w|Y%W7t;~XNMqtF?IwJ$T1W>2Bu{wJj-zdJq$y5S&CqaYP+5&PVs0C
zhnBjoI93f^)di5G7|4={tBVkxjiQ$4=T{_=X0>|Ha*^@o#he$H@Y`Q)7^KA84)v#>
zoqrX_5oQ?BPa!RZahAHS*gUK-#_|05B`;pQ;C#8{baBeb$&&qk$LZ-Q-+lYd*q77n
zwnq;8nk-GpvXt#+L(??0P0QuwCDq}`cDG}<+q2yqP$~*160LDA=<5X%p(Ka_+f_`8
z94`XfNsOJmM+JJCr0k9dw1`4LQo&#hRaY|*Vh@p2w9YUL0{LXIc}l2}B+2*y8^R3A
zSd2BKX&Qdr2b7{xiop$}$*7wjACQl4p+_~lwT`Z{G)+&_v_MGdCQ0CUgF{LeuD5>R
zKmXtVnP30wZ@IjF#(KR*iog`J&Xef~;|6pjxV|`NHY>5-L##1Y;0cL!Ap{~)VfN;O
zpwt)>)MDdN{t<-tIK<RiQRFGcRU~P|bTTsRqX3d?JBu}%t_yEkAtZUO!}mcbcDn<M
zWr_4~ICNN-v)gq~SA?n!rR9*#vJ8X{CO&-e=JOflB;&B#qm&}al3*_yELufm<8^T{
zpHekP;skW61M<fN@<J5FAO>_4WVMTvocS~jC#&9$r{wSee17$e-a6{8!n!V8TdiQV
zYiatF<I&KxJsyp93S$)?KCX%5l=JzL=NB*d*KfY#egpsZhlZQ`9ha9&c6aai>wo_<
z;#lzE!}q*;{S1j^zuC|<N1C=m#VNo1)g5m?b$s~Had%g9dwXPm47P9QAWB1ty6pnT
zd{U-V#}H~QCn*niTfE9Jwx=v7+}<2{|E|S3PgzXC8h-R_$}fKUjG}<k^OWn$IawOB
zy4_F~IkQQ^*>XnL)y!uTCTU6>$JABF-Tjfb->s;-Ag-<J<_GrJh@K9os-UZTdUy#D
z@I@-neg$C=-<yH^^?|Ain`WsKw(ADtTjEGE$#ahT9fyM<O+e#${_K*=s|isYh!@L~
z8UOKbzF=Bte)anu>Zfn!U)kOvMZm5IAJo^gB4a+E@$Y{A6PC+KSji6q>-C2FyL&dP
z2To7VIPSN!ZH;XWw;$IWc1Pa4evK50-~9S(A}M(D`ZKPsuKD`wKcJ%+9mgE&nn<f4
zW_4j`tF)%7s!$?LHPR2v7bhI+3Z*pD=_G7^gdEqN9_a<s$&`=x4_K$M#)LJhb0`sE
z>W1m0pfd*V6?!ZmKh<`;AB)Ux{NWBqUp<O5;zTnH4(mNpqM6K61{(~>Ng4<4dzKKz
zk}NBpa!i3Y4q8VfaY7V5;&}adeG9*C+MeJ2?hkk+Xb&|>8p5enRiVcRq*RJTNxt~W
zkNNid_kl>!cJzIKv>EHdLQ+fY;6Nx4Dm3Y>ANgAW|La`nI3irgSh)cy6iKSkkwjvd
zmJ@F7b{vk5&F(<g8InX(PBP-eqm>{{6Vfye885Bq%s^c=6lICl0u{ydW*{pvyzp2f
zNYWr4F~*Q);kvxvwPQhjKuRd`33qopswyPQwN@xCIlo?Tzuw|J)J@OeCDub)<QQk@
zOvt3ESW)IFN^07wBhd+QByfFCn#J62S2#RTk_No8)ZrBB1MSvWLW1A*Xf42XJbQUT
znZu|18~*v%TmJ3qHFfKWW5u6*`5f(AUOc~KyQx?o+OP>Tf}~jT&;R<Ca=s)>BJMX8
z|K;y)c=x`dYDZ*>wb)(}$BH-+B#EH!?fCiW8NA?Ox5v8hu$IcRI~sob^&Q*2K`Ket
z_e`f5fBo-1CrSmY?J*eEd&6dZAd-SV{n<;b?O4o$ou<e#(j?~X+qYDm<zd%wzp1%h
zH4H;If%m-&QeiouRX80#&aHm9L4XjC8^U1MaYJY>G{%Q)q*M&9XEuq+iijjrVJTw_
ztsQ6@&+h2?_Wg!K^}u4Pm=`m&5Qr${fBeHg@Grk!^UZsKx|+vdS!=OFc&cYvLYbyS
z(lg03Oka<1uGv_bu`Cu#CX)$GTl3-F4c~tEf#=uP#8JX_yTuJbtZF(>nuM#>&CN~V
znpYLpT9(TN!(f6AsSA<6VQ9&-gd$JJWO*{`qo8X&0>!>MV4S1tdZv>JN=TgTsrrFq
z-O~?_C=EeEIRyCq5U}uccEAyc5I;z%#8XwJYx}VxG(7!(<0Nch%!nM$(vTn1T0PMM
znx+l2w+5^Ut8^)Y@jwUy4Z#P4Fmf~}kG-v6f(g*N!8;<U(MVDq2e!Bf^4Y<|$J-my
zB>a7vwhhDn;gL<`u>2qq6@;U@>H86DBf@qF&{_~D;UP5)mcjaP^7D=|kC9S^>!}Y!
z)S}49(g-(nM6n=>;}NACm{j{+&wAZ3SUHj<lF$x7lBA&=>;{l>K<n@s>U&4qI1c-k
zEK`(4ijV>&Lv6;`&}l8ol)C!gT)oM&WmlHw_1n$q?zzqD{dpsoOCc%x%8W>|GO5g>
z3<{&HC<Y8*$dn-i28{JjFkr+0i~$p{G^+ua0fvDYNhOtCWJF|y8kgiQ?_YDf)9!}B
z+UGt+$-={>=g;5m&RKh{Z+*=cYn9MRd?0w0EMEEpNme1|b)e{)j+>i3ql0l6Sj}rz
ziv>z+-dtUgmnF`NB*ghhS>!?<b%D*g6~BL{2q8yl%eODz(z(djFFe2e)h*sfW~HUB
z3*K$7c<=I@tE<<1^L9@N8DGEH^7+^A`0|^#1fBExdd;tXeZyb;^%XZa5i$Re^lNcL
z5&!@99-UH_vYGQiQ<NEXRid?J+jK;&$gF0!7kSn&h`mrGvRSu${p<}d-|hJJ%CT=d
z&d!gS&uWeqhFPu{`wpcvCnv|$vr4iE1H8G~5LM2L7aO*Fafnb#Nr#GP|7LZSR2*{H
z3n^NOO;Xa+PX1WKFbexU-VuKl3aujBZQ%NPk5!5y%h+xkyz=zU@kjsQJ%0A%hs<ls
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
DQTQ90

literal 0
HcmV?d00001

diff --git a/mobile/android/app/src/main/res/drawable-nodpi/random_preview.png b/mobile/android/app/src/main/res/drawable-nodpi/random_preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..f94d1bbcd55126c21c2744745171898561d037af
GIT binary patch
literal 250040
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%0A8-7!XfQ0e
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%0DPDLAsUz+$&ctsd=<
z(q~jbttwMUXOR+uAVBK?5T1P?BtaM=Oz9y5NDz{DudVUb=dO`8=9q4*apCL<>h%G6
znIMH`cQV9SkNtAMBz1iE`FFU!IiYZMh$8Z2gCGC&le~R(k1WkNci(;NZQZVtBZ)wh
zCOL)8=^P6xsqhMtAbqJ7gn`Fn9cl~A+-znGcJ{r)|DI)Cv&B4XVjrIT%@(;*enRFQ
zy%h#O(H2+=Q(|&MUgRjLsn_cOWLeI1nxM3%(QbPZ`^+OjDq5{3rG=f{T}GMZ_SS%M
zz0dIz$C;!vyp}zrmg2A_OvV$kETb$9)6s;a`aAu>h)J68+0Q+Veh-)M@D%fXjrv2u
zZ5FnyorN!`$C}~9vcA*bS3A+;#5YVOf_kG?S$H{eQzDH*DT!18-FA~{W=Zp$TA<O5
zx|e;GhCm9+EI~=(ErU#fGkyx^;rs^SJgV4~{zevg$<?h9UwiF!){+TYX@2a1vveB~
z!<{MHiDGCXc6(zsHa57lxyJUikHS&Yf`9fapCb;zs~=cQQBV|)AdZmEqQb!24=IIo
z#>;#t?-!VsB?3tl3Y-qHLZelH0g_TPEg@>wD2+r&FAweIoP`fiuJT+o;vU+Lw+w?;
zr;d@{6qVk9p|b=!qR2c_xfa(T&r!w@+MIGXLr-#YBYErUO<sBBRZ3Ok#!jDxC|O=w
z=H|8QJn+;<xW2VbtJz?Ed!6a-4hTyY2-0bnV0n(hS>k$&@!p8nF5e{%6jNdrpT59%
z{^U90_9BxaXRPPgNi3iI<R@9*-ehxgo3u<x(v+-pj7CFF9hu|Nv!@9{$@<oSv#mBa
zu5U7&mOT6H+dTZC`;e}zFjt<UC4~fAf^h8hwpnb32wM;+jdLZnIAEGv;y_Yc=uk5g
zkMXh+FCydtltCC^D*0Sd4LOXFT)MNxv#;D>TxfdZ6k&3H>F0l%zxeC#^1{on5~;|8
zDRYYm0tQpVSHAfY!y=^9X|dIF+_<|(q-sp|dVKxc&r+m<bH|T!`&y4U@&PkYg2ZT=
z;S!A~LP(DX^4XH8FjsOvxM;242PrsAnJG(8i!sLR2e}W@Uq6i3N|J;q@~+WJD_rgk
zTZZEaaiBb4xYP33!7O7q8WCtOP8i2ElB{6RpWu{WetwyDXP(=)@ACGg%iO%X#oFc;
z8|zyfIevsEpL_y!$amBCXb(!eH(tBMrOUVXH|9_}j8Hf#DJoIy16yaM@Zo!KSOsQZ
z;7_u@<9lJhN}H^5If{dbA!${i`FpBE9gw<&uoioWyfdCbUaylEB}z%6P_tMMNtzK^
zCTRyD!?L6-4O&|iUd16)dLLtA%q&>>=AoW(sKSV6zyB6*T-o89Z(nCvZ*gsBh_#j{
z&Yt2+|KwNs-QRzn|Kqp+9hni_-rUAoSUTFlNl8&!YEq(vLI{s;R)Hj$OtE2&BuRMt
z)z>(4<^gnN-#z;Xyr`I`9eDnh=Vzs9iggyH0*rB_Sxzpeq-8;)T|<O_M}usEFDt?T
zZ5$0Fuv#$K>rt=Qstm+<bTyV<-|^M2|A5`m2oc6)sbDaivZP{i<>($eMtygeOP4M)
zx3bLTopqYA=ED!1XK|^+gZCZb%yNxWCr|KBe@d25aSGP@W6mwN*_-72XaDqH@P$u&
zlp`k;w|4f}+1g+<s<FAZO<b?BwKw4YbLY^igu;;~6F%|8)0|pb;Dr}n<i@QnP8~Z*
zEp9RyZgAx2+y`E|7LH>_7Rjt33?+9r@1n6he(nVKA8mOBjAWOO-M>seT;u$GPtcAI
z9^$er5F)|}@7^p6#Y`>Y(v1zi`_dg!qX}AFChHrlF3$7t1NZS8|Lgyb)|$on1@?Bw
zI22ohoUc9e4wJIM@#Cwk-@eOIP~#tbxWgM8b>gtb$DjT*fAnWxp{X@L_2Zwy^!FGg
zQ!+pjvc9#+eGgxt7R43pM-f&f-E1-MPd)d?@rM)#4nY~-dmMg`*)g3?{m(l5reE5M
zW9Oe&sTB+J^I%JoB%#;q5k(Pkt3ljsP~@d|L>H2{)*zGtDy;Ks|Kq==-%ETFQMF4l
z>wDMpi(Q0tY;LaeL9Grc6r<4uCFOorB!%^`vl%YTaZi>A2hH_aAU_<m_NSn;p7^1A
zvX7ugR7n1Vd!?nd)T4+rNoduZP&%BFl%>U#78MKP(xB@#@@$F=K`6sgvrgs;G$B%Y
zia?ngq@P?82=BUUD5=*%oD+mvBCKL<dzYQjlq40nru1qMR(k)jQlp}fM!iX_1UEOf
zd=s=HfC#0%9yZFOvMK2Ihd#)fk}$0EiI0Dbz1<N-k@^O`aX6=N6rdGxv*BSJN+Src
z#-W2c!|gts+q+0r!`YA`mrzQIyks=Vsn;T};9wkq3NWr9%X5$BHx8slD^2Dc+8Bfu
zSgi>KjE7U|-GD4f(Mr;6cNpXu#X$4y^KT$(F*Tu3afB!fer#otSSzH<IeT`I`Gv>5
zUVf*^-}{k^Xd#KCkSGcf&JdLaT9j<o8g%C8nT*C{I_72;K{mz70GCd9=t!LlOD+E3
z**Ce{%gIg7{TEJf?(}iyI(61JHVA@%5Q)O^^wW<s%_qG6+MB%f&YOJh=RQk2EXjI(
zwzqa!imdkpv?<H2kS~37$xoN^lKk?w2%P0qOLO)M_Yr7E90o+8AjtbPf{R|ntu&xi
zC3hX5bmVC=8eD2|MBKQu%X4qs#h8*-V~*$F+Mp#B$Cu{$;dh>4zOjOiE%U7o$3Olw
zZ(km8?fNAqiD8mzu3WuC6iObtxWtielN;Z-&dnXe=GGRU|J0}X_6wK!(a(R3`&tVa
z5wp0w%6OR43>~tt)TM9qo3dnD6!!$A8DB66f_+-dVS9F^)c(I`C7^F!OV0_kj<R}B
zEj<apC<-48%M$Rq>_ydJACIThLQNdk5H(3wlw?VzG!aDTxIu3?;o9~F)1*X6O|Lhh
zG_qo^R9*tgffFRtgtfIb-!row9^$0j&#<JFG&^;+c7_L&@t|5)vkugLMy0AO$syfA
z;F>ky4`aiac_})Ja)Pw<O?T@ALRMP%ROeH14Ru=;fWat<OL~OXG4C=o1=BJkN~WAX
zw#w$tkon~<N4qr&V>tKd6a4Ylzekc9v{YWCuY$K3TYAX75l9Px@Y#lx;EeZ&3v^In
zk{q!Vo@lLg)rj?JH|pLLRR)?+hB#X=8js2B6deR~=jXlLtWqc$R_qwhi^B<oR9@iT
zlsIci@{FWXKJ+E8q$mrrvZOa0k>v$idI7Uh-}2_AHU7h2y}*34Nw2@lu_G(!DjV1x
z4EdQ~`Yg>>!}Bh!Wn3DfPKPpTlFfI~SwWdwrnYKiE3b#{R*sUQc<AF#BBKZ)Aq+!;
zC?wPhV@f36Y1kCYOs7+_Bqa(%gi<7#Wjx79GsApM(5{Cx8!=~&E#Z<36?%7;)zwwf
ztY9xK_}be$1j=!Au|rTx=rn6wy}QHBn|D|_vVg$SY}S}-I^MqYCjZlKyw3LCm`1b1
z_nv!^Z$D%C*e4$5{tHJ*huf&dE>;ILTXlZ%?|%`(2&q+t-dDIh#TH&BMgrKW*Pn7Z
zm5=ZK&YNZ_qe;%VuCYR+axj_W_WB;*f9Wa~MY}eSQIf}xYM%bokMgx2yu-1x=jac<
z#)6LMbUHK|bKF?lMF8hdpW^DRHI6RMaq-*<R=Rb9IA-CMDVw_!Ha2@a_UI|5$?M(>
z6^967taFs5VP$0wAsmfn?LZyV9H<k#7x(l*qyNLD;VcU=#!wWV8m5%mH*rX+3`^^(
zCnW?ykP`+0S)LPD&j%7FNm4l-1vnM4x!Yr_*JF|t6lEoSq%}n{_4F$9!C=qBGC22g
zV-K>Pxw$!T>+gSYc8wgevZ=1!%t}P=g)@B6F}pYAAziH5VW~9K0KK%k&U|-{daKS}
zzvr<K-3CS}%K17EKk*o^eCPW_(=n2g<BvVa+{sl`r^Q1@7J2#lO~OEt7Q$<;mKKG?
zx&kMh*R*!RH&}%LN=gHHnqy4K#na0iJGMX|74w}oR!CH(N#x`VGEjj6g<_g!v>E|(
ztp*KU+lTsFYyHnlKT<acl+Yjopafg-ynxaGR^zm1nCmbgndbNysR^T)q9~D0P^2EP
zmZXj?lQP)LFlOj?N#{R~%kQl5;A8jEpGFLOea5FxLaoKS8$0A_&ceb1t)oYX<Jj9I
zNkLu|)Kowu9nFO~5CUTzQdZ|Ay(@K5CX5DCHaEBE@9y!#=U?RNtqq=d;wkRz-sSlp
zUSU|kfB(;Zm1J+7GY>w>lc$feduNRsx9(76hKu(<Ko|<P*0xbVktbwXLKI7`Y~Mn<
zfKw-0hybLj)9f^8w7U$(IlW0jnHb7)io$Yiq07b7M_9kU$MKImg3TP(O0VOu3?dG}
zg=EQ?-K{&=(veTc*uoNo5#4T=X5{&g9<QUZ#*n5N*<?bq(V(-`#i$mOQNeEF=qF=p
z^)4lnL4SvZTAg3{=}*yJUgQs+i}|hJ{$oD!#3KwwyU3u<i!Z;;Km4yg#cJaSQ4sKv
z53LYI5oO^;8MO>4ivk-e-(MA$IEpc)MMy`Z7Gss~d1kr8xPmjsmJu$8Dj3bcptED<
zay)}A%!062ClDk_N)$!=h;yYBSeQ)4I1Ht=G@C8j&5%47OeYhjX+opbB8p=QV-U`>
z5`t69$f6{uHCf-<W3xAAnv1Fx<I7K}W}CF3UT+YDA!U{W(o@xyLAXk9-X8RrEbRL`
zc(5m)%^=18^X{E@sx>}?JYc}8djO+{OWwnc_Zdw`I3I{+Uu}g&v(Dg$b>5_P{~d)u
zcjx@1Z!{XwY_-@K^myaekaK6|nd>%LzjcSx7taxO8XW)7!^GW%s>~HU_Q|JNyR$~G
zoFEj;FRZY6dlP3fKe8=-4{R2_??DAf-&h+CMm%@rCQ3@4K6C7Ejlw?ay8TAoVIepv
z{^s91d^qLPOS#_w1Y4FEXKA;+Cbc#8V4Pds^wN6A>avn!aq2*1|Ji3=qqDe#awT;Y
zbMnXuPoHp}X%A2od3D*Evb0Pm1>4g;y}ce+Zrx$jA9ME9DsR5|78_eTEG;eZ#1kLp
z+3!BXXqX_PfR&|XN-J4eUSe;zM_@uebnyardPDy5o6itNn!kME9VXKprzEbl?B2P?
zAO1hT3qn&E%eX8^vw}3Skdz1_YD&|sMJ#q2EVN@U7i7k0QzAPVl!ic9v?w@#CMMXv
z!mZmGx3}&m8K(61#terETU&iLcN45FnXA<}ergGeAQmM*^6@iRrx+$v4ip4t%Cvrx
z9K{i%!GP`CQ}!l~>8NC{-}l;1r&d8alw9J}(FFpfi0XCPttOkhDPb5PsPx;UquZUQ
zp@nyssch7;EMqVj5JYv)kFB)Mj4}JzF@Vx|@jM|VJN-V#xQ{4QM6u7jMAc+}Z$IXq
ziJ0}-LRpk#Y4zDx<zSko`%){;NP2q{Hg2tR_wHSWlPN_Z_`(-I!s>}tk|bd;OnoC>
zhZL&D*PnZXRuofUDGG@bs?w*rHz>>k#(RUShoA6)$ehCxI5Y6)f!vD^91@Vu5U7KU
z%sA;4LEnRL{~Oog?EGeH*v*te{`TM1S(c$x#As@`yK$4po_d7OJ=CDqtg(FZB(=qP
zq>|KIb0B2Z+3;7pa%`2K`A5G@_s{;4g-0L8)K~faU;hoPm6W#hSrUG7W~#=cL!yI#
znX!Ci6{S^JE2}A+*SdD1`tWC?U_|BKW5DUkl<DB6BE^2RubN)|cdM^X2=94TdJQ2>
zB`;zP0>v;%xOI2SyI%`0{lScO<6QLsR(v&PlMQdfU8I&j|D$j4lRxznj0PhnNzP!H
z&}`OmCgZI)FSE1L=i^U5&dr-Qc>Rrc*y~OB{7-zA-HlDQws)9h8LP`(jx5Y`W_6X)
zmE3&iO&&XcoKCAlk(cy#cjzv!vN*rUr5o#f^X1FzO;S{=#jVW=K`msO<VYN0sA<$g
zLQxU~Anla4wnPo6MH-Ey8Cv2nLc0=a4Z`&h)?jUpc9JMm#7)JC<EtE9S>*Wfqcoaz
z2IG{dwa2BmZqROZnVV~K?DTznwArN5j7iFz{%}HXFeMcYZe82pnOmB9-RDF%@*{I`
zut18U^st7g&hE}0EA=^=^(GD7U}b5JvMlIy+DMlmrK3m-4{@$GJ!2d}82XJ%S|o<7
zEXhrdb*2J8dhxk9j!DuCNreP=02Zxf1%jM?%VW3(<HQe?q#%p}l$4c1g+mEJSs0uF
z9q4M&c{P(fFTL=cvoxDc(lli}9(%-m6k<xtbTsAP|IQyUP5eSVc4UEGFQ+%0G8%dK
zKo~c?LV}c7A$a5R6|~kY%_+jrPgQMM;yCaSJ)GUmz@1^B5gs(>OSdYMafhtx-aFNs
zeUFN5BKI>cAM7N)DsX^SUMBg_9`9G;dr<KQncM9B4?%<Mp{%r8zBBmH>|ONH#~)_>
z<{B%fmU#H&)0}wZL1Yj>SVO4*QN6)|-F)RX;^+G;EG+TGU-?B|dG$43`r2Qhguii~
zY+6!Se@3H;KuTT72y0)q6$K|(j-s#KoJmPlXDJWPa+XBxgU!5j#q7rH$0S(=M<J^F
zIRh}xZnC5(N=)fR#Y<yIGjLhS?Yq0Y{Kgd?xc_mIBtzjaWr>y&>HM{q*7Kck0#iXX
zjIotViD5J?_>({VG8fLB<p<Bd$X<WS<4=5;#fBoJ;K+QFD{s9{q$Qtz{6XsV2Bj^j
z&qaLV?1yN!T5N4@(44E$2m_oE$j%Z`ATW7?j04h@c{ckKzVp2oxUo6J<`!Wco9o-$
z8kKzE^N&-@dMrdxR}NuQ((%;OC5-XRfk4ox)v4E;)Z&mZ2ngbUTBA;*QK!*}X|`*$
z+cj#jrWS^tho(G>KuASUuW{y~6ZFfN!7$<I>GOQ=`Pb?9E|X1$?CnjM7LLqH^xO(B
zzWg$+Mw5T}4?hapOBFdgqpM6APjZ|w+_<&DQ;(k`O{ZSGtu)kv7!e4(M`_ixRlz<F
z)NgPC9fX)lYS$XWU^Jv#FNxxi(s<_|9MtP|jF4#Ur(C}Lu>@g2QBAi)U8}ZaM_zi#
zp@vfI^?P)h(#z>sNjlBQ^Nc~S&v;yNcVnHWKk+Ew{W8Na!Wd67_JC1MSsKzb0VkPE
z6OOGcaciy5I4dcN1cRUyf~{eSTkn(PhODR*J)D=B5rNO{6qT6<K1h1g)_bRs9!3$M
zl|re5>6@!IV!xCR@Lz`mjdQMYR2L|zs{WFX0YQZ~vv^95az0aLw*EdKQ<{BmztnV|
zAbmK|;?N{<c1VGjn6VDsTs_LiKlT*0T8N07ewwBgqVze?Y_T&dxelw6RhJ*Ch^IdO
z5$e_u#gZR9`?{y_82^Chh2i#Yfo0a%lPKkN-&@T#>Rzez4?Mj7(%~PPwQ(zR1Sj!Y
zC-)xq(2baB6<K4*l7eTSeVtcdc#}8Yy2joxV`pc_?=nd0K}e_3^628cU~e>KHEJS+
zSJSlCFdiqBH=L<@6Y%QmZ}H^Cvz%W&0z$BHYmJMmO9Zy0EF8^R45C0vhgA`}8>52|
zB`w{fOGrP@CJ=KJ&R~R}w&ZES+gERK>DCUJan!>)LKrfaBjtcID_x@gCJ)Yok_IFM
zL5XhrzR~>r0*gl$nO|9;-abh@w~7txSS66MPH!+_qc>q^XUMxdYfLZS;;|!+BP$K+
z^*W*Q%9GAHzVfvf_{Qx9Z@zn%PN&KL{4XEnCw}(l5ygZ*{Qv%vm)?DW>$f&p-|6wi
zpZz&h&?1T(Os5HX7T|K9ZCICcboB^Hwu{4YY;~1(yNwWImX{XU*&OeeQDs?r{e9TS
zJ?%dY)$TQ!OmT~T@G%^WP|c9ZWI|`Ii*t_g(5oLfTQHpt(cR;|xo%3rFse$^2t-Bk
z629@Cr72M-CM&|qa$fOo|Ml;&ac7LRaO~JJn|o7+$&?EhPZGy5^+sbqfLL3SrYWT<
zh~t=0#}v7Dn;s6v9?32QNom;Xk15eyy|ad?#b_Pjq{3OTZ{g+Lf`xzPD;mt~vw1J9
zz$53q(nwLbDgby%DPt6_GPpP#RQ9v03gPRFtK_MbUuuV9fDqo)c(y72O<cqGtxI=M
z5B*&ZeeBT>BLc}_bAy}DeTP%0@1uL>oR`e4o`ri(pn6JNRj$pzk|H-e_|!)T8!gP<
z9^Zfa7O_;MdBK!`TI_KoI8C0V9t&j+krKFEk`6`;cKg-e(+C_vrA8PC3D%&cAukQF
z$sq_a%JZeJUcHHRe!|$DYm*fzz1@`FFyY0Q-eq;MjnI<au_JJBq~2gJ8-tAa%C}zQ
z%8fO8JAJ<V*Waeda`H4G%}dI>WUduq^OQTABl1EMDNC)iIDC2GoFh#OBmqV^j@27{
zWT^vbg0+^#BMVik9a885B_OkYJT7AhY8{_>Vu^J?Zc30bqpYN#T3)y@<lXgcUVi%;
zpE+J<z7;SSJEV*P@Y0q503ZNKL_t&#y2L2S)V8>Ic8Op3<T*~BUqNd>W!1_XO6>I=
zZ%sSg%_9cy7X0|<pXR04-z3g%kmr5~a%+8?js67PS?25C`942#VTluskc;Q%xPJXQ
z8ylO{>NOsD^dX#8NF7n@G(jnf(kqrua?7v%=KsbxDY4#dg7x(^vNT~kPq?!+&$(_J
z9fssqVu^Y4o!e*~QVK^L6x_MJ&M2C&GlqK9z&L>riaU3<SzTV>&fS}|<~r1x4f1qa
zWy>WffmRBESHc{RO5#?Ra$xpJ%*I;A(+T5ANlQycqaBXaV7hjlqjm^)#$5dLS#~yW
zGuNq8j}>?CY@oFTLR74=S;1y+Orzc<V@hT$lktcoEy(i%B|_SrHpUd>S+d^%Z?#$!
zc|kHx5K<5XF+mWsQ>N@BCF3+_kV^`ou%e)}KA4~!rYMm@Bc&$LH7~Y^+voEE_moky
zK%$hl;xg8tLj^kY6gS}+!&dviXYGNlJXMcwW~&7rQ>cT0!rJ}JNO($s=XC-y@Spd7
zW>z)Us|dIM-Z)>KDCa|ob;k2{t-@8hdH1}>q4yL5^sU!kr+@t#6dBD{8!i76sm|YW
zDB%3Xi$u;cO1{eV%>h#7tXJdLvMfpSguH5k22wE|3^CgUA6}lLJt-ON^^wVl6Y~wG
ziQ{7rJiyJ(b-JyXT39F6f}^ow?am$IIHa_eTC+=*TfY0(&+*tJAHqmWZ+Ao>n_PYE
z7F;-i!EyQa4ryYTObSdP==Cyw_Yb~CX$p)LoB#<y_P)PxmR8FvFd8Q)i-LB&Q#tHN
z*4EZIxw=s8NC(EV)_Ar(ra;sjN=Ss3_t-A&yYebYk|_S_+JNmOXPm9^Gf&^og$t(`
zZtrq=ZNSal3BB=@@4vgj)p5?o)&^zf_!mF>6sNjPe)#$&h8gURGDfLK%>V4?KgQ8!
z#@t*7Aq>VDgf)ya!~gk*&+xW5O>dkN)?z;SnV;n8r=B9u`uwY3|2Mq#&NVjo1{B8e
zr7!(5=_n!BO>XS=ICAwW3kwSzOotrKSY(wUOXCe0aK3bqK#9c}P+HNR>#(`AO;MEG
zTJQ0?>(L0jnB48_cbV(Vp#o4sqBIyQC^Cz&0wp8TG)GFwbTZ}E&4MVdv%523!3DhZ
z&Ram2I1Hf3m~Yi_=^m>KHKwB>Z@e~U&>MIY2jv}if-pn?pLt-FKuhAM&eLkwX*V>@
zPJ{UmU%-sVoH39jkQ5UXAy=;5;>7s}xV5{>?e!jacZN)J1J*-h8c~RIzI?RSptQ#e
zdd^|)p$t}FlqShadb@i}CIxr;V~mjpdiKIkExm2lA?+xH*Nr=rG|U3kVOYg~vQ&A`
zA@HTv?6=HJa=CJRpB?X`+`K0}vc~g~57Ud@dn$*sw^`}us9H`^-vb)`o0{)>^Nm+&
zw%Rlo=CPICxD(PBgH^-ry@#8nbF=1|kT@j5dijqN4_)MEHT>Zpe3N%>t$~BwSV||k
zyS2mR%Qv{YSz>dEa0Xpka-(_k#x{>_r<^!_nz`m2jckMSXO58<84I0&uFh%14f=Z%
zb_bSpV?@2Pz^kuZ2PL@w`~|Mx9Pz-D=P;_ngNvt_rU~o)F>hYE!Mk^MY1KM3Yl3UZ
zZA6ttDiNZEpf{LMT7$6#wk)}D;t1BH6hJ5)-Gw&BItJsMEX}KaiS;U*QdMRFfk(|t
zze9=&=i-FK;w`Oy>&xHe`oaZ%_{JLuA-MR^X+HInzrZuU|L^&ouY8%kyurD1NBQel
zuW<f>^Ar|JWl+{plkk}*9;7TwUc7vVjbTcpBXm7P2M(cpsVqthLVN5}5R#{UOe`!o
zEighbObh<qfA}-<>LIJu8jQ0P6)AKSabk6a3+KB4G#WMDy?g~}ysaBDAP6FA?Z{7v
zoFz#{NbUO_rg|V3j;^w>dYoIgZZRCLbM~oIB*P)2(TLA|<_R`;dS3Ldv`kZjL=kJx
zy2$a_bzvOiBqP*@oqkG^X6*G7oU7B^y~2}SMKis@11DnIv1946Gpx)-%+0lFKX?i$
z{i2+tDOpxvtmg|(vy#zx!shlauf3D7wY5v_t8a4Z{3@qUEmNPHBM21FKmQ7I&47_v
zBR2|zhERExlThJ|Mu`ILETu`%Dj>@ej8>omj8F_FIXlCQNixBd_|HN}oYE9YrTQCK
zlGLHJz?6WK`<aEc23KX~K^XV|A<KPt^`a=MvT#-r9f<8A1X{;cfbe0;_j?tk^=|Hk
z^Aa-m1d7=J&w8CJFMKx}FTUSrQA)l4+Tq6fely+gY6r@r{<pjYyPfI7&pZnKYu4EP
z*PIpT#ib<*V;E1T9=Q1d6oS9&A(5Oqdp~CG4aV2kFiun23?(I}jvwXN(gM5NJB&*~
zO*QB&%`+~hxM{}!^}qZs-+$v8-EM=2PR^t1HJr7aT3TVb7P8QGyy`YtUg~n~(k+NI
zTXzTK7Jlj<|F`^`fAnAT{H;EDGQm2-h5OI**1PW_gNVKUgey0P%r7iZ7)>a>lt*DQ
z!Z76IiQ`<pd>LC9x}6RbhWSpH&F$^|YpcZ(VJHZ-Mxij)lBZr2aC2wM(I6&}-dICv
zg((W3)=EFw6t;Zd{R*|GeAHS^M5qAm<$J28@NAGUdx-YIiPdDtI_vGL<YBw@N(B>z
z5Q-oOiEx#@)Xc5s-a|-1x7(#OhN8$(I^KWHSxXRv{`ruC)#JxlJbH>K@^UfYvzIuI
z(5X-RrIa+Hm~VdT+oV~>iIbWj(3nbBN(ix!rUp;x8fOW*7;*La*BFly+TA9d?i};o
zIgYI?c<4!(0#K#}Kl1oeC1j_NDnyEio!wp5wg+5$=O#NnFGSbtkFW}qP-t1lb0@sg
zhu4)a$n%uq(k)*7&i7gBw#X!?FlK55QM5?28onSUg|#Rx2|`I(CX}W?YfC;Uyi!D1
zXK#|QJJ@BCWWHzPs>!m$qtYcP>D`5>fY(|pUm{i6#{onEDhMSr<BY>O$ZWa?2hfCl
zBDN50Z|{EaT9wk%UmQL^KAZ&!AMoU?G0yw*w*x|VMZr1rLx;1e*?G)f-_OLv`;}Su
z-?KWuS{zd39s#d+_j)wuI!q@CNm_9FVc}H(_is=&FPYV|9MqWAb5{M&&i)!WfvUya
zzH@_Cr$gTq4EMGfjVB~U6JZsPUcAT;-`&DlMQ<?Xv7_^(^)?Sb`4q#bfyS|N-%*Bp
zLv#?)ZPl4(DdX*e8#|Ui`onLLr&Ge(O*XfuOsyh}E&us{`OEz2SH6WoaP#(Uo_p;Y
z&G`<UdJ`pUtSnfNhE^>gFD;MUf0{cxyA-CR+pbgQ1w~n4on>u(n`Uj9eU}m(N_w{x
z538^^V<?T+_L*<jX?JQ61k7AiT(#S2>50=qDU=NSgHcUOw9>v2D1Ek4mKIb1QZOEm
z5CUpZ0LpVAjj<>lc<hjr2xPT;scQT37$WDKS4>3_#4(A@SX^1A-`|5gB2AMD)=>pF
z2SO`8|Ao)<z+w%hyaNqFpn?EXcxT_jI`S;z)i++|qfdU+GYO<3PywC<?fW27N@`Jv
zaHV(jaS|<qgGGhku!WwHXaz-9B3qI#ed)7E5qNk)QIaGn+j}E!uHRuYDVa{EOfy4K
zTFMfNq9jRj@@Yz58uFqf&r`D8P?TOw(i-E38WKV&k;3|bAq7F;SUtAF`IDz<H)1A}
zK5yL}vNy=7&n?sMk6BpM7+YW}C`E1^W}4BghaduSCs^xEF<U!~lbq66N@Mm-U8E2m
z7Ia|chzdhwQus_=;7Qib8(4Ts%07M^QGG9tBFwDGUENEG0P85rVjuTtO%8Y;f#WBS
z^XBW9JbxB}lmTHFc{5iX(C?4@P)h54&%`Ly1X3fg4EF|f=Q`E;_S0!&4Nm!T)si6v
zNK-Y`wM5J`v+zODI#a2Pvd<JSb_T!j&?Xs#`_p$FNg54Ht(KxyWu)qaM|#gK%p>~~
z-+Y_N0PaVmzo9NZ+)S%dLGX*&T1!40Gn(YAZzq&kCew^R|MIu#^%L5)hSv{w4wWPf
z(ww#1J8Vq9Pq$IysSiKQYp=b=$zuzgXeds113FQSot-h4)DEro0_%ezLRt2vQ^uv@
z_NANLyt9D}B*vD6L5M9z6iL9XogQb-9w$f&vfR5m2SLEe<0~XZ&fcI$BMb?YpU6ld
z87ET;E0H=NN1~0Qw4f@yiNH~mj>3zIA)J?3+0TdEOeUlf?Ux7H(AL&gW$Wc{ox>sA
ztP6Ai?WomaY<~|Oc^xAk2*siF{ty<;dG!b{xai-ytWeb_PMlzEdk>{G-T66Mkph_$
zh7vOq0j<W^-~ProdGuF)w6ekS=aeQX^WFIh`{Wr2MUfq%V)$J+OAE51#8J7&I6rLB
zS`o#OcQX>z^D*P(Nv~ffkgN|TxT56${j+CSU*9Ir3|X3!W!{<#=WwQ)USV*qvM960
zUwf6oXeF!OjL$+NDZHqjQncq6h-x8o&6tzNk8|?WDbAidjSe*H8#`QGAMvf1zKs?E
zIR$x^6BHS_DXWHeB|)P!xiL&FBxT8@G~C`A5U;NI^QyM^Subb?m6)w2Z+)h)Hoteh
z30Yl}y=U@W7UjO0Ls<o@S!3E%&1{t4ygXdNOO_jF2x~D*M^^x^Flx$@D2$k9331&k
zjtVU)jG;81ZdVkBP<w5zS}kTU>>Ywg_)QaGiQ^C{n`CK9l8ostEFeWyK8gd$m|4c?
z&+Q;{oMn-tBw>)Ggkek&1b(ARy>xS{Ima|f(2Z7`Fs?yf5=Dg%So=3=mfsx&qYsE$
z@BepIrkG@koQ+ad$o1>D8SYJyW~Mitl4dEZM^<RpTO8Gf?m~m-UwNB_cEtAD1|Pbw
z%c(}mYikJ$q2o?(idC>T7+`@k%P=+}of`g!|L)f)CA69i=Gt9!plLS);+jTl$#B$X
zFq{xX4WyE2CCIXzqf0BSEG}{F+BHs|IKjgF0_$5_wC38}+1w$JaBaQM(YcsTr|y*x
zB{(N3U1gkU9kQCN%&PYpE^O8tkV01DWaD{)QXKM-69-=o^$s0=H=0duWW|{G1k)K7
zP27X6nK>qxMaj<g&i;7&&%gX-zVL<5<0@r}*>qYUsMK_^I2v)x?Hd~$z0k!PA8eY<
z7D<w0jUkRB0u>;Y+~;S`PJ5afveaP3L12<dbfAf&$Zt|oQmZ$-bCDAyX@-!VJNeeN
z+i-jl?WSlMli37s)FH?w6F=OL6*dS@@d-nX)PZL^sLH%l`@o-$CzPclD;=e3V3nqO
z<}9E3*y9}SwpqV>ms=a_JoD0vjK&F<?oRltmp9NFe*BST+6_f-Z;z)RKFeq_M5;Pr
z;EhL12h-AF^OC&qax0_Mcn$w56G0p_sAt;$hl(F&8g2*Z8}G(Ub<ILZ%5vrt>H*mP
z{UIw0aNg}IEpl%GW)7P5RKp*wH7d|JCE45SvlIqw@9fa-bSR3_OE78a{Xr{Eqf(kO
z%h}!Dq+W|i##27@*u`pd^kyyATH2kq=OUsQkB79{b3SNVyMMhL27=-<`Pme5Hl1`h
ztQ3Ux8p3$0Q<5f7J^y*0V@iX*|0jPOn<m`3e1+XDkMxcYua+uzo&9lRz2Ci@)tzpJ
zj}p}w(;G;tD8fmJaV4eyBoIN9LJWvQO=dl@x6~oqh2iOor#RA?^56q2Jo)jD^22AI
z=l*lc#Bq)LE}mh1XH2ISFrvwDxXb$9F8%E-ln6+3N0Mcvr6kV_N-NQEol+_0kDVsB
zf@W!GG#bnwt9#;USuh$8c<btIrjwK`n~)U+#`q7znaXijD@M~PMd?M|jx86&p{BH8
zOhJL6u>QfRDM^yM$~8pn>nDN#U}nKbN&&V&3X7JrhgEo?K)~8^e-v-2CMQPko16+k
zC8g{8Q&<PaU?Z<iX%TF$ZR2q4><me>f?5=T%b1Ktz9B9oPF60yv(-|SDLT}wZSEl-
zm`6ze;0Iw$tJB0u4>Xj*;*2Ftr=IudthZNpu(CMEW^dp<Eh}5JzzG^rNFhL|2p0<O
zZ0s<YBwW9{fl~oO8H!vYDF_1Jd~G*Ea^)yONg0I*o0FFXsE`vEE>f>I(NT@+?jm$Z
zX$?s><+aNLp1b-wM#l^c><xAav}AS1@!$OVzhdi$&oIBV%v*OenhQ1F-nhg&YddHK
z0>dybsK*hh@z^|5czA%b;FKn}2Bde15mKV818e+-HLG{+Ou=9V7pP2UtHv~hUKGGq
zhN05q%ZkElwt38%AWc)IS%Od@gYgt8{U9XL0V)WXj>pvNb%fHS<1tB^v9z>|!R-rN
z>L8{xlDq_z@|mJm9(<~N1}B79ge^)hK@-$!6t<*rC2>8V-fZ|50SZ?dWZ=)ySVIs8
z`?v}zeB!e&WUwEQt4vFZS#IMs=cM<0G?jX)chm_mCdV2O+E3zjAVX{|;LM|sbLR2K
zAv@f-eg9D!<M~>D3wO_BFnmBW2xRd8v-V!GmSyLi-*1JTPP+Nltz2DQU7e}}yBWkN
zisDGLL=8q040|+&Ex-?g;RpM{fQ@<fn;#8hVA$}3!;A-#At-nxN*szKwkVQPH$!(d
ztGe<Hb#pjrrxpCL_CEJki<+?kZ=kz6oO{l>JACU~|L-4Sym5SVe}hh3Vw|8j7*P~C
zJKKB6Va^ZV`vISQX@$G4WOIB#f1sJ~_aIU%tS;lC1tyazhdb+Z(}a!V9HJG9yr#rZ
zrwOh$L}|vvM~rtyVJ~dQ6tx3ynyMaP9Vr4~PAL_%gbfZ5iNKB*qR~J)=<1llI-c$w
zQCwR@N*RcND2|TD<W<FZYVgL<l>-m~I92|XxY}ZV#)fHKuh(IGSYyP`9&$(#bdGi7
z5O7Kb{@81zXjazKRl2P`Qc7;zc!58C?=NX>dZ*Lr-*}(X_WX41zjFC9MOA~1AW{ew
zQCAS@K+@DYBJ0M~w&37kpNkikiIbR1%RPSii=QALS3G?3nB(`q$7^dn9&B!4iipik
z&9s=1=!~PoAy#O7^Uw<Eh;;Z2g%8s(Wr^a9s;b%AGu+<s<VKNKjw^1+fAH1o9Pe-A
z3|I$cWhkqXNmcVN|MiDBWf^1<Drq{DW-DuC!t&MU_@Dmg|Biq5dq3o#{?^~;@y>)N
zd&ji9ikgsN5HQUK!xgRlvpR)D&Ky-09{N^h<~a3x@{N2<G+nVZhVk$u<nT#}_XZV(
zYgwBbDb*|vt+iIpi112dOi&->dC7EI1lI-`u&<=kA?tRVA}O#gFyh<d5j31K7+yv}
z0a9BVWHzo@zq}8&<31P|3<d+LGH(VpGAL8dveBg?Ns{ohr&;#Tyyh8=<Hv4iDFj*v
z3!OGBwk4>xLF+;YwDi8Q{ZKTbsAoR#XFVi7$n2X2%+DMZ!k-E$ZP4y{iIWObPH;j~
z*OsK)A?*!F`<^$>!}-f=EY2G`odM3)Y)__?`5t9ev$t1K<`vUv!S>;VaZ%!CEo57*
zgXBUAF|(R2i*RFjC#bwdd4=$G;0U?!)2{ixuK73FoaovIEC~X>Ae1IaVv;1Hss!J^
zvmKIQOyF*X8!-Ufv6qZ%6JXBJDnSFds%Ay4>oVA@lwp-}&QS}8#6ct*zEIsbwCd)(
z3Y;|*r3tscJtgqreemAT3tSdstswG>w9{cS$%E&S&<zh*G8zq`b_hJ8jVe<C1rXk&
zP0*JWb&XOzOlOg5;XHnF!nEF_8dX>nsV}&^xWMzvOT^Cbbp0_WqkRU01%!l`)?odP
z<F!iz-u%qx`0?!z7(cm3+D*8-v5749Sr{Y;TN8`ME?IdJB}sLRl!{mdSBt7PlvTx@
z;}P#Z4Hy}~&`H)VTxNcLfxrG>gM(?#cw#v?G3+0g0poIhwuKD$iNrTRbAB>rexZj{
z4iUwnLy!%)D<rlA(epSLg{?0FV{4q$Gs_|+n;l5l)G(dqcx%A7np*-SDbB{#1tE4C
zr(C~rnS+Dj4E&c-M3$w@EezP$SZ8r*o;d0>O@PAK3Mmt;^;iocig9)DysC^v3eYkP
zFsv5{C-9BqLFGL}n#u~KN|@#~y|f>OJXYeZX<&<nj4Nfp*qUjoj$)hz*`@&rk7|ZP
zz77i8mdevqsM)mAHqn1lw(#t16C55w2|~DlQ##XZ9YZ>oj)GHbq$B=6T4{oBFbk4)
zg*n|*_%q)DKnRVNj^%y=LeWhHwk|l?Jqc}PmN6bnjH}q%+-EqMP!t8W6ig-)#*+y}
zQDO=c9xADkP1SX?k#FdXocGvfukXFX`2Ygv))EOp+I**|Nht~T;Nd^&HflZ9c*3N@
z3rS_d!!fB!lnouqq&9dDPDUuzw7-q5h>|gRZSc)_xR#Q$eQ0~}ln(Z{GtHD&O=5QN
zzFJ;hB8lO`@*GR^eMb8SBuUJ8T7_#XWnjuH)$IKtA5Cz}DNaP>r67(6OsA(5idafg
zsSu{7uESrRiaD(j-HbFz=??}Z!f<hAfqZ(xy?Y1Dbv@_$*ND1T5o(+H#YH0Zn3cH&
z4o*h1_^ZXmMLHeD;oc#eTg#-0<=VOPWG3eK{<q&@`Qk+mr;gFl5tkM_OePZ~4jn0!
zG+`R$J+HrffrY39Un8{!5sdxX2T5x=i=@4D;T+2^T%|lX<PZLbf6ndA9IU}>kE#T<
zbZ0HqW=D|YgkeM!2kc9>^n&Iv9&%$b_`l(bsg&aA_#_CPO^wGiQ?WC*zjMLX*q_4e
zt@TV@*X-`@lBFp+h4Yt}iF8D#+d(Kt()h1?FNmY;)brhjPJ2c~ZOF*R7)+?1wDT74
z+mK+<gpAU#-zB!`-mEjt&!2++E=+&|zpL$t+Gnl7NgXgdRj#F6oH@VEITuYq@HS93
zj*mtxF3lsQYhkUh4ferNwRMF!r8S7zcWx;#dKP`{Epo=c@U%Q0d<a-~J}|z_!6ETN
zKa9g$Kv^^^nFm`N5MU-H|M`FR8!Rr*Gru&4_Ys{)KsCXZC8nxKdtH*NSE-$2Vl3lP
z$@@RK$2))eSA2N;E{A)=5I5!>%6YsD>UXW8;4T1-+$WrnC=Itu3rrj9NydVOen{g1
zf@fDViECr$y-F#ar*xjY_IMRh)irUFq0>+xDq|Y%5Lg=+&0#9%@O2d&HhoFqmZ@a}
zx?6!zq5Co(ymw40&$PD0S%jDfRxh3B!IKSkHl8xv+vcq|ZgE`pu&zR(Ni@88;}T+8
zv$&vnynDoORMANz$_j*(bTcq{jgSetf1ab`J%o<1(L6gxQ<m4}IGG;uwO{x=X?MVI
zcuY4D)TZXf)tiWJ%5XFeQ#O^bv~-TFlMwNQ%M0`L7gm@WgNYPB`QG>O#fW?N-shwB
z9X8jW@cONn>1YLs#!GnR)ff5f8`tRz&*OVP<Y_Twy!C`nJlE&>OBqt7%=a$RNn)Ie
zxO;zt2Tz`|yAPjx>n3krP4LzdA^78W?y|l!1|5?sg%?e{yp+h;a_h67CqF*mwOhZ(
zha2xwdylUH0kI179A^!vFz^6}tHVUn$%G`zLhPH2h@&JFFBRMv3KO6K?>)7(NErpJ
zsjgXCoa5o)5owaJxVTEv&&aZj-dxO+M~_%qS|N_&Ks(W=-BxRteDUH%thMw9eYB47
zE?}0v3G}coxJk6r!XQKrcFa17F;$ohDtyx(2Z*C;_-`S<AQW5SBAg3Awh#e>j3P}n
z45`n?RQT2b)j6bUpavVhhigJlqozt}C7Z2f^9%}sJ0qt7W=U57PHVh#ly!-z9jR6g
zo8Px3hQfu(J1XG6&N(XUk<OzPVQVZEfpGD$5?PidQ5>@Og58M0*9P#U3;j@4^CEDJ
zWV69?9-)Ihn2-rdXg>YMi-B||8V0trkj~-iGMMh^P&7IUx*g3@zt3|k3;fDg-T)M%
zQNjAd4fYNW`RK2I%KF9=wzjsZ$^vU8k&2qHA2QKw)9LAEFK?V9i7EzJOdK_Z84yb2
zeZ;7!skLNU3u+JNFRZb?y-($WTc+`Z2=vCk-a1QNyM`a*LW`<3y(nX;7tx6&FJC=R
zWh7h2Bl?35(g(4%Z&tHu(&PEp-Xb!ZyASUmlx1l!&v-InXK%!}zw<8Z`vouEyuy_$
zmw39j&2ThAc*lnuLssJ{s?((&jX4-j**!R<*XvW62@fA^vT-zFxPOB8f?l`B{`7=L
zk2X-3me6U20n#ib?R2QhAu%}<8?m*$i_(gBzVkgk`sg+{u3h2R-ke8LQym?kvmU+G
zHD2yY*1z>GJ&`h)8{n#%G)ck;KQH-*U;kxZx^bD~{cTJvIDcss^^-l4G~(R(jK!rC
zt$K9g(B3;8g#>Y>f;>kl;#gt~&;&Oq9i%m_8||sjQw1_4>!e9c94lNE{$H#ltyOP3
zO>Of5l?;VU%AoUW)?Hfvvw)>k4a>UeGzjhz<C7_K3j-F<^;lYc4Xq_ghKx=jBw3cS
zpyy{iw3c#k)`8$`Ktm8Gw-HwYAsV)LTXo@?Lg0NUIL-yGl4=YEY|{z0bNzOr?3^Rg
zg3)M<F(EpvEK8zDVQh_%E=Z!P5Q1x*r_L==a}FS+uNPH?j3T^L;N)yK^>OU;8ExYX
z_Y3FZ{P{H=K6u3S>(@>x4nmM7DI1SB**-X?*PkazV!FKyl_Y4TxTO?H95XIUG_xVR
z2z&2lRQ+%M=uh}Nzw~9iYqo$Yyi$k=p~AMSB}cZlfx?7oig!M==E5~HpAaH|)Hn}H
z#dsYW9j|2b<sD`+;qdW3Nk1j+WDL@jTd!Qli|6^=n=e!5IS=pL=Y^MV^4;%zm!snm
zd%OEQeR{}vk`wN7up(qCmSv5_Gw7v6t<)dS`eDK5FlS=J3aW$*laVS%D^N->NE6a5
zA=43AUX_%I001BWNkl<Z+M%CHk|deMmWM`EQJX5*q?nMASmz^-4#qgu<I(yq$HOUW
z&s|}E<A`n&^W@+$?|$@%aesx!Pxh$ml3)MStE{Y@=hF2{Tv*MxcKHGmpYU*NgQHQ7
zQZYut=Kh51&tGKY=~J%XxWarC)9D{@aB_f<uW@m8z*IS+l`ik!-lAW4Mz!H&Sg>{b
z4kdw3P}FsBc9ojt`GoE5lNl&)t;IXZ-24&;`-jBZGunAd;b5T`Bcm=iU%rLgg&#iJ
zpqdt}uW#~X{UJA2`{cuY)*l$Y{&&B^y!3qcJO2i241?YrgHDHhG9`|6@T-q>c(9d3
zOWBy{g=->YhzyIO;AgIsB$65_P9KW8Y#u17h@&+8slr3DxH!+z;So+W)B+r`dH>+{
zX#z$o)r{0D8`gE;hcOfOx(4-)<AjB@k4_>MR|3^UNj(FEX}XQNS)5uwf{%MlojpEo
z1o*6-^2c7>bm^_LXp+Q@5~5A65i{JmbxjCqLt%Rwrx7;9yf+z(bBxDhthekRoG>j5
zre)1!JY{}<p1LZ+bh5Gt39npQCW-WH%K2|QPTBIOuMDZ(3Tp+ZhWa4{bzSlLt(SSB
zwipMd4vRxsP8ko685Jd?;h3$xaob^qc3DWl$<ZPEyN5ivw~qg6V`VBEcTEpMD7?3`
z6C=E6^5S6TI^T#lrBn@8)GQ56e2=#dtPkT{-zdMm#}<x<51&#L6?I+H$x_x<7g@Wq
zN;=5US;QMZ_co#%^NYX!HSWKAoBiD*?kyiMwvxl$O^y$bkf!n876m<BlVlmOXps-i
z^|dZHpG&!P<uY^KK1vz9vp8E*I>~TaGny8RMkDIVVQqo43XLL7GSVz-a0Z3*4wDxY
zMNU!I#5%msq{@*Ci(GvBH8$?t!-<k&f0wzgVlk?j2#HXjMa0R;5XzjV_kK#6Xtodc
zdF74I@~!Xx1S<qO*4XKo>#K_>1yQU?5FC^iTUn$Y@bqxZ>Vo3w!2#O`BZiZhyPIPU
zhx=53ca9{Ea7D$mhW(Q%qs^!6j3y*n)6Fz8j!Cl!K?pw>6$O*=A&+*4T)6%ssFag@
zN@uXb!TaxXWp$MY_a5@Whaa-Aw7{*)1OD;f`wCl|n>@I8pEurmiPB0U9jtDZkPVQk
zaMs{rK^U$Jw9*Kn8rqCP35QdPBnmgVl#pmeq$NTn;bAlt&8CP*#&~y1crK<ns=;?4
zOlLj8P1MzvYX6XGT5&Y3kO*qy(K>!+dR4bngr*oMr7%dGP>9A6!+F=B$W3wb;*@XH
z7MU~M$k{IIY%yy;w#B8C(imfAn2vJ}XTw0px*#}r&SQkYHF`lM!^AJ>VLixTPd*&&
zGb&0RK6#9g66*tZFmMJnQKI<ndw1|kAh9HoV&myHWgVV<;SC<oOBWVEc&xW5p=R=`
z_V;Kz%8wV`Hs(wU==Zza{@^yR-g*J4<ZS5m(TBI$-Q5p9^hyy$dKTH%RnY5e4vuW-
zuv(Pd2`I)>9^QFKJuJz`Ih{_cCwn$-y1f|xe;y)LAZ!@_O3k$N+<m;u`}em{!qbgo
z1`83FE?s2t!XnpSe}($J+brdd$<_hgxmB`muyZ*&Ii%xi4tKUfutQ*j;e-oy)m1!w
z^pGE|KgAS~SBAnyeEI8NroYf9?bfWUtWeh$Q`Z<z(|v%+E6Q<>6OH4j3)q72l5sI*
zJn7<N!O8Xk^H(nL+_h_z%M;3-9Xg9Cmv_ee^l-?zbLS|_k_Azq%AEQ07kIGw=M-*^
zx~?h9lC0kgX(n-k!Lc(b_~H7Hd%HD7USParQjS>PI^e>*<nrYUlzxY(C)xXGhn0n8
zQY~1&e@v&Nh|`o0?>yi(mX}sie)Bi~6SlSwC~VEn{t=JXcbmAVih_~{>pLu7{WRbF
z<{xqG(iI+WY#?igvyuy)WhVWES6{x#@nl4=-{sEjpArvx{N%l#u(q<qjaOgbPrvgM
ziZaLg0Ya-_19OHJBbA&P&$aZ7cFT}u8A61JsW^&=bi`;l#(RMoM9(}FLbNzlyHyGA
z?_6uC5{{9vJbAcDf@SC62;;-9LN|oRa5J7V)M>g;+HK{Tu+;xI$H#rD{;khIQ=HCr
zW2eS<o+wrv>>rV)DM~4dvSc(Kb284EPID$zC`8VCw3c`;DNTuV0u=?!HbF8_A!ImB
zLI$JOVR)sQ1;zH$84>lQ_Ee^#qcy3DnqkkgN9!8#v%Ij{?mbe9ZZ~0Zu}4)o;sj{A
z`oUtKG>y?x<Gh^>qrhWb4N@@}<mgb{J-*Iol7q7J=(NZ8{^Cb`@fSXWjvTTblQy_O
zoA8U22pbY<tTka(vj&C0HT;gFlOsGqh7!kd2y4YNndHm?y<VR*jxj>xg+>ZTq?^eB
z9^oCv!cmoTFdTE|qiy0iqT5MXnClaFGU{fE<nUM=ai@<fE0WF})A59bxpa17!8bAv
zK^Av#!XV?6dg?hmI>zfTT{132dI>LspE#1rg7KEpRFq{&SyxPpig6B``y-Y*DPO#-
zSbw^~#nlBaUB1NLcto+WfmMRR{3`25LsGTO{jDAHJjZ0O;FJm`{?0R*jso-C`^Kd*
zthC?w;XUSbj5U@~Way+ZSc{T^Bu*J5nm7h04RM+=^%cXB<HwsJj_lW7dx1$+QSa~Y
z%G+;~RtI=n(@g}jQuNb^@%Wgcn2@Cjw;vy~_I}1I$ri`EyWF4V+<g0!{O-T_ZC?Gv
z=XtWR$@<fMj`yBoZO!A2M;z_#lU+EEwT8W|UB36-@A1_yy~cQa!jr9a)+hVC_`-G4
zPQ>}BhgTY54gF4x6g5I>9JV1$O6K}W=q!{*Xg}+s;%16sj3Y+T=>(0U@nJibWeV>s
zWd+V!E}UQE!ILel7sOIA98a0+M3g>8NKbAIQfgdd7bAqAssab8c4sEjt!;LA6cIu_
zBRsa=qh&Nx4K%L`4{S5YsyQuQp_povR?qmUxBom#>TwPs74@{@gGU>T^D;m=F4#0F
zDG|bvMiEMc>9p2@SZS1%C?(LinN`i~^GyK=+%({H#yd>IlkyFocd4JSw0wzJw*@_f
z3Wp-z{*DCdj&C%w{?ww`7!#y6#-N0xpTu}q;mHt9o~afRmA2hyxR$N2pmu@WDy1fD
zz<n^&+u7Wt-|um7aKLal<cB}_A;KAc?sIQprKPSaoUxQ;L0uTe`IKJ2M;s?Se*B0|
z(q&xc%r7pIb-N^;EGYKpmXSVKVE8CR80{bI(|!Ib>C$;BB^Xb~s3>Fk#`C=Q&R+qN
z(Qr(XBteWxAhJ1U0%5MSOo|Clc21hKji6f-)?sDf7+D}nQj}~i0))|Qvxe8!lXkj{
zr<Q-czQu9jQHK?mbwyc~Oml;+Cb+WX@MOfs=8(}SC(9(Ae!|hzlEw-B6h7P;Vw~XW
z(mXj5m86uW=8yi*-{rMm`zq6=MO0zf**&5z9U_ZD_M>$SPbO5AV>lckW$TaaiL_!m
z4PIiYkbniPs49bQLTg*K!Qsi6@wA6H$$9u_lc|m9#ESX30f$w^lY>JFS2N1T*hddo
zI={pVYYW72xH+^^!TUQ-P&%TnE40?U@ZwEIN5@>eaGCR$u8_q&e*TxfMp+xWJCa}g
z)GI7RhVi&${qAE%JKOllF)N(#<OknpReLV=Yp%X=g{YHI8^iJDF2~~$7gq=P22atE
zM(OZ-`^H-xpp#_*)NWSlD30(xr}a(>lmkJWBm_craG|wlh_pfkNlJT^MM+&%(1~aN
zEo@`{-MEZ%{#4}wKeMCwcOA;L)YR}dkDpN&&c@ca*Vo#>ajI)WEMYFyXdJPQ=xIr$
zG|GFB7U@EBA-oS!_9mz|eC;TW38m88nOsIToG9U2R=q~c1~W_`%QE_d9$6=*uoc?r
zX6PiIk=FdI^U%6QwA718MN~p!r6iV;vs<*Y-e0rx-TWCW*Bf#v&SHgNJk0slpTAE&
ztQpKL@DKi@FOX*8fqA&G&eHrGld>S{W<;Hg<GoFKy&hGbWAiabJ6pu(E@P)tCe|_8
z+e2zioF*hmOw{SHxUfK{*F`DC!rb%t3(L6Dvc3M8-KS64+}L8YIYec1tgI|^<K|7q
zMa|CkHXA!T>>eF(d}w&_$^{nt37!zO<%OoMDvYxjTnM7{4ueC)F{U=8GO%`SbAyC4
z0d<)(DGet=U?lv(JKyKUwH2(bSl=D-^7S<)g<<#U5ifNN3v-GjOBtL$&%GbtV?n1p
zx3)yFeu9W$T2%byPamR$;f3p$8P*PI9k;*tE~~o3D4$}HDCK5ZbQ2Ym^aezoj3iOS
z;|UM%eiWGU#v+8}jT_fUU5P0soEUhzUvhJ;8w{@nym#+0H&$R(F4LW#XHIqa=+Op)
z&OCK}z_gt5%{!0r#_*M|yo#@LHrA(XZEjLmC3#t4D#N*s<I?3hI%Xe}dLF$0h_V{7
zFyCcsTCljZ$mM>F6PBBAuQ3@<*nRvidwctss^o>MYb-1#sFh{j|LFs|Nz9!eeaL8U
zg)3KASUz`-bLR$#N`-F9dLk`|6Ai}Toe3avU1I^Q!MiXq6VxaKS_i62X-v4bTA<Uw
zi&M2i3q>~x0Szb90->NPa<q=93WG85-iIIY)z5zt?*%%J@iv5ziYUWlu*L_OjTA@~
z1lLwrbfRW_y6{wm-oiBrKvD_L^k1_=XRSp^-9CX~a@-KD+b*re+h)_n#>`GO&IZmq
zO5<4Q&C!VpG7Xc_l*6MV6iwQX_dyaR#S9}>&F&-CZE?}FZM63ut-`RP-L`3^(NRQ{
z#Hh5H(n^J>0wqN07}2CgrIAF*2;b=as;Z);76}*JDXb4fP-hKNN#Zo5Xw#C=36p#2
z1?tQ>i<%y_ZZJBj6xtK8^8e$1{9h=hC6BiDc=4sH)Z>dd6O(qkbb4K)NVCxEHu-|^
z{L3$f36Bp9=}RxXglOanO2}DJXg%EJnSH$QgjG~ZRHV4@{PSG8d6Sz*BmU}Ny~AWU
z;$UloC-*)I_99h9U0V9WGk<xWAKm#eoo){ZD?r+eyaRX|LLsWU3ahBM6lKZ8HIvAO
z^6wl(m7_<D^TD&q3(!%-;_^I7cs6!USeRcxjHm3&Bj&qZq>!ji#=^=XLP@f2#$YfP
zW)~(95^I2Lj{Cbg`zHt3Z+?$Q>)VvQd2E_;R20Phf>&=m$I{XQt83?Y?|VPscz?ua
zKmAE`oG>gVWc>(V8U}-uPrnh8lZ&$C2k+kF>Fzl2aJ<LW4jsk#IOa#UAMto+%FP!p
zg3%nDOv!}ht!u0FJ6%#8^Y{nv;5N^3X-@OX`FZ9C9h8hI%PH#C4TKMNT!U_h!|@Pj
zSDEHDTTgd+bpI*u=bq7I%(#HEDiJ<tFFo-7g9lVqfib~m#yg8J9_o7}5!||Ui!cA3
zS9$(&2O&byYC9;P!Cy|hBV#Ir4Bk<39OKDnuazo9rimnM6qJ_;Rb!o{taQVj69@-d
z3MyBTrV1|%7uOaMw&Y8nd5uqg;x&3{#EVx}m{U`J|C`?>?n&N!?jmyuXrXXQprwAs
zM{I_h&2)ibiubcR4y|<n!ox2a0Q`@6sh_1H%woWN8!qZmDggaLc!alPaYijCEcQEe
z6BW3DF1)`4qBv|-l~fG@vn6D5TChae%4wy-a6@Zk8_gF-L~Zx06m>nM+e_*717B@?
zd_t#};hf<3WJqNVLaW*JoIUSNy3yILw9QtK{Ouj8C#(lv%h|SA3l$XY=N1;wOOh)$
zZtyGr@N2|bf^3<pgtpo{kB9<sQqfK~8uF+Ma*we2Z6+n+G(qDmIO?6lJInnaf53CM
zUPYrB?Vn($75)AkNoT;I0lTZZ4$R)VrmQQxR;(<{bNlW+s@hVF$2b+R1_=~J**Fx2
z&x=H`>ea&IgK{@aI{_KPWHM>EHjRi?NCtC#dQpV)_vj9KR6g7&{Vc;<hlnE5es_jV
z^!jt*rfjA(^D9dXt-$$+g$oym(+;nE;fwgnQdrMhYZs~TBuibKcWe(2x&43rHk0ub
zp#(}x%5h0P%1NV${ewduZ$)&ol)AL+?Vs?`!)<OXc3IXjk%}0Vh7TV+<rjb9ZC<Y{
zGVRbWULdbZKK1f-4h|2vc>Ww!Sy7cew3d{{k`MP7o@hp+DS2K{RuyGkQxr92UXbS{
zdFjZj!1_1VQ`fTL7CDgNrnEMY5v35MNko#w^!qW3{e)Gmc<$OF=T_#qcYmE>KBUvX
zj4Of^1la_8K=5kvr(Me8(qiM)Zi$<%vXp{I3Z$1z#$)C>13vYMTm06449+*vS5?U$
zeB;~fGh%hV!%|<Ng`m^z((QH`*n-{l$8@DZQ8GQ8V5)+buB~w6pZp?Q>yM}=CEX+?
zR&tgsBU_)d**)!{NiA=;ZfyZNEo!YDkZ&kHj@p`2Is(kPDSpP!YZZ(lX-Jf@R>&l#
z-^<99BcD#`B{9C6VXO%*w`aKDsvSzmwqP~HX3-Qt=g~S$UQudBbd^d4akWwiFX$va
zG%*J|$MmueD}y=i+<l6*6+gXmhqpfWDWWJOy1US)1f6Q*eb#<vJ5{YsP&l;T$T~N(
zffhbk4%NnScrwNqOJ0=d+Eknz9r4;*pP<vvxWB%Qj3bP(jo3UShgf5RWek?Roqbl8
zR*0eq9mPaCw6wOgRCR%nnqHR9==-O0$kW3Km`*4B#W%jm7yi9pW#`Eb<B`S09c*3V
zy+e9QB7)1Mjbmb);(f*a4{vj+mk>p1qY4jKW;Rl8$I3z?d}uPwEXv5uP9jcl@9sUI
zXgDrmRnS_KrCG51je<2tD1H*71WIXS6r!f2lt>-VZZ4%Xd;5F1!GK9IWOy{@M^Emv
zurN<mR6&9xL~x<d*Qm;hNl|dLwNEjc1f0$~T<tJb6}V#3^X-pzF{Z)-R%*J!(N~hF
z@qIGJP}>M=OMESPxN|^~q)a9!IJd)aH07svA2FWhR8~;chPq)CJ8x$MN$J7YCEmCo
zHIbgmLS;h{G0vk@!f_QWpVPF%OV`g6>xTX8B~@h@6*Z411^>l=`FB|}n+-nJ#n=hx
zX7LDbk7-!l);XMP?RCSUwIq%LsZ@K-Y9{GKJvxzOE{)LTl=7h9(=T7<&1)+h?d>6j
zBrhDl`k5>2t>0le6WC(P<D-Jnq(*4P^yyuWivm-XRCR^31wzU|Z%~4Ba|v=GBQNV9
zGACfLGI5Azi+0)vxQ6igH;+@orw;^5p&Fa0(<$b&#L#C8U3&y)Spr@q1!zsIBypCY
zAh>Y=)|sGAIpfFP0^h-R-Qz7(#!)$gF*WDb7Lkq56%7eh2@#%etx-x-7B%mE|9$G(
z;+$Z0Wsxs`{!M=L-UsL?WEBV?j)EDbSAlsioC|mter7||B6vbHqHh<dAzlh9XAv$y
zY*QPuBt@LEGT-C4a%dqX-de1J`wt&bR)X3ZvQCDuq567#+8tS~Ns|F-+F@sRkKOgh
zO!5gr2$lycEG*2ixZGnrozROSK8|C~cpDyG`NZq|`R{&%s<t3f{?|YJ2Cu&HGOu2{
zinbNQ-7PTXGwmck<%OF!f}c~<0jg%@b<IieO~n#Y;g!Y-g18u%9PDG8xNyuVULeoh
z97=`k#HjHS(la)61O7FP>82_ofVsH=gZ>;V{Vv^3%-!`(T<uXhqU!|H(IHX<b2KS6
z$Hfls-hC2;)Xq^)%BCO$8HBApD$!sCN(ZkkB?Yk-#LBVMAFvq5SONy2wL(N0Kfb%p
z@E|9zC&5!Fx0tdf5upPPEw+M4BcqfoONo*$S=J%RQcN*s|KUAkEW*}BD4f*fRd6~e
z>YTzF9v&Nxjl!8Jue|vRgG{oywavy}!NKvE&Alm=04+3$=-_m)6qb_N0@GUW)OCFt
z6D3Z0OVG$_oJG2t3v-^|_}nF~oLk__pL+|vw1hA3LLs55NQ#o>c!c*ggKmXPEZ6(z
zI6fZpbZ3gTK~~~{>G6KRW$+}C!s(=$*m+PIsRLQGGIlmK6lZuxXN$_mjrKl%w6C$&
zAcb$v!QcAw+0V29w6&Hz&u2PRsX_;$wL+^DErKQz1m2ratj-jy_kR2!V7z(gf;~{y
z1}h|;K}vto%v?N#Qkc5t{K_g(9OIS5O3l{x20{cWoKlkE@UZbVYy9T1T)K1t<2^zu
zN*5-AXQ!SxgCq<OypR-iMV?pBbY2giY_PdM45V*k5D1o6`^;Ut9`YX!_Q%}$!3X5S
z1D<>RH6Cqj^6=r4aH48UUe;v&K53Q`Y0X@x&%+;o0Jh@#%^SRO<pNo^7ntu&7c-hp
z`QQKOd+d)!oQ#KzCLsmpKmGbI^R>5ch7$vUELvAY+M(A5{PX|&52=3tPr%ju)<5}2
zeD&ok)Cll4z;9B3^<>##HZncSBKA0Rf1bNrhumG?;$S%DaQ~3$v>>lNzxc^lc>Ur4
zDLoQJ?P@HRvd&S)lS;+f(h@5RORV%0zVMkZa&hef7ghzb@T@LKMkgm!Lh#nj7x~80
zkC`9zNwN+C&(YxlCkH#c8Lcv?J>#MvuSP(iXyl~{YWMc0_pWKvgCUz&5-r1)NJjyT
z9%w-pX<oay!f{@*KQ3?tFk0(iXW|9HdbcW(CS%Z7q*aPB8rSz!MS-n?JE)M7`K!11
zmw$1e!U-xnrKpC~#$v7Izy9}so`sVwq-$)3T+oRr>6unFh?H_#^V%Edc{ChiC4BZ5
zK1(#61ab5IpO8h8Bn4+AMF}=;SlC(-cT!60LB&Wy@pRT=OdS>(56*>7)j0>o^VKii
zV*hYRRn>I61GH9@W{NneF^48BC_Xsd>gM6F-UhpwvSyN3I3MA}bT(bpQIOJDg4M6~
z!3qZH35KS@k4tz+R76!-vRL7)dxn|b5<P8mzD}{MXL(fNK6NwxnfESS|K{JjX+~L;
zOvYotQ|2XQSyGe*%jZ@xwINA6I02osLs{oUafC1x-qc7L5jqz&6FX}y7>|SLVOd%t
zDR91O<Vj&GI~epSO3UT76`+~O5vH*LnAJE7SFc}Z`^hfC1}MOLPlzXInD$0d*CWbG
zHLZciD20mj%%K4lVH^LN@o-F8S5y}E_l{UuUZQq_3XP6BOv@>q!5pK}2v5YpFz0wu
zqU*Y5Yki$tpL&Ido9le)GoNPZ+;Y%QDME*30ybr>1!uT+^Abx-%gqYa?ubuUn7{hT
zNBpzj`Bzj@;Jsyeb%pKSJ=V8(fSb*)6CNIG9Tv~R`88J0b$PmLur+LNKgHg>2yIa6
znfGt;g0pRN04OC|XnyZof5E#S+-H7%fk8K;(@E*|QhNOX{eB-`2XCy4SFdn%a7cgo
zJmm=tOG7aoQ=5{s)8_|2_)EH-pCg|XJlfdcikc^hWBPM*%rDH-?RMy79pWfvad9cA
z(``i>MMS=WIHD7WoIHhRB1>xH&fL_^KkJa58)?nr`~q0Z(p;Yh+nc<7ah1m#TTF@}
z{r()a2iJ_BkqU)HdWV*hG>XXL2!|t0G}aoNt+BBLmo&izo?53o+&jVGP>t3zEFzNO
zbjotK6K<?#HAI6G78xrlXDNkX<R<7&*iKgEl#{(ZqD0Z_X9xk&*f6avMQsqBC~U)#
zBx#q@if4fKvq!k5Fgcl0RwdRz?FFmnR*2(}x~){8E(jUyQ^w;lS(2igpj@RCu>|i0
zWm%KwC8N=#Nga=8#RV^Cw$|1MQ8K<UH}rnCAh!40+3(l_%I$*Lc0)f)elxpol?vH~
zDzsSM2Qx?S;qL7_Jbk=DT~<f|b-R7@p816Z`tt*f@l@8LB2781IX*eYl{pLZbK!n?
z_DrIrCW>4GU9{Y(Q#`AkV)lDI;ubp+;du+&@*q7@&7wME>YwQjg=pFBb|$NmB6MAN
zi>)11qX=<LxJg}CRHl_iNu<^|p_x`Wqr7HZS;kdO;m1^_W_@qW<MktI9D0yxE?+y(
zi*Max{SUv%;_3kEDp2y9)E4JG&V;NrnMCL`X{<N`m?pdc?`WL0kXj*>L@7y87^>2s
z5zNnZnhP4XC(=u>Cb$<`$WjT->Ud%8T!X8GcC$Us0{CZdkZ^*7vOKYdm*x}xtKa+;
zUikEDyz|`;`Tm^^it#?BiLrHst!oypo#*&qkIiAh(?d^pZl3dNYh1Z}m5YlVzWyt}
z%;gJ96osY8Yh;`=DQot&w{dv#>4eqQ6?&b7=dWI(KR-t`&Pm4)a55rEG_DG(QLH6p
zq?j~Zw$|2IDn*iY`R4u@X=}vZA(Omjvc8A2mYe4t=a&YcG~>L);euMeN$(AkDu|Rt
zYDto65REgbPZ7@HjK$Q|?A(>T9$u)hO@0Po^gRFKb=1A5pdv<jL6l|~@0in$X;CvS
zYE(4E%7#~`B{GhPlbC*gfiz7KB8Zlmj47Kjw<l~BvMgmZwpc-s-}ne;Y#<;z%Y%;|
zay4FLZFz;or2(dLA(%i2oHGa!$d=YtBuPRPDU$g);wIdpEjCJ26uCtTN!Ce7^8!yz
z91EhT15I}|o>YvdA-%>nor4lh1iZIMtr5adSVyn%Y;rV~L=H?9rqXHJ39=Y#&{^8V
zf`s!eg`#x`iK37M-I7#8@w1Fij+y2YA{X2pBn=5wDJGK%3%w3?RifgEB#IE;Gv6H`
zyB&06741Zj4S8=G-LE9;_ec{(F$uQb_|WZ05g3UoMEL|-fe^F-%FYw$Hw24otPAjt
z@OU2t(I>;>5afZxMGB=OOlcdeJK$)>fhSDitJ+bNmZGT1jb}6+vp*hFRgR}We%Kfr
z0s^!WD4?HZ^t2#boTJ<6pf?|F@bcTAWOp**-0CXWP$``;7#qgrQV4Vsm9eJX001BW
zNkl<ZfalZF@r={cGqwHN_3Kz;nU=vVaWa{NgpIQ?_u|aY`cu!KvqvD-o!JBPOmY7k
z<UQwtQ{zAQ^h^Be<xeyJ;(6qt;L_(W@Ec!yooX_o96Qopmp}cpKc_BA3M|9%1WCri
zAmi%l64x(ZWFe9K{FknwMU9RVb~bl;@nXi)tsU~(FdmOc)0nk$t4ynk!;=&8s^sy#
z$Gra19KtrEY85=TbsP~(nj$u3bt&VMH?K06Xzq^T+kbI~%7s9SDvqeeff{gc>xk>U
z81D;YoSZrvD1}F$r9{h;NLtbe(k6k|d5y%Ph_SW7M-K0Uo8$TG=Mkz7QjA8oRo692
z3O@hEPjmT`T{Jbn^Ly`bJOSY>QiYhM+CyB&v+YznO-j>*IIcq!Jj_<`Nn!BBp*Z@`
z8F^bHf0j`d@bXJ9a^-3Q&f-OI5>Q&w+6lL#e`_sq95b^xYA4!_ZHadtsRWUZ7<9YD
zQH+iy-EI%0q?}Zo40Edb7*z|5t*E`k8BbM#l?sc*#T~W}?{nqCX-Bwy_c6OqcQKWn
z-PhB+CXOPWfAt2dS1$%{s=uY%I_=QJ?Dt8MFr_m-oTpY@XpA9g!e86_zbFg(y*^6o
zz;JKik=9Yv`yg=>LZW>ru6o9BZ{p#6Fn(;iEiaSC9XE7~S}A-R{@WZ%1>LYfqLgQD
zu1lN*A2VYdQ5>U+3U9-=H%@R;T8>Y~jK>o;cK67u;KgQZhb=2~qFG*E=J|^&EY1%Y
z^t*Ut$%`rbha)z&_Bb|z-IG0H;nDeM#P(>ywa>o=mr6`ghrO{B#5$VM79fC-&Iv4X
zhK%~wXy1X5p}5p_&7jx86eU#|0!O6|t4t_bKD6Tqj0`jb=fKnshiN{?;k*Iw8rHHn
zEp8vf2Tl)(6oP9DeWDn!mU3F5IvHg?LhFbFcf@pKmsj3=mF`@RH^2A=etz{DyZa-e
zBtpk2Cx<)uPR#HB@gMTZx8Ed+VtSF`<amf_wy<%MaO2uVuC6T+$(q+*xW=7FTSx>;
z9f@|5PLh(QicXfXkSSsnbW+_^6U$HtgcNkEnmCe7#wFuPjj4TDE%C?z>p&F0G$W1!
z|3}Cm1wn)edgm-sc%n%0){7TdQZ*M>dUSgU{a%MOi%E2t_6RJ_S)w>4dg<p``tSb*
z<7tg^u(UkK{{BJme~TlS)<jW^iW1_K;DTW+O1q|5hK$7|&G0k{GE$KwX}HcV2%Ww3
zIF%qHLa;00yPGyeMKtb}QUr0bkkqC`sV-oHL`P`63-Mx31cy(7L_`XyG_9ash(=T|
zB}j|2iqP0NRHws02vpofYlRVAWY;l?3zR*esQ0<QHRSl@goC3oUMS|5=7^+Zevl$m
zL{V0lEJh<R&M+NM@pX`mX|0Kc0^>M3IOg1QmjcEbk|=3IG)@8gXW8MtDIU%^RM@14
zZJ9r1#0x3$A}kJdZAcT{gysrR8YhEJu(fgtMJsIIl$0nD`dra;FG47+XaYNgY#PAu
zehx5AScsQl_!6)uL1hB=mdc<DtZNxke`JJpf+W#+(*!Z2_|ac|AH1NdD^>>c^s)?R
zVOma^mL*cf#M+TYl4^X!=HX5w+)lW&aX?-hdYulvZbB-2z_1jGkACnYE?>Jsl%}VX
zJ<-hiXGJTh-nG&*kLy|Ckbx@$L2K1Y1ZJyDOL1s<C(ffdoe25Xxv<&Jw1p`!d>b2P
z;bta-{>=Yxi&k)Mb#&7h=SsY{>^<2eT3e;ClKwz*^~Mdp`>k)YvAxTSi;GM~6Nc3$
zTU$p=UCO!D0hz3@ndUQ}x<w~WNwbuEX$~_w##)CXcw((|1ewS=nbzEU@B}F%`my5I
zzVtSUnKav=K%#9un2IvTni_8$G?>Yt8#Sa=4Wc1R;z&}-`MH$mmJ_sAL{UVfC6RJ;
z;+VtS@$Q2|qSEklufD*`R~A^fG>4<6L5>N5of6yF;CLiH3fM`|<4LNj2)eUKQxz4F
zjzeLTVX7yUL^fdxN=lRtk5xIT8pqDy^WEMTN;E4po=I7QkDIMV`#{VXdjSD;0lZGq
zjLHK^g0DeYkE=~sEE_iwAya&$Ktz}*!&{GYiqW`YoR2vf=1ixKQQ@eo3aJyk&`hTj
zYB!=N3hJ_=C`Je=xpL()-F}~?xe2em_zJrRN4)#~2Yli4pJJ}Nz_-5fXT-u&Su?|`
zT(jMhDr`?hGYo<dq2+yJv)%4*Xs<=<<rQ$cXAaQ@youSP*G{k70aeSRilT`5!2soI
zM4O5%<g5S&AV2J{JYlLGI;R%HYCk~E=qx|WtILVTwY1?=AqCEb_qRUeX<oc`na2+w
z;+11G%@M99FG`&7I1zL6$_2cEI8ONR{oCx9CAsq)8>qdbmu6gC83cn%5e4DBG3*bg
zf&Zv=<85b&lNfCdPgr{W72f&wcewTDtr<Zs?8hA5i>8YT*uZ2u#W}~G9ddkp%y>8?
zRhk<wyg=k#L;Uk(S`!;b)tvA)p1SpW_AUO^co6yK1fQ-tVMS;S>1S=+nQ`sMJ%*eM
zhJ!i^B4Y0x3!NUvdC6#6Q<N2}Nr$Y{r8~cX2kzaw$5(#sA8~YCF&Y)DE+i;t+1cIY
z_D}Dzwz!56g3X8bdFi<;#7T_Of<eE>aw@oTZh@WSoY!A?jt?Jh(2YIHg^8EN6G@Ol
zp|xz<WF2lm5#kA)b0{l_;+V*lT)BE4DK+JI%+kUFZ#*~07hYIuv{bUWfdyW{ll3G1
z+SSbi<nXo%&ask)E7W{O^OsbL+Bo+2_rr}VJu54V937pYbi~@Z^Vs%=m!h!_2H_+^
zx~5=+?U-wg;~KK0RuNL!CfFl@>fSjfMFBp+%QMgK?D{by7K30oJi%BnQjzush*5zN
zz6p*n9F85gKf1%ylZ;2ZhLeMR>Z$}Z*RGvsZDp0^g_!f_m$`VgPgPe;CS%q&p73*@
zev^&$4Sw{)yZq|czs947n|${#zt7szOB|n^u>SZS%X1xU;`nd=+keV??|hd({{7$P
zcz>5zDU1moSwaYwmzLSOx7p-KLd$e-d3??WS6tei$QcKTzwKx_eX~NPn(N#axiim3
z97pI#<16z_q4}Ftuz7FQ(j%H^I1z-!PP#^qc}5f1UK;`_+&dRsbDJ%GJ0$4!25fC@
zbMeX=4<0>1rHX^26aMjk`0JEq!QFcwk&i2!^Hhc7=;(;KUYD%f<?+EGdF?=JYALWn
zad<M}WH@H7-@{tV?s!V=Jl<M5X%e=yLZGw7K8M@ej1G?}^C`B-ky%1n6l9$aNJ(8+
zL}^Aj$w@n1s%g&lc*w$Fz<jqy8bwU=Db5-yW7vLrz#x@8|J+UXPsa4;22Aptxo$7C
zmdy!r)`C$u<?(g!iVpR%;Uf7OPguMJ1Xt5DIM~NKEZ?jijv!+|DO4R2aq_a_PyXyL
z`O+_anQU&3?EhixO=B!e@AJOjyPW0jx0ddz>gr{>XJ0wwaJYyRNs*!iYO`c1iVVYn
z0)LQW#0UZeSr8|7qR0Xg1OWuYk`Y9);@E~H2LeS?p-DxgxD6?i!{%^idZzd8s;<56
ze(%}dB_G~X)kB6sa)AcAfvKsgd(U~#e|etY(`eFOS^=p!INamP<qh_}{U&G5u5$0z
z+pKSFax~76GG=9EnS3(f?B;n~dPq^`tZ%H5&4%b$G8rC{I)!u<pLpNXlmx+CnJq|K
z9b^(CWI)g;RlB94K)4WA<BF0_f0^Od15{b!Y=-xa{o^CVQ!6OyCvAN}DjgW|BGN${
zL?EOF3)D#nKxn;BhWp+NvQqKKpZ_|4boJlhgkg21&wQHUD#Q8n>%4LGHkI|Ey7HlQ
zsC;N!wNeNfHdJX6p$dn04n=~oo>tOE#fHhWq|uCU9%3Px%`GNsp?!{ZB|<q06DskL
z{%mkA=y2jVVmvCC9A?O-AzizG*nPn3Z`|Vg-2t=0@UegY*IB!F%=LfqNBr{7eT=lx
z;j3Ty8joI%IlC5f`_>j&c1Y4_&~CR`%rl0gDck!;T)cFNC~47Zukz><9Xd<v91TY7
zAI(`>-sHo-@bi52OW)wP|AYUW@qC|tuf<BcgA+k<EqqPhjALZIaTUHsh}R%J=c+nU
z>a?YJ#{>2MY4ANgR0#Se?*a)G0@7G%O<9%ojH*scu5%T%(kF#ot!x*kY2ut#a|9@-
z57L*Q%y;!lAixu?KPewhTF`n~P?L3ql*Bs15Qr@x7>q~s*FMM>zVZ#uU%tfiFFnTj
zbDO;Q(?5-ql6Msu2Y0r(`ps8)usfnEOH`ClRfe_ob#_NX4h|0Jb-T=FGx9uRIGAvF
zaKt>D(^;t)jpoefb4<BFH9O>Gg%(<&mwP<<f%hPlVm_VI>GhD6#n>S0udFAobIe42
z!n*p6S0Ypn)|e15iJ;YLVQdKTJRD9qIyyot#qr@GM@L=m-n+*$&ppS^^|v_M9n|)l
zA2D?I9&76g%L|0J??8KSI*dQLk*#$^c#6D0c0(C#jD;FsQB^V94~`ih9a0n(KmIeT
zm`bp*vCi$A4`?<T%x80o#e$ihv-M!c#+f$81YupkZA5tCNg55FeePM#oH>IOB@Yhf
ztZzKYg>Hmd?;!}FJ+r?@tIo2MH4IKldCJ#TDhym_^BGbGMKb;&(CuWkF2uvXpK!rX
zSJWr1gOI1l-;=amyrV+%>g%`o_Vpt^^Xdb}mEwsD7uY?XFd0sG=BaZi8PSYm?%uh>
z^A{?Jb=?x45Ck|q{E{T4mqctf8z`BO%?k2y&S<`1GOy4{lU7^PnlIQtUhvg#-{R~_
zhvkmq{(i>2`vbPOhirCqI2g6Y+69%V==EaW`2G#fZT8u$9C4#X@8TnT@+W_hySoFv
z`e$Edsny{5mtJD?(iOBydG3YxqT`6ktfaDC#)lc$5oK}2(a{mJdB#`2{w7sv@KzC}
zfk4phcf;0lI_Bqo_9ytAzyA-J4kxs_4c5+G1|MuLIxj<jsdFJLR|Ns3AgIs1_r%e|
zmaM)wPuEEQZ|e0QemUo`#{Ga`6cH5TCtrVZ;OSW7i=tjYgenLTEHS6w_jF`d&p&G?
zNT}r8>7nMF51|wF{T=jI;p?3Mr6We832D1Sqph&Uf^z)%H@}WCj=jA-KC<*O`FzgR
zufM|H?jFy+^d27EJ79VBJpJ{{L6|BfcW&Qhbz=<?NzSjG;b=6W)oPI>F}pkaJp0^p
zbo*^8V;CNWP5Gby#n<@wPke-H*RG*kD=Sn|bNRU^kc~#2EL-C&>ZgS_Cb*=rH3!;L
znvlC^%Ywb5W6qvE8_G@R5Y{rEIa(5wP-v;iN>7oOM2&>r$`V>CE<Jjg@1OZD4IMES
zj)<Dg?lsfNl*+CmY#8#LCfe5UdtJ92CpU2TKt0wtD(4YGBZwjLG`kI^Wy$&T%R#FZ
zMWHvAo+qBYLcS;&&lY_0WA9=-9`neR^CVjHGaq}3b89{Ny*~2gi!_@Jl=4icW6bf}
zeBixL5k-<G)}IL4pGYHRsB9YRtH?BA@R>g);-MAA*6VO<!WPS#x(br@%t)(;o-||8
zQbMGVM4Uhrg%52=QqPaP5a=W#iWLY#cz|>m<JjJx@ts%SU_8$m4ojY1Ste^XNm^(4
zPyX&t@wfiYKSX)WQn!yzcTiSxZ-0oe5y&=1=6EEfwG=oqXBcKv4zq&eMTV&+l-`jh
z5yQJf7UhDrYcrc>lzG9?!H`|O#P0SsOZ^n*EL#V23^76qO5;J*H<{3Aq4?kjpW=&O
z`98kcA!#qM^4zoh<)3^8EgPs}%$s-aa<Dh&OJDdlLP4A+G~$>>l8`h6=g*%bY4w?n
z#;k2V8VDG1z^3G7!F)8Js!F_WaXcK;Xas@d*^7^}dMQ*K<5|J&+t+zyRZ-az>tmb^
z)CMh6A}#PP;FXOF;k_PFOI8#QA361zA%D;}c<M2PQ;izPU{9(ktU~H~W+duN!!STM
zl|`Z{eSxg!PbX<N{v8joQ%sFi5XWJxBLJz0fh0*tTP=#xP*wKy(0r#l-CE0_ni0n_
zvw1=B4zKR=@-mBjgp5Lt<jU$2FTDTV-2UhPnyokPG0zq?uBJnk=QP`$dX5$<&|5d|
z@Qqhr10)rO=_IJ_Klzg%q1$Z-hk+DG;c2uRs92*Hiv^?6oXw3h4^R3qTtYa7X!LP$
z58rGevi$VT5cM0Ql;XmL3qK&Nv(A#HY49#t%h|JM**^~4aP<z9Y8*u*ae}cGb}?hM
z*XF@)j#H9E3B0NB^_<|;xn3)>QJ%$YPP5rOMSXZ%p(RwtkrRx_2Y9+sgT`viiyz*g
zk%lZhZz^nd$cNwa7{-)beD4`rNx{UHJbL+Y(m2AoimJBCcoo+(3Qw=Gdb&CfEG`X7
zk{gS2K{S^*hhOBO1#~~yo(UNkP{C|koxYz^{vc)~tmc0(D(pwSd>u;Q5Ev(LUa-jF
z>)&{t(#2RBM5*M_ODnw8T4DWN@8a`+{x$Az-DYLANnVtU#}lTrjI_JT`dWiQmh<Kp
z-=yE~QdOSutYSQ0FdS#xIG&Pu1CeLB*G0;R>0*kp@Wh2RnynVTGW2_!w9<sz2m5q%
zNoRGP@pwX6F8JJM{(|55n;#Dzxw>K$LQoc#yLTQ?Wyf58|G&rl-Zs(U4wo-oB5pKz
zCVreqD~jB(7*80C=8P95)*5=<K1zh@RmLfoE^OdTK{XwdrU~DBV~el6{uceS7unk%
z@S%4#`L|!Z%HhQG^m{+S|MWk94y$}ffKh_gUc!3&T%gTX7Gn(B2cx}rkQF77mdKMu
zk$A|i`cZY%4^v0|JFe@K7_%T=J%I&=|8B9!>d(3EYP7<5i>T9U!f3a?R^-FY<EaYY
z3%dQKkSpjcd6rXE6<Jv^+}`2JW0y|Z@+a3{Q51oW;XQGzP7%oAPuSQ?DT!*1{&KGm
z4ko)tjK>Rl{fEQ}Q&!l@oU*?1Jm-6_Ut=-PY8;KEbQPn~2(4rO_+S4i-ENDIedK*~
z(k9P7`*@9Fa_EbXU*S7{{3je89<zFWg~wJ_a2874pj0iQ^N(Qm_bFn9tsV6OkltZ&
zBvBk<wS~ZyhN>ti^Bh+$h&z%<r+8&>m{aKd>Co9YL_?!w#QMexzxzM_CZGMo&oda$
z$g??j?rpKTwjM%K>-JEdT--?7?RI@YR`h#q+MO2NUZ3`pYluXnlavcdjI)-Ou@pst
zj65oi5hNI61D;pMXeF>V3{;~;fs#lcV~djEc*5cS5f8R@Sd?={gAv!?zROR1^21zv
z?RD<n-{ZoCO)gzr=c`}(7OuU@umA0z<-O0H$6HqqPQx%;=sF%=)!G^4Y4~KM!#Y^v
zPYINxtin_=yTfA|al}fmi&7p$Rg)nl(n*TNg2_~KeZ0W=3E#bXgp!JWPtk}Y9zTDc
zM;^Jv(cvLq_~z@pc~G$E!`|MA$+V)=G4%T#2K!s=R2lc~9<!KcbW%;CBVtvszS5-K
z)x_N%$N7}KY{r?@lr#MptGitN?yC$(bBfBKg+oUX|K|UCg?1<6gU?)`H7vM(bDP0z
zz*85V!MF-9BAiz^A0#x_Z{Fj>Pd>-y#Salt&@@Ll<GHeIapi>BJm&xS(sf)C6z><;
z)=APfpZ@Gs_V$lJM$D{ZZ!n;eU?fZy3yQqt@r%pc+?nA07Pj)d=a~)8Z>}Nan5DMm
zkxPAs(~L^Rj2ClcteKWM&Uh;7481V1!V3i|AhJ)Q=o}Jb{KLKA=^UxHv+%I36DNPK
z7wJ|wtne5aHhxKxAdCx#M$NmAlQd|rbi`s&V5@?vC@@up#}h?y7|7RYP9T}hbEMLY
zM~B$T2KS1TEcJS1`78tk=NWmG2Td1Y!`n#HQ_rlo0mc_1$ShG5k>@!@QP6J1T-j(t
zUg8=Nv*RHETf6%-W9W3+NHYanP%P%)Jk!aPzxdLZ>9o72hpVr%J(DEGd&Oir=f;gK
zo`3uT%9bGm0FNGQZ*#D};IEF3=)ZM?4?Oz}=a0rb@k_r(b$H0&^|#2&1*=b74s!Y$
zv89|xBeBMk=OHRv7!xW7rD(TXs3c{c)vEbg6Y|cN5W&ES@I*i((p=m)!`kX<m>bP!
z;Z&~Mz7V!}Qck;*2|Wl$yW8f8$1j8@MNO;>y}GQcoS;aajpj@zQ%1unB9d&~+osd)
zkTx5<`d4r8;(MNFcYB*RUVoF1{P>6Y%ddY0?<CJX{{;80U1w>1jaUh;tasVEagDa{
zy!Xl)2m6PVBICs?=lJsV9fsTcjI#+H6=BLE94tB}D@u-sV|wi_U@*?{=Jpn%esYH=
zWk@ELGDLUp98OS;geZ*}&*$Vt5iCtUSR#~Eq)AGZSw8dUuj90)-E3e@$zVKWr7O5_
zzG7$VHqBOxU-+4i^1uDP|Bi27eS=3Hxky%2bUIzK%+PA~dE>@?hO?3z_a<E5p3-bK
z$g`5EljK%0$!2uUF0+_A@{T9Z4CBKgE30eVxwB6cB}^AHvMk3sLmV|ZJQ~tV6?s{)
zFp9%@i4+M3#}jVfypNS3yYBqv8jWUz7csUHcq0Oj%1e$HGroNF8h`ZdyKEhfC@aY?
zfArn_7r*}VeDROI#GbXtW{jT}jHhE-D}9azqq=2|1Jy(dY~?{obfj5c>hj>hfJiIS
zBu30Kl&%RM^+6z|z?qs%<lm{E3NlP5YMmk{DjspFpQ3Krg%I^;8?ZQm?_|RgQ7gQP
z=q#;3jgql0h!e}u6Ea^cupUeuE*zM0bte<Yr<9S0Mr#X%YhQ|>#Zz^ARhAYVCFJuN
z-V_J{NqygxMS=HFmKDa<=|4`;Xf$Xxn?yPyilXrMD8iL<v=kI&Nu%9h{gI1AjaT{o
zKlqpYjbHiMQ1y9g;%H2kWpuh-A{~YF>og6d5o2jILTGF-!#nQY+os)avh!e{JNq+s
z_V&^C%{O_^`ZCkGB~DUyXBIKcc;x7S?W<S0{KTU)`^(tb9A^yKd`_d?M&<@<9K}3i
zJe$&A>XJxZN5Xo#?G}@)B#C39Bt9*9aVML-aDK%q0vy7)fOXA+!n>*}ln|$@*pu=S
z7oKXNQhQj6PbM?=_KwN2IX7?KWq<FG%a<?l$}6vckGObYmDjGm&ZCb$LfUMxb^ie$
z{P;(>_10UI#&c$=Pt#<4_b<P|O1sIsFP!1vt*d<W;u_;wM(gm1OHVz?%{%vaVsnLV
zugBpyr@y*HBhf7SOI#Zn23gKwS+R9=#1-2lZ?wpZf>Z`?-|c&MIJddU!C-ib-??yh
z9r@NVtyYuCbVeghgXc_!YHV&iNfl_Eaje-r8j_}6Vio2Ll`UB0IgK;xT)DW+lUG)W
zlZ3l>w;3Fd`M~p!^VpTMET$7W-3D1((rh=#O@R;!rF`uRm0WxKF7Dun+xK@UM9FNB
zac+H$z4<np26JO+CNaJ=6s5$u6zepj@r+0(Eb@wGSy4JiRaPPK$9t64WQ!c3BF35J
z#)Bc>{Ki$LSxK|qp|YWJ-rd>f_FacSb8+(-UcGvY*(~G1&JKs;g4?446(=}h(aLf-
z*yH~8O)i{m^46?keRGNVTN9F+`JZMnmGO1za=3Y2z1>?{T4s1K4%7o3hzCjt41y>M
zO9v&xcGUXXYEw6SCsnf(p#@h;6U8w)j)MnK1fG+%K@ATlh$D}%J|Kj=!&p~;hK}KQ
z3N-|>(Q1ZD&U^B_2%AAf0O~12k|tq+pafM}g(_VJIf)da_AEZcEqPxdy`+;ke&aWO
zmF=x<Zr*S4=DlNthuL66oFv3iLL+V9y+=iw*=!c()wLty1O}KS2}MzyZbwa3g~Kh9
zXeIgN$3H^5)kJv5A}jFTGoBxE<Hp;>X-twt932g)j3Li6gwo6x8Br8d<T=I|X43^X
z?%W3<P(re_)I&#uLmusRdFsa=#a3{5VUwHRy2|ju9r~+1hNA)Jn(IuaBc|g8vMM>A
z&FL+7Ih-DI{X1{*-K*Dd&T#3mO+NKYKhI(~p-VwkZ>Y3!C;_g>aa8CCyapj1Nt$Af
zt+W0N)`Bf;z)jTZcJIRm&^d>xLLV%|Lr<ZUl7qt$`v=D?_1e7t>Z^F+*}Z?8l|~oq
zU~p%PjaG-*?Jdq+++?-NIC$l&eB$v(xpjY!=QcJ-i!n*EPD4AS^a#<Vbb{-R4u5v*
zfNO8Q#+ioaXaDxEG27mzn$OwVpEDdynfR1{@!i+i+25ztjOng!&}vHV>};{~U<Yjl
zmoJ<};3$iX>2ylJ)5CjDyBoA8i^T%1BU;TC#bSU}g3MGL&JXF?gq5WwvZ4a-DT|y&
zzk@Lj83`(*(2>NMlJU_I>*rQ@{K^@Y-}4As)D{b&C@YIn3BpT!?G&4g=Ol3pV=Y(T
zyv~JI11DluTAJCYB9fMNQ!|<iB#!YSqm?F%#yO4Sf?Kz?kj`=U{vA-h2JwZU*-}Mh
z1w=_ir`zKw%h=h=xwPbY@5|3)h35LLdyJ<ULI^HgI>(bwU%?wk)NONj`;f&Vrzkvz
zAka)A$x^$ELGr@WPw>RE&+_~K{lB6RZIUEKp=mdowQy1rFi!#qLdhtOan>P~4hnkb
zNE<0}8X={ms6v8_^8_WmfYR89N^&7F1R<w)zD`u~m^>q@n%v#mLev~7DJ9KLo7rrJ
zjw0enK|SDBDnjE)nhDe41m_)ED^x9#EwWH)$T~>0GQl`4>$b8mB|&alqYp)pJO~xI
z>v_Hi2X&-a?KOGV`7=xx$E>ZTJp1_jdFEii_8)wX&2yV<Tv+45gRm)YHd`2DI3ABE
ziUJiSL9bOKa+K0cr&C(37W1ja`%qy?=ONO>N^x=R3<}4Yl}ENO82|tv07*naR3&x~
zLYvs>G}u^OMN5H}0_z=l5ulNsPC~!iCXQpuMmR8q(il^5cyx>qP?{WV*3R?R+t+#W
z=`PGiEWfeGlPafubU^#rXNen4ymv&ZOLC#XD4QY&W3o!pzVav^df`QWva^B^38u=(
zr&G@9guiiVoxQvF*xjFUINjr{?n6G~wKulezQ2XnH|brv#Q1o?i=1pasLR3dB(p$O
z**f4d99Xm2JYbr!Xsu{Ao2SD}kKpKd$S0qAf^2Yr^KfS}#dcQt*3B`0@0WiHu^8Y5
ztc{o09W8ieYrsGK>P_OW-Q@Rw<wY9CB6S*KpR{1_XvjbL#ujf@j`?iHOOLG4fBz>~
zf1lxB{@(BLe}3<fkALKO{+r+aUpc$l3VJ1_c>RsnNn^|E@-nMS%N!jYu(`3pN~c4s
z9kgqmM#5w|;pX->RTU}#Ap}KPoF<JdH(FHH7};!wxNd@p*x3-u;l0OHaC9_cw$Y^9
zYx307kDz1EU@!myQ5@G>QHcRuRh}+HWKBu+-h-Do1I@N#H1tff0;N4lL#!PgWjJ%D
z!@d0(I8!?kB=_%a^T_5|%A!IbPuKEQWpG9^nH5Z@B{!=h4n}h>Y{XpHSV6i4Qn!dz
z5V0yPLN#MDoRNsC2zikw!`nKUsoO}{u10vBu)Xtux8Hu7D;F=Zw?D3>A`hh<p~Wz#
z+vLjF+NB|wOtOIcQPB_57i{=CbNU`BtSe7P8S};b6bW4`dP8O7Jz17<vEQdO7O6tc
z;&3=5&vW`qOJPu*oD8^w`u~KhUX~T8nv@$wh`gxL#NptI>QINWDC_(_!C)}JR)#cA
zNcw$L6d~%xgZI83)d-BY0kSAyGM;k#)-Km>-=p8}Go8*@DZ|f}=Xp5PYj~eAhN`O2
zTGMJaPq|s4;tHmBDJ2IxyQJ+Fv*9SfK7m%N#pdQFgYkm#c+7A-XKyg#=FToh!wDja
zLUrgp$HzmI3T?BkH=aTSRez%yfTB8z&>MgEKW1sRAe+pvlS9&?q&Xc>42~Ip^)CS^
zO$Z}><HlWbYq;|4lf3-ycf+MicrP$jjw@$4V@VTOJHNr|#u}Gjcpf1LH<q<j)^O|9
z8w@xmpO(D+%A1VFGcK&Z!b-o*yefl(ObU##oDv#q4NTCfR7?grrCG4Hezw+VX}k<G
zEh!YeR1!5J{_N^De>z*RGrUW`mGbxB|3OwZmf5>{l|T4bU*;1Zc!B@ncR!8Oig{6@
zg+@iP_FqMK4^pR8Wr0u;m8~#kMHB~Tx=LGEXV5Ce7)RP_GS3%Cpxa7mMUtwhNE1b2
z3am4DX)#p>uENtmshEwmHp1V<6csA1`Q$3b+ORF^b-EB~jQ4nB@wIPjmWL-E3I>w}
z^U;*?v}8WZF}`3pm@psBSX*16C|oT>H0Wi6Kp~tbl0gw4wnUbdjv}%%+Ofk$0+Yl{
z=M|-IvnXe1Q?giCs1{UZ&TM$Z@F=0zXi*e~$d^>pW6s10Pi!u++>U8AEKfagnMql)
zeeZzCXACD9yTbvUR%rVZEx|{Dhwnn=602aOJ{1N#5Gb|}2JG%liPVDikH4Geo_?C^
zt6w8N78Ir;io)PnCrygt0B3!um~9Yddh1cjb2trA_mwDWI9_le1U7j@<xEH`HyPFl
zO6%xIL1jxsq-vGEtAk4&)<ZjPvdFTUIVI6jgO^ms)rMk+Jze_-l7_5-QBrH7ILvgc
z53{XyyUnAQFLCM0IeeDU?sOQ>W~fNhZnsI2hzP-KG9iv*EQ)!aQ&fh*@q{ePXm^{$
zlvrDk>V&E)m`$gYrD3VRg0+rbzs3IkK53&xv)vBwdA7j$04_u-7J0^*v&#$y$8>uw
zrt=9=Bj%u#91mx_{f$>Sw2JS1{|$}@6NFaGrV9=R!&)R9iV`n^t;ab>zul{sVL|IA
zy{{w7Y8Q+R^XMee;W~A<uhCjwV)?={s5KUooYG8b5Yda`Fi@M#sfI_qc=>7ecXrYJ
z4zk-vMJZlE)QE!JtCrHAqN}7wNRO#1+&pLd#vQi4_dOPaF-9gdn=M-XRd)6!?C%YO
z;?@P7O3<o!eEn}@!zR*}A)c$<?jnT_n?veg2_H&hB1LHwlZ7Ss2HA+P!t>y0pT~ae
zW$u0F4c^?|<x}mK7%y^~?HE^>(1uEZueT*9ivb}7?RJ~VWI~)I_4WrEoi<SO<m+MQ
z$rdP0Q(9?+w}xgjJcZsVjWxzFod$24>jtW+syByaS%%-)7!HOL8vT@NG$IxPZ!O+=
zqPW5Kz556m;atXOG$zsKv6W@_V4pNeC<=#Ff}Q<An2Go>INsU+KGS)IwP9g`vrI=r
zgs;d7!y88<Y+f=to{+?v2M>19O0n9FxVV;ZX?c}qJ7KwXfz{<6OKnNJrD*-wyE)Tq
z(QN2&fnmvJB^8F1M=zlIO-x=gJ{;5TwP@!V^Kr>&JR&bEX0sXDqClw#Ybt*Dbt3=h
zb~;qmA)R)>6&2Gtiz26}s?&kEdxs0+RR82W&Yq0JgP!l5hLltGdi_V#GbE)n))s(g
zJRZ|(w~&nlkt)(SqLF}%o5YO-?;%cNoUxo_U{+N{k|Y>wu_i>roxDy~{XhH)kUZ#g
zdh~k@mIN%MW2K!kIC#Lug^L^=9nn93k^Su*_I4i7?zCCCaEYp{xOL+e^Q;VQ+kD1i
zJfiF@Gph`EQODg|991nX;8a@UoU4c7by`hr$7;7*NGa*{yG+Z9d*eAp<tY!QND&VF
z@8A0~yzm(3(2)WZX|qwk7vUaowSV;F9)JM1kfBXN1zi<V7>c4o2}zo2W{U;-AN|IE
zMRT>u`#<(RO5I@f>=_zKiznaxG}D7EOe~STRaT#P9OEVFU_q5lIM#|)9~|l4i=Z{C
zw{u<wu9fftQF*je&}`FNS>?)8&(IqVDN5KG9P|0FeVxDc^Pj?bs9eBQRHdc1#hylC
zoiMeugw=kFyvTtNxvgqjyZ44tsE2*MutW$NQG};rxz|G}jczsrdN^tZsex313ZX=B
z%ZrC$lR^o!^WYSXq|JC%P>!a!whSCE;UU&I!oe&>kSHAO4>(?K5<AEjCDX}_8@KLI
znSu-JYc!LT(!ey!NIG3~6tS4)G^7F|=Cc`T+F<K=La(W42}xF#<ay3yGQ&y1YHt;$
zQ<P97X_G9sL}|h_>XF%qx9;vDTueJsG}B;Yl}fYFhp5?*%|^^xJL97-ond{o%lWlS
ztSvR@^)9o%)FVw(lDPg1B*amKt16;MW1Yq1iV{a*VKkXB7!J99Ym39f5u@>xJTLGS
zG-6F766i?N>-Si_aGqFaeBuL7<GrWTYM|2&E6Y7@y?vWImzz|T<<ZOUIaPTF%4!T$
zU`iYUYaHAAQ*Pee=KfK^WIn??h+-AONBqNl!_anxN=CTwa53HxM-t^7kw}qBQaUhR
zpq0ZoQLDW@mGcy3L2IdpsT@zf@a(Cc5FtWUCIop=g`fHK@C#r@ufi3jqXcVgsLq5t
zZAC*4io$t;u>m583UI>3XpY|O6Nv;<lq4!<crajRdz;l>m!+j9M|(BJq1j+Mn}?rG
zNf0`0lch#B8tm*3Y4zF|b4=wbw1~(T6CecFwptCmgKoRcTZ18!$pjrKI_(ybFL73L
zJehN2cb{hO3~^ME2#qxl&EcLPX~72^bmc-IaAlw<$~v>4z!oJcPU%IGNwxr?xwzVA
zIGQn<Oj+(XX=s?`Gh&%=HkIiA@b`X`Bu&U?3m)w3Am$6c__@#XC;$6DBcBWACgt*l
zHGcN5|2Uh^JVJ9eXZPmYG#+^dv2iB!(motgPI#pCfzM+@0`rNy;Neq5k+hch(s#bW
zy{&CN@$w6lrU)CclWM9qn!-D_gC}2I2LSv4EBZuXC)`64!2gF0;{Wd}iZn`Vj*kbF
zWkKE$WQzrzI1TvLA9^~TgbfH8S{)}Pg{?p(2%RvUPEc`!`Fu|097(&$>sz}l=3`n)
z&`!c!qikw)1no{(B}<tgbc*nrwezb?XEXX|SFk&i(`us1GX^{R6nVwP^)4?zzs~B?
z3jI!lII;xpc-Sia%1`_%aoj*iPpmcG2`b~5OmimFDYqZ&Fq_R84Jz_1Co2kys$!8X
zm=&6Akx}M`+*Fj-)Y~pkA_Ao$62W;O6|^)o6g>Ip22Y%C(QYm1_gWn6?vnOaP+F7J
z%%-QGxX9{K7a2!&z-olD9_1Yr2HsJp24;O0qS~`LnX~mMAyf)^k^gAJ@d-({47~VG
zqs6OlzJ+lLQ|sWw>35Rh3*JGzJ^4R6>Pn~<RQ_=C4b&St7yOg43h#3r4;aXtJS2a@
zJC)|)S}F=dksD0qD9ehy-3i@Zo3xQ~aHQz>d(0MdhSNDJj%e=>*grTzNR2h+skKcA
zMOKuQMh3i3{VkVQ+E_oMp=0Lb3Crysi^ZI>5u<Rd^tz$zaQ>7xSC$n?+QK>kBIvV(
z2WJBz!`Ac7PBW!kELhAcmX{iI(ukvMLRC60t}QW~8uGHBA0_l;g!6*5n6TLtTxxX?
z$^~#>r$MBH4^rRz%xBrzAE0|HTzUE&Wez|7$&a(Vwv3BXe33Cc-si#o4%37CtS)sa
z4@XSZ9cI~trN^G6zr2J?6N)OPk;X`0g>8j*xWy!V#4^lg?j0TR*?;?GHda^oYoGXW
zln#~@<7}AOxSG&Vv$Ib=z@X%or#csFgDW0;;&1e|NYir?PD!mSm);ZA?4%PqfRq6t
zOMPMZ`bs?2&eYAq(Q)X%tExgG!%eOn!gv;o1=0s5m2_dVB!vjfrYL4oR%jPmxXgJn
zFR@Vr+3taiX}3FMrUHA+hhORtskr7Sg|)GglGTo)+e>-w#b<ENaeQ#Z?eD!sv#M#F
zQihak>(LF(-~81dCuu@qDr{+4%rnNLF?s39@`^=PFkj@%GRtBzV>n-sEpqb0P?Q!|
z*?<>v0_)7_YTg)ESHTY9HDM1JDgoVS(rCrRNkk+g;z*K4u(r9u6Hi{|TocZpiK)D!
zDNA&s(2*v~EKwZMXr#EjqB14TG@_X(3Skfmq>d4)s^u4==0XJv5=vog#mbpA&Yf8$
zJzTKVNw~23D6`@woqnI(I2J`onk0Par5A}CH&|I-W^?TfZa!pI=3KgPp6_0L1EC~~
zBD752ODa<`oE9M)(Sh?}27?e-QLC+FP=0z}(=<-JmxM?!fegUFY(W|&Krk`OS`OiS
zxah3&p=Eczz6XNCqAGK;%rIRTvc-Z{tAX&AI93>Eg8|w)7RHk*$?e-)pd?itUFV%A
zX{0Dqpc@UARvIBsR0qNKQm?_CJ7eba39U3HR-S2@F*@GI3r|)V=2b;rRUt8lobfy-
zuO#E6L#*_iUFngH7Zk;ua~o?Ei#d5dM@7)qf}{nq%<yK;*;EjBQnZ`XYAa$XNEN6$
z{VLXVGP?*Tx+Fq+g^a>OLx1Skeu;yvZT|6Z{ZrPLyPUstfyv;2>CPSQ-rm8QJoKGs
zHaY*^XJ~d}+K)Ys7Y#~dIKK8aSMP1}fnWJm{=skmx9lGu^2}3D^TKm4@R1+;0Bs?l
zGI%Y>i-Iry<yZOW2j54x5hJxajcYf~Vo|{@CqmSabM_P`9NNP$^j10;n@?m7wq_NH
zTI46B4B|K$!U>dsR?;}#j3GSI2iEn87Aia<JWjszSqd8)>j-f#Xl{%}>6A!-TjVVD
zdtBH!gA(w<(@!%i223i)<<0Z-SI(fiG5yXeN@?P3!NhrHvl*Yhu}6{T9L?{Ml_g1}
zSXx=e8bi0!s#nq(3dOCP$2>?A7L_DTQ-*^9!$}TB#*(opAy7JE_jtm$-*R*gN4$RX
zZG?}}LZLhqMNtQel;nlM3qxr`z(a*Zst`@Cv_cBdfHMVBdSVs4e#ElQHP>VY7EThZ
z=8{W~Y>*c)FAR&K#3dcl)lFV|Fyzl~yw3fdeFl>mu`s;yJHJd<X*?1kEs>Nct%;-H
zJ3aBWXeXE)573Pk+Q+zR4B8`gMp6k@+aXb$%5iJ^h~*2L{FguXi=4Z-#>I;lnI8|p
zdx|Q|!jzQ6sV2*EMCCXhPx#6gzs~mlA+2_c!%}i@cbB*+5%mhcl_V6EA<_}Bz*=8p
zi$kk;a$kkY`W=RIpv(&vi-NS(VUd?)^PE=N2<@~zsmj95=@H~b8T^7e<ocmC(kY~O
zh)6M<=gj95M4GVLIm>94F<f{?GsFI1!LYE1Y(|<i@K}r~IM_X+-R=@=MYGjlGMUhA
zXks0QlxP`Ini4M+JBK5-2NP}`EjS#ESu8SURS>XR7dE~&B&Z-o$amD*BduU->zJjc
z;QUI5xSG;VA!#>>acBv;6@v&kW~~H~JV~7rr;d+^0EI*Z#JaHp5jngIXF_Eho(S!w
zqT5~KJ@0vh=ISb+`Q|nL`Y-$p%garku0}+S7*`p#U-=e(vBPBFQ5+vL8%;S%x_sh4
z{X1NI_Y3$)GB4-s9qqF7m0iC6wJ-D7<qJH~ZepW=RvnCI=qTaba)aESU@gLj9YqOc
zR${%!;OjIKhqpGk`HdwK5)~_~F=2)^7c^y)SVwfbU7Be^R^~uim+p0BwsoXw82kwp
zG6$cyas`3meJ?%FYd3EOv<IQP^e0y!A!kiVK~`2oLNFWz@<g-QAe)Yuj0UH(j6BZ~
z!gDk{Wb3d;k@vZIcNc37c^2{qv+<0g3~TBv%c-&gXKG%ROfZ!}>kwSwtquAfQ}N}`
zz7pgf&JzpI#kCdQ`|JidPi_nL59Vkw=WJf#qb@!#ndKSIW*BQxE*#L!hD62*>*vlR
z;x;0Ra4HI0E*mPzZll4`jjI9PCr*sz66=EL{d2cVw&nuqGlZ4=M^CL&O)}oRy2EY}
zE>h%m2BxCfZ!xJdr1LnXkWr%!VF0L34f9$nDpLhEQ|+nq5B7NS-5=s>-`{3)-SNV6
zPtjUFL*${^U&c#|E=r7b6xP#AV&1rWk9McS@$d*DMLTUWK0c<fmV<@h()uP3_O`h8
z_8sD=i7^${RBYY7!P;ud#%h!0ZVzuIi7z-j98lP*9zFc%AO_%ci+!?q866HVLUMh3
zhYK4Qu~w4R+e3I5FBgXT3f)NXN-{HHxG!84x&;BbFF2m$>>YS~oUpxn8!H^w@6GV;
zbtc&i;ZkC)SX${boeaPlR#sMMwL18sz}uXAqnxA_@!Gv3KK<o4*&U6j{^~Ay<*8n~
zSJ#80?rtQhQgmCIGu<xBy%ybe*rMiz<-yK~EZE{n`z@Ni4(+DGS96+Lpa}XbEkUTD
zZ$s8&0v~jk&N(Cjb1l6(6_-C4=Um;-8O=+kg`qGexH-}UEv-Y~_~~E#MWX&1|MhSF
zK7aZLpJiz!;kSS1KjV>0=aAa4`Rp^ueis?V2mwV_K)XfKT*9UXp*kQnLTiNal-83i
zGW=?fa<L$m;n4Afr+Te*3l;+dbKu7Agl@OPndK$Y(leVJp3*2UUB1LqFFwt9dxvY+
zt|7Ic-Rcm>5v8q|F6J!eB~>|svmKIHqP&87t2UcYf{8jWs1`Gld><zT)!=|KpAjhq
zUZO=5O8t8N6?xDCQWdl@g{$yL275c4KYxj{cZX1wY@Y3NIDCL}j-A~RpZ&sjxs)cP
z6ja872xewy!P$CN=Vcws9&pFr2jmPQ<K&(YN|H)gN+iqe4rf;SU~{B%%mxA35qW{L
zmP98sk{GQFPRCRU2%7{6g)M3;lb{lk*LMwHxOM|$EoD`O8_tJ`&2RnsPtoajklql>
zAhz^gV1UVDMw&##wG%-{lE=<(@X3GYdH(PZzryc+?z@3pp*^$G5GxR6cmVmjiVbXc
z0U|-lsMg$w5Y|vD!@aSHhNhvK9E`_&>O&u6HlLx880l##fzBPy3M7g|IA(dlgRKKr
zFVATtEv~+CjrYCuBCVq2%{Sg=e=_0uXP)Kg;DEgFL`nqWNL6rlxrsrtFgdN%VY3ob
zRWzEKrh!Q<uMz%aBOR_0;U7{&ZSBICFA6dz7|aXyh6N?Nw37rYCHIeZgK*W^)6SwS
zL%?oTFRDN=n}u*+;VsX%mzZP~nT6qOhIEEY7te(UYLYM*9U^tY{^23Fx9{VvC5|;a
zg9%b;in1m#m|&Cp&f9-RDmAUNM<-EqS}mFp!LJueMVzfdF(DmNRw$EU@`N-^S?;9t
z9!Yrf?ORwE%+IY@lQv?aL=sUUX`mvDR}p#cm^;rbw`iZSv82I3T<1jyA7b#3VOcRF
z;nu-nnD5o&8RI;YMTYj?)9ALrS&Y;~k)o6iFAU2|eMF5#C5ib5zxB_!cKsezS+Tm(
z<RAUx-{Row-{S1KHM(amyu%@`G1ky(wUJTGz3;usa4=;uD=5q26dL+Y;=zNx3IEHd
zKTlZ&q|GN@eit8o_7c_>SZlfQ)>|Y?P2POvoAmpA(nOOcAf+Xij#z6NQAC+_p$akJ
zqAp#>qcK$#M5*)Ph|ZZFANtUHsqzUQc==si{geGuLEI0&q?8Y7kV2e3Wl!xz!ZDs@
z+~3_LFN#o&NJ(B9(pE}03P=@Sc_!I{st7{ZSV^=GsO3=Gh3}&PjiA#?aL&<8B9>Yy
zkrY(Ua&)vq97S}SZHzT1=C)eMr-)NU<YR2*NRkL?9JmrmeEK^T*0Db_j2H8uZ6k2c
zqzLWF*p{qzQex>yBSo4<#Eq1@4-P>svAnuq&y4U!VT|SSm5XRBoj5`zidae_6(Lpi
z(BEclNOTc^koBQ;B3(FHpaeV+UXm9jnX(Ly4|(^a>l8)C{jK|4Sz2Q0{5sAB+lj9q
z1VRWF^97Z)9PaLMZY5!9X@%YW0c+g`<Jp44{r%dvX6lMo;Jl+KiXbHs3R_lGS%EOY
zE1T*VYaL1k?2l3*8VrAeY_5HUH6Es{EPK;}w|0jZ=MhQFBsWa+l4M#Sw8YMfdW0cR
zKEM@2l@X!z>01)w1)U6J-`R{=?wHO;WZ9J0-g=uwUXYuU9EBk8#7o+Zm?SGXlcpq*
zCTT+|HL-L=I&=))7)(_`Szsn}D(eH*7%1^nLh#fJ&mjaX<_o-clzG8;JZ6$xzP~@`
zc$yIbAKd5?$1!mn6FGsl@Rhqm_NFDXtROcA>mZ5~p4(_}ak+sHAxA;v>pf7%ehJBV
zKF6F2iypoNps9y@f}jH4T<>F75;j)q6~70m1-{wj==ca%ERf2Rrd?JyHYjYxTC+<f
z!)7c_8zfPRs_ZFRHEy;@j;DC%Fh#A?@_|?xo-&X&5{j}y>i`Jb-ao)SwTV>lzGpAf
zta9Y|fXALbk1Gp`MTsj$XatEeXcrM1&Hd4YMbr#WPa)7EK+P;3B^42tY&5|ksY)oa
zS)iXvhdL30)ILQBH-z#vwBLHHi11F4CS69eoc+O!=brCS<OSB$!I)kUYt2%u=_mED
z&^S7=V6q6Vc;&;}AZ4hq+KHmmh<Wz%I?rD@&$r&b!{J18G}t363l;=FSG(0BQ4w*?
zcvsHiy`&R+l0*|n3h5$@aDYYEEsB<b7@)Mm8OvH0plQZb#1a~f1XtTGe(l$Of%Eg%
z!Q=>G>XTdXN1yoyrE>^5$D^>?Abbd;5X8txkSI^8B}#(!b)1_zNm`MVPU6vFCW*i(
zM_Gc592UW~8{53=q9%<J;;usAXr~$<MeObD^5naoCod|Zq=9XwsCka?6(A_Ar@Ohy
zAN=!A^Qm9_YkcvGukg_izRbC964Ho(t=(PHMwilCwDcsgVt+iLFclRRQ%StH<nyu)
z?+`c<$Rq;6WKmG~iuo*OkvS%_oY_2MR%9#|8H*we#2bw?pp1e<w?-g^<xybd36vA~
zFtn|gE%5Y{m)PGwB+ClQ%CNMw#P{F67m{YI1XZF0XfNnAQ<^%k&YQYLGgUOA2FlM7
zr68Zpz*dxtI#t|*S2AqAl^~Kbzz2wtDr5(KWxrrQ&zZZ5Ve0`OfA5nNwqkc|=(m^1
zXER>AyUordSg9&!@lqg_Mn?(KI=s}}Ii51gP58Zq#tTPTRm`fGBu*aAoux$mz&2m7
z)K0?jFMlxWQAvSzz79^*66QINo)?&fr`6P;Jw8s6x{DVXk%qz)oNY#|pKWmM+h5`6
z;DAe?`USKzWZ8nGnv+m4&fIBba`D+GnI0Y?COM55oUNeVka+KLHYkNpUP?)Ny&fLV
zbUG!udxw@R(UG9l>X0vHw5-P`8Ycyslb}mMv(dy<war2VMz-{vmb&Ru7a;_@Tid+&
z{+D^<jkkYfWp!F%)tsgiM%A>axcTNaT5-hA&MsM&y+cBABCqfy0@`Urug(dK1SF*<
z#-XIg`x1@h%DJ<={Osf8@iN<^IXlB+zWdq^U-|w4(|OMO&o8mrmbltpqNFF51&K5y
zNHP!jl7IJSKFnIzvV38g2u~7e(pVFx3gHbJkFCuA&Dfj8T9#h-eZOzm(;4qv!>y|B
zs_JHwRC7>s5=DxXEXx{TIksaPkfA7mp}-G$2@(ehkOw7*pYo6(h-1V~5EuajDNv+H
zjzr0tY>N~rPHOg0-CeA%uJO*pxo6zNH|62m=iX|PMsk2^RCnDzb%wpyx7L6C2atlw
z26p~z#8>X`GM~@!A&})7X9W=B(0vF5@6d@n{~V%iiGx5(bQRdzp`^q(OR99FB4`~y
z_oenuN@P%^dYK(atIHG2=X3UU_b3KA-h1YY1;$#MMa}w_Co2jX2aCl5rv<B<8#F{e
zv8q~->X`FqeIUs*uJwET;UE1ezxF#{qSx>6sUQ9*BEZ(>7L(d=bacx0))k7ppkB;c
zqHaZ18!8W4Wo=k%{NCL&Ksr)z@4-_Z9xI#QQ~&@V07*naRGgt?hV#*RRwj{=o~9{k
zR$`2ao>EO6n}HVASZ)AgKOH+L-QKLroAWQe`38AjkS2<{F0sylu{4b(QGyo-EA*B`
zX&hOvN54Oy7^dW%KAj>bNfYXmV;;V9pFGV8MINu6Hnm8^FXvoexuhM{Rn5pwnfic|
zDSO8gE^S|9T){WK`sdufewj2)I4kRm@*<Yr{?A~1?fdy&D`+W2yY;_tytsIt^X*s5
za=-ZVrQaQR^q+tE>olV=D@uWxvDw>X`{whkuB~zJ^*0DgQ}lYgbMHNV{Ieh8M_+!P
zJe)Dmf`fPOvgoYxZ~y$uJb3g3WlApf`#iV0#<%W206W9l9=emF)>7*GPx#bFuONiQ
zx>h$71U49)yWmxY;E_^c8bc?`NHR$#lE|E%&)UF8klx32bL1+-5Y;Sd8e{Enky?RA
z21#QooR2)I?Q2(Y*75SkKFl|FzKjr&;1<z{3+D5ar~6ocVTPuZz?6nsKv}l{sSuc8
zW9ER5K20|_S6N9NT^&etpr0oQnc`LxZd}^n@@k)MN0TLzvohsB`&VCKe>}%n!^XxY
z`*wlIBp-NgouB>C8p_8JCWeRVXh$s*{*Nzxi!@CbbTltq-(dLsI=+nZpx`~{w?}ZG
z<M@%KORJU8vXNu0^}*8X^x}yrB|;~75nW(|kZ7G?Tuoz|xH`Ad9z_O?wH_^1tMiOo
zT_;+AIzTX<ki(*`Ijm=7S%wLoJjoG>W-^OvhRwANZd`vJZyXDea(VkI@BHbXvDtXK
zc}}Poyz}lJAN%2t)9ZE#E&s^Y4OzEKW9n99ZJ5m){=0wjzw_%`8_ep46&d*I*S^k5
zzr)GNDOc8pEXrBrm(5_|1cEs!If+zcd5mi}BBllDM8{CpPOl|Q0|DxJiD`9s5S<^i
z(kLOQU2}ezC5dW5`(?orBrPdxIo8?`sGElCYwO(JUgy>OJLD>mb`nw_$jyR0)krPb
zym6hUF5%troTHO5O>;_Fm*4~c@y~yOm8Zv%YOyQ`GBzi^wXAv8vYSBbXdw|H7T4~u
zPuA&?6d6gDLL$*=XBo&8jTZ$#%rMOI3|ZGWFEA#&?;u~ASNaf1-BPKT9JsvWo+(gE
z_lyuAP1E*psz{OyEt7=jU%G|HQ&*n1{_UIGyMIiQKIO0f;?J{rWeqK$BNDtSxjQa-
z@4X{ldj2}MxBFC;<&S>rU-HvG{nPx|r#{R6$v#R3HczMA|K``({QMUg9qn=Bg_|7Q
zyUUZqWAF=%4Y-itLgbUg1}mK7S~0#UTzCUr+*c8Zlaaf!1Z+k7ht67j@Z?&zab*`F
zt=2^g3;~QMV>YjB^JHfyc9?+m{=5@gCWNd2@IVj0tn^7W6x}Qq&~8r9k|a+l@`O}N
zwDc$+xO#b$-Q8Vst$6Xu8vpReU!t3)C>h9<Y?bH7s6^w1BbBimx%*&0rl8;u5|kEn
zx;aWI)&@D7!~VIKeUfN&5&>Yd1b$mEXSuyPkA`YBS@DL5;Iwy<T&oj})~%DIiaIT^
z{COX-j2KZa&anlZBvHO3;xfQB5zBGyc#9NhC0i$mC5cjEEtn=Sn>FkooN;ZvhcPwx
zAMbE^eGB6S2PZR(6`Y*R_=A7_O}4i-Xfng6e)?rPoeq=ngoMCrufD~9@sIxnzxtd1
zE1N4T)K!h}AZme^66+<GH!tz{;27{cdGwH-$B!{0VS8ARD~qs>Zl>|GIcqC@dPzcO
zHFkq*!!_1cyL|WQF{fw8%oi2Y8l+AzO+%hUJ|QByKA6VR>-Ct==M+VOY28F(^qGpQ
zdScSeMaSXe$P?Na#TFkGLO|1Co#XiIj2C(-SBfGMZ_`LQ>E#J&n;Y8g_V_nnxx>+H
zfe;A-aKVtZ@JynUHV~tYo^Q93=Q#lK88=%`do6KJ*GTg;UT-=fNm8VY8o+0ZO9)VO
zx<~?9k)T9E)5Pm|$q&*x2K5F)Yr~U7tdh3dd-fqjEcQx8jcJyht6f3}=u20(*xFj9
z@fB;T&!Sl{J3S@OGd3=5vc9%LxtOy%8T0b<TkL;(kM~X|nBFP>;Ael9d-vYub3giH
zj3-lm?VtS<vOMMEFMpUCh0D9V{k1>G93SzZGvE(jeUq)V6%OaetaR3BY7^D--s4<&
z=0gZ9W9Ore(6J;;Ejd|1gmW&;xlS)Y)9SXsMxKj};HEK_*?a*ag70hVYv@FC_3CBB
zYww+lY<-Ai)TO4X-$_YCpwsU%olNL=b6)=9XDA;&<|lsaM@f?o(pf(9(U-XM?me!q
z_8<sy?a6f@O=9sCQXyokf=?oiK!{ivUw-})`QuXtwvP}J>*9MTIvsjNbeq&|!B#qs
zzcCzBo`b&2$|R*Y55J5xye&9VwTvHeZffY;EJ*Jn4q~mnuxA!gFL`k@#nxQO*gb^S
z_a7fSDc>fxM8me|co2P=98Kj2UVxVvBUqGy!C=62w#%iB4o`L;Fj+WIDR=Jfve~=B
z!i?CuwuKaeZnwkZhkI<T6}<MweGX5KIXFDvgWJP+pS9%Q>3oV#GydimZ}DT##SL1w
zpOGXP-+AXTPeu!RdCF>6G0bwLu#`>7uvbvznoFyFF0XHp_i|20Q`S0LNF^CH3*LON
z4*`04PNElBYcNfN5Q?U0=(J7-&-$q^lg^i!lCb1zMSN9+$f{3t(teKtC9>AH3r3R}
z*DeiNEEZ&mqDVFAa^x1#{$^eqe9-9jI`A$awTR=Xid2DfAqae5!8#9eSq4?GTq3l+
zxm0b@Qju`FTs|$2BNg$v&XSF;B#6+Cb@6^JTDzE~>#DU&Nc|a#$TD5fw?>vOsurrM
zI@cCMKwIw+J}}7plx4uxmc}WHB;oMrkhROJq{AMEr>9J|hLl0Dn3uRF!H0%7UVDw3
z+gIt|zKK_X$NNt?IT?|K!1ndqY;O!XeRQAc(HUA7y!&88zpwe3zw!!4yZf9To}%;4
z`_ga_QJCtT$2+h}5irrow6nt0!=mz(0Y+uT;mMpI|L`W&bjqljuyv_VVoD-8*0!0E
zf}}e{5Xc98`fCGBQ_@W}-ORJDGggKJ27{cYEMqbV0WTFDDd<cm^n>TKFWf>*4M{#E
zSsd`<aKPT<U4HWVfX}4YSuG_0_t)=`wPURek$)1cV+?7Uu<Tldlz1;ecx)}0%}YdU
zk6Sf0WnF>1ifA=$v2~B8asXONLhIu#lY}6m4l;z;5yfdtME8T>+OAQ8kIxZ^g$y5%
zs7Tx-f~KHaOY3Om6W3PJ-^sYx1smfjlw@8u<m*GEP%(ed$BS4?iL>Ec$Xx~a>T8c!
z>1%?wNG~`%dxxXb8NI;@)=roiczQTvG;Qc!iN0q=(V;O7(?*l|hA)0_6EQ!fo|lkk
zEDmOfM6)<JV&mEszWBLUcvDU(7d7K~#l467>>rPDHgHzf93DF~vSsu8xGlqS^~z;F
z^imI*LAJKRbUbD{o-&=D&`nby&`lkw*7Q0Z#*-;^yBW4NY6-P&LsGOth)BqdMIl-X
zCy8uL{TjfN$Q-4UNIeMwha*c9@D^mwwQE;+@a{tjm7t{}5gM%$yb$O#V`bQ9elk8k
z%(Y6Qb+$^|YfL<ITV05|&l`jG_p!mcNbCtAV4RJ?C_-XQjq^RUjs(v{M^#3iX|g;+
zq^;9$5Ok89UMI)5Sn~1^TpoDd3q)xDF7fPZh#|XKmS9>Ji=|BtL{B`evlJf!^T~{F
zfAv+;B1g<4!R^ZSRlfF>*BQ^@@q4EnpK3;vlJ&K#n8tB@a?G{sSFzr4`0jh$9&XUL
zAgrOEX#V7PzQp+Gn1O4k>YBx@VRklSJ#6qNzx7A_!Y}=M+<xvRU;fG+X5|H~U>P=H
ztRacB33bsYEpjHk4u9~Sr<4t#p%|>N^??Di8<**6$ro?m<nZAG%2(fvYf$6KgJh-G
zXT39E^kffF8G2T7xPQpatjFJf@fu%v@j6%51_+wyV`Sq<BfaI9zwk1@EMo}8+!)^Y
zAO10u>69$Z=%ooCl#r*I;mcPMTJw#2Ph+%~^^rFI%tL8~YaJYYu<eB;&pq6=R-{Qv
zCCX>OM$S*g_nmIv^Y8J)i@>=*$N$@tyTvP(NkiwSYw+h|%ljX){pI2Z9lk#bV;QKi
zn9nI^ioM<4I97&Mo&+tf6JNgzu&{!@5g>FdeAZz-Oy{#Gb7}ux8>00}l%sU9#<ID!
z$!K(jw+lv-5h~S$M4|GOG)X8I3#1S{7+L<8U;i>c{L06%&hz+a!RfrgI7ibM>X{*F
z3B{q+V+G*F7dE(d^Enz1E=jrl(uZjlGoHNjDsMhKh>M{hFvdhb^Ii{K$8F-06l$$y
zI2<yaPS1h+rJvN&lWQ3|p;HxYi!}%ry{EDy!x%%6r=&^B`1lm?(VWqHgpN8%Aun{b
z%T)2@y+bQCTiPQpTY;s0^7+p_^YHD`D&j|)3ndBXBU;nM_u<3RR5Ru^B1CjkA$C*c
zY=UVFRo%L0gxG~jC9p1w!@&1Uf)|BS!uLxumlrqMmKEv78Vl$6y+8OiIxU#X65(NV
zHsiIg|1lqW`IGb#!{7Uf+x+t{O?d0*jP<pYt&L57>o@*@>TJ&ax9`#|=jeHb6OMZi
z54d~xfL<?UW4Mk8hDZAoQmy#=Kl6FM_1f!bogjRmGA5D++sE@aZt#zO;R|f6bm^vw
zG$BSoiMZ+bsh`|n?a~&FHI!wAwT{W@DWlUl^2!EXE%93L%C!NXytzgb1fx;Oy?^%4
zx#uidrpPnRMn7d^eT7ed;<-3GS8@I8jmO)#DGDyGkA2)f)5#URwN)0g0+AHxPLJv2
z3>_RQPchb_MW88T8c1llTd}T41UiOD0NB>NO@dA&O2$}je-3b5WDRm2|8a3)1|iWh
z0179f2F{BpbqUtC0SEDda_vP1f}kXR+1j^SGuO83m9Lo2=3JJ7;G$8WpjG|{hauY4
zCMqDL$2-N|$r&HGzQMGrAb4zOkTPRsu!8LN*xTEW<AzFOcM+n%yWQwR8{MXq!Z?Qs
zlAM%IuSZ$UA%M4n+b_Mqqk9i%Y(T1%G|RE3A?<gOjiI9@naWw&yh^$7^tuC{yLFw$
zS_Zu?b=`1!I%3wCctfi9Z@Iqnoo{jXowtxma{a|?WFL8%VZYC?+d&B#EpOVIDukpl
zH35&(2~yL_nxY%0wb3_CN)<y_<9tn;rU-n??vK33vMi(5yV77IZWC8&o;-^YT0sbs
zL?V*t;t+`GR8q8)KwAa8iUrMH+~bk7{7hH1EMDz@h$%r*A<`b+jm|A^BmtddaU+~)
zq|mK&CP8>hz~j8;(e6H<dgUV+;B2uVcpKT^t&H5W+!_k3710$Xi1>5Ma9AI3Lf}Lo
zQM|7+Tt0-5=$$*?Wvl3LdU8V2E%??u4{<_bRN(jj^ecSx!HD}OUm<wOx9_~oWLlDC
z3EjNQ-Phlwn{@d0Yj>&V6$iV=)b)bT{KzLbJNgDPNl26?PhxuT?dR8+EoQv_@J(DY
zr93&H);*Rb*ZVjEJbk*)`qm}-iDi5?V=^9bcyLHLnX<dL$7C|0-|JD96^pW>+s){8
z5;j&hqDkA+$J|~i_{dAoBSb(Vakj==ix8SX44&)^`k2swPiV@D`84LQg=bgUKA@1X
zfB@EcNII0crV@&#@|b*;!^0y^pYHI{&0!R_wxq@%cup*FgYz$98IalHKvK4+C+GOW
z^2tIA*8M;i0%8aCtfuXmZ~OfEef#b^-2d+A2mDApfjhk(ej4z2T#zwqQb-&csdJLF
zPnyi>WjV?RW(&{n{p)WqO}e~rd&scUV|qH_Z1<F-#ez<!pvXHk*7A*aM||e?23eZY
zNzMEI?&atJkmVU#YnnyLWHQCzxwN^-aAn9~IHcF<Fexi+U6W{yF@e?9P2PU(4gTP_
zf0rzE{K+5wDRmQg>4$D2rDU~r{8XlDL1@)#`MB_G_nv@f@8M$}+<lj8*RF7NMWOXY
z9GSwA7X@WqlOzdEQ&FTjjcH;B;ys<BK!h0TaOLt9c6N4f?TD19`28xSn9t|!!4W@$
zJkM#K**;6DP)JgxQM$b@yr<LcVOn0D5R$C**a`%+kK=#bpZN2l{Ot7yu>-3JcqHR`
zL0BHJ?W1X;9k-OR6I{BlKHDBGBj$E?cDVV%Hr@xMXw3(f!5k5lcwZmCbX8eC+j1g^
zoW~_e`~BCa_W`}A41f7&UuD|VT)94^dB-td7)s~3w|mTY?oW960~t?u580bmOeZzD
zwA@~ieCfA-kJsLL#A<()<I@p!uzc!6*Z9Ua?l9~W<QdG$in?kr!m`>;P#w=aEMn#$
zk#cZye2VU_o`0y;8~)LM|7(2i);btRp&XeC&=_*BN%KB5j`h65a5&)R)dAfkW0+^$
zyYo67pV9OZ(nLo+VgM&4q)Bvi0Cbi@QBZ^;&dKxEe9yVq9=F9)$mQy_y|J*oH?8@v
z{+};1E*r8e<CT|Q<gI(}F{@_$%8!3MeigwHTm(Ut<f1_N7z!JFIHwPI1Hm?teH|j%
zRkonFmkEhZsmy{T>EK;`J_-grD#ReqU<58$P@3RMyo}>ZPy(q__73*h*jPiWjOSi>
zg_n+=@}+M-AWt;CEMqVjkYyR(2kzZ@oBjC#Idd*;u2bYWxlGBk0a6E~)-;Vpwk&X?
z6ep)O4~|ZFd^kml_#XDAH8PEWtJH!NMY)*KxK-Sup_5(!)Di!Qqe!gE9-S97HSFx{
zM=(}u>ZZas6~FpF{!jcyT2R+DXD6p|^Hh~BZlu^;TP4USoSjZ*Ovfc@x=*4d{k%gm
z=y3JMRjk!`8(l<ai#b&TXN#Kg%y3jsxc|-}FKu-xGDnhRC?QxKtWsMOM^)=0o+K>8
zL5K0YBFPh$`G86Wf~)Cd8D((j)~VEckF{~c>h*f4me_2)K`Vjw9`7s(5}_bzv7`VL
z-7dDpMYW0}nrq_t)p&y!5^H@d6y702I|>Q~NNO7ktCEVd#e&K-I0yZ1m!w^I5d=~t
zG{)gPNReQSMQM;i;atR)Jb^@~1k=RBmPl7f(*#i)2q0VO5<XD78bN{)bqnCj7AB2i
zd?y8sk0Y*Mn(xS1tb!D1(dpr(;H_6*qrbVy$3OZ)>_UWLYh#U{{QN6)b9nLA^Q4(Z
z%_m$R7ARYCb&#{6u3)XhuCFku9WQQg@SX2Ip<nb^l!58Y(J6XdyR^>z$ESSyMa|#%
z?2qvEufK*+DZ)qZ=gIp#5|*1nf%P6HXMFZ*L6*X>=%ErBHxjf_;W(6cxT?XPO`(^b
zM~Le*C&@DAqX|t_;|VmzV8$hzXx0aVxD63404PLc{o+8y^}K(kV7UMX<1<R3@KPdm
z!p_kVhCq_#bh-sao<pKRM=45Jc3gn<vCXa<ixRPW+CMu%EH^Q6T}i4nLP#dFk|tQD
zvneOXXI#3pj*_}%Oh@X4*3q9z_!aKlc?hPCNx4!-9!nx{E@d({Na2_@(HO2Mq96XE
zu9zP#BF-QbtDAp^+36!T*82cVr&G$ZVR!$KlTpQJK8+SY1cY)d$_0zXg22W4KD47v
z(-tG|J=4jIkAL_Iv-yH%(Xi56Iq$5Noyqc8&9jX4^>yyuy~k`i2jcdq-|L{U%*Pdn
zc8al%wbdcLE)cfxA{K(h+*3PG<s9?IvwLQ!TiQxM;KG8xp09E5-A5eHEYjQPu&D%P
zP@L8gL>JC8Tg@31D&E9WQr9&?$+&fHyWrK$H8$7RNT&-94i4kGzbIH44)D&B<{5dO
zMN1+g2T^NHo@dNvGp=lIwm4r#HJhW9Kx^nINvhO&$0U^`%~O1$S$K<S%sG#WXL_F~
zAlHa?atR?|yglb*1u2=-H9<<UEXSJYX_Y1kAuL!5#v(Qsd1x{H=l%C-Jj96t{vgg>
zhut$j*DmuTk^6jFi1ydMjs14Q(*!tM7#<%Tvp(puXbmd`k>4k!Lcf0ZUfiG!hD@dt
zF0U6T9gXaThV88kt=qH@4U=+4UDb4jCK$s;n$T!LQY2hepsP85`;#AHG(I9PGKyr4
z;2ZkGjA@#%+FgmAgv!YBE>#uKAtq?VwQKxG9Lu8ccF^hY+*%I}SQ9~GD--UX85)%`
zcZSA0j^;D$%<&VwmXsC*I!Tdf#$-{ENyU6}O1IbL_U+p^9HuFwGpdv{wn4X_t|z*g
zE-wMmj;$KS=K3ZfT;K?ek9Hxhi2)joZAiSvgy^gwBe@B$ploVR502>d`V0phgj8JJ
zx(v;GtoM5$C3%)Xo*|`--q}@2cXge-j_f9H+_~IE${4W}*Vq}y2P3XsyUNk=KC{`3
zOm>l~W@}@W$!LbsiphKmNSdaO`ZK9WQjH3ZEbFp%X^ZS&z{YxkYsLs~=&cMudkl57
zzzvSz1ifAn?N?gGLR>rwn!0WJmp4+&?F#J%jWjvmtSvqJ3GIn0BuSdHy1K@juilBV
zS9yk#(Cv0862%|iopM^o0(4~}`Q&xM+uz+ssyJv!;qh8ygk*nKGqoX7`J!tciGWF2
zvbx$s<qbN|7#*E}QuK=s)7=q`iBN_Kpp-tR&}b!?E*1nI=nn?*@Q{kxY|dmdWo>m8
zV-3g0$B{!M0%!@r$7Mw8lfDd?$n!joz1Cu!L9`T~wQk0X&tK<cG-{~=Eq6*O#`76T
zr$dq^2%-g)cy{a(QH@}|Yn{uYZA;X<3JegmM2KkbZCq&I=LO->IY-gyFg}}IJa^!H
zqrd#FEFNopi<c?9Z&+rAE*CuUfR!XVrEvk%ET^fctK2`GptGE#vjxS<ChQ)Aadfn9
zx2q{xs?i_)$SqQxAf%+5wd(2i!%W(3nUvsM#anN_NtOl{i#bmY_9I6_XLO1#d7h(;
zM~aFxQ*8CSF)+b^Rvqf`ln-yOBN|6_T4N2E`2wv{f~k-spdvV|L~H?_iFt6=NAYR!
zA$GL_o;t~|eEltgQg|i7dR*i9#O4a0^EHZ95Q5#Eow%M=IlW$&j$TD239hM8T4RlC
zZz@4>fqAoN*}vl4`XqX~cR45ENf1bkwQVwrU^btlTJoJt6i$JalFCDtBuLuArc>50
zUBa4%ahp(5tBe<3yvfO=;py%n<$O*xn^V^o|H3BS;R+}7hC6rO;u9bHFpIL}_1Ew4
z6F>4vOuO|90qUw@HXgGW6bNq__BxDD_SwF6iOsEox{`D{9Y$w@^)iVg10j-5r2t&~
z?wv&j2f?6`?aAqI#?l`QxVjE|;~2PUO$>4kCXTtzI3&?MHW30N0|XUa4e&^3;?1uw
zqS>RS%p+vV^|dakoRNu=*>p;l795ODxv{;8#Iw@N=wwiPK!uikY51@I%m18T`IUc)
z=;T-j`%ezZ*9KTAI4mv7*qAXuJm9VOtgWwc+*A}<hAiSi9Z)SflJl|7Isv+6wo8e#
zB`f_dRpXe?=Rn-D4TnR@CSq!{#e%_bg_V^R_7C=O&XMSpq{Swed7II@Jz#x2DTNSm
z!Q=zRIf`6yX>FC$MM)6xP`A#Jr5Ra~gST-*CnLbmQWPFSB-GL_j|7<Dsl7)fk@Dby
z#uFWJLrk}BTAS|>U@<GP!6TEnm6T3I8|6Hstg9%Rcaevu^EA?4vVxFkwy$i{HIn&!
zPF*z-|I-?sNU9*{^!gkg8~}!*D0sTRU}ab#T*f!Qc?T~vojhh7zVO^-7A9Is=@)NY
z#ndJm<on2%!C693)F#fJ{Xw7gwM%qU#q@Na*?7)_6xLSP*xA`-b+t>=G~9c9h_!}X
zC`<_SI|X^7Ns=_mHnJJb%<;#+|1}Vv@%|}ZO0MOCRR#aS=YEK<y?e<0y+h8^YrUXe
zu17^&<&!9$?46Q!hSX+?uNsQHU|w4YFdB`Rtad3vjCPk=vv)F$`nDD{T+HM4$<{U2
zIFc+qUr#@JvO}la=k)Z1Yge|oa^(uXZHJeD`Fyd6IDk^j=Vd#_q%n(5C&;uzWdo&m
zOpZ@EJ{|GltJ^$!v=`G?dVR7qc9U-&>~Mc)&f$1Q-85`py^42^-XLNBWW?@%hsQg6
zT;1BFoL3wiozm?MW0752*ER-%BhjA8cpp^6N^ahIj&3i#=n|i$Mab_3WBGT2_Q89m
z(<w(Y$Ns^%m6AjdSSLw)iaH1u;YIY{kFW6ip6mQMT~smLxU$A8AG^ix|H-R-@v|@S
zlONke>x{-l>5p@cG))1)^Vhd2x+zLS65=@V(ht4JrAs+CRx_rZ4vWgRosdQ*(ZxbG
z9-&=(GedBKEQ<~UP6Sk%p%aa@@83{`XS$W>1t=M=^hnYIrqy}C!n|rYJUNX^9w})W
zi!}k~M(63qg5~EOxkj;FY4vrs#k^Wtf^RudPoM5!Y!js_?SYx)IVVSl3^&&!{&l=~
z#sS5*@|Q@EUh4Oj9gdd*r(jW+lw|`dCshebNvf)e9a#wAp{^`n{<FWpI6<Bk$P6aa
zDT7{*L<*$T2;0y}dZ07jc>BA&bbT9Bmppv<m@~8F4vN-=6=XN1u6x*WfuM<0W+6z6
zluMV_8K0DB8AvigB3hZeZCI2w9)&Je2GnOI-#s~FUI(hu5Uk~w|JF|-ooyvA9;pPE
zu5IB=jVTv=PAO)iW5$y+gpka}Q?5-G__D?<7L0cGX>81dYm7l<inY}avqecgFR9Cl
zvvQ6@k?5Q>EBVZZB9WWi+dX7aRXEXNSW+TY2El+7SReS{t>@tG5zb0Xa0Fv;B7OvG
zE1UF&MdTjQI)zFQDj=LkxCjJ>5YQsp2`5TY`FLaWdmXM`xx|%?RXV+1dvhzii`IZ&
z`Nkb`sga3fbW+m4l4Ht>lSw=kKrR3PAOJ~3K~x|F$#mW@Hz)j?SKnZ>AA#Ykt1B4q
zxPI*t-g!E0&Y;$sn<^pMeMp*ja9$u)O6>w!H>cC>V5$=DEVXSoJ~_qJHJ3Nmc;o&f
zDjTtv-Gc+J4g|$ug;aa8G|C~Ak}))trG2wRSVxi+5F~MFE|5YaMFvDITWu`Uxj?vz
z$#_a`0;{V%tX8b|Dt5;;hL~Kun9dMdak6)Ylqp^|NR^VK7}o}oDv-;qs73}b#6S#z
zBRJ1yzZ=P<0#<uDQotKe9}v7Cc+Z3P-oyAnrXW?|ti#dT5-UXrlAg#|2tiPqR7H=a
zMyO~%>^-6t!3pB$fQ*nqGnw%2!vlmfs3c=&e;lbL?awZn8l`(IYJ(<VYKxW@tt5-8
ziep`;iy|RWlFjv1ymvI#BbCI|4MkR98^g_;H(6U>ZJFeP##*M62}&hg9uD}6Z+<i4
zdTrS1{@DUkHHb8(rw><Gur@Xq)uJL1>YSVIoJ9$R!sCL8^0g2d^#X7{3e+1XP$c9@
zf>aWuVmvJ&2vm}i>xLi{{ao?!mtNp(GGjGYj7L*;_K*3{)lKf-n_z82Ujwe>$-x;a
zD=5n`zOLx?3Qms~1n=9t29MSf8v@Q$D4j=gGx0!DLbM8#hP+S_6B7a}0<%R;RU3i=
z?K?x>dG!(h?Qj1cPmhj~Qqj$Ge(7)h44HK8HeIwcyho*RQ!*ywzxnll!3S>M<mT1O
zTpnKKl}|j!aJ7fb6Uz5?s1#Ti{mzB6n9&(~@4ZLA*JU!9^6DFRdGO?fqq(P236G8{
zrZ%93z!{4(CK{djXP9ImfCx0kGMz3k&ZE;vb~Ck&-q5t*t%zN~vk$psfVTxpN=bjE
zk9Uqjq<9}<B5#tSWx^6<blx*-6u<qgxA=P95KO~h*eBl@(n&H_yF+&N&zMZcSZnF6
z4!CmpGP;_RcQhL-Ly9zsEPCf!yO1bL>U3gQtrU?3T~{@AZK&&p#bVBQTyy!#WeyJy
z*}imzq+N$!-rS(SGiEfa$&#d%B*iExQccq|)KwKt?n0ohs~AgOEifj<7}ILJG>MIl
z075H{j!$rt1-a08Dy$cjXJgVd!Fh{R0VzF7#K6+y<KyW0<s+YL$!m&+bn!dM(gH0d
zi>9J!Bux{*D$-0b9iOrLbhq8iMy7v);P$F#JTB=LIn&XY-}u$v<O{ECM-W)4h)K0w
zVeIr2Z@;_C(X8f@*1WfO%p8FgYRLwA|Fs}5Qk0#w$Pkde4Nr-4|Mxv&1eWCb_9e1B
zr_<>~a;THsd;EyWS;@xwI+O8?a(+hb98xPLlS!mhB${9Sy+38PsBkVOj7tH7PM3f9
z_x?tUheZOa%JcK>sSR-<6j~zcO6!L<Ys~<bT&E~VmKXXvAGj#f(ds5xM<z7AMAHb5
zYYC<+dB&|l#vs(BI^*{CCHCLEgYI>>(k-~Pu|+S{bkiJtWffD_xDar`V}g&|FQt%5
zw%LNQds?nimJ|~298S0k?wv76c@e;oWf_JL$-@LrrzLaeaG^&3(trBD(F8+K>f+`O
zo>WSLPhzlbh^u(5TK^suQ)K?)tp~jRV5ilV1^$y?{P+2}Pkj_MhF-Uzz~fr*%_frU
z`Zcyb{pt9DE~ec6^kaVO|NJs;Z^qNTBSzC1LP$QmeTg6?hm!@pOjDZ3$acb^2u$n1
z8+-flg3_KO$uK6`ZzNK*%TS9_8PVA`;DT!fsp1?wq-B5`8v*{HJd$WArbXOb#PCkf
zXs-CpFMpH$v`aT1^4v<!&;R&Gn9UP1JLRNNG_pYZLqf1v0#Emz@bdOemU()vi5F4Q
zdZ#-f8I4BFoCTRgDnw|bqP(JMKxJJ*CYYCo*`ndS$4}|x1v~r4XrVCW96`W2$>G_8
zlV(b-YO>>u#ca-SrAtu^=yf8mX|TG<!NG{vUw@~q|MBK`Ccf8H_BcL1CMzq(Dq1yL
z1B*&>G7=mgA2XkokZ6<wU6*WZ4B3A;M=J$ZkYou(r^EH!aA|dg_062W`Zxa?j~*WK
zrQi7y^NHf}#$^(5%Jcm`n;*E&<tqaU6+O(eB*U4CmE7^yKDx@msOH_rmgBwG*}pf!
zhiHG}e7q^@+7gVXwlzgJ$4@Jyj9XON4kNS%iL^&h^z)absRkv;J1JpNld5Rf8^jVs
z4hS2$Q{IJ$Sq8(wq-Ou&DU->V(R9kRifK>QOV-!c*xVd492T6Njak$d(a8w1peS;z
z4>WjC;6*GlMVqS`LSQ<Xkt7LKRpLw$t$~ClxPYx1icSZaCXCCHUMEM$1(_rkS}93<
z&17EE>vxfhlFC@Z(xD;5&0`?Y)Fm>>C{2ZP24@2|2VGw1chOSCJ>l7u>iCoj7)i;&
z*@BIJMl+3&NRZ$gL8?16c)Zswuzvvs*p}nwTV;Xu8hoH}o=nGsHPH#iM{IIFFPYa0
zLnJD%35~(gNj3V7J8!eLxys;rmx~2te5m$B3KCSirC7d<qSL{OK<RB;&@4}$?w~*a
znaJZH&f}`x6sg7_CUeAW)><P62K`k=m8Wc?o53e<Z&No7)5h`o!vpsAjtRnZbJ$1d
z1Y95p!@b=pUwOPw2n~rEwp@-0xn4)fG@`0uDJ}VTU??)aL)YR6LI|YySbQ8KTe6$-
zo_CLD{Mns{92?JWJ;RuW#mO=M*Y8fa_wbaz`uR`toB!&|XzBT%|HGf7agYUtF^+|;
zsmcoHJ9I>#DrXdF%G&z+xn)f!>oA}1Qnj0trmkCglBKF^np)5wbm{ea5!jZJ(R_x^
zb3~GoB!MT7AG1<i<IGrex1jN!$=vbXySw!B5xs7Q5Col0gJFdmTb9heODA<C#0w_x
zX!2yv{OE|Mj}Lk7@+!hLI2%><*Ef5-aPt*@N?3HBp;U^m=kzlLAGnSFxtDNtd`~u1
z47wePB188yH$HKRPkm$)`|u9EwH|-_AN&mVYzCua9`B5iX$)UjjtE(n(KHP{lw4Ys
ztQD)AZl&z)9$;F1+4A!{JDc&HH|}#%2aJ~}9mVheUymT8NLaVU>{-$zLVRC?6+1D9
zD?NAi-{bz#m=HuXsuTj#I8<<Sx?O~wlcp)%UXR+BSYxTm1$Et=gZbb4+yMQ4pDfFn
zO=on94oYjV%b-(9S(P{`*gH8U>2|o%QDisQxZ3NHWf}cW5A7_&x@JC}A%nZXw_0gY
zr0@vv9vuQH&`lE(0($A-@V?tdw6{zYZ7)M&z4y_%sQoT<p0@sB@&~h~!-Z3?cQMq~
zMaZ0@*QGL^fa2Ek+e{{Nl+u`>kVr=JGp?@m(J^8>5*FY0+(IH-qpyI7?g&JA0f5pe
zP6|9RGtPO><ty6+FE~$4=Hi{}tVKIp@|zB^HJr_A?%sXG^H*1yS2g%RM+;VR&B)d$
z;pvH13W4IQ-`(MB2dC^bk(XnG#W{<X1&<yd@X_H-TnMrGZMQJ-HAl`C-nAW%Y=y$%
z0+0lPRMf3&VsP;7N5_2o(H_BTZr->|S~ZNF=VPD#1aG|g9j;ss9Go7ZQ$>>GJb1E0
z={(d9s}u*Pr#K(oOdBbfj3#{O)-87T4<b=gE2<`LVx@}qG1gjaW6(-b&MU&Oiw%Kk
zS&|nW%Cctd(iY>gqOq1m*|4>_MVcmbRU~zGyD2M|x467EAWKq0aMVrB+1Uw|ft#Jc
zKmCusK(`;=C?KxxgOA<iV*M7KOfxG>4i8R9vx39JW3oh$6&X}>YBND8$^OJJn^jbm
z!#E%F08wqq5m;;J|Lz^KZilB2j!7P$vGx0J@}b)uWK(0EL5Bp>l4q;BrY;RjM@sKJ
zi}{?>lPP<n**Ort93e*I1>e5=fZb_D<)V3u579^72U>H;aK2zz>MPGCQ+iUiA_fsL
zmC))o3GMkUTbT+m*(rGDO+^qXo)}N3<Z^=;yAm55yH5`(tC*@>JJ<5H0(R-N8OeVa
zW0UtF1@py%bHCd*tYhiq;Dg6j6_v3Jdr@2anZYm;LrqC&9921{ZVaX=qYbiH+PJjD
zQy1MskbzVu7;BIrQ0RmVXnmeqUo6^@@*)(L5Z{Bh4xyJh4e@i*I$^pfk=CEnfIvhh
zNeeAG=kaa)m<thOYpiE(=Pjo);)`1Ps4lUV%0=}-?JQa<2}+X4<b4Ipqd-LLNC@yk
zAbmibOGa!=c&62<wI8xLUy(0QjpYQr#01*Z+xBFV!tsF{Td_S%Qj9ksBsVrzxV{d8
zimQ3Xs4@J>tM717T8;x4Yq@p(21nx&)xweI1tN@Na&&Mw1PV{pcw~~$xc1By%h`Gv
z+!_c{w^*5=wuU(=Zy!xKnT@eUj~74uVG^x*<DCZ_92|2NJpP^UqGW<`4evhLK}nC2
zj@NgNIH(QJE6ud7xwJl{DJus3VZ@8l9FZo-MA8`yn3W5ToM2<vr7-bJ4ndP$y-d?M
zR<8D`hdI8VllPuyayCYE3PRJ64Tm`P7+aVuYJzoq=Ho9>bQ9{PjM48^gAkGRoE8$H
z6{0N3T-+v2CN*{GF~(BW4U_o-(-`Jug=q}4xudFToL}DfkK;+`1Ez`AKc<OZ?9Ta?
zW*g4kW~CGqiK3q$u(6Wy!57x}^bfzljq3@aap=6yi71gOL1#MNNJWnJ2}_^%+BaAS
zm5slmH&Z-NeF&VLopCmq0g^<52nHA8_!B||=YwirlZY+{!Wp_nhr}902&CQ;5`prb
z^^Rt0{Sv)okO?xK;rxUk1ienq#I-3)?fs%;WCn+}uz9JOR+CoP9u@GyMctuN3az4D
z%MvmPA$Iy{8pY2Jm{%3XC1~%Xe()JgcC|kQDL6SiLbyQiF#^xG4FSr>8r&A|AOfbb
zXr1Em*w%behd`nfb<3j*&XXpZ;FffmrQEAkf`n*k-a^Fj{~<0mPL4(>VHjkvXqvX*
zw+Wx^Vc~qNC8C|f8f$5+1vJk3w(fXBE6EoKvQ!a#8aaH?c31wuHueA4qn#qH{eA}Q
z`yb0cU$S!J2hcP%r)MK7)yJuX-mpiWBou=tdbiIfc;We%Z$3imjH2IVv9re@?SXO3
zMq`RR$5jnUh;6=8f_YssnHx%%PzFb1Et^`9Bm<H(L8mGA9z0}wdz)rqm`x_!fAWOd
z!qM3oZg-DKxu7@Lz{rHX!(&QUa3BN?k|(dfg%i;$zLOPfYz%4YhHsyY5RIod9h2m+
zU(Q(>uAr}7BiEY5yg;&jjWuDJRW+ldLzvC^h#qh@nJ_vVGd`P<dPg@??3Wcs*7NbL
zRTN+w%X~J+17}su+<J^tj4RJ^75L+?y}|C@BaF`@hpxS&tThNkJbjJFI*T#1_8qi#
zJ`o16Hbe=Iiep3^AtK8<b{jqxdl^rEEd_ZVf1a=m3XOpBT0h|z|L$Mm`c}qL5UUb_
zwGCM+@gbwE9i1$?1xOKHF-_CPW(CK5R&jP#ax$ry*8!z<JQUlpZ7>|Ly1GgTfod`)
z2{5lbne_A!ENnRM`2_-H;uyQyD^M=y_N|+I;KiHhPEMZov7y1+IisTk7UMD3H~Y+k
zix`j;lx0Z>o!B9Zn5MJ@%hT4ctSEAZ!vRg}nI)xUJf5(a&o69U!uQ`Z=cBFw?_xlP
z4*`+qk#O4zo8xA(Kx<81FWRL7=N;Qpz^s(QSwrvwr9g;)PBe-rv~O$`b+y(bvMAnH
zQbh?{xNrfEkzD7m@_lp|0Iek(!y$uihVm7svx*<MwIB{!#xxjX@ZLnvE16Psdh~~D
zbbCFNQq;DgF`oHsf)Ik)bcPPzBLb9dt16{Hh?dJCF1B+@03!M}$G}k!?Rq@g4liGx
z0k1EL+4-Zzl?1K8bcqp2x`Qr%`P~DCm#(rnJ7YGTa{E%BYr_<kNsO0tdj(p7H-=yM
z{Kq+|YSQi+*Dnp3mIiAbsmdu*&7x|!ci`!EG74>>wse%@U}r*J6ft-q%Xsj3AFT`O
z*_dv(%jK0GgN-d-d*>ZqeEtTb(E&~kdH3lKpMU8lcaJCBeKN-c5Q)UKKI?g+s9Oq0
zA_N=5Rc_q8MV<)G5FAWu-un9M=P}<)jH;8R3<mwEVXGQ!6HWX3g=z_fp2=~851zMz
zVRLg8V+H%iHCdL?DJ$yI(bbl}yuZVII%a*Vk4IqZGD>ZNq%N!W0*thc7$+Vt?o@?1
z`ky!0%L_l8kIv^`rC6S_EvtI@i+03DMEZgtrUEI=%207-O`sA_2&%PSj?@N`#G-0z
zLt~@J*I8IJ4ouB#QZt$^I60d$o;NHig9#QX1E0Ln<7_%-V{Mgwx69e-m|HJh=R?Iy
z6nRdXw4J?>1aCRmeT1uKfFRFObgJow2~ul{O-WL$aex1e*PcA!BbPK;unaTHa9tC;
z!!`}pdqPM^RfaGUsU+T92)Lu`fTO8vrjsdE-9&P+To#W=9}yyots|`@{(pvuk5x_G
zioj#x?iD$gR|+1VE(k`p1Xj;<He)fJ#e7a$FDWUac2LN6OpV1)$b`_2yIz2ImZgiw
z%m$>l;5<c$U2EM$K;8LPl%D`TGTISI<l8AnBf(3JBTzOCU71rg2I*mYnDO+aA<Gnl
z-hh6;ORv|bBR#qc%JvaWgHnQxJi|LjZ9I>kK4mgn;GCmh<VYDUnesHDQ{?D4f<ReT
z<avyiN|Q7ikGYFVy7bvu7FK5*MV5hx2`NH8ds-}i|15|v+uwgb2rk<;_nmj{QWQBi
zwy&_gy~*}^&e6^eiI6l{iXi#Ot?QgjOCF8R`1;!q*&Q1Oy^N}=kRhcJU8=fd<?1!2
zvnjVe_(P0$o{$Jh+0>+Il+!33NK!$TDO@FRu3<b~a4>$ze7-<<N2WEi)_iWUSj2Dv
z=ddjvrrXoh5m=NZlSxB2&#CJXx5}Eu!RdL5uy1U{Xe>AzPp@%+y>LL&Sd4L4<IclU
zy=%R<i5K48S0A)Md>~JvjqHcE2XvAQ-Qp~P*xn17Vq{b-_y9$!k;0>tq}S=tO(iG$
zd-yhAPYA{LLd>D{r`N3&PH632V>FhEN&p{=(-Om7I+I2QdrRDu_FPV~v~ku#6ZNeT
zto8(&GCC+s<_n%aJ*BE@j{jfY-XzAh>^jr?c5}MhMfc+MnJ@cH_7p`@6xFb#lFAk&
z%aUDX6buc@fFTz&FyMg!+XJH}wnsJa%y8L&VaPQpy9`SOSfI+5)leeEBx#CWcFgYO
zYvM(JyVLE)gSF3%c$rC><$(|I^1Y0>apT-`_E~$afBozKPnVq6j&;)zgOj#CU^2tc
zzjT$hb9BKm-I}tsGeKP$(={z!x1?{{lr?(#zGIdLbU97SG7x;AJA1Uzbh`f1KGWF_
z?ZYMQ{FE$<jLJeJUxKDL3h&PF-ZPs{Id+K>5{LVgR(_OnOGU`Er6_Y&ZM`vHc#NWR
z`Fbb9u8(mufe;d9;B3_rgHD-_2WwcZmSoCcl%kITv`OBNQm^^T*;{%Ho8XW+N-5=C
z5PU1fNbh=-<Xsy=aqrw?nrxkSG_C`yP<er^N^}IDvh2JlAc{Nm?W<!x_FO@c=bRp$
zuvjdZxPZ;!_#_ZIVYmm^vtFK2WtPRN#`uQovka{Z5dqMEgV@*jW`(s{7MJdOVhnia
zh%rwnS^ATlb#zRNG)jB7S$T@WV5|nG=%Tocm;~agOV=!JNHYkS<~<=8d~`(L<3nWC
zw{&>!-g}$>_P_dF%B$D-FaOj39OdBpuH`dNU1eNYR<&bVWq6%2sSL$<g2P~yCRY}t
zJ%xd4R&wwDU3N6sEGG*A9~?0_`nF@;bsRrB;^EOFlu}$7Z;_W3hl_KL=BIcc=`3{0
z@`HmD9<3d{ijv7YSvcN%v3j?bbzQTrR}|Lp<v;!w+qq^uc<%*8=Y*Fws6WKu1(Qe}
zqNv1}z-q~Ejga~!)N8OtlUIsKVVIOT<J=|@KnE(48$(%TC|h7%$8$gRS?Z>zb_(qp
z36v;q>?l^tIm9*@f?j@fQr;VqIe`v%4>l_Zt|!k8MP|6RGv=eu-y*je@7_P)?FXlv
ztQ;yN9*&ZUf~#94rb^o4N(;heBFb2dE(o2Y?HsGVBLu^%cMsSe8SsPHos^17%e<mI
zKn|ru=nyo)!O45?;G84dWLAbui!fqkMS8`>3yGLPX`pEv`p{v^8Nr>Aw=1$)pT=~A
zW}>u0M~~GO-!;^(W0V&nx$@YgfHZsNi<X-=_F2`EEp^8oKEV|-%sZenmjjlf^8v8*
z&XZR{lzuR8(B3m0PbD!(0KJWB<DflsFE^*6^(OG4L@hfg$cl=_b+j&k5)T2CP>=E~
zPt7aYRQlebtfluN;JD~|?0CfOC-zya8$6NLdzx-7yt!NvV<#5(i#2&(P|sJWYDCv8
z$ZceOb}Z}L8jOmx%|hZ^gn4Qzl-}dJ29%=pE-8~hmY53m1B#VD>ES&yTe7IvJn`g{
z93P+X<$w7n{QbZ6MexmV<vzT<iL_`*Al~I?MJa_Yrue3%KRn=LFFeKdy(@g-`jplE
zyE3?%<!RErWZl-AA0K!&>)vs?sv&f&Y@ja;&E5MnO~dJG#m@FNv&oFJWzF6+Fx$S4
z)`}(sdS!UDYH`O49vqz$Z9(m%TiS;KS5c3ZONNfU?J<XsYMf7lyhbz2Ewdp*ah?V*
zvvui`SS=ltjb&sMP*oe@2pJUCs7(;dtPI{-YZzq~Yec1#7%8JDSd_+~ti~C!dpbBc
z=AZnp-=KFLMv30ifAM?2#;7b%G24K>($u-gh$9_?gpCS;Nu~MZ$6w@y7w%wU6lawv
zDhoGmZSl$0@z#3>oSm;&E;^b{h_OHag-?n3MO0{$<})$4-cYYsJUm%(?{G=uTY`=p
zpEf)?TybT4Dp_3|cKC=&5QR;{`N2yI-57;2DwRL-nm%=2FRKffq{yM-pnG-UAk(%U
zzn)XIM_8&27IZnR3_59TD_)QvwzdZq*Tcgj&K5Ffm?ag_JkOa<rzq40TO8^QmAaY(
zZlofps0Bn<ilCAn|NDOBfK?4rH5+{F@(7l-n9Q>7T$+8<6lFzAz-UXU4ZasC7$JPh
z&-KYg=X|~3u=ePB&8mIK;e5fUtk{}P$$(|k5l$V>^%x@x7q0cJW6v@i)3!YjP+m6S
zPKhU?;Av6?Xce%CKyTDxldbC{mS}bIB{WJgDlKbTbQA@E;Kk+=)TQnpg6juKJ9Uig
z<|AyLbAI}WZs};+DgWY+{||osZ+$^PTBVTQT!d)3*vbWPj0$OyhBT-kS}Zhe&wKZe
z_{1ll<73Y~i^($P>vJ-lVT}T#=(?U&)6qGP?gL#PP?@HWfv6RA?^&&uJpZZZSUh@w
zHi~>SqCP!mYBJtCJ7)!a`{5&z6+uAGK1!+5svM^brY!L57L=yeN_47qhA|fJK}Acm
z?x-rywX54acz7b$N(E+_WjmL^q+(>1b#zH-Ax5xDxGi|a{v_k+TU#t!&zlcUfz$~z
zBBv`utWstbX-GZO3g->ldOrF5ZL;<RbdNHMN?9g(#@6m0Mn!gZ40YpB+EGoW+`2Zw
zXve6kHoDwJo{0giG2|x08jZ~r<FaBp9c{|M-a8bAnCyFV3wc)XnU6k~<a>v}6wqX{
zg3=Is-8$N~<LJEO;c3g!*@F9rXXIr?Gzu3**2in%&_(aX!92C*QNygGjEh|aS?Spg
zUY9mAo6Pls5S{3E3EuFjJs(4)n;)`1dC2}m3vOb>@g{D9n-bLnt(lC+w5z1(oQ{BW
z;$$5;igCpRO}(xu$`RURELThJ-G6{WGHI1EJ{1HrY<<8*&{<9hiZ)$AZRI%>ict!1
ziJ=b>qZCD+j7`$);AL(0m`sZ!usz$R?>exCNAsHLsKO-fVUZUE=LlL+C*6MI0+Xy_
zoCDfW=N&hzlFm82>#4h*u6MM3D-8hGV-4v&1rwjzgl}5Wwi=v#q;DdyLUI^LSgG7B
zV=b8$JXhppG**1%L=t7=nBfQ48cEmE<=QL?fEWz3aZc~1^eouDRWM)Hyz<5m`ITS#
zSxQJX;jm*26o-&*uhh>z_{Vgn6$-22!J{J%{_G+Cd_mK;eE#_-dH3EA$b8SjOU4l*
ziSeA;r4i0nOU`qTi(B|U(4C!QdXKM0WTwE3<`m-zlih-|hesSQ8#*N8bHQEU0ZmVr
z<(Modj&qbT?9U3a-Ht9qf+{EqOEs$a#0%Gf2H)p2b;ql(yv6rleV5WWcB`CROF3jC
z_*{lM$Ax8YTJXe`EuOkQVShRT*Yd{UO7xSAl-+q6%_uWPo{8i0xXj41jL~S!U%&Dm
z^ApYIKlLo1zVQ*RK6jHYHYhu0^z3K&^RIo6Lc_JaF{fuWo{XRW(&x!u^yCQw2peot
zTJt^xtda?RAY~y5qcR4S2%AH8tWv205R^PXqVORBrfxdcb<f$n<>-9H;i6?xJDS#s
zo3;lR6h5e=3ac+lH_1B$FixGdffF>~D>2!<KaQEk&FYWugH1&|&u#Fe;CtSA^_%SN
z?z7f5IX+*!jnFd$gNs_>`W};23=J#!6VL&)7V`#=;(WOh09`j5BUO|Zl5SCK&PS#R
zdhXu4Puq1kCxO)F5Jm-~$p{r5C&F$xW$8qfPY=9ODO0=n>>)LT$Z~?0&mFyduk9Qv
z&%k?1o1u&mnVUW^$}O3-Vi}F7L{tjd)O;kM&{m_o!sHfX4Q=ent;qM-goT;Z%~ffX
zYv7eBrO1ZQqAxy|zJ!|@Yax1(Y1Rtc_m18LahSCtswEw&;ctbBA%S@p%vPdiG|qT%
zU^qIT6L!IO1zEYx|M<WBbN>B*>+hoDg$(e;l}_&yE~Vwe!cXDwBhTL8-u?TiEb`fp
zyu|<h7k|+6{u=-QAOJ~3K~%z1H+Nap9kbHld(U_@M(MdcV^IR528vOE&swHecB%4=
zrfcbZPvaC_?>KS_(?muJoXwc+Z&OXT7*8gQ#wDS!L?f~@hX;>nqbFeKUCZHvBV2uk
zGM4FBp=r@ggIZ~#TT;eI85KYE)Rb4g<GFKd%$3qoWR_gFxa|?+vg9LAUgPFYMc;Wc
zBgz)uM{Hj4;_Z?bZtoI8vSCWQFIr*kpkyidQeNcz;GIJZfijEC3eDD5NgoxlS7cSi
zFa6v98n^%P?{jTBrd_oxdr#j7a-8sKl*XoqI1&<8CS|Hl_j==}mmYi>l-4LSNZ?*H
zV-iJ^wy9~`$a>v#bh_Z+WX0j4r`bGr;v^lS1gNg{bZw*!8F!D)c{VeQt14}xg8B`L
z8Jk!V)ur$>1g&(ALxvI5hUq;}YLpTz%q4D-HHNJ*D8FQDS}{;=E<ZrlTzp1rExvYw
zF)Br_w9Hw0PnBCb=Q%lF(YDe^@%<uk7XypMlDe*GQ>S=y1i`<=yrGfii4r@nx~|EK
z!OcWA{tG*?^wohUH3V&S(Un(;YgM~mT(#Sl@z%DC_@HR|o<d1SF?u0ZZ%-zeD093K
z={^!9@z4=0Vy^3BPlhMzNV8s1RT)*G$#ld@d>(F=Xn`qFERAUcM9DbOz|~SHl(Ff4
zMs%Ku4wkXvVBR@}RT`^u0?5COn2r`ofs&4cQbG<@%0Y}QSEpRLa+5#&lRxE`e&&;S
zjyd)<@4S1TW_h2(U;1UP?QA7gN}V_-!ygGxI%+y^2`1t~5K!NHe);Eqn&XG}_{?)J
zaQ)70etG<>>`yE1e)XI5KI3RU=ahog=?SH&*e^0hJ3Cz6-QuOE_IP%G!fZBWes;!r
z-{9PgqepA*K70h*GtRpjx}Ni8P2JAP4vxrkOR+U$a_uTw8{YWN_i5%!)?FmJhR_G<
zb<4U_be*H?JRuhRd%yWJ{Jr1$6{eFC-vl1qKjJHY@-=?z(>M6d&)h_N%g(LqH0LW;
z%Cob(g*!Zg*kcQe^B%3Dn3@_P`3)(3j1gm{6pDmoUJ;X&usnb=g`fmiLkO@2h0{_t
z6}F(NpvW{uCX%?yWT102ohU>`NfQ)<G_zzfLwO;a!bLC`BvLj{aOyS!bZua{Y&kt&
zaWJnrK5bYxj;0SnTHRnPfzC<59F1~ZP(%ufOfj8II67G}x>kz$10t78lm)Hr5I{8^
z!FRA?DW<)=M)p9tKErtqD^Id=`Fu7>DqjwAN?BC0Qj19EjsZ`znsuugRRz!9xQaEF
zyeR0JmZoWlcovH_M~5erxj4iO&um#0Xluogwr&`tp$B)G$)sX7ou>KLj!fs^Jp=hu
zN@0&uLuNTRr4NJAh!{X7W*-A<9}^%tw9*urg(xbsAv!u2$Wl}ZUZ5VU6|PyMa)F4V
z@+d9f&|v*$oF?i>m1RPK>1(Dt6Ur(}#u$naMcyXM3(8VVL)yhTp$8vZh#HgS8~5qG
z{e4DTy95QRUN)h;DhXX+xmdD4RoFlLr~jB&-*|)n`hWQES;xTc$S|@QDg>}r>U||Q
zE_gpo3$V4d!_m=wZrz-4^NB4=J%U&6@*n^1Z?U(tFUFs0kRDdNpClJuj|*^g(lB3j
z^u3VfUV7$f-hKBF9DMJ40P#Q$zi&~m8}6SRv3lY<<;PzFlT-CQqs;PqzxYKSz4s8M
zG=1MwuU35bmGAML?>fq=f;?lkeU<Nh_j|b3L+l_#>c-=op=mr#ADHBtTq}P27c1_4
z``fJRz>T7$R~fVYiWhF)=Jxd&@4WMXruKNR$cv0VdS>>JZ~ws`Fui(%M~{xM#&Bz|
zU|QVb`)$U$TTwoIgc()r-?+)V%-PnK>d^rvIq?j6g3=l@1cX!q>7*(eFOP7%@6d_8
ze_{J|p_Q(+p(-nM>ISRSRns~{#}4$M?mD<#n@tP;@#E6()e(|jllPvs4Xjozt5wJG
zqUG>($;qmv>qM1Xp7l%F(D3F%#*)fUZybt%QR1Q^fkYNRQPeS245(xS?$wa=DNO2Q
z$IHHIQGT~i2)9%Z(s_?*ZK_M>b2+OTB&{#Aa9Zbi_uicEzHz|L_BipU4E0jvrKhu*
zfX7iW9amJPfbC^5VzpYOYxTa&YPh-~Y-kcOMqKYWi%a4pC+e8W;SVZETx<aHo*G5;
zNx9YNq$wxOA`@keg{ZM;GNV~~&p5LpcF;Td+`$uKAWNb4B9IT}DKQ!G%7FRA8j3RG
z<}-H~@6Cu>eqY@>*6Wrg!0EDKuPT@X&vLOKGvd#wv?hj#iyE&DU;e*;NbTU!$%^xJ
zM;|=FD7LNU_x_E~VPCva@$BA5_{ER^BMy&Fc=pbd_|Q`-wUMTX0mwjk>6Elx$Jf64
zH+<>mKFtd+-R5+@<m6<|Klq(rWs;A`Od2Luf>!BXaG|t@<S^2WuqKH7c??Vo%fbD7
zylxj*9l4hoUVHmB+Q#$EZ+(Z^YzBEnS1-7A<0?l7XB<B`q3Na5)3+_#ndh0CJDj}r
zkl-^OwGY@TGsdHWy>Y=8Kl42I-+M@&S4?L!oO6sS0sWh<<;mUKG;K>(6v7m@hN_$}
z?;X{ZU5YFtuSR59$>HIgIt1?dh(1`MR7vPP{dz@SWRz9L)|FdiqY_<alv`8g>orRQ
zWog-I6cY`~wURYNoyrwW3|au^<i@LzIX|sT0xd<$stcZo7EYBC2D(y0@Ka8L%4BR&
zQH%1aiY&XHNsK^7j2_`m8=?|*(TG7A0m+Fmbwkr`9wd!-y<)X$IA6A$oUb`NU2(SV
zShXP;g{Ii1m6ZHS0<h9b#%8p^E6`~APBhaZ;*#u@NcbwNiM?cuQ7IuVCLAe(KozMe
zM0$9Fx&WI|kHwqK=4+Ko1{D|fBEz~ALZ!aw;we%8kdV-`Tf)t~5on87hPr8_OIumG
zP6nP$H2B`pC&k`2*5W^?wD<~mf9aG`XAn(vsbOF(3gJNse&-?PB*Fh7RBcMaO~8$y
zRTR1cLT%_ZD6dgLfdLoXX3WP&#olC+nEDaQGP&|ZVw80(jy|bGP8qIb`(_i!y!RMu
z7|o{qi?6@QgX0qx%UWn8!+nU6pZ)05eDPL^YCC-5JO#8&7I?|_8W-5x-{*L~qV*}O
z43V``EY>Y{yP6P6&)#gt6SuCRos3+>WDTF3wJ!yB5yAhBzx{au(xdFn&IMv_dFPEE
z^1@6+?_zSE@ok4nAfqxv`k9c4=;^zjNW?|MdR_C^ufX$H3?IEc<LKQ3>Xm4E_jbYV
zY{aj9?ip@xY34>_pMFwA$+{k`0*iV{mY3)k_Q{G7y@Jm5RI?rW(6J7R>mPZE5EZ>^
zQ8ChH5=_VWl(uat@Hp=<O0n*1I-O%p#p&{d<42EZyH47{Sp|p&l(m+=Z^`qF>({SQ
zZB6K-XEGZx+u!4(pL&VCD_5wSmY2W&b$<BhfQQbp8zVPONf8`*8hs&N*on(kN@Tv&
z*7jaX$oC(E=C}7@Q-}B%sm2vYkIq@FJ-yH9JCP$M3@mLW-gJq`DYJk&{pPsgP<iKQ
znvPY|F`utFJ?nUMzT~{_==w-d8g+R#jx_LFR#;u4vI3Lm6#1AuD^a$@g+SAG+#DI+
z{{A;nT!`0w;D{;D3({eZ1WEQj#N;(x{KyBtm%5lDA)LOpS>OX9_VRnm>$TR{%rc#g
zX}dt}gxXOQ#fICpUavPD@w%=lih{{xLRprC5I8;kpuO7VW4&G{%X^aeq6hQAd%Zcc
z4VE?Fi7AUD;<S{rUGU->9Tg!&RF?75CqIrUa+dXyx^3vz4eQm4)8(4Qx|0#L<8$hD
z$4gg7Y*%CSpwRHX-*1e;sGKq{Ih`*!TCBuFR1Jum98KGx^DUw^46=hng~5nlgL5=>
zPf-+X?`(6pIHK<Z5sy-qay-IDbun43F+?L8Q7V<~YI9LEDn?AyM6aYQNEgOv1Zy!l
zFFf}wBKNNdQJAt_Y?6Ht#I~Vs8V=sON2M%ZdTxpi8ByP+w1(bA>Uu?KU_8o+pSX%K
zIjR_=@{DK$F<Ry}$6p;2wIP~Z>UkX*Ys2yJ39I!A-M8#tyNU{d!^M(89PHu!dyL0p
z%Bm!@LQeqA8*jg!R60c}cYeMkgve^OV*lDTGMlkIyNcG(v}-~zES7Ur>zGc*Jp0_!
zD5J@%oNQuw;f0Uz%rm#CCQ~t?BrwVqzwoo4=chjY5&q);`ZFHAbB`r~YSr=V&Wyr4
zvX}-$O-2k3iy`VuJL~XJ85vO51K4VZfl<l8Lf7Hmd6)m}Kl+C_gq;kE-70YY_L{9s
z$c8THgh2(gHG=Pu5n@M-imvVH8^_Vff}^uFC(EAm^^&@giThzN_VSSH@F4Xea_xmL
z@b-JBeCM4*y0+)+>}~3{X0cjvbaX<VW&9_<`*%5u1zw3Ymo#PE#)wuPNG%2!Y0cVb
zCBP=`?WWrt0$xd%HTsJOY-1*>(s^EbpmfSoCCj}OaHVzxCB6bE&16(iH|JPwm{uiO
zR)`{pF)}Eg`~s~SurVc>tVx`)gik*9;1lV5#O668WX3jXp;5>nu;9p-Q-=-bY6u7+
zpt16tX=(1c5IODPho?(U*9&Q+0Wb8P+gpbB9-fj}#jMIOC<>c%e}2w)-a9A6NNEh$
z>mKdSnUtl(hIGD?#hP@TJT53!O(PkqN^~ftFd@<@MOjVBvJpz3p)-+<7M-pfq9ZFx
zuIx?7%K{aWxS>%HGqy%K%2t;Pe)YkB4MqR34&%_Nk$X7M6$W@JWE}x`_j^C!tslHb
zp$+S{p{{E(U9zs%1Z(J8aVhEgj?rvax=u!83PYtbc8VtnKHwA0f4LBu*sg7{7QEAR
zz1yf1hCZ;fyUTb|;ayKLswl=4y>rxUBek{>$>7zhWjvmtwV`Vr^}1y~KgXDyq8L+_
zip6413{X`g>bk+&jN{`I!Bk=(Mn|3-w)b{;`kC8IcP3<+C7<M6y?&M3&)i|}>K=Jn
zqMV4C#S{?ac@9ix6aLP>`Rm+!>n^W+>u<RK<~y|WB|BELpJ$8%D0*~O5-)XI6YQK8
zN!S3l(#2P_z2oHM7-I`2`Yn`>j5<eCpQTBLo(Ic0Mg`H$>Uu`iSgyaZBuz>>*V5E2
z%cbLVzT$M*a(rI1tXqN?+j)P9jv{#3WqQM~Mx?8FbaKl7_D6qAZcFka$2mvcG-Btz
zUbF5T`*)rvzJ5UO1KF_rhCp)(_EM?)q!LDzI{4}J@#1Ug|39c~b+NoRf5!pKyA(o(
zH-6u9(f2(zv*e}_i@QExGqIxI+uP;v=qxo(gv`2F%s1Lya(z;SeT)SvbcvpT$*h#S
zt|3I>BSkKP(*+0X;@Sr#QsJ6N>v~L<<N81!Jnx>I^UA?F(Mu7mjp1hR`PipF%dOJ|
zul?{1*7Gx7dhP`tzIT^AFIcyo1olM5sHy_1&11nFHfmFV!e*A8-7QY<9X@uQi&4QZ
ze(EKj*eS>+Iis+Ts~eOtB2pM7llLSX*O)ZZtT5JqSG@G%bM!7?Hw*sqjT|n<rT>Vm
zRN_y-2HzUECC+<}4i>!e>RY`2-Pc9KI(9OwX)A2VD7I!86R~|KvrgHF&U?DL1s^Gl
zVzpjye)@pf_7<a2NnNkWOhNCJh~bY)%2CO-El^q(52@3&UN>m1>3xr}nzATaES8*|
zol@i#lj)SYYgjJUOs6x-N>cUNY=+jBz7ycHDk~Pt1$Essnat2yF<;E(T&!j?t+;x9
zpUKt;jApzu<@S@exb^H4Z0&9lycnDcpd{v%VRPLs7P3}`C!fB<jXSq_`1U=%{k505
zfA1j=&zI~M6JELNdHucD`G>#q5>xtAnh!XF?6z56u(y{nos{$;5c|OO>(^P=4a>84
zu~Aymqp~8)GGeqasi@a$+O|P!%kjx6!>p&$n%;TZ-m_SAJUUx3uREI7<CAiOOj9P`
zJ9Y8UTs%n9nd_XR>mrX14yYz0w)bZA9n^J8B$8!f^+gmD2k&}()HvrQU|k9zLnloQ
z<#Hftw7oAFX~AB(gzbD7$bIp~Y??}v5e#1+O0A2GarkCgmMmINmKXTYk`+Rrb>559
zlONDA2~f_->|RkAe2kk-fAg8NI5r)hoN#u&5O6%Lnh-?DF?>i?Chs91!6{90U_j?$
z;L-aa=j6ktiVz~KV%@Zir!$Pn$RCV3Jw9eU-J+-tnZ*K9#;ld#P)1*1RuC@44mUM*
z#Cb0cT*DTTzE_xxm+}SX^j#huMXa%yJSQqk>ttPpC^)t<hRkMcOjZd5EwVdkDIGs>
zAub|$8lNFZ=RvC^>LsFoN@sLV@%>j{=e5^gN5zbjlR4{U%eacnwr42g>0LwZJ6vxl
zbxG@`{ToAMRF28*n8U+E)@{x9_71x{*NHK*S}&=pagyb2xOM9muJ2jQPbi9t@o2)y
z$?0agyvQr*UPQ<F`5DXQlIe8D{{B9*>5kk?tr?HUDac0V%O#H<-lJ(6GCQKGD$dT1
zP#UJ&+hSayU@|Rv`uUs8W+OW97;Q}%?M`|6#TU4F=QcV>OPJs>N?+{iX@o;ZFO&2M
zj<^^q_2fF^)}5O?@%+ETn?HD!zxuPUaQ}44?sZ2oH?&>PM9a|cfGZ6x?JU!L?$a-F
z`-SUtrzaGp$heG)QpkzXKXy+^rBgK;QH{oEt=QV$VmWV^FIwJw=YV(a9drNqjNUn>
zGYRUK{px~`DM1JfZT7*Hc)nZ-*Qf6>#xR*(VSj&*^Keer)U>_X_ymyJ?mme5!Pmd`
z*AP2`Du_|xe2_WSO~w?`=P>gBLR(K*sd_8}x%`<w{6QB$ce4Sc#Al#qY(ywi`M7z{
z5b67llk+uIBM+(EhfF%v>os*JUGES&!J)L+dO0n@%SSLKNWf2<m(kEPHJPy(t;Os&
zL}Jog|3G^%9ZE?l>w{Dy>$agRE3`F4=LkL|T=619(<(A5b24l2MMY7K8I8x}xn*Z}
z%)+f?t%3w>tu{0dNN!2?vZ$ZJC?kfr=0b}4qAW1vszdoTI0p`zwPv(;o8CvVEC=Ta
z$$U3Yd_#>u3WE@1A0F!g|F}cy{op(#nbtSodXKl?zE86j-bo)?B1^i?F`4b)d&hd+
zp-d26_|%1J>YlUnB`2qksH%!QU(nP&lgWh1bV^lKWVXcnz}A+<`;Modej2SZ*6TGk
z8&Q@eF)E6p;MT2MpnP&I7PZdRYQ^@}6~?0(j}9NwG!0kwI<(fjd-pBroK0uUwsy#}
zj4M~J2yca)x~|#U+M(@gnr6Y)jqB|1Um=8uEe)gX5idM_hg)}^q?%4ZfpKXpBPvJ&
zWFL4yRAL2(@PV}#RY)Ywj;Ee~l3P#T<ek^w<>f#B3NJq6`N7E{Pwb3%qTIp6NOXN-
zUyEe)r$6}|S3dnL_rCn6v`s@^WOyz7xjgNPm%-A39?>-7tb2I6=KQ?o<ZR7Z-O^_T
zSFY|MWs&UgZQE|<))uwH=nQR0v;Z$-E<sA8ax`L=ZAk_d#7ccU9!ut<AP(G^{(_U2
z*@~B5{3u`f+E=L?7!|{{Nef?r!blfv!^8S9nbVIsF7&AQ;Jp|!svq<7S{tzkOV?vC
z6#>x3aP{g{oDaBOShADxgwbfk&TNX&hQ6=a-QA@s3o-6RL<8P_@Q`l35{aQv$;^Ou
zEo391CuG@=Jf}<<@dXS*@o>G&fGYnXYcYLpV-3bhSGuSyWv&_LhH+t;P7AyX;*l_1
zuS;0b!2i13oQN^ue8c~zPDV)QV6-M0SyKh_`!DD>dedAY#>e#eLJ;1ZbN=ywb%8|)
zf5T=nDq*x{zF70ln{V^(d-u72?;eXqP1AU)azvgNGG0K7F@}0QC(kRXOM3wuy$|?$
zAsXhRF_Y=j)b*OCY02{(=RC*9$L#Ix5sEa=7#&@|rfC}5HZrQJ<e%1X<?0ohre(Dh
zz3kO`#o2N}+qR6Vifh-dV)B9;H*aH<B1<+&&wupeEEaQ?%N56GXN1_}dRVPilzGOu
z+G4yl;m)USil?G6j3yJduWzw`b)Oqg+{T(rI8PxpCbUAhL88Q|;zju|w4zlE4D*v8
zc+jFOY?b&kh0S>WrDwQx=LT=Q@+Pmm{4HKPJmz50^2BtD{W2#fFmF6hJa>nk-4U+y
zl-g2NV}h1lRV6|xxJ}yK_MY{+qggkcoGv+8ww#>TG<{F!oy;~yaWaOB&f{evx2j5|
zht?N-rOlBB!j*;qDhM`F<ppiXlE`2B*jA@&<5{&0^Li;>gg6vA1K&8xYEPfRp~DCF
z*`Xx8Jm&RbuaSQYS(WVGn~VS?OO7^`S^-qtJa}4xLlaVW)dw#;x2ht>C|P<|u$nK?
z3cmF7U*zVsD^jII$r2tO9B}YpMGTJJ-K*du2F<E%c<;S;MbbuVthNMSlVsBw6ms=2
zW0^jSF^1rRF!7^gxjF_29_vM5QpZ41WP|##beaLoh&HT2*;GPnGF_tLQn+d{Wp5Ek
zRl^Xt2ERjv>{?DmeCIIsVyr48s3tHFNiSvlN*XCHN!SGEFi|Kc+Gq?0V=STTMXyaM
z+891O!y1$d&(G(a93Auh?|zSi2ZzE`CQuY3vaDjcsF}~#tk=@M?Ls3w6l-YPR)WW<
zV6j-xby6aXMk5xB1&hU;$z;OL_U@+KFjnE5V?IB}J5S%YXd|6HjG=W7-#fOqw`r42
z7E04akIpkjTe}oq(4t4@HAPVpw5IJH>(!ify=K+5^u32DxEpj(1SXS${c*<h&MjVh
z^8p{fdW-1{uIydmiKp%`+8NU=*CJ_>#)>v73m@7%Pe+=k{BbYYkbu;HEDKsa9*y|q
zPko%1KKT*8{nc;s+PA*T_fOB5%oR`X?QytRkfl;L%W{-8c%yJJqKa)$8NJeIZE+Yn
zr&-mWGkWg6^>q#&JfiQ#t!3y2|ESbrqh6qXT<-Cs51Vj_K`v(VzFJC-Ogk3$UgN2q
zLP(&)r5SiimjclHOTT~BBfjtN4}HyL9CuUUh{e`mp=Gql91nrq7(-o)dPw7XzV^+R
z`R(8Qb(D|H=X3t-uU_Wh;2}Ol+TLTck}rJjv+Qq|937ufRTWmtBWbi@d3pwA{vqe~
zAux^?D#qs8pfHi-jIB4Ar+iZht37Q*N-1I*5j*W1!In}TsVK75m#)dhwg2EXbAA7>
zd{1-&*+aszoa2HjVJ<e!7$VLGtPj%Kz8D2Dym$8=fB6@GArEvSj1{8^ZPSt!5?!^*
z$a6=YYtH8joNLJnOOfR=CXxi;+D>lF?%vfzP-|JQ6?NaSXj;~XN9^wHkmote+L2|J
zW#1FErH+y1dChu#%)IVt>V|a}fV-d|FGXf%G8vH<nyRX(MkPg=qjVCq(-6CkYF4rx
z#<a0vJQ;z~M6Kw8!&pObJvVP(=c6w^&u72%DaNCm&wcJQsIE&30?KN{Fqk$_L8R%I
zRz_gMLn2-xFv_iwawsOzyGuBW+B`v*Zg$FWbo7*3^SPh<3_tbxPw>sJzRb72@(ud)
zIl0bwYHtgpA~7mXd$4|j)-BcE^L+DfUg!0<9`V+_d%SV?oL63Zi~INQ@f*MStNi?v
z8lMJWFJ~C<Z^FDE2eQ`E4@1LRQhN0vuNxFKgNYD&@?r}WI#iZ#N`#<Au|O+>Li5R|
zukhO41L^=#M|=WZ2dqo3yWx9x*L?EMRE!Klz-B^14MC%fY<eN~DCN-JTm-1}pa*p!
zQl}C?7QNrRe~6A~h6fZ>u*9ITRuiHH)zP*+u5a;P%3X1L?znN|8s2+Ws~Yb-fAEK2
z=80Q-N&L|<8joq)4)0q+SM!&D{%1V@{PXPYR$RNf2hmEo<s)Z@_fSfxC^2d-PaABy
zv0<1v5Iwux*bS~`wIS;rS%`#ys5BttToDJ9Imw`)cZxn39vszlKC(TkIInAz65V-4
z#Hm3HLCQTHbQ%E@ZFd(vHVT~~CUHO^o{9p6sxLBjm%5}yW(cm6m=RQR=1KR)2$Ukk
zSwrv&YmBr^-+AX<Uj5!{tXFH+&72q_>sF@BLDThyu4}2=F8xwV--{aLs&S0R1;!Q3
z&jc%4u9m5TsFG8Nm#Cl1KxbY~0E6#5Cx>TbS;oAsi7}wHIOeLLFg7FK8gcu^nAK`U
zX4Piq&Uul*u_h<Pp0Wh*SFF}6OtRlL#!wU)eF##Mn~FY0GAk0dg(+mh-WWpLQRD@R
zR4e!0`!|ID-;Rr&QVy*&S)TK`pZz>9ef(p5@7v$y^>2TlgZVjn^c-#9b98is&I~)(
z_t3eeniPEFn=kW&w;%BGs}JeC;1wY$ntJ~u2%10Qd<M*B!wL_BZqbk4Rb!B`60H<@
zA&%A`@+u+fl1iLD5W+Ci`1tGlzDM;7RyCB>1Y;}qpZPdl(DZ0r-{FHN@6I{9{}$mx
z?7oK5@p6`;HUT$%{X;*KbX<#~pe%(&uC?8eMrX4bF~($)D?{B64<0cYmw4|lX}=3k
zv1?m2iZ|c<A#c4cvc@J8(0WvkD3rl<J+UlOY5&3F!$!5z2l>EfeC*p^uKDn;>)x~O
zJiT`;Rx7q<W6o2yI7sY>%7O&=5F=s0MAFf9z0eTe|GNgt$>yA3qd=TUbc%t`XEs4t
z1xIvZi>6J)1+f3!@Bee|zH^t}IhL!A5Ik)n5-KGp=A6SvFH`D$ztOW130x7B>x?GL
zWK=<`NX)I28d^ipjH?l@?>Fyb%Z#q=gc}sV_dVlLF4>38&_q$>G={=hbZ*e5ptMPJ
zE_k#OhH<7NF&gUSiijsuQA|Su*bY<;#;tMAkw>vy@=@{Dy^hl+a{G#*o{V^URFmhB
z6j*%#03ZNKL_t)C%s%qdT)p#AnOq-0#Du9|Zr2X2^MMC-k#t8c3J#tA?U4=(@5^9*
zL=`qXKuN7Z@B+z(X0r)j_=PX<!be`@`!9b76E(}W;lX0b^vVvSwxL_B$<TcA;~%9X
z=jB%pFp0NDG@I7HQYv9?8y(cgvaE}_zciN@g~oDmn(wC`$fAyM&~8ezZAJ_lnoFC2
z{Hz4DzV9iNA=3sIdSX<Y%yTo~o8JG$JNx2N6Cz&0d1v`2|I`1>su$;=(P+ef`0xG(
zzDI~c8y5IQF*pQ{%i|?6rc4>hAY!@=1Gj59*W6fK(tk3>;)BN;jWIAkKci_Hnzo}F
zjTuiyym#-RXl}U<1(;+?F)mA)+sh2j_h_QHPb-BXCTAUU!9~0D_W)K8pC}C7iA_wo
z;5Ka*>!l;aWNmK@HnYS4-aB@8W@w|i>N4IvI7(|gjo6_RlRoK=kpg_O`xDQ_VLmfq
zWg!ri#%T*N1C^}XRDoBPd?bbwC_`s5uBeL9Xw0>%*SL1`3D#}kY;nr|{#EYZzlZ(q
zYd;hTSfw!247_2Kf?se_4r;M~#@Y<uJCVLXo;2@0Q3Y%UMP`W6l4V*97o%urE2XiS
zLFbw*Q;dp|qR3e;&IrAy$^t5QMp;e>j_A$_U5D=*bO_|yP$@+W4&AMZ1eEU~EixV4
zhNA;fcr3%cGZJaEO2!UpXg31mGV<P1bH!cZ`g3=9>baXdsZW^P+QN>C%dEJx;4dcc
zH;X4k8Dok{mWN7Z;w5TGjDFKO{9w6tDO|;if9N6o*BT#uy50ijtF$BSUfJcvmu_*o
zSm3AdsBxUUa+ldVhkU~9b9mlTj4Nid5lSP$!27hA2A)ew@zY|Dc-gETJI55P)4=No
z^xxBKE`orP2VSuesnbdnQwO=2;d92#ItnOl$WpmNdT<BI?BiX|G#DNgQAf(EWZkwb
z>J>VIF&Wy}6re863vNL70T)wg_HqcaX`@kTmNUxSY*rTH-KiD5_msL|YdQvPHWprZ
z0i4^q!Dtzd&x;J#%O+#3rE+2pTi6Vrz-C*>fOO2vCJVFHlGzNaL<(9y^u=emOyLMA
zTM5I)r_<Gqa&0gAu<zeo<obswj?5|qa;uq+b5749uf6`J_yk6ox{$Ik4VYgNGU%hn
zC`(7c`bd!*CPl_{I%R)roC0%2zO~PE?;7>G1_k5UnDfPw(mGC0PRWWAtf=NHr8z!2
z#;JmPk514ga^w1KUi;yD*rF_0uh$qY_D<EPA|j5snH4k4zVFC$0Zq5dDbah{#hj`v
zSuM}WRZpdJiXza57VXw(=O|RfDj7<R%QXZ?Y}+)$71<?XkUF{xJ(*TAmuC#oi?EzF
z1``$91aX)S3T;5=gHvxrMUw#d2pEVSV-#6t(I!J>mMXK9Wkxm5u{L8gsyI74<Bhi-
z(z;WQzWEJa{rYQM`<c)2uYW9OKV_I7L}rIa9N>K=mGUXY9kMD&z}EZU<in3k!>t#j
zNiVqAWuDRS&LL23&6t*!uG;2z{)4~I|M^FM!n?0M;A?;S6-N6v$%=}}q$JB^N?&hE
zyNlG_lhSmRrsvZRDogqT#QpzrC?7X7dp5He<2DO^5YSVkPOH+FlmT?g&L78Z9xr2s
z+a{9$LN1KXF&>XD_*Gn*v)g1TiVy~EtU-2Iq>tq5YV+V{dA11>+GzT|14gXZYeti)
zn6~6OySqEAR!jEwa+b>_KEkT5B_m4|h$7EXKvk4<i6-I`-V_Op$7713*ldJ@kl~Ly
zA`k@V;W0Ih|CeKvA*GE$#0&#%*Rou#XxoPAbi&!H-WZkmq05~{dxq6u@{DRSrZNiW
zpt6=pq1hf69G#2%%~s`kaKGmqk%@lr@Q7PaKFxY{Mp2E(iX3Y!UMayOlhkuSprNGa
zip_HDb+f|RCA#m)wSziRWf0dMLXY)PxIfxsiDU@quDs0pm_*)Fb$~Ouz`a)(D}r5C
zX^hfD<wVM)lBlh9OtVplnxM(aON%j@EE7Sr%$C?(x`bIKU4tywfD=xWmIbb&7ygHi
zmuUT@j6@c5z>onBzriW?_OJ8QGdJj?rs*TchjSjBexJYjm+<@-e~xE9@exsyOb?3*
zmjhACcs8;r0TnLuWQLN;r50|w#UXu5bE)hZfchb=4;SEl7=Zo97i!d^#%Qf2b_#1@
zyPERbfA6<=_~3xQ{_3}R_lIxcLS)aDB0G{E&ZemeYD}kPc$gS)K5%}#X79?joR=Cp
zNHW7G0P6e7k<E@h0OA+)2Z2vBOrg=CWq$gAQBiX2R)R@rk$qNC;iD7vSf9pdqCyks
zyu+r9Rm2Qs^CLO%5H%qvlrmJKg8IBAGZxo&v_|o@Hx6jqK<^?UIDYP<H_2_}bkTC&
zDw=*pX$o#!$+3ud<p2g7BUx3{iqLgwyeq>6g;Rxq)lo4&IcIBYi&K9t#<hK<X;$31
zbDJ!;%;$5I76Co26gnuDP0jhT#>dnk2$9Z1x%9knr%az8w1;3iIWO<=Do>!dxDa}h
zRu@rbO?9N}r0VEnq*sbQDtt7k&~L6|ky(s_#rYZax}jaJG2U_f=$NKm6NBUVXKtX8
zA^WH`je@Z;Xe%UPmq?xu9z5d7$&}@MPCl6tqr#LE-a9;JYceGS$aBMJRN|MO&Iugj
zgQKV>1dN!0bUmYN#4<$IjiZa;6sRm?y*Njkj6lR*JNyBqg)ByNCgq0hW%MH&P*%Pc
zAxWD^%T-$mE+*4hYm!yF0NuR{<hdd*3|VHd+F)~ORc6UNA<GB#OweZF`bf(=2F>a5
zDm@2j>}KUTJz0?D6)(JW10PzPmmSx4LS5)XvfT;_rLAZ?McJ`>6>xoIWEH_H`WBjX
zi`E{KW&HU!&-e$w^EA)Lz#I9KoS&??`^G(<c=qO|gpzE@U&^|ElB{FM(SPzC@FzV&
z2vQciASEwS+TXZwgJ1gfeg5fx^UoOP1{VxT>*qrcA?z7;cc-aT^c$>OrJ-%P59#$o
zQ2KFTI~rqi7V9<pMssv@K#^rajqzb4E~gbq)@Hz{F6QmD5?7$0G$HzpxVA{83Z9bG
zM}}W2P)3MgbC$iK^#+e)zHI0*C>419u;aCR$BZWv>h&qVcI74RJoP-Qw#5W-jOo%i
zO*tx9KDtj(mYy{(3T`%=PC1*e+1}pfhd+E1AEadT0q#6`ll6K{UDqNNb1A?ZV_0{A
zW!qDCo{$t2w1KE2%XN)07D5obRl@}idU5?@D*4*Zk>@$<&f{WFRN{A#mpL}GC|b63
z#!Fj!bO>2<v0PA9C0c9N>lL%<6t^|uxu>7t<mdt2Y@2W0J*4dw+7@)a!I~nuJj+^<
zq(d_vR~W14x(@n|kmZSz)F;8gxPcL3%APK3;|;vez7zN;1X2(eP58lRB_z(9y|G_W
z=87y+SZyiG0#izQT~#?nmdT)Jo?}eFCPe_>E4mIm9@k4-vuPTZ%LZdL&pv+*rQ76G
zqHsyhRyZu+yu$U0E(A<&DU}TMdZ##AS7fGVZz@tK5AGkJr(2AQoVZ%^&RY-2tdUeQ
z&&V>(sG6{1!tZ}$$?0js$#Tuvvf-reIXF3IQMcU63;yUIeGEl|>muFS6Fn4@39GNY
zgVu`H++f*lV|0#gA`cHvxOr{w;vy?^L1&2}Q5xg{d&~hy6825oe1i!kK$H+S1V}OW
z5KvwK8nx+KZMs#LJ6cHGlq}Mqjl~NjiV6``8n*J1w+~_7FL>_hCm3eqhH((IMu#K{
z7)AFg0KxZC!l!c0qcPgbSw;`aq>e9}MVssfAc*60M97xsixqX}dHt<>bV|znDzn5a
zkx;!QCIP|R7<?3CiR;@VjLKNlBv9KCyrFd(qQ#{$ruS>AoonpSqiuoBH6v335u;>n
zES7UZ@K~*>?HHfs%&rt{%{#Ceqtesq8J#Zq^S}HGM`v>}#6a-br=NO~>8PUjn%ZgV
zreTMiRda$himJ%io{edol#O-o*q)A9HMLyF#Hm9miabyJ#0C^tt7zNApORZZAH7&>
z^$}C#5X8jAdq?o4sH-B<<uNGAQbq!-)l9dx=sNKmbST<B;ORMcJqPs?qjQXb<$BGP
zoo#fMv$eC&s=kklmbP87T(z8?&S|=2i{?GnMw};!OKLKc(e{nt)WPHWhzlOmJAw&`
z;uGn7$ETmY&S)eR(mM3yG1B%Oy%&m1P!Xjq^|EJV6uk?q&dyji9bQS-SVRwz#OD{j
z^nBthDRNuL#R)Q5jvBly#KIhMVs!WzI6C(z6ERT$#M9$Bci%l>cl!!a!>ivv034aI
zSes!hhc=o#E6MYWRXyS5S0C}USKi@^pM93U^Vu;vI;=JP)tA4+6Sqo6FYYtl%6R7a
ztGH1?VRO`C4Ukx~iIpECk&Z{L<)3}yJ`WBL=^{jBxV3+UhfPP88RiChA1SQC8jaU!
z;dh;wU;2#u^Nuq==f-qOQItG*^B&vV+f0fiKo~A?rk^Cg+Tal%lx*TB$+}{AA6P%M
zuH>djRuUC=-+hnM(-S`P)1OTvFFk+zSAUv=<Bo$z_eEJjNm(U=d6r1YAOX`f9d%u^
zu9tLOkL!|Yf=#LgD#;FMO;L>~ivnvrWjVonol29yD5;x98))k}or{c8`3j2O3BDLY
z>L90|>pV<$Zcy@wd`q)E+aYMN)bedl-#ffkBHIiE7ihhs=@eZG7UoiuB>X?Ly?Kmf
z>3QDw`<Aoat@f(!>UCzid-mawGvo|8TtrHwL_wRSNLD0EN)THJf&fVz7zhv`F%lp_
z03$F0*g@drA1RR)ZImq8)<SKRL~_J!hQr}#w%)he>uzWLmi+OZd#k#8DA@vXfX1!r
zx^>U3d(QWM@B6&Z`#e?<dq-wVq!Q%PFwQ-Fov^!q7gLuEBFEU~6itKBG3Oq+NOScv
zFTZ*jPmr03`zt)!&7f6m)jB{E#sts2FuBp8pLB4}ar@R5vCvFyn7=(vEvS8<Wh7Bd
zgh53bTuo!bWlgmv)iK>phkRP#OpQ#$oS1rq)3zC=2U^2jV?+0SG%aulD(7e{cqQj0
z_|ZKX@IyO$O~Tkr9LFF8YpZL#eYn*!1w<?8=a1!hVWSET)%PAkF!vJ7BE{KLCpa8W
zP--RxeMCTZE_fo&%6-?O{G&WjqKpqs2-`YU3n|e)jw!vM*{_izNIqx<LK-gbINsiY
zyr|fnShf!*R7O#h1zj)rdoL}pkXjZN63#xf$i>H2u_l1bO3!eL7A$Q6J`XrA`Qq1K
z<!j#>lDib!RP5|nTvOBUb}`nny0*w*DeUIb%lV9w5J#O7F*6nLp*%X+-Dg@EDr>1*
zN`g><+-R&tXcgv}9NfNpz~SzMvu8K3#^J1FT1*+2G1EFHN+R;I;L_=H?B3m>ckaZ|
zZh1VQh*_8Icn9z(sD+N3pJ(*q_+_7U4rklzEN$TkAbx;ea4cKH1#HIQIeqFBXU?B%
ztIw7*<0MLWr0UX1Q<RQSQn0_b!`0hR9o`Oux3lvIL97*#1{rCp$`GYlkj9P_ag-2A
z$=%&4lgS=vL7LPk6}2V4VpJ6D9qeOF!S_D4%qk6xD)y`*uN$Hy!qo<?qLxPoX(!>g
zfA90GF7{bl+MwU-GHet!-{*X$NwwphgPdG<5h$w0P!t7aULdq&VR<LG89PX$u#mj;
zoatL)1(mC)4D_-DV;raYFc?q4<qR~WEjXWcGt$mtXgt_3MrCV*@Cs=iu~Lj`i$>6i
zV`@_qoSs3c1|egdhkQClJAn`yMUD{>Mctr{qpS?6wfyMwPjcnP4MvUU`KQnFr8jP{
zvtOW{<zR1!z+;;dpZ1v9d%2clAOzvM`(Rw*+BrKRH6n_rtw+XbC~u1br!0{Y80(Qz
z2k}f76j)qq@zt0*kYc4qD?wA)*5^?YJQzVm5vB?5(GKQ{4bC~NlgKCvfyjnt+54Zo
zz|C7bWc>xaXxg&ARoL+1Gq={ERD^XN;~ma;n!2IaOW8Xt5UPVQL0VcVjh0%mu++zi
zeT0a^%Xx6F=8vvd{O^BsjcGBZae^~vPjTz!Erbx9A>zOM4=!+Kx%C|sp*@Odqi&!I
z&lmDc+|7FsD&qW!m~Py`>y-61!`fnpBpn2xFFFbgAu#!)1wC8q$G!>eTTd@Z!tUFe
zHV7Zu<+g2I8w*ulkx0kxf#>B{3a;!PaN)5HWIy5Bfyao9EYk=rSzcYm<rAcEbE(&R
z0?q@+aWLin?%FKi%(_wnd~@&b&WT>f+3)_|$NSIHmZ7oMfs4~V&sxWo%U8L2^N`y+
zhb%4h+1Wc_IxRVW`Xrktm#NZ%<9bm7-+BrvMzumu8*1yZI1a~Cvdq!%NY*!&+1L~<
z_-d%Fq^cY0#uCSxv!^%N-9Kctr%-i;N*$(Bh`K>k)7G)s5{n~w<ArXQ<zAn1I%a?8
zE+<x(IVne+?REL&cfZKhq2+)5jW05)gNR<F6>%C-RTW#e?^2AWG-XX`!?lipNH~=A
zNN3R~oU1?yvPeK=u}+dIffhC1m&97p%Tlbd#8L#|Xj>CEIhFOSYt5jaup}yU*07Xy
zsGEjJ)m&Wfu`?_=b7GO7eBoifefcttPx$^1eUO)5eT_-c@Uizj#f>|+c=Mf`eB|)~
zdz-6#<k`pRoLXThKFKfsi+{tbJG*Q-$tW*_ew7cKm34Mby9j|M01nu8Ue5-*yQJR>
zK}l-feDfW&j;KwWEfelN4}lA1LkGxvD6QxE&OX+91a;tlxmkxOWVS)?zs9zi;|!Y%
zUCt1IX2!mVpipw_&JOj>J<hy%9%BOI-dRai)ou0^GSKjvo~EuaMa{}ekI})1NP2_|
z8&4KXw3MoCCkJb8N$A!{rx99#Ryab+7R8|}C8flQn(jgusRBmete?~F=Yd8XTe?DE
z8bf6rcW>Wf?ZhHaKK%&RG@-NOeUP3wMkSbMEb_s&`tjDPhohll)oM?*3*T7Va&{!9
zfu=AZ9Gh!he)cC%gRJO%-+#hWKNGQi`!-+u^*`hB4_;t-Z6#y?zQ*|m=N-k~nBLOD
zv5;~9(cVy=c~|g=(cq7sF@wX}lJMS{#QU<iS;lp|z0c9-axb>k4qgLj&BDSmU-{f$
za5x!*&RAVrXKg)ri@bg14#HG;@2IUKO%mcH;l}N4hPmOw*@swK>XB)OF`kuZBk-cC
z8li$y3L+R?W<s>CHZUHIu~p4uXHKztQicI$rAUq9vtoncbVA+)%l2_mP}K%wEE@}5
zE}mY;E6LXGE~YGa>*@~M*R~nOeWtnR)Zzlqo<2k2B>VgO81E^of=d_A;mnww?QJG`
zpa*Q<zD^{=Cz~jZZ#;>&Xjjq*4@$AVy2@xcCNon$v1EDYa7Y%9`SeeHl4f{FVLcZ&
z*D%976kf4(av58BrbWc*7oMcp-KMA-%Jof_dl8ee!`Aj8>FzB)u(U+s71zK03TLwz
zwb<v*<u~bfJ3M-B9a#+d(HGy(II;|$`vl7;&+%XPQpT^m!GHI;KjZ7UrEqN`;EtD;
zzJ)--n)0pg`OM$5mSBa)OITQ4;qY)sQC2t~9cxas9Je+I3ISdxY>%gOC0J8ooSg@x
z`3Ms&;j}&1%)Onq#Iw!?;NN?cfZe@);y9+s4WL12g1uXEL|JOrK$fN?Ny0|bXK6KN
zeQm($wGH;BITufViou{y<Q-aT1<s=)jWD8}&UW0mevM+hh`}LMj1(nO1Seu49GV0-
zo#M1d5LmuPZEoMzoC(%?Zr{F(_prXPN}R<!{Ltx;skq?n=A1!zj}u@~%m{BnhAxp6
z!F=I3ooODV=1VwaELAxUBt!zs*5DCQ@EJ7DQUeDQ&6OKNzUN~L7$YH{GMy-1`SaKK
z?2r5)-@f)P!~Jc>JA0hDcph1ljP7p3!2}iuN4y=^Hkkd<1@(CF!LqE4G{?eK_)5&N
zs~Oed7*FW_jOxD9FeI}_*_!i#sqTEBLU<9}Wjuni8sVg3e}BY?DWho^wJ3@cJpc5E
z!O?bAeamrj*reg<iw~pXFms1>q}_zt1bwE;dwdgt_tZ_zbUMOX&v-iG;-!bt-7ej3
zpL6AF4BtJVH|R009HsR<0-yyl)zBA|m8G(QyJp=kW_ORKahw&B$~c~UbeXej%Y61H
zKZVI1|NNi*KkR(-7AwnZELR00N_hX14{`I&zu>?5`JZC<OJ8AhIHtCm7cMODms?$K
zyNZu}?4!K;>Z{zmeVG@Zd7M2AcLoD4o?Rr8OBg3;uD!!Ure>fjmUK>;Sq=_!{2haG
z6*4cFjt;4+iq!?jo!4%XqzT<_ipxhJ`z&hB!paJ1C!%hqETx(_+GJW4RHeuI4koYo
z^mC^etZyPd{wWsEU&1yu+t=P?<9mOAI_dF`Ma@6?^{?{hw?^n=`UGY!{5Qju!hI7O
z5RSSrxF{ov6N<{Py}gG}3NHm3MOn8dwboPRIkD2@MM=}t*v8<M#bptb0+jT`N?@(Q
zN>6Pq-Ao5ciBv(S$_Lx|!Z{jL5bvuT%e{=vN6z3I&p|mPjbipDhG^j=qsG!(-XH>s
zQO<BOp_?XTI-=M;0F|(_Kc%|v@KuE~g0U$XY0Z_bJ#-@!iIj|nBkH_F$AQFk?xC}E
zZiCXhI5EYFV5>9-%~}m?(T+$QKc>^5NtL82Dp8!+Tt~EQa5<ZvbPwV|p=s*pU|>jN
zCEqcjx$lrtk)$bNQnks43))%+FrKls{EOeZ%y2Yi&>Qf5-*W-y3#`}NxPHL;xktHr
z`#R^&tWiydWQk(u&K74bo};@kz@1#5rE={V+xZ`6?{n5ZY=6eF$72C#KDYLsKs@&X
z>wn8bieQ4UzOhVMm5lD}&VSaJFkV#=G{cn+%zv#wXhoC-n=503=|X92$iST?iaV`w
zsvs39{e=NiWxV_DJ9rea25&4&9mzu0;q;j`UVHNv#swOJ(u(D5kt9iI>Vl$%ey0Q8
zFe(Zbm)02_?s9v-=40=Blxvr-@>~DxS9#yF7kFw#a_dgR3+KCRZBMy+YoGY8WFxkW
zcW+|$x6nI>fZ*!OLpYdlDjTr(?KfDpjx!G}!~Q-4DjvCXh9a*4PZkMmKE;%dg(yN!
z_sK*`((hmz4_c#L91K0OE~c20X-T3aHm``BrkNBJ){w>>8ebt}#dK0|P){-5v%J*h
zsmD&Ra&nXM!o%oiUchH5ci;LNzB(k|&Y2vH*nIXmdK;(s$Nfcq>Gxmdja$2+6MGE2
zpOuNTe{&~m8(RO<X~8tF5F%*C(QZ_8*<lr^6lGcAjAeawjX`%2Yb|wMv0K)3glD;{
ziM2%GX@qBMItm6Xwqbo^ohw^g-~~-l(pz4pmI9Pvb!mZEd0gGF+Uug5n%l3vfp2Q?
z5Gln(L6XG8NUCYc)CPAXDFg$2%e!(UQX;g&YDJ_ax-O>F)fAm24Eo)GJ9!VrV@w%t
z<TzMf<y8$T+}zeUKm%3#A$l6=*xH*g8I@ePcrx%cuwm-jhICdq(fU^$;akBz%C#{p
zuxV$?rt{v!tjjQ4b>dij5CV({EqD*gE1Je(t!L}zUCK$((ijDMqZ}O6b?BM}U$lmC
zQ8OOz@$B;#>2?%VCYhFol{2U5^m{0RXP}?IBRPW}TfHQKkjFBl@6baO$9^Pcf!-Yj
zGYEh8+;d`HE*@uix7nPK1h#h=eF?LV1oHwsjkTOUwLq#Qe|2Yje#2WYFir+tbeMPR
zyl`NHmtb%+k*%hY48D;vFuipWezC4h=oV4ZSci1JH3Z37?xrk=lGBeaa(CyD$=xZD
zS6q7JVeVYr$6H68=h#x?U4)XBZY3Gt+GS<2$Ks0R_8V7NNKzIu&z)D_VsmMkwKE0N
zyL<FdJawXru4^*g<#2DGjU>S@1+lwWLcFxVpg&+V9y90-f<{#4aP*k&4g<Sh3Y<_J
z9OPJMNwpyAbf`;1w;MAoO5!+TFz92dDh!W%O`4?S#gr(K^!pj3X@gdpB!RudDLPJY
zszCaT_rLF9k|j;=$@e2){5ZX&!|?XojNf{f)8|ei<tcX3J-+_sZ;+QICmy;$@B4p%
zpUh(Z>h-Jq*=z4|y;2AxK?l<1Y!ad&=$u&*d;rC?!a7S;<fM^83r|0as09>4(h;7O
zG(%g%&Ye3<#zP=<TCFiy;}{)|FvXOP3ie-F6jKvZ2}vztn#OVG+CI~1O}CR!9**Jm
z9^G!2qA02A25TMXmIn;9rvnfxMAVs&K{ejeIH-J}Vbsor4BuNCz}YE{3A{2ZEHFf(
z(Y=+WAWt%>9#AI;+$)8%j;1k0@2Pm`=MjI#bk4H$C`*`gmX4NR=y))PYn%k@Y3H|?
z3xCbXaevd%)WJ#TV0Xl5SW--imW1XgTfp60hZA9E!3Jx1tVamNjXSsT&hp(q`Vz7(
znd~3ZJ+aDi+7IQLGaw(-B|180qH1nl*8OcqSspz88tQ{Fh`PZV15Mcuk$SKOul0SV
z3J)H~2Wn^JzG>OuT-a5;3q!x|{?~DW*{INr_&56(9ETlAnvjx^^_Lm+Mo>yV^~o2g
z_x4#i9TR!5tkTpaI+i3!htVj<lnqWADj5;unM^{9TS>|8t!;#IEcE*9@9&c&9gK<)
z+ELuxM#mAE2&%P{(UA3x6HKR5mRGvuc}^sIcwZ7F3C;<olY%(XY~9&Li7r)HF<4(@
zI2@B@-MKb<lBGmKp*os4OEFa$q>QQ_!?B^V4aO9dWzBG87*&RB5cAZ9lRW#(W0a>K
zq4UzG@Iq4MTfF<_f6K+k9%kw6DI^+)Wn*=T@BZvZ`QjhHjPwPL+8T=h03ZNKL_t*3
z!73;J&X03S{4zhc+Tj;||Eug<N1o3p4Kv5*mT*ge1@`Z35p`1z_x2f0r@Zi?57BH|
z-nns?lY=hGd9stsDB;<@d7aVW5NAR*1c5>oN18S5NmN)LwX(c@=MF}Od0f{vv%>Oj
z6+C<}yznAWB%}~*jdJ#JcoX7^Fg~n9-@4%tVu3M1*N!%kSzGGUO*DSc$9W%E?*{6|
zp_Ox>RoLy7#GBR?M|xB{+hs-Ipxk>?%C=J>QNm$cCbd?94iMg<oP&na9|7Y|hN0Hk
z@U3$mF9P-6JBOA*Z{66L29QGu!1yEZx&7n9n}xcn*xoxJ&r5KDHx_t9nvXsE6hHAJ
zpW&bW^Iyb>ZJe!1EqJN1b<Nh+E-P#2!8uggp?@O783Vp)wW6Y9I#{z3kfU-?1_G&Y
z$1=cqDcJt(I|bh3+0}8p>R2$D?Me?E5`<1s%@n0t_0HM*Y)wY-Avc?GhGwtt+!15n
z&y*m6s%ce6-Hc8Vy1?GG;IDBY6-z5iEUd0ztfZ_B+j~=t4lX?FOC7wsgVU1zVT>1j
zKJ(&v4lZ8{%^N&5p4vFlG^HvUn!2H=ssP}|3+zv8d~NVT633D<FR^G`Q9@HN9eYge
zQAtJCkJ(&YWxRg_RcpM-DJD6Q3?>)LtBdH?Lav-xCI^QUMMV;29PE!+=r6Fhdq^ki
zQkItS(2&H6y}b#YZU^f;lQiP|GZz@XemS(+^PH+O)CQ`mLEwq9jPqv)Joe<nNS)%I
zcpp6R0kU2~ad3k>Z@tE;vnP4_na7VdG!f=$@em8o$G_`C>>iA`@mFu55BKSR;w9vr
zL;k+>3`Zru^yMpTPa9|gr;rxx_FgjD-J@}kk0)eG((iTIe)CPF@T>@d-km_((W|9I
zYJqCnibn>9Kw}(5-e8PlYD$W_VPZlygbeB`-uWQU4VbD7BXU|&4@W2wFxA7N0t>MZ
zbdX4RRO=e0bl6yB>*5{7Q5zpDLP!=DW4?NI$k<KhDkZ+XK_65cJ+@fH?E7Q8>Af1v
zU|aCbiMhfJO)~?ULlpKiT0*;cyc4ZJojle?Yv=fdKxujJ;IWvsOOJwu7e~2=5D-Ng
zFM_qvQQ0UsvC!jx`yc-+HdnfQ{KHT2PyW+?KwZ^stZ0Et=b4lRQ554^w`bS1!D{{<
zW@q!q9{=X-&-0ywm3OmjY^DYDU{DGM3$$$d_c&(rl;S}w5x`kD?<n2>zGl^{m<blm
zud|zXGG{yZaYY6jcp}`qd4sQg?VDV=ahs|MgRRB5<Ujhm-w)lGgOMP9cL!BkuHU+X
zDN7cY7C4yJc<)J*i1D~UNsV!i!)d|o-JIGDX`G?gPpHd=Zk*BYt}>a9naYIXAjdgP
zW+yDF9>uWcjE7|T1l#Z40PnH21wX}l&uDUkPN$1;P#A|uQcj;c$L_l~Sy<>XSQwyn
znDrYMB`d3a8Vpw^HMh1Z)F9=jfBIRZ5bWhSvGF)>sHzh0pe!05d3uw@#Z?v;GvpJ`
zqn~(&XrV)MxXbQqZ;>XFhb}w>rfKDTW*6efi6(sBg4Klu()V5D^4piW@rAb;Y(Bz6
zfA?qTy!-`zyeRp-Z{Omry%Hx?yH@>?X>ns(sTfb?EF)hAXDaWg+I3`%$N13LYHSlS
zB@>!1$M2wk%m%i8?Sp{d?0xqmO*fG^7kn&{p^7oil2?YR31%0OfLKB#J&_b)zBtmX
zZ!Gip!zcOlOBZm~@r5s4;Y%;Sf^mXwmeO!I=Zeiy5dnH$wu$yLo9*oFf)w-5R?MTF
zU>4Uxa8q6)Tu4t5&@`sy^Z0qNniWYFLI<tAXnyW85Pnw*IR^)4o+criYD<@S>wmTg
z+t;<0Nl|lTryb7wL!bQ^yQ4AA)oh$vL~BhwV+ps5G18ia#f9*@v*~vsg1pR3aIWQ+
z%&(-FeQ^M*Kvci<nZ4IB7ht$Q-n1q2aYE>OJ#jY2DeeLEk1k-_Y<>^y?5GXhQuW&B
zAE_9)R`-3jJ%#ZaS{-#CC@#l3m@^+lW5aa+i4z-~Iemihc+BC!n9UO#TrF>rHaSY9
zI5Xhz>OMF{k()3+Wnk^X8FsJVLFt6i!68mK8ZX&Bs5rf`h*XlpDn)i<^3gsE-IR?J
zD?EGgNd~9S@y_S}n0$YN_kx3iDP?8Zd*|I?)ehv-oNlK_Sy;-tB<^Osb!8jT>vHDe
zX*%o6#BmB&Zn3m7ps6dOR1!s+DAQ=2uzxV2YAmB^iJVNi^R;&vAMB#*3NK^ElajO-
zLF9S({CO^2IDvZT65{!nh<ZKDc!%A$U#BW_PM<j!nijT%NZ+&0=C?z*AyH1_L_<GK
zc=FlDdF`uT=itU`>}_A?1K;z5$dyz4%;wkl-LHI;m#^d$R??VIhE+|FT*5<9HCQB-
zvy{%0n=o@YsRB{d(5hwlfXohJiEJFL6=+z$ZDr8-po3N(+Yoz7v$5P`|FEEJJi}?t
zAdBgw5xdhG??d@0wV<0SVkwCTrM=dYwUtHAp6c_l4?Tf*q164xSH6LdG~F~qDupoa
z-YH5?>r2QH_#Hkxg>i<Yqp`*!eNbKqH$?lW1!Ywq(<}<4FexO~Gy#tiq3u7*)WVt!
z5j&_D&cyFpM!O7xWyqkV6m*rsVzMqQTJM9|XRv_^V;;1x+sk4iE$0p<Ao$W>ev5zf
zvp+&MSm4IByO_pfg$5<4YJ-kLl4<JD!I(=QtKhgRg>3_ZI?6uVv7qC!C32pnc<@IZ
z9pPsI`*;vK!jA;ApyrPSt)qt{I>WJ75c4f0@S$*o`MzUqM<vj*RmE_ob;Js?B55qJ
z#$j9wn%9OzM+hW|46@8#2D~9Of!nC-AksSE7)?VtDcHVso9bYMDN4-NEx!Na65o4L
zp-V|G>w##P=5Q!HcdCXT{PFL?8_V#{4#V9;re(#U$=N*^(~nc?sbVx55w9<Du;cl&
zZ{OtZ#BlzhGyM0@UP7mm6Q@?`EH5$5bJ9mnG9HbBk;8OCSs0>0m#V2b91qD&!q;E9
z#`eT=;iABm?{MbiNsJaGNtebzcd$rfgH(8;B8sBm!b7Kc=%G#S?(Q%xOJsS#*3}&r
zmo&;2R9V7jKK&5}3xeU=DbzDB60I#$?Qb!?a+!R*&)M_mf?E>cya{B@CX~7JqGN_?
z%-|7kkj{l{!ojo8y`QSFy!!H2_~T#tKl$*F{tU_ahj_7Sc>3XOe*KHr*)lN`Uj^?%
z5i%j8Lz5{2POo&ay2EfXX6wc{*oSd+4+1Rr`lQYx<S~hC6}rWd^%Pd(o1?~$F%7+L
zinE@*X+u3J&^qGGT9+&P6O47l5|T)eN<}I?T7)>Fw4^R8k|@P%unsOgdYUXwXs~2S
z6e^~=X%o<SI{Mxw6hbuUxW~c4K1zjhqgAh%AKrVq-5%BrXUnc#@G8ufxmM03AR_Zc
z=ACFg>}Hu=s~_cq7L!1sL~z-WQZpOEvxF({x=nd++}>e%d4aX%4ATTI)Y{@QFTHpc
zYaC4zTD005{@efM|00%>*c;ZC*ZAm5FY?YCuk-EKFSEMRL!Q6X&f3i`$X^GTdyeM0
zzT-3Q2}t+<a5i7~K$$lWS{&WU?@=cHweM|KT3AD;7t!fNbYj8z)gIGKW1XWLgQ*Ja
zY`#n=ytR~vyJXdbX8RVy(E+1LMOlXNlPF3#98NJ7mKM5vt1KxR&)U*})60F9(ER)l
zeVEe=5&Ji`kxfHg*Tk{lt8eb`g?IP)#7Cau>NnqDdSjQKmW-ugu#mBqW-KR=>WFb!
z(i@~?2#l@xp=VB`63w)lu=lmEFxGvjC)7$Y8c%};ma|C0^{(r-*-}+F2P^%E7cLIS
zx;?zF&{2YH3dYk3E6XRT%8GoNBUFM?nsGh`Jh$)O!FfkjH^HfCG+|?7!0EFaJbZSE
zbdX}ttl>ZWDHax&u;aVbw_fL4U;8?bJoYH3&z%QkSdI6q2HVh~CdnXPZvU&on+9bK
z&Net#gSSWziKuwr2cM_EeusDe<lka?>wM_v|8wsC#;@{oF6MKuT;;7@i7y;hg^e}x
zj@rR9kDcSui>v(6pMQ%%w~t^F-cMUOv`{63ND&E*H@3~dTi8W}q-|K<J2%+rby!+j
zz&b(UE9Ai#sU&q>1(jR^aa`+&L`h;9%0nqV5>GLikPpY?!x6*b5LYNt9f1oDOHnI3
zeUJJrpq;e{8zUQyrwSXX*Z8JjsUM*oC=-x<Z)#HSNxUR&#mA)VP*yd$fh5Xs(jcV5
z7#Y+)2}YR`*A7fJbI0GA0j049YaLZBsLGPG+d=Du@#p}p<5u&k!E4QQ5{948om$13
zhT*}4EXyd1G5dQ3fAJSzLlOZYi(BY-c=fdjk&5VLF(2v{{PHjS3Qs+HfnG0ReW}mT
z8^B>2TKvp|m-EtznN_@-xsS{M@o)|`6YLXhY3731;62BE_>#vXkLjDwv#wb=daU|v
zPZpjxYpp{2JdKwTo(Oe3j}wZg)*RpW*h#cnf#_+hlfi8_&w1r9-sM|Y#*~$%^nxlc
zh=t<(QjFQ(VxT=Li)bRpq_%YW3wQ#_cwuRQg*vD5DVsgVbElTLwBDmz9I~|&Ml3p6
zf;XPLZ1~7ir@3@$l|ffBdE+LXC?=AU#f5HgU&;%5{azR@js$V1i<XjpFAFNE#$e(F
z%-B-YJ2=<S)HN1~j_TIINMM|!YHE@=CQdW@3j^x9VL9p}M2z*CG>vJRk|^ph8jqQH
z%i!cmgmqN6chFie9u;&t5!0%|OMw!wc50QC)kT(97U?|m9MMzHz~VAKKVbOo*D$6+
zMVb%1_(D+R^})U@V2k1Y5Aca-=_3_Qa++WGwLheAHEEimBTW`(#BoBJ#B|b_$1YxC
zy?%$xO?dqLDXu8Tw_m-?@BP2O%*Vg~hq2pF^V92p!kceh<5&Lj8v8=>#$L@qSt0~{
zoQSW#vcshA@$UAJg|22;Ijr<Ft#6|6&|Byt4{N+^y#_saf>U)ZYGSDov#~n?u~KAN
zmrkdoYdum+k~l?bPeia#3-)&&tpt%2Va!GZ4D0EOXE=5CB&#2Mk(Ju;%9maz(jKg$
z5e2c<NEIrpfc}KkM>kI3OQ_=v-NYzSwvrZtL9BV^+&RptV9Skwl^FVIhOeQiD~7`<
z!)Z?1>C;h;x(a`ka~^LSvNQ$bu!P`LmSwAjt>)9-rV2Lfy-teolJR(qS<QfG-kB6q
zqLic?DVnB1IfpeCVQf3P;1SlLoTt<4P}RXtF-a1nC{S9{>2{E+4jNdhl?ZOf4!jRm
zOv@`v$HT<20O0N|+1~4z(F6WHNuP6uyKiR*@7H3UJ!ke-zEjq9OtBOkuYc<{lTN|&
zFP(vAN<J-U3PZ2kAuDgvt4D~uCKEBG4V~JuEQo|8)d?{<6W>teH3EU0<~Tfs^6czS
z=ywGldHNFT&4}rZAqPc?^O{blLz6q|swRp$)RPfQu|T1jiqKHW^C?~mtSRx%v$V8?
zl!CpiOS-s#xOS6#c!*2{d0rr;WIQS;%7T73qbe;X($r;xiemI?pS340aO%V&*Z=e@
z^rJYaf_75UG-Yr1kSOglolH2KG+Y}^sg>pv-}5+kZjb2s(4{Q)^FTJPp|pbDpvUv?
zf1G|tVa{D7e&M6&-T+hXQr~!;A|J83xq@&@SYy#zfjv^@Ji;a2dt}>=-~QdtalPE8
zsb++1#k49hwxKT-|HD80NBqe9Pq&xX^YFQIte!c;SN`B-e(`_)pZL^&{Bu0~cYcD0
zf9G@jyw3Q|SKnl7B=Am?NXg06aWJaU)sWg)HWpI$iV3rkoLN67jUrSOACsz@i39>x
z2XDY*ht|Q5G0QTNstr;|c7_wQY|TVk@L9<)qNQXQ3DQ#1NmHyb_}V~YNjsgODuF`!
z4%4!JAj5LbqkUsgebBeJkZl@fnqXaI>LGWw4%pk@B}x*qtix^ZD9eI)n)9<yKFz76
zeyjWAkfH%wGoBXU%0Q8bBTQ4_@E9S3MO0H0D-9-S!AGK{N;rp70*MdpbKlx{hq<4C
zoynQxZTn9+gsqXH)dIJkL`A_S$~m--5HiRBTQ4ytfb`Bf%F-Z&Lkf>=9F465c4cPs
zQ!VuDJs#7ZFJw4kW|)e=i8=_<c^=HHW+CKw5OW@RtRxJ;cW5!p&7<d|J>mE6x8ef8
zdZcu1?_oA{>OlmZuXCrD`O@!ynde^EAkHLlBM?rryqeNkSwLQy1ZSeCRlX!h0nMCE
zqzGPf3z;HIYdWpNb~i0~^x=#%3z`dO`c$SvaeJ5X-jLWEO6QrH5+!1MR8mz1Vxdbh
z+$M@5sx-n$K@>*_6|uOv4#FaA&DQ=d8)r^XDNncGp((;{tF>ltZx1OIdxtfXaSqu6
zU%7TbBjEXG*Le2C^TfrJj)EjnK-?NVIN}77$YVMZGwjmOA}-&&!IiJ2O!xNKEh>7w
z4%0#s>5}QN<TF3?VNR`gxKn#NKk?IK{bkH}i*oBa`+IwAZl0vyO9Fz8LrVc=jn`ou
zCfp;;%`fKN@>Y>mJBJYshlS%{nA1x$RMIdmN*V)kFCwo(SvbqkrE?6F;Jd!>CE|X<
z%|HJl--=>>;vf8H@H?O5zgX{b@-MIOYu~tm&jcz?*;un&IZVmK0bZ)G*~`#VQnO$n
zCEdtj8pXWLCcw$iD$}Bz2M!^jF&?EF;zSWA8XrX%R|kAqN{Z4F$H8_jl3{djHe4@N
z@XD-<64~;yqD%+#U!Cy#-?+kXl7}&~wred^kW$xS@mrh^+$y}sTZ3<<Kf*wB(0C8l
zJNNq5F~ehy{g-vKAsg-?fcp7DKf-G6mD;^;q5GrJ12MCG`gb^d+p_)Zd6O+M@>s@{
zrYW{D_XLNwrE~0iao=NmqL8;fc$S%x|Nk#XTSDIRUlP1R#)_gSv08!CM8r&8iHs~l
zcvLiVBM#RjTq8FpBs$mXc+dY1hckvj5_4i@35;gfSpM+a*Z6xs^@Ff`$T#l(F@vr~
zX^poT)<A6xNw))1VZ3C}>yV}yJKH<FxwFfcZ&ZBXu{(V1*(Zn_Pk&*+!Sy@1gG0LA
z9(8N^<ea0^>CowR+1nekxVVIjB~P7<5otz}H{AT<S5S?|Hx?xfc~LW+ltfzN8bR$H
z-YL$XP8c0joO<|Fn4?W2;(kWc7^c&j7oWbwBbOFXo9n2TKEb*5vy_uP@>{Pm86U8;
zvd-q_=6ljrypj*Bhxfd0_dJ4BK~qdPiL*gT!FwpH2d(A;GAy}t=_2Jh%b)$h7x<U|
z^#9;vKlmAV@=-pc|1}p+ru@#^TlCJa@xF&1<+l9_Mb-u75PQY^z0cONY8zfsnPYEj
zrduZN`Fni3esyb@G1FidQUrL!IU3=aQLU|(SSiBjSLm_PNJmXf<2#HeBewTT4phw8
z)Hu~}exr{{0&zXofru)F2wg&4aLqWfRrfe+=jodiia3fxZ7YM+rD&Z|@PW)3<Z8nW
z-qe<$q2qAgwhN(+l*h^+Jahht_ny3J*xDXbHZ?_M$cqT;a-<aW7Q1w#dtGRS5G|L)
zGaeT-He?yzht$)yUk3--RzqBgQ1PMyhpaV{#e1?|591uMKHiH61_3kr#0<g;iT<%5
z9NyFe6{EO6AkXn99(eA&`}e@>%)oTPJ+-1Z(iWm6ineOtcxNzm#rnn~<H?x)I|WF?
z#<>$g4_<`9Y3GAOPdMcfq13fXw%#l7j!3~151--e>ISdAeglV~k)Bl*v;FONh({GC
z)|L<|fZtNZq?tlC!AZy1hPd0KCT4$kOs~7Zr=NI~_~kcP?f01O?6EtY(0}9+Qf=9{
z9+j8i1zER4RaK-(2WLD>i(QmXn3Oq}&Yq;K8@fq{a(99kP**kk`v(}~=ybZ2<(Q?V
zCB~B}#yduCh^-|_tf-rsPB%rzF=y5~eCpCkq7$d_7oR7&@DScK<ab`Dnhr^#loRWl
z%(x%#S^A6CXYcqmoGtd5_@kKJ6AmGCn0*(mGmTMrW)9AhvM5_d&5YvHUS$E17Bo%8
zkNxZq@%1l%ozMU3FL3JO6MXo`e;WOT&-3?}uJNtO0kK{q?WQPY(ODGW7;ER)5CAf0
z&N*q?U^a6O3fbU%%&u*&IUh*kQUr&eFe)rSD!dTHUXVlrr4_lg)DCj5QIRAPk}tk-
z6(Qi?{N+Ck9eUyMogUg*HoNU~g{i>SbacDkyhr=l2kCrJ9&H2AOn+x)ca0av)>`;F
z7-_VwAF4G>#Z#Nm$(tE=&Xk1x3<L81*aGob3kRc;*Dh}{nHa{?hAUUM+1YN|sO)+E
zBTv)w5^F-qT8W0dEEr8EG-{obCr@DCy*kIEX7=39g@9$PK(;_&ke^X4&@E6xP#YV%
zlHMX_8|1ORvp=qo+5R2gw>D$5oAo=SbjLNl=dXR7=y@zNI|_>J<}r(G!Z0Hl9+&zE
z+$h3^BUSs$7Uv<8hD=r@Sr<3VIXoEBUFf3q0zw38h;zQZ{9z2oxR7aUFR<1ltz$7u
z`0?-iB;$9lBBn!LIMX3X6ND2S9u6^Y-JtT8tluS5n!0XqUZA8ynlR#Z_1X>ghdEUf
zI=vkkk!4-B_ZzO>*(Z*M^g1ycqqlkd$xYHYLE~tU?CtFlY0Y5J5BR0lL0-7d!bAo&
zWzi7D5yfak(&@83DbZ0(VGTN#Z13-dhE9@D8^gll3XxW1(l9DUJoVfo#Dj$7@eh){
z_}w^{Q|w%(m>iI(h?V8lwwjoA%Vs6QeZ0B0V?M(r!$NB_lsWO)&&SUMQM-;DC^dI0
z3VxA<uA85+=Z;P-1gtJEvUljIiky$U^djdTInUc~UE^Q>%D?23Kl&rAZfx+uue{9Y
z=5-d7B8wEc3Ch2-5gBNeIs}2SE@t<bL}*P}Hptf4C2Z6)@^}y%kSZdMEmDN$XA}ib
z$~cO+aQ*~%i*YrPYV$(j5W?V^5U_nwqw%C7NYW@NNp(yVX;cP@PH?U!NMI?nH+Bvd
z%XU%OR)5D?i)#h&0<IxQBs9m$IoJNo0n*A=7_5Dbc4p7Dcy)O0y%mxNyiEA3%a<u8
z;hL(p&h2CwQKZT9Dc|_&+nicop*Y-UFzB(ex<sT?mKIYcO@y$XNa^nkNWaISRDzO0
z7S>q{uEoyc2W1q53lUn(`TQJ3;eQ|I!QcAu$Nsf#UVmiAHGfV^%@AI(Hi+q-J%zWD
zrR61}ZcL2k_SHMomZS1-UbeT%T1zQQ;+Rjp|8W={^6nSDNGDC%-P>bxZ5>k?@P@UO
zC3;zc){;0*sA@~v>0%Km1uLDDJTEx4xyq?c$uuw6-X4>9%?CgF1aH0b4tXhYt|5*E
zlL>HQji)~S5^sFz%ZRJnbUGad3w;EhIEhG;6pttAG)yKn&SoqvW$f-8kfePMyyKli
z&qsdXIX?J_=ehaX8+_@Pev>T9D6By!$KEJsJe~4^_nqR!?|PB(2R=dP@n_K9(+uBc
z_wrjTu5PlnxP}*wdj{|SU9Z=CI^telgPRdYk6pVN^np0iz4AT`B){ja&~m9dy<Th4
zmvidmDw`)(`NQewdF4-kpWfmLp8m0)VDiiVHy?=M%SDAAqz|A7v)7bDwbcl;h!dSo
zhtk};5zo5WLIgt@-BKwK0gRVYP?ZgT_4ZBrNyJJbSQvEaB@O*l(oZA<<w>Om-64uX
z7C&pQ5pw<zB!$4M7<^!2=;?5R?xf6A4V?{Uk#$*9RN<zU&Vluml|jb>V?5Fb?ra~@
zR28-fUU$Ye6nR5gS+=$(n5HC-5^Sr$5Jxd}9h3&Oswwh<tdlVsmmH1_!B$+Or6$=p
zMQ_kBEj??SXGqNugy7chn6u|MX^bU~f^lUQJBn$+_Q+x_#6nP*;8_=pA}mTuB2!cA
zkou}5ChBEWB7-Q!<_0ANg{{yn;Ow0NAFP=|Iy^I)n3c3GZ)-la^B$PSY{#6>86JDi
zF;eJ!v}Trt-p}=#`v`^%3gM9iRY&J6%DZ+xN`R0^FKE<&PX7><bf{~AZyZ*{Y^*Kt
z?ptqCxgdL6i-_|V&a<_($E5aTLh<m%GKp8D!wHjvoQ14Ml0?L7>ttEh^5kNygQ6)h
zxg%1Z18bO^98fiqOD9%ouDnf==j3IDQV~sUSXzu2?$<b%v$?s<jXO2Bi-x-gC8y7A
zu(G*|ND`j<$cK3A)*nz+4bDoMx@oylBg(3z*X^QH#bUQllUKn@Z`^S8$`B&O=-O?*
z{M&y(wR1=>?vX8J6h+C#<_XT8U151?5%b&!aZkKJKNU2?TkPJwMyJ=~<k|D>XqH1d
z+NOp$cHQo6iX4^wZob@Sm&>~*z#cRR7iQ=JlwgS?z}psHkpTx%ZFM3&WnBg3BJ1a9
zfFKY{h1aA)hfGdtgmZXd`P65=i>ude@$z4Ml^a*C@ZJC6&l3IN=XvzaKjvF|IokU`
z2o|&I$x}3T-s}<cpcG)9#`$}CoI(g{XOK|>s-S5nB+4RZkSwA#O!34*l174uHu{`i
z>d=vrEY|e1DA@l=)%p(JcZgZ_5Hha9OUkMyi8Q*Y47<1Y$#3t4VPF%|!$u1B_61E7
z<R50#fdF}VVih4oL>z-v4f(WUVX;TI3tRi+R%*hKr7_Mq@_b61DDujnWrUXsgTM-f
zP?~PP&$#e(vOYF3?5&*V%6OZia(vI(58&@!#tXrg9kS)us0xQG99l0@R^eWfOI@CO
zDh@VcNlfD$9)(+9CQT!>ujq6fzA2b)WE?JE;!sF>O$@F<NJ&%Gh%9{|_#8Rnya%v;
zoO1Bs$Nx7TM<i3j@!86-NM?8GvFvIV)Mn2){yHwOl9Geu001BWNkl<Z^qn<`Y`{Bj
z?y)mDAW|?IjaXP%;OdQQoIZJu_kH*j{eGWUzWF*Idht2RTJk&p>i77-*;OuWu9EK_
z(pZD^8Qr7}Qc59Z0Q9r8i)lPp?hJYD)*&~i4w)!E{9(`1QjZ&N?=ZQ(1=i8)bZMHL
zZm)|qV+!LirsCx0I@fQ#i*g=Q6kL1jUEcaL&FZNW$lG@*$|=@*%1Thx1wsg#u|R3f
zelewVhAd67Wks4Lq><#wb4z61h|$3=eiUJ=oMbU!aWUikLnj%WNLYOQgXrg8BwJj;
zOt(3_eiK~H%F0UE2;QrKa;#jNe?PnSv-19aGO!4chV$mZp3Ll$!dz8!mf_6YjH>!U
z(EWiI5e{$L=;I_x!1*&LS^Kfi^39iD<9C1UU-8KMK1Bbq>*zoKChN+x)i}n?#06kF
zokDhWA1kG)>oBKNnFb^8J!e^zIO|B06g90erXh~fxuQ#m^(}_1HH%A&B;J#1MXG}X
z&hda{<`U3>03usysYzk^&97hO&SB0^ef%-BlnJrYlxd7`Nibye(AbDhZ-BCwiIm3I
zmIROT4&~s5M@})ZT_#N!3#ny?tvsWyE4HgXuUxmp(Q>QAAgFB@Ig&J@iyM1{PC=}o
ztPX0TYtW5TCXJ;NC)_Rzu1+;oKH+i=`6vXU$*Cv!{B225HcayzJk;JGgdi^(Hr70q
ztud|$9Uv)DO4Ilp*~?Iit2A|iSsqX=tssOX*AnR*t}ckR#I`ue(M{FT9A?1X@w<_>
zt_Pew293`F^dohN`C}`_7SdnenozVj$2?%!<ELPzr~sm+JOpbcheTSB!v;!)(14~M
zkBHL&{q>W?-Hf8hF{vb%87f<#LE)t5U_8Ovh^A=Rx%Lh}_`Y-W8_WLXn=CFa(v3Bu
zn^D&_9*I^7dC`#im^9Vw4~O(RijO^cmfKsqBw0*%Ji%;jAv!&#g=aiARCkB$7d3f#
zmyQ%HcHqW4+ql~Dfv3+AG`AWM4lNb-)($k_Dub7T-Tfg#M^r^Y=_;aZKwTFkQj_Ns
z;xwhI9Fv1OP;x{`)=h|`h}=jXy0pk+kDj4f-z56zXAzOc7duRDew|``$cfYE+UwQM
z(7F3uz5UVVaF1N|eMz;y|9ZEF6dLOqL_3cg-~~Y(r)U*y^g<IUkT8YwpcCq{0<VzA
zhUx-dAMOE%LwEy32owl|cMjzPd;OyyeU{GPO@8Y)ev7;N@aZ4^VgCG2zd&dEkX!o|
zV+GEu;07ceLd!X&MnnqNIE)BG&QgjNJ_yNPaBLTJl9)4_YgBp7laF3tc(6;P6tVK8
zaZK)I(1^zcTRsW26Ev#rFh&j<6KF%y35<^L)}plMQ%|q+mv8Md=xFqv$r^*sD*I{)
zr8DxzkfmKF4hp?Zr<*ZYS|Ujk;#kn{ce#G;E)P9=hC90A)~LdxX_|&{ZK)bXy?BPp
zTP0O9#rlvwMp9E%6?UG3c(ODlO*5udAd}W*!Tzw~{f|C`>_nVDw?SSk@+W`tCG50j
zX=xFhBQJv4WYIo~)_w`CgAG*@Qcs~2jcw36LM9p+Y0!!!$uO;3NE}6A8V-hs)J;RD
z)1jCabUSTR)|r6u`5=*Vk4*DCGYU78IF>liw5a}COl{656X8bVNF_nON2YxIaK@1D
zjhT$c#9ERrF9g6;2)wVEOs4GbA0P(V|Hs>#1>1IA=Xu|3*4pi9?>)D_xEBBc0t7&?
z5lNA<DUxDYEZKBq$7NY6OGy;PX&z#yDtSn%@)DO{Qsq=0QgKzv6{l>=Wha(HNnxyp
zqFPcU0TKYwUEIF!PQTl=*6i{y=Gy1n3sRExkc~nCb@tiKS#z#2$N0xT{+~u^SRT?}
zS;B|F(o&yM45UdzVJ!W%T^`=JN`2!lvu>Bc+KQAUF%lZj%E}5&-B1<<-ChsfP59a|
znLCcGA7?h7Q_mY#%aVStplQY!ZJCV5sAj^(QbB*PL}iybd*&ozS~0L$hGcgaTXY~3
zO07{?WAIHwvI@JrPBp7Y8e+M`=G^kclTR_&SjEQ~X?Mi+H{avraFv~%ZMxk)t4Ei(
zaOFC^?vT}u4L<wXv&@#exG(-R<&l%9dd$6x-=SA(R#w(n8lE9~feobWI(#Vo*)-V>
z7Us}F({7fWB`-$XVm!z`w4rGloD)`jzw9!1bD=ae4Ym708CK4!BHVbm&%+z{dH#dv
zDXc|DCk%5XSTMlLFFcQ``h5KxZ=&2j|KZPnnf;wT-u?b1_Jd*18&;P!YoTIZ&2g^A
zhlr~pTjPdd$Fl4uxLQ<(V@w?FYBq0O!$;BNf9{DB)YCb4u3TVkP%!L3R2`ZS2$d6(
zcY6Vptg-n)_l8m=EzpKlk~ADKiZ6d+RivK(>G!Tvly@cdR2>1!m6Fa8aOA`gjmG;5
ztu=KpJbZYISvby(`@8H_9&0R3Q$tbY3ID{>V8E=JVyvNY9@ELJbu5L^#25%FQKvv*
zHPJVeWy$)wV!N7AQd0UMDS7(64#Qp-YZ4vXVWn${G2%*tMS-dT53Z5z6+LM#NWb+G
z2&}SrUt@zpsYs~}o4fZ}I(CBc%qgCJ?g^2WDO<il%Q}ylpqUA)KWOh}?CCH@l{i#7
z#P<WX@?3jkgxp2aIU|$JD1_1g7>G*f6<Px2=;1aO-?_!+gMH2&U*VL}teriXKUnas
zxlc@*?5wTCGQ6r9lo2D5<@FBR@7|)E%n2c~QuYALg9p0|mr7i$#q4%_j~D|Um^KZV
z9#z+{^6V-4$uNKYJ&LZTY@pDZluArt81|OXmFCLW@R?73oTZbiJoDTKdF7w{b0(vj
ztJh|%t}LNz(G>4=N@8-9oeE=(Kn`6?h#FP)__wcLW;YC3f950)Zr@=gG!P?4Po8Av
zBB>nG0B>Ht%}B5C`Hvpwg=e2aefU!hp8p8Sjo7~a3MG*fCyrvXxvZQ!nY_DjHIh|)
ze8Qkz%hYmP4mQDps<0T}%I|xS8VQ!U*bgC66djyv6+{h6fvaU~ttN`2auWK^!m1=?
zj7&wAdxo$4#_x0U@(sTH3qON7bfPYV7ggk?&#v;3&wk<&sb#ISj0xpYoERJ`Y3ck2
zpA~<_v6+ZaUUC4J#+oO2Cs~p05QF2+YwxnVGvdOnJ8W%NOq-e*1V$&T4x_bn=yMlb
zCBewFQuvhTA(L2`8Etd$E$}g6XF=h|GHLC6El(B&)>ugan})(#IWSaW*nt<HKg)yB
z6k`lWmr4==SCo_pzbB=L4s%xfn!<uBHC@$!g;INhb6^sdM9*lHZZHKT7f32{$(JY(
zCU{=@z<EaND>Sz*p{~4(Y8rtHl)~gzZ$#2mlbwuZQDxhR*n^aYE6Y9BR(hP+SfetE
z*YE5zRgN!x;iIe^U6+$Dw57n|{JZTE{t&$C2k~)ahs$CMk>-(~AG{{zt=JZm@_s3k
z4`bBazH*&Tui)6JV~f+dzqZW0s@dA!qnhk7I5uGA)P~4%D9v!S$M1gq9e)4!-;|VF
z<xP?z-3~na+&Mn-%o&!4five$@qy<*K-${j&TDT|Pd(0Q>e|!mX+lhlCpFiv?{Q(f
zqSx>7!Uu<(`RI$RA6;kr!Y!urJ(iBFv9Y>LRaJD#lKFhj?HgmZCNu6`yTQ;ky!!SP
zDf42YQyOfUn2c+bwz$UQyvMpg(?DI#DZ72D+Oe{{%*W20!l}rH_e>w`VVC<%<~9Ao
z(k(=~*hR(p7f$l|pZpQx;0QebBIWu9W_pv`S1)k#)M;!{EI{Q0IikZWsty89?ufNN
z7NJWPWZT7(Wzwz6rQ5-h9|EfK+N%7PDFu36%g|^lE1A3|pjAK{jWvqs8=`u&&#07Q
zZ+9PUOH5R3oH#~N6m+`XM+6EE9__)X-#3SS_>rPrz#cK$gVONO`y_>=|C!RHGE@<)
zfd1y(X^w9kp<@l3D|4!*W?t1ajc0#<l1*LB0y3G_j`y}I>SiwBzjsXQIiGpvJYADn
z_bGSgQ^Nk;&%R94I8u^Qt1L@)c6Nv%u(YzmXm5}0txaqpvtfRJ8*rHYE#XIK0e`*s
z^o@`)Ord1RGq-8AQiQw#wAPS<D559OPK*~zqj5z758J(CcoI*nE%T`lK822n3*%di
zy8+u1EAo`dC~{5nC<z*$@g}1*Xfbp>e*7p;o?W9T5<BB5U;EC4JEq59`Q$3kZuIC5
zJkxna(d`mcdy>RQ5%dhOE_B%8eOc4NPah3-f5H}Fv3ns8@wQJH=F>TEy>^9**Y0AI
z=J^ku<@uMNqOcm(>0rw;muP{F)2ALOKMQ5}AO6cvkbdzQ0W?w6wZ}Qjdl&Zk&2L=b
zcVBsrU;LY&;LMq0^sHt)pR=^or&oyMcZg!TV2noF5zikv!eDPs3XbEer})-yeUs+)
z7L|v3UeW3FXqxNvx;?5o5l9?aTjJ?e&-mIM_LSnm-Fuupx=v*xt4CJobS$<I{!v*L
zj7Fl;aO_x52J4;22aVQ_VqlrO#O?dHSvh``CMI@g6ZYqc(aiH;T=C<ddyy}E>N%#X
zC+UCsi<sy!ZcaVkrN6X<)xtkhZDgVC`27iMl@6_EY6H;Y!i+8P`th6mvGqm{jRX)q
zpLy{`x<<1(8k2%z?rX;TW17a{@C*uj&|_)eBSpURt+%*!d!Hjmdl*}=7@Gfqd+txc
z7asqLKkQQEvK@5(PKj31$N<S2)?Rp;7!o%gY@#O(27?Y79g*R740hr84V$AG|MEMR
zA=RucFS9e9VhDWv$#Zl~duFHwxz=`%9ixvB+16vAEKANj`2^aC15JvNYCfYA1M~Tu
z)qY1*E^{`blcKI`dcB^sNv$Q-Q<_Qy`<-j3s+yu(5-SHp5uLAQqVTvs!c`STQ823;
z-n?H?>XLIOHhAjjI!AgPwAOs&h11v*wOpzsH+oA1^)U+mkPe8JF)BiG6t<HAYekBh
zum1i6Uf(YGum9eUbE>{hRE`u9-Q_-;TU#u}RaOTBh?xo8uAs`qy+`(T{+}Ggl2!*l
zer)XLePczL7%2ZAv&2?@y|!#W*yi_s=etx+vd6iPy!G}?Ze72}PyLNAl2VQHky#ZO
z4lH_UiOa9O%`=~PNm6ZVC`}~k2|c4wR`cpxcUdyW(YqsFIx^&As|j`OK9}CS%*y&2
zrqJBGb%XWwb(WR})U!EpRuiKb9GC(=dVYiZcW;wM_xRxY5?k|vPQSzQ@(HS{qF0_|
zHlLA<WiS}9y*onb9?BN%?Cs-~=IUrhUDr(NJ$n5P3CqNJYNcoxvbuhhf$kAP;P{y}
zR@ay5_xg|`E2YR)i+fXGqiHD0lB5*R|MXv_sVhdaF-M<%PD*$sf_X_LtQK*`#Z25G
zJXI~$F$b^+s65}fC=J{7My5krdV`7wm}NX*q`&XZ&qQN%{^T&_XaD+__*wmziAM06
z7)7g1oQc3S4#u}h1Y(qWLYYL>Kuu(GJZ2Cq(MN*!i-G>bl$k#h1eY^OAveqD&-<~v
z17|2jT!?f+rb7fk88ita)gvm&xQ<S(5vxqRSS7jMq-sz)0+v#PQKIQ(u`(2=K#8y$
zF@mkgiUn3YD4MB^0+bzvs%H!E6(H#@`*bOEfi~ck$7(|zXW&7Zf+AW%N|?U*_vwKq
zhCtC9fDag=%piG(3Xxt_Gc*cg3%Yep@#ak~zx_7XclX(giNUcAVc@zBCzg*h2)kkq
z5Tj7rl*S_SPf5x6O-c%#Y)*eY8na;3&qG8N25lkM5gRR#=r1oZTwRm&J3c-?_{hp0
zdhXG4w9USL&?^tdIMgF0#^VoH1unex9`9VdL*oL`>&3x7uLG42eDy0|=ks6u1R+N1
zre<${PI7@ew{G*y$6i2n456-R&VPbB8Z<Rmzy1e|#~to(-=?DsD}%($2ezj(y4@ak
zc6KGu$e<V7J7eLcMS%;FwwyX~lKah^(b7@M{*Y@v(s^>7^{39Ty}d=O8pegCEIXhS
zJ0arN8all$w%g%};WD%7jQ-LR#u#B(hd^m9AqKpbsRR`hT4}1PqOjubT$Gv+16Boe
z#xR3R3<iCwx~B0mxV~}fjD(*o5yYX69^o<8^1th2(Fr+BacOPn-aqvIr#_k~>i&Cx
z!X7&7T3jt@P0{ka)WLRX0sE9>3~8vO#BJH=i$^<M@&5<2x$U6l&o`N_&@>GP)_{v&
zUib?PheKjY*sL<FlpG&1chOahL<`&F8CP#U#8y=WNU3JDrLZO5dx^3}VXa2%4lyLE
zs-l`VR5ZjSwojc-2Zsztce{P*c<7QQ$_3O(qivRj)mm7ywI?R<A<`KPsX`FT^9V0~
z_(^``lh5<og-g79^A_9VDdMkof*Y6j8N?wQeaF$hW6(hiFp|L}A+#!MXnaH|L#QId
zUPq?Lb;<{XsAyVS2<Vs;$_tTBD<vZ?k33pOoWvsJw;=ms1Gfg3hswntdSj$T_o$Wl
zNGXwgWHPS!qd$C&huibqI+tMI%I78$(ZT(PQ-1R|UM0pr)CsK2hs~3bazBEyCCM9n
z9r)JQzsb{QpJcpk*bHL^{SHN8Da(REzmF|6M+-}lu^m6J87>V8L7bA5Qn=u0oTDVs
zZ!=aeps?zete-h0*NKoxrCJ&WQR96e1kZG~k1Y#k(>(y{rq1q0o)|q<RpFxm&VDYs
zXSH+Gb<KD@Wp^}VJ`Yq)EylR6p(sUm=;X-_?(AOU&ZSGNtPOeM)G0pkr7u!V#vD6$
zUOJph(r}SX>JSN-L*3k#*QUwXNiP4?0sl=UM`m-9@ThQb1Ev@jnYIu)5Bqw@{QCB`
zRiyTH3m`ndR>30_nxyld(xj-cR^c-*Qg?FD^uobgU~lkfu=<mT&9pL0?avN3iV~?M
zPaC}u=u0UaR2Mm8N<=gPQ<}xlx=P|Xx>q}P_GY~F(s@okb(Us2=WczCo|f)#rw9yf
ziB%0_HzQ76mOh_jJ0(YtEn!=tR~xXr&u#3c$yk?A^iz^)`IJ)L*oWo~vn<VgF1kg-
z;V?&54nRpIT?=K6WNb0f?RFRD3%y>C<>h7Sx~87jeC+w>c=?47@o;ZjJ}*Ru%d5;P
zPx-`YzJKX5_ikQeV{OP+zjdFRn+@Zt!UfN`ZqV9rYN_Ox|K53QGN3eCi6pQwW-&AM
z=YJ&rT&L=xN9$hW>zd1N-{HHjUnE3B3|Zt2h&u1vJolIKM!vtjE0TRlF`YY+`t2{F
zv?c@(AyL#dH{ZTax6@~HYs_FcU@+|C16XSb!DCD!B}d&joUhO*LesFhHKwX6Qfjrs
zRNfPc{rx>c2#ojkrRx+u&NVd7(^QTS6SLVqAv$qEGUkyvHKTKY$fv3d^5#r3%Lyr+
z;bCQjN9P?zdCDSDlm_P#(32o)3pUn<{M29m96o)D-HVs$XhXki812+Fvngf2i`dX*
zS?R}QfDW|v+tTg_9XNT-Q?^r6hZ-e^)-=RG(ptDmKNMH`^FLyW43>tZv@J=2u?xNZ
zf9FRVJ;R^=T4^j8Di=W~Yy_o+sHAeE8<hyb3pK(?x7#Ppq>|~3{;=SaKk*j`CDg$)
z{^M8pu@Aq@^;>uNz_|^!_dSJ4ER{WM0br?|qucG`oyX2*GqKsx8r!j$PC;EaG)>K9
zIsp>KSd29?kf;h`f}#|l)H?y}lTjouw%OzHm~OYbke+Du;<Zv)J6qvgL!JG~3S|f`
zFrP`bhgP^o1iX%PdT6aF`UQGrC2Ir0GavjAPk-Qp)J?-*J^GOAH}A4DgJ1i-HyDi*
zO4SSo0`|q+nMheXO6df~pfJM5N+Mr_3JZ0G#k^I<%LF|TJ9t@`Ofyhfne;GV{>Un~
z<w*wCRn~%!LKq!A+~-^0y~yU~2p^4PO)Z`fAeuH{u~1itNs%z*9tWZFeC^kMm-V$C
z1evxMd$xq_YK}bn43pb;Nd#`*y2Tsc{+0}?=hHMLQQ**rvItFUP@!_;M6y9+Eh##r
zjFI!(8p-hVLZ}V8t4kRTidniu#!djV7P4R@2*#nsVLB3sDlOuIDSLFfU5cWMQU$gw
zQ7F3oAsa_Gh{<tpd!KtZE^_Do7XRoU{_p&)|LCWsc>>tpfTx~)E(b@AI($>Atf-K?
zu_>RfEs%ZyQyy-#v`vz>^NVC`S_Xa>{s>z0U~7xAC|O@w#XQc2CkIHSa77=h717Cl
z55CFzZvt<S5=w_`gQXWSMr%b~M@j>!*Q#zvh6i#GwDQL~1J-e2{E|HYjD{e}D;_7a
ze1V16LQ-C+5n5qNi`JHER`b1Yf1ls_^{?|^{N4YU?ac?I*&fSB*U(l_^4?&Gt1A+L
zs-EM5VltajJ4dm!#+7Tg`3s-^IK|o$*FN+Num9m4*4NfqUtQt;<^zsztkWO%h|P@d
zaKQFxN>G}R6gFssa{+6VL`$UzMo|ZkDMT5xEDNDFD1~o4)ojXiDyOt9i!5atXq*I`
z6eHvDn3U2YXw{7veRg_1j4@bSh#h@~wzZb>M{7+{6gVg8ph8ZR>2xZs+p^437ZTWP
zVR`b2vz$MBhRJlor$788cenSrc4wb!S8m~pC2VZ)J}x%pB5*{ZL<s3j_-CylgkG?!
z9svawF-UGIVdlQyg6j~@)wZ_VQX^?pRMgdsi|^dv;-x!GW);Dw1E-<vZR8H$8&Rg~
z!vX*Xm#b4B1AC)68^_icrFXv9IQQf^h97vI>f~*Rk-?io-ud3QvDV5wS&Ssr%_gjQ
zqF#%Us@R$vAfR>3Fo0PQ5?fhk8F&>Y^nxpyZ(gm){*VVCZX2+Yl5#;Su%#iUK+I;m
zI+pZS*0^}b@!st{Hb+w$*GOhpd7SfDqgfr4{OnJ>1p70t-g-b?MFyt8hmbi{8Gv2@
z>PVD79F-FJR5)BdaVRr-Jd-}i#txY6l1V8!_gEhE1c;CR07px*&!l2W#G=o9{W%`q
zpVI3KE5B<a${36_SRF}zhMqh?&$brdPf4u9hbSXuWcPFdau;}eyB6a28S)`5Pc-wu
zx4!WTH!k1i)1P}0H?1i{q`$Ey)sy#>y;5}08Yh3TN~mP8NfctIqbW~+^ktgudvv;1
z_Gj%V$_~T9fSn>R91fYx>b#E{LJBl>L$}`-j7}@8a%k--lt;%o%1@Zh9Lv34?$|4=
zwe(Gi{md`@SK=oYM95!bFoj{Vy^T(Z$~nfP5x%YoKCrAk&O2gLLy+`3hJdSUQg4dU
z1`D{RSy*<Z5GbSgpG~GSs?mhf7>p7VMW=;A7QG_`PjFrcbBJPqWO*{W(KJog-AWAl
zePRq)TjHEUE6tJBC62DH@bu|9Tj!T}_3oV0YdwZxPfE)+;IuV(yIE5kTiVUYpZ-XB
zS3Lf^>F}nO-$}~L`RyG$oBRCHAAE;tWpGUdWr#RbIvDzlB!UvnF-h_wAqnHYJ*mBt
ztjmQ+6X4RNTRi#naZWyQoR(~;T0eTEq_ozuyt*vcl!!5w-f)e|S(4Jke2V+jN~ClN
z(Xp`{nUA++C_HoATCSKexwOkFn;;BsNk}r5sdWzQiPj;!?ZPP(MN!Ii(gABNy-tVI
zPd~$3cQ5k#m22!bffOR0P6te&ZX6oT>PnaHu#f5VFx?(|`(t`TEmAuQ3El|_QaR8b
zqEA6;52cLD$(?zi_{yPQUYt~qQCIT%kg-Mu^o=E%gz|2&-)I#`$*+lt@4xaEf9GfZ
z9xg~JZ3=}gd-$Yy`K71$sV{w;U-%neASTIP<!iJsO~N^s=MJSg=3ONXi4?Ozw<6SD
zbn)vMu5NJNp-n;0L^>*==ZfQJPc!V61Ya)>#KIav6Y#o0cMG(Jx(@WaBVvN3!EgZy
zDY7nH)|hLJW{RR9#@Qnc1Lq?lcq|>JqY1&y84P-i$9pUfyYzcXl#*1IKZ@c3IdvX;
z|GjsFYg1Udy$-1`#5AD4woa%fbce@TIb}f?+4odVk&sd@sbuL2tqCb&kQ>G1&6%9T
zmNG}xCM8C<Cyn4*I!E*emo9Pq>~Th;8O}9?x*=8-^La(Rzlryb;2kO@Le;QW*Gwi;
ztSH1VEEBVNMRFdaU}<TUpjL^iOWdDKxO?R?=U(_YqpSBRqQ*qzRL>=#P|6<5mfjb*
z)Z&ziN}%usW$Vz1ERxEglH9n_06y`?tM72(y<4~_Mg@r|5<KWEzoX?;%irTLGr1i;
zf283UK}ADIn(cATum0*E@;Cqb=Qwg|1MlUumS2=_ZnUA_TOr~=IgBYedh{Is>;Lr)
zt~}gh);N3!^m;P1ZY}g|!QcNoUqFSalrIZ=^0ow$zdaJsx{xucBw}xcQFJ;T`n?{j
ztIKqI-NpEePT32vkXbqu1Rt}zxaZE+9*v))3qud_-P1;-M~pE<uUK8#peP4uTTm1Q
zYa2(fVM60uE}i`C=@6C_^ANYo1W=X0w2c!~F2~HFi+p%L9O@LNBxU9y{AjT>A(Kdz
zk>o2lsSI)!uaE#^RL#-lfDho4!B|aid5N2wV=Aw?a`6uT_@8`*I2*IP+~LU4BOF;<
z;m(~Me25qdDi?9VbN|X!=)m&YDrKhwKr^3XDX@hll|6L7i;D?mOI+3P+T>k^!#>4u
zg+Kn6{}MBwfD7!+#(eQV`wy_HVC*aE%Qxr^hRiF+?BO<Og=jry8i!Jh_qHi@LD4BN
zR;nN$1C47?ByoI3(KHc-#c0F4a@0-4hbhJknKur~AtXmMLRpf6LDtjmfAgz+|N0%A
z_k8{rf02jZ{2lIZjktRGE?@Y|U!Z?<g=Xs^$&0B&qacJxXdEu%DKSRsx@KAjRJR~f
z5_Il>n1Xrj=?#Yzg{9jYP;~orQY0ki001BWNkl<Z`YR+fM~-dKEfu}tkhP=hpkevM
zS&X#@Hyd^V*oGwfT`6~@R8j;lty7u!&T=?O^vD(9Lq%|km%0WwpK|0ke~mZp+~fJq
zQP$$!$0O3C@#+V4TiTywY|g01`NN9CDhnZa?q9vnTkqaxdv8WkB^o)2LI}8|GA@-z
zqOyXhd_Ifda9F!4zqQ~VF%i7nG|m_N>#ux^PygtPJoUk+5AHQ3<X){6gMrB%;2zzw
z$LTZcG&(TyPRs^0^!r_=vl+EZoZDF8(?9Y8^YIa^mXbfEl)HgSh^1P<bFpR<j3s6+
zn;3~G3T;S9=FvikI9D&|4T@}mZUn%xh2`86Pq4fuF3?R(izcmP?vgo9ruz$16Jre1
z*$flsn4;u|K9r&{aOdhxHcp*Hr%3-#`1Qwub&_t|ct7+N&S+kL<2{DM4$J)>r%!JD
z(C;EmAcIcgd61G~wcqEX&z|9fPpq&s=u-7cV(@G|+~dLhU3^F!U+Ia*<IWDl($bqa
ziuE<Q&OXq1NAO;*k2a*JP+9j)nM9!s{a#-z?rO)@!%d!f`U!f&0ZVm7Gp~8@;6C@S
zUS#LJ%bYrOmhr4&FViRvgZ#+_>Uo1H!Nf#a6bm|3OzpUmWS8E1n!19yW_@j)(%fVo
zHPI?OwHPrgDa1n(C!}DNG>e}5;-`7??lyjHK)I|q_0f-_FJIx~fAg<_l9{vN=_g3B
zhT6$Y5RgJ3I5B@n8r=S#1dp;y;~L7Om^T&POBttAz*sP|yF9qD%Y`fVC_5e2zW5nl
zfAuvs@68x?Ezf=N$CzAsJ4>!=C`xo;h(3w6lP%GOC1QzLa4aMXDA9n{R={0j!C1U1
zD7yo&mTtGhU~P$~e)KQ$-W$Ki=7USDm6FAv(+_Osv{+W#o|O^642EX&OHzwjwIxUE
zo@1DdXI#8+m5Y}j5`z$QNo}^2h)NTp&Y4tPyncbxX4w%LYEF-Al$bOwC4vK|G);u0
zMTGEo|KN4#EphJrSyFWJc|Oo9O8(-fK0>Jzf*@)(M}hT?6}p={C|%Iho|W|#Dpz53
zqzQ@T;W9ex<`O>(|K&|+TC(Efw|L9HQQ}3ZjLkF+IgyPm7dNfaqU*FM9ju{aOX?u6
z!wH3;C=0yH^L08fbD+x}*b<CIDTCF8?13cRYqglm%vh3&Xcq|4v3370Pn<nPj6tLs
zqmVWekoqfly$mYLY_~X($pF5akoNANlc!~qCp1c6KknV#<*BD%V&n80Q7LMdsOpBQ
z@ziz0*6u^zxm7by1(lCPG@c%#y_!>NJ-+nW5AgDjd^FcAEF{QN$_5u%Jz=&tVt)Ik
zD7>mfwYSIg!4}PIhK`aU>Q2FAbBEI(d5O*2cNiqg*5)>imwjZqmV5i2<KqObB2*O@
ze*bM6KPSxQ3{E}E-F?sgG;rg=L(GvOA$e3v+_`dtPIA~m7vCiM8M2vGbBwmQsA*!t
z*bWuogM%Q4(*A5r?HW|KL+t`hh<H`u>Eq{9-nn(3CN|i*pe#CARTT8jo+N2QGi}(N
zk9qBtSE=am>`#6H<y){$K?tZU5v#Of<|=llV{F;MEHBH=GjH%)_o)-~PMyL=O{o=1
zC7d#>58!0o@a&IH&}%Eq>%hxD`FX;_`wUN>ph^X&&VGTIWd1KXk8d2tO=+fcinSxS
zAV8*y60L0(2rQ}*aqj^-e`j5GxU)Uw55MspI!~PE$3FF8e)%8$pQxiJ`OLGYc&anW
zqWKwkf4m(0Gd@ykfJ17h3W$o^*KYIO*Dg`jDQ6WKq*YQr#RMT^MTafnAARrizJJ@#
z2|?tk+yBOt@KNQqJ-EiRkm^m5&CN}|`^qbP>_ev^2?i9C;zJ*L9%H`oNYH7qk)qIy
zXR`&*2FP5TxCrJ8z41d2odYZ_=$$9<dEZzJ2hS%Ccs)@{4&7R@X|+(?dHkU=R-=@{
z8jZyg+Te5uJa4HINeR{BsdMK*X`+u9ZK<Qr3b`8ZYP_5AmEZUpU;XXh0iY<QW8Ld?
z=xEC?{M^r>N1Lc3GMZM58*o!cGn;d7bDzn$<`2H}yIj3_pZ(D;n_FWNq5-wCGDI28
z+R;@;X@Jv?S=BIWCRn98y*^}lX_>+D5^W~eUf}@XKp(%T6|=n&d-osGR5klI?ot}h
zjZ0T}+Pui_gNID-Z=q`u%UoYwMt3_{G~fR9-(qijpYx~Bv0K-KAi7&BC3N=)zy6!w
z;R9#ZSz9T2=e^r}`m>*8GM!+@j=g*LSlig(-0?MTxhBi-Bu<<^i_wnp=8oKVTGJ9%
z>$+Ni_$k9iEw?a6kz=pwnqF@xlH8^sro_%{%=XAJiG6fzFiMMSj`V{P8cnC)BSp(+
zKKprAPCbdWeWITN5tS^M0#%4QsrL=v`|c}z{Tp9nmPB}LK$pM$v%kcdk9?U~n$y<`
zv;-4ZYyS36{d@e}FZ^{bUwMb_s-fTMGwk&E_kZE%v8PUR_sRwS;8(uNPyOfrDa$LX
zGHX~0m};i`l+!7{{jdHt*Y-A9KeEc&@-iF8j**HI+wag>Il`GIo}yzDsxu^YS2-6d
z)?av*!3SSpw0Vo|oA){Q%*zaV8a=H<3n3E$TkZA714g@91h0y;I>HAhp2;w*hY0g=
z!yo;@_t@N<k$ldGvNlahQLw6{ap=rtiwhuIWn3g`$*x+t>cg_O=}>TsDbZ*aT~)b(
zEhJA9ga_3QVE2bBjOGFY+oHg^AjShK;L!3qG)jqjY)k=<AvO&S8bgVSiWnUlb1-O*
z%A6`lEf%B{ZPuZ*SpcX4xcjVraRAn9t?<4zMlh6Ulo8Ug&fiH(4-;h+1dWbC0A5q%
zEKbHbFhV4b1itz0H+c80+iY!4*%}9F`pg5f$%N5pN?p$h!R78Nl*46)OUsOQb{Vc8
z<-)b=>`eEF0s2eJSZi5b8nUrA;PlB8oOpT_TX?*&{EeUa`=qMj>8H+c?))mxJ=NjV
z#uGgC%;!<S+RB>fK~a&SCsJ^EJM!QBcmI%w`<4}TgyrQmMxzljcoPn?_``<*iCb@7
zVgKGP!=+_ToH)*)-{JI;4eW^xmO4GIjAv}!+vN1=(^OR=RTCz3C|6H#^}V}%<E`JP
zwk03_(ND_04~b9z=tns<R4jK2rhEH*?h`Li?~h4!U_Rfa34OM2-$Si#;0lXNV&L-b
z+wbz?3r|A=gA&Ln2I283Et#WFh|heYabAYULqK)<7-JZZrZRKfMCO&|jq6*i9~rRR
zO<cS>A*C@-o;&%NRlPEtc=}0pYfrhp!GdR0SV%%UP+HP^qdG({=9qOg#rru76kq%G
zf6KrA<^P_4{(HZ|wO3!|@+;paCHRS7`cGIM_Sl|QxM82$d$)*9;Mnpi7)@#-`wvHa
z?kD~dVKhZ``=a)%l5`AALFg2Ct5`j8ga<pjJRFa?xwFG~IszX#e)1Idg%5H5$#cj|
zQ^XYo%jeD$iw@2Xc;a)P=FQjM<j2o{TDU>^wrT}E7fruEL$Y<iU=~eyh2qMk8(g|{
zlkv!tLLwl>9CD+#Syd*@|A6c%wxw1$^s^Wj<rnRD<)B<_f%zB@EU`$6?X5BK$;|1|
z3g;YERc9Gxz-nY{_5FWr%c~Mb^P{B1meqaubt<)4*1_0HD~2Z=Jbg%ESQ-wo?W!e{
z{{^9xn8jPCwsRT<Gpp+gU8sZak-&!lNxbe3zL2cr+OW%)zx)}{iNe|}=qSNf1J()$
zY(f8ufu!KhwR^mMZN$I$>Ua2mzwxR_gnLJFHG88mo12P%@vr`GmKb9#RI@1`{?IDN
zH#X=LhJMFlRbsS1<-$7`>GgW-4j!=78!+g1DLWmCeo1FABo>kBWWwDC4~X$9{eF*?
z)9XKc<Hg8{XP#t#b3{Zviq|E0?T`ML;gK~4y*}5kT%|i05|iVVH}0`BPu#k<$)G<#
z4az*`6NyRlPydf!VYWYE{pdP-`@0lq`hyi_E->F8vp=5mk+U5J6omCPybs_5%d4wG
zlR1=e+p++}G$zJ~_W`9u1U>jbUDtFHZ0+vias#5SD;g&q&6GUzy&7L6N?lTx8lzMW
zSW2}BE=4jNU0Fk!GIKYybUL)ixrCJUbBv`dd$`(@l0s`MT_|gr>`wuMHJ0FNy4{|D
z$}!=#_OU(T`zQeyh%RB2;`p=AFulLc@nc7bDx$O{=~AqNQb760`DdTykKX<s$%xrS
z(e2WWqBuI)+ru?JcQg$t#f-0%i|=>;l{aX1Wzs%@lqfBs@9`E~e*O`v!=ZL}T5xwF
z)A5||z4|T>H}?p^<Ny*DM9~<9k{FVbfR)HUe>C8P6!D0iQHm+6E9EwL{;vcz*|_cN
zLkJ7rnv$pZ{#%#0d4HFWeCp#od305zZoMNZ!Op}7HfNAZ)7q^GRl!QIK(f9RTel&F
zPU6mUxPo5Hfh~q(rHP=mUQjEdOn9RyS}-t|d@@w4(E00V0!c!tR&+ZZ=FZda_bAJf
zqykO!1Q+P{`<VyUiWg=+Ta>c&si)6#=f-uOdg_TofmX69m4}IOwO~&qA$g`qw<wuc
z9#wQ{e2~Fgt?@w`29pK`%SV`R?h$8!y75@kVRvtQ$oZxnM3%Mm$)O^IJl)ahbm<IE
z@$SV<Xrkc5T1J_i4~wWPmsEz5TQ}wXyAP?V8dLO$QK6Gao8P~BgWmEI)o8-faENn`
znS-L!VdF@Ta&B<WbNcK_-oEv4(RtR^@{yO%uzPRBoqIb>MiuKT19WQe4pvuI*^idj
zZ;x1ZbIz_T6M|q)4{kkVW!OQ5NKsg!HYCMpnq_6iQ%2(%6du#<5*p9u))v#`@xadB
zgjp3>8g`k@YMy=OX=vu8x?wt-f>P}6PZ=%^unLhbRc(Jd$xv}hAx|D;jK|9F8Doh-
za2TB#@Pket9|N{1(8fqKZFjO(43-9fAt}w$pv!}~kl>1<peT!M!xLFsS!Lze36u|{
z<N%Kf4a_`28??1tymBR<riKtbKKN|+mPjfwsvA^xYbFMiOT-NNmMT(CMrgI10q<-u
z(GEMO_hU${g^bFZZt-_1P^!S!bFN*!%lE$bjxd{|lx*V1n56ZavN5I-rki}-gFy92
zCY3Tlw9WR~>?XAVHWLBWLAOpib`r2OvSuzO=5yG+yM=l43SYT+g-h3O^3n&+B7Tvr
z*?=fWYGqJLNR367Gzl?cjio5Xqb|gRwrwLKEyjoBV&pK@GWy$$P^pFT37O|4`%UL^
zP%i*+r4upe++dZPP%Dw|O)*kAm&bP6fnLRIK9|o`<W_sgAEqECI%S96U`SM@IFlo5
ztPXWz^EX>O2g3S~-iu5TidGRtp|cdV!ud#@TwW7MN^Vs7K1udK6u>2>mb;dzD=86G
zWQt>RyXNSi$XiejxOS~m$_EBXs-2h^-+4e$%h*fEhn33e2CJt}FdI!-JNG1C`DgzI
zQ0(qa`0>yG2p@W}&t#l9ed-jAGJN};%VL{`0-rc_^f*hp!)RxlPyOVN^ZNI`%gXXH
z4`(|ZTU|koN1Q%)k|}|v@!Y@nkkS4=-YLeTIpggeI!gn(bI-i&F=-ll-7aMq(vOB{
zOLoU&9`20T4H~ODEFV2Zh_9iP#yO8Mn%&)fZr`~_OqnOxS?1|y&+wPN_$jOumf;Z$
z6m!UbFQ?WiDvYuV%cBJtsuY94fU0TeW>=h;fnfp84V_L$%A#C~lx4~B)f1?cSnl;n
zMxk{<j2;^^-jggOOHu{CG+5UVm1ci7K^aZgcBmnH4hFj2F7?cjO4-~Z7n}~de+o=G
zD5qEiiG$MY-^C&<rNs8b`@Hep3q07H<VwgBLrILHavDOw=T23N{U&wbNf+{%(gHY7
zBHX7lM=di9ASM|S)-psIlL+#K{5=++dyE7n3J4*=%sae+s0`nK_cE7n+@hMy_?a&~
zonuKx=2G@?%)zGD>k1K9YkXD$_1;UC6&2EUOOITO_B|f|*&>#q7QsJXjl)-S5wMfe
zk8DL-luRZf{1!sQdk-q+b&ojLJhE=mym*vma%BAo*RNdV1J9iO;R~uB6K+Ht%-ide
za#y&Om5C8th<N~6<#maNnh$C5Ps}s7tq*1hazKiaug0hLdL8=1AKh(i-@40acSLFe
zWeONoQZ)_5BD1!l<=%L%z4b0{ji)FRSzlYD_K}_OKAU$pxqRt9cXuMGDA0L6Z+~}>
z8+UH=+8dYI-Q4Ba>Js1k=I^mrY07S&)imL#9dd4|#}_~QLH_MG-)25@^oOgw_|Xq?
z{o-Y=ZPv_pE#LaB?=YV`cE)qA-?+zkGNJ4nVl<RRhoz+f^EBsw`zOE3N~g!pbj;Z^
zr>W+1X45gfUYCoPF3LDi&f0hPcKFg?`2;`zOFxYj<IseRlV$Eyj8K-j-7Gs!rI1OY
zIzu1{?<!P;x~d>0qES5iu^;6h{NpcE47wb9_C=OYoDy37@{mDUqLthP)o8|iHpOfl
z7lC?h(8@xrr9@L2lqDg0IsyncIPW=r>?E7pTbwy{hP!v~a%^LR(Rj><o_Q9X#3c1V
zRY5@6q%=txEE*FdMz?cg0tSnxka}OxN~-0MNZA}?A~caJ7cTSeyVnWPprSM`Qb?pE
zm{o|1fL)08hnAOhD4S~KRX_r7^1^l}3JbqI{}(rYOz0#tV<CANRQAFEk6t8gm9aG5
zp|$1IsWU9CuhT0FMw1!GkDeq1M0-oi4XBfra!6@9okDIPFLw5wP6ww1By}Os(Rl(t
z+l;l@l;makk;jW7BKI6~CZx!vO$Og}&WKPsV@wH@Gyq}(l?)wg=_uJ7AspPzDJ8+J
zR93z`6g-`a(j0P)R0|4<(qan5Z070qtjx=C*rYa*qDCcgPD(LSmKL7}_?5~fa1z!2
z5F^%V>Sj*x31UNxI)CpL$2mmu&4D_mgeMZRE|v*S2Fo=#pCm)f*HA<kq)d&`6Pm>6
z!JObcPn=z4UOT~iLclx8{A%afzq3j2*fCB#x6Zl7bL7|tN3PxA<nhy-dC?Na{|}#h
zen4mSD3`Y<+}qt}8Vu(?@G{pwzQ@&n^ELEf$gO#o{o1qrV8W!1T-?7)(Ji_0+pqIr
zXP5q9iGT1v|1!ZfOePZ|j^(8xAtv_r_bEFaqK+Inw#2cOC3-!vSS!m8v)R5-Lwc6g
zVM(DpP1oR-x+I`5ipDuy<LMLyU2VAf&K17)E5CtF<V+;rknI{0BZQn<E5*X`HYA}s
zl%0Gs<xLyKw(0WszRmygKYf+oe)D&@@a=Chx_ODBEcxhP`&-n$ksB42PfD3I#~7kA
z*cge*E~pdj4X#`u<^g%%ICi$TNhxvf-aSGLJlx(QguuOr4_I1WdNf<i56M8p=uraT
zpFNubDZi9bOt#0o{l*0zZtmlQUdS`2*xpPLA9HuD4RWv$cspDI9;PKo7M9(350$2e
zgPWYv8LW;Xgy<Vba$e-68=tYUgb$vbx87qOpxf<ntlOok8kVd8+Tw_<X}hCMBc+Y^
z0(u%FN*XbwT#~fdSj(Od3v5qi`a*1>P$V-9Eyzv_4<2BJF-xz+g*<fo_p(r=h$&Kb
z1Sps6O=ikanh@o0?e}~66Eq~fSf|7Jo3@50&Y$Puy$6(?HO%|c7=a{6TBsB0(dXMW
zXf>Xcl8&bLA&*Y!MHZC~?cIYlR0j=}$5bK?em9q@x~*Ieo>NMRLrvpk-qvWm_f*xK
ze(iA0oM~;iaA%8CFTKDDeZ0~<c(BX<e&X7$<y-H)hw1gXvlFNuK0w(CH?~I1n}$FB
z{#E)#mnKF!R`GCi#@gu(&Xg9VG`;y4?>yc)mX-!2981GKtE;P2b;ItirkZ&MgCWj4
zLhb1GdMFas7@Tu>?-`9IXe}dl!3Xv?xAESKTT*Tq2?1Ot5jrt|tLZAk&9^S`FYewE
z4~N+57b!^XWPQe52>FK5hXl1!fTqsuS&f^E6_c?A%9xxPD7xK}rrTvQnPgDaWU?Cz
z%lPPAUKAlR5;e&b5F9Br*-1KrQRo;bl%{J6f`Q3wMyKpB_cgXC*q_bNUP%fO#i<%o
z$moT(_z;=S!NrbX9VC*tBjzFeT<$!!k=ikeoA2D@-AgxVT)?A<NwlA$*SSLn0Y$(F
z$es>P*|zj+Ve}BBY$VBu&z;*_%xh6p?H46=J;^4qCB|BU^Z7M`uUM1NNdkZ664Sjg
zow7^gyqq<N3rs>W8Sk)GS|}{Xj&~)yQ3;~LC-EkWD1x#in%rs3WXS@whu}QXYLb_6
z9Wc1)u-1~iM<r3?kXv76fIVxBWmfniUM*-2IsZ!S3}0Lb)!AeSDe>%?6=|y~k2Y}j
z#3{zJDGz4%0nOU5BWklmOlCtHWpEj&mP`;#(lpaK&1{)oPahZ}EY?{_w8_hBG>OK$
ztaO>zDFn%um0VjF5;}Q#P0GO}cPbyjLUq=filQv50HT&IyArH8>Xf_H;->5x*;^@r
zpUxRS*b;$(sEEO%iR?~mM%7(L(`EMe=ltr|zJ~7nHX%d`ThJ*BhQlt~<0;NL_V=a?
zhJAu>SRNYIRxInLOTRy0X=#bcctWRJptQ!?0#Xn)7N4+6^tjw~f}hUVole=hd!Kn#
z$$+v_Om`nHI_LFlMq%0s%}jez`k<3o%4CGdO-O@GYb~Q!DxeE+zJvx+VQEHFd|hD|
zk{3ocw=#ACn5q<nD-q;ojJ7}rPYN!##AQ<m6I-K|Wq*GxnS=L|-W3JY*(}rZ4}w9f
zWGapv(rptOgC^-jN(Oc4G}2Dm%^}E&r*uG^l#D?xipbZr#6%ET+AN=}74!KV)m?c6
zZ~2oRIz{}f=K6)JT)n+Z$PzjsGqy#FS;|1?0$wR%(u;uAZr&DS(zyZPwV|#P+j}D}
zT)#zCIgYKZGTzz2BrsO~$kE);=@=n|>W=U)iFB<IFT0*%z3ecZOoX(j3@IdvQcOe&
zQ!t;+uw{qobjGBKB(Jcg&8{ekh-bNLg>V`pr;ndxIvdk84aOFnI(}TfzlxOB(#}b?
z1i_e6>r3#1A($U_ZSxvPo2SK{9%YBx!eXt#S0Q&HTX|$Dvy8P1kwKl2aoJl3Qw8ng
z%=ss{b?qAGo;-b!3X-=<4vH8>&~ee(tL7C2+1?5uMl1>w5dp!N$EA?r?gar@wc|T1
zcyo(A0K}*y$j5|L3LWHqo7gOrQB#aiIcB#XQfkStnxJsC#|L=x!X=iLR{6Ex_(M*e
zS|<cJe)JeSyStn@eVR_urEVtJqQ`7DW3*FIr~;!S&1}MaHph7hl)XZfU2~01N*b#L
zmn=-cYK1ixuM|TgGRWF$(o$zJ6NxIYro<{sGMc?6(2pK%3Q<GV0cAj2jTv@0dg2(J
zl_ff5hhkvp_PP|E0v{Z+$sW_~hPPgQkEl9S(~9HE0|{7Sa+v80Nkb({2{AONPKhoH
zlB*#|3a@lq?nsbJxu#Fa6NAB8jml#)(FKuRj!8}{fFO0dMow~7S16mEOsti%GjFzp
z&%`!yp|#m~v1%HO7OC7q8|L#ly+J>#2?$?Ikz|ZS8_2S|N*f_0W@dHdpgdU&w6+mZ
z!E|e%%NMS*yE7v+QBvNJPrs-SvW6rWgkI=gOZxBI4U7cbX&sqV4Y%&yXI6P)@GSR-
ztPB*mz>&2TI#$XdR3DeXq(Gr%xVLG%bc>R7_FUtbC6C9*;JMM*vJjO|G_#3#H;$*`
zb=P<!nQ&6ljq?KV_e&ApDwL+QhG0q=eW}HCA_OOD3^|LEU@U;Lyn~^Y_7&b3i-~=5
zhN)C5d((!t13<gwnF+R}<%W;2zds`SK*tm`t|5kqUCi-CcK7#18AOXXUkIY}6jFp1
zG>?v?WKZ-4Jx2QzmX?-CnPx%W%V^Ek&JNg;uIWOA0)tgbGKG}T)>1c)vZL8~xW)0I
z#^}Us4%^#1oY+{)!AWLCi4ot3f`WGe=cTl2F*&<iaem_{I#x0Otz>ZgW6zxCy;t9%
z7<*2hT%mT3#s^%}P&G%mc;yx$1it(3b?$G?xH)pf%JE=y5u)ezt$TE>qFV^xOsB-E
zG3aSUNy2JNzqFW6#A++$TVH$`njp4YT`T^9+Q?oh`dxHs(1k@=(J^~)Z_3`JqEajL
zdnNtVWrj<AhQk3zyNP4VC1u}G6eVT0`cp{}>WZzo;qJqIcJA-9KdzWeXUt}zYW(>Z
zPEl>|uxdLv7ddhIIQ_E3Mxz$zqEgbT)`gTH+DLhof&i#0Mv@h0VFDx{P*Ksb1F9x~
zi9Gl6i~P6$<A>=i_gH)4DOB0x<l6s7*?Yy>p56C-pH=>4m$Og5?c6#ucjgW$a)uNs
z7LgJqkx_}<7$Z(`3`2?I7a>l9*hpT2<RK3M3?xB}B(Pz)$T4IolB`BaRwXG?9M;j0
zoPO`z-cH}`-&V=PZ|!|9ivwf>GsEGWbMD#u|NpPGe&2eU-e`p~jb*O&n4TODZI($?
zO-MM2=EN!!CFCwHkJO?MYT8!fXOy`5%dC)EG9daV@Gp5f<h?B(h#+!<MdXJHEMroh
z+>S#6SzrIwTTI3cT~H@DMNENhNe*$M_?F*WC22$S60;Fdw7%os<1x1%?uu#H8e;1h
z4SE!1Dj<k~%coZO@ejTSGR?pIjn8xaorhf7-XzQA6j79gWM`=a%*U8a<^~r7E<jL`
z#)DM~lgbU0)|7cc*ER%&EK0!<q8Bk~2w0=(aB{>?RJu`6Rdd0mlBQ^Zr^Up2oxD<v
z^MWBX0=J*wh3TJRsdHGq7Lj5hh#o5_1<q6S3QX*XPU4W8t|Ai2tf7dJp|%VMePLe_
ztJaBBP7#ep!VV=VVWWXlb^rh%07*naRAc)LZ@%&>7q9drA+_mf>xQbH<6@*~psFgG
zs^j|G*Xiap+hy8-wGkM6(4(}0$M3wwxG-oVBV-7H`}dl(unUo4tj20B1rgd%6eW4T
zFF2&K4A#za`%hk`Fp;(sGNLRDWv=Pkz+^h-vf1X?H_YoA*LD2)>u+-~o}#qj)LKqk
z=j>N4EiK07luEHN%o+78y)vVhX{;$FnKT6I&M~QKnOJl|um+bGxDcsb;L=9M#+JgA
zeeygf>*eHSiM58j$mP&rL?5S>q3DmO>q?4^TSr${G<5|{Mmueo9d@);EipH3pmh!(
z17Er~=WB1=Mk|Y1C=R3GpFjTm1v0E)n3*QabF9|bP&c5ZG1)f`bj5r+VK^L7O{du2
z09_Qgt^sY(T1>}UX)c}H;b(v5XSsWCm%7V1wbiG$K4iPrxalFy-UE(rz0Q}u_(fj$
z=tr?DJtngW)@V$Y)5{8qbfSt{QV?<KWbsIgg9;jDEx|`FUcAVIy*;W<cF&@a+OLH&
zTTXq8y6uEhr17z<8;q4v$%n;4_T(#-r9Sao^#?tUk0lGtd!M+a#7?DAaJkII#rP+<
zVB0y4n}&Oj_qew^24yf9Vi!<Gq$E1TRF)Yb$~9=K8LA32U8GYQbPg!0s-`S^@=yXH
zIE*n&t2u+gklDN<M#b^*l&A|bB_*{=DXO}|dB`nz=On=qIkmp@(wAu4M(Fk@K9Cp$
zCu^G~jo}Nq%7Xn`$X^nj|HSwun&2o#*TgpKl+KDz7-o<UEf5JRc~n#CDh4`Np}LwE
zF6?kn)eMRrS(Z~4nvG{KvD&w+l$N&M<J;f9$J$1*Brtp;b$;WY{|b*DPnmZRS_zmO
zAGD0tzQyY1h|&6x(fTUAe#tjp`U*exGe5z5p1(qD4cG6_c--xBck(jc2lApPjnvxG
z(}5rR<c~l*2IX<c=}$*1A&17YI4_dM)9q7RJbL_?x~`Iv$Us&Sw8kq>SVWR*z#1WM
zoUo?O2O8Hh?;P{mF>fQa%5X)WE^ly+p;mJ0SsN9cy|}@tbL(gmd9d3spDV~Ur_Zi%
z@zfe?>l*}MeW<Z2qGFA)B}V0JtgkVdjq#nM@sTDJ(llO0+PdN4gG27zdBnlNA@?6n
zc<cTit~EsM`1JcOadtGsYS6tNopWSfk)@{RfX1kd+!!n^E~ylh$pmU~fila;vpzbX
zqa_$C5k1HW%V?R=by<kI+B<^s(!{F+Mn@UhtcB<?p~cq?_pZNzLs30`z{S&Nx%%`a
z*0#3jv?Ugic6P+(#)!ZA@BK8T@%;3sKFQXpZM1H2zGgTWGCn>e&MRu&lG`W?gE0_1
zu5BoK{WNw)jIvyO_8HDxx{4`tj5chZI}f_y*6VMwKI#i@k=b+#3IrWdDl$Eu@XfD$
zovT0n38rn1S~*3{HGJdg4Nrl}3DKj1N!l$rvJZE5xc`lt93Sqpy0XIDJNmsoI_QL9
zEmA<`&+DRM<^!+4eV3!72{A~UZ_gG)FQ(g=G({Ru2wr?|!3jR*J(IejurfY-r*K`z
zapSPYFsqsqEF{b6e5C0bY+KNDk%(d5c*@+<D2OQL^C<!7!h*5#$?z)I{ev%lfX{sP
z9!1;Hb&kDz_gP(CVQ39`FXO^$4{IaS*_<-wWX3GV!Wad-*D1|Fo;rsjBh7~>ix37%
zVyQvAYf4)}=;S1VoFLzR=Q^vSRhrH*o6cFua{l&Tc@F@+zU=r%$NQk*V1L5u#v1n?
z-R0V|r<u>^i3D+iqu|)Nyv<L2`X|W|OsQ*H{`GJFDf6}g@2ToB?c*uF3#@Oh@$whH
z&MRLMjoWdhiAs^{0yJVF(Fz?}ys?CChKi2XJFGHjG*N3#o!J3pMS20Ct&DOG2J2_A
zO-<XjQm!%E<Jz^e9PK}*-|zG6vrn=2_z^dcC)^v4`JJ!b#{bG^8Fv+<RZU)w7_F>O
z=8=snBQ6X}UhF@^%Am(^kOLjY=CrNHWR@5rPj!ai91re4<iTFe7rt<v$9rF=8z1xE
z{k^|LcsyqQc$Y~Rd3ZEoWiUi{ffzNv^p)!zR*_Hq&^12uCol8S7oWkqmg~3fFsTBU
z&z+|A5RD^KhD>X6n-RU|;lqavheM3cP?=4kj^Z2bbdZQ6Z4)l7QjB&$XNG7pRF=!s
zr4%Fr$!cvx6A=Yqj#0#(o=6s1YLrA(eF6rWJfn@Cqq^eTZ@dnj<KopTQ0CAd5X&{b
z`szM6Uw?y}*T2a>_{C51M_>F3?|$!9*49eC^{sEPv$Mng?k?A!xr|N>BPs~UnHZkx
z@k4qWYZBRkXL9c$2M7C{zjTq+jZKE_5jroaj*r;Aex2=&EyDVim}`TlJ>J9TJqG8V
z;@S&8z@>9%IDEWIf3zjdwHrCMT;b8ZyA*kbZ#s%zjz=D-7+c=^Locv)VTbjzr-(}N
z2fy(DP#@3a1fm7UnzR*%lR1y}k9fFyMB6EHW6{bmo6YDA3J8(1)MVCD6a^+k4yOlf
zj<&gd`yQj!5wqEx$#_DQ=gb>N+cflhed>Bj-s_2%Zb5x(jrX1+FY!J~l!p%t1_Q}1
zbB@||s4OGT<i^N*qJ_J2`!-z&%;s~Zb>I^(p5{m2zd=#<QA&{|2)%A+j0PL*-+POm
zR`iBvIZ^+gKnWT{j3yB)dg*D@$}W{L3L`#3CD$_IF-Gd?>slhTpL*)D=);tyYb&xW
zTb}OFGInLzI)nazr!HEmw&QSCiEK|x(ruP!xDZgzbLHAIy#Df^^WOKpATU*_=v<`p
zil{OX@w$k2B0%oimbPiAT2B)!^TRQxMm>3-Sz<Po7A1UBGaesvcswCQx5VOZzH<-f
zMARB$5TIErdaDD_iXzu!)?hP>Ht>TlZZTXrPuF#Hq2}!AZIsUG>xlB2AGmUbH}BkB
zVqi@*;oPY+_|W27*xP-`x5pjxIx?xnJ~TO=apm+HvvGy*<}}VRp3QmYxp#AP1p9Z6
zxiW&o*Kcw3`B%uu8UDa?4DAZl-kkN76*}M2(;8=5u03^{U;W*d)zww<+;Z>HF7tYh
zEqVl{2tJS-byD(T45!xCL|EP%rqj7eO;uo&81I)AV2i(!Hc#;8RFLz84%liGcqi;t
zl!QPX1I8<&Z!tE<g$@%G(K*ltA3)_6t8<i+tfeCFF@JEMT185m(E>p^CY5KF^jw*?
zXbO}q=v*Z4^@&Q;&kC9lCB7yBwaO@r%IR-!<0BX}D!}1%#)G{BdTVR=S%o>+$E@_J
zs+MV8Q8Y7g7^MglRSd)z*EEbDAK`rD?Kj@R4oX(Cg2Nm4xb&`PSs9M7tE+_Bl+M+(
zRgE2Hcw4gn_y(JoPSGnYsw{;ObR9lQ)%N}UBkn#t<aj!l2P-PNs-Z(s6gmA~Nk*XT
zm*klx&oUYRVn>+`I6m&!+Z*%aAAA>=E^o5d3#_ee@C(271+JanA;yT!ES+nYHS1MX
z(JOj{&Y|)Fb=?pmbl#EYIdxs5j6taq?;ODgX7dW8Bh%@Wix)2~T>_#OPYi8L>>rL8
z1N(c&Y;0_#g(Aa7EkzMZVWJ3TJLOOzkm*e96l8!zBL^R)>Me>UC-_86=#)5%L}&NP
zp(yL40OT>{C!wCuC8>ZmFd7b67{W8H0E;oQb6aCESw>L8W!}Ggz-RvG>wNXKJ*KmY
z@p#M|Z``479F2E0t&`J;)?9n`D)@$nj~<EF()Oslp(w3bZi0;Awk*h1N9^Sc@{&+G
zRHn&uLo`x-XH6!PK^mQ7R7_?Q@@&BN)=<(gyvKRRqx~5^W~`JWZr;4d(a{kfxV%ng
zG#hIxJiB$4<9i3xR^e5k)g8Wyy!OhQDAi}<>}j%~`25%3ltry`Y-AaKd9cO)B#>Ra
z#M{-3y~EcTWd%R8(x9(o99J#+xFN4AioT*g-ldM3jm>TD?H_V$cS3G8!(6jIS`h}^
zSZr=7$`YM5*rXPSO5;^PnH+61tkUE~nG&iEM7bUd3QByYV!c|3ja9;2LyVATplp(?
zED}Hv9o7PS2vJfWqmMWj&_1BiNrjy{$W-{A?mlZJ;x_Y87>nuz8~Nl<eTol%>|-?b
z5xriYJU>Y)Tt=#d6W~KdE%?|IKU-;qPWBlh%;ybN)v~v{PuU-0Y{q=Ni(43hV^|P;
z5Tk_ME5qUOn3ll7!2!qPV`A6gCJ!ip>C7?r69z`3x|Ymp!MZX_h%M9E3>Cpo4)KS9
z)^*%FnDEw}yHvHqJHcxDS;=HPVK^KzDs%F@pvVR2oX=;BCx<fb)HQ>_kPsxJysZ!T
z@VifO|Nc#`z55(%Bg4k(I$Im-cps_jmZA`RrtPGtL#vEx-pY;A)WQm;P`9q@h=_T4
zI+>&eC`h$e2-q^m8iP+>MA_M7bXGCN#zgrH&Ye3a36Uvd|NFg+lH160LU^d}0OLW9
zNeYxtsNX^``rWSp(LAXoUAFD0?@4w&`O#0Zkc)d#=aw69zrp5epS3~GM}G8u49b$<
z{p~-c=>mb2NTI-Wo;<U(ZNtUO=V$}ye8BblM||Pcn|KdpCX$xF{c|58I!)KkP*&47
z0-|?aU_P$dZzi0-_!NWT2=4-;m2JA#ar4I4x%%uDlktSEix}Ob4Vqv5)h`jF=Y#M6
zLGIqUN6!}Im(H-!@3S>J!>e!IAum_3t;1_iWerEwjHjP|n(@SO?feyPK77d0WU{Q=
zYJllG53n(CfA4@Vw!8Rf_{~4~WB%6DYxItfSse|@OeD7uYsYxvc=gdCn`6a0j~@||
zv?B!1!Qr87BHApAWfnqOxi+!@p)^s8Z&;;fcE41RoEVq%cb%-h-|Kr)K_XZ`9ZRC4
z)kG(Hn8|}Nl|P`HkJ-6;g<^9JrKFnLr&3ZCJB-q}4qSk`^SEkCd$5n2SH#sbeBn>O
z!na<2oh$u@=dN8r%A+j7L%<MqP8Sr%dt+iDbN=YuDbd^bq*z|yz=;W0+R}x{=GrEv
zsl*_d0_(LdFr@G>FW=C%fogn=-8#kX>$f;_;WX#YoJH9lAsVjVxXX$;%hhKF_$bC+
zk!?VzI&Qvpi~Zx8$-$W3!2`^2oiBXxYm8@dYRO`T4vt|tz*vorJ+e$w&nrfQlId(B
zBVljI+WMwwqD;p92M;-Q>J*dll&zs9v=iD6rU!?-=ehUM?~OQnW{Y=j93;W1r)^t`
zqGUXu(;p1PI)V}#P?8y_q`XvGF&>YJMl@IZ`$v>z53O^IHMG9PrbJmGNiC9~u~-0%
zFkLd4qmA%59-o*TolazasdRr5bO+gF7Bsd=;Hg$R8G;iAmShFm2#FzthFX6ALSMIF
zB~`LVEqsvLK<C83Ejzbo(b1=T<i~#U$N1v!e-78qd3viSG<_;MaZAU8*k4=+XiXbD
zoeLOK$SK`P+N>mQC{$eI7k}xG_^D6)AbI9#E4csYkhkvavQmi9ckj^~?3_JEo);XI
zEk{Sk939Mf_1kZ;wKe44t%nr0$Gok1_VOl~^PC=l8y3_JjE`qrK6{2U7ccSn@h;7L
zhAJ%Yy7nBe-gukG(-~def>%uE6`9dkqe!|}YUc?AeATk8U@H{thK@mzv%bB8uMR2u
z1B?|Rvd(+-M+3s6F&o?4ytBJ6EH~2J&^gg(84a1u$&AG=<V}#GgoKdMX(0;>8B>xF
zEetiV2xmN5s22J)ln@LdozjigN&Y1IHLH~-I8Ufs+4sr;!AF|9!8IN2WG+9YbC@zG
zddYV8Dl$DhW;(B^n^pvw44Cd6pjT?BX3VEEj%Rb;e0)o8J|AhSnyS!Lb;EpKF`dr1
zfA=9P+Z!C;z0LEZAwkKiE;fwC?rMn&rn8yQ@KHkRx~|0qk8e6TWmFByJE9Bn0JWa+
z-X0qpr)ZlFg5_x5FgWfQ&OF0GL1rV%!b2o+;OMa7wYP5b^{>3nGf!=b_DThqP1)Jl
zpr1D!jwcW_-sEIiPEb%3J-l<QtgJAfRWxm&$Ol-PF&WEgC-3E~Z){LEEqPwj`U%@B
zt8}5G*Y8u5J(Sk;dj<3P9BVB_nK2v=a6U-AH)6lZvJ4*s%7~_|>RR$VBhM{GnKNr@
z>ZWG2x+?B|f6@~eVn`9qUJ@O(TH0`k5R}3^u?Q_p%V|1G0^fx(czHK|*P_LVhBrm$
zE_c}!9(lsEMi!ccWe)h0%p=Jy@Pw{wQRw@9Up_EgTjj#D&v5$m1+L$Iz~#%AnKzEA
z_S8-aWZR~tX$1T~cXpi{H}2s>qzw-_nmMj)uZvpUAmU2ju`wEAKoScMr!<XWvo{hG
zv<n=K=QQnIwl=rWwxX$PY0|b9V{$f6pT_EfRb_eW3tuKU$GE#q)6N)AE3WN~xPAW-
z<=Q%BIpo&u2OLl4Oat6~c#jYjWjP=#Ec3eJgYSPo`j>xyu^uEWS}NsiW*M1`{kA2>
zfX#EF(d4PUWf8WtG8*#Kr5)O4$|A`^A+_^en^@cg9Y}`$6J~d{fHoKR!O2x!s!Y=L
zT-bcIN)|mtU|!cX+GxB_eE|y_njx|B5v$4q8<nVQ^PHdr*GPtPOj(eR2Dn*;>6g&S
z!e)z%-k?V>M0#Z@BZ~{z+z^B8ayALh?(EN&zjc=9WSPwQMV@1g1ux24jm88;R$5}T
z%iVsNq@b11)r&VCJb0-#Z`($0yiCzfrVzvwe0+RNMx;5O;G9DROMh(>Z4|ff>{3r_
zKKNppe6*hEG`DWw=U@Eazs~dT`Ed@WasgD;LYUFCV{}^)+nRo!b9_7pld=2wF#*MJ
zxI)v^_<T`}5Eu-4WLbf=hRI~ccsj!xOWS%vaP+b{PoKF+Uj?+5X6#vAbMM|RMOk2t
zp{i!Y*rTc&w9TlS29sHwcXT0==Q+7CU=(#-(|J$8GaL-4>Y5k=)7hL+zbA>E#AF&4
z1~%&Wop%>YQOL<crIM~HK5-L9o)CmC*wvH6|01P8zEGe1;Kh@r($2dOk}ejhD4Uj6
z=H&V-or*%!f~Q&LtbNDYrsRkE82IcT{u#gatAE7NxS?qsM%!c@j$m?$X9*sqHS6o^
zoZs1IGMS@Qj_Kv(y`01P9$m6>HBE=ohDQez=Cv5{hrKyp{^r~4SDs>FIf|aEPjB(e
zbI;?0r>ZI*J-p9_owGEqV)N80TIWQsIhxdTAu?$WIJ>ohRV_u{XSBA#%4o!3xXx$4
z`s++8$HhxKv;posc*vD==joLa!q>|(3AeMNZ!DBXMNO^^{i3Aj=Ae<%<SY}78i}<I
zVh>vz4LENH+<y2F=N&42_Qn{Rwn=A)bRt{ioIP>3EPbF)+&{~Mw@M0_C?;@~*g~Zg
z)*9NjCC?3Am+VNvV`3`1MH4hA4>ook%1A(-4w6gmeTT|&d<|XG(My70m7s^XNO)9=
z#mv?PhcElkE6_!T*BX;Wtd0y;Mo7(%Mj;+QsR5JL6-n0w=RubiOp5YIH>uDH65l%-
z44AKu=<1Hl*Yvfb@-P^b1Q#h*`(!IC5F_<?#@3|^R0oIHm4c$M>|DIWo%?rK85rXB
z8e_fB+MuBE5QE_t{^_r=Iojg*u*Fid-Ycl<2+?C*OD{&AI=9X0xT5l&;>vldwx#P%
zu}C<u#!}52di_2f(gGa4r_l=6S!T6oHlNckrEz9*Jm;`#*<M@Y`a6#~noPKT`!N^K
zY_M~>5uu(gQzpEksoN!Mn`If}s+N?2DE_M$`-~@Z=JP-cc%!JBhLzG{GbfB}GJ``z
zV^f5U$5^oj`y_`8I{g&`mc$IEAUU<nep=+x`{n;8;bufc2pSfru#-hlA&Z$zb1DrV
zwTy*P0DH8k*YiAQ*}W3QI4(*B`Pw80ld;xhbS-Gp<J9&B|LI@<3#@IOqs`#p-X355
z@|)B?P&>aot#xfj*LC#D0au@Sil76^=G;4|IGQvv1{;G8mO2<>RP62TvvO_?-^~~n
zmZt8AO5q7u6?yi`CHlEWM<`>)!`U9wU5RPlE=vrN-1PVhFI*uv9;*WTUeTR4Jlea<
z<%_2<O0#i#lY5W%DF-VY9_&-*B@d4d*<9UVU`lLMbj^&N)9Z{I>E|ran3xe`OIZ}O
zvpE<|UiKKbpo2Ib@}i{mflNbxlw&3}S&HtlRyNPPkOn1E0<qRA-EV2bizL&zPMc2J
z<d!D%^miq)8lpmzyvbU=w&+<-o!a8&jRzR5l5t)M0T@LN6Y*F-orx47$d(nO__xZH
z5nVGE=EikPkQ^^37dnUb5ovul6lF=Vy-8>*X7efQWsgt(#E<gg2j7pIj>&ohEDEIs
z3tN<H>L*&07s&-yNpnd$e~Oes%g11n2FQC!o77rU7M9p0>>_0<1tLyC&uWwl_;$|o
z?|K$fYN~q1#^^Nb7gsqdSq9-vAGf^v?Yn&VqvvVcjx08O>V2oUH=bgP92E?eitNoQ
zls1$anr1>fpA(6k+c{6K*W=)DpDb&|wo*GTY)ad;(HXN!Vqk^R7E~zsOSBHidh8!f
z**~6B+JYi8)ZS3H9WKuCJ~AAP7!Fqen719Ba};Gijocoqv<N_Tz~*8Y@2})^rQ&CQ
z;)nPvf8#IG?cQa6a6sKuX=hx{Y<%x)F)E*od?#aIfV2UD)KxuMrV$r5r}Xb92Ozb)
z-mv_!Ah)1=y=VD-;#Uky1$~HuZ|Znrs8*<D<T5BaXE?s~nDZ-}eC4&5IlF#|-~F}U
z#Zd5#SH4Z-gJg_(NvH6wyvIkITTG88#NbfM()!59&#d5*;W${$YhU^rKe01p&`vOS
zXROD_2Ujg|Wgw$=GIg69-{ANi3G*{3p4A%06DG3*RvBSqi}s#pdq`hlG2r2iM|63K
zQieBg-sHKf&#^b1;k*Q1?(Xez_Vg)PgwknKYt5z07kS@%-@`Be-k%U7^tFbqErN!s
zZCG1fgQGpPHZ)$mxjv>u4J#1Opx4LfHnlXvB4E;5%VaWHk{|zHujTb2E|W8!{BI)7
zTf}B7*49Ss?;r4?4?NFHUwA9Y9+G@2jhTzI5~DTt(eV@xBVFg{LLkpF?mT#mIXvcQ
z_YsX%Y&wsQjxe2~@fZ}k%&5AKdvCtOR&Ri68is4@=&GQ|OUmde&aSh4c0FMp4WprD
ztuRa{GtTeq5M0Okb7!ekpv(-WENJHq!D?)giI7uCD!M_TRpivx8nK?UwK<{;4Yn}!
z*SFa|sIVbmQqh5{EAk?TuA^0+A_fMTV)y#ngu2C$Gp!<1XL)o`^E-e1Wv=WzPaQ3}
z4}9$T3!Gms*zRlgsxitcblJ!DhCDc)Q@0+QS*DdoDTB>2ZoG0+0u0mdAdkDu<FnRN
z*A>o1bP~h`pSlSXTe`58EHqZGb95d;@FLcXCrmB`Y?0$Sw~QMp@;rgh;1@|$O0&@~
zIeTiv=Egd!8|xe$?vqet@mdB+&|HphX%UGFFdZpAAnGNS0N~Q;S|QdHfjyM4c_D>D
zY6-W)>Lnwr5YXPMg&|xof2NK_`u&rKRLRd+h%jT)0Y<<X@LgnFRWxnKY%=3l{^jTS
zjbHu}lfy$6L5UEls$a&YvI;4b)oC1+lio_1F`HHFPbL(ZCATTrv}?#?q(AJVP}I&b
zkB04DKm~_R#Ar`xg3&k~2}(*`B)vgQ(UB;Df2s!WIiAgluEXd^FU!S4y0(f^4^dr*
zkDhK`@%X`Qe)F?mWMyF48fH8`IOeH~JM>Vrvko_s#D^F>pZf8S@GHOnxugdZhA#$~
z%`3`{9Fswo!(16wG*tDR4W)4&G7~W-;({j6a-0w3+KBg2DMFAGhnV7bvOLE{$!A}Z
zJ&Q8sC?lL+oT!&1icTKOKocVO5BHf&X1xCc@8+A|xK0QiL`6|#DG^qBPnTFJVDI1G
zOLB$fy-87)L<O5$o6Kf2X0w^xvRVw$AxP3<@PTKayCTNn&hz@qudp&&p>0~edGlY>
zAC69TK%0>(M?K!<XncgtGrAbbjN#4k8}uIErJ2lVLdVKz1!IMk%8MKw!RBI|eCPEy
z+1=fvYAViOJkM%x1KnHU@bNp`dFLITxqO93H*e#dW3;-8GZEJYnn!zl;ZMH6WbV1Q
zd&I_Q#A~m-PF{>qHz(xEaP!t}p1b-KnfAQr-B)?Ef5hddpXHPVJ6y#z5wpF+jj`kQ
zt%n>>XY^M#P_991P21E0kmotxJDR$s$OXG<I*IZ%Mw10;4XK+NVL~i<X0awCSdFn6
z!+}_id=iRArD@tmGLfQGfVZxrGZ4Fmm@AZOmN1dE0!sI-BUe-EM@Rh9KmV6_8~DhJ
zS0yec#8g5M(`ok!nmPq{E_S)4ECB<2r(ZLqVND={@01=ald0lKM%AJ$V>ui?fqi|?
zE1vxKMMTeH&u(kaq-m+<0-D!#$8<cVsvBwlHlokU@(gP&u9HPjvf@*+X%zon3`V3L
zZAa)FAvp3}ENhMH@NGv{NZG?vPhVvE#y7=mo_=o=WpQm6HF%L_qO4B`$q*xr(zwEM
zI2n^8`m(W~^KkzNuM|V0=#+FPT-X}1mRTl;NBpH9`v`lx`&88gi=vuW9FOmD`Sdw3
zk>jIdKJwo8N%KrP<#-jr8iMO^Zjr$zhWrMJin);GWTl9<H&36U`PKm@ZGbk}-KzPV
z(ct{@<h5XXPlUtEhJ=6X>!h_@tZOg5eVaRnGcH`*=FYAARF#a~Dot!5p5%8d?iZ~!
z_IP?MHVLKBTGXf}3YfdxY?UJKl|rKu6Hq2Mk8>wTTh+BxyL$v8##-v>fru8{ju7G8
z*;O)=v%R@W({{utU~vp0pxazO!+1WU3i3VPiSyoCn@(Gb_3drex3`G_s)^^@Z`?zf
zo5O~afB*m>07*naRHzWRcy@=jX?f%AcPNSyfA66@bTMLr=E}R?P1|)`(_*9f&?i11
z&x8liXe+EmY#n0{y)zqp`|bk(uD|sfqtS?X^frI(FaI#}#uKBVt{dKb`wn0D+?N^U
z8sAnZH%H^?DKK4)2^vdEiwF_ji0q)3+FvpoFvg*AD5Geb8Sz*~=APBer*lxy&nzps
zAx4Kb9YqFq#fVANDztKFqUgx*SQ{A>mh)#$v$Zv1ZGFUQdC2`&ze2vUj(15Unr;YV
zq*gsBP%a`Ixis1Y1x`hR>Xw~@Ax3O~Xe0#Esetu}VLjbD-UqVOHMe}}baG1BRj8Bk
z@X6+tMFK<cp3GXj*0`X#e>CR$je8u7E84cDbsp!ycQ9)m<Ia+WfYs2=TL!M9muYk^
zyRva&B{B(~FiK%?^b5tH$P@c00f$Ou^om7TC6t*);V@PJVXNeK4PF+~UJ_C&V+heM
zbJ7%=pbfpOpmvV_pdce+R0pw7Bt4W_Nv9Ob=A7PKC+NrrUwoFQE??$fed`T;sCn1b
zEBxjk{~_1!PWXYRr(D?H;;@E)@elv;@^jZp)9A>+WcaAKcxsbBn>^;=a1Z~~S;#Vc
za7^o#Xmd73IluE8Ut*jO$h1S@h!m1AG8Yo3rxh-x&7vYE(}W=RTvQ4Z1s?E0GH4gM
z`wNvjX@Uqb5*ouOFW7%PW-^&b>r^E5N{X1w8UtR!4>Ss|!S3`+iCj^Nx}D1pwnivt
zAMh?UxrBx?*ElanXdM)#&A^xw;32V2S|?_0!9WdIM!|#-P?=^J!ZIW-L~zbyb)d6G
zRKhlsT6!f5q;o1IADrw~L3QLskI=}jmQJ1o6(njGPpo~4riC^-0hOc11;315S}+kB
z!C<0bhq9O?dq5z{2MZLvoZc{(#Dy3sRLkCLMydxXP%*M#e1jKt_JR>HN(<fmgkUZb
z#W1Uqc#~|I4Q8|=(odJ3g!!d>CGQ14%;3V#87`dNU^K`nGP^uAMIR~3jF|90Wh~V+
zAYHUcueA6)(~TENpu0LrM>la%3Za*=&&$s{%2;Prmd2qIhVlDtygvQjCoi@9!sWQ>
z94-a|frI0goA(c>x=2+!+O{SJg(oLyjn*Em8?r&p%7sntyuQmb=T9>`e9T&5*jOnj
zG)cOlu~wnASxyv6D{)dNMc^cePz1W_MBJ<tZFI!Wv9Ylsw@6%M*{hSclHSLX;<r7F
zvUJhWXw7v0khRm>=%jP9(G!DY)BC7UMGhvH%{)e8t9ZD3%)NsnB91rjKBDa+E4`dM
z5AO1NfA$Ujuh0A&`h)(mC?zNu8;|R0O5gB<AA1iQpL`dE3cUB3i+tmkDsJ6<$dR^u
zqca@cZD^Vsyzs)cRHAK{kbsUI!(KsdCBn!kh1CYDBydj~h5tUv5{ds-X?c)h6`!cW
zk6$~_jp>}<{?aR`7|Ak&>x79mCgFZjQG1W8Yev1HcyX_O;$tT(U_FPt5Ha9vp1|&u
z`DCS<DK?ed)S(qE4hn5@nb8TTwj(w*m`vhWjFmj~AlQp{4jVc`+Y*h&L~!+#5Hx5j
zmI#v(lsrVy$xg1c!GwU0Df%QmY#|18-jg)M)LQ0!hfzxMs(P8U*g$GDk$WiSHf3N5
z>lxES6I3K^2I<cg(`5(&otHSRIGT>B<};MZ==FM>S<iXl;t&-TnH7DCG2)vFA&}=1
zDXf&pGKwO{8ok`fixfa-t-+^woHEa(87OJ3MDrrpSf1w?ozaAd*M`-#E!j6xRhx`D
zkmV&l)MPqBaG)e;PNkr^ut;Z63Y}Ym&IIsOijZ!`s0?VA>f2As6o@PrrjRg36AeMR
zlZ7e@)DRa7(GuHF<K4;su~-kDShS?oXnp$<2h9=mO9~$-hDJtE=SAe%bwpRQyZ4x?
zowC|5xO!=gJCF9byjk$n_Bw?Ywkc!-td{%HSS?bBwBSf8rUuuL<e|%$nB^h>v>|Z)
zc*?cSHDS6)ny}^Cd(z~sv?3_WTL%so6s=cOvE!)m%=arHue|0xSJqf@vS4+=Gi^Hw
z&y3();H$5ElYMWvcW}hYpvN!&)*rAjT;=C~{y$+lJK}@;bByxfTmJq({8gF+sDC}1
zu{s>^U;k(S5kLCZ|0<0Ge229;FTZk^-+$>}v3*=|>@593M$rqbjfP}6POYt=Ooj)l
zrXi0FJKL)aOHE-st3Av1&@vnpoLXNcbdiieW;J;(q?gvx81JIP21V7j>>VDnwZ1}B
z9sS&}G3?9fRLixnTBbLvJqm|!=d`||@rLoy6q~PYOS*y1AasBs7=>zPP`AWho`Bep
z%0ja=CioPJ2Q(GI8cJklj?QC>KC!J>bQs1U`Qg|Mx+$uv2v$k0ysy*MPH`M7n{qRS
zi1r=;*FY%0GMn^P4wIE~Q+UT>Sy!P!q43Eisk%0Ww;|NJ7XxZk78glwex2xZL^r05
z1QbRmn3QitIB6`=JG!PLZfp~@;m)6Zj<4@M<o4^=*&eR)V?X>NXFmEt+ODH01iunY
z+mn?&Y?QigV>I4*v=X75OD7GZ^m0yL;54Ki{>k}W+MNSgp5uL_3MF?dgEd=1xhF+&
zjFFa>Ok38>79G17Re@J@S}mK8V(OUeubySJz9n*pv^bwEYLFQX(bLW!6Y4omNtCe;
zf?b%PQ|$8Mtdtgh^__Yw(n7jq31h;&lDt7Fy;P|$#zb#c_|-r8Jhyj`aX|tUn_9%4
z&O7S5;p6YS%Bj^n<xOd9Ua@m-$mz8a(d5)haFKkpm9Q;^CJ5xfLQJc`%4VQLhfPz1
zPFPnYu~k0u_0PS+^PhS*y&@ACg<52zoh;6BQrC3K^0}8^W|A<&yi{DgaGF1R<pwCo
zb<R^4*BNG#RbQwc-ga~@rdFVivdp>u+D+QdbL3`NGB(Pbi|1E)_W2JmpUg0MPK*}k
zOa9M)_KRq3(JHWW{uI8j+<fZ>xQ@xu5m}z``7iw;FJ2k)=GR{3@BUYRgLi%CdD`h5
z*L7t5lD~;UTT5`_6V=-A-)21s9_2fN^LX!Y^9gy;m&DdAf)^=`wiXpl$|I9b(Y9`}
zR?*oE)io$%`R}tr!a7@rPgu2yh-rT@PWny=su-{_1@xiP%@aIIS&1Y@quPjaj_8{t
zmhV6r*|GD~3e(HbT@cJ8cvL63OmvMDvL<D9%%seeCPL`YUP=5&8oL%Wc+d*v0@`~#
z4ih5L^q?$=K1vR>Qppm+vUQp27_T8ynM6KoCE4`egL9~&B)6Gph)n9)OAnB?7TvWF
zeKNjg(yS9A%qCc0qqcU4+Vbjj%yzHGd*Ay5R3<VVceL3iCW}-ZxF{YfoheG2vzfQ#
zZhu*wCBUzih}i@vXIZvv(8-d)d4c0Bz6ZeA0C`Cl`%GKSKl#i{eDN!9rPE2$ji-gC
z-|z81{N29=N1j2b`0%xr#OlZ^Ah9pOd4BzK-{QCa^v|VUJVs{KoVM*~YH85<&p-W1
zKK+SjQDH9T=a`aYB4{srQ8@9bibDPb-u$<`76blwQ{N|ZWSJZO%~!w9!BI=wb}5rg
z-m6jys}!xfn$*{t^|e**JlJEny2h`4={9qO;nZ65=^t6;{N|8YHz;Mu^Nip<c`h5U
zwUV}~LW|`@k?%vmX~?4i10VU&GxYjBRMP4%;!hTfaEwusN35Z9k(NLcg9OlN!^Mji
zxpi|FlWCgTGi@OY;zOO(V~(aXf-*$+n7Xc+)^oOoeGX?Wc`v8T3uc|eOauSqfBz?3
zy?BW-bPxxeFFHQ`sgLosm%q*X-*buFXlyiGUf-Zsz-+CLYaAJoAA0s_)=I<Wr!TU8
z?jq4>{G-RXEE12W<bwiVfgbkBS67)H9x>WJPmG!v8<fhR>li<{O}Vv2_3#nBK|!~B
zh$=E-QDXZgDjM=ZpQ9UZ(Lb|;Ssj4`QxteNqnpez3No9Ce5ALADmB`lYy=XD;IULQ
zumv%ffHU0%V&;imz!y0x69u~RN=7Ijh!)9waH6-+bzGJQM6J+Da-L&R3IkbJsGb%E
zsjFnM({@?srIN}zI*&36J+Bflt1w7nf-$))ddfpHgRTafL%AYf>jMfyrZmAO-B2K%
z@HF%WsIDW{l~D9b+LZyKu_$kdT?<)(iXPQ^$!ls_u?V1%Mh3&xjZMtKJ_iTK^taCN
znQz?ZYp>o0CtY)$bJSkU1J7JK!>3-{!L%*UpUqh*oOC8?#Ho%v>`H4<9WPEG3u}ZH
zP})V!%?FQp>(&AP%O5`C_TeGk!_Ll-pZkx0lIF1Di{E&KN5^x{Z*Ot);U0A~{LR1j
z_c6xs-02m5^MCp@A$mfhptY8)EnDQ=di;o&UVn?WX&4NLbaj)~5*bTdE#r3=9SVcj
zLBRD8lG`3Bqd>5(pag$Xi5(0YbXvW1@@D81gqUQ8%LQA+%MRxvzx~Ib$N3JWA~w%O
zyqd;1@1-Q+(f$#aws$ZA&YfPN_Rnze-~mOyU_Pm7oTDfTs<vi0+Mzt1^Lu~zMGg)s
zKKj0Ej0P+GtKax6AAZk8-v9KD6iWyo320mwiP7S9q#Ty4)Sj8k=-P&Q-bnL{m-jHQ
zJ;6JA!y!%Akd-|yZ>=+_I!taD4ohZx`<&YvGOrygMdV;SVdfipWe;!RxNa!=D+B_q
zQaGK_)HSQ?D`Z8^(cv+jgO_hy=c})Ln=gF%6{>13iKv+bF7}n@#+&bO;lc&J`O3?j
zzp&2Q>WKM#j`NX8YYF8lSt;c+S+A65;o^>LAZHhhaiWWX)!wRHpBRZjSnQxn24~Je
zug4(EG1_8JT@X0KHPCeEvWK=A>+gR53DlR7dP{S%%^_WsrgxJL9}101BIcMxc?yg5
z-lIbeO(XvKOsAthXxE|YT7dOLP-`Npb1Z<KNJt9!1?`>G%>h)~2?eJj%x5S)7c?-W
zgiXGC`xPEt1uv>)CAsWcw_*uefcssIb}a<yy;H`pEYnCI=n@wR$jIx`m=yvsIu@OE
zfHX}fkQ+CZ$0v=llF^mRNmGf`VsCfC|M<WCG1ng-(?mFTrq56R@C(dm6W)GjkK>8s
z^!A9?uHR#KTJh_jdzq@L_(wngBmD5yksOzm!n=sE24hZiD$ACc#Uk$IQeD6Mh(CY*
z0Y^<BW+ih6vF(UN{{8>(FZ1@-U*(mz-{SV8L$*(y;;8B9$Y^~e&r3!t1=ruc$@<z5
zl?~C>;JP3sp1_S8HxjP2kWUF7=z>JO9335_(rGV-1+XrE4^i$569Q->g|B{5xO;-B
z{r`C>CE)lcKJpR%*I)c&j$`T>2!YNm(n$p%-`reF8e_$|?G^G~pRXP6lI03*1Y6Tu
zv%R?{x&PWyw}DADXWlr5$}*{Hx|B?!g2Y;j7!?lpk9hFtkZaGJ=k>dHc`%u>^6XXC
zHwL`#ho5GD|A2ds?{oIlX?FML#OT;q9}(JyUQzNBAGpS&y)lD+k9kyl>+LuA=ns5|
zySMHUP(0e(XKpigAMI1Mj>)v4=cAnPweWSpNWS{`;E*c$LEpM@i^2LSj_y8W<J1P$
zX1KQH*az~wV0=8GX&OeWt4zidwzoDJ3<h%QYg@UF$`AvRp-&p&Lt^(9cCGKoPg!aQ
zKuHLsHWsA}9!c3yBqAg06IAz|-?L;TkWE<^l7M?~0Bft5Xi+`8B!lE$Sddc+``TAu
z5ui6l$qLts-~Fx6@!=2uAZOqE6jeS(kz?vHJKGo8>~Ez-p<Vt80LrKL>5+CFgmF<z
zhQ*^uqvS%J6Tg!gLP=}S!O;<u$%I8*vC$fnS!wSnN(!Y|U0oqMhgKD|fHDNFQtGAb
z`tksJloKleM0{uoKs}o$b}oIKN=`S{Xl!ON+KZZB4T!j<dOk+Q<NY~Djb{=9UFQgP
z$lv*I{tn;#voG^M|AT+ZgTo^}{_!8=rPpq;Qo!c=8nd#;tnRq`=n&ThCX*?np5^)H
zpT~zTHNMDaptU&}A2qlTu$d+(OKAf}S6DQij?9~m#s#9b<VB7$7HvFrRkJsnvU_kK
z6-%+tm5U!i<(Av~Q%ajJdQ8c(f@hz4hCh1sE-|HFcnu~X)fQHowPTEs8BEgjSOpmA
z=p&G__hqeBQPMhNjOY-P;8bAtrM62;k?evs74TK#eJ9LZ$WSpdZ$)glh`5Ogtksl7
zPSXZr@aR-w@4Tm9X!>O)Or%mvM)Jcy^g*h_eRNi^bLKRMhZBO$q-Zq;Tu?X_$&ALN
zgaD-!+ov`-v$@X7XvCWbGak(h|Lij_acXnGQ`eqj9s;%;aQ>OA?7VBl=88t!jMzEa
zc}3M$%+xy!vkX_wXxc;0oO+sb+fU)VV>o!8!)eRS`-e<jWN-I4f#~A==<Yuv8bfYj
z(9f}*XLYq;J~^gtIy!Br+79X|hJyLr;l1K`(ouKN9}PIz-Q~IGE>X3XfAkB##qq2q
zYB|lg;Fq>37FaVP#gNlgBP7=%Nlz_=(ONeCe1HlbT`W2x)2d)JCKaa0zso^lu_ovw
z3|2a$JbmV5QHyFxaxA`XvDVnjAOA~y_76VCFa3l6gUeU8_z(Vz|B|Zz75?-auX6m#
z=Xm69(0Y&dfuH-CzsA4w(VzLwh4%ZrLhDe8)mpA-iP>BJ@=xFtDzzd<V+cO-m6yJZ
z&Mj}<ydhD|c^WZ8;5{#V06m-Xp$~ruf<%Z!f_%na{D%q7AsPiy%L&RFsVuWOci(!O
z<H>}Fdk@*&dz6&vhE8W(I=936pvQ|ZynET?6BpSwh`vQqFi%d0v)PRKM9kHBmP-m~
zk+UH8H#fJq^{rPqK0Ib{{uJwHq*<j*?@KF#cY!AhG@lep%C$eK)cT&!+xe6uE=Opc
z7)Nau0?j9{S6aw}q&*k|ZPzUy&L@q{PreorFAHV5)-u*D$PvkUmu6}>(N%pvLFjkm
zRAGT#qNv-J!-Fw*_YT-Unz3_1(m9k;<awUnO2p*mWHWr?<wHPgG52~W)oY9Q^U_OS
z;)Um)MJvr@GEV!0V(E`l-}}xNQW6y;sUZ@1^{pGc>)qG5ee)Kd`|`^Sv&iH911fS%
zK4R1loIbU|`sxbK2j0GZi?`l<gOC5n$JjZ0m2cjBgP;71|1Pm}G@X==R`ZIl{`u?t
z`Rli-suq05^mu}`mi4uDX1fOr1_P?9BF`*URdIBD#H~jM986lOl^#2%H<(Ww4rdij
z-C?zqk_HOC{pLGddHPv?`%k{cFaGP#;6k9Dx41&0yJewTyy@?<Oa%jrHmL7DDkr;6
z3}$h0Pwt-(zvDSs3QQLp7O?bSeaDBsd<YhQ$l{B!|1W88_A5!6p7;H}C6-)Ho~2GL
zUDbQfbPszr&Tz)$h?GHsB0-y$Y`~^K>B0tdVZ*-gg<%W!Utr$}uq?wed}F|dWx=pG
zkRger$r;X2oEgo&aeA#@YCUz<+#}-KeDQvfd8)gHr04(|)yO;<84>v{@B6&Z`#dhf
zYSnOb^oSeR2DmO^F)U7w;d({T3ZpFA!rFVO4qjeG>AzeG+yGkJ&EW56N*__BoUUCS
z8Y%S`DTL1Fo_&sQe(&4tR0DhpxER4hp)7BG?}z;C$3I5Q5lD(oE+vQ#Ptt<3p{=AW
znGC6d*ubYGllj5%F>l_xlj#Qvr6Rs<dH2p;hR?r%%CroHBNY~0e)vi%M<$y)$daTX
zX>3u7g_to|TY@r77jtY?5<}$H(>J(weIJrY?eu)4O%Gnb$+4aE#z=Tvl%?Dxmo=QA
z>mt)tOG*y!b0VYVx|EjPO@s|)*{u{5eL|-d&IerAWR`I@@3`be(Hq~=Yi@Z6db^Ou
zp1P1Lem&hpaHz0RDpmP!d-1-M5<Ui+&T~Fra(*#qxme+YXHXBhIvMi(t?NAd(a*5E
z`@6Jfy&(a(Amr7|$UrHi@(G-rt%zYk;}Y}Ls*mMKBtHGKukyl;8yp?adG?u`+&?-;
z3fq=#BNcQpQRFB>Oe6qf2r*%eCMd(~V$Mfjyv0X9`V3*c=Kjf?*WP}_#ri%^-@HOO
z-eGd3;M&ty`TehcgU|fJ=XrRs;L3A1r3)fB>S2lP1n=v*6}N6)<%hQ)Nb`SEG+o2M
zj5t1<LWI+k6NaN9&IO{2?CtOJXx6Yep0Qdt%obt=Z$=Y}!Vz7^ougy^_#5Bl=G9&5
z;V%FD_r8kjWzW$W#mSY~KCY2U)V9K_^ai8OJJe%~kWBi`3bcJMFFu<DiVVA`?fg%^
zcj}fe=ylFEpXc#S&x(A9q++JbEMJwVcE(J*ITQkp_CKgx@b+|l$@lXA<@|sTA9>PW
z;^fGc^((Q6{4bXab|-rr?Cx?lyWqj;F_XzIyTdUW#e;_r`S_<kL2srhGX{FOMIri0
zhnqG9%FU&MnXj-crHWXVb(Rxep|zzNNc)CF9KHA)grdfT4xbW5&mr3E?h4QZFT9f&
z;^w^+6Sgk#F>`!UBm|K-DT-qAcYQT51Zi^7<l=?a_}n+w+eW3Nn9k-HYbcVm`V7ar
zw8aDJdYC;X<#Dc?HAT@|i1p3L2_x)0e0KbfF$k-8vk|GyM%sG~%1@R#Sg~(-?x*-A
zYxT_#Nt*@T$4E$`C)RbI)pE`BV!?FTvRbbx%Yxm>kQbl3#_niDT~;Fdg2*a=u;*3-
z1W}vV-j}Rg7qj_>(z3TZBqE-GA}SZCO3|3NnK&AgEKC}eDHWQS6k5d%?L~Ge0fM#G
z*cAC|zxZ<uD)_mVUZM$}|Ly<z8t*;4pePbIpZRtE@Q;7O&wb8Qz4r#Q)q+2L^ByOU
z&Ot}oRm<7wIn|&<#l-%;q?-?pE@+x1t7eVS1+&(1@Aw|GwYVdxq*$$6rmHp0y5p<g
z`BRLkaGg+$+ICJ+G+D5~6FSGDX<2sg<!}6iyAS_oPA(QArxQg^d)rJd_nG=>tkq_Y
zUZOAN)cy&Pmio~DY~T7|<f^vk-jdGMrQPR)=iaV0R&bq2Sr%w>$!5DZ%}iOwSSvno
znm^~rDoQ=4sBZ>-QofO|CPj}PjCkkW_gJo%bgLCz6qn`IYDK9H-g~CU$C#qXcH?YP
z6Yx?vNC_2t>nTUlC7K2jn6hBCUb9-Sg-z}Kh7u5Cq%2Bi^Z7Q4L8FTy(R)niNyFT@
zoVH=}V%adAO$j-Y@xgB<QrosvWtHW0@(1!W)<!0T>g786NGJv|t5nkW)~;5Zo}QyH
zwC$RvS)+A{QVDIgs+?MH6%&-wtd=XDx^aW|-@ijj<%Yaj6a{URG*{;?2W#wOW3A7y
ztx}g{WY|1!mBaczmE5>?Zx;02Pz_wHmK<N4bAC2wK5wb3lD+*APv5%A!R`)53lAy<
z+4V2?3--mC?U<JZJvf(DE^|buMW^Yhr>?Spu+O8DZ$k2nhczjaLff`uHk~~trJb@+
zpxQ9n<z8dIII~Si`o`%N#TS3~OBfoa-~Jk({M09T{^mZR(A+q@$(?)m_{rPv@TG73
zF~9V0e1dj0<+axz^6&iHzsVbKyp9iw|M4IELw0v}_^<x!{}M$aI?rOc<oMxz-h2N6
zXVV2fC<gV2b+=+X9y2>%5K_XWfb*K^LSb!3sS2EO05pwg<SPx@SXQ0mkN)MiX_Df-
z2dA=eBv2{IMv{Aidm^36MIPzT`mluc#y#&}=lD>Hcj+y&ZHoV?M=y~LSd<|~C)KKq
zyQHK@E(rij-$o+c=aPe7>gwO@%9_4$CS@ZDxz=r1Nq@5{k?@zob(y#tjf!G(Usp9(
z53h2zn6h-OScs=YaEi9|BwL_;n>Rp}Y1hJ@(K-=ahbc<o3=s*|U_vAnnpM}aYL*m*
zm_m9lB7h-!5`lByp{(>V>7tMU5FqM~luFtF%hi$)0vZ?&N_Hl@TpS%?Oo8{HlK9e<
zMsfA(At$Ggw(=(_=ki9<rj!?)nBA2_3_Lo1L|K+hCKJlC;L4RfxP2}~R;7p`KoZQ)
zg%0m!c}<ATRYZChCwsf7dw1n28=DIYiZ&uL(phgz$gXLFc?H?K2n1{rY_L!Ur`Wjl
zY;f8bQC6djScxs>E6(Oij!!OFEf(0)u)jayxtli_4+oTm!Js$kwaRT^3Wz}rd{dG@
z$%T&K6K%61VKN(9G}|FiSuwsKX;22;%O@v8Wh`gY2Io2^lQE~~D|U({T`D-6x5T9I
zA(6C_qDqo9JH#YR|0HpGjEMp*gjqByMi#B3(wfdr_=7+GE<ad0ytcgY-uLs|jFhEl
za=q~UK3}@`WB%L!;eTOwr{bmO_oyuV@@GCriW*e}&M!`R@aPy_7*<V(G6l=|lG)4?
z33T0zUL#H?ONt#`*AV=60|dd_V&1G%h8fo0W2|D?b{VP>MGfzTjOlz2^Q23OQQAZo
zdb4ol39S1658LWu+<xwZ%TNE_7CPDnXbGQBD@GMDW8G%ch#$G!P;dJN<el-Tzf6()
z*j&`(N6h<;dF&>BTG;d#JvQ|K0P1?cx^3uOx4}X}2&8gARaF$Wc;ae}QMpo8qLS>Q
zDmaq0;#z%)?hvCm&s4dw)fgjP{U}t|l2V^r=QZ{NUuBIYB`;ORBt4QYx7GA~A~_^t
zdg5K@=re@CVmYUC9oEW^bM@*~s;a^{**W{}_$L9wuIsY)(1!tS?>)T^ktp_kI92Zz
z8$#~&Y}=O3xA}W5WnVz~;Por$yl34wrt=lk>4LTENI@|kmE63#$LRU%jE5r%Ef(x4
z2DBDjE<WL$O^ht2Yo?1eN3%IM&S0@<(5l!({VIk0y9L^Hc<g?i@5CiIKSv)TAwlO7
z-~Y)w6slq}IpFl{g3gIE5U^qPZ|+Sxz+_WR32WJ4Jt2sH<|=x=^w#^#n}7v+l=J`q
zAOJ~3K~yq^g<IqMMslsGh7~_}<2LRiFLFBXSa*>)Z}Fkx_T7hk@9+O3KL3SZq8@a-
z@%roBzki?gDlnUN=%OHcP1kxbf-Uv*mk{L|yia8I$)9;h^t~N#N=f~%C@gL8be-ce
ziFaGHzYKej|7MfR$t#z-GWtQW{W;=e|32mt-WS^PVw6#=&Gq@tq01t}YWccT!qz)u
z{>rcZD$hRu0y`ta%@;o=JDl<a9kEJoSaxAR7pTx(n!#J_s;{M~tk)!O8)8++Ye{+&
zRbRR3@w$APh@_sV#M-x9%r5A%a9dT?v?&l%BjiONNvijWi%{;Mx^>nXk5HDPWNK`#
zCOT9ygrv|#fzpY(uBhvZ)k<`#VjI{QjS*8Z3n~$90l|}s60HVVWlDfUG@vvwAiClb
zkdl%tvPvtGmQ<^%N`i}G=8&LuEpZ)0GszYVheO8W(Poi0#%4*5K#V!n%e#GDCFWgV
z|6re#)*>6Ml^B(3$p?&<D0eg(N(7^&iQVN13<9Qy5Q)m8trR1gR*C_G!6>%{DSRU~
zU@0gXA85LU`E146V$E`~B*w_FF4>z5cz%4qXf)bvG)jr<Z(rrr7$SK`Pq1to+Riaw
zthtyiST-Fo1cr6V)7P%@!bd;C{{EP?l77#WQf|n1narGsnb?>jbWOx{jxH(|O~<N}
zNU(LDMdOKxQA3xVlzmJntTg6EF&|N>@BPdh0Ev*KA`Kd46>X5p?C~m4DVrt5rDaLv
znFEX2nzz?2=n+v_S{J#tH)1w-w5!C`gFTkB1zJ_OxW_lY|22-MOHzcoDwwNP7R}2Y
z5jllRN~4RCkRq`Q8>5enYfXL@g_V9*Yh?TsM&r7Ux~h5UnQMIXldmu|9pn8G%i}Yd
z!@iU8q(t*diYekk9lg&PdctZ0A<)ccn>EdMPWoP}lHeRV<EJ`h8RnGNg%qU!^b)KS
zoI@Lv%|RlSF$62uJK4J;&DaWTGe74m|Kk7U|NIC46Q6wbCjY^I{$GGnbe$(v{jMX7
zb`^zFlVaMo@&B1ezi<gzQ>O%8p?Zmm4<1^;P3J{bp(qL#3n}e(U5B-nrdiW<xzA|(
zK^b8ExB3VrP)hio+DrCReUy?CAvoGRL9H!7MVxD-f3g4jD50!Q5>cf7^GbH8{r!Eq
z_4!YI0zIK|e}5n6JtwCp7z{h35k);9YH=ayv7eqZ)Z;)2*}dlTneb6EKo5zgS!3)^
zF<{7t%NkI!7f4#~T|(LI*4#Vb@Pz111*tBc&zIc3`+&Q5-lA<CWo5axH|F`5pQb9r
z4O;cZjvU(ey^wNmfYz)-plJg0`GTXfIqP*t@}8Yh&B6XI&pur<sfWZ6aN3BNTOS=<
z68e*8q){Yk*+~hXBJbXL#N9`yEEX+o8*)J_PYMsi!OkWM?e)L}M-*{6**Mv1$19oq
z$!qRhO!?k>ceW2FiTZ%kiC*-|CJ3Dnnxj={qq%eE5w2}1qo!R(e)g9>%bWH!-n(;`
zzxVh5F`xgdpW%1^>6iJ@Yj;qE^bmHdmMfzX#csi5GR|W|<Gg1w95bjZ%CeNkZmlWH
zkhSEq7-WhRwWxl?E-Qx`F@e$AuzR?}-}%pen^J3}EZlRfhMRe%knF)^-S<s-Ef*??
zk<rdxezwA)BST-}PuYvJWv8ShYXO;t)H`DV8_DGuA||^r^?J2R(ijp6tCU4sP1mkP
zEimVxK8YTUN`~J3*%(kM19Ul5Q#_#xfI?O@$#=C2mnshaG2ngsc?nZv)Myfi`+J;R
zTri$YxR_pW{n|C!u4Q+3pVe|H@mt*DUbL-naEy@vs1;|Oq>*UMNYgJyw4o1n#Nr60
ziNgV4Mbo<|(VZ8Sir`3fCAoDM1jtVcWt2>0A6d?q6gHb7<w+H^<oY5T6wxtpc794}
zU*T~7U}LP1vJ$25I%&<(R;pDY5Uh~;0$@o@CSyXpLyC$~U1Qe`A;Hd2T8T)x^sEZJ
zb9t|jR50Y7S)xG+|GTb3X|hbN#S|8T=x5`T2>kg-=Omh0uND}ac=7qC*c%LUqjka<
zn}z%2#|*Joz5s0v&DyhQmn_z6PR|$2<|~wf;jrMwWX$-fD-7ydR4#ILE2iuUof2RA
z>Q`vmHY;D`bi*Smn3?f@b}=KVr%B3C4CGv^upl6EI8xBjxDZ$ePhq5YG$kQTN^2BZ
z{WYQpI7AaJ1WywZfBfAy2xw-jhG!1;Fh*guqOJ<Mb;I87kVImCJltrNkH;h0rlHVg
zLwYq@aq;kVZX6U$s%z}mk=MWWHD0_n<YUi#4(}aWnGG!{_&`;Qpj`}+qOciM&kzAw
zGb|}WCf@dw%_t*S=g2|~S-I8{eaBE4RDcvTQFkc6LLss)y;WSFwEKR-hM1wP?czo5
zO-+5#rY|J|K1WYF<yvz8IRz*&nF&4<(0lMqsf|43hRY}ATv7~Jkm^d?wK?}pkO_>v
zF=vbcqr`ri&ARu52x$Y3U9K)%E>rdkS^ge2ib46pvI(PBbis3cc8V!x6xOot8Xi78
z;?!o&O!P==Kt5Lt=v+1GBPf(2Wwx`*Hb9{hOsK3%&hOpB6M6oH7YJVS@X;Jn;&8a#
zg_U<CBVcZC0g8grutu#G093Wb$Bus1_Jd1qO74AUXZ(ccm3c{toOblO<!m&s2?3uJ
zt5#Au7XpPX2w{y<DTDT5BY|R#<=VAt+`fM%V*a^wog$m)%xDNsA}t>+4;~!z<3D`^
z-vvUJXbxSARYJcY1W1u*pT0%AJVtw|Op3Eglt%N6NrjYHH7#dzQL0@nW#g#JlJThG
z#+9cS4=Sp{ZfF9slPA3M+bUF^w4eUery2c|Z*g|9&e2eA?)E_%;T0V0O%Rod#Mxqv
z@47A8lKNRB96zZErhYxo3<$LmCDhvDT;Sfx85grTqv43bc!w{1`bDV_wk?CfK!~^A
z5lOU7!_IgQ??nm-z`Ks3Ea<8VqfO?d2_wHZC-ouVSBv}}w2P&5PV`Y}%$qnOcImw*
zc)@1H{~&H8vwOLqkfnt$%lU*9#d|?X8`WoCzQywNn7{pNf1AlL@oT^S1%C6l|3;R>
zN%R{1J<0n?45e*;^El{#`L*r8xfd|$4UpdxptrG0+Webx_O&gnYoW1(fK8bt*mXT8
zqZgZ#G%I8$7407{EkE(ttUMnC>n{Jv=8xDe$x;GGYtYj4cyfNmXm^LBqeqNJBmBh$
zSj~LBVti>~lm#S*^=Mg%b3u|6Q9emuWBy*1S<S1pXue0+advi&_lZ^4vY5{)V!nqI
z(XJz^ny3{zZJ88<!4Rc{)8e{7QJM{?UzHWMw42COrO5PRE)h;lXhSZe_gJ1>UGUkq
z_cG}i#l?KVYp=aah?<ZTi{&a?T!|_}41o|OB?#W}==c#DNhMdyrSuOfQROU*?8x(`
z<#fJgzH(SSVlv*#EOCvs23r-GK&nZ}Fxi=qLL_>J(N-GOl}v`!+A*ImnJ<<smK|-^
zL7_R=nQ;B-3FE<#val3JOBGH<q6-_UPokIa4J57cA+lVyteS>mcf@+R7VY}nV5OC!
zG=@Nw1vX<m&Uxltpe%D#m1K<cV{+ZJ`Dac2&zo^E`8^hkg&24w#qMy-xEf^ogJ*U!
z$EP3?)j_0byceYl=N&QK#e0vAS=%Y*`-`~(t0V#v{+&1;p%kYNd;P3_!Bm+hB3%nc
zX_VShH#R+Xxx#9*Dk~(Sk_f-w^mJd{kK$37^5(U-KjLt5g9p>^QkaUvy&c9+-;@n)
zv(Tx{^xaPDOY{En5^(uBlL@Cu^vq;<D|((~ZajUAA|t2BY~{2itj4|>9-V>rgauEC
z5u+3uPmC?f8nGW&j^5wRU~{uz;*y1HUNQS{?t^&BhnMEw!aQAKw5A?I(FU}kR3<kx
zdkSml6{Ag2;+u8u`p-jM<?m7b@|Vw>9bE+M?;EwXq=rcod_*ftOpeaUj#XDBt1Mw6
zgF>(gojnevky{ZXtXB=gy29sDxJtsKQb60Zbj?CKv7BS4(2NEpJ{AN5I*H|XkB&B0
zs0J}BP|6P@lQV|EmAxH4{d2E!^pziRzF4zbb;Pv;t5Kl>4=yB`xI|fKW1_Z}M@J8F
zog<<7C;#G4`Sj21bARf2?cOod(}rL9l~3}_&8IkO3Pyv1X6;cXQYEqoTS8lnQ4r81
zWtp!!=F<zNbH{YPV7i`B+LD9G0avdcu)DiMX}889N?W8?b8FTbE5VeMQF!l|&1Ni?
zOU`Ev)7gqu8_-3?wWqFer5eC!&AgTIRn<dIFD`_+Zw!x4X58M{;d~k~Du|0xN)W&r
zNsSbd`C=}(NdbjX7#$>1&|+FU9*syz7Mk5*oiW73x>@t)-P?3|w^A8z?B}4;0ufY3
zQ&^oT7awl-`Ji^bQc|s!R8&2NVG{clH=@*bgH}2#$EpvXo1{tj{85EYxuYOKX$>Jb
zNRger35PeYP=2qb8V*p#X8h^#Hm*&C)h|4k81DVz73y6Sm-+=$%vJFOSy0pG3b!^I
z)y%+)>y(`Ia^E7`)sah!n#)O|G1$@WKEM1Mzro8N`!u5=Tz~c!_KRP{T8*(574(K1
z@l%ZgdRGkH|DgRh#>Xx|{wRaJ+UC&DlY9=zOA(MO$^x}k1eZyPS_>FgSV(Z~+O_Rd
z%|B#5=@Twa$wHd*a%Bq88e=PzYAMX)Gyr1^`}_NX&uP(MmmScdbLGf;$6~R>HGwuJ
z^eC5gGf;l(#x-<kxw^MYB}`Uq7_eRi)_#Dqis&P42QHgRkQ|K*G+if6?5U!Qp00zY
znR5T^f(I8BKJM`H&6=ZD(u&$9zWwzdaQm(IcyRZK{k?szU%f`?G{eCT*9z%toL|g%
z{k@00{r)3VSz$~;kw$#w_g=&6x4D15<f_qhbuHp)N;q9rN?_odfAW2f-ndU_T8h+B
z7)4!a29=>{I@asR;gvu!I6-T$THL6uDP%%eOHmb@e#iM@!GrhjFdB~-)HSR5g30bK
z*KQ2i-{0fuK}|9hhc~ZdDwrNMpfm@22OLjl?C<V!u~-5LYZN*(oFCt3IGV7xWAj|l
zl!c`(4Q<=9GZ<u7aKm5wm0#l5fBBaPPFlNu`)~er+<HM+OlcMi>fta)3XwsfxUxHB
z*@VrQ+O#H-a+)oCy~2?DI3-ijy<#tHA|aL2-G1B|V?dXi1<QLc7-9&bo@<KDIDbry
z`3Vcw-SZ{0rW2E1GC7vS;jrT7-jI~N5q9?WsOws|h^EN%DXX%4s9&)E4ld2RJm<^n
z{ODU>XWmx}xn#1Mqo;@f_n-XSFEJ<+DLV9H(9lmgdJbpVub>9Inl4Vh_qDGb{_lV9
zzvtDLuk$zl<Np-p1IH&v*jfNYLd2^?ie93O&4u?3k-d$z$!o`xDp!vaz=(Z2K-SjQ
zNrc3c=b7s_dAOLOl|(y}$%M5N?W3}+INaYCqer7Ql_|*sbH(E^zQ|^@<Pc1=yL*+<
zV8qGAjJ5AL81GY-C1)4spcOl1K?p4-8B%g2e<>$V8e5Hd<+&T2wTg8YxH2jE`j@`K
z@BP8os7uSWon5~7<2QKfV2`F<F`F;hn^gRxKl%=3e3^sEnE&H<zRssV`8=Qh^izar
zc<;eEi<#ruXZKi5TYmJ~>wNO#&#}8x^PL~O!}VKx4C+L8wqib=a=u6e6(}`){^x&=
zld~Da(<vwSAMnPV6W)LKE|n>`eq+M7e)28_ikELp*sTJedg&@xuaDS0xJC$p@s&fq
z{{08M^-uqZtA~fg7<m2tdxFs<g;kor^7&i**0236$z8BNp3t;Qjvh{V;e{6&jSaqS
z(I`S{GMtbXdJJvT;(TPe_MD%evuZqt*DLl9U!<^w^csf1wSx(xodIprGF!H+*E8nJ
z3)+<fDhd@T>zcu;V`nsBIbTT?*gID96;(Mv;XoB68eY9QrZ$F=)l{}%G}+_i-n;0O
zqaC1W8ocu|wyb4uY=vVN^Jba?CMd?E3EH|m3?eaVmM+rxBw$N!a~c#SqpHX{^Sw^|
z=3_DxH>60Zyno}}6PBG+R(lLllla0%ZeUF&*D9H?eRP)6c9RzBfndN5YaXpT6eT|D
z4L8u1ksDah(%w}KhnTuXX?uygXf9`hmvX^=3iW_~Kj)-F<D1|31HS&|4<*w;fl7=9
zHOpm#(uz_Gsr<kB$j2C6sYpr+Uvko(hjl4>>lfla5~b+p?y-$A++VNOhwr`j9#0)s
zS=OZF+Ra-$O6MCMipny+f9WG-If^G8R)BUj91@*lx>}(l8}KouB--!U8f!kEU&6xr
zl=P>ZyD!D&2uN!~ijlIaHmw$LiByMTHlK@?R<4vN?{Z}{0v@d+T16JiH792?M#WVQ
z4-dJRUeE#e?q6`_lQ%h^O*y()Fxfev?G_Ad$KL*!$xg*&w`6Bna=1UF=`=T$=6&~w
zdSKA8U^vngWuPpftYsmWon2HyeSoAAwkUY;-W`1KEY~a6>vf(an&+Or&cFG&XZh|M
z_qcj>!WTaOGCRgI-l@5F_m~!;ji{pwy0vC+H00S^H+b~uh?|p9mb^*05U6d<?Kh7(
zJ$et7U_2i1)Kdq%{@NRi#v^7k$Lp`(VK^$N2PJLeI6uE&-L%-kQWTcOO8N-L!-7{{
zc@A4ERzC9f+i!6(Ut_9*YB*#zn{#?{PSZJVz3@E8XH#~DLY;`d=STGfO=#PO+qX~A
zCb7RimdGY4UU}vkle(ZlQ5lP|Ly|RwB#qiJCAzhvG-CB`P}D`aX*cTUrYa0OqcMS%
zj1?kYS?-;k^3K^3ZFJ5CG&goCe(@tW5Cf6NqlmseO&U9-uhS>R*|KBpI;<^lE@Yez
znxvSN16iDO9)eoaQ+i^IvH-=1(uNQcD;HRH(zI`kX4SPM4D%MS5}x@KscK1ib=hCz
zrO@qzQO}2hAhjuGXr)*s$I*HvV0{GNwLERF@^H1vSY5=l9WHDm)a|J@HYXqcLiNGx
zQTHt=-cO`Yg%EL3faNZET9=5W#u|$WiJ&7cR}i<3AOaF^+HZPKHZD~Q6Ointq`BE$
zR76FM9}Y0K-0HAv%hA~h&N-T{Ln#Xwyzl7R7Fy5A={c&Z!8wxgS-JF5RM(@DNSQYE
zH=iIz0ZC7ek7?Fx0oVcO9F?tTS1oOb6h)nPF$d9Mlt|4)?+H;Fq(jq*jk<>6z%m+I
z!a5LqVpt3a?p(ma7>F(~stXE}sBA%979_N2BN7-_jzLutx<FkSLR2Iz_Y_=5RC{!O
zO;QnMYn1X_ozyIvhBw~5k52}lz{NyS)<mCp@4+cw`Ie%LaJ7uQ{l@z|bK`)$on5No
z9(Ue5<Kcrd+UU7{>n4RYj0XemcaBL_q6<ye1vHWU$sX&~in|Y|+`2a6%E2DHqk^?6
zxOTWhRnK_)9Sv5|IKkQ8yLU!C)V%t_%iOxL%kskW;OLmcD<eMh*_U}VU-0nJg1Pc6
z38*e%$0Jl(U<L(MVHodBgrwOy)KJKSZQHUtnNS+x{}^LMsLv?sLSxZX)}pm#SPn5-
z+KP;l6tC|SO$4gRFq2wUp0+YhoO6(p&`e@tXE0*fHH4^8dO#%5Xe$k7UPJ|r(JY-I
z8Y|R^z6Y+yf_hfHlEon<g*UKrkv1Z&V@j;%w1T$l@B`@)O^_Xp47#@~QkrCv5U7dh
z!ZIEW@aJ<>43efs@H#S?9H1&gazQ9dRVm_oB%<rdhU(JXVUyB*Xd&4gnr1QO-rcu|
z2=yZ5OeSh*dmuf4j-J<k_%)vU)n6B^`U3$*`cS~}B$!9tw<vXADFF^cZVDwOe2A#b
z>we+Im$>ureX;$@fb>==VSDmT)U#<6>cMfhx%bQ9T+*OdPV8u-CaD%RsKxKDDA=9s
zG9Hd4!pbr%H=epdT8P>xK~mJMgz9z&+tdVN4_`^;LPf#jin?NFXNM4FxAESym@Sy>
z?9i8(Qf?xa^TZ8XUnxaZR}4pr9b{k@MIi<TZOirRS1F2utJkkFZ64sg<KwTs%KE`u
z_^c5$84Yn=mv@m!UDvFZCmbG*Hr2OM8*E{vIuzSYI?%SA*w&ASOqVNOfBkjrV1)NV
zZ<x(yL?UgjfZ9Uy@N~}58jc^H5Y}gOMM*#y|An?(zkZGM!@F1u#u^$eGA=9M;k;+v
zb$C3^dAu^LTF=AtmXk*dW~-Wu#heF^rab-3K8J?~)P>{9Y>BlcgTVxs47ZPtI5|Dz
zXf@?gyQWz#!3=3yN7s3Zq7wWjQvkNk&42M@BW;t#A3r4Zz!osReC8hP-k4?N%9ctA
zivY$&Q3(mtC{$3wpSxTMLopr>C^Go|!S9Q)Ck3Z%gralXRn7qVxuvyYZ-0*znvJZE
zjB%B{Hf4<WX=l$Q-{4wm>zZw}5wf*XprsY8tSVAU3~h;3KP@}?;DeJZxO~*ZU2Z+|
z3O_jg7BRA+*IYh~Ezqgt`IlZLs+c#9f4$!|ANMV!`-voM;@;C9myv!&x9WJ~wKt%E
z#cW2~HPltTxq}|g>MNI*8L<j7b`(jWFRA2@#z4}E&~<nps3yCzd(<T=B`#)DRAC{&
zDyKPRRnat#_TpUh*Mk>+22yR&ij6gulJX5CMZ1_%kM^X3;W{V^7W1C}l9*1Vk8hY4
z$LVZAPqH*dnwX<&^I(!Y8`c)3*4eQcY*A1YB}%O+Y#~JpttiU^?*(rwtj2rsN!%G%
zG+moHFNwM;X*x$$YJwAs?to^oUbAQ#^upqGC4FSxiwjW_GmWGStK}M%k$~xR21e1e
z4Q6k|csSyzJ%zD`H{QF)Z~f-yaJJ<5d`a5`+8~^swrjbVFKN1t>0(LJiHO3*#B8~w
zShdVoE%zUu5PV=fDQFwdt}l4{nOi(~WVvzuDn+TdcXY(rd`YsN_MP`o%5!qI#JQGX
zEUDLllq@Mme2@~q7;$76pl^SI+>|X7JY^E1L>+x(pEe+N?*=5Qruj1}5p|aBN!!N#
zo<7iL4gGPMp`TL-3Tr7%Nv9ow+*rOd=4jDLkE8F4Ljh|vDXQGWeMv+yH?O6nHyfeR
zvRJCz#<Z~=%fU`j6uCV|rq9-BHqS7X7eu8n+HTZ2`}<FuXfj8ZO4GHD;5!tG%9_W(
z`#<aG)i|V(Efvg&q9|&tw)hlDM#fT4A6CdUga{OMuB?6#T6)s=_rcDVk)RUyZ4tx$
zmtT6G|L{Ngk2u&Fu(!Lz$3O8&mN(Bh4>L@09q$5*^@5k4dY(c_50PsfwvdWj3W20l
z4xdAQnrbtl08t`9(OJ>;u`b}E$J7<duf;9HM%IfN*AK3u>k3m=L?4-5oS}?VQDzr2
zu08XNEIdR^gycNUx}h8nNR`GSiU!&mlvcPdQVwL0h4mVx3_2+WWi8UWWkm=ct0YPa
z>lMj)(YMO2N!@ftv2%^6I-Y&{X}<7<Pw>h#;bOtSI1UcR{MDcT9N+r!kNLrmA7y>1
zL|Irm=TI?FT7`2C9}=UTlH=1EDGGtOG8M`img_aMMP$~seEY|5@zM)Vao#q>IaIq9
zE(rIm7yt7iFkP(W8OKOSiO%_rd`iFrn!1t-(7H?9xN(isRRgCBmg|n76kSMM%obcM
zmMqpSrmP6b(>7u)b}^emiY%Iz!z;TSUcb(j-5rk4PN;?hrYpzUe8%E-L(?s|n01^k
z8p^_nc|>6)35${n#gqt2+>@n}B~{5xWg{ku^!muSpTsE%v2bf%n#WuS!f`@`0aGSP
zhNuWCQd9-W#Y@AV&39cc63E2dPN1m3lNf5*aCFd^6vf#ooBWEHh1x_r+8ClwoAdVP
zlWW$*kSCx9tG0NVU{ihiD0=^w6*;x)l@_+3eMljbjAgOvZOK%Q*66bfw%LJJhS6jq
z3!+vVzS9#{s4WqD^HN>_B^m*(D3m}+gdm1mLG;o@E=k^3N%&wNT$<D-YTLe(Hnb^O
zuzD&Kr2Ezp?pL+t^FRAZ9^AQ$R|!>&*cq+4{nk6&d}hLIdd!2ncL^{445q3HF)>|T
zu(!9D8>LN-u0+kj*jyeBAsdmx{GGd`R;n>}JfR+qST}2`dce{Jb{d7+wFIL%ymkY3
ztQqa>5=+f`ddg(9LkNLC`Tn2q^PhN?^>l#=9+O0fENVm7MFv{YtQY7(g|?BhEU9n3
zNLo&bD6BHn+Oj{{<;vA-y!qyv9PV9VI-OD&&5KVz%a6YQUFj|JZsVI*A6%hz9l9K_
zJF57^(^ohdt=PNz4Bz?AcW|pIL(_8OV3(hmv+aNnk=0Uw*<>`%c~S_B$7Ak4I3uOR
z`Pquabir)d^7h?_oLqPoA!423V6w}=l-#&}oqK1q4SCQ9kF^%pIp*^@qtR%iE7Y^w
ziJ~eHLf~Q^uv+%SF2HQjvTOtAi#4_$Fl##2J~AARQ4}m!OI+&7#EH>(%+=cR=;WBX
zu34^@+&@0!!RaHeUKz3O6z`u-8LtM|Qm{0i6gJ2+h-O<r5wdF%+(q>)?UdQuVI!Ux
zb5Go#cX;n9HW8MPGB>Pv45t?t>?^}$lRiCu&c5IhFHO!(+Nico{Y6nwM2Nwo;^l>d
z4KJ!M<n(yeW!}}s3EAk);v_OaPr55<E7EHF`4qO--7AUc+=Hio>UlnVgcvBx0_Pl7
z>Br9d7dtM)L9z%=MgyEL2r6NQLv&1B-#s9N1Sv9@?0-PT<S%oi`_`}K51Pe{yKlYD
z?VtRRr#|))DruT_!Nq*Vcs=A~s+i6qi&dhX%5LtL9cd8gR_#{DJ5Q2mq@>}Sj$%;J
zG!3dKFg~(eEYW2}tOuAj;MyhnsVl5b&KX|WM=MxO&$td~S)Tv^AOJ~3K~y+Cq8tsG
z-96|0bct3&ilSgTn{qK<vA%y7qYEZCZxG%;rfXZukG#a}y*mtU9Ma9_*ufC5G~v-P
zq)yVTBC?oW@aVxYwi@&B=#+ZA&&9=pVNu~)&uX@$Tdaxg8e=qC8$1eCE1c7W0Lw+-
z{@rs9Zhee$Jf>}BC#%Z=g>C7a!XQ<x)^&6NDy3;!&!h7tcaG0_xL)$zw;uBF;VGl>
zA*a(h`+K{1*O5}7jWA!Wn75I4A3P%3ApxEFwMKYOi26W4F&GZ{<SReJn{U3!&0Dv4
zc;_BfJ>mHH4#rr@(y&O1Z@qJ$)zb0s^qk{q2TkJkzxoluM^>#TD1}SXqTzFj_S)O;
zaWqgYmveq{FR^nm!W5R(DzdX*(|Lzd9;X~iRic7m6sfW}EvgXf)(Zw}EUi-*WoUxK
zc>_9<l*WZb=L4M=GVl3(Nl{dyONOO11y}d>vvYO=4U4v=Q~`V>OaoW1i%D)5Bc8zF
z{sA`A3&gFwhb-~}C-V+e?1gDJQ3{BYcq&V3rC1?mAkK=XWnnFzgioDlndOM4C}h(%
z%3x8KqBl*_QE)LJP=HZ6wU^|iEJegxCyl~x>PZ^4Q62?|DrEwX$YL8Ug@&@!SOzqq
zqpS*yHFQByMoUtGDvA~Tq)?QFbRVQ_e7lWo*hFMcSUB>3((t}mHw=r4lZEv7`V@$I
z%*rkCAyR8dMJal7$z~buydm`b(My|19}#XLvkfuiflVpiR!S!$hW2uic~=l^aw}~W
zR#Oy~Y9c*xwreoM5jq7_CYY#%l%1_OrudXFBN1%VRZWVX$z;U3O_T@w6r&N|dnhdB
zD<7py8W%l9Vfo0bALGr}Zgc&{b;@Ba*HM<d{NhVozj2kr7oNd|gdNt@Pd|lTH<-#`
zKK(P8#SE*Vs%u<XVrkKKKnjU+caO52Qw(cHqY=a5P@=H9rZkcgR&|XT4=4;`WT6DO
zv}KJdgluPek;43(v=&9nloBt!^c?5YIX<kgg`p@*wCgx+Jl}cujBAI9w;wK8wgs=>
zpL1<@k79R^HTQV5jNDr^v>sL=@~zuPTqIa`k>pxdtw$G{$$;F~R?&4rA@DvB(S(#Z
zJ3U3AIA6}`f@j)9tkX0B{`r?*V`oPUZs%@^i9>d;9%9Tn-utX2C8?Xqtsbkjqis8U
z6KHWPy0t7mAyAFh_|9`aYq70@)Z)BjwRYGBmW^z3O_r%CS92DN$e=a^;PhOavGqdI
zT*2rdCB^!|BOKtCOO$Gum_1g@CBxx>kc%Rn4@8Zq8AQQ|y!X^qB@-wYz#<~`-3JGv
zJeqN>oRY+(Hm~<-l}*yVQz%8P6+Q{BXO!52b-oi>6=U$uQ`!ROWC62E$%IYNL@^S!
zN+Gpxg*LSmpNd+fUu=oi8rM0L(hRiTR4@yZD7Cmdc~W*I5}HO-fKEI(y<pKsRC2VP
z=&RYT!`eh?429OzN@HVUSk)M|i^pH;P!Ye<%q~_;Pv`g)>0Ha8mbBQ#DJ!MW5jyv0
zL|A`5j+TIT>{BoQyC>iK%K!R}sEc1HM`L*iF^DN<QYfowLLwUIa!9L^q}F{{tNNHZ
z_XwqAvk0J&)RZYnafO}iky=l&TB1vhcVGtt?EZw#MX)74MN~ba?Hr5coNM7aCT=-k
zUI)rb(R2}O4Jv_;iehJkDoWPpQ+BF?paP*Nv7IBv7D6p*lp&&3L5Sicn+U|{u{JaM
z6&v7EYmH0N+CfOTn4Mz^i6F-#L#Y~uWy#y`Kj3uUp=`l}yZ0dDUsv`j_I3_9pPgf?
z5mPGKX~$r9pW$w#F$3P20<%*_*Pdan;Oea_BrQO5!1Ch$b5w<u-Bnw>mo%tLicft)
z{4q$<=h*sybB@(&fp1!jPdKG$mor9_F%zx$tzY{Erqd(-)sOG7e=w2SMNu%>AET^d
zFdk4hwcs6A?jvfb${j{KS4hDN?JvpBymSStRf`#n@mZWtn-Sv*FhYIN3C87MGd7*p
zv@SP!*TXEGqw&$9Y)Q;*Fl`JRT$zwk%nmS)a$q@|p7E*Ae2UIFy0wTswyTD&Yw#}6
zxxjL|q>PHHwD_{3$o5f%%>sfs1>Fcl#z<%#)>=aL8PG~m5V$rPOPZHF&U*@NxpRKO
zvJEU(j-p5er744<Bp0ev#KcIIX+BbjOrpw>K!wO#^BEV@mSCkpx(k6q8!@sCfkH=g
zX|V~$MTLodIw)h*6IiI0HYTQ>=H2O<m<n9yutkXvfwIuNa%~r-0z0-At*pXQ=tR&8
zrNX9amonA`Plm#`3k(QBJW;5EpSk`FXR|53YcRINd&j}3V7e-@eW2#ew_fM7ue=~w
zT<^QNS&h`C6ZgfroSvIR3i0da@ZUPgBJS~bQcS;K^5ERqN#*jY^h9Nmx+h+FU&YAf
zN|n2HHhDeSl+-f5euZh<NvC?}sIE;QDvbA}VFfNwk4N18!4D+*`oN*J-h|@8Ib2~R
zBHWpvL!@#YVK^kF2CEX@cSKWQlp<)6Jki?7&eA`uKJ@LMUY=lG*P*htl+p^U+Ta{T
zQDCh_8-r7cE(E-WWG!Y?6Sc6b$3?-QuIXGy*L8FrI>d>nODzv)3sUl%-8^N*hNf39
z^=1p^W}L=#P82WKoq+g|l{5?ira)Q0-bXsuQK!WGe2y+^8sE^mggslKG<^FX{*I(;
zG0Dbbv_urZ@pOq&(6sA3aP%eu(HUIs&Eos2kv%$MZ!#gqz-%@XDHx+S&-O#3U+jx8
z$!v(QeZ#%B#RjMAKi4Y{)Y)^Ocj9^H-FN9t6k_N2o4@h}MgvW$0@mExDrUf@^ske&
z(+I{FGeEp``AI`*BMB*P*zhVkqE@V&CsU|+?dX`(`5I+Pib8mX&IKAJ1{X#4=G031
zL_uB$!J-n8WeWV?-~AC@7aN&u0G}g~=sbg}q%=ZmEtSqZ%k4ldOo>*CwF~_2YqyDP
zg%kV2j18ViRcGbVzQC~EnE!tr2_~ZvAAjz%eE-hdw5~;A7>qPuc=hA_{`bF63@fzO
z{J|go9)Ihv|Asi_Y?vBb1&0qF8+MfUs2G0-a(7}(>5EP4|GTD(Qe9C&)*YRle~q|~
zgkDiGR|&-a$B=>y=%gWPvz4+{hNP?*T-t;|%kCEwWz%4H#<-=!wKEctRi_y2?yxvJ
zr?&#?f5bolA~q$4gCS}>V)53y)ZLgc7{Iat*U~OmSX-cnLt@vW3^@@nV8ww&6ERAh
zbxC5bDnGw;=9gswN~4QP?vq5)29pv&L-Zc!9bMz_E)c!JJ6O#fc4$~kr$l9QdXx3q
zeZ+f5O1*{{q8qLhF+ac13)lz~L<Vh;if4==OBhSTZj2GUu<=V}h^Zw-uqk0;AY|-7
zYsL8B04ggfV+{C9jzB3#mA&v=$dbyV(NOTaLTDX*PrycIS}8&l1Kt!9O|ukU&(1LG
zapyr8GgU?j#4N7~5KjnVeo@t#SESIHj2tqjPNlR#G-8%*E|dl*(a~m~_JQeqifb)e
zS-RB%qf>4!_Ry=;#v~X^2IXUxg;u>pOOI>iG*BzW-p-I_v1U16aCq&2WJ-Q=?-9Bf
zuw1RPCYYw}9D~wgVx-V!v%vQR(iHnDrN`@nA0Ho!BU2OuSouCp=N*QG^NvE-S^qX+
zdW`>afgwh$GCY`H@czjHQ(L+iFj{^$-+D|5RjI{V&Pu^Xp~XNIkz4Mg8g;p=?Wf>Z
zX#*}r5<;>0<~P2J_F$62<2gCMz@wN?TS_a1kURI@;r83F@zPU=JidcHRwK+2USBRo
z^zKsn;%346>@WYF*B;&d^6N3iR|exT5AXdBkIv4CuFIY2vWxi;peP7F5VPBgLg%g<
z0S-x04O3c?Y(cW64A{)IF<3%O7&|~$6|wCYAMTObjxgD!S*@t7!F8f5-gRqI^7PIo
zMaI{h3z*@MYHyclOH$Wi4|b?0yTr0$bulH4tE@h1NY;`lNUdk64F>SeiRpnBdEoVY
zPKp6zG)>cD(VHHv=mWZp;61+Sa81j4)zCIA?W)6?j&|ipF0guVMDo3RO#T@zIe#c}
zfuiqJzvRI4;U948l5Mk*N6JIRZp*zJsg$TdI<+LC48B1x9bqLxYKFwv8WNhh&x#h8
zzSH)LSdOk@`(b=TMd9t)OA%>5iOfpKu$$|@+^pNr1f{a%38G06wvpIoj$~X#T~<6W
zDgPtUCWS1cS^<^fo8SMgs9oxc*~NmLVSx#rkyVUqEfG!<Fk7ze1CvH;Y$>95g%JV2
zuI*^&1&1GhmHpv$j^=aTJekpMTE{XcEJ>P9SxI@nup4fo+?UF5ix|DmnvSpDzDrpQ
zvs{o+IAV-A@34j55Jvm#D5fn1qK`U565i9d-+#ntXTYNEvgvN%@XCavhjS4`RI*r$
z6trA-zxm};^&|61gK&HFczcd~HHxlt{LxqcCFc5&dQ!1oEb%GvowwiS>~zhw8zqLo
zjVp(I`OAOEi+}6ir&n@#@{t#-ym6?MUQ;*!z1O+?so`Y&MV0uw(FZJvD+jy0e{qUQ
zO8WSGz<Ce0Lg`HG>%~yA`9q3=Cz-M!ZWb&VB!1y3jKRA=!k~sDq6%mgVAavp2JM{4
z{uTuXdk36fOfeRWm4T_0W^aEVYpmFsmnDl;!(@L%w2tH=Z8DTaMJzz;LNF?0z!stb
zUTRt;5#waC%l`g;cC1Ns&QTU6r7fuk147$vMqDC6>m=d|Ay@L^rjlZ`!YZh=VNzI<
z$&xhX;|yw$N@@aO{9YOuY7@t72TX6&(3j99ErbrT%ufEh%x?-n7XuCfkiCzLj724n
zQi6*WHsDi~e$6EECH<u&WULrd<VkU9F_jQYFg=}LRI&r=JSj!JV2iQX4K^Z?B1&G{
zwx?_fhW+0Gn+Dk4Em7`WK4UgeLqr>Cz)i}4vUEOy8L+%qu`?J@D$l{FV6V2hhfu0~
zy}Cv(JzUuW?>(#ajFc3G0-}LIjWL#0GpC*$^4fzFet7SgYB*#yT~cP<^Pcd^hFX!h
zJmY(<s~8o&ZTR~8M+9Zjskdp9Yg#Us^uCvMT}f1Cw&%Ef#1v6U^Tx#yw=WvXLg6}(
zEesI(!Y_W7|LY(BK3WwV9v%{xGg;tbB7J~j@Fd0ZzsQk7;PmXAb=NTIN{p#R`4l*A
zSIjP2Za%+*ThDp%+2{Dl>#qrX@#iurwwp2V#s1aJg7wxv`)6N#@6J1acfD?Kwq~_D
z<#VsT#MP_UcyaeC>ldEpV;}n%{_IRlL6-}<VU-2OgjW(t=nzqzmx;b!692#6-aOd0
z?5^+otYHslxbvHb?tVR}H6bK{kT5ob?ZN?70mcv+WUxbJvYnJGAypYjoGLrE%T%R+
z6p5({4%kc*;1n1e1BNID6eJwcAgQI6<euKx_q}(gbI-7cHRO-q+WVY)-|JRO5v;27
z-o5AUbIv|%ul-xU;rsi3t0uYsHM9AQgS~yUm7VY4mD`L)1Db(C%{+>VX8(Zo^E>?8
zk9>ssaK^#iJ*JbnL>6_+^%q_ySB7C`dHTtx(Ch0Q-nl_pl<2`2rz^tll)73l)rPWd
zXcrZkK9*9uGPwDS*>uLioqJT13d3A-K`kui3yu$u*nQyzMx(LFeS42J0iTa>ZOgfh
z0nKBVX^Y6#xgl?`SFy%Wj^Oa6+l(_sh?*EJAp!ro8&F5d>4^$Xx+E(s7Rz-br7fjb
zQQTq_To75T%xbKGPR&JjTt(v`T0=<e8M%$<Aef#k0UZMx8b=#4VN}%sp*Ny_wT%Sv
zj<kxz=pb=7p(IywDkFGe!5MA(P%_4j!dD76+B~?0_e_-OZG<j3fsgTY%E4F>KQ&rB
z5g$BSgJ~mo_NEL*hV2c*xzRegNe0g5*sMV5Op^Gn>wT4*-)O^{*?=ISyN+_6fyhQ#
za((w6cP0~xvSdE1dG!2QUOAYcwPvwc2zE?G7Ij6DXKDT<oL5Q_ogx^`o-#al>wtWa
zGnrJ3$7AZICPXg)OvHm6ZEq2ekBE4DGU;6&6A}<r8-DNQeQcqr+m@Z3HIAnXE?qvu
zM}Fu3!J^n&U+3zDi`>8CP|itcs1(r~(6*O&>uF_rTM_&303`fcOgTuEItMh(V#4{$
z=c!%AkQ`$TaZ%G8AG332DC^9%w63Peat@{ownoF{MVCol`Mt}3_Sz2*8m!>=KYH=P
zXjiN8c@-n3cmtWvajs!)oRe*y#V(F{@wtyfj8siS)lASXDT<)_3zsLEBkw#uiu&>7
za6(oV)YXFV);6E|qdx%OfEHTXkg!^A(b9hUv%KR?Z=&@r*1)6Zx5x);=%{$d(~mK$
z7G#;>#TP%vc(}pz_yDD#Tw4?C-L^D!!{IBpDRM<MU631%F3XfeSA5mm-;B0~D;M8M
zY+AV`Rfe~kcfRAz9PHl0t*v45OlWKI3`QHwj~CqCKji3m!I_N>4({G1hRCdGFwx^<
zO_n2E_z^lCCbI&7>=MjNijd9=TRBD<9MUNe5))|ZYhckvLKDCWcUY!7gAfT(Q=nP6
zNb3S#Hw<!1p{4oPXq~v^wWyK=1-WK@eKX}f(&FrGNf*jS>cx!tV%B?8;80p)&?{(U
zwes(>`qSm@<c15P)5*!tIQg^uzqYnPUX=3UL|hlVC_)D%^Jp|Q^_2O13iAa!+iPSo
za`oH><1AZ-lsf14U%b!F!z!gS5)HMIykv-qZ+v<iqaD#FRCyHm!NBC)pWNf1a*VPe
zPhHvKMiOO()EcHcH}q7fsZ7dWMO1M7#wTCES%YtCo__i%p8f2<>%pO2zDp~GwFP~D
z?5WXh3m?C|$NsEFWtwZ(9_7~UyFkmeN6zty`+FE*F`IJz=1nr!FfbDFgb*a$=Cmx`
z7dE15FgB7!MbL&vw$7jimix!YC=A7!mQYn(I(v@YS9Tc~#c%%lZ}6Sp{%x=FjaIfk
ztx$nojQ(i%TyL=6`TigF&-{!3@fSyV`8Tssff<zerlD<G=JOeY(U>b&u5kC(4Yszo
z`OOdhJa2jTy9nbFA2en(;P_yl?X%~(c<wyY#f&@&l{T*BvXZ=3+b;P1|MwZ*_Re=P
znH@7(%rVw5Jv`*h&JG)!Tg)fN1RuD3{w#YpZ?L(&&17;+J{+>Ye@HRP+1T7*kmq0x
z>-Aacx@J5cQsf2XhP$7AfeUYXl4deva{nGmY0f?VB==vrOTAc776mu%+`-z6_02U7
z_V>|Y!SVhfZ+!A8%y10BGmnacW<fC;@yeZDOkS`cP;L#W9bA3<G44$#)K$fJFy;?G
z_6#N;NInOR$6-UnsDO#mP##tCRzggP*^^-($mTW=iaLrs*H)3!6*5~Cy3}|ynJpn!
zfJ&Z*V$lXktQ(Dr1*5`H;4xbI+fv6Zjkdz)WHpnf<eAUhP8xViPp8x2yR<XrE3OSt
zAxVBk$zyfxCZ`S7av8=xjny3z&}1p;-;I73_Y$@#L|SS%8uFn}+~%ddBTVv6eahuz
zCZi~FuAJTEtKYDRjswbK$a;wE?j4BCRZsT~Z45lWyU(4YdH<Omyg{Ykj~?CN+;9lG
zP9BCLQyH1DOzM`A&Ct$serWikn@!3uEm7{yE1b%t5joOV?BoM9^C~c@S_%~z6eV}A
ze~zKaaM4p_hSmzlTLkv^_c<F|Ow0uIs+Y>z3gP#^wYSIF;gGdbGn`F1#Bu4$6>dF$
zi%gY-SmA@GsT&F%Fgi<NeoQns(o&~<OYqrJBLTJSVeD{P$@_~+K@>s*6+9O&Z1H7J
zzL#J6m%qZ(k3UI%<36AL>~HbC@BJ43_n-Pro_u1&OV8fo+yArg=G)%)-HfP&XI`1)
zQ35)#6s#Jopo#Dc_WXPMo%}@R>*(&Sf6&<c`&7=rH;%>$`nay<O!J&Eo*U18lIGGy
zE?(JT_odGWtptL)t`~Ef!H9CQ$D*kjjz{P+ha#gnnt}pX&AB?V9DerWEL_8^UNBoU
z0$4n}&(s*^^J6)=!%OISg$)hn=#ZnT=KlVDA<N(1W~MZbNK@5#A9(VSOH_@+ltXql
zhxk`+F~4`8vZ?S<a~LXSdk1*un1_Ix95bsb>P(bo43WpqoWosz0SwfOISU`K-czov
zv4uem40mqd=C}U!M``K?l|}B?fkmUi8;p*atb|0kuT7w&#YQL1+QDIs(CE6R#oA^6
zn3S1QUMQyOW+SvA!(7VI0a&=mpv);UgEBdF-B6Y#N*U@p;G;)n!fuhN2Af3+tuP7%
zA1p*}Ii6r5*qoV<94=<UD-Zo*?UKAlQ$;yCLt9OuYjKH5xn-p)xXeYRf&u}Z@>E@V
zzlV{WGFAZ5Ch08?MNtS1il9Ex#&G`pdDb@8PzsKYj@jM4!~P+_CeAymx&dQFt;X8b
z7@MLjQse%-`((-O#>ASSHJh88<cT;krs}A{5H*}x8*^!UgEPgD>vwN)c5InA5tGf7
zpc3=U)2p!3F^+a&ZeUO-{*yoTR_dyuY8%{mn;-qv-(@h&D2yUgg5cNAvz8ld`|8Oh
z4gA?RK9(4aS{8N9&c=xU>)DrBA7$WSSZLPA>&)kK1_OhSf})S!r@ZjV79;dYqw%nz
zy7s5&P|EYC{`7me^U`hp>%a5g^TD6}X<oef3SaY%w{r2!8vo?S{~rJB7k-L354`=W
z-o<D*LQM`(S-He-0!ym(<!5WH7r;MQ{p=G4>+8So$8X*F$-nl)gL(Vk5|XZ%(vU+`
zHGJ-mct@^b?=}~#LYYFs%@_brlMktymf`*#)=<Rby}r8F@xbc{8%ia@d?1VHEQ6R4
z5_CZg6Flr_S8V<6giRtFC@yagMLsK3QkepDE?+j@dquwP5wI(3X06{PJS+|wLcfUP
z$iiqW=R!tM2CZagRUtwSK^17NX|%_cBf|O)TWbdt%>o@^t=!`L#q;bJmuX$g{{4OS
zcdzr@3%6*S$c3FDUwLJKc2UaBDpAHDNobR0Lb;RXsN1nYfe-AA3+Wq7d6<Y|V;C75
zOY1F-%J|S{7HC}qkz!CXUsNL45CUKQhAq|x8XFv>YmwVrlHVwDEr7>*;iNgW%O7;>
zC;>P}qaoT@OeUV5)|wcy-m~Z`nW7=rt$o$MQ-^6vhn>I!b-ARXC|KWIV>lcV+8{{n
zJjdi2Whu$++q<_3cYM+$kam)?+`y(HfiViD4KYeyt`n{hcOtN{K1SW$PsOf|pGrX#
zZ!61kf~!yn4?KzlSdEO0VXL$h)^lxh#5@>&|K)o`ttc~54j))e9Yd0AOU73%L-y!B
zN@XYuZS5Jj2^&L$iy<N1rT^8&jC=R*GZ^HIhT^gHd{st6kfKfQ93IE9*W5f<5S8Z4
zC_`abxK`M6+Zi9fKI6*PCQo0;7!<;}rHqs`Lb_y~aa}PP$(D2)ja{FBCbXW9{`@cU
z&hPpjc5mL`g<Cgx{)NwR;oNyHUbu(>=Ep}o`_T{a=0_jr>C0D{-aUXf1wQ%PAK~e*
zc@KFugrqGQqe@Kca%HrN5cLn~Gk@Xss~RkT;?c+d;c#I8V}joyb^I%Ow$i?8B`%{*
zF?Mpfo0`0B!5U1Fvs&Kn^D{l|>B{EU#qE97d&T0PGWM#jWr5{+{|23sjmi2fHobsY
zSHiX@m0wSj_yeh*D&fbv54N%c6(}gyVf!+p+L7Z3!81SDW%vGsU;X&+p>$+>bBm`Q
zJI^E69%nS%V8nu}=M-gWSyVOSL5{0yX0thy$uTiBJ>Exa0ksMnX24omSh*Fst)6>H
zdzu(T4ow^8jfYO0HWQkf7*wKVF{1q23uV%)NLwpR21LW!cy!{LoTlQn)(HQ%&HA;_
zd0G#6OED?nM8SI%MbWoG*@QB83GdbC=McknbbQF+;h{t<TC=%*mKXz7RrP#NN_S`4
zg)YnXC>1)ev*;Z5Vx9;-@FZBWD`=cp7&8AV)hCs}dX&<Fd9#{V?#*dpB#WA>>m{Cu
zO+4*r&9g7=a{kLl6lMjM(7nCZL|-$jT3)_&#MP^3xVk=|Y1=g4I&BD+`^Pobc}8oa
z?rc-|8G8(!G>L1Dj}IB-mZ4Q#Sudo&bgTs296<$57FsDlM0!kENI1HFE>~UBZuEVA
zGVelF6L{OZzMMP1{Tn=yDIWi_H?sM}lbFF8<v^6bgYMQtK&jLvQy=rzul{PBQQ%rc
z1gDjAM9X*75Q5%Q%KqT#Q+dE(ZGXexKJqX8lm7|)52@Gz-D3Ymx<==o7l&o`bf^n7
z0i3Wj1eQHoeMPLRl52^hW9NK9GA`;wD7#GFrvL9tNXXVkue{MM%C6^X=~>1Vw#Snd
zkJaavD>kGBvHDy(CqRTVEJb0tv}u^N24gMFV!)-dn;gz2H1(Xr!vk*Ky-!sI-tqWF
znvvn)712CAAd(k3gW-^Ck3B+J=Hx|=_a4`J>LwxLo0>(nU}#2IYq7@km9~H=q0C!N
zRa=oO>!hRTmYrM|Yenp%t2Um<xkR~6Mj31{sq8NOc}h#zYL&(q%lg_nYinanY|{QB
zFpBOP*<@6UJV$BGpe$2=WzAx-U^+c!clQ<9*%JeSRM0|yeYMv3;4sEY$zDsZp0!zT
z2v__5Sh<$Q7|GfBt~eo$!a6BE2``hD3U~MV?mk@^N+*N3f^pMnBQpvH#_-gI4T5(Z
z))iOIl+@8<Q+QSCl8fV96qT1{;C}6ifyp>Cwro66V2tLg9^YZU(q|`YG;ppg7};T>
zDw2GW0!S1?eLhPmE^Tk(gQ8U}F}Bn$;u6flYK>8mfi;Ya3=^aci4KMlQfwAa8>^U#
zg6UrG0G$Nltfq*X3l}e=iwrh4(cTgF?~3;9IIW2Q03ZNKL_t)dfj_vZ*gkuP?LuKQ
zuzHSP%qYhjSQkM#;$lGvEm3Ju78eY6W*PSu`tQE`>%Qse)Cs)`dQ0nnq)~q>2KU%<
z&byo8)LK!jU}ln6lVs4%s&VMwy8n>={d&8R%H$pQbyReMJeaOSeJ~PZr?cgIbe=~-
zGOkv*ddKdRHwDW)O;0zXR$nh|91`k?E36D)BEvlA;+X-~4j7a<7wiR|z4aVERMbsN
zP@)$n9#X@w+yHWHPzi_{!B^bfz0t!Jy6+MD@Ih|srmpeciML=3S(dTBxrH(rTZ19v
zY=>{T{1$=_3<d)>*2XfcN_di<-pberN0iDf$^FxXm`0dKjcX%ec!^6-y&dNri$#SG
zk;P&`HJQ`44I3jd8g<p++LpF$3CSSlDOc2aOTA%aN!=peOiU~WrvF>d?Ae`G@&r3t
zqL_*aC;D@{2zoVmF&32WzoYj~AQ4);JxQ}!Od@q$np(-psAOM4m$^!Uq9Pw?Qpl(&
zw3S9`Z5gPNx~|a5f>zk5D7B%mxfD`54=66VwzSr$ETTfdnn)WQLtE0)F4v_}SR!RU
zz!)oP>|MCMGK?|(92zT{f*FQ0;}HjSEkeyvVWJd$hFS97LnJmn8KML?iHQ!%E<<{G
zo@7i`yZtnJeI30vz_zVaZ=<I<nDU`t`Zea!a_-_K?mzzLcxl&Dm;&EAE@TGhH>skh
z$iPNTv8XA-43~|#e(x@$oeQvb?#1K9;>RAiVR;pUWgh#UI^OuHA3&L(S>8=)vby-I
z|5mUx9O)R<C-ooLWlmVS?x(&H(#Ya?h=<i<Gd4C+%A>+ch!_2dV^(*Ho?f=2vrsFc
zsX6(#l`BQJy9ia{$z04}Sn}wjR{#;oJZy5>7|F7Xs%~go=?yeSCvU=FJffhSo(IUS
zB193_fD{==31)5L1do{&oR;dsFU@>1MHx#oopHy{`R5=0G)?Nv9}G$s^M!n+82QdW
z{Z`J{1q0<l>0Z1Pt=Vg8=0Rh0&QW-tU-{6-QrM-FTP``G5F<}La)GBVJdN`%c|BI3
z3331`8Lw`Rx=rLH_3$#C0A2rMw=C4kam!^Q4c{jjL0``h7F~5>DSjcNOZ2bOI~XHy
z9c?4V!#Eo3U`XwR?6F0P8(HUE^(|_u4|_YnD~J)zL&m@b<|})NQi@V3hFKv?(0i=4
zC+6s3p|~-^elfIxfytP-hDGZzI-?*kDhqU~@`d1&(CQZhYX}HmghJUuo{9#iat@9c
zJb&wek9_<FZ~tq5hSo<I7|<D?dg*ya=da+&(NUA3SR5*>D!6_BfbFyAShx`z=pXn?
z-~7$>!#?>{@$t8A-~GV(bKBo<tbJ$nzTf$<U9ZV%u+|x)lM9lSBf1rMVwX=YX(tq^
zJ3FBw&wu85UViB&wQIR~|9)~!;f?1nQnz#7@n_z{_SR+>dY|~zlVP7+jF+xo=MVnq
zlT46u|JlJNPd@QhAutP(XaXqB2mjZ9#N}&`&}J}=fyy^r+FIv(-uE4J<Zvcc+@{k7
zbFbN7%y2$(G_CMKQ?-G4)%M@ryB1@_Q$R&YVyb}gIR-%z^tu8o_Ph&4P%7mPH8JW$
zmG4o?V6zP8eY*J-T3hipLYI5Wv3iD0rFE@k$BbH$`-~RBd+99e849}USg$m!62)!e
z;OgnpyPHs-z~|G!1y+B5SSYSf-Egq<$a+(zBrMg&_8U_VM@Y24U1298%TgN+$_vy&
z32HwG;dshAEW^-_!Bm(<pmm-hChd8$Af1X}EJlGcR^TZ{p>@P~&roZEQnbM{NL+BH
z6OKskpi&}hr<D<9DkX^wr(lrhY_^HpDoProG?^^zG<P9+YsA>!ddnPE=#L>ricDU+
zX$?c&&;~_rEE%z97Y#9@bdtGuL8y0(N`1j6@25WU=+i$2g(y-JM9nFxfNyIS^GH<%
zj;9rMwIC}8xW=KZ=GKePb7_5>JTC}3M{C3Go$Fk@{1`XyzQjkL`2<fr^@fkV{q1l2
zAg?lB)nHwD_xFci`=P)5{y+a0zxg9NnvDl4ou>`Y>Nwq_#p>R=qNsCvbT9Lfx@!6G
zA3VdI*^DX%S^~-ip84!&c+caH^XB?N1N?AvDdYO>SNO%>`EBk_7DOUn_pYz!+FQPX
zYhV6Wp7}Q)CAbA|`?{|smLK5wxaFCbKF6o#2Lui8dE^S;Bi-Jp0Bz&g-8*J7Z8>h>
zUaL7co{9jh^El^w&%#(M<#jKZlMus7b!s`4eTcK-&?;nUctz*L_7u5lB}otT$?T?S
zP8f@5Gqkc2_N3Cg0H^{fK20~a?6$A!$fy;=qakYD8=Mt~_`#Pw#8CAi{6oU@FJ$!R
zqol(0u%>^tl4E_f*PoWJ3rV@8fBscouTzpe#z<~+a_?8bqY<UNgj2C=t1_sL-Z`WU
zuhJ;xST|YEYZbj;X+KI2ty3dDbUmuEQ*2)e6<575trW&aN~A3bT>9HG92essWP=MU
zyZ`GMrw)x#RIKZ!#m7Lim}AQkgn)OB-8-)^eB_X=vu7BjoZsE+FOlaZU;p)A$A>@s
zk)s!0c;Ws3@NfTjuj&^+97dbQzxQ8!;5lv0`{-&4x^o4zxI;S1J7^^jY5W6aKpCQ5
zK2)NYiRt=9t%*jOlF=!5qk@ENIb7J-<fv&lSS*-V6>S@tHI75)utmYhX7tHpW#n^{
z)P48)D50KFS_}A2<;(*tyy9cee4Kyvfe(N#`MIC`3I5dwekQRDz;tqq&2nL)h+1%F
z+MrZMFrG!L`Q1;?`PlUdw+|X-bH`*_5n|U6>nIAtc(evlv8X*EYN2IOQUTH`7o}_i
zN=Z|4RMIlxm60;9mImgKX_1S!7GpIgNm^+oITm9~uQa2rLK$#ACig#p6=;UE;ze|f
zQtnq)((|eLd-cBU%JAKAtrG=el@i>^>+1?65z)c*T9!yh4ZM2Otv<JUlcA&+wF@y<
zA4UrXicXwj)uN_NBu0qVU{jSTgn+gw)u0oSN@uu`x?lT6xMD=p!w2D=m(xl+Nr(_4
zSp*X!7}3#`f>9E(h(b|pQ>&V%n+GsD$l6MtwLURF>1U(KtYKg>a&4vR7`wlj<@t~*
zdnyW7nW7KLJ5KjNOx4JUNs7`cCMqEeN?B+cKode@iSR8E0e5rSLnd+SuS8H0+oxAV
z-AEA|PvadfMgp34KE*4IR~}<CUU}&{`-c-0mf$_wXzsrFX<m8xWiqS6*Z!IJ{QJM~
zlRy5M*Rn~kX|MqFmG}QT@Lw&TP{P9b$2ejexHCCq>K(NUEL^~AXbH4Rabxd*scS#~
z8$I;R#Vr=~nvQq-<o8+I-eOjZ_(B^!EuLt^9oNxv@7VL<&)(<evEtZkMr&hsHcNtv
zv;-WG4@T@CPMFMR)WP*0z)3G4K|*>LYk8vzm4OzB$V%Vg=^+%(Y4K}Wu)@=&mUJXQ
zUzuAmB3hr?#XrwwRj_npp*K7o)L`}fUe9>g=RPca3_VQc3mKjE-N~@?_41x~v@;<Q
z`;iJ6oH~!w23F}Hp;lB74Iy;raFPPJH-^bn8mloY(qJb-?3HthQ3x}8rLfcIt;CP8
zr>1Ll^8koGyzcAtS|cQJn3JES$TCaSv}hvMWRyk`+J@P5no<si4ecqkWB1k#GGo5~
z+rIHH{Kn_|yw7W}0HTUNtd#l*KoTxW(U(=az3DV|>UGYA>i${15v*l@G3ThR5Tr)z
z#Q<8b`0SlqxK(f9fpE2ZEYGh~ul68{CtA}wpB9<vl@(D67d%00l<g#nQf@~{+r+$y
z?9BsnZ+ZUyf=ShompQd_xDaSVWIC^LF^Ute6+T9M6s5<|!wyu+CnYa5HTrhpp3xSi
zt?Y<hJdj+Pn8G-5RK!ctN)q~ISzrv9%%YU(rJ-c#KKxTD?vy^zhhMN|ZmCmTSzc$Y
zRI1o5Z@zBYyUgb5WA*)3Z*mZ9kXm`ZGvHl5ZB;npM97<PL<*@8DwMDV#H6j<6<bm+
zuFs*atkKmQu6D84L+ogFLWfh*az1@!H`03~{aYwa2ujW;RT)F*@?|MUmyV5L>9P0_
zXq}+zqXM5)gqF~Q<Xy%HzB5`X<$Rad%cQQGuB#v<W(LJFQ7_zN3h;eiHl%!?<eOKo
z7<B9t!cIaDXCW+6{1G7>EDJ44+ND5uVhAXVbOIPsl~N4<NIQ&c*x%dzKa4Ry^3Vl%
zYP=RH&2kbR`>QeD`02k6ydf&}HP9u`Q>-44SpM_^=o6RpalCp+*``|<%Xya_%}41Q
z3xr<eHTpnfmI>QVlkLRkuD*9yx=x`%g5?PJxfAn&QfU{Ln^<lDgD1!>xWZ|rfl;n_
z;>-{=Uyv1+-Fy4ox_?BwVjz8znsQ!x?xL4(*bB<`i+qV^T0Lu`B8Da4GX_bjtF$@9
zWl~Ed(zN6vtW8N>k`#L@io`wfA|@?JF=LXpNZ6*h>>pdrH%V?HC6BdEoKCvGz9)=8
z0wkW;z*u@`CwBQ0VFxD)D7`DBknsM*A5V_3VvMv>w9X5gXcS6pljy3WQcNb3B=!(b
zoJV&i_x6w2+8!p4E*VQ=%00^FrIR$5OF1j&9m-2ZI(Q`=3_aj9g{V>YzsDe0v?vQs
zqRt>m`rw=7RRUxf18vgYv_Tjuq84KpYbR-x7%@iZaggX$(D{+1JmkTvBxVtWA1h(2
zVw9Y$6u&~^v`_1y!^ri!P-^4xUc_8cXxFB{8%i7by03f#PhP&qybipu|L+KTh8gWJ
zuUbZB&dzv~#qlwNfv3qbM&<B#kM7?48{hb~U;nyX=+|Yi0MymLQpX!V{q4ZN1s-{w
zuUeY_9&*tA>7*6^e5033`XbBJI?<e<H6i+*0yhLPW^u)3>#Ij;Cq0oj(U!HM<?Yu>
z>R@SI!-SGH?NA^$P}{b|DBwMhfcK*BItP+>s?+wUADoBN{dQXA%Q;JiQK#Hhcb>+W
zKItA~q-`Cu#hftA<R&6w0yr%OtDFBWq<g(y@dM$-7YI4{lNg;Rq*l&NYt3jh2JXG;
z>ozvl5ma_3=qg@oP-2*32+Zq>vMf2C&G0c&mL;xfFvg;S7jAvuk{iRo=2UINXf&cq
zVjRO#sArsuD4S8&HIx}`(-6p5v`ym3YO$@t)gEQEY@iWThzzrgQC6Uk&~=f-h6#~6
z1g33E9V9f(t)gifjEi{Rl4Y`~)lJRf?jgo#d_9NSP}dcimEKyL1e4w5m}XuvJiEnw
zHYL{z?-e0Bis1-9uLy2|i7jUzzf4gY1}NVB=y{s`DgWkQ|4W{I;U161z$bqB$9czB
zy@U00W7eN|^!j3Y{Fi?Fndcu0VR+bh-3ALlUHvO}!>ynBX5d%pj8>OlSlIyk1)O4k
zWilXX<wYSEBZ1arTai`+)p2$stqv`cg!j(LYY2E+T*&br38OkkV_67iH3(5FyT4b0
z>Xp;;G;JfD>Iire6$wiI&s2_6GC?gK9Wz2~WvA5{wKvJ#j|43sO+w;5k5aX3TPH0j
zAtQtq6}5a16_VkMfR|G8i4ch%IN9?<o$^e(zcnuQ`gPstjAaM`AHbooK1woQMSK8l
zJCDiGA^=rh&HGV`$#jlS$?B*>^3_gSI29o%y<|{5alVnDQe$@Vm~{G_kgkt}r$T$&
zvx3G*>l!fnRSjfSx5D!jBqwMsSfg=9lcma)(jr}!Tk)=dKFm~6_nU^*3Yjs3*Q#eE
zutiQb5MK1sl-Mjo+l<Na6rB}d3{_LJv$lrKGoHJClW|cpD2J3*8qsZ*Q&$x#c|%b{
zHYoYz?jFUUpo*Yk<mmWVK$|{bjAA$%QZ<g?6*@F*t__%13)aq`1E*G0s=;JA+BbaW
z)-hE|+F#xrapUejUv=#YH+Jt+&lfl+TAoK$&5rX@I97_hEYm%q@b!#lUg7rksOpB{
zxh<^CiPmD91;IyJ-{PkeG6KOlMi<U7IDZb4W%$_?wY9}t?!Af8<_4E9p5<Ts<|lZ>
zPWg&UYuAVB-Z%f)Z#{eWfyMF~<8|e*PQ2jq`=15g1$<bpwvxQoLvkQeF7?D9;-Mr%
zA*<6uw7|pq(O5~429%1g6Wo@P*m332zh|mUg-91%t^Un9pXhicB<%7SAw;}eMInRp
zipCW*E`T-+i=5J!{=7SQfdFX@WQ8Q%Q~tG&0K4jHdYoWLI6ar@<Rd6C0;94_(=S!3
z)kL_~nk*AeC6O_=7?lx{G?ZM2uC3{{UDvhoh|Jmt(AKYah=Em-D@mi(;(ZdsibpF+
zcAp+7#nIvMiR;yk)#~Hvzc#_}(v5rEKbZFKrTV<<=N~>sj;9N5-rB_l(K3i3NToJa
z?eaWleSMug&lwB`j7B4ZN%^*9Q|I$}5098kCaHx8ibBX8clYj72S?=tM9X4ciRL6p
z+t9%NWJVhxFLJJ&+2Z_o#6V}Lu%w&O#!xp6AwuOni{NoySb}fvACnc*Dz&k(fi;Gv
zkxeZt3y!A8eU3_;_ehA2*`0gTN5@2~*?IDDN#m6{c!wE`z&oOAuxo1)ChA0eJs#kE
zOQ;<*jtkcwB^wkx_Le7j>sv4L6CeEW@BZN*KKHI`@B5KwztDB`1$kKA(3jtTH{AM}
zKSzlF8!>zzfU@)$p8ke2mJSt*Hz;fRd`(RG8!!;G?5ut2D`K=LgmjBT+YIHScqdUM
z^0sanYkE18(<7aW%`6+4VNm9TRy>5@S`?8$B3NrZ!FlGvp^Ro^a$;d9ilNA=2LnNJ
zL(}79#^Vut`%{kMKEqt2L#o2Xz&I}mA>cfG{P}&>O%RWy+X)l6v91k8-c79Tzk<=4
zx>e-Lqjiw)ueuzTwCWtSo~GO<OVvRig3wv}K$a4yw|4KNrWVt*az3r&-tmI3eCq|;
zEOOL1#>I$@wVcvseWfp?#p{E7rqPP1S`H^IqxBS`(_OEXwV`Cw=+uO}9M0-7zVpCh
zXMmSw^qBHo9*_1pErxSD8|)s<(TQ*`rUPSo|4hT&MHW8bUCKUb%cb)>6iQfFN!7JH
z%lh+(OSi6HInFmCeH8=4!Z5zDO$dSg{d>3|nvc#qN|iBL%qd1|)WK2D9oiUP*xlvq
zu;k3f8dcMx1_K&bGtP1pkvz|EbwgPelzGnXbcSnM&^bQLMa`)3Y>mfU*xurWySK>|
zLLE*-k27+sF~b5ET3plMy{AmQo0Xd~TZlJX6vE3^)eDBk^5XsxgS@~F3Sy?n1_Smc
zbMm4Td*cHd(S<}AHm+VJYK5;F>bhcx70uB+!wtv8<2jl4MBkt{*3nhP<jyYo{vP>o
zfF@$1#xJIvKexsxFE}`!|6|9|-+2Fz{C4x;&HDMr7iF*j^yT;0;pKn&9}@WlTK~^d
z_kU29ORP{XUle+RxYd0+5Cp_?DyOBjA<vgyN0H~U%SHVFC-up(EC}>oR)~D(pZz9Y
z{OA9SMXb<D3w9}nWd$r@UKAc<HGVF+uBKU;+Zf67g5hw$e6~oHIZKx1D3ZK-@I5w4
zTPxHgYb7egR9O?WeLzvWiqV?r^+^}JAx4iihQ<9kqfOD1%d*u<RK!@z<gj6Ft?cty
zA&MvJoW~|lXf!Gq4KuVAWtP@PMj^)s&t%f_()9zr?2QBN-@eJ$e%V<`C~GlNf*u#c
zm1PAtUwE0%-FSsBfAjg}rS0b>O>-A!y~fpft<f2{PrbCy<Y2+h*(srkJaOqVjcZbp
zxFSYyp(Xf0RXcv=|NcWJM>C2+@{n84<oI*E{S95_B4UkZQn`K;OqY|@d`3;i#I-18
z(JI4eMccOQ3<iYbV+mK4Mj69#+pxR0Pf-*}dB$PKLoQvq1Z~Cs{s9?*&CN|(zvzvM
zHX4kgtr{+j*V*2_z$;b5@pO(hFd7ZeF>+YV(6z&8OKCHdcWey?=;+bfkSUERik_ZF
zYt7EaHV1B>^BWsXtA=tgNI9!Hi^YQbhX<TnUlX7)vPbUj?L!cqf=ml$&(9Vdzp_h=
zk;S~?{5#%4Y@L*9LL^pmOfG<EV>3d#U^bhfwPsijFu5qchqk3vaOLXNFgZN@FCV+O
z`M><mO@H!6{{qGrZLk3Jqu(2W9}YKu_R}%O4}#eMS;)%AzL%;u9;hX6bX+?5Qu*kr
zPExgtF%o=av1nMd4I3NlxJq(!r7h?hQVGjYtG`KBe@Gwaz32HGFLOMd(ljl3S<oho
zjS}rIsRCMq@*%MtAPPY%jo(ol0cheW1~4*~#SG?EBRzo;vOME>Hp3VrJDLs*tj9Gq
zxwQn>lG%)T+c3;6R>`q3QOP*x$np|vS~5KW<*^-oajJqTG**|i^-OSAS|?s}VI;6x
zyha-xnO0=lqYXF<O<Q60I_u+{H@x{GF$A{O$Ly>_&xe&-OKh4<j{sBO_Ld9F3T-#d
zQl;oaw2twiTMIpWpf9zjmYTTSbi{C|ln;Qj+nb_-Y&{!8*vTwSkYunABF<p*5#C28
zM^my~arx|7X7h%+shLbFp1O9Ps-Dp{tq4sNC9bLa&{JvgBqgMjHFt0@W!@e#D#uiA
z!ST$ovsQ5N%o^T1oPttG{?TS7pT2#c!O#=E7ZqvcxVU!AnIdC*eT=b+7##}5+IT?3
zpp6tnocEv%pT2dQ`&IHTwZ~|KF&Q?_dE>bq_GdNox}vU*33W@B8*HM}i6KxF1#R0h
zC`;}f9dUbJV~u9CKBj3JvSJ`&FmBG{TNilo)@_2049XEj-f%Q?MCZlux)#tdD9FbH
zLYb2pi=WR>Hm454OksQ^DhnnuKe*5AaF2Gez_$&1cXzRwG{i@s&dkv(FWq_HyZ-t=
z{`D`|$ebGgzYJD4^wsbF^>Fj&-VNqwfp@AXwbj%4j#Y@jgQ<kxedtT@2zrE|B?R=T
z$Sj@oX*OcQG{si~KFX6O%lPmgeM~SQ3FG6#vh>{Fd|FAG4ULN;deH5^3ORji71ns_
z#T-nI^Gj`)4(}Br0{GMlV%O^>=$M`&MRiyvK|(tcB2WoRUF!t?R0@@#9$FjW8A7De
zJ9x=5@0I2zBz#i(425ux=UVajrL&ZS65l2kj1+3F=7JP@g-|Vhe=V&->a@Y4+mhs(
zbp3hVHSdmFhJD>L$*9Gy5JJK{DYVh48C=>_tl$QcKBgyXg*6Hn6UJ6SW(?L?TJ11e
zk>wWCMxqgDN0DXN#0%f8pN?QpC2E}_Hw?68JSw1SsB0LNHu2aaTHz^QQxqjH-`yjy
zN98<OCjEx*ecRJC(+S?U7%%HVJZ?t>sW!&I+IUQihHH;)@EgDOyK=n^SYt65u5J$5
zx^|He1BLROyL64Qwktr^G=m}Z&Cy$%n_U0gZ5DMy<swbnNJ2fr*Sz&fc1Ag~^$iG?
zh!79vO4GCzYVQE7!LE%^^BS|YA#AaW1*#~(2l67L+CRjYNN#dmHef$kro~0_^@7Z1
zC@(6aY0vstXcq5(*SGvfuZduPz2i$_umJRx@A^!*@r&;Q-WNmr_f&}2PL}3%N?64H
z*N%ns;Un$FN^%VmjSpbe%8k<Fy}D%Tt9zPCDMD$}5mH6$Y~JdKsZz7z?43F$qKp#S
z7uOQVXkDk9m^_q3#Uajun3@m*b?Yf?NbMiXvU!iHP9dH533JxvX;?BR^Z-H>OF5|r
zhcSi@{&0F$O$d0`qE((+RhD(t{^+=3gjgwB@DLco>KvVdg7lXt##07Mq3GBhd;%rv
zzACy@0+O@n+n!d6AuE?;<^7k>OTKFr1p4ZuJGT%+??HCDgBu$gJwpW`3GTK<8$(qG
zHnv7oM>8^Gu~xITxlX-UV2q)471k>9JjbKBw|_*Q8@9GKna^enhGWX2kmhP@sp^_6
zg4Q81mugIC*(@^(ABdrqNI-R|74ZPtAlIkNaw-q^Du+%=?XDF#gx49RQarM~#opZ`
zY?fh-=Fy86(2XO@JZ!Gf98GACCJfGBL>s7%r<8*cZPTKXv87Gk@bMw%9)A-%*%*ju
zlcDpH;My1cZ1MvNJ~%r2)n6nS>A~?OGgtun>URX-=lt{k^#8<W|0&A+4=8q)93Ly-
z(5MN%LhB?2zmj-W;(8#EQK=%KlLlSXsjFQQ_ED!BnT`hL)L2R6XJ`zP<XsyNxpMJQ
z+IG%UPdtX2t)UhZu0C>w=Rflt))?|EqxG)O%QzhbLZGF}R=J3^0Us4M%Lv}Fu`v?%
z$RHS&s%>zTR59b@yN)L=<Qz>Z9=$ZcI71TyrONQp;FHF$j{z4HC{5$F?79iWD*AT{
zqQ-}Y7;=$mQZ@k)Jz7V6lu))!-S;5|jFR{E3M{E0;sPGKyh#xrvz}$3uOh}?Xrklv
z>MDz|0~MzE)&@e9e1}R#B*bKFg7jpH6X<*6C4Frnd1eBpjXD5Aee8VzEFlOzvU8p+
z<qIRC5TvyshDwZCXh4~cbX$57W4BSo6YFgiB<oXE8WmBZN{a$=Yf&Mf0(ck6Y|hA9
ztPw0<2j;X&%Q3#i7{hG3;LO=g*^m@$ZjPn+;T%2$G>ZB0F)ql>xD2-y4vo^5Hp1be
zVvrS>OsAHs2ng$}id~UDqB6s*Uf?<=ix}ycVVl+wVvdf1<3&vqTD*&_ty!X5;LIAC
zvgG46j5X*%PBod)jMo@s8AUlD8YspCj&9z<=zywb>_7J@?%X*b#>im%%-$1U`{)1e
z{!7pQ*yT5W)9c1pz25P~)u=zuFi(7MtsniaA5p|7fWHqcP9GC}AbQ_dlU{ASdT(0t
z9^&i!3exIgFnPgnFd)~4aVcV{bv<KyX9M3H^5kQW;@Xh7f&}KU+RY#3&2Zk~Ld1J<
z@!Q5xRgS&A2~{PedwFiP$tk)300>V>L_t(RwH(YFKJ=+O9M_&t+?w+8Vc_F8rrbDa
znLAPL_1@!y!bgpdg7JzWHRE~-MVyLwCCT-`(%a}f8l}Ky3Tt&wT-_B6R-K}#w6F*~
zWOOZ1K82N?_xD=f>uZhE_%b<{?!1#>N}qEY+7KhjK!s$mPQ8BRoMPx+^Xgvb7ds@e
zU-c+|YYj0<?ns|Xd&DT-tx2Khcx|mWkOH4^XssnrnH3z(W;}NJGCKNG*JN4wJ)F+i
zn^m;VrByH0@)&)>zMVYZ&5g~63Zu4di?J4MM2@e^eG;Q6lPk$FYhy9vb=+)$3ZAv?
zEuvEFfBI8=@<SgYc+YTa8)Y+`kHjM9xT+S%i|X%Jb^An_KmH?s9L5U%m<(1o)aCCy
zQkTBt2MF;gLi|yJ-zBI76m20$z|<!}yL?iVUAyS|;8etD@eU%I!dM~>bU^7P=uM!d
z4}Tb~Xrn`^fX9;=O<lKgQ=o*HP>*Qp1tA79qbW2D)DoOZ6!r(LjPwIWg=>U~!L<#-
zsF@Qy3`RLk(=eO0986l85U8Ew=(wh80+Xp{79-E^9&$8q@Ddyfm@=dg$Vi(-MB#l#
z2st6-#Apd#Q3t7Df!xH-D}r-u4n`D2b_NBZb~H_kQX20g-b-lR8DXEiQ}K5E(n!T9
z;siZ>WNCOrb0qy76*?Mp6nF~JK@_huq~1yKnG?pXtGOiO(ud{=sHTERA$~-W5fS6s
zIKR{YRM2>bkDYOq))Jz$2?;fr#yOFqYJxPc*CFD<GBj06^@gPz(JP#ngs~@LqO2=x
zOq#bSxlOBtK|(_tRt$$#v|h*(L-3vOw+tUBGZE9sjAdBlxTa-tbVz1Iqd*u!z;-!L
z9k{T)O=dOwRV|IxJwKHIbz|tZC%LyutNRwPRs5p!NufJNls1e?Q6HKu7MN&+Z4?Mv
z6P%+tIK+;J#Q7AZ6~}ls&YdL!Sy7_uhAhu_hdbwg)V2PpZ}_W!=Lf#xy?^roTH`O}
z_>zW%uQt@>_uT^i^LYDb{}wU48^X6nrN0%;8>2SM?LUQ%T1B=;L(Z;ku)jD7g!RsG
z?ffGYT0p0-cjxaGCn>L_AL3zjEh=?YF*q}lN?8hJ`eUL8qo{+%MFYW7`#|F(c@ny4
znwG8YEvA!w42r64@IH`b8P>{8yRlxfdvC(L3Ot`xJdq9A$a8|~8l)3dib^*^T(+5b
zxi|YHeZPapz~;t~>E1DgidZBk^qK2-dGf+0!$Jxa&TCp137HrJotPX}L+UQYsM7y2
zEIk_au<d*Gl~E^;;o(<jDL&eHO%LYUzSz-wXrXJpiYptUVsHQ8fn$N*Q@VR_#M+qw
z&O;0)d3ze?0$JYmG_HJ)#BZe%c)EMP#yfmdF&dTq`G9y|ZSZ8);=E@(9y4zrWFF~S
zs}zcAHl>-*sd6FaGg_~By*^Fdl7dF7F2{9p_CxUa&;hpv_!?tmFc?U$t`B6^P|s^j
zX0hvIn9ZrDQ%n<i?91Lpb9jVWG|w>{{Bj&-zr<1V`&*B{_qD^MFX8wTF<9MDm%cjy
zzn32WO}PERrxog3fo}ueLz>ALBI~0Og^D;QA&qjfb8BPKCQ|CeL9IJ*>TA1;#$?pK
zp<OI6+R(Tf^fLCBl5{|+9F(O&`nPQE)AK1u6C)AJ3%gS)3_d#MPGOBk8_4sF>8#@R
z?Rz*EDJ*^RyKP-sAO-gh=fY1EBJ+jgg*%6Aj52Jp-^zLxm1DSQK&57a4vC-c?R)b`
zoK!R}5RlUSeA;l~!g-pbBQh13P3I`9`P3^1Yzzk!Hp4OD%7t~xtPmGYk*cgKJV+g0
zOz9J$SDLN#gM>ysL#a~4C`5uWkQgnOb;mA&u9Oln)Gj{;CyYv)@|HeoX(e(F?;X|_
z#3<~iKBP)-f+YkWXo9E-c?B*&+iDaU%0z<7n76R8zQK)ynS7%TbD{c*7URJHrwS@G
zb<_mosa&A;4r}aEXw(O?(oi>%s-4q@fD1KkBUR|O4LAn_3?{b1r)4dT3rr3t49=G{
z&ZDrbuWd--rftR3wj%pQG$JT`?krX7h;=P}ufA(*lFcJ31kkJ$-UY1DM1nNVhbXyU
z6!W@42k{(rjFjs`tkP7~g6eq2_=#&oATM)p0lT?|pH~<^jDyX!-;2)wvX9}H%O}3~
zOH%RsV#c4S!8$$krT2XX_(9+Y<E@`R16%_xg1I!S>r0n5b}k(){H48ScB#mVO9O4s
zUfMdtqg!Xi&3_%<Ri79(k@ceF>Bp|3jp6aDPw*GN?c34H@!kKyUq&fUY%9tlW4Jyb
zmX`B_5~GKl84sm;r8GW*%?j2poM-3_E<}bNMq3WF=6JGTXJ<=xE$<WB-Q%4{DJX45
zkxMUGRkd8aFl6TD46|JNxRTmR1Pm38F&Lw1<I-q$yLC}&+TeM^m5Ts0zGi)xvAcT=
zF|a<$vBnZKkd;&>$CLvGg(XH$>qyPtC%p}j-vjgz5}_nX*R9JNrY!rzUfU<bPV6G7
z;)hg8`#;7MmZmzT50cZH%@@>34$S+&ypq>B?{Tf8N%^(9mL5-RMO6!MwuzeOUcQM*
zVh{pnu*_Y=_R>w=cc9lQ*xfr|J{6dXa}Mt#wQJcNT*f*_$V`9UF<q0QENSP`e4G~+
zl)xjVlPPN>Npjcq0$UU;>IRz+IG!zlfNvWHnM4ZK8eH4TETn?EH3qk+8QP4U?H%#7
zQGJf8^MXn2rop#qLYFX~ek17h2_&Djwm!l;M^R??T;pyxZFAcybz3QQ+ZcV@PpjLy
pEbinsdr@Ef_WPgrX8RKu{~u}<@R<NiVkZCq002ovPDHLkV1j1;p+Eot

literal 0
HcmV?d00001

diff --git a/mobile/android/app/src/main/res/values/strings.xml b/mobile/android/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..5ac495ebb5
--- /dev/null
+++ b/mobile/android/app/src/main/res/values/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="memory_widget_title">Memories</string>
+  <string name="random_widget_title">Random</string>
+
+  <string name="memory_widget_description">See memories from Immich.</string>
+  <string name="random_widget_description">View a random image from your library or a specific album.</string>
+</resources>
diff --git a/mobile/android/app/src/main/res/xml/memory_widget.xml b/mobile/android/app/src/main/res/xml/memory_widget.xml
new file mode 100644
index 0000000000..611c5aae02
--- /dev/null
+++ b/mobile/android/app/src/main/res/xml/memory_widget.xml
@@ -0,0 +1,9 @@
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+  android:initialLayout="@layout/glance_default_loading_layout"
+  android:minWidth="110dp"
+  android:minHeight="110dp"
+  android:resizeMode="horizontal|vertical"
+  android:updatePeriodMillis="1200000"
+  android:description="@string/memory_widget_description"
+  android:previewImage="@drawable/memory_preview"
+  />
diff --git a/mobile/android/app/src/main/res/xml/random_widget.xml b/mobile/android/app/src/main/res/xml/random_widget.xml
new file mode 100644
index 0000000000..25fb24754f
--- /dev/null
+++ b/mobile/android/app/src/main/res/xml/random_widget.xml
@@ -0,0 +1,13 @@
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:initialLayout="@layout/glance_default_loading_layout"
+  android:minWidth="110dp"
+  android:minHeight="110dp"
+  android:resizeMode="horizontal|vertical"
+  android:updatePeriodMillis="1200000"
+  android:configure="app.alextran.immich.widget.configure.RandomConfigure"
+  android:widgetFeatures="reconfigurable|configuration_optional"
+  tools:targetApi="28"
+  android:description="@string/random_widget_description"
+  android:previewImage="@drawable/random_preview"
+  />
diff --git a/mobile/lib/constants/constants.dart b/mobile/lib/constants/constants.dart
index 6d98152efc..c37498ea3e 100644
--- a/mobile/lib/constants/constants.dart
+++ b/mobile/lib/constants/constants.dart
@@ -28,7 +28,8 @@ const String appShareGroupId = "group.app.immich.share";
 
 // add widget identifiers here for new widgets
 // these are used to force a widget refresh
-const List<String> kWidgetNames = [
-  'com.immich.widget.random',
-  'com.immich.widget.memory',
+// (iOSName, androidFQDN)
+const List<(String, String)> kWidgetNames = [
+  ('com.immich.widget.random', 'app.alextran.immich.widget.RandomReceiver'),
+  ('com.immich.widget.memory', 'app.alextran.immich.widget.MemoryReceiver'),
 ];
diff --git a/mobile/lib/repositories/widget.repository.dart b/mobile/lib/repositories/widget.repository.dart
index be314a281e..09532f4b78 100644
--- a/mobile/lib/repositories/widget.repository.dart
+++ b/mobile/lib/repositories/widget.repository.dart
@@ -10,8 +10,11 @@ class WidgetRepository {
     await HomeWidget.saveWidgetData<String>(key, value);
   }
 
-  Future<void> refresh(String name) async {
-    await HomeWidget.updateWidget(name: name, iOSName: name);
+  Future<void> refresh(String iosName, String androidName) async {
+    await HomeWidget.updateWidget(
+      iOSName: iosName,
+      qualifiedAndroidName: androidName,
+    );
   }
 
   Future<void> setAppGroupId(String appGroupId) async {
diff --git a/mobile/lib/services/widget.service.dart b/mobile/lib/services/widget.service.dart
index 02ddedbe89..fb2022784f 100644
--- a/mobile/lib/services/widget.service.dart
+++ b/mobile/lib/services/widget.service.dart
@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/repositories/widget.repository.dart';
@@ -33,10 +32,8 @@ class WidgetService {
   }
 
   Future<void> refreshWidgets() async {
-    if (Platform.isAndroid) return;
-
-    for (final name in kWidgetNames) {
-      await _repository.refresh(name);
+    for (final (iOSName, androidName) in kWidgetNames) {
+      await _repository.refresh(iOSName, androidName);
     }
   }
 }

From 493d85b02103f371c83f9cc2aac93e2bdc46b7f1 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 18 Jul 2025 10:57:29 -0400
Subject: [PATCH 240/337] feat!: absolute file paths (#19995)

feat: absolute file paths
---
 docs/docs/administration/server-commands.md   |  42 ++-
 docs/docs/install/environment-variables.md    |  28 +-
 server/src/app.module.ts                      |   4 +-
 server/src/commands/index.ts                  |  10 +-
 server/src/commands/media-location.command.ts | 106 +++++++
 server/src/constants.ts                       |   2 +-
 server/src/dtos/env.dto.ts                    |   6 +-
 server/src/enum.ts                            |   2 +
 server/src/queries/asset.repository.sql       |  24 ++
 server/src/queries/person.repository.sql      |  11 +
 server/src/queries/user.repository.sql        |  11 +
 server/src/repositories/asset.repository.ts   |  18 ++
 .../repositories/config.repository.spec.ts    |  12 +-
 server/src/repositories/config.repository.ts  |   8 +-
 .../src/repositories/database.repository.ts   |  33 +++
 server/src/repositories/person.repository.ts  |  10 +
 server/src/repositories/user.repository.ts    |  10 +
 .../1752759108283-ConvertToAbsolutePaths.ts   |  39 +++
 .../src/services/asset-media.service.spec.ts  |  10 +-
 server/src/services/auth.service.spec.ts      |   2 +-
 server/src/services/cli.service.ts            |  58 ++++
 server/src/services/download.service.spec.ts  |  15 +-
 server/src/services/library.service.spec.ts   |   4 +-
 server/src/services/media.service.spec.ts     | 273 +++++++++---------
 server/src/services/metadata.service.spec.ts  |   6 +-
 server/src/services/server.service.spec.ts    |  12 +-
 .../services/storage-template.service.spec.ts |  72 +++--
 server/src/services/storage.service.spec.ts   |  58 ++--
 server/src/services/storage.service.ts        |  19 +-
 server/src/services/user.service.spec.ts      |  27 +-
 server/src/types.ts                           |   2 +
 server/src/utils/file.ts                      |  10 +-
 .../repositories/asset.repository.mock.ts     |   1 +
 .../repositories/database.repository.mock.ts  |   1 +
 34 files changed, 689 insertions(+), 257 deletions(-)
 create mode 100644 server/src/commands/media-location.command.ts
 create mode 100644 server/src/schema/migrations/1752759108283-ConvertToAbsolutePaths.ts

diff --git a/docs/docs/administration/server-commands.md b/docs/docs/administration/server-commands.md
index b414f5deaa..b275d8fede 100644
--- a/docs/docs/administration/server-commands.md
+++ b/docs/docs/administration/server-commands.md
@@ -2,16 +2,17 @@
 
 The `immich-server` docker image comes preinstalled with an administrative CLI (`immich-admin`) that supports the following commands:
 
-| Command                  | Description                           |
-| ------------------------ | ------------------------------------- |
-| `help`                   | Display help                          |
-| `reset-admin-password`   | Reset the password for the admin user |
-| `disable-password-login` | Disable password login                |
-| `enable-password-login`  | Enable password login                 |
-| `enable-oauth-login`     | Enable OAuth login                    |
-| `disable-oauth-login`    | Disable OAuth login                   |
-| `list-users`             | List Immich users                     |
-| `version`                | Print Immich version                  |
+| Command                  | Description                                                   |
+| ------------------------ | ------------------------------------------------------------- |
+| `help`                   | Display help                                                  |
+| `reset-admin-password`   | Reset the password for the admin user                         |
+| `disable-password-login` | Disable password login                                        |
+| `enable-password-login`  | Enable password login                                         |
+| `enable-oauth-login`     | Enable OAuth login                                            |
+| `disable-oauth-login`    | Disable OAuth login                                           |
+| `list-users`             | List Immich users                                             |
+| `version`                | Print Immich version                                          |
+| `change-media-location`  | Change database file paths to align with a new media location |
 
 ## How to run a command
 
@@ -88,3 +89,24 @@ Print Immich Version
 immich-admin version
 v1.129.0
 ```
+
+Change media location
+
+```
+immich-admin change-media-location
+? Enter the previous value of IMMICH_MEDIA_LOCATION: /usr/src/app/upload
+? Enter the new value of IMMICH_MEDIA_LOCATION: /data
+
+  Previous value: /usr/src/app/upload
+  Current value:  /data
+
+  Changing database paths from "/usr/src/app/upload/*" to "/data/*"
+
+? Do you want to proceed? [Y/n] y
+
+Database file paths updated successfully! 🎉
+
+You may now set IMMICH_MEDIA_LOCATION=/data and restart!
+
+(please remember to update applicable volume mounts e.g. ${UPLOAD_LOCATION}:/data)
+```
diff --git a/docs/docs/install/environment-variables.md b/docs/docs/install/environment-variables.md
index b9dab5b9c8..8d5ab55049 100644
--- a/docs/docs/install/environment-variables.md
+++ b/docs/docs/install/environment-variables.md
@@ -29,20 +29,20 @@ These environment variables are used by the `docker-compose.yml` file and do **N
 
 ## General
 
-| Variable                            | Description                                                                               |           Default            | Containers               | Workers            |
-| :---------------------------------- | :---------------------------------------------------------------------------------------- | :--------------------------: | :----------------------- | :----------------- |
-| `TZ`                                | Timezone                                                                                  |        <sup>\*1</sup>        | server                   | microservices      |
-| `IMMICH_ENV`                        | Environment (production, development)                                                     |         `production`         | server, machine learning | api, microservices |
-| `IMMICH_LOG_LEVEL`                  | Log level (verbose, debug, log, warn, error)                                              |            `log`             | server, machine learning | api, microservices |
-| `IMMICH_MEDIA_LOCATION`             | Media location inside the container ⚠️**You probably shouldn't set this**<sup>\*2</sup>⚠️ |   `./upload`<sup>\*3</sup>   | server                   | api, microservices |
-| `IMMICH_CONFIG_FILE`                | Path to config file                                                                       |                              | server                   | api, microservices |
-| `NO_COLOR`                          | Set to `true` to disable color-coded log output                                           |           `false`            | server, machine learning |                    |
-| `CPU_CORES`                         | Number of cores available to the Immich server                                            | auto-detected CPU core count | server                   |                    |
-| `IMMICH_API_METRICS_PORT`           | Port for the OTEL metrics                                                                 |            `8081`            | server                   | api                |
-| `IMMICH_MICROSERVICES_METRICS_PORT` | Port for the OTEL metrics                                                                 |            `8082`            | server                   | microservices      |
-| `IMMICH_PROCESS_INVALID_IMAGES`     | When `true`, generate thumbnails for invalid images                                       |                              | server                   | microservices      |
-| `IMMICH_TRUSTED_PROXIES`            | List of comma-separated IPs set as trusted proxies                                        |                              | server                   | api                |
-| `IMMICH_IGNORE_MOUNT_CHECK_ERRORS`  | See [System Integrity](/docs/administration/system-integrity)                             |                              | server                   | api, microservices |
+| Variable                            | Description                                                                               |               Default               | Containers               | Workers            |
+| :---------------------------------- | :---------------------------------------------------------------------------------------- | :---------------------------------: | :----------------------- | :----------------- |
+| `TZ`                                | Timezone                                                                                  |           <sup>\*1</sup>            | server                   | microservices      |
+| `IMMICH_ENV`                        | Environment (production, development)                                                     |            `production`             | server, machine learning | api, microservices |
+| `IMMICH_LOG_LEVEL`                  | Log level (verbose, debug, log, warn, error)                                              |                `log`                | server, machine learning | api, microservices |
+| `IMMICH_MEDIA_LOCATION`             | Media location inside the container ⚠️**You probably shouldn't set this**<sup>\*2</sup>⚠️ | `/usr/src/app/upload`<sup>\*3</sup> | server                   | api, microservices |
+| `IMMICH_CONFIG_FILE`                | Path to config file                                                                       |                                     | server                   | api, microservices |
+| `NO_COLOR`                          | Set to `true` to disable color-coded log output                                           |               `false`               | server, machine learning |                    |
+| `CPU_CORES`                         | Number of cores available to the Immich server                                            |    auto-detected CPU core count     | server                   |                    |
+| `IMMICH_API_METRICS_PORT`           | Port for the OTEL metrics                                                                 |               `8081`                | server                   | api                |
+| `IMMICH_MICROSERVICES_METRICS_PORT` | Port for the OTEL metrics                                                                 |               `8082`                | server                   | microservices      |
+| `IMMICH_PROCESS_INVALID_IMAGES`     | When `true`, generate thumbnails for invalid images                                       |                                     | server                   | microservices      |
+| `IMMICH_TRUSTED_PROXIES`            | List of comma-separated IPs set as trusted proxies                                        |                                     | server                   | api                |
+| `IMMICH_IGNORE_MOUNT_CHECK_ERRORS`  | See [System Integrity](/docs/administration/system-integrity)                             |                                     | server                   | api, microservices |
 
 \*1: `TZ` should be set to a `TZ identifier` from [this list][tz-list]. For example, `TZ="Etc/UTC"`.
 `TZ` is used by `exiftool` as a fallback in case the timezone cannot be determined from the image metadata. It is also used for logfile timestamps and cron job execution.
diff --git a/server/src/app.module.ts b/server/src/app.module.ts
index 9ea75d78c4..8d261463e7 100644
--- a/server/src/app.module.ts
+++ b/server/src/app.module.ts
@@ -5,7 +5,7 @@ import { ScheduleModule, SchedulerRegistry } from '@nestjs/schedule';
 import { ClsModule } from 'nestjs-cls';
 import { KyselyModule } from 'nestjs-kysely';
 import { OpenTelemetryModule } from 'nestjs-otel';
-import { commands } from 'src/commands';
+import { commandsAndQuestions } from 'src/commands';
 import { IWorker } from 'src/constants';
 import { controllers } from 'src/controllers';
 import { ImmichWorker } from 'src/enum';
@@ -97,7 +97,7 @@ export class MicroservicesModule extends BaseModule {}
 
 @Module({
   imports: [...imports],
-  providers: [...common, ...commands, SchedulerRegistry],
+  providers: [...common, ...commandsAndQuestions, SchedulerRegistry],
 })
 export class ImmichAdminModule implements OnModuleDestroy {
   constructor(private service: CliService) {}
diff --git a/server/src/commands/index.ts b/server/src/commands/index.ts
index ce085f6e34..46a8d13e35 100644
--- a/server/src/commands/index.ts
+++ b/server/src/commands/index.ts
@@ -1,11 +1,16 @@
 import { GrantAdminCommand, PromptEmailQuestion, RevokeAdminCommand } from 'src/commands/grant-admin';
 import { ListUsersCommand } from 'src/commands/list-users.command';
+import {
+  ChangeMediaLocationCommand,
+  PromptConfirmMoveQuestions,
+  PromptMediaLocationQuestions,
+} from 'src/commands/media-location.command';
 import { DisableOAuthLogin, EnableOAuthLogin } from 'src/commands/oauth-login';
 import { DisablePasswordLoginCommand, EnablePasswordLoginCommand } from 'src/commands/password-login';
 import { PromptPasswordQuestions, ResetAdminPasswordCommand } from 'src/commands/reset-admin-password.command';
 import { VersionCommand } from 'src/commands/version.command';
 
-export const commands = [
+export const commandsAndQuestions = [
   ResetAdminPasswordCommand,
   PromptPasswordQuestions,
   PromptEmailQuestion,
@@ -17,4 +22,7 @@ export const commands = [
   VersionCommand,
   GrantAdminCommand,
   RevokeAdminCommand,
+  ChangeMediaLocationCommand,
+  PromptMediaLocationQuestions,
+  PromptConfirmMoveQuestions,
 ];
diff --git a/server/src/commands/media-location.command.ts b/server/src/commands/media-location.command.ts
new file mode 100644
index 0000000000..0935fe202d
--- /dev/null
+++ b/server/src/commands/media-location.command.ts
@@ -0,0 +1,106 @@
+import { Command, CommandRunner, InquirerService, Question, QuestionSet } from 'nest-commander';
+import { CliService } from 'src/services/cli.service';
+
+@Command({
+  name: 'change-media-location',
+  description: 'Change database file paths to align with a new media location',
+})
+export class ChangeMediaLocationCommand extends CommandRunner {
+  constructor(
+    private service: CliService,
+    private inquirer: InquirerService,
+  ) {
+    super();
+  }
+
+  private async showSamplePaths(hint?: string) {
+    hint = hint ? ` (${hint})` : '';
+
+    const paths = await this.service.getSampleFilePaths();
+    if (paths.length > 0) {
+      let message = `  Examples from the database${hint}:\n`;
+      for (const path of paths) {
+        message += `  - ${path}\n`;
+      }
+
+      console.log(`\n${message}`);
+    }
+  }
+
+  async run(): Promise<void> {
+    try {
+      await this.showSamplePaths();
+
+      const { oldValue, newValue } = await this.inquirer.ask<{ oldValue: string; newValue: string }>(
+        'prompt-media-location',
+        {},
+      );
+
+      const success = await this.service.migrateFilePaths({
+        oldValue,
+        newValue,
+        confirm: async ({ sourceFolder, targetFolder }) => {
+          console.log(`
+  Previous value: ${oldValue}
+  Current value:  ${newValue}
+
+  Changing  from "${sourceFolder}/*" to "${targetFolder}/*"
+`);
+
+          const { value: confirmed } = await this.inquirer.ask<{ value: boolean }>('prompt-confirm-move', {});
+          return confirmed;
+        },
+      });
+
+      const successMessage = `Matching database file paths were updated successfully! 🎉
+
+  You may now set IMMICH_MEDIA_LOCATION=${newValue} and restart!
+
+  (please remember to update applicable volume mounts e.g
+    services:
+      immich-server:
+        ...
+        volumes:
+          - \${UPLOAD_LOCATION}:/usr/src/app/upload
+        ...
+  )`;
+
+      console.log(`\n  ${success ? successMessage : 'No rows were updated'}\n`);
+
+      await this.showSamplePaths('after');
+    } catch (error) {
+      console.error(error);
+      console.error('Unable to update database file paths.');
+    }
+  }
+}
+
+const currentValue = process.env.IMMICH_MEDIA_LOCATION || '';
+
+const makePrompt = (which: string) => {
+  return `Enter the ${which} value of IMMICH_MEDIA_LOCATION:${currentValue ? ` [${currentValue}]` : ''}`;
+};
+
+@QuestionSet({ name: 'prompt-media-location' })
+export class PromptMediaLocationQuestions {
+  @Question({ message: makePrompt('previous'), name: 'oldValue' })
+  oldValue(value: string) {
+    return value || currentValue;
+  }
+
+  @Question({ message: makePrompt('new'), name: 'newValue' })
+  newValue(value: string) {
+    return value || currentValue;
+  }
+}
+
+@QuestionSet({ name: 'prompt-confirm-move' })
+export class PromptConfirmMoveQuestions {
+  @Question({
+    message: 'Do you want to proceed? [Y/n]',
+    name: 'value',
+  })
+  value(value: string): boolean {
+    return ['yes', 'y'].includes((value || 'y').toLowerCase());
+  }
+}
diff --git a/server/src/constants.ts b/server/src/constants.ts
index 447d8a09c9..2d803c2e95 100644
--- a/server/src/constants.ts
+++ b/server/src/constants.ts
@@ -47,7 +47,7 @@ export const serverVersion = new SemVer(version);
 export const AUDIT_LOG_MAX_DURATION = Duration.fromObject({ days: 100 });
 export const ONE_HOUR = Duration.fromObject({ hours: 1 });
 
-export const APP_MEDIA_LOCATION = process.env.IMMICH_MEDIA_LOCATION || './upload';
+export const APP_MEDIA_LOCATION = process.env.IMMICH_MEDIA_LOCATION || '/usr/src/app/upload';
 
 export const MACHINE_LEARNING_PING_TIMEOUT = Number(process.env.MACHINE_LEARNING_PING_TIMEOUT || 2000);
 export const MACHINE_LEARNING_AVAILABILITY_BACKOFF_TIME = Number(
diff --git a/server/src/dtos/env.dto.ts b/server/src/dtos/env.dto.ts
index 99fd1d2149..3543d8dae9 100644
--- a/server/src/dtos/env.dto.ts
+++ b/server/src/dtos/env.dto.ts
@@ -1,5 +1,5 @@
 import { Transform, Type } from 'class-transformer';
-import { IsEnum, IsInt, IsString } from 'class-validator';
+import { IsEnum, IsInt, IsString, Matches } from 'class-validator';
 import { DatabaseSslMode, ImmichEnvironment, LogLevel } from 'src/enum';
 import { IsIPRange, Optional, ValidateBoolean } from 'src/validation';
 
@@ -48,6 +48,10 @@ export class EnvDto {
   @Optional()
   IMMICH_LOG_LEVEL?: LogLevel;
 
+  @Optional()
+  @Matches(/^\//, { message: 'IMMICH_MEDIA_LOCATION must be an absolute path' })
+  IMMICH_MEDIA_LOCATION?: string;
+
   @IsInt()
   @Optional()
   @Type(() => Number)
diff --git a/server/src/enum.ts b/server/src/enum.ts
index 587a76126f..e41a790999 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -198,6 +198,7 @@ export enum StorageFolder {
 }
 
 export enum SystemMetadataKey {
+  MediaLocation = 'MediaLocation',
   ReverseGeocodingState = 'reverse-geocoding-state',
   FacialRecognitionState = 'facial-recognition-state',
   MemoriesState = 'memories-state',
@@ -544,6 +545,7 @@ export enum DatabaseLock {
   CLIPDimSize = 512,
   Library = 1337,
   NightlyJobs = 600,
+  MediaLocation = 700,
   GetSystemConfig = 69,
   BackupDatabase = 42,
   MemoryCreation = 777,
diff --git a/server/src/queries/asset.repository.sql b/server/src/queries/asset.repository.sql
index e482a38a9a..9425bd9a11 100644
--- a/server/src/queries/asset.repository.sql
+++ b/server/src/queries/asset.repository.sql
@@ -168,6 +168,30 @@ from
 where
   "livePhotoVideoId" = $1::uuid
 
+-- AssetRepository.getFileSamples
+select
+  "asset"."id",
+  "asset"."originalPath",
+  "asset"."sidecarPath",
+  "asset"."encodedVideoPath",
+  (
+    select
+      coalesce(json_agg(agg), '[]')
+    from
+      (
+        select
+          "path"
+        from
+          "asset_file"
+        where
+          "asset"."id" = "asset_file"."assetId"
+      ) as agg
+  ) as "files"
+from
+  "asset"
+limit
+  3
+
 -- AssetRepository.getById
 select
   "asset".*
diff --git a/server/src/queries/person.repository.sql b/server/src/queries/person.repository.sql
index 3e41edde9c..8ad5b96bbc 100644
--- a/server/src/queries/person.repository.sql
+++ b/server/src/queries/person.repository.sql
@@ -12,6 +12,17 @@ delete from "person"
 where
   "person"."id" in ($1)
 
+-- PersonRepository.getFileSamples
+select
+  "id",
+  "thumbnailPath"
+from
+  "person"
+where
+  "thumbnailPath" != ''
+limit
+  3
+
 -- PersonRepository.getAllForUser
 select
   "person".*
diff --git a/server/src/queries/user.repository.sql b/server/src/queries/user.repository.sql
index f1809464bf..6a02654781 100644
--- a/server/src/queries/user.repository.sql
+++ b/server/src/queries/user.repository.sql
@@ -78,6 +78,17 @@ where
   "user"."isAdmin" = $1
   and "user"."deletedAt" is null
 
+-- UserRepository.getFileSamples
+select
+  "id",
+  "profileImagePath"
+from
+  "user"
+where
+  "profileImagePath" != ''
+limit
+  3
+
 -- UserRepository.hasAdmin
 select
   "user"."id"
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index cb7e804f6f..edbafaa22d 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { Insertable, Kysely, NotNull, Selectable, UpdateResult, Updateable, sql } from 'kysely';
+import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { isEmpty, isUndefined, omitBy } from 'lodash';
 import { InjectKysely } from 'nestjs-kysely';
 import { Stack } from 'src/database';
@@ -335,6 +336,23 @@ export class AssetRepository {
     return count;
   }
 
+  @GenerateSql()
+  getFileSamples() {
+    return this.db
+      .selectFrom('asset')
+      .select((eb) => [
+        'asset.id',
+        'asset.originalPath',
+        'asset.sidecarPath',
+        'asset.encodedVideoPath',
+        jsonArrayFrom(eb.selectFrom('asset_file').select('path').whereRef('asset.id', '=', 'asset_file.assetId')).as(
+          'files',
+        ),
+      ])
+      .limit(sql.lit(3))
+      .execute();
+  }
+
   @GenerateSql({ params: [DummyValue.UUID] })
   getById(id: string, { exifInfo, faces, files, library, owner, smartSearch, stack, tags }: GetByIdsRelations = {}) {
     return this.db
diff --git a/server/src/repositories/config.repository.spec.ts b/server/src/repositories/config.repository.spec.ts
index a096c6a4bc..99cba43b99 100644
--- a/server/src/repositories/config.repository.spec.ts
+++ b/server/src/repositories/config.repository.spec.ts
@@ -13,6 +13,7 @@ const resetEnv = () => {
     'IMMICH_WORKERS_EXCLUDE',
     'IMMICH_TRUSTED_PROXIES',
     'IMMICH_API_METRICS_PORT',
+    'IMMICH_MEDIA_LOCATION',
     'IMMICH_MICROSERVICES_METRICS_PORT',
     'IMMICH_TELEMETRY_INCLUDE',
     'IMMICH_TELEMETRY_EXCLUDE',
@@ -76,6 +77,13 @@ describe('getEnv', () => {
     });
   });
 
+  describe('IMMICH_MEDIA_LOCATION', () => {
+    it('should throw an error for relative paths', () => {
+      process.env.IMMICH_MEDIA_LOCATION = './relative/path';
+      expect(() => getEnv()).toThrowError('IMMICH_MEDIA_LOCATION must be an absolute path');
+    });
+  });
+
   describe('database', () => {
     it('should use defaults', () => {
       const { database } = getEnv();
@@ -95,7 +103,7 @@ describe('getEnv', () => {
 
     it('should validate DB_SSL_MODE', () => {
       process.env.DB_SSL_MODE = 'invalid';
-      expect(() => getEnv()).toThrowError('Invalid environment variables: DB_SSL_MODE');
+      expect(() => getEnv()).toThrowError('DB_SSL_MODE must be one of the following values:');
     });
 
     it('should accept a valid DB_SSL_MODE', () => {
@@ -239,7 +247,7 @@ describe('getEnv', () => {
 
     it('should reject invalid trusted proxies', () => {
       process.env.IMMICH_TRUSTED_PROXIES = '10.1';
-      expect(() => getEnv()).toThrowError('Invalid environment variables: IMMICH_TRUSTED_PROXIES');
+      expect(() => getEnv()).toThrow('IMMICH_TRUSTED_PROXIES must be an ip address, or ip address range');
     });
   });
 
diff --git a/server/src/repositories/config.repository.ts b/server/src/repositories/config.repository.ts
index 7038338927..c9e96a1803 100644
--- a/server/src/repositories/config.repository.ts
+++ b/server/src/repositories/config.repository.ts
@@ -131,9 +131,11 @@ const getEnv = (): EnvData => {
   const dto = plainToInstance(EnvDto, process.env);
   const errors = validateSync(dto);
   if (errors.length > 0) {
-    throw new Error(
-      `Invalid environment variables: ${errors.map((error) => `${error.property}=${error.value}`).join(', ')}`,
-    );
+    const messages = [`Invalid environment variables: `];
+    for (const error of errors) {
+      messages.push(`  - ${error.property}=${error.value} (${Object.values(error.constraints || {}).join(', ')})`);
+    }
+    throw new Error(messages.join('\n'));
   }
 
   const includedWorkers = asSet(dto.IMMICH_WORKERS_INCLUDE, [ImmichWorker.Api, ImmichWorker.Microservices]);
diff --git a/server/src/repositories/database.repository.ts b/server/src/repositories/database.repository.ts
index 8b5c728ce4..1f83630cfa 100644
--- a/server/src/repositories/database.repository.ts
+++ b/server/src/repositories/database.repository.ts
@@ -436,6 +436,39 @@ export class DatabaseRepository {
     this.logger.debug('Finished running kysely migrations');
   }
 
+  async migrateFilePaths(sourceFolder: string, targetFolder: string): Promise<void> {
+    // escaping regex special characters with a backslash
+    const sourceRegex = '^' + sourceFolder.replaceAll(/[-[\]{}()*+?.,\\^$|#\s]/g, String.raw`\$&`);
+    const source = sql.raw(`'${sourceRegex}'`);
+    const target = sql.lit(targetFolder);
+
+    await this.db.transaction().execute(async (tx) => {
+      await tx
+        .updateTable('asset')
+        .set((eb) => ({
+          originalPath: eb.fn('REGEXP_REPLACE', ['originalPath', source, target]),
+          encodedVideoPath: eb.fn('REGEXP_REPLACE', ['encodedVideoPath', source, target]),
+          sidecarPath: eb.fn('REGEXP_REPLACE', ['sidecarPath', source, target]),
+        }))
+        .execute();
+
+      await tx
+        .updateTable('asset_file')
+        .set((eb) => ({ path: eb.fn('REGEXP_REPLACE', ['path', source, target]) }))
+        .execute();
+
+      await tx
+        .updateTable('person')
+        .set((eb) => ({ thumbnailPath: eb.fn('REGEXP_REPLACE', ['thumbnailPath', source, target]) }))
+        .execute();
+
+      await tx
+        .updateTable('user')
+        .set((eb) => ({ profileImagePath: eb.fn('REGEXP_REPLACE', ['profileImagePath', source, target]) }))
+        .execute();
+    });
+  }
+
   async withLock<R>(lock: DatabaseLock, callback: () => Promise<R>): Promise<R> {
     let res;
     await this.asyncLock.acquire(DatabaseLock[lock], async () => {
diff --git a/server/src/repositories/person.repository.ts b/server/src/repositories/person.repository.ts
index 5b7d1d3700..f653bb8179 100644
--- a/server/src/repositories/person.repository.ts
+++ b/server/src/repositories/person.repository.ts
@@ -142,6 +142,16 @@ export class PersonRepository {
       .stream();
   }
 
+  @GenerateSql()
+  getFileSamples() {
+    return this.db
+      .selectFrom('person')
+      .select(['id', 'thumbnailPath'])
+      .where('thumbnailPath', '!=', sql.lit(''))
+      .limit(sql.lit(3))
+      .execute();
+  }
+
   @GenerateSql({ params: [{ take: 1, skip: 0 }, DummyValue.UUID] })
   async getAllForUser(pagination: PaginationOptions, userId: string, options?: PersonSearchOptions) {
     const items = await this.db
diff --git a/server/src/repositories/user.repository.ts b/server/src/repositories/user.repository.ts
index 715aa2dc32..9d5f19b26a 100644
--- a/server/src/repositories/user.repository.ts
+++ b/server/src/repositories/user.repository.ts
@@ -79,6 +79,16 @@ export class UserRepository {
       .executeTakeFirst();
   }
 
+  @GenerateSql()
+  getFileSamples() {
+    return this.db
+      .selectFrom('user')
+      .select(['id', 'profileImagePath'])
+      .where('profileImagePath', '!=', sql.lit(''))
+      .limit(sql.lit(3))
+      .execute();
+  }
+
   @GenerateSql()
   async hasAdmin(): Promise<boolean> {
     const admin = await this.db
diff --git a/server/src/schema/migrations/1752759108283-ConvertToAbsolutePaths.ts b/server/src/schema/migrations/1752759108283-ConvertToAbsolutePaths.ts
new file mode 100644
index 0000000000..68b0c7931e
--- /dev/null
+++ b/server/src/schema/migrations/1752759108283-ConvertToAbsolutePaths.ts
@@ -0,0 +1,39 @@
+import { Kysely, sql } from 'kysely';
+import { LoggingRepository } from 'src/repositories/logging.repository';
+
+const logger = LoggingRepository.create();
+logger.setContext('Migrations');
+
+export async function up(db: Kysely<any>): Promise<void> {
+  if (process.env.IMMICH_MEDIA_LOCATION) {
+    // do not automatically convert paths for a custom location/setting
+    return;
+  }
+
+  // we construct paths using `path.join(mediaLocation, ...)`, which strips the leading './'
+  const source = 'upload';
+  const target = '/usr/src/app/upload';
+
+  logger.log(`Converting database file paths from relative to absolute (source=${source}/*, target=${target}/*)`);
+
+  // escaping regex special characters with a backslash
+  const sourceRegex = '^' + source.replaceAll(/[-[\]{}()*+?.,\\^$|#\s]/g, String.raw`\$&`);
+
+  const items: Array<{ table: string; column: string }> = [
+    { table: 'asset', column: 'originalPath' },
+    { table: 'asset', column: 'encodedVideoPath' },
+    { table: 'asset', column: 'sidecarPath' },
+    { table: 'asset_file', column: 'path' },
+    { table: 'person', column: 'thumbnailPath' },
+    { table: 'user', column: 'profileImagePath' },
+  ];
+
+  for (const { table, column } of items) {
+    const query = `UPDATE "${table}" SET "${column}" = REGEXP_REPLACE("${column}", '${sourceRegex}', '${target}') WHERE "${column}" IS NOT NULL`;
+    await sql.raw(query).execute(db);
+  }
+}
+
+export async function down(): Promise<void> {
+  // not supported
+}
diff --git a/server/src/services/asset-media.service.spec.ts b/server/src/services/asset-media.service.spec.ts
index dccb79c585..08b42b6cbf 100644
--- a/server/src/services/asset-media.service.spec.ts
+++ b/server/src/services/asset-media.service.spec.ts
@@ -294,16 +294,16 @@ describe(AssetMediaService.name, () => {
 
     it('should return profile for profile uploads', () => {
       expect(sut.getUploadFolder(uploadFile.filename(UploadFieldName.PROFILE_DATA, 'image.jpg'))).toEqual(
-        'upload/profile/admin_id',
+        expect.stringContaining('upload/profile/admin_id'),
       );
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/profile/admin_id');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.stringContaining('upload/profile/admin_id'));
     });
 
     it('should return upload for everything else', () => {
       expect(sut.getUploadFolder(uploadFile.filename(UploadFieldName.ASSET_DATA, 'image.jpg'))).toEqual(
-        'upload/upload/admin_id/ra/nd',
+        expect.stringContaining('upload/upload/admin_id/ra/nd'),
       );
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/upload/admin_id/ra/nd');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.stringContaining('upload/upload/admin_id/ra/nd'));
     });
   });
 
@@ -913,7 +913,7 @@ describe(AssetMediaService.name, () => {
 
       expect(mocks.job.queue).toHaveBeenCalledWith({
         name: JobName.FileDelete,
-        data: { files: ['upload/upload/user-id/ra/nd/random-uuid.jpg'] },
+        data: { files: [expect.stringContaining('upload/upload/user-id/ra/nd/random-uuid.jpg')] },
       });
     });
   });
diff --git a/server/src/services/auth.service.spec.ts b/server/src/services/auth.service.spec.ts
index f52fd9dd81..129877bbdd 100644
--- a/server/src/services/auth.service.spec.ts
+++ b/server/src/services/auth.service.spec.ts
@@ -789,7 +789,7 @@ describe(AuthService.name, () => {
       ).resolves.toEqual(oauthResponse(user));
 
       expect(mocks.user.update).toHaveBeenCalledWith(user.id, {
-        profileImagePath: `upload/profile/${user.id}/${fileId}.jpg`,
+        profileImagePath: expect.stringContaining(`upload/profile/${user.id}/${fileId}.jpg`),
         profileChangedAt: expect.any(Date),
       });
       expect(mocks.oauth.getProfilePicture).toHaveBeenCalledWith(pictureUrl);
diff --git a/server/src/services/cli.service.ts b/server/src/services/cli.service.ts
index 021a5240f6..674b885dc4 100644
--- a/server/src/services/cli.service.ts
+++ b/server/src/services/cli.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@nestjs/common';
+import { isAbsolute } from 'node:path';
 import { SALT_ROUNDS } from 'src/constants';
 import { UserAdminResponseDto, mapUserAdmin } from 'src/dtos/user.dto';
 import { BaseService } from 'src/services/base.service';
@@ -67,6 +68,63 @@ export class CliService extends BaseService {
     await this.updateConfig(config);
   }
 
+  async getSampleFilePaths(): Promise<string[]> {
+    const [assets, people, users] = await Promise.all([
+      this.assetRepository.getFileSamples(),
+      this.personRepository.getFileSamples(),
+      this.userRepository.getFileSamples(),
+    ]);
+
+    const paths = [];
+
+    for (const person of people) {
+      paths.push(person.thumbnailPath);
+    }
+
+    for (const user of users) {
+      paths.push(user.profileImagePath);
+    }
+
+    for (const asset of assets) {
+      paths.push(
+        asset.originalPath,
+        asset.sidecarPath,
+        asset.encodedVideoPath,
+        ...asset.files.map((file) => file.path),
+      );
+    }
+
+    return paths.filter(Boolean) as string[];
+  }
+
+  async migrateFilePaths({
+    oldValue,
+    newValue,
+    confirm,
+  }: {
+    oldValue: string;
+    newValue: string;
+    confirm: (data: { sourceFolder: string; targetFolder: string }) => Promise<boolean>;
+  }): Promise<boolean> {
+    let sourceFolder = oldValue;
+    if (sourceFolder.startsWith('./')) {
+      sourceFolder = sourceFolder.slice(2);
+    }
+
+    const targetFolder = newValue;
+    if (!isAbsolute(targetFolder)) {
+      throw new Error('Target media location must be an absolute path');
+    }
+
+    if (!(await confirm({ sourceFolder, targetFolder }))) {
+      return false;
+    }
+
+    await this.databaseRepository.migrateFilePaths(sourceFolder, targetFolder);
+
+    return true;
+  }
+
   cleanup() {
     return this.databaseRepository.shutdown();
   }
diff --git a/server/src/services/download.service.spec.ts b/server/src/services/download.service.spec.ts
index 7646637093..940767ff67 100644
--- a/server/src/services/download.service.spec.ts
+++ b/server/src/services/download.service.spec.ts
@@ -1,4 +1,5 @@
 import { BadRequestException } from '@nestjs/common';
+import { APP_MEDIA_LOCATION } from 'src/constants';
 import { DownloadResponseDto } from 'src/dtos/download.dto';
 import { DownloadService } from 'src/services/download.service';
 import { assetStub } from 'test/fixtures/asset.stub';
@@ -46,7 +47,11 @@ describe(DownloadService.name, () => {
       });
 
       expect(archiveMock.addFile).toHaveBeenCalledTimes(1);
-      expect(archiveMock.addFile).toHaveBeenNthCalledWith(1, 'upload/library/IMG_123.jpg', 'IMG_123.jpg');
+      expect(archiveMock.addFile).toHaveBeenNthCalledWith(
+        1,
+        expect.stringContaining('upload/library/IMG_123.jpg'),
+        'IMG_123.jpg',
+      );
     });
 
     it('should log a warning if the original path could not be resolved', async () => {
@@ -279,9 +284,15 @@ describe(DownloadService.name, () => {
       mocks.downloadRepository.downloadAssetIds.mockReturnValue(
         makeStream([{ id: 'asset-1', livePhotoVideoId: 'asset-3', size: 5000 }]),
       );
+
       mocks.downloadRepository.downloadMotionAssetIds.mockReturnValue(
         makeStream([
-          { id: 'asset-2', livePhotoVideoId: null, size: 23_456, originalPath: 'upload/encoded-video/uuid-MP.mp4' },
+          {
+            id: 'asset-2',
+            livePhotoVideoId: null,
+            size: 23_456,
+            originalPath: APP_MEDIA_LOCATION + '/encoded-video/uuid-MP.mp4',
+          },
         ]),
       );
 
diff --git a/server/src/services/library.service.spec.ts b/server/src/services/library.service.spec.ts
index dac2b64ebc..308c80fb37 100644
--- a/server/src/services/library.service.spec.ts
+++ b/server/src/services/library.service.spec.ts
@@ -1,7 +1,7 @@
 import { BadRequestException } from '@nestjs/common';
 import { Stats } from 'node:fs';
 import { defaults, SystemConfig } from 'src/config';
-import { JOBS_LIBRARY_PAGINATION_SIZE } from 'src/constants';
+import { APP_MEDIA_LOCATION, JOBS_LIBRARY_PAGINATION_SIZE } from 'src/constants';
 import { mapLibrary } from 'src/dtos/library.dto';
 import { AssetType, CronJob, ImmichWorker, JobName, JobStatus } from 'src/enum';
 import { LibraryService } from 'src/services/library.service';
@@ -1264,7 +1264,7 @@ describe(LibraryService.name, () => {
     });
 
     it('should detect when import path is in immich media folder', async () => {
-      const importPaths = ['upload/thumbs', `${process.cwd()}/xyz`, 'upload/library'];
+      const importPaths = [APP_MEDIA_LOCATION + '/thumbs', `${process.cwd()}/xyz`, APP_MEDIA_LOCATION + '/library'];
       const library = factory.library({ importPaths });
 
       mocks.storage.stat.mockResolvedValue({ isDirectory: () => true } as Stats);
diff --git a/server/src/services/media.service.spec.ts b/server/src/services/media.service.spec.ts
index d3c361bb8a..0f4ba769c0 100644
--- a/server/src/services/media.service.spec.ts
+++ b/server/src/services/media.service.spec.ts
@@ -1,5 +1,6 @@
 import { OutputInfo } from 'sharp';
 import { SystemConfig } from 'src/config';
+import { APP_MEDIA_LOCATION } from 'src/constants';
 import { Exif } from 'src/database';
 import {
   AssetFileType,
@@ -204,19 +205,19 @@ describe(MediaService.name, () => {
         entityId: assetStub.image.id,
         pathType: AssetPathType.FullSize,
         oldPath: '/uploads/user-id/fullsize/path.webp',
-        newPath: 'upload/thumbs/user-id/as/se/asset-id-fullsize.jpeg',
+        newPath: expect.stringContaining('upload/thumbs/user-id/as/se/asset-id-fullsize.jpeg'),
       });
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: assetStub.image.id,
         pathType: AssetPathType.Preview,
         oldPath: '/uploads/user-id/thumbs/path.jpg',
-        newPath: 'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+        newPath: expect.stringContaining('upload/thumbs/user-id/as/se/asset-id-preview.jpeg'),
       });
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: assetStub.image.id,
         pathType: AssetPathType.Thumbnail,
         oldPath: '/uploads/user-id/webp/path.ext',
-        newPath: 'upload/thumbs/user-id/as/se/asset-id-thumbnail.webp',
+        newPath: expect.stringContaining('upload/thumbs/user-id/as/se/asset-id-thumbnail.webp'),
       });
       expect(mocks.move.create).toHaveBeenCalledTimes(3);
     });
@@ -295,7 +296,7 @@ describe(MediaService.name, () => {
 
       await sut.handleGenerateThumbnails({ id: assetStub.image.id });
 
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/thumbs/user-id/as/se');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.any(String));
 
       expect(mocks.media.decodeImage).toHaveBeenCalledOnce();
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(assetStub.image.originalPath, {
@@ -315,7 +316,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           raw: rawInfo,
         },
-        'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+        expect.any(String),
       );
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         rawBuffer,
@@ -327,7 +328,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           raw: rawInfo,
         },
-        'upload/thumbs/user-id/as/se/asset-id-thumbnail.webp',
+        expect.any(String),
       );
 
       expect(mocks.media.generateThumbhash).toHaveBeenCalledOnce();
@@ -341,12 +342,12 @@ describe(MediaService.name, () => {
         {
           assetId: 'asset-id',
           type: AssetFileType.Preview,
-          path: 'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+          path: expect.any(String),
         },
         {
           assetId: 'asset-id',
           type: AssetFileType.Thumbnail,
-          path: 'upload/thumbs/user-id/as/se/asset-id-thumbnail.webp',
+          path: expect.any(String),
         },
       ]);
       expect(mocks.asset.update).toHaveBeenCalledWith({ id: 'asset-id', thumbhash: thumbhashBuffer });
@@ -357,10 +358,10 @@ describe(MediaService.name, () => {
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.video);
       await sut.handleGenerateThumbnails({ id: assetStub.video.id });
 
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/thumbs/user-id/as/se');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.any(String));
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: ['-skip_frame nointra', '-sws_flags accurate_rnd+full_chroma_int'],
           outputOptions: [
@@ -377,12 +378,12 @@ describe(MediaService.name, () => {
         {
           assetId: 'asset-id',
           type: AssetFileType.Preview,
-          path: 'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+          path: expect.any(String),
         },
         {
           assetId: 'asset-id',
           type: AssetFileType.Thumbnail,
-          path: 'upload/thumbs/user-id/as/se/asset-id-thumbnail.webp',
+          path: expect.any(String),
         },
       ]);
     });
@@ -392,10 +393,10 @@ describe(MediaService.name, () => {
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.video);
       await sut.handleGenerateThumbnails({ id: assetStub.video.id });
 
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/thumbs/user-id/as/se');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.any(String));
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: ['-skip_frame nointra', '-sws_flags accurate_rnd+full_chroma_int'],
           outputOptions: [
@@ -412,12 +413,12 @@ describe(MediaService.name, () => {
         {
           assetId: 'asset-id',
           type: AssetFileType.Preview,
-          path: 'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+          path: expect.any(String),
         },
         {
           assetId: 'asset-id',
           type: AssetFileType.Thumbnail,
-          path: 'upload/thumbs/user-id/as/se/asset-id-thumbnail.webp',
+          path: expect.any(String),
         },
       ]);
     });
@@ -432,7 +433,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: ['-skip_frame nointra', '-sws_flags accurate_rnd+full_chroma_int'],
           outputOptions: [
@@ -453,7 +454,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: ['-sws_flags accurate_rnd+full_chroma_int'],
           outputOptions: expect.any(Array),
@@ -471,7 +472,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining([expect.stringContaining('scale=-2:1440')]),
@@ -485,12 +486,12 @@ describe(MediaService.name, () => {
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.image);
       const thumbhashBuffer = Buffer.from('a thumbhash', 'utf8');
       mocks.media.generateThumbhash.mockResolvedValue(thumbhashBuffer);
-      const previewPath = `upload/thumbs/user-id/as/se/asset-id-preview.${format}`;
-      const thumbnailPath = `upload/thumbs/user-id/as/se/asset-id-thumbnail.webp`;
+      const previewPath = APP_MEDIA_LOCATION + `/thumbs/user-id/as/se/asset-id-preview.${format}`;
+      const thumbnailPath = APP_MEDIA_LOCATION + `/thumbs/user-id/as/se/asset-id-thumbnail.webp`;
 
       await sut.handleGenerateThumbnails({ id: assetStub.image.id });
 
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/thumbs/user-id/as/se');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.any(String));
       expect(mocks.media.decodeImage).toHaveBeenCalledOnce();
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(assetStub.image.originalPath, {
         colorspace: Colorspace.Srgb,
@@ -530,12 +531,12 @@ describe(MediaService.name, () => {
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.image);
       const thumbhashBuffer = Buffer.from('a thumbhash', 'utf8');
       mocks.media.generateThumbhash.mockResolvedValue(thumbhashBuffer);
-      const previewPath = `upload/thumbs/user-id/as/se/asset-id-preview.jpeg`;
-      const thumbnailPath = `upload/thumbs/user-id/as/se/asset-id-thumbnail.${format}`;
+      const previewPath = expect.stringContaining(`upload/thumbs/user-id/as/se/asset-id-preview.jpeg`);
+      const thumbnailPath = expect.stringContaining(`upload/thumbs/user-id/as/se/asset-id-thumbnail.${format}`);
 
       await sut.handleGenerateThumbnails({ id: assetStub.image.id });
 
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/thumbs/user-id/as/se');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.any(String));
       expect(mocks.media.decodeImage).toHaveBeenCalledOnce();
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(assetStub.image.originalPath, {
         colorspace: Colorspace.Srgb,
@@ -658,12 +659,12 @@ describe(MediaService.name, () => {
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         rawBuffer,
         expect.objectContaining({ processInvalidImages: false }),
-        'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+        expect.any(String),
       );
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         rawBuffer,
         expect.objectContaining({ processInvalidImages: false }),
-        'upload/thumbs/user-id/as/se/asset-id-thumbnail.webp',
+        expect.any(String),
       );
 
       expect(mocks.media.generateThumbhash).toHaveBeenCalledOnce();
@@ -704,7 +705,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           raw: rawInfo,
         },
-        'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+        expect.any(String),
       );
     });
 
@@ -734,7 +735,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           raw: rawInfo,
         },
-        'upload/thumbs/user-id/as/se/asset-id-fullsize.webp',
+        expect.any(String),
       );
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         fullsizeBuffer,
@@ -746,7 +747,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           raw: rawInfo,
         },
-        'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+        expect.any(String),
       );
     });
 
@@ -774,7 +775,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           raw: rawInfo,
         },
-        'upload/thumbs/user-id/as/se/asset-id-fullsize.jpeg',
+        expect.any(String),
       );
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         rawBuffer,
@@ -786,7 +787,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           raw: rawInfo,
         },
-        'upload/thumbs/user-id/as/se/asset-id-preview.jpeg',
+        expect.any(String),
       );
     });
 
@@ -815,7 +816,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           raw: rawInfo,
         },
-        'upload/thumbs/user-id/as/se/asset-id-fullsize.jpeg',
+        expect.any(String),
       );
     });
 
@@ -838,7 +839,7 @@ describe(MediaService.name, () => {
       expect(mocks.media.generateThumbnail).not.toHaveBeenCalledWith(
         expect.anything(),
         expect.anything(),
-        'upload/thumbs/user-id/as/se/asset-id-fullsize.jpeg',
+        expect.stringContaining('fullsize.jpeg'),
       );
     });
 
@@ -869,7 +870,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           raw: rawInfo,
         },
-        'upload/thumbs/user-id/as/se/asset-id-fullsize.webp',
+        expect.any(String),
       );
     });
   });
@@ -911,7 +912,7 @@ describe(MediaService.name, () => {
       );
 
       expect(mocks.person.getDataForThumbnailGenerationJob).toHaveBeenCalledWith(personStub.primaryPerson.id);
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/thumbs/admin_id/pe/rs');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.any(String));
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(personThumbnailStub.newThumbnailMiddle.originalPath, {
         colorspace: Colorspace.P3,
         orientation: undefined,
@@ -933,12 +934,9 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           size: 250,
         },
-        'upload/thumbs/admin_id/pe/rs/person-1.jpeg',
+        expect.any(String),
       );
-      expect(mocks.person.update).toHaveBeenCalledWith({
-        id: 'person-1',
-        thumbnailPath: 'upload/thumbs/admin_id/pe/rs/person-1.jpeg',
-      });
+      expect(mocks.person.update).toHaveBeenCalledWith({ id: 'person-1', thumbnailPath: expect.any(String) });
     });
 
     it('should use preview path if video', async () => {
@@ -953,7 +951,7 @@ describe(MediaService.name, () => {
       );
 
       expect(mocks.person.getDataForThumbnailGenerationJob).toHaveBeenCalledWith(personStub.primaryPerson.id);
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/thumbs/admin_id/pe/rs');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.any(String));
       expect(mocks.media.decodeImage).toHaveBeenCalledWith(personThumbnailStub.newThumbnailMiddle.previewPath, {
         colorspace: Colorspace.P3,
         orientation: undefined,
@@ -975,12 +973,9 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           size: 250,
         },
-        'upload/thumbs/admin_id/pe/rs/person-1.jpeg',
+        expect.any(String),
       );
-      expect(mocks.person.update).toHaveBeenCalledWith({
-        id: 'person-1',
-        thumbnailPath: 'upload/thumbs/admin_id/pe/rs/person-1.jpeg',
-      });
+      expect(mocks.person.update).toHaveBeenCalledWith({ id: 'person-1', thumbnailPath: expect.any(String) });
     });
 
     it('should generate a thumbnail without going negative', async () => {
@@ -1015,7 +1010,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           size: 250,
         },
-        'upload/thumbs/admin_id/pe/rs/person-1.jpeg',
+        expect.any(String),
       );
     });
 
@@ -1052,7 +1047,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           size: 250,
         },
-        'upload/thumbs/admin_id/pe/rs/person-1.jpeg',
+        expect.any(String),
       );
     });
 
@@ -1089,7 +1084,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           size: 250,
         },
-        'upload/thumbs/admin_id/pe/rs/person-1.jpeg',
+        expect.any(String),
       );
     });
 
@@ -1126,7 +1121,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           size: 250,
         },
-        'upload/thumbs/admin_id/pe/rs/person-1.jpeg',
+        expect.any(String),
       );
     });
 
@@ -1168,7 +1163,7 @@ describe(MediaService.name, () => {
           processInvalidImages: false,
           size: 250,
         },
-        'upload/thumbs/admin_id/pe/rs/person-1.jpeg',
+        expect.any(String),
       );
     });
 
@@ -1288,7 +1283,7 @@ describe(MediaService.name, () => {
       expect(mocks.storage.mkdirSync).toHaveBeenCalled();
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-map 0:1', '-map 0:3']),
@@ -1308,7 +1303,7 @@ describe(MediaService.name, () => {
       expect(mocks.storage.mkdirSync).toHaveBeenCalled();
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-map 0:0', '-map 0:2']),
@@ -1354,7 +1349,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.any(Array),
@@ -1369,7 +1364,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.any(Array),
@@ -1384,7 +1379,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.any(Array),
@@ -1399,7 +1394,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.any(Array),
@@ -1416,7 +1411,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.not.arrayContaining([expect.stringContaining('scale')]),
@@ -1431,7 +1426,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining([expect.stringMatching(/scale(_.+)?=-2:720/)]),
@@ -1446,7 +1441,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining([expect.stringMatching(/scale(_.+)?=720:-2/)]),
@@ -1463,7 +1458,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining([expect.stringMatching(/scale(_.+)?=-2:354/)]),
@@ -1480,7 +1475,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining([expect.stringMatching(/scale(_.+)?=354:-2/)]),
@@ -1497,7 +1492,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v copy', '-c:a aac']),
@@ -1518,7 +1513,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.not.arrayContaining(['-tag:v hvc1']),
@@ -1539,7 +1534,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v copy', '-tag:v hvc1']),
@@ -1554,7 +1549,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v h264', '-c:a copy']),
@@ -1568,7 +1563,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v copy', '-c:a copy']),
@@ -1627,7 +1622,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v h264', '-maxrate 4500k', '-bufsize 9000k']),
@@ -1642,7 +1637,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v h264', '-maxrate 4500k', '-bufsize 9000k']),
@@ -1657,7 +1652,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v h264', '-b:v 3104k', '-minrate 1552k', '-maxrate 4500k']),
@@ -1672,7 +1667,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v h264', '-c:a copy']),
@@ -1693,7 +1688,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-b:v 3104k', '-minrate 1552k', '-maxrate 4500k']),
@@ -1714,7 +1709,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.not.arrayContaining([expect.stringContaining('-maxrate')]),
@@ -1729,7 +1724,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-cpu-used 2']),
@@ -1744,7 +1739,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.not.arrayContaining([expect.stringContaining('-cpu-used')]),
@@ -1759,7 +1754,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-threads 2']),
@@ -1774,7 +1769,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-threads 1', '-x264-params frame-threads=1:pools=none']),
@@ -1789,7 +1784,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.not.arrayContaining([expect.stringContaining('-threads')]),
@@ -1804,7 +1799,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v hevc', '-threads 1', '-x265-params frame-threads=1:pools=none']),
@@ -1819,7 +1814,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.not.arrayContaining([expect.stringContaining('-threads')]),
@@ -1834,7 +1829,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining([
@@ -1859,7 +1854,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-preset 4']),
@@ -1874,7 +1869,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-svtav1-params mbr=2M']),
@@ -1889,7 +1884,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-svtav1-params lp=4']),
@@ -1906,7 +1901,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-svtav1-params lp=4:mbr=2M']),
@@ -1950,7 +1945,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-init_hw_device cuda=cuda:0', '-filter_hw_device cuda']),
           outputOptions: expect.arrayContaining([
@@ -1987,7 +1982,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-init_hw_device cuda=cuda:0', '-filter_hw_device cuda']),
           outputOptions: expect.arrayContaining([expect.stringContaining('-multipass')]),
@@ -2004,7 +1999,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-init_hw_device cuda=cuda:0', '-filter_hw_device cuda']),
           outputOptions: expect.arrayContaining(['-cq:v 23', '-maxrate 10000k', '-bufsize 6897k']),
@@ -2021,7 +2016,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-init_hw_device cuda=cuda:0', '-filter_hw_device cuda']),
           outputOptions: expect.not.stringContaining('-maxrate'),
@@ -2038,7 +2033,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-init_hw_device cuda=cuda:0', '-filter_hw_device cuda']),
           outputOptions: expect.not.arrayContaining([expect.stringContaining('-preset')]),
@@ -2053,7 +2048,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-init_hw_device cuda=cuda:0', '-filter_hw_device cuda']),
           outputOptions: expect.not.arrayContaining([expect.stringContaining('-multipass')]),
@@ -2070,7 +2065,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-hwaccel cuda',
@@ -2092,7 +2087,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-hwaccel cuda', '-hwaccel_output_format cuda']),
           outputOptions: expect.arrayContaining([
@@ -2113,7 +2108,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-hwaccel cuda', '-hwaccel_output_format cuda']),
           outputOptions: expect.arrayContaining([expect.stringContaining('scale_cuda=-2:720:format=nv12')]),
@@ -2130,7 +2125,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device qsv=hw,child_device=/dev/dri/renderD128',
@@ -2170,7 +2165,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device qsv=hw,child_device=/dev/dri/renderD128',
@@ -2190,7 +2185,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device qsv=hw,child_device=/dev/dri/renderD128',
@@ -2210,7 +2205,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device qsv=hw,child_device=/dev/dri/renderD128',
@@ -2239,7 +2234,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device qsv=hw,child_device=/dev/dri/renderD129',
@@ -2261,7 +2256,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-hwaccel qsv',
@@ -2287,7 +2282,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-hwaccel qsv',
@@ -2315,7 +2310,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-hwaccel qsv', '-qsv_device /dev/dri/renderD129']),
           outputOptions: expect.any(Array),
@@ -2334,7 +2329,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-hwaccel qsv',
@@ -2354,7 +2349,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device vaapi=accel:/dev/dri/renderD128',
@@ -2386,7 +2381,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device vaapi=accel:/dev/dri/renderD128',
@@ -2410,7 +2405,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device vaapi=accel:/dev/dri/renderD128',
@@ -2436,7 +2431,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device vaapi=accel:/dev/dri/renderD128',
@@ -2455,7 +2450,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device vaapi=accel:/dev/dri/renderD129',
@@ -2476,7 +2471,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device vaapi=accel:/dev/dri/renderD128',
@@ -2498,7 +2493,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-hwaccel vaapi',
@@ -2523,7 +2518,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-hwaccel vaapi', '-hwaccel_output_format vaapi', '-threads 1']),
           outputOptions: expect.arrayContaining([
@@ -2546,7 +2541,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-hwaccel vaapi', '-hwaccel_output_format vaapi', '-threads 1']),
           outputOptions: expect.arrayContaining([expect.stringContaining('format=nv12')]),
@@ -2565,7 +2560,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-hwaccel vaapi', '-hwaccel_device /dev/dri/renderD129']),
           outputOptions: expect.any(Array),
@@ -2584,7 +2579,7 @@ describe(MediaService.name, () => {
       expect(mocks.media.transcode).toHaveBeenCalledTimes(2);
       expect(mocks.media.transcode).toHaveBeenLastCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-init_hw_device vaapi=accel:/dev/dri/renderD128',
@@ -2607,7 +2602,7 @@ describe(MediaService.name, () => {
       expect(mocks.media.transcode).toHaveBeenCalledTimes(3);
       expect(mocks.media.transcode).toHaveBeenLastCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v h264']),
@@ -2624,7 +2619,7 @@ describe(MediaService.name, () => {
       expect(mocks.media.transcode).toHaveBeenCalledTimes(2);
       expect(mocks.media.transcode).toHaveBeenLastCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v h264']),
@@ -2649,7 +2644,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining([
             '-hwaccel rkmpp',
@@ -2689,7 +2684,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-hwaccel rkmpp', '-hwaccel_output_format drm_prime', '-afbc rga']),
           outputOptions: expect.arrayContaining([`-c:v hevc_rkmpp`, '-level 153', '-rc_mode AVBR', '-b:v 10000k']),
@@ -2706,7 +2701,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-hwaccel rkmpp', '-hwaccel_output_format drm_prime', '-afbc rga']),
           outputOptions: expect.arrayContaining([`-c:v h264_rkmpp`, '-level 51', '-rc_mode CQP', '-qp_init 30']),
@@ -2723,7 +2718,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-hwaccel rkmpp', '-hwaccel_output_format drm_prime', '-afbc rga']),
           outputOptions: expect.arrayContaining([
@@ -2745,7 +2740,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.arrayContaining(['-hwaccel rkmpp', '-hwaccel_output_format drm_prime', '-afbc rga']),
           outputOptions: expect.arrayContaining([
@@ -2764,7 +2759,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: [],
           outputOptions: expect.arrayContaining([
@@ -2786,7 +2781,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining([
@@ -2805,7 +2800,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining([
@@ -2824,7 +2819,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining([
@@ -2843,7 +2838,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v h264', '-c:a copy', '-vf format=yuv420p']),
@@ -2858,7 +2853,7 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        expect.any(String),
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:v h264', '-c:a copy', '-vf scale=-2:720,format=yuv420p']),
@@ -2874,19 +2869,15 @@ describe(MediaService.name, () => {
       await sut.handleVideoConversion({ id: assetStub.video.id });
 
       expect(mocks.media.probe).toHaveBeenCalledWith(assetStub.video.originalPath, { countFrames: true });
-      expect(mocks.media.transcode).toHaveBeenCalledWith(
-        assetStub.video.originalPath,
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
-        {
-          inputOptions: expect.any(Array),
-          outputOptions: expect.any(Array),
-          twoPass: false,
-          progress: {
-            frameCount: probeStub.videoStream2160p.videoStreams[0].frameCount,
-            percentInterval: expect.any(Number),
-          },
+      expect(mocks.media.transcode).toHaveBeenCalledWith(assetStub.video.originalPath, expect.any(String), {
+        inputOptions: expect.any(Array),
+        outputOptions: expect.any(Array),
+        twoPass: false,
+        progress: {
+          frameCount: probeStub.videoStream2160p.videoStreams[0].frameCount,
+          percentInterval: expect.any(Number),
         },
-      );
+      });
     });
 
     it('should not count frames for progress when log level is not debug', async () => {
@@ -2904,7 +2895,7 @@ describe(MediaService.name, () => {
 
       expect(mocks.media.transcode).toHaveBeenCalledWith(
         '/original/path.ext',
-        'upload/encoded-video/user-id/as/se/asset-id.mp4',
+        APP_MEDIA_LOCATION + '/encoded-video/user-id/as/se/asset-id.mp4',
         expect.objectContaining({
           inputOptions: expect.any(Array),
           outputOptions: expect.arrayContaining(['-c:a copy']),
diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.ts
index 77f0b50a0a..cc0956b9a8 100644
--- a/server/src/services/metadata.service.spec.ts
+++ b/server/src/services/metadata.service.spec.ts
@@ -587,7 +587,7 @@ describe(MetadataService.name, () => {
         libraryId: assetStub.livePhotoWithOriginalFileName.libraryId,
         localDateTime: assetStub.livePhotoWithOriginalFileName.fileCreatedAt,
         originalFileName: 'asset_1.mp4',
-        originalPath: 'upload/encoded-video/user-id/li/ve/live-photo-motion-asset-MP.mp4',
+        originalPath: expect.stringContaining('upload/encoded-video/user-id/li/ve/live-photo-motion-asset-MP.mp4'),
         ownerId: assetStub.livePhotoWithOriginalFileName.ownerId,
         type: AssetType.Video,
       });
@@ -645,7 +645,7 @@ describe(MetadataService.name, () => {
         libraryId: assetStub.livePhotoWithOriginalFileName.libraryId,
         localDateTime: assetStub.livePhotoWithOriginalFileName.fileCreatedAt,
         originalFileName: 'asset_1.mp4',
-        originalPath: 'upload/encoded-video/user-id/li/ve/live-photo-motion-asset-MP.mp4',
+        originalPath: expect.stringContaining('upload/encoded-video/user-id/li/ve/live-photo-motion-asset-MP.mp4'),
         ownerId: assetStub.livePhotoWithOriginalFileName.ownerId,
         type: AssetType.Video,
       });
@@ -703,7 +703,7 @@ describe(MetadataService.name, () => {
         libraryId: assetStub.livePhotoWithOriginalFileName.libraryId,
         localDateTime: assetStub.livePhotoWithOriginalFileName.fileCreatedAt,
         originalFileName: 'asset_1.mp4',
-        originalPath: 'upload/encoded-video/user-id/li/ve/live-photo-motion-asset-MP.mp4',
+        originalPath: expect.stringContaining('upload/encoded-video/user-id/li/ve/live-photo-motion-asset-MP.mp4'),
         ownerId: assetStub.livePhotoWithOriginalFileName.ownerId,
         type: AssetType.Video,
       });
diff --git a/server/src/services/server.service.spec.ts b/server/src/services/server.service.spec.ts
index 0ddf3d69b1..06ddd32601 100644
--- a/server/src/services/server.service.spec.ts
+++ b/server/src/services/server.service.spec.ts
@@ -28,7 +28,7 @@ describe(ServerService.name, () => {
         diskUseRaw: 300,
       });
 
-      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith('upload/library');
+      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith(expect.stringContaining('upload/library'));
     });
 
     it('should return the disk space as KiB', async () => {
@@ -44,7 +44,7 @@ describe(ServerService.name, () => {
         diskUseRaw: 300_000,
       });
 
-      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith('upload/library');
+      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith(expect.stringContaining('upload/library'));
     });
 
     it('should return the disk space as MiB', async () => {
@@ -60,7 +60,7 @@ describe(ServerService.name, () => {
         diskUseRaw: 300_000_000,
       });
 
-      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith('upload/library');
+      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith(expect.stringContaining('upload/library'));
     });
 
     it('should return the disk space as GiB', async () => {
@@ -80,7 +80,7 @@ describe(ServerService.name, () => {
         diskUseRaw: 300_000_000_000,
       });
 
-      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith('upload/library');
+      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith(expect.stringContaining('upload/library'));
     });
 
     it('should return the disk space as TiB', async () => {
@@ -100,7 +100,7 @@ describe(ServerService.name, () => {
         diskUseRaw: 300_000_000_000_000,
       });
 
-      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith('upload/library');
+      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith(expect.stringContaining('upload/library'));
     });
 
     it('should return the disk space as PiB', async () => {
@@ -120,7 +120,7 @@ describe(ServerService.name, () => {
         diskUseRaw: 300_000_000_000_000_000,
       });
 
-      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith('upload/library');
+      expect(mocks.storage.checkDiskUsage).toHaveBeenCalledWith(expect.stringContaining('upload/library'));
     });
   });
 
diff --git a/server/src/services/storage-template.service.spec.ts b/server/src/services/storage-template.service.spec.ts
index 2751651dbf..882ffcd328 100644
--- a/server/src/services/storage-template.service.spec.ts
+++ b/server/src/services/storage-template.service.spec.ts
@@ -1,5 +1,6 @@
 import { Stats } from 'node:fs';
 import { defaults, SystemConfig } from 'src/config';
+import { APP_MEDIA_LOCATION } from 'src/constants';
 import { AssetPathType, JobStatus } from 'src/enum';
 import { StorageTemplateService } from 'src/services/storage-template.service';
 import { albumStub } from 'test/fixtures/album.stub';
@@ -110,8 +111,10 @@ describe(StorageTemplateService.name, () => {
 
     it('should migrate single moving picture', async () => {
       mocks.user.get.mockResolvedValue(userStub.user1);
-      const newMotionPicturePath = `upload/library/${motionAsset.ownerId}/2022/2022-06-19/${motionAsset.originalFileName}`;
-      const newStillPicturePath = `upload/library/${stillAsset.ownerId}/2022/2022-06-19/${stillAsset.originalFileName}`;
+      const newMotionPicturePath =
+        APP_MEDIA_LOCATION + `/library/${motionAsset.ownerId}/2022/2022-06-19/${motionAsset.originalFileName}`;
+      const newStillPicturePath =
+        APP_MEDIA_LOCATION + `/library/${stillAsset.ownerId}/2022/2022-06-19/${stillAsset.originalFileName}`;
 
       mocks.assetJob.getForStorageTemplateJob.mockResolvedValueOnce(stillAsset);
       mocks.assetJob.getForStorageTemplateJob.mockResolvedValueOnce(motionAsset);
@@ -156,7 +159,9 @@ describe(StorageTemplateService.name, () => {
 
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: asset.id,
-        newPath: `upload/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/${album.albumName}/${asset.originalFileName}`,
+        newPath: expect.stringContaining(
+          `upload/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/${album.albumName}/${asset.originalFileName}`,
+        ),
         oldPath: asset.originalPath,
         pathType: AssetPathType.Original,
       });
@@ -177,7 +182,9 @@ describe(StorageTemplateService.name, () => {
       const month = (asset.fileCreatedAt.getMonth() + 1).toString().padStart(2, '0');
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: asset.id,
-        newPath: `upload/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/other/${month}/${asset.originalFileName}`,
+        newPath: expect.stringContaining(
+          `upload/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/other/${month}/${asset.originalFileName}`,
+        ),
         oldPath: asset.originalPath,
         pathType: AssetPathType.Original,
       });
@@ -211,7 +218,9 @@ describe(StorageTemplateService.name, () => {
       const month = (asset.fileCreatedAt.getMonth() + 1).toString().padStart(2, '0');
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: asset.id,
-        newPath: `upload/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/${month} - ${album.albumName}/${asset.originalFileName}`,
+        newPath: expect.stringContaining(
+          `upload/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/${month} - ${album.albumName}/${asset.originalFileName}`,
+        ),
         oldPath: asset.originalPath,
         pathType: AssetPathType.Original,
       });
@@ -234,7 +243,9 @@ describe(StorageTemplateService.name, () => {
       const month = (asset.fileCreatedAt.getMonth() + 1).toString().padStart(2, '0');
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: asset.id,
-        newPath: `upload/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/${month}/${asset.originalFileName}`,
+        newPath:
+          APP_MEDIA_LOCATION +
+          `/library/${user.id}/${asset.fileCreatedAt.getFullYear()}/${month}/${asset.originalFileName}`,
         oldPath: asset.originalPath,
         pathType: AssetPathType.Original,
       });
@@ -244,8 +255,9 @@ describe(StorageTemplateService.name, () => {
       mocks.user.get.mockResolvedValue(userStub.user1);
 
       const asset = assetStub.storageAsset();
-      const previousFailedNewPath = `upload/library/${userStub.user1.id}/2023/Feb/${asset.originalFileName}`;
-      const newPath = `upload/library/${userStub.user1.id}/2022/2022-06-19/${asset.originalFileName}`;
+      const previousFailedNewPath =
+        APP_MEDIA_LOCATION + `/library/${userStub.user1.id}/2023/Feb/${asset.originalFileName}`;
+      const newPath = APP_MEDIA_LOCATION + `/library/${userStub.user1.id}/2022/2022-06-19/${asset.originalFileName}`;
 
       mocks.storage.checkFileExists.mockImplementation((path) => Promise.resolve(path === asset.originalPath));
       mocks.move.getByEntity.mockResolvedValue({
@@ -284,8 +296,9 @@ describe(StorageTemplateService.name, () => {
       mocks.user.get.mockResolvedValue(userStub.user1);
 
       const asset = assetStub.storageAsset({ fileSizeInByte: 5000 });
-      const previousFailedNewPath = `upload/library/${asset.ownerId}/2022/June/${asset.originalFileName}`;
-      const newPath = `upload/library/${asset.ownerId}/2022/2022-06-19/${asset.originalFileName}`;
+      const previousFailedNewPath =
+        APP_MEDIA_LOCATION + `/library/${asset.ownerId}/2022/June/${asset.originalFileName}`;
+      const newPath = APP_MEDIA_LOCATION + `/library/${asset.ownerId}/2022/2022-06-19/${asset.originalFileName}`;
 
       mocks.storage.checkFileExists.mockImplementation((path) => Promise.resolve(path === previousFailedNewPath));
       mocks.storage.stat.mockResolvedValue({ size: 5000 } as Stats);
@@ -319,7 +332,8 @@ describe(StorageTemplateService.name, () => {
 
     it('should fail move if copying and hash of asset and the new file do not match', async () => {
       mocks.user.get.mockResolvedValue(userStub.user1);
-      const newPath = `upload/library/${userStub.user1.id}/2022/2022-06-19/${testAsset.originalFileName}`;
+      const newPath =
+        APP_MEDIA_LOCATION + `/library/${userStub.user1.id}/2022/2022-06-19/${testAsset.originalFileName}`;
 
       mocks.storage.rename.mockRejectedValue({ code: 'EXDEV' });
       mocks.storage.stat.mockResolvedValue({ size: 5000 } as Stats);
@@ -409,7 +423,7 @@ describe(StorageTemplateService.name, () => {
     it('should handle an asset with a duplicate destination', async () => {
       const asset = assetStub.storageAsset();
       const oldPath = asset.originalPath;
-      const newPath = `upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`;
+      const newPath = APP_MEDIA_LOCATION + `/library/user-id/2022/2022-06-19/${asset.originalFileName}`;
       const newPath2 = newPath.replace('.jpg', '+1.jpg');
 
       mocks.assetJob.streamForStorageTemplateJob.mockReturnValue(makeStream([asset]));
@@ -466,7 +480,7 @@ describe(StorageTemplateService.name, () => {
     it('should move an asset', async () => {
       const asset = assetStub.storageAsset();
       const oldPath = asset.originalPath;
-      const newPath = `upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`;
+      const newPath = APP_MEDIA_LOCATION + `/library/user-id/2022/2022-06-19/${asset.originalFileName}`;
       mocks.assetJob.streamForStorageTemplateJob.mockReturnValue(makeStream([asset]));
       mocks.user.getList.mockResolvedValue([userStub.user1]);
       mocks.move.create.mockResolvedValue({
@@ -502,18 +516,20 @@ describe(StorageTemplateService.name, () => {
       expect(mocks.assetJob.streamForStorageTemplateJob).toHaveBeenCalled();
       expect(mocks.storage.rename).toHaveBeenCalledWith(
         '/original/path.jpg',
-        `upload/library/${user.storageLabel}/2022/2022-06-19/${asset.originalFileName}`,
+        expect.stringContaining(`upload/library/${user.storageLabel}/2022/2022-06-19/${asset.originalFileName}`),
       );
       expect(mocks.asset.update).toHaveBeenCalledWith({
         id: asset.id,
-        originalPath: `upload/library/${user.storageLabel}/2022/2022-06-19/${asset.originalFileName}`,
+        originalPath: expect.stringContaining(
+          `upload/library/${user.storageLabel}/2022/2022-06-19/${asset.originalFileName}`,
+        ),
       });
     });
 
     it('should copy the file if rename fails due to EXDEV (rename across filesystems)', async () => {
       const asset = assetStub.storageAsset({ originalPath: '/path/to/original.jpg', fileSizeInByte: 5000 });
       const oldPath = asset.originalPath;
-      const newPath = `upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`;
+      const newPath = APP_MEDIA_LOCATION + `/library/user-id/2022/2022-06-19/${asset.originalFileName}`;
       mocks.assetJob.streamForStorageTemplateJob.mockReturnValue(makeStream([asset]));
       mocks.storage.rename.mockRejectedValue({ code: 'EXDEV' });
       mocks.user.getList.mockResolvedValue([userStub.user1]);
@@ -572,14 +588,14 @@ describe(StorageTemplateService.name, () => {
       expect(mocks.assetJob.streamForStorageTemplateJob).toHaveBeenCalled();
       expect(mocks.storage.rename).toHaveBeenCalledWith(
         '/original/path.jpg',
-        `upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`,
+        expect.stringContaining(`upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`),
       );
       expect(mocks.storage.copyFile).toHaveBeenCalledWith(
         '/original/path.jpg',
-        `upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`,
+        expect.stringContaining(`upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`),
       );
       expect(mocks.storage.stat).toHaveBeenCalledWith(
-        `upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`,
+        expect.stringContaining(`upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`),
       );
       expect(mocks.asset.update).not.toHaveBeenCalled();
     });
@@ -603,7 +619,7 @@ describe(StorageTemplateService.name, () => {
       expect(mocks.assetJob.streamForStorageTemplateJob).toHaveBeenCalled();
       expect(mocks.storage.rename).toHaveBeenCalledWith(
         '/original/path.jpg',
-        `upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`,
+        expect.stringContaining(`upload/library/user-id/2022/2022-06-19/${asset.originalFileName}`),
       );
       expect(mocks.asset.update).not.toHaveBeenCalled();
     });
@@ -631,8 +647,8 @@ describe(StorageTemplateService.name, () => {
 
       expect(mocks.assetJob.streamForStorageTemplateJob).toHaveBeenCalled();
       expect(mocks.storage.rename).toHaveBeenCalledWith(
-        `upload/library/${user.id}/2022/2022-06-19/IMG_7065.heic`,
-        `upload/library/${user.storageLabel}/2022/2022-06-19/IMG_7065.heic`,
+        expect.stringContaining(`upload/library/${user.id}/2022/2022-06-19/IMG_7065.heic`),
+        expect.stringContaining(`upload/library/${user.storageLabel}/2022/2022-06-19/IMG_7065.heic`),
       );
     });
 
@@ -657,8 +673,8 @@ describe(StorageTemplateService.name, () => {
 
       expect(mocks.assetJob.streamForStorageTemplateJob).toHaveBeenCalled();
       expect(mocks.storage.rename).toHaveBeenCalledWith(
-        `upload/library/${user.id}/2022/2022-06-19/IMG_7065.HEIC`,
-        `upload/library/${user.id}/2022/2022-06-19/IMG_7065.heic`,
+        expect.stringContaining(`upload/library/${user.id}/2022/2022-06-19/IMG_7065.HEIC`),
+        expect.stringContaining(`upload/library/${user.id}/2022/2022-06-19/IMG_7065.heic`),
       );
     });
 
@@ -683,8 +699,8 @@ describe(StorageTemplateService.name, () => {
 
       expect(mocks.assetJob.streamForStorageTemplateJob).toHaveBeenCalled();
       expect(mocks.storage.rename).toHaveBeenCalledWith(
-        `upload/library/${user.id}/2022/2022-06-19/IMG_7065.JPEG`,
-        `upload/library/${user.id}/2022/2022-06-19/IMG_7065.jpg`,
+        expect.stringContaining(`upload/library/${user.id}/2022/2022-06-19/IMG_7065.JPEG`),
+        expect.stringContaining(`upload/library/${user.id}/2022/2022-06-19/IMG_7065.jpg`),
       );
     });
 
@@ -709,8 +725,8 @@ describe(StorageTemplateService.name, () => {
 
       expect(mocks.assetJob.streamForStorageTemplateJob).toHaveBeenCalled();
       expect(mocks.storage.rename).toHaveBeenCalledWith(
-        `upload/library/${user.id}/2022/2022-06-19/IMG_7065.JPG`,
-        `upload/library/${user.id}/2022/2022-06-19/IMG_7065.jpg`,
+        expect.stringContaining(`upload/library/${user.id}/2022/2022-06-19/IMG_7065.JPG`),
+        expect.stringContaining(`upload/library/${user.id}/2022/2022-06-19/IMG_7065.jpg`),
       );
     });
   });
diff --git a/server/src/services/storage.service.spec.ts b/server/src/services/storage.service.spec.ts
index 0e051f2642..567b78ac09 100644
--- a/server/src/services/storage.service.spec.ts
+++ b/server/src/services/storage.service.spec.ts
@@ -32,18 +32,36 @@ describe(StorageService.name, () => {
           upload: true,
         },
       });
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/encoded-video');
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/library');
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/profile');
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/thumbs');
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/upload');
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/backups');
-      expect(mocks.storage.createFile).toHaveBeenCalledWith('upload/encoded-video/.immich', expect.any(Buffer));
-      expect(mocks.storage.createFile).toHaveBeenCalledWith('upload/library/.immich', expect.any(Buffer));
-      expect(mocks.storage.createFile).toHaveBeenCalledWith('upload/profile/.immich', expect.any(Buffer));
-      expect(mocks.storage.createFile).toHaveBeenCalledWith('upload/thumbs/.immich', expect.any(Buffer));
-      expect(mocks.storage.createFile).toHaveBeenCalledWith('upload/upload/.immich', expect.any(Buffer));
-      expect(mocks.storage.createFile).toHaveBeenCalledWith('upload/backups/.immich', expect.any(Buffer));
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.stringContaining('upload/encoded-video'));
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.stringContaining('upload/library'));
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.stringContaining('upload/profile'));
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.stringContaining('upload/thumbs'));
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.stringContaining('upload/upload'));
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.stringContaining('upload/backups'));
+      expect(mocks.storage.createFile).toHaveBeenCalledWith(
+        expect.stringContaining('upload/encoded-video/.immich'),
+        expect.any(Buffer),
+      );
+      expect(mocks.storage.createFile).toHaveBeenCalledWith(
+        expect.stringContaining('upload/library/.immich'),
+        expect.any(Buffer),
+      );
+      expect(mocks.storage.createFile).toHaveBeenCalledWith(
+        expect.stringContaining('upload/profile/.immich'),
+        expect.any(Buffer),
+      );
+      expect(mocks.storage.createFile).toHaveBeenCalledWith(
+        expect.stringContaining('upload/thumbs/.immich'),
+        expect.any(Buffer),
+      );
+      expect(mocks.storage.createFile).toHaveBeenCalledWith(
+        expect.stringContaining('upload/upload/.immich'),
+        expect.any(Buffer),
+      );
+      expect(mocks.storage.createFile).toHaveBeenCalledWith(
+        expect.stringContaining('upload/backups/.immich'),
+        expect.any(Buffer),
+      );
     });
 
     it('should enable mount folder checking for a new folder type', async () => {
@@ -71,11 +89,17 @@ describe(StorageService.name, () => {
         },
       });
       expect(mocks.storage.mkdirSync).toHaveBeenCalledTimes(2);
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/library');
-      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/backups');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.stringContaining('upload/library'));
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith(expect.stringContaining('upload/backups'));
       expect(mocks.storage.createFile).toHaveBeenCalledTimes(2);
-      expect(mocks.storage.createFile).toHaveBeenCalledWith('upload/library/.immich', expect.any(Buffer));
-      expect(mocks.storage.createFile).toHaveBeenCalledWith('upload/backups/.immich', expect.any(Buffer));
+      expect(mocks.storage.createFile).toHaveBeenCalledWith(
+        expect.stringContaining('upload/library/.immich'),
+        expect.any(Buffer),
+      );
+      expect(mocks.storage.createFile).toHaveBeenCalledWith(
+        expect.stringContaining('upload/backups/.immich'),
+        expect.any(Buffer),
+      );
     });
 
     it('should throw an error if .immich is missing', async () => {
@@ -131,7 +155,7 @@ describe(StorageService.name, () => {
 
       await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-      expect(mocks.systemMetadata.set).not.toHaveBeenCalled();
+      expect(mocks.systemMetadata.set).not.toHaveBeenCalledWith(SystemMetadataKey.SystemFlags, expect.anything());
     });
   });
 
diff --git a/server/src/services/storage.service.ts b/server/src/services/storage.service.ts
index 6e3ef4820a..632e0c1385 100644
--- a/server/src/services/storage.service.ts
+++ b/server/src/services/storage.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { join, resolve } from 'node:path';
+import { join } from 'node:path';
+import { APP_MEDIA_LOCATION } from 'src/constants';
 import { StorageCore } from 'src/cores/storage.core';
 import { OnEvent, OnJob } from 'src/decorators';
 import { DatabaseLock, JobName, JobStatus, QueueName, StorageFolder, SystemMetadataKey } from 'src/enum';
@@ -60,6 +61,17 @@ export class StorageService extends BaseService {
         }
       }
     });
+
+    await this.databaseRepository.withLock(DatabaseLock.MediaLocation, async () => {
+      const current = APP_MEDIA_LOCATION;
+      const savedValue = await this.systemMetadataRepository.get(SystemMetadataKey.MediaLocation);
+      const previous = savedValue?.location || '';
+
+      if (previous !== current) {
+        this.logger.log(`Media location changed (from=${previous}, to=${current})`);
+        await this.systemMetadataRepository.set(SystemMetadataKey.MediaLocation, { location: current });
+      }
+    });
   }
 
   @OnJob({ name: JobName.FileDelete, queue: QueueName.BackgroundTask })
@@ -87,9 +99,8 @@ export class StorageService extends BaseService {
     try {
       await this.storageRepository.readFile(internalPath);
     } catch (error) {
-      const fullyQualifiedPath = resolve(process.cwd(), internalPath);
-      this.logger.error(`Failed to read ${fullyQualifiedPath} (${internalPath}): ${error}`);
-      throw new ImmichStartupError(`Failed to read: "${externalPath} (${fullyQualifiedPath}) - ${docsMessage}"`);
+      this.logger.error(`Failed to read (${internalPath}): ${error}`);
+      throw new ImmichStartupError(`Failed to read: "${externalPath} (${internalPath}) - ${docsMessage}"`);
     }
   }
 
diff --git a/server/src/services/user.service.spec.ts b/server/src/services/user.service.spec.ts
index 3a85389ace..b4e616974e 100644
--- a/server/src/services/user.service.spec.ts
+++ b/server/src/services/user.service.spec.ts
@@ -235,11 +235,26 @@ describe(UserService.name, () => {
 
       await sut.handleUserDelete({ id: user.id });
 
-      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith('upload/library/deleted-user', options);
-      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith('upload/upload/deleted-user', options);
-      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith('upload/profile/deleted-user', options);
-      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith('upload/thumbs/deleted-user', options);
-      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith('upload/encoded-video/deleted-user', options);
+      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith(
+        expect.stringContaining('upload/library/deleted-user'),
+        options,
+      );
+      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith(
+        expect.stringContaining('upload/upload/deleted-user'),
+        options,
+      );
+      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith(
+        expect.stringContaining('upload/profile/deleted-user'),
+        options,
+      );
+      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith(
+        expect.stringContaining('upload/thumbs/deleted-user'),
+        options,
+      );
+      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith(
+        expect.stringContaining('upload/encoded-video/deleted-user'),
+        options,
+      );
       expect(mocks.album.deleteAll).toHaveBeenCalledWith(user.id);
       expect(mocks.user.delete).toHaveBeenCalledWith(user, true);
     });
@@ -253,7 +268,7 @@ describe(UserService.name, () => {
 
       const options = { force: true, recursive: true };
 
-      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith('upload/library/admin', options);
+      expect(mocks.storage.unlinkDir).toHaveBeenCalledWith(expect.stringContaining('upload/library/admin'), options);
     });
   });
 
diff --git a/server/src/types.ts b/server/src/types.ts
index 79aeedd47d..9cd1aa996b 100644
--- a/server/src/types.ts
+++ b/server/src/types.ts
@@ -451,11 +451,13 @@ export type MemoriesState = {
   /** memories have already been created through this date */
   lastOnThisDayDate: string;
 };
+export type MediaLocation = { location: string };
 
 export interface SystemMetadata extends Record<SystemMetadataKey, Record<string, any>> {
   [SystemMetadataKey.AdminOnboarding]: { isOnboarded: boolean };
   [SystemMetadataKey.FacialRecognitionState]: { lastRun?: string };
   [SystemMetadataKey.License]: { licenseKey: string; activationKey: string; activatedAt: Date };
+  [SystemMetadataKey.MediaLocation]: MediaLocation;
   [SystemMetadataKey.ReverseGeocodingState]: { lastUpdate?: string; lastImportFileName?: string };
   [SystemMetadataKey.SystemConfig]: DeepPartial<SystemConfig>;
   [SystemMetadataKey.SystemFlags]: DeepPartial<SystemFlags>;
diff --git a/server/src/utils/file.ts b/server/src/utils/file.ts
index 3e1a1b7f68..2331a45a62 100644
--- a/server/src/utils/file.ts
+++ b/server/src/utils/file.ts
@@ -1,7 +1,7 @@
 import { HttpException, StreamableFile } from '@nestjs/common';
 import { NextFunction, Response } from 'express';
 import { access, constants } from 'node:fs/promises';
-import { basename, extname, isAbsolute } from 'node:path';
+import { basename, extname } from 'node:path';
 import { promisify } from 'node:util';
 import { CacheControl } from 'src/enum';
 import { LoggingRepository } from 'src/repositories/logging.repository';
@@ -62,15 +62,9 @@ export const sendFile = async (
       res.header('Content-Disposition', `inline; filename*=UTF-8''${encodeURIComponent(file.fileName)}`);
     }
 
-    // configure options for serving
-    const options: SendFileOptions = { dotfiles: 'allow' };
-    if (!isAbsolute(file.path)) {
-      options.root = process.cwd();
-    }
-
     await access(file.path, constants.R_OK);
 
-    return await _sendFile(file.path, options);
+    return await _sendFile(file.path, { dotfiles: 'allow' });
   } catch (error: Error | any) {
     // ignore client-closed connection
     if (isConnectionAborted(error) || res.headersSent) {
diff --git a/server/test/repositories/asset.repository.mock.ts b/server/test/repositories/asset.repository.mock.ts
index a29babbf54..6fca29d98e 100644
--- a/server/test/repositories/asset.repository.mock.ts
+++ b/server/test/repositories/asset.repository.mock.ts
@@ -39,5 +39,6 @@ export const newAssetRepositoryMock = (): Mocked<RepositoryInterface<AssetReposi
     detectOfflineExternalAssets: vitest.fn(),
     filterNewExternalAssetPaths: vitest.fn(),
     updateByLibraryId: vitest.fn(),
+    getFileSamples: vitest.fn(),
   };
 };
diff --git a/server/test/repositories/database.repository.mock.ts b/server/test/repositories/database.repository.mock.ts
index abdde53e9d..3664730be2 100644
--- a/server/test/repositories/database.repository.mock.ts
+++ b/server/test/repositories/database.repository.mock.ts
@@ -23,5 +23,6 @@ export const newDatabaseRepositoryMock = (): Mocked<RepositoryInterface<Database
     tryLock: vitest.fn(),
     isBusy: vitest.fn(),
     wait: vitest.fn(),
+    migrateFilePaths: vitest.fn(),
   };
 };

From 576f681b5cca74b1ae8ef44cabd16d3443fccf1e Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Fri, 18 Jul 2025 10:57:49 -0400
Subject: [PATCH 241/337] feat: remove dep on cwd for workers (#20012)

---
 .../manifest.json                                        | 1 -
 server/src/main.ts                                       | 9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
 delete mode 100644 mobile/ios/build/XCBuildData/a34f3d77f077776687d3b444cba8f1c4.xcbuilddata/manifest.json

diff --git a/mobile/ios/build/XCBuildData/a34f3d77f077776687d3b444cba8f1c4.xcbuilddata/manifest.json b/mobile/ios/build/XCBuildData/a34f3d77f077776687d3b444cba8f1c4.xcbuilddata/manifest.json
deleted file mode 100644
index 7391713b6f..0000000000
--- a/mobile/ios/build/XCBuildData/a34f3d77f077776687d3b444cba8f1c4.xcbuilddata/manifest.json
+++ /dev/null
@@ -1 +0,0 @@
-{"client":{"name":"basic","version":0,"file-system":"device-agnostic","perform-ownership-analysis":"no"},"targets":{"":["<all>"]},"commands":{"<all>":{"tool":"phony","inputs":["<WorkspaceHeaderMapVFSFilesWritten>"],"outputs":["<all>"]},"P0:::Gate WorkspaceHeaderMapVFSFilesWritten":{"tool":"phony","inputs":[],"outputs":["<WorkspaceHeaderMapVFSFilesWritten>"]}}}
\ No newline at end of file
diff --git a/server/src/main.ts b/server/src/main.ts
index 591fc156d9..68ea396e7a 100644
--- a/server/src/main.ts
+++ b/server/src/main.ts
@@ -1,5 +1,6 @@
 import { CommandFactory } from 'nest-commander';
 import { ChildProcess, fork } from 'node:child_process';
+import { dirname, join } from 'node:path';
 import { Worker } from 'node:worker_threads';
 import { ImmichAdminModule } from 'src/app.module';
 import { ImmichWorker, LogLevel } from 'src/enum';
@@ -33,14 +34,18 @@ const onExit = (name: string, exitCode: number | null) => {
 function bootstrapWorker(name: ImmichWorker) {
   console.log(`Starting ${name} worker`);
 
+  // eslint-disable-next-line unicorn/prefer-module
+  const basePath = dirname(__filename);
+  const workerFile = join(basePath, 'workers', `${name}.js`);
+
   let worker: Worker | ChildProcess;
   if (name === ImmichWorker.Api) {
-    worker = fork(`./dist/workers/${name}.js`, [], {
+    worker = fork(workerFile, [], {
       execArgv: process.execArgv.map((arg) => (arg.startsWith('--inspect') ? '--inspect=0.0.0.0:9231' : arg)),
     });
     apiProcess = worker;
   } else {
-    worker = new Worker(`./dist/workers/${name}.js`);
+    worker = new Worker(workerFile);
   }
 
   worker.on('error', (error) => onError(name, error));

From f33e1ad94c4fa558f78248ea4a6da0d9840e6aa4 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Fri, 18 Jul 2025 11:19:06 -0400
Subject: [PATCH 242/337] feat: relocate scripts, PATH update (#20002)

Relocate scripts, and PATH updates
---
 docker/docker-compose.dev.yml              |  4 +-
 e2e/docker-compose.yml                     |  1 -
 server/Dockerfile                          |  6 +--
 {docker/scripts => server/bin}/get-cpus.sh |  0
 server/bin/immich-admin                    |  2 +-
 server/bin/immich-dev                      |  8 +++-
 server/bin/start.sh                        | 44 ++++++++++++++++++++++
 server/start.sh                            | 29 --------------
 web/Dockerfile                             |  5 ++-
 web/bin/immich-web                         |  1 +
 10 files changed, 60 insertions(+), 40 deletions(-)
 rename {docker/scripts => server/bin}/get-cpus.sh (100%)
 create mode 100755 server/bin/start.sh
 delete mode 100755 server/start.sh

diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 56d1817317..f3d1e83fb2 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -16,7 +16,7 @@ name: immich-dev
 services:
   immich-server:
     container_name: immich_server
-    command: ['/usr/src/app/bin/immich-dev']
+    command: ['immich-dev']
     image: immich-server-dev:latest
     # extends:
     #   file: hwaccel.transcoding.yml
@@ -70,7 +70,7 @@ services:
     # user: 0:0
     build:
       context: ../web
-    command: ['/usr/src/app/bin/immich-web']
+    command: ['immich-web']
     env_file:
       - .env
     ports:
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index 6ec5402360..26c3951278 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -3,7 +3,6 @@ name: immich-e2e
 services:
   immich-server:
     container_name: immich-e2e-server
-    command: ['./start.sh']
     image: immich-server:latest
     build:
       context: ../
diff --git a/server/Dockerfile b/server/Dockerfile
index 0b3b864c95..b95887f18b 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -12,7 +12,7 @@ ENV PATH="${PATH}:/usr/src/app/bin" \
     IMMICH_ENV=development \
     NVIDIA_DRIVER_CAPABILITIES=all \
     NVIDIA_VISIBLE_DEVICES=all
-ENTRYPOINT ["tini", "--", "/bin/sh"]
+ENTRYPOINT ["tini", "--", "/bin/sh", "-c"]
 
 FROM dev AS dev-container-server
 
@@ -110,8 +110,6 @@ COPY --from=prod /usr/src/app/bin ./bin
 COPY --from=web /usr/src/app/build /build/www
 COPY server/resources resources
 COPY server/package.json server/package-lock.json ./
-COPY server/start*.sh ./
-COPY "docker/scripts/get-cpus.sh" ./
 RUN npm install -g @immich/cli && npm cache clean --force
 COPY LICENSE /licenses/LICENSE.txt
 COPY LICENSE /LICENSE
@@ -134,7 +132,7 @@ ENV IMMICH_SOURCE_URL=https://github.com/immich-app/immich/commit/${BUILD_SOURCE
 
 VOLUME /usr/src/app/upload
 EXPOSE 2283
-ENTRYPOINT ["tini", "--", "/bin/bash"]
+ENTRYPOINT ["tini", "--", "/bin/bash", "-c"]
 CMD ["start.sh"]
 
 HEALTHCHECK CMD immich-healthcheck
diff --git a/docker/scripts/get-cpus.sh b/server/bin/get-cpus.sh
similarity index 100%
rename from docker/scripts/get-cpus.sh
rename to server/bin/get-cpus.sh
diff --git a/server/bin/immich-admin b/server/bin/immich-admin
index 30fd33a20a..0465a362b8 100755
--- a/server/bin/immich-admin
+++ b/server/bin/immich-admin
@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-/usr/src/app/start.sh immich-admin "$@"
+start.sh immich-admin "$@"
diff --git a/server/bin/immich-dev b/server/bin/immich-dev
index 177455d037..85d75b8b0c 100755
--- a/server/bin/immich-dev
+++ b/server/bin/immich-dev
@@ -1,3 +1,9 @@
 #!/usr/bin/env bash
 
-node /usr/src/app/node_modules/.bin/nest start --debug "0.0.0.0:9230" --watch -- "$@"
+if [ "$IMMICH_ENV" != "development" ]; then
+  echo "This command can only be run in development environments"
+  exit 1
+fi
+
+cd /usr/src/app || exit 1
+node ./node_modules/.bin/nest start --debug "0.0.0.0:9230" --watch -- "$@"
diff --git a/server/bin/start.sh b/server/bin/start.sh
new file mode 100755
index 0000000000..7c6069570d
--- /dev/null
+++ b/server/bin/start.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+echo "Initializing Immich $IMMICH_SOURCE_REF"
+
+lib_path="/usr/lib/$(arch)-linux-gnu/libmimalloc.so.2"
+if [ -f "$lib_path" ]; then
+  export LD_PRELOAD="$lib_path"
+else
+  echo "skipping libmimalloc - path not found $lib_path"
+fi
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jellyfin-ffmpeg/lib"
+SERVER_HOME=/usr/src/app
+
+read_file_and_export() {
+	if [ -n "${!1}" ]; then
+		content="$(cat "${!1}")"
+		export "$2"="${content}"
+		unset "$1"
+	fi
+}
+read_file_and_export "DB_URL_FILE" "DB_URL"
+read_file_and_export "DB_HOSTNAME_FILE" "DB_HOSTNAME"
+read_file_and_export "DB_DATABASE_NAME_FILE" "DB_DATABASE_NAME"
+read_file_and_export "DB_USERNAME_FILE" "DB_USERNAME"
+read_file_and_export "DB_PASSWORD_FILE" "DB_PASSWORD"
+read_file_and_export "REDIS_PASSWORD_FILE" "REDIS_PASSWORD"
+
+if CPU_CORES="${CPU_CORES:=$(get-cpus.sh 2>/dev/null)}"; then
+  echo "Detected CPU Cores: $CPU_CORES"
+  if [ "$CPU_CORES" -gt 4 ]; then
+    export UV_THREADPOOL_SIZE=$CPU_CORES
+  fi
+else
+  echo "skipping get-cpus.sh - not found in PATH or failed: using default UV_THREADPOOL_SIZE"
+fi
+
+if [ -f "${SERVER_HOME}/dist/main.js" ]; then
+  exec node "${SERVER_HOME}/dist/main.js" "$@"
+else
+  echo "Error: ${SERVER_HOME}/dist/main.js not found"
+  if [ "$IMMICH_ENV" = "development" ]; then
+    echo "You may need to build the server first."
+  fi
+  exit 1
+fi
diff --git a/server/start.sh b/server/start.sh
deleted file mode 100755
index 1a08d01a75..0000000000
--- a/server/start.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Initializing Immich $IMMICH_SOURCE_REF"
-
-lib_path="/usr/lib/$(arch)-linux-gnu/libmimalloc.so.2"
-export LD_PRELOAD="$lib_path"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jellyfin-ffmpeg/lib"
-
-read_file_and_export() {
-	if [ -n "${!1}" ]; then
-		content="$(cat "${!1}")"
-		export "$2"="${content}"
-		unset "$1"
-	fi
-}
-read_file_and_export "DB_URL_FILE" "DB_URL"
-read_file_and_export "DB_HOSTNAME_FILE" "DB_HOSTNAME"
-read_file_and_export "DB_DATABASE_NAME_FILE" "DB_DATABASE_NAME"
-read_file_and_export "DB_USERNAME_FILE" "DB_USERNAME"
-read_file_and_export "DB_PASSWORD_FILE" "DB_PASSWORD"
-read_file_and_export "REDIS_PASSWORD_FILE" "REDIS_PASSWORD"
-
-export CPU_CORES="${CPU_CORES:=$(./get-cpus.sh)}"
-echo "Detected CPU Cores: $CPU_CORES"
-if [ "$CPU_CORES" -gt 4 ]; then
-  export UV_THREADPOOL_SIZE=$CPU_CORES
-fi
-
-exec node /usr/src/app/dist/main "$@"
diff --git a/web/Dockerfile b/web/Dockerfile
index 1c6c4b46bf..c83f783391 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -5,7 +5,8 @@ USER node
 WORKDIR /usr/src/app
 COPY --chown=node:node package*.json ./
 RUN npm ci
-ENV CHOKIDAR_USEPOLLING=true
+ENV CHOKIDAR_USEPOLLING=true \
+  PATH="${PATH}:/usr/src/app/bin"
 EXPOSE 24678
 EXPOSE 3000
-ENTRYPOINT ["/sbin/tini", "--", "/bin/sh"]
+ENTRYPOINT ["/sbin/tini", "--", "/bin/sh", "-c"]
diff --git a/web/bin/immich-web b/web/bin/immich-web
index ea748863db..8868945ee1 100755
--- a/web/bin/immich-web
+++ b/web/bin/immich-web
@@ -5,6 +5,7 @@ TYPESCRIPT_SDK=/usr/src/open-api/typescript-sdk
 npm --prefix "$TYPESCRIPT_SDK" install
 npm --prefix "$TYPESCRIPT_SDK" run build
 
+cd /usr/src/app || exit 1
 
 COUNT=0
 UPSTREAM="${IMMICH_SERVER_URL:-http://immich-server:2283/}"

From 9719965caf7d54b7ee492f9e528b83f949bfff25 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Fri, 18 Jul 2025 11:54:15 -0500
Subject: [PATCH 243/337] fix: invalid android manifest (#20015)

fix extra > in android manifest
---
 mobile/android/app/src/main/AndroidManifest.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index 3aa72d2876..09276f6d4a 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -171,7 +171,6 @@
     <activity android:name=".widget.configure.RandomConfigure"
       android:exported="true"
       android:theme="@style/Theme.Material3.DayNight.NoActionBar">
-      >
 
       <intent-filter>
         <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>

From 635f5de186afef2feb7a8e26c80cda2cb068aefa Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 18 Jul 2025 22:24:35 +0530
Subject: [PATCH 244/337] chore: change dcm constraint to include 1.30.0
 (#20017)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/dcm_global.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/dcm_global.yaml b/mobile/dcm_global.yaml
index d2465e64b6..c33846e674 100644
--- a/mobile/dcm_global.yaml
+++ b/mobile/dcm_global.yaml
@@ -1 +1 @@
-version: '>=1.29.0 <1.30.0'
+version: '>=1.29.0 <=1.30.0'

From dcfe8d5aded526227514257014d8e5f40d00a921 Mon Sep 17 00:00:00 2001
From: megumin <megumin.bakaretsurie@gmail.com>
Date: Fri, 18 Jul 2025 17:55:24 +0100
Subject: [PATCH 245/337] fix: send filename when viewing the original file
 (#20005)

* feat: add fileName to downloadOriginal response

* test: add fileName to ImmichFileResponse for downloadOriginal

* lint: use single quotes for fileName string in test
---
 server/src/services/asset-media.service.spec.ts | 1 +
 server/src/services/asset-media.service.ts      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/server/src/services/asset-media.service.spec.ts b/server/src/services/asset-media.service.spec.ts
index 08b42b6cbf..0585a159ac 100644
--- a/server/src/services/asset-media.service.spec.ts
+++ b/server/src/services/asset-media.service.spec.ts
@@ -505,6 +505,7 @@ describe(AssetMediaService.name, () => {
       await expect(sut.downloadOriginal(authStub.admin, 'asset-1')).resolves.toEqual(
         new ImmichFileResponse({
           path: '/original/path.jpg',
+          fileName: 'asset-id.jpg',
           contentType: 'image/jpeg',
           cacheControl: CacheControl.PrivateWithCache,
         }),
diff --git a/server/src/services/asset-media.service.ts b/server/src/services/asset-media.service.ts
index 080774d038..517a1f665f 100644
--- a/server/src/services/asset-media.service.ts
+++ b/server/src/services/asset-media.service.ts
@@ -197,6 +197,7 @@ export class AssetMediaService extends BaseService {
 
     return new ImmichFileResponse({
       path: asset.originalPath,
+      fileName: asset.originalFileName,
       contentType: mimeTypes.lookup(asset.originalPath),
       cacheControl: CacheControl.PrivateWithCache,
     });

From 5d244c6feca7010a64ac78a1e3dc1364ef989955 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 18 Jul 2025 13:16:22 -0500
Subject: [PATCH 246/337] chore: finish drift locked page (#20013)

* feat: overlay mechanism

* handle merged asset local id extraction

* locked view asset viewer actions

* pr feedback
---
 .../pages/library/locked/pin_auth.page.dart   | 20 ++++++--
 .../presentation/pages/drift_album.page.dart  |  4 ++
 .../pages/drift_locked_folder.page.dart       | 51 ++++++++++++++++---
 .../asset_viewer/asset_viewer.page.dart       |  9 ++--
 .../asset_viewer/bottom_sheet.widget.dart     |  7 ++-
 .../asset_viewer/top_app_bar.widget.dart      | 16 +++++-
 .../infrastructure/action.provider.dart       | 20 +++++---
 .../lib/routing/app_navigation_observer.dart  | 25 ++++++++-
 mobile/lib/routing/router.dart                |  2 +-
 mobile/lib/services/action.service.dart       | 14 ++++-
 .../common/mesmerizing_sliver_app_bar.dart    |  1 -
 11 files changed, 143 insertions(+), 26 deletions(-)

diff --git a/mobile/lib/pages/library/locked/pin_auth.page.dart b/mobile/lib/pages/library/locked/pin_auth.page.dart
index cca0e3b7ac..9bfd96ed74 100644
--- a/mobile/lib/pages/library/locked/pin_auth.page.dart
+++ b/mobile/lib/pages/library/locked/pin_auth.page.dart
@@ -1,13 +1,14 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:flutter_hooks/flutter_hooks.dart' show useState;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/local_auth.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/forms/pin_registration_form.dart';
 import 'package:immich_mobile/widgets/forms/pin_verification_form.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 
 @RoutePage()
 class PinAuthPage extends HookConsumerWidget {
@@ -19,6 +20,7 @@ class PinAuthPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final localAuthState = ref.watch(localAuthProvider);
     final showPinRegistrationForm = useState(createPinCode);
+    final isBetaTimeline = Store.isBetaTimelineEnabled;
 
     Future<void> registerBiometric(String pinCode) async {
       final isRegistered =
@@ -39,7 +41,11 @@ class PinAuthPage extends HookConsumerWidget {
           ),
         );
 
-        context.replaceRoute(const LockedRoute());
+        if (isBetaTimeline) {
+          context.replaceRoute(const DriftLockedFolderRoute());
+        } else {
+          context.replaceRoute(const LockedRoute());
+        }
       }
     }
 
@@ -93,8 +99,14 @@ class PinAuthPage extends HookConsumerWidget {
                       Center(
                         child: PinVerificationForm(
                           autoFocus: true,
-                          onSuccess: (_) =>
-                              context.replaceRoute(const LockedRoute()),
+                          onSuccess: (_) {
+                            if (isBetaTimeline) {
+                              context
+                                  .replaceRoute(const DriftLockedFolderRoute());
+                            } else {
+                              context.replaceRoute(const LockedRoute());
+                            }
+                          },
                         ),
                       ),
                       const SizedBox(height: 24),
diff --git a/mobile/lib/presentation/pages/drift_album.page.dart b/mobile/lib/presentation/pages/drift_album.page.dart
index fbdf1ef116..c7dffbeaef 100644
--- a/mobile/lib/presentation/pages/drift_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_album.page.dart
@@ -95,9 +95,13 @@ class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
 
     return RefreshIndicator(
       onRefresh: onRefresh,
+      edgeOffset: 100,
       child: CustomScrollView(
         slivers: [
           ImmichSliverAppBar(
+            snap: false,
+            floating: false,
+            pinned: true,
             actions: [
               IconButton(
                 icon: const Icon(
diff --git a/mobile/lib/presentation/pages/drift_locked_folder.page.dart b/mobile/lib/presentation/pages/drift_locked_folder.page.dart
index 9b42cdb103..e134b418e9 100644
--- a/mobile/lib/presentation/pages/drift_locked_folder.page.dart
+++ b/mobile/lib/presentation/pages/drift_locked_folder.page.dart
@@ -4,14 +4,45 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 
 @RoutePage()
-class DriftLockedFolderPage extends StatelessWidget {
+class DriftLockedFolderPage extends ConsumerStatefulWidget {
   const DriftLockedFolderPage({super.key});
 
+  @override
+  ConsumerState<DriftLockedFolderPage> createState() =>
+      _DriftLockedFolderPageState();
+}
+
+class _DriftLockedFolderPageState extends ConsumerState<DriftLockedFolderPage>
+    with WidgetsBindingObserver {
+  bool _showOverlay = false;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (mounted) {
+      setState(() {
+        _showOverlay = state != AppLifecycleState.resumed;
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return ProviderScope(
@@ -30,12 +61,18 @@ class DriftLockedFolderPage extends StatelessWidget {
           },
         ),
       ],
-      child: Timeline(
-        appBar: MesmerizingSliverAppBar(
-          title: 'locked_folder'.t(context: context),
-        ),
-        bottomSheet: const LockedFolderBottomSheet(),
-      ),
+      child: _showOverlay
+          ? const SizedBox()
+          : PopScope(
+              onPopInvokedWithResult: (didPop, _) =>
+                  didPop ? ref.read(authProvider.notifier).lockPinCode() : null,
+              child: Timeline(
+                appBar: MesmerizingSliverAppBar(
+                  title: 'locked_folder'.t(context: context),
+                ),
+                bottomSheet: const LockedFolderBottomSheet(),
+              ),
+            ),
     );
   }
 }
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 50f4a09197..9356c2f43e 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -25,6 +25,7 @@ import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view_gallery.dart';
 import 'package:platform/platform.dart';
@@ -638,6 +639,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       });
     });
 
+    final isInLockedView = ref.watch(inLockedViewProvider);
+
     // Currently it is not possible to scroll the asset when the bottom sheet is open all the way.
     // Issue: https://github.com/flutter/flutter/issues/109037
     // TODO: Add a custom scrum builder once the fix lands on stable
@@ -666,13 +669,13 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
         ),
         bottomNavigationBar: showingBottomSheet
             ? const SizedBox.shrink()
-            : const Column(
+            : Column(
                 mainAxisSize: MainAxisSize.min,
                 mainAxisAlignment: MainAxisAlignment.end,
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
-                  AssetStackRow(),
-                  ViewerBottomBar(),
+                  const AssetStackRow(),
+                  if (!isInLockedView) const ViewerBottomBar(),
                 ],
               ),
       ),
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 ea6dece942..a8b7c79588 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -18,6 +18,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
 
@@ -44,6 +45,8 @@ class AssetDetailBottomSheet extends ConsumerWidget {
       serverInfoProvider.select((state) => state.serverFeatures.trash),
     );
 
+    final isInLockedView = ref.watch(inLockedViewProvider);
+
     final actions = <Widget>[
       const ShareActionButton(source: ActionSource.viewer),
       if (asset.hasRemote) ...[
@@ -63,8 +66,10 @@ class AssetDetailBottomSheet extends ConsumerWidget {
       ],
     ];
 
+    final lockedViewActions = <Widget>[];
+
     return BaseBottomSheet(
-      actions: actions,
+      actions: isInLockedView ? lockedViewActions : actions,
       slivers: const [_AssetDetailBottomSheet()],
       controller: controller,
       initialChildSize: initialChildSize,
diff --git a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
index c85c4390ae..4cdf9f2287 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
@@ -12,6 +12,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_act
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 
@@ -27,6 +28,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
 
     final user = ref.watch(currentUserProvider);
     final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
+    final isInLockedView = ref.watch(inLockedViewProvider);
 
     final isShowingSheet = ref
         .watch(assetViewerProvider.select((state) => state.showingBottomSheet));
@@ -62,6 +64,14 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
       const _KebabMenu(),
     ];
 
+    final lockedViewActions = <Widget>[
+      if (isCasting || (asset.hasRemote && websocketConnected))
+        const CastActionButton(
+          menuItem: true,
+        ),
+      const _KebabMenu(),
+    ];
+
     return IgnorePointer(
       ignoring: opacity < 255,
       child: AnimatedOpacity(
@@ -74,7 +84,11 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
           iconTheme: const IconThemeData(size: 22, color: Colors.white),
           actionsIconTheme: const IconThemeData(size: 22, color: Colors.white),
           shape: const Border(),
-          actions: isShowingSheet ? null : actions,
+          actions: isShowingSheet
+              ? null
+              : isInLockedView
+                  ? lockedViewActions
+                  : actions,
         ),
       ),
     );
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 456b072a39..a0ebf448fc 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -47,7 +47,18 @@ class ActionNotifier extends Notifier<void> {
   }
 
   List<String> _getLocalIdsForSource(ActionSource source) {
-    return _getIdsForSource<LocalAsset>(source).toIds().toList(growable: false);
+    final Set<BaseAsset> assets = _getAssets(source);
+    final List<String> localIds = [];
+
+    for (final asset in assets) {
+      if (asset is LocalAsset) {
+        localIds.add(asset.id);
+      } else if (asset is RemoteAsset && asset.localId != null) {
+        localIds.add(asset.localId!);
+      }
+    }
+
+    return localIds;
   }
 
   List<String> _getOwnedRemoteIdsForSource(ActionSource source) {
@@ -162,8 +173,9 @@ class ActionNotifier extends Notifier<void> {
 
   Future<ActionResult> moveToLockFolder(ActionSource source) async {
     final ids = _getOwnedRemoteIdsForSource(source);
+    final localIds = _getLocalIdsForSource(source);
     try {
-      await _service.moveToLockFolder(ids);
+      await _service.moveToLockFolder(ids, localIds);
       return ActionResult(count: ids.length, success: true);
     } catch (error, stack) {
       _logger.severe('Failed to move assets to lock folder', error, stack);
@@ -329,7 +341,3 @@ extension on Iterable<RemoteAsset> {
     return whereType<RemoteAsset>().where((a) => a.ownerId == ownerId);
   }
 }
-
-extension on Iterable<LocalAsset> {
-  Iterable<String> toIds() => map((e) => e.id);
-}
diff --git a/mobile/lib/routing/app_navigation_observer.dart b/mobile/lib/routing/app_navigation_observer.dart
index 047e897c8e..98560018ee 100644
--- a/mobile/lib/routing/app_navigation_observer.dart
+++ b/mobile/lib/routing/app_navigation_observer.dart
@@ -25,7 +25,7 @@ class AppNavigationObserver extends AutoRouterObserver {
   @override
   void didPush(Route route, Route? previousRoute) {
     _handleLockedViewState(route, previousRoute);
-
+    _handleDriftLockedFolderState(route, previousRoute);
     Future(
       () => ref.read(currentRouteNameProvider.notifier).state =
           route.settings.name,
@@ -54,4 +54,27 @@ class AppNavigationObserver extends AutoRouterObserver {
       );
     }
   }
+
+  _handleDriftLockedFolderState(Route route, Route? previousRoute) {
+    final isInLockedView = ref.read(inLockedViewProvider);
+    final isFromLockedViewToDetailView =
+        route.settings.name == AssetViewerRoute.name &&
+            previousRoute?.settings.name == DriftLockedFolderRoute.name;
+
+    final isFromDetailViewToInfoPanelView = route.settings.name == null &&
+        previousRoute?.settings.name == AssetViewerRoute.name &&
+        isInLockedView;
+
+    if (route.settings.name == DriftLockedFolderRoute.name ||
+        isFromLockedViewToDetailView ||
+        isFromDetailViewToInfoPanelView) {
+      Future(
+        () => ref.read(inLockedViewProvider.notifier).state = true,
+      );
+    } else {
+      Future(
+        () => ref.read(inLockedViewProvider.notifier).state = false,
+      );
+    }
+  }
 }
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 94e3437d66..3a694df816 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -427,7 +427,7 @@ class AppRouter extends RootStackRouter {
     ),
     AutoRoute(
       page: DriftLockedFolderRoute.page,
-      guards: [_authGuard, _duplicateGuard],
+      guards: [_authGuard, _lockedGuard, _duplicateGuard],
     ),
     AutoRoute(
       page: DriftVideoRoute.page,
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index adefd5da16..b59df5b3dc 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -83,7 +83,10 @@ class ActionService {
     );
   }
 
-  Future<void> moveToLockFolder(List<String> remoteIds) async {
+  Future<void> moveToLockFolder(
+    List<String> remoteIds,
+    List<String> localIds,
+  ) async {
     await _assetApiRepository.updateVisibility(
       remoteIds,
       AssetVisibilityEnum.locked,
@@ -92,6 +95,15 @@ class ActionService {
       remoteIds,
       AssetVisibility.locked,
     );
+
+    // Ask user if they want to delete local copies
+    if (localIds.isNotEmpty) {
+      final deletedIds = await _assetMediaRepository.deleteAll(localIds);
+
+      if (deletedIds.isNotEmpty) {
+        await _localAssetRepository.delete(deletedIds);
+      }
+    }
   }
 
   Future<void> removeFromLockFolder(List<String> remoteIds) async {
diff --git a/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
index eace57fe5c..eecc099a9e 100644
--- a/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
@@ -22,7 +22,6 @@ class MesmerizingSliverAppBar extends ConsumerStatefulWidget {
 
   final String title;
   final IconData icon;
-
   @override
   ConsumerState<MesmerizingSliverAppBar> createState() =>
       _MesmerizingSliverAppBarState();

From 9e94f52b057005e33cd16927e1f4f344ce1db009 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Fri, 18 Jul 2025 17:56:26 -0400
Subject: [PATCH 247/337] chore: dockerfile layout changes (#19673)

Dockerfile layout changes

Fix up web path

feat: update server env vars for layout
---
 .dockerignore                 | 32 ++++++-------
 .gitignore                    |  1 +
 docker/docker-compose.dev.yml | 17 +++----
 server/Dockerfile             | 88 +++++++++++++++++------------------
 server/bin/immich-dev         |  4 +-
 server/bin/start.sh           |  2 +-
 web/Dockerfile                | 13 ++++--
 web/bin/immich-web            |  6 +--
 8 files changed, 85 insertions(+), 78 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index d152800d1b..f7efb5c56e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,41 +1,41 @@
 .vscode/
 .github/
 .git/
+.env*
+*.log
+*.tmp
+*.temp
+
+**/Dockerfile
+**/node_modules/
+**/.pnpm-store/
+**/dist/
+**/coverage/
+**/build/
 
 design/
 docker/
-Dockerfile
 !docker/scripts
+
 docs/
 !docs/package.json
 !docs/package-lock.json
+
 e2e/
 !e2e/package.json
 !e2e/package-lock.json
+
 fastlane/
 machine-learning/
 misc/
 mobile/
 
-cli/coverage/
-cli/dist/
-cli/node_modules/
-cli/Dockerfile
-
 open-api/typescript-sdk/build/
-open-api/typescript-sdk/node_modules/
+!open-api/typescript-sdk/package.json
+!open-api/typescript-sdk/package-lock.json
 
-server/coverage/
-server/node_modules/
 server/upload/
 server/src/queries
-server/dist/
 server/www/
-server/Dockerfile
 
-web/node_modules/
-web/coverage/
 web/.svelte-kit
-web/build/
-web/.env
-web/Dockerfile
diff --git a/.gitignore b/.gitignore
index b4ebd04841..af85d96c02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ mobile/android/fastlane/report.xml
 mobile/ios/fastlane/report.xml
 
 vite.config.js.timestamp-*
+.pnpm-store
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index f3d1e83fb2..32ff115102 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -27,11 +27,11 @@ services:
       target: dev
     restart: unless-stopped
     volumes:
-      - ../server:/usr/src/app
-      - ../open-api:/usr/src/open-api
+      - ../server:/usr/src/app/server
+      - ../open-api:/usr/src/app/open-api
       - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload
       - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/upload/upload
-      - /usr/src/app/node_modules
+      - /usr/src/app/server/node_modules
       - /etc/localtime:/etc/localtime:ro
     env_file:
       - .env
@@ -69,7 +69,8 @@ services:
     # Needed for rootless docker setup, see https://github.com/moby/moby/issues/45919
     # user: 0:0
     build:
-      context: ../web
+      context: ../
+      dockerfile: web/Dockerfile
     command: ['immich-web']
     env_file:
       - .env
@@ -77,11 +78,11 @@ services:
       - 3000:3000
       - 24678:24678
     volumes:
-      - ../web:/usr/src/app
-      - ../i18n:/usr/src/i18n
-      - ../open-api/:/usr/src/open-api/
+      - ../web:/usr/src/app/web
+      - ../i18n:/usr/src/app/i18n
+      - ../open-api/:/usr/src/app/open-api/
       # - ../../ui:/usr/ui
-      - /usr/src/app/node_modules
+      - /usr/src/app/web/node_modules
     ulimits:
       nofile:
         soft: 1048576
diff --git a/server/Dockerfile b/server/Dockerfile
index b95887f18b..e082d0e69e 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -2,25 +2,26 @@
 FROM ghcr.io/immich-app/base-server-dev:202507162011@sha256:85d4230c2208646bd6c528db41b2213d780b11b7a311397ca6a2aaba7cf697c8 AS dev
 
 WORKDIR /usr/src/app
-COPY server/package.json server/package-lock.json ./
+COPY ./server/package* ./server/
+WORKDIR /usr/src/app/server
 RUN npm ci && \
-    # exiftool-vendored.pl, sharp-linux-x64 and sharp-linux-arm64 are the only ones we need
-    # they're marked as optional dependencies, so we need to copy them manually after pruning
-    rm -rf node_modules/@img/sharp-libvips* && \
-    rm -rf node_modules/@img/sharp-linuxmusl-x64
-ENV PATH="${PATH}:/usr/src/app/bin" \
-    IMMICH_ENV=development \
-    NVIDIA_DRIVER_CAPABILITIES=all \
-    NVIDIA_VISIBLE_DEVICES=all
-ENTRYPOINT ["tini", "--", "/bin/sh", "-c"]
+  # exiftool-vendored.pl, sharp-linux-x64 and sharp-linux-arm64 are the only ones we need
+  # they're marked as optional dependencies, so we need to copy them manually after pruning
+  rm -rf node_modules/@img/sharp-libvips* && \
+  rm -rf node_modules/@img/sharp-linuxmusl-x64
+ENV PATH="${PATH}:/usr/src/app/server/bin" \
+  IMMICH_ENV=development \
+  NVIDIA_DRIVER_CAPABILITIES=all \
+  NVIDIA_VISIBLE_DEVICES=all
+ENTRYPOINT ["tini", "--", "/bin/bash", "-c"]
 
 FROM dev AS dev-container-server
 
 RUN rm -rf /usr/src/app
 RUN apt-get update && \
-    apt-get install sudo inetutils-ping openjdk-11-jre-headless \
-    vim nano \
-    -y --no-install-recommends --fix-missing
+  apt-get install sudo inetutils-ping openjdk-11-jre-headless \
+  vim nano \
+  -y --no-install-recommends --fix-missing
 
 RUN usermod -aG sudo node
 RUN echo "node ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
@@ -38,14 +39,14 @@ FROM dev-container-server AS dev-container-mobile
 USER root
 # Enable multiarch for arm64 if necessary
 RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
-    dpkg --add-architecture amd64 && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends \
-        qemu-user-static \
-        libc6:amd64 \
-        libstdc++6:amd64 \
-        libgcc1:amd64; \
-    fi
+  dpkg --add-architecture amd64 && \
+  apt-get update && \
+  apt-get install -y --no-install-recommends \
+  qemu-user-static \
+  libc6:amd64 \
+  libstdc++6:amd64 \
+  libgcc1:amd64; \
+  fi
 
 # Flutter SDK
 # https://flutter.dev/docs/development/tools/sdk/releases?tab=linux
@@ -77,43 +78,42 @@ FROM dev AS prod
 COPY server .
 RUN npm run build
 RUN npm prune --omit=dev --omit=optional
-COPY --from=dev /usr/src/app/node_modules/@img ./node_modules/@img
-COPY --from=dev /usr/src/app/node_modules/exiftool-vendored.pl ./node_modules/exiftool-vendored.pl
+COPY --from=dev /usr/src/app/server/node_modules/@img ./node_modules/@img
+COPY --from=dev /usr/src/app/server/node_modules/exiftool-vendored.pl ./node_modules/exiftool-vendored.pl
 
 # web build
 FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS web
 
-WORKDIR /usr/src/open-api/typescript-sdk
-COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./
-RUN npm ci
-COPY open-api/typescript-sdk/ ./
-RUN npm run build
-
 WORKDIR /usr/src/app
-COPY web/package*.json web/svelte.config.js ./
-RUN npm ci
-COPY web ./
-COPY i18n ../i18n
-RUN npm run build
+COPY ./web ./web/
+COPY ./i18n ./i18n/
+COPY ./open-api/typescript-sdk ./open-api/typescript-sdk/
 
+WORKDIR /usr/src/app/open-api/typescript-sdk
+RUN npm ci && npm run build
+
+WORKDIR /usr/src/app/web
+RUN npm ci && npm run build
 
 # prod build
 FROM ghcr.io/immich-app/base-server-prod:202507162011@sha256:636f3ddb6106628ef851d51c23f3fa2c6e4829390cc315b27b38c288c82b23a7
 
 WORKDIR /usr/src/app
 ENV NODE_ENV=production \
-    NVIDIA_DRIVER_CAPABILITIES=all \
-    NVIDIA_VISIBLE_DEVICES=all
-COPY --from=prod /usr/src/app/node_modules ./node_modules
-COPY --from=prod /usr/src/app/dist ./dist
-COPY --from=prod /usr/src/app/bin ./bin
-COPY --from=web /usr/src/app/build /build/www
-COPY server/resources resources
-COPY server/package.json server/package-lock.json ./
-RUN npm install -g @immich/cli && npm cache clean --force
+  NVIDIA_DRIVER_CAPABILITIES=all \
+  NVIDIA_VISIBLE_DEVICES=all
+
+COPY --from=prod /usr/src/app/server/node_modules ./server/node_modules
+COPY --from=prod /usr/src/app/server/dist ./server/dist
+COPY --from=prod /usr/src/app/server/bin ./server/bin
+COPY --from=web /usr/src/app/web/build /build/www
+COPY ./server/resources ./server/resources
+COPY ./server/package.json server/package-lock.json ./
 COPY LICENSE /licenses/LICENSE.txt
 COPY LICENSE /LICENSE
-ENV PATH="${PATH}:/usr/src/app/bin"
+
+RUN npm install -g @immich/cli && npm cache clean --force
+ENV PATH="${PATH}:/usr/src/app/server/bin"
 
 ARG BUILD_ID
 ARG BUILD_IMAGE
diff --git a/server/bin/immich-dev b/server/bin/immich-dev
index 85d75b8b0c..533c10ef9d 100755
--- a/server/bin/immich-dev
+++ b/server/bin/immich-dev
@@ -5,5 +5,5 @@ if [ "$IMMICH_ENV" != "development" ]; then
   exit 1
 fi
 
-cd /usr/src/app || exit 1
-node ./node_modules/.bin/nest start --debug "0.0.0.0:9230" --watch -- "$@"
+cd /usr/src/app/server || exit 1
+npm exec nest start --debug "0.0.0.0:9230" --watch -- "$@"
diff --git a/server/bin/start.sh b/server/bin/start.sh
index 7c6069570d..2b4351a6bc 100755
--- a/server/bin/start.sh
+++ b/server/bin/start.sh
@@ -8,7 +8,7 @@ else
   echo "skipping libmimalloc - path not found $lib_path"
 fi
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jellyfin-ffmpeg/lib"
-SERVER_HOME=/usr/src/app
+SERVER_HOME=/usr/src/app/server
 
 read_file_and_export() {
 	if [ -n "${!1}" ]; then
diff --git a/web/Dockerfile b/web/Dockerfile
index c83f783391..3c119fdd4d 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,12 +1,17 @@
 FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e
 
-RUN apk add --no-cache tini
+RUN apk add --no-cache tini bash
+
 USER node
 WORKDIR /usr/src/app
-COPY --chown=node:node package*.json ./
+
+COPY --chown=node:node ./web/package* ./web/
+
+WORKDIR /usr/src/app/web
 RUN npm ci
+
 ENV CHOKIDAR_USEPOLLING=true \
-  PATH="${PATH}:/usr/src/app/bin"
+  PATH="${PATH}:/usr/src/app/web/bin"
 EXPOSE 24678
 EXPOSE 3000
-ENTRYPOINT ["/sbin/tini", "--", "/bin/sh", "-c"]
+ENTRYPOINT ["tini", "--", "/bin/bash", "-c"]
diff --git a/web/bin/immich-web b/web/bin/immich-web
index 8868945ee1..d2739cf6c3 100755
--- a/web/bin/immich-web
+++ b/web/bin/immich-web
@@ -1,11 +1,11 @@
 #!/usr/bin/env sh
 
-TYPESCRIPT_SDK=/usr/src/open-api/typescript-sdk
+TYPESCRIPT_SDK=/usr/src/app/open-api/typescript-sdk
 
 npm --prefix "$TYPESCRIPT_SDK" install
 npm --prefix "$TYPESCRIPT_SDK" run build
 
-cd /usr/src/app || exit 1
+cd /usr/src/app/web || exit 1
 
 COUNT=0
 UPSTREAM="${IMMICH_SERVER_URL:-http://immich-server:2283/}"
@@ -19,4 +19,4 @@ done
 
 echo "Connected to $UPSTREAM"
 
-node ./node_modules/.bin/vite dev --host 0.0.0.0 --port 3000
+npx vite dev --host 0.0.0.0 --port 3000

From f929dc0816e1167cd15f0b8e2231e3e44113557a Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Fri, 18 Jul 2025 19:07:49 -0400
Subject: [PATCH 248/337] fix: devcontainer layout (#20021)

---
 .devcontainer/mobile/container-compose-overrides.yml | 4 ++--
 .devcontainer/server/container-compose-overrides.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/mobile/container-compose-overrides.yml b/.devcontainer/mobile/container-compose-overrides.yml
index 62a97a01eb..0543f42317 100644
--- a/.devcontainer/mobile/container-compose-overrides.yml
+++ b/.devcontainer/mobile/container-compose-overrides.yml
@@ -11,8 +11,8 @@ services:
       - open_api_node_modules:/workspaces/immich/open-api/typescript-sdk/node_modules
       - server_node_modules:/workspaces/immich/server/node_modules
       - web_node_modules:/workspaces/immich/web/node_modules
-      - ${UPLOAD_LOCATION}/photos:/workspaces/immich/server/upload
-      - ${UPLOAD_LOCATION}/photos/upload:/workspaces/immich/server/upload/upload
+      - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload
+      - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
 
   database:
diff --git a/.devcontainer/server/container-compose-overrides.yml b/.devcontainer/server/container-compose-overrides.yml
index d7efc92cb1..24ac9734b1 100644
--- a/.devcontainer/server/container-compose-overrides.yml
+++ b/.devcontainer/server/container-compose-overrides.yml
@@ -13,8 +13,8 @@ services:
       - open_api_node_modules:/workspaces/immich/open-api/typescript-sdk/node_modules
       - server_node_modules:/workspaces/immich/server/node_modules
       - web_node_modules:/workspaces/immich/web/node_modules
-      - ${UPLOAD_LOCATION:-upload1-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/workspaces/immich/server/upload
-      - ${UPLOAD_LOCATION:-upload2-devcontainer-volume}${UPLOAD_LOCATION:+/photos/upload}:/workspaces/immich/server/upload/upload
+      - ${UPLOAD_LOCATION:-upload1-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/usr/src/app/upload
+      - ${UPLOAD_LOCATION:-upload2-devcontainer-volume}${UPLOAD_LOCATION:+/photos/upload}:/usr/src/app/upload/upload
       - /etc/localtime:/etc/localtime:ro
 
   immich-web:

From fafb88d31c357d180052143773926d03d3e2256b Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 18 Jul 2025 23:58:53 -0500
Subject: [PATCH 249/337] feat(mobile): new upload (#18726)

---
 mobile/lib/constants/constants.dart           |   5 +
 .../domain/services/local_album.service.dart  |   4 +
 .../repositories/backup.repository.dart       | 154 +++++++++
 .../repositories/local_album.repository.dart  |  28 +-
 .../repositories/local_asset.repository.dart  |   7 +
 .../repositories/storage.repository.dart      |  48 ++-
 mobile/lib/main.dart                          |  23 +-
 .../upload/share_intent_attachment.model.dart |   2 +-
 .../lib/pages/backup/drift_backup.page.dart   | 294 +++++++++++++++++
 .../drift_backup_album_selection.page.dart    | 307 ++++++++++++++++++
 .../pages/common/change_experience.page.dart  |   6 +
 .../pages/share_intent/share_intent.page.dart |   2 +-
 .../pages/dev/feat_in_development.page.dart   |  27 +-
 .../providers/app_life_cycle.provider.dart    |   3 +
 .../share_intent_upload.provider.dart         |  36 +-
 .../backup/backup_album.provider.dart         |  62 ++++
 .../backup/drift_backup.provider.dart         | 194 +++++++++++
 mobile/lib/providers/websocket.provider.dart  |  42 ++-
 .../lib/repositories/upload.repository.dart   |  25 +-
 mobile/lib/routing/router.dart                |  10 +
 mobile/lib/routing/router.gr.dart             |  32 ++
 mobile/lib/services/drift_backup.service.dart | 286 ++++++++++++++++
 mobile/lib/services/upload.service.dart       |  83 +++--
 mobile/lib/utils/database.utils.dart          |  31 ++
 mobile/lib/utils/upload.dart                  |   1 -
 .../backup/drift_album_info_list_tile.dart    | 121 +++++++
 .../widgets/common/immich_sliver_app_bar.dart |   2 +-
 27 files changed, 1733 insertions(+), 102 deletions(-)
 create mode 100644 mobile/lib/infrastructure/repositories/backup.repository.dart
 create mode 100644 mobile/lib/pages/backup/drift_backup.page.dart
 create mode 100644 mobile/lib/pages/backup/drift_backup_album_selection.page.dart
 create mode 100644 mobile/lib/providers/backup/backup_album.provider.dart
 create mode 100644 mobile/lib/providers/backup/drift_backup.provider.dart
 create mode 100644 mobile/lib/services/drift_backup.service.dart
 create mode 100644 mobile/lib/utils/database.utils.dart
 delete mode 100644 mobile/lib/utils/upload.dart
 create mode 100644 mobile/lib/widgets/backup/drift_album_info_list_tile.dart

diff --git a/mobile/lib/constants/constants.dart b/mobile/lib/constants/constants.dart
index c37498ea3e..37a3eec073 100644
--- a/mobile/lib/constants/constants.dart
+++ b/mobile/lib/constants/constants.dart
@@ -16,6 +16,11 @@ const int kBatchHashSizeLimit = 1024 * 1024 * 1024; // 1GB
 // Secure storage keys
 const String kSecuredPinCode = "secured_pin_code";
 
+// background_downloader task groups
+const String kManualUploadGroup = 'manual_upload_group';
+const String kBackupGroup = 'backup_group';
+const String kBackupLivePhotoGroup = 'backup_live_photo_group';
+
 // Timeline constants
 const int kTimelineNoneSegmentSize = 120;
 const int kTimelineAssetLoadBatchSize = 256;
diff --git a/mobile/lib/domain/services/local_album.service.dart b/mobile/lib/domain/services/local_album.service.dart
index 9af12ce595..7ec9231196 100644
--- a/mobile/lib/domain/services/local_album.service.dart
+++ b/mobile/lib/domain/services/local_album.service.dart
@@ -14,4 +14,8 @@ class LocalAlbumService {
   Future<LocalAsset?> getThumbnail(String albumId) {
     return _repository.getThumbnail(albumId);
   }
+
+  Future<void> update(LocalAlbum album) {
+    return _repository.upsert(album);
+  }
 }
diff --git a/mobile/lib/infrastructure/repositories/backup.repository.dart b/mobile/lib/infrastructure/repositories/backup.repository.dart
new file mode 100644
index 0000000000..4ce3b07e8b
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/backup.repository.dart
@@ -0,0 +1,154 @@
+import 'package:drift/drift.dart';
+import 'package:hooks_riverpod/hooks_riverpod.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/repositories/db.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import "package:immich_mobile/utils/database.utils.dart";
+
+final backupRepositoryProvider = Provider<DriftBackupRepository>(
+  (ref) => DriftBackupRepository(ref.watch(driftProvider)),
+);
+
+class DriftBackupRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftBackupRepository(this._db) : super(_db);
+
+  _getExcludedSubquery() {
+    return _db.localAlbumAssetEntity.selectOnly()
+      ..addColumns([_db.localAlbumAssetEntity.assetId])
+      ..join([
+        innerJoin(
+          _db.localAlbumEntity,
+          _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
+          useColumns: false,
+        ),
+      ])
+      ..where(
+        _db.localAlbumEntity.backupSelection
+            .equalsValue(BackupSelection.excluded),
+      );
+  }
+
+  Future<int> getTotalCount() async {
+    final query = _db.localAlbumAssetEntity.selectOnly(distinct: true)
+      ..addColumns([_db.localAlbumAssetEntity.assetId])
+      ..join([
+        innerJoin(
+          _db.localAlbumEntity,
+          _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
+          useColumns: false,
+        ),
+      ])
+      ..where(
+        _db.localAlbumEntity.backupSelection
+                .equalsValue(BackupSelection.selected) &
+            _db.localAlbumAssetEntity.assetId
+                .isNotInQuery(_getExcludedSubquery()),
+      );
+
+    return query.get().then((rows) => rows.length);
+  }
+
+  Future<int> getRemainderCount() async {
+    final query = _db.localAlbumAssetEntity.selectOnly(distinct: true)
+      ..addColumns(
+        [_db.localAlbumAssetEntity.assetId],
+      )
+      ..join([
+        innerJoin(
+          _db.localAlbumEntity,
+          _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
+          useColumns: false,
+        ),
+        innerJoin(
+          _db.localAssetEntity,
+          _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
+          useColumns: false,
+        ),
+        leftOuterJoin(
+          _db.remoteAssetEntity,
+          _db.localAssetEntity.checksum
+              .equalsExp(_db.remoteAssetEntity.checksum),
+          useColumns: false,
+        ),
+      ])
+      ..where(
+        _db.localAlbumEntity.backupSelection
+                .equalsValue(BackupSelection.selected) &
+            _db.remoteAssetEntity.id.isNull() &
+            _db.localAlbumAssetEntity.assetId
+                .isNotInQuery(_getExcludedSubquery()),
+      );
+
+    return query.get().then((rows) => rows.length);
+  }
+
+  Future<int> getBackupCount() async {
+    final query = _db.localAlbumAssetEntity.selectOnly(distinct: true)
+      ..addColumns(
+        [_db.localAlbumAssetEntity.assetId],
+      )
+      ..join([
+        innerJoin(
+          _db.localAlbumEntity,
+          _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
+          useColumns: false,
+        ),
+        innerJoin(
+          _db.localAssetEntity,
+          _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
+          useColumns: false,
+        ),
+        innerJoin(
+          _db.remoteAssetEntity,
+          _db.localAssetEntity.checksum
+              .equalsExp(_db.remoteAssetEntity.checksum),
+          useColumns: false,
+        ),
+      ])
+      ..where(
+        _db.localAlbumEntity.backupSelection
+                .equalsValue(BackupSelection.selected) &
+            _db.remoteAssetEntity.id.isNotNull() &
+            _db.localAlbumAssetEntity.assetId
+                .isNotInQuery(_getExcludedSubquery()),
+      );
+
+    return query.get().then((rows) => rows.length);
+  }
+
+  Future<List<LocalAsset>> getCandidates() async {
+    final selectedAlbumIds = _db.localAlbumEntity.selectOnly(distinct: true)
+      ..addColumns([_db.localAlbumEntity.id])
+      ..where(
+        _db.localAlbumEntity.backupSelection
+            .equalsValue(BackupSelection.selected),
+      );
+
+    final query = _db.localAssetEntity.select()
+      ..where(
+        (lae) =>
+            existsQuery(
+              _db.localAlbumAssetEntity.selectOnly()
+                ..addColumns([_db.localAlbumAssetEntity.assetId])
+                ..where(
+                  _db.localAlbumAssetEntity.albumId
+                          .isInQuery(selectedAlbumIds) &
+                      _db.localAlbumAssetEntity.assetId.equalsExp(lae.id),
+                ),
+            ) &
+            notExistsQuery(
+              _db.remoteAssetEntity.selectOnly()
+                ..addColumns([_db.remoteAssetEntity.checksum])
+                ..where(
+                  _db.remoteAssetEntity.checksum.equalsExp(lae.checksum) &
+                      lae.checksum.isNotNull(),
+                ),
+            ) &
+            lae.id.isNotInQuery(_getExcludedSubquery()),
+      );
+
+    return query.map((localAsset) => localAsset.toDto()).get();
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/local_album.repository.dart b/mobile/lib/infrastructure/repositories/local_album.repository.dart
index 44ebe7f7ca..ba9dfd979d 100644
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -5,6 +5,7 @@ import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.d
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/utils/database.utils.dart';
 import 'package:platform/platform.dart';
 
 enum SortLocalAlbumsBy { id, backupSelection, isIosSharedAlbum }
@@ -381,30 +382,3 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
     return results.isNotEmpty ? results.first : null;
   }
 }
-
-extension on LocalAlbumEntityData {
-  LocalAlbum toDto({int assetCount = 0}) {
-    return LocalAlbum(
-      id: id,
-      name: name,
-      updatedAt: updatedAt,
-      assetCount: assetCount,
-      backupSelection: backupSelection,
-    );
-  }
-}
-
-extension on LocalAssetEntityData {
-  LocalAsset toDto() {
-    return LocalAsset(
-      id: id,
-      name: name,
-      checksum: checksum,
-      type: type,
-      createdAt: createdAt,
-      updatedAt: updatedAt,
-      durationInSeconds: durationInSeconds,
-      isFavorite: isFavorite,
-    );
-  }
-}
diff --git a/mobile/lib/infrastructure/repositories/local_asset.repository.dart b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
index 31a11f7047..8d21c858a2 100644
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -56,4 +56,11 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
       }
     });
   }
+
+  Future<LocalAsset?> getById(String id) {
+    final query = _db.localAssetEntity.select()
+      ..where((lae) => lae.id.equals(id));
+
+    return query.map((row) => row.toDto()).getSingleOrNull();
+  }
 }
diff --git a/mobile/lib/infrastructure/repositories/storage.repository.dart b/mobile/lib/infrastructure/repositories/storage.repository.dart
index 5b511709cd..0cf4f20ba8 100644
--- a/mobile/lib/infrastructure/repositories/storage.repository.dart
+++ b/mobile/lib/infrastructure/repositories/storage.repository.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';
 
@@ -7,8 +8,9 @@ class StorageRepository {
   const StorageRepository();
 
   Future<File?> getFileForAsset(String assetId) async {
-    final log = Logger('StorageRepository');
     File? file;
+    final log = Logger('StorageRepository');
+
     try {
       final entity = await AssetEntity.fromId(assetId);
       file = await entity?.originFile;
@@ -20,4 +22,48 @@ class StorageRepository {
     }
     return file;
   }
+
+  Future<File?> getMotionFileForAsset(LocalAsset asset) async {
+    File? file;
+    final log = Logger('StorageRepository');
+
+    try {
+      final entity = await AssetEntity.fromId(asset.id);
+      file = await entity?.originFileWithSubtype;
+      if (file == null) {
+        log.warning(
+          "Cannot get motion file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
+        );
+      }
+    } catch (error, stackTrace) {
+      log.warning(
+        "Error getting motion file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
+        error,
+        stackTrace,
+      );
+    }
+    return file;
+  }
+
+  Future<AssetEntity?> getAssetEntityForAsset(LocalAsset asset) async {
+    final log = Logger('StorageRepository');
+
+    AssetEntity? entity;
+
+    try {
+      entity = await AssetEntity.fromId(asset.id);
+      if (entity == null) {
+        log.warning(
+          "Cannot get AssetEntity for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
+        );
+      }
+    } catch (error, stackTrace) {
+      log.warning(
+        "Error getting AssetEntity for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
+        error,
+        stackTrace,
+      );
+    }
+    return entity;
+  }
 }
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index f67767f767..acadf4c887 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -93,6 +93,13 @@ Future<void> initApp() async {
 
   initializeTimeZones();
 
+  // Initialize the file downloader
+
+  await FileDownloader().configure(
+    // maxConcurrent: 5, maxConcurrentByHost: 2, maxConcurrentByGroup: 3
+    globalConfig: (Config.holdingQueue, (5, 2, 3)),
+  );
+
   await FileDownloader().trackTasksInGroup(
     downloadGroupLivePhoto,
     markDownloadedComplete: false,
@@ -171,7 +178,21 @@ class ImmichAppState extends ConsumerState<ImmichApp>
   }
 
   void _configureFileDownloaderNotifications() {
-    FileDownloader().configureNotification(
+    FileDownloader().configureNotificationForGroup(
+      downloadGroupImage,
+      running: TaskNotification(
+        'downloading_media'.tr(),
+        '${'file_name'.tr()}: {filename}',
+      ),
+      complete: TaskNotification(
+        'download_finished'.tr(),
+        '${'file_name'.tr()}: {filename}',
+      ),
+      progressBar: true,
+    );
+
+    FileDownloader().configureNotificationForGroup(
+      downloadGroupVideo,
       running: TaskNotification(
         'downloading_media'.tr(),
         '${'file_name'.tr()}: {filename}',
diff --git a/mobile/lib/models/upload/share_intent_attachment.model.dart b/mobile/lib/models/upload/share_intent_attachment.model.dart
index 1bdb5b6b48..7e57cf94d2 100644
--- a/mobile/lib/models/upload/share_intent_attachment.model.dart
+++ b/mobile/lib/models/upload/share_intent_attachment.model.dart
@@ -17,7 +17,7 @@ enum UploadStatus {
   notFound,
   failed,
   canceled,
-  waitingtoRetry,
+  waitingToRetry,
   paused,
 }
 
diff --git a/mobile/lib/pages/backup/drift_backup.page.dart b/mobile/lib/pages/backup/drift_backup.page.dart
new file mode 100644
index 0000000000..34649ca42c
--- /dev/null
+++ b/mobile/lib/pages/backup/drift_backup.page.dart
@@ -0,0 +1,294 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
+import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/providers/websocket.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/backup/backup_info_card.dart';
+
+@RoutePage()
+class DriftBackupPage extends HookConsumerWidget {
+  const DriftBackupPage({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    useEffect(
+      () {
+        ref.read(driftBackupProvider.notifier).getBackupStatus();
+        return null;
+      },
+      [],
+    );
+
+    Widget buildControlButtons() {
+      return Padding(
+        padding: const EdgeInsets.only(
+          top: 24,
+        ),
+        child: Column(
+          children: [
+            ElevatedButton(
+              onPressed: () => ref.read(driftBackupProvider.notifier).backup(),
+              child: const Text(
+                "backup_controller_page_start_backup",
+                style: TextStyle(
+                  fontSize: 16,
+                  fontWeight: FontWeight.bold,
+                ),
+              ).tr(),
+            ),
+            OutlinedButton(
+              onPressed: () => ref.read(driftBackupProvider.notifier).cancel(),
+              child: const Text(
+                "cancel",
+                style: TextStyle(
+                  fontSize: 16,
+                  fontWeight: FontWeight.bold,
+                ),
+              ).tr(),
+            ),
+            OutlinedButton(
+              onPressed: () =>
+                  ref.read(driftBackupProvider.notifier).getDataInfo(),
+              child: const Text(
+                "Get database info",
+                style: TextStyle(
+                  fontSize: 16,
+                  fontWeight: FontWeight.bold,
+                ),
+              ).tr(),
+            ),
+          ],
+        ),
+      );
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        title: const Text(
+          "Backup (Experimental)",
+        ),
+        leading: IconButton(
+          onPressed: () {
+            ref.watch(websocketProvider.notifier).listenUploadEvent();
+            context.maybePop(true);
+          },
+          splashRadius: 24,
+          icon: const Icon(
+            Icons.arrow_back_ios_rounded,
+          ),
+        ),
+        actions: [
+          Padding(
+            padding: const EdgeInsets.only(right: 8.0),
+            child: IconButton(
+              onPressed: () => context.pushRoute(const BackupOptionsRoute()),
+              splashRadius: 24,
+              icon: const Icon(
+                Icons.settings_outlined,
+              ),
+            ),
+          ),
+        ],
+      ),
+      body: Stack(
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(
+              left: 16.0,
+              right: 16,
+              bottom: 32,
+            ),
+            child: ListView(
+              children: [
+                const SizedBox(height: 8),
+                const _BackupAlbumSelectionCard(),
+                const _TotalCard(),
+                const _BackupCard(),
+                const _RemainderCard(),
+                const Divider(),
+                buildControlButtons(),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _BackupAlbumSelectionCard extends ConsumerWidget {
+  const _BackupAlbumSelectionCard();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    Widget buildSelectedAlbumName() {
+      String text = "backup_controller_page_backup_selected".tr();
+      final albums = ref
+          .watch(backupAlbumProvider)
+          .where(
+            (album) => album.backupSelection == BackupSelection.selected,
+          )
+          .toList();
+
+      if (albums.isNotEmpty) {
+        for (var album in albums) {
+          if (album.name == "Recent" || album.name == "Recents") {
+            text += "${album.name} (${'all'.tr()}), ";
+          } else {
+            text += "${album.name}, ";
+          }
+        }
+
+        return Padding(
+          padding: const EdgeInsets.only(top: 8.0),
+          child: Text(
+            text.trim().substring(0, text.length - 2),
+            style: context.textTheme.labelLarge?.copyWith(
+              color: context.primaryColor,
+            ),
+          ),
+        );
+      } else {
+        return Padding(
+          padding: const EdgeInsets.only(top: 8.0),
+          child: Text(
+            "backup_controller_page_none_selected".tr(),
+            style: context.textTheme.labelLarge?.copyWith(
+              color: context.primaryColor,
+            ),
+          ),
+        );
+      }
+    }
+
+    Widget buildExcludedAlbumName() {
+      String text = "backup_controller_page_excluded".tr();
+      final albums = ref
+          .watch(backupAlbumProvider)
+          .where(
+            (album) => album.backupSelection == BackupSelection.excluded,
+          )
+          .toList();
+
+      if (albums.isNotEmpty) {
+        for (var album in albums) {
+          text += "${album.name}, ";
+        }
+
+        return Padding(
+          padding: const EdgeInsets.only(top: 8.0),
+          child: Text(
+            text.trim().substring(0, text.length - 2),
+            style: context.textTheme.labelLarge?.copyWith(
+              color: Colors.red[300],
+            ),
+          ),
+        );
+      } else {
+        return const SizedBox();
+      }
+    }
+
+    return Card(
+      shape: RoundedRectangleBorder(
+        borderRadius: const BorderRadius.all(Radius.circular(20)),
+        side: BorderSide(
+          color: context.colorScheme.outlineVariant,
+          width: 1,
+        ),
+      ),
+      elevation: 0,
+      borderOnForeground: false,
+      child: ListTile(
+        minVerticalPadding: 18,
+        title: Text(
+          "backup_controller_page_albums",
+          style: context.textTheme.titleMedium,
+        ).tr(),
+        subtitle: Padding(
+          padding: const EdgeInsets.only(top: 8.0),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                "backup_controller_page_to_backup",
+                style: context.textTheme.bodyMedium?.copyWith(
+                  color: context.colorScheme.onSurfaceSecondary,
+                ),
+              ).tr(),
+              buildSelectedAlbumName(),
+              buildExcludedAlbumName(),
+            ],
+          ),
+        ),
+        trailing: ElevatedButton(
+          onPressed: () async {
+            await context.pushRoute(const DriftBackupAlbumSelectionRoute());
+            ref.read(driftBackupProvider.notifier).getBackupStatus();
+          },
+          child: const Text(
+            "select",
+            style: TextStyle(
+              fontWeight: FontWeight.bold,
+            ),
+          ).tr(),
+        ),
+      ),
+    );
+  }
+}
+
+class _TotalCard extends ConsumerWidget {
+  const _TotalCard();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final totalCount =
+        ref.watch(driftBackupProvider.select((p) => p.totalCount));
+
+    return BackupInfoCard(
+      title: "total".tr(),
+      subtitle: "backup_controller_page_total_sub".tr(),
+      info: totalCount.toString(),
+    );
+  }
+}
+
+class _BackupCard extends ConsumerWidget {
+  const _BackupCard();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final backupCount =
+        ref.watch(driftBackupProvider.select((p) => p.backupCount));
+
+    return BackupInfoCard(
+      title: "backup_controller_page_backup".tr(),
+      subtitle: "backup_controller_page_backup_sub".tr(),
+      info: backupCount.toString(),
+    );
+  }
+}
+
+class _RemainderCard extends ConsumerWidget {
+  const _RemainderCard();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final remainderCount =
+        ref.watch(driftBackupProvider.select((p) => p.remainderCount));
+    return BackupInfoCard(
+      title: "backup_controller_page_remainder".tr(),
+      subtitle: "backup_controller_page_remainder_sub".tr(),
+      info: remainderCount.toString(),
+    );
+  }
+}
diff --git a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
new file mode 100644
index 0000000000..2e7a2d4c2d
--- /dev/null
+++ b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
@@ -0,0 +1,307 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/album/album.provider.dart';
+import 'package:immich_mobile/providers/backup/backup.provider.dart';
+import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
+import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';
+import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
+
+@RoutePage()
+class DriftBackupAlbumSelectionPage extends HookConsumerWidget {
+  const DriftBackupAlbumSelectionPage({super.key});
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final albums = ref.watch(backupAlbumProvider);
+
+    final selectedBackupAlbums = albums
+        .where((album) => album.backupSelection == BackupSelection.selected)
+        .toList();
+    final excludedBackupAlbums = albums
+        .where((album) => album.backupSelection == BackupSelection.excluded)
+        .toList();
+    final enableSyncUploadAlbum =
+        useAppSettingsState(AppSettingsEnum.syncAlbums);
+    final isDarkTheme = context.isDarkTheme;
+
+    useEffect(
+      () {
+        ref.watch(backupProvider.notifier).getBackupInfo();
+        ref.watch(backupAlbumProvider.notifier).getAll();
+        return null;
+      },
+      [],
+    );
+
+    buildAlbumSelectionList() {
+      if (albums.isEmpty) {
+        return const SliverToBoxAdapter(
+          child: Center(
+            child: CircularProgressIndicator(),
+          ),
+        );
+      }
+
+      return SliverPadding(
+        padding: const EdgeInsets.symmetric(vertical: 12.0),
+        sliver: SliverList(
+          delegate: SliverChildBuilderDelegate(
+            ((context, index) {
+              return DriftAlbumInfoListTile(
+                album: albums[index],
+              );
+            }),
+            childCount: albums.length,
+          ),
+        ),
+      );
+    }
+
+    buildAlbumSelectionGrid() {
+      if (albums.isEmpty) {
+        return const SliverToBoxAdapter(
+          child: Center(
+            child: CircularProgressIndicator(),
+          ),
+        );
+      }
+
+      return SliverPadding(
+        padding: const EdgeInsets.all(12.0),
+        sliver: SliverGrid.builder(
+          gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+            maxCrossAxisExtent: 300,
+            mainAxisSpacing: 12,
+            crossAxisSpacing: 12,
+          ),
+          itemCount: albums.length,
+          itemBuilder: ((context, index) {
+            return DriftAlbumInfoListTile(
+              album: albums[index],
+            );
+          }),
+        ),
+      );
+    }
+
+    buildSelectedAlbumNameChip() {
+      return selectedBackupAlbums.map((album) {
+        void removeSelection() {
+          ref.read(backupAlbumProvider.notifier).deselectAlbum(album);
+        }
+
+        return Padding(
+          padding: const EdgeInsets.only(right: 8.0),
+          child: GestureDetector(
+            onTap: removeSelection,
+            child: Chip(
+              label: Text(
+                album.name,
+                style: TextStyle(
+                  fontSize: 12,
+                  color: isDarkTheme ? Colors.black : Colors.white,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              backgroundColor: context.primaryColor,
+              deleteIconColor: isDarkTheme ? Colors.black : Colors.white,
+              deleteIcon: const Icon(
+                Icons.cancel_rounded,
+                size: 15,
+              ),
+              onDeleted: removeSelection,
+            ),
+          ),
+        );
+      }).toSet();
+    }
+
+    buildExcludedAlbumNameChip() {
+      return excludedBackupAlbums.map((album) {
+        void removeSelection() {
+          ref.read(backupAlbumProvider.notifier).deselectAlbum(album);
+        }
+
+        return GestureDetector(
+          onTap: removeSelection,
+          child: Padding(
+            padding: const EdgeInsets.only(right: 8.0),
+            child: Chip(
+              label: Text(
+                album.name,
+                style: TextStyle(
+                  fontSize: 12,
+                  color: context.scaffoldBackgroundColor,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              backgroundColor: Colors.red[300],
+              deleteIconColor: context.scaffoldBackgroundColor,
+              deleteIcon: const Icon(
+                Icons.cancel_rounded,
+                size: 15,
+              ),
+              onDeleted: removeSelection,
+            ),
+          ),
+        );
+      }).toSet();
+    }
+
+    handleSyncAlbumToggle(bool isEnable) async {
+      if (isEnable) {
+        await ref.read(albumProvider.notifier).refreshRemoteAlbums();
+        for (final album in selectedBackupAlbums) {
+          await ref.read(albumProvider.notifier).createSyncAlbum(album.name);
+        }
+      }
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(
+          onPressed: () => context.maybePop(),
+          icon: const Icon(Icons.arrow_back_ios_rounded),
+        ),
+        title: const Text(
+          "backup_album_selection_page_select_albums",
+        ).tr(),
+        elevation: 0,
+      ),
+      body: SafeArea(
+        child: CustomScrollView(
+          physics: const ClampingScrollPhysics(),
+          slivers: [
+            SliverToBoxAdapter(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.symmetric(
+                      vertical: 8.0,
+                      horizontal: 16.0,
+                    ),
+                    child: Text(
+                      "backup_album_selection_page_selection_info",
+                      style: context.textTheme.titleSmall,
+                    ).tr(),
+                  ),
+                  // Selected Album Chips
+
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                    child: Wrap(
+                      children: [
+                        ...buildSelectedAlbumNameChip(),
+                        ...buildExcludedAlbumNameChip(),
+                      ],
+                    ),
+                  ),
+
+                  SettingsSwitchListTile(
+                    valueNotifier: enableSyncUploadAlbum,
+                    title: "sync_albums".tr(),
+                    subtitle: "sync_upload_album_setting_subtitle".tr(),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                    titleStyle: context.textTheme.bodyLarge?.copyWith(
+                      fontWeight: FontWeight.bold,
+                    ),
+                    subtitleStyle: context.textTheme.labelLarge?.copyWith(
+                      color: context.colorScheme.primary,
+                    ),
+                    onChanged: handleSyncAlbumToggle,
+                  ),
+
+                  ListTile(
+                    title: Text(
+                      "backup_album_selection_page_albums_device".tr(
+                        namedArgs: {
+                          'count': ref
+                              .watch(backupProvider)
+                              .availableAlbums
+                              .length
+                              .toString(),
+                        },
+                      ),
+                      style: context.textTheme.titleSmall,
+                    ),
+                    subtitle: Padding(
+                      padding: const EdgeInsets.symmetric(vertical: 8.0),
+                      child: Text(
+                        "backup_album_selection_page_albums_tap",
+                        style: context.textTheme.labelLarge?.copyWith(
+                          color: context.primaryColor,
+                        ),
+                      ).tr(),
+                    ),
+                    trailing: IconButton(
+                      splashRadius: 16,
+                      icon: Icon(
+                        Icons.info,
+                        size: 20,
+                        color: context.primaryColor,
+                      ),
+                      onPressed: () {
+                        // show the dialog
+                        showDialog(
+                          context: context,
+                          builder: (BuildContext context) {
+                            return AlertDialog(
+                              shape: const RoundedRectangleBorder(
+                                borderRadius:
+                                    BorderRadius.all(Radius.circular(10)),
+                              ),
+                              elevation: 5,
+                              title: Text(
+                                'backup_album_selection_page_selection_info',
+                                style: TextStyle(
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold,
+                                  color: context.primaryColor,
+                                ),
+                              ).tr(),
+                              content: SingleChildScrollView(
+                                child: ListBody(
+                                  children: [
+                                    const Text(
+                                      'backup_album_selection_page_assets_scatter',
+                                      style: TextStyle(
+                                        fontSize: 14,
+                                      ),
+                                    ).tr(),
+                                  ],
+                                ),
+                              ),
+                            );
+                          },
+                        );
+                      },
+                    ),
+                  ),
+
+                  // buildSearchBar(),
+                ],
+              ),
+            ),
+            SliverLayoutBuilder(
+              builder: (context, constraints) {
+                if (constraints.crossAxisExtent > 600) {
+                  return buildAlbumSelectionGrid();
+                } else {
+                  return buildAlbumSelectionList();
+                }
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/pages/common/change_experience.page.dart b/mobile/lib/pages/common/change_experience.page.dart
index 74c3116962..5d298edb42 100644
--- a/mobile/lib/pages/common/change_experience.page.dart
+++ b/mobile/lib/pages/common/change_experience.page.dart
@@ -8,6 +8,7 @@ import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/migration.dart';
 import 'package:permission_handler/permission_handler.dart';
@@ -42,6 +43,9 @@ class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
         albumNotifier.dispose();
       }
 
+      ref.read(websocketProvider.notifier).stopListenToOldEvents();
+      ref.read(websocketProvider.notifier).startListeningToBetaEvents();
+
       final permission = await ref
           .read(galleryPermissionNotifier.notifier)
           .requestGalleryPermission();
@@ -55,6 +59,8 @@ class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
       }
     } else {
       await ref.read(backgroundSyncProvider).cancel();
+      ref.read(websocketProvider.notifier).stopListeningToBetaEvents();
+      ref.read(websocketProvider.notifier).startListeningToOldEvents();
     }
 
     if (mounted) {
diff --git a/mobile/lib/pages/share_intent/share_intent.page.dart b/mobile/lib/pages/share_intent/share_intent.page.dart
index 11c114e4a6..299ffe5497 100644
--- a/mobile/lib/pages/share_intent/share_intent.page.dart
+++ b/mobile/lib/pages/share_intent/share_intent.page.dart
@@ -268,7 +268,7 @@ class UploadStatusIcon extends StatelessWidget {
           color: Colors.red,
           semanticLabel: 'canceled'.tr(),
         ),
-      UploadStatus.waitingtoRetry || UploadStatus.paused => Icon(
+      UploadStatus.waitingToRetry || UploadStatus.paused => Icon(
           Icons.pause_circle_rounded,
           color: context.primaryColor,
           semanticLabel: 'paused'.tr(),
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index e94329acd2..7ee151f94d 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -91,6 +91,10 @@ final _features = [
   ),
   _Feature(
     name: 'Clear Local Data',
+    style: const TextStyle(
+      color: Colors.orange,
+      fontWeight: FontWeight.bold,
+    ),
     icon: Icons.delete_forever_rounded,
     onTap: (_, ref) async {
       final db = ref.read(driftProvider);
@@ -101,6 +105,10 @@ final _features = [
   ),
   _Feature(
     name: 'Clear Remote Data',
+    style: const TextStyle(
+      color: Colors.orange,
+      fontWeight: FontWeight.bold,
+    ),
     icon: Icons.delete_sweep_rounded,
     onTap: (_, ref) async {
       final db = ref.read(driftProvider);
@@ -117,17 +125,29 @@ final _features = [
   ),
   _Feature(
     name: 'Local Media Summary',
+    style: const TextStyle(
+      color: Colors.indigo,
+      fontWeight: FontWeight.bold,
+    ),
     icon: Icons.table_chart_rounded,
     onTap: (ctx, _) => ctx.pushRoute(const LocalMediaSummaryRoute()),
   ),
   _Feature(
     name: 'Remote Media Summary',
+    style: const TextStyle(
+      color: Colors.indigo,
+      fontWeight: FontWeight.bold,
+    ),
     icon: Icons.summarize_rounded,
     onTap: (ctx, _) => ctx.pushRoute(const RemoteMediaSummaryRoute()),
   ),
   _Feature(
     name: 'Reset Sqlite',
     icon: Icons.table_view_rounded,
+    style: const TextStyle(
+      color: Colors.red,
+      fontWeight: FontWeight.bold,
+    ),
     onTap: (_, ref) async {
       final drift = ref.read(driftProvider);
       // ignore: invalid_use_of_protected_member, invalid_use_of_visible_for_testing_member
@@ -160,7 +180,10 @@ class FeatInDevPage extends StatelessWidget {
                 final feat = _features[index];
                 return Consumer(
                   builder: (ctx, ref, _) => ListTile(
-                    title: Text(feat.name),
+                    title: Text(
+                      feat.name,
+                      style: feat.style,
+                    ),
                     trailing: Icon(feat.icon),
                     visualDensity: VisualDensity.compact,
                     onTap: () => unawaited(feat.onTap(ctx, ref)),
@@ -183,10 +206,12 @@ class _Feature {
     required this.name,
     required this.icon,
     required this.onTap,
+    this.style,
   });
 
   final String name;
   final IconData icon;
+  final TextStyle? style;
   final Future<void> Function(BuildContext, WidgetRef _) onTap;
 }
 
diff --git a/mobile/lib/providers/app_life_cycle.provider.dart b/mobile/lib/providers/app_life_cycle.provider.dart
index 997058d763..5984160241 100644
--- a/mobile/lib/providers/app_life_cycle.provider.dart
+++ b/mobile/lib/providers/app_life_cycle.provider.dart
@@ -69,6 +69,9 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
       }
 
       await _ref.read(serverInfoProvider.notifier).getServerVersion();
+
+      // TODO: Need to decide on how we want to handle uploads once the app is resumed
+      // await FileDownloader().start();
     }
 
     if (!Store.isBetaTimelineEnabled) {
diff --git a/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart b/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
index ed2c485b13..3c448b112f 100644
--- a/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
+++ b/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:background_downloader/background_downloader.dart';
-import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/extensions/string_extensions.dart';
@@ -30,7 +29,7 @@ class ShareIntentUploadStateNotifier
     this._uploadService,
     this._shareIntentService,
   ) : super([]) {
-    _uploadService.onUploadStatus = _uploadStatusCallback;
+    _uploadService.onUploadStatus = _updateUploadStatus;
     _uploadService.onTaskProgress = _taskProgressCallback;
   }
 
@@ -69,8 +68,8 @@ class ShareIntentUploadStateNotifier
     state = [];
   }
 
-  void _updateUploadStatus(TaskStatusUpdate task, TaskStatus status) async {
-    if (status == TaskStatus.canceled) {
+  void _updateUploadStatus(TaskStatusUpdate task) async {
+    if (task.status == TaskStatus.canceled) {
       return;
     }
 
@@ -83,7 +82,7 @@ class ShareIntentUploadStateNotifier
       TaskStatus.running => UploadStatus.running,
       TaskStatus.paused => UploadStatus.paused,
       TaskStatus.notFound => UploadStatus.notFound,
-      TaskStatus.waitingToRetry => UploadStatus.waitingtoRetry
+      TaskStatus.waitingToRetry => UploadStatus.waitingToRetry
     };
 
     state = [
@@ -95,27 +94,6 @@ class ShareIntentUploadStateNotifier
     ];
   }
 
-  void _uploadStatusCallback(TaskStatusUpdate update) {
-    _updateUploadStatus(update, update.status);
-
-    switch (update.status) {
-      case TaskStatus.complete:
-        if (update.responseStatusCode == 200) {
-          if (kDebugMode) {
-            debugPrint("[COMPLETE] ${update.task.taskId} - DUPLICATE");
-          }
-        } else {
-          if (kDebugMode) {
-            debugPrint("[COMPLETE] ${update.task.taskId}");
-          }
-        }
-        break;
-
-      default:
-        break;
-    }
-  }
-
   void _taskProgressCallback(TaskProgressUpdate update) {
     // Ignore if the task is canceled or completed
     if (update.progress == downloadFailed ||
@@ -134,10 +112,6 @@ class ShareIntentUploadStateNotifier
   }
 
   Future<void> upload(File file) {
-    return _uploadService.upload(file);
-  }
-
-  Future<bool> cancelUpload(String id) {
-    return _uploadService.cancelUpload(id);
+    return _uploadService.buildUploadTask(file, group: kManualUploadGroup);
   }
 }
diff --git a/mobile/lib/providers/backup/backup_album.provider.dart b/mobile/lib/providers/backup/backup_album.provider.dart
new file mode 100644
index 0000000000..b36d3ac57e
--- /dev/null
+++ b/mobile/lib/providers/backup/backup_album.provider.dart
@@ -0,0 +1,62 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/domain/services/local_album.service.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+
+final backupAlbumProvider =
+    StateNotifierProvider<BackupAlbumNotifier, List<LocalAlbum>>(
+  (ref) => BackupAlbumNotifier(
+    ref.watch(localAlbumServiceProvider),
+  ),
+);
+
+class BackupAlbumNotifier extends StateNotifier<List<LocalAlbum>> {
+  BackupAlbumNotifier(this._localAlbumService) : super([]) {
+    getAll();
+  }
+
+  final LocalAlbumService _localAlbumService;
+
+  Future<void> getAll() async {
+    state = await _localAlbumService.getAll();
+  }
+
+  Future<void> selectAlbum(LocalAlbum album) async {
+    album = album.copyWith(backupSelection: BackupSelection.selected);
+    await _localAlbumService.update(album);
+
+    state = state
+        .map(
+          (currentAlbum) => currentAlbum.id == album.id
+              ? currentAlbum.copyWith(backupSelection: BackupSelection.selected)
+              : currentAlbum,
+        )
+        .toList();
+  }
+
+  Future<void> deselectAlbum(LocalAlbum album) async {
+    album = album.copyWith(backupSelection: BackupSelection.none);
+    await _localAlbumService.update(album);
+
+    state = state
+        .map(
+          (currentAlbum) => currentAlbum.id == album.id
+              ? currentAlbum.copyWith(backupSelection: BackupSelection.none)
+              : currentAlbum,
+        )
+        .toList();
+  }
+
+  Future<void> excludeAlbum(LocalAlbum album) async {
+    album = album.copyWith(backupSelection: BackupSelection.excluded);
+    await _localAlbumService.update(album);
+
+    state = state
+        .map(
+          (currentAlbum) => currentAlbum.id == album.id
+              ? currentAlbum.copyWith(backupSelection: BackupSelection.excluded)
+              : currentAlbum,
+        )
+        .toList();
+  }
+}
diff --git a/mobile/lib/providers/backup/drift_backup.provider.dart b/mobile/lib/providers/backup/drift_backup.provider.dart
new file mode 100644
index 0000000000..2544d208c4
--- /dev/null
+++ b/mobile/lib/providers/backup/drift_backup.provider.dart
@@ -0,0 +1,194 @@
+import 'dart:async';
+
+import 'package:background_downloader/background_downloader.dart';
+import 'package:collection/collection.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/services/drift_backup.service.dart';
+import 'package:immich_mobile/services/upload.service.dart';
+
+class DriftUploadStatus {
+  final String taskId;
+  final String filename;
+  final double progress;
+
+  const DriftUploadStatus({
+    required this.taskId,
+    required this.filename,
+    required this.progress,
+  });
+
+  DriftUploadStatus copyWith({
+    String? taskId,
+    String? filename,
+    double? progress,
+  }) {
+    return DriftUploadStatus(
+      taskId: taskId ?? this.taskId,
+      filename: filename ?? this.filename,
+      progress: progress ?? this.progress,
+    );
+  }
+
+  @override
+  String toString() =>
+      'ExpUploadStatus(taskId: $taskId, filename: $filename, progress: $progress)';
+
+  @override
+  bool operator ==(covariant DriftUploadStatus other) {
+    if (identical(this, other)) return true;
+
+    return other.taskId == taskId &&
+        other.filename == filename &&
+        other.progress == progress;
+  }
+
+  @override
+  int get hashCode => taskId.hashCode ^ filename.hashCode ^ progress.hashCode;
+}
+
+class DriftBackupState {
+  final int totalCount;
+  final int backupCount;
+  final int remainderCount;
+  final Map<String, DriftUploadStatus> uploadItems;
+
+  const DriftBackupState({
+    required this.totalCount,
+    required this.backupCount,
+    required this.remainderCount,
+    required this.uploadItems,
+  });
+
+  DriftBackupState copyWith({
+    int? totalCount,
+    int? backupCount,
+    int? remainderCount,
+    Map<String, DriftUploadStatus>? uploadItems,
+  }) {
+    return DriftBackupState(
+      totalCount: totalCount ?? this.totalCount,
+      backupCount: backupCount ?? this.backupCount,
+      remainderCount: remainderCount ?? this.remainderCount,
+      uploadItems: uploadItems ?? this.uploadItems,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'ExpBackupState(totalCount: $totalCount, backupCount: $backupCount, remainderCount: $remainderCount, uploadItems: $uploadItems)';
+  }
+
+  @override
+  bool operator ==(covariant DriftBackupState other) {
+    if (identical(this, other)) return true;
+    final mapEquals = const DeepCollectionEquality().equals;
+
+    return other.totalCount == totalCount &&
+        other.backupCount == backupCount &&
+        other.remainderCount == remainderCount &&
+        mapEquals(other.uploadItems, uploadItems);
+  }
+
+  @override
+  int get hashCode {
+    return totalCount.hashCode ^
+        backupCount.hashCode ^
+        remainderCount.hashCode ^
+        uploadItems.hashCode;
+  }
+}
+
+final driftBackupProvider =
+    StateNotifierProvider<ExpBackupNotifier, DriftBackupState>((ref) {
+  return ExpBackupNotifier(
+    ref.watch(driftBackupServiceProvider),
+    ref.watch(uploadServiceProvider),
+  );
+});
+
+class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
+  ExpBackupNotifier(
+    this._backupService,
+    this._uploadService,
+  ) : super(
+          const DriftBackupState(
+            totalCount: 0,
+            backupCount: 0,
+            remainderCount: 0,
+            uploadItems: {},
+          ),
+        ) {
+    {
+      _uploadService.taskStatusStream.listen(_handleTaskStatusUpdate);
+      _uploadService.taskProgressStream.listen(_handleTaskProgressUpdate);
+    }
+  }
+
+  final DriftBackupService _backupService;
+  final UploadService _uploadService;
+  StreamSubscription<TaskStatusUpdate>? _statusSubscription;
+  StreamSubscription<TaskProgressUpdate>? _progressSubscription;
+
+  void _handleTaskStatusUpdate(TaskStatusUpdate update) {
+    switch (update.status) {
+      case TaskStatus.complete:
+        state = state.copyWith(
+          backupCount: state.backupCount + 1,
+          remainderCount: state.remainderCount - 1,
+        );
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  void _handleTaskProgressUpdate(TaskProgressUpdate update) {}
+
+  Future<void> getBackupStatus() async {
+    final [totalCount, backupCount, remainderCount] = await Future.wait([
+      _backupService.getTotalCount(),
+      _backupService.getBackupCount(),
+      _backupService.getRemainderCount(),
+    ]);
+
+    state = state.copyWith(
+      totalCount: totalCount,
+      backupCount: backupCount,
+      remainderCount: remainderCount,
+    );
+  }
+
+  Future<void> backup() {
+    return _backupService.backup();
+  }
+
+  Future<void> cancel() async {
+    await _backupService.cancel();
+    await getDataInfo();
+  }
+
+  Future<void> getDataInfo() async {
+    final a = await FileDownloader().database.allRecordsWithStatus(
+          TaskStatus.enqueued,
+          group: kBackupGroup,
+        );
+
+    final b = await FileDownloader().allTasks(
+      group: kBackupGroup,
+    );
+
+    debugPrint(
+      "Enqueued tasks: ${a.length}, All tasks: ${b.length}",
+    );
+  }
+
+  @override
+  void dispose() {
+    _statusSubscription?.cancel();
+    _progressSubscription?.cancel();
+    super.dispose();
+  }
+}
diff --git a/mobile/lib/providers/websocket.provider.dart b/mobile/lib/providers/websocket.provider.dart
index d9db831776..05fe5a087c 100644
--- a/mobile/lib/providers/websocket.provider.dart
+++ b/mobile/lib/providers/websocket.provider.dart
@@ -176,16 +176,14 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
           );
         });
 
-        socket.on('on_upload_success', _handleOnUploadSuccess);
+        if (!Store.isBetaTimelineEnabled) {
+          startListeningToOldEvents();
+        } else {
+          startListeningToBetaEvents();
+        }
+
         socket.on('on_config_update', _handleOnConfigUpdate);
-        socket.on('on_asset_delete', _handleOnAssetDelete);
-        socket.on('on_asset_trash', _handleOnAssetTrash);
-        socket.on('on_asset_restore', _handleServerUpdates);
-        socket.on('on_asset_update', _handleServerUpdates);
-        socket.on('on_asset_stack_update', _handleServerUpdates);
-        socket.on('on_asset_hidden', _handleOnAssetHidden);
         socket.on('on_new_release', _handleReleaseUpdates);
-        socket.on('AssetUploadReadyV1', _handleSyncAssetUploadReady);
       } catch (e) {
         debugPrint("[WEBSOCKET] Catch Websocket Error - ${e.toString()}");
       }
@@ -213,6 +211,34 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     state.socket?.off(eventName);
   }
 
+  void stopListenToOldEvents() {
+    state.socket?.off('on_upload_success');
+    state.socket?.off('on_asset_delete');
+    state.socket?.off('on_asset_trash');
+    state.socket?.off('on_asset_restore');
+    state.socket?.off('on_asset_update');
+    state.socket?.off('on_asset_stack_update');
+    state.socket?.off('on_asset_hidden');
+  }
+
+  void startListeningToOldEvents() {
+    state.socket?.on('on_upload_success', _handleOnUploadSuccess);
+    state.socket?.on('on_asset_delete', _handleOnAssetDelete);
+    state.socket?.on('on_asset_trash', _handleOnAssetTrash);
+    state.socket?.on('on_asset_restore', _handleServerUpdates);
+    state.socket?.on('on_asset_update', _handleServerUpdates);
+    state.socket?.on('on_asset_stack_update', _handleServerUpdates);
+    state.socket?.on('on_asset_hidden', _handleOnAssetHidden);
+  }
+
+  void stopListeningToBetaEvents() {
+    state.socket?.off('AssetUploadReadyV1');
+  }
+
+  void startListeningToBetaEvents() {
+    state.socket?.on('AssetUploadReadyV1', _handleSyncAssetUploadReady);
+  }
+
   void listenUploadEvent() {
     debugPrint("Start listening to event on_upload_success");
     state.socket?.on('on_upload_success', _handleOnUploadSuccess);
diff --git a/mobile/lib/repositories/upload.repository.dart b/mobile/lib/repositories/upload.repository.dart
index 4f840fa3c6..b98eece656 100644
--- a/mobile/lib/repositories/upload.repository.dart
+++ b/mobile/lib/repositories/upload.repository.dart
@@ -1,6 +1,6 @@
 import 'package:background_downloader/background_downloader.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/utils/upload.dart';
+import 'package:immich_mobile/constants/constants.dart';
 
 final uploadRepositoryProvider = Provider((ref) => UploadRepository());
 
@@ -11,25 +11,30 @@ class UploadRepository {
 
   UploadRepository() {
     FileDownloader().registerCallbacks(
-      group: uploadGroup,
+      group: kBackupGroup,
+      taskStatusCallback: (update) => onUploadStatus?.call(update),
+      taskProgressCallback: (update) => onTaskProgress?.call(update),
+    );
+    FileDownloader().registerCallbacks(
+      group: kBackupLivePhotoGroup,
       taskStatusCallback: (update) => onUploadStatus?.call(update),
       taskProgressCallback: (update) => onTaskProgress?.call(update),
     );
   }
 
-  Future<bool> upload(UploadTask task) {
-    return FileDownloader().enqueue(task);
+  void enqueueAll(List<UploadTask> tasks) {
+    FileDownloader().enqueueAll(tasks);
   }
 
-  Future<void> deleteAllTrackingRecords() {
-    return FileDownloader().database.deleteAllRecords();
+  Future<void> deleteAllTrackingRecords(String group) {
+    return FileDownloader().database.deleteAllRecords(group: group);
   }
 
-  Future<bool> cancel(String id) {
-    return FileDownloader().cancelTaskWithId(id);
+  Future<bool> cancelAll(String group) {
+    return FileDownloader().cancelAll(group: group);
   }
 
-  Future<void> deleteRecordsWithIds(List<String> ids) {
-    return FileDownloader().database.deleteRecordsWithIds(ids);
+  Future<int> reset(String group) {
+    return FileDownloader().reset(group: group);
   }
 }
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 3a694df816..d7dd45dbd9 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -22,6 +22,8 @@ import 'package:immich_mobile/pages/album/album_shared_user_selection.page.dart'
 import 'package:immich_mobile/pages/album/album_viewer.page.dart';
 import 'package:immich_mobile/pages/albums/albums.page.dart';
 import 'package:immich_mobile/pages/backup/album_preview.page.dart';
+import 'package:immich_mobile/pages/backup/drift_backup_album_selection.page.dart';
+import 'package:immich_mobile/pages/backup/drift_backup.page.dart';
 import 'package:immich_mobile/pages/backup/backup_album_selection.page.dart';
 import 'package:immich_mobile/pages/backup/backup_controller.page.dart';
 import 'package:immich_mobile/pages/backup/backup_options.page.dart';
@@ -385,6 +387,14 @@ class AppRouter extends RootStackRouter {
       page: RemoteMediaSummaryRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftBackupRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
+    AutoRoute(
+      page: DriftBackupAlbumSelectionRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     AutoRoute(
       page: LocalTimelineRoute.page,
       guards: [_authGuard, _duplicateGuard],
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 716d5ef89a..c72dc62765 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -726,6 +726,38 @@ class DriftAssetSelectionTimelineRouteArgs {
   }
 }
 
+/// generated route for
+/// [DriftBackupAlbumSelectionPage]
+class DriftBackupAlbumSelectionRoute extends PageRouteInfo<void> {
+  const DriftBackupAlbumSelectionRoute({List<PageRouteInfo>? children})
+      : super(DriftBackupAlbumSelectionRoute.name, initialChildren: children);
+
+  static const String name = 'DriftBackupAlbumSelectionRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftBackupAlbumSelectionPage();
+    },
+  );
+}
+
+/// generated route for
+/// [DriftBackupPage]
+class DriftBackupRoute extends PageRouteInfo<void> {
+  const DriftBackupRoute({List<PageRouteInfo>? children})
+      : super(DriftBackupRoute.name, initialChildren: children);
+
+  static const String name = 'DriftBackupRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftBackupPage();
+    },
+  );
+}
+
 /// generated route for
 /// [DriftCreateAlbumPage]
 class DriftCreateAlbumRoute extends PageRouteInfo<void> {
diff --git a/mobile/lib/services/drift_backup.service.dart b/mobile/lib/services/drift_backup.service.dart
new file mode 100644
index 0000000000..5966aad304
--- /dev/null
+++ b/mobile/lib/services/drift_backup.service.dart
@@ -0,0 +1,286 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:background_downloader/background_downloader.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/backup.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/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
+import 'package:immich_mobile/services/upload.service.dart';
+import 'package:logging/logging.dart';
+import 'package:path/path.dart' as p;
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+final driftBackupServiceProvider = Provider<DriftBackupService>(
+  (ref) => DriftBackupService(
+    ref.watch(backupRepositoryProvider),
+    ref.watch(storageRepositoryProvider),
+    ref.watch(uploadServiceProvider),
+    ref.watch(localAssetRepository),
+  ),
+);
+
+class DriftBackupService {
+  DriftBackupService(
+    this._backupRepository,
+    this._storageRepository,
+    this._uploadService,
+    this._localAssetRepository,
+  ) {
+    _uploadService.taskStatusStream.listen(_handleTaskStatusUpdate);
+  }
+
+  final DriftBackupRepository _backupRepository;
+  final StorageRepository _storageRepository;
+  final DriftLocalAssetRepository _localAssetRepository;
+  final UploadService _uploadService;
+  final _log = Logger("DriftBackupService");
+
+  bool shouldCancel = false;
+
+  Future<int> getTotalCount() {
+    return _backupRepository.getTotalCount();
+  }
+
+  Future<int> getRemainderCount() {
+    return _backupRepository.getRemainderCount();
+  }
+
+  Future<int> getBackupCount() {
+    return _backupRepository.getBackupCount();
+  }
+
+  Future<void> backup() async {
+    shouldCancel = false;
+
+    final candidates = await _backupRepository.getCandidates();
+    if (candidates.isEmpty) {
+      return;
+    }
+
+    const batchSize = 100;
+    int count = 0;
+    for (int i = 0; i < candidates.length; i += batchSize) {
+      if (shouldCancel) {
+        break;
+      }
+
+      final batch = candidates.skip(i).take(batchSize).toList();
+
+      List<UploadTask> tasks = [];
+      for (final asset in batch) {
+        final task = await _getUploadTask(asset);
+        if (task != null) {
+          tasks.add(task);
+        }
+      }
+
+      if (tasks.isNotEmpty && !shouldCancel) {
+        count += tasks.length;
+        _uploadService.enqueueTasks(tasks);
+        debugPrint(
+          "Enqueued $count/${candidates.length} tasks for backup",
+        );
+      }
+    }
+  }
+
+  void _handleTaskStatusUpdate(TaskStatusUpdate update) {
+    switch (update.status) {
+      case TaskStatus.complete:
+        _handleLivePhoto(update);
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  Future<void> _handleLivePhoto(TaskStatusUpdate update) async {
+    try {
+      if (update.task.metaData.isEmpty || update.task.metaData == '') {
+        return;
+      }
+
+      final metadata = UploadTaskMetadata.fromJson(update.task.metaData);
+      if (!metadata.isLivePhotos) {
+        return;
+      }
+
+      if (update.responseBody == null || update.responseBody!.isEmpty) {
+        return;
+      }
+      final response = jsonDecode(update.responseBody!);
+
+      final localAsset =
+          await _localAssetRepository.getById(metadata.localAssetId);
+      if (localAsset == null) {
+        return;
+      }
+
+      final uploadTask = await _getLivePhotoUploadTask(
+        localAsset,
+        response['id'] as String,
+      );
+
+      if (uploadTask == null) {
+        return;
+      }
+
+      _uploadService.enqueueTasks([uploadTask]);
+    } catch (error, stackTrace) {
+      _log.severe("Error handling live photo upload task", error, stackTrace);
+      debugPrint("Error handling live photo upload task: $error $stackTrace");
+    }
+  }
+
+  Future<UploadTask?> _getUploadTask(LocalAsset asset) async {
+    final entity = await _storageRepository.getAssetEntityForAsset(asset);
+    if (entity == null) {
+      return null;
+    }
+
+    File? file;
+
+    /// iOS LivePhoto has two files: a photo and a video.
+    /// They are uploaded separately, with video file being upload first, then returned with the assetId
+    /// The assetId is then used as a metadata for the photo file upload task.
+    ///
+    /// We implement two separate upload groups for this, the normal one for the video file
+    /// and the higher priority group for the photo file because the video file is already uploaded.
+    ///
+    /// The cancel operation will only cancel the video group (normal group), the photo group will not
+    /// be touched, as the video file is already uploaded.
+
+    if (entity.isLivePhoto) {
+      file = await _storageRepository.getMotionFileForAsset(asset);
+    } else {
+      file = await _storageRepository.getFileForAsset(asset.id);
+    }
+
+    if (file == null) {
+      return null;
+    }
+
+    final originalFileName = entity.isLivePhoto
+        ? p.setExtension(
+            asset.name,
+            p.extension(file.path),
+          )
+        : asset.name;
+
+    String metadata = UploadTaskMetadata(
+      localAssetId: asset.id,
+      isLivePhotos: entity.isLivePhoto,
+      livePhotoVideoId: '',
+    ).toJson();
+
+    return _uploadService.buildUploadTask(
+      file,
+      originalFileName: originalFileName,
+      deviceAssetId: asset.id,
+      metadata: metadata,
+      group: kBackupGroup,
+    );
+  }
+
+  Future<UploadTask?> _getLivePhotoUploadTask(
+    LocalAsset asset,
+    String livePhotoVideoId,
+  ) async {
+    final entity = await _storageRepository.getAssetEntityForAsset(asset);
+    if (entity == null) {
+      return null;
+    }
+
+    final file = await _storageRepository.getFileForAsset(asset.id);
+    if (file == null) {
+      return null;
+    }
+
+    final fields = {
+      'livePhotoVideoId': livePhotoVideoId,
+    };
+
+    return _uploadService.buildUploadTask(
+      file,
+      originalFileName: asset.name,
+      deviceAssetId: asset.id,
+      fields: fields,
+      group: kBackupLivePhotoGroup,
+      priority: 0,
+    );
+  }
+
+  Future<void> cancel() async {
+    shouldCancel = true;
+    await _uploadService.cancelAllForGroup(kBackupGroup);
+  }
+}
+
+class UploadTaskMetadata {
+  final String localAssetId;
+  final bool isLivePhotos;
+  final String livePhotoVideoId;
+
+  const UploadTaskMetadata({
+    required this.localAssetId,
+    required this.isLivePhotos,
+    required this.livePhotoVideoId,
+  });
+
+  UploadTaskMetadata copyWith({
+    String? localAssetId,
+    bool? isLivePhotos,
+    String? livePhotoVideoId,
+  }) {
+    return UploadTaskMetadata(
+      localAssetId: localAssetId ?? this.localAssetId,
+      isLivePhotos: isLivePhotos ?? this.isLivePhotos,
+      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'localAssetId': localAssetId,
+      'isLivePhotos': isLivePhotos,
+      'livePhotoVideoId': livePhotoVideoId,
+    };
+  }
+
+  factory UploadTaskMetadata.fromMap(Map<String, dynamic> map) {
+    return UploadTaskMetadata(
+      localAssetId: map['localAssetId'] as String,
+      isLivePhotos: map['isLivePhotos'] as bool,
+      livePhotoVideoId: map['livePhotoVideoId'] as String,
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory UploadTaskMetadata.fromJson(String source) =>
+      UploadTaskMetadata.fromMap(json.decode(source) as Map<String, dynamic>);
+
+  @override
+  String toString() =>
+      'UploadTaskMetadata(localAssetId: $localAssetId, isLivePhotos: $isLivePhotos, livePhotoVideoId: $livePhotoVideoId)';
+
+  @override
+  bool operator ==(covariant UploadTaskMetadata other) {
+    if (identical(this, other)) return true;
+
+    return other.localAssetId == localAssetId &&
+        other.isLivePhotos == isLivePhotos &&
+        other.livePhotoVideoId == livePhotoVideoId;
+  }
+
+  @override
+  int get hashCode =>
+      localAssetId.hashCode ^ isLivePhotos.hashCode ^ livePhotoVideoId.hashCode;
+}
diff --git a/mobile/lib/services/upload.service.dart b/mobile/lib/services/upload.service.dart
index 18f90ab844..60aab4a16c 100644
--- a/mobile/lib/services/upload.service.dart
+++ b/mobile/lib/services/upload.service.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:background_downloader/background_downloader.dart';
@@ -6,22 +7,28 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/utils/upload.dart';
 import 'package:path/path.dart';
-// import 'package:logging/logging.dart';
 
-final uploadServiceProvider = Provider(
-  (ref) => UploadService(
-    ref.watch(uploadRepositoryProvider),
-  ),
-);
+final uploadServiceProvider = Provider((ref) {
+  final service = UploadService(ref.watch(uploadRepositoryProvider));
+  ref.onDispose(service.dispose);
+  return service;
+});
 
 class UploadService {
   final UploadRepository _uploadRepository;
-  // final Logger _log = Logger("UploadService");
   void Function(TaskStatusUpdate)? onUploadStatus;
   void Function(TaskProgressUpdate)? onTaskProgress;
 
+  final StreamController<TaskStatusUpdate> _taskStatusController =
+      StreamController<TaskStatusUpdate>.broadcast();
+  final StreamController<TaskProgressUpdate> _taskProgressController =
+      StreamController<TaskProgressUpdate>.broadcast();
+
+  Stream<TaskStatusUpdate> get taskStatusStream => _taskStatusController.stream;
+  Stream<TaskProgressUpdate> get taskProgressStream =>
+      _taskProgressController.stream;
+
   UploadService(
     this._uploadRepository,
   ) {
@@ -31,29 +38,65 @@ class UploadService {
 
   void _onTaskProgressCallback(TaskProgressUpdate update) {
     onTaskProgress?.call(update);
+    if (!_taskProgressController.isClosed) {
+      _taskProgressController.add(update);
+    }
   }
 
   void _onUploadCallback(TaskStatusUpdate update) {
     onUploadStatus?.call(update);
+    if (!_taskStatusController.isClosed) {
+      _taskStatusController.add(update);
+    }
+  }
+
+  void dispose() {
+    _taskStatusController.close();
+    _taskProgressController.close();
   }
 
   Future<bool> cancelUpload(String id) {
     return FileDownloader().cancelTaskWithId(id);
   }
 
-  Future<void> upload(File file) async {
-    final task = await _buildUploadTask(
-      hash(file.path).toString(),
-      file,
-    );
-
-    await _uploadRepository.upload(task);
+  Future<void> cancelAllForGroup(String group) async {
+    await _uploadRepository.cancelAll(group);
+    await _uploadRepository.reset(group);
+    await _uploadRepository.deleteAllTrackingRecords(group);
   }
 
-  Future<UploadTask> _buildUploadTask(
+  void enqueueTasks(List<UploadTask> tasks) {
+    _uploadRepository.enqueueAll(tasks);
+  }
+
+  Future<UploadTask> buildUploadTask(
+    File file, {
+    required String group,
+    Map<String, String>? fields,
+    String? originalFileName,
+    String? deviceAssetId,
+    String? metadata,
+    int? priority,
+  }) async {
+    return _buildTask(
+      deviceAssetId ?? hash(file.path).toString(),
+      file,
+      fields: fields,
+      originalFileName: originalFileName,
+      metadata: metadata,
+      group: group,
+      priority: priority,
+    );
+  }
+
+  Future<UploadTask> _buildTask(
     String id,
     File file, {
+    required String group,
     Map<String, String>? fields,
+    String? originalFileName,
+    String? metadata,
+    int? priority,
   }) async {
     final serverEndpoint = Store.get(StoreKey.serverEndpoint);
     final url = Uri.parse('$serverEndpoint/assets').toString();
@@ -65,9 +108,8 @@ class UploadService {
     final stats = await file.stat();
     final fileCreatedAt = stats.changed;
     final fileModifiedAt = stats.modified;
-
     final fieldsMap = {
-      'filename': filename,
+      'filename': originalFileName ?? filename,
       'deviceAssetId': id,
       'deviceId': deviceId,
       'fileCreatedAt': fileCreatedAt.toUtc().toIso8601String(),
@@ -79,6 +121,7 @@ class UploadService {
 
     return UploadTask(
       taskId: id,
+      displayName: originalFileName ?? filename,
       httpRequestMethod: 'POST',
       url: url,
       headers: headers,
@@ -87,7 +130,9 @@ class UploadService {
       baseDirectory: baseDirectory,
       directory: directory,
       fileField: 'assetData',
-      group: uploadGroup,
+      metaData: metadata ?? '',
+      group: group,
+      priority: priority ?? 5,
       updates: Updates.statusAndProgress,
     );
   }
diff --git a/mobile/lib/utils/database.utils.dart b/mobile/lib/utils/database.utils.dart
new file mode 100644
index 0000000000..446b92db19
--- /dev/null
+++ b/mobile/lib/utils/database.utils.dart
@@ -0,0 +1,31 @@
+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.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
+
+extension LocalAlbumEntityDataHelper on LocalAlbumEntityData {
+  LocalAlbum toDto({int assetCount = 0}) {
+    return LocalAlbum(
+      id: id,
+      name: name,
+      updatedAt: updatedAt,
+      assetCount: assetCount,
+      backupSelection: backupSelection,
+    );
+  }
+}
+
+extension LocalAssetEntityDataHelper on LocalAssetEntityData {
+  LocalAsset toDto() {
+    return LocalAsset(
+      id: id,
+      name: name,
+      checksum: checksum,
+      type: type,
+      createdAt: createdAt,
+      updatedAt: updatedAt,
+      durationInSeconds: durationInSeconds,
+      isFavorite: isFavorite,
+    );
+  }
+}
diff --git a/mobile/lib/utils/upload.dart b/mobile/lib/utils/upload.dart
deleted file mode 100644
index a0b77f1d93..0000000000
--- a/mobile/lib/utils/upload.dart
+++ /dev/null
@@ -1 +0,0 @@
-const uploadGroup = 'upload_group';
diff --git a/mobile/lib/widgets/backup/drift_album_info_list_tile.dart b/mobile/lib/widgets/backup/drift_album_info_list_tile.dart
new file mode 100644
index 0000000000..42178c972e
--- /dev/null
+++ b/mobile/lib/widgets/backup/drift_album_info_list_tile.dart
@@ -0,0 +1,121 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/album/album.provider.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+class DriftAlbumInfoListTile extends HookConsumerWidget {
+  final LocalAlbum album;
+
+  const DriftAlbumInfoListTile({super.key, required this.album});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final bool isSelected = album.backupSelection == BackupSelection.selected;
+    final bool isExcluded = album.backupSelection == BackupSelection.excluded;
+
+    final syncAlbum = ref
+        .watch(appSettingsServiceProvider)
+        .getSetting(AppSettingsEnum.syncAlbums);
+
+    buildTileColor() {
+      if (isSelected) {
+        return context.isDarkTheme
+            ? context.primaryColor.withAlpha(100)
+            : context.primaryColor.withAlpha(25);
+      } else if (isExcluded) {
+        return context.isDarkTheme
+            ? Colors.red[300]?.withAlpha(150)
+            : Colors.red[100]?.withAlpha(150);
+      } else {
+        return Colors.transparent;
+      }
+    }
+
+    buildIcon() {
+      if (isSelected) {
+        return Icon(
+          Icons.check_circle_rounded,
+          color: context.colorScheme.primary,
+        );
+      }
+
+      if (isExcluded) {
+        return Icon(
+          Icons.remove_circle_rounded,
+          color: context.colorScheme.error,
+        );
+      }
+
+      return Icon(
+        Icons.circle,
+        color: context.colorScheme.surfaceContainerHighest,
+      );
+    }
+
+    return GestureDetector(
+      onDoubleTap: () {
+        ref.watch(hapticFeedbackProvider.notifier).selectionClick();
+
+        if (isExcluded) {
+          ref.read(backupAlbumProvider.notifier).deselectAlbum(album);
+        } else {
+          if (album.id == 'isAll' || album.name == 'Recents') {
+            ImmichToast.show(
+              context: context,
+              msg: 'Cannot exclude album contains all assets',
+              toastType: ToastType.error,
+              gravity: ToastGravity.BOTTOM,
+            );
+            return;
+          }
+
+          ref.read(backupAlbumProvider.notifier).excludeAlbum(album);
+        }
+      },
+      child: ListTile(
+        tileColor: buildTileColor(),
+        contentPadding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+        onTap: () {
+          ref.read(hapticFeedbackProvider.notifier).selectionClick();
+          if (isSelected) {
+            ref.read(backupAlbumProvider.notifier).deselectAlbum(album);
+          } else {
+            ref.read(backupAlbumProvider.notifier).selectAlbum(album);
+            if (syncAlbum) {
+              ref.read(albumProvider.notifier).createSyncAlbum(album.name);
+            }
+          }
+        },
+        leading: buildIcon(),
+        title: Text(
+          album.name,
+          style: const TextStyle(
+            fontSize: 14,
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+        subtitle: Text(album.assetCount.toString()),
+        trailing: IconButton(
+          onPressed: () {
+            context.pushRoute(LocalTimelineRoute(album: album));
+          },
+          icon: Icon(
+            Icons.image_outlined,
+            color: context.primaryColor,
+            size: 24,
+          ),
+          splashRadius: 25,
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
index b58a1ad6f9..2b020d20ee 100644
--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -205,7 +205,7 @@ class _BackupIndicator extends ConsumerWidget {
     final badgeBackground = context.colorScheme.surfaceContainer;
 
     return InkWell(
-      onTap: () => context.pushRoute(const BackupControllerRoute()),
+      onTap: () => context.pushRoute(const DriftBackupRoute()),
       borderRadius: const BorderRadius.all(Radius.circular(12)),
       child: Badge(
         label: Container(

From 261818ddd9684884b4091a494e4d76c63d257a61 Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Sat, 19 Jul 2025 12:34:17 +0300
Subject: [PATCH 250/337] refactor(mobile): download button in new timeline
 (#20010)

* download button

* minor improvements
---
 i18n/en.json                                  |   1 +
 .../download_action_button.widget.dart        |  40 ++++++-
 .../asset_viewer/bottom_sheet.widget.dart     |   3 +-
 .../archive_bottom_sheet.widget.dart          |   2 +-
 .../favorite_bottom_sheet.widget.dart         |   2 +-
 .../general_bottom_sheet.widget.dart          |   2 +-
 .../locked_folder_bottom_sheet.widget.dart    |   2 +-
 .../partner_detail_bottom_sheet.widget.dart   |   2 +-
 .../remote_album_bottom_sheet.widget.dart     |   2 +-
 .../infrastructure/action.provider.dart       |  24 ++++-
 .../lib/repositories/download.repository.dart | 102 ++++++++++++++++--
 mobile/lib/services/action.service.dart       |   9 ++
 12 files changed, 170 insertions(+), 21 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index dfe2954c9f..77dc2e235c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -782,6 +782,7 @@
   "documentation": "Documentation",
   "done": "Done",
   "download": "Download",
+  "download_action_prompt": "Downloading {count} assets",
   "download_canceled": "Download canceled",
   "download_complete": "Download complete",
   "download_enqueue": "Download enqueued",
diff --git a/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
index 53ea5d4946..c6eda703a5 100644
--- a/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
@@ -1,16 +1,54 @@
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class DownloadActionButton extends ConsumerWidget {
-  const DownloadActionButton({super.key});
+  final ActionSource source;
+
+  const DownloadActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).downloadAll(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    if (!context.mounted) {
+      return;
+    }
+
+    if (!result.success) {
+      ImmichToast.show(
+        context: context,
+        msg: 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: ToastType.error,
+      );
+    } else if (result.count > 0) {
+      ImmichToast.show(
+        context: context,
+        msg: 'download_action_prompt'
+            .t(context: context, args: {'count': result.count.toString()}),
+        gravity: ToastGravity.BOTTOM,
+        toastType: ToastType.success,
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.download,
       label: "download".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
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 a8b7c79588..89822fef91 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -52,7 +52,8 @@ class AssetDetailBottomSheet extends ConsumerWidget {
       if (asset.hasRemote) ...[
         const ShareLinkActionButton(source: ActionSource.viewer),
         const ArchiveActionButton(source: ActionSource.viewer),
-        if (!asset.hasLocal) const DownloadActionButton(),
+        if (!asset.hasLocal)
+          const DownloadActionButton(source: ActionSource.viewer),
         isTrashEnable
             ? const TrashActionButton(source: ActionSource.viewer)
             : const DeletePermanentActionButton(source: ActionSource.viewer),
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
index a3d24ec8ee..9ed35da4cd 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
@@ -38,7 +38,7 @@ class ArchiveBottomSheet extends ConsumerWidget {
           const ShareLinkActionButton(source: ActionSource.timeline),
           const UnArchiveActionButton(source: ActionSource.timeline),
           const FavoriteActionButton(source: ActionSource.timeline),
-          const DownloadActionButton(),
+          const DownloadActionButton(source: ActionSource.timeline),
           isTrashEnable
               ? const TrashActionButton(source: ActionSource.timeline)
               : const DeletePermanentActionButton(
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
index eefe19194c..a1e1255a9f 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
@@ -38,7 +38,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
           const ShareLinkActionButton(source: ActionSource.timeline),
           const UnFavoriteActionButton(source: ActionSource.timeline),
           const ArchiveActionButton(source: ActionSource.timeline),
-          const DownloadActionButton(),
+          const DownloadActionButton(source: ActionSource.timeline),
           isTrashEnable
               ? const TrashActionButton(source: ActionSource.timeline)
               : const DeletePermanentActionButton(
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
index f9a9dd3203..373d264d82 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -38,7 +38,7 @@ class GeneralBottomSheet extends ConsumerWidget {
           const ShareLinkActionButton(source: ActionSource.timeline),
           const ArchiveActionButton(source: ActionSource.timeline),
           const FavoriteActionButton(source: ActionSource.timeline),
-          const DownloadActionButton(),
+          const DownloadActionButton(source: ActionSource.timeline),
           isTrashEnable
               ? const TrashActionButton(source: ActionSource.timeline)
               : const DeletePermanentActionButton(
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
index ef71f3a3a3..7f82f750f7 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
@@ -18,7 +18,7 @@ class LockedFolderBottomSheet extends ConsumerWidget {
       shouldCloseOnMinExtent: false,
       actions: [
         ShareActionButton(source: ActionSource.timeline),
-        DownloadActionButton(),
+        DownloadActionButton(source: ActionSource.timeline),
         DeletePermanentActionButton(source: ActionSource.timeline),
         RemoveFromLockFolderActionButton(source: ActionSource.timeline),
       ],
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart
index 1cdf6f28d6..5e4dae34bc 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart
@@ -16,7 +16,7 @@ class PartnerDetailBottomSheet extends ConsumerWidget {
       shouldCloseOnMinExtent: false,
       actions: [
         ShareActionButton(source: ActionSource.timeline),
-        DownloadActionButton(),
+        DownloadActionButton(source: ActionSource.timeline),
       ],
     );
   }
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
index b5fecdf7a4..cfb6fe4f1a 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
@@ -41,7 +41,7 @@ class RemoteAlbumBottomSheet extends ConsumerWidget {
           const ShareLinkActionButton(source: ActionSource.timeline),
           const ArchiveActionButton(source: ActionSource.timeline),
           const FavoriteActionButton(source: ActionSource.timeline),
-          const DownloadActionButton(),
+          const DownloadActionButton(source: ActionSource.timeline),
           isTrashEnable
               ? const TrashActionButton(source: ActionSource.timeline)
               : const DeletePermanentActionButton(
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index a0ebf448fc..cb025ef941 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -41,7 +41,8 @@ class ActionNotifier extends Notifier<void> {
   }
 
   List<String> _getRemoteIdsForSource(ActionSource source) {
-    return _getIdsForSource<RemoteAsset>(source)
+    return _getAssets(source)
+        .whereType<RemoteAsset>()
         .toIds()
         .toList(growable: false);
   }
@@ -63,7 +64,8 @@ class ActionNotifier extends Notifier<void> {
 
   List<String> _getOwnedRemoteIdsForSource(ActionSource source) {
     final ownerId = ref.read(currentUserProvider)?.id;
-    return _getIdsForSource<RemoteAsset>(source)
+    return _getAssets(source)
+        .whereType<RemoteAsset>()
         .ownedAssets(ownerId)
         .toIds()
         .toList(growable: false);
@@ -331,6 +333,24 @@ class ActionNotifier extends Notifier<void> {
       );
     }
   }
+
+  Future<ActionResult> downloadAll(ActionSource source) async {
+    final assets =
+        _getAssets(source).whereType<RemoteAsset>().toList(growable: false);
+
+    try {
+      final didEnqueue = await _service.downloadAll(assets);
+      final enqueueCount = didEnqueue.where((e) => e).length;
+      return ActionResult(count: enqueueCount, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to download assets', error, stack);
+      return ActionResult(
+        count: assets.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
 }
 
 extension on Iterable<RemoteAsset> {
diff --git a/mobile/lib/repositories/download.repository.dart b/mobile/lib/repositories/download.repository.dart
index 72f7e065ca..f1dae3c251 100644
--- a/mobile/lib/repositories/download.repository.dart
+++ b/mobile/lib/repositories/download.repository.dart
@@ -1,10 +1,28 @@
+import 'dart:convert';
+import 'dart:io';
+
 import 'package:background_downloader/background_downloader.dart';
+import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
+import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/download.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
 
 final downloadRepositoryProvider = Provider((ref) => DownloadRepository());
 
 class DownloadRepository {
+  static final _downloader = FileDownloader();
+  static final _dummyTask = DownloadTask(
+    taskId: 'dummy',
+    url: '',
+    filename: 'dummy',
+    group: '',
+    updates: Updates.statusAndProgress,
+  );
+  static final _dummyMetadata = {'part': LivePhotosPart.image, 'id': ''};
+
   void Function(TaskStatusUpdate)? onImageDownloadStatus;
 
   void Function(TaskStatusUpdate)? onVideoDownloadStatus;
@@ -14,19 +32,19 @@ class DownloadRepository {
   void Function(TaskProgressUpdate)? onTaskProgress;
 
   DownloadRepository() {
-    FileDownloader().registerCallbacks(
+    _downloader.registerCallbacks(
       group: downloadGroupImage,
       taskStatusCallback: (update) => onImageDownloadStatus?.call(update),
       taskProgressCallback: (update) => onTaskProgress?.call(update),
     );
 
-    FileDownloader().registerCallbacks(
+    _downloader.registerCallbacks(
       group: downloadGroupVideo,
       taskStatusCallback: (update) => onVideoDownloadStatus?.call(update),
       taskProgressCallback: (update) => onTaskProgress?.call(update),
     );
 
-    FileDownloader().registerCallbacks(
+    _downloader.registerCallbacks(
       group: downloadGroupLivePhoto,
       taskStatusCallback: (update) => onLivePhotoDownloadStatus?.call(update),
       taskProgressCallback: (update) => onTaskProgress?.call(update),
@@ -34,25 +52,87 @@ class DownloadRepository {
   }
 
   Future<List<bool>> downloadAll(List<DownloadTask> tasks) {
-    return FileDownloader().enqueueAll(tasks);
+    return _downloader.enqueueAll(tasks);
   }
 
   Future<void> deleteAllTrackingRecords() {
-    return FileDownloader().database.deleteAllRecords();
+    return _downloader.database.deleteAllRecords();
   }
 
   Future<bool> cancel(String id) {
-    return FileDownloader().cancelTaskWithId(id);
+    return _downloader.cancelTaskWithId(id);
   }
 
   Future<List<TaskRecord>> getLiveVideoTasks() {
-    return FileDownloader().database.allRecordsWithStatus(
-          TaskStatus.complete,
-          group: downloadGroupLivePhoto,
-        );
+    return _downloader.database.allRecordsWithStatus(
+      TaskStatus.complete,
+      group: downloadGroupLivePhoto,
+    );
   }
 
   Future<void> deleteRecordsWithIds(List<String> ids) {
-    return FileDownloader().database.deleteRecordsWithIds(ids);
+    return _downloader.database.deleteRecordsWithIds(ids);
+  }
+
+  Future<List<bool>> downloadAllAssets(List<RemoteAsset> assets) async {
+    if (assets.isEmpty) {
+      return Future.value(const []);
+    }
+
+    final length = Platform.isAndroid ? assets.length : assets.length * 2;
+    final tasks = List.filled(length, _dummyTask);
+    int taskIndex = 0;
+    final headers = ApiService.getRequestHeaders();
+    for (final asset in assets) {
+      if (!asset.isRemoteOnly) {
+        continue;
+      }
+
+      final id = asset.id;
+      final livePhotoVideoId = asset.livePhotoVideoId;
+      final isVideo = asset.isVideo;
+      final url = getOriginalUrlForRemoteId(id);
+
+      if (Platform.isAndroid || livePhotoVideoId == null || isVideo) {
+        tasks[taskIndex++] = DownloadTask(
+          taskId: id,
+          url: url,
+          headers: headers,
+          filename: asset.name,
+          updates: Updates.statusAndProgress,
+          group: isVideo ? downloadGroupVideo : downloadGroupImage,
+        );
+        continue;
+      }
+
+      _dummyMetadata['part'] = LivePhotosPart.image;
+      _dummyMetadata['id'] = id;
+      tasks[taskIndex++] = DownloadTask(
+        taskId: id,
+        url: url,
+        headers: headers,
+        filename: asset.name,
+        updates: Updates.statusAndProgress,
+        group: downloadGroupLivePhoto,
+        metaData: json.encode(_dummyMetadata),
+      );
+
+      _dummyMetadata['part'] = LivePhotosPart.video;
+      tasks[taskIndex++] = DownloadTask(
+        taskId: livePhotoVideoId,
+        url: url,
+        headers: headers,
+        filename: asset.name
+            .toUpperCase()
+            .replaceAll(RegExp(r"\.(JPG|HEIC)$"), '.MOV'),
+        updates: Updates.statusAndProgress,
+        group: downloadGroupLivePhoto,
+        metaData: json.encode(_dummyMetadata),
+      );
+    }
+    if (taskIndex == 0) {
+      return Future.value(const []);
+    }
+    return _downloader.enqueueAll(tasks.slice(0, taskIndex));
   }
 }
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index b59df5b3dc..7b0d74e420 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -1,3 +1,5 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/repositories/download.repository.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
@@ -23,6 +25,7 @@ final actionServiceProvider = Provider<ActionService>(
     ref.watch(driftAlbumApiRepositoryProvider),
     ref.watch(remoteAlbumRepository),
     ref.watch(assetMediaRepositoryProvider),
+    ref.watch(downloadRepositoryProvider),
   ),
 );
 
@@ -33,6 +36,7 @@ class ActionService {
   final DriftAlbumApiRepository _albumApiRepository;
   final DriftRemoteAlbumRepository _remoteAlbumRepository;
   final AssetMediaRepository _assetMediaRepository;
+  final DownloadRepository _downloadRepository;
 
   const ActionService(
     this._assetApiRepository,
@@ -41,6 +45,7 @@ class ActionService {
     this._albumApiRepository,
     this._remoteAlbumRepository,
     this._assetMediaRepository,
+    this._downloadRepository,
   );
 
   Future<void> shareLink(List<String> remoteIds, BuildContext context) async {
@@ -191,4 +196,8 @@ class ActionService {
   Future<int> shareAssets(List<BaseAsset> assets) {
     return _assetMediaRepository.shareAssets(assets);
   }
+
+  Future<List<bool>> downloadAll(List<RemoteAsset> assets) {
+    return _downloadRepository.downloadAllAssets(assets);
+  }
 }

From dee6d072fb3762ff718562e4de963c9159c5210c Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sun, 20 Jul 2025 13:56:53 -0500
Subject: [PATCH 251/337] fix: memory jarring hero animation (#20030)

* fix: memory jarring hero animation

* remove other hero
---
 .../widgets/memory/memory_card.widget.dart    | 38 ++++++++-----------
 .../widgets/memory/memory_lane.widget.dart    | 15 +++-----
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/mobile/lib/presentation/widgets/memory/memory_card.widget.dart b/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
index a6262bd2e5..268bbc30c0 100644
--- a/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
+++ b/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
@@ -57,30 +57,24 @@ class DriftMemoryCard extends StatelessWidget {
               }
 
               if (asset.isImage) {
-                return Hero(
-                  tag: 'memory-${asset.id}',
-                  child: FullImage(
-                    asset,
-                    fit: fit,
-                    size: const Size(double.infinity, double.infinity),
-                  ),
+                return FullImage(
+                  asset,
+                  fit: fit,
+                  size: const Size(double.infinity, double.infinity),
                 );
               } else {
-                return Hero(
-                  tag: 'memory-${asset.id}',
-                  child: SizedBox(
-                    width: context.width,
-                    height: context.height,
-                    child: NativeVideoViewer(
-                      key: ValueKey(asset.id),
-                      asset: asset,
-                      showControls: false,
-                      playbackDelayFactor: 2,
-                      image: FullImage(
-                        asset,
-                        size: Size(context.width, context.height),
-                        fit: BoxFit.contain,
-                      ),
+                return SizedBox(
+                  width: context.width,
+                  height: context.height,
+                  child: NativeVideoViewer(
+                    key: ValueKey(asset.id),
+                    asset: asset,
+                    showControls: false,
+                    playbackDelayFactor: 2,
+                    image: FullImage(
+                      asset,
+                      size: Size(context.width, context.height),
+                      fit: BoxFit.contain,
                     ),
                   ),
                 );
diff --git a/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart b/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
index aa21f36dd1..403d8de061 100644
--- a/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
+++ b/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
@@ -79,15 +79,12 @@ class DriftMemoryCard extends ConsumerWidget {
               Colors.black.withValues(alpha: 0.2),
               BlendMode.darken,
             ),
-            child: Hero(
-              tag: 'memory-${memory.assets[0].id}',
-              child: SizedBox(
-                width: 205,
-                height: 200,
-                child: Thumbnail(
-                  remoteId: memory.assets[0].id,
-                  fit: BoxFit.cover,
-                ),
+            child: SizedBox(
+              width: 205,
+              height: 200,
+              child: Thumbnail(
+                remoteId: memory.assets[0].id,
+                fit: BoxFit.cover,
               ),
             ),
           ),

From 5fc4393e7a2c51584dcd7d2a3d2c7b3ba42ff8eb Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Mon, 21 Jul 2025 23:26:49 +0530
Subject: [PATCH 252/337] feat: migrate backup albums to sqlite (#20049)

* do not migrate again on app start

* migrate backup albums over to sqlite

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/entities/backup_album.entity.dart  | 12 +++
 .../pages/common/change_experience.page.dart  |  4 +
 mobile/lib/utils/migration.dart               | 85 ++++++++++++++++---
 3 files changed, 87 insertions(+), 14 deletions(-)

diff --git a/mobile/lib/entities/backup_album.entity.dart b/mobile/lib/entities/backup_album.entity.dart
index 4d4d7b3aa3..1e96c0452e 100644
--- a/mobile/lib/entities/backup_album.entity.dart
+++ b/mobile/lib/entities/backup_album.entity.dart
@@ -13,6 +13,18 @@ class BackupAlbum {
   BackupAlbum(this.id, this.lastBackup, this.selection);
 
   Id get isarId => fastHash(id);
+
+  BackupAlbum copyWith({
+    String? id,
+    DateTime? lastBackup,
+    BackupSelection? selection,
+  }) {
+    return BackupAlbum(
+      id ?? this.id,
+      lastBackup ?? this.lastBackup,
+      selection ?? this.selection,
+    );
+  }
 }
 
 enum BackupSelection {
diff --git a/mobile/lib/pages/common/change_experience.page.dart b/mobile/lib/pages/common/change_experience.page.dart
index 5d298edb42..a8569b25a0 100644
--- a/mobile/lib/pages/common/change_experience.page.dart
+++ b/mobile/lib/pages/common/change_experience.page.dart
@@ -56,6 +56,10 @@ class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
           ref.read(isarProvider),
           ref.read(driftProvider),
         );
+        await migrateBackupAlbumsToSqlite(
+          ref.read(isarProvider),
+          ref.read(driftProvider),
+        );
       }
     } else {
       await ref.read(backgroundSyncProvider).cancel();
diff --git a/mobile/lib/utils/migration.dart b/mobile/lib/utils/migration.dart
index d09f2b9978..a95c376ac2 100644
--- a/mobile/lib/utils/migration.dart
+++ b/mobile/lib/utils/migration.dart
@@ -2,19 +2,23 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/android_device_asset.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/entities/backup_album.entity.dart'
+    as isar_backup_album;
 import 'package:immich_mobile/entities/etag.entity.dart';
 import 'package:immich_mobile/entities/ios_device_asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/device_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
@@ -27,7 +31,7 @@ import 'package:logging/logging.dart';
 // ignore: import_rule_photo_manager
 import 'package:photo_manager/photo_manager.dart';
 
-const int targetVersion = 14;
+const int targetVersion = 13;
 
 Future<void> migrateDatabaseIfNeeded(Isar db) async {
   final int version = Store.get(StoreKey.version, targetVersion);
@@ -56,18 +60,6 @@ Future<void> migrateDatabaseIfNeeded(Isar db) async {
     await Store.put(StoreKey.photoManagerCustomFilter, true);
   }
 
-  if (version < 14) {
-    if (!Store.isBetaTimelineEnabled) {
-      // Try again when beta timeline is enabled and the app is restarted
-      return;
-    }
-    final backgroundSync = BackgroundSyncManager();
-    await backgroundSync.syncLocal();
-    final drift = Drift();
-    await migrateDeviceAssetToSqlite(db, drift);
-    await drift.close();
-  }
-
   if (targetVersion >= 12) {
     await Store.put(StoreKey.version, targetVersion);
     return;
@@ -204,6 +196,71 @@ Future<void> migrateDeviceAssetToSqlite(Isar db, Drift drift) async {
   }
 }
 
+Future<void> migrateBackupAlbumsToSqlite(
+  Isar db,
+  Drift drift,
+) async {
+  try {
+    final isarBackupAlbums = await db.backupAlbums.where().findAll();
+    // Recents is a virtual album on Android, and we don't have it with the new sync
+    // If recents is selected previously, select all albums during migration except the excluded ones
+    if (Platform.isAndroid) {
+      final recentAlbum =
+          isarBackupAlbums.firstWhereOrNull((album) => album.id == 'isAll');
+      if (recentAlbum != null) {
+        await drift.localAlbumEntity.update().write(
+              const LocalAlbumEntityCompanion(
+                backupSelection: Value(BackupSelection.selected),
+              ),
+            );
+        final excluded = isarBackupAlbums
+            .where(
+              (album) =>
+                  album.selection == isar_backup_album.BackupSelection.exclude,
+            )
+            .map((album) => album.id)
+            .toList();
+        await drift.batch((batch) async {
+          for (final id in excluded) {
+            batch.update(
+              drift.localAlbumEntity,
+              const LocalAlbumEntityCompanion(
+                backupSelection: Value(BackupSelection.excluded),
+              ),
+              where: (t) => t.id.equals(id),
+            );
+          }
+        });
+      }
+      return;
+    }
+
+    await drift.batch((batch) {
+      for (final album in isarBackupAlbums) {
+        batch.update(
+          drift.localAlbumEntity,
+          LocalAlbumEntityCompanion(
+            backupSelection: Value(
+              switch (album.selection) {
+                isar_backup_album.BackupSelection.none => BackupSelection.none,
+                isar_backup_album.BackupSelection.select =>
+                  BackupSelection.selected,
+                isar_backup_album.BackupSelection.exclude =>
+                  BackupSelection.excluded,
+              },
+            ),
+          ),
+          where: (t) => t.id.equals(album.id),
+        );
+      }
+    });
+  } catch (error) {
+    debugPrint(
+      "[MIGRATION] Error while migrating backup albums to SQLite: $error",
+    );
+  }
+}
+
 class _DeviceAsset {
   final String assetId;
   final List<int>? hash;

From 1dc62fce5f16425020aa3644672a2b4025c1047e Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Tue, 22 Jul 2025 01:50:41 +0530
Subject: [PATCH 253/337] fix: remove foreign constraint on
 stack.primaryAssetId (#20052)

* fix: remove foreign constraint in stack.primaryAssetId

* fix migration

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../drift_schemas/main/drift_schema_v3.json   |    1 +
 .../infrastructure/entities/stack.entity.dart |    3 +-
 .../entities/stack.entity.drift.dart          |  135 +-
 .../repositories/db.repository.dart           |   10 +-
 .../repositories/db.repository.steps.dart     |  355 ++
 .../repositories/remote_asset.repository.dart |    2 +-
 mobile/test/drift/main/generated/schema.dart  |    5 +-
 .../test/drift/main/generated/schema_v3.dart  | 5136 +++++++++++++++++
 8 files changed, 5521 insertions(+), 126 deletions(-)
 create mode 100644 mobile/drift_schemas/main/drift_schema_v3.json
 create mode 100644 mobile/test/drift/main/generated/schema_v3.dart

diff --git a/mobile/drift_schemas/main/drift_schema_v3.json b/mobile/drift_schemas/main/drift_schema_v3.json
new file mode 100644
index 0000000000..1acfbaf493
--- /dev/null
+++ b/mobile/drift_schemas/main/drift_schema_v3.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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"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":4,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":6,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":7,"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":8,"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":9,"references":[],"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":"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":10,"references":[2,9],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":11,"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":12,"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":13,"references":[1,12],"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":14,"references":[12,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":15,"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":16,"references":[1,15],"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":17,"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":"thumbnail_path","getter_name":"thumbnailPath","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":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"]}}]}
\ No newline at end of file
diff --git a/mobile/lib/infrastructure/entities/stack.entity.dart b/mobile/lib/infrastructure/entities/stack.entity.dart
index 92375f19db..b5da42832e 100644
--- a/mobile/lib/infrastructure/entities/stack.entity.dart
+++ b/mobile/lib/infrastructure/entities/stack.entity.dart
@@ -1,5 +1,4 @@
 import 'package:drift/drift.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 
@@ -15,7 +14,7 @@ class StackEntity extends Table with DriftDefaultsMixin {
   TextColumn get ownerId =>
       text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
 
-  TextColumn get primaryAssetId => text().references(RemoteAssetEntity, #id)();
+  TextColumn get primaryAssetId => text()();
 
   @override
   Set<Column> get primaryKey => {id};
diff --git a/mobile/lib/infrastructure/entities/stack.entity.drift.dart b/mobile/lib/infrastructure/entities/stack.entity.drift.dart
index c0d000e02a..df0390aea0 100644
--- a/mobile/lib/infrastructure/entities/stack.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/stack.entity.drift.dart
@@ -8,8 +8,6 @@ import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
     as i4;
 import 'package:drift/internal/modular.dart' as i5;
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
-    as i6;
 
 typedef $$StackEntityTableCreateCompanionBuilder = i1.StackEntityCompanion
     Function({
@@ -57,33 +55,6 @@ final class $$StackEntityTableReferences extends i0.BaseReferences<
     return i0.ProcessedTableManager(
         manager.$state.copyWith(prefetchedData: [item]));
   }
-
-  static i6.$RemoteAssetEntityTable _primaryAssetIdTable(
-          i0.GeneratedDatabase db) =>
-      i5.ReadDatabaseContainer(db)
-          .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias(i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i1.$StackEntityTable>('stack_entity')
-                  .primaryAssetId,
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity')
-                  .id));
-
-  i6.$$RemoteAssetEntityTableProcessedTableManager get primaryAssetId {
-    final $_column = $_itemColumn<String>('primary_asset_id')!;
-
-    final manager = i6
-        .$$RemoteAssetEntityTableTableManager(
-            $_db,
-            i5.ReadDatabaseContainer($_db)
-                .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'))
-        .filter((f) => f.id.sqlEquals($_column));
-    final item = $_typedResult.readTableOrNull(_primaryAssetIdTable($_db));
-    if (item == null) return manager;
-    return i0.ProcessedTableManager(
-        manager.$state.copyWith(prefetchedData: [item]));
-  }
 }
 
 class $$StackEntityTableFilterComposer
@@ -104,6 +75,10 @@ class $$StackEntityTableFilterComposer
   i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
       column: $table.updatedAt, builder: (column) => i0.ColumnFilters(column));
 
+  i0.ColumnFilters<String> get primaryAssetId => $composableBuilder(
+      column: $table.primaryAssetId,
+      builder: (column) => i0.ColumnFilters(column));
+
   i4.$$UserEntityTableFilterComposer get ownerId {
     final i4.$$UserEntityTableFilterComposer composer = $composerBuilder(
         composer: this,
@@ -125,28 +100,6 @@ class $$StackEntityTableFilterComposer
             ));
     return composer;
   }
-
-  i6.$$RemoteAssetEntityTableFilterComposer get primaryAssetId {
-    final i6.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
-        composer: this,
-        getCurrentColumn: (t) => t.primaryAssetId,
-        referencedTable: i5.ReadDatabaseContainer($db)
-            .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
-        getReferencedColumn: (t) => t.id,
-        builder: (joinBuilder,
-                {$addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer}) =>
-            i6.$$RemoteAssetEntityTableFilterComposer(
-              $db: $db,
-              $table: i5.ReadDatabaseContainer($db)
-                  .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
-              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-              joinBuilder: joinBuilder,
-              $removeJoinBuilderFromRootComposer:
-                  $removeJoinBuilderFromRootComposer,
-            ));
-    return composer;
-  }
 }
 
 class $$StackEntityTableOrderingComposer
@@ -169,6 +122,10 @@ class $$StackEntityTableOrderingComposer
       column: $table.updatedAt,
       builder: (column) => i0.ColumnOrderings(column));
 
+  i0.ColumnOrderings<String> get primaryAssetId => $composableBuilder(
+      column: $table.primaryAssetId,
+      builder: (column) => i0.ColumnOrderings(column));
+
   i4.$$UserEntityTableOrderingComposer get ownerId {
     final i4.$$UserEntityTableOrderingComposer composer = $composerBuilder(
         composer: this,
@@ -190,30 +147,6 @@ class $$StackEntityTableOrderingComposer
             ));
     return composer;
   }
-
-  i6.$$RemoteAssetEntityTableOrderingComposer get primaryAssetId {
-    final i6.$$RemoteAssetEntityTableOrderingComposer composer =
-        $composerBuilder(
-            composer: this,
-            getCurrentColumn: (t) => t.primaryAssetId,
-            referencedTable: i5.ReadDatabaseContainer($db)
-                .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
-            getReferencedColumn: (t) => t.id,
-            builder: (joinBuilder,
-                    {$addJoinBuilderToRootComposer,
-                    $removeJoinBuilderFromRootComposer}) =>
-                i6.$$RemoteAssetEntityTableOrderingComposer(
-                  $db: $db,
-                  $table: i5.ReadDatabaseContainer($db)
-                      .resultSet<i6.$RemoteAssetEntityTable>(
-                          'remote_asset_entity'),
-                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                  joinBuilder: joinBuilder,
-                  $removeJoinBuilderFromRootComposer:
-                      $removeJoinBuilderFromRootComposer,
-                ));
-    return composer;
-  }
 }
 
 class $$StackEntityTableAnnotationComposer
@@ -234,6 +167,9 @@ class $$StackEntityTableAnnotationComposer
   i0.GeneratedColumn<DateTime> get updatedAt =>
       $composableBuilder(column: $table.updatedAt, builder: (column) => column);
 
+  i0.GeneratedColumn<String> get primaryAssetId => $composableBuilder(
+      column: $table.primaryAssetId, builder: (column) => column);
+
   i4.$$UserEntityTableAnnotationComposer get ownerId {
     final i4.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
         composer: this,
@@ -255,30 +191,6 @@ class $$StackEntityTableAnnotationComposer
             ));
     return composer;
   }
-
-  i6.$$RemoteAssetEntityTableAnnotationComposer get primaryAssetId {
-    final i6.$$RemoteAssetEntityTableAnnotationComposer composer =
-        $composerBuilder(
-            composer: this,
-            getCurrentColumn: (t) => t.primaryAssetId,
-            referencedTable: i5.ReadDatabaseContainer($db)
-                .resultSet<i6.$RemoteAssetEntityTable>('remote_asset_entity'),
-            getReferencedColumn: (t) => t.id,
-            builder: (joinBuilder,
-                    {$addJoinBuilderToRootComposer,
-                    $removeJoinBuilderFromRootComposer}) =>
-                i6.$$RemoteAssetEntityTableAnnotationComposer(
-                  $db: $db,
-                  $table: i5.ReadDatabaseContainer($db)
-                      .resultSet<i6.$RemoteAssetEntityTable>(
-                          'remote_asset_entity'),
-                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                  joinBuilder: joinBuilder,
-                  $removeJoinBuilderFromRootComposer:
-                      $removeJoinBuilderFromRootComposer,
-                ));
-    return composer;
-  }
 }
 
 class $$StackEntityTableTableManager extends i0.RootTableManager<
@@ -292,7 +204,7 @@ class $$StackEntityTableTableManager extends i0.RootTableManager<
     $$StackEntityTableUpdateCompanionBuilder,
     (i1.StackEntityData, i1.$$StackEntityTableReferences),
     i1.StackEntityData,
-    i0.PrefetchHooks Function({bool ownerId, bool primaryAssetId})> {
+    i0.PrefetchHooks Function({bool ownerId})> {
   $$StackEntityTableTableManager(
       i0.GeneratedDatabase db, i1.$StackEntityTable table)
       : super(i0.TableManagerState(
@@ -338,7 +250,7 @@ class $$StackEntityTableTableManager extends i0.RootTableManager<
                     i1.$$StackEntityTableReferences(db, table, e)
                   ))
               .toList(),
-          prefetchHooksCallback: ({ownerId = false, primaryAssetId = false}) {
+          prefetchHooksCallback: ({ownerId = false}) {
             return i0.PrefetchHooks(
               db: db,
               explicitlyWatchedTables: [],
@@ -365,17 +277,6 @@ class $$StackEntityTableTableManager extends i0.RootTableManager<
                         i1.$$StackEntityTableReferences._ownerIdTable(db).id,
                   ) as T;
                 }
-                if (primaryAssetId) {
-                  state = state.withJoin(
-                    currentTable: table,
-                    currentColumn: table.primaryAssetId,
-                    referencedTable: i1.$$StackEntityTableReferences
-                        ._primaryAssetIdTable(db),
-                    referencedColumn: i1.$$StackEntityTableReferences
-                        ._primaryAssetIdTable(db)
-                        .id,
-                  ) as T;
-                }
 
                 return state;
               },
@@ -398,7 +299,7 @@ typedef $$StackEntityTableProcessedTableManager = i0.ProcessedTableManager<
     $$StackEntityTableUpdateCompanionBuilder,
     (i1.StackEntityData, i1.$$StackEntityTableReferences),
     i1.StackEntityData,
-    i0.PrefetchHooks Function({bool ownerId, bool primaryAssetId})>;
+    i0.PrefetchHooks Function({bool ownerId})>;
 
 class $StackEntityTable extends i2.StackEntity
     with i0.TableInfo<$StackEntityTable, i1.StackEntityData> {
@@ -440,12 +341,8 @@ class $StackEntityTable extends i2.StackEntity
       const i0.VerificationMeta('primaryAssetId');
   @override
   late final i0.GeneratedColumn<String> primaryAssetId =
-      i0.GeneratedColumn<String>(
-          'primary_asset_id', aliasedName, false,
-          type: i0.DriftSqlType.string,
-          requiredDuringInsert: true,
-          defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-              'REFERENCES remote_asset_entity (id)'));
+      i0.GeneratedColumn<String>('primary_asset_id', aliasedName, false,
+          type: i0.DriftSqlType.string, requiredDuringInsert: true);
   @override
   List<i0.GeneratedColumn> get $columns =>
       [id, createdAt, updatedAt, ownerId, primaryAssetId];
diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/lib/infrastructure/repositories/db.repository.dart
index 0a763c91cc..7562cf6ff5 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -72,7 +72,7 @@ class Drift extends $Drift implements IDatabaseRepository {
         );
 
   @override
-  int get schemaVersion => 2;
+  int get schemaVersion => 3;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -84,12 +84,16 @@ class Drift extends $Drift implements IDatabaseRepository {
             from: from,
             to: to,
             steps: migrationSteps(
-              from1To2: (m, _) async {
-                for (final entity in allSchemaEntities) {
+              from1To2: (m, v2) async {
+                for (final entity in v2.entities) {
                   await m.drop(entity);
                   await m.create(entity);
                 }
               },
+              from2To3: (m, v3) async {
+                // Removed foreign key constraint on stack.primaryAssetId
+                await m.alterTable(TableMigration(v3.stackEntity));
+              },
             ),
           );
 
diff --git a/mobile/lib/infrastructure/repositories/db.repository.steps.dart b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
index 76e5df76d0..a0703c3714 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -919,8 +919,356 @@ i1.GeneratedColumn<String> _column_73(String aliasedName) =>
 i1.GeneratedColumn<DateTime> _column_74(String aliasedName) =>
     i1.GeneratedColumn<DateTime>('birth_date', aliasedName, true,
         type: i1.DriftSqlType.dateTime);
+
+final class Schema3 extends i0.VersionedSchema {
+  Schema3({required super.database}) : super(version: 3);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    localAssetEntity,
+    stackEntity,
+    idxLocalAssetChecksum,
+    uQRemoteAssetOwnerChecksum,
+    idxRemoteAssetChecksum,
+    userMetadataEntity,
+    partnerEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    remoteExifEntity,
+    remoteAlbumEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+  ];
+  late final Shape0 userEntity = Shape0(
+      source: i0.VersionedTable(
+        entityName: 'user_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(id)',
+        ],
+        columns: [
+          _column_0,
+          _column_1,
+          _column_2,
+          _column_3,
+          _column_4,
+          _column_5,
+          _column_6,
+          _column_7,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape1 remoteAssetEntity = Shape1(
+      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,
+        ],
+        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 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);
+  final i1.Index idxLocalAssetChecksum = i1.Index('idx_local_asset_checksum',
+      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  final i1.Index uQRemoteAssetOwnerChecksum = i1.Index(
+      'UQ_remote_asset_owner_checksum',
+      'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
+  final i1.Index idxRemoteAssetChecksum = i1.Index('idx_remote_asset_checksum',
+      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  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 Shape6 localAlbumEntity = Shape6(
+      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_33,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape7 localAlbumAssetEntity = Shape7(
+      source: i0.VersionedTable(
+        entityName: 'local_album_asset_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(asset_id, album_id)',
+        ],
+        columns: [
+          _column_34,
+          _column_35,
+        ],
+        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 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 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 Shape13 personEntity = Shape13(
+      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_70,
+          _column_71,
+          _column_72,
+          _column_73,
+          _column_74,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+}
+
+i1.GeneratedColumn<String> _column_75(String aliasedName) =>
+    i1.GeneratedColumn<String>('primary_asset_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,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -929,6 +1277,11 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from1To2(migrator, schema);
         return 2;
+      case 2:
+        final schema = Schema3(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from2To3(migrator, schema);
+        return 3;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -937,8 +1290,10 @@ i0.MigrationStepWithVersion migrationSteps({
 
 i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
+  required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
 }) =>
     i0.VersionedSchema.stepByStepHelper(
         step: migrationSteps(
       from1To2: from1To2,
+      from2To3: from2To3,
     ));
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index 28c229b46b..52cfe2e7c2 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -193,7 +193,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
   Future<void> stack(String userId, StackResponse stack) {
     return _db.transaction(() async {
       final stackIds = await _db.managers.stackEntity
-          .filter((row) => row.primaryAssetId.id.isIn(stack.assetIds))
+          .filter((row) => row.primaryAssetId.isIn(stack.assetIds))
           .map((row) => row.id)
           .get();
 
diff --git a/mobile/test/drift/main/generated/schema.dart b/mobile/test/drift/main/generated/schema.dart
index b2b7404b5a..209e70d788 100644
--- a/mobile/test/drift/main/generated/schema.dart
+++ b/mobile/test/drift/main/generated/schema.dart
@@ -5,6 +5,7 @@ import 'package:drift/drift.dart';
 import 'package:drift/internal/migrations.dart';
 import 'schema_v1.dart' as v1;
 import 'schema_v2.dart' as v2;
+import 'schema_v3.dart' as v3;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -14,10 +15,12 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v1.DatabaseAtV1(db);
       case 2:
         return v2.DatabaseAtV2(db);
+      case 3:
+        return v3.DatabaseAtV3(db);
       default:
         throw MissingSchemaException(version, versions);
     }
   }
 
-  static const versions = const [1, 2];
+  static const versions = const [1, 2, 3];
 }
diff --git a/mobile/test/drift/main/generated/schema_v3.dart b/mobile/test/drift/main/generated/schema_v3.dart
new file mode 100644
index 0000000000..8f655b3f7d
--- /dev/null
+++ b/mobile/test/drift/main/generated/schema_v3.dart
@@ -0,0 +1,5136 @@
+// 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<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<String> email = GeneratedColumn<String>(
+      'email', aliasedName, false,
+      type: DriftSqlType.string, requiredDuringInsert: true);
+  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>(
+      'profile_image_path', aliasedName, true,
+      type: DriftSqlType.string, requiredDuringInsert: false);
+  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> quotaSizeInBytes = GeneratedColumn<int>(
+      'quota_size_in_bytes', aliasedName, true,
+      type: DriftSqlType.int, requiredDuringInsert: false);
+  late final GeneratedColumn<int> quotaUsageInBytes = GeneratedColumn<int>(
+      'quota_usage_in_bytes', aliasedName, false,
+      type: DriftSqlType.int,
+      requiredDuringInsert: false,
+      defaultValue: const CustomExpression('0'));
+  @override
+  List<GeneratedColumn> get $columns => [
+        id,
+        name,
+        isAdmin,
+        email,
+        profileImagePath,
+        updatedAt,
+        quotaSizeInBytes,
+        quotaUsageInBytes
+      ];
+  @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'])!,
+      isAdmin: attachedDatabase.typeMapping
+          .read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
+      email: attachedDatabase.typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}email'])!,
+      profileImagePath: attachedDatabase.typeMapping.read(
+          DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
+      updatedAt: attachedDatabase.typeMapping
+          .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      quotaSizeInBytes: attachedDatabase.typeMapping.read(
+          DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
+      quotaUsageInBytes: attachedDatabase.typeMapping.read(
+          DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
+    );
+  }
+
+  @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 bool isAdmin;
+  final String email;
+  final String? profileImagePath;
+  final DateTime updatedAt;
+  final int? quotaSizeInBytes;
+  final int quotaUsageInBytes;
+  const UserEntityData(
+      {required this.id,
+      required this.name,
+      required this.isAdmin,
+      required this.email,
+      this.profileImagePath,
+      required this.updatedAt,
+      this.quotaSizeInBytes,
+      required this.quotaUsageInBytes});
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['name'] = Variable<String>(name);
+    map['is_admin'] = Variable<bool>(isAdmin);
+    map['email'] = Variable<String>(email);
+    if (!nullToAbsent || profileImagePath != null) {
+      map['profile_image_path'] = Variable<String>(profileImagePath);
+    }
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || quotaSizeInBytes != null) {
+      map['quota_size_in_bytes'] = Variable<int>(quotaSizeInBytes);
+    }
+    map['quota_usage_in_bytes'] = Variable<int>(quotaUsageInBytes);
+    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']),
+      isAdmin: serializer.fromJson<bool>(json['isAdmin']),
+      email: serializer.fromJson<String>(json['email']),
+      profileImagePath: serializer.fromJson<String?>(json['profileImagePath']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      quotaSizeInBytes: serializer.fromJson<int?>(json['quotaSizeInBytes']),
+      quotaUsageInBytes: serializer.fromJson<int>(json['quotaUsageInBytes']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'name': serializer.toJson<String>(name),
+      'isAdmin': serializer.toJson<bool>(isAdmin),
+      'email': serializer.toJson<String>(email),
+      'profileImagePath': serializer.toJson<String?>(profileImagePath),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'quotaSizeInBytes': serializer.toJson<int?>(quotaSizeInBytes),
+      'quotaUsageInBytes': serializer.toJson<int>(quotaUsageInBytes),
+    };
+  }
+
+  UserEntityData copyWith(
+          {String? id,
+          String? name,
+          bool? isAdmin,
+          String? email,
+          Value<String?> profileImagePath = const Value.absent(),
+          DateTime? updatedAt,
+          Value<int?> quotaSizeInBytes = const Value.absent(),
+          int? quotaUsageInBytes}) =>
+      UserEntityData(
+        id: id ?? this.id,
+        name: name ?? this.name,
+        isAdmin: isAdmin ?? this.isAdmin,
+        email: email ?? this.email,
+        profileImagePath: profileImagePath.present
+            ? profileImagePath.value
+            : this.profileImagePath,
+        updatedAt: updatedAt ?? this.updatedAt,
+        quotaSizeInBytes: quotaSizeInBytes.present
+            ? quotaSizeInBytes.value
+            : this.quotaSizeInBytes,
+        quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+      );
+  UserEntityData copyWithCompanion(UserEntityCompanion data) {
+    return UserEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      name: data.name.present ? data.name.value : this.name,
+      isAdmin: data.isAdmin.present ? data.isAdmin.value : this.isAdmin,
+      email: data.email.present ? data.email.value : this.email,
+      profileImagePath: data.profileImagePath.present
+          ? data.profileImagePath.value
+          : this.profileImagePath,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      quotaSizeInBytes: data.quotaSizeInBytes.present
+          ? data.quotaSizeInBytes.value
+          : this.quotaSizeInBytes,
+      quotaUsageInBytes: data.quotaUsageInBytes.present
+          ? data.quotaUsageInBytes.value
+          : this.quotaUsageInBytes,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserEntityData(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('email: $email, ')
+          ..write('profileImagePath: $profileImagePath, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, name, isAdmin, email, profileImagePath,
+      updatedAt, quotaSizeInBytes, quotaUsageInBytes);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserEntityData &&
+          other.id == this.id &&
+          other.name == this.name &&
+          other.isAdmin == this.isAdmin &&
+          other.email == this.email &&
+          other.profileImagePath == this.profileImagePath &&
+          other.updatedAt == this.updatedAt &&
+          other.quotaSizeInBytes == this.quotaSizeInBytes &&
+          other.quotaUsageInBytes == this.quotaUsageInBytes);
+}
+
+class UserEntityCompanion extends UpdateCompanion<UserEntityData> {
+  final Value<String> id;
+  final Value<String> name;
+  final Value<bool> isAdmin;
+  final Value<String> email;
+  final Value<String?> profileImagePath;
+  final Value<DateTime> updatedAt;
+  final Value<int?> quotaSizeInBytes;
+  final Value<int> quotaUsageInBytes;
+  const UserEntityCompanion({
+    this.id = const Value.absent(),
+    this.name = const Value.absent(),
+    this.isAdmin = const Value.absent(),
+    this.email = const Value.absent(),
+    this.profileImagePath = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.quotaSizeInBytes = const Value.absent(),
+    this.quotaUsageInBytes = const Value.absent(),
+  });
+  UserEntityCompanion.insert({
+    required String id,
+    required String name,
+    this.isAdmin = const Value.absent(),
+    required String email,
+    this.profileImagePath = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.quotaSizeInBytes = const Value.absent(),
+    this.quotaUsageInBytes = const Value.absent(),
+  })  : id = Value(id),
+        name = Value(name),
+        email = Value(email);
+  static Insertable<UserEntityData> custom({
+    Expression<String>? id,
+    Expression<String>? name,
+    Expression<bool>? isAdmin,
+    Expression<String>? email,
+    Expression<String>? profileImagePath,
+    Expression<DateTime>? updatedAt,
+    Expression<int>? quotaSizeInBytes,
+    Expression<int>? quotaUsageInBytes,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (name != null) 'name': name,
+      if (isAdmin != null) 'is_admin': isAdmin,
+      if (email != null) 'email': email,
+      if (profileImagePath != null) 'profile_image_path': profileImagePath,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (quotaSizeInBytes != null) 'quota_size_in_bytes': quotaSizeInBytes,
+      if (quotaUsageInBytes != null) 'quota_usage_in_bytes': quotaUsageInBytes,
+    });
+  }
+
+  UserEntityCompanion copyWith(
+      {Value<String>? id,
+      Value<String>? name,
+      Value<bool>? isAdmin,
+      Value<String>? email,
+      Value<String?>? profileImagePath,
+      Value<DateTime>? updatedAt,
+      Value<int?>? quotaSizeInBytes,
+      Value<int>? quotaUsageInBytes}) {
+    return UserEntityCompanion(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      isAdmin: isAdmin ?? this.isAdmin,
+      email: email ?? this.email,
+      profileImagePath: profileImagePath ?? this.profileImagePath,
+      updatedAt: updatedAt ?? this.updatedAt,
+      quotaSizeInBytes: quotaSizeInBytes ?? this.quotaSizeInBytes,
+      quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+    );
+  }
+
+  @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 (isAdmin.present) {
+      map['is_admin'] = Variable<bool>(isAdmin.value);
+    }
+    if (email.present) {
+      map['email'] = Variable<String>(email.value);
+    }
+    if (profileImagePath.present) {
+      map['profile_image_path'] = Variable<String>(profileImagePath.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.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);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('email: $email, ')
+          ..write('profileImagePath: $profileImagePath, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes')
+          ..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);
+  @override
+  List<GeneratedColumn> get $columns => [
+        name,
+        type,
+        createdAt,
+        updatedAt,
+        width,
+        height,
+        durationInSeconds,
+        id,
+        checksum,
+        isFavorite,
+        ownerId,
+        localDateTime,
+        thumbHash,
+        deletedAt,
+        livePhotoVideoId,
+        visibility,
+        stackId
+      ];
+  @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']),
+    );
+  }
+
+  @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;
+  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});
+  @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);
+    }
+    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']),
+    );
+  }
+  @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),
+    };
+  }
+
+  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()}) =>
+      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,
+      );
+  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,
+    );
+  }
+
+  @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(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      name,
+      type,
+      createdAt,
+      updatedAt,
+      width,
+      height,
+      durationInSeconds,
+      id,
+      checksum,
+      isFavorite,
+      ownerId,
+      localDateTime,
+      thumbHash,
+      deletedAt,
+      livePhotoVideoId,
+      visibility,
+      stackId);
+  @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);
+}
+
+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;
+  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(),
+  });
+  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(),
+  })  : 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,
+  }) {
+    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,
+    });
+  }
+
+  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}) {
+    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,
+    );
+  }
+
+  @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);
+    }
+    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(')'))
+        .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 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 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 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<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, 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'])!,
+      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 bool? marker_;
+  const LocalAlbumEntityData(
+      {required this.id,
+      required this.name,
+      required this.updatedAt,
+      required this.backupSelection,
+      required this.isIosSharedAlbum,
+      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 || 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']),
+      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),
+      'marker_': serializer.toJson<bool?>(marker_),
+    };
+  }
+
+  LocalAlbumEntityData copyWith(
+          {String? id,
+          String? name,
+          DateTime? updatedAt,
+          int? backupSelection,
+          bool? isIosSharedAlbum,
+          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,
+        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,
+      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('marker_: $marker_')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      id, name, updatedAt, backupSelection, isIosSharedAlbum, 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.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<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.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.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<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 (marker_ != null) 'marker': marker_,
+    });
+  }
+
+  LocalAlbumEntityCompanion copyWith(
+      {Value<String>? id,
+      Value<String>? name,
+      Value<DateTime>? updatedAt,
+      Value<int>? backupSelection,
+      Value<bool>? isIosSharedAlbum,
+      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,
+      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 (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('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'));
+  @override
+  List<GeneratedColumn> get $columns => [assetId, albumId];
+  @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'])!,
+    );
+  }
+
+  @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;
+  const LocalAlbumAssetEntityData(
+      {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 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']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'albumId': serializer.toJson<String>(albumId),
+    };
+  }
+
+  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
+      LocalAlbumAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        albumId: albumId ?? this.albumId,
+      );
+  LocalAlbumAssetEntityData copyWithCompanion(
+      LocalAlbumAssetEntityCompanion data) {
+    return LocalAlbumAssetEntityData(
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      albumId: data.albumId.present ? data.albumId.value : this.albumId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LocalAlbumAssetEntityData(')
+          ..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 LocalAlbumAssetEntityData &&
+          other.assetId == this.assetId &&
+          other.albumId == this.albumId);
+}
+
+class LocalAlbumAssetEntityCompanion
+    extends UpdateCompanion<LocalAlbumAssetEntityData> {
+  final Value<String> assetId;
+  final Value<String> albumId;
+  const LocalAlbumAssetEntityCompanion({
+    this.assetId = const Value.absent(),
+    this.albumId = const Value.absent(),
+  });
+  LocalAlbumAssetEntityCompanion.insert({
+    required String assetId,
+    required String albumId,
+  })  : assetId = Value(assetId),
+        albumId = Value(albumId);
+  static Insertable<LocalAlbumAssetEntityData> custom({
+    Expression<String>? assetId,
+    Expression<String>? albumId,
+  }) {
+    return RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (albumId != null) 'album_id': albumId,
+    });
+  }
+
+  LocalAlbumAssetEntityCompanion copyWith(
+      {Value<String>? assetId, Value<String>? albumId}) {
+    return LocalAlbumAssetEntityCompanion(
+      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('LocalAlbumAssetEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('albumId: $albumId')
+          ..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 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 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<String> thumbnailPath = GeneratedColumn<String>(
+      'thumbnail_path', aliasedName, false,
+      type: DriftSqlType.string, requiredDuringInsert: true);
+  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,
+        thumbnailPath,
+        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']),
+      thumbnailPath: attachedDatabase.typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!,
+      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 String thumbnailPath;
+  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.thumbnailPath,
+      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['thumbnail_path'] = Variable<String>(thumbnailPath);
+    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']),
+      thumbnailPath: serializer.fromJson<String>(json['thumbnailPath']),
+      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),
+      'thumbnailPath': serializer.toJson<String>(thumbnailPath),
+      '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(),
+          String? thumbnailPath,
+          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,
+        thumbnailPath: thumbnailPath ?? this.thumbnailPath,
+        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,
+      thumbnailPath: data.thumbnailPath.present
+          ? data.thumbnailPath.value
+          : this.thumbnailPath,
+      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('thumbnailPath: $thumbnailPath, ')
+          ..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, thumbnailPath, 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.thumbnailPath == this.thumbnailPath &&
+          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<String> thumbnailPath;
+  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.thumbnailPath = 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 String thumbnailPath,
+    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),
+        thumbnailPath = Value(thumbnailPath),
+        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<String>? thumbnailPath,
+    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 (thumbnailPath != null) 'thumbnail_path': thumbnailPath,
+      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<String>? thumbnailPath,
+      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,
+      thumbnailPath: thumbnailPath ?? this.thumbnailPath,
+      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 (thumbnailPath.present) {
+      map['thumbnail_path'] = Variable<String>(thumbnailPath.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('thumbnailPath: $thumbnailPath, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('isHidden: $isHidden, ')
+          ..write('color: $color, ')
+          ..write('birthDate: $birthDate')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class DatabaseAtV3 extends GeneratedDatabase {
+  DatabaseAtV3(QueryExecutor e) : super(e);
+  late final UserEntity userEntity = UserEntity(this);
+  late final RemoteAssetEntity remoteAssetEntity = RemoteAssetEntity(this);
+  late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
+  late final StackEntity stackEntity = StackEntity(this);
+  late final Index idxLocalAssetChecksum = Index('idx_local_asset_checksum',
+      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  late final Index uQRemoteAssetOwnerChecksum = Index(
+      'UQ_remote_asset_owner_checksum',
+      'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
+  late final Index idxRemoteAssetChecksum = Index('idx_remote_asset_checksum',
+      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this);
+  late final PartnerEntity partnerEntity = PartnerEntity(this);
+  late final LocalAlbumEntity localAlbumEntity = LocalAlbumEntity(this);
+  late final LocalAlbumAssetEntity localAlbumAssetEntity =
+      LocalAlbumAssetEntity(this);
+  late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this);
+  late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(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);
+  @override
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  @override
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+        userEntity,
+        remoteAssetEntity,
+        localAssetEntity,
+        stackEntity,
+        idxLocalAssetChecksum,
+        uQRemoteAssetOwnerChecksum,
+        idxRemoteAssetChecksum,
+        userMetadataEntity,
+        partnerEntity,
+        localAlbumEntity,
+        localAlbumAssetEntity,
+        remoteExifEntity,
+        remoteAlbumEntity,
+        remoteAlbumAssetEntity,
+        remoteAlbumUserEntity,
+        memoryEntity,
+        memoryAssetEntity,
+        personEntity
+      ];
+  @override
+  int get schemaVersion => 3;
+  @override
+  DriftDatabaseOptions get options =>
+      const DriftDatabaseOptions(storeDateTimeAsText: true);
+}

From 4d27f187eaf776a6a3e7ebb08d8309793a09fb4b Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 21 Jul 2025 15:30:51 -0500
Subject: [PATCH 254/337] feat: new upload (cont) (#20029)

* new upload button

* wip

* pr feedback

* fix: updateAll override album selection value

* feat: status box

* feat: handle upload resume

* re-enable websocket event

* fix: update state condition and upload status

* Better backup detail page

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 i18n/en.json                                  |   8 +
 .../app/alextran/immich/BackupWorker.kt       |   1 +
 mobile/lib/constants/constants.dart           |   3 +
 mobile/lib/domain/models/store.model.dart     |   3 +-
 .../domain/services/local_album.service.dart  |   4 +-
 mobile/lib/domain/utils/background_sync.dart  |  16 +-
 .../extensions/build_context_extensions.dart  |   4 +
 .../repositories/backup.repository.dart       |   9 +-
 .../repositories/local_album.repository.dart  |  21 +-
 mobile/lib/main.dart                          |   4 +-
 .../lib/pages/backup/drift_backup.page.dart   | 125 ++-
 .../drift_backup_album_selection.page.dart    | 720 ++++++++++++------
 .../backup/drift_upload_detail.page.dart      | 428 +++++++++++
 mobile/lib/pages/common/tab_shell.page.dart   |  17 +-
 .../backup/backup_toggle_button.widget.dart   | 242 ++++++
 .../providers/app_life_cycle.provider.dart    |  24 +-
 .../backup/backup_album.provider.dart         |   4 +-
 .../backup/drift_backup.provider.dart         | 231 +++++-
 mobile/lib/providers/websocket.provider.dart  |  12 +-
 mobile/lib/routing/router.dart                |   5 +
 mobile/lib/routing/router.gr.dart             |  16 +
 mobile/lib/services/app_settings.service.dart |   1 +
 mobile/lib/services/drift_backup.service.dart |  15 +-
 mobile/lib/services/upload.service.dart       |   1 +
 .../widgets/common/immich_sliver_app_bar.dart |   6 +
 .../settings/beta_timeline_list_tile.dart     |  51 +-
 26 files changed, 1558 insertions(+), 413 deletions(-)
 create mode 100644 mobile/lib/pages/backup/drift_upload_detail.page.dart
 create mode 100644 mobile/lib/presentation/widgets/backup/backup_toggle_button.widget.dart

diff --git a/i18n/en.json b/i18n/en.json
index 77dc2e235c..8961943678 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -406,6 +406,7 @@
   "album_options": "Album options",
   "album_remove_user": "Remove user?",
   "album_remove_user_confirmation": "Are you sure you want to remove {user}?",
+  "album_search_not_found": "No albums found matching your search",
   "album_share_no_users": "Looks like you have shared this album with all users or you don't have any user to share with.",
   "album_updated": "Album updated",
   "album_updated_setting_description": "Receive an email notification when a shared album has new assets",
@@ -425,6 +426,7 @@
   "albums_default_sort_order": "Default album sort order",
   "albums_default_sort_order_description": "Initial asset sort order when creating new albums.",
   "albums_feature_description": "Collections of assets that can be shared with other users.",
+  "albums_on_device_count": "Albums on device ({count})",
   "all": "All",
   "all_albums": "All albums",
   "all_people": "All people",
@@ -605,6 +607,7 @@
   "cancel": "Cancel",
   "cancel_search": "Cancel search",
   "canceled": "Canceled",
+  "canceling": "Canceling",
   "cannot_merge_people": "Cannot merge people",
   "cannot_undo_this_action": "You cannot undo this action!",
   "cannot_update_the_description": "Cannot update the description",
@@ -765,6 +768,7 @@
   "description": "Description",
   "description_input_hint_text": "Add description...",
   "description_input_submit_error": "Error updating description, check the log for more details",
+  "deselect_all": "Deselect All",
   "details": "Details",
   "direction": "Direction",
   "disabled": "Disabled",
@@ -839,6 +843,7 @@
   "empty_trash": "Empty trash",
   "empty_trash_confirmation": "Are you sure you want to empty the trash? This will remove all the assets in trash permanently from Immich.\nYou cannot undo this action!",
   "enable": "Enable",
+  "enable_backup": "Enable Backup",
   "enable_biometric_auth_description": "Enter your PIN code to enable biometric authentication",
   "enabled": "Enabled",
   "end_date": "End date",
@@ -1485,6 +1490,7 @@
   "purchase_server_description_2": "Supporter status",
   "purchase_server_title": "Server",
   "purchase_settings_server_activated": "The server product key is managed by the admin",
+  "queue_status": "Queuing {count}/{total}",
   "rating": "Star rating",
   "rating_clear": "Clear rating",
   "rating_count": "{count, plural, one {# star} other {# stars}}",
@@ -1915,6 +1921,7 @@
   "updated_password": "Updated password",
   "upload": "Upload",
   "upload_concurrency": "Upload concurrency",
+  "upload_details": "Upload Details",
   "upload_dialog_info": "Do you want to backup the selected Asset(s) to the server?",
   "upload_dialog_title": "Upload Asset",
   "upload_errors": "Upload completed with {count, plural, one {# error} other {# errors}}, refresh the page to see new upload assets.",
@@ -1965,6 +1972,7 @@
   "view_album": "View Album",
   "view_all": "View All",
   "view_all_users": "View all users",
+  "view_details": "View Details",
   "view_in_timeline": "View in timeline",
   "view_link": "View link",
   "view_links": "View links",
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/BackupWorker.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/BackupWorker.kt
index 0fb75b002c..9c90528dc9 100644
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/BackupWorker.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/BackupWorker.kt
@@ -83,6 +83,7 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
 
     flutterLoader.ensureInitializationCompleteAsync(ctx, null, Handler(Looper.getMainLooper())) {
       runDart()
+
     }
 
     return resolvableFuture
diff --git a/mobile/lib/constants/constants.dart b/mobile/lib/constants/constants.dart
index 37a3eec073..206fbbb28f 100644
--- a/mobile/lib/constants/constants.dart
+++ b/mobile/lib/constants/constants.dart
@@ -38,3 +38,6 @@ const List<(String, String)> kWidgetNames = [
   ('com.immich.widget.random', 'app.alextran.immich.widget.RandomReceiver'),
   ('com.immich.widget.memory', 'app.alextran.immich.widget.MemoryReceiver'),
 ];
+
+const double kUploadStatusFailed = -1.0;
+const double kUploadStatusCanceled = -2.0;
diff --git a/mobile/lib/domain/models/store.model.dart b/mobile/lib/domain/models/store.model.dart
index 61c5807ba8..305b3f3387 100644
--- a/mobile/lib/domain/models/store.model.dart
+++ b/mobile/lib/domain/models/store.model.dart
@@ -70,7 +70,8 @@ enum StoreKey<T> {
   // Experimental stuff
   photoManagerCustomFilter<bool>._(1000),
   betaPromptShown<bool>._(1001),
-  betaTimeline<bool>._(1002);
+  betaTimeline<bool>._(1002),
+  enableBackup<bool>._(1003);
 
   const StoreKey._(this.id);
   final int id;
diff --git a/mobile/lib/domain/services/local_album.service.dart b/mobile/lib/domain/services/local_album.service.dart
index 7ec9231196..79cc58f3e0 100644
--- a/mobile/lib/domain/services/local_album.service.dart
+++ b/mobile/lib/domain/services/local_album.service.dart
@@ -7,8 +7,8 @@ class LocalAlbumService {
 
   const LocalAlbumService(this._repository);
 
-  Future<List<LocalAlbum>> getAll() {
-    return _repository.getAll();
+  Future<List<LocalAlbum>> getAll({Set<SortLocalAlbumsBy> sortBy = const {}}) {
+    return _repository.getAll(sortBy: sortBy);
   }
 
   Future<LocalAsset?> getThumbnail(String albumId) {
diff --git a/mobile/lib/domain/utils/background_sync.dart b/mobile/lib/domain/utils/background_sync.dart
index 7ab2989354..4a44c4d8f2 100644
--- a/mobile/lib/domain/utils/background_sync.dart
+++ b/mobile/lib/domain/utils/background_sync.dart
@@ -101,14 +101,18 @@ class BackgroundSyncManager {
     if (_syncWebsocketTask != null) {
       return _syncWebsocketTask!.future;
     }
-
-    _syncWebsocketTask = runInIsolateGentle(
-      computation: (ref) => ref
-          .read(syncStreamServiceProvider)
-          .handleWsAssetUploadReadyV1Batch(batchData),
-    );
+    _syncWebsocketTask = _handleWsAssetUploadReadyV1Batch(batchData);
     return _syncWebsocketTask!.whenComplete(() {
       _syncWebsocketTask = null;
     });
   }
 }
+
+Cancelable<void> _handleWsAssetUploadReadyV1Batch(
+  List<dynamic> batchData,
+) =>
+    runInIsolateGentle(
+      computation: (ref) => ref
+          .read(syncStreamServiceProvider)
+          .handleWsAssetUploadReadyV1Batch(batchData),
+    );
diff --git a/mobile/lib/extensions/build_context_extensions.dart b/mobile/lib/extensions/build_context_extensions.dart
index 69a9c3b347..7bb194cdae 100644
--- a/mobile/lib/extensions/build_context_extensions.dart
+++ b/mobile/lib/extensions/build_context_extensions.dart
@@ -33,6 +33,10 @@ extension ContextHelper on BuildContext {
 
   // Returns the current Primary color of the Theme
   Color get primaryColor => themeData.colorScheme.primary;
+  Color get logoYellow => const Color.fromARGB(255, 255, 184, 0);
+  Color get logoRed => const Color.fromARGB(255, 230, 65, 30);
+  Color get logoPink => const Color.fromARGB(255, 222, 127, 179);
+  Color get logoGreen => const Color.fromARGB(255, 49, 164, 82);
 
   // Returns the Scaffold background color of the Theme
   Color get scaffoldBackgroundColor => colorScheme.surface;
diff --git a/mobile/lib/infrastructure/repositories/backup.repository.dart b/mobile/lib/infrastructure/repositories/backup.repository.dart
index 4ce3b07e8b..99df206db5 100644
--- a/mobile/lib/infrastructure/repositories/backup.repository.dart
+++ b/mobile/lib/infrastructure/repositories/backup.repository.dart
@@ -52,9 +52,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
 
   Future<int> getRemainderCount() async {
     final query = _db.localAlbumAssetEntity.selectOnly(distinct: true)
-      ..addColumns(
-        [_db.localAlbumAssetEntity.assetId],
-      )
+      ..addColumns([_db.localAlbumAssetEntity.assetId])
       ..join([
         innerJoin(
           _db.localAlbumEntity,
@@ -147,6 +145,11 @@ class DriftBackupRepository extends DriftDatabaseRepository {
                 ),
             ) &
             lae.id.isNotInQuery(_getExcludedSubquery()),
+      )
+      ..orderBy(
+        [
+          (localAsset) => OrderingTerm.desc(localAsset.createdAt),
+        ],
       );
 
     return query.map((localAsset) => localAsset.toDto()).get();
diff --git a/mobile/lib/infrastructure/repositories/local_album.repository.dart b/mobile/lib/infrastructure/repositories/local_album.repository.dart
index ba9dfd979d..5f192a20cf 100644
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -8,7 +8,13 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/utils/database.utils.dart';
 import 'package:platform/platform.dart';
 
-enum SortLocalAlbumsBy { id, backupSelection, isIosSharedAlbum }
+enum SortLocalAlbumsBy {
+  id,
+  backupSelection,
+  isIosSharedAlbum,
+  name,
+  assetCount
+}
 
 class DriftLocalAlbumRepository extends DriftDatabaseRepository {
   final Drift _db;
@@ -41,6 +47,9 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
               OrderingTerm.asc(_db.localAlbumEntity.backupSelection),
             SortLocalAlbumsBy.isIosSharedAlbum =>
               OrderingTerm.asc(_db.localAlbumEntity.isIosSharedAlbum),
+            SortLocalAlbumsBy.name =>
+              OrderingTerm.asc(_db.localAlbumEntity.name),
+            SortLocalAlbumsBy.assetCount => OrderingTerm.desc(assetCount),
           },
         );
       }
@@ -151,7 +160,15 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
           batch.insert(
             _db.localAlbumEntity,
             companion,
-            onConflict: DoUpdate((_) => companion),
+            onConflict: DoUpdate(
+              (old) => LocalAlbumEntityCompanion(
+                id: companion.id,
+                name: companion.name,
+                updatedAt: companion.updatedAt,
+                isIosSharedAlbum: companion.isIosSharedAlbum,
+                marker_: companion.marker_,
+              ),
+            ),
           );
         }
       });
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index acadf4c887..f036fd9bc3 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -96,8 +96,8 @@ Future<void> initApp() async {
   // Initialize the file downloader
 
   await FileDownloader().configure(
-    // maxConcurrent: 5, maxConcurrentByHost: 2, maxConcurrentByGroup: 3
-    globalConfig: (Config.holdingQueue, (5, 2, 3)),
+    // maxConcurrent: 6, maxConcurrentByHost(server):6, maxConcurrentByGroup: 3
+    globalConfig: (Config.holdingQueue, (6, 6, 3)),
   );
 
   await FileDownloader().trackTasksInGroup(
diff --git a/mobile/lib/pages/backup/drift_backup.page.dart b/mobile/lib/pages/backup/drift_backup.page.dart
index 34649ca42c..1b9ec8ad07 100644
--- a/mobile/lib/pages/backup/drift_backup.page.dart
+++ b/mobile/lib/pages/backup/drift_backup.page.dart
@@ -1,83 +1,61 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/backup/backup_toggle_button.widget.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/backup/backup_info_card.dart';
 
 @RoutePage()
-class DriftBackupPage extends HookConsumerWidget {
+class DriftBackupPage extends ConsumerStatefulWidget {
   const DriftBackupPage({super.key});
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    useEffect(
-      () {
-        ref.read(driftBackupProvider.notifier).getBackupStatus();
-        return null;
-      },
-      [],
-    );
+  ConsumerState<DriftBackupPage> createState() => _DriftBackupPageState();
+}
 
-    Widget buildControlButtons() {
-      return Padding(
-        padding: const EdgeInsets.only(
-          top: 24,
-        ),
-        child: Column(
-          children: [
-            ElevatedButton(
-              onPressed: () => ref.read(driftBackupProvider.notifier).backup(),
-              child: const Text(
-                "backup_controller_page_start_backup",
-                style: TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.bold,
-                ),
-              ).tr(),
-            ),
-            OutlinedButton(
-              onPressed: () => ref.read(driftBackupProvider.notifier).cancel(),
-              child: const Text(
-                "cancel",
-                style: TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.bold,
-                ),
-              ).tr(),
-            ),
-            OutlinedButton(
-              onPressed: () =>
-                  ref.read(driftBackupProvider.notifier).getDataInfo(),
-              child: const Text(
-                "Get database info",
-                style: TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.bold,
-                ),
-              ).tr(),
-            ),
-          ],
-        ),
-      );
-    }
+class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
+  @override
+  void initState() {
+    super.initState();
+    ref.read(driftBackupProvider.notifier).getBackupStatus();
+  }
+
+  Future<void> startBackup() async {
+    await ref.read(driftBackupProvider.notifier).getBackupStatus();
+    await ref.read(driftBackupProvider.notifier).backup();
+  }
+
+  Future<void> stopBackup() async {
+    await ref.read(driftBackupProvider.notifier).cancel();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final selectedAlbum = ref
+        .watch(backupAlbumProvider)
+        .where(
+          (album) => album.backupSelection == BackupSelection.selected,
+        )
+        .toList();
+    final uploadItems = ref.watch(
+      driftBackupProvider.select((state) => state.uploadItems),
+    );
 
     return Scaffold(
       appBar: AppBar(
         elevation: 0,
-        title: const Text(
-          "Backup (Experimental)",
+        title: Text(
+          "backup_controller_page_backup".t(),
         ),
         leading: IconButton(
           onPressed: () {
-            ref.watch(websocketProvider.notifier).listenUploadEvent();
             context.maybePop(true);
           },
           splashRadius: 24,
@@ -85,18 +63,6 @@ class DriftBackupPage extends HookConsumerWidget {
             Icons.arrow_back_ios_rounded,
           ),
         ),
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 8.0),
-            child: IconButton(
-              onPressed: () => context.pushRoute(const BackupOptionsRoute()),
-              splashRadius: 24,
-              icon: const Icon(
-                Icons.settings_outlined,
-              ),
-            ),
-          ),
-        ],
       ),
       body: Stack(
         children: [
@@ -110,11 +76,24 @@ class DriftBackupPage extends HookConsumerWidget {
               children: [
                 const SizedBox(height: 8),
                 const _BackupAlbumSelectionCard(),
-                const _TotalCard(),
-                const _BackupCard(),
-                const _RemainderCard(),
-                const Divider(),
-                buildControlButtons(),
+                if (selectedAlbum.isNotEmpty) ...[
+                  const _TotalCard(),
+                  const _BackupCard(),
+                  const _RemainderCard(),
+                  const Divider(),
+                  BackupToggleButton(
+                    onStart: () async => await startBackup(),
+                    onStop: () async => await stopBackup(),
+                  ),
+                  if (uploadItems.isNotEmpty)
+                    TextButton.icon(
+                      icon: const Icon(Icons.info_outline_rounded),
+                      onPressed: () => context.pushRoute(
+                        const DriftUploadDetailRoute(),
+                      ),
+                      label: Text("view_details".t(context: context)),
+                    ),
+                ],
               ],
             ),
           ),
diff --git a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
index 2e7a2d4c2d..fd39f0a579 100644
--- a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
+++ b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
@@ -1,25 +1,67 @@
+import 'dart:io';
+
 import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
-import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
+import 'package:immich_mobile/widgets/common/search_field.dart';
 
 @RoutePage()
-class DriftBackupAlbumSelectionPage extends HookConsumerWidget {
+class DriftBackupAlbumSelectionPage extends ConsumerStatefulWidget {
   const DriftBackupAlbumSelectionPage({super.key});
+
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  ConsumerState<DriftBackupAlbumSelectionPage> createState() =>
+      _DriftBackupAlbumSelectionPageState();
+}
+
+class _DriftBackupAlbumSelectionPageState
+    extends ConsumerState<DriftBackupAlbumSelectionPage> {
+  String _searchQuery = '';
+  bool _isSearchMode = false;
+  late ValueNotifier<bool> _enableSyncUploadAlbum;
+  late TextEditingController _searchController;
+  late FocusNode _searchFocusNode;
+
+  @override
+  void initState() {
+    super.initState();
+    _enableSyncUploadAlbum = ValueNotifier<bool>(false);
+    _searchController = TextEditingController();
+    _searchFocusNode = FocusNode();
+
+    _enableSyncUploadAlbum.value = ref
+        .read(appSettingsServiceProvider)
+        .getSetting(AppSettingsEnum.syncAlbums);
+    ref.read(backupAlbumProvider.notifier).getAll();
+  }
+
+  @override
+  void dispose() {
+    _enableSyncUploadAlbum.dispose();
+    _searchController.dispose();
+    _searchFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
     final albums = ref.watch(backupAlbumProvider);
+    final albumCount = albums.length;
+    // Filter albums based on search query
+    final filteredAlbums = albums.where((album) {
+      if (_searchQuery.isEmpty) return true;
+      return album.name.toLowerCase().contains(_searchQuery.toLowerCase());
+    }).toList();
 
     final selectedBackupAlbums = albums
         .where((album) => album.backupSelection == BackupSelection.selected)
@@ -27,133 +69,6 @@ class DriftBackupAlbumSelectionPage extends HookConsumerWidget {
     final excludedBackupAlbums = albums
         .where((album) => album.backupSelection == BackupSelection.excluded)
         .toList();
-    final enableSyncUploadAlbum =
-        useAppSettingsState(AppSettingsEnum.syncAlbums);
-    final isDarkTheme = context.isDarkTheme;
-
-    useEffect(
-      () {
-        ref.watch(backupProvider.notifier).getBackupInfo();
-        ref.watch(backupAlbumProvider.notifier).getAll();
-        return null;
-      },
-      [],
-    );
-
-    buildAlbumSelectionList() {
-      if (albums.isEmpty) {
-        return const SliverToBoxAdapter(
-          child: Center(
-            child: CircularProgressIndicator(),
-          ),
-        );
-      }
-
-      return SliverPadding(
-        padding: const EdgeInsets.symmetric(vertical: 12.0),
-        sliver: SliverList(
-          delegate: SliverChildBuilderDelegate(
-            ((context, index) {
-              return DriftAlbumInfoListTile(
-                album: albums[index],
-              );
-            }),
-            childCount: albums.length,
-          ),
-        ),
-      );
-    }
-
-    buildAlbumSelectionGrid() {
-      if (albums.isEmpty) {
-        return const SliverToBoxAdapter(
-          child: Center(
-            child: CircularProgressIndicator(),
-          ),
-        );
-      }
-
-      return SliverPadding(
-        padding: const EdgeInsets.all(12.0),
-        sliver: SliverGrid.builder(
-          gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-            maxCrossAxisExtent: 300,
-            mainAxisSpacing: 12,
-            crossAxisSpacing: 12,
-          ),
-          itemCount: albums.length,
-          itemBuilder: ((context, index) {
-            return DriftAlbumInfoListTile(
-              album: albums[index],
-            );
-          }),
-        ),
-      );
-    }
-
-    buildSelectedAlbumNameChip() {
-      return selectedBackupAlbums.map((album) {
-        void removeSelection() {
-          ref.read(backupAlbumProvider.notifier).deselectAlbum(album);
-        }
-
-        return Padding(
-          padding: const EdgeInsets.only(right: 8.0),
-          child: GestureDetector(
-            onTap: removeSelection,
-            child: Chip(
-              label: Text(
-                album.name,
-                style: TextStyle(
-                  fontSize: 12,
-                  color: isDarkTheme ? Colors.black : Colors.white,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              backgroundColor: context.primaryColor,
-              deleteIconColor: isDarkTheme ? Colors.black : Colors.white,
-              deleteIcon: const Icon(
-                Icons.cancel_rounded,
-                size: 15,
-              ),
-              onDeleted: removeSelection,
-            ),
-          ),
-        );
-      }).toSet();
-    }
-
-    buildExcludedAlbumNameChip() {
-      return excludedBackupAlbums.map((album) {
-        void removeSelection() {
-          ref.read(backupAlbumProvider.notifier).deselectAlbum(album);
-        }
-
-        return GestureDetector(
-          onTap: removeSelection,
-          child: Padding(
-            padding: const EdgeInsets.only(right: 8.0),
-            child: Chip(
-              label: Text(
-                album.name,
-                style: TextStyle(
-                  fontSize: 12,
-                  color: context.scaffoldBackgroundColor,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              backgroundColor: Colors.red[300],
-              deleteIconColor: context.scaffoldBackgroundColor,
-              deleteIcon: const Icon(
-                Icons.cancel_rounded,
-                size: 15,
-              ),
-              onDeleted: removeSelection,
-            ),
-          ),
-        );
-      }).toSet();
-    }
 
     handleSyncAlbumToggle(bool isEnable) async {
       if (isEnable) {
@@ -170,138 +85,439 @@ class DriftBackupAlbumSelectionPage extends HookConsumerWidget {
           onPressed: () => context.maybePop(),
           icon: const Icon(Icons.arrow_back_ios_rounded),
         ),
-        title: const Text(
-          "backup_album_selection_page_select_albums",
-        ).tr(),
+        title: _isSearchMode
+            ? SearchField(
+                hintText: 'search_albums'.t(context: context),
+                autofocus: true,
+                controller: _searchController,
+                focusNode: _searchFocusNode,
+                onChanged: (value) =>
+                    setState(() => _searchQuery = value.trim()),
+              )
+            : const Text(
+                "backup_album_selection_page_select_albums",
+              ).t(context: context),
+        actions: [
+          if (!_isSearchMode)
+            IconButton(
+              icon: const Icon(Icons.search),
+              onPressed: () => setState(() {
+                _isSearchMode = true;
+                _searchQuery = '';
+              }),
+            )
+          else
+            IconButton(
+              icon: const Icon(Icons.close),
+              onPressed: () => setState(() {
+                _isSearchMode = false;
+                _searchQuery = '';
+                _searchController.clear();
+              }),
+            ),
+        ],
         elevation: 0,
       ),
-      body: SafeArea(
-        child: CustomScrollView(
-          physics: const ClampingScrollPhysics(),
-          slivers: [
-            SliverToBoxAdapter(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.symmetric(
-                      vertical: 8.0,
-                      horizontal: 16.0,
-                    ),
-                    child: Text(
-                      "backup_album_selection_page_selection_info",
-                      style: context.textTheme.titleSmall,
-                    ).tr(),
+      body: CustomScrollView(
+        physics: const ClampingScrollPhysics(),
+        slivers: [
+          SliverToBoxAdapter(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.symmetric(
+                    vertical: 8.0,
+                    horizontal: 16.0,
                   ),
-                  // Selected Album Chips
+                  child: Text(
+                    "backup_album_selection_page_selection_info",
+                    style: context.textTheme.titleSmall,
+                  ).t(context: context),
+                ),
+                // Selected Album Chips
 
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                    child: Wrap(
-                      children: [
-                        ...buildSelectedAlbumNameChip(),
-                        ...buildExcludedAlbumNameChip(),
-                      ],
-                    ),
-                  ),
-
-                  SettingsSwitchListTile(
-                    valueNotifier: enableSyncUploadAlbum,
-                    title: "sync_albums".tr(),
-                    subtitle: "sync_upload_album_setting_subtitle".tr(),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-                    titleStyle: context.textTheme.bodyLarge?.copyWith(
-                      fontWeight: FontWeight.bold,
-                    ),
-                    subtitleStyle: context.textTheme.labelLarge?.copyWith(
-                      color: context.colorScheme.primary,
-                    ),
-                    onChanged: handleSyncAlbumToggle,
-                  ),
-
-                  ListTile(
-                    title: Text(
-                      "backup_album_selection_page_albums_device".tr(
-                        namedArgs: {
-                          'count': ref
-                              .watch(backupProvider)
-                              .availableAlbums
-                              .length
-                              .toString(),
-                        },
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                  child: Wrap(
+                    children: [
+                      _SelectedAlbumNameChips(
+                        selectedBackupAlbums: selectedBackupAlbums,
                       ),
-                      style: context.textTheme.titleSmall,
+                      _ExcludedAlbumNameChips(
+                        excludedBackupAlbums: excludedBackupAlbums,
+                      ),
+                    ],
+                  ),
+                ),
+
+                SettingsSwitchListTile(
+                  valueNotifier: _enableSyncUploadAlbum,
+                  title: "sync_albums".t(context: context),
+                  subtitle:
+                      "sync_upload_album_setting_subtitle".t(context: context),
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                  titleStyle: context.textTheme.bodyLarge?.copyWith(
+                    fontWeight: FontWeight.bold,
+                  ),
+                  subtitleStyle: context.textTheme.labelLarge?.copyWith(
+                    color: context.colorScheme.primary,
+                  ),
+                  onChanged: handleSyncAlbumToggle,
+                ),
+
+                ListTile(
+                  title: Text(
+                    "albums_on_device_count".t(
+                      context: context,
+                      args: {'count': albumCount.toString()},
                     ),
-                    subtitle: Padding(
-                      padding: const EdgeInsets.symmetric(vertical: 8.0),
-                      child: Text(
-                        "backup_album_selection_page_albums_tap",
-                        style: context.textTheme.labelLarge?.copyWith(
-                          color: context.primaryColor,
-                        ),
-                      ).tr(),
-                    ),
-                    trailing: IconButton(
-                      splashRadius: 16,
-                      icon: Icon(
-                        Icons.info,
-                        size: 20,
+                    style: context.textTheme.titleSmall,
+                  ),
+                  subtitle: Padding(
+                    padding: const EdgeInsets.symmetric(vertical: 8.0),
+                    child: Text(
+                      "backup_album_selection_page_albums_tap",
+                      style: context.textTheme.labelLarge?.copyWith(
                         color: context.primaryColor,
                       ),
-                      onPressed: () {
-                        // show the dialog
-                        showDialog(
-                          context: context,
-                          builder: (BuildContext context) {
-                            return AlertDialog(
-                              shape: const RoundedRectangleBorder(
-                                borderRadius:
-                                    BorderRadius.all(Radius.circular(10)),
-                              ),
-                              elevation: 5,
-                              title: Text(
-                                'backup_album_selection_page_selection_info',
-                                style: TextStyle(
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold,
-                                  color: context.primaryColor,
-                                ),
-                              ).tr(),
-                              content: SingleChildScrollView(
-                                child: ListBody(
-                                  children: [
-                                    const Text(
-                                      'backup_album_selection_page_assets_scatter',
-                                      style: TextStyle(
-                                        fontSize: 14,
-                                      ),
-                                    ).tr(),
-                                  ],
-                                ),
-                              ),
-                            );
-                          },
-                        );
-                      },
-                    ),
+                    ).t(context: context),
                   ),
+                  trailing: IconButton(
+                    splashRadius: 16,
+                    icon: Icon(
+                      Icons.info,
+                      size: 20,
+                      color: context.primaryColor,
+                    ),
+                    onPressed: () {
+                      // show the dialog
+                      showDialog(
+                        context: context,
+                        builder: (BuildContext context) {
+                          return AlertDialog(
+                            shape: const RoundedRectangleBorder(
+                              borderRadius:
+                                  BorderRadius.all(Radius.circular(10)),
+                            ),
+                            elevation: 5,
+                            title: Text(
+                              'backup_album_selection_page_selection_info',
+                              style: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold,
+                                color: context.primaryColor,
+                              ),
+                            ).t(context: context),
+                            content: SingleChildScrollView(
+                              child: ListBody(
+                                children: [
+                                  const Text(
+                                    'backup_album_selection_page_assets_scatter',
+                                    style: TextStyle(
+                                      fontSize: 14,
+                                    ),
+                                  ).t(context: context),
+                                ],
+                              ),
+                            ),
+                          );
+                        },
+                      );
+                    },
+                  ),
+                ),
 
-                  // buildSearchBar(),
-                ],
-              ),
+                if (Platform.isAndroid)
+                  _SelectAllButton(
+                    filteredAlbums: filteredAlbums,
+                    selectedBackupAlbums: selectedBackupAlbums,
+                  ),
+              ],
             ),
-            SliverLayoutBuilder(
-              builder: (context, constraints) {
-                if (constraints.crossAxisExtent > 600) {
-                  return buildAlbumSelectionGrid();
-                } else {
-                  return buildAlbumSelectionList();
-                }
-              },
-            ),
-          ],
+          ),
+          SliverLayoutBuilder(
+            builder: (context, constraints) {
+              if (constraints.crossAxisExtent > 600) {
+                return _AlbumSelectionGrid(
+                  filteredAlbums: filteredAlbums,
+                  searchQuery: _searchQuery,
+                );
+              } else {
+                return _AlbumSelectionList(
+                  filteredAlbums: filteredAlbums,
+                  searchQuery: _searchQuery,
+                );
+              }
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _AlbumSelectionList extends StatelessWidget {
+  final List<LocalAlbum> filteredAlbums;
+  final String searchQuery;
+
+  const _AlbumSelectionList({
+    required this.filteredAlbums,
+    required this.searchQuery,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    if (filteredAlbums.isEmpty && searchQuery.isNotEmpty) {
+      return SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(24.0),
+            child: Text('album_search_not_found'.t(context: context)),
+          ),
+        ),
+      );
+    }
+
+    if (filteredAlbums.isEmpty) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: CircularProgressIndicator(),
+        ),
+      );
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(vertical: 12.0),
+      sliver: SliverList(
+        delegate: SliverChildBuilderDelegate(
+          ((context, index) {
+            return DriftAlbumInfoListTile(
+              album: filteredAlbums[index],
+            );
+          }),
+          childCount: filteredAlbums.length,
         ),
       ),
     );
   }
 }
+
+class _AlbumSelectionGrid extends StatelessWidget {
+  final List<LocalAlbum> filteredAlbums;
+  final String searchQuery;
+
+  const _AlbumSelectionGrid({
+    required this.filteredAlbums,
+    required this.searchQuery,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    if (filteredAlbums.isEmpty && searchQuery.isNotEmpty) {
+      return SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(24.0),
+            child: Text('album_search_not_found'.t(context: context)),
+          ),
+        ),
+      );
+    }
+
+    if (filteredAlbums.isEmpty) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: CircularProgressIndicator(),
+        ),
+      );
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.all(12.0),
+      sliver: SliverGrid.builder(
+        gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: 300,
+          mainAxisSpacing: 12,
+          crossAxisSpacing: 12,
+        ),
+        itemCount: filteredAlbums.length,
+        itemBuilder: ((context, index) {
+          return DriftAlbumInfoListTile(
+            album: filteredAlbums[index],
+          );
+        }),
+      ),
+    );
+  }
+}
+
+class _SelectedAlbumNameChips extends ConsumerWidget {
+  final List<LocalAlbum> selectedBackupAlbums;
+
+  const _SelectedAlbumNameChips({
+    required this.selectedBackupAlbums,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Wrap(
+      children: selectedBackupAlbums.asMap().entries.map((entry) {
+        final album = entry.value;
+
+        void removeSelection() {
+          ref.read(backupAlbumProvider.notifier).deselectAlbum(album);
+        }
+
+        return Padding(
+          padding: const EdgeInsets.only(right: 8.0),
+          child: GestureDetector(
+            onTap: removeSelection,
+            child: AnimatedContainer(
+              duration: const Duration(milliseconds: 200),
+              curve: Curves.easeInOut,
+              child: Chip(
+                label: Text(
+                  album.name,
+                  style: TextStyle(
+                    fontSize: 12,
+                    color: context.isDarkTheme ? Colors.black : Colors.white,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                backgroundColor: context.primaryColor,
+                deleteIconColor:
+                    context.isDarkTheme ? Colors.black : Colors.white,
+                deleteIcon: const Icon(
+                  Icons.cancel_rounded,
+                  size: 15,
+                ),
+                onDeleted: removeSelection,
+              ),
+            ),
+          ),
+        );
+      }).toList(),
+    );
+  }
+}
+
+class _ExcludedAlbumNameChips extends ConsumerWidget {
+  final List<LocalAlbum> excludedBackupAlbums;
+
+  const _ExcludedAlbumNameChips({
+    required this.excludedBackupAlbums,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Wrap(
+      children: excludedBackupAlbums.asMap().entries.map((entry) {
+        final album = entry.value;
+
+        void removeSelection() {
+          ref.read(backupAlbumProvider.notifier).deselectAlbum(album);
+        }
+
+        return GestureDetector(
+          onTap: removeSelection,
+          child: Padding(
+            padding: const EdgeInsets.only(right: 8.0),
+            child: AnimatedContainer(
+              duration: const Duration(milliseconds: 200),
+              curve: Curves.easeInOut,
+              child: Chip(
+                label: Text(
+                  album.name,
+                  style: TextStyle(
+                    fontSize: 12,
+                    color: context.scaffoldBackgroundColor,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                backgroundColor: Colors.red[300],
+                deleteIconColor: context.scaffoldBackgroundColor,
+                deleteIcon: const Icon(
+                  Icons.cancel_rounded,
+                  size: 15,
+                ),
+                onDeleted: removeSelection,
+              ),
+            ),
+          ),
+        );
+      }).toList(),
+    );
+  }
+}
+
+class _SelectAllButton extends ConsumerWidget {
+  final List<LocalAlbum> filteredAlbums;
+  final List<LocalAlbum> selectedBackupAlbums;
+
+  const _SelectAllButton({
+    required this.filteredAlbums,
+    required this.selectedBackupAlbums,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final canSelectAll = filteredAlbums
+        .where((album) => album.backupSelection != BackupSelection.selected)
+        .isNotEmpty;
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+      child: Row(
+        children: [
+          Expanded(
+            child: ElevatedButton.icon(
+              onPressed: canSelectAll
+                  ? () {
+                      for (final album in filteredAlbums) {
+                        if (album.backupSelection != BackupSelection.selected) {
+                          ref
+                              .read(backupAlbumProvider.notifier)
+                              .selectAlbum(album);
+                        }
+                      }
+                    }
+                  : null,
+              icon: const Icon(Icons.select_all),
+              label: AnimatedSwitcher(
+                duration: const Duration(milliseconds: 200),
+                child: Text(
+                  "select_all".t(context: context),
+                ),
+              ),
+              style: ElevatedButton.styleFrom(
+                padding: const EdgeInsets.symmetric(vertical: 12.0),
+              ),
+            ),
+          ),
+          const SizedBox(width: 8.0),
+          Expanded(
+            child: OutlinedButton.icon(
+              onPressed: selectedBackupAlbums.isNotEmpty
+                  ? () {
+                      for (final album in filteredAlbums) {
+                        if (album.backupSelection == BackupSelection.selected) {
+                          ref
+                              .read(backupAlbumProvider.notifier)
+                              .deselectAlbum(album);
+                        }
+                      }
+                    }
+                  : null,
+              icon: const Icon(Icons.deselect),
+              label: Text('deselect_all'.t(context: context)),
+              style: OutlinedButton.styleFrom(
+                padding: const EdgeInsets.symmetric(vertical: 12.0),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/pages/backup/drift_upload_detail.page.dart b/mobile/lib/pages/backup/drift_upload_detail.page.dart
new file mode 100644
index 0000000000..66803265e6
--- /dev/null
+++ b/mobile/lib/pages/backup/drift_upload_detail.page.dart
@@ -0,0 +1,428 @@
+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/translate_extensions.dart';
+import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/utils/bytes_units.dart';
+import 'package:path/path.dart' as path;
+
+@RoutePage()
+class DriftUploadDetailPage extends ConsumerWidget {
+  const DriftUploadDetailPage({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final uploadItems = ref.watch(
+      driftBackupProvider.select((state) => state.uploadItems),
+    );
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text("upload_details".t(context: context)),
+        backgroundColor: context.colorScheme.surface,
+        elevation: 0,
+        scrolledUnderElevation: 1,
+      ),
+      body: uploadItems.isEmpty
+          ? _buildEmptyState(context)
+          : _buildUploadList(uploadItems),
+    );
+  }
+
+  Widget _buildEmptyState(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Icon(
+            Icons.cloud_upload_outlined,
+            size: 80,
+            color: context.colorScheme.onSurface.withValues(alpha: 0.3),
+          ),
+          const SizedBox(height: 16),
+          Text(
+            "no_uploads_in_progress".t(context: context),
+            style: context.textTheme.titleMedium?.copyWith(
+              color: context.colorScheme.onSurface.withValues(alpha: 0.6),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildUploadList(
+    Map<String, DriftUploadStatus> uploadItems,
+  ) {
+    return ListView.separated(
+      addAutomaticKeepAlives: true,
+      padding: const EdgeInsets.all(16),
+      itemCount: uploadItems.length,
+      separatorBuilder: (context, index) => const SizedBox(height: 4),
+      itemBuilder: (context, index) {
+        final item = uploadItems.values.elementAt(index);
+        return _buildUploadCard(context, item);
+      },
+    );
+  }
+
+  Widget _buildUploadCard(
+    BuildContext context,
+    DriftUploadStatus item,
+  ) {
+    final isCompleted = item.progress >= 1.0;
+    final double progressPercentage = (item.progress * 100).clamp(0, 100);
+
+    return Card(
+      elevation: 0,
+      color: context.colorScheme.surfaceContainer,
+      shape: RoundedRectangleBorder(
+        borderRadius: const BorderRadius.all(
+          Radius.circular(16),
+        ),
+        side: BorderSide(
+          color: context.colorScheme.outline.withValues(alpha: 0.1),
+          width: 1,
+        ),
+      ),
+      child: InkWell(
+        onTap: () => _showFileDetailDialog(context, item),
+        borderRadius: const BorderRadius.all(
+          Radius.circular(16),
+        ),
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          path.basename(item.filename),
+                          style: context.textTheme.titleSmall?.copyWith(
+                            fontWeight: FontWeight.w600,
+                          ),
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                        const SizedBox(height: 4),
+                        Text(
+                          'Tap for more details',
+                          style: context.textTheme.bodySmall?.copyWith(
+                            color: context.colorScheme.onSurface
+                                .withValues(alpha: 0.6),
+                          ),
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                      ],
+                    ),
+                  ),
+                  _buildProgressIndicator(
+                    context,
+                    item.progress,
+                    progressPercentage,
+                    isCompleted,
+                    item.networkSpeedAsString,
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildProgressIndicator(
+    BuildContext context,
+    double progress,
+    double percentage,
+    bool isCompleted,
+    String networkSpeedAsString,
+  ) {
+    return Column(
+      children: [
+        Stack(
+          alignment: AlignmentDirectional.center,
+          children: [
+            SizedBox(
+              width: 36,
+              height: 36,
+              child: TweenAnimationBuilder(
+                tween: Tween<double>(begin: 0.0, end: progress),
+                duration: const Duration(milliseconds: 300),
+                builder: (context, value, _) => CircularProgressIndicator(
+                  backgroundColor:
+                      context.colorScheme.outline.withValues(alpha: 0.2),
+                  strokeWidth: 3,
+                  value: value,
+                  color: isCompleted
+                      ? context.colorScheme.primary
+                      : context.colorScheme.secondary,
+                ),
+              ),
+            ),
+            if (isCompleted)
+              Icon(
+                Icons.check_circle_rounded,
+                size: 28,
+                color: context.colorScheme.primary,
+              )
+            else
+              Text(
+                percentage.toStringAsFixed(0),
+                style: context.textTheme.labelSmall?.copyWith(
+                  fontWeight: FontWeight.bold,
+                  fontSize: 10,
+                ),
+              ),
+          ],
+        ),
+        Text(
+          networkSpeedAsString,
+          style: context.textTheme.labelSmall?.copyWith(
+            color: context.colorScheme.onSurface.withValues(alpha: 0.6),
+            fontSize: 10,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Future<void> _showFileDetailDialog(
+    BuildContext context,
+    DriftUploadStatus item,
+  ) async {
+    showDialog(
+      context: context,
+      builder: (context) => FileDetailDialog(uploadStatus: item),
+    );
+  }
+}
+
+class FileDetailDialog extends ConsumerWidget {
+  final DriftUploadStatus uploadStatus;
+
+  const FileDetailDialog({
+    super.key,
+    required this.uploadStatus,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return AlertDialog(
+      insetPadding: const EdgeInsets.all(20),
+      backgroundColor: context.colorScheme.surfaceContainerLow,
+      shape: RoundedRectangleBorder(
+        borderRadius: const BorderRadius.all(
+          Radius.circular(16),
+        ),
+        side: BorderSide(
+          color: context.colorScheme.outline.withValues(alpha: 0.2),
+          width: 1,
+        ),
+      ),
+      title: Row(
+        children: [
+          Icon(
+            Icons.info_outline,
+            color: context.primaryColor,
+            size: 24,
+          ),
+          const SizedBox(width: 8),
+          Expanded(
+            child: Text(
+              "details".t(context: context),
+              style: context.textTheme.titleMedium?.copyWith(
+                fontWeight: FontWeight.w600,
+                color: context.primaryColor,
+              ),
+            ),
+          ),
+        ],
+      ),
+      content: SizedBox(
+        width: double.maxFinite,
+        child: FutureBuilder<LocalAsset?>(
+          future: _getAssetDetails(ref, uploadStatus.taskId),
+          builder: (context, snapshot) {
+            if (snapshot.connectionState == ConnectionState.waiting) {
+              return const SizedBox(
+                height: 200,
+                child: Center(child: CircularProgressIndicator()),
+              );
+            }
+
+            final asset = snapshot.data;
+            return SingleChildScrollView(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  // Thumbnail at the top center
+                  Center(
+                    child: ClipRRect(
+                      borderRadius: const BorderRadius.all(Radius.circular(12)),
+                      child: Container(
+                        width: 128,
+                        height: 128,
+                        decoration: BoxDecoration(
+                          border: Border.all(
+                            color: context.colorScheme.outline
+                                .withValues(alpha: 0.2),
+                            width: 1,
+                          ),
+                          borderRadius:
+                              const BorderRadius.all(Radius.circular(12)),
+                        ),
+                        child: asset != null
+                            ? Thumbnail(
+                                asset: asset,
+                                size: const Size(512, 512),
+                                fit: BoxFit.cover,
+                              )
+                            : null,
+                      ),
+                    ),
+                  ),
+                  const SizedBox(height: 24),
+                  if (asset != null) ...[
+                    _buildInfoSection(context, [
+                      _buildInfoRow(
+                        context,
+                        "Filename",
+                        path.basename(uploadStatus.filename),
+                      ),
+                      _buildInfoRow(
+                        context,
+                        "Local ID",
+                        asset.id,
+                      ),
+                      _buildInfoRow(
+                        context,
+                        "File Size",
+                        formatHumanReadableBytes(uploadStatus.fileSize, 2),
+                      ),
+                      if (asset.width != null)
+                        _buildInfoRow(context, "Width", "${asset.width}px"),
+                      if (asset.height != null)
+                        _buildInfoRow(
+                          context,
+                          "Height",
+                          "${asset.height}px",
+                        ),
+                      _buildInfoRow(
+                        context,
+                        "Created At",
+                        asset.createdAt.toString(),
+                      ),
+                      _buildInfoRow(
+                        context,
+                        "Updated At",
+                        asset.updatedAt.toString(),
+                      ),
+                      if (asset.checksum != null)
+                        _buildInfoRow(
+                          context,
+                          "Checksum",
+                          asset.checksum!,
+                        ),
+                    ]),
+                  ],
+                ],
+              ),
+            );
+          },
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: Text(
+            "close".t(),
+            style: TextStyle(
+              fontWeight: FontWeight.w600,
+              color: context.primaryColor,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildInfoSection(
+    BuildContext context,
+    List<Widget> children,
+  ) {
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: context.colorScheme.surfaceContainer,
+        borderRadius: const BorderRadius.all(
+          Radius.circular(12),
+        ),
+        border: Border.all(
+          color: context.colorScheme.outline.withValues(alpha: 0.1),
+          width: 1,
+        ),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          ...children,
+        ],
+      ),
+    );
+  }
+
+  Widget _buildInfoRow(BuildContext context, String label, String value) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 4),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          SizedBox(
+            width: 100,
+            child: Text(
+              "$label:",
+              style: context.textTheme.labelMedium?.copyWith(
+                fontWeight: FontWeight.w500,
+                color: context.colorScheme.onSurface.withValues(alpha: 0.7),
+              ),
+            ),
+          ),
+          Expanded(
+            child: Text(
+              value,
+              style: context.textTheme.labelMedium?.copyWith(),
+              maxLines: 3,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<LocalAsset?> _getAssetDetails(
+    WidgetRef ref,
+    String localAssetId,
+  ) async {
+    try {
+      final repository = ref.read(localAssetRepository);
+      return await repository.getById(localAssetId);
+    } catch (e) {
+      return null;
+    }
+  }
+}
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index 671c1a6156..b0be136a15 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -3,7 +3,9 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
+import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
@@ -11,6 +13,7 @@ import 'package:immich_mobile/providers/tab.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/migration.dart';
 
 @RoutePage()
@@ -25,9 +28,19 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
       ref.read(websocketProvider.notifier).connect();
-      runNewSync(ref, full: true);
+
+      final isEnableBackup = ref
+          .read(appSettingsServiceProvider)
+          .getSetting(AppSettingsEnum.enableBackup);
+
+      await runNewSync(ref, full: true).then((_) async {
+        if (isEnableBackup) {
+          await ref.read(driftBackupProvider.notifier).handleBackupResume();
+        }
+      });
     });
   }
 
diff --git a/mobile/lib/presentation/widgets/backup/backup_toggle_button.widget.dart b/mobile/lib/presentation/widgets/backup/backup_toggle_button.widget.dart
new file mode 100644
index 0000000000..c817b9b4b6
--- /dev/null
+++ b/mobile/lib/presentation/widgets/backup/backup_toggle_button.widget.dart
@@ -0,0 +1,242 @@
+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/theme_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
+
+class BackupToggleButton extends ConsumerStatefulWidget {
+  final VoidCallback onStart;
+  final VoidCallback onStop;
+
+  const BackupToggleButton({
+    super.key,
+    required this.onStart,
+    required this.onStop,
+  });
+
+  @override
+  ConsumerState<BackupToggleButton> createState() => BackupToggleButtonState();
+}
+
+class BackupToggleButtonState extends ConsumerState<BackupToggleButton>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _animationController;
+  late Animation<double> _gradientAnimation;
+  bool _isEnabled = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _animationController = AnimationController(
+      duration: const Duration(seconds: 8),
+      vsync: this,
+    );
+
+    _gradientAnimation = Tween<double>(begin: 0, end: 1).animate(
+      CurvedAnimation(
+        parent: _animationController,
+        curve: Curves.easeInOut,
+      ),
+    );
+
+    _isEnabled = ref
+        .read(appSettingsServiceProvider)
+        .getSetting(AppSettingsEnum.enableBackup);
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _onToggle(bool value) async {
+    await ref
+        .read(appSettingsServiceProvider)
+        .setSetting(AppSettingsEnum.enableBackup, value);
+
+    setState(() {
+      _isEnabled = value;
+    });
+
+    if (value) {
+      widget.onStart.call();
+    } else {
+      widget.onStop.call();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final enqueueCount = ref.watch(
+      driftBackupProvider.select((state) => state.enqueueCount),
+    );
+
+    final enqueueTotalCount = ref.watch(
+      driftBackupProvider.select((state) => state.enqueueTotalCount),
+    );
+
+    final isCanceling = ref.watch(
+      driftBackupProvider.select((state) => state.isCanceling),
+    );
+
+    final uploadTasks = ref.watch(
+      driftBackupProvider.select((state) => state.uploadItems),
+    );
+
+    final isUploading = uploadTasks.isNotEmpty;
+
+    return AnimatedBuilder(
+      animation: _animationController,
+      builder: (context, child) {
+        final gradientColors = [
+          Color.lerp(
+            context.primaryColor.withValues(alpha: 0.5),
+            context.primaryColor.withValues(alpha: 0.3),
+            _gradientAnimation.value,
+          )!,
+          Color.lerp(
+            context.primaryColor.withValues(alpha: 0.2),
+            context.primaryColor.withValues(alpha: 0.4),
+            _gradientAnimation.value,
+          )!,
+          Color.lerp(
+            context.primaryColor.withValues(alpha: 0.3),
+            context.primaryColor.withValues(alpha: 0.5),
+            _gradientAnimation.value,
+          )!,
+        ];
+
+        return Container(
+          margin: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),
+          decoration: BoxDecoration(
+            borderRadius: const BorderRadius.all(Radius.circular(20)),
+            gradient: LinearGradient(
+              colors: gradientColors,
+              stops: const [0.0, 0.5, 1.0],
+              begin: Alignment.topLeft,
+              end: Alignment.bottomRight,
+            ),
+            boxShadow: [
+              BoxShadow(
+                color: context.primaryColor.withValues(alpha: 0.1),
+                blurRadius: 12,
+                offset: const Offset(0, 2),
+              ),
+            ],
+          ),
+          child: Container(
+            margin: const EdgeInsets.all(1.5),
+            decoration: BoxDecoration(
+              borderRadius: const BorderRadius.all(Radius.circular(18.5)),
+              color: context.colorScheme.surfaceContainerLow,
+            ),
+            child: Material(
+              color: context.colorScheme.surfaceContainerLow,
+              borderRadius: const BorderRadius.all(Radius.circular(20.5)),
+              child: InkWell(
+                borderRadius: const BorderRadius.all(Radius.circular(20.5)),
+                onTap: () => isCanceling ? null : _onToggle(!_isEnabled),
+                child: Padding(
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
+                  child: Row(
+                    children: [
+                      Container(
+                        padding: const EdgeInsets.all(8),
+                        decoration: BoxDecoration(
+                          shape: BoxShape.circle,
+                          gradient: LinearGradient(
+                            colors: [
+                              context.primaryColor.withValues(alpha: 0.2),
+                              context.primaryColor.withValues(alpha: 0.1),
+                            ],
+                          ),
+                        ),
+                        child: isUploading
+                            ? const SizedBox(
+                                width: 24,
+                                height: 24,
+                                child: CircularProgressIndicator(
+                                  strokeWidth: 2,
+                                ),
+                              )
+                            : Icon(
+                                Icons.cloud_upload_outlined,
+                                color: context.primaryColor,
+                                size: 24,
+                              ),
+                      ),
+                      const SizedBox(width: 16),
+                      Expanded(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Row(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                Text(
+                                  "enable_backup".t(context: context),
+                                  style:
+                                      context.textTheme.titleMedium?.copyWith(
+                                    fontWeight: FontWeight.w600,
+                                    color: context.primaryColor,
+                                  ),
+                                ),
+                              ],
+                            ),
+                            if (enqueueCount != enqueueTotalCount)
+                              Text(
+                                "queue_status".t(
+                                  context: context,
+                                  args: {
+                                    'count': enqueueCount.toString(),
+                                    'total': enqueueTotalCount.toString(),
+                                  },
+                                ),
+                                style: context.textTheme.labelLarge?.copyWith(
+                                  color: context.colorScheme.onSurfaceSecondary,
+                                ),
+                              ),
+                            if (isCanceling)
+                              Row(
+                                children: [
+                                  Text(
+                                    "canceling".t(),
+                                    style: context.textTheme.labelLarge,
+                                  ),
+                                  const SizedBox(width: 4),
+                                  SizedBox(
+                                    width: 18,
+                                    height: 18,
+                                    child: CircularProgressIndicator(
+                                      strokeWidth: 2,
+                                      backgroundColor: context
+                                          .colorScheme.onSurface
+                                          .withValues(alpha: 0.2),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                          ],
+                        ),
+                      ),
+                      Switch.adaptive(
+                        value: _isEnabled,
+                        onChanged: (value) =>
+                            isCanceling ? null : _onToggle(value),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/mobile/lib/providers/app_life_cycle.provider.dart b/mobile/lib/providers/app_life_cycle.provider.dart
index 5984160241..3be46d2fbd 100644
--- a/mobile/lib/providers/app_life_cycle.provider.dart
+++ b/mobile/lib/providers/app_life_cycle.provider.dart
@@ -6,10 +6,12 @@ import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/models/backup/backup_state.model.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
+import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/backup/ios_background_settings.provider.dart';
 import 'package:immich_mobile/providers/backup/manual_upload.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
@@ -18,6 +20,7 @@ import 'package:immich_mobile/providers/notification_permission.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/tab.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/background.service.dart';
 import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
@@ -69,25 +72,18 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
       }
 
       await _ref.read(serverInfoProvider.notifier).getServerVersion();
-
-      // TODO: Need to decide on how we want to handle uploads once the app is resumed
-      // await FileDownloader().start();
     }
 
     if (!Store.isBetaTimelineEnabled) {
       switch (_ref.read(tabProvider)) {
         case TabEnum.home:
           await _ref.read(assetProvider.notifier).getAllAsset();
-          break;
-        case TabEnum.search:
-          // nothing to do
-          break;
 
         case TabEnum.albums:
           await _ref.read(albumProvider.notifier).refreshRemoteAlbums();
-          break;
+
         case TabEnum.library:
-          // nothing to do
+        case TabEnum.search:
           break;
       }
     } else {
@@ -108,7 +104,15 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
             },
           ),
           backgroundManager.syncRemote(),
-        ]);
+        ]).then((_) async {
+          final isEnableBackup = _ref
+              .read(appSettingsServiceProvider)
+              .getSetting(AppSettingsEnum.enableBackup);
+
+          if (isEnableBackup) {
+            await _ref.read(driftBackupProvider.notifier).handleBackupResume();
+          }
+        });
       } catch (e, stackTrace) {
         Logger("AppLifeCycleNotifier").severe(
           "Error during background sync",
diff --git a/mobile/lib/providers/backup/backup_album.provider.dart b/mobile/lib/providers/backup/backup_album.provider.dart
index b36d3ac57e..2915c7c216 100644
--- a/mobile/lib/providers/backup/backup_album.provider.dart
+++ b/mobile/lib/providers/backup/backup_album.provider.dart
@@ -1,6 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/services/local_album.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 
 final backupAlbumProvider =
@@ -18,7 +19,8 @@ class BackupAlbumNotifier extends StateNotifier<List<LocalAlbum>> {
   final LocalAlbumService _localAlbumService;
 
   Future<void> getAll() async {
-    state = await _localAlbumService.getAll();
+    state =
+        await _localAlbumService.getAll(sortBy: {SortLocalAlbumsBy.assetCount});
   }
 
   Future<void> selectAlbum(LocalAlbum album) async {
diff --git a/mobile/lib/providers/backup/drift_backup.provider.dart b/mobile/lib/providers/backup/drift_backup.provider.dart
index 2544d208c4..c51c40775e 100644
--- a/mobile/lib/providers/backup/drift_backup.provider.dart
+++ b/mobile/lib/providers/backup/drift_backup.provider.dart
@@ -1,39 +1,75 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:background_downloader/background_downloader.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/services/drift_backup.service.dart';
 import 'package:immich_mobile/services/upload.service.dart';
 
+class EnqueueStatus {
+  final int enqueueCount;
+  final int totalCount;
+
+  const EnqueueStatus({
+    required this.enqueueCount,
+    required this.totalCount,
+  });
+
+  EnqueueStatus copyWith({
+    int? enqueueCount,
+    int? totalCount,
+  }) {
+    return EnqueueStatus(
+      enqueueCount: enqueueCount ?? this.enqueueCount,
+      totalCount: totalCount ?? this.totalCount,
+    );
+  }
+
+  @override
+  String toString() =>
+      'EnqueueStatus(enqueueCount: $enqueueCount, totalCount: $totalCount)';
+}
+
 class DriftUploadStatus {
   final String taskId;
   final String filename;
   final double progress;
+  final int fileSize;
+  final String networkSpeedAsString;
 
   const DriftUploadStatus({
     required this.taskId,
     required this.filename,
     required this.progress,
+    required this.fileSize,
+    required this.networkSpeedAsString,
   });
 
   DriftUploadStatus copyWith({
     String? taskId,
     String? filename,
     double? progress,
+    int? fileSize,
+    String? networkSpeedAsString,
   }) {
     return DriftUploadStatus(
       taskId: taskId ?? this.taskId,
       filename: filename ?? this.filename,
       progress: progress ?? this.progress,
+      fileSize: fileSize ?? this.fileSize,
+      networkSpeedAsString: networkSpeedAsString ?? this.networkSpeedAsString,
     );
   }
 
   @override
-  String toString() =>
-      'ExpUploadStatus(taskId: $taskId, filename: $filename, progress: $progress)';
+  String toString() {
+    return 'DriftUploadStatus(taskId: $taskId, filename: $filename, progress: $progress, fileSize: $fileSize, networkSpeedAsString: $networkSpeedAsString)';
+  }
 
   @override
   bool operator ==(covariant DriftUploadStatus other) {
@@ -41,23 +77,65 @@ class DriftUploadStatus {
 
     return other.taskId == taskId &&
         other.filename == filename &&
-        other.progress == progress;
+        other.progress == progress &&
+        other.fileSize == fileSize &&
+        other.networkSpeedAsString == networkSpeedAsString;
   }
 
   @override
-  int get hashCode => taskId.hashCode ^ filename.hashCode ^ progress.hashCode;
+  int get hashCode {
+    return taskId.hashCode ^
+        filename.hashCode ^
+        progress.hashCode ^
+        fileSize.hashCode ^
+        networkSpeedAsString.hashCode;
+  }
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'taskId': taskId,
+      'filename': filename,
+      'progress': progress,
+      'fileSize': fileSize,
+      'networkSpeedAsString': networkSpeedAsString,
+    };
+  }
+
+  factory DriftUploadStatus.fromMap(Map<String, dynamic> map) {
+    return DriftUploadStatus(
+      taskId: map['taskId'] as String,
+      filename: map['filename'] as String,
+      progress: map['progress'] as double,
+      fileSize: map['fileSize'] as int,
+      networkSpeedAsString: map['networkSpeedAsString'] as String,
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory DriftUploadStatus.fromJson(String source) =>
+      DriftUploadStatus.fromMap(json.decode(source) as Map<String, dynamic>);
 }
 
 class DriftBackupState {
   final int totalCount;
   final int backupCount;
   final int remainderCount;
+
+  final int enqueueCount;
+  final int enqueueTotalCount;
+
+  final bool isCanceling;
+
   final Map<String, DriftUploadStatus> uploadItems;
 
   const DriftBackupState({
     required this.totalCount,
     required this.backupCount,
     required this.remainderCount,
+    required this.enqueueCount,
+    required this.enqueueTotalCount,
+    required this.isCanceling,
     required this.uploadItems,
   });
 
@@ -65,19 +143,25 @@ class DriftBackupState {
     int? totalCount,
     int? backupCount,
     int? remainderCount,
+    int? enqueueCount,
+    int? enqueueTotalCount,
+    bool? isCanceling,
     Map<String, DriftUploadStatus>? uploadItems,
   }) {
     return DriftBackupState(
       totalCount: totalCount ?? this.totalCount,
       backupCount: backupCount ?? this.backupCount,
       remainderCount: remainderCount ?? this.remainderCount,
+      enqueueCount: enqueueCount ?? this.enqueueCount,
+      enqueueTotalCount: enqueueTotalCount ?? this.enqueueTotalCount,
+      isCanceling: isCanceling ?? this.isCanceling,
       uploadItems: uploadItems ?? this.uploadItems,
     );
   }
 
   @override
   String toString() {
-    return 'ExpBackupState(totalCount: $totalCount, backupCount: $backupCount, remainderCount: $remainderCount, uploadItems: $uploadItems)';
+    return 'DriftBackupState(totalCount: $totalCount, backupCount: $backupCount, remainderCount: $remainderCount, enqueueCount: $enqueueCount, enqueueTotalCount: $enqueueTotalCount, isCanceling: $isCanceling, uploadItems: $uploadItems)';
   }
 
   @override
@@ -88,6 +172,9 @@ class DriftBackupState {
     return other.totalCount == totalCount &&
         other.backupCount == backupCount &&
         other.remainderCount == remainderCount &&
+        other.enqueueCount == enqueueCount &&
+        other.enqueueTotalCount == enqueueTotalCount &&
+        other.isCanceling == isCanceling &&
         mapEquals(other.uploadItems, uploadItems);
   }
 
@@ -96,6 +183,9 @@ class DriftBackupState {
     return totalCount.hashCode ^
         backupCount.hashCode ^
         remainderCount.hashCode ^
+        enqueueCount.hashCode ^
+        enqueueTotalCount.hashCode ^
+        isCanceling.hashCode ^
         uploadItems.hashCode;
   }
 }
@@ -117,6 +207,9 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
             totalCount: 0,
             backupCount: 0,
             remainderCount: 0,
+            enqueueCount: 0,
+            enqueueTotalCount: 0,
+            isCanceling: false,
             uploadItems: {},
           ),
         ) {
@@ -131,13 +224,39 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
   StreamSubscription<TaskStatusUpdate>? _statusSubscription;
   StreamSubscription<TaskProgressUpdate>? _progressSubscription;
 
+  /// Remove upload item from state
+  void _removeUploadItem(String taskId) {
+    if (state.uploadItems.containsKey(taskId)) {
+      final updatedItems =
+          Map<String, DriftUploadStatus>.from(state.uploadItems);
+      updatedItems.remove(taskId);
+      state = state.copyWith(uploadItems: updatedItems);
+    }
+  }
+
   void _handleTaskStatusUpdate(TaskStatusUpdate update) {
     switch (update.status) {
       case TaskStatus.complete:
-        state = state.copyWith(
-          backupCount: state.backupCount + 1,
-          remainderCount: state.remainderCount - 1,
-        );
+        if (update.task.group == kBackupGroup) {
+          state = state.copyWith(
+            backupCount: state.backupCount + 1,
+            remainderCount: state.remainderCount - 1,
+          );
+        }
+
+        // Remove the completed task from the upload items
+        final taskId = update.task.taskId;
+        if (state.uploadItems.containsKey(taskId)) {
+          Future.delayed(const Duration(milliseconds: 500), () {
+            _removeUploadItem(taskId);
+          });
+        }
+
+      case TaskStatus.failed:
+        break;
+
+      case TaskStatus.canceled:
+        _removeUploadItem(update.task.taskId);
         break;
 
       default:
@@ -145,7 +264,48 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
     }
   }
 
-  void _handleTaskProgressUpdate(TaskProgressUpdate update) {}
+  void _handleTaskProgressUpdate(TaskProgressUpdate update) {
+    final taskId = update.task.taskId;
+    final filename = update.task.displayName;
+    final progress = update.progress;
+    final currentItem = state.uploadItems[taskId];
+    if (currentItem != null) {
+      if (progress == kUploadStatusCanceled) {
+        _removeUploadItem(update.task.taskId);
+        return;
+      }
+
+      state = state.copyWith(
+        uploadItems: {
+          ...state.uploadItems,
+          taskId: update.hasExpectedFileSize
+              ? currentItem.copyWith(
+                  progress: progress,
+                  fileSize: update.expectedFileSize,
+                  networkSpeedAsString: update.networkSpeedAsString,
+                )
+              : currentItem.copyWith(
+                  progress: progress,
+                ),
+        },
+      );
+
+      return;
+    }
+
+    state = state.copyWith(
+      uploadItems: {
+        ...state.uploadItems,
+        taskId: DriftUploadStatus(
+          taskId: taskId,
+          filename: filename,
+          progress: progress,
+          fileSize: update.expectedFileSize,
+          networkSpeedAsString: update.networkSpeedAsString,
+        ),
+      },
+    );
+  }
 
   Future<void> getBackupStatus() async {
     final [totalCount, backupCount, remainderCount] = await Future.wait([
@@ -162,27 +322,50 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
   }
 
   Future<void> backup() {
-    return _backupService.backup();
+    return _backupService.backup(_updateEnqueueCount);
+  }
+
+  void _updateEnqueueCount(EnqueueStatus status) {
+    state = state.copyWith(
+      enqueueCount: status.enqueueCount,
+      enqueueTotalCount: status.totalCount,
+    );
   }
 
   Future<void> cancel() async {
+    state = state.copyWith(
+      enqueueCount: 0,
+      enqueueTotalCount: 0,
+      isCanceling: true,
+    );
+
     await _backupService.cancel();
-    await getDataInfo();
+
+    // Check if there are any tasks left in the queue
+    final tasks = await FileDownloader().allTasks(group: kBackupGroup);
+
+    debugPrint("Tasks left to cancel: ${tasks.length}");
+
+    if (tasks.isNotEmpty) {
+      await cancel();
+    } else {
+      // Clear all upload items when cancellation is complete
+      state = state.copyWith(
+        isCanceling: false,
+        uploadItems: {},
+      );
+    }
   }
 
-  Future<void> getDataInfo() async {
-    final a = await FileDownloader().database.allRecordsWithStatus(
-          TaskStatus.enqueued,
-          group: kBackupGroup,
-        );
+  Future<void> handleBackupResume() async {
+    final tasks = await FileDownloader().allTasks(group: kBackupGroup);
+    if (tasks.isEmpty) {
+      // Start a new backup queue
+      await backup();
+    }
 
-    final b = await FileDownloader().allTasks(
-      group: kBackupGroup,
-    );
-
-    debugPrint(
-      "Enqueued tasks: ${a.length}, All tasks: ${b.length}",
-    );
+    debugPrint("Tasks to resume: ${tasks.length}");
+    await FileDownloader().start();
   }
 
   @override
diff --git a/mobile/lib/providers/websocket.provider.dart b/mobile/lib/providers/websocket.provider.dart
index 05fe5a087c..2718738286 100644
--- a/mobile/lib/providers/websocket.provider.dart
+++ b/mobile/lib/providers/websocket.provider.dart
@@ -12,6 +12,7 @@ import 'package:immich_mobile/models/server_info/server_version.model.dart';
 import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
+// import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
@@ -177,9 +178,15 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
         });
 
         if (!Store.isBetaTimelineEnabled) {
-          startListeningToOldEvents();
+          socket.on('on_upload_success', _handleOnUploadSuccess);
+          socket.on('on_asset_delete', _handleOnAssetDelete);
+          socket.on('on_asset_trash', _handleOnAssetTrash);
+          socket.on('on_asset_restore', _handleServerUpdates);
+          socket.on('on_asset_update', _handleServerUpdates);
+          socket.on('on_asset_stack_update', _handleServerUpdates);
+          socket.on('on_asset_hidden', _handleOnAssetHidden);
         } else {
-          startListeningToBetaEvents();
+          socket.on('AssetUploadReadyV1', _handleSyncAssetUploadReady);
         }
 
         socket.on('on_config_update', _handleOnConfigUpdate);
@@ -207,7 +214,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
   }
 
   void stopListenToEvent(String eventName) {
-    debugPrint("Stop listening to event $eventName");
     state.socket?.off(eventName);
   }
 
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index d7dd45dbd9..d0f8852dc3 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -27,6 +27,7 @@ import 'package:immich_mobile/pages/backup/drift_backup.page.dart';
 import 'package:immich_mobile/pages/backup/backup_album_selection.page.dart';
 import 'package:immich_mobile/pages/backup/backup_controller.page.dart';
 import 'package:immich_mobile/pages/backup/backup_options.page.dart';
+import 'package:immich_mobile/pages/backup/drift_upload_detail.page.dart';
 import 'package:immich_mobile/pages/backup/failed_backup_status.page.dart';
 import 'package:immich_mobile/pages/common/activities.page.dart';
 import 'package:immich_mobile/pages/common/app_log.page.dart';
@@ -484,6 +485,10 @@ class AppRouter extends RootStackRouter {
       page: ChangeExperienceRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: DriftUploadDetailRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index c72dc62765..c9ed8a40a3 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -1078,6 +1078,22 @@ class DriftTrashRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftUploadDetailPage]
+class DriftUploadDetailRoute extends PageRouteInfo<void> {
+  const DriftUploadDetailRoute({List<PageRouteInfo>? children})
+      : super(DriftUploadDetailRoute.name, initialChildren: children);
+
+  static const String name = 'DriftUploadDetailRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftUploadDetailPage();
+    },
+  );
+}
+
 /// generated route for
 /// [DriftUserSelectionPage]
 class DriftUserSelectionRoute
diff --git a/mobile/lib/services/app_settings.service.dart b/mobile/lib/services/app_settings.service.dart
index 982dab1cae..cefc52385a 100644
--- a/mobile/lib/services/app_settings.service.dart
+++ b/mobile/lib/services/app_settings.service.dart
@@ -91,6 +91,7 @@ enum AppSettingsEnum<T> {
     true,
   ),
   betaTimeline<bool>(StoreKey.betaTimeline, null, false),
+  enableBackup<bool>(StoreKey.enableBackup, null, false),
   ;
 
   const AppSettingsEnum(this.storeKey, this.hiveKey, this.defaultValue);
diff --git a/mobile/lib/services/drift_backup.service.dart b/mobile/lib/services/drift_backup.service.dart
index 5966aad304..2f51c261fb 100644
--- a/mobile/lib/services/drift_backup.service.dart
+++ b/mobile/lib/services/drift_backup.service.dart
@@ -9,6 +9,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.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/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 import 'package:immich_mobile/services/upload.service.dart';
@@ -55,7 +56,9 @@ class DriftBackupService {
     return _backupRepository.getBackupCount();
   }
 
-  Future<void> backup() async {
+  Future<void> backup(
+    void Function(EnqueueStatus status) onEnqueueTasks,
+  ) async {
     shouldCancel = false;
 
     final candidates = await _backupRepository.getCandidates();
@@ -83,8 +86,12 @@ class DriftBackupService {
       if (tasks.isNotEmpty && !shouldCancel) {
         count += tasks.length;
         _uploadService.enqueueTasks(tasks);
-        debugPrint(
-          "Enqueued $count/${candidates.length} tasks for backup",
+
+        onEnqueueTasks(
+          EnqueueStatus(
+            enqueueCount: count,
+            totalCount: candidates.length,
+          ),
         );
       }
     }
@@ -213,7 +220,7 @@ class DriftBackupService {
       deviceAssetId: asset.id,
       fields: fields,
       group: kBackupLivePhotoGroup,
-      priority: 0,
+      priority: 0, // Highest priority to get upload immediately
     );
   }
 
diff --git a/mobile/lib/services/upload.service.dart b/mobile/lib/services/upload.service.dart
index 60aab4a16c..b869624e52 100644
--- a/mobile/lib/services/upload.service.dart
+++ b/mobile/lib/services/upload.service.dart
@@ -134,6 +134,7 @@ class UploadService {
       group: group,
       priority: priority ?? 5,
       updates: Updates.statusAndProgress,
+      retries: 3,
     );
   }
 }
diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
index 2b020d20ee..c7ddeca6e0 100644
--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -1,5 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -83,6 +84,11 @@ class ImmichSliverAppBar extends ConsumerWidget {
                 child: action,
               ),
             ),
+          if (kDebugMode || kProfileMode)
+            IconButton(
+              icon: const Icon(Icons.science_rounded),
+              onPressed: () => context.pushRoute(const FeatInDevRoute()),
+            ),
           if (showUploadButton)
             const Padding(
               padding: EdgeInsets.only(right: 20),
diff --git a/mobile/lib/widgets/settings/beta_timeline_list_tile.dart b/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
index 1de3a6e7ab..a9c873cb67 100644
--- a/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
+++ b/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
@@ -90,6 +90,19 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
                       ),
                 actions: [
                   TextButton(
+                    onPressed: () {
+                      context.pop();
+                    },
+                    child: Text(
+                      "cancel".t(context: context),
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                        color: context.colorScheme.outline,
+                      ),
+                    ),
+                  ),
+                  ElevatedButton(
                     onPressed: () async {
                       Navigator.of(context).pop();
                       await ref.read(appSettingsServiceProvider).setSetting(
@@ -101,25 +114,7 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
                       );
                     },
                     child: Text(
-                      "YES",
-                      style: TextStyle(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w500,
-                        color: context.primaryColor,
-                      ),
-                    ),
-                  ),
-                  TextButton(
-                    onPressed: () {
-                      context.pop();
-                    },
-                    child: Text(
-                      "NO",
-                      style: TextStyle(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w500,
-                        color: context.colorScheme.outline,
-                      ),
+                      "ok".t(context: context),
                     ),
                   ),
                 ],
@@ -135,13 +130,13 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
             _gradientAnimation.value,
           )!,
           Color.lerp(
-            context.primaryColor.withValues(alpha: 0.4),
-            context.primaryColor.withValues(alpha: 0.6),
+            context.logoPink.withValues(alpha: 0.2),
+            context.logoPink.withValues(alpha: 0.4),
             _gradientAnimation.value,
           )!,
           Color.lerp(
-            context.primaryColor.withValues(alpha: 0.3),
-            context.primaryColor.withValues(alpha: 0.5),
+            context.logoRed.withValues(alpha: 0.3),
+            context.logoRed.withValues(alpha: 0.5),
             _gradientAnimation.value,
           )!,
         ];
@@ -155,7 +150,7 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
               stops: const [0.0, 0.5, 1.0],
               begin: Alignment.topLeft,
               end: Alignment.bottomRight,
-              transform: GradientRotation(_rotationAnimation.value * 0.1),
+              transform: GradientRotation(_rotationAnimation.value * 0.5),
             ),
             boxShadow: [
               BoxShadow(
@@ -166,13 +161,12 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
             ],
           ),
           child: Container(
-            margin: const EdgeInsets.all(1.5),
+            margin: const EdgeInsets.all(2),
             decoration: BoxDecoration(
               borderRadius: const BorderRadius.all(Radius.circular(10.5)),
               color: context.scaffoldBackgroundColor,
             ),
             child: Material(
-              color: Colors.transparent,
               borderRadius: const BorderRadius.all(Radius.circular(10.5)),
               child: InkWell(
                 borderRadius: const BorderRadius.all(Radius.circular(10.5)),
@@ -205,7 +199,7 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
                           ),
                         ),
                       ),
-                      const SizedBox(width: 16),
+                      const SizedBox(width: 28),
                       Expanded(
                         child: Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
@@ -259,8 +253,9 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
                                   .t(context: context),
                               style: context.textTheme.labelLarge?.copyWith(
                                 color: context.textTheme.labelLarge?.color
-                                    ?.withValues(alpha: 0.7),
+                                    ?.withValues(alpha: 0.9),
                               ),
+                              maxLines: 2,
                             ),
                           ],
                         ),

From 7ea878359367f9076fd64fe28d8b9f12d350b84e Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Tue, 22 Jul 2025 03:18:22 +0530
Subject: [PATCH 255/337] chore: do not render drift migration auto gen files
 (#20060)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .gitattributes | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 3d43ff20ed..e3fb061bbc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,6 +12,12 @@ mobile/lib/**/*.drift.dart linguist-generated=true
 mobile/drift_schemas/main/drift_schema_*.json -diff -merge
 mobile/drift_schemas/main/drift_schema_*.json linguist-generated=true
 
+mobile/lib/infrastructure/repositories/db.repository.steps.dart -diff -merge
+mobile/lib/infrastructure/repositories/db.repository.steps.dart linguist-generated=true
+
+mobile/test/drift/main/generated/** -diff -merge
+mobile/test/drift/main/generated/** linguist-generated=true
+
 open-api/typescript-sdk/fetch-client.ts -diff -merge
 open-api/typescript-sdk/fetch-client.ts linguist-generated=true
 

From 99e5b33969bcb172f26ca72406d4e081987c3ec8 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Mon, 21 Jul 2025 14:51:16 -0700
Subject: [PATCH 256/337] feat: add favorites support to android widget
 (#20061)

---
 .../app/alextran/immich/widget/ImageDownloadWorker.kt | 11 +++++++----
 .../immich/widget/configure/RandomConfigure.kt        |  2 +-
 .../kotlin/app/alextran/immich/widget/model/Model.kt  |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImageDownloadWorker.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImageDownloadWorker.kt
index 2a23d0ecbd..3915f291f8 100644
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImageDownloadWorker.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/ImageDownloadWorker.kt
@@ -169,13 +169,16 @@ class ImageDownloadWorker(
   ): WidgetEntry {
     val api = ImmichAPI(serverConfig)
 
-    val filters = SearchFilters(AssetType.IMAGE)
+    val filters = SearchFilters()
     val albumId = widgetConfig[kSelectedAlbum]
     val showSubtitle = widgetConfig[kShowAlbumName]
     val albumName = widgetConfig[kSelectedAlbumName]
     var subtitle: String? = if (showSubtitle == true) albumName else ""
 
-    if (albumId != null) {
+
+    if (albumId == "FAVORITES") {
+      filters.isFavorite = true
+    } else if (albumId != null) {
       filters.albumIds = listOf(albumId)
     }
 
@@ -183,7 +186,7 @@ class ImageDownloadWorker(
 
     // handle an empty album, fallback to random
     if (randomSearch.isEmpty() && albumId != null) {
-      randomSearch = api.fetchSearchResults(SearchFilters(AssetType.IMAGE))
+      randomSearch = api.fetchSearchResults(SearchFilters())
       subtitle = ""
     }
 
@@ -215,7 +218,7 @@ class ImageDownloadWorker(
       val yearDiff = today.year - memory.data.year
       subtitle = "$yearDiff ${if (yearDiff == 1) "year" else "years"} ago"
     } else {
-      val filters = SearchFilters(AssetType.IMAGE, size=1)
+      val filters = SearchFilters(size=1)
       asset = api.fetchSearchResults(filters).first()
     }
 
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/RandomConfigure.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/RandomConfigure.kt
index d0490c023e..83e404a8f1 100644
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/RandomConfigure.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/configure/RandomConfigure.kt
@@ -98,7 +98,7 @@ fun RandomConfiguration(context: Context, appWidgetId: Int, glanceId: GlanceId,
       albumItems = listOf(DropdownItem(currentAlbumName, currentAlbumId))
     }
 
-    availableAlbums = listOf(DropdownItem("None", "NONE")) + albumItems
+    availableAlbums = listOf(DropdownItem("None", "NONE"), DropdownItem("Favorites", "FAVORITES")) + albumItems
 
     // load selected configuration
     val albumEntity = availableAlbums.firstOrNull { it.id == currentAlbumId }
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/model/Model.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/model/Model.kt
index 2337de0612..9595a3b696 100644
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/model/Model.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/widget/model/Model.kt
@@ -17,7 +17,8 @@ data class Asset(
 data class SearchFilters(
   var type: AssetType = AssetType.IMAGE,
   val size: Int = 1,
-  var albumIds: List<String> = listOf()
+  var albumIds: List<String> = listOf(),
+  var isFavorite: Boolean? = null
 )
 
 data class MemoryResult(

From 737e768212d1bb758b74ada600a83a9a922f7f1c Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 21 Jul 2025 16:58:53 -0500
Subject: [PATCH 257/337] feat: drift partners (#20051)

* feat: drift toggle partner in timeline

* partners operation

* fix: lint
---
 mobile/lib/domain/models/user.model.dart      |  88 ++++++++++
 .../lib/domain/services/partner.service.dart  |  61 +++++++
 .../repositories/partner.repository.dart      | 164 ++++++++++++++++++
 .../library/partner/drift_partner.page.dart   | 161 +++++++++++++++++
 .../pages/drift_library.page.dart             |  16 +-
 .../pages/drift_partner_detail.page.dart      |  64 +++++--
 .../widgets/partner_user_avatar.widget.dart   |  32 ++++
 .../infrastructure/partner.provider.dart      |  92 ++++++++++
 .../infrastructure/user.provider.dart         |  22 +++
 mobile/lib/routing/router.dart                |   6 +
 mobile/lib/routing/router.gr.dart             |  20 ++-
 11 files changed, 703 insertions(+), 23 deletions(-)
 create mode 100644 mobile/lib/domain/services/partner.service.dart
 create mode 100644 mobile/lib/infrastructure/repositories/partner.repository.dart
 create mode 100644 mobile/lib/pages/library/partner/drift_partner.page.dart
 create mode 100644 mobile/lib/presentation/widgets/partner_user_avatar.widget.dart
 create mode 100644 mobile/lib/providers/infrastructure/partner.provider.dart

diff --git a/mobile/lib/domain/models/user.model.dart b/mobile/lib/domain/models/user.model.dart
index abf2e5620b..6cafd8d149 100644
--- a/mobile/lib/domain/models/user.model.dart
+++ b/mobile/lib/domain/models/user.model.dart
@@ -1,3 +1,6 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
+import 'dart:convert';
+
 import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 
 // TODO: Rename to User once Isar is removed
@@ -123,3 +126,88 @@ quotaSizeInBytes: $quotaSizeInBytes,
       quotaUsageInBytes.hashCode ^
       quotaSizeInBytes.hashCode;
 }
+
+class PartnerUserDto {
+  final String id;
+  final String email;
+  final String name;
+  final bool inTimeline;
+
+  final String? profileImagePath;
+
+  const PartnerUserDto({
+    required this.id,
+    required this.email,
+    required this.name,
+    required this.inTimeline,
+    this.profileImagePath,
+  });
+
+  PartnerUserDto copyWith({
+    String? id,
+    String? email,
+    String? name,
+    bool? inTimeline,
+    String? profileImagePath,
+  }) {
+    return PartnerUserDto(
+      id: id ?? this.id,
+      email: email ?? this.email,
+      name: name ?? this.name,
+      inTimeline: inTimeline ?? this.inTimeline,
+      profileImagePath: profileImagePath ?? this.profileImagePath,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'id': id,
+      'email': email,
+      'name': name,
+      'inTimeline': inTimeline,
+      'profileImagePath': profileImagePath,
+    };
+  }
+
+  factory PartnerUserDto.fromMap(Map<String, dynamic> map) {
+    return PartnerUserDto(
+      id: map['id'] as String,
+      email: map['email'] as String,
+      name: map['name'] as String,
+      inTimeline: map['inTimeline'] as bool,
+      profileImagePath: map['profileImagePath'] != null
+          ? map['profileImagePath'] as String
+          : null,
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory PartnerUserDto.fromJson(String source) =>
+      PartnerUserDto.fromMap(json.decode(source) as Map<String, dynamic>);
+
+  @override
+  String toString() {
+    return 'PartnerUserDto(id: $id, email: $email, name: $name, inTimeline: $inTimeline, profileImagePath: $profileImagePath)';
+  }
+
+  @override
+  bool operator ==(covariant PartnerUserDto other) {
+    if (identical(this, other)) return true;
+
+    return other.id == id &&
+        other.email == email &&
+        other.name == name &&
+        other.inTimeline == inTimeline &&
+        other.profileImagePath == profileImagePath;
+  }
+
+  @override
+  int get hashCode {
+    return id.hashCode ^
+        email.hashCode ^
+        name.hashCode ^
+        inTimeline.hashCode ^
+        profileImagePath.hashCode;
+  }
+}
diff --git a/mobile/lib/domain/services/partner.service.dart b/mobile/lib/domain/services/partner.service.dart
new file mode 100644
index 0000000000..065560c4be
--- /dev/null
+++ b/mobile/lib/domain/services/partner.service.dart
@@ -0,0 +1,61 @@
+import 'package:flutter/foundation.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/partner.repository.dart';
+import 'package:immich_mobile/repositories/partner_api.repository.dart';
+
+class DriftPartnerService {
+  final DriftPartnerRepository _driftPartnerRepository;
+  final PartnerApiRepository _partnerApiRepository;
+
+  const DriftPartnerService(
+    this._driftPartnerRepository,
+    this._partnerApiRepository,
+  );
+
+  Future<List<PartnerUserDto>> getSharedWith(String userId) {
+    return _driftPartnerRepository.getSharedWith(userId);
+  }
+
+  Future<List<PartnerUserDto>> getSharedBy(String userId) {
+    return _driftPartnerRepository.getSharedBy(userId);
+  }
+
+  Future<List<PartnerUserDto>> getAvailablePartners(
+    String currentUserId,
+  ) async {
+    final otherUsers =
+        await _driftPartnerRepository.getAvailablePartners(currentUserId);
+    final currentPartners =
+        await _driftPartnerRepository.getSharedBy(currentUserId);
+    final available = otherUsers.where((user) {
+      return !currentPartners.any((partner) => partner.id == user.id);
+    }).toList();
+
+    return available;
+  }
+
+  Future<void> toggleShowInTimeline(String partnerId, String userId) async {
+    final partner = await _driftPartnerRepository.getPartner(partnerId, userId);
+    if (partner == null) {
+      debugPrint("Partner not found: $partnerId for user: $userId");
+      return;
+    }
+
+    await _partnerApiRepository.update(
+      partnerId,
+      inTimeline: !partner.inTimeline,
+    );
+
+    await _driftPartnerRepository.toggleShowInTimeline(partner, userId);
+  }
+
+  Future<void> addPartner(String partnerId, String userId) async {
+    await _partnerApiRepository.create(partnerId);
+    await _driftPartnerRepository.create(partnerId, userId);
+  }
+
+  Future<void> removePartner(String partnerId, String userId) async {
+    await _partnerApiRepository.delete(partnerId);
+    await _driftPartnerRepository.delete(partnerId, userId);
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/partner.repository.dart b/mobile/lib/infrastructure/repositories/partner.repository.dart
new file mode 100644
index 0000000000..b3b057b035
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/partner.repository.dart
@@ -0,0 +1,164 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class DriftPartnerRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftPartnerRepository(this._db) : super(_db);
+
+  Future<List<PartnerUserDto>> getPartners(String userId) {
+    final query = _db.select(_db.partnerEntity).join([
+      innerJoin(
+        _db.userEntity,
+        _db.userEntity.id.equalsExp(_db.partnerEntity.sharedById),
+      ),
+    ])
+      ..where(
+        _db.partnerEntity.sharedWithId.equals(userId),
+      );
+
+    return query.map((row) {
+      final user = row.readTable(_db.userEntity);
+      final partner = row.readTable(_db.partnerEntity);
+      return PartnerUserDto(
+        id: user.id,
+        email: user.email,
+        name: user.name,
+        inTimeline: partner.inTimeline,
+      );
+    }).get();
+  }
+
+  // Get users who we can share our library with
+  Future<List<PartnerUserDto>> getAvailablePartners(String currentUserId) {
+    final query = _db.select(_db.userEntity)
+      ..where((row) => row.id.equals(currentUserId).not());
+
+    return query.map((user) {
+      return PartnerUserDto(
+        id: user.id,
+        email: user.email,
+        name: user.name,
+        inTimeline: false,
+      );
+    }).get();
+  }
+
+  // Get users who are sharing their photos WITH the current user
+  Future<List<PartnerUserDto>> getSharedWith(String partnerId) {
+    final query = _db.select(_db.partnerEntity).join([
+      innerJoin(
+        _db.userEntity,
+        _db.userEntity.id.equalsExp(_db.partnerEntity.sharedById),
+      ),
+    ])
+      ..where(
+        _db.partnerEntity.sharedWithId.equals(partnerId),
+      );
+
+    return query.map((row) {
+      final user = row.readTable(_db.userEntity);
+      final partner = row.readTable(_db.partnerEntity);
+      return PartnerUserDto(
+        id: user.id,
+        email: user.email,
+        name: user.name,
+        inTimeline: partner.inTimeline,
+      );
+    }).get();
+  }
+
+  // Get users who the current user is sharing their photos TO
+  Future<List<PartnerUserDto>> getSharedBy(String userId) {
+    final query = _db.select(_db.partnerEntity).join([
+      innerJoin(
+        _db.userEntity,
+        _db.userEntity.id.equalsExp(_db.partnerEntity.sharedWithId),
+      ),
+    ])
+      ..where(
+        _db.partnerEntity.sharedById.equals(userId),
+      );
+
+    return query.map((row) {
+      final user = row.readTable(_db.userEntity);
+      final partner = row.readTable(_db.partnerEntity);
+      return PartnerUserDto(
+        id: user.id,
+        email: user.email,
+        name: user.name,
+        inTimeline: partner.inTimeline,
+      );
+    }).get();
+  }
+
+  Future<List<String>> getAllPartnerIds(String userId) async {
+    // Get users who are sharing with me (sharedWithId = userId)
+    final sharingWithMeQuery = _db.select(_db.partnerEntity)
+      ..where((tbl) => tbl.sharedWithId.equals(userId));
+    final sharingWithMe =
+        await sharingWithMeQuery.map((row) => row.sharedById).get();
+
+    // Get users who I am sharing with (sharedById = userId)
+    final sharingWithThemQuery = _db.select(_db.partnerEntity)
+      ..where((tbl) => tbl.sharedById.equals(userId));
+    final sharingWithThem =
+        await sharingWithThemQuery.map((row) => row.sharedWithId).get();
+
+    // Combine both lists and remove duplicates
+    final allPartnerIds =
+        <String>{...sharingWithMe, ...sharingWithThem}.toList();
+    return allPartnerIds;
+  }
+
+  Future<PartnerUserDto?> getPartner(String partnerId, String userId) {
+    final query = _db.select(_db.partnerEntity).join([
+      innerJoin(
+        _db.userEntity,
+        _db.userEntity.id.equalsExp(_db.partnerEntity.sharedById),
+      ),
+    ])
+      ..where(
+        _db.partnerEntity.sharedById.equals(partnerId) &
+            _db.partnerEntity.sharedWithId.equals(userId),
+      );
+
+    return query.map((row) {
+      final user = row.readTable(_db.userEntity);
+      final partner = row.readTable(_db.partnerEntity);
+      return PartnerUserDto(
+        id: user.id,
+        email: user.email,
+        name: user.name,
+        inTimeline: partner.inTimeline,
+      );
+    }).getSingleOrNull();
+  }
+
+  Future<bool> toggleShowInTimeline(PartnerUserDto partner, String userId) {
+    return _db.partnerEntity.update().replace(
+          PartnerEntityCompanion(
+            sharedById: Value(partner.id),
+            sharedWithId: Value(userId),
+            inTimeline: Value(!partner.inTimeline),
+          ),
+        );
+  }
+
+  Future<int> create(String partnerId, String userId) {
+    final entity = PartnerEntityCompanion(
+      sharedById: Value(userId),
+      sharedWithId: Value(partnerId),
+      inTimeline: const Value(false),
+    );
+
+    return _db.partnerEntity.insertOne(entity);
+  }
+
+  Future<void> delete(String partnerId, String userId) {
+    return _db.partnerEntity.deleteWhere(
+      (t) => t.sharedById.equals(userId) & t.sharedWithId.equals(partnerId),
+    );
+  }
+}
diff --git a/mobile/lib/pages/library/partner/drift_partner.page.dart b/mobile/lib/pages/library/partner/drift_partner.page.dart
new file mode 100644
index 0000000000..04efbe066c
--- /dev/null
+++ b/mobile/lib/pages/library/partner/drift_partner.page.dart
@@ -0,0 +1,161 @@
+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/domain/models/user.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/partner_user_avatar.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/partner.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
+import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+@RoutePage()
+class DriftPartnerPage extends HookConsumerWidget {
+  const DriftPartnerPage({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final potentialPartnersAsync = ref.watch(driftAvailablePartnerProvider);
+
+    addNewUsersHandler() async {
+      final potentialPartners = potentialPartnersAsync.value;
+      if (potentialPartners == null || potentialPartners.isEmpty) {
+        ImmichToast.show(
+          context: context,
+          msg: "partner_page_no_more_users".tr(),
+        );
+        return;
+      }
+
+      final selectedUser = await showDialog<PartnerUserDto>(
+        context: context,
+        builder: (context) {
+          return SimpleDialog(
+            title: const Text("partner_page_select_partner").tr(),
+            children: [
+              for (PartnerUserDto partner in potentialPartners)
+                SimpleDialogOption(
+                  onPressed: () => context.pop(partner),
+                  child: Row(
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.only(right: 8),
+                        child: PartnerUserAvatar(partner: partner),
+                      ),
+                      Text(partner.name),
+                    ],
+                  ),
+                ),
+            ],
+          );
+        },
+      );
+      if (selectedUser != null) {
+        await ref.read(partnerUsersProvider.notifier).addPartner(selectedUser);
+      }
+    }
+
+    onDeleteUser(PartnerUserDto partner) {
+      return showDialog(
+        context: context,
+        builder: (BuildContext context) {
+          return ConfirmDialog(
+            title: "stop_photo_sharing",
+            content: "partner_page_stop_sharing_content"
+                .tr(namedArgs: {'partner': partner.name}),
+            onOk: () =>
+                ref.read(partnerUsersProvider.notifier).removePartner(partner),
+          );
+        },
+      );
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text("partners").t(context: context),
+        elevation: 0,
+        centerTitle: false,
+        actions: [
+          IconButton(
+            onPressed: potentialPartnersAsync.whenOrNull(
+              data: (data) => addNewUsersHandler,
+            ),
+            icon: const Icon(Icons.person_add),
+            tooltip: "add_partner".tr(),
+          ),
+        ],
+      ),
+      body: _SharedToPartnerList(
+        onAddPartner: addNewUsersHandler,
+        onDeletePartner: onDeleteUser,
+      ),
+    );
+  }
+}
+
+class _SharedToPartnerList extends ConsumerWidget {
+  final VoidCallback onAddPartner;
+  final Function(PartnerUserDto partner) onDeletePartner;
+
+  const _SharedToPartnerList({
+    required this.onAddPartner,
+    required this.onDeletePartner,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final partnerAsync = ref.watch(driftSharedByPartnerProvider);
+
+    return partnerAsync.when(
+      data: (partners) {
+        if (partners.isEmpty) {
+          return Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 8),
+                  child: const Text(
+                    "partner_page_empty_message",
+                    style: TextStyle(fontSize: 14),
+                  ).tr(),
+                ),
+                Align(
+                  alignment: Alignment.center,
+                  child: ElevatedButton.icon(
+                    onPressed: onAddPartner,
+                    icon: const Icon(Icons.person_add),
+                    label: const Text("add_partner").tr(),
+                  ),
+                ),
+              ],
+            ),
+          );
+        }
+
+        return ListView.builder(
+          itemCount: partners.length,
+          itemBuilder: (context, index) {
+            final partner = partners[index];
+            return ListTile(
+              leading: PartnerUserAvatar(partner: partner),
+              title: Text(partner.name),
+              subtitle: Text(partner.email),
+              trailing: IconButton(
+                icon: const Icon(Icons.person_remove),
+                onPressed: () => onDeletePartner(partner),
+              ),
+            );
+          },
+        );
+      },
+      loading: () => const Center(child: CircularProgressIndicator()),
+      error: (error, stack) => Center(
+        child: Text("Error loading partners: $error"),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/pages/drift_library.page.dart b/mobile/lib/presentation/pages/drift_library.page.dart
index 552733980e..eba0a5ea81 100644
--- a/mobile/lib/presentation/pages/drift_library.page.dart
+++ b/mobile/lib/presentation/pages/drift_library.page.dart
@@ -6,15 +6,15 @@ import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/local_album_thumbnail.widget.dart';
+import 'package:immich_mobile/presentation/widgets/partner_user_avatar.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/partner.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/partner.provider.dart';
 import 'package:immich_mobile/providers/search/people.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
-import 'package:immich_mobile/widgets/common/user_avatar.dart';
 import 'package:immich_mobile/widgets/map/map_thumbnail.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
@@ -391,7 +391,8 @@ class _QuickAccessButtonList extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final partners = ref.watch(partnerSharedWithProvider);
+    final partnerSharedWithAsync = ref.watch(driftSharedWithPartnerProvider);
+    final partners = partnerSharedWithAsync.valueOrNull ?? [];
 
     return SliverPadding(
       padding: const EdgeInsets.only(left: 16, top: 12, right: 16, bottom: 32),
@@ -452,7 +453,6 @@ class _QuickAccessButtonList extends ConsumerWidget {
                     fontWeight: FontWeight.w500,
                   ),
                 ),
-                // TODO: PIN code is needed
                 onTap: () => context.pushRoute(const DriftLockedFolderRoute()),
               ),
               ListTile(
@@ -466,7 +466,7 @@ class _QuickAccessButtonList extends ConsumerWidget {
                     fontWeight: FontWeight.w500,
                   ),
                 ),
-                onTap: () => context.pushRoute(const PartnerRoute()),
+                onTap: () => context.pushRoute(const DriftPartnerRoute()),
               ),
               _PartnerList(partners: partners),
             ],
@@ -480,7 +480,7 @@ class _QuickAccessButtonList extends ConsumerWidget {
 class _PartnerList extends StatelessWidget {
   const _PartnerList({required this.partners});
 
-  final List<UserDto> partners;
+  final List<PartnerUserDto> partners;
 
   @override
   Widget build(BuildContext context) {
@@ -503,7 +503,9 @@ class _PartnerList extends StatelessWidget {
             left: 12.0,
             right: 18.0,
           ),
-          leading: userAvatar(context, partner, radius: 16),
+          leading: PartnerUserAvatar(
+            partner: partner,
+          ),
           title: const Text(
             "partner_list_user_photos",
             style: TextStyle(
diff --git a/mobile/lib/presentation/pages/drift_partner_detail.page.dart b/mobile/lib/presentation/pages/drift_partner_detail.page.dart
index baae893d39..6c77a480ea 100644
--- a/mobile/lib/presentation/pages/drift_partner_detail.page.dart
+++ b/mobile/lib/presentation/pages/drift_partner_detail.page.dart
@@ -6,11 +6,14 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/partner_detail_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 
 @RoutePage()
 class DriftPartnerDetailPage extends StatelessWidget {
-  final UserDto partner;
+  final PartnerUserDto partner;
 
   const DriftPartnerDetailPage({
     super.key,
@@ -35,12 +38,7 @@ class DriftPartnerDetailPage extends StatelessWidget {
           title: partner.name,
           icon: Icons.person_outline,
         ),
-        topSliverWidget: _InfoBox(
-          onTap: () => {
-            // TODO: Create DriftUserProvider/DriftUserService to handle this action
-          },
-          inTimeline: partner.inTimeline,
-        ),
+        topSliverWidget: _InfoBox(partner: partner),
         topSliverWidgetHeight: 110,
         bottomSheet: const PartnerDetailBottomSheet(),
       ),
@@ -48,15 +46,53 @@ class DriftPartnerDetailPage extends StatelessWidget {
   }
 }
 
-class _InfoBox extends StatelessWidget {
-  final VoidCallback onTap;
-  final bool inTimeline;
+class _InfoBox extends ConsumerStatefulWidget {
+  final PartnerUserDto partner;
 
   const _InfoBox({
-    required this.onTap,
-    required this.inTimeline,
+    required this.partner,
   });
 
+  @override
+  ConsumerState<_InfoBox> createState() => _InfoBoxState();
+}
+
+class _InfoBoxState extends ConsumerState<_InfoBox> {
+  bool _inTimeline = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _inTimeline = widget.partner.inTimeline;
+  }
+
+  _toggleInTimeline() async {
+    final user = ref.read(currentUserProvider);
+    if (user == null) {
+      return;
+    }
+
+    try {
+      await ref.read(partnerUsersProvider.notifier).toggleShowInTimeline(
+            widget.partner.id,
+            user.id,
+          );
+
+      setState(() {
+        _inTimeline = !_inTimeline;
+      });
+    } catch (error, stack) {
+      debugPrint("Failed to toggle in timeline: $error $stack");
+      ImmichToast.show(
+        context: context,
+        toastType: ToastType.error,
+        durationInSecond: 1,
+        msg: "Failed to toggle the timeline setting",
+      );
+      return;
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return SliverToBoxAdapter(
@@ -96,8 +132,8 @@ class _InfoBox extends StatelessWidget {
                   style: context.textTheme.bodyMedium,
                 ),
                 trailing: Switch(
-                  value: inTimeline,
-                  onChanged: (_) => onTap(),
+                  value: _inTimeline,
+                  onChanged: (_) => _toggleInTimeline(),
                 ),
               ),
             ),
diff --git a/mobile/lib/presentation/widgets/partner_user_avatar.widget.dart b/mobile/lib/presentation/widgets/partner_user_avatar.widget.dart
new file mode 100644
index 0000000000..9be55cae67
--- /dev/null
+++ b/mobile/lib/presentation/widgets/partner_user_avatar.widget.dart
@@ -0,0 +1,32 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/services/api.service.dart';
+
+class PartnerUserAvatar extends StatelessWidget {
+  const PartnerUserAvatar({super.key, required this.partner});
+
+  final PartnerUserDto partner;
+
+  @override
+  Widget build(BuildContext context) {
+    final url =
+        "${Store.get(StoreKey.serverEndpoint)}/users/${partner.id}/profile-image";
+    final nameFirstLetter = partner.name.isNotEmpty ? partner.name[0] : "";
+    return CircleAvatar(
+      radius: 16,
+      backgroundColor: context.primaryColor.withAlpha(50),
+      foregroundImage: CachedNetworkImageProvider(
+        url,
+        headers: ApiService.getRequestHeaders(),
+        cacheKey: "user-${partner.id}-profile",
+      ),
+      // silence errors if user has no profile image, use initials as fallback
+      onForegroundImageError: (exception, stackTrace) {},
+      child: Text(nameFirstLetter.toUpperCase()),
+    );
+  }
+}
diff --git a/mobile/lib/providers/infrastructure/partner.provider.dart b/mobile/lib/providers/infrastructure/partner.provider.dart
new file mode 100644
index 0000000000..e1c7ebf960
--- /dev/null
+++ b/mobile/lib/providers/infrastructure/partner.provider.dart
@@ -0,0 +1,92 @@
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/domain/services/partner.service.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+class PartnerNotifier extends Notifier<List<PartnerUserDto>> {
+  late DriftPartnerService _driftPartnerService;
+
+  @override
+  List<PartnerUserDto> build() {
+    _driftPartnerService = ref.read(driftPartnerServiceProvider);
+    return [];
+  }
+
+  Future<void> _loadPartners() async {
+    final currentUser = ref.read(currentUserProvider);
+    if (currentUser == null) {
+      return;
+    }
+
+    state = await _driftPartnerService.getSharedWith(currentUser.id);
+  }
+
+  Future<List<PartnerUserDto>> getPartners(String userId) async {
+    final partners = await _driftPartnerService.getSharedWith(userId);
+    state = partners;
+    return partners;
+  }
+
+  Future<void> toggleShowInTimeline(String partnerId, String userId) async {
+    await _driftPartnerService.toggleShowInTimeline(partnerId, userId);
+    await _loadPartners();
+  }
+
+  Future<void> addPartner(PartnerUserDto partner) async {
+    final currentUser = ref.read(currentUserProvider);
+    if (currentUser == null) {
+      return;
+    }
+
+    await _driftPartnerService.addPartner(partner.id, currentUser.id);
+    await _loadPartners();
+    ref.invalidate(driftAvailablePartnerProvider);
+    ref.invalidate(driftSharedByPartnerProvider);
+  }
+
+  Future<void> removePartner(PartnerUserDto partner) async {
+    final currentUser = ref.read(currentUserProvider);
+    if (currentUser == null) {
+      return;
+    }
+
+    await _driftPartnerService.removePartner(partner.id, currentUser.id);
+    await _loadPartners();
+    ref.invalidate(driftAvailablePartnerProvider);
+    ref.invalidate(driftSharedByPartnerProvider);
+  }
+}
+
+final driftAvailablePartnerProvider =
+    FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
+  final currentUser = ref.watch(currentUserProvider);
+  if (currentUser == null) {
+    return [];
+  }
+
+  return ref
+      .watch(driftPartnerServiceProvider)
+      .getAvailablePartners(currentUser.id);
+});
+
+final driftSharedByPartnerProvider =
+    FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
+  final currentUser = ref.watch(currentUserProvider);
+  if (currentUser == null) {
+    return [];
+  }
+
+  return ref.watch(driftPartnerServiceProvider).getSharedBy(currentUser.id);
+});
+
+final driftSharedWithPartnerProvider =
+    FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
+  final currentUser = ref.watch(currentUserProvider);
+  if (currentUser == null) {
+    return [];
+  }
+
+  return ref.watch(driftPartnerServiceProvider).getSharedWith(currentUser.id);
+});
diff --git a/mobile/lib/providers/infrastructure/user.provider.dart b/mobile/lib/providers/infrastructure/user.provider.dart
index ca65f8be14..d328f97600 100644
--- a/mobile/lib/providers/infrastructure/user.provider.dart
+++ b/mobile/lib/providers/infrastructure/user.provider.dart
@@ -1,10 +1,15 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/domain/services/partner.service.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/partner.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/providers/api.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/partner.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
+import 'package:immich_mobile/repositories/partner_api.repository.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'user.provider.g.dart';
@@ -23,3 +28,20 @@ UserService userService(Ref ref) => UserService(
       userApiRepository: ref.watch(userApiRepositoryProvider),
       storeService: ref.watch(storeServiceProvider),
     );
+
+/// Drifts
+final driftPartnerRepositoryProvider = Provider<DriftPartnerRepository>(
+  (ref) => DriftPartnerRepository(ref.watch(driftProvider)),
+);
+
+final driftPartnerServiceProvider = Provider<DriftPartnerService>(
+  (ref) => DriftPartnerService(
+    ref.watch(driftPartnerRepositoryProvider),
+    ref.watch(partnerApiRepositoryProvider),
+  ),
+);
+
+final partnerUsersProvider =
+    NotifierProvider<PartnerNotifier, List<PartnerUserDto>>(
+  PartnerNotifier.new,
+);
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index d0f8852dc3..ba31ccef2b 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -51,6 +51,7 @@ import 'package:immich_mobile/pages/library/library.page.dart';
 import 'package:immich_mobile/pages/library/local_albums.page.dart';
 import 'package:immich_mobile/pages/library/locked/locked.page.dart';
 import 'package:immich_mobile/pages/library/locked/pin_auth.page.dart';
+import 'package:immich_mobile/pages/library/partner/drift_partner.page.dart';
 import 'package:immich_mobile/pages/library/partner/partner.page.dart';
 import 'package:immich_mobile/pages/library/partner/partner_detail.page.dart';
 import 'package:immich_mobile/pages/library/people/people_collection.page.dart';
@@ -485,6 +486,11 @@ class AppRouter extends RootStackRouter {
       page: ChangeExperienceRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+
+    AutoRoute(
+      page: DriftPartnerRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     AutoRoute(
       page: DriftUploadDetailRoute.page,
       guards: [_authGuard, _duplicateGuard],
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index c9ed8a40a3..0e24f776d8 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -896,7 +896,7 @@ class DriftPartnerDetailRoute
     extends PageRouteInfo<DriftPartnerDetailRouteArgs> {
   DriftPartnerDetailRoute({
     Key? key,
-    required UserDto partner,
+    required PartnerUserDto partner,
     List<PageRouteInfo>? children,
   }) : super(
           DriftPartnerDetailRoute.name,
@@ -920,7 +920,7 @@ class DriftPartnerDetailRouteArgs {
 
   final Key? key;
 
-  final UserDto partner;
+  final PartnerUserDto partner;
 
   @override
   String toString() {
@@ -928,6 +928,22 @@ class DriftPartnerDetailRouteArgs {
   }
 }
 
+/// generated route for
+/// [DriftPartnerPage]
+class DriftPartnerRoute extends PageRouteInfo<void> {
+  const DriftPartnerRoute({List<PageRouteInfo>? children})
+      : super(DriftPartnerRoute.name, initialChildren: children);
+
+  static const String name = 'DriftPartnerRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const DriftPartnerPage();
+    },
+  );
+}
+
 /// generated route for
 /// [DriftPlaceDetailPage]
 class DriftPlaceDetailRoute extends PageRouteInfo<DriftPlaceDetailRouteArgs> {

From 826eaedae64d4ef10e27bd2ef3458db2ea88b4d2 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Mon, 21 Jul 2025 23:59:42 +0200
Subject: [PATCH 258/337] feat: play live photos on hover (#19962)

---
 web/src/lib/components/assets/thumbnail/thumbnail.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/lib/components/assets/thumbnail/thumbnail.svelte b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
index 04f6d94e0f..e07e5e99c6 100644
--- a/web/src/lib/components/assets/thumbnail/thumbnail.svelte
+++ b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
@@ -343,11 +343,12 @@
         <div class="absolute top-0 h-full w-full">
           <VideoThumbnail
             url={getAssetPlaybackUrl({ id: asset.livePhotoVideoId, cacheKey: asset.thumbhash })}
+            enablePlayback={mouseOver && $playVideoThumbnailOnHover}
             pauseIcon={mdiMotionPauseOutline}
             playIcon={mdiMotionPlayOutline}
             showTime={false}
             curve={selected}
-            playbackOnIconHover
+            playbackOnIconHover={!$playVideoThumbnailOnHover}
           />
         </div>
       {/if}

From df318ac641fce158af944cecb1dcf1e1fd9192f4 Mon Sep 17 00:00:00 2001
From: Zack Pollard <zack@futo.org>
Date: Tue, 22 Jul 2025 02:31:45 +0100
Subject: [PATCH 259/337] feat: asset face sync (#20048)

* chore: remove thumbnailPath from person sync dto

* feat: asset face sync
---
 .../repositories/sync_stream.repository.dart  |   1 -
 mobile/openapi/README.md                      |   2 +
 mobile/openapi/lib/api.dart                   |   2 +
 mobile/openapi/lib/api_client.dart            |   4 +
 .../lib/model/sync_asset_face_delete_v1.dart  |  99 ++++++++++
 .../openapi/lib/model/sync_asset_face_v1.dart | 175 ++++++++++++++++++
 .../openapi/lib/model/sync_entity_type.dart   |   6 +
 mobile/openapi/lib/model/sync_person_v1.dart  |  10 +-
 .../openapi/lib/model/sync_request_type.dart  |   3 +
 open-api/immich-openapi-specs.json            |  66 ++++++-
 open-api/typescript-sdk/src/fetch-client.ts   |   3 +
 server/src/database.ts                        |   2 +
 server/src/dtos/sync.dto.ts                   |  22 ++-
 server/src/enum.ts                            |   4 +
 server/src/queries/sync.repository.sql        |  36 +++-
 server/src/repositories/sync.repository.ts    |  49 ++++-
 server/src/schema/functions.ts                |  13 ++
 server/src/schema/index.ts                    |   5 +
 ...04909784-AssetFaceUpdateIdAndAuditTable.ts |  52 ++++++
 .../schema/tables/asset-face-audit.table.ts   |  17 ++
 server/src/schema/tables/asset-face.table.ts  |  17 ++
 server/src/services/sync.service.ts           |  16 ++
 server/test/fixtures/face.stub.ts             |  16 ++
 server/test/medium.factory.ts                 |   6 +
 .../medium/specs/sync/sync-asset-face.spec.ts |  92 +++++++++
 .../medium/specs/sync/sync-person.spec.ts     |   1 -
 26 files changed, 699 insertions(+), 20 deletions(-)
 create mode 100644 mobile/openapi/lib/model/sync_asset_face_delete_v1.dart
 create mode 100644 mobile/openapi/lib/model/sync_asset_face_v1.dart
 create mode 100644 server/src/schema/migrations/1753104909784-AssetFaceUpdateIdAndAuditTable.ts
 create mode 100644 server/src/schema/tables/asset-face-audit.table.ts
 create mode 100644 server/test/medium/specs/sync/sync-asset-face.spec.ts

diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index fb5c7fdb3c..e141c387be 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -523,7 +523,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             ownerId: Value(person.ownerId),
             name: Value(person.name),
             faceAssetId: Value(person.faceAssetId),
-            thumbnailPath: Value(person.thumbnailPath),
             isFavorite: Value(person.isFavorite),
             isHidden: Value(person.isHidden),
             color: Value(person.color),
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 28fa63ba84..3e7fa4c2f1 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -475,6 +475,8 @@ Class | Method | HTTP request | Description
  - [SyncAlbumV1](doc//SyncAlbumV1.md)
  - [SyncAssetDeleteV1](doc//SyncAssetDeleteV1.md)
  - [SyncAssetExifV1](doc//SyncAssetExifV1.md)
+ - [SyncAssetFaceDeleteV1](doc//SyncAssetFaceDeleteV1.md)
+ - [SyncAssetFaceV1](doc//SyncAssetFaceV1.md)
  - [SyncAssetV1](doc//SyncAssetV1.md)
  - [SyncEntityType](doc//SyncEntityType.md)
  - [SyncMemoryAssetDeleteV1](doc//SyncMemoryAssetDeleteV1.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index becafa06bf..545955a184 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -257,6 +257,8 @@ part 'model/sync_album_user_v1.dart';
 part 'model/sync_album_v1.dart';
 part 'model/sync_asset_delete_v1.dart';
 part 'model/sync_asset_exif_v1.dart';
+part 'model/sync_asset_face_delete_v1.dart';
+part 'model/sync_asset_face_v1.dart';
 part 'model/sync_asset_v1.dart';
 part 'model/sync_entity_type.dart';
 part 'model/sync_memory_asset_delete_v1.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 603163f00e..55d6f4108b 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -570,6 +570,10 @@ class ApiClient {
           return SyncAssetDeleteV1.fromJson(value);
         case 'SyncAssetExifV1':
           return SyncAssetExifV1.fromJson(value);
+        case 'SyncAssetFaceDeleteV1':
+          return SyncAssetFaceDeleteV1.fromJson(value);
+        case 'SyncAssetFaceV1':
+          return SyncAssetFaceV1.fromJson(value);
         case 'SyncAssetV1':
           return SyncAssetV1.fromJson(value);
         case 'SyncEntityType':
diff --git a/mobile/openapi/lib/model/sync_asset_face_delete_v1.dart b/mobile/openapi/lib/model/sync_asset_face_delete_v1.dart
new file mode 100644
index 0000000000..0992bfdcba
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_asset_face_delete_v1.dart
@@ -0,0 +1,99 @@
+//
+// 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 SyncAssetFaceDeleteV1 {
+  /// Returns a new [SyncAssetFaceDeleteV1] instance.
+  SyncAssetFaceDeleteV1({
+    required this.assetFaceId,
+  });
+
+  String assetFaceId;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncAssetFaceDeleteV1 &&
+    other.assetFaceId == assetFaceId;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (assetFaceId.hashCode);
+
+  @override
+  String toString() => 'SyncAssetFaceDeleteV1[assetFaceId=$assetFaceId]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'assetFaceId'] = this.assetFaceId;
+    return json;
+  }
+
+  /// Returns a new [SyncAssetFaceDeleteV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncAssetFaceDeleteV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncAssetFaceDeleteV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncAssetFaceDeleteV1(
+        assetFaceId: mapValueOfType<String>(json, r'assetFaceId')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncAssetFaceDeleteV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncAssetFaceDeleteV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncAssetFaceDeleteV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncAssetFaceDeleteV1> mapFromJson(dynamic json) {
+    final map = <String, SyncAssetFaceDeleteV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncAssetFaceDeleteV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncAssetFaceDeleteV1-objects as value to a dart map
+  static Map<String, List<SyncAssetFaceDeleteV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncAssetFaceDeleteV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncAssetFaceDeleteV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'assetFaceId',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_asset_face_v1.dart b/mobile/openapi/lib/model/sync_asset_face_v1.dart
new file mode 100644
index 0000000000..853a8a1514
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_asset_face_v1.dart
@@ -0,0 +1,175 @@
+//
+// 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 SyncAssetFaceV1 {
+  /// Returns a new [SyncAssetFaceV1] instance.
+  SyncAssetFaceV1({
+    required this.assetId,
+    required this.boundingBoxX1,
+    required this.boundingBoxX2,
+    required this.boundingBoxY1,
+    required this.boundingBoxY2,
+    required this.id,
+    required this.imageHeight,
+    required this.imageWidth,
+    required this.personId,
+    required this.sourceType,
+  });
+
+  String assetId;
+
+  num boundingBoxX1;
+
+  num boundingBoxX2;
+
+  num boundingBoxY1;
+
+  num boundingBoxY2;
+
+  String id;
+
+  num imageHeight;
+
+  num imageWidth;
+
+  String? personId;
+
+  String sourceType;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncAssetFaceV1 &&
+    other.assetId == assetId &&
+    other.boundingBoxX1 == boundingBoxX1 &&
+    other.boundingBoxX2 == boundingBoxX2 &&
+    other.boundingBoxY1 == boundingBoxY1 &&
+    other.boundingBoxY2 == boundingBoxY2 &&
+    other.id == id &&
+    other.imageHeight == imageHeight &&
+    other.imageWidth == imageWidth &&
+    other.personId == personId &&
+    other.sourceType == sourceType;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (assetId.hashCode) +
+    (boundingBoxX1.hashCode) +
+    (boundingBoxX2.hashCode) +
+    (boundingBoxY1.hashCode) +
+    (boundingBoxY2.hashCode) +
+    (id.hashCode) +
+    (imageHeight.hashCode) +
+    (imageWidth.hashCode) +
+    (personId == null ? 0 : personId!.hashCode) +
+    (sourceType.hashCode);
+
+  @override
+  String toString() => 'SyncAssetFaceV1[assetId=$assetId, boundingBoxX1=$boundingBoxX1, boundingBoxX2=$boundingBoxX2, boundingBoxY1=$boundingBoxY1, boundingBoxY2=$boundingBoxY2, id=$id, imageHeight=$imageHeight, imageWidth=$imageWidth, personId=$personId, sourceType=$sourceType]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'assetId'] = this.assetId;
+      json[r'boundingBoxX1'] = this.boundingBoxX1;
+      json[r'boundingBoxX2'] = this.boundingBoxX2;
+      json[r'boundingBoxY1'] = this.boundingBoxY1;
+      json[r'boundingBoxY2'] = this.boundingBoxY2;
+      json[r'id'] = this.id;
+      json[r'imageHeight'] = this.imageHeight;
+      json[r'imageWidth'] = this.imageWidth;
+    if (this.personId != null) {
+      json[r'personId'] = this.personId;
+    } else {
+    //  json[r'personId'] = null;
+    }
+      json[r'sourceType'] = this.sourceType;
+    return json;
+  }
+
+  /// Returns a new [SyncAssetFaceV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncAssetFaceV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncAssetFaceV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncAssetFaceV1(
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+        boundingBoxX1: num.parse('${json[r'boundingBoxX1']}'),
+        boundingBoxX2: num.parse('${json[r'boundingBoxX2']}'),
+        boundingBoxY1: num.parse('${json[r'boundingBoxY1']}'),
+        boundingBoxY2: num.parse('${json[r'boundingBoxY2']}'),
+        id: mapValueOfType<String>(json, r'id')!,
+        imageHeight: num.parse('${json[r'imageHeight']}'),
+        imageWidth: num.parse('${json[r'imageWidth']}'),
+        personId: mapValueOfType<String>(json, r'personId'),
+        sourceType: mapValueOfType<String>(json, r'sourceType')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncAssetFaceV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncAssetFaceV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncAssetFaceV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncAssetFaceV1> mapFromJson(dynamic json) {
+    final map = <String, SyncAssetFaceV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncAssetFaceV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncAssetFaceV1-objects as value to a dart map
+  static Map<String, List<SyncAssetFaceV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncAssetFaceV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncAssetFaceV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'assetId',
+    'boundingBoxX1',
+    'boundingBoxX2',
+    'boundingBoxY1',
+    'boundingBoxY2',
+    'id',
+    'imageHeight',
+    'imageWidth',
+    'personId',
+    'sourceType',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_entity_type.dart b/mobile/openapi/lib/model/sync_entity_type.dart
index 61f94401c7..65ed78105c 100644
--- a/mobile/openapi/lib/model/sync_entity_type.dart
+++ b/mobile/openapi/lib/model/sync_entity_type.dart
@@ -58,6 +58,8 @@ class SyncEntityType {
   static const stackDeleteV1 = SyncEntityType._(r'StackDeleteV1');
   static const personV1 = SyncEntityType._(r'PersonV1');
   static const personDeleteV1 = SyncEntityType._(r'PersonDeleteV1');
+  static const assetFaceV1 = SyncEntityType._(r'AssetFaceV1');
+  static const assetFaceDeleteV1 = SyncEntityType._(r'AssetFaceDeleteV1');
   static const userMetadataV1 = SyncEntityType._(r'UserMetadataV1');
   static const userMetadataDeleteV1 = SyncEntityType._(r'UserMetadataDeleteV1');
   static const syncAckV1 = SyncEntityType._(r'SyncAckV1');
@@ -100,6 +102,8 @@ class SyncEntityType {
     stackDeleteV1,
     personV1,
     personDeleteV1,
+    assetFaceV1,
+    assetFaceDeleteV1,
     userMetadataV1,
     userMetadataDeleteV1,
     syncAckV1,
@@ -177,6 +181,8 @@ class SyncEntityTypeTypeTransformer {
         case r'StackDeleteV1': return SyncEntityType.stackDeleteV1;
         case r'PersonV1': return SyncEntityType.personV1;
         case r'PersonDeleteV1': return SyncEntityType.personDeleteV1;
+        case r'AssetFaceV1': return SyncEntityType.assetFaceV1;
+        case r'AssetFaceDeleteV1': return SyncEntityType.assetFaceDeleteV1;
         case r'UserMetadataV1': return SyncEntityType.userMetadataV1;
         case r'UserMetadataDeleteV1': return SyncEntityType.userMetadataDeleteV1;
         case r'SyncAckV1': return SyncEntityType.syncAckV1;
diff --git a/mobile/openapi/lib/model/sync_person_v1.dart b/mobile/openapi/lib/model/sync_person_v1.dart
index e86c22f64b..6749beb3e1 100644
--- a/mobile/openapi/lib/model/sync_person_v1.dart
+++ b/mobile/openapi/lib/model/sync_person_v1.dart
@@ -22,7 +22,6 @@ class SyncPersonV1 {
     required this.isHidden,
     required this.name,
     required this.ownerId,
-    required this.thumbnailPath,
     required this.updatedAt,
   });
 
@@ -44,8 +43,6 @@ class SyncPersonV1 {
 
   String ownerId;
 
-  String thumbnailPath;
-
   DateTime updatedAt;
 
   @override
@@ -59,7 +56,6 @@ class SyncPersonV1 {
     other.isHidden == isHidden &&
     other.name == name &&
     other.ownerId == ownerId &&
-    other.thumbnailPath == thumbnailPath &&
     other.updatedAt == updatedAt;
 
   @override
@@ -74,11 +70,10 @@ class SyncPersonV1 {
     (isHidden.hashCode) +
     (name.hashCode) +
     (ownerId.hashCode) +
-    (thumbnailPath.hashCode) +
     (updatedAt.hashCode);
 
   @override
-  String toString() => 'SyncPersonV1[birthDate=$birthDate, color=$color, createdAt=$createdAt, faceAssetId=$faceAssetId, id=$id, isFavorite=$isFavorite, isHidden=$isHidden, name=$name, ownerId=$ownerId, thumbnailPath=$thumbnailPath, updatedAt=$updatedAt]';
+  String toString() => 'SyncPersonV1[birthDate=$birthDate, color=$color, createdAt=$createdAt, faceAssetId=$faceAssetId, id=$id, isFavorite=$isFavorite, isHidden=$isHidden, name=$name, ownerId=$ownerId, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -103,7 +98,6 @@ class SyncPersonV1 {
       json[r'isHidden'] = this.isHidden;
       json[r'name'] = this.name;
       json[r'ownerId'] = this.ownerId;
-      json[r'thumbnailPath'] = this.thumbnailPath;
       json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
     return json;
   }
@@ -126,7 +120,6 @@ class SyncPersonV1 {
         isHidden: mapValueOfType<bool>(json, r'isHidden')!,
         name: mapValueOfType<String>(json, r'name')!,
         ownerId: mapValueOfType<String>(json, r'ownerId')!,
-        thumbnailPath: mapValueOfType<String>(json, r'thumbnailPath')!,
         updatedAt: mapDateTime(json, r'updatedAt', r'')!,
       );
     }
@@ -184,7 +177,6 @@ class SyncPersonV1 {
     'isHidden',
     'name',
     'ownerId',
-    'thumbnailPath',
     'updatedAt',
   };
 }
diff --git a/mobile/openapi/lib/model/sync_request_type.dart b/mobile/openapi/lib/model/sync_request_type.dart
index 75ce852f9f..800b3f4485 100644
--- a/mobile/openapi/lib/model/sync_request_type.dart
+++ b/mobile/openapi/lib/model/sync_request_type.dart
@@ -39,6 +39,7 @@ class SyncRequestType {
   static const stacksV1 = SyncRequestType._(r'StacksV1');
   static const usersV1 = SyncRequestType._(r'UsersV1');
   static const peopleV1 = SyncRequestType._(r'PeopleV1');
+  static const assetFacesV1 = SyncRequestType._(r'AssetFacesV1');
   static const userMetadataV1 = SyncRequestType._(r'UserMetadataV1');
 
   /// List of all possible values in this [enum][SyncRequestType].
@@ -59,6 +60,7 @@ class SyncRequestType {
     stacksV1,
     usersV1,
     peopleV1,
+    assetFacesV1,
     userMetadataV1,
   ];
 
@@ -114,6 +116,7 @@ class SyncRequestTypeTypeTransformer {
         case r'StacksV1': return SyncRequestType.stacksV1;
         case r'UsersV1': return SyncRequestType.usersV1;
         case r'PeopleV1': return SyncRequestType.peopleV1;
+        case r'AssetFacesV1': return SyncRequestType.assetFacesV1;
         case r'UserMetadataV1': return SyncRequestType.userMetadataV1;
         default:
           if (!allowNull) {
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 71329c3f75..2f41318d6d 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13788,6 +13788,65 @@
         ],
         "type": "object"
       },
+      "SyncAssetFaceDeleteV1": {
+        "properties": {
+          "assetFaceId": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "assetFaceId"
+        ],
+        "type": "object"
+      },
+      "SyncAssetFaceV1": {
+        "properties": {
+          "assetId": {
+            "type": "string"
+          },
+          "boundingBoxX1": {
+            "type": "number"
+          },
+          "boundingBoxX2": {
+            "type": "number"
+          },
+          "boundingBoxY1": {
+            "type": "number"
+          },
+          "boundingBoxY2": {
+            "type": "number"
+          },
+          "id": {
+            "type": "string"
+          },
+          "imageHeight": {
+            "type": "number"
+          },
+          "imageWidth": {
+            "type": "number"
+          },
+          "personId": {
+            "nullable": true,
+            "type": "string"
+          },
+          "sourceType": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "assetId",
+          "boundingBoxX1",
+          "boundingBoxX2",
+          "boundingBoxY1",
+          "boundingBoxY2",
+          "id",
+          "imageHeight",
+          "imageWidth",
+          "personId",
+          "sourceType"
+        ],
+        "type": "object"
+      },
       "SyncAssetV1": {
         "properties": {
           "checksum": {
@@ -13912,6 +13971,8 @@
           "StackDeleteV1",
           "PersonV1",
           "PersonDeleteV1",
+          "AssetFaceV1",
+          "AssetFaceDeleteV1",
           "UserMetadataV1",
           "UserMetadataDeleteV1",
           "SyncAckV1",
@@ -14109,9 +14170,6 @@
           "ownerId": {
             "type": "string"
           },
-          "thumbnailPath": {
-            "type": "string"
-          },
           "updatedAt": {
             "format": "date-time",
             "type": "string"
@@ -14127,7 +14185,6 @@
           "isHidden",
           "name",
           "ownerId",
-          "thumbnailPath",
           "updatedAt"
         ],
         "type": "object"
@@ -14150,6 +14207,7 @@
           "StacksV1",
           "UsersV1",
           "PeopleV1",
+          "AssetFacesV1",
           "UserMetadataV1"
         ],
         "type": "string"
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index f60fa6dfe8..d5f7fde52a 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -4125,6 +4125,8 @@ export enum SyncEntityType {
     StackDeleteV1 = "StackDeleteV1",
     PersonV1 = "PersonV1",
     PersonDeleteV1 = "PersonDeleteV1",
+    AssetFaceV1 = "AssetFaceV1",
+    AssetFaceDeleteV1 = "AssetFaceDeleteV1",
     UserMetadataV1 = "UserMetadataV1",
     UserMetadataDeleteV1 = "UserMetadataDeleteV1",
     SyncAckV1 = "SyncAckV1",
@@ -4147,6 +4149,7 @@ export enum SyncRequestType {
     StacksV1 = "StacksV1",
     UsersV1 = "UsersV1",
     PeopleV1 = "PeopleV1",
+    AssetFacesV1 = "AssetFacesV1",
     UserMetadataV1 = "UserMetadataV1"
 }
 export enum TranscodeHWAccel {
diff --git a/server/src/database.ts b/server/src/database.ts
index d42b2618a4..dc99fc5b31 100644
--- a/server/src/database.ts
+++ b/server/src/database.ts
@@ -272,6 +272,8 @@ export type AssetFace = {
   personId: string | null;
   sourceType: SourceType;
   person?: Person | null;
+  updatedAt: Date;
+  updateId: string;
 };
 
 const userColumns = ['id', 'name', 'email', 'avatarColor', 'profileImagePath', 'profileChangedAt'] as const;
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index 9725539e3d..e0c9c059c4 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -245,7 +245,6 @@ export class SyncPersonV1 {
   ownerId!: string;
   name!: string;
   birthDate!: Date | null;
-  thumbnailPath!: string;
   isHidden!: boolean;
   isFavorite!: boolean;
   color!: string | null;
@@ -257,6 +256,25 @@ export class SyncPersonDeleteV1 {
   personId!: string;
 }
 
+@ExtraModel()
+export class SyncAssetFaceV1 {
+  id!: string;
+  assetId!: string;
+  personId!: string | null;
+  imageWidth!: number;
+  imageHeight!: number;
+  boundingBoxX1!: number;
+  boundingBoxY1!: number;
+  boundingBoxX2!: number;
+  boundingBoxY2!: number;
+  sourceType!: string;
+}
+
+@ExtraModel()
+export class SyncAssetFaceDeleteV1 {
+  assetFaceId!: string;
+}
+
 @ExtraModel()
 export class SyncUserMetadataV1 {
   userId!: string;
@@ -312,6 +330,8 @@ export type SyncItem = {
   [SyncEntityType.PartnerStackV1]: SyncStackV1;
   [SyncEntityType.PersonV1]: SyncPersonV1;
   [SyncEntityType.PersonDeleteV1]: SyncPersonDeleteV1;
+  [SyncEntityType.AssetFaceV1]: SyncAssetFaceV1;
+  [SyncEntityType.AssetFaceDeleteV1]: SyncAssetFaceDeleteV1;
   [SyncEntityType.UserMetadataV1]: SyncUserMetadataV1;
   [SyncEntityType.UserMetadataDeleteV1]: SyncUserMetadataDeleteV1;
   [SyncEntityType.SyncAckV1]: SyncAckV1;
diff --git a/server/src/enum.ts b/server/src/enum.ts
index e41a790999..f2eae615ab 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -568,6 +568,7 @@ export enum SyncRequestType {
   StacksV1 = 'StacksV1',
   UsersV1 = 'UsersV1',
   PeopleV1 = 'PeopleV1',
+  AssetFacesV1 = 'AssetFacesV1',
   UserMetadataV1 = 'UserMetadataV1',
 }
 
@@ -619,6 +620,9 @@ export enum SyncEntityType {
   PersonV1 = 'PersonV1',
   PersonDeleteV1 = 'PersonDeleteV1',
 
+  AssetFaceV1 = 'AssetFaceV1',
+  AssetFaceDeleteV1 = 'AssetFaceDeleteV1',
+
   UserMetadataV1 = 'UserMetadataV1',
   UserMetadataDeleteV1 = 'UserMetadataDeleteV1',
 
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index 4782eedf1d..7502b79f57 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -409,6 +409,41 @@ where
 order by
   "updateId" asc
 
+-- SyncRepository.assetFace.getDeletes
+select
+  "asset_face_audit"."id",
+  "assetFaceId"
+from
+  "asset_face_audit"
+  left join "asset" on "asset"."id" = "asset_face_audit"."assetId"
+where
+  "asset"."ownerId" = $1
+  and "asset_face_audit"."deletedAt" < now() - interval '1 millisecond'
+order by
+  "asset_face_audit"."id" asc
+
+-- SyncRepository.assetFace.getUpserts
+select
+  "asset_face"."id",
+  "assetId",
+  "personId",
+  "imageWidth",
+  "imageHeight",
+  "boundingBoxX1",
+  "boundingBoxY1",
+  "boundingBoxX2",
+  "boundingBoxY2",
+  "sourceType",
+  "asset_face"."updateId"
+from
+  "asset_face"
+  left join "asset" on "asset"."id" = "asset_face"."assetId"
+where
+  "asset_face"."updatedAt" < now() - interval '1 millisecond'
+  and "asset"."ownerId" = $1
+order by
+  "asset_face"."updateId" asc
+
 -- SyncRepository.memory.getDeletes
 select
   "id",
@@ -779,7 +814,6 @@ select
   "ownerId",
   "name",
   "birthDate",
-  "thumbnailPath",
   "isHidden",
   "isFavorite",
   "color",
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index 34c450d52d..dba52d25a0 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -17,7 +17,8 @@ type AuditTables =
   | 'memory_asset_audit'
   | 'stack_audit'
   | 'person_audit'
-  | 'user_metadata_audit';
+  | 'user_metadata_audit'
+  | 'asset_face_audit';
 type UpsertTables =
   | 'user'
   | 'partner'
@@ -29,7 +30,8 @@ type UpsertTables =
   | 'memory_asset'
   | 'stack'
   | 'person'
-  | 'user_metadata';
+  | 'user_metadata'
+  | 'asset_face';
 
 @Injectable()
 export class SyncRepository {
@@ -40,6 +42,7 @@ export class SyncRepository {
   albumUser: AlbumUserSync;
   asset: AssetSync;
   assetExif: AssetExifSync;
+  assetFace: AssetFaceSync;
   memory: MemorySync;
   memoryToAsset: MemoryToAssetSync;
   partner: PartnerSync;
@@ -59,6 +62,7 @@ export class SyncRepository {
     this.albumUser = new AlbumUserSync(this.db);
     this.asset = new AssetSync(this.db);
     this.assetExif = new AssetExifSync(this.db);
+    this.assetFace = new AssetFaceSync(this.db);
     this.memory = new MemorySync(this.db);
     this.memoryToAsset = new MemoryToAssetSync(this.db);
     this.partner = new PartnerSync(this.db);
@@ -385,7 +389,6 @@ class PersonSync extends BaseSync {
         'ownerId',
         'name',
         'birthDate',
-        'thumbnailPath',
         'isHidden',
         'isFavorite',
         'color',
@@ -398,6 +401,46 @@ class PersonSync extends BaseSync {
   }
 }
 
+class AssetFaceSync extends BaseSync {
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getDeletes(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('asset_face_audit')
+      .select(['asset_face_audit.id', 'assetFaceId'])
+      .orderBy('asset_face_audit.id', 'asc')
+      .leftJoin('asset', 'asset.id', 'asset_face_audit.assetId')
+      .where('asset.ownerId', '=', userId)
+      .where('asset_face_audit.deletedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('asset_face_audit.id', '>', ack!.updateId))
+      .stream();
+  }
+
+  @GenerateSql({ params: [DummyValue.UUID], stream: true })
+  getUpserts(userId: string, ack?: SyncAck) {
+    return this.db
+      .selectFrom('asset_face')
+      .select([
+        'asset_face.id',
+        'assetId',
+        'personId',
+        'imageWidth',
+        'imageHeight',
+        'boundingBoxX1',
+        'boundingBoxY1',
+        'boundingBoxX2',
+        'boundingBoxY2',
+        'sourceType',
+        'asset_face.updateId',
+      ])
+      .where('asset_face.updatedAt', '<', sql.raw<Date>("now() - interval '1 millisecond'"))
+      .$if(!!ack, (qb) => qb.where('asset_face.updateId', '>', ack!.updateId))
+      .orderBy('asset_face.updateId', 'asc')
+      .leftJoin('asset', 'asset.id', 'asset_face.assetId')
+      .where('asset.ownerId', '=', userId)
+      .stream();
+  }
+}
+
 class AssetExifSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getUpserts(userId: string, ack?: SyncAck) {
diff --git a/server/src/schema/functions.ts b/server/src/schema/functions.ts
index 5577169227..786e7a1ffa 100644
--- a/server/src/schema/functions.ts
+++ b/server/src/schema/functions.ts
@@ -229,3 +229,16 @@ export const user_metadata_audit = registerFunction({
       RETURN NULL;
     END`,
 });
+
+export const asset_face_audit = registerFunction({
+  name: 'asset_face_audit',
+  returnType: 'TRIGGER',
+  language: 'PLPGSQL',
+  body: `
+    BEGIN
+      INSERT INTO asset_face_audit ("assetFaceId", "assetId")
+      SELECT "id", "assetId"
+      FROM OLD;
+      RETURN NULL;
+    END`,
+});
diff --git a/server/src/schema/index.ts b/server/src/schema/index.ts
index ba25a65d4d..8982437b34 100644
--- a/server/src/schema/index.ts
+++ b/server/src/schema/index.ts
@@ -4,6 +4,7 @@ import {
   album_user_after_insert,
   album_user_delete_audit,
   asset_delete_audit,
+  asset_face_audit,
   f_concat_ws,
   f_unaccent,
   immich_uuid_v7,
@@ -27,6 +28,7 @@ import { AlbumTable } from 'src/schema/tables/album.table';
 import { ApiKeyTable } from 'src/schema/tables/api-key.table';
 import { AssetAuditTable } from 'src/schema/tables/asset-audit.table';
 import { AssetExifTable } from 'src/schema/tables/asset-exif.table';
+import { AssetFaceAuditTable } from 'src/schema/tables/asset-face-audit.table';
 import { AssetFaceTable } from 'src/schema/tables/asset-face.table';
 import { AssetFileTable } from 'src/schema/tables/asset-file.table';
 import { AssetJobStatusTable } from 'src/schema/tables/asset-job-status.table';
@@ -78,6 +80,7 @@ export class ImmichDatabase {
     ApiKeyTable,
     AssetAuditTable,
     AssetFaceTable,
+    AssetFaceAuditTable,
     AssetJobStatusTable,
     AssetTable,
     AssetFileTable,
@@ -132,6 +135,7 @@ export class ImmichDatabase {
     stack_delete_audit,
     person_delete_audit,
     user_metadata_audit,
+    asset_face_audit,
   ];
 
   enum = [assets_status_enum, asset_face_source_type, asset_visibility_enum];
@@ -158,6 +162,7 @@ export interface DB {
   asset: AssetTable;
   asset_exif: AssetExifTable;
   asset_face: AssetFaceTable;
+  asset_face_audit: AssetFaceAuditTable;
   asset_file: AssetFileTable;
   asset_job_status: AssetJobStatusTable;
   asset_audit: AssetAuditTable;
diff --git a/server/src/schema/migrations/1753104909784-AssetFaceUpdateIdAndAuditTable.ts b/server/src/schema/migrations/1753104909784-AssetFaceUpdateIdAndAuditTable.ts
new file mode 100644
index 0000000000..1f4072e34e
--- /dev/null
+++ b/server/src/schema/migrations/1753104909784-AssetFaceUpdateIdAndAuditTable.ts
@@ -0,0 +1,52 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`CREATE OR REPLACE FUNCTION asset_face_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO asset_face_audit ("assetFaceId", "assetId")
+      SELECT "id", "assetId"
+      FROM OLD;
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE TABLE "asset_face_audit" (
+  "id" uuid NOT NULL DEFAULT immich_uuid_v7(),
+  "assetFaceId" uuid NOT NULL,
+  "assetId" uuid NOT NULL,
+  "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp(),
+  CONSTRAINT "asset_face_audit_pkey" PRIMARY KEY ("id")
+);`.execute(db);
+  await sql`CREATE INDEX "asset_face_audit_assetFaceId_idx" ON "asset_face_audit" ("assetFaceId");`.execute(db);
+  await sql`CREATE INDEX "asset_face_audit_assetId_idx" ON "asset_face_audit" ("assetId");`.execute(db);
+  await sql`CREATE INDEX "asset_face_audit_deletedAt_idx" ON "asset_face_audit" ("deletedAt");`.execute(db);
+  await sql`ALTER TABLE "asset_face" ADD "updatedAt" timestamp with time zone NOT NULL DEFAULT now();`.execute(db);
+  await sql`ALTER TABLE "asset_face" ADD "updateId" uuid NOT NULL DEFAULT immich_uuid_v7();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_face_audit"
+  AFTER DELETE ON "asset_face"
+  REFERENCING OLD TABLE AS "old"
+  FOR EACH STATEMENT
+  WHEN (pg_trigger_depth() = 0)
+  EXECUTE FUNCTION asset_face_audit();`.execute(db);
+  await sql`CREATE OR REPLACE TRIGGER "asset_face_updatedAt"
+  BEFORE UPDATE ON "asset_face"
+  FOR EACH ROW
+  EXECUTE FUNCTION updated_at();`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_asset_face_audit', '{"type":"function","name":"asset_face_audit","sql":"CREATE OR REPLACE FUNCTION asset_face_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO asset_face_audit (\\"assetFaceId\\", \\"assetId\\")\\n      SELECT \\"id\\", \\"assetId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_face_audit', '{"type":"trigger","name":"asset_face_audit","sql":"CREATE OR REPLACE TRIGGER \\"asset_face_audit\\"\\n  AFTER DELETE ON \\"asset_face\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION asset_face_audit();"}'::jsonb);`.execute(db);
+  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_face_updatedAt', '{"type":"trigger","name":"asset_face_updatedAt","sql":"CREATE OR REPLACE TRIGGER \\"asset_face_updatedAt\\"\\n  BEFORE UPDATE ON \\"asset_face\\"\\n  FOR EACH ROW\\n  EXECUTE FUNCTION updated_at();"}'::jsonb);`.execute(db);
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await sql`DROP TRIGGER "asset_face_audit" ON "asset_face";`.execute(db);
+  await sql`DROP TRIGGER "asset_face_updatedAt" ON "asset_face";`.execute(db);
+  await sql`ALTER TABLE "asset_face" DROP COLUMN "updatedAt";`.execute(db);
+  await sql`ALTER TABLE "asset_face" DROP COLUMN "updateId";`.execute(db);
+  await sql`DROP TABLE "asset_face_audit";`.execute(db);
+  await sql`DROP FUNCTION asset_face_audit;`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_asset_face_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_face_audit';`.execute(db);
+  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_face_updatedAt';`.execute(db);
+}
diff --git a/server/src/schema/tables/asset-face-audit.table.ts b/server/src/schema/tables/asset-face-audit.table.ts
new file mode 100644
index 0000000000..4f03c22aa0
--- /dev/null
+++ b/server/src/schema/tables/asset-face-audit.table.ts
@@ -0,0 +1,17 @@
+import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
+import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
+
+@Table('asset_face_audit')
+export class AssetFaceAuditTable {
+  @PrimaryGeneratedUuidV7Column()
+  id!: Generated<string>;
+
+  @Column({ type: 'uuid', index: true })
+  assetFaceId!: string;
+
+  @Column({ type: 'uuid', index: true })
+  assetId!: string;
+
+  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
+  deletedAt!: Generated<Timestamp>;
+}
diff --git a/server/src/schema/tables/asset-face.table.ts b/server/src/schema/tables/asset-face.table.ts
index 6e45a3a64d..5041d945e2 100644
--- a/server/src/schema/tables/asset-face.table.ts
+++ b/server/src/schema/tables/asset-face.table.ts
@@ -1,8 +1,11 @@
+import { UpdatedAtTrigger, UpdateIdColumn } from 'src/decorators';
 import { SourceType } from 'src/enum';
 import { asset_face_source_type } from 'src/schema/enums';
+import { asset_face_audit } from 'src/schema/functions';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import { PersonTable } from 'src/schema/tables/person.table';
 import {
+  AfterDeleteTrigger,
   Column,
   DeleteDateColumn,
   ForeignKeyColumn,
@@ -11,9 +14,17 @@ import {
   PrimaryGeneratedColumn,
   Table,
   Timestamp,
+  UpdateDateColumn,
 } from 'src/sql-tools';
 
 @Table({ name: 'asset_face' })
+@UpdatedAtTrigger('asset_face_updatedAt')
+@AfterDeleteTrigger({
+  scope: 'statement',
+  function: asset_face_audit,
+  referencingOldTableAs: 'old',
+  when: 'pg_trigger_depth() = 0',
+})
 // schemaFromDatabase does not preserve column order
 @Index({ name: 'asset_face_assetId_personId_idx', columns: ['assetId', 'personId'] })
 @Index({ columns: ['personId', 'assetId'] })
@@ -61,4 +72,10 @@ export class AssetFaceTable {
 
   @DeleteDateColumn()
   deletedAt!: Timestamp | null;
+
+  @UpdateDateColumn()
+  updatedAt!: Generated<Timestamp>;
+
+  @UpdateIdColumn()
+  updateId!: Generated<string>;
 }
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 4463ab0d76..fb582ab038 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -70,6 +70,7 @@ export const SYNC_TYPES_ORDER = [
   SyncRequestType.MemoriesV1,
   SyncRequestType.MemoryToAssetsV1,
   SyncRequestType.PeopleV1,
+  SyncRequestType.AssetFacesV1,
   SyncRequestType.UserMetadataV1,
 ];
 
@@ -156,6 +157,7 @@ export class SyncService extends BaseService {
       [SyncRequestType.StacksV1]: () => this.syncStackV1(response, checkpointMap, auth),
       [SyncRequestType.PartnerStacksV1]: () => this.syncPartnerStackV1(response, checkpointMap, auth, session.id),
       [SyncRequestType.PeopleV1]: () => this.syncPeopleV1(response, checkpointMap, auth),
+      [SyncRequestType.AssetFacesV1]: async () => this.syncAssetFacesV1(response, checkpointMap, auth),
       [SyncRequestType.UserMetadataV1]: () => this.syncUserMetadataV1(response, checkpointMap, auth),
     };
 
@@ -606,6 +608,20 @@ export class SyncService extends BaseService {
     }
   }
 
+  private async syncAssetFacesV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
+    const deleteType = SyncEntityType.AssetFaceDeleteV1;
+    const deletes = this.syncRepository.assetFace.getDeletes(auth.user.id, checkpointMap[deleteType]);
+    for await (const { id, ...data } of deletes) {
+      send(response, { type: deleteType, ids: [id], data });
+    }
+
+    const upsertType = SyncEntityType.AssetFaceV1;
+    const upserts = this.syncRepository.assetFace.getUpserts(auth.user.id, checkpointMap[upsertType]);
+    for await (const { updateId, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data });
+    }
+  }
+
   private async syncUserMetadataV1(response: Writable, checkpointMap: CheckpointMap, auth: AuthDto) {
     const deleteType = SyncEntityType.UserMetadataDeleteV1;
     const deletes = this.syncRepository.userMetadata.getDeletes(auth.user.id, checkpointMap[deleteType]);
diff --git a/server/test/fixtures/face.stub.ts b/server/test/fixtures/face.stub.ts
index beecf7c69e..f655a3944e 100644
--- a/server/test/fixtures/face.stub.ts
+++ b/server/test/fixtures/face.stub.ts
@@ -23,6 +23,8 @@ export const faceStub = {
     sourceType: SourceType.MachineLearning,
     faceSearch: { faceId: 'assetFaceId1', embedding: '[1, 2, 3, 4]' },
     deletedAt: new Date(),
+    updatedAt: new Date('2023-01-01T00:00:00Z'),
+    updateId: '0d1173e3-4d80-4d76-b41e-57d56de21125',
   }),
   primaryFace1: Object.freeze({
     id: 'assetFaceId2',
@@ -39,6 +41,8 @@ export const faceStub = {
     sourceType: SourceType.MachineLearning,
     faceSearch: { faceId: 'assetFaceId2', embedding: '[1, 2, 3, 4]' },
     deletedAt: null,
+    updatedAt: new Date('2023-01-01T00:00:00Z'),
+    updateId: '0d1173e3-4d80-4d76-b41e-57d56de21125',
   }),
   mergeFace1: Object.freeze({
     id: 'assetFaceId3',
@@ -55,6 +59,8 @@ export const faceStub = {
     sourceType: SourceType.MachineLearning,
     faceSearch: { faceId: 'assetFaceId3', embedding: '[1, 2, 3, 4]' },
     deletedAt: null,
+    updatedAt: new Date('2023-01-01T00:00:00Z'),
+    updateId: '0d1173e3-4d80-4d76-b41e-57d56de21125',
   }),
   noPerson1: Object.freeze({
     id: 'assetFaceId8',
@@ -71,6 +77,8 @@ export const faceStub = {
     sourceType: SourceType.MachineLearning,
     faceSearch: { faceId: 'assetFaceId8', embedding: '[1, 2, 3, 4]' },
     deletedAt: null,
+    updatedAt: new Date('2023-01-01T00:00:00Z'),
+    updateId: '0d1173e3-4d80-4d76-b41e-57d56de21125',
   }),
   noPerson2: Object.freeze({
     id: 'assetFaceId9',
@@ -87,6 +95,8 @@ export const faceStub = {
     sourceType: SourceType.MachineLearning,
     faceSearch: { faceId: 'assetFaceId9', embedding: '[1, 2, 3, 4]' },
     deletedAt: null,
+    updatedAt: new Date('2023-01-01T00:00:00Z'),
+    updateId: '0d1173e3-4d80-4d76-b41e-57d56de21125',
   }),
   fromExif1: Object.freeze({
     id: 'assetFaceId9',
@@ -102,6 +112,8 @@ export const faceStub = {
     imageWidth: 400,
     sourceType: SourceType.Exif,
     deletedAt: null,
+    updatedAt: new Date('2023-01-01T00:00:00Z'),
+    updateId: '0d1173e3-4d80-4d76-b41e-57d56de21125',
   }),
   fromExif2: Object.freeze({
     id: 'assetFaceId9',
@@ -117,6 +129,8 @@ export const faceStub = {
     imageWidth: 1024,
     sourceType: SourceType.Exif,
     deletedAt: null,
+    updatedAt: new Date('2023-01-01T00:00:00Z'),
+    updateId: '0d1173e3-4d80-4d76-b41e-57d56de21125',
   }),
   withBirthDate: Object.freeze({
     id: 'assetFaceId10',
@@ -132,5 +146,7 @@ export const faceStub = {
     imageWidth: 1024,
     sourceType: SourceType.MachineLearning,
     deletedAt: null,
+    updatedAt: new Date('2023-01-01T00:00:00Z'),
+    updateId: '0d1173e3-4d80-4d76-b41e-57d56de21125',
   }),
 };
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index 4d13264fa2..d6038b6b84 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -154,6 +154,12 @@ export class MediumTestContext<S extends BaseService = BaseService> {
     return { asset, result };
   }
 
+  async newAssetFace(dto: Partial<Insertable<AssetFace>> & { assetId: string }) {
+    const assetFace = mediumFactory.assetFaceInsert(dto);
+    const result = await this.get(PersonRepository).createAssetFace(assetFace);
+    return { assetFace, result };
+  }
+
   async newMemory(dto: Partial<Insertable<MemoryTable>> = {}) {
     const memory = mediumFactory.memoryInsert(dto);
     const result = await this.get(MemoryRepository).create(memory, new Set<string>());
diff --git a/server/test/medium/specs/sync/sync-asset-face.spec.ts b/server/test/medium/specs/sync/sync-asset-face.spec.ts
new file mode 100644
index 0000000000..68d3007c52
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-asset-face.spec.ts
@@ -0,0 +1,92 @@
+import { Kysely } from 'kysely';
+import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { PersonRepository } from 'src/repositories/person.repository';
+import { DB } from 'src/schema';
+import { SyncTestContext } from 'test/medium.factory';
+import { factory } from 'test/small.factory';
+import { getKyselyDB } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(SyncEntityType.AssetFaceV1, () => {
+  it('should detect and sync the first asset face', async () => {
+    const { auth, ctx } = await setup();
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    const { person } = await ctx.newPerson({ ownerId: auth.user.id });
+    const { assetFace } = await ctx.newAssetFace({ assetId: asset.id, personId: person.id });
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AssetFacesV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: assetFace.id,
+          assetId: asset.id,
+          personId: person.id,
+          imageWidth: assetFace.imageWidth,
+          imageHeight: assetFace.imageHeight,
+          boundingBoxX1: assetFace.boundingBoxX1,
+          boundingBoxY1: assetFace.boundingBoxY1,
+          boundingBoxX2: assetFace.boundingBoxX2,
+          boundingBoxY2: assetFace.boundingBoxY2,
+          sourceType: assetFace.sourceType,
+        }),
+        type: 'AssetFaceV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetFacesV1])).resolves.toEqual([]);
+  });
+
+  it('should detect and sync a deleted asset face', async () => {
+    const { auth, ctx } = await setup();
+    const personRepo = ctx.get(PersonRepository);
+    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
+    const { assetFace } = await ctx.newAssetFace({ assetId: asset.id });
+    await personRepo.deleteAssetFace(assetFace.id);
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AssetFacesV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          assetFaceId: assetFace.id,
+        },
+        type: 'AssetFaceDeleteV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AssetFacesV1])).resolves.toEqual([]);
+  });
+
+  it('should not sync an asset face or asset face delete for an unrelated user', async () => {
+    const { auth, ctx } = await setup();
+    const personRepo = ctx.get(PersonRepository);
+    const { user: user2 } = await ctx.newUser();
+    const { session } = await ctx.newSession({ userId: user2.id });
+    const { asset } = await ctx.newAsset({ ownerId: user2.id });
+    const { assetFace } = await ctx.newAssetFace({ assetId: asset.id });
+    const auth2 = factory.auth({ session, user: user2 });
+
+    expect(await ctx.syncStream(auth2, [SyncRequestType.AssetFacesV1])).toHaveLength(1);
+    expect(await ctx.syncStream(auth, [SyncRequestType.AssetFacesV1])).toHaveLength(0);
+
+    await personRepo.deleteAssetFace(assetFace.id);
+    expect(await ctx.syncStream(auth2, [SyncRequestType.AssetFacesV1])).toHaveLength(1);
+    expect(await ctx.syncStream(auth, [SyncRequestType.AssetFacesV1])).toHaveLength(0);
+  });
+});
diff --git a/server/test/medium/specs/sync/sync-person.spec.ts b/server/test/medium/specs/sync/sync-person.spec.ts
index 807e41894c..fbf401e377 100644
--- a/server/test/medium/specs/sync/sync-person.spec.ts
+++ b/server/test/medium/specs/sync/sync-person.spec.ts
@@ -31,7 +31,6 @@ describe(SyncEntityType.PersonV1, () => {
         data: expect.objectContaining({
           id: person.id,
           name: person.name,
-          thumbnailPath: person.thumbnailPath,
           isHidden: person.isHidden,
           birthDate: person.birthDate,
           faceAssetId: person.faceAssetId,

From 02c423b32672775c3786a69f46cb0b03bcccfd28 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 21 Jul 2025 22:44:39 -0500
Subject: [PATCH 260/337] chore: graceful(not) disposal(be gong) Isar (#20062)

---
 mobile/lib/utils/isolate.dart | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/utils/isolate.dart b/mobile/lib/utils/isolate.dart
index 2263bf3d76..3c2aeed756 100644
--- a/mobile/lib/utils/isolate.dart
+++ b/mobile/lib/utils/isolate.dart
@@ -63,7 +63,17 @@ Cancelable<T?> runInIsolateGentle<T>({
       try {
         await LogService.I.flushBuffer();
         await ref.read(driftProvider).close();
-        await ref.read(isarProvider).close();
+
+        // Close Isar safely
+        try {
+          final isar = ref.read(isarProvider);
+          if (isar.isOpen) {
+            await isar.close();
+          }
+        } catch (e) {
+          debugPrint("Error closing Isar: $e");
+        }
+
         ref.dispose();
       } catch (error) {
         debugPrint("Error closing resources in isolate: $error");

From 30f6dc3a6e8b794d17678491bda904c858522f59 Mon Sep 17 00:00:00 2001
From: "Weblate (bot)" <hosted@weblate.org>
Date: Tue, 22 Jul 2025 11:27:32 +0200
Subject: [PATCH 261/337] chore(web): update translations (#19228)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 1024mb <1024mb@users.noreply.hosted.weblate.org>
Co-authored-by: Abel Márquez Mora <abeelmarquez@gmail.com>
Co-authored-by: Adupa Vasista <adupavasista@gmail.com>
Co-authored-by: AgentTricky <andreweditz26@gmail.com>
Co-authored-by: Ahmed Khaleel Shihab <ahmed91shihab@gmail.com>
Co-authored-by: Ahmed Shihab <blugrana2@gmail.com>
Co-authored-by: Alberto Serluca <alberto.ser11@gmail.com>
Co-authored-by: Alex <weblate.attire524@passmail.net>
Co-authored-by: Andreas Johansen <andreas@josern.com>
Co-authored-by: Antonio Vazquez <antoniovavazquez@gmail.com>
Co-authored-by: Apurbo Islam <apurboislam2809@gmail.com>
Co-authored-by: Bahadır Hamza Öztürk <bahadirhamza2@gmail.com>
Co-authored-by: Barend van der Walt <barendjohannes.vdwalt@gmail.com>
Co-authored-by: Bernardo <bernaamg@gmail.com>
Co-authored-by: Bezruchenko Simon <worcposj44@gmail.com>
Co-authored-by: Bora Atıcı <boratici.acc@gmail.com>
Co-authored-by: Carina Chenot <carina.chenot@gmail.com>
Co-authored-by: Christian Glockner <christian@glcknr.eu>
Co-authored-by: Claudiu Hanza <claudiu.hanza@gmail.com>
Co-authored-by: Cristality_ <jovarasz@gmail.com>
Co-authored-by: DarkWolf DarkINFINITE <ddarkinfinite@gmail.com>
Co-authored-by: Davide Ciaccia <davideccia@gmail.com>
Co-authored-by: Denis Pacquier <denis.pacquier@gmail.com>
Co-authored-by: DevServs <bonov@mail.ru>
Co-authored-by: Etienne de Villiers <etiennefdevilliers@proton.me>
Co-authored-by: Filip Polak <rabbitxones@gmail.com>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Fjuro <git@alius.cz>
Co-authored-by: Florian Ostertag <florian.kuepper@gmail.com>
Co-authored-by: G M <gauravmmh2@gmail.com>
Co-authored-by: Gerry <ger_26_6@hotmail.com>
Co-authored-by: Girom Kenji Respicio Pacho <pachogiromkenji@gmail.com>
Co-authored-by: Gyubin Lee <support@pcor.me>
Co-authored-by: Hazret <tncytrk@live.com>
Co-authored-by: Hoi <Hoihoi@users.noreply.hosted.weblate.org>
Co-authored-by: Hurricane-32 <rodrigorimo@hotmail.com>
Co-authored-by: Indrek Haav <indrek.haav@hotmail.com>
Co-authored-by: Ivan Dimitrov <idimitrov08@gmail.com>
Co-authored-by: JPar99 <github.wad969@passmail.com>
Co-authored-by: Janat Taerakul <janat.taerakul@gmail.com>
Co-authored-by: Janat Taerakul <ppppp5541@gmail.com>
Co-authored-by: Jozef Gaal <preklady@mayday.sk>
Co-authored-by: JustRensio <debouwer741@gmail.com>
Co-authored-by: Lenny Angst <lenny@familie-angst.ch>
Co-authored-by: Leo Bottaro <github@leobottaro.com>
Co-authored-by: Lucas Correia <github.freehand702@passmail.net>
Co-authored-by: Luis Peregrina <luis.a.peregrina@gmail.com>
Co-authored-by: MSDNicrosoft <wang3311835119@hotmail.com>
Co-authored-by: MaBeniu <marius.beniusis@teliacompany.com>
Co-authored-by: Marc Portabella Navarro <portabella.marc@gmail.com>
Co-authored-by: Martin <me@mart-e.be>
Co-authored-by: Mateo Varela <matevarela32@gmail.com>
Co-authored-by: Matjaž T <matjaz@moj-svet.si>
Co-authored-by: Matteo Marchi <marchimatteo@gmail.com>
Co-authored-by: Mehedi Hasan <asmaparvin019@gmail.com>
Co-authored-by: Mohammed Al Otaibi <mopes.03.belle@icloud.com>
Co-authored-by: Molnar Eduard <edimolnar@posteo.ro>
Co-authored-by: Máté Molnár <matmolni@gmail.com>
Co-authored-by: Mārtiņš Bruņenieks <martinsb@gmail.com>
Co-authored-by: Niko Savola <niko.savola@aalto.fi>
Co-authored-by: OffsetMonkey538 <offsetmonkey538@gmail.com>
Co-authored-by: P <eisregner@gmail.com>
Co-authored-by: Pavel Miniutka <pavel.miniutka@gmail.com>
Co-authored-by: Petri Hämäläinen <petri.hamalainen@mailbox.org>
Co-authored-by: Revc Nix <revc.nix@gmail.com>
Co-authored-by: Robert <robert.bezem@gmail.com>
Co-authored-by: Runskrift <anders@rimfrost.nu>
Co-authored-by: SGT <gabriel.sgt@gmail.com>
Co-authored-by: Sachin Kekarjawalekar <kekarjawalekarsachin1@gmail.com>
Co-authored-by: Sai varun <saivarunkollurufb@gmail.com>
Co-authored-by: Santiago <santiwever@hotmail.com>
Co-authored-by: Sergey Katsubo <skatsubo@gmail.com>
Co-authored-by: Sergi Font <sfont@tuta.io>
Co-authored-by: Shawn <xiaxinx@gmail.com>
Co-authored-by: Sylvain Pichon <service@spichon.fr>
Co-authored-by: Taiki M <vexingly-many-mace@duck.com>
Co-authored-by: Theodor Onarheim <thbo@startmail.com>
Co-authored-by: Tijs-B <tijs.bergmans@telenet.be>
Co-authored-by: Tomas Veselis <tomkex@gmail.com>
Co-authored-by: Tony Ronaldo Matute <tonyronaldomatute@gmail.com>
Co-authored-by: Topaz Barziv <mail@topazbarziv.com>
Co-authored-by: User 123456789 <user123456789@users.noreply.hosted.weblate.org>
Co-authored-by: Valter Vicente <vallovic@gmail.com>
Co-authored-by: Vegard Fladby <vegard@fladby.org>
Co-authored-by: Xo <xocodokie@users.noreply.hosted.weblate.org>
Co-authored-by: Yago Raña Gayoso <yago.rana.gayoso@gmail.com>
Co-authored-by: adri1m64 <adrien.melle@laposte.net>
Co-authored-by: adriadam10 <adriadam10@gmail.com>
Co-authored-by: amirulashraf3861 <amirulashrafidros@gmail.com>
Co-authored-by: anton garcias <isaga.percompartir@gmail.com>
Co-authored-by: ardtas <ardtas@users.noreply.hosted.weblate.org>
Co-authored-by: bacardicoke <bacardicoke@gmail.com>
Co-authored-by: catelixor <catelixor+weblate@proton.me>
Co-authored-by: dark&white <darkwhite@users.noreply.hosted.weblate.org>
Co-authored-by: eSascha <kitaigorod49@yahoo.com>
Co-authored-by: eav5jhl0 <eav5jhl0@users.noreply.hosted.weblate.org>
Co-authored-by: evensure <j.evenschor@gmail.com>
Co-authored-by: jicetus <jicetus@users.noreply.hosted.weblate.org>
Co-authored-by: juanCoder64 <jgama12569@gmail.com>
Co-authored-by: lumppu <saukkolanerkki@gmail.com>
Co-authored-by: mastoduy <mastoduy@gmail.com>
Co-authored-by: miiyuh <itsazripp2@gmail.com>
Co-authored-by: no <weblate@rosenheim.dk>
Co-authored-by: sarga <devilcyber33@gmail.com>
Co-authored-by: slick-daddy <gokalpselamet@gmail.com>
Co-authored-by: st7105 <st7105@gmail.com>
Co-authored-by: waclaw66 <waclaw66@seznam.cz>
Co-authored-by: wickdj <wickdj@gmail.com>
Co-authored-by: Вячеслав Лукьяненко <madeinchuguev@gmail.com>
Co-authored-by: Оргил Пүрэвдорж <orgyldinio@proton.me>
---
 i18n/af.json            | 118 +++++++++-
 i18n/ar.json            | 470 ++++++++++++++++++++++++++++++-------
 i18n/be.json            | 276 +++++++++++++++++++++-
 i18n/bg.json            |  42 +++-
 i18n/bn.json            |  82 ++++++-
 i18n/ca.json            |  24 +-
 i18n/cs.json            |  69 +++++-
 i18n/da.json            |   4 +-
 i18n/de.json            |  54 ++++-
 i18n/el.json            |   2 -
 i18n/es.json            |  90 ++++---
 i18n/et.json            |  75 ++++--
 i18n/fi.json            |  73 +++++-
 i18n/fil.json           |   3 +
 i18n/fr.json            |  59 ++++-
 i18n/gl.json            |   1 -
 i18n/he.json            |  37 ++-
 i18n/hi.json            |   2 +
 i18n/hr.json            |   1 -
 i18n/hu.json            | 163 ++++++++++---
 i18n/id.json            |  23 +-
 i18n/it.json            | 115 +++++----
 i18n/ja.json            |  12 +-
 i18n/ko.json            |  39 ++-
 i18n/lt.json            |  99 ++++++--
 i18n/lv.json            |  84 ++++++-
 i18n/mn.json            |   8 +
 i18n/mr.json            |  19 +-
 i18n/ms.json            | 117 +++++++--
 i18n/nb_NO.json         | 127 ++++++----
 i18n/nl.json            |  55 ++++-
 i18n/nn.json            |  59 ++++-
 i18n/pl.json            |  42 +++-
 i18n/pt.json            |  43 +++-
 i18n/pt_BR.json         | 136 ++++++-----
 i18n/ro.json            | 134 +++++++++--
 i18n/ru.json            |  77 ++++--
 i18n/sk.json            | 508 +++++++++++++++++++++++++++-------------
 i18n/sl.json            |  49 +++-
 i18n/sr_Cyrl.json       |   1 -
 i18n/sr_Latn.json       |   1 -
 i18n/sv.json            |  24 +-
 i18n/ta.json            |   1 -
 i18n/te.json            |  15 +-
 i18n/th.json            | 219 ++++++++++++++---
 i18n/tr.json            | 202 +++++++++++++---
 i18n/uk.json            |   3 +-
 i18n/vi.json            |  20 +-
 i18n/zh_Hant.json       |   2 -
 i18n/zh_SIMPLIFIED.json |  49 +++-
 50 files changed, 3168 insertions(+), 760 deletions(-)

diff --git a/i18n/af.json b/i18n/af.json
index 55555c8398..b3729903ec 100644
--- a/i18n/af.json
+++ b/i18n/af.json
@@ -4,6 +4,7 @@
   "account_settings": "Rekeninginstellings",
   "acknowledge": "Erken",
   "action": "Aksie",
+  "action_common_update": "Opdateur",
   "actions": "Aksies",
   "active": "Aktief",
   "activity": "Aktiwiteite",
@@ -13,6 +14,7 @@
   "add_a_location": "Voeg 'n ligging by",
   "add_a_name": "Voeg 'n naam by",
   "add_a_title": "Voeg 'n titel by",
+  "add_endpoint": "Voeg Koppelvlakpunt by",
   "add_exclusion_pattern": "Voeg uitsgluitingspatrone by",
   "add_import_path": "Voeg invoerpad by",
   "add_location": "Voeg ligging by",
@@ -20,26 +22,30 @@
   "add_partner": "Voeg vennoot by",
   "add_path": "Voeg pad by",
   "add_photos": "Voeg foto's by",
+  "add_tag": "Voeg tag by",
   "add_to": "Voeg by…",
   "add_to_album": "Voeg na album",
-  "add_to_shared_album": "Voeg na gedeelde album",
+  "add_to_album_bottom_sheet_added": "By {album} bygevoeg",
+  "add_to_album_bottom_sheet_already_exists": "Reeds in {album}",
+  "add_to_shared_album": "Voeg toe aan gedeelde album",
   "add_url": "Voeg URL by",
-  "added_to_archive": "By argief gevoeg",
-  "added_to_favorites": "By gunstelinge gevoeg",
-  "added_to_favorites_count": "Het {count, number} by gunstelinge gevoeg",
+  "added_to_archive": "By argief toegevoegd",
+  "added_to_favorites": "By gunstelinge toegevoegd",
+  "added_to_favorites_count": "Het {count, number} by gunstelinge toegevoegd",
   "admin": {
     "add_exclusion_pattern_description": "Voeg uitsluitingspatrone by. Globbing met *, ** en ? word ondersteun. Om alle lêers in enige lêergids genaamd \"Raw\" te ignoreer, gebruik \"**/Raw/**\". Om alle lêers wat op \".tif\" eindig, te ignoreer, gebruik \"**/*.tif\". Om 'n absolute pad te ignoreer, gebruik \"/path/to/ignore/**\".",
+    "admin_user": "Admin gebruiker",
     "asset_offline_description": "Hierdie eksterne biblioteekbate word nie meer op skyf gevind nie en is na die asblik geskuif. As die lêer binne die biblioteek geskuif is, gaan jou tydlyn na vir die nuwe ooreenstemmende bate. Om hierdie bate te herstel, maak asseblief seker dat die lêerpad hieronder deur Immich verkry kan word en skandeer die biblioteek.",
     "authentication_settings": "Verifikasie instellings",
     "authentication_settings_description": "Bestuur wagwoord, OAuth en ander verifikasie instellings",
     "authentication_settings_disable_all": "Is jy seker jy wil alle aanmeldmetodes deaktiveer? Aanmelding sal heeltemal gedeaktiveer word.",
     "authentication_settings_reenable": "Om te heraktiveer, gebruik 'n <link>Server Command</link>.",
     "background_task_job": "Agtergrondtake",
-    "backup_database": "Rugsteun databasis",
+    "backup_database": "Skep Datastortlêer",
     "backup_database_enable_description": "Aktiveer databasisrugsteun",
     "backup_keep_last_amount": "Aantal vorige rugsteune om te hou",
     "backup_settings": "Rugsteun instellings",
-    "backup_settings_description": "Bestuur databasis rugsteun instellings",
+    "backup_settings_description": "Bestuur databasis rugsteun instellings.",
     "cleared_jobs": "Poste gevee vir: {job}",
     "config_set_by_file": "Config word tans deur 'n konfigurasielêer gestel",
     "confirm_delete_library": "Is jy seker jy wil {library}-biblioteek uitvee?",
@@ -47,6 +53,7 @@
     "confirm_email_below": "Om te bevestig, tik \"{email}\" hieronder",
     "confirm_reprocess_all_faces": "Is jy seker jy wil alle gesigte herverwerk? Dit sal ook genoemde mense skoonmaak.",
     "confirm_user_password_reset": "Is jy seker jy wil {user} se wagwoord terugstel?",
+    "confirm_user_pin_code_reset": "Is jy seker jy wil {user} se PIN kode herstel?",
     "create_job": "Skep werk",
     "cron_expression": "Cron uitdrukking",
     "cron_expression_description": "Stel die skanderingsinterval in met die cron-formaat. Vir meer inligting verwys asseblief na bv. <link>Crontab Guru</link>",
@@ -56,10 +63,14 @@
     "exclusion_pattern_description": "Met uitsluitingspatrone kan jy lêers en vouers ignoreer wanneer jy jou biblioteek skandeer. Dit is nuttig as jy vouers het wat lêers bevat wat jy nie wil invoer nie, soos RAW-lêers.",
     "external_library_management": "Eksterne Biblioteekbestuur",
     "face_detection": "Gesig deteksie",
+    "face_detection_description": "Detecteer die gesigte in media deur middel van masjienleer. Vir videos word slegs die duimnaelskets oorweeg. “Herlaai” (ver)werk al die media weer. “Stel terug” verwyder boonop alle huidige gesigdata. “Onverwerk” plaas bates in die tou wat nog nie verwerk is nie. Gedekte gesigte sal ná voltooiing van Gesigdetectie vir Gesigherkenning in die tou geplaas word, om hulle in bestaande of nuwe persone te groepeer.",
+    "facial_recognition_job_description": "Groepeer gesigte in mense in. Die stap is vinniger nadat Gesig Deteksie klaar is. \"Herstel\" (her-)groepeer alle gesigte. \"Vermiste\" plaas gesigte in ry wat nie 'n persoon gekoppel het nie.",
     "failed_job_command": "Opdrag {command} het misluk vir werk: {job}",
     "force_delete_user_warning": "WAARSKUWING: Dit sal onmiddellik die gebruiker en alle bates verwyder. Dit kan nie ontdoen word nie en die lêers kan nie herstel word nie.",
     "image_format": "Formaat",
     "image_format_description": "WebP produseer kleiner lêers as JPEG, maar is stadiger om te enkodeer.",
+    "image_fullsize_description": "Vol grote prent met geen metadata, gebruik wanner ingezoem",
+    "image_fullsize_enabled": "Skakel aan vol grote prent generasie",
     "image_prefer_embedded_preview": "Verkies ingebedde voorskou",
     "image_prefer_wide_gamut": "Verkies wide gamut",
     "image_prefer_wide_gamut_setting_description": "Gebruik Display P3 vir kleinkiekies. Dit behou die lewendheid van beelde met wye kleurruimtes beter, maar beelde kan anders verskyn op ou apparate met 'n ou blaaierweergawe. sRGB-beelde gebruik steeds sRGB om kleurverskuiwings te voorkom.",
@@ -77,8 +88,99 @@
     "job_concurrency": "{job} gelyktydigheid",
     "job_created": "Taak gemaak",
     "job_not_concurrency_safe": "Hierdie taak kan nie gelyktydig uitgevoer word nie.",
-    "job_settings": "Agtergrondtaakinstellings"
+    "job_settings": "Agtergrondtaakinstellings",
+    "job_settings_description": "Bestuur werkgelyktydigheid",
+    "job_status": "Werkstatus",
+    "library_created": "Biblioteek geskep: {library}",
+    "library_deleted": "Biblioteek verwyder",
+    "library_import_path_description": "Spesifiseer 'n leer om in te neem. Hierdie leer, en al die sub leers, gaan geskandeer for vir prente en videos.",
+    "library_scanning": "Periodieke Skandering",
+    "library_scanning_description": "Stel periodieke skandering van biblioteek in",
+    "library_scanning_enable_description": "Aktiveer periodieke biblioteekskandering",
+    "library_settings": "Eksterne Biblioteek",
+    "map_settings": "Kaart",
+    "migration_job": "Migrasie",
+    "oauth_settings": "OAuth",
+    "transcoding_acceleration_vaapi": "VAAPI"
   },
+  "administration": "Administrasie",
+  "advanced": "Gevorderde",
+  "albums": "Albums",
+  "all": "Alle",
+  "anti_clockwise": "Anti-kloksgewys",
+  "archive": "Argief",
+  "asset_skipped": "Oorgeslaan",
+  "asset_uploaded": "Opgelaai",
+  "asset_uploading": "Oplaai…",
+  "assets": "Bates",
+  "back": "Terug",
+  "backward": "Agteruit",
+  "build": "Bou",
+  "camera": "Kamera",
+  "cancel": "Kanselleer",
+  "city": "Stad",
+  "clockwise": "Kloksgewys",
+  "close": "Maak toe",
+  "color": "Kleur",
+  "confirm": "Bevestig",
+  "contain": "Bevat",
+  "context": "Konteks",
+  "continue": "Gaan voort",
+  "country": "Land",
+  "cover": "Bedek",
+  "create": "Skep",
+  "created": "Geskep",
+  "dark": "Donker",
+  "day": "Dag",
+  "delete": "Verwyder",
+  "description": "Beskrywing",
+  "details": "Besonderhede",
+  "direction": "Rigting",
+  "discover": "Ontdek",
+  "documentation": "Dokumentasie",
+  "done": "Klaar",
+  "download": "Aflaai",
+  "download_settings": "Aflaai",
+  "duplicates": "Duplikate",
+  "duration": "Duur",
+  "edit": "Wysig",
+  "edited": "Gewysigd",
   "search_by_description": "Soek by beskrywing",
-  "search_by_description_example": "Stapdag in Sapa"
+  "search_by_description_example": "Stapdag in Sapa",
+  "version": "Weergawe",
+  "version_announcement_closing": "Jou friend, Alex",
+  "version_history": "Weergawegeskiedenis",
+  "version_history_item": "{version} geinstaleerd op {date}",
+  "video": "Video",
+  "videos": "Video's",
+  "view": "Bekyk",
+  "view_album": "Bekyk Album",
+  "view_all": "Bekyk alle",
+  "view_all_users": "Bekyk alle gebruikers",
+  "view_in_timeline": "Bekyk in tydlyn",
+  "view_link": "Bekyk skakel",
+  "view_links": "Bekyk skakels",
+  "view_name": "Bekyk",
+  "view_next_asset": "Bekyk volgende bate",
+  "view_previous_asset": "Bekyk vorige bate",
+  "view_qr_code": "Bekyk QR-kode",
+  "view_stack": "Bekyk stapel",
+  "view_user": "Bekyk gebruiker",
+  "viewer_remove_from_stack": "Verwyder van stapel",
+  "viewer_stack_use_as_main_asset": "Gebruik as hoofbate",
+  "viewer_unstack": "Ontstapel",
+  "visibility_changed": "Sigbaarheid verander voor {count, plural, one {# person} other {# people}}",
+  "waiting": "Wag",
+  "warning": "Waaskuwing",
+  "week": "Week",
+  "welcome": "Welkom",
+  "welcome_to_immich": "Welkom by Immich",
+  "wifi_name": "Wi-Fi Naam",
+  "wrong_pin_code": "Verkeerde PIN-kode",
+  "year": "Jaar",
+  "years_ago": "{years, plural, one {# year} other {# years}} gelede",
+  "yes": "Ja",
+  "you_dont_have_any_shared_links": "Jy het geen gedeelde skakels",
+  "your_wifi_name": "Jou Wi-Fi naam",
+  "zoom_image": "Vergroot Prent"
 }
diff --git a/i18n/ar.json b/i18n/ar.json
index 67f7752ae1..6042c8f82f 100644
--- a/i18n/ar.json
+++ b/i18n/ar.json
@@ -1,19 +1,20 @@
 {
-  "about": "من نحن",
-  "account": "الحساب",
+  "about": "عن",
+  "account": "حساب",
   "account_settings": "إعدادات الحساب",
   "acknowledge": "أُدرك ذلك",
-  "action": "التحكم",
+  "action": "عملية",
   "action_common_update": "تحديث",
-  "actions": "العمليات",
+  "actions": "عمليات",
   "active": "نشط",
-  "activity": "النشاط",
+  "activity": "نشاط",
   "activity_changed": "النشاط {enabled, select, true {مُفْعل} other {معطّل}}",
   "add": "إضافة",
   "add_a_description": "إضافة وصف",
   "add_a_location": "إضافة موقع",
   "add_a_name": "إضافة إسم",
   "add_a_title": "إضافة عنوان",
+  "add_endpoint": "اضف نقطة نهاية",
   "add_exclusion_pattern": "إضافة نمط إستثناء",
   "add_import_path": "إضافة مسار الإستيراد",
   "add_location": "إضافة موقع",
@@ -21,28 +22,30 @@
   "add_partner": "أضف شريكًا",
   "add_path": "إضافة مسار",
   "add_photos": "إضافة صور",
+  "add_tag": "اضف علامة",
   "add_to": "إضافة إلى…",
   "add_to_album": "إضافة إلى ألبوم",
   "add_to_album_bottom_sheet_added": "تمت الاضافة{album}",
   "add_to_album_bottom_sheet_already_exists": "موجودة مسبقا {album}",
-  "add_to_shared_album": "إضافة إلى ألبوم مشترك",
+  "add_to_shared_album": "إضافة إلى ألبوم مشارك",
   "add_url": "إضافة رابط",
   "added_to_archive": "أُضيفت للأرشيف",
   "added_to_favorites": "أُضيفت للمفضلات",
   "added_to_favorites_count": "تم إضافة {count, number} إلى المفضلات",
   "admin": {
     "add_exclusion_pattern_description": "إضافة أنماط الاستبعاد. يدعم التمويه باستخدام *، **، و؟. لتجاهل جميع الملفات في أي دليل يسمى \"Raw\"، استخدم \"**/Raw/**\". لتجاهل جميع الملفات التي تنتهي بـ \".tif\"، استخدم \"**/*.tif\". لتجاهل مسار مطلق، استخدم \"/path/to/ignore/**\".",
+    "admin_user": "مستخدم مدير",
     "asset_offline_description": "لم يعد هذا الأصل الخاص بالمكتبة الخارجية موجودًا على القرص وتم نقله إلى سلة المهملات. إذا تم نقل الملف داخل المكتبة، فتحقق من الجدول الزمني الخاص بك لمعرفة الأصل الجديد المقابل. لاستعادة هذا الأصل، يرجى التأكد من إمكانية الوصول إلى مسار الملف أدناه بواسطة Immich ومن ثم قم بمسح المكتبة.",
     "authentication_settings": "إعدادات المصادقة",
     "authentication_settings_description": "إدارة كلمة المرور وOAuth وإعدادات المصادقة الأُخرى",
     "authentication_settings_disable_all": "هل أنت متأكد أنك تريد تعطيل جميع وسائل تسجيل الدخول؟ سيتم تعطيل تسجيل الدخول بالكامل.",
     "authentication_settings_reenable": "لإعادة التفعيل، استخدم <link>أمر الخادم</link>.",
     "background_task_job": "المهام الخلفية",
-    "backup_database": "قاعدة البيانات الاحتياطية",
-    "backup_database_enable_description": "تمكين النسخ الاحتياطي لقاعدة البيانات",
-    "backup_keep_last_amount": "مقدار النسخ الاحتياطية السابقة للاحتفاظ بها",
-    "backup_settings": "إعدادات النسخ الاحتياطي",
-    "backup_settings_description": "إدارة إعدادات النسخ الاحتياطي لقاعدة البيانات",
+    "backup_database": "انشاء تفريغ قاعدة البيانات",
+    "backup_database_enable_description": "تمكين تفريغ قاعدة البيانات",
+    "backup_keep_last_amount": "مقدار التفريغات السابقة للاحتفاظ بها",
+    "backup_settings": "إعدادات تفريغ قاعدة البيانات",
+    "backup_settings_description": "إدارة إعدادات تفريغ قاعدة البيانات.",
     "cleared_jobs": "تم إخلاء مهام: {job}",
     "config_set_by_file": "الإعدادات حاليًا معينة عن طريق ملف الاعدادات",
     "confirm_delete_library": "هل أنت متأكد أنك تريد حذف مكتبة {library}؟",
@@ -50,6 +53,7 @@
     "confirm_email_below": "للتأكيد، اكتب \"{email}\" بالأسفل",
     "confirm_reprocess_all_faces": "هل أنت متأكد أنك تريد إعادة معالجة جميع الوجوه؟ سيخلي هذا كل الأشخاص الذين سَميتَهم.",
     "confirm_user_password_reset": "هل أنت متأكد أنك تريد إعادة تعيين كلمة مرور {user}؟",
+    "confirm_user_pin_code_reset": "هل انت متاكد من اعادة ضبط رمز PIN الخاص ب {user}؟",
     "create_job": "إنشاء وظيفة",
     "cron_expression": "تعبير Cron",
     "cron_expression_description": "اضبط الفاصل الزمني للفحص باستخدام تنسيق cron. لمزيد من المعلومات يُرجى الرجوع إلى <link>Crontab Guru</link> على سبيل المثال",
@@ -65,10 +69,15 @@
     "force_delete_user_warning": "تحذير: سيؤدي ذلك إلى إزالة المستخدم وجميع محتوياته على الفور. لا يمكن التراجع عن هذا الإجراء ولا يمكن استرداد الملفات.",
     "image_format": "التنسيق",
     "image_format_description": "يُنتج WebP ملفات أصغر حجمًا من ملفات JPEG، ولكنه أبطأ في عملية الترميز.",
+    "image_fullsize_description": "صورة بحجم كامل مع ازالة البيانات الوصفية، تستخدم عند التكبير",
+    "image_fullsize_enabled": "تمكين توليد الصور بحجم كامل",
+    "image_fullsize_enabled_description": "توليد صور بحجم كامل للصيغ الغير صديقة للويب. عند تفعيل \"تفضيل العرض المدمج\" ، العروض المدمجه تستخدم بشكل مباشر بدون تحويل. لا يؤثر على الصيغ الصديقة للويب مثل JPEG.",
+    "image_fullsize_quality_description": "صور بدقة كاملة من ١-١٠٠. الاعلى افضل ولكن ينتج ملفات بحجم اكبر.",
+    "image_fullsize_title": "اعدادات الصور بحجم كامل",
     "image_prefer_embedded_preview": "تفضيل المعاينة المدمجة",
-    "image_prefer_embedded_preview_setting_description": "استخدم المعاينات المضمنة في صور RAW كمدخل لمعالجة الصور عندما تكون متاحة. يؤدي لإنتاج ألوان أكثر دقة لبعض الصور، لكن جودة المعاينة تعتمد على الكاميرا وقد تحتوي الصورة على شوائب ضغطٍ أكثر.",
-    "image_prefer_wide_gamut": "تفضيل نطاق الألوان الواسع",
-    "image_prefer_wide_gamut_setting_description": "استخدم Display P3 للصور المصغرة. يحافظ هذا على حيوية الصور ذات مساحات الألوان الواسعة بشكل أفضل، ولكن قد تظهر الصور بشكل مختلف على الأجهزة القديمة ذات إصدار متصفح قديم. يتم الاحتفاظ بصور sRGB بتنسيق sRGB لتجنب تغيرات اللون.",
+    "image_prefer_embedded_preview_setting_description": "استخدم المعاينات المضمنة في صور RAW كمدخل لمعالجة الصور عندما تكون متاحة. ينتج عنه انتاج ألوان أكثر دقة لبعض الصور، لكن جودة المعاينة تعتمد على الكاميرا وقد تحتوي الصورة على شوائب ضغطٍ أكثر.",
+    "image_prefer_wide_gamut": "تفضيل تدرج الألوان الواسع",
+    "image_prefer_wide_gamut_setting_description": "استخدم عرض P3 للصور المصغرة. يحافظ هذا على حيوية الصور ذات مساحات الألوان الواسعة بشكل أفضل، ولكن قد تظهر الصور بشكل مختلف على الأجهزة القديمة ذات إصدار متصفح قديم. يتم الاحتفاظ بصور sRGB بتنسيق sRGB لتجنب تغيرات اللون.",
     "image_preview_description": "صورة متوسطة الحجم مع بيانات وصفية مجردة، تُستخدم عند عرض أصل واحد وللتعلم الآلي",
     "image_preview_quality_description": "جودة المعاينة من 1 إلى 100. كلما كانت القيمة أعلى كان ذلك أفضل، ولكنها تنتج ملفات أكبر وقد تقلل من استجابة التطبيق. قد يؤثر ضبط قيمة منخفضة على جودة التعلم الآلي.",
     "image_preview_title": "إعدادات المعاينة",
@@ -91,18 +100,18 @@
     "library_created": "تم إنشاء المكتبة: {library}",
     "library_deleted": "تم حذف المكتبة",
     "library_import_path_description": "حدد مجلدًا للاستيراد. سيتم فحص هذا المجلد، بما في ذلك المجلدات الفرعية، بحثًا عن الصور ومقاطع الفيديو.",
-    "library_scanning": "الفحص الدوري",
-    "library_scanning_description": "إعداد فحص المكتبة الدوري",
-    "library_scanning_enable_description": "تفعيل فحص المكتبة الدوري",
+    "library_scanning": "المسح الدوري",
+    "library_scanning_description": "إعداد مسح المكتبة الدوري",
+    "library_scanning_enable_description": "تفعيل مسح المكتبة الدوري",
     "library_settings": "المكتبة الخارجية",
     "library_settings_description": "إدارة إعدادات المكتبة الخارجية",
     "library_tasks_description": "مسح المكتبات الخارجية للعثور على الأصول الجديدة و/أو المتغيرة",
-    "library_watching_enable_description": "راقب المكتبات الخارجية لتتبع تغييرات الملفات",
+    "library_watching_enable_description": "راقب المكتبات الخارجية لتغييرات الملفات",
     "library_watching_settings": "مراقبة المكتبات (تجريبي)",
     "library_watching_settings_description": "راقب تلقائيًا التغييرات في الملفات",
     "logging_enable_description": "تفعيل تسجيل الأحداث",
     "logging_level_description": "عند التفعيل، أي مستوى تسجيل سيستخدم.",
-    "logging_settings": "تسجيل الأحداث",
+    "logging_settings": "تسجيل الاحداث",
     "machine_learning_clip_model": "نموذج CLIP",
     "machine_learning_clip_model_description": "اسم نموذج CLIP مدرجٌ <link>هنا</link>. يرجى ملاحظة أنه يجب إعادة تشغيل وظيفة \"البحث الذكي\" لجميع الصور بعد تغيير النموذج.",
     "machine_learning_duplicate_detection": "كشف التكرار",
@@ -142,10 +151,10 @@
     "map_light_style": "النمط الفاتح",
     "map_manage_reverse_geocoding_settings": "إدارة إعدادات <link>التكوين الجغرافي المعكوس</link>",
     "map_reverse_geocoding": "عكس الترميز الجغرافي",
-    "map_reverse_geocoding_enable_description": "تفعيل عكس الترميز الجغرافي",
-    "map_reverse_geocoding_settings": "إعدادات عكس الترميز الجغرافي",
-    "map_settings": "الخريطة",
-    "map_settings_description": "إدارة إعدادات الخريطة",
+    "map_reverse_geocoding_enable_description": "تفعيل الترميز الجغرافي العكسي",
+    "map_reverse_geocoding_settings": "إعدادات الترميز الجغرافي العكسي",
+    "map_settings": "الخارطة",
+    "map_settings_description": "إدارة إعدادات الخارطة",
     "map_style_description": "عنوان URL لسمة الخريطة style.json",
     "memory_cleanup_job": "تنظيف الذاكرة",
     "memory_generate_job": "توليد الذاكرة",
@@ -157,12 +166,26 @@
     "metadata_settings_description": "إدارة إعدادات البيانات الوصفية",
     "migration_job": "ترحيل",
     "migration_job_description": "ترحيل الصور المصغرة للمحتويات والوجوه إلى أحدث هيكل مجلدات",
+    "nightly_tasks_cluster_faces_setting_description": "قم بتشغيل التعرف على الوجه على الوجوه المكتشفة حديثا",
+    "nightly_tasks_cluster_new_faces_setting": "مجموعة الوجوه الجديدة",
+    "nightly_tasks_database_cleanup_setting": "مهام تنظيف قاعدة البيانات",
+    "nightly_tasks_database_cleanup_setting_description": "قم بتنظيف البيانات القديمة منتهية الصلاحية من قاعدة البيانات",
+    "nightly_tasks_generate_memories_setting": "إنشاء الذكريات",
+    "nightly_tasks_generate_memories_setting_description": "إنشاء ذكريات جديدة من الأصول",
+    "nightly_tasks_missing_thumbnails_setting": "إنشاء صور مصغرة مفقودة",
+    "nightly_tasks_missing_thumbnails_setting_description": "أصول قائمة الانتظار بدون صور مصغرة لإنشاء الصور المصغرة",
+    "nightly_tasks_settings": "إعدادات المهام الليلية",
+    "nightly_tasks_settings_description": "إدارة المهام الليلية",
+    "nightly_tasks_start_time_setting": "وقت البدء",
+    "nightly_tasks_start_time_setting_description": "الوقت الذي يبدأ فيه الخادم في تشغيل المهام الليلية",
+    "nightly_tasks_sync_quota_usage_setting": "مزامنة حصة الاستخدام",
+    "nightly_tasks_sync_quota_usage_setting_description": "تحديث حصة تخزين المستخدم، بناء على الاستخدام الحالي",
     "no_paths_added": "لم يتم إضافة أي مسارات",
     "no_pattern_added": "لم يتم إضافة أي أنماط",
-    "note_apply_storage_label_previous_assets": "ملاحظة: لتطبيق تسمية التخزين على المحتويات التي تم رفعها سابقًا، قم بتشغيل",
+    "note_apply_storage_label_previous_assets": "ملاحظة: لتطبيق سمية التخزين على المحتويات التي تم رفعها سابقًا، قم بتشغيل",
     "note_cannot_be_changed_later": "ملاحظة: لا يمكن تغيير هذا لاحقًا!",
     "notification_email_from_address": "عنوان المرسل",
-    "notification_email_from_address_description": "عنوان البريد الإلكتروني للمرسل، على سبيل المثال: \"Immich Photo Server noreply@example.com\"",
+    "notification_email_from_address_description": "عنوان البريد الإلكتروني للمرسل، على سبيل المثال: \"Immich Photo Server noreply@example.com\". تاكد من استخدام عنوان بريد الكتروني يسمح لك بارسال البريد الالكتروني منه.",
     "notification_email_host_description": "مضيف خادم البريد الإلكتروني (مثلًا: smtp.immich.app)",
     "notification_email_ignore_certificate_errors": "تجاهل أخطاء الشهادة",
     "notification_email_ignore_certificate_errors_description": "تجاهل أخطاء التحقق من صحة شهادة TLS (غير مستحسن)",
@@ -182,6 +205,7 @@
     "oauth_auto_register": "التسجيل التلقائي",
     "oauth_auto_register_description": "التسجيل التلقائي للمستخدمين الجدد بعد تسجيل الدخول باستخدام OAuth",
     "oauth_button_text": "نص الزر",
+    "oauth_client_secret_description": "مطلوب اذاPKCE(مفتاح الاثبات لتبادل الكود) لم يتم توفيره من مزود OAuth",
     "oauth_enable_description": "تسجيل الدخول باستخدام OAuth",
     "oauth_mobile_redirect_uri": "عنوان URI لإعادة التوجيه على الهاتف",
     "oauth_mobile_redirect_uri_override": "تجاوز عنوان URI لإعادة التوجيه على الهاتف",
@@ -189,12 +213,14 @@
     "oauth_settings": "OAuth",
     "oauth_settings_description": "إدارة إعدادات تسجيل الدخول OAuth",
     "oauth_settings_more_details": "لمزيد من التفاصيل حول هذه الميزة، يرجى الرجوع إلى <link>الوثائق</link>.",
-    "oauth_storage_label_claim": "المطالبة بتصنيف التخزين",
-    "oauth_storage_label_claim_description": "قم تلقائيًا بتعيين تصنيف التخزين الخاص بالمستخدم على قيمة هذه المطالبة.",
+    "oauth_storage_label_claim": "المطالبة بسمة التخزين",
+    "oauth_storage_label_claim_description": "قم تلقائيًا بتعيين سمة التخزين الخاص بالمستخدم على قيمة هذه المطالبة.",
     "oauth_storage_quota_claim": "المطالبة بحصة التخزين",
     "oauth_storage_quota_claim_description": "قم تلقائيًا بتعيين حصة التخزين للمستخدم على قيمة هذه المطالبة.",
     "oauth_storage_quota_default": "حصة التخزين الافتراضية (جيجابايت)",
-    "oauth_storage_quota_default_description": "الحصة بالجيجابايت التي سيتم استخدامها عندما لا يتم توفير مطالبة (أدخل 0 لحصة غير محدودة).",
+    "oauth_storage_quota_default_description": "الحصة بالجيجابايت التي سيتم استخدامها عندما لا يتم توفير مطالبة.",
+    "oauth_timeout": "نفاذ وقت الطلب",
+    "oauth_timeout_description": "نفاذ وقت الطلب بالميلي ثانية",
     "password_enable_description": "تسجيل الدخول باستخدام البريد الكتروني وكلمة المرور",
     "password_settings": "تسجيل الدخول بكلمة المرور",
     "password_settings_description": "إدارة تسجيل الدخول بكلمة المرور",
@@ -229,13 +255,14 @@
     "storage_template_hash_verification_enabled_description": "تفعيل التحقق من الهاش، لا تعطل هذا إلا إذا كنت متأكدًا من تأثيراته",
     "storage_template_migration": "تهجير قالب التخزين",
     "storage_template_migration_description": "قم بتطبيق القالب الحالي <link>{template}</link> على المحتويات التي تم رفعها سابقًا",
-    "storage_template_migration_info": "تغييرات القالب ستنطبق فقط على المحتويات الجديدة. لتطبيق القالب على المحتويات التي تم رفعها سابقًا، قم بتشغيل <link>{job}</link>.",
+    "storage_template_migration_info": "تغييرات النموذج الخزني ستغير جميع الصيغ الى احرف صغيرة. تغييرات النموذج ستنطبق فقط على المحتويات الجديدة. لتطبيق النموذج على المحتويات التي تم رفعها سابقًا، قم بتشغيل <link>{job}</link>.",
     "storage_template_migration_job": "وظيفة تهجير قالب التخزين",
     "storage_template_more_details": "لمزيد من التفاصيل حول هذه الميزة، يرجى الرجوع إلى <template-link>Storage Template</template-link> و<implications-link>implications</implications-link>",
+    "storage_template_onboarding_description_v2": "عند التفعيل. هذه الخاصية ستقوم بالترتيب التلقائي للملفات بناء على نموذج معرف من قبل المستخدم. رجاء اطلع على <link>التوثيق</link>.",
     "storage_template_path_length": "الحد التقريبي لطول المسار: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "قالب التخزين",
     "storage_template_settings_description": "إدارة هيكل المجلد واسم الملف للأصول المرفوعة",
-    "storage_template_user_label": "<code>{label}</code> هو تسمية التخزين الخاصة بالمستخدم",
+    "storage_template_user_label": "<code>{label}</code> هو سمة التخزين الخاصة بالمستخدم",
     "system_settings": "إعدادات النظام",
     "tag_cleanup_job": "تنظيف العلامة",
     "template_email_available_tags": "يمكنك استخدام المتغيرات التالية في القالب الخاص بك: {tags}",
@@ -246,15 +273,15 @@
     "template_email_update_album": "تحديث قالب الألبوم",
     "template_email_welcome": "قالب البريد الإلكتروني الترحيبي",
     "template_settings": "قوالب الإشعارات",
-    "template_settings_description": "إدارة القوالب المخصصة للإشعارات.",
+    "template_settings_description": "إدارة القوالب المخصصة للإشعارات",
     "theme_custom_css_settings": "CSS مخصص",
     "theme_custom_css_settings_description": "أوراق الأنماط المتتالية تسمح بتخصيص تصميم Immich.",
     "theme_settings": "إعدادات السمة",
     "theme_settings_description": "إدارة تخصيص واجهة ويب Immich",
     "thumbnail_generation_job": "إنشاء الصور المصغرة",
     "thumbnail_generation_job_description": "إنشاء صور مصغرة كبيرة وصغيرة وغير واضحة لكل أصل، بالإضافة إلى صور مصغرة لكل شخص",
-    "transcoding_acceleration_api": "واجهة برمجة التطبيقات للتسريع",
-    "transcoding_acceleration_api_description": "الواجهة البرمجية التي ستتفاعل مع جهازك لتسريع التحويل. هذا الإعداد هو \"أفضل محاولة\": سيعود إلى التحويل البرمجي في حالة الفشل. قد لا يعمل VP9 اعتمادًا على عتادك.",
+    "transcoding_acceleration_api": "تسريع API",
+    "transcoding_acceleration_api_description": "API التي ستتفاعل مع جهازك لتسريع التحويل. هذا الإعداد هو \"أفضل محاولة\": سيعود إلى التحويل البرمجي في حالة الفشل. قد لا يعمل VP9 اعتمادًا على عتادك.",
     "transcoding_acceleration_nvenc": "NVENC (يتطلب GPU من NVIDIA)",
     "transcoding_acceleration_qsv": "Quick Sync (يتطلب معالج Intel من الجيل السابع أو أحدث)",
     "transcoding_acceleration_rkmpp": "RKMPP (فقط على شرائح Rockchip SOC)",
@@ -278,13 +305,13 @@
     "transcoding_encoding_options": "خيارات الترميز",
     "transcoding_encoding_options_description": "اضبط برامج الترميز والدقة والجودة والخيارات الأخرى لمقاطع الفيديو المشفرة",
     "transcoding_hardware_acceleration": "التسريع العتادي",
-    "transcoding_hardware_acceleration_description": "تجريبي؛ أسرع بكثير، ولكن ستكون جودتها أقل عند نفس معدل البت",
+    "transcoding_hardware_acceleration_description": "تجريبي: ترميز اسرع لكن قد يقلل من الجودة مع معدل بت اقل",
     "transcoding_hardware_decoding": "فك تشفير الأجهزة",
     "transcoding_hardware_decoding_setting_description": "ينطبق ذلك فقط على NVENC، QSV، و RKMPP. يمكن التسريع من طرف لطرف بدلاً من تسريع الترميز فقط. قد لا يعمل على جميع مقاطع الفيديو.",
     "transcoding_max_b_frames": "أقصى عدد من الإطارات B",
     "transcoding_max_b_frames_description": "القيم الأعلى تعزز كفاءة الضغط، ولكنها تبطئ عملية الترميز. قد لا تكون متوافقة مع التسريع العتادي على الأجهزة القديمة. قيمة 0 تعطل إطارات B، بينما تضبط القيمة -1 هذا القيمة تلقائيًا.",
     "transcoding_max_bitrate": "الحد الأقصى لمعدل البت",
-    "transcoding_max_bitrate_description": "يمكن أن يؤدي تعيين الحد الأقصى لمعدل البت إلى جعل أحجام الملفات أكثر قابلية للتنبؤ بها بتكلفة بسيطة بالنسبة للجودة. عند دقة 720 بكسل، تكون القيم النموذجية 2600 كيلو بايت لـ VP9 أو HEVC، أو 4500 كيلو بايت لـ H.264. معطل إذا تم ضبطه على 0.",
+    "transcoding_max_bitrate_description": "يمكن أن يؤدي تعيين الحد الأقصى لمعدل البت إلى جعل أحجام الملفات أكثر قابلية للتنبؤ بها بتكلفة بسيطة بالنسبة للجودة. عند دقة 720 بكسل، تكون القيم النموذجية 2600 كيلو بت لـ VP9 أو HEVC، أو 4500 كيلو بت لـ H.264. معطل إذا تم ضبطه على 0.",
     "transcoding_max_keyframe_interval": "الحد الأقصى للفاصل الزمني للإطار الرئيسي",
     "transcoding_max_keyframe_interval_description": "يضبط الحد الأقصى لمسافة الإطار بين الإطارات الرئيسية. تؤدي القيم المنخفضة إلى زيادة سوء كفاءة الضغط، ولكنها تعمل على تحسين أوقات البحث وقد تعمل على تحسين الجودة في المشاهد ذات الحركة السريعة. 0 يضبط هذه القيمة تلقائيًا.",
     "transcoding_optimal_description": "مقاطع الفيديو ذات الدقة الأعلى من الدقة المستهدفة أو بتنسيق غير مقبول",
@@ -324,6 +351,7 @@
     "user_delete_delay_settings_description": "عدد الأيام بعد الإزالة لحذف حساب المستخدم ومحتوياته بشكل دائم. تقوم وظيفة حذف المستخدم بالتشغيل في منتصف الليل للتحقق من المستخدمين الجاهزين للحذف. سيتم تقييم التغييرات على هذا الإعداد في التنفيذ القادم.",
     "user_delete_immediately": "سيتم وضع حساب <b>{user}</b> ومحتوياته في قائمة الانتظار للحذف الدائم <b>على الفور</b>.",
     "user_delete_immediately_checkbox": "قائمة انتظار المستخدم والمحتويات للحذف الفوري",
+    "user_details": "تفاصيل المستخدم",
     "user_management": "إدارة المستخدم",
     "user_password_has_been_reset": "تمت إعادة تعيين كلمة المرور الخاصة بالمستخدم:",
     "user_password_reset_description": "يرجى تزويد المستخدم بكلمة المرور المؤقتة وإبلاغه بأنه سيحتاج إلى تغيير كلمة المرور عند تسجيل الدخول التالي.",
@@ -343,9 +371,17 @@
   "admin_password": "كلمة سر المشرف",
   "administration": "الإدارة",
   "advanced": "متقدم",
+  "advanced_settings_enable_alternate_media_filter_subtitle": "استخدم هذا الخيار لتصفية الوسائط اثناء المزامنه بناء على معايير بديلة. جرب هذا الخيار فقط كان لديك مشاكل مع التطبيق بالكشف عن جميع الالبومات.",
+  "advanced_settings_enable_alternate_media_filter_title": "[تجريبي] استخدم جهاز تصفية مزامنه البومات بديل",
+  "advanced_settings_log_level_title": "مستوى السجل: {level}",
   "advanced_settings_prefer_remote_subtitle": "تكون بعض الأجهزة بطيئة للغاية في تحميل الصور المصغرة من الأصول الموجودة على الجهاز. قم بتنشيط هذا الإعداد لتحميل الصور البعيدة بدلاً من ذلك.",
   "advanced_settings_prefer_remote_title": "تفضل الصور البعيدة",
+  "advanced_settings_proxy_headers_subtitle": "عرف عناوين الوكيل التي يستخدمها Immich لارسال كل طلب شبكي",
+  "advanced_settings_proxy_headers_title": "عناوين الوكيل",
+  "advanced_settings_self_signed_ssl_subtitle": "تخطي التحقق من شهادة SSL لخادم النقطة النهائي. مكلوب للشهادات الموقعة ذاتيا.",
   "advanced_settings_self_signed_ssl_title": "السماح بشهادات SSL الموقعة ذاتيًا",
+  "advanced_settings_sync_remote_deletions_subtitle": "حذف او استعادة تلقائي للاصول على هذا الجهاز عند تنفيذ العملية على الويب",
+  "advanced_settings_sync_remote_deletions_title": "مزامنة عمليات الحذف عن بعد [تجريبي]",
   "advanced_settings_tile_subtitle": "إعدادات المستخدم المتقدمة",
   "advanced_settings_troubleshooting_subtitle": "تمكين الميزات الإضافية لاستكشاف الأخطاء وإصلاحها",
   "advanced_settings_troubleshooting_title": "استكشاف الأخطاء وإصلاحها",
@@ -382,6 +418,9 @@
   "album_with_link_access": "السماح لأي شخص لديه الرابط برؤية الصور والأشخاص الموجودين في هذا الألبوم.",
   "albums": "الألبومات",
   "albums_count": "{count, plural, one {{count, number} ألبوم} other {{count, number} ألبومات}}",
+  "albums_default_sort_order": "ترتيب الألبوم الافتراضي",
+  "albums_default_sort_order_description": "ترتيب فرز الأصول الأولي عند إنشاء ألبومات جديدة.",
+  "albums_feature_description": "مجموعة من الأصول التي يمكن مشاركتها مع مستخدمين آخرين.",
   "all": "الكل",
   "all_albums": "جميع الألبومات",
   "all_people": "جميع الأشخاص",
@@ -392,20 +431,23 @@
   "allow_public_user_to_upload": "السماح للمستخدم العام بالرفع",
   "alt_text_qr_code": "صورة رمز الاستجابة السريعة (QR)",
   "anti_clockwise": "عكس اتجاه عقارب الساعة",
-  "api_key": "مفتاح واجهة برمجة التطبيقات",
+  "api_key": "مفتاح API",
   "api_key_description": "سيتم عرض هذه القيمة مرة واحدة فقط. يرجى التأكد من نسخها قبل إغلاق النافذة.",
   "api_key_empty": "يجب ألا يكون اسم مفتاح API فارغًا",
-  "api_keys": "مفاتيح واجهة برمجة التطبيقات",
+  "api_keys": "مفاتيح API",
   "app_bar_signout_dialog_content": "هل أنت متأكد أنك تريد الخروج",
   "app_bar_signout_dialog_ok": "نعم",
   "app_bar_signout_dialog_title": "خروج",
   "app_settings": "إعدادات التطبيق",
   "appears_in": "يظهر في",
   "archive": "الأرشيف",
+  "archive_action_prompt": "{count} اضيف إلى الارشيف",
   "archive_or_unarchive_photo": "أرشفة الصورة أو إلغاء أرشفتها",
   "archive_page_no_archived_assets": "لم يتم العثور على الأصول المؤرشفة",
+  "archive_page_title": "ارشيف ({count})",
   "archive_size": "حجم الأرشيف",
   "archive_size_description": "تكوين حجم الأرشيف للتنزيلات (بالجيجابايت)",
+  "archived": "مؤرشفة",
   "archived_count": "{count, plural, other {الأرشيف #}}",
   "are_these_the_same_person": "هل هؤلاء هم نفس الشخص؟",
   "are_you_sure_to_do_this": "هل انت متأكد من أنك تريد أن تفعل هذا؟",
@@ -427,37 +469,55 @@
   "asset_list_settings_title": "شبكة الصور",
   "asset_offline": "المحتوى غير اتصال",
   "asset_offline_description": "لم يعد هذا الأصل الخارجي موجودًا على القرص. يرجى الاتصال بمسؤول Immich للحصول على المساعدة.",
+  "asset_restored_successfully": "تم استعادة الاصل بنجاح",
   "asset_skipped": "تم تخطيه",
   "asset_skipped_in_trash": "في سلة المهملات",
   "asset_uploaded": "تم الرفع",
   "asset_uploading": "جارٍ الرفع…",
+  "asset_viewer_settings_subtitle": "إدارة إعدادات عارض المعرض الخاص بك",
   "asset_viewer_settings_title": "عارض الأصول",
   "assets": "المحتويات",
   "assets_added_count": "تمت إضافة {count, plural, one {# محتوى} other {# محتويات}}",
   "assets_added_to_album_count": "تمت إضافة {count, plural, one {# الأصل} other {# الأصول}} إلى الألبوم",
-  "assets_added_to_name_count": "تم إضافة {count, plural, one {# محتوى} other {# محتويات }} إلى {hasName, select, true {<b>{name}</b>} other {ألبوم جديد}}",
+  "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} لايمكن اضافته الى الالبوم",
   "assets_count": "{count, plural, one {# محتوى} other {# محتويات}}",
+  "assets_deleted_permanently": "{count} الاص(و)ل المحذوف(ه) بشكل دائم",
+  "assets_deleted_permanently_from_server": "{count} الاص(و)ل المحذوف(ه) بشكل دائمي من خادم Immich",
+  "assets_downloaded_failed": "{count, plural, one {تم التحميل # ملف - {error} ملف فشل} other {تم التحميل # ملفات - {error} ملفات فشلت}}",
+  "assets_downloaded_successfully": "{count, plural, one {تم التحميل # ملف بنجاح} other {تم التحميل # ملفات بنجاح}}",
   "assets_moved_to_trash_count": "تم نقل {count, plural, one {# محتوى} other {# محتويات}} إلى سلة المهملات",
   "assets_permanently_deleted_count": "تم حذف {count, plural, one {# هذا المحتوى} other {# هذه المحتويات}} بشكل دائم",
   "assets_removed_count": "تمت إزالة {count, plural, one {# محتوى} other {# محتويات}}",
+  "assets_removed_permanently_from_device": "{count} الاص(و)ل محذوف(ه) من الجهاز",
   "assets_restore_confirmation": "هل أنت متأكد من أنك تريد استعادة جميع الأصول المحذوفة؟ لا يمكنك التراجع عن هذا الإجراء! لاحظ أنه لا يمكن استعادة أي أصول غير متصلة بهذه الطريقة.",
   "assets_restored_count": "تمت استعادة {count, plural, one {# محتوى} other {# محتويات}}",
+  "assets_restored_successfully": "{count} الاص(و)ل المستعاد(ه) بنجاح",
+  "assets_trashed": "{count} الاصل(و) ل المنقوله الى سلة المهملات",
   "assets_trashed_count": "تم إرسال {count, plural, one {# محتوى} other {# محتويات}} إلى سلة المهملات",
+  "assets_trashed_from_server": "{count} الاص(و)ل المنقولة الى سلة المهملات من خادم Immich",
   "assets_were_part_of_album_count": "{count, plural, one {هذا المحتوى} other {هذه المحتويات}} في الألبوم بالفعل",
   "authorized_devices": "الأجهزه المخولة",
+  "automatic_endpoint_switching_subtitle": "اتصل محليا من خلال شبكه Wi-Fi عند توفرها و استخدم اتصالات بديله في الاماكن الاخرى",
+  "automatic_endpoint_switching_title": "تبديل URL تلقائي",
+  "autoplay_slideshow": "تشغيل تلقائي لعرض الشرائح",
   "back": "خلف",
   "back_close_deselect": "الرجوع أو الإغلاق أو إلغاء التحديد",
+  "background_location_permission": "اذن الوصول للموقع في الخلفية",
+  "background_location_permission_content": "للتمكن من تبديل الشبكه بالخلفية، Immich يحتاج*دائما* للحصول على موقع دقيق ليتمكن التطبيق من قرائة اسم شبكة الWi-Fi",
+  "backup_album_selection_page_albums_device": "الالبومات على الجهاز ({count})",
   "backup_album_selection_page_albums_tap": "انقر للتضمين، وانقر نقرًا مزدوجًا للاستثناء",
   "backup_album_selection_page_assets_scatter": "يمكن أن تنتشر الأصول عبر ألبومات متعددة. وبالتالي، يمكن تضمين الألبومات أو استبعادها أثناء عملية النسخ الاحتياطي.",
   "backup_album_selection_page_select_albums": "حدد الألبومات",
   "backup_album_selection_page_selection_info": "معلومات الاختيار",
   "backup_album_selection_page_total_assets": "إجمالي الأصول الفريدة",
   "backup_all": "الجميع",
-  "backup_background_service_backup_failed_message": "فشل في النسخ الاحتياطي للأصول. جارٍ إعادة المحاولة...",
-  "backup_background_service_connection_failed_message": "فشل في الاتصال بالخادم. جارٍ إعادة المحاولة...",
-  "backup_background_service_default_notification": "التحقق من الأصول الجديدة ...",
+  "backup_background_service_backup_failed_message": "فشل في النسخ الاحتياطي للأصول. جارٍ إعادة المحاولة…",
+  "backup_background_service_connection_failed_message": "فشل في الاتصال بالخادم. جارٍ إعادة المحاولة…",
+  "backup_background_service_current_upload_notification": "تحميل {filename}",
+  "backup_background_service_default_notification": "التحقق من الأصول الجديدة…",
   "backup_background_service_error_title": "خطأ في النسخ الاحتياطي",
-  "backup_background_service_in_progress_notification": "النسخ الاحتياطي للأصول الخاصة بك...",
+  "backup_background_service_in_progress_notification": "النسخ الاحتياطي للأصول الخاصة بك…",
+  "backup_background_service_upload_failure_notification": "فشل تحميل {filename}",
   "backup_controller_page_albums": "ألبومات احتياطية",
   "backup_controller_page_background_app_refresh_disabled_content": "قم بتمكين تحديث تطبيق الخلفية في الإعدادات > عام > تحديث تطبيق الخلفية لاستخدام النسخ الاحتياطي في الخلفية.",
   "backup_controller_page_background_app_refresh_disabled_title": "تم تعطيل تحديث التطبيق في الخلفية",
@@ -468,17 +528,22 @@
   "backup_controller_page_background_battery_info_title": "تحسين البطارية",
   "backup_controller_page_background_charging": "فقط أثناء الشحن",
   "backup_controller_page_background_configure_error": "فشل في تكوين خدمة الخلفية",
+  "backup_controller_page_background_delay": "تاخير الخزن التلقائي للاصول: {duration}",
   "backup_controller_page_background_description": "قم بتشغيل خدمة الخلفية لإجراء نسخ احتياطي لأي أصول جديدة تلقائيًا دون الحاجة إلى فتح التطبيق",
   "backup_controller_page_background_is_off": "تم إيقاف النسخ الاحتياطي التلقائي للخلفية",
   "backup_controller_page_background_is_on": "النسخ الاحتياطي التلقائي للخلفية قيد التشغيل",
   "backup_controller_page_background_turn_off": "قم بإيقاف تشغيل خدمة الخلفية",
   "backup_controller_page_background_turn_on": "قم بتشغيل خدمة الخلفية",
-  "backup_controller_page_background_wifi": "فقط على واي فاي",
+  "backup_controller_page_background_wifi": "فقط على Wi-Fi",
   "backup_controller_page_backup": "دعم",
   "backup_controller_page_backup_selected": "المحدد: ",
   "backup_controller_page_backup_sub": "النسخ الاحتياطي للصور ومقاطع الفيديو",
+  "backup_controller_page_created": "انشئ في :{date}",
   "backup_controller_page_desc_backup": "قم بتشغيل النسخ الاحتياطي الأمامي لتحميل الأصول الجديدة تلقائيًا إلى الخادم عند فتح التطبيق.",
   "backup_controller_page_excluded": "مستبعد: ",
+  "backup_controller_page_failed": "فشل ({count})",
+  "backup_controller_page_filename": "اسم الملف : {filename} [{size}]",
+  "backup_controller_page_id": "هوية: {id}",
   "backup_controller_page_info": "معلومات النسخ الاحتياطي",
   "backup_controller_page_none_selected": "لم يتم التحديد",
   "backup_controller_page_remainder": "بقية",
@@ -487,7 +552,8 @@
   "backup_controller_page_start_backup": "بدء النسخ الاحتياطي",
   "backup_controller_page_status_off": "النسخة الاحتياطية التلقائية غير فعالة",
   "backup_controller_page_status_on": "النسخة الاحتياطية التلقائية فعالة",
-  "backup_controller_page_to_backup": "الألبومات  الاحتياطية",
+  "backup_controller_page_storage_format": "{used} من {total} مستخدم",
+  "backup_controller_page_to_backup": "الألبومات التي سيتم نسخها احتياطيا",
   "backup_controller_page_total_sub": "جميع الصور ومقاطع الفيديو الفريدة من ألبومات مختارة",
   "backup_controller_page_turn_off": "قم بإيقاف تشغيل النسخ الاحتياطي المقدمة",
   "backup_controller_page_turn_on": "قم بتشغيل النسخ الاحتياطي المقدمة",
@@ -499,7 +565,12 @@
   "backup_manual_success": "نجاح",
   "backup_manual_title": "حالة التحميل",
   "backup_options_page_title": "خيارات النسخ الاحتياطي",
+  "backup_setting_subtitle": "ادارة اعدادات التحميل في الخلفية والمقدمة",
   "backward": "الى الوراء",
+  "biometric_auth_enabled": "المصادقة البايومترية مفعله",
+  "biometric_locked_out": "لقد قفلت عنك المصادقة البيومترية",
+  "biometric_no_options": "لا توجد خيارات بايومترية متوفرة",
+  "biometric_not_available": "االمصادقة البيومترية غير متاحة على هذا الجهاز",
   "birthdate_saved": "تم حفظ تاريخ الميلاد بنجاح",
   "birthdate_set_description": "يتم استخدام تاريخ الميلاد لحساب عمر هذا الشخص وقت التقاط الصورة.",
   "blurred_background": "خلفية مشوشة",
@@ -514,12 +585,13 @@
   "cache_settings_clear_cache_button_title": "يقوم بمسح ذاكرة التخزين المؤقت للتطبيق.سيؤثر هذا بشكل كبير على أداء التطبيق حتى إعادة بناء ذاكرة التخزين المؤقت.",
   "cache_settings_duplicated_assets_clear_button": "واضح",
   "cache_settings_duplicated_assets_subtitle": "الصور ومقاطع الفيديو اللتي تم تجاهلها المدرجة في التطبيق",
+  "cache_settings_duplicated_assets_title": "الاصول المكررة ({count})",
   "cache_settings_statistics_album": "مكتبه الصور المصغره",
   "cache_settings_statistics_full": "صور كاملة",
   "cache_settings_statistics_shared": "صورة ألبوم مشتركة",
   "cache_settings_statistics_thumbnail": "الصورة المصغرة",
   "cache_settings_statistics_title": "استخدام ذاكرة التخزين المؤقت",
-  "cache_settings_subtitle": "تحكم في سلوك التخزين المؤقت لتطبيق الجوال.",
+  "cache_settings_subtitle": "تحكم في سلوك التخزين المؤقت لتطبيق Immich الجوال",
   "cache_settings_tile_subtitle": "التحكم في سلوك التخزين المحلي",
   "cache_settings_tile_title": "التخزين المحلي",
   "cache_settings_title": "إعدادات التخزين المؤقت",
@@ -527,11 +599,16 @@
   "camera_brand": "علامة الكاميرا التجارية",
   "camera_model": "طراز الكاميرا",
   "cancel": "إلغاء",
-  "cancel_search": "الغي البحث",
+  "cancel_search": "الغاء البحث",
+  "canceled": "تم الالغاء",
   "cannot_merge_people": "لا يمكن دمج الأشخاص",
   "cannot_undo_this_action": "لا يمكنك التراجع عن هذا الإجراء!",
   "cannot_update_the_description": "لا يمكن تحديث الوصف",
+  "cast": "بث",
+  "cast_description": "ضبط وجهات البث المتوفرة",
   "change_date": "غيّر التاريخ",
+  "change_description": "تغيير الوصف",
+  "change_display_order": "تغيير ترتيب العرض",
   "change_expiration_time": "تغيير وقت انتهاء الصلاحية",
   "change_location": "غيّر الموقع",
   "change_name": "تغيير الإسم",
@@ -543,9 +620,12 @@
   "change_password_form_new_password": "كلمة المرور الجديدة",
   "change_password_form_password_mismatch": "كلمة المرور غير مطابقة",
   "change_password_form_reenter_new_password": "أعد إدخال كلمة مرور جديدة",
-  "change_pin_code": "تغيير الرقم السري",
+  "change_pin_code": "تغيير رمز PIN",
   "change_your_password": "غير كلمة المرور الخاصة بك",
   "changed_visibility_successfully": "تم تغيير الرؤية بنجاح",
+  "check_corrupt_asset_backup": "التحقق من وجود نسخ احتياطية فاسدة للاصول",
+  "check_corrupt_asset_backup_button": "اجراء فحص",
+  "check_corrupt_asset_backup_description": "قم بإجراء هذا الفحص فقط عبر شبكة Wi-Fi وبعد نسخ جميع الأصول احتياطيًا. قد يستغرق الإجراء بضع دقائق.",
   "check_logs": "تحقق من السجلات",
   "choose_matching_people_to_merge": "اختر الأشخاص المتطابقين لدمجهم",
   "city": "المدينة",
@@ -554,6 +634,14 @@
   "clear_all_recent_searches": "مسح جميع عمليات البحث الأخيرة",
   "clear_message": "إخلاء الرسالة",
   "clear_value": "إخلاء القيمة",
+  "client_cert_dialog_msg_confirm": "حسنا",
+  "client_cert_enter_password": "ادخل كلمة سر",
+  "client_cert_import": "استيراد",
+  "client_cert_import_success_msg": "تم استيراد شهادة العميل",
+  "client_cert_invalid_msg": "ملف شهادة عميل غير صالحة او كلمة سر غير صحيحة",
+  "client_cert_remove_msg": "تم ازالة شهادة العميل",
+  "client_cert_subtitle": "يدعم صيغ PKCS12 (.p12, .pfx)فقط. استيراد/ازالة الشهادات متاح فقط قبل تسجيل الدخول",
+  "client_cert_title": "شهادة مستخدم SSL",
   "clockwise": "باتجاه عقارب الساعة",
   "close": "إغلاق",
   "collapse": "طي",
@@ -566,21 +654,27 @@
   "comments_are_disabled": "التعليقات معطلة",
   "common_create_new_album": "إنشاء ألبوم جديد",
   "common_server_error": "يرجى التحقق من اتصال الشبكة الخاص بك ، والتأكد من أن الجهاز قابل للوصول وإصدارات التطبيق/الجهاز متوافقة.",
+  "completed": "اكتمل",
   "confirm": "تأكيد",
   "confirm_admin_password": "تأكيد كلمة مرور المسؤول",
   "confirm_delete_face": "هل أنت متأكد من حذف وجه {name} من الأصول؟",
   "confirm_delete_shared_link": "هل أنت متأكد أنك تريد حذف هذا الرابط المشترك؟",
   "confirm_keep_this_delete_others": "سيتم حذف جميع الأصول الأخرى في المجموعة باستثناء هذا الأصل. هل أنت متأكد من أنك تريد المتابعة؟",
-  "confirm_new_pin_code": "ثبت الرقم السري الجديد",
+  "confirm_new_pin_code": "ثبت رمز PIN الجديد",
   "confirm_password": "تأكيد كلمة المرور",
+  "confirm_tag_face": "هل تريد وضع علامة على هذا الوجه {name}؟",
+  "confirm_tag_face_unnamed": "هل تريد وضع علامة على هذا الوجه؟",
+  "connected_device": "جهاز متصل",
+  "connected_to": "متصل ب",
   "contain": "محتواة",
   "context": "السياق",
   "continue": "متابعة",
   "control_bottom_app_bar_create_new_album": "إنشاء ألبوم جديد",
-  "control_bottom_app_bar_delete_from_immich": " حذف منال تطبيق",
+  "control_bottom_app_bar_delete_from_immich": "حذف من Immich",
   "control_bottom_app_bar_delete_from_local": "حذف من الجهاز",
   "control_bottom_app_bar_edit_location": "تحديد الوجهة",
   "control_bottom_app_bar_edit_time": "تحرير التاريخ والوقت",
+  "control_bottom_app_bar_share_link": "مشاركة رابط",
   "control_bottom_app_bar_share_to": "مشاركة إلى",
   "control_bottom_app_bar_trash_from_immich": "حذفه ونقله في سله المهملات",
   "copied_image_to_clipboard": "تم نسخ الصورة إلى الحافظة.",
@@ -602,6 +696,7 @@
   "create_link": "إنشاء رابط",
   "create_link_to_share": "إنشاء رابط للمشاركة",
   "create_link_to_share_description": "السماح لأي شخص لديه الرابط بمشاهدة الصورة (الصور) المحددة",
+  "create_new": "انشاء جديد",
   "create_new_person": "إنشاء شخص جديد",
   "create_new_person_hint": "تعيين المحتويات المحددة لشخص جديد",
   "create_new_user": "إنشاء مستخدم جديد",
@@ -611,14 +706,18 @@
   "create_tag_description": "أنشئ علامة جديدة. بالنسبة للعلامات المتداخلة، يرجى إدخال المسار الكامل للعلامة بما في ذلك الخطوط المائلة للأمام.",
   "create_user": "إنشاء مستخدم",
   "created": "تم الإنشاء",
+  "created_at": "مخلوق",
+  "crop": "قص",
   "curated_object_page_title": "أشياء",
   "current_device": "الجهاز الحالي",
-  "current_pin_code": "الرقم السري الحالي",
+  "current_pin_code": "رمز PIN الحالي",
+  "current_server_address": "عنوان الخادم الحالي",
   "custom_locale": "لغة مخصصة",
   "custom_locale_description": "تنسيق التواريخ والأرقام بناءً على اللغة والمنطقة",
   "daily_title_text_date": "E ، MMM DD",
   "daily_title_text_date_year": "E ، MMM DD ، yyyy",
   "dark": "معتم",
+  "dark_theme": "تبديل المظهر الداكن",
   "date_after": "التارخ بعد",
   "date_and_time": "التاريخ و الوقت",
   "date_before": "التاريخ قبل",
@@ -634,11 +733,12 @@
   "default_locale": "اللغة الافتراضية",
   "default_locale_description": "تنسيق التواريخ والأرقام بناءً على لغة المتصفح الخاص بك",
   "delete": "حذف",
+  "delete_action_prompt": "{count} حذف بشكل نهائي",
   "delete_album": "حذف الألبوم",
   "delete_api_key_prompt": "هل أنت متأكد أنك تريد حذف مفتاح API هذا؟",
-  "delete_dialog_alert": " هذه العناصر سيتم حذفها بشكل دائم من جهازك ومن تطبيق",
-  "delete_dialog_alert_local": " العناصر التي تم حذفها من جهازك ولكنها موجوده في تطبيق",
-  "delete_dialog_alert_local_non_backed_up": "بعض العناصر التي سيتم حذفها بشكل دائم ولا يوجد لها نسخه احتياطيه في تطبيق ",
+  "delete_dialog_alert": "هذه العناصر سيتم حذفها بشكل دائم من Immich و من جهازك",
+  "delete_dialog_alert_local": "العناصر التي سيتم حذفها من جهازك ولكن تبقى موجوده في خادم Immich",
+  "delete_dialog_alert_local_non_backed_up": "بعض العناصر غير مدعومة بنسخة احتياطية على Immich وسيتم إزالتها نهائيًا من جهازك",
   "delete_dialog_alert_remote": "العناصر التي سيتم حذفها بشكل دائم من تطبيق",
   "delete_dialog_ok_force": "احذف على أي حال",
   "delete_dialog_title": "الحذف بشكل نهائي",
@@ -664,7 +764,9 @@
   "direction": "الإتجاه",
   "disabled": "معطل",
   "disallow_edits": "منع التعديلات",
+  "discord": "دسكورد",
   "discover": "اكتشف",
+  "discovered_devices": "اجهزة مكتشفة",
   "dismiss_all_errors": "تجاهل كافة الأخطاء",
   "dismiss_error": "تجاهل الخطأ",
   "display_options": "عرض الخيارات",
@@ -675,12 +777,25 @@
   "documentation": "الوثائق",
   "done": "تم",
   "download": "تنزيل",
+  "download_canceled": "الغي التنزيل",
+  "download_complete": "اكتمل التنزيل",
+  "download_enqueue": "تنزيل في قائمة الانتظار",
+  "download_error": "خطا في التنزيل",
+  "download_failed": "فشل التنزيل",
+  "download_finished": "انتهى التنزيل",
   "download_include_embedded_motion_videos": "مقاطع الفيديو المدمجة",
   "download_include_embedded_motion_videos_description": "تضمين مقاطع الفيديو المضمنة في الصور المتحركة كملف منفصل",
+  "download_notfound": "لم يعثر على التنزيل",
+  "download_paused": "اوقف التنزيل",
   "download_settings": "التنزيلات",
   "download_settings_description": "إدارة الإعدادات المتعلقة بتنزيل المحتويات",
+  "download_started": "بدا التنزيل",
+  "download_sucess": "نجح التنزيل",
+  "download_sucess_android": "تم تحميل الوسائط الى DCIM/Immich",
+  "download_waiting_to_retry": "الانتظار للمحاولة",
   "downloading": "جارٍ التنزيل",
   "downloading_asset_filename": "{filename} قيد التنزيل",
+  "downloading_media": "تحميل الوسائط",
   "drop_files_to_upload": "قم بإسقاط الملفات في أي مكان لرفعها",
   "duplicates": "التكرارات",
   "duplicates_description": "قم بحل كل مجموعة من خلال الإشارة إلى التكرارات، إن وجدت",
@@ -690,6 +805,8 @@
   "edit_avatar": "تعديل الصورة الشخصية",
   "edit_date": "تعديل التاريخ",
   "edit_date_and_time": "تعديل التاريخ والوقت",
+  "edit_description": "تعديل الوصف",
+  "edit_description_prompt": "الرجاء اختيار وصف جديد:",
   "edit_exclusion_pattern": "تعديل نمط الاستبعاد",
   "edit_faces": "تعديل الوجوه",
   "edit_import_path": "تعديل مسار الاستيراد",
@@ -697,6 +814,7 @@
   "edit_key": "تعديل المفتاح",
   "edit_link": "تغيير الرابط",
   "edit_location": "تعديل الموقع",
+  "edit_location_action_prompt": "{count} موقع تم تعديله",
   "edit_location_dialog_title": "موقع",
   "edit_name": "تعديل الاسم",
   "edit_people": "تعديل الأشخاص",
@@ -710,15 +828,24 @@
   "editor_crop_tool_h2_aspect_ratios": "نسب العرض إلى الارتفاع",
   "editor_crop_tool_h2_rotation": "التدوير",
   "email": "البريد الإلكتروني",
+  "email_notifications": "تنبيهات البريد الالكتروني",
+  "empty_folder": "هذا المجلد فارغ",
   "empty_trash": "أفرغ سلة المهملات",
   "empty_trash_confirmation": "هل أنت متأكد أنك تريد إفراغ سلة المهملات؟ سيؤدي هذا إلى إزالة جميع المحتويات الموجودة في سلة المهملات بشكل نهائي من Immich.\nلا يمكنك التراجع عن هذا الإجراء!",
   "enable": "تفعيل",
+  "enable_biometric_auth_description": "أدخل رمز PIN الخاص بك لتمكين المصادقة البيومترية",
   "enabled": "مفعل",
   "end_date": "تاريخ الإنتهاء",
-  "enter_wifi_name": "Enter WiFi name",
+  "enqueued": "مُدرج في الطابور",
+  "enter_wifi_name": "ادخل اسم Wi-Fi",
+  "enter_your_pin_code": "أدخل رمز PIN الخاص بك",
+  "enter_your_pin_code_subtitle": "أدخل رمز PIN الخاص بك للوصول إلى المجلد المقفل",
   "error": "خطأ",
+  "error_change_sort_album": "فشل في تغيير ترتيب الألبوم",
   "error_delete_face": "حدث خطأ في حذف الوجه من الأصول",
   "error_loading_image": "حدث خطأ أثناء تحميل الصورة",
+  "error_saving_image": "خطأ: {error}",
+  "error_tag_face_bounding_box": "خطأ في وضع علامة على الوجه - لا يمكن الحصول على إحداثيات المربع المحيط",
   "error_title": "خطأ - حدث خللٌ ما",
   "errors": {
     "cannot_navigate_next_asset": "لا يمكن الانتقال إلى المحتوى التالي",
@@ -746,10 +873,12 @@
     "failed_to_keep_this_delete_others": "فشل في الاحتفاظ بهذا الأصل وحذف الأصول الأخرى",
     "failed_to_load_asset": "فشل تحميل المحتوى",
     "failed_to_load_assets": "فشل تحميل المحتويات",
+    "failed_to_load_notifications": "فشل تحميل الإشعارات",
     "failed_to_load_people": "فشل تحميل الأشخاص",
     "failed_to_remove_product_key": "تعذر إزالة مفتاح المنتج",
     "failed_to_stack_assets": "فشل في تكديس المحتويات",
     "failed_to_unstack_assets": "فشل في فصل المحتويات",
+    "failed_to_update_notification_status": "فشل في تحديث حالة الإشعار",
     "import_path_already_exists": "مسار الاستيراد هذا موجود مسبقًا.",
     "incorrect_email_or_password": "بريد أو كلمة مرور غير صحيحة",
     "paths_validation_failed": "فشل في التحقق من {paths, plural, one {# مسار} other {# مسارات}}",
@@ -766,6 +895,7 @@
     "unable_to_archive_unarchive": "تعذر {archived, select, true {الأرشفة} other {الإخراج من الأرشيف}}",
     "unable_to_change_album_user_role": "غير قادر على تغيير دور مستخدم الألبوم",
     "unable_to_change_date": "غير قادر على تغيير التاريخ",
+    "unable_to_change_description": "غير قادر على تغيير الوصف",
     "unable_to_change_favorite": "غير قادر على تغيير المفضلة لمحتوى",
     "unable_to_change_location": "غير قادر على تغيير الموقع",
     "unable_to_change_password": "غير قادر على تغيير كلمة المرور",
@@ -809,6 +939,7 @@
     "unable_to_remove_partner": "غير قادر على إزالة الشريك",
     "unable_to_remove_reaction": "غير قادر على إزالة رد الفعل",
     "unable_to_reset_password": "غير قادر على إعادة تعيين كلمة المرور",
+    "unable_to_reset_pin_code": "غير قادر على إعادة تعيين رمز PIN",
     "unable_to_resolve_duplicate": "غير قادر على حل التكرارات",
     "unable_to_restore_assets": "غير قادر على استعادة المحتويات",
     "unable_to_restore_trash": "غير قادر على استعادة سلة المهملات",
@@ -842,6 +973,9 @@
   "exif_bottom_sheet_location": "موقع",
   "exif_bottom_sheet_people": "الناس",
   "exif_bottom_sheet_person_add_person": "اضف اسما",
+  "exif_bottom_sheet_person_age_months": "العمر {months} اشهر",
+  "exif_bottom_sheet_person_age_year_months": "العمر ١ سنة،{months} اشهر",
+  "exif_bottom_sheet_person_age_years": "العمر {years}",
   "exit_slideshow": "خروج من العرض التقديمي",
   "expand_all": "توسيع الكل",
   "experimental_settings_new_asset_list_subtitle": "أعمال جارية",
@@ -858,10 +992,15 @@
   "extension": "الإمتداد",
   "external": "خارجي",
   "external_libraries": "المكتبات الخارجية",
-  "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",
+  "external_network": "شبكة خارجية",
+  "external_network_sheet_info": "عندما لا يتواجد على شبكة Wi-Fi المفضلة، فإنه سيتصل بالخادم من خلال أول عناوين URL أدناه التي يمكنه الوصول إليها، بدءًا من الأعلى إلى الأسفل",
   "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": "لم يتم العثور على الأصول المفضلة",
@@ -872,18 +1011,26 @@
   "file_name_or_extension": "اسم الملف أو امتداده",
   "filename": "اسم الملف",
   "filetype": "نوع الملف",
+  "filter": "تصفية",
   "filter_people": "تصفية الاشخاص",
+  "filter_places": "تصفية الاماكن",
   "find_them_fast": "يمكنك العثور عليها بسرعة بالاسم من خلال البحث",
   "fix_incorrect_match": "إصلاح المطابقة غير الصحيحة",
+  "folder": "مجلد",
+  "folder_not_found": "لم يتم العثور على المجلد",
   "folders": "المجلدات",
   "folders_feature_description": "تصفح عرض المجلد للصور ومقاطع الفيديو الموجودة على نظام الملفات",
   "forward": "إلى الأمام",
+  "gcast_enabled": "كوكل كاست",
+  "gcast_enabled_description": "تقوم هذه الميزة بتحميل الموارد الخارجية من Google حتى تعمل.",
   "general": "عام",
   "get_help": "الحصول على المساعدة",
+  "get_wifiname_error": "تعذر الحصول على اسم شبكة Wi-Fi. تأكد من منح الأذونات اللازمة واتصالك بشبكة Wi-Fi",
   "getting_started": "البدء",
   "go_back": "الرجوع للخلف",
   "go_to_folder": "اذهب إلى المجلد",
   "go_to_search": "اذهب إلى البحث",
+  "grant_permission": "منح الاذن",
   "group_albums_by": "تجميع الألبومات حسب...",
   "group_country": "مجموعة البلد",
   "group_no": "بدون تجميع",
@@ -893,6 +1040,12 @@
   "haptic_feedback_switch": "تمكين ردود الفعل اللمسية",
   "haptic_feedback_title": "ردود فعل لمسية",
   "has_quota": "محدد بحصة",
+  "header_settings_add_header_tip": "اضاف راس",
+  "header_settings_field_validator_msg": "القيمة لا يمكن ان تكون فارغة",
+  "header_settings_header_name_input": "اسم الرأس",
+  "header_settings_header_value_input": "قيمة الرأس",
+  "headers_settings_tile_subtitle": "قم بتعريف رؤوس الوكيل التي يجب أن يرسلها التطبيق مع كل طلب شبكة",
+  "headers_settings_tile_title": "رؤوس وكيل مخصصة",
   "hi_user": "مرحبا {name} ({email})",
   "hide_all_people": "إخفاء جميع الأشخاص",
   "hide_gallery": "اخفاء المعرض",
@@ -911,11 +1064,16 @@
   "home_page_delete_remote_err_local": "الأصول المحلية في التحديد البعيد المحذوف، سوف يتخطى",
   "home_page_favorite_err_local": "لا يمكن تفضيل الأصول المحلية بعد، سوف يتخطى",
   "home_page_favorite_err_partner": "لا يمكن الأصول الشريكة المفضلة بعد ، سوف يتخطى",
-  "home_page_first_time_notice": "إذا كانت هذه هي المرة الأولى التي تستخدم فيها التطبيق، فيرجى التأكد من اختيار ألبوم (ألبومات) احتياطية حتى يتمكن المخطط الزمني من ملء الصور ومقاطع الفيديو في الألبوم (الألبومات).",
+  "home_page_first_time_notice": "إذا كانت هذه هي المرة الأولى التي تستخدم فيها التطبيق، فيرجى التأكد من اختيار ألبوم (ألبومات) احتياطية حتى يتمكن المخطط الزمني من ملء الصور ومقاطع الفيديو فيه",
+  "home_page_locked_error_local": "لا يمكن نقل الأصول المحلية إلى المجلد المقفل، يتم التخطي",
+  "home_page_locked_error_partner": "لا يمكن نقل أصول الشريك إلى المجلد المقفل، يتم التخطي",
   "home_page_share_err_local": "لا يمكن مشاركة الأصول المحلية عبر الرابط ، سوف يتخطى",
   "home_page_upload_err_limit": "لا يمكن إلا تحميل 30 أحد الأصول في وقت واحد ، سوف يتخطى",
   "host": "المضيف",
   "hour": "ساعة",
+  "id": "المعرف",
+  "ignore_icloud_photos": "تجاهل صور iCloud",
+  "ignore_icloud_photos_description": "الصور المخزنة في Cloud لن يتم تحميلها إلى خادم Immich",
   "image": "صورة",
   "image_alt_text_date": "{isVideo, select, true {Video} other {Image}} تم التقاطها في {date}",
   "image_alt_text_date_1_person": "{isVideo, select, true {Video} other {Image}} تم التقاطها مع {person1} في {date}",
@@ -927,6 +1085,7 @@
   "image_alt_text_date_place_2_people": "{isVideo, select, true {Video} other {Image}} تم التقاطها في {city}، {country} مع {person1} و{person2} في {date}",
   "image_alt_text_date_place_3_people": "{isVideo, select, true {Video} other {Image}} تم التقاطها في {city}، {country} مع {person1}، {person2}، و{person3} في {date}",
   "image_alt_text_date_place_4_or_more_people": "{isVideo, select, true {Video} other {Image}} تم التقاطها في {city}, {country} with {person1}, {person2}, مع {additionalCount, number} آخرين في {date}",
+  "image_saved_successfully": "الصور حُفظت",
   "image_viewer_page_state_provider_download_started": "بدأ التنزيل",
   "image_viewer_page_state_provider_download_success": "تم التنزيل بنجاح",
   "image_viewer_page_state_provider_share_error": "خطأ في المشاركة",
@@ -948,8 +1107,16 @@
     "night_at_midnight": "كل ليلة عند منتصف الليل",
     "night_at_twoam": "كل ليلة الساعة 2 صباحا"
   },
+  "invalid_date": "تاريخ غير صالح",
+  "invalid_date_format": "صيغة تاريخ غير صالحة",
   "invite_people": "دعوة الأشخاص",
   "invite_to_album": "دعوة إلى الألبوم",
+  "ios_debug_info_fetch_ran_at": "جرت عملية الجلب في {dateTime}",
+  "ios_debug_info_last_sync_at": "اخر مزامنة {dateTime}",
+  "ios_debug_info_no_processes_queued": "لا توجد عمليات خلفية في قائمة الانتظار",
+  "ios_debug_info_no_sync_yet": "لم يتم تشغيل أي مهمة مزامنة في الخلفية حتى الآن",
+  "ios_debug_info_processes_queued": "{count, plural, one {{count} عملية خلفية ادخلتةفي طابور} other {{count} عمليات خلفية ادخلت في طابور}}",
+  "ios_debug_info_processing_ran_at": "المعالجة جرت في {dateTime}",
   "items_count": "{count, plural, one {# عنصر} other {# عناصر}}",
   "jobs": "الوظائف",
   "keep": "احتفظ",
@@ -958,6 +1125,9 @@
   "kept_this_deleted_others": "تم الاحتفاظ بهذا الأصل وحذف {count, plural, one {# asset} other {# assets}}",
   "keyboard_shortcuts": "اختصارات لوحة المفاتيح",
   "language": "اللغة",
+  "language_no_results_subtitle": "حاول تعديل مصطلح البحث",
+  "language_no_results_title": "لم يتم العثور على لغات",
+  "language_search_hint": "البحث عن لغات...",
   "language_setting_description": "اختر لغتك المفضلة",
   "last_seen": "اخر ظهور",
   "latest_version": "احدث اصدار",
@@ -983,21 +1153,29 @@
   "list": "قائمة",
   "loading": "تحميل",
   "loading_search_results_failed": "فشل تحميل نتائج البحث",
-  "location_permission_content": "In order to use the auto-switching feature, Immich needs precise location permission so it can read the current WiFi network's name",
+  "local_asset_cast_failed": "غير قادر على بث أصل لم يتم تحميله إلى الخادم",
+  "local_network": "شبكة محلية",
+  "local_network_sheet_info": "سيتصل التطبيق بالخادم من خلال عنوان URL هذا عند استخدام شبكة Wi-Fi المحددة",
+  "location_permission": "اذن الموقع",
+  "location_permission_content": "من أجل استخدام ميزة التبديل التلقائي، يحتاج Immich إلى إذن موقع دقيق حتى يتمكن من قراءة اسم شبكة Wi-Fi الحالية",
   "location_picker_choose_on_map": "اختر على الخريطة",
   "location_picker_latitude_error": "أدخل خط عرض صالح",
   "location_picker_latitude_hint": "أدخل خط العرض الخاص بك هنا",
   "location_picker_longitude_error": "أدخل خط الطول الصحيح",
   "location_picker_longitude_hint": "أدخل خط الطول هنا",
+  "lock": "قفل",
+  "locked_folder": "مجلد مقفول",
   "log_out": "تسجيل خروج",
   "log_out_all_devices": "تسجيل الخروج من كافة الأجهزة",
+  "logged_in_as": "تم تسجيل الدخول باسم {user}",
   "logged_out_all_devices": "تم تسجيل الخروج من جميع الأجهزة",
   "logged_out_device": "تم تسجيل الخروج من الجهاز",
   "login": "تسجيل الدخول",
   "login_disabled": "تم تعطيل تسجيل الدخول",
-  "login_form_api_exception": " استثناء برمجة التطبيقات. يرجى التحقق من عنوان الخادم والمحاولة مرة أخرى ",
+  "login_form_api_exception": "استثناء API. يرجى التحقق من عنوان URL الخادم والمحاولة مرة أخرى.",
   "login_form_back_button_text": "الرجوع للخلف",
   "login_form_email_hint": "yoursemail@email.com",
+  "login_form_endpoint_hint": "http://المنفذ:عنوان‫-ip-الخادم",
   "login_form_endpoint_url": "url نقطة نهاية الخادم",
   "login_form_err_http": "يرجى تحديد http:// أو https://",
   "login_form_err_invalid_email": "بريد إلكتروني خاطئ",
@@ -1021,7 +1199,8 @@
   "look": "الشكل",
   "loop_videos": "تكرار مقاطع الفيديو",
   "loop_videos_description": "فَعْل لتكرار مقطع فيديو تلقائيًا في عارض التفاصيل.",
-  "main_branch_warning": "أنت تستخدم إصداراً تطويرياً؛ ونحن نوصي بشدة باستخدام إصدار النشر!",
+  "main_branch_warning": "أنت تستخدم إصداراً قيد التطوير؛ ونحن نوصي بشدة باستخدام إصدار النشر!",
+  "main_menu": "القائمة الرئيسية",
   "make": "صنع",
   "manage_shared_links": "إدارة الروابط المشتركة",
   "manage_sharing_with_partners": "إدارة المشاركة مع الشركاء",
@@ -1031,6 +1210,8 @@
   "manage_your_devices": "إدارة الأجهزة التي تم تسجيل الدخول إليها",
   "manage_your_oauth_connection": "إدارة اتصال OAuth الخاص بك",
   "map": "الخريطة",
+  "map_assets_in_bound": "{count} صوره",
+  "map_assets_in_bounds": "{count} صور",
   "map_cannot_get_user_location": "لا يمكن الحصول على موقع المستخدم",
   "map_location_dialog_yes": "نعم",
   "map_location_picker_page_use_location": "استخدم هذا الموقع",
@@ -1044,13 +1225,18 @@
   "map_settings": "إعدادات الخريطة",
   "map_settings_dark_mode": "الوضع المظلم",
   "map_settings_date_range_option_day": "24 ساعة الماضية",
+  "map_settings_date_range_option_days": "الايام {days} الماضية",
   "map_settings_date_range_option_year": "السنة الفائتة",
+  "map_settings_date_range_option_years": "السنوات {years} الماضية",
   "map_settings_dialog_title": "إعدادات الخريطة",
   "map_settings_include_show_archived": "تشمل الأرشفة",
   "map_settings_include_show_partners": "تضمين الشركاء",
   "map_settings_only_show_favorites": "اظهار المفضلة فقط",
   "map_settings_theme_settings": "مظهر الخريطة",
   "map_zoom_to_see_photos": "قم بتصغيرها لرؤية الصور",
+  "mark_all_as_read": "تحديد الكل كمقروء",
+  "mark_as_read": "تحديد كمقروء",
+  "marked_all_as_read": "تم تحديد الكل كمقروء",
   "matches": "تطابقات",
   "media_type": "نوع الوسائط",
   "memories": "الذكريات",
@@ -1075,6 +1261,13 @@
   "month": "شهر",
   "monthly_title_text_date_format": "ط ط ط",
   "more": "المزيد",
+  "move": "تحريك",
+  "move_off_locked_folder": "تحريك خارج المجلد المقفل",
+  "move_to_lock_folder_action_prompt": "{count} اضيف إلى المجلد المقفل",
+  "move_to_locked_folder": "النقل الى مجلد مغلق",
+  "move_to_locked_folder_confirmation": "هذه الصور والفديوات ستتم ازالتها من جميع الالبومات، ويمكنان تتم مشاهدتها فقط من خلال المجلد المقفل",
+  "moved_to_archive": "تم نقل {count, plural, one {# اصل} other {# اصول}} الى الارشيف",
+  "moved_to_library": "تم نقل {count, plural, one {# اصل} other {# اصول}} الى المكتبة",
   "moved_to_trash": "تم النقل إلى سلة المهملات",
   "multiselect_grid_edit_date_time_err_read_only": "لا يمكن تعديل تاريخ الأصول (المواد) للقراءة فقط، سوف يتخطى",
   "multiselect_grid_edit_gps_err_read_only": "لا يمكن تعديل موقع الأصول (المواد) للقراءة فقط، سوف يتخطى",
@@ -1082,12 +1275,15 @@
   "my_albums": "ألبوماتي",
   "name": "الاسم",
   "name_or_nickname": "الاسم أو اللقب",
+  "networking_settings": "الشبكات",
+  "networking_subtitle": "إدارة إعدادات نقطة الخادم النهائية",
   "never": "أبداً",
   "new_album": "البوم جديد",
   "new_api_key": "مفتاح API جديد",
   "new_password": "كلمة المرور الجديدة",
   "new_person": "شخص جديد",
-  "new_pin_code": "الرقم السري الجديد",
+  "new_pin_code": "رمز PIN الجديد",
+  "new_pin_code_subtitle": "هذه أول مرة تدخل فيها إلى المجلد المقفل. أنشئ رمزًا PIN للوصول بامان إلى هذه الصفحة",
   "new_user_created": "تم إنشاء مستخدم جديد",
   "new_version_available": "إصدار جديد متاح",
   "newest_first": "الأحدث أولاً",
@@ -1100,19 +1296,25 @@
   "no_archived_assets_message": "أرشفة الصور ومقاطع الفيديو لإخفائها من عرض الصور لديك",
   "no_assets_message": "انقر لتحميل صورتك الأولى",
   "no_assets_to_show": "لا توجد أصول لعرضها",
+  "no_cast_devices_found": "لم يتم ايجاد جهاز بث",
   "no_duplicates_found": "لم يتم العثور على أي تكرارات.",
   "no_exif_info_available": "لا تتوفر معلومات exif",
   "no_explore_results_message": "قم برفع المزيد من الصور لاستكشاف مجموعتك.",
   "no_favorites_message": "أضف المفضلة للعثور بسرعة على أفضل الصور ومقاطع الفيديو",
   "no_libraries_message": "إنشاء مكتبة خارجية لعرض الصور ومقاطع الفيديو الخاصة بك",
+  "no_locked_photos_message": "الصور والفديوهات في المجلد المقفل مخفية ولن تصهر في التصفح او البحث في مكتبتك.",
   "no_name": "لا اسم",
+  "no_notifications": "لا توجد تنبيهات",
+  "no_people_found": "لم يتم العثور على اشخاص مطابقين",
   "no_places": "لا أماكن",
   "no_results": "لا يوجد نتائج",
   "no_results_description": "جرب كلمة رئيسية مرادفة أو أكثر عمومية",
   "no_shared_albums_message": "قم بإنشاء ألبوم لمشاركة الصور ومقاطع الفيديو مع الأشخاص في شبكتك",
   "not_in_any_album": "ليست في أي ألبوم",
-  "note_apply_storage_label_to_previously_uploaded assets": "ملاحظة: لتطبيق تسمية التخزين على المحتويات التي تم رفعها مسبقًا، قم بتشغيل",
+  "not_selected": "لم يختار",
+  "note_apply_storage_label_to_previously_uploaded assets": "ملاحظة: لتطبيق سمة التخزين على المحتويات التي تم رفعها مسبقًا، قم بتشغيل",
   "notes": "ملاحظات",
+  "nothing_here_yet": "لا يوجد شيء هنا بعد",
   "notification_permission_dialog_content": "لتمكين الإخطارات ، انتقل إلى الإعدادات و اختار السماح.",
   "notification_permission_list_tile_content": "منح إذن لتمكين الإخطارات.",
   "notification_permission_list_tile_enable_button": "تمكين الإخطارات",
@@ -1120,16 +1322,22 @@
   "notification_toggle_setting_description": "تفعيل إشعارات البريد الإلكتروني",
   "notifications": "إشعارات",
   "notifications_setting_description": "إدارة الإشعارات",
+  "oauth": "OAuth",
   "official_immich_resources": "الموارد الرسمية لشركة Immich",
   "offline": "غير متصل",
   "ok": "نعم",
   "oldest_first": "الأقدم أولا",
+  "on_this_device": "على هذا الجهاز",
   "onboarding": "الإعداد الأولي",
-  "onboarding_privacy_description": "تعتمد الميزات التالية (اختياري) على خدمات خارجية، ويمكن تعطيلها في أي وقت في إعدادات الإدارة.",
+  "onboarding_locale_description": "اختر لغتك المفضلة. يمكنك تغييرها فيما بعد في الاعدادات.",
+  "onboarding_privacy_description": "تعتمد الميزات التالية (اختياري) على خدمات خارجية، ويمكن تعطيلها في أي وقت في الاعدادات.",
+  "onboarding_server_welcome_description": "لنقم باعداد نسختك من البرنامج مع بعض الاعدادات الشائعة.",
   "onboarding_theme_description": "اختر نسق الألوان للنسخة الخاصة بك. يمكنك تغيير ذلك لاحقًا في إعداداتك.",
+  "onboarding_user_welcome_description": "لنساعدك على البدء!",
   "onboarding_welcome_user": "مرحبا، {user}",
   "online": "متصل",
   "only_favorites": "المفضلة فقط",
+  "open": "فتح",
   "open_in_map_view": "فتح في عرض الخريطة",
   "open_in_openstreetmap": "فتح في OpenStreetMap",
   "open_the_search_filters": "افتح مرشحات البحث",
@@ -1146,12 +1354,14 @@
   "partner_can_access": "يستطيع {partner} الوصول",
   "partner_can_access_assets": "جميع الصور ومقاطع الفيديو الخاصة بك باستثناء تلك الموجودة في المؤرشفة والمحذوفة",
   "partner_can_access_location": "الموقع الذي تم التقاط صورك فيه",
+  "partner_list_user_photos": "صور {user}",
   "partner_list_view_all": "عرض الكل",
   "partner_page_empty_message": "لم يتم مشاركة صورك بعد مع أي شريك.",
   "partner_page_no_more_users": "لا مزيد من المستخدمين لإضافة",
   "partner_page_partner_add_failed": "فشل في إضافة شريك",
   "partner_page_select_partner": "حدد شريكًا",
   "partner_page_shared_to_title": "مشترك ل",
+  "partner_page_stop_sharing_content": "{partner} لن يعود قادرا على الوصوف الى صورك.",
   "partner_sharing": "مشاركة الشركاء",
   "partners": "الشركاء",
   "password": "كلمة المرور",
@@ -1180,14 +1390,16 @@
   "permanently_delete_assets_prompt": "هل أنت متأكد أنك تريد حذف {count, plural, one {هذا العنصر؟} other {هذه العناصر <b>#</b>؟}} سيتم أيضًا إزالته {count, plural, one {من ألبومه} other {من ألبوماتهم}}.",
   "permanently_deleted_asset": "تم حذف الأصل بشكل نهائي",
   "permanently_deleted_assets_count": "تم حذف {count, plural, one {# محتوى} other {# المحتويات}} نهائيًا",
+  "permission": "اذن",
+  "permission_empty": "الاذن الخاص بك يجب ان لا يكون فارغا",
   "permission_onboarding_back": "خلف",
   "permission_onboarding_continue_anyway": "تواصل على أي حال",
   "permission_onboarding_get_started": "البدء",
   "permission_onboarding_go_to_settings": "اذهب للاعدادات",
-  "permission_onboarding_permission_denied": "تم رفض الإذن. لاستخدام التطبيق، قم بمنح أذونات الصور والفيديو في الإعدادات ",
+  "permission_onboarding_permission_denied": "تم رفض الإذن. لاستخدام التطبيق، قم بمنح أذونات الصور والفيديو في الإعدادات.",
   "permission_onboarding_permission_granted": "تم تأمين التصريح! وضعك تمام.",
   "permission_onboarding_permission_limited": "إذن محدود. للسماح بالنسخ الاحتياطي للتطبيق وإدارة مجموعة المعرض بالكامل، امنح أذونات الصور والفيديو في الإعدادات.",
-  "permission_onboarding_request": "يتطلب التطبيق إذنًا لعرض الصور ومقاطع الفيديو الخاصة بك",
+  "permission_onboarding_request": "يتطلب التطبيق إذنًا لعرض الصور ومقاطع الفيديو الخاصة بك.",
   "person": "شخص",
   "person_birthdate": "تاريخ الميلاد {التاريخ}",
   "person_hidden": "{name}{hidden, select, true { (مخفي)} other {}}",
@@ -1197,9 +1409,10 @@
   "photos_count": "{count, plural, one {{count, number} صورة} other {{count, number} صور}}",
   "photos_from_previous_years": "صور من السنوات السابقة",
   "pick_a_location": "اختر موقعًا",
-  "pin_code_changed_successfully": "تم تغير الرقم السري",
-  "pin_code_reset_successfully": "تم اعادة تعيين الرقم السري",
-  "pin_code_setup_successfully": "تم انشاء رقم سري",
+  "pin_code_changed_successfully": "تم تغير رمز PIN بنجاح",
+  "pin_code_reset_successfully": "تم اعادة تعيين رمز PIN بنجاح",
+  "pin_code_setup_successfully": "تم انشاء رمز PIN بنجاح",
+  "pin_verification": "التحقق برمز PIN",
   "place": "مكان",
   "places": "الأماكن",
   "places_count": "{count, plural, one {{count, number} مكان} other {{count, number} أماكن}}",
@@ -1207,15 +1420,21 @@
   "play_memories": "تشغيل الذكريات",
   "play_motion_photo": "تشغيل الصور المتحركة",
   "play_or_pause_video": "تشغيل الفيديو أو إيقافه مؤقتًا",
+  "please_auth_to_access": "الرجاء القيام بالمصادقة للوصول",
   "port": "المنفذ",
+  "preferences_settings_subtitle": "ادارة تفضيلات التطبيق",
   "preferences_settings_title": "التفضيلات",
   "preset": "الإعداد المسبق",
   "preview": "معاينة",
   "previous": "السابق",
   "previous_memory": "الذكرى السابقة",
-  "previous_or_next_photo": "الصورة السابقة أو التالية",
+  "previous_or_next_day": "يوم تالي/سابق",
+  "previous_or_next_month": "شهر تالي/سابق",
+  "previous_or_next_photo": "صورة تالية/سابقة",
+  "previous_or_next_year": "سنة تالية/سابقة",
   "primary": "أساسي",
   "privacy": "الخصوصية",
+  "profile": "حساب تعريفي",
   "profile_drawer_app_logs": "السجلات",
   "profile_drawer_client_out_of_date_major": "تطبيق الهاتف المحمول قديم.يرجى التحديث إلى أحدث إصدار رئيسي.",
   "profile_drawer_client_out_of_date_minor": "تطبيق الهاتف المحمول قديم.يرجى التحديث إلى أحدث إصدار صغير.",
@@ -1247,7 +1466,7 @@
   "purchase_lifetime_description": "الشراء لمدى الحياة",
   "purchase_option_title": "خيارات الشراء",
   "purchase_panel_info_1": "يتطلب بناء Immich الكثير من الوقت والجهد، ولدينا مهندسون يعملون بدوام كامل لجعله أفضل ما يمكن. مهمتنا هي أن تصبح البرمجيات مفتوحة المصدر وممارسات العمل الأخلاقية مصدر دخل مستدام للمطورين وإنشاء نظام بيئي يحترم الخصوصية مع بدائل حقيقية للخدمات السحابية الاستغلالية.",
-  "purchase_panel_info_2": "نظرًا لأننا ملتزمون بعدم إضافة نظام حظر الاشتراك غير المدفوع، فإن هذا الشراء لن يمنحك أي ميزات إضافية في Immich. نحن نعتمد على المستخدمين مثلك لدعم التطوير المستمر لـ Immich.",
+  "purchase_panel_info_2": "نظرًا لأننا ملتزمون بعدم إضافة حاجز دفع، فإن هذا الشراء لن يمنحك أي ميزات إضافية في Immich. نحن نعتمد على المستخدمين مثلك لدعم التطوير المستمر لـ Immich.",
   "purchase_panel_title": "ادعم المشروع",
   "purchase_per_server": "لكل خادم",
   "purchase_per_user": "لكل مستخدم",
@@ -1272,13 +1491,16 @@
   "recent": "حديث",
   "recent-albums": "ألبومات الحديثة",
   "recent_searches": "عمليات البحث الأخيرة",
+  "recently_added": "اضيف مؤخرا",
   "recently_added_page_title": "أضيف مؤخرا",
+  "recently_taken": "تم التقاطها مؤخرًا",
+  "recently_taken_page_title": "تم التقاطها مؤخرًا",
   "refresh": "تحديث",
   "refresh_encoded_videos": "تحديث مقاطع الفيديو المشفرة",
   "refresh_faces": "تحديث الوجوه",
   "refresh_metadata": "تحديث البيانات الوصفية",
   "refresh_thumbnails": "تحديث الصور المصغرة",
-  "refreshed": "تم التحديث",
+  "refreshed": "اعادة تحميل",
   "refreshes_every_file": "إعادة قراءة كافة الملفات الموجودة والجديدة",
   "refreshing_encoded_video": "جارٍ تحديث الفيديو المرمز",
   "refreshing_faces": "جاري تحديث الوجوه",
@@ -1292,12 +1514,16 @@
   "remove_deleted_assets": "إزالة الملفات الغير متصلة",
   "remove_from_album": "إزالة من الألبوم",
   "remove_from_favorites": "إزالة من المفضلة",
+  "remove_from_lock_folder_action_prompt": "{count} أويل من المجلد المقفل",
+  "remove_from_locked_folder": "ازالة من المجلد المقفل",
+  "remove_from_locked_folder_confirmation": "هل انت متأكد من ازالة هذه الصور والفيديوهات من المجلد المقفل؟ سيكونون مرئيين في المكتبة الخاصة بك.",
   "remove_from_shared_link": "إزالة من الرابط المشترك",
   "remove_memory": "إزالة الذاكرة",
   "remove_photo_from_memory": "إزالة الصورة من هذه الذكرى",
+  "remove_tag": "ازالة علامة",
   "remove_url": "إزالة عنوان URL",
   "remove_user": "إزالة المستخدم",
-  "removed_api_key": "تم إزالة مفتاح API: {name}",
+  "removed_api_key": "تم إزاة مفتاح API: ‪‫{name}",
   "removed_from_archive": "تمت إزالتها من الأرشيف",
   "removed_from_favorites": "تمت الإزالة من المفضلة",
   "removed_from_favorites_count": "{count, plural, other {أُزيلت #}} من التفضيلات",
@@ -1315,6 +1541,7 @@
   "reset": "إعادة ضبط",
   "reset_password": "إعادة تعيين كلمة المرور",
   "reset_people_visibility": "إعادة ضبط ظهور الأشخاص",
+  "reset_pin_code": "اعادة تعيين رمز PIN",
   "reset_to_default": "إعادة التعيين إلى الافتراضي",
   "resolve_duplicates": "معالجة النسخ المكررة",
   "resolved_all_duplicates": "تم حل جميع التكرارات",
@@ -1329,6 +1556,7 @@
   "role_editor": "المحرر",
   "role_viewer": "العارض",
   "save": "حفظ",
+  "save_to_gallery": "حفظ الى المعرض",
   "saved_api_key": "تم حفظ مفتاح الـ API",
   "saved_profile": "تم حفظ الملف",
   "saved_settings": "تم حفظ الإعدادات",
@@ -1349,19 +1577,33 @@
   "search_camera_model": "البحث حسب موديل الكاميرا...",
   "search_city": "البحث حسب المدينة...",
   "search_country": "البحث حسب الدولة...",
-  "search_filter_apply": "اختار الفلتر ",
+  "search_filter_apply": "اختار الفلتر",
+  "search_filter_camera_title": "اختر نوع الكاميرا",
+  "search_filter_date": "تاريخ",
+  "search_filter_date_interval": "{start} الى {end}",
+  "search_filter_date_title": "حدد نطاق التاريخ",
   "search_filter_display_option_not_in_album": "ليس في الألبوم",
+  "search_filter_display_options": "خيارات العرض",
+  "search_filter_filename": "بحث باستخدام الاسم",
+  "search_filter_location": "الموقع",
+  "search_filter_location_title": "اختر الموقع",
+  "search_filter_media_type": "نوع الوسائط",
+  "search_filter_media_type_title": "اختر نوع الوسائط",
+  "search_filter_people_title": "اختر الاشخاص",
   "search_for": "البحث عن",
   "search_for_existing_person": "البحث عن شخص موجود",
+  "search_no_more_result": "لا توجد نتائج اضافية",
   "search_no_people": "لا يوجد أشخاص",
   "search_no_people_named": "لا يوجد أشخاص بالاسم \"{name}\"",
+  "search_no_result": "لا توجد نتائج، حاول استخدام مصطلح بحث مختلف او تركيبة",
   "search_options": "خيارات البحث",
   "search_page_categories": "فئات",
   "search_page_motion_photos": "الصور المتحركه",
   "search_page_no_objects": "لا توجد معلومات عن أشياء متاحة",
   "search_page_no_places": "لا توجد معلومات متوفرة للأماكن",
   "search_page_screenshots": "لقطات الشاشة",
-  "search_page_selfies": " صور ذاتيه",
+  "search_page_search_photos_videos": "ابحث عن صورك او فديوهاتك",
+  "search_page_selfies": "صور ذاتيه",
   "search_page_things": "أشياء",
   "search_page_view_all_button": "عرض الكل",
   "search_page_your_activity": "نشاطك",
@@ -1372,7 +1614,7 @@
   "search_result_page_new_search_hint": "بحث جديد",
   "search_settings": "إعدادات البحث",
   "search_state": "البحث حسب الولاية...",
-  "search_suggestion_list_smart_search_hint_1": "يتم تمكين البحث الذكي افتراضيًا ، للبحث عن البيانات الوصفية ، استخدم بناء الجملة",
+  "search_suggestion_list_smart_search_hint_1": "يتم تمكين البحث الذكي افتراضيًا ، للبحث عن البيانات الوصفية ، استخدم بناء الجملة. ",
   "search_suggestion_list_smart_search_hint_2": "م: البحث الخاص بك",
   "search_tags": "البحث عن العلامات...",
   "search_timezone": "البحث حسب المنطقة الزمنية...",
@@ -1385,6 +1627,7 @@
   "select_album_cover": "تحديد غلاف الألبوم",
   "select_all": "تحديد الكل",
   "select_all_duplicates": "تحديد جميع النسخ المكررة",
+  "select_all_in": "اختر الكل في {group}",
   "select_avatar_color": "تحديد لون الصورة الشخصية",
   "select_face": "تحديد وجه",
   "select_featured_photo": "تحديد الصورة المميزة",
@@ -1392,6 +1635,7 @@
   "select_keep_all": "تحديد الأحتفاظ بالكل",
   "select_library_owner": "تحديد مالِك المكتبة",
   "select_new_face": "تحديد وجه جديد",
+  "select_person_to_tag": "اختر شخص لوضع علامة",
   "select_photos": "تحديد الصور",
   "select_trash_all": "تحديد حذف الكلِ",
   "select_user_for_sharing_page_err_album": "فشل في إنشاء ألبوم",
@@ -1399,10 +1643,12 @@
   "selected_count": "{count, plural, other {# محددة }}",
   "send_message": "‏إرسال رسالة",
   "send_welcome_email": "إرسال بريدًا إلكترونيًا ترحيبيًا",
+  "server_endpoint": "نقطة نهاية الخادم",
   "server_info_box_app_version": "نسخة التطبيق",
   "server_info_box_server_url": "عنوان URL الخادم",
   "server_offline": "الخادم غير متصل",
   "server_online": "الخادم متصل",
+  "server_privacy": "خصوصية الخادم",
   "server_stats": "إحصائيات الخادم",
   "server_version": "إصدار الخادم",
   "set": "‏تحديد",
@@ -1412,6 +1658,7 @@
   "set_date_of_birth": "تحديد تاريخ الميلاد",
   "set_profile_picture": "تحديد صورة الملف الشخصي",
   "set_slideshow_to_fullscreen": "تحديد عرض الشرائح على وضع ملء الشاشة",
+  "set_stack_primary_asset": "تعيين كأصل اساسي",
   "setting_image_viewer_help": "يقوم عارض التفاصيل بتحميل الصورة المصغرة الصغيرة أولاً ، ثم يقوم بتحميل المعاينة متوسطة الحجم (إذا تم تمكينها) ، ويقوم أخيرًا بتحميل الأصل (إذا تم تمكينه).",
   "setting_image_viewer_original_subtitle": "تمكين تحميل الصورة الكاملة الدقة الأصلية (كبيرة!).تعطيل لتقليل استخدام البيانات (كل من الشبكة وعلى ذاكرة التخزين المؤقت للجهاز).",
   "setting_image_viewer_original_title": "تحميل الصورة الأصلية",
@@ -1419,21 +1666,30 @@
   "setting_image_viewer_preview_title": "تحميل صورة معاينة",
   "setting_image_viewer_title": "الصور",
   "setting_languages_apply": "تغيير الإعدادات",
+  "setting_languages_subtitle": "تغيير لغة التطبيق",
+  "setting_notifications_notify_failures_grace_period": "التنبيه بفشل النسخ الاحتياطي في الخلفية: {duration}",
+  "setting_notifications_notify_hours": "{count} ساعات",
   "setting_notifications_notify_immediately": "في الحال",
+  "setting_notifications_notify_minutes": "{count} دقائق",
   "setting_notifications_notify_never": "أبداً",
+  "setting_notifications_notify_seconds": "{count} ثواني",
   "setting_notifications_single_progress_subtitle": "معلومات التقدم التفصيلية تحميل لكل أصل",
   "setting_notifications_single_progress_title": "إظهار تقدم التفاصيل الاحتياطية الخلفية",
   "setting_notifications_subtitle": "اضبط تفضيلات الإخطار",
   "setting_notifications_total_progress_subtitle": "التقدم التحميل العام (تم القيام به/إجمالي الأصول)",
   "setting_notifications_total_progress_title": "إظهار النسخ الاحتياطي الخلفية التقدم المحرز",
   "setting_video_viewer_looping_title": "تكرار مقطع فيديو تلقائيًا",
+  "setting_video_viewer_original_video_subtitle": "عند بث فيديو من الخادم، شغّل النسخة الأصلية حتى مع توفر ترميز بديل. قد يؤدي ذلك إلى تقطيع اثناء العرض . تُشغّل الفيديوهات المتوفرة محليًا بجودة أصلية بغض النظر عن هذا الإعداد.",
+  "setting_video_viewer_original_video_title": "اجبار عرض الفديو الاصلي",
   "settings": "الإعدادات",
   "settings_require_restart": "يرجى إعادة تشغيل لتطبيق هذا الإعداد",
   "settings_saved": "تم حفظ الإعدادات",
-  "setup_pin_code": "تحديد رقم سري",
+  "setup_pin_code": "تحديد رمز PIN",
   "share": "مشاركة",
   "share_add_photos": "إضافة الصور",
+  "share_assets_selected": "اختيار {count}",
   "share_dialog_preparing": "تحضير...",
+  "share_link": "مشاركة رابط",
   "shared": "مُشتَرك",
   "shared_album_activities_input_disable": "التعليق معطل",
   "shared_album_activity_remove_content": "هل تريد حذف هذا النشاط؟",
@@ -1446,22 +1702,40 @@
   "shared_by_user": "تمت المشاركة بواسطة {user}",
   "shared_by_you": "تمت مشاركته من قِبلك",
   "shared_from_partner": "صور من {partner}",
+  "shared_intent_upload_button_progress_text": "{current} / {total} تم رفع",
   "shared_link_app_bar_title": "روابط مشتركة",
   "shared_link_clipboard_copied_massage": "نسخ إلى الحافظة",
+  "shared_link_clipboard_text": "رابط: {link}\nكلمة المرور: {password}",
   "shared_link_create_error": "خطأ أثناء إنشاء رابط مشترك",
   "shared_link_edit_description_hint": "أدخل وصف المشاركة",
   "shared_link_edit_expire_after_option_day": "يوم 1",
+  "shared_link_edit_expire_after_option_days": "{count} ايام",
   "shared_link_edit_expire_after_option_hour": "1 ساعة",
+  "shared_link_edit_expire_after_option_hours": "{count} ساعات",
   "shared_link_edit_expire_after_option_minute": "1 دقيقة",
+  "shared_link_edit_expire_after_option_minutes": "{count} دقائق",
+  "shared_link_edit_expire_after_option_months": "{count} اشهر",
+  "shared_link_edit_expire_after_option_year": "{count} سنة",
   "shared_link_edit_password_hint": "أدخل كلمة مرور المشاركة",
   "shared_link_edit_submit_button": "تحديث الرابط",
   "shared_link_error_server_url_fetch": "لا يمكن جلب عنوان الخادم",
+  "shared_link_expires_day": "تنتهي صلاحيته في {count} يوم",
+  "shared_link_expires_days": "تنتهي صلاحيته في {count} ايام",
+  "shared_link_expires_hour": "تنتهي صلاحية في {count} ساعة",
+  "shared_link_expires_hours": "تنتهي صلاحيته في {count} ساعات",
+  "shared_link_expires_minute": "تنتهي صلاحيته في {count} دقيقة",
+  "shared_link_expires_minutes": "تنتهي صلاحيته في {count} دقائق",
   "shared_link_expires_never": "تنتهي ∞",
+  "shared_link_expires_second": "تنتهي صلاحيته في {count} ثانية",
+  "shared_link_expires_seconds": "تنتهي صلاحيته في {count} ثواني",
+  "shared_link_individual_shared": "مشاركة فردية",
+  "shared_link_info_chip_metadata": "EXIF",
   "shared_link_manage_links": "إدارة الروابط المشتركة",
   "shared_link_options": "خيارات الرابط المشترك",
   "shared_links": "روابط مشتركة",
   "shared_links_description": "وصف الروابط المشتركة",
   "shared_photos_and_videos_count": "{assetCount, plural, other {# الصور ومقاطع الفيديو المُشارَكة.}}",
+  "shared_with_me": "تمت مشاركتها معي",
   "shared_with_partner": "تمت المشاركة مع {partner}",
   "sharing": "مشاركة",
   "sharing_enter_password": "الرجاء إدخال كلمة المرور لعرض هذه الصفحة.",
@@ -1522,12 +1796,14 @@
   "start_date": "تاريخ البدء",
   "state": "الولاية",
   "status": "الحالة",
+  "stop_casting": "ايقاف البث",
   "stop_motion_photo": "إيقاف حركة الصورة",
   "stop_photo_sharing": "توقف عن مشاركة صورك؟",
   "stop_photo_sharing_description": "لن يتمكن {partner} من الوصول إلى صورك بعد الآن.",
   "stop_sharing_photos_with_user": "توقف عن مشاركة صورك مع هذا المستخدم",
   "storage": "مساحة التخزين",
-  "storage_label": "تسمية التخزين",
+  "storage_label": "سمة التخزين",
+  "storage_quota": "حصة الخزن",
   "storage_usage": "{used} من {available} مُستخْدم",
   "submit": "إرسال",
   "suggestions": "اقتراحات",
@@ -1537,6 +1813,9 @@
   "support_third_party_description": "تم حزم تثبيت immich الخاص بك بواسطة جهة خارجية. قد تكون المشكلات التي تواجهها ناجمة عن هذه الحزمة، لذا يرجى طرح المشكلات معهم في المقام الأول باستخدام الروابط أدناه.",
   "swap_merge_direction": "تبديل اتجاه الدمج",
   "sync": "مزامنة",
+  "sync_albums": "مزامنة الالبومات",
+  "sync_albums_manual_subtitle": "مزامنة جميع الفديوهات والصور المرفوعة الى البومات الخزن الاحتياطي المختارة",
+  "sync_upload_album_setting_subtitle": "انشئ و ارفع صورك و فديوهاتك الالبومات المختارة في Immich",
   "tag": "العلامة",
   "tag_assets": "أصول العلامة",
   "tag_created": "تم إنشاء العلامة: {tag}",
@@ -1551,8 +1830,14 @@
   "theme_selection": "اختيار السمة",
   "theme_selection_description": "قم بتعيين السمة تلقائيًا على اللون الفاتح أو الداكن بناءً على تفضيلات نظام المتصفح الخاص بك",
   "theme_setting_asset_list_storage_indicator_title": "عرض مؤشر التخزين على بلاط الأصول",
+  "theme_setting_asset_list_tiles_per_row_title": "عدد الاصول في كل صف({count})",
+  "theme_setting_colorful_interface_subtitle": "تطبيق اللون الأساسي على الأسطح في الخلفية.",
+  "theme_setting_colorful_interface_title": "واجهه ملونة",
   "theme_setting_image_viewer_quality_subtitle": "اضبط جودة عارض الصورة التفصيلية",
   "theme_setting_image_viewer_quality_title": "جودة عارض الصورة",
+  "theme_setting_primary_color_subtitle": "اختر لون للعمليات الاساسية والمكمله.",
+  "theme_setting_primary_color_title": "اللون الاساسي",
+  "theme_setting_system_primary_color_title": "استخدم لون النظام",
   "theme_setting_system_theme_switch": "تلقائي (اتبع إعداد النظام)",
   "theme_setting_theme_subtitle": "اختر إعدادات مظهر التطبيق",
   "theme_setting_three_stage_loading_subtitle": "قد يزيد التحميل من ثلاث مراحل من أداء التحميل ولكنه يسبب تحميل شبكة أعلى بكثير",
@@ -1572,22 +1857,29 @@
   "total": "الإجمالي",
   "total_usage": "الاستخدام الإجمالي",
   "trash": "المهملات",
+  "trash_action_prompt": "{count} نقل الى سلة المهملات",
   "trash_all": "نقل الكل إلى سلة المهملات",
   "trash_count": "سلة المحملات {count, number}",
   "trash_delete_asset": "حذف/نقل المحتوى إلى سلة المهملات",
+  "trash_emptied": "سبة مهملا مفرغة",
   "trash_no_results_message": "ستظهر هنا الصور ومقاطع الفيديو المحذوفة.",
   "trash_page_delete_all": "حذف الكل",
   "trash_page_empty_trash_dialog_content": "هل تريد تفريغ أصولك المهملة؟ ستتم إزالة هذه العناصر نهائيًا من التطبيق",
+  "trash_page_info": "العناصر المنقولة الى سلة المهملات سيتم حذفها بشكل نهائي بعد {days} ايام",
   "trash_page_no_assets": "لا توجد اصول في سله المهملات",
   "trash_page_restore_all": "استعادة الكل",
-  "trash_page_select_assets_btn": "اختر الأصول ",
+  "trash_page_select_assets_btn": "اختر الأصول",
+  "trash_page_title": "سلة المهملات ({count})",
   "trashed_items_will_be_permanently_deleted_after": "سيتم حذفُ العناصر المحذوفة نِهائيًا بعد {days, plural, one {# يوم} other {# أيام }}.",
   "type": "النوع",
-  "unable_to_change_pin_code": "تفيير الرقم السري غير ممكن",
-  "unable_to_setup_pin_code": "انشاء الرقم السري غير ممكن",
+  "unable_to_change_pin_code": "تفيير رمز PIN غير ممكن",
+  "unable_to_setup_pin_code": "انشاء رمز PIN غير ممكن",
   "unarchive": "أخرج من الأرشيف",
+  "unarchive_action_prompt": "{count} ازيل من الارشيف",
   "unarchived_count": "{count, plural, other {غير مؤرشفة #}}",
+  "undo": "تراجع",
   "unfavorite": "أزل التفضيل",
+  "unfavorite_action_prompt": "{count} ازيل من المفضلات",
   "unhide_person": "أظهر الشخص",
   "unknown": "غير معروف",
   "unknown_country": "بلد غير معروف",
@@ -1603,9 +1895,11 @@
   "unsaved_change": "تغيير غير محفوظ",
   "unselect_all": "إلغاء تحديد الكل",
   "unselect_all_duplicates": "إلغاء تحديد كافة النسخ المكررة",
+  "unselect_all_in": "إلغاء تحديد الكل في {group}",
   "unstack": "فك الكومه",
   "unstacked_assets_count": "تم إخراج {count, plural, one {# الأصل} other {# الأصول}} من التكديس",
   "up_next": "التالي",
+  "updated_at": "تم التحديث",
   "updated_password": "تم تحديث كلمة المرور",
   "upload": "رفع",
   "upload_concurrency": "الرفع المتزامن",
@@ -1618,14 +1912,20 @@
   "upload_status_errors": "الأخطاء",
   "upload_status_uploaded": "تم الرفع",
   "upload_success": "تم الرفع بنجاح، قم بتحديث الصفحة لرؤية المحتويات المرفوعة الجديدة.",
+  "upload_to_immich": "الرفع الىImmich ‎ ‏ ({count})",
+  "uploading": "جاري الرفع",
   "url": "عنوان URL",
   "usage": "الاستخدام",
+  "use_biometric": "استخدم البايومتري",
+  "use_current_connection": "استخدم الاتصال الحالي",
   "use_custom_date_range": "استخدم النطاق الزمني المخصص بدلاً من ذلك",
   "user": "مستخدم",
+  "user_has_been_deleted": "هذا المستخدم تم حذفه.",
   "user_id": "معرف المستخدم",
   "user_liked": "قام {user} بالإعجاب {type, select, photo {بهذه الصورة} video {بهذا الفيديو} asset {بهذا المحتوى} other {بها}}",
-  "user_pin_code_settings": "الرقم السري",
-  "user_pin_code_settings_description": "تغير الرقم السري",
+  "user_pin_code_settings": "رمز PIN",
+  "user_pin_code_settings_description": "تغير رمز PIN",
+  "user_privacy": "خصوصية المستخدم",
   "user_purchase_settings": "الشراء",
   "user_purchase_settings_description": "إدارة عملية الشراء الخاصة بك",
   "user_role_set": "قم بتعيين {user} كـ {role}",
@@ -1636,6 +1936,7 @@
   "users": "المستخدمين",
   "utilities": "أدوات",
   "validate": "تحقْق",
+  "validate_endpoint_error": "الرجاء ادخال عنوان URL صالح",
   "variables": "المتغيرات",
   "version": "الإصدار",
   "version_announcement_closing": "صديقك، أليكس",
@@ -1657,7 +1958,9 @@
   "view_name": "عرض",
   "view_next_asset": "عرض المحتوى التالي",
   "view_previous_asset": "عرض المحتوى السابق",
+  "view_qr_code": "­عرض رمز الاستجابة السريعة",
   "view_stack": "عرض التكديس",
+  "view_user": "عرض المستخدم",
   "viewer_remove_from_stack": "حذف من الكومه أو المجموعة",
   "viewer_stack_use_as_main_asset": "استخدم كأصل رئيسي",
   "viewer_unstack": "فك الكومه",
@@ -1667,11 +1970,12 @@
   "week": "أسبوع",
   "welcome": "مرحباً",
   "welcome_to_immich": "مرحباً بك في Immich",
-  "wifi_name": "WiFi Name",
+  "wifi_name": "اسم شبكة Wi-Fi",
+  "wrong_pin_code": "رمز PIN خاطئ",
   "year": "سنة",
   "years_ago": "منذ {years, plural, one {# سنة} other {# سنوات}}",
   "yes": "نعم",
   "you_dont_have_any_shared_links": "ليس لديك أي روابط مشتركة",
-  "your_wifi_name": "Your WiFi name",
+  "your_wifi_name": "اسم شبكة Wi-Fi الخاص بك",
   "zoom_image": "تكبير الصورة"
 }
diff --git a/i18n/be.json b/i18n/be.json
index 470030b6f6..d3f59b32a5 100644
--- a/i18n/be.json
+++ b/i18n/be.json
@@ -22,6 +22,7 @@
   "add_partner": "Дадаць партнёра",
   "add_path": "Дадаць шлях",
   "add_photos": "Дадаць фота",
+  "add_tag": "Дадаць тэг",
   "add_to": "Дадаць у…",
   "add_to_album": "Дадаць у альбом",
   "add_to_album_bottom_sheet_added": "Дададзена да {album}",
@@ -33,28 +34,30 @@
   "added_to_favorites_count": "Дададзена {count, number} да абранага",
   "admin": {
     "add_exclusion_pattern_description": "Дадайце шаблоны выключэнняў. Падтрымліваецца выкарыстанне сімвалаў * , ** і ?. Каб ігнараваць усе файлы ў любой дырэкторыі з назвай \"Raw\", выкарыстоўвайце \"**/Raw/**\". Каб ігнараваць усе файлы, якія заканчваюцца на \".tif\", выкарыстоўвайце \"**/.tif\". Каб ігнараваць абсолютны шлях, выкарыстоўвайце \"/path/to/ignore/**\".",
+    "admin_user": "Адміністратар",
     "asset_offline_description": "Гэты знешні бібліятэчны актыў больш не знойдзены на дыску і быў перамешчаны ў сметніцу. Калі файл быў перамешчаны ў межах бібліятэкі, праверце вашу хроніку для новага адпаведнага актыва. Каб аднавіць гэты актыў, пераканайцеся, што шлях да файла ніжэй даступны для Immich і адскануйце бібліятэку.",
     "authentication_settings": "Налады праверкі сапраўднасці",
     "authentication_settings_description": "Кіраванне паролямі, OAuth, і іншыя налады праверкі сапраўднасці",
     "authentication_settings_disable_all": "Вы ўпэўнены, што жадаеце адключыць усе спосабы логіну? Логін будзе цалкам адключаны.",
     "authentication_settings_reenable": "Каб зноў уключыць, выкарыстайце <link>Каманду сервера</link>.",
     "background_task_job": "Фонавыя заданні",
-    "backup_database": "Рэзервовая копія базы даных",
+    "backup_database": "Стварыць рэзервовую копію базы даных",
     "backup_database_enable_description": "Уключыць рэзерваванне базы даных",
     "backup_keep_last_amount": "Колькасць папярэдніх рэзервовых копій для захавання",
     "backup_settings": "Налады рэзервовага капіявання",
-    "backup_settings_description": "Кіраванне наладамі дампа базы дадзеных. Заўвага: гэтыя задачы не кантралююцца, і ў выпадку няўдачы паведамленне адпраўлена не будзе.",
+    "backup_settings_description": "Кіраванне наладамі рэзервавання базы даных.",
     "cleared_jobs": "Ачышчаны заданні для: {job}",
-    "config_set_by_file": "Канфігурацыя ў зараз усталявана праз файл канфігурацыі",
-    "confirm_delete_library": "Вы ўпэўнены што жадаеце выдаліць {library} бібліятэку?",
+    "config_set_by_file": "Канфігурацыя зараз усталявана праз файл канфігурацыі",
+    "confirm_delete_library": "Вы ўпэўнены што жадаеце выдаліць бібліятэку {library}?",
     "confirm_delete_library_assets": "Вы ўпэўнены, што хочаце выдаліць гэтую бібліятэку? Гэта прывядзе да выдалення {count, plural, one {# актыву} other {усіх # актываў}}, якія змяшчаюцца ў Immich, і гэта дзеянне немагчыма будзе адмяніць. Файлы застануцца на дыску.",
     "confirm_email_below": "Каб пацвердзіць, увядзіце \"{email}\" ніжэй",
     "confirm_reprocess_all_faces": "Вы ўпэўнены, што хочаце пераапрацаваць усе твары? Гэта таксама прывядзе да выдалення імя людзей.",
     "confirm_user_password_reset": "Вы ўпэўнены ў тым, што жадаеце скінуць пароль {user}?",
+    "confirm_user_pin_code_reset": "Вы ўпэўнены ў тым, што жадаеце скінуць PIN-код {user}?",
     "create_job": "Стварыць заданне",
     "cron_expression": "Выраз Cron",
     "cron_expression_description": "Усталюйце інтэрвал сканавання, выкарыстоўваючы фармат cron. Для атрымання дадатковай інфармацыі, калі ласка, звярніцеся, напрыклад, да <link>Crontab Guru</link>",
-    "cron_expression_presets": "Прадустановкі выразаў Cron",
+    "cron_expression_presets": "Прадустаноўкі выразаў Cron",
     "disable_login": "Адключыць уваход",
     "duplicate_detection_job_description": "Запусціць машыннае навучанне на актывах для выяўлення падобных выяў. Залежыць ад Smart Search",
     "exclusion_pattern_description": "Шаблоны выключэння дазваляюць ігнараваць файлы і папкі пры сканаванні вашай бібліятэкі. Гэта карысна, калі ў вас ёсць папкі, якія змяшчаюць файлы, якія вы не хочаце імпартаваць, напрыклад, файлы RAW.",
@@ -71,15 +74,272 @@
     "image_fullsize_enabled_description": "Ствараць выяву ў поўным памеры для фарматаў, што не прыдатныя для вэб. Калі ўключана опцыя \"Аддаваць перавагу ўбудаванай праяве\", прагляды выкарыстоўваюцца непасрэдна без канвертацыі. Не ўплывае на вэб-прыдатныя фарматы, такія як JPEG.",
     "image_fullsize_quality_description": "Якасць выявы ў поўным памеры ад 1 да 100. Больш высокае значэнне лепшае, але прыводзіць да павелічэння памеру файла.",
     "image_fullsize_title": "Налады выявы ў поўным памеры",
+    "image_prefer_embedded_preview_setting_description": "Выкарыстоўваць убудаваныя праявы ў RAW-фотаздымках ў якасці ўваходных дадзеных для апрацоўкі малюнкаў, калі магчыма. Гэта дазваляе атрымаць больш дакладныя колеры для некаторых відарысаў, але ж якасць праяў залежыць ад камеры, і на відарысе можа быць больш артэфактаў сціску.",
+    "image_prefer_wide_gamut": "Аддаць перавагу шырокай гаме",
     "image_preview_title": "Налады папярэдняга прагляду",
     "image_quality": "Якасць",
     "image_resolution": "Раздзяляльнасць",
     "image_settings": "Налады відарыса",
-    "image_settings_description": "Кіруйце якасцю і раздзяляльнасцю сгенерыраваных відарысаў"
+    "image_settings_description": "Кіруйце якасцю і раздзяляльнасцю сгенерыраваных відарысаў",
+    "library_created": "Створана бібліятэка: {library}",
+    "library_deleted": "Бібліятэка выдалена",
+    "map_dark_style": "Цёмны стыль",
+    "map_enable_description": "Уключыць функцыі карты",
+    "map_gps_settings": "Налады карты і GPS",
+    "map_light_style": "Светлы стыль",
+    "map_settings": "Карта",
+    "map_settings_description": "Кіраванне наладамі карты",
+    "map_style_description": "URL-адрас style.json тэмы карты",
+    "metadata_settings": "Налады метаданых",
+    "oauth_button_text": "Тэкст кнопкі",
+    "oauth_settings": "OAuth",
+    "system_settings": "Сістэмныя налады",
+    "theme_settings": "Налады тэмы",
+    "transcoding_acceleration_vaapi": "VAAPI",
+    "transcoding_audio_codec": "Аудыякодэк",
+    "transcoding_video_codec": "Відэакодэк",
+    "trash_settings": "Налады сметніцы",
+    "trash_settings_description": "Кіраванне наладамі сметніцы",
+    "version_check_settings": "Праверка версіі",
+    "version_check_settings_description": "Уключыць/адключыць апавяшчэнні аб новай версіі"
   },
+  "advanced_settings_troubleshooting_title": "Выпраўленне непаладак",
+  "album_added": "Альбом дададзены",
+  "album_name": "Назва альбома",
+  "album_remove_user": "Выдаліць карыстальніка?",
+  "album_updated": "Альбом абноўлены",
+  "albums": "Альбомы",
+  "all": "Усе",
+  "all_albums": "Усе альбомы",
+  "all_people": "Усе людзі",
+  "all_videos": "Усе відэа",
+  "app_bar_signout_dialog_ok": "Так",
+  "app_bar_signout_dialog_title": "Выйсці",
+  "app_settings": "Налады праграмы",
+  "archive": "Архіў",
+  "archive_size": "Памер архіва",
+  "asset_uploading": "Запампоўванне…",
+  "back": "Назад",
+  "backup_all": "Усе",
+  "backup_controller_page_background_wifi": "Толькі праз Wi-Fi",
+  "buy": "Купіць Immich",
+  "cache_settings_clear_cache_button": "Ачысціць кэш",
+  "cache_settings_tile_title": "Лакальнае сховішча",
+  "cancel": "Скасаваць",
+  "cancel_search": "Скасаваць пошук",
+  "canceled": "Скасавана",
+  "city": "Горад",
+  "clear": "Ачысціць",
+  "clear_all": "Ачысціць усё",
+  "client_cert_dialog_msg_confirm": "ОК",
+  "client_cert_enter_password": "Увядзіце пароль",
+  "client_cert_import": "Імпарт",
+  "close": "Закрыць",
+  "collapse": "Згарнуць",
+  "collapse_all": "Згарнуць усё",
+  "color": "Колер",
+  "color_theme": "Колеравая тэма",
+  "continue": "Працягнуць",
+  "control_bottom_app_bar_create_new_album": "Стварыць новы альбом",
+  "control_bottom_app_bar_delete_from_immich": "Выдаліць з Immich",
+  "control_bottom_app_bar_delete_from_local": "Выдаліць з прылады",
+  "control_bottom_app_bar_edit_location": "Рэдагаваць месцазнаходжанне",
+  "country": "Краіна",
+  "cover": "Вокладка",
+  "covers": "Вокладкі",
+  "create": "Стварыць",
+  "create_album": "Стварыць альбом",
+  "create_album_page_untitled": "Без назвы",
+  "create_library": "Стварыць бібліятэку",
+  "create_link": "Стварыць спасылку",
+  "create_new_user": "Стварыць новага карыстальніка",
+  "create_tag": "Стварыць тэг",
+  "create_user": "Стварыць карыстальніка",
+  "dark": "Цёмная",
+  "day": "Дзень",
+  "delete": "Выдаліць",
+  "delete_album": "Выдаліць альбом",
+  "delete_dialog_ok_force": "Усё адно выдаліць",
+  "delete_dialog_title": "Выдаліць назаўжды",
+  "delete_face": "Выдаліць твар",
+  "delete_key": "Выдаліць ключ",
+  "delete_library": "Выдаліць бібліятэку",
+  "delete_link": "Выдаліць спасылку",
+  "delete_local_dialog_ok_force": "Усё адно выдаліць",
+  "delete_others": "Выдаліць іншыя",
+  "delete_tag": "Выдаліць тэг",
+  "delete_user": "Выдаліць карыстальніка",
+  "discord": "Discord",
+  "documentation": "Дакументацыя",
+  "done": "Гатова",
+  "download": "Спампаваць",
+  "download_canceled": "Спампоўванне скасавана",
+  "download_complete": "Спампоўванне завершана",
+  "download_enqueue": "Спампоўванне дададзена ў чаргу",
+  "downloading": "Спампоўванне",
+  "edit": "Рэдагаваць",
+  "edit_album": "Рэдагаваць альбом",
+  "edit_avatar": "Рэдагаваць аватар",
+  "edit_date": "Рэдагаваць дату",
+  "edit_date_and_time": "Рэдагаваь дату і час",
+  "edit_description": "Рэдагаваць апісанне",
+  "edit_description_prompt": "Выберыце новае апісанне:",
+  "edit_faces": "Рэдагаваць твары",
+  "edit_import_path": "Рэдагаваць шлях імпарту",
+  "edit_import_paths": "Рэдагаваць шляхі імпарту",
+  "edit_key": "Рэдагаваць ключ",
+  "edit_link": "Рэдагаваць спасылку",
+  "edit_location": "Рэдагаваць месцазнаходжанне",
+  "edit_location_dialog_title": "Месцазнаходжанне",
+  "edit_name": "Рэдагаваць назву",
+  "edit_people": "Рэдагаваць людзей",
+  "edit_tag": "Рэдагаваць тэг",
+  "edit_title": "Рэдагаваць загаловак",
+  "edit_user": "Рэдагаваць карыстальніка",
+  "edited": "Адрэдагавана",
+  "editor": "Рэдактар",
+  "editor_close_without_save_prompt": "Змены не будуць захаваны",
+  "editor_close_without_save_title": "Закрыць рэдактар?",
+  "editor_crop_tool_h2_aspect_ratios": "Суадносіны бакоў",
+  "editor_crop_tool_h2_rotation": "Паварот",
+  "error": "Памылка",
+  "error_saving_image": "Памылка: {error}",
+  "exif": "Exif",
+  "exif_bottom_sheet_description": "Дадаць апісанне...",
+  "favorite": "У абраным",
+  "favorite_or_unfavorite_photo": "Дадаць або выдаліць фота з абранага",
+  "favorites": "Абраныя",
+  "file_name": "Назва файла",
+  "filename": "Назва файла",
+  "filetype": "Тып файла",
+  "filter": "Фільтр",
+  "forward": "Наперад",
+  "gcast_enabled": "Google Cast",
+  "general": "Агульныя",
+  "go_back": "Назад",
+  "go_to_folder": "Перайсці да папкі",
+  "hi_user": "Вітаем, {name} ({email})",
+  "hide_all_people": "Схаваць усіх людзей",
+  "hide_gallery": "Схаваць галерэю",
+  "hide_named_person": "Схаваць {name}",
+  "hide_password": "Схаваць пароль",
+  "hide_person": "Схаваць чалавека",
+  "image_viewer_page_state_provider_download_started": "Спампоўванне пачалося",
+  "immich_logo": "Лагатып Immich",
+  "interval": {
+    "day_at_onepm": "Кожны дзень а 13-й гадзіне",
+    "hours": "{hours, plural, one {Кожную гадзіну} few {Кожныя {hours, number} гадзіны} many {Кожныя {hours, number} гадзін} other {Кожныя {hours, number} гадзін}}",
+    "night_at_midnight": "Кожную ноч апоўначы",
+    "night_at_twoam": "Кожную ноч а 2-й гадзіне"
+  },
+  "language": "Мова",
+  "library": "Бібліятэка",
+  "light": "Светлая",
+  "login_form_back_button_text": "Назад",
+  "login_form_email_hint": "youremail@email.com",
+  "login_form_endpoint_hint": "http://your-server-ip:port",
+  "login_form_password_hint": "пароль",
+  "login_form_save_login": "Заставацца ў сістэме",
+  "main_menu": "Галоўнае меню",
+  "map_location_dialog_yes": "Так",
+  "map_settings_dark_mode": "Цёмны рэжым",
+  "map_settings_date_range_option_day": "Апошнія 24 гадзіны",
+  "map_settings_date_range_option_days": "Апошніх дзён: {days}",
+  "map_settings_date_range_option_year": "Апошні год",
+  "map_settings_date_range_option_years": "Апошніх год: {years}",
+  "map_settings_dialog_title": "Налады карты",
+  "map_settings_theme_settings": "Тэма карты",
+  "menu": "Меню",
+  "minute": "Хвіліна",
+  "month": "Месяц",
+  "monthly_title_text_date_format": "MMMM y",
+  "my_albums": "Мае альбомы",
+  "name": "Імя",
+  "name_or_nickname": "Імя або псеўданім",
+  "next": "Далей",
+  "no": "Не",
+  "offline": "Па-за сеткай",
+  "ok": "ОК",
+  "online": "У сетцы",
+  "open": "Адкрыць",
+  "or": "або",
+  "partner_list_user_photos": "Фота карыстальніка {user}",
+  "pause": "Прыпыніць",
+  "people": "Людзі",
+  "permission_onboarding_back": "Назад",
+  "permission_onboarding_continue_anyway": "Усё адно працягнуць",
+  "photos": "Фота",
+  "photos_and_videos": "Фота і відэа",
+  "place": "Месца",
+  "places": "Месцы",
+  "port": "Порт",
+  "previous": "Папярэдняе",
+  "profile": "Профіль",
+  "profile_drawer_app_logs": "Журналы",
+  "profile_drawer_github": "GitHub",
+  "purchase_button_buy": "Купіць",
+  "purchase_button_buy_immich": "Купіць Immich",
+  "purchase_button_select": "Выбраць",
+  "remove": "Выдаліць",
+  "remove_from_album": "Выдаліць з альбома",
+  "remove_from_favorites": "Выдаліць з абраных",
+  "remove_tag": "Выдаліць тэг",
+  "remove_url": "Выдаліць URL-адрас",
+  "remove_user": "Выдаліць карыстальніка",
+  "rename": "Перайменаваць",
+  "repository": "Рэпазіторый",
+  "reset": "Скінуць",
+  "reset_password": "Скінуць пароль",
+  "restore": "Аднавіць",
+  "restore_all": "Аднавіць усё",
+  "restore_user": "Аднавіць карыстальніка",
+  "resume": "Узнавіць",
+  "role": "Роля",
+  "role_editor": "Рэдактар",
+  "role_viewer": "Глядач",
+  "save": "Захаваць",
+  "save_to_gallery": "Захаваць у галерэю",
+  "search_filter_date": "Дата",
+  "search_filter_location": "Месцазнаходжанне",
+  "search_filter_location_title": "Выберыце месцазнаходжанне",
+  "search_filter_media_type": "Тып медыя",
+  "search_filter_media_type_title": "Выберыце тып медыя",
+  "search_page_screenshots": "Здымкі экрана",
+  "search_page_selfies": "Сэлфі",
+  "search_page_things": "Рэчы",
+  "search_page_your_map": "Ваша карта",
+  "second": "Секунда",
+  "send_message": "Адправіць паведамленне",
+  "setting_languages_apply": "Ужыць",
+  "setting_notifications_notify_never": "ніколі",
+  "settings": "Налады",
+  "share_add_photos": "Дадаць фота",
+  "shared_album_section_people_title": "ЛЮДЗІ",
+  "shared_link_info_chip_metadata": "EXIF",
+  "sharing_page_empty_list": "ПУСТЫ СПІС",
+  "sign_out": "Выйсці",
+  "sign_up": "Зарэгістравацца",
+  "size": "Памер",
+  "sort_title": "Загаловак",
+  "source": "Крыніца",
+  "tag": "Тэг",
+  "tags": "Тэгі",
+  "theme": "Тэма",
+  "theme_selection": "Выбар тэмы",
   "timeline": "Хроніка",
   "total": "Усяго",
+  "trash": "Сметніца",
+  "trash_page_delete_all": "Выдаліць усе",
+  "trash_page_restore_all": "Аднавіць усе",
+  "trash_page_title": "Сметніца ({count})",
+  "type": "Тып",
+  "undo": "Адрабіць",
+  "upload": "Запампаваць",
+  "upload_status_errors": "Памылкі",
+  "uploading": "Запампоўванне",
+  "url": "URL-адрас",
   "user": "Карыстальнік",
+  "user_has_been_deleted": "Гэты карыстальнік быў выдалены.",
   "user_id": "ID карыстальніка",
   "user_purchase_settings": "Купля",
   "user_purchase_settings_description": "Кіруйце пакупкамі",
@@ -112,14 +372,14 @@
   "view_next_asset": "Паказаць наступны аб'ект",
   "view_previous_asset": "Праглядзець папярэдні аб'ект",
   "view_stack": "Прагляд стэка",
-  "visibility_changed": "Відзімасць змянілася для {count, plural, one {# чалавек(-аў)} астатніх {# чалавек}}",
+  "visibility_changed": "Бачнасць змянілася для {count, plural, one {# чалавека} other {# чалавек}}",
   "waiting": "Чакаюць",
   "warning": "Папярэджанне",
   "week": "Тыдзень",
   "welcome": "Вітаем",
   "welcome_to_immich": "Вітаем у Immich",
   "year": "Год",
-  "years_ago": "{years, plural, one {# год} other {# гадоў}} таму",
+  "years_ago": "{years, plural, one {# год} few {# гады} many {# гадоў} other {# гадоў}} таму",
   "yes": "Так",
   "you_dont_have_any_shared_links": "У вас няма абагуленых спасылак",
   "zoom_image": "Павялічыць відарыс"
diff --git a/i18n/bg.json b/i18n/bg.json
index 2df3dd927d..327fd7c7df 100644
--- a/i18n/bg.json
+++ b/i18n/bg.json
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Управление на настройките за метаданни",
     "migration_job": "Миграция",
     "migration_job_description": "Мигриране на миниатюрите за елементи и лица към най-новата структура на папките",
+    "nightly_tasks_cluster_faces_setting_description": "Изпълни разпознаване на лице за открити нови лица",
+    "nightly_tasks_cluster_new_faces_setting": "Разпознаване на нови лица",
+    "nightly_tasks_database_cleanup_setting": "Задачи по почистване на базата данни",
+    "nightly_tasks_database_cleanup_setting_description": "Премахни стари, ненужни записи от базата данни",
+    "nightly_tasks_generate_memories_setting": "Създаване на спомени",
+    "nightly_tasks_generate_memories_setting_description": "Създаване на нови спомени от съществуващи обекти",
+    "nightly_tasks_missing_thumbnails_setting": "Генериране на липсващи миниатюри",
+    "nightly_tasks_missing_thumbnails_setting_description": "Добавяне на обекти без миниатюра в опашката за създаване на миниатюра",
+    "nightly_tasks_settings": "Настройка на задачи за през нощта",
+    "nightly_tasks_settings_description": "Управление на задачите, изпълнявани през нощта",
+    "nightly_tasks_start_time_setting": "Време за начало",
+    "nightly_tasks_start_time_setting_description": "Време, когато сървъра ще започне изпълнение на нощни задачи",
+    "nightly_tasks_sync_quota_usage_setting": "Квота за синхронизация",
+    "nightly_tasks_sync_quota_usage_setting_description": "Обновяване на квотата според текущото потребление",
     "no_paths_added": "Няма добавени пътища",
     "no_pattern_added": "Няма добавен модел",
     "note_apply_storage_label_previous_assets": "Забележка: За да приложите етикета за съхранение към предварително качени файлове, стартирайте",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "URI за мобилно пренасочване",
     "oauth_mobile_redirect_uri_override": "URI пренасочване за мобилни устройства",
     "oauth_mobile_redirect_uri_override_description": "Разреши когато доставчика за OAuth удостоверяване не позволява за мобилни URI идентификатори, като ''{callback}''",
+    "oauth_role_claim": "Потвърждение на роля",
+    "oauth_role_claim_description": "Автоматично предоставяне на административни права при наличие на това потвържение. Потвърждението може да има стойност 'user' или 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Управление на настройките за вход с OAuth",
     "oauth_settings_more_details": "За повече информация за функционалността, се потърсете в <link>docs</link>.",
@@ -357,6 +373,8 @@
   "admin_password": "Администраторска парола",
   "administration": "Администрация",
   "advanced": "Разширено",
+  "advanced_settings_beta_timeline_subtitle": "Опитайте новите функции на приложението",
+  "advanced_settings_beta_timeline_title": "Бета версия на времевата линия",
   "advanced_settings_enable_alternate_media_filter_subtitle": "При синхронизация, използвайте тази опция като филтър, основан на промяна на даден критерии. Опитайте само в случай, че приложението има проблем с откриване на всички албуми.",
   "advanced_settings_enable_alternate_media_filter_title": "[ЕКСПЕРИМЕНТАЛНО] Използвай филтъра на алтернативното устройство за синхронизация на албуми",
   "advanced_settings_log_level_title": "Ниво на запис в дневника: {level}",
@@ -427,6 +445,7 @@
   "app_settings": "Настройки ма приложението",
   "appears_in": "Излиза в",
   "archive": "Архив",
+  "archive_action_prompt": "{count} са добавени в Архива",
   "archive_or_unarchive_photo": "Архивиране или деархивиране на снимка",
   "archive_page_no_archived_assets": "Не са намерени обекти в архива",
   "archive_page_title": "Архив ({count})",
@@ -464,7 +483,6 @@
   "assets": "Елементи",
   "assets_added_count": "Добавено {count, plural, one {# asset} other {# assets}}",
   "assets_added_to_album_count": "Добавен(и) са {count, plural, one {# актив} other {# актива}} в албума",
-  "assets_added_to_name_count": "Добавен(и) са {count, plural, one {# актив} other {# актива}} към {hasName, select, true {<b>{name}</b>} other {нов албум}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Обекта не може да се добави} other {Обектите не може да се добавят}} в албума",
   "assets_count": "{count, plural, one {# актив} other {# актива}}",
   "assets_deleted_permanently": "{count} обекта са изтрити завинаги",
@@ -703,7 +721,7 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM yyyy",
   "dark": "Тъмен",
-  "darkTheme": "Превключи на тъмна тема",
+  "dark_theme": "Тъмна тема",
   "date_after": "Дата след",
   "date_and_time": "Дата и час",
   "date_before": "Дата преди",
@@ -719,6 +737,7 @@
   "default_locale": "Локализация по подразбиране",
   "default_locale_description": "Форматиране на дати и числа в зависимост от езиковата настройка на браузъра",
   "delete": "Изтрий",
+  "delete_action_prompt": "{count} са изтрити завинаги",
   "delete_album": "Изтрий албум",
   "delete_api_key_prompt": "Сигурни ли сте, че искате да изтриете този API ключ?",
   "delete_dialog_alert": "Тези обекти ще бъдат изтрити завинаги и от Immich сървъра и от устройството",
@@ -732,19 +751,20 @@
   "delete_key": "Изтрий ключ",
   "delete_library": "Изтрий библиотека",
   "delete_link": "Изтрий линк",
+  "delete_local_action_prompt": "{count} са изтрити локално",
   "delete_local_dialog_ok_backed_up_only": "Изтрий локално само архивираните",
   "delete_local_dialog_ok_force": "Въпреки това изтрий",
   "delete_others": "Изтрий останалите",
   "delete_shared_link": "Изтриване на споделен линк",
   "delete_shared_link_dialog_title": "Изтрий споделената връзка",
   "delete_tag": "Изтрий таг",
-  "delete_tag_confirmation_prompt": "Сигурни ли сте, че искате да изтриете таг {tagName}?",
+  "delete_tag_confirmation_prompt": "Сигурни ли сте, че искате да изтриете тага {tagName}?",
   "delete_user": "Изтрий потребител",
   "deleted_shared_link": "Изтрит споделен линк",
   "deletes_missing_assets": "Изтрива файлове, които липсват на диска",
   "description": "Описание",
   "description_input_hint_text": "Добави описание...",
-  "description_input_submit_error": "Неуспешно обновяване на описанието. За подробности виж в дневника",
+  "description_input_submit_error": "Неуспешно обновяване на описанието. За подробности вижте в дневника",
   "details": "Детайли",
   "direction": "Посока",
   "disabled": "Изключено",
@@ -762,6 +782,7 @@
   "documentation": "Документация",
   "done": "Готово",
   "download": "Изтегли",
+  "download_action_prompt": "Зареждане на {count} обекта",
   "download_canceled": "Изтеглянето е отменено",
   "download_complete": "Изтеглянето завърши",
   "download_enqueue": "Изтеглянето е добавено в опашката",
@@ -799,6 +820,7 @@
   "edit_key": "Редактиране на ключ",
   "edit_link": "Редактиране на линк",
   "edit_location": "Редактиране на местоположението",
+  "edit_location_action_prompt": "{count} локации са редактирани",
   "edit_location_dialog_title": "Местоположение",
   "edit_name": "Редактиране на име",
   "edit_people": "Редактиране на хора",
@@ -984,6 +1006,7 @@
   "failed_to_load_assets": "Неуспешно зареждане на елементи",
   "failed_to_load_folder": "Неуспешно зареждане на папка",
   "favorite": "Любим",
+  "favorite_action_prompt": "{count} са добавени в Любими",
   "favorite_or_unfavorite_photo": "Добави или премахни снимка от Любими",
   "favorites": "Любими",
   "favorites_page_no_favorites": "Не са намерени любими обекти",
@@ -1127,6 +1150,7 @@
   "library_page_sort_created": "Дата на създаване",
   "library_page_sort_last_modified": "Последна промяна",
   "library_page_sort_title": "Заглавие на албума",
+  "licenses": "Лицензи",
   "light": "Светло",
   "like_deleted": "Като изтрит",
   "link_motion_video": "Линк към видео",
@@ -1246,6 +1270,7 @@
   "more": "Още",
   "move": "Премести",
   "move_off_locked_folder": "Извади от заключената папка",
+  "move_to_lock_folder_action_prompt": "{count} са добавени в заключената папка",
   "move_to_locked_folder": "Премести в заключена папка",
   "move_to_locked_folder_confirmation": "Тези снимки и видеа ще бъдат изтрити от всички албуми и ще са достъпни само в заключената папка",
   "moved_to_archive": "{count, plural, one {# обект е преместен} many {# обекта са преместени} other {# обекта са преместени}} в архива",
@@ -1495,7 +1520,9 @@
   "remove_custom_date_range": "Премахни зададения диапазон от дати",
   "remove_deleted_assets": "Премахни Изтритите Елементи",
   "remove_from_album": "Премахни от албума",
+  "remove_from_album_action_prompt": "{count} са премахнати от албума",
   "remove_from_favorites": "Премахни от Любими",
+  "remove_from_lock_folder_action_prompt": "{count} са премахнати от заключената папка",
   "remove_from_locked_folder": "Махни от заключената папка",
   "remove_from_locked_folder_confirmation": "Сигурни ли си, че искате тези снимки и видеа да бъдат извадени от заключената папка? Те ще бъдат видими в библиотеката.",
   "remove_from_shared_link": "Премахни от споделения линк",
@@ -1667,6 +1694,7 @@
   "settings_saved": "Настройките са запазени",
   "setup_pin_code": "Задай PIN код",
   "share": "Споделяне",
+  "share_action_prompt": "{count} споделени обекта",
   "share_add_photos": "Добави снимки",
   "share_assets_selected": "{count} избрани",
   "share_dialog_preparing": "Подготовка...",
@@ -1768,6 +1796,7 @@
   "sort_title": "Заглавие",
   "source": "Код",
   "stack": "Събери",
+  "stack_action_prompt": "{count} са групирани",
   "stack_duplicates": "Подреждане на дубликати",
   "stack_select_one_photo": "Избери една главна снимка за събраните снимки",
   "stack_selected_photos": "Подреждане на избрани снимки",
@@ -1838,6 +1867,7 @@
   "total": "Общо",
   "total_usage": "Общо използвано",
   "trash": "Кошче",
+  "trash_action_prompt": "{count} са преместени в коша",
   "trash_all": "Изхвърли всички",
   "trash_count": "В Кошчето {count, number}",
   "trash_delete_asset": "Вкарай в Кошчето/Изтрий елемент",
@@ -1855,9 +1885,11 @@
   "unable_to_change_pin_code": "Невъзможна промяна на PIN кода",
   "unable_to_setup_pin_code": "Неуспешно задаване на PIN кода",
   "unarchive": "Разархивирай",
+  "unarchive_action_prompt": "{count} са премахнати от Архива",
   "unarchived_count": "{count, plural, other {Неархивирани #}}",
   "undo": "Отмени",
   "unfavorite": "Премахване от любимите",
+  "unfavorite_action_prompt": "{count} са премахнати от Любими",
   "unhide_person": "Покажи отново човека",
   "unknown": "Неизвестно",
   "unknown_country": "Непозната Държава",
@@ -1875,7 +1907,9 @@
   "unselect_all_duplicates": "От маркирай всички дубликати",
   "unselect_all_in": "Премахни избора на всички от групата {group}",
   "unstack": "Разкачи",
+  "unstack_action_prompt": "{count} са разгрупирани",
   "unstacked_assets_count": "Разкачени {count, plural, one {# елемент} other {# елементи}}",
+  "untagged": "Немаркирани",
   "up_next": "Следващ",
   "updated_at": "Обновено",
   "updated_password": "Паролата е актуализирана",
diff --git a/i18n/bn.json b/i18n/bn.json
index ed108652b7..d71e4e25ae 100644
--- a/i18n/bn.json
+++ b/i18n/bn.json
@@ -8,6 +8,7 @@
   "actions": "কর্ম",
   "active": "সচল",
   "activity": "কার্যকলাপ",
+  "activity_changed": "একটিভিটি এখন {enabled, select, true {চালু} other {বন্ধ}} আছে",
   "add": "যোগ করুন",
   "add_a_description": "একটি বিবরণ যোগ করুন",
   "add_a_location": "একটি অবস্থান যোগ করুন",
@@ -15,5 +16,84 @@
   "add_a_title": "একটি শিরোনাম যোগ করুন",
   "add_endpoint": "এন্ডপয়েন্ট যোগ করুন",
   "add_exclusion_pattern": "বহির্ভূতকরণ নমুনা",
-  "add_url": "লিঙ্ক যোগ করুন"
+  "add_import_path": "ইমপোর্ট করার পাথ যুক্ত করুন",
+  "add_location": "অবস্থান যুক্ত করুন",
+  "add_more_users": "আরো ব্যবহারকারী যুক্ত করুন",
+  "add_partner": "অংশীদার যোগ করুন",
+  "add_path": "পাথ যুক্ত করুন",
+  "add_photos": "ছবি যুক্ত করুন",
+  "add_tag": "ট্যাগ যুক্ত করুন",
+  "add_to": "যুক্ত করুন…",
+  "add_to_album": "এলবাম এ যোগ করুন",
+  "add_to_album_bottom_sheet_added": "{album} এ যোগ করা হয়েছে",
+  "add_to_album_bottom_sheet_already_exists": "{album} এ আগে থেকেই আছে",
+  "add_to_shared_album": "শেয়ার করা অ্যালবামে যোগ করুন",
+  "add_url": "লিঙ্ক যোগ করুন",
+  "added_to_archive": "আর্কাইভ এ যোগ করা হয়েছে",
+  "added_to_favorites": "ফেভারিটে যোগ করা হয়েছে",
+  "added_to_favorites_count": "পছন্দের তালিকায় {count, number} যোগ করা হয়েছে",
+  "admin": {
+    "add_exclusion_pattern_description": "এক্সক্লুশন প্যাটার্ন যোগ করুন। *, **, এবং ? ব্যবহার করে গ্লোবিং করা সম্ভব। \"Raw\" নামের যেকোনো ডিরেক্টরিতে থাকা সমস্ত ফাইল বাদ দিতে \"**/Raw/**\" ব্যবহার করুন। \".tif\" দিয়ে শেষ হওয়া সমস্ত ফাইল বাদ দিতে \"**/*.tif\" ব্যবহার করুন। একটি সম্পূর্ণ পাথ বাদ দিতে, \"/path/to/ignore/**\" ব্যবহার করুন।",
+    "admin_user": "এডমিন ইউজার",
+    "asset_offline_description": "এই বহিরাগত লাইব্রেরি সম্পদটি আর ডিস্কে পাওয়া যাচ্ছে না এবং ট্র্যাশে সরানো হয়েছে। যদি ফাইলটি লাইব্রেরির মধ্যে সরানো হয়ে থাকে, তাহলে নতুন সংশ্লিষ্ট সম্পদের জন্য আপনার টাইমলাইন পরীক্ষা করুন। এই সম্পদটি পুনরুদ্ধার করতে, দয়া করে নিশ্চিত করুন যে নীচের ফাইল পাথটি Immich দ্বারা অ্যাক্সেস করা যেতে পারে এবং লাইব্রেরিটি স্ক্যান করুন।",
+    "authentication_settings": "প্রমাণীকরণ সেটিংস",
+    "authentication_settings_description": "পাসওয়ার্ড, OAuth এবং অন্যান্য প্রমাণীকরণ সেটিংস পরিচালনা করুন",
+    "authentication_settings_disable_all": "আপনি কি নিশ্চিত যে আপনি সমস্ত লগইন পদ্ধতি অক্ষম করতে চান? লগইন সম্পূর্ণরূপে অক্ষম করা হবে।",
+    "authentication_settings_reenable": "পুনরায় সক্ষম করতে, একটি <link>সার্ভার কমান্ড</link> ব্যবহার করুন।",
+    "background_task_job": "ব্যাকগ্রাউন্ড টাস্ক",
+    "backup_database": "ডাটাবেস ডাম্প তৈরি করুন",
+    "backup_database_enable_description": "ডাটাবেস ডাম্প সক্রিয় করুন",
+    "backup_keep_last_amount": "আগের ডাম্পের পরিমাণ রাখা হবে",
+    "backup_settings": "ডাটাবেস ডাম্প সেটিংস",
+    "backup_settings_description": "ডাটাবেস ডাম্প সেটিংস পরিচালনা করুন।",
+    "cleared_jobs": "{job} এর জন্য jobs খালি করা হয়েছে",
+    "config_set_by_file": "কনফিগ বর্তমানে একটি কনফিগ ফাইল দ্বারা সেট করা আছে",
+    "confirm_delete_library": "আপনি কি নিশ্চিত যে আপনি {library} লাইব্রেরি মুছে ফেলতে চান?",
+    "confirm_delete_library_assets": "আপনি কি নিশ্চিত যে আপনি এই লাইব্রেরিটি মুছে ফেলতে চান? এটি Immich থেকে {count, plural, one {# contained asset} other {all # contained asset}} মুছে ফেলবে এবং পূর্বাবস্থায় ফেরানো যাবে না। ফাইলগুলি ডিস্কে থাকবে।",
+    "confirm_email_below": "নিশ্চিত করতে, নিচে \"{email}\" টাইপ করুন",
+    "confirm_reprocess_all_faces": "আপনি কি নিশ্চিত যে আপনি সমস্ত মুখ পুনরায় প্রক্রিয়া করতে চান? এটি নামযুক্ত ব্যক্তিদেরও মুছে ফেলবে।",
+    "confirm_user_password_reset": "আপনি কি নিশ্চিত যে আপনি {user} এর পাসওয়ার্ড রিসেট করতে চান?",
+    "confirm_user_pin_code_reset": "আপনি কি নিশ্চিত যে আপনি {user} এর পিন কোড রিসেট করতে চান?",
+    "create_job": "job তৈরি করুন",
+    "cron_expression": "ক্রোন এক্সপ্রেশন",
+    "cron_expression_description": "ক্রোন ফর্ম্যাট ব্যবহার করে স্ক্যানিং ব্যবধান সেট করুন। আরও তথ্যের জন্য দয়া করে দেখুন যেমন <link>Crontab Guru</link>",
+    "cron_expression_presets": "ক্রোন এক্সপ্রেশন প্রিসেট",
+    "disable_login": "লগইন অক্ষম করুন",
+    "duplicate_detection_job_description": "অনুরূপ ছবি সনাক্ত করতে সম্পদগুলিতে মেশিন লার্নিং চালান। স্মার্ট অনুসন্ধানের উপর নির্ভর করে",
+    "exclusion_pattern_description": "এক্সক্লুশন প্যাটার্ন ব্যবহার করে আপনি আপনার লাইব্রেরি স্ক্যান করার সময় ফাইল এবং ফোল্ডারগুলিকে উপেক্ষা করতে পারবেন। যদি আপনার এমন ফোল্ডার থাকে যেখানে এমন ফাইল থাকে যা আপনি আমদানি করতে চান না, যেমন RAW ফাইল।",
+    "external_library_management": "বহিরাগত গ্রন্থাগার ব্যবস্থাপনা",
+    "face_detection": "মুখ সনাক্তকরণ",
+    "face_detection_description": "মেশিন লার্নিং ব্যবহার করে অ্যাসেটে থাকা মুখগুলি সনাক্ত করুন। ভিডিওগুলির জন্য, শুধুমাত্র থাম্বনেইল বিবেচনা করা হয়। \"রিফ্রেশ\" (পুনরায়) সমস্ত অ্যাসেট প্রক্রিয়া করে। \"রিসেট\" অতিরিক্তভাবে সমস্ত বর্তমান মুখের ডেটা সাফ করে। \"অনুপস্থিত\" অ্যাসেটগুলিকে সারিবদ্ধ করে যা এখনও প্রক্রিয়া করা হয়নি। সনাক্ত করা মুখগুলিকে ফেসিয়াল রিকগনিশনের জন্য সারিবদ্ধ করা হবে, ফেসিয়াল ডিটেকশন সম্পূর্ণ হওয়ার পরে, বিদ্যমান বা নতুন ব্যক্তিদের মধ্যে গোষ্ঠীবদ্ধ করে।",
+    "facial_recognition_job_description": "শনাক্ত করা মুখগুলিকে মানুষের মধ্যে গোষ্ঠীভুক্ত করুন। মুখ সনাক্তকরণ সম্পূর্ণ হওয়ার পরে এই ধাপটি চলে। \"রিসেট\" (পুনরায়) সমস্ত মুখকে ক্লাস্টার করে। \"অনুপস্থিত\" মুখগুলিকে সারিতে রাখে যেখানে কোনও ব্যক্তিকে বরাদ্দ করা হয়নি।",
+    "failed_job_command": "কমান্ড {command} কাজের জন্য ব্যর্থ হয়েছে: {job}",
+    "force_delete_user_warning": "সতর্কতা: এটি ব্যবহারকারী এবং সমস্ত সম্পদ অবিলম্বে সরিয়ে ফেলবে। এটি পূর্বাবস্থায় ফেরানো যাবে না এবং ফাইলগুলি পুনরুদ্ধার করা যাবে না।",
+    "image_format": "ফরম্যাট",
+    "image_format_description": "WebP JPEG এর তুলনায় ছোট ফাইল তৈরি করে, কিন্তু এনকোড করতে ধীর।",
+    "image_fullsize_description": "জুম ইন করার সময় ব্যবহৃত স্ট্রিপড মেটাডেটা সহ পূর্ণ আকারের ছবি",
+    "image_fullsize_enabled": "পূর্ণ-আকারের ছবি তৈরি সক্ষম করুন",
+    "image_fullsize_enabled_description": "ওয়েব-বান্ধব নয় এমন ফর্ম্যাটের জন্য পূর্ণ-আকারের ছবি তৈরি করুন। \"এমবেডেড প্রিভিউ পছন্দ করুন\" সক্ষম করা থাকলে, রূপান্তর ছাড়াই এমবেডেড প্রিভিউ সরাসরি ব্যবহার করা হয়। JPEG-এর মতো ওয়েব-বান্ধব ফর্ম্যাটগুলিকে প্রভাবিত করে না।",
+    "image_fullsize_quality_description": "পূর্ণ-আকারের ছবির মান ১-১০০। উচ্চতর হলে ভালো, কিন্তু আরও বড় ফাইল তৈরি হয়।",
+    "image_fullsize_title": "পূর্ণ-আকারের চিত্র সেটিংস",
+    "image_prefer_embedded_preview": "এম্বেড করা প্রিভিউ পছন্দ করুন",
+    "image_prefer_embedded_preview_setting_description": "ছবি প্রক্রিয়াকরণের জন্য এবং যখনই উপলব্ধ থাকবে তখন RAW ফটোতে এমবেডেড প্রিভিউ ব্যবহার করুন। এটি কিছু ছবির জন্য আরও সঠিক রঙ তৈরি করতে পারে, তবে প্রিভিউয়ের মান ক্যামেরা-নির্ভর এবং ছবিতে আরও কম্প্রেশন আর্টিফ্যাক্ট থাকতে পারে।",
+    "image_prefer_wide_gamut": "প্রশস্ত পরিসর পছন্দ করুন",
+    "image_prefer_wide_gamut_setting_description": "থাম্বনেইলের জন্য ডিসপ্লে P3 ব্যবহার করুন। এটি প্রশস্ত রঙের স্থান সহ ছবির প্রাণবন্ততা আরও ভালভাবে সংরক্ষণ করে, তবে পুরানো ব্রাউজার সংস্করণ সহ পুরানো ডিভাইসগুলিতে ছবিগুলি ভিন্নভাবে প্রদর্শিত হতে পারে। রঙের পরিবর্তন এড়াতে sRGB ছবিগুলিকে sRGB হিসাবে রাখা হয়।",
+    "image_preview_description": "স্ট্রিপড মেটাডেটা সহ মাঝারি আকারের ছবি, একটি একক সম্পদ দেখার সময় এবং মেশিন লার্নিংয়ের জন্য ব্যবহৃত হয়",
+    "image_preview_quality_description": "১-১০০ এর মধ্যে প্রিভিউ কোয়ালিটি। বেশি হলে ভালো, কিন্তু বড় ফাইল তৈরি হয় এবং অ্যাপের প্রতিক্রিয়াশীলতা কমাতে পারে। কম মান সেট করলে মেশিন লার্নিং কোয়ালিটির উপর প্রভাব পড়তে পারে।",
+    "image_preview_title": "প্রিভিউ সেটিংস",
+    "image_quality": "গুণমান",
+    "image_resolution": "রেজোলিউশন",
+    "image_resolution_description": "উচ্চ রেজোলিউশনের ক্ষেত্রে আরও বিস্তারিত তথ্য সংরক্ষণ করা সম্ভব কিন্তু এনকোড করতে বেশি সময় লাগে, ফাইলের আকার বড় হয় এবং অ্যাপের প্রতিক্রিয়াশীলতা কমাতে পারে।",
+    "image_settings": "চিত্র সেটিংস",
+    "image_settings_description": "তৈরি করা ছবির মান এবং রেজোলিউশন পরিচালনা করুন",
+    "image_thumbnail_description": "মেটাডেটা বাদ দেওয়া ছোট থাম্বনেইল, মূল টাইমলাইনের মতো ছবির গ্রুপ দেখার সময় ব্যবহৃত হয়",
+    "image_thumbnail_quality_description": "থাম্বনেইলের মান ১-১০০। বেশি হলে ভালো, কিন্তু বড় ফাইল তৈরি হয় এবং অ্যাপের প্রতিক্রিয়াশীলতা কমাতে পারে।",
+    "image_thumbnail_title": "থাম্বনেল সেটিংস",
+    "job_concurrency": "{job} কনকারেন্সি",
+    "job_created": "Job তৈরি হয়েছে",
+    "job_not_concurrency_safe": "এই কাজটি সমকালীন-নিরাপদ নয়।",
+    "job_settings": "কাজের সেটিংস",
+    "job_settings_description": "কাজের সমান্তরালতা পরিচালনা করুন",
+    "job_status": "চাকরির অবস্থা"
+  }
 }
diff --git a/i18n/ca.json b/i18n/ca.json
index 5c53311a02..39c249c3a3 100644
--- a/i18n/ca.json
+++ b/i18n/ca.json
@@ -166,6 +166,10 @@
     "metadata_settings_description": "Administrar la configuració de les metadades",
     "migration_job": "Migració",
     "migration_job_description": "Migra les miniatures d'elements i cares cap a la nova estructura de carpetes",
+    "nightly_tasks_cluster_new_faces_setting": "Agrupa cares noves",
+    "nightly_tasks_database_cleanup_setting": "Tasques de neteja de la base de dades",
+    "nightly_tasks_database_cleanup_setting_description": "Netegeu les dades antigues i caducades de la base de dades",
+    "nightly_tasks_missing_thumbnails_setting": "Generar les miniatures restants",
     "no_paths_added": "No s'ha afegit cap ruta",
     "no_pattern_added": "Cap patró aplicat",
     "note_apply_storage_label_previous_assets": "Nota: Per aplicar l'etiquetatge d'emmagatzematge a elements pujats prèviament, executeu la",
@@ -196,6 +200,8 @@
     "oauth_mobile_redirect_uri": "URI de redirecció mòbil",
     "oauth_mobile_redirect_uri_override": "Sobreescriu l'URI de redirecció mòbil",
     "oauth_mobile_redirect_uri_override_description": "Habilita quan el proveïdor d'OAuth no permet una URI mòbil, com ara ''{callback}''",
+    "oauth_role_claim": "Concessió de rol",
+    "oauth_role_claim_description": "Atorgar accés d'administrador automàticament segons la presència d'aquesta concessió. La concessió pot ser 'usuari' o 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Gestiona la configuració de l'inici de sessió OAuth",
     "oauth_settings_more_details": "Per a més detalls sobre aquesta funcionalitat, consulteu la <link>documentació</link>.",
@@ -244,6 +250,7 @@
     "storage_template_migration_info": "Les extensions es convertiran a minúscules. Els canvis de plantilla només s'aplicaran a nous elements. Per aplicar la plantilla rectroactivament a elements pujats prèviament, executeu la <link>{job}</link>.",
     "storage_template_migration_job": "Tasca de migració de la plantilla d'emmagatzematge",
     "storage_template_more_details": "Per obtenir més detalls sobre aquesta funció, consulteu la <template-link>Storage Template</template-link> i les seves <implications-link>implications</implications-link>",
+    "storage_template_onboarding_description_v2": "Un cop habilitada, aquesta funció organitzarà automàticament els fitxers a partir d'una plantilla definida per l'usuari. Per a més informació, podeu consultar la <link>documentació</link>.",
     "storage_template_path_length": "Límit aproximat de longitud de la ruta: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Plantilla d'emmagatzematge",
     "storage_template_settings_description": "Gestiona l'estructura de les carpetes i el nom del fitxers dels elements pujats",
@@ -359,7 +366,7 @@
   "advanced_settings_enable_alternate_media_filter_subtitle": "Feu servir aquesta opció per filtrar els continguts multimèdia durant la sincronització segons criteris alternatius. Només proveu-ho si teniu problemes amb l'aplicació per detectar tots els àlbums.",
   "advanced_settings_enable_alternate_media_filter_title": "Utilitza el filtre de sincronització d'àlbums de dispositius alternatius",
   "advanced_settings_log_level_title": "Nivell de registre: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Alguns dispositius són molt lents en carregar miniatures dels elements del dispositiu. Activeu aquest paràmetre per carregar imatges remotes en el seu lloc.",
+  "advanced_settings_prefer_remote_subtitle": "Alguns dispositius són molt lents en carregar miniatures dels elements locals. Activeu aquest paràmetre per carregar imatges remotes en el seu lloc.",
   "advanced_settings_prefer_remote_title": "Prefereix imatges remotes",
   "advanced_settings_proxy_headers_subtitle": "Definiu les capçaleres de proxy que Immich per enviar amb cada sol·licitud de xarxa",
   "advanced_settings_proxy_headers_title": "Capçaleres de proxy",
@@ -426,6 +433,7 @@
   "app_settings": "Configuració de l'app",
   "appears_in": "Apareix a",
   "archive": "Arxiu",
+  "archive_action_prompt": "{count} afegit a Arxiu",
   "archive_or_unarchive_photo": "Arxivar o desarxivar fotografia",
   "archive_page_no_archived_assets": "No s'ha trobat res arxivat",
   "archive_page_title": "Arxiu({count})",
@@ -463,7 +471,6 @@
   "assets": "Elements",
   "assets_added_count": "{count, plural, one {Afegit un element} other {Afegits # elements}}",
   "assets_added_to_album_count": "{count, plural, one {Afegit un element} other {Afegits # elements}} a l'àlbum",
-  "assets_added_to_name_count": "{count, plural, one {S'ha afegit # recurs} other {S'han afegit # recursos}} a {hasName, select, true {<b>{name}</b>} other {new album}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} no es pot afegir a l'àlbum",
   "assets_count": "{count, plural, one {# recurs} other {# recursos}}",
   "assets_deleted_permanently": "{count} element(s) esborrats permanentment",
@@ -702,7 +709,7 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Fosc",
-  "darkTheme": "Activa/desactiva el tema fosc",
+  "dark_theme": "Canviar a tema fosc",
   "date_after": "Data posterior a",
   "date_and_time": "Data i hora",
   "date_before": "Data anterior a",
@@ -718,6 +725,7 @@
   "default_locale": "Localització predeterminada",
   "default_locale_description": "Format de dates i números segons la configuració del navegador",
   "delete": "Esborra",
+  "delete_action_prompt": "{count} eliminats permanentment",
   "delete_album": "Esborra l'àlbum",
   "delete_api_key_prompt": "Esteu segurs que voleu eliminar aquesta clau API?",
   "delete_dialog_alert": "Aquests elements seran eliminats de manera permanent d'Immich i del vostre dispositiu",
@@ -798,6 +806,7 @@
   "edit_key": "Edita clau",
   "edit_link": "Edita enllaç",
   "edit_location": "Edita ubicació",
+  "edit_location_action_prompt": "{count} ubicacions editades",
   "edit_location_dialog_title": "Ubicació",
   "edit_name": "Edita el nom",
   "edit_people": "Edita la gent",
@@ -983,6 +992,7 @@
   "failed_to_load_assets": "Error carregant recursos",
   "failed_to_load_folder": "No s'ha pogut carregar la carpeta",
   "favorite": "Preferit",
+  "favorite_action_prompt": "{count} afegit a Favorits",
   "favorite_or_unfavorite_photo": "Foto preferida o no preferida",
   "favorites": "Preferits",
   "favorites_page_no_favorites": "No s'han trobat preferits",
@@ -1149,6 +1159,7 @@
   "locked_folder": "Carpeta bloquejada",
   "log_out": "Tanca la sessió",
   "log_out_all_devices": "Tanqueu la sessió de tots els dispositius",
+  "logged_in_as": "Sessió iniciada com a {user}",
   "logged_out_all_devices": "S'ha tancat la sessió de tots els dispositius",
   "logged_out_device": "Dispositiu tancat",
   "login": "Iniciar sessió",
@@ -1244,6 +1255,7 @@
   "more": "Més",
   "move": "Moure",
   "move_off_locked_folder": "Moure fora de la carpeta bloquejada",
+  "move_to_lock_folder_action_prompt": "{count} afegides a la carpeta protegida",
   "move_to_locked_folder": "Moure a la carpeta bloquejada",
   "move_to_locked_folder_confirmation": "Aquestes fotos i vídeos seran eliminades de tots els àlbums, i només podran ser vistes des de la carpeta bloquejada",
   "moved_to_archive": "S'han mogut {count, plural, one {# asset} other {# assets}} a l'arxiu",
@@ -1494,6 +1506,7 @@
   "remove_deleted_assets": "Suprimeix fitxers fora de línia",
   "remove_from_album": "Treu de l'àlbum",
   "remove_from_favorites": "Eliminar dels preferits",
+  "remove_from_lock_folder_action_prompt": "{count} eliminades de la carpeta protegida",
   "remove_from_locked_folder": "Elimina de la carpeta bloquejada",
   "remove_from_locked_folder_confirmation": "Segur que vols moure aquestes fotos i vídeos fora de la carpeta bloquejada? Seran visibles a la teva biblioteca.",
   "remove_from_shared_link": "Eliminar de l'enllaç compartit",
@@ -1606,6 +1619,7 @@
   "select_album_cover": "Seleccionar la portada de l'àlbum",
   "select_all": "Selecciona-ho tot",
   "select_all_duplicates": "Seleccioneu tots els duplicats",
+  "select_all_in": "Selecciona tot en {group}",
   "select_avatar_color": "Tria color de l'avatar",
   "select_face": "Selecciona cara",
   "select_featured_photo": "Selecciona foto principal",
@@ -1835,6 +1849,7 @@
   "total": "Total",
   "total_usage": "Ús total",
   "trash": "Paperera",
+  "trash_action_prompt": "{count} mogudes a la brossa",
   "trash_all": "Envia-ho tot a la paperera",
   "trash_count": "Paperera {count, number}",
   "trash_delete_asset": "Esborra/Elimina element",
@@ -1852,9 +1867,11 @@
   "unable_to_change_pin_code": "No es pot canviar el codi PIN",
   "unable_to_setup_pin_code": "No s'ha pogut configurar el codi PIN",
   "unarchive": "Desarxivar",
+  "unarchive_action_prompt": "{count} eliminades de l'arxiu",
   "unarchived_count": "{count, plural, other {# elements desarxivats}}",
   "undo": "Desfer",
   "unfavorite": "Reverteix preferit",
+  "unfavorite_action_prompt": "{count} eliminades de preferits",
   "unhide_person": "Mostra persona",
   "unknown": "Desconegut",
   "unknown_country": "País Desconegut",
@@ -1870,6 +1887,7 @@
   "unsaved_change": "Canvi no desat",
   "unselect_all": "Deselecciona-ho tot",
   "unselect_all_duplicates": "Desmarqueu tots els duplicats",
+  "unselect_all_in": "Desseleccionar tots els elements de {group}",
   "unstack": "Desapila",
   "unstacked_assets_count": "No apilat {count, plural, one {# recurs} other {# recursos}}",
   "up_next": "Pròxim",
diff --git a/i18n/cs.json b/i18n/cs.json
index 82e72cab46..c14a4b6d0c 100644
--- a/i18n/cs.json
+++ b/i18n/cs.json
@@ -44,7 +44,7 @@
     "backup_database": "Vytvořit výpis databáze",
     "backup_database_enable_description": "Povolit výpisy z databáze",
     "backup_keep_last_amount": "Počet předchozích výpisů, které se mají ponechat",
-    "backup_settings": "Nastavení výpisu databáze",
+    "backup_settings": "Zálohování databáze",
     "backup_settings_description": "Správa nastavení výpisu databáze.",
     "cleared_jobs": "Hotové úlohy pro: {job}",
     "config_set_by_file": "Konfigurace je aktuálně prováděna konfiguračním souborem",
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Správa nastavení metadat",
     "migration_job": "Migrace",
     "migration_job_description": "Migrace miniatur snímků a obličejů do nejnovější struktury složek",
+    "nightly_tasks_cluster_faces_setting_description": "Spustit rozpoznávání obličeje na nově nalezených obličejích",
+    "nightly_tasks_cluster_new_faces_setting": "Seskupit nové tváře",
+    "nightly_tasks_database_cleanup_setting": "Úlohy čištění databáze",
+    "nightly_tasks_database_cleanup_setting_description": "Vyčistit databázi od starých dat, jejichž platnost vypršela",
+    "nightly_tasks_generate_memories_setting": "Vytváření vzpomínek",
+    "nightly_tasks_generate_memories_setting_description": "Vytváření nových vzpomínek z položek",
+    "nightly_tasks_missing_thumbnails_setting": "Generovat chybějící miniatury",
+    "nightly_tasks_missing_thumbnails_setting_description": "Řadit položky bez miniatur do fronty pro generování miniatur",
+    "nightly_tasks_settings": "Noční úlohy",
+    "nightly_tasks_settings_description": "Správa nočních úkolů",
+    "nightly_tasks_start_time_setting": "Čas zahájení",
+    "nightly_tasks_start_time_setting_description": "Čas, kdy server spustí noční úlohy",
+    "nightly_tasks_sync_quota_usage_setting": "Synchronizace využití kvóty",
+    "nightly_tasks_sync_quota_usage_setting_description": "Aktualizovat kvótu úložiště uživatele na základě aktuálního využití",
     "no_paths_added": "Nebyly přidány žádné cesty",
     "no_pattern_added": "Nebyl přidán žádný vzor",
     "note_apply_storage_label_previous_assets": "Upozornění: Pro uplatnění Štítku úložiště na dříve nahrané položky spusťte",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "Mobilní přesměrování URI",
     "oauth_mobile_redirect_uri_override": "Přepsat mobilní přesměrování URI",
     "oauth_mobile_redirect_uri_override_description": "Povolit, pokud poskytovatel OAuth nepovoluje mobilní URI, například ''{callback}''",
+    "oauth_role_claim": "Deklarace Role",
+    "oauth_role_claim_description": "Automaticky udělit přístup správce na základě přítomnosti této deklarace. Deklarace může mít hodnotu 'user' nebo 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Správa nastavení OAuth přihlášení",
     "oauth_settings_more_details": "Další podrobnosti o této funkci naleznete v <link>dokumentaci</link>.",
@@ -357,10 +373,12 @@
   "admin_password": "Heslo správce",
   "administration": "Administrace",
   "advanced": "Pokročilé",
+  "advanced_settings_beta_timeline_subtitle": "Vyzkoušejte nové prostředí aplikace",
+  "advanced_settings_beta_timeline_title": "Časová osa beta verze",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Tuto možnost použijte k filtrování médií během synchronizace na základě alternativních kritérií. Tuto možnost vyzkoušejte pouze v případě, že máte problémy s detekcí všech alb v aplikaci.",
   "advanced_settings_enable_alternate_media_filter_title": "[EXPERIMENTÁLNÍ] Použít alternativní filtr pro synchronizaci alb zařízení",
   "advanced_settings_log_level_title": "Úroveň protokolování: {level}",
-  "advanced_settings_prefer_remote_subtitle": "U některých zařízení je načítání miniatur z prostředků v zařízení velmi pomalé. Aktivujte toto nastavení, aby se místo toho načítaly vzdálené obrázky.",
+  "advanced_settings_prefer_remote_subtitle": "U některých zařízení je načítání miniatur z lokálních prostředků velmi pomalé. Aktivujte toto nastavení, aby se místo toho načítaly vzdálené obrázky.",
   "advanced_settings_prefer_remote_title": "Preferovat vzdálené obrázky",
   "advanced_settings_proxy_headers_subtitle": "Definice hlaviček proxy serveru, které by měl Immich odesílat s každým síťovým požadavkem",
   "advanced_settings_proxy_headers_title": "Proxy hlavičky",
@@ -388,6 +406,7 @@
   "album_options": "Možnosti alba",
   "album_remove_user": "Odebrat uživatele?",
   "album_remove_user_confirmation": "Opravdu chcete odebrat uživatele {user}?",
+  "album_search_not_found": "Nebyla nalezena žádná alba odpovídající vašemu hledání",
   "album_share_no_users": "Zřejmě jste toto album sdíleli se všemi uživateli, nebo nemáte žádného uživatele, se kterým byste ho mohli sdílet.",
   "album_updated": "Album aktualizováno",
   "album_updated_setting_description": "Dostávat e-mailová oznámení o nových položkách sdíleného alba",
@@ -407,6 +426,7 @@
   "albums_default_sort_order": "Výchozí řazení alb",
   "albums_default_sort_order_description": "Výchozí řazení položek při vytváření nových alb.",
   "albums_feature_description": "Sbírky položek, které lze sdílet s ostatními uživateli.",
+  "albums_on_device_count": "Alba v zařízení ({count})",
   "all": "Vše",
   "all_albums": "Všechna alba",
   "all_people": "Všichni lidé",
@@ -427,7 +447,8 @@
   "app_settings": "Aplikace",
   "appears_in": "Vyskytuje se v",
   "archive": "Archiv",
-  "archive_or_unarchive_photo": "Archivovat nebo odarchivovat fotku",
+  "archive_action_prompt": "{count} přidaných do archivu",
+  "archive_or_unarchive_photo": "Přidat nebo odebrat fotku z archivu",
   "archive_page_no_archived_assets": "Nebyla nalezena žádná archivovaná média",
   "archive_page_title": "Archiv ({count})",
   "archive_size": "Velikost archivu",
@@ -464,14 +485,13 @@
   "assets": "Položky",
   "assets_added_count": "{count, plural, one {Přidána # položka} few {Přidány # položky} other {Přidáno # položek}}",
   "assets_added_to_album_count": "Do alba {count, plural, one {byla přidána # položka} few {byly přidány # položky} other {bylo přidáno # položek}}",
-  "assets_added_to_name_count": "{count, plural, one {Přidána # položka} few {Přidány # položky} other {Přidáno # položek}} do {hasName, select, true {alba <b>{name}</b>} other {nového alba}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Položku} other {Položky}} nelze přidat do alba",
   "assets_count": "{count, plural, one {# položka} few {# položky} other {# položek}}",
   "assets_deleted_permanently": "{count} položek trvale odstraněno",
   "assets_deleted_permanently_from_server": "{count} položek trvale odstraněno z Immich serveru",
   "assets_downloaded_failed": "{count, plural, one {Stažen # soubor - {error} souborů selhalo} few {Staženy # soubory - {error} souborů selhalo} other {Staženo # souborů - {error} souborů selhalo}}",
   "assets_downloaded_successfully": "{count, plural, one {Úspěšně stažen # soubor} few {Úspěšně staženy # soubory} other {Úspěšně staženo # souborů}}",
-  "assets_moved_to_trash_count": "Do koše {count, plural, one {přesunuta # položka} few {přesunuty # položky} other {přesunuto # položek}}",
+  "assets_moved_to_trash_count": "{count, plural, one {# položka přesunuta} few {# položky přesunuty} other {# položek přesunuto}} do koše",
   "assets_permanently_deleted_count": "Trvale {count, plural, one {smazána # položka} few {smazány # položky} other {smazáno # položek}}",
   "assets_removed_count": "{count, plural, one {Odstraněna # položka} few {Odstraněny # položky} other {Odstraněno # položek}}",
   "assets_removed_permanently_from_device": "{count} položek trvale odstraněno z vašeho zařízení",
@@ -587,6 +607,7 @@
   "cancel": "Zrušit",
   "cancel_search": "Zrušit vyhledávání",
   "canceled": "Zrušeno",
+  "canceling": "Rušení",
   "cannot_merge_people": "Nelze sloučit osoby",
   "cannot_undo_this_action": "Tuto akci nelze vrátit zpět!",
   "cannot_update_the_description": "Nelze aktualizovat popis",
@@ -703,7 +724,7 @@
   "daily_title_text_date": "EEEE, d. MMMM",
   "daily_title_text_date_year": "EEEE, d. MMMM y",
   "dark": "Tmavý",
-  "darkTheme": "Přepnout tmavý motiv",
+  "dark_theme": "Přepnout tmavý motiv",
   "date_after": "Datum po",
   "date_and_time": "Datum a čas",
   "date_before": "Datum před",
@@ -719,6 +740,7 @@
   "default_locale": "Výchozí jazyk",
   "default_locale_description": "Formátovat datumy a čísla podle místního prostředí prohlížeče",
   "delete": "Smazat",
+  "delete_action_prompt": "{count} trvale smazaných",
   "delete_album": "Smazat album",
   "delete_api_key_prompt": "Opravdu chcete tento API klíč odstranit?",
   "delete_dialog_alert": "Tyto položky budou trvale smazány z aplikace Immich i z vašeho zařízení",
@@ -732,6 +754,7 @@
   "delete_key": "Smazat klíč",
   "delete_library": "Smazat knihovnu",
   "delete_link": "Smazat odkaz",
+  "delete_local_action_prompt": "{count} smazáno lokálně",
   "delete_local_dialog_ok_backed_up_only": "Smazat pouze zálohované",
   "delete_local_dialog_ok_force": "Přesto smazat",
   "delete_others": "Odstranit ostatní",
@@ -745,6 +768,7 @@
   "description": "Popis",
   "description_input_hint_text": "Přidat popis...",
   "description_input_submit_error": "Chyba aktualizace popisu, další podrobnosti najdete v logu",
+  "deselect_all": "Zrušit výběr všech",
   "details": "Podrobnosti",
   "direction": "Směr",
   "disabled": "Zakázáno",
@@ -762,6 +786,7 @@
   "documentation": "Dokumentace",
   "done": "Hotovo",
   "download": "Stáhnout",
+  "download_action_prompt": "Stahování {count} položek",
   "download_canceled": "Stahování zrušeno",
   "download_complete": "Stahování kompletní",
   "download_enqueue": "Stahování ve frontě",
@@ -799,6 +824,7 @@
   "edit_key": "Upravit klíč",
   "edit_link": "Upravit odkaz",
   "edit_location": "Upravit polohu",
+  "edit_location_action_prompt": "{count} upravených poloh",
   "edit_location_dialog_title": "Poloha",
   "edit_name": "Upravit jméno",
   "edit_people": "Upravit lidi",
@@ -817,6 +843,7 @@
   "empty_trash": "Vyprázdnit koš",
   "empty_trash_confirmation": "Opravdu chcete vysypat koš? Tím se z Immiche trvale odstraní všechny položky v koši.\nTuto akci nelze vrátit zpět!",
   "enable": "Povolit",
+  "enable_backup": "Povolit zálohování",
   "enable_biometric_auth_description": "Zadejte váš PIN kód pro povolení biometrického ověřování",
   "enabled": "Povoleno",
   "end_date": "Konečné datum",
@@ -861,7 +888,7 @@
     "failed_to_load_people": "Chyba načítání osob",
     "failed_to_remove_product_key": "Nepodařilo se odebrat klíč produktu",
     "failed_to_stack_assets": "Nepodařilo se seskupit položky",
-    "failed_to_unstack_assets": "Nepodařilo se rozložit položky",
+    "failed_to_unstack_assets": "Nepodařilo se zrušit seskupení položek",
     "failed_to_update_notification_status": "Nepodařilo se aktualizovat stav oznámení",
     "import_path_already_exists": "Tato cesta importu již existuje.",
     "incorrect_email_or_password": "Nesprávný e-mail nebo heslo",
@@ -876,7 +903,7 @@
     "unable_to_add_partners": "Nelze přidat partnery",
     "unable_to_add_remove_archive": "Nelze {archived, select, true {odstranit položku z} other {přidat položku do}} archivu",
     "unable_to_add_remove_favorites": "Nelze {favorite, select, true {oblíbit položku} other {zrušit oblíbení položky}}",
-    "unable_to_archive_unarchive": "Nelze {archived, select, true {archivovat} other {odarchivovat}}",
+    "unable_to_archive_unarchive": "Nelze {archived, select, true {archivovat} other {odebrat z archivu}}",
     "unable_to_change_album_user_role": "Nelze změnit roli uživatele alba",
     "unable_to_change_date": "Nelze změnit datum",
     "unable_to_change_description": "Nelze změnit popis",
@@ -984,6 +1011,7 @@
   "failed_to_load_assets": "Nepodařilo se načíst položky",
   "failed_to_load_folder": "Nepodařilo se načíst složku",
   "favorite": "Oblíbit",
+  "favorite_action_prompt": "{count} přidáno do Oblíbených",
   "favorite_or_unfavorite_photo": "Oblíbit nebo zrušit oblíbení fotky",
   "favorites": "Oblíbené",
   "favorites_page_no_favorites": "Nebyla nalezena žádná oblíbená média",
@@ -1127,6 +1155,7 @@
   "library_page_sort_created": "Naposledy vytvořené",
   "library_page_sort_last_modified": "Naposledy upraveno",
   "library_page_sort_title": "Podle názvu alba",
+  "licenses": "Licence",
   "light": "Světlý",
   "like_deleted": "Lajk smazán",
   "link_motion_video": "Připojit pohyblivé video",
@@ -1246,10 +1275,11 @@
   "more": "Více",
   "move": "Přesunout",
   "move_off_locked_folder": "Přesunout z uzamčené složky",
+  "move_to_lock_folder_action_prompt": "{count} přidaných do uzamčené složky",
   "move_to_locked_folder": "Přesunout do uzamčené složky",
   "move_to_locked_folder_confirmation": "Tyto fotky a videa budou odstraněny ze všech alb a bude je možné zobrazit pouze v uzamčené složce",
-  "moved_to_archive": "{count, plural, one {Přesunuta # položka} few {Přesunuty # položky} other {Přesunuto # položek}} do archivu",
-  "moved_to_library": "{count, plural, one {Přesunuta # položka} few {Přesunuty # položky} other {Přesunuto # položek}} do knihovny",
+  "moved_to_archive": "{count, plural, one {# položka přesunuta} few {# položky přesunuty} other {# položek přesunuto}} do archivu",
+  "moved_to_library": "{count, plural, one {# položka přesunuta} few {# položky přesunuty} other {# položek přesunuto}} do knihovny",
   "moved_to_trash": "Přesunuto do koše",
   "multiselect_grid_edit_date_time_err_read_only": "Nelze upravit datum položek pouze pro čtení, přeskakuji",
   "multiselect_grid_edit_gps_err_read_only": "Nelze upravit polohu položek pouze pro čtení, přeskakuji",
@@ -1460,6 +1490,7 @@
   "purchase_server_description_2": "Stav podporovatele",
   "purchase_server_title": "Server",
   "purchase_settings_server_activated": "Produktový klíč serveru spravuje správce",
+  "queue_status": "Ve frontě {count}/{total}",
   "rating": "Hodnocení hvězdičkami",
   "rating_clear": "Vyčistit hodnocení",
   "rating_count": "{count, plural, one {# hvězdička} few {# hvězdičky} other {# hvězdček}}",
@@ -1495,7 +1526,9 @@
   "remove_custom_date_range": "Odstranit vlastní rozsah datumů",
   "remove_deleted_assets": "Odstranit offline soubory",
   "remove_from_album": "Odstranit z alba",
+  "remove_from_album_action_prompt": "{count} odstraněných z alba",
   "remove_from_favorites": "Odstranit z oblíbených",
+  "remove_from_lock_folder_action_prompt": "{count} odebraných z uzamčené složky",
   "remove_from_locked_folder": "Odstranit z uzamčené složky",
   "remove_from_locked_folder_confirmation": "Opravdu chcete tyto fotky a videa přesunout z uzamčené složky? Budou viditelné ve vaší knihovně.",
   "remove_from_shared_link": "Odstranit ze sdíleného odkazu",
@@ -1667,6 +1700,7 @@
   "settings_saved": "Nastavení uloženo",
   "setup_pin_code": "Nastavení PIN kódu",
   "share": "Sdílet",
+  "share_action_prompt": "Sdíleno {count} položek",
   "share_add_photos": "Přidat fotografie",
   "share_assets_selected": "{count} vybráno",
   "share_dialog_preparing": "Připravuji...",
@@ -1768,6 +1802,7 @@
   "sort_title": "Název alba",
   "source": "Zdroj",
   "stack": "Seskupit",
+  "stack_action_prompt": "{count} seskupeno",
   "stack_duplicates": "Seskupit duplicity",
   "stack_select_one_photo": "Vyberte jednu hlavní fotografii pro seskupení",
   "stack_selected_photos": "Seskupení vybraných fotografií",
@@ -1838,6 +1873,7 @@
   "total": "Celkem",
   "total_usage": "Celkové využití",
   "trash": "Koš",
+  "trash_action_prompt": "{count} přesunutých do koše",
   "trash_all": "Vyhodit vše",
   "trash_count": "Vyhodit {count, number}",
   "trash_delete_asset": "Vyhodit/Smazat položku",
@@ -1854,10 +1890,12 @@
   "type": "Typ",
   "unable_to_change_pin_code": "Nelze změnit PIN kód",
   "unable_to_setup_pin_code": "Nelze nastavit PIN kód",
-  "unarchive": "Odarchivovat",
+  "unarchive": "Odebrat z archivu",
+  "unarchive_action_prompt": "{count} odstraněných z archivu",
   "unarchived_count": "{count, plural, one {Odarchivována #} few {Odarchivovány #} other {Odarchivováno #}}",
   "undo": "Vrátit zpět",
   "unfavorite": "Zrušit oblíbení",
+  "unfavorite_action_prompt": "{count} odstraněných z oblíbených",
   "unhide_person": "Zrušit skrytí osoby",
   "unknown": "Neznámý",
   "unknown_country": "Neznámá země",
@@ -1875,12 +1913,15 @@
   "unselect_all_duplicates": "Zrušit výběr všech duplicit",
   "unselect_all_in": "Zrušit výběr ve skupině {group}",
   "unstack": "Zrušit seskupení",
-  "unstacked_assets_count": "{count, plural, one {Rozložená # položka} few {Rozložené # položky} other {Rozložených # položiek}}",
+  "unstack_action_prompt": "{count} seskupených zrušeno",
+  "unstacked_assets_count": "{count, plural, one {Rozložená # položka} few {Rozložené # položky} other {Rozložených # položek}}",
+  "untagged": "Neoznačeno",
   "up_next": "To je prozatím vše",
   "updated_at": "Aktualizováno",
   "updated_password": "Heslo aktualizováno",
   "upload": "Nahrát",
   "upload_concurrency": "Souběžnost nahrávání",
+  "upload_details": "Detaily nahrávání",
   "upload_dialog_info": "Chcete zálohovat vybrané položky na server?",
   "upload_dialog_title": "Nahrát položku",
   "upload_errors": "Nahrávání bylo dokončeno s {count, plural, one {# chybou} other {# chybami}}, obnovte stránku pro zobrazení nových položek.",
@@ -1912,6 +1953,7 @@
   "user_usage_stats_description": "Zobrazit statistiky používání účtu",
   "username": "Uživateleské jméno",
   "users": "Uživatelé",
+  "users_added_to_album_count": "{count, plural, one {Přidán # uživatel} few {Přidány # uživatelé} other {Přidáno # uživatelů}} do alba",
   "utilities": "Nástroje",
   "validate": "Ověřit",
   "validate_endpoint_error": "Zadejte platné URL",
@@ -1930,6 +1972,7 @@
   "view_album": "Zobrazit album",
   "view_all": "Zobrazit vše",
   "view_all_users": "Zobrazit všechny uživatele",
+  "view_details": "Zobrazit podrobnosti",
   "view_in_timeline": "Zobrazit na časové ose",
   "view_link": "Zobrazit odkaz",
   "view_links": "Zobrazit odkazy",
@@ -1941,7 +1984,7 @@
   "view_user": "Zobrazit uživatele",
   "viewer_remove_from_stack": "Odstranit ze zásobníku",
   "viewer_stack_use_as_main_asset": "Použít jako hlavní položku",
-  "viewer_unstack": "Rozbalit zásobník",
+  "viewer_unstack": "Zrušit zásobník",
   "visibility_changed": "Viditelnost změněna u {count, plural, one {# osoby} few {# osob} other {# lidí}}",
   "waiting": "Čekající",
   "warning": "Upozornění",
diff --git a/i18n/da.json b/i18n/da.json
index 3273a2d553..e9f9534927 100644
--- a/i18n/da.json
+++ b/i18n/da.json
@@ -34,6 +34,7 @@
   "added_to_favorites_count": "Tilføjet {count, number} til favoritter",
   "admin": {
     "add_exclusion_pattern_description": "Tilføj udelukkelsesmønstre. Globbing ved hjælp af *, ** og ? understøttes. For at ignorere alle filer i enhver mappe med navnet \"Raw\", brug \"**/Raw/**\". For at ignorere alle filer, der slutter på \".tif\", brug \"**/*.tif\". For at ignorere en absolut sti, brug \"/sti/til/ignoreret/**\".",
+    "admin_user": "Administrator bruger",
     "asset_offline_description": "Denne eksterne biblioteksressource findes ikke længere på disken og er blevet flyttet til papirkurven. Hvis filen blev flyttet inde i biblioteket, skal du tjekke din tidslinje for den nye tilsvarende ressource. For at gendanne denne ressource skal du sikre, at filstien nedenfor kan tilgås af Immich og scanne biblioteket.",
     "authentication_settings": "Godkendelsesindstillinger",
     "authentication_settings_description": "Administrer adgangskode, OAuth og andre godkendelsesindstillinger",
@@ -165,6 +166,7 @@
     "metadata_settings_description": "Håndtér metadataindstillinger",
     "migration_job": "Migrering",
     "migration_job_description": "Migrér miniaturebilleder for aktiver og ansigter til den seneste mappestruktur",
+    "nightly_tasks_cluster_faces_setting_description": "Kør ansigtsgenkendelse på nye ansigter",
     "no_paths_added": "Ingen stier tilføjet",
     "no_pattern_added": "Intet mønster tilføjet",
     "note_apply_storage_label_previous_assets": "Bemærk: For at anvende Lagringsmærkatet på tidligere uploadede mediefiler, kør",
@@ -462,7 +464,6 @@
   "assets": "elementer",
   "assets_added_count": "Tilføjet {count, plural, one {# mediefil} other {# mediefiler}}",
   "assets_added_to_album_count": "{count, plural, one {# mediefil} other {# mediefiler}} tilføjet til albummet",
-  "assets_added_to_name_count": "Tilføjet {count, plural, one {# mediefil} other {# mediefiler}} til {hasName, select, true {<b>{name}</b>} other {nyt album}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Billed} other {Billeder}} kan ikke blive tilføjet til album",
   "assets_count": "{count, plural, one {# mediefil} other {# mediefiler}}",
   "assets_deleted_permanently": "{count} element(er) blev fjernet permanent",
@@ -701,7 +702,6 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Mørk",
-  "darkTheme": "Skift til mørkt tema",
   "date_after": "Dato efter",
   "date_and_time": "Dato og klokkeslæt",
   "date_before": "Dato før",
diff --git a/i18n/de.json b/i18n/de.json
index bbcd9c569c..79ba1251d5 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -56,9 +56,9 @@
     "confirm_user_pin_code_reset": "Bist du sicher, dass du den PIN Code von {user} zurücksetzen möchtest?",
     "create_job": "Aufgabe erstellen",
     "cron_expression": "Cron Zeitangabe",
-    "cron_expression_description": "Setze ein Intervall für die Sicherung mittels cron. Hilfe mit dem Format bietet dir dabei z.B der <link>Crontab Guru</link>",
+    "cron_expression_description": "Setze ein Intervall für die Sicherung mittels cron. Hilfe mit dem Format bietet dir dabei z. B. der <link>Crontab Guru</link>",
     "cron_expression_presets": "Nützliche Zeitangaben für Cron",
-    "disable_login": "Login deaktvieren",
+    "disable_login": "Login deaktivieren",
     "duplicate_detection_job_description": "Diese Aufgabe führt das maschinelle Lernen für jede Datei aus, um Duplikate zu finden. Diese Aufgabe beruht auf der intelligenten Suche",
     "exclusion_pattern_description": "Mit Ausschlussmustern können Dateien und Ordner beim Scannen Ihrer Bibliothek ignoriert werden. Dies ist nützlich, wenn du Ordner hast, die Dateien enthalten, die du nicht importieren möchtest, wie z. B. RAW-Dateien.",
     "external_library_management": "Verwaltung externer Bibliotheken",
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Metadaten-Einstellungen verwalten",
     "migration_job": "Migration",
     "migration_job_description": "Diese Aufgabe migriert Miniaturansichten für Dateien und Gesichter in die neueste Ordnerstruktur",
+    "nightly_tasks_cluster_faces_setting_description": "Gesichtsidentifikation auf neu erkannten Gesichtern ausführen",
+    "nightly_tasks_cluster_new_faces_setting": "Neue Gesichter gruppieren",
+    "nightly_tasks_database_cleanup_setting": "Datenbankbereinigungs-Aufgaben",
+    "nightly_tasks_database_cleanup_setting_description": "Alte, abgelaufene Daten aus der Datenbank bereinigen",
+    "nightly_tasks_generate_memories_setting": "Erinnerungen generieren",
+    "nightly_tasks_generate_memories_setting_description": "Neue Erinnerungen aus Dateien erstellen",
+    "nightly_tasks_missing_thumbnails_setting": "Fehlende Miniaturansichten generieren",
+    "nightly_tasks_missing_thumbnails_setting_description": "Dateien ohne Miniaturansicht in die Warteschlange zur Miniaturansicht-Generierung hinzufügen",
+    "nightly_tasks_settings": "Einstellungen für nächtliche Aufgaben",
+    "nightly_tasks_settings_description": "Nächtliche Aufgaben verwalten",
+    "nightly_tasks_start_time_setting": "Startzeit",
+    "nightly_tasks_start_time_setting_description": "Die Zeit, zu der der Server mit der Ausführung der nächtlichen Aufgaben beginnt",
+    "nightly_tasks_sync_quota_usage_setting": "Kontingentnutzung synchronisieren",
+    "nightly_tasks_sync_quota_usage_setting_description": "Benutzerspeicherkontingent basierend auf der aktuellen Nutzung aktualisieren",
     "no_paths_added": "Keine Pfade hinzugefügt",
     "no_pattern_added": "Kein Ausschlussmuster hinzugefügt",
     "note_apply_storage_label_previous_assets": "Hinweis: Um den Speicherpfad auf die vorher hochgeladenen Dateien anzuwenden, starte den",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "Mobile Umleitungs-URI",
     "oauth_mobile_redirect_uri_override": "Mobile Umleitungs-URI überschreiben",
     "oauth_mobile_redirect_uri_override_description": "Einschalten, wenn der OAuth-Anbieter keine mobile URI wie ''{callback}'' erlaubt",
+    "oauth_role_claim": "Rollen-Claim",
+    "oauth_role_claim_description": "Gewähre automatisch Admin-Zugriff basierend auf dem Vorhandensein dieses Claims. Der Claim kann entweder 'user' oder 'admin' sein.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "OAuth-Anmeldeeinstellungen verwalten",
     "oauth_settings_more_details": "Weitere Informationen zu dieser Funktion findest du in der <link>Dokumentation</link>.",
@@ -244,6 +260,7 @@
     "storage_template_migration_info": "Die Speichervorlage wird alle Dateierweiterungen in Kleinbuchstaben umwandeln. Vorlagenänderungen gelten nur für neue Dateien. Um die Vorlage rückwirkend auf bereits hochgeladene Assets anzuwenden, führe den <link>{job}</link> aus.",
     "storage_template_migration_job": "Speichervorlagenmigrations-Aufgabe",
     "storage_template_more_details": "Weitere Details zu dieser Funktion findest du unter <template-link>Speichervorlage</template-link> und dessen <implications-link>Implikationen</implications-link>",
+    "storage_template_onboarding_description_v2": "Wenn aktiviert, werden Dateien automatisch nach einer benutzerdefinierten Vorlage organisiert. Für mehr Informationen siehe die <link>Dokumentation</link>.",
     "storage_template_path_length": "Ungefähres Pfadlängen-Limit: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Speichervorlage",
     "storage_template_settings_description": "Die Ordnerstruktur und den Dateinamen der hochgeladenen Datei verwalten",
@@ -356,10 +373,12 @@
   "admin_password": "Administrator Passwort",
   "administration": "Verwaltung",
   "advanced": "Erweitert",
+  "advanced_settings_beta_timeline_subtitle": "Probier die neue App-Erfahrung aus",
+  "advanced_settings_beta_timeline_title": "Beta-Timeline",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Verwende diese Option, um Medien während der Synchronisierung nach anderen Kriterien zu filtern. Versuchen dies nur, wenn Probleme mit der Erkennung aller Alben durch die App auftreten.",
   "advanced_settings_enable_alternate_media_filter_title": "[EXPERIMENTELL] Benutze alternativen Filter für Synchronisierung der Gerätealben",
   "advanced_settings_log_level_title": "Log-Level: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Einige Geräte sind sehr langsam beim Laden von Miniaturbildern direkt aus dem Gerät. Aktivieren Sie diese Einstellung, um stattdessen die Server-Bilder zu laden.",
+  "advanced_settings_prefer_remote_subtitle": "Einige Geräte sind sehr langsam beim Laden von lokalen Vorschaubildern. Aktivieren Sie diese Einstellung, um stattdessen die Server-Bilder zu laden.",
   "advanced_settings_prefer_remote_title": "Server-Bilder bevorzugen",
   "advanced_settings_proxy_headers_subtitle": "Definiere einen Proxy-Header, den Immich bei jeder Netzwerkanfrage mitschicken soll",
   "advanced_settings_proxy_headers_title": "Proxy-Headers",
@@ -387,6 +406,7 @@
   "album_options": "Albumoptionen",
   "album_remove_user": "Nutzer entfernen?",
   "album_remove_user_confirmation": "Bist du sicher, dass du {user} entfernen willst?",
+  "album_search_not_found": "Keine Alben gefunden, die zur Suche passen",
   "album_share_no_users": "Es sieht so aus, als hättest du dieses Album mit allen Benutzern geteilt oder du hast keine Benutzer, mit denen du teilen kannst.",
   "album_updated": "Album aktualisiert",
   "album_updated_setting_description": "Erhalte eine E-Mail-Benachrichtigung, wenn ein freigegebenes Album neue Dateien enthält",
@@ -406,6 +426,7 @@
   "albums_default_sort_order": "Standard Album Sortierung",
   "albums_default_sort_order_description": "Sortierreihenfolge der Dateien bei der Erstellung neuer Alben.",
   "albums_feature_description": "Sammlung an Alben die mit anderen Benutzern geteilt werden können.",
+  "albums_on_device_count": "Alben auf dem Gerät ({count})",
   "all": "Alle",
   "all_albums": "Alle Alben",
   "all_people": "Alle Personen",
@@ -426,6 +447,7 @@
   "app_settings": "App-Einstellungen",
   "appears_in": "Erscheint in",
   "archive": "Archiv",
+  "archive_action_prompt": "{count} zum Archiv hinzugefügt",
   "archive_or_unarchive_photo": "Foto archivieren bzw. Archivierung aufheben",
   "archive_page_no_archived_assets": "Keine archivierten Inhalte gefunden",
   "archive_page_title": "Archiv ({count})",
@@ -463,7 +485,6 @@
   "assets": "Dateien",
   "assets_added_count": "{count, plural, one {# Datei} other {# Dateien}} hinzugefügt",
   "assets_added_to_album_count": "{count, plural, one {# Datei} other {# Dateien}} zum Album hinzugefügt",
-  "assets_added_to_name_count": "{count, plural, one {# Element} other {# Elemente}} zu {hasName, select, true {<b>{name}</b>} other {neuem Album}} hinzugefügt",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Datei kann}other {Dateien können}} nicht zum Album hinzugefügt werden",
   "assets_count": "{count, plural, one {# Datei} other {# Dateien}}",
   "assets_deleted_permanently": "{count} Element(e) permanent gelöscht",
@@ -586,6 +607,7 @@
   "cancel": "Abbrechen",
   "cancel_search": "Suche abbrechen",
   "canceled": "Abgebrochen",
+  "canceling": "Abbrechen",
   "cannot_merge_people": "Personen können nicht zusammengeführt werden",
   "cannot_undo_this_action": "Diese Aktion kann nicht rückgängig gemacht werden!",
   "cannot_update_the_description": "Beschreibung kann nicht aktualisiert werden",
@@ -702,7 +724,7 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Dunkel",
-  "darkTheme": "Dunkles Theme umschalten",
+  "dark_theme": "Dunkle Ansicht umschalten",
   "date_after": "Datum nach",
   "date_and_time": "Datum und Zeit",
   "date_before": "Datum vor",
@@ -718,6 +740,7 @@
   "default_locale": "Standard-Sprache",
   "default_locale_description": "Datumsangaben und Zahlen basierend auf dem Gebietsschema des Browsers formatieren",
   "delete": "Löschen",
+  "delete_action_prompt": "{count} endgültig gelöscht",
   "delete_album": "Album löschen",
   "delete_api_key_prompt": "Bist du sicher, dass du diesen API-Schlüssel löschen willst?",
   "delete_dialog_alert": "Diese Elemente werden unwiderruflich von Immich und dem Gerät entfernt",
@@ -731,6 +754,7 @@
   "delete_key": "Schlüssel löschen",
   "delete_library": "Bibliothek löschen",
   "delete_link": "Link löschen",
+  "delete_local_action_prompt": "{count} lokal gelöscht",
   "delete_local_dialog_ok_backed_up_only": "Nur gesicherte Inhalte löschen",
   "delete_local_dialog_ok_force": "Trotzdem löschen",
   "delete_others": "Andere löschen",
@@ -744,6 +768,7 @@
   "description": "Beschreibung",
   "description_input_hint_text": "Beschreibung hinzufügen...",
   "description_input_submit_error": "Beschreibung konnte nicht geändert werden, bitte im Log für mehr Details nachsehen",
+  "deselect_all": "Alle abwählen",
   "details": "Details",
   "direction": "Richtung",
   "disabled": "Deaktiviert",
@@ -761,6 +786,7 @@
   "documentation": "Dokumentation",
   "done": "Fertig",
   "download": "Herunterladen",
+  "download_action_prompt": "Herunterladen von {count} Dateien",
   "download_canceled": "Download abgebrochen",
   "download_complete": "Download vollständig",
   "download_enqueue": "Download in die Warteschlange gesetzt",
@@ -798,6 +824,7 @@
   "edit_key": "Schlüssel bearbeiten",
   "edit_link": "Link bearbeiten",
   "edit_location": "Standort bearbeiten",
+  "edit_location_action_prompt": "{count} Geolokationen angepasst",
   "edit_location_dialog_title": "Ort bearbeiten",
   "edit_name": "Name bearbeiten",
   "edit_people": "Personen bearbeiten",
@@ -816,6 +843,7 @@
   "empty_trash": "Papierkorb leeren",
   "empty_trash_confirmation": "Bist du sicher, dass du den Papierkorb leeren willst?\nDies entfernt alle Dateien im Papierkorb endgültig aus Immich und kann nicht rückgängig gemacht werden!",
   "enable": "Aktivieren",
+  "enable_backup": "Sicherung aktivieren",
   "enable_biometric_auth_description": "Gib deinen PIN Code ein, um die biometrische Authentifizierung zu aktivieren",
   "enabled": "Aktiviert",
   "end_date": "Enddatum",
@@ -983,6 +1011,7 @@
   "failed_to_load_assets": "Laden der Assets fehlgeschlagen",
   "failed_to_load_folder": "Fehler beim Laden des Ordners",
   "favorite": "Favorit",
+  "favorite_action_prompt": "{count} zu den Favoriten hinzugefügt",
   "favorite_or_unfavorite_photo": "Favorisiertes oder nicht favorisiertes Foto",
   "favorites": "Favoriten",
   "favorites_page_no_favorites": "Keine favorisierten Inhalte gefunden",
@@ -1126,6 +1155,7 @@
   "library_page_sort_created": "Zuletzt erstellt",
   "library_page_sort_last_modified": "Zuletzt bearbeitet",
   "library_page_sort_title": "Titel des Albums",
+  "licenses": "Lizenzen",
   "light": "Hell",
   "like_deleted": "Like gelöscht",
   "link_motion_video": "Bewegungsvideo verknüpfen",
@@ -1245,6 +1275,7 @@
   "more": "Mehr",
   "move": "Verschieben",
   "move_off_locked_folder": "Aus dem gesperrten Ordner verschieben",
+  "move_to_lock_folder_action_prompt": "{count} zum gesperrten Ordner hinzugefügt",
   "move_to_locked_folder": "In den gesperrten Ordner verschieben",
   "move_to_locked_folder_confirmation": "Diese Fotos und Videos werden aus allen Alben entfernt und können nur noch im gesperrten Ordner angezeigt werden",
   "moved_to_archive": "{count, plural, one {# Datei} other {# Dateien}} archiviert",
@@ -1459,6 +1490,7 @@
   "purchase_server_description_2": "Unterstützerstatus",
   "purchase_server_title": "Server",
   "purchase_settings_server_activated": "Der Server-Produktschlüssel wird durch den Administrator verwaltet",
+  "queue_status": "Warteschlange {count}/{total}",
   "rating": "Bewertung",
   "rating_clear": "Bewertung löschen",
   "rating_count": "{count, plural, one {# Stern} other {# Sterne}}",
@@ -1494,7 +1526,9 @@
   "remove_custom_date_range": "Benutzerdefinierten Datumsbereich entfernen",
   "remove_deleted_assets": "Offline-Dateien entfernen",
   "remove_from_album": "Aus Album entfernen",
+  "remove_from_album_action_prompt": "{count} vom Album entfernt",
   "remove_from_favorites": "Aus Favoriten entfernen",
+  "remove_from_lock_folder_action_prompt": "{count} aus dem gesperrten Ordner entfernt",
   "remove_from_locked_folder": "Aus gesperrtem Ordner entfernen",
   "remove_from_locked_folder_confirmation": "Bist du sicher, dass du diese Fotos und Videos aus dem gesperrten Ordner entfernen möchtest? Sie werden wieder in deiner Bibliothek sichtbar sein.",
   "remove_from_shared_link": "Aus geteiltem Link entfernen",
@@ -1666,6 +1700,7 @@
   "settings_saved": "Einstellungen gespeichert",
   "setup_pin_code": "Einen PIN Code festlegen",
   "share": "Teilen",
+  "share_action_prompt": "{count} Dateien geteilt",
   "share_add_photos": "Fotos hinzufügen",
   "share_assets_selected": "{count} ausgewählt",
   "share_dialog_preparing": "Vorbereiten...",
@@ -1767,6 +1802,7 @@
   "sort_title": "Titel",
   "source": "Quellcode",
   "stack": "Stapel",
+  "stack_action_prompt": "{count} gestapelt",
   "stack_duplicates": "Duplikate stapeln",
   "stack_select_one_photo": "Hauptfoto für den Stapel auswählen",
   "stack_selected_photos": "Ausgewählte Fotos stapeln",
@@ -1837,6 +1873,7 @@
   "total": "Gesamt",
   "total_usage": "Gesamtnutzung",
   "trash": "Papierkorb",
+  "trash_action_prompt": "{count} in den Papierkorb verschoben",
   "trash_all": "Alle löschen",
   "trash_count": "Papierkorb {count, number}",
   "trash_delete_asset": "Datei löschen/in den Papierkorb verschieben",
@@ -1854,9 +1891,11 @@
   "unable_to_change_pin_code": "PIN Code konnte nicht geändert werden",
   "unable_to_setup_pin_code": "PIN Code konnte nicht festgelegt werden",
   "unarchive": "Entarchivieren",
+  "unarchive_action_prompt": "{count} aus dem Archiv entfernt",
   "unarchived_count": "{count, plural, other {# entarchiviert}}",
   "undo": "Rückgängig",
   "unfavorite": "Entfavorisieren",
+  "unfavorite_action_prompt": "{count} aus den Favoriten entfernt",
   "unhide_person": "Person einblenden",
   "unknown": "Unbekannt",
   "unknown_country": "Unbekanntes Land",
@@ -1874,12 +1913,15 @@
   "unselect_all_duplicates": "Alle Duplikate abwählen",
   "unselect_all_in": "Alle in {group} abwählen",
   "unstack": "Entstapeln",
+  "unstack_action_prompt": "{count} entstapelt",
   "unstacked_assets_count": "{count, plural, one {# Datei} other {# Dateien}} entstapelt",
+  "untagged": "Ohne Tag",
   "up_next": "Weiter",
   "updated_at": "Aktualisiert",
   "updated_password": "Passwort aktualisiert",
   "upload": "Hochladen",
   "upload_concurrency": "Parallelität beim Hochladen",
+  "upload_details": "Upload Details",
   "upload_dialog_info": "Willst du die ausgewählten Elemente auf dem Server sichern?",
   "upload_dialog_title": "Element hochladen",
   "upload_errors": "Hochladen mit {count, plural, one {# Fehler} other {# Fehlern}} abgeschlossen, aktualisiere die Seite, um neu hochgeladene Dateien zu sehen.",
@@ -1911,6 +1953,7 @@
   "user_usage_stats_description": "Statistiken zur Kontonutzung anzeigen",
   "username": "Nutzername",
   "users": "Benutzer",
+  "users_added_to_album_count": "{count, plural, one {# Benutzer} other {# Benutzer}} zum Album hinzugefügt",
   "utilities": "Hilfsmittel",
   "validate": "Validieren",
   "validate_endpoint_error": "Bitte gib eine gültige URL ein",
@@ -1929,6 +1972,7 @@
   "view_album": "Album anzeigen",
   "view_all": "Alles anzeigen",
   "view_all_users": "Alle Nutzer anzeigen",
+  "view_details": "Details ansehen",
   "view_in_timeline": "In Zeitleiste anzeigen",
   "view_link": "Link anzeigen",
   "view_links": "Links anzeigen",
diff --git a/i18n/el.json b/i18n/el.json
index 62d0481ec6..015bf80c0a 100644
--- a/i18n/el.json
+++ b/i18n/el.json
@@ -464,7 +464,6 @@
   "assets": "Αντικείμενα",
   "assets_added_count": "Προστέθηκε {count, plural, one {# αρχείο} other {# αρχεία}}",
   "assets_added_to_album_count": "Προστέθηκε {count, plural, one {# αρχείο} other {# αρχεία}} στο άλμπουμ",
-  "assets_added_to_name_count": "Προστέθηκε {count, plural, one {# αρχείο} other {# αρχεία}} στο {hasName, select, true {<b>{name}</b>} other {νέο άλμπουμ}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Στοιχείο} other {Στοιχεία}} δεν μπορούν να προστεθούν στο άλμπουμ",
   "assets_count": "{count, plural, one {# αρχείο} other {# αρχεία}}",
   "assets_deleted_permanently": "{count} τα στοιχεία διαγράφηκαν οριστικά",
@@ -703,7 +702,6 @@
   "daily_title_text_date": "Ε, MMM dd",
   "daily_title_text_date_year": "Ε, MMM dd, yyyy",
   "dark": "Σκούρο",
-  "darkTheme": "Εναλλαγή σκούρου θέματος",
   "date_after": "Ημερομηνία μετά",
   "date_and_time": "Ημερομηνία και ώρα",
   "date_before": "Ημερομηνία πριν",
diff --git a/i18n/es.json b/i18n/es.json
index 7bfdc678df..83d1c9d355 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -2,7 +2,7 @@
   "about": "Acerca de",
   "account": "Cuenta",
   "account_settings": "Ajustes de la cuenta",
-  "acknowledge": "De acuerdo",
+  "acknowledge": "Aceptar",
   "action": "Acción",
   "action_common_update": "Actualizar",
   "actions": "Acciones",
@@ -14,13 +14,13 @@
   "add_a_location": "Agregar ubicación",
   "add_a_name": "Agregar nombre",
   "add_a_title": "Agregar título",
-  "add_endpoint": "Añadir endpoint",
+  "add_endpoint": "Agregar endpoint",
   "add_exclusion_pattern": "Agregar patrón de exclusión",
   "add_import_path": "Agregar ruta de importación",
   "add_location": "Agregar ubicación",
   "add_more_users": "Agregar más usuarios",
   "add_partner": "Agregar compañero",
-  "add_path": "Agregar carpeta",
+  "add_path": "Agregar ruta",
   "add_photos": "Agregar fotos",
   "add_tag": "Agregar etiqueta",
   "add_to": "Agregar a…",
@@ -63,8 +63,8 @@
     "exclusion_pattern_description": "Los patrones de exclusión te permiten ignorar archivos y carpetas al escanear tu biblioteca. Es útil si tienes carpetas que contienen archivos que no deseas importar, por ejemplo archivos RAW.",
     "external_library_management": "Gestión de bibliotecas externas",
     "face_detection": "Detección de caras",
-    "face_detection_description": "Detecta las caras en los activos mediante aprendizaje automático. En el caso de los vídeos, solo se tiene en cuenta la miniatura. \"Actualizar\" (re)procesará todos los elementos. \"Restablecer\" borra además todos los datos de caras actuales. \"Falta\" pone en cola los elementos que aún no se han procesado. Las caras detectadas se pondrán en cola para el reconocimiento facial una vez finalizada la detección, agrupándolos en personas existentes o nuevas.",
-    "facial_recognition_job_description": "Agrupa las caras detectadas en personas. Este paso se ejecuta una vez finalizada la detección de caras. \"Restablecer\" (re)agrupa todas las caras. \"Falta\" pone en cola las caras que no tienen asignada una persona.",
+    "face_detection_description": "Detecta las caras en los elementos mediante aprendizaje automático. En el caso de los vídeos, solo se tiene en cuenta la miniatura. \"Actualizar\" (re)procesará todos los elementos. \"Restablecer\" borra además todos los datos de caras actuales. \"Faltante\" pone en cola los elementos que aún no se han procesado. Las caras detectadas se pondrán en cola para el reconocimiento facial una vez finalizada la detección, agrupándolos en personas existentes o nuevas.",
+    "facial_recognition_job_description": "Agrupa las caras detectadas en personas. Este paso se realiza después de completar la detección de caras. \"Restablecer\" (re)agrupa todas las caras. \"Faltante\" pone en cola las caras que no tienen una persona asignada.",
     "failed_job_command": "El comando {command} ha fallado para la tarea: {job}",
     "force_delete_user_warning": "CUIDADO: Esta acción eliminará inmediatamente el usuario y todos los elementos. Esta accion no se puede deshacer y los archivos no pueden ser recuperados.",
     "image_format": "Formato",
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Administrar la configuración de metadatos",
     "migration_job": "Migración",
     "migration_job_description": "Migrar miniaturas de archivos y caras a la estructura de carpetas más reciente",
+    "nightly_tasks_cluster_faces_setting_description": "Ejecutar reconocimiento facial en caras detectadas recientemente",
+    "nightly_tasks_cluster_new_faces_setting": "Agrupar caras nuevas",
+    "nightly_tasks_database_cleanup_setting": "Tareas de limpieza de base de datos",
+    "nightly_tasks_database_cleanup_setting_description": "Limpiar datos antiguos y caducados de la base de datos",
+    "nightly_tasks_generate_memories_setting": "Generar recuerdos",
+    "nightly_tasks_generate_memories_setting_description": "Crear nuevos recuerdos a partir de activos",
+    "nightly_tasks_missing_thumbnails_setting": "Generar miniaturas faltantes",
+    "nightly_tasks_missing_thumbnails_setting_description": "Poner en cola a activos sin miniaturas para la generación de miniaturas",
+    "nightly_tasks_settings": "Configuración de Tareas Nocturnas",
+    "nightly_tasks_settings_description": "Gestionar Tareas Nocturnas",
+    "nightly_tasks_start_time_setting": "Tiempo de inicio",
+    "nightly_tasks_start_time_setting_description": "El tiempo cuando el servidor comienza a ejecutar las tareas nocturnas",
+    "nightly_tasks_sync_quota_usage_setting": "Uso de la cuota de sincronización",
+    "nightly_tasks_sync_quota_usage_setting_description": "Actualizar la cuota de almacenamiento del usuario, según el uso actual",
     "no_paths_added": "No se han añadido carpetas",
     "no_pattern_added": "No se han añadido patrones",
     "note_apply_storage_label_previous_assets": "Nota: para aplicar una Etiqueta de Almacenamiento a un elemento anteriormente cargado, lanza el",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "URI de redireccionamiento móvil",
     "oauth_mobile_redirect_uri_override": "Sobreescribir URI de redirección móvil",
     "oauth_mobile_redirect_uri_override_description": "Habilitar cuando el proveedor de OAuth no permite una URI móvil, como ''{callback}''",
+    "oauth_role_claim": "Concesión de rol",
+    "oauth_role_claim_description": "Otorgar acceso de administrador automáticamente según la presencia de esta concesión. La concesión puede tener \"usuario\" o \"admin\".",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Administrar la configuración de inicio de sesión de OAuth",
     "oauth_settings_more_details": "Para más detalles acerca de esta característica, consulte la <link>documentación</link>.",
@@ -205,7 +221,7 @@
     "oauth_storage_quota_claim_description": "Establezca automáticamente la cuota de almacenamiento del usuario al valor de esta solicitud.",
     "oauth_storage_quota_default": "Cuota de almacenamiento predeterminada (GiB)",
     "oauth_storage_quota_default_description": "Cuota en GiB que se utilizará cuando no se proporcione ninguna por defecto.",
-    "oauth_timeout": "Expiración de solicitud",
+    "oauth_timeout": "Límite de tiempo para la solicitud",
     "oauth_timeout_description": "Tiempo de espera de solicitudes en milisegundos",
     "password_enable_description": "Iniciar sesión con correo electrónico y contraseña",
     "password_settings": "Contraseña de Acceso",
@@ -357,10 +373,12 @@
   "admin_password": "Contraseña del Administrador",
   "administration": "Administración",
   "advanced": "Avanzada",
+  "advanced_settings_beta_timeline_subtitle": "Prueba la nueva experiencia de la aplicación",
+  "advanced_settings_beta_timeline_title": "Cronología beta",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Usa esta opción para filtrar medios durante la sincronización según criterios alternativos. Intenta esto solo si tienes problemas con que la aplicación detecte todos los álbumes.",
   "advanced_settings_enable_alternate_media_filter_title": "[EXPERIMENTAL] Usar filtro alternativo de sincronización de álbumes del dispositivo",
   "advanced_settings_log_level_title": "Nivel de registro: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Algunos dispositivos tardan mucho en cargar las miniaturas de los elementos encontrados en el dispositivo. Activa esta opción para cargar imágenes remotas en su lugar.",
+  "advanced_settings_prefer_remote_subtitle": "Algunos dispositivos tardan mucho en cargar las miniaturas desde los archivos locales. Activa esta opción para cargar imágenes remotas en su lugar.",
   "advanced_settings_prefer_remote_title": "Preferir imágenes remotas",
   "advanced_settings_proxy_headers_subtitle": "Configura headers HTTP que Immich incluirá en cada petición de red",
   "advanced_settings_proxy_headers_title": "Cabeceras Proxy",
@@ -405,8 +423,8 @@
   "albums": "Álbumes",
   "albums_count": "{count, plural, one {{count, number} Álbum} other {{count, number} Álbumes}}",
   "albums_default_sort_order": "Ordenación por defecto de los álbumes",
-  "albums_default_sort_order_description": "Orden de clasificación inicial de los activos al crear nuevos álbumes.",
-  "albums_feature_description": "Colecciones de activos que pueden compartirse con otros usuarios.",
+  "albums_default_sort_order_description": "Orden de clasificación inicial de los recursos al crear nuevos álbumes.",
+  "albums_feature_description": "Colecciones de recursos que pueden ser compartidos con otros usuarios.",
   "all": "Todos",
   "all_albums": "Todos los albums",
   "all_people": "Todas las personas",
@@ -427,6 +445,7 @@
   "app_settings": "Ajustes de Aplicacion",
   "appears_in": "Aparece en",
   "archive": "Archivo",
+  "archive_action_prompt": "{count} añadidos al Archivo",
   "archive_or_unarchive_photo": "Archivar o restaurar foto",
   "archive_page_no_archived_assets": "No se encontraron elementos archivados",
   "archive_page_title": "Archivo ({count})",
@@ -464,13 +483,12 @@
   "assets": "elementos",
   "assets_added_count": "Añadido {count, plural, one {# asset} other {# assets}}",
   "assets_added_to_album_count": "Añadido {count, plural, one {# asset} other {# assets}} al álbum",
-  "assets_added_to_name_count": "Añadido {count, plural, one {# asset} other {# assets}} a {hasName, select, true {<b>{name}</b>} other {new album}}",
-  "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} no pueden ser añadidos al album",
+  "assets_cannot_be_added_to_album_count": "{count, plural, one {El recurso no puede ser añadido al álbum} other {Los recursos no pueden ser añadidos al álbum}}",
   "assets_count": "{count, plural, one {# activo} other {# activos}}",
   "assets_deleted_permanently": "{count} elemento(s) eliminado(s) permanentemente",
   "assets_deleted_permanently_from_server": "{count} recurso(s) eliminado(s) de forma permanente del servidor de Immich",
-  "assets_downloaded_failed": "{count, plural, one {Descargado archivo # - {error} archivo fallido} other {Descargados # archivos - {error} archivos fallidos}}",
-  "assets_downloaded_successfully": "{count, plural, one {Archivo # descargado correctamente} other {Archivos # descargados correctamente}}",
+  "assets_downloaded_failed": "{count, plural, one {# archivo descargado - {error} archivo fallido} other {# archivos descargados - {error} archivos fallidos}}",
+  "assets_downloaded_successfully": "{count, plural, one {# archivo descargado exitosamente} other {# archivos descargados exitosamente}}",
   "assets_moved_to_trash_count": "{count, plural, one {# elemento movido} other {# elementos movidos}} a la papelera",
   "assets_permanently_deleted_count": "Eliminado permanentemente {count, plural, one {# elemento} other {# elementos}}",
   "assets_removed_count": "Eliminado {count, plural, one {# elemento} other {# elementos}}",
@@ -703,7 +721,7 @@
   "daily_title_text_date": "E dd, MMM",
   "daily_title_text_date_year": "E dd de MMM, yyyy",
   "dark": "Oscuro",
-  "darkTheme": "Activar tema oscuro",
+  "dark_theme": "Alternar tema oscuro",
   "date_after": "Fecha posterior",
   "date_and_time": "Fecha y Hora",
   "date_before": "Fecha anterior",
@@ -719,6 +737,7 @@
   "default_locale": "Configuración regional predeterminada",
   "default_locale_description": "Formatee fechas y números según la configuración regional de su navegador",
   "delete": "Eliminar",
+  "delete_action_prompt": "{count} eliminados permanentemente",
   "delete_album": "Eliminar álbum",
   "delete_api_key_prompt": "¿Está seguro de que desea eliminar esta clave API?",
   "delete_dialog_alert": "Estos elementos serán eliminados permanentemente de Immich y de tu dispositivo",
@@ -732,6 +751,7 @@
   "delete_key": "Eliminar clave",
   "delete_library": "Eliminar biblioteca",
   "delete_link": "Eliminar enlace",
+  "delete_local_action_prompt": "{count} eliminados localmente",
   "delete_local_dialog_ok_backed_up_only": "Borrar solo las que tengan copia de seguridad",
   "delete_local_dialog_ok_force": "Borrar de todos modos",
   "delete_others": "Eliminar otros",
@@ -749,6 +769,7 @@
   "direction": "Dirección",
   "disabled": "Deshabilitado",
   "disallow_edits": "Bloquear edición",
+  "discord": "Discord",
   "discover": "Descubrir",
   "discovered_devices": "Dispositivos descubiertos",
   "dismiss_all_errors": "Descartar todos los errores",
@@ -761,6 +782,7 @@
   "documentation": "Documentación",
   "done": "Hecho",
   "download": "Descargar",
+  "download_action_prompt": "Descargando {count} archivos",
   "download_canceled": "Descarga cancelada",
   "download_complete": "Descarga completada",
   "download_enqueue": "Descarga en cola",
@@ -798,6 +820,7 @@
   "edit_key": "Editar clave",
   "edit_link": "Editar enlace",
   "edit_location": "Editar ubicación",
+  "edit_location_action_prompt": "{count} ubicaciones actualizadas",
   "edit_location_dialog_title": "Ubicación",
   "edit_name": "Cambiar nombre",
   "edit_people": "Editar persona",
@@ -983,6 +1006,7 @@
   "failed_to_load_assets": "Error al cargar los activos",
   "failed_to_load_folder": "No se pudo cargar la carpeta",
   "favorite": "Favorito",
+  "favorite_action_prompt": "{count} añadidos a Favoritos",
   "favorite_or_unfavorite_photo": "Foto favorita o no favorita",
   "favorites": "Favoritos",
   "favorites_page_no_favorites": "No se encontraron elementos marcados como favoritos",
@@ -1126,6 +1150,7 @@
   "library_page_sort_created": "Creado más recientemente",
   "library_page_sort_last_modified": "Última modificación",
   "library_page_sort_title": "Título del álbum",
+  "licenses": "Licencias",
   "light": "Claro",
   "like_deleted": "Me gusta eliminado",
   "link_motion_video": "Enlazar vídeo en movimiento",
@@ -1135,7 +1160,7 @@
   "list": "Listar",
   "loading": "Cargando",
   "loading_search_results_failed": "Error al cargar los resultados de la búsqueda",
-  "local_asset_cast_failed": "No se puede emitir un activo que no está cargado en el servidor",
+  "local_asset_cast_failed": "No es posible transmitir un recurso que no está subido al servidor",
   "local_network": "Red local",
   "local_network_sheet_info": "La aplicación se conectará al servidor a través de esta URL cuando utilice la red Wi-Fi especificada",
   "location_permission": "Permiso de ubicación",
@@ -1238,13 +1263,14 @@
   "merged_people_count": "Fusionada {count, plural, one {# persona} other {# personas}}",
   "minimize": "Minimizar",
   "minute": "Minuto",
-  "missing": "Perdido",
+  "missing": "Faltante",
   "model": "Modelo",
   "month": "Mes",
-  "monthly_title_text_date_format": "MMMM y",
+  "monthly_title_text_date_format": "MMMM a",
   "more": "Mas",
   "move": "Mover",
   "move_off_locked_folder": "Mover fuera de la carpeta protegida",
+  "move_to_lock_folder_action_prompt": "{count} añadidos a la carpeta protegida",
   "move_to_locked_folder": "Mover a la carpeta protegida",
   "move_to_locked_folder_confirmation": "Estas fotos y vídeos serán eliminados de todos los álbumes y sólo podrán ser vistos desde la carpeta protegida",
   "moved_to_archive": "Movido(s) {count, plural, one {# recurso} other {# recursos}} a archivo",
@@ -1277,7 +1303,7 @@
   "no_archived_assets_message": "Archive fotos y videos para ocultarlos de su vista de Fotos",
   "no_assets_message": "HAZ CLIC PARA SUBIR TU PRIMERA FOTO",
   "no_assets_to_show": "No hay elementos a mostrar",
-  "no_cast_devices_found": "Dispositivos de difusión no encontrados",
+  "no_cast_devices_found": "No se encontraron dispositivos de transmisión",
   "no_duplicates_found": "No se encontraron duplicados.",
   "no_exif_info_available": "No hay información exif disponible",
   "no_explore_results_message": "Sube más fotos para explorar tu colección.",
@@ -1494,7 +1520,9 @@
   "remove_custom_date_range": "Eliminar intervalo de fechas personalizado",
   "remove_deleted_assets": "Eliminar archivos sin conexión",
   "remove_from_album": "Eliminar del álbum",
+  "remove_from_album_action_prompt": "{count} eliminado del álbum",
   "remove_from_favorites": "Quitar de favoritos",
+  "remove_from_lock_folder_action_prompt": "{count} eliminado de la carpeta protegida",
   "remove_from_locked_folder": "Eliminar de la carpeta protegida",
   "remove_from_locked_folder_confirmation": "¿Estás seguro de que deseas mover estas fotos y vídeos fuera de la carpeta protegida? Serán visibles en tu biblioteca.",
   "remove_from_shared_link": "Eliminar desde enlace compartido",
@@ -1558,17 +1586,17 @@
   "search_city": "Buscar ciudad...",
   "search_country": "Buscar país...",
   "search_filter_apply": "Aplicar filtros",
-  "search_filter_camera_title": "Elige tipo de cámara",
+  "search_filter_camera_title": "Elegir tipo de cámara",
   "search_filter_date": "Fecha",
   "search_filter_date_interval": "{start} al {end}",
-  "search_filter_date_title": "Selecciona un intervalo de fechas",
+  "search_filter_date_title": "Seleccionar un intervalo de fechas",
   "search_filter_display_option_not_in_album": "No en álbum",
   "search_filter_display_options": "Opciones de visualización",
   "search_filter_filename": "Buscar por nombre de archivo",
   "search_filter_location": "Ubicación",
   "search_filter_location_title": "Seleccionar una ubicación",
   "search_filter_media_type": "Tipo de archivo",
-  "search_filter_media_type_title": "Selecciona el tipo de archivo",
+  "search_filter_media_type_title": "Seleccionar el tipo de archivo",
   "search_filter_people_title": "Seleccionar personas",
   "search_for": "Buscar",
   "search_for_existing_person": "Buscar persona existente",
@@ -1591,23 +1619,23 @@
   "search_people": "Buscar personas",
   "search_places": "Buscar lugar",
   "search_rating": "Buscar por calificación...",
-  "search_result_page_new_search_hint": "Nueva Busqueda",
+  "search_result_page_new_search_hint": "Nueva Búsqueda",
   "search_settings": "Ajustes de la búsqueda",
   "search_state": "Buscar región/estado...",
   "search_suggestion_list_smart_search_hint_1": "La búsqueda inteligente está habilitada por defecto, para buscar metadatos utiliza esta sintaxis ",
   "search_suggestion_list_smart_search_hint_2": "m:tu-término-de-búsqueda",
-  "search_tags": "Buscando etiquetas...",
+  "search_tags": "Buscar etiquetas...",
   "search_timezone": "Buscar zona horaria...",
   "search_type": "Tipo de búsqueda",
   "search_your_photos": "Busca tus fotos",
   "searching_locales": "Buscando sitios...",
   "second": "Segundo",
   "see_all_people": "Ver todas las personas",
-  "select": "Selecciona",
+  "select": "Seleccionar",
   "select_album_cover": "Seleccionar portada del álbum",
   "select_all": "Seleccionar todo",
   "select_all_duplicates": "Seleccionar todos los duplicados",
-  "select_all_in": "Selecciona todos en {group}",
+  "select_all_in": "Seleccionar todos en {group}",
   "select_avatar_color": "Seleccionar color del avatar",
   "select_face": "Seleccionar cara",
   "select_featured_photo": "Seleccionar foto principal",
@@ -1638,7 +1666,7 @@
   "set_date_of_birth": "Establecer fecha de nacimiento",
   "set_profile_picture": "Establecer foto de perfil",
   "set_slideshow_to_fullscreen": "Mostrar diapositivas en pantalla completa",
-  "set_stack_primary_asset": "Establecer como activo principal",
+  "set_stack_primary_asset": "Establecer como recurso principal",
   "setting_image_viewer_help": "El visor de detalles carga primero la miniatura pequeña, luego carga la vista previa de tamaño mediano (si está habilitada), finalmente carga la original (si está habilitada).",
   "setting_image_viewer_original_subtitle": "Activar para cargar la imagen en resolución original (¡muy grande!). Deshabilitar para reducir el consumo de datos (de red y caché).",
   "setting_image_viewer_original_title": "Cargar imagen original",
@@ -1666,6 +1694,7 @@
   "settings_saved": "Ajustes guardados",
   "setup_pin_code": "Establecer un PIN",
   "share": "Compartir",
+  "share_action_prompt": "{count} recursos compartidos",
   "share_add_photos": "Agregar fotos",
   "share_assets_selected": "{count} seleccionado(s)",
   "share_dialog_preparing": "Preparando...",
@@ -1767,6 +1796,7 @@
   "sort_title": "Título",
   "source": "Origen",
   "stack": "Apilar",
+  "stack_action_prompt": "{count} apilados",
   "stack_duplicates": "Apilar duplicados",
   "stack_select_one_photo": "Selecciona una imagen principal para la pila",
   "stack_selected_photos": "Apilar fotos seleccionadas",
@@ -1776,7 +1806,7 @@
   "start_date": "Fecha de inicio",
   "state": "Estado",
   "status": "Estado",
-  "stop_casting": "Parar difusión",
+  "stop_casting": "Detener transmisión",
   "stop_motion_photo": "Parar foto en movimiento",
   "stop_photo_sharing": "¿Dejar de compartir tus fotos?",
   "stop_photo_sharing_description": "{partner} ya no podrá acceder a tus fotos.",
@@ -1837,6 +1867,7 @@
   "total": "Total",
   "total_usage": "Uso total",
   "trash": "Papelera",
+  "trash_action_prompt": "{count} movidos a la papelera",
   "trash_all": "Descartar todo",
   "trash_count": "Descartar {count, number}",
   "trash_delete_asset": "Borrar/Eliminar archivo",
@@ -1854,9 +1885,11 @@
   "unable_to_change_pin_code": "No se ha podido cambiar el PIN",
   "unable_to_setup_pin_code": "No se ha podido establecer el PIN",
   "unarchive": "Desarchivar",
+  "unarchive_action_prompt": "{count} eliminados del archivo",
   "unarchived_count": "{count, plural, one {# No archivado} other {# No archivados}}",
   "undo": "Deshacer",
   "unfavorite": "Retirar favorito",
+  "unfavorite_action_prompt": "{count} eliminados de favoritos",
   "unhide_person": "Mostrar persona",
   "unknown": "Desconocido",
   "unknown_country": "País desconocido",
@@ -1874,7 +1907,9 @@
   "unselect_all_duplicates": "Deseleccionar todos los duplicados",
   "unselect_all_in": "Deselecciona todos en {group}",
   "unstack": "Desapilar",
+  "unstack_action_prompt": "{count} desapilado(s)",
   "unstacked_assets_count": "Desapilado(s) {count, plural, one {# elemento} other {# elementos}}",
+  "untagged": "Sin etiqueta",
   "up_next": "A continuación",
   "updated_at": "Actualizado",
   "updated_password": "Contraseña actualizada",
@@ -1911,6 +1946,7 @@
   "user_usage_stats_description": "Ver estadísticas de uso de la cuenta",
   "username": "Nombre de usuario",
   "users": "Usuarios",
+  "users_added_to_album_count": "{count, plural, one {# usuario agregado} other {# usuarios agregados}} al álbum",
   "utilities": "Utilidades",
   "validate": "Validar",
   "validate_endpoint_error": "Por favor, introduce una URL válida",
diff --git a/i18n/et.json b/i18n/et.json
index a2b17c6138..804d0c6c46 100644
--- a/i18n/et.json
+++ b/i18n/et.json
@@ -33,11 +33,11 @@
   "added_to_favorites": "Lisatud lemmikutesse",
   "added_to_favorites_count": "{count, number} pilti lisatud lemmikutesse",
   "admin": {
-    "add_exclusion_pattern_description": "Lisa välistamismustreid. Toetatud on metamärgid *, ** ja ?. Kõikide kataloogis nimega \"Raw\" olevate failide ignoreerimiseks kasuta \"**/Raw/**\". Kõikide .tif failide ignoreerimiseks kasuta \"**/*.tif\". Absouutse tee ignoreerimiseks kasuta \"/path/to/ignore/**\".",
+    "add_exclusion_pattern_description": "Lisa välistamismustreid. Toetatud on metamärgid *, ** ja ?. Kõikide kataloogis nimega \"Raw\" olevate failide ignoreerimiseks kasuta \"**/Raw/**\". Kõikide \".tif\" lõpuga failide ignoreerimiseks kasuta \"**/*.tif\". Absouutse tee ignoreerimiseks kasuta \"/tee/mida/ignoreerida/**\".",
     "admin_user": "Administraator",
-    "asset_offline_description": "Seda välise kogu üksust ei leitud kettalt ning see liigutati prügikasti. Kui faili asukoht kogu siseselt muutus, leiad vastava uue üksuse oma ajajoonelt. Üksuse taastamiseks veendu, et allpool toodud failitee on Immich'ile kättesaadav ning skaneeri kogu uuesti.",
+    "asset_offline_description": "Seda välise kogu üksust ei leitud kettalt ning see liigutati prügikasti. Kui faili asukoht muutus kogu siseselt, leiad vastava uue üksuse oma ajajoonelt. Üksuse taastamiseks veendu, et allpool toodud failitee on Immich'ile kättesaadav ning skaneeri kogu uuesti.",
     "authentication_settings": "Autentimise seaded",
-    "authentication_settings_description": "Halda parooli, OAuth ja muid autentimise seadeid",
+    "authentication_settings_description": "Halda parooli, OAuth'i ja muid autentimise seadeid",
     "authentication_settings_disable_all": "Kas oled kindel, et soovid kõik sisselogimismeetodid välja lülitada? Sisselogimine lülitatakse täielikult välja.",
     "authentication_settings_reenable": "Et taas lubada, kasuta <link>serveri käsku</link>.",
     "background_task_job": "Tausttegumid",
@@ -47,26 +47,26 @@
     "backup_settings": "Andmebaasi tõmmiste seaded",
     "backup_settings_description": "Halda andmebaasi tõmmiste seadeid.",
     "cleared_jobs": "Tööted eemaldatud: {job}",
-    "config_set_by_file": "Konfiguratsioon on määratud konfifaili abil",
+    "config_set_by_file": "Konfiguratsioon on määratud konfiguratsioonifaili abil",
     "confirm_delete_library": "Kas oled kindel, et soovid kustutada {library} kogu?",
-    "confirm_delete_library_assets": "Kas oled kindel, et soovid selle kogu kustutada? Sellega kustutatakse {count, plural, one {# sisalduv üksus} other {kõik # sisalduvat üksust}} Immich'ist ning seda ei saa tagasi võtta. Failid jäävad kettale alles.",
+    "confirm_delete_library_assets": "Kas oled kindel, et soovid selle kogu kustutada? Sellega kustutatakse {count, plural, one {# sisalduv üksus} other {kõik # sisalduvat üksust}} Immich'ist ning seda toimingut ei saa tagasi võtta. Failid jäävad kettale alles.",
     "confirm_email_below": "Kinnitamiseks sisesta allpool \"{email}\"",
     "confirm_reprocess_all_faces": "Kas oled kindel, et soovid kõik näod uuesti töödelda? See eemaldab kõik nimega isikud.",
     "confirm_user_password_reset": "Kas oled kindel, et soovid kasutaja {user} parooli lähtestada?",
     "confirm_user_pin_code_reset": "Kas oled kindel, et soovid kasutaja {user} PIN-koodi lähtestada?",
     "create_job": "Lisa tööde",
     "cron_expression": "Cron avaldis",
-    "cron_expression_description": "Sea skaneerimise intervall cron formaadis. Rohkema info jaoks vaata nt. <link>Crontab Guru</link>",
+    "cron_expression_description": "Määra skaneerimise intervall cron formaadis. Rohkema info jaoks vaata nt. <link>Crontab Guru</link>",
     "cron_expression_presets": "Eelseadistatud cron avaldised",
     "disable_login": "Keela sisselogimine",
     "duplicate_detection_job_description": "Rakenda üksustele masinõpet, et leida sarnaseid pilte. Kasutab nutiotsingut",
-    "exclusion_pattern_description": "Välistamismustrid võimaldavad ignoreerida faile ja kaustu kogu skaneerimisel. See on kasulik, kui sul on kaustu, mis sisaldavad faile, mida sa ei soovi importida, nagu RAW failid.",
+    "exclusion_pattern_description": "Välistamismustrid võimaldavad ignoreerida faile ja kaustu selle kogu skaneerimisel. See on kasulik, kui sul on kaustu, mis sisaldavad faile, mida sa ei soovi importida, nagu RAW failid.",
     "external_library_management": "Väliste kogude haldus",
     "face_detection": "Näoavastus",
-    "face_detection_description": "Avasta üksustest nägusid masinõppe abil. Videote puhul kasutatakse ainult pisipilti. \"Värskenda\" töötleb kõik üksused uuesti. \"Lähtesta\" kustutab lisaks kõik seni leitud näed. \"Puuduvad\" võtab ette üksused, mida pole veel töödeldud. Avastatud näod suunatakse näotuvastusse, et grupeerida nad olemasolevateks või uuteks isikuteks.",
+    "face_detection_description": "Avasta üksustest nägusid masinõppe abil. Videote puhul kasutatakse ainult pisipilti. \"Värskenda\" töötleb kõik üksused uuesti. \"Lähtesta\" kustutab lisaks kõik seni leitud näod. \"Puuduvad\" võtab ette üksused, mida pole veel töödeldud. Avastatud näod suunatakse näotuvastusse, et grupeerida nad olemasolevateks või uuteks isikuteks.",
     "facial_recognition_job_description": "Grupeeri avastatud näod inimesteks. See samm käivitub siis, kui näoavastus on lõppenud. \"Lähtesta\" grupeerib kõik näod uuesti. \"Puuduvad\" võtab ette näod, mida pole isikuga seostatud.",
     "failed_job_command": "Käsk {command} ebaõnnestus töötes: {job}",
-    "force_delete_user_warning": "HOIATUS: See kustutab koheselt kasutaja ja kõik üksused. Seda ei saa tagasi võtta ja faile ei saa taastada.",
+    "force_delete_user_warning": "HOIATUS: See kustutab koheselt kasutaja ja kõik tema üksused. Toimingut ei saa tagasi võtta ja faile ei saa taastada.",
     "image_format": "Formaat",
     "image_format_description": "WebP failid on väiksemad kui JPEG, aga kodeerimine on aeglasem.",
     "image_fullsize_description": "Täismõõdus pilt ilma metaandmeteta, kasutatakse sisse suumimisel",
@@ -77,9 +77,9 @@
     "image_prefer_embedded_preview": "Eelista manustatud eelvaadet",
     "image_prefer_embedded_preview_setting_description": "Kasuta pilditöötluse sisendina võimalusel RAW fotodesse manustatud eelvaateid. See võib mõnede piltide puhul anda tulemuseks täpsemad värvid, aga eelvaate kvaliteet sõltub konkreetsest kaamerast ning pildis võib olla rohkem tihendusmüra.",
     "image_prefer_wide_gamut": "Eelista laia värvigammat",
-    "image_prefer_wide_gamut_setting_description": "Kasuta pisipiltide jaoks Display P3. See säilitab paremini laia värviruumiga piltide erksuse, aga vanematel seadmetel ja vanemate brauseritega võivad pildid teistsugused välja näha. sRGB pildid säilitatakse värvinihete vältimiseks.",
+    "image_prefer_wide_gamut_setting_description": "Kasuta pisipiltide jaoks Display P3. See säilitab paremini laia värviruumiga piltide erksuse, kuid vanematel seadmetel ja vanemate brauseritega võivad pildid teistsugused välja näha. sRGB pildid säilitatakse värvinihete vältimiseks.",
     "image_preview_description": "Keskmise suurusega pilt ilma metaandmeteta, kasutusel üksiku üksuse vaatamise ja masinõppe jaoks",
-    "image_preview_quality_description": "Eelvaate kvaliteet vahemikus 1-100. Kõrgem väärtus on parem, aga tekitab suuremaid faile ning võib mõjutada rakenduse töökiirust. Madala väärtuse seadmine võib mõjutada masinõppe kvaliteeti.",
+    "image_preview_quality_description": "Eelvaate kvaliteet vahemikus 1-100. Kõrgem väärtus on parem, aga tekitab suuremaid faile ning võib mõjutada rakenduse töökiirust. Madal väärtus võib mõjutada masinõppe kvaliteeti.",
     "image_preview_title": "Eelvaate seaded",
     "image_quality": "Kvaliteet",
     "image_resolution": "Resolutsioon",
@@ -92,7 +92,7 @@
     "job_concurrency": "{job} samaaegsus",
     "job_created": "Tööde lisatud",
     "job_not_concurrency_safe": "Seda töödet pole ohutu samaaegselt käivitada.",
-    "job_settings": "Tööte seaded",
+    "job_settings": "Töödete seaded",
     "job_settings_description": "Halda töödete samaaegsust",
     "job_status": "Tööte seisund",
     "jobs_delayed": "{jobCount, plural, other {# edasi lükatud}}",
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Halda metaandmete seadeid",
     "migration_job": "Migratsioon",
     "migration_job_description": "Migreeri üksuste ja nägude pisipildid uusimale kaustastruktuurile",
+    "nightly_tasks_cluster_faces_setting_description": "Käivita värskelt avastatud nägudel näotuvastus",
+    "nightly_tasks_cluster_new_faces_setting": "Grupeeri uued näod",
+    "nightly_tasks_database_cleanup_setting": "Andmebaasi puhastuse tegumid",
+    "nightly_tasks_database_cleanup_setting_description": "Eemalda andmebaasist vanad, aegunud andmed",
+    "nightly_tasks_generate_memories_setting": "Genereeri mälestused",
+    "nightly_tasks_generate_memories_setting_description": "Loo üksustest uued mälestused",
+    "nightly_tasks_missing_thumbnails_setting": "Genereeri puuduvad pisipildid",
+    "nightly_tasks_missing_thumbnails_setting_description": "Suuna ilma pisipiltideta üksused pisipiltide genereerimisele",
+    "nightly_tasks_settings": "Öiste tegumite seaded",
+    "nightly_tasks_settings_description": "Halda öiseid tegumeid",
+    "nightly_tasks_start_time_setting": "Algusaeg",
+    "nightly_tasks_start_time_setting_description": "Aeg, millal server alustab öiste tegumite käivitamist",
+    "nightly_tasks_sync_quota_usage_setting": "Sünkrooni kvoodikasutus",
+    "nightly_tasks_sync_quota_usage_setting_description": "Uuenda kasutaja talletuskvoot jooksva kasutuse alusel",
     "no_paths_added": "Ühtegi teed pole",
     "no_pattern_added": "Mustreid ei ole",
     "note_apply_storage_label_previous_assets": "Märkus: Et rakendada talletussilt varem üleslaaditud üksustele, käivita",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "Mobiilne ümbersuunamise URI",
     "oauth_mobile_redirect_uri_override": "Mobiilse ümbersuunamise URI ülekirjutamine",
     "oauth_mobile_redirect_uri_override_description": "Lülita sisse, kui OAuth pakkuja ei luba mobiilset URI-d, näiteks ''{callback}''",
+    "oauth_role_claim": "Rolli väide",
+    "oauth_role_claim_description": "Anna selle väite olemasolul automaatselt administraatori ligipääs. Väite väärtus võib olla 'user' või 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Halda OAuth sisselogimise seadeid",
     "oauth_settings_more_details": "Selle funktsiooni kohta rohkem teada saamiseks loe <link>dokumentatsiooni</link>.",
@@ -357,10 +373,12 @@
   "admin_password": "Administraatori parool",
   "administration": "Administratsioon",
   "advanced": "Täpsemad valikud",
+  "advanced_settings_beta_timeline_subtitle": "Koge uut rakendust",
+  "advanced_settings_beta_timeline_title": "Beeta ajajoon",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Kasuta seda valikut, et filtreerida sünkroonimise ajal üksuseid alternatiivsete kriteeriumite alusel. Proovi seda ainult siis, kui rakendusel on probleeme kõigi albumite tuvastamisega.",
   "advanced_settings_enable_alternate_media_filter_title": "[EKSPERIMENTAALNE] Kasuta alternatiivset seadme albumi sünkroonimise filtrit",
   "advanced_settings_log_level_title": "Logimistase: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Mõned seadmed laadivad seadmes olevate üksuste pisipilte piinavalt aeglaselt. Aktiveeri see seadistus, et laadida selle asemel kaugpilte.",
+  "advanced_settings_prefer_remote_subtitle": "Mõned seadmed laadivad lokaalsete üksuste pisipilte piinavalt aeglaselt. Aktiveeri see seadistus, et laadida selle asemel kaugpilte.",
   "advanced_settings_prefer_remote_title": "Eelista kaugpilte",
   "advanced_settings_proxy_headers_subtitle": "Määra vaheserveri päised, mida Immich peaks iga päringuga saatma",
   "advanced_settings_proxy_headers_title": "Vaheserveri päised",
@@ -388,6 +406,7 @@
   "album_options": "Albumi valikud",
   "album_remove_user": "Eemalda kasutaja?",
   "album_remove_user_confirmation": "Kas oled kindel, et soovid kasutaja {user} eemaldada?",
+  "album_search_not_found": "Otsingule vastavaid albumeid ei leitud",
   "album_share_no_users": "Paistab, et oled seda albumit kõikide kasutajatega jaganud, või pole ühtegi kasutajat, kellega jagada.",
   "album_updated": "Album muudetud",
   "album_updated_setting_description": "Saa teavitus e-posti teel, kui jagatud albumis on uusi üksuseid",
@@ -407,6 +426,7 @@
   "albums_default_sort_order": "Vaikimisi albumi järjestus",
   "albums_default_sort_order_description": "Uute albumite lisamisel üksuste esialgne järjekord.",
   "albums_feature_description": "Üksuste kollektsioonid, mida saab teiste kasutajatega jagada.",
+  "albums_on_device_count": "Albumid seadmel ({count})",
   "all": "Kõik",
   "all_albums": "Kõik albumid",
   "all_people": "Kõik isikud",
@@ -427,6 +447,7 @@
   "app_settings": "Rakenduse seaded",
   "appears_in": "Albumid",
   "archive": "Arhiiv",
+  "archive_action_prompt": "{count} lisatud arhiivi",
   "archive_or_unarchive_photo": "Arhiveeri või taasta foto",
   "archive_page_no_archived_assets": "Arhiveeritud üksuseid ei leitud",
   "archive_page_title": "Arhiveeri ({count})",
@@ -464,7 +485,6 @@
   "assets": "Üksused",
   "assets_added_count": "{count, plural, one {# üksus} other {# üksust}} lisatud",
   "assets_added_to_album_count": "{count, plural, one {# üksus} other {# üksust}} albumisse lisatud",
-  "assets_added_to_name_count": "{count, plural, one {# üksus} other {# üksust}} lisatud {hasName, select, true {albumisse <b>{name}</b>} other {uude albumisse}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Üksust} other {Üksuseid}} ei saa albumisse lisada",
   "assets_count": "{count, plural, one {# üksus} other {# üksust}}",
   "assets_deleted_permanently": "{count} üksus(t) jäädavalt kustutatud",
@@ -587,6 +607,7 @@
   "cancel": "Katkesta",
   "cancel_search": "Katkesta otsing",
   "canceled": "Tühistatud",
+  "canceling": "Tühistamine",
   "cannot_merge_people": "Ei saa isikuid ühendada",
   "cannot_undo_this_action": "Sa ei saa seda tagasi võtta!",
   "cannot_update_the_description": "Kirjelduse muutmine ebaõnnestus",
@@ -703,7 +724,7 @@
   "daily_title_text_date": "d. MMMM",
   "daily_title_text_date_year": "d. MMMM yyyy",
   "dark": "Tume",
-  "darkTheme": "Lülita tume teema",
+  "dark_theme": "Lülita tume teema",
   "date_after": "Kuupäev pärast",
   "date_and_time": "Kuupäev ja kellaaeg",
   "date_before": "Kuupäev enne",
@@ -719,6 +740,7 @@
   "default_locale": "Vaikimisi lokaat",
   "default_locale_description": "Vorminda kuupäevad ja numbrid vastavalt brauseri lokaadile",
   "delete": "Kustuta",
+  "delete_action_prompt": "{count} jäädavalt kustutatud",
   "delete_album": "Kustuta album",
   "delete_api_key_prompt": "Kas oled kindel, et soovid selle API võtme kustutada?",
   "delete_dialog_alert": "Need üksused kustutatakse jäädavalt Immich'ist ja sinu seadmest",
@@ -732,6 +754,7 @@
   "delete_key": "Kustuta võti",
   "delete_library": "Kustuta kogu",
   "delete_link": "Kustuta link",
+  "delete_local_action_prompt": "{count} kustutatud lokaalselt",
   "delete_local_dialog_ok_backed_up_only": "Kustuta ainult varundatud",
   "delete_local_dialog_ok_force": "Kustuta sellegipoolest",
   "delete_others": "Kustuta teised",
@@ -745,6 +768,7 @@
   "description": "Kirjeldus",
   "description_input_hint_text": "Lisa kirjeldus...",
   "description_input_submit_error": "Viga kirjelduse muutmisel, rohkem infot leiad logist",
+  "deselect_all": "Eemalda kõik valikust",
   "details": "Üksikasjad",
   "direction": "Suund",
   "disabled": "Välja lülitatud",
@@ -762,6 +786,7 @@
   "documentation": "Dokumentatsioon",
   "done": "Tehtud",
   "download": "Laadi alla",
+  "download_action_prompt": "{count} üksust laaditakse alla",
   "download_canceled": "Allalaadimine katkestatud",
   "download_complete": "Allalaadimine lõpetatud",
   "download_enqueue": "Allalaadimine ootel",
@@ -799,6 +824,7 @@
   "edit_key": "Muuda võtit",
   "edit_link": "Muuda linki",
   "edit_location": "Muuda asukohta",
+  "edit_location_action_prompt": "{count} asukoht muudetud",
   "edit_location_dialog_title": "Asukoht",
   "edit_name": "Muuda nime",
   "edit_people": "Muuda isikuid",
@@ -817,6 +843,7 @@
   "empty_trash": "Tühjenda prügikast",
   "empty_trash_confirmation": "Kas oled kindel, et soovid prügikasti tühjendada? See eemaldab kõik seal olevad üksused Immich'ist jäädavalt.\nSeda tegevust ei saa tagasi võtta!",
   "enable": "Luba",
+  "enable_backup": "Luba varundus",
   "enable_biometric_auth_description": "Biomeetrilise autentimise lubamiseks sisesta oma PIN-kood",
   "enabled": "Lubatud",
   "end_date": "Lõppkuupäev",
@@ -984,6 +1011,7 @@
   "failed_to_load_assets": "Üksuste laadimine ebaõnnestus",
   "failed_to_load_folder": "Kausta laadimine ebaõnnestus",
   "favorite": "Lemmik",
+  "favorite_action_prompt": "{count} lisatud lemmikutesse",
   "favorite_or_unfavorite_photo": "Lisa foto lemmikutesse või eemalda lemmikutest",
   "favorites": "Lemmikud",
   "favorites_page_no_favorites": "Lemmikuid üksuseid ei leitud",
@@ -1099,7 +1127,7 @@
   "ios_debug_info_no_processes_queued": "Taustaprotsesse pole järjekorras",
   "ios_debug_info_no_sync_yet": "Taustal sünkroonimise tööde pole veel käinud",
   "ios_debug_info_processes_queued": "{count, plural, one {{count} taustaprotsess järjekorras} other {{count} taustaprotsessi järjekorras}}",
-  "ios_debug_info_processing_ran_at": "Töötlemine käis {dateTime}",
+  "ios_debug_info_processing_ran_at": "Töötlemine toimus {dateTime}",
   "items_count": "{count, plural, one {# üksus} other {# üksust}}",
   "jobs": "Tööted",
   "keep": "Jäta alles",
@@ -1127,6 +1155,7 @@
   "library_page_sort_created": "Loomise aeg",
   "library_page_sort_last_modified": "Viimase muutmise aeg",
   "library_page_sort_title": "Albumi pealkiri",
+  "licenses": "Litsentsid",
   "light": "Hele",
   "like_deleted": "Meeldimine kustutatud",
   "link_motion_video": "Lingi liikuv video",
@@ -1246,6 +1275,7 @@
   "more": "Rohkem",
   "move": "Liiguta",
   "move_off_locked_folder": "Liiguta lukustatud kaustast välja",
+  "move_to_lock_folder_action_prompt": "{count} lisatud lukustatud kausta",
   "move_to_locked_folder": "Liiguta lukustatud kausta",
   "move_to_locked_folder_confirmation": "Need fotod ja videod eemaldatakse kõigist albumitest ning nad on nähtavad ainult lukustatud kaustas",
   "moved_to_archive": "{count, plural, one {# üksus} other {# üksust}} liigutatud arhiivi",
@@ -1460,6 +1490,7 @@
   "purchase_server_description_2": "Toetaja staatus",
   "purchase_server_title": "Server",
   "purchase_settings_server_activated": "Serveri tootevõtit haldab administraator",
+  "queue_status": "Järjekorras {count}/{total}",
   "rating": "Hinnang",
   "rating_clear": "Tühjenda hinnang",
   "rating_count": "{count, plural, one {# tärn} other {# tärni}}",
@@ -1495,7 +1526,9 @@
   "remove_custom_date_range": "Eemalda kohandatud kuupäevavahemik",
   "remove_deleted_assets": "Eemalda kustutatud üksused",
   "remove_from_album": "Eemalda albumist",
+  "remove_from_album_action_prompt": "{count} eemaldatud albumist",
   "remove_from_favorites": "Eemalda lemmikutest",
+  "remove_from_lock_folder_action_prompt": "{count} eemaldatud lukustatud kaustast",
   "remove_from_locked_folder": "Eemalda lukustatud kaustast",
   "remove_from_locked_folder_confirmation": "Kas oled kindel, et soovid need fotod ja videod lukustatud kaustast välja liigutada? Need muutuvad su kogus nähtavaks.",
   "remove_from_shared_link": "Eemalda jagatud lingist",
@@ -1667,6 +1700,7 @@
   "settings_saved": "Seaded salvestatud",
   "setup_pin_code": "Seadista PIN-kood",
   "share": "Jaga",
+  "share_action_prompt": "Jagatud {count} üksust",
   "share_add_photos": "Lisa fotosid",
   "share_assets_selected": "{count} valitud",
   "share_dialog_preparing": "Ettevalmistamine...",
@@ -1768,6 +1802,7 @@
   "sort_title": "Pealkiri",
   "source": "Lähtekood",
   "stack": "Virnasta",
+  "stack_action_prompt": "{count} virnastatud",
   "stack_duplicates": "Virnasta duplikaadid",
   "stack_select_one_photo": "Vali virnale kaanefoto",
   "stack_selected_photos": "Virnasta valitud fotod",
@@ -1838,6 +1873,7 @@
   "total": "Kokku",
   "total_usage": "Kogukasutus",
   "trash": "Prügikast",
+  "trash_action_prompt": "{count} liigutatud prügikasti",
   "trash_all": "Kõik prügikasti",
   "trash_count": "Liiguta {count, number} prügikasti",
   "trash_delete_asset": "Kustuta üksus",
@@ -1855,9 +1891,11 @@
   "unable_to_change_pin_code": "PIN-koodi muutmine ebaõnnestus",
   "unable_to_setup_pin_code": "PIN-koodi seadistamine ebaõnnestus",
   "unarchive": "Taasta arhiivist",
+  "unarchive_action_prompt": "{count} eemaldatud arhiivist",
   "unarchived_count": "{count, plural, other {# arhiivist taastatud}}",
   "undo": "Võta tagasi",
   "unfavorite": "Eemalda lemmikutest",
+  "unfavorite_action_prompt": "{count} eemaldatud lemmikutest",
   "unhide_person": "Ära peida isikut",
   "unknown": "Teadmata",
   "unknown_country": "Tundmatu riik",
@@ -1875,12 +1913,15 @@
   "unselect_all_duplicates": "Ära vali duplikaate",
   "unselect_all_in": "Ära vali ühtegi grupis {group}",
   "unstack": "Eralda",
+  "unstack_action_prompt": "{count} eraldatud",
   "unstacked_assets_count": "{count, plural, one {# üksus} other {# üksust}} eraldatud",
+  "untagged": "Sildistamata",
   "up_next": "Järgmine",
   "updated_at": "Uuendatud",
   "updated_password": "Parool muudetud",
   "upload": "Laadi üles",
   "upload_concurrency": "Üleslaadimise samaaegsus",
+  "upload_details": "Üleslaadimise üksikasjad",
   "upload_dialog_info": "Kas soovid valitud üksuse(d) serverisse varundada?",
   "upload_dialog_title": "Üksuse üleslaadimine",
   "upload_errors": "Üleslaadimine lõpetatud {count, plural, one {# veaga} other {# veaga}}, uute üksuste nägemiseks värskenda lehte.",
@@ -1912,6 +1953,7 @@
   "user_usage_stats_description": "Vaata konto kasutuse statistikat",
   "username": "Kasutajanimi",
   "users": "Kasutajad",
+  "users_added_to_album_count": "{count, plural, one {# kasutaja} other {# kasutajat}} lisatud albumisse",
   "utilities": "Tööriistad",
   "validate": "Valideeri",
   "validate_endpoint_error": "Sisesta korrektne URL",
@@ -1930,6 +1972,7 @@
   "view_album": "Vaata albumit",
   "view_all": "Vaata kõiki",
   "view_all_users": "Vaata kõiki kasutajaid",
+  "view_details": "Vaata üksikasju",
   "view_in_timeline": "Vaata ajajoonel",
   "view_link": "Vaata linki",
   "view_links": "Vaata linke",
diff --git a/i18n/fi.json b/i18n/fi.json
index f41d0cf631..4e12253cf2 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Hallitse metatietoja",
     "migration_job": "Migraatio",
     "migration_job_description": "Migroi aineiston pikkukuvat ja kasvot uusimpaan kansiorakenteeseen",
+    "nightly_tasks_cluster_faces_setting_description": "Aja kasvojen tunnistus uusiin tunnistettuihin kasvoihin",
+    "nightly_tasks_cluster_new_faces_setting": "Kokoa uudet kasvot",
+    "nightly_tasks_database_cleanup_setting": "Tietokannan puhdistuksen tehtävät",
+    "nightly_tasks_database_cleanup_setting_description": "Siivoa vanhentunut data tietokannasta",
+    "nightly_tasks_generate_memories_setting": "Luo muistoja",
+    "nightly_tasks_generate_memories_setting_description": "Luo kohteista uusia muistoja",
+    "nightly_tasks_missing_thumbnails_setting": "Luo puuttuvat pikkukuvat",
+    "nightly_tasks_missing_thumbnails_setting_description": "Laita ilman pikkukuvia olevat kohteet jonoon pikkukuvien luontia varten",
+    "nightly_tasks_settings": "Yöllisten tehtävien asetukset",
+    "nightly_tasks_settings_description": "Hallitse yöllisiä tehtäviä",
+    "nightly_tasks_start_time_setting": "Aloitusaika",
+    "nightly_tasks_start_time_setting_description": "Aika jolloin palvelin aloittaa yöllisten tehtävien ajon",
+    "nightly_tasks_sync_quota_usage_setting": "Synkronointikiintiön käyttö",
+    "nightly_tasks_sync_quota_usage_setting_description": "Päivitä käyttäjän tallennustilan kiintiö nykyisen käytön mukaan",
     "no_paths_added": "Polkuja ei asetettu",
     "no_pattern_added": "Kaavoja ei lisättynä",
     "note_apply_storage_label_previous_assets": "Huom: Asettaaksesi nimikkeen aiemmin ladatulle aineistolle, aja",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "Mobiilin uudellenohjaus-URI",
     "oauth_mobile_redirect_uri_override": "Ohita mobiilin uudelleenohjaus-URI",
     "oauth_mobile_redirect_uri_override_description": "Ota käyttöön kun OAuth tarjoaja ei salli mobiili URI:a, kuten ''{callback}''",
+    "oauth_role_claim": "Roolin vaatimus",
+    "oauth_role_claim_description": "Salli pääkäyttäjän pääsyoikeus automaattisesti tämän vaatimuksen perusteella. Vaatimus voi sisältää, joko 'käyttäjän' tai 'pääkäyttäjän'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Hallitse OAuth-kirjautumisen asetuksia",
     "oauth_settings_more_details": "Saadaksesi lisätietoja tästä toiminnosta, katso <link>dokumentaatio</link>.",
@@ -244,6 +260,7 @@
     "storage_template_migration_info": "Tallennusmalli muuntaa kaikki tiedostopäätteet pieniksi kirjaimiksi. Mallipohjan muutokset koskevat vain uusia resursseja. Jos haluat käyttää mallipohjaa takautuvasti aiemmin ladattuihin resursseihin, suorita <link>{job}</link>.",
     "storage_template_migration_job": "Tallennustilan mallin muutostyö",
     "storage_template_more_details": "Saadaksesi lisätietoa tästä ominaisuudesta, katso <template-link>Tallennustilan Mallit</template-link> sekä <implications-link>mihin se vaikuttaa</implications-link>",
+    "storage_template_onboarding_description_v2": "Päälle kytkettynä, toiminto järjestestelee tiedostot automaattisesti käyttäjän määrittämän mallin mukaisesti. Lisätietoja <link>dokumentaatiosta</link>..",
     "storage_template_path_length": "Arvioitu tiedostopolun pituusrajoitus: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Tallennustilan malli",
     "storage_template_settings_description": "Hallitse palvelimelle ladatun aineiston kansiorakennetta ja tiedostonimiä",
@@ -403,6 +420,9 @@
   "album_with_link_access": "Anna kenen tahansa nähdä linkin kautta tämän albumin valokuvat ja henkilöt.",
   "albums": "Albumit",
   "albums_count": "{count, plural, one {{count, number} albumi} other {{count, number} albumia}}",
+  "albums_default_sort_order": "Albumin oletuslajittelujärjestys",
+  "albums_default_sort_order_description": "Kohteiden ensisijainen lajittelujärjestys uusia albumeja luotaessa.",
+  "albums_feature_description": "Kokoelma kohteita, jotka voidaan jakaa muille käyttäjille.",
   "all": "Kaikki",
   "all_albums": "Kaikki albumit",
   "all_people": "Kaikki henkilöt",
@@ -423,6 +443,7 @@
   "app_settings": "Sovellusasetukset",
   "appears_in": "Esiintyy albumeissa",
   "archive": "Arkisto",
+  "archive_action_prompt": "{count} lisätty arkistoon",
   "archive_or_unarchive_photo": "Arkistoi kuva tai palauta arkistosta",
   "archive_page_no_archived_assets": "Arkistoituja kohteita ei löytynyt",
   "archive_page_title": "Arkisto ({count})",
@@ -460,10 +481,12 @@
   "assets": "Kohteet",
   "assets_added_count": "Lisätty {count, plural, one {# kohde} other {# kohdetta}}",
   "assets_added_to_album_count": "Albumiin lisätty {count, plural, one {# kohde} other {# kohdetta}}",
-  "assets_added_to_name_count": "Lisätty {count, plural, one {# kohde} other {# kohdetta}} {hasName, select, true {<b>{name}</b>} other {uuteen albumiin}}",
+  "assets_cannot_be_added_to_album_count": "{count, plural, one {Kohdetta} other {Kohdetta}} ei voida lisätä albumiin",
   "assets_count": "{count, plural, one {# media} other {# mediaa}}",
   "assets_deleted_permanently": "{count} kohdetta poistettu pysyvästi",
   "assets_deleted_permanently_from_server": "{count} objektia poistettu pysyvästi Immich-palvelimelta",
+  "assets_downloaded_failed": "{count, plural, one {Ladattu # tiedosto - {error} tiedosto epäonnistui} other {ladattu # tiedostoa - {error} tiedostot epäonnistuivat}}",
+  "assets_downloaded_successfully": "{count, plural, one {Ladattu # tiedosto onnistuneesti} other {Ladattu # tiedostoa onnistuneesti}}",
   "assets_moved_to_trash_count": "Siirretty {count, plural, one {# media} other {# mediaa}} roskakoriin",
   "assets_permanently_deleted_count": "{count, plural, one {# media} other {# mediaa}} poistettu pysyvästi",
   "assets_removed_count": "{count, plural, one {# media} other {# mediaa}} poistettu",
@@ -478,6 +501,7 @@
   "authorized_devices": "Valtuutetut laitteet",
   "automatic_endpoint_switching_subtitle": "Yhdistä paikallisesti nimetyn Wi-Fi-yhteyden kautta, kun se on saatavilla, ja käytä vaihtoehtoisia yhteyksiä muualla",
   "automatic_endpoint_switching_title": "Automaattinen URL-osoitteen vaihto",
+  "autoplay_slideshow": "Toista diaesitys automaattisesti",
   "back": "Takaisin",
   "back_close_deselect": "Palaa, sulje tai poista valinnat",
   "background_location_permission": "Taustasijainnin käyttöoikeus",
@@ -582,7 +606,8 @@
   "cannot_merge_people": "Ihmisiä ei voitu yhdistää",
   "cannot_undo_this_action": "Et voi perua tätä toimintoa!",
   "cannot_update_the_description": "Kuvausta ei voi päivittää",
-  "cast": "Lähettää",
+  "cast": "Suoratoisto",
+  "cast_description": "Määritä saatavilla olevat suoratoistopalvelut",
   "change_date": "Vaihda päiväys",
   "change_description": "Muuta kuvausta",
   "change_display_order": "Muuta näyttöjärjestystä",
@@ -641,6 +666,7 @@
   "confirm_password": "Vahvista salasana",
   "confirm_tag_face": "Haluatko merkitä nämä kasvot nimellä {name}?",
   "confirm_tag_face_unnamed": "Merkitäänkö nämä kasvot?",
+  "connected_device": "Yhdistetty laite",
   "connected_to": "Yhdistetty",
   "contain": "Mahduta",
   "context": "Konteksti",
@@ -693,6 +719,7 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Tumma",
+  "dark_theme": "Vaihda tumma teema",
   "date_after": "Päivämäärän jälkeen",
   "date_and_time": "Päivämäärä ja aika",
   "date_before": "Päivä ennen",
@@ -708,6 +735,7 @@
   "default_locale": "Oletuskieliasetus",
   "default_locale_description": "Muotoile päivämäärät ja numerot selaimesi kielen mukaan",
   "delete": "Poista",
+  "delete_action_prompt": "{count} poistettu pysyvästi",
   "delete_album": "Poista albumi",
   "delete_api_key_prompt": "Haluatko varmasti poistaa tämän API-avaimen?",
   "delete_dialog_alert": "Nämä kohteet poistetaan pysyvästi Immich:stä ja laitteeltasi",
@@ -740,12 +768,13 @@
   "disallow_edits": "Älä salli muokkauksia",
   "discord": "Discord",
   "discover": "Tutki",
+  "discovered_devices": "Löydetyt laitteet",
   "dismiss_all_errors": "Sivuuta kaikki virheet",
   "dismiss_error": "Sivuuta virhe",
   "display_options": "Näyttöasetukset",
   "display_order": "Näyttöjärjestys",
   "display_original_photos": "Näytä alkuperäiset kuvat",
-  "display_original_photos_setting_description": "Näytä mieluiten alkuperäinen kuva peukalokuvan sijasta kun alkuperäinen aineisto on web-yhteensopiva. Tämä voi aiheuttaa kuvien näyttämisen hitautta.",
+  "display_original_photos_setting_description": "Näytä mieluiten alkuperäinen kuva esikatselukuvan sijasta, kun alkuperäinen kuva on web-yhteensopiva. Tämä voi aiheuttaa kuvien näyttämisen hitautta.",
   "do_not_show_again": "Älä näytä tätä enää",
   "documentation": "Dokumentaatio",
   "done": "Valmis",
@@ -787,6 +816,7 @@
   "edit_key": "Muokkaa avainta",
   "edit_link": "Muokkaa linkkiä",
   "edit_location": "Muokkaa sijaintia",
+  "edit_location_action_prompt": "{count} sijaintia muokattu",
   "edit_location_dialog_title": "Sijainti",
   "edit_name": "Muokkaa nimeä",
   "edit_people": "Muokkaa henkilöitä",
@@ -972,6 +1002,7 @@
   "failed_to_load_assets": "Kohteiden lataus epäonnistui",
   "failed_to_load_folder": "Kansion lataaminen epäonnistui",
   "favorite": "Suosikki",
+  "favorite_action_prompt": "{count} lisätty suosikkeihin",
   "favorite_or_unfavorite_photo": "Suosikki- tai ei-suosikkikuva",
   "favorites": "Suosikit",
   "favorites_page_no_favorites": "Suosikkikohteita ei löytynyt",
@@ -1086,6 +1117,8 @@
   "ios_debug_info_last_sync_at": "Viimeisin synkronisointi {dateTime}",
   "ios_debug_info_no_processes_queued": "Ei taustaprosesseja jonossa",
   "ios_debug_info_no_sync_yet": "Taustasynkronisointia ei ole suoritettu vielä",
+  "ios_debug_info_processes_queued": "{count, plural, one {{count} taustaprosessi jonossa} other {{count} taustaprosessia jonossa}}",
+  "ios_debug_info_processing_ran_at": "Prosessi valmistui {dateTime}",
   "items_count": "{count, plural, one {# kpl} other {# kpl}}",
   "jobs": "Taustatehtävät",
   "keep": "Säilytä",
@@ -1094,6 +1127,9 @@
   "kept_this_deleted_others": "Tämä kohde säilytettiin. {count, plural, one {# asset} other {# assets}} poistettiin",
   "keyboard_shortcuts": "Pikanäppäimet",
   "language": "Kieli",
+  "language_no_results_subtitle": "Yritä säätää hakuehtoja",
+  "language_no_results_title": "Kieliä ei löydetty",
+  "language_search_hint": "Etsi kieliä...",
   "language_setting_description": "Valitse suosimasi kieli",
   "last_seen": "Viimeksi nähty",
   "latest_version": "Viimeisin versio",
@@ -1119,6 +1155,7 @@
   "list": "Lista",
   "loading": "Ladataan",
   "loading_search_results_failed": "Hakutulosten lataaminen epäonnistui",
+  "local_asset_cast_failed": "Kohdetta, joka ei ole ladattuna palvelimelle, ei voida striimata",
   "local_network": "Lähiverkko",
   "local_network_sheet_info": "Sovellus muodostaa yhteyden palvelimeen tämän URL-osoitteen kautta, kun käytetään määritettyä Wi-Fi-verkkoa",
   "location_permission": "Sijainnin käyttöoikeus",
@@ -1132,6 +1169,7 @@
   "locked_folder": "Lukittu kansio",
   "log_out": "Kirjaudu ulos",
   "log_out_all_devices": "Kirjaudu ulos kaikilta laitteilta",
+  "logged_in_as": "Kirjautunut käyttäjänä {user}",
   "logged_out_all_devices": "Kaikki laitteet kirjattu ulos",
   "logged_out_device": "Laite kirjattu ulos",
   "login": "Kirjaudu",
@@ -1220,13 +1258,14 @@
   "merged_people_count": "{count, plural, one {# Henkilö} other {# henkilöä}} yhdistetty",
   "minimize": "PIenennä",
   "minute": "Minuutti",
-  "missing": "Puuttuu",
+  "missing": "Puuttuvat",
   "model": "Malli",
   "month": "Kuukauden mukaan",
   "monthly_title_text_date_format": "MMMM y",
   "more": "Enemmän",
   "move": "Siirrä",
   "move_off_locked_folder": "Siirrä pois lukitusta kansiosta",
+  "move_to_lock_folder_action_prompt": "{count} lisätty lukittuun kansioon",
   "move_to_locked_folder": "Siirrä lukittuun kansioon",
   "move_to_locked_folder_confirmation": "Nämä kuvat ja videot poistetaan kaikista albumeista, ja ne ovat nähtävissä vain lukitussa kansiossa",
   "moved_to_archive": "Siirretty {count, plural, one {# kohde} other {# kohdetta}} arkistoon",
@@ -1259,6 +1298,7 @@
   "no_archived_assets_message": "Arkistoi kuvia ja videoita piilottaaksesi ne kuvat näkymästä",
   "no_assets_message": "NAPAUTA LATAAKSESI ENSIMMÄISEN KUVASI",
   "no_assets_to_show": "Ei näytettäviä kohteita",
+  "no_cast_devices_found": "Cast-laitteita ei löytynyt",
   "no_duplicates_found": "Kaksoiskappaleita ei löytynyt.",
   "no_exif_info_available": "EXIF-tietoa ei saatavilla",
   "no_explore_results_message": "Lataa lisää kuvia tutkiaksesi kokoelmaasi.",
@@ -1291,8 +1331,11 @@
   "oldest_first": "Vanhin ensin",
   "on_this_device": "Laitteella",
   "onboarding": "Käyttöönotto",
-  "onboarding_privacy_description": "Seuraavat (valinnaiset) ominaisuudet perustuvat ulkoisiin palveluihin, ja ne voidaan poistaa käytöstä milloin tahansa hallinta asetuksista.",
+  "onboarding_locale_description": "Valitse haluamasi kieli. Voit muuttaa kieliasetuksia myöhemmin asetuksista.",
+  "onboarding_privacy_description": "Seuraavat (valinnaiset) ominaisuudet perustuvat ulkoisiin palveluihin ja ne voidaan milloin tahansa poistaa käytöstä asetuksista.",
+  "onboarding_server_welcome_description": "Määritellään seuraavaksi järjestelmäsi muutamalla yleisellä asetuksella.",
   "onboarding_theme_description": "Valitse väriteema istunnollesi. Voit muuttaa tämän myöhemmin asetuksistasi.",
+  "onboarding_user_welcome_description": "Aloitetaan!",
   "onboarding_welcome_user": "Tervetuloa {user}",
   "online": "Online",
   "only_favorites": "Vain suosikit",
@@ -1392,7 +1435,7 @@
   "previous_or_next_photo": "Kuva seuraava/edellinen",
   "previous_or_next_year": "Vuosi seuraava/edellinen",
   "primary": "Ensisijainen",
-  "privacy": "Yksityisyys",
+  "privacy": "Tietosuoja",
   "profile": "Profiili",
   "profile_drawer_app_logs": "Lokit",
   "profile_drawer_client_out_of_date_major": "Sovelluksen mobiiliversio on vanhentunut. Päivitä viimeisimpään merkittävään versioon.",
@@ -1472,12 +1515,15 @@
   "remove_custom_date_range": "Poista aikaväliltä",
   "remove_deleted_assets": "Poista Offline-tiedostot",
   "remove_from_album": "Poista albumista",
+  "remove_from_album_action_prompt": "{count} poistettu albumista",
   "remove_from_favorites": "Poista suosikeista",
+  "remove_from_lock_folder_action_prompt": "{count} poistettu lukitusta albumista",
   "remove_from_locked_folder": "Poista lukitusta kansiosta",
   "remove_from_locked_folder_confirmation": "Haluatko varmasti siirtää nämä kuvat ja videot pois lukitusta kansiosta? Ne näkyvät sen jälkeen kirjastossasi.",
   "remove_from_shared_link": "Poista jakolinkistä",
   "remove_memory": "Tyhjennä muisti",
   "remove_photo_from_memory": "Poista kuva muistista",
+  "remove_tag": "Poista tunniste",
   "remove_url": "Poista URL",
   "remove_user": "Poista käyttäjä",
   "removed_api_key": "API-avain {name} poistettu",
@@ -1584,6 +1630,7 @@
   "select_album_cover": "Valitse albmin kansi",
   "select_all": "Valitse kaikki",
   "select_all_duplicates": "Valitse kaikki kaksoiskappaleet",
+  "select_all_in": "Valitse kaikki {group}",
   "select_avatar_color": "Valitse avatarin väri",
   "select_face": "Valitse kasvo",
   "select_featured_photo": "Valitse esittelykuva",
@@ -1604,6 +1651,7 @@
   "server_info_box_server_url": "Palvelimen URL-osoite",
   "server_offline": "Palvelin Offline-tilassa",
   "server_online": "Palvelin Online-tilassa",
+  "server_privacy": "Palvelimen tietosuoja",
   "server_stats": "Palvelimen tilastot",
   "server_version": "Palvelimen versio",
   "set": "Aseta",
@@ -1613,6 +1661,7 @@
   "set_date_of_birth": "Aseta syntymäaika",
   "set_profile_picture": "Aseta profiilikuva",
   "set_slideshow_to_fullscreen": "Näytä diaesitys koko ruudulla",
+  "set_stack_primary_asset": "Aseta pääkohteeksi",
   "setting_image_viewer_help": "Kuvaa katseltaessa ensin ladataan pikkukuva, sitten keskilaatuinen pikkukuva (jos käytössä) ja lopuksi alkuperäinen (jos käytössä).",
   "setting_image_viewer_original_subtitle": "Ota käyttöön ladataksesi alkuperäinen täysitarkkuuksinen kuva (suuri!). Poista käytöstä vähentääksesi datan käyttöä (sekä verkossa että laitteen välimuistissa).",
   "setting_image_viewer_original_title": "Lataa alkuperäinen kuva",
@@ -1750,6 +1799,7 @@
   "start_date": "Alkupäivä",
   "state": "Maakunta",
   "status": "Tila",
+  "stop_casting": "Lopeta suoratoisto",
   "stop_motion_photo": "Pysäytä liikkuva kuva",
   "stop_photo_sharing": "Lopetetaanko kuvien jakaminen?",
   "stop_photo_sharing_description": "{partner} ei enää pääse kuviisi.",
@@ -1769,7 +1819,7 @@
   "sync_albums": "Synkronoi albumit",
   "sync_albums_manual_subtitle": "Synkronoi kaikki ladatut videot ja valokuvat valittuihin varmuuskopioalbumeihin",
   "sync_upload_album_setting_subtitle": "Luo ja lataa valokuvasi ja videosi valittuihin albumeihin Immichissä",
-  "tag": "Lisää tunniste",
+  "tag": "Tunniste",
   "tag_assets": "Lisää tunnisteita",
   "tag_created": "Luotu tunniste: {tag}",
   "tag_feature_description": "Selaa valokuvia ja videoita, jotka on ryhmitelty loogisten tunnisteotsikoiden mukaan",
@@ -1810,6 +1860,7 @@
   "total": "Yhteensä",
   "total_usage": "Käyttö yhteensä",
   "trash": "Roskakori",
+  "trash_action_prompt": "{count} siirretty roskakoriin",
   "trash_all": "Vie kaikki roskakoriin",
   "trash_count": "Roskakori {count, number}",
   "trash_delete_asset": "Poista / vie roskakoriin",
@@ -1827,8 +1878,11 @@
   "unable_to_change_pin_code": "PIN-koodin vaihtaminen epäonnistui",
   "unable_to_setup_pin_code": "PIN-koodin määrittäminen epäonnistui",
   "unarchive": "Palauta arkistosta",
+  "unarchive_action_prompt": "{count} poistettu arkistosta",
   "unarchived_count": "{count, plural, other {# poistettu arkistosta}}",
+  "undo": "Kumoa",
   "unfavorite": "Poista suosikeista",
+  "unfavorite_action_prompt": "{count} poistettu suosikeista",
   "unhide_person": "Poista henkilö piilosta",
   "unknown": "Tuntematon",
   "unknown_country": "Tuntematon maa",
@@ -1844,8 +1898,10 @@
   "unsaved_change": "Tallentamaton muutos",
   "unselect_all": "Poista valinnat",
   "unselect_all_duplicates": "Poista kaikkien kaksoiskappaleiden valinta",
+  "unselect_all_in": "Poista kaikki valinnat {group}",
   "unstack": "Pura pino",
   "unstacked_assets_count": "Poistettu pinosta {count, plural, one {# kohde} other {# kohdetta}}",
+  "untagged": "Ilman tunnistetta",
   "up_next": "Seuraavaksi",
   "updated_at": "Päivitetty",
   "updated_password": "Salasana päivitetty",
@@ -1861,7 +1917,7 @@
   "upload_status_uploaded": "Ladattu",
   "upload_success": "Lataus onnistui. Päivitä sivu jotta näet latauksesi.",
   "upload_to_immich": "Lähetä Immichiin ({count})",
-  "uploading": "Lähettään",
+  "uploading": "Lähettää",
   "url": "URL",
   "usage": "Käyttö",
   "use_biometric": "Käytä biometriikkaa",
@@ -1873,6 +1929,7 @@
   "user_liked": "{user} tykkäsi {type, select, photo {kuvasta} video {videosta} asset {mediasta} other {tästä}}",
   "user_pin_code_settings": "PIN-koodi",
   "user_pin_code_settings_description": "Hallinnoi PIN-koodiasi",
+  "user_privacy": "Käyttäjän tietosuoja",
   "user_purchase_settings": "Osta",
   "user_purchase_settings_description": "Hallitse ostostasi",
   "user_role_set": "Tee käyttäjästä {user} {role}",
diff --git a/i18n/fil.json b/i18n/fil.json
index 12e74f7bad..12e6086064 100644
--- a/i18n/fil.json
+++ b/i18n/fil.json
@@ -14,10 +14,13 @@
   "add_a_location": "Dagdagan ng lugar",
   "add_a_name": "Dagdagan ng pangalan",
   "add_a_title": "Dagdagan ng pamagat",
+  "add_endpoint": "Dagdagan ng dulo",
   "add_location": "Magdagdag ng lugar",
   "add_more_users": "Magdagdag ng mga user",
   "add_partner": "Magdagdag ng kasangga",
+  "add_path": "Magdagdag ng path",
   "add_photos": "Magdagdag ng litrato",
+  "add_tag": "Magdagdag ng tag",
   "add_to": "Idagdag sa…",
   "add_to_album": "Idagdag sa album",
   "add_to_album_bottom_sheet_added": "Naidagdag sa {album}",
diff --git a/i18n/fr.json b/i18n/fr.json
index bf57469944..cebd4b694f 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -17,7 +17,7 @@
   "add_endpoint": "Ajouter une adresse",
   "add_exclusion_pattern": "Ajouter un schéma d'exclusion",
   "add_import_path": "Ajouter un chemin à importer",
-  "add_location": "Ajouter un lieu",
+  "add_location": "Ajouter une localisation",
   "add_more_users": "Ajouter plus d'utilisateurs",
   "add_partner": "Ajouter un partenaire",
   "add_path": "Ajouter un chemin",
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Gestion des paramètres de métadonnées",
     "migration_job": "Migration",
     "migration_job_description": "Migration des miniatures pour les médias et les visages vers la dernière structure de dossiers",
+    "nightly_tasks_cluster_faces_setting_description": "Démarrer la reconnaissance faciale sur les visages nouvellement détectés",
+    "nightly_tasks_cluster_new_faces_setting": "Regrouper les nouveaux visages",
+    "nightly_tasks_database_cleanup_setting": "Tâches de nettoyage de la base de données",
+    "nightly_tasks_database_cleanup_setting_description": "Nettoyage ancien, données de la base de données expirées",
+    "nightly_tasks_generate_memories_setting": "Générer les souvenirs",
+    "nightly_tasks_generate_memories_setting_description": "Créer des souvenirs à partir des éléments",
+    "nightly_tasks_missing_thumbnails_setting": "Générer les miniatures manquantes",
+    "nightly_tasks_missing_thumbnails_setting_description": "Mettre en file d'attente les éléments sans miniature pour la création de miniature",
+    "nightly_tasks_settings": "Paramètres des tâches de nuit",
+    "nightly_tasks_settings_description": "Gérer les tâches de nuit",
+    "nightly_tasks_start_time_setting": "Heure de démarrage",
+    "nightly_tasks_start_time_setting_description": "Heure à laquelle le serveur commence à exécuter les tâches de nuit",
+    "nightly_tasks_sync_quota_usage_setting": "Synchroniser les quota d'usage",
+    "nightly_tasks_sync_quota_usage_setting_description": "Mettre à jour les quota d'usage de l'utilisateur, en se basant sur l'utilisation actuelle",
     "no_paths_added": "Aucun chemin n'a été ajouté",
     "no_pattern_added": "Aucun schéma d'exclusion n'a été ajouté",
     "note_apply_storage_label_previous_assets": "Remarque : pour appliquer l'étiquette de stockage à des médias précédemment envoyés, exécutez",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "URI de redirection mobile",
     "oauth_mobile_redirect_uri_override": "Remplacer l'URI de redirection mobile",
     "oauth_mobile_redirect_uri_override_description": "Activer quand le fournisseur d'OAuth ne permet pas un URI mobile, comme ''{callback}''",
+    "oauth_role_claim": "Attribut de rôle",
+    "oauth_role_claim_description": "Donne automatiquement un accès en tant qu'admin, en se basant sur la présence de cet attribut. L'attribut peut avoir soit 'user' (utilisateur) soit 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Gérer les paramètres de connexion OAuth",
     "oauth_settings_more_details": "Pour plus de détails sur cette fonctionnalité, consultez <link>ce lien</link>.",
@@ -244,7 +260,7 @@
     "storage_template_migration_info": "L'enregistrement des modèles va convertir toutes les extensions en minuscule. Les changements de modèle ne s'appliqueront qu'aux nouveaux médias. Pour appliquer rétroactivement le modèle aux médias précédemment envoyés, exécutez la tâche <link>{job}</link>.",
     "storage_template_migration_job": "Tâche de migration du modèle de stockage",
     "storage_template_more_details": "Pour plus de détails sur cette fonctionnalité, reportez-vous au <template-link>Modèle de stockage</template-link> et à ses <implications-link>implications</implications-link>",
-    "storage_template_onboarding_description_v2": "Quand elle est activée, cette fonctionnalité organise automatiquement les fichiers, sur base d'un modèle défini par l'utilisateur. Pour plus d'informations, se répéter à la <link>documentation</link>.",
+    "storage_template_onboarding_description_v2": "Quand elle est activée, cette fonctionnalité organise automatiquement les fichiers, sur base d'un modèle défini par l'utilisateur. Pour plus d'informations, se référer à la <link>documentation</link>.",
     "storage_template_path_length": "Limite approximative de la longueur du chemin : <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Modèle de stockage",
     "storage_template_settings_description": "Gérer la structure des dossiers et le nom des fichiers du média envoyé",
@@ -357,10 +373,12 @@
   "admin_password": "Mot de passe Admin",
   "administration": "Administration",
   "advanced": "Avancé",
+  "advanced_settings_beta_timeline_subtitle": "Essayer la nouvelle application",
+  "advanced_settings_beta_timeline_title": "Timeline de la béta",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Utilisez cette option pour filtrer les média durant la synchronisation avec des critères alternatifs. N'utilisez cela que lorsque l'application n'arrive pas à détecter tout les albums.",
   "advanced_settings_enable_alternate_media_filter_title": "[EXPÉRIMENTAL] Utiliser le filtre de synchronisation d'album alternatif",
   "advanced_settings_log_level_title": "Niveau de journalisation : {level}",
-  "advanced_settings_prefer_remote_subtitle": "Certains appareils sont très lents à charger des miniatures à partir de ressources présentes sur l'appareil. Activez ce paramètre pour charger des images externes à la place.",
+  "advanced_settings_prefer_remote_subtitle": "Certains appareils sont très lents à charger des miniatures à partir de ressources locales. Activez ce paramètre pour charger des images externes à la place.",
   "advanced_settings_prefer_remote_title": "Préférer les images externes",
   "advanced_settings_proxy_headers_subtitle": "Ajoutez des en-têtes personnalisés à chaque requête réseau",
   "advanced_settings_proxy_headers_title": "En-têtes de proxy",
@@ -413,8 +431,8 @@
   "all_videos": "Toutes les vidéos",
   "allow_dark_mode": "Autoriser le mode sombre",
   "allow_edits": "Autoriser les modifications",
-  "allow_public_user_to_download": "Permettre aux utilisateurs non connectés de télécharger",
-  "allow_public_user_to_upload": "Autoriser l'envoi aux utilisateurs non connectés",
+  "allow_public_user_to_download": "Permettre le téléchargement par des utilisateurs non connectés",
+  "allow_public_user_to_upload": "Permettre l'envoi par des utilisateurs non connectés",
   "alt_text_qr_code": "Image du code QR",
   "anti_clockwise": "Sens anti-horaire",
   "api_key": "Clé API",
@@ -427,6 +445,7 @@
   "app_settings": "Paramètres de l'application",
   "appears_in": "Apparaît dans",
   "archive": "Archiver",
+  "archive_action_prompt": "{count} ajouté(s) à l'archive",
   "archive_or_unarchive_photo": "Archiver ou désarchiver une photo",
   "archive_page_no_archived_assets": "Aucun élément archivé n'a été trouvé",
   "archive_page_title": "Archiver ({count})",
@@ -464,7 +483,6 @@
   "assets": "Médias",
   "assets_added_count": "{count, plural, one {# média ajouté} other {# médias ajoutés}}",
   "assets_added_to_album_count": "{count, plural, one {# média ajouté} other {# médias ajoutés}} à l'album",
-  "assets_added_to_name_count": "{count, plural, one {# média ajouté} other {# médias ajoutés}} à {hasName, select, true {<b>{name}</b>} other {new album}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Le média ne peut pas être ajouté} other {Les médias ne peuvent pas être ajoutés}} à l'album",
   "assets_count": "{count, plural, one {# média} other {# médias}}",
   "assets_deleted_permanently": "{count} média(s) supprimé(s) définitivement",
@@ -703,7 +721,7 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Sombre",
-  "darkTheme": "Basculer sur le thème sombre",
+  "dark_theme": "Activer le thème sombre",
   "date_after": "Date après",
   "date_and_time": "Date et heure",
   "date_before": "Date avant",
@@ -719,6 +737,7 @@
   "default_locale": "Région par défaut",
   "default_locale_description": "Afficher les dates et nombres en fonction des paramètres de votre navigateur",
   "delete": "Supprimer",
+  "delete_action_prompt": "{count} supprimé(s) définitivement",
   "delete_album": "Supprimer l'album",
   "delete_api_key_prompt": "Voulez-vous vraiment supprimer cette clé API ?",
   "delete_dialog_alert": "Ces médias seront définitivement supprimés de Immich et de votre appareil",
@@ -732,6 +751,7 @@
   "delete_key": "Supprimer la clé",
   "delete_library": "Supprimer la bibliothèque",
   "delete_link": "Supprimer le lien",
+  "delete_local_action_prompt": "{count} supprimé(s) localement",
   "delete_local_dialog_ok_backed_up_only": "Suppression des données sauvegardées uniquement",
   "delete_local_dialog_ok_force": "Supprimer tout de même",
   "delete_others": "Supprimer les autres",
@@ -762,6 +782,7 @@
   "documentation": "Documentation",
   "done": "Terminé",
   "download": "Télécharger",
+  "download_action_prompt": "Téléchargement de {count} éléments",
   "download_canceled": "Téléchargement annulé",
   "download_complete": "Téléchargement terminé",
   "download_enqueue": "Téléchargement en attente",
@@ -799,6 +820,7 @@
   "edit_key": "Modifier la clé",
   "edit_link": "Modifier le lien",
   "edit_location": "Modifier la localisation",
+  "edit_location_action_prompt": "{count} localisation(s) mise(s) à jour",
   "edit_location_dialog_title": "Localisation",
   "edit_name": "Modifier le nom",
   "edit_people": "Modifier les personnes",
@@ -984,6 +1006,7 @@
   "failed_to_load_assets": "Échec du chargement des ressources",
   "failed_to_load_folder": "Échec de chargement du dossier",
   "favorite": "Favori",
+  "favorite_action_prompt": "{count} ajouté(s) aux Favoris",
   "favorite_or_unfavorite_photo": "Ajouter ou supprimer des favoris",
   "favorites": "Favoris",
   "favorites_page_no_favorites": "Aucun élément favori n'a été trouvé",
@@ -1036,7 +1059,7 @@
   "hide_password": "Masquer le mot de passe",
   "hide_person": "Masquer la personne",
   "hide_unnamed_people": "Cacher les personnes non nommées",
-  "home_page_add_to_album_conflicts": "{added} éléments ajoutés à l'album {album}. Les éléments {failed} sont déjà dans l'album.",
+  "home_page_add_to_album_conflicts": "{added} éléments ajoutés à l'album {album}. {failed} éléments sont déjà dans l'album.",
   "home_page_add_to_album_err_local": "Impossible d'ajouter des médias locaux aux albums, ils sont ignorés",
   "home_page_add_to_album_success": "{added} éléments ajoutés à l'album {album}.",
   "home_page_album_err_partner": "Impossible d'ajouter des médias d'un partenaire à un album, ils sont ignorés",
@@ -1127,6 +1150,7 @@
   "library_page_sort_created": "Créations les plus récentes",
   "library_page_sort_last_modified": "Dernière modification",
   "library_page_sort_title": "Titre de l'album",
+  "licenses": "Licences",
   "light": "Clair",
   "like_deleted": "Réaction « j'aime » supprimée",
   "link_motion_video": "Lier la photo animée",
@@ -1246,6 +1270,7 @@
   "more": "Plus",
   "move": "Déplacer",
   "move_off_locked_folder": "Déplacer en dehors du dossier verrouillé",
+  "move_to_lock_folder_action_prompt": "{count} ajouté(s) au dossier verrouillé",
   "move_to_locked_folder": "Déplacer dans le dossier verrouillé",
   "move_to_locked_folder_confirmation": "Ces photos et vidéos seront retirés de tout les albums et ne seront visibles que dans le dossier verrouillé",
   "moved_to_archive": "{count, plural, one {# élément déplacé} other {# éléments déplacés}} vers les archives",
@@ -1390,7 +1415,7 @@
   "photos_and_videos": "Photos et vidéos",
   "photos_count": "{count, plural, one {{count, number} Photo} other {{count, number} Photos}}",
   "photos_from_previous_years": "Photos des années précédentes",
-  "pick_a_location": "Choisissez un lieu",
+  "pick_a_location": "Choisissez une localisation",
   "pin_code_changed_successfully": "Code PIN changé avec succès",
   "pin_code_reset_successfully": "Réinitialisation du code PIN réussie",
   "pin_code_setup_successfully": "Définition du code PIN réussie",
@@ -1495,7 +1520,9 @@
   "remove_custom_date_range": "Supprimer la plage de date personnalisée",
   "remove_deleted_assets": "Supprimer les fichiers hors ligne",
   "remove_from_album": "Supprimer de l'album",
+  "remove_from_album_action_prompt": "{count} supprimé(s) de l'album",
   "remove_from_favorites": "Supprimer des favoris",
+  "remove_from_lock_folder_action_prompt": "{count} supprimé(s) du dossier verrouillé",
   "remove_from_locked_folder": "Supprimer du dossier verrouillé",
   "remove_from_locked_folder_confirmation": "Êtes vous sûr de vouloir déplacer ces photos et vidéos en dehors du dossier verrouillé ? Elles seront visibles dans votre galerie.",
   "remove_from_shared_link": "Supprimer des liens partagés",
@@ -1510,7 +1537,7 @@
   "removed_from_favorites_count": "{count, plural, one {# supprimé} other {# supprimés}} des favoris",
   "removed_memory": "Souvenir supprimé",
   "removed_photo_from_memory": "Photo supprimée du souvenir",
-  "removed_tagged_assets": "Tag supprimé de {count, plural, one {# média} other {# médias}}",
+  "removed_tagged_assets": "Étiquette supprimée de {count, plural, one {# média} other {# médias}}",
   "rename": "Renommer",
   "repair": "Réparer",
   "repair_no_results_message": "Les fichiers non importés ou absents s'afficheront ici",
@@ -1566,8 +1593,8 @@
   "search_filter_display_option_not_in_album": "Pas dans un album",
   "search_filter_display_options": "Options d'affichage",
   "search_filter_filename": "Recherche par nom de fichier",
-  "search_filter_location": "Lieu",
-  "search_filter_location_title": "Sélectionner un lieu",
+  "search_filter_location": "Localisation",
+  "search_filter_location_title": "Sélectionner une localisation",
   "search_filter_media_type": "Type de média",
   "search_filter_media_type_title": "Sélectionner type de média",
   "search_filter_people_title": "Sélectionner une personne",
@@ -1667,6 +1694,7 @@
   "settings_saved": "Paramètres sauvegardés",
   "setup_pin_code": "Définir un code PIN",
   "share": "Partager",
+  "share_action_prompt": "{count} éléments partagés",
   "share_add_photos": "Ajouter des photos",
   "share_assets_selected": "{count} sélectionné(s)",
   "share_dialog_preparing": "Préparation...",
@@ -1768,6 +1796,7 @@
   "sort_title": "Titre",
   "source": "Source",
   "stack": "Empiler",
+  "stack_action_prompt": "{count} groupé(s)",
   "stack_duplicates": "Empiler les doublons",
   "stack_select_one_photo": "Sélectionnez une photo principale pour la pile",
   "stack_selected_photos": "Empiler les photos sélectionnées",
@@ -1838,6 +1867,7 @@
   "total": "Total",
   "total_usage": "Utilisation globale",
   "trash": "Corbeille",
+  "trash_action_prompt": "{count} mis à la corbeille",
   "trash_all": "Tout supprimer",
   "trash_count": "Corbeille {count, number}",
   "trash_delete_asset": "Mettre à la corbeille/Supprimer un média",
@@ -1855,9 +1885,11 @@
   "unable_to_change_pin_code": "Impossible de changer le code PIN",
   "unable_to_setup_pin_code": "Impossible de définir le code PIN",
   "unarchive": "Désarchiver",
+  "unarchive_action_prompt": "{count} supprimé(s) de l'archive",
   "unarchived_count": "{count, plural, one {# supprimé} other {# supprimés}} de l'archive",
   "undo": "Annuler",
   "unfavorite": "Enlever des favoris",
+  "unfavorite_action_prompt": "{count} supprimé(s) des favoris",
   "unhide_person": "Afficher la personne",
   "unknown": "Inconnu",
   "unknown_country": "Pays non connu",
@@ -1875,7 +1907,9 @@
   "unselect_all_duplicates": "Désélectionner tous les doublons",
   "unselect_all_in": "Tout désélectionner dans {group}",
   "unstack": "Désempiler",
+  "unstack_action_prompt": "{count} non groupés",
   "unstacked_assets_count": "{count, plural, one {# média dépilé} other {# médias dépilés}}",
+  "untagged": "Étiquette supprimée",
   "up_next": "Suite",
   "updated_at": "Mis à jour à",
   "updated_password": "Mot de passe mis à jour",
@@ -1912,6 +1946,7 @@
   "user_usage_stats_description": "Voir les statistiques d'utilisation du compte",
   "username": "Nom d'utilisateur",
   "users": "Utilisateurs",
+  "users_added_to_album_count": "{count, plural, one {# utilisateur ajouté} other {# utilisateurs ajoutés}} à l'album",
   "utilities": "Utilitaires",
   "validate": "Valider",
   "validate_endpoint_error": "Merci d'entrer un lien valide",
diff --git a/i18n/gl.json b/i18n/gl.json
index 558cc48900..70146abb53 100644
--- a/i18n/gl.json
+++ b/i18n/gl.json
@@ -455,7 +455,6 @@
   "assets": "Activos",
   "assets_added_count": "Engadido {count, plural, one {# activo} other {# activos}}",
   "assets_added_to_album_count": "Engadido {count, plural, one {# activo} other {# activos}} ao álbum",
-  "assets_added_to_name_count": "Engadido {count, plural, one {# activo} other {# activos}} a {hasName, select, true {<b>{name}</b>} other {novo álbum}}",
   "assets_count": "{count, plural, one {# activo} other {# activos}}",
   "assets_deleted_permanently": "{count} activo(s) eliminado(s) permanentemente",
   "assets_deleted_permanently_from_server": "{count} activo(s) eliminado(s) permanentemente do servidor Immich",
diff --git a/i18n/he.json b/i18n/he.json
index 737c307f31..49973dbc63 100644
--- a/i18n/he.json
+++ b/i18n/he.json
@@ -34,6 +34,7 @@
   "added_to_favorites_count": "{count, number} נוספו למועדפים",
   "admin": {
     "add_exclusion_pattern_description": "הוספת דפוסי החרגה. נתמכת התאמת דפוסים באמצעות *, ** ו-?. כדי להתעלם מכל הקבצים בתיקיה כלשהי בשם \"Raw\", יש להשתמש ב \"**/Raw/**\". כדי להתעלם מכל הקבצים המסתיימים ב \"tif.\", יש להשתמש ב \"tif.*/**\". כדי להתעלם מנתיב מוחלט, יש להשתמש ב \"**/נתיב/להתעלמות\".",
+    "admin_user": "מנהל מערכת",
     "asset_offline_description": "תמונה מספרייה חיצונית זו לא נמצאת יותר בדיסק והועברה לאשפה. אם הקובץ הועבר מתוך הספרייה, נא לבדוק את ציר הזמן שלך עבור התמונה המקבילה החדש. כדי לשחזר תמונה זו, נא לוודא ש-Immich יכול לגשת אל נתיב הקובץ למטה ולסרוק מחדש את הספרייה.",
     "authentication_settings": "הגדרות התחברות",
     "authentication_settings_description": "ניהול סיסמה, OAuth, והגדרות התחברות אחרות",
@@ -165,6 +166,20 @@
     "metadata_settings_description": "ניהול הגדרות מטא-נתונים",
     "migration_job": "העברה",
     "migration_job_description": "העבר תמונות ממוזערות של תמונות ופנים למבנה התיקיות העדכני ביותר",
+    "nightly_tasks_cluster_faces_setting_description": "בצע זיהוי פנים עבור פרצופים שזוהו לאחרונה",
+    "nightly_tasks_cluster_new_faces_setting": "קבץ פנים חדשות",
+    "nightly_tasks_database_cleanup_setting": "משימות תחזוקה וניקוי של מסד הנתונים",
+    "nightly_tasks_database_cleanup_setting_description": "נקה נתונים ישנים שפג תוקפם ממסד הנתונים",
+    "nightly_tasks_generate_memories_setting": "יצירת זכרונות",
+    "nightly_tasks_generate_memories_setting_description": "צור זכרונות חדשים מהתמונות שלך",
+    "nightly_tasks_missing_thumbnails_setting": "צור תמונות ממוזערות חסרות",
+    "nightly_tasks_missing_thumbnails_setting_description": "הוסף לתור קבצים ללא תמונות ממוזערות ליצירה של תמונות ממוזערות",
+    "nightly_tasks_settings": "הגדרות של משימות ליליות",
+    "nightly_tasks_settings_description": "נהל משימות ליליות",
+    "nightly_tasks_start_time_setting": "זמן התחלה",
+    "nightly_tasks_start_time_setting_description": "השעה שבה השרת מתחיל להריץ את המשימות הליליות",
+    "nightly_tasks_sync_quota_usage_setting": "סנכרן את השימוש באחסון",
+    "nightly_tasks_sync_quota_usage_setting_description": "עדכן את מכסת האחסון של המשתמש בהתאם לשימוש הנוכחי",
     "no_paths_added": "לא נוספו נתיבים",
     "no_pattern_added": "לא נוספה תבנית",
     "note_apply_storage_label_previous_assets": "הערה: כדי להחיל את תווית האחסון על תמונות שהועלו בעבר, הפעל את",
@@ -203,7 +218,7 @@
     "oauth_storage_quota_claim": "דרישת מכסת אחסון",
     "oauth_storage_quota_claim_description": "הגדר אוטומטית את מכסת האחסון של המשתמש לערך של דרישה זו.",
     "oauth_storage_quota_default": "מכסת אחסון ברירת מחדל (GiB)",
-    "oauth_storage_quota_default_description": "מכסה ב-GiB לשימוש כאשר לא מסופקת דרישה (הזן 0 עבור מכסה בלתי מוגבלת).",
+    "oauth_storage_quota_default_description": "מכסה ב-GiB לשימוש כאשר לא מסופקת דרישה.",
     "oauth_timeout": "הבקשה נכשלה – הזמן הקצוב הסתיים",
     "oauth_timeout_description": "זמן קצוב לבקשות (במילישניות)",
     "password_enable_description": "התחבר עם דוא\"ל וסיסמה",
@@ -243,6 +258,7 @@
     "storage_template_migration_info": "תבנית האחסון תמיר את כל ההרחבות לאותיות קטנות. שינויים בתבנית יחולו רק על תמונות חדשות. כדי להחיל באופן רטרואקטיבי את התבנית על תמונות שהועלו בעבר, הפעל את <link>{job}</link>.",
     "storage_template_migration_job": "משימת העברת תבנית אחסון",
     "storage_template_more_details": "לפרטים נוספים אודות תכונה זו, עיין ב<template-link>תבנית האחסון</template-link> וב<implications-link>השלכותיה</implications-link>",
+    "storage_template_onboarding_description_v2": "כאשר פיצ’ר זה מופעל, הקבצים יאורגנו אוטומטית לפי תבנית שהוגדרה על ידי המשתמש. למידע נוסף, עיין ב־<link>תיעוד</link>.",
     "storage_template_path_length": "מגבלת אורך נתיב משוערת: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "תבנית אחסון",
     "storage_template_settings_description": "ניהול מבנה התיקיות ואת שם הקובץ של התמונה שהועלתה",
@@ -425,6 +441,7 @@
   "app_settings": "הגדרות יישום",
   "appears_in": "מופיע ב",
   "archive": "ארכיון",
+  "archive_action_prompt": "{count} נוספו לארכיון",
   "archive_or_unarchive_photo": "העבר תמונה לארכיון או הוצא אותה משם",
   "archive_page_no_archived_assets": "לא נמצאו תמונות בארכיון",
   "archive_page_title": "בארכיון ({count})",
@@ -462,7 +479,6 @@
   "assets": "תמונות",
   "assets_added_count": "{count, plural, one {נוספה תומנה #} other {נוספו # תמונות}}",
   "assets_added_to_album_count": "{count, plural, one {נוספה תמונה #} other {נוספו # תמונות}} לאלבום",
-  "assets_added_to_name_count": "{count, plural, one {תמונה # נוספה} other {# תמונות נוספו}} אל {hasName, select, true {<b>{name}</b>} other {אלבום חדש}}",
   "assets_cannot_be_added_to_album_count": "לא ניתן להוסיף את ה{count, plural, one {תמונה} other {תמונות}} לאלבום",
   "assets_count": "{count, plural, one {תמונה #} other {# תמונות}}",
   "assets_deleted_permanently": "{count} תמונות נמחקו לצמיתות",
@@ -701,7 +717,7 @@
   "daily_title_text_date": "E, MMM dd",
   "daily_title_text_date_year": "E, MMM dd, yyyy",
   "dark": "כהה",
-  "darkTheme": "החלפה למצב חושך",
+  "dark_theme": "הפעל/כבה מצב כהה",
   "date_after": "תאריך אחרי",
   "date_and_time": "תאריך ושעה",
   "date_before": "תאריך לפני",
@@ -711,12 +727,13 @@
   "day": "יום",
   "deduplicate_all": "ביטול כל הכפילויות",
   "deduplication_criteria_1": "גודל תמונה בבתים",
-  "deduplication_criteria_2": "ספירת נתוני EXIF",
+  "deduplication_criteria_2": "כמות נתוני EXIF",
   "deduplication_info": "מידע על ביטול כפילויות",
   "deduplication_info_description": "כדי לבחור מראש תמונות באופן אוטומטי ולהסיר כפילויות בכמות גדולה, אנו מסתכלים על:",
   "default_locale": "שפת ברירת מחדל",
   "default_locale_description": "פורמט תאריכים ומספרים מבוסס שפת הדפדפן שלך",
   "delete": "מחק",
+  "delete_action_prompt": "{count} נמחקו לצמיתות",
   "delete_album": "מחק אלבום",
   "delete_api_key_prompt": "האם אתה בטוח שברצונך למחוק מפתח ה-API הזה?",
   "delete_dialog_alert": "הפריטים האלה ימחקו לצמיתות מהשרת ומהמכשיר שלך",
@@ -797,6 +814,7 @@
   "edit_key": "ערוך מפתח",
   "edit_link": "ערוך קישור",
   "edit_location": "ערוך מיקום",
+  "edit_location_action_prompt": "{count} מיקומים נערכו",
   "edit_location_dialog_title": "מיקום",
   "edit_name": "ערוך שם",
   "edit_people": "ערוך אנשים",
@@ -982,6 +1000,7 @@
   "failed_to_load_assets": "טעינת תמונות נכשלה",
   "failed_to_load_folder": "טעינת תיקיה נכשלה",
   "favorite": "מועדף",
+  "favorite_action_prompt": "{count} נוספו למועדפים",
   "favorite_or_unfavorite_photo": "הוסף או הסר תמונה מהמועדפים",
   "favorites": "מועדפים",
   "favorites_page_no_favorites": "לא נמצאו תמונות מועדפים",
@@ -1148,6 +1167,7 @@
   "locked_folder": "תיקיה נעולה",
   "log_out": "התנתק",
   "log_out_all_devices": "התנתק מכל המכשירים",
+  "logged_in_as": "מחובר כ {user}",
   "logged_out_all_devices": "מנותק מכל המכשירים",
   "logged_out_device": "מכשיר מנותק",
   "login": "כניסה",
@@ -1243,6 +1263,7 @@
   "more": "עוד",
   "move": "העבר",
   "move_off_locked_folder": "הוצאה מהתיקייה הנעולה",
+  "move_to_lock_folder_action_prompt": "{count} נוספו לתיקייה הנעולה",
   "move_to_locked_folder": "העבר לתיקיה הנעולה",
   "move_to_locked_folder_confirmation": "התמונות והסרטונים האלו יוסרו מכל האלבומים, ויהיו מוצגים רק בתיקיה הנעולה",
   "moved_to_archive": "{count, plural, one {הועברה תמונה # } other {# תמונות הועברו}} לארכיון",
@@ -1492,7 +1513,9 @@
   "remove_custom_date_range": "הסר טווח תאריכים מותאם",
   "remove_deleted_assets": "הסר קבצים לא מקוונים",
   "remove_from_album": "הסר מאלבום",
+  "remove_from_album_action_prompt": "{count} הוסרו מהאלבום",
   "remove_from_favorites": "הסר מהמועדפים",
+  "remove_from_lock_folder_action_prompt": "{count} הוסרו מהתיקייה הנעולה",
   "remove_from_locked_folder": "הסר מהתיקייה הנעולה",
   "remove_from_locked_folder_confirmation": "האם אתה בטוח שברצונך להעביר את התמונות והסרטונים האלה מחוץ לתיקייה הנעולה? הם יהיו מוצגים בספרייה שלך.",
   "remove_from_shared_link": "הסר מקישור משותף",
@@ -1605,6 +1628,7 @@
   "select_album_cover": "בחר עטיפת אלבום",
   "select_all": "בחר הכל",
   "select_all_duplicates": "בחר את כל הכפילויות",
+  "select_all_in": "בחר הכול בתוך {group}",
   "select_avatar_color": "בחר צבע תמונת פרופיל",
   "select_face": "בחר פנים",
   "select_featured_photo": "בחר תמונה מייצגת",
@@ -1834,6 +1858,7 @@
   "total": "סה\"כ",
   "total_usage": "שימוש כולל",
   "trash": "אשפה",
+  "trash_action_prompt": "{count} הועברו לאשפה",
   "trash_all": "העבר הכל לאשפה",
   "trash_count": "העבר לאשפה {count, number}",
   "trash_delete_asset": "העבר לאשפה/מחק תמונה",
@@ -1851,9 +1876,11 @@
   "unable_to_change_pin_code": "לא ניתן לשנות את קוד ה PIN",
   "unable_to_setup_pin_code": "לא ניתן להגדיר קוד PIN",
   "unarchive": "הוצא מארכיון",
+  "unarchive_action_prompt": "{count} הוסרו מהארכיון",
   "unarchived_count": "{count, plural, other {# הוצאו מהארכיון}}",
   "undo": "לבטל",
   "unfavorite": "לא מועדף",
+  "unfavorite_action_prompt": "{count} הוסרו מהמועדפים",
   "unhide_person": "בטל הסתרת אדם",
   "unknown": "לא ידוע",
   "unknown_country": "מדינה לא ידועה",
@@ -1869,8 +1896,10 @@
   "unsaved_change": "שינוי לא נשמר",
   "unselect_all": "בטל בחירה בהכל",
   "unselect_all_duplicates": "בטל בחירת כל הכפילויות",
+  "unselect_all_in": "בטל את הבחירה של הכל ב {group}",
   "unstack": "בטל ערימה",
   "unstacked_assets_count": "{count, plural, one {תמונה # הוסרה} other {# תמונות הוסרו}} מהערימה",
+  "untagged": "לא מתיוגים",
   "up_next": "הבא בתור",
   "updated_at": "עודכן",
   "updated_password": "סיסמה עודכנה",
diff --git a/i18n/hi.json b/i18n/hi.json
index abb1552154..2cb29370b5 100644
--- a/i18n/hi.json
+++ b/i18n/hi.json
@@ -22,6 +22,7 @@
   "add_partner": "जोड़ीदार डालें",
   "add_path": "पथ डालें",
   "add_photos": "फ़ोटो डालें",
+  "add_tag": "चिह्नित करें",
   "add_to": "इसमें डालें…",
   "add_to_album": "एल्बम में डालें",
   "add_to_album_bottom_sheet_added": "{album} में डालें",
@@ -33,6 +34,7 @@
   "added_to_favorites_count": "पसंदीदा में {count, number} डाला गया",
   "admin": {
     "add_exclusion_pattern_description": "बहिष्करण पैटर्न जोड़ें. *, **, और ? का उपयोग करके ग्लोबिंग करना समर्थित है। \"Raw\" नामक किसी भी निर्देशिका की सभी फ़ाइलों को अनदेखा करने के लिए, \"**/Raw/**\" का उपयोग करें। \".tif\" से समाप्त होने वाली सभी फ़ाइलों को अनदेखा करने के लिए, \"**/*.tif\" का उपयोग करें। किसी पूर्ण पथ को अनदेखा करने के लिए, \"/path/to/ignore/**\" का उपयोग करें।",
+    "admin_user": "व्यवस्थापक उपयोगकर्ता",
     "asset_offline_description": "यह बाहरी लाइब्रेरी एसेट अब डिस्क पर मौजूद नहीं है और इसे ट्रैश में डाल दिया गया है। यदि फ़ाइल को लाइब्रेरी के भीतर कहीं ले जाया गया था, तो नई संबंधित एसेट के लिए अपनी टाइमलाइन देखें। इस एसेट को वापस पाने के लिए, कृपया सुनिश्चित करें कि नीचे दिए गए फ़ाइल पथ को इम्मिच द्वारा एक्सेस किया जा सकता है और फिर लाइब्रेरी को स्कैन करें।",
     "authentication_settings": "प्रमाणीकरण सेटिंग्स",
     "authentication_settings_description": "पासवर्ड, OAuth और अन्य प्रमाणीकरण सेटिंग्स प्रबंधित करें",
diff --git a/i18n/hr.json b/i18n/hr.json
index d2edfc9a8e..35e7aba7e0 100644
--- a/i18n/hr.json
+++ b/i18n/hr.json
@@ -462,7 +462,6 @@
   "assets": "Sredstva",
   "assets_added_count": "Dodano {count, plural, one {# asset} other {# assets}}",
   "assets_added_to_album_count": "Dodano {count, plural, one {# asset} other {# assets}} u album",
-  "assets_added_to_name_count": "Dodano {count, plural, one {# asset} other {# assets}} u {hasName, select, true {<b>{name}</b>} other {new album}}",
   "assets_cannot_be_added_to_album_count": "{count, plural,\n one {Nije moguće dodati medij u album}\n few {Nije moguće dodati # medija u album}\n other {Nije moguće dodati # medija u album}\n}",
   "assets_count": "{count, plural, one {# asset} other {# assets}}",
   "assets_deleted_permanently": "{count} resurs(i) uspješno uklonjeni",
diff --git a/i18n/hu.json b/i18n/hu.json
index 22ec6f22a1..c00fb37224 100644
--- a/i18n/hu.json
+++ b/i18n/hu.json
@@ -22,6 +22,7 @@
   "add_partner": "Partner hozzáadása",
   "add_path": "Elérési útvonal megadása",
   "add_photos": "Fotók hozzáadása",
+  "add_tag": "Címke hozzáadása",
   "add_to": "Hozzáadás ide…",
   "add_to_album": "Felvétel albumba",
   "add_to_album_bottom_sheet_added": "Hozzáadva a(z) \"{album}\" albumhoz",
@@ -33,6 +34,7 @@
   "added_to_favorites_count": "{count, number} hozzáadva a kedvencekhez",
   "admin": {
     "add_exclusion_pattern_description": "Kihagyási minták (pattern) megadása. A *, ** és ? helyettesítő karakterek engedélyezettek. Pl. a \"Raw\" könyvtárban tárolt összes fájl kihagyásához használható a \"**/Raw/**\". Minden \".tif\" fájl kihagyása az összes mappában: \"**/*.tif\". Abszolút elérési útvonal kihagyása: \"/kihagyni/kivant/mappa/**\".",
+    "admin_user": "Admin felhasználó",
     "asset_offline_description": "Ez a külső képtárban lévő elem már nem található, ezért a lomtárba került. Ha a fájl a képtáron belül lett áthelyezve, akkor ellenőrizd, hogy továbbra is látható az idővonaladon. Az elem visszaállításához győződj meg róla, hogy az alábbi mappa az Immich számára elérhető, majd újra fésüld át a képtárat.",
     "authentication_settings": "Hitelesítési beállítások",
     "authentication_settings_description": "Jelszó, OAuth és egyéb hitelesítési beállítások kezelése",
@@ -43,7 +45,7 @@
     "backup_database_enable_description": "Adatbázis mentések engedélyezése",
     "backup_keep_last_amount": "Megőrizendő korábbi mentések száma",
     "backup_settings": "Adatbázis mentés beállításai",
-    "backup_settings_description": "Adatbázis mentés beállításainak kezelése. Megjegyzés: Ezek a feladatok nincsenek felügyelve, így nem kapsz értesítés meghiúsulás esetén.",
+    "backup_settings_description": "Adatbázis mentés beállításainak kezelése.",
     "cleared_jobs": "{job}: feladatai törölve",
     "config_set_by_file": "A konfigurációt jelenleg egy konfigurációs fájl állítja be",
     "confirm_delete_library": "Biztosan ki szeretnéd törölni a {library} képtárat?",
@@ -155,7 +157,7 @@
     "map_settings_description": "Térkép beállítások kezelése",
     "map_style_description": "Egy style.json térképtémára mutató URL cím",
     "memory_cleanup_job": "Memória takarítás",
-    "memory_generate_job": "Emlék generálálsa",
+    "memory_generate_job": "Emlék generálása",
     "metadata_extraction_job": "Metaadatok kinyerése",
     "metadata_extraction_job_description": "Metaadat információk (pl. GPS, arcok és felbontás) kinyerése minden elemből",
     "metadata_faces_import_setting": "Arc importálás engedélyezése",
@@ -169,7 +171,7 @@
     "note_apply_storage_label_previous_assets": "Megjegyzés: Ha a korábban feltöltött elemekhez is szeretne Tárhely Címkéket társítani, akkor futtassa ezt",
     "note_cannot_be_changed_later": "FIGYELEM: ezt később nem lehet megváltoztatni!",
     "notification_email_from_address": "Feladó cím",
-    "notification_email_from_address_description": "Küldő email címe, például: \"Immich Fotószerver <noreply@example.com>\"",
+    "notification_email_from_address_description": "Küldő email címe, például: \"Immich Fotószerver <noreply@example.com>\". Figyelj hogy olyan címet adj meg ahonnan az email küldés engedélyezett.",
     "notification_email_host_description": "Email szerver kiszolgálója (pl. smtp.immich.app)",
     "notification_email_ignore_certificate_errors": "Tanúsítvány hibák figyelmen kívül hagyása",
     "notification_email_ignore_certificate_errors_description": "TLS tanúsítvány érvényességi hibák figyelmen kívül hagyása (nem ajánlott)",
@@ -202,7 +204,7 @@
     "oauth_storage_quota_claim": "Tárhelykvóta igénylése",
     "oauth_storage_quota_claim_description": "A felhasználó tárhelykvótájának automatikus beállítása ennek az igényeltre.",
     "oauth_storage_quota_default": "Alapértelmezett tárhelykvóta (GiB)",
-    "oauth_storage_quota_default_description": "Alapértelmezett tárhely kvóta GiB-ban, amennyiben a felhasználó nem jelezte az igényét (A korlátlan tárhelyhez 0-t adj meg).",
+    "oauth_storage_quota_default_description": "Alapértelmezett tárhely kvóta GiB-ban, amennyiben a felhasználó nem jelezte az igényét.",
     "oauth_timeout": "Kérés időkorlátja",
     "oauth_timeout_description": "Kérések időkorlátja milliszekundumban",
     "password_enable_description": "Bejelentkezés emaillel és jelszóval",
@@ -242,6 +244,7 @@
     "storage_template_migration_info": "A sablon az összes kiterjesztést kisbetűssé alakítja át. A megváltozott sablon csak az újonnan feltöltött elemekre vonatkozik. A korábbi elemek visszamenőleges áthelyezéséhez ezt futtasd: <link>{job}</link>.",
     "storage_template_migration_job": "Tárhely Sablon Migrációja",
     "storage_template_more_details": "További részletekért erről a funkcióról lásd a <template-link>Tárhely Sablon</template-link> és annak <implications-link>következményeit</implications-link> a dokumentációban",
+    "storage_template_onboarding_description_v2": "A funkció engedélyezésével automatikusan, a felhasználó által definiált sablon alapján lesznek rendezve a fájlok. Több információért lásd a <link>dokumentációt</link>.",
     "storage_template_path_length": "Útvonal hozzávetőleges maximális hossza: <b>{length, number}</b>{limit, number}",
     "storage_template_settings": "Tárhely Sablon",
     "storage_template_settings_description": "A feltöltött elemek mappaszerkezetének és fájl elnevezésének kezelése",
@@ -256,7 +259,7 @@
     "template_email_update_album": "Album frissítve sablon",
     "template_email_welcome": "Üdvözlő email sablon",
     "template_settings": "Értesítés sablon",
-    "template_settings_description": "Egyéni sablonok kezelése az értesítésekhez.",
+    "template_settings_description": "Egyéni sablonok kezelése az értesítésekhez",
     "theme_custom_css_settings": "Egyedi CSS",
     "theme_custom_css_settings_description": "CSS Stíluslapokkal az Immich stílusa megváltoztatható.",
     "theme_settings": "Téma Beállítások",
@@ -288,7 +291,7 @@
     "transcoding_encoding_options": "Enkódolás beállítások",
     "transcoding_encoding_options_description": "Beállíthatod az enkódolt videók kódolási algoritmusát, felbontását, minőségét és egyéb beállításait",
     "transcoding_hardware_acceleration": "Hardveres Gyorsítás",
-    "transcoding_hardware_acceleration_description": "Kísérleti funkció. Sokkal gyorsabb, viszont azonos bitrátán is alacsonyabb minőséghez vezet",
+    "transcoding_hardware_acceleration_description": "Kísérleti funkció: gyorsabb transzkódolás, viszont azonos bitrátán alacsonyabb minőséghez vezethet",
     "transcoding_hardware_decoding": "Hardveres dekódolás",
     "transcoding_hardware_decoding_setting_description": "Lehetővé teszi az egész folyamat gyorsítását a pusztán kódolás gyorsítása helyett. Nem biztos, hogy minden videó esetén működik.",
     "transcoding_max_b_frames": "B-képkockák maximum száma",
@@ -334,6 +337,7 @@
     "user_delete_delay_settings_description": "Hány nappal az eltávolítás után legyen véglegesen törölve a felhasználó fiókja és tárolt elemei. A végleges törlés feladat minden éjfélkor fut le, hogy ellenőrizze, hogy van-e törlendő felhasználó. Ez a beállítás a következő futtatás során lép életbe.",
     "user_delete_immediately": "<b>{user}</b> felhasználója és összes eleme <b>azonnal</b> sorba állításra kerül a végleges törléshez .",
     "user_delete_immediately_checkbox": "Felhasználó és tárolt elemeinek sorba állítása azonnali törlésre",
+    "user_details": "Felhasználói adatok",
     "user_management": "Felhasználók Kezelése",
     "user_password_has_been_reset": "A felhasználó jelszava megváltoztatásra került:",
     "user_password_reset_description": "Juttasd el az átmeneti jelszót a felhasználóhoz és tájékoztasd, hogy a következő belépésnél azt majd meg kell változtatnia.",
@@ -349,6 +353,7 @@
     "video_conversion_job": "Videók Átkódolása",
     "video_conversion_job_description": "Videók átkódolása böngészőkkel és eszközökkel való széleskörű kompatibilitás érdekében"
   },
+  "admin_email": "Admin e-mail",
   "admin_password": "Admin Jelszó",
   "administration": "Adminisztráció",
   "advanced": "Haladó",
@@ -362,6 +367,7 @@
   "advanced_settings_self_signed_ssl_subtitle": "Nem ellenőrzi a szerver SSL tanúsítványát. Önaláírt tanúsítvány esetén szükséges beállítás.",
   "advanced_settings_self_signed_ssl_title": "Önaláírt SSL tanúsítványok engedélyezése",
   "advanced_settings_sync_remote_deletions_subtitle": "Automatikusan törölni vagy visszaállítani egy elemet ezen az eszközön, ha az adott műveletet a weben hajtották végre",
+  "advanced_settings_sync_remote_deletions_title": "Távoli törlések szinkronizálása [KÍSÉRLETI FUNKCIÓ]",
   "advanced_settings_tile_subtitle": "Haladó felhasználói beállítások",
   "advanced_settings_troubleshooting_subtitle": "További funkciók engedélyezése hibaelhárítás céljából",
   "advanced_settings_troubleshooting_title": "Hibaelhárítás",
@@ -398,6 +404,9 @@
   "album_with_link_access": "A link birtokában bárki láthatja a fotókat és a személyeket ebben az albumban.",
   "albums": "Albumok",
   "albums_count": "{count, plural, one {{count, number} Album} other {{count, number} Album}}",
+  "albums_default_sort_order": "Alapértelmezett album rendezés",
+  "albums_default_sort_order_description": "Alapértelmezett sorrendezés új albumok létrehozásánál.",
+  "albums_feature_description": "Másokkal megosztható elemek gyűjteménye.",
   "all": "Mind",
   "all_albums": "Minden album",
   "all_people": "Minden személy",
@@ -455,10 +464,11 @@
   "assets": "Elemek",
   "assets_added_count": "{count, plural, other {# elem}} hozzáadva",
   "assets_added_to_album_count": "{count, plural, other {# elem}} hozzáadva az albumhoz",
-  "assets_added_to_name_count": "{count, plural, other {# elem}} hozzáadva {hasName, select, true {a(z) <b>{name}</b>} other {az új}} albumhoz",
+  "assets_cannot_be_added_to_album_count": "{count, plural, one {Az elem} other {Az elemek}} nem adhatóak hozzá az albumhoz",
   "assets_count": "{count, plural, other {# elem}}",
   "assets_deleted_permanently": "{count} elem véglegesen törölve",
   "assets_deleted_permanently_from_server": "{count} elem véglegesen törölve az Immich szerverről",
+  "assets_downloaded_successfully": "{count, plural, one {# fájl sikeresen letöltve} other {# fájl sikeresen letöltve}}",
   "assets_moved_to_trash_count": "{count, plural, other {# elem}} áthelyezve a lomtárba",
   "assets_permanently_deleted_count": "{count, plural, other {# elem}} véglegesen törölve",
   "assets_removed_count": "{count, plural, other {# elem}} eltávolítva",
@@ -484,10 +494,10 @@
   "backup_album_selection_page_selection_info": "Összegzés",
   "backup_album_selection_page_total_assets": "Összes egyedi elem",
   "backup_all": "Összes",
-  "backup_background_service_backup_failed_message": "Az elemek mentése sikertelen. Újrapróbálkozás...",
-  "backup_background_service_connection_failed_message": "A szerverhez csatlakozás sikertelen. Újrapróbálkozás...",
+  "backup_background_service_backup_failed_message": "Az elemek mentése sikertelen. Újrapróbálkozás…",
+  "backup_background_service_connection_failed_message": "A szerverhez csatlakozás sikertelen. Újrapróbálkozás…",
   "backup_background_service_current_upload_notification": "Feltöltés {filename}",
-  "backup_background_service_default_notification": "Új elemek ellenőrzése...",
+  "backup_background_service_default_notification": "Új elemek ellenőrzése…",
   "backup_background_service_error_title": "Hiba a mentés közben",
   "backup_background_service_in_progress_notification": "Elemek mentése folyamatban…",
   "backup_background_service_upload_failure_notification": "A feltöltés sikertelen {filename}",
@@ -497,6 +507,7 @@
   "backup_controller_page_background_app_refresh_enable_button_text": "Beállítások megnyitása",
   "backup_controller_page_background_battery_info_link": "Mutasd meg hogyan",
   "backup_controller_page_background_battery_info_message": "A sikeres háttérben történő mentéshez kérjük, tiltsd le az Immich akkumulátor optimalizálását.\n\nMivel ezt a különféle eszközökön máshogy kell, ezért kérjük, az eszközöd gyártójától tudd meg, hogyan kell.",
+  "backup_controller_page_background_battery_info_ok": "OK",
   "backup_controller_page_background_battery_info_title": "Akkumulátor optimalizálás",
   "backup_controller_page_background_charging": "Csak töltés közben",
   "backup_controller_page_background_configure_error": "A háttérszolgáltatás beállítása sikertelen",
@@ -539,6 +550,10 @@
   "backup_options_page_title": "Biztonági mentés beállításai",
   "backup_setting_subtitle": "A háttérben és előtérben mentés beállításainak kezelése",
   "backward": "Visszafele",
+  "biometric_auth_enabled": "Biometrikus azonosítás engedélyezve",
+  "biometric_locked_out": "A biometrikus azonosításból kizárva",
+  "biometric_no_options": "A biometrikus azonosítás nem elérhető",
+  "biometric_not_available": "Biometrikus azonosítás ezen az eszközön nem elérhető",
   "birthdate_saved": "Születésnap elmentve",
   "birthdate_set_description": "A születés napját a rendszer arra használja, hogy kiírja, hogy a fénykép készítésekor a személy hány éves volt.",
   "blurred_background": "Homályos háttér",
@@ -572,6 +587,7 @@
   "cannot_undo_this_action": "Ez a művelet nem visszavonható!",
   "cannot_update_the_description": "A leírás megváltoztatása nem sikerült",
   "change_date": "Dátum változtatása",
+  "change_description": "Leírás megváltoztatása",
   "change_display_order": "Megjelenítési sorrend megváltoztatása",
   "change_expiration_time": "Lejárati idő megváltoztatása",
   "change_location": "Helyszín változtatása",
@@ -598,6 +614,7 @@
   "clear_all_recent_searches": "Legutóbbi keresések törlése",
   "clear_message": "Üzenet törlése",
   "clear_value": "Érték törlése",
+  "client_cert_dialog_msg_confirm": "OK",
   "client_cert_enter_password": "Jelszó Megadása",
   "client_cert_import": "Importálás",
   "client_cert_import_success_msg": "Kliens tanúsítvány importálva",
@@ -625,6 +642,10 @@
   "confirm_keep_this_delete_others": "Minden más elem a készletben törlésre kerül, kivéve ezt az elemet. Biztosan folytatni szeretnéd?",
   "confirm_new_pin_code": "Új PIN kód megerősítése",
   "confirm_password": "Jelszó megerősítése",
+  "confirm_tag_face": "Szeretnéd ezt az arcot {name}-ként megjelölni?",
+  "confirm_tag_face_unnamed": "Szeretnéd ezt az arcot megjelölni?",
+  "connected_device": "Kapcsolt eszköz",
+  "connected_to": "Kapcsolódva",
   "contain": "Belül",
   "context": "Kontextus",
   "continue": "Folytatás",
@@ -633,6 +654,7 @@
   "control_bottom_app_bar_delete_from_local": "Törlés az eszközről",
   "control_bottom_app_bar_edit_location": "Hely Módosítása",
   "control_bottom_app_bar_edit_time": "Dátum és Idő Módosítása",
+  "control_bottom_app_bar_share_link": "Link megosztása",
   "control_bottom_app_bar_share_to": "Megosztás Ide",
   "control_bottom_app_bar_trash_from_immich": "Lomtárba Helyez",
   "copied_image_to_clipboard": "Kép a vágólapra másolva.",
@@ -664,6 +686,7 @@
   "create_tag_description": "Új címke létrehozása. Beágyazott címkék esetén add meg a címke teljes elérési útvonalát, beleértve a perjeleket is.",
   "create_user": "Felhasználó létrehozása",
   "created": "Készült",
+  "created_at": "Létrehozva",
   "crop": "Kivágás",
   "curated_object_page_title": "Dolgok",
   "current_device": "Ez az eszköz",
@@ -719,7 +742,9 @@
   "direction": "Irány",
   "disabled": "Letiltott",
   "disallow_edits": "Módosítások letiltása",
+  "discord": "Discord",
   "discover": "Felfedez",
+  "discovered_devices": "Felfedezett eszközök",
   "dismiss_all_errors": "Minden hiba elvetése",
   "dismiss_error": "Hiba elvetése",
   "display_options": "Megjelenítési beállítások",
@@ -744,8 +769,8 @@
   "download_settings_description": "Elemek letöltésével kapcsolatos beállítások kezelése",
   "download_started": "Letöltés megkezdve",
   "download_sucess": "Sikeres letöltés",
-  "download_sucess_android": "Média letöltve a DCIM/Immich mappába\n",
-  "download_waiting_to_retry": "Várakozás",
+  "download_sucess_android": "Média letöltve a DCIM/Immich mappába",
+  "download_waiting_to_retry": "Várakozás újrapróbálkozáshoz",
   "downloading": "Letöltés",
   "downloading_asset_filename": "{filename} elem letöltése",
   "downloading_media": "Média letöltése",
@@ -758,6 +783,8 @@
   "edit_avatar": "Profilkép módosítása",
   "edit_date": "Dátum módosítása",
   "edit_date_and_time": "Dátum és idő módosítása",
+  "edit_description": "Leírás szerkesztése",
+  "edit_description_prompt": "Kérlek válassz egy új leírást:",
   "edit_exclusion_pattern": "Kizárási minta (pattern) módosítása",
   "edit_faces": "Arcok módosítása",
   "edit_import_path": "Importálási útvonal módosítása",
@@ -777,18 +804,25 @@
   "editor_close_without_save_title": "Szerkesztő bezárása?",
   "editor_crop_tool_h2_aspect_ratios": "Oldalarányok",
   "editor_crop_tool_h2_rotation": "Forgatás",
+  "email": "E-mail",
+  "email_notifications": "E-mail értesítések",
+  "empty_folder": "Ez a mappa üres",
   "empty_trash": "Lomtár ürítése",
   "empty_trash_confirmation": "Biztosan kiüríted a lomtárat? Ez az Immich lomtárában lévő összes elemet véglegesen törli.\nEz a művelet nem visszavonható!",
   "enable": "Engedélyezés",
+  "enable_biometric_auth_description": "Add meg a jelszavad a biometrikus azonosítás engedélyezéséhez",
   "enabled": "Engedélyezve",
   "end_date": "Vég dátum",
   "enqueued": "Sorba állítva",
-  "enter_wifi_name": "Add meg a WiFi hálózat nevét",
+  "enter_wifi_name": "Add meg a Wi-Fi hálózat nevét",
+  "enter_your_pin_code": "Add meg a jelszavad",
+  "enter_your_pin_code_subtitle": "Add meg a jelszavad a zárolt mappa megnyitásához",
   "error": "Hiba",
   "error_change_sort_album": "Album sorbarendezésének megváltoztatása sikertelen",
   "error_delete_face": "Hiba az arc törlése során",
   "error_loading_image": "Hiba a kép betöltése közben",
   "error_saving_image": "Hiba: {error}",
+  "error_tag_face_bounding_box": "Hiba az arc megjelölése közben - nem elérhetőek a határoló koordináták",
   "error_title": "Hiba - valami félresikerült",
   "errors": {
     "cannot_navigate_next_asset": "Nem lehet a következő elemhez navigálni",
@@ -816,10 +850,12 @@
     "failed_to_keep_this_delete_others": "Nem sikerült megtartani ezt az elemet, és a többi elemet törölni",
     "failed_to_load_asset": "Elem betöltése sikertelen",
     "failed_to_load_assets": "Elemek betöltése sikertelen",
+    "failed_to_load_notifications": "Értesítések betöltése sikertelen",
     "failed_to_load_people": "Személyek betöltése sikertelen",
     "failed_to_remove_product_key": "Termékkulcs eltávolítása sikertelen",
     "failed_to_stack_assets": "Elemek csoportosítása sikertelen",
     "failed_to_unstack_assets": "Csoportosított elemek szétszedése sikertelen",
+    "failed_to_update_notification_status": "Értesítés státusz frissítése sikertelen",
     "import_path_already_exists": "Ez az importálási útvonal már létezik.",
     "incorrect_email_or_password": "Helytelen email vagy jelszó",
     "paths_validation_failed": "A(z) {paths, plural, one {# elérési útvonal} other {# elérési útvonal}} érvényesítése sikertelen",
@@ -836,6 +872,7 @@
     "unable_to_archive_unarchive": "Az elem {archived, select, true {archiválása} other {kivétele az archívumból}} sikertelen",
     "unable_to_change_album_user_role": "Az album felhasználói jogkörének megváltoztatása sikertelen",
     "unable_to_change_date": "Dátum megváltoztatása sikertelen",
+    "unable_to_change_description": "Leírás módosítása sikertelen",
     "unable_to_change_favorite": "Az elem kedvenc állapotának megváltoztatása sikertelen",
     "unable_to_change_location": "Hely megváltoztatása sikertelen",
     "unable_to_change_password": "Jelszó megváltoztatása sikertelen",
@@ -879,6 +916,7 @@
     "unable_to_remove_partner": "Partner eltávolítása sikertelen",
     "unable_to_remove_reaction": "Reakció eltávolítása sikertelen",
     "unable_to_reset_password": "Jelszó visszaállítása sikertelen",
+    "unable_to_reset_pin_code": "Jelszó visszaállítása sikertelen",
     "unable_to_resolve_duplicate": "Duplikátum feloldása sikertelen",
     "unable_to_restore_assets": "Elemek visszaállítása sikertelen",
     "unable_to_restore_trash": "Az összes elem visszaállítása sikertelen",
@@ -906,11 +944,14 @@
     "unable_to_update_user": "Felhasználó módosítása sikertelen",
     "unable_to_upload_file": "Fájlfeltöltés sikertelen"
   },
+  "exif": "Exif",
   "exif_bottom_sheet_description": "Leírás Hozzáadása...",
   "exif_bottom_sheet_details": "RÉSZLETEK",
   "exif_bottom_sheet_location": "HELY",
   "exif_bottom_sheet_people": "EMBEREK",
   "exif_bottom_sheet_person_add_person": "Elnevez",
+  "exif_bottom_sheet_person_age_months": "{months} hónap idős",
+  "exif_bottom_sheet_person_age_year_months": "1 év, {months} hónap idős",
   "exit_slideshow": "Kilépés a Diavetítésből",
   "expand_all": "Összes kinyitása",
   "experimental_settings_new_asset_list_subtitle": "Fejlesztés alatt",
@@ -928,10 +969,12 @@
   "external": "Külső Képtár",
   "external_libraries": "Külső Képtárak",
   "external_network": "Külső hálózat",
-  "external_network_sheet_info": "Ha nem vagy a megadott WiFi hálózathoz csatlakozva, akkor az alkalmazás az alábbi URL címeken fogja elérni a szervert, fentről lefelé haladva",
+  "external_network_sheet_info": "Ha nem vagy a megadott Wi-Fi hálózathoz csatlakozva, akkor az alkalmazás az alábbi URL címeken fogja elérni a szervert, fentről lefelé haladva",
   "face_unassigned": "Nincs hozzárendelve",
   "failed": "Sikertelen",
+  "failed_to_authenticate": "Autentikáció sikertelen",
   "failed_to_load_assets": "Nem sikerült betölteni az elemeket",
+  "failed_to_load_folder": "Mappa betöltése sikertelen",
   "favorite": "Kedvenc",
   "favorite_or_unfavorite_photo": "Fotó kedvencnek jelölése vagy annak visszavonása",
   "favorites": "Kedvencek",
@@ -945,14 +988,19 @@
   "filetype": "Fájltípus",
   "filter": "Szűrő",
   "filter_people": "Személyek szűrése",
+  "filter_places": "Helyek szűrése",
   "find_them_fast": "Név alapján kereséssel gyorsan megtalálhatóak",
   "fix_incorrect_match": "Hibás találat javítása",
+  "folder": "Mappa",
+  "folder_not_found": "Mappa nem található",
   "folders": "Mappák",
   "folders_feature_description": "A fájlrendszerben lévő fényképek és videók mappanézetben való böngészése",
   "forward": "Előre",
+  "gcast_enabled": "Google Cast",
+  "gcast_enabled_description": "Ez a funkció a Google-től tölti be a működéséhez szükséges külső adatokat.",
   "general": "Általános",
   "get_help": "Segítségkérés",
-  "get_wifiname_error": "Nem sikerült lekérni a Wi-Fi nevét. Győződj meg róla, hogy megadtad a szükséges engedélyeket és csatlakoztál egy Wi-Fi hálózathoz.",
+  "get_wifiname_error": "Nem sikerült lekérni a Wi-Fi nevét. Győződj meg róla, hogy megadtad a szükséges engedélyeket és csatlakoztál egy Wi-Fi hálózathoz",
   "getting_started": "Kezdő Lépések",
   "go_back": "Visszalépés",
   "go_to_folder": "Ugrás a mappához",
@@ -981,9 +1029,9 @@
   "hide_person": "Személy elrejtése",
   "hide_unnamed_people": "Név nélküli személyek elrejtése",
   "home_page_add_to_album_conflicts": "{added} elem hozzáadva a(z) \"{album}\" albumhoz. {failed} elem már eleve az albumban volt.",
-  "home_page_add_to_album_err_local": "Helyi elemeket még nem lehet albumba tenni. Kihagyjuk.",
+  "home_page_add_to_album_err_local": "Helyi elemeket még nem lehet albumba tenni, kihagyás",
   "home_page_add_to_album_success": "{added} elem hozzáadva a(z) \"{album}\" albumhoz.",
-  "home_page_album_err_partner": "Még nem lehet a partner elemeit albumokhoz adni, úghogy kihagyjuk.",
+  "home_page_album_err_partner": "Még nem lehet a partner elemeit albumokhoz adni, kihagyás",
   "home_page_archive_err_local": "Helyi elemek archiválása még nem támogatott, úgyhogy kihagyjuk",
   "home_page_archive_err_partner": "Partner elemeit nem lehet archiválni, úgyhogy kihagyjuk",
   "home_page_building_timeline": "Idővonal összeállítása",
@@ -991,11 +1039,14 @@
   "home_page_delete_remote_err_local": "Helyi elemek vannak távoli törlésre kiválasztva, úgyhogy ezeket kihagyjuk",
   "home_page_favorite_err_local": "Helyi elemeket még nem lehet a kedvencek közé tenni, úgyhogy ezeket kihagyjuk",
   "home_page_favorite_err_partner": "Partner elemeit még nem lehet a kedvencek közé tenni, úgyhogy ezeket kihagyjuk",
-  "home_page_first_time_notice": "Ha most használod először az alkalmazást, akkor ahhoz, hogy megjelenjenek a fotók és a videók az idővonaladon, állítsd be, hogy melyik albumaidról készüljön biztonsági mentés.",
+  "home_page_first_time_notice": "Ha most használod először az alkalmazást, a fotók és videók megjelenítéséhez az idővonaladon, állítsd be, hogy melyik albumaidról készüljön biztonsági mentés",
+  "home_page_locked_error_local": "Helyi elemek nem mozgathatóak a zárolt mappába, átugorva",
+  "home_page_locked_error_partner": "Partner elemek nem mozgathatóak a zárolt mappába, átugorva",
   "home_page_share_err_local": "Helyi elemekről nem lehet megosztott linket készíteni, úgyhogy kihagyjuk",
   "home_page_upload_err_limit": "Csak 30 elemet tudsz egyszerre feltölteni, úgyhogy kihagyjuk",
   "host": "Kiszolgáló",
   "hour": "Óra",
+  "id": "Azonosító",
   "ignore_icloud_photos": "iCloud fotók figyelmen kívül hagyása",
   "ignore_icloud_photos_description": "Az iCloud-ban tárolt fotók nem lesznek feltöltve az Immich szerverre",
   "image": "Kép",
@@ -1035,6 +1086,11 @@
   "invalid_date_format": "Érvénytelen dátumformátum",
   "invite_people": "Személyek Meghívása",
   "invite_to_album": "Meghívás az albumba",
+  "ios_debug_info_last_sync_at": "Utoljára szinkronizálva {dateTime}",
+  "ios_debug_info_no_processes_queued": "Nincs sorba állított hátterfolyamat",
+  "ios_debug_info_no_sync_yet": "Még nem futott szinkronizáló háttérfolyamat",
+  "ios_debug_info_processes_queued": "{count, plural, one {{count} háttérfolyamat előkészítve} other {{count} háttérfolyamat előkészítve}}",
+  "ios_debug_info_processing_ran_at": "Feldolgozás futott {dateTime}",
   "items_count": "{count, plural, other {# elem}}",
   "jobs": "Feladatok",
   "keep": "Megtart",
@@ -1043,6 +1099,8 @@
   "kept_this_deleted_others": "Ez az elem és a töröltek meg lettek hagyva {count, plural, one {# asset} other {# assets}}",
   "keyboard_shortcuts": "Billentyűparancsok",
   "language": "Nyelv",
+  "language_no_results_subtitle": "Próbáld a keresésed módosítását",
+  "language_search_hint": "Nyelvek keresése...",
   "language_setting_description": "Válaszd ki preferált nyelvet",
   "last_seen": "Utoljára láttuk",
   "latest_version": "Legfrissebb Verzió",
@@ -1071,14 +1129,17 @@
   "local_network": "Helyi hálózat",
   "local_network_sheet_info": "Az alkalmazés ezen az URL címen fogja elérni a szervert, ha a megadott WiFi hálózathoz van csatlankozva",
   "location_permission": "Helymeghatározási engedély",
-  "location_permission_content": "Hálózatok automatikus váltásához az Immich-nek *mindenképpen* hozzá kell férnie a pontos helyzethez, hogy az alkalmazás le tudja kérni a Wi-Fi hálózat nevét",
+  "location_permission_content": "Hálózatok automatikus váltásához az Immich-nek szüksége van a pontos helymeghatározásra, hogy az alkalmazás le tudja kérni a Wi-Fi hálózat nevét",
   "location_picker_choose_on_map": "Válassz a térképen",
   "location_picker_latitude_error": "Érvényes szélességi kört írj be",
   "location_picker_latitude_hint": "Ide írd a szélességi kört",
   "location_picker_longitude_error": "Érvényes hosszúsági kört írj be",
   "location_picker_longitude_hint": "Ide írd a hosszúsági kört",
+  "lock": "Zárolás",
+  "locked_folder": "Zárolt mappa",
   "log_out": "Kijelentkezés",
   "log_out_all_devices": "Kijelentkezés Minden Eszközön",
+  "logged_in_as": "{user}-ként belépve",
   "logged_out_all_devices": "Minden eszköz kijelentkeztetve",
   "logged_out_device": "Eszköz kijelentkeztetve",
   "login": "Bejelentkezés",
@@ -1093,7 +1154,7 @@
   "login_form_err_invalid_url": "Érvénytelen cím",
   "login_form_err_leading_whitespace": "Az első karakter szóköz",
   "login_form_err_trailing_whitespace": "Az utolsó karakter szóköz",
-  "login_form_failed_get_oauth_server_config": "Nem sikerült az OAuth bejelentkezés. Ellenőrizd a szerver címét.",
+  "login_form_failed_get_oauth_server_config": "Nem sikerült az OAuth bejelentkezés. Ellenőrizd a szerver URL-t",
   "login_form_failed_get_oauth_server_disable": "OAuth bejelentkezés nem elérhető ezen a szerveren",
   "login_form_failed_login": "Hiba a bejelentkezés közben, ellenőrizd a szerver címét, az emailt és a jelszót",
   "login_form_handshake_exception": "SSL Kézfogási Hiba törént. Engedélyezd az önaláírt tanúsítvényokat a beállításokban, hogy ha önaláírt tanúsítványt használsz.",
@@ -1145,6 +1206,9 @@
   "map_settings_only_show_favorites": "Csak Kedvencek Mutatása",
   "map_settings_theme_settings": "Térkép Témája",
   "map_zoom_to_see_photos": "Kicsinyítsd, hogy láss fényképeket",
+  "mark_all_as_read": "Összes megjelölése olvasottként",
+  "mark_as_read": "Megjelölés olvasottként",
+  "marked_all_as_read": "Összes megjelölve olvasottként",
   "matches": "Azonosak",
   "media_type": "Médiatípus",
   "memories": "Emlékek",
@@ -1169,6 +1233,12 @@
   "month": "Hónap",
   "monthly_title_text_date_format": "y MMMM",
   "more": "Továbbiak",
+  "move": "Áthelyezés",
+  "move_off_locked_folder": "Zárolt mappából kivonás",
+  "move_to_locked_folder": "Áthelyezés a zárolt mappába",
+  "move_to_locked_folder_confirmation": "Ezek a képek és videók az összes albumból kikerülnek, és csak a zárolt mappából lesznek elérhetőek",
+  "moved_to_archive": "{count, plural, one {# Elem} other {# Elemek}} archiválva",
+  "moved_to_library": "{count, plural, one {# Elem} other {# Elemek}} másik könyvtárba költöztetve",
   "moved_to_trash": "Áthelyezve a lomtárba",
   "multiselect_grid_edit_date_time_err_read_only": "Csak-olvasható elem(ek) dátuma nem módosítható, ezért kihagyjuk",
   "multiselect_grid_edit_gps_err_read_only": "Csak-olvasható elem(ek) helye nem módosítható, ezért kihagyjuk",
@@ -1184,6 +1254,7 @@
   "new_password": "Új jelszó",
   "new_person": "Új személy",
   "new_pin_code": "Új PIN kód",
+  "new_pin_code_subtitle": "Ez az első alkalom hogy megnyitod a zárolt mappát. Hozz létre egy jelszót az oldal biztosítására",
   "new_user_created": "Új felhasználó létrehozva",
   "new_version_available": "ÚJ VERZIÓ ÉRHETŐ EL",
   "newest_first": "Legújabb először",
@@ -1201,7 +1272,9 @@
   "no_explore_results_message": "Tölts fel több képet, hogy böngészhesd a gyűjteményed.",
   "no_favorites_message": "Add hozzá a kedvencekhez, hogy gyorsan megtaláld a legjobb képeidet és videóidat",
   "no_libraries_message": "Hozz létre külső képtárat a fényképeid és videóid megtekintéséhez",
+  "no_locked_photos_message": "A zárolt mappában elhelyezett fotók és videók rejtettek, és nem jelennek meg a könyvtárad böngészése vagy keresése közben sem.",
   "no_name": "Nincs Név",
+  "no_notifications": "Nincsenek értesítések",
   "no_places": "Nincsenek helyek",
   "no_results": "Nincs találat",
   "no_results_description": "Próbálkozz szinonimákkal vagy általánosabb kulcsszavakkal",
@@ -1210,6 +1283,7 @@
   "not_selected": "Nincs kiválasztva",
   "note_apply_storage_label_to_previously_uploaded assets": "Megjegyzés: a korábban feltöltött elemek Tárhely Címkézéséhez futtasd a(z)",
   "notes": "Megjegyzések",
+  "nothing_here_yet": "Itt még nincs semmi",
   "notification_permission_dialog_content": "Az értesítések bekapcsolásához a Beállítások menüben válaszd ki az Engedélyezés-t.",
   "notification_permission_list_tile_content": "Értesítések engedélyezése.",
   "notification_permission_list_tile_enable_button": "Értesítések Bekapcsolása",
@@ -1217,15 +1291,21 @@
   "notification_toggle_setting_description": "Email értesítések engedélyezése",
   "notifications": "Értesítések",
   "notifications_setting_description": "Értesítések kezelése",
+  "oauth": "OAuth",
   "official_immich_resources": "Hivatalos Immich Források",
+  "offline": "Offline",
   "ok": "Rendben",
   "oldest_first": "Legrégebbi először",
   "on_this_device": "Ezen az eszközön",
   "onboarding": "Első lépések",
-  "onboarding_privacy_description": "Az alábbi (nem kötelező) funkciók külsős szolgáltatásokon alapulnak és bármikor kikapcsolhatóak az adminisztrációs beállításokban.",
+  "onboarding_locale_description": "Válaszd ki a preferált nyelved. Ezt később a beállításokban bármikor módosíthatod.",
+  "onboarding_privacy_description": "Az alábbi (nem kötelező) funkciók külsős szolgáltatásokon alapulnak és bármikor kikapcsolhatóak a beállításokban.",
   "onboarding_theme_description": "Válassz egy színtémát. Ezt bármikor megváltoztathatod a beállításokban.",
+  "onboarding_user_welcome_description": "Kezdjünk bele!",
   "onboarding_welcome_user": "Üdvözöllek {user}",
+  "online": "Online",
   "only_favorites": "Csak kedvencek",
+  "open": "Nyitva",
   "open_in_map_view": "Megnyitás térkép nézetben",
   "open_in_openstreetmap": "Megnyitás OpenStreetMap-ben",
   "open_the_search_filters": "Keresési szűrők megnyitása",
@@ -1238,6 +1318,7 @@
   "other_variables": "Egyéb változók",
   "owned": "Tulajdonos",
   "owner": "Tulajdonos",
+  "partner": "Partner",
   "partner_can_access": "{partner} hozzáférhet",
   "partner_can_access_assets": "Minden fényképed és videód, kivéve az Archiváltak és a Töröltek",
   "partner_can_access_location": "A helyszín, ahol a fotókat készítették",
@@ -1247,7 +1328,7 @@
   "partner_page_no_more_users": "Nincs több hozzáadható felhasználó",
   "partner_page_partner_add_failed": "Partner hozzáadása sikertelen",
   "partner_page_select_partner": "Partner kiválasztása",
-  "partner_page_shared_to_title": "Megosztva: ",
+  "partner_page_shared_to_title": "Megosztva",
   "partner_page_stop_sharing_content": "{partner} nem fog többé hozzáférni a fotóidhoz.",
   "partner_sharing": "Partner Megosztás",
   "partners": "Partnerek",
@@ -1277,6 +1358,8 @@
   "permanently_delete_assets_prompt": "Biztos, hogy véglegesen törölni {count, plural, one {szeretnéd ezt az elemet} other {szeretnél <b>#</b> elemet}}? Ez el fogja távolítani az {count, plural, one {elemet az albumokból, amikben szerepel} other {elemeket az albumokból, amikben szerepelnek}}.",
   "permanently_deleted_asset": "Elem véglegesen törölve",
   "permanently_deleted_assets_count": "{count, plural, other {# elem}} véglegesen törölve",
+  "permission": "Jogosultság",
+  "permission_empty": "A jogosultság nem hagyható üresen",
   "permission_onboarding_back": "Vissza",
   "permission_onboarding_continue_anyway": "Folytatás mindenképp",
   "permission_onboarding_get_started": "Vágjunk bele",
@@ -1284,7 +1367,7 @@
   "permission_onboarding_permission_denied": "Hozzáférés megtagadva. Az Immich használatához engedélyezni kell a fotó és videó hozzáférést a Beállításokban.",
   "permission_onboarding_permission_granted": "Hozzáférés engedélyezve! Minden készen áll.",
   "permission_onboarding_permission_limited": "Korlátozott hozzáférés. Ha szeretnéd, hogy az Immich a teljes galéria gyűjteményedet mentse és kezelje, akkor a Beállításokban engedélyezd a fotó és videó jogosultságokat.",
-  "permission_onboarding_request": "Engedélyezni kell, hogy az Immich hozzáférjen a képeidhez és videóidhoz",
+  "permission_onboarding_request": "Engedélyezni kell, hogy az Immich hozzáférjen a képeidhez és videóidhoz.",
   "person": "Személy",
   "person_birthdate": "Született: {date}",
   "person_hidden": "{name}{hidden, select, true { (rejtett)} other {}}",
@@ -1304,19 +1387,25 @@
   "play_memories": "Emlékek lejátszása",
   "play_motion_photo": "Mozgókép lejátszása",
   "play_or_pause_video": "Videó elindítása vagy megállítása",
+  "port": "Port",
   "preferences_settings_subtitle": "Alkalmazásbeállítások kezelése",
   "preferences_settings_title": "Beállítások",
   "preset": "Sablon",
   "preview": "Előnézet",
   "previous": "Előző",
   "previous_memory": "Előző emlék",
-  "previous_or_next_photo": "Előző vagy következő fotó",
+  "previous_or_next_day": "Nap előre/hátra",
+  "previous_or_next_month": "Hónap előre/hátra",
+  "previous_or_next_photo": "Fotó előre/hátra",
+  "previous_or_next_year": "Év előre/hátra",
   "primary": "Elsődleges",
   "privacy": "Magánszféra",
+  "profile": "Profil",
   "profile_drawer_app_logs": "Naplók",
   "profile_drawer_client_out_of_date_major": "A mobilalkalmazás elavult. Kérjük, frissítsd a legfrisebb főverzióra.",
   "profile_drawer_client_out_of_date_minor": "A mobilalkalmazás elavult. Kérjük, frissítsd a legfrisebb alverzióra.",
   "profile_drawer_client_server_up_to_date": "A Kliens és a Szerver is naprakész",
+  "profile_drawer_github": "GitHub",
   "profile_drawer_server_out_of_date_major": "A szerver elavult. Kérjük, frissítsd a legfrisebb főverzióra.",
   "profile_drawer_server_out_of_date_minor": "A szerver elavult. Kérjük, frissítsd a legfrisebb alverzióra.",
   "profile_image_of_user": "{user} profilképe",
@@ -1370,6 +1459,8 @@
   "recent_searches": "Legutóbbi keresések",
   "recently_added": "Nemrég hozzáadott",
   "recently_added_page_title": "Nemrég Hozzáadott",
+  "recently_taken": "Nemrég készített",
+  "recently_taken_page_title": "Nemrég készített",
   "refresh": "Frissítés",
   "refresh_encoded_videos": "Átkódolt videók frissítése",
   "refresh_faces": "Arcok frissítése",
@@ -1389,9 +1480,12 @@
   "remove_deleted_assets": "Törölt Elemek Eltávolítása",
   "remove_from_album": "Eltávolítás az albumból",
   "remove_from_favorites": "Eltávolítás a kedvencekből",
+  "remove_from_locked_folder": "Eltávolítás a zárolt mappából",
+  "remove_from_locked_folder_confirmation": "Biztosan ki szeretnéd venni ezeket a fotókat és videókat a zárolt mappából? Láthatóak lesznek a könyvtáradban.",
   "remove_from_shared_link": "Eltávolítás a megosztott linkből",
   "remove_memory": "Emlék eltávolítása",
   "remove_photo_from_memory": "Kép eltávolítása az emlékből",
+  "remove_tag": "Címke eltávolítása",
   "remove_url": "URL eltávolítása",
   "remove_user": "Felhasználó eltávolítása",
   "removed_api_key": "API Kulcs eltávolítva: {name}",
@@ -1485,7 +1579,7 @@
   "search_result_page_new_search_hint": "Új Keresés",
   "search_settings": "Keresési beállítások",
   "search_state": "Megye/Állam keresése...",
-  "search_suggestion_list_smart_search_hint_1": "Az intelligens keresés alapértelmezetten be van kapcsolva, metaadatokat így kereshetsz: ",
+  "search_suggestion_list_smart_search_hint_1": "Az intelligens keresés alapértelmezetten be van kapcsolva, metaadatokat így kereshetsz ",
   "search_suggestion_list_smart_search_hint_2": "m:keresési-kifejezés",
   "search_tags": "Címkék keresése...",
   "search_timezone": "Időzóna keresése...",
@@ -1517,6 +1611,7 @@
   "server_info_box_server_url": "Szerver Címe",
   "server_offline": "Szerver Nem Elérhető",
   "server_online": "Szerver Elérhető",
+  "server_privacy": "Szerver biztonság",
   "server_stats": "Szerver Statisztikák",
   "server_version": "Szerver Verzió",
   "set": "Beállít",
@@ -1526,6 +1621,7 @@
   "set_date_of_birth": "Születési dátum beállítása",
   "set_profile_picture": "Profilkép beállítása",
   "set_slideshow_to_fullscreen": "Diavetítés teljes képernyőre állítása",
+  "set_stack_primary_asset": "Beállítás elsődleges elemként",
   "setting_image_viewer_help": "Az Elem Megjelenítő először a kis bélyegképet tölti be, aztán a közepes méretű előnézetet (ha elérhető), végül az eredetit (ha elérhető).",
   "setting_image_viewer_original_subtitle": "Engedélyezi az eredeti teljes felbontású kép betöltését (nagy!). Kikapcsolva csökkenti az adathasználatot (a neten és az eszköz gyorsítótárán is).",
   "setting_image_viewer_original_title": "Eredeti kép betöltése",
@@ -1556,6 +1652,7 @@
   "share_add_photos": "Fotók hozzáadása",
   "share_assets_selected": "{count} kiválasztva",
   "share_dialog_preparing": "Előkészítés...",
+  "share_link": "Link megosztása",
   "shared": "Megosztva",
   "shared_album_activities_input_disable": "Hozzászólások kikapcsolva",
   "shared_album_activity_remove_content": "Törölni szeretnéd ezt a tevékenységet?",
@@ -1595,6 +1692,7 @@
   "shared_link_expires_second": "{count} másodperc múlva lejár",
   "shared_link_expires_seconds": "{count} másodperc múlva lejár",
   "shared_link_individual_shared": "Egyénileg megosztva",
+  "shared_link_info_chip_metadata": "EXIF",
   "shared_link_manage_links": "Megosztott linkek kezelése",
   "shared_link_options": "Megosztott link beállításai",
   "shared_links": "Megosztott linkek",
@@ -1656,6 +1754,7 @@
   "stack_select_one_photo": "Válassz egy fő képet a csoportból",
   "stack_selected_photos": "Kiválasztott fényképek csoportosítása",
   "stacked_assets_count": "{count, plural, other {# elem}} csoportosítva",
+  "stacktrace": "Hibaleírás",
   "start": "Elindít",
   "start_date": "Kezdő dátum",
   "state": "Megye/Állam",
@@ -1666,6 +1765,7 @@
   "stop_sharing_photos_with_user": "Fényképeid megosztásának megszüntetése ezzel a felhasználóval",
   "storage": "Tárhely",
   "storage_label": "Tárhely címke",
+  "storage_quota": "Tárhely kvóta",
   "storage_usage": "{used}/{available} használatban",
   "submit": "Beküldés",
   "suggestions": "Javaslatok",
@@ -1693,11 +1793,11 @@
   "theme_selection_description": "A böngésző beállításának megfelelően automatikusan használjon világos vagy sötét témát",
   "theme_setting_asset_list_storage_indicator_title": "Tárhely ikon mutatása az elemeken",
   "theme_setting_asset_list_tiles_per_row_title": "Elemek száma soronként ({count})",
-  "theme_setting_colorful_interface_subtitle": "Alapértelmezett szín használata a háttérben lévő felületekhez",
+  "theme_setting_colorful_interface_subtitle": "Alapértelmezett szín használata a háttérben lévő felületekhez.",
   "theme_setting_colorful_interface_title": "Színes felhasználói felület",
   "theme_setting_image_viewer_quality_subtitle": "Részletes képmegjelenítő minőségének beállítása",
   "theme_setting_image_viewer_quality_title": "Képmegjelenítő minősége",
-  "theme_setting_primary_color_subtitle": "Válassz egy színt az alapértelmezett műveletekhez és kiemelésekhez",
+  "theme_setting_primary_color_subtitle": "Válassz egy színt az alapértelmezett műveletekhez és kiemelésekhez.",
   "theme_setting_primary_color_title": "Alapértelmezett szín",
   "theme_setting_system_primary_color_title": "Rendszerszínek használata",
   "theme_setting_system_theme_switch": "Automatikus (követi a rendszer témáját)",
@@ -1737,6 +1837,7 @@
   "unable_to_setup_pin_code": "Sikertelen PIN kód beállítás",
   "unarchive": "Archívumból kivesz",
   "unarchived_count": "{count, plural, other {# elem kivéve az archívumból}}",
+  "undo": "Visszavonás",
   "unfavorite": "Kedvenc közül kivesz",
   "unhide_person": "Nem rejtett személy",
   "unknown": "Ismeretlen",
@@ -1756,6 +1857,7 @@
   "unstack": "Csoport Szétszedése",
   "unstacked_assets_count": "{count, plural, other {# elemből}} álló csoport szétszedve",
   "up_next": "Következik",
+  "updated_at": "Frissített",
   "updated_password": "Jelszó megváltoztatva",
   "upload": "Feltöltés",
   "upload_concurrency": "Párhuzamos feltöltés",
@@ -1770,14 +1872,17 @@
   "upload_success": "Feltöltés sikeres, frissítsd az oldalt az újonnan feltöltött elemek megtekintéséhez.",
   "upload_to_immich": "Feltöltés Immich-be ({count})",
   "uploading": "Feltöltés folyamatban",
+  "url": "URL",
   "usage": "Használat",
   "use_current_connection": "Jelenlegi kapcsolat használata",
   "use_custom_date_range": "Szabadon megadott időintervallum használata",
   "user": "Felhasználó",
+  "user_has_been_deleted": "Ez a felhasználó törlésre került.",
   "user_id": "Felhasználó azonosítója",
   "user_liked": "{user} felhasználónak {type, select, photo {ez a fénykép} video {ez a videó} asset {ez az elem} other {ez}} tetszik",
   "user_pin_code_settings": "PIN kód",
   "user_pin_code_settings_description": "PIN kód kezelése",
+  "user_privacy": "Felhasználói biztonság",
   "user_purchase_settings": "Megvásárlás",
   "user_purchase_settings_description": "Vásárlás kezelése",
   "user_role_set": "{user} felhasználónak {role} jogkör biztosítása",
@@ -1822,12 +1927,12 @@
   "week": "Hét",
   "welcome": "Üdvözlünk",
   "welcome_to_immich": "Üdvözöl az Immich",
-  "wifi_name": "WiFi Neve",
+  "wifi_name": "Wi-Fi Neve",
   "wrong_pin_code": "Hibás PIN kód",
   "year": "Év",
   "years_ago": "{years, plural, one {# évvel} other {# évvel}} ezelőtt",
   "yes": "Igen",
   "you_dont_have_any_shared_links": "Nincsenek megosztott linkjeid",
-  "your_wifi_name": "A WiFi hálózatod neve",
+  "your_wifi_name": "A Wi-Fi hálózatod neve",
   "zoom_image": "Kép Nagyítása"
 }
diff --git a/i18n/id.json b/i18n/id.json
index 4d15ef01e9..ff5e2524e2 100644
--- a/i18n/id.json
+++ b/i18n/id.json
@@ -34,6 +34,7 @@
   "added_to_favorites_count": "Ditambahkan {count, number} ke favorit",
   "admin": {
     "add_exclusion_pattern_description": "Tambahkan pola pengecualian. Glob menggunakan *, **, dan ? didukung. Untuk mengabaikan semua berkas dalam direktori apa pun bernama \"Raw\", gunakan \"**/Raw/**\". Untuk mengabaikan semua berkas berakhiran dengan \".tif\", gunakan \"**/*.tif\". Untuk mengabaikan jalur absolut, gunakan \"/jalur/untuk/diabaikan/**\".",
+    "admin_user": "Pengguna Admin",
     "asset_offline_description": "Aset pustaka eksternal ini tidak ada di diska dan telah dipindahkan ke tempat sampah. Jika berkasnya dipindah dalam pustaka, periksa lini masa Anda untuk aset baru yang cocok. Untuk memulihkan aset ini, pastikan jalur berkas di bawah dapat diakses oleh Immich dan pindai pustaka.",
     "authentication_settings": "Pengaturan Autentikasi",
     "authentication_settings_description": "Kelola kata sandi, OAuth, dan pengaturan autentikasi lainnya",
@@ -44,7 +45,7 @@
     "backup_database_enable_description": "Aktifkan pencadangan basis data",
     "backup_keep_last_amount": "Jumlah cadangan untuk disimpan",
     "backup_settings": "Pengaturan Pencadangan Basis Data",
-    "backup_settings_description": "Kelola pengaturan pencadangan basis data. Catatan: Tugas ini tidak dipantau dan Anda tidak akan diberi tahu jika ada kesalahan.",
+    "backup_settings_description": "Kelola pengaturan pencadangan basis data.",
     "cleared_jobs": "Tugas terselesaikan untuk: {job}",
     "config_set_by_file": "Konfigurasi saat ini ditetapkan oleh berkas konfigurasi",
     "confirm_delete_library": "Apakah Anda yakin ingin menghapus pustaka {library}?",
@@ -165,12 +166,18 @@
     "metadata_settings_description": "Kelola pengaturan metadata",
     "migration_job": "Migrasi",
     "migration_job_description": "Migrasikan gambar kecil untuk aset dan wajah ke struktur folder terkini",
+    "nightly_tasks_cluster_faces_setting_description": "Mulai pengenalan wajah pada semua wajah yang baru saja terdeteksi",
+    "nightly_tasks_cluster_new_faces_setting": "Kelompokkan semua wajah baru",
+    "nightly_tasks_database_cleanup_setting": "Tugas pembersihan basis data",
+    "nightly_tasks_generate_memories_setting": "Buat kenang-kenangan",
+    "nightly_tasks_generate_memories_setting_description": "Buat kenang-kenangan baru dari berbagai aset",
+    "nightly_tasks_start_time_setting": "Waktu mulai",
     "no_paths_added": "Tidak ada jalur yang ditambahkan",
     "no_pattern_added": "Tidak ada pola yang ditambahkan",
     "note_apply_storage_label_previous_assets": "Catatan: Untuk menerapkan Label Penyimpanan untuk aset yang telah diunggah sebelumnya, jalankan",
     "note_cannot_be_changed_later": "CATATAN: Ini tidak akan dapat diubah lagi!",
     "notification_email_from_address": "Dari alamat",
-    "notification_email_from_address_description": "Alamat surel pengirim, misalnya: \"Server Foto Immich <noreply@example.com>\"",
+    "notification_email_from_address_description": "Alamat surel pengirim, misalnya: \"Server Foto Immich <noreply@example.com>\". Pastikan untuk menggunakan alamat yang diizinkan untuk mengirim email",
     "notification_email_host_description": "Hos server surel (mis. smtp.immich.app)",
     "notification_email_ignore_certificate_errors": "Abaikan eror sertifikat",
     "notification_email_ignore_certificate_errors_description": "Abaikan eror validasi sertifikat TLS (tidak disarankan)",
@@ -195,6 +202,7 @@
     "oauth_mobile_redirect_uri": "URI pengalihan ponsel",
     "oauth_mobile_redirect_uri_override": "Penimpaan URI penerusan ponsel",
     "oauth_mobile_redirect_uri_override_description": "Aktifkan ketika provider OAuth tidak mengizinkan tautan mobile, seperti ''{callback}''",
+    "oauth_role_claim_description": "Secara otomatis memberikan akses admin berdasarkan keberadaan klaim ini. Klaim dapat berupa \"user\" atau \"admin\".",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Kelola pengaturan log masuk OAuth",
     "oauth_settings_more_details": "Untuk detail lanjut tentang fitur ini, lihat <link>docs</link>.",
@@ -243,6 +251,7 @@
     "storage_template_migration_info": "Templat penyimpanan akan mengubah semua ekstensi ke huruf kecil. Perubahan templat hanya akan diterapkan pada aset baru. Untuk menerapkan templat pada setiap aset yang sebelumnya telah diunggah, jalankan <link>{job}</link>.",
     "storage_template_migration_job": "Tugas Migrasi Templat Ruang Penyimpanan",
     "storage_template_more_details": "Untuk detail lebih lanjut tentang fitur ini, pergi ke <template-link>Templat Penyimpanan</template-link> dan <implications-link>kekurangannya</implications-link>",
+    "storage_template_onboarding_description_v2": "Saat diaktifkan, fitur ini akan mengatur file secara otomatis berdasarkan templat yang ditentukan pengguna. Untuk informasi selengkapnya, silakan lihat <link>dokumentasi</link>.",
     "storage_template_path_length": "Batas panjang jalur: <b>{length, number}</b>{limit, number}",
     "storage_template_settings": "Templat Penyimpanan",
     "storage_template_settings_description": "Kelola struktur folder dan nama berkas dari aset yang diunggah",
@@ -257,7 +266,7 @@
     "template_email_update_album": "Perbarui Templat Album",
     "template_email_welcome": "Templat surel selamat datang",
     "template_settings": "Templat Notifikasi",
-    "template_settings_description": "Kelola templat kustom untuk notifikasi.",
+    "template_settings_description": "Kelola templat kustom untuk notifikasi",
     "theme_custom_css_settings": "CSS Kustom",
     "theme_custom_css_settings_description": "CSS memungkinkan desain Immich untuk diubah.",
     "theme_settings": "Pengaturan Tema",
@@ -355,13 +364,20 @@
   "admin_password": "Kata Sandi Admin",
   "administration": "Administrasi",
   "advanced": "Tingkat lanjut",
+  "advanced_settings_beta_timeline_subtitle": "Coba pengalaman aplikasi baru",
+  "advanced_settings_beta_timeline_title": "Garis waktu Beta",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Gunakan opsi ini untuk menyaring media saat sinkronisasi berdasarkan kriteria alternatif. Hanya coba ini dengan aplikasi mendeteksi semua album.",
   "advanced_settings_enable_alternate_media_filter_title": "[EKSPERIMENTAL] Gunakan saringan sinkronisasi album perangkat alternatif",
   "advanced_settings_log_level_title": "Tingkat log: {level}",
   "advanced_settings_prefer_remote_subtitle": "Beberapa perangkat tidak dapat memuat gambar kecil dengan cepat. Menyalakan ini akan memuat gambar kecil dari server.",
   "advanced_settings_prefer_remote_title": "Prioritaskan gambar dari server",
+  "advanced_settings_proxy_headers_subtitle": "Tentukan header proxy yang harus dikirim Immich dengan setiap permintaan jaringan",
+  "advanced_settings_self_signed_ssl_subtitle": "Melewati verifikasi sertifikat SSL untuk titik akhir server. Diperlukan untuk sertifikat yang ditandatangani sendiri.",
+  "advanced_settings_self_signed_ssl_title": "Izinkan sertifikat SSL yang ditandatangani sendiri",
   "advanced_settings_sync_remote_deletions_subtitle": "Hapus atau pulihkan aset pada perangkat ini secara otomatis ketika tindakan dilakukan di web",
   "advanced_settings_sync_remote_deletions_title": "Sinkronisasi penghapusan jarak jauh [EKSPERIMENTAL]",
+  "advanced_settings_tile_subtitle": "Pengaturan pengguna tingkat lanjut",
+  "advanced_settings_troubleshooting_subtitle": "Aktifkan fitur tambahan untuk pemecahan masalah",
   "age_months": "Umur {months, plural, one {# bulan} other {# bulan}}",
   "age_year_months": "Umur 1 tahun, {months, plural, one {# bulan} other {# bulan}}",
   "age_years": "{years, plural, other {Umur #}}",
@@ -446,7 +462,6 @@
   "assets": "Aset",
   "assets_added_count": "{count, plural, one {# aset} other {# aset}} ditambahkan",
   "assets_added_to_album_count": "Ditambahkan {count, plural, one {# aset} other {# aset}} ke album",
-  "assets_added_to_name_count": "Ditambahkan {count, plural, one {# aset} other {# aset}} ke {hasName, select, true {<b>{name}</b>} other {album baru}}",
   "assets_count": "{count, plural, one {# aset} other {# aset}}",
   "assets_deleted_permanently": "{count} aset dihapus secara permanen",
   "assets_deleted_permanently_from_server": "{count} aset dihapus secara permanen dari server Immich",
diff --git a/i18n/it.json b/i18n/it.json
index 07e19736a7..5e12bdfc97 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -87,7 +87,7 @@
     "image_settings": "Impostazioni delle immagini",
     "image_settings_description": "Gestisci qualità e risoluzione delle immagini generate",
     "image_thumbnail_description": "Miniatura piccola senza metadati, utilizzata durante la visualizzazione di gruppi di foto come la sequenza temporale principale",
-    "image_thumbnail_quality_description": "Qualità delle miniature da 1 a 100. Un valore più alto è migliore, ma produce file più grandi e può ridurre la reattività dell'app.",
+    "image_thumbnail_quality_description": "Qualità delle anteprime da 1 a 100. Un valore più alto è migliore ma produce file più grandi e può ridurre la reattività dell'app.",
     "image_thumbnail_title": "Impostazioni della copertina",
     "job_concurrency": "Concorrenza {job}",
     "job_created": "Processo creato",
@@ -105,7 +105,7 @@
     "library_scanning_enable_description": "Attiva la scansione periodica della libreria",
     "library_settings": "Libreria Esterna",
     "library_settings_description": "Gestisci le impostazioni della libreria esterna",
-    "library_tasks_description": "Scansiona le librerie esterne per i nuovi aggiornamenti",
+    "library_tasks_description": "Scansiona le librerie esterne per risorse nuove o modificate",
     "library_watching_enable_description": "Osserva le librerie esterne per cambiamenti",
     "library_watching_settings": "Osserva librerie (SPERIMENTALE)",
     "library_watching_settings_description": "Osserva automaticamente i cambiamenti dei file",
@@ -121,7 +121,7 @@
     "machine_learning_enabled": "Attiva machine learning",
     "machine_learning_enabled_description": "Se disabilitato, tutte le funzioni di ML saranno disabilitate ignorando le importazioni sottostanti.",
     "machine_learning_facial_recognition": "Riconoscimento Facciale",
-    "machine_learning_facial_recognition_description": "Rileva, riconosci, e raggruppa facce nelle immagini",
+    "machine_learning_facial_recognition_description": "Rileva, riconosci e raggruppa volti nelle immagini",
     "machine_learning_facial_recognition_model": "Modello di riconoscimento facciale",
     "machine_learning_facial_recognition_model_description": "I modelli sono mostrati in ordine decrescente in base alla dimensione. I modelli più grandi sono più lenti e utilizzano più memoria, però producono risultati migliori. Nota che devi ri-eseguire il processo di rilevamento facciale per tutte le immagini quando cambi il modello.",
     "machine_learning_facial_recognition_setting": "Attiva riconoscimento facciale",
@@ -156,16 +156,30 @@
     "map_settings": "Impostazioni Mappa e Posizione",
     "map_settings_description": "Gestisci impostazioni mappa",
     "map_style_description": "URL per un tema della mappa style.json",
-    "memory_cleanup_job": "pulizia memoria",
-    "memory_generate_job": "Generazione della memoria",
+    "memory_cleanup_job": "Pulizia dei vecchi Ricordi",
+    "memory_generate_job": "Generazione dei Ricordi",
     "metadata_extraction_job": "Estrazione Metadata",
-    "metadata_extraction_job_description": "Estrai informazioni dai metadati di ciascun asset, ad esempio coordinate GPS, volti e risoluzione",
+    "metadata_extraction_job_description": "Estrai informazioni dai metadati di ciascuna risorsa, come coordinate GPS, volti e risoluzione",
     "metadata_faces_import_setting": "Abilita l'importazione dei volti",
     "metadata_faces_import_setting_description": "Importa i volti dai dati EXIF dell'immagine e dai file sidecar",
     "metadata_settings": "Impostazioni Metadati",
     "metadata_settings_description": "Gestisci le impostazioni dei metadati",
     "migration_job": "Migrazione",
     "migration_job_description": "Migra le anteprime per gli asset e volti alla struttura di cartelle più recente",
+    "nightly_tasks_cluster_faces_setting_description": "Avvia riconoscimento facciale sui volti appena rilevati",
+    "nightly_tasks_cluster_new_faces_setting": "Raggruppa nuovi volti",
+    "nightly_tasks_database_cleanup_setting": "Processi di pulizia del database",
+    "nightly_tasks_database_cleanup_setting_description": "Ripulisci il database da file vecchi e scaduti",
+    "nightly_tasks_generate_memories_setting": "Genera ricordi",
+    "nightly_tasks_generate_memories_setting_description": "Genera nuovi ricordi a partire dalle risorse",
+    "nightly_tasks_missing_thumbnails_setting": "Genera anteprime mancanti",
+    "nightly_tasks_missing_thumbnails_setting_description": "Metti in coda le risorse senza miniatura per la generazione delle anteprime",
+    "nightly_tasks_settings": "Impostazioni delle attività notturne",
+    "nightly_tasks_settings_description": "Gestisci attività notturne",
+    "nightly_tasks_start_time_setting": "Tempo di avvio",
+    "nightly_tasks_start_time_setting_description": "Il tempo in cui il server fa partire le attività notturne",
+    "nightly_tasks_sync_quota_usage_setting": "Sincronizza la quota di utilizzo",
+    "nightly_tasks_sync_quota_usage_setting_description": "Aggiorna la quota di spazio dell'utente in base all'utilizzo corrente",
     "no_paths_added": "Nessun percorso aggiunto",
     "no_pattern_added": "Nessun pattern aggiunto",
     "note_apply_storage_label_previous_assets": "Nota: Per assegnare l'etichetta storage ad asset precedentemente caricati, esegui",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "URI reindirizzamento mobile",
     "oauth_mobile_redirect_uri_override": "Sovrascrivi URI reindirizzamento cellulare",
     "oauth_mobile_redirect_uri_override_description": "Abilita quando il gestore OAuth non consente un URL come ''{callback}''",
+    "oauth_role_claim": "Claim del ruolo",
+    "oauth_role_claim_description": "Concedi automaticamente l'accesso come amministratore in base alla presenza di questo claim. Il claim può essere 'user' o 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Gestisci impostazioni di login OAuth",
     "oauth_settings_more_details": "Per più dettagli riguardo a questa funzionalità, consulta <link>la documentazione</link>.",
@@ -264,8 +280,8 @@
     "theme_custom_css_settings_description": "I Cascading Style Sheets (CSS) permettono di personalizzare l'interfaccia di Immich.",
     "theme_settings": "Impostazioni Tema",
     "theme_settings_description": "Gestisci la personalizzazione dell'interfaccia web di Immich",
-    "thumbnail_generation_job": "Generazione Miniature",
-    "thumbnail_generation_job_description": "Genera miniature grandi, piccole e sfocate per ogni asset, oltre a miniature per ogni persona",
+    "thumbnail_generation_job": "Genera Anteprime",
+    "thumbnail_generation_job_description": "Genera anteprime grandi, piccole e sfocate per ogni asset, oltre a miniature per ogni persona",
     "transcoding_acceleration_api": "API di accelerazione",
     "transcoding_acceleration_api_description": "L'API che interagirà con il tuo dispositivo per accelerare la transcodifica. Questa impostazione è \"best effort\": ripiegherà sulla transcodifica software in caso di fallimento. VP9 potrebbe funzionare o meno a seconda del tuo hardware.",
     "transcoding_acceleration_nvenc": "NVENC (richiede GPU NVIDIA)",
@@ -357,25 +373,27 @@
   "admin_password": "Password Amministratore",
   "administration": "Amministrazione",
   "advanced": "Avanzate",
+  "advanced_settings_beta_timeline_subtitle": "Prova la nuova esperienza dell'app",
+  "advanced_settings_beta_timeline_title": "Timeline beta",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Usa questa opzione per filtrare i contenuti multimediali durante la sincronizzazione in base a criteri alternativi. Prova questa opzione solo se riscontri problemi con il rilevamento di tutti gli album da parte dell'app.",
   "advanced_settings_enable_alternate_media_filter_title": "[SPERIMENTALE] Usa un filtro alternativo per la sincronizzazione degli album del dispositivo",
   "advanced_settings_log_level_title": "Livello log: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Alcuni dispositivi sono molto lenti a caricare le anteprime delle immagini dal dispositivo. Attivare questa impostazione per caricare invece le immagini remote.",
+  "advanced_settings_prefer_remote_subtitle": "Alcuni dispositivi sono molto lenti a caricare le anteprime delle immagini locali. Attivare questa impostazione per caricare invece le immagini remote.",
   "advanced_settings_prefer_remote_title": "Preferisci immagini remote",
   "advanced_settings_proxy_headers_subtitle": "Definisci gli header per i proxy che Immich dovrebbe inviare con ogni richiesta di rete",
   "advanced_settings_proxy_headers_title": "Header Proxy",
   "advanced_settings_self_signed_ssl_subtitle": "Salta la verifica dei certificati SSL del server. Richiesto con l'uso di certificati self-signed.",
   "advanced_settings_self_signed_ssl_title": "Consenti certificati SSL self-signed",
-  "advanced_settings_sync_remote_deletions_subtitle": "Rimuovi o ripristina automaticamente un elemento su questo dispositivo se l'azione è stata fatta via web",
+  "advanced_settings_sync_remote_deletions_subtitle": "Rimuovi o ripristina automaticamente un elemento su questo dispositivo quando l'azione è stata fatta via web",
   "advanced_settings_sync_remote_deletions_title": "Sincronizza le cancellazioni remote [SPERIMENTALE]",
-  "advanced_settings_tile_subtitle": "Impostazioni aggiuntive utenti",
+  "advanced_settings_tile_subtitle": "Impostazioni avanzate dell'utente",
   "advanced_settings_troubleshooting_subtitle": "Attiva funzioni addizionali per la risoluzione dei problemi",
   "advanced_settings_troubleshooting_title": "Risoluzione problemi",
   "age_months": "Età {months, plural, one {# mese} other {# mesi}}",
   "age_year_months": "Età 1 anno, {months, plural, one {# mese} other {# mesi}}",
   "age_years": "{years, plural, one {# anno} other {# anni}}",
   "album_added": "Album aggiunto",
-  "album_added_notification_setting_description": "Ricevi una notifica email quando sei aggiunto a un album condiviso",
+  "album_added_notification_setting_description": "Ricevi una notifica email quando sei aggiunto ad un album condiviso",
   "album_cover_updated": "Copertina dell'album aggiornata",
   "album_delete_confirmation": "Sei sicuro di voler cancellare l'album {album}?",
   "album_delete_confirmation_description": "Se l'album è condiviso gli altri utenti perderanno l'accesso.",
@@ -394,32 +412,32 @@
   "album_user_left": "{album} abbandonato",
   "album_user_removed": "Utente {user} rimosso",
   "album_viewer_appbar_delete_confirm": "Sei sicuro di voler rimuovere questo album dal tuo account?",
-  "album_viewer_appbar_share_err_delete": "Impossibile eliminare l'album",
-  "album_viewer_appbar_share_err_leave": "Impossibile lasciare l'album",
-  "album_viewer_appbar_share_err_remove": "Ci sono problemi nel rimuovere oggetti dall'album",
-  "album_viewer_appbar_share_err_title": "Impossibile cambiare il titolo dell'album",
+  "album_viewer_appbar_share_err_delete": "Non è stato possibile eliminare l'album",
+  "album_viewer_appbar_share_err_leave": "Non è stato possibile lasciare l'album",
+  "album_viewer_appbar_share_err_remove": "Ci sono problemi nel rimuovere elementi dall'album",
+  "album_viewer_appbar_share_err_title": "Non è stato possibile cambiare il titolo dell'album",
   "album_viewer_appbar_share_leave": "Lascia album",
   "album_viewer_appbar_share_to": "Condividi a",
   "album_viewer_page_share_add_users": "Aggiungi utenti",
   "album_with_link_access": "Permetti a chiunque possieda il link di visualizzare le foto e le persone dell'album.",
   "albums": "Album",
   "albums_count": "{count, plural, one {{count, number} Album} other {{count, number} Album}}",
-  "albums_default_sort_order": "Ordinamento album predefinito",
-  "albums_default_sort_order_description": "Ordine iniziale degli asset alla creazione di nuovi album.",
-  "albums_feature_description": "Collezione di asset che possono essere condivisi con altri utenti.",
+  "albums_default_sort_order": "Ordinamento predefinito degli album",
+  "albums_default_sort_order_description": "Ordine iniziale degli elementi alla creazione di nuovi album.",
+  "albums_feature_description": "Raggruppamento di elementi che possono essere condivisi con altri utenti.",
   "all": "Tutti",
   "all_albums": "Tutti gli album",
   "all_people": "Tutte le persone",
   "all_videos": "Tutti i video",
   "allow_dark_mode": "Permetti Tema Scuro",
-  "allow_edits": "Permetti Modifiche",
+  "allow_edits": "Permetti modifiche",
   "allow_public_user_to_download": "Permetti agli utenti pubblici di scaricare",
   "allow_public_user_to_upload": "Permetti agli utenti pubblici di caricare",
   "alt_text_qr_code": "Immagine QR",
   "anti_clockwise": "Senso anti-orario",
   "api_key": "Chiave API",
-  "api_key_description": "Il valore verrà mostrato solo una volta. Assicurati di copiarlo prima di chiudere la finestra.",
-  "api_key_empty": "Il nome della chiave API non può essere vuoto",
+  "api_key_description": "Questo valore verrà mostrato una sola volta. Assicurati di copiarlo prima di chiudere la finestra.",
+  "api_key_empty": "Il nome della chiave API non dovrebbe essere vuoto",
   "api_keys": "Chiavi API",
   "app_bar_signout_dialog_content": "Sei sicuro di volerti disconnettere?",
   "app_bar_signout_dialog_ok": "Si",
@@ -427,8 +445,9 @@
   "app_settings": "Impostazioni Applicazione",
   "appears_in": "Compare in",
   "archive": "Archivio",
+  "archive_action_prompt": "Aggiunti {count} elementi all'Archivio",
   "archive_or_unarchive_photo": "Archivia o ripristina foto",
-  "archive_page_no_archived_assets": "Nessuna oggetto archiviato",
+  "archive_page_no_archived_assets": "Non è stato trovato nessun elemento archiviato",
   "archive_page_title": "Archivio ({count})",
   "archive_size": "Dimensioni Archivio",
   "archive_size_description": "Imposta le dimensioni dell'archivio per i download (in GiB)",
@@ -440,42 +459,41 @@
   "asset_action_share_err_offline": "Non è possibile recuperare le risorse offline, azione ignorata",
   "asset_added_to_album": "Aggiunto all'album",
   "asset_adding_to_album": "Aggiungendo all'album…",
-  "asset_description_updated": "La descrizione del media è stata aggiornata",
+  "asset_description_updated": "La descrizione dell'elemento è stata aggiornata",
   "asset_filename_is_offline": "Il media {filename} è offline",
   "asset_has_unassigned_faces": "Il media ha dei volti non categorizzati",
   "asset_hashing": "Hashing in corso …",
   "asset_list_group_by_sub_title": "Raggruppa per",
   "asset_list_layout_settings_dynamic_layout_title": "Layout dinamico",
   "asset_list_layout_settings_group_automatically": "Automatico",
-  "asset_list_layout_settings_group_by": "Raggruppa le risorse per",
+  "asset_list_layout_settings_group_by": "Raggruppa gli elementi per",
   "asset_list_layout_settings_group_by_month_day": "Mese + giorno",
   "asset_list_layout_sub_title": "Layout",
-  "asset_list_settings_subtitle": "Impostazion del layout della griglia delle foto",
+  "asset_list_settings_subtitle": "Impostazioni del layout della griglia delle foto",
   "asset_list_settings_title": "Griglia foto",
-  "asset_offline": "Risorsa Offline",
-  "asset_offline_description": "Questo media non è stato trovato nel disco. Contatta il tuo amministratore di Immich per assistenza.",
-  "asset_restored_successfully": "Asset ripristinato con successo",
+  "asset_offline": "Elemento Offline",
+  "asset_offline_description": "Questo elemento esterno non viene più trovato sul disco. Contatta il tuo amministratore di Immich per assistenza.",
+  "asset_restored_successfully": "Elemento ripristinato con successo",
   "asset_skipped": "Saltato",
   "asset_skipped_in_trash": "Nel cestino",
   "asset_uploaded": "Caricato",
   "asset_uploading": "Caricamento…",
-  "asset_viewer_settings_subtitle": "Gestisci le impostazioni del visualizzatore risorse",
+  "asset_viewer_settings_subtitle": "Gestisci le impostazioni del visualizzatore della galleria",
   "asset_viewer_settings_title": "Visualizzazione risorse",
   "assets": "Risorse",
   "assets_added_count": "{count, plural, one {# asset aggiunto} other {# asset aggiunti}}",
   "assets_added_to_album_count": "{count, plural, one {# asset aggiunto} other {# asset aggiunti}} all'album",
-  "assets_added_to_name_count": "Aggiunti {count, plural, one {# asset} other {# assets}} a {hasName, select, true {<b>{name}</b>} other {new album}}",
-  "assets_cannot_be_added_to_album_count": "{count, plural, one {L'asset} other {Gli asset}} non possono essere aggiunti all'album",
-  "assets_count": "{count, plural, other {# asset}}",
+  "assets_cannot_be_added_to_album_count": "{count, plural, one {L'elemento} other {Gli elementi}} non possono essere aggiunti all'album",
+  "assets_count": "{count, plural, one {# elemento} other {# elementi}}",
   "assets_deleted_permanently": "{count} elementi cancellati definitivamente",
   "assets_deleted_permanently_from_server": "{count} elementi cancellati definitivamente dal server Immich",
-  "assets_downloaded_failed": "{count, plural, one {Scaricato # file - {error} file non riusciti} other {Scaricati # file - {error} file non riusciti}}",
+  "assets_downloaded_failed": "{count, plural, one {Scaricato # file - {error} file non riuscito} other {Scaricati # file - {error} file non riusciti}}",
   "assets_downloaded_successfully": "{count, plural, one {Scaricato # file con successo} other {Scaricati # file con successo}}",
-  "assets_moved_to_trash_count": "{count, plural, one {# asset spostato} other {# asset spostati}} nel cestino",
+  "assets_moved_to_trash_count": "{count, plural, one {# elemento spostato} other {# elementi spostati}} nel cestino",
   "assets_permanently_deleted_count": "{count, plural, one {# asset cancellato} other {# asset cancellati}} definitivamente",
   "assets_removed_count": "{count, plural, one {# asset rimosso} other {# asset rimossi}}",
   "assets_removed_permanently_from_device": "{count} elementi cancellati definitivamente dal tuo dispositivo",
-  "assets_restore_confirmation": "Sei sicuro di voler ripristinare tutti gli asset cancellati? Non puoi annullare questa azione! Tieni presente che eventuali risorse offline NON possono essere ripristinate in questo modo.",
+  "assets_restore_confirmation": "Sei sicuro di voler ripristinare tutti gli elementi cancellati? Non puoi annullare questa azione! Tieni presente che eventuali risorse offline NON possono essere ripristinate in questo modo.",
   "assets_restored_count": "{count, plural, one {# asset ripristinato} other {# asset ripristinati}}",
   "assets_restored_successfully": "{count} elementi ripristinati",
   "assets_trashed": "{count} elementi cestinati",
@@ -497,7 +515,7 @@
   "backup_album_selection_page_selection_info": "Informazioni sulla selezione",
   "backup_album_selection_page_total_assets": "Numero totale delle risorse",
   "backup_all": "Tutti",
-  "backup_background_service_backup_failed_message": "Impossibile caricare i contenuti. Riprovo…",
+  "backup_background_service_backup_failed_message": "È stato impossibile fare il backup dei contenuti. Riprovo…",
   "backup_background_service_connection_failed_message": "Impossibile connettersi al server. Riprovo…",
   "backup_background_service_current_upload_notification": "Caricamento di {filename} in corso",
   "backup_background_service_default_notification": "Ricerca di nuovi contenuti…",
@@ -506,7 +524,7 @@
   "backup_background_service_upload_failure_notification": "Impossibile caricare {filename}",
   "backup_controller_page_albums": "Backup Album",
   "backup_controller_page_background_app_refresh_disabled_content": "Attiva l'aggiornamento dell'app in background in Impostazioni > Generale > Aggiorna app in background per utilizzare backup in background.",
-  "backup_controller_page_background_app_refresh_disabled_title": "Backup in background è disattivo",
+  "backup_controller_page_background_app_refresh_disabled_title": "Aggiornamento dell'app in background disattivo",
   "backup_controller_page_background_app_refresh_enable_button_text": "Vai alle impostazioni",
   "backup_controller_page_background_battery_info_link": "Mostrami come",
   "backup_controller_page_background_battery_info_message": "Per una migliore esperienza di backup, disabilita le ottimizzazioni della batteria per l'app Immich.\n\nDal momento che è una funzionalità specifica del dispositivo, per favore consulta il manuale del produttore.",
@@ -515,12 +533,12 @@
   "backup_controller_page_background_charging": "Solo durante la ricarica",
   "backup_controller_page_background_configure_error": "Impossibile configurare i servizi in background",
   "backup_controller_page_background_delay": "Ritarda il backup di nuovi elementi: {duration}",
-  "backup_controller_page_background_description": "Abilita i servizi in background per fare il backup di tutti i nuovi contenuti senza la necessità di aprire l'app",
-  "backup_controller_page_background_is_off": "Backup automatico disattivato",
-  "backup_controller_page_background_is_on": "Backup automatico attivo",
+  "backup_controller_page_background_description": "Abilita i servizi in background per fare il backup di nuovi contenuti senza la necessità di aprire l'app",
+  "backup_controller_page_background_is_off": "Backup automatico in background disattivato",
+  "backup_controller_page_background_is_on": "Backup automatico in background attivo",
   "backup_controller_page_background_turn_off": "Disabilita servizi in background",
   "backup_controller_page_background_turn_on": "Abilita servizi in background",
-  "backup_controller_page_background_wifi": "Solo Wi-Fi",
+  "backup_controller_page_background_wifi": "Solo con Wi-Fi",
   "backup_controller_page_backup": "Backup",
   "backup_controller_page_backup_selected": "Selezionati: ",
   "backup_controller_page_backup_sub": "Foto e video caricati",
@@ -703,7 +721,7 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Scuro",
-  "darkTheme": "Attiva/Disattiva tema scuro",
+  "dark_theme": "Imposta tema scuro",
   "date_after": "Data dopo",
   "date_and_time": "Data e ora",
   "date_before": "Data prima",
@@ -719,6 +737,7 @@
   "default_locale": "Localizzazione preimpostata",
   "default_locale_description": "Formatta la data e i numeri in base alle impostazioni del tuo browser",
   "delete": "Elimina",
+  "delete_action_prompt": "{count} elementi eliminati definitivamente",
   "delete_album": "Elimina album",
   "delete_api_key_prompt": "Sei sicuro di voler eliminare questa chiave API?",
   "delete_dialog_alert": "Questi oggetti saranno eliminati definitivamente da Immich e dal tuo device",
@@ -799,6 +818,7 @@
   "edit_key": "Modifica chiave",
   "edit_link": "Modifica link",
   "edit_location": "Modifica posizione",
+  "edit_location_action_prompt": "{count} luoghi modificati",
   "edit_location_dialog_title": "Posizione",
   "edit_name": "Modifica nome",
   "edit_people": "Modifica persone",
@@ -984,6 +1004,7 @@
   "failed_to_load_assets": "Impossibile caricare gli asset",
   "failed_to_load_folder": "Impossibile caricare la cartella",
   "favorite": "Preferito",
+  "favorite_action_prompt": "{count} elementi aggiunti ai preferiti",
   "favorite_or_unfavorite_photo": "Aggiungi o rimuovi foto da preferiti",
   "favorites": "Preferiti",
   "favorites_page_no_favorites": "Nessun preferito",
@@ -1127,6 +1148,7 @@
   "library_page_sort_created": "Data di creazione",
   "library_page_sort_last_modified": "Ultima modifica",
   "library_page_sort_title": "Titolo album",
+  "licenses": "Licenze",
   "light": "Chiaro",
   "like_deleted": "Mi piace rimosso",
   "link_motion_video": "Collega video in movimento",
@@ -1246,6 +1268,7 @@
   "more": "Di più",
   "move": "Sposta",
   "move_off_locked_folder": "Sposta al di fuori della cartella privata",
+  "move_to_lock_folder_action_prompt": "{count} elementi aggiunti alla cartella sicura",
   "move_to_locked_folder": "Sposta nella cartella privata",
   "move_to_locked_folder_confirmation": "Queste foto e video verranno rimossi da tutti gli album, e saranno visibili solo dalla cartella privata",
   "moved_to_archive": "Spostati {count, plural, one {# asset} other {# assets}} nell'archivio",
@@ -1479,13 +1502,13 @@
   "recently_taken_page_title": "Scattate di Recente",
   "refresh": "Aggiorna",
   "refresh_encoded_videos": "Ricarica video codificati",
-  "refresh_faces": "Aggiorna facce",
+  "refresh_faces": "Aggiorna volti",
   "refresh_metadata": "Ricarica metadati",
   "refresh_thumbnails": "Ricarica anteprime",
   "refreshed": "Aggiornato",
   "refreshes_every_file": "Rilegge tutti i file esistenti e nuovi",
   "refreshing_encoded_video": "Ricaricando il video codificato",
-  "refreshing_faces": "Aggiorna Facce",
+  "refreshing_faces": "Aggiornando volti",
   "refreshing_metadata": "Ricaricando i metadati",
   "regenerating_thumbnails": "Rigenerando le anteprime",
   "remove": "Rimuovi",
@@ -1496,6 +1519,7 @@
   "remove_deleted_assets": "Rimuovi file offline",
   "remove_from_album": "Rimuovere dall'album",
   "remove_from_favorites": "Rimuovi dai preferiti",
+  "remove_from_lock_folder_action_prompt": "{count} elementi rimossi dalla cartella sicura",
   "remove_from_locked_folder": "Rimuovi dalla cartella privata",
   "remove_from_locked_folder_confirmation": "Sei sicuro di voler spostare queste foto e questi video dalla cartella privata? Diventeranno visibili nella vostra libreria.",
   "remove_from_shared_link": "Rimuovi dal link condiviso",
@@ -1838,6 +1862,7 @@
   "total": "Totale",
   "total_usage": "Utilizzo totale",
   "trash": "Cestino",
+  "trash_action_prompt": "{count} elementi spostati nel cestino",
   "trash_all": "Cestina Tutto",
   "trash_count": "Cancella {count, number}",
   "trash_delete_asset": "Cestina/Cancella Asset",
diff --git a/i18n/ja.json b/i18n/ja.json
index 1649f978d8..69c0f368fa 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -427,6 +427,7 @@
   "app_settings": "アプリ設定",
   "appears_in": "これらに含まれます",
   "archive": "アーカイブ",
+  "archive_action_prompt": "アーカイブに{count}項目追加しました",
   "archive_or_unarchive_photo": "写真をアーカイブまたはアーカイブ解除",
   "archive_page_no_archived_assets": "アーカイブした写真またはビデオがありません",
   "archive_page_title": "アーカイブ ({count})",
@@ -464,7 +465,6 @@
   "assets": "アセット",
   "assets_added_count": "{count, plural, one {#個} other {#個}}のアセットを追加しました",
   "assets_added_to_album_count": "{count, plural, one {#個} other {#個}}のアセットをアルバムに追加しました",
-  "assets_added_to_name_count": "{count, plural, one {#個} other {#個}}のアセットを{hasName, select, true {<b>{name}</b>} other {新しいアルバム}}に追加しました",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {アセット} other {アセット}} はアルバムに追加できません",
   "assets_count": "{count, plural, one {#個} other {#個}}のアセット",
   "assets_deleted_permanently": "{count}項目を完全に削除しました",
@@ -492,7 +492,7 @@
   "background_location_permission_content": "正常にWi-Fiの名前(SSID)を獲得するにはアプリが常に詳細な位置情報にアクセスできる必要があります",
   "backup_album_selection_page_albums_device": "デバイス上のアルバム({count})",
   "backup_album_selection_page_albums_tap": "タップで選択、ダブルタップで除外",
-  "backup_album_selection_page_assets_scatter": "アルバムを選択・除外してバックアップする写真を選ぶ (同じ写真が複数のアルバムに登録されていることがあるため)",
+  "backup_album_selection_page_assets_scatter": "アルバムを選択・除外してバックアップする写真を選ぶ。 (同じ写真が複数のアルバムに登録されていることがあるため)",
   "backup_album_selection_page_select_albums": "アルバムを選択",
   "backup_album_selection_page_selection_info": "選択・除外中のアルバム",
   "backup_album_selection_page_total_assets": "選択されたアルバムの写真と動画の数",
@@ -703,7 +703,7 @@
   "daily_title_text_date": "MM DD, EE",
   "daily_title_text_date_year": "yyyy MM DD, EE",
   "dark": "ダークモード",
-  "darkTheme": "ダークモードを切り替え",
+  "dark_theme": "ダークモード切り替え",
   "date_after": "この日以降",
   "date_and_time": "日付と時間",
   "date_before": "この日以前",
@@ -719,6 +719,7 @@
   "default_locale": "デフォルトのロケール",
   "default_locale_description": "ブラウザのロケールに基づいて日付と数値をフォーマットします",
   "delete": "削除",
+  "delete_action_prompt": "{count}項目を完全に削除しました",
   "delete_album": "アルバムを削除",
   "delete_api_key_prompt": "本当にこのAPI キーを削除しますか?",
   "delete_dialog_alert": "サーバーとデバイスの両方から完全に削除されます",
@@ -799,6 +800,7 @@
   "edit_key": "キーを編集",
   "edit_link": "リンクを編集する",
   "edit_location": "位置情報を編集",
+  "edit_location_action_prompt": "{count}項目の位置情報を変更しました",
   "edit_location_dialog_title": "位置情報",
   "edit_name": "名前を変更",
   "edit_people": "人物を編集",
@@ -984,6 +986,7 @@
   "failed_to_load_assets": "アセットのロードに失敗しました",
   "failed_to_load_folder": "フォルダーの読み込みに失敗",
   "favorite": "お気に入り",
+  "favorite_action_prompt": "{count}項目をお気に入りに追加しました",
   "favorite_or_unfavorite_photo": "写真をお気にいりに登録または解除",
   "favorites": "お気に入り",
   "favorites_page_no_favorites": "お気に入り登録された項目がありません",
@@ -1246,6 +1249,7 @@
   "more": "もっと表示",
   "move": "移動",
   "move_off_locked_folder": "鍵付きフォルダーから出す",
+  "move_to_lock_folder_action_prompt": "{count}項目を鍵付きフォルダーに追加しました",
   "move_to_locked_folder": "鍵付きフォルダーへ移動",
   "move_to_locked_folder_confirmation": "これらの写真や動画はすべてのアルバムから外され、鍵付きフォルダー内でのみ閲覧可能になります",
   "moved_to_archive": "{count, plural, one {#} other {#}}項目をアーカイブしました",
@@ -1496,6 +1500,7 @@
   "remove_deleted_assets": "オフラインのアセットを削除",
   "remove_from_album": "アルバムから削除",
   "remove_from_favorites": "お気に入り解除",
+  "remove_from_lock_folder_action_prompt": "{count}項目を鍵付きフォルダーから出しました",
   "remove_from_locked_folder": "鍵付きフォルダーから取り除く",
   "remove_from_locked_folder_confirmation": "選択した写真・動画を鍵付きフォルダーの外に出してよろしいですか？ライブラリに再び表示されるようになります",
   "remove_from_shared_link": "共有リンクから削除",
@@ -1838,6 +1843,7 @@
   "total": "合計",
   "total_usage": "総使用量",
   "trash": "ゴミ箱",
+  "trash_action_prompt": "{count}項目をゴミ箱に移動しました",
   "trash_all": "全て削除",
   "trash_count": "{count, number}枚ゴミ箱へ移動",
   "trash_delete_asset": "アセットをゴミ箱へ移動/削除",
diff --git a/i18n/ko.json b/i18n/ko.json
index 01b29e6776..1890962e5a 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -22,6 +22,7 @@
   "add_partner": "파트너 추가",
   "add_path": "경로 추가",
   "add_photos": "사진 추가",
+  "add_tag": "태그 추가하기",
   "add_to": "앨범에 추가…",
   "add_to_album": "앨범에 추가",
   "add_to_album_bottom_sheet_added": "{album}에 추가되었습니다.",
@@ -33,6 +34,7 @@
   "added_to_favorites_count": "즐겨찾기에 {count, number}개 추가됨",
   "admin": {
     "add_exclusion_pattern_description": "규칙에 *, ** 및 ? 를 사용할 수 있습니다. 이름이 \"Raw\"인 디렉터리의 모든 파일을 제외하려면 \"**/Raw/**\"를, \".tif\"로 끝나는 모든 파일을 제외하려면 \"**/*.tif\"를 사용하고, 절대 경로의 경우 \"/path/to/ignore/**\"와 같은 방식으로 사용합니다.",
+    "admin_user": "관리자",
     "asset_offline_description": "외부 라이브러리에 포함된 이 항목을 디스크에서 더이상 찾을 수 없어 휴지통으로 이동되었습니다. 파일이 라이브러리 내에서 이동된 경우 타임라인에서 새로 연결된 항목을 확인하세요. 항목을 복원하려면 아래의 파일 경로에 Immich가 접근할 수 있는지 확인하고 라이브러리 스캔을 진행하세요.",
     "authentication_settings": "인증 설정",
     "authentication_settings_description": "비밀번호, OAuth 및 기타 인증 설정 관리",
@@ -43,7 +45,7 @@
     "backup_database_enable_description": "데이터베이스 덤프 활성화",
     "backup_keep_last_amount": "보관할 이전 덤프의 수",
     "backup_settings": "데이터베이스 덤프 설정",
-    "backup_settings_description": "데이터베이스 덤프 설정을 관리합니다. 참고: 이 작업은 진행 및 실패 여부를 확인할 수 없습니다.",
+    "backup_settings_description": "데이터베이스 덤프 설정을 관리합니다.",
     "cleared_jobs": "작업 중단: {job}",
     "config_set_by_file": "현재 구성은 설정 파일을 통해 지정되어 있습니다.",
     "confirm_delete_library": "{library} 라이브러리를 삭제하시겠습니까?",
@@ -164,12 +166,26 @@
     "metadata_settings_description": "메타데이터 설정 관리",
     "migration_job": "마이그레이션",
     "migration_job_description": "각 항목의 섬네일 및 인물의 얼굴을 최신 폴더 구조로 마이그레이션",
+    "nightly_tasks_cluster_faces_setting_description": "새로 감지된 얼굴에 대하여 얼굴 인식을 실행",
+    "nightly_tasks_cluster_new_faces_setting": "새 얼굴 묶기",
+    "nightly_tasks_database_cleanup_setting": "데이터베이스 정리 작업",
+    "nightly_tasks_database_cleanup_setting_description": "데이터베이스에서 오래되거나 만료된 데이터 정리하기",
+    "nightly_tasks_generate_memories_setting": "메모리 생성하기",
+    "nightly_tasks_generate_memories_setting_description": "항목에서 새로운 메모리 만들기",
+    "nightly_tasks_missing_thumbnails_setting": "누락된 섬네일 생성하기",
+    "nightly_tasks_missing_thumbnails_setting_description": "섬네일이 없는 항목에 대해 섬네일 생성 대기열에 추가하기",
+    "nightly_tasks_settings": "야간 작업 설정",
+    "nightly_tasks_settings_description": "야간 작업 관리",
+    "nightly_tasks_start_time_setting": "시작 시간",
+    "nightly_tasks_start_time_setting_description": "서버가 야간 작업을 시작할 시간",
+    "nightly_tasks_sync_quota_usage_setting": "사용량 동기화",
+    "nightly_tasks_sync_quota_usage_setting_description": "현재 사용량에 따라 사용자의 사용량 갱신하기",
     "no_paths_added": "추가된 경로 없음",
     "no_pattern_added": "추가된 규칙 없음",
     "note_apply_storage_label_previous_assets": "참고: 이전에 업로드한 항목에도 스토리지 레이블을 적용하려면 다음을 실행합니다,",
     "note_cannot_be_changed_later": "주의: 추후 변경할 수 없습니다!",
     "notification_email_from_address": "보낸 사람 이메일",
-    "notification_email_from_address_description": "보낸 사람의 이메일 주소, 예: \"Immich Photo Server <noreply@example.com>\"",
+    "notification_email_from_address_description": "보낸 사람의 이메일 주소, 예: \"Immich Photo Server <noreply@example.com>\". 이메일을 보낼 수 있도록 허가 받은 주소만을 사용하세요.",
     "notification_email_host_description": "이메일 서버의 호스트 (예: smtp.immich.app)",
     "notification_email_ignore_certificate_errors": "인증서 오류 무시",
     "notification_email_ignore_certificate_errors_description": "TLS 인증서 유효성 검사 오류 무시 (권장되지 않음)",
@@ -194,6 +210,7 @@
     "oauth_mobile_redirect_uri": "모바일 리다이렉트 URI",
     "oauth_mobile_redirect_uri_override": "모바일 리다이렉트 URI 재정의",
     "oauth_mobile_redirect_uri_override_description": "OAuth 공급자가 ''{callback}''과 같은 모바일 URI를 제공하지 않는 경우 활성화하세요.",
+    "oauth_role_claim": "역할 수령",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "OAuth 로그인 설정 관리",
     "oauth_settings_more_details": "이 기능에 대한 자세한 내용은 <link>문서</link>를 참조하세요.",
@@ -202,7 +219,7 @@
     "oauth_storage_quota_claim": "스토리지 할당량 선택",
     "oauth_storage_quota_claim_description": "스토리지 할당량을 사용자가 입력한 값으로 자동 설정합니다.",
     "oauth_storage_quota_default": "스토리지 할당량 기본값 (GiB)",
-    "oauth_storage_quota_default_description": "입력하지 않은 경우 사용할 GiB 단위의 기본 할당량 (무제한 할당량의 경우 0 입력)",
+    "oauth_storage_quota_default_description": "입력하지 않은 경우 사용할 GiB 단위의 기본 할당량",
     "oauth_timeout": "요청 타임아웃",
     "oauth_timeout_description": "요청 타임아웃 (밀리초 단위)",
     "password_enable_description": "이메일과 비밀번호로 로그인",
@@ -242,6 +259,7 @@
     "storage_template_migration_info": "스토리지 템플릿은 모든 확장자를 소문자로 변환하며, 변경 사항은 새로 업로드한 항목에만 적용됩니다. 기존에 업로드된 항목에 적용하려면 <link>{job}</link>을 실행하세요.",
     "storage_template_migration_job": "스토리지 템플릿 마이그레이션 작업",
     "storage_template_more_details": "이 기능에 대한 자세한 내용은 <template-link>스토리지 템플릿</template-link> 및 <implications-link>설명</implications-link>을 참조하세요.",
+    "storage_template_onboarding_description_v2": "활성화 시, 이 기능은 사용자 지정 템플릿에 따라 파일을 자동 분류합니다. 자세한 정보는 <link>이 문서</link>를 확인하세요.",
     "storage_template_path_length": "대략적인 경로 길이 제한: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "스토리지 템플릿",
     "storage_template_settings_description": "업로드된 항목의 폴더 구조 및 파일 이름 관리",
@@ -288,7 +306,7 @@
     "transcoding_encoding_options": "인코딩 옵션",
     "transcoding_encoding_options_description": "인코딩된 동영상의 코덱, 해상도, 품질 및 기타 옵션 설정",
     "transcoding_hardware_acceleration": "하드웨어 가속",
-    "transcoding_hardware_acceleration_description": "실험적인 기능입니다. 속도가 향상되지만 동일 비트레이트에서 품질이 상대적으로 낮을 수 있습니다.",
+    "transcoding_hardware_acceleration_description": "실험적인 기능입니다. 트랜스코딩이 빨라지지만 동일 비트레이트에서 품질이 상대적으로 낮을 수 있습니다.",
     "transcoding_hardware_decoding": "하드웨어 디코딩",
     "transcoding_hardware_decoding_setting_description": "인코딩 가속을 위해 엔드 투 엔드 가속을 사용합니다. 모든 동영상에서 작동하지 않을 수 있습니다.",
     "transcoding_max_b_frames": "최대 B 프레임",
@@ -354,10 +372,12 @@
   "admin_password": "관리자 비밀번호",
   "administration": "관리",
   "advanced": "고급",
+  "advanced_settings_beta_timeline_subtitle": "새로운 앱 경험 사용하기",
+  "advanced_settings_beta_timeline_title": "베타 타임라인",
   "advanced_settings_enable_alternate_media_filter_subtitle": "이 옵션을 사용하면 동기화 중 미디어를 대체 기준으로 필터링할 수 있습니다. 앱이 모든 앨범을 제대로 감지하지 못할 때만 사용하세요.",
   "advanced_settings_enable_alternate_media_filter_title": "대체 기기 앨범 동기화 필터 사용 (실험적)",
   "advanced_settings_log_level_title": "로그 레벨: {level}",
-  "advanced_settings_prefer_remote_subtitle": "일부 기기의 경우 기기 내의 섬네일을 로드하는 속도가 매우 느립니다. 서버 이미지를 대신 로드하려면 이 설정을 활성화하세요.",
+  "advanced_settings_prefer_remote_subtitle": "일부 기기의 경우 로컬 항목에서 섬네일을 로드하는 속도가 매우 느립니다. 서버 이미지를 대신 로드하려면 이 설정을 활성화하세요.",
   "advanced_settings_prefer_remote_title": "서버 이미지 선호",
   "advanced_settings_proxy_headers_subtitle": "네트워크 요청을 보낼 때 Immich가 사용할 프록시 헤더를 정의합니다.",
   "advanced_settings_proxy_headers_title": "프록시 헤더",
@@ -401,6 +421,9 @@
   "album_with_link_access": "링크가 있는 경우 누구나 이 앨범의 사진과 인물을 볼 수 있습니다.",
   "albums": "앨범",
   "albums_count": "앨범 {count, plural, one {{count, number}개} other {{count, number}개}}",
+  "albums_default_sort_order": "기본 앨범 정렬 순서",
+  "albums_default_sort_order_description": "새 앨범을 생성할 때 기본적으로 항목을 정렬할 순서.",
+  "albums_feature_description": "다른 사용자와 공유할 수 있는 항목 모음.",
   "all": "모두",
   "all_albums": "모든 앨범",
   "all_people": "모든 인물",
@@ -421,6 +444,7 @@
   "app_settings": "앱 설정",
   "appears_in": "다음 앨범에 포함됨",
   "archive": "보관함",
+  "archive_action_prompt": "보관함에 {count}개가 추가되었습니다.",
   "archive_or_unarchive_photo": "보관 처리 또는 해제",
   "archive_page_no_archived_assets": "보관된 항목 없음",
   "archive_page_title": "보관함 ({count})",
@@ -458,10 +482,12 @@
   "assets": "항목",
   "assets_added_count": "{count, plural, one {#개} other {#개}} 항목 추가됨",
   "assets_added_to_album_count": "앨범에 항목 {count, plural, one {#개} other {#개}} 추가됨",
-  "assets_added_to_name_count": "{hasName, select, true {<b>{name}</b>} other {새 앨범}}에 항목 {count, plural, one {#개} other {#개}} 추가됨",
+  "assets_cannot_be_added_to_album_count": "{count, plural, one {항목} other {항목}]이 앨범에 추가될 수 없습니다.",
   "assets_count": "{count, plural, one {#개} other {#개}} 항목",
   "assets_deleted_permanently": "{count}개 항목이 영구적으로 삭제됨",
   "assets_deleted_permanently_from_server": "서버에서 항목 {count}개가 영구적으로 삭제됨",
+  "assets_downloaded_failed": "{count, plural, one {파일 #개 다운로드 완료 - {error}개 실패} other {파일 #개 다운로드 완료 - {error}개 실패}}",
+  "assets_downloaded_successfully": "{count, plural, one {#개 파일 다운로드 완료} other {#개 파일 다운로드 완료}}",
   "assets_moved_to_trash_count": "휴지통으로 항목 {count, plural, one {#개} other {#개}} 이동됨",
   "assets_permanently_deleted_count": "항목 {count, plural, one {#개} other {#개}}가 영구적으로 삭제됨",
   "assets_removed_count": "항목 {count, plural, one {#개} other {#개}}를 제거했습니다.",
@@ -476,6 +502,7 @@
   "authorized_devices": "인증된 기기",
   "automatic_endpoint_switching_subtitle": "지정된 Wi-Fi가 사용 가능한 경우 내부망을 통해 연결하고, 그렇지 않으면 다른 연결 방식을 사용합니다.",
   "automatic_endpoint_switching_title": "자동 URL 전환",
+  "autoplay_slideshow": "슬라이드 쇼 자동 재생",
   "back": "뒤로",
   "back_close_deselect": "뒤로, 닫기, 선택 취소",
   "background_location_permission": "백그라운드 위치 권한",
diff --git a/i18n/lt.json b/i18n/lt.json
index d5e6ff20ed..14668921d2 100644
--- a/i18n/lt.json
+++ b/i18n/lt.json
@@ -14,6 +14,7 @@
   "add_a_location": "Pridėti vietovę",
   "add_a_name": "Pridėti vardą",
   "add_a_title": "Pridėti pavadinimą",
+  "add_endpoint": "Pridėti galutinį tašką",
   "add_exclusion_pattern": "Pridėti išimčių šabloną",
   "add_import_path": "Pridėti importavimo kelią",
   "add_location": "Pridėti vietovę",
@@ -32,6 +33,8 @@
   "added_to_favorites": "Pridėta prie mėgstamiausių",
   "added_to_favorites_count": "{count, plural, one {# pridėtas} few {# pridėti} other {# pridėta}} prie mėgstamiausių",
   "admin": {
+    "add_exclusion_pattern_description": "Pridėti išimčių taisyklęs. Plaikomi simboliai *,**, ir ?. Ignoruoti bet kokius failus bet kuriame aplanke užvadintame \"Raw\", naudokite \"**/RAW/**\". Ignoravimui failų su plėtiniu \".tif\", naudokite \"**/*.tiff\". Aplanko kelio nustatymams, naudokite \"/aplanko/kelias/ignoruoti/**\"",
+    "admin_user": "Administratorius",
     "asset_offline_description": "Šis išorinės bibliotekos elementas nebepasiekiamas diske ir buvo perkeltas į šiukšliadėžę. Jei failas buvo perkeltas toje pačioje bibliotekoje, laiko skalėje rasite naują atitinkamą elementą. Jei norite šį elementą atkurti, įsitikinkite, kad Immich gali pasiekti failą žemiau nurodytu adresu, ir suvykdykite bibliotekos skenavimą.",
     "authentication_settings": "Autentifikavimo nustatymai",
     "authentication_settings_description": "Tvarkyti slaptažodžių, OAuth ir kitus autentifikavimo nustatymus",
@@ -42,8 +45,8 @@
     "backup_database_enable_description": "Įgalinti duomenų bazės išklotinės",
     "backup_keep_last_amount": "Išsaugomų ankstesnių duomenų bazės išklotinių skaičius",
     "backup_settings": "Duomenų bazės išklotinių nustatymai",
-    "backup_settings_description": "Tvarkyti duomenų bazės išklotinės nustatymus. Pastaba: Šie darbai nėra stebimi ir jums nebus pranešta apie nesėkmę.",
-    "cleared_jobs": "Išvalyti darbai: {job}",
+    "backup_settings_description": "Tvarkyti duomenų bazės išklotinės nustatymus. Pastaba: šie darbai nėra stebimi ir jums nebus pranešta apie nesėkmę.",
+    "cleared_jobs": "Išvalytos užduotys užduočiai: {job}",
     "config_set_by_file": "Konfigūracija nustatyta pagal konfigūracinį failą",
     "confirm_delete_library": "Ar tikrai norite ištrinti {library} biblioteką?",
     "confirm_delete_library_assets": "Ar tikrai norite ištrinti šią biblioteką? Šis veiksmas ištrins {count, plural, one {# contained asset} other {all # contained assets}} iš Immich ir negali būti grąžintas. Failai liks diske.",
@@ -51,7 +54,7 @@
     "confirm_reprocess_all_faces": "Ar tikrai norite iš naujo apdoroti visus veidus? Tai taip pat ištrins įvardytus asmenis.",
     "confirm_user_password_reset": "Ar tikrai norite iš naujo nustatyti {user} slaptažodį?",
     "confirm_user_pin_code_reset": "Ar tikrai norite iš naujo nustatyti {user} PIN kodą?",
-    "create_job": "Sukurti darbą",
+    "create_job": "Sukurti užduotį",
     "cron_expression": "Cron išraiška",
     "cron_expression_description": "Nustatyti skenavimo intervalą naudojant cron formatą. Norėdami gauti daugiau informacijos žiūrėkite <link>Crontab Guru</link>",
     "cron_expression_presets": "Išankstiniai Cron nustatymai",
@@ -62,15 +65,19 @@
     "face_detection": "Veidų aptikimas",
     "face_detection_description": "Veidų aptikimas bibliotekos elementuose naudojant mašininį mokymąsi. Vaizdo įrašų atveju naudojama tik miniatiūra. \"Atnaujinti\" iš naujo nuskaito visus bibliotekos elementus. \"Atstatyti\" ne tik atnaujina, bet ir išvalo visus esamus veidų duomenis. \"Trūkstami\" nuskaito tik dar nenuskaitytus bibliotekos elementus. Veidų aptikimo darbui pasibaigus, aptikti veidai patenka į veidų atpažinimo darbų eilę, kur jie priskiriami jau esamiems ar naujai atpažintiems žmonėms.",
     "facial_recognition_job_description": "Aptiktų veidų atpažinimas ir priskyrimas žmonėms. Šis darbas vykdomas pasibaigus \"veidų aptikimo\" darbui. \"Atstatyti\" (per)grupuoja visus aptiktus veidus. \"Trūkstami\" apdoroja jokiam žmogui dar nepriskirtus aptiktus veidus.",
-    "failed_job_command": "Darbo {job} komanda {command} nepavyko",
+    "failed_job_command": "Užduoties {job} komanda {command} nepavyko",
     "force_delete_user_warning": "ĮSPĖJIMAS: Šis veiksmas iš karto pašalins naudotoją ir visą jo informaciją. Šis žingsnis nesugrąžinamas ir failų nebus galima atkurti.",
     "image_format": "Formatas",
     "image_format_description": "WebP sukuria mažesnius failus nei JPEG, tačiau lėčiau juos apdoroja.",
+    "image_fullsize_description": "Pilno dydžio nuotrauka be meta duomenų naudojama priartinus",
     "image_fullsize_enabled": "Įgalinti pilno dydžio nuotraukų generavimą",
+    "image_fullsize_enabled_description": "Generuoti viso dydžio vaizdą neinternetui pritaikytiems formatams. Kai įjungta parinktis „Pirmenybė įterptai peržiūrai“, įterptosios peržiūros naudojamos tiesiogiai be konvertavimo. Tai neturi įtakos internetui pritaikytiems formatams, pvz., JPEG",
     "image_fullsize_quality_description": "Pilno dydžio nuotraukų kokybė 1-100. Didesnė yra geresnė, tačiau sukuria didesniu failus.",
     "image_fullsize_title": "Pilno dydžio nuotraukų Nustatymai",
     "image_prefer_embedded_preview": "Pageidautinai rodyti įterptą peržiūrą",
+    "image_prefer_embedded_preview_setting_description": "Naudokite įterptąsias peržiūras RAW nuotraukose kaip įvestį vaizdų apdorojimui ir, jei įmanoma, tai gali suteikti tikslesnes kai kurių vaizdų spalvas, tačiau peržiūros kokybė priklauso nuo fotoaparato, todėl vaizde gali būti daugiau glaudinimo artefaktų.",
     "image_prefer_wide_gamut": "Teikti pirmenybę plačiai gamai",
+    "image_prefer_wide_gamut_setting_description": "Miniatiūroms naudokite „Display P3“. Taip geriau išsaugomas vaizdų, turinčių plačias spalvų erdves, ryškumas, tačiau senesniuose įrenginiuose su senesne naršyklės versija vaizdai gali atrodyti kitaip. sRGB vaizdai išsaugomi kaip sRGB, kad būtų išvengta spalvų pasikeitimo.",
     "image_preview_description": "Vidutinio dydžio vaizdas su išvalytais metaduomenimis, naudojamas kai žiūrimas vienas objektas arba mašininiam mokymuisi",
     "image_preview_quality_description": "Peržiūros kokybė nuo 1-100. Aukštesnės reikšmės yra geriau, bet sukuriami didesni failai gali sumažinti programos reagavimo laiką. Mažos vertės nustatymas gali paveikti mašininio mokymo kokybę.",
     "image_preview_title": "Peržiūros nustatymai",
@@ -83,11 +90,11 @@
     "image_thumbnail_quality_description": "Miniatiūros kokybė nuo 1-100. Aukštesnės reikšmės yra geriau, bet pagaminami didesni failai ir gali būti sulėtintas programos reagavimo greitis.",
     "image_thumbnail_title": "Miniatiūros nustatymai",
     "job_concurrency": "{job} lygiagretumas",
-    "job_created": "Darbas sukurtas",
-    "job_not_concurrency_safe": "Šis darbas nėra saugus apdoroti lygiagrečiai.",
-    "job_settings": "Darbų nustatymai",
-    "job_settings_description": "Keisti darbų lygiagretumą",
-    "job_status": "Darbų būsenos",
+    "job_created": "Užduotis sukurta",
+    "job_not_concurrency_safe": "Ši užduotis nėra saugi apdoroti lygiagrečiai.",
+    "job_settings": "Užduočių nustatymai",
+    "job_settings_description": "Keisti užduočių lygiagretumą",
+    "job_status": "Užduočių būsenos",
     "library_created": "Sukurta biblioteka: {library}",
     "library_deleted": "Biblioteka ištrinta",
     "library_import_path_description": "Nurodykite aplanką, kurį norite importuoti. Šiame aplanke, įskaitant poaplankius, bus nuskaityti vaizdai ir vaizdo įrašai.",
@@ -104,6 +111,7 @@
     "logging_level_description": "Įjungus, kokį žurnalo vedimo lygį naudot.",
     "logging_settings": "Žurnalo vedimas",
     "machine_learning_clip_model": "CLIP modelis",
+    "machine_learning_clip_model_description": "Pavadinimas CLIP modelio įvardintio <link>here</link>. Dėmesio, keičiant modelį jūs privalote iš naujo paleisti 'Išmaniosios Paieškos' užduotį visiems vaizdams.",
     "machine_learning_duplicate_detection": "Dublikatų aptikimas",
     "machine_learning_duplicate_detection_enabled": "Įjungti dublikatų aptikimą",
     "machine_learning_duplicate_detection_enabled_description": "Jei išjungta, visiškai identiški elementai vis tiek bus deduplikuoti.",
@@ -113,12 +121,15 @@
     "machine_learning_facial_recognition": "Veidų atpažinimas",
     "machine_learning_facial_recognition_description": "Aptikti, atpažinti ir sugrupuoti veidus nuotraukose",
     "machine_learning_facial_recognition_model": "Veidų atpažinimo modelis",
+    "machine_learning_facial_recognition_model_description": "Modeliai išvardinti apimties mažėjančia tvarka. Didieji modeliai yra lėti ir naudoja daugiau atminties, tačiau sukuria geresnius rezultatus. Pastebime kad keičiant modelį jūs turite iš naujo paleisti Veidų Atpažinimo užduotį visiems vaizdams.",
     "machine_learning_facial_recognition_setting": "Įgalinti veidų atpažinimą",
     "machine_learning_facial_recognition_setting_description": "Išjungus, vaizdai nebus užšifruoti veidų atpažinimui ir nebus naudojami Žmonių sekcijoje Naršymo puslapyje.",
     "machine_learning_max_detection_distance": "Maksimalus aptikimo atstumas",
     "machine_learning_max_detection_distance_description": "Didžiausias atstumas tarp dviejų vaizdų, kad jie būtų laikomi dublikatais, svyruoja nuo 0,001 iki 0,1. Didesnės vertės aptiks daugiau dublikatų, tačiau gali būti klaidingai teigiami.",
     "machine_learning_max_recognition_distance": "Maksimalus atpažinimo atstumas",
+    "machine_learning_max_recognition_distance_description": "Didžiausias skirtumas tarp veidų, kad būtų užskaityti kaip vienas ir tas pats asmuo, rėžis nuo 0-2. Mažinant tai gali apsaugoti nuo dviejų žmonių žymėjimo tuo pačiu asmeniu, didinant tai gali apsaugoti nuo to pačio asmens žymėjimo kaip du skirtingus žmones. Pastebime kad yra paprasčiau apjungti kelių žmonių modelius į vieną nei vieną išdalinti į du, taigi kai įmanoma geriau naudoti mažensę ribą.",
     "machine_learning_min_detection_score": "Minimalus aptikimo balas",
+    "machine_learning_min_detection_score_description": "Minimalus užtikrintumo balas veido aptikimui nuo 0-1. Mažesnė reikšmė aptiks daugiau veidų tačiau bus ir daugiau klaidingų teigiamų režultatų.",
     "machine_learning_min_recognized_faces": "Mažiausias atpažintų veidų skaičius",
     "machine_learning_min_recognized_faces_description": "Mažiausias atpažintų veidų skaičius asmeniui, kurį reikia sukurti. Tai padidinus, veido atpažinimas tampa tikslesnis, bet padidėja tikimybė, kad veidas žmogui nepriskirtas.",
     "machine_learning_settings": "Mašininio mokymosi nustatymai",
@@ -151,10 +162,14 @@
     "metadata_faces_import_setting_description": "Importuoti veidus iš vaizdo EXIF duomenų ir papildomų failų",
     "metadata_settings": "Metaduomenų nustatymai",
     "metadata_settings_description": "Tvarkyti metaduomenų nustatymus",
-    "migration_job": "Migracija",
+    "migration_job": "Tvarkymas",
+    "migration_job_description": "Pertvarkytį turinio ir veidų miniatiūras pagal naują struktūrą",
+    "nightly_tasks_cluster_faces_setting_description": "Paleisti veido atpažinimą naujai aptiktiems veidams",
+    "nightly_tasks_cluster_new_faces_setting": "Sugrupuoti naujus veidus",
+    "nightly_tasks_database_cleanup_setting": "Duomenų bazės valymo darbai",
     "no_paths_added": "Keliai nepridėti",
     "no_pattern_added": "Šablonas nepridėtas",
-    "note_apply_storage_label_previous_assets": "Pastaba: norėdami pritaikyti saugyklos etiketę seniau įkeltiems ištekliams, paleiskite",
+    "note_apply_storage_label_previous_assets": "Pastaba: norėdami pritaikyti Saugyklos Žymą seniau įkeltiems ištekliams, paleiskite",
     "note_cannot_be_changed_later": "PASTABA: Vėliau to pakeisti negalima!",
     "notification_email_from_address": "Iš adreso",
     "notification_email_from_address_description": "Siuntėjo elektroninis adresas, pavyzdžiui: \"Immich Photo Server <noreply@example.com>\"",
@@ -177,20 +192,29 @@
     "oauth_auto_register": "Automatinis registravimas",
     "oauth_auto_register_description": "Automatiškai užregistruoti naujus naudotojus po prisijungimo per OAuth",
     "oauth_button_text": "Mygtuko tekstas",
+    "oauth_client_secret_description": "Privalomas jei PKCE (Proof Key for Code Exchange) nepalaikomas pagal OAuth tiekėją",
     "oauth_enable_description": "Prisijungti su OAuth",
     "oauth_mobile_redirect_uri": "Mobiliojo peradresavimo URI",
     "oauth_mobile_redirect_uri_override": "Mobiliojo peradresavimo URI pakeitimas",
     "oauth_mobile_redirect_uri_override_description": "Įjunkite, kai OAuth teikėjas nepalaiko mobiliojo URI, tokio kaip ''{callback}''",
+    "oauth_role_claim": "Rolės Tvirtinimas",
+    "oauth_role_claim_description": "Suteikti admin teises automatiškai pagal šios rolės tvirtinimo buvimą. Tvirtinimas gali turėti priskirtus arba 'vartotoją' arba 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Tvarkyti OAuth prisijungimo nustatymus",
     "oauth_settings_more_details": "Detaliau apie šią funkciją galite paskaityti <link>dokumentacijoje</link>.",
+    "oauth_storage_label_claim": "Saugyklos Žyma pagal tvirtinimą",
+    "oauth_storage_label_claim_description": "Priskirti Saugyklos Žymą automatiškai pagal reikšmę vartotojo tvirtinime.",
+    "oauth_storage_quota_claim": "Saugyklos apimties tvirtinimas",
+    "oauth_storage_quota_claim_description": "Priskirti vartotojo saugyklos apimties kvotą automatiškai pagal šio tvirtinimo reikšmę.",
     "oauth_storage_quota_default": "Numatyta atminties kvota (GiB)",
+    "oauth_storage_quota_default_description": "Nustatoma appimties kvota GiB kai nėra nurodyta tvirtinime.",
     "oauth_timeout": "Užklausa viršijo laiko limitą",
     "oauth_timeout_description": "Laiko limitas užklausoms milisekundėmis",
     "password_enable_description": "Prisijungti su el. paštu ir slaptažodžiu",
     "password_settings": "Prisijungimas slaptažodžiu",
     "password_settings_description": "Tvarkyti prisijungimo slaptažodžiu nustatymus",
     "paths_validated_successfully": "Visi keliai patvirtinti sėkmingai",
+    "person_cleanup_job": "Išvalyti asmenis",
     "quota_size_gib": "Kvotos dydis (GiB)",
     "refreshing_all_libraries": "Perkraunamos visos bibliotekos",
     "registration": "Administratoriaus registracija",
@@ -199,7 +223,7 @@
     "reset_settings_to_default": "Atstatyti nustatymus į numatytuosius",
     "reset_settings_to_recent_saved": "Nustatymų atstatymas į neseniai išsaugotus nustatymus",
     "scanning_library": "Biblioteka skenuojama",
-    "search_jobs": "Ieškoma darbų…",
+    "search_jobs": "Ieškoma užduočių…",
     "send_welcome_email": "Siųsti sveikinimo el. laišką",
     "server_external_domain_settings": "Išorinis domenas",
     "server_external_domain_settings_description": "Bendrinimo nuorodų domenas, įskaitant http(s)://",
@@ -209,19 +233,36 @@
     "server_settings_description": "Tvarkyti serverio nustatymus",
     "server_welcome_message": "Sveikinimo pranešimas",
     "server_welcome_message_description": "Žinutė, rodoma prisijungimo puslapyje.",
+    "sidecar_job": "Sidecar metaduomenys",
+    "sidecar_job_description": "Aptikti ar sinchronizuoti sidecar metaduomenis iš failų sistemos",
     "slideshow_duration_description": "Sekundžių skaičius, kiek viena nuotrauka rodoma",
     "smart_search_job_description": "Vykdykite mašininį mokymąsi bibliotekos elementų išmaniajai paieškai",
     "storage_template_date_time_description": "Elemento sukūrimo laiko žymė yra naudojama laiko informacijai",
     "storage_template_date_time_sample": "Pavyzdinis laikas {date}",
+    "storage_template_enable_description": "Aktyvuoti saugyklos šabloną",
+    "storage_template_hash_verification_enabled": "Aktyvuoti Hash tikrinimą",
+    "storage_template_hash_verification_enabled_description": "Aktyvuojamas Hash tikrinimas, neišjungti nebent gerai suprantate galimas pasekmes",
+    "storage_template_migration": "Saugyklos tvarkymas pagal šabloną",
+    "storage_template_migration_description": "Taikyti dabartinį <link>{template}</link> anksčiau įkeltiems duomenims",
+    "storage_template_migration_info": "Saugyklos tvarkyklė konvertuos visus plėtinius mažosiomis raidėmis. Šablonas bus taikomas tik naujiems duomenims. Taikyti šabloną retroaktyviai anksčiau įkeltiems duomenims, paleiskite šią <link>{job}</link>.",
+    "storage_template_migration_job": "Saugyklos Tvarkymo Pagal Šabloną Užduotis",
+    "storage_template_more_details": "Daugiau detalių apie šią funkciją, atsižvelkite į <template-link>Storage Template</template-link> ir jo galimus <implications-link>implications</implications-link>",
+    "storage_template_onboarding_description_v2": "Kai aktyvuota, ši funkcija automatiškai sukurs failus pagal vartotojo-nustatytą šabloną. Daugiau informacijos, prašome skaityti <link>documentation</link>.",
+    "storage_template_path_length": "Preliminarus struktūros kelio ilgis/limitas:<b>{length, number}</b>/{limit, number}",
+    "storage_template_settings": "Saugyklos Šablonas",
+    "storage_template_settings_description": "Tvarkyti aplankų struktūrą bei failų pavadinimus įkeliamiems duomenims",
+    "storage_template_user_label": "<code>{label}</code> yra vartotojo Saugyklos Žymą",
     "system_settings": "Sistemos nustatymai",
     "tag_cleanup_job": "Žymų išvalymas",
+    "template_email_available_tags": "Savo šablone galite naudoti nurodytas kintamas reikšmes:{tags}",
+    "template_email_if_empty": "Jei šablone tuščia reikšmė, bus naudojamas numatytas pagal nutylėjimą El. pašto adresas.",
     "template_email_preview": "Peržiūra",
     "template_email_settings": "El. pašto Šablonai",
     "template_settings": "Pranešimų šablonai",
     "template_settings_description": "Tvarkyti pasirinktinius pranešimų šablonus",
     "theme_custom_css_settings": "Individualizuotas CSS",
     "theme_settings": "Temos nustatymai",
-    "thumbnail_generation_job": "Generuoti miniatiūras",
+    "thumbnail_generation_job": "Generuoti Miniatiūras",
     "thumbnail_generation_job_description": "Didelių, mažų ir neryškių miniatiūrų generavimas kiekvienam bibliotekos elementui, taip pat miniatiūrų generavimas kiekvienam asmeniui",
     "transcoding_acceleration_api": "Spartinimo API",
     "transcoding_acceleration_nvenc": "NVENC (reikalinga NVIDIA GPU)",
@@ -233,16 +274,21 @@
     "transcoding_audio_codec_description": "Opus yra aukščiausios kokybės variantas, tačiau turi mažesnį suderinamumą su senesniais įrenginiais ar programine įranga.",
     "transcoding_bitrate_description": "Vaizdo įrašai viršija maksimalią leistiną bitų spartą arba nėra priimtino formato",
     "transcoding_constant_quality_mode": "Pastovios kokybės režimas",
+    "transcoding_constant_rate_factor_description": "Video kokybės lygis. Tipinės reikšmės yra 23 jei H.264, 28 jei HVEC, 31 jei VP9, ir 35 jei AV1. Kuo mažesnis tuo kokybiškesnis tačiau didesni failai.",
     "transcoding_hardware_acceleration": "Techninės įrangos spartinimas",
     "transcoding_hardware_decoding": "Aparatinis dekodavimas",
     "transcoding_max_bitrate": "Maksimalus bitų srautas",
+    "transcoding_max_bitrate_description": "Pasirenkant max bitrate galima pasiekti labiau nuspėjamą failų dydį su minimaliais kokybės praradimais. Prie 720p, tipinės reikšmės yra 2600 kbits/s jei BP9 ar HVEC, arba 4500 kbits/s jei H.264. Neveiksnus jei pasirenkamas 0.",
+    "transcoding_preset_preset_description": "Kompresijos greitis. Siekiant tam tikro bitrate lėtesnis apdorojimas lems mažesnius failų dydžius ir padidins kokybę. VP9 ignoruos greičius virš \"gretesnis\" lygio.",
     "transcoding_target_resolution_description": "Didesnės skiriamosios gebos gali išsaugoti daugiau detalių, tačiau jas koduoti užtrunka ilgiau, failų dydžiai yra didesni ir gali sumažėti programos jautrumas.",
     "transcoding_video_codec": "Video kodekas",
     "trash_enabled_description": "Įgalinti šiukšliadėžės funkcijas",
     "trash_number_of_days": "Dienų skaičius",
     "trash_settings": "Šiukšliadėžės nustatymai",
     "trash_settings_description": "Tvarkyti šiukšliadėžės nustatymus",
+    "user_cleanup_job": "Vartotojų išvalymas",
     "user_delete_delay_settings": "Ištrynimo delsa",
+    "user_delete_delay_settings_description": "Skaičius dienų po ištrynimo kuomet vartotojo paskyrą ir susiję duomenys bus negražinamai ištrinti. Vartotojo Trynimo užduotis paleidžiama vidurnaktį ir tikrina kurie vartotojai gali būti trinami. Šio nustatymo pakeitimai bus naudojami sekančio užduoties paleidimo metu.",
     "user_management": "Naudotojų valdymas",
     "user_password_has_been_reset": "Naudotojo slaptažodis buvo iš naujo nustatytas:",
     "user_restore_description": "Naudotojo <b>{user}</b> paskyra bus atkurta.",
@@ -305,7 +351,6 @@
   "assets": "Elementai",
   "assets_added_count": "{count, plural, one {Pridėtas # elementas} few {Pridėti # elementai} other {Pridėta # elementų}}",
   "assets_added_to_album_count": "Į albumą {count, plural, one {įtrauktas # elementas} few {įtraukti # elementai} other {įtraukta # elementų}}",
-  "assets_added_to_name_count": "Į {hasName, select, true {<b>{name}</b>} other {naują}} albumą {count, plural, one {įtrauktas # elementas} few {įtraukti # elementai} other {įtraukta # elementų}}",
   "assets_count": "{count, plural, one {# elementas} few {# elementai} other {# elementų}}",
   "assets_moved_to_trash_count": "{count, plural, one {# elementas perkeltas} few {# elementai perkelti} other {# elementų perkelta}} į šiukšliadėžę",
   "assets_permanently_deleted_count": "{count, plural, one {# elementas ištrintas} few {# elementai ištrinti} other {# elementų ištrinta}} visam laikui",
@@ -316,7 +361,11 @@
   "authorized_devices": "Autorizuoti įrenginiai",
   "back": "Atgal",
   "back_close_deselect": "Atgal, uždaryti arba atžymėti",
+  "backup_background_service_current_upload_notification": "Įkeliamas {filename}",
+  "backup_background_service_upload_failure_notification": "Nepavyko įkelti {filename}",
   "backup_controller_page_background_wifi": "Only on WiFi",
+  "backup_controller_page_filename": "Failo pavadinimas: {filename}[{size}]",
+  "backup_controller_page_uploading_file_info": "Įkeliama failo info",
   "birthdate_saved": "Sėkmingai išsaugota gimimo data",
   "blurred_background": "Neryškus fonas",
   "bugs_and_feature_requests": "Klaidų ir funkcijų užklausos",
@@ -345,6 +394,7 @@
   "clear_all": "Išvalyti viską",
   "clear_message": "Išvalyti pranešimą",
   "clear_value": "Išvalyti reikšmę",
+  "client_cert_invalid_msg": "Netinkamas sertifikato failas arba neteisingas slaptažodis",
   "close": "Uždaryti",
   "collapse": "Suskleisti",
   "collapse_all": "Suskleisti viską",
@@ -420,8 +470,11 @@
   "do_not_show_again": "Daugiau nerodyti šio pranešimo",
   "documentation": "Dokumentacija",
   "download": "Atsisiųsti",
+  "download_include_embedded_motion_videos_description": "Pridėti prie judesio nuotraukų įterptus video kaip atskirą failą",
   "download_settings": "Atsisiųsti",
   "downloading": "Siunčiama",
+  "downloading_asset_filename": "Parsisiunčiamas resursas {filename}",
+  "drop_files_to_upload": "Užkelkite failus bet kurioje vietoje kad įkeltumėte",
   "duplicates": "Dublikatai",
   "duplicates_description": "Sutvarkykite kiekvieną elementų grupę nurodydami elementus, kurie yra dublikatai (jei tokių yra)",
   "duration": "Trukmė",
@@ -493,6 +546,7 @@
     "unable_to_delete_import_path": "Nepavyksta ištrinti importavimo kelio",
     "unable_to_delete_shared_link": "Nepavyko ištrinti bendrinimo nuorodos",
     "unable_to_delete_user": "Nepavyksta ištrinti naudotojo",
+    "unable_to_download_files": "Nepavyksta atsisiųsti failų",
     "unable_to_edit_exclusion_pattern": "Nepavyksta redaguoti išimčių šablono",
     "unable_to_edit_import_path": "Nepavyksta redaguoti išimčių kelio",
     "unable_to_enter_fullscreen": "Nepavyksta pereiti į viso ekrano režimą",
@@ -517,6 +571,7 @@
     "unable_to_scan_library": "Nepavyksta nuskaityti bibliotekos",
     "unable_to_set_feature_photo": "Nepavyksta nustatyti mėgstamiausios nuotraukos",
     "unable_to_set_profile_picture": "Nepavyksta nustatyti profilio nuotraukos",
+    "unable_to_submit_job": "Napvyko sukurti užduoties",
     "unable_to_trash_asset": "Nepavyko perkelti į šiukšliadėžę",
     "unable_to_upload_file": "Nepavyksta įkelti failo"
   },
@@ -539,6 +594,7 @@
   "features_setting_description": "Valdyti aplikacijos funkcijas",
   "file_name": "Failo pavadinimas",
   "file_name_or_extension": "Failo pavadinimas arba plėtinys",
+  "filename": "Failopavadinimas",
   "filetype": "Failo tipas",
   "filter_people": "Filtruoti žmones",
   "folders": "Aplankai",
@@ -574,8 +630,9 @@
   },
   "invite_people": "Kviesti žmones",
   "invite_to_album": "Pakviesti į albumą",
+  "ios_debug_info_no_sync_yet": "Jokia background sync užduotis dar nebuvo paleista",
   "items_count": "{count, plural, one {# elementas} few {# elementai} other {# elementų}}",
-  "jobs": "Darbai",
+  "jobs": "Užduotys",
   "keep": "Palikti",
   "keep_all": "Palikti visus",
   "keyboard_shortcuts": "Spartieji klaviatūros klavišai",
@@ -660,6 +717,7 @@
   "no_results": "Nerasta",
   "no_results_description": "Pabandykite sinonimą arba bendresnį raktažodį",
   "not_in_any_album": "Nė viename albume",
+  "note_apply_storage_label_to_previously_uploaded assets": "Pastaba: Priskirti Saugyklos Žymą prie ankčiau įkeltų ištekliu, paleiskite šį",
   "notes": "Pastabos",
   "notification_toggle_setting_description": "Įjungti el. pašto pranešimus",
   "notifications": "Pranešimai",
@@ -707,6 +765,14 @@
   "place": "Vieta",
   "places": "Vietos",
   "play_memories": "Leisti atsiminimus",
+  "profile": "Profilis",
+  "profile_drawer_app_logs": "Logai",
+  "profile_drawer_client_out_of_date_major": "Mobili aplikacija jau pasenusios versijos. Prašome atsinaujinti į paskutinę didžiąją versiją.",
+  "profile_drawer_client_out_of_date_minor": "Mobili aplikacija jau pasenusios versijos. Prašome atsinaujinti į paskutinę mažąją versiją.",
+  "profile_drawer_client_server_up_to_date": "Klientas ir Serveris yra atnaujinti",
+  "profile_drawer_github": "GitHub",
+  "profile_drawer_server_out_of_date_major": "Serveris jau yra pasenusios versijos. Prašome atsinaujinti į paskutinę didžiąją versiją.",
+  "profile_drawer_server_out_of_date_minor": "Serveris jau yra pasenusios versijos. Prašome atsinaujinti į paskutinę mažąją versiją.",
   "profile_image_of_user": "{user} profilio nuotrauka",
   "profile_picture_set": "Profilio nuotrauka nustatyta.",
   "public_album": "Viešas albumas",
@@ -893,7 +959,7 @@
   "show_albums": "Rodyti albumus",
   "show_all_people": "Rodyti visus asmenis",
   "show_and_hide_people": "Rodyti ir paslėpti žmones",
-  "show_file_location": "Rodyti rinkmenos vietą",
+  "show_file_location": "Rodyti failo vietą",
   "show_gallery": "Rodyti galeriją",
   "show_hidden_people": "Rodyti paslėptus asmenis",
   "show_in_timeline": "Rodyti laiko skalėje",
@@ -936,6 +1002,7 @@
   "status": "Statusas",
   "stop_casting": "Nutraukti transliavimą",
   "storage": "Saugykla",
+  "storage_label": "Saugyklos Žyma",
   "storage_usage": "Naudojama {used} iš {available}",
   "submit": "Pateikti",
   "suggestions": "Pasiūlymai",
diff --git a/i18n/lv.json b/i18n/lv.json
index 3fcf228612..01a506a90a 100644
--- a/i18n/lv.json
+++ b/i18n/lv.json
@@ -88,11 +88,14 @@
     "machine_learning_url_description": "Mašīnmācīšanās servera URL",
     "manage_concurrency": "Vienlaicīgas darbības pārvaldība",
     "manage_log_settings": "Žurnāla iestatījumu pārvaldība",
+    "map_dark_style": "Tumšais stils",
     "map_gps_settings": "Kartes un GPS iestatījumi",
     "map_gps_settings_description": "Karšu un GPS (apgrieztās ģeokodēšanas) iestatījumu pārvaldība",
+    "map_light_style": "Gaišais stils",
     "map_manage_reverse_geocoding_settings": "<link>Reversās ģeokodēšanas</link> iestatījumu pārvaldība",
     "map_settings": "Karte",
     "map_settings_description": "Kartes iestatījumu pārvaldība",
+    "map_style_description": "URL uz style.json kartes tēmu",
     "metadata_extraction_job": "Metadatu iegūšana",
     "metadata_settings": "Metadatu iestatījumi",
     "metadata_settings_description": "Metadatu iestatījumu pārvaldība",
@@ -110,6 +113,10 @@
     "notification_email_test_email_sent": "Uz {email} ir nosūtīts testa e-pasts. Lūdzu, pārbaudi savu iesūtni.",
     "notification_settings": "Paziņojumu iestatījumi",
     "notification_settings_description": "Paziņojumu iestatījumu, tostarp e-pasta, pārvaldība",
+    "oauth_auto_launch": "Palaist automātiski",
+    "oauth_auto_launch_description": "Pie navigācijas uz pieslēgšanās lapu automātiski uzsākt OAuth pieslēgšanās plūsmu",
+    "oauth_auto_register": "Automātiska reģistrācija",
+    "oauth_auto_register_description": "Pēc pieslēgšanās ar OAuth automātiski reģistrēt jaunus lietotājus",
     "oauth_button_text": "Pogas teksts",
     "oauth_enable_description": "Pieslēgties ar OAuth",
     "oauth_settings": "OAuth",
@@ -124,6 +131,7 @@
     "require_password_change_on_login": "Pieprasīt lietotājam mainīt paroli pēc pirmās pieteikšanās",
     "scanning_library": "Skenē bibliotēku",
     "search_jobs": "Meklēt uzdevumus…",
+    "server_public_users": "Publiski lietotāji",
     "server_settings": "Servera iestatījumi",
     "server_settings_description": "Servera iestatījumu pārvaldība",
     "server_welcome_message": "Sveiciena ziņa",
@@ -134,7 +142,12 @@
     "storage_template_path_length": "Aptuvenais ceļa garuma ierobežojums: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Krātuves veidne",
     "system_settings": "Sistēmas iestatījumi",
+    "template_email_available_tags": "Sagatavē var izmantot šos mainīgos: {tags}",
+    "template_email_if_empty": "Ja sagatave ir tukša, tiks izmantots noklusējuma e-pasts.",
+    "template_email_invite_album": "Albuma ielūguma sagatave",
     "template_email_preview": "Priekšskatījums",
+    "template_email_settings": "E-pasta sagataves",
+    "template_email_update_album": "Atjaunināt albuma sagatavi",
     "template_settings_description": "Pielāgotu paziņojumu veidņu pārvaldība",
     "theme_custom_css_settings": "Pielāgots CSS",
     "theme_custom_css_settings_description": "Cascading Style Sheets ļauj pielāgot Immich izskatu.",
@@ -219,7 +232,9 @@
   "are_these_the_same_person": "Vai šī ir tā pati persona?",
   "asset_action_delete_err_read_only": "Nevar dzēst read only aktīvu(-s), notiek izlaišana",
   "asset_action_share_err_offline": "Nevar iegūt bezsaistes aktīvu(-s), notiek izlaišana",
+  "asset_added_to_album": "Pievienots albumam",
   "asset_adding_to_album": "Pievieno albumam…",
+  "asset_description_updated": "Faila apraksts ir atjaunināts",
   "asset_list_group_by_sub_title": "Grupēt pēc",
   "asset_list_layout_settings_dynamic_layout_title": "Dinamiskais izkārtojums",
   "asset_list_layout_settings_group_automatically": "Automātiski",
@@ -228,6 +243,7 @@
   "asset_list_layout_sub_title": "Izvietojums",
   "asset_list_settings_subtitle": "Fotorežģa izkārtojuma iestatījumi",
   "asset_list_settings_title": "Fotorežģis",
+  "asset_uploaded": "Augšupielādēts",
   "asset_uploading": "Augšupielādē…",
   "asset_viewer_settings_title": "Aktīvu Skatītājs",
   "assets": "aktīvi",
@@ -339,6 +355,7 @@
   "clear": "Notīrīt",
   "clear_all": "Notīrīt visu",
   "clear_value": "Notīrīt vērtību",
+  "client_cert_subtitle": "Atbalsta tikai PKCS12 (.p12, .pfx) formātu. Sertifikātu importēšana/noņemšana ir pieejama tikai pirms pieslēgšanās",
   "client_cert_title": "SSL klienta sertifikāts",
   "clockwise": "Pulksteņrādītāja virzienā",
   "close": "Aizvērt",
@@ -504,7 +521,11 @@
   "features_setting_description": "Lietotnes funkciju pārvaldība",
   "filename": "Faila nosaukums",
   "filetype": "Faila tips",
+  "folder": "Mape",
+  "folder_not_found": "Mape nav atrasta",
   "folders": "Mapes",
+  "gcast_enabled": "Google Cast",
+  "get_help": "Saņemt palīdzību",
   "haptic_feedback_switch": "Iestatīt haptisku reakciju",
   "haptic_feedback_title": "Haptiska Reakcija",
   "has_quota": "Ir kvota",
@@ -529,10 +550,12 @@
   "hour": "Stunda",
   "id": "ID",
   "image": "Attēls",
+  "image_saved_successfully": "Attēls saglabāts",
   "image_viewer_page_state_provider_download_started": "Lejupielāde Uzsākta",
   "image_viewer_page_state_provider_download_success": "Lejupielāde izdevās",
   "image_viewer_page_state_provider_share_error": "Kopīgošanas Kļūda",
   "immich_logo": "Immich logo",
+  "immich_web_interface": "Immich tīmekļa saskarne",
   "import_from_json": "Importēt no JSON",
   "import_path": "Importa ceļš",
   "in_albums": "{count, plural, one {# albumā} other {# albumos}}",
@@ -545,18 +568,25 @@
     "night_at_midnight": "Katru dienu pusnaktī",
     "night_at_twoam": "Katru dienu 2.00 naktī"
   },
+  "invalid_date": "Nederīgs datums",
+  "invalid_date_format": "Nederīgs datuma formāts",
   "invite_people": "Ielūgt cilvēkus",
   "invite_to_album": "Uzaicināt albumā",
+  "ios_debug_info_last_sync_at": "Pēdējā sinhronizācija {dateTime}",
+  "ios_debug_info_no_processes_queued": "Nav ierindotu fona procesu",
   "jobs": "Uzdevumi",
   "keep": "Paturēt",
   "keep_all": "Paturēt visus",
+  "keep_this_delete_others": "Paturēt šo, dzēst citus",
   "keyboard_shortcuts": "Tastatūras saīsnes",
   "language": "Valoda",
+  "language_search_hint": "Meklēt valodas...",
   "language_setting_description": "Izvēlieties vēlamo valodu",
   "last_seen": "Pēdējo reizi redzēts",
   "latest_version": "Jaunākā versija",
   "latitude": "Ģeogrāfiskais platums",
   "leave": "Paturēt",
+  "lens_model": "Objektīva modelis",
   "let_others_respond": "Ļaut citiem atbildēt",
   "level": "Līmenis",
   "library": "Bibliotēka",
@@ -600,7 +630,7 @@
   "longitude": "Ģeogrāfiskais garums",
   "look": "Izskats",
   "loop_videos_description": "Iespējot, lai automātiski videoklips tiktu cikliski palaists detaļu skatītājā.",
-  "make": "Firma",
+  "make": "Ražotājs",
   "manage_shared_links": "Kopīgoto saišu pārvaldība",
   "manage_sharing_with_partners": "Koplietošanas ar partneriem pārvaldība",
   "manage_the_app_settings": "Lietotnes iestatījumu pārvaldība",
@@ -738,48 +768,78 @@
   "permission_onboarding_request": "Immich nepieciešama atļauja skatīt jūsu fotoattēlus un videoklipus.",
   "person": "Persona",
   "photos": "Fotoattēli",
+  "photos_and_videos": "Fotogrāfijas un video",
   "photos_from_previous_years": "Fotogrāfijas no iepriekšējiem gadiem",
+  "pick_a_location": "Izvēlies atrašanās vietu",
   "pin_verification": "PIN koda pārbaude",
   "place": "Atrašanās vieta",
   "places": "Vietas",
+  "play": "Atskaņot",
+  "play_memories": "Atskaņot atmiņas",
   "please_auth_to_access": "Lai piekļūtu, lūdzu, autentificējieties",
   "port": "Ports",
   "preferences_settings_title": "Iestatījumi",
   "preview": "Priekšskatījums",
   "previous": "Iepriekšējais",
+  "previous_memory": "Iepriekšējā atmiņa",
   "privacy": "Privātums",
   "profile": "Profils",
   "profile_drawer_app_logs": "Žurnāli",
   "profile_drawer_client_out_of_date_major": "Mobilā lietotne ir novecojusi. Lūdzu, atjaunini to uz jaunāko pamatversiju.",
   "profile_drawer_client_out_of_date_minor": "Mobilā lietotne ir novecojusi. Lūdzu, atjaunini to uz jaunāko papildversiju.",
   "profile_drawer_client_server_up_to_date": "Klients un serveris ir atjaunināti",
+  "profile_drawer_github": "GitHub",
   "profile_drawer_server_out_of_date_major": "Serveris ir novecojis. Lūdzu, atjaunini to uz jaunāko pamatversiju.",
   "profile_drawer_server_out_of_date_minor": "Serveris ir novecojis. Lūdzu, atjaunini to uz jaunāko papildversiju.",
+  "profile_image_of_user": "{user} profila attēls",
+  "profile_picture_set": "Profila attēls iestatīts.",
+  "public_album": "Publisks albums",
   "purchase_account_info": "Atbalstītājs",
+  "purchase_activated_subtitle": "Paldies, ka atbalstāt Immich un atvērtā koda programmatūru",
+  "purchase_activated_time": "Aktivizēts {date}",
+  "purchase_activated_title": "Tava atslēga ir sekmīgi aktivizēta",
+  "purchase_button_activate": "Aktivizēt",
   "purchase_button_buy": "Pirkt",
+  "purchase_button_buy_immich": "Iegādāties Immich",
   "purchase_button_never_show_again": "Nekad vairs nerādīt",
   "purchase_button_reminder": "Atgādināt man pēc 30 dienām",
   "purchase_button_remove_key": "Noņemt atslēgu",
   "purchase_button_select": "Izvēlēties",
+  "purchase_failed_activation": "Neizdevās aktivizēt! Lūdzu, pārbaudi savu e-pastu, lai iegūtu pareizo produkta atslēgu!",
   "purchase_individual_description_2": "Atbalstītāja statuss",
   "purchase_input_suggestion": "Vai tev ir produkta atslēga? Ievadi atslēgu zemāk",
   "purchase_license_subtitle": "Nopērc Immich licenci, lai atbalstītu turpmāku pakalpojuma attīstību",
   "purchase_lifetime_description": "Pirkums uz mūžu",
   "purchase_option_title": "IEGĀDES IESPĒJAS",
+  "purchase_panel_info_1": "Immich veidošanai ir nepieciešams daudz laika un pūļu, un pie tā strādā pilna laika inženieri, lai padarītu to pēc iespējas labāku. Mūsu misija ir panākt, lai atvērtā koda programmatūra un ētiska uzņēmējdarbības prakse kļūtu par ilgtspējīgu ienākumu avotu izstrādātājiem un izveidotu privātumu respektējošu ekosistēmu ar reālām alternatīvām ekspluatējošiem mākoņpakalpojumiem.",
+  "purchase_panel_info_2": "Tā kā mēs esam apņēmušies nepievienot maksas funkcionalitāti, šis pirkums nepiešķirs jums nekādas papildu Immich funkcijas. Mēs paļaujamies uz tādiem lietotājiem kā jūs, lai atbalstītu nepārtrauktu Immich attīstību.",
   "purchase_panel_title": "Atbalsti projektu",
   "purchase_remove_product_key": "Noņemt produkta atslēgu",
+  "purchase_remove_product_key_prompt": "Vai tiešām vēlaties noņemt produkta atslēgu?",
   "purchase_remove_server_product_key": "Noņemt servera produkta atslēgu",
+  "purchase_remove_server_product_key_prompt": "Vai tiešām vēlaties noņemt Servera produkta atslēgu?",
   "purchase_server_description_1": "Visam serverim",
   "purchase_server_description_2": "Atbalstītāja statuss",
   "purchase_server_title": "Serveris",
   "purchase_settings_server_activated": "Servera produkta atslēgu pārvalda administrators",
   "rating_clear": "Noņemt vērtējumu",
+  "rating_description": "Rādīt EXIF vērtējumu informācijas panelī",
+  "reaction_options": "Reakcijas iespējas",
   "read_changelog": "Lasīt izmaiņu sarakstu",
   "recently_added_page_title": "Nesen Pievienotais",
+  "refresh_thumbnails": "Atsvaidzināt sīktēlus",
+  "refreshed": "Atsvaidzināts",
   "remove": "Noņemt",
+  "remove_assets_title": "Izņemt failus?",
+  "remove_deleted_assets": "Izņemt dzēstos failus",
   "remove_from_album": "Noņemt no albuma",
+  "remove_from_album_action_prompt": "No albuma izņemti {count} faili",
   "remove_from_favorites": "Noņemt no izlases",
+  "remove_from_lock_folder_action_prompt": "No slēgtās mapes izņemti {count} faili",
   "remove_from_locked_folder": "Izņemt no slēgtās mapes",
+  "remove_memory": "Noņemt atmiņu",
+  "remove_photo_from_memory": "Noņemt fotogrāfiju no šīs atmiņas",
+  "remove_url": "Noņemt URL",
   "remove_user": "Noņemt lietotāju",
   "removed_api_key": "Noņēma API atslēgu: {name}",
   "removed_from_archive": "Noņēma no arhīva",
@@ -790,6 +850,11 @@
   "replace_with_upload": "Aizstāt ar augšupielādi",
   "require_user_to_change_password_on_first_login": "Pieprasīt lietotājam mainīt paroli pēc pirmās pieteikšanās",
   "rescan": "Pārskenēt atkārtoti",
+  "reset": "Atiestatīt",
+  "reset_password": "Atiestatīt paroli",
+  "reset_people_visibility": "Atiestatīt cilvēku redzamību",
+  "reset_pin_code": "Atiestatīt PIN kodu",
+  "reset_to_default": "Atiestatīt noklusējuma iestatījumus",
   "resolve_duplicates": "Atrisināt dublēšanās gadījumus",
   "resolved_all_duplicates": "Visi dublikāti ir atrisināti",
   "restore": "Atjaunot",
@@ -802,6 +867,7 @@
   "role_editor": "Redaktors",
   "role_viewer": "Skatītājs",
   "save": "Saglabāt",
+  "save_to_gallery": "Saglabāt galerijā",
   "saved_api_key": "API atslēga saglabāta",
   "saved_profile": "Profils saglabāts",
   "saved_settings": "Iestatījumi saglabāti",
@@ -813,9 +879,23 @@
   "scanning_for_album": "Skenē albumu...",
   "search": "Meklēt",
   "search_albums": "Meklēt albumus",
+  "search_by_context": "Meklēt pēc konteksta",
+  "search_by_description": "Meklēt pēc apraksta",
+  "search_by_description_example": "Pārgājiens Līgatnē",
+  "search_by_filename": "Meklēt pēc faila nosaukuma vai paplašinājuma",
   "search_by_filename_example": "piemēram, IMG_1234.JPG vai PNG",
+  "search_camera_make": "Meklēt pēc fotokameras ražotāja...",
+  "search_camera_model": "Meklēt pēc fotokameras modeļa...",
+  "search_city": "Meklēt pēc pilsētas...",
+  "search_country": "Meklēt pēc valsts...",
   "search_filter_apply": "Lietot filtru",
+  "search_filter_camera_title": "Izvēlies fotokameras veidu",
+  "search_filter_date": "Datums",
   "search_filter_display_option_not_in_album": "Nav albumā",
+  "search_filter_filename": "Meklēt pēc faila nosaukuma",
+  "search_filter_location": "Atrašanās vieta",
+  "search_filter_location_title": "Izvēlies atrašanās vietu",
+  "search_for_existing_person": "Meklēt esošu personu",
   "search_no_people": "Nav cilvēku",
   "search_no_people_named": "Nav cilvēku ar vārdu \"{name}\"",
   "search_page_categories": "Kategorijas",
@@ -836,6 +916,7 @@
   "second": "Sekunde",
   "select_album_cover": "Izvēlieties albuma vāciņu",
   "select_all_duplicates": "Atlasīt visus dublikātus",
+  "select_from_computer": "Izvēlēties no datora",
   "select_photos": "Fotoattēlu Izvēle",
   "select_user_for_sharing_page_err_album": "Neizdevās izveidot albumu",
   "server_info_box_app_version": "Aplikācijas Versija",
@@ -1031,6 +1112,7 @@
   "viewer_stack_use_as_main_asset": "Izmantot kā Galveno Aktīvu",
   "viewer_unstack": "At-Stekot",
   "waiting": "Gaida",
+  "warning": "Brīdinājums",
   "week": "Nedēļa",
   "welcome": "Laipni lūgti",
   "welcome_to_immich": "Laipni lūgti Immich",
diff --git a/i18n/mn.json b/i18n/mn.json
index 8a18a1d5e5..85092fef0d 100644
--- a/i18n/mn.json
+++ b/i18n/mn.json
@@ -15,10 +15,13 @@
   "add_a_name": "Нэр өгөх",
   "add_a_title": "Гарчиг оруулах",
   "add_endpoint": "Endpoint нэмэх",
+  "add_import_path": "Импортлох зам нэмэх",
   "add_location": "Байршил оруулах",
   "add_more_users": "Өөр хэрэглэгчид нэмэх",
   "add_partner": "Хамтрагч нэмэх",
+  "add_path": "Зам нэмэх",
   "add_photos": "Зураг нэмэх",
+  "add_tag": "Шошго нэмэх",
   "add_to_album": "Цомогт оруулах",
   "add_to_album_bottom_sheet_added": "{album}-д нэмлээ",
   "add_to_album_bottom_sheet_already_exists": "{album}-д аль хэдийн орсон байна",
@@ -28,6 +31,7 @@
   "added_to_favorites": "Дуртай зурганд нэмэх",
   "added_to_favorites_count": "Дуртай зурагнуудад {count, number} нэмэгдлээ",
   "admin": {
+    "admin_user": "Админ хэрэглэгч",
     "authentication_settings": "Танин нэвтрэлт тохиргоо",
     "authentication_settings_description": "Нууц үгийн удирдлага, OAuth болон бусад танин нэвтрэлтийн тохиргоо",
     "authentication_settings_disable_all": "Бүх нэвтрэх аргуудыг идэвхигүй болгохдоо итгэлтэй байна уу? Нэвтрэх үйлдэл бүрэн идэвхигүй болно.",
@@ -35,11 +39,15 @@
     "backup_database": "Өгөгдлийн сангийн дамп үүсгэх",
     "backup_database_enable_description": "Өгөгдлийн сангийн дамп идэвхижүүлэх",
     "backup_keep_last_amount": "Өмнөх хэдэн дампыг хадгалах вэ",
+    "backup_settings": "Датабаз дамп тохиргоо",
+    "backup_settings_description": "Датабазаас дамп хийх тохиргоонууд.",
     "config_set_by_file": "Тохиргоог одоогоор файлаас авч байна",
     "confirm_delete_library": "Та {library} гэсэн санг устгахдаа итгэлтэй байна уу?",
     "confirm_delete_library_assets": "Та энэ санг устгахдаа итгэлтэй байна уу? Энэ үйлдлээр таны {count, plural, one {# contained asset} other {all # contained assets}} серверээс устах бөгөөд буцаах боломжгүй. Гэхдээ файлууд диск дээрээ үлдэнэ.",
     "confirm_email_below": "Баталгаажуулахын тулд та \"{email}\" гэж бичнэ үү",
     "confirm_reprocess_all_faces": "Бүх царайг дахин процесс хийх үү? Тэгвэл бүх нэрс арилах болно.",
+    "confirm_user_password_reset": "{user}-ийн нууц үгийг дахин тохируулах уу?",
+    "confirm_user_pin_code_reset": "{user} хэрэглэгчийн PIN code дахин тохируулах уу?",
     "face_detection": "Нүүр илрүүлэх",
     "image_quality": "Чанар",
     "job_settings": "Ажлын тохиргоо",
diff --git a/i18n/mr.json b/i18n/mr.json
index 6c2ab7406c..781174c79e 100644
--- a/i18n/mr.json
+++ b/i18n/mr.json
@@ -4,6 +4,7 @@
   "account_settings": "खाते व्यवस्था",
   "acknowledge": "मान्यता",
   "action": "कृती",
+  "action_common_update": "अद्ययावत",
   "actions": "कृत्ये",
   "active": "सक्रिय",
   "activity": "गतिविधि",
@@ -13,6 +14,7 @@
   "add_a_location": "एक स्थळ टाका",
   "add_a_name": "नाव टाका",
   "add_a_title": "शीर्षक टाका",
+  "add_endpoint": "एंडपॉइंट जोडा",
   "add_exclusion_pattern": "अपवाद नमुना जोडा",
   "add_import_path": "आयात मार्ग टाका",
   "add_location": "स्थळ टाका",
@@ -20,8 +22,11 @@
   "add_partner": "भागीदार जोडा",
   "add_path": "मार्ग टाका",
   "add_photos": "छायाचित्रे जोडा",
+  "add_tag": "टॅग जोडा",
   "add_to": "त्या मध्ये जोडा…",
   "add_to_album": "संग्रहात टाका",
+  "add_to_album_bottom_sheet_added": "{album} मध्ये जोडले गेले",
+  "add_to_album_bottom_sheet_already_exists": "आधीच {album} मध्ये आहे",
   "add_to_shared_album": "सामायिक संग्रहात टाका",
   "add_url": "URL जोडा",
   "added_to_archive": "संग्रहालयात जोडले",
@@ -29,6 +34,7 @@
   "added_to_favorites_count": "आवडत्यात {count, number} टाकले",
   "admin": {
     "add_exclusion_pattern_description": "अपवाद अनुकूलन जोडा. ** आणि ? या उपयोगात ग्लोबिंग समर्थित आहे. कोणत्याही \"Raw\" नावाच्या निर्देशिकेमधील सर्व खतावण्या दुर्लक्षीत करण्यासाठी \"/Raw/\" वापरा. \".tif\" या सामान्य पथावर समाप्त असलेल्या सर्व खतावण्या दुर्लक्षीत करण्यासाठी \"**/.tif\" वापरा. विशिष्ट पथ दुर्लक्ष करण्यासाठी \"/path/to/ignore/**\" वापरा.",
+    "admin_user": "प्रशासन वापरकर्ता",
     "asset_offline_description": "ही बाह्य संग्रहालय संसाधने डिस्कवर नाहीत आणि ट्रॅशमध्ये विस्थापित केली गेली आहेत. जर फाइल संग्रहालयामध्ये विस्थापित केली गेली आहे, तर नवीन संगत संसाधन किंव्हा रोजीनिशी मध्ये तपासा. हा संसाधन वापर करण्यासाठी कृपया निम्नलिखित खतावणी पथाला इम्मीच द्वारा वापरू शकतो याची तपासणी करा आणि तो संग्रहालय चाळा.",
     "authentication_settings": "प्रमाणीकरण साधक",
     "authentication_settings_description": "परवलीचा शब्द, OAuth आणि अन्य प्रमाणीकरण प्रबंधन करा",
@@ -47,6 +53,7 @@
     "confirm_email_below": "पुष्टी करण्या साठी, खाली \"{email}\" टंकलिखित करा",
     "confirm_reprocess_all_faces": "तुम्हाला खात्री आहे का की तुम्हाला सर्व चेहऱ्यांवर पुन्हा प्रक्रिया करायची आहे? यामुळे नाव दिलेले लोकही साफ होतील.",
     "confirm_user_password_reset": "तुम्हाला नक्की {user} चा परवलीचा शब्द बदलायचा आहे का?",
+    "confirm_user_pin_code_reset": "तुम्हाला नक्की {user} चा पिन कोड रीसेट करायचा आहे का?",
     "create_job": "कार्य बनवा",
     "cron_expression": "वेळापत्रक सूत्र",
     "cron_expression_description": "चाळन्याचे वेळापत्रक क्रॉन पद्धती ने करा. अधिक माहिती साठी पहा: <link> क्रॉन गुरु</link>",
@@ -55,6 +62,16 @@
     "duplicate_detection_job_description": "सारख्या छायाचित्रांचा शोध घेण्यासाठी यांत्रिकी प्रशिक्षण द्या. ही कार्यक्षमता चतुर शोधप्रणालीवर अवलंबून आहे",
     "exclusion_pattern_description": "आपले संग्रहालय चाळताना अपवाद नमुने आपल्याला खतावण्या आणि र्निर्देशिकेला दुर्लक्षीत करू देतात. आपल्याकडे कच्च्या खतावण्या सारख्या आयात करू इच्छित नसलेल्या असंपादित (RAW) खतावण्या असलेल्या निर्देशिका असल्यास हे उपयुक्त आहे.",
     "external_library_management": "बाह्य संग्रहालय व्यवस्थापन",
-    "face_detection": "मुख संशोधन"
+    "face_detection": "मुख संशोधन",
+    "face_detection_description": "मशीन लर्निंग वापरून मालमत्तांमधील चेहरे शोधा. व्हिडिओंसाठी, फक्त थंबनेलचा विचार केला जातो. \"रिफ्रेश\" (पुन्हा) सर्व मालमत्तांवर प्रक्रिया करते. \"रीसेट\" याव्यतिरिक्त सर्व वर्तमान चेहरा डेटा साफ करते. \"गहाळ\" मालमत्तांवर अद्याप प्रक्रिया न केलेल्या रांगेत ठेवते. शोधलेले चेहरे फेस डिटेक्शन पूर्ण झाल्यानंतर फेशियल रेकग्निशनसाठी रांगेत ठेवले जातील, त्यांना विद्यमान किंवा नवीन लोकांमध्ये गटबद्ध केले जाईल.",
+    "facial_recognition_job_description": "शोधलेले चेहरे लोकांमध्ये गटबद्ध करा. हे चरण चेहरा शोधणे पूर्ण झाल्यानंतर चालते. \"रीसेट करा\" (पुन्हा) सर्व चेहरे क्लस्टर कर. \"गहाळ\" चेहरे रांगेत समाविष्ट करते ज्यांना नियुक्त केलेली व्यक्ती नाही.",
+    "failed_job_command": "{command} कमांड जॉबसाठी अयशस्वी झाला: {job}",
+    "force_delete_user_warning": "सावधान: हे वापरकर्ता आणि सर्व मालमत्ता ताबडतोब काढून टाकेल. हे पूर्ववत करता येणार नाही आणि फायली पुनर्प्राप्त करता येणार नाहीत.",
+    "image_format": "फॉरमॅट",
+    "image_format_description": "WebP JPEG पेक्षा लहान फायली तयार करते, परंतु एन्कोड करण्यास हळू असते.",
+    "image_fullsize_description": "झूम इन केल्यावर वापरल्या जाणाऱ्या स्ट्रिप केलेल्या मेटाडेटासह पूर्ण आकाराची प्रतिमा",
+    "image_fullsize_enabled": "पूर्ण-आकारातील प्रतिमा निर्मिती",
+    "image_fullsize_enabled_description": "वेब-फ्रेंडली नसलेल्या फॉरमॅटसाठी पूर्ण-आकाराची प्रतिमा तयार करा. जेव्हा \"embedded preview\" चालुआसेल तेव्हा, \"embedded preview\" थेट रूपांतरणाशिवाय वापरले जातात. JPEG सारख्या वेब-फ्रेंडली फॉरमॅटवर परिणाम होत नाही.",
+    "image_fullsize_quality_description": "१-१०० पर्यंत पूर्ण-आकारातील प्रतिमा गुणवत्ता. जास्त तेव्हडे चांगले, परंतु मोठ्या फायली तयार करते."
   }
 }
diff --git a/i18n/ms.json b/i18n/ms.json
index cfe935102e..e7e0432a4c 100644
--- a/i18n/ms.json
+++ b/i18n/ms.json
@@ -14,6 +14,7 @@
   "add_a_location": "Tambah lokasi",
   "add_a_name": "Tambah nama",
   "add_a_title": "Tambah tajuk",
+  "add_endpoint": "Tambah titik akhir",
   "add_exclusion_pattern": "Tambahkan corak pengecualian",
   "add_import_path": "Tambahkan laluan import",
   "add_location": "Tambah lokasi",
@@ -21,6 +22,7 @@
   "add_partner": "Tambah rakan",
   "add_path": "Tambah laluan",
   "add_photos": "Tambah gambar",
+  "add_tag": "Tambah tag",
   "add_to": "Tambah ke…",
   "add_to_album": "Tambah ke album",
   "add_to_album_bottom_sheet_added": "Dimasukkan ke {album}",
@@ -32,17 +34,18 @@
   "added_to_favorites_count": "Menambahkan {count, number} ke kegemaran",
   "admin": {
     "add_exclusion_pattern_description": "Tambahkan corak pengecualian. Globbing menggunakan *, **, dan ? disokong. Untuk mengabaikan semua fail dalam mana-mana direktori bernama \"Raw\", gunakan \"**/Raw/**\". Untuk mengabaikan semua fail yang berakhir dengan \".tif\", gunakan \"**/*.tif\". Untuk mengabaikan laluan mutlak, gunakan \"/path/to/ignore/**\".",
+    "admin_user": "Pengguna Pentadbir",
     "asset_offline_description": "Aset pustaka luaran ini tidak lagi ditemui pada cakera dan telah dialihkan ke sampah. Jika fail telah dialihkan dalam pustaka, semak garis masa anda untuk aset baharu yang sepadan. Untuk memulihkan aset ini, sila pastikan bahawa laluan fail di bawah boleh diakses oleh Immich dan mengimbas pustaka.",
     "authentication_settings": "Tetapan Pengesahan",
     "authentication_settings_description": "Urus kata laluan, OAuth dan tetapan pengesahan lain",
     "authentication_settings_disable_all": "Adakah anda pasti mahu melumpuhkan semua kaedah log masuk? Log masuk akan dilumpuhkan sepenuhnya.",
     "authentication_settings_reenable": "Untuk menghidupkan semula, guna <link>Arahan Pelayan</link>.",
     "background_task_job": "Tugas Latar Belakang",
-    "backup_database": "Sandar pangkalan data",
-    "backup_database_enable_description": "Aktifkan sandaran pangkalan data",
-    "backup_keep_last_amount": "Jumlah sandaran sebelumnya yang hendak disimpan",
-    "backup_settings": "Tetapan Sandaran",
-    "backup_settings_description": "Urus tetapan sandaran pangkalan data",
+    "backup_database": "Buat Salinan Pangkalan Data",
+    "backup_database_enable_description": "Dayakan salinan pangkalan data",
+    "backup_keep_last_amount": "Jumlah salinan pangkalan data sebelumnya untuk disimpan",
+    "backup_settings": "Tetapan Salinan Pangkalan Data",
+    "backup_settings_description": "Urus tetapan salinan pangkalan data.",
     "cleared_jobs": "Kerja telah dibersihkan untuk: {job}",
     "config_set_by_file": "Konfigurasi kini ditetapkan oleh fail konfigurasi",
     "confirm_delete_library": "Adakah anda pasti mahu memadamkan {library}?",
@@ -72,7 +75,7 @@
     "image_fullsize_quality_description": "Kualiti imej bersaiz penuh dari 1-100. Lebih tinggi adalah lebih baik, tetapi menghasilkan fail yang lebih besar.",
     "image_fullsize_title": "Tetapan Imej bersaiz penuh",
     "image_prefer_embedded_preview": "Cadangkan pratonton terbenam",
-    "image_prefer_embedded_preview_setting_description": "Gunakan pratonton terbenam dalam foto RAW sebagai input kepada pemprosesan imej apabila tersedia. Cara ini boleh menghasilkan warna yang lebih tepat untuk sesetengah imej, tetapi kualiti pratonton bergantung pada kamera dan imej mungkin mempunyai lebih banyak artifak mampatan.",
+    "image_prefer_embedded_preview_setting_description": "Gunakan pratonton terbenam dalam foto RAW sebagai input untuk pemprosesan imej apabila tersedia. Ini boleh menghasilkan warna yang lebih tepat untuk sesetengah imej, tetapi kualiti pratonton bergantung kepada kamera dan imej mungkin mengandungi lebih banyak artifak pemampatan.",
     "image_prefer_wide_gamut": "Cadangkan warna gamut yang luas",
     "image_prefer_wide_gamut_setting_description": "Gunakan Paparan P3 untuk lakaran kenit. Ini lebih baik mengekalkan kerancakan imej dengan ruang warna yang luas, tetapi imej mungkin kelihatan berbeza pada peranti lama dengan versi penyemak imbas lama. Imej sRGB disimpan sebagai sRGB untuk mengelakkan peralihan warna.",
     "image_preview_description": "Imej bersaiz sederhana dengan metadata yang dilucutkan, digunakan semasa melihat aset tunggal dan untuk pembelajaran mesin",
@@ -102,7 +105,7 @@
     "library_scanning_enable_description": "Dayakan pengimbasan perpustakaan berkala",
     "library_settings": "Perpustakaan Luaran",
     "library_settings_description": "Urus tetapan perpustakaan luaran",
-    "library_tasks_description": "Laksanakan tugas perpustakaan",
+    "library_tasks_description": "Imbas pustaka luaran untuk aset yang baru dan/atau telah diubah",
     "library_watching_enable_description": "Perhatikan perpustakaan luaran untuk perubahan fail",
     "library_watching_settings": "Perhati perpustakaan (EKSPERIMEN)",
     "library_watching_settings_description": "Perhati fail yang diubah secara automatik",
@@ -137,7 +140,7 @@
     "machine_learning_smart_search_description": "Cari imej secara semantik menggunakan pembenaman CLIP",
     "machine_learning_smart_search_enabled": "Dayakan carian pintar",
     "machine_learning_smart_search_enabled_description": "Jika ditutup, gambar-gambar tidak akan dikodkan untuk carian pintar.",
-    "machine_learning_url_description": "URL pelayan pembelajaran mesin. Jika lebih daripada satu URL disediakan, setiap pelayan akan dicuba satu demi satu sehingga satu menjawab dengan jayanya, mengikut urutan dari pertama hingga terakhir.",
+    "machine_learning_url_description": "URL pelayan pembelajaran mesin. Jika lebih daripada satu URL disediakan, setiap pelayan akan dicuba satu demi satu mengikut turutan, dari yang pertama hingga yang terakhir, sehingga salah satu memberi maklum balas yang berjaya. Pelayan yang tidak memberi maklum balas akan diabaikan sementara sehingga ia kembali dalam talian.",
     "manage_concurrency": "Urus Concurrency",
     "manage_log_settings": "Urus tetapan log",
     "map_dark_style": "Tema gelap",
@@ -146,13 +149,15 @@
     "map_gps_settings_description": "Urus Tetapan Peta & GPS (Geokod Terbalik)",
     "map_implications": "Ciri peta bergantung pada perkhidmatan jubin luaran (tiles.immich.cloud)",
     "map_light_style": "Tema terang",
-    "map_manage_reverse_geocoding_settings": "Urus tetapan <link>Geocoding Songsang</link>",
+    "map_manage_reverse_geocoding_settings": "Urus tetapan <link>Penentuan Alamat Songsang</link>",
     "map_reverse_geocoding": "Geokoding Sonsang",
     "map_reverse_geocoding_enable_description": "Dayakan pengekodan geo terbalik",
     "map_reverse_geocoding_settings": "Tetapan Pengekodan Geo Terbalik",
     "map_settings": "Peta",
     "map_settings_description": "Urus tetapan peta",
     "map_style_description": "URL ke tema peta style.json",
+    "memory_cleanup_job": "Pembersihan memori",
+    "memory_generate_job": "Penjanaan memori",
     "metadata_extraction_job": "Sari metadata",
     "metadata_extraction_job_description": "Sari maklumat metadata dari setiap aset, seperti GPS, muka-muka, dan pelaraian",
     "metadata_faces_import_setting": "Dayakan import muka",
@@ -161,12 +166,26 @@
     "metadata_settings_description": "Urus tetapan metadata",
     "migration_job": "Migrasi",
     "migration_job_description": "Pindahkan imej kecil untuk aset-aset dan muka-muka kepada struktur folder terkini",
+    "nightly_tasks_cluster_faces_setting_description": "Jalankan pengecaman wajah kepada wajah baharu yang dijumpai",
+    "nightly_tasks_cluster_new_faces_setting": "Kumpulan wajah baharu",
+    "nightly_tasks_database_cleanup_setting": "Tugasan membersihkan pangkalan data",
+    "nightly_tasks_database_cleanup_setting_description": "Membersihkan data lama, luput dari pangkalan data",
+    "nightly_tasks_generate_memories_setting": "Menjana memori",
+    "nightly_tasks_generate_memories_setting_description": "Mencipta memori dari aset",
+    "nightly_tasks_missing_thumbnails_setting": "Menjana lakaran kecil yang hilang",
+    "nightly_tasks_missing_thumbnails_setting_description": "Aturan aset tanpa lakaran kecil untuk janaan lakaran kecil",
+    "nightly_tasks_settings": "Tetapan tugasan malam",
+    "nightly_tasks_settings_description": "Mengurus tugasan malam",
+    "nightly_tasks_start_time_setting": "Masa mula",
+    "nightly_tasks_start_time_setting_description": "Masa di mana pelayan mula bekerja pada tugasan malam",
+    "nightly_tasks_sync_quota_usage_setting": "Penyelarasan penggunaan kuota",
+    "nightly_tasks_sync_quota_usage_setting_description": "Kemaskini kuota simpanan pengguna, berdasarkan kepada penggunaan terkini",
     "no_paths_added": "Tiada laluan yang ditambah",
     "no_pattern_added": "Tiada corak ditambah",
     "note_apply_storage_label_previous_assets": "Nota: Untuk menggunakan Label Storan pada aset yang dimuat naik sebelum ini, jalankan",
     "note_cannot_be_changed_later": "NOTA: Ini tidak boleh diubah kemudian!",
     "notification_email_from_address": "Dari alamat",
-    "notification_email_from_address_description": "Alamat e-mel penghantar, sebagai contoh: \"Immich Photo Server <noreply@example.com>\"",
+    "notification_email_from_address_description": "Alamat e-mel penghantar, sebagai contoh: \"Pelayan Gambar Immich <noreply@example.com>\". Pastikan menggunakan alamat yang dibenarkan anda untuk menghantar e-mel.",
     "notification_email_host_description": "Hos e-mel pelayan (cth. smtp.immich.app)",
     "notification_email_ignore_certificate_errors": "Abaikan ralat-ralat sijil",
     "notification_email_ignore_certificate_errors_description": "Abaikan ralat pengesahan sijil TLS (tidak disyorkan)",
@@ -186,19 +205,24 @@
     "oauth_auto_register": "Daftar secara automatik",
     "oauth_auto_register_description": "Daftar secara automatik pengguna-pengguna baharu selepas mendaftar masuk dengan OAuth",
     "oauth_button_text": "Teks butang",
+    "oauth_client_secret_description": "Diperlukan jika PKCE (Proof Key for Code Exchange) tidak disokong oleh penyedia OAuth",
     "oauth_enable_description": "Log masuk dengan OAuth",
     "oauth_mobile_redirect_uri": "URI ubah hala mudah alih",
     "oauth_mobile_redirect_uri_override": "Penggantian URI ubah hala mudah alih",
     "oauth_mobile_redirect_uri_override_description": "Aktifkan apabila pembekal OAuth tidak membenarkan URI mudah alih, seperti ''{callback}''",
+    "oauth_role_claim": "Tebus peranan",
+    "oauth_role_claim_description": "Automatik memberi kebenaran pentadbir berdasarkan tuntutan ini. Tuntutan ini mungkin mempunyai sama ada 'pengguna' atau 'pentadbir'.",
     "oauth_settings": "OAuth",
-    "oauth_settings_description": "Urus tetapan-tetapan log masuk OAuth",
+    "oauth_settings_description": "Urus tetapan log masuk OAuth",
     "oauth_settings_more_details": "Untuk maklumat lanjut tentang ciri ini, rujuk ke <link>dokumen</link>.",
     "oauth_storage_label_claim": "Tuntutan label storan",
     "oauth_storage_label_claim_description": "Tetapkan label storan pengguna secara automatik kepada nilai tuntutan ini.",
     "oauth_storage_quota_claim": "Tuntutan kuota storan",
     "oauth_storage_quota_claim_description": "Tetapkan kuota storan pengguna secara automatik kepada nilai tuntutan ini.",
     "oauth_storage_quota_default": "Kuota storan lalai (GiB)",
-    "oauth_storage_quota_default_description": "Kuota dalam GiB untuk digunakan apabila tiada tuntutan disediakan (Masukkan 0 untuk kuota tanpa had).",
+    "oauth_storage_quota_default_description": "Kuota dalam GiB yang akan digunakan jika tiada tuntutan disediakan.",
+    "oauth_timeout": "Had Masa Permintaan",
+    "oauth_timeout_description": "Had masa untuk permintaan dalam milisaat",
     "password_enable_description": "Log masuk dengan e-mel dan kata laluan",
     "password_settings": "Kata Laluan Log Masuk",
     "password_settings_description": "Urus tetapan-tetapan kata laluan log masuk",
@@ -207,12 +231,12 @@
     "quota_size_gib": "Saiz Kuota (GiB)",
     "refreshing_all_libraries": "Menyegarkan semua perpustakaan",
     "registration": "Pendaftaran Pentadbir",
-    "registration_description": "Memandangkan anda adalah pengguna pertama pada sistem, anda akan ditugaskan sebagai Admin dan bertanggungjawab untuk tugas pentadbiran, serta pengguna tambahan yang akan anda tambah.",
+    "registration_description": "Memandangkan anda adalah pengguna pertama pada sistem, anda akan ditugaskan sebagai Pentadbir dan bertanggungjawab untuk tugas pentadbiran, serta pengguna tambahan yang akan anda tambah.",
     "require_password_change_on_login": "Perlukan pengguna menukar kata laluan ketika log masuk pertama",
     "reset_settings_to_default": "Tetapkan semula tetapan kepada lalai",
     "reset_settings_to_recent_saved": "Tetapkan semula tetapan kepada tetapan yang disimpan baru-baru ini",
     "scanning_library": "Mengimbas perpustakaan",
-    "search_jobs": "Cari kerja…",
+    "search_jobs": "Cari tugasan…",
     "send_welcome_email": "Hantar e-mel alu-aluan",
     "server_external_domain_settings": "Domain luaran",
     "server_external_domain_settings_description": "Domain untuk pautan kongsi awam, termasuk http(s)://",
@@ -222,7 +246,7 @@
     "server_settings_description": "Urus tetapan pelayan",
     "server_welcome_message": "Mesej alu-aluan",
     "server_welcome_message_description": "Mesej yang dipaparkan pada halaman log masuk.",
-    "sidecar_job": "Metadata kereta sisi",
+    "sidecar_job": "Metadata sampingan",
     "sidecar_job_description": "Temui atau segerakkan metadata sampingan daripada sistem fail",
     "slideshow_duration_description": "Bilangan saat untuk memaparkan setiap imej",
     "smart_search_job_description": "Jalankan pembelajaran mesin pada aset-aset untuk menyokong carian pintar",
@@ -233,9 +257,10 @@
     "storage_template_hash_verification_enabled_description": "Mendayakan pengesahan hac, jangan lumpuhkan melainkan anda pasti akan implikasinya",
     "storage_template_migration": "Penghijrahan templat storan",
     "storage_template_migration_description": "Gunakan <link>{template}</link> semasa pada aset-aset yang dimuat naik sebelum ini",
-    "storage_template_migration_info": "Perubahan templat hanya akan digunakan pada aset baharu. Untuk menggunakan templat secara retroaktif pada aset-aset yang dimuat naik sebelum ini, jalankan <link>{job}</link>.",
+    "storage_template_migration_info": "Templat storan akan menukar semua sambungan fail kepada huruf kecil. Perubahan templat hanya akan digunakan untuk aset baru. Untuk menggunakan templat ini secara retroaktif pada aset yang telah dimuat naik sebelum ini, jalankan <link>{job}</link>.",
     "storage_template_migration_job": "Kerja Migrasi Templat Storan",
     "storage_template_more_details": "Untuk butiran lanjut tentang ciri ini, rujuk kepada <template-link>Templat Storan</template-link> dan <implications-link>implikasi</implications-link>",
+    "storage_template_onboarding_description_v2": "Apabila diaktifkan, ciri ini akan mengatur fail secara automatik berdasarkan templat yang ditetapkan oleh pengguna. Untuk maklumat lanjut, sila rujuk <link>dokumentasi</link>.",
     "storage_template_path_length": "Anggaran kepanjangan laluan: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Templat Storan",
     "storage_template_settings_description": "Urus struktur folder dan nama fail aset dimuat naik",
@@ -250,7 +275,7 @@
     "template_email_update_album": "Templat Kemas kini Album",
     "template_email_welcome": "Templat e-mel alu-aluan",
     "template_settings": "Templat Pemberitahuan",
-    "template_settings_description": "Urus templat tersuai untuk pemberitahuan.",
+    "template_settings_description": "Urus templat tersuai untuk notifikasi",
     "theme_custom_css_settings": "CSS tersuai",
     "theme_custom_css_settings_description": "Lembaran Gaya Lata membolehkan reka bentuk Immich disuaikan.",
     "theme_settings": "Tetapan Tema",
@@ -282,7 +307,7 @@
     "transcoding_encoding_options": "Pilihan Pengekodan",
     "transcoding_encoding_options_description": "Tetapkan codec, resolusi, kualiti dan pilihan lain untuk video yang dikodkan",
     "transcoding_hardware_acceleration": "Pecutan Perkakasan",
-    "transcoding_hardware_acceleration_description": "Eksperimen; lebih pantas, tetapi akan mempunyai kualiti yang lebih rendah pada kadar bit yang sama",
+    "transcoding_hardware_acceleration_description": "Eksperimen: pengekodan semula yang lebih pantas tetapi mungkin mengurangkan kualiti pada kadar bit yang sama",
     "transcoding_hardware_decoding": "Penyahkodan perkakasan",
     "transcoding_hardware_decoding_setting_description": "Mendayakan pecutan hujung ke hujung dan bukannya hanya mempercepatkan pengekodan. Mungkin tidak berfungsi pada semua video.",
     "transcoding_max_b_frames": "Bingkai-B maksimum",
@@ -311,8 +336,61 @@
     "transcoding_threads_description": "Nilai yang lebih tinggi membawa kepada pengekodan yang lebih pantas, tetapi meninggalkan lebih sedikit ruang untuk pemproses tugas lain semasa aktif. Nilai ini tidak boleh lebih daripada bilangan teras CPU. Memaksimumkan penggunaan jika ditetapkan kepada 0.",
     "transcoding_tone_mapping": "Pemetaan nada",
     "transcoding_tone_mapping_description": "Percubaan untuk mengekalkan penampilan video HDR apabila ditukar kepada SDR. Setiap algoritma membuat pertukaran yang berbeza untuk warna, perincian dan kecerahan. Hable mengekalkan perincian, Mobius mengekalkan warna, dan Reinhard mengekalkan kecerahan.",
-    "transcoding_transcode_policy": "Dasar transkod"
+    "transcoding_transcode_policy": "Dasar transkod",
+    "transcoding_transcode_policy_description": "Dasar untuk bila video perlu ditranskod. Video HDR akan sentiasa ditranskod (kecuali jika pengekodan semula dinyahdayakan).",
+    "transcoding_two_pass_encoding": "Pengekodan dua lelaran",
+    "transcoding_two_pass_encoding_setting_description": "Transkod dalam dua lelaran untuk menghasilkan video yang ditranskod dengan kualiti lebih baik. Apabila kadar bit maksimum diaktifkan (diperlukan untuk berfungsi dengan H.264 dan HEVC), mod ini akan menggunakan julat kadar bit berdasarkan kadar bit maksimum dan mengabaikan CRF. Untuk VP9, CRF boleh digunakan jika kadar bit maksimum dinyahdayakan.",
+    "transcoding_video_codec": "Kodek video",
+    "transcoding_video_codec_description": "VP9 mempunyai kecekapan tinggi dan keserasian web yang baik, tetapi mengambil masa lebih lama untuk ditranskod. HEVC memberikan prestasi yang serupa, tetapi kurang serasi dengan web. H.264 sangat serasi dan pantas untuk ditranskod, tetapi menghasilkan fail yang jauh lebih besar. AV1 ialah kodek paling cekap tetapi tidak disokong pada peranti lama.",
+    "trash_enabled_description": "Dayakan ciri Tong Sampah",
+    "trash_number_of_days": "Bilangan hari",
+    "trash_number_of_days_description": "Bilangan hari untuk menyimpan aset dalam tong sampah sebelum dipadam secara kekal",
+    "trash_settings": "Tetapan Tong Sampah",
+    "trash_settings_description": "Urus tetapan tong sampah",
+    "user_cleanup_job": "Pembersihan pengguna",
+    "user_delete_delay": "Akaun dan aset <b>{user}</b> akan dijadualkan untuk dipadam secara kekal dalam {delay, plural, one {# hari} other {# hari}}.",
+    "user_delete_delay_settings": "Kelewatan pemadaman",
+    "user_delete_delay_settings_description": "Bilangan hari selepas penghapusan sebelum akaun dan aset pengguna dipadam secara kekal. Tugasan pemadaman pengguna dijalankan pada tengah malam untuk menyemak pengguna yang sedia untuk dipadam. Perubahan pada tetapan ini akan dinilai semasa pelaksanaan seterusnya.",
+    "user_delete_immediately": "Akaun dan aset <b>{user}</b> akan dimasukkan ke dalam baris gilir untuk dipadam secara kekal <b>serta-merta</b>.",
+    "user_delete_immediately_checkbox": "Masukkan pengguna dan aset ke dalam baris gilir untuk dipadam serta-merta",
+    "user_details": "Butiran Pengguna",
+    "user_management": "Pengurusan Pengguna",
+    "user_password_has_been_reset": "Katalaluan pengguna telah ditetapkan semula:",
+    "user_password_reset_description": "Sila berikan katalaluan sementara kepada pengguna dan maklumkan bahawa mereka perlu menukar katalaluan semasa log masuk yang seterusnya.",
+    "user_restore_description": "Akaun <b>{user}</b> akan dipulihkan.",
+    "user_restore_scheduled_removal": "Pulihkan pengguna – pemadaman dijadualkan pada {date, date, long}",
+    "user_settings": "Tetapan Pengguna",
+    "user_settings_description": "Urus tetapan pengguna",
+    "user_successfully_removed": "Pengguna {email} telah berjaya dipadam.",
+    "version_check_enabled_description": "Dayakan semakan versi",
+    "version_check_implications": "Ciri semakan versi bergantung kepada komunikasi berkala dengan github.com",
+    "version_check_settings": "Semakan Versi",
+    "version_check_settings_description": "Dayakan/nyahdayakan notifikasi versi baharu",
+    "video_conversion_job": "Transkod video",
+    "video_conversion_job_description": "Transkod video untuk keserasian yang lebih luas dengan pelayar dan peranti"
   },
+  "admin_email": "Emel Pentadbir",
+  "admin_password": "Kata laluan Pentadbir",
+  "administration": "Pentadbiran",
+  "advanced": "Lanjutan",
+  "advanced_settings_beta_timeline_subtitle": "Cuba pengalaman aplikasi baharu",
+  "advanced_settings_beta_timeline_title": "Garis masa beta",
+  "advanced_settings_enable_alternate_media_filter_subtitle": "Gunakan pilihan ini untuk menapis media semasa penyegerakan berdasarkan kriteria alternatif. Hanya cuba jika anda menghadapi masalah dengan aplikasi mengesan semua album.",
+  "advanced_settings_enable_alternate_media_filter_title": "[EKSPERIMENTAL] Gunakan penapis penyelarasan album peranti alternatif",
+  "advanced_settings_log_level_title": "Tahap log: {level}",
+  "advanced_settings_prefer_remote_subtitle": "Sesetengah peranti sangat perlahan untuk memuatkan imej kecil daripada aset lokal. Aktifkan tetapan ini untuk memuatkan imej dari jauh sebagai gantinya.",
+  "advanced_settings_prefer_remote_title": "Utamakan imej jauh",
+  "advanced_settings_proxy_headers_subtitle": "Tentukan pengepala proksi yang perlu dihantar oleh Immich dengan setiap permintaan rangkaian",
+  "advanced_settings_proxy_headers_title": "Pengepala Proksi",
+  "advanced_settings_self_signed_ssl_subtitle": "Langkau pengesahan sijil SSL untuk titik hujung pelayan. Diperlukan untuk sijil yang ditandatangani sendiri.",
+  "advanced_settings_self_signed_ssl_title": "Benarkan sijil SSL yang ditandatangani sendiri",
+  "advanced_settings_sync_remote_deletions_subtitle": "Automatik memadam atau memulihkan satu asset di peranti ini apabila tindakan itu diambil di dalam laman sesawang",
+  "advanced_settings_sync_remote_deletions_title": "Selaraskan pemadaman kawalan jauh [UJI KAJI]",
+  "advanced_settings_tile_subtitle": "Tetapan lanjutan pengguna",
+  "advanced_settings_troubleshooting_subtitle": "Dayakan ciri tambahan untuk menyelesaikan masalah",
+  "advanced_settings_troubleshooting_title": "Menyelesaikan masalah",
+  "age_months": "Umur {bulan, plural, satu {# bulan} lain {# bulan}}",
+  "age_year_months": "Umur 1 tahun, {bulan, plural, satu {# bulan} lain {# bulan}}",
   "deduplication_criteria_1": "Saiz imej dalam bait",
   "deduplication_criteria_2": "Kiraan data EXIF",
   "deduplication_info": "Maklumat Pendeduplikasian",
@@ -361,5 +439,6 @@
   "year": "Tahun",
   "yes": "Ya",
   "you_dont_have_any_shared_links": "Anda tidak mempunyai apa-apa pautan yang dikongsi",
+  "your_wifi_name": "Nama Wi-Fi anda",
   "zoom_image": "Zum Gambar"
 }
diff --git a/i18n/nb_NO.json b/i18n/nb_NO.json
index 3478262019..89b5e298bc 100644
--- a/i18n/nb_NO.json
+++ b/i18n/nb_NO.json
@@ -22,8 +22,8 @@
   "add_partner": "Legg til partner",
   "add_path": "Legg til sti",
   "add_photos": "Legg til bilder",
-  "add_tag": "Legg til tag",
-  "add_to": "Legg til…",
+  "add_tag": "Legg til tagg",
+  "add_to": "Legg til i…",
   "add_to_album": "Legg til album",
   "add_to_album_bottom_sheet_added": "Lagt til i {album}",
   "add_to_album_bottom_sheet_already_exists": "Allerede i {album}",
@@ -35,7 +35,7 @@
   "admin": {
     "add_exclusion_pattern_description": "Legg til ekskluderingsmønstre. Globbing med *, ** og ? støttes. For å ignorere alle filer i en hvilken som helst mappe som heter \"Raw\", bruk \"**/Raw/**\". For å ignorere alle filer som slutter på \".tif\", bruk \"**/*.tif\". For å ignorere en absolutt filplassering, bruk \"/filsti/til/ignorer/**\".",
     "admin_user": "Administrasjonsbruker",
-    "asset_offline_description": "Denne eksterne bibliotekressursen finnes ikke lenger på disk og har blitt flyttet til papirkurven. Hvis filen ble flyttet innad i biblioteket, sjekk tidslinjen din for den tilsvarende ressursen. For å gjenopprette ressursen, vennligst sørg for at filstien under er tilgjengelig for Immich og skan biblioteket.",
+    "asset_offline_description": "Dette eksterne biblioteksobjektet finnes ikke lenger på disk og har blitt flyttet til papirkurven. Hvis filen ble flyttet innad i biblioteket, se etter det tilsvarende objektet i tidslinjen din. For å gjenopprette objektet, vennligst sørg for at filstien under er tilgjengelig for Immich og skann biblioteket.",
     "authentication_settings": "Godkjenningsinnstillinger",
     "authentication_settings_description": "Administrer passord, OAuth, og andre innstillinger for autentisering",
     "authentication_settings_disable_all": "Er du sikker på at du ønsker å deaktivere alle innloggingsmetoder? Innlogging vil bli fullstendig deaktivert.",
@@ -114,7 +114,7 @@
     "logging_settings": "Logger",
     "machine_learning_clip_model": "Clip-modell",
     "machine_learning_clip_model_description": "Navnet på en CLIP-modell finnes <link>her</link>. Merk at du må kjøre 'Smart Søk'-jobben på nytt for alle bilder etter at du har endret modell.",
-    "machine_learning_duplicate_detection": "Duplikat-deteksjon",
+    "machine_learning_duplicate_detection": "Duplikatsøk",
     "machine_learning_duplicate_detection_enabled": "Aktiver duplikatdeteksjon",
     "machine_learning_duplicate_detection_enabled_description": "Hvis deaktivert: helt identiske filer vil fremdeles de-duplisert.",
     "machine_learning_duplicate_detection_setting_description": "Bruk CLIP-embeddings for å finne sannsynlige duplikater",
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Administrer metadatainnstillinger",
     "migration_job": "Migrering",
     "migration_job_description": "Migrer miniatyrbilder for filer og ansikter til den nyeste mappestrukturen",
+    "nightly_tasks_cluster_faces_setting_description": "Kjør ansiktsgjenkjenning på nylige oppdagede ansikter",
+    "nightly_tasks_cluster_new_faces_setting": "Grupper nye ansikter",
+    "nightly_tasks_database_cleanup_setting": "Opprydningsjobber for databasen",
+    "nightly_tasks_database_cleanup_setting_description": "Rydder opp i gamle, utgåtte data fra databasen",
+    "nightly_tasks_generate_memories_setting": "Genererer minner",
+    "nightly_tasks_generate_memories_setting_description": "Generer nye minner fra objekter",
+    "nightly_tasks_missing_thumbnails_setting": "Generer manglende miniatyrbilder",
+    "nightly_tasks_missing_thumbnails_setting_description": "Legg til objekter i kø som mangler miniatyrbilder for generering",
+    "nightly_tasks_settings": "Innstillinger for nattjobber",
+    "nightly_tasks_settings_description": "Endre på nattjobber",
+    "nightly_tasks_start_time_setting": "Starttid",
+    "nightly_tasks_start_time_setting_description": "Tiden som serveren starter med nattjobbene",
+    "nightly_tasks_sync_quota_usage_setting": "Synkroniser kvotebruk",
+    "nightly_tasks_sync_quota_usage_setting_description": "Oppdater brukerkvote basert på nåværende bruk",
     "no_paths_added": "Ingen filstier lagt til",
     "no_pattern_added": "Ingen mønster lagt til",
     "note_apply_storage_label_previous_assets": "Merk: For å bruke lagringsetiketten på tidligere opplastede filer, kjør",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "Mobil omdirigerings-URI",
     "oauth_mobile_redirect_uri_override": "Mobil omdirigerings-URI overstyring",
     "oauth_mobile_redirect_uri_override_description": "Aktiver når OAuth-leverandøren ikke tillater en mobil URI, som ''{callback}''",
+    "oauth_role_claim": "Krev Rolle",
+    "oauth_role_claim_description": "Gi automatisk administratortilgang basert på tilstedeværelsen av dette kravet. Kravet kan ha enten «bruker» eller «administrator».",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Administrer innstillinger for OAuth-innlogging",
     "oauth_settings_more_details": "For mer informasjon om denne funksjonen, se <link>dokumentasjonen</link>.",
@@ -212,7 +228,7 @@
     "password_settings_description": "Administrer innstillinger for passordinnlogging",
     "paths_validated_successfully": "Alle filstier validert uten problemer",
     "person_cleanup_job": "Person opprydding",
-    "quota_size_gib": "Kvotestørrelse (GiB)",
+    "quota_size_gib": "Kvote (GiB)",
     "refreshing_all_libraries": "Oppdaterer alle biblioteker",
     "registration": "Administrator registrering",
     "registration_description": "Siden du er den første brukeren på systemet, vil du bli utnevnt til administrator og ha ansvar for administrative oppgaver. Du vil også opprette eventuelle nye brukere.",
@@ -236,12 +252,12 @@
     "smart_search_job_description": "Kjør maskinlæring på filer for å støtte smart søk",
     "storage_template_date_time_description": "Elementets opprettelsestidspunkt brukes for datotid-informasjonen",
     "storage_template_date_time_sample": "Eksempeltid {date}",
-    "storage_template_enable_description": "Aktiver lagringstemplatmotoren",
+    "storage_template_enable_description": "Aktiver lagringsmal-motoren",
     "storage_template_hash_verification_enabled": "Hash verifisering aktivert",
     "storage_template_hash_verification_enabled_description": "Aktiver hasjverifisering. Ikke deaktiver dette med mindre du er sikker på konsekvensene",
-    "storage_template_migration": "Lagringsmal migrering",
+    "storage_template_migration": "Implementer lagringsmal",
     "storage_template_migration_description": "Bruk gjeldende <link>{template}</link> på tidligere opplastede bilder",
-    "storage_template_migration_info": "Lagringsmalen vil endre filtypen til små bokstaver. Malendringer vil kun gjelde nye ressurser. For å anvende malen på tidligere opplastede ressurser, kjør <link>{job}</link>.",
+    "storage_template_migration_info": "Lagringsmalen vil endre filtypen til små bokstaver. Malendringer vil kun gjelde nye objekter. For å anvende malen på tidligere opplastede objekter, kjør <link>{job}</link>.",
     "storage_template_migration_job": "Migreringsjobb for lagringsmal",
     "storage_template_more_details": "For mer informasjon om denne funksjonen, se <template-link>lagringsmalen</template-link> og dens <implications-link>konsekvenser</implications-link>",
     "storage_template_onboarding_description_v2": "Når aktivert vil denne funksjonen automatisk organisere filer basert på en brukerdefinert mal. For mer informasjon, se denne linken <link>dokumentasjon</link>.",
@@ -250,19 +266,19 @@
     "storage_template_settings_description": "Administrer mappestrukturen og filnavnet til opplastede fil",
     "storage_template_user_label": "<code>{label}</code> er brukerens Lagringsetikett",
     "system_settings": "Systeminstillinger",
-    "tag_cleanup_job": "Tag opprydding",
+    "tag_cleanup_job": "Tagg-opprydding",
     "template_email_available_tags": "Du kan bruke følgende variabler i din mal: {tags}",
     "template_email_if_empty": "Hvis malen er tom, vil standard epost bli brut.",
     "template_email_invite_album": "Inviter Album Mal",
     "template_email_preview": "Forhåndsvis",
-    "template_email_settings": "Epost mal",
+    "template_email_settings": "E-postmaler",
     "template_email_update_album": "Oppdater Album Mal",
-    "template_email_welcome": "Mal for velkomst epost",
+    "template_email_welcome": "Mal for velkomst-e-post",
     "template_settings": "Varslings Mal",
     "template_settings_description": "Administrer tilpassede maler for varsling",
     "theme_custom_css_settings": "Egendefinert CSS",
     "theme_custom_css_settings_description": "Cascading Style Sheets gjør det mulig å tilpasse designet av Immich.",
-    "theme_settings": "Tema innstillinger",
+    "theme_settings": "Tema-innstillinger",
     "theme_settings_description": "Administrer tilpasning av Immich webgrensesnitt",
     "thumbnail_generation_job": "Generer miniatyrbilder",
     "thumbnail_generation_job_description": "Generer store, små og uskarpe miniatyrbilder for hver fil, samt miniatyrbilder for hver person",
@@ -357,10 +373,12 @@
   "admin_password": "Administrator Passord",
   "administration": "Administrasjon",
   "advanced": "Avansert",
+  "advanced_settings_beta_timeline_subtitle": "Prøv den nye app opplevelsen",
+  "advanced_settings_beta_timeline_title": "Beta tidslinje",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Bruk denne innstillingen for å filtrere mediefiler under synkronisering basert på alternative kriterier. Bruk kun denne innstillingen dersom man opplever problemer med at applikasjonen ikke oppdager alle album.",
   "advanced_settings_enable_alternate_media_filter_title": "[EKSPERIMENTELT] Bruk alternativ enhet album synk filter",
   "advanced_settings_log_level_title": "Loggnivå: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Noen enheter er veldige trege til å hente mikrobilder fra enheten. Aktiver denne innstillingen for å hente de eksternt istedenfor.",
+  "advanced_settings_prefer_remote_subtitle": "Noen enheter er veldige trege til å hente miniatyrbilder fra enheten. Aktiver denne innstillingen for å hente de eksternt istedenfor.",
   "advanced_settings_prefer_remote_title": "Foretrekk eksterne bilder",
   "advanced_settings_proxy_headers_subtitle": "Definer proxy headere som Immich skal benytte ved enhver nettverksrequest",
   "advanced_settings_proxy_headers_title": "Proxy headere",
@@ -388,6 +406,7 @@
   "album_options": "Albumalternativer",
   "album_remove_user": "Fjerne bruker?",
   "album_remove_user_confirmation": "Er du sikker på at du vil fjerne {user}?",
+  "album_search_not_found": "Ingen album ble funnet som traff ditt søk",
   "album_share_no_users": "Ser ut til at du har delt dette albumet med alle brukere, eller du ikke har noen brukere å dele det med.",
   "album_updated": "Album oppdatert",
   "album_updated_setting_description": "Motta e-postvarsling når et delt album får nye filer",
@@ -407,6 +426,7 @@
   "albums_default_sort_order": "Standard sorteringsrekkefølge for albumer",
   "albums_default_sort_order_description": "Standard sorteringsrekkefølge for bilder når man lager et nytt album.",
   "albums_feature_description": "Samlinger av bilder som kan deles med andre brukere.",
+  "albums_on_device_count": "Albumer på enheten {count}",
   "all": "Alle",
   "all_albums": "Alle album",
   "all_people": "Alle personer",
@@ -426,7 +446,8 @@
   "app_bar_signout_dialog_title": "Logg ut",
   "app_settings": "Appinstillinger",
   "appears_in": "Vises i",
-  "archive": "Arkiver",
+  "archive": "Arkiv",
+  "archive_action_prompt": "{count} lagt til i arkivet",
   "archive_or_unarchive_photo": "Arkiver eller ta ut av arkivet",
   "archive_page_no_archived_assets": "Ingen arkiverte objekter funnet",
   "archive_page_title": "Arkiv ({count})",
@@ -464,13 +485,12 @@
   "assets": "Filer",
   "assets_added_count": "Lagt til {count, plural, one {# element} other {# elementer}}",
   "assets_added_to_album_count": "Lagt til {count, plural, one {# asset} other {# assets}} i album",
-  "assets_added_to_name_count": "Lagt til {count, plural, one {# asset} other {# assets}} i {hasName, select, true {<b>{name}</b>} other {new album}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} kan ikke legges til i albumet",
   "assets_count": "{count, plural, one {# fil} other {# filer}}",
   "assets_deleted_permanently": "{count} objekt(er) slettet permanent",
   "assets_deleted_permanently_from_server": "{count} objekt(er) slettet permanent fra Immich-serveren",
   "assets_downloaded_failed": "{count, plural, one {Nedlasting av # fil - {error} fil feilet} other {Nedlastede # filer - {error} filer feilet}}",
-  "assets_downloaded_successfully": "{count, plural, one {Downloaded # file successfully} other {Downloaded # files successfully}}",
+  "assets_downloaded_successfully": "{count, plural, one {Nedlastet # fil vellykket} other {Nedlastede # filer vellykket}}",
   "assets_moved_to_trash_count": "Flyttet {count, plural, one {# asset} other {# assets}} til søppel",
   "assets_permanently_deleted_count": "Permanent slettet {count, plural, one {# asset} other {# assets}}",
   "assets_removed_count": "Slettet {count, plural, one {# asset} other {# assets}}",
@@ -587,6 +607,7 @@
   "cancel": "Avbryt",
   "cancel_search": "Avbryt søk",
   "canceled": "Avbrutt",
+  "canceling": "Avbryter",
   "cannot_merge_people": "Kan ikke slå sammen personer",
   "cannot_undo_this_action": "Du kan ikke gjøre om denne handlingen!",
   "cannot_update_the_description": "Kan ikke oppdatere beskrivelsen",
@@ -703,7 +724,7 @@
   "daily_title_text_date": "E MMM. dd",
   "daily_title_text_date_year": "E MMM. dddd, yyyy",
   "dark": "Mørk",
-  "darkTheme": "Aktiver mørkt utsende",
+  "dark_theme": "Aktiver mørk-modus",
   "date_after": "Dato etter",
   "date_and_time": "Dato og tid",
   "date_before": "Dato før",
@@ -719,6 +740,7 @@
   "default_locale": "Standard språkinnstilling",
   "default_locale_description": "Formater datoer og tall basert på nettleserens språkinnstilling",
   "delete": "Slett",
+  "delete_action_prompt": "{count} permanen slettet",
   "delete_album": "Slett album",
   "delete_api_key_prompt": "Er du sikker på at du vil slette denne API-nøkkelen?",
   "delete_dialog_alert": "Disse objektene vil bli slettet permanent fra Immich og fra enheten din",
@@ -732,6 +754,7 @@
   "delete_key": "Slett nøkkel",
   "delete_library": "Slett bibliotek",
   "delete_link": "Slett lenke",
+  "delete_local_action_prompt": "{count} slettet lokalt",
   "delete_local_dialog_ok_backed_up_only": "Slett kun sikkerhetskopierte objekter",
   "delete_local_dialog_ok_force": "Slett uansett",
   "delete_others": "Slett andre",
@@ -745,6 +768,7 @@
   "description": "Beskrivelse",
   "description_input_hint_text": "Legg til beskrivelse ...",
   "description_input_submit_error": "Feil ved oppdatering av beskrivelse, sjekk loggen for flere detaljer",
+  "deselect_all": "Avmerk alle",
   "details": "Detaljer",
   "direction": "Retning",
   "disabled": "Deaktivert",
@@ -762,6 +786,7 @@
   "documentation": "Dokumentasjon",
   "done": "Ferdig",
   "download": "Last ned",
+  "download_action_prompt": "Laster ned {count} objekter",
   "download_canceled": "Nedlasting avbrutt",
   "download_complete": "Nedlasting fullført",
   "download_enqueue": "Nedlasting satt i kø",
@@ -799,6 +824,7 @@
   "edit_key": "Rediger nøkkel",
   "edit_link": "Endre lenke",
   "edit_location": "Endre lokasjon",
+  "edit_location_action_prompt": "{count} lokasjon endret",
   "edit_location_dialog_title": "Lokasjon",
   "edit_name": "Redigere navn",
   "edit_people": "Rediger personer",
@@ -817,6 +843,7 @@
   "empty_trash": "Tøm papirkurv",
   "empty_trash_confirmation": "Er du sikker på at du vil tømme søppelbøtta? Dette vil slette alle filene i søppelbøtta permanent fra Immich.\nDu kan ikke angre denne handlingen!",
   "enable": "Aktivere",
+  "enable_backup": "Aktiver backup",
   "enable_biometric_auth_description": "Skriv inn PINkoden for å aktivere biometrisk autentisering",
   "enabled": "Aktivert",
   "end_date": "Slutt dato",
@@ -867,7 +894,7 @@
     "incorrect_email_or_password": "Feil epost eller passord",
     "paths_validation_failed": "{paths, plural, one {# sti} other {# sti}} mislyktes validering",
     "profile_picture_transparent_pixels": "Profil bilde kan ikke ha gjennomsiktige piksler. Vennligst zoom inn og/eller flytt bilde.",
-    "quota_higher_than_disk_size": "Du har satt en kvote høyere enn diskstørrelsen",
+    "quota_higher_than_disk_size": "Du har satt kvoten større enn diskstørrelsen",
     "unable_to_add_album_users": "Kan ikke legge til brukere i albumet",
     "unable_to_add_assets_to_shared_link": "Kan ikke legge til bilder til delt lenke",
     "unable_to_add_comment": "Kan ikke legge til kommentar",
@@ -984,6 +1011,7 @@
   "failed_to_load_assets": "Feilet med å laste fil",
   "failed_to_load_folder": "Kunne ikke laste inn mappe",
   "favorite": "Favoritt",
+  "favorite_action_prompt": "{count} lagt til i favoritter",
   "favorite_or_unfavorite_photo": "Merk som favoritt eller fjern som favoritt",
   "favorites": "Favoritter",
   "favorites_page_no_favorites": "Ingen favorittobjekter funnet",
@@ -1022,7 +1050,7 @@
   "group_year": "Grupper etter år",
   "haptic_feedback_switch": "Aktivert haptisk tilbakemelding",
   "haptic_feedback_title": "Haptisk tilbakemelding",
-  "has_quota": "Har kvote",
+  "has_quota": "Kvote",
   "header_settings_add_header_tip": "Legg til header",
   "header_settings_field_validator_msg": "Verdi kan ikke være null",
   "header_settings_header_name_input": "Header navn",
@@ -1127,6 +1155,7 @@
   "library_page_sort_created": "Nylig opplastet",
   "library_page_sort_last_modified": "Sist endret",
   "library_page_sort_title": "Albumtittel",
+  "licenses": "Lisenser",
   "light": "Lys",
   "like_deleted": "Som slettede",
   "link_motion_video": "Koble bevegelsesvideo",
@@ -1173,7 +1202,7 @@
   "login_form_save_login": "Forbli innlogget",
   "login_form_server_empty": "Skriv inn en server-URL.",
   "login_form_server_error": "Kan ikke koble til server.",
-  "login_has_been_disabled": "Login har blitt deaktivert.",
+  "login_has_been_disabled": "Innlogging har blitt deaktivert.",
   "login_password_changed_error": "Det skjedde en feil ved oppdatering av passordet",
   "login_password_changed_success": "Passord oppdatert",
   "logout_all_device_confirmation": "Er du sikker på at du vil logge ut av alle enheter?",
@@ -1209,7 +1238,7 @@
   "map_settings_dark_mode": "Mørk modus",
   "map_settings_date_range_option_day": "Siste 24 timer",
   "map_settings_date_range_option_days": "Siste {days} dager",
-  "map_settings_date_range_option_year": "Sist år",
+  "map_settings_date_range_option_year": "Siste år",
   "map_settings_date_range_option_years": "Siste {years} år",
   "map_settings_dialog_title": "Kartinnstillinger",
   "map_settings_include_show_archived": "Inkluder arkiverte",
@@ -1227,7 +1256,7 @@
   "memories_check_back_tomorrow": "Sjekk igjen i morgen for flere minner",
   "memories_setting_description": "Administrer hva du ser i minnene dine",
   "memories_start_over": "Start på nytt",
-  "memories_swipe_to_close": "Swipe opp for å lukke",
+  "memories_swipe_to_close": "Sveip opp for å lukke",
   "memory": "Minne",
   "memory_lane_title": "Minnefelt {title}",
   "menu": "Meny",
@@ -1235,7 +1264,7 @@
   "merge_people": "Slå sammen personer",
   "merge_people_limit": "Du kan bare slå sammen opp til 5 fjes om gangen",
   "merge_people_prompt": "Vil du slå sammen disse personene? Denne handlingen kan ikke reverseres.",
-  "merge_people_successfully": "Personene ble vellykket slått sammen",
+  "merge_people_successfully": "Sammenslåing av personer var vellykket",
   "merged_people_count": "Sammenslått {count, plural, one {# person} other {# people}}",
   "minimize": "Minimer",
   "minute": "Minutt",
@@ -1246,6 +1275,7 @@
   "more": "Mer",
   "move": "Flytt",
   "move_off_locked_folder": "Flytt ut av låst mappe",
+  "move_to_lock_folder_action_prompt": "{count} lagt til i låst mappe",
   "move_to_locked_folder": "Flytt til låst mappe",
   "move_to_locked_folder_confirmation": "Disse bildene og videoene vil bli fjernet fra alle albumer, og kun tilgjengelige via den låste mappen",
   "moved_to_archive": "Flyttet {count, plural, one {# asset} other {# assets}} til arkivet",
@@ -1258,14 +1288,14 @@
   "name": "Navn",
   "name_or_nickname": "Navn eller kallenavn",
   "networking_settings": "Nettverk",
-  "networking_subtitle": "Administrer serverendepunktinnstillingene",
+  "networking_subtitle": "Administrer serverendepunkt-innstillinger",
   "never": "aldri",
   "new_album": "Nytt Album",
   "new_api_key": "Ny API-nøkkel",
   "new_password": "Nytt passord",
   "new_person": "Ny person",
-  "new_pin_code": "Ny PIN kode",
-  "new_pin_code_subtitle": "Dette er første gang du åpner den låste mappen. Lag en PIN kode for å sikre tilgangen til denne siden",
+  "new_pin_code": "Ny PIN-kode",
+  "new_pin_code_subtitle": "Dette er første gang du åpner den låste mappen. Lag en PIN-kode for å sikre tilgangen til denne siden",
   "new_user_created": "Ny bruker opprettet",
   "new_version_available": "NY VERSJON TILGJENGELIG",
   "newest_first": "Nyeste først",
@@ -1282,7 +1312,7 @@
   "no_duplicates_found": "Ingen duplikater ble funnet.",
   "no_exif_info_available": "Ingen EXIF-informasjon tilgjengelig",
   "no_explore_results_message": "Last opp flere bilder for å utforske samlingen din.",
-  "no_favorites_message": "Legg til favoritter for å raskt finne dine beste bilder og videoer",
+  "no_favorites_message": "Legg til favoritter for å finne dine beste bilder og videoer raskt",
   "no_libraries_message": "Opprett et eksternt bibliotek for å se bildene og videoene dine",
   "no_locked_photos_message": "Bilder og videoer i den låste mappen er skjult og vil ikke vises når du blar i biblioteket.",
   "no_name": "Ingen navn",
@@ -1292,7 +1322,7 @@
   "no_results": "Ingen resultater",
   "no_results_description": "Prøv et synonym eller mer generelt søkeord",
   "no_shared_albums_message": "Opprett et album for å dele bilder og videoer med personer i nettverket ditt",
-  "not_in_any_album": "Ikke i noen album",
+  "not_in_any_album": "Ikke i noe album",
   "not_selected": "Ikke valgt",
   "note_apply_storage_label_to_previously_uploaded assets": "Merk: For å bruke lagringsetiketten på tidligere opplastede filer, kjør",
   "notes": "Notater",
@@ -1305,7 +1335,7 @@
   "notifications": "Notifikasjoner",
   "notifications_setting_description": "Administrer varsler",
   "oauth": "OAuth",
-  "official_immich_resources": "Offisielle Immich Resurser",
+  "official_immich_resources": "Offisielle Immich-ressurser",
   "offline": "Frakoblet",
   "ok": "Ok",
   "oldest_first": "Eldste først",
@@ -1315,7 +1345,7 @@
   "onboarding_privacy_description": "Følgene (valgfrie) funksjoner er avhengige av eksterne tjenester, og kan bli deaktivert når som helst under innstillinger.",
   "onboarding_server_welcome_description": "La oss sette opp din instans med noen standard innstillinger.",
   "onboarding_theme_description": "Velg et fargetema for din bruker. Du kan endre denne senere under dine instillinger.",
-  "onboarding_user_welcome_description": "La oss få deg startet!",
+  "onboarding_user_welcome_description": "La oss få deg i gang!",
   "onboarding_welcome_user": "Velkommen, {user}",
   "online": "Tilkoblet",
   "only_favorites": "Bare favoritter",
@@ -1460,6 +1490,7 @@
   "purchase_server_description_2": "Støttespiller status",
   "purchase_server_title": "Server",
   "purchase_settings_server_activated": "Produktnøkkel for server er administrert av administratoren",
+  "queue_status": "Kø {count}/{total}",
   "rating": "Stjernevurdering",
   "rating_clear": "Slett vurdering",
   "rating_count": "{count, plural, one {# sjerne} other {# stjerner}}",
@@ -1474,7 +1505,7 @@
   "recent-albums": "Nylige album",
   "recent_searches": "Nylige søk",
   "recently_added": "Nylig lagt til",
-  "recently_added_page_title": "Nylig lagt til",
+  "recently_added_page_title": "Nylig oppført",
   "recently_taken": "Nylig tatt",
   "recently_taken_page_title": "Nylig Tatt",
   "refresh": "Oppdater",
@@ -1495,7 +1526,9 @@
   "remove_custom_date_range": "Fjern egendefinert datoperiode",
   "remove_deleted_assets": "Fjern fra frakoblede filer",
   "remove_from_album": "Fjern fra album",
+  "remove_from_album_action_prompt": "{count} fjernet fra albumet",
   "remove_from_favorites": "Fjern fra favoritter",
+  "remove_from_lock_folder_action_prompt": "{count} fjernet fra låst mappe",
   "remove_from_locked_folder": "Fjern fra låst mappe",
   "remove_from_locked_folder_confirmation": "Er du sikker på at du vil flytte disse bildene og videoene ut av den låste mappen? De vil bli synlige i biblioteket.",
   "remove_from_shared_link": "Fjern fra delt lenke",
@@ -1630,7 +1663,7 @@
   "server_offline": "Server frakoblet",
   "server_online": "Server tilkoblet",
   "server_privacy": "Server personvern",
-  "server_stats": "Server Statistikk",
+  "server_stats": "Serverstatistikk",
   "server_version": "Server Versjon",
   "set": "Sett",
   "set_as_album_cover": "Sett som albumomslag",
@@ -1667,6 +1700,7 @@
   "settings_saved": "Innstillinger lagret",
   "setup_pin_code": "Sett opp en PINkode",
   "share": "Del",
+  "share_action_prompt": "Delte {count} objekter",
   "share_add_photos": "Legg til bilder",
   "share_assets_selected": "{count} valgt",
   "share_dialog_preparing": "Forbereder ...",
@@ -1768,6 +1802,7 @@
   "sort_title": "Tittel",
   "source": "Kilde",
   "stack": "Stable",
+  "stack_action_prompt": "{count} stakket",
   "stack_duplicates": "Stable duplikater",
   "stack_select_one_photo": "Velg hovedbilde for bildestabbel",
   "stack_selected_photos": "Stable valgte bilder",
@@ -1838,9 +1873,10 @@
   "total": "Total",
   "total_usage": "Totalt brukt",
   "trash": "Papirkurv",
+  "trash_action_prompt": "{count} flyttet til søppel",
   "trash_all": "Slett alt",
   "trash_count": "Slett {count, number}",
-  "trash_delete_asset": "Slett ressurs",
+  "trash_delete_asset": "Slett objekt",
   "trash_emptied": "Søppelbøtte tømt",
   "trash_no_results_message": "Her vises bilder og videoer som er flyttet til papirkurven.",
   "trash_page_delete_all": "Slett alt",
@@ -1852,16 +1888,18 @@
   "trash_page_title": "Søppelbøtte ({count})",
   "trashed_items_will_be_permanently_deleted_after": "Elementer i papirkurven vil bli permanent slettet etter {days, plural, one {# dag} other {# dager}}.",
   "type": "Type",
-  "unable_to_change_pin_code": "Klarte ikke å endre PINkode",
+  "unable_to_change_pin_code": "Klarte ikke å endre PIN-kode",
   "unable_to_setup_pin_code": "Klarte ikke å sette opp PINkode",
   "unarchive": "Fjern fra arkiv",
+  "unarchive_action_prompt": "{count} slettet fra Arkiv",
   "unarchived_count": "{count, plural, other {uarkivert #}}",
   "undo": "Angre",
   "unfavorite": "Fjern favoritt",
+  "unfavorite_action_prompt": "{count} slettet fra Favoritter",
   "unhide_person": "Vis person",
   "unknown": "Ukjent",
   "unknown_country": "Ukjent Land",
-  "unknown_year": "Ukjent År",
+  "unknown_year": "Ukjent år",
   "unlimited": "Ubegrenset",
   "unlink_motion_video": "Koble fra bevegelsesvideo",
   "unlink_oauth": "Fjern kobling til OAuth",
@@ -1873,14 +1911,17 @@
   "unsaved_change": "Ulagrede endringer",
   "unselect_all": "Fjern alle valg",
   "unselect_all_duplicates": "Fjern markeringen av alle duplikater",
-  "unselect_all_in": "Fjern alle i {group}",
+  "unselect_all_in": "Fjern velging av alle i {group}",
   "unstack": "avstable",
+  "unstack_action_prompt": "{count} ustakket",
   "unstacked_assets_count": "Ikke stablet {count, plural, one {# asset} other {# assets}}",
+  "untagged": "Umerket",
   "up_next": "Neste",
   "updated_at": "Oppdatert",
   "updated_password": "Passord oppdatert",
   "upload": "Last opp",
   "upload_concurrency": "Samtidig opplastning",
+  "upload_details": "Opplastingsdetaljer",
   "upload_dialog_info": "Vil du utføre backup av valgte objekt(er) til serveren?",
   "upload_dialog_title": "Last opp objekt",
   "upload_errors": "Opplasting fullført med {count, plural, one {# error} other {# errors}}, oppdater siden for å se nye opplastingsressurser.",
@@ -1912,6 +1953,7 @@
   "user_usage_stats_description": "Vis kontobruksstatistikk",
   "username": "Brukernavn",
   "users": "Brukere",
+  "users_added_to_album_count": "Lagt til {count, plural, one {#user} other {#users}} til albumet",
   "utilities": "Verktøy",
   "validate": "Valider",
   "validate_endpoint_error": "Skriv inn en gyldig URL",
@@ -1919,7 +1961,7 @@
   "version": "Versjon",
   "version_announcement_closing": "Din venn, Alex",
   "version_announcement_message": "Hei! En ny versjon av Immich er tilgjengelig. Vennligst ta deg tid til å lese <link>utgivelsesnotatene</link> for å sikre at oppsettet ditt er oppdatert for å forhindre feilkonfigurasjoner, spesielt hvis du bruker WatchTower eller en annen mekanisme som håndterer oppdatering av Immich-forekomsten din automatisk.",
-  "version_history": "Verson Historie",
+  "version_history": "Versjonshistorikk",
   "version_history_item": "Installert {version} den {date}",
   "video": "Video",
   "video_hover_setting": "Spill av forhåndsvisining mens du holder over musepekeren",
@@ -1927,9 +1969,10 @@
   "videos": "Videoer",
   "videos_count": "{count, plural, one {# Video} other {# Videoer}}",
   "view": "Vis",
-  "view_album": "Vis Album",
+  "view_album": "Vis album",
   "view_all": "Vis alle",
   "view_all_users": "Vis alle brukere",
+  "view_details": "Vis detaljer",
   "view_in_timeline": "Vis i tidslinje",
   "view_link": "Vis lenke",
   "view_links": "Vis lenker",
@@ -1937,7 +1980,7 @@
   "view_next_asset": "Vis neste fil",
   "view_previous_asset": "Vis forrige fil",
   "view_qr_code": "Vis QR-kode",
-  "view_stack": "Vis Stabbel",
+  "view_stack": "Vis stabel",
   "view_user": "Vis bruker",
   "viewer_remove_from_stack": "Fjern fra stabling",
   "viewer_stack_use_as_main_asset": "Bruk som hovedobjekt",
@@ -1948,12 +1991,12 @@
   "week": "Uke",
   "welcome": "Velkommen",
   "welcome_to_immich": "Velkommen til Immich",
-  "wifi_name": "Wi-Fi Navn",
-  "wrong_pin_code": "Feil PINkode",
+  "wifi_name": "Wi-Fi-navn",
+  "wrong_pin_code": "Feil PIN-kode",
   "year": "År",
   "years_ago": "{years, plural, one {# år} other {# år}} siden",
   "yes": "Ja",
   "you_dont_have_any_shared_links": "Du har ingen delte lenker",
-  "your_wifi_name": "Ditt Wi-Fi navn",
+  "your_wifi_name": "Ditt Wi-Fi-navn",
   "zoom_image": "Zoom Bilde"
 }
diff --git a/i18n/nl.json b/i18n/nl.json
index 07699e0b31..ecd8418fa5 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -93,7 +93,7 @@
     "job_created": "Taak aangemaakt",
     "job_not_concurrency_safe": "Deze taak kan niet gelijktijdig worden uitgevoerd.",
     "job_settings": "Achtergrondtaak-instellingen",
-    "job_settings_description": "Beheer gelijktijdige taken",
+    "job_settings_description": "Beheer aantal gelijktijdige taken",
     "job_status": "Taakstatus",
     "jobs_delayed": "{jobCount, plural, other {# vertraagd}}",
     "jobs_failed": "{jobCount, plural, other {# mislukt}}",
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Beheer metadata instellingen",
     "migration_job": "Migratie",
     "migration_job_description": "Migreer thumbnails voor assets en gezichten naar de nieuwste mapstructuur",
+    "nightly_tasks_cluster_faces_setting_description": "Gezichtsherkenning uitvoeren op nieuw gedetecteerde gezichten",
+    "nightly_tasks_cluster_new_faces_setting": "Cluster nieuwe gezichten",
+    "nightly_tasks_database_cleanup_setting": "Database opschoon taken",
+    "nightly_tasks_database_cleanup_setting_description": "Ruim oude data op van de database",
+    "nightly_tasks_generate_memories_setting": "Genereer herinneringen",
+    "nightly_tasks_generate_memories_setting_description": "Maak nieuwe herinneringen van assets",
+    "nightly_tasks_missing_thumbnails_setting": "Genereer ontbrekende thumbnails",
+    "nightly_tasks_missing_thumbnails_setting_description": "Assets zonder thumbnail in een wachtrij plaatsen voor het genereren van thumbnails",
+    "nightly_tasks_settings": "Instellingen voor nacht taken",
+    "nightly_tasks_settings_description": "Beheer nacht taken",
+    "nightly_tasks_start_time_setting": "Start tijd",
+    "nightly_tasks_start_time_setting_description": "De tijd waarop de server begint met het uitvoeren van de nacht taken",
+    "nightly_tasks_sync_quota_usage_setting": "Synchroniseer quota gebruik",
+    "nightly_tasks_sync_quota_usage_setting_description": "update gebruiker opslag quota, gebaseerd op huidig gebruik",
     "no_paths_added": "Geen paden toegevoegd",
     "no_pattern_added": "Geen patroon toegevoegd",
     "note_apply_storage_label_previous_assets": "Opmerking: om het opslaglabel toe te passen op eerder geüploade assets, voer de volgende taak uit",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "Omleidings-URI voor mobiel",
     "oauth_mobile_redirect_uri_override": "Omleidings-URI voor mobiele app overschrijven",
     "oauth_mobile_redirect_uri_override_description": "Inschakelen wanneer de OAuth-provider geen mobiele URI toestaat, zoals ''{callback}''",
+    "oauth_role_claim": "Rol claim",
+    "oauth_role_claim_description": "Automatisch admin toegang geven als deze claim aanwezig is. De claim kan 'user' of 'admin' zijn.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Beheer OAuth inloginstellingen",
     "oauth_settings_more_details": "Raadpleeg de <link>documentatie</link> voor meer informatie over deze functie.",
@@ -305,7 +321,7 @@
     "transcoding_policy_description": "Stel in wanneer een video wordt getranscodeerd",
     "transcoding_preferred_hardware_device": "Voorkeur hardwareapparaat",
     "transcoding_preferred_hardware_device_description": "Geldt alleen voor VAAPI en QSV. Stelt de dri node in die wordt gebruikt voor hardwaretranscodering.",
-    "transcoding_preset_preset": "Preset (-preset)",
+    "transcoding_preset_preset": "Voorkeuze (-preset)",
     "transcoding_preset_preset_description": "Compressiesnelheid. Langzamere presets produceren kleinere bestanden en verhogen de kwaliteit bij het targeten van een bepaalde bitrate. VP9 negeert snelheden boven 'faster'.",
     "transcoding_reference_frames": "Referentie frames",
     "transcoding_reference_frames_description": "Het aantal frames om naar te verwijzen bij het comprimeren van een bepaald frame. Hogere waarden verbeteren de compressie-efficiëntie, maar vertragen de codering. Bij 0 wordt deze waarde automatisch ingesteld.",
@@ -357,10 +373,12 @@
   "admin_password": "Beheerder wachtwoord",
   "administration": "Beheer",
   "advanced": "Geavanceerd",
+  "advanced_settings_beta_timeline_subtitle": "Probeer de nieuwe app-ervaring",
+  "advanced_settings_beta_timeline_title": "Beta tijdlijn",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Gebruik deze optie om media te filteren tijdens de synchronisatie op basis van alternatieve criteria. Gebruik dit enkel als de app problemen heeft met het detecteren van albums.",
   "advanced_settings_enable_alternate_media_filter_title": "[EXPERIMENTEEL] Gebruik een alternatieve album synchronisatie filter",
   "advanced_settings_log_level_title": "Logniveau: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Sommige apparaten zijn traag met het laden van afbeeldingen die lokaal zijn opgeslagen op het apparaat. Activeer deze instelling om in plaats daarvan externe afbeeldingen te laden.",
+  "advanced_settings_prefer_remote_subtitle": "Sommige apparaten zijn traag met het laden van lokale afbeeldingen. Activeer deze instelling om in plaats daarvan externe afbeeldingen te laden.",
   "advanced_settings_prefer_remote_title": "Externe afbeeldingen laden",
   "advanced_settings_proxy_headers_subtitle": "Definieer proxy headers die Immich bij elk netwerkverzoek moet verzenden",
   "advanced_settings_proxy_headers_title": "Proxy headers",
@@ -427,6 +445,7 @@
   "app_settings": "App instellingen",
   "appears_in": "Komt voor in",
   "archive": "Archief",
+  "archive_action_prompt": "{count}toegevoegd aan Archief",
   "archive_or_unarchive_photo": "Foto archiveren of uit het archief halen",
   "archive_page_no_archived_assets": "Geen gearchiveerde assets gevonden",
   "archive_page_title": "Archief ({count})",
@@ -459,12 +478,11 @@
   "asset_skipped_in_trash": "In prullenbak",
   "asset_uploaded": "Geüpload",
   "asset_uploading": "Uploaden…",
-  "asset_viewer_settings_subtitle": "Beheer je instellingen voor gallerijweergave",
-  "asset_viewer_settings_title": "Foto weergave",
+  "asset_viewer_settings_subtitle": "Beheer je instellingen voor galerijweergave",
+  "asset_viewer_settings_title": "Fotoweergave",
   "assets": "Assets",
   "assets_added_count": "{count, plural, one {# asset} other {# assets}} toegevoegd",
   "assets_added_to_album_count": "{count, plural, one {# asset} other {# assets}} aan het album toegevoegd",
-  "assets_added_to_name_count": "{count, plural, one {# asset} other {# assets}} toegevoegd aan {hasName, select, true {<b>{name}</b>} other {nieuw album}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {# asset} other {# assets}} konden niet aan album toegevoegd worden",
   "assets_count": "{count, plural, one {# asset} other {# assets}}",
   "assets_deleted_permanently": "{count} asset(s) permanent verwijderd",
@@ -697,13 +715,13 @@
   "curated_object_page_title": "Dingen",
   "current_device": "Huidig apparaat",
   "current_pin_code": "Huidige PIN code",
-  "current_server_address": "Huidige serveradres",
+  "current_server_address": "Huidig serveradres",
   "custom_locale": "Aangepaste landinstelling",
   "custom_locale_description": "Formatteer datums en getallen op basis van de taal en de regio",
   "daily_title_text_date": "E dd MMM",
   "daily_title_text_date_year": "E dd MMM yyyy",
   "dark": "Donker",
-  "darkTheme": "Donker thema in-/uitschakelen",
+  "dark_theme": "Wissel naar donker thema",
   "date_after": "Datum na",
   "date_and_time": "Datum en tijd",
   "date_before": "Datum voor",
@@ -719,6 +737,7 @@
   "default_locale": "Standaard landinstelling",
   "default_locale_description": "Formatteer datums en getallen op basis van de landinstellingen van je browser",
   "delete": "Verwijderen",
+  "delete_action_prompt": "{count} permanent verwijderd",
   "delete_album": "Album verwijderen",
   "delete_api_key_prompt": "Weet je zeker dat je deze API-sleutel wilt verwijderen?",
   "delete_dialog_alert": "Deze items zullen permanent verwijderd worden van Immich en je apparaat",
@@ -732,6 +751,7 @@
   "delete_key": "Verwijder key",
   "delete_library": "Verwijder bibliotheek",
   "delete_link": "Verwijder link",
+  "delete_local_action_prompt": "{count} lokaal verwijderd",
   "delete_local_dialog_ok_backed_up_only": "Verwijder alleen met back-up",
   "delete_local_dialog_ok_force": "Toch verwijderen",
   "delete_others": "Andere verwijderen",
@@ -762,6 +782,7 @@
   "documentation": "Documentatie",
   "done": "Klaar",
   "download": "Downloaden",
+  "download_action_prompt": "{count} assets downloaden",
   "download_canceled": "Download geannuleerd",
   "download_complete": "Download voltooid",
   "download_enqueue": "Download in wachtrij",
@@ -799,6 +820,7 @@
   "edit_key": "Key bewerken",
   "edit_link": "Link bewerken",
   "edit_location": "Locatie bewerken",
+  "edit_location_action_prompt": "{count} locatie(s) aangepast",
   "edit_location_dialog_title": "Locatie",
   "edit_name": "Naam bewerken",
   "edit_people": "Mensen bewerken",
@@ -984,6 +1006,7 @@
   "failed_to_load_assets": "Kan assets niet laden",
   "failed_to_load_folder": "Laden van map mislukt",
   "favorite": "Favoriet",
+  "favorite_action_prompt": "{count}toegevoegd aan Favorieten",
   "favorite_or_unfavorite_photo": "Foto markeren als of verwijderen uit favorieten",
   "favorites": "Favorieten",
   "favorites_page_no_favorites": "Geen favoriete assets gevonden",
@@ -1031,7 +1054,7 @@
   "headers_settings_tile_title": "Aangepaste proxy headers",
   "hi_user": "Hallo {name} ({email})",
   "hide_all_people": "Verberg alle mensen",
-  "hide_gallery": "Gallerij verbergen",
+  "hide_gallery": "Galerij verbergen",
   "hide_named_person": "Verberg persoon {name}",
   "hide_password": "Verberg wachtwoord",
   "hide_person": "Verberg persoon",
@@ -1127,6 +1150,7 @@
   "library_page_sort_created": "Meest recent gemaakt",
   "library_page_sort_last_modified": "Laatst aangepast",
   "library_page_sort_title": "Albumtitel",
+  "licenses": "Licenties",
   "light": "Licht",
   "like_deleted": "Like verwijderd",
   "link_motion_video": "Koppel bewegende video",
@@ -1246,6 +1270,7 @@
   "more": "Meer",
   "move": "Verplaats",
   "move_off_locked_folder": "Verplaats uit vergrendelde map",
+  "move_to_lock_folder_action_prompt": "{count} toegevoegd aan de vergrendelde map",
   "move_to_locked_folder": "Verplaats naar vergrendelde map",
   "move_to_locked_folder_confirmation": "Deze foto’s en video’s worden uit alle albums verwijderd en zijn alleen te bekijken in de vergrendelde map",
   "moved_to_archive": "{count, plural, one {# asset} other {# assets}} verplaatst naar archief",
@@ -1495,7 +1520,9 @@
   "remove_custom_date_range": "Aangepast datumbereik verwijderen",
   "remove_deleted_assets": "Verwijder offline bestanden",
   "remove_from_album": "Verwijder uit album",
+  "remove_from_album_action_prompt": "{count} verwijderd uit het album",
   "remove_from_favorites": "Verwijderen uit favorieten",
+  "remove_from_lock_folder_action_prompt": "{count} verwijderd uit de vergrendelde map",
   "remove_from_locked_folder": "Verwijder uit de vergrendelde map",
   "remove_from_locked_folder_confirmation": "Weet je zeker dat je deze foto's en video's uit de vergrendelde map wilt verplaatsen? Ze zijn dan weer zichtbaar in je bibliotheek.",
   "remove_from_shared_link": "Verwijderen uit gedeelde link",
@@ -1667,6 +1694,7 @@
   "settings_saved": "Instellingen opgeslagen",
   "setup_pin_code": "Stel een PIN code in",
   "share": "Delen",
+  "share_action_prompt": "{count} assets gedeeld",
   "share_add_photos": "Foto's toevoegen",
   "share_assets_selected": "{count} geselecteerd",
   "share_dialog_preparing": "Voorbereiden...",
@@ -1768,6 +1796,7 @@
   "sort_title": "Titel",
   "source": "Bron",
   "stack": "Stapel",
+  "stack_action_prompt": "{count} gestapeld",
   "stack_duplicates": "Stapel duplicaten",
   "stack_select_one_photo": "Selecteer één primaire foto voor de stapel",
   "stack_selected_photos": "Geselecteerde foto's stapelen",
@@ -1838,6 +1867,7 @@
   "total": "Totaal",
   "total_usage": "Totaal gebruik",
   "trash": "Prullenbak",
+  "trash_action_prompt": "{count} verwijderd naar de prullenbak",
   "trash_all": "Verplaats alle naar prullenbak",
   "trash_count": "{count, number} naar prullenbak",
   "trash_delete_asset": "Assets naar prullenbak verplaatsen of verwijderen",
@@ -1855,9 +1885,11 @@
   "unable_to_change_pin_code": "PIN code kan niet gewijzigd worden",
   "unable_to_setup_pin_code": "PIN code kan niet ingesteld worden",
   "unarchive": "Herstellen uit archief",
+  "unarchive_action_prompt": "{count} verwijderd uit het archief",
   "unarchived_count": "{count, plural, other {# verwijderd uit archief}}",
   "undo": "Ongedaan maken",
   "unfavorite": "Verwijderen uit favorieten",
+  "unfavorite_action_prompt": "{count} verwijderd uit favorieten",
   "unhide_person": "Persoon zichtbaar maken",
   "unknown": "Onbekend",
   "unknown_country": "Onbekend Land",
@@ -1875,12 +1907,14 @@
   "unselect_all_duplicates": "Deselecteer alle duplicaten",
   "unselect_all_in": "Deselecteer alles in {group}",
   "unstack": "Ontstapelen",
+  "unstack_action_prompt": "{count} ontstapeld",
   "unstacked_assets_count": "{count, plural, one {# asset} other {# assets}} ontstapeld",
+  "untagged": "Ongemarkeerd",
   "up_next": "Volgende",
   "updated_at": "Geüpdatet",
   "updated_password": "Wachtwoord bijgewerkt",
   "upload": "Uploaden",
-  "upload_concurrency": "Upload gelijktijdigheid",
+  "upload_concurrency": "Aantal gelijktijdige uploads",
   "upload_dialog_info": "Wil je een backup maken van de geselecteerde asset(s) op de server?",
   "upload_dialog_title": "Asset uploaden",
   "upload_errors": "Upload voltooid met {count, plural, one {# fout} other {# fouten}}, vernieuw de pagina om de nieuwe assets te zien.",
@@ -1912,6 +1946,7 @@
   "user_usage_stats_description": "Bekijk statistieken van accountgebruik",
   "username": "Gebruikersnaam",
   "users": "Gebruikers",
+  "users_added_to_album_count": "{count, plural, one {# Gebruiker} other {# Gebruikers}} toegevoegd aan album",
   "utilities": "Gereedschap",
   "validate": "Valideren",
   "validate_endpoint_error": "Vul een geldige URL in",
diff --git a/i18n/nn.json b/i18n/nn.json
index 7fb5fdef02..8b04b5d4b2 100644
--- a/i18n/nn.json
+++ b/i18n/nn.json
@@ -22,18 +22,20 @@
   "add_partner": "Legg til partnar",
   "add_path": "Legg til sti",
   "add_photos": "Legg til bilete",
+  "add_tag": "Legg til tagg",
   "add_to": "Legg til…",
-  "add_to_album": "Legg til album",
+  "add_to_album": "Legg til i album",
   "add_to_album_bottom_sheet_added": "Lagt til i {album}",
   "add_to_album_bottom_sheet_already_exists": "Allereie i {album}",
-  "add_to_shared_album": "Legg til delt album",
+  "add_to_shared_album": "Legg til i delt album",
   "add_url": "Legg til URL",
-  "added_to_archive": "Lagt til arkiv",
-  "added_to_favorites": "Lagt til favorittar",
-  "added_to_favorites_count": "Lagt {count, number} til favorittar",
+  "added_to_archive": "Lagt til i arkiv",
+  "added_to_favorites": "Lagt til i favorittar",
+  "added_to_favorites_count": "La til {count, number} i favorittar",
   "admin": {
     "add_exclusion_pattern_description": "Legg til utelatingsmønstre. Du kan bruke jokerteikna *, **, og ? for å finne filer som passar mønsteret. For å ignorere alle filer i ei mappe kalla \"Raw\", bruk \"Raw\", bruk \"**/Raw/**\". For å ignorere alle filer som sluttar på \".tif\", bruk \"**/*.tif\". For å ignorere ein absolutt sti, bruk \"/path/to/ignore/**\".",
-    "asset_offline_description": "Denne eksterne bibliotekressursen finst ikkje lenger på disk og har blitt flytta til papirkurven. Om fila blei flytta innad i biblioteket, sjekk tidslinja di for den tilsvarande ressursen. For å gjenopprette ressursen, vennligst sørg for at filstien under er tilgjengeleg for Immich og skann biblioteket.",
+    "admin_user": "Admin-brukar",
+    "asset_offline_description": "Denne eksterne bibliotekressursen finst ikkje lenger på disk og har blitt flytta til papirkorga. Om fila blei flytta innad i biblioteket, sjekk tidslinja di for den tilsvarande ressursen. For å gjenopprette ressursen, vennligst sørg for at filstien under er tilgjengeleg for Immich og skann biblioteket.",
     "authentication_settings": "Godkjenningsinnstillingar",
     "authentication_settings_description": "Handsam passord, OAuth, og godkjenningsinnstillingar",
     "authentication_settings_disable_all": "Er du sikker at du ynskjer å gjera alle innloggingsmetodar uverksame? Innlogging vil bli heilt uverksam.",
@@ -43,7 +45,7 @@
     "backup_database_enable_description": "Aktiver tryggingskopiering av database",
     "backup_keep_last_amount": "Antal tryggingskopiar å behalde",
     "backup_settings": "Tryggingskopi-innstillingar",
-    "backup_settings_description": "Handter innstillingar for tryggingskopiering av database. Merk: Desse jobbane  vert ikkje overvaka, og du får inga varsling ved feil.",
+    "backup_settings_description": "Handter innstillingar for tryggingskopiering av database. Merk: Desse jobbane vert ikkje overvaka, og du får inga varsling ved feil.",
     "cleared_jobs": "Rydda jobbar for: {job}",
     "config_set_by_file": "Oppsettet blir sett av ei oppsettfil",
     "confirm_delete_library": "Er du sikker at du vil slette biblioteket {library}?",
@@ -51,6 +53,7 @@
     "confirm_email_below": "For å bekrefte, skriv \"{email}\" under",
     "confirm_reprocess_all_faces": "Er du sikker på at du vil behandle alle ansikt på nytt? Det vil òg fjerne namngjevne personar.",
     "confirm_user_password_reset": "Er du sikker at du vil tilbakestille passordet til {user}?",
+    "confirm_user_pin_code_reset": "Er du sikker på at du vil tilbakestille {user} sin PIN-kode?",
     "create_job": "Lag jobb",
     "cron_expression": "Cron uttrykk",
     "cron_expression_description": "Set inn skanningsintervall med cron-formatet. For meir informasjon sjå t.d. <link>Crontab Guru</link>",
@@ -66,6 +69,10 @@
     "force_delete_user_warning": "ÅTVARING: Handlinga fjernar brukaren og all data. Du kan ikkje angre, og filane kan ikkje gjenopprettast.",
     "image_format": "Format",
     "image_format_description": "WebP gjev mindre filstorleik enn JPEG, men er treigare å lage.",
+    "image_fullsize_description": "Bilete i full storleik utan metadata, i bruk når zooma inn",
+    "image_fullsize_enabled": "Skru på generering av bilete i full storleik",
+    "image_fullsize_quality_description": "Kvalitet på bilete i full storleik frå 1-100. Høgare er betre, men gjev større filer.",
+    "image_fullsize_title": "Innstillingar for bilete i full storleik",
     "image_prefer_embedded_preview": "Bruk helst innebygd førehandsvisning",
     "image_prefer_embedded_preview_setting_description": "Når mogleg bruk innebygd førehandsvisning av RAW bilete som inndata til biletehandsaming. For noko bilete kan det gje meir nøyaktige farger, men kvaliteten kjem an på kamera og det kan oppstå komprimeringsartefakt i bilete.",
     "image_prefer_wide_gamut": "Bruk helst breitt fargespektrum",
@@ -121,6 +128,7 @@
     "machine_learning_max_detection_distance": "Maksimal oppdagingsverdi",
     "machine_learning_max_detection_distance_description": "Den største skilnaden mellom to bilete for å rekne dei som duplikat, frå 0.001-0.1. Større verdiar finn fleire duplikat, men kan gje falske treff.",
     "machine_learning_max_recognition_distance": "Maksimal attkjenningsverdi",
+    "machine_learning_max_recognition_distance_description": "Maksimal forskjell på to ansikt for å bli rekna som same person, på ein skala frå 0-2. Eit lågare tal kan hindre to personar i å bli rekna som den same, medan eit høgare tal kan hindre at same individ vert merka som to forskjellige personar. Merk at det er lettare å slå saman to personar enn å dele éin person i to, så sikt mot den låge sida av skalaen når mogleg.",
     "machine_learning_min_detection_score": "Minimum deteksjonsresultat",
     "machine_learning_min_detection_score_description": "Minimum tillitspoeng for at eit ansikt skal bli oppdaga, på ein skala frå 0 til 1. Lågare verdiar vil oppdage fleire ansikt, men kan føre til feilaktige treff.",
     "machine_learning_min_recognized_faces": "Minimum gjenkjende ansikt",
@@ -137,16 +145,38 @@
     "map_gps_settings_description": "Administrer innstillingar for kart og GPS (Reversert geokoding)",
     "map_light_style": "Lys modus",
     "map_settings": "Kart",
+    "map_settings_description": "Endre kartinnstillingar",
+    "map_style_description": "URL til eit style.json-karttema",
     "metadata_extraction_job": "Hent ut metadata",
+    "metadata_extraction_job_description": "Hent ut metadata frå kvart bilete, slik som GPS, ansikt og oppløysing",
+    "metadata_faces_import_setting": "Skru på import av ansikt",
+    "metadata_faces_import_setting_description": "Importer ansikt frå bilete sine EXIF-data og sidecar-filer",
     "metadata_settings": "Metadata Innstillinger",
+    "metadata_settings_description": "Endre metadata-innstillingar",
     "migration_job": "Migrasjon",
     "notification_email_from_address": "Frå adresse",
+    "notification_email_test_email_failed": "Mislukka sending av test-e-post, sjekk konfigurasjonen din",
+    "notification_email_test_email_sent": "Det vart sendt ei test-melding til {email}. Sjekk e-posten din.",
+    "notification_email_username_description": "Brukarnamn for autentisering på e-post-serveren",
+    "notification_enable_email_notifications": "Aktiver e-post-varslingar",
     "notification_settings": "Varselinnstillingar",
+    "notification_settings_description": "Endre varslingsinnstillingar, inkludert e-post",
     "oauth_auto_launch": "Autostart",
+    "oauth_auto_launch_description": "Start OAuth-innloggingsprosessen automatisk når innloggingssida vert opna",
+    "oauth_auto_register_description": "Registrer nye brukarar automatisk etter innlogging med OAuth",
     "oauth_button_text": "Tekst på knapp",
+    "oauth_client_secret_description": "Krevjast dersom PKCE (Proof Key for Code Exchange) ikkje støttast av OAuth-tilbydaren",
+    "oauth_enable_description": "Logg inn med OAuth",
+    "oauth_settings": "OAuth",
+    "oauth_settings_description": "Innstillingar for innlogging med OAuth",
+    "oauth_storage_quota_default": "Standard lagringskvote (GiB)",
+    "oauth_timeout": "Tidsavbrot på førespurnad",
+    "oauth_timeout_description": "Tidsavbrot for førespurnadar i millisekund",
     "password_enable_description": "Logg inn med e-post og passord",
     "password_settings": "Passordinnlogging",
+    "password_settings_description": "Innstillingar for innlogging med passord",
     "person_cleanup_job": "Personopprydding",
+    "quota_size_gib": "Lagringskvote (GiB)",
     "refreshing_all_libraries": "Laster alle bibliotek opp att",
     "registration": "Administrator registrering",
     "registration_description": "Sidan du er den første brukaren på systemet, vil du bli utnevnt til administrator og ha ansvar for administrative oppgåver. Du vil òg opprette eventuelle nye brukarar.",
@@ -164,8 +194,17 @@
     "server_settings_description": "Administrer serverinnstillingar",
     "server_welcome_message": "Velkomstmelding",
     "server_welcome_message_description": "Ei melding som synast på innloggingssida.",
+    "sidecar_job": "Sidecar-metadata",
+    "sidecar_job_description": "Oppdag eller synkroniser sidecar-metadata frå filsystemet",
+    "slideshow_duration_description": "Antal sekund å vise kvart bilete",
+    "storage_template_date_time_sample": "Døme på tid {date}",
+    "storage_template_enable_description": "Aktiver lagringsmal-motoren",
+    "storage_template_migration": "Overgang til ny lagringsmal",
+    "storage_template_migration_job": "Omorganisering etter ny lagringsmal",
+    "storage_template_settings": "Lagringsmal",
     "system_settings": "Systeminnstillingar",
     "template_email_preview": "Førehandsvisning",
+    "thumbnail_generation_job": "Generer miniatyrbilete",
     "transcoding_acceleration_nvenc": "NVENC (Krev NVIDIA GPU)",
     "transcoding_acceleration_qsv": "Quick Sync (Krev 7. generasjons Intel CPU eller nyare)",
     "transcoding_acceleration_rkmpp": "RKMPP (Berre på Rockchip SOCer)",
@@ -180,7 +219,11 @@
     "transcoding_audio_codec": "Lydkodek",
     "transcoding_audio_codec_description": "Opus er det valet med høgast lydkvalitet, men mindre kompabilitet med gamlare einingar og programvare.",
     "transcoding_bitrate_description": "Videoar med bitrate over høgste tillatte verdi, eller i eit format som ikkje er tillate",
-    "transcoding_codecs_learn_more": "For å lære meir om nytta begrep, sjå FFmpeg dokumentasjon for <h264-link>H.264 codec</h264-link>, <hevc-link>HEVC codec</hevc-link> and <vp9-link>VP9 codec</vp9-link>."
+    "transcoding_codecs_learn_more": "For å lære meir om nytta begrep, sjå FFmpeg dokumentasjon for <h264-link>H.264 codec</h264-link>, <hevc-link>HEVC codec</hevc-link> and <vp9-link>VP9 codec</vp9-link>.",
+    "transcoding_constant_rate_factor_description": "Videokvalitet. Vanlege verdiar er 23 for H.264, 28 for HEVC, 31 for VP9, og 35 for AV1. Lågare er betre, men gjev større filer.",
+    "transcoding_hardware_acceleration": "Maskinvare-akselerasjon",
+    "transcoding_max_bitrate": "Maksimal bitrate",
+    "transcoding_optimal_description": "Videoar med for høg oppløysing, eller ikkje i eit godkjend format"
   },
   "admin_email": "Adminisrator E-post",
   "admin_password": "Administratorpassord",
diff --git a/i18n/pl.json b/i18n/pl.json
index e84c6f53e6..5adc6df943 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -5,7 +5,7 @@
   "acknowledge": "Zrozumiałem/łam",
   "action": "Akcja",
   "action_common_update": "Aktualizuj",
-  "actions": "Akcje/i",
+  "actions": "Akcje",
   "active": "Aktywne",
   "activity": "Aktywność",
   "activity_changed": "Aktywność jest {enabled, select, true {włączona} other {wyłączona}}",
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Zarządzaj ustawieniami metadanych",
     "migration_job": "Migracja",
     "migration_job_description": "Przenieś miniatury zasobów i twarzy do najnowszej struktury folderów",
+    "nightly_tasks_cluster_faces_setting_description": "Uruchom rozpoznawanie twarzy dla nowo wykrytych twarzy",
+    "nightly_tasks_cluster_new_faces_setting": "Zgrupuj nowe twarze",
+    "nightly_tasks_database_cleanup_setting": "Zadania związane z czyszczeniem bazy danych",
+    "nightly_tasks_database_cleanup_setting_description": "Wyczyść stare, nieaktualne dane z bazy danych",
+    "nightly_tasks_generate_memories_setting": "Generuj wspomnienia",
+    "nightly_tasks_generate_memories_setting_description": "Stwórz nowe wspomnienia z zasobów",
+    "nightly_tasks_missing_thumbnails_setting": "Wygeneruj brakujące miniatury",
+    "nightly_tasks_missing_thumbnails_setting_description": "Dodaj zasoby bez miniatur do kolejki generowania miniatur",
+    "nightly_tasks_settings": "Ustawienia nocnych zadań",
+    "nightly_tasks_settings_description": "Zarządzaj zadaniami wykonywanymi w nocy",
+    "nightly_tasks_start_time_setting": "Czas rozpoczęcia",
+    "nightly_tasks_start_time_setting_description": "Czas, w którym serwer rozpoczyna wykonywanie nocnych zadań",
+    "nightly_tasks_sync_quota_usage_setting": "Zsynchronizuj wykorzystanie kontyngentu",
+    "nightly_tasks_sync_quota_usage_setting_description": "Zaktualizuj kontyngent przestrzeni dyskowej użytkownika na podstawie aktualnego zużycia",
     "no_paths_added": "Nie dodano ścieżki",
     "no_pattern_added": "Nie dodano wzoru",
     "note_apply_storage_label_previous_assets": "Uwaga: aby zastosować etykietę magazynu do wcześniej przesłanych zasobów, uruchom",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "Mobilny adres zwrotny",
     "oauth_mobile_redirect_uri_override": "Zapasowy URI przekierowania mobilnego",
     "oauth_mobile_redirect_uri_override_description": "Włącz, gdy dostawca OAuth nie pozwala na mobilne identyfikatory URI typu ''{callback}''",
+    "oauth_role_claim": "Oświadczenie roli",
+    "oauth_role_claim_description": "Automatycznie przyznaj dostęp administratora na podstawie obecności tego oświadczenia. Oświadczenie może mieć wartość „użytkownik” lub „administrator”.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Zarządzaj ustawieniami logowania OAuth",
     "oauth_settings_more_details": "Więcej informacji o tej funkcji znajdziesz w <link>dokumentacji</link>.",
@@ -357,10 +373,12 @@
   "admin_password": "Hasło Administratora",
   "administration": "Administracja",
   "advanced": "Zaawansowane",
+  "advanced_settings_beta_timeline_subtitle": "Wypróbuj nową funkcjonalność aplikacji",
+  "advanced_settings_beta_timeline_title": "Beta-Timeline",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Użyj tej opcji do filtrowania mediów podczas synchronizacji alternatywnych kryteriów. Używaj tylko wtedy gdy aplikacja ma problemy z wykrywaniem wszystkich albumów.",
   "advanced_settings_enable_alternate_media_filter_title": "[EKSPERYMENTALNE] Użyj alternatywnego filtra synchronizacji albumu",
   "advanced_settings_log_level_title": "Poziom szczegółowości dziennika: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Niektóre urządzenia bardzo wolno ładują miniatury z zasobów na urządzeniu. Aktywuj to ustawienie, aby ładować zdalne obrazy.",
+  "advanced_settings_prefer_remote_subtitle": "Niektóre urządzenia bardzo wolno ładują miniatury z lokalnych zasobów. Aktywuj to ustawienie, aby ładować zdalne obrazy.",
   "advanced_settings_prefer_remote_title": "Preferuj obrazy zdalne",
   "advanced_settings_proxy_headers_subtitle": "Zdefiniuj nagłówki proxy, które Immich powinien wysyłać z każdym żądaniem sieciowym",
   "advanced_settings_proxy_headers_title": "Nagłówki proxy",
@@ -427,6 +445,7 @@
   "app_settings": "Ustawienia Aplikacji",
   "appears_in": "W albumach",
   "archive": "Archiwum",
+  "archive_action_prompt": "{count} dodanych do Archiwum",
   "archive_or_unarchive_photo": "Dodaj lub usuń zasób z archiwum",
   "archive_page_no_archived_assets": "Nie znaleziono zarchiwizowanych zasobów",
   "archive_page_title": "Archiwum {count}",
@@ -464,7 +483,6 @@
   "assets": "Zasoby",
   "assets_added_count": "Dodano {count, plural, one {# zasób} few {# zasoby} other {# zasobów}}",
   "assets_added_to_album_count": "Dodano {count, plural, one {# zasób} few {# zasoby} other {# zasobów}} do albumu",
-  "assets_added_to_name_count": "Dodano {count, plural, one {# zasób} few {# zasoby} other {# zasobów}} do {hasName, select, true {<b>{name}</b>} other {new album}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {sztuka Elementu} other {szt. Elementów}} nie może być dodana do albumu",
   "assets_count": "{count, plural, one {# zasób} few {# zasoby} other {# zasobów}}",
   "assets_deleted_permanently": "{count} zostało trwale usuniętych",
@@ -703,7 +721,7 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Ciemny",
-  "darkTheme": "Włącz ciemny motyw",
+  "dark_theme": "Przełącz ciemny motyw",
   "date_after": "Data po",
   "date_and_time": "Data i godzina",
   "date_before": "Data przed",
@@ -719,6 +737,7 @@
   "default_locale": "Domyślny Region",
   "default_locale_description": "Formatuj daty i liczby na podstawie ustawień Twojej przeglądarki",
   "delete": "Usuń",
+  "delete_action_prompt": "{count} trwale usuniętych",
   "delete_album": "Usuń album",
   "delete_api_key_prompt": "Czy na pewno chcesz usunąć ten klucz API?",
   "delete_dialog_alert": "Te elementy zostaną trwale usunięte z Immich i z Twojego urządzenia",
@@ -732,6 +751,7 @@
   "delete_key": "Usuń klucz",
   "delete_library": "Usuń bibliotekę",
   "delete_link": "Usuń link",
+  "delete_local_action_prompt": "{count} lokalnie usunięto",
   "delete_local_dialog_ok_backed_up_only": "Usuń tylko kopię zapasową",
   "delete_local_dialog_ok_force": "Usuń mimo to",
   "delete_others": "Usuń inne",
@@ -799,6 +819,7 @@
   "edit_key": "Edytuj klucz",
   "edit_link": "Edytuj link",
   "edit_location": "Edytuj lokalizację",
+  "edit_location_action_prompt": "{count} edytowana lokalizacja",
   "edit_location_dialog_title": "Lokalizacja",
   "edit_name": "Edytuj nazwę",
   "edit_people": "Edytuj osoby",
@@ -984,6 +1005,7 @@
   "failed_to_load_assets": "Nie udało się załadować zasobów",
   "failed_to_load_folder": "Nie udało się załadować folderu",
   "favorite": "Ulubione",
+  "favorite_action_prompt": "{count} dodane do ulubionych",
   "favorite_or_unfavorite_photo": "Dodaj lub usuń z ulubionych",
   "favorites": "Ulubione",
   "favorites_page_no_favorites": "Nie znaleziono ulubionych zasobów",
@@ -1127,6 +1149,7 @@
   "library_page_sort_created": "Ostatnio utworzone",
   "library_page_sort_last_modified": "Ostatnio zmodyfikowany",
   "library_page_sort_title": "Tytuł albumu",
+  "licenses": "Licencje",
   "light": "Jasny",
   "like_deleted": "Polubienie usunięte",
   "link_motion_video": "Podłącz ruchome wideo",
@@ -1246,6 +1269,7 @@
   "more": "Więcej",
   "move": "Przenieś",
   "move_off_locked_folder": "Przenieś z folderu zablokowanego",
+  "move_to_lock_folder_action_prompt": "{count} dodanych do folderu zablokowanego",
   "move_to_locked_folder": "Przenieś do folderu zablokowanego",
   "move_to_locked_folder_confirmation": "Te zdjęcia i filmy zostaną usunięte ze wszystkich albumów i będą widzialne tylko w folderze zablokowanym",
   "moved_to_archive": "Przeniesiono {count, plural, one {# zasób} few {# zasoby} other {# zasobów}} do archiwum",
@@ -1495,7 +1519,9 @@
   "remove_custom_date_range": "Usuń niestandardowy zakres dat",
   "remove_deleted_assets": "Usuń Niedostępne Pliki",
   "remove_from_album": "Usuń z albumu",
+  "remove_from_album_action_prompt": "{count} usunięto z albumu",
   "remove_from_favorites": "Usuń z ulubionych",
+  "remove_from_lock_folder_action_prompt": "{count} usunięte z folderu zablokowanego",
   "remove_from_locked_folder": "Usuń z folderu zablokowanego",
   "remove_from_locked_folder_confirmation": "Czy na pewno chcesz przenieść te zdjęcia i filmy z folderu zablokowanego? Będą one widoczne w bibliotece.",
   "remove_from_shared_link": "Usuń z udostępnionego linku",
@@ -1667,6 +1693,7 @@
   "settings_saved": "Ustawienia zapisane",
   "setup_pin_code": "Ustaw kod PIN",
   "share": "Udostępnij",
+  "share_action_prompt": "Udostępniono {count} zasobów",
   "share_add_photos": "Dodaj zdjęcia",
   "share_assets_selected": "Wybrano {count}",
   "share_dialog_preparing": "Przygotowywanie…",
@@ -1768,6 +1795,7 @@
   "sort_title": "Tytuł",
   "source": "Źródło",
   "stack": "Stos",
+  "stack_action_prompt": "{count} zgrupowano",
   "stack_duplicates": "Stos duplikatów",
   "stack_select_one_photo": "Wybierz jedno główne zdjęcie do stosu",
   "stack_selected_photos": "Układaj wybrane zdjęcia",
@@ -1838,6 +1866,7 @@
   "total": "Całkowity",
   "total_usage": "Całkowite wykorzystanie",
   "trash": "Kosz",
+  "trash_action_prompt": "{count} przeniesione do kosza",
   "trash_all": "Usuń wszystkie",
   "trash_count": "Kosz {count, number}",
   "trash_delete_asset": "Kosz/Usuń zasób",
@@ -1855,9 +1884,11 @@
   "unable_to_change_pin_code": "Nie można zmienić kodu PIN",
   "unable_to_setup_pin_code": "Nie można ustawić kodu PIN",
   "unarchive": "Cofnij archiwizację",
+  "unarchive_action_prompt": "{count} usunięto z archiwum",
   "unarchived_count": "{count, plural, one {# cofnięta archiwizacja} few {# cofnięte archiwizacje} other {# cofniętych archiwizacji}}",
   "undo": "Cofnij",
   "unfavorite": "Usuń z ulubionych",
+  "unfavorite_action_prompt": "{count} usunięto z ulubionych",
   "unhide_person": "Przywróć osobę",
   "unknown": "Nieznany",
   "unknown_country": "Nieznane państwo",
@@ -1875,7 +1906,9 @@
   "unselect_all_duplicates": "Odznacz wszystkie duplikaty",
   "unselect_all_in": "Odznacz wszystkie w {group}",
   "unstack": "Rozłóż stos",
+  "unstack_action_prompt": "{count} odgrupowano",
   "unstacked_assets_count": "{count, plural, one {Rozłożony # zasób} few {Rozłożone # zasoby} other {Rozłożonych # zasobów}}",
+  "untagged": "Nieoznaczone",
   "up_next": "Do następnego",
   "updated_at": "Zaktualizowany",
   "updated_password": "Pomyślnie zaktualizowano hasło",
@@ -1912,6 +1945,7 @@
   "user_usage_stats_description": "Wyświetl statystyki użytkowania konta",
   "username": "Nazwa użytkownika",
   "users": "Użytkownicy",
+  "users_added_to_album_count": "Dodano {count, plural, one {# użytkownika} other {# użytkowników}} do albumu",
   "utilities": "Narzędzia",
   "validate": "Walidacja",
   "validate_endpoint_error": "Proszę wprowadzić prawidłowy adres URL",
diff --git a/i18n/pt.json b/i18n/pt.json
index bb88cafbfa..1878c9b9cc 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Gerir definições de metadados",
     "migration_job": "Migração",
     "migration_job_description": "Migra miniaturas de ficheiros e rostos para a estrutura de pastas mais recente",
+    "nightly_tasks_cluster_faces_setting_description": "Executar reconhecimento facial em faces detetadas recentemente",
+    "nightly_tasks_cluster_new_faces_setting": "Agrupar novas faces",
+    "nightly_tasks_database_cleanup_setting": "Tarefas de limpeza da base de dados",
+    "nightly_tasks_database_cleanup_setting_description": "Limpar dados antigos e expirados da base de dados",
+    "nightly_tasks_generate_memories_setting": "Gerar memórias",
+    "nightly_tasks_generate_memories_setting_description": "Criar novas memórias a partir de ficheiros",
+    "nightly_tasks_missing_thumbnails_setting": "Gerar miniaturas em falta",
+    "nightly_tasks_missing_thumbnails_setting_description": "Colocar em fila ficheiros sem miniaturas para a geração das mesmas",
+    "nightly_tasks_settings": "Definições de Tarefas Diárias",
+    "nightly_tasks_settings_description": "Gerir tarefas diárias",
+    "nightly_tasks_start_time_setting": "Hora de início",
+    "nightly_tasks_start_time_setting_description": "A hora em qual o servidor começa a executar as tarefas diárias",
+    "nightly_tasks_sync_quota_usage_setting": "Utilização da quota de sincronização",
+    "nightly_tasks_sync_quota_usage_setting_description": "Atualizar quotas de armazenamento de utilizadores, com base na utilização atual",
     "no_paths_added": "Nenhum caminho adicionado",
     "no_pattern_added": "Nenhum padrão adicionado",
     "note_apply_storage_label_previous_assets": "Observação: Para aplicar o Rótulo de Armazenamento a ficheiros carregados anteriormente, execute o",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "URI de redirecionamento móvel",
     "oauth_mobile_redirect_uri_override": "Substituição de URI de redirecionamento móvel",
     "oauth_mobile_redirect_uri_override_description": "Ative quando o provedor do OAuth não permite um URI móvel, como ''{callback}''",
+    "oauth_role_claim": "Reivindicação de Funções",
+    "oauth_role_claim_description": "Automaticamente concede acesso de administrador, com base na presença desta reivindicação. A reivindicação tanto pode ter \"user\" como \"admin\".",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Gerir definições de inicio de sessão do OAuth",
     "oauth_settings_more_details": "Para mais informações sobre esta funcionalidade, veja a <link>documentação</link>.",
@@ -357,10 +373,12 @@
   "admin_password": "Palavra-passe do administrador",
   "administration": "Administração",
   "advanced": "Avançado",
+  "advanced_settings_beta_timeline_subtitle": "Experimente as novas funcionalidades da aplicação",
+  "advanced_settings_beta_timeline_title": "Linha temporal da versão Beta",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Utilize esta definição para filtrar ficheiros durante a sincronização baseada em critérios alternativos. Utilize apenas se a aplicação estiver com problemas a detetar todos os álbuns.",
   "advanced_settings_enable_alternate_media_filter_title": "[EXPERIMENTAL] Utilizar um filtro alternativo de sincronização de álbuns em dispositivos",
   "advanced_settings_log_level_title": "Nível de registo: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Alguns dispositivos são extremamente lentos para carregar miniaturas da memória. Ative esta opção para preferir imagens do servidor.",
+  "advanced_settings_prefer_remote_subtitle": "Alguns dispositivos são extremamente lentos a carregar miniaturas da memória interna. Ative esta opção para preferir imagens do servidor.",
   "advanced_settings_prefer_remote_title": "Preferir imagens do servidor",
   "advanced_settings_proxy_headers_subtitle": "Defina os cabeçalhos do proxy que o Immich deve enviar em todas comunicações com a rede",
   "advanced_settings_proxy_headers_title": "Cabeçalhos do Proxy",
@@ -427,6 +445,7 @@
   "app_settings": "Definições da Aplicação",
   "appears_in": "Aparece em",
   "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_title": "Arquivo ({count})",
@@ -464,7 +483,6 @@
   "assets": "Ficheiros",
   "assets_added_count": "{count, plural, one {# ficheiro adicionado} other {# ficheiros adicionados}}",
   "assets_added_to_album_count": "{count, plural, one {# ficheiro adicionado} other {# ficheiros adicionados}} ao álbum",
-  "assets_added_to_name_count": "{count, plural, one {# ficheiro adicionado} other {# ficheiros adicionados}} a {hasName, select, true {<b>{name}</b>} other {novo álbum}}",
   "assets_cannot_be_added_to_album_count": "Não foi possível adicionar {count, plural, one {ficheiro} other {ficheiros}} ao álbum",
   "assets_count": "{count, plural, one {# ficheiro} other {# ficheiros}}",
   "assets_deleted_permanently": "{count} ficheiro(s) eliminado(s) permanentemente",
@@ -703,7 +721,7 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Escuro",
-  "darkTheme": "Alternar tema escuro",
+  "dark_theme": "Alternar tema escuro",
   "date_after": "Data após",
   "date_and_time": "Data e Hora",
   "date_before": "Data antes",
@@ -719,6 +737,7 @@
   "default_locale": "Localização Padrão",
   "default_locale_description": "Formatar datas e números baseados na linguagem do seu navegador",
   "delete": "Eliminar",
+  "delete_action_prompt": "{count} eliminados permanentemente",
   "delete_album": "Eliminar álbum",
   "delete_api_key_prompt": "Tem a certeza de que deseja eliminar esta chave de API?",
   "delete_dialog_alert": "Esses arquivos serão permanentemente apagados do Immich e de seu dispositivo",
@@ -732,6 +751,7 @@
   "delete_key": "Eliminar chave",
   "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_force": "Excluir mesmo assim",
   "delete_others": "Excluir outros",
@@ -762,6 +782,7 @@
   "documentation": "Documentação",
   "done": "Feito",
   "download": "Transferir",
+  "download_action_prompt": "A descarregar {count} ficheiros",
   "download_canceled": "Cancelado",
   "download_complete": "Sucesso",
   "download_enqueue": "Na fila",
@@ -799,6 +820,7 @@
   "edit_key": "Editar chave",
   "edit_link": "Editar link",
   "edit_location": "Editar Localização",
+  "edit_location_action_prompt": "{count} locais alterados",
   "edit_location_dialog_title": "Localização",
   "edit_name": "Editar nome",
   "edit_people": "Editar pessoas",
@@ -984,6 +1006,7 @@
   "failed_to_load_assets": "Ocorreu um erro ao carregar ficheiros",
   "failed_to_load_folder": "Ocorreu um erro ao carregar a pasta",
   "favorite": "Favorito",
+  "favorite_action_prompt": "{count} adicionados aos favoritos",
   "favorite_or_unfavorite_photo": "Marcar ou desmarcar a foto como favorita",
   "favorites": "Favoritos",
   "favorites_page_no_favorites": "Nenhum favorito encontrado",
@@ -1127,6 +1150,7 @@
   "library_page_sort_created": "Data de criação",
   "library_page_sort_last_modified": "Última modificação",
   "library_page_sort_title": "Título do álbum",
+  "licenses": "Licenças",
   "light": "Claro",
   "like_deleted": "Gosto removido",
   "link_motion_video": "Relacionar video animado",
@@ -1246,6 +1270,7 @@
   "more": "Mais",
   "move": "Mover",
   "move_off_locked_folder": "Mover para fora da pasta trancada",
+  "move_to_lock_folder_action_prompt": "{count} adicionados à pasta trancada",
   "move_to_locked_folder": "Mover para a pasta trancada",
   "move_to_locked_folder_confirmation": "Estas fotos e vídeos serão removidas de todos os álbuns, e só serão visíveis na pasta trancada",
   "moved_to_archive": "{count, plural, one {Foi movido # ficheiro} other {Foram movidos # ficheiros}} para o arquivo",
@@ -1495,7 +1520,9 @@
   "remove_custom_date_range": "Remover intervalo de datas personalizado",
   "remove_deleted_assets": "Remover ficheiros indisponíveis",
   "remove_from_album": "Remover do álbum",
+  "remove_from_album_action_prompt": "{count} removido(s) do álbum",
   "remove_from_favorites": "Remover dos favoritos",
+  "remove_from_lock_folder_action_prompt": "{count} removidos da pasta trancada",
   "remove_from_locked_folder": "Remover da pasta trancada",
   "remove_from_locked_folder_confirmation": "Tem a certeza de que quer mover estas fotos e vídeos para fora da pasta trancada? Passarão a ser visíveis na biblioteca.",
   "remove_from_shared_link": "Remover do link partilhado",
@@ -1667,6 +1694,7 @@
   "settings_saved": "Definições guardadas",
   "setup_pin_code": "Configurar um código PIN",
   "share": "Partilhar",
+  "share_action_prompt": "Partilhados {count} ficheiros",
   "share_add_photos": "Adicionar fotos",
   "share_assets_selected": "{count} selecionados",
   "share_dialog_preparing": "Preparando...",
@@ -1768,6 +1796,7 @@
   "sort_title": "Título",
   "source": "Fonte",
   "stack": "Empilhar",
+  "stack_action_prompt": "{count} empilhados",
   "stack_duplicates": "Empilhar itens duplicados",
   "stack_select_one_photo": "Selecione uma foto principal para a pilha",
   "stack_selected_photos": "Empilhar fotos selecionadas",
@@ -1838,6 +1867,7 @@
   "total": "Total",
   "total_usage": "Total utilizado",
   "trash": "Reciclagem",
+  "trash_action_prompt": "{count} movidos para a reciclagem",
   "trash_all": "Mover todos para a reciclagem",
   "trash_count": "Reciclar {count, number}",
   "trash_delete_asset": "Eliminar ficheiro",
@@ -1855,9 +1885,11 @@
   "unable_to_change_pin_code": "Não foi possível alterar o código PIN",
   "unable_to_setup_pin_code": "Não foi possível configurar o código PIN",
   "unarchive": "Desarquivar",
+  "unarchive_action_prompt": "{count} removidos do Arquivo",
   "unarchived_count": "{count, plural, other {Não arquivado #}}",
   "undo": "Anular",
   "unfavorite": "Remover favorito",
+  "unfavorite_action_prompt": "{count} removidos dos Favoritos",
   "unhide_person": "Exibir pessoa",
   "unknown": "Desconhecido",
   "unknown_country": "País desconhecido",
@@ -1875,7 +1907,9 @@
   "unselect_all_duplicates": "Remover seleção de todos os itens duplicados",
   "unselect_all_in": "Remover seleção de {group}",
   "unstack": "Desempilhar",
+  "unstack_action_prompt": "{count} desempilhados",
   "unstacked_assets_count": "Desempilhados {count, plural, one {# ficheiro} other {# ficheiros}}",
+  "untagged": "Marcador removido",
   "up_next": "A seguir",
   "updated_at": "Atualizado a",
   "updated_password": "Palavra-passe atualizada",
@@ -1912,6 +1946,7 @@
   "user_usage_stats_description": "Ver estatísticas de utilização de conta",
   "username": "Nome de utilizador",
   "users": "Utilizadores",
+  "users_added_to_album_count": "{count, plural, one {Foi adicionado # utilizador} other {Foram adicionados # utilizadores}} ao álbum",
   "utilities": "Ferramentas",
   "validate": "Validar",
   "validate_endpoint_error": "Digite uma URL válida",
@@ -1951,7 +1986,7 @@
   "wifi_name": "Nome da rede Wi-Fi",
   "wrong_pin_code": "Código PIN errado",
   "year": "Ano",
-  "years_ago": "Há {years, plural, one {# ano} other {# anos}} atrás",
+  "years_ago": "Há {years, plural, one {# ano} other {# anos}}",
   "yes": "Sim",
   "you_dont_have_any_shared_links": "Não tem links partilhados",
   "your_wifi_name": "Nome da sua rede Wi-Fi",
diff --git a/i18n/pt_BR.json b/i18n/pt_BR.json
index 705180cafd..1af3bda2ac 100644
--- a/i18n/pt_BR.json
+++ b/i18n/pt_BR.json
@@ -105,7 +105,7 @@
     "library_scanning_enable_description": "Habilitar verificação periódica da biblioteca",
     "library_settings": "Biblioteca Externa",
     "library_settings_description": "Gerenciar configurações de biblioteca externa",
-    "library_tasks_description": "Escanear bibliotecas externas para ativos novos ou modificados",
+    "library_tasks_description": "Verificar se há arquivos novos ou modificados nas bibliotecas externas",
     "library_watching_enable_description": "Observe bibliotecas externas para alterações de arquivos",
     "library_watching_settings": "Observação de biblioteca (EXPERIMENTAL)",
     "library_watching_settings_description": "Observe automaticamente os arquivos alterados",
@@ -168,7 +168,7 @@
     "migration_job_description": "Migrar miniaturas de arquivos e rostos para a estrutura de pastas mais recente",
     "no_paths_added": "Nenhum caminho adicionado",
     "no_pattern_added": "Nenhum padrão adicionado",
-    "note_apply_storage_label_previous_assets": "Observação: Para aplicar o rótulo de armazenamento a arquivos carregados anteriormente, execute o",
+    "note_apply_storage_label_previous_assets": "Observação: Para aplicar o rótulo de armazenamento a arquivos enviados anteriormente, execute o",
     "note_cannot_be_changed_later": "NOTA: Isto não pode ser alterado posteriormente!",
     "notification_email_from_address": "E-mail de origem",
     "notification_email_from_address_description": "Endereço de e-mail do remetente, por exemplo: \"Immich Photo Server <noreply@example.com>\". Tenha certeza de ter permissão para enviar e-mails a partir do endereço selecionado.",
@@ -196,15 +196,17 @@
     "oauth_mobile_redirect_uri": "URI de redirecionamento móvel",
     "oauth_mobile_redirect_uri_override": "Substituição de URI de redirecionamento móvel",
     "oauth_mobile_redirect_uri_override_description": "Ative quando o provedor do OAuth não suportar uma URI de aplicativo, por exemplo ''{callback}''",
+    "oauth_role_claim": "Declaração de função",
+    "oauth_role_claim_description": "Dá permissões de administrador baseado no valor desta declaração. A declaração pode conter os valores 'user' ou 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Gerenciar configurações de login do OAuth",
     "oauth_settings_more_details": "Para mais detalhes sobre este recurso, consulte a <link>documentação</link>.",
-    "oauth_storage_label_claim": "Reivindicação de rótulo de armazenamento",
+    "oauth_storage_label_claim": "Declaração do rótulo de armazenamento",
     "oauth_storage_label_claim_description": "Defina automaticamente o rótulo de armazenamento do usuário para o valor desta declaração.",
-    "oauth_storage_quota_claim": "Cota de armazenamento",
+    "oauth_storage_quota_claim": "Declaração de cota de armazenamento",
     "oauth_storage_quota_claim_description": "Defina automaticamente a cota de armazenamento do usuário para o valor desta declaração.",
     "oauth_storage_quota_default": "Cota de armazenamento padrão (GiB)",
-    "oauth_storage_quota_default_description": "Cota em GiB a ser usada quando nenhuma outra reivindicação for fornecida.",
+    "oauth_storage_quota_default_description": "Cota em GiB que será usada caso esta declaração não seja fornecida.",
     "oauth_timeout": "Tempo Limite de Requisição",
     "oauth_timeout_description": "Tempo limite para requisições, em milissegundos",
     "password_enable_description": "Login com e-mail e senha",
@@ -234,20 +236,20 @@
     "sidecar_job_description": "Descubra ou sincronize metadados secundários do sistema de arquivos",
     "slideshow_duration_description": "Tempo em segundos para exibir cada imagem",
     "smart_search_job_description": "Execute aprendizado de máquina em arquivos para oferecer suporte à pesquisa inteligente",
-    "storage_template_date_time_description": "A data e hora da criação do ativo é usado para a informações de data e hora",
+    "storage_template_date_time_description": "A data e hora da criação do arquivo é usado para a informações de data e hora",
     "storage_template_date_time_sample": "Exemplo {date}",
     "storage_template_enable_description": "Habilitar mecanismo de modelo de armazenamento",
     "storage_template_hash_verification_enabled": "Verificação de hash ativada",
     "storage_template_hash_verification_enabled_description": "Ativa a verificação de hash, não desative a menos que você tenha certeza das implicações",
     "storage_template_migration": "Migração de modelo de armazenamento",
-    "storage_template_migration_description": "Aplique o <link>{template}</link> atual aos arquivos carregados anteriormente",
-    "storage_template_migration_info": "O modelo altera todas extensões para minúsculo. As mudanças no modelo serão aplicadas apenas em novos arquivos. Para aplicar retroativamente o modelo aos arquivos carregados anteriormente, execute o <link>{job}</link>.",
+    "storage_template_migration_description": "Aplicar o <link>{template}</link> atual aos arquivos enviados anteriormente",
+    "storage_template_migration_info": "O modelo altera todas extensões para minúsculo. As mudanças no modelo serão aplicadas apenas em novos arquivos; para aplicar o modelo aos arquivos enviados anteriormente, execute o <link>{job}</link>.",
     "storage_template_migration_job": "Tarefa de Migração de Modelo de Armazenamento",
     "storage_template_more_details": "Para mais detalhes sobre este recurso, consulte o <template-link>Modelo de Armazenamento</template-link> e suas <implications-link>implicações</implications-link>",
     "storage_template_onboarding_description_v2": "Ao ser ativado, este recurso irá organizar automaticamente os arquivos com base em um modelo definido pelo usuário. Para mais informações, consulte a <link>documentação</link>.",
     "storage_template_path_length": "Limite aproximado de comprimento do caminho: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Modelo de Armazenamento",
-    "storage_template_settings_description": "Gerencie a estrutura de pasta e o nome do arquivo carregado",
+    "storage_template_settings_description": "Gerencie a estrutura de pasta e o nome do arquivo enviado",
     "storage_template_user_label": "<code>{label}</code> é o Rótulo de Armazenamento do usuário",
     "system_settings": "Configurações do Sistema",
     "tag_cleanup_job": "Limpeza de marcadores",
@@ -336,7 +338,7 @@
     "user_delete_delay_settings": "Remover atraso",
     "user_delete_delay_settings_description": "Número de dias após a remoção para excluir permanentemente a conta e os arquivos de um usuário. A tarefa de exclusão de usuário é executada à meia-noite para verificar usuários que estão prontos para exclusão. As alterações nesta configuração serão avaliadas na próxima execução.",
     "user_delete_immediately": "A conta e os arquivos de <b>{user}</b> serão programados para exclusão permanente <b>imediata</b>.",
-    "user_delete_immediately_checkbox": "Adicionar o usuário e seus ativos na fila para serem deletados imediatamente",
+    "user_delete_immediately_checkbox": "Adicionar o usuário e seus arquivos na fila para serem deletados imediatamente",
     "user_details": "Detalhes do Usuário",
     "user_management": "Gerenciamento de usuários",
     "user_password_has_been_reset": "A senha do usuário foi redefinida:",
@@ -426,7 +428,8 @@
   "app_bar_signout_dialog_title": "Sair",
   "app_settings": "Configurações do Aplicativo",
   "appears_in": "Aparece em",
-  "archive": "Arquivados",
+  "archive": "Arquivar",
+  "archive_action_prompt": "{count} mídias arquivadas",
   "archive_or_unarchive_photo": "Arquivar ou desarquivar foto",
   "archive_page_no_archived_assets": "Nenhum arquivo encontrado",
   "archive_page_title": "Arquivados ({count})",
@@ -440,7 +443,7 @@
   "asset_action_share_err_offline": "Não foi possível obter os arquivos indisponíveis, ignorando",
   "asset_added_to_album": "Adicionado ao álbum",
   "asset_adding_to_album": "Adicionando ao álbum…",
-  "asset_description_updated": "A descrição do ativo foi atualizada",
+  "asset_description_updated": "A descrição do arquivo foi atualizada",
   "asset_filename_is_offline": "O arquivo {filename} não está disponível",
   "asset_has_unassigned_faces": "O arquivo tem rostos sem nomes",
   "asset_hashing": "Processando…",
@@ -457,14 +460,13 @@
   "asset_restored_successfully": "Arquivo restaurado",
   "asset_skipped": "Ignorado",
   "asset_skipped_in_trash": "Na lixeira",
-  "asset_uploaded": "Carregado",
-  "asset_uploading": "Carregando…",
+  "asset_uploaded": "Enviado",
+  "asset_uploading": "Enviando…",
   "asset_viewer_settings_subtitle": "Gerenciar as configurações do visualizador da galeria",
   "asset_viewer_settings_title": "Visualizador de Mídia",
   "assets": "Arquivos",
   "assets_added_count": "{count, plural, one {# arquivo adicionado} other {# arquivos adicionados}}",
   "assets_added_to_album_count": "{count, plural, one {# arquivo adicionado} other {# arquivos adicionados}} ao álbum",
-  "assets_added_to_name_count": "{count, plural, one {# arquivo adicionado} other {# arquivos adicionados}} {hasName, select, true {ao álbum <b>{name}</b>} other {em um novo álbum}}",
   "assets_cannot_be_added_to_album_count": "Não foi possível adicionar {count, plural, one {o arquivo} other {os arquivos}} ao álbum",
   "assets_count": "{count, plural, one {# arquivo} other {# arquivos}}",
   "assets_deleted_permanently": "{count} arquivo(s) deletado(s) permanentemente",
@@ -489,7 +491,7 @@
   "back": "Voltar",
   "back_close_deselect": "Voltar, fechar ou desmarcar",
   "background_location_permission": "Permissão de localização em segundo plano",
-  "background_location_permission_content": "Para que seja possível trocar a URL quando estiver executando em segundo plano, o Immich deve *sempre* ter a permissão de localização precisa para que o aplicativo consiga ler o nome da rede Wi-Fi",
+  "background_location_permission_content": "Para que seja possível trocar o endereço quando estiver executando em segundo plano, o Immich deve *sempre* ter a permissão de localização precisa para que o aplicativo consiga ler o nome da rede Wi-Fi",
   "backup_album_selection_page_albums_device": "Álbuns no dispositivo ({count})",
   "backup_album_selection_page_albums_tap": "Toque para incluir, toque duas vezes para excluir",
   "backup_album_selection_page_assets_scatter": "Os recursos podem se espalhar por vários álbuns. Assim, os álbuns podem ser incluídos ou excluídos durante o processo de backup.",
@@ -502,9 +504,9 @@
   "backup_background_service_current_upload_notification": "Enviando {filename}",
   "backup_background_service_default_notification": "Verificando se há novos arquivos…",
   "backup_background_service_error_title": "Erro no backup",
-  "backup_background_service_in_progress_notification": "Fazendo backup de seus ativos…",
+  "backup_background_service_in_progress_notification": "Fazendo backup de seus arquivos…",
   "backup_background_service_upload_failure_notification": "Falha ao enviar {filename}",
-  "backup_controller_page_albums": "Álbuns de backup",
+  "backup_controller_page_albums": "Backup de álbuns",
   "backup_controller_page_background_app_refresh_disabled_content": "Para utilizar o backup em segundo plano, ative a atualização da aplicação em segundo plano em Configurações > Geral > Atualização em 2º plano.",
   "backup_controller_page_background_app_refresh_disabled_title": "Atualização em 2º plano desativada",
   "backup_controller_page_background_app_refresh_enable_button_text": "Ir para as configurações",
@@ -512,40 +514,40 @@
   "backup_controller_page_background_battery_info_message": "Para uma melhor experiência de backup em segundo plano, desative todas as otimizações de bateria que restrinjam a atividade em segundo plano do Immich.\n\nComo isso é específico por dispositivo, consulte as informações de como fazer isso com o fabricante do seu dispositivo.",
   "backup_controller_page_background_battery_info_ok": "OK",
   "backup_controller_page_background_battery_info_title": "Otimizações de bateria",
-  "backup_controller_page_background_charging": "Apenas durante o carregamento",
+  "backup_controller_page_background_charging": "Apenas enquanto carrega a bateria",
   "backup_controller_page_background_configure_error": "Falha ao configurar o serviço em segundo plano",
   "backup_controller_page_background_delay": "Adiar backup de novos arquivos: {duration}",
-  "backup_controller_page_background_description": "Ative o serviço em segundo plano para fazer backup automático de novos ativos sem precisar abrir o aplicativo",
+  "backup_controller_page_background_description": "Ative o serviço em segundo plano para fazer backup automático de novos arquivos sem precisar abrir o aplicativo",
   "backup_controller_page_background_is_off": "O backup automático em segundo plano está desativado",
   "backup_controller_page_background_is_on": "O backup automático em segundo plano está ativado",
   "backup_controller_page_background_turn_off": "Desativar o serviço em segundo plano",
   "backup_controller_page_background_turn_on": "Ativar o serviço em segundo plano",
   "backup_controller_page_background_wifi": "Apenas no Wi-Fi",
   "backup_controller_page_backup": "Backup",
-  "backup_controller_page_backup_selected": "Selecionado: ",
-  "backup_controller_page_backup_sub": "Backup de fotos e vídeos",
-  "backup_controller_page_created": "Criado em: {date}",
-  "backup_controller_page_desc_backup": "Ative o backup para carregar automaticamente novos ativos no servidor.",
-  "backup_controller_page_excluded": "Excluído: ",
+  "backup_controller_page_backup_selected": "Selecionados: ",
+  "backup_controller_page_backup_sub": "Total de mídias com backup",
+  "backup_controller_page_created": "Data: {date}",
+  "backup_controller_page_desc_backup": "Ative para fazer backup automático dos novos arquivos ao abrir este aplicativo.",
+  "backup_controller_page_excluded": "Ignorados: ",
   "backup_controller_page_failed": "Falhou ({count})",
-  "backup_controller_page_filename": "Nome do arquivo: {filename} [{size}]",
+  "backup_controller_page_filename": "Arquivo: {filename} [{size}]",
   "backup_controller_page_id": "ID: {id}",
-  "backup_controller_page_info": "Informações de backup",
-  "backup_controller_page_none_selected": "Nenhum selecionado",
+  "backup_controller_page_info": "Informações do backup",
+  "backup_controller_page_none_selected": "Nenhum álbum selecionado",
   "backup_controller_page_remainder": "Restante",
-  "backup_controller_page_remainder_sub": "Fotos e vídeos restantes para fazer backup da seleção",
+  "backup_controller_page_remainder_sub": "Mídias nos álbuns selecionados que ainda não tem backup",
   "backup_controller_page_server_storage": "Armazenamento do servidor",
-  "backup_controller_page_start_backup": "Iniciar backup",
-  "backup_controller_page_status_off": "O backup está desativado",
-  "backup_controller_page_status_on": "O backup está ativado",
+  "backup_controller_page_start_backup": "Iniciar backup manual",
+  "backup_controller_page_status_off": "O backup automático está desativado",
+  "backup_controller_page_status_on": "O backup automático está ativado",
   "backup_controller_page_storage_format": "{used} de {total} usados",
-  "backup_controller_page_to_backup": "Álbuns para backup",
-  "backup_controller_page_total_sub": "Todas as fotos e vídeos únicos dos álbuns selecionados",
-  "backup_controller_page_turn_off": "Desativar o backup",
-  "backup_controller_page_turn_on": "Ativar Backup",
-  "backup_controller_page_uploading_file_info": "Carregando informações do arquivo",
+  "backup_controller_page_to_backup": "Escolha os álbuns para fazer backup",
+  "backup_controller_page_total_sub": "Total de mídias nos álbuns selecionados",
+  "backup_controller_page_turn_off": "Desativar backup automático",
+  "backup_controller_page_turn_on": "Ativar backup automático",
+  "backup_controller_page_uploading_file_info": "Informações do arquivo",
   "backup_err_only_album": "Não é possível remover o único álbum",
-  "backup_info_card_assets": "ativos",
+  "backup_info_card_assets": "arquivos",
   "backup_manual_cancelled": "Cancelado",
   "backup_manual_in_progress": "Envio já está em progresso. Tente novamente mais tarde",
   "backup_manual_success": "Sucesso",
@@ -570,7 +572,7 @@
   "cache_settings_clear_cache_button": "Limpar o cache",
   "cache_settings_clear_cache_button_title": "Limpa o cache do aplicativo. Isso afetará significativamente o desempenho do aplicativo até que o cache seja reconstruído.",
   "cache_settings_duplicated_assets_clear_button": "LIMPAR",
-  "cache_settings_duplicated_assets_subtitle": "Fotos e vídeos que são bloqueados pelo app",
+  "cache_settings_duplicated_assets_subtitle": "Mídias ignoradas pelo app",
   "cache_settings_duplicated_assets_title": "Arquivos duplicados ({count})",
   "cache_settings_statistics_album": "Miniaturas da biblioteca",
   "cache_settings_statistics_full": "Imagens completas",
@@ -658,9 +660,9 @@
   "control_bottom_app_bar_create_new_album": "Criar novo álbum",
   "control_bottom_app_bar_delete_from_immich": "Excluir do Immich",
   "control_bottom_app_bar_delete_from_local": "Excluir do dispositivo",
-  "control_bottom_app_bar_edit_location": "Editar Localização",
+  "control_bottom_app_bar_edit_location": "Alterar Local",
   "control_bottom_app_bar_edit_time": "Editar data e hora",
-  "control_bottom_app_bar_share_link": "Compartilhar Link",
+  "control_bottom_app_bar_share_link": "Link",
   "control_bottom_app_bar_share_to": "Compartilhar",
   "control_bottom_app_bar_trash_from_immich": "Mover para a Lixeira",
   "copied_image_to_clipboard": "Imagem copiada para a área de transferência.",
@@ -680,7 +682,7 @@
   "create_album_page_untitled": "Sem título",
   "create_library": "Criar biblioteca",
   "create_link": "Criar link",
-  "create_link_to_share": "Criar link para partilhar",
+  "create_link_to_share": "Criar link e compartilhar",
   "create_link_to_share_description": "Permitir que qualquer pessoa com o link veja a(s) foto(s) selecionada(s)",
   "create_new": "CRIAR NOVO",
   "create_new_person": "Criar nova pessoa",
@@ -703,7 +705,7 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Escuro",
-  "darkTheme": "trocar para tema escuro",
+  "dark_theme": "Usar tema escuro",
   "date_after": "Data após",
   "date_and_time": "Data e Hora",
   "date_before": "Data antes",
@@ -719,6 +721,7 @@
   "default_locale": "Localização Padrão",
   "default_locale_description": "Formatar datas e números baseados na linguagem do seu navegador",
   "delete": "Excluir",
+  "delete_action_prompt": "{count} deletados permanentemente",
   "delete_album": "Excluir álbum",
   "delete_api_key_prompt": "Tem certeza de que deseja excluir esta chave de API?",
   "delete_dialog_alert": "Esses itens serão excluídos permanentemente do Immich e do seu dispositivo",
@@ -781,7 +784,7 @@
   "downloading": "Baixando",
   "downloading_asset_filename": "Baixando arquivo {filename}",
   "downloading_media": "Baixando mídia",
-  "drop_files_to_upload": "Solte arquivos em qualquer lugar para carregar",
+  "drop_files_to_upload": "Solte os arquivos em qualquer lugar para enviar",
   "duplicates": "Duplicados",
   "duplicates_description": "Marque cada grupo indicando quais arquivos, se algum, são duplicados",
   "duration": "Duração",
@@ -799,6 +802,7 @@
   "edit_key": "Editar chave",
   "edit_link": "Editar link",
   "edit_location": "Editar Localização",
+  "edit_location_action_prompt": "{count} locais alterados",
   "edit_location_dialog_title": "Localização",
   "edit_name": "Editar nome",
   "edit_people": "Editar pessoas",
@@ -814,7 +818,7 @@
   "email": "E-mail",
   "email_notifications": "Notificações por e-mail",
   "empty_folder": "A pasta está vazia",
-  "empty_trash": "Esvaziar lixo",
+  "empty_trash": "Esvaziar lixeira",
   "empty_trash_confirmation": "Tem certeza de que deseja esvaziar a lixeira? Isso removerá permanentemente do Immich todos os arquivos que estão na lixeira.\nVocê não pode desfazer esta ação!",
   "enable": "Habilitar",
   "enable_biometric_auth_description": "Insira seu código PIN para ativar a autenticação por biometria",
@@ -855,8 +859,8 @@
     "failed_to_edit_shared_link": "Falha ao editar o link compartilhado",
     "failed_to_get_people": "Falha na obtenção de pessoas",
     "failed_to_keep_this_delete_others": "Falha ao manter este arquivo e excluir os outros",
-    "failed_to_load_asset": "Não foi possível carregar o ativo",
-    "failed_to_load_assets": "Não foi possível carregar os ativos",
+    "failed_to_load_asset": "Não foi possível carregar o arquivo",
+    "failed_to_load_assets": "Não foi possível carregar os arquivos",
     "failed_to_load_notifications": "Falha ao carregar notificações",
     "failed_to_load_people": "Falha ao carregar pessoas",
     "failed_to_remove_product_key": "Falha ao remover a chave do produto",
@@ -949,7 +953,7 @@
     "unable_to_update_settings": "Não foi possível atualizar as configurações",
     "unable_to_update_timeline_display_status": "Não foi possível atualizar o modo de visualização da linha do tempo",
     "unable_to_update_user": "Não foi possível atualizar o usuário",
-    "unable_to_upload_file": "Não foi possível carregar o arquivo"
+    "unable_to_upload_file": "Não foi possível enviar o arquivo"
   },
   "exif": "Exif",
   "exif_bottom_sheet_description": "Adicionar descrição...",
@@ -977,13 +981,14 @@
   "external": "Externo",
   "external_libraries": "Bibliotecas externas",
   "external_network": "Rede externa",
-  "external_network_sheet_info": "Quando não estiver na rede Wi-Fi especificada, o aplicativo irá se conectar usando a primeira URL abaixo que obtiver sucesso, começando do topo da lista para baixo",
+  "external_network_sheet_info": "Quando não estiver na rede Wi-Fi especificada, o aplicativo irá se conectar usando o primeiro endereço abaixo que obtiver sucesso, começando do topo da lista para baixo",
   "face_unassigned": "Sem nome",
   "failed": "Falhou",
   "failed_to_authenticate": "Não foi possível autenticar",
   "failed_to_load_assets": "Falha ao carregar arquivos",
   "failed_to_load_folder": "Falha ao carregar a pasta",
   "favorite": "Favorito",
+  "favorite_action_prompt": "{count} marcados como favorito",
   "favorite_or_unfavorite_photo": "Marque ou desmarque a foto como favorita",
   "favorites": "Favoritos",
   "favorites_page_no_favorites": "Nenhuma mídia favorita encontrada",
@@ -1138,7 +1143,7 @@
   "loading_search_results_failed": "Falha ao carregar os resultados da pesquisa",
   "local_asset_cast_failed": "Não é possível transmitir um arquivo que não foi enviado ao servidor",
   "local_network": "Rede local",
-  "local_network_sheet_info": "O aplicativo irá se conectar ao servidor através desta URL quando estiver na rede Wi-Fi especificada",
+  "local_network_sheet_info": "O aplicativo irá se conectar ao servidor através deste endereço quando estiver na rede Wi-Fi especificada",
   "location_permission": "Permissão de localização",
   "location_permission_content": "Para utilizar a função de troca automática de URL é necessário a permissão de localização precisa, para que seja possível ler o nome da rede Wi-Fi",
   "location_picker_choose_on_map": "Escolha no mapa",
@@ -1147,7 +1152,7 @@
   "location_picker_longitude_error": "Digite uma longitude válida",
   "location_picker_longitude_hint": "Digite a longitude",
   "lock": "Trancar",
-  "locked_folder": "Pasta Trancada",
+  "locked_folder": "Pasta com senha",
   "log_out": "Sair",
   "log_out_all_devices": "Sair de todos dispositivos",
   "logged_in_as": "Usuário atual: {user}",
@@ -1246,6 +1251,7 @@
   "more": "Mais",
   "move": "Mover",
   "move_off_locked_folder": "Mover para fora da pasta com senha",
+  "move_to_lock_folder_action_prompt": "{count} adicionados à pasta com senha",
   "move_to_locked_folder": "Mover para a pasta com senha",
   "move_to_locked_folder_confirmation": "Estas fotos e vídeos serão removidos de todos os álbuns e somente poderão ser visualizados de dentro da pasta com senha",
   "moved_to_archive": "{count, plural, one {# mídia foi arquivada} other {# mídias foram arquivadas}}",
@@ -1276,12 +1282,12 @@
   "no_albums_with_name_yet": "Parece que você ainda não tem nenhum álbum com esse nome.",
   "no_albums_yet": "Parece que você 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": "CLIQUE PARA CARREGAR SUA PRIMEIRA FOTO",
+  "no_assets_message": "CLIQUE PARA ENVIAR SUA PRIMEIRA FOTO",
   "no_assets_to_show": "Não há arquivos para exibir",
   "no_cast_devices_found": "Nenhum dispositivo encontrado",
   "no_duplicates_found": "Nenhuma duplicidade foi encontrada.",
   "no_exif_info_available": "Sem informações exif disponíveis",
-  "no_explore_results_message": "Carregue mais fotos para explorar sua coleção.",
+  "no_explore_results_message": "Envie mais fotos para explorar sua coleção.",
   "no_favorites_message": "Adicione aos favoritos para encontrar suas melhores fotos e vídeos rapidamente",
   "no_libraries_message": "Crie uma biblioteca externa para ver suas fotos e vídeos",
   "no_locked_photos_message": "Fotos e vídeos na pasta com senha são ocultos e não serão exibidos enquanto explora ou pesquisa na biblioteca.",
@@ -1294,7 +1300,7 @@
   "no_shared_albums_message": "Crie um álbum para compartilhar fotos e vídeos com pessoas em sua rede",
   "not_in_any_album": "Fora de álbum",
   "not_selected": "Não selecionado",
-  "note_apply_storage_label_to_previously_uploaded assets": "Nota: Para aplicar o rótulo de armazenamento a arquivos carregados anteriormente, execute o",
+  "note_apply_storage_label_to_previously_uploaded assets": "Nota: Para aplicar o rótulo de armazenamento a arquivos enviados anteriormente, execute o",
   "notes": "Notas",
   "nothing_here_yet": "Ainda não existe nada aqui",
   "notification_permission_dialog_content": "Para ativar as notificações, vá em Configurações e selecione permitir.",
@@ -1369,7 +1375,7 @@
   "permanent_deletion_warning_setting_description": "Exibe um aviso ao deletar arquivos de forma permanente",
   "permanently_delete": "Deletar permanentemente",
   "permanently_delete_assets_count": "Excluir permanentemente {count, plural, one {asset} other {assets}}",
-  "permanently_delete_assets_prompt": "Você tem certeza de que deseja excluir permanentemente {count, plural, one {este ativo?} other {estes <b>#</b> ativos?}} Esta ação também removerá {count, plural, one {o ativo} other {os ativos}} de um ou mais álbuns.",
+  "permanently_delete_assets_prompt": "Você tem certeza de que deseja excluir permanentemente {count, plural, one {este arquivo?} other {estes <b>#</b> arquivos?}} Esta ação também removerá {count, plural, one {o arquivo} other {os arquivos}} de um ou mais álbuns.",
   "permanently_deleted_asset": "Arquivo deletado permanentemente",
   "permanently_deleted_assets_count": "{count, plural, one {# arquivo permanentemente excluído} other {# arquivos permanentemente excluídos}}",
   "permission": "Permissão",
@@ -1495,7 +1501,9 @@
   "remove_custom_date_range": "Remover intervalo de datas personalizado",
   "remove_deleted_assets": "Remover arquivos excluídos",
   "remove_from_album": "Remover do álbum",
+  "remove_from_album_action_prompt": "{count} removido do álbum",
   "remove_from_favorites": "Remover dos favoritos",
+  "remove_from_lock_folder_action_prompt": "{count} removidos da pasta com senha",
   "remove_from_locked_folder": "Remover da pasta com senha",
   "remove_from_locked_folder_confirmation": "Tem a certeza de que deseja mover estes arquivos para fora da pasta com senha? Eles ficarão visíveis na biblioteca principal.",
   "remove_from_shared_link": "Remover do link compartilhado",
@@ -1531,7 +1539,7 @@
   "restore_user": "Restaurar usuário",
   "restored_asset": "Arquivo restaurado",
   "resume": "Continuar",
-  "retry_upload": "Tentar carregar novamente",
+  "retry_upload": "Tentar enviar novamente",
   "review_duplicates": "Revisar duplicidade",
   "role": "Função",
   "role_editor": "Editor",
@@ -1626,7 +1634,7 @@
   "send_welcome_email": "Enviar E-mail de boas vindas",
   "server_endpoint": "URL do servidor",
   "server_info_box_app_version": "Versão do aplicativo",
-  "server_info_box_server_url": "URL do servidor",
+  "server_info_box_server_url": "Endereço",
   "server_offline": "Servidor Indisponível",
   "server_online": "Servidor Disponível",
   "server_privacy": "Privacidade do servidor",
@@ -1713,7 +1721,7 @@
   "shared_link_info_chip_metadata": "EXIF",
   "shared_link_manage_links": "Gerenciar links compartilhados",
   "shared_link_options": "Opções de link compartilhado",
-  "shared_links": "Links compartilhados",
+  "shared_links": "Links",
   "shared_links_description": "Compartilhar fotos e videos com um link",
   "shared_photos_and_videos_count": "{assetCount, plural, one {# Foto & vídeo compartilhado.} other {# Fotos & vídeos compartilhados.}}",
   "shared_with_me": "Compartilhado comigo",
@@ -1838,6 +1846,7 @@
   "total": "Total",
   "total_usage": "Utilização total",
   "trash": "Lixeira",
+  "trash_action_prompt": "{count} enviados à lixeira",
   "trash_all": "Mover todos para o lixo",
   "trash_count": "Lixo {count, number}",
   "trash_delete_asset": "Jogar na lixeira/Excluir Arquivo",
@@ -1855,9 +1864,11 @@
   "unable_to_change_pin_code": "Não foi possível alterar o código PIN",
   "unable_to_setup_pin_code": "Não foi possível criar o código PIN",
   "unarchive": "Desarquivar",
+  "unarchive_action_prompt": "{count} desarquivado",
   "unarchived_count": "{count, plural, one {# Desarquivado} other {# Desarquivados}}",
   "undo": "Desfazer",
   "unfavorite": "Remover favorito",
+  "unfavorite_action_prompt": "{count} removido dos favoritos",
   "unhide_person": "Exibir pessoa",
   "unknown": "Desconhecido",
   "unknown_country": "País desconhecido",
@@ -1876,20 +1887,21 @@
   "unselect_all_in": "Remover seleção de {group}",
   "unstack": "Retirar do grupo",
   "unstacked_assets_count": "{count, plural, one {# arquivo retirado} other {# arquivos retirados}} do grupo",
+  "untagged": "Marcador removido",
   "up_next": "A seguir",
   "updated_at": "Atualizado em",
   "updated_password": "Senha atualizada",
-  "upload": "Carregar",
+  "upload": "Enviar",
   "upload_concurrency": "Envios simultâneos",
   "upload_dialog_info": "Deseja fazer o backup dos arquivos selecionados no servidor?",
   "upload_dialog_title": "Enviar arquivo",
-  "upload_errors": "Envio concluído com {count, plural, one {# erro} other {# erros}}, atualize a página para ver os novos arquivos carregados.",
+  "upload_errors": "Envio concluído com {count, plural, one {# erro} other {# erros}}, atualize a página para ver os novos arquivos.",
   "upload_progress": "{remaining, number} restantes - {processed, number}/{total, number} já processados",
   "upload_skipped_duplicates": "{count, plural, one {# Arquivo duplicado foi ignorado} other {# Arquivos duplicados foram ignorados}}",
   "upload_status_duplicates": "Duplicados",
   "upload_status_errors": "Erros",
-  "upload_status_uploaded": "Carregado",
-  "upload_success": "Carregado com sucesso, atualize a página para ver os novos arquivos.",
+  "upload_status_uploaded": "Enviado",
+  "upload_success": "Enviado com sucesso, atualize a página para ver os novos arquivos.",
   "upload_to_immich": "Enviar para o Immich ({count})",
   "uploading": "Enviando",
   "url": "URL",
diff --git a/i18n/ro.json b/i18n/ro.json
index 0b2ef61a36..46197e943f 100644
--- a/i18n/ro.json
+++ b/i18n/ro.json
@@ -14,6 +14,7 @@
   "add_a_location": "Adaugă o locație",
   "add_a_name": "Adaugă un nume",
   "add_a_title": "Adaugă un titlu",
+  "add_endpoint": "Adaugă punct final",
   "add_exclusion_pattern": "Adăugă un model de excludere",
   "add_import_path": "Adaugă o cale de import",
   "add_location": "Adaugă locație",
@@ -21,6 +22,7 @@
   "add_partner": "Adaugă partener",
   "add_path": "Adaugă o cale",
   "add_photos": "Adaugă fotografii",
+  "add_tag": "Adaugă etichetă",
   "add_to": "Adaugă la…",
   "add_to_album": "Adaugă în album",
   "add_to_album_bottom_sheet_added": "Adăugat în {album}",
@@ -32,6 +34,7 @@
   "added_to_favorites_count": "Adăugat {count, number} la favorite",
   "admin": {
     "add_exclusion_pattern_description": "Adăugați modele de excludere. Globing folosind *, ** și ? este suportat. Pentru a ignora toate fișierele din orice director numit „Raw”, utilizați „**/Raw/**”. Pentru a ignora toate fișierele care se termină în „.tif”, utilizați „**/*.tif”. Pentru a ignora o cale absolută, utilizați „/path/to/ignore/**”.",
+    "admin_user": "Utilizator admin",
     "asset_offline_description": "Acest material din biblioteca externă nu se mai găsește pe disc și a fost mutat în coșul de gunoi. Dacă fișierul a fost mutat în bibliotecă, verificați cronologia pentru noul material corespunzător. Pentru a restabili acest material, asigurați-vă că calea fișierului de mai jos poate fi accesată de Immich și scanați biblioteca.",
     "authentication_settings": "Setări de Autentificare",
     "authentication_settings_description": "Gestionează parola, OAuth și alte setări de autentificare",
@@ -39,8 +42,8 @@
     "authentication_settings_reenable": "Pentru a reactiva, folosește <link>Comandă Server</link>.",
     "background_task_job": "Activități de Fundal",
     "backup_database": "Salvare Bază de Date",
-    "backup_database_enable_description": "Activare salvare bază de date",
-    "backup_keep_last_amount": "Cantitatea de copii de rezervă anterioare de păstrat",
+    "backup_database_enable_description": "Activare salvarea bazei de date",
+    "backup_keep_last_amount": "Număr de copii de rezervă anterioare de păstrat",
     "backup_settings": "Setări Copii de Rezervă",
     "backup_settings_description": "Gestionați setările de salvare a bazei de date",
     "cleared_jobs": "Activități eliminate pentru: {job}",
@@ -50,6 +53,7 @@
     "confirm_email_below": "Pentru a confirma, tastați „{email}” mai jos",
     "confirm_reprocess_all_faces": "Sigur doriți să reprocesați toate fețele? Acest lucru va șterge și persoanele cu nume.",
     "confirm_user_password_reset": "Sigur doriți să resetați parola utilizatorului {user}?",
+    "confirm_user_pin_code_reset": "Ești sigur că vrei să resetezi codul PIN al {user}?",
     "create_job": "Creează sarcină",
     "cron_expression": "Expresia cron",
     "cron_expression_description": "Setați intervalul de scanare folosind formatul cron. Pentru mai multe informații, consultați de ex. <link>Crontab Guru</link>",
@@ -167,7 +171,7 @@
     "note_apply_storage_label_previous_assets": "Notă: Pentru a aplica Eticheta de Stocare la elementele încărcate anterior, executați",
     "note_cannot_be_changed_later": "NOTĂ: Nu se va mai putea modifica ulterior!",
     "notification_email_from_address": "De la adresa",
-    "notification_email_from_address_description": "Adresa expeditorului, spre exemplu: „Immich Photo Server <noreply@example.com>”",
+    "notification_email_from_address_description": "Adresa expeditorului, spre exemplu: „Immich Photo Server <noreply@example.com>”. Asigură-te că folosești o adresă de la care ai permisiunea de a trimite e-mailuri.",
     "notification_email_host_description": "Adresa serverului de email (ex. smtp.immich.app)",
     "notification_email_ignore_certificate_errors": "Ingnoră erorile de certificat",
     "notification_email_ignore_certificate_errors_description": "Ignoră erorile de validare a certificatului TLS (nerecomandat)",
@@ -187,6 +191,7 @@
     "oauth_auto_register": "Auto înregistrare",
     "oauth_auto_register_description": "Înregistrează automat utilizatori noi după autentificarea cu OAuth",
     "oauth_button_text": "Text buton",
+    "oauth_client_secret_description": "Necesar dacă PKCE (Proof Key for Code Exchange) nu este suportat de furnizorul OAuth",
     "oauth_enable_description": "Autentifică-te cu OAuth",
     "oauth_mobile_redirect_uri": "URI de redirecționare mobilă",
     "oauth_mobile_redirect_uri_override": "Înlocuire URI de redirecționare mobilă",
@@ -199,7 +204,9 @@
     "oauth_storage_quota_claim": "Revendicare spațiu de stocare",
     "oauth_storage_quota_claim_description": "Setează automat spațiul de stocare al utilizatorului la valoarea acestei cereri.",
     "oauth_storage_quota_default": "Cota implicită a spațiului de stocare (GiB)",
-    "oauth_storage_quota_default_description": "Spațiul în GiB ce urmează a fi utilizat atunci când nu este furnizată nicio solicitare (introduceți 0 pentru spațiu nelimitat).",
+    "oauth_storage_quota_default_description": "Spațiul în GiB ce urmează a fi utilizat atunci când nu este furnizată nicio solicitare.",
+    "oauth_timeout": "Solicitarea a expirat",
+    "oauth_timeout_description": "Timp de expirare pentru solicitări în milisecunde",
     "password_enable_description": "Autentificare cu email și parolǎ",
     "password_settings": "Autentificare cu Parolǎ",
     "password_settings_description": "Gestioneazǎ setǎrile de autentificare cu parola",
@@ -237,6 +244,7 @@
     "storage_template_migration_info": "Șablonul de stocare va converti extensiile in litere mici. Modificările șablonului se vor aplica doar materialelor noi. Pentru a aplica retroactiv șablonul la materialele încărcate anterior, rulați <link>{job}</link>.",
     "storage_template_migration_job": "Sarcină Migrare Șablon Stocare",
     "storage_template_more_details": "Pentru mai multe detalii despre aceasta caracteristică, accesați <template-link>Șablon stocare</template-link> si <implications-link>implicațiile</implications-link>",
+    "storage_template_onboarding_description_v2": "Când este activată, această funcție va organiza automat fișierele pe baza șablonului definit de către utilizator. Pentru mai multe informații, accesează <link>documentația</link>.",
     "storage_template_path_length": "Limita de lungime pentru calea aproximativă: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Șablon Stocare",
     "storage_template_settings_description": "Gestionează structura folderelor și numele fișierelor pentru elementele încărcate",
@@ -251,7 +259,7 @@
     "template_email_update_album": "Actualizați Șablonul de Album",
     "template_email_welcome": "Șablon de e-mail de bun venit",
     "template_settings": "Șabloane de Notificare",
-    "template_settings_description": "Gestionați șabloanele personalizate pentru notificări.",
+    "template_settings_description": "Gestionați șabloanele personalizate pentru notificări",
     "theme_custom_css_settings": "CSS personalizat",
     "theme_custom_css_settings_description": "Foile de stil în cascadă (CSS) permit personalizarea designului Immich.",
     "theme_settings": "Setări Temă",
@@ -283,7 +291,7 @@
     "transcoding_encoding_options": "Opțiuni codificare",
     "transcoding_encoding_options_description": "Setează codecuri , calitatea, rezoluția și alte opțiuni pentru videoclipuri codificare",
     "transcoding_hardware_acceleration": "Accelerare Hardware",
-    "transcoding_hardware_acceleration_description": "Experimental; mult mai rapid, dar va avea o calitate mai scăzută la același bitrate",
+    "transcoding_hardware_acceleration_description": "Experimental: transcodare mai rapidă, dar poate reduce calitatea la aceeași rată de biți",
     "transcoding_hardware_decoding": "Decodare hardware",
     "transcoding_hardware_decoding_setting_description": "Se aplică doar pentru NVENC, QSV și RKMPP. Activează accelerarea completă în loc de doar accelerarea codificării. S-ar putea să nu funcționeze pentru toate videoclipurile.",
     "transcoding_max_b_frames": "Număr maxim de cadre B",
@@ -329,6 +337,7 @@
     "user_delete_delay_settings_description": "Numărul de zile după eliminare până la ștergerea permanentă a contului și a resurselor unui utilizator. Procesul de ștergere a utilizatorului rulează la miezul nopții pentru a verifica utilizatorii care sunt pregătiți pentru ștergere. Modificările aduse acestei setări vor fi evaluate la următoarea execuție.",
     "user_delete_immediately": "Contul și resursele utilizatorului <b>{user}</b> vor fi puse în coadă pentru ștergere permanentă <b>imediat</b>.",
     "user_delete_immediately_checkbox": "Pune utilizatorul și resursele în coadă pentru ștergere imediată",
+    "user_details": "Detalii utilizator",
     "user_management": "Gestionarea Utilizatorilor",
     "user_password_has_been_reset": "Parola utilizatorului a fost resetată:",
     "user_password_reset_description": "Vă rugăm să furnizați utilizatorului parola temporară și să îi informați că va trebui să o schimbe la următoarea autentificare.",
@@ -353,6 +362,8 @@
   "advanced_settings_log_level_title": "Nivel log: {level}",
   "advanced_settings_prefer_remote_subtitle": "Unele dispozitive întâmpină dificultăți în încărcarea miniaturilor pentru resursele de pe dispozitiv. Activează această setare pentru a încărca imaginile de la distanță în schimb.",
   "advanced_settings_prefer_remote_title": "Preferă fotografii la distanță",
+  "advanced_settings_proxy_headers_subtitle": "Definește antetele proxy pe care Immich ar trebui să le trimită cu fiecare solicitare de rețea",
+  "advanced_settings_proxy_headers_title": "Antete Proxy",
   "advanced_settings_self_signed_ssl_subtitle": "Omite verificare certificate SSL pentru distinația server-ului, necesar pentru certificate auto-semnate.",
   "advanced_settings_self_signed_ssl_title": "Permite certificate SSL auto-semnate",
   "advanced_settings_sync_remote_deletions_subtitle": "Ștergeți sau restaurați automat un element de pe acest dispozitiv atunci când acțiunea este efectuată pe web",
@@ -382,6 +393,7 @@
   "album_updated_setting_description": "Primiți o notificare prin e-mail când un album partajat are elemente noi",
   "album_user_left": "A părăsit {album}",
   "album_user_removed": "{user} eliminat",
+  "album_viewer_appbar_delete_confirm": "Ești sigur că vrei să ștergi acest album din contul tău?",
   "album_viewer_appbar_share_err_delete": "Ștergere album eșuată",
   "album_viewer_appbar_share_err_leave": "Părăsire album eșuată",
   "album_viewer_appbar_share_err_remove": "Probleme la ștergerea resurselor din album",
@@ -392,6 +404,9 @@
   "album_with_link_access": "Permite oricui cu link-ul să vadă fotografiile și persoanele din acest album.",
   "albums": "Albume",
   "albums_count": "{count, plural, one {{count, number} Album} other {{count, number} Albume}}",
+  "albums_default_sort_order": "Ordinea implicită de sortare a albumelor",
+  "albums_default_sort_order_description": "Ordinea inițială de sortare a pozelor la crearea de albume noi.",
+  "albums_feature_description": "Colecții de date care pot fi partajate cu alți utilizatori.",
   "all": "Toate",
   "all_albums": "Toate albumele",
   "all_people": "Toți oamenii",
@@ -412,11 +427,13 @@
   "app_settings": "Setări Aplicație",
   "appears_in": "Apare în",
   "archive": "Arhivă",
+  "archive_action_prompt": "{count} adăugate la Arhivă",
   "archive_or_unarchive_photo": "Arhiveazǎ sau dezarhiveazǎ fotografia",
   "archive_page_no_archived_assets": "Nu au fost găsite resurse favorite",
   "archive_page_title": "Arhivă ({count})",
   "archive_size": "Mărime arhivă",
   "archive_size_description": "Configurează dimensiunea arhivei pentru descărcări (în GiB)",
+  "archived": "Arhivat",
   "archived_count": "{count, plural, other {Arhivat/e#}}",
   "are_these_the_same_person": "Sunt aceștia aceeași persoană?",
   "are_you_sure_to_do_this": "Sunteți sigur că doriți să faceți acest lucru?",
@@ -427,33 +444,52 @@
   "asset_description_updated": "Descrierea resursei a fost actualizată",
   "asset_filename_is_offline": "Resursa {filename} este offline",
   "asset_has_unassigned_faces": "Resursa are fețe neatribuite",
+  "asset_hashing": "Calculare amprentă digitală",
+  "asset_list_group_by_sub_title": "Grupare după",
   "asset_list_layout_settings_dynamic_layout_title": "Aspect dinamic",
   "asset_list_layout_settings_group_automatically": "Automat",
   "asset_list_layout_settings_group_by": "Grupează resurse după",
   "asset_list_layout_settings_group_by_month_day": "Lună + zi",
+  "asset_list_layout_sub_title": "Aspect",
   "asset_list_settings_subtitle": "Setări format grilă fotografii",
   "asset_list_settings_title": "Grilă fotografii",
   "asset_offline": "Resursă Offline",
   "asset_offline_description": "Această resursă externă nu mai este găsită pe disc. Contactează te rog administratorul tău Immich pentru ajutor.",
+  "asset_restored_successfully": "Date restaurate cu succes",
   "asset_skipped": "Sărit",
   "asset_skipped_in_trash": "În coșul de gunoi",
   "asset_uploaded": "Încărcat",
   "asset_uploading": "Se incarcă…",
+  "asset_viewer_settings_subtitle": "Gestionați setările de vizualizare a galeriei",
+  "asset_viewer_settings_title": "Vizualizator resurse",
   "assets": "Resurse",
   "assets_added_count": "Adăugat {count, plural, one {# resursă} other {# resurse}}",
   "assets_added_to_album_count": "Am adăugat {count, plural, one {# resursă} other {# resurse}} în album",
-  "assets_added_to_name_count": "Am adăugat {count, plural, one {# resursă} other {# resurse}} în {hasName, select, true {<b>{name}</b>} other {albumul nou}}",
+  "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} nu pot fi adăugate în album",
   "assets_count": "{count, plural, one {# resursă} other {# resurse}}",
+  "assets_deleted_permanently": "{count} poză/poze ștearsă/șterse permanent",
+  "assets_deleted_permanently_from_server": "{count} poză/poze ștearsă/șterse permanent din serverul Immich",
+  "assets_downloaded_failed": "{count, plural, one {S-a descărcat # fișier – {error} fișier eșuat} other {S-au descărcat # fișiere – {error} fișiere eșuate}}",
+  "assets_downloaded_successfully": "{count, plural, one {S-a descărcat cu succes # fișier} other {S-au descărcat cu succes # fișiere}}",
   "assets_moved_to_trash_count": "Am mutat {count, plural, one {# resursă} other {# resurse}} în coșul de gunoi",
   "assets_permanently_deleted_count": "Șters permanent {count, plural, one {# resursă} other {# resurse}}",
   "assets_removed_count": "Eliminat {count, plural, one {# resursă} other {# resurse}}",
+  "assets_removed_permanently_from_device": "{count} resursă(e) eliminate permanent din dispozitivul dvs.",
   "assets_restore_confirmation": "Ești sigur că vrei să restaurezi toate resursele tale din coșul de gunoi? Nu poți anula această acțiune! Ține minte că resursele offline nu se restaurează astfel.",
   "assets_restored_count": "Restaurat {count, plural, one {# resursă} other {# resurse}}",
+  "assets_restored_successfully": "{count} resursă(e) restaurate cu succes",
+  "assets_trashed": "{count} resursă(e) eliminate",
   "assets_trashed_count": "Mutat în coșul de gunoi {count, plural, one {# resursă} other {# resurse}}",
+  "assets_trashed_from_server": "{count} resursă(e) eliminate de pe serverul Immich",
   "assets_were_part_of_album_count": "{count, plural, one {Resursa era} other {Resursele erau}} deja parte din album",
   "authorized_devices": "Dispozitive Autorizate",
+  "automatic_endpoint_switching_subtitle": "Conectează-te local prin rețeaua Wi‐Fi configurată când este valabilă și prin rețele alternative în caz contrar",
+  "automatic_endpoint_switching_title": "Alternare URL automată",
+  "autoplay_slideshow": "Derulare slideshow automat",
   "back": "Înapoi",
   "back_close_deselect": "Înapoi, închidere sau deselectare",
+  "background_location_permission": "Permisiune locație în fundal",
+  "background_location_permission_content": "Pentru a putea schimba rețeaua activă în fundal, Immich are nevoie de acces *permanent* la locația precisă pentru a citi numele rețelei Wi-Fi",
   "backup_album_selection_page_albums_device": "Albume în dispozitiv ({count})",
   "backup_album_selection_page_albums_tap": "Apasă odata pentru a include, de două ori pentru a exclude",
   "backup_album_selection_page_assets_scatter": "Resursele pot fi împrăștiate în mai multe albume. Prin urmare, albumele pot fi incluse sau excluse în timpul procesului de backup.",
@@ -474,6 +510,7 @@
   "backup_controller_page_background_app_refresh_enable_button_text": "Mergi la setări",
   "backup_controller_page_background_battery_info_link": "Arată-mi cum",
   "backup_controller_page_background_battery_info_message": "Pentru cea mai bună experiență a backup-ului în fundal, te rugăm să dezactivezi orice optimizare pentru baterie care restricționează activitatea în fundal pentru Immich.\n\nDeoarece aceasta este specifică fiecărui dispozitiv, te rugăm verifică informațiile necesare tipului tău de dispozitiv.",
+  "backup_controller_page_background_battery_info_ok": "OK",
   "backup_controller_page_background_battery_info_title": "Optimizări baterie",
   "backup_controller_page_background_charging": "Doar în timpul încărcării",
   "backup_controller_page_background_configure_error": "Configurare serviciu în fundal eșuată",
@@ -483,7 +520,8 @@
   "backup_controller_page_background_is_on": "Backup-ul automat în fundal este activat",
   "backup_controller_page_background_turn_off": "Dezactivează serviciul în fundal",
   "backup_controller_page_background_turn_on": "Activează serviciul în fundal",
-  "backup_controller_page_background_wifi": "Doar conectat la WiFi",
+  "backup_controller_page_background_wifi": "Numai prin Wi-Fi",
+  "backup_controller_page_backup": "Backup",
   "backup_controller_page_backup_selected": "Selectat(e): ",
   "backup_controller_page_backup_sub": "S-a făcut backup pentru fotografii și videoclipuri",
   "backup_controller_page_created": "Creat la: {date}",
@@ -491,6 +529,7 @@
   "backup_controller_page_excluded": "Exclus(e): ",
   "backup_controller_page_failed": "Eșuate ({count})",
   "backup_controller_page_filename": "Nume fișier: {filename} [{size}]",
+  "backup_controller_page_id": "ID: {id}",
   "backup_controller_page_info": "Informații backup",
   "backup_controller_page_none_selected": "Nici o selecție",
   "backup_controller_page_remainder": "Rămas(e)",
@@ -504,14 +543,20 @@
   "backup_controller_page_total_sub": "Toate fotografiile și videoclipurile unice din albumele selectate",
   "backup_controller_page_turn_off": "Dezactivează backup-ul în prim-plan",
   "backup_controller_page_turn_on": "Activează backup-ul în prim-plan",
-  "backup_controller_page_uploading_file_info": "Încărcare informații fișier",
+  "backup_controller_page_uploading_file_info": "Informații încărcare fișier",
   "backup_err_only_album": "Nu poți șterge singurul album",
   "backup_info_card_assets": "resurse",
   "backup_manual_cancelled": "Anulat",
   "backup_manual_in_progress": "Încărcarea este deja în curs. Încearcă din nou mai târziu",
   "backup_manual_success": "Succes",
   "backup_manual_title": "Status încărcare",
+  "backup_options_page_title": "Opțiuni Backup",
+  "backup_setting_subtitle": "Schimbă opțiuni pentru backup în prim-plan și în fundal",
   "backward": "În sens invers",
+  "biometric_auth_enabled": "Autentificare biometrică activată",
+  "biometric_locked_out": "Sunteți blocați de la autentificare biometrică",
+  "biometric_no_options": "Nu sunt disponibile opțiuni biometrice",
+  "biometric_not_available": "Autentificarea biometrică nu este disponibilă pe acest dispozitiv",
   "birthdate_saved": "Data nașterii salvată cu succes",
   "birthdate_set_description": "Data nașterii este utilizată pentru a calcula vârsta acestei persoane la momentul realizării fotografiei.",
   "blurred_background": "Fundal neclar",
@@ -541,14 +586,19 @@
   "camera_model": "Model cameră",
   "cancel": "Anulați",
   "cancel_search": "Anulați căutarea",
+  "canceled": "Anulat",
   "cannot_merge_people": "Nu se pot îmbina persoanele",
   "cannot_undo_this_action": "Nu puteți anula această acțiune!",
   "cannot_update_the_description": "Nu se poate actualiza descrierea",
+  "cast": "Partajare",
+  "cast_description": "Configurați destinațiile de difuzare disponibile",
   "change_date": "Schimbați data",
+  "change_description": "Schimbă descrierea",
+  "change_display_order": "Schimbați ordinea de afișare",
   "change_expiration_time": "Schimbați data expirare",
   "change_location": "Schimbați locația",
   "change_name": "Schimbați nume",
-  "change_name_successfully": "Schimbare nume cu succes",
+  "change_name_successfully": "Schimbare a numelui făcută cu succes",
   "change_password": "Schimbați parolă",
   "change_password_description": "Aceasta este fie prima dată când te conectezi în sistem, fie s-a făcut o solicitare pentru a schimba parola ta. Te rog să introduci noua parolă mai jos.",
   "change_password_form_confirm_password": "Confirmă parola",
@@ -556,8 +606,12 @@
   "change_password_form_new_password": "Parolă nouă",
   "change_password_form_password_mismatch": "Parolele nu se potrivesc",
   "change_password_form_reenter_new_password": "Reintrodu noua parolă",
+  "change_pin_code": "Schimbă codul PIN",
   "change_your_password": "Schimbă-ți parola",
   "changed_visibility_successfully": "Schimbare vizibilitate cu succes",
+  "check_corrupt_asset_backup": "Verifică copii de rezervă a resurselor corupte",
+  "check_corrupt_asset_backup_button": "Efectuează verificarea",
+  "check_corrupt_asset_backup_description": "Rulează această verificare doar prin Wi-Fi și doar după ce toate resursele au fost salvate în copia de rezerva. Procedura poate dura câteva minute.",
   "check_logs": "Verificați Jurnale",
   "choose_matching_people_to_merge": "Alegeți persoanele care se potrivesc pentru a le fuziona",
   "city": "Oraș",
@@ -566,6 +620,14 @@
   "clear_all_recent_searches": "Curățați toate căutările recente",
   "clear_message": "Ștergeți mesajul",
   "clear_value": "Ștergeți valoarea",
+  "client_cert_dialog_msg_confirm": "OK",
+  "client_cert_enter_password": "Introdu Parola",
+  "client_cert_import": "Importă",
+  "client_cert_import_success_msg": "Certificatul de client este importat",
+  "client_cert_invalid_msg": "Fisier cu certificat invalid sau parola este greșită",
+  "client_cert_remove_msg": "Certificatul de client este șters",
+  "client_cert_subtitle": "Acceptă doar formatul PKCS12 (.p12, .pfx). Importul/ștergerea certificatului este disponibil(ă) doar înainte de autentificare",
+  "client_cert_title": "Certificat SSL pentru client",
   "clockwise": "În sensul acelor de ceas",
   "close": "Închideți",
   "collapse": "Restrângeți",
@@ -578,19 +640,27 @@
   "comments_are_disabled": "Comentariile sunt dezactivate",
   "common_create_new_album": "Creează album nou",
   "common_server_error": "Te rugăm să verifici conexiunea la rețea, asigura-te că server-ul este accesibil și că versiunile aplicației/server-ului sunt compatibile.",
+  "completed": "Finalizat",
   "confirm": "Confirmați",
   "confirm_admin_password": "Confirmați Parola de Administrator",
   "confirm_delete_face": "Ești sigur ca vrei sa ștergi {name} din activ?",
   "confirm_delete_shared_link": "Sunteți sigur că doriți să ștergeți acest link partajat?",
   "confirm_keep_this_delete_others": "Toate celelalte active din stivă vor fi șterse, cu excepția acestui material. Sunteți sigur că doriți să continuați?",
+  "confirm_new_pin_code": "Confirmă noul cod PIN",
   "confirm_password": "Confirmați parola",
+  "confirm_tag_face": "Vrei să etichetezi această față ca {name}?",
+  "confirm_tag_face_unnamed": "Vrei să etichetezi această față?",
+  "connected_device": "Dispozitiv conectat",
+  "connected_to": "Conectat la",
   "contain": "Încadrează",
+  "context": "Context",
   "continue": "Continuați",
   "control_bottom_app_bar_create_new_album": "Creează album nou",
   "control_bottom_app_bar_delete_from_immich": "Șterge din Immich",
   "control_bottom_app_bar_delete_from_local": "Șterge din dispozitiv",
   "control_bottom_app_bar_edit_location": "Editează locație",
   "control_bottom_app_bar_edit_time": "Editează Data și Ora",
+  "control_bottom_app_bar_share_link": "Partajează linkul",
   "control_bottom_app_bar_share_to": "Distribuire către",
   "control_bottom_app_bar_trash_from_immich": "Mută în coș",
   "copied_image_to_clipboard": "Imagine copiată în clipboard.",
@@ -612,6 +682,7 @@
   "create_link": "Creează link",
   "create_link_to_share": "Creează link pentru a distribui",
   "create_link_to_share_description": "Permiteți oricui are link-ul să vadă fotografia (fotografiile) selectată(e)",
+  "create_new": "CREARE NOUĂ",
   "create_new_person": "Creați o persoană nouă",
   "create_new_person_hint": "Atribuiți resursele selectate unei persoane noi",
   "create_new_user": "Creează utilizator nou",
@@ -621,11 +692,16 @@
   "create_tag_description": "Creează o etichetă nouă. Pentru etichete imbricate, te rog să introduci calea completă a etichetei, inclusiv bare oblice (/).",
   "create_user": "Creează utilizator",
   "created": "Creat",
+  "created_at": "Creat",
+  "crop": "Decupează",
   "curated_object_page_title": "Obiecte",
   "current_device": "Dispozitiv curent",
+  "current_pin_code": "Codul PIN actual",
+  "current_server_address": "Adresa actuală a serverului",
   "custom_locale": "Setare Regională Personalizată",
   "custom_locale_description": "Formatați datele și numerele în funcție de limbă și regiune",
   "dark": "Întunecat",
+  "dark_theme": "Comută tema întunecată",
   "date_after": "După data",
   "date_and_time": "Dată și oră",
   "date_before": "Anterior datei",
@@ -640,6 +716,7 @@
   "default_locale": "Setare Regională Implicită",
   "default_locale_description": "Formatați datele și numerele în funcție de regiunea browserului dvs",
   "delete": "Ștergere",
+  "delete_action_prompt": "{count} șterse permanent",
   "delete_album": "Ștergere album",
   "delete_api_key_prompt": "Sunteți sigur că doriți să ștergeți această cheie API?",
   "delete_dialog_alert": "Aceste elemente vor fi șterse permanent de pe server-ul Immich și din dispozitivul tău",
@@ -672,6 +749,7 @@
   "disallow_edits": "Interzice modificările",
   "discord": "Server Discord",
   "discover": "Descoperiți",
+  "discovered_devices": "Dispozititve descoperite",
   "dismiss_all_errors": "Ignorați toate erorile",
   "dismiss_error": "Ignorați eroarea",
   "display_options": "Opțiuni de afișare",
@@ -682,6 +760,12 @@
   "documentation": "Documentație",
   "done": "Gata",
   "download": "Descărcați",
+  "download_canceled": "Descărcare anulată",
+  "download_complete": "Descărcare completă",
+  "download_enqueue": "Descărcare în coadă",
+  "download_error": "Eroare de descărcare",
+  "download_failed": "Descărcare eșuată",
+  "download_finished": "Descărcare finalizată",
   "download_include_embedded_motion_videos": "Videoclipuri încorporate",
   "download_include_embedded_motion_videos_description": "Include videoclipurile încorporate în fotografiile în mișcare ca fișier separat",
   "download_settings": "Descărcați",
@@ -1204,13 +1288,16 @@
   "previous": "Anterior",
   "previous_memory": "Memoria anterioară",
   "previous_or_next_photo": "Fotografie înainte/înapoi",
+  "previous_or_next_year": "An înainte/înapoi",
   "primary": "Primar",
   "privacy": "Confidențialitate",
+  "profile": "Profil",
   "profile_drawer_app_logs": "Log-uri",
-  "profile_drawer_client_out_of_date_major": "Aplicația nu folosește ultima versiune. Te rugăm să actulizezi la ultima versiune majoră.",
-  "profile_drawer_client_out_of_date_minor": "Aplicația nu folosește ultima versiune. Te rugăm să actulizezi la ultima versiune minoră.",
+  "profile_drawer_client_out_of_date_major": "Aplicația nu folosește ultima versiune. Te rugăm să actualizezi la ultima versiune majoră.",
+  "profile_drawer_client_out_of_date_minor": "Aplicația nu folosește ultima versiune. Te rugăm să actualizezi la ultima versiune minoră.",
   "profile_drawer_client_server_up_to_date": "Aplicația client și server-ul sunt actualizate",
-  "profile_drawer_server_out_of_date_major": "Server-ul nu folosește ultima versiune. Te rugăm să actulizezi la ultima versiune majoră.",
+  "profile_drawer_github": "GitHub",
+  "profile_drawer_server_out_of_date_major": "Server-ul nu folosește ultima versiune. Te rugăm să actualizezi la ultima versiune majoră.",
   "profile_drawer_server_out_of_date_minor": "Server-ul nu folosește ultima versiune. Te rugăm să actulizezi la ultima versiune minoră.",
   "profile_image_of_user": "Imagine de profil a lui {user}",
   "profile_picture_set": "Poză de profil setată.",
@@ -1230,22 +1317,25 @@
   "purchase_failed_activation": "Activare eșuată! Vă rugăm să vă verificați e-mailul pentru cheia de produs corectă!",
   "purchase_individual_description_1": "Pentru un individ",
   "purchase_individual_description_2": "Statutul de suporter",
+  "purchase_individual_title": "Individual",
   "purchase_input_suggestion": "Aveți o cheie de produs? Introduceți cheia mai jos",
   "purchase_license_subtitle": "Cumpărați Immich pentru a sprijini dezvoltarea continuă a serviciului",
   "purchase_lifetime_description": "Achiziție pe viață",
   "purchase_option_title": "OPȚIUNI DE CUMPĂRARE",
-  "purchase_panel_info_1": "Dezvoltarea Immich necesită mult timp și efort și avem ingineri cu normă întreagă care lucrează la ea pentru a o face cât se poate de bună. Misiunea noastră este ca software-ul open-source și practicile de afaceri etice să devină o sursă de venit durabilă pentru dezvoltatori și să se creeze un ecosistem care să respecte confidențialitatea, cu alternative reale la serviciile cloud care exploatează.",
+  "purchase_panel_info_1": "Dezvoltarea programului Immich necesită mult timp și efort și avem ingineri cu normă întreagă care lucrează la el pentru a-l face cât se poate de bun. Misiunea noastră este ca software-ul open-source și practicile de afaceri etice să devină o sursă de venit durabilă pentru dezvoltatori și să se creeze un ecosistem care să respecte confidențialitatea utilizatorilor, cu alternative reale la serviciile cloud care exploatează utilizatorii.",
   "purchase_panel_info_2": "Deoarece ne-am angajat să nu adăugăm planuri de plată, această achiziție nu vă va oferi nicio funcție suplimentară în Immich. Ne bazăm pe utilizatori ca dvs. pentru a sprijini dezvoltarea continuă a lui Immich.",
   "purchase_panel_title": "Susțineți proiectul",
+  "purchase_per_user": "Per utilizator",
   "purchase_remove_product_key": "Eliminați Cheia Produsului",
   "purchase_remove_product_key_prompt": "Sigur doriți să eliminați cheia de produs?",
   "purchase_remove_server_product_key": "Eliminați cheia de produs a Serverului",
   "purchase_remove_server_product_key_prompt": "Sigur doriți să eliminați cheia de produs a Serverului?",
   "purchase_server_description_1": "Pentru tot serverul",
   "purchase_server_description_2": "Statutul de suporter",
+  "purchase_server_title": "Server",
   "purchase_settings_server_activated": "Cheia de produs a serverului este gestionată de administrator",
   "rating": "Evaluare cu stele",
-  "rating_clear": "Anulați evaluare",
+  "rating_clear": "Anulați evaluarea",
   "rating_count": "{count, plural, one {# stea} other {# stele}}",
   "rating_description": "Afișați evaluarea EXIF în panoul de informații",
   "reaction_options": "Opțiuni de reacție",
@@ -1256,15 +1346,16 @@
   "reassing_hint": "Atribuiți resursele selectate unei persoane existente",
   "recent-albums": "Albume recente",
   "recent_searches": "Căutări recente",
+  "recently_added": "Adăugate recent",
   "recently_added_page_title": "Adăugate recent",
   "refresh": "Reîmprospătare",
-  "refresh_encoded_videos": "Actualizează videoclipurile codificate",
+  "refresh_encoded_videos": "Actualizează videoclipurile encodate",
   "refresh_faces": "Reîmprospătați fețele",
   "refresh_metadata": "Actualizați metadatele",
   "refresh_thumbnails": "Reîmprospătați miniaturile",
   "refreshed": "Reîmprospătat",
   "refreshes_every_file": "Recitește toate fișierele existente și noi",
-  "refreshing_encoded_video": "Se reîmprospătează videoclipul codificat",
+  "refreshing_encoded_video": "Se reîmprospătează videoclipul encodat",
   "refreshing_faces": "Se reîmprospătează fețele",
   "refreshing_metadata": "Se reîmprospătează metadatele",
   "regenerating_thumbnails": "Se regenerează miniaturile",
@@ -1276,9 +1367,12 @@
   "remove_deleted_assets": "Eliminați Resursele Șterse",
   "remove_from_album": "Ștergeți din album",
   "remove_from_favorites": "Eliminați din favorite",
+  "remove_from_locked_folder": "Eliminați din folderul securizat",
+  "remove_from_locked_folder_confirmation": "Sunteți sigur că doriți să mutați aceste poze și videoclipuri afară din folderul securizat? Vor deveni vizibile în biblioteca dvs.",
   "remove_from_shared_link": "Eliminați din linkul partajat",
   "remove_memory": "Șterge amintirea",
   "remove_photo_from_memory": "Șterge fotografia din această amintire",
+  "remove_tag": "Eliminați ticheta",
   "remove_url": "Eliminați adresa URL",
   "remove_user": "Eliminați utilizatorul",
   "removed_api_key": "Cheie API eliminată: {name}",
@@ -1647,6 +1741,7 @@
   "view_previous_asset": "Vizualizați resursa anterioară",
   "view_qr_code": "Vezi cod QR",
   "view_stack": "Vizualizați Stiva",
+  "view_user": "Vizualizare utilizator",
   "viewer_remove_from_stack": "Șterge din grup",
   "viewer_stack_use_as_main_asset": "Folosește ca resursă principală",
   "viewer_unstack": "Anulează grup",
@@ -1656,11 +1751,12 @@
   "week": "Sǎptǎmânǎ",
   "welcome": "Bun venit",
   "welcome_to_immich": "Bun venit la Immich",
-  "wifi_name": "WiFi Name",
+  "wifi_name": "Nume Wi-Fi",
+  "wrong_pin_code": "Cod PIN greșit",
   "year": "An",
   "years_ago": "acum {years, plural, one {# an} other {# ani}} în urmă",
   "yes": "Da",
   "you_dont_have_any_shared_links": "Nu aveți linkuri partajate",
-  "your_wifi_name": "Your WiFi name",
+  "your_wifi_name": "Numele rețelei tale WiFi",
   "zoom_image": "Măriți Imaginea"
 }
diff --git a/i18n/ru.json b/i18n/ru.json
index 5810a31053..84db991027 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Управление настройками метаданных",
     "migration_job": "Миграция",
     "migration_job_description": "Перенос миниатюр объектов и лиц в последнюю структуру папок",
+    "nightly_tasks_cluster_faces_setting_description": "Запустить распознавание людей по новым обнаруженным лицам",
+    "nightly_tasks_cluster_new_faces_setting": "Распознавание новых лиц",
+    "nightly_tasks_database_cleanup_setting": "Задачи очистки базы данных",
+    "nightly_tasks_database_cleanup_setting_description": "Удаление старых и более ненужных записей из базы данных",
+    "nightly_tasks_generate_memories_setting": "Создание воспоминаний",
+    "nightly_tasks_generate_memories_setting_description": "Создание новых воспоминаний из существующих объектов",
+    "nightly_tasks_missing_thumbnails_setting": "Создание отсутствующих миниатюр",
+    "nightly_tasks_missing_thumbnails_setting_description": "Добавление объектов без миниатюр в очередь для их создания",
+    "nightly_tasks_settings": "Настройки ночных задач",
+    "nightly_tasks_settings_description": "Управление ночными регламентными задачами",
+    "nightly_tasks_start_time_setting": "Время начала",
+    "nightly_tasks_start_time_setting_description": "Время, когда сервер начинает выполнять ночные задачи",
+    "nightly_tasks_sync_quota_usage_setting": "Синхронизация квот хранилища",
+    "nightly_tasks_sync_quota_usage_setting_description": "Обновление квоты хранилища пользователя на основе актуальных данных",
     "no_paths_added": "Пути не добавлены",
     "no_pattern_added": "Шаблон не добавлен",
     "note_apply_storage_label_previous_assets": "Примечание: Чтобы применить метку хранилища к ранее загруженным объектам, запустите",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "URI редиректа для мобильных",
     "oauth_mobile_redirect_uri_override": "Перенаправление URI для мобильных устройств",
     "oauth_mobile_redirect_uri_override_description": "Включите, если поставщик OAuth не разрешает использование мобильного URI, например, ''{callback}''",
+    "oauth_role_claim": "Утверждение роли",
+    "oauth_role_claim_description": "Автоматическое предоставление доступа администратора на основе наличия этого утверждения. Утверждение может иметь значение 'user' или 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Настройки входа через OAuth",
     "oauth_settings_more_details": "Для получения дополнительной информаций об этой функции обратитесь к <link>документации</link>.",
@@ -357,10 +373,12 @@
   "admin_password": "Пароль администратора",
   "administration": "Управление сервером",
   "advanced": "Расширенные",
+  "advanced_settings_beta_timeline_subtitle": "Попробуйте новый функционал приложения",
+  "advanced_settings_beta_timeline_title": "Бета-версия временной шкалы",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Используйте этот параметр для фильтрации медиафайлов во время синхронизации на основе альтернативных критериев. Пробуйте только в том случае, если у вас есть проблемы с обнаружением приложением всех альбомов.",
   "advanced_settings_enable_alternate_media_filter_title": "[ЭКСПЕРИМЕНТАЛЬНО] Использование фильтра синхронизации альбомов альтернативных устройств",
   "advanced_settings_log_level_title": "Уровень логирования: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Некоторые устройства очень медленно загружают локальные изображения. Активируйте эту настройку, чтобы изображения всегда загружались с сервера.",
+  "advanced_settings_prefer_remote_subtitle": "Некоторые устройства очень медленно загружают локальные миниатюры. Активируйте эту настройку, чтобы изображения всегда загружались с сервера.",
   "advanced_settings_prefer_remote_title": "Предпочитать фото на сервере",
   "advanced_settings_proxy_headers_subtitle": "Определите заголовки прокси-сервера, которые Immich должен отправлять с каждым сетевым запросом",
   "advanced_settings_proxy_headers_title": "Заголовки прокси",
@@ -388,6 +406,7 @@
   "album_options": "Параметры альбома",
   "album_remove_user": "Удалить пользователя?",
   "album_remove_user_confirmation": "Вы уверены, что хотите удалить пользователя {user}?",
+  "album_search_not_found": "Не найдено альбомов по вашему запросу",
   "album_share_no_users": "Похоже, вы поделились этим альбомом со всеми пользователями или у вас нет пользователей, с которыми можно поделиться.",
   "album_updated": "Альбом обновлён",
   "album_updated_setting_description": "Получать уведомление по электронной почте при добавлении новых ресурсов в общий альбом",
@@ -407,6 +426,7 @@
   "albums_default_sort_order": "Порядок сортировки в альбомах по умолчанию",
   "albums_default_sort_order_description": "Первоначальный порядок сортировки, устанавливаемый в новых альбомах.",
   "albums_feature_description": "Коллекции фото и видео, которыми можно делиться с другими пользователями.",
+  "albums_on_device_count": "Альбомы на устройстве ({count})",
   "all": "Все",
   "all_albums": "Все альбомы",
   "all_people": "Все люди",
@@ -427,6 +447,7 @@
   "app_settings": "Параметры приложения",
   "appears_in": "Добавлено в",
   "archive": "Архив",
+  "archive_action_prompt": "{count} добавлено в Архив",
   "archive_or_unarchive_photo": "Архивировать или разархивировать фото",
   "archive_page_no_archived_assets": "В архиве сейчас пусто",
   "archive_page_title": "Архив ({count})",
@@ -464,7 +485,6 @@
   "assets": "Объекты",
   "assets_added_count": "{count, plural, one {Добавлен # объект} many {Добавлено # объектов} other {Добавлено # объекта}}",
   "assets_added_to_album_count": "В альбом {count, plural, one {добавлен # объект} many {добавлено # объектов} other {добавлено # объекта}}",
-  "assets_added_to_name_count": "{count, plural, one {# объект добавлен} many {# объектов добавлено} other {# объекта добавлено}} в {hasName, select, true {альбом <b>{name}</b>} other {новый альбом}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Объект не может быть добавлен} other {Объекты не могут быть добавлены}} в альбом",
   "assets_count": "{count, plural, one {# объект} many {# объектов} other {# объекта}}",
   "assets_deleted_permanently": "{count} объект(ов) удалено навсегда",
@@ -587,6 +607,7 @@
   "cancel": "Отменить",
   "cancel_search": "Отменить поиск",
   "canceled": "Отменено",
+  "canceling": "Отмена",
   "cannot_merge_people": "Невозможно объединить людей",
   "cannot_undo_this_action": "Это действие нельзя отменить!",
   "cannot_update_the_description": "Невозможно обновить описание",
@@ -703,7 +724,7 @@
   "daily_title_text_date": "E, MMM dd",
   "daily_title_text_date_year": "E, MMM dd, yyyy",
   "dark": "Тёмная",
-  "darkTheme": "Переключение темной темы",
+  "dark_theme": "Тёмная тема",
   "date_after": "Дата после",
   "date_and_time": "Дата и Время",
   "date_before": "Дата до",
@@ -713,12 +734,13 @@
   "day": "День",
   "deduplicate_all": "Убрать все дубликаты",
   "deduplication_criteria_1": "Размер изображения в байтах",
-  "deduplication_criteria_2": "Подсчет данных EXIF",
+  "deduplication_criteria_2": "Количество EXIF данных",
   "deduplication_info": "Информация о дедупликации",
-  "deduplication_info_description": "Для автоматического предварительного выбора объектов и массового удаления дубликатов мы рассмотрим:",
+  "deduplication_info_description": "Для автоматического выбора лучших объектов среди дубликатов анализируется следующая информация:",
   "default_locale": "Дата и время по умолчанию",
   "default_locale_description": "Использовать формат даты и времени в соответствии с языковым стандартом вашего браузера",
   "delete": "Удалить",
+  "delete_action_prompt": "{count} удалено навсегда",
   "delete_album": "Удалить альбом",
   "delete_api_key_prompt": "Вы действительно хотите удалить этот API ключ?",
   "delete_dialog_alert": "Эти элементы будут безвозвратно удалены с сервера, а также с вашего устройства",
@@ -732,6 +754,7 @@
   "delete_key": "Удалить ключ",
   "delete_library": "Удалить библиотеку",
   "delete_link": "Удалить ссылку",
+  "delete_local_action_prompt": "{count} удалено локально",
   "delete_local_dialog_ok_backed_up_only": "Удалить только резервные копии",
   "delete_local_dialog_ok_force": "Все равно удалить",
   "delete_others": "Удалить остальные",
@@ -745,6 +768,7 @@
   "description": "Описание",
   "description_input_hint_text": "Добавить описание...",
   "description_input_submit_error": "Не удалось обновить описание, проверьте логи, чтобы узнать причину",
+  "deselect_all": "Снять выделение",
   "details": "Подробности",
   "direction": "Направление",
   "disabled": "Отключено",
@@ -762,6 +786,7 @@
   "documentation": "Документация",
   "done": "Готово",
   "download": "Скачать",
+  "download_action_prompt": "Загружаются {count} объектов",
   "download_canceled": "Загрузка отменена",
   "download_complete": "Загрузка окончена",
   "download_enqueue": "Загрузка в очереди",
@@ -783,7 +808,7 @@
   "downloading_media": "Загрузка медиа",
   "drop_files_to_upload": "Перенесите файлы в любое место для загрузки",
   "duplicates": "Дубликаты",
-  "duplicates_description": "Разберитесь с каждой группой, указав, какие из них являются дубликатами, если таковые имеются",
+  "duplicates_description": "Просмотрите найденные дубликаты и в каждой группе укажите, какие объекты оставить, а какие удалить",
   "duration": "Продолжительность",
   "edit": "Редактировать",
   "edit_album": "Редактировать альбом",
@@ -799,6 +824,7 @@
   "edit_key": "Изменить ключ",
   "edit_link": "Редактировать ссылку",
   "edit_location": "Редактировать местоположение",
+  "edit_location_action_prompt": "{count} мест изменено",
   "edit_location_dialog_title": "Местоположение",
   "edit_name": "Редактировать имя",
   "edit_people": "Редактировать людей",
@@ -817,6 +843,7 @@
   "empty_trash": "Очистить корзину",
   "empty_trash_confirmation": "Вы уверены, что хотите очистить корзину? Все объекты в корзине будут навсегда удалены из Immich.\nВы не сможете отменить это действие!",
   "enable": "Включить",
+  "enable_backup": "Включить резервное копирование",
   "enable_biometric_auth_description": "Введите свой PIN-код для включения биометрической аутентификации",
   "enabled": "Включено",
   "end_date": "Дата окончания",
@@ -984,6 +1011,7 @@
   "failed_to_load_assets": "Не удалось загрузить объекты",
   "failed_to_load_folder": "Ошибка при загрузке папки",
   "favorite": "Избранное",
+  "favorite_action_prompt": "{count} добавлено в Избранное",
   "favorite_or_unfavorite_photo": "Добавить или удалить фотографию из избранного",
   "favorites": "Избранное",
   "favorites_page_no_favorites": "В избранном сейчас пусто",
@@ -1103,7 +1131,7 @@
   "items_count": "{count, plural, one {# элемент} many {# элементов} other {# элемента}}",
   "jobs": "Задачи",
   "keep": "Оставить",
-  "keep_all": "Сохранить всё",
+  "keep_all": "Сохранить все",
   "keep_this_delete_others": "Оставить этот, удалить остальные",
   "kept_this_deleted_others": "Сохранён этот объект и {count, plural, one {# объект удалён} many {# объектов удалено} other {# объекта удалено}}",
   "keyboard_shortcuts": "Сочетания клавиш",
@@ -1127,6 +1155,7 @@
   "library_page_sort_created": "Недавно созданные",
   "library_page_sort_last_modified": "Последнее изменение",
   "library_page_sort_title": "Название альбома",
+  "licenses": "Лицензии",
   "light": "Светлая",
   "like_deleted": "Лайк удален",
   "link_motion_video": "Ссылка на движущееся видео",
@@ -1246,6 +1275,7 @@
   "more": "Больше",
   "move": "Переместить",
   "move_off_locked_folder": "Переместить из личной папки",
+  "move_to_lock_folder_action_prompt": "{count} добавлено в Личную папку",
   "move_to_locked_folder": "Переместить в личную папку",
   "move_to_locked_folder_confirmation": "Эти фото и видео будут удалены из всех альбомов и будут доступны только в личной папке",
   "moved_to_archive": "{count, plural, one {# объект перемещён} many {# объектов перемещено} other {# объекта перемещено}} в архив",
@@ -1460,6 +1490,7 @@
   "purchase_server_description_2": "Состояние поддержки",
   "purchase_server_title": "Сервер",
   "purchase_settings_server_activated": "Ключом продукта управляет администратор сервера",
+  "queue_status": "В очереди {count}/{total}",
   "rating": "Рейтинг звёзд",
   "rating_clear": "Очистить рейтинг",
   "rating_count": "{count, plural, one {# звезда} many {# звезд} other {# звезды}}",
@@ -1495,7 +1526,9 @@
   "remove_custom_date_range": "Удалить пользовательский диапазон дат",
   "remove_deleted_assets": "Удаление автономных файлов",
   "remove_from_album": "Удалить из альбома",
+  "remove_from_album_action_prompt": "{count} удалено из альбома",
   "remove_from_favorites": "Удалить из избранного",
+  "remove_from_lock_folder_action_prompt": "{count} удалено из Личной папки",
   "remove_from_locked_folder": "Удалить из личной папки",
   "remove_from_locked_folder_confirmation": "Вы действительно хотите переместить эти фото и видео из личной папки? Они станут доступны в вашей библиотеке.",
   "remove_from_shared_link": "Удалить из публичной ссылки",
@@ -1532,7 +1565,7 @@
   "restored_asset": "Восстановленный объект",
   "resume": "Продолжить",
   "retry_upload": "Повторить загрузку",
-  "review_duplicates": "Посмотреть дубликаты",
+  "review_duplicates": "Разобрать дубликаты",
   "role": "Роль",
   "role_editor": "Редактор",
   "role_viewer": "Зритель",
@@ -1607,18 +1640,18 @@
   "select": "Выбрать",
   "select_album_cover": "Выбрать обложку альбома",
   "select_all": "Выбрать все",
-  "select_all_duplicates": "Выбрать все дубликаты",
+  "select_all_duplicates": "Выбрать все для сохранения",
   "select_all_in": "Выбрать все в {group}",
   "select_avatar_color": "Выберите цвет аватара",
   "select_face": "Выбрать лицо",
   "select_featured_photo": "Выбрать избранное фото",
   "select_from_computer": "Выберите с компьютера",
-  "select_keep_all": "Оставить всё выбранное",
+  "select_keep_all": "Выбрать все для сохранения",
   "select_library_owner": "Выберите владельца библиотеки",
   "select_new_face": "Выбрать другое лицо",
   "select_person_to_tag": "Выделите лицо человека, которого хотите отметить",
   "select_photos": "Выберите фотографии",
-  "select_trash_all": "Удалить всё выбранное",
+  "select_trash_all": "Выбрать все для удаления",
   "select_user_for_sharing_page_err_album": "Не удалось создать альбом",
   "selected": "Выбрано",
   "selected_count": "{count, plural, one {Выбран # объект} many {Выбрано # объектов} other {Выбрано # объекта}}",
@@ -1667,6 +1700,7 @@
   "settings_saved": "Настройки сохранены",
   "setup_pin_code": "Создание PIN-кода",
   "share": "Поделиться",
+  "share_action_prompt": "Расшарено {count} объектов",
   "share_add_photos": "Добавить фото",
   "share_assets_selected": "{count} выбрано",
   "share_dialog_preparing": "Подготовка...",
@@ -1767,10 +1801,11 @@
   "sort_recent": "Недавние фото",
   "sort_title": "Заголовок",
   "source": "Исходный код",
-  "stack": "Группировать",
-  "stack_duplicates": "Группировать дубликаты",
+  "stack": "Сгруппировать",
+  "stack_action_prompt": "{count} сгруппировано",
+  "stack_duplicates": "Сгруппировать дубликаты",
   "stack_select_one_photo": "Выберите главную фотографию для группы",
-  "stack_selected_photos": "Группировать выбранные объекты",
+  "stack_selected_photos": "Сгруппировать выбранные объекты",
   "stacked_assets_count": "{count, plural, one {# объект объединен} many {# объектов объединено} other {# объекта объединено}} в группу",
   "stacktrace": "Трассировка стека",
   "start": "Старт",
@@ -1838,7 +1873,8 @@
   "total": "Всего",
   "total_usage": "Общая статистика",
   "trash": "Корзина",
-  "trash_all": "Удалить всё",
+  "trash_action_prompt": "{count} перемещено в корзину",
+  "trash_all": "Удалить все",
   "trash_count": "Удалить {count, number}",
   "trash_delete_asset": "Переместить в корзину",
   "trash_emptied": "Корзина очищена",
@@ -1855,9 +1891,11 @@
   "unable_to_change_pin_code": "Ошибка при изменении PIN-кода",
   "unable_to_setup_pin_code": "Ошибка при создании PIN-кода",
   "unarchive": "Восстановить",
+  "unarchive_action_prompt": "{count} удалено из архива",
   "unarchived_count": "{count, plural, one {# объект возвращён} many {# объектов возвращено} other {# объекта возвращено}} из архива",
   "undo": "Отменить",
   "unfavorite": "Удалить из избранного",
+  "unfavorite_action_prompt": "{count} удалено из избранного",
   "unhide_person": "Показать человека",
   "unknown": "Неизвестно",
   "unknown_country": "Неизвестная страна",
@@ -1872,15 +1910,18 @@
   "unnamed_share": "Общий доступ без названия",
   "unsaved_change": "Несохранённое изменение",
   "unselect_all": "Отменить выделение",
-  "unselect_all_duplicates": "Отменить выбор всех дубликатов",
+  "unselect_all_duplicates": "Выбрать все для удаления",
   "unselect_all_in": "Отменить выделение в {group}",
   "unstack": "Разгруппировать",
+  "unstack_action_prompt": "{count} разгруппировано",
   "unstacked_assets_count": "{count, plural, one {Разгруппирован # объект} many {Разгруппировано # объектов} other {Разгруппировано # объекта}}",
+  "untagged": "Без тегов",
   "up_next": "Следующее",
   "updated_at": "Обновлён",
   "updated_password": "Пароль изменён",
   "upload": "Загрузить",
   "upload_concurrency": "Параллельность загрузки",
+  "upload_details": "Подробности загрузки",
   "upload_dialog_info": "Хотите загрузить выбранные объекты на сервер?",
   "upload_dialog_title": "Загрузить объект",
   "upload_errors": "Загрузка завершена с {count, plural, one {# ошибкой} other {# ошибками}}, обновите страницу, чтобы увидеть новые загруженные объекты.",
@@ -1912,6 +1953,7 @@
   "user_usage_stats_description": "Посмотреть статистику использования аккаунта",
   "username": "Имя пользователя",
   "users": "Пользователи",
+  "users_added_to_album_count": "{count, plural, one {# пользователь добавлен} many {# пользователей добавлено} other {# пользователя добавлено}} к альбому",
   "utilities": "Утилиты",
   "validate": "Проверить",
   "validate_endpoint_error": "Введите корректный URL",
@@ -1930,6 +1972,7 @@
   "view_album": "Просмотреть альбом",
   "view_all": "Посмотреть всё",
   "view_all_users": "Показать всех пользователей",
+  "view_details": "Посмотреть подробности",
   "view_in_timeline": "Показать на временной шкале",
   "view_link": "Показать ссылку",
   "view_links": "Показать ссылки",
@@ -1937,7 +1980,7 @@
   "view_next_asset": "Показать следующий объект",
   "view_previous_asset": "Показать предыдущий объект",
   "view_qr_code": "Посмотреть QR код",
-  "view_stack": "Показать стек",
+  "view_stack": "Показать группу",
   "view_user": "Просмотреть пользователя",
   "viewer_remove_from_stack": "Убрать из группы",
   "viewer_stack_use_as_main_asset": "Использовать в качестве основного объекта",
diff --git a/i18n/sk.json b/i18n/sk.json
index cd64c52532..c8c1cb5303 100644
--- a/i18n/sk.json
+++ b/i18n/sk.json
@@ -14,6 +14,7 @@
   "add_a_location": "Pridať polohu",
   "add_a_name": "Pridať meno",
   "add_a_title": "Pridať názov",
+  "add_endpoint": "Pridať koncový bod",
   "add_exclusion_pattern": "Pridať vzor vylúčenia",
   "add_import_path": "Pridať cestu pre import",
   "add_location": "Pridať polohu",
@@ -33,6 +34,7 @@
   "added_to_favorites_count": "Pridané {count, number} do obľúbených",
   "admin": {
     "add_exclusion_pattern_description": "Pridávanie vzorov na vylúčenie. Globovanie pomocou *, ** a ? je podporované. Ak chcete ignorovať všetky súbory v akomkoľvek adresári s názvom \"Raw\", použite \"**/Raw/**\". Ak chcete ignorovať všetky súbory končiace na \".tif\", použite \"**/*.tif\". Ak chcete ignorovať absolútnu cestu, použite príkaz \"/cesta/k/ignorovanym/**\".",
+    "admin_user": "Správca",
     "asset_offline_description": "Táto položka externej knižnice sa už na disku nenachádza a bola presunutá do koša. Pokiaľ bol súbor presunutý v rámci knižnice, skontrolujte časovú os a vyhľadajte nové odpovedajúce položky. Ak chcete túto položku obnoviť, uistite sa, že je cesta k nižšie uvedenému súboru prístupná pre aplikáciu Immich a prehľadajte knižnicu.",
     "authentication_settings": "Overovanie a prihlásenie",
     "authentication_settings_description": "Spravovať heslo, protokol OAuth a ďalšie nastavenia overenia",
@@ -47,7 +49,7 @@
     "cleared_jobs": "Hotové úlohy pre: {job}",
     "config_set_by_file": "Konfigurácia je v súčasnosti nastavená konfiguračným súborom",
     "confirm_delete_library": "Naozaj chcete vymazať knižnicu {library}?",
-    "confirm_delete_library_assets": "Ste si istí, že chcete vymazať túto knižnicu? Tato operácia nenávratne odstráni {count, plural, one {# contained asset} other {all # contained assets}} súborov z Immich. Súbory budú ponechané na disku.",
+    "confirm_delete_library_assets": "Ste si istí, že chcete vymazať túto knižnicu? Tato operácia nenávratne odstráni {count, plural, one {# zahrnutú položku} few {# zahrnuté položky} other {všetkých # zahrnutých položiek}} z aplikácie Immich. Súbory budú ponechané na disku.",
     "confirm_email_below": "Pre potvrdenie zadajte \"{email}\" nižšie",
     "confirm_reprocess_all_faces": "Naozaj chcete spracovať všetky tváre znova? Tento proces vymaže pomenovaných ľudí.",
     "confirm_user_password_reset": "Naozaj chcete resetovať heslo pre {user}?",
@@ -55,14 +57,14 @@
     "create_job": "Vytvoriť úlohu",
     "cron_expression": "Výraz cron",
     "cron_expression_description": "Nastavte interval skenovania pomocou formátu cron. Pre viac informácií navštívte <link>Crontab Guru</link>",
-    "cron_expression_presets": "Presety cron výrazov",
+    "cron_expression_presets": "Predvoľby výrazov Cron",
     "disable_login": "Zakázať prihlásenie",
-    "duplicate_detection_job_description": "Spustiť strojové učenie na položkách pre detekciu podobných obrázkov. Spolieha sa na inteligentné vyhľadávanie",
+    "duplicate_detection_job_description": "Spustite strojové učenie na položkách pre detekciu podobných obrázkov. Spolieha sa na inteligentné vyhľadávanie",
     "exclusion_pattern_description": "Vylučovacie vzory Vám umožňujú ignorovať súbory a priečinky pri skenovaní Vašej knižnice. Toto je užitočné, ak máte priečinky obsahujúce súbory, ktoré nechcete importovať, napríklad RAW súbory.",
     "external_library_management": "Správa Externej Knižnice",
     "face_detection": "Detekcia tvárí",
-    "face_detection_description": "Rozpoznajte tváre v položkách pomocou strojového učenia. V prípade videí sa berie do úvahy len náhľad. „Obnoviť“ (znovu) spracuje všetky položky. „Obnoviť“ dodatočne vymaže všetky aktuálne údaje o tvárach. „Chýbajúce“ zaradí do poradia položky aktív, ktoré ešte neboli spracované. Zistené tváre sa po dokončení rozpoznávania tvárí zaradia do poradia na rozpoznávanie tvárí, pričom sa zoskupia do existujúcich alebo nových osôb.",
-    "facial_recognition_job_description": "Zoskupovať rozpoznané tváre do osôb. Tento krok sa vykoná po dokončení rozpoznávania tvárí. „Obnoviť“ (znovu) zoskupí všetky tváre. „Chýbajúce“ zaradí tváre, ktoré nemajú pridelenú osobu.",
+    "face_detection_description": "Rozpoznajte tváre v položkách pomocou strojového učenia. V prípade videí sa berie do úvahy len náhľad. „Obnoviť“ (znovu) spracuje všetky položky. „Resetovať“ dodatočne vymaže všetky aktuálne údaje o tvárach. „Chýbajúce“ zaradí do poradia médiá, ktoré ešte neboli spracované. Zistené tváre sa po dokončení rozpoznávania tvárí zaradia do poradia na rozpoznávanie tvárí, pričom sa zoskupia do existujúcich alebo nových osôb.",
+    "facial_recognition_job_description": "Zoskupte rozpoznané tváre do osôb. Tento krok sa vykoná po dokončení rozpoznávania tvárí. „Resetovať“ (znovu) zoskupí všetky tváre. „Chýbajúce“ zaradí tváre, ktoré nemajú pridelenú osobu.",
     "failed_job_command": "Príkaz {command} zlyhal pre úlohu: {job}",
     "force_delete_user_warning": "VAROVANIE: Toto okamžite odstráni používateľa a všetky položky. Tento krok nie je možné vrátiť späť a súbory nebude možné obnoviť.",
     "image_format": "Formát",
@@ -84,7 +86,7 @@
     "image_resolution_description": "Vyššie rozlíšenie môže zachovať viac detailov, ale kódovanie trvá dlhšie, súbory sú väčšie a môže to znížiť rýchlosť odozvy aplikácie.",
     "image_settings": "Obrázky",
     "image_settings_description": "Spravovať kvalitu a rozlíšenie generovaných obrázkov",
-    "image_thumbnail_description": "Malá miniatúra s odstránenými metadátami, používané pri zobrazovaní skupín fotiek ako na hlavnej časovej osi",
+    "image_thumbnail_description": "Malá miniatúra s odstránenými metadátami, ktorá sa používa pri prezeraní skupín fotografií ako na hlavnej časovej osi",
     "image_thumbnail_quality_description": "Kvalita miniatúry v stupnici od 1 do 100. Vyššia hodnota znamená lepšiu kvalitu, ale produkuje väčšie súbory a môže znížiť odozvu aplikácie.",
     "image_thumbnail_title": "Miniatúry",
     "job_concurrency": "Súbežnosť úlohy - {job}",
@@ -103,18 +105,18 @@
     "library_scanning_enable_description": "Zapnúť pravidelné skenovanie knižnice",
     "library_settings": "Externá knižnica",
     "library_settings_description": "Spravovať nastavenia externej knižnice",
-    "library_tasks_description": "Vyhľadávanie nových alebo zmenených položiek v externých knižniciach",
+    "library_tasks_description": "Vyhľadajte nové alebo zmenené médiá v externých knižniciach",
     "library_watching_enable_description": "Sledovať externé knižnice pre zmeny v súboroch",
     "library_watching_settings": "Sledovanie knižnice (EXPERIMENTÁLNE)",
     "library_watching_settings_description": "Automaticky sledovať zmenené súbory",
-    "logging_enable_description": "Povoliť logovanie",
-    "logging_level_description": "Ak je povolené, akú úroveň logovania použiť.",
-    "logging_settings": "Logovanie",
+    "logging_enable_description": "Povoliť ukladanie záznamov",
+    "logging_level_description": "Ak je povolené, akú úroveň záznamov použiť.",
+    "logging_settings": "Ukladanie záznamov",
     "machine_learning_clip_model": "Model CLIP",
     "machine_learning_clip_model_description": "Názov modelu CLIP je uvedený <link>tu</link>. Pamätajte, že pri zmene modelu je nutné znovu spustiť úlohu 'Inteligentné vyhľadávanie' pre všetky obrázky.",
     "machine_learning_duplicate_detection": "Detekcia duplikátov",
     "machine_learning_duplicate_detection_enabled": "Povoliť detekciu duplikátov",
-    "machine_learning_duplicate_detection_enabled_description": "Ak je vypnuté, presne identické položky budú stále deduplikované.",
+    "machine_learning_duplicate_detection_enabled_description": "Ak je vypnuté, úplne identické položky budú stále deduplikované.",
     "machine_learning_duplicate_detection_setting_description": "Použiť CLIP embeddings na identifikáciu pravdepodobných duplikátov",
     "machine_learning_enabled": "Povoliť strojové učenie",
     "machine_learning_enabled_description": "Ak je vypnuté, všetky funkcie strojového učenia (ML) budú vypnuté, bez ohľadu na nastavenia nižšie.",
@@ -124,10 +126,10 @@
     "machine_learning_facial_recognition_model_description": "Modely sú zoradené od najväčšieho po najmenší. Väčšie modely sú pomalšie a vyžadujú viac pamäte, ale poskytujú lepšie výsledky. Pamätajte, že po zmene modelu je potrebné znovu spustiť úlohu detekcie tvárí pre všetky obrázky.",
     "machine_learning_facial_recognition_setting": "Povoliť rozpoznávanie tvárí",
     "machine_learning_facial_recognition_setting_description": "Ak je vypnuté, obrázky nebudú spracované pre rozpoznávanie tvárí a nebudú sa zobrazovať v sekcii Ľudia na stránke Preskúmať.",
-    "machine_learning_max_detection_distance": "Maximálna detekčná odchylka",
-    "machine_learning_max_detection_distance_description": "Maximálna odchylka medzi dvoma obrázkami, aby boli považované za duplikáty, v rozsahu od 0.001 do 0.1. Vyššie hodnoty odhalia viac duplikátov, ale môžu viesť k falošným pozitívam.",
-    "machine_learning_max_recognition_distance": "Maximálna rozpoznávacia odchylka",
-    "machine_learning_max_recognition_distance_description": "Maximálna odchylka medzi dvoma tvárami, aby boli považované za rovnakú osobu, v rozsahu od 0 do 2. Zníženie tejto hodnoty môže zabrániť označeniu dvoch ľudí za tú istú osobu, zatiaľ čo zvýšenie môže zabrániť označeniu jednej osoby za dve rôzne osoby. Pamätajte, že je jednoduchšie spojiť dvoch ľudí ako rozdeliť jednu osobu na dve, takže je lepšie voliť nižší prah, ak je to možné.",
+    "machine_learning_max_detection_distance": "Maximálna detekčná odchýlka",
+    "machine_learning_max_detection_distance_description": "Maximálna odchýlka medzi dvoma obrázkami, aby boli považované za duplikáty, v rozsahu od 0.001 do 0.1. Vyššie hodnoty odhalia viac duplikátov, ale môžu viesť k falošným pozitívam.",
+    "machine_learning_max_recognition_distance": "Maximálna rozpoznávacia odchýlka",
+    "machine_learning_max_recognition_distance_description": "Maximálna odchýlka medzi dvomi tvárami, aby boli považované za rovnakú osobu, v rozsahu od 0 do 2. Zníženie tejto hodnoty môže zabrániť označeniu dvoch ľudí za tú istú osobu, zatiaľ čo zvýšenie môže zabrániť označeniu jednej osoby za dve rôzne osoby. Pamätajte, že je jednoduchšie spojiť dvoch ľudí ako rozdeliť jednu osobu na dve, takže je lepšie voliť nižší prah, ak je to možné.",
     "machine_learning_min_detection_score": "Minimálne detekčné skóre",
     "machine_learning_min_detection_score_description": "Minimálne skóre dôveryhodnosti pre detekciu tváre v rozsahu od 0 do 1. Nižšie hodnoty odhalia viac tvárí, ale môžu viesť k falošným pozitivním výsledkom.",
     "machine_learning_min_recognized_faces": "Minimum rozpoznaných tvárí",
@@ -140,11 +142,11 @@
     "machine_learning_smart_search_enabled_description": "Ak je vypnuté, obrázky nebudú spracované pre inteligentné vyhľadávanie.",
     "machine_learning_url_description": "URL adresa servera strojového učenia. Ak je zadaných viacero adries URL, každý server bude testovaný postupne, kým jeden z nich neodpovie úspešne, v poradí od prvého po posledný. Servery, ktoré neodpovedajú, budú dočasne ignorované, kým nebudú opäť online.",
     "manage_concurrency": "Správa súbežnosti",
-    "manage_log_settings": "Spravovať nastavenia logovania",
+    "manage_log_settings": "Spravovať nastavenia ukladania záznamov",
     "map_dark_style": "Tmavý štýl",
     "map_enable_description": "Povoliť funkcie mapy",
-    "map_gps_settings": "Mapa & GPS",
-    "map_gps_settings_description": "Správa nastavení máp a GPS reverzného geokódovania",
+    "map_gps_settings": "Mapa a nastavenia GPS",
+    "map_gps_settings_description": "Spravujte nastavenia mapy a GPS (reverzné geokódovanie)",
     "map_implications": "Táto funkčnosť sa spolieha na externý servis spracovania mapových dlaždíc (tiles.immich.cloud)",
     "map_light_style": "Svetlý štýl",
     "map_manage_reverse_geocoding_settings": "Správa nastavení <link>Reverzného geokódovania</link>",
@@ -157,16 +159,30 @@
     "memory_cleanup_job": "Vymazávanie spomienok",
     "memory_generate_job": "Vytváranie spomienok",
     "metadata_extraction_job": "Extrahovať metadáta",
-    "metadata_extraction_job_description": "Vytiahne metadáta z každej položky, ako napríklad GPS, tváre a rozlíšenie",
+    "metadata_extraction_job_description": "Získajte informácie o metadátach z každého média, ako sú GPS, tváre a rozlíšenie",
     "metadata_faces_import_setting": "Povoliť import tváre",
-    "metadata_faces_import_setting_description": "Importuj tváre z EXIF dát obrázkov a sidecar súborov",
+    "metadata_faces_import_setting_description": "Importovať tváre z EXIF údajov obrázka a pridružených súborov",
     "metadata_settings": "Metadáta",
     "metadata_settings_description": "Spravovať nastavenia metadát",
     "migration_job": "Migrácia",
-    "migration_job_description": "Migrácia miniatúr položiek a tvárí na najnovšiu štruktúru priečinkov",
+    "migration_job_description": "Presunúť miniatúry pre médiá a tváre do najnovšej štruktúry priečinkov",
+    "nightly_tasks_cluster_faces_setting_description": "Spustiť rozpoznávanie tváre na novo-zistených tvárach",
+    "nightly_tasks_cluster_new_faces_setting": "Zoskupiť nové tváre",
+    "nightly_tasks_database_cleanup_setting": "Úlohy čistenia databázy",
+    "nightly_tasks_database_cleanup_setting_description": "Vyčistiť databázu od starých, neplatných údajov",
+    "nightly_tasks_generate_memories_setting": "Vytvoriť spomienky",
+    "nightly_tasks_generate_memories_setting_description": "Vytvoriť nové spomienky z položiek",
+    "nightly_tasks_missing_thumbnails_setting": "Vytvoriť chýbajúce náhľady",
+    "nightly_tasks_missing_thumbnails_setting_description": "Zaradiť položky bez náhľadov do poradia na vytvorenie náhľadov",
+    "nightly_tasks_settings": "Nastavenia nočných úloh",
+    "nightly_tasks_settings_description": "Spravovať nočné úlohy",
+    "nightly_tasks_start_time_setting": "Čas spustenia",
+    "nightly_tasks_start_time_setting_description": "Čas, kedy server začne vykonávať nočné úlohy",
+    "nightly_tasks_sync_quota_usage_setting": "Synchronizovať využitie kvóty",
+    "nightly_tasks_sync_quota_usage_setting_description": "Aktualizovať kvótu úložiska používateľa na základe aktuálneho využitia",
     "no_paths_added": "Neboli pridané žiadne cesty",
     "no_pattern_added": "Nebol pridaný žiadny vzor",
-    "note_apply_storage_label_previous_assets": "Poznámka: Ak chcete použiť Štítkovanie úložiska na predtým nahrané aktíva, spustite príkaz",
+    "note_apply_storage_label_previous_assets": "Poznámka: Ak chcete použiť štítok úložiska na predtým nahrané položky, spustite príkaz",
     "note_cannot_be_changed_later": "POZNÁMKA: Toto nie je možné neskôr zmeniť!",
     "notification_email_from_address": "Z adresy",
     "notification_email_from_address_description": "E-mailová adresa odosielateľa, napríklad: \"Immich Foto Server <email@napriklad.sk>\". Uistite sa, že používate adresu, z ktorej máte povolené odosielať e-maily.",
@@ -189,19 +205,24 @@
     "oauth_auto_register": "Automatická regristrácia",
     "oauth_auto_register_description": "Automatické zaregistrovanie nového požívateľa pri prihlásení pomocou OAuth",
     "oauth_button_text": "Text tlačítka",
+    "oauth_client_secret_description": "Vyžaduje sa, ak poskytovateľ OAuth nepodporuje PKCE (Proof Key for Code Exchange)",
     "oauth_enable_description": "Prihlásiť sa pomocou OAuth",
     "oauth_mobile_redirect_uri": "URI mobilného presmerovania",
     "oauth_mobile_redirect_uri_override": "Prepísanie URI mobilného presmerovania",
     "oauth_mobile_redirect_uri_override_description": "Povoľte, keď poskytovateľ protokolu OAuth nepovoľuje identifikátor URI pre mobilné zariadenia, napríklad ''{callback}''",
+    "oauth_role_claim": "Požiadavka na rolu",
+    "oauth_role_claim_description": "Automaticky udeliť prístup správcu na základe prítomnosti tejto požiadavky. Požiadavka môže mať príznak „user“ alebo „admin“.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Spravovať nastavenia prihlásenia OAuth",
     "oauth_settings_more_details": "Pre viac informácii o tejto funkcii, prejdite na <link>docs</link>.",
     "oauth_storage_label_claim": "Nárokovať Štítok úložiska",
-    "oauth_storage_label_claim_description": "Automaticky nastaviť Štítok úložiska používateľa na hodnotu tohto nároku.",
+    "oauth_storage_label_claim_description": "Automaticky nastaviť štítok úložiska používateľa na hodnotu tohto nároku.",
     "oauth_storage_quota_claim": "Deklarácia kvóty úložiska",
     "oauth_storage_quota_claim_description": "Automaticky nastaviť kvótu úložiska používateľa na hodnotu tejto deklarácie.",
     "oauth_storage_quota_default": "Predvolený limit úložiska (GiB)",
     "oauth_storage_quota_default_description": "Kvóta v GiB, ktorá sa použije, ak nie je poskytnutá žiadna požiadavka.",
+    "oauth_timeout": "Časový limit požiadavky",
+    "oauth_timeout_description": "Časový limit pre požiadavky v milisekundách",
     "password_enable_description": "Prihlásiť sa pomocou emailu a hesla",
     "password_settings": "Prihlásenie cez heslo",
     "password_settings_description": "Spravovať nastavenia prihlásenia cez heslo",
@@ -225,8 +246,8 @@
     "server_settings_description": "Spravovať nastavenia servera",
     "server_welcome_message": "Uvítacia správa",
     "server_welcome_message_description": "Správa, ktorá sa zobrazí na prihlasovacej stránke.",
-    "sidecar_job": "Sidecar metadáta",
-    "sidecar_job_description": "Objavte alebo synchronizujte metadáta Sidecar zo súborového systému",
+    "sidecar_job": "Pridružené metadáta",
+    "sidecar_job_description": "Objavte alebo synchronizujte pridružené metadáta zo súborového systému",
     "slideshow_duration_description": "Čas zobrazenia obrázku v sekundách",
     "smart_search_job_description": "Spustite strojové učenie na médiách na podporu inteligentného vyhľadávania",
     "storage_template_date_time_description": "Časová pečiatka vytvorenia položky sa používa pre informácie o dátume a čase",
@@ -239,13 +260,14 @@
     "storage_template_migration_info": "Šablóna úložiska skonvertuje všetky prípony na malé písmená. Zmeny šablón sa budú vzťahovať iba na nové diela. Ak chcete šablónu spätne použiť na predtým nahrané médiá, spustite <link>{job}</link>.",
     "storage_template_migration_job": "Úloha migrácie šablóny úložiska",
     "storage_template_more_details": "Ďalšie podrobnosti o tejto funkcii nájdete v <template-link>Šablóna úložiska</template-link> a jej <implications-link>dôsledky</implications-link>",
+    "storage_template_onboarding_description_v2": "Ak je táto funkcia zapnutá, automaticky usporiada súbory na základe šablóny definovanej používateľom. Ďalšie informácie nájdete v <link>dokumentácii</link>.",
     "storage_template_path_length": "Približný limit dĺžky cesty: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Šablóna úložiska",
     "storage_template_settings_description": "Spravujte štruktúru priečinkov a názov súboru odovzdaného média",
     "storage_template_user_label": "<code>{label}</code> je Štítok úložiska používateľa",
     "system_settings": "Nastavenia systému",
-    "tag_cleanup_job": "Premazanie značiek",
-    "template_email_available_tags": "V šablóne môžeš použiť nasledujúce stítky: {tags}",
+    "tag_cleanup_job": "Prečistenie štítkov",
+    "template_email_available_tags": "V šablóne môžete použiť nasledujúce premenné: {tags}",
     "template_email_if_empty": "Ak nie je zadaná žiadna šablóna, bude použitá predvolená šablóna.",
     "template_email_invite_album": "Šablóna Pozvánky do albumu",
     "template_email_preview": "Ukážka",
@@ -259,19 +281,19 @@
     "theme_settings": "Motívy",
     "theme_settings_description": "Spravovať prispôsobenie webového rozhrania Immich",
     "thumbnail_generation_job": "Generovať Miniatúry",
-    "thumbnail_generation_job_description": "Generuje veľké, malé a rozostrení miniatúry pre každú položku, ako aj miniatúry pre každú osobu",
+    "thumbnail_generation_job_description": "Generujte veľké, malé a rozmazané miniatúry pre každú položku, ako aj miniatúry pre každú osobu",
     "transcoding_acceleration_api": "API pre akceleráciu",
-    "transcoding_acceleration_api_description": "Rozhranie API, ktoré bude interagovať s vaším zariadením s cieľom urýchliť prekódovanie. Toto nastavenie je „najlepšie úsilie“: pri zlyhaní sa vráti k softvérovému prekódovaniu. VP9 môže alebo nemusí fungovať v závislosti od vášho hardvéru.",
+    "transcoding_acceleration_api_description": "Rozhranie API, ktoré bude spolupracovať s vaším zariadením s cieľom urýchliť prekódovanie. Toto nastavenie je „najlepšie úsilie“: pri zlyhaní sa vráti k softvérovému prekódovaniu. VP9 môže alebo nemusí fungovať v závislosti od vášho hardvéru.",
     "transcoding_acceleration_nvenc": "NVENC (vyžaduje NVIDIA GPU)",
     "transcoding_acceleration_qsv": "Quick Sync (vyžaduje 7. generáciu Intel CPU alebo novšiu)",
     "transcoding_acceleration_rkmpp": "RKMPP (iba na Rockchip SOC)",
     "transcoding_acceleration_vaapi": "VAAPI",
     "transcoding_accepted_audio_codecs": "Akceptované zvukové kodeky",
-    "transcoding_accepted_audio_codecs_description": "Vyberte, ktoré zvukové kodeky nie je potrebné prekódovať. Používa sa len pre určité zásady prekódovania.",
+    "transcoding_accepted_audio_codecs_description": "Vyberte, ktoré zvukové kodeky nie je potrebné prekódovať. Používa sa len pre určité pravidlá prekódovania.",
     "transcoding_accepted_containers": "Akceptované kontajnery",
-    "transcoding_accepted_containers_description": "Vyberte, ktoré formáty kontajnerov nie je potrebné remuxovať na MP4. Používa sa len pre určité zásady prekódovania.",
+    "transcoding_accepted_containers_description": "Vyberte, ktoré formáty kontajnerov nie je potrebné remuxovať na MP4. Používa sa len pre určité pravidlá prekódovania.",
     "transcoding_accepted_video_codecs": "Akceptované video kodeky",
-    "transcoding_accepted_video_codecs_description": "Vyberte, ktoré video kodeky nie je potrebné prekódovať. Používa sa len pre určité zásady prekódovania.",
+    "transcoding_accepted_video_codecs_description": "Vyberte, ktoré video kodeky nie je potrebné prekódovať. Používa sa len pre určité pravidlá prekódovania.",
     "transcoding_advanced_options_description": "Možnosti, ktoré by väčšina používateľov nemala meniť",
     "transcoding_audio_codec": "Zvukový kodek",
     "transcoding_audio_codec_description": "Opus je najkvalitnejšia možnosť, ale má nižšiu kompatibilitu so starými zariadeniami alebo softvérom.",
@@ -281,7 +303,7 @@
     "transcoding_constant_quality_mode_description": "ICQ je lepšie ako CQP, ale niektoré zariadenia na hardvérovú akceleráciu tento režim nepodporujú. Nastavenie tejto možnosti uprednostní špecifikovaný režim pri použití kódovania založeného na kvalite. Ignorované spoločnosťou NVENC, pretože nepodporuje ICQ.",
     "transcoding_constant_rate_factor": "Faktor konštantnej rýchlosti (-crf)",
     "transcoding_constant_rate_factor_description": "Úroveň kvality videa. Typické hodnoty sú 23 pre H.264, 28 pre HEVC, 31 pre VP9 a 35 pre AV1. Nižšie je lepšie, ale vytvára väčšie súbory.",
-    "transcoding_disabled_description": "Neprekódujte žiadne videá, na niektorých klientoch môže prerušiť prehrávanie",
+    "transcoding_disabled_description": "Neprekódovať žiadne videá, na niektorých klientoch môže prerušiť prehrávanie",
     "transcoding_encoding_options": "Možnosti kódovania",
     "transcoding_encoding_options_description": "Nastavte kodeky, rozlíšenie, kvalitu a ďalšie možnosti pre kódované videá",
     "transcoding_hardware_acceleration": "Hardvérová akcelerácia",
@@ -295,7 +317,7 @@
     "transcoding_max_keyframe_interval": "Maximálny interval medzi kľúčovými snímkami",
     "transcoding_max_keyframe_interval_description": "Nastavuje maximálnu vzdialenosť medzi kľúčovými snímkami. Nižšie hodnoty zhoršujú účinnosť kompresie, ale zlepšujú časy vyhľadávania a môžu zlepšiť kvalitu v scénach s rýchlym pohybom. Hodnota 0 nastavuje túto hodnotu automaticky.",
     "transcoding_optimal_description": "Videá s vyšším ako cieľovým rozlíšením alebo videá, ktoré nie sú v prijateľnom formáte",
-    "transcoding_policy": "Politika prekódovania",
+    "transcoding_policy": "Pravidlá prekódovania",
     "transcoding_policy_description": "Nastavte, kedy bude video prekódované",
     "transcoding_preferred_hardware_device": "Uprednostňované hardvérové zariadenie",
     "transcoding_preferred_hardware_device_description": "Platí len pre VAAPI a QSV. Nastavuje uzol dri, ktorý sa používa na hardvérové prekódovanie.",
@@ -304,7 +326,7 @@
     "transcoding_reference_frames": "Referenčné snímky",
     "transcoding_reference_frames_description": "Počet snímok, na ktoré sa má odkazovať pri kompresii daného snímku. Vyššie hodnoty zvyšujú účinnosť kompresie, ale spomaľujú kódovanie. Hodnota 0 sa nastavuje automaticky.",
     "transcoding_required_description": "Iba videá, ktoré nie sú v prijatom formáte",
-    "transcoding_settings": "Transkódovania videa",
+    "transcoding_settings": "Nastavenia prekódovania videa",
     "transcoding_settings_description": "Spravujte, ktoré videá sa majú prekódovať a ako ich spracovať",
     "transcoding_target_resolution": "Cieľové rozlíšenie",
     "transcoding_target_resolution_description": "Vyššie rozlíšenia môžu zachovať viac detailov, ale ich kódovanie trvá dlhšie, majú väčšiu veľkosť súborov a môžu znížiť odozvu aplikácie.",
@@ -314,22 +336,22 @@
     "transcoding_threads_description": "Vyššie hodnoty vedú k rýchlejšiemu kódovaniu, ale ponechávajú serveru menej priestoru na spracovanie iných úloh počas aktivity. Táto hodnota by nemala byť väčšia ako počet jadier CPU. Maximalizuje využitie, ak je nastavená na hodnotu 0.",
     "transcoding_tone_mapping": "Tónové mapovanie",
     "transcoding_tone_mapping_description": "Snaží sa zachovať vzhľad videí HDR pri konverzii na SDR. Každý algoritmus robí rôzne kompromisy v oblasti farieb, detailov a jasu. Hable zachováva detaily, Mobius zachováva farby a Reinhard zachováva jas.",
-    "transcoding_transcode_policy": "Politika prekódovania",
-    "transcoding_transcode_policy_description": "Zásady, kedy sa má video prekódovať. Videá HDR sa vždy prekódujú (okrem prípadov, keď je prekódovanie vypnuté).",
+    "transcoding_transcode_policy": "Pravidlá prekódovania",
+    "transcoding_transcode_policy_description": "Pravidlá, kedy sa má video prekódovať. HDR videá sa prekódujú vždy (okrem prípadov, keď je prekódovanie vypnuté).",
     "transcoding_two_pass_encoding": "Dvojpriechodové kódovanie",
-    "transcoding_two_pass_encoding_setting_description": "Prekladajte v dvoch priechodoch, aby ste vytvorili lepšie zakódované videá. Keď je povolený maximálny dátový tok (vyžaduje sa na prácu s formátmi H.264 a HEVC), tento režim používa rozsah dátového toku na základe maximálneho dátového toku a ignoruje CRF. V prípade VP9 sa CRF môže použiť, ak je max bitrate vypnutý.",
+    "transcoding_two_pass_encoding_setting_description": "Prekódovať v dvoch fázach, aby sa vytvorili lepšie kódované videá. Keď je povolený maximálny dátový tok (vyžaduje sa na prácu s formátmi H.264 a HEVC), tento režim používa rozsah dátového toku na základe maximálneho dátového toku a ignoruje CRF. V prípade VP9 sa CRF môže použiť, ak je maximálny bitrate vypnutý.",
     "transcoding_video_codec": "Video kodek",
-    "transcoding_video_codec_description": "VP9 má vysokú účinnosť a kompatibilitu s webom, ale prekódovanie trvá dlhšie. HEVC má podobnú výkonnosť, ale nižšiu kompatibilitu s webom. H.264 je široko kompatibilný a rýchlo sa prekódováva, ale vytvára oveľa väčšie súbory. AV1 je najúčinnejší kodek, ale chýba mu podpora v starších zariadeniach.",
+    "transcoding_video_codec_description": "VP9 má vysokú účinnosť a kompatibilitu s webom, ale prekódovanie trvá dlhšie. HEVC má podobnú výkonnosť, ale nižšiu kompatibilitu s webom. H.264 je široko kompatibilný a rýchlo sa prekóduje, ale vytvára oveľa väčšie súbory. AV1 je najúčinnejší kodek, ale chýba mu podpora v starších zariadeniach.",
     "trash_enabled_description": "Povoliť funkcie koša",
     "trash_number_of_days": "Počet dní",
-    "trash_number_of_days_description": "Počet dní, počas ktorých sa má majetok ponechať v koši pred jeho trvalým odstránením",
+    "trash_number_of_days_description": "Počet dní, počas ktorých sa majú médiá ponechať v koši pred ich trvalým odstránením",
     "trash_settings": "Kôš",
     "trash_settings_description": "Spravovať nastavenia koša",
     "user_cleanup_job": "Premazanie používateľov",
-    "user_delete_delay": "Konto <b>{user}</b> a jeho médiá budú podľa plánu natrvalo vymazané za {delay, plural, one {# day} other {# days}}.",
+    "user_delete_delay": "Konto <b>{user}</b> a jeho médiá budú podľa plánu natrvalo vymazané za {delay, plural, one {# deň} few {# dni} other {# dní}}.",
     "user_delete_delay_settings": "Odstrániť oneskorenie",
-    "user_delete_delay_settings_description": "Počet dní po odstránení na trvalé vymazanie účtu a aktív používateľa. Úloha odstraňovania používateľov sa spúšťa o polnoci, aby sa skontrolovali používatelia, ktorí sú pripravení na odstránenie. Zmeny tohto nastavenia sa vyhodnotia pri ďalšom spustení.",
-    "user_delete_immediately": "Konto a médiá <b>{user}</b> budú zaradené do frontu na trvalé vymazanie <b>okamžite</b>.",
+    "user_delete_delay_settings_description": "Počet dní po odstránení na trvalé vymazanie účtu a médií používateľa. Úloha odstraňovania používateľov sa spúšťa o polnoci, aby sa skontrolovali používatelia, ktorí sú pripravení na odstránenie. Zmeny tohto nastavenia sa vyhodnotia pri ďalšom spustení.",
+    "user_delete_immediately": "Konto a médiá používateľa <b>{user}</b> budú zaradené do poradia na trvalé vymazanie <b>okamžite</b>.",
     "user_delete_immediately_checkbox": "Používateľ a médiá budú zaradení do frontu na okamžité vymazanie",
     "user_details": "Podrobnosti o používateľovi",
     "user_management": "Správa používateľov",
@@ -351,11 +373,19 @@
   "admin_password": "Administrátorské heslo",
   "administration": "Administrácia",
   "advanced": "Pokročilé",
-  "advanced_settings_log_level_title": "Úroveň logovania: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Niektoré zariadenia sú extrémne pomalé pre načítavanie miniatúr z fotiek na zariadení. Povoľte toto nastavenie aby sa namiesto toho načítavali obrázky zo servera.",
-  "advanced_settings_prefer_remote_title": "Preferovať vzdialené obrázky",
+  "advanced_settings_beta_timeline_subtitle": "Vyskúšajte prostredie novej aplikácie",
+  "advanced_settings_beta_timeline_title": "Beta verzia časovej osi",
+  "advanced_settings_enable_alternate_media_filter_subtitle": "Túto možnosť použite na filtrovanie médií počas synchronizácie na základe alternatívnych kritérií. Túto možnosť vyskúšajte len vtedy, ak máte problémy s detekciou všetkých albumov v aplikácii.",
+  "advanced_settings_enable_alternate_media_filter_title": "[EXPERIMENTÁLNE] Použiť alternatívny filter synchronizácie albumu zariadenia",
+  "advanced_settings_log_level_title": "Úroveň ukladania záznamov: {level}",
+  "advanced_settings_prefer_remote_subtitle": "V niektorých zariadeniach sa miniatúry z miestnych položiek načítavajú veľmi pomaly. Aktivovaním tohto nastavenia sa namiesto toho načítajú vzdialené obrázky.",
+  "advanced_settings_prefer_remote_title": "Uprednostniť vzdialené obrázky",
+  "advanced_settings_proxy_headers_subtitle": "Určite hlavičky proxy servera, ktoré by mal Immich posielať s každou požiadavkou na sieť",
+  "advanced_settings_proxy_headers_title": "Proxy hlavičky",
   "advanced_settings_self_signed_ssl_subtitle": "Preskakuje overovanie SSL certifikátom zo strany servera. Vyžaduje sa pre samo-podpísané certifikáty.",
   "advanced_settings_self_signed_ssl_title": "Povoliť samo-podpísané SSL certifikáty",
+  "advanced_settings_sync_remote_deletions_subtitle": "Automaticky vymazať alebo obnoviť položku na tomto zariadení, keď sa táto akcia vykoná na webe",
+  "advanced_settings_sync_remote_deletions_title": "Synchronizovať vzdialené vymazania [EXPERIMENTÁLNE]",
   "advanced_settings_tile_subtitle": "Pokročilé nastavenia používateľa",
   "advanced_settings_troubleshooting_subtitle": "Povoliť ďalšie funkcie pre opravu chýb",
   "advanced_settings_troubleshooting_title": "Oprava chýb",
@@ -376,6 +406,7 @@
   "album_options": "Nastavenia albumu",
   "album_remove_user": "Odstrániť používateľa?",
   "album_remove_user_confirmation": "Ste si istý, že chcete odstrániť používateľa {user}?",
+  "album_search_not_found": "Neboli nájdené žiadne albumy zodpovedajúce vášmu hľadaniu",
   "album_share_no_users": "Vyzerá to, že ste tento album zdieľali so všetkými používateľmi alebo nemáte žiadneho používateľa, s ktorým by ste ho mohli zdieľať.",
   "album_updated": "Album bol aktualizovaný",
   "album_updated_setting_description": "Obdržať e-mailové upozornenie, keď v zdieľanom albume pribudnú nové položky",
@@ -391,15 +422,19 @@
   "album_viewer_page_share_add_users": "Pridať používateľov",
   "album_with_link_access": "Umožnite komukoľvek s odkazom pozrieť si fotky a ľudí v tomto albume.",
   "albums": "Albumy",
-  "albums_count": "{count, plural, one {{count, number} Album} other {{count, number} Albumov}}",
+  "albums_count": "{count, plural, one {{count, number} album} few {{count, number} albumy} other {{count, number} albumov}}",
+  "albums_default_sort_order": "Predvolené poradie albumov",
+  "albums_default_sort_order_description": "Počiatočné poradie triedenia položiek pri vytváraní nových albumov.",
+  "albums_feature_description": "Zbierky médií, ktoré možno zdieľať s ostatnými používateľmi.",
+  "albums_on_device_count": "Albumy v zariadení ({count})",
   "all": "Všetko",
   "all_albums": "Všetky albumy",
   "all_people": "Všetci ľudia",
   "all_videos": "Všetky videa",
   "allow_dark_mode": "Povoliť tmavý režim",
   "allow_edits": "Povoliť úpravy",
-  "allow_public_user_to_download": "Povoľte verejnému používateľovi sťahovať",
-  "allow_public_user_to_upload": "Umožniť verejnému používateľovi nahrávať",
+  "allow_public_user_to_download": "Povoliť verejnému používateľovi stiahnutie",
+  "allow_public_user_to_upload": "Umožniť verejnému používateľovi nahrať",
   "alt_text_qr_code": "Obrázok QR kódu",
   "anti_clockwise": "Proti smeru hodinových ručičiek",
   "api_key": "API Klúč",
@@ -409,9 +444,10 @@
   "app_bar_signout_dialog_content": "Skutočne sa chcete odhlásiť?",
   "app_bar_signout_dialog_ok": "Áno",
   "app_bar_signout_dialog_title": "Odhlásiť sa",
-  "app_settings": "Nastavenia Aplikácie",
+  "app_settings": "Nastavenia aplikácie",
   "appears_in": "Vyskytuje sa v",
-  "archive": "Archivovať",
+  "archive": "Archív",
+  "archive_action_prompt": "{count} pridaných do archívu",
   "archive_or_unarchive_photo": "Archivácia alebo odarchivovanie fotografie",
   "archive_page_no_archived_assets": "Žiadne archivované médiá",
   "archive_page_title": "Archív ({count})",
@@ -439,31 +475,45 @@
   "asset_list_settings_title": "Fotografická mriežka",
   "asset_offline": "Médium je offline",
   "asset_offline_description": "Toto externý obsah sa už nenachádza na disku. Požiadajte o pomoc svojho správcu Immich.",
+  "asset_restored_successfully": "Položky boli úspešne obnovené",
   "asset_skipped": "Preskočené",
   "asset_skipped_in_trash": "V koši",
   "asset_uploaded": "Nahrané",
   "asset_uploading": "Nahráva sa…",
-  "asset_viewer_settings_title": "Zobrazovač položiek",
+  "asset_viewer_settings_subtitle": "Spravujte nastavenia prehliadača galérie",
+  "asset_viewer_settings_title": "Prehliadač médií",
   "assets": "Položky",
   "assets_added_count": "{count, plural, one {Pridaná # položka} few {Pridané # položky} other {Pridaných # položek}}",
   "assets_added_to_album_count": "Do albumu {count, plural, one {bola pridaná # položka} few {boli pridané # položky} other {bolo pridaných # položiek}}",
-  "assets_added_to_name_count": "{count, plural, one {Pridaná # položka} few {Pridané # položky} other {Pridaných # položiek}} do {hasName, select, true {alba <b>{name}</b>} other {nového albumu}}",
+  "assets_cannot_be_added_to_album_count": "{count, plural, one {položku} other {položiek}} nie je možné pridať do albumu",
   "assets_count": "{count, plural, one {# položka} few {# položky} other {# položiek}}",
+  "assets_deleted_permanently": "{count} položka(iek) natrvalo vymazaná(ých)",
+  "assets_deleted_permanently_from_server": "{count} položka(iek) natrvalo vymazaná(ých) zo servera Immich",
+  "assets_downloaded_failed": "{count, plural, one {Stiahnutý # súbor - {error} súbor zlyhal} few {Stiahnuté # súbory - {error} súbory zlyhali} other {Stiahnutých # súborov - {error} súborov zlyhalo}}",
+  "assets_downloaded_successfully": "{count, plural, one {# súbor bol úspešne stiahnutý} few {# súbory boli úspešne stiahnuté} other {# súborov bolo úspešne stiahnutých}}",
   "assets_moved_to_trash_count": "Do koša {count, plural, one {bola presunutá # položka} few {boli presunuté # položky} other {bolo presunutých # položiek}}",
   "assets_permanently_deleted_count": "Trvalo {count, plural, one {vymazaná # položka} few {vymazané # položky} other {vymazaných # položiek}}",
   "assets_removed_count": "{count, plural, one {Odstránená # položka} few {Odstránené # položky} other {Odstránených # položiek}}",
+  "assets_removed_permanently_from_device": "{count} položka(iek) natrvalo vymazaná(ých) z vášho zariadenia",
   "assets_restore_confirmation": "Naozaj chcete obnoviť všetky vyhodené položky? Túto akciu nie je možné vrátiť späť! Upozorňujeme, že týmto spôsobom nie je možné obnoviť žiadne offline položky.",
   "assets_restored_count": "{count, plural, one {Obnovená # položka} few {Obnovené # položky} other {Obnovených # položiek}}",
-  "assets_restored_successfully": "{count} medií úspešne obnovených",
+  "assets_restored_successfully": "{count} médií úspešne obnovených",
+  "assets_trashed": "{count} položka(iek) vyhodená(ých) do koša",
   "assets_trashed_count": "{count, plural, one {Odstránená # položka} few {Odstránené # položky} other {Odstránených # položiek}}",
-  "assets_were_part_of_album_count": "{count, plural, one {Položka bola} other {Položky boli}} súčasťou albumu",
+  "assets_trashed_from_server": "{count} položka(iek) vyhodená(ých) do koša zo servera Immich",
+  "assets_were_part_of_album_count": "{count, plural, one {Položka už bola} other {Položky už boli}} súčasťou albumu",
   "authorized_devices": "Autorizované zariadenia",
+  "automatic_endpoint_switching_subtitle": "Pripojiť sa lokálne prostredníctvom určeného pripojenia Wi-Fi, ak je k dispozícii, a používať alternatívne pripojenia inde",
+  "automatic_endpoint_switching_title": "Automatické prepínanie URL adresy",
+  "autoplay_slideshow": "Automatické prehrávanie prezentácie",
   "back": "Späť",
   "back_close_deselect": "Späť, zavrieť alebo zrušiť výber",
+  "background_location_permission": "Povolenie na určenie polohy na pozadí",
+  "background_location_permission_content": "Aby bolo možné prepínať siete pri spustení na pozadí, musí mať aplikácia Immich *vždy* presný prístup k polohe, aby mohla prečítať názov siete Wi-Fi",
   "backup_album_selection_page_albums_device": "Albumy v zariadení ({count})",
   "backup_album_selection_page_albums_tap": "Ťuknutím na položku ju zahrniete, dvojitým ťuknutím ju vylúčite",
   "backup_album_selection_page_assets_scatter": "Súbory môžu byť roztrúsené vo viacerých albumoch. To umožňuje zahrnúť alebo vylúčiť albumy počas procesu zálohovania.",
-  "backup_album_selection_page_select_albums": "Vybrané albumy",
+  "backup_album_selection_page_select_albums": "Vybrať albumy",
   "backup_album_selection_page_selection_info": "Informácie o výbere",
   "backup_album_selection_page_total_assets": "Celkový počet jedinečných súborov",
   "backup_all": "Všetko",
@@ -485,7 +535,7 @@
   "backup_controller_page_background_charging": "Len počas nabíjania",
   "backup_controller_page_background_configure_error": "Nepodarilo sa nakonfigurovať službu na pozadí",
   "backup_controller_page_background_delay": "Oneskorenie zálohovania nových médií: {duration}",
-  "backup_controller_page_background_description": "Povoľte službu na pozadí na automatické zálohovanie všetkých nových aktív bez nutnosti otvorenia aplikácie",
+  "backup_controller_page_background_description": "Povoľte službu na pozadí na automatické zálohovanie všetkých nových položiek bez nutnosti otvorenia aplikácie",
   "backup_controller_page_background_is_off": "Automatické zálohovanie na pozadí je vypnuté",
   "backup_controller_page_background_is_on": "Automatické zálohovanie na pozadí je zapnuté",
   "backup_controller_page_background_turn_off": "Vypnúť zálohovanie na pozadí",
@@ -503,7 +553,7 @@
   "backup_controller_page_info": "Informácie o zálohovaní",
   "backup_controller_page_none_selected": "Žiadne vybrané",
   "backup_controller_page_remainder": "Zostáva",
-  "backup_controller_page_remainder_sub": "Zostávajúce fotografie a videá, ktoré sa majú zálohovať z výbraných albumov",
+  "backup_controller_page_remainder_sub": "Zostávajúce fotografie a videá, ktoré sa majú zálohovať z výberu",
   "backup_controller_page_server_storage": "Serverové úložisko",
   "backup_controller_page_start_backup": "Spustiť zálohovanie",
   "backup_controller_page_status_off": "Automatické zálohovanie na popredí je vypnuté",
@@ -521,22 +571,27 @@
   "backup_manual_success": "Úspech",
   "backup_manual_title": "Stav nahrávania",
   "backup_options_page_title": "Možnosti zálohovania",
-  "backward": "Spätne",
+  "backup_setting_subtitle": "Spravovať nastavenia odosielania na pozadí a v popredí",
+  "backward": "Dozadu",
+  "biometric_auth_enabled": "Biometrické overovanie je povolené",
+  "biometric_locked_out": "Ste vymknutí z biometrického overovania",
+  "biometric_no_options": "Nie sú k dispozícii žiadne biometrické možnosti",
+  "biometric_not_available": "Biometrické overenie nie je v tomto zariadení k dispozícii",
   "birthdate_saved": "Dátum narodenia bol úspešne uložený",
   "birthdate_set_description": "Dátum narodenia sa používa na výpočet veku tejto osoby v čase fotografie.",
   "blurred_background": "Rozmazané pozadie",
   "bugs_and_feature_requests": "Chyby a požiadavky na funkcie",
   "build": "Zostava",
   "build_image": "Obraz zostavy",
-  "bulk_delete_duplicates_confirmation": "Naozaj chcete hromadne odstrániť {count, plural, one {# duplikátnu položku} few {# duplikáte položky} other {# duplikátnych položiek}}? Týmto sa zachová najväčšia položka z každej skupiny a všetky ostatné duplikáty sa natrvalo odstránia. Túto akciu nie je možné vrátiť späť!",
-  "bulk_keep_duplicates_confirmation": "Naozaj chceš ponechať {count, plural, one {# duplicitný súbor} other {# duplicitné súbory}}? Týmto sa vysporiadaš so všetkými duplicitnými skupinami bez mazania súborov.",
-  "bulk_trash_duplicates_confirmation": "Naozaj chcete hromadne vymazať {count, plural, one {# duplicitný súbor} other {# duplicitné súbory}}? Týmto si ponecháš z každej skupiny najväčší súbor a vymažeš všetky ostatné duplicitné súbory v skupine.",
+  "bulk_delete_duplicates_confirmation": "Naozaj chcete hromadne odstrániť {count, plural, one {# duplikátnu položku} few {# duplikátne položky} other {# duplikátnych položiek}}? Týmto sa zachová najväčšia položka z každej skupiny a všetky ostatné duplikáty sa natrvalo odstránia. Túto akciu nie je možné vrátiť späť!",
+  "bulk_keep_duplicates_confirmation": "Naozaj chcete ponechať {count, plural, one {# duplicitnú položku} few {# duplicitné položky} other {# duplicitných položiek}}? Týmto sa vyriešia všetky duplicitné skupiny bez toho, aby sa čokoľvek odstránilo.",
+  "bulk_trash_duplicates_confirmation": "Naozaj chcete hromadne vymazať {count, plural, one {# duplicitnú položku} few {# duplicitné položky} other {# duplicitných položiek}}? Týmto sa zachová najväčšia položka z každej skupiny a všetky ostatné duplicitné položky sa vyhodia.",
   "buy": "Kúpiť Immich",
   "cache_settings_clear_cache_button": "Vymazať vyrovnávaciu pamäť",
   "cache_settings_clear_cache_button_title": "Vymaže vyrovnávaciu pamäť aplikácie. To výrazne ovplyvní výkon aplikácie, kým sa vyrovnávacia pamäť neobnoví.",
   "cache_settings_duplicated_assets_clear_button": "VYČISTIŤ",
   "cache_settings_duplicated_assets_subtitle": "Fotky a videá ktoré sú na čiernej listine zvolené aplikáciou",
-  "cache_settings_duplicated_assets_title": "Duplikáty ({count})",
+  "cache_settings_duplicated_assets_title": "Duplicitné položky ({count})",
   "cache_settings_statistics_album": "Knižnica náhľadov",
   "cache_settings_statistics_full": "Kompletné fotografie",
   "cache_settings_statistics_shared": "Zdieľané náhľady albumov",
@@ -552,9 +607,12 @@
   "cancel": "Zrušiť",
   "cancel_search": "Zrušiť vyhľadávanie",
   "canceled": "Zrušené",
+  "canceling": "Ruší sa",
   "cannot_merge_people": "Nie je možné zlúčiť ľudí",
   "cannot_undo_this_action": "Túto akciu nemôžete vrátiť späť!",
   "cannot_update_the_description": "Popis nie je možné aktualizovať",
+  "cast": "Prenos (cast)",
+  "cast_description": "Nastavte dostupné ciele prenosu",
   "change_date": "Upraviť dátum",
   "change_description": "Zmeniť popis",
   "change_display_order": "Zmeniť poradie zobrazenia",
@@ -572,7 +630,9 @@
   "change_pin_code": "Zmeniť PIN kód",
   "change_your_password": "Zmeňte si heslo",
   "changed_visibility_successfully": "Viditeľnosť bola úspešne zmenená",
+  "check_corrupt_asset_backup": "Skontrolovať, či nie sú poškodené zálohy položiek",
   "check_corrupt_asset_backup_button": "Vykonať kontrolu",
+  "check_corrupt_asset_backup_description": "Spustiť túto kontrolu len cez Wi-Fi a po zálohovaní všetkých položiek. Tento postup môže trvať niekoľko minút.",
   "check_logs": "Skontrolovať logy",
   "choose_matching_people_to_merge": "Vyberte rovnakých ľudí na zlúčenie",
   "city": "Mesto",
@@ -584,6 +644,11 @@
   "client_cert_dialog_msg_confirm": "OK",
   "client_cert_enter_password": "Zadať heslo",
   "client_cert_import": "Importovať",
+  "client_cert_import_success_msg": "Certifikát klienta je naimportovaný",
+  "client_cert_invalid_msg": "Neplatný súbor certifikátu alebo nesprávne heslo",
+  "client_cert_remove_msg": "Certifikát klienta je odstránený",
+  "client_cert_subtitle": "Podporuje iba formát PKCS12 (.p12, .pfx). Importovanie/odstránenie certifikátu je k dispozícii len pred prihlásením",
+  "client_cert_title": "SSL certifikát klienta",
   "clockwise": "V smere hodinových ručičiek",
   "close": "Zatvoriť",
   "collapse": "Zbaliť",
@@ -607,7 +672,8 @@
   "confirm_tag_face": "Chcete označiť túto tvár ako {name}?",
   "confirm_tag_face_unnamed": "Chcete označiť túto tvár?",
   "connected_device": "Pripojené zariadenie",
-  "contain": "Obsiahnúť",
+  "connected_to": "Pripojené k",
+  "contain": "Prispôsobiť",
   "context": "Kontext",
   "continue": "Pokračovať",
   "control_bottom_app_bar_create_new_album": "Vytvoriť nový album",
@@ -616,6 +682,7 @@
   "control_bottom_app_bar_edit_location": "Upraviť polohu",
   "control_bottom_app_bar_edit_time": "Upraviť dátum a čas",
   "control_bottom_app_bar_share_link": "Zdieľať odkaz",
+  "control_bottom_app_bar_share_to": "Zdieľať cez",
   "control_bottom_app_bar_trash_from_immich": "Presunúť do koša",
   "copied_image_to_clipboard": "Obrázok skopírovaný do schránky.",
   "copied_to_clipboard": "Skopírované do schránky!",
@@ -627,7 +694,7 @@
   "copy_password": "Skopírovať heslo",
   "copy_to_clipboard": "Skopírovať do schránky",
   "country": "Krajina",
-  "cover": "Titulka",
+  "cover": "Vyplniť",
   "covers": "Dlaždice",
   "create": "Vytvoriť",
   "create_album": "Vytvoriť album",
@@ -635,15 +702,15 @@
   "create_library": "Vytvoriť knižnicu",
   "create_link": "Vytvoriť odkaz",
   "create_link_to_share": "Vytvoriť odkaz na zdieľanie",
-  "create_link_to_share_description": "Umožniť každému kto má odkaz zobraziť vybrané fotografie",
+  "create_link_to_share_description": "Umožniť každému, kto má odkaz, zobraziť vybrané fotografie",
   "create_new": "VYTVORIŤ NOVÉ",
   "create_new_person": "Vytvoriť novú osobu",
   "create_new_person_hint": "Priradiť vybrané položky novej osobe",
   "create_new_user": "Vytvorenie nového používateľa",
   "create_shared_album_page_share_add_assets": "Pridať položky",
   "create_shared_album_page_share_select_photos": "Vybrať fotografie",
-  "create_tag": "Vytvoriť značku",
-  "create_tag_description": "Vytvorenie nového štítku. Pre Vnorené štítky, prosím, zadaj celú cestu štítku, vrátane lomítok vpred.",
+  "create_tag": "Vytvoriť štítok",
+  "create_tag_description": "Vytvorte nový štítok. V prípade vnorených štítkov zadajte celú cestu k štítku vrátane lomiek.",
   "create_user": "Vytvoriť používateľa",
   "created": "Vytvorené",
   "created_at": "Vytvorené",
@@ -657,6 +724,7 @@
   "daily_title_text_date": "EEEE, d. MMMM",
   "daily_title_text_date_year": "EEEE, d. MMMM y",
   "dark": "Tmavý",
+  "dark_theme": "Prepnúť tmavú tému",
   "date_after": "Dátum po",
   "date_and_time": "Dátum a Čas",
   "date_before": "Dátum pred",
@@ -669,14 +737,15 @@
   "deduplication_criteria_2": "Počet EXIF údajov",
   "deduplication_info": "Info o deduplikácii",
   "deduplication_info_description": "Na automatický predvýber položiek a hromadné odstránenie duplicít, sa pozeráme do:",
-  "default_locale": "Predvolená Lokalizácia",
-  "default_locale_description": "Formátovanie dátumu a čísel podľa lokalizácie vášho prehliadača",
+  "default_locale": "Predvolené miestne nastavenie",
+  "default_locale_description": "Formátovanie dátumov a čísel na základe miestneho nastavenia prehliadača",
   "delete": "Vymazať",
+  "delete_action_prompt": "{count} natrvalo vymazaných",
   "delete_album": "Odstrániť album",
   "delete_api_key_prompt": "Naozaj chcete odstrániť tento API kľúč?",
   "delete_dialog_alert": "Tieto položky budú natrvalo odstránené z aplikácie Immich a z vášho zariadenia",
   "delete_dialog_alert_local": "Tieto položky budú permanentne vymazané z vašeho zariadenia, ale budú stále k dispozícií na serveri Immich",
-  "delete_dialog_alert_local_non_backed_up": "Niektoré položky nie sú zálohované na Immichi a budú permanentne vymazané z vášho zariadenia",
+  "delete_dialog_alert_local_non_backed_up": "Niektoré položky nie sú zálohované na Immich a budú permanentne odstránené z vášho zariadenia",
   "delete_dialog_alert_remote": "Tieto položky budú permanentne vymazané zo serveru Immich",
   "delete_dialog_ok_force": "Napriek tomu vymazať",
   "delete_dialog_title": "Vymazať natrvalo",
@@ -685,12 +754,13 @@
   "delete_key": "Odstrániť kľúč",
   "delete_library": "Vymazať knižnicu",
   "delete_link": "Odstrániť odkaz",
+  "delete_local_action_prompt": "{count} vymazané lokálne",
   "delete_local_dialog_ok_backed_up_only": "Vymazať len zálohované",
   "delete_local_dialog_ok_force": "Napriek tomu vymazať",
   "delete_others": "Vymazať ostatné",
   "delete_shared_link": "Odstrániť zdieľaný odkaz",
   "delete_shared_link_dialog_title": "Odstrániť zdieľaný odkaz",
-  "delete_tag": "Odstrániť označenie",
+  "delete_tag": "Odstrániť štítok",
   "delete_tag_confirmation_prompt": "Naozaj chcete odstrániť štítok menom {tagName}?",
   "delete_user": "Vymazať používateľa",
   "deleted_shared_link": "Vymazaný zdieľaný odkaz",
@@ -698,6 +768,7 @@
   "description": "Popis",
   "description_input_hint_text": "Pridať popis...",
   "description_input_submit_error": "Chyba pri aktualizovaní popisu, zobrazte log pre viac detailov",
+  "deselect_all": "Zrušiť výber všetkých",
   "details": "Podrobnosti",
   "direction": "Smer",
   "disabled": "Vypnuté",
@@ -715,22 +786,27 @@
   "documentation": "Dokumentácia",
   "done": "Hotovo",
   "download": "Stiahnuť",
+  "download_action_prompt": "Sťahuje sa {count} položiek",
   "download_canceled": "Stiahnutie zrušené",
   "download_complete": "Stiahnutie dokončené",
+  "download_enqueue": "Stiahnutie v poradí",
   "download_error": "Chyba sťahovania",
   "download_failed": "Stiahnutie sa nepodarilo",
   "download_finished": "Stiahnutie dokončené",
   "download_include_embedded_motion_videos": "Vložené videá",
   "download_include_embedded_motion_videos_description": "Zahrnúť videá vložené do pohyblivých fotiek ako samostatné súbory",
+  "download_notfound": "Stiahnutie nebolo nájdené",
   "download_paused": "Stiahnutie pozastavené",
   "download_settings": "Stiahnuť",
   "download_settings_description": "Spravovať nastavenia súvisiace so sťahovaním položiek",
   "download_started": "Sťahovanie spustené",
+  "download_sucess": "Stiahnutie úspešné",
   "download_sucess_android": "Médiá boli stiahnuté do DCIM/Immich",
+  "download_waiting_to_retry": "Čaká sa na opakovanie pokusu",
   "downloading": "Sťahuje sa",
   "downloading_asset_filename": "Sťahuje sa položka {filename}",
   "downloading_media": "Sťahovanie médií",
-  "drop_files_to_upload": "Hoď súbory kdekoľvek, nahrajú sa",
+  "drop_files_to_upload": "Umiestnite súbory kamkoľvek na nahratie",
   "duplicates": "Duplikáty",
   "duplicates_description": "Vysporiadať sa s každou skupinou tak, že sa duplicitné označia ako duplicitné",
   "duration": "Trvanie",
@@ -748,10 +824,11 @@
   "edit_key": "Upraviť kľúč",
   "edit_link": "Upraviť odkaz",
   "edit_location": "Upraviť polohu",
+  "edit_location_action_prompt": "{count} poloha upravená",
   "edit_location_dialog_title": "Poloha",
   "edit_name": "Upraviť meno",
   "edit_people": "Upraviť osoby",
-  "edit_tag": "Upraiť značku",
+  "edit_tag": "Upraviť štítok",
   "edit_title": "Upraviť názov",
   "edit_user": "Upraviť používateľa",
   "edited": "Upravené",
@@ -766,23 +843,28 @@
   "empty_trash": "Vyprázdniť kôš",
   "empty_trash_confirmation": "Naozaj chcete vyprázdniť kôš? Nenávratne sa vymažú všetky položky z Immich.\nTáto akcia sa nedá vrátiť!",
   "enable": "Aktivovať",
+  "enable_backup": "Povoliť zálohovanie",
+  "enable_biometric_auth_description": "Zadajte svoj PIN kód, aby ste povolili biometrické overenie",
   "enabled": "Aktivovaný",
   "end_date": "Koncový dátum",
+  "enqueued": "V poradí",
   "enter_wifi_name": "Zadajte názov Wi-Fi",
   "enter_your_pin_code": "Zadajte svoj PIN kód",
   "enter_your_pin_code_subtitle": "Zadaním kódu PIN získate prístup k zamknutému priečinku",
   "error": "Chyba",
+  "error_change_sort_album": "Nepodarilo sa zmeniť poradie albumu",
   "error_delete_face": "Chyba pri odstraňovaní tváre z položky",
   "error_loading_image": "Nepodarilo sa načítať obrázok",
   "error_saving_image": "Chyba: {error}",
+  "error_tag_face_bounding_box": "Chyba pri označovaní tváre - nemožno získať súradnice ohraničujúceho poľa",
   "error_title": "Chyba - niečo sa pokazilo",
   "errors": {
     "cannot_navigate_next_asset": "Nedokážem prejsť na ďaľšiu položku",
     "cannot_navigate_previous_asset": "Nedokážem prejsť na predošlú položku",
     "cant_apply_changes": "Nedokážem aplikovať zmeny",
-    "cant_change_activity": "Nodokážem {enabled, select, true {zakázať} other {povoliť}} aktivitu",
+    "cant_change_activity": "Nie je možné {enabled, select, true {zakázať} other {povoliť}} aktivitu",
     "cant_change_asset_favorite": "Nedokážem zmeniť obľúbenosť pre položku",
-    "cant_change_metadata_assets_count": "Nedokážem zmeniť metadáta pre {count, plural, one {# túto položku} other {# tieto položky}}",
+    "cant_change_metadata_assets_count": "Nie je možné zmeniť metadáta pre {count, plural, one {# položku} few {# položky} other {# položiek}}",
     "cant_get_faces": "Nedokážem získať tváre",
     "cant_get_number_of_comments": "Nedokážem získať počet komentárov",
     "cant_search_people": "Nedokážem hľadať osoby",
@@ -802,10 +884,12 @@
     "failed_to_keep_this_delete_others": "Nepodarilo sa ponechať túto položku a vymazať tie ostatné položky",
     "failed_to_load_asset": "Nepodarilo sa načítať položku",
     "failed_to_load_assets": "Nepodarilo sa načítať položky",
+    "failed_to_load_notifications": "Nepodarilo sa načítať oznámenia",
     "failed_to_load_people": "Nepodarilo sa načítať ľudí",
     "failed_to_remove_product_key": "Nepodarilo sa odstrániť produktový kľúč",
     "failed_to_stack_assets": "Nepodarilo sa zoskupiť položky",
     "failed_to_unstack_assets": "Nepodarilo sa rozdeliť položky",
+    "failed_to_update_notification_status": "Nepodarilo sa aktualizovať stav oznámenia",
     "import_path_already_exists": "Táto cesta importu už existuje.",
     "incorrect_email_or_password": "Nesprávny e-mail alebo heslo",
     "paths_validation_failed": "{paths, plural, one {# cesta zlyhala} few {# cesty zlyhali} other {# ciest zlyhalo}} pri validácii",
@@ -826,14 +910,14 @@
     "unable_to_change_favorite": "Nie je možné zmeniť obľúbené pre položku",
     "unable_to_change_location": "Nie je možné zmeniť polohu",
     "unable_to_change_password": "Nie je možné zmeniť heslo",
-    "unable_to_change_visibility": "Nie je možné zmeniť viditeľnosť pre {count, plural, one {# osobu} other {# ľudí}}",
+    "unable_to_change_visibility": "Nie je možné zmeniť viditeľnosť pre {count, plural, one {# osobu} few {# osoby} other {# osôb}}",
     "unable_to_complete_oauth_login": "Nemožno dokončiť prihlásenie cez OAuth",
     "unable_to_connect": "Nie je možné sa pripojiť",
     "unable_to_copy_to_clipboard": "Nie je možné kopírovať do schránky, overte si, že stránku navštevujete cez https",
-    "unable_to_create_admin_account": "Nie je možné vytvoriť admin účet",
+    "unable_to_create_admin_account": "Nie je možné vytvoriť účet správcu",
     "unable_to_create_api_key": "Nie je možné vytvoriť nový API Klúč",
     "unable_to_create_library": "Nie je možné vytvoriť knihovňu",
-    "unable_to_create_user": "Nie je možné vytvoriť uživateľa",
+    "unable_to_create_user": "Nie je možné vytvoriť používateľa",
     "unable_to_delete_album": "Nie je možné vymazať album",
     "unable_to_delete_asset": "Nie je možné vymazať položku",
     "unable_to_delete_assets": "Chyba pri odstraňovaní položiek",
@@ -842,7 +926,7 @@
     "unable_to_delete_shared_link": "Nie je možné vymazať zdieľaný odkaz",
     "unable_to_delete_user": "Nie je možné vymazať používateľa",
     "unable_to_download_files": "Nie je možné stiahnuť súbory",
-    "unable_to_edit_exclusion_pattern": "Nie je možné upravit vzorec vylúčenia",
+    "unable_to_edit_exclusion_pattern": "Nie je možné upraviť vzorec vylúčenia",
     "unable_to_edit_import_path": "Nie je možné upraviť cestu importu",
     "unable_to_empty_trash": "Nie je možné vyprázdniť kôš",
     "unable_to_enter_fullscreen": "Nie je možné prejsť do režimu celej obrazovky",
@@ -900,6 +984,7 @@
   "exif_bottom_sheet_location": "POLOHA",
   "exif_bottom_sheet_people": "ĽUDIA",
   "exif_bottom_sheet_person_add_person": "Pridať meno",
+  "exif_bottom_sheet_person_age_months": "Vek {months} mesiacov",
   "exif_bottom_sheet_person_age_year_months": "Vek 1 rok, {months} mesiacov",
   "exif_bottom_sheet_person_age_years": "Vek {years}",
   "exit_slideshow": "Opustiť Slideshow",
@@ -908,7 +993,7 @@
   "experimental_settings_new_asset_list_title": "Povolenie experimentálnej mriežky fotografií",
   "experimental_settings_subtitle": "Používajte na vlastné riziko!",
   "experimental_settings_title": "Experimentálne",
-  "expire_after": "Expiruje po",
+  "expire_after": "Platnosť vyprší",
   "expired": "Vypršalo",
   "expires_date": "Expiruje {date}",
   "explore": "Preskúmať",
@@ -922,17 +1007,20 @@
   "external_network_sheet_info": "Ak nie ste v preferovanej sieti Wi-Fi, aplikácia sa pripojí k serveru prostredníctvom prvej z nižšie uvedených adries URL, na ktorú sa dostane, počnúc zhora nadol",
   "face_unassigned": "Nepriradená",
   "failed": "Neúspešné",
+  "failed_to_authenticate": "Nepodarilo sa overiť",
   "failed_to_load_assets": "Nepodarilo sa načítať položky",
+  "failed_to_load_folder": "Nepodarilo sa načítať priečinok",
   "favorite": "Obľúbené",
+  "favorite_action_prompt": "{count} pridané do obľúbených",
   "favorite_or_unfavorite_photo": "Označiť fotku ako obľúbenú alebo neobľúbenú",
   "favorites": "Obľúbené",
   "favorites_page_no_favorites": "Žiadne obľúbené médiá",
   "feature_photo_updated": "Hlavný obrázok bol aktualizovaný",
   "features": "Funkcie",
   "features_setting_description": "Spravovať funkcie aplikácie",
-  "file_name": "Meno súboru",
+  "file_name": "Názov súboru",
   "file_name_or_extension": "Názov alebo prípona súboru",
-  "filename": "Meno súboru",
+  "filename": "Názov súboru",
   "filetype": "Typ súboru",
   "filter": "Filter",
   "filter_people": "Filtrovať ľudí",
@@ -940,11 +1028,15 @@
   "find_them_fast": "Nájdite ich rýchlejšie podľa mena",
   "fix_incorrect_match": "Opraviť nesprávnu zhodu",
   "folder": "Priečinok",
+  "folder_not_found": "Priečinok nebol nájdený",
   "folders": "Priečinky",
-  "folders_feature_description": "Prehliadanie zobrazenia priečinka s fotografiami a videami na súborovom systéme",
+  "folders_feature_description": "Prezeranie zobrazenia priečinkov fotografií a videí v systéme súborov",
   "forward": "Dopredu",
+  "gcast_enabled": "Google Cast",
+  "gcast_enabled_description": "Táto funkcia načítava externé zdroje zo spoločnosti Google, aby mohla fungovať.",
   "general": "Všeobecné",
   "get_help": "Získať pomoc",
+  "get_wifiname_error": "Nepodarilo sa získať názov Wi-Fi siete. Uistite sa, že ste udelili potrebné oprávnenia a ste pripojení k sieti Wi-Fi",
   "getting_started": "Začíname",
   "go_back": "Vrátiť sa späť",
   "go_to_folder": "Prejsť do priečinka",
@@ -959,6 +1051,12 @@
   "haptic_feedback_switch": "Povoliť hmatovú odozvu",
   "haptic_feedback_title": "Hmatová odozva",
   "has_quota": "Má kvótu",
+  "header_settings_add_header_tip": "Pridať hlavičku",
+  "header_settings_field_validator_msg": "Hodnota nemôže byť prázdna",
+  "header_settings_header_name_input": "Názov hlavičky",
+  "header_settings_header_value_input": "Hodnota hlavičky",
+  "headers_settings_tile_subtitle": "Určite hlavičky proxy servera, ktoré má aplikácia posielať s každou požiadavkou na sieť",
+  "headers_settings_tile_title": "Vlastné hlavičky proxy servera",
   "hi_user": "Ahoj {name} ({email})",
   "hide_all_people": "Skryť všetky osoby",
   "hide_gallery": "Skryť galériu",
@@ -974,25 +1072,31 @@
   "home_page_archive_err_partner": "Nemožno archivovať partnerské položky, preskakuje sa",
   "home_page_building_timeline": "Vytváranie časovej osi",
   "home_page_delete_err_partner": "Nie je možné vymazať položky partnera, preskakuje sa",
+  "home_page_delete_remote_err_local": "Miestne položky vo výbere vzdialeného odstránenia, preskakuje sa",
   "home_page_favorite_err_local": "Zatiaľ nie je možné zaradiť lokálne média medzi obľúbené, preskakuje sa",
   "home_page_favorite_err_partner": "Na teraz nemôžete pridať partnerove médiá medzi obľúbené",
   "home_page_first_time_notice": "Ak aplikáciu používate prvýkrát, uistite sa, že ste si vybrali záložný album, aby sa na časovej osi mohli zobrazovať fotografie a videá",
+  "home_page_locked_error_local": "Nie je možné presunúť miestne položky do zamknutého priečinka, preskakuje sa",
+  "home_page_locked_error_partner": "Nie je možné presunúť partnerské položky do zamknutého priečinka, preskakuje sa",
   "home_page_share_err_local": "Nemožno zdieľať lokálne médiá pomocou odkazu",
   "home_page_upload_err_limit": "Naraz môžete nahrať len 30 médií, preskakuje sa",
   "host": "Hostiteľ",
   "hour": "Hodina",
   "id": "ID",
+  "ignore_icloud_photos": "Ignorovať fotky v službe iCloud",
+  "ignore_icloud_photos_description": "Fotografie uložené v službe iCloud sa nebudú odosielať na server Immich",
   "image": "Obrázok",
   "image_alt_text_date": "{isVideo, select, true {Video} other {Image}} nasnímané {date}",
   "image_alt_text_date_1_person": "{isVideo, select, true {Video} other {Image}} nasnímané s {person1} dňa {date}",
   "image_alt_text_date_2_people": "{isVideo, select, true {Video} other {Image}} nasnímané s {person1} a {person2} dňa {date}",
   "image_alt_text_date_3_people": "{isVideo, select, true {Video} other {Image}} nasnímané s {person1}, {person2} a {person3} dňa {date}",
-  "image_alt_text_date_4_or_more_people": "{isVideo, select, true {Video} other {Image}} nasnímané s {person1}, {person2} a {additionalCount, number} inými dňa {date}",
-  "image_alt_text_date_place": "{isVideo, select, true {Video} other {Obrázok}} nasnímané v {city}, {country} dňa {date}",
-  "image_alt_text_date_place_1_person": "{isVideo, select, true {Video} other {Obrázok}} zo dňa {date} v {city}, {country} s {person1}",
-  "image_alt_text_date_place_2_people": "{isVideo, select, true {Video} other {Obrázok}} v {city}, {country} s {person1} a {person2} zo dňa {date}",
-  "image_alt_text_date_place_3_people": "{isVideo, select, true {Video} other {Obrázok}} zo dňa {date} v {city}, {country} s {person1}, {person2} a {person3}",
-  "image_alt_text_date_place_4_or_more_people": "{isVideo, select, true {Video} other {Image}} nasnímaný v {city}, {country} s {person1}, {person2} a {additionalCount, number} inými dňa {date}",
+  "image_alt_text_date_4_or_more_people": "{isVideo, select, true {Video nasnímané} other {Obrázok odfotený}} s osobami {person1}, {person2} a {additionalCount, number} inými dňa {date}",
+  "image_alt_text_date_place": "{isVideo, select, true {Video nasnímané} other {Obrázok odfotený}} v {city}, {country} dňa {date}",
+  "image_alt_text_date_place_1_person": "{isVideo, select, true {Video nasnímané} other {Obrázok odfotený}} dňa {date} v {city}, {country} s {person1}",
+  "image_alt_text_date_place_2_people": "{isVideo, select, true {Video nasnímané} other {Obrázok odfotený}} v {city}, {country} s {person1} a {person2} dňa {date}",
+  "image_alt_text_date_place_3_people": "{isVideo, select, true {Video nasnímané} other {Obrázok odfotený}} dňa {date} v {city}, {country} s {person1}, {person2} a {person3}",
+  "image_alt_text_date_place_4_or_more_people": "{isVideo, select, true {Video nasnímamé} other {Obrázok odfotený}} v {city}, {country} s {person1}, {person2} a {additionalCount, number} inými dňa {date}",
+  "image_saved_successfully": "Obrázok bol uložený",
   "image_viewer_page_state_provider_download_started": "Sťahovanie sa začalo",
   "image_viewer_page_state_provider_download_success": "Sťahovanie bolo úspešné",
   "image_viewer_page_state_provider_share_error": "Chyba zdieľania",
@@ -1015,16 +1119,26 @@
     "night_at_twoam": "Každú noc o 2:00"
   },
   "invalid_date": "Neplatný dátum",
+  "invalid_date_format": "Neplatný formát dátumu",
   "invite_people": "Pozvať ľudí",
   "invite_to_album": "Pozvať do albumu",
+  "ios_debug_info_fetch_ran_at": "Načítanie prebehlo {dateTime}",
+  "ios_debug_info_last_sync_at": "Posledná synchronizácia {dateTime}",
+  "ios_debug_info_no_processes_queued": "Žiadne procesy nie sú v poradí na pozadí",
+  "ios_debug_info_no_sync_yet": "Zatiaľ nebola spustená žiadna úloha synchronizácie na pozadí",
+  "ios_debug_info_processes_queued": "{count, plural, one {{count} proces na pozadí v poradí} few {{count} procesy na pozadí v poradí} other {{count} procesov na pozadí v poradí}}",
+  "ios_debug_info_processing_ran_at": "Spracovanie prebehlo {dateTime}",
   "items_count": "{count, plural, one {# položka} few {# položky} other {# položiek}}",
   "jobs": "Úlohy",
   "keep": "Ponechať",
   "keep_all": "Ponechať všetko",
   "keep_this_delete_others": "Ponechať toto, odstrániť ostatné",
-  "kept_this_deleted_others": "Ponechá túto položku a odstráni {count, plural, one {# položku} other {# položiek}}",
+  "kept_this_deleted_others": "Ponechal túto položku a odstránil {count, plural, one {# položku} few {# položky} other {# položiek}}",
   "keyboard_shortcuts": "Klávesové skratky",
   "language": "Jazyk",
+  "language_no_results_subtitle": "Skúste upraviť hľadaný výraz",
+  "language_no_results_title": "Neboli nájdené žiadne jazyky",
+  "language_search_hint": "Vyhľadať jazyky...",
   "language_setting_description": "Vyberte preferovaný jazyk",
   "last_seen": "Naposledy videné",
   "latest_version": "Najnovšia verzia",
@@ -1041,6 +1155,7 @@
   "library_page_sort_created": "Najnovšie vytvorené",
   "library_page_sort_last_modified": "Naposledy upravené",
   "library_page_sort_title": "Podľa názvu albumu",
+  "licenses": "Licencie",
   "light": "Svetlý",
   "like_deleted": "Like odstránený",
   "link_motion_video": "Pripojiť pohyblivé video",
@@ -1050,7 +1165,10 @@
   "list": "Zoznam",
   "loading": "Načítavanie",
   "loading_search_results_failed": "Načítanie výsledkov hľadania sa nepodarilo",
+  "local_asset_cast_failed": "Nie je možné preniesť médium, ktoré nie je nahrané na serveri",
   "local_network": "Miestna sieť",
+  "local_network_sheet_info": "Pri použití zadanej siete Wi-Fi sa aplikácia pripojí k serveru prostredníctvom tejto URL adresy",
+  "location_permission": "Povolenie na určenie polohy",
   "location_permission_content": "Na používanie funkcie automatického prepínania potrebuje aplikácia Immich presné povolenie na určenie polohy, aby mohla prečítať názov aktuálnej Wi-Fi siete",
   "location_picker_choose_on_map": "Zvoľte na mape",
   "location_picker_latitude_error": "Zadajte platnú zemepisnú šírku",
@@ -1061,6 +1179,7 @@
   "locked_folder": "Zamknutý priečinok",
   "log_out": "Odhlásiť sa",
   "log_out_all_devices": "Odhlásiť všetky zariadenia",
+  "logged_in_as": "Prihlásený ako {user}",
   "logged_out_all_devices": "Všetky zariadenia odhlásené",
   "logged_out_device": "Zariadenie odhlásené",
   "login": "Prihlásenie",
@@ -1069,7 +1188,7 @@
   "login_form_back_button_text": "Späť",
   "login_form_email_hint": "tvojmail@email.com",
   "login_form_endpoint_hint": "http://ip-tvojho-servera:port",
-  "login_form_endpoint_url": "URL adresa servera",
+  "login_form_endpoint_url": "URL adresa koncového bodu servera",
   "login_form_err_http": "Prosím, uveďte http:// alebo https://",
   "login_form_err_invalid_email": "Neplatný e-mail",
   "login_form_err_invalid_url": "Neplatná URL adresa",
@@ -1089,7 +1208,7 @@
   "logout_all_device_confirmation": "Ste si istý, že sa chcete odhlásiť zo všetkých zariadení?",
   "logout_this_device_confirmation": "Ste si istý, že sa chcete odhlásiť z tohoto zariadenia?",
   "longitude": "Zemepisná dĺžka",
-  "look": "Zobrazenie",
+  "look": "Vzhľad",
   "loop_videos": "Opakovať videá",
   "loop_videos_description": "Povolí prehrávanie videí v slučke v detailnom zobrazení.",
   "main_branch_warning": "Používate vývojársku verziu; dôrazne odporúčame používať vydané verzie!",
@@ -1127,6 +1246,9 @@
   "map_settings_only_show_favorites": "Zobraziť iba obľúbené",
   "map_settings_theme_settings": "Téma mapy",
   "map_zoom_to_see_photos": "Oddiaľte priblíženie aby ste videli fotky",
+  "mark_all_as_read": "Označiť všetko ako prečítané",
+  "mark_as_read": "Označiť ako prečítané",
+  "marked_all_as_read": "Označené všetko ako prečítané",
   "matches": "Zhody",
   "media_type": "Typ média",
   "memories": "Spomienky",
@@ -1143,7 +1265,7 @@
   "merge_people_limit": "Zlúčiť môžete naraz najviac 5 tvárí",
   "merge_people_prompt": "Chcete zlúčiť týchto ľudí? Táto akcia sa nedá vrátiť.",
   "merge_people_successfully": "Zlúčenie ľudí sa podarilo",
-  "merged_people_count": "Zlúčení {count, plural, one {# človek} other {# ľudia}}",
+  "merged_people_count": "{count, plural, one {Zlúčená # osoba} few {Zlúčené # osoby} other {Zlúčených # osôb}}",
   "minimize": "Minimalizovať",
   "minute": "Minúta",
   "missing": "Chýbajúce",
@@ -1153,15 +1275,20 @@
   "more": "Viac",
   "move": "Presunúť",
   "move_off_locked_folder": "Presunúť zo zamknutého priečinka",
+  "move_to_lock_folder_action_prompt": "{count} pridaných do zamknutého priečinka",
   "move_to_locked_folder": "Presunúť do zamknutého priečinka",
   "move_to_locked_folder_confirmation": "Tieto fotografie a videá budú odstránené zo všetkých albumov a bude ich možné zobraziť len v zamknutom priečinku",
+  "moved_to_archive": "{count, plural, one {Presunutá # položka} few {Presunuté # položky} other {Presunutých # položiek}} do archívu",
+  "moved_to_library": "{count, plural, one {Presunutá # položka} few {Presunuté # položky} other {Presunutých # položiek}} do knižnice",
   "moved_to_trash": "Presunuté do koša",
   "multiselect_grid_edit_date_time_err_read_only": "Nemožno upraviť dátum položky len na čítanie, preskakujem",
-  "multiselect_grid_edit_gps_err_read_only": "Nie je možné upraviť polohu položky (položiek) len na čítanie, preskakuje sa",
+  "multiselect_grid_edit_gps_err_read_only": "Nie je možné upraviť polohu položky (položiek), ktorá je len na čítanie, preskakuje sa",
   "mute_memories": "Vyblednutie spomienok",
   "my_albums": "Moje albumy",
   "name": "Meno",
   "name_or_nickname": "Meno alebo prezývka",
+  "networking_settings": "Sieť",
+  "networking_subtitle": "Spravovať nastavenia koncového bodu servera",
   "never": "nikdy",
   "new_album": "Nový album",
   "new_api_key": "Nový API kľúč",
@@ -1178,9 +1305,10 @@
   "no_albums_message": "Vytvorí album na organizovanie fotiek a videí",
   "no_albums_with_name_yet": "Vyzerá, že zatiaľ nemáte album s týmto názvom.",
   "no_albums_yet": "Vyzerá, že zatiaľ nemáte žiadne albumy.",
-  "no_archived_assets_message": "Archivovať fotografie a videá, aby sa skryli zo zobrazenia Fotografie",
+  "no_archived_assets_message": "Archivujte fotografie a videá a skryte ich z vášho zobrazenia fotografií",
   "no_assets_message": "KLIKNITE A NAHRAJTE SVOJU PRVÚ FOTKU",
   "no_assets_to_show": "Žiadne položky",
+  "no_cast_devices_found": "Nenašli sa žiadne zariadenia na prenos",
   "no_duplicates_found": "Nenašli sa žiadne duplicity.",
   "no_exif_info_available": "Nie sú dostupné exif údaje",
   "no_explore_results_message": "Nahrajte viac fotiek na objavovanie vašej zbierky.",
@@ -1188,16 +1316,20 @@
   "no_libraries_message": "Vytvorí externú knižnicu na prezeranie fotiek a videí",
   "no_locked_photos_message": "Fotografie a videá v zamknutom priečinku sú skryté a nezobrazujú sa pri prehľadávaní alebo vyhľadávaní v knižnici.",
   "no_name": "Bez mena",
+  "no_notifications": "Žiadne oznámenia",
+  "no_people_found": "Nenašli sa žiadni vyhovujúci ľudia",
   "no_places": "Bez miesta",
   "no_results": "Žiadne výsledky",
   "no_results_description": "Skúste synonymum alebo všeobecnejší výraz",
   "no_shared_albums_message": "Vytvorí album na zdieľanie fotiek a videí s ľuďmi vo vašej sieti",
   "not_in_any_album": "Nie je v žiadnom albume",
+  "not_selected": "Nevybrané",
   "note_apply_storage_label_to_previously_uploaded assets": "Poznámka: Ak chcete použiť Štítok úložiska na predtým nahrané médiá, spustite príkaz",
   "notes": "Poznámky",
+  "nothing_here_yet": "Zatiaľ tu nič nie je",
   "notification_permission_dialog_content": "Ak chcete povoliť upozornenia, prejdite do Nastavenia a vyberte možnosť Povoliť.",
-  "notification_permission_list_tile_content": "Udeľte oprávnenie k aktivácii oznámení.",
-  "notification_permission_list_tile_enable_button": "Povoliť upozornenia",
+  "notification_permission_list_tile_content": "Udeľte povolenie na zapnutie oznámení.",
+  "notification_permission_list_tile_enable_button": "Povoliť oznámenia",
   "notification_permission_list_tile_title": "Povolenie oznámení",
   "notification_toggle_setting_description": "Povoliť e-mailové upozornenia",
   "notifications": "Oznámenia",
@@ -1209,7 +1341,9 @@
   "oldest_first": "Najstaršie prvé",
   "on_this_device": "Na tomto zariadení",
   "onboarding": "Na palube",
+  "onboarding_locale_description": "Vyberte požadovaný jazyk. Neskôr ho môžete zmeniť v nastaveniach.",
   "onboarding_privacy_description": "Nasledujúce (voliteľné) funkcie závisia na externých službách a kedykoľvek ich môžete vypnúť nastaveniach.",
+  "onboarding_server_welcome_description": "Nastavme vašu inštanciu pomocou bežných nastavení.",
   "onboarding_theme_description": "Vyberte farbu témy pre váš server. Môžete to aj neskôr zmeniť vo vašich nastaveniach.",
   "onboarding_user_welcome_description": "Začnime!",
   "onboarding_welcome_user": "Vitaj, {user}",
@@ -1247,9 +1381,9 @@
   "password_required": "Heslo je povinné",
   "password_reset_success": "Obnovenie hesla úspešné",
   "past_durations": {
-    "days": "{days, plural, one {Posledný deň} other {Posledných # dní }}",
-    "hours": "{hours, plural, one {Posledná hodina} other {Posledných # hodín}}",
-    "years": "{years, plural, one {Posledný rok} other {Posledné # roky}}"
+    "days": "{days, plural, one {Posledný deň} few {Posledné # dni} other {Posledných # dní }}",
+    "hours": "{hours, plural, one {Posledná hodina} few {Posledné # hodiny} other {Posledných # hodín}}",
+    "years": "{years, plural, one {Posledný rok} few {Posledné # roky} other {Posledných # rokov}}"
   },
   "path": "Cesta",
   "pattern": "Vzor",
@@ -1258,17 +1392,18 @@
   "paused": "Pozastavené",
   "pending": "Čakajúce",
   "people": "Ľudia",
-  "people_edits_count": "{count, plural, one {Upravená # osoba} other {Upravených # ľudí}}",
+  "people_edits_count": "{count, plural, one {Upravená # osoba} few {Upravené # osoby} other {Upravených # osôb}}",
   "people_feature_description": "Prehliadanie fotiek a videí zoskupených podľa ľudí",
-  "people_sidebar_description": "Zobrazí odkaz na Ľudí v bočnom paneli",
+  "people_sidebar_description": "Zobraziť odkaz na Ľudí v bočnom paneli",
   "permanent_deletion_warning": "Varovanie o trvalom zmazaní",
   "permanent_deletion_warning_setting_description": "Zobraziť varovanie pri trvalom zmazaní položky",
   "permanently_delete": "Trvalo zmazať",
-  "permanently_delete_assets_count": "Navždy zmazať {count, plural, one {položku} other {položky}}",
-  "permanently_delete_assets_prompt": "Naozaj si prajete navždy zmazať {count, plural, one {túto položku?} other {týchto <b>#</b> položiek?}} Vymažú sa aj {count, plural, one {zo svojho albumu} other {zo svojich albumov}}.",
+  "permanently_delete_assets_count": "Natrvalo vymazať {count, plural, one {položku} few {položky} other {položiek}}",
+  "permanently_delete_assets_prompt": "Ste si istí, že chcete natrvalo vymazať {count, plural, one {túto položku?} few {tieto <b>#</b> položky?} other {týchto <b>#</b> položiek?}} Týmto sa odstráni aj {count, plural, one {z jej albumu} other {zo svojich albumov}}.",
   "permanently_deleted_asset": "Navždy odstránená položka",
-  "permanently_deleted_assets_count": "Navždy {count, plural, one {odstránená # položka} other {odstránené # položky}}",
+  "permanently_deleted_assets_count": "Natrvalo {count, plural, one {odstránená # položka} few {odstránené # položky} other {odstránených # položiek}}",
   "permission": "Povolenie",
+  "permission_empty": "Vaše povolenie by nemalo byť prázdne",
   "permission_onboarding_back": "Späť",
   "permission_onboarding_continue_anyway": "Pokračovať aj tak",
   "permission_onboarding_get_started": "Začať",
@@ -1283,9 +1418,13 @@
   "photo_shared_all_users": "Vyzerá, že zdieľate svoje fotky so všetkými používateľmi alebo nemáte žiadnych používateľov.",
   "photos": "Fotografie",
   "photos_and_videos": "Fotografie & Videa",
-  "photos_count": "{count, plural, one {{count, number} Fotka} other {{count, number} Fotiek}}",
+  "photos_count": "{count, plural, one {{count, number} fotka} few {{count, number} fotky} other {{count, number} fotiek}}",
   "photos_from_previous_years": "Fotky z minulých rokov",
   "pick_a_location": "Vyberte polohu",
+  "pin_code_changed_successfully": "Úspešne ste zmenili PIN kód",
+  "pin_code_reset_successfully": "Úspešne ste obnovili PIN kód",
+  "pin_code_setup_successfully": "Úspešne ste nastavili PIN kód",
+  "pin_verification": "Overenie PIN kódom",
   "place": "Miesto",
   "places": "Miesta",
   "places_count": "{count, plural, one {{count, number} miesto} few {{count, number} miesta} other {{count, number} miest}}",
@@ -1293,17 +1432,22 @@
   "play_memories": "Prehrať spomienky",
   "play_motion_photo": "Prehrať pohyblivú fotku",
   "play_or_pause_video": "Pustí alebo pozastaví video",
+  "please_auth_to_access": "Prosím, potvrďte overenie pre prístup",
   "port": "Port",
-  "preferences_settings_title": "Preferencie",
+  "preferences_settings_subtitle": "Spravujte predvoľby aplikácie",
+  "preferences_settings_title": "Predvoľby",
   "preset": "Prednastavenie",
   "preview": "Náhľad",
   "previous": "Predošlé",
   "previous_memory": "Predošlá spomienka",
+  "previous_or_next_day": "Deň dopredu/dozadu",
+  "previous_or_next_month": "Mesiac dopredu/dozadu",
   "previous_or_next_photo": "Fotka ďalšia/predošlá",
+  "previous_or_next_year": "Rok dopredu/dozadu",
   "primary": "Primárne",
   "privacy": "Súkromie",
   "profile": "Profil",
-  "profile_drawer_app_logs": "Logy",
+  "profile_drawer_app_logs": "Záznamy",
   "profile_drawer_client_out_of_date_major": "Mobilná aplikácia je zastaralá. Prosím aktualizujte na najnovšiu verziu.",
   "profile_drawer_client_out_of_date_minor": "Mobilná aplikácia je zastaralá. Prosím aktualizujte na najnovšiu verziu.",
   "profile_drawer_client_server_up_to_date": "Klient a server sú aktuálne",
@@ -1327,7 +1471,7 @@
   "purchase_button_select": "Vybrať",
   "purchase_failed_activation": "Aktivácia sa nepodarila! Prosím skontrolujte email či je správny kľúč produktu!",
   "purchase_individual_description_1": "Pre jednotlivca",
-  "purchase_individual_description_2": "Stav podporovateľa",
+  "purchase_individual_description_2": "Štatút podporovateľa",
   "purchase_individual_title": "Jednotlivec",
   "purchase_input_suggestion": "Máte produktový kľúč? Zadajte ho nižšie",
   "purchase_license_subtitle": "Kúpte si Immich a podporte neustály vývoj tejto služby",
@@ -1343,22 +1487,24 @@
   "purchase_remove_server_product_key": "Odstrániť produktový kľúč servera",
   "purchase_remove_server_product_key_prompt": "Naozaj chcete odstrániť produktový kľúč servera?",
   "purchase_server_description_1": "Pre celý server",
-  "purchase_server_description_2": "Stav podporovateľa",
+  "purchase_server_description_2": "Štatút podporovateľa",
   "purchase_server_title": "Server",
   "purchase_settings_server_activated": "Produktový kľúč servera spravuje admin",
+  "queue_status": "V poradí {count}/{total}",
   "rating": "Hodnotenie hviezdičkami",
   "rating_clear": "Vyčistiť hodnotenie",
-  "rating_count": "{count, plural, one {# hviezdička} other {# hviezdičky}}",
-  "rating_description": "Zobrazí EXIF hodnotenie v info paneli",
+  "rating_count": "{count, plural, one {# hviezdička} few {# hviezdičky} other {# hviezdičiek}}",
+  "rating_description": "Zobraziť EXIF hodnotenie v informačnom paneli",
   "reaction_options": "Možnosti reakcie",
   "read_changelog": "Prečítať zoznam zmien",
   "reassign": "Preradiť",
-  "reassigned_assets_to_existing_person": "Preradené {count, plural, one {# položka} other {# položky}} k {name, select, null {existujúcej osobe} other {{name}}}",
-  "reassigned_assets_to_new_person": "Preradené {count, plural, one {# položka} other {# položiek}} novej osobe",
+  "reassigned_assets_to_existing_person": "Opätovne {count, plural, one {priradená # položka} few {priradené # položky} other {priradených # položiek}} k {name, select, null {existujúcej osobe} other {{name}}}",
+  "reassigned_assets_to_new_person": "Opätovne {count, plural, one {priradená # položka} few {priradené # položky} other {priradených # položiek}} novej osobe",
   "reassing_hint": "Priradí zvolenú položku k existujúcej osobe",
   "recent": "Nedávne",
   "recent-albums": "Posledné albumy",
   "recent_searches": "Posledné vyhľadávania",
+  "recently_added": "Nedávno pridané",
   "recently_added_page_title": "Nedávno pridané",
   "recently_taken": "Nedávno nasnímané",
   "recently_taken_page_title": "Nedávno zhotovené",
@@ -1367,20 +1513,22 @@
   "refresh_faces": "Obnoviť tváre",
   "refresh_metadata": "Obnoviť metadáta",
   "refresh_thumbnails": "Obnoviť miniatúry",
-  "refreshed": "Aktualizované",
+  "refreshed": "Obnovené",
   "refreshes_every_file": "Znova prečíta všetky existujúce a nové súbory",
   "refreshing_encoded_video": "Obnovovanie enkódovaných videí",
-  "refreshing_faces": "Obnovovnie tvárí",
+  "refreshing_faces": "Obnovovanie tvárí",
   "refreshing_metadata": "Obnovovanie metadát",
   "regenerating_thumbnails": "Pregenerovanie náhľadov",
   "remove": "Odstrániť",
-  "remove_assets_album_confirmation": "Naozaj chcete odstrániť {count, plural, one {# položky} other {# položiek}} z albumu?",
-  "remove_assets_shared_link_confirmation": "Naozaj chcete odstrániť {count, plural, one {# položku} other {# položiek}} z tohoto zdieľaného odkazu?",
+  "remove_assets_album_confirmation": "Naozaj chcete odstrániť {count, plural, one {# položku} few {# položky} other {# položiek}} z albumu?",
+  "remove_assets_shared_link_confirmation": "Naozaj chcete odstrániť {count, plural, one {# položku} few {# položky} other {# položiek}} z tohoto zdieľaného odkazu?",
   "remove_assets_title": "Odstrániť položky?",
   "remove_custom_date_range": "Odstrániť vlastný rozsah dátumov",
   "remove_deleted_assets": "Odstrániť vymazané položky",
   "remove_from_album": "Odstrániť z albumu",
+  "remove_from_album_action_prompt": "{count} odstránené z albumu",
   "remove_from_favorites": "Odstrániť z obľúbených",
+  "remove_from_lock_folder_action_prompt": "{count} odobrané zo zamknutého priečinka",
   "remove_from_locked_folder": "Odstrániť zo zamknutého priečinka",
   "remove_from_locked_folder_confirmation": "Ste si istí, že chcete tieto fotografie a videá presunúť zo zamknutého priečinka? Budú viditeľné vo vašej knižnici.",
   "remove_from_shared_link": "Odstrániť zo zdieľaného odkazu",
@@ -1395,7 +1543,7 @@
   "removed_from_favorites_count": "{count, plural, other {Odstránených #}} z obľúbených",
   "removed_memory": "Odstránená pamäť",
   "removed_photo_from_memory": "Fotografia odstránená z pamäte",
-  "removed_tagged_assets": "Odstránená značka z {count, plural, one {# položky} other {# položiek}}",
+  "removed_tagged_assets": "Odstránený štítok z {count, plural, one {# položky} other {# položiek}}",
   "rename": "Premenovať",
   "repair": "Opraviť",
   "repair_no_results_message": "Nesledované a chýbajúce súbory sa zobrazia tu",
@@ -1422,6 +1570,7 @@
   "role_editor": "Editor",
   "role_viewer": "Divák",
   "save": "Uložiť",
+  "save_to_gallery": "Uložiť do galérie",
   "saved_api_key": "Uložený API Kľúč",
   "saved_profile": "Uložený profil",
   "saved_settings": "Uložené nastavenia",
@@ -1445,9 +1594,11 @@
   "search_filter_apply": "Použiť filter",
   "search_filter_camera_title": "Vyberte typ kamery",
   "search_filter_date": "Dátum",
+  "search_filter_date_interval": "{start} do {end}",
   "search_filter_date_title": "Vyberte rozsah dátumov",
   "search_filter_display_option_not_in_album": "Mimo albumu",
   "search_filter_display_options": "Možnosti zobrazenia",
+  "search_filter_filename": "Hľadať podľa názvu súboru",
   "search_filter_location": "Poloha",
   "search_filter_location_title": "Vyberte polohu",
   "search_filter_media_type": "Typ média",
@@ -1490,6 +1641,7 @@
   "select_album_cover": "Vyberte obal albumu",
   "select_all": "Vybrať všetko",
   "select_all_duplicates": "Vybrať všetky duplikáty",
+  "select_all_in": "Označiť všetky v {group}",
   "select_avatar_color": "Vyberte farbu avatara",
   "select_face": "Vyberte tvár",
   "select_featured_photo": "Vyberte náhľadovú fotku",
@@ -1502,15 +1654,17 @@
   "select_trash_all": "Vybrať zahodiť všetky",
   "select_user_for_sharing_page_err_album": "Nepodarilo sa vytvoriť album",
   "selected": "Vybrané",
-  "selected_count": "{count, plural, other {# vybrané}}",
+  "selected_count": "{count, plural, one {# vybraná} few {# vybrané} other {# vybraných}}",
   "send_message": "Odoslať správu",
   "send_welcome_email": "Odoslať uvítací e-mail",
+  "server_endpoint": "Koncový bod servera",
   "server_info_box_app_version": "Verzia aplikácie",
-  "server_info_box_server_url": "URL Serveru",
+  "server_info_box_server_url": "URL adresa servera",
   "server_offline": "Server je Offline",
   "server_online": "Server je Online",
-  "server_stats": "Serverové Štatistiky",
-  "server_version": "Verzia Servera",
+  "server_privacy": "Zásady ochrany osobných údajov servera",
+  "server_stats": "Štatistiky servera",
+  "server_version": "Verzia servera",
   "set": "Nastaviť",
   "set_as_album_cover": "Nastaviť ako obal albumu",
   "set_as_featured_photo": "Nastaviť ako hlavnú fotku",
@@ -1518,14 +1672,16 @@
   "set_date_of_birth": "Nastaviť dátum narodenia",
   "set_profile_picture": "Nastaviť profilový obrázok",
   "set_slideshow_to_fullscreen": "Nastaviť prezentáciu na celú obrazovku",
-  "setting_image_viewer_help": "Prehliadač detailov najprv načíta malú miniatúru, potom načíta náhľad strednej veľkosti (ak je povolený) a nakoniec načíta originál (ak je povolený).",
+  "set_stack_primary_asset": "Nastaviť ako primárnu položku",
+  "setting_image_viewer_help": "V detailnom prehliadači sa najprv načíta malá miniatúra, potom sa načíta stredne veľký náhľad (ak je povolený) a nakoniec sa načíta originál (ak je povolený).",
   "setting_image_viewer_original_subtitle": "Povolením umožníte načítať pôvodný obrázok v plnom rozlíšení (veľký!). Zakázaním znížite používania dát (v sieti, aj v dočasnej pamäte zariadenia).",
   "setting_image_viewer_original_title": "Načítať pôvodný obrázok",
   "setting_image_viewer_preview_subtitle": "Povolením umožníte načítať obrázok so stredným rozlíšením. Zakážte, ak chcete priamo načítať originál alebo použiť iba miniatúru.",
   "setting_image_viewer_preview_title": "Načítať náhľad obrázka",
   "setting_image_viewer_title": "Obrázky",
   "setting_languages_apply": "Použiť",
-  "setting_notifications_notify_failures_grace_period": "Oznámenie o zlyhaní zálohovania na pozadí: {duration}",
+  "setting_languages_subtitle": "Zmeniť jazyk aplikácie",
+  "setting_notifications_notify_failures_grace_period": "Upozorniť na zlyhanie zálohovania na pozadí: {duration}",
   "setting_notifications_notify_hours": "{count} hodín",
   "setting_notifications_notify_immediately": "okamžite",
   "setting_notifications_notify_minutes": "{count} minút",
@@ -1533,14 +1689,18 @@
   "setting_notifications_notify_seconds": "{count} sekúnd",
   "setting_notifications_single_progress_subtitle": "Podrobné informácie o priebehu nahrávania pre položku",
   "setting_notifications_single_progress_title": "Zobraziť priebeh detailov zálohovania na pozadí",
-  "setting_notifications_subtitle": "Prispôsobenie predvolieb oznámení",
+  "setting_notifications_subtitle": "Upravte svoje nastavenia oznámení",
   "setting_notifications_total_progress_subtitle": "Celkový priebeh nahrávania (nahraných/celkovo)",
   "setting_notifications_total_progress_title": "Zobraziť celkový priebeh zálohovania na pozadí",
   "setting_video_viewer_looping_title": "Opakovanie",
+  "setting_video_viewer_original_video_subtitle": "Pri streamovaní videa zo servera prehrať originál, aj keď je k dispozícii prekódované video. Môže to viesť k prerušovanému prehrávaniu videa. Videá dostupné lokálne sa prehrajú v pôvodnej kvalite bez ohľadu na toto nastavenie.",
+  "setting_video_viewer_original_video_title": "Vynútiť pôvodné video",
   "settings": "Nastavenia",
   "settings_require_restart": "Na použitie tohto nastavenia reštartujte Immich",
   "settings_saved": "Nastavenia boli uložené",
+  "setup_pin_code": "Nastavte si PIN kód",
   "share": "Zdieľať",
+  "share_action_prompt": "{count} položiek zdieľaných",
   "share_add_photos": "Pridať fotografie",
   "share_assets_selected": "{count} označených",
   "share_dialog_preparing": "Pripravujem...",
@@ -1574,14 +1734,14 @@
   "shared_link_edit_password_hint": "Zadajte heslo zdieľania",
   "shared_link_edit_submit_button": "Aktualizovať odkaz",
   "shared_link_error_server_url_fetch": "Nemožno nájsť URL severa",
-  "shared_link_expires_day": "Vyprší o {count} dní",
+  "shared_link_expires_day": "Vyprší o {count} deň",
   "shared_link_expires_days": "Vyprší o {count} dní",
-  "shared_link_expires_hour": "Vyprší o {count} hodín",
+  "shared_link_expires_hour": "Vyprší o {count} hodinu",
   "shared_link_expires_hours": "Vyprší o {count} hodín",
-  "shared_link_expires_minute": "Vyprší o {count} minút",
+  "shared_link_expires_minute": "Vyprší o {count} minútu",
   "shared_link_expires_minutes": "Vyprší o {count} minút",
   "shared_link_expires_never": "Nevyprší",
-  "shared_link_expires_second": "Vyprší o {count} sekúnd",
+  "shared_link_expires_second": "Vyprší o {count} sekundu",
   "shared_link_expires_seconds": "Vyprší o {count} sekúnd",
   "shared_link_individual_shared": "Individuálne zdieľané",
   "shared_link_info_chip_metadata": "EXIF",
@@ -1589,7 +1749,8 @@
   "shared_link_options": "Možnosti zdieľaných odkazov",
   "shared_links": "Zdieľané odkazy",
   "shared_links_description": "Zdieľanie fotografií a videí pomocou odkazu",
-  "shared_photos_and_videos_count": "{assetCount, plural, other {# zdieľané fotky a videá.}}",
+  "shared_photos_and_videos_count": "{assetCount, plural, few {# zdieľané fotky a videá.} other {# zdieľaných fotiek a videí.}}",
+  "shared_with_me": "Zdieľané so mnou",
   "shared_with_partner": "Zdieľané s {partner}",
   "sharing": "Zdieľanie",
   "sharing_enter_password": "Ak chcete zobraziť túto stránku, prosím, zadajte heslo.",
@@ -1599,7 +1760,7 @@
   "sharing_sidebar_description": "Zobraziť odkaz na Zdieľanie v bočnom paneli",
   "sharing_silver_appbar_create_shared_album": "Vytvoriť zdieľaný album",
   "sharing_silver_appbar_share_partner": "Zdieľať s partnerom",
-  "shift_to_permanent_delete": "stlačte ⇧ pre nemenné zmazanie pložiek",
+  "shift_to_permanent_delete": "stlačte ⇧ na trvalé vymazanie položky",
   "show_album_options": "Zobraziť možnosti albumu",
   "show_albums": "Zobraziť albumy",
   "show_all_people": "Zobraziť všetkých ľudí",
@@ -1608,21 +1769,21 @@
   "show_gallery": "Zobraziť galériu",
   "show_hidden_people": "Zobraziť skrytých ľudí",
   "show_in_timeline": "Zobraziť na časovej osi",
-  "show_in_timeline_setting_description": "Zobrazí fotky a videá tohoto používateľa na časovej osi",
+  "show_in_timeline_setting_description": "Zobraziť fotky a videá tohoto používateľa na vašej časovej osi",
   "show_keyboard_shortcuts": "Zobraziť klávesové skratky",
   "show_metadata": "Zobraziť metadáta",
-  "show_or_hide_info": "Zobrazí alebo skryje info",
+  "show_or_hide_info": "Zobraziť alebo skryť informácie",
   "show_password": "Zobraziť heslo",
-  "show_person_options": "Zobrazí možnosti osoby",
-  "show_progress_bar": "Zobrazí ukazovateľ priebehu",
+  "show_person_options": "Zobraziť možnosti osoby",
+  "show_progress_bar": "Zobraziť ukazovateľ priebehu",
   "show_search_options": "Zobraziť možnosti vyhľadávania",
   "show_shared_links": "Zobraziť zdieľané odkazy",
-  "show_slideshow_transition": "Zobrazí prechody v prezentácii",
+  "show_slideshow_transition": "Zobraziť prechody v prezentácii",
   "show_supporter_badge": "Odznak podporovateľa",
   "show_supporter_badge_description": "Zobraziť odznak podporovateľa",
   "shuffle": "Náhodné poradie",
   "sidebar": "Bočný panel",
-  "sidebar_display_description": "Zobrazí odkaz na pohľad v bočnom paneli",
+  "sidebar_display_description": "Zobraziť odkaz na zobrazenie v bočnom paneli",
   "sign_out": "Odhlásiť sa",
   "sign_up": "Registrovať",
   "size": "Veľkosť",
@@ -1641,15 +1802,17 @@
   "sort_title": "Názov",
   "source": "Zdroj",
   "stack": "Zoskupenie",
+  "stack_action_prompt": "{count} zoskupených",
   "stack_duplicates": "Zoskupiť duplicity",
   "stack_select_one_photo": "Vyberte jednu hlavnú fotku pre zoskupenie",
   "stack_selected_photos": "Zoskupiť vybraté fotky",
-  "stacked_assets_count": "{count, plural, one {Zoskupená # položka} other {Zoskupených # položiek}}",
+  "stacked_assets_count": "{count, plural, one {Zoskupená # položka} few {Zoskupené # položky} other {Zoskupených # položiek}}",
   "stacktrace": "Výpis zásobníku",
   "start": "Štart",
   "start_date": "Začiatočný dátum",
   "state": "Štát",
   "status": "Stav",
+  "stop_casting": "Zastaviť prenos",
   "stop_motion_photo": "Stopmotion fotka",
   "stop_photo_sharing": "Zastaviť zdieľanie vašich fotiek?",
   "stop_photo_sharing_description": "{partner} už nebude mať prístup k vašim fotkám.",
@@ -1667,24 +1830,31 @@
   "swap_merge_direction": "Vymeniť smer zlúčenia",
   "sync": "Synchronizovať",
   "sync_albums": "Synchronizovať albumy",
-  "tag": "Značka",
-  "tag_assets": "Pridať značku",
-  "tag_created": "Vytvorená značka: {tag}",
-  "tag_feature_description": "Prehliadanie fotiek a videá zoskupených podľa tematických značiek",
-  "tag_not_found_question": "Neviete nájsť značku? <link>Vytvorte novú značku.</link>",
+  "sync_albums_manual_subtitle": "Synchronizujte všetky nahrané videá a fotografie s vybranými záložnými albumami",
+  "sync_upload_album_setting_subtitle": "Vytvárajte a nahrávajte svoje fotografie a videá do vybraných albumov na Immich",
+  "tag": "Štítok",
+  "tag_assets": "Označiť položky",
+  "tag_created": "Vytvorený štítok: {tag}",
+  "tag_feature_description": "Prehliadanie fotiek a videá zoskupených podľa tematických štítkov",
+  "tag_not_found_question": "Neviete nájsť štítok? <link>Vytvorte nový štítok.</link>",
   "tag_people": "Označiť ľudí",
-  "tag_updated": "Upravená značka: {tag}",
-  "tagged_assets": "Značka priradená {count, plural, one {# položke} other {# položkám}}",
+  "tag_updated": "Upravený štítok: {tag}",
+  "tagged_assets": "Štítok priradený {count, plural, one {# položke} other {# položkám}}",
   "tags": "Štítky",
   "template": "Šablóna",
   "theme": "Téma",
   "theme_selection": "Výber témy",
-  "theme_selection_description": "Automaticky nastaví tému na svetlú alebo tmavú podľa systémových preferencií v prehliadači",
-  "theme_setting_asset_list_storage_indicator_title": "Zobraziť indikátor úložiska na dlaždiciach položiek",
+  "theme_selection_description": "Automaticky nastaví tému na svetlú alebo tmavú podľa systémových predvolieb v prehliadači",
+  "theme_setting_asset_list_storage_indicator_title": "Zobraziť indikátor úložiska na dlaždiciach médií",
   "theme_setting_asset_list_tiles_per_row_title": "Počet položiek na riadok ({count})",
-  "theme_setting_image_viewer_quality_subtitle": "Prispôsobenie kvality prehliadača detailov",
+  "theme_setting_colorful_interface_subtitle": "Použiť základnú farbu na plochy na pozadí.",
+  "theme_setting_colorful_interface_title": "Farebné rozhranie",
+  "theme_setting_image_viewer_quality_subtitle": "Upravte kvalitu detailného prehliadača obrázkov",
   "theme_setting_image_viewer_quality_title": "Kvalita prehliadača obrázkov",
-  "theme_setting_system_theme_switch": "Automaticky (podľa systemového nastavenia)",
+  "theme_setting_primary_color_subtitle": "Vyberte si farbu pre základné akcie a dôrazy.",
+  "theme_setting_primary_color_title": "Základná farba",
+  "theme_setting_system_primary_color_title": "Použiť systémovú farbu",
+  "theme_setting_system_theme_switch": "Automaticky (podľa systémového nastavenia)",
   "theme_setting_theme_subtitle": "Vyberte nastavenia témy aplikácie",
   "theme_setting_three_stage_loading_subtitle": "Trojstupňové načítanie môže zvýšiť výkonnosť načítania, ale vedie k výrazne vyššiemu zaťaženiu siete",
   "theme_setting_three_stage_loading_title": "Povolenie trojstupňového načítavania",
@@ -1693,7 +1863,7 @@
   "time_based_memories": "Časové spomienky",
   "timeline": "Časová os",
   "timezone": "Časové pásmo",
-  "to_archive": "Archivovať",
+  "to_archive": "Archív",
   "to_change_password": "Zmeniť heslo",
   "to_favorite": "Obľúbiť",
   "to_login": "Prihlásiť",
@@ -1703,23 +1873,29 @@
   "total": "Celkom",
   "total_usage": "Celkové využitie",
   "trash": "Kôš",
+  "trash_action_prompt": "{count} presunutých do koša",
   "trash_all": "Všetko do koša",
   "trash_count": "{count, number} do koša",
   "trash_delete_asset": "Položky do koša/odstrániť",
+  "trash_emptied": "Kôš vyprázdnený",
   "trash_no_results_message": "Vymazané fotografie a videá sa zobrazia tu.",
   "trash_page_delete_all": "Vymazať všetky",
-  "trash_page_empty_trash_dialog_content": "Skutočne chcete vyprázdniť kôš? Tieto položky budú permanentne odstránené z Immichu",
+  "trash_page_empty_trash_dialog_content": "Skutočne chcete vyprázdniť kôš? Tieto položky budú permanentne odstránené z aplikácie Immich",
   "trash_page_info": "Médiá v koši sa permanentne odstránia po {days} dňoch",
   "trash_page_no_assets": "Žiadne médiá v koši",
   "trash_page_restore_all": "Obnoviť všetky",
-  "trash_page_select_assets_btn": "Označiť médiá",
+  "trash_page_select_assets_btn": "Vybrať médiá",
   "trash_page_title": "Kôš ({count})",
   "trashed_items_will_be_permanently_deleted_after": "Položky v koši sa natrvalo vymažú po {days, plural, one {# dni} other {# dňoch}}.",
   "type": "Typ",
+  "unable_to_change_pin_code": "Nie je možné zmeniť PIN kód",
+  "unable_to_setup_pin_code": "Nie je možné nastaviť PIN kód",
   "unarchive": "Odarchivovať",
+  "unarchive_action_prompt": "{count} odstránené z archívu",
   "unarchived_count": "{count, plural, other {Odarchivovaných #}}",
   "undo": "Späť",
   "unfavorite": "Odznačiť ako obľúbené",
+  "unfavorite_action_prompt": "{count} odstránené z Obľúbených",
   "unhide_person": "Odkryť osobu",
   "unknown": "Neznáme",
   "unknown_country": "Neznámy štát",
@@ -1727,7 +1903,7 @@
   "unlimited": "Neobmedzené",
   "unlink_motion_video": "Odpojiť pohyblivé video",
   "unlink_oauth": "Odpojiť OAuth",
-  "unlinked_oauth_account": "Odpojiť OAuth účet",
+  "unlinked_oauth_account": "Odpojený OAuth účet",
   "unmute_memories": "Zrušenie stlmenia spomienok",
   "unnamed_album": "Nepomenovaný album",
   "unnamed_album_delete_confirmation": "Ste si istý, že chcete zmazať tento album?",
@@ -1735,18 +1911,22 @@
   "unsaved_change": "Neuložená zmena",
   "unselect_all": "Zrušiť výber všetkých",
   "unselect_all_duplicates": "Zrušiť výber všetkých duplicít",
+  "unselect_all_in": "Zrušiť výber všetkých v {group}",
   "unstack": "Odskupiť",
-  "unstacked_assets_count": "{count, plural, one {Rozložená # položka} few {Rozložené # položky} other {Rozložených # položiek}}",
+  "unstack_action_prompt": "{count} nezoskupených",
+  "unstacked_assets_count": "Zrušenie zoskupenia pre {count, plural, one {# položku} few {# položky} other {# položiek}}",
+  "untagged": "Bez štítku",
   "up_next": "To je všetko",
   "updated_at": "Aktualizované",
   "updated_password": "Heslo zmenené",
   "upload": "Nahrať",
   "upload_concurrency": "Súbežnosť nahrávania",
+  "upload_details": "Podrobnosti o nahrávaní",
   "upload_dialog_info": "Chcete zálohovať zvolené médiá na server?",
   "upload_dialog_title": "Nahrať médiá",
-  "upload_errors": "Nahrávanie ukončené s {count, plural, one {# chybou} other {# chybami}}, obnovte stránku aby sa zobrazili nové položky.",
+  "upload_errors": "Nahrávanie ukončené s {count, plural, one {# chybou} other {# chybami}}, obnovte stránku, aby sa zobrazili nové položky.",
   "upload_progress": "Ostáva {remaining, number} - Spracovaných {processed, number}/{total, number}",
-  "upload_skipped_duplicates": "{count, plural, one {Preskočená # duplicita} few {Preskočené # duplicity} other {Preskočených # duplicít}}",
+  "upload_skipped_duplicates": "{count, plural, one {Preskočená # duplicitná položka} few {Preskočené # duplicitné položky} other {Preskočených # duplicitných položiek}}",
   "upload_status_duplicates": "Duplikáty",
   "upload_status_errors": "Chyby",
   "upload_status_uploaded": "Nahrané",
@@ -1755,6 +1935,8 @@
   "uploading": "Nahrávanie",
   "url": "Odkaz URL",
   "usage": "Použitie",
+  "use_biometric": "Použiť biometrické údaje",
+  "use_current_connection": "použiť aktuálne pripojenie",
   "use_custom_date_range": "Použiť radšej vlastný rozsah dátumov",
   "user": "Používateľ",
   "user_has_been_deleted": "Tento používateľ bol vymazaný.",
@@ -1762,16 +1944,19 @@
   "user_liked": "Používateľovi {user} sa páči {type, select, photo {táto fotka} video {toto video} asset {táto položka} other {toto}}",
   "user_pin_code_settings": "PIN kód",
   "user_pin_code_settings_description": "Spravujte svoj PIN kód",
+  "user_privacy": "Ochrana osobných údajov používateľa",
   "user_purchase_settings": "Nákup",
-  "user_purchase_settings_description": "Správa vášho nákupu",
+  "user_purchase_settings_description": "Spravujte svoj nákup",
   "user_role_set": "Nastav {user} ako {role}",
   "user_usage_detail": "Podrobnosti o využívaní používateľmi",
   "user_usage_stats": "Štatistiky využitia účtu",
   "user_usage_stats_description": "Zobraziť štatistiky využitia účtu",
   "username": "Používateľské meno",
   "users": "Používatelia",
+  "users_added_to_album_count": "{count, plural, one {Pridaný # používateľ} few {Pridaní # používatelia} other {Pridaných # používateľov}} do albumu",
   "utilities": "Nástroje",
   "validate": "Validovať",
+  "validate_endpoint_error": "Zadajte prosím platnú URL adresu",
   "variables": "Premenné",
   "version": "Verzia",
   "version_announcement_closing": "Tvoj kamarát, Alex",
@@ -1783,10 +1968,11 @@
   "video_hover_setting_description": "Prehrá video náhľad keď kurzor myši prejde cez položku. Aj keď je vypnuté, prehrávanie sa môže spustiť nabehnutí cez ikonu Prehrať.",
   "videos": "Videá",
   "videos_count": "{count, plural, one {# Video} few {# Videá} other {# Videí}}",
-  "view": "Zobraziť",
+  "view": "Zobrazenie",
   "view_album": "Zobraziť Album",
   "view_all": "Zobraziť všetky",
   "view_all_users": "Zobraziť všetkých používateľov",
+  "view_details": "Zobraziť podrobnosti",
   "view_in_timeline": "Zobraziť v časovej osi",
   "view_link": "Zobraziť odkaz",
   "view_links": "Zobraziť odkazy",
@@ -1799,7 +1985,7 @@
   "viewer_remove_from_stack": "Odstrániť zo zoskupenia",
   "viewer_stack_use_as_main_asset": "Použiť ako hlavnú fotku",
   "viewer_unstack": "Odskupiť",
-  "visibility_changed": "Viditeľnosť zmenená pre {count, plural, one {# osobu} other {# ľudí}}",
+  "visibility_changed": "Viditeľnosť zmenená pre {count, plural, one {# osobu} few {# osoby} other {# osôb}}",
   "waiting": "Čaká",
   "warning": "Varovanie",
   "week": "Týždeň",
diff --git a/i18n/sl.json b/i18n/sl.json
index 5132d09fc8..c4409c717e 100644
--- a/i18n/sl.json
+++ b/i18n/sl.json
@@ -166,6 +166,20 @@
     "metadata_settings_description": "Upravljanje nastavitev metapodatkov",
     "migration_job": "Migracija",
     "migration_job_description": "Preselite sličice za sredstva in obraze v najnovejšo strukturo map",
+    "nightly_tasks_cluster_faces_setting_description": "Zaženi prepoznavanje obrazov na novo zaznanih obrazih",
+    "nightly_tasks_cluster_new_faces_setting": "Združite nove obraze",
+    "nightly_tasks_database_cleanup_setting": "Naloge čiščenja baze podatkov",
+    "nightly_tasks_database_cleanup_setting_description": "Očistite stare, potekle podatke iz baze podatkov",
+    "nightly_tasks_generate_memories_setting": "Ustvarjajte spomine",
+    "nightly_tasks_generate_memories_setting_description": "Ustvarite nove spomine iz sredstev",
+    "nightly_tasks_missing_thumbnails_setting": "Ustvari manjkajoče sličice",
+    "nightly_tasks_missing_thumbnails_setting_description": "Sredstva brez sličic postavite v čakalno vrsto za ustvarjanje sličic",
+    "nightly_tasks_settings": "Nastavitve nočnih opravil",
+    "nightly_tasks_settings_description": "Upravljajte nočne naloge",
+    "nightly_tasks_start_time_setting": "Začetni čas",
+    "nightly_tasks_start_time_setting_description": "Čas, ko strežnik začne izvajati nočne naloge",
+    "nightly_tasks_sync_quota_usage_setting": "Poraba kvote za sinhronizacijo",
+    "nightly_tasks_sync_quota_usage_setting_description": "Posodobi kvoto shrambe uporabnikov glede na trenutno uporabo",
     "no_paths_added": "Ni dodanih poti",
     "no_pattern_added": "Brez dodanega vzorca",
     "note_apply_storage_label_previous_assets": "Opomba: Če želite oznako za shranjevanje uporabiti za predhodno naložena sredstva, zaženite",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "Mobilni preusmeritveni URI",
     "oauth_mobile_redirect_uri_override": "Preglasitev URI preusmeritve za mobilne naprave",
     "oauth_mobile_redirect_uri_override_description": "Omogoči, ko ponudnik OAuth ne dovoli mobilnega URI-ja, kot je ''{callback}''",
+    "oauth_role_claim": "Zahteva vloge",
+    "oauth_role_claim_description": "Samodejno dodeli skrbniški dostop na podlagi prisotnosti tega zahtevka. Zahtevek ima lahko »uporabnik« ali »skrbnik«.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Upravljanje nastavitev prijave OAuth",
     "oauth_settings_more_details": "Za več podrobnosti o tej funkciji glejte <link>dokumentacijo</link>.",
@@ -357,10 +373,12 @@
   "admin_password": "Skrbniško geslo",
   "administration": "Administracija",
   "advanced": "Napredno",
+  "advanced_settings_beta_timeline_subtitle": "Preizkusite novo izkušnjo aplikacije",
+  "advanced_settings_beta_timeline_title": "Časovnica beta različice",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Uporabite to možnost za filtriranje medijev med sinhronizacijo na podlagi alternativnih meril. To poskusite le, če imate težave z aplikacijo, ki zaznava vse albume.",
   "advanced_settings_enable_alternate_media_filter_title": "[EKSPERIMENTALNO] Uporabite alternativni filter za sinhronizacijo albuma v napravi",
   "advanced_settings_log_level_title": "Nivo dnevnika: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Nekatere naprave zelo počasi nalagajo sličice iz sredstev v napravi. Aktivirajte to nastavitev, če želite namesto tega naložiti oddaljene slike.",
+  "advanced_settings_prefer_remote_subtitle": "Nekatere naprave zelo počasi nalagajo sličice iz lokalnih sredstev. Aktivirajte to nastavitev, če želite namesto tega naložiti oddaljene slike.",
   "advanced_settings_prefer_remote_title": "Uporabi raje oddaljene slike",
   "advanced_settings_proxy_headers_subtitle": "Določi proxy glavo, ki jo naj Immich pošlje ob vsaki mrežni zahtevi",
   "advanced_settings_proxy_headers_title": "Proxy glave",
@@ -388,6 +406,7 @@
   "album_options": "Možnosti albuma",
   "album_remove_user": "Odstrani uporabnika?",
   "album_remove_user_confirmation": "Ali ste prepričani, da želite odstraniti {user}?",
+  "album_search_not_found": "Ni najdenih albumov, ki bi ustrezali vašemu iskanju",
   "album_share_no_users": "Videti je, da ste ta album dali v skupno rabo z vsemi uporabniki ali pa nimate nobenega uporabnika, s katerim bi ga lahko delili.",
   "album_updated": "Album posodobljen",
   "album_updated_setting_description": "Prejmite e-poštno obvestilo, ko ima album v skupni rabi nova sredstva",
@@ -407,6 +426,7 @@
   "albums_default_sort_order": "Privzeti vrstni red razvrščanja albumov",
   "albums_default_sort_order_description": "Začetni vrstni red razvrščanja sredstev pri ustvarjanju novih albumov.",
   "albums_feature_description": "Zbirke sredstev, ki jih je mogoče deliti z drugimi uporabniki.",
+  "albums_on_device_count": "Albumi v napravi ({count})",
   "all": "Vse",
   "all_albums": "Vsi albumi",
   "all_people": "Vsi ljudje",
@@ -427,6 +447,7 @@
   "app_settings": "Nastavitve aplikacije",
   "appears_in": "Pojavi se v",
   "archive": "Arhiv",
+  "archive_action_prompt": "v arhiv je dodanih {count}",
   "archive_or_unarchive_photo": "Arhivirajte ali odstranite fotografijo iz arhiva",
   "archive_page_no_archived_assets": "Ni arhiviranih sredstev",
   "archive_page_title": "Arhiv ({count})",
@@ -464,7 +485,6 @@
   "assets": "Sredstva",
   "assets_added_count": "Dodano{count, plural, one {# sredstvo} two {# sredstvi} few {# sredstva} other {# sredstev}}",
   "assets_added_to_album_count": "Dodano {count, plural, one {# sredstvo} two {# sredstvi} few {# sredstva} other {# sredstev}} v album",
-  "assets_added_to_name_count": "Dodano {count, plural, one {# sredstvo} two {# sredstvi} few {# sredstva} other {# sredstev}} v {hasName, select, true {<b>{name}</b>} other {new album}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Sredstvo} two {Sredstvi} few {Sredstva} other {Sredstev}} ni mogoče dodati v album",
   "assets_count": "{count, plural, one {# sredstvo} two {# sredstvi} few {# sredstva} other {# sredstev}}",
   "assets_deleted_permanently": "trajno izrisana sredstva {count}",
@@ -587,6 +607,7 @@
   "cancel": "Prekliči",
   "cancel_search": "Prekliči iskanje",
   "canceled": "Preklicano",
+  "canceling": "Preklic",
   "cannot_merge_people": "Oseb ni mogoče združiti",
   "cannot_undo_this_action": "Tega dejanja ne morete razveljaviti!",
   "cannot_update_the_description": "Opisa ni mogoče posodobiti",
@@ -703,7 +724,7 @@
   "daily_title_text_date": "E, MMM dd",
   "daily_title_text_date_year": "E, MMM dd, yyyy",
   "dark": "Temno",
-  "darkTheme": "Preklopi na temno temo",
+  "dark_theme": "Preklopi temno temo",
   "date_after": "Datum po",
   "date_and_time": "Datum in ura",
   "date_before": "Datum pred",
@@ -719,6 +740,7 @@
   "default_locale": "Privzeti jezik",
   "default_locale_description": "Oblikujte datume in številke glede na lokalne nastavitve brskalnika",
   "delete": "Izbriši",
+  "delete_action_prompt": "trajno izbrisano {count}",
   "delete_album": "Izbriši album",
   "delete_api_key_prompt": "Ali ste prepričani, da želite izbrisati ta API ključ?",
   "delete_dialog_alert": "Ti elementi bodo trajno izbrisani iz Immicha in vaše naprave",
@@ -732,6 +754,7 @@
   "delete_key": "Izbriši ključ",
   "delete_library": "Izbriši knjižnico",
   "delete_link": "Izbriši povezavo",
+  "delete_local_action_prompt": "{count} izbrisano lokalno",
   "delete_local_dialog_ok_backed_up_only": "Izbriši samo kar je varnostno kopirano",
   "delete_local_dialog_ok_force": "Vseeno izbriši",
   "delete_others": "Izbriši ostale",
@@ -745,6 +768,7 @@
   "description": "Opis",
   "description_input_hint_text": "Dodaj opis ...",
   "description_input_submit_error": "Napaka pri posodabljanju opisa, preverite dnevnik za več podrobnosti",
+  "deselect_all": "Prekliči vse",
   "details": "Podrobnosti",
   "direction": "Usmeritev",
   "disabled": "Onemogočeno",
@@ -762,6 +786,7 @@
   "documentation": "Dokumentacija",
   "done": "Končano",
   "download": "Prenesi",
+  "download_action_prompt": "Prenašanje {count} sredstev",
   "download_canceled": "Prenos preklican",
   "download_complete": "Prenos končan",
   "download_enqueue": "Prenos v čakalni vrsti",
@@ -799,6 +824,7 @@
   "edit_key": "Uredi ključ",
   "edit_link": "Uredi povezavo",
   "edit_location": "Uredi lokacijo",
+  "edit_location_action_prompt": "urejenih {count} lokacij",
   "edit_location_dialog_title": "Lokacija",
   "edit_name": "Uredi ime",
   "edit_people": "Uredi osebe",
@@ -817,6 +843,7 @@
   "empty_trash": "Izprazni smetnjak",
   "empty_trash_confirmation": "Ste prepričani, da želite izprazniti smetnjak? S tem boste iz Immicha trajno odstranili vsa sredstva v smetnjaku.\nTega dejanja ne morete razveljaviti!",
   "enable": "Omogoči",
+  "enable_backup": "Omogoči varnostno kopiranje",
   "enable_biometric_auth_description": "Vnesite svojo PIN kodo, da omogočite biometrično preverjanje pristnosti",
   "enabled": "Omogočeno",
   "end_date": "Končni datum",
@@ -984,6 +1011,7 @@
   "failed_to_load_assets": "Sredstev ni bilo mogoče naložiti",
   "failed_to_load_folder": "Mape ni bilo mogoče naložiti",
   "favorite": "Priljubljen",
+  "favorite_action_prompt": "med priljubljene je dodanih {count}",
   "favorite_or_unfavorite_photo": "Priljubljena ali nepriljubljena fotografija",
   "favorites": "Priljubljene",
   "favorites_page_no_favorites": "Ni priljubljenih sredstev",
@@ -1127,6 +1155,7 @@
   "library_page_sort_created": "Nazadnje ustvarjeno",
   "library_page_sort_last_modified": "Nazadnje spremenjeno",
   "library_page_sort_title": "Naslov albuma",
+  "licenses": "Licence",
   "light": "Svetlo",
   "like_deleted": "Všeček izbrisan",
   "link_motion_video": "Povezava videa gibanja",
@@ -1246,6 +1275,7 @@
   "more": "Več",
   "move": "Premakni",
   "move_off_locked_folder": "Premakni iz zaklenjene mape",
+  "move_to_lock_folder_action_prompt": "V zaklenjeno mapo je bilo dodanih {count}",
   "move_to_locked_folder": "Premakni v zaklenjeno mapo",
   "move_to_locked_folder_confirmation": "Te fotografije in videoposnetki bodo odstranjeni iz vseh albumov in si jih bo mogoče ogledati le v zaklenjeni mapi",
   "moved_to_archive": "Premaknjeno {count, plural, one {# sredstvo} two {# sredstvi} few {# sredstva} other {# sredstev}} v arhiv",
@@ -1460,6 +1490,7 @@
   "purchase_server_description_2": "Status podpornika",
   "purchase_server_title": "Strežnik",
   "purchase_settings_server_activated": "Ključ izdelka strežnika upravlja skrbnik",
+  "queue_status": "Čakalna vrsta {count}/{total}",
   "rating": "Ocena z zvezdicami",
   "rating_clear": "Počisti oceno",
   "rating_count": "{count, plural, one {# zvezdica} two {# zvezdici} few {# zvezdice} other {# zvezdic}}",
@@ -1495,7 +1526,9 @@
   "remove_custom_date_range": "Odstrani časovno obdobje po meri",
   "remove_deleted_assets": "Odstrani izbrisana sredstva",
   "remove_from_album": "Odstrani iz albuma",
+  "remove_from_album_action_prompt": "{count} odstranjenih iz albuma",
   "remove_from_favorites": "Odstrani iz priljubljenih",
+  "remove_from_lock_folder_action_prompt": "iz zaklenjene mape je odstranjenih {count}",
   "remove_from_locked_folder": "Odstrani iz zaklenjene mape",
   "remove_from_locked_folder_confirmation": "Ali ste prepričani, da želite premakniti te fotografije in videoposnetke iz zaklenjene mape? Vidni bodo v vaši knjižnici.",
   "remove_from_shared_link": "Odstrani iz skupne povezave",
@@ -1667,6 +1700,7 @@
   "settings_saved": "Nastavitve shranjene",
   "setup_pin_code": "Nastavi PIN kodo",
   "share": "Deli",
+  "share_action_prompt": "Deljena sredstva {count}",
   "share_add_photos": "Dodaj fotografije",
   "share_assets_selected": "{count} izbrano",
   "share_dialog_preparing": "Priprava...",
@@ -1768,6 +1802,7 @@
   "sort_title": "Naslov",
   "source": "Vir",
   "stack": "Sklad",
+  "stack_action_prompt": "{count} naloženih",
   "stack_duplicates": "Nabor dvojnikov",
   "stack_select_one_photo": "Izberite eno glavno fotografijo za nabor",
   "stack_selected_photos": "Nabor izbranih fotografij",
@@ -1838,6 +1873,7 @@
   "total": "Skupno",
   "total_usage": "Skupna poraba",
   "trash": "Smetnjak",
+  "trash_action_prompt": "premaknjeno v smetnjak {count}",
   "trash_all": "Vse v smetnjak",
   "trash_count": "Smetnjak {count, number}",
   "trash_delete_asset": "V smetnjak/izbriši sredstvo",
@@ -1855,9 +1891,11 @@
   "unable_to_change_pin_code": "PIN kode ni mogoče spremeniti",
   "unable_to_setup_pin_code": "PIN kode ni mogoče nastaviti",
   "unarchive": "Odstrani iz arhiva",
+  "unarchive_action_prompt": "{count} odstranjenih iz arhiva",
   "unarchived_count": "{count, plural, other {nearhiviranih #}}",
   "undo": "Razveljavi",
   "unfavorite": "Odznači priljubljeno",
+  "unfavorite_action_prompt": "{count} odstranjenih iz priljubljenih",
   "unhide_person": "Prikaži osebo",
   "unknown": "Neznano",
   "unknown_country": "Neznana država",
@@ -1875,12 +1913,15 @@
   "unselect_all_duplicates": "Odznači vse dvojnike",
   "unselect_all_in": "Prekliči izbor vseh v {group}",
   "unstack": "Razklad",
+  "unstack_action_prompt": "{count} razloženih",
   "unstacked_assets_count": "Razloži {count, plural, one {# sredstvo} two {# sredstvi} few {# sredstva} other {# sredstev}}",
+  "untagged": "Neoznačeno",
   "up_next": "Naslednja",
   "updated_at": "Posodobljeno",
   "updated_password": "Posodobljeno geslo",
   "upload": "Naloži",
   "upload_concurrency": "Sočasnost nalaganja",
+  "upload_details": "Podrobnosti o nalaganju",
   "upload_dialog_info": "Ali želite varnostno kopirati izbrana sredstva na strežnik?",
   "upload_dialog_title": "Naloži sredstvo",
   "upload_errors": "Nalaganje je končano s/z {count, plural, one {# napako} two {# napakama} other {# napakami}}, osvežite stran, da vidite nova sredstva za nalaganje.",
@@ -1912,6 +1953,7 @@
   "user_usage_stats_description": "Oglejte si statistiko uporabe računa",
   "username": "Uporabniško ime",
   "users": "Uporabniki",
+  "users_added_to_album_count": "V album {count, plural, one {je bil dodan # uporabnik} two {sta bila dodana # uporabnika} few {so bili dodani # uporabniki} other {je bilo dodanih # uporanikov}}",
   "utilities": "Pripomočki",
   "validate": "Potrdi",
   "validate_endpoint_error": "Vnesite veljaven URL",
@@ -1930,6 +1972,7 @@
   "view_album": "Ogled albuma",
   "view_all": "Poglej vse",
   "view_all_users": "Ogled vseh uporabnikov",
+  "view_details": "Ogled podrobnosti",
   "view_in_timeline": "Ogled na časovnici",
   "view_link": "Odpri povezavo",
   "view_links": "Ogled povezav",
diff --git a/i18n/sr_Cyrl.json b/i18n/sr_Cyrl.json
index b518bb39af..6216e671a8 100644
--- a/i18n/sr_Cyrl.json
+++ b/i18n/sr_Cyrl.json
@@ -458,7 +458,6 @@
   "assets": "Записи",
   "assets_added_count": "Додато {count, plural, one {# датотека} other {# датотека}}",
   "assets_added_to_album_count": "Додато је {count, plural, one {# датотека} other {# датотека}} у албум",
-  "assets_added_to_name_count": "Додато {count, plural, one {# датотека} other {# датотеке}} у {hasName, select, true {<b>{name}</b>} other {нови албум}}",
   "assets_count": "{count, plural, one {# датотека} few {# датотеке} other {# датотека}}",
   "assets_deleted_permanently": "{count} елемената трајно обрисано",
   "assets_deleted_permanently_from_server": "{count} ресурс(а) трајно обрисан(а) са Immich сервера",
diff --git a/i18n/sr_Latn.json b/i18n/sr_Latn.json
index aa92e6da49..a757146861 100644
--- a/i18n/sr_Latn.json
+++ b/i18n/sr_Latn.json
@@ -456,7 +456,6 @@
   "assets": "Zapisi",
   "assets_added_count": "Dodato {count, plural, one {# datoteka} other {# datoteka}}",
   "assets_added_to_album_count": "Dodato je {count, plural, one {# datoteka} other {# datoteka}} u album",
-  "assets_added_to_name_count": "Dodato {count, plural, one {# datoteka} other {# datoteke}} u {hasName, select, true {<b>{name}</b>} other {novi album}}",
   "assets_count": "{count, plural, one {# datoteka} few {# datoteke} other {# datoteka}}",
   "assets_deleted_permanently": "{count} elemenata trajno obrisano",
   "assets_deleted_permanently_from_server": "{count} resurs(a) trajno obrisan(a) sa Immich servera",
diff --git a/i18n/sv.json b/i18n/sv.json
index a4c08f8c22..00f5d95b66 100644
--- a/i18n/sv.json
+++ b/i18n/sv.json
@@ -22,6 +22,7 @@
   "add_partner": "Lägg till partner",
   "add_path": "Lägg till sökväg",
   "add_photos": "Lägg till foton",
+  "add_tag": "Lägg till tagg",
   "add_to": "Lägg till i…",
   "add_to_album": "Lägg till i album",
   "add_to_album_bottom_sheet_added": "Tillagd till {album}",
@@ -33,6 +34,7 @@
   "added_to_favorites_count": "{count, number} tillagda till favoriter",
   "admin": {
     "add_exclusion_pattern_description": "Lägg till exkluderande mönster. Matchning med jokertecken *, ** samt ? stödjs. För att ignorera alla filer i samtliga mappar som heter \"Raw\", använd \"**/Raw/**\". För att ignorera alla filer som slutar med \".tif\", använd \"**/*.tif\". För att ignorera en absolut sökväg, använd \"/sökväg/att/ignorera/**\".",
+    "admin_user": "Adminanvändare",
     "asset_offline_description": "Denna externa bibliotekstillgång finns inte längre på disken och har flyttats till papperskorgen. Om filen flyttades inom biblioteket, kontrollera din tidslinje för den nya motsvarande tillgången. För att återställa denna tillgång, se till att filsökvägen nedan kan nås av Immich och skanna biblioteket.",
     "authentication_settings": "Autentiseringsinställningar",
     "authentication_settings_description": "Hantera lösenord, OAuth, och andra autentiseringsinställningar",
@@ -169,7 +171,7 @@
     "note_apply_storage_label_previous_assets": "Obs: Om du vill använda lagringsetiketten på tidigare uppladdade tillgångar kör du",
     "note_cannot_be_changed_later": "OBS: Detta kan inte ändras i efterhand!",
     "notification_email_from_address": "Från adress",
-    "notification_email_from_address_description": "Avsändarens epost, t.ex.: \"Immich Fotoserver <noreply@example.com>\"",
+    "notification_email_from_address_description": "Avsändarens e-post, till exempel: \"Immich Fotoserver <noreply@example.com>\". Säkerställ att du använder en adress som du har tillåtelse att skicka e-post från.",
     "notification_email_host_description": "Värd för epostservern (t.ex. smtp.immich.app)",
     "notification_email_ignore_certificate_errors": "Ignorera certifikatfel",
     "notification_email_ignore_certificate_errors_description": "Ignorera valideringsfel för TLS-certifikat (rekommenderas ej)",
@@ -194,6 +196,8 @@
     "oauth_mobile_redirect_uri": "Telefonomdirigernings-URI",
     "oauth_mobile_redirect_uri_override": "Telefonomdirigerings-URI överrskridning",
     "oauth_mobile_redirect_uri_override_description": "Aktivera om OAuth-leverantören inte tillåter mobila URI:er, så som ''{callback}''",
+    "oauth_role_claim": "Rollanspråk",
+    "oauth_role_claim_description": "Bevilja administratörsåtkomst automatiskt baserat på förekomsten av detta påstående. Påståendet kan innehålla antingen 'user' eller 'admin'.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Hantera OAuth-logininställningar",
     "oauth_settings_more_details": "För ytterligare detaljer om denna funktion, se <link>dokumentationen</link>.",
@@ -202,7 +206,7 @@
     "oauth_storage_quota_claim": "Användaranknuten lagringskvot",
     "oauth_storage_quota_claim_description": "Sätter automatiskt angiven användares lagringskvot.",
     "oauth_storage_quota_default": "Standardlagringskvot (GiB)",
-    "oauth_storage_quota_default_description": "Kvot i GiB som används när ingen fordran angetts (Ange 0 för obegränsad kvot).",
+    "oauth_storage_quota_default_description": "Kvot i GiB som används när ingen fordran angetts.",
     "oauth_timeout": "Begäran tog för lång tid",
     "oauth_timeout_description": "Timeout för förfrågningar i millisekunder",
     "password_enable_description": "Logga in med epost och lösenord",
@@ -242,6 +246,7 @@
     "storage_template_migration_info": "Lagringsmallen kommer konvertera alla filändelser till gemena bokstäver. Ändringar gäller endast för nya resurser, för att retoaktivt tillämpa mallen på befintliga resurser kör <link>{job}</link>.",
     "storage_template_migration_job": "Lagringsmall migreringsjobb",
     "storage_template_more_details": "För mer information om den här funktionen se <template-link>Lagringsmall</template-link> och dess <implications-link>konsekvenser</implications-link>",
+    "storage_template_onboarding_description_v2": "Denna funktion kommer när den är aktiverad att auto-organisera filer baserat på en användardefinierad mall. För mer information se <link>dokumentationen</link>.",
     "storage_template_path_length": "Uppskattad längdbegränsning på sökväg: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Lagringsmall",
     "storage_template_settings_description": "Hantera mappstruktur och filnamn för uppladdade resurser",
@@ -401,6 +406,9 @@
   "album_with_link_access": "Låt alla med länken se foton och personer i det här albumet.",
   "albums": "Album",
   "albums_count": "{count, plural, one {{count, number} Album} other {{count, number} Album}}",
+  "albums_default_sort_order": "Standard sorteringsordning för album",
+  "albums_default_sort_order_description": "Standard sorteringsordning för mediefiler vid skapande av nytt album.",
+  "albums_feature_description": "Samlingar av mediefiler som kan delas med andra användare.",
   "all": "Allt",
   "all_albums": "Alla album",
   "all_people": "Alla personer",
@@ -421,6 +429,7 @@
   "app_settings": "Appinställningar",
   "appears_in": "Visas i",
   "archive": "Arkiv",
+  "archive_action_prompt": "{count} adderade till Arkiv",
   "archive_or_unarchive_photo": "Arkivera eller oarkivera fotot",
   "archive_page_no_archived_assets": "Inga arkiverade objekt hittade",
   "archive_page_title": "Arkiv ({count})",
@@ -458,7 +467,6 @@
   "assets": "Objekt",
   "assets_added_count": "La till {count, plural, one {# asset} other {# assets}}",
   "assets_added_to_album_count": "Lade till {count, plural, one {# asset} other {# assets}} i albumet",
-  "assets_added_to_name_count": "Lade till {count, plural, one {# objekt} other {# objekt}} till {hasName, select, true {<b>{name}</b>} other {nytt album}}",
   "assets_count": "{count, plural, one {# objekt} other {# objekt}}",
   "assets_deleted_permanently": "{count} objekt har tagits bort permanent",
   "assets_deleted_permanently_from_server": "{count} objekt har tagits bort permanent från Immich-servern",
@@ -639,6 +647,7 @@
   "confirm_password": "Bekräfta lösenord",
   "confirm_tag_face": "Vill du tagga det här ansiktet som {name}?",
   "confirm_tag_face_unnamed": "Vill du tagga detta ansikte?",
+  "connected_device": "Ansluten enhet",
   "connected_to": "Ansluten till",
   "contain": "Anpassa",
   "context": "Sammanhang",
@@ -691,7 +700,6 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Mörk",
-  "darkTheme": "Växla till mörkt tema",
   "date_after": "Datum efter",
   "date_and_time": "Datum och Tid",
   "date_before": "Datum före",
@@ -707,6 +715,7 @@
   "default_locale": "Standardplats",
   "default_locale_description": "Formatera datum och siffror baserat på din webbläsares språkversion",
   "delete": "Radera",
+  "delete_action_prompt": "{count, plural, one {# permanent raderad} other {# permanent raderade}}",
   "delete_album": "Ta bort album",
   "delete_api_key_prompt": "Är du säker på att du vill ta bort denna API-nyckel?",
   "delete_dialog_alert": "Dessa objekt kommer att raderas permanent från Immich och din enhet",
@@ -739,6 +748,7 @@
   "disallow_edits": "Tillåt inte redigeringar",
   "discord": "Discord",
   "discover": "Upptäck",
+  "discovered_devices": "Funna enheter",
   "dismiss_all_errors": "Avvisa alla fel",
   "dismiss_error": "Avvisa fel",
   "display_options": "Visningsalternativ",
@@ -1083,6 +1093,7 @@
   "invite_to_album": "Bjuder in till album",
   "ios_debug_info_last_sync_at": "Senaste synkning {dateTime}",
   "ios_debug_info_no_processes_queued": "Inga bakgrundsprocesser köade",
+  "ios_debug_info_processes_queued": "{count, plural, one {{count} bakgrundsprocess köad} other {{count} bakgrundsprocesser köade}}",
   "items_count": "{count, plural, one {# objekt} other {# objekt}}",
   "jobs": "Jobb",
   "keep": "Behåll",
@@ -1091,6 +1102,8 @@
   "kept_this_deleted_others": "Behåll denna tillgång och borttagna {count, plural, one {# asset} other {# assets}}",
   "keyboard_shortcuts": "Kortkommandon",
   "language": "Språk",
+  "language_no_results_title": "Inga språk funna",
+  "language_search_hint": "Sök språk…",
   "language_setting_description": "Välj önskat språk",
   "last_seen": "Senast sedd",
   "latest_version": "Senaste versionen",
@@ -1129,6 +1142,7 @@
   "locked_folder": "Låst Mapp",
   "log_out": "Logga ut",
   "log_out_all_devices": "Logga ut alla enheter",
+  "logged_in_as": "Inloggad som {user}",
   "logged_out_all_devices": "Loggat ut från alla enheter",
   "logged_out_device": "Loggat ut enheten",
   "login": "Logga in",
@@ -1224,6 +1238,7 @@
   "more": "Mer",
   "move": "Flytta",
   "move_off_locked_folder": "Flytta från låst mapp",
+  "move_to_lock_folder_action_prompt": "{count} adderades till låst mapp",
   "move_to_locked_folder": "Flytta till låst mapp",
   "move_to_locked_folder_confirmation": "Dessa foton och videor kommer tas bort från alla album och går endast se i låsta mappen",
   "moved_to_archive": "Flyttade {count, plural, one {# resurs} other {# assets}} till arkivet",
@@ -1825,6 +1840,7 @@
   "unable_to_setup_pin_code": "Kunde inte konfigurera pinkod",
   "unarchive": "Ångra arkivering",
   "unarchived_count": "{count, plural, one {# borttagen från arkiv} other {# borttagna från arkiv}}",
+  "undo": "Ångra",
   "unfavorite": "Avfavorisera",
   "unhide_person": "Visa person",
   "unknown": "Okänd",
diff --git a/i18n/ta.json b/i18n/ta.json
index ce0768982d..a91ea9d045 100644
--- a/i18n/ta.json
+++ b/i18n/ta.json
@@ -392,7 +392,6 @@
   "assets": "சொத்துக்கள்",
   "assets_added_count": "சேர்க்கப்பட்டது {எண்ணிக்கை, பன்மை, ஒன்று {# சொத்து} மற்ற {# சொத்துக்கள்}}",
   "assets_added_to_album_count": "ஆல்பத்தில் {எண்ணிக்கை, பன்மை, ஒன்று {# சொத்து} மற்ற {# சொத்துக்கள்}}",
-  "assets_added_to_name_count": "சேர்க்கப்பட்டது {எண்ணிக்கை, பன்மை, ஒன்று {# சொத்து} மற்ற {# சொத்துக்கள்}} {hasname, தேர்ந்தெடுக்கவும், உண்மை {<b> {name} </b>} பிற {new album}}",
   "assets_count": "{எண்ணிக்கை, பன்மை, ஒன்று {# சொத்து} மற்ற {# சொத்துக்கள்}}",
   "assets_moved_to_trash_count": "நகர்த்தப்பட்டது {எண்ணிக்கை, பன்மை, ஒன்று {# சொத்து} மற்ற {# சொத்துக்கள்}}}",
   "assets_permanently_deleted_count": "நிரந்தரமாக நீக்கப்பட்டது {எண்ணிக்கை, பன்மை, ஒன்று {# சொத்து} பிற {# சொத்துக்கள்}}",
diff --git a/i18n/te.json b/i18n/te.json
index 8bd57bc3bc..4a2e938c9a 100644
--- a/i18n/te.json
+++ b/i18n/te.json
@@ -23,6 +23,8 @@
   "add_photos": "ఫోటోలను జోడించండి",
   "add_to": "జోడించండి…",
   "add_to_album": "ఆల్బమ్‌కు జోడించండి",
+  "add_to_album_bottom_sheet_added": "ఆల్బమ్కు జోడించబడింది",
+  "add_to_album_bottom_sheet_already_exists": "ఆల్బమ్‌లో ఇప్పటికే జోడించబడింది",
   "add_to_shared_album": "భాగస్వామ్య ఆల్బమ్‌కు జోడించండి",
   "add_url": "URLని జోడించండి",
   "added_to_archive": "ఆర్కైవ్‌కి జోడించబడింది",
@@ -30,17 +32,18 @@
   "added_to_favorites_count": "ఇష్టమైన వాటికి {count, number} జోడించబడింది",
   "admin": {
     "add_exclusion_pattern_description": "మినహాయింపు నమూనాలను జోడించండి. *, ** మరియు ?ని ఉపయోగించి గ్లోబింగ్‌కు మద్దతు ఉంది. \"Raw\" అనే పేరు గల ఏదైనా డైరెక్టరీలోని అన్ని ఫైల్‌లను విస్మరించడానికి, \"**/Raw/**\"ని ఉపయోగించండి. \".tif\"తో ముగిసే అన్ని ఫైల్‌లను విస్మరించడానికి, \"**/*.tif\"ని ఉపయోగించండి. సంపూర్ణ మార్గాన్ని విస్మరించడానికి, \"/path/to/ignore/**\"ని ఉపయోగించండి.",
+    "admin_user": "నిర్వాహకుడు",
     "asset_offline_description": "ఈ బాహ్య లైబ్రరీ ఫైల్ ఇకపై డిస్క్‌లో కనుగొనబడలేదు మరియు ట్రాష్‌కు తరలించబడింది. ఫైల్ లైబ్రరీలోకి తరలించబడితే, కొత్త సంబంధిత ఫైల్ కోసం మీ టైమ్‌లైన్‌ను తనిఖీ చేయండి. ఈ ఫైల్ని పునరుద్ధరించడానికి, దయచేసి దిగువన ఉన్న ఫైల్ పాత్‌ను Immich యాక్సెస్ చేయగలదని నిర్ధారించుకోండి మరియు లైబ్రరీని స్కాన్ చేయండి.",
     "authentication_settings": "ప్రమాణీకరణ సెట్టింగ్‌లు",
     "authentication_settings_description": "పాస్‌వర్డ్, OAuth మరియు ఇతర ప్రమాణీకరణ సెట్టింగ్‌లను నిర్వహించండి",
     "authentication_settings_disable_all": "మీరు ఖచ్చితంగా అన్ని లాగిన్ పద్ధతులను నిలిపివేయాలనుకుంటున్నారా? లాగిన్ పూర్తిగా నిలిపివేయబడుతుంది.",
     "authentication_settings_reenable": "మళ్లీ ప్రారంబించటానికి, <link>Server Command</link>ని ఉపయోగించండి.",
     "background_task_job": "నేపథ్య పనులు",
-    "backup_database": "బ్యాకప్ డేటాబేస్",
-    "backup_database_enable_description": "డేటాబేస్ బ్యాకప్‌లను ప్రారంభించండి",
-    "backup_keep_last_amount": "ఉంచుకోవాల్సిన మునుపటి బ్యాకప్‌ల మొత్తం",
-    "backup_settings": "బ్యాకప్ సెట్టింగ్‌లు",
-    "backup_settings_description": "డేటాబేస్ బ్యాకప్ సెట్టింగ్‌లను నిర్వహించండి",
+    "backup_database": "డేటాబేస్ ను సృష్టించు",
+    "backup_database_enable_description": "డేటాబేస్ పడవెయ్యడాన్నీ ప్రారంభించండి",
+    "backup_keep_last_amount": "ఉంచుకోవాల్సిన మునుపటి పడవెయ్యడాల్లా మొత్తం",
+    "backup_settings": "డేటాబేస్ పడవెసే సెట్టింగ్‌లు",
+    "backup_settings_description": "డేటాబేస్ పడవెసే సెట్టింగ్‌లను నిర్వహించండి",
     "cleared_jobs": "దీని కోసం ఉద్యోగాలు క్లియర్ చేయబడ్డాయి: {job}",
     "config_set_by_file": "కాన్ఫిగరేషన్ ప్రస్తుతం కాన్ఫిగరేషన్ ఫైల్ ద్వారా సెట్ చేయబడింది",
     "confirm_delete_library": "మీరు ఖచ్చితంగా {library} లైబ్రరీని తొలగించాలనుకుంటున్నారా?",
@@ -48,6 +51,7 @@
     "confirm_email_below": "నిర్ధారించడానికి, క్రింద \"{email}\" టైప్ చేయండి",
     "confirm_reprocess_all_faces": "మీరు ఖచ్చితంగా అన్ని ముఖాలను రీప్రాసెస్ చేయాలనుకుంటున్నారా? ఇది పేరున్న వ్యక్తులను కూడా క్లియర్ చేస్తుంది.",
     "confirm_user_password_reset": "మీరు ఖచ్చితంగా {user} పాస్‌వర్డ్‌ని రీసెట్ చేయాలనుకుంటున్నారా?",
+    "confirm_user_pin_code_reset": "మీరు ఖచ్చితంగా {user} యొక్క పిన్ కోడ్ నీ రీసెట్ చేద్దామనిఅనుకుంటున్నారా?",
     "create_job": "పనిని సృష్టించండి",
     "cron_expression": "క్రాన్ వ్యక్తీకరణ",
     "cron_expression_description": "క్రాన్ ఫార్మాట్ ఉపయోగించి స్కానింగ్ విరామాన్ని సెట్ చేయండి. మరిన్ని వివరాల కోసం దయచేసి ఉదా. <link>క్రోంటాబ్ గురు</link> చూడండి",
@@ -402,7 +406,6 @@
   "assets": "ఆస్తులు",
   "assets_added_count": "జోడించబడినవి {count, plural, one {# ఆస్తి} other {# ఆస్తులు}}",
   "assets_added_to_album_count": "{count, plural, one {# ఆస్తి} other {# ఆస్తులు}} ఆల్బమ్‌కి జోడించబడినవి",
-  "assets_added_to_name_count": "{count, plural, one {# ఆస్తి} other {# ఆస్తులు}} {hasName, select, true {<b>{name}</b>} other {కొత్త ఆల్బమ్}}కి జోడించబడినవి",
   "assets_count": "{count, plural, one {# ఆస్తి} other {# ఆస్తులు}}",
   "assets_moved_to_trash_count": "{count, plural, one {# ఆస్తి} other {# ఆస్తులు}} చెత్తబుట్టలోకి తరలించారు",
   "assets_permanently_deleted_count": "{count, plural, one {# ఆస్తి} other {# ఆస్తులు}} శాశ్వతంగా తొలగించబడినవి",
diff --git a/i18n/th.json b/i18n/th.json
index 13d9514d63..3cce9afd1c 100644
--- a/i18n/th.json
+++ b/i18n/th.json
@@ -14,14 +14,15 @@
   "add_a_location": "เพิ่มตำแหน่ง",
   "add_a_name": "เพิ่มชื่อ",
   "add_a_title": "เพิ่มหัวข้อ",
-  "add_endpoint": "เพิ่มอุปกรณ์ปลายทาง",
+  "add_endpoint": "เพิ่มปลายทาง",
   "add_exclusion_pattern": "เพิ่มข้อยกเว้น",
   "add_import_path": "เพิ่มเส้นทางนำเข้า",
   "add_location": "เพิ่มตำแหน่ง",
   "add_more_users": "เพิ่มผู้ใช้งาน",
-  "add_partner": "เพิ่มพันธมิตร",
+  "add_partner": "เพิ่มคู่หู",
   "add_path": "เพิ่มพาทที่ตั้ง",
   "add_photos": "เพิ่มรูปภาพ",
+  "add_tag": "เพิ่มแท็ก",
   "add_to": "เพิ่มไปยัง …",
   "add_to_album": "เพิ่มไปอัลบั้ม",
   "add_to_album_bottom_sheet_added": "เพิ่มไปยัง {album}",
@@ -33,7 +34,8 @@
   "added_to_favorites_count": "{count, number} รูปถูกเพิ่มเข้ารายการโปรด",
   "admin": {
     "add_exclusion_pattern_description": "เพิ่มรูปแบบข้อยกเว้น รองรับการใช้ *, ** และ ? หากต้องการละเว้นไฟล์ทั้งหมดในไดเร็กทอรีที่ชื่อว่า \"Raw\" ให้ใช้ \"**/Raw/**\" ถ้าต้องการละเว้นไฟล์ทั้งหมดที่ลงท้ายด้วย \".tif\" ให้ใช้ \"**/*.tif\" ถ้าต้องการละเว้นพาธที่เริ่มจากไดเรกทอรีบนสุดให้ใช้ \"/พาธ/ที่ต้องการ/ละเว้น/**\"",
-    "asset_offline_description": "ไฟล์ Asset ของไลบรารีภายนอกนี้ไม่พบในดิสก์แล้ว และถูกย้ายไปที่ถังขยะ หากไฟล์ถูกย้ายภายในไลบรารี โปรดตรวจสอบไทม์ไลน์ของคุณเพื่อหาแอสเซ็ตที่เกี่ยวข้องใหม่ หากต้องการกู้คืน Asset นี้ โปรดตรวจสอบให้แน่ใจว่า Immich สามารถเข้าถึงเส้นทางไฟล์ด้านล่างได้ และทำการสแกนไลบรารีอีกครั้ง",
+    "admin_user": "ผู้ดูแล",
+    "asset_offline_description": "ไม่พบไฟล์สื่อของไลบรารีภายนอกนี้ในดิสก์ และถูกย้ายไปที่ถังขยะแล้ว หากไฟล์ถูกย้ายภายในไลบรารี โปรดตรวจสอบไทม์ไลน์ของคุณเพื่อหาสื่อที่เกี่ยวข้องใหม่ หากต้องการกู้คืนสื่อนี้ โปรดตรวจสอบว่า Immich สามารถเข้าถึงไฟล์ด้านล่างได้ และทำการสแกนไลบรารีอีกครั้ง",
     "authentication_settings": "การตั้งค่าการเข้าถึง",
     "authentication_settings_description": "จัดการรหัสผ่าน, OAuth, และตั้งค่าการเข้าถึงอื่นๆ",
     "authentication_settings_disable_all": "คุณแน่ใจว่าต้องการปิดวิธีการล็อกอินทั้งหมดหรือไม่? ล็อกอินจะถูกปิดทั้งหมด",
@@ -43,7 +45,7 @@
     "backup_database_enable_description": "เปิดใช้งานสำรองฐานข้อมูล",
     "backup_keep_last_amount": "จำนวนข้อมูลสำรองก่อนหน้าที่ต้องเก็บไว้",
     "backup_settings": "ตั้งค่าการสำรองข้อมูล",
-    "backup_settings_description": "จัดการการตั้งค่าการสำรองฐานข้อมูล งานสำรองนี้จะไม่ถูกตรวจสอบและคุณจะไม่ได้รับการแจ้งเมื่อมันสำรองไม่สำเร็จ",
+    "backup_settings_description": "จัดการการตั้งค่าการสำรองฐานข้อมูล",
     "cleared_jobs": "เคลียร์งานสำหรับ: {job}",
     "config_set_by_file": "การตั้งค่าคอนฟิกกำลังถูกกำหนดโดยไฟล์คอนฟิก",
     "confirm_delete_library": "คุณแน่ใจว่าอยากลบคลังภาพ {library} หรือไม่?",
@@ -169,7 +171,7 @@
     "note_apply_storage_label_previous_assets": "หากต้องการใช้ Storage Label กับไฟล์ที่อัปโหลดก่อนหน้านี้ ให้รันคำสั่งนี้",
     "note_cannot_be_changed_later": "หมายเหตุ: ไม่สามารถเปลี่ยนภายหลังได้!",
     "notification_email_from_address": "จากที่อยู่",
-    "notification_email_from_address_description": "อีเมลผู้ส่ง อย่างเช่น \"Immich Photo Server <noreply@immich.app>\"",
+    "notification_email_from_address_description": "ที่อยู่อีเมลผู้ส่ง ตัวอย่าง \"Immich Photo Server <noreply@immich.app>\" (กรุณายีนยันว่าสามารถส่งเมลจากที่อยู่นี้ได้)",
     "notification_email_host_description": "ที่อยู่เซิร์ฟเวอร์อีเมล (เช่น smtp.immich.app)",
     "notification_email_ignore_certificate_errors": "ไม่สนใจข้อผิดพลาดเกี่ยวกับใบรับรอง",
     "notification_email_ignore_certificate_errors_description": "ไม่สนใจการยืนยันใบรับรอง TLS ผิดพลาด (ไม่แนะนำ)",
@@ -193,7 +195,7 @@
     "oauth_enable_description": "ล็อกอินผ่าน OAuth",
     "oauth_mobile_redirect_uri": "URI เปลี่ยนเส้นทางบนโทรศัพท์",
     "oauth_mobile_redirect_uri_override": "แทนที่ URI เปลี่ยนเส้นทางบนโทรศัพท์",
-    "oauth_mobile_redirect_uri_override_description": "เปิดเมื่อ 'app.immich:/' เป็น URI ที่เปลี่ยนเส้นทางไม่ถูกต้อง",
+    "oauth_mobile_redirect_uri_override_description": "เปิดเมื่อผู้ให้บริการ OAuth ไม่อนุญาต URI เช่น \"{callback}\"",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "จัดการการตั้งค่าล็อกอินผ่าน OAuth",
     "oauth_settings_more_details": "สำหรับรายละเอียดเพิ่มเติม ให้อ้างถึง<link>เอกสาร</link>",
@@ -202,7 +204,7 @@
     "oauth_storage_quota_claim": "สิทธิ์ที่ใช้อ้างถึงโควต้าพื้นที่จัดเก็บ",
     "oauth_storage_quota_claim_description": "ตั้งโควต้าพื้นที่จัดเก็บของผู้ใช้งานตามสิทธิ์ที่ใช้อ้างถึงโดยอัตโนมัติ",
     "oauth_storage_quota_default": "โควต้าพื้นที่เก็บข้อมูลเริ่มต้น (GiB)",
-    "oauth_storage_quota_default_description": "โควต้าในหน่วย GiB ที่จะใช้เมื่อไม่มีการอ้างสิทธิ์ (ป้อน 0 สำหรับโควต้าไม่จำกัด)",
+    "oauth_storage_quota_default_description": "โควต้าในหน่วย GiB ที่จะใช้เมื่อไม่มีการอ้างสิทธิ์",
     "oauth_timeout": "หมดเวลาการร้องขอ",
     "oauth_timeout_description": "ระยะเวลาหมดเวลาสำหรับการร้องขอ (หน่วยเป็นมิลลิวินาที)",
     "password_enable_description": "ล็อกอินกับอีเมลและรหัสผ่าน",
@@ -242,6 +244,7 @@
     "storage_template_migration_info": "เทมเพลตของการจัดเก็บข้อมูลจะเปลี่ยนตัวอักษรเป็นตัวพิมพ์เล็กทั้งหมด การเปลี่ยนแปลงเทมเพลตจะมีผลกับแอสเซ็ตใหม่เท่านั้น หากต้องการนำเทมเพลตไปใช้กับ Asset ที่อัปโหลดก่อนหน้านี้ ให้รัน <link>{job}</link>.",
     "storage_template_migration_job": "เทมเพลตการ Migration ข้อมูล",
     "storage_template_more_details": "สำหรับรายละเอียดเพิ่มเติมเกี่ยวกับฟีเจอร์นี้ โปรดดูที่ <template-link>Storage Template</template-link> และ <implications-link>ผลกระทบ</implications-link>",
+    "storage_template_onboarding_description_v2": "เมื่อเปิด ฟีเจอร์จะจัดเก็บข้อมูลตามเทมเพลตที่ผู้ใช้กำหนด <link>อ่านเพิ่มเติม</link>",
     "storage_template_path_length": "ขีดจำกัดของความยาวพาธโดยประมาณ: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "เทมเพลตการจัดเก็บข้อมูล",
     "storage_template_settings_description": "จัดการโครงสร้างโฟลเดอร์และชื่อไฟล์ที่อัปโหลด",
@@ -256,7 +259,7 @@
     "template_email_update_album": "อัปเดตเทมเพลตอัลบั้ม",
     "template_email_welcome": "เทมเพลตสำหรับอีเมลต้อนรับ",
     "template_settings": "เทมเพลตการแจ้งเตือน",
-    "template_settings_description": "ปรับแต่งเทมเพลตแจ้งเตือน",
+    "template_settings_description": "ปรับแต่งเทมเพลตการแจ้งเตือน",
     "theme_custom_css_settings": "CSS กําหนดเอง",
     "theme_custom_css_settings_description": "Cascading Style Sheets ช่วยให้ปรับแต่งเค้าโครง Immich ได้",
     "theme_settings": "การตั้งค่าธีม",
@@ -362,7 +365,7 @@
   "advanced_settings_proxy_headers_subtitle": "กำหนด proxy headers ที่ Immich ควรส่งพร้อมกับแต่ละคำขอเครือข่าย",
   "advanced_settings_proxy_headers_title": "พ็อกซี่ เฮดเดอร์",
   "advanced_settings_self_signed_ssl_subtitle": "ข้ามการตรวจสอบใบรับรอง SSL จำเป็นสำหรับใบรับรองแบบ self-signed",
-  "advanced_settings_self_signed_ssl_title": "อนุญาตใบรับรอง SSL แบบ self-signed ",
+  "advanced_settings_self_signed_ssl_title": "อนุญาตใบรับรอง SSL แบบ self-signed",
   "advanced_settings_sync_remote_deletions_subtitle": "บหรือกู้คืนไฟล์บนอุปกรณ์นี้โดยอัตโนมัติเมื่อดำเนินการดังกล่าวผ่านเว็บ",
   "advanced_settings_sync_remote_deletions_title": "ซิงก์การลบจากระยะไกล [คุณสมบัติทดลอง]",
   "advanced_settings_tile_subtitle": "ตั้งค่าผู้ใช้งานขั้นสูง",
@@ -401,6 +404,9 @@
   "album_with_link_access": "อนุญาตให้ทุกคนที่มีลิงก์สามารถดูรูปภาพและผู้คนที่อยู่ในอัลบั้มนี้",
   "albums": "อัลบั้ม",
   "albums_count": "{count, plural, one {{count, number} อัลบั้ม} other {{count, number} อัลบั้ม}}",
+  "albums_default_sort_order": "การจัดเรียงอัลบั้มเริ่มต้น",
+  "albums_default_sort_order_description": "การจัดเรียงแอสเซ็ตเริ่มต้นเมื่อสร้างอัลบั้มใหม่",
+  "albums_feature_description": "กลุ่มของแอสเซ็ตที่สามารถส่งให้ผู้ใช้อื่นได้",
   "all": "ทั้งหมด",
   "all_albums": "อัลบั้มทั้งหมด",
   "all_people": "ทุกคน",
@@ -413,8 +419,8 @@
   "anti_clockwise": "ทวนเข็มนาฬิกา",
   "api_key": "API key",
   "api_key_description": "ค่านี้จะแสดงเพียงครั้งเดียว โปรดคัดลอกก่อนปิดหน้าต่าง",
-  "api_key_empty": "ชื่อคีย์ API ของคุณไม่ควรว่างเปล่า",
-  "api_keys": "API คีย์",
+  "api_key_empty": "ชื่อ API Key ของคุณไม่ควรว่างเปล่า",
+  "api_keys": "API Key",
   "app_bar_signout_dialog_content": "คุณแน่ใจว่าอยากออกจากระบบ",
   "app_bar_signout_dialog_ok": "ใช่",
   "app_bar_signout_dialog_title": "ออกจากระบบ",
@@ -428,7 +434,7 @@
   "archive_size_description": "ตั้งค่าขนาดสูงสุดสำหรับการดาวน์โหลด (GiB)",
   "archived": "เก็บถาวรแล้ว",
   "archived_count": "{count, plural, other {เก็บถาวร # รายการ}}",
-  "are_these_the_same_person": "เป็นคนเดียวกันหรือไม่?",
+  "are_these_the_same_person": "เป็นบุคคลเดียวกันหรือไม่?",
   "are_you_sure_to_do_this": "คุณแน่ใจว่าต้องการทำสิ่งนี้หรือไม่?",
   "asset_action_delete_err_read_only": "ไม่สามารถลบทรัพยากรแบบอ่านอย่างเดียวได้ กำลังข้าม",
   "asset_action_share_err_offline": "ไม่สามารถดึงข้อมูลทรัพยากรออฟไลน์ กำลังข้าม",
@@ -448,24 +454,41 @@
   "asset_list_settings_title": "ตารางรูปภาพ",
   "asset_offline": "สื่อออฟไลน์",
   "asset_offline_description": "ไม่พบทรัพยากรภายนอกนี้ในดิสก์อีกต่อไป โปรดติดต่อผู้ดูแลระบบ Immich ของคุณเพื่อขอความช่วยเหลือ",
+  "asset_restored_successfully": "กู้คืนสื่อสำเร็จ",
   "asset_skipped": "ข้ามแล้ว",
   "asset_skipped_in_trash": "ในถังขยะ",
   "asset_uploaded": "อัปโหลดแล้ว",
   "asset_uploading": "กำลังอัปโหลด…",
+  "asset_viewer_settings_subtitle": "ตั้งค่าการแสดงแกลเลอรี",
   "asset_viewer_settings_title": "ตัวดูทรัพยากร",
   "assets": "สื่อ",
+  "assets_added_count": "เพิ่ม {count, plural, one{# สื่อ} other {# สื่อ}} แล้ว",
   "assets_added_to_album_count": "เพิ่ม {count, plural, one {# asset} other {# assets}} ไปยังอัลบั้ม",
-  "assets_added_to_name_count": "เพิ่ม {count, plural, one {# asset} other {# assets}} ไปยัง {hasName, select, true {<b>{name}</b>} other {new album}}",
+  "assets_cannot_be_added_to_album_count": "ไม่สามารถเพิ่ม {count, plural, one {สื่อ} other {สื่อ}} ไปยังอัลบั้ม",
+  "assets_count": "{count, plural, one { สื่อ} other { สื่อ}}",
+  "assets_deleted_permanently": "{count} สื่อถูกลบอย่างถาวร",
+  "assets_deleted_permanently_from_server": "ลบ {count} สื่อออกจาก Immich อย่างถาวร",
+  "assets_downloaded_failed": "ดาวน์โหลด {count, plural, one {ไฟล์} other {ไฟล์}} ไม่สำเร็จ - {error}",
+  "assets_downloaded_successfully": "ดาวน์โหลด {count, plural, one {ไฟล์} other {ไฟล์}} สำเร็จ",
   "assets_moved_to_trash_count": "ย้าย {count, plural, one {# asset} other {# assets}} ไปยังถังขยะแล้ว",
   "assets_permanently_deleted_count": "ลบ {count, plural, one {# asset} other {# assets}} ทิ้งถาวร",
   "assets_removed_count": "{count, plural, one {# asset} other {# assets}} ถูกลบแล้ว",
+  "assets_removed_permanently_from_device": "นำ {count} สื่อออกจากอุปกรณ์อย่างถาวร",
   "assets_restore_confirmation": "คุณแน่ใจหรือไม่ว่าต้องการกู้คืนสื่อที่ทิ้งทั้งหมด? คุณไม่สามารถย้อนกลับการดำเนินการนี้ได้! โปรดทราบว่าสื่อออฟไลน์ใดๆ ไม่สามารถกู้คืนได้ด้วยวิธีนี้",
   "assets_restored_count": "{count, plural, one {# asset} other {# assets}} คืนค่า",
+  "assets_restored_successfully": "กู้คืน {count} สื่อสำเร็จ",
+  "assets_trashed": "ย้าย {count} สื่อไปยังถังขยะ",
   "assets_trashed_count": "{count, plural, one {# asset} other {# assets}} ถูกลบ",
+  "assets_trashed_from_server": "ย้าย {count} สื่อจาก Immich ไปยังถังขยะ",
   "assets_were_part_of_album_count": "{count, plural, one {Asset was} other {Assets were}} อยู่ในอัลบั้มอยู่แล้ว",
   "authorized_devices": "อุปกรณ์ที่ได้รับอนุญาต",
+  "automatic_endpoint_switching_subtitle": "เชื่อมต่อด้วย LAN ภายในวง Wi-Fi ที่ระบุไว้ และเชื่อมต่อด้วยวิธีอื่นเมื่ออยู่นอก Wi-Fi ที่ระบุไว้",
+  "automatic_endpoint_switching_title": "สลับ URL อัตโนมัติ",
+  "autoplay_slideshow": "เล่นสไลด์โชว์",
   "back": "กลับ",
   "back_close_deselect": "ย้อนกลับ, ปิด, หรือยกเลิกการเลือก",
+  "background_location_permission": "การอนุญาตระบุตำแหน่งพื้นหลัง",
+  "background_location_permission_content": "เพื่อที่จะสลับการเชื่อมต่อขณะที่รันในพื้นหลัง Immich ต้องรู้ตำแหน่งที่แม่ยำตลอดเวลา เพื่อจะสามารถอ่านชื่อ Wi-Fi",
   "backup_album_selection_page_albums_device": "อัลบั้มบนเครื่อง ({count})",
   "backup_album_selection_page_albums_tap": "กดเพื่อรวม กดสองครั้งเพื่อยกเว้น",
   "backup_album_selection_page_assets_scatter": "ทรัพยาการสามารถกระจายไปในหลายอัลบั้ม ดังนั้นอัลบั้มสามารถถูกรวมหรือยกเว้นในกระบวนการสำรองข้อมูล",
@@ -496,15 +519,16 @@
   "backup_controller_page_background_is_on": "การสำรองข้อมูลอัตโนมัติเปิดอยู่",
   "backup_controller_page_background_turn_off": "ปิดบริการเบื้องหลัง",
   "backup_controller_page_background_turn_on": "เปิดบริการเบื้องหลัง",
-  "backup_controller_page_background_wifi": "บน WiFi เท่านั้น",
+  "backup_controller_page_background_wifi": "บน Wi-Fi เท่านั้น",
   "backup_controller_page_backup": "สำรองข้อมูล",
   "backup_controller_page_backup_selected": "ที่เลือก: ",
   "backup_controller_page_backup_sub": "รูปภาพและวิดีโอที่สำรองแล้ว",
   "backup_controller_page_created": "สร้างเมื่อ: {date}",
   "backup_controller_page_desc_backup": "เปิดการสำรองข้อมูลในฉากหน้าเพื่อที่จะอัพโหลดทรัพยากรใหม่ไปยังเซิร์ฟเวอร์เมื่อเปิดแอพ",
-  "backup_controller_page_excluded": "ถูกยกเว้น: ",
+  "backup_controller_page_excluded": "ยกเว้น: ",
   "backup_controller_page_failed": "ล้มเหลว ({count})",
   "backup_controller_page_filename": "ชื่อไฟล์: {filename} [{size}]",
+  "backup_controller_page_id": "ID: {id}",
   "backup_controller_page_info": "ข้อมูลเกี่ยวกับการสำรองข้อมูล",
   "backup_controller_page_none_selected": "ไม่มีที่เลือก",
   "backup_controller_page_remainder": "ที่เหลือ",
@@ -526,7 +550,12 @@
   "backup_manual_success": "สำเร็จ",
   "backup_manual_title": "สถานะอัพโหลด",
   "backup_options_page_title": "ตัวเลือกการสำรองข้อมูล",
+  "backup_setting_subtitle": "ตั้งค่าการอัพโหลดในฉากหน้า และพื้นหลัง",
   "backward": "กลับหลัง",
+  "biometric_auth_enabled": "การพิสูจน์อัตลักษณ์เพื่อยืนยันตัวบุคคลถูกเปิด",
+  "biometric_locked_out": "การพิสูจน์อัตลักษณ์เพื่อยืนยันตัวบุคคลถูกล็อค",
+  "biometric_no_options": "ไม่มีตัวเลือกการพิสูจน์อัตลักษณ์เพื่อยืนยันตัวบุคคล",
+  "biometric_not_available": "ไม่สามารถใช้งานการพิสูจน์อัตลักษณ์เพื่อยืนยันตัวบุคคลได้บนอุปกรณ์นี้",
   "birthdate_saved": "บันทึกวันเกิดแล้ว",
   "birthdate_set_description": "วันที่เกิดจะนำมาใช้ในการคำนวณอายุของบุคคลนี้ในขณะที่ถ่ายรูป",
   "blurred_background": "พื้นหลังแบบเบลอ",
@@ -556,14 +585,19 @@
   "camera_model": "รุ่นกล้อง",
   "cancel": "ยกเลิก",
   "cancel_search": "ยกเลิกการค้นหา",
+  "canceled": "ยกเลิก",
   "cannot_merge_people": "ไม่สามารถรวมกลุ่มคนได้",
   "cannot_undo_this_action": "การกระทำนี้ไม่สามารถย้อนกลับได้!",
   "cannot_update_the_description": "ไม่สามารถอัพเดทรายละเอียดได้",
+  "cast": "แคสต์",
+  "cast_description": "ตั้งค่าปลายทางแคสต์",
   "change_date": "เปลี่ยนวันที่",
+  "change_description": "แก้ไขคำอธิบาย",
+  "change_display_order": "เปลี่ยนลำดับการแสดงผล",
   "change_expiration_time": "เปลี่ยนเวลาหมดอายุ",
   "change_location": "เปลี่ยนตําแหน่ง",
   "change_name": "เปลี่ยนชื่อ",
-  "change_name_successfully": "เปลี่ยนชื่อเรียบร้อยแล้ว",
+  "change_name_successfully": "เปลี่ยนชื่อสำเร็จ",
   "change_password": "เปลี่ยนรหัสผ่าน",
   "change_password_description": "การเข้าสู่ระบบครั้งแรก จำเป็นจต้องเปลี่ยนรหัสผ่านของคุณเพื่อความปลอดภัย โปรดป้อนรหัสผ่านใหม่ด้านล่าง",
   "change_password_form_confirm_password": "ยืนยันรหัสผ่าน",
@@ -574,6 +608,9 @@
   "change_pin_code": "เปลี่ยนรหัสประจำตัว (PIN)",
   "change_your_password": "เปลี่ยนรหัสผ่านของคุณ",
   "changed_visibility_successfully": "เปลี่ยนการมองเห็นเรียบร้อยแล้ว",
+  "check_corrupt_asset_backup": "ตรวจสอบสำรองสื่อที่ผิดปกติ",
+  "check_corrupt_asset_backup_button": "ตรวจสอบ",
+  "check_corrupt_asset_backup_description": "ตรวจสอบเมื่อเชื่อมต่อ Wi-Fi และสื่อทั้งหมดถูกสำรองข้อมูลแล้วเท่านั้น การตรวจสอบอาจใช้เวลาหลายนาที",
   "check_logs": "ตรวจสอบบันทึก",
   "choose_matching_people_to_merge": "เลือกคนที่ตรงกันเพื่อรวมเข้าด้วยกัน",
   "city": "เมือง",
@@ -582,6 +619,14 @@
   "clear_all_recent_searches": "ล้างประวัติการค้นหา",
   "clear_message": "ล้างข้อความ",
   "clear_value": "ล้างค่า",
+  "client_cert_dialog_msg_confirm": "เสร็จ",
+  "client_cert_enter_password": "ใส่รหัสผ่าน",
+  "client_cert_import": "นำเข้า",
+  "client_cert_import_success_msg": "นำเข้าใบรับรองสำเร็จ",
+  "client_cert_invalid_msg": "ใบรับรอง หรือรหัสผ่านไม่ถูกต้อง",
+  "client_cert_remove_msg": "ลบใบรับรองสำเร็จ",
+  "client_cert_subtitle": "รองรับเฉพาะ PKCS12 (.p12, .pfx) เท่านั้น การนำเข้า/ลบใบรับรองสามารถทำได้ก่อนล็อคอินเท่านั้น",
+  "client_cert_title": "ใบรับรอง SSL ไคลเอนต์",
   "clockwise": "ตามเข็มนาฬิกา",
   "close": "ปิด",
   "collapse": "ย่อ",
@@ -602,6 +647,10 @@
   "confirm_keep_this_delete_others": "จะลบทั้งหมดในรายการ และยกเว้นสื่อนี้หรือไม่ คุณแน่ใจใช่ไหมที่ต้องการดำเนินการต่อ?",
   "confirm_new_pin_code": "ยืนยันรหัสประจำตัว (PIN)",
   "confirm_password": "ยืนยันรหัสผ่าน",
+  "confirm_tag_face": "คุณต้องการแท็กใบหน้านี้ด้วยชื่อ {name} หรือไม่",
+  "confirm_tag_face_unnamed": "คุณต้องการแท็กใบหน้านี้หรือไม่",
+  "connected_device": "อุปกรณ์ที่เชื่อมต่อแล้ว",
+  "connected_to": "เชื่อมต่อไปยัง",
   "contain": "มีอยู่",
   "context": "บริบท",
   "continue": "ต่อไป",
@@ -610,6 +659,7 @@
   "control_bottom_app_bar_delete_from_local": "ลบจากเรื่อง",
   "control_bottom_app_bar_edit_location": "แก้ไขตำแหน่ง",
   "control_bottom_app_bar_edit_time": "แก้ไขวันและเวลา",
+  "control_bottom_app_bar_share_link": "แชร์ลิงค์",
   "control_bottom_app_bar_share_to": "แชร์ให้",
   "control_bottom_app_bar_trash_from_immich": "ย้ายเข้าถังขยะ",
   "copied_image_to_clipboard": "คัดลอกภาพไปยังคลิปบอร์ดแล้ว",
@@ -631,6 +681,7 @@
   "create_link": "สร้างลิงก์",
   "create_link_to_share": "สร้างลิงก์เพื่อแชร์",
   "create_link_to_share_description": "ผู้ที่มีลิงก์ สามารถดูรูปที่เลือกได้",
+  "create_new": "สร้างใหม่",
   "create_new_person": "สร้างคนใหม่",
   "create_new_person_hint": "กำหนดสื่อที่เลือกให้กับคนใหม่",
   "create_new_user": "สร้างผู้ใช้งานใหม่",
@@ -640,9 +691,12 @@
   "create_tag_description": "สร้างแท็กใหม่ สำหรับแท็กที่ซ้อนกัน โปรดป้อนเส้นทางทั้งหมดของแท็ก รวมถึงเครื่องหมายทับ",
   "create_user": "สร้างผู้ใช้",
   "created": "สร้างแล้ว",
+  "created_at": "สร้างเมื่อ",
+  "crop": "ครอป",
   "curated_object_page_title": "สิ่งของ",
   "current_device": "อุปกรณ์ปัจจุบัน",
   "current_pin_code": "รหัสประจำตัว (PIN) ปัจจุบัน",
+  "current_server_address": "ที่อยู่เซิร์ฟเวอร์ปัจจุบัน",
   "custom_locale": "ปรับภาษาท้องถิ่นเอง",
   "custom_locale_description": "ใช้รูปแบบวันที่และตัวเลขจากภาษาและขอบเขต",
   "daily_title_text_date": "E dd MMM",
@@ -694,6 +748,7 @@
   "disallow_edits": "ไม่อนุญาตให้แก้ไข",
   "discord": "ดิสคอร์ด",
   "discover": "ค้นพบ",
+  "discovered_devices": "ค้นหาอุปกรณ์",
   "dismiss_all_errors": "ปฏิเสธข้อผิดพลาดทั้งหมด",
   "dismiss_error": "ปฏิเสธข้อผิดพลาด",
   "display_options": "ตัวเลือกการแสดง",
@@ -704,12 +759,25 @@
   "documentation": "เอกสาร",
   "done": "ดำเนินการสำเร็จ",
   "download": "ดาวน์โหลด",
+  "download_canceled": "การดาวน์โหลดยกเลิก",
+  "download_complete": "การดาวน์โหลดเสร็จสิ้น",
+  "download_enqueue": "การดาวน์โหลดอยู่ในคิว",
+  "download_error": "ดาวน์โหลดผิดพลาด",
+  "download_failed": "ดาวน์โหลดไม่สำเร็จ",
+  "download_finished": "ดาวน์โหลดเสร็จสิ้น",
   "download_include_embedded_motion_videos": "รวมวิดีโอที่ฝังอยู่ในภาพเคลื่อนไหว",
   "download_include_embedded_motion_videos_description": "รวมวิดีโอที่ฝังอยู่ในภาพเคลื่อนไหวเมื่อดาวน์โหลดอัลบั้ม",
+  "download_notfound": "ไม่พบดาวน์โหลด",
+  "download_paused": "หยุดการดาวน์โหลดชั่วคราว",
   "download_settings": "การตั้งค่าการดาวน์โหลด",
   "download_settings_description": "จัดการการตั้งค่าการดาวน์โหลด",
+  "download_started": "เริ่มการดาวน์โหลด",
+  "download_sucess": "ดาวน์โหลดสำเร็จ",
+  "download_sucess_android": "สื่อถูกดาวน์โหลดไปยัง DCIM/Immich",
+  "download_waiting_to_retry": "รอลองใหม่",
   "downloading": "กำลังดาวน์โหลด",
   "downloading_asset_filename": "กำลังดาวน์โหลด {filename}",
+  "downloading_media": "กำลังดาวน์โหลดสื่อ",
   "drop_files_to_upload": "วางไฟล์ในช่องอัปโหลด",
   "duplicates": "รายการที่ซ้ำกัน",
   "duplicates_description": "แก้ไขแต่ละกลุ่มโดยระบุว่ากลุ่มใดซ้ำกันหากมี",
@@ -719,6 +787,8 @@
   "edit_avatar": "แก้ไขตัวละคร",
   "edit_date": "แก้ไขวันที่",
   "edit_date_and_time": "แก้ไขวันที่และเวลา",
+  "edit_description": "แก้ไขคำอธิบาย",
+  "edit_description_prompt": "โปรดเลื่อกคำอธิบายใหม่",
   "edit_exclusion_pattern": "แก้ไขข้อยกเว้น",
   "edit_faces": "แก้ไขหน้า",
   "edit_import_path": "แก้ไขพาธนําเข้า",
@@ -739,15 +809,24 @@
   "editor_crop_tool_h2_aspect_ratios": "อัตราส่วนภาพ",
   "editor_crop_tool_h2_rotation": "การหมุน",
   "email": "อีเมล",
+  "email_notifications": "แจ้งเตือนผ่านอีเมล",
+  "empty_folder": "โฟลเดอร์นี้ว่างเปล่า",
   "empty_trash": "ทิ้งจากถังขยะ",
   "empty_trash_confirmation": "คุณแน่ใจหรือไม่ว่าต้องการล้างถังขยะ การดำเนินการนี้จะลบทรัพยากรทั้งหมดในถังขยะออกจาก Immich อย่างถาวร\nคุณไม่สามารถย้อนกลับการดำเนินการนี้ได้!",
   "enable": "เปิดใช้งาน",
+  "enable_biometric_auth_description": "ใส่พินเพื่อเปิดการพิสูจน์อัตลักษณ์เพื่อยืนยันตัวบุคคล",
   "enabled": "เปิดใช้งาน",
   "end_date": "วันสิ้นสุด",
-  "enter_wifi_name": "Enter WiFi name",
+  "enqueued": "รอคิว",
+  "enter_wifi_name": "ใส่ชื่อ Wi-Fi",
+  "enter_your_pin_code": "ใส่พินโค้ด",
+  "enter_your_pin_code_subtitle": "ใส่พินโค้ดเพื่อเข้าถึงโฟลเดอร์ล็อค",
   "error": "เกิดข้อผิดพลาด",
+  "error_change_sort_album": "เปลี่ยนการเรียงลำดับอัลบั้มไม่สำเร็จ",
   "error_delete_face": "เกิดเออเรอร์ ไม่สามารถลบใบหน้าออกได้",
   "error_loading_image": "เกิดข้อผิดพลาดระหว่างโหลดภาพ",
+  "error_saving_image": "เกิดข้อผิดพลาดระหว่างเซฟภาพ: {error}",
+  "error_tag_face_bounding_box": "การแท็กใบหน้าผิดพลาด - ไม่สามารถตีกรอบใบหน้าได้",
   "error_title": "เกิดข้อผิดพลาด",
   "errors": {
     "cannot_navigate_next_asset": "ไม่สามารถเปลี่ยนเส้นทางได้",
@@ -755,7 +834,7 @@
     "cant_apply_changes": "เกิดข้อผิดพลาดในการเปลี่ยนแปลง",
     "cant_change_activity": "Can't {enabled, select, true {disable} other {enable}} activity",
     "cant_change_asset_favorite": "ไม่สามารถเปลี่ยนสื่อที่ชื่นชอบได้",
-    "cant_change_metadata_assets_count": "Can't change metadata of {count, plural, one {# asset} other {# assets}}",
+    "cant_change_metadata_assets_count": "ไม่สามารถแก้ไขข้อมูล metadata ของ {count, plural, one {# สื่อ} other {# สื่อ}}",
     "cant_get_faces": "เกิดข้อผิดพลาดในการเรียกดูใบหน้า",
     "cant_get_number_of_comments": "ไม่สามารถเรียกดูจำนวนความคิดเห็นได้",
     "cant_search_people": "ไม่สามารถค้นหาบุคคลคนได้",
@@ -775,10 +854,12 @@
     "failed_to_keep_this_delete_others": "ไม่สามารถเก็บหรือลบได้",
     "failed_to_load_asset": "ไม่สามารถโหลดสื่อได้",
     "failed_to_load_assets": "ไม่สามารถโหลดสื่อได้",
+    "failed_to_load_notifications": "โหลดการแจ้งเตือนไม่สำเร็จ",
     "failed_to_load_people": "ไม่สามารถโหลดบุคคลได้",
     "failed_to_remove_product_key": "ไม่สามารถลบ product key ได้",
     "failed_to_stack_assets": "Failed to stack assets",
     "failed_to_unstack_assets": "Failed to un-stack assets",
+    "failed_to_update_notification_status": "อัพเดทสถานะการแจ้งเตือนไม่สำเร็จ",
     "import_path_already_exists": "พาธนำเข้านี้มีอยู่แล้ว",
     "incorrect_email_or_password": "อีเมลหรือรหัสผ่านไม่ถูกต้อง",
     "paths_validation_failed": "การตรวจสอบ {paths, plural, one {# path} other {# paths}} ล้มเหลว",
@@ -795,6 +876,7 @@
     "unable_to_archive_unarchive": "ไม่สามารถทำรายการ {archived, select, true {archive} other {unarchive}}",
     "unable_to_change_album_user_role": "ไม่สามารถเปลี่ยนบทบาทผู้ใช้ในอัลบั้มได้",
     "unable_to_change_date": "ไม่สามารถเปลี่ยนวันที่ได้",
+    "unable_to_change_description": "ไม่สามารถเปลี่ยนคำอธิบาย",
     "unable_to_change_favorite": "ไม่สามารถเปลี่ยนแปลงสื่อรายการโปรดได้",
     "unable_to_change_location": "ไม่สามารถเปลี่ยนตําแหน่งได้",
     "unable_to_change_password": "ไม่สามารถเปลี่ยนรหัสผ่านได้",
@@ -838,6 +920,7 @@
     "unable_to_remove_partner": "ไม่สามารถลบคู่หูได้",
     "unable_to_remove_reaction": "ไม่สามารถลบ reaction ได้",
     "unable_to_reset_password": "ไม่สามารถตั้งรหัสผ่านใหม่ได้",
+    "unable_to_reset_pin_code": "ไม่สามารถรีเซ็ตพินโค้ด",
     "unable_to_resolve_duplicate": "ไม่สามารถแก้ไขของซ้ำได้",
     "unable_to_restore_assets": "ไม่สามารถเรียกคืนสื่อได้",
     "unable_to_restore_trash": "ไม่สามารถเรียกคืนถังขยะได้",
@@ -865,11 +948,15 @@
     "unable_to_update_user": "ไม่สามารถอัพเดทผู้ใช้ได้",
     "unable_to_upload_file": "ไม่สามารถอัปโหลดได้"
   },
+  "exif": "Exif",
   "exif_bottom_sheet_description": "เพิ่มคำอธิบาย",
   "exif_bottom_sheet_details": "รายละเอียด",
   "exif_bottom_sheet_location": "ตำแหน่ง",
   "exif_bottom_sheet_people": "คน",
   "exif_bottom_sheet_person_add_person": "เพิ่มชื่อ",
+  "exif_bottom_sheet_person_age_months": "อายุ {months} เดือน",
+  "exif_bottom_sheet_person_age_year_months": "อายุ 1 ปี {months} เดือน",
+  "exif_bottom_sheet_person_age_years": "อายุ {years} ปี",
   "exit_slideshow": "ออกจากการนำเสนอ",
   "expand_all": "ขยายทั้งหมด",
   "experimental_settings_new_asset_list_subtitle": "กำลังพัฒนา",
@@ -886,9 +973,13 @@
   "extension": "ส่วนต่อขยาย",
   "external": "ภายนอก",
   "external_libraries": "ภายนอกคลังภาพ",
-  "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",
+  "external_network": "การเชื่อมต่อภายนอก",
+  "external_network_sheet_info": "เมื่อไม่ได้เชื่อมต่อ Wi-Fi ที่เลือกไว้ แอพจะเชื่อมต่อเซิร์ฟเวอร์ผ่าน URL ด้านล่างตามลำดับ",
   "face_unassigned": "ไม่กำหนดมอบหมาย",
+  "failed": "ล้มเหลว",
+  "failed_to_authenticate": "การยืนยันตัวตนไม่สำเร็จ",
   "failed_to_load_assets": "เกิดข้อผิดพลาดในการโหลดสื่อ",
+  "failed_to_load_folder": "โหลดโฟลเดอร์ไม่สำเร็จ",
   "favorite": "รายการโปรด",
   "favorite_or_unfavorite_photo": "โปรดหรือไม่โปรดภาพ",
   "favorites": "รายการโปรด",
@@ -900,18 +991,26 @@
   "file_name_or_extension": "นามสกุลหรือชื่อไฟล์",
   "filename": "ชื่อไฟล์",
   "filetype": "ชนิดไฟล์",
+  "filter": "ตัวกรอง",
   "filter_people": "กรองผู้คน",
+  "filter_places": "กรองสถานที่",
   "find_them_fast": "ค้นหาโดยชื่ออย่างรวดเร็ว",
   "fix_incorrect_match": "แก้ไขการจับคู่ที่ไม่ถูกต้อง",
+  "folder": "โฟลเดอร์",
+  "folder_not_found": "ไม่พบโฟลเดอร์",
   "folders": "โฟล์เดอร์",
   "folders_feature_description": "การเรียกดูมุมมองโฟลเดอร์สำหรับภาพถ่ายและวิดีโอในระบบไฟล์",
   "forward": "ไปข้างหน้า",
+  "gcast_enabled": "Google Cast",
+  "gcast_enabled_description": "ฟีเจอร์นี้ต้องโหลดทรัพยากรจาก Google เพื่อทำงาน",
   "general": "ทั่วไป",
   "get_help": "ขอความช่วยเหลือ",
+  "get_wifiname_error": "ไม่สามารถรับชื่อ Wi-Fi กรุณายืนยันการให้อนุญาตแอพ และยืนยันว่า Wi-Fi เชื่อมต่ออยู่",
   "getting_started": "เริ่มต้นใช้งาน",
   "go_back": "กลับ",
   "go_to_folder": "ไปที่โฟล์เดอร์",
   "go_to_search": "กลับไปยังการค้นหา",
+  "grant_permission": "ให้อนุญาต",
   "group_albums_by": "จัดกลุ่มอัลบั้มตาม",
   "group_country": "จัดเรียงกลุ่มตามประเทศ",
   "group_no": "ไม่จัดกลุ่ม",
@@ -921,6 +1020,11 @@
   "haptic_feedback_switch": "เปิดการตอบสนองแบบสัมผัส",
   "haptic_feedback_title": "การตอบสนองแบบสัมผัส",
   "has_quota": "เหลือพื้นที่",
+  "header_settings_add_header_tip": "เพิ่ม Header",
+  "header_settings_field_validator_msg": "ค่าต้องไม่ว่างเปล่า",
+  "header_settings_header_name_input": "ชื่อ Header",
+  "header_settings_header_value_input": "ค่า Header",
+  "headers_settings_tile_title": "ปรับแต่ง proxy headers",
   "hi_user": "สวัสดีคุณ {name} {email}",
   "hide_all_people": "ซ่อนบุคคลทั้งหมด",
   "hide_gallery": "ซ่อนคลังภาพ",
@@ -929,22 +1033,28 @@
   "hide_person": "ซ่อนบุคคล",
   "hide_unnamed_people": "ซ่อนบุคคลที่ไม่ได้ระบุชื่อ",
   "home_page_add_to_album_conflicts": "เพิ่ม {added} ทรัพยากรเข้าอัลบั้ม {album}. {failed} ทรัพยากรอยู่ในอัลบั้มอยู่แล้ว",
-  "home_page_add_to_album_err_local": " ยังไม่สามารถเพิ่มทรัพยากรบนเครื่องเข้าอัลบั้ม กำลังข้าม",
+  "home_page_add_to_album_err_local": "ยังไม่สามารถเพิ่มสื่อบนอุปกรณ์เข้าอัลบั้ม ข้าม",
   "home_page_add_to_album_success": "เพิ่มทรัพยากร {added} เข้าอัลบั้ม {album}",
-  "home_page_album_err_partner": "ยังไม่สามารถเพิ่มทรัพยากรของพันธมิตรได้ กำลังข้าม",
+  "home_page_album_err_partner": "ยังไม่สามารถเพิ่มสื่อของคู่หูได้ กำลังข้าม",
   "home_page_archive_err_local": "ยังไม่สามารถเก็บถาวรได้ กำลังข้าม",
-  "home_page_archive_err_partner": "ไม่สามารถเก็บทรัพยากรของพันธมิตรได้ กำลังข้าม",
+  "home_page_archive_err_partner": "ไม่สามารถเก็บสื่อของคู่หูได้ กำลังข้าม",
   "home_page_building_timeline": "กำลังสร้าง timeline",
-  "home_page_delete_err_partner": "ไม่สามารถลบทรัพยากรของพันธมิตรได้ กำลังข้าม",
+  "home_page_delete_err_partner": "ไม่สามารถลบสื่อของคู่ได้ กำลังข้าม",
   "home_page_delete_remote_err_local": "ทรัพยากรบนเครื่องอยู่ในลบจากรีโมท กำลังข้าม",
   "home_page_favorite_err_local": "ยังไม่สามารถตั้งทรัพยากรบนเครื่องเป็นรายการโปรด กำลังข้าม",
-  "home_page_favorite_err_partner": "ยังไม่สามารถเพิ่มทรัพยากรของพันธมิตรในรายการโปรดได้ กำลังข้าม",
+  "home_page_favorite_err_partner": "ยังไม่สามารถเพิ่มสื่อของคู่หูในรายการโปรดได้ กำลังข้าม",
   "home_page_first_time_notice": "ถ้าครั้งนี้เป็นครั้งแรกที่ใช้แอปนี้ กรุณาเลือกอัลบั้มที่จะสำรองข้อมูล ไทม์ไลน์จะได้เพิ่มรูปภาพและวิดีโอที่อยู่ในอัลบั้ม",
+  "home_page_locked_error_local": "ไม่สามารถย้ายสื่อบนอุปกรณ์ไปยังโฟลเดอร์ล็อค ข้าม",
+  "home_page_locked_error_partner": "ยังไม่สามารถเพิ่มสื่อของคู่หูไปยังโฟลเดอร์ล็อคได้ กำลังข้าม",
   "home_page_share_err_local": "ไม่สามารถแชร์ผ่านลิงค์ได้ กำลังข้าม",
   "home_page_upload_err_limit": "สามารถอัพโหลดได้มากสุดครั้งละ 30 ทรัพยากร กำลังข้าม",
   "host": "โฮสต์",
   "hour": "ชั่วโมง",
+  "id": "ไอดี",
+  "ignore_icloud_photos": "ข้ามภาพบน iCloud",
+  "ignore_icloud_photos_description": "ภาพที่ถูกเก็บบน iCloud จะไม่ถูกอัพโหลดขึ้น Immich",
   "image": "รูปภาพ",
+  "image_alt_text_date": "{isVideo, select, true {วิดีโอ} other {รูปภาพ}}ถูกถ่ายเมื่อ {date}",
   "image_alt_text_date_1_person": "{isVideo, select, true {Video} other {Image}} ถ่ายกับ {person1} วันที่ {date}",
   "image_alt_text_date_2_people": "{isVideo, select, true {Video} other {Image}} ถ่ายกับ {person1} และ {person2} วันที่ {date}",
   "image_alt_text_date_3_people": "{isVideo, select, true {Video} other {Image}} ถ่ายกับ {person1}, {person2},และ {person3} วันที่ {date}",
@@ -954,6 +1064,7 @@
   "image_alt_text_date_place_2_people": "{isVideo, select, true {Video} other {Image}} ถ่ายใน {city}, {country} กับ {person1} และ {person2} วันที่ {date}",
   "image_alt_text_date_place_3_people": "{isVideo, select, true {Video} other {Image}} ถ่ายใน {city}, {country} กับ {person1}, {person2},และ {person3} วันที่ {date}",
   "image_alt_text_date_place_4_or_more_people": "{isVideo, select, true {Video} other {Image}} ถ่ายใน {city}, {country} กับ {person1}, {person2}, และ {additionalCount, number} ในวันที่ {date}",
+  "image_saved_successfully": "รูปภาพถูกเซฟ",
   "image_viewer_page_state_provider_download_started": "ดาวน์โหลดเริ่มต้น",
   "image_viewer_page_state_provider_download_success": "ดาวน์โหลดสำเร็จ",
   "image_viewer_page_state_provider_share_error": "แชร์ผิดพลาด",
@@ -974,8 +1085,16 @@
     "night_at_midnight": "ทุกเที่ยงคืน",
     "night_at_twoam": "ทุกวันเวลาตี 2"
   },
+  "invalid_date": "วันที่ไม่ถูกต้อง",
+  "invalid_date_format": "รูปแบบวันที่ไม่ถูกต้อง",
   "invite_people": "เชิญผู้คน",
   "invite_to_album": "เชิญเข้าอัลบั้ม",
+  "ios_debug_info_fetch_ran_at": "รับข้อมูลเมื่อ {dateTime}",
+  "ios_debug_info_last_sync_at": "ซิงค์ล่าสุด {dateTime}",
+  "ios_debug_info_no_processes_queued": "ไม่มีคิวในพื้นหลัง",
+  "ios_debug_info_no_sync_yet": "ยังไม่มีงานซิงค์รันในพื้นหลัง",
+  "ios_debug_info_processes_queued": "{count} โพรเซสรอคิวในพื้นหลัง",
+  "ios_debug_info_processing_ran_at": "โพรเซสรันเมื่อ {dateTime}",
   "items_count": "{count, plural, one {# รายการ} other {#รายการ}}",
   "jobs": "งาน",
   "keep": "เก็บ",
@@ -984,6 +1103,9 @@
   "kept_this_deleted_others": "เก็บเนื้อหานี้และลบ {count, plural, one {# Asset} other {# Asset}}",
   "keyboard_shortcuts": "ปุ่มพิมพ์ลัด",
   "language": "ภาษา",
+  "language_no_results_subtitle": "กรุณาปรับเปลี่ยนคำค้นหา",
+  "language_no_results_title": "ไม่พบภาษา",
+  "language_search_hint": "ค้นหาภาษา...",
   "language_setting_description": "เลือกภาษาที่ต้องการ",
   "last_seen": "เห็นล่าสุด",
   "latest_version": "เวอร์ชันล่าสุด",
@@ -1009,14 +1131,21 @@
   "list": "รายการ",
   "loading": "กำลังโหลด",
   "loading_search_results_failed": "โหลดผลการค้นหาล้มเหลว",
-  "location_permission_content": "In order to use the auto-switching feature, Immich needs precise location permission so it can read the current WiFi network's name",
+  "local_asset_cast_failed": "ไม่สามารถแคสสื่อที่ไม่ถูกอัพโหลดไปยังเซิร์ฟเวอร์",
+  "local_network": "เครือข่ายระยะใกล้",
+  "local_network_sheet_info": "แอพจะทำการเชื่อมต่อไปยังเซิร์ฟเวอร์ผ่าน URL นี้เมื่อเชื่อต่อกับ Wi-Fi ที่เลือกไว้",
+  "location_permission": "การอนุญาตตำแหน่ง",
+  "location_permission_content": "เพื่อใช้ฟีเจอร์การสับโดยอัตโนมัติ Immich ต้องการการอนุญาตเข้าถึงต่ำแหน่งที่แม่นยำเพื่ออ่านชื่อ Wi-Fi ที่เชื่อมต่ออยู่",
   "location_picker_choose_on_map": "เลือกบนแผนที่",
   "location_picker_latitude_error": "กรุณาเพิ่มละติจูตที่ถูกต้อง",
   "location_picker_latitude_hint": "เพิ่มละติจูตตรงนี้",
   "location_picker_longitude_error": "กรุณาเพิ่มลองจิจูตที่ถูกต้อง",
   "location_picker_longitude_hint": "เพิ่มลองจิจูตตรงนี้",
+  "lock": "ล็อค",
+  "locked_folder": "โฟลเดอร์ล็อค",
   "log_out": "ออกจากระบบ",
   "log_out_all_devices": "ให้ทุกอุปกรณ์ออกจากระบบทั้งหมด",
+  "logged_in_as": "{user} กำลังล็อคอิน",
   "logged_out_all_devices": "ออกจากระบบทั้งหมดแล้ว",
   "logged_out_device": "ออกจากระบบแล้ว",
   "login": "เข้าสู่ระบบ",
@@ -1079,7 +1208,7 @@
   "map_settings_date_range_option_years": "{years} ปีผ่านมา",
   "map_settings_dialog_title": "ตั้งค่าแผนที่",
   "map_settings_include_show_archived": "รวมเก็บถาวร",
-  "map_settings_include_show_partners": "รามพันธมิตร",
+  "map_settings_include_show_partners": "รวมคู่หู",
   "map_settings_only_show_favorites": "แสดงรายการโปรดเท่านั้น",
   "map_settings_theme_settings": "ธีมแผนที่",
   "map_zoom_to_see_photos": "ซูมออกเพื่อดูรูป",
@@ -1106,12 +1235,17 @@
   "model": "โมเดล",
   "month": "เดือน",
   "more": "เพิ่มเติม",
+  "move": "ย้าย",
+  "move_off_locked_folder": "ย้ายออกจากโฟลเดอร์ล็อค",
+  "move_to_locked_folder": "ย้ายไปโฟลเดอร์ล็อค",
   "moved_to_trash": "ทิ้งลงถังขยะแล้ว",
   "multiselect_grid_edit_date_time_err_read_only": "ไม่สามารถแก้ไขวันที่ทรัพยากรแบบอ่านอย่างเดียว กำลังข้าม",
   "multiselect_grid_edit_gps_err_read_only": "ไม่สามารถแก้ตำแหน่งของทรัพยากรแบบอ่านอย่างเดียว กำลังข้าม",
   "my_albums": "อัลบั้มของฉัน",
   "name": "ชื่อ",
   "name_or_nickname": "ชื่อหรือชื่อเล่น",
+  "networking_settings": "การเชื่อมต่อ",
+  "networking_subtitle": "ตั้งค่าปลายทางเซิร์ฟเวอร์",
   "never": "ไม่เคย",
   "new_album": "อัลบั้มใหม่",
   "new_api_key": "สร้าง API คีย์ใหม่",
@@ -1155,7 +1289,7 @@
   "ok": "ตกลง",
   "oldest_first": "เรียงเก่าสุดก่อน",
   "onboarding": "การเริ่มต้นใช้งาน",
-  "onboarding_privacy_description": "คุณลักษณะ (ไม่จำเป็น) ต่อไปนี้ต้องอาศัยบริการภายนอก และสามารถปิดใช้งานได้ตลอดเวลาในการตั้งค่าการดูแลระบบ",
+  "onboarding_privacy_description": "ฟีเจอร์ (ตัวเลือก) ต่อไปนี้ต้องอาศัยบริการภายนอก และสามารถปิดใช้งานได้ตลอดเวลาในการตั้งค่าการ",
   "onboarding_theme_description": "เลือกธีมสี คุณสามารถเปลี่ยนแปลงได้ในภายหลังในการตั้งค่าของคุณ",
   "onboarding_welcome_user": "ยินดีต้อนรับคุณ {user}",
   "online": "ออนไลน์",
@@ -1172,20 +1306,20 @@
   "other_variables": "ตัวแปรอื่น",
   "owned": "เป็นเจ้าของ",
   "owner": "เจ้าของ",
-  "partner": "พาร์ทเนอร์",
+  "partner": "คู่หู",
   "partner_can_access": "{partner} สามารถเข้าถึง",
   "partner_can_access_assets": "รูปภาพและวิดีโอทั้งหมดยกเว้นที่อยู่ในเก็บถาวรและถูกลบทิ้ง",
   "partner_can_access_location": "ตำแหน่งที่รูปถูกถ่าย",
   "partner_list_user_photos": "รูปภาพของ {user}",
   "partner_list_view_all": "ดูทั้งหมด",
-  "partner_page_empty_message": "รูปภาพของคุณยังไม่ถูกแชร์กับพันธมิตร",
+  "partner_page_empty_message": "รูปภาพของคุณยังไม่ถูกแชร์กับคู่หู",
   "partner_page_no_more_users": "ไม่มีผู้ใช้งานให้เพิ่ม",
-  "partner_page_partner_add_failed": "การเพิ่มพันธมิตรล้มเหลว",
-  "partner_page_select_partner": "เลือกพันธมิตร",
+  "partner_page_partner_add_failed": "การเพิ่มคู่หูล้มเหลว",
+  "partner_page_select_partner": "เลือกคู่หู",
   "partner_page_shared_to_title": "แชร์กับ",
   "partner_page_stop_sharing_content": "{partner} จะไม่สามารถเข้าถึงรูปภาพของคุณ",
-  "partner_sharing": "แชร์สำหรับพาร์ทเนอร์",
-  "partners": "พาร์ทเนอร์",
+  "partner_sharing": "แชร์สำหรับคู่หู",
+  "partners": "คู่หู",
   "password": "รหัสผ่าน",
   "password_does_not_match": "รหัสผ่านไม่ตรงกัน",
   "password_required": "จำเป็นต้องมีรหัสผ่าน",
@@ -1276,7 +1410,7 @@
   "purchase_lifetime_description": "ซื้อตลอดชีพ",
   "purchase_option_title": "ตัวเลือกการซื้อ",
   "purchase_panel_info_1": "ทางทีม Immich ต้องใช้เวลาและความพยายามอย่างมากในการพัฒนาระบบนี้ขึ้นมา และเรามีวิศวกรที่ทำงานเต็มเวลาเพื่อพัฒนาให้ดีที่สุดเท่าที่จะทำได้ ภารกิจของเราคือการทำให้ซอฟต์แวร์โอเพ่นซอร์สและแนวทางปฏิบัติทางธุรกิจที่ถูกต้องตามจริยธรรมกลายเป็นแหล่งรายได้ที่ยั่งยืนสำหรับนักพัฒนา และสร้างระบบนิเวศที่เคารพความเป็นส่วนตัวพร้อมทางเลือกอื่นที่เป็นรูปธรรมแทนบริการคลาวด์ที่เอารัดเอาเปรียบ",
-  "purchase_panel_info_2": "เนื่องจากเราให้คำมั่นว่า จะไม่เพิ่มระบบชำระเงินในระบบของเรา ดังนั้นการซื้อครั้งนี้จะไม่ทำให้คุณได้รับฟีเจอร์เพิ่มเติมใน Immich เป็นพิเศษ เราอาศัยผู้คนแบบท่านในการสนับสนุนการพัฒนาอย่างต่อเนื่องของ Immich",
+  "purchase_panel_info_2": "เนื่องจากเราให้คำมั่นว่า จะไม่เพิ่มระบบชำระเงินในระบบของเรา ดังนั้นการซื้อครั้งนี้จะไม่ทำให้คุณได้รับฟีเจอร์เพิ่มเติมใน Immich เป็นพิเศษ เราอาศัยผู้คนแบบคุณในการสนับสนุนการพัฒนาอย่างต่อเนื่องของ Immich",
   "purchase_panel_title": "สนับสนุนโครงการนี้",
   "purchase_per_server": "ต่อเซิร์ฟเวอร์",
   "purchase_per_user": "ต่อผู้ใช้งาน",
@@ -1421,6 +1555,7 @@
   "select_keep_all": "เลือกเก็บทั้งหมด",
   "select_library_owner": "เลือกเจ้าของคลังภาพ",
   "select_new_face": "เลือกใบหน้าใหม่",
+  "select_person_to_tag": "เลือกบุคคล",
   "select_photos": "เลือกรูปภาพ",
   "select_trash_all": "เลือกในถังขยะทั้งหมด",
   "select_user_for_sharing_page_err_album": "สร้างอัลบั้มล้มเหลว",
@@ -1428,12 +1563,14 @@
   "selected_count": "{count, plural, other {# เลือกแล้ว}}",
   "send_message": "ส่งข้อความ",
   "send_welcome_email": "ส่งอีเมลต้อนรับ",
+  "server_endpoint": "ปลายทางเซิร์ฟเวอร์",
   "server_info_box_app_version": "เวอร์ชันแอพ",
   "server_info_box_server_url": "URL เซิร์ฟเวอร์",
   "server_offline": "Server ออฟไลน์",
   "server_online": "Server ออนไลน์",
+  "server_privacy": "ความเป็นส่วนตัวเซิร์ฟเวอร์",
   "server_stats": "สถิติเซิร์ฟเวอร์",
-  "server_version": "เวอร์ชันของ Server",
+  "server_version": "เวอร์ชันของเซิร์ฟเวอร์",
   "set": "ตั้ง",
   "set_as_album_cover": "ตั้งเป็นภาพปกอัลบั้ม",
   "set_as_featured_photo": "ตั้งเป็นรูปสำคัญ",
@@ -1518,7 +1655,7 @@
   "sharing_page_empty_list": "รายการว่างเปล่า",
   "sharing_sidebar_description": "แสดงลิงก์ที่แชร์ในแถบด้านข้าง",
   "sharing_silver_appbar_create_shared_album": "อัลบั้มที่แชร์ใหม่",
-  "sharing_silver_appbar_share_partner": "แชร์กับพันธมิตร",
+  "sharing_silver_appbar_share_partner": "แชร์กับคู่หู",
   "shift_to_permanent_delete": "กด ⇧ to สำหรับลบสื่อถาวร",
   "show_album_options": "แสดงตัวเลือกอัลบั้ม",
   "show_albums": "แสดงอัลบั้ม",
@@ -1570,7 +1707,7 @@
   "status": "สถานะ",
   "stop_motion_photo": "ภาพวัตถุเคลื่อนไหว",
   "stop_photo_sharing": "หยุดแชร์รูปภาพ?",
-  "stop_photo_sharing_description": "{partner}จะไม่สามารถเข้าถึงรูปของคุณได้อีก",
+  "stop_photo_sharing_description": "{partner} จะไม่สามารถเข้าถึงรูปของคุณได้อีก",
   "stop_sharing_photos_with_user": "หยุดการแชร์รูปภาพของคุณกับผู้ใช้นี้",
   "storage": "พื้นที่จัดเก็บ",
   "storage_label": "เนื้อที่จัดเก็บ",
@@ -1644,6 +1781,7 @@
   "unselect_all": "ยกเลิกการเลือกทั้งหมด",
   "unstack": "หยุดซ้อน",
   "up_next": "ต่อไป",
+  "updated_at": "อัพเดท",
   "updated_password": "รหัสผ่านเปลี่ยนแล้ว",
   "upload": "อัปโหลด",
   "upload_concurrency": "อัปโหลดพร้อมกัน",
@@ -1653,7 +1791,9 @@
   "upload_status_errors": "ข้อผิดพลาด",
   "upload_status_uploaded": "อัปโหลดแล้ว",
   "upload_success": "อัปโหลดสำเร็จ, รีเฟรชหน้านี้ใหม่คุณจะเห็นสื่อที่เพิ่มล่าสุด",
+  "uploading": "กำลังอัพโหลด",
   "usage": "การใช้งาน",
+  "use_biometric": "ใช้การพิสูจน์อัตลักษณ์",
   "use_custom_date_range": "ใช้การปรับแต่งช่วงเวลา",
   "user": "ผู้ใช้",
   "user_id": "ไอดีผู้ใช้",
@@ -1686,6 +1826,7 @@
   "view_links": "ดูลิงก์",
   "view_next_asset": "ดูสื่อถัดไป",
   "view_previous_asset": "ดูสื่อก่อนหน้า",
+  "view_qr_code": "ดูคิวอาร์โค้ด",
   "viewer_remove_from_stack": "เอาออกจากที่ซ้อน",
   "viewer_stack_use_as_main_asset": "ใช้เป็นทรัพยากรหลัก",
   "viewer_unstack": "หยุดซ้อน",
@@ -1695,11 +1836,11 @@
   "week": "สัปดาห์",
   "welcome": "ยินดีต้อนรับ",
   "welcome_to_immich": "ยินดีต้อนรับสู่ immich",
-  "wifi_name": "WiFi Name",
+  "wifi_name": "ชื่อ Wi-Fi",
   "year": "ปี",
   "years_ago": "{years, plural, one {# ปี} other {# ปี}} ที่แล้ว",
   "yes": "ใช่",
   "you_dont_have_any_shared_links": "คุณไม่ได้มีลิงก์ที่แชร์",
-  "your_wifi_name": "Your WiFi name",
+  "your_wifi_name": "ชื่อ Wi-Fi",
   "zoom_image": "ซูมรูปภาพ"
 }
diff --git a/i18n/tr.json b/i18n/tr.json
index ddb99ca019..b26f70acc2 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -34,6 +34,7 @@
   "added_to_favorites_count": "{count, number} fotoğraf favorilere eklendi",
   "admin": {
     "add_exclusion_pattern_description": "Hariç tutma desenleri ekleyin. *, ** ve ? kullanılarak Globbing (temsili yer doldurucu karakter) desteklenir. Farzedelim \"Raw\" adlı bir dizininiz var, içinde ki tüm dosyaları yoksaymak için \"**/Raw/**\" şeklinde yazabilirsiniz. \".tif\" ile biten tüm dosyaları yoksaymak için \"**/*.tif\" yazabilirsiniz. Mutlak yolu yoksaymak için \"/yoksayılacak/olan/yol/**\" şeklinde yazabilirsiniz.",
+    "admin_user": "Yönetici kullanıcısı",
     "asset_offline_description": "Bu harici kütüphane varlığı artık diskte bulunmuyor ve çöp kutusuna taşındı. Dosya kütüphane içinde taşındıysa, yeni karşılık gelen varlık için zaman çizelgenizi kontrol edin. Bu varlığı geri yüklemek için lütfen aşağıdaki dosya yolunun Immich tarafından erişilebilir olduğundan emin olun ve kütüphaneyi tarayın.",
     "authentication_settings": "Yetkilendirme Ayarları",
     "authentication_settings_description": "Şifre, OAuth, ve diğer yetkilendirme ayarlarını yönet",
@@ -44,7 +45,7 @@
     "backup_database_enable_description": "Veritabanı yığınlarını etkinleştir",
     "backup_keep_last_amount": "Tutulması gereken geçmiş yığını miktarı",
     "backup_settings": "Veritabanı yığını ayarları",
-    "backup_settings_description": "Veritabanı Yedekleme Ayarlarını Yönet",
+    "backup_settings_description": "Veritabanı döküm ayarlarını yönet.",
     "cleared_jobs": "{job} için işler temizlendi",
     "config_set_by_file": "Ayarlar şuanda config dosyası tarafından ayarlanmıştır",
     "confirm_delete_library": "{library} kütüphanesini silmek istediğinize emin misiniz?",
@@ -68,7 +69,9 @@
     "force_delete_user_warning": "UYARI: Bu işlem kullanıcıyı ve tüm varlıkları anında kaldıracaktır. Bu geri alınamaz ve dosyalar geri getirilemez.",
     "image_format": "Biçim",
     "image_format_description": "WebP, JPEG'e göre daha küçük dosya boyutu sunar fakat işlemesi daha uzun sürer.",
+    "image_fullsize_description": "Yakınlaştırıldığında kullanılan, meta verileri kaldırılmış tam boyutlu görüntü",
     "image_fullsize_enabled": "Tam boyutlu görüntü üretimini etkinleştir",
+    "image_fullsize_enabled_description": "Yerleşik önizlemeyi tercih et” seçeneği etkinleştirildiğinde, yerleşik önizlemeler dönüştürme yapılmadan doğrudan kullanılır. JPEG gibi web dostu formatlar bu ayardan etkilenmez.",
     "image_fullsize_quality_description": "1-100 arasında tam boyutlu görüntü kalitesi. Daha yüksek kalitelidir, ancak daha büyük dosyalar üretir.",
     "image_fullsize_title": "Tam boyutlu görüntü ayarları",
     "image_prefer_embedded_preview": "Gömülü önizlemeyi tercih et",
@@ -168,7 +171,7 @@
     "note_apply_storage_label_previous_assets": "Not: Daha önce yüklenen varlıklara Depolama Etiketi uygulamak için şu komutu çalıştırın",
     "note_cannot_be_changed_later": "NOT: Bu daha sonra değiştirilemez!",
     "notification_email_from_address": "Şu adresten",
-    "notification_email_from_address_description": "Göndericinin email adresi, örnek: \"Immich Fotoğraf Sunucusu <noreply@example.com>\"",
+    "notification_email_from_address_description": "Gönderen e-posta adresi, örneğin: \"Immich Görsel Sunucusu <noreply@example.com>\". E-posta gönderilmesine izin verdiğiniz bir adres kullandığınızdan emin olun.",
     "notification_email_host_description": "E-posta sunucusunun ana bilgisayarı (örneğin, smtp.immich.app)",
     "notification_email_ignore_certificate_errors": "Sertifika hatalarını görmezden gel",
     "notification_email_ignore_certificate_errors_description": "TLS sertifika doğrulama ayarlarını görmezden gel (Önerilmez)",
@@ -188,6 +191,7 @@
     "oauth_auto_register": "Otomatik kayıt",
     "oauth_auto_register_description": "OAuth ile giriş yapan yeni kullanıcıları otomatik kaydet",
     "oauth_button_text": "Buton yazısı",
+    "oauth_client_secret_description": "OAuth sağlayıcısı PKCE (Kod Değişimi İçin Kanıt Anahtarı) desteği sunmuyorsa gereklidir",
     "oauth_enable_description": "OAuth ile giriş yap",
     "oauth_mobile_redirect_uri": "Mobil yönlendirme URL'si",
     "oauth_mobile_redirect_uri_override": "Mobilde zorla kullanılacak Yönlendirme Adresi",
@@ -200,7 +204,7 @@
     "oauth_storage_quota_claim": "Depolama kotası talebi",
     "oauth_storage_quota_claim_description": "Kullanıcıya depolama kotası koymak için kullanılacak değer (en: OAuth claim).",
     "oauth_storage_quota_default": "Varsayılan depolama kotası (GiB)",
-    "oauth_storage_quota_default_description": "Değer (en: OAuth claim) mevcut değilse konulacak kota. GiB cinsinden, sınırsız kota için 0 kullanın.",
+    "oauth_storage_quota_default_description": "Değer (en: OAuth claim) mevcut değilse GiB cinsinden konulacak kota.",
     "oauth_timeout": "İstek zaman aşımı",
     "oauth_timeout_description": "Milisaniye cinsinden istek zaman aşımı",
     "password_enable_description": "Email ve şifre ile giriş yap",
@@ -237,9 +241,10 @@
     "storage_template_hash_verification_enabled_description": "Hash doğrulamayı etkinleştirir, eğer ne işe yaradığını bilmiyorsanız bunu devre dışı bırakmayın",
     "storage_template_migration": "Depolama şablonu birleştirme",
     "storage_template_migration_description": "Geçerli <link>{template}</link> ayarlarını daha önce yüklenmiş olan varlıklara uygula",
-    "storage_template_migration_info": "Şablon ayarlarındaki değişiklikler sadece yeni varlıklara uygulanacak. Şablon ayarlarını daha önce yüklenmiş olan varlıklara uygulamak için <link>{job}</link> çalıştırın.",
+    "storage_template_migration_info": "Depolama şablonu tüm dosya uzantılarını küçük harfe dönüştürecektir. Şablon ayarlarındaki değişiklikler sadece yeni varlıklara uygulanacak. Şablon ayarlarını daha önce yüklenmiş olan varlıklara uygulamak için <link>{job}</link> çalıştırın.",
     "storage_template_migration_job": "Depolama Adreslerini Değiştirme Görevi",
     "storage_template_more_details": "Bu özellik hakkında daha fazla bilgi için, <template-link>Depolama Şablonu</template-link> ve onun <implications-link>etkileri</implications-link> kısmına bakın",
+    "storage_template_onboarding_description_v2": "Etkinleştirildiğinde, bu özellik dosyaları kullanıcı tanımlı bir şablona göre otomatik olarak organize eder. Daha fazla bilgi için lütfen <link>belgeler</link>e bakın.",
     "storage_template_path_length": "Tahmini dosya adresi uzunluğu: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Depolama Şablonu",
     "storage_template_settings_description": "Yüklenen dosyanın ismini ve klasör yapısını düzenle",
@@ -254,7 +259,7 @@
     "template_email_update_album": "Albüm Şablonunu Güncelle",
     "template_email_welcome": "Hoş geldiniz e-posta şablonu",
     "template_settings": "Bildirim Şablonları",
-    "template_settings_description": "Bildirim şablonlarını yönet.",
+    "template_settings_description": "Bildirim şablonlarını yönet",
     "theme_custom_css_settings": "Özel CSS",
     "theme_custom_css_settings_description": "CSS (Cascading Style Sheets) kullanılarak Immich'in tasarımı değiştirilebilir.",
     "theme_settings": "Tema ayarları",
@@ -286,13 +291,13 @@
     "transcoding_encoding_options": "Kodlama Seçenekleri",
     "transcoding_encoding_options_description": "Kodlanmış videolar için kodekleri, çözünürlüğü, kaliteyi ve diğer seçenekleri ayarlayın",
     "transcoding_hardware_acceleration": "Donanım Hızlandırma",
-    "transcoding_hardware_acceleration_description": "Deneysel; daha hızlı, fakat aynı bitrate ayarlarında daha düşük kaliteye sahip",
+    "transcoding_hardware_acceleration_description": "Deneysel: daha hızlı dönüştürme, ancak aynı bit hızında kaliteyi düşürebilir",
     "transcoding_hardware_decoding": "Donanım çözücü",
     "transcoding_hardware_decoding_setting_description": "Uçtan uca hızlandırmayı, sadece kodlamayı hızlandırmanın yerine etkinleştirir. Tüm videolarda çalışmayabilir.",
     "transcoding_max_b_frames": "Maksimum B-kareler",
     "transcoding_max_b_frames_description": "Daha yüksek değerler sıkıştırma verimliliğini artırır, ancak kodlamayı yavaşlatır. Eski cihazlarda donanım hızlandırma ile uyumlu olmayabilir. 0, B-çerçevelerini devre dışı bırakır, -1 ise bu değeri otomatik olarak ayarlar.",
     "transcoding_max_bitrate": "Maksimum bitrate",
-    "transcoding_max_bitrate_description": "Maksimum bit hızı ayarlamak, kaliteye küçük bir maliyetle dosya boyutlarını daha öngörülebilir hale getirebilir.",
+    "transcoding_max_bitrate_description": "Maksimum bit hızı ayarlamak, kaliteyi az bir maliyetle düşürerek dosya boyutlarını daha öngörülebilir hale getirebilir. 720p çözünürlükte, tipik değerler VP9 veya HEVC için 2600 kbit/s, H.264 için ise 4500 kbit/s’dir. 0 olarak ayarlanırsa devre dışı bırakılır.",
     "transcoding_max_keyframe_interval": "Maksimum ana kare aralığı",
     "transcoding_max_keyframe_interval_description": "Ana kareler arasındaki maksimum kare mesafesini ayarlar. Düşük değerler sıkıştırma verimliliğini kötüleştirir, ancak arama sürelerini iyileştirir ve hızlı hareket içeren sahnelerde kaliteyi artırabilir. 0 bu değeri otomatik olarak ayarlar.",
     "transcoding_optimal_description": "Hedef çözünürlükten yüksek veya kabul edilen formatta olmayan videolar",
@@ -352,6 +357,7 @@
   "admin_password": "Yönetici Şifresi",
   "administration": "Yönetim",
   "advanced": "Gelişmiş",
+  "advanced_settings_enable_alternate_media_filter_subtitle": "Eşleme sırasında medyayı alternatif ölçütlere göre süzgeçten geçirmek için bu seçeneği kullanın. Uygulamanın tüm albümleri algılamasında sorun yaşıyorsanız yalnızca bu durumda deneyin.",
   "advanced_settings_enable_alternate_media_filter_title": "[DENEYSEL] Alternatif cihaz albüm eşleme süzgeci kullanın",
   "advanced_settings_log_level_title": "Günlük düzeyi: {level}",
   "advanced_settings_prefer_remote_subtitle": "Bazı cihazlar, cihazdaki öğelerin küçük resimlerini göstermekte çok yavaştır. Bunun yerine sunucudaki küçük resimleri göstermek için bu ayarı etkinleştirin.",
@@ -360,6 +366,7 @@
   "advanced_settings_proxy_headers_title": "Proxy Header'lar",
   "advanced_settings_self_signed_ssl_subtitle": "Sunucu uç noktası için SSL sertifika doğrulamasını atlar. Kendinden imzalı sertifikalar için gereklidir.",
   "advanced_settings_self_signed_ssl_title": "Kendi kendine imzalanmış SSL sertifikalarına izin ver",
+  "advanced_settings_sync_remote_deletions_subtitle": "Web üzerinde işlem yapıldığında, bu aygıttaki varlığı otomatik olarak sil veya geri yükle",
   "advanced_settings_sync_remote_deletions_title": "Uzaktan silinmeleri eşle [DENEYSEL]",
   "advanced_settings_tile_subtitle": "Gelişmiş kullanıcı ayarları",
   "advanced_settings_troubleshooting_subtitle": "Sorun giderme için ek özellikleri etkinleştirin",
@@ -392,11 +399,14 @@
   "album_viewer_appbar_share_err_remove": "Albümden öğeleri kaldırmada sorunlar var",
   "album_viewer_appbar_share_err_title": "Albüm başlığı değiştirilemedi",
   "album_viewer_appbar_share_leave": "Albümden çık",
-  "album_viewer_appbar_share_to": "Paylaş:",
+  "album_viewer_appbar_share_to": "Paylaşma",
   "album_viewer_page_share_add_users": "Kullanıcı ekle",
   "album_with_link_access": "Link'e sahip olan herhangi bir kişinin bu albümdeki fotoğrafları ve kişileri görmesine izin ver.",
   "albums": "Albümler",
   "albums_count": "{count, plural, one {{count, number} Albüm} other {{count, number} Albüm}}",
+  "albums_default_sort_order": "Varsayılan albüm sıralama düzeni",
+  "albums_default_sort_order_description": "Yeni albüm oluştururken kullanılacak başlangıç varlık sıralama düzeni.",
+  "albums_feature_description": "Diğer kullanıcılarla paylaşılabilen varlık koleksiyonları.",
   "all": "Tümü",
   "all_albums": "Tüm Albümler",
   "all_people": "Tüm Kişiler",
@@ -417,6 +427,7 @@
   "app_settings": "Uygulama Ayarları",
   "appears_in": "Şurada görünür",
   "archive": "Arşiv",
+  "archive_action_prompt": "{count} arşive eklendi",
   "archive_or_unarchive_photo": "Fotoğrafı arşivle/arşivden çıkar",
   "archive_page_no_archived_assets": "Arşivlenmiş öğe bulunamadı",
   "archive_page_title": "Arşiv ({count})",
@@ -454,10 +465,12 @@
   "assets": "Varlıklar",
   "assets_added_count": "{count, plural, one {# varlık eklendi} other {# varlık eklendi}}",
   "assets_added_to_album_count": "{count, plural, one {# varlık} other {# varlık}} albüme eklendi",
-  "assets_added_to_name_count": "{count, plural, one {# varlık} other {# varlık}} {hasName, select, true {<b>{name}</b>} other {yeni albüm}} içine eklendi",
+  "assets_cannot_be_added_to_album_count": "{count, plural, one {Varlık} other {Varlıklar}} albüme eklenemiyor",
   "assets_count": "{count, plural, one {# varlık} other {# varlıklar}}",
   "assets_deleted_permanently": "{count} öğe kalıcı olarak silindi",
   "assets_deleted_permanently_from_server": "{count} öğe kalıcı olarak Immich sunucusundan silindi",
+  "assets_downloaded_failed": "{count, plural, one {# dosya indirildi – {error} dosya indirilemedi} other {# dosya indirildi – {error} dosya indirilemedi}}",
+  "assets_downloaded_successfully": "{count, plural, one {# dosya başarıyla indirildi} other {# dosya başarıyla indirildi}}",
   "assets_moved_to_trash_count": "{count, plural, one {# varlık} other {# varlık}} çöpe taşındı",
   "assets_permanently_deleted_count": "Kalıcı olarak silindi {count, plural, one {# varlık} other {# varlıklar}}",
   "assets_removed_count": "Kaldırıldı {count, plural, one {# varlık} other {# varlıklar}}",
@@ -484,12 +497,12 @@
   "backup_album_selection_page_selection_info": "Seçim Bilgileri",
   "backup_album_selection_page_total_assets": "Toplam eşsiz öğeler",
   "backup_all": "Tümü",
-  "backup_background_service_backup_failed_message": "Yedekleme başarısız. Tekrar deneniyor...",
-  "backup_background_service_connection_failed_message": "Sunucuya bağlanılamadı. Tekrar deneniyor...",
+  "backup_background_service_backup_failed_message": "Yedekleme başarısız. Tekrar deneniyor…",
+  "backup_background_service_connection_failed_message": "Sunucuya bağlanılamadı. Tekrar deneniyor…",
   "backup_background_service_current_upload_notification": "{filename} yükleniyor",
   "backup_background_service_default_notification": "Yeni öğeler kontrol ediliyor…",
   "backup_background_service_error_title": "Yedekleme hatası",
-  "backup_background_service_in_progress_notification": "Öğeleriniz yedekleniyor...",
+  "backup_background_service_in_progress_notification": "Öğeleriniz yedekleniyor…",
   "backup_background_service_upload_failure_notification": "{filename} yüklemesi başarısız oldu",
   "backup_controller_page_albums": "Yedekleme Albümleri",
   "backup_controller_page_background_app_refresh_disabled_content": "Arka planda yedeklemeyi kullanabilmek için Ayarlar > Genel > Arka Planda Uygulama Yenileme bölümünden arka planda uygulama yenilemeyi etkinleştirin.",
@@ -577,6 +590,8 @@
   "cannot_merge_people": "Kişiler birleştirilemiyor",
   "cannot_undo_this_action": "Bu işlem geri alınamaz!",
   "cannot_update_the_description": "Açıklama güncellenemiyor",
+  "cast": "Yansıt",
+  "cast_description": "Kullanılabilir yansıtma hedeflerini yapılandır",
   "change_date": "Tarihi değiştir",
   "change_description": "Açıklamayı değiştir",
   "change_display_order": "Görüntüleme sırasını değiştir",
@@ -636,6 +651,7 @@
   "confirm_tag_face": "Bu yüzü {name} olarak etiketlemek ister misiniz?",
   "confirm_tag_face_unnamed": "Bu yüzü etiketlemek ister misin?",
   "connected_device": "Cihaz bağlandı",
+  "connected_to": "Bağlı",
   "contain": "İçermek",
   "context": "Bağlam",
   "continue": "Devam et",
@@ -644,8 +660,8 @@
   "control_bottom_app_bar_delete_from_local": "Cihazdan sil",
   "control_bottom_app_bar_edit_location": "Konumu Düzenle",
   "control_bottom_app_bar_edit_time": "Tarih ve Saati Düzenle",
-  "control_bottom_app_bar_share_link": "İlişimi paylaş",
-  "control_bottom_app_bar_share_to": "Paylaş:",
+  "control_bottom_app_bar_share_link": "Bağlantıyı Paylaş",
+  "control_bottom_app_bar_share_to": "Paylaşma",
   "control_bottom_app_bar_trash_from_immich": "Çöp Kutusuna At",
   "copied_image_to_clipboard": "Resim, panoya kopyalandı.",
   "copied_to_clipboard": "Panoya kopyalandı!",
@@ -687,6 +703,7 @@
   "daily_title_text_date": "dd MMM E",
   "daily_title_text_date_year": "dd MMM yyyy E",
   "dark": "Koyu",
+  "dark_theme": "Karanlık temaya geç",
   "date_after": "Sonraki tarih",
   "date_and_time": "Tarih ve Zaman",
   "date_before": "Önceki tarih",
@@ -702,6 +719,7 @@
   "default_locale": "Varsayılan Yerel Ayar",
   "default_locale_description": "Tarihleri ve sayıları tarayıcınızın yerel ayarına göre biçimlendirin",
   "delete": "Sil",
+  "delete_action_prompt": "{count} kalıcı olarak silindi",
   "delete_album": "Albümü sil",
   "delete_api_key_prompt": "Bu API anahtarını silmek istediğinizden emin misiniz?",
   "delete_dialog_alert": "Bu öğeler cihazınızdan ve Immich'ten kalıcı olarak silinecektir",
@@ -715,6 +733,7 @@
   "delete_key": "Anahtarı sil",
   "delete_library": "Kütüphaneyi sil",
   "delete_link": "Bağlantıyı sil",
+  "delete_local_action_prompt": "{count} yerel olarak silindi",
   "delete_local_dialog_ok_backed_up_only": "Sadece Yedeklenmişleri Sil",
   "delete_local_dialog_ok_force": "Yine de Sil",
   "delete_others": "Diğerlerini sil",
@@ -734,6 +753,7 @@
   "disallow_edits": "Değişikliklere izin verme",
   "discord": "Discord",
   "discover": "Keşfet",
+  "discovered_devices": "Keşfedilen aygıtlar",
   "dismiss_all_errors": "Tüm hataları yoksay",
   "dismiss_error": "Hatayı yoksay",
   "display_options": "Görüntüleme seçenekleri",
@@ -802,6 +822,7 @@
   "enable_biometric_auth_description": "Biyometrik kimlik doğrulamasını etkinleştirmek için PIN kodu girin",
   "enabled": "Etkinleştirildi",
   "end_date": "Bitiş tarihi",
+  "enqueued": "Kuyruğa alındı",
   "enter_wifi_name": "Wi-Fi adını girin",
   "enter_your_pin_code": "Pin kodu girin",
   "enter_your_pin_code_subtitle": "Kilitli klasöre erişmek için PIN kodunuzu girin",
@@ -810,6 +831,7 @@
   "error_delete_face": "Yüzü varlıktan silme hatası",
   "error_loading_image": "Resim yüklenirken hata oluştu",
   "error_saving_image": "Hata: {error}",
+  "error_tag_face_bounding_box": "Yüz etiketleme hatası – sınırlayıcı kutu koordinatları alınamadı",
   "error_title": "Bir Hata Oluştu - Bir şeyler ters gitti",
   "errors": {
     "cannot_navigate_next_asset": "Sonraki varlığa geçiş yapılamıyor",
@@ -859,6 +881,7 @@
     "unable_to_archive_unarchive": "{archived, select, true {Arşivleme} other {Arşivden çıkarma}} işlemi yapılamıyor",
     "unable_to_change_album_user_role": "Albüm kullanıcı rolü değiştirilemiyor",
     "unable_to_change_date": "Tarih değiştirilemiyor",
+    "unable_to_change_description": "Açıklama değiştirilemiyor",
     "unable_to_change_favorite": "Favori durumu değiştirilemiyor",
     "unable_to_change_location": "Konum değiştirilemiyor",
     "unable_to_change_password": "Şifre değiştirilemiyor",
@@ -902,6 +925,7 @@
     "unable_to_remove_partner": "Ortak kaldırılamıyor",
     "unable_to_remove_reaction": "Reaksiyon kaldırılamıyor",
     "unable_to_reset_password": "Şifre sıfırlanamıyor",
+    "unable_to_reset_pin_code": "Pin kodunu sıfırlanamıyor",
     "unable_to_resolve_duplicate": "Çiftler çözümlenemiyor",
     "unable_to_restore_assets": "Varlıklar geri yüklenemiyor",
     "unable_to_restore_trash": "Çöp geri yüklenemiyor",
@@ -935,6 +959,9 @@
   "exif_bottom_sheet_location": "KONUM",
   "exif_bottom_sheet_people": "KİŞİLER",
   "exif_bottom_sheet_person_add_person": "İsim ekle",
+  "exif_bottom_sheet_person_age_months": "Yaş: {months} ay",
+  "exif_bottom_sheet_person_age_year_months": "Yaş: 1 yıl, {months} ay",
+  "exif_bottom_sheet_person_age_years": "Yaş: {years}",
   "exit_slideshow": "Slayt gösterisinden çık",
   "expand_all": "Hepsini genişlet",
   "experimental_settings_new_asset_list_subtitle": "Çalışmalar devam ediyor",
@@ -952,13 +979,17 @@
   "external": "Harici",
   "external_libraries": "Harici kütüphaneler",
   "external_network": "Harici ağlar",
-  "external_network_sheet_info": "Belirlenmiş WiFi ağına bağlı olmadığında uygulama, yukarıdan aşağıya doğru ulaşabileceği aşağıdaki URL'lerden ilki aracılığıyla sunucuya bağlanacaktır",
+  "external_network_sheet_info": "Belirlenmiş Wi-Fi ağına bağlı olmadığında uygulama, yukarıdan aşağıya doğru ulaşabileceği aşağıdaki URL'lerden ilki aracılığıyla sunucuya bağlanacaktır",
   "face_unassigned": "Yüz atanmadı",
+  "failed": "Başarısız",
+  "failed_to_authenticate": "Kimlik doğrulaması yapılamadı",
   "failed_to_load_assets": "Varlıklar yüklenemedi",
-  "favorite": "Favori",
-  "favorite_or_unfavorite_photo": "Favoriye ekle veya çıkar",
-  "favorites": "Favoriler",
-  "favorites_page_no_favorites": "Favori öğe bulunamadı",
+  "failed_to_load_folder": "Klasör yüklenemedi",
+  "favorite": "Gözde",
+  "favorite_action_prompt": "{count} gözdelere eklendi",
+  "favorite_or_unfavorite_photo": "Gözdeye ekle veya çıkar",
+  "favorites": "Gözdeler",
+  "favorites_page_no_favorites": "Gözde öge bulunamadı",
   "feature_photo_updated": "Özellikli fotoğraf güncellendi",
   "features": "Özellikler",
   "features_setting_description": "Uygulamanın özelliklerini yönet",
@@ -968,11 +999,16 @@
   "filetype": "Dosya tipi",
   "filter": "Filtre",
   "filter_people": "Kişileri filtrele",
+  "filter_places": "Yerleri süz",
   "find_them_fast": "Adlarına göre hızlıca bul",
   "fix_incorrect_match": "Yanlış eşleştirmeyi düzelt",
+  "folder": "Klasör",
+  "folder_not_found": "Klasör bulunamadı",
   "folders": "Klasörler",
   "folders_feature_description": "Dosya sistemindeki fotoğraf ve videoları klasör görünümüyle keşfedin",
   "forward": "İleri",
+  "gcast_enabled": "Google Cast",
+  "gcast_enabled_description": "Bu özellik, çalışabilmek için Google'dan harici kaynaklar yükler.",
   "general": "Genel",
   "get_help": "Yardım Al",
   "get_wifiname_error": "Wi-Fi adı alınamadı. Gerekli izinleri verdiğinizden ve bir Wi-Fi ağına bağlı olduğunuzdan emin olun",
@@ -1012,12 +1048,16 @@
   "home_page_building_timeline": "Zaman çizelgesi oluşturuluyor",
   "home_page_delete_err_partner": "Partner öğeleri silinemez, atlanıyor",
   "home_page_delete_remote_err_local": "Uzaktan silme seçimindeki yerel öğeler atlanıyor",
-  "home_page_favorite_err_local": "Yerel öğeler henüz favorilere eklenemiyor, atlanıyor",
-  "home_page_favorite_err_partner": "Partner öğeleri henüz favorilere eklenemiyor, atlanıyor",
+  "home_page_favorite_err_local": "Yerel ögeler henüz gözdelere eklenemiyor, atlanıyor",
+  "home_page_favorite_err_partner": "Ortak ögeleri henüz gözdelere eklenemiyor, atlanıyor",
   "home_page_first_time_notice": "Uygulamayı ilk kez kullanıyorsanız, zaman çizelgesinin albümlerdeki fotoğraf ve videolar ile oluşturulabilmesi için lütfen yedekleme için albüm(ler) seçtiğinizden emin olun.",
+  "home_page_locked_error_local": "Yerel varlıklar kilitli klasöre taşınamıyor, atlanıyor",
+  "home_page_locked_error_partner": "Ortak varlıklar kilitli klasöre taşınamıyor, atlanıyor",
   "home_page_share_err_local": "Yerel öğeler bağlantı ile paylaşılamaz, atlanıyor",
   "home_page_upload_err_limit": "Aynı anda en fazla 30 öğe yüklenebilir, atlanabilir",
+  "host": "Ana bilgisayar",
   "hour": "Saat",
+  "id": "ID",
   "ignore_icloud_photos": "iCloud Fotoğraflarını Yok Say",
   "ignore_icloud_photos_description": "iCloud'a yüklenmiş fotoğraflar Immich sunucusuna yüklenmesin",
   "image": "Resim",
@@ -1057,6 +1097,12 @@
   "invalid_date_format": "Geçersiz tarih formatı",
   "invite_people": "Kişileri Davet Et",
   "invite_to_album": "Albüme davet et",
+  "ios_debug_info_fetch_ran_at": "Veri çekme {dateTime} tarihinde çalıştırıldı",
+  "ios_debug_info_last_sync_at": "Son eşleme: {dateTime}",
+  "ios_debug_info_no_processes_queued": "Hiçbir arka plan işlemi kuyruğa alınmadı",
+  "ios_debug_info_no_sync_yet": "Henüz hiçbir arka plan eşleme görevi çalıştırılmadı",
+  "ios_debug_info_processes_queued": "{count, plural, one {{count} arka plan işlemi kuyruğa alındı} other {{count} arka plan işlemi kuyruğa alındı}}",
+  "ios_debug_info_processing_ran_at": "İşleme {dateTime} tarihinde çalıştırıldı",
   "items_count": "{count, plural, one {# Öğe} other {# Öğe}}",
   "jobs": "Görevler",
   "keep": "Koru",
@@ -1065,6 +1111,9 @@
   "kept_this_deleted_others": "Bu varlık tutuldu ve {count, plural, one {# varlık} other {# varlık}} silindi",
   "keyboard_shortcuts": "Klavye kısayolları",
   "language": "Dil",
+  "language_no_results_subtitle": "Arama teriminizi değiştirmeyi deneyin",
+  "language_no_results_title": "Dil bulunamadı",
+  "language_search_hint": "Dilleri ara...",
   "language_setting_description": "Tercih ettiğiniz dili seçiniz",
   "last_seen": "Son görülme",
   "latest_version": "En son versiyon",
@@ -1081,6 +1130,7 @@
   "library_page_sort_created": "Oluşturma tarihi",
   "library_page_sort_last_modified": "Son düzenleme",
   "library_page_sort_title": "Albüm başlığı",
+  "licenses": "Lisanslar",
   "light": "Açık",
   "like_deleted": "Beğeni silindi",
   "link_motion_video": "Hareket videosunu bağla",
@@ -1090,17 +1140,21 @@
   "list": "Liste",
   "loading": "Yükleniyor",
   "loading_search_results_failed": "Arama sonuçları yüklenemedi",
+  "local_asset_cast_failed": "Sunucuya yüklenmemiş bir varlık yansıtılamaz",
   "local_network": "Yerel Wi-Fi",
   "local_network_sheet_info": "Uygulama belirlenmiş Wi-Fi ağını kullanırken bu URL üzerinden sunucuya bağlanacaktır",
   "location_permission": "Konum izni",
-  "location_permission_content": "Otomatik geçiş özelliğinin çalışabilmesi için Immich'in mevcut Wi-Fi ağının adını bilmesi, bunu sağlamak için de tam konum iznine ihtiyacı vardır.",
+  "location_permission_content": "Otomatik geçiş özelliğinin çalışabilmesi için Immich'in mevcut Wi-Fi ağının adını bilmesi, bunu sağlamak için de tam konum iznine ihtiyacı vardır",
   "location_picker_choose_on_map": "Haritada seç",
   "location_picker_latitude_error": "Geçerli bir enlem yazın",
   "location_picker_latitude_hint": "Buraya enlem yazın",
   "location_picker_longitude_error": "Geçerli bir boylam yazın",
   "location_picker_longitude_hint": "Buraya boylam yazın",
+  "lock": "Kilitle",
+  "locked_folder": "Kilitli Klasör",
   "log_out": "Oturumu kapat",
   "log_out_all_devices": "Tüm Cihazlarda Oturumu Kapat",
+  "logged_in_as": "{user} olarak oturum açıldı",
   "logged_out_all_devices": "Tüm cihazlarda oturum kapatıldı",
   "logged_out_device": "Oturum kapatılmış cihaz",
   "login": "Giriş yap",
@@ -1124,7 +1178,7 @@
   "login_form_server_empty": "Sunucu URL'si girin",
   "login_form_server_error": "Sunucuya bağlanılamadı.",
   "login_has_been_disabled": "Giriş devre dışı bırakıldı.",
-  "login_password_changed_error": "Parola güncellenirken bir hata oluştu.",
+  "login_password_changed_error": "Parolanız güncellenirken bir hata oluştu.",
   "login_password_changed_success": "Parola güncellendi",
   "logout_all_device_confirmation": "Tüm cihazlarda oturum kapatmak istediğinizden emin misiniz?",
   "logout_this_device_confirmation": "Bu cihazda oturum kapatmak istediğinizden emin misiniz?",
@@ -1133,6 +1187,7 @@
   "loop_videos": "Videoları döngüye al",
   "loop_videos_description": "Ayrıntı görünümünde videoların otomatik döngüye alınmasını etkinleştir.",
   "main_branch_warning": "Geliştirme sürümü kullanıyorsunuz. Yayınlanan bir sürüm kullanmanızı önemle tavsiye ederiz!",
+  "main_menu": "Ana menü",
   "make": "Marka",
   "manage_shared_links": "Paylaşılan bağlantıları yönet",
   "manage_sharing_with_partners": "Ortaklarla paylaşımı yönet",
@@ -1163,9 +1218,12 @@
   "map_settings_dialog_title": "Harita Ayarları",
   "map_settings_include_show_archived": "Arşivdekileri dahil et",
   "map_settings_include_show_partners": "Partnerleri Dahil Et",
-  "map_settings_only_show_favorites": "Sadece Favorileri Göster",
+  "map_settings_only_show_favorites": "Sadece Gözdeleri Göster",
   "map_settings_theme_settings": "Harita Teması",
   "map_zoom_to_see_photos": "Fotoğrafları görmek için uzaklaştırın",
+  "mark_all_as_read": "Tümünü okundu olarak işaretle",
+  "mark_as_read": "Okundu olarak işaretle",
+  "marked_all_as_read": "Tümü okundu olarak işaretlendi",
   "matches": "Eşleşenler",
   "media_type": "Medya türü",
   "memories": "Anılar",
@@ -1186,8 +1244,16 @@
   "minimize": "Küçült",
   "minute": "Dakika",
   "missing": "Eksik",
+  "model": "Model",
   "month": "Ay",
+  "monthly_title_text_date_format": "MMMM y",
   "more": "Daha fazla",
+  "move": "Taşı",
+  "move_off_locked_folder": "Kilitli klasörden taşı",
+  "move_to_locked_folder": "Kilitli klasöre taşı",
+  "move_to_locked_folder_confirmation": "Bu fotoğraflar ve videolar tüm albümlerden kaldırılacak ve yalnızca kilitli klasörden görüntülenebilecektir",
+  "moved_to_archive": "{count, plural, one {# öğe arşive taşındı} other {# öğe arşive taşındı}}",
+  "moved_to_library": "{count, plural, one {# öğe kitaplığa taşındı} other {# öğe kitaplığa taşındı}}",
   "moved_to_trash": "Çöp kutusuna taşındı",
   "multiselect_grid_edit_date_time_err_read_only": "Salt okunur öğelerin tarihi düzenlenemedi, atlanıyor",
   "multiselect_grid_edit_gps_err_read_only": "Salt okunur öğelerin konumu düzenlenemedi, atlanıyor",
@@ -1203,6 +1269,7 @@
   "new_password": "Yeni şifre",
   "new_person": "Yeni kişi",
   "new_pin_code": "Yeni PIN kodu",
+  "new_pin_code_subtitle": "Kilitli klasöre ilk kez erişiyorsunuz. Bu sayfaya güvenli erişim için bir PIN kodu oluşturun",
   "new_user_created": "Yeni kullanıcı oluşturuldu",
   "new_version_available": "YENİ VERSİYON MEVCUT",
   "newest_first": "Önce en yeniler",
@@ -1215,19 +1282,25 @@
   "no_archived_assets_message": "Fotoğraf görünümünüzden kaldırmak için fotoğrafları ve videoları arşivleyin",
   "no_assets_message": "İLK FOTOĞRAFINIZI YÜKLEMEK İÇİN TIKLAYIN",
   "no_assets_to_show": "Gösterilecek öğe yok",
+  "no_cast_devices_found": "Yansıtılacak cihaz bulunamadı",
   "no_duplicates_found": "Çift bulunamadı.",
   "no_exif_info_available": "EXIF bilgisi mevcut değil",
   "no_explore_results_message": "Koleksiyonunuzu keşfetmek için daha fazla fotoğraf yükleyin.",
-  "no_favorites_message": "En sevdiğiniz fotoğraf ve videoları hızlıca bulmak için favoriler ekleyin",
+  "no_favorites_message": "En sevdiğiniz fotoğraf ve videoları hızlıca bulmak için gözdelere ekleyin",
   "no_libraries_message": "Fotoğraf ve videolarınızı görmek için bir harici kütüphane oluşturun",
+  "no_locked_photos_message": "Kilitli klasördeki fotoğraf ve videolar gizlidir; kitaplığınızda gezinirken veya arama yaparken görünmezler.",
   "no_name": "İsim yok",
+  "no_notifications": "Bildirim yok",
+  "no_people_found": "Eşleşen kişi bulunamadı",
   "no_places": "Yer yok",
   "no_results": "Sonuç bulunamadı",
   "no_results_description": "Eş anlamlı ya da daha genel anlamlı bir kelime deneyin",
   "no_shared_albums_message": "Fotoğrafları ve videoları ağınızdaki kişilerle paylaşmak için bir albüm oluşturun",
   "not_in_any_album": "Hiçbir albümde değil",
+  "not_selected": "Seçilmedi",
   "note_apply_storage_label_to_previously_uploaded assets": "Not: Daha önce yüklenen varlıklar için bir depolama yolu etiketi uygulamak üzere şunu başlatın",
   "notes": "Notlar",
+  "nothing_here_yet": "Burada henüz bir şey yok",
   "notification_permission_dialog_content": "Bildirimleri etkinleştirmek için cihaz ayarlarına gidin ve izin verin.",
   "notification_permission_list_tile_content": "Bildirimleri etkinleştirmek için izin verin.",
   "notification_permission_list_tile_enable_button": "Bildirimleri Etkinleştir",
@@ -1235,17 +1308,22 @@
   "notification_toggle_setting_description": "E-posta bildirimlerine izin ver",
   "notifications": "Bildirimler",
   "notifications_setting_description": "Bildirimleri yönetin",
+  "oauth": "OAuth",
   "official_immich_resources": "Resmi Immich Kaynakları",
   "offline": "Çevrim dışı",
   "ok": "Tamam",
   "oldest_first": "Eski olan önce",
   "on_this_device": "Bu cihazda",
   "onboarding": "Uyum Süreci",
-  "onboarding_privacy_description": "Şu (isteğe bağlı) özellikler harici hizmetlere dayanır ve yönetim ayarlarından herhangi bir zamanda devre dışı bırakılabilir.",
+  "onboarding_locale_description": "Tercih ettiğiniz dili seçin. Bu ayarı daha sonra değiştirebilirsiniz.",
+  "onboarding_privacy_description": "Şu (isteğe bağlı) özellikler harici hizmetlere dayanır ve ayarlardan herhangi bir zamanda devre dışı bırakılabilir.",
+  "onboarding_server_welcome_description": "Örneğinizi bazı yaygın ayarlarla ayarlayalım.",
   "onboarding_theme_description": "İnstance’ınız için bir renk teması seçin. Bunu daha sonra ayarlarınızdan değiştirebilirsiniz.",
+  "onboarding_user_welcome_description": "Haydi başlayalım!",
   "onboarding_welcome_user": "Hoş geldin, {user}",
   "online": "Çevrimiçi",
-  "only_favorites": "Sadece favoriler",
+  "only_favorites": "Sadece gözdeler",
+  "open": "Aç",
   "open_in_map_view": "Harita görünümünde aç",
   "open_in_openstreetmap": "OpenStreetMap'te Aç",
   "open_the_search_filters": "Arama filtrelerini aç",
@@ -1268,7 +1346,7 @@
   "partner_page_no_more_users": "Eklenecek başka kullanıcı yok",
   "partner_page_partner_add_failed": "Partner eklenemedi",
   "partner_page_select_partner": "Partner seç",
-  "partner_page_shared_to_title": "Paylaşıldı:",
+  "partner_page_shared_to_title": "Paylaşıldı",
   "partner_page_stop_sharing_content": "{partner} artık fotoğraflarınıza erişemeyecek.",
   "partner_sharing": "Ortak paylaşımı",
   "partners": "Ortaklar",
@@ -1298,15 +1376,18 @@
   "permanently_delete_assets_prompt": "Bu {count, plural, one {dosyayı} other {<b>#</b> dosyaları}} kalıcı olarak silmek istediğinizden emin misiniz? Bu işlem {count, plural, one {bu dosyayı} other {bu dosyaları}} albümlerinizden de kaldırır.",
   "permanently_deleted_asset": "Kalıcı olarak silinmiş ögeler",
   "permanently_deleted_assets_count": "{count, plural, one {# dosya} other {# dosya}} kalıcı olarak silindi",
+  "permission": "İzin",
+  "permission_empty": "İzniniz boş olmamalı",
   "permission_onboarding_back": "Geri",
   "permission_onboarding_continue_anyway": "Yine de devam et",
   "permission_onboarding_get_started": "Haydi başlayalım",
   "permission_onboarding_go_to_settings": "Ayarlara git",
   "permission_onboarding_permission_denied": "İzin reddedildi. Immich'i kullanmak için Ayarlar'da fotoğraf ve video izinlerini verin.",
-  "permission_onboarding_permission_granted": "İzin verildi. Artık hazırsınız!",
+  "permission_onboarding_permission_granted": "İzin verildi! Artık hazırsınız.",
   "permission_onboarding_permission_limited": "Sınırlı izin. Immich'in tüm fotoğrav ve videolarınızı yedeklemesine ve yönetmesine izin vermek için Ayarlar'da fotoğraf ve video izinlerini verin.",
   "permission_onboarding_request": "Immich'in fotoğraflarınızı ve videolarınızı görüntüleyebilmesi için izne ihtiyacı var.",
   "person": "Kişi",
+  "person_birthdate": "{date} tarihinde doğdu",
   "person_hidden": "{name}{hidden, select, true { (gizli)} other {}}",
   "photo_shared_all_users": "Fotoğraflarınızı tüm kullanıcılarla paylaştınız gibi görünüyor veya paylaşacak kullanıcı bulunmuyor.",
   "photos": "Fotoğraflar",
@@ -1317,6 +1398,7 @@
   "pin_code_changed_successfully": "PIN kodu başarıyla değiştirildi",
   "pin_code_reset_successfully": "PIN kodu başarıyla sıfırlandı",
   "pin_code_setup_successfully": "PIN kodu başarıyla ayarlandı",
+  "pin_verification": "PIN kodu doğrulama",
   "place": "Konum",
   "places": "Konumlar",
   "places_count": "{count, plural, one {{count, number} yer} other {{count, number} yer}}",
@@ -1324,19 +1406,26 @@
   "play_memories": "Anıları oynat",
   "play_motion_photo": "Hareketli fotoğrafı oynat",
   "play_or_pause_video": "Videoyu oynat ya da durdur",
+  "please_auth_to_access": "Erişim için lütfen kimliğinizi doğrulayın",
+  "port": "Port",
   "preferences_settings_subtitle": "Uygulama tercihlerini düzenle",
   "preferences_settings_title": "Tercihler",
   "preset": "Ön ayar",
   "preview": "Önizleme",
   "previous": "Önceki",
   "previous_memory": "Önceki anı",
-  "previous_or_next_photo": "Önceki ya da sonraki fotoğraf",
+  "previous_or_next_day": "Gün ileri/geri",
+  "previous_or_next_month": "Ay ileri/geri",
+  "previous_or_next_photo": "Fotoğraf ileri/geri",
+  "previous_or_next_year": "Yıl ileri/geri",
   "primary": "Birincil",
   "privacy": "Gizlilik",
+  "profile": "Profil",
   "profile_drawer_app_logs": "Günlükler",
   "profile_drawer_client_out_of_date_major": "Mobil uygulama güncel değil. Lütfen en son ana sürüme güncelleyin.",
   "profile_drawer_client_out_of_date_minor": "Mobil uygulama güncel değil. Lütfen en son sürüme güncelleyin.",
   "profile_drawer_client_server_up_to_date": "Uygulama ve sunucu güncel",
+  "profile_drawer_github": "GitHub",
   "profile_drawer_server_out_of_date_major": "Sunucu güncel değil. Lütfen en son ana sürüme güncelleyin.",
   "profile_drawer_server_out_of_date_minor": "Sunucu güncel değil. Lütfen en son sürüme güncelleyin.",
   "profile_image_of_user": "{user} kullanıcısının profil resmi",
@@ -1363,7 +1452,7 @@
   "purchase_lifetime_description": "Ömür boyu geçerli",
   "purchase_option_title": "SATIN ALMA SEÇENEKLERİ",
   "purchase_panel_info_1": "Immich'in gelişimi zaman ve çaba gerektiriyor ve tam zamanlı geliştiricilerimiz var. Amacımız, açık kaynak yazılımı sürdürülebilir bir gelir kaynağı haline getirmek.",
-  "purchase_panel_info_2": "Bu satın alma işlemi Immich'te ek işlevsellik açmayacak. Immich'in gelişimini desteklemek için size güveniyoruz.",
+  "purchase_panel_info_2": "Ücretli özellikler (paywall) eklememeye kararlı olduğumuz için, bu satın alma işlemi Immich'te ek işlevsellik sağlamaz. Immich'in sürekli gelişimini desteklemek için sizin gibi kullanıcılara güveniyoruz.",
   "purchase_panel_title": "Projeyi destekleyin",
   "purchase_per_server": "Sunucu başına",
   "purchase_per_user": "Kullanıcı başına",
@@ -1390,6 +1479,8 @@
   "recent_searches": "Son aramalar",
   "recently_added": "Son eklenenler",
   "recently_added_page_title": "Son Eklenenler",
+  "recently_taken": "Son çekilenler",
+  "recently_taken_page_title": "Son Çekilenler",
   "refresh": "Yenile",
   "refresh_encoded_videos": "Kodlanmış videoları yenile",
   "refresh_faces": "Yüzleri yenile",
@@ -1408,14 +1499,21 @@
   "remove_custom_date_range": "Özel tarih aralığını kaldır",
   "remove_deleted_assets": "Çevrimdışı dosyaları kaldır",
   "remove_from_album": "Albümden çıkar",
-  "remove_from_favorites": "Favorilerden çıkar",
+  "remove_from_album_action_prompt": "{count} albümden kaldırıldı",
+  "remove_from_favorites": "Gözdelerden çıkar",
+  "remove_from_lock_folder_action_prompt": "{count} kilitli klasörden kaldırıldı",
+  "remove_from_locked_folder": "Kilitli klasörden kaldır",
+  "remove_from_locked_folder_confirmation": "Bu fotoğraf ve videoları kilitli klasörden çıkarmak istediğinizden emin misiniz? Çıkarıldıklarında kitaplığınızda görünür olacaklar.",
   "remove_from_shared_link": "Paylaşılan bağlantıdan çıkar",
+  "remove_memory": "Anıyı kaldır",
+  "remove_photo_from_memory": "Bu anıdan fotoğrafı kaldır",
+  "remove_tag": "Etiketi kaldır",
   "remove_url": "Bağlantıyı kaldır",
   "remove_user": "Kullanıcıyı çıkar",
   "removed_api_key": "API anahtarı {name} kaldırıldı",
   "removed_from_archive": "Arşivden çıkarıldı",
-  "removed_from_favorites": "Favorilerden kaldırıldı",
-  "removed_from_favorites_count": "{count, plural, other {#}} favorilerden çıkarıldı",
+  "removed_from_favorites": "Gözdelerden kaldırıldı",
+  "removed_from_favorites_count": "{count, plural, other {#}} gözdelerden çıkarıldı",
   "removed_memory": "Anı kaldırıldı",
   "removed_photo_from_memory": "Fotoğraf anıdan kaldırıldı",
   "removed_tagged_assets": "{count, plural, one {# dosya} other {# dosya}} etiketleri kaldırıldı",
@@ -1460,7 +1558,7 @@
   "search_by_context": "Bağlama göre ara",
   "search_by_description": "Açıklamaya göre ara",
   "search_by_description_example": "Sapa'da yürüyüş günü",
-  "search_by_filename": "Dosya adına göre ara",
+  "search_by_filename": "Dosya adına veya uzantısına göre ara",
   "search_by_filename_example": "Örn. IMG_1234.JPG veya PNG",
   "search_camera_make": "Kamera markasına göre ara...",
   "search_camera_model": "Kamera modeline göre ara...",
@@ -1473,6 +1571,7 @@
   "search_filter_date_title": "Tarih aralığı seç",
   "search_filter_display_option_not_in_album": "Albümde değil",
   "search_filter_display_options": "Görüntü Seçenekleri",
+  "search_filter_filename": "Dosya adına göre ara",
   "search_filter_location": "Konum",
   "search_filter_location_title": "Konum seç",
   "search_filter_media_type": "Medya Türü",
@@ -1480,8 +1579,10 @@
   "search_filter_people_title": "Kişi seç",
   "search_for": "Araştır",
   "search_for_existing_person": "Mevcut bir kişiyi ara",
+  "search_no_more_result": "Daha fazla sonuç yok",
   "search_no_people": "Kişi yok",
   "search_no_people_named": "\"{name}\" isimli bir kişi yok",
+  "search_no_result": "Sonuç bulunamadı. Farklı bir arama terimi veya kombinasyon deneyin",
   "search_options": "Arama seçenekleri",
   "search_page_categories": "Kategoriler",
   "search_page_motion_photos": "Canlı Fotoğraflar",
@@ -1509,9 +1610,11 @@
   "searching_locales": "Yerleri arıyor...",
   "second": "Saniye",
   "see_all_people": "Tüm kişileri gör",
+  "select": "Seç",
   "select_album_cover": "Albüm kapağı seç",
   "select_all": "Tümünü seç",
   "select_all_duplicates": "Tüm çiftleri seç",
+  "select_all_in": "{group} içindekilerin tümünü seç",
   "select_avatar_color": "Avatar rengini seç",
   "select_face": "Yüzü seç",
   "select_featured_photo": "Öne çıkan fotoğrafı seç",
@@ -1519,6 +1622,7 @@
   "select_keep_all": "Hepsini sakla",
   "select_library_owner": "Kütüphane sahibini seç",
   "select_new_face": "Yeni yüz seç",
+  "select_person_to_tag": "Etiketlemek için bir kişi seçin",
   "select_photos": "Fotoğrafları seç",
   "select_trash_all": "Hepsini çöpe at",
   "select_user_for_sharing_page_err_album": "Albüm oluşturulamadı",
@@ -1531,6 +1635,7 @@
   "server_info_box_server_url": "Sunucu URL",
   "server_offline": "Sunucu çevrimdışı",
   "server_online": "Sunucu çevrimiçi",
+  "server_privacy": "Sunucu Gizliliği",
   "server_stats": "Sunucu istatistikleri",
   "server_version": "Sunucu versiyonu",
   "set": "Ayarla",
@@ -1540,6 +1645,7 @@
   "set_date_of_birth": "Doğum tarihini ayarla",
   "set_profile_picture": "Profil resmini ayarla",
   "set_slideshow_to_fullscreen": "Slayt gösterisini tam ekran yap",
+  "set_stack_primary_asset": "Birincil varlık olarak ayarla",
   "setting_image_viewer_help": "Görüntüleyici önce küçük resmi gösterir, ardından orta boy önizlemeyi (etkinleştirilmişse) ve son olarak orijinali (etkinleştirilmişse) gösterir.",
   "setting_image_viewer_original_subtitle": "Orijinal tam çözünürlüklü görüntüyü göstermek için etkinleştirin. Veri kullanımını azaltmak için devre dışı bırakın (hem ağ hem de cihaz önbelleği).",
   "setting_image_viewer_original_title": "Orijinal görüntüyü göster",
@@ -1560,6 +1666,8 @@
   "setting_notifications_total_progress_subtitle": "Toplam yükleme ilerlemesi (tamamlanan/toplam)",
   "setting_notifications_total_progress_title": "Arkaplan yedeklemesi toplam ilerlemesini göster",
   "setting_video_viewer_looping_title": "Döngü",
+  "setting_video_viewer_original_video_subtitle": "Sunucudan video aktarılırken, transcode (dönüştürülmüş) sürüm mevcut olsa bile orijinal dosya oynatılır. Bu durum, arabelleğe alma (buffering) sorunlarına yol açabilir. Videolar yerel olarak mevcutsa, bu ayardan bağımsız olarak orijinal kalitede oynatılır.",
+  "setting_video_viewer_original_video_title": "Orijinal videoyu zorla",
   "settings": "Ayarlar",
   "settings_require_restart": "Bu ayarı uygulamak için lütfen Immich'i yeniden başlatın",
   "settings_saved": "Ayarlar kaydedildi",
@@ -1568,6 +1676,7 @@
   "share_add_photos": "Fotoğraf ekle",
   "share_assets_selected": "{count} seçili",
   "share_dialog_preparing": "Hazırlanıyor...",
+  "share_link": "Bağlantıyı Paylaş",
   "shared": "Paylaşılan",
   "shared_album_activities_input_disable": "Yoruma kapalı",
   "shared_album_activity_remove_content": "Bu etkinliği silmek istiyor musunuz?",
@@ -1580,6 +1689,7 @@
   "shared_by_user": "{user} tarafından paylaşıldı",
   "shared_by_you": "Senin tarafından paylaşıldı",
   "shared_from_partner": "{partner} tarafından paylaşılan fotoğraflar",
+  "shared_intent_upload_button_progress_text": "{current} / {total} Yüklendi",
   "shared_link_app_bar_title": "Paylaşılan Bağlantılar",
   "shared_link_clipboard_copied_massage": "Panoya kopyalandı",
   "shared_link_clipboard_text": "Bağlantı: {link}\nParola: {password}",
@@ -1606,6 +1716,7 @@
   "shared_link_expires_second": "Süresi {count} saniye içinde doluyor",
   "shared_link_expires_seconds": "{count} sanyei içinde süresi doluyor",
   "shared_link_individual_shared": "Bireysel paylaşımlı",
+  "shared_link_info_chip_metadata": "EXIF",
   "shared_link_manage_links": "Paylaşılan Bağlantıları Yönet",
   "shared_link_options": "Paylaşılan bağlantı seçenekleri",
   "shared_links": "Paylaşılan bağlantılar",
@@ -1672,12 +1783,14 @@
   "start_date": "Başlangıç tarihi",
   "state": "Eyalet/İl",
   "status": "Durum",
+  "stop_casting": "Yansıtmayı durdur",
   "stop_motion_photo": "Hareketli fotoğrafı durdur",
   "stop_photo_sharing": "Fotoğraflarınızı paylaşmayı durdurmak mı istiyorsunuz?",
   "stop_photo_sharing_description": "{partner} artık fotoğraflarınıza erişemeyecek.",
   "stop_sharing_photos_with_user": "Bu kullanıcı ile fotoğraflarınızı paylaşmayı durdurun",
   "storage": "Depolama alanı",
   "storage_label": "Depolama yolu",
+  "storage_quota": "Depolama Kotası",
   "storage_usage": "{used} / {available} kullanıldı",
   "submit": "Gönder",
   "suggestions": "Öneriler",
@@ -1714,7 +1827,7 @@
   "theme_setting_system_primary_color_title": "Sistem rengini kullan",
   "theme_setting_system_theme_switch": "Otomatik (sistem ayarına göre)",
   "theme_setting_theme_subtitle": "Uygulama teması seç",
-  "theme_setting_three_stage_loading_subtitle": "Üç aşamalı yükleme yükleme performansını artırabilir ancak önemli ölçüde daha yüksek ağ yüküne sebep olur.",
+  "theme_setting_three_stage_loading_subtitle": "Üç aşamalı yükleme, yükleme performansını artırabilir ancak önemli ölçüde daha yüksek ağ yüküne sebep olur.",
   "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",
@@ -1723,7 +1836,7 @@
   "timezone": "Zaman dilimi",
   "to_archive": "Arşivle",
   "to_change_password": "Şifreyi değiştir",
-  "to_favorite": "Favorilere ekle",
+  "to_favorite": "Gözdelere ekle",
   "to_login": "Oturum aç",
   "to_parent": "Üst öğeye git",
   "to_trash": "Çöpe taşı",
@@ -1749,7 +1862,8 @@
   "unable_to_setup_pin_code": "PIN kodu ayarlanamadı",
   "unarchive": "Arşivden çıkar",
   "unarchived_count": "{count, plural, other {# arşivden çıkarıldı}}",
-  "unfavorite": "Favorilerden kaldır",
+  "undo": "Geri al",
+  "unfavorite": "Gözdelerden kaldır",
   "unhide_person": "Kişiyi göster",
   "unknown": "Bilinmeyen",
   "unknown_country": "Bilinmeyen ülke",
@@ -1765,9 +1879,11 @@
   "unsaved_change": "Kaydedilmemiş değişiklik",
   "unselect_all": "Tümünü seçimini kaldır",
   "unselect_all_duplicates": "Tüm çiftlerin seçimini kaldır",
+  "unselect_all_in": "{group} içindeki tüm seçimleri kaldır",
   "unstack": "Yığını kaldır",
   "unstacked_assets_count": "{count, plural, one {# dosya} other {# dosya}} yığını kaldırıldı",
   "up_next": "Sıradaki",
+  "updated_at": "Güncellenme",
   "updated_password": "Şifreyi güncelle",
   "upload": "Yükle",
   "upload_concurrency": "Yükleme eşzamanlılığı",
@@ -1780,14 +1896,20 @@
   "upload_status_errors": "Hatalar",
   "upload_status_uploaded": "Yüklendi",
   "upload_success": "Yükleme başarılı, yüklenen yeni ögeleri görebilmek için sayfayı yenileyin.",
+  "upload_to_immich": "Immich'e Yükle ({count})",
+  "uploading": "Yükleniyor",
+  "url": "URL",
   "usage": "Kullanım",
+  "use_biometric": "Biyometri kullan",
   "use_current_connection": "mevcut bağlantıyı kullan",
   "use_custom_date_range": "Bunun yerine özel tarih aralığını kullan",
   "user": "Kullanıcı",
+  "user_has_been_deleted": "Bu kullanıcı silindi.",
   "user_id": "Kullanıcı ID",
   "user_liked": "{type, select, photo {Bu fotoğraf} video {Bu video} asset {Bu dosya} other {Bu}} {user} tarafından beğenildi",
   "user_pin_code_settings": "PIN Kodu",
   "user_pin_code_settings_description": "PIN kodunuzu yönetin",
+  "user_privacy": "Kullanıcı Gizliliği",
   "user_purchase_settings": "Satın Alma",
   "user_purchase_settings_description": "Satın alma işlemlerini yönet",
   "user_role_set": "{user}, {role} olarak ayarlandı",
@@ -1805,6 +1927,7 @@
   "version_announcement_message": "Merhaba! Immich'in yeni bir sürümü mevcut. Lütfen yapılandırmanızın güncel olduğundan emin olmak için <link>sürüm notlarını</link> okumak için biraz zaman ayırın, özellikle WatchTower veya Immich kurulumunuzu otomatik olarak güncelleyen bir mekanizma kullanıyorsanız yanlış yapılandırmaların önüne geçmek adına bu önemlidir.",
   "version_history": "Versiyon geçmişi",
   "version_history_item": "{version}, {date} tarihinde kuruldu",
+  "video": "Video",
   "video_hover_setting": "Üzerinde durulduğunda video önizlemesi oynat",
   "video_hover_setting_description": "Öğe üzerinde fareyle durulduğunda video küçük resmini oynatır. Bu özellik devre dışıyken, oynatma simgesine fareyle gidilerek oynatma başlatılabilir.",
   "videos": "Videolar",
@@ -1819,7 +1942,9 @@
   "view_name": "Göster",
   "view_next_asset": "Sonraki dosyayı görüntüle",
   "view_previous_asset": "Önceki dosyayı görüntüle",
+  "view_qr_code": "QR kodu görüntüle",
   "view_stack": "Yığını görüntüle",
+  "view_user": "Kullanıcıyı Görüntüle",
   "viewer_remove_from_stack": "Yığından Kaldır",
   "viewer_stack_use_as_main_asset": "Ana fotoğraf olarak kullan",
   "viewer_unstack": "Yığını Kaldır",
@@ -1830,6 +1955,7 @@
   "welcome": "Hoş geldiniz",
   "welcome_to_immich": "Immich'e hoş geldiniz",
   "wifi_name": "Wi-Fi Adı",
+  "wrong_pin_code": "Yanlış PIN kodu",
   "year": "Yıl",
   "years_ago": "{years, plural, one {bir yıl} other {# yıl}} önce",
   "yes": "Evet",
diff --git a/i18n/uk.json b/i18n/uk.json
index 7b843ceff9..8a375e627a 100644
--- a/i18n/uk.json
+++ b/i18n/uk.json
@@ -244,6 +244,7 @@
     "storage_template_migration_info": "Шаблон зберігання конвертуватиме всі розширення у нижній регістр. Зміни шаблону застосовуватимуться лише до нових ресурсів. Щоб застосувати шаблон до раніше завантажених ресурсів, запустіть <link>{job}</link>.",
     "storage_template_migration_job": "Завдання міграції шаблону зберігання",
     "storage_template_more_details": "Для отримання детальнішої інформації про цю функцію, звертайтесь до <template-link>Шаблону зберігання</template-link> та його <implications-link>наслідків</implications-link>",
+    "storage_template_onboarding_description_v2": "Якщо цю функцію увімкнено, файли будуть автоматично впорядковуватися за шаблоном, визначеним користувачем. Докладніше дивіться в <link>документації</link>.",
     "storage_template_path_length": "Приблизна максимальна довжина шляху: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Шаблон сховища",
     "storage_template_settings_description": "Керуйте структурою тек та іменем завантаженого файлу",
@@ -463,7 +464,6 @@
   "assets": "елементи",
   "assets_added_count": "Додано {count, plural, one {# ресурс} few {# ресурси} other {# ресурсів}}",
   "assets_added_to_album_count": "Додано {count, plural, one {# ресурс} few {# ресурси} other {# ресурсів}} до альбому",
-  "assets_added_to_name_count": "Додано {count, plural, one {# елемент} other {# елементів}} до {hasName, select, true {<b>{name}</b>} other {нового альбому}}",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Ресурс} other {Ресурси}} не можна додати до альбому",
   "assets_count": "{count, plural, one {# ресурс} few {# ресурси} other {# ресурсів}}",
   "assets_deleted_permanently": "{count} елемент(и) остаточно видалено",
@@ -702,7 +702,6 @@
   "daily_title_text_date": "Е, МММ дд",
   "daily_title_text_date_year": "Е, МММ дд, рррр",
   "dark": "Темний",
-  "darkTheme": "Перемкнути темну тему",
   "date_after": "Дата після",
   "date_and_time": "Дата і час",
   "date_before": "Дата до",
diff --git a/i18n/vi.json b/i18n/vi.json
index 5890ef87db..10c883dc70 100644
--- a/i18n/vi.json
+++ b/i18n/vi.json
@@ -461,7 +461,6 @@
   "assets": "Các tập tin",
   "assets_added_count": "Đã thêm {count, plural, one {# mục} other {# mục}}",
   "assets_added_to_album_count": "Đã thêm {count, plural, one {# mục} other {# mục}} vào album",
-  "assets_added_to_name_count": "Đã thêm {count, plural, one {# mục} other {# mục}} vào {hasName, select, true {<b>{name}</b>} other {album mới}}",
   "assets_count": "{count, plural, one {# mục} other {# mục}}",
   "assets_deleted_permanently": "Đã xoá vĩnh viễn {count} mục",
   "assets_deleted_permanently_from_server": "Đã xoá vĩnh viễn {count} mục khỏi máy chủ Immich",
@@ -534,7 +533,7 @@
   "backup_controller_page_start_backup": "Bắt đầu sao lưu",
   "backup_controller_page_status_off": "Sao lưu tự động khi ứng dụng hoạt động đang tắt",
   "backup_controller_page_status_on": "Sao lưu tự động khi ứng dụng hoạt động đang bật",
-  "backup_controller_page_storage_format": "Đã sử dụng {used} của {total}",
+  "backup_controller_page_storage_format": "Đã dùng {used} của {total}",
   "backup_controller_page_to_backup": "Các album cần được sao lưu",
   "backup_controller_page_total_sub": "Tất cả ảnh và video không trùng lập từ các album được chọn",
   "backup_controller_page_turn_off": "Tắt sao lưu khi ứng dụng hoạt động",
@@ -698,7 +697,6 @@
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Tối",
-  "darkTheme": "Chuyển đổi chủ đề tối",
   "date_after": "Ngày sau",
   "date_and_time": "Ngày và giờ",
   "date_before": "Ngày trước",
@@ -1016,7 +1014,7 @@
   "group_year": "Nhóm theo năm",
   "haptic_feedback_switch": "Bật phản hồi haptic",
   "haptic_feedback_title": "Phản hồi Hapic",
-  "has_quota": "Có hạn mức",
+  "has_quota": "Hạn mức",
   "header_settings_add_header_tip": "Thêm Header",
   "header_settings_field_validator_msg": "Trường này không được để trống",
   "header_settings_header_name_input": "Tên Header",
@@ -1426,7 +1424,7 @@
   "purchase_button_activate": "Kích hoạt",
   "purchase_button_buy": "Mua",
   "purchase_button_buy_immich": "Mua Immich",
-  "purchase_button_never_show_again": "Không hiển thị lại",
+  "purchase_button_never_show_again": "Không hiện lại",
   "purchase_button_reminder": "Nhắc tôi trong 30 ngày",
   "purchase_button_remove_key": "Xóa khóa",
   "purchase_button_select": "Chọn",
@@ -1504,7 +1502,7 @@
   "rename": "Đổi tên",
   "repair": "Sửa chữa",
   "repair_no_results_message": "Các tập tin không được theo dõi và bị mất sẽ xuất hiện ở đây",
-  "replace_with_upload": "Thay thế bằng tập tin tải lên",
+  "replace_with_upload": "Thay thế tập tin khác",
   "repository": "Kho lưu trữ",
   "require_password": "Yêu cầu mật khẩu",
   "require_user_to_change_password_on_first_login": "Yêu cầu người dùng thay đổi mật khẩu ở lần đầu đăng nhập",
@@ -1522,7 +1520,7 @@
   "restored_asset": "Ảnh đã được khôi phục",
   "resume": "Tiếp tục",
   "retry_upload": "Thử tải lên lại",
-  "review_duplicates": "Xem xét các mục trùng lặp",
+  "review_duplicates": "Xem lại các mục trùng lặp",
   "role": "Vai trò",
   "role_editor": "Người chỉnh sửa",
   "role_viewer": "Người xem",
@@ -1617,7 +1615,7 @@
   "server_info_box_app_version": "Phiên bản ứng dụng",
   "server_info_box_server_url": "Địa chỉ máy chủ",
   "server_offline": "Máy chủ ngoại tuyến",
-  "server_online": "Máy chủ trực tuyến",
+  "server_online": "Phiên bản",
   "server_privacy": "Quyền riêng tư máy chủ",
   "server_stats": "Thống kê máy chủ",
   "server_version": "Phiên bản máy chủ",
@@ -1772,7 +1770,7 @@
   "storage": "Bộ nhớ",
   "storage_label": "Nhãn lưu trữ",
   "storage_quota": "Giới hạn Dung lượng",
-  "storage_usage": "Đã sử dụng {used} của {available}",
+  "storage_usage": "Đã dùng {used} của {available}",
   "submit": "Gửi",
   "suggestions": "Gợi ý",
   "sunrise_on_the_beach": "Bình minh trên bãi biển",
@@ -1819,7 +1817,7 @@
   "to_change_password": "Đổi mật khẩu",
   "to_favorite": "Yêu thích",
   "to_login": "Đăng nhập",
-  "to_parent": "Đi tới thư mục cha",
+  "to_parent": "Về thư mục gốc",
   "to_trash": "Xóa",
   "toggle_settings": "Chuyển đổi cài đặt",
   "total": "Tổng cộng",
@@ -1894,7 +1892,7 @@
   "user_purchase_settings_description": "Quản lý mục mua của bạn",
   "user_role_set": "Đặt {user} làm {role}",
   "user_usage_detail": "Chi tiết sử dụng của người dùng",
-  "user_usage_stats": "Thống kê sử dụng của tài khoản",
+  "user_usage_stats": "Thống kê sử dụng tài khoản",
   "user_usage_stats_description": "Xem thống kê sử dụng của tài khoản",
   "username": "Tên người dùng",
   "users": "Người dùng",
diff --git a/i18n/zh_Hant.json b/i18n/zh_Hant.json
index e5a8a65e25..334da7bfb1 100644
--- a/i18n/zh_Hant.json
+++ b/i18n/zh_Hant.json
@@ -464,7 +464,6 @@
   "assets": "項目",
   "assets_added_count": "已新增 {count, plural, one {# 個項目} other {# 個項目}}",
   "assets_added_to_album_count": "已將 {count, plural, other {# 個項目}}加入相簿",
-  "assets_added_to_name_count": "已將 {count, plural, other {# 個項目}}加入{hasName, select, true {<b>{name}</b>} other {新相簿}}",
   "assets_cannot_be_added_to_album_count": "{count. plural, one {個} other {個}} 項目未能被添加至相簿",
   "assets_count": "{count, plural, one {# 個項目} other {# 個項目}}",
   "assets_deleted_permanently": "{count} 個項目已被永久刪除",
@@ -699,7 +698,6 @@
   "daily_title_text_date": "E, MMM dd",
   "daily_title_text_date_year": "YYYY年M月D日 (E)",
   "dark": "深色",
-  "darkTheme": "切換爲深色主題",
   "date_after": "日期之後",
   "date_and_time": "日期與時間",
   "date_before": "日期之前",
diff --git a/i18n/zh_SIMPLIFIED.json b/i18n/zh_SIMPLIFIED.json
index 17c6954ab7..28d6a5c0d5 100644
--- a/i18n/zh_SIMPLIFIED.json
+++ b/i18n/zh_SIMPLIFIED.json
@@ -166,6 +166,20 @@
     "metadata_settings_description": "管理元数据设置",
     "migration_job": "迁移",
     "migration_job_description": "将项目和人脸识别的缩略图迁移到最新的文件夹结构",
+    "nightly_tasks_cluster_faces_setting_description": "对新检测到的面部进行面部识别",
+    "nightly_tasks_cluster_new_faces_setting": "群组新面孔",
+    "nightly_tasks_database_cleanup_setting": "数据库清理任务",
+    "nightly_tasks_database_cleanup_setting_description": "清理数据库中过期的旧数据",
+    "nightly_tasks_generate_memories_setting": "生成回忆",
+    "nightly_tasks_generate_memories_setting_description": "从项目中生成新的回忆",
+    "nightly_tasks_missing_thumbnails_setting": "生成缺失的缩略图",
+    "nightly_tasks_missing_thumbnails_setting_description": "为生成缩略图队列无缩略图的项目",
+    "nightly_tasks_settings": "夜间任务设置",
+    "nightly_tasks_settings_description": "管理夜间任务",
+    "nightly_tasks_start_time_setting": "开始时间",
+    "nightly_tasks_start_time_setting_description": "服务器开始运行夜间任务的时间",
+    "nightly_tasks_sync_quota_usage_setting": "同步配额使用情况",
+    "nightly_tasks_sync_quota_usage_setting_description": "根据当前使用情况更新用户存储配额",
     "no_paths_added": "无已添加路径",
     "no_pattern_added": "无已添加规则",
     "note_apply_storage_label_previous_assets": "提示：要将存储标签应用于之前上传的项目，需要运行",
@@ -196,6 +210,8 @@
     "oauth_mobile_redirect_uri": "移动端重定向 URI",
     "oauth_mobile_redirect_uri_override": "移动端重定向 URI 覆盖",
     "oauth_mobile_redirect_uri_override_description": "当 OAuth 提供商不允许使用移动 URI 时启用，如“''{callback}''”",
+    "oauth_role_claim": "角色声明",
+    "oauth_role_claim_description": "根据此声明的存在自动授予管理员访问权限。声明可以是“user”（用户）或“admin”（管理员）。",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "管理 OAuth 登录设置",
     "oauth_settings_more_details": "关于此功能的更多详细信息，请查看<link>相关文档</link>。",
@@ -357,6 +373,8 @@
   "admin_password": "管理员密码",
   "administration": "系统管理",
   "advanced": "高级",
+  "advanced_settings_beta_timeline_subtitle": "体验全新的应用程序",
+  "advanced_settings_beta_timeline_title": "测试版时间线",
   "advanced_settings_enable_alternate_media_filter_subtitle": "使用此选项可在同步过程中根据备用条件筛选项目。仅当您在应用程序检测所有相册均遇到问题时才尝试此功能。",
   "advanced_settings_enable_alternate_media_filter_title": "[实验] 使用备用的设备相册同步筛选条件",
   "advanced_settings_log_level_title": "日志等级: {level}",
@@ -388,6 +406,7 @@
   "album_options": "相册设置",
   "album_remove_user": "移除用户？",
   "album_remove_user_confirmation": "确定要移除“{user}”吗？",
+  "album_search_not_found": "未找到符合搜索条件的相册",
   "album_share_no_users": "看起来您已与所有用户共享了此相册，或者您根本没有任何用户可共享。",
   "album_updated": "相册有更新",
   "album_updated_setting_description": "当共享相册有新项目时接收邮件通知",
@@ -407,6 +426,7 @@
   "albums_default_sort_order": "默认相册排序方式",
   "albums_default_sort_order_description": "创建新相册时的项目初始排序方式。",
   "albums_feature_description": "可与其他用户共享的项目收藏。",
+  "albums_on_device_count": "设备上的相册（{count} 个）",
   "all": "全部",
   "all_albums": "所有相册",
   "all_people": "全部人物",
@@ -427,12 +447,13 @@
   "app_settings": "应用设置",
   "appears_in": "出现于",
   "archive": "归档",
+  "archive_action_prompt": "已将 {count} 项添加到归档",
   "archive_or_unarchive_photo": "归档或取消归档照片",
   "archive_page_no_archived_assets": "未找到归档项目",
   "archive_page_title": "归档（{count}）",
   "archive_size": "归档大小",
   "archive_size_description": "配置下载归档大小（GB）",
-  "archived": "已存档",
+  "archived": "已归档",
   "archived_count": "{count, plural, other {已归档 # 项}}",
   "are_these_the_same_person": "他们是同一位人吗？",
   "are_you_sure_to_do_this": "确定要这样做吗？",
@@ -464,7 +485,6 @@
   "assets": "项目",
   "assets_added_count": "已添加{count, plural, one {#个项目} other {#个项目}}",
   "assets_added_to_album_count": "已添加{count, plural, one {#个项目} other {#个项目}}到相册",
-  "assets_added_to_name_count": "已添加{count, plural, one {#个项目} other {#个项目}}到{hasName, select, true {<b>{name}</b>} other {新相册}}",
   "assets_cannot_be_added_to_album_count": "无法添加 {count, plural, one {个项目} other {个项目}} 到相册中",
   "assets_count": "{count, plural, one {#个项目} other {#个项目}}",
   "assets_deleted_permanently": "{count} 个项目已被永久删除",
@@ -587,6 +607,7 @@
   "cancel": "取消",
   "cancel_search": "取消搜索",
   "canceled": "已取消",
+  "canceling": "取消中",
   "cannot_merge_people": "无法合并人物",
   "cannot_undo_this_action": "注意：该操作无法被撤消！",
   "cannot_update_the_description": "无法更新描述",
@@ -703,7 +724,7 @@
   "daily_title_text_date": "MMM dd (E)",
   "daily_title_text_date_year": "YYYY年M月D日 (E)",
   "dark": "深色",
-  "darkTheme": "暗色主题",
+  "dark_theme": "切换深色主题",
   "date_after": "开始日期",
   "date_and_time": "日期与时间",
   "date_before": "结束日期",
@@ -719,6 +740,7 @@
   "default_locale": "默认地区",
   "default_locale_description": "根据您的浏览器地区设置日期和数字显示格式",
   "delete": "删除",
+  "delete_action_prompt": "已永久删除 {count} 项",
   "delete_album": "删除相册",
   "delete_api_key_prompt": "确定删除此 API 密钥吗？",
   "delete_dialog_alert": "这些项目将从 Immich 和您的设备中永久删除",
@@ -732,6 +754,7 @@
   "delete_key": "删除密钥",
   "delete_library": "删除图库",
   "delete_link": "删除链接",
+  "delete_local_action_prompt": "已删除本地项目{count}项",
   "delete_local_dialog_ok_backed_up_only": "仅删除已备份项目",
   "delete_local_dialog_ok_force": "确认删除",
   "delete_others": "删除其它",
@@ -745,6 +768,7 @@
   "description": "描述",
   "description_input_hint_text": "添加描述...",
   "description_input_submit_error": "更新描述时出错，请检查日志以获取更多详细信息",
+  "deselect_all": "取消全选",
   "details": "详情",
   "direction": "方向",
   "disabled": "已禁用",
@@ -762,6 +786,7 @@
   "documentation": "帮助文档",
   "done": "完成",
   "download": "下载",
+  "download_action_prompt": "正在下载 {count} 个项目",
   "download_canceled": "下载已取消",
   "download_complete": "下载完成",
   "download_enqueue": "已加入下载队列",
@@ -799,6 +824,7 @@
   "edit_key": "编辑 API 密钥",
   "edit_link": "编辑链接",
   "edit_location": "编辑位置",
+  "edit_location_action_prompt": "{count} 个位置已编辑",
   "edit_location_dialog_title": "位置",
   "edit_name": "编辑名称",
   "edit_people": "编辑人物",
@@ -817,6 +843,7 @@
   "empty_trash": "清空回收站",
   "empty_trash_confirmation": "确定要清空回收站？这将永久删除回收站中的所有项目。\n注意：该操作无法撤消！",
   "enable": "启用",
+  "enable_backup": "启用备份",
   "enable_biometric_auth_description": "输入您的PIN码以启用生物识别身份验证",
   "enabled": "已启用",
   "end_date": "结束日期",
@@ -984,6 +1011,7 @@
   "failed_to_load_assets": "加载项目失败",
   "failed_to_load_folder": "加载文件夹失败",
   "favorite": "收藏",
+  "favorite_action_prompt": "已将 {count} 项添加到收藏",
   "favorite_or_unfavorite_photo": "收藏或取消收藏照片",
   "favorites": "收藏夹",
   "favorites_page_no_favorites": "未找到收藏项目",
@@ -1127,6 +1155,7 @@
   "library_page_sort_created": "创建日期",
   "library_page_sort_last_modified": "上次修改",
   "library_page_sort_title": "相册标题",
+  "licenses": "许可证",
   "light": "浅色",
   "like_deleted": "已删除的收藏",
   "link_motion_video": "链接动态视频",
@@ -1246,6 +1275,7 @@
   "more": "更多",
   "move": "移动",
   "move_off_locked_folder": "移出锁定文件夹",
+  "move_to_lock_folder_action_prompt": "已将 {count} 项添加到锁定文件夹",
   "move_to_locked_folder": "移动到锁定文件夹",
   "move_to_locked_folder_confirmation": "这些照片和视频将从所有相册中移除，只能在锁定文件夹中查看",
   "moved_to_archive": "已归档 {count, plural, one {# 个项目} other {# 个项目}}",
@@ -1460,6 +1490,7 @@
   "purchase_server_description_2": "支持者状态",
   "purchase_server_title": "服务器",
   "purchase_settings_server_activated": "服务器产品密钥正在由管理员管理",
+  "queue_status": "排队中 {count}/{total}",
   "rating": "星级",
   "rating_clear": "删除星级",
   "rating_count": "{count, plural, one {#星} other {#星}}",
@@ -1495,7 +1526,9 @@
   "remove_custom_date_range": "取消自定义日期范围",
   "remove_deleted_assets": "彻底删除文件",
   "remove_from_album": "从相册中移除",
+  "remove_from_album_action_prompt": "从相册中移除了 {count} 项",
   "remove_from_favorites": "移出收藏",
+  "remove_from_lock_folder_action_prompt": "已从锁定的文件夹中移除 {count} 项",
   "remove_from_locked_folder": "从锁定文件夹中移除",
   "remove_from_locked_folder_confirmation": "您确定要将这些照片和视频移出锁定文件夹吗？移出后它们将会在您的图库中可见。",
   "remove_from_shared_link": "从共享链接中移除",
@@ -1667,6 +1700,7 @@
   "settings_saved": "设置已保存",
   "setup_pin_code": "设置PIN码",
   "share": "共享",
+  "share_action_prompt": "已共享 {count} 项目",
   "share_add_photos": "添加项目",
   "share_assets_selected": "{count} 已选择",
   "share_dialog_preparing": "正在准备...",
@@ -1768,6 +1802,7 @@
   "sort_title": "标题",
   "source": "GitHub 源代码",
   "stack": "堆叠",
+  "stack_action_prompt": "{count} 个已堆叠",
   "stack_duplicates": "堆叠重复项目",
   "stack_select_one_photo": "为堆叠选择一张展示图",
   "stack_selected_photos": "堆叠选定的照片",
@@ -1838,6 +1873,7 @@
   "total": "总计",
   "total_usage": "总用量",
   "trash": "回收站",
+  "trash_action_prompt": "已将 {count} 项移至回收站",
   "trash_all": "全部删除",
   "trash_count": "删除{count, number}项",
   "trash_delete_asset": "将项目放入回收站/删除",
@@ -1855,9 +1891,11 @@
   "unable_to_change_pin_code": "无法修改PIN码",
   "unable_to_setup_pin_code": "无法设置PIN码",
   "unarchive": "取消归档",
+  "unarchive_action_prompt": "已从归档中移除 {count} 项",
   "unarchived_count": "{count, plural, other {取消归档 # 项}}",
   "undo": "撤销",
   "unfavorite": "取消收藏",
+  "unfavorite_action_prompt": "已从收藏中移除 {count} 项",
   "unhide_person": "显示人物",
   "unknown": "未知",
   "unknown_country": "未知的国家",
@@ -1875,12 +1913,15 @@
   "unselect_all_duplicates": "取消选择所有重复项",
   "unselect_all_in": "取消选择 {group} 中的所有内容",
   "unstack": "取消堆叠",
+  "unstack_action_prompt": "{count} 个未堆叠",
   "unstacked_assets_count": "{count, plural, one {#个项目} other {#个项目}}已取消堆叠",
+  "untagged": "无标签",
   "up_next": "下一个",
   "updated_at": "已更新",
   "updated_password": "更新密码",
   "upload": "上传",
   "upload_concurrency": "上传并发",
+  "upload_details": "上传详情",
   "upload_dialog_info": "是否要将所选项目备份到服务器？",
   "upload_dialog_title": "上传项目",
   "upload_errors": "上传完成，出现{count, plural, one {#个错误} other {#个错误}}，刷新页面以查看新上传的项目。",
@@ -1912,6 +1953,7 @@
   "user_usage_stats_description": "查看帐户使用统计信息",
   "username": "用户名",
   "users": "用户",
+  "users_added_to_album_count": "已将 {count, plural, one {# 个用户} other {# 个用户}} 添加到相册",
   "utilities": "实用工具",
   "validate": "验证",
   "validate_endpoint_error": "请输入有效的 URL",
@@ -1930,6 +1972,7 @@
   "view_album": "查看相册",
   "view_all": "查看全部",
   "view_all_users": "查看全部用户",
+  "view_details": "查看详情",
   "view_in_timeline": "在时间轴中查看",
   "view_link": "查看链接",
   "view_links": "查看链接",

From 166452640d6d421d4ff1281134e5cf0a39971895 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 10:28:15 +0100
Subject: [PATCH 262/337] chore(deps): update dependency @types/node to
 ^22.16.4 (#20068)

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

diff --git a/cli/package-lock.json b/cli/package-lock.json
index 7c87c3be2e..0d3db4cffa 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -27,7 +27,7 @@
         "@types/lodash-es": "^4.17.12",
         "@types/micromatch": "^4.0.9",
         "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.15.33",
+        "@types/node": "^22.16.4",
         "@vitest/coverage-v8": "^3.0.0",
         "byte-size": "^9.0.0",
         "cli-progress": "^3.12.0",
@@ -61,7 +61,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.33",
+        "@types/node": "^22.16.4",
         "typescript": "^5.3.3"
       }
     },
@@ -1355,9 +1355,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.15.34",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.34.tgz",
-      "integrity": "sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==",
+      "version": "22.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.16.5.tgz",
+      "integrity": "sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/cli/package.json b/cli/package.json
index e1f49475c0..3fde7e8b02 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -21,7 +21,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.15.33",
+    "@types/node": "^22.16.4",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index 1e2f8b47e1..1884b22dd5 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -16,7 +16,7 @@
         "@playwright/test": "^1.44.1",
         "@socket.io/component-emitter": "^3.1.2",
         "@types/luxon": "^3.4.2",
-        "@types/node": "^22.15.33",
+        "@types/node": "^22.16.4",
         "@types/oidc-provider": "^9.0.0",
         "@types/pg": "^8.15.1",
         "@types/pngjs": "^6.0.4",
@@ -68,7 +68,7 @@
         "@types/lodash-es": "^4.17.12",
         "@types/micromatch": "^4.0.9",
         "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.15.33",
+        "@types/node": "^22.16.4",
         "@vitest/coverage-v8": "^3.0.0",
         "byte-size": "^9.0.0",
         "cli-progress": "^3.12.0",
@@ -102,7 +102,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.33",
+        "@types/node": "^22.16.4",
         "typescript": "^5.3.3"
       }
     },
@@ -1996,9 +1996,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.15.34",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.34.tgz",
-      "integrity": "sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==",
+      "version": "22.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.16.5.tgz",
+      "integrity": "sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/e2e/package.json b/e2e/package.json
index 24b97bb4b7..c780a93a24 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -26,7 +26,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.15.33",
+    "@types/node": "^22.16.4",
     "@types/oidc-provider": "^9.0.0",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
diff --git a/open-api/typescript-sdk/package-lock.json b/open-api/typescript-sdk/package-lock.json
index ab9f3b1fd7..01086f3113 100644
--- a/open-api/typescript-sdk/package-lock.json
+++ b/open-api/typescript-sdk/package-lock.json
@@ -12,7 +12,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.33",
+        "@types/node": "^22.16.4",
         "typescript": "^5.3.3"
       }
     },
@@ -23,9 +23,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.15.34",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.34.tgz",
-      "integrity": "sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==",
+      "version": "22.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.16.5.tgz",
+      "integrity": "sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json
index f2885f4a7b..c1bf8b4f65 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.15.33",
+    "@types/node": "^22.16.4",
     "typescript": "^5.3.3"
   },
   "repository": {
diff --git a/server/package-lock.json b/server/package-lock.json
index 11be49ecb6..1239730fce 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -109,7 +109,7 @@
         "@types/luxon": "^3.6.2",
         "@types/mock-fs": "^4.13.1",
         "@types/multer": "^1.4.7",
-        "@types/node": "^22.15.33",
+        "@types/node": "^22.16.4",
         "@types/nodemailer": "^6.4.14",
         "@types/picomatch": "^4.0.0",
         "@types/pngjs": "^6.0.5",
@@ -7258,9 +7258,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.15.34",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.34.tgz",
-      "integrity": "sha512-8Y6E5WUupYy1Dd0II32BsWAx5MWdcnRd8L84Oys3veg1YrYtNtzgO4CFhiBg6MDSjk7Ay36HYOnU7/tuOzIzcw==",
+      "version": "22.16.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.16.5.tgz",
+      "integrity": "sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
diff --git a/server/package.json b/server/package.json
index c765786960..5a385193ec 100644
--- a/server/package.json
+++ b/server/package.json
@@ -135,7 +135,7 @@
     "@types/luxon": "^3.6.2",
     "@types/mock-fs": "^4.13.1",
     "@types/multer": "^1.4.7",
-    "@types/node": "^22.15.33",
+    "@types/node": "^22.16.4",
     "@types/nodemailer": "^6.4.14",
     "@types/picomatch": "^4.0.0",
     "@types/pngjs": "^6.0.5",

From 496b0c7076a23a6b34e2ff7ede94ee85bafe9e1a Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Tue, 22 Jul 2025 17:29:14 +0800
Subject: [PATCH 263/337] fix(server): missing integer type (#20075)

---
 .../openapi/lib/model/sync_asset_face_v1.dart | 24 +++++++++----------
 open-api/immich-openapi-specs.json            | 12 +++++-----
 server/src/dtos/sync.dto.ts                   |  6 +++++
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/mobile/openapi/lib/model/sync_asset_face_v1.dart b/mobile/openapi/lib/model/sync_asset_face_v1.dart
index 853a8a1514..60d1766e34 100644
--- a/mobile/openapi/lib/model/sync_asset_face_v1.dart
+++ b/mobile/openapi/lib/model/sync_asset_face_v1.dart
@@ -27,19 +27,19 @@ class SyncAssetFaceV1 {
 
   String assetId;
 
-  num boundingBoxX1;
+  int boundingBoxX1;
 
-  num boundingBoxX2;
+  int boundingBoxX2;
 
-  num boundingBoxY1;
+  int boundingBoxY1;
 
-  num boundingBoxY2;
+  int boundingBoxY2;
 
   String id;
 
-  num imageHeight;
+  int imageHeight;
 
-  num imageWidth;
+  int imageWidth;
 
   String? personId;
 
@@ -104,13 +104,13 @@ class SyncAssetFaceV1 {
 
       return SyncAssetFaceV1(
         assetId: mapValueOfType<String>(json, r'assetId')!,
-        boundingBoxX1: num.parse('${json[r'boundingBoxX1']}'),
-        boundingBoxX2: num.parse('${json[r'boundingBoxX2']}'),
-        boundingBoxY1: num.parse('${json[r'boundingBoxY1']}'),
-        boundingBoxY2: num.parse('${json[r'boundingBoxY2']}'),
+        boundingBoxX1: mapValueOfType<int>(json, r'boundingBoxX1')!,
+        boundingBoxX2: mapValueOfType<int>(json, r'boundingBoxX2')!,
+        boundingBoxY1: mapValueOfType<int>(json, r'boundingBoxY1')!,
+        boundingBoxY2: mapValueOfType<int>(json, r'boundingBoxY2')!,
         id: mapValueOfType<String>(json, r'id')!,
-        imageHeight: num.parse('${json[r'imageHeight']}'),
-        imageWidth: num.parse('${json[r'imageWidth']}'),
+        imageHeight: mapValueOfType<int>(json, r'imageHeight')!,
+        imageWidth: mapValueOfType<int>(json, r'imageWidth')!,
         personId: mapValueOfType<String>(json, r'personId'),
         sourceType: mapValueOfType<String>(json, r'sourceType')!,
       );
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 2f41318d6d..4acd431203 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13805,25 +13805,25 @@
             "type": "string"
           },
           "boundingBoxX1": {
-            "type": "number"
+            "type": "integer"
           },
           "boundingBoxX2": {
-            "type": "number"
+            "type": "integer"
           },
           "boundingBoxY1": {
-            "type": "number"
+            "type": "integer"
           },
           "boundingBoxY2": {
-            "type": "number"
+            "type": "integer"
           },
           "id": {
             "type": "string"
           },
           "imageHeight": {
-            "type": "number"
+            "type": "integer"
           },
           "imageWidth": {
-            "type": "number"
+            "type": "integer"
           },
           "personId": {
             "nullable": true,
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index e0c9c059c4..c8b1a7dde9 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -261,11 +261,17 @@ export class SyncAssetFaceV1 {
   id!: string;
   assetId!: string;
   personId!: string | null;
+  @ApiProperty({ type: 'integer' })
   imageWidth!: number;
+  @ApiProperty({ type: 'integer' })
   imageHeight!: number;
+  @ApiProperty({ type: 'integer' })
   boundingBoxX1!: number;
+  @ApiProperty({ type: 'integer' })
   boundingBoxY1!: number;
+  @ApiProperty({ type: 'integer' })
   boundingBoxX2!: number;
+  @ApiProperty({ type: 'integer' })
   boundingBoxY2!: number;
   sourceType!: string;
 }

From bd92f6b12dbe1b2fa84b26100fe1eb03e848343a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 09:31:01 +0000
Subject: [PATCH 264/337] chore(deps): update dependency dotenv to v17 (#20073)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 web/package-lock.json | 8 ++++----
 web/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index 2bd5409903..c1147447de 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -66,7 +66,7 @@
         "@types/qrcode": "^1.5.5",
         "@vitest/coverage-v8": "^3.0.0",
         "autoprefixer": "^10.4.17",
-        "dotenv": "^16.4.7",
+        "dotenv": "^17.0.0",
         "eslint": "^9.18.0",
         "eslint-config-prettier": "^10.0.0",
         "eslint-p": "^0.25.0",
@@ -4698,9 +4698,9 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.6.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
-      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+      "version": "17.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.0.tgz",
+      "integrity": "sha512-Q4sgBT60gzd0BB0lSyYD3xM4YxrXA9y4uBDof1JNYGzOXrQdQ6yX+7XIAqoFOGQFOTK1D3Hts5OllpxMDZFONQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
diff --git a/web/package.json b/web/package.json
index c63c52a916..158c490b6a 100644
--- a/web/package.json
+++ b/web/package.json
@@ -83,7 +83,7 @@
     "@types/qrcode": "^1.5.5",
     "@vitest/coverage-v8": "^3.0.0",
     "autoprefixer": "^10.4.17",
-    "dotenv": "^16.4.7",
+    "dotenv": "^17.0.0",
     "eslint": "^9.18.0",
     "eslint-config-prettier": "^10.0.0",
     "eslint-p": "^0.25.0",

From 7b41c6348c910fd93e43bc06206145ca83accb93 Mon Sep 17 00:00:00 2001
From: "Weblate (bot)" <hosted@weblate.org>
Date: Tue, 22 Jul 2025 11:49:18 +0200
Subject: [PATCH 265/337] chore(web): update translations (#20076)

Co-authored-by: Zack Pollard <zack@futo.org>
---
 i18n/lv.json | 1 +
 i18n/nl.json | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/i18n/lv.json b/i18n/lv.json
index 01a506a90a..5af3e0511c 100644
--- a/i18n/lv.json
+++ b/i18n/lv.json
@@ -485,6 +485,7 @@
     "cant_get_faces": "Nevar iegūt sejas",
     "cant_search_people": "Neizdevās veikt peronu meklēšanu",
     "failed_to_create_album": "Neizdevās izveidot albumu",
+    "profile_picture_transparent_pixels": "Profila attēlos nevar būt caurspīdīgi pikseļi. Lūdzu, palielini un/vai pārvieto attēlu.",
     "unable_to_change_description": "Neizdevās nomainīt aprakstu",
     "unable_to_create_user": "Neizdevās izveidot lietotāju",
     "unable_to_delete_user": "Neizdevās dzēst lietotāju",
diff --git a/i18n/nl.json b/i18n/nl.json
index ecd8418fa5..2cedd63b15 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -406,6 +406,7 @@
   "album_options": "Albumopties",
   "album_remove_user": "Gebruiker verwijderen?",
   "album_remove_user_confirmation": "Weet je zeker dat je {user} wilt verwijderen?",
+  "album_search_not_found": "Geen albums gevonden die aan je zoekopdracht voldoen",
   "album_share_no_users": "Het lijkt erop dat je dit album met alle gebruikers hebt gedeeld, of dat je geen gebruikers hebt om mee te delen.",
   "album_updated": "Album bijgewerkt",
   "album_updated_setting_description": "Ontvang een e-mailmelding wanneer een gedeeld album nieuwe assets heeft",
@@ -605,6 +606,7 @@
   "cancel": "Annuleren",
   "cancel_search": "Zoeken annuleren",
   "canceled": "Geannuleerd",
+  "canceling": "Annuleren",
   "cannot_merge_people": "Kan mensen niet samenvoegen",
   "cannot_undo_this_action": "Je kunt deze actie niet ongedaan maken!",
   "cannot_update_the_description": "Kan de beschrijving niet bijwerken",
@@ -765,6 +767,7 @@
   "description": "Beschrijving",
   "description_input_hint_text": "Beschrijving toevoegen...",
   "description_input_submit_error": "Beschrijving bijwerken mislukt, controleer het logboek voor meer details",
+  "deselect_all": "Alles Deselecteren",
   "details": "Details",
   "direction": "Richting",
   "disabled": "Uitgeschakeld",
@@ -839,6 +842,7 @@
   "empty_trash": "Prullenbak leegmaken",
   "empty_trash_confirmation": "Weet je zeker dat je de prullenbak wilt legen? Hiermee worden alle assets in de prullenbak permanent uit Immich verwijderd.\nJe kunt deze actie niet ongedaan maken!",
   "enable": "Inschakelen",
+  "enable_backup": "Back-up aanzetten",
   "enable_biometric_auth_description": "Voer uw pincode in om biometrische authenticatie in te schakelen",
   "enabled": "Ingeschakeld",
   "end_date": "Einddatum",
@@ -1485,6 +1489,7 @@
   "purchase_server_description_2": "Supporterstatus",
   "purchase_server_title": "Server",
   "purchase_settings_server_activated": "De licentiesleutel van de server wordt beheerd door de beheerder",
+  "queue_status": "Wachtrij {count}/{total}",
   "rating": "Sterwaardering",
   "rating_clear": "Waardering verwijderen",
   "rating_count": "{count, plural, one {# ster} other {# sterren}}",
@@ -1915,6 +1920,7 @@
   "updated_password": "Wachtwoord bijgewerkt",
   "upload": "Uploaden",
   "upload_concurrency": "Aantal gelijktijdige uploads",
+  "upload_details": "Uploaddetails",
   "upload_dialog_info": "Wil je een backup maken van de geselecteerde asset(s) op de server?",
   "upload_dialog_title": "Asset uploaden",
   "upload_errors": "Upload voltooid met {count, plural, one {# fout} other {# fouten}}, vernieuw de pagina om de nieuwe assets te zien.",
@@ -1965,6 +1971,7 @@
   "view_album": "Bekijk album",
   "view_all": "Bekijk alle",
   "view_all_users": "Bekijk alle gebruikers",
+  "view_details": "Bekijk details",
   "view_in_timeline": "Bekijk in tijdlijn",
   "view_link": "Bekijk link",
   "view_links": "Links bekijken",

From f16457d2f9acdb8161f3fee884d0e19f5c5f823e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 10:57:58 +0100
Subject: [PATCH 266/337] chore(deps): update redis:6.2-alpine docker digest to
 7fe72c4 (#20065)

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 26c3951278..ccb21e4587 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:03fd052257735b41cd19f3d8ae9782926bf9b704fb6a9dc5e29f9ccfbe8827f0
+    image: redis:6.2-alpine@sha256:7fe72c486b910f6b1a9769c937dad5d63648ddee82e056f47417542dd40825bb
 
   database:
     image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0@sha256:3aef84a0a4fabbda17ef115c3019ba0c914ec73e9f6e59203674322d858b8eea

From 637eba6e089fc7ce7d37f61ab72d05ffa7f515aa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 09:59:16 +0000
Subject: [PATCH 267/337] chore(deps): update node.js to v22.17.1 (#20066)

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

diff --git a/.github/.nvmrc b/.github/.nvmrc
index fc37597bcc..7377d130ed 100644
--- a/.github/.nvmrc
+++ b/.github/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.17.1
diff --git a/cli/.nvmrc b/cli/.nvmrc
index fc37597bcc..7377d130ed 100644
--- a/cli/.nvmrc
+++ b/cli/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.17.1
diff --git a/cli/package.json b/cli/package.json
index 3fde7e8b02..bd5b4b5757 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -69,6 +69,6 @@
     "micromatch": "^4.0.8"
   },
   "volta": {
-    "node": "22.17.0"
+    "node": "22.17.1"
   }
 }
diff --git a/docs/.nvmrc b/docs/.nvmrc
index fc37597bcc..7377d130ed 100644
--- a/docs/.nvmrc
+++ b/docs/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.17.1
diff --git a/docs/package.json b/docs/package.json
index b1faa4cfcb..97072d8eb5 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -59,6 +59,6 @@
     "node": ">=20"
   },
   "volta": {
-    "node": "22.17.0"
+    "node": "22.17.1"
   }
 }
diff --git a/e2e/.nvmrc b/e2e/.nvmrc
index fc37597bcc..7377d130ed 100644
--- a/e2e/.nvmrc
+++ b/e2e/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.17.1
diff --git a/e2e/package.json b/e2e/package.json
index c780a93a24..1299b267f2 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -54,6 +54,6 @@
     "vitest": "^3.0.0"
   },
   "volta": {
-    "node": "22.17.0"
+    "node": "22.17.1"
   }
 }
diff --git a/open-api/typescript-sdk/.nvmrc b/open-api/typescript-sdk/.nvmrc
index fc37597bcc..7377d130ed 100644
--- a/open-api/typescript-sdk/.nvmrc
+++ b/open-api/typescript-sdk/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.17.1
diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json
index c1bf8b4f65..677bc146cc 100644
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -28,6 +28,6 @@
     "directory": "open-api/typescript-sdk"
   },
   "volta": {
-    "node": "22.17.0"
+    "node": "22.17.1"
   }
 }
diff --git a/server/.nvmrc b/server/.nvmrc
index fc37597bcc..7377d130ed 100644
--- a/server/.nvmrc
+++ b/server/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.17.1
diff --git a/server/package.json b/server/package.json
index 5a385193ec..91e68718bb 100644
--- a/server/package.json
+++ b/server/package.json
@@ -172,7 +172,7 @@
     "vitest": "^3.0.0"
   },
   "volta": {
-    "node": "22.17.0"
+    "node": "22.17.1"
   },
   "overrides": {
     "sharp": "^0.34.2"
diff --git a/web/.nvmrc b/web/.nvmrc
index fc37597bcc..7377d130ed 100644
--- a/web/.nvmrc
+++ b/web/.nvmrc
@@ -1 +1 @@
-22.17.0
+22.17.1
diff --git a/web/package.json b/web/package.json
index 158c490b6a..2b092f057a 100644
--- a/web/package.json
+++ b/web/package.json
@@ -109,6 +109,6 @@
     "vitest": "^3.0.0"
   },
   "volta": {
-    "node": "22.17.0"
+    "node": "22.17.1"
   }
 }

From 5548033cae442d928ee02d03b20382c9d9610a69 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 11:00:28 +0100
Subject: [PATCH 268/337] chore(deps): update dependency @types/multer to v2
 (#20069)

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

diff --git a/server/package-lock.json b/server/package-lock.json
index 1239730fce..ca758d97e4 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -108,7 +108,7 @@
         "@types/lodash": "^4.14.197",
         "@types/luxon": "^3.6.2",
         "@types/mock-fs": "^4.13.1",
-        "@types/multer": "^1.4.7",
+        "@types/multer": "^2.0.0",
         "@types/node": "^22.16.4",
         "@types/nodemailer": "^6.4.14",
         "@types/picomatch": "^4.0.0",
@@ -7239,9 +7239,9 @@
       }
     },
     "node_modules/@types/multer": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/@types/multer/-/multer-1.4.13.tgz",
-      "integrity": "sha512-bhhdtPw7JqCiEfC9Jimx5LqX9BDIPJEh2q/fQ4bqbBPtyEZYr3cvF22NwG0DmPZNYA0CAf2CnqDB4KIGGpJcaw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/multer/-/multer-2.0.0.tgz",
+      "integrity": "sha512-C3Z9v9Evij2yST3RSBktxP9STm6OdMc5uR1xF1SGr98uv8dUlAL2hqwrZ3GVB3uyMyiegnscEK6PGtYvNrjTjw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/server/package.json b/server/package.json
index 91e68718bb..86abe8979c 100644
--- a/server/package.json
+++ b/server/package.json
@@ -134,7 +134,7 @@
     "@types/lodash": "^4.14.197",
     "@types/luxon": "^3.6.2",
     "@types/mock-fs": "^4.13.1",
-    "@types/multer": "^1.4.7",
+    "@types/multer": "^2.0.0",
     "@types/node": "^22.16.4",
     "@types/nodemailer": "^6.4.14",
     "@types/picomatch": "^4.0.0",

From 97daf42fd5e83206e2259292cb3a5d1e091bc975 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 22 Jul 2025 10:24:00 -0500
Subject: [PATCH 269/337] chore: don't show beta switcher if connect to server
 below 1.136 (#20084)

---
 .../lib/widgets/settings/beta_timeline_list_tile.dart  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mobile/lib/widgets/settings/beta_timeline_list_tile.dart b/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
index a9c873cb67..154ccb3552 100644
--- a/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
+++ b/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
@@ -1,11 +1,14 @@
 import 'dart:math' as math;
 
 import 'package:auto_route/auto_route.dart';
+import 'package:flutter/foundation.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/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/providers/auth.provider.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 
@@ -69,6 +72,13 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
     final betaTimelineValue = ref
         .watch(appSettingsServiceProvider)
         .getSetting<bool>(AppSettingsEnum.betaTimeline);
+    final serverInfo = ref.watch(serverInfoProvider);
+    final auth = ref.watch(authProvider);
+
+    if (!auth.isAuthenticated ||
+        (serverInfo.serverVersion.minor < 136 && kReleaseMode)) {
+      return const SizedBox.shrink();
+    }
 
     return AnimatedBuilder(
       animation: _animationController,

From 2efca67217ea7c1306c02624c65dc321235aee82 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Tue, 22 Jul 2025 11:24:32 -0500
Subject: [PATCH 270/337] feat(mobile): beta sync stats page (#19950)

* show beta sync stats

* show status next to jobs

* use drift devtools reset database impl

* dcm fixes

* fix: hash count

* styling

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 i18n/en.json                                  |  19 +
 mobile/lib/domain/services/asset.service.dart |  11 +
 .../domain/services/local_album.service.dart  |   4 +
 .../lib/domain/services/memory.service.dart   |   4 +
 .../domain/services/remote_album.service.dart |   4 +
 mobile/lib/domain/utils/background_sync.dart  |  27 ++
 .../repositories/local_album.repository.dart  |   4 +
 .../repositories/local_asset.repository.dart  |  10 +
 .../repositories/memory.repository.dart       |   4 +
 .../repositories/remote_album.repository.dart |   4 +
 .../repositories/remote_asset.repository.dart |   4 +
 mobile/lib/pages/common/settings.page.dart    |  55 +--
 .../settings/beta_sync_settings.page.dart     |  29 ++
 .../providers/background_sync.provider.dart   |   6 +
 .../lib/providers/sync_status.provider.dart   |  69 +++-
 mobile/lib/routing/router.dart                |   6 +-
 mobile/lib/routing/router.gr.dart             |  16 +
 .../beta_sync_settings.dart                   | 348 ++++++++++++++++++
 .../beta_sync_settings/entity_count_tile.dart |  99 +++++
 .../lib/widgets/settings/settings_card.dart   |  63 ++++
 20 files changed, 742 insertions(+), 44 deletions(-)
 create mode 100644 mobile/lib/pages/settings/beta_sync_settings.page.dart
 create mode 100644 mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
 create mode 100644 mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart
 create mode 100644 mobile/lib/widgets/settings/settings_card.dart

diff --git a/i18n/en.json b/i18n/en.json
index 8961943678..ddcb01bf94 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -573,6 +573,8 @@
   "backup_options_page_title": "Backup options",
   "backup_setting_subtitle": "Manage background and foreground upload settings",
   "backward": "Backward",
+  "beta_sync": "Beta Sync Status",
+  "beta_sync_subtitle": "Manage the new sync system",
   "biometric_auth_enabled": "Biometric authentication enabled",
   "biometric_locked_out": "You are locked out of biometric authentication",
   "biometric_no_options": "No biometric options available",
@@ -1051,6 +1053,9 @@
   "haptic_feedback_switch": "Enable haptic feedback",
   "haptic_feedback_title": "Haptic Feedback",
   "has_quota": "Has quota",
+  "hash_asset": "Hash asset",
+  "hashed_assets": "Hashed assets",
+  "hashing": "Hashing",
   "header_settings_add_header_tip": "Add Header",
   "header_settings_field_validator_msg": "Value cannot be empty",
   "header_settings_header_name_input": "Header name",
@@ -1083,6 +1088,7 @@
   "host": "Host",
   "hour": "Hour",
   "id": "ID",
+  "idle": "Idle",
   "ignore_icloud_photos": "Ignore iCloud photos",
   "ignore_icloud_photos_description": "Photos that are stored on iCloud will not be uploaded to the Immich server",
   "image": "Image",
@@ -1165,7 +1171,9 @@
   "list": "List",
   "loading": "Loading",
   "loading_search_results_failed": "Loading search results failed",
+  "local": "Local",
   "local_asset_cast_failed": "Unable to cast an asset that is not uploaded to the server",
+  "local_assets": "Local Assets",
   "local_network": "Local network",
   "local_network_sheet_info": "The app will connect to the server through this URL when using the specified Wi-Fi network",
   "location_permission": "Location permission",
@@ -1359,6 +1367,7 @@
   "original": "original",
   "other": "Other",
   "other_devices": "Other devices",
+  "other_entities": "Other entities",
   "other_variables": "Other variables",
   "owned": "Owned",
   "owner": "Owner",
@@ -1519,6 +1528,8 @@
   "refreshing_faces": "Refreshing faces",
   "refreshing_metadata": "Refreshing metadata",
   "regenerating_thumbnails": "Regenerating thumbnails",
+  "remote": "Remote",
+  "remote_assets": "Remote Assets",
   "remove": "Remove",
   "remove_assets_album_confirmation": "Are you sure you want to remove {count, plural, one {# asset} other {# assets}} from the album?",
   "remove_assets_shared_link_confirmation": "Are you sure you want to remove {count, plural, one {# asset} other {# assets}} from this shared link?",
@@ -1556,6 +1567,9 @@
   "reset_password": "Reset password",
   "reset_people_visibility": "Reset people visibility",
   "reset_pin_code": "Reset PIN code",
+  "reset_sqlite": "Reset SQLite Database",
+  "reset_sqlite_confirmation": "Are you sure you want to reset the SQLite database? You will need to log out and log in again to resync the data",
+  "reset_sqlite_success": "Successfully reset the SQLite database",
   "reset_to_default": "Reset to default",
   "resolve_duplicates": "Resolve duplicates",
   "resolved_all_duplicates": "Resolved all duplicates",
@@ -1569,6 +1583,7 @@
   "role": "Role",
   "role_editor": "Editor",
   "role_viewer": "Viewer",
+  "running": "Running",
   "save": "Save",
   "save_to_gallery": "Save to gallery",
   "saved_api_key": "Saved API Key",
@@ -1822,6 +1837,7 @@
   "storage_quota": "Storage Quota",
   "storage_usage": "{used} of {available} used",
   "submit": "Submit",
+  "success": "Success",
   "suggestions": "Suggestions",
   "sunrise_on_the_beach": "Sunrise on the beach",
   "support": "Support",
@@ -1831,6 +1847,8 @@
   "sync": "Sync",
   "sync_albums": "Sync albums",
   "sync_albums_manual_subtitle": "Sync all uploaded videos and photos to the selected backup albums",
+  "sync_local": "Sync Local",
+  "sync_remote": "Sync Remote",
   "sync_upload_album_setting_subtitle": "Create and upload your photos and videos to the selected albums on Immich",
   "tag": "Tag",
   "tag_assets": "Tag assets",
@@ -1841,6 +1859,7 @@
   "tag_updated": "Updated tag: {tag}",
   "tagged_assets": "Tagged {count, plural, one {# asset} other {# assets}}",
   "tags": "Tags",
+  "tap_to_run_job": "Tap to run job",
   "template": "Template",
   "theme": "Theme",
   "theme_selection": "Theme selection",
diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dart
index 63b1aad8c1..995ed42dc8 100644
--- a/mobile/lib/domain/services/asset.service.dart
+++ b/mobile/lib/domain/services/asset.service.dart
@@ -76,4 +76,15 @@ class AssetService {
   Future<List<(String, String)>> getPlaces() {
     return _remoteAssetRepository.getPlaces();
   }
+
+  Future<(int local, int remote)> getAssetCounts() async {
+    return (
+      await _localAssetRepository.getCount(),
+      await _remoteAssetRepository.getCount()
+    );
+  }
+
+  Future<int> getLocalHashedCount() {
+    return _localAssetRepository.getHashedCount();
+  }
 }
diff --git a/mobile/lib/domain/services/local_album.service.dart b/mobile/lib/domain/services/local_album.service.dart
index 79cc58f3e0..6c1479fdc9 100644
--- a/mobile/lib/domain/services/local_album.service.dart
+++ b/mobile/lib/domain/services/local_album.service.dart
@@ -18,4 +18,8 @@ class LocalAlbumService {
   Future<void> update(LocalAlbum album) {
     return _repository.upsert(album);
   }
+
+  Future<int> getCount() {
+    return _repository.getCount();
+  }
 }
diff --git a/mobile/lib/domain/services/memory.service.dart b/mobile/lib/domain/services/memory.service.dart
index c94b8a9f0a..50ed1e0f75 100644
--- a/mobile/lib/domain/services/memory.service.dart
+++ b/mobile/lib/domain/services/memory.service.dart
@@ -12,4 +12,8 @@ class DriftMemoryService {
   Future<List<DriftMemory>> getMemoryLane(String ownerId) {
     return _repository.getAll(ownerId);
   }
+
+  Future<int> getCount() {
+    return _repository.getCount();
+  }
 }
diff --git a/mobile/lib/domain/services/remote_album.service.dart b/mobile/lib/domain/services/remote_album.service.dart
index ebb24d5fe5..0f36fac2b9 100644
--- a/mobile/lib/domain/services/remote_album.service.dart
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -147,4 +147,8 @@ class RemoteAlbumService {
 
     return _repository.addUsers(albumId, userIds);
   }
+
+  Future<int> getCount() {
+    return _repository.getCount();
+  }
 }
diff --git a/mobile/lib/domain/utils/background_sync.dart b/mobile/lib/domain/utils/background_sync.dart
index 4a44c4d8f2..af66dda7a9 100644
--- a/mobile/lib/domain/utils/background_sync.dart
+++ b/mobile/lib/domain/utils/background_sync.dart
@@ -12,6 +12,14 @@ class BackgroundSyncManager {
   final SyncCallback? onRemoteSyncComplete;
   final SyncErrorCallback? onRemoteSyncError;
 
+  final SyncCallback? onLocalSyncStart;
+  final SyncCallback? onLocalSyncComplete;
+  final SyncErrorCallback? onLocalSyncError;
+
+  final SyncCallback? onHashingStart;
+  final SyncCallback? onHashingComplete;
+  final SyncErrorCallback? onHashingError;
+
   Cancelable<void>? _syncTask;
   Cancelable<void>? _syncWebsocketTask;
   Cancelable<void>? _deviceAlbumSyncTask;
@@ -21,6 +29,12 @@ class BackgroundSyncManager {
     this.onRemoteSyncStart,
     this.onRemoteSyncComplete,
     this.onRemoteSyncError,
+    this.onLocalSyncStart,
+    this.onLocalSyncComplete,
+    this.onLocalSyncError,
+    this.onHashingStart,
+    this.onHashingComplete,
+    this.onHashingError,
   });
 
   Future<void> cancel() {
@@ -47,6 +61,8 @@ class BackgroundSyncManager {
       return _deviceAlbumSyncTask!.future;
     }
 
+    onLocalSyncStart?.call();
+
     // We use a ternary operator to avoid [_deviceAlbumSyncTask] from being
     // captured by the closure passed to [runInIsolateGentle].
     _deviceAlbumSyncTask = full
@@ -61,6 +77,10 @@ class BackgroundSyncManager {
 
     return _deviceAlbumSyncTask!.whenComplete(() {
       _deviceAlbumSyncTask = null;
+      onLocalSyncComplete?.call();
+    }).catchError((error) {
+      onLocalSyncError?.call(error.toString());
+      _deviceAlbumSyncTask = null;
     });
   }
 
@@ -70,10 +90,17 @@ class BackgroundSyncManager {
       return _hashTask!.future;
     }
 
+    onHashingStart?.call();
+
     _hashTask = runInIsolateGentle(
       computation: (ref) => ref.read(hashServiceProvider).hashAssets(),
     );
+
     return _hashTask!.whenComplete(() {
+      onHashingComplete?.call();
+      _hashTask = null;
+    }).catchError((error) {
+      onHashingError?.call(error.toString());
       _hashTask = null;
     });
   }
diff --git a/mobile/lib/infrastructure/repositories/local_album.repository.dart b/mobile/lib/infrastructure/repositories/local_album.repository.dart
index 5f192a20cf..16c363b839 100644
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -398,4 +398,8 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
 
     return results.isNotEmpty ? results.first : null;
   }
+
+  Future<int> getCount() {
+    return _db.managers.localAlbumEntity.count();
+  }
 }
diff --git a/mobile/lib/infrastructure/repositories/local_asset.repository.dart b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
index 8d21c858a2..bf1ec37615 100644
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -63,4 +63,14 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
 
     return query.map((row) => row.toDto()).getSingleOrNull();
   }
+
+  Future<int> getCount() {
+    return _db.managers.localAssetEntity.count();
+  }
+
+  Future<int> getHashedCount() {
+    return _db.managers.localAssetEntity
+        .filter((e) => e.checksum.isNull().not())
+        .count();
+  }
 }
diff --git a/mobile/lib/infrastructure/repositories/memory.repository.dart b/mobile/lib/infrastructure/repositories/memory.repository.dart
index ff5f75c2ac..8582290c61 100644
--- a/mobile/lib/infrastructure/repositories/memory.repository.dart
+++ b/mobile/lib/infrastructure/repositories/memory.repository.dart
@@ -58,6 +58,10 @@ class DriftMemoryRepository extends DriftDatabaseRepository {
 
     return memoriesMap.values.toList();
   }
+
+  Future<int> getCount() {
+    return _db.managers.memoryEntity.count();
+  }
 }
 
 extension on MemoryEntityData {
diff --git a/mobile/lib/infrastructure/repositories/remote_album.repository.dart b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
index c3c4570559..ca8dc2cfd5 100644
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -268,6 +268,10 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
       return album;
     }).watchSingleOrNull();
   }
+
+  Future<int> getCount() {
+    return _db.managers.remoteAlbumEntity.count();
+  }
 }
 
 extension on RemoteAlbumEntityData {
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index 52cfe2e7c2..865c35be54 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -238,4 +238,8 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
       });
     });
   }
+
+  Future<int> getCount() {
+    return _db.managers.remoteAssetEntity.count();
+  }
 }
diff --git a/mobile/lib/pages/common/settings.page.dart b/mobile/lib/pages/common/settings.page.dart
index e45001270c..b19ff87aa9 100644
--- a/mobile/lib/pages/common/settings.page.dart
+++ b/mobile/lib/pages/common/settings.page.dart
@@ -13,6 +13,8 @@ import 'package:immich_mobile/widgets/settings/language_settings.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/networking_settings.dart';
 import 'package:immich_mobile/widgets/settings/notification_setting.dart';
 import 'package:immich_mobile/widgets/settings/preference_settings/preference_setting.dart';
+import 'package:immich_mobile/entities/store.entity.dart' as app_store;
+import 'package:immich_mobile/widgets/settings/settings_card.dart';
 
 enum SettingSection {
   advanced(
@@ -97,47 +99,11 @@ class _MobileLayout extends StatelessWidget {
   Widget build(BuildContext context) {
     final List<Widget> settings = SettingSection.values
         .map(
-          (setting) => Padding(
-            padding: const EdgeInsets.symmetric(
-              horizontal: 16.0,
-            ),
-            child: Card(
-              elevation: 0,
-              clipBehavior: Clip.antiAlias,
-              color: context.colorScheme.surfaceContainer,
-              shape: const RoundedRectangleBorder(
-                borderRadius: BorderRadius.all(Radius.circular(16)),
-              ),
-              margin: const EdgeInsets.symmetric(vertical: 4.0),
-              child: ListTile(
-                contentPadding: const EdgeInsets.symmetric(
-                  horizontal: 16.0,
-                ),
-                leading: Container(
-                  decoration: BoxDecoration(
-                    borderRadius: const BorderRadius.all(Radius.circular(16)),
-                    color: context.isDarkTheme
-                        ? Colors.black26
-                        : Colors.white.withAlpha(100),
-                  ),
-                  padding: const EdgeInsets.all(16.0),
-                  child: Icon(setting.icon, color: context.primaryColor),
-                ),
-                title: Text(
-                  setting.title,
-                  style: context.textTheme.titleMedium!.copyWith(
-                    fontWeight: FontWeight.w600,
-                    color: context.primaryColor,
-                  ),
-                ).tr(),
-                subtitle: Text(
-                  setting.subtitle,
-                  style: context.textTheme.labelLarge,
-                ).tr(),
-                onTap: () =>
-                    context.pushRoute(SettingsSubRoute(section: setting)),
-              ),
-            ),
+          (setting) => SettingsCard(
+            title: setting.title.tr(),
+            subtitle: setting.subtitle.tr(),
+            icon: setting.icon,
+            settingRoute: SettingsSubRoute(section: setting),
           ),
         )
         .toList();
@@ -146,6 +112,13 @@ class _MobileLayout extends StatelessWidget {
       padding: const EdgeInsets.only(top: 10.0, bottom: 56),
       children: [
         const BetaTimelineListTile(),
+        if (app_store.Store.isBetaTimelineEnabled)
+          SettingsCard(
+            icon: Icons.sync_outlined,
+            title: 'beta_sync'.tr(),
+            subtitle: 'beta_sync_subtitle'.tr(),
+            settingRoute: const BetaSyncSettingsRoute(),
+          ),
         ...settings,
       ],
     );
diff --git a/mobile/lib/pages/settings/beta_sync_settings.page.dart b/mobile/lib/pages/settings/beta_sync_settings.page.dart
new file mode 100644
index 0000000000..ba23ccf5eb
--- /dev/null
+++ b/mobile/lib/pages/settings/beta_sync_settings.page.dart
@@ -0,0 +1,29 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/widgets/settings/beta_sync_settings/beta_sync_settings.dart';
+
+@RoutePage()
+class BetaSyncSettingsPage extends StatelessWidget {
+  const BetaSyncSettingsPage({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        title: const Text("beta_sync").t(context: context),
+        leading: IconButton(
+          onPressed: () => context.maybePop(true),
+          splashRadius: 24,
+          icon: const Icon(
+            Icons.arrow_back_ios_rounded,
+          ),
+        ),
+      ),
+      body: const BetaSyncSettings(),
+    );
+  }
+}
diff --git a/mobile/lib/providers/background_sync.provider.dart b/mobile/lib/providers/background_sync.provider.dart
index dc9cc0d59f..e6e83b64df 100644
--- a/mobile/lib/providers/background_sync.provider.dart
+++ b/mobile/lib/providers/background_sync.provider.dart
@@ -8,6 +8,12 @@ final backgroundSyncProvider = Provider<BackgroundSyncManager>((ref) {
     onRemoteSyncStart: syncStatusNotifier.startRemoteSync,
     onRemoteSyncComplete: syncStatusNotifier.completeRemoteSync,
     onRemoteSyncError: syncStatusNotifier.errorRemoteSync,
+    onLocalSyncStart: syncStatusNotifier.startLocalSync,
+    onLocalSyncComplete: syncStatusNotifier.completeLocalSync,
+    onLocalSyncError: syncStatusNotifier.errorLocalSync,
+    onHashingStart: syncStatusNotifier.startHashJob,
+    onHashingComplete: syncStatusNotifier.completeHashJob,
+    onHashingError: syncStatusNotifier.errorHashJob,
   );
   ref.onDispose(manager.cancel);
   return manager;
diff --git a/mobile/lib/providers/sync_status.provider.dart b/mobile/lib/providers/sync_status.provider.dart
index 18d851aa19..5640ad6c89 100644
--- a/mobile/lib/providers/sync_status.provider.dart
+++ b/mobile/lib/providers/sync_status.provider.dart
@@ -1,43 +1,71 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 enum SyncStatus {
   idle,
   syncing,
   success,
-  error,
+  error;
+
+  localized() {
+    return switch (this) {
+      SyncStatus.idle => "idle".tr(),
+      SyncStatus.syncing => "running".tr(),
+      SyncStatus.success => "success".tr(),
+      SyncStatus.error => "error".tr()
+    };
+  }
 }
 
 class SyncStatusState {
   final SyncStatus remoteSyncStatus;
+  final SyncStatus localSyncStatus;
+  final SyncStatus hashJobStatus;
+
   final String? errorMessage;
 
   const SyncStatusState({
     this.remoteSyncStatus = SyncStatus.idle,
+    this.localSyncStatus = SyncStatus.idle,
+    this.hashJobStatus = SyncStatus.idle,
     this.errorMessage,
   });
 
   SyncStatusState copyWith({
     SyncStatus? remoteSyncStatus,
+    SyncStatus? localSyncStatus,
+    SyncStatus? hashJobStatus,
     String? errorMessage,
   }) {
     return SyncStatusState(
       remoteSyncStatus: remoteSyncStatus ?? this.remoteSyncStatus,
+      localSyncStatus: localSyncStatus ?? this.localSyncStatus,
+      hashJobStatus: hashJobStatus ?? this.hashJobStatus,
       errorMessage: errorMessage ?? this.errorMessage,
     );
   }
 
   bool get isRemoteSyncing => remoteSyncStatus == SyncStatus.syncing;
+  bool get isLocalSyncing => localSyncStatus == SyncStatus.syncing;
+  bool get isHashing => hashJobStatus == SyncStatus.syncing;
 
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     return other is SyncStatusState &&
         other.remoteSyncStatus == remoteSyncStatus &&
+        other.localSyncStatus == localSyncStatus &&
+        other.hashJobStatus == hashJobStatus &&
         other.errorMessage == errorMessage;
   }
 
   @override
-  int get hashCode => Object.hash(remoteSyncStatus, errorMessage);
+  int get hashCode => Object.hash(
+        remoteSyncStatus,
+        localSyncStatus,
+        hashJobStatus,
+        errorMessage,
+      );
 }
 
 class SyncStatusNotifier extends Notifier<SyncStatusState> {
@@ -46,9 +74,15 @@ class SyncStatusNotifier extends Notifier<SyncStatusState> {
     return const SyncStatusState(
       errorMessage: null,
       remoteSyncStatus: SyncStatus.idle,
+      localSyncStatus: SyncStatus.idle,
+      hashJobStatus: SyncStatus.idle,
     );
   }
 
+  ///
+  /// Remote Sync
+  ///
+
   void setRemoteSyncStatus(SyncStatus status, [String? errorMessage]) {
     state = state.copyWith(
       remoteSyncStatus: status,
@@ -60,6 +94,37 @@ class SyncStatusNotifier extends Notifier<SyncStatusState> {
   void completeRemoteSync() => setRemoteSyncStatus(SyncStatus.success);
   void errorRemoteSync(String error) =>
       setRemoteSyncStatus(SyncStatus.error, error);
+
+  ///
+  /// Local Sync
+  ///
+
+  void setLocalSyncStatus(SyncStatus status, [String? errorMessage]) {
+    state = state.copyWith(
+      localSyncStatus: status,
+      errorMessage: status == SyncStatus.error ? errorMessage : null,
+    );
+  }
+
+  void startLocalSync() => setLocalSyncStatus(SyncStatus.syncing);
+  void completeLocalSync() => setLocalSyncStatus(SyncStatus.success);
+  void errorLocalSync(String error) =>
+      setLocalSyncStatus(SyncStatus.error, error);
+
+  ///
+  /// Hash Job
+  ///
+
+  void setHashJobStatus(SyncStatus status, [String? errorMessage]) {
+    state = state.copyWith(
+      hashJobStatus: status,
+      errorMessage: status == SyncStatus.error ? errorMessage : null,
+    );
+  }
+
+  void startHashJob() => setHashJobStatus(SyncStatus.syncing);
+  void completeHashJob() => setHashJobStatus(SyncStatus.success);
+  void errorHashJob(String error) => setHashJobStatus(SyncStatus.error, error);
 }
 
 final syncStatusProvider =
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index ba31ccef2b..5b3a92d4e2 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -73,6 +73,7 @@ import 'package:immich_mobile/pages/search/map/map_location_picker.page.dart';
 import 'package:immich_mobile/pages/search/person_result.page.dart';
 import 'package:immich_mobile/pages/search/recently_taken.page.dart';
 import 'package:immich_mobile/pages/search/search.page.dart';
+import 'package:immich_mobile/pages/settings/beta_sync_settings.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
@@ -481,7 +482,6 @@ class AppRouter extends RootStackRouter {
       page: DriftUserSelectionRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
-
     AutoRoute(
       page: ChangeExperienceRoute.page,
       guards: [_authGuard, _duplicateGuard],
@@ -495,6 +495,10 @@ class AppRouter extends RootStackRouter {
       page: DriftUploadDetailRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
+    AutoRoute(
+      page: BetaSyncSettingsRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 0e24f776d8..a59b15856f 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -503,6 +503,22 @@ class BackupOptionsRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [BetaSyncSettingsPage]
+class BetaSyncSettingsRoute extends PageRouteInfo<void> {
+  const BetaSyncSettingsRoute({List<PageRouteInfo>? children})
+      : super(BetaSyncSettingsRoute.name, initialChildren: children);
+
+  static const String name = 'BetaSyncSettingsRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const BetaSyncSettingsPage();
+    },
+  );
+}
+
 /// generated route for
 /// [ChangeExperiencePage]
 class ChangeExperienceRoute extends PageRouteInfo<ChangeExperienceRouteArgs> {
diff --git a/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart b/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
new file mode 100644
index 0000000000..3d37fb102b
--- /dev/null
+++ b/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
@@ -0,0 +1,348 @@
+import 'package:drift/drift.dart' as drift_db;
+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/translate_extensions.dart';
+import 'package:immich_mobile/providers/background_sync.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/album.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/sync_status.provider.dart';
+import 'package:immich_mobile/widgets/settings/beta_sync_settings/entity_count_tile.dart';
+
+class BetaSyncSettings extends HookConsumerWidget {
+  const BetaSyncSettings({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final assetService = ref.watch(assetServiceProvider);
+    final localAlbumService = ref.watch(localAlbumServiceProvider);
+    final remoteAlbumService = ref.watch(remoteAlbumServiceProvider);
+    final memoryService = ref.watch(driftMemoryServiceProvider);
+
+    Future<List<dynamic>> loadCounts() async {
+      final assetCounts = assetService.getAssetCounts();
+      final localAlbumCounts = localAlbumService.getCount();
+      final remoteAlbumCounts = remoteAlbumService.getCount();
+      final memoryCount = memoryService.getCount();
+      final getLocalHashedCount = assetService.getLocalHashedCount();
+
+      return await Future.wait([
+        assetCounts,
+        localAlbumCounts,
+        remoteAlbumCounts,
+        memoryCount,
+        getLocalHashedCount,
+      ]);
+    }
+
+    Future<void> resetDatabase() async {
+// https://github.com/simolus3/drift/commit/bd80a46264b6dd833ef4fd87fffc03f5a832ab41#diff-3f879e03b4a35779344ef16170b9353608dd9c42385f5402ec6035aac4dd8a04R76-R94
+      final drift = ref.read(driftProvider);
+      final database = drift.attachedDatabase;
+      await database.exclusively(() async {
+        // https://stackoverflow.com/a/65743498/25690041
+        await database.customStatement('PRAGMA writable_schema = 1;');
+        await database.customStatement('DELETE FROM sqlite_master;');
+        await database.customStatement('VACUUM;');
+        await database.customStatement('PRAGMA writable_schema = 0;');
+        await database.customStatement('PRAGMA integrity_check');
+
+        await database.customStatement('PRAGMA user_version = 0');
+        await database.beforeOpen(
+          // ignore: invalid_use_of_internal_member
+          database.resolvedEngine.executor,
+          drift_db.OpeningDetails(null, database.schemaVersion),
+        );
+        await database.customStatement(
+          'PRAGMA user_version = ${database.schemaVersion}',
+        );
+
+        // Refresh all stream queries
+        database.notifyUpdates({
+          for (final table in database.allTables)
+            drift_db.TableUpdate.onTable(table),
+        });
+      });
+    }
+
+    return FutureBuilder<List<dynamic>>(
+      future: loadCounts(),
+      builder: (context, snapshot) {
+        if (snapshot.connectionState != ConnectionState.done) {
+          return const CircularProgressIndicator();
+        }
+
+        final assetCounts = snapshot.data![0]! as (int, int);
+        final localAssetCount = assetCounts.$1;
+        final remoteAssetCount = assetCounts.$2;
+
+        final localAlbumCount = snapshot.data![1]! as int;
+        final remoteAlbumCount = snapshot.data![2]! as int;
+        final memoryCount = snapshot.data![3]! as int;
+        final localHashedCount = snapshot.data![4]! as int;
+
+        return Padding(
+          padding: const EdgeInsets.only(top: 16, bottom: 32),
+          child: ListView(
+            children: [
+              _SectionHeaderText(text: "assets".t(context: context)),
+              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: localAssetCount,
+                        icon: Icons.smartphone,
+                      ),
+                    ),
+                    Expanded(
+                      child: EntitiyCountTile(
+                        label: "remote".t(context: context),
+                        count: remoteAssetCount,
+                        icon: Icons.cloud,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              _SectionHeaderText(text: "albums".t(context: context)),
+              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: localAlbumCount,
+                        icon: Icons.smartphone,
+                      ),
+                    ),
+                    Expanded(
+                      child: EntitiyCountTile(
+                        label: "remote".t(context: context),
+                        count: remoteAlbumCount,
+                        icon: Icons.cloud,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              _SectionHeaderText(text: "other".t(context: context)),
+              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: "memories".t(context: context),
+                        count: memoryCount,
+                        icon: Icons.calendar_today,
+                      ),
+                    ),
+                    Expanded(
+                      child: EntitiyCountTile(
+                        label: "hashed_assets".t(context: context),
+                        count: localHashedCount,
+                        icon: Icons.tag,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              const Divider(
+                height: 1,
+                indent: 16,
+                endIndent: 16,
+              ),
+              const SizedBox(height: 24),
+              _SectionHeaderText(text: "jobs".t(context: context)),
+              ListTile(
+                title: Text(
+                  "sync_local".t(context: context),
+                  style: const TextStyle(
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+                subtitle: Text(
+                  "tap_to_run_job".t(context: context),
+                ),
+                leading: const Icon(Icons.sync),
+                trailing: _SyncStatusIcon(
+                  status: ref.watch(syncStatusProvider).localSyncStatus,
+                ),
+                onTap: () {
+                  ref.read(backgroundSyncProvider).syncLocal(full: true);
+                },
+              ),
+              ListTile(
+                title: Text(
+                  "sync_remote".t(context: context),
+                  style: const TextStyle(
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+                subtitle: Text(
+                  "tap_to_run_job".t(context: context),
+                ),
+                leading: const Icon(Icons.cloud_sync),
+                trailing: _SyncStatusIcon(
+                  status: ref.watch(syncStatusProvider).remoteSyncStatus,
+                ),
+                onTap: () {
+                  ref.read(backgroundSyncProvider).syncRemote();
+                },
+              ),
+              ListTile(
+                title: Text(
+                  "hash_asset".t(context: context),
+                  style: const TextStyle(
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+                leading: const Icon(Icons.tag),
+                subtitle: Text(
+                  "tap_to_run_job".t(context: context),
+                ),
+                trailing: _SyncStatusIcon(
+                  status: ref.watch(syncStatusProvider).hashJobStatus,
+                ),
+                onTap: () {
+                  ref.read(backgroundSyncProvider).hashAssets();
+                },
+              ),
+              const Divider(
+                height: 1,
+                indent: 16,
+                endIndent: 16,
+              ),
+              const SizedBox(height: 24),
+              _SectionHeaderText(text: "actions".t(context: context)),
+              ListTile(
+                title: Text(
+                  "reset_sqlite".t(context: context),
+                  style: TextStyle(
+                    color: context.colorScheme.error,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+                leading: Icon(
+                  Icons.settings_backup_restore_rounded,
+                  color: context.colorScheme.error,
+                ),
+                onTap: () async {
+                  showDialog(
+                    context: context,
+                    builder: (context) {
+                      return AlertDialog(
+                        title: Text(
+                          "reset_sqlite".t(context: context),
+                        ),
+                        content: Text(
+                          "reset_sqlite_confirmation".t(context: context),
+                        ),
+                        actions: [
+                          TextButton(
+                            onPressed: () => context.pop(),
+                            child: Text("cancel".t(context: context)),
+                          ),
+                          TextButton(
+                            onPressed: () async {
+                              await resetDatabase();
+                              context.pop();
+                              context.scaffoldMessenger.showSnackBar(
+                                SnackBar(
+                                  content: Text(
+                                    "reset_sqlite_success".t(context: context),
+                                  ),
+                                ),
+                              );
+                            },
+                            child: Text(
+                              "confirm".t(context: context),
+                              style: TextStyle(
+                                color: context.colorScheme.error,
+                              ),
+                            ),
+                          ),
+                        ],
+                      );
+                    },
+                  );
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _SyncStatusIcon extends StatelessWidget {
+  final SyncStatus status;
+
+  const _SyncStatusIcon({
+    required this.status,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return switch (status) {
+      SyncStatus.idle => const Icon(
+          Icons.pause_circle_outline_rounded,
+        ),
+      SyncStatus.syncing => const SizedBox(
+          height: 24,
+          width: 24,
+          child: CircularProgressIndicator(
+            strokeWidth: 2,
+          ),
+        ),
+      SyncStatus.success => const Icon(
+          Icons.check_circle_outline,
+          color: Colors.green,
+        ),
+      SyncStatus.error => Icon(
+          Icons.error_outline,
+          color: context.colorScheme.error,
+        ),
+    };
+  }
+}
+
+class _SectionHeaderText extends StatelessWidget {
+  final String text;
+
+  const _SectionHeaderText({
+    required this.text,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(left: 16.0),
+      child: Text(
+        text.toUpperCase(),
+        style: context.textTheme.labelLarge?.copyWith(
+          fontWeight: FontWeight.w500,
+          color: context.colorScheme.onSurface.withAlpha(200),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart b/mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart
new file mode 100644
index 0000000000..1e140fbf2e
--- /dev/null
+++ b/mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart
@@ -0,0 +1,99 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
+
+class EntitiyCountTile extends StatelessWidget {
+  final int count;
+  final String label;
+  final IconData icon;
+
+  const EntitiyCountTile({
+    super.key,
+    required this.count,
+    required this.label,
+    required this.icon,
+  });
+
+  String zeroPadding(int number, int targetWidth) {
+    final numStr = number.toString();
+    return numStr.length < targetWidth
+        ? "0" * (targetWidth - numStr.length)
+        : "";
+  }
+
+  int calculateMaxDigits(double availableWidth) {
+    const double charWidth = 11.0;
+    return (availableWidth / charWidth).floor().clamp(1, 20);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: context.colorScheme.surfaceContainerLow,
+        borderRadius: const BorderRadius.all(Radius.circular(16)),
+        border: Border.all(
+          width: 0.5,
+          color: context.colorScheme.outline.withAlpha(25),
+        ),
+      ),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          // Icon and Label
+          Row(
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              Icon(
+                icon,
+                color: context.primaryColor,
+              ),
+              const SizedBox(width: 8),
+              Text(
+                label,
+                style: TextStyle(
+                  color: context.primaryColor,
+                  fontWeight: FontWeight.bold,
+                  fontSize: 16,
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 12),
+          // Number
+          LayoutBuilder(
+            builder: (context, constraints) {
+              final maxDigits = calculateMaxDigits(constraints.maxWidth);
+              return RichText(
+                text: TextSpan(
+                  style: const TextStyle(
+                    fontSize: 18,
+                    fontFamily: 'OverpassMono',
+                    fontWeight: FontWeight.w600,
+                  ),
+                  children: [
+                    TextSpan(
+                      text: zeroPadding(count, maxDigits),
+                      style: TextStyle(
+                        color: context.colorScheme.onSurfaceSecondary
+                            .withAlpha(75),
+                      ),
+                    ),
+                    TextSpan(
+                      text: count.toString(),
+                      style: TextStyle(
+                        color: context.primaryColor,
+                      ),
+                    ),
+                  ],
+                ),
+              );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/widgets/settings/settings_card.dart b/mobile/lib/widgets/settings/settings_card.dart
new file mode 100644
index 0000000000..257c0ce2d6
--- /dev/null
+++ b/mobile/lib/widgets/settings/settings_card.dart
@@ -0,0 +1,63 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+
+class SettingsCard extends StatelessWidget {
+  const SettingsCard({
+    super.key,
+    required this.icon,
+    required this.title,
+    required this.subtitle,
+    required this.settingRoute,
+  });
+
+  final IconData icon;
+  final String title;
+  final String subtitle;
+  final PageRouteInfo settingRoute;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(
+        horizontal: 16.0,
+      ),
+      child: Card(
+        elevation: 0,
+        clipBehavior: Clip.antiAlias,
+        color: context.colorScheme.surfaceContainer,
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(16)),
+        ),
+        margin: const EdgeInsets.symmetric(vertical: 4.0),
+        child: ListTile(
+          contentPadding: const EdgeInsets.symmetric(
+            horizontal: 16.0,
+          ),
+          leading: Container(
+            decoration: BoxDecoration(
+              borderRadius: const BorderRadius.all(Radius.circular(16)),
+              color: context.isDarkTheme
+                  ? Colors.black26
+                  : Colors.white.withAlpha(100),
+            ),
+            padding: const EdgeInsets.all(16.0),
+            child: Icon(icon, color: context.primaryColor),
+          ),
+          title: Text(
+            title,
+            style: context.textTheme.titleMedium!.copyWith(
+              fontWeight: FontWeight.w600,
+              color: context.primaryColor,
+            ),
+          ),
+          subtitle: Text(
+            subtitle,
+            style: context.textTheme.labelLarge,
+          ),
+          onTap: () => context.pushRoute(settingRoute),
+        ),
+      ),
+    );
+  }
+}

From aa344a398984457d55b82584e2cfe1fec6442d7a Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 22 Jul 2025 11:36:00 -0500
Subject: [PATCH 271/337] feat: delete actions (#20034)

* chore: show delete local

* pr feedback

* restore and perm delete action
---
 i18n/en.json                                  |  1 +
 .../repositories/remote_asset.repository.dart | 12 ++++
 .../repositories/timeline.repository.dart     | 42 ++++++++++---
 .../presentation/pages/drift_trash.page.dart  | 24 ++++++++
 ...elete_permanent_action_button.widget.dart} |  3 +-
 .../delete_trash_action_button.widget.dart    | 59 +++++++++++++++++++
 .../restore_trash_action_button.widget.dart   | 56 ++++++++++++++++++
 .../asset_viewer/bottom_sheet.widget.dart     |  2 +-
 .../archive_bottom_sheet.widget.dart          |  2 +-
 .../favorite_bottom_sheet.widget.dart         |  2 +-
 .../general_bottom_sheet.widget.dart          |  5 +-
 .../locked_folder_bottom_sheet.widget.dart    |  2 +-
 .../remote_album_bottom_sheet.widget.dart     |  2 +-
 .../trash_bottom_sheet.widget.dart            | 32 ++++++++++
 .../infrastructure/action.provider.dart       | 21 ++++++-
 .../timeline/multiselect.provider.dart        |  7 +++
 .../repositories/asset_api.repository.dart    | 13 +++-
 mobile/lib/services/action.service.dart       | 18 +++++-
 18 files changed, 285 insertions(+), 18 deletions(-)
 rename mobile/lib/presentation/widgets/action_buttons/{delete_action_button.widget.dart => delete_permanent_action_button.widget.dart} (94%)
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart
 create mode 100644 mobile/lib/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.dart

diff --git a/i18n/en.json b/i18n/en.json
index ddcb01bf94..bbd6debd5e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1575,6 +1575,7 @@
   "resolved_all_duplicates": "Resolved all duplicates",
   "restore": "Restore",
   "restore_all": "Restore all",
+  "restore_trash_action_prompt": "{count} restored from trash",
   "restore_user": "Restore user",
   "restored_asset": "Restored asset",
   "resume": "Resume",
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index 865c35be54..2c5006953f 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -171,6 +171,18 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
     });
   }
 
+  Future<void> restoreTrash(List<String> ids) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteAssetEntity,
+          const RemoteAssetEntityCompanion(deletedAt: Value(null)),
+          where: (e) => e.id.equals(id),
+        );
+      }
+    });
+  }
+
   Future<void> delete(List<String> ids) {
     return _db.remoteAssetEntity.deleteWhere((row) => row.id.isIn(ids));
   }
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 0c3eee59af..7bbae9a80a 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -332,6 +332,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       _remoteQueryBuilder(
         filter: (row) => row.deletedAt.isNotNull() & row.ownerId.equals(userId),
         groupBy: groupBy,
+        joinLocal: true,
       );
 
   TimelineQuery archived(String userId, GroupAssetsBy groupBy) =>
@@ -443,11 +444,16 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
   TimelineQuery _remoteQueryBuilder({
     required Expression<bool> Function($RemoteAssetEntityTable row) filter,
     GroupAssetsBy groupBy = GroupAssetsBy.day,
+    bool joinLocal = false,
   }) {
     return (
       bucketSource: () => _watchRemoteBucket(filter: filter, groupBy: groupBy),
-      assetSource: (offset, count) =>
-          _getRemoteAssets(filter: filter, offset: offset, count: count),
+      assetSource: (offset, count) => _getRemoteAssets(
+            filter: filter,
+            offset: offset,
+            count: count,
+            joinLocal: joinLocal,
+          ),
     );
   }
 
@@ -480,13 +486,35 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     required Expression<bool> Function($RemoteAssetEntityTable row) filter,
     required int offset,
     required int count,
+    bool joinLocal = false,
   }) {
-    final query = _db.remoteAssetEntity.select()
-      ..where(filter)
-      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
-      ..limit(count, offset: offset);
+    if (joinLocal) {
+      final query = _db.remoteAssetEntity.select().join([
+        leftOuterJoin(
+          _db.localAssetEntity,
+          _db.remoteAssetEntity.checksum
+              .equalsExp(_db.localAssetEntity.checksum),
+          useColumns: false,
+        ),
+      ])
+        ..addColumns([_db.localAssetEntity.id])
+        ..where(filter(_db.remoteAssetEntity))
+        ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
+        ..limit(count, offset: offset);
 
-    return query.map((row) => row.toDto()).get();
+      return query.map((row) {
+        final asset = row.readTable(_db.remoteAssetEntity).toDto();
+        final localId = row.read(_db.localAssetEntity.id);
+        return asset.copyWith(localId: localId);
+      }).get();
+    } else {
+      final query = _db.remoteAssetEntity.select()
+        ..where(filter)
+        ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
+        ..limit(count, offset: offset);
+
+      return query.map((row) => row.toDto()).get();
+    }
   }
 }
 
diff --git a/mobile/lib/presentation/pages/drift_trash.page.dart b/mobile/lib/presentation/pages/drift_trash.page.dart
index 9cd2fac760..108a7e1cc9 100644
--- a/mobile/lib/presentation/pages/drift_trash.page.dart
+++ b/mobile/lib/presentation/pages/drift_trash.page.dart
@@ -2,8 +2,10 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.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/server_info.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 
 @RoutePage()
@@ -29,6 +31,7 @@ class DriftTrashPage extends StatelessWidget {
         ),
       ],
       child: Timeline(
+        showStorageIndicator: true,
         appBar: SliverAppBar(
           title: Text('trash'.t(context: context)),
           floating: true,
@@ -37,6 +40,27 @@ class DriftTrashPage extends StatelessWidget {
           centerTitle: true,
           elevation: 0,
         ),
+        topSliverWidgetHeight: 24,
+        topSliverWidget: Consumer(
+          builder: (context, ref, child) {
+            final trashDays = ref.watch(
+              serverInfoProvider.select((v) => v.serverConfig.trashDays),
+            );
+
+            return SliverPadding(
+              padding: const EdgeInsets.all(16.0),
+              sliver: SliverToBoxAdapter(
+                child: SizedBox(
+                  height: 24.0,
+                  child: const Text(
+                    "trash_page_info",
+                  ).t(context: context, args: {"days": "$trashDays"}),
+                ),
+              ),
+            );
+          },
+        ),
+        bottomSheet: const TrashBottomBar(),
       ),
     );
   }
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
similarity index 94%
rename from mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
rename to mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
index d81f998a7b..9f88d640dd 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
@@ -18,7 +18,8 @@ class DeletePermanentActionButton extends ConsumerWidget {
       return;
     }
 
-    final result = await ref.read(actionProvider.notifier).delete(source);
+    final result =
+        await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'delete_action_prompt'.t(
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
new file mode 100644
index 0000000000..3ec75c60c2
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+class DeleteTrashActionButton extends ConsumerWidget {
+  final ActionSource source;
+
+  const DeleteTrashActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result =
+        await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'restore_trash_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return TextButton.icon(
+      icon: Icon(
+        Icons.delete_forever,
+        color: Colors.red[400],
+      ),
+      label: Text(
+        "delete".t(context: context),
+        style: TextStyle(
+          fontSize: 14,
+          color: Colors.red[400],
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart
new file mode 100644
index 0000000000..05ee469d25
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart
@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+class RestoreTrashActionButton extends ConsumerWidget {
+  final ActionSource source;
+
+  const RestoreTrashActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).restoreTrash(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'restore_trash_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return TextButton.icon(
+      icon: const Icon(
+        Icons.history_rounded,
+      ),
+      label: Text(
+        'restore'.t(),
+        style: const TextStyle(
+          fontSize: 14,
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}
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 89822fef91..0e426fde6d 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -7,7 +7,7 @@ import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
index 9ed35da4cd..deaaea0d39 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
index a1e1255a9f..8199271bfe 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
index 373d264d82..d83b8e399d 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
@@ -44,6 +44,9 @@ class GeneralBottomSheet extends ConsumerWidget {
               : const DeletePermanentActionButton(
                   source: ActionSource.timeline,
                 ),
+          if (multiselect.hasLocal || multiselect.hasMerged) ...[
+            const DeleteLocalActionButton(source: ActionSource.timeline),
+          ],
           const EditDateTimeActionButton(),
           const EditLocationActionButton(source: ActionSource.timeline),
           const MoveToLockFolderActionButton(
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
index 7f82f750f7..a644e6a035 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
index cfb6fe4f1a..2e6047f0ba 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
@@ -3,7 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.dart
new file mode 100644
index 0000000000..9f8216c4ed
--- /dev/null
+++ b/mobile/lib/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart';
+
+class TrashBottomBar extends ConsumerWidget {
+  const TrashBottomBar({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return SafeArea(
+      child: Align(
+        alignment: Alignment.bottomCenter,
+        child: SizedBox(
+          height: 64,
+          child: Container(
+            color: context.themeData.canvasColor,
+            child: const Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: [
+                DeleteTrashActionButton(source: ActionSource.timeline),
+                RestoreTrashActionButton(source: ActionSource.timeline),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index cb025ef941..419ba0f902 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -206,6 +206,7 @@ class ActionNotifier extends Notifier<void> {
 
   Future<ActionResult> trash(ActionSource source) async {
     final ids = _getOwnedRemoteIdsForSource(source);
+
     try {
       await _service.trash(ids);
       return ActionResult(count: ids.length, success: true);
@@ -219,10 +220,26 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
-  Future<ActionResult> delete(ActionSource source) async {
+  Future<ActionResult> restoreTrash(ActionSource source) async {
     final ids = _getOwnedRemoteIdsForSource(source);
     try {
-      await _service.delete(ids);
+      await _service.restoreTrash(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to restore trash assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
+  Future<ActionResult> deleteRemoteAndLocal(ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    final localIds = _getLocalIdsForSource(source);
+    try {
+      await _service.deleteRemoteAndLocal(ids, localIds);
       return ActionResult(count: ids.length, success: true);
     } catch (error, stack) {
       _logger.severe('Failed to delete assets', error, stack);
diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dart
index b1a926545d..9e0f690e7d 100644
--- a/mobile/lib/providers/timeline/multiselect.provider.dart
+++ b/mobile/lib/providers/timeline/multiselect.provider.dart
@@ -23,15 +23,22 @@ class MultiSelectState {
   });
 
   bool get isEnabled => selectedAssets.isNotEmpty;
+
+  /// Cloud only
   bool get hasRemote => selectedAssets.any(
         (asset) =>
             asset.storage == AssetState.remote ||
             asset.storage == AssetState.merged,
       );
+
   bool get hasLocal => selectedAssets.any(
         (asset) => asset.storage == AssetState.local,
       );
 
+  bool get hasMerged => selectedAssets.any(
+        (asset) => asset.storage == AssetState.merged,
+      );
+
   MultiSelectState copyWith({
     Set<BaseAsset>? selectedAssets,
     Set<BaseAsset>? lockedSelectionAssets,
diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dart
index 4c854973b1..6d08b4f0d9 100644
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -13,6 +13,7 @@ final assetApiRepositoryProvider = Provider(
     ref.watch(apiServiceProvider).assetsApi,
     ref.watch(apiServiceProvider).searchApi,
     ref.watch(apiServiceProvider).stacksApi,
+    ref.watch(apiServiceProvider).trashApi,
   ),
 );
 
@@ -20,8 +21,14 @@ class AssetApiRepository extends ApiRepository {
   final AssetsApi _api;
   final SearchApi _searchApi;
   final StacksApi _stacksApi;
+  final TrashApi _trashApi;
 
-  AssetApiRepository(this._api, this._searchApi, this._stacksApi);
+  AssetApiRepository(
+    this._api,
+    this._searchApi,
+    this._stacksApi,
+    this._trashApi,
+  );
 
   Future<Asset> update(String id, {String? description}) async {
     final response = await checkNull(
@@ -56,6 +63,10 @@ class AssetApiRepository extends ApiRepository {
     return _api.deleteAssets(AssetBulkDeleteDto(ids: ids, force: force));
   }
 
+  Future<void> restoreTrash(List<String> ids) async {
+    await _trashApi.restoreAssets(BulkIdsDto(ids: ids));
+  }
+
   Future<void> updateVisibility(
     List<String> ids,
     AssetVisibilityEnum visibility,
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index 7b0d74e420..63bc053a41 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -127,9 +127,25 @@ class ActionService {
     await _remoteAssetRepository.trash(remoteIds);
   }
 
-  Future<void> delete(List<String> remoteIds) async {
+  Future<void> restoreTrash(List<String> ids) async {
+    await _assetApiRepository.restoreTrash(ids);
+    await _remoteAssetRepository.restoreTrash(ids);
+  }
+
+  Future<void> deleteRemoteAndLocal(
+    List<String> remoteIds,
+    List<String> localIds,
+  ) async {
     await _assetApiRepository.delete(remoteIds, true);
     await _remoteAssetRepository.delete(remoteIds);
+
+    if (localIds.isNotEmpty) {
+      final deletedIds = await _assetMediaRepository.deleteAll(localIds);
+
+      if (deletedIds.isNotEmpty) {
+        await _localAssetRepository.delete(deletedIds);
+      }
+    }
   }
 
   Future<void> deleteLocal(List<String> localIds) async {

From ab61bcfcc8c3c94aa1941f0b24352558eb05e2b6 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Tue, 22 Jul 2025 22:28:34 +0530
Subject: [PATCH 272/337] fix: reduce asset_viewer reloads (#20083)

* fix: reduce asset_viewer reloads

* limit the result of watch asset to one

* fix null reference in map thumbnail

* bump hash file limit to 256

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 mobile/lib/constants/constants.dart           |  2 +-
 .../repositories/remote_asset.repository.dart |  3 +-
 .../archive_action_button.widget.dart         |  6 ++++
 .../delete_local_action_button.widget.dart    |  6 ++++
 ...delete_permanent_action_button.widget.dart |  6 ++++
 ...e_to_lock_folder_action_button.widget.dart |  6 ++++
 .../trash_action_button.widget.dart           |  6 ++++
 .../asset_viewer/asset_viewer.page.dart       | 30 ++++++++++++++-----
 .../asset_viewer/asset_viewer.state.dart      |  4 +++
 mobile/lib/widgets/map/map_thumbnail.dart     | 15 +++++-----
 10 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/mobile/lib/constants/constants.dart b/mobile/lib/constants/constants.dart
index 206fbbb28f..b54a1e9ca2 100644
--- a/mobile/lib/constants/constants.dart
+++ b/mobile/lib/constants/constants.dart
@@ -10,7 +10,7 @@ const int kSyncEventBatchSize = 5000;
 const int kFetchLocalAssetsBatchSize = 40000;
 
 // Hash batch limits
-const int kBatchHashFileLimit = 128;
+const int kBatchHashFileLimit = 256;
 const int kBatchHashSizeLimit = 1024 * 1024 * 1024; // 1GB
 
 // Secure storage keys
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index 2c5006953f..64c602a2c7 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -62,7 +62,8 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
         _db.remoteAssetEntity.id,
         _db.localAssetEntity.id,
         _db.stackEntity.primaryAssetId,
-      ]);
+      ])
+      ..limit(1);
 
     return query.map((row) {
       final asset = row.readTable(_db.remoteAssetEntity).toDto();
diff --git a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
index 86537816e3..061e15e58a 100644
--- a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
@@ -2,8 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/translate_extensions.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/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -21,6 +23,10 @@ class ArchiveActionButton extends ConsumerWidget {
     final result = await ref.read(actionProvider.notifier).archive(source);
     ref.read(multiSelectProvider.notifier).reset();
 
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
+
     final successMessage = 'archive_action_prompt'.t(
       context: context,
       args: {'count': result.count.toString()},
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
index 90534ca68c..acd3738f7a 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
@@ -2,8 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/translate_extensions.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/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -21,6 +23,10 @@ class DeleteLocalActionButton extends ConsumerWidget {
     final result = await ref.read(actionProvider.notifier).deleteLocal(source);
     ref.read(multiSelectProvider.notifier).reset();
 
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
+
     final successMessage = 'delete_local_action_prompt'.t(
       context: context,
       args: {'count': result.count.toString()},
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
index 9f88d640dd..7840e8a41d 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
@@ -2,8 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/translate_extensions.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/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -22,6 +24,10 @@ class DeletePermanentActionButton extends ConsumerWidget {
         await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
     ref.read(multiSelectProvider.notifier).reset();
 
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
+
     final successMessage = 'delete_action_prompt'.t(
       context: context,
       args: {'count': result.count.toString()},
diff --git a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
index 7546f07961..6b3e32a2dc 100644
--- a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
@@ -2,8 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/translate_extensions.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/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -22,6 +24,10 @@ class MoveToLockFolderActionButton extends ConsumerWidget {
         await ref.read(actionProvider.notifier).moveToLockFolder(source);
     ref.read(multiSelectProvider.notifier).reset();
 
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
+
     final successMessage = 'move_to_lock_folder_action_prompt'.t(
       context: context,
       args: {'count': result.count.toString()},
diff --git a/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
index 449b688550..2863c71d12 100644
--- a/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
@@ -2,8 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/translate_extensions.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/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -21,6 +23,10 @@ class TrashActionButton extends ConsumerWidget {
     final result = await ref.read(actionProvider.notifier).trash(source);
     ref.read(multiSelectProvider.notifier).reset();
 
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
+
     final successMessage = 'trash_action_prompt'.t(
       context: context,
       args: {'count': result.count.toString()},
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 9356c2f43e..34339c8ba3 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -85,6 +85,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   bool blockGestures = false;
   bool dragInProgress = false;
   bool shouldPopOnDrag = false;
+  bool assetReloadRequested = false;
   double? initialScale;
   double previousExtent = _kBottomSheetMinimumExtent;
   Offset dragDownPosition = Offset.zero;
@@ -404,7 +405,12 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   void _onEvent(Event event) {
     if (event is TimelineReloadEvent) {
-      _onTimelineReload(event);
+      _onTimelineReloadEvent();
+      return;
+    }
+
+    if (event is ViewerReloadAssetEvent) {
+      assetReloadRequested = true;
       return;
     }
 
@@ -417,14 +423,22 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     }
   }
 
-  void _onTimelineReload(_) {
-    setState(() {
-      totalAssets = ref.read(timelineServiceProvider).totalAssets;
-      if (totalAssets == 0) {
-        context.maybePop();
-        return;
-      }
+  void _onTimelineReloadEvent() {
+    totalAssets = ref.read(timelineServiceProvider).totalAssets;
+    if (totalAssets == 0) {
+      context.maybePop();
+      return;
+    }
 
+    if (assetReloadRequested) {
+      assetReloadRequested = false;
+      _onAssetReloadEvent();
+      return;
+    }
+  }
+
+  void _onAssetReloadEvent() {
+    setState(() {
       final index = pageController.page?.round() ?? 0;
       final newAsset = ref.read(timelineServiceProvider).getAsset(index);
       final currentAsset = ref.read(currentAssetNotifier);
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
index 825b637e8d..e57a6ff7ca 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
@@ -7,6 +7,10 @@ class ViewerOpenBottomSheetEvent extends Event {
   const ViewerOpenBottomSheetEvent();
 }
 
+class ViewerReloadAssetEvent extends Event {
+  const ViewerReloadAssetEvent();
+}
+
 class AssetViewerState {
   final int backgroundOpacity;
   final bool showingBottomSheet;
diff --git a/mobile/lib/widgets/map/map_thumbnail.dart b/mobile/lib/widgets/map/map_thumbnail.dart
index 1e4b061be6..5be15f2d5f 100644
--- a/mobile/lib/widgets/map/map_thumbnail.dart
+++ b/mobile/lib/widgets/map/map_thumbnail.dart
@@ -113,13 +113,14 @@ class MapThumbnail extends HookConsumerWidget {
               ),
               ValueListenableBuilder(
                 valueListenable: position,
-                builder: (_, value, __) => value != null
-                    ? PositionedAssetMarkerIcon(
-                        size: height / 2,
-                        point: value,
-                        assetRemoteId: assetMarkerRemoteId!,
-                      )
-                    : const SizedBox.shrink(),
+                builder: (_, value, __) =>
+                    value != null && assetMarkerRemoteId != null
+                        ? PositionedAssetMarkerIcon(
+                            size: height / 2,
+                            point: value,
+                            assetRemoteId: assetMarkerRemoteId!,
+                          )
+                        : const SizedBox.shrink(),
               ),
             ],
           ),

From ac44f6d1e0ad026c509e8bb71fddf4457defb6fd Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Wed, 23 Jul 2025 01:17:52 +0800
Subject: [PATCH 273/337] feat(mobile): asset face sync (#20022)

* feat(mobile): asset face sync

* fix: lint

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../drift_schemas/main/drift_schema_v4.json   |    1 +
 .../lib/domain/models/asset_face.model.dart   |   98 +
 mobile/lib/domain/models/person.model.dart    |    7 -
 .../domain/services/sync_stream.service.dart  |    4 +
 .../entities/asset_face.entity.dart           |   34 +
 .../entities/asset_face.entity.drift.dart     | 1013 +++
 .../entities/person.entity.dart               |    3 -
 .../entities/person.entity.drift.dart         |   60 +-
 .../repositories/asset_face.repository.dart   |   33 +
 .../repositories/db.repository.dart           |    8 +-
 .../repositories/db.repository.drift.dart     |   31 +-
 .../repositories/db.repository.steps.dart     |  449 ++
 .../repositories/person.repository.dart       |    1 -
 .../repositories/sync_api.repository.dart     |    3 +
 .../repositories/sync_stream.repository.dart  |   58 +-
 .../pages/dev/feat_in_development.page.dart   |    1 +
 .../pages/dev/media_stat.page.dart            |    4 +
 .../infrastructure/asset_face.provider.dart   |    7 +
 mobile/lib/repositories/auth.repository.dart  |    3 +-
 .../services/sync_stream_service_test.dart    |    4 +
 mobile/test/drift/main/generated/schema.dart  |    5 +-
 .../test/drift/main/generated/schema_v4.dart  | 5524 +++++++++++++++++
 22 files changed, 7270 insertions(+), 81 deletions(-)
 create mode 100644 mobile/drift_schemas/main/drift_schema_v4.json
 create mode 100644 mobile/lib/domain/models/asset_face.model.dart
 create mode 100644 mobile/lib/infrastructure/entities/asset_face.entity.dart
 create mode 100644 mobile/lib/infrastructure/entities/asset_face.entity.drift.dart
 create mode 100644 mobile/lib/infrastructure/repositories/asset_face.repository.dart
 create mode 100644 mobile/lib/providers/infrastructure/asset_face.provider.dart
 create mode 100644 mobile/test/drift/main/generated/schema_v4.dart

diff --git a/mobile/drift_schemas/main/drift_schema_v4.json b/mobile/drift_schemas/main/drift_schema_v4.json
new file mode 100644
index 0000000000..82ef30adae
--- /dev/null
+++ b/mobile/drift_schemas/main/drift_schema_v4.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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"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":4,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":6,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":7,"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":8,"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":9,"references":[],"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":"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":10,"references":[2,9],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":11,"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":12,"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":13,"references":[1,12],"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":14,"references":[12,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":15,"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":16,"references":[1,15],"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":17,"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":18,"references":[1,17],"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"]}}]}
\ No newline at end of file
diff --git a/mobile/lib/domain/models/asset_face.model.dart b/mobile/lib/domain/models/asset_face.model.dart
new file mode 100644
index 0000000000..f432b923e3
--- /dev/null
+++ b/mobile/lib/domain/models/asset_face.model.dart
@@ -0,0 +1,98 @@
+// Model for an asset face stored in the server
+class AssetFace {
+  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 AssetFace({
+    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,
+  });
+
+  AssetFace copyWith({
+    String? id,
+    String? assetId,
+    String? personId,
+    int? imageWidth,
+    int? imageHeight,
+    int? boundingBoxX1,
+    int? boundingBoxY1,
+    int? boundingBoxX2,
+    int? boundingBoxY2,
+    String? sourceType,
+  }) {
+    return AssetFace(
+      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
+  String toString() {
+    return '''AssetFace {
+    id: $id,
+    assetId: $assetId,
+    personId: ${personId ?? "<NA>"},
+    imageWidth: $imageWidth,
+    imageHeight: $imageHeight,
+    boundingBoxX1: $boundingBoxX1,
+    boundingBoxY1: $boundingBoxY1,
+    boundingBoxX2: $boundingBoxX2,
+    boundingBoxY2: $boundingBoxY2,
+    sourceType: $sourceType,
+}''';
+  }
+
+  @override
+  bool operator ==(covariant AssetFace other) {
+    if (identical(this, other)) return true;
+
+    return other.id == id &&
+        other.assetId == assetId &&
+        other.personId == personId &&
+        other.imageWidth == imageWidth &&
+        other.imageHeight == imageHeight &&
+        other.boundingBoxX1 == boundingBoxX1 &&
+        other.boundingBoxY1 == boundingBoxY1 &&
+        other.boundingBoxX2 == boundingBoxX2 &&
+        other.boundingBoxY2 == boundingBoxY2 &&
+        other.sourceType == sourceType;
+  }
+
+  @override
+  int get hashCode {
+    return id.hashCode ^
+        assetId.hashCode ^
+        personId.hashCode ^
+        imageWidth.hashCode ^
+        imageHeight.hashCode ^
+        boundingBoxX1.hashCode ^
+        boundingBoxY1.hashCode ^
+        boundingBoxX2.hashCode ^
+        boundingBoxY2.hashCode ^
+        sourceType.hashCode;
+  }
+}
diff --git a/mobile/lib/domain/models/person.model.dart b/mobile/lib/domain/models/person.model.dart
index d9eee9ae06..2a6b31cb17 100644
--- a/mobile/lib/domain/models/person.model.dart
+++ b/mobile/lib/domain/models/person.model.dart
@@ -103,7 +103,6 @@ class Person {
   final String ownerId;
   final String name;
   final String? faceAssetId;
-  final String thumbnailPath;
   final bool isFavorite;
   final bool isHidden;
   final String? color;
@@ -116,7 +115,6 @@ class Person {
     required this.ownerId,
     required this.name,
     this.faceAssetId,
-    required this.thumbnailPath,
     required this.isFavorite,
     required this.isHidden,
     required this.color,
@@ -130,7 +128,6 @@ class Person {
     String? ownerId,
     String? name,
     String? faceAssetId,
-    String? thumbnailPath,
     bool? isFavorite,
     bool? isHidden,
     String? color,
@@ -143,7 +140,6 @@ class Person {
       ownerId: ownerId ?? this.ownerId,
       name: name ?? this.name,
       faceAssetId: faceAssetId ?? this.faceAssetId,
-      thumbnailPath: thumbnailPath ?? this.thumbnailPath,
       isFavorite: isFavorite ?? this.isFavorite,
       isHidden: isHidden ?? this.isHidden,
       color: color ?? this.color,
@@ -160,7 +156,6 @@ class Person {
     ownerId: $ownerId,
     name: $name,
     faceAssetId: ${faceAssetId ?? "<NA>"},
-    thumbnailPath: $thumbnailPath,
     isFavorite: $isFavorite,
     isHidden: $isHidden,
     color: ${color ?? "<NA>"},
@@ -178,7 +173,6 @@ class Person {
         other.ownerId == ownerId &&
         other.name == name &&
         other.faceAssetId == faceAssetId &&
-        other.thumbnailPath == thumbnailPath &&
         other.isFavorite == isFavorite &&
         other.isHidden == isHidden &&
         other.color == color &&
@@ -193,7 +187,6 @@ class Person {
         ownerId.hashCode ^
         name.hashCode ^
         faceAssetId.hashCode ^
-        thumbnailPath.hashCode ^
         isFavorite.hashCode ^
         isHidden.hashCode ^
         color.hashCode ^
diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index 9a7d91ced9..ca8295fc8f 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -244,6 +244,10 @@ class SyncStreamService {
         return _syncStreamRepository.updatePeopleV1(data.cast());
       case SyncEntityType.personDeleteV1:
         return _syncStreamRepository.deletePeopleV1(data.cast());
+      case SyncEntityType.assetFaceV1:
+        return _syncStreamRepository.updateAssetFacesV1(data.cast());
+      case SyncEntityType.assetFaceDeleteV1:
+        return _syncStreamRepository.deleteAssetFacesV1(data.cast());
       default:
         _logger.warning("Unknown sync data type: $type");
     }
diff --git a/mobile/lib/infrastructure/entities/asset_face.entity.dart b/mobile/lib/infrastructure/entities/asset_face.entity.dart
new file mode 100644
index 0000000000..c54e4e1848
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/asset_face.entity.dart
@@ -0,0 +1,34 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/entities/person.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class AssetFaceEntity extends Table with DriftDefaultsMixin {
+  const AssetFaceEntity();
+
+  TextColumn get id => text()();
+
+  TextColumn get assetId =>
+      text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get personId => text()
+      .nullable()
+      .references(PersonEntity, #id, onDelete: KeyAction.setNull)();
+
+  IntColumn get imageWidth => integer()();
+
+  IntColumn get imageHeight => integer()();
+
+  IntColumn get boundingBoxX1 => integer()();
+
+  IntColumn get boundingBoxY1 => integer()();
+
+  IntColumn get boundingBoxX2 => integer()();
+
+  IntColumn get boundingBoxY2 => integer()();
+
+  TextColumn get sourceType => text()();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}
diff --git a/mobile/lib/infrastructure/entities/asset_face.entity.drift.dart b/mobile/lib/infrastructure/entities/asset_face.entity.drift.dart
new file mode 100644
index 0000000000..140af60de1
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/asset_face.entity.drift.dart
@@ -0,0 +1,1013 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/asset_face.entity.dart'
+    as i2;
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
+    as i3;
+import 'package:drift/internal/modular.dart' as i4;
+import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart'
+    as i5;
+
+typedef $$AssetFaceEntityTableCreateCompanionBuilder
+    = i1.AssetFaceEntityCompanion Function({
+  required String id,
+  required String assetId,
+  i0.Value<String?> personId,
+  required int imageWidth,
+  required int imageHeight,
+  required int boundingBoxX1,
+  required int boundingBoxY1,
+  required int boundingBoxX2,
+  required int boundingBoxY2,
+  required String sourceType,
+});
+typedef $$AssetFaceEntityTableUpdateCompanionBuilder
+    = i1.AssetFaceEntityCompanion Function({
+  i0.Value<String> id,
+  i0.Value<String> assetId,
+  i0.Value<String?> personId,
+  i0.Value<int> imageWidth,
+  i0.Value<int> imageHeight,
+  i0.Value<int> boundingBoxX1,
+  i0.Value<int> boundingBoxY1,
+  i0.Value<int> boundingBoxX2,
+  i0.Value<int> boundingBoxY2,
+  i0.Value<String> sourceType,
+});
+
+final class $$AssetFaceEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase, i1.$AssetFaceEntityTable, i1.AssetFaceEntityData> {
+  $$AssetFaceEntityTableReferences(
+      super.$_db, super.$_table, super.$_typedResult);
+
+  static i3.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
+      i4.ReadDatabaseContainer(db)
+          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$AssetFaceEntityTable>('asset_face_entity')
+                  .assetId,
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+                  .id));
+
+  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
+    final $_column = $_itemColumn<String>('asset_id')!;
+
+    final manager = i3
+        .$$RemoteAssetEntityTableTableManager(
+            $_db,
+            i4.ReadDatabaseContainer($_db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_assetIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+
+  static i5.$PersonEntityTable _personIdTable(i0.GeneratedDatabase db) =>
+      i4.ReadDatabaseContainer(db)
+          .resultSet<i5.$PersonEntityTable>('person_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$AssetFaceEntityTable>('asset_face_entity')
+                  .personId,
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i5.$PersonEntityTable>('person_entity')
+                  .id));
+
+  i5.$$PersonEntityTableProcessedTableManager? get personId {
+    final $_column = $_itemColumn<String>('person_id');
+    if ($_column == null) return null;
+    final manager = i5
+        .$$PersonEntityTableTableManager(
+            $_db,
+            i4.ReadDatabaseContainer($_db)
+                .resultSet<i5.$PersonEntityTable>('person_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_personIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$AssetFaceEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$AssetFaceEntityTable> {
+  $$AssetFaceEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<int> get imageWidth => $composableBuilder(
+      column: $table.imageWidth, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<int> get imageHeight => $composableBuilder(
+      column: $table.imageHeight,
+      builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<int> get boundingBoxX1 => $composableBuilder(
+      column: $table.boundingBoxX1,
+      builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<int> get boundingBoxY1 => $composableBuilder(
+      column: $table.boundingBoxY1,
+      builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<int> get boundingBoxX2 => $composableBuilder(
+      column: $table.boundingBoxX2,
+      builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<int> get boundingBoxY2 => $composableBuilder(
+      column: $table.boundingBoxY2,
+      builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get sourceType => $composableBuilder(
+      column: $table.sourceType, builder: (column) => i0.ColumnFilters(column));
+
+  i3.$$RemoteAssetEntityTableFilterComposer get assetId {
+    final i3.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.assetId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i3.$$RemoteAssetEntityTableFilterComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i5.$$PersonEntityTableFilterComposer get personId {
+    final i5.$$PersonEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.personId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i5.$PersonEntityTable>('person_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$PersonEntityTableFilterComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i5.$PersonEntityTable>('person_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$AssetFaceEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$AssetFaceEntityTable> {
+  $$AssetFaceEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get imageWidth => $composableBuilder(
+      column: $table.imageWidth,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get imageHeight => $composableBuilder(
+      column: $table.imageHeight,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get boundingBoxX1 => $composableBuilder(
+      column: $table.boundingBoxX1,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get boundingBoxY1 => $composableBuilder(
+      column: $table.boundingBoxY1,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get boundingBoxX2 => $composableBuilder(
+      column: $table.boundingBoxX2,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get boundingBoxY2 => $composableBuilder(
+      column: $table.boundingBoxY2,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get sourceType => $composableBuilder(
+      column: $table.sourceType,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i3.$$RemoteAssetEntityTableOrderingComposer get assetId {
+    final i3.$$RemoteAssetEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.assetId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i3.$$RemoteAssetEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i3.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i5.$$PersonEntityTableOrderingComposer get personId {
+    final i5.$$PersonEntityTableOrderingComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.personId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i5.$PersonEntityTable>('person_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$PersonEntityTableOrderingComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i5.$PersonEntityTable>('person_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$AssetFaceEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$AssetFaceEntityTable> {
+  $$AssetFaceEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get imageWidth => $composableBuilder(
+      column: $table.imageWidth, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get imageHeight => $composableBuilder(
+      column: $table.imageHeight, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get boundingBoxX1 => $composableBuilder(
+      column: $table.boundingBoxX1, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get boundingBoxY1 => $composableBuilder(
+      column: $table.boundingBoxY1, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get boundingBoxX2 => $composableBuilder(
+      column: $table.boundingBoxX2, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get boundingBoxY2 => $composableBuilder(
+      column: $table.boundingBoxY2, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get sourceType => $composableBuilder(
+      column: $table.sourceType, builder: (column) => column);
+
+  i3.$$RemoteAssetEntityTableAnnotationComposer get assetId {
+    final i3.$$RemoteAssetEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.assetId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i3.$$RemoteAssetEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i3.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i5.$$PersonEntityTableAnnotationComposer get personId {
+    final i5.$$PersonEntityTableAnnotationComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.personId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i5.$PersonEntityTable>('person_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$PersonEntityTableAnnotationComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i5.$PersonEntityTable>('person_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$AssetFaceEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$AssetFaceEntityTable,
+    i1.AssetFaceEntityData,
+    i1.$$AssetFaceEntityTableFilterComposer,
+    i1.$$AssetFaceEntityTableOrderingComposer,
+    i1.$$AssetFaceEntityTableAnnotationComposer,
+    $$AssetFaceEntityTableCreateCompanionBuilder,
+    $$AssetFaceEntityTableUpdateCompanionBuilder,
+    (i1.AssetFaceEntityData, i1.$$AssetFaceEntityTableReferences),
+    i1.AssetFaceEntityData,
+    i0.PrefetchHooks Function({bool assetId, bool personId})> {
+  $$AssetFaceEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$AssetFaceEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$AssetFaceEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$AssetFaceEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () => i1
+              .$$AssetFaceEntityTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> id = const i0.Value.absent(),
+            i0.Value<String> assetId = const i0.Value.absent(),
+            i0.Value<String?> personId = const i0.Value.absent(),
+            i0.Value<int> imageWidth = const i0.Value.absent(),
+            i0.Value<int> imageHeight = const i0.Value.absent(),
+            i0.Value<int> boundingBoxX1 = const i0.Value.absent(),
+            i0.Value<int> boundingBoxY1 = const i0.Value.absent(),
+            i0.Value<int> boundingBoxX2 = const i0.Value.absent(),
+            i0.Value<int> boundingBoxY2 = const i0.Value.absent(),
+            i0.Value<String> sourceType = const i0.Value.absent(),
+          }) =>
+              i1.AssetFaceEntityCompanion(
+            id: id,
+            assetId: assetId,
+            personId: personId,
+            imageWidth: imageWidth,
+            imageHeight: imageHeight,
+            boundingBoxX1: boundingBoxX1,
+            boundingBoxY1: boundingBoxY1,
+            boundingBoxX2: boundingBoxX2,
+            boundingBoxY2: boundingBoxY2,
+            sourceType: sourceType,
+          ),
+          createCompanionCallback: ({
+            required String id,
+            required String assetId,
+            i0.Value<String?> personId = const i0.Value.absent(),
+            required int imageWidth,
+            required int imageHeight,
+            required int boundingBoxX1,
+            required int boundingBoxY1,
+            required int boundingBoxX2,
+            required int boundingBoxY2,
+            required String sourceType,
+          }) =>
+              i1.AssetFaceEntityCompanion.insert(
+            id: id,
+            assetId: assetId,
+            personId: personId,
+            imageWidth: imageWidth,
+            imageHeight: imageHeight,
+            boundingBoxX1: boundingBoxX1,
+            boundingBoxY1: boundingBoxY1,
+            boundingBoxX2: boundingBoxX2,
+            boundingBoxY2: boundingBoxY2,
+            sourceType: sourceType,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$AssetFaceEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({assetId = false, personId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (assetId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.assetId,
+                    referencedTable:
+                        i1.$$AssetFaceEntityTableReferences._assetIdTable(db),
+                    referencedColumn: i1.$$AssetFaceEntityTableReferences
+                        ._assetIdTable(db)
+                        .id,
+                  ) as T;
+                }
+                if (personId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.personId,
+                    referencedTable:
+                        i1.$$AssetFaceEntityTableReferences._personIdTable(db),
+                    referencedColumn: i1.$$AssetFaceEntityTableReferences
+                        ._personIdTable(db)
+                        .id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$AssetFaceEntityTableProcessedTableManager = i0.ProcessedTableManager<
+    i0.GeneratedDatabase,
+    i1.$AssetFaceEntityTable,
+    i1.AssetFaceEntityData,
+    i1.$$AssetFaceEntityTableFilterComposer,
+    i1.$$AssetFaceEntityTableOrderingComposer,
+    i1.$$AssetFaceEntityTableAnnotationComposer,
+    $$AssetFaceEntityTableCreateCompanionBuilder,
+    $$AssetFaceEntityTableUpdateCompanionBuilder,
+    (i1.AssetFaceEntityData, i1.$$AssetFaceEntityTableReferences),
+    i1.AssetFaceEntityData,
+    i0.PrefetchHooks Function({bool assetId, bool personId})>;
+
+class $AssetFaceEntityTable extends i2.AssetFaceEntity
+    with i0.TableInfo<$AssetFaceEntityTable, i1.AssetFaceEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $AssetFaceEntityTable(this.attachedDatabase, [this._alias]);
+  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 _assetIdMeta =
+      const i0.VerificationMeta('assetId');
+  @override
+  late final i0.GeneratedColumn<String> assetId = i0.GeneratedColumn<String>(
+      'asset_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_asset_entity (id) ON DELETE CASCADE'));
+  static const i0.VerificationMeta _personIdMeta =
+      const i0.VerificationMeta('personId');
+  @override
+  late final i0.GeneratedColumn<String> personId = i0.GeneratedColumn<String>(
+      'person_id', aliasedName, true,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: false,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES person_entity (id) ON DELETE SET NULL'));
+  static const i0.VerificationMeta _imageWidthMeta =
+      const i0.VerificationMeta('imageWidth');
+  @override
+  late final i0.GeneratedColumn<int> imageWidth = i0.GeneratedColumn<int>(
+      'image_width', aliasedName, false,
+      type: i0.DriftSqlType.int, requiredDuringInsert: true);
+  static const i0.VerificationMeta _imageHeightMeta =
+      const i0.VerificationMeta('imageHeight');
+  @override
+  late final i0.GeneratedColumn<int> imageHeight = i0.GeneratedColumn<int>(
+      'image_height', aliasedName, false,
+      type: i0.DriftSqlType.int, requiredDuringInsert: true);
+  static const i0.VerificationMeta _boundingBoxX1Meta =
+      const i0.VerificationMeta('boundingBoxX1');
+  @override
+  late final i0.GeneratedColumn<int> boundingBoxX1 = i0.GeneratedColumn<int>(
+      'bounding_box_x1', aliasedName, false,
+      type: i0.DriftSqlType.int, requiredDuringInsert: true);
+  static const i0.VerificationMeta _boundingBoxY1Meta =
+      const i0.VerificationMeta('boundingBoxY1');
+  @override
+  late final i0.GeneratedColumn<int> boundingBoxY1 = i0.GeneratedColumn<int>(
+      'bounding_box_y1', aliasedName, false,
+      type: i0.DriftSqlType.int, requiredDuringInsert: true);
+  static const i0.VerificationMeta _boundingBoxX2Meta =
+      const i0.VerificationMeta('boundingBoxX2');
+  @override
+  late final i0.GeneratedColumn<int> boundingBoxX2 = i0.GeneratedColumn<int>(
+      'bounding_box_x2', aliasedName, false,
+      type: i0.DriftSqlType.int, requiredDuringInsert: true);
+  static const i0.VerificationMeta _boundingBoxY2Meta =
+      const i0.VerificationMeta('boundingBoxY2');
+  @override
+  late final i0.GeneratedColumn<int> boundingBoxY2 = i0.GeneratedColumn<int>(
+      'bounding_box_y2', aliasedName, false,
+      type: i0.DriftSqlType.int, requiredDuringInsert: true);
+  static const i0.VerificationMeta _sourceTypeMeta =
+      const i0.VerificationMeta('sourceType');
+  @override
+  late final i0.GeneratedColumn<String> sourceType = i0.GeneratedColumn<String>(
+      'source_type', aliasedName, false,
+      type: i0.DriftSqlType.string, requiredDuringInsert: true);
+  @override
+  List<i0.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
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.AssetFaceEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('asset_id')) {
+      context.handle(_assetIdMeta,
+          assetId.isAcceptableOrUnknown(data['asset_id']!, _assetIdMeta));
+    } else if (isInserting) {
+      context.missing(_assetIdMeta);
+    }
+    if (data.containsKey('person_id')) {
+      context.handle(_personIdMeta,
+          personId.isAcceptableOrUnknown(data['person_id']!, _personIdMeta));
+    }
+    if (data.containsKey('image_width')) {
+      context.handle(
+          _imageWidthMeta,
+          imageWidth.isAcceptableOrUnknown(
+              data['image_width']!, _imageWidthMeta));
+    } else if (isInserting) {
+      context.missing(_imageWidthMeta);
+    }
+    if (data.containsKey('image_height')) {
+      context.handle(
+          _imageHeightMeta,
+          imageHeight.isAcceptableOrUnknown(
+              data['image_height']!, _imageHeightMeta));
+    } else if (isInserting) {
+      context.missing(_imageHeightMeta);
+    }
+    if (data.containsKey('bounding_box_x1')) {
+      context.handle(
+          _boundingBoxX1Meta,
+          boundingBoxX1.isAcceptableOrUnknown(
+              data['bounding_box_x1']!, _boundingBoxX1Meta));
+    } else if (isInserting) {
+      context.missing(_boundingBoxX1Meta);
+    }
+    if (data.containsKey('bounding_box_y1')) {
+      context.handle(
+          _boundingBoxY1Meta,
+          boundingBoxY1.isAcceptableOrUnknown(
+              data['bounding_box_y1']!, _boundingBoxY1Meta));
+    } else if (isInserting) {
+      context.missing(_boundingBoxY1Meta);
+    }
+    if (data.containsKey('bounding_box_x2')) {
+      context.handle(
+          _boundingBoxX2Meta,
+          boundingBoxX2.isAcceptableOrUnknown(
+              data['bounding_box_x2']!, _boundingBoxX2Meta));
+    } else if (isInserting) {
+      context.missing(_boundingBoxX2Meta);
+    }
+    if (data.containsKey('bounding_box_y2')) {
+      context.handle(
+          _boundingBoxY2Meta,
+          boundingBoxY2.isAcceptableOrUnknown(
+              data['bounding_box_y2']!, _boundingBoxY2Meta));
+    } else if (isInserting) {
+      context.missing(_boundingBoxY2Meta);
+    }
+    if (data.containsKey('source_type')) {
+      context.handle(
+          _sourceTypeMeta,
+          sourceType.isAcceptableOrUnknown(
+              data['source_type']!, _sourceTypeMeta));
+    } else if (isInserting) {
+      context.missing(_sourceTypeMeta);
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.AssetFaceEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.AssetFaceEntityData(
+      id: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}id'])!,
+      assetId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      personId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}person_id']),
+      imageWidth: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}image_width'])!,
+      imageHeight: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}image_height'])!,
+      boundingBoxX1: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.int, data['${effectivePrefix}bounding_box_x1'])!,
+      boundingBoxY1: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.int, data['${effectivePrefix}bounding_box_y1'])!,
+      boundingBoxX2: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.int, data['${effectivePrefix}bounding_box_x2'])!,
+      boundingBoxY2: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.int, data['${effectivePrefix}bounding_box_y2'])!,
+      sourceType: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}source_type'])!,
+    );
+  }
+
+  @override
+  $AssetFaceEntityTable createAlias(String alias) {
+    return $AssetFaceEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class AssetFaceEntityData extends i0.DataClass
+    implements i0.Insertable<i1.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, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<String>(id);
+    map['asset_id'] = i0.Variable<String>(assetId);
+    if (!nullToAbsent || personId != null) {
+      map['person_id'] = i0.Variable<String>(personId);
+    }
+    map['image_width'] = i0.Variable<int>(imageWidth);
+    map['image_height'] = i0.Variable<int>(imageHeight);
+    map['bounding_box_x1'] = i0.Variable<int>(boundingBoxX1);
+    map['bounding_box_y1'] = i0.Variable<int>(boundingBoxY1);
+    map['bounding_box_x2'] = i0.Variable<int>(boundingBoxX2);
+    map['bounding_box_y2'] = i0.Variable<int>(boundingBoxY2);
+    map['source_type'] = i0.Variable<String>(sourceType);
+    return map;
+  }
+
+  factory AssetFaceEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.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({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.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),
+    };
+  }
+
+  i1.AssetFaceEntityData copyWith(
+          {String? id,
+          String? assetId,
+          i0.Value<String?> personId = const i0.Value.absent(),
+          int? imageWidth,
+          int? imageHeight,
+          int? boundingBoxX1,
+          int? boundingBoxY1,
+          int? boundingBoxX2,
+          int? boundingBoxY2,
+          String? sourceType}) =>
+      i1.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(i1.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 i1.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 i0.UpdateCompanion<i1.AssetFaceEntityData> {
+  final i0.Value<String> id;
+  final i0.Value<String> assetId;
+  final i0.Value<String?> personId;
+  final i0.Value<int> imageWidth;
+  final i0.Value<int> imageHeight;
+  final i0.Value<int> boundingBoxX1;
+  final i0.Value<int> boundingBoxY1;
+  final i0.Value<int> boundingBoxX2;
+  final i0.Value<int> boundingBoxY2;
+  final i0.Value<String> sourceType;
+  const AssetFaceEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.assetId = const i0.Value.absent(),
+    this.personId = const i0.Value.absent(),
+    this.imageWidth = const i0.Value.absent(),
+    this.imageHeight = const i0.Value.absent(),
+    this.boundingBoxX1 = const i0.Value.absent(),
+    this.boundingBoxY1 = const i0.Value.absent(),
+    this.boundingBoxX2 = const i0.Value.absent(),
+    this.boundingBoxY2 = const i0.Value.absent(),
+    this.sourceType = const i0.Value.absent(),
+  });
+  AssetFaceEntityCompanion.insert({
+    required String id,
+    required String assetId,
+    this.personId = const i0.Value.absent(),
+    required int imageWidth,
+    required int imageHeight,
+    required int boundingBoxX1,
+    required int boundingBoxY1,
+    required int boundingBoxX2,
+    required int boundingBoxY2,
+    required String sourceType,
+  })  : id = i0.Value(id),
+        assetId = i0.Value(assetId),
+        imageWidth = i0.Value(imageWidth),
+        imageHeight = i0.Value(imageHeight),
+        boundingBoxX1 = i0.Value(boundingBoxX1),
+        boundingBoxY1 = i0.Value(boundingBoxY1),
+        boundingBoxX2 = i0.Value(boundingBoxX2),
+        boundingBoxY2 = i0.Value(boundingBoxY2),
+        sourceType = i0.Value(sourceType);
+  static i0.Insertable<i1.AssetFaceEntityData> custom({
+    i0.Expression<String>? id,
+    i0.Expression<String>? assetId,
+    i0.Expression<String>? personId,
+    i0.Expression<int>? imageWidth,
+    i0.Expression<int>? imageHeight,
+    i0.Expression<int>? boundingBoxX1,
+    i0.Expression<int>? boundingBoxY1,
+    i0.Expression<int>? boundingBoxX2,
+    i0.Expression<int>? boundingBoxY2,
+    i0.Expression<String>? sourceType,
+  }) {
+    return i0.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,
+    });
+  }
+
+  i1.AssetFaceEntityCompanion copyWith(
+      {i0.Value<String>? id,
+      i0.Value<String>? assetId,
+      i0.Value<String?>? personId,
+      i0.Value<int>? imageWidth,
+      i0.Value<int>? imageHeight,
+      i0.Value<int>? boundingBoxX1,
+      i0.Value<int>? boundingBoxY1,
+      i0.Value<int>? boundingBoxX2,
+      i0.Value<int>? boundingBoxY2,
+      i0.Value<String>? sourceType}) {
+    return i1.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, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<String>(id.value);
+    }
+    if (assetId.present) {
+      map['asset_id'] = i0.Variable<String>(assetId.value);
+    }
+    if (personId.present) {
+      map['person_id'] = i0.Variable<String>(personId.value);
+    }
+    if (imageWidth.present) {
+      map['image_width'] = i0.Variable<int>(imageWidth.value);
+    }
+    if (imageHeight.present) {
+      map['image_height'] = i0.Variable<int>(imageHeight.value);
+    }
+    if (boundingBoxX1.present) {
+      map['bounding_box_x1'] = i0.Variable<int>(boundingBoxX1.value);
+    }
+    if (boundingBoxY1.present) {
+      map['bounding_box_y1'] = i0.Variable<int>(boundingBoxY1.value);
+    }
+    if (boundingBoxX2.present) {
+      map['bounding_box_x2'] = i0.Variable<int>(boundingBoxX2.value);
+    }
+    if (boundingBoxY2.present) {
+      map['bounding_box_y2'] = i0.Variable<int>(boundingBoxY2.value);
+    }
+    if (sourceType.present) {
+      map['source_type'] = i0.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();
+  }
+}
diff --git a/mobile/lib/infrastructure/entities/person.entity.dart b/mobile/lib/infrastructure/entities/person.entity.dart
index 68dd04cb5f..75543baca3 100644
--- a/mobile/lib/infrastructure/entities/person.entity.dart
+++ b/mobile/lib/infrastructure/entities/person.entity.dart
@@ -16,11 +16,8 @@ class PersonEntity extends Table with DriftDefaultsMixin {
 
   TextColumn get name => text()();
 
-  // TODO: foreign key refering to asset faces
   TextColumn get faceAssetId => text().nullable()();
 
-  TextColumn get thumbnailPath => text()();
-
   BoolColumn get isFavorite => boolean()();
 
   BoolColumn get isHidden => boolean()();
diff --git a/mobile/lib/infrastructure/entities/person.entity.drift.dart b/mobile/lib/infrastructure/entities/person.entity.drift.dart
index f0ced63f0e..70639adc2f 100644
--- a/mobile/lib/infrastructure/entities/person.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/person.entity.drift.dart
@@ -17,7 +17,6 @@ typedef $$PersonEntityTableCreateCompanionBuilder = i1.PersonEntityCompanion
   required String ownerId,
   required String name,
   i0.Value<String?> faceAssetId,
-  required String thumbnailPath,
   required bool isFavorite,
   required bool isHidden,
   i0.Value<String?> color,
@@ -31,7 +30,6 @@ typedef $$PersonEntityTableUpdateCompanionBuilder = i1.PersonEntityCompanion
   i0.Value<String> ownerId,
   i0.Value<String> name,
   i0.Value<String?> faceAssetId,
-  i0.Value<String> thumbnailPath,
   i0.Value<bool> isFavorite,
   i0.Value<bool> isHidden,
   i0.Value<String?> color,
@@ -94,10 +92,6 @@ class $$PersonEntityTableFilterComposer
       column: $table.faceAssetId,
       builder: (column) => i0.ColumnFilters(column));
 
-  i0.ColumnFilters<String> get thumbnailPath => $composableBuilder(
-      column: $table.thumbnailPath,
-      builder: (column) => i0.ColumnFilters(column));
-
   i0.ColumnFilters<bool> get isFavorite => $composableBuilder(
       column: $table.isFavorite, builder: (column) => i0.ColumnFilters(column));
 
@@ -160,10 +154,6 @@ class $$PersonEntityTableOrderingComposer
       column: $table.faceAssetId,
       builder: (column) => i0.ColumnOrderings(column));
 
-  i0.ColumnOrderings<String> get thumbnailPath => $composableBuilder(
-      column: $table.thumbnailPath,
-      builder: (column) => i0.ColumnOrderings(column));
-
   i0.ColumnOrderings<bool> get isFavorite => $composableBuilder(
       column: $table.isFavorite,
       builder: (column) => i0.ColumnOrderings(column));
@@ -225,9 +215,6 @@ class $$PersonEntityTableAnnotationComposer
   i0.GeneratedColumn<String> get faceAssetId => $composableBuilder(
       column: $table.faceAssetId, builder: (column) => column);
 
-  i0.GeneratedColumn<String> get thumbnailPath => $composableBuilder(
-      column: $table.thumbnailPath, builder: (column) => column);
-
   i0.GeneratedColumn<bool> get isFavorite => $composableBuilder(
       column: $table.isFavorite, builder: (column) => column);
 
@@ -293,7 +280,6 @@ class $$PersonEntityTableTableManager extends i0.RootTableManager<
             i0.Value<String> ownerId = const i0.Value.absent(),
             i0.Value<String> name = const i0.Value.absent(),
             i0.Value<String?> faceAssetId = const i0.Value.absent(),
-            i0.Value<String> thumbnailPath = const i0.Value.absent(),
             i0.Value<bool> isFavorite = const i0.Value.absent(),
             i0.Value<bool> isHidden = const i0.Value.absent(),
             i0.Value<String?> color = const i0.Value.absent(),
@@ -306,7 +292,6 @@ class $$PersonEntityTableTableManager extends i0.RootTableManager<
             ownerId: ownerId,
             name: name,
             faceAssetId: faceAssetId,
-            thumbnailPath: thumbnailPath,
             isFavorite: isFavorite,
             isHidden: isHidden,
             color: color,
@@ -319,7 +304,6 @@ class $$PersonEntityTableTableManager extends i0.RootTableManager<
             required String ownerId,
             required String name,
             i0.Value<String?> faceAssetId = const i0.Value.absent(),
-            required String thumbnailPath,
             required bool isFavorite,
             required bool isHidden,
             i0.Value<String?> color = const i0.Value.absent(),
@@ -332,7 +316,6 @@ class $$PersonEntityTableTableManager extends i0.RootTableManager<
             ownerId: ownerId,
             name: name,
             faceAssetId: faceAssetId,
-            thumbnailPath: thumbnailPath,
             isFavorite: isFavorite,
             isHidden: isHidden,
             color: color,
@@ -443,12 +426,6 @@ class $PersonEntityTable extends i2.PersonEntity
   late final i0.GeneratedColumn<String> faceAssetId =
       i0.GeneratedColumn<String>('face_asset_id', aliasedName, true,
           type: i0.DriftSqlType.string, requiredDuringInsert: false);
-  static const i0.VerificationMeta _thumbnailPathMeta =
-      const i0.VerificationMeta('thumbnailPath');
-  @override
-  late final i0.GeneratedColumn<String> thumbnailPath =
-      i0.GeneratedColumn<String>('thumbnail_path', aliasedName, false,
-          type: i0.DriftSqlType.string, requiredDuringInsert: true);
   static const i0.VerificationMeta _isFavoriteMeta =
       const i0.VerificationMeta('isFavorite');
   @override
@@ -487,7 +464,6 @@ class $PersonEntityTable extends i2.PersonEntity
         ownerId,
         name,
         faceAssetId,
-        thumbnailPath,
         isFavorite,
         isHidden,
         color,
@@ -535,14 +511,6 @@ class $PersonEntityTable extends i2.PersonEntity
           faceAssetId.isAcceptableOrUnknown(
               data['face_asset_id']!, _faceAssetIdMeta));
     }
-    if (data.containsKey('thumbnail_path')) {
-      context.handle(
-          _thumbnailPathMeta,
-          thumbnailPath.isAcceptableOrUnknown(
-              data['thumbnail_path']!, _thumbnailPathMeta));
-    } else if (isInserting) {
-      context.missing(_thumbnailPathMeta);
-    }
     if (data.containsKey('is_favorite')) {
       context.handle(
           _isFavoriteMeta,
@@ -586,8 +554,6 @@ class $PersonEntityTable extends i2.PersonEntity
           .read(i0.DriftSqlType.string, data['${effectivePrefix}name'])!,
       faceAssetId: attachedDatabase.typeMapping.read(
           i0.DriftSqlType.string, data['${effectivePrefix}face_asset_id']),
-      thumbnailPath: attachedDatabase.typeMapping.read(
-          i0.DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!,
       isFavorite: attachedDatabase.typeMapping
           .read(i0.DriftSqlType.bool, data['${effectivePrefix}is_favorite'])!,
       isHidden: attachedDatabase.typeMapping
@@ -618,7 +584,6 @@ class PersonEntityData extends i0.DataClass
   final String ownerId;
   final String name;
   final String? faceAssetId;
-  final String thumbnailPath;
   final bool isFavorite;
   final bool isHidden;
   final String? color;
@@ -630,7 +595,6 @@ class PersonEntityData extends i0.DataClass
       required this.ownerId,
       required this.name,
       this.faceAssetId,
-      required this.thumbnailPath,
       required this.isFavorite,
       required this.isHidden,
       this.color,
@@ -646,7 +610,6 @@ class PersonEntityData extends i0.DataClass
     if (!nullToAbsent || faceAssetId != null) {
       map['face_asset_id'] = i0.Variable<String>(faceAssetId);
     }
-    map['thumbnail_path'] = i0.Variable<String>(thumbnailPath);
     map['is_favorite'] = i0.Variable<bool>(isFavorite);
     map['is_hidden'] = i0.Variable<bool>(isHidden);
     if (!nullToAbsent || color != null) {
@@ -668,7 +631,6 @@ class PersonEntityData extends i0.DataClass
       ownerId: serializer.fromJson<String>(json['ownerId']),
       name: serializer.fromJson<String>(json['name']),
       faceAssetId: serializer.fromJson<String?>(json['faceAssetId']),
-      thumbnailPath: serializer.fromJson<String>(json['thumbnailPath']),
       isFavorite: serializer.fromJson<bool>(json['isFavorite']),
       isHidden: serializer.fromJson<bool>(json['isHidden']),
       color: serializer.fromJson<String?>(json['color']),
@@ -685,7 +647,6 @@ class PersonEntityData extends i0.DataClass
       'ownerId': serializer.toJson<String>(ownerId),
       'name': serializer.toJson<String>(name),
       'faceAssetId': serializer.toJson<String?>(faceAssetId),
-      'thumbnailPath': serializer.toJson<String>(thumbnailPath),
       'isFavorite': serializer.toJson<bool>(isFavorite),
       'isHidden': serializer.toJson<bool>(isHidden),
       'color': serializer.toJson<String?>(color),
@@ -700,7 +661,6 @@ class PersonEntityData extends i0.DataClass
           String? ownerId,
           String? name,
           i0.Value<String?> faceAssetId = const i0.Value.absent(),
-          String? thumbnailPath,
           bool? isFavorite,
           bool? isHidden,
           i0.Value<String?> color = const i0.Value.absent(),
@@ -712,7 +672,6 @@ class PersonEntityData extends i0.DataClass
         ownerId: ownerId ?? this.ownerId,
         name: name ?? this.name,
         faceAssetId: faceAssetId.present ? faceAssetId.value : this.faceAssetId,
-        thumbnailPath: thumbnailPath ?? this.thumbnailPath,
         isFavorite: isFavorite ?? this.isFavorite,
         isHidden: isHidden ?? this.isHidden,
         color: color.present ? color.value : this.color,
@@ -727,9 +686,6 @@ class PersonEntityData extends i0.DataClass
       name: data.name.present ? data.name.value : this.name,
       faceAssetId:
           data.faceAssetId.present ? data.faceAssetId.value : this.faceAssetId,
-      thumbnailPath: data.thumbnailPath.present
-          ? data.thumbnailPath.value
-          : this.thumbnailPath,
       isFavorite:
           data.isFavorite.present ? data.isFavorite.value : this.isFavorite,
       isHidden: data.isHidden.present ? data.isHidden.value : this.isHidden,
@@ -747,7 +703,6 @@ class PersonEntityData extends i0.DataClass
           ..write('ownerId: $ownerId, ')
           ..write('name: $name, ')
           ..write('faceAssetId: $faceAssetId, ')
-          ..write('thumbnailPath: $thumbnailPath, ')
           ..write('isFavorite: $isFavorite, ')
           ..write('isHidden: $isHidden, ')
           ..write('color: $color, ')
@@ -758,7 +713,7 @@ class PersonEntityData extends i0.DataClass
 
   @override
   int get hashCode => Object.hash(id, createdAt, updatedAt, ownerId, name,
-      faceAssetId, thumbnailPath, isFavorite, isHidden, color, birthDate);
+      faceAssetId, isFavorite, isHidden, color, birthDate);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -769,7 +724,6 @@ class PersonEntityData extends i0.DataClass
           other.ownerId == this.ownerId &&
           other.name == this.name &&
           other.faceAssetId == this.faceAssetId &&
-          other.thumbnailPath == this.thumbnailPath &&
           other.isFavorite == this.isFavorite &&
           other.isHidden == this.isHidden &&
           other.color == this.color &&
@@ -783,7 +737,6 @@ class PersonEntityCompanion extends i0.UpdateCompanion<i1.PersonEntityData> {
   final i0.Value<String> ownerId;
   final i0.Value<String> name;
   final i0.Value<String?> faceAssetId;
-  final i0.Value<String> thumbnailPath;
   final i0.Value<bool> isFavorite;
   final i0.Value<bool> isHidden;
   final i0.Value<String?> color;
@@ -795,7 +748,6 @@ class PersonEntityCompanion extends i0.UpdateCompanion<i1.PersonEntityData> {
     this.ownerId = const i0.Value.absent(),
     this.name = const i0.Value.absent(),
     this.faceAssetId = const i0.Value.absent(),
-    this.thumbnailPath = const i0.Value.absent(),
     this.isFavorite = const i0.Value.absent(),
     this.isHidden = const i0.Value.absent(),
     this.color = const i0.Value.absent(),
@@ -808,7 +760,6 @@ class PersonEntityCompanion extends i0.UpdateCompanion<i1.PersonEntityData> {
     required String ownerId,
     required String name,
     this.faceAssetId = const i0.Value.absent(),
-    required String thumbnailPath,
     required bool isFavorite,
     required bool isHidden,
     this.color = const i0.Value.absent(),
@@ -816,7 +767,6 @@ class PersonEntityCompanion extends i0.UpdateCompanion<i1.PersonEntityData> {
   })  : id = i0.Value(id),
         ownerId = i0.Value(ownerId),
         name = i0.Value(name),
-        thumbnailPath = i0.Value(thumbnailPath),
         isFavorite = i0.Value(isFavorite),
         isHidden = i0.Value(isHidden);
   static i0.Insertable<i1.PersonEntityData> custom({
@@ -826,7 +776,6 @@ class PersonEntityCompanion extends i0.UpdateCompanion<i1.PersonEntityData> {
     i0.Expression<String>? ownerId,
     i0.Expression<String>? name,
     i0.Expression<String>? faceAssetId,
-    i0.Expression<String>? thumbnailPath,
     i0.Expression<bool>? isFavorite,
     i0.Expression<bool>? isHidden,
     i0.Expression<String>? color,
@@ -839,7 +788,6 @@ class PersonEntityCompanion extends i0.UpdateCompanion<i1.PersonEntityData> {
       if (ownerId != null) 'owner_id': ownerId,
       if (name != null) 'name': name,
       if (faceAssetId != null) 'face_asset_id': faceAssetId,
-      if (thumbnailPath != null) 'thumbnail_path': thumbnailPath,
       if (isFavorite != null) 'is_favorite': isFavorite,
       if (isHidden != null) 'is_hidden': isHidden,
       if (color != null) 'color': color,
@@ -854,7 +802,6 @@ class PersonEntityCompanion extends i0.UpdateCompanion<i1.PersonEntityData> {
       i0.Value<String>? ownerId,
       i0.Value<String>? name,
       i0.Value<String?>? faceAssetId,
-      i0.Value<String>? thumbnailPath,
       i0.Value<bool>? isFavorite,
       i0.Value<bool>? isHidden,
       i0.Value<String?>? color,
@@ -866,7 +813,6 @@ class PersonEntityCompanion extends i0.UpdateCompanion<i1.PersonEntityData> {
       ownerId: ownerId ?? this.ownerId,
       name: name ?? this.name,
       faceAssetId: faceAssetId ?? this.faceAssetId,
-      thumbnailPath: thumbnailPath ?? this.thumbnailPath,
       isFavorite: isFavorite ?? this.isFavorite,
       isHidden: isHidden ?? this.isHidden,
       color: color ?? this.color,
@@ -895,9 +841,6 @@ class PersonEntityCompanion extends i0.UpdateCompanion<i1.PersonEntityData> {
     if (faceAssetId.present) {
       map['face_asset_id'] = i0.Variable<String>(faceAssetId.value);
     }
-    if (thumbnailPath.present) {
-      map['thumbnail_path'] = i0.Variable<String>(thumbnailPath.value);
-    }
     if (isFavorite.present) {
       map['is_favorite'] = i0.Variable<bool>(isFavorite.value);
     }
@@ -922,7 +865,6 @@ class PersonEntityCompanion extends i0.UpdateCompanion<i1.PersonEntityData> {
           ..write('ownerId: $ownerId, ')
           ..write('name: $name, ')
           ..write('faceAssetId: $faceAssetId, ')
-          ..write('thumbnailPath: $thumbnailPath, ')
           ..write('isFavorite: $isFavorite, ')
           ..write('isHidden: $isHidden, ')
           ..write('color: $color, ')
diff --git a/mobile/lib/infrastructure/repositories/asset_face.repository.dart b/mobile/lib/infrastructure/repositories/asset_face.repository.dart
new file mode 100644
index 0000000000..a9ad753d84
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/asset_face.repository.dart
@@ -0,0 +1,33 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/asset_face.model.dart';
+import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class DriftAssetFaceRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftAssetFaceRepository(this._db) : super(_db);
+
+  Future<List<AssetFace>> getAll() {
+    return _db.assetFaceEntity
+        .select()
+        .map((assetFace) => assetFace.toDto())
+        .get();
+  }
+}
+
+extension on AssetFaceEntityData {
+  AssetFace toDto() {
+    return AssetFace(
+      id: id,
+      assetId: assetId,
+      personId: personId,
+      imageWidth: imageWidth,
+      imageHeight: imageHeight,
+      boundingBoxX1: boundingBoxX1,
+      boundingBoxY1: boundingBoxY1,
+      boundingBoxX2: boundingBoxX2,
+      boundingBoxY2: boundingBoxY2,
+      sourceType: sourceType,
+    );
+  }
+}
diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/lib/infrastructure/repositories/db.repository.dart
index 7562cf6ff5..ced148f855 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -5,6 +5,7 @@ import 'package:drift_flutter/drift_flutter.dart';
 import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/domain/interfaces/db.interface.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/asset_face.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';
@@ -56,6 +57,7 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     MemoryAssetEntity,
     StackEntity,
     PersonEntity,
+    AssetFaceEntity,
   ],
   include: {
     'package:immich_mobile/infrastructure/entities/merged_asset.drift',
@@ -72,7 +74,7 @@ class Drift extends $Drift implements IDatabaseRepository {
         );
 
   @override
-  int get schemaVersion => 3;
+  int get schemaVersion => 4;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -94,6 +96,10 @@ class Drift extends $Drift implements IDatabaseRepository {
                 // Removed foreign key constraint on stack.primaryAssetId
                 await m.alterTable(TableMigration(v3.stackEntity));
               },
+              from3To4: (m, v4) async {
+                await m.alterTable(TableMigration(v4.personEntity));
+                await m.create(v4.assetFaceEntity);
+              },
             ),
           );
 
diff --git a/mobile/lib/infrastructure/repositories/db.repository.drift.dart b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
index 0f822e57eb..7b722dfff6 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -31,9 +31,11 @@ import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.
     as i14;
 import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart'
     as i15;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart'
     as i16;
-import 'package:drift/internal/modular.dart' as i17;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i17;
+import 'package:drift/internal/modular.dart' as i18;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -64,8 +66,10 @@ abstract class $Drift extends i0.GeneratedDatabase {
   late final i14.$MemoryAssetEntityTable memoryAssetEntity =
       i14.$MemoryAssetEntityTable(this);
   late final i15.$PersonEntityTable personEntity = i15.$PersonEntityTable(this);
-  i16.MergedAssetDrift get mergedAssetDrift => i17.ReadDatabaseContainer(this)
-      .accessor<i16.MergedAssetDrift>(i16.MergedAssetDrift.new);
+  late final i16.$AssetFaceEntityTable assetFaceEntity =
+      i16.$AssetFaceEntityTable(this);
+  i17.MergedAssetDrift get mergedAssetDrift => i18.ReadDatabaseContainer(this)
+      .accessor<i17.MergedAssetDrift>(i17.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -88,7 +92,8 @@ abstract class $Drift extends i0.GeneratedDatabase {
         remoteAlbumUserEntity,
         memoryEntity,
         memoryAssetEntity,
-        personEntity
+        personEntity,
+        assetFaceEntity
       ];
   @override
   i0.StreamQueryUpdateRules get streamUpdateRules =>
@@ -227,6 +232,20 @@ abstract class $Drift extends i0.GeneratedDatabase {
               i0.TableUpdate('person_entity', kind: i0.UpdateKind.delete),
             ],
           ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('asset_face_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('person_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('asset_face_entity', kind: i0.UpdateKind.update),
+            ],
+          ),
         ],
       );
   @override
@@ -268,4 +287,6 @@ class $DriftManager {
       i14.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
   i15.$$PersonEntityTableTableManager get personEntity =>
       i15.$$PersonEntityTableTableManager(_db, _db.personEntity);
+  i16.$$AssetFaceEntityTableTableManager get assetFaceEntity =>
+      i16.$$AssetFaceEntityTableTableManager(_db, _db.assetFaceEntity);
 }
diff --git a/mobile/lib/infrastructure/repositories/db.repository.steps.dart b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
index a0703c3714..d8c35707ed 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -1266,9 +1266,451 @@ final class Schema3 extends i0.VersionedSchema {
 i1.GeneratedColumn<String> _column_75(String aliasedName) =>
     i1.GeneratedColumn<String>('primary_asset_id', aliasedName, false,
         type: i1.DriftSqlType.string);
+
+final class Schema4 extends i0.VersionedSchema {
+  Schema4({required super.database}) : super(version: 4);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    localAssetEntity,
+    stackEntity,
+    idxLocalAssetChecksum,
+    uQRemoteAssetOwnerChecksum,
+    idxRemoteAssetChecksum,
+    userMetadataEntity,
+    partnerEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    remoteExifEntity,
+    remoteAlbumEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+  ];
+  late final Shape0 userEntity = Shape0(
+      source: i0.VersionedTable(
+        entityName: 'user_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(id)',
+        ],
+        columns: [
+          _column_0,
+          _column_1,
+          _column_2,
+          _column_3,
+          _column_4,
+          _column_5,
+          _column_6,
+          _column_7,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape1 remoteAssetEntity = Shape1(
+      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,
+        ],
+        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 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);
+  final i1.Index idxLocalAssetChecksum = i1.Index('idx_local_asset_checksum',
+      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  final i1.Index uQRemoteAssetOwnerChecksum = i1.Index(
+      'UQ_remote_asset_owner_checksum',
+      'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
+  final i1.Index idxRemoteAssetChecksum = i1.Index('idx_remote_asset_checksum',
+      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  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 Shape6 localAlbumEntity = Shape6(
+      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_33,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape7 localAlbumAssetEntity = Shape7(
+      source: i0.VersionedTable(
+        entityName: 'local_album_asset_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(asset_id, album_id)',
+        ],
+        columns: [
+          _column_34,
+          _column_35,
+        ],
+        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 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 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);
+}
+
+class Shape14 extends i0.VersionedTable {
+  Shape14({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  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<String> get ownerId =>
+      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get faceAssetId =>
+      columnsByName['face_asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isFavorite =>
+      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<bool> get isHidden =>
+      columnsByName['is_hidden']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get color =>
+      columnsByName['color']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get birthDate =>
+      columnsByName['birth_date']! as i1.GeneratedColumn<DateTime>;
+}
+
+class Shape15 extends i0.VersionedTable {
+  Shape15({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get assetId =>
+      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get personId =>
+      columnsByName['person_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get imageWidth =>
+      columnsByName['image_width']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get imageHeight =>
+      columnsByName['image_height']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxX1 =>
+      columnsByName['bounding_box_x1']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxY1 =>
+      columnsByName['bounding_box_y1']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxX2 =>
+      columnsByName['bounding_box_x2']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxY2 =>
+      columnsByName['bounding_box_y2']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get sourceType =>
+      columnsByName['source_type']! as i1.GeneratedColumn<String>;
+}
+
+i1.GeneratedColumn<String> _column_76(String aliasedName) =>
+    i1.GeneratedColumn<String>('person_id', aliasedName, true,
+        type: i1.DriftSqlType.string,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES person_entity (id) ON DELETE SET NULL'));
+i1.GeneratedColumn<int> _column_77(String aliasedName) =>
+    i1.GeneratedColumn<int>('image_width', aliasedName, false,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<int> _column_78(String aliasedName) =>
+    i1.GeneratedColumn<int>('image_height', aliasedName, false,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<int> _column_79(String aliasedName) =>
+    i1.GeneratedColumn<int>('bounding_box_x1', aliasedName, false,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<int> _column_80(String aliasedName) =>
+    i1.GeneratedColumn<int>('bounding_box_y1', aliasedName, false,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<int> _column_81(String aliasedName) =>
+    i1.GeneratedColumn<int>('bounding_box_x2', aliasedName, false,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<int> _column_82(String aliasedName) =>
+    i1.GeneratedColumn<int>('bounding_box_y2', aliasedName, false,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<String> _column_83(String aliasedName) =>
+    i1.GeneratedColumn<String>('source_type', 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,
+  required Future<void> Function(i1.Migrator m, Schema4 schema) from3To4,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -1282,6 +1724,11 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from2To3(migrator, schema);
         return 3;
+      case 3:
+        final schema = Schema4(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from3To4(migrator, schema);
+        return 4;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -1291,9 +1738,11 @@ i0.MigrationStepWithVersion migrationSteps({
 i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
+  required Future<void> Function(i1.Migrator m, Schema4 schema) from3To4,
 }) =>
     i0.VersionedSchema.stepByStepHelper(
         step: migrationSteps(
       from1To2: from1To2,
       from2To3: from2To3,
+      from3To4: from3To4,
     ));
diff --git a/mobile/lib/infrastructure/repositories/person.repository.dart b/mobile/lib/infrastructure/repositories/person.repository.dart
index 859765d63b..fa336c5480 100644
--- a/mobile/lib/infrastructure/repositories/person.repository.dart
+++ b/mobile/lib/infrastructure/repositories/person.repository.dart
@@ -26,7 +26,6 @@ extension on PersonEntityData {
       ownerId: ownerId,
       name: name,
       faceAssetId: faceAssetId,
-      thumbnailPath: thumbnailPath,
       isFavorite: isFavorite,
       isHidden: isHidden,
       color: color,
diff --git a/mobile/lib/infrastructure/repositories/sync_api.repository.dart b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
index 11d58663e0..e8be84effb 100644
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -58,6 +58,7 @@ class SyncApiRepository {
           SyncRequestType.partnerStacksV1,
           SyncRequestType.userMetadataV1,
           SyncRequestType.peopleV1,
+          SyncRequestType.assetFacesV1,
         ],
       ).toJson(),
     );
@@ -176,6 +177,8 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.userMetadataDeleteV1: SyncUserMetadataDeleteV1.fromJson,
   SyncEntityType.personV1: SyncPersonV1.fromJson,
   SyncEntityType.personDeleteV1: SyncPersonDeleteV1.fromJson,
+  SyncEntityType.assetFaceV1: SyncAssetFaceV1.fromJson,
+  SyncEntityType.assetFaceDeleteV1: SyncAssetFaceDeleteV1.fromJson,
 };
 
 class _SyncAckV1 {
diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index e141c387be..1cca903566 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -5,6 +5,7 @@ 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/domain/models/memory.model.dart';
 import 'package:immich_mobile/domain/models/user_metadata.model.dart';
+import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart';
@@ -546,11 +547,62 @@ class SyncStreamRepository extends DriftDatabaseRepository {
     Iterable<SyncPersonDeleteV1> data,
   ) async {
     try {
-      await _db.personEntity.deleteWhere(
-        (row) => row.id.isIn(data.map((e) => e.personId)),
-      );
+      await _db.batch((batch) {
+        for (final person in data) {
+          batch.deleteWhere(
+            _db.personEntity,
+            (row) => row.id.equals(person.personId),
+          );
+        }
+      });
     } catch (error, stack) {
       _logger.severe('Error: deletePeopleV1', error, stack);
+      rethrow;
+    }
+  }
+
+  Future<void> updateAssetFacesV1(Iterable<SyncAssetFaceV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final assetFace in data) {
+          final companion = AssetFaceEntityCompanion(
+            assetId: Value(assetFace.assetId),
+            personId: Value(assetFace.personId),
+            imageWidth: Value(assetFace.imageWidth),
+            imageHeight: Value(assetFace.imageHeight),
+            boundingBoxX1: Value(assetFace.boundingBoxX1),
+            boundingBoxY1: Value(assetFace.boundingBoxY1),
+            boundingBoxX2: Value(assetFace.boundingBoxX2),
+            boundingBoxY2: Value(assetFace.boundingBoxY2),
+            sourceType: Value(assetFace.sourceType),
+          );
+
+          batch.insert(
+            _db.assetFaceEntity,
+            companion.copyWith(id: Value(assetFace.id)),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: updateAssetFacesV1', error, stack);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteAssetFacesV1(Iterable<SyncAssetFaceDeleteV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final assetFace in data) {
+          batch.deleteWhere(
+            _db.assetFaceEntity,
+            (row) => row.id.equals(assetFace.assetFaceId),
+          );
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: deleteAssetFacesV1', error, stack);
+      rethrow;
     }
   }
 }
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index 7ee151f94d..2334fc5227 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -121,6 +121,7 @@ final _features = [
       await db.memoryAssetEntity.deleteAll();
       await db.stackEntity.deleteAll();
       await db.personEntity.deleteAll();
+      await db.assetFaceEntity.deleteAll();
     },
   ),
   _Feature(
diff --git a/mobile/lib/presentation/pages/dev/media_stat.page.dart b/mobile/lib/presentation/pages/dev/media_stat.page.dart
index acd7b219b3..d1803498b4 100644
--- a/mobile/lib/presentation/pages/dev/media_stat.page.dart
+++ b/mobile/lib/presentation/pages/dev/media_stat.page.dart
@@ -170,6 +170,10 @@ final _remoteStats = [
     name: 'People',
     load: (db) => db.managers.personEntity.count(),
   ),
+  _Stat(
+    name: 'AssetFaces',
+    load: (db) => db.managers.assetFaceEntity.count(),
+  ),
 ];
 
 @RoutePage()
diff --git a/mobile/lib/providers/infrastructure/asset_face.provider.dart b/mobile/lib/providers/infrastructure/asset_face.provider.dart
new file mode 100644
index 0000000000..386609ba94
--- /dev/null
+++ b/mobile/lib/providers/infrastructure/asset_face.provider.dart
@@ -0,0 +1,7 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/infrastructure/repositories/asset_face.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+
+final driftAssetFaceProvider = Provider<DriftAssetFaceRepository>(
+  (ref) => DriftAssetFaceRepository(ref.watch(driftProvider)),
+);
diff --git a/mobile/lib/repositories/auth.repository.dart b/mobile/lib/repositories/auth.repository.dart
index 5cf357d5a4..1c51cedf96 100644
--- a/mobile/lib/repositories/auth.repository.dart
+++ b/mobile/lib/repositories/auth.repository.dart
@@ -34,11 +34,12 @@ class AuthRepository extends DatabaseRepository {
       _drift.userMetadataEntity.deleteAll(),
       _drift.partnerEntity.deleteAll(),
       _drift.stackEntity.deleteAll(),
-      _drift.personEntity.deleteAll(),
+      _drift.assetFaceEntity.deleteAll(),
     ]);
     // Drift deletions - parent entities
     await Future.wait([
       _drift.memoryEntity.deleteAll(),
+      _drift.personEntity.deleteAll(),
       _drift.remoteAlbumEntity.deleteAll(),
       _drift.remoteAssetEntity.deleteAll(),
       _drift.userEntity.deleteAll(),
diff --git a/mobile/test/domain/services/sync_stream_service_test.dart b/mobile/test/domain/services/sync_stream_service_test.dart
index deb19dfcf8..f9d9c4fbe4 100644
--- a/mobile/test/domain/services/sync_stream_service_test.dart
+++ b/mobile/test/domain/services/sync_stream_service_test.dart
@@ -109,6 +109,10 @@ void main() {
         .thenAnswer(successHandler);
     when(() => mockSyncStreamRepo.deletePeopleV1(any()))
         .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updateAssetFacesV1(any()))
+        .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deleteAssetFacesV1(any()))
+        .thenAnswer(successHandler);
 
     sut = SyncStreamService(
       syncApiRepository: mockSyncApiRepo,
diff --git a/mobile/test/drift/main/generated/schema.dart b/mobile/test/drift/main/generated/schema.dart
index 209e70d788..22131b11bb 100644
--- a/mobile/test/drift/main/generated/schema.dart
+++ b/mobile/test/drift/main/generated/schema.dart
@@ -6,6 +6,7 @@ import 'package:drift/internal/migrations.dart';
 import 'schema_v1.dart' as v1;
 import 'schema_v2.dart' as v2;
 import 'schema_v3.dart' as v3;
+import 'schema_v4.dart' as v4;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -17,10 +18,12 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v2.DatabaseAtV2(db);
       case 3:
         return v3.DatabaseAtV3(db);
+      case 4:
+        return v4.DatabaseAtV4(db);
       default:
         throw MissingSchemaException(version, versions);
     }
   }
 
-  static const versions = const [1, 2, 3];
+  static const versions = const [1, 2, 3, 4];
 }
diff --git a/mobile/test/drift/main/generated/schema_v4.dart b/mobile/test/drift/main/generated/schema_v4.dart
new file mode 100644
index 0000000000..d02e2ff9c4
--- /dev/null
+++ b/mobile/test/drift/main/generated/schema_v4.dart
@@ -0,0 +1,5524 @@
+// 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<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<String> email = GeneratedColumn<String>(
+      'email', aliasedName, false,
+      type: DriftSqlType.string, requiredDuringInsert: true);
+  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>(
+      'profile_image_path', aliasedName, true,
+      type: DriftSqlType.string, requiredDuringInsert: false);
+  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> quotaSizeInBytes = GeneratedColumn<int>(
+      'quota_size_in_bytes', aliasedName, true,
+      type: DriftSqlType.int, requiredDuringInsert: false);
+  late final GeneratedColumn<int> quotaUsageInBytes = GeneratedColumn<int>(
+      'quota_usage_in_bytes', aliasedName, false,
+      type: DriftSqlType.int,
+      requiredDuringInsert: false,
+      defaultValue: const CustomExpression('0'));
+  @override
+  List<GeneratedColumn> get $columns => [
+        id,
+        name,
+        isAdmin,
+        email,
+        profileImagePath,
+        updatedAt,
+        quotaSizeInBytes,
+        quotaUsageInBytes
+      ];
+  @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'])!,
+      isAdmin: attachedDatabase.typeMapping
+          .read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
+      email: attachedDatabase.typeMapping
+          .read(DriftSqlType.string, data['${effectivePrefix}email'])!,
+      profileImagePath: attachedDatabase.typeMapping.read(
+          DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
+      updatedAt: attachedDatabase.typeMapping
+          .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      quotaSizeInBytes: attachedDatabase.typeMapping.read(
+          DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
+      quotaUsageInBytes: attachedDatabase.typeMapping.read(
+          DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
+    );
+  }
+
+  @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 bool isAdmin;
+  final String email;
+  final String? profileImagePath;
+  final DateTime updatedAt;
+  final int? quotaSizeInBytes;
+  final int quotaUsageInBytes;
+  const UserEntityData(
+      {required this.id,
+      required this.name,
+      required this.isAdmin,
+      required this.email,
+      this.profileImagePath,
+      required this.updatedAt,
+      this.quotaSizeInBytes,
+      required this.quotaUsageInBytes});
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['name'] = Variable<String>(name);
+    map['is_admin'] = Variable<bool>(isAdmin);
+    map['email'] = Variable<String>(email);
+    if (!nullToAbsent || profileImagePath != null) {
+      map['profile_image_path'] = Variable<String>(profileImagePath);
+    }
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || quotaSizeInBytes != null) {
+      map['quota_size_in_bytes'] = Variable<int>(quotaSizeInBytes);
+    }
+    map['quota_usage_in_bytes'] = Variable<int>(quotaUsageInBytes);
+    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']),
+      isAdmin: serializer.fromJson<bool>(json['isAdmin']),
+      email: serializer.fromJson<String>(json['email']),
+      profileImagePath: serializer.fromJson<String?>(json['profileImagePath']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      quotaSizeInBytes: serializer.fromJson<int?>(json['quotaSizeInBytes']),
+      quotaUsageInBytes: serializer.fromJson<int>(json['quotaUsageInBytes']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'name': serializer.toJson<String>(name),
+      'isAdmin': serializer.toJson<bool>(isAdmin),
+      'email': serializer.toJson<String>(email),
+      'profileImagePath': serializer.toJson<String?>(profileImagePath),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'quotaSizeInBytes': serializer.toJson<int?>(quotaSizeInBytes),
+      'quotaUsageInBytes': serializer.toJson<int>(quotaUsageInBytes),
+    };
+  }
+
+  UserEntityData copyWith(
+          {String? id,
+          String? name,
+          bool? isAdmin,
+          String? email,
+          Value<String?> profileImagePath = const Value.absent(),
+          DateTime? updatedAt,
+          Value<int?> quotaSizeInBytes = const Value.absent(),
+          int? quotaUsageInBytes}) =>
+      UserEntityData(
+        id: id ?? this.id,
+        name: name ?? this.name,
+        isAdmin: isAdmin ?? this.isAdmin,
+        email: email ?? this.email,
+        profileImagePath: profileImagePath.present
+            ? profileImagePath.value
+            : this.profileImagePath,
+        updatedAt: updatedAt ?? this.updatedAt,
+        quotaSizeInBytes: quotaSizeInBytes.present
+            ? quotaSizeInBytes.value
+            : this.quotaSizeInBytes,
+        quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+      );
+  UserEntityData copyWithCompanion(UserEntityCompanion data) {
+    return UserEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      name: data.name.present ? data.name.value : this.name,
+      isAdmin: data.isAdmin.present ? data.isAdmin.value : this.isAdmin,
+      email: data.email.present ? data.email.value : this.email,
+      profileImagePath: data.profileImagePath.present
+          ? data.profileImagePath.value
+          : this.profileImagePath,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      quotaSizeInBytes: data.quotaSizeInBytes.present
+          ? data.quotaSizeInBytes.value
+          : this.quotaSizeInBytes,
+      quotaUsageInBytes: data.quotaUsageInBytes.present
+          ? data.quotaUsageInBytes.value
+          : this.quotaUsageInBytes,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserEntityData(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('email: $email, ')
+          ..write('profileImagePath: $profileImagePath, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, name, isAdmin, email, profileImagePath,
+      updatedAt, quotaSizeInBytes, quotaUsageInBytes);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserEntityData &&
+          other.id == this.id &&
+          other.name == this.name &&
+          other.isAdmin == this.isAdmin &&
+          other.email == this.email &&
+          other.profileImagePath == this.profileImagePath &&
+          other.updatedAt == this.updatedAt &&
+          other.quotaSizeInBytes == this.quotaSizeInBytes &&
+          other.quotaUsageInBytes == this.quotaUsageInBytes);
+}
+
+class UserEntityCompanion extends UpdateCompanion<UserEntityData> {
+  final Value<String> id;
+  final Value<String> name;
+  final Value<bool> isAdmin;
+  final Value<String> email;
+  final Value<String?> profileImagePath;
+  final Value<DateTime> updatedAt;
+  final Value<int?> quotaSizeInBytes;
+  final Value<int> quotaUsageInBytes;
+  const UserEntityCompanion({
+    this.id = const Value.absent(),
+    this.name = const Value.absent(),
+    this.isAdmin = const Value.absent(),
+    this.email = const Value.absent(),
+    this.profileImagePath = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.quotaSizeInBytes = const Value.absent(),
+    this.quotaUsageInBytes = const Value.absent(),
+  });
+  UserEntityCompanion.insert({
+    required String id,
+    required String name,
+    this.isAdmin = const Value.absent(),
+    required String email,
+    this.profileImagePath = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.quotaSizeInBytes = const Value.absent(),
+    this.quotaUsageInBytes = const Value.absent(),
+  })  : id = Value(id),
+        name = Value(name),
+        email = Value(email);
+  static Insertable<UserEntityData> custom({
+    Expression<String>? id,
+    Expression<String>? name,
+    Expression<bool>? isAdmin,
+    Expression<String>? email,
+    Expression<String>? profileImagePath,
+    Expression<DateTime>? updatedAt,
+    Expression<int>? quotaSizeInBytes,
+    Expression<int>? quotaUsageInBytes,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (name != null) 'name': name,
+      if (isAdmin != null) 'is_admin': isAdmin,
+      if (email != null) 'email': email,
+      if (profileImagePath != null) 'profile_image_path': profileImagePath,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (quotaSizeInBytes != null) 'quota_size_in_bytes': quotaSizeInBytes,
+      if (quotaUsageInBytes != null) 'quota_usage_in_bytes': quotaUsageInBytes,
+    });
+  }
+
+  UserEntityCompanion copyWith(
+      {Value<String>? id,
+      Value<String>? name,
+      Value<bool>? isAdmin,
+      Value<String>? email,
+      Value<String?>? profileImagePath,
+      Value<DateTime>? updatedAt,
+      Value<int?>? quotaSizeInBytes,
+      Value<int>? quotaUsageInBytes}) {
+    return UserEntityCompanion(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      isAdmin: isAdmin ?? this.isAdmin,
+      email: email ?? this.email,
+      profileImagePath: profileImagePath ?? this.profileImagePath,
+      updatedAt: updatedAt ?? this.updatedAt,
+      quotaSizeInBytes: quotaSizeInBytes ?? this.quotaSizeInBytes,
+      quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+    );
+  }
+
+  @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 (isAdmin.present) {
+      map['is_admin'] = Variable<bool>(isAdmin.value);
+    }
+    if (email.present) {
+      map['email'] = Variable<String>(email.value);
+    }
+    if (profileImagePath.present) {
+      map['profile_image_path'] = Variable<String>(profileImagePath.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.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);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('email: $email, ')
+          ..write('profileImagePath: $profileImagePath, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes')
+          ..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);
+  @override
+  List<GeneratedColumn> get $columns => [
+        name,
+        type,
+        createdAt,
+        updatedAt,
+        width,
+        height,
+        durationInSeconds,
+        id,
+        checksum,
+        isFavorite,
+        ownerId,
+        localDateTime,
+        thumbHash,
+        deletedAt,
+        livePhotoVideoId,
+        visibility,
+        stackId
+      ];
+  @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']),
+    );
+  }
+
+  @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;
+  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});
+  @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);
+    }
+    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']),
+    );
+  }
+  @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),
+    };
+  }
+
+  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()}) =>
+      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,
+      );
+  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,
+    );
+  }
+
+  @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(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      name,
+      type,
+      createdAt,
+      updatedAt,
+      width,
+      height,
+      durationInSeconds,
+      id,
+      checksum,
+      isFavorite,
+      ownerId,
+      localDateTime,
+      thumbHash,
+      deletedAt,
+      livePhotoVideoId,
+      visibility,
+      stackId);
+  @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);
+}
+
+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;
+  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(),
+  });
+  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(),
+  })  : 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,
+  }) {
+    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,
+    });
+  }
+
+  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}) {
+    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,
+    );
+  }
+
+  @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);
+    }
+    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(')'))
+        .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 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 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 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<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, 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'])!,
+      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 bool? marker_;
+  const LocalAlbumEntityData(
+      {required this.id,
+      required this.name,
+      required this.updatedAt,
+      required this.backupSelection,
+      required this.isIosSharedAlbum,
+      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 || 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']),
+      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),
+      'marker_': serializer.toJson<bool?>(marker_),
+    };
+  }
+
+  LocalAlbumEntityData copyWith(
+          {String? id,
+          String? name,
+          DateTime? updatedAt,
+          int? backupSelection,
+          bool? isIosSharedAlbum,
+          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,
+        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,
+      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('marker_: $marker_')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      id, name, updatedAt, backupSelection, isIosSharedAlbum, 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.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<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.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.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<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 (marker_ != null) 'marker': marker_,
+    });
+  }
+
+  LocalAlbumEntityCompanion copyWith(
+      {Value<String>? id,
+      Value<String>? name,
+      Value<DateTime>? updatedAt,
+      Value<int>? backupSelection,
+      Value<bool>? isIosSharedAlbum,
+      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,
+      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 (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('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'));
+  @override
+  List<GeneratedColumn> get $columns => [assetId, albumId];
+  @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'])!,
+    );
+  }
+
+  @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;
+  const LocalAlbumAssetEntityData(
+      {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 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']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'albumId': serializer.toJson<String>(albumId),
+    };
+  }
+
+  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
+      LocalAlbumAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        albumId: albumId ?? this.albumId,
+      );
+  LocalAlbumAssetEntityData copyWithCompanion(
+      LocalAlbumAssetEntityCompanion data) {
+    return LocalAlbumAssetEntityData(
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      albumId: data.albumId.present ? data.albumId.value : this.albumId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LocalAlbumAssetEntityData(')
+          ..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 LocalAlbumAssetEntityData &&
+          other.assetId == this.assetId &&
+          other.albumId == this.albumId);
+}
+
+class LocalAlbumAssetEntityCompanion
+    extends UpdateCompanion<LocalAlbumAssetEntityData> {
+  final Value<String> assetId;
+  final Value<String> albumId;
+  const LocalAlbumAssetEntityCompanion({
+    this.assetId = const Value.absent(),
+    this.albumId = const Value.absent(),
+  });
+  LocalAlbumAssetEntityCompanion.insert({
+    required String assetId,
+    required String albumId,
+  })  : assetId = Value(assetId),
+        albumId = Value(albumId);
+  static Insertable<LocalAlbumAssetEntityData> custom({
+    Expression<String>? assetId,
+    Expression<String>? albumId,
+  }) {
+    return RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (albumId != null) 'album_id': albumId,
+    });
+  }
+
+  LocalAlbumAssetEntityCompanion copyWith(
+      {Value<String>? assetId, Value<String>? albumId}) {
+    return LocalAlbumAssetEntityCompanion(
+      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('LocalAlbumAssetEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('albumId: $albumId')
+          ..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 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 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 DatabaseAtV4 extends GeneratedDatabase {
+  DatabaseAtV4(QueryExecutor e) : super(e);
+  late final UserEntity userEntity = UserEntity(this);
+  late final RemoteAssetEntity remoteAssetEntity = RemoteAssetEntity(this);
+  late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
+  late final StackEntity stackEntity = StackEntity(this);
+  late final Index idxLocalAssetChecksum = Index('idx_local_asset_checksum',
+      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  late final Index uQRemoteAssetOwnerChecksum = Index(
+      'UQ_remote_asset_owner_checksum',
+      'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
+  late final Index idxRemoteAssetChecksum = Index('idx_remote_asset_checksum',
+      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this);
+  late final PartnerEntity partnerEntity = PartnerEntity(this);
+  late final LocalAlbumEntity localAlbumEntity = LocalAlbumEntity(this);
+  late final LocalAlbumAssetEntity localAlbumAssetEntity =
+      LocalAlbumAssetEntity(this);
+  late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this);
+  late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(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);
+  @override
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  @override
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+        userEntity,
+        remoteAssetEntity,
+        localAssetEntity,
+        stackEntity,
+        idxLocalAssetChecksum,
+        uQRemoteAssetOwnerChecksum,
+        idxRemoteAssetChecksum,
+        userMetadataEntity,
+        partnerEntity,
+        localAlbumEntity,
+        localAlbumAssetEntity,
+        remoteExifEntity,
+        remoteAlbumEntity,
+        remoteAlbumAssetEntity,
+        remoteAlbumUserEntity,
+        memoryEntity,
+        memoryAssetEntity,
+        personEntity,
+        assetFaceEntity
+      ];
+  @override
+  int get schemaVersion => 4;
+  @override
+  DriftDatabaseOptions get options =>
+      const DriftDatabaseOptions(storeDateTimeAsText: true);
+}

From 250548dea67c0e21196a65a766e54069690d00c9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 17:42:07 +0000
Subject: [PATCH 274/337] fix(deps): update typescript-projects (#19939)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Zack Pollard <zackpollard@ymail.com>
Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
---
 cli/package-lock.json                         | 161 ++--
 e2e/package-lock.json                         | 416 +++++-----
 server/package-lock.json                      |  16 +-
 server/package.json                           |   2 +-
 web/package-lock.json                         | 731 ++++++++++--------
 web/package.json                              |  10 +-
 .../settings/setting-accordion-state.svelte   |   3 +-
 .../side-bar/purchase-info.svelte             |   3 +-
 .../timeline-manager/day-group.svelte.ts      |   7 +-
 .../group-insertion-cache.svelte.ts           |   9 +-
 .../internal/operations-support.svelte.ts     |  11 +-
 .../timeline-manager/month-group.svelte.ts    |   7 +-
 .../timeline-manager.svelte.ts                |  12 +-
 web/src/lib/modals/ApiKeyModal.svelte         |   3 +-
 web/src/lib/utils/timeline-util.ts            |   5 +-
 15 files changed, 783 insertions(+), 613 deletions(-)

diff --git a/cli/package-lock.json b/cli/package-lock.json
index 0d3db4cffa..a575b630cc 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -682,9 +682,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.30.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
-      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
+      "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1365,17 +1365,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.36.0.tgz",
-      "integrity": "sha512-lZNihHUVB6ZZiPBNgOQGSxUASI7UJWhT8nHyUGCnaQ28XFCw98IfrMCG3rUl1uwUWoAvodJQby2KTs79UTcrAg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.37.0.tgz",
+      "integrity": "sha512-jsuVWeIkb6ggzB+wPCsR4e6loj+rM72ohW6IBn2C+5NCvfUVY8s33iFPySSVXqtm5Hu29Ne/9bnA0JmyLmgenA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/type-utils": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/type-utils": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -1389,7 +1389,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.36.0",
+        "@typescript-eslint/parser": "^8.37.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
@@ -1405,16 +1405,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.36.0.tgz",
-      "integrity": "sha512-FuYgkHwZLuPbZjQHzJXrtXreJdFMKl16BFYyRrLxDhWr6Qr7Kbcu2s1Yhu8tsiMXw1S0W1pjfFfYEt+R604s+Q==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.37.0.tgz",
+      "integrity": "sha512-kVIaQE9vrN9RLCQMQ3iyRlVJpTiDUY6woHGb30JDkfJErqrQEmtdWH3gV0PBAfGZgQXoqzXOO0T3K6ioApbbAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/typescript-estree": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1430,14 +1430,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
-      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.37.0.tgz",
+      "integrity": "sha512-BIUXYsbkl5A1aJDdYJCBAo8rCEbAvdquQ8AnLb6z5Lp1u3x5PNgSSx9A/zqYc++Xnr/0DVpls8iQ2cJs/izTXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.36.0",
-        "@typescript-eslint/types": "^8.36.0",
+        "@typescript-eslint/tsconfig-utils": "^8.37.0",
+        "@typescript-eslint/types": "^8.37.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1452,14 +1452,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
-      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.37.0.tgz",
+      "integrity": "sha512-0vGq0yiU1gbjKob2q691ybTg9JX6ShiVXAAfm2jGf3q0hdP6/BruaFjL/ManAR/lj05AvYCH+5bbVo0VtzmjOA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0"
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1470,9 +1470,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
-      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.37.0.tgz",
+      "integrity": "sha512-1/YHvAVTimMM9mmlPvTec9NP4bobA1RkDbMydxG8omqwJJLEW/Iy2C4adsAESIXU3WGLXFHSZUU+C9EoFWl4Zg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1487,14 +1487,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.36.0.tgz",
-      "integrity": "sha512-5aaGYG8cVDd6cxfk/ynpYzxBRZJk7w/ymto6uiyUFtdCozQIsQWh7M28/6r57Fwkbweng8qAzoMCPwSJfWlmsg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.37.0.tgz",
+      "integrity": "sha512-SPkXWIkVZxhgwSwVq9rqj/4VFo7MnWwVaRNznfQDc/xPYHjXnPfLWn+4L6FF1cAz6e7dsqBeMawgl7QjUMj4Ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -1511,9 +1512,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
-      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz",
+      "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1525,16 +1526,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
-      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.37.0.tgz",
+      "integrity": "sha512-zuWDMDuzMRbQOM+bHyU4/slw27bAUEcKSKKs3hcv2aNnc/tvE/h7w60dwVw8vnal2Pub6RT1T7BI8tFZ1fE+yg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.36.0",
-        "@typescript-eslint/tsconfig-utils": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/project-service": "8.37.0",
+        "@typescript-eslint/tsconfig-utils": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -1580,16 +1581,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz",
-      "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.37.0.tgz",
+      "integrity": "sha512-TSFvkIW6gGjN2p6zbXo20FzCABbyUAuq6tBvNRGsKdsSQ6a7rnV6ADfZ7f4iI3lIiXc4F4WWvtUfDw9CJ9pO5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/typescript-estree": "8.36.0"
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1604,13 +1605,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
-      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.37.0.tgz",
+      "integrity": "sha512-YzfhzcTnZVPiLfP/oeKtDp2evwvHLMe0LOy7oe+hb9KKIumLNohYS9Hgp1ifwpu42YWxhZE8yieggz6JpqO/1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/types": "8.37.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -2305,9 +2306,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.30.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
-      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz",
+      "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2315,9 +2316,9 @@
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.21.0",
         "@eslint/config-helpers": "^0.3.0",
-        "@eslint/core": "^0.14.0",
+        "@eslint/core": "^0.15.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.30.1",
+        "@eslint/js": "9.31.0",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -2504,6 +2505,19 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint/node_modules/@eslint/core": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
+      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/espree": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
@@ -4125,15 +4139,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.36.0.tgz",
-      "integrity": "sha512-fTCqxthY+h9QbEgSIBfL9iV6CvKDFuoxg6bHPNpJ9HIUzS+jy2lCEyCmGyZRWEBSaykqcDPf1SJ+BfCI8DRopA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.37.0.tgz",
+      "integrity": "sha512-TnbEjzkE9EmcO0Q2zM+GE8NQLItNAJpMmED1BdgoBMYNdqMhzlbqfdSwiRlAzEK2pA9UzVW0gzaaIzXWg2BjfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.36.0",
-        "@typescript-eslint/parser": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0"
+        "@typescript-eslint/eslint-plugin": "8.37.0",
+        "@typescript-eslint/parser": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4196,9 +4211,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.4.tgz",
-      "integrity": "sha512-SkaSguuS7nnmV7mfJ8l81JGBFV7Gvzp8IzgE8A8t23+AxuNX61Q5H1Tpz5efduSN7NHC8nQXD3sKQKZAu5mNEA==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.5.tgz",
+      "integrity": "sha512-1mncVwJxy2C9ThLwz0+2GKZyEXuC3MyWtAAlNftlZZXZDP3AJt5FmwcMit/IGGaNZ8ZOB2BNO/HFUB+CpN0NQw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4329,9 +4344,9 @@
       }
     },
     "node_modules/vite/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index 1884b22dd5..3ff7670739 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -181,9 +181,9 @@
       }
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz",
-      "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz",
+      "integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -734,9 +734,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.30.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
-      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
+      "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -837,9 +837,9 @@
       }
     },
     "node_modules/@img/sharp-darwin-arm64": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.2.tgz",
-      "integrity": "sha512-OfXHZPppddivUJnqyKoi5YVeHRkkNE2zUFT2gbpKxp/JZCFYEYubnMg+gOp6lWfasPrTS+KPosKqdI+ELYVDtg==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.3.tgz",
+      "integrity": "sha512-ryFMfvxxpQRsgZJqBd4wsttYQbCxsJksrv9Lw/v798JcQ8+w84mBWuXwl+TT0WJ/WrYOLaYpwQXi3sA9nTIaIg==",
       "cpu": [
         "arm64"
       ],
@@ -856,13 +856,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-darwin-arm64": "1.1.0"
+        "@img/sharp-libvips-darwin-arm64": "1.2.0"
       }
     },
     "node_modules/@img/sharp-darwin-x64": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.2.tgz",
-      "integrity": "sha512-dYvWqmjU9VxqXmjEtjmvHnGqF8GrVjM2Epj9rJ6BUIXvk8slvNDJbhGFvIoXzkDhrJC2jUxNLz/GUjjvSzfw+g==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.3.tgz",
+      "integrity": "sha512-yHpJYynROAj12TA6qil58hmPmAwxKKC7reUqtGLzsOHfP7/rniNGTL8tjWX6L3CTV4+5P4ypcS7Pp+7OB+8ihA==",
       "cpu": [
         "x64"
       ],
@@ -879,13 +879,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-darwin-x64": "1.1.0"
+        "@img/sharp-libvips-darwin-x64": "1.2.0"
       }
     },
     "node_modules/@img/sharp-libvips-darwin-arm64": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.1.0.tgz",
-      "integrity": "sha512-HZ/JUmPwrJSoM4DIQPv/BfNh9yrOA8tlBbqbLz4JZ5uew2+o22Ik+tHQJcih7QJuSa0zo5coHTfD5J8inqj9DA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.0.tgz",
+      "integrity": "sha512-sBZmpwmxqwlqG9ueWFXtockhsxefaV6O84BMOrhtg/YqbTaRdqDE7hxraVE3y6gVM4eExmfzW4a8el9ArLeEiQ==",
       "cpu": [
         "arm64"
       ],
@@ -900,9 +900,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-darwin-x64": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.1.0.tgz",
-      "integrity": "sha512-Xzc2ToEmHN+hfvsl9wja0RlnXEgpKNmftriQp6XzY/RaSfwD9th+MSh0WQKzUreLKKINb3afirxW7A0fz2YWuQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.0.tgz",
+      "integrity": "sha512-M64XVuL94OgiNHa5/m2YvEQI5q2cl9d/wk0qFTDVXcYzi43lxuiFTftMR1tOnFQovVXNZJ5TURSDK2pNe9Yzqg==",
       "cpu": [
         "x64"
       ],
@@ -917,9 +917,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linux-arm": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.1.0.tgz",
-      "integrity": "sha512-s8BAd0lwUIvYCJyRdFqvsj+BJIpDBSxs6ivrOPm/R7piTs5UIwY5OjXrP2bqXC9/moGsyRa37eYWYCOGVXxVrA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.0.tgz",
+      "integrity": "sha512-mWd2uWvDtL/nvIzThLq3fr2nnGfyr/XMXlq8ZJ9WMR6PXijHlC3ksp0IpuhK6bougvQrchUAfzRLnbsen0Cqvw==",
       "cpu": [
         "arm"
       ],
@@ -934,9 +934,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linux-arm64": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.1.0.tgz",
-      "integrity": "sha512-IVfGJa7gjChDET1dK9SekxFFdflarnUB8PwW8aGwEoF3oAsSDuNUTYS+SKDOyOJxQyDC1aPFMuRYLoDInyV9Ew==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.0.tgz",
+      "integrity": "sha512-RXwd0CgG+uPRX5YYrkzKyalt2OJYRiJQ8ED/fi1tq9WQW2jsQIn0tqrlR5l5dr/rjqq6AHAxURhj2DVjyQWSOA==",
       "cpu": [
         "arm64"
       ],
@@ -951,9 +951,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linux-ppc64": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.1.0.tgz",
-      "integrity": "sha512-tiXxFZFbhnkWE2LA8oQj7KYR+bWBkiV2nilRldT7bqoEZ4HiDOcePr9wVDAZPi/Id5fT1oY9iGnDq20cwUz8lQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.0.tgz",
+      "integrity": "sha512-Xod/7KaDDHkYu2phxxfeEPXfVXFKx70EAFZ0qyUdOjCcxbjqyJOEUpDe6RIyaunGxT34Anf9ue/wuWOqBW2WcQ==",
       "cpu": [
         "ppc64"
       ],
@@ -968,9 +968,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linux-s390x": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.1.0.tgz",
-      "integrity": "sha512-xukSwvhguw7COyzvmjydRb3x/09+21HykyapcZchiCUkTThEQEOMtBj9UhkaBRLuBrgLFzQ2wbxdeCCJW/jgJA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.0.tgz",
+      "integrity": "sha512-eMKfzDxLGT8mnmPJTNMcjfO33fLiTDsrMlUVcp6b96ETbnJmd4uvZxVJSKPQfS+odwfVaGifhsB07J1LynFehw==",
       "cpu": [
         "s390x"
       ],
@@ -985,9 +985,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linux-x64": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.1.0.tgz",
-      "integrity": "sha512-yRj2+reB8iMg9W5sULM3S74jVS7zqSzHG3Ol/twnAAkAhnGQnpjj6e4ayUz7V+FpKypwgs82xbRdYtchTTUB+Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.0.tgz",
+      "integrity": "sha512-ZW3FPWIc7K1sH9E3nxIGB3y3dZkpJlMnkk7z5tu1nSkBoCgw2nSRTFHI5pB/3CQaJM0pdzMF3paf9ckKMSE9Tg==",
       "cpu": [
         "x64"
       ],
@@ -1002,9 +1002,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.1.0.tgz",
-      "integrity": "sha512-jYZdG+whg0MDK+q2COKbYidaqW/WTz0cc1E+tMAusiDygrM4ypmSCjOJPmFTvHHJ8j/6cAGyeDWZOsK06tP33w==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.0.tgz",
+      "integrity": "sha512-UG+LqQJbf5VJ8NWJ5Z3tdIe/HXjuIdo4JeVNADXBFuG7z9zjoegpzzGIyV5zQKi4zaJjnAd2+g2nna8TZvuW9Q==",
       "cpu": [
         "arm64"
       ],
@@ -1019,9 +1019,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linuxmusl-x64": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.1.0.tgz",
-      "integrity": "sha512-wK7SBdwrAiycjXdkPnGCPLjYb9lD4l6Ze2gSdAGVZrEL05AOUJESWU2lhlC+Ffn5/G+VKuSm6zzbQSzFX/P65A==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.0.tgz",
+      "integrity": "sha512-SRYOLR7CXPgNze8akZwjoGBoN1ThNZoqpOgfnOxmWsklTGVfJiGJoC/Lod7aNMGA1jSsKWM1+HRX43OP6p9+6Q==",
       "cpu": [
         "x64"
       ],
@@ -1036,9 +1036,9 @@
       }
     },
     "node_modules/@img/sharp-linux-arm": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.2.tgz",
-      "integrity": "sha512-0DZzkvuEOqQUP9mo2kjjKNok5AmnOr1jB2XYjkaoNRwpAYMDzRmAqUIa1nRi58S2WswqSfPOWLNOr0FDT3H5RQ==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.3.tgz",
+      "integrity": "sha512-oBK9l+h6KBN0i3dC8rYntLiVfW8D8wH+NPNT3O/WBHeW0OQWCjfWksLUaPidsrDKpJgXp3G3/hkmhptAW0I3+A==",
       "cpu": [
         "arm"
       ],
@@ -1055,13 +1055,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm": "1.1.0"
+        "@img/sharp-libvips-linux-arm": "1.2.0"
       }
     },
     "node_modules/@img/sharp-linux-arm64": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.2.tgz",
-      "integrity": "sha512-D8n8wgWmPDakc83LORcfJepdOSN6MvWNzzz2ux0MnIbOqdieRZwVYY32zxVx+IFUT8er5KPcyU3XXsn+GzG/0Q==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.3.tgz",
+      "integrity": "sha512-QdrKe3EvQrqwkDrtuTIjI0bu6YEJHTgEeqdzI3uWJOH6G1O8Nl1iEeVYRGdj1h5I21CqxSvQp1Yv7xeU3ZewbA==",
       "cpu": [
         "arm64"
       ],
@@ -1078,13 +1078,36 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm64": "1.1.0"
+        "@img/sharp-libvips-linux-arm64": "1.2.0"
+      }
+    },
+    "node_modules/@img/sharp-linux-ppc64": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.3.tgz",
+      "integrity": "sha512-GLtbLQMCNC5nxuImPR2+RgrviwKwVql28FWZIW1zWruy6zLgA5/x2ZXk3mxj58X/tszVF69KK0Is83V8YgWhLA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-ppc64": "1.2.0"
       }
     },
     "node_modules/@img/sharp-linux-s390x": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.2.tgz",
-      "integrity": "sha512-EGZ1xwhBI7dNISwxjChqBGELCWMGDvmxZXKjQRuqMrakhO8QoMgqCrdjnAqJq/CScxfRn+Bb7suXBElKQpPDiw==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.3.tgz",
+      "integrity": "sha512-3gahT+A6c4cdc2edhsLHmIOXMb17ltffJlxR0aC2VPZfwKoTGZec6u5GrFgdR7ciJSsHT27BD3TIuGcuRT0KmQ==",
       "cpu": [
         "s390x"
       ],
@@ -1101,13 +1124,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-s390x": "1.1.0"
+        "@img/sharp-libvips-linux-s390x": "1.2.0"
       }
     },
     "node_modules/@img/sharp-linux-x64": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.2.tgz",
-      "integrity": "sha512-sD7J+h5nFLMMmOXYH4DD9UtSNBD05tWSSdWAcEyzqW8Cn5UxXvsHAxmxSesYUsTOBmUnjtxghKDl15EvfqLFbQ==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.3.tgz",
+      "integrity": "sha512-8kYso8d806ypnSq3/Ly0QEw90V5ZoHh10yH0HnrzOCr6DKAPI6QVHvwleqMkVQ0m+fc7EH8ah0BB0QPuWY6zJQ==",
       "cpu": [
         "x64"
       ],
@@ -1124,13 +1147,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-x64": "1.1.0"
+        "@img/sharp-libvips-linux-x64": "1.2.0"
       }
     },
     "node_modules/@img/sharp-linuxmusl-arm64": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.2.tgz",
-      "integrity": "sha512-NEE2vQ6wcxYav1/A22OOxoSOGiKnNmDzCYFOZ949xFmrWZOVII1Bp3NqVVpvj+3UeHMFyN5eP/V5hzViQ5CZNA==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.3.tgz",
+      "integrity": "sha512-vAjbHDlr4izEiXM1OTggpCcPg9tn4YriK5vAjowJsHwdBIdx0fYRsURkxLG2RLm9gyBq66gwtWI8Gx0/ov+JKQ==",
       "cpu": [
         "arm64"
       ],
@@ -1147,13 +1170,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-arm64": "1.1.0"
+        "@img/sharp-libvips-linuxmusl-arm64": "1.2.0"
       }
     },
     "node_modules/@img/sharp-linuxmusl-x64": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.2.tgz",
-      "integrity": "sha512-DOYMrDm5E6/8bm/yQLCWyuDJwUnlevR8xtF8bs+gjZ7cyUNYXiSf/E8Kp0Ss5xasIaXSHzb888V1BE4i1hFhAA==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.3.tgz",
+      "integrity": "sha512-gCWUn9547K5bwvOn9l5XGAEjVTTRji4aPTqLzGXHvIr6bIDZKNTA34seMPgM0WmSf+RYBH411VavCejp3PkOeQ==",
       "cpu": [
         "x64"
       ],
@@ -1170,13 +1193,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-x64": "1.1.0"
+        "@img/sharp-libvips-linuxmusl-x64": "1.2.0"
       }
     },
     "node_modules/@img/sharp-wasm32": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.2.tgz",
-      "integrity": "sha512-/VI4mdlJ9zkaq53MbIG6rZY+QRN3MLbR6usYlgITEzi4Rpx5S6LFKsycOQjkOGmqTNmkIdLjEvooFKwww6OpdQ==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.3.tgz",
+      "integrity": "sha512-+CyRcpagHMGteySaWos8IbnXcHgfDn7pO2fiC2slJxvNq9gDipYBN42/RagzctVRKgxATmfqOSulgZv5e1RdMg==",
       "cpu": [
         "wasm32"
       ],
@@ -1184,7 +1207,7 @@
       "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/runtime": "^1.4.3"
+        "@emnapi/runtime": "^1.4.4"
       },
       "engines": {
         "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -1194,9 +1217,9 @@
       }
     },
     "node_modules/@img/sharp-win32-arm64": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.2.tgz",
-      "integrity": "sha512-cfP/r9FdS63VA5k0xiqaNaEoGxBg9k7uE+RQGzuK9fHt7jib4zAVVseR9LsE4gJcNWgT6APKMNnCcnyOtmSEUQ==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.3.tgz",
+      "integrity": "sha512-MjnHPnbqMXNC2UgeLJtX4XqoVHHlZNd+nPt1kRPmj63wURegwBhZlApELdtxM2OIZDRv/DFtLcNhVbd1z8GYXQ==",
       "cpu": [
         "arm64"
       ],
@@ -1214,9 +1237,9 @@
       }
     },
     "node_modules/@img/sharp-win32-ia32": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.2.tgz",
-      "integrity": "sha512-QLjGGvAbj0X/FXl8n1WbtQ6iVBpWU7JO94u/P2M4a8CFYsvQi4GW2mRy/JqkRx0qpBzaOdKJKw8uc930EX2AHw==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.3.tgz",
+      "integrity": "sha512-xuCdhH44WxuXgOM714hn4amodJMZl3OEvf0GVTm0BEyMeA2to+8HEdRPShH0SLYptJY1uBw+SCFP9WVQi1Q/cw==",
       "cpu": [
         "ia32"
       ],
@@ -1234,9 +1257,9 @@
       }
     },
     "node_modules/@img/sharp-win32-x64": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.2.tgz",
-      "integrity": "sha512-aUdT6zEYtDKCaxkofmmJDJYGCf0+pJg3eU9/oBuqvEeoB9dKI6ZLc/1iLJCTuJQDO4ptntAlkUmHgGjyuobZbw==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.3.tgz",
+      "integrity": "sha512-OWwz05d++TxzLEv4VnsTz5CmZ6mI6S05sfQGEMrNrQcOEERbX46332IvE7pO/EUiw7jUrrS40z/M7kPyjfl04g==",
       "cpu": [
         "x64"
       ],
@@ -1356,12 +1379,13 @@
       }
     },
     "node_modules/@koa/router": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/@koa/router/-/router-13.1.0.tgz",
-      "integrity": "sha512-mNVu1nvkpSd8Q8gMebGbCkDWJ51ODetrFvLKYusej+V0ByD4btqHYnPIzTBLXnQMVUlm/oxVwqmWBY3zQfZilw==",
+      "version": "13.1.1",
+      "resolved": "https://registry.npmjs.org/@koa/router/-/router-13.1.1.tgz",
+      "integrity": "sha512-JQEuMANYRVHs7lm7KY9PCIjkgJk73h4m4J+g2mkw2Vo1ugPZ17UJVqEH8F+HeAdjKz5do1OaLe7ArDz+z308gw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "debug": "^4.4.1",
         "http-errors": "^2.0.0",
         "koa-compose": "^4.1.0",
         "path-to-regexp": "^6.3.0"
@@ -1510,13 +1534,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.53.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.53.2.tgz",
-      "integrity": "sha512-tEB2U5z74ebBeyfGNZ3Jfg29AnW+5HlWhvHtb/Mqco9pFdZU1ZLNdVb2UtB5CvmiilNr2ZfVH/qMmAROG/XTzw==",
+      "version": "1.54.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.54.1.tgz",
+      "integrity": "sha512-FS8hQ12acieG2dYSksmLOF7BNxnVf2afRJdCuM1eMSxj6QTSE6G4InGF7oApGgDb65MX7AwMVlIkpru0yZA4Xw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.53.2"
+        "playwright": "1.54.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -2101,17 +2125,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.36.0.tgz",
-      "integrity": "sha512-lZNihHUVB6ZZiPBNgOQGSxUASI7UJWhT8nHyUGCnaQ28XFCw98IfrMCG3rUl1uwUWoAvodJQby2KTs79UTcrAg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.37.0.tgz",
+      "integrity": "sha512-jsuVWeIkb6ggzB+wPCsR4e6loj+rM72ohW6IBn2C+5NCvfUVY8s33iFPySSVXqtm5Hu29Ne/9bnA0JmyLmgenA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/type-utils": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/type-utils": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -2125,7 +2149,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.36.0",
+        "@typescript-eslint/parser": "^8.37.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
@@ -2141,16 +2165,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.36.0.tgz",
-      "integrity": "sha512-FuYgkHwZLuPbZjQHzJXrtXreJdFMKl16BFYyRrLxDhWr6Qr7Kbcu2s1Yhu8tsiMXw1S0W1pjfFfYEt+R604s+Q==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.37.0.tgz",
+      "integrity": "sha512-kVIaQE9vrN9RLCQMQ3iyRlVJpTiDUY6woHGb30JDkfJErqrQEmtdWH3gV0PBAfGZgQXoqzXOO0T3K6ioApbbAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/typescript-estree": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2166,14 +2190,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
-      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.37.0.tgz",
+      "integrity": "sha512-BIUXYsbkl5A1aJDdYJCBAo8rCEbAvdquQ8AnLb6z5Lp1u3x5PNgSSx9A/zqYc++Xnr/0DVpls8iQ2cJs/izTXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.36.0",
-        "@typescript-eslint/types": "^8.36.0",
+        "@typescript-eslint/tsconfig-utils": "^8.37.0",
+        "@typescript-eslint/types": "^8.37.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2188,14 +2212,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
-      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.37.0.tgz",
+      "integrity": "sha512-0vGq0yiU1gbjKob2q691ybTg9JX6ShiVXAAfm2jGf3q0hdP6/BruaFjL/ManAR/lj05AvYCH+5bbVo0VtzmjOA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0"
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2206,9 +2230,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
-      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.37.0.tgz",
+      "integrity": "sha512-1/YHvAVTimMM9mmlPvTec9NP4bobA1RkDbMydxG8omqwJJLEW/Iy2C4adsAESIXU3WGLXFHSZUU+C9EoFWl4Zg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2223,14 +2247,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.36.0.tgz",
-      "integrity": "sha512-5aaGYG8cVDd6cxfk/ynpYzxBRZJk7w/ymto6uiyUFtdCozQIsQWh7M28/6r57Fwkbweng8qAzoMCPwSJfWlmsg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.37.0.tgz",
+      "integrity": "sha512-SPkXWIkVZxhgwSwVq9rqj/4VFo7MnWwVaRNznfQDc/xPYHjXnPfLWn+4L6FF1cAz6e7dsqBeMawgl7QjUMj4Ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -2247,9 +2272,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
-      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz",
+      "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2261,16 +2286,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
-      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.37.0.tgz",
+      "integrity": "sha512-zuWDMDuzMRbQOM+bHyU4/slw27bAUEcKSKKs3hcv2aNnc/tvE/h7w60dwVw8vnal2Pub6RT1T7BI8tFZ1fE+yg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.36.0",
-        "@typescript-eslint/tsconfig-utils": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/project-service": "8.37.0",
+        "@typescript-eslint/tsconfig-utils": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -2316,16 +2341,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz",
-      "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.37.0.tgz",
+      "integrity": "sha512-TSFvkIW6gGjN2p6zbXo20FzCABbyUAuq6tBvNRGsKdsSQ6a7rnV6ADfZ7f4iI3lIiXc4F4WWvtUfDw9CJ9pO5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/typescript-estree": "8.36.0"
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2340,13 +2365,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
-      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.37.0.tgz",
+      "integrity": "sha512-YzfhzcTnZVPiLfP/oeKtDp2evwvHLMe0LOy7oe+hb9KKIumLNohYS9Hgp1ifwpu42YWxhZE8yieggz6JpqO/1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/types": "8.37.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -3439,9 +3464,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.30.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
-      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz",
+      "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3449,9 +3474,9 @@
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.21.0",
         "@eslint/config-helpers": "^0.3.0",
-        "@eslint/core": "^0.14.0",
+        "@eslint/core": "^0.15.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.30.1",
+        "@eslint/js": "9.31.0",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -3638,6 +3663,19 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint/node_modules/@eslint/core": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
+      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/espree": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
@@ -5154,17 +5192,17 @@
       }
     },
     "node_modules/oidc-provider": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/oidc-provider/-/oidc-provider-9.2.0.tgz",
-      "integrity": "sha512-L0JL1ymI/hLKzDRqYzhKluNfRRQUR0++q5fTTziniKmJgNrJ6DnI5h5SP6w8Z0U/3wZrCndpVmbbu0VpKpY0CA==",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/oidc-provider/-/oidc-provider-9.3.0.tgz",
+      "integrity": "sha512-JVocwYM+Fs76nOCED2hMf3iMfrzhN4jISmCYVuFhBEnZiFk3QlODzQXkO1XS/Spw8VwRlKxwIl3otkiintFIjw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@koa/cors": "^5.0.0",
-        "@koa/router": "^13.1.0",
+        "@koa/router": "^13.1.1",
         "debug": "^4.4.1",
         "eta": "^3.5.0",
-        "jose": "^6.0.11",
+        "jose": "^6.0.12",
         "jsesc": "^3.1.0",
         "koa": "^3.0.0",
         "nanoid": "^5.1.5",
@@ -5177,9 +5215,9 @@
       }
     },
     "node_modules/oidc-provider/node_modules/jose": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-6.0.11.tgz",
-      "integrity": "sha512-QxG7EaliDARm1O1S8BGakqncGT9s25bKL1WSf6/oa17Tkqwi8D2ZNglqCF+DsYF88/rV66Q/Q2mFAy697E1DUg==",
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-6.0.12.tgz",
+      "integrity": "sha512-T8xypXs8CpmiIi78k0E+Lk7T2zlK4zDyg+o1CZ4AkOHgDg98ogdP2BeZ61lTFKFyoEwJ9RgAgN+SdM3iPgNonQ==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -5488,13 +5526,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.53.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.53.2.tgz",
-      "integrity": "sha512-6K/qQxVFuVQhRQhFsVZ9fGeatxirtrpPgxzBYWyZLEXJzqYwuL4fuNmfOfD5et1tJE4GScKyPNeLhZeRwuTU3A==",
+      "version": "1.54.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.1.tgz",
+      "integrity": "sha512-peWpSwIBmSLi6aW2auvrUtf2DqY16YYcCMO8rTVx486jKmDTJg7UAhyrraP98GB8BoPURZP8+nxO7TSd4cPr5g==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.53.2"
+        "playwright-core": "1.54.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -5507,9 +5545,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.53.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.53.2.tgz",
-      "integrity": "sha512-ox/OytMy+2w1jcYEYlOo1Hhp8hZkLCximMTUTMBXjGUA1KoFfiSZ+DU+3a739jsPY0yoKH2TFy9S2fsJas8yAw==",
+      "version": "1.54.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.1.tgz",
+      "integrity": "sha512-Nbjs2zjj0htNhzgiy5wu+3w09YetDx5pkrpI/kZotDlDUaYk0HVA5xrBVPdow4SAUIlhgKcJeJg4GRKW6xHusA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -5993,9 +6031,9 @@
       "license": "ISC"
     },
     "node_modules/sharp": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.2.tgz",
-      "integrity": "sha512-lszvBmB9QURERtyKT2bNmsgxXK0ShJrL/fvqlonCo7e6xBF8nT8xU6pW+PMIbLsz0RxQk3rgH9kd8UmvOzlMJg==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.3.tgz",
+      "integrity": "sha512-eX2IQ6nFohW4DbvHIOLRB3MHFpYqaqvXd3Tp5e/T/dSH83fxaNJQRvDMhASmkNTsNTVF2/OOopzRCt7xokgPfg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
@@ -6011,27 +6049,28 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-darwin-arm64": "0.34.2",
-        "@img/sharp-darwin-x64": "0.34.2",
-        "@img/sharp-libvips-darwin-arm64": "1.1.0",
-        "@img/sharp-libvips-darwin-x64": "1.1.0",
-        "@img/sharp-libvips-linux-arm": "1.1.0",
-        "@img/sharp-libvips-linux-arm64": "1.1.0",
-        "@img/sharp-libvips-linux-ppc64": "1.1.0",
-        "@img/sharp-libvips-linux-s390x": "1.1.0",
-        "@img/sharp-libvips-linux-x64": "1.1.0",
-        "@img/sharp-libvips-linuxmusl-arm64": "1.1.0",
-        "@img/sharp-libvips-linuxmusl-x64": "1.1.0",
-        "@img/sharp-linux-arm": "0.34.2",
-        "@img/sharp-linux-arm64": "0.34.2",
-        "@img/sharp-linux-s390x": "0.34.2",
-        "@img/sharp-linux-x64": "0.34.2",
-        "@img/sharp-linuxmusl-arm64": "0.34.2",
-        "@img/sharp-linuxmusl-x64": "0.34.2",
-        "@img/sharp-wasm32": "0.34.2",
-        "@img/sharp-win32-arm64": "0.34.2",
-        "@img/sharp-win32-ia32": "0.34.2",
-        "@img/sharp-win32-x64": "0.34.2"
+        "@img/sharp-darwin-arm64": "0.34.3",
+        "@img/sharp-darwin-x64": "0.34.3",
+        "@img/sharp-libvips-darwin-arm64": "1.2.0",
+        "@img/sharp-libvips-darwin-x64": "1.2.0",
+        "@img/sharp-libvips-linux-arm": "1.2.0",
+        "@img/sharp-libvips-linux-arm64": "1.2.0",
+        "@img/sharp-libvips-linux-ppc64": "1.2.0",
+        "@img/sharp-libvips-linux-s390x": "1.2.0",
+        "@img/sharp-libvips-linux-x64": "1.2.0",
+        "@img/sharp-libvips-linuxmusl-arm64": "1.2.0",
+        "@img/sharp-libvips-linuxmusl-x64": "1.2.0",
+        "@img/sharp-linux-arm": "0.34.3",
+        "@img/sharp-linux-arm64": "0.34.3",
+        "@img/sharp-linux-ppc64": "0.34.3",
+        "@img/sharp-linux-s390x": "0.34.3",
+        "@img/sharp-linux-x64": "0.34.3",
+        "@img/sharp-linuxmusl-arm64": "0.34.3",
+        "@img/sharp-linuxmusl-x64": "0.34.3",
+        "@img/sharp-wasm32": "0.34.3",
+        "@img/sharp-win32-arm64": "0.34.3",
+        "@img/sharp-win32-ia32": "0.34.3",
+        "@img/sharp-win32-x64": "0.34.3"
       }
     },
     "node_modules/shebang-command": {
@@ -6778,15 +6817,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.36.0.tgz",
-      "integrity": "sha512-fTCqxthY+h9QbEgSIBfL9iV6CvKDFuoxg6bHPNpJ9HIUzS+jy2lCEyCmGyZRWEBSaykqcDPf1SJ+BfCI8DRopA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.37.0.tgz",
+      "integrity": "sha512-TnbEjzkE9EmcO0Q2zM+GE8NQLItNAJpMmED1BdgoBMYNdqMhzlbqfdSwiRlAzEK2pA9UzVW0gzaaIzXWg2BjfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.36.0",
-        "@typescript-eslint/parser": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0"
+        "@typescript-eslint/eslint-plugin": "8.37.0",
+        "@typescript-eslint/parser": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/server/package-lock.json b/server/package-lock.json
index ca758d97e4..207776873e 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -30,7 +30,7 @@
         "@opentelemetry/sdk-metrics": "^2.0.1",
         "@opentelemetry/sdk-node": "^0.203.0",
         "@opentelemetry/semantic-conventions": "^1.34.0",
-        "@react-email/components": "^0.2.0",
+        "@react-email/components": "^0.3.0",
         "@react-email/render": "^1.1.2",
         "@socket.io/redis-adapter": "^8.3.0",
         "archiver": "^7.0.0",
@@ -6031,9 +6031,9 @@
       }
     },
     "node_modules/@react-email/components": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@react-email/components/-/components-0.2.0.tgz",
-      "integrity": "sha512-y45D+oYDgvL1fuFnauwUk8MwT54l0hWwnUAzzP0bVuwhsmVJFelKOGGMCRch0pcgyINilVlAEk0Xjtcu0Su4cw==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@react-email/components/-/components-0.3.2.tgz",
+      "integrity": "sha512-nVbo0KtBdZbj19lvfFpe0ZhjKPh6LE229+NyQLuTDt6dfaLzNRpSu/rHP+jlvdWBAk93slsoGyWDRldbqklpaA==",
       "license": "MIT",
       "dependencies": {
         "@react-email/body": "0.0.11",
@@ -6054,7 +6054,7 @@
         "@react-email/render": "1.1.3",
         "@react-email/row": "0.0.12",
         "@react-email/section": "0.0.16",
-        "@react-email/tailwind": "1.1.0",
+        "@react-email/tailwind": "1.2.2",
         "@react-email/text": "0.1.5"
       },
       "engines": {
@@ -6227,9 +6227,9 @@
       }
     },
     "node_modules/@react-email/tailwind": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@react-email/tailwind/-/tailwind-1.1.0.tgz",
-      "integrity": "sha512-m4sh5d1c8P9TPA6Ea8qHrboE5s9PmRQREIreYMn1l5ca0pCV/UBEY15e1RgoaseAzy2cy+gwI+nKhMwqUJsD1g==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@react-email/tailwind/-/tailwind-1.2.2.tgz",
+      "integrity": "sha512-heO9Khaqxm6Ulm6p7HQ9h01oiiLRrZuuEQuYds/O7Iyp3c58sMVHZGIxiRXO/kSs857NZQycpjewEVKF3jhNTw==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
diff --git a/server/package.json b/server/package.json
index 86abe8979c..d461f1d767 100644
--- a/server/package.json
+++ b/server/package.json
@@ -55,7 +55,7 @@
     "@opentelemetry/sdk-metrics": "^2.0.1",
     "@opentelemetry/sdk-node": "^0.203.0",
     "@opentelemetry/semantic-conventions": "^1.34.0",
-    "@react-email/components": "^0.2.0",
+    "@react-email/components": "^0.3.0",
     "@react-email/render": "^1.1.2",
     "@socket.io/redis-adapter": "^8.3.0",
     "archiver": "^7.0.0",
diff --git a/web/package-lock.json b/web/package-lock.json
index c1147447de..1d4d3bdb34 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -51,9 +51,9 @@
         "@koddsson/eslint-plugin-tscompat": "^0.2.0",
         "@socket.io/component-emitter": "^3.1.0",
         "@sveltejs/adapter-static": "^3.0.8",
-        "@sveltejs/enhanced-img": "^0.6.0",
-        "@sveltejs/kit": "^2.15.2",
-        "@sveltejs/vite-plugin-svelte": "^6.0.0",
+        "@sveltejs/enhanced-img": "^0.7.0",
+        "@sveltejs/kit": "^2.25.0",
+        "@sveltejs/vite-plugin-svelte": "6.1.0",
         "@tailwindcss/vite": "^4.1.7",
         "@testing-library/jest-dom": "^6.4.2",
         "@testing-library/svelte": "^5.2.8",
@@ -81,14 +81,14 @@
         "prettier-plugin-sort-json": "^4.1.1",
         "prettier-plugin-svelte": "^3.3.3",
         "rollup-plugin-visualizer": "^6.0.0",
-        "svelte": "^5.25.3",
+        "svelte": "5.35.5",
         "svelte-check": "^4.1.5",
         "svelte-eslint-parser": "^1.2.0",
         "tailwindcss": "^4.1.7",
         "tslib": "^2.6.2",
         "typescript": "^5.7.3",
         "typescript-eslint": "^8.28.0",
-        "vite": "^7.0.0",
+        "vite": "^7.0.5",
         "vitest": "^3.0.0"
       }
     },
@@ -496,9 +496,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.4.tgz",
-      "integrity": "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.8.tgz",
+      "integrity": "sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==",
       "cpu": [
         "arm64"
       ],
@@ -529,9 +529,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
-      "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.8.tgz",
+      "integrity": "sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==",
       "cpu": [
         "arm64"
       ],
@@ -561,6 +561,23 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.8.tgz",
+      "integrity": "sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/sunos-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
@@ -667,6 +684,31 @@
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
+    "node_modules/@eslint/config-array": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/object-schema": "^2.1.6",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
+      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@eslint/core": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
@@ -718,9 +760,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.30.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
-      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
+      "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2142,9 +2184,9 @@
       }
     },
     "node_modules/@sveltejs/enhanced-img": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/@sveltejs/enhanced-img/-/enhanced-img-0.6.1.tgz",
-      "integrity": "sha512-8oj/cXc/M1soGQOkkkuEzeaiE/LTa3MJnoRwoRzG7GOPKHOfNRJDzsCcx3s1GqxQlcoHc4BJK3HoU1m0OV9UMA==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@sveltejs/enhanced-img/-/enhanced-img-0.7.0.tgz",
+      "integrity": "sha512-nvWETsp2IsUoRlt2dFg8swJ8BXmEAZCmOTpIrJ+SGGf54V+rYQ01IbIOPNkmzlejz0Tr0PmslzwMunie8eKU7A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2155,15 +2197,15 @@
         "zimmerframe": "^1.1.2"
       },
       "peerDependencies": {
-        "@sveltejs/vite-plugin-svelte": "^5.0.0 || ^6.0.0-next.0",
+        "@sveltejs/vite-plugin-svelte": "^6.0.0",
         "svelte": "^5.0.0",
-        "vite": ">= 5.0.0"
+        "vite": "^6.3.0 || >=7.0.0"
       }
     },
     "node_modules/@sveltejs/kit": {
-      "version": "2.22.4",
-      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.22.4.tgz",
-      "integrity": "sha512-BXK9hTbP8AeQIfoz6+P3uoyVYStVHc5CIKqoTSF7hXm3Q5P9BwFMdEus4jsQuhaYmXGHzukcGlxe2QrsE8BJfQ==",
+      "version": "2.25.1",
+      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.25.1.tgz",
+      "integrity": "sha512-8H+fxDEp7Xq6tLFdrGdS5fLu6ONDQQ9DgyjboXpChubuFdfH9QoFX09ypssBpyNkJNZFt9eW3yLmXIc9CesPCA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2193,9 +2235,9 @@
       }
     },
     "node_modules/@sveltejs/vite-plugin-svelte": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-6.0.0.tgz",
-      "integrity": "sha512-mma5GJ23pYiWpTNbN//g9XI3Hfob3aAlXPP42qRtvjgTAU6pfJyLyNPTdLjFuj+jfC9JslP4J3AkeiJNhjtLLA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-6.1.0.tgz",
+      "integrity": "sha512-+U6lz1wvGEG/BvQyL4z/flyNdQ9xDNv5vrh+vWBWTHaebqT0c9RNggpZTo/XSPoHsSCWBlYaTlRX8pZ9GATXCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2919,17 +2961,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.36.0.tgz",
-      "integrity": "sha512-lZNihHUVB6ZZiPBNgOQGSxUASI7UJWhT8nHyUGCnaQ28XFCw98IfrMCG3rUl1uwUWoAvodJQby2KTs79UTcrAg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.37.0.tgz",
+      "integrity": "sha512-jsuVWeIkb6ggzB+wPCsR4e6loj+rM72ohW6IBn2C+5NCvfUVY8s33iFPySSVXqtm5Hu29Ne/9bnA0JmyLmgenA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/type-utils": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/type-utils": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -2943,20 +2985,20 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.36.0",
+        "@typescript-eslint/parser": "^8.37.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/project-service": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
-      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.37.0.tgz",
+      "integrity": "sha512-BIUXYsbkl5A1aJDdYJCBAo8rCEbAvdquQ8AnLb6z5Lp1u3x5PNgSSx9A/zqYc++Xnr/0DVpls8iQ2cJs/izTXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.36.0",
-        "@typescript-eslint/types": "^8.36.0",
+        "@typescript-eslint/tsconfig-utils": "^8.37.0",
+        "@typescript-eslint/types": "^8.37.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2971,14 +3013,14 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
-      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.37.0.tgz",
+      "integrity": "sha512-0vGq0yiU1gbjKob2q691ybTg9JX6ShiVXAAfm2jGf3q0hdP6/BruaFjL/ManAR/lj05AvYCH+5bbVo0VtzmjOA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0"
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2989,9 +3031,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
-      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.37.0.tgz",
+      "integrity": "sha512-1/YHvAVTimMM9mmlPvTec9NP4bobA1RkDbMydxG8omqwJJLEW/Iy2C4adsAESIXU3WGLXFHSZUU+C9EoFWl4Zg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3006,14 +3048,15 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.36.0.tgz",
-      "integrity": "sha512-5aaGYG8cVDd6cxfk/ynpYzxBRZJk7w/ymto6uiyUFtdCozQIsQWh7M28/6r57Fwkbweng8qAzoMCPwSJfWlmsg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.37.0.tgz",
+      "integrity": "sha512-SPkXWIkVZxhgwSwVq9rqj/4VFo7MnWwVaRNznfQDc/xPYHjXnPfLWn+4L6FF1cAz6e7dsqBeMawgl7QjUMj4Ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -3030,9 +3073,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
-      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz",
+      "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3044,16 +3087,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
-      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.37.0.tgz",
+      "integrity": "sha512-zuWDMDuzMRbQOM+bHyU4/slw27bAUEcKSKKs3hcv2aNnc/tvE/h7w60dwVw8vnal2Pub6RT1T7BI8tFZ1fE+yg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.36.0",
-        "@typescript-eslint/tsconfig-utils": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/project-service": "8.37.0",
+        "@typescript-eslint/tsconfig-utils": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -3073,16 +3116,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz",
-      "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.37.0.tgz",
+      "integrity": "sha512-TSFvkIW6gGjN2p6zbXo20FzCABbyUAuq6tBvNRGsKdsSQ6a7rnV6ADfZ7f4iI3lIiXc4F4WWvtUfDw9CJ9pO5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/typescript-estree": "8.36.0"
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3097,13 +3140,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
-      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.37.0.tgz",
+      "integrity": "sha512-YzfhzcTnZVPiLfP/oeKtDp2evwvHLMe0LOy7oe+hb9KKIumLNohYS9Hgp1ifwpu42YWxhZE8yieggz6JpqO/1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/types": "8.37.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -3151,16 +3194,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.36.0.tgz",
-      "integrity": "sha512-FuYgkHwZLuPbZjQHzJXrtXreJdFMKl16BFYyRrLxDhWr6Qr7Kbcu2s1Yhu8tsiMXw1S0W1pjfFfYEt+R604s+Q==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.37.0.tgz",
+      "integrity": "sha512-kVIaQE9vrN9RLCQMQ3iyRlVJpTiDUY6woHGb30JDkfJErqrQEmtdWH3gV0PBAfGZgQXoqzXOO0T3K6ioApbbAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/typescript-estree": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3176,14 +3219,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
-      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.37.0.tgz",
+      "integrity": "sha512-BIUXYsbkl5A1aJDdYJCBAo8rCEbAvdquQ8AnLb6z5Lp1u3x5PNgSSx9A/zqYc++Xnr/0DVpls8iQ2cJs/izTXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.36.0",
-        "@typescript-eslint/types": "^8.36.0",
+        "@typescript-eslint/tsconfig-utils": "^8.37.0",
+        "@typescript-eslint/types": "^8.37.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3198,14 +3241,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
-      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.37.0.tgz",
+      "integrity": "sha512-0vGq0yiU1gbjKob2q691ybTg9JX6ShiVXAAfm2jGf3q0hdP6/BruaFjL/ManAR/lj05AvYCH+5bbVo0VtzmjOA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0"
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3216,9 +3259,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
-      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.37.0.tgz",
+      "integrity": "sha512-1/YHvAVTimMM9mmlPvTec9NP4bobA1RkDbMydxG8omqwJJLEW/Iy2C4adsAESIXU3WGLXFHSZUU+C9EoFWl4Zg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3233,9 +3276,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
-      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz",
+      "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3247,16 +3290,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
-      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.37.0.tgz",
+      "integrity": "sha512-zuWDMDuzMRbQOM+bHyU4/slw27bAUEcKSKKs3hcv2aNnc/tvE/h7w60dwVw8vnal2Pub6RT1T7BI8tFZ1fE+yg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.36.0",
-        "@typescript-eslint/tsconfig-utils": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/project-service": "8.37.0",
+        "@typescript-eslint/tsconfig-utils": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -3276,13 +3319,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
-      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.37.0.tgz",
+      "integrity": "sha512-YzfhzcTnZVPiLfP/oeKtDp2evwvHLMe0LOy7oe+hb9KKIumLNohYS9Hgp1ifwpu42YWxhZE8yieggz6JpqO/1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/types": "8.37.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -3320,14 +3363,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.37.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.37.0.tgz",
-      "integrity": "sha512-BIUXYsbkl5A1aJDdYJCBAo8rCEbAvdquQ8AnLb6z5Lp1u3x5PNgSSx9A/zqYc++Xnr/0DVpls8iQ2cJs/izTXA==",
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.38.0.tgz",
+      "integrity": "sha512-dbK7Jvqcb8c9QfH01YB6pORpqX1mn5gDZc9n63Ak/+jD67oWXn3Gs0M6vddAN+eDXBCS5EmNWzbSxsn9SzFWWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.37.0",
-        "@typescript-eslint/types": "^8.37.0",
+        "@typescript-eslint/tsconfig-utils": "^8.38.0",
+        "@typescript-eslint/types": "^8.38.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3342,14 +3385,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.37.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.37.0.tgz",
-      "integrity": "sha512-0vGq0yiU1gbjKob2q691ybTg9JX6ShiVXAAfm2jGf3q0hdP6/BruaFjL/ManAR/lj05AvYCH+5bbVo0VtzmjOA==",
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.38.0.tgz",
+      "integrity": "sha512-WJw3AVlFFcdT9Ri1xs/lg8LwDqgekWXWhH3iAF+1ZM+QPd7oxQ6jvtW/JPwzAScxitILUIFs0/AnQ/UWHzbATQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.37.0",
-        "@typescript-eslint/visitor-keys": "8.37.0"
+        "@typescript-eslint/types": "8.38.0",
+        "@typescript-eslint/visitor-keys": "8.38.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3360,9 +3403,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.37.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.37.0.tgz",
-      "integrity": "sha512-1/YHvAVTimMM9mmlPvTec9NP4bobA1RkDbMydxG8omqwJJLEW/Iy2C4adsAESIXU3WGLXFHSZUU+C9EoFWl4Zg==",
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.38.0.tgz",
+      "integrity": "sha512-Lum9RtSE3EroKk/bYns+sPOodqb2Fv50XOl/gMviMKNvanETUuUcC9ObRbzrJ4VSd2JalPqgSAavwrPiPvnAiQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3377,15 +3420,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.37.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.37.0.tgz",
-      "integrity": "sha512-SPkXWIkVZxhgwSwVq9rqj/4VFo7MnWwVaRNznfQDc/xPYHjXnPfLWn+4L6FF1cAz6e7dsqBeMawgl7QjUMj4Ow==",
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.38.0.tgz",
+      "integrity": "sha512-c7jAvGEZVf0ao2z+nnz8BUaHZD09Agbh+DY7qvBQqLiz8uJzRgVPj5YvOh8I8uEiH8oIUGIfHzMwUcGVco/SJg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.37.0",
-        "@typescript-eslint/typescript-estree": "8.37.0",
-        "@typescript-eslint/utils": "8.37.0",
+        "@typescript-eslint/types": "8.38.0",
+        "@typescript-eslint/typescript-estree": "8.38.0",
+        "@typescript-eslint/utils": "8.38.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -3402,9 +3445,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.37.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz",
-      "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==",
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.38.0.tgz",
+      "integrity": "sha512-wzkUfX3plUqij4YwWaJyqhiPE5UCRVlFpKn1oCRn2O1bJ592XxWJj8ROQ3JD5MYXLORW84063z3tZTb/cs4Tyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3416,16 +3459,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.37.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.37.0.tgz",
-      "integrity": "sha512-zuWDMDuzMRbQOM+bHyU4/slw27bAUEcKSKKs3hcv2aNnc/tvE/h7w60dwVw8vnal2Pub6RT1T7BI8tFZ1fE+yg==",
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.38.0.tgz",
+      "integrity": "sha512-fooELKcAKzxux6fA6pxOflpNS0jc+nOQEEOipXFNjSlBS6fqrJOVY/whSn70SScHrcJ2LDsxWrneFoWYSVfqhQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.37.0",
-        "@typescript-eslint/tsconfig-utils": "8.37.0",
-        "@typescript-eslint/types": "8.37.0",
-        "@typescript-eslint/visitor-keys": "8.37.0",
+        "@typescript-eslint/project-service": "8.38.0",
+        "@typescript-eslint/tsconfig-utils": "8.38.0",
+        "@typescript-eslint/types": "8.38.0",
+        "@typescript-eslint/visitor-keys": "8.38.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -3471,16 +3514,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.37.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.37.0.tgz",
-      "integrity": "sha512-TSFvkIW6gGjN2p6zbXo20FzCABbyUAuq6tBvNRGsKdsSQ6a7rnV6ADfZ7f4iI3lIiXc4F4WWvtUfDw9CJ9pO5A==",
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.38.0.tgz",
+      "integrity": "sha512-hHcMA86Hgt+ijJlrD8fX0j1j8w4C92zue/8LOPAFioIno+W0+L7KqE8QZKCcPGc/92Vs9x36w/4MPTJhqXdyvg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.37.0",
-        "@typescript-eslint/types": "8.37.0",
-        "@typescript-eslint/typescript-estree": "8.37.0"
+        "@typescript-eslint/scope-manager": "8.38.0",
+        "@typescript-eslint/types": "8.38.0",
+        "@typescript-eslint/typescript-estree": "8.38.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3495,13 +3538,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.37.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.37.0.tgz",
-      "integrity": "sha512-YzfhzcTnZVPiLfP/oeKtDp2evwvHLMe0LOy7oe+hb9KKIumLNohYS9Hgp1ifwpu42YWxhZE8yieggz6JpqO/1w==",
+      "version": "8.38.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.38.0.tgz",
+      "integrity": "sha512-pWrTcoFNWuwHlA9CvlfSsGWs14JxfN1TH25zM5L7o0pRLhsoZkDnTsXfQRJBEWJoV5DL0jf+Z+sxiud+K0mq1g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/types": "8.38.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -5031,9 +5074,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.30.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
-      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz",
+      "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5041,9 +5084,9 @@
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.21.0",
         "@eslint/config-helpers": "^0.3.0",
-        "@eslint/core": "^0.14.0",
+        "@eslint/core": "^0.15.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.30.1",
+        "@eslint/js": "9.31.0",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -5123,6 +5166,80 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/eslint-p/node_modules/@eslint/js": {
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
+      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
+      }
+    },
+    "node_modules/eslint-p/node_modules/eslint": {
+      "version": "9.30.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
+      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.0",
+        "@eslint/core": "^0.14.0",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "9.30.1",
+        "@eslint/plugin-kit": "^0.3.1",
+        "@humanfs/node": "^0.16.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.6",
+        "debug": "^4.3.2",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
+        "esquery": "^1.5.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^8.0.0",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-plugin-compat": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-6.0.2.tgz",
@@ -5160,9 +5277,9 @@
       }
     },
     "node_modules/eslint-plugin-svelte": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.10.1.tgz",
-      "integrity": "sha512-csCh2x0ge/DugXC7dCANh46Igi7bjMZEy6rHZCdS13AoGVJSu7a90Kru3I8oMYLGEemPRE1hQXadxvRPVMAAXQ==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.11.0.tgz",
+      "integrity": "sha512-KliWlkieHyEa65aQIkRwUFfHzT5Cn4u3BQQsu3KlkJOs7c1u7ryn84EWaOjEzilbKgttT4OfBURA8Uc4JBSQIw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5175,7 +5292,7 @@
         "postcss-load-config": "^3.1.4",
         "postcss-safe-parser": "^7.0.0",
         "semver": "^7.6.3",
-        "svelte-eslint-parser": "^1.2.0"
+        "svelte-eslint-parser": "^1.3.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5285,31 +5402,19 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/@eslint/config-array": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
-      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
+    "node_modules/eslint/node_modules/@eslint/core": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
+      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^2.1.6",
-        "debug": "^4.3.1",
-        "minimatch": "^3.1.2"
+        "@types/json-schema": "^7.0.15"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/eslint/node_modules/@eslint/config-helpers": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
-      "integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
     "node_modules/esm-env": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
@@ -9093,9 +9198,9 @@
       }
     },
     "node_modules/svelte-eslint-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/svelte-eslint-parser/-/svelte-eslint-parser-1.2.0.tgz",
-      "integrity": "sha512-mbPtajIeuiyU80BEyGvwAktBeTX7KCr5/0l+uRGLq1dafwRNrjfM5kHGJScEBlPG3ipu6dJqfW/k0/fujvIEVw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/svelte-eslint-parser/-/svelte-eslint-parser-1.3.0.tgz",
+      "integrity": "sha512-VCgMHKV7UtOGcGLGNFSbmdm6kEKjtzo5nnpGU/mnx4OsFY6bZ7QwRF5DUx+Hokw5Lvdyo8dpk8B1m8mliomrNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9608,15 +9713,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.36.0.tgz",
-      "integrity": "sha512-fTCqxthY+h9QbEgSIBfL9iV6CvKDFuoxg6bHPNpJ9HIUzS+jy2lCEyCmGyZRWEBSaykqcDPf1SJ+BfCI8DRopA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.37.0.tgz",
+      "integrity": "sha512-TnbEjzkE9EmcO0Q2zM+GE8NQLItNAJpMmED1BdgoBMYNdqMhzlbqfdSwiRlAzEK2pA9UzVW0gzaaIzXWg2BjfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.36.0",
-        "@typescript-eslint/parser": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0"
+        "@typescript-eslint/eslint-plugin": "8.37.0",
+        "@typescript-eslint/parser": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9631,14 +9737,14 @@
       }
     },
     "node_modules/typescript-eslint/node_modules/@typescript-eslint/project-service": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
-      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.37.0.tgz",
+      "integrity": "sha512-BIUXYsbkl5A1aJDdYJCBAo8rCEbAvdquQ8AnLb6z5Lp1u3x5PNgSSx9A/zqYc++Xnr/0DVpls8iQ2cJs/izTXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.36.0",
-        "@typescript-eslint/types": "^8.36.0",
+        "@typescript-eslint/tsconfig-utils": "^8.37.0",
+        "@typescript-eslint/types": "^8.37.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -9653,14 +9759,14 @@
       }
     },
     "node_modules/typescript-eslint/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
-      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.37.0.tgz",
+      "integrity": "sha512-0vGq0yiU1gbjKob2q691ybTg9JX6ShiVXAAfm2jGf3q0hdP6/BruaFjL/ManAR/lj05AvYCH+5bbVo0VtzmjOA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0"
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9671,9 +9777,9 @@
       }
     },
     "node_modules/typescript-eslint/node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
-      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.37.0.tgz",
+      "integrity": "sha512-1/YHvAVTimMM9mmlPvTec9NP4bobA1RkDbMydxG8omqwJJLEW/Iy2C4adsAESIXU3WGLXFHSZUU+C9EoFWl4Zg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9688,9 +9794,9 @@
       }
     },
     "node_modules/typescript-eslint/node_modules/@typescript-eslint/types": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
-      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz",
+      "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9702,16 +9808,16 @@
       }
     },
     "node_modules/typescript-eslint/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
-      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.37.0.tgz",
+      "integrity": "sha512-zuWDMDuzMRbQOM+bHyU4/slw27bAUEcKSKKs3hcv2aNnc/tvE/h7w60dwVw8vnal2Pub6RT1T7BI8tFZ1fE+yg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.36.0",
-        "@typescript-eslint/tsconfig-utils": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/project-service": "8.37.0",
+        "@typescript-eslint/tsconfig-utils": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -9731,16 +9837,16 @@
       }
     },
     "node_modules/typescript-eslint/node_modules/@typescript-eslint/utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz",
-      "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.37.0.tgz",
+      "integrity": "sha512-TSFvkIW6gGjN2p6zbXo20FzCABbyUAuq6tBvNRGsKdsSQ6a7rnV6ADfZ7f4iI3lIiXc4F4WWvtUfDw9CJ9pO5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/typescript-estree": "8.36.0"
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9755,13 +9861,13 @@
       }
     },
     "node_modules/typescript-eslint/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
-      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.37.0.tgz",
+      "integrity": "sha512-YzfhzcTnZVPiLfP/oeKtDp2evwvHLMe0LOy7oe+hb9KKIumLNohYS9Hgp1ifwpu42YWxhZE8yieggz6JpqO/1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/types": "8.37.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -9888,9 +9994,9 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.4.tgz",
-      "integrity": "sha512-SkaSguuS7nnmV7mfJ8l81JGBFV7Gvzp8IzgE8A8t23+AxuNX61Q5H1Tpz5efduSN7NHC8nQXD3sKQKZAu5mNEA==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.5.tgz",
+      "integrity": "sha512-1mncVwJxy2C9ThLwz0+2GKZyEXuC3MyWtAAlNftlZZXZDP3AJt5FmwcMit/IGGaNZ8ZOB2BNO/HFUB+CpN0NQw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10001,9 +10107,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
-      "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.8.tgz",
+      "integrity": "sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==",
       "cpu": [
         "ppc64"
       ],
@@ -10018,9 +10124,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/android-arm": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
-      "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.8.tgz",
+      "integrity": "sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==",
       "cpu": [
         "arm"
       ],
@@ -10035,9 +10141,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/android-arm64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
-      "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.8.tgz",
+      "integrity": "sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==",
       "cpu": [
         "arm64"
       ],
@@ -10052,9 +10158,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/android-x64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
-      "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.8.tgz",
+      "integrity": "sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==",
       "cpu": [
         "x64"
       ],
@@ -10069,9 +10175,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
-      "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.8.tgz",
+      "integrity": "sha512-Jw0mxgIaYX6R8ODrdkLLPwBqHTtYHJSmzzd+QeytSugzQ0Vg4c5rDky5VgkoowbZQahCbsv1rT1KW72MPIkevw==",
       "cpu": [
         "arm64"
       ],
@@ -10086,9 +10192,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
-      "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.8.tgz",
+      "integrity": "sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==",
       "cpu": [
         "x64"
       ],
@@ -10103,9 +10209,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
-      "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.8.tgz",
+      "integrity": "sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==",
       "cpu": [
         "arm64"
       ],
@@ -10120,9 +10226,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
-      "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.8.tgz",
+      "integrity": "sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==",
       "cpu": [
         "x64"
       ],
@@ -10137,9 +10243,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/linux-arm": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
-      "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.8.tgz",
+      "integrity": "sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==",
       "cpu": [
         "arm"
       ],
@@ -10154,9 +10260,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
-      "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.8.tgz",
+      "integrity": "sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==",
       "cpu": [
         "arm64"
       ],
@@ -10171,9 +10277,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
-      "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.8.tgz",
+      "integrity": "sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==",
       "cpu": [
         "ia32"
       ],
@@ -10188,9 +10294,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
-      "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.8.tgz",
+      "integrity": "sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==",
       "cpu": [
         "loong64"
       ],
@@ -10205,9 +10311,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
-      "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.8.tgz",
+      "integrity": "sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==",
       "cpu": [
         "mips64el"
       ],
@@ -10222,9 +10328,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
-      "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.8.tgz",
+      "integrity": "sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==",
       "cpu": [
         "ppc64"
       ],
@@ -10239,9 +10345,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
-      "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.8.tgz",
+      "integrity": "sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==",
       "cpu": [
         "riscv64"
       ],
@@ -10256,9 +10362,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
-      "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.8.tgz",
+      "integrity": "sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==",
       "cpu": [
         "s390x"
       ],
@@ -10273,9 +10379,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/linux-x64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
-      "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.8.tgz",
+      "integrity": "sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==",
       "cpu": [
         "x64"
       ],
@@ -10290,9 +10396,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
-      "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.8.tgz",
+      "integrity": "sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==",
       "cpu": [
         "x64"
       ],
@@ -10307,9 +10413,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
-      "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.8.tgz",
+      "integrity": "sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==",
       "cpu": [
         "x64"
       ],
@@ -10324,9 +10430,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
-      "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.8.tgz",
+      "integrity": "sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==",
       "cpu": [
         "x64"
       ],
@@ -10341,9 +10447,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
-      "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.8.tgz",
+      "integrity": "sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==",
       "cpu": [
         "arm64"
       ],
@@ -10358,9 +10464,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
-      "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.8.tgz",
+      "integrity": "sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==",
       "cpu": [
         "ia32"
       ],
@@ -10375,9 +10481,9 @@
       }
     },
     "node_modules/vite/node_modules/@esbuild/win32-x64": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
-      "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.8.tgz",
+      "integrity": "sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==",
       "cpu": [
         "x64"
       ],
@@ -10392,9 +10498,9 @@
       }
     },
     "node_modules/vite/node_modules/esbuild": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz",
-      "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==",
+      "version": "0.25.8",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.8.tgz",
+      "integrity": "sha512-vVC0USHGtMi8+R4Kz8rt6JhEWLxsv9Rnu/lGYbPR8u47B+DCBksq9JarW0zOO7bs37hyOK1l2/oqtbciutL5+Q==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -10405,31 +10511,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.4",
-        "@esbuild/android-arm": "0.25.4",
-        "@esbuild/android-arm64": "0.25.4",
-        "@esbuild/android-x64": "0.25.4",
-        "@esbuild/darwin-arm64": "0.25.4",
-        "@esbuild/darwin-x64": "0.25.4",
-        "@esbuild/freebsd-arm64": "0.25.4",
-        "@esbuild/freebsd-x64": "0.25.4",
-        "@esbuild/linux-arm": "0.25.4",
-        "@esbuild/linux-arm64": "0.25.4",
-        "@esbuild/linux-ia32": "0.25.4",
-        "@esbuild/linux-loong64": "0.25.4",
-        "@esbuild/linux-mips64el": "0.25.4",
-        "@esbuild/linux-ppc64": "0.25.4",
-        "@esbuild/linux-riscv64": "0.25.4",
-        "@esbuild/linux-s390x": "0.25.4",
-        "@esbuild/linux-x64": "0.25.4",
-        "@esbuild/netbsd-arm64": "0.25.4",
-        "@esbuild/netbsd-x64": "0.25.4",
-        "@esbuild/openbsd-arm64": "0.25.4",
-        "@esbuild/openbsd-x64": "0.25.4",
-        "@esbuild/sunos-x64": "0.25.4",
-        "@esbuild/win32-arm64": "0.25.4",
-        "@esbuild/win32-ia32": "0.25.4",
-        "@esbuild/win32-x64": "0.25.4"
+        "@esbuild/aix-ppc64": "0.25.8",
+        "@esbuild/android-arm": "0.25.8",
+        "@esbuild/android-arm64": "0.25.8",
+        "@esbuild/android-x64": "0.25.8",
+        "@esbuild/darwin-arm64": "0.25.8",
+        "@esbuild/darwin-x64": "0.25.8",
+        "@esbuild/freebsd-arm64": "0.25.8",
+        "@esbuild/freebsd-x64": "0.25.8",
+        "@esbuild/linux-arm": "0.25.8",
+        "@esbuild/linux-arm64": "0.25.8",
+        "@esbuild/linux-ia32": "0.25.8",
+        "@esbuild/linux-loong64": "0.25.8",
+        "@esbuild/linux-mips64el": "0.25.8",
+        "@esbuild/linux-ppc64": "0.25.8",
+        "@esbuild/linux-riscv64": "0.25.8",
+        "@esbuild/linux-s390x": "0.25.8",
+        "@esbuild/linux-x64": "0.25.8",
+        "@esbuild/netbsd-arm64": "0.25.8",
+        "@esbuild/netbsd-x64": "0.25.8",
+        "@esbuild/openbsd-arm64": "0.25.8",
+        "@esbuild/openbsd-x64": "0.25.8",
+        "@esbuild/openharmony-arm64": "0.25.8",
+        "@esbuild/sunos-x64": "0.25.8",
+        "@esbuild/win32-arm64": "0.25.8",
+        "@esbuild/win32-ia32": "0.25.8",
+        "@esbuild/win32-x64": "0.25.8"
       }
     },
     "node_modules/vitefu": {
diff --git a/web/package.json b/web/package.json
index 2b092f057a..753b0a15a6 100644
--- a/web/package.json
+++ b/web/package.json
@@ -68,9 +68,9 @@
     "@koddsson/eslint-plugin-tscompat": "^0.2.0",
     "@socket.io/component-emitter": "^3.1.0",
     "@sveltejs/adapter-static": "^3.0.8",
-    "@sveltejs/enhanced-img": "^0.6.0",
-    "@sveltejs/kit": "^2.15.2",
-    "@sveltejs/vite-plugin-svelte": "^6.0.0",
+    "@sveltejs/enhanced-img": "^0.7.0",
+    "@sveltejs/kit": "^2.25.0",
+    "@sveltejs/vite-plugin-svelte": "6.1.0",
     "@tailwindcss/vite": "^4.1.7",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/svelte": "^5.2.8",
@@ -98,14 +98,14 @@
     "prettier-plugin-sort-json": "^4.1.1",
     "prettier-plugin-svelte": "^3.3.3",
     "rollup-plugin-visualizer": "^6.0.0",
-    "svelte": "^5.25.3",
+    "svelte": "5.35.5",
     "svelte-check": "^4.1.5",
     "svelte-eslint-parser": "^1.2.0",
     "tailwindcss": "^4.1.7",
     "tslib": "^2.6.2",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.28.0",
-    "vite": "^7.0.0",
+    "vite": "^7.0.5",
     "vitest": "^3.0.0"
   },
   "volta": {
diff --git a/web/src/lib/components/shared-components/settings/setting-accordion-state.svelte b/web/src/lib/components/shared-components/settings/setting-accordion-state.svelte
index 6b3ae81685..b0deb64316 100644
--- a/web/src/lib/components/shared-components/settings/setting-accordion-state.svelte
+++ b/web/src/lib/components/shared-components/settings/setting-accordion-state.svelte
@@ -12,6 +12,7 @@
   import { goto } from '$app/navigation';
   import type { Snippet } from 'svelte';
   import { handlePromiseError } from '$lib/utils';
+  import { SvelteURLSearchParams } from 'svelte/reactivity';
 
   const getParamValues = (param: string) => {
     return new Set((page.url.searchParams.get(param) || '').split(' ').filter((x) => x !== ''));
@@ -26,7 +27,7 @@
   let { queryParam, state = writable(getParamValues(queryParam)), children }: Props = $props();
   setAccordionState(state);
 
-  const searchParams = new URLSearchParams(page.url.searchParams);
+  const searchParams = new SvelteURLSearchParams(page.url.searchParams);
 
   $effect(() => {
     if ($state.size > 0) {
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 5a984e94be..627292ea1b 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
@@ -17,6 +17,7 @@
   import { mdiClose, mdiInformationOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
+  import { SvelteDate } from 'svelte/reactivity';
 
   let showMessage = $state(false);
   let hoverMessage = $state(false);
@@ -37,7 +38,7 @@
   };
 
   const hideButton = async (always: boolean) => {
-    const hideBuyButtonUntil = new Date();
+    const hideBuyButtonUntil = new SvelteDate();
 
     if (always) {
       hideBuyButtonUntil.setFullYear(2124); // see ya in 100 years
diff --git a/web/src/lib/managers/timeline-manager/day-group.svelte.ts b/web/src/lib/managers/timeline-manager/day-group.svelte.ts
index 2a949499ec..9d5008bf83 100644
--- a/web/src/lib/managers/timeline-manager/day-group.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/day-group.svelte.ts
@@ -4,6 +4,7 @@ import type { CommonLayoutOptions } from '$lib/utils/layout-utils';
 import { getJustifiedLayoutFromAssets, getPosition } from '$lib/utils/layout-utils';
 import { plainDateTimeCompare } from '$lib/utils/timeline-util';
 
+import { SvelteSet } from 'svelte/reactivity';
 import type { MonthGroup } from './month-group.svelte';
 import type { AssetOperation, Direction, MoveAsset, TimelineAsset } from './types';
 import { ViewerAsset } from './viewer-asset.svelte';
@@ -109,13 +110,13 @@ export class DayGroup {
     if (ids.size === 0) {
       return {
         moveAssets: [] as MoveAsset[],
-        processedIds: new Set<string>(),
+        processedIds: new SvelteSet<string>(),
         unprocessedIds: ids,
         changedGeometry: false,
       };
     }
-    const unprocessedIds = new Set<string>(ids);
-    const processedIds = new Set<string>();
+    const unprocessedIds = new SvelteSet<string>(ids);
+    const processedIds = new SvelteSet<string>();
     const moveAssets: MoveAsset[] = [];
     let changedGeometry = false;
     for (const assetId of unprocessedIds) {
diff --git a/web/src/lib/managers/timeline-manager/group-insertion-cache.svelte.ts b/web/src/lib/managers/timeline-manager/group-insertion-cache.svelte.ts
index 66cca61d45..e511df9bf0 100644
--- a/web/src/lib/managers/timeline-manager/group-insertion-cache.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/group-insertion-cache.svelte.ts
@@ -1,5 +1,6 @@
 import { setDifference, type TimelinePlainDate } from '$lib/utils/timeline-util';
 import { AssetOrder } from '@immich/sdk';
+import { SvelteSet } from 'svelte/reactivity';
 import type { DayGroup } from './day-group.svelte';
 import type { MonthGroup } from './month-group.svelte';
 import type { TimelineAsset } from './types';
@@ -9,8 +10,8 @@ export class GroupInsertionCache {
     [year: number]: { [month: number]: { [day: number]: DayGroup } };
   } = {};
   unprocessedAssets: TimelineAsset[] = [];
-  changedDayGroups = new Set<DayGroup>();
-  newDayGroups = new Set<DayGroup>();
+  changedDayGroups = new SvelteSet<DayGroup>();
+  newDayGroups = new SvelteSet<DayGroup>();
 
   getDayGroup({ year, month, day }: TimelinePlainDate): DayGroup | undefined {
     return this.#lookupCache[year]?.[month]?.[day];
@@ -31,7 +32,7 @@ export class GroupInsertionCache {
   }
 
   get updatedBuckets() {
-    const updated = new Set<MonthGroup>();
+    const updated = new SvelteSet<MonthGroup>();
     for (const group of this.changedDayGroups) {
       updated.add(group.monthGroup);
     }
@@ -39,7 +40,7 @@ export class GroupInsertionCache {
   }
 
   get bucketsWithNewDayGroups() {
-    const updated = new Set<MonthGroup>();
+    const updated = new SvelteSet<MonthGroup>();
     for (const group of this.newDayGroups) {
       updated.add(group.monthGroup);
     }
diff --git a/web/src/lib/managers/timeline-manager/internal/operations-support.svelte.ts b/web/src/lib/managers/timeline-manager/internal/operations-support.svelte.ts
index 82ec78499b..4419de2103 100644
--- a/web/src/lib/managers/timeline-manager/internal/operations-support.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/internal/operations-support.svelte.ts
@@ -1,6 +1,7 @@
 import { setDifference, type TimelinePlainDate } from '$lib/utils/timeline-util';
 import { AssetOrder } from '@immich/sdk';
 
+import { SvelteSet } from 'svelte/reactivity';
 import { GroupInsertionCache } from '../group-insertion-cache.svelte';
 import { MonthGroup } from '../month-group.svelte';
 import type { TimelineManager } from '../timeline-manager.svelte';
@@ -18,7 +19,7 @@ export function addAssetsToMonthGroups(
   }
 
   const addContext = new GroupInsertionCache();
-  const updatedMonthGroups = new Set<MonthGroup>();
+  const updatedMonthGroups = new SvelteSet<MonthGroup>();
   const monthCount = timelineManager.months.length;
   for (const asset of assets) {
     let month = getMonthGroupByDate(timelineManager, asset.localDateTime);
@@ -63,12 +64,12 @@ export function runAssetOperation(
   options: { order: AssetOrder },
 ) {
   if (ids.size === 0) {
-    return { processedIds: new Set(), unprocessedIds: ids, changedGeometry: false };
+    return { processedIds: new SvelteSet(), unprocessedIds: ids, changedGeometry: false };
   }
 
-  const changedMonthGroups = new Set<MonthGroup>();
-  let idsToProcess = new Set(ids);
-  const idsProcessed = new Set<string>();
+  const changedMonthGroups = new SvelteSet<MonthGroup>();
+  let idsToProcess = new SvelteSet(ids);
+  const idsProcessed = new SvelteSet<string>();
   const combinedMoveAssets: { asset: TimelineAsset; date: TimelinePlainDate }[][] = [];
   for (const month of timelineManager.months) {
     if (idsToProcess.size > 0) {
diff --git a/web/src/lib/managers/timeline-manager/month-group.svelte.ts b/web/src/lib/managers/timeline-manager/month-group.svelte.ts
index bbcfe88caa..9f7112963a 100644
--- a/web/src/lib/managers/timeline-manager/month-group.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/month-group.svelte.ts
@@ -17,6 +17,7 @@ import {
 import { t } from 'svelte-i18n';
 import { get } from 'svelte/store';
 
+import { SvelteSet } from 'svelte/reactivity';
 import { DayGroup } from './day-group.svelte';
 import { GroupInsertionCache } from './group-insertion-cache.svelte';
 import type { TimelineManager } from './timeline-manager.svelte';
@@ -115,15 +116,15 @@ export class MonthGroup {
     if (ids.size === 0) {
       return {
         moveAssets: [] as MoveAsset[],
-        processedIds: new Set<string>(),
+        processedIds: new SvelteSet<string>(),
         unprocessedIds: ids,
         changedGeometry: false,
       };
     }
     const { dayGroups } = this;
     let combinedChangedGeometry = false;
-    let idsToProcess = new Set(ids);
-    const idsProcessed = new Set<string>();
+    let idsToProcess = new SvelteSet(ids);
+    const idsProcessed = new SvelteSet<string>();
     const combinedMoveAssets: MoveAsset[][] = [];
     let index = dayGroups.length;
     while (index--) {
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 8aacd0a90a..c66a55fa11 100644
--- a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
@@ -6,7 +6,7 @@ import { CancellableTask } from '$lib/utils/cancellable-task';
 import { toTimelineAsset, type TimelinePlainDateTime, type TimelinePlainYearMonth } from '$lib/utils/timeline-util';
 
 import { clamp, debounce, isEqual } from 'lodash-es';
-import { SvelteSet } from 'svelte/reactivity';
+import { SvelteDate, SvelteMap, SvelteSet } from 'svelte/reactivity';
 
 import { updateIntersectionMonthGroup } from '$lib/managers/timeline-manager/internal/intersection-support.svelte';
 import { updateGeometry } from '$lib/managers/timeline-manager/internal/layout-support.svelte';
@@ -293,7 +293,7 @@ export class TimelineManager {
     });
 
     this.months = timebuckets.map((timeBucket) => {
-      const date = new Date(timeBucket.timeBucket);
+      const date = new SvelteDate(timeBucket.timeBucket);
       return new MonthGroup(
         this,
         { year: date.getUTCFullYear(), month: date.getUTCMonth() + 1 },
@@ -456,14 +456,14 @@ export class TimelineManager {
   }
 
   updateAssetOperation(ids: string[], operation: AssetOperation) {
-    runAssetOperation(this, new Set(ids), operation, { order: this.#options.order ?? AssetOrder.Desc });
+    runAssetOperation(this, new SvelteSet(ids), operation, { order: this.#options.order ?? AssetOrder.Desc });
   }
 
   updateAssets(assets: TimelineAsset[]) {
-    const lookup = new Map<string, TimelineAsset>(assets.map((asset) => [asset.id, asset]));
+    const lookup = new SvelteMap<string, TimelineAsset>(assets.map((asset) => [asset.id, asset]));
     const { unprocessedIds } = runAssetOperation(
       this,
-      new Set(lookup.keys()),
+      new SvelteSet(lookup.keys()),
       (asset) => {
         updateObject(asset, lookup.get(asset.id));
         return { remove: false };
@@ -480,7 +480,7 @@ export class TimelineManager {
   removeAssets(ids: string[]) {
     const { unprocessedIds } = runAssetOperation(
       this,
-      new Set(ids),
+      new SvelteSet(ids),
       () => {
         return { remove: true };
       },
diff --git a/web/src/lib/modals/ApiKeyModal.svelte b/web/src/lib/modals/ApiKeyModal.svelte
index 15902c8e53..55896c631d 100644
--- a/web/src/lib/modals/ApiKeyModal.svelte
+++ b/web/src/lib/modals/ApiKeyModal.svelte
@@ -9,6 +9,7 @@
   import { mdiKeyVariant } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
+  import { SvelteMap } from 'svelte/reactivity';
 
   interface Props {
     apiKey: { name: string; permissions: Permission[] };
@@ -23,7 +24,7 @@
   let selectedItems: Permission[] = $state(apiKey.permissions);
   let selectAllItems = $derived(selectedItems.length === Object.keys(Permission).length - 1);
 
-  const permissions: Map<string, Permission[]> = new Map();
+  const permissions: Map<string, Permission[]> = new SvelteMap();
 
   permissions.set('activity', [
     Permission.ActivityCreate,
diff --git a/web/src/lib/utils/timeline-util.ts b/web/src/lib/utils/timeline-util.ts
index 7646d0d6d4..dc237c2223 100644
--- a/web/src/lib/utils/timeline-util.ts
+++ b/web/src/lib/utils/timeline-util.ts
@@ -3,6 +3,7 @@ import { locale } from '$lib/stores/preferences.store';
 import { getAssetRatio } from '$lib/utils/asset-utils';
 import { AssetTypeEnum, type AssetResponseDto } from '@immich/sdk';
 import { DateTime, type LocaleOptions } from 'luxon';
+import { SvelteSet } from 'svelte/reactivity';
 import { get } from 'svelte/store';
 
 // Move type definitions to the top
@@ -216,8 +217,8 @@ export const plainDateTimeCompare = (ascending: boolean, a: TimelinePlainDateTim
   return aDateTime.millisecond - bDateTime.millisecond;
 };
 
-export function setDifference<T>(setA: Set<T>, setB: Set<T>): Set<T> {
-  const result = new Set<T>();
+export function setDifference<T>(setA: Set<T>, setB: Set<T>): SvelteSet<T> {
+  const result = new SvelteSet<T>();
   for (const value of setA) {
     if (!setB.has(value)) {
       result.add(value);

From b3061f1e4f47e5ad5b28b69fb1f47a35fa8f098b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 19:18:29 +0100
Subject: [PATCH 275/337] fix(deps): update typescript-projects (#20086)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
---
 web/package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index 1d4d3bdb34..51f60a83c3 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -100,7 +100,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.15.33",
+        "@types/node": "^22.16.4",
         "typescript": "^5.3.3"
       }
     },
@@ -9174,9 +9174,9 @@
       }
     },
     "node_modules/svelte-check": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.2.2.tgz",
-      "integrity": "sha512-1+31EOYZ7NKN0YDMKusav2hhEoA51GD9Ws6o//0SphMT0ve9mBTsTUEX7OmDMadUP3KjNHsSKtJrqdSaD8CrGQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.3.0.tgz",
+      "integrity": "sha512-Iz8dFXzBNAM7XlEIsUjUGQhbEE+Pvv9odb9+0+ITTgFWZBGeJRRYqHUUglwe2EkLD5LIsQaAc4IUJyvtKuOO5w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 277e39ac982c25b5074f7142959aaf23ca6cd325 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Tue, 22 Jul 2025 15:01:18 -0500
Subject: [PATCH 276/337] fix(mobile): sync icon rotation direction (#20088)

spin the sync icon the right direction
---
 mobile/lib/widgets/common/immich_sliver_app_bar.dart | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
index c7ddeca6e0..09c84e0c20 100644
--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -364,7 +364,10 @@ class _SyncStatusIndicatorState extends ConsumerState<_SyncStatusIndicator>
             child: Opacity(
               opacity: isSyncing ? 1.0 : _dismissalAnimation.value,
               child: Transform.rotate(
-                angle: _rotationAnimation.value * 2 * 3.14159,
+                angle: _rotationAnimation.value *
+                    2 *
+                    3.14159 *
+                    -1, // Rotate counter-clockwise
                 child: Icon(
                   Icons.sync,
                   size: 24,

From 3c7f0a2900f47dc5c35868ca2459c964550ef1f5 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Tue, 22 Jul 2025 16:02:52 -0500
Subject: [PATCH 277/337] chore(mobile): use hides instead of changing the
 namespace (#20090)

---
 mobile/lib/pages/common/settings.page.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/pages/common/settings.page.dart b/mobile/lib/pages/common/settings.page.dart
index b19ff87aa9..439e5068a3 100644
--- a/mobile/lib/pages/common/settings.page.dart
+++ b/mobile/lib/pages/common/settings.page.dart
@@ -1,7 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/settings/advanced_settings.dart';
@@ -13,7 +13,7 @@ import 'package:immich_mobile/widgets/settings/language_settings.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/networking_settings.dart';
 import 'package:immich_mobile/widgets/settings/notification_setting.dart';
 import 'package:immich_mobile/widgets/settings/preference_settings/preference_setting.dart';
-import 'package:immich_mobile/entities/store.entity.dart' as app_store;
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/widgets/settings/settings_card.dart';
 
 enum SettingSection {
@@ -112,7 +112,7 @@ class _MobileLayout extends StatelessWidget {
       padding: const EdgeInsets.only(top: 10.0, bottom: 56),
       children: [
         const BetaTimelineListTile(),
-        if (app_store.Store.isBetaTimelineEnabled)
+        if (Store.isBetaTimelineEnabled)
           SettingsCard(
             icon: Icons.sync_outlined,
             title: 'beta_sync'.tr(),

From f1cac122ed44d9efa26eada3fe4a2c661b1d0823 Mon Sep 17 00:00:00 2001
From: Sebastian Di Luzio <sebastian@diluz.io>
Date: Tue, 22 Jul 2025 23:29:36 +0200
Subject: [PATCH 278/337] fix: more inclusive language (#20092)

---
 docs/docs/features/mobile-app.mdx | 4 ++--
 i18n/en.json                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/docs/features/mobile-app.mdx b/docs/docs/features/mobile-app.mdx
index 38222479b0..cd837741f1 100644
--- a/docs/docs/features/mobile-app.mdx
+++ b/docs/docs/features/mobile-app.mdx
@@ -88,9 +88,9 @@ It will only reflect files you add.
 :::
 
 If the same asset is in more than one album it will only sync to the first album it's in, after that it won't sync again even if the user clicks sync albums manually.
-To overcome this limitation, the files must be removed from the blacklist by
+To overcome this limitation, the files must be removed from the ignore list by
 App settings -> Advanced -> Duplicate Assets -> Clear
 
 :::info
-Cleaning duplicate assets from the list will cause all the previously uploaded duplicate files to be re-uploaded, the files will not actually be uploaded and will be rejected on the server side (due to duplication) but will be synchronized to the album and at the end will be added to the black list again at the end of the synchronization.
+Cleaning duplicate assets from the list will cause all the previously uploaded duplicate files to be re-uploaded, the files will not actually be uploaded and will be rejected on the server side (due to duplication) but will be synchronized to the album and at the end will be added to the ignore list again at the end of the synchronization.
 :::
diff --git a/i18n/en.json b/i18n/en.json
index bbd6debd5e..4dc72b4c42 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -592,7 +592,7 @@
   "cache_settings_clear_cache_button": "Clear cache",
   "cache_settings_clear_cache_button_title": "Clears the app's cache. This will significantly impact the app's performance until the cache has rebuilt.",
   "cache_settings_duplicated_assets_clear_button": "CLEAR",
-  "cache_settings_duplicated_assets_subtitle": "Photos and videos that are black listed by the app",
+  "cache_settings_duplicated_assets_subtitle": "Photos and videos that are ignore listed by the app",
   "cache_settings_duplicated_assets_title": "Duplicated Assets ({count})",
   "cache_settings_statistics_album": "Library thumbnails",
   "cache_settings_statistics_full": "Full images",

From 1011cdb37699a53ee61d876067d3cfc435e2eafb Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 22 Jul 2025 17:11:06 -0500
Subject: [PATCH 279/337] chore: handle requeue upload when target albums
 changed (#20089)

* chore: handle requeue upload when target albums changed

* chore: remove debug
---
 i18n/en.json                                  |   1 +
 .../lib/pages/backup/drift_backup.page.dart   |  16 +-
 .../drift_backup_album_selection.page.dart    | 364 ++++++++++--------
 .../backup/drift_upload_detail.page.dart      |   6 +-
 .../backup/drift_backup.provider.dart         |  32 +-
 5 files changed, 237 insertions(+), 182 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 4dc72b4c42..54c7ca6f1b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1330,6 +1330,7 @@
   "no_results": "No results",
   "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_in_any_album": "Not in any album",
   "not_selected": "Not selected",
   "note_apply_storage_label_to_previously_uploaded assets": "Note: To apply the Storage Label to previously uploaded assets, run the",
diff --git a/mobile/lib/pages/backup/drift_backup.page.dart b/mobile/lib/pages/backup/drift_backup.page.dart
index 1b9ec8ad07..7780413399 100644
--- a/mobile/lib/pages/backup/drift_backup.page.dart
+++ b/mobile/lib/pages/backup/drift_backup.page.dart
@@ -44,9 +44,6 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
           (album) => album.backupSelection == BackupSelection.selected,
         )
         .toList();
-    final uploadItems = ref.watch(
-      driftBackupProvider.select((state) => state.uploadItems),
-    );
 
     return Scaffold(
       appBar: AppBar(
@@ -85,14 +82,13 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
                     onStart: () async => await startBackup(),
                     onStop: () async => await stopBackup(),
                   ),
-                  if (uploadItems.isNotEmpty)
-                    TextButton.icon(
-                      icon: const Icon(Icons.info_outline_rounded),
-                      onPressed: () => context.pushRoute(
-                        const DriftUploadDetailRoute(),
-                      ),
-                      label: Text("view_details".t(context: context)),
+                  TextButton.icon(
+                    icon: const Icon(Icons.info_outline_rounded),
+                    onPressed: () => context.pushRoute(
+                      const DriftUploadDetailRoute(),
                     ),
+                    label: Text("view_details".t(context: context)),
+                  ),
                 ],
               ],
             ),
diff --git a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
index fd39f0a579..18d3ee1156 100644
--- a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
+++ b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
@@ -9,6 +9,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
+import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';
@@ -28,6 +29,8 @@ class _DriftBackupAlbumSelectionPageState
     extends ConsumerState<DriftBackupAlbumSelectionPage> {
   String _searchQuery = '';
   bool _isSearchMode = false;
+  int _initialTotalAssetCount = 0;
+  bool _hasPopped = false;
   late ValueNotifier<bool> _enableSyncUploadAlbum;
   late TextEditingController _searchController;
   late FocusNode _searchFocusNode;
@@ -43,6 +46,9 @@ class _DriftBackupAlbumSelectionPageState
         .read(appSettingsServiceProvider)
         .getSetting(AppSettingsEnum.syncAlbums);
     ref.read(backupAlbumProvider.notifier).getAll();
+
+    _initialTotalAssetCount =
+        ref.read(driftBackupProvider.select((p) => p.totalCount));
   }
 
   @override
@@ -79,179 +85,207 @@ class _DriftBackupAlbumSelectionPageState
       }
     }
 
-    return Scaffold(
-      appBar: AppBar(
-        leading: IconButton(
-          onPressed: () => context.maybePop(),
-          icon: const Icon(Icons.arrow_back_ios_rounded),
-        ),
-        title: _isSearchMode
-            ? SearchField(
-                hintText: 'search_albums'.t(context: context),
-                autofocus: true,
-                controller: _searchController,
-                focusNode: _searchFocusNode,
-                onChanged: (value) =>
-                    setState(() => _searchQuery = value.trim()),
+    return PopScope(
+      onPopInvokedWithResult: (didPop, result) async {
+        // There is an issue with Flutter where the pop event
+        // can be triggered multiple times, so we guard it with _hasPopped
+        if (didPop && !_hasPopped) {
+          _hasPopped = true;
+
+          await ref.read(driftBackupProvider.notifier).getBackupStatus();
+          final currentTotalAssetCount =
+              ref.read(driftBackupProvider.select((p) => p.totalCount));
+
+          if (currentTotalAssetCount != _initialTotalAssetCount) {
+            final isBackupEnabled = ref
+                .read(appSettingsServiceProvider)
+                .getSetting(AppSettingsEnum.enableBackup);
+
+            if (!isBackupEnabled) {
+              return;
+            }
+            final backupNotifier = ref.read(driftBackupProvider.notifier);
+
+            backupNotifier.cancel().then((_) {
+              backupNotifier.backup();
+            });
+          }
+        }
+      },
+      child: Scaffold(
+        appBar: AppBar(
+          leading: IconButton(
+            onPressed: () async => await context.maybePop(),
+            icon: const Icon(Icons.arrow_back_ios_rounded),
+          ),
+          title: _isSearchMode
+              ? SearchField(
+                  hintText: 'search_albums'.t(context: context),
+                  autofocus: true,
+                  controller: _searchController,
+                  focusNode: _searchFocusNode,
+                  onChanged: (value) =>
+                      setState(() => _searchQuery = value.trim()),
+                )
+              : const Text(
+                  "backup_album_selection_page_select_albums",
+                ).t(context: context),
+          actions: [
+            if (!_isSearchMode)
+              IconButton(
+                icon: const Icon(Icons.search),
+                onPressed: () => setState(() {
+                  _isSearchMode = true;
+                  _searchQuery = '';
+                }),
               )
-            : const Text(
-                "backup_album_selection_page_select_albums",
-              ).t(context: context),
-        actions: [
-          if (!_isSearchMode)
-            IconButton(
-              icon: const Icon(Icons.search),
-              onPressed: () => setState(() {
-                _isSearchMode = true;
-                _searchQuery = '';
-              }),
-            )
-          else
-            IconButton(
-              icon: const Icon(Icons.close),
-              onPressed: () => setState(() {
-                _isSearchMode = false;
-                _searchQuery = '';
-                _searchController.clear();
-              }),
-            ),
-        ],
-        elevation: 0,
-      ),
-      body: CustomScrollView(
-        physics: const ClampingScrollPhysics(),
-        slivers: [
-          SliverToBoxAdapter(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    vertical: 8.0,
-                    horizontal: 16.0,
-                  ),
-                  child: Text(
-                    "backup_album_selection_page_selection_info",
-                    style: context.textTheme.titleSmall,
-                  ).t(context: context),
-                ),
-                // Selected Album Chips
-
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                  child: Wrap(
-                    children: [
-                      _SelectedAlbumNameChips(
-                        selectedBackupAlbums: selectedBackupAlbums,
-                      ),
-                      _ExcludedAlbumNameChips(
-                        excludedBackupAlbums: excludedBackupAlbums,
-                      ),
-                    ],
-                  ),
-                ),
-
-                SettingsSwitchListTile(
-                  valueNotifier: _enableSyncUploadAlbum,
-                  title: "sync_albums".t(context: context),
-                  subtitle:
-                      "sync_upload_album_setting_subtitle".t(context: context),
-                  contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-                  titleStyle: context.textTheme.bodyLarge?.copyWith(
-                    fontWeight: FontWeight.bold,
-                  ),
-                  subtitleStyle: context.textTheme.labelLarge?.copyWith(
-                    color: context.colorScheme.primary,
-                  ),
-                  onChanged: handleSyncAlbumToggle,
-                ),
-
-                ListTile(
-                  title: Text(
-                    "albums_on_device_count".t(
-                      context: context,
-                      args: {'count': albumCount.toString()},
+            else
+              IconButton(
+                icon: const Icon(Icons.close),
+                onPressed: () => setState(() {
+                  _isSearchMode = false;
+                  _searchQuery = '';
+                  _searchController.clear();
+                }),
+              ),
+          ],
+          elevation: 0,
+        ),
+        body: CustomScrollView(
+          physics: const ClampingScrollPhysics(),
+          slivers: [
+            SliverToBoxAdapter(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.symmetric(
+                      vertical: 8.0,
+                      horizontal: 16.0,
                     ),
-                    style: context.textTheme.titleSmall,
-                  ),
-                  subtitle: Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 8.0),
                     child: Text(
-                      "backup_album_selection_page_albums_tap",
-                      style: context.textTheme.labelLarge?.copyWith(
-                        color: context.primaryColor,
-                      ),
+                      "backup_album_selection_page_selection_info",
+                      style: context.textTheme.titleSmall,
                     ).t(context: context),
                   ),
-                  trailing: IconButton(
-                    splashRadius: 16,
-                    icon: Icon(
-                      Icons.info,
-                      size: 20,
-                      color: context.primaryColor,
-                    ),
-                    onPressed: () {
-                      // show the dialog
-                      showDialog(
-                        context: context,
-                        builder: (BuildContext context) {
-                          return AlertDialog(
-                            shape: const RoundedRectangleBorder(
-                              borderRadius:
-                                  BorderRadius.all(Radius.circular(10)),
-                            ),
-                            elevation: 5,
-                            title: Text(
-                              'backup_album_selection_page_selection_info',
-                              style: TextStyle(
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold,
-                                color: context.primaryColor,
-                              ),
-                            ).t(context: context),
-                            content: SingleChildScrollView(
-                              child: ListBody(
-                                children: [
-                                  const Text(
-                                    'backup_album_selection_page_assets_scatter',
-                                    style: TextStyle(
-                                      fontSize: 14,
-                                    ),
-                                  ).t(context: context),
-                                ],
-                              ),
-                            ),
-                          );
-                        },
-                      );
-                    },
-                  ),
-                ),
+                  // Selected Album Chips
 
-                if (Platform.isAndroid)
-                  _SelectAllButton(
-                    filteredAlbums: filteredAlbums,
-                    selectedBackupAlbums: selectedBackupAlbums,
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                    child: Wrap(
+                      children: [
+                        _SelectedAlbumNameChips(
+                          selectedBackupAlbums: selectedBackupAlbums,
+                        ),
+                        _ExcludedAlbumNameChips(
+                          excludedBackupAlbums: excludedBackupAlbums,
+                        ),
+                      ],
+                    ),
                   ),
-              ],
+
+                  SettingsSwitchListTile(
+                    valueNotifier: _enableSyncUploadAlbum,
+                    title: "sync_albums".t(context: context),
+                    subtitle: "sync_upload_album_setting_subtitle"
+                        .t(context: context),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                    titleStyle: context.textTheme.bodyLarge?.copyWith(
+                      fontWeight: FontWeight.bold,
+                    ),
+                    subtitleStyle: context.textTheme.labelLarge?.copyWith(
+                      color: context.colorScheme.primary,
+                    ),
+                    onChanged: handleSyncAlbumToggle,
+                  ),
+
+                  ListTile(
+                    title: Text(
+                      "albums_on_device_count".t(
+                        context: context,
+                        args: {'count': albumCount.toString()},
+                      ),
+                      style: context.textTheme.titleSmall,
+                    ),
+                    subtitle: Padding(
+                      padding: const EdgeInsets.symmetric(vertical: 8.0),
+                      child: Text(
+                        "backup_album_selection_page_albums_tap",
+                        style: context.textTheme.labelLarge?.copyWith(
+                          color: context.primaryColor,
+                        ),
+                      ).t(context: context),
+                    ),
+                    trailing: IconButton(
+                      splashRadius: 16,
+                      icon: Icon(
+                        Icons.info,
+                        size: 20,
+                        color: context.primaryColor,
+                      ),
+                      onPressed: () {
+                        // show the dialog
+                        showDialog(
+                          context: context,
+                          builder: (BuildContext context) {
+                            return AlertDialog(
+                              shape: const RoundedRectangleBorder(
+                                borderRadius:
+                                    BorderRadius.all(Radius.circular(10)),
+                              ),
+                              elevation: 5,
+                              title: Text(
+                                'backup_album_selection_page_selection_info',
+                                style: TextStyle(
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold,
+                                  color: context.primaryColor,
+                                ),
+                              ).t(context: context),
+                              content: SingleChildScrollView(
+                                child: ListBody(
+                                  children: [
+                                    const Text(
+                                      'backup_album_selection_page_assets_scatter',
+                                      style: TextStyle(
+                                        fontSize: 14,
+                                      ),
+                                    ).t(context: context),
+                                  ],
+                                ),
+                              ),
+                            );
+                          },
+                        );
+                      },
+                    ),
+                  ),
+
+                  if (Platform.isAndroid)
+                    _SelectAllButton(
+                      filteredAlbums: filteredAlbums,
+                      selectedBackupAlbums: selectedBackupAlbums,
+                    ),
+                ],
+              ),
             ),
-          ),
-          SliverLayoutBuilder(
-            builder: (context, constraints) {
-              if (constraints.crossAxisExtent > 600) {
-                return _AlbumSelectionGrid(
-                  filteredAlbums: filteredAlbums,
-                  searchQuery: _searchQuery,
-                );
-              } else {
-                return _AlbumSelectionList(
-                  filteredAlbums: filteredAlbums,
-                  searchQuery: _searchQuery,
-                );
-              }
-            },
-          ),
-        ],
+            SliverLayoutBuilder(
+              builder: (context, constraints) {
+                if (constraints.crossAxisExtent > 600) {
+                  return _AlbumSelectionGrid(
+                    filteredAlbums: filteredAlbums,
+                    searchQuery: _searchQuery,
+                  );
+                } else {
+                  return _AlbumSelectionList(
+                    filteredAlbums: filteredAlbums,
+                    searchQuery: _searchQuery,
+                  );
+                }
+              },
+            ),
+          ],
+        ),
       ),
     );
   }
diff --git a/mobile/lib/pages/backup/drift_upload_detail.page.dart b/mobile/lib/pages/backup/drift_upload_detail.page.dart
index 66803265e6..058bfa1aaf 100644
--- a/mobile/lib/pages/backup/drift_upload_detail.page.dart
+++ b/mobile/lib/pages/backup/drift_upload_detail.page.dart
@@ -39,7 +39,7 @@ class DriftUploadDetailPage extends ConsumerWidget {
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
           Icon(
-            Icons.cloud_upload_outlined,
+            Icons.cloud_off_rounded,
             size: 80,
             color: context.colorScheme.onSurface.withValues(alpha: 0.3),
           ),
@@ -79,7 +79,9 @@ class DriftUploadDetailPage extends ConsumerWidget {
 
     return Card(
       elevation: 0,
-      color: context.colorScheme.surfaceContainer,
+      color: item.isFailed != null
+          ? context.colorScheme.errorContainer
+          : context.colorScheme.surfaceContainer,
       shape: RoundedRectangleBorder(
         borderRadius: const BorderRadius.all(
           Radius.circular(16),
diff --git a/mobile/lib/providers/backup/drift_backup.provider.dart b/mobile/lib/providers/backup/drift_backup.provider.dart
index c51c40775e..3a2c7fd9ce 100644
--- a/mobile/lib/providers/backup/drift_backup.provider.dart
+++ b/mobile/lib/providers/backup/drift_backup.provider.dart
@@ -41,6 +41,7 @@ class DriftUploadStatus {
   final double progress;
   final int fileSize;
   final String networkSpeedAsString;
+  final bool? isFailed;
 
   const DriftUploadStatus({
     required this.taskId,
@@ -48,6 +49,7 @@ class DriftUploadStatus {
     required this.progress,
     required this.fileSize,
     required this.networkSpeedAsString,
+    this.isFailed,
   });
 
   DriftUploadStatus copyWith({
@@ -56,6 +58,7 @@ class DriftUploadStatus {
     double? progress,
     int? fileSize,
     String? networkSpeedAsString,
+    bool? isFailed,
   }) {
     return DriftUploadStatus(
       taskId: taskId ?? this.taskId,
@@ -63,12 +66,13 @@ class DriftUploadStatus {
       progress: progress ?? this.progress,
       fileSize: fileSize ?? this.fileSize,
       networkSpeedAsString: networkSpeedAsString ?? this.networkSpeedAsString,
+      isFailed: isFailed ?? this.isFailed,
     );
   }
 
   @override
   String toString() {
-    return 'DriftUploadStatus(taskId: $taskId, filename: $filename, progress: $progress, fileSize: $fileSize, networkSpeedAsString: $networkSpeedAsString)';
+    return 'DriftUploadStatus(taskId: $taskId, filename: $filename, progress: $progress, fileSize: $fileSize, networkSpeedAsString: $networkSpeedAsString, isFailed: $isFailed)';
   }
 
   @override
@@ -79,7 +83,8 @@ class DriftUploadStatus {
         other.filename == filename &&
         other.progress == progress &&
         other.fileSize == fileSize &&
-        other.networkSpeedAsString == networkSpeedAsString;
+        other.networkSpeedAsString == networkSpeedAsString &&
+        other.isFailed == isFailed;
   }
 
   @override
@@ -88,7 +93,8 @@ class DriftUploadStatus {
         filename.hashCode ^
         progress.hashCode ^
         fileSize.hashCode ^
-        networkSpeedAsString.hashCode;
+        networkSpeedAsString.hashCode ^
+        isFailed.hashCode;
   }
 
   Map<String, dynamic> toMap() {
@@ -98,6 +104,7 @@ class DriftUploadStatus {
       'progress': progress,
       'fileSize': fileSize,
       'networkSpeedAsString': networkSpeedAsString,
+      'isFailed': isFailed,
     };
   }
 
@@ -108,6 +115,7 @@ class DriftUploadStatus {
       progress: map['progress'] as double,
       fileSize: map['fileSize'] as int,
       networkSpeedAsString: map['networkSpeedAsString'] as String,
+      isFailed: map['isFailed'] != null ? map['isFailed'] as bool : null,
     );
   }
 
@@ -235,6 +243,8 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
   }
 
   void _handleTaskStatusUpdate(TaskStatusUpdate update) {
+    final taskId = update.task.taskId;
+
     switch (update.status) {
       case TaskStatus.complete:
         if (update.task.group == kBackupGroup) {
@@ -245,14 +255,26 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
         }
 
         // Remove the completed task from the upload items
-        final taskId = update.task.taskId;
         if (state.uploadItems.containsKey(taskId)) {
-          Future.delayed(const Duration(milliseconds: 500), () {
+          Future.delayed(const Duration(milliseconds: 1000), () {
             _removeUploadItem(taskId);
           });
         }
 
       case TaskStatus.failed:
+        final currentItem = state.uploadItems[taskId];
+        if (currentItem == null) {
+          return;
+        }
+
+        state = state.copyWith(
+          uploadItems: {
+            ...state.uploadItems,
+            taskId: currentItem.copyWith(
+              isFailed: true,
+            ),
+          },
+        );
         break;
 
       case TaskStatus.canceled:

From 1a70896113cc05a64287d75e97400f7b75f3b712 Mon Sep 17 00:00:00 2001
From: xCJPECKOVERx <cjpeckover@hotmail.ca>
Date: Tue, 22 Jul 2025 22:17:06 -0400
Subject: [PATCH 280/337] feat(web): Remove from Stack (#19703)

* - add component
- update server's StackCreateDto for merge parameter
- Update stackRepo to only merge stacks when merge=true (default)
- update web action handlers to show stack changes

* - make open-api

* lint & format

* - Add proper icon to 'remove from stack'
- change web unstack icon to image-off-outline

* - cleanup

* - format & lint

* - make open-api: StackCreateDto merge optional

* initial addition of new endpoint

* remove stack endpoint

* - fix up remove stack endpoint
- open-api

* - Undo stackCreate merge parameter

* - open-api typescript

* open-api dart

* Tests:
- add tests
- update assetStub.imageFrom2015 to have required stack attributes to include it with tests

* update event name

* Fix event name in test

* remove asset_update check

* - merge stack.removeAsset params into one object
- refactor asset existence check (no need for asset fetch)
- fix tests

* Don't return updated stack

* Create specialized stack id & primary asset fetch for asset removal checks

* Correct new permission names

* make sql

* - fix open-api

* - cleanup
---
 mobile/openapi/README.md                      |  1 +
 mobile/openapi/lib/api/stacks_api.dart        | 45 +++++++++++++++++
 open-api/immich-openapi-specs.json            | 44 +++++++++++++++++
 open-api/typescript-sdk/src/fetch-client.ts   |  9 ++++
 server/src/controllers/stack.controller.ts    |  9 +++-
 server/src/queries/stack.repository.sql       | 10 ++++
 server/src/repositories/stack.repository.ts   | 10 ++++
 server/src/services/stack.service.spec.ts     | 49 +++++++++++++++++++
 server/src/services/stack.service.ts          | 19 +++++++
 server/src/validation.ts                      | 40 +++++++++------
 server/test/fixtures/asset.stub.ts            |  5 +-
 .../components/asset-viewer/actions/action.ts |  3 +-
 .../actions/remove-asset-from-stack.svelte    | 31 ++++++++++++
 .../actions/unstack-action.svelte             |  4 +-
 .../asset-viewer/asset-viewer-nav-bar.svelte  |  4 ++
 .../asset-viewer/asset-viewer.svelte          |  7 +++
 .../photos-page/actions/stack-action.svelte   |  4 +-
 .../components/photos-page/asset-grid.svelte  | 17 +++++++
 web/src/lib/constants.ts                      |  1 +
 19 files changed, 289 insertions(+), 23 deletions(-)
 create mode 100644 web/src/lib/components/asset-viewer/actions/remove-asset-from-stack.svelte

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 3e7fa4c2f1..b20a0694c5 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -221,6 +221,7 @@ Class | Method | HTTP request | Description
 *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 | 
diff --git a/mobile/openapi/lib/api/stacks_api.dart b/mobile/openapi/lib/api/stacks_api.dart
index 84f23ec55d..6d6c4506be 100644
--- a/mobile/openapi/lib/api/stacks_api.dart
+++ b/mobile/openapi/lib/api/stacks_api.dart
@@ -190,6 +190,51 @@ class StacksApi {
     return null;
   }
 
+  /// Performs an HTTP 'DELETE /stacks/{id}/assets/{assetId}' operation and returns the [Response].
+  /// Parameters:
+  ///
+  /// * [String] assetId (required):
+  ///
+  /// * [String] id (required):
+  Future<Response> removeAssetFromStackWithHttpInfo(String assetId, String id,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/stacks/{id}/assets/{assetId}'
+      .replaceAll('{assetId}', assetId)
+      .replaceAll('{id}', id);
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'DELETE',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Parameters:
+  ///
+  /// * [String] assetId (required):
+  ///
+  /// * [String] id (required):
+  Future<void> removeAssetFromStack(String assetId, String id,) async {
+    final response = await removeAssetFromStackWithHttpInfo(assetId, id,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+  }
+
   /// Performs an HTTP 'GET /stacks' operation and returns the [Response].
   /// Parameters:
   ///
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 4acd431203..cd61f3e004 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -6746,6 +6746,50 @@
         ]
       }
     },
+    "/stacks/{id}/assets/{assetId}": {
+      "delete": {
+        "operationId": "removeAssetFromStack",
+        "parameters": [
+          {
+            "name": "assetId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "format": "uuid",
+              "type": "string"
+            }
+          },
+          {
+            "name": "id",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "format": "uuid",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "Stacks"
+        ]
+      }
+    },
     "/sync/ack": {
       "delete": {
         "operationId": "deleteSyncAck",
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index d5f7fde52a..81d279407c 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -3373,6 +3373,15 @@ export function updateStack({ id, stackUpdateDto }: {
         body: stackUpdateDto
     })));
 }
+export function removeAssetFromStack({ assetId, id }: {
+    assetId: string;
+    id: string;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchText(`/stacks/${encodeURIComponent(id)}/assets/${encodeURIComponent(assetId)}`, {
+        ...opts,
+        method: "DELETE"
+    }));
+}
 export function deleteSyncAck({ syncAckDeleteDto }: {
     syncAckDeleteDto: SyncAckDeleteDto;
 }, opts?: Oazapfts.RequestOpts) {
diff --git a/server/src/controllers/stack.controller.ts b/server/src/controllers/stack.controller.ts
index 238753734c..5b153a163b 100644
--- a/server/src/controllers/stack.controller.ts
+++ b/server/src/controllers/stack.controller.ts
@@ -6,7 +6,7 @@ import { StackCreateDto, StackResponseDto, StackSearchDto, StackUpdateDto } from
 import { Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { StackService } from 'src/services/stack.service';
-import { UUIDParamDto } from 'src/validation';
+import { UUIDAssetIDParamDto, UUIDParamDto } from 'src/validation';
 
 @ApiTags('Stacks')
 @Controller('stacks')
@@ -54,4 +54,11 @@ export class StackController {
   deleteStack(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
+
+  @Delete(':id/assets/:assetId')
+  @Authenticated({ permission: Permission.StackUpdate })
+  @HttpCode(HttpStatus.NO_CONTENT)
+  removeAssetFromStack(@Auth() auth: AuthDto, @Param() dto: UUIDAssetIDParamDto): Promise<void> {
+    return this.service.removeAsset(auth, dto);
+  }
 }
diff --git a/server/src/queries/stack.repository.sql b/server/src/queries/stack.repository.sql
index a256cdfc76..94a24f69e4 100644
--- a/server/src/queries/stack.repository.sql
+++ b/server/src/queries/stack.repository.sql
@@ -143,3 +143,13 @@ from
   "stack"
 where
   "id" = $1::uuid
+
+-- StackRepository.getForAssetRemoval
+select
+  "stackId" as "id",
+  "stack"."primaryAssetId"
+from
+  "asset"
+  left join "stack" on "stack"."id" = "asset"."stackId"
+where
+  "asset"."id" = $1
diff --git a/server/src/repositories/stack.repository.ts b/server/src/repositories/stack.repository.ts
index fe16c8b5eb..ace9468177 100644
--- a/server/src/repositories/stack.repository.ts
+++ b/server/src/repositories/stack.repository.ts
@@ -152,4 +152,14 @@ export class StackRepository {
       .where('id', '=', asUuid(id))
       .executeTakeFirst();
   }
+
+  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
+  getForAssetRemoval(assetId: string) {
+    return this.db
+      .selectFrom('asset')
+      .leftJoin('stack', 'stack.id', 'asset.stackId')
+      .select(['stackId as id', 'stack.primaryAssetId'])
+      .where('asset.id', '=', assetId)
+      .executeTakeFirst();
+  }
 }
diff --git a/server/src/services/stack.service.spec.ts b/server/src/services/stack.service.spec.ts
index 5c7b505cd9..5517cf17f8 100644
--- a/server/src/services/stack.service.spec.ts
+++ b/server/src/services/stack.service.spec.ts
@@ -188,4 +188,53 @@ describe(StackService.name, () => {
       });
     });
   });
+
+  describe('removeAsset', () => {
+    it('should require stack.update permissions', async () => {
+      await expect(sut.removeAsset(authStub.admin, { id: 'stack-id', assetId: 'asset-id' })).rejects.toBeInstanceOf(
+        BadRequestException,
+      );
+
+      expect(mocks.stack.getForAssetRemoval).not.toHaveBeenCalled();
+      expect(mocks.asset.update).not.toHaveBeenCalled();
+      expect(mocks.event.emit).not.toHaveBeenCalled();
+    });
+
+    it('should fail if the asset is not in the stack', async () => {
+      mocks.access.stack.checkOwnerAccess.mockResolvedValue(new Set(['stack-id']));
+      mocks.stack.getForAssetRemoval.mockResolvedValue({ id: null, primaryAssetId: null });
+
+      await expect(
+        sut.removeAsset(authStub.admin, { id: 'stack-id', assetId: assetStub.imageFrom2015.id }),
+      ).rejects.toBeInstanceOf(BadRequestException);
+
+      expect(mocks.asset.update).not.toHaveBeenCalled();
+      expect(mocks.event.emit).not.toHaveBeenCalled();
+    });
+
+    it('should fail if the assetId is the primaryAssetId', async () => {
+      mocks.access.stack.checkOwnerAccess.mockResolvedValue(new Set(['stack-id']));
+      mocks.stack.getForAssetRemoval.mockResolvedValue({ id: 'stack-id', primaryAssetId: assetStub.image.id });
+
+      await expect(
+        sut.removeAsset(authStub.admin, { id: 'stack-id', assetId: assetStub.image.id }),
+      ).rejects.toBeInstanceOf(BadRequestException);
+
+      expect(mocks.asset.update).not.toHaveBeenCalled();
+      expect(mocks.event.emit).not.toHaveBeenCalled();
+    });
+
+    it("should update the asset to nullify it's stack-id", async () => {
+      mocks.access.stack.checkOwnerAccess.mockResolvedValue(new Set(['stack-id']));
+      mocks.stack.getForAssetRemoval.mockResolvedValue({ id: 'stack-id', primaryAssetId: assetStub.image.id });
+
+      await sut.removeAsset(authStub.admin, { id: 'stack-id', assetId: assetStub.image1.id });
+
+      expect(mocks.asset.update).toHaveBeenCalledWith({ id: assetStub.image1.id, stackId: null });
+      expect(mocks.event.emit).toHaveBeenCalledWith('StackUpdate', {
+        stackId: 'stack-id',
+        userId: authStub.admin.user.id,
+      });
+    });
+  });
 });
diff --git a/server/src/services/stack.service.ts b/server/src/services/stack.service.ts
index 18600abd12..c84ec70fbf 100644
--- a/server/src/services/stack.service.ts
+++ b/server/src/services/stack.service.ts
@@ -4,6 +4,7 @@ import { AuthDto } from 'src/dtos/auth.dto';
 import { StackCreateDto, StackResponseDto, StackSearchDto, StackUpdateDto, mapStack } from 'src/dtos/stack.dto';
 import { Permission } from 'src/enum';
 import { BaseService } from 'src/services/base.service';
+import { UUIDAssetIDParamDto } from 'src/validation';
 
 @Injectable()
 export class StackService extends BaseService {
@@ -58,6 +59,24 @@ export class StackService extends BaseService {
     await this.eventRepository.emit('StackDeleteAll', { stackIds: dto.ids, userId: auth.user.id });
   }
 
+  async removeAsset(auth: AuthDto, dto: UUIDAssetIDParamDto): Promise<void> {
+    const { id: stackId, assetId } = dto;
+    await this.requireAccess({ auth, permission: Permission.StackUpdate, ids: [stackId] });
+
+    const stack = await this.stackRepository.getForAssetRemoval(assetId);
+
+    if (!stack?.id || stack.id !== stackId) {
+      throw new BadRequestException('Asset not in stack');
+    }
+
+    if (stack.primaryAssetId === assetId) {
+      throw new BadRequestException("Cannot remove stack's primary asset");
+    }
+
+    await this.assetRepository.update({ id: assetId, stackId: null });
+    await this.eventRepository.emit('StackUpdate', { stackId, userId: auth.user.id });
+  }
+
   private async findOrFail(id: string) {
     const stack = await this.stackRepository.getById(id);
     if (!stack) {
diff --git a/server/src/validation.ts b/server/src/validation.ts
index 049b5432d6..3f7e1c6f3b 100644
--- a/server/src/validation.ts
+++ b/server/src/validation.ts
@@ -63,6 +63,22 @@ export class FileNotEmptyValidator extends FileValidator {
   }
 }
 
+type UUIDOptions = { optional?: boolean; each?: boolean; nullable?: boolean };
+export const ValidateUUID = (options?: UUIDOptions & ApiPropertyOptions) => {
+  const { optional, each, nullable, ...apiPropertyOptions } = {
+    optional: false,
+    each: false,
+    nullable: false,
+    ...options,
+  };
+  return applyDecorators(
+    IsUUID('4', { each }),
+    ApiProperty({ format: 'uuid', ...apiPropertyOptions }),
+    optional ? Optional({ nullable }) : IsNotEmpty(),
+    each ? IsArray() : IsString(),
+  );
+};
+
 export class UUIDParamDto {
   @IsNotEmpty()
   @IsUUID('4')
@@ -70,6 +86,14 @@ export class UUIDParamDto {
   id!: string;
 }
 
+export class UUIDAssetIDParamDto {
+  @ValidateUUID()
+  id!: string;
+
+  @ValidateUUID()
+  assetId!: string;
+}
+
 type PinCodeOptions = { optional?: boolean } & OptionalOptions;
 export const PinCode = (options?: PinCodeOptions & ApiPropertyOptions) => {
   const { optional, nullable, emptyToNull, ...apiPropertyOptions } = {
@@ -131,22 +155,6 @@ export const ValidateHexColor = () => {
   return applyDecorators(...decorators);
 };
 
-type UUIDOptions = { optional?: boolean; each?: boolean; nullable?: boolean };
-export const ValidateUUID = (options?: UUIDOptions & ApiPropertyOptions) => {
-  const { optional, each, nullable, ...apiPropertyOptions } = {
-    optional: false,
-    each: false,
-    nullable: false,
-    ...options,
-  };
-  return applyDecorators(
-    IsUUID('4', { each }),
-    ApiProperty({ format: 'uuid', ...apiPropertyOptions }),
-    optional ? Optional({ nullable }) : IsNotEmpty(),
-    each ? IsArray() : IsString(),
-  );
-};
-
 type DateOptions = { optional?: boolean; nullable?: boolean; format?: 'date' | 'date-time' };
 export const ValidateDate = (options?: DateOptions & ApiPropertyOptions) => {
   const { optional, nullable, format, ...apiPropertyOptions } = {
diff --git a/server/test/fixtures/asset.stub.ts b/server/test/fixtures/asset.stub.ts
index 991c5d2c4f..76cf71d34d 100644
--- a/server/test/fixtures/asset.stub.ts
+++ b/server/test/fixtures/asset.stub.ts
@@ -462,7 +462,7 @@ export const assetStub = {
   }),
 
   imageFrom2015: Object.freeze({
-    id: 'asset-id-1',
+    id: 'asset-id-2015',
     status: AssetStatus.Active,
     deviceAssetId: 'device-asset-id',
     fileModifiedAt: new Date('2015-02-23T05:06:29.716Z'),
@@ -484,6 +484,9 @@ export const assetStub = {
     duration: null,
     livePhotoVideo: null,
     livePhotoVideoId: null,
+    updateId: 'foo',
+    libraryId: null,
+    stackId: null,
     sharedLinks: [],
     originalFileName: 'asset-id.ext',
     faces: [],
diff --git a/web/src/lib/components/asset-viewer/actions/action.ts b/web/src/lib/components/asset-viewer/actions/action.ts
index d823f17df4..446a004cbb 100644
--- a/web/src/lib/components/asset-viewer/actions/action.ts
+++ b/web/src/lib/components/asset-viewer/actions/action.ts
@@ -1,6 +1,6 @@
 import type { AssetAction } from '$lib/constants';
 import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
-import type { AlbumResponseDto, StackResponseDto } from '@immich/sdk';
+import type { AlbumResponseDto, AssetResponseDto, StackResponseDto } from '@immich/sdk';
 
 type ActionMap = {
   [AssetAction.ARCHIVE]: { asset: TimelineAsset };
@@ -15,6 +15,7 @@ type ActionMap = {
   [AssetAction.UNSTACK]: { assets: TimelineAsset[] };
   [AssetAction.KEEP_THIS_DELETE_OTHERS]: { asset: TimelineAsset };
   [AssetAction.SET_STACK_PRIMARY_ASSET]: { stack: StackResponseDto };
+  [AssetAction.REMOVE_ASSET_FROM_STACK]: { stack: StackResponseDto | null; asset: AssetResponseDto };
   [AssetAction.SET_VISIBILITY_LOCKED]: { asset: TimelineAsset };
   [AssetAction.SET_VISIBILITY_TIMELINE]: { asset: TimelineAsset };
 };
diff --git a/web/src/lib/components/asset-viewer/actions/remove-asset-from-stack.svelte b/web/src/lib/components/asset-viewer/actions/remove-asset-from-stack.svelte
new file mode 100644
index 0000000000..0c77f3a1a6
--- /dev/null
+++ b/web/src/lib/components/asset-viewer/actions/remove-asset-from-stack.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+  import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
+
+  import { AssetAction } from '$lib/constants';
+  import { removeAssetFromStack, type AssetResponseDto, type StackResponseDto } from '@immich/sdk';
+  import { mdiImageMinusOutline } from '@mdi/js';
+  import { t } from 'svelte-i18n';
+  import type { OnAction } from './action';
+
+  interface Props {
+    asset: AssetResponseDto;
+    stack: StackResponseDto;
+    onAction: OnAction;
+  }
+
+  let { asset, stack, onAction }: Props = $props();
+
+  const handleRemoveFromStack = async () => {
+    await removeAssetFromStack({
+      id: stack.id,
+      assetId: asset.id,
+    });
+    const updatedStack = {
+      ...stack,
+      assets: stack.assets.filter((a) => a.id !== asset.id),
+    };
+    onAction({ type: AssetAction.REMOVE_ASSET_FROM_STACK, stack: updatedStack, asset });
+  };
+</script>
+
+<MenuOption icon={mdiImageMinusOutline} onClick={handleRemoveFromStack} text={$t('viewer_remove_from_stack')} />
diff --git a/web/src/lib/components/asset-viewer/actions/unstack-action.svelte b/web/src/lib/components/asset-viewer/actions/unstack-action.svelte
index 1adeead05f..0c8192a9e3 100644
--- a/web/src/lib/components/asset-viewer/actions/unstack-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/unstack-action.svelte
@@ -4,7 +4,7 @@
   import { deleteStack } from '$lib/utils/asset-utils';
   import { toTimelineAsset } from '$lib/utils/timeline-util';
   import type { StackResponseDto } from '@immich/sdk';
-  import { mdiImageMinusOutline } from '@mdi/js';
+  import { mdiImageOffOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { OnAction } from './action';
 
@@ -23,4 +23,4 @@
   };
 </script>
 
-<MenuOption icon={mdiImageMinusOutline} onClick={handleUnstack} text={$t('unstack')} />
+<MenuOption icon={mdiImageOffOutline} onClick={handleUnstack} text={$t('unstack')} />
diff --git a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
index a376c37139..66061ebb01 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
@@ -9,6 +9,7 @@
   import DownloadAction from '$lib/components/asset-viewer/actions/download-action.svelte';
   import FavoriteAction from '$lib/components/asset-viewer/actions/favorite-action.svelte';
   import KeepThisDeleteOthersAction from '$lib/components/asset-viewer/actions/keep-this-delete-others.svelte';
+  import RemoveAssetFromStack from '$lib/components/asset-viewer/actions/remove-asset-from-stack.svelte';
   import RestoreAction from '$lib/components/asset-viewer/actions/restore-action.svelte';
   import SetAlbumCoverAction from '$lib/components/asset-viewer/actions/set-album-cover-action.svelte';
   import SetFeaturedPhotoAction from '$lib/components/asset-viewer/actions/set-person-featured-action.svelte';
@@ -195,6 +196,9 @@
             <KeepThisDeleteOthersAction {stack} {asset} {onAction} />
             {#if stack?.primaryAssetId !== asset.id}
               <SetStackPrimaryAsset {stack} {asset} {onAction} />
+              {#if stack?.assets?.length > 2}
+                <RemoveAssetFromStack {asset} {stack} {onAction} />
+              {/if}
             {/if}
           {/if}
           {#if album}
diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte
index 4f793e7b52..d82b2e6532 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte
@@ -328,6 +328,13 @@
         await handleGetAllAlbums();
         break;
       }
+      case AssetAction.REMOVE_ASSET_FROM_STACK: {
+        stack = action.stack;
+        if (stack) {
+          asset = stack.assets[0];
+        }
+        break;
+      }
       case AssetAction.SET_STACK_PRIMARY_ASSET: {
         stack = action.stack;
         break;
diff --git a/web/src/lib/components/photos-page/actions/stack-action.svelte b/web/src/lib/components/photos-page/actions/stack-action.svelte
index 1e817d9e61..8ed3dea22c 100644
--- a/web/src/lib/components/photos-page/actions/stack-action.svelte
+++ b/web/src/lib/components/photos-page/actions/stack-action.svelte
@@ -4,7 +4,7 @@
   import type { OnStack, OnUnstack } from '$lib/utils/actions';
   import { deleteStack, stackAssets } from '$lib/utils/asset-utils';
   import { toTimelineAsset } from '$lib/utils/timeline-util';
-  import { mdiImageMinusOutline, mdiImageMultipleOutline } from '@mdi/js';
+  import { mdiImageMultipleOutline, mdiImageOffOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
   interface Props {
@@ -42,7 +42,7 @@
 </script>
 
 {#if unstack}
-  <MenuOption text={$t('unstack')} icon={mdiImageMinusOutline} onClick={handleUnstack} />
+  <MenuOption text={$t('unstack')} icon={mdiImageOffOutline} onClick={handleUnstack} />
 {:else}
   <MenuOption text={$t('stack')} icon={mdiImageMultipleOutline} onClick={handleStack} />
 {/if}
diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelte
index 2d40857f99..182b24f3eb 100644
--- a/web/src/lib/components/photos-page/asset-grid.svelte
+++ b/web/src/lib/components/photos-page/asset-grid.svelte
@@ -523,6 +523,23 @@
         updateUnstackedAssetInTimeline(timelineManager, action.assets);
         break;
       }
+      case AssetAction.REMOVE_ASSET_FROM_STACK: {
+        timelineManager.addAssets([toTimelineAsset(action.asset)]);
+        if (action.stack) {
+          //Have to unstack then restack assets in timeline in order to update the stack count in the timeline.
+          updateUnstackedAssetInTimeline(
+            timelineManager,
+            action.stack.assets.map((asset) => toTimelineAsset(asset)),
+          );
+          updateStackedAssetInTimeline(timelineManager, {
+            stack: action.stack,
+            toDeleteIds: action.stack.assets
+              .filter((asset) => asset.id !== action.stack?.primaryAssetId)
+              .map((asset) => asset.id),
+          });
+        }
+        break;
+      }
       case AssetAction.SET_STACK_PRIMARY_ASSET: {
         //Have to unstack then restack assets in timeline in order for the currently removed new primary asset to be made visible.
         updateUnstackedAssetInTimeline(
diff --git a/web/src/lib/constants.ts b/web/src/lib/constants.ts
index 1a40f8522e..b354989e17 100644
--- a/web/src/lib/constants.ts
+++ b/web/src/lib/constants.ts
@@ -11,6 +11,7 @@ export enum AssetAction {
   UNSTACK = 'unstack',
   KEEP_THIS_DELETE_OTHERS = 'keep-this-delete-others',
   SET_STACK_PRIMARY_ASSET = 'set-stack-primary-asset',
+  REMOVE_ASSET_FROM_STACK = 'remove-asset-from-stack',
   SET_VISIBILITY_LOCKED = 'set-visibility-locked',
   SET_VISIBILITY_TIMELINE = 'set-visibility-timeline',
 }

From c7853fbe9d59b97ac2480a2e4ad105960bac1a8a Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 22 Jul 2025 23:21:58 -0500
Subject: [PATCH 281/337] chore: refactor download group (#20099)

---
 mobile/lib/constants/constants.dart              |  3 +++
 mobile/lib/main.dart                             |  8 ++++----
 mobile/lib/repositories/download.repository.dart | 16 ++++++++--------
 mobile/lib/services/download.service.dart        |  8 ++++----
 mobile/lib/utils/download.dart                   |  3 ---
 5 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 mobile/lib/utils/download.dart

diff --git a/mobile/lib/constants/constants.dart b/mobile/lib/constants/constants.dart
index b54a1e9ca2..b3d9d138c4 100644
--- a/mobile/lib/constants/constants.dart
+++ b/mobile/lib/constants/constants.dart
@@ -20,6 +20,9 @@ const String kSecuredPinCode = "secured_pin_code";
 const String kManualUploadGroup = 'manual_upload_group';
 const String kBackupGroup = 'backup_group';
 const String kBackupLivePhotoGroup = 'backup_live_photo_group';
+const String kDownloadGroupImage = 'group_image';
+const String kDownloadGroupVideo = 'group_video';
+const String kDownloadGroupLivePhoto = 'group_livephoto';
 
 // Timeline constants
 const int kTimelineNoneSegmentSize = 120;
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index f036fd9bc3..9f39a89b33 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -10,6 +10,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/constants/locales.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
@@ -29,7 +30,6 @@ import 'package:immich_mobile/theme/dynamic_theme.dart';
 import 'package:immich_mobile/theme/theme_data.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/cache/widgets_binding.dart';
-import 'package:immich_mobile/utils/download.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/utils/licenses.dart';
 import 'package:immich_mobile/utils/migration.dart';
@@ -101,7 +101,7 @@ Future<void> initApp() async {
   );
 
   await FileDownloader().trackTasksInGroup(
-    downloadGroupLivePhoto,
+    kDownloadGroupLivePhoto,
     markDownloadedComplete: false,
   );
 
@@ -179,7 +179,7 @@ class ImmichAppState extends ConsumerState<ImmichApp>
 
   void _configureFileDownloaderNotifications() {
     FileDownloader().configureNotificationForGroup(
-      downloadGroupImage,
+      kDownloadGroupImage,
       running: TaskNotification(
         'downloading_media'.tr(),
         '${'file_name'.tr()}: {filename}',
@@ -192,7 +192,7 @@ class ImmichAppState extends ConsumerState<ImmichApp>
     );
 
     FileDownloader().configureNotificationForGroup(
-      downloadGroupVideo,
+      kDownloadGroupVideo,
       running: TaskNotification(
         'downloading_media'.tr(),
         '${'file_name'.tr()}: {filename}',
diff --git a/mobile/lib/repositories/download.repository.dart b/mobile/lib/repositories/download.repository.dart
index f1dae3c251..a1ad4ee3d9 100644
--- a/mobile/lib/repositories/download.repository.dart
+++ b/mobile/lib/repositories/download.repository.dart
@@ -4,10 +4,10 @@ import 'dart:io';
 import 'package:background_downloader/background_downloader.dart';
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/utils/download.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 
 final downloadRepositoryProvider = Provider((ref) => DownloadRepository());
@@ -33,19 +33,19 @@ class DownloadRepository {
 
   DownloadRepository() {
     _downloader.registerCallbacks(
-      group: downloadGroupImage,
+      group: kDownloadGroupImage,
       taskStatusCallback: (update) => onImageDownloadStatus?.call(update),
       taskProgressCallback: (update) => onTaskProgress?.call(update),
     );
 
     _downloader.registerCallbacks(
-      group: downloadGroupVideo,
+      group: kDownloadGroupVideo,
       taskStatusCallback: (update) => onVideoDownloadStatus?.call(update),
       taskProgressCallback: (update) => onTaskProgress?.call(update),
     );
 
     _downloader.registerCallbacks(
-      group: downloadGroupLivePhoto,
+      group: kDownloadGroupLivePhoto,
       taskStatusCallback: (update) => onLivePhotoDownloadStatus?.call(update),
       taskProgressCallback: (update) => onTaskProgress?.call(update),
     );
@@ -66,7 +66,7 @@ class DownloadRepository {
   Future<List<TaskRecord>> getLiveVideoTasks() {
     return _downloader.database.allRecordsWithStatus(
       TaskStatus.complete,
-      group: downloadGroupLivePhoto,
+      group: kDownloadGroupLivePhoto,
     );
   }
 
@@ -100,7 +100,7 @@ class DownloadRepository {
           headers: headers,
           filename: asset.name,
           updates: Updates.statusAndProgress,
-          group: isVideo ? downloadGroupVideo : downloadGroupImage,
+          group: isVideo ? kDownloadGroupVideo : kDownloadGroupImage,
         );
         continue;
       }
@@ -113,7 +113,7 @@ class DownloadRepository {
         headers: headers,
         filename: asset.name,
         updates: Updates.statusAndProgress,
-        group: downloadGroupLivePhoto,
+        group: kDownloadGroupLivePhoto,
         metaData: json.encode(_dummyMetadata),
       );
 
@@ -126,7 +126,7 @@ class DownloadRepository {
             .toUpperCase()
             .replaceAll(RegExp(r"\.(JPG|HEIC)$"), '.MOV'),
         updates: Updates.statusAndProgress,
-        group: downloadGroupLivePhoto,
+        group: kDownloadGroupLivePhoto,
         metaData: json.encode(_dummyMetadata),
       );
     }
diff --git a/mobile/lib/services/download.service.dart b/mobile/lib/services/download.service.dart
index 98f1765d04..fbd3f406fd 100644
--- a/mobile/lib/services/download.service.dart
+++ b/mobile/lib/services/download.service.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:background_downloader/background_downloader.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
@@ -10,7 +11,6 @@ import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/repositories/download.repository.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/utils/download.dart';
 import 'package:logging/logging.dart';
 
 final downloadServiceProvider = Provider(
@@ -173,7 +173,7 @@ class DownloadService {
         _buildDownloadTask(
           asset.remoteId!,
           asset.fileName,
-          group: downloadGroupLivePhoto,
+          group: kDownloadGroupLivePhoto,
           metadata: LivePhotosMetadata(
             part: LivePhotosPart.image,
             id: asset.remoteId!,
@@ -184,7 +184,7 @@ class DownloadService {
           asset.fileName
               .toUpperCase()
               .replaceAll(RegExp(r"\.(JPG|HEIC)$"), '.MOV'),
-          group: downloadGroupLivePhoto,
+          group: kDownloadGroupLivePhoto,
           metadata: LivePhotosMetadata(
             part: LivePhotosPart.video,
             id: asset.remoteId!,
@@ -201,7 +201,7 @@ class DownloadService {
       _buildDownloadTask(
         asset.remoteId!,
         asset.fileName,
-        group: asset.isImage ? downloadGroupImage : downloadGroupVideo,
+        group: asset.isImage ? kDownloadGroupImage : kDownloadGroupVideo,
       ),
     ];
   }
diff --git a/mobile/lib/utils/download.dart b/mobile/lib/utils/download.dart
deleted file mode 100644
index c701f353a2..0000000000
--- a/mobile/lib/utils/download.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-const downloadGroupImage = 'group_image';
-const downloadGroupVideo = 'group_video';
-const downloadGroupLivePhoto = 'group_livephoto';

From c91382625cf3939a35bc74d8da9e651a0031a17e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 23 Jul 2025 13:26:28 +0100
Subject: [PATCH 282/337] fix(deps): update typescript-projects (#20103)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Zack Pollard <zackpollard@ymail.com>
---
 e2e/package-lock.json    |   6 +-
 server/package-lock.json | 447 +++++++++++++++++++--------------------
 server/package.json      |   4 +-
 3 files changed, 223 insertions(+), 234 deletions(-)

diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index 3ff7670739..278d3a7f93 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -5192,9 +5192,9 @@
       }
     },
     "node_modules/oidc-provider": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/oidc-provider/-/oidc-provider-9.3.0.tgz",
-      "integrity": "sha512-JVocwYM+Fs76nOCED2hMf3iMfrzhN4jISmCYVuFhBEnZiFk3QlODzQXkO1XS/Spw8VwRlKxwIl3otkiintFIjw==",
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/oidc-provider/-/oidc-provider-9.4.0.tgz",
+      "integrity": "sha512-1mEUejJq7cQV/b6cw2nitqOyIlOJTfQ6RNwGFcA7/Pp+vKIWBn8p48ylFtogP3Hbvrkf9s9W5HUeFe+v1KpcEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/server/package-lock.json b/server/package-lock.json
index 207776873e..c0c048c554 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -54,7 +54,7 @@
         "i18n-iso-countries": "^7.6.0",
         "ioredis": "^5.3.2",
         "js-yaml": "^4.1.0",
-        "kysely": "^0.28.0",
+        "kysely": "^0.28.2",
         "kysely-postgres-js": "^2.0.0",
         "lodash": "^4.17.21",
         "luxon": "^3.4.2",
@@ -297,6 +297,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@angular-devkit/schematics-cli/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/@angular-devkit/schematics-cli/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -369,6 +382,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@angular-devkit/schematics/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -1159,9 +1185,9 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
-      "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
+      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1209,9 +1235,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.30.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz",
-      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
+      "integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1245,19 +1271,6 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.0.tgz",
-      "integrity": "sha512-b7ePw78tEWWkpgZCDYkbqDOP8dmM6qe+AOC6iuJqlq1R/0ahMAeH3qynpnqKFGkMltrp44ohV4ubGyvLX28tzw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@types/json-schema": "^7.0.15"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
     "node_modules/@golevelup/nestjs-discovery": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@golevelup/nestjs-discovery/-/nestjs-discovery-4.0.3.tgz",
@@ -2736,6 +2749,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@nestjs/cli/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/@nestjs/cli/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -2757,9 +2783,9 @@
       }
     },
     "node_modules/@nestjs/common": {
-      "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-11.1.3.tgz",
-      "integrity": "sha512-ogEK+GriWodIwCw6buQ1rpcH4Kx+G7YQ9EwuPySI3rS05pSdtQ++UhucjusSI9apNidv+QURBztJkRecwwJQXg==",
+      "version": "11.1.5",
+      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-11.1.5.tgz",
+      "integrity": "sha512-DQpWdr3ShO0BHWkHl3I4W/jR6R3pDtxyBlmrpTuZF+PXxQyBXNvsUne0Wyo6QHPEDi+pAz9XchBFoKbqOhcdTg==",
       "license": "MIT",
       "dependencies": {
         "file-type": "21.0.0",
@@ -2788,9 +2814,9 @@
       }
     },
     "node_modules/@nestjs/core": {
-      "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-11.1.3.tgz",
-      "integrity": "sha512-5lTni0TCh8x7bXETRD57pQFnKnEg1T6M+VLE7wAmyQRIecKQU+2inRGZD+A4v2DC1I04eA0WffP0GKLxjOKlzw==",
+      "version": "11.1.5",
+      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-11.1.5.tgz",
+      "integrity": "sha512-Qr25MEY9t8VsMETy7eXQ0cNXqu0lzuFrrTr+f+1G57ABCtV5Pogm7n9bF71OU2bnkDD32Bi4hQLeFR90cku3Tw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -2862,14 +2888,14 @@
       }
     },
     "node_modules/@nestjs/platform-express": {
-      "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-11.1.3.tgz",
-      "integrity": "sha512-hEDNMlaPiBO72fxxX/CuRQL3MEhKRc/sIYGVoXjrnw6hTxZdezvvM6A95UaLsYknfmcZZa/CdG1SMBZOu9agHQ==",
+      "version": "11.1.5",
+      "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-11.1.5.tgz",
+      "integrity": "sha512-OsoiUBY9Shs5IG3uvDIt9/IDfY5OlvWBESuB/K4Eun8xILw1EK5d5qMfC3d2sIJ+kA3l+kBR1d/RuzH7VprLIg==",
       "license": "MIT",
       "dependencies": {
         "cors": "2.8.5",
         "express": "5.1.0",
-        "multer": "2.0.1",
+        "multer": "2.0.2",
         "path-to-regexp": "8.2.0",
         "tslib": "2.8.1"
       },
@@ -2882,71 +2908,10 @@
         "@nestjs/core": "^11.0.0"
       }
     },
-    "node_modules/@nestjs/platform-express/node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/@nestjs/platform-express/node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/@nestjs/platform-express/node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/@nestjs/platform-express/node_modules/multer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
-      "integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
-      "license": "MIT",
-      "dependencies": {
-        "append-field": "^1.0.0",
-        "busboy": "^1.6.0",
-        "concat-stream": "^2.0.0",
-        "mkdirp": "^0.5.6",
-        "object-assign": "^4.1.1",
-        "type-is": "^1.6.18",
-        "xtend": "^4.0.2"
-      },
-      "engines": {
-        "node": ">= 10.16.0"
-      }
-    },
-    "node_modules/@nestjs/platform-express/node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "license": "MIT",
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/@nestjs/platform-socket.io": {
-      "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/@nestjs/platform-socket.io/-/platform-socket.io-11.1.3.tgz",
-      "integrity": "sha512-jQ+ccprmh3kKolBp+bb97zoaS3vKaiyeNqyctGqV4CSG8P6mXSaaUObWxAsw6Jdgn5YQAVEBWJ6FhvF4s6QZbg==",
+      "version": "11.1.5",
+      "resolved": "https://registry.npmjs.org/@nestjs/platform-socket.io/-/platform-socket.io-11.1.5.tgz",
+      "integrity": "sha512-DY3zNY+BjbrYpV/t8HL8ptrusrWK8J0cfkfY1iZsfCd+0/1+j8IKno+QMLkerNQAZ7/Frh5tkaKHVwWk18TkMw==",
       "license": "MIT",
       "dependencies": {
         "socket.io": "4.8.1",
@@ -3063,6 +3028,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@nestjs/schematics/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/@nestjs/schematics/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -3117,9 +3095,9 @@
       }
     },
     "node_modules/@nestjs/testing": {
-      "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/@nestjs/testing/-/testing-11.1.3.tgz",
-      "integrity": "sha512-CeXG6/eEqgFIkPkmU00y18Dd3DLOIDFhPItzJK1SWckKo6IhcnfoRJzGx75bmuvUMjb51j6An96S/+MJ2ty9jA==",
+      "version": "11.1.5",
+      "resolved": "https://registry.npmjs.org/@nestjs/testing/-/testing-11.1.5.tgz",
+      "integrity": "sha512-ZYRYF750SefmuIo7ZqPlHDcin1OHh6My0OkOfGEFjrD9mJ0vMVIpwMTOOkpzCfCcpqUuxeHBuecpiIn+NLrQbQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3145,9 +3123,9 @@
       }
     },
     "node_modules/@nestjs/websockets": {
-      "version": "11.1.3",
-      "resolved": "https://registry.npmjs.org/@nestjs/websockets/-/websockets-11.1.3.tgz",
-      "integrity": "sha512-IjhWKfRf0D247JxYIEs8USblJJbcxUsKJpzbCPaZ7TrVy4LrpG3IRQDlSTOw599TRIYP5ixyH9C0+v5DyaI9uA==",
+      "version": "11.1.5",
+      "resolved": "https://registry.npmjs.org/@nestjs/websockets/-/websockets-11.1.5.tgz",
+      "integrity": "sha512-mAM11HwyS7aeSUbXdOqHbNCRoHwB0OOb+cmx5sgxvszhdG0Y6bwR60nKA4+EXL9xUEeWoxmbfLmSHlTSIJ9GKA==",
       "license": "MIT",
       "dependencies": {
         "iterare": "1.2.1",
@@ -5838,9 +5816,9 @@
       }
     },
     "node_modules/@opentelemetry/semantic-conventions": {
-      "version": "1.34.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.34.0.tgz",
-      "integrity": "sha512-aKcOkyrorBGlajjRdVoJWHTxfxO1vCNHLJVlSDaRHDIdjU+pX8IYQPvPDkYiujKLbRnWU+1TBwEt0QRgSm4SGA==",
+      "version": "1.36.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.36.0.tgz",
+      "integrity": "sha512-TtxJSRD8Ohxp6bKkhrm27JRHAxPczQA7idtcTOMYI+wQRRrfgqxHv1cFbCApcSnNjtXkmzFozn6jQtFrOmbjPQ==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=14"
@@ -6627,9 +6605,9 @@
       "license": "MIT"
     },
     "node_modules/@swc/core": {
-      "version": "1.12.11",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.12.11.tgz",
-      "integrity": "sha512-P3GM+0lqjFctcp5HhR9mOcvLSX3SptI9L1aux0Fuvgt8oH4f92rCUrkodAa0U2ktmdjcyIiG37xg2mb/dSCYSA==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.13.0.tgz",
+      "integrity": "sha512-7Fh16ZH/Rj3Di720if+sw9BictD4N5kbTpsyDC+URXhvsZ7qRt1lH7PaeIQYyJJQHwFhoKpwwGxfGU9SHgPLdw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
@@ -6645,16 +6623,16 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.12.11",
-        "@swc/core-darwin-x64": "1.12.11",
-        "@swc/core-linux-arm-gnueabihf": "1.12.11",
-        "@swc/core-linux-arm64-gnu": "1.12.11",
-        "@swc/core-linux-arm64-musl": "1.12.11",
-        "@swc/core-linux-x64-gnu": "1.12.11",
-        "@swc/core-linux-x64-musl": "1.12.11",
-        "@swc/core-win32-arm64-msvc": "1.12.11",
-        "@swc/core-win32-ia32-msvc": "1.12.11",
-        "@swc/core-win32-x64-msvc": "1.12.11"
+        "@swc/core-darwin-arm64": "1.13.0",
+        "@swc/core-darwin-x64": "1.13.0",
+        "@swc/core-linux-arm-gnueabihf": "1.13.0",
+        "@swc/core-linux-arm64-gnu": "1.13.0",
+        "@swc/core-linux-arm64-musl": "1.13.0",
+        "@swc/core-linux-x64-gnu": "1.13.0",
+        "@swc/core-linux-x64-musl": "1.13.0",
+        "@swc/core-win32-arm64-msvc": "1.13.0",
+        "@swc/core-win32-ia32-msvc": "1.13.0",
+        "@swc/core-win32-x64-msvc": "1.13.0"
       },
       "peerDependencies": {
         "@swc/helpers": ">=0.5.17"
@@ -6666,9 +6644,9 @@
       }
     },
     "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.12.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.12.11.tgz",
-      "integrity": "sha512-J19Jj9Y5x/N0loExH7W0OI9OwwoVyxutDdkyq1o/kgXyBqmmzV7Y/Q9QekI2Fm/qc5mNeAdP7aj4boY4AY/JPw==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.13.0.tgz",
+      "integrity": "sha512-SkmR9u7MHDu2X8hf7SjZTmsAfQTmel0mi+TJ7AGtufLwGySv6pwQfJ/CIJpcPxYENVqDJAFnDrHaKV8mgA6kxQ==",
       "cpu": [
         "arm64"
       ],
@@ -6683,9 +6661,9 @@
       }
     },
     "node_modules/@swc/core-darwin-x64": {
-      "version": "1.12.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.12.11.tgz",
-      "integrity": "sha512-PTuUQrfStQ6cjW+uprGO2lpQHy84/l0v+GqRqq8s/jdK55rFRjMfCeyf6FAR0l6saO5oNOQl+zWR1aNpj8pMQw==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.13.0.tgz",
+      "integrity": "sha512-15/SyDjXRtFJ09fYHBXUXrj4tpiSpCkjgsF1z3/sSpHH1POWpQUQzxmFyomPQVZ/SsDqP18WGH09Vph4Qriuiw==",
       "cpu": [
         "x64"
       ],
@@ -6700,9 +6678,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.12.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.12.11.tgz",
-      "integrity": "sha512-poxBq152HsupOtnZilenvHmxZ9a8SRj4LtfxUnkMDNOGrZR9oxbQNwEzNKfi3RXEcXz+P8c0Rai1ubBazXv8oQ==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.13.0.tgz",
+      "integrity": "sha512-AHauVHZQEJI/dCZQg6VYNNQ6HROz8dSOnCSheXzzBw1DGWo77BlcxRP0fF0jaAXM9WNqtCUOY1HiJ9ohkAE61Q==",
       "cpu": [
         "arm"
       ],
@@ -6717,9 +6695,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.12.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.12.11.tgz",
-      "integrity": "sha512-y1HNamR/D0Hc8xIE910ysyLe269UYiGaQPoLjQS0phzWFfWdMj9bHM++oydVXZ4RSWycO7KyJ3uvw4NilvyMKQ==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.13.0.tgz",
+      "integrity": "sha512-qyZmBZF7asF6954/x7yn6R7Bzd45KRG05rK2atIF9J3MTa8az7vubP1Q3BWmmss1j8699DELpbuoJucGuhsNXw==",
       "cpu": [
         "arm64"
       ],
@@ -6734,9 +6712,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.12.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.12.11.tgz",
-      "integrity": "sha512-LlBxPh/32pyQsu2emMEOFRm7poEFLsw12Y1mPY7FWZiZeptomKSOSHRzKDz9EolMiV4qhK1caP1lvW4vminYgQ==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.13.0.tgz",
+      "integrity": "sha512-whskQCOUlLQT7MjnronpHmyHegBka5ig9JkQvecbqhWzRfdwN+c2xTJs3kQsWy2Vc2f1hcL3D8hGIwY5TwPxMQ==",
       "cpu": [
         "arm64"
       ],
@@ -6751,9 +6729,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.12.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.12.11.tgz",
-      "integrity": "sha512-bOjiZB8O/1AzHkzjge1jqX62HGRIpOHqFUrGPfAln/NC6NR+Z2A78u3ixV7k5KesWZFhCV0YVGJL+qToL27myA==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.13.0.tgz",
+      "integrity": "sha512-51n4P4nv6rblXyH3zCEktvmR9uSAZ7+zbfeby0sxbj8LS/IKuVd7iCwD5dwMj4CxG9Fs+HgjN73dLQF/OerHhg==",
       "cpu": [
         "x64"
       ],
@@ -6768,9 +6746,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.12.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.12.11.tgz",
-      "integrity": "sha512-4dzAtbT/m3/UjF045+33gLiHd8aSXJDoqof7gTtu4q0ZyAf7XJ3HHspz+/AvOJLVo4FHHdFcdXhmo/zi1nFn8A==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.13.0.tgz",
+      "integrity": "sha512-VMqelgvnXs27eQyhDf1S2O2MxSdchIH7c1tkxODRtu9eotcAeniNNgqqLjZ5ML0MGeRk/WpbsAY/GWi7eSpiHw==",
       "cpu": [
         "x64"
       ],
@@ -6785,9 +6763,9 @@
       }
     },
     "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.12.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.12.11.tgz",
-      "integrity": "sha512-h8HiwBZErKvCAmjW92JvQp0iOqm6bncU4ac5jxBGkRApabpUenNJcj3h2g5O6GL5K6T9/WhnXE5gyq/s1fhPQg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.13.0.tgz",
+      "integrity": "sha512-NLJmseWJngWeENgat+O/WB4ptNxtx2X4OfPnSG5a/A4sxcn2E4jq91OPvbeUQwDkH+ZQWKXmbXFzt7Nn661QYA==",
       "cpu": [
         "arm64"
       ],
@@ -6802,9 +6780,9 @@
       }
     },
     "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.12.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.12.11.tgz",
-      "integrity": "sha512-1pwr325mXRNUhxTtXmx1IokV5SiRL+6iDvnt3FRXj+X5UvXXKtg2zeyftk+03u8v8v8WUr5I32hIypVJPTNxNg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.13.0.tgz",
+      "integrity": "sha512-UBfwrp0xW37KQGTA08mwrCLIm1ZKy6pXK8IVwou7BvhMgrItRNweTGyUrCnvDLUfyYFuJCmzcEaJ3NudtctD6g==",
       "cpu": [
         "ia32"
       ],
@@ -6819,9 +6797,9 @@
       }
     },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.12.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.12.11.tgz",
-      "integrity": "sha512-5gggWo690Gvs7XiPxAmb5tHwzB9RTVXUV7AWoGb6bmyUd1OXYaebQF0HAOtade5jIoNhfQMQJ7QReRgt/d2jAA==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.13.0.tgz",
+      "integrity": "sha512-BAB1P7Z/y2EENsfsPytPnjIyBVRZN2WULY+s3ozW4QkGmYHde6XXG28n0ABTHhcIOmmR2VzM+uaW1x48laSimw==",
       "cpu": [
         "x64"
       ],
@@ -7500,17 +7478,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.36.0.tgz",
-      "integrity": "sha512-lZNihHUVB6ZZiPBNgOQGSxUASI7UJWhT8nHyUGCnaQ28XFCw98IfrMCG3rUl1uwUWoAvodJQby2KTs79UTcrAg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.37.0.tgz",
+      "integrity": "sha512-jsuVWeIkb6ggzB+wPCsR4e6loj+rM72ohW6IBn2C+5NCvfUVY8s33iFPySSVXqtm5Hu29Ne/9bnA0JmyLmgenA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/type-utils": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/type-utils": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -7524,7 +7502,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.36.0",
+        "@typescript-eslint/parser": "^8.37.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <5.9.0"
       }
@@ -7540,16 +7518,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.36.0.tgz",
-      "integrity": "sha512-FuYgkHwZLuPbZjQHzJXrtXreJdFMKl16BFYyRrLxDhWr6Qr7Kbcu2s1Yhu8tsiMXw1S0W1pjfFfYEt+R604s+Q==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.37.0.tgz",
+      "integrity": "sha512-kVIaQE9vrN9RLCQMQ3iyRlVJpTiDUY6woHGb30JDkfJErqrQEmtdWH3gV0PBAfGZgQXoqzXOO0T3K6ioApbbAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/typescript-estree": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -7565,14 +7543,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz",
-      "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.37.0.tgz",
+      "integrity": "sha512-BIUXYsbkl5A1aJDdYJCBAo8rCEbAvdquQ8AnLb6z5Lp1u3x5PNgSSx9A/zqYc++Xnr/0DVpls8iQ2cJs/izTXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.36.0",
-        "@typescript-eslint/types": "^8.36.0",
+        "@typescript-eslint/tsconfig-utils": "^8.37.0",
+        "@typescript-eslint/types": "^8.37.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -7587,14 +7565,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz",
-      "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.37.0.tgz",
+      "integrity": "sha512-0vGq0yiU1gbjKob2q691ybTg9JX6ShiVXAAfm2jGf3q0hdP6/BruaFjL/ManAR/lj05AvYCH+5bbVo0VtzmjOA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0"
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7605,9 +7583,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz",
-      "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.37.0.tgz",
+      "integrity": "sha512-1/YHvAVTimMM9mmlPvTec9NP4bobA1RkDbMydxG8omqwJJLEW/Iy2C4adsAESIXU3WGLXFHSZUU+C9EoFWl4Zg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7622,14 +7600,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.36.0.tgz",
-      "integrity": "sha512-5aaGYG8cVDd6cxfk/ynpYzxBRZJk7w/ymto6uiyUFtdCozQIsQWh7M28/6r57Fwkbweng8qAzoMCPwSJfWlmsg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.37.0.tgz",
+      "integrity": "sha512-SPkXWIkVZxhgwSwVq9rqj/4VFo7MnWwVaRNznfQDc/xPYHjXnPfLWn+4L6FF1cAz6e7dsqBeMawgl7QjUMj4Ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -7646,9 +7625,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz",
-      "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.37.0.tgz",
+      "integrity": "sha512-ax0nv7PUF9NOVPs+lmQ7yIE7IQmAf8LGcXbMvHX5Gm+YJUYNAl340XkGnrimxZ0elXyoQJuN5sbg6C4evKA4SQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7660,16 +7639,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz",
-      "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.37.0.tgz",
+      "integrity": "sha512-zuWDMDuzMRbQOM+bHyU4/slw27bAUEcKSKKs3hcv2aNnc/tvE/h7w60dwVw8vnal2Pub6RT1T7BI8tFZ1fE+yg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.36.0",
-        "@typescript-eslint/tsconfig-utils": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/visitor-keys": "8.36.0",
+        "@typescript-eslint/project-service": "8.37.0",
+        "@typescript-eslint/tsconfig-utils": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/visitor-keys": "8.37.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -7715,16 +7694,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz",
-      "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.37.0.tgz",
+      "integrity": "sha512-TSFvkIW6gGjN2p6zbXo20FzCABbyUAuq6tBvNRGsKdsSQ6a7rnV6ADfZ7f4iI3lIiXc4F4WWvtUfDw9CJ9pO5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.36.0",
-        "@typescript-eslint/types": "8.36.0",
-        "@typescript-eslint/typescript-estree": "8.36.0"
+        "@typescript-eslint/scope-manager": "8.37.0",
+        "@typescript-eslint/types": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7739,13 +7718,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz",
-      "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.37.0.tgz",
+      "integrity": "sha512-YzfhzcTnZVPiLfP/oeKtDp2evwvHLMe0LOy7oe+hb9KKIumLNohYS9Hgp1ifwpu42YWxhZE8yieggz6JpqO/1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.36.0",
+        "@typescript-eslint/types": "8.37.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -8905,9 +8884,9 @@
       }
     },
     "node_modules/bullmq": {
-      "version": "5.56.2",
-      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.56.2.tgz",
-      "integrity": "sha512-bq0PSxPCWeNlFBc5yjBs3eR+e6GxIEIeHY0xxq6WELzG65GPjL+A2ni1NS7NroKsur0C3UJdabw51IswiSTSYw==",
+      "version": "5.56.4",
+      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.56.4.tgz",
+      "integrity": "sha512-5wSHd0oXs2jS6P+6tay/01Iz0cWRK8iYcscKtpS/GewEq0bJZwbkMZc77GJVOT9SP+UQuXA2y+pQTdCQJel7kQ==",
       "license": "MIT",
       "dependencies": {
         "cron-parser": "^4.9.0",
@@ -9556,16 +9535,16 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
-      "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
+      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
       "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "compressible": "~2.0.18",
         "debug": "2.6.9",
         "negotiator": "~0.6.4",
-        "on-headers": "~1.0.2",
+        "on-headers": "~1.1.0",
         "safe-buffer": "5.2.1",
         "vary": "~1.1.2"
       },
@@ -9588,6 +9567,15 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
+    "node_modules/compression/node_modules/on-headers": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
+      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -10685,9 +10673,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.30.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz",
-      "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==",
+      "version": "9.31.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz",
+      "integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10695,9 +10683,9 @@
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.21.0",
         "@eslint/config-helpers": "^0.3.0",
-        "@eslint/core": "^0.14.0",
+        "@eslint/core": "^0.15.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.30.1",
+        "@eslint/js": "9.31.0",
         "@eslint/plugin-kit": "^0.3.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -13823,9 +13811,9 @@
       "license": "MIT"
     },
     "node_modules/nest-commander": {
-      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/nest-commander/-/nest-commander-3.17.0.tgz",
-      "integrity": "sha512-1R9vppZT2j/9njKiG0zYTDLAyQOj14KdGWdNuhluveK8VXoQepXNb0t09dRNWy4KCWrI7wDZ2tQTEwb43JyHOw==",
+      "version": "3.18.0",
+      "resolved": "https://registry.npmjs.org/nest-commander/-/nest-commander-3.18.0.tgz",
+      "integrity": "sha512-NWtodOl2aStnApWp9oajCoJW71lqN0CCjf9ygOWxpXnG3o4nQ8ZO5CgrExfVw2+0CVC877hr0rFR7FSu2rypGg==",
       "license": "MIT",
       "dependencies": {
         "@fig/complete-commander": "^3.0.0",
@@ -13926,9 +13914,9 @@
       "license": "MIT"
     },
     "node_modules/node-addon-api": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.4.0.tgz",
-      "integrity": "sha512-D9DI/gXHvVmjHS08SVch0Em8G5S1P+QWtU31appcKT/8wFSPRcdHadIFSAntdMMVM5zz+/DL+bL/gz3UDppqtg==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.5.0.tgz",
+      "integrity": "sha512-/bRZty2mXUIFY/xU5HLvveNHlswNJej+RnxBjOMkidWfwZzgTbPG1E3K5TOxRLOR+5hX7bSofy8yf1hZevMS8A==",
       "license": "MIT",
       "engines": {
         "node": "^18 || ^20 || >= 21"
@@ -14687,9 +14675,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -15397,9 +15385,9 @@
       }
     },
     "node_modules/react-email": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/react-email/-/react-email-4.1.0.tgz",
-      "integrity": "sha512-UvG5z1/gNOsLNwKPO87vgMoF7tdzUGd0kIy4fozzdBBsyLUju7hNVLBRm9j+Li/CwP5CXFT8Y5jZBtIFvSyr0w==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/react-email/-/react-email-4.2.3.tgz",
+      "integrity": "sha512-LUKyk9nNVFuTqAyp4yCEQFQjBe+s8nl3VauMWuOhBZ4VhGnimbrnv01U8yD2YwzaHKtytS0U659x5dc/0+xu+Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.27.0",
@@ -18447,15 +18435,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.36.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.36.0.tgz",
-      "integrity": "sha512-fTCqxthY+h9QbEgSIBfL9iV6CvKDFuoxg6bHPNpJ9HIUzS+jy2lCEyCmGyZRWEBSaykqcDPf1SJ+BfCI8DRopA==",
+      "version": "8.37.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.37.0.tgz",
+      "integrity": "sha512-TnbEjzkE9EmcO0Q2zM+GE8NQLItNAJpMmED1BdgoBMYNdqMhzlbqfdSwiRlAzEK2pA9UzVW0gzaaIzXWg2BjfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.36.0",
-        "@typescript-eslint/parser": "8.36.0",
-        "@typescript-eslint/utils": "8.36.0"
+        "@typescript-eslint/eslint-plugin": "8.37.0",
+        "@typescript-eslint/parser": "8.37.0",
+        "@typescript-eslint/typescript-estree": "8.37.0",
+        "@typescript-eslint/utils": "8.37.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/server/package.json b/server/package.json
index d461f1d767..5dbe83381a 100644
--- a/server/package.json
+++ b/server/package.json
@@ -79,7 +79,7 @@
     "i18n-iso-countries": "^7.6.0",
     "ioredis": "^5.3.2",
     "js-yaml": "^4.1.0",
-    "kysely": "^0.28.0",
+    "kysely": "^0.28.2",
     "kysely-postgres-js": "^2.0.0",
     "lodash": "^4.17.21",
     "luxon": "^3.4.2",
@@ -113,7 +113,6 @@
     "validator": "^13.12.0"
   },
   "devDependencies": {
-    "canvas": "^3.1.0",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.8.0",
     "@nestjs/cli": "^11.0.2",
@@ -146,6 +145,7 @@
     "@types/ua-parser-js": "^0.7.36",
     "@types/validator": "^13.15.2",
     "@vitest/coverage-v8": "^3.0.0",
+    "canvas": "^3.1.0",
     "eslint": "^9.14.0",
     "eslint-config-prettier": "^10.0.0",
     "eslint-plugin-prettier": "^5.1.3",

From 05d26dc68390b3831162bf09539b7270dd36875a Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Wed, 23 Jul 2025 18:53:49 +0530
Subject: [PATCH 283/337] fix: remove safe area from bottom bar (#20102)

* remove safe area from bottom bar

* fix: video not playing in search view

* stop foreground / background back on migration

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../pages/common/change_experience.page.dart  | 15 +++++++
 .../asset_viewer/bottom_bar.widget.dart       | 45 +++++++++----------
 .../asset_viewer/video_viewer.widget.dart     | 22 ++++++++-
 3 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/mobile/lib/pages/common/change_experience.page.dart b/mobile/lib/pages/common/change_experience.page.dart
index a8569b25a0..3cd545ea33 100644
--- a/mobile/lib/pages/common/change_experience.page.dart
+++ b/mobile/lib/pages/common/change_experience.page.dart
@@ -2,10 +2,14 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
 import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
+import 'package:immich_mobile/providers/backup/backup.provider.dart';
+import 'package:immich_mobile/providers/backup/manual_upload.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
@@ -43,6 +47,17 @@ class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
         albumNotifier.dispose();
       }
 
+      // Cancel uploads
+      await Store.put(StoreKey.backgroundBackup, false);
+      ref.read(backupProvider.notifier).configureBackgroundBackup(
+            enabled: false,
+            onBatteryInfo: () {},
+            onError: (_) {},
+          );
+      ref.read(backupProvider.notifier).setAutoBackup(false);
+      ref.read(backupProvider.notifier).cancelBackup();
+      ref.read(manualUploadProvider.notifier).cancelBackup();
+      // Start listening to new websocket events
       ref.read(websocketProvider.notifier).stopListenToOldEvents();
       ref.read(websocketProvider.notifier).startListeningToBetaEvents();
 
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
index d35a315f48..cb558804d2 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
@@ -50,31 +50,30 @@ class ViewerBottomBar extends ConsumerWidget {
           duration: Durations.short4,
           child: isSheetOpen
               ? const SizedBox.shrink()
-              : SafeArea(
-                  child: Theme(
-                    data: context.themeData.copyWith(
-                      iconTheme:
-                          const IconThemeData(size: 22, color: Colors.white),
-                      textTheme: context.themeData.textTheme.copyWith(
-                        labelLarge:
-                            context.themeData.textTheme.labelLarge?.copyWith(
-                          color: Colors.white,
-                        ),
+              : Theme(
+                  data: context.themeData.copyWith(
+                    iconTheme:
+                        const IconThemeData(size: 22, color: Colors.white),
+                    textTheme: context.themeData.textTheme.copyWith(
+                      labelLarge:
+                          context.themeData.textTheme.labelLarge?.copyWith(
+                        color: Colors.white,
                       ),
                     ),
-                    child: Container(
-                      height: asset.isVideo ? 160 : 80,
-                      color: Colors.black.withAlpha(125),
-                      child: Column(
-                        mainAxisAlignment: MainAxisAlignment.end,
-                        children: [
-                          if (asset.isVideo) const VideoControls(),
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                            children: actions,
-                          ),
-                        ],
-                      ),
+                  ),
+                  child: Container(
+                    height: context.padding.bottom + (asset.isVideo ? 160 : 80),
+                    color: Colors.black.withAlpha(125),
+                    padding: EdgeInsets.only(bottom: context.padding.bottom),
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.end,
+                      children: [
+                        if (asset.isVideo) const VideoControls(),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                          children: actions,
+                        ),
+                      ],
                     ),
                   ),
                 ),
diff --git a/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
index 17880da3e7..2accf465ed 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
@@ -27,6 +27,26 @@ import 'package:logging/logging.dart';
 import 'package:native_video_player/native_video_player.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
 
+bool _isCurrentAsset(
+  BaseAsset asset,
+  BaseAsset? currentAsset,
+) {
+  if (asset is RemoteAsset) {
+    return switch (currentAsset) {
+      RemoteAsset remoteAsset => remoteAsset.id == asset.id,
+      LocalAsset localAsset => localAsset.remoteId == asset.id,
+      _ => false,
+    };
+  } else if (asset is LocalAsset) {
+    return switch (currentAsset) {
+      RemoteAsset remoteAsset => remoteAsset.localId == asset.id,
+      LocalAsset localAsset => localAsset.id == asset.id,
+      _ => false,
+    };
+  }
+  return false;
+}
+
 class NativeVideoViewer extends HookConsumerWidget {
   final BaseAsset asset;
   final bool showControls;
@@ -56,7 +76,7 @@ class NativeVideoViewer extends HookConsumerWidget {
     // If the swipe is completed, `isCurrent` will be true for video B after a delay.
     // If the swipe is canceled, `currentAsset` will not have changed and video A will continue to play.
     final currentAsset = useState(ref.read(currentAssetNotifier));
-    final isCurrent = currentAsset.value == asset;
+    final isCurrent = _isCurrentAsset(asset, currentAsset.value);
 
     // Used to show the placeholder during hero animations for remote videos to avoid a stutter
     final isVisible = useState(Platform.isIOS && asset.hasLocal);

From 1d9cc4ca5f0dec7fe402f69d6a4016979fdf3beb Mon Sep 17 00:00:00 2001
From: "Weblate (bot)" <hosted@weblate.org>
Date: Wed, 23 Jul 2025 15:38:29 +0200
Subject: [PATCH 284/337] chore(web): update translations (#20082)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alberto Serluca <alberto.ser11@gmail.com>
Co-authored-by: DevServs <bonov@mail.ru>
Co-authored-by: Florian Ostertag <florian.kuepper@gmail.com>
Co-authored-by: Gilbert <thengilbert@gmail.com>
Co-authored-by: Indrek Haav <indrek.haav@hotmail.com>
Co-authored-by: Jozef Gaal <preklady@mayday.sk>
Co-authored-by: KecskeTech <teonyitas@gmail.com>
Co-authored-by: Kuno Claes <kuno@icodes.dev>
Co-authored-by: MSDNicrosoft <wang3311835119@hotmail.com>
Co-authored-by: Matjaž T <matjaz@moj-svet.si>
Co-authored-by: Mārtiņš Bruņenieks <martinsb@gmail.com>
Co-authored-by: Vegard Fladby <vegard@fladby.org>
Co-authored-by: adri1m64 <adrien.melle@laposte.net>
Co-authored-by: waclaw66 <waclaw66@seznam.cz>
---
 i18n/cs.json            |  23 +++++++-
 i18n/de.json            |  21 ++++++++
 i18n/et.json            |  23 +++++++-
 i18n/fr.json            |  28 ++++++++++
 i18n/hu.json            |  58 +++++++++++---------
 i18n/id.json            |  10 +++-
 i18n/it.json            |  12 +++++
 i18n/lv.json            |  11 ++++
 i18n/nb_NO.json         |  23 +++++++-
 i18n/nl.json            |  24 ++++++++-
 i18n/ru.json            |  47 +++++++++++-----
 i18n/sk.json            | 117 +++++++++++++++++++++++-----------------
 i18n/sl.json            |  25 ++++++++-
 i18n/zh_SIMPLIFIED.json |  23 +++++++-
 14 files changed, 350 insertions(+), 95 deletions(-)

diff --git a/i18n/cs.json b/i18n/cs.json
index c14a4b6d0c..80ea9674c0 100644
--- a/i18n/cs.json
+++ b/i18n/cs.json
@@ -573,6 +573,8 @@
   "backup_options_page_title": "Nastavení záloh",
   "backup_setting_subtitle": "Správa nastavení zálohování na pozadí a na popředí",
   "backward": "Pozpátku",
+  "beta_sync": "Stav synchronizace beta verze",
+  "beta_sync_subtitle": "Správa nového systému synchronizace",
   "biometric_auth_enabled": "Biometrické ověřování je povoleno",
   "biometric_locked_out": "Jste vyloučeni z biometrického ověřování",
   "biometric_no_options": "Biometrické možnosti nejsou k dispozici",
@@ -590,7 +592,7 @@
   "cache_settings_clear_cache_button": "Vymazat vyrovnávací paměť",
   "cache_settings_clear_cache_button_title": "Vymaže vyrovnávací paměť aplikace. To výrazně ovlivní výkon aplikace, dokud se vyrovnávací paměť neobnoví.",
   "cache_settings_duplicated_assets_clear_button": "VYMAZAT",
-  "cache_settings_duplicated_assets_subtitle": "Fotografie a videa, které aplikace zařadila na černou listinu",
+  "cache_settings_duplicated_assets_subtitle": "Fotografie a videa, které aplikace ignoruje",
   "cache_settings_duplicated_assets_title": "Duplicitní položky ({count})",
   "cache_settings_statistics_album": "Knihovna náhledů",
   "cache_settings_statistics_full": "Kompletní fotografie",
@@ -1051,6 +1053,9 @@
   "haptic_feedback_switch": "Povolit dotykovou zpětnou vazbu",
   "haptic_feedback_title": "Dotyková zpětná vazba",
   "has_quota": "Má kvótu",
+  "hash_asset": "Hash položky",
+  "hashed_assets": "Hashované položky",
+  "hashing": "Hashování",
   "header_settings_add_header_tip": "Přidat hlavičku",
   "header_settings_field_validator_msg": "Hodnota nemůže být prázdná",
   "header_settings_header_name_input": "Název hlavičky",
@@ -1083,6 +1088,7 @@
   "host": "Hostitel",
   "hour": "Hodina",
   "id": "ID",
+  "idle": "Nečinnost",
   "ignore_icloud_photos": "Ignorovat fotografie na iCloudu",
   "ignore_icloud_photos_description": "Fotografie uložené na iCloudu se nebudou nahrávat na Immich server",
   "image": "Obrázek",
@@ -1165,7 +1171,9 @@
   "list": "Seznam",
   "loading": "Načítání",
   "loading_search_results_failed": "Načítání výsledků vyhledávání se nezdařilo",
+  "local": "Místní",
   "local_asset_cast_failed": "Nelze odeslat položku, která není nahraná na serveru",
+  "local_assets": "Místní položky",
   "local_network": "Místní síť",
   "local_network_sheet_info": "Aplikace se při použití zadané sítě Wi-Fi připojí k serveru prostřednictvím tohoto URL",
   "location_permission": "Oprávnění polohy",
@@ -1322,6 +1330,7 @@
   "no_results": "Žádné výsledky",
   "no_results_description": "Zkuste použít synonymum nebo obecnější klíčové slovo",
   "no_shared_albums_message": "Vytvořte si album a sdílejte fotografie a videa s lidmi ve své síti",
+  "no_uploads_in_progress": "Neprobíhá žádné nahrávání",
   "not_in_any_album": "Bez alba",
   "not_selected": "Není vybráno",
   "note_apply_storage_label_to_previously_uploaded assets": "Upozornění: Chcete-li použít štítek úložiště na dříve nahrané položky, spusťte příkaz",
@@ -1359,6 +1368,7 @@
   "original": "originál",
   "other": "Ostatní",
   "other_devices": "Ostatní zařízení",
+  "other_entities": "Ostatní entity",
   "other_variables": "Další proměnné",
   "owned": "Vlastní",
   "owner": "Vlastník",
@@ -1519,6 +1529,8 @@
   "refreshing_faces": "Obnovování obličejů",
   "refreshing_metadata": "Obnovování metadat",
   "regenerating_thumbnails": "Regenerace miniatur",
+  "remote": "Vzdálený",
+  "remote_assets": "Vzdálené položky",
   "remove": "Odstranit",
   "remove_assets_album_confirmation": "Opravdu chcete z alba odstranit {count, plural, one {# položku} few {# položky} other {# položek}}?",
   "remove_assets_shared_link_confirmation": "Opravdu chcete ze sdíleného odkazu odstranit {count, plural, one {# položku} few {# položky} other {# položek}}?",
@@ -1556,11 +1568,15 @@
   "reset_password": "Obnovit heslo",
   "reset_people_visibility": "Obnovit viditelnost lidí",
   "reset_pin_code": "Resetovat PIN kód",
+  "reset_sqlite": "Obnovit SQLite databázi",
+  "reset_sqlite_confirmation": "Jste si jisti, že chcete obnovit SQLite databázi? Pro opětovnou synchronizaci dat se budete muset odhlásit a znovu přihlásit",
+  "reset_sqlite_success": "Obnovení SQLite databáze proběhlo úspěšně",
   "reset_to_default": "Obnovit výchozí nastavení",
   "resolve_duplicates": "Vyřešit duplicity",
   "resolved_all_duplicates": "Vyřešeny všechny duplicity",
   "restore": "Obnovit",
   "restore_all": "Obnovit vše",
+  "restore_trash_action_prompt": "{count} obnoveno z koše",
   "restore_user": "Obnovit uživatele",
   "restored_asset": "Položka obnovena",
   "resume": "Pokračovat",
@@ -1569,6 +1585,7 @@
   "role": "Role",
   "role_editor": "Editor",
   "role_viewer": "Divák",
+  "running": "Probíhá",
   "save": "Uložit",
   "save_to_gallery": "Uložit do galerie",
   "saved_api_key": "API klíč uložen",
@@ -1822,6 +1839,7 @@
   "storage_quota": "Kvóta úložiště",
   "storage_usage": "Využito {used} z {available}",
   "submit": "Odeslat",
+  "success": "Úspěch",
   "suggestions": "Návrhy",
   "sunrise_on_the_beach": "Východ slunce na pláži",
   "support": "Podpora",
@@ -1831,6 +1849,8 @@
   "sync": "Synchronizovat",
   "sync_albums": "Synchronizovat alba",
   "sync_albums_manual_subtitle": "Synchronizovat všechna nahraná videa a fotografie do vybraných záložních alb",
+  "sync_local": "Synchronizovat místní",
+  "sync_remote": "Synchronizovat vzdálené",
   "sync_upload_album_setting_subtitle": "Vytvořit a nahrát fotografie a videa do vybraných alb na Immich",
   "tag": "Značka",
   "tag_assets": "Přiřadit značku",
@@ -1841,6 +1861,7 @@
   "tag_updated": "Aktualizována značka: {tag}",
   "tagged_assets": "Přiřazena značka {count, plural, one {# položce} other {# položkám}}",
   "tags": "Značky",
+  "tap_to_run_job": "Klepnutím na spustíte úlohu",
   "template": "Šablona",
   "theme": "Motiv",
   "theme_selection": "Výběr motivu",
diff --git a/i18n/de.json b/i18n/de.json
index 79ba1251d5..45245b182b 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -573,6 +573,8 @@
   "backup_options_page_title": "Sicherungsoptionen",
   "backup_setting_subtitle": "Verwaltung der Upload-Einstellungen im Hintergrund und im Vordergrund",
   "backward": "Rückwärts",
+  "beta_sync": "Status des Beta Sync",
+  "beta_sync_subtitle": "Verwalte das neue Synchronisierungssystem",
   "biometric_auth_enabled": "Biometrische Authentifizierung aktiviert",
   "biometric_locked_out": "Du bist von der biometrischen Authentifizierung ausgeschlossen",
   "biometric_no_options": "Keine biometrischen Optionen verfügbar",
@@ -1051,6 +1053,9 @@
   "haptic_feedback_switch": "Haptisches Feedback aktivieren",
   "haptic_feedback_title": "Haptisches Feedback",
   "has_quota": "Kontingent",
+  "hash_asset": "Dateihash",
+  "hashed_assets": "Gehashte Dateien",
+  "hashing": "Hashen",
   "header_settings_add_header_tip": "Header hinzufügen",
   "header_settings_field_validator_msg": "Der Wert darf nicht leer sein",
   "header_settings_header_name_input": "Header-Name",
@@ -1083,6 +1088,7 @@
   "host": "Host",
   "hour": "Stunde",
   "id": "ID",
+  "idle": "Untätig",
   "ignore_icloud_photos": "iCloud Fotos ignorieren",
   "ignore_icloud_photos_description": "Fotos, die in der iCloud gespeichert sind, werden nicht auf den immich Server hochgeladen",
   "image": "Bild",
@@ -1165,7 +1171,9 @@
   "list": "Liste",
   "loading": "Laden",
   "loading_search_results_failed": "Laden von Suchergebnissen fehlgeschlagen",
+  "local": "Lokal",
   "local_asset_cast_failed": "Eine Datei, die nicht auf den Server hochgeladen wurde, kann nicht gecastet werden",
+  "local_assets": "Lokale Dateien",
   "local_network": "Lokales Netzwerk",
   "local_network_sheet_info": "Die App stellt über diese URL eine Verbindung zum Server her, wenn sie das angegebene WLAN-Netzwerk verwendet",
   "location_permission": "Standort Genehmigung",
@@ -1322,6 +1330,7 @@
   "no_results": "Keine Ergebnisse",
   "no_results_description": "Versuche es mit einem Synonym oder einem allgemeineren Stichwort",
   "no_shared_albums_message": "Erstelle ein Album, um Fotos und Videos mit Personen in deinem Netzwerk zu teilen",
+  "no_uploads_in_progress": "Kein Upload in Bearbeitung",
   "not_in_any_album": "In keinem Album",
   "not_selected": "Nicht ausgewählt",
   "note_apply_storage_label_to_previously_uploaded assets": "Hinweis: Um eine Speicherpfadbezeichnung anzuwenden, starte den",
@@ -1359,6 +1368,7 @@
   "original": "Original",
   "other": "Sonstiges",
   "other_devices": "Andere Geräte",
+  "other_entities": "Andere Entitäten",
   "other_variables": "Sonstige Variablen",
   "owned": "Eigenes",
   "owner": "Besitzer",
@@ -1519,6 +1529,8 @@
   "refreshing_faces": "Gesichter werden aktualisiert",
   "refreshing_metadata": "Metadaten werden aktualisiert",
   "regenerating_thumbnails": "Miniaturansichten werden neu erstellt",
+  "remote": "Entfernt",
+  "remote_assets": "Entfernte Dateien",
   "remove": "Entfernen",
   "remove_assets_album_confirmation": "Bist du sicher, dass du {count, plural, one {# Datei} other {# Dateien}} aus dem Album entfernen willst?",
   "remove_assets_shared_link_confirmation": "Bist du sicher, dass du {count, plural, one {# Datei} other {# Dateien}} von diesem geteilten Link entfernen willst?",
@@ -1556,11 +1568,15 @@
   "reset_password": "Passwort zurücksetzen",
   "reset_people_visibility": "Sichtbarkeit von Personen zurücksetzen",
   "reset_pin_code": "PIN Code zurücksetzen",
+  "reset_sqlite": "SQLite Datenbank zurücksetzen",
+  "reset_sqlite_confirmation": "Bist du sicher, dass du die SQLite-Datenbank zurücksetzen willst? Du musst dich ab- und wieder anmelden, um die Daten neu zu synchronisieren",
+  "reset_sqlite_success": "SQLite Datenbank erfolgreich zurückgesetzt",
   "reset_to_default": "Auf Standard zurücksetzen",
   "resolve_duplicates": "Duplikate entfernen",
   "resolved_all_duplicates": "Alle Duplikate aufgelöst",
   "restore": "Wiederherstellen",
   "restore_all": "Alle wiederherstellen",
+  "restore_trash_action_prompt": "{count} aus dem Papierkorb wiederhergestellt",
   "restore_user": "Nutzer wiederherstellen",
   "restored_asset": "Datei wiederhergestellt",
   "resume": "Fortsetzen",
@@ -1569,6 +1585,7 @@
   "role": "Rolle",
   "role_editor": "Bearbeiter",
   "role_viewer": "Betrachter",
+  "running": "Läuft",
   "save": "Speichern",
   "save_to_gallery": "In Galerie speichern",
   "saved_api_key": "API-Schlüssel wurde gespeichert",
@@ -1822,6 +1839,7 @@
   "storage_quota": "Speicherplatz-Kontingent",
   "storage_usage": "{used} von {available} verwendet",
   "submit": "Bestätigen",
+  "success": "Erfolgreich",
   "suggestions": "Vorschläge",
   "sunrise_on_the_beach": "Sonnenaufgang am Strand",
   "support": "Unterstützung",
@@ -1831,6 +1849,8 @@
   "sync": "Synchronisieren",
   "sync_albums": "Alben synchronisieren",
   "sync_albums_manual_subtitle": "Synchronisiere alle hochgeladenen Videos und Fotos in die ausgewählten Backup-Alben",
+  "sync_local": "Lokal synchronisieren",
+  "sync_remote": "Entfernt synchronisieren",
   "sync_upload_album_setting_subtitle": "Erstelle deine ausgewählten Alben in Immich und lade die Fotos und Videos dort hoch",
   "tag": "Tag",
   "tag_assets": "Dateien taggen",
@@ -1841,6 +1861,7 @@
   "tag_updated": "Tag aktualisiert: {tag}",
   "tagged_assets": "{count, plural, one {# Datei} other {# Dateien}} getagged",
   "tags": "Tags",
+  "tap_to_run_job": "Tippen um den Job zu starten",
   "template": "Vorlage",
   "theme": "Theme",
   "theme_selection": "Themenauswahl",
diff --git a/i18n/et.json b/i18n/et.json
index 804d0c6c46..1d293a3bdf 100644
--- a/i18n/et.json
+++ b/i18n/et.json
@@ -573,6 +573,8 @@
   "backup_options_page_title": "Varundamise valikud",
   "backup_setting_subtitle": "Halda taustal ja esiplaanil üleslaadimise seadeid",
   "backward": "Tagasi",
+  "beta_sync": "Beeta sünkroonimise staatus",
+  "beta_sync_subtitle": "Halda uut sünkroonimissüsteemi",
   "biometric_auth_enabled": "Biomeetriline autentimine lubatud",
   "biometric_locked_out": "Biomeetriline autentimine on blokeeritud",
   "biometric_no_options": "Biomeetrilisi valikuid ei ole",
@@ -590,7 +592,7 @@
   "cache_settings_clear_cache_button": "Tühjenda puhver",
   "cache_settings_clear_cache_button_title": "Tühjendab rakenduse puhvri. See mõjutab oluliselt rakenduse jõudlust, kuni puhver uuesti täidetakse.",
   "cache_settings_duplicated_assets_clear_button": "TÜHJENDA",
-  "cache_settings_duplicated_assets_subtitle": "Fotod ja videod, mis on rakenduse poolt mustfiltreeritud",
+  "cache_settings_duplicated_assets_subtitle": "Fotod ja videod, mis on rakenduse poolt ignoreeritud",
   "cache_settings_duplicated_assets_title": "Dubleeritud üksused ({count})",
   "cache_settings_statistics_album": "Kogu pisipildid",
   "cache_settings_statistics_full": "Täismõõdus pildid",
@@ -1051,6 +1053,9 @@
   "haptic_feedback_switch": "Luba haptiline tagasiside",
   "haptic_feedback_title": "Haptiline tagasiside",
   "has_quota": "On kvoot",
+  "hash_asset": "Arvuta üksuse räsi",
+  "hashed_assets": "Räsiga üksused",
+  "hashing": "Räsi arvutamine",
   "header_settings_add_header_tip": "Lisa päis",
   "header_settings_field_validator_msg": "Väärtus ei saa olla tühi",
   "header_settings_header_name_input": "Päise nimi",
@@ -1083,6 +1088,7 @@
   "host": "Host",
   "hour": "Tund",
   "id": "ID",
+  "idle": "Jõude",
   "ignore_icloud_photos": "Ignoreeri iCloud fotosid",
   "ignore_icloud_photos_description": "Fotosid, mis on iCloud'is, ei laadita üles Immich'i serverisse",
   "image": "Pilt",
@@ -1165,7 +1171,9 @@
   "list": "Loend",
   "loading": "Laadimine",
   "loading_search_results_failed": "Otsitulemuste laadimine ebaõnnestus",
+  "local": "Lokaalne üksus",
   "local_asset_cast_failed": "Ei saa edastada üksust, mis pole serverisse üles laaditud",
+  "local_assets": "Lokaalsed üksused",
   "local_network": "Kohalik võrk",
   "local_network_sheet_info": "Rakendus ühendub valitud Wi-Fi võrgus olles serveriga selle URL-i kaudu",
   "location_permission": "Asukoha luba",
@@ -1322,6 +1330,7 @@
   "no_results": "Vasteid pole",
   "no_results_description": "Proovi sünonüümi või üldisemat märksõna",
   "no_shared_albums_message": "Lisa album, et fotosid ja videosid teistega jagada",
+  "no_uploads_in_progress": "Üleslaadimisi käimas ei ole",
   "not_in_any_album": "Pole üheski albumis",
   "not_selected": "Ei ole valitud",
   "note_apply_storage_label_to_previously_uploaded assets": "Märkus: Et rakendada talletussilt varem üleslaaditud üksustele, käivita",
@@ -1359,6 +1368,7 @@
   "original": "originaal",
   "other": "Muud",
   "other_devices": "Muud seadmed",
+  "other_entities": "Muud objektid",
   "other_variables": "Muud muutujad",
   "owned": "Minu omad",
   "owner": "Omanik",
@@ -1519,6 +1529,8 @@
   "refreshing_faces": "Nägude värskendamine",
   "refreshing_metadata": "Metaandmete värskendamine",
   "regenerating_thumbnails": "Pisipiltide uuesti genereerimine",
+  "remote": "Kaugüksus",
+  "remote_assets": "Kaugüksused",
   "remove": "Eemalda",
   "remove_assets_album_confirmation": "Kas oled kindel, et soovid {count, plural, one {# üksuse} other {# üksust}} albumist eemaldada?",
   "remove_assets_shared_link_confirmation": "Kas oled kindel, et soovid eemaldada {count, plural, one {# üksuse} other {# üksust}} sellelt jagatud lingilt?",
@@ -1556,11 +1568,15 @@
   "reset_password": "Lähtesta parool",
   "reset_people_visibility": "Lähtesta isikute nähtavus",
   "reset_pin_code": "Lähtesta PIN-kood",
+  "reset_sqlite": "Lähtesta SQLite andmebaas",
+  "reset_sqlite_confirmation": "Kas oled kindel, et soovid SQLite andmebaasi lähtestada? Andmete uuesti sünkroonimiseks pead välja ja jälle sisse logima",
+  "reset_sqlite_success": "SQLite andmebaas edukalt lähtestatud",
   "reset_to_default": "Lähtesta",
   "resolve_duplicates": "Lahenda duplikaadid",
   "resolved_all_duplicates": "Kõik duplikaadid lahendatud",
   "restore": "Taasta",
   "restore_all": "Taasta kõik",
+  "restore_trash_action_prompt": "{count} prügikastust taastatud",
   "restore_user": "Taasta kasutaja",
   "restored_asset": "Üksus taastatud",
   "resume": "Jätka",
@@ -1569,6 +1585,7 @@
   "role": "Roll",
   "role_editor": "Muutja",
   "role_viewer": "Vaataja",
+  "running": "Käimas",
   "save": "Salvesta",
   "save_to_gallery": "Salvesta galeriisse",
   "saved_api_key": "API võti salvestatud",
@@ -1822,6 +1839,7 @@
   "storage_quota": "Talletuskvoot",
   "storage_usage": "{used}/{available} kasutatud",
   "submit": "Saada",
+  "success": "Õnnestus",
   "suggestions": "Soovitused",
   "sunrise_on_the_beach": "Päikesetõus rannal",
   "support": "Tugi",
@@ -1831,6 +1849,8 @@
   "sync": "Sünkrooni",
   "sync_albums": "Sünkrooni albumid",
   "sync_albums_manual_subtitle": "Sünkrooni kõik üleslaaditud videod ja fotod valitud varundusalbumitesse",
+  "sync_local": "Sünkrooni lokaalsed üksused",
+  "sync_remote": "Sünkrooni kaugüksused",
   "sync_upload_album_setting_subtitle": "Loo ja laadi oma pildid ja videod üles Immich'isse valitud albumitesse",
   "tag": "Silt",
   "tag_assets": "Sildista üksuseid",
@@ -1841,6 +1861,7 @@
   "tag_updated": "Muudetud silt: {tag}",
   "tagged_assets": "{count, plural, one {# üksus} other {# üksust}} sildistatud",
   "tags": "Sildid",
+  "tap_to_run_job": "Puuduta tööte käivitamiseks",
   "template": "Mall",
   "theme": "Teema",
   "theme_selection": "Teema valik",
diff --git a/i18n/fr.json b/i18n/fr.json
index cebd4b694f..ff9f783771 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -406,6 +406,7 @@
   "album_options": "Options de l'album",
   "album_remove_user": "Supprimer l'utilisateur ?",
   "album_remove_user_confirmation": "Êtes-vous sûr de vouloir supprimer {user} ?",
+  "album_search_not_found": "Aucun album trouvé ne correspond à votre recherche",
   "album_share_no_users": "Il semble que vous ayez partagé cet album avec tous les utilisateurs ou que vous n'ayez aucun utilisateur avec lequel le partager.",
   "album_updated": "Album mis à jour",
   "album_updated_setting_description": "Recevoir une notification par courriel lorsqu'un album partagé a de nouveaux médias",
@@ -425,6 +426,7 @@
   "albums_default_sort_order": "Ordre de tri par défaut des albums",
   "albums_default_sort_order_description": "Ordre de tri des médias pour les nouveaux albums créés.",
   "albums_feature_description": "Bibliothèques de médias pouvant être partagés avec d'autres utilisateurs.",
+  "albums_on_device_count": "Album sur l'appareil ({count})",
   "all": "Tout",
   "all_albums": "Tous les albums",
   "all_people": "Toutes les personnes",
@@ -571,6 +573,8 @@
   "backup_options_page_title": "Options de sauvegarde",
   "backup_setting_subtitle": "Ajuster les paramètres d'envoi au premier et en arrière-plan",
   "backward": "Arrière",
+  "beta_sync": "Statut de la synchronisation béta",
+  "beta_sync_subtitle": "Gérer le nouveau système de synchronisation",
   "biometric_auth_enabled": "Authentification biométrique activée",
   "biometric_locked_out": "L'authentification biométrique est verrouillé",
   "biometric_no_options": "Aucune option biométrique disponible",
@@ -605,6 +609,7 @@
   "cancel": "Annuler",
   "cancel_search": "Annuler la recherche",
   "canceled": "Annulé",
+  "canceling": "Annulation",
   "cannot_merge_people": "Impossible de fusionner les personnes",
   "cannot_undo_this_action": "Vous ne pouvez pas annuler cette action !",
   "cannot_update_the_description": "Impossible de mettre à jour la description",
@@ -765,6 +770,7 @@
   "description": "Description",
   "description_input_hint_text": "Ajouter une description...",
   "description_input_submit_error": "Erreur de mise à jour de la description, vérifier le journal pour plus de détails",
+  "deselect_all": "Tout désélectionner",
   "details": "Détails",
   "direction": "Ordre",
   "disabled": "Désactivé",
@@ -839,6 +845,7 @@
   "empty_trash": "Vider la corbeille",
   "empty_trash_confirmation": "Êtes-vous sûr de vouloir vider la corbeille ? Cela supprimera définitivement de Immich tous les médias qu'elle contient.\nVous ne pouvez pas annuler cette action !",
   "enable": "Active",
+  "enable_backup": "Activer Backup",
   "enable_biometric_auth_description": "Entrez votre code PIN pour activer l'authentification biométrique",
   "enabled": "Activé",
   "end_date": "Date de fin",
@@ -1046,6 +1053,9 @@
   "haptic_feedback_switch": "Activer le retour haptique",
   "haptic_feedback_title": "Retour haptique",
   "has_quota": "Quota",
+  "hash_asset": "Hasher le média",
+  "hashed_assets": "Média hashés",
+  "hashing": "Hash",
   "header_settings_add_header_tip": "Ajouter un en-tête",
   "header_settings_field_validator_msg": "Cette valeur ne peut pas être vide",
   "header_settings_header_name_input": "Nom de l'en-tête",
@@ -1160,7 +1170,9 @@
   "list": "Liste",
   "loading": "Chargement",
   "loading_search_results_failed": "Chargement des résultats échoué",
+  "local": "Local",
   "local_asset_cast_failed": "Impossible de caster un média qui n'a pas envoyé vers le serveur",
+  "local_assets": "Média locaux",
   "local_network": "Réseau local",
   "local_network_sheet_info": "L'application va se connecter au serveur via cette URL quand l'appareil est connecté à ce réseau Wi-Fi",
   "location_permission": "Autorisation de localisation",
@@ -1317,6 +1329,7 @@
   "no_results": "Aucun résultat",
   "no_results_description": "Essayez un synonyme ou un mot-clé plus général",
   "no_shared_albums_message": "Créer un album pour partager vos photos et vidéos avec les personnes de votre réseau",
+  "no_uploads_in_progress": "Pas d'envoi en cours",
   "not_in_any_album": "Dans aucun album",
   "not_selected": "Non sélectionné",
   "note_apply_storage_label_to_previously_uploaded assets": "Note : Pour appliquer l'étiquette de stockage aux médias précédemment envoyés, exécutez",
@@ -1354,6 +1367,7 @@
   "original": "original",
   "other": "Autre",
   "other_devices": "Autres appareils",
+  "other_entities": "Autres entités",
   "other_variables": "Autres variables",
   "owned": "Possédé",
   "owner": "Propriétaire",
@@ -1485,6 +1499,7 @@
   "purchase_server_description_2": "Statut de contributeur",
   "purchase_server_title": "Serveur",
   "purchase_settings_server_activated": "La clé du produit pour le Serveur est gérée par l'administrateur",
+  "queue_status": "File d'attente {count}/{total}",
   "rating": "Étoile d'évaluation",
   "rating_clear": "Effacer l'évaluation",
   "rating_count": "{count, plural, one {# étoile} other {# étoiles}}",
@@ -1513,6 +1528,8 @@
   "refreshing_faces": "Actualisation des visages",
   "refreshing_metadata": "Actualisation des métadonnées",
   "regenerating_thumbnails": "Regénération des miniatures",
+  "remote": "A distance",
+  "remote_assets": "Média à distance",
   "remove": "Supprimer",
   "remove_assets_album_confirmation": "Êtes-vous sûr de vouloir supprimer {count, plural, one {# média} other {# médias}} de l'album ?",
   "remove_assets_shared_link_confirmation": "Êtes-vous sûr de vouloir supprimer {count, plural, one {# média} other {# médias}} de ce lien partagé ?",
@@ -1550,11 +1567,15 @@
   "reset_password": "Réinitialiser le mot de passe",
   "reset_people_visibility": "Réinitialiser la visibilité des personnes",
   "reset_pin_code": "Réinitialiser le code PIN",
+  "reset_sqlite": "Réinitialiser la base de données SQLite",
+  "reset_sqlite_confirmation": "Êtes vous sur que vous voulez réinitialiser la base de données SQLite ? Vous devrez vous déconnecter and vous reconnecter à nouveau pour re-synchroniser les données",
+  "reset_sqlite_success": "La base de données SQLite à été réinitialisé avec succès",
   "reset_to_default": "Rétablir les valeurs par défaut",
   "resolve_duplicates": "Résoudre les doublons",
   "resolved_all_duplicates": "Résolution de tous les doublons",
   "restore": "Restaurer",
   "restore_all": "Tout restaurer",
+  "restore_trash_action_prompt": "{count} restauré de la corbeille",
   "restore_user": "Restaurer l'utilisateur",
   "restored_asset": "Média restauré",
   "resume": "Reprendre",
@@ -1563,6 +1584,7 @@
   "role": "Rôle",
   "role_editor": "Éditeur",
   "role_viewer": "Visionneuse",
+  "running": "En marche",
   "save": "Sauvegarder",
   "save_to_gallery": "Enregistrer",
   "saved_api_key": "Clé API sauvegardée",
@@ -1816,6 +1838,7 @@
   "storage_quota": "Quota de stockage",
   "storage_usage": "{used} sur {available} utilisé",
   "submit": "Soumettre",
+  "success": "Réussi",
   "suggestions": "Suggestions",
   "sunrise_on_the_beach": "Lever de soleil sur la plage",
   "support": "Soutenir",
@@ -1825,6 +1848,8 @@
   "sync": "Synchroniser",
   "sync_albums": "Synchroniser dans des albums",
   "sync_albums_manual_subtitle": "Synchroniser toutes les vidéos et photos envoyées dans les albums sélectionnés",
+  "sync_local": "Synchronisation locale",
+  "sync_remote": "Synchronisation à distance",
   "sync_upload_album_setting_subtitle": "Créez et envoyez vos photos et vidéos dans les albums sélectionnés sur Immich",
   "tag": "Étiquette",
   "tag_assets": "Étiqueter les médias",
@@ -1835,6 +1860,7 @@
   "tag_updated": "Étiquette mise à jour : {tag}",
   "tagged_assets": "Étiquette ajoutée à {count, plural, one {# média} other {# médias}}",
   "tags": "Étiquettes",
+  "tap_to_run_job": "Appuyez pour démarrer la tâche",
   "template": "Modèle",
   "theme": "Thème",
   "theme_selection": "Sélection du thème",
@@ -1915,6 +1941,7 @@
   "updated_password": "Mot de passe mis à jour",
   "upload": "Envoyer",
   "upload_concurrency": "Envois simultanés",
+  "upload_details": "Uploader les details",
   "upload_dialog_info": "Voulez-vous sauvegarder la sélection vers le serveur ?",
   "upload_dialog_title": "Envoyer le média",
   "upload_errors": "L'envoi s'est complété avec {count, plural, one {# erreur} other {# erreurs}}. Rafraîchissez la page pour voir les nouveaux médias envoyés.",
@@ -1965,6 +1992,7 @@
   "view_album": "Afficher l'album",
   "view_all": "Voir tout",
   "view_all_users": "Voir tous les utilisateurs",
+  "view_details": "Voir les détails",
   "view_in_timeline": "Voir dans la vue chronologique",
   "view_link": "Voir le lien",
   "view_links": "Voir les liens",
diff --git a/i18n/hu.json b/i18n/hu.json
index c00fb37224..df995c0d6c 100644
--- a/i18n/hu.json
+++ b/i18n/hu.json
@@ -140,7 +140,7 @@
     "machine_learning_smart_search_description": "Képek szemantikai keresése CLIP beágyazások segítségével",
     "machine_learning_smart_search_enabled": "Okos keresés engedélyezése",
     "machine_learning_smart_search_enabled_description": "Ha ki van kapcsolva, a képek nem lesznek átalakítva okos kereséshez.",
-    "machine_learning_url_description": "Gépi tanulás szerver URL címe. Ha többi, mint egy URL van megadva, mindegyik szervert egyenként próbálja meg, amíg az egyik sikeresen nem válaszol, sorrendben az elsőtől az utólsóig. A nem válaszoló szervereket átmenetileg figyelmen kívül hagyja, amíg újra online nem lesznek.",
+    "machine_learning_url_description": "Gépi tanulás szerver URL címe. Ha többi, mint egy URL van megadva, mindegyik szervert egyenként próbálja meg, amíg az egyik sikeresen nem válaszol, sorrendben az elsőtől az utólsóig. A nem elérhető szervereket átmenetileg figyelmen kívül lesznek hagyva, amíg újra online nem lesznek.",
     "manage_concurrency": "Párhuzamos Feladatok Kezelése",
     "manage_log_settings": "Naplózási beállítások kezelése",
     "map_dark_style": "Sötét stílus",
@@ -166,6 +166,12 @@
     "metadata_settings_description": "Metaadat beállítások kezelése",
     "migration_job": "Migrálás",
     "migration_job_description": "Az elemek és arcok bélyegképeinek migrálása a legújabb mappastruktúrába",
+    "nightly_tasks_cluster_faces_setting_description": "Arcfelismerés futtatása az újonnan érzékelt arcokon",
+    "nightly_tasks_database_cleanup_setting": "Adatbázis-tisztítási feladatok",
+    "nightly_tasks_database_cleanup_setting_description": "A régi, lejárt adatok törlése az adatbázisból",
+    "nightly_tasks_generate_memories_setting": "Emlékek generálása",
+    "nightly_tasks_generate_memories_setting_description": "Új emlékek létrehozása elemekből",
+    "nightly_tasks_missing_thumbnails_setting": "Hiányzó indexképek generálása",
     "no_paths_added": "Nincs megadva elérési útvonal",
     "no_pattern_added": "Nincs megadva minta (pattern)",
     "note_apply_storage_label_previous_assets": "Megjegyzés: Ha a korábban feltöltött elemekhez is szeretne Tárhely Címkéket társítani, akkor futtassa ezt",
@@ -360,7 +366,7 @@
   "advanced_settings_enable_alternate_media_filter_subtitle": "Ezzel a beállítással a szinkronizálás során alternatív kritériumok alapján szűrheted a fájlokat. Csak akkor próbáld ki, ha problémáid vannak azzal, hogy az alkalmazás nem ismeri fel az összes albumot.",
   "advanced_settings_enable_alternate_media_filter_title": "[KÍSÉRLETI] Alternatív eszköz album szinkronizálási szűrő használata",
   "advanced_settings_log_level_title": "Naplózás szintje: {level}",
-  "advanced_settings_prefer_remote_subtitle": "Néhány eszköz fájdalmasan lassan tölti be az eszközön lévő bélyegképeket. Ez a beállítás inkább a távoli képeket tölti be helyettük.",
+  "advanced_settings_prefer_remote_subtitle": "Néhány eszköz fájdalmasan lassan tölti be az eszközön lévő indexképeket. Ez a beállítás inkább a távoli képeket (a szerverről) tölti be helyettük.",
   "advanced_settings_prefer_remote_title": "Távoli képek előnyben részesítése",
   "advanced_settings_proxy_headers_subtitle": "Add meg azokat a proxy fejléceket, amiket az app elküldjön minden hálózati kérésnél",
   "advanced_settings_proxy_headers_title": "Proxy Fejlécek",
@@ -517,7 +523,7 @@
   "backup_controller_page_background_is_on": "Automatikus mentés a háttérben be van kapcsolva",
   "backup_controller_page_background_turn_off": "Háttérszolgáltatás kikapcsolása",
   "backup_controller_page_background_turn_on": "Háttérszolgáltatás bekapcsolása",
-  "backup_controller_page_background_wifi": "Csak WiFi-n",
+  "backup_controller_page_background_wifi": "Csak Wi-Fi-n",
   "backup_controller_page_backup": "Mentés",
   "backup_controller_page_backup_selected": "Kiválasztva: ",
   "backup_controller_page_backup_sub": "Mentett fotók és videók",
@@ -551,8 +557,8 @@
   "backup_setting_subtitle": "A háttérben és előtérben mentés beállításainak kezelése",
   "backward": "Visszafele",
   "biometric_auth_enabled": "Biometrikus azonosítás engedélyezve",
-  "biometric_locked_out": "A biometrikus azonosításból kizárva",
-  "biometric_no_options": "A biometrikus azonosítás nem elérhető",
+  "biometric_locked_out": "Ki vagy zárva a biometrikus azonosításból",
+  "biometric_no_options": "Nincsen elérhető biometrikus azonosítás",
   "biometric_not_available": "Biometrikus azonosítás ezen az eszközön nem elérhető",
   "birthdate_saved": "Születésnap elmentve",
   "birthdate_set_description": "A születés napját a rendszer arra használja, hogy kiírja, hogy a fénykép készítésekor a személy hány éves volt.",
@@ -642,7 +648,7 @@
   "confirm_keep_this_delete_others": "Minden más elem a készletben törlésre kerül, kivéve ezt az elemet. Biztosan folytatni szeretnéd?",
   "confirm_new_pin_code": "Új PIN kód megerősítése",
   "confirm_password": "Jelszó megerősítése",
-  "confirm_tag_face": "Szeretnéd ezt az arcot {name}-ként megjelölni?",
+  "confirm_tag_face": "Szeretnéd ezt az arcot {name}-nak/nek megjelölni?",
   "confirm_tag_face_unnamed": "Szeretnéd ezt az arcot megjelölni?",
   "connected_device": "Kapcsolt eszköz",
   "connected_to": "Kapcsolódva",
@@ -770,7 +776,7 @@
   "download_started": "Letöltés megkezdve",
   "download_sucess": "Sikeres letöltés",
   "download_sucess_android": "Média letöltve a DCIM/Immich mappába",
-  "download_waiting_to_retry": "Várakozás újrapróbálkozáshoz",
+  "download_waiting_to_retry": "Várás az újrapróbálkozásra",
   "downloading": "Letöltés",
   "downloading_asset_filename": "{filename} elem letöltése",
   "downloading_media": "Média letöltése",
@@ -816,7 +822,7 @@
   "enqueued": "Sorba állítva",
   "enter_wifi_name": "Add meg a Wi-Fi hálózat nevét",
   "enter_your_pin_code": "Add meg a jelszavad",
-  "enter_your_pin_code_subtitle": "Add meg a jelszavad a zárolt mappa megnyitásához",
+  "enter_your_pin_code_subtitle": "Add meg a PIN kódodat a zárolt mappa megnyitásához",
   "error": "Hiba",
   "error_change_sort_album": "Album sorbarendezésének megváltoztatása sikertelen",
   "error_delete_face": "Hiba az arc törlése során",
@@ -916,7 +922,7 @@
     "unable_to_remove_partner": "Partner eltávolítása sikertelen",
     "unable_to_remove_reaction": "Reakció eltávolítása sikertelen",
     "unable_to_reset_password": "Jelszó visszaállítása sikertelen",
-    "unable_to_reset_pin_code": "Jelszó visszaállítása sikertelen",
+    "unable_to_reset_pin_code": "PIN kód visszaállítása sikertelen",
     "unable_to_resolve_duplicate": "Duplikátum feloldása sikertelen",
     "unable_to_restore_assets": "Elemek visszaállítása sikertelen",
     "unable_to_restore_trash": "Az összes elem visszaállítása sikertelen",
@@ -988,7 +994,7 @@
   "filetype": "Fájltípus",
   "filter": "Szűrő",
   "filter_people": "Személyek szűrése",
-  "filter_places": "Helyek szűrése",
+  "filter_places": "Helyszínek szűrése",
   "find_them_fast": "Név alapján kereséssel gyorsan megtalálhatóak",
   "fix_incorrect_match": "Hibás találat javítása",
   "folder": "Mappa",
@@ -1029,9 +1035,9 @@
   "hide_person": "Személy elrejtése",
   "hide_unnamed_people": "Név nélküli személyek elrejtése",
   "home_page_add_to_album_conflicts": "{added} elem hozzáadva a(z) \"{album}\" albumhoz. {failed} elem már eleve az albumban volt.",
-  "home_page_add_to_album_err_local": "Helyi elemeket még nem lehet albumba tenni, kihagyás",
+  "home_page_add_to_album_err_local": "Helyi elemeket még nem lehet albumba tenni, ki lesznek hagyva",
   "home_page_add_to_album_success": "{added} elem hozzáadva a(z) \"{album}\" albumhoz.",
-  "home_page_album_err_partner": "Még nem lehet a partner elemeit albumokhoz adni, kihagyás",
+  "home_page_album_err_partner": "Még nem lehet a partner elemeit albumokhoz adni, ki lesznek hagyva",
   "home_page_archive_err_local": "Helyi elemek archiválása még nem támogatott, úgyhogy kihagyjuk",
   "home_page_archive_err_partner": "Partner elemeit nem lehet archiválni, úgyhogy kihagyjuk",
   "home_page_building_timeline": "Idővonal összeállítása",
@@ -1040,7 +1046,7 @@
   "home_page_favorite_err_local": "Helyi elemeket még nem lehet a kedvencek közé tenni, úgyhogy ezeket kihagyjuk",
   "home_page_favorite_err_partner": "Partner elemeit még nem lehet a kedvencek közé tenni, úgyhogy ezeket kihagyjuk",
   "home_page_first_time_notice": "Ha most használod először az alkalmazást, a fotók és videók megjelenítéséhez az idővonaladon, állítsd be, hogy melyik albumaidról készüljön biztonsági mentés",
-  "home_page_locked_error_local": "Helyi elemek nem mozgathatóak a zárolt mappába, átugorva",
+  "home_page_locked_error_local": "A Helyi elemek nem mozgathatóak a zárolt mappába, ki lesznek hagyva",
   "home_page_locked_error_partner": "Partner elemek nem mozgathatóak a zárolt mappába, átugorva",
   "home_page_share_err_local": "Helyi elemekről nem lehet megosztott linket készíteni, úgyhogy kihagyjuk",
   "home_page_upload_err_limit": "Csak 30 elemet tudsz egyszerre feltölteni, úgyhogy kihagyjuk",
@@ -1087,10 +1093,10 @@
   "invite_people": "Személyek Meghívása",
   "invite_to_album": "Meghívás az albumba",
   "ios_debug_info_last_sync_at": "Utoljára szinkronizálva {dateTime}",
-  "ios_debug_info_no_processes_queued": "Nincs sorba állított hátterfolyamat",
+  "ios_debug_info_no_processes_queued": "Nincs a sorban háttérfolyamat jelenleg",
   "ios_debug_info_no_sync_yet": "Még nem futott szinkronizáló háttérfolyamat",
   "ios_debug_info_processes_queued": "{count, plural, one {{count} háttérfolyamat előkészítve} other {{count} háttérfolyamat előkészítve}}",
-  "ios_debug_info_processing_ran_at": "Feldolgozás futott {dateTime}",
+  "ios_debug_info_processing_ran_at": "A feldolgozás ekkor futott: {dateTime}",
   "items_count": "{count, plural, other {# elem}}",
   "jobs": "Feladatok",
   "keep": "Megtart",
@@ -1099,7 +1105,7 @@
   "kept_this_deleted_others": "Ez az elem és a töröltek meg lettek hagyva {count, plural, one {# asset} other {# assets}}",
   "keyboard_shortcuts": "Billentyűparancsok",
   "language": "Nyelv",
-  "language_no_results_subtitle": "Próbáld a keresésed módosítását",
+  "language_no_results_subtitle": "Próbáld módosítani a szavaidat a keresésnél",
   "language_search_hint": "Nyelvek keresése...",
   "language_setting_description": "Válaszd ki preferált nyelvet",
   "last_seen": "Utoljára láttuk",
@@ -1129,7 +1135,7 @@
   "local_network": "Helyi hálózat",
   "local_network_sheet_info": "Az alkalmazés ezen az URL címen fogja elérni a szervert, ha a megadott WiFi hálózathoz van csatlankozva",
   "location_permission": "Helymeghatározási engedély",
-  "location_permission_content": "Hálózatok automatikus váltásához az Immich-nek szüksége van a pontos helymeghatározásra, hogy az alkalmazás le tudja kérni a Wi-Fi hálózat nevét",
+  "location_permission_content": "A Hálózatok automatikus váltásához az Immich-nek szüksége van a pontos helymeghatározásra, hogy az alkalmazás le tudja kérni a Wi-Fi hálózat nevét",
   "location_picker_choose_on_map": "Válassz a térképen",
   "location_picker_latitude_error": "Érvényes szélességi kört írj be",
   "location_picker_latitude_hint": "Ide írd a szélességi kört",
@@ -1139,7 +1145,7 @@
   "locked_folder": "Zárolt mappa",
   "log_out": "Kijelentkezés",
   "log_out_all_devices": "Kijelentkezés Minden Eszközön",
-  "logged_in_as": "{user}-ként belépve",
+  "logged_in_as": "Belépve: {user} néven",
   "logged_out_all_devices": "Minden eszköz kijelentkeztetve",
   "logged_out_device": "Eszköz kijelentkeztetve",
   "login": "Bejelentkezés",
@@ -1234,9 +1240,9 @@
   "monthly_title_text_date_format": "y MMMM",
   "more": "Továbbiak",
   "move": "Áthelyezés",
-  "move_off_locked_folder": "Zárolt mappából kivonás",
+  "move_off_locked_folder": "Átmozgatás a zárolt mappából",
   "move_to_locked_folder": "Áthelyezés a zárolt mappába",
-  "move_to_locked_folder_confirmation": "Ezek a képek és videók az összes albumból kikerülnek, és csak a zárolt mappából lesznek elérhetőek",
+  "move_to_locked_folder_confirmation": "Ezek a képek és videók az összes albumból kikerülnek, és csak a zárolt mappában lesznek elérhetőek",
   "moved_to_archive": "{count, plural, one {# Elem} other {# Elemek}} archiválva",
   "moved_to_library": "{count, plural, one {# Elem} other {# Elemek}} másik könyvtárba költöztetve",
   "moved_to_trash": "Áthelyezve a lomtárba",
@@ -1254,7 +1260,7 @@
   "new_password": "Új jelszó",
   "new_person": "Új személy",
   "new_pin_code": "Új PIN kód",
-  "new_pin_code_subtitle": "Ez az első alkalom hogy megnyitod a zárolt mappát. Hozz létre egy jelszót az oldal biztosítására",
+  "new_pin_code_subtitle": "Ez az első alkalom hogy megnyitod a zárolt mappát. Hozz létre egy jelszót a mappa biztonságos eléréséhez",
   "new_user_created": "Új felhasználó létrehozva",
   "new_version_available": "ÚJ VERZIÓ ÉRHETŐ EL",
   "newest_first": "Legújabb először",
@@ -1283,7 +1289,7 @@
   "not_selected": "Nincs kiválasztva",
   "note_apply_storage_label_to_previously_uploaded assets": "Megjegyzés: a korábban feltöltött elemek Tárhely Címkézéséhez futtasd a(z)",
   "notes": "Megjegyzések",
-  "nothing_here_yet": "Itt még nincs semmi",
+  "nothing_here_yet": "Még semmi sincs itt",
   "notification_permission_dialog_content": "Az értesítések bekapcsolásához a Beállítások menüben válaszd ki az Engedélyezés-t.",
   "notification_permission_list_tile_content": "Értesítések engedélyezése.",
   "notification_permission_list_tile_enable_button": "Értesítések Bekapcsolása",
@@ -1293,7 +1299,7 @@
   "notifications_setting_description": "Értesítések kezelése",
   "oauth": "OAuth",
   "official_immich_resources": "Hivatalos Immich Források",
-  "offline": "Offline",
+  "offline": "Nem elérhető (offline)",
   "ok": "Rendben",
   "oldest_first": "Legrégebbi először",
   "on_this_device": "Ezen az eszközön",
@@ -1303,7 +1309,7 @@
   "onboarding_theme_description": "Válassz egy színtémát. Ezt bármikor megváltoztathatod a beállításokban.",
   "onboarding_user_welcome_description": "Kezdjünk bele!",
   "onboarding_welcome_user": "Üdvözöllek {user}",
-  "online": "Online",
+  "online": "Online (elérhető)",
   "only_favorites": "Csak kedvencek",
   "open": "Nyitva",
   "open_in_map_view": "Megnyitás térkép nézetben",
@@ -1754,7 +1760,7 @@
   "stack_select_one_photo": "Válassz egy fő képet a csoportból",
   "stack_selected_photos": "Kiválasztott fényképek csoportosítása",
   "stacked_assets_count": "{count, plural, other {# elem}} csoportosítva",
-  "stacktrace": "Hibaleírás",
+  "stacktrace": "Hiba leírása",
   "start": "Elindít",
   "start_date": "Kezdő dátum",
   "state": "Megye/Állam",
@@ -1882,7 +1888,7 @@
   "user_liked": "{user} felhasználónak {type, select, photo {ez a fénykép} video {ez a videó} asset {ez az elem} other {ez}} tetszik",
   "user_pin_code_settings": "PIN kód",
   "user_pin_code_settings_description": "PIN kód kezelése",
-  "user_privacy": "Felhasználói biztonság",
+  "user_privacy": "Felhasználói adatvédelem",
   "user_purchase_settings": "Megvásárlás",
   "user_purchase_settings_description": "Vásárlás kezelése",
   "user_role_set": "{user} felhasználónak {role} jogkör biztosítása",
diff --git a/i18n/id.json b/i18n/id.json
index ff5e2524e2..92cb07ff30 100644
--- a/i18n/id.json
+++ b/i18n/id.json
@@ -169,15 +169,23 @@
     "nightly_tasks_cluster_faces_setting_description": "Mulai pengenalan wajah pada semua wajah yang baru saja terdeteksi",
     "nightly_tasks_cluster_new_faces_setting": "Kelompokkan semua wajah baru",
     "nightly_tasks_database_cleanup_setting": "Tugas pembersihan basis data",
+    "nightly_tasks_database_cleanup_setting_description": "Membersihkan data lama, kadaluarsa dari database",
     "nightly_tasks_generate_memories_setting": "Buat kenang-kenangan",
     "nightly_tasks_generate_memories_setting_description": "Buat kenang-kenangan baru dari berbagai aset",
+    "nightly_tasks_missing_thumbnails_setting": "Membuat thumbnail yang hilang",
+    "nightly_tasks_missing_thumbnails_setting_description": "Mengantrikan aset tanpa thumbnail untuk pembuatan thumbnail",
+    "nightly_tasks_settings": "Pengaturan Tugas Malam",
+    "nightly_tasks_settings_description": "Atur tugas malam",
     "nightly_tasks_start_time_setting": "Waktu mulai",
+    "nightly_tasks_start_time_setting_description": "Waktu saat server mulai menjalankan tugas malam",
+    "nightly_tasks_sync_quota_usage_setting": "Sinkronisasi penggunaan kuota",
+    "nightly_tasks_sync_quota_usage_setting_description": "Pembaruan kuota penyimpanan pengguna, berdasarkan penggunaan sekarang",
     "no_paths_added": "Tidak ada jalur yang ditambahkan",
     "no_pattern_added": "Tidak ada pola yang ditambahkan",
     "note_apply_storage_label_previous_assets": "Catatan: Untuk menerapkan Label Penyimpanan untuk aset yang telah diunggah sebelumnya, jalankan",
     "note_cannot_be_changed_later": "CATATAN: Ini tidak akan dapat diubah lagi!",
     "notification_email_from_address": "Dari alamat",
-    "notification_email_from_address_description": "Alamat surel pengirim, misalnya: \"Server Foto Immich <noreply@example.com>\". Pastikan untuk menggunakan alamat yang diizinkan untuk mengirim email",
+    "notification_email_from_address_description": "Alamat surel pengirim, misalnya: \"Server Foto Immich <noreply@example.com>\". Pastikan untuk menggunakan alamat yang diizinkan untuk mengirim email.",
     "notification_email_host_description": "Hos server surel (mis. smtp.immich.app)",
     "notification_email_ignore_certificate_errors": "Abaikan eror sertifikat",
     "notification_email_ignore_certificate_errors_description": "Abaikan eror validasi sertifikat TLS (tidak disarankan)",
diff --git a/i18n/it.json b/i18n/it.json
index 5e12bdfc97..0aec538a85 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -406,6 +406,7 @@
   "album_options": "Impostazioni Album",
   "album_remove_user": "Rimuovi l'utente?",
   "album_remove_user_confirmation": "Sicuro di voler rimuovere l'utente {user}?",
+  "album_search_not_found": "Nessun album trovato corrispondente alla tua ricerca",
   "album_share_no_users": "Sembra che tu abbia condiviso questo album con tutti gli utenti oppure non hai nessun utente con cui condividere.",
   "album_updated": "Album aggiornato",
   "album_updated_setting_description": "Ricevi una notifica email quando un album condiviso ha nuovi media",
@@ -425,6 +426,7 @@
   "albums_default_sort_order": "Ordinamento predefinito degli album",
   "albums_default_sort_order_description": "Ordine iniziale degli elementi alla creazione di nuovi album.",
   "albums_feature_description": "Raggruppamento di elementi che possono essere condivisi con altri utenti.",
+  "albums_on_device_count": "Album sul dispositivo ({count})",
   "all": "Tutti",
   "all_albums": "Tutti gli album",
   "all_people": "Tutte le persone",
@@ -605,6 +607,7 @@
   "cancel": "Annulla",
   "cancel_search": "Annulla ricerca",
   "canceled": "Annullato",
+  "canceling": "Annullamento",
   "cannot_merge_people": "Impossibile unire le persone",
   "cannot_undo_this_action": "Non puoi annullare questa azione!",
   "cannot_update_the_description": "Impossibile aggiornare la descrizione",
@@ -751,6 +754,7 @@
   "delete_key": "Elimina chiave",
   "delete_library": "Elimina libreria",
   "delete_link": "Elimina link",
+  "delete_local_action_prompt": "{count} elementi rimossi in locale",
   "delete_local_dialog_ok_backed_up_only": "Elimina solo con backup",
   "delete_local_dialog_ok_force": "Elimina comunque",
   "delete_others": "Elimina gli altri",
@@ -764,6 +768,7 @@
   "description": "Descrizione",
   "description_input_hint_text": "Aggiungi descrizione...",
   "description_input_submit_error": "Errore modificare descrizione, controlli I log per maggiori dettagli",
+  "deselect_all": "Deseleziona Tutto",
   "details": "Dettagli",
   "direction": "Direzione",
   "disabled": "Disabilitato",
@@ -781,6 +786,7 @@
   "documentation": "Documentazione",
   "done": "Fatto",
   "download": "Scarica",
+  "download_action_prompt": "Scaricando {count} elementi",
   "download_canceled": "Download annullato",
   "download_complete": "Download completato",
   "download_enqueue": "Download in coda",
@@ -837,6 +843,7 @@
   "empty_trash": "Svuota cestino",
   "empty_trash_confirmation": "Sei sicuro di volere svuotare il cestino? Questo rimuoverà tutte le risorse nel cestino in modo permanente da Immich.\nNon puoi annullare questa azione!",
   "enable": "Abilita",
+  "enable_backup": "Abilita Backup",
   "enable_biometric_auth_description": "Inserire il codice PIN per abilitare l'autenticazione biometrica",
   "enabled": "Abilitato",
   "end_date": "Data Fine",
@@ -1483,6 +1490,7 @@
   "purchase_server_description_2": "Stato di Contributore",
   "purchase_server_title": "Server",
   "purchase_settings_server_activated": "La chiave del prodotto del server è gestita dall'amministratore",
+  "queue_status": "Messi in coda {count}/{total}",
   "rating": "Valutazione a stelle",
   "rating_clear": "Crea valutazione",
   "rating_count": "{count, plural, one {# stella} other {# stelle}}",
@@ -1518,6 +1526,7 @@
   "remove_custom_date_range": "Rimuovi intervallo data personalizzato",
   "remove_deleted_assets": "Rimuovi file offline",
   "remove_from_album": "Rimuovere dall'album",
+  "remove_from_album_action_prompt": "{count} elementi rimossi dall'album",
   "remove_from_favorites": "Rimuovi dai preferiti",
   "remove_from_lock_folder_action_prompt": "{count} elementi rimossi dalla cartella sicura",
   "remove_from_locked_folder": "Rimuovi dalla cartella privata",
@@ -1691,6 +1700,7 @@
   "settings_saved": "Impostazioni salvate",
   "setup_pin_code": "Configura un codice PIN",
   "share": "Condivisione",
+  "share_action_prompt": "Condivisi {count} elementi",
   "share_add_photos": "Aggiungi foto",
   "share_assets_selected": "{count} selezionati",
   "share_dialog_preparing": "Preparo…",
@@ -1792,6 +1802,7 @@
   "sort_title": "Titolo",
   "source": "Fonte",
   "stack": "Raggruppa",
+  "stack_action_prompt": "{count} elementi raggruppati",
   "stack_duplicates": "Raggruppa i duplicati",
   "stack_select_one_photo": "Seleziona una foto principale per il gruppo",
   "stack_selected_photos": "Impila foto selezionate",
@@ -1880,6 +1891,7 @@
   "unable_to_change_pin_code": "Impossibile cambiare il codice PIN",
   "unable_to_setup_pin_code": "Impossibile configurare il codice PIN",
   "unarchive": "Annulla l'archiviazione",
+  "unarchive_action_prompt": "{count} elementi rimossi dall'Archivio",
   "unarchived_count": "{count, plural, other {Non archiviati #}}",
   "undo": "Annulla",
   "unfavorite": "Rimuovi preferito",
diff --git a/i18n/lv.json b/i18n/lv.json
index 5af3e0511c..2e6b702e22 100644
--- a/i18n/lv.json
+++ b/i18n/lv.json
@@ -707,6 +707,9 @@
   "next_memory": "Nākamā atmiņa",
   "no": "Nē",
   "no_albums_message": "Izveido albumu, lai organizētu savas fotogrāfijas un video",
+  "no_albums_with_name_yet": "Izskatās, ka tev vēl nav albumu ar šādu nosaukumu.",
+  "no_albums_yet": "Izskatās, ka tev vēl nav neviena albuma.",
+  "no_archived_assets_message": "Arhivē fotoattēlus un videoklipus, lai paslēptu tos no Fotoattēli skata",
   "no_assets_message": "NOKLIKŠĶINIET, LAI AUGŠUPIELĀDĒTU SAVU PIRMO FOTOATTĒLU",
   "no_assets_to_show": "Nav uzrādāmo aktīvu",
   "no_duplicates_found": "Dublikāti netika atrasti.",
@@ -730,6 +733,10 @@
   "official_immich_resources": "Oficiālie Immich resursi",
   "offline": "Bezsaistē",
   "ok": "Labi",
+  "onboarding": "Uzņemšana",
+  "onboarding_locale_description": "Izvēlies vēlamo valodu. To vēlāk var mainīt iestatījumos.",
+  "onboarding_theme_description": "Izvēlies savas instances krāsu motīvu. To vēlāk var mainīt iestatījumos.",
+  "onboarding_user_welcome_description": "Sāksim darbu!",
   "online": "Tiešsaistē",
   "only_favorites": "Tikai izlase",
   "open_in_map_view": "Atvērt kartes skatā",
@@ -737,13 +744,16 @@
   "open_the_search_filters": "Atvērt meklēšanas filtrus",
   "options": "Iestatījumi",
   "or": "vai",
+  "organize_your_library": "Bibliotēkas organizēšana",
   "original": "oriģināls",
   "other": "Citi",
   "other_devices": "Citas ierīces",
   "other_variables": "Citi mainīgie",
   "owned": "Īpašumā",
   "owner": "Īpašnieks",
+  "partner": "Partneris",
   "partner_can_access": "{partner} var piekļūt",
+  "partner_can_access_location": "Fotogrāfiju uzņemšanas vieta",
   "partner_list_user_photos": "{user} fotoattēli",
   "partner_list_view_all": "Apskatīt visu",
   "partner_page_empty_message": "Jūsu fotogrāfijas pagaidām nav kopīgotas ar nevienu partneri.",
@@ -757,6 +767,7 @@
   "password_does_not_match": "Parole nesakrīt",
   "path": "Ceļš",
   "pause": "Pauzēt",
+  "pause_memories": "Pauzēt atmiņas",
   "paused": "Nopauzēts",
   "people": "Cilvēki",
   "permission_onboarding_back": "Atpakaļ",
diff --git a/i18n/nb_NO.json b/i18n/nb_NO.json
index 89b5e298bc..2abc08e7f2 100644
--- a/i18n/nb_NO.json
+++ b/i18n/nb_NO.json
@@ -573,6 +573,8 @@
   "backup_options_page_title": "Backupinnstillinger",
   "backup_setting_subtitle": "Administrer opplastingsinnstillinger for bakgrunn og forgrunn",
   "backward": "Bakover",
+  "beta_sync": "Beta synkroniseringsstatus",
+  "beta_sync_subtitle": "Håndter det nye synkroniseringssystemet",
   "biometric_auth_enabled": "Biometrisk autentisering aktivert",
   "biometric_locked_out": "Du er låst ute av biometrisk verifisering",
   "biometric_no_options": "Ingen biometriske valg tilgjengelige",
@@ -590,7 +592,7 @@
   "cache_settings_clear_cache_button": "Tøm buffer",
   "cache_settings_clear_cache_button_title": "Tømmer app-ens buffer. Dette vil ha betydelig innvirkning på appens ytelse inntil bufferen er gjenoppbygd.",
   "cache_settings_duplicated_assets_clear_button": "TØM",
-  "cache_settings_duplicated_assets_subtitle": "Bilder og videoer som er svartelistet av app'en",
+  "cache_settings_duplicated_assets_subtitle": "Bilder og videoer som er ignorert av app'en",
   "cache_settings_duplicated_assets_title": "Dupliserte objekter ({count})",
   "cache_settings_statistics_album": "Bibliotekminiatyrbilder",
   "cache_settings_statistics_full": "Originalbilder",
@@ -1051,6 +1053,9 @@
   "haptic_feedback_switch": "Aktivert haptisk tilbakemelding",
   "haptic_feedback_title": "Haptisk tilbakemelding",
   "has_quota": "Kvote",
+  "hash_asset": "Hash objekter",
+  "hashed_assets": "Hashede objekter",
+  "hashing": "Hasher",
   "header_settings_add_header_tip": "Legg til header",
   "header_settings_field_validator_msg": "Verdi kan ikke være null",
   "header_settings_header_name_input": "Header navn",
@@ -1083,6 +1088,7 @@
   "host": "Vert",
   "hour": "Time",
   "id": "ID",
+  "idle": "Uvirksom",
   "ignore_icloud_photos": "Ignorer iCloud bilder",
   "ignore_icloud_photos_description": "Bilder som er lagret på iCloud vil ikke lastes opp til Immich",
   "image": "Bilde",
@@ -1165,7 +1171,9 @@
   "list": "Liste",
   "loading": "Laster",
   "loading_search_results_failed": "Klarte ikke å laste inn søkeresultater",
+  "local": "Lokal",
   "local_asset_cast_failed": "Kan ikke caste et bilde som ikke er lastet opp til serveren",
+  "local_assets": "Lokale objekter",
   "local_network": "Lokalt nettverk",
   "local_network_sheet_info": "Appen vil koble til serveren via denne URL-en når du bruker det angitte Wi-Fi-nettverket",
   "location_permission": "Stedstillatelse",
@@ -1322,6 +1330,7 @@
   "no_results": "Ingen resultater",
   "no_results_description": "Prøv et synonym eller mer generelt søkeord",
   "no_shared_albums_message": "Opprett et album for å dele bilder og videoer med personer i nettverket ditt",
+  "no_uploads_in_progress": "Ingen opplasting pågår",
   "not_in_any_album": "Ikke i noe album",
   "not_selected": "Ikke valgt",
   "note_apply_storage_label_to_previously_uploaded assets": "Merk: For å bruke lagringsetiketten på tidligere opplastede filer, kjør",
@@ -1359,6 +1368,7 @@
   "original": "original",
   "other": "Annet",
   "other_devices": "Andre enheter",
+  "other_entities": "Andre objekter",
   "other_variables": "Andre variabler",
   "owned": "Dine",
   "owner": "Eier",
@@ -1519,6 +1529,8 @@
   "refreshing_faces": "Oppdaterer ansikter",
   "refreshing_metadata": "Oppdaterer matadata",
   "regenerating_thumbnails": "Regenererer miniatyrbilder",
+  "remote": "Eksternt",
+  "remote_assets": "Eksterne objekter",
   "remove": "Fjern",
   "remove_assets_album_confirmation": "Er du sikker på at du fil slette {count, plural, one {# asset} other {# assets}} fra albumet?",
   "remove_assets_shared_link_confirmation": "Er du sikker på at du vil slette {count, plural, one {# asset} other {# assets}} fra den delte lenken?",
@@ -1556,11 +1568,15 @@
   "reset_password": "Tilbakestill passord",
   "reset_people_visibility": "Tilbakestill personsynlighet",
   "reset_pin_code": "Resett PINkode",
+  "reset_sqlite": "Reset SQLite Databasen",
+  "reset_sqlite_confirmation": "Er du sikker på at du vil resette SQLite databasen? Du blir nødt til å logge ut og inn igjen for å resynkronisere data",
+  "reset_sqlite_success": "Vellykket resetting av SQLite databasen",
   "reset_to_default": "Tilbakestill til standard",
   "resolve_duplicates": "Løs duplikater",
   "resolved_all_duplicates": "Løste alle duplikater",
   "restore": "Gjenopprett",
   "restore_all": "Gjenopprett alle",
+  "restore_trash_action_prompt": "{count} gjenopprettet fra søppelbøtten",
   "restore_user": "Gjenopprett bruker",
   "restored_asset": "Gjenopprettet ressurs",
   "resume": "Fortsett",
@@ -1569,6 +1585,7 @@
   "role": "Rolle",
   "role_editor": "Redigerer",
   "role_viewer": "Visning",
+  "running": "Kjører",
   "save": "Lagre",
   "save_to_gallery": "Lagre til galleriet",
   "saved_api_key": "Lagret API-nøkkel",
@@ -1822,6 +1839,7 @@
   "storage_quota": "Lagringsplass",
   "storage_usage": "{used} av {available} brukt",
   "submit": "Send inn",
+  "success": "Vellykket",
   "suggestions": "Forslag",
   "sunrise_on_the_beach": "Soloppgang på stranden",
   "support": "Støtte",
@@ -1831,6 +1849,8 @@
   "sync": "Synkroniser",
   "sync_albums": "Synkroniser albumer",
   "sync_albums_manual_subtitle": "Synkroniser alle opplastede videoer og bilder til det valgte backupalbumet",
+  "sync_local": "Synkroniser lokalt",
+  "sync_remote": "Synkroniser eksternt",
   "sync_upload_album_setting_subtitle": "Opprett og last opp dine bilder og videoer til det valgte albumet på Immich",
   "tag": "Tagg",
   "tag_assets": "Merk ressurser",
@@ -1841,6 +1861,7 @@
   "tag_updated": "Oppdater merke: {tag}",
   "tagged_assets": "Merket {count, plural, one {# asset} other {# assets}}",
   "tags": "Merker",
+  "tap_to_run_job": "Trykk for å kjøre jobben",
   "template": "Mal",
   "theme": "Tema",
   "theme_selection": "Temavalg",
diff --git a/i18n/nl.json b/i18n/nl.json
index 2cedd63b15..86cb0fba6e 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -426,6 +426,7 @@
   "albums_default_sort_order": "Standaard sorteervolgorde album",
   "albums_default_sort_order_description": "Initiële sorteervolgorde bij het maken van nieuwe albums.",
   "albums_feature_description": "Collectie van assets die je kan delen met andere gebruikers.",
+  "albums_on_device_count": "Albums op apparaat ({count})",
   "all": "Alle",
   "all_albums": "Alle albums",
   "all_people": "Alle mensen",
@@ -572,6 +573,8 @@
   "backup_options_page_title": "Back-up instellingen",
   "backup_setting_subtitle": "Beheer achtergrond en voorgrond uploadinstellingen",
   "backward": "Achteruit",
+  "beta_sync": "Beta Sync Status",
+  "beta_sync_subtitle": "Beheer het nieuwe synchronisatiesysteem",
   "biometric_auth_enabled": "Biometrische authenticatie ingeschakeld",
   "biometric_locked_out": "Biometrische authenticatie is vergrendeld",
   "biometric_no_options": "Geen biometrische opties beschikbaar",
@@ -589,7 +592,7 @@
   "cache_settings_clear_cache_button": "Cache wissen",
   "cache_settings_clear_cache_button_title": "Wist de cache van de app. Dit zal de presentaties van de app aanzienlijk beïnvloeden totdat de cache opnieuw is opgebouwd.",
   "cache_settings_duplicated_assets_clear_button": "MAAK VRIJ",
-  "cache_settings_duplicated_assets_subtitle": "Foto's en video's op de zwarte lijst van de app",
+  "cache_settings_duplicated_assets_subtitle": "Foto’s en video's die de app negeert",
   "cache_settings_duplicated_assets_title": "Gedupliceerde assets ({count})",
   "cache_settings_statistics_album": "Bibliotheekthumbnails",
   "cache_settings_statistics_full": "Volledige afbeeldingen",
@@ -1050,6 +1053,9 @@
   "haptic_feedback_switch": "Aanraaktrillingen inschakelen",
   "haptic_feedback_title": "Aanraaktrillingen",
   "has_quota": "Heeft limiet",
+  "hash_asset": "Hash asset",
+  "hashed_assets": "Gehashte assets",
+  "hashing": "Hashen",
   "header_settings_add_header_tip": "Header toevoegen",
   "header_settings_field_validator_msg": "Waarde kan niet leeg zijn",
   "header_settings_header_name_input": "Header naam",
@@ -1082,6 +1088,7 @@
   "host": "Host",
   "hour": "Uur",
   "id": "ID",
+  "idle": "Idle",
   "ignore_icloud_photos": "Negeer iCloud foto's",
   "ignore_icloud_photos_description": "Foto's die op iCloud zijn opgeslagen, worden niet geüpload naar de Immich server",
   "image": "Afbeelding",
@@ -1164,7 +1171,9 @@
   "list": "Lijst",
   "loading": "Laden",
   "loading_search_results_failed": "Laden van zoekresultaten mislukt",
+  "local": "Lokaal",
   "local_asset_cast_failed": "Kan geen asset casten die nog niet geüpload is naar de server",
+  "local_assets": "Lokale Assets",
   "local_network": "Lokaal netwerk",
   "local_network_sheet_info": "De app maakt verbinding met de server via deze URL wanneer het opgegeven WiFi-netwerk wordt gebruikt",
   "location_permission": "Locatietoestemming",
@@ -1321,6 +1330,7 @@
   "no_results": "Geen resultaten",
   "no_results_description": "Probeer een synoniem of een algemener zoekwoord",
   "no_shared_albums_message": "Maak een album om foto's en video's te delen met mensen in je netwerk",
+  "no_uploads_in_progress": "Geen uploads bezig",
   "not_in_any_album": "Niet in een album",
   "not_selected": "Niet geselecteerd",
   "note_apply_storage_label_to_previously_uploaded assets": "Opmerking: om het opslaglabel toe te passen op eerder geüploade assets, voer de volgende taak uit",
@@ -1358,6 +1368,7 @@
   "original": "origineel",
   "other": "Overige",
   "other_devices": "Andere apparaten",
+  "other_entities": "Andere entities",
   "other_variables": "Andere variabelen",
   "owned": "Eigenaar",
   "owner": "Eigenaar",
@@ -1518,6 +1529,8 @@
   "refreshing_faces": "Gezichten aan het vernieuwen",
   "refreshing_metadata": "Metadata aan het vernieuwen",
   "regenerating_thumbnails": "Thumbnails opnieuw aan het genereren",
+  "remote": "Remote",
+  "remote_assets": "Remote Assets",
   "remove": "Verwijderen",
   "remove_assets_album_confirmation": "Weet je zeker dat je {count, plural, one {# asset} other {# assets}} uit het album wilt verwijderen?",
   "remove_assets_shared_link_confirmation": "Weet je zeker dat je {count, plural, one {# asset} other {# assets}} uit deze gedeelde link wilt verwijderen?",
@@ -1555,11 +1568,15 @@
   "reset_password": "Wachtwoord resetten",
   "reset_people_visibility": "Zichtbaarheid mensen resetten",
   "reset_pin_code": "Reset PIN code",
+  "reset_sqlite": "Reset SQLite Database",
+  "reset_sqlite_confirmation": "Ben je zeker dat je de SQLite database wilt resetten? Je zal moetenn uitloggen om de data opnieuw te synchroniseren.",
+  "reset_sqlite_success": "De SQLite database is succesvol gereset",
   "reset_to_default": "Resetten naar standaard",
   "resolve_duplicates": "Duplicaten oplossen",
   "resolved_all_duplicates": "Alle duplicaten opgelost",
   "restore": "Herstellen",
   "restore_all": "Herstel alle",
+  "restore_trash_action_prompt": "{count} teruggezet uit prullenbak",
   "restore_user": "Gebruiker herstellen",
   "restored_asset": "Asset hersteld",
   "resume": "Hervatten",
@@ -1568,6 +1585,7 @@
   "role": "Rol",
   "role_editor": "Bewerker",
   "role_viewer": "Bekijker",
+  "running": "Actief",
   "save": "Opslaan",
   "save_to_gallery": "Opslaan in galerij",
   "saved_api_key": "API-sleutel opgeslagen",
@@ -1821,6 +1839,7 @@
   "storage_quota": "Opslaglimiet",
   "storage_usage": "{used} van {available} gebruikt",
   "submit": "Verzenden",
+  "success": "Succes",
   "suggestions": "Suggesties",
   "sunrise_on_the_beach": "Zonsopkomst op het strand",
   "support": "Ondersteuning",
@@ -1830,6 +1849,8 @@
   "sync": "Sync",
   "sync_albums": "Albums synchroniseren",
   "sync_albums_manual_subtitle": "Synchroniseer alle geüploade video’s en foto’s naar de geselecteerde back-up albums",
+  "sync_local": "Lokaal synchroniseren",
+  "sync_remote": "Op afstand synchroniseren",
   "sync_upload_album_setting_subtitle": "Maak en upload je foto's en video's naar de geselecteerde albums op Immich",
   "tag": "Tag",
   "tag_assets": "Assets taggen",
@@ -1840,6 +1861,7 @@
   "tag_updated": "Tag bijgewerkt: {tag}",
   "tagged_assets": "{count, plural, one {# asset} other {# assets}} getagd",
   "tags": "Tags",
+  "tap_to_run_job": "Klik om job te starten",
   "template": "Template",
   "theme": "Thema",
   "theme_selection": "Thema selectie",
diff --git a/i18n/ru.json b/i18n/ru.json
index 84db991027..c0a01b0be2 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -228,7 +228,7 @@
     "password_settings_description": "Управление настройками входа по паролю",
     "paths_validated_successfully": "Все пути успешно прошли проверку",
     "person_cleanup_job": "Очистка персоны",
-    "quota_size_gib": "Размер квоты (ГБ)",
+    "quota_size_gib": "Размер квоты (GiB)",
     "refreshing_all_libraries": "Обновление всех библиотек",
     "registration": "Регистрация администратора",
     "registration_description": "Первый зарегистрированный пользователь будет назначен администратором. В дальнейшем этой учетной записи будет доступно создание дополнительных пользователей и управление сервером.",
@@ -241,7 +241,7 @@
     "server_external_domain_settings": "Внешний домен",
     "server_external_domain_settings_description": "Домен для публичных ссылок, включая http(s)://",
     "server_public_users": "Публичные пользователи",
-    "server_public_users_description": "Отображать всех пользователей (имена и email) для добавления в общие альбомы. Когда отключено, список пользователей будет доступен только администраторам.",
+    "server_public_users_description": "Выводить список пользователей (имена и email) в общих альбомах. Когда отключено, список доступен только администраторам, пользователи смогут делиться только ссылкой.",
     "server_settings": "Настройки сервера",
     "server_settings_description": "Управление настройками сервера",
     "server_welcome_message": "Приветственное сообщение",
@@ -407,7 +407,7 @@
   "album_remove_user": "Удалить пользователя?",
   "album_remove_user_confirmation": "Вы уверены, что хотите удалить пользователя {user}?",
   "album_search_not_found": "Не найдено альбомов по вашему запросу",
-  "album_share_no_users": "Похоже, вы поделились этим альбомом со всеми пользователями или у вас нет пользователей, с которыми можно поделиться.",
+  "album_share_no_users": "Нет доступных пользователей, с которыми можно поделиться альбомом.",
   "album_updated": "Альбом обновлён",
   "album_updated_setting_description": "Получать уведомление по электронной почте при добавлении новых ресурсов в общий альбом",
   "album_user_left": "Вы покинули {album}",
@@ -433,8 +433,8 @@
   "all_videos": "Все видео",
   "allow_dark_mode": "Разрешить темный режим",
   "allow_edits": "Разрешить редактирование",
-  "allow_public_user_to_download": "Разрешить скачивание публичным пользователям",
-  "allow_public_user_to_upload": "Разрешить публичным пользователям загружать файлы",
+  "allow_public_user_to_download": "Разрешить скачивание",
+  "allow_public_user_to_upload": "Разрешить добавление файлов",
   "alt_text_qr_code": "QR-код",
   "anti_clockwise": "Против часовой",
   "api_key": "API ключ",
@@ -573,6 +573,8 @@
   "backup_options_page_title": "Резервное копирование",
   "backup_setting_subtitle": "Настройка активного и фонового резервного копирования",
   "backward": "Назад",
+  "beta_sync": "Статус бета-синхронизации",
+  "beta_sync_subtitle": "Управление новой системой синхронизации",
   "biometric_auth_enabled": "Биометрическая аутентификация включена",
   "biometric_locked_out": "Вам закрыт доступ к биометрической аутентификации",
   "biometric_no_options": "Биометрическая аутентификация недоступна",
@@ -590,7 +592,7 @@
   "cache_settings_clear_cache_button": "Очистить кэш",
   "cache_settings_clear_cache_button_title": "Очищает кэш приложения. Это негативно повлияет на производительность, пока кэш не будет создан заново.",
   "cache_settings_duplicated_assets_clear_button": "ОЧИСТИТЬ",
-  "cache_settings_duplicated_assets_subtitle": "Фото и видео, занесенные приложением в черный список",
+  "cache_settings_duplicated_assets_subtitle": "Фото и видео, пропускаемые приложением",
   "cache_settings_duplicated_assets_title": "Дублирующиеся объекты ({count})",
   "cache_settings_statistics_album": "Миниатюры библиотеки",
   "cache_settings_statistics_full": "Полные изображения",
@@ -616,7 +618,7 @@
   "change_date": "Изменить дату",
   "change_description": "Изменить описание",
   "change_display_order": "Изменить порядок отображения",
-  "change_expiration_time": "Изменить время окончания",
+  "change_expiration_time": "Изменить срок действия",
   "change_location": "Изменить местоположение",
   "change_name": "Изменить имя",
   "change_name_successfully": "Имя успешно изменено",
@@ -692,7 +694,7 @@
   "copy_link": "Копировать ссылку",
   "copy_link_to_clipboard": "Скопировать ссылку в буфер обмена",
   "copy_password": "Скопировать пароль",
-  "copy_to_clipboard": "Скопировать в буфер обмена",
+  "copy_to_clipboard": "Скопировать настройки в буфер обмена",
   "country": "Страна",
   "cover": "Обложка",
   "covers": "Обложки",
@@ -830,7 +832,7 @@
   "edit_people": "Редактировать людей",
   "edit_tag": "Изменить тег",
   "edit_title": "Редактировать Заголовок",
-  "edit_user": "Редактирование пользователя",
+  "edit_user": "Изменить пользователя",
   "edited": "Отредактировано",
   "editor": "Редактор",
   "editor_close_without_save_prompt": "Изменения не будут сохранены",
@@ -994,7 +996,7 @@
   "experimental_settings_subtitle": "Используйте на свой страх и риск!",
   "experimental_settings_title": "Экспериментальные функции",
   "expire_after": "Истекает через",
-  "expired": "Срок действия истек",
+  "expired": "Срок действия истёк",
   "expires_date": "Срок действия до {date}",
   "explore": "Поиск",
   "explorer": "Проводник",
@@ -1051,6 +1053,9 @@
   "haptic_feedback_switch": "Включить тактильную отдачу",
   "haptic_feedback_title": "Тактильная отдача",
   "has_quota": "Квота",
+  "hash_asset": "Хешированный объект",
+  "hashed_assets": "Хешированные объекты",
+  "hashing": "Хеширование",
   "header_settings_add_header_tip": "Добавить заголовок",
   "header_settings_field_validator_msg": "Значение не может быть пустым",
   "header_settings_header_name_input": "Имя заголовка",
@@ -1083,6 +1088,7 @@
   "host": "Хост",
   "hour": "Час",
   "id": "ID",
+  "idle": "В ожидании",
   "ignore_icloud_photos": "Пропускать файлы из iCloud",
   "ignore_icloud_photos_description": "Не загружать файлы в Immich, если они хранятся в iCloud",
   "image": "Изображения",
@@ -1109,8 +1115,8 @@
   "include_archived": "Отображать архив",
   "include_shared_albums": "Включать общие альбомы",
   "include_shared_partner_assets": "Включать общие ресурсы партнера",
-  "individual_share": "Персональный доступ",
-  "individual_shares": "Индивидуальный доступ",
+  "individual_share": "Индивидуальная подборка",
+  "individual_shares": "Подборки",
   "info": "Информация",
   "interval": {
     "day_at_onepm": "Каждый день в 13:00",
@@ -1165,7 +1171,9 @@
   "list": "Список",
   "loading": "Загрузка",
   "loading_search_results_failed": "Загрузка результатов поиска не удалась",
+  "local": "На устройстве",
   "local_asset_cast_failed": "Невозможно транслировать объект, который ещё не загружен на сервер",
+  "local_assets": "Объекты на устройстве",
   "local_network": "Локальная сеть",
   "local_network_sheet_info": "Приложение будет подключаться к серверу по этому адресу, когда устройство подключено к выбранной Wi-Fi сети",
   "location_permission": "Доступ к местоположению",
@@ -1322,6 +1330,7 @@
   "no_results": "Нет результатов",
   "no_results_description": "Попробуйте использовать синоним или более общее ключевое слово",
   "no_shared_albums_message": "Создайте альбом для обмена фотографиями и видеозаписями с людьми в вашей сети",
+  "no_uploads_in_progress": "Нет активных загрузок",
   "not_in_any_album": "Ни в одном альбоме",
   "not_selected": "Не выбрано",
   "note_apply_storage_label_to_previously_uploaded assets": "Примечание: Чтобы применить метку хранилища к ранее загруженным ресурсам, запустите",
@@ -1359,6 +1368,7 @@
   "original": "оригинал",
   "other": "Другое",
   "other_devices": "Другие устройства",
+  "other_entities": "Другие объекты",
   "other_variables": "Другие переменные",
   "owned": "Мои",
   "owner": "Владелец",
@@ -1456,7 +1466,7 @@
   "profile_drawer_server_out_of_date_minor": "Версия сервера устарела. Пожалуйста, обновите его.",
   "profile_image_of_user": "Изображение профиля {user}",
   "profile_picture_set": "Фото профиля установлено.",
-  "public_album": "Публичный альбом",
+  "public_album": "Общий альбом",
   "public_share": "Публичный доступ",
   "purchase_account_info": "Поддержка",
   "purchase_activated_subtitle": "Благодарим вас за поддержку Immich и программного обеспечения с открытым исходным кодом",
@@ -1519,6 +1529,8 @@
   "refreshing_faces": "Обновление лиц",
   "refreshing_metadata": "Обновление метаданных",
   "regenerating_thumbnails": "Восстановление миниатюр",
+  "remote": "На сервере",
+  "remote_assets": "Объекты на сервере",
   "remove": "Удалить",
   "remove_assets_album_confirmation": "Вы действительно хотите удалить {count, plural, one {# объект} many {# объектов} other {# объекта}} из альбома?",
   "remove_assets_shared_link_confirmation": "Вы действительно хотите удалить {count, plural, one {# объект} many {# объектов} other {# объекта}} из публичного доступа по этой ссылке?",
@@ -1556,11 +1568,15 @@
   "reset_password": "Сброс пароля",
   "reset_people_visibility": "Восстановить видимость людей",
   "reset_pin_code": "Сбросить PIN-код",
+  "reset_sqlite": "Очистить базу данных SQLite",
+  "reset_sqlite_confirmation": "Вы уверены, что хотите очистить базу данных SQLite? Вам потребуется выйти из системы и снова войти для повторной синхронизации данных.",
+  "reset_sqlite_success": "База данных SQLite успешно очищена",
   "reset_to_default": "Восстановление значений по умолчанию",
   "resolve_duplicates": "Устранить дубликаты",
   "resolved_all_duplicates": "Все дубликаты устранены",
   "restore": "Восстановить",
   "restore_all": "Восстановить все",
+  "restore_trash_action_prompt": "{count} восстановлено из корзины",
   "restore_user": "Восстановить пользователя",
   "restored_asset": "Восстановленный объект",
   "resume": "Продолжить",
@@ -1569,6 +1585,7 @@
   "role": "Роль",
   "role_editor": "Редактор",
   "role_viewer": "Зритель",
+  "running": "Выполняется",
   "save": "Сохранить",
   "save_to_gallery": "Сохранить в галерею",
   "saved_api_key": "API ключ изменён",
@@ -1822,6 +1839,7 @@
   "storage_quota": "Квота хранилища",
   "storage_usage": "{used} из {available}",
   "submit": "Подтвердить",
+  "success": "Успешно",
   "suggestions": "Предложения",
   "sunrise_on_the_beach": "Восход солнца на пляже",
   "support": "Поддержка",
@@ -1831,6 +1849,8 @@
   "sync": "Синхр.",
   "sync_albums": "Синхронизировать альбомы",
   "sync_albums_manual_subtitle": "Синхронизировать все загруженные фото и видео в выбранные альбомы для резервного копирования",
+  "sync_local": "Синхронизировать локально",
+  "sync_remote": "Синхронизация с сервером",
   "sync_upload_album_setting_subtitle": "Создавайте и загружайте свои фотографии и видео в выбранные альбомы на сервер Immich",
   "tag": "Тег",
   "tag_assets": "Добавить теги",
@@ -1841,6 +1861,7 @@
   "tag_updated": "Тег {tag} изменен",
   "tagged_assets": "Тег назначен для {count, plural, one {# объекта} other {# объектов}}",
   "tags": "Теги",
+  "tap_to_run_job": "Нажмите для запуска задачи",
   "template": "Шаблон",
   "theme": "Тема",
   "theme_selection": "Выбор темы",
diff --git a/i18n/sk.json b/i18n/sk.json
index c8c1cb5303..a29262a6e8 100644
--- a/i18n/sk.json
+++ b/i18n/sk.json
@@ -45,14 +45,14 @@
     "backup_database_enable_description": "Povoliť výpisy z databázy",
     "backup_keep_last_amount": "Množstvo predchádzajúcich výpisov, ktoré sa majú zachovať",
     "backup_settings": "Nastavenia výpisu databázy",
-    "backup_settings_description": "Správa nastavení výpisu databázy.",
+    "backup_settings_description": "Spravovať nastavenia výpisu databázy.",
     "cleared_jobs": "Hotové úlohy pre: {job}",
     "config_set_by_file": "Konfigurácia je v súčasnosti nastavená konfiguračným súborom",
     "confirm_delete_library": "Naozaj chcete vymazať knižnicu {library}?",
     "confirm_delete_library_assets": "Ste si istí, že chcete vymazať túto knižnicu? Tato operácia nenávratne odstráni {count, plural, one {# zahrnutú položku} few {# zahrnuté položky} other {všetkých # zahrnutých položiek}} z aplikácie Immich. Súbory budú ponechané na disku.",
     "confirm_email_below": "Pre potvrdenie zadajte \"{email}\" nižšie",
     "confirm_reprocess_all_faces": "Naozaj chcete spracovať všetky tváre znova? Tento proces vymaže pomenovaných ľudí.",
-    "confirm_user_password_reset": "Naozaj chcete resetovať heslo pre {user}?",
+    "confirm_user_password_reset": "Naozaj chcete obnoviť heslo pre {user}?",
     "confirm_user_pin_code_reset": "Ste si istí, že chcete opätovne nastaviť PIN kód používateľa {user}?",
     "create_job": "Vytvoriť úlohu",
     "cron_expression": "Výraz cron",
@@ -61,10 +61,10 @@
     "disable_login": "Zakázať prihlásenie",
     "duplicate_detection_job_description": "Spustite strojové učenie na položkách pre detekciu podobných obrázkov. Spolieha sa na inteligentné vyhľadávanie",
     "exclusion_pattern_description": "Vylučovacie vzory Vám umožňujú ignorovať súbory a priečinky pri skenovaní Vašej knižnice. Toto je užitočné, ak máte priečinky obsahujúce súbory, ktoré nechcete importovať, napríklad RAW súbory.",
-    "external_library_management": "Správa Externej Knižnice",
+    "external_library_management": "Spravovanie externej knižnice",
     "face_detection": "Detekcia tvárí",
-    "face_detection_description": "Rozpoznajte tváre v položkách pomocou strojového učenia. V prípade videí sa berie do úvahy len náhľad. „Obnoviť“ (znovu) spracuje všetky položky. „Resetovať“ dodatočne vymaže všetky aktuálne údaje o tvárach. „Chýbajúce“ zaradí do poradia médiá, ktoré ešte neboli spracované. Zistené tváre sa po dokončení rozpoznávania tvárí zaradia do poradia na rozpoznávanie tvárí, pričom sa zoskupia do existujúcich alebo nových osôb.",
-    "facial_recognition_job_description": "Zoskupte rozpoznané tváre do osôb. Tento krok sa vykoná po dokončení rozpoznávania tvárí. „Resetovať“ (znovu) zoskupí všetky tváre. „Chýbajúce“ zaradí tváre, ktoré nemajú pridelenú osobu.",
+    "face_detection_description": "Rozpoznajte tváre v položkách pomocou strojového učenia. V prípade videí sa berie do úvahy len náhľad. „Aktualizovať“ (znovu) spracuje všetky položky. „Obnoviť“ dodatočne vymaže všetky aktuálne údaje o tvárach. „Chýbajúce“ zaradí do poradia médiá, ktoré ešte neboli spracované. Zistené tváre sa po dokončení rozpoznávania tvárí zaradia do poradia na rozpoznávanie tvárí, pričom sa zoskupia do existujúcich alebo nových osôb.",
+    "facial_recognition_job_description": "Zoskupte rozpoznané tváre do osôb. Tento krok sa vykoná po dokončení rozpoznávania tvárí. „Obnoviť“ (znovu) zoskupí všetky tváre. „Chýbajúce“ zaradí tváre, ktoré nemajú pridelenú osobu.",
     "failed_job_command": "Príkaz {command} zlyhal pre úlohu: {job}",
     "force_delete_user_warning": "VAROVANIE: Toto okamžite odstráni používateľa a všetky položky. Tento krok nie je možné vrátiť späť a súbory nebude možné obnoviť.",
     "image_format": "Formát",
@@ -94,7 +94,7 @@
     "job_not_concurrency_safe": "Táto úloha nie je bezpečná pre súbežné spracovanie.",
     "job_settings": "Úlohy",
     "job_settings_description": "Spravovať súbežnosť úloh",
-    "job_status": "Stav Úloh",
+    "job_status": "Stav úloh",
     "jobs_delayed": "{jobCount, plural, one {# oneskorený} few {# oneskorené} other {# oneskorených}}",
     "jobs_failed": "{jobCount, plural, one {# neúspešný} few {# neúspešné} other {# neúspešných}}",
     "library_created": "Vytvorená knižnica: {library}",
@@ -141,15 +141,15 @@
     "machine_learning_smart_search_enabled": "Povoliť inteligentné vyhľadávanie",
     "machine_learning_smart_search_enabled_description": "Ak je vypnuté, obrázky nebudú spracované pre inteligentné vyhľadávanie.",
     "machine_learning_url_description": "URL adresa servera strojového učenia. Ak je zadaných viacero adries URL, každý server bude testovaný postupne, kým jeden z nich neodpovie úspešne, v poradí od prvého po posledný. Servery, ktoré neodpovedajú, budú dočasne ignorované, kým nebudú opäť online.",
-    "manage_concurrency": "Správa súbežnosti",
+    "manage_concurrency": "Spravovať súbežnosť",
     "manage_log_settings": "Spravovať nastavenia ukladania záznamov",
     "map_dark_style": "Tmavý štýl",
     "map_enable_description": "Povoliť funkcie mapy",
     "map_gps_settings": "Mapa a nastavenia GPS",
-    "map_gps_settings_description": "Spravujte nastavenia mapy a GPS (reverzné geokódovanie)",
+    "map_gps_settings_description": "Spravovať nastavenia mapy a GPS (reverzné geokódovanie)",
     "map_implications": "Táto funkčnosť sa spolieha na externý servis spracovania mapových dlaždíc (tiles.immich.cloud)",
     "map_light_style": "Svetlý štýl",
-    "map_manage_reverse_geocoding_settings": "Správa nastavení <link>Reverzného geokódovania</link>",
+    "map_manage_reverse_geocoding_settings": "Spravovať nastavenia <link>reverzného geokódovania</link>",
     "map_reverse_geocoding": "Reverzné Geokódovanie",
     "map_reverse_geocoding_enable_description": "Povoliť reverzné geokódovanie",
     "map_reverse_geocoding_settings": "Reverzné geokódovanie",
@@ -214,7 +214,7 @@
     "oauth_role_claim_description": "Automaticky udeliť prístup správcu na základe prítomnosti tejto požiadavky. Požiadavka môže mať príznak „user“ alebo „admin“.",
     "oauth_settings": "OAuth",
     "oauth_settings_description": "Spravovať nastavenia prihlásenia OAuth",
-    "oauth_settings_more_details": "Pre viac informácii o tejto funkcii, prejdite na <link>docs</link>.",
+    "oauth_settings_more_details": "Pre viac informácii o tejto funkcii, prejdite na <link>dokumentáciu</link>.",
     "oauth_storage_label_claim": "Nárokovať Štítok úložiska",
     "oauth_storage_label_claim_description": "Automaticky nastaviť štítok úložiska používateľa na hodnotu tohto nároku.",
     "oauth_storage_quota_claim": "Deklarácia kvóty úložiska",
@@ -234,7 +234,7 @@
     "registration_description": "Keďže ste prvým používateľom v systéme, budú vám pridelené správcovské práva na vykonávanie všetkých úloh a vrátane tvorby nových používateľov.",
     "require_password_change_on_login": "Vyžadovať od používateľa zmenu hesla pri prvom prihlásení",
     "reset_settings_to_default": "Obnoviť pôvodné nastavenia",
-    "reset_settings_to_recent_saved": "Obnoviť naposledy uložené nastavenia",
+    "reset_settings_to_recent_saved": "Nastavenia boli obnovené na posledné uložené nastavenia",
     "scanning_library": "Knižnica sa skenuje",
     "search_jobs": "Vyhľadať úlohy…",
     "send_welcome_email": "Odoslať uvítací e-mail",
@@ -259,7 +259,7 @@
     "storage_template_migration_description": "Použite aktuálnu <link>{template}</link> na predtým nahrané médiá",
     "storage_template_migration_info": "Šablóna úložiska skonvertuje všetky prípony na malé písmená. Zmeny šablón sa budú vzťahovať iba na nové diela. Ak chcete šablónu spätne použiť na predtým nahrané médiá, spustite <link>{job}</link>.",
     "storage_template_migration_job": "Úloha migrácie šablóny úložiska",
-    "storage_template_more_details": "Ďalšie podrobnosti o tejto funkcii nájdete v <template-link>Šablóna úložiska</template-link> a jej <implications-link>dôsledky</implications-link>",
+    "storage_template_more_details": "Podrobnejšie informácie o tejto funkcii nájdete v časti <template-link>šablóna úložiska</template-link> a jej <implications-link>následky</implications-link>",
     "storage_template_onboarding_description_v2": "Ak je táto funkcia zapnutá, automaticky usporiada súbory na základe šablóny definovanej používateľom. Ďalšie informácie nájdete v <link>dokumentácii</link>.",
     "storage_template_path_length": "Približný limit dĺžky cesty: <b>{length, number}</b>/{limit, number}",
     "storage_template_settings": "Šablóna úložiska",
@@ -278,9 +278,9 @@
     "template_settings_description": "Spravovanie vlastných šablón upozornení",
     "theme_custom_css_settings": "Vlastné CSS",
     "theme_custom_css_settings_description": "CSS štýly umožňujú prispôsobiť dizajn Immich.",
-    "theme_settings": "Motívy",
+    "theme_settings": "Nastavenia témy",
     "theme_settings_description": "Spravovať prispôsobenie webového rozhrania Immich",
-    "thumbnail_generation_job": "Generovať Miniatúry",
+    "thumbnail_generation_job": "Generovať miniatúry",
     "thumbnail_generation_job_description": "Generujte veľké, malé a rozmazané miniatúry pre každú položku, ako aj miniatúry pre každú osobu",
     "transcoding_acceleration_api": "API pre akceleráciu",
     "transcoding_acceleration_api_description": "Rozhranie API, ktoré bude spolupracovať s vaším zariadením s cieľom urýchliť prekódovanie. Toto nastavenie je „najlepšie úsilie“: pri zlyhaní sa vráti k softvérovému prekódovaniu. VP9 môže alebo nemusí fungovať v závislosti od vášho hardvéru.",
@@ -300,7 +300,7 @@
     "transcoding_bitrate_description": "Videá presahujúce maximálnu bitovú rýchlosť alebo videá, ktoré nie sú v akceptovanom formáte",
     "transcoding_codecs_learn_more": "Ak sa chcete dozvedieť viac o tu použitej terminológii, pozrite si dokumentáciu FFmpeg pre <h264-link>kodek H.264</h264-link>, <hevc-link>kodek HEVC</hevc-link> a <vp9-link>VP9 kodek</vp9-link>.",
     "transcoding_constant_quality_mode": "Režim konštantnej kvality",
-    "transcoding_constant_quality_mode_description": "ICQ je lepšie ako CQP, ale niektoré zariadenia na hardvérovú akceleráciu tento režim nepodporujú. Nastavenie tejto možnosti uprednostní špecifikovaný režim pri použití kódovania založeného na kvalite. Ignorované spoločnosťou NVENC, pretože nepodporuje ICQ.",
+    "transcoding_constant_quality_mode_description": "ICQ je lepšie ako CQP, ale niektoré zariadenia na hardvérovú akceleráciu tento režim nepodporujú. Nastavenie tejto možnosti uprednostní špecifikovaný režim pri použití kódovania založeného na kvalite. Ignorované funkciou NVENC, pretože nepodporuje ICQ.",
     "transcoding_constant_rate_factor": "Faktor konštantnej rýchlosti (-crf)",
     "transcoding_constant_rate_factor_description": "Úroveň kvality videa. Typické hodnoty sú 23 pre H.264, 28 pre HEVC, 31 pre VP9 a 35 pre AV1. Nižšie je lepšie, ale vytvára väčšie súbory.",
     "transcoding_disabled_description": "Neprekódovať žiadne videá, na niektorých klientoch môže prerušiť prehrávanie",
@@ -321,13 +321,13 @@
     "transcoding_policy_description": "Nastavte, kedy bude video prekódované",
     "transcoding_preferred_hardware_device": "Uprednostňované hardvérové zariadenie",
     "transcoding_preferred_hardware_device_description": "Platí len pre VAAPI a QSV. Nastavuje uzol dri, ktorý sa používa na hardvérové prekódovanie.",
-    "transcoding_preset_preset": "Prednastavenie (-preset)",
+    "transcoding_preset_preset": "Predvoľba (-preset)",
     "transcoding_preset_preset_description": "Rýchlosť kompresie. Pomalšie predvoľby vytvárajú menšie súbory a zvyšujú kvalitu, keď sa zameriavajú na určitý dátový tok. VP9 ignoruje rýchlosti vyššie ako „rýchlejšie“.",
     "transcoding_reference_frames": "Referenčné snímky",
     "transcoding_reference_frames_description": "Počet snímok, na ktoré sa má odkazovať pri kompresii daného snímku. Vyššie hodnoty zvyšujú účinnosť kompresie, ale spomaľujú kódovanie. Hodnota 0 sa nastavuje automaticky.",
     "transcoding_required_description": "Iba videá, ktoré nie sú v prijatom formáte",
     "transcoding_settings": "Nastavenia prekódovania videa",
-    "transcoding_settings_description": "Spravujte, ktoré videá sa majú prekódovať a ako ich spracovať",
+    "transcoding_settings_description": "Spravovať, ktoré videá sa majú prekódovať a ako sa majú spracovať",
     "transcoding_target_resolution": "Cieľové rozlíšenie",
     "transcoding_target_resolution_description": "Vyššie rozlíšenia môžu zachovať viac detailov, ale ich kódovanie trvá dlhšie, majú väčšiu veľkosť súborov a môžu znížiť odozvu aplikácie.",
     "transcoding_temporal_aq": "Časové AQ",
@@ -349,13 +349,13 @@
     "trash_settings_description": "Spravovať nastavenia koša",
     "user_cleanup_job": "Premazanie používateľov",
     "user_delete_delay": "Konto <b>{user}</b> a jeho médiá budú podľa plánu natrvalo vymazané za {delay, plural, one {# deň} few {# dni} other {# dní}}.",
-    "user_delete_delay_settings": "Odstrániť oneskorenie",
-    "user_delete_delay_settings_description": "Počet dní po odstránení na trvalé vymazanie účtu a médií používateľa. Úloha odstraňovania používateľov sa spúšťa o polnoci, aby sa skontrolovali používatelia, ktorí sú pripravení na odstránenie. Zmeny tohto nastavenia sa vyhodnotia pri ďalšom spustení.",
+    "user_delete_delay_settings": "Oneskorenie vymazania",
+    "user_delete_delay_settings_description": "Počet dní, po ktorých sa po odstránení používateľa natrvalo odstráni jeho účet a položky. Úloha odstraňovania používateľov sa spúšťa o polnoci, aby sa skontrolovali používatelia, ktorí sú pripravení na odstránenie. Zmeny tohto nastavenia sa vyhodnotia pri ďalšom spustení.",
     "user_delete_immediately": "Konto a médiá používateľa <b>{user}</b> budú zaradené do poradia na trvalé vymazanie <b>okamžite</b>.",
     "user_delete_immediately_checkbox": "Používateľ a médiá budú zaradení do frontu na okamžité vymazanie",
     "user_details": "Podrobnosti o používateľovi",
-    "user_management": "Správa používateľov",
-    "user_password_has_been_reset": "Heslo používateľa bolo resetované:",
+    "user_management": "Spravovanie používateľov",
+    "user_password_has_been_reset": "Heslo používateľa bolo obnovené:",
     "user_password_reset_description": "Poskytnite používateľovi dočasné heslo a informujte ho, že si ho bude musieť zmeniť pri ďalšom prihlásení.",
     "user_restore_description": "<b>{user}</b> bude účet obnovený.",
     "user_restore_scheduled_removal": "Obnoviť používateľa - plánované odstránenie na {date, date, long}",
@@ -393,7 +393,7 @@
   "age_year_months": "Vek 1 rok, {months, plural, one {# month} other {# months}}",
   "age_years": "{years, plural, other {Vek #}}",
   "album_added": "Album bol pridaný",
-  "album_added_notification_setting_description": "Obdržať upozornenie emailom, keď ste pridaní do zdieľaného albumu",
+  "album_added_notification_setting_description": "Obdržať upozornenie emailom, keď vás pridajú do zdieľaného albumu",
   "album_cover_updated": "Obal albumu aktualizovaný",
   "album_delete_confirmation": "Ste si istý, že chcete odstrániť album {album}?",
   "album_delete_confirmation_description": "Ak je tento album zdieľaný, ostatní používatelia k nemu už nebudú mať prístup.",
@@ -573,6 +573,8 @@
   "backup_options_page_title": "Možnosti zálohovania",
   "backup_setting_subtitle": "Spravovať nastavenia odosielania na pozadí a v popredí",
   "backward": "Dozadu",
+  "beta_sync": "Stav synchronizácie verzie Beta",
+  "beta_sync_subtitle": "Spravovať nový systém synchronizácie",
   "biometric_auth_enabled": "Biometrické overovanie je povolené",
   "biometric_locked_out": "Ste vymknutí z biometrického overovania",
   "biometric_no_options": "Nie sú k dispozícii žiadne biometrické možnosti",
@@ -590,7 +592,7 @@
   "cache_settings_clear_cache_button": "Vymazať vyrovnávaciu pamäť",
   "cache_settings_clear_cache_button_title": "Vymaže vyrovnávaciu pamäť aplikácie. To výrazne ovplyvní výkon aplikácie, kým sa vyrovnávacia pamäť neobnoví.",
   "cache_settings_duplicated_assets_clear_button": "VYČISTIŤ",
-  "cache_settings_duplicated_assets_subtitle": "Fotky a videá ktoré sú na čiernej listine zvolené aplikáciou",
+  "cache_settings_duplicated_assets_subtitle": "Fotografie a videá, ktoré aplikácia ignoruje podľa zoznamu",
   "cache_settings_duplicated_assets_title": "Duplicitné položky ({count})",
   "cache_settings_statistics_album": "Knižnica náhľadov",
   "cache_settings_statistics_full": "Kompletné fotografie",
@@ -628,7 +630,7 @@
   "change_password_form_password_mismatch": "Heslá sa nezhodujú",
   "change_password_form_reenter_new_password": "Znova zadajte nové heslo",
   "change_pin_code": "Zmeniť PIN kód",
-  "change_your_password": "Zmeňte si heslo",
+  "change_your_password": "Zmeniť heslo",
   "changed_visibility_successfully": "Viditeľnosť bola úspešne zmenená",
   "check_corrupt_asset_backup": "Skontrolovať, či nie sú poškodené zálohy položiek",
   "check_corrupt_asset_backup_button": "Vykonať kontrolu",
@@ -723,7 +725,7 @@
   "custom_locale_description": "Formátovanie dátumov a čísel podľa jazyka a regiónu",
   "daily_title_text_date": "EEEE, d. MMMM",
   "daily_title_text_date_year": "EEEE, d. MMMM y",
-  "dark": "Tmavý",
+  "dark": "Tmavá",
   "dark_theme": "Prepnúť tmavú tému",
   "date_after": "Dátum po",
   "date_and_time": "Dátum a Čas",
@@ -949,7 +951,7 @@
     "unable_to_remove_library": "Nie je možné odstrániť knižnicu",
     "unable_to_remove_partner": "Nie je možné odstrániť partnera",
     "unable_to_remove_reaction": "Nie je možné odstrániť reakciu",
-    "unable_to_reset_password": "Nie je možné resetovať heslo",
+    "unable_to_reset_password": "Nie je možné obnoviť heslo",
     "unable_to_reset_pin_code": "Nie je možné obnoviť PIN kód",
     "unable_to_resolve_duplicate": "Nie je možné vyriešiť duplikát",
     "unable_to_restore_assets": "Nie je možné obnoviť položky",
@@ -987,7 +989,7 @@
   "exif_bottom_sheet_person_age_months": "Vek {months} mesiacov",
   "exif_bottom_sheet_person_age_year_months": "Vek 1 rok, {months} mesiacov",
   "exif_bottom_sheet_person_age_years": "Vek {years}",
-  "exit_slideshow": "Opustiť Slideshow",
+  "exit_slideshow": "Opustiť prezentáciu",
   "expand_all": "Rozbaliť všetko",
   "experimental_settings_new_asset_list_subtitle": "Prebiehajúca práca",
   "experimental_settings_new_asset_list_title": "Povolenie experimentálnej mriežky fotografií",
@@ -1051,6 +1053,9 @@
   "haptic_feedback_switch": "Povoliť hmatovú odozvu",
   "haptic_feedback_title": "Hmatová odozva",
   "has_quota": "Má kvótu",
+  "hash_asset": "Hashovať položku",
+  "hashed_assets": "Hashované položky",
+  "hashing": "Hashovanie",
   "header_settings_add_header_tip": "Pridať hlavičku",
   "header_settings_field_validator_msg": "Hodnota nemôže byť prázdna",
   "header_settings_header_name_input": "Názov hlavičky",
@@ -1083,6 +1088,7 @@
   "host": "Hostiteľ",
   "hour": "Hodina",
   "id": "ID",
+  "idle": "Nečinné",
   "ignore_icloud_photos": "Ignorovať fotky v službe iCloud",
   "ignore_icloud_photos_description": "Fotografie uložené v službe iCloud sa nebudú odosielať na server Immich",
   "image": "Obrázok",
@@ -1139,7 +1145,7 @@
   "language_no_results_subtitle": "Skúste upraviť hľadaný výraz",
   "language_no_results_title": "Neboli nájdené žiadne jazyky",
   "language_search_hint": "Vyhľadať jazyky...",
-  "language_setting_description": "Vyberte preferovaný jazyk",
+  "language_setting_description": "Vyberte požadovaný jazyk",
   "last_seen": "Naposledy videné",
   "latest_version": "Najnovšia verzia",
   "latitude": "Zemepisná šírka",
@@ -1156,7 +1162,7 @@
   "library_page_sort_last_modified": "Naposledy upravené",
   "library_page_sort_title": "Podľa názvu albumu",
   "licenses": "Licencie",
-  "light": "Svetlý",
+  "light": "Svetlá",
   "like_deleted": "Like odstránený",
   "link_motion_video": "Pripojiť pohyblivé video",
   "link_options": "Možnosti odkazu",
@@ -1165,7 +1171,9 @@
   "list": "Zoznam",
   "loading": "Načítavanie",
   "loading_search_results_failed": "Načítanie výsledkov hľadania sa nepodarilo",
+  "local": "Lokálne",
   "local_asset_cast_failed": "Nie je možné preniesť médium, ktoré nie je nahrané na serveri",
+  "local_assets": "Lokálne položky",
   "local_network": "Miestna sieť",
   "local_network_sheet_info": "Pri použití zadanej siete Wi-Fi sa aplikácia pripojí k serveru prostredníctvom tejto URL adresy",
   "location_permission": "Povolenie na určenie polohy",
@@ -1277,7 +1285,7 @@
   "move_off_locked_folder": "Presunúť zo zamknutého priečinka",
   "move_to_lock_folder_action_prompt": "{count} pridaných do zamknutého priečinka",
   "move_to_locked_folder": "Presunúť do zamknutého priečinka",
-  "move_to_locked_folder_confirmation": "Tieto fotografie a videá budú odstránené zo všetkých albumov a bude ich možné zobraziť len v zamknutom priečinku",
+  "move_to_locked_folder_confirmation": "Tieto fotografie a videá budú odobrané zo všetkých albumov a bude ich možné zobraziť len v zamknutom priečinku",
   "moved_to_archive": "{count, plural, one {Presunutá # položka} few {Presunuté # položky} other {Presunutých # položiek}} do archívu",
   "moved_to_library": "{count, plural, one {Presunutá # položka} few {Presunuté # položky} other {Presunutých # položiek}} do knižnice",
   "moved_to_trash": "Presunuté do koša",
@@ -1322,6 +1330,7 @@
   "no_results": "Žiadne výsledky",
   "no_results_description": "Skúste synonymum alebo všeobecnejší výraz",
   "no_shared_albums_message": "Vytvorí album na zdieľanie fotiek a videí s ľuďmi vo vašej sieti",
+  "no_uploads_in_progress": "Žiadne prebiehajúce nahrávanie",
   "not_in_any_album": "Nie je v žiadnom albume",
   "not_selected": "Nevybrané",
   "note_apply_storage_label_to_previously_uploaded assets": "Poznámka: Ak chcete použiť Štítok úložiska na predtým nahrané médiá, spustite príkaz",
@@ -1343,7 +1352,7 @@
   "onboarding": "Na palube",
   "onboarding_locale_description": "Vyberte požadovaný jazyk. Neskôr ho môžete zmeniť v nastaveniach.",
   "onboarding_privacy_description": "Nasledujúce (voliteľné) funkcie závisia na externých službách a kedykoľvek ich môžete vypnúť nastaveniach.",
-  "onboarding_server_welcome_description": "Nastavme vašu inštanciu pomocou bežných nastavení.",
+  "onboarding_server_welcome_description": "Poďme si nastaviť vašu inštanciu s niekoľkými bežnými nastaveniami.",
   "onboarding_theme_description": "Vyberte farbu témy pre váš server. Môžete to aj neskôr zmeniť vo vašich nastaveniach.",
   "onboarding_user_welcome_description": "Začnime!",
   "onboarding_welcome_user": "Vitaj, {user}",
@@ -1359,6 +1368,7 @@
   "original": "originál",
   "other": "Ostatné",
   "other_devices": "Ďalšie zariadenia",
+  "other_entities": "Ostatné subjekty",
   "other_variables": "Ostatné premenné",
   "owned": "Vlastnené",
   "owner": "Vlastník",
@@ -1434,9 +1444,9 @@
   "play_or_pause_video": "Pustí alebo pozastaví video",
   "please_auth_to_access": "Prosím, potvrďte overenie pre prístup",
   "port": "Port",
-  "preferences_settings_subtitle": "Spravujte predvoľby aplikácie",
+  "preferences_settings_subtitle": "Spravovať predvoľby aplikácie",
   "preferences_settings_title": "Predvoľby",
-  "preset": "Prednastavenie",
+  "preset": "Predvoľba",
   "preview": "Náhľad",
   "previous": "Predošlé",
   "previous_memory": "Predošlá spomienka",
@@ -1508,7 +1518,7 @@
   "recently_added_page_title": "Nedávno pridané",
   "recently_taken": "Nedávno nasnímané",
   "recently_taken_page_title": "Nedávno zhotovené",
-  "refresh": "Obnoviť",
+  "refresh": "Aktualizovať",
   "refresh_encoded_videos": "Obnoviť enkódované videá",
   "refresh_faces": "Obnoviť tváre",
   "refresh_metadata": "Obnoviť metadáta",
@@ -1519,6 +1529,8 @@
   "refreshing_faces": "Obnovovanie tvárí",
   "refreshing_metadata": "Obnovovanie metadát",
   "regenerating_thumbnails": "Pregenerovanie náhľadov",
+  "remote": "Vzdialené",
+  "remote_assets": "Vzdialené položky",
   "remove": "Odstrániť",
   "remove_assets_album_confirmation": "Naozaj chcete odstrániť {count, plural, one {# položku} few {# položky} other {# položiek}} z albumu?",
   "remove_assets_shared_link_confirmation": "Naozaj chcete odstrániť {count, plural, one {# položku} few {# položky} other {# položiek}} z tohoto zdieľaného odkazu?",
@@ -1529,8 +1541,8 @@
   "remove_from_album_action_prompt": "{count} odstránené z albumu",
   "remove_from_favorites": "Odstrániť z obľúbených",
   "remove_from_lock_folder_action_prompt": "{count} odobrané zo zamknutého priečinka",
-  "remove_from_locked_folder": "Odstrániť zo zamknutého priečinka",
-  "remove_from_locked_folder_confirmation": "Ste si istí, že chcete tieto fotografie a videá presunúť zo zamknutého priečinka? Budú viditeľné vo vašej knižnici.",
+  "remove_from_locked_folder": "Odobrať zo zamknutého priečinka",
+  "remove_from_locked_folder_confirmation": "Ste si istí, že chcete tieto fotografie a videá odobrať zo zamknutého priečinka? Budú viditeľné vo vašej knižnici.",
   "remove_from_shared_link": "Odstrániť zo zdieľaného odkazu",
   "remove_memory": "Odstrániť spomienku",
   "remove_photo_from_memory": "Odstrániť fotografiu z tejto spomienky",
@@ -1552,28 +1564,33 @@
   "require_password": "Vyžadovať heslo",
   "require_user_to_change_password_on_first_login": "Vyžadovať zmenu hesla po prvom prihlásení",
   "rescan": "Opätovné vyhľadávanie",
-  "reset": "Resetovať",
+  "reset": "Obnoviť",
   "reset_password": "Obnoviť heslo",
-  "reset_people_visibility": "Resetovať viditeľnosť ľudí",
+  "reset_people_visibility": "Obnoviť viditeľnosť ľudí",
   "reset_pin_code": "Obnoviť PIN kód",
-  "reset_to_default": "Resetovať na predvolené",
+  "reset_sqlite": "Obnoviť SQLite databázu",
+  "reset_sqlite_confirmation": "Ste si istí, že chcete obnoviť SQLite databázu? Na opätovnú synchronizáciu údajov sa budete musieť odhlásiť a znova prihlásiť",
+  "reset_sqlite_success": "Úspešné obnovenie databázy SQLite",
+  "reset_to_default": "Obnoviť na predvolené",
   "resolve_duplicates": "Vyriešiť duplicity",
   "resolved_all_duplicates": "Vyriešené všetky duplicity",
   "restore": "Navrátiť",
   "restore_all": "Navrátit všetko",
+  "restore_trash_action_prompt": "{count} obnovených z koša",
   "restore_user": "Navrátiť používateľa",
   "restored_asset": "Navrátené položky",
   "resume": "Pokračovať",
   "retry_upload": "Zopakovať nahrávanie",
-  "review_duplicates": "Prezrieť duplikáty",
+  "review_duplicates": "Preskúmať duplikáty",
   "role": "Rola",
   "role_editor": "Editor",
   "role_viewer": "Divák",
+  "running": "Spustené",
   "save": "Uložiť",
   "save_to_gallery": "Uložiť do galérie",
   "saved_api_key": "Uložený API Kľúč",
   "saved_profile": "Uložený profil",
-  "saved_settings": "Uložené nastavenia",
+  "saved_settings": "Nastavenia boli uložené",
   "say_something": "Napíšte niečo",
   "scaffold_body_error_occurred": "Vyskytla sa chyba",
   "scan_all_libraries": "Preskenovať všetky knižnice",
@@ -1585,7 +1602,7 @@
   "search_by_context": "Hľadať s kontextom",
   "search_by_description": "Vyhľadávanie podľa popisu",
   "search_by_description_example": "Pešia turistika v Sape",
-  "search_by_filename": "Hľadať s názvom alebo príponou súboru",
+  "search_by_filename": "Hľadať podľa názvu alebo prípony súboru",
   "search_by_filename_example": "napr. IMG_1234.JPG alebo PNG",
   "search_camera_make": "Hľadať značku fotoaparátu...",
   "search_camera_model": "Hľadať model fotoaparátu...",
@@ -1809,7 +1826,7 @@
   "stacked_assets_count": "{count, plural, one {Zoskupená # položka} few {Zoskupené # položky} other {Zoskupených # položiek}}",
   "stacktrace": "Výpis zásobníku",
   "start": "Štart",
-  "start_date": "Začiatočný dátum",
+  "start_date": "Počiatočný dátum",
   "state": "Štát",
   "status": "Stav",
   "stop_casting": "Zastaviť prenos",
@@ -1822,6 +1839,7 @@
   "storage_quota": "Úložný limit",
   "storage_usage": "Využitých {used} z {available}",
   "submit": "Odoslať",
+  "success": "Úspech",
   "suggestions": "Návrhy",
   "sunrise_on_the_beach": "Východ slnka na pláži",
   "support": "Podpora",
@@ -1831,9 +1849,11 @@
   "sync": "Synchronizovať",
   "sync_albums": "Synchronizovať albumy",
   "sync_albums_manual_subtitle": "Synchronizujte všetky nahrané videá a fotografie s vybranými záložnými albumami",
+  "sync_local": "Synchronizovať lokálne",
+  "sync_remote": "Synchronizovať vzdialené",
   "sync_upload_album_setting_subtitle": "Vytvárajte a nahrávajte svoje fotografie a videá do vybraných albumov na Immich",
   "tag": "Štítok",
-  "tag_assets": "Označiť položky",
+  "tag_assets": "Pridať štítky",
   "tag_created": "Vytvorený štítok: {tag}",
   "tag_feature_description": "Prehliadanie fotiek a videá zoskupených podľa tematických štítkov",
   "tag_not_found_question": "Neviete nájsť štítok? <link>Vytvorte nový štítok.</link>",
@@ -1841,6 +1861,7 @@
   "tag_updated": "Upravený štítok: {tag}",
   "tagged_assets": "Štítok priradený {count, plural, one {# položke} other {# položkám}}",
   "tags": "Štítky",
+  "tap_to_run_job": "Ťuknutím na položku spustíte úlohu",
   "template": "Šablóna",
   "theme": "Téma",
   "theme_selection": "Výber témy",
@@ -1863,7 +1884,7 @@
   "time_based_memories": "Časové spomienky",
   "timeline": "Časová os",
   "timezone": "Časové pásmo",
-  "to_archive": "Archív",
+  "to_archive": "Archivovať",
   "to_change_password": "Zmeniť heslo",
   "to_favorite": "Obľúbiť",
   "to_login": "Prihlásiť",
@@ -1898,7 +1919,7 @@
   "unfavorite_action_prompt": "{count} odstránené z Obľúbených",
   "unhide_person": "Odkryť osobu",
   "unknown": "Neznáme",
-  "unknown_country": "Neznámy štát",
+  "unknown_country": "Neznáma krajina",
   "unknown_year": "Neznámy rok",
   "unlimited": "Neobmedzené",
   "unlink_motion_video": "Odpojiť pohyblivé video",
@@ -1986,7 +2007,7 @@
   "viewer_stack_use_as_main_asset": "Použiť ako hlavnú fotku",
   "viewer_unstack": "Odskupiť",
   "visibility_changed": "Viditeľnosť zmenená pre {count, plural, one {# osobu} few {# osoby} other {# osôb}}",
-  "waiting": "Čaká",
+  "waiting": "Čakajúce",
   "warning": "Varovanie",
   "week": "Týždeň",
   "welcome": "Vitajte",
@@ -1996,7 +2017,7 @@
   "year": "Rok",
   "years_ago": "pred {years, plural, one {# rokom} other {# rokmi}}",
   "yes": "Áno",
-  "you_dont_have_any_shared_links": "Nemáte žiadne zdielané linky",
+  "you_dont_have_any_shared_links": "Nemáte žiadne zdielané odkazy",
   "your_wifi_name": "Váš názov siete Wi-Fi",
   "zoom_image": "Priblížiť obrázok"
 }
diff --git a/i18n/sl.json b/i18n/sl.json
index c4409c717e..e08a9dd506 100644
--- a/i18n/sl.json
+++ b/i18n/sl.json
@@ -573,6 +573,8 @@
   "backup_options_page_title": "Možnosti varnostne kopije",
   "backup_setting_subtitle": "Upravljaj nastavitve nalaganja v ozadju in ospredju",
   "backward": "Nazaj",
+  "beta_sync": "Stanje sinhronizacije beta različice",
+  "beta_sync_subtitle": "Upravljanje novega sistema sinhronizacije",
   "biometric_auth_enabled": "Biometrična avtentikacija omogočena",
   "biometric_locked_out": "Biometrična avtentikacija vam je onemogočena",
   "biometric_no_options": "Biometrične možnosti niso na voljo",
@@ -590,7 +592,7 @@
   "cache_settings_clear_cache_button": "Počisti predpomnilnik",
   "cache_settings_clear_cache_button_title": "Počisti predpomnilnik aplikacije. To bo znatno vplivalo na delovanje aplikacije, dokler se predpomnilnik ne obnovi.",
   "cache_settings_duplicated_assets_clear_button": "POČISTI",
-  "cache_settings_duplicated_assets_subtitle": "Fotografije in videoposnetki, ki jih je aplikacija uvrstila na črni seznam",
+  "cache_settings_duplicated_assets_subtitle": "Fotografije in videoposnetki, ki so prezrti s strani aplikacije",
   "cache_settings_duplicated_assets_title": "Podvojena sredstva ({count})",
   "cache_settings_statistics_album": "Sličice knjižnice",
   "cache_settings_statistics_full": "Izvirne slike",
@@ -1051,6 +1053,9 @@
   "haptic_feedback_switch": "Uporabi haptičen odziv",
   "haptic_feedback_title": "Haptičen odziv",
   "has_quota": "Ima kvoto",
+  "hash_asset": "Zgoščeno sredstvo",
+  "hashed_assets": "Zgoščena sredstva",
+  "hashing": "Zgoščevanje",
   "header_settings_add_header_tip": "Dodaj glavo",
   "header_settings_field_validator_msg": "Vrednost ne sme biti prazna",
   "header_settings_header_name_input": "Ime glave",
@@ -1083,6 +1088,7 @@
   "host": "Gostitelj",
   "hour": "Ura",
   "id": "ID",
+  "idle": "Nedejavnost",
   "ignore_icloud_photos": "Ignoriraj fotografije iCloud",
   "ignore_icloud_photos_description": "Fotografije, shranjene v iCloud, ne bodo naložene na strežnik Immich",
   "image": "Slika",
@@ -1165,7 +1171,9 @@
   "list": "Seznam",
   "loading": "Nalaganje",
   "loading_search_results_failed": "Nalaganje rezultatov iskanja ni uspelo",
+  "local": "Lokalno",
   "local_asset_cast_failed": "Sredstva, ki niso naložena na strežnik, ni mogoče predvajati",
+  "local_assets": "Lokalna sredstva",
   "local_network": "Lokalno omrežje",
   "local_network_sheet_info": "Aplikacija se bo povezala s strežnikom prek tega URL-ja, ko bo uporabljala navedeno omrežje Wi-Fi",
   "location_permission": "Dovoljenje za lokacijo",
@@ -1322,6 +1330,7 @@
   "no_results": "Brez rezultatov",
   "no_results_description": "Poskusite s sinonimom ali bolj splošno ključno besedo",
   "no_shared_albums_message": "Ustvarite album za skupno rabo fotografij in videoposnetkov z osebami v vašem omrežju",
+  "no_uploads_in_progress": "Ni nalaganj v teku",
   "not_in_any_album": "Ni v nobenem albumu",
   "not_selected": "Ni izbrano",
   "note_apply_storage_label_to_previously_uploaded assets": "Opomba: Če želite oznako za shranjevanje uporabiti za predhodno naložena sredstva, zaženite",
@@ -1359,6 +1368,7 @@
   "original": "izvirnik",
   "other": "drugo",
   "other_devices": "Druge naprave",
+  "other_entities": "Drugi subjekti",
   "other_variables": "Druge spremenljivke",
   "owned": "V lasti",
   "owner": "Lastnik",
@@ -1390,7 +1400,7 @@
   "pause": "Premor",
   "pause_memories": "Zaustavi spomine",
   "paused": "Zaustavljeno",
-  "pending": "V teku",
+  "pending": "Čakanje",
   "people": "Osebe",
   "people_edits_count": "{count, plural, one {Urejena # oseba} two {Urejeni # osebi} few {Urejene # osebe} other {Urejenih # oseb}}",
   "people_feature_description": "Brskanje po fotografijah in videoposnetkih, razvrščenih po osebah",
@@ -1519,6 +1529,8 @@
   "refreshing_faces": "Osveževanje obrazev",
   "refreshing_metadata": "Osveževanje metapodatkov",
   "regenerating_thumbnails": "Obnavljanje sličic",
+  "remote": "Oddaljeno",
+  "remote_assets": "Oddaljena sredstva",
   "remove": "Odstrani",
   "remove_assets_album_confirmation": "Ali ste prepričani, da želite odstraniti {count, plural, one {# sredstvo} two {# sredstvi} few {# sredstva} other {# sredstev}} iz albuma?",
   "remove_assets_shared_link_confirmation": "Ali ste prepričani, da želite odstraniti {count, plural, one {# sredstvo} two {# sredstvi} few {# sredstva} other {# sredstev}} iz te skupne povezave?",
@@ -1556,11 +1568,15 @@
   "reset_password": "Ponastavi geslo",
   "reset_people_visibility": "Ponastavi vidnost ljudi",
   "reset_pin_code": "Ponastavi PIN kodo",
+  "reset_sqlite": "Ponastavi bazo podatkov SQLite",
+  "reset_sqlite_confirmation": "Ali ste prepričani, da želite ponastaviti bazo podatkov SQLite? Za ponovno sinhronizacijo podatkov se boste morali odjaviti in znova prijaviti",
+  "reset_sqlite_success": "Uspešno ponastavljena baza podatkov SQLite",
   "reset_to_default": "Ponastavi na privzeto",
   "resolve_duplicates": "Razreši dvojnike",
   "resolved_all_duplicates": "Razrešeni vsi dvojniki",
   "restore": "Obnovi",
   "restore_all": "Obnovi vse",
+  "restore_trash_action_prompt": "{count} obnovljenih iz koša",
   "restore_user": "Obnovi uporabnika",
   "restored_asset": "Obnovljeno sredstvo",
   "resume": "Nadaljuj",
@@ -1569,6 +1585,7 @@
   "role": "Vloga",
   "role_editor": "Urejevalec",
   "role_viewer": "Gledalec",
+  "running": "V teku",
   "save": "Shrani",
   "save_to_gallery": "Shrani v galerijo",
   "saved_api_key": "Shranjen API ključ",
@@ -1822,6 +1839,7 @@
   "storage_quota": "Kvota shranjevanja",
   "storage_usage": "uporabljeno {used} od {available}",
   "submit": "Predloži",
+  "success": "Uspeh",
   "suggestions": "Predlogi",
   "sunrise_on_the_beach": "Sončni vzhod na plaži",
   "support": "Podpora",
@@ -1831,6 +1849,8 @@
   "sync": "Sinhronizacija",
   "sync_albums": "Sinhronizacija albumov",
   "sync_albums_manual_subtitle": "Sinhronizirajte vse naložene videoposnetke in fotografije v izbrane varnostne albume",
+  "sync_local": "Sinhroniziraj lokalno",
+  "sync_remote": "Sinhroniziraj oddaljeno",
   "sync_upload_album_setting_subtitle": "Ustvarite in naložite svoje fotografije in videoposnetke v izbrane albume na Immich",
   "tag": "Oznaka",
   "tag_assets": "Označi sredstva",
@@ -1841,6 +1861,7 @@
   "tag_updated": "Posodobljena oznaka: {tag}",
   "tagged_assets": "Označeno {count, plural, one {# sredstvo} two {# sredstvi} few {# sredstva} other {# sredstev}}",
   "tags": "Oznake",
+  "tap_to_run_job": "Dotaknite se za zagon opravila",
   "template": "Predloga",
   "theme": "Tema",
   "theme_selection": "Izbira teme",
diff --git a/i18n/zh_SIMPLIFIED.json b/i18n/zh_SIMPLIFIED.json
index 28d6a5c0d5..bcbdcc5d6b 100644
--- a/i18n/zh_SIMPLIFIED.json
+++ b/i18n/zh_SIMPLIFIED.json
@@ -573,6 +573,8 @@
   "backup_options_page_title": "备份选项",
   "backup_setting_subtitle": "管理后台和前台上传设置",
   "backward": "后退",
+  "beta_sync": "测试版同步状态",
+  "beta_sync_subtitle": "管理新的同步系统",
   "biometric_auth_enabled": "生物识别身份验证已启用",
   "biometric_locked_out": "您被锁定在生物识别身份验证之外",
   "biometric_no_options": "没有可用的生物识别选项",
@@ -590,7 +592,7 @@
   "cache_settings_clear_cache_button": "清除缓存",
   "cache_settings_clear_cache_button_title": "清除应用缓存。在重新生成缓存之前，将显著影响应用的性能。",
   "cache_settings_duplicated_assets_clear_button": "清除",
-  "cache_settings_duplicated_assets_subtitle": "已加入黑名单的照片和视频",
+  "cache_settings_duplicated_assets_subtitle": "应用程序忽略的照片和视频",
   "cache_settings_duplicated_assets_title": "重复项目（{count}）",
   "cache_settings_statistics_album": "图库缩略图",
   "cache_settings_statistics_full": "完整图像",
@@ -1051,6 +1053,9 @@
   "haptic_feedback_switch": "启用振动反馈",
   "haptic_feedback_title": "振动反馈",
   "has_quota": "配额大小",
+  "hash_asset": "哈希项目",
+  "hashed_assets": "已哈希的项目",
+  "hashing": "正在哈希",
   "header_settings_add_header_tip": "添加标头",
   "header_settings_field_validator_msg": "设置不可为空",
   "header_settings_header_name_input": "标头名称",
@@ -1083,6 +1088,7 @@
   "host": "服务器",
   "hour": "时",
   "id": "ID",
+  "idle": "空闲",
   "ignore_icloud_photos": "忽略 iCloud 照片",
   "ignore_icloud_photos_description": "存储在 iCloud 中的照片不会上传至 Immich 服务器",
   "image": "图片",
@@ -1165,7 +1171,9 @@
   "list": "列表",
   "loading": "加载中",
   "loading_search_results_failed": "加载搜索结果失败",
+  "local": "本地",
   "local_asset_cast_failed": "无法投放未上传至服务器的项目",
+  "local_assets": "本地项目",
   "local_network": "本地网络",
   "local_network_sheet_info": "当使用指定的 Wi-Fi 网络时，应用程序将通过此 URL 访问服务器",
   "location_permission": "定位权限",
@@ -1322,6 +1330,7 @@
   "no_results": "无结果",
   "no_results_description": "尝试使用同义词或更通用的关键词",
   "no_shared_albums_message": "创建相册以共享照片和视频",
+  "no_uploads_in_progress": "没有正在进行的上传",
   "not_in_any_album": "不在任何相册中",
   "not_selected": "未选择",
   "note_apply_storage_label_to_previously_uploaded assets": "提示：要将存储标签应用于之前上传的项目，需要运行",
@@ -1359,6 +1368,7 @@
   "original": "原图",
   "other": "其它",
   "other_devices": "其它设备",
+  "other_entities": "其他实体",
   "other_variables": "其它变量",
   "owned": "我的",
   "owner": "所有者",
@@ -1519,6 +1529,8 @@
   "refreshing_faces": "正在面部重新识别",
   "refreshing_metadata": "正在刷新元数据",
   "regenerating_thumbnails": "正在重新生成缩略图",
+  "remote": "远程",
+  "remote_assets": "远程项目",
   "remove": "移除",
   "remove_assets_album_confirmation": "确定要从图库中移除{count, plural, one {#个项目} other {#个项目}}？",
   "remove_assets_shared_link_confirmation": "确定要从共享链接中移除{count, plural, one {#个项目} other {#个项目}}？",
@@ -1556,11 +1568,15 @@
   "reset_password": "重置密码",
   "reset_people_visibility": "重置人物识别",
   "reset_pin_code": "重置PIN码",
+  "reset_sqlite": "重置 SQLite 数据库",
+  "reset_sqlite_confirmation": "您确定要重置 SQLite 数据库吗？您需要注销并重新登录才能重新同步数据",
+  "reset_sqlite_success": "已成功重置 SQLite 数据库",
   "reset_to_default": "恢复默认值",
   "resolve_duplicates": "处理重复项",
   "resolved_all_duplicates": "处理所有重复项",
   "restore": "恢复",
   "restore_all": "恢复全部",
+  "restore_trash_action_prompt": "从回收站中恢复了 {count} 项",
   "restore_user": "恢复用户",
   "restored_asset": "已恢复项目",
   "resume": "继续",
@@ -1569,6 +1585,7 @@
   "role": "选择用户权限",
   "role_editor": "可编辑",
   "role_viewer": "仅查看",
+  "running": "正在运行",
   "save": "保存",
   "save_to_gallery": "保存到图库",
   "saved_api_key": "已保存的 API 密钥",
@@ -1822,6 +1839,7 @@
   "storage_quota": "存储配额",
   "storage_usage": "已用：{used}/{available}",
   "submit": "提交",
+  "success": "成功",
   "suggestions": "建议",
   "sunrise_on_the_beach": "海滩上的日出",
   "support": "支持",
@@ -1831,6 +1849,8 @@
   "sync": "同步",
   "sync_albums": "同步相册",
   "sync_albums_manual_subtitle": "将所有上传的视频和照片同步到选定的备份相册",
+  "sync_local": "同步本地",
+  "sync_remote": "同步远程",
   "sync_upload_album_setting_subtitle": "创建照片和视频并上传到 Immich 上的选定相册中",
   "tag": "标签",
   "tag_assets": "标记项目",
@@ -1841,6 +1861,7 @@
   "tag_updated": "已更新标签：{tag}",
   "tagged_assets": "{count, plural, one {# 个项目} other {# 个项目}}被加上标签",
   "tags": "标签",
+  "tap_to_run_job": "点击运行作业",
   "template": "模版",
   "theme": "主题",
   "theme_selection": "主题选项",

From ab597155fa66664b582fe83bc558ecd1e78123a5 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Wed, 23 Jul 2025 09:59:21 -0400
Subject: [PATCH 285/337] fix: immich-dev live reload (#20104)

---
 server/bin/immich-dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/bin/immich-dev b/server/bin/immich-dev
index 533c10ef9d..e861c0ee06 100755
--- a/server/bin/immich-dev
+++ b/server/bin/immich-dev
@@ -6,4 +6,4 @@ if [ "$IMMICH_ENV" != "development" ]; then
 fi
 
 cd /usr/src/app/server || exit 1
-npm exec nest start --debug "0.0.0.0:9230" --watch -- "$@"
+npm exec nest -- start --debug "0.0.0.0:9230" --watch -- "$@"

From 92384c28de047c1b697c3f48343e137e7756a078 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Wed, 23 Jul 2025 09:59:33 -0400
Subject: [PATCH 286/337] feat: sync auth user (#20067)

---
 e2e/test-assets                               |   2 +-
 mobile/openapi/README.md                      |   1 +
 mobile/openapi/lib/api.dart                   |   1 +
 mobile/openapi/lib/api_client.dart            |   2 +
 .../openapi/lib/model/sync_auth_user_v1.dart  | 215 ++++++++++++++++++
 .../openapi/lib/model/sync_entity_type.dart   |   3 +
 .../openapi/lib/model/sync_request_type.dart  |   3 +
 mobile/openapi/lib/model/sync_user_v1.dart    |  14 +-
 mobile/test/fixtures/sync_stream.stub.dart    |   2 +
 open-api/immich-openapi-specs.json            |  81 +++++++
 open-api/typescript-sdk/src/fetch-client.ts   |   2 +
 server/src/database.ts                        |   1 +
 server/src/dtos/sync.dto.ts                   |  18 ++
 server/src/enum.ts                            |   3 +
 server/src/queries/sync.repository.sql        |  24 ++
 server/src/repositories/sync.repository.ts    |  29 ++-
 server/src/services/sync.service.ts           |  10 +
 server/test/medium.factory.ts                 |   7 +
 .../medium/specs/sync/sync-auth-user.spec.ts  |  87 +++++++
 .../test/medium/specs/sync/sync-user.spec.ts  |  43 +---
 20 files changed, 507 insertions(+), 41 deletions(-)
 create mode 100644 mobile/openapi/lib/model/sync_auth_user_v1.dart
 create mode 100644 server/test/medium/specs/sync/sync-auth-user.spec.ts

diff --git a/e2e/test-assets b/e2e/test-assets
index 18736fc27a..37f60ea537 160000
--- a/e2e/test-assets
+++ b/e2e/test-assets
@@ -1 +1 @@
-Subproject commit 18736fc27a80c99c68e856cdb4f842bc81ed3445
+Subproject commit 37f60ea537c0228f5f92e4f42dc42f0bb39a6d7f
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index b20a0694c5..2d764aa153 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -479,6 +479,7 @@ Class | Method | HTTP request | Description
  - [SyncAssetFaceDeleteV1](doc//SyncAssetFaceDeleteV1.md)
  - [SyncAssetFaceV1](doc//SyncAssetFaceV1.md)
  - [SyncAssetV1](doc//SyncAssetV1.md)
+ - [SyncAuthUserV1](doc//SyncAuthUserV1.md)
  - [SyncEntityType](doc//SyncEntityType.md)
  - [SyncMemoryAssetDeleteV1](doc//SyncMemoryAssetDeleteV1.md)
  - [SyncMemoryAssetV1](doc//SyncMemoryAssetV1.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index 545955a184..8b8acc0042 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -260,6 +260,7 @@ part 'model/sync_asset_exif_v1.dart';
 part 'model/sync_asset_face_delete_v1.dart';
 part 'model/sync_asset_face_v1.dart';
 part 'model/sync_asset_v1.dart';
+part 'model/sync_auth_user_v1.dart';
 part 'model/sync_entity_type.dart';
 part 'model/sync_memory_asset_delete_v1.dart';
 part 'model/sync_memory_asset_v1.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 55d6f4108b..d9cae66dd3 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -576,6 +576,8 @@ class ApiClient {
           return SyncAssetFaceV1.fromJson(value);
         case 'SyncAssetV1':
           return SyncAssetV1.fromJson(value);
+        case 'SyncAuthUserV1':
+          return SyncAuthUserV1.fromJson(value);
         case 'SyncEntityType':
           return SyncEntityTypeTypeTransformer().decode(value);
         case 'SyncMemoryAssetDeleteV1':
diff --git a/mobile/openapi/lib/model/sync_auth_user_v1.dart b/mobile/openapi/lib/model/sync_auth_user_v1.dart
new file mode 100644
index 0000000000..1dab7f47e3
--- /dev/null
+++ b/mobile/openapi/lib/model/sync_auth_user_v1.dart
@@ -0,0 +1,215 @@
+//
+// 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 SyncAuthUserV1 {
+  /// Returns a new [SyncAuthUserV1] instance.
+  SyncAuthUserV1({
+    required this.avatarColor,
+    required this.deletedAt,
+    required this.email,
+    required this.hasProfileImage,
+    required this.id,
+    required this.isAdmin,
+    required this.name,
+    required this.oauthId,
+    required this.pinCode,
+    required this.profileChangedAt,
+    required this.quotaSizeInBytes,
+    required this.quotaUsageInBytes,
+    required this.storageLabel,
+  });
+
+  UserAvatarColor? avatarColor;
+
+  DateTime? deletedAt;
+
+  String email;
+
+  bool hasProfileImage;
+
+  String id;
+
+  bool isAdmin;
+
+  String name;
+
+  String oauthId;
+
+  String? pinCode;
+
+  DateTime profileChangedAt;
+
+  int? quotaSizeInBytes;
+
+  int quotaUsageInBytes;
+
+  String? storageLabel;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncAuthUserV1 &&
+    other.avatarColor == avatarColor &&
+    other.deletedAt == deletedAt &&
+    other.email == email &&
+    other.hasProfileImage == hasProfileImage &&
+    other.id == id &&
+    other.isAdmin == isAdmin &&
+    other.name == name &&
+    other.oauthId == oauthId &&
+    other.pinCode == pinCode &&
+    other.profileChangedAt == profileChangedAt &&
+    other.quotaSizeInBytes == quotaSizeInBytes &&
+    other.quotaUsageInBytes == quotaUsageInBytes &&
+    other.storageLabel == storageLabel;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (avatarColor == null ? 0 : avatarColor!.hashCode) +
+    (deletedAt == null ? 0 : deletedAt!.hashCode) +
+    (email.hashCode) +
+    (hasProfileImage.hashCode) +
+    (id.hashCode) +
+    (isAdmin.hashCode) +
+    (name.hashCode) +
+    (oauthId.hashCode) +
+    (pinCode == null ? 0 : pinCode!.hashCode) +
+    (profileChangedAt.hashCode) +
+    (quotaSizeInBytes == null ? 0 : quotaSizeInBytes!.hashCode) +
+    (quotaUsageInBytes.hashCode) +
+    (storageLabel == null ? 0 : storageLabel!.hashCode);
+
+  @override
+  String toString() => 'SyncAuthUserV1[avatarColor=$avatarColor, deletedAt=$deletedAt, email=$email, hasProfileImage=$hasProfileImage, id=$id, isAdmin=$isAdmin, name=$name, oauthId=$oauthId, pinCode=$pinCode, profileChangedAt=$profileChangedAt, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, storageLabel=$storageLabel]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+    if (this.avatarColor != null) {
+      json[r'avatarColor'] = this.avatarColor;
+    } else {
+    //  json[r'avatarColor'] = null;
+    }
+    if (this.deletedAt != null) {
+      json[r'deletedAt'] = this.deletedAt!.toUtc().toIso8601String();
+    } else {
+    //  json[r'deletedAt'] = null;
+    }
+      json[r'email'] = this.email;
+      json[r'hasProfileImage'] = this.hasProfileImage;
+      json[r'id'] = this.id;
+      json[r'isAdmin'] = this.isAdmin;
+      json[r'name'] = this.name;
+      json[r'oauthId'] = this.oauthId;
+    if (this.pinCode != null) {
+      json[r'pinCode'] = this.pinCode;
+    } else {
+    //  json[r'pinCode'] = null;
+    }
+      json[r'profileChangedAt'] = this.profileChangedAt.toUtc().toIso8601String();
+    if (this.quotaSizeInBytes != null) {
+      json[r'quotaSizeInBytes'] = this.quotaSizeInBytes;
+    } else {
+    //  json[r'quotaSizeInBytes'] = null;
+    }
+      json[r'quotaUsageInBytes'] = this.quotaUsageInBytes;
+    if (this.storageLabel != null) {
+      json[r'storageLabel'] = this.storageLabel;
+    } else {
+    //  json[r'storageLabel'] = null;
+    }
+    return json;
+  }
+
+  /// Returns a new [SyncAuthUserV1] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncAuthUserV1? fromJson(dynamic value) {
+    upgradeDto(value, "SyncAuthUserV1");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncAuthUserV1(
+        avatarColor: UserAvatarColor.fromJson(json[r'avatarColor']),
+        deletedAt: mapDateTime(json, r'deletedAt', r''),
+        email: mapValueOfType<String>(json, r'email')!,
+        hasProfileImage: mapValueOfType<bool>(json, r'hasProfileImage')!,
+        id: mapValueOfType<String>(json, r'id')!,
+        isAdmin: mapValueOfType<bool>(json, r'isAdmin')!,
+        name: mapValueOfType<String>(json, r'name')!,
+        oauthId: mapValueOfType<String>(json, r'oauthId')!,
+        pinCode: mapValueOfType<String>(json, r'pinCode'),
+        profileChangedAt: mapDateTime(json, r'profileChangedAt', r'')!,
+        quotaSizeInBytes: mapValueOfType<int>(json, r'quotaSizeInBytes'),
+        quotaUsageInBytes: mapValueOfType<int>(json, r'quotaUsageInBytes')!,
+        storageLabel: mapValueOfType<String>(json, r'storageLabel'),
+      );
+    }
+    return null;
+  }
+
+  static List<SyncAuthUserV1> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncAuthUserV1>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncAuthUserV1.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncAuthUserV1> mapFromJson(dynamic json) {
+    final map = <String, SyncAuthUserV1>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncAuthUserV1.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncAuthUserV1-objects as value to a dart map
+  static Map<String, List<SyncAuthUserV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncAuthUserV1>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncAuthUserV1.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'avatarColor',
+    'deletedAt',
+    'email',
+    'hasProfileImage',
+    'id',
+    'isAdmin',
+    'name',
+    'oauthId',
+    'pinCode',
+    'profileChangedAt',
+    'quotaSizeInBytes',
+    'quotaUsageInBytes',
+    'storageLabel',
+  };
+}
+
diff --git a/mobile/openapi/lib/model/sync_entity_type.dart b/mobile/openapi/lib/model/sync_entity_type.dart
index 65ed78105c..5368126923 100644
--- a/mobile/openapi/lib/model/sync_entity_type.dart
+++ b/mobile/openapi/lib/model/sync_entity_type.dart
@@ -23,6 +23,7 @@ class SyncEntityType {
 
   String toJson() => value;
 
+  static const authUserV1 = SyncEntityType._(r'AuthUserV1');
   static const userV1 = SyncEntityType._(r'UserV1');
   static const userDeleteV1 = SyncEntityType._(r'UserDeleteV1');
   static const assetV1 = SyncEntityType._(r'AssetV1');
@@ -67,6 +68,7 @@ class SyncEntityType {
 
   /// List of all possible values in this [enum][SyncEntityType].
   static const values = <SyncEntityType>[
+    authUserV1,
     userV1,
     userDeleteV1,
     assetV1,
@@ -146,6 +148,7 @@ class SyncEntityTypeTypeTransformer {
   SyncEntityType? decode(dynamic data, {bool allowNull = true}) {
     if (data != null) {
       switch (data) {
+        case r'AuthUserV1': return SyncEntityType.authUserV1;
         case r'UserV1': return SyncEntityType.userV1;
         case r'UserDeleteV1': return SyncEntityType.userDeleteV1;
         case r'AssetV1': return SyncEntityType.assetV1;
diff --git a/mobile/openapi/lib/model/sync_request_type.dart b/mobile/openapi/lib/model/sync_request_type.dart
index 800b3f4485..8a1857366e 100644
--- a/mobile/openapi/lib/model/sync_request_type.dart
+++ b/mobile/openapi/lib/model/sync_request_type.dart
@@ -30,6 +30,7 @@ class SyncRequestType {
   static const albumAssetExifsV1 = SyncRequestType._(r'AlbumAssetExifsV1');
   static const assetsV1 = SyncRequestType._(r'AssetsV1');
   static const assetExifsV1 = SyncRequestType._(r'AssetExifsV1');
+  static const authUsersV1 = SyncRequestType._(r'AuthUsersV1');
   static const memoriesV1 = SyncRequestType._(r'MemoriesV1');
   static const memoryToAssetsV1 = SyncRequestType._(r'MemoryToAssetsV1');
   static const partnersV1 = SyncRequestType._(r'PartnersV1');
@@ -51,6 +52,7 @@ class SyncRequestType {
     albumAssetExifsV1,
     assetsV1,
     assetExifsV1,
+    authUsersV1,
     memoriesV1,
     memoryToAssetsV1,
     partnersV1,
@@ -107,6 +109,7 @@ class SyncRequestTypeTypeTransformer {
         case r'AlbumAssetExifsV1': return SyncRequestType.albumAssetExifsV1;
         case r'AssetsV1': return SyncRequestType.assetsV1;
         case r'AssetExifsV1': return SyncRequestType.assetExifsV1;
+        case r'AuthUsersV1': return SyncRequestType.authUsersV1;
         case r'MemoriesV1': return SyncRequestType.memoriesV1;
         case r'MemoryToAssetsV1': return SyncRequestType.memoryToAssetsV1;
         case r'PartnersV1': return SyncRequestType.partnersV1;
diff --git a/mobile/openapi/lib/model/sync_user_v1.dart b/mobile/openapi/lib/model/sync_user_v1.dart
index b9b41bb723..c01ddcc9fc 100644
--- a/mobile/openapi/lib/model/sync_user_v1.dart
+++ b/mobile/openapi/lib/model/sync_user_v1.dart
@@ -13,12 +13,15 @@ part of openapi.api;
 class SyncUserV1 {
   /// Returns a new [SyncUserV1] instance.
   SyncUserV1({
+    required this.avatarColor,
     required this.deletedAt,
     required this.email,
     required this.id,
     required this.name,
   });
 
+  UserAvatarColor? avatarColor;
+
   DateTime? deletedAt;
 
   String email;
@@ -29,6 +32,7 @@ class SyncUserV1 {
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is SyncUserV1 &&
+    other.avatarColor == avatarColor &&
     other.deletedAt == deletedAt &&
     other.email == email &&
     other.id == id &&
@@ -37,16 +41,22 @@ class SyncUserV1 {
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
+    (avatarColor == null ? 0 : avatarColor!.hashCode) +
     (deletedAt == null ? 0 : deletedAt!.hashCode) +
     (email.hashCode) +
     (id.hashCode) +
     (name.hashCode);
 
   @override
-  String toString() => 'SyncUserV1[deletedAt=$deletedAt, email=$email, id=$id, name=$name]';
+  String toString() => 'SyncUserV1[avatarColor=$avatarColor, deletedAt=$deletedAt, email=$email, id=$id, name=$name]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
+    if (this.avatarColor != null) {
+      json[r'avatarColor'] = this.avatarColor;
+    } else {
+    //  json[r'avatarColor'] = null;
+    }
     if (this.deletedAt != null) {
       json[r'deletedAt'] = this.deletedAt!.toUtc().toIso8601String();
     } else {
@@ -67,6 +77,7 @@ class SyncUserV1 {
       final json = value.cast<String, dynamic>();
 
       return SyncUserV1(
+        avatarColor: UserAvatarColor.fromJson(json[r'avatarColor']),
         deletedAt: mapDateTime(json, r'deletedAt', r''),
         email: mapValueOfType<String>(json, r'email')!,
         id: mapValueOfType<String>(json, r'id')!,
@@ -118,6 +129,7 @@ class SyncUserV1 {
 
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
+    'avatarColor',
     'deletedAt',
     'email',
     'id',
diff --git a/mobile/test/fixtures/sync_stream.stub.dart b/mobile/test/fixtures/sync_stream.stub.dart
index de2d58bc9d..6c47b9172e 100644
--- a/mobile/test/fixtures/sync_stream.stub.dart
+++ b/mobile/test/fixtures/sync_stream.stub.dart
@@ -9,6 +9,7 @@ abstract final class SyncStreamStub {
       email: "admin@admin",
       id: "1",
       name: "Admin",
+      avatarColor: null,
     ),
     ack: "1",
   );
@@ -19,6 +20,7 @@ abstract final class SyncStreamStub {
       email: "user@user",
       id: "5",
       name: "User",
+      avatarColor: null,
     ),
     ack: "5",
   );
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index cd61f3e004..270a560fb0 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -13978,8 +13978,79 @@
         ],
         "type": "object"
       },
+      "SyncAuthUserV1": {
+        "properties": {
+          "avatarColor": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/UserAvatarColor"
+              }
+            ],
+            "nullable": true
+          },
+          "deletedAt": {
+            "format": "date-time",
+            "nullable": true,
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          },
+          "hasProfileImage": {
+            "type": "boolean"
+          },
+          "id": {
+            "type": "string"
+          },
+          "isAdmin": {
+            "type": "boolean"
+          },
+          "name": {
+            "type": "string"
+          },
+          "oauthId": {
+            "type": "string"
+          },
+          "pinCode": {
+            "nullable": true,
+            "type": "string"
+          },
+          "profileChangedAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "quotaSizeInBytes": {
+            "nullable": true,
+            "type": "integer"
+          },
+          "quotaUsageInBytes": {
+            "type": "integer"
+          },
+          "storageLabel": {
+            "nullable": true,
+            "type": "string"
+          }
+        },
+        "required": [
+          "avatarColor",
+          "deletedAt",
+          "email",
+          "hasProfileImage",
+          "id",
+          "isAdmin",
+          "name",
+          "oauthId",
+          "pinCode",
+          "profileChangedAt",
+          "quotaSizeInBytes",
+          "quotaUsageInBytes",
+          "storageLabel"
+        ],
+        "type": "object"
+      },
       "SyncEntityType": {
         "enum": [
+          "AuthUserV1",
           "UserV1",
           "UserDeleteV1",
           "AssetV1",
@@ -14242,6 +14313,7 @@
           "AlbumAssetExifsV1",
           "AssetsV1",
           "AssetExifsV1",
+          "AuthUsersV1",
           "MemoriesV1",
           "MemoryToAssetsV1",
           "PartnersV1",
@@ -14364,6 +14436,14 @@
       },
       "SyncUserV1": {
         "properties": {
+          "avatarColor": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/UserAvatarColor"
+              }
+            ],
+            "nullable": true
+          },
           "deletedAt": {
             "format": "date-time",
             "nullable": true,
@@ -14380,6 +14460,7 @@
           }
         },
         "required": [
+          "avatarColor",
           "deletedAt",
           "email",
           "id",
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 81d279407c..bcbe757066 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -4099,6 +4099,7 @@ export enum Error2 {
     NotFound = "not_found"
 }
 export enum SyncEntityType {
+    AuthUserV1 = "AuthUserV1",
     UserV1 = "UserV1",
     UserDeleteV1 = "UserDeleteV1",
     AssetV1 = "AssetV1",
@@ -4149,6 +4150,7 @@ export enum SyncRequestType {
     AlbumAssetExifsV1 = "AlbumAssetExifsV1",
     AssetsV1 = "AssetsV1",
     AssetExifsV1 = "AssetExifsV1",
+    AuthUsersV1 = "AuthUsersV1",
     MemoriesV1 = "MemoriesV1",
     MemoryToAssetsV1 = "MemoryToAssetsV1",
     PartnersV1 = "PartnersV1",
diff --git a/server/src/database.ts b/server/src/database.ts
index dc99fc5b31..53c39b7383 100644
--- a/server/src/database.ts
+++ b/server/src/database.ts
@@ -356,6 +356,7 @@ export const columns = {
   ],
   syncAlbumUser: ['album_user.albumsId as albumId', 'album_user.usersId as userId', 'album_user.role'],
   syncStack: ['stack.id', 'stack.createdAt', 'stack.updatedAt', 'stack.primaryAssetId', 'stack.ownerId'],
+  syncUser: ['id', 'name', 'email', 'avatarColor', 'deletedAt', 'updateId'],
   stack: ['stack.id', 'stack.primaryAssetId', 'ownerId'],
   syncAssetExif: [
     'asset_exif.assetId',
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index c8b1a7dde9..8614bd5776 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -10,6 +10,7 @@ import {
   MemoryType,
   SyncEntityType,
   SyncRequestType,
+  UserAvatarColor,
   UserMetadataKey,
 } from 'src/enum';
 import { UserMetadata } from 'src/types';
@@ -58,9 +59,25 @@ export class SyncUserV1 {
   id!: string;
   name!: string;
   email!: string;
+  @ValidateEnum({ enum: UserAvatarColor, name: 'UserAvatarColor', nullable: true })
+  avatarColor!: UserAvatarColor | null;
   deletedAt!: Date | null;
 }
 
+@ExtraModel()
+export class SyncAuthUserV1 extends SyncUserV1 {
+  isAdmin!: boolean;
+  pinCode!: string | null;
+  oauthId!: string;
+  storageLabel!: string | null;
+  @ApiProperty({ type: 'integer' })
+  quotaSizeInBytes!: number | null;
+  @ApiProperty({ type: 'integer' })
+  quotaUsageInBytes!: number;
+  hasProfileImage!: boolean;
+  profileChangedAt!: Date;
+}
+
 @ExtraModel()
 export class SyncUserDeleteV1 {
   userId!: string;
@@ -301,6 +318,7 @@ export class SyncAckV1 {}
 export class SyncResetV1 {}
 
 export type SyncItem = {
+  [SyncEntityType.AuthUserV1]: SyncAuthUserV1;
   [SyncEntityType.UserV1]: SyncUserV1;
   [SyncEntityType.UserDeleteV1]: SyncUserDeleteV1;
   [SyncEntityType.PartnerV1]: SyncPartnerV1;
diff --git a/server/src/enum.ts b/server/src/enum.ts
index f2eae615ab..75a96dfe67 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -559,6 +559,7 @@ export enum SyncRequestType {
   AlbumAssetExifsV1 = 'AlbumAssetExifsV1',
   AssetsV1 = 'AssetsV1',
   AssetExifsV1 = 'AssetExifsV1',
+  AuthUsersV1 = 'AuthUsersV1',
   MemoriesV1 = 'MemoriesV1',
   MemoryToAssetsV1 = 'MemoryToAssetsV1',
   PartnersV1 = 'PartnersV1',
@@ -573,6 +574,8 @@ export enum SyncRequestType {
 }
 
 export enum SyncEntityType {
+  AuthUserV1 = 'AuthUserV1',
+
   UserV1 = 'UserV1',
   UserDeleteV1 = 'UserDeleteV1',
 
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index 7502b79f57..7c7774a020 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -444,6 +444,29 @@ where
 order by
   "asset_face"."updateId" asc
 
+-- SyncRepository.authUser.getUpserts
+select
+  "id",
+  "name",
+  "email",
+  "avatarColor",
+  "deletedAt",
+  "updateId",
+  "isAdmin",
+  "pinCode",
+  "oauthId",
+  "storageLabel",
+  "quotaSizeInBytes",
+  "quotaUsageInBytes",
+  "profileImagePath",
+  "profileChangedAt"
+from
+  "user"
+where
+  "updatedAt" < now() - interval '1 millisecond'
+order by
+  "updateId" asc
+
 -- SyncRepository.memory.getDeletes
 select
   "id",
@@ -871,6 +894,7 @@ select
   "id",
   "name",
   "email",
+  "avatarColor",
   "deletedAt",
   "updateId"
 from
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index dba52d25a0..486984118d 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -43,6 +43,7 @@ export class SyncRepository {
   asset: AssetSync;
   assetExif: AssetExifSync;
   assetFace: AssetFaceSync;
+  authUser: AuthUserSync;
   memory: MemorySync;
   memoryToAsset: MemoryToAssetSync;
   partner: PartnerSync;
@@ -63,6 +64,7 @@ export class SyncRepository {
     this.asset = new AssetSync(this.db);
     this.assetExif = new AssetExifSync(this.db);
     this.assetFace = new AssetFaceSync(this.db);
+    this.authUser = new AuthUserSync(this.db);
     this.memory = new MemorySync(this.db);
     this.memoryToAsset = new MemoryToAssetSync(this.db);
     this.partner = new PartnerSync(this.db);
@@ -367,6 +369,27 @@ class AssetSync extends BaseSync {
   }
 }
 
+class AuthUserSync extends BaseSync {
+  @GenerateSql({ params: [], stream: true })
+  getUpserts(ack?: SyncAck) {
+    return this.db
+      .selectFrom('user')
+      .select(columns.syncUser)
+      .select([
+        'isAdmin',
+        'pinCode',
+        'oauthId',
+        'storageLabel',
+        'quotaSizeInBytes',
+        'quotaUsageInBytes',
+        'profileImagePath',
+        'profileChangedAt',
+      ])
+      .$call(this.upsertTableFilters(ack))
+      .stream();
+  }
+}
+
 class PersonSync extends BaseSync {
   @GenerateSql({ params: [DummyValue.UUID], stream: true })
   getDeletes(userId: string, ack?: SyncAck) {
@@ -693,11 +716,7 @@ class UserSync extends BaseSync {
 
   @GenerateSql({ params: [], stream: true })
   getUpserts(ack?: SyncAck) {
-    return this.db
-      .selectFrom('user')
-      .select(['id', 'name', 'email', 'deletedAt', 'updateId'])
-      .$call(this.upsertTableFilters(ack))
-      .stream();
+    return this.db.selectFrom('user').select(columns.syncUser).$call(this.upsertTableFilters(ack)).stream();
   }
 }
 
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index fb582ab038..57b953f12e 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -54,6 +54,7 @@ const sendEntityBackfillCompleteAck = (response: Writable, ackType: SyncEntityTy
 
 const FULL_SYNC = { needsFullSync: true, deleted: [], upserted: [] };
 export const SYNC_TYPES_ORDER = [
+  SyncRequestType.AuthUsersV1,
   SyncRequestType.UsersV1,
   SyncRequestType.PartnersV1,
   SyncRequestType.AssetsV1,
@@ -140,6 +141,7 @@ export class SyncService extends BaseService {
     const checkpointMap: CheckpointMap = Object.fromEntries(checkpoints.map(({ type, ack }) => [type, fromAck(ack)]));
 
     const handlers: Record<SyncRequestType, () => Promise<void>> = {
+      [SyncRequestType.AuthUsersV1]: () => this.syncAuthUsersV1(response, checkpointMap),
       [SyncRequestType.UsersV1]: () => this.syncUsersV1(response, checkpointMap),
       [SyncRequestType.PartnersV1]: () => this.syncPartnersV1(response, checkpointMap, auth),
       [SyncRequestType.AssetsV1]: () => this.syncAssetsV1(response, checkpointMap, auth),
@@ -169,6 +171,14 @@ export class SyncService extends BaseService {
     response.end();
   }
 
+  private async syncAuthUsersV1(response: Writable, checkpointMap: CheckpointMap) {
+    const upsertType = SyncEntityType.AuthUserV1;
+    const upserts = this.syncRepository.authUser.getUpserts(checkpointMap[upsertType]);
+    for await (const { updateId, profileImagePath, ...data } of upserts) {
+      send(response, { type: upsertType, ids: [updateId], data: { ...data, hasProfileImage: !!profileImagePath } });
+    }
+  }
+
   private async syncUsersV1(response: Writable, checkpointMap: CheckpointMap) {
     const deleteType = SyncEntityType.UserDeleteV1;
     const deletes = this.syncRepository.user.getDeletes(checkpointMap[deleteType]);
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index d6038b6b84..1b669e83e4 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -507,7 +507,14 @@ const userInsert = (user: Partial<Insertable<UserTable>> = {}) => {
     deletedAt: null,
     isAdmin: false,
     profileImagePath: '',
+    profileChangedAt: newDate(),
     shouldChangePassword: true,
+    storageLabel: null,
+    pinCode: null,
+    oauthId: '',
+    avatarColor: null,
+    quotaSizeInBytes: null,
+    quotaUsageInBytes: 0,
   };
 
   return { ...defaults, ...user, id };
diff --git a/server/test/medium/specs/sync/sync-auth-user.spec.ts b/server/test/medium/specs/sync/sync-auth-user.spec.ts
new file mode 100644
index 0000000000..80ce8b37fa
--- /dev/null
+++ b/server/test/medium/specs/sync/sync-auth-user.spec.ts
@@ -0,0 +1,87 @@
+import { Kysely } from 'kysely';
+import { SyncEntityType, SyncRequestType } from 'src/enum';
+import { UserRepository } from 'src/repositories/user.repository';
+import { DB } from 'src/schema';
+import { SyncTestContext } from 'test/medium.factory';
+import { getKyselyDB } from 'test/utils';
+
+let defaultDatabase: Kysely<DB>;
+
+const setup = async (db?: Kysely<DB>) => {
+  const ctx = new SyncTestContext(db || defaultDatabase);
+  const { auth, user, session } = await ctx.newSyncAuthUser();
+  return { auth, user, session, ctx };
+};
+
+beforeAll(async () => {
+  defaultDatabase = await getKyselyDB();
+});
+
+describe(SyncEntityType.AuthUserV1, () => {
+  it('should detect and sync the first user', async () => {
+    const { auth, user, ctx } = await setup(await getKyselyDB());
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AuthUsersV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: {
+          id: user.id,
+          isAdmin: user.isAdmin,
+          deletedAt: user.deletedAt,
+          name: user.name,
+          avatarColor: user.avatarColor,
+          email: user.email,
+          pinCode: user.pinCode,
+          hasProfileImage: false,
+          profileChangedAt: (user.profileChangedAt as Date).toISOString(),
+          oauthId: user.oauthId,
+          quotaSizeInBytes: user.quotaSizeInBytes,
+          quotaUsageInBytes: user.quotaUsageInBytes,
+          storageLabel: user.storageLabel,
+        },
+        type: 'AuthUserV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+    await expect(ctx.syncStream(auth, [SyncRequestType.AuthUsersV1])).resolves.toEqual([]);
+  });
+
+  it('should sync a change and then another change to that same user', async () => {
+    const { auth, user, ctx } = await setup(await getKyselyDB());
+
+    const userRepo = ctx.get(UserRepository);
+
+    const response = await ctx.syncStream(auth, [SyncRequestType.AuthUsersV1]);
+    expect(response).toHaveLength(1);
+    expect(response).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: user.id,
+          isAdmin: false,
+        }),
+        type: 'AuthUserV1',
+      },
+    ]);
+
+    await ctx.syncAckAll(auth, response);
+
+    await userRepo.update(user.id, { isAdmin: true });
+
+    const newResponse = await ctx.syncStream(auth, [SyncRequestType.AuthUsersV1]);
+    expect(newResponse).toHaveLength(1);
+    expect(newResponse).toEqual([
+      {
+        ack: expect.any(String),
+        data: expect.objectContaining({
+          id: user.id,
+          isAdmin: true,
+        }),
+        type: 'AuthUserV1',
+      },
+    ]);
+  });
+});
diff --git a/server/test/medium/specs/sync/sync-user.spec.ts b/server/test/medium/specs/sync/sync-user.spec.ts
index 24137e3aea..72661e119c 100644
--- a/server/test/medium/specs/sync/sync-user.spec.ts
+++ b/server/test/medium/specs/sync/sync-user.spec.ts
@@ -37,6 +37,7 @@ describe(SyncEntityType.UserV1, () => {
           email: user.email,
           id: user.id,
           name: user.name,
+          avatarColor: user.avatarColor,
         },
         type: 'UserV1',
       },
@@ -49,8 +50,7 @@ describe(SyncEntityType.UserV1, () => {
   it('should detect and sync a soft deleted user', async () => {
     const { auth, ctx } = await setup(await getKyselyDB());
 
-    const deletedAt = new Date().toISOString();
-    const { user: deleted } = await ctx.newUser({ deletedAt });
+    const { user: deleted } = await ctx.newUser({ deletedAt: new Date().toISOString() });
 
     const response = await ctx.syncStream(auth, [SyncRequestType.UsersV1]);
 
@@ -59,22 +59,12 @@ describe(SyncEntityType.UserV1, () => {
       expect.arrayContaining([
         {
           ack: expect.any(String),
-          data: {
-            deletedAt: null,
-            email: auth.user.email,
-            id: auth.user.id,
-            name: auth.user.name,
-          },
+          data: expect.objectContaining({ id: auth.user.id }),
           type: 'UserV1',
         },
         {
           ack: expect.any(String),
-          data: {
-            deletedAt,
-            email: deleted.email,
-            id: deleted.id,
-            name: deleted.name,
-          },
+          data: expect.objectContaining({ id: deleted.id }),
           type: 'UserV1',
         },
       ]),
@@ -85,7 +75,7 @@ describe(SyncEntityType.UserV1, () => {
   });
 
   it('should detect and sync a deleted user', async () => {
-    const { auth, ctx } = await setup(await getKyselyDB());
+    const { auth, user: authUser, ctx } = await setup(await getKyselyDB());
 
     const userRepo = ctx.get(UserRepository);
 
@@ -104,12 +94,7 @@ describe(SyncEntityType.UserV1, () => {
       },
       {
         ack: expect.any(String),
-        data: {
-          deletedAt: null,
-          email: auth.user.email,
-          id: auth.user.id,
-          name: auth.user.name,
-        },
+        data: expect.objectContaining({ id: authUser.id }),
         type: 'UserV1',
       },
     ]);
@@ -119,7 +104,7 @@ describe(SyncEntityType.UserV1, () => {
   });
 
   it('should sync a user and then an update to that same user', async () => {
-    const { auth, ctx } = await setup(await getKyselyDB());
+    const { auth, user, ctx } = await setup(await getKyselyDB());
 
     const userRepo = ctx.get(UserRepository);
 
@@ -128,12 +113,7 @@ describe(SyncEntityType.UserV1, () => {
     expect(response).toEqual([
       {
         ack: expect.any(String),
-        data: {
-          deletedAt: null,
-          email: auth.user.email,
-          id: auth.user.id,
-          name: auth.user.name,
-        },
+        data: expect.objectContaining({ id: user.id }),
         type: 'UserV1',
       },
     ]);
@@ -147,12 +127,7 @@ describe(SyncEntityType.UserV1, () => {
     expect(newResponse).toEqual([
       {
         ack: expect.any(String),
-        data: {
-          deletedAt: null,
-          email: auth.user.email,
-          id: auth.user.id,
-          name: updated.name,
-        },
+        data: expect.objectContaining({ id: user.id, name: updated.name }),
         type: 'UserV1',
       },
     ]);

From 08122d687128e9b5b60baf6d861fa4683bdf0b0d Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Wed, 23 Jul 2025 19:43:15 +0530
Subject: [PATCH 287/337] fix: show only local assets from albums selected for
 backup (#20050)

* show only local assets from albums selected for backup

# Conflicts:
#	mobile/lib/infrastructure/repositories/db.repository.drift.dart

* ignore backup selection

* fix: backup album ownerId

* fix: backup album ownerId

* only show local only assets that are selected for backup

* add index on visibility and backup selection

* fix: video not playing in search view

* remove safe area from bottom bar

* refactor stack count with a CTE and local asset with a SELECT

* fix lint

* remove redundant COALESCE

* remove stack count from main timeline query

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../drift_schemas/main/drift_schema_v4.json   |    2 +-
 .../models/asset/remote_asset.model.dart      |   11 +-
 .../entities/merged_asset.drift               |  143 +-
 .../entities/merged_asset.drift.dart          |   47 +-
 .../repositories/backup.repository.dart       |   11 +-
 .../repositories/db.repository.dart           |    4 +-
 .../repositories/db.repository.drift.dart     |   98 +-
 .../repositories/db.repository.steps.dart     |   84 +-
 .../repositories/remote_asset.repository.dart |   30 +-
 .../repositories/timeline.repository.dart     |    3 +-
 .../lib/pages/backup/drift_backup.page.dart   |   27 +-
 .../drift_backup_album_selection.page.dart    |   18 +-
 mobile/lib/pages/common/tab_shell.page.dart   |   10 +-
 .../asset_viewer/asset_stack.provider.dart    |    6 +-
 .../widgets/images/thumbnail_tile.widget.dart |   40 +-
 .../providers/app_life_cycle.provider.dart    |   10 +-
 .../backup/drift_backup.provider.dart         |   14 +-
 mobile/lib/services/drift_backup.service.dart |   11 +-
 .../test/drift/main/generated/schema_v4.dart  | 1282 ++++++++---------
 19 files changed, 916 insertions(+), 935 deletions(-)

diff --git a/mobile/drift_schemas/main/drift_schema_v4.json b/mobile/drift_schemas/main/drift_schema_v4.json
index 82ef30adae..2488319a5e 100644
--- a/mobile/drift_schemas/main/drift_schema_v4.json
+++ b/mobile/drift_schemas/main/drift_schema_v4.json
@@ -1 +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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"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":3,"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":4,"references":[2],"type":"index","data":{"on":2,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":5,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":6,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":7,"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":8,"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":9,"references":[],"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":"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":10,"references":[2,9],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":11,"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":12,"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":13,"references":[1,12],"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":14,"references":[12,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":15,"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":16,"references":[1,15],"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":17,"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":18,"references":[1,17],"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"]}}]}
\ No newline at end of file
+{"_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":"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":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"profile_image_path","getter_name":"profileImagePath","moor_type":"string","nullable":true,"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":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"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":[]}],"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":[]}],"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":[],"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":"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":5,"references":[3,4],"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"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":6,"references":[3],"type":"index","data":{"on":3,"name":"idx_local_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":7,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_asset_owner_checksum","sql":null,"unique":true,"columns":["checksum","owner_id"]}},{"id":8,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":null,"unique":false,"columns":["checksum"]}},{"id":9,"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":10,"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":11,"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":12,"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":13,"references":[1,12],"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":14,"references":[12,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":15,"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":16,"references":[1,15],"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":17,"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":18,"references":[1,17],"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"]}}]}
\ No newline at end of file
diff --git a/mobile/lib/domain/models/asset/remote_asset.model.dart b/mobile/lib/domain/models/asset/remote_asset.model.dart
index 760a16170b..f96fa18a74 100644
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -15,7 +15,6 @@ class RemoteAsset extends BaseAsset {
   final AssetVisibility visibility;
   final String ownerId;
   final String? stackId;
-  final int stackCount;
 
   const RemoteAsset({
     required this.id,
@@ -34,7 +33,6 @@ class RemoteAsset extends BaseAsset {
     this.visibility = AssetVisibility.timeline,
     super.livePhotoVideoId,
     this.stackId,
-    this.stackCount = 0,
   });
 
   @override
@@ -61,7 +59,6 @@ class RemoteAsset extends BaseAsset {
     thumbHash: ${thumbHash ?? "<NA>"},
     visibility: $visibility,
     stackId: ${stackId ?? "<NA>"},
-    stackCount: $stackCount,
     checksum: $checksum,
     livePhotoVideoId: ${livePhotoVideoId ?? "<NA>"},
  }''';
@@ -77,8 +74,7 @@ class RemoteAsset extends BaseAsset {
         ownerId == other.ownerId &&
         thumbHash == other.thumbHash &&
         visibility == other.visibility &&
-        stackId == other.stackId &&
-        stackCount == other.stackCount;
+        stackId == other.stackId;
   }
 
   @override
@@ -89,8 +85,7 @@ class RemoteAsset extends BaseAsset {
       localId.hashCode ^
       thumbHash.hashCode ^
       visibility.hashCode ^
-      stackId.hashCode ^
-      stackCount.hashCode;
+      stackId.hashCode;
 
   RemoteAsset copyWith({
     String? id,
@@ -109,7 +104,6 @@ class RemoteAsset extends BaseAsset {
     AssetVisibility? visibility,
     String? livePhotoVideoId,
     String? stackId,
-    int? stackCount,
   }) {
     return RemoteAsset(
       id: id ?? this.id,
@@ -128,7 +122,6 @@ class RemoteAsset extends BaseAsset {
       visibility: visibility ?? this.visibility,
       livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
       stackId: stackId ?? this.stackId,
-      stackCount: stackCount ?? this.stackCount,
     );
   }
 }
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift b/mobile/lib/infrastructure/entities/merged_asset.drift
index 3dc7221c15..9778ba723b 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -1,76 +1,68 @@
 import 'remote_asset.entity.dart';
-import 'local_asset.entity.dart';
 import 'stack.entity.dart';
+import 'local_asset.entity.dart';
+import 'local_album.entity.dart';
+import 'local_album_asset.entity.dart';
 
-mergedAsset: SELECT * FROM
-(
-	SELECT
-		rae.id as remote_id,
-		lae.id as local_id,
-		rae.name,
-		rae."type",
-		rae.created_at,
-		rae.updated_at,
-		rae.width,
-		rae.height,
-		rae.duration_in_seconds,
-		rae.is_favorite,
-		rae.thumb_hash,
-		rae.checksum,
-		rae.owner_id,
-		rae.live_photo_video_id,
-		0 as orientation,
-		rae.stack_id,
-		COALESCE(stack_count.total_count, 0) AS stack_count
-	FROM
-		remote_asset_entity rae
-	LEFT JOIN
-		local_asset_entity lae ON rae.checksum  = lae.checksum
-	LEFT JOIN
-        stack_entity se ON rae.stack_id = se.id
-	LEFT JOIN
-        (SELECT 
-            stack_id,
-            COUNT(*) AS total_count
-         FROM remote_asset_entity 
-         WHERE deleted_at IS NULL 
-           AND visibility = 0
-           AND stack_id IS NOT NULL
-         GROUP BY stack_id
-        ) AS stack_count ON rae.stack_id = stack_count.stack_id
-	WHERE
-		rae.deleted_at IS NULL
-		AND rae.visibility = 0
-		AND rae.owner_id in ?
-		AND (
-			rae.stack_id IS NULL
-			OR rae.id = se.primary_asset_id
-		)
-	UNION ALL
-	SELECT
-		NULL as remote_id,
-		lae.id as local_id,
-		lae.name,
-		lae."type",
-		lae.created_at,
-		lae.updated_at,
-		lae.width,
-		lae.height,
-		lae.duration_in_seconds,
-		lae.is_favorite,
-		NULL as thumb_hash,
-		lae.checksum,
-		NULL as owner_id,
-		NULL as live_photo_video_id,
-		lae.orientation,
-		NULL as stack_id,
-		0 AS stack_count
-	FROM
-		local_asset_entity lae
-	LEFT JOIN
-		remote_asset_entity rae ON rae.checksum = lae.checksum
-	WHERE
-		rae.id IS NULL
+mergedAsset: 
+SELECT
+	rae.id as remote_id,
+	(SELECT lae.id FROM local_asset_entity lae WHERE lae.checksum = rae.checksum LIMIT 1) as local_id,
+	rae.name,
+	rae."type",
+	rae.created_at as created_at,
+	rae.updated_at,
+	rae.width,
+	rae.height,
+	rae.duration_in_seconds,
+	rae.is_favorite,
+	rae.thumb_hash,
+	rae.checksum,
+	rae.owner_id,
+	rae.live_photo_video_id,
+	0 as orientation,
+	rae.stack_id
+FROM
+	remote_asset_entity rae
+LEFT JOIN
+	stack_entity se ON rae.stack_id = se.id
+WHERE
+	rae.deleted_at IS NULL
+	AND rae.visibility = 0 -- timeline visibility
+	AND rae.owner_id in ?
+	AND (
+		rae.stack_id IS NULL
+		OR rae.id = se.primary_asset_id
+	)
+
+UNION ALL
+
+SELECT
+	NULL as remote_id,
+	lae.id as local_id,
+	lae.name,
+	lae."type",
+	lae.created_at as created_at,
+	lae.updated_at,
+	lae.width,
+	lae.height,
+	lae.duration_in_seconds,
+	lae.is_favorite,
+	NULL as thumb_hash,
+	lae.checksum,
+	NULL as owner_id,
+	NULL as live_photo_video_id,
+	lae.orientation,
+	NULL as stack_id
+FROM
+	local_asset_entity lae
+WHERE NOT EXISTS (
+	SELECT 1 FROM remote_asset_entity rae WHERE rae.checksum = lae.checksum
+)
+AND EXISTS (
+	SELECT 1 FROM local_album_asset_entity laa
+	INNER JOIN local_album_entity la on laa.album_id = la.id
+	WHERE laa.asset_id = lae.id AND la.backup_selection = 0 -- selected
 )
 ORDER BY created_at DESC
 LIMIT $limit;
@@ -85,17 +77,14 @@ SELECT
 FROM
 (
 	SELECT
-		rae.name,
 		rae.created_at
 	FROM
 		remote_asset_entity rae
-	LEFT JOIN
-		local_asset_entity lae  ON rae.checksum  = lae.checksum
 	LEFT JOIN
         stack_entity se ON rae.stack_id = se.id
 	WHERE
 		rae.deleted_at IS NULL
-		AND rae.visibility = 0
+		AND rae.visibility = 0 -- timeline visibility
 		AND rae.owner_id in ?
 		AND (
 			rae.stack_id IS NULL
@@ -103,14 +92,18 @@ FROM
 		)
 	UNION ALL
 	SELECT
-		lae.name,
 		lae.created_at
 	FROM
 		local_asset_entity lae
 	LEFT JOIN
 		remote_asset_entity rae ON rae.checksum = lae.checksum
+	LEFT JOIN
+		local_album_asset_entity laa ON laa.asset_id = lae.id
+	LEFT JOIN
+		local_album_entity la ON la.id = laa.album_id
 	WHERE
 		rae.id IS NULL
+		AND la.backup_selection = 0 -- selected
 )
 GROUP BY bucket_date
 ORDER BY bucket_date DESC;
diff --git a/mobile/lib/infrastructure/entities/merged_asset.drift.dart b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
index ac3db868e1..7f56b25d4e 100644
--- a/mobile/lib/infrastructure/entities/merged_asset.drift.dart
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
@@ -3,24 +3,29 @@
 import 'package:drift/drift.dart' as i0;
 import 'package:drift/internal/modular.dart' as i1;
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart' as i2;
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
-    as i3;
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart'
+    as i3;
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
     as i4;
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart'
     as i5;
+import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart'
+    as i6;
+import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart'
+    as i7;
 
 class MergedAssetDrift extends i1.ModularAccessor {
   MergedAssetDrift(i0.GeneratedDatabase db) : super(db);
   i0.Selectable<MergedAssetResult> mergedAsset(List<String> var1,
-      {required i0.Limit limit}) {
+      {required MergedAsset$limit limit}) {
     var $arrayStartIndex = 1;
     final expandedvar1 = $expandVar($arrayStartIndex, var1.length);
     $arrayStartIndex += var1.length;
-    final generatedlimit = $write(limit, startIndex: $arrayStartIndex);
+    final generatedlimit = $write(limit(alias(this.localAssetEntity, 'lae')),
+        startIndex: $arrayStartIndex);
     $arrayStartIndex += generatedlimit.amountOfVariables;
     return customSelect(
-        'SELECT * FROM (SELECT rae.id AS remote_id, lae.id AS local_id, rae.name, rae.type, rae.created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, COALESCE(stack_count.total_count, 0) AS stack_count FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum LEFT JOIN stack_entity AS se ON rae.stack_id = se.id LEFT JOIN (SELECT stack_id, COUNT(*) AS total_count FROM remote_asset_entity WHERE deleted_at IS NULL AND visibility = 0 AND stack_id IS NOT NULL GROUP BY stack_id) AS stack_count ON rae.stack_id = stack_count.stack_id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, 0 AS stack_count FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) ORDER BY created_at DESC ${generatedlimit.sql}',
+        'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar1) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) ORDER BY created_at DESC ${generatedlimit.sql}',
         variables: [
           for (var $ in var1) i0.Variable<String>($),
           ...generatedlimit.introducedVariables
@@ -29,12 +34,14 @@ class MergedAssetDrift extends i1.ModularAccessor {
           remoteAssetEntity,
           localAssetEntity,
           stackEntity,
+          localAlbumAssetEntity,
+          localAlbumEntity,
           ...generatedlimit.watchedTables,
         }).map((i0.QueryRow row) => MergedAssetResult(
           remoteId: row.readNullable<String>('remote_id'),
           localId: row.readNullable<String>('local_id'),
           name: row.read<String>('name'),
-          type: i3.$RemoteAssetEntityTable.$convertertype
+          type: i4.$RemoteAssetEntityTable.$convertertype
               .fromSql(row.read<int>('type')),
           createdAt: row.read<DateTime>('created_at'),
           updatedAt: row.read<DateTime>('updated_at'),
@@ -48,7 +55,6 @@ class MergedAssetDrift extends i1.ModularAccessor {
           livePhotoVideoId: row.readNullable<String>('live_photo_video_id'),
           orientation: row.read<int>('orientation'),
           stackId: row.readNullable<String>('stack_id'),
-          stackCount: row.read<int>('stack_count'),
         ));
   }
 
@@ -58,30 +64,39 @@ class MergedAssetDrift extends i1.ModularAccessor {
     final expandedvar2 = $expandVar($arrayStartIndex, var2.length);
     $arrayStartIndex += var2.length;
     return customSelect(
-        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at, \'localtime\') WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at, \'localtime\') END AS bucket_date FROM (SELECT rae.name, rae.created_at FROM remote_asset_entity AS rae LEFT JOIN local_asset_entity AS lae ON rae.checksum = lae.checksum LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT lae.name, lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum WHERE rae.id IS NULL) GROUP BY bucket_date ORDER BY bucket_date DESC',
+        'SELECT COUNT(*) AS asset_count, CASE WHEN ?1 = 0 THEN STRFTIME(\'%Y-%m-%d\', created_at, \'localtime\') WHEN ?1 = 1 THEN STRFTIME(\'%Y-%m\', created_at, \'localtime\') END AS bucket_date FROM (SELECT rae.created_at FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandedvar2) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT lae.created_at FROM local_asset_entity AS lae LEFT JOIN remote_asset_entity AS rae ON rae.checksum = lae.checksum LEFT JOIN local_album_asset_entity AS laa ON laa.asset_id = lae.id LEFT JOIN local_album_entity AS la ON la.id = laa.album_id WHERE rae.id IS NULL AND la.backup_selection = 0) GROUP BY bucket_date ORDER BY bucket_date DESC',
         variables: [
           i0.Variable<int>(groupBy),
           for (var $ in var2) i0.Variable<String>($)
         ],
         readsFrom: {
           remoteAssetEntity,
-          localAssetEntity,
           stackEntity,
+          localAssetEntity,
+          localAlbumAssetEntity,
+          localAlbumEntity,
         }).map((i0.QueryRow row) => MergedBucketResult(
           assetCount: row.read<int>('asset_count'),
           bucketDate: row.read<String>('bucket_date'),
         ));
   }
 
-  i3.$RemoteAssetEntityTable get remoteAssetEntity =>
+  i4.$RemoteAssetEntityTable get remoteAssetEntity =>
       i1.ReadDatabaseContainer(attachedDatabase)
-          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity');
-  i4.$LocalAssetEntityTable get localAssetEntity =>
-      i1.ReadDatabaseContainer(attachedDatabase)
-          .resultSet<i4.$LocalAssetEntityTable>('local_asset_entity');
+          .resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity');
   i5.$StackEntityTable get stackEntity =>
       i1.ReadDatabaseContainer(attachedDatabase)
           .resultSet<i5.$StackEntityTable>('stack_entity');
+  i3.$LocalAssetEntityTable get localAssetEntity =>
+      i1.ReadDatabaseContainer(attachedDatabase)
+          .resultSet<i3.$LocalAssetEntityTable>('local_asset_entity');
+  i6.$LocalAlbumAssetEntityTable get localAlbumAssetEntity =>
+      i1.ReadDatabaseContainer(attachedDatabase)
+          .resultSet<i6.$LocalAlbumAssetEntityTable>(
+              'local_album_asset_entity');
+  i7.$LocalAlbumEntityTable get localAlbumEntity =>
+      i1.ReadDatabaseContainer(attachedDatabase)
+          .resultSet<i7.$LocalAlbumEntityTable>('local_album_entity');
 }
 
 class MergedAssetResult {
@@ -101,7 +116,6 @@ class MergedAssetResult {
   final String? livePhotoVideoId;
   final int orientation;
   final String? stackId;
-  final int stackCount;
   MergedAssetResult({
     this.remoteId,
     this.localId,
@@ -119,10 +133,11 @@ class MergedAssetResult {
     this.livePhotoVideoId,
     required this.orientation,
     this.stackId,
-    required this.stackCount,
   });
 }
 
+typedef MergedAsset$limit = i0.Limit Function(i3.$LocalAssetEntityTable lae);
+
 class MergedBucketResult {
   final int assetCount;
   final String bucketDate;
diff --git a/mobile/lib/infrastructure/repositories/backup.repository.dart b/mobile/lib/infrastructure/repositories/backup.repository.dart
index 99df206db5..aed7118e5a 100644
--- a/mobile/lib/infrastructure/repositories/backup.repository.dart
+++ b/mobile/lib/infrastructure/repositories/backup.repository.dart
@@ -50,7 +50,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
     return query.get().then((rows) => rows.length);
   }
 
-  Future<int> getRemainderCount() async {
+  Future<int> getRemainderCount(String userId) async {
     final query = _db.localAlbumAssetEntity.selectOnly(distinct: true)
       ..addColumns([_db.localAlbumAssetEntity.assetId])
       ..join([
@@ -74,7 +74,8 @@ class DriftBackupRepository extends DriftDatabaseRepository {
       ..where(
         _db.localAlbumEntity.backupSelection
                 .equalsValue(BackupSelection.selected) &
-            _db.remoteAssetEntity.id.isNull() &
+            (_db.remoteAssetEntity.id.isNull() |
+                _db.remoteAssetEntity.ownerId.equals(userId).not()) &
             _db.localAlbumAssetEntity.assetId
                 .isNotInQuery(_getExcludedSubquery()),
       );
@@ -82,7 +83,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
     return query.get().then((rows) => rows.length);
   }
 
-  Future<int> getBackupCount() async {
+  Future<int> getBackupCount(String userId) async {
     final query = _db.localAlbumAssetEntity.selectOnly(distinct: true)
       ..addColumns(
         [_db.localAlbumAssetEntity.assetId],
@@ -109,6 +110,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
         _db.localAlbumEntity.backupSelection
                 .equalsValue(BackupSelection.selected) &
             _db.remoteAssetEntity.id.isNotNull() &
+            _db.remoteAssetEntity.ownerId.equals(userId) &
             _db.localAlbumAssetEntity.assetId
                 .isNotInQuery(_getExcludedSubquery()),
       );
@@ -116,7 +118,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
     return query.get().then((rows) => rows.length);
   }
 
-  Future<List<LocalAsset>> getCandidates() async {
+  Future<List<LocalAsset>> getCandidates(String userId) async {
     final selectedAlbumIds = _db.localAlbumEntity.selectOnly(distinct: true)
       ..addColumns([_db.localAlbumEntity.id])
       ..where(
@@ -141,6 +143,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
                 ..addColumns([_db.remoteAssetEntity.checksum])
                 ..where(
                   _db.remoteAssetEntity.checksum.equalsExp(lae.checksum) &
+                      _db.remoteAssetEntity.ownerId.equals(userId) &
                       lae.checksum.isNotNull(),
                 ),
             ) &
diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/lib/infrastructure/repositories/db.repository.dart
index ced148f855..5cbbb3b4f4 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -4,8 +4,8 @@ import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
 import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/domain/interfaces/db.interface.dart';
-import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.dart';
+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';
@@ -97,7 +97,9 @@ class Drift extends $Drift implements IDatabaseRepository {
                 await m.alterTable(TableMigration(v3.stackEntity));
               },
               from3To4: (m, v4) async {
+                // Thumbnail path column got removed from person_entity
                 await m.alterTable(TableMigration(v4.personEntity));
+                // asset_face_entity is added
                 await m.create(v4.assetFaceEntity);
               },
             ),
diff --git a/mobile/lib/infrastructure/repositories/db.repository.drift.dart b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
index 7b722dfff6..f5962f09ab 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -5,17 +5,17 @@ import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
     as i1;
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
     as i2;
-import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart'
-    as i3;
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart'
+    as i3;
+import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart'
     as i4;
-import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
-    as i5;
-import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
-    as i6;
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart'
-    as i7;
+    as i5;
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart'
+    as i6;
+import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
+    as i7;
+import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
     as i8;
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
     as i9;
@@ -43,17 +43,17 @@ abstract class $Drift extends i0.GeneratedDatabase {
   late final i1.$UserEntityTable userEntity = i1.$UserEntityTable(this);
   late final i2.$RemoteAssetEntityTable remoteAssetEntity =
       i2.$RemoteAssetEntityTable(this);
-  late final i3.$LocalAssetEntityTable localAssetEntity =
-      i3.$LocalAssetEntityTable(this);
-  late final i4.$StackEntityTable stackEntity = i4.$StackEntityTable(this);
-  late final i5.$UserMetadataEntityTable userMetadataEntity =
-      i5.$UserMetadataEntityTable(this);
-  late final i6.$PartnerEntityTable partnerEntity =
-      i6.$PartnerEntityTable(this);
-  late final i7.$LocalAlbumEntityTable localAlbumEntity =
-      i7.$LocalAlbumEntityTable(this);
-  late final i8.$LocalAlbumAssetEntityTable localAlbumAssetEntity =
-      i8.$LocalAlbumAssetEntityTable(this);
+  late final i3.$StackEntityTable stackEntity = i3.$StackEntityTable(this);
+  late final i4.$LocalAssetEntityTable localAssetEntity =
+      i4.$LocalAssetEntityTable(this);
+  late final i5.$LocalAlbumEntityTable localAlbumEntity =
+      i5.$LocalAlbumEntityTable(this);
+  late final i6.$LocalAlbumAssetEntityTable localAlbumAssetEntity =
+      i6.$LocalAlbumAssetEntityTable(this);
+  late final i7.$UserMetadataEntityTable userMetadataEntity =
+      i7.$UserMetadataEntityTable(this);
+  late final i8.$PartnerEntityTable partnerEntity =
+      i8.$PartnerEntityTable(this);
   late final i9.$RemoteExifEntityTable remoteExifEntity =
       i9.$RemoteExifEntityTable(this);
   late final i10.$RemoteAlbumEntityTable remoteAlbumEntity =
@@ -77,15 +77,15 @@ abstract class $Drift extends i0.GeneratedDatabase {
   List<i0.DatabaseSchemaEntity> get allSchemaEntities => [
         userEntity,
         remoteAssetEntity,
-        localAssetEntity,
         stackEntity,
-        i3.idxLocalAssetChecksum,
+        localAssetEntity,
+        localAlbumEntity,
+        localAlbumAssetEntity,
+        i4.idxLocalAssetChecksum,
         i2.uQRemoteAssetOwnerChecksum,
         i2.idxRemoteAssetChecksum,
         userMetadataEntity,
         partnerEntity,
-        localAlbumEntity,
-        localAlbumAssetEntity,
         remoteExifEntity,
         remoteAlbumEntity,
         remoteAlbumAssetEntity,
@@ -113,6 +113,22 @@ abstract class $Drift extends i0.GeneratedDatabase {
               i0.TableUpdate('stack_entity', kind: i0.UpdateKind.delete),
             ],
           ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('local_asset_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('local_album_asset_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('local_album_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('local_album_asset_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
           i0.WritePropagation(
             on: i0.TableUpdateQuery.onTableName('user_entity',
                 limitUpdateKind: i0.UpdateKind.delete),
@@ -135,22 +151,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
               i0.TableUpdate('partner_entity', kind: i0.UpdateKind.delete),
             ],
           ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('local_asset_entity',
-                limitUpdateKind: i0.UpdateKind.delete),
-            result: [
-              i0.TableUpdate('local_album_asset_entity',
-                  kind: i0.UpdateKind.delete),
-            ],
-          ),
-          i0.WritePropagation(
-            on: i0.TableUpdateQuery.onTableName('local_album_entity',
-                limitUpdateKind: i0.UpdateKind.delete),
-            result: [
-              i0.TableUpdate('local_album_asset_entity',
-                  kind: i0.UpdateKind.delete),
-            ],
-          ),
           i0.WritePropagation(
             on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
                 limitUpdateKind: i0.UpdateKind.delete),
@@ -260,18 +260,18 @@ class $DriftManager {
       i1.$$UserEntityTableTableManager(_db, _db.userEntity);
   i2.$$RemoteAssetEntityTableTableManager get remoteAssetEntity =>
       i2.$$RemoteAssetEntityTableTableManager(_db, _db.remoteAssetEntity);
-  i3.$$LocalAssetEntityTableTableManager get localAssetEntity =>
-      i3.$$LocalAssetEntityTableTableManager(_db, _db.localAssetEntity);
-  i4.$$StackEntityTableTableManager get stackEntity =>
-      i4.$$StackEntityTableTableManager(_db, _db.stackEntity);
-  i5.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
-      i5.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
-  i6.$$PartnerEntityTableTableManager get partnerEntity =>
-      i6.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
-  i7.$$LocalAlbumEntityTableTableManager get localAlbumEntity =>
-      i7.$$LocalAlbumEntityTableTableManager(_db, _db.localAlbumEntity);
-  i8.$$LocalAlbumAssetEntityTableTableManager get localAlbumAssetEntity => i8
+  i3.$$StackEntityTableTableManager get stackEntity =>
+      i3.$$StackEntityTableTableManager(_db, _db.stackEntity);
+  i4.$$LocalAssetEntityTableTableManager get localAssetEntity =>
+      i4.$$LocalAssetEntityTableTableManager(_db, _db.localAssetEntity);
+  i5.$$LocalAlbumEntityTableTableManager get localAlbumEntity =>
+      i5.$$LocalAlbumEntityTableTableManager(_db, _db.localAlbumEntity);
+  i6.$$LocalAlbumAssetEntityTableTableManager get localAlbumAssetEntity => i6
       .$$LocalAlbumAssetEntityTableTableManager(_db, _db.localAlbumAssetEntity);
+  i7.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
+      i7.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
+  i8.$$PartnerEntityTableTableManager get partnerEntity =>
+      i8.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
   i9.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
       i9.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
   i10.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity =>
diff --git a/mobile/lib/infrastructure/repositories/db.repository.steps.dart b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
index d8c35707ed..7f179fb5f0 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -1273,15 +1273,15 @@ final class Schema4 extends i0.VersionedSchema {
   late final List<i1.DatabaseSchemaEntity> entities = [
     userEntity,
     remoteAssetEntity,
-    localAssetEntity,
     stackEntity,
+    localAssetEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
     idxLocalAssetChecksum,
     uQRemoteAssetOwnerChecksum,
     idxRemoteAssetChecksum,
     userMetadataEntity,
     partnerEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
     remoteExifEntity,
     remoteAlbumEntity,
     remoteAlbumAssetEntity,
@@ -1342,6 +1342,24 @@ final class Schema4 extends i0.VersionedSchema {
         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',
@@ -1366,9 +1384,9 @@ final class Schema4 extends i0.VersionedSchema {
         attachedDatabase: database,
       ),
       alias: null);
-  late final Shape3 stackEntity = Shape3(
+  late final Shape6 localAlbumEntity = Shape6(
       source: i0.VersionedTable(
-        entityName: 'stack_entity',
+        entityName: 'local_album_entity',
         withoutRowId: true,
         isStrict: true,
         tableConstraints: [
@@ -1376,10 +1394,26 @@ final class Schema4 extends i0.VersionedSchema {
         ],
         columns: [
           _column_0,
-          _column_9,
+          _column_1,
           _column_5,
-          _column_15,
-          _column_75,
+          _column_31,
+          _column_32,
+          _column_33,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape7 localAlbumAssetEntity = Shape7(
+      source: i0.VersionedTable(
+        entityName: 'local_album_asset_entity',
+        withoutRowId: true,
+        isStrict: true,
+        tableConstraints: [
+          'PRIMARY KEY(asset_id, album_id)',
+        ],
+        columns: [
+          _column_34,
+          _column_35,
         ],
         attachedDatabase: database,
       ),
@@ -1423,40 +1457,6 @@ final class Schema4 extends i0.VersionedSchema {
         attachedDatabase: database,
       ),
       alias: null);
-  late final Shape6 localAlbumEntity = Shape6(
-      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_33,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
-  late final Shape7 localAlbumAssetEntity = Shape7(
-      source: i0.VersionedTable(
-        entityName: 'local_album_asset_entity',
-        withoutRowId: true,
-        isStrict: true,
-        tableConstraints: [
-          'PRIMARY KEY(asset_id, album_id)',
-        ],
-        columns: [
-          _column_34,
-          _column_35,
-        ],
-        attachedDatabase: database,
-      ),
-      alias: null);
   late final Shape8 remoteExifEntity = Shape8(
       source: i0.VersionedTable(
         entityName: 'remote_exif_entity',
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index 64c602a2c7..c3b15efb83 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -32,49 +32,21 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
   }
 
   Stream<RemoteAsset?> watchAsset(String id) {
-    final stackCountRef = _db.stackEntity.id.count();
-
     final query = _db.remoteAssetEntity.select().addColumns([
       _db.localAssetEntity.id,
-      _db.stackEntity.primaryAssetId,
-      stackCountRef,
     ]).join([
       leftOuterJoin(
         _db.localAssetEntity,
         _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
         useColumns: false,
       ),
-      leftOuterJoin(
-        _db.stackEntity,
-        _db.stackEntity.primaryAssetId.equalsExp(_db.remoteAssetEntity.id),
-        useColumns: false,
-      ),
-      leftOuterJoin(
-        _db.remoteAssetEntity.createAlias('stacked_assets'),
-        _db.stackEntity.id.equalsExp(
-          _db.remoteAssetEntity.createAlias('stacked_assets').stackId,
-        ),
-        useColumns: false,
-      ),
     ])
       ..where(_db.remoteAssetEntity.id.equals(id))
-      ..groupBy([
-        _db.remoteAssetEntity.id,
-        _db.localAssetEntity.id,
-        _db.stackEntity.primaryAssetId,
-      ])
       ..limit(1);
 
     return query.map((row) {
       final asset = row.readTable(_db.remoteAssetEntity).toDto();
-      final primaryAssetId = row.read(_db.stackEntity.primaryAssetId);
-      final stackCount =
-          primaryAssetId == id ? (row.read(stackCountRef) ?? 0) : 0;
-
-      return asset.copyWith(
-        localId: row.read(_db.localAssetEntity.id),
-        stackCount: stackCount,
-      );
+      return asset.copyWith(localId: row.read(_db.localAssetEntity.id));
     }).watchSingleOrNull();
   }
 
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 7bbae9a80a..fe9ae1e60d 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -71,7 +71,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     required int count,
   }) {
     return _db.mergedAssetDrift
-        .mergedAsset(userIds, limit: Limit(count, offset))
+        .mergedAsset(userIds, limit: (_) => Limit(count, offset))
         .map(
           (row) => row.remoteId != null && row.ownerId != null
               ? RemoteAsset(
@@ -90,7 +90,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                   durationInSeconds: row.durationInSeconds,
                   livePhotoVideoId: row.livePhotoVideoId,
                   stackId: row.stackId,
-                  stackCount: row.stackCount,
                 )
               : LocalAsset(
                   id: row.localId!,
diff --git a/mobile/lib/pages/backup/drift_backup.page.dart b/mobile/lib/pages/backup/drift_backup.page.dart
index 7780413399..08b09250e1 100644
--- a/mobile/lib/pages/backup/drift_backup.page.dart
+++ b/mobile/lib/pages/backup/drift_backup.page.dart
@@ -9,6 +9,7 @@ import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/backup/backup_toggle_button.widget.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/backup/backup_info_card.dart';
 
@@ -24,12 +25,24 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
   @override
   void initState() {
     super.initState();
-    ref.read(driftBackupProvider.notifier).getBackupStatus();
+    final currentUser = ref.read(currentUserProvider);
+    if (currentUser == null) {
+      return;
+    }
+
+    ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
   }
 
   Future<void> startBackup() async {
-    await ref.read(driftBackupProvider.notifier).getBackupStatus();
-    await ref.read(driftBackupProvider.notifier).backup();
+    final currentUser = ref.read(currentUserProvider);
+    if (currentUser == null) {
+      return;
+    }
+
+    await ref
+        .read(driftBackupProvider.notifier)
+        .getBackupStatus(currentUser.id);
+    await ref.read(driftBackupProvider.notifier).backup(currentUser.id);
   }
 
   Future<void> stopBackup() async {
@@ -207,7 +220,13 @@ class _BackupAlbumSelectionCard extends ConsumerWidget {
         trailing: ElevatedButton(
           onPressed: () async {
             await context.pushRoute(const DriftBackupAlbumSelectionRoute());
-            ref.read(driftBackupProvider.notifier).getBackupStatus();
+            final currentUser = ref.read(currentUserProvider);
+            if (currentUser == null) {
+              return;
+            }
+            ref
+                .read(driftBackupProvider.notifier)
+                .getBackupStatus(currentUser.id);
           },
           child: const Text(
             "select",
diff --git a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
index 18d3ee1156..f0f3bedaab 100644
--- a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
+++ b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
@@ -4,17 +4,17 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
-
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';
-import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 import 'package:immich_mobile/widgets/common/search_field.dart';
+import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 
 @RoutePage()
 class DriftBackupAlbumSelectionPage extends ConsumerStatefulWidget {
@@ -92,7 +92,15 @@ class _DriftBackupAlbumSelectionPageState
         if (didPop && !_hasPopped) {
           _hasPopped = true;
 
-          await ref.read(driftBackupProvider.notifier).getBackupStatus();
+          super.initState();
+          final currentUser = ref.read(currentUserProvider);
+          if (currentUser == null) {
+            return;
+          }
+
+          await ref
+              .read(driftBackupProvider.notifier)
+              .getBackupStatus(currentUser.id);
           final currentTotalAssetCount =
               ref.read(driftBackupProvider.select((p) => p.totalCount));
 
@@ -107,7 +115,7 @@ class _DriftBackupAlbumSelectionPageState
             final backupNotifier = ref.read(driftBackupProvider.notifier);
 
             backupNotifier.cancel().then((_) {
-              backupNotifier.backup();
+              backupNotifier.backup(currentUser.id);
             });
           }
         }
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index b0be136a15..418c8b9e39 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -11,6 +11,7 @@ import 'package:immich_mobile/providers/infrastructure/album.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';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
@@ -38,7 +39,14 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
 
       await runNewSync(ref, full: true).then((_) async {
         if (isEnableBackup) {
-          await ref.read(driftBackupProvider.notifier).handleBackupResume();
+          final currentUser = ref.read(currentUserProvider);
+          if (currentUser == null) {
+            return;
+          }
+
+          await ref
+              .read(driftBackupProvider.notifier)
+              .handleBackupResume(currentUser.id);
         }
       });
     });
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart
index cb4e02b56c..5b86258e72 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart
@@ -6,11 +6,7 @@ class StackChildrenNotifier
     extends AutoDisposeFamilyAsyncNotifier<List<RemoteAsset>, BaseAsset?> {
   @override
   Future<List<RemoteAsset>> build(BaseAsset? asset) async {
-    if (asset == null ||
-        asset is! RemoteAsset ||
-        asset.stackId == null ||
-        // The stackCount check is to ensure we only fetch stacks for timelines that have stacks
-        asset.stackCount == 0) {
+    if (asset == null || asset is! RemoteAsset || asset.stackId == null) {
       return const [];
     }
 
diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index ce3d39629f..b059f5feaa 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -54,7 +54,7 @@ class ThumbnailTile extends ConsumerWidget {
             : const BoxDecoration();
 
     final hasStack =
-        asset is RemoteAsset && (asset as RemoteAsset).stackCount > 0;
+        asset is RemoteAsset && (asset as RemoteAsset).stackId != null;
 
     return Stack(
       children: [
@@ -86,9 +86,7 @@ class ThumbnailTile extends ConsumerWidget {
                         right: 10.0,
                         top: asset.isVideo ? 24.0 : 6.0,
                       ),
-                      child: _StackIndicator(
-                        stackCount: (asset as RemoteAsset).stackCount,
-                      ),
+                      child: const _TileOverlayIcon(Icons.burst_mode_rounded),
                     ),
                   ),
                 if (asset.isVideo)
@@ -198,40 +196,6 @@ class _SelectionIndicator extends StatelessWidget {
   }
 }
 
-class _StackIndicator extends StatelessWidget {
-  final int stackCount;
-
-  const _StackIndicator({required this.stackCount});
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      spacing: 3,
-      mainAxisSize: MainAxisSize.min,
-      mainAxisAlignment: MainAxisAlignment.end,
-      // CrossAxisAlignment.start looks more centered vertically than CrossAxisAlignment.center
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          stackCount.toString(),
-          style: const TextStyle(
-            color: Colors.white,
-            fontSize: 12,
-            fontWeight: FontWeight.bold,
-            shadows: [
-              Shadow(
-                blurRadius: 5.0,
-                color: Color.fromRGBO(0, 0, 0, 0.6),
-              ),
-            ],
-          ),
-        ),
-        const _TileOverlayIcon(Icons.burst_mode_rounded),
-      ],
-    );
-  }
-}
-
 class _VideoIndicator extends StatelessWidget {
   final Duration duration;
   const _VideoIndicator(this.duration);
diff --git a/mobile/lib/providers/app_life_cycle.provider.dart b/mobile/lib/providers/app_life_cycle.provider.dart
index 3be46d2fbd..647ada4a64 100644
--- a/mobile/lib/providers/app_life_cycle.provider.dart
+++ b/mobile/lib/providers/app_life_cycle.provider.dart
@@ -19,6 +19,7 @@ import 'package:immich_mobile/providers/memory.provider.dart';
 import 'package:immich_mobile/providers/notification_permission.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/tab.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/background.service.dart';
@@ -110,7 +111,14 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
               .getSetting(AppSettingsEnum.enableBackup);
 
           if (isEnableBackup) {
-            await _ref.read(driftBackupProvider.notifier).handleBackupResume();
+            final currentUser = _ref.read(currentUserProvider);
+            if (currentUser == null) {
+              return;
+            }
+
+            await _ref
+                .read(driftBackupProvider.notifier)
+                .handleBackupResume(currentUser.id);
           }
         });
       } catch (e, stackTrace) {
diff --git a/mobile/lib/providers/backup/drift_backup.provider.dart b/mobile/lib/providers/backup/drift_backup.provider.dart
index 3a2c7fd9ce..45941639a0 100644
--- a/mobile/lib/providers/backup/drift_backup.provider.dart
+++ b/mobile/lib/providers/backup/drift_backup.provider.dart
@@ -329,11 +329,11 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
     );
   }
 
-  Future<void> getBackupStatus() async {
+  Future<void> getBackupStatus(String userId) async {
     final [totalCount, backupCount, remainderCount] = await Future.wait([
       _backupService.getTotalCount(),
-      _backupService.getBackupCount(),
-      _backupService.getRemainderCount(),
+      _backupService.getBackupCount(userId),
+      _backupService.getRemainderCount(userId),
     ]);
 
     state = state.copyWith(
@@ -343,8 +343,8 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
     );
   }
 
-  Future<void> backup() {
-    return _backupService.backup(_updateEnqueueCount);
+  Future<void> backup(String userId) {
+    return _backupService.backup(userId, _updateEnqueueCount);
   }
 
   void _updateEnqueueCount(EnqueueStatus status) {
@@ -379,11 +379,11 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
     }
   }
 
-  Future<void> handleBackupResume() async {
+  Future<void> handleBackupResume(String userId) async {
     final tasks = await FileDownloader().allTasks(group: kBackupGroup);
     if (tasks.isEmpty) {
       // Start a new backup queue
-      await backup();
+      await backup(userId);
     }
 
     debugPrint("Tasks to resume: ${tasks.length}");
diff --git a/mobile/lib/services/drift_backup.service.dart b/mobile/lib/services/drift_backup.service.dart
index 2f51c261fb..7373643c95 100644
--- a/mobile/lib/services/drift_backup.service.dart
+++ b/mobile/lib/services/drift_backup.service.dart
@@ -48,20 +48,21 @@ class DriftBackupService {
     return _backupRepository.getTotalCount();
   }
 
-  Future<int> getRemainderCount() {
-    return _backupRepository.getRemainderCount();
+  Future<int> getRemainderCount(String userId) {
+    return _backupRepository.getRemainderCount(userId);
   }
 
-  Future<int> getBackupCount() {
-    return _backupRepository.getBackupCount();
+  Future<int> getBackupCount(String userId) {
+    return _backupRepository.getBackupCount(userId);
   }
 
   Future<void> backup(
+    String userId,
     void Function(EnqueueStatus status) onEnqueueTasks,
   ) async {
     shouldCancel = false;
 
-    final candidates = await _backupRepository.getCandidates();
+    final candidates = await _backupRepository.getCandidates(userId);
     if (candidates.isEmpty) {
       return;
     }
diff --git a/mobile/test/drift/main/generated/schema_v4.dart b/mobile/test/drift/main/generated/schema_v4.dart
index d02e2ff9c4..9cf72a098b 100644
--- a/mobile/test/drift/main/generated/schema_v4.dart
+++ b/mobile/test/drift/main/generated/schema_v4.dart
@@ -982,6 +982,255 @@ class RemoteAssetEntityCompanion
   }
 }
 
+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
@@ -1415,640 +1664,6 @@ class LocalAssetEntityCompanion extends UpdateCompanion<LocalAssetEntityData> {
   }
 }
 
-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 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 LocalAlbumEntity extends Table
     with TableInfo<LocalAlbumEntity, LocalAlbumEntityData> {
   @override
@@ -2498,6 +2113,391 @@ class LocalAlbumAssetEntityCompanion
   }
 }
 
+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
@@ -5467,8 +5467,11 @@ class DatabaseAtV4 extends GeneratedDatabase {
   DatabaseAtV4(QueryExecutor e) : super(e);
   late final UserEntity userEntity = UserEntity(this);
   late final RemoteAssetEntity remoteAssetEntity = RemoteAssetEntity(this);
-  late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
   late final StackEntity stackEntity = StackEntity(this);
+  late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
+  late final LocalAlbumEntity localAlbumEntity = LocalAlbumEntity(this);
+  late final LocalAlbumAssetEntity localAlbumAssetEntity =
+      LocalAlbumAssetEntity(this);
   late final Index idxLocalAssetChecksum = Index('idx_local_asset_checksum',
       'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
   late final Index uQRemoteAssetOwnerChecksum = Index(
@@ -5478,9 +5481,6 @@ class DatabaseAtV4 extends GeneratedDatabase {
       'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
   late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this);
   late final PartnerEntity partnerEntity = PartnerEntity(this);
-  late final LocalAlbumEntity localAlbumEntity = LocalAlbumEntity(this);
-  late final LocalAlbumAssetEntity localAlbumAssetEntity =
-      LocalAlbumAssetEntity(this);
   late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this);
   late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(this);
   late final RemoteAlbumAssetEntity remoteAlbumAssetEntity =
@@ -5498,15 +5498,15 @@ class DatabaseAtV4 extends GeneratedDatabase {
   List<DatabaseSchemaEntity> get allSchemaEntities => [
         userEntity,
         remoteAssetEntity,
-        localAssetEntity,
         stackEntity,
+        localAssetEntity,
+        localAlbumEntity,
+        localAlbumAssetEntity,
         idxLocalAssetChecksum,
         uQRemoteAssetOwnerChecksum,
         idxRemoteAssetChecksum,
         userMetadataEntity,
         partnerEntity,
-        localAlbumEntity,
-        localAlbumAssetEntity,
         remoteExifEntity,
         remoteAlbumEntity,
         remoteAlbumAssetEntity,

From 1a35a01149fda1d33470905203e3524c6db944cd Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Wed, 23 Jul 2025 09:20:52 -0500
Subject: [PATCH 288/337] feat: drift manual upload (#20101)

---
 i18n/en.json                                  |  3 ++
 .../repositories/timeline.repository.dart     |  5 +++
 mobile/lib/main.dart                          | 13 +++++++
 .../upload_action_button.widget.dart          | 36 ++++++++++++++++++-
 .../asset_viewer/bottom_bar.widget.dart       |  3 ++
 .../asset_viewer/bottom_sheet.widget.dart     |  2 +-
 .../archive_bottom_sheet.widget.dart          |  2 +-
 .../favorite_bottom_sheet.widget.dart         |  2 +-
 .../general_bottom_sheet.widget.dart          |  2 +-
 .../local_album_bottom_sheet.widget.dart      |  2 +-
 .../remote_album_bottom_sheet.widget.dart     |  2 +-
 .../infrastructure/action.provider.dart       | 18 ++++++++++
 .../lib/repositories/upload.repository.dart   |  5 +++
 mobile/lib/services/drift_backup.service.dart | 28 +++++++++++++--
 14 files changed, 114 insertions(+), 9 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 54c7ca6f1b..e2e0fd3c4f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1941,11 +1941,13 @@
   "updated_at": "Updated",
   "updated_password": "Updated password",
   "upload": "Upload",
+  "upload_action_prompt": "{count} queued for upload",
   "upload_concurrency": "Upload concurrency",
   "upload_details": "Upload Details",
   "upload_dialog_info": "Do you want to backup the selected Asset(s) to the server?",
   "upload_dialog_title": "Upload Asset",
   "upload_errors": "Upload completed with {count, plural, one {# error} other {# errors}}, refresh the page to see new upload assets.",
+  "upload_finished": "Upload finished",
   "upload_progress": "Remaining {remaining, number} - Processed {processed, number}/{total, number}",
   "upload_skipped_duplicates": "Skipped {count, plural, one {# duplicate asset} other {# duplicate assets}}",
   "upload_status_duplicates": "Duplicates",
@@ -1954,6 +1956,7 @@
   "upload_success": "Upload success, refresh the page to see new upload assets.",
   "upload_to_immich": "Upload to Immich ({count})",
   "uploading": "Uploading",
+  "uploading_media": "Uploading media",
   "url": "URL",
   "usage": "Usage",
   "use_biometric": "Use biometric",
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index fe9ae1e60d..2916993a9b 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -141,6 +141,11 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
         useColumns: false,
       ),
+      leftOuterJoin(
+        _db.remoteAssetEntity,
+        _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
+        useColumns: false,
+      ),
     ])
       ..addColumns([assetCountExp, dateExp])
       ..where(_db.localAlbumAssetEntity.albumId.equals(albumId))
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 9f39a89b33..b62fb180e5 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -203,6 +203,19 @@ class ImmichAppState extends ConsumerState<ImmichApp>
       ),
       progressBar: true,
     );
+
+    FileDownloader().configureNotificationForGroup(
+      kManualUploadGroup,
+      running: TaskNotification(
+        'uploading_media'.tr(),
+        '${'file_name'.tr()}: {displayName}',
+      ),
+      complete: TaskNotification(
+        'upload_finished'.tr(),
+        '${'file_name'.tr()}: {displayName}',
+      ),
+      progressBar: true,
+    );
   }
 
   Future<DeepLink> _deepLinkBuilder(PlatformDeepLink deepLink) async {
diff --git a/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart
index 66467e44a3..d67c952b1a 100644
--- a/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart
@@ -1,16 +1,50 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class UploadActionButton extends ConsumerWidget {
-  const UploadActionButton({super.key});
+  final ActionSource source;
+
+  const UploadActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).upload(source);
+
+    final successMessage = 'upload_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success
+            ? successMessage
+            : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+
+      ref.read(multiSelectProvider.notifier).reset();
+    }
+  }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
       iconData: Icons.backup_outlined,
       label: "upload".t(context: context),
+      onPressed: () => _onTap(context, ref),
     );
   }
 }
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
index cb558804d2..65bab5acb8 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
@@ -5,6 +5,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
@@ -37,6 +38,8 @@ class ViewerBottomBar extends ConsumerWidget {
 
     final actions = <Widget>[
       const ShareActionButton(source: ActionSource.viewer),
+      if (asset.isLocalOnly)
+        const UploadActionButton(source: ActionSource.viewer),
       if (asset.hasRemote && isOwner)
         const ArchiveActionButton(source: ActionSource.viewer),
     ];
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 0e426fde6d..9111469629 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -63,7 +63,7 @@ class AssetDetailBottomSheet extends ConsumerWidget {
       ],
       if (asset.storage == AssetState.local) ...[
         const DeleteLocalActionButton(source: ActionSource.viewer),
-        const UploadActionButton(),
+        const UploadActionButton(source: ActionSource.timeline),
       ],
     ];
 
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
index deaaea0d39..76243cf803 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
@@ -53,7 +53,7 @@ class ArchiveBottomSheet extends ConsumerWidget {
         ],
         if (multiselect.hasLocal) ...[
           const DeleteLocalActionButton(source: ActionSource.timeline),
-          const UploadActionButton(),
+          const UploadActionButton(source: ActionSource.timeline),
         ],
       ],
     );
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
index 8199271bfe..3f3f933745 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
@@ -53,7 +53,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
         ],
         if (multiselect.hasLocal) ...[
           const DeleteLocalActionButton(source: ActionSource.timeline),
-          const UploadActionButton(),
+          const UploadActionButton(source: ActionSource.timeline),
         ],
       ],
     );
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
index d83b8e399d..c148861b43 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -56,7 +56,7 @@ class GeneralBottomSheet extends ConsumerWidget {
         ],
         if (multiselect.hasLocal) ...[
           const DeleteLocalActionButton(source: ActionSource.timeline),
-          const UploadActionButton(),
+          const UploadActionButton(source: ActionSource.timeline),
         ],
       ],
     );
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
index 2ad0fe7485..b1e87dfaea 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/local_album_bottom_sheet.widget.dart
@@ -18,7 +18,7 @@ class LocalAlbumBottomSheet extends ConsumerWidget {
       actions: [
         ShareActionButton(source: ActionSource.timeline),
         DeleteLocalActionButton(source: ActionSource.timeline),
-        UploadActionButton(),
+        UploadActionButton(source: ActionSource.timeline),
       ],
     );
   }
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
index 2e6047f0ba..ff77c79906 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
@@ -56,7 +56,7 @@ class RemoteAlbumBottomSheet extends ConsumerWidget {
         ],
         if (multiselect.hasLocal) ...[
           const DeleteLocalActionButton(source: ActionSource.timeline),
-          const UploadActionButton(),
+          const UploadActionButton(source: ActionSource.timeline),
         ],
         RemoveFromAlbumActionButton(
           source: ActionSource.timeline,
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 419ba0f902..3102511295 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -5,6 +5,7 @@ import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asse
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/action.service.dart';
+import 'package:immich_mobile/services/drift_backup.service.dart';
 import 'package:immich_mobile/services/timeline.service.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -32,12 +33,14 @@ class ActionResult {
 class ActionNotifier extends Notifier<void> {
   final Logger _logger = Logger('ActionNotifier');
   late ActionService _service;
+  late DriftBackupService _backupService;
 
   ActionNotifier() : super();
 
   @override
   void build() {
     _service = ref.watch(actionServiceProvider);
+    _backupService = ref.watch(driftBackupServiceProvider);
   }
 
   List<String> _getRemoteIdsForSource(ActionSource source) {
@@ -368,6 +371,21 @@ class ActionNotifier extends Notifier<void> {
       );
     }
   }
+
+  Future<ActionResult> upload(ActionSource source) async {
+    final assets = _getAssets(source).whereType<LocalAsset>().toList();
+    try {
+      await _backupService.manualBackup(assets);
+      return ActionResult(count: assets.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed manually upload assets', error, stack);
+      return ActionResult(
+        count: assets.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
 }
 
 extension on Iterable<RemoteAsset> {
diff --git a/mobile/lib/repositories/upload.repository.dart b/mobile/lib/repositories/upload.repository.dart
index b98eece656..6d75313a24 100644
--- a/mobile/lib/repositories/upload.repository.dart
+++ b/mobile/lib/repositories/upload.repository.dart
@@ -20,6 +20,11 @@ class UploadRepository {
       taskStatusCallback: (update) => onUploadStatus?.call(update),
       taskProgressCallback: (update) => onTaskProgress?.call(update),
     );
+    FileDownloader().registerCallbacks(
+      group: kManualUploadGroup,
+      taskStatusCallback: (_) => {},
+      taskProgressCallback: (_) => {},
+    );
   }
 
   void enqueueAll(List<UploadTask> tasks) {
diff --git a/mobile/lib/services/drift_backup.service.dart b/mobile/lib/services/drift_backup.service.dart
index 7373643c95..ab878969a0 100644
--- a/mobile/lib/services/drift_backup.service.dart
+++ b/mobile/lib/services/drift_backup.service.dart
@@ -26,6 +26,7 @@ final driftBackupServiceProvider = Provider<DriftBackupService>(
   ),
 );
 
+// TODO: Rename to UploadService after removing Isar
 class DriftBackupService {
   DriftBackupService(
     this._backupRepository,
@@ -56,6 +57,24 @@ class DriftBackupService {
     return _backupRepository.getBackupCount(userId);
   }
 
+  Future<void> manualBackup(List<LocalAsset> localAssets) async {
+    List<UploadTask> tasks = [];
+    for (final asset in localAssets) {
+      final task = await _getUploadTask(
+        asset,
+        group: kManualUploadGroup,
+        priority: 1, // High priority after upload motion photo part
+      );
+      if (task != null) {
+        tasks.add(task);
+      }
+    }
+
+    if (tasks.isNotEmpty) {
+      _uploadService.enqueueTasks(tasks);
+    }
+  }
+
   Future<void> backup(
     String userId,
     void Function(EnqueueStatus status) onEnqueueTasks,
@@ -147,7 +166,11 @@ class DriftBackupService {
     }
   }
 
-  Future<UploadTask?> _getUploadTask(LocalAsset asset) async {
+  Future<UploadTask?> _getUploadTask(
+    LocalAsset asset, {
+    String group = kBackupGroup,
+    int? priority,
+  }) async {
     final entity = await _storageRepository.getAssetEntityForAsset(asset);
     if (entity == null) {
       return null;
@@ -193,7 +216,8 @@ class DriftBackupService {
       originalFileName: originalFileName,
       deviceAssetId: asset.id,
       metadata: metadata,
-      group: kBackupGroup,
+      group: group,
+      priority: priority,
     );
   }
 

From 0174de19dd712aa647289b0b9c4c161cae3a6628 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Wed, 23 Jul 2025 09:40:16 -0500
Subject: [PATCH 289/337] feat: export database option (#20098)

---
 i18n/en.json                                  |  2 +
 .../beta_sync_settings.dart                   | 79 +++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/i18n/en.json b/i18n/en.json
index e2e0fd3c4f..73338ff6cc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1002,6 +1002,8 @@
   "explorer": "Explorer",
   "export": "Export",
   "export_as_json": "Export as JSON",
+  "export_database": "Export Database",
+  "export_database_description": "Export the SQLite database",
   "extension": "Extension",
   "external": "External",
   "external_libraries": "External Libraries",
diff --git a/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart b/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
index 3d37fb102b..e69717d3a4 100644
--- a/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
+++ b/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:drift/drift.dart' as drift_db;
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -10,6 +12,9 @@ import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
 import 'package:immich_mobile/providers/sync_status.provider.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';
+import 'package:share_plus/share_plus.dart';
 
 class BetaSyncSettings extends HookConsumerWidget {
   const BetaSyncSettings({
@@ -69,6 +74,67 @@ class BetaSyncSettings extends HookConsumerWidget {
       });
     }
 
+    Future<void> exportDatabase() async {
+      try {
+        // WAL Checkpoint to ensure all changes are written to the database
+        await ref
+            .read(driftProvider)
+            .customStatement("pragma wal_checkpoint(truncate)");
+        final documentsDir = await getApplicationDocumentsDirectory();
+        final dbFile = File(path.join(documentsDir.path, 'immich.sqlite'));
+
+        if (!await dbFile.exists()) {
+          if (context.mounted) {
+            context.scaffoldMessenger.showSnackBar(
+              SnackBar(
+                content: Text("Database file not found".t(context: context)),
+              ),
+            );
+          }
+          return;
+        }
+
+        final timestamp = DateTime.now().millisecondsSinceEpoch;
+        final exportFile = File(
+          path.join(
+            documentsDir.path,
+            'immich_export_$timestamp.sqlite',
+          ),
+        );
+
+        await dbFile.copy(exportFile.path);
+
+        await Share.shareXFiles(
+          [XFile(exportFile.path)],
+          text: 'Immich Database Export',
+        );
+
+        Future.delayed(const Duration(seconds: 30), () async {
+          if (await exportFile.exists()) {
+            await exportFile.delete();
+          }
+        });
+
+        if (context.mounted) {
+          context.scaffoldMessenger.showSnackBar(
+            SnackBar(
+              content:
+                  Text("Database exported successfully".t(context: context)),
+            ),
+          );
+        }
+      } catch (e) {
+        if (context.mounted) {
+          context.scaffoldMessenger.showSnackBar(
+            SnackBar(
+              content:
+                  Text("Failed to export database: $e".t(context: context)),
+            ),
+          );
+        }
+      }
+    }
+
     return FutureBuilder<List<dynamic>>(
       future: loadCounts(),
       builder: (context, snapshot) {
@@ -232,6 +298,19 @@ class BetaSyncSettings extends HookConsumerWidget {
               ),
               const SizedBox(height: 24),
               _SectionHeaderText(text: "actions".t(context: context)),
+              ListTile(
+                title: Text(
+                  "export_database".t(context: context),
+                  style: const TextStyle(
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+                subtitle: Text(
+                  "export_database_description".t(context: context),
+                ),
+                leading: const Icon(Icons.download),
+                onTap: exportDatabase,
+              ),
               ListTile(
                 title: Text(
                   "reset_sqlite".t(context: context),

From 0e1c8c2b8086bd2fc6a7433431e9c18c598eb6de Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Wed, 23 Jul 2025 19:12:06 +0200
Subject: [PATCH 290/337] fix: ML recognition distance UI form validation
 (#20107)

---
 .../machine-learning-settings.svelte                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte b/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte
index c120cb3750..acc920981b 100644
--- a/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte
+++ b/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte
@@ -183,7 +183,7 @@
             label={$t('admin.machine_learning_min_detection_score')}
             description={$t('admin.machine_learning_min_detection_score_description')}
             bind:value={config.machineLearning.facialRecognition.minScore}
-            step="0.1"
+            step="0.01"
             min={0.1}
             max={1}
             disabled={disabled || !config.machineLearning.enabled || !config.machineLearning.facialRecognition.enabled}
@@ -196,7 +196,7 @@
             label={$t('admin.machine_learning_max_recognition_distance')}
             description={$t('admin.machine_learning_max_recognition_distance_description')}
             bind:value={config.machineLearning.facialRecognition.maxDistance}
-            step="0.1"
+            step="0.01"
             min={0.1}
             max={2}
             disabled={disabled || !config.machineLearning.enabled || !config.machineLearning.facialRecognition.enabled}

From 2bead445bdb6c9717216e61ba8e1f7370e6653f1 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Wed, 23 Jul 2025 16:00:19 -0400
Subject: [PATCH 291/337] docs: remove outdated note (#20110)

---
 docs/docs/install/environment-variables.md | 31 ++++++++++------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/docs/docs/install/environment-variables.md b/docs/docs/install/environment-variables.md
index 8d5ab55049..939c42439d 100644
--- a/docs/docs/install/environment-variables.md
+++ b/docs/docs/install/environment-variables.md
@@ -29,29 +29,26 @@ These environment variables are used by the `docker-compose.yml` file and do **N
 
 ## General
 
-| Variable                            | Description                                                                               |               Default               | Containers               | Workers            |
-| :---------------------------------- | :---------------------------------------------------------------------------------------- | :---------------------------------: | :----------------------- | :----------------- |
-| `TZ`                                | Timezone                                                                                  |           <sup>\*1</sup>            | server                   | microservices      |
-| `IMMICH_ENV`                        | Environment (production, development)                                                     |            `production`             | server, machine learning | api, microservices |
-| `IMMICH_LOG_LEVEL`                  | Log level (verbose, debug, log, warn, error)                                              |                `log`                | server, machine learning | api, microservices |
-| `IMMICH_MEDIA_LOCATION`             | Media location inside the container ⚠️**You probably shouldn't set this**<sup>\*2</sup>⚠️ | `/usr/src/app/upload`<sup>\*3</sup> | server                   | api, microservices |
-| `IMMICH_CONFIG_FILE`                | Path to config file                                                                       |                                     | server                   | api, microservices |
-| `NO_COLOR`                          | Set to `true` to disable color-coded log output                                           |               `false`               | server, machine learning |                    |
-| `CPU_CORES`                         | Number of cores available to the Immich server                                            |    auto-detected CPU core count     | server                   |                    |
-| `IMMICH_API_METRICS_PORT`           | Port for the OTEL metrics                                                                 |               `8081`                | server                   | api                |
-| `IMMICH_MICROSERVICES_METRICS_PORT` | Port for the OTEL metrics                                                                 |               `8082`                | server                   | microservices      |
-| `IMMICH_PROCESS_INVALID_IMAGES`     | When `true`, generate thumbnails for invalid images                                       |                                     | server                   | microservices      |
-| `IMMICH_TRUSTED_PROXIES`            | List of comma-separated IPs set as trusted proxies                                        |                                     | server                   | api                |
-| `IMMICH_IGNORE_MOUNT_CHECK_ERRORS`  | See [System Integrity](/docs/administration/system-integrity)                             |                                     | server                   | api, microservices |
+| Variable                            | Description                                                                               |           Default            | Containers               | Workers            |
+| :---------------------------------- | :---------------------------------------------------------------------------------------- | :--------------------------: | :----------------------- | :----------------- |
+| `TZ`                                | Timezone                                                                                  |        <sup>\*1</sup>        | server                   | microservices      |
+| `IMMICH_ENV`                        | Environment (production, development)                                                     |         `production`         | server, machine learning | api, microservices |
+| `IMMICH_LOG_LEVEL`                  | Log level (verbose, debug, log, warn, error)                                              |            `log`             | server, machine learning | api, microservices |
+| `IMMICH_MEDIA_LOCATION`             | Media location inside the container ⚠️**You probably shouldn't set this**<sup>\*2</sup>⚠️ |    `/usr/src/app/upload`     | server                   | api, microservices |
+| `IMMICH_CONFIG_FILE`                | Path to config file                                                                       |                              | server                   | api, microservices |
+| `NO_COLOR`                          | Set to `true` to disable color-coded log output                                           |           `false`            | server, machine learning |                    |
+| `CPU_CORES`                         | Number of cores available to the Immich server                                            | auto-detected CPU core count | server                   |                    |
+| `IMMICH_API_METRICS_PORT`           | Port for the OTEL metrics                                                                 |            `8081`            | server                   | api                |
+| `IMMICH_MICROSERVICES_METRICS_PORT` | Port for the OTEL metrics                                                                 |            `8082`            | server                   | microservices      |
+| `IMMICH_PROCESS_INVALID_IMAGES`     | When `true`, generate thumbnails for invalid images                                       |                              | server                   | microservices      |
+| `IMMICH_TRUSTED_PROXIES`            | List of comma-separated IPs set as trusted proxies                                        |                              | server                   | api                |
+| `IMMICH_IGNORE_MOUNT_CHECK_ERRORS`  | See [System Integrity](/docs/administration/system-integrity)                             |                              | server                   | api, microservices |
 
 \*1: `TZ` should be set to a `TZ identifier` from [this list][tz-list]. For example, `TZ="Etc/UTC"`.
 `TZ` is used by `exiftool` as a fallback in case the timezone cannot be determined from the image metadata. It is also used for logfile timestamps and cron job execution.
 
 \*2: This path is where the Immich code looks for the files, which is internal to the docker container. Setting it to a path on your host will certainly break things, you should use the `UPLOAD_LOCATION` variable instead.
 
-\*3: With the default `WORKDIR` of `/usr/src/app`, this path will resolve to `/usr/src/app/upload`.
-It only needs to be set if the Immich deployment method is changing.
-
 ## Workers
 
 | Variable                 | Description                                                                                          | Default | Containers |

From a6759221727c64c82d7329cf276095129098e33a Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Wed, 23 Jul 2025 16:52:59 -0400
Subject: [PATCH 292/337] fix: unset prewarn param (#20109)

---
 server/src/repositories/logging.repository.ts |  9 +++--
 .../1750323941566-UnsetPrewarmDimParameter.ts | 35 +++++++++----------
 .../1752759108283-ConvertToAbsolutePaths.ts   |  3 +-
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/server/src/repositories/logging.repository.ts b/server/src/repositories/logging.repository.ts
index 1833168f3e..939ecb718f 100644
--- a/server/src/repositories/logging.repository.ts
+++ b/server/src/repositories/logging.repository.ts
@@ -85,8 +85,13 @@ export class LoggingRepository {
     this.logger = new MyConsoleLogger(cls, { context: LoggingRepository.name, color: !noColor });
   }
 
-  static create() {
-    return new LoggingRepository(undefined, undefined);
+  static create(context?: string) {
+    const logger = new LoggingRepository(undefined, undefined);
+    if (context) {
+      logger.setContext(context);
+    }
+
+    return logger;
   }
 
   setAppName(name: string): void {
diff --git a/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts b/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts
index 776b51d1db..d687694490 100644
--- a/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts
+++ b/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts
@@ -1,25 +1,22 @@
 import { Kysely, sql } from 'kysely';
+import { LoggingRepository } from 'src/repositories/logging.repository';
 
-export async function up(qb: Kysely<any>): Promise<void> {
-  type Conf = { db: string; guc: string[] };
-  const res = await sql<Conf>`
-    select current_database() db, to_json(setconfig) guc
-    from pg_db_role_setting
-    where setdatabase = (select oid from pg_database where datname = current_database())
-      and setrole = 0;`.execute(qb);
-  if (res.rows.length === 0) {
-    return;
-  }
+const logger = LoggingRepository.create('Migrations');
 
-  const { db, guc } = res.rows[0];
-  await sql.raw(`alter database "${db}" reset all;`).execute(qb);
-  for (const parameter of guc) {
-    const [key, value] = parameter.split('=');
-    if (key === 'vchordrq.prewarm_dim') {
-      continue;
-    }
-    await sql.raw(`alter database "${db}" set ${key} to ${value};`).execute(qb);
+export async function up(db: Kysely<any>): Promise<void> {
+  const { rows } = await sql<{ db: string }>`SELECT current_database() as db;`.execute(db);
+  const databaseName = rows[0].db;
+  try {
+    await sql.raw(`ALTER DATABASE "${databaseName}" RESET vchordrq.prewarm_dim;`).execute(db);
+  } catch {
+    logger.warn('Failed to reset vchordrq.prewarm_dim, skipping');
   }
 }
 
-export async function down(): Promise<void> {}
+export async function down(db: Kysely<any>): Promise<void> {
+  const { rows } = await sql<{ db: string }>`SELECT current_database() as db;`.execute(db);
+  const databaseName = rows[0].db;
+  await sql
+    .raw(`ALTER DATABASE "${databaseName}" SET vchordrq.prewarm_dim = '512,640,768,1024,1152,1536';`)
+    .execute(db);
+}
diff --git a/server/src/schema/migrations/1752759108283-ConvertToAbsolutePaths.ts b/server/src/schema/migrations/1752759108283-ConvertToAbsolutePaths.ts
index 68b0c7931e..839af40cf5 100644
--- a/server/src/schema/migrations/1752759108283-ConvertToAbsolutePaths.ts
+++ b/server/src/schema/migrations/1752759108283-ConvertToAbsolutePaths.ts
@@ -1,8 +1,7 @@
 import { Kysely, sql } from 'kysely';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 
-const logger = LoggingRepository.create();
-logger.setContext('Migrations');
+const logger = LoggingRepository.create('Migrations');
 
 export async function up(db: Kysely<any>): Promise<void> {
   if (process.env.IMMICH_MEDIA_LOCATION) {

From bc8cb9b671412ff8aa2999a74ee45d5ff272b058 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Wed, 23 Jul 2025 16:56:38 -0400
Subject: [PATCH 293/337] fix: default route permission (#20113)

---
 server/src/services/auth.service.spec.ts | 32 ++++++++++++++++++------
 server/src/services/auth.service.ts      |  7 +++---
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/server/src/services/auth.service.spec.ts b/server/src/services/auth.service.spec.ts
index 129877bbdd..9f678162c6 100644
--- a/server/src/services/auth.service.spec.ts
+++ b/server/src/services/auth.service.spec.ts
@@ -459,18 +459,34 @@ describe(AuthService.name, () => {
 
       mocks.apiKey.getKey.mockResolvedValue({ ...authApiKey, user: authUser });
 
-      await expect(
-        sut.authenticate({
-          headers: { 'x-api-key': 'auth_token' },
-          queryParams: {},
-          metadata: { adminRoute: false, sharedLinkRoute: false, uri: 'test', permission: Permission.AssetRead },
-        }),
-      ).rejects.toBeInstanceOf(ForbiddenException);
+      const result = sut.authenticate({
+        headers: { 'x-api-key': 'auth_token' },
+        queryParams: {},
+        metadata: { adminRoute: false, sharedLinkRoute: false, uri: 'test', permission: Permission.AssetRead },
+      });
+
+      await expect(result).rejects.toBeInstanceOf(ForbiddenException);
+      await expect(result).rejects.toThrow('Missing required permission: asset.read');
+    });
+
+    it('should default to requiring the all permission when omitted', async () => {
+      const authUser = factory.authUser();
+      const authApiKey = factory.authApiKey({ permissions: [Permission.AssetRead] });
+
+      mocks.apiKey.getKey.mockResolvedValue({ ...authApiKey, user: authUser });
+
+      const result = sut.authenticate({
+        headers: { 'x-api-key': 'auth_token' },
+        queryParams: {},
+        metadata: { adminRoute: false, sharedLinkRoute: false, uri: 'test' },
+      });
+      await expect(result).rejects.toBeInstanceOf(ForbiddenException);
+      await expect(result).rejects.toThrow('Missing required permission: all');
     });
 
     it('should return an auth dto', async () => {
       const authUser = factory.authUser();
-      const authApiKey = factory.authApiKey({ permissions: [] });
+      const authApiKey = factory.authApiKey({ permissions: [Permission.All] });
 
       mocks.apiKey.getKey.mockResolvedValue({ ...authApiKey, user: authUser });
 
diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
index a5b0de25cd..f757bf5a3e 100644
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -174,7 +174,8 @@ export class AuthService extends BaseService {
 
   async authenticate({ headers, queryParams, metadata }: ValidateRequest): Promise<AuthDto> {
     const authDto = await this.validate({ headers, queryParams });
-    const { adminRoute, sharedLinkRoute, permission, uri } = metadata;
+    const { adminRoute, sharedLinkRoute, uri } = metadata;
+    const requestedPermission = metadata.permission ?? Permission.All;
 
     if (!authDto.user.isAdmin && adminRoute) {
       this.logger.warn(`Denied access to admin only route: ${uri}`);
@@ -186,8 +187,8 @@ export class AuthService extends BaseService {
       throw new ForbiddenException('Forbidden');
     }
 
-    if (authDto.apiKey && permission && !isGranted({ requested: [permission], current: authDto.apiKey.permissions })) {
-      throw new ForbiddenException(`Missing required permission: ${permission}`);
+    if (authDto.apiKey && !isGranted({ requested: [requestedPermission], current: authDto.apiKey.permissions })) {
+      throw new ForbiddenException(`Missing required permission: ${requestedPermission}`);
     }
 
     return authDto;

From c1c9f30ea4b7879febc98188ba89a4a3f2ef1bc9 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Wed, 23 Jul 2025 22:56:56 +0200
Subject: [PATCH 294/337] chore: migrate to immich/ui confirm modal (#20114)

---
 web/package-lock.json                         |  8 +--
 web/package.json                              |  2 +-
 .../asset-viewer/editor/editor-panel.svelte   |  3 +-
 .../photos-page/delete-asset-dialog.svelte    |  3 +-
 .../shared-components/change-date.spec.ts     |  4 +-
 .../shared-components/change-date.svelte      |  4 +-
 .../shared-components/change-location.svelte  |  2 +-
 web/src/lib/managers/modal-manager.svelte.ts  |  2 +-
 .../AssetUpdateDecriptionConfirmModal.svelte  |  3 +-
 web/src/lib/modals/ConfirmModal.svelte        | 52 -------------------
 web/src/lib/modals/JobCreateModal.svelte      |  2 +-
 .../lib/modals/UserDeleteConfirmModal.svelte  |  3 +-
 12 files changed, 15 insertions(+), 73 deletions(-)
 delete mode 100644 web/src/lib/modals/ConfirmModal.svelte

diff --git a/web/package-lock.json b/web/package-lock.json
index 51f60a83c3..46b0a059ed 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@formatjs/icu-messageformat-parser": "^2.9.8",
         "@immich/sdk": "file:../open-api/typescript-sdk",
-        "@immich/ui": "^0.23.2",
+        "@immich/ui": "^0.23.5",
         "@mapbox/mapbox-gl-rtl-text": "0.2.3",
         "@mdi/js": "^7.4.47",
         "@photo-sphere-viewer/core": "^5.11.5",
@@ -1357,9 +1357,9 @@
       "link": true
     },
     "node_modules/@immich/ui": {
-      "version": "0.23.3",
-      "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.23.3.tgz",
-      "integrity": "sha512-YbYJSv3HqDu2+6MmiHhLThSessZ6HkoVOWun/ZoGb8mKj5x/ZZ4AyXGPIqbyKTamsjzbcD9FInij70G+m4egkg==",
+      "version": "0.23.5",
+      "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.23.5.tgz",
+      "integrity": "sha512-1wlFMmfDmtGC+Kcc8cYTT00mQaSumR41KEOOOmVn5Rw/8z9pUhpNY8mGl1AxY4qhtnaz+G3dH6vowYzL23D+YQ==",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@mdi/js": "^7.4.47",
diff --git a/web/package.json b/web/package.json
index 753b0a15a6..7e1b769c52 100644
--- a/web/package.json
+++ b/web/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@formatjs/icu-messageformat-parser": "^2.9.8",
     "@immich/sdk": "file:../open-api/typescript-sdk",
-    "@immich/ui": "^0.23.2",
+    "@immich/ui": "^0.23.5",
     "@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/asset-viewer/editor/editor-panel.svelte b/web/src/lib/components/asset-viewer/editor/editor-panel.svelte
index f4d5c69c62..203f1c6587 100644
--- a/web/src/lib/components/asset-viewer/editor/editor-panel.svelte
+++ b/web/src/lib/components/asset-viewer/editor/editor-panel.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
   import { shortcut } from '$lib/actions/shortcut';
-  import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
   import { editTypes, showCancelConfirmDialog } from '$lib/stores/asset-editor.store';
   import { websocketEvents } from '$lib/stores/websocket';
   import { type AssetResponseDto } from '@immich/sdk';
-  import { IconButton } from '@immich/ui';
+  import { ConfirmModal, IconButton } from '@immich/ui';
   import { mdiClose } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/lib/components/photos-page/delete-asset-dialog.svelte b/web/src/lib/components/photos-page/delete-asset-dialog.svelte
index 2af215a34a..c04b5f39d0 100644
--- a/web/src/lib/components/photos-page/delete-asset-dialog.svelte
+++ b/web/src/lib/components/photos-page/delete-asset-dialog.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
   import FormatMessage from '$lib/components/i18n/format-message.svelte';
-  import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
   import { showDeleteModal } from '$lib/stores/preferences.store';
-  import { Checkbox, Label } from '@immich/ui';
+  import { Checkbox, ConfirmModal, Label } from '@immich/ui';
   import { mdiDeleteForeverOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
diff --git a/web/src/lib/components/shared-components/change-date.spec.ts b/web/src/lib/components/shared-components/change-date.spec.ts
index 38c72838e5..5b894a625d 100644
--- a/web/src/lib/components/shared-components/change-date.spec.ts
+++ b/web/src/lib/components/shared-components/change-date.spec.ts
@@ -12,8 +12,8 @@ describe('ChangeDate component', () => {
 
   const getDateInput = () => screen.getByLabelText('date_and_time') as HTMLInputElement;
   const getTimeZoneInput = () => screen.getByLabelText('timezone') as HTMLInputElement;
-  const getCancelButton = () => screen.getByText('cancel');
-  const getConfirmButton = () => screen.getByText('confirm');
+  const getCancelButton = () => screen.getByText('Cancel');
+  const getConfirmButton = () => screen.getByText('Confirm');
 
   beforeEach(() => {
     vi.stubGlobal('IntersectionObserver', getIntersectionObserverMock());
diff --git a/web/src/lib/components/shared-components/change-date.svelte b/web/src/lib/components/shared-components/change-date.svelte
index e5da909028..bf9cd376fb 100644
--- a/web/src/lib/components/shared-components/change-date.svelte
+++ b/web/src/lib/components/shared-components/change-date.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
+  import { ConfirmModal } from '@immich/ui';
   import { mdiCalendarEditOutline } from '@mdi/js';
   import { DateTime, Duration } from 'luxon';
   import { t } from 'svelte-i18n';
@@ -184,8 +184,6 @@
   disabled={!date.isValid}
   onClose={(confirmed) => (confirmed ? handleConfirm() : onCancel())}
 >
-  <!-- @migration-task: migrate this slot by hand, `prompt` would shadow a prop on the parent component -->
-  <!-- @migration-task: migrate this slot by hand, `prompt` would shadow a prop on the parent component -->
   {#snippet promptSnippet()}
     <div class="flex flex-col text-start gap-2">
       <div class="flex flex-col">
diff --git a/web/src/lib/components/shared-components/change-location.svelte b/web/src/lib/components/shared-components/change-location.svelte
index 6409774d37..0829adaf4e 100644
--- a/web/src/lib/components/shared-components/change-location.svelte
+++ b/web/src/lib/components/shared-components/change-location.svelte
@@ -6,11 +6,11 @@
   import LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';
   import type Map from '$lib/components/shared-components/map/map.svelte';
   import { timeDebounceOnSearch, timeToLoadTheMap } from '$lib/constants';
-  import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
   import { lastChosenLocation } from '$lib/stores/asset-editor.store';
   import { delay } from '$lib/utils/asset-utils';
   import { handleError } from '$lib/utils/handle-error';
   import { searchPlaces, type AssetResponseDto, type PlacesResponseDto } from '@immich/sdk';
+  import { ConfirmModal } from '@immich/ui';
   import { mdiMapMarkerMultipleOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import { get } from 'svelte/store';
diff --git a/web/src/lib/managers/modal-manager.svelte.ts b/web/src/lib/managers/modal-manager.svelte.ts
index 73967aef15..5b3babc84d 100644
--- a/web/src/lib/managers/modal-manager.svelte.ts
+++ b/web/src/lib/managers/modal-manager.svelte.ts
@@ -1,4 +1,4 @@
-import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
+import { ConfirmModal } from '@immich/ui';
 import { mount, unmount, type Component, type ComponentProps } from 'svelte';
 
 type OnCloseData<T> = T extends { onClose: (data?: infer R) => void }
diff --git a/web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte b/web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte
index 77458b6e04..d7066e8ea6 100644
--- a/web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte
+++ b/web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
-  import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
-  import { Input } from '@immich/ui';
+  import { ConfirmModal, Input } from '@immich/ui';
   import { mdiText } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
diff --git a/web/src/lib/modals/ConfirmModal.svelte b/web/src/lib/modals/ConfirmModal.svelte
deleted file mode 100644
index c60d7c3963..0000000000
--- a/web/src/lib/modals/ConfirmModal.svelte
+++ /dev/null
@@ -1,52 +0,0 @@
-<script lang="ts">
-  import { Button, HStack, Modal, ModalBody, ModalFooter, type Color } from '@immich/ui';
-  import type { Snippet } from 'svelte';
-  import { t } from 'svelte-i18n';
-
-  interface Props {
-    title?: string;
-    prompt?: string;
-    confirmText?: string;
-    confirmColor?: Color;
-    disabled?: boolean;
-    size?: 'small' | 'medium';
-    icon?: string;
-    onClose: (confirmed: boolean) => void;
-    promptSnippet?: Snippet;
-  }
-
-  let {
-    title = $t('confirm'),
-    prompt = $t('are_you_sure_to_do_this'),
-    confirmText = $t('confirm'),
-    confirmColor = 'danger',
-    disabled = false,
-    size = 'small',
-    icon = undefined,
-    onClose,
-    promptSnippet,
-  }: Props = $props();
-
-  const handleConfirm = () => {
-    onClose(true);
-  };
-</script>
-
-<Modal {title} {icon} onClose={() => onClose(false)} {size}>
-  <ModalBody>
-    {#if promptSnippet}{@render promptSnippet()}{:else}
-      <p>{prompt}</p>
-    {/if}
-  </ModalBody>
-
-  <ModalFooter>
-    <HStack fullWidth>
-      <Button shape="round" color="secondary" fullWidth onclick={() => onClose(false)}>
-        {$t('cancel')}
-      </Button>
-      <Button shape="round" color={confirmColor} fullWidth onclick={handleConfirm} {disabled}>
-        {confirmText}
-      </Button>
-    </HStack>
-  </ModalFooter>
-</Modal>
diff --git a/web/src/lib/modals/JobCreateModal.svelte b/web/src/lib/modals/JobCreateModal.svelte
index dbb97fdcf7..95751cbb98 100644
--- a/web/src/lib/modals/JobCreateModal.svelte
+++ b/web/src/lib/modals/JobCreateModal.svelte
@@ -4,9 +4,9 @@
     notificationController,
     NotificationType,
   } from '$lib/components/shared-components/notification/notification';
-  import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
   import { handleError } from '$lib/utils/handle-error';
   import { createJob, ManualJobName } from '@immich/sdk';
+  import { ConfirmModal } from '@immich/ui';
   import { t } from 'svelte-i18n';
 
   type Props = { onClose: (confirmed: boolean) => void };
diff --git a/web/src/lib/modals/UserDeleteConfirmModal.svelte b/web/src/lib/modals/UserDeleteConfirmModal.svelte
index 3fde7a7ef9..bbb045ecb7 100644
--- a/web/src/lib/modals/UserDeleteConfirmModal.svelte
+++ b/web/src/lib/modals/UserDeleteConfirmModal.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
   import FormatMessage from '$lib/components/i18n/format-message.svelte';
-  import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
   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 { Checkbox, Label } from '@immich/ui';
+  import { Checkbox, ConfirmModal, Label } from '@immich/ui';
   import { t } from 'svelte-i18n';
 
   interface Props {

From f27bdf7523db24d34402bbd28dd5e0ce61e2a3a9 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Wed, 23 Jul 2025 23:27:09 +0200
Subject: [PATCH 295/337] chore: migrate to UI modal manager (#20116)

---
 .../admin-page/jobs/jobs-panel.svelte         |  2 +-
 .../settings/auth/auth-settings.svelte        |  2 +-
 .../template-settings.svelte                  |  3 +-
 .../components/album-page/album-map.svelte    |  3 +-
 .../components/album-page/albums-list.svelte  |  2 +-
 .../actions/add-to-album-action.svelte        |  2 +-
 .../actions/keep-this-delete-others.svelte    |  3 +-
 .../actions/set-profile-picture-action.svelte |  2 +-
 .../actions/set-visibility-action.svelte      |  3 +-
 .../asset-viewer/actions/share-action.svelte  |  3 +-
 .../asset-viewer/detail-panel-tags.svelte     |  2 +-
 .../face-editor/face-editor.svelte            |  3 +-
 .../asset-viewer/slideshow-bar.svelte         |  3 +-
 .../faces-page/merge-face-selector.svelte     |  3 +-
 .../faces-page/person-side-panel.svelte       |  3 +-
 .../forms/library-import-paths-form.svelte    |  3 +-
 .../forms/library-scan-settings-form.svelte   |  3 +-
 .../photos-page/actions/add-to-album.svelte   |  2 +-
 .../actions/change-description-action.svelte  |  6 +--
 .../actions/create-shared-link.svelte         |  3 +-
 .../actions/remove-from-album.svelte          |  3 +-
 .../actions/remove-from-shared-link.svelte    |  3 +-
 .../actions/set-visibility-action.svelte      |  4 +-
 .../photos-page/actions/tag-action.svelte     |  3 +-
 .../components/photos-page/asset-grid.svelte  |  4 +-
 .../gallery-viewer/gallery-viewer.svelte      |  2 +-
 .../shared-components/map/map.svelte          |  2 +-
 .../shared-components/modal-header.svelte     | 49 -----------------
 .../navigation-bar/account-info-panel.svelte  |  3 +-
 .../search-bar/search-bar.svelte              |  3 +-
 .../side-bar/purchase-info.svelte             |  5 +-
 .../side-bar/server-status.svelte             |  2 +-
 .../user-settings-page/device-list.svelte     |  3 +-
 .../partner-settings.svelte                   |  3 +-
 .../user-api-key-list.svelte                  |  3 +-
 .../user-purchase-settings.svelte             |  3 +-
 web/src/lib/managers/modal-manager.svelte.ts  | 53 -------------------
 web/src/lib/modals/AlbumOptionsModal.svelte   |  3 +-
 web/src/lib/modals/AlbumUsersModal.svelte     |  3 +-
 ...AssetUpdateDescriptionConfirmModal.svelte} |  0
 web/src/lib/utils/album-utils.ts              |  2 +-
 .../[[assetId=id]]/+page.svelte               |  3 +-
 web/src/routes/(user)/people/+page.svelte     |  3 +-
 .../[[assetId=id]]/+page.svelte               |  2 +-
 .../shared-links/[[id=id]]/+page.svelte       |  2 +-
 .../[[assetId=id]]/+page.svelte               |  3 +-
 .../[[assetId=id]]/+page.svelte               |  5 +-
 .../routes/(user)/user-settings/+page.svelte  |  3 +-
 .../[[assetId=id]]/+page.svelte               |  5 +-
 web/src/routes/+layout.svelte                 |  3 +-
 web/src/routes/admin/jobs-status/+page.svelte |  3 +-
 .../admin/library-management/+page.svelte     |  3 +-
 web/src/routes/admin/users/+page.svelte       |  3 +-
 web/src/routes/admin/users/[id]/+page.svelte  |  4 +-
 54 files changed, 58 insertions(+), 196 deletions(-)
 delete mode 100644 web/src/lib/components/shared-components/modal-header.svelte
 delete mode 100644 web/src/lib/managers/modal-manager.svelte.ts
 rename web/src/lib/modals/{AssetUpdateDecriptionConfirmModal.svelte => AssetUpdateDescriptionConfirmModal.svelte} (100%)

diff --git a/web/src/lib/components/admin-page/jobs/jobs-panel.svelte b/web/src/lib/components/admin-page/jobs/jobs-panel.svelte
index 73dfb30908..463bcb3d20 100644
--- a/web/src/lib/components/admin-page/jobs/jobs-panel.svelte
+++ b/web/src/lib/components/admin-page/jobs/jobs-panel.svelte
@@ -3,11 +3,11 @@
     notificationController,
     NotificationType,
   } from '$lib/components/shared-components/notification/notification';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { featureFlags } from '$lib/stores/server-config.store';
   import { getJobName } from '$lib/utils';
   import { handleError } from '$lib/utils/handle-error';
   import { JobCommand, JobName, sendJobCommand, type AllJobStatusResponseDto, type JobCommandDto } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import {
     mdiContentDuplicate,
     mdiFaceRecognition,
diff --git a/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte b/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte
index a1926b4020..ce6dc26171 100644
--- a/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte
+++ b/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte
@@ -6,9 +6,9 @@
   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 { modalManager } from '$lib/managers/modal-manager.svelte';
   import AuthDisableLoginConfirmModal from '$lib/modals/AuthDisableLoginConfirmModal.svelte';
   import { OAuthTokenEndpointAuthMethod, type SystemConfigDto } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
diff --git a/web/src/lib/components/admin-page/settings/template-settings/template-settings.svelte b/web/src/lib/components/admin-page/settings/template-settings/template-settings.svelte
index 872b4b9833..a337aab2ae 100644
--- a/web/src/lib/components/admin-page/settings/template-settings/template-settings.svelte
+++ b/web/src/lib/components/admin-page/settings/template-settings/template-settings.svelte
@@ -4,11 +4,10 @@
   import LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';
   import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
   import SettingTextarea from '$lib/components/shared-components/settings/setting-textarea.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import EmailTemplatePreviewModal from '$lib/modals/EmailTemplatePreviewModal.svelte';
   import { handleError } from '$lib/utils/handle-error';
   import { type SystemConfigDto, type SystemConfigTemplateEmailsDto, getNotificationTemplateAdmin } from '@immich/sdk';
-  import { Button } from '@immich/ui';
+  import { Button, modalManager } from '@immich/ui';
   import { mdiEyeOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
diff --git a/web/src/lib/components/album-page/album-map.svelte b/web/src/lib/components/album-page/album-map.svelte
index fbb831a38b..7d7060ac0a 100644
--- a/web/src/lib/components/album-page/album-map.svelte
+++ b/web/src/lib/components/album-page/album-map.svelte
@@ -1,9 +1,8 @@
 <script lang="ts">
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import MapModal from '$lib/modals/MapModal.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { getAlbumInfo, type AlbumResponseDto, type MapMarkerResponseDto } from '@immich/sdk';
-  import { IconButton } from '@immich/ui';
+  import { IconButton, modalManager } from '@immich/ui';
   import { mdiMapOutline } from '@mdi/js';
   import { onDestroy, onMount } from 'svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/lib/components/album-page/albums-list.svelte b/web/src/lib/components/album-page/albums-list.svelte
index f3d14ddb27..29031bee2e 100644
--- a/web/src/lib/components/album-page/albums-list.svelte
+++ b/web/src/lib/components/album-page/albums-list.svelte
@@ -9,7 +9,6 @@
     notificationController,
   } from '$lib/components/shared-components/notification/notification';
   import { AppRoute } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import AlbumEditModal from '$lib/modals/AlbumEditModal.svelte';
   import AlbumShareModal from '$lib/modals/AlbumShareModal.svelte';
   import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
@@ -38,6 +37,7 @@
   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 { modalManager } from '@immich/ui';
   import { mdiDeleteOutline, mdiFolderDownloadOutline, mdiRenameOutline, mdiShareVariantOutline } from '@mdi/js';
   import { groupBy } from 'lodash-es';
   import { onMount, type Snippet } from 'svelte';
diff --git a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
index 8fe765ab2d..dca0b7918e 100644
--- a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte
@@ -3,11 +3,11 @@
   import type { OnAction } from '$lib/components/asset-viewer/actions/action';
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
   import { AssetAction } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import AlbumPickerModal from '$lib/modals/AlbumPickerModal.svelte';
   import { addAssetsToAlbum } from '$lib/utils/asset-utils';
   import { toTimelineAsset } from '$lib/utils/timeline-util';
   import type { AssetResponseDto } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import { mdiImageAlbum, mdiShareVariantOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
diff --git a/web/src/lib/components/asset-viewer/actions/keep-this-delete-others.svelte b/web/src/lib/components/asset-viewer/actions/keep-this-delete-others.svelte
index be5e8f7827..dfb8d8910c 100644
--- a/web/src/lib/components/asset-viewer/actions/keep-this-delete-others.svelte
+++ b/web/src/lib/components/asset-viewer/actions/keep-this-delete-others.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
-
   import { AssetAction } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { keepThisDeleteOthers } from '$lib/utils/asset-utils';
   import { toTimelineAsset } from '$lib/utils/timeline-util';
   import type { AssetResponseDto, StackResponseDto } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import { mdiPinOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { OnAction } from './action';
diff --git a/web/src/lib/components/asset-viewer/actions/set-profile-picture-action.svelte b/web/src/lib/components/asset-viewer/actions/set-profile-picture-action.svelte
index 6887ae8ebb..0d7735d4f1 100644
--- a/web/src/lib/components/asset-viewer/actions/set-profile-picture-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/set-profile-picture-action.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import ProfileImageCropperModal from '$lib/modals/ProfileImageCropperModal.svelte';
   import type { AssetResponseDto } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import { mdiAccountCircleOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
diff --git a/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte b/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte
index 14126bb8c7..44c1687be6 100644
--- a/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
-
   import { AssetAction } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
   import { handleError } from '$lib/utils/handle-error';
   import { AssetVisibility, updateAssets } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import { mdiLockOpenVariantOutline, mdiLockOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { OnAction, PreAction } from './action';
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 5ab60fcb4c..25b3520d09 100644
--- a/web/src/lib/components/asset-viewer/actions/share-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/share-action.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
   import { makeSharedLinkUrl } from '$lib/utils';
   import type { AssetResponseDto } from '@immich/sdk';
-  import { IconButton } from '@immich/ui';
+  import { IconButton, modalManager } from '@immich/ui';
   import { mdiShareVariantOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
diff --git a/web/src/lib/components/asset-viewer/detail-panel-tags.svelte b/web/src/lib/components/asset-viewer/detail-panel-tags.svelte
index a6a080d52b..007e20b7c6 100644
--- a/web/src/lib/components/asset-viewer/detail-panel-tags.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel-tags.svelte
@@ -3,10 +3,10 @@
   import Icon from '$lib/components/elements/icon.svelte';
   import { AppRoute } from '$lib/constants';
   import { authManager } from '$lib/managers/auth-manager.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import AssetTagModal from '$lib/modals/AssetTagModal.svelte';
   import { removeTag } from '$lib/utils/asset-utils';
   import { getAssetInfo, type AssetResponseDto } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import { mdiClose, mdiPlus } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
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 0336e0a74d..0067088150 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
@@ -1,13 +1,12 @@
 <script lang="ts">
   import ImageThumbnail from '$lib/components/assets/thumbnail/image-thumbnail.svelte';
   import { notificationController } from '$lib/components/shared-components/notification/notification';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { isFaceEditMode } from '$lib/stores/face-edit.svelte';
   import { getPeopleThumbnailUrl } from '$lib/utils';
   import { handleError } from '$lib/utils/handle-error';
   import { createFace, getAllPeople, type PersonResponseDto } from '@immich/sdk';
-  import { Button, Input } from '@immich/ui';
+  import { Button, Input, modalManager } from '@immich/ui';
   import { Canvas, InteractiveFabricObject, Rect } from 'fabric';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/lib/components/asset-viewer/slideshow-bar.svelte b/web/src/lib/components/asset-viewer/slideshow-bar.svelte
index a52bcbf707..c2b2a63586 100644
--- a/web/src/lib/components/asset-viewer/slideshow-bar.svelte
+++ b/web/src/lib/components/asset-viewer/slideshow-bar.svelte
@@ -2,10 +2,9 @@
   import { shortcuts } from '$lib/actions/shortcut';
   import ProgressBar from '$lib/components/shared-components/progress-bar/progress-bar.svelte';
   import { ProgressBarStatus } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import SlideshowSettingsModal from '$lib/modals/SlideshowSettingsModal.svelte';
   import { SlideshowNavigation, slideshowStore } from '$lib/stores/slideshow.store';
-  import { IconButton } from '@immich/ui';
+  import { IconButton, modalManager } from '@immich/ui';
   import { mdiChevronLeft, mdiChevronRight, mdiClose, mdiCog, mdiFullscreen, mdiPause, mdiPlay } from '@mdi/js';
   import { onDestroy, onMount } from 'svelte';
   import { swipe } from 'svelte-gestures';
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 7eed929386..9102f9cc5a 100644
--- a/web/src/lib/components/faces-page/merge-face-selector.svelte
+++ b/web/src/lib/components/faces-page/merge-face-selector.svelte
@@ -3,10 +3,9 @@
   import { page } from '$app/state';
   import Icon from '$lib/components/elements/icon.svelte';
   import { ActionQueryParameterValue, AppRoute, QueryParameter } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { handleError } from '$lib/utils/handle-error';
   import { getAllPeople, getPerson, mergePerson, type PersonResponseDto } from '@immich/sdk';
-  import { Button, IconButton } from '@immich/ui';
+  import { Button, IconButton, modalManager } from '@immich/ui';
   import { mdiCallMerge, mdiMerge, mdiSwapHorizontal } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
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 154927194e..ccde32a652 100644
--- a/web/src/lib/components/faces-page/person-side-panel.svelte
+++ b/web/src/lib/components/faces-page/person-side-panel.svelte
@@ -2,7 +2,6 @@
   import Icon from '$lib/components/elements/icon.svelte';
   import LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';
   import { timeBeforeShowLoadingSpinner } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { photoViewerImgElement } from '$lib/stores/assets-store.svelte';
   import { boundingBoxesArray } from '$lib/stores/people.store';
@@ -20,7 +19,7 @@
     type AssetFaceResponseDto,
     type PersonResponseDto,
   } from '@immich/sdk';
-  import { IconButton } from '@immich/ui';
+  import { IconButton, modalManager } from '@immich/ui';
   import { mdiAccountOff, mdiArrowLeftThin, mdiPencil, mdiRestart, mdiTrashCan } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
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 f83057bf67..96aee9e413 100644
--- a/web/src/lib/components/forms/library-import-paths-form.svelte
+++ b/web/src/lib/components/forms/library-import-paths-form.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
   import Icon from '$lib/components/elements/icon.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import LibraryImportPathModal from '$lib/modals/LibraryImportPathModal.svelte';
   import type { ValidateLibraryImportPathResponseDto } from '@immich/sdk';
   import { validate, type LibraryResponseDto } from '@immich/sdk';
-  import { Button, IconButton } from '@immich/ui';
+  import { Button, IconButton, modalManager } from '@immich/ui';
   import { mdiAlertOutline, mdiCheckCircleOutline, mdiPencilOutline, mdiRefresh } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
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 639771f8a9..2425c9f539 100644
--- a/web/src/lib/components/forms/library-scan-settings-form.svelte
+++ b/web/src/lib/components/forms/library-scan-settings-form.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import LibraryExclusionPatternModal from '$lib/modals/LibraryExclusionPatternModal.svelte';
   import { type LibraryResponseDto } from '@immich/sdk';
-  import { Button, IconButton } from '@immich/ui';
+  import { Button, IconButton, modalManager } from '@immich/ui';
   import { mdiPencilOutline } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/lib/components/photos-page/actions/add-to-album.svelte b/web/src/lib/components/photos-page/actions/add-to-album.svelte
index c00fd2e1c9..5ec2e879c9 100644
--- a/web/src/lib/components/photos-page/actions/add-to-album.svelte
+++ b/web/src/lib/components/photos-page/actions/add-to-album.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import AlbumPickerModal from '$lib/modals/AlbumPickerModal.svelte';
   import type { OnAddToAlbum } from '$lib/utils/actions';
   import { addAssetsToAlbum } from '$lib/utils/asset-utils';
+  import { modalManager } from '@immich/ui';
   import { mdiImageAlbum, mdiShareVariantOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import { getAssetControlContext } from '../asset-select-control-bar.svelte';
diff --git a/web/src/lib/components/photos-page/actions/change-description-action.svelte b/web/src/lib/components/photos-page/actions/change-description-action.svelte
index 740bed78ef..c919efb2a9 100644
--- a/web/src/lib/components/photos-page/actions/change-description-action.svelte
+++ b/web/src/lib/components/photos-page/actions/change-description-action.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
-  import AssetUpdateDecriptionConfirmModal from '$lib/modals/AssetUpdateDecriptionConfirmModal.svelte';
+  import AssetUpdateDescriptionConfirmModal from '$lib/modals/AssetUpdateDescriptionConfirmModal.svelte';
   import { user } from '$lib/stores/user.store';
   import { getSelectedAssets } from '$lib/utils/asset-utils';
   import { handleError } from '$lib/utils/handle-error';
   import { updateAssets } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import { mdiText } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import MenuOption from '../../shared-components/context-menu/menu-option.svelte';
@@ -18,7 +18,7 @@
   const { clearSelect, getOwnedAssets } = getAssetControlContext();
 
   const handleUpdateDescription = async () => {
-    const description = await modalManager.show(AssetUpdateDecriptionConfirmModal);
+    const description = await modalManager.show(AssetUpdateDescriptionConfirmModal);
     if (description) {
       const ids = getSelectedAssets(getOwnedAssets(), $user);
 
diff --git a/web/src/lib/components/photos-page/actions/create-shared-link.svelte b/web/src/lib/components/photos-page/actions/create-shared-link.svelte
index 95e0277cb0..e49cce24e3 100644
--- a/web/src/lib/components/photos-page/actions/create-shared-link.svelte
+++ b/web/src/lib/components/photos-page/actions/create-shared-link.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
   import { getAssetControlContext } from '$lib/components/photos-page/asset-select-control-bar.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
   import { makeSharedLinkUrl } from '$lib/utils';
+  import { IconButton, modalManager } from '@immich/ui';
   import { mdiShareVariantOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
-  import { IconButton } from '@immich/ui';
 
   const { getAssets } = getAssetControlContext();
 
diff --git a/web/src/lib/components/photos-page/actions/remove-from-album.svelte b/web/src/lib/components/photos-page/actions/remove-from-album.svelte
index 747cc1d01c..0ee8584a55 100644
--- a/web/src/lib/components/photos-page/actions/remove-from-album.svelte
+++ b/web/src/lib/components/photos-page/actions/remove-from-album.svelte
@@ -3,9 +3,8 @@
     NotificationType,
     notificationController,
   } from '$lib/components/shared-components/notification/notification';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { getAlbumInfo, removeAssetFromAlbum, type AlbumResponseDto } from '@immich/sdk';
-  import { IconButton } from '@immich/ui';
+  import { IconButton, modalManager } from '@immich/ui';
   import { mdiDeleteOutline, mdiImageRemoveOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import MenuOption from '../../shared-components/context-menu/menu-option.svelte';
diff --git a/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelte b/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelte
index 53dba07bbc..6c97e348a9 100644
--- a/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelte
+++ b/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelte
@@ -1,13 +1,12 @@
 <script lang="ts">
   import { authManager } from '$lib/managers/auth-manager.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { handleError } from '$lib/utils/handle-error';
   import { removeSharedLinkAssets, type SharedLinkResponseDto } from '@immich/sdk';
+  import { IconButton, modalManager } from '@immich/ui';
   import { mdiDeleteOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import { NotificationType, notificationController } from '../../shared-components/notification/notification';
   import { getAssetControlContext } from '../asset-select-control-bar.svelte';
-  import { IconButton } from '@immich/ui';
 
   interface Props {
     sharedLink: SharedLinkResponseDto;
diff --git a/web/src/lib/components/photos-page/actions/set-visibility-action.svelte b/web/src/lib/components/photos-page/actions/set-visibility-action.svelte
index 04598ca79d..5ac183fd18 100644
--- a/web/src/lib/components/photos-page/actions/set-visibility-action.svelte
+++ b/web/src/lib/components/photos-page/actions/set-visibility-action.svelte
@@ -1,12 +1,10 @@
 <script lang="ts">
   import { getAssetControlContext } from '$lib/components/photos-page/asset-select-control-bar.svelte';
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
-
   import type { OnSetVisibility } from '$lib/utils/actions';
   import { handleError } from '$lib/utils/handle-error';
   import { AssetVisibility, updateAssets } from '@immich/sdk';
-  import { Button } from '@immich/ui';
+  import { Button, modalManager } from '@immich/ui';
   import { mdiLockOpenVariantOutline, mdiLockOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
diff --git a/web/src/lib/components/photos-page/actions/tag-action.svelte b/web/src/lib/components/photos-page/actions/tag-action.svelte
index 5bad8ca327..a5079cc028 100644
--- a/web/src/lib/components/photos-page/actions/tag-action.svelte
+++ b/web/src/lib/components/photos-page/actions/tag-action.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
   import { shortcut } from '$lib/actions/shortcut';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import AssetTagModal from '$lib/modals/AssetTagModal.svelte';
-  import { IconButton } from '@immich/ui';
+  import { IconButton, modalManager } from '@immich/ui';
   import { mdiTagMultipleOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import MenuOption from '../../shared-components/context-menu/menu-option.svelte';
diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelte
index 182b24f3eb..5ffb1e0bdf 100644
--- a/web/src/lib/components/photos-page/asset-grid.svelte
+++ b/web/src/lib/components/photos-page/asset-grid.svelte
@@ -13,7 +13,6 @@
   import Scrubber from '$lib/components/shared-components/scrubber/scrubber.svelte';
   import { AppRoute, AssetAction } from '$lib/constants';
   import { authManager } from '$lib/managers/auth-manager.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import type { MonthGroup } from '$lib/managers/timeline-manager/month-group.svelte';
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
   import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
@@ -37,6 +36,7 @@
     type TimelinePlainYearMonth,
   } from '$lib/utils/timeline-util';
   import { AssetVisibility, getAssetInfo, type AlbumResponseDto, type PersonResponseDto } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import { DateTime } from 'luxon';
   import { onMount, type Snippet } from 'svelte';
   import type { UpdatePayload } from 'vite';
@@ -729,7 +729,7 @@
     }
 
     isShortcutModalOpen = true;
-    await modalManager.show(ShortcutsModal);
+    await modalManager.show(ShortcutsModal, {});
     isShortcutModalOpen = false;
   };
 
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 09998ed060..6e0c547b90 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
@@ -4,7 +4,6 @@
   import type { Action } from '$lib/components/asset-viewer/actions/action';
   import Thumbnail from '$lib/components/assets/thumbnail/thumbnail.svelte';
   import { AppRoute, AssetAction } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import type { TimelineAsset, Viewport } from '$lib/managers/timeline-manager/types';
   import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';
   import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
@@ -20,6 +19,7 @@
   import { navigate } from '$lib/utils/navigation';
   import { isTimelineAsset, toTimelineAsset } from '$lib/utils/timeline-util';
   import { AssetVisibility, type AssetResponseDto } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import { debounce } from 'lodash-es';
   import { t } from 'svelte-i18n';
   import AssetViewer from '../../asset-viewer/asset-viewer.svelte';
diff --git a/web/src/lib/components/shared-components/map/map.svelte b/web/src/lib/components/shared-components/map/map.svelte
index d5b531dfc7..8e3a37cbf0 100644
--- a/web/src/lib/components/shared-components/map/map.svelte
+++ b/web/src/lib/components/shared-components/map/map.svelte
@@ -10,13 +10,13 @@
   import { afterNavigate } from '$app/navigation';
   import Icon from '$lib/components/elements/icon.svelte';
   import { Theme } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { themeManager } from '$lib/managers/theme-manager.svelte';
   import MapSettingsModal from '$lib/modals/MapSettingsModal.svelte';
   import { mapSettings } from '$lib/stores/preferences.store';
   import { serverConfig } from '$lib/stores/server-config.store';
   import { getAssetThumbnailUrl, handlePromiseError } from '$lib/utils';
   import { getMapMarkers, type MapMarkerResponseDto } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import mapboxRtlUrl from '@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.min.js?url';
   import { mdiCog, mdiMap, mdiMapMarker } from '@mdi/js';
   import type { Feature, GeoJsonProperties, Geometry, Point } from 'geojson';
diff --git a/web/src/lib/components/shared-components/modal-header.svelte b/web/src/lib/components/shared-components/modal-header.svelte
deleted file mode 100644
index 57dbba87e0..0000000000
--- a/web/src/lib/components/shared-components/modal-header.svelte
+++ /dev/null
@@ -1,49 +0,0 @@
-<script lang="ts">
-  import Icon from '$lib/components/elements/icon.svelte';
-  import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte';
-  import { IconButton } from '@immich/ui';
-  import { mdiClose } from '@mdi/js';
-  import { t } from 'svelte-i18n';
-
-  interface Props {
-    /**
-     * Unique identifier for the header text.
-     */
-    id: string;
-    title: string;
-    onClose: () => void;
-    /**
-     * If true, the logo will be displayed next to the modal title.
-     */
-    showLogo?: boolean;
-    /**
-     * Optional icon to display next to the modal title, if `showLogo` is false.
-     */
-    icon?: string;
-  }
-
-  let { id, title, onClose, showLogo = false, icon = undefined }: Props = $props();
-</script>
-
-<div class="flex place-items-center justify-between px-5 pb-3">
-  <div class="flex gap-2 place-items-center">
-    {#if showLogo}
-      <ImmichLogo noText={true} class="h-[40px]" />
-    {:else if icon}
-      <Icon path={icon} size={24} ariaHidden={true} class="text-immich-primary dark:text-immich-dark-primary" />
-    {/if}
-    <h1 {id}>
-      {title}
-    </h1>
-  </div>
-
-  <IconButton
-    shape="round"
-    color="secondary"
-    variant="ghost"
-    onclick={onClose}
-    icon={mdiClose}
-    size="medium"
-    aria-label={$t('close')}
-  />
-</div>
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 b079ecb241..b1746932b1 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
@@ -3,13 +3,12 @@
   import { focusTrap } from '$lib/actions/focus-trap';
   import Icon from '$lib/components/elements/icon.svelte';
   import { AppRoute } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import AvatarEditModal from '$lib/modals/AvatarEditModal.svelte';
   import HelpAndFeedbackModal from '$lib/modals/HelpAndFeedbackModal.svelte';
   import { user } from '$lib/stores/user.store';
   import { userInteraction } from '$lib/stores/user.svelte';
   import { getAboutInfo, type ServerAboutResponseDto } from '@immich/sdk';
-  import { Button, IconButton } from '@immich/ui';
+  import { Button, IconButton, modalManager } from '@immich/ui';
   import { mdiCog, mdiLogout, mdiPencil, mdiWrench } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
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 9f36431f19..4c807e7652 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
@@ -3,14 +3,13 @@
   import { focusOutside } from '$lib/actions/focus-outside';
   import { shortcuts } from '$lib/actions/shortcut';
   import { AppRoute } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import SearchFilterModal from '$lib/modals/SearchFilterModal.svelte';
   import { searchStore } from '$lib/stores/search.svelte';
   import { handlePromiseError } from '$lib/utils';
   import { generateId } from '$lib/utils/generate-id';
   import { getMetadataSearchQuery } from '$lib/utils/metadata-search';
   import type { MetadataSearchDto, SmartSearchDto } from '@immich/sdk';
-  import { IconButton } from '@immich/ui';
+  import { IconButton, modalManager } from '@immich/ui';
   import { mdiClose, mdiMagnify, mdiTune } from '@mdi/js';
   import { onDestroy, tick } from 'svelte';
   import { t } from 'svelte-i18n';
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 627292ea1b..f21cc7de4d 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
@@ -5,7 +5,6 @@
   import Portal from '$lib/components/shared-components/portal/portal.svelte';
   import SupporterBadge from '$lib/components/shared-components/side-bar/supporter-badge.svelte';
   import { AppRoute } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import PurchaseModal from '$lib/modals/PurchaseModal.svelte';
   import { purchaseStore } from '$lib/stores/purchase.store';
   import { preferences } from '$lib/stores/user.store';
@@ -13,11 +12,11 @@
   import { handleError } from '$lib/utils/handle-error';
   import { getButtonVisibility } from '$lib/utils/purchase-utils';
   import { updateMyPreferences } from '@immich/sdk';
-  import { Button, IconButton } from '@immich/ui';
+  import { Button, IconButton, modalManager } from '@immich/ui';
   import { mdiClose, mdiInformationOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
-  import { fade } from 'svelte/transition';
   import { SvelteDate } from 'svelte/reactivity';
+  import { fade } from 'svelte/transition';
 
   let showMessage = $state(false);
   let hoverMessage = $state(false);
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 0a9f3d9d8c..3c3da8eb5f 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,6 +1,5 @@
 <script lang="ts">
   import Icon from '$lib/components/elements/icon.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import ServerAboutModal from '$lib/modals/ServerAboutModal.svelte';
   import { userInteraction } from '$lib/stores/user.svelte';
   import { websocketStore } from '$lib/stores/websocket';
@@ -11,6 +10,7 @@
     type ServerAboutResponseDto,
     type ServerVersionHistoryResponseDto,
   } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import { mdiAlert } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/lib/components/user-settings-page/device-list.svelte b/web/src/lib/components/user-settings-page/device-list.svelte
index a56f4cc316..4635913c24 100644
--- a/web/src/lib/components/user-settings-page/device-list.svelte
+++ b/web/src/lib/components/user-settings-page/device-list.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { deleteAllSessions, deleteSession, getSessions, type SessionResponseDto } from '@immich/sdk';
-  import { Button } from '@immich/ui';
+  import { Button, modalManager } from '@immich/ui';
   import { t } from 'svelte-i18n';
   import { handleError } from '../../utils/handle-error';
   import { notificationController, NotificationType } from '../shared-components/notification/notification';
diff --git a/web/src/lib/components/user-settings-page/partner-settings.svelte b/web/src/lib/components/user-settings-page/partner-settings.svelte
index 6a221a1b3b..586cdf4afa 100644
--- a/web/src/lib/components/user-settings-page/partner-settings.svelte
+++ b/web/src/lib/components/user-settings-page/partner-settings.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import PartnerSelectionModal from '$lib/modals/PartnerSelectionModal.svelte';
   import {
     createPartner,
@@ -12,7 +11,7 @@
     type PartnerResponseDto,
     type UserResponseDto,
   } from '@immich/sdk';
-  import { Button, IconButton } from '@immich/ui';
+  import { Button, IconButton, modalManager } from '@immich/ui';
   import { mdiCheck, mdiClose } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
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 5958015c0f..a5281cb430 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,11 +1,10 @@
 <script lang="ts">
   import { dateFormats } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import ApiKeyModal from '$lib/modals/ApiKeyModal.svelte';
   import ApiKeySecretModal from '$lib/modals/ApiKeySecretModal.svelte';
   import { locale } from '$lib/stores/preferences.store';
   import { createApiKey, deleteApiKey, getApiKeys, updateApiKey, type ApiKeyResponseDto } from '@immich/sdk';
-  import { Button, IconButton } from '@immich/ui';
+  import { Button, IconButton, modalManager } from '@immich/ui';
   import { mdiPencilOutline, mdiTrashCanOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
diff --git a/web/src/lib/components/user-settings-page/user-purchase-settings.svelte b/web/src/lib/components/user-settings-page/user-purchase-settings.svelte
index 2690559d89..69825dcfda 100644
--- a/web/src/lib/components/user-settings-page/user-purchase-settings.svelte
+++ b/web/src/lib/components/user-settings-page/user-purchase-settings.svelte
@@ -5,7 +5,6 @@
   import PurchaseContent from '$lib/components/shared-components/purchasing/purchase-content.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import { dateFormats } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { locale } from '$lib/stores/preferences.store';
   import { purchaseStore } from '$lib/stores/purchase.store';
   import { preferences, user } from '$lib/stores/user.store';
@@ -20,7 +19,7 @@
     isHttpError,
     type LicenseResponseDto,
   } from '@immich/sdk';
-  import { Button } from '@immich/ui';
+  import { Button, modalManager } from '@immich/ui';
   import { mdiKey } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/lib/managers/modal-manager.svelte.ts b/web/src/lib/managers/modal-manager.svelte.ts
deleted file mode 100644
index 5b3babc84d..0000000000
--- a/web/src/lib/managers/modal-manager.svelte.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { ConfirmModal } from '@immich/ui';
-import { mount, unmount, type Component, type ComponentProps } from 'svelte';
-
-type OnCloseData<T> = T extends { onClose: (data?: infer R) => void }
-  ? R | undefined
-  : T extends { onClose: (data: infer R) => void }
-    ? R
-    : never;
-type ExtendsEmptyObject<T> = keyof T extends never ? never : T;
-type StripValueIfOptional<T> = T extends undefined ? undefined : T;
-
-// if the modal does not expect any props, makes the props param optional but also allows passing `{}` and `undefined`
-type OptionalParamIfEmpty<T> = ExtendsEmptyObject<T> extends never ? [] | [Record<string, never> | undefined] : [T];
-
-class ModalManager {
-  show<T extends object>(Component: Component<T>, ...props: OptionalParamIfEmpty<Omit<T, 'onClose'>>) {
-    return this.open(Component, ...props).onClose;
-  }
-
-  open<T extends object, K = OnCloseData<T>>(
-    Component: Component<T>,
-    ...props: OptionalParamIfEmpty<Omit<T, 'onClose'>>
-  ) {
-    let modal: object = {};
-    let onClose: (...args: [StripValueIfOptional<K>]) => Promise<void>;
-
-    const deferred = new Promise<StripValueIfOptional<K>>((resolve) => {
-      onClose = async (...args: [StripValueIfOptional<K>]) => {
-        await unmount(modal);
-        setTimeout(() => resolve(args?.[0]), 0);
-      };
-
-      modal = mount(Component, {
-        target: document.body,
-        props: {
-          ...((props?.[0] ?? {}) as T),
-          onClose,
-        },
-      });
-    });
-
-    return {
-      onClose: deferred,
-      close: (...args: [StripValueIfOptional<K>]) => onClose(args[0]),
-    };
-  }
-
-  showDialog(options: Omit<ComponentProps<typeof ConfirmModal>, 'onClose'>) {
-    return this.show(ConfirmModal, options);
-  }
-}
-
-export const modalManager = new ModalManager();
diff --git a/web/src/lib/modals/AlbumOptionsModal.svelte b/web/src/lib/modals/AlbumOptionsModal.svelte
index f9c9cab204..e56fe784a6 100644
--- a/web/src/lib/modals/AlbumOptionsModal.svelte
+++ b/web/src/lib/modals/AlbumOptionsModal.svelte
@@ -4,7 +4,6 @@
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { handleError } from '$lib/utils/handle-error';
   import {
     AlbumUserRole,
@@ -15,7 +14,7 @@
     type AlbumResponseDto,
     type UserResponseDto,
   } from '@immich/sdk';
-  import { Modal, ModalBody } from '@immich/ui';
+  import { Modal, ModalBody, modalManager } from '@immich/ui';
   import { mdiArrowDownThin, mdiArrowUpThin, mdiDotsVertical, mdiPlus } from '@mdi/js';
   import { findKey } from 'lodash-es';
   import { t } from 'svelte-i18n';
diff --git a/web/src/lib/modals/AlbumUsersModal.svelte b/web/src/lib/modals/AlbumUsersModal.svelte
index 4f1b8aa94d..32c8cd28cf 100644
--- a/web/src/lib/modals/AlbumUsersModal.svelte
+++ b/web/src/lib/modals/AlbumUsersModal.svelte
@@ -6,7 +6,6 @@
     notificationController,
   } from '$lib/components/shared-components/notification/notification';
   import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { handleError } from '$lib/utils/handle-error';
   import {
     AlbumUserRole,
@@ -16,7 +15,7 @@
     type AlbumResponseDto,
     type UserResponseDto,
   } from '@immich/sdk';
-  import { Modal, ModalBody } from '@immich/ui';
+  import { Modal, ModalBody, modalManager } from '@immich/ui';
   import { mdiDotsVertical } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte b/web/src/lib/modals/AssetUpdateDescriptionConfirmModal.svelte
similarity index 100%
rename from web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte
rename to web/src/lib/modals/AssetUpdateDescriptionConfirmModal.svelte
diff --git a/web/src/lib/utils/album-utils.ts b/web/src/lib/utils/album-utils.ts
index 1a4097b78d..0cb8b7fc04 100644
--- a/web/src/lib/utils/album-utils.ts
+++ b/web/src/lib/utils/album-utils.ts
@@ -1,6 +1,5 @@
 import { goto } from '$app/navigation';
 import { AppRoute } from '$lib/constants';
-import { modalManager } from '$lib/managers/modal-manager.svelte';
 import {
   AlbumFilter,
   AlbumGroupBy,
@@ -13,6 +12,7 @@ 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';
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 aa535a30ee..5b644f251a 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,7 +34,6 @@
   import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
   import { AlbumPageViewMode, AppRoute } from '$lib/constants';
   import { activityManager } from '$lib/managers/activity-manager.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
   import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
   import AlbumOptionsModal from '$lib/modals/AlbumOptionsModal.svelte';
@@ -70,7 +69,7 @@
     updateAlbumInfo,
     type AlbumUserAddDto,
   } from '@immich/sdk';
-  import { Button, IconButton } from '@immich/ui';
+  import { Button, IconButton, modalManager } from '@immich/ui';
   import {
     mdiArrowLeft,
     mdiCogOutline,
diff --git a/web/src/routes/(user)/people/+page.svelte b/web/src/routes/(user)/people/+page.svelte
index 014614094e..0f2284ce34 100644
--- a/web/src/routes/(user)/people/+page.svelte
+++ b/web/src/routes/(user)/people/+page.svelte
@@ -15,7 +15,6 @@
     NotificationType,
   } from '$lib/components/shared-components/notification/notification';
   import { ActionQueryParameterValue, AppRoute, QueryParameter, SessionStorageKey } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import PersonEditBirthDateModal from '$lib/modals/PersonEditBirthDateModal.svelte';
   import PersonMergeSuggestionModal from '$lib/modals/PersonMergeSuggestionModal.svelte';
   import { locale } from '$lib/stores/preferences.store';
@@ -24,7 +23,7 @@
   import { handleError } from '$lib/utils/handle-error';
   import { clearQueryParam } from '$lib/utils/navigation';
   import { getAllPeople, getPerson, searchPerson, updatePerson, type PersonResponseDto } from '@immich/sdk';
-  import { Button } from '@immich/ui';
+  import { Button, modalManager } from '@immich/ui';
   import { mdiAccountOff, mdiEyeOutline } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
index a4a0050de6..807819b585 100644
--- a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -31,7 +31,6 @@
     notificationController,
   } from '$lib/components/shared-components/notification/notification';
   import { AppRoute, PersonPageViewMode, QueryParameter, SessionStorageKey } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
   import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
   import PersonEditBirthDateModal from '$lib/modals/PersonEditBirthDateModal.svelte';
@@ -51,6 +50,7 @@
     updatePerson,
     type PersonResponseDto,
   } from '@immich/sdk';
+  import { modalManager } from '@immich/ui';
   import {
     mdiAccountBoxOutline,
     mdiAccountMultipleCheckOutline,
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 7062966b71..2f732646ec 100644
--- a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
+++ b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
@@ -9,10 +9,10 @@
   } from '$lib/components/shared-components/notification/notification';
   import SharedLinkCard from '$lib/components/sharedlinks-page/shared-link-card.svelte';
   import { AppRoute } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.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 } from '@immich/ui';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
   import type { PageData } from './$types';
diff --git a/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 503ea72d54..32e910e4a9 100644
--- a/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -8,14 +8,13 @@
   import TreeItems from '$lib/components/shared-components/tree/tree-items.svelte';
   import Sidebar from '$lib/components/sidebar/sidebar.svelte';
   import { AppRoute, AssetAction, QueryParameter } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
   import TagCreateModal from '$lib/modals/TagCreateModal.svelte';
   import TagEditModal from '$lib/modals/TagEditModal.svelte';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { joinPaths, TreeNode } from '$lib/utils/tree-utils';
   import { deleteTag, getAllTags, type TagResponseDto } from '@immich/sdk';
-  import { Button, HStack, Text } from '@immich/ui';
+  import { Button, HStack, modalManager, Text } from '@immich/ui';
   import { mdiPencil, mdiPlus, mdiTag, mdiTagMultiple, mdiTrashCanOutline } from '@mdi/js';
   import { onDestroy } from 'svelte';
   import { t } from 'svelte-i18n';
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 bae1786891..2989a78a13 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
@@ -9,18 +9,17 @@
   import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
   import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
   import {
-    NotificationType,
     notificationController,
+    NotificationType,
   } from '$lib/components/shared-components/notification/notification';
   import { AppRoute } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { featureFlags, serverConfig } from '$lib/stores/server-config.store';
   import { handlePromiseError } from '$lib/utils';
   import { handleError } from '$lib/utils/handle-error';
   import { emptyTrash, restoreTrash } from '@immich/sdk';
-  import { Button, HStack, Text } from '@immich/ui';
+  import { Button, HStack, modalManager, Text } from '@immich/ui';
   import { mdiDeleteForeverOutline, mdiHistory } from '@mdi/js';
   import { onDestroy } from 'svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/routes/(user)/user-settings/+page.svelte b/web/src/routes/(user)/user-settings/+page.svelte
index fb3af28823..43c214fd07 100644
--- a/web/src/routes/(user)/user-settings/+page.svelte
+++ b/web/src/routes/(user)/user-settings/+page.svelte
@@ -1,9 +1,8 @@
 <script lang="ts">
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import UserSettingsList from '$lib/components/user-settings-page/user-settings-list.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';
-  import { Container, IconButton } from '@immich/ui';
+  import { Container, IconButton, modalManager } from '@immich/ui';
   import { mdiKeyboard } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { PageData } from './$types';
diff --git a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte
index f15a20f6d3..67354d894d 100644
--- a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import {
-    NotificationType,
     notificationController,
+    NotificationType,
   } from '$lib/components/shared-components/notification/notification';
   import DuplicatesCompareControl from '$lib/components/utilities-page/duplicates/duplicates-compare-control.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import DuplicatesInformationModal from '$lib/modals/DuplicatesInformationModal.svelte';
   import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';
   import { locale } from '$lib/stores/preferences.store';
@@ -15,7 +14,7 @@
   import { handleError } from '$lib/utils/handle-error';
   import type { AssetResponseDto } from '@immich/sdk';
   import { deleteAssets, deleteDuplicates, updateAssets } from '@immich/sdk';
-  import { Button, HStack, IconButton, Text } from '@immich/ui';
+  import { Button, HStack, IconButton, modalManager, Text } from '@immich/ui';
   import { mdiCheckOutline, mdiInformationOutline, mdiKeyboard, mdiTrashCanOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { PageData } from './$types';
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index 6e1c193276..71958d9d9f 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -9,7 +9,6 @@
   import NotificationList from '$lib/components/shared-components/notification/notification-list.svelte';
   import UploadPanel from '$lib/components/shared-components/upload-panel.svelte';
   import { eventManager } from '$lib/managers/event-manager.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import VersionAnnouncementModal from '$lib/modals/VersionAnnouncementModal.svelte';
   import { serverConfig } from '$lib/stores/server-config.store';
   import { user } from '$lib/stores/user.store';
@@ -22,7 +21,7 @@
   import { copyToClipboard } from '$lib/utils';
   import { isAssetViewerRoute } from '$lib/utils/navigation';
   import type { ServerVersionResponseDto } from '@immich/sdk';
-  import { setTranslations } from '@immich/ui';
+  import { modalManager, setTranslations } from '@immich/ui';
   import { onMount, type Snippet } from 'svelte';
   import { t } from 'svelte-i18n';
   import { run } from 'svelte/legacy';
diff --git a/web/src/routes/admin/jobs-status/+page.svelte b/web/src/routes/admin/jobs-status/+page.svelte
index 9985fd949d..d1bd4e41d0 100644
--- a/web/src/routes/admin/jobs-status/+page.svelte
+++ b/web/src/routes/admin/jobs-status/+page.svelte
@@ -2,11 +2,10 @@
   import JobsPanel from '$lib/components/admin-page/jobs/jobs-panel.svelte';
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
   import { AppRoute } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import JobCreateModal from '$lib/modals/JobCreateModal.svelte';
   import { asyncTimeout } from '$lib/utils';
   import { getAllJobsStatus, type AllJobStatusResponseDto } from '@immich/sdk';
-  import { Button, HStack, Text } from '@immich/ui';
+  import { Button, HStack, modalManager, Text } from '@immich/ui';
   import { mdiCog, mdiPlus } from '@mdi/js';
   import { onDestroy, onMount } from 'svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/routes/admin/library-management/+page.svelte b/web/src/routes/admin/library-management/+page.svelte
index 3d8792749c..d16fc4bc7c 100644
--- a/web/src/routes/admin/library-management/+page.svelte
+++ b/web/src/routes/admin/library-management/+page.svelte
@@ -10,7 +10,6 @@
     notificationController,
     NotificationType,
   } from '$lib/components/shared-components/notification/notification';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import LibraryImportPathModal from '$lib/modals/LibraryImportPathModal.svelte';
   import LibraryRenameModal from '$lib/modals/LibraryRenameModal.svelte';
   import LibraryUserPickerModal from '$lib/modals/LibraryUserPickerModal.svelte';
@@ -32,7 +31,7 @@
     type LibraryStatsResponseDto,
     type UserResponseDto,
   } from '@immich/sdk';
-  import { Button, Text } from '@immich/ui';
+  import { Button, modalManager, Text } from '@immich/ui';
   import { mdiDotsVertical, mdiPlusBoxOutline, mdiSync } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/routes/admin/users/+page.svelte b/web/src/routes/admin/users/+page.svelte
index 3ebc67dabf..4ed91147da 100644
--- a/web/src/routes/admin/users/+page.svelte
+++ b/web/src/routes/admin/users/+page.svelte
@@ -7,7 +7,6 @@
     notificationController,
   } from '$lib/components/shared-components/notification/notification';
   import { AppRoute } from '$lib/constants';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import UserCreateModal from '$lib/modals/UserCreateModal.svelte';
   import UserDeleteConfirmModal from '$lib/modals/UserDeleteConfirmModal.svelte';
   import UserRestoreConfirmModal from '$lib/modals/UserRestoreConfirmModal.svelte';
@@ -17,7 +16,7 @@
   import { websocketEvents } from '$lib/stores/websocket';
   import { getByteUnitString } from '$lib/utils/byte-units';
   import { UserStatus, searchUsersAdmin, type UserAdminResponseDto } from '@immich/sdk';
-  import { Button, HStack, IconButton, Text } from '@immich/ui';
+  import { Button, HStack, IconButton, Text, modalManager } from '@immich/ui';
   import { mdiDeleteRestore, mdiEyeOutline, mdiInfinity, mdiPlusBoxOutline, mdiTrashCanOutline } from '@mdi/js';
   import { DateTime } from 'luxon';
   import { onMount } from 'svelte';
diff --git a/web/src/routes/admin/users/[id]/+page.svelte b/web/src/routes/admin/users/[id]/+page.svelte
index 79e76e5d0f..960b006d4b 100644
--- a/web/src/routes/admin/users/[id]/+page.svelte
+++ b/web/src/routes/admin/users/[id]/+page.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
   import StatsCard from '$lib/components/admin-page/server-stats/stats-card.svelte';
+  import FeatureSetting from '$lib/components/admin-page/user/feature-setting.svelte';
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
   import {
     notificationController,
     NotificationType,
   } from '$lib/components/shared-components/notification/notification';
   import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
-  import { modalManager } from '$lib/managers/modal-manager.svelte';
   import PasswordResetSuccessModal from '$lib/modals/PasswordResetSuccessModal.svelte';
   import UserDeleteConfirmModal from '$lib/modals/UserDeleteConfirmModal.svelte';
   import UserEditModal from '$lib/modals/UserEditModal.svelte';
@@ -29,6 +29,7 @@
     Heading,
     HStack,
     Icon,
+    modalManager,
     Stack,
     Text,
   } from '@immich/ui';
@@ -48,7 +49,6 @@
   } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { PageData } from './$types';
-  import FeatureSetting from '$lib/components/admin-page/user/feature-setting.svelte';
 
   interface Props {
     data: PageData;

From 0051a9bba5e720ba2fcf4721fae11e0cdf86da40 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Thu, 24 Jul 2025 02:45:38 -0500
Subject: [PATCH 296/337] fix(web): Revert prevent flashing white background in
 dark mode on page load/reload (#19934) (#20122)

Revert "fix(web): prevent flashing white background in dark mode on page load/reload (#19934)"

This reverts commit 32f23b8d383fa6214f83c29150ca4d5cb97af068.
---
 web/src/app.html | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/web/src/app.html b/web/src/app.html
index ec8c4393ff..776764850f 100644
--- a/web/src/app.html
+++ b/web/src/app.html
@@ -21,11 +21,6 @@
       html {
         height: 100%;
         width: 100%;
-        background-color: rgb(255, 255, 255);
-      }
-
-      html.dark {
-        background-color: rgb(10, 10, 10);
       }
 
       body,
@@ -34,10 +29,6 @@
         padding: 0;
       }
 
-      body {
-        transition: background-color 0.15s ease;
-      }
-
       @keyframes delayedVisibility {
         to {
           visibility: visible;

From fc68cf4f324034e6a5b6b1ecb94439e1b9ece431 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Thu, 24 Jul 2025 10:11:53 -0400
Subject: [PATCH 297/337] chore: remove migration (#20129)

---
 .../1750323941566-UnsetPrewarmDimParameter.ts | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts b/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts
index d687694490..e7a1a06ec9 100644
--- a/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts
+++ b/server/src/schema/migrations/1750323941566-UnsetPrewarmDimParameter.ts
@@ -1,22 +1,10 @@
-import { Kysely, sql } from 'kysely';
-import { LoggingRepository } from 'src/repositories/logging.repository';
+// this file used to try to reset the `vchordrq.prewarm_dim;` parameter
+// that ends up being a problem on pg 15 + since the extension is not installed.
 
-const logger = LoggingRepository.create('Migrations');
-
-export async function up(db: Kysely<any>): Promise<void> {
-  const { rows } = await sql<{ db: string }>`SELECT current_database() as db;`.execute(db);
-  const databaseName = rows[0].db;
-  try {
-    await sql.raw(`ALTER DATABASE "${databaseName}" RESET vchordrq.prewarm_dim;`).execute(db);
-  } catch {
-    logger.warn('Failed to reset vchordrq.prewarm_dim, skipping');
-  }
+export async function up(): Promise<void> {
+  // noop
 }
 
-export async function down(db: Kysely<any>): Promise<void> {
-  const { rows } = await sql<{ db: string }>`SELECT current_database() as db;`.execute(db);
-  const databaseName = rows[0].db;
-  await sql
-    .raw(`ALTER DATABASE "${databaseName}" SET vchordrq.prewarm_dim = '512,640,768,1024,1152,1536';`)
-    .execute(db);
+export async function down(): Promise<void> {
+  // noop
 }

From 089085fcdbd748f8019797c0ff829508e295d4d0 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 24 Jul 2025 14:24:38 +0000
Subject: [PATCH 298/337] chore: version v1.136.0

---
 cli/package-lock.json                       |  6 +-
 cli/package.json                            |  2 +-
 docs/static/archived-versions.json          |  4 ++
 e2e/package-lock.json                       |  8 +--
 e2e/package.json                            |  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-lock.json   |  4 +-
 open-api/typescript-sdk/package.json        |  2 +-
 open-api/typescript-sdk/src/fetch-client.ts |  2 +-
 server/package-lock.json                    |  4 +-
 server/package.json                         |  2 +-
 web/package-lock.json                       | 66 ++++++++++++++++++++-
 web/package.json                            |  2 +-
 17 files changed, 90 insertions(+), 26 deletions(-)

diff --git a/cli/package-lock.json b/cli/package-lock.json
index a575b630cc..3cd4da0480 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.72",
+  "version": "2.2.73",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@immich/cli",
-      "version": "2.2.72",
+      "version": "2.2.73",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "chokidar": "^4.0.3",
@@ -54,7 +54,7 @@
     },
     "../open-api/typescript-sdk": {
       "name": "@immich/sdk",
-      "version": "1.135.3",
+      "version": "1.136.0",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
diff --git a/cli/package.json b/cli/package.json
index bd5b4b5757..6475a91465 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.72",
+  "version": "2.2.73",
   "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 adbd9aa717..6018e26011 100644
--- a/docs/static/archived-versions.json
+++ b/docs/static/archived-versions.json
@@ -1,4 +1,8 @@
 [
+  {
+    "label": "v1.136.0",
+    "url": "https://v1.136.0.archive.immich.app"
+  },
   {
     "label": "v1.135.3",
     "url": "https://v1.135.3.archive.immich.app"
diff --git a/e2e/package-lock.json b/e2e/package-lock.json
index 278d3a7f93..5da041b37b 100644
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "immich-e2e",
-  "version": "1.135.3",
+  "version": "1.136.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "immich-e2e",
-      "version": "1.135.3",
+      "version": "1.136.0",
       "license": "GNU Affero General Public License version 3",
       "devDependencies": {
         "@eslint/eslintrc": "^3.1.0",
@@ -46,7 +46,7 @@
     },
     "../cli": {
       "name": "@immich/cli",
-      "version": "2.2.72",
+      "version": "2.2.73",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
@@ -95,7 +95,7 @@
     },
     "../open-api/typescript-sdk": {
       "name": "@immich/sdk",
-      "version": "1.135.3",
+      "version": "1.136.0",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
diff --git a/e2e/package.json b/e2e/package.json
index 1299b267f2..580cf4982c 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "1.135.3",
+  "version": "1.136.0",
   "description": "",
   "main": "index.js",
   "type": "module",
diff --git a/mobile/android/fastlane/Fastfile b/mobile/android/fastlane/Fastfile
index 31203fe55f..2287ab0821 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" => 204,
-        "android.injected.version.name" => "1.135.3",
+        "android.injected.version.code" => 205,
+        "android.injected.version.name" => "1.136.0",
       }
     )
     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 4c60a2e831..70fade71ba 100644
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -22,7 +22,7 @@ platform :ios do
       path: "./Runner.xcodeproj",
     )
     increment_version_number(
-      version_number: "1.135.3"
+      version_number: "1.136.0"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 2d764aa153..62c48bf292 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: 1.135.3
+- API version: 1.136.0
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index bbffb9f51b..19fff31d41 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: 1.135.3+204
+version: 1.136.0+205
 
 environment:
   sdk: '>=3.3.0 <4.0.0'
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 270a560fb0..53a91a4014 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -8663,7 +8663,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "1.135.3",
+    "version": "1.136.0",
     "contact": {}
   },
   "tags": [],
diff --git a/open-api/typescript-sdk/package-lock.json b/open-api/typescript-sdk/package-lock.json
index 01086f3113..61c8807fc5 100644
--- a/open-api/typescript-sdk/package-lock.json
+++ b/open-api/typescript-sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@immich/sdk",
-  "version": "1.135.3",
+  "version": "1.136.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@immich/sdk",
-      "version": "1.135.3",
+      "version": "1.136.0",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@oazapfts/runtime": "^1.0.2"
diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json
index 677bc146cc..fceb764f82 100644
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@immich/sdk",
-  "version": "1.135.3",
+  "version": "1.136.0",
   "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 bcbe757066..2918e00dd7 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1,6 +1,6 @@
 /**
  * Immich
- * 1.135.3
+ * 1.136.0
  * DO NOT MODIFY - This file has been generated using oazapfts.
  * See https://www.npmjs.com/package/oazapfts
  */
diff --git a/server/package-lock.json b/server/package-lock.json
index c0c048c554..5b7ffcdcaf 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "immich",
-  "version": "1.135.3",
+  "version": "1.136.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "immich",
-      "version": "1.135.3",
+      "version": "1.136.0",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@nestjs/bullmq": "^11.0.1",
diff --git a/server/package.json b/server/package.json
index 5dbe83381a..67945b3dbe 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich",
-  "version": "1.135.3",
+  "version": "1.136.0",
   "description": "",
   "author": "",
   "private": true,
diff --git a/web/package-lock.json b/web/package-lock.json
index 46b0a059ed..ab515030cc 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "immich-web",
-  "version": "1.135.3",
+  "version": "1.136.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "immich-web",
-      "version": "1.135.3",
+      "version": "1.136.0",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@formatjs/icu-messageformat-parser": "^2.9.8",
@@ -94,7 +94,7 @@
     },
     "../open-api/typescript-sdk": {
       "name": "@immich/sdk",
-      "version": "1.135.3",
+      "version": "1.136.0",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@oazapfts/runtime": "^1.0.2"
@@ -2512,6 +2512,66 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
+      "version": "1.4.3",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.0.2",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
+      "version": "1.4.3",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
+      "version": "1.0.2",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+      "version": "0.2.11",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/core": "^1.4.3",
+        "@emnapi/runtime": "^1.4.3",
+        "@tybys/wasm-util": "^0.9.0"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
+      "version": "0.9.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": {
+      "version": "2.8.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "0BSD",
+      "optional": true
+    },
     "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.11.tgz",
diff --git a/web/package.json b/web/package.json
index 7e1b769c52..b9fb5b0400 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich-web",
-  "version": "1.135.3",
+  "version": "1.136.0",
   "license": "GNU Affero General Public License version 3",
   "type": "module",
   "scripts": {

From 3b9bfceef0e6fbf7a93c68d8a658c5b93adef40f Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Thu, 24 Jul 2025 14:09:17 -0500
Subject: [PATCH 299/337] fix: album deleted toast message (#20121)

* fix: album deleted toast message

* Update mobile/lib/presentation/pages/drift_remote_album.page.dart

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

* Fix lint

---------

Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
---
 i18n/en.json                                               | 1 +
 mobile/lib/presentation/pages/drift_remote_album.page.dart | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 73338ff6cc..f75af26611 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -397,6 +397,7 @@
   "album_cover_updated": "Album cover updated",
   "album_delete_confirmation": "Are you sure you want to delete the album {album}?",
   "album_delete_confirmation_description": "If this album is shared, other users will not be able to access it anymore.",
+  "album_deleted": "Album deleted",
   "album_info_card_backup_album_excluded": "EXCLUDED",
   "album_info_card_backup_album_included": "INCLUDED",
   "album_info_updated": "Album info updated",
diff --git a/mobile/lib/presentation/pages/drift_remote_album.page.dart b/mobile/lib/presentation/pages/drift_remote_album.page.dart
index 6b68bfcd4e..4d49cf3012 100644
--- a/mobile/lib/presentation/pages/drift_remote_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_remote_album.page.dart
@@ -2,7 +2,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 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/build_context_extensions.dart';
@@ -164,8 +163,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
 
         ImmichToast.show(
           context: context,
-          msg: 'library_deleted'
-              .t(context: context), // Using existing success message
+          msg: 'album_deleted'.t(context: context),
           toastType: ToastType.success,
         );
 

From 02688a2a036e32626ac18e7fd8a93166419dcde9 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 25 Jul 2025 00:56:00 +0530
Subject: [PATCH 300/337] fix: override SSL options inside isolates (#20142)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/utils/http_ssl_options.dart | 8 ++++----
 mobile/lib/utils/isolate.dart          | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mobile/lib/utils/http_ssl_options.dart b/mobile/lib/utils/http_ssl_options.dart
index 04c01d36d9..24e51f1b30 100644
--- a/mobile/lib/utils/http_ssl_options.dart
+++ b/mobile/lib/utils/http_ssl_options.dart
@@ -10,18 +10,18 @@ import 'package:logging/logging.dart';
 class HttpSSLOptions {
   static const MethodChannel _channel = MethodChannel('immich/httpSSLOptions');
 
-  static void apply() {
+  static void apply({bool applyNative = true}) {
     AppSettingsEnum setting = AppSettingsEnum.allowSelfSignedSSLCert;
     bool allowSelfSignedSSLCert =
         Store.get(setting.storeKey as StoreKey<bool>, setting.defaultValue);
-    _apply(allowSelfSignedSSLCert);
+    _apply(allowSelfSignedSSLCert, applyNative: applyNative);
   }
 
   static void applyFromSettings(bool newValue) {
     _apply(newValue);
   }
 
-  static void _apply(bool allowSelfSignedSSLCert) {
+  static void _apply(bool allowSelfSignedSSLCert, {bool applyNative = true}) {
     String? serverHost;
     if (allowSelfSignedSSLCert && Store.tryGet(StoreKey.currentUser) != null) {
       serverHost = Uri.parse(Store.tryGet(StoreKey.serverEndpoint) ?? "").host;
@@ -32,7 +32,7 @@ class HttpSSLOptions {
     HttpOverrides.global =
         HttpSSLCertOverride(allowSelfSignedSSLCert, serverHost, clientCert);
 
-    if (Platform.isAndroid) {
+    if (applyNative && Platform.isAndroid) {
       _channel.invokeMethod("apply", [
         allowSelfSignedSSLCert,
         serverHost,
diff --git a/mobile/lib/utils/isolate.dart b/mobile/lib/utils/isolate.dart
index 3c2aeed756..a506aa4858 100644
--- a/mobile/lib/utils/isolate.dart
+++ b/mobile/lib/utils/isolate.dart
@@ -9,6 +9,7 @@ import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
+import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:logging/logging.dart';
 import 'package:worker_manager/worker_manager.dart';
 
@@ -48,6 +49,7 @@ Cancelable<T?> runInIsolateGentle<T>({
     Logger log = Logger("IsolateLogger");
 
     try {
+      HttpSSLOptions.apply(applyNative: false);
       return await computation(ref);
     } on CanceledError {
       log.warning(

From 79157e10437c02f3142e0c87c3a1140d1a7e64f3 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 25 Jul 2025 00:58:40 +0530
Subject: [PATCH 301/337] fix: fallback auto grouping to day grouping (#20156)

fallback auto grouping to day grouping

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/domain/models/timeline.model.dart              | 1 +
 mobile/lib/domain/services/timeline.service.dart          | 8 ++++++--
 .../infrastructure/repositories/timeline.repository.dart  | 4 ++--
 .../widgets/timeline/fixed/segment_builder.dart           | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/mobile/lib/domain/models/timeline.model.dart b/mobile/lib/domain/models/timeline.model.dart
index f3b688b8b8..98a37d619c 100644
--- a/mobile/lib/domain/models/timeline.model.dart
+++ b/mobile/lib/domain/models/timeline.model.dart
@@ -3,6 +3,7 @@ import 'package:immich_mobile/domain/utils/event_stream.dart';
 enum GroupAssetsBy {
   day,
   month,
+  auto,
   none;
 }
 
diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 0d31f06e74..26335ad3cf 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -33,8 +33,12 @@ class TimelineFactory {
   })  : _timelineRepository = timelineRepository,
         _settingsService = settingsService;
 
-  GroupAssetsBy get groupBy =>
-      GroupAssetsBy.values[_settingsService.get(Setting.groupAssetsBy)];
+  GroupAssetsBy get groupBy {
+    final group =
+        GroupAssetsBy.values[_settingsService.get(Setting.groupAssetsBy)];
+    // We do not support auto grouping in the new timeline yet, fallback to day grouping
+    return group == GroupAssetsBy.auto ? GroupAssetsBy.day : group;
+  }
 
   TimelineService main(List<String> timelineUsers) =>
       TimelineService(_timelineRepository.main(timelineUsers, groupBy));
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 2916993a9b..b1fc540bd8 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -539,7 +539,7 @@ extension on Expression<DateTime> {
     // to create the correct time bucket
     final localTimeExp = modify(const DateTimeModifier.localTime());
     return switch (groupBy) {
-      GroupAssetsBy.day => localTimeExp.date,
+      GroupAssetsBy.day || GroupAssetsBy.auto => localTimeExp.date,
       GroupAssetsBy.month => localTimeExp.strftime("%Y-%m"),
       GroupAssetsBy.none => throw ArgumentError(
           "GroupAssetsBy.none is not supported for date formatting",
@@ -551,7 +551,7 @@ extension on Expression<DateTime> {
 extension on String {
   DateTime dateFmt(GroupAssetsBy groupBy) {
     final format = switch (groupBy) {
-      GroupAssetsBy.day => "y-M-d",
+      GroupAssetsBy.day || GroupAssetsBy.auto => "y-M-d",
       GroupAssetsBy.month => "y-M",
       GroupAssetsBy.none => throw ArgumentError(
           "GroupAssetsBy.none is not supported for date formatting",
diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment_builder.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment_builder.dart
index 327e690267..6e3af3fd3d 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment_builder.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment_builder.dart
@@ -35,7 +35,8 @@ class FixedSegmentBuilder extends SegmentBuilder {
 
       final timelineHeader = switch (groupBy) {
         GroupAssetsBy.month => HeaderType.month,
-        GroupAssetsBy.day =>
+        GroupAssetsBy.day ||
+        GroupAssetsBy.auto =>
           bucket is TimeBucket && bucket.date.month != previousDate?.month
               ? HeaderType.monthAndDay
               : HeaderType.day,

From 563e2ab503e3ddb76b0283cde6a6c51ad1d4d100 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 25 Jul 2025 01:25:35 +0530
Subject: [PATCH 302/337] fix: update trash action i18n keys (#20164)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../action_buttons/delete_trash_action_button.widget.dart       | 2 +-
 .../action_buttons/restore_trash_action_button.widget.dart      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
index 3ec75c60c2..71cf5acb0a 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
@@ -21,7 +21,7 @@ class DeleteTrashActionButton extends ConsumerWidget {
         await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
     ref.read(multiSelectProvider.notifier).reset();
 
-    final successMessage = 'restore_trash_action_prompt'.t(
+    final successMessage = 'assets_permanently_deleted_count'.t(
       context: context,
       args: {'count': result.count.toString()},
     );
diff --git a/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart
index 05ee469d25..6a3df94cbd 100644
--- a/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart
@@ -20,7 +20,7 @@ class RestoreTrashActionButton extends ConsumerWidget {
     final result = await ref.read(actionProvider.notifier).restoreTrash(source);
     ref.read(multiSelectProvider.notifier).reset();
 
-    final successMessage = 'restore_trash_action_prompt'.t(
+    final successMessage = 'assets_restored_count'.t(
       context: context,
       args: {'count': result.count.toString()},
     );

From 6170a3843c3b463642b7ba16b4b03eeb658ca585 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Thu, 24 Jul 2025 14:55:49 -0500
Subject: [PATCH 303/337] chore: remove build flavor Android (#20161)

---
 .github/workflows/build-mobile.yml            |  8 ++++----
 .vscode/launch.json                           | 19 -------------------
 mobile/android/app/build.gradle               | 14 --------------
 .../android/app/src/beta/AndroidManifest.xml  |  5 -----
 mobile/lib/widgets/common/immich_app_bar.dart |  3 +--
 mobile/makefile                               |  3 ---
 mobile/pubspec.yaml                           |  2 +-
 7 files changed, 6 insertions(+), 48 deletions(-)
 delete mode 100644 mobile/android/app/src/beta/AndroidManifest.xml

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index ca24e33b52..a048536b2f 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -122,17 +122,17 @@ jobs:
           IS_MAIN: ${{ github.ref == 'refs/heads/main' }}
         run: |
           if [[ $IS_MAIN == 'true' ]]; then
-            flutter build apk --release --flavor production
-            flutter build apk --release --flavor production --split-per-abi --target-platform android-arm,android-arm64,android-x64
+            flutter build apk --release
+            flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64
           else
-            flutter build apk --debug --flavor production --split-per-abi --target-platform android-arm64
+            flutter build apk --debug --split-per-abi --target-platform android-arm64
           fi
 
       - name: Publish Android Artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: release-apk-signed
-          path: mobile/build/app/outputs/flutter-apk/**/*.apk
+          path: mobile/build/app/outputs/flutter-apk/*.apk
 
       - name: Save Gradle Cache
         id: cache-gradle-save
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8682376cda..ed3da9f667 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -18,25 +18,6 @@
       "name": "Immich Workers",
       "remoteRoot": "/usr/src/app",
       "localRoot": "${workspaceFolder}/server"
-    },
-    {
-      "name": "Flavor - Production",
-      "request": "launch",
-      "type": "dart",
-      "codeLens": {
-        "for": [
-          "run-test",
-          "run-test-file",
-          "run-file",
-          "debug-test",
-          "debug-test-file",
-          "debug-file",
-        ],
-        "title": "${debugType}",
-      },
-      "args": [
-        "--flavor", "production"
-      ],
     }
   ]
 }
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 8b4dc42b7e..1f0e2e7675 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -72,20 +72,6 @@ android {
     }
   }
 
-  flavorDimensions "default"
-  productFlavors {
-    production {
-      dimension "default"
-      applicationId "app.alextran.immich"
-    }
-    
-    beta {
-      dimension "default"
-      applicationId "app.alextran.immich.beta"
-      versionNameSuffix "-BETA"
-    }
-  }
-
   buildTypes {
     debug {
       applicationIdSuffix '.debug'
diff --git a/mobile/android/app/src/beta/AndroidManifest.xml b/mobile/android/app/src/beta/AndroidManifest.xml
deleted file mode 100644
index d4f7b5bc80..0000000000
--- a/mobile/android/app/src/beta/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-  <application android:label="Immich Beta" tools:replace="android:label" />
-</manifest>
\ No newline at end of file
diff --git a/mobile/lib/widgets/common/immich_app_bar.dart b/mobile/lib/widgets/common/immich_app_bar.dart
index 799cf17f3f..dbf088c112 100644
--- a/mobile/lib/widgets/common/immich_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_app_bar.dart
@@ -2,7 +2,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
@@ -186,7 +185,7 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {
               child: action,
             ),
           ),
-        if (kDebugMode || kProfileMode || appFlavor == 'beta')
+        if (kDebugMode || kProfileMode)
           IconButton(
             icon: const Icon(Icons.science_rounded),
             onPressed: () => context.pushRoute(const FeatInDevRoute()),
diff --git a/mobile/makefile b/mobile/makefile
index 37d33fa817..fe259ca771 100644
--- a/mobile/makefile
+++ b/mobile/makefile
@@ -29,6 +29,3 @@ translation:
 	dart run bin/generate_keys.dart
 	dart format lib/generated/codegen_loader.g.dart
 	dart format lib/generated/intl_keys.g.dart
-
-build-beta:
-	flutter build apk --flavor beta --release
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 19fff31d41..dcd078f65f 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: 1.136.0+205
+version: 1.136.0+3000
 
 environment:
   sdk: '>=3.3.0 <4.0.0'

From e34f46fa0d32389720beffa736720dbf6ade27cf Mon Sep 17 00:00:00 2001
From: Pablo Lluch <github.dev.tweet@postnode.org>
Date: Thu, 24 Jul 2025 13:34:06 -0700
Subject: [PATCH 304/337] fix: send correct includeArchived parameter to API
 when showing markers in map (#20117)

Co-authored-by: Pablo Lluch <pablo.lluch@gmail.com>
Co-authored-by: Zack Pollard <zackpollard@ymail.com>
---
 mobile/lib/providers/map/map_marker.provider.dart    | 12 ++----------
 mobile/lib/providers/map/map_marker.provider.g.dart  |  2 +-
 .../lib/components/shared-components/map/map.svelte  |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/mobile/lib/providers/map/map_marker.provider.dart b/mobile/lib/providers/map/map_marker.provider.dart
index 23342b77b3..a0a11a0637 100644
--- a/mobile/lib/providers/map/map_marker.provider.dart
+++ b/mobile/lib/providers/map/map_marker.provider.dart
@@ -12,8 +12,8 @@ Future<List<MapMarker>> mapMarkers(Ref ref) async {
   final mapState = ref.read(mapStateNotifierProvider);
   DateTime? fileCreatedAfter;
   bool? isFavorite;
-  bool? isIncludeArchived;
-  bool? isWithPartners;
+  bool isIncludeArchived = mapState.includeArchived;
+  bool isWithPartners = mapState.withPartners;
 
   if (mapState.relativeTime != 0) {
     fileCreatedAfter =
@@ -24,14 +24,6 @@ Future<List<MapMarker>> mapMarkers(Ref ref) async {
     isFavorite = true;
   }
 
-  if (!mapState.includeArchived) {
-    isIncludeArchived = false;
-  }
-
-  if (mapState.withPartners) {
-    isWithPartners = true;
-  }
-
   final markers = await service.getMapMarkers(
     isFavorite: isFavorite,
     withArchived: isIncludeArchived,
diff --git a/mobile/lib/providers/map/map_marker.provider.g.dart b/mobile/lib/providers/map/map_marker.provider.g.dart
index 76cc44a103..a4c1db7dc0 100644
--- a/mobile/lib/providers/map/map_marker.provider.g.dart
+++ b/mobile/lib/providers/map/map_marker.provider.g.dart
@@ -6,7 +6,7 @@ part of 'map_marker.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$mapMarkersHash() => r'f33ac4baa3251b3f06423aece89673315966f885';
+String _$mapMarkersHash() => r'a0c129fcddbf1b9bce4aafcd2e47a858ab6ef1c9';
 
 /// See also [mapMarkers].
 @ProviderFor(mapMarkers)
diff --git a/web/src/lib/components/shared-components/map/map.svelte b/web/src/lib/components/shared-components/map/map.svelte
index 8e3a37cbf0..8d508552bc 100644
--- a/web/src/lib/components/shared-components/map/map.svelte
+++ b/web/src/lib/components/shared-components/map/map.svelte
@@ -189,7 +189,7 @@
 
     return await getMapMarkers(
       {
-        isArchived: includeArchived && undefined,
+        isArchived: includeArchived || undefined,
         isFavorite: onlyFavorites || undefined,
         fileCreatedAfter: fileCreatedAfter || undefined,
         fileCreatedBefore,

From a36840d7cc32d080da5018ca85dba2c9c67398d3 Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Fri, 25 Jul 2025 05:37:44 +0800
Subject: [PATCH 305/337] fix(web): multi-select in ascending asset order
 (#19461)

---
 .../timeline-manager/internal/search-support.svelte.ts     | 7 +++----
 .../managers/timeline-manager/timeline-manager.svelte.ts   | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/src/lib/managers/timeline-manager/internal/search-support.svelte.ts b/web/src/lib/managers/timeline-manager/internal/search-support.svelte.ts
index f86e2c1501..f85246933f 100644
--- a/web/src/lib/managers/timeline-manager/internal/search-support.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/internal/search-support.svelte.ts
@@ -1,4 +1,5 @@
 import { plainDateTimeCompare, type TimelinePlainYearMonth } from '$lib/utils/timeline-util';
+import { AssetOrder } from '@immich/sdk';
 import type { MonthGroup } from '../month-group.svelte';
 import type { TimelineManager } from '../timeline-manager.svelte';
 import type { AssetDescriptor, Direction, TimelineAsset } from '../types';
@@ -113,11 +114,10 @@ export async function retrieveRange(timelineManager: TimelineManager, start: Ass
   if (!endMonthGroup || !endAsset) {
     return [];
   }
-  let direction: Direction = 'earlier';
-  if (plainDateTimeCompare(true, startAsset.localDateTime, endAsset.localDateTime) < 0) {
+  const assetOrder: AssetOrder = timelineManager.getAssetOrder();
+  if (plainDateTimeCompare(assetOrder === AssetOrder.Desc, startAsset.localDateTime, endAsset.localDateTime) < 0) {
     [startAsset, endAsset] = [endAsset, startAsset];
     [startMonthGroup, endMonthGroup] = [endMonthGroup, startMonthGroup];
-    direction = 'earlier';
   }
 
   const range: TimelineAsset[] = [];
@@ -126,7 +126,6 @@ export async function retrieveRange(timelineManager: TimelineManager, start: Ass
     startMonthGroup,
     startDayGroup,
     startAsset,
-    direction,
   })) {
     range.push(targetAsset);
     if (targetAsset.id === endAsset.id) {
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 c66a55fa11..8a1ce8fe18 100644
--- a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
@@ -540,4 +540,8 @@ export class TimelineManager {
       isMismatched(this.#options.isTrashed, asset.isTrashed)
     );
   }
+
+  getAssetOrder() {
+    return this.#options.order ?? AssetOrder.Desc;
+  }
 }

From aa2828ab338d7aadd0d6e9224e53970ff0a2e12d Mon Sep 17 00:00:00 2001
From: John Stef <john@johnstef.com>
Date: Fri, 25 Jul 2025 00:38:08 +0300
Subject: [PATCH 306/337] fix(mobile): hide video thumbnail when video is ready
 (#19328)

---
 mobile/lib/pages/common/native_video_viewer.page.dart | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/pages/common/native_video_viewer.page.dart b/mobile/lib/pages/common/native_video_viewer.page.dart
index 8afa6ab4e3..5c1dd8fc66 100644
--- a/mobile/lib/pages/common/native_video_viewer.page.dart
+++ b/mobile/lib/pages/common/native_video_viewer.page.dart
@@ -63,6 +63,8 @@ class NativeVideoViewerPage extends HookConsumerWidget {
 
     final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
 
+    final isVideoReady = useState(false);
+
     Future<VideoSource?> createSource() async {
       if (!context.mounted) {
         return null;
@@ -197,6 +199,8 @@ class NativeVideoViewerPage extends HookConsumerWidget {
           VideoPlaybackValue.fromNativeController(videoController);
       ref.read(videoPlaybackValueProvider.notifier).value = videoPlayback;
 
+      isVideoReady.value = true;
+
       try {
         await videoController.play();
         await videoController.setVolume(0.9);
@@ -393,7 +397,8 @@ class NativeVideoViewerPage extends HookConsumerWidget {
       children: [
         // This remains under the video to avoid flickering
         // For motion videos, this is the image portion of the asset
-        Center(key: ValueKey(asset.id), child: image),
+        if (!isVideoReady.value || asset.isMotionPhoto)
+          Center(key: ValueKey(asset.id), child: image),
         if (aspectRatio.value != null && !isCasting)
           Visibility.maintain(
             key: ValueKey(asset),

From 977c9b96ba1095594f7ad16931f81e1bf8b70630 Mon Sep 17 00:00:00 2001
From: Zack Pollard <zack@futo.org>
Date: Thu, 24 Jul 2025 22:50:36 +0100
Subject: [PATCH 307/337] fix: geodata_places pkey migration failing for
 certain upgrade paths (#20177)

---
 .../schema/migrations/1752161055253-RenameGeodataPKConstraint.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts b/server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts
index 686791e201..57ce86704e 100644
--- a/server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts
+++ b/server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts
@@ -3,6 +3,7 @@ import { Kysely, sql } from 'kysely';
 export async function up(db: Kysely<any>): Promise<void> {
   await sql`ALTER TABLE "geodata_places" DROP CONSTRAINT IF EXISTS "PK_c29918988912ef4036f3d7fbff4";`.execute(db);
   await sql`ALTER TABLE "geodata_places" DROP CONSTRAINT IF EXISTS "geodata_places_pkey"`.execute(db);
+  await sql`ALTER TABLE "geodata_places" DROP CONSTRAINT IF EXISTS "geodata_places_tmp_pkey"`.execute(db);
   await sql`ALTER TABLE "geodata_places" ADD CONSTRAINT "geodata_places_pkey" PRIMARY KEY ("id");`.execute(db);
 }
 

From ad65e9011aef0c1774b645d748c1cbadc965835b Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 25 Jul 2025 08:07:22 +0530
Subject: [PATCH 308/337] chore: bump line length to 120 (#20191)

---
 .github/workflows/static_analysis.yml         |    3 +-
 mobile/.vscode/settings.json                  |    4 +
 mobile/analysis_options.yaml                  |    3 +
 mobile/lib/constants/colors.dart              |    2 +-
 mobile/lib/constants/locales.dart             |   12 +-
 .../domain/models/asset/base_asset.model.dart |    6 +-
 .../models/asset/local_asset.model.dart       |    6 +-
 .../models/asset/remote_asset.model.dart      |    3 +-
 .../lib/domain/models/device_asset.model.dart |    4 +-
 mobile/lib/domain/models/exif.model.dart      |    3 +-
 mobile/lib/domain/models/log.model.dart       |    7 +-
 mobile/lib/domain/models/memory.model.dart    |    3 +-
 mobile/lib/domain/models/person.model.dart    |   11 +-
 mobile/lib/domain/models/stack.model.dart     |   10 +-
 mobile/lib/domain/models/user.model.dart      |   13 +-
 .../domain/models/user_metadata.model.dart    |   16 +-
 mobile/lib/domain/services/asset.service.dart |   15 +-
 mobile/lib/domain/services/hash.service.dart  |    6 +-
 .../domain/services/local_sync.service.dart   |   40 +-
 mobile/lib/domain/services/log.service.dart   |    7 +-
 .../lib/domain/services/partner.service.dart  |    6 +-
 .../domain/services/remote_album.service.dart |    9 +-
 .../lib/domain/services/setting.service.dart  |   13 +-
 mobile/lib/domain/services/store.service.dart |    6 +-
 .../lib/domain/services/timeline.service.dart |   42 +-
 mobile/lib/domain/utils/background_sync.dart  |   10 +-
 mobile/lib/domain/utils/event_stream.dart     |    3 +-
 mobile/lib/entities/album.entity.dart         |   22 +-
 mobile/lib/entities/asset.entity.dart         |   53 +-
 .../lib/extensions/asyncvalue_extensions.dart |    6 +-
 .../extensions/build_context_extensions.dart  |    3 +-
 .../lib/extensions/datetime_extensions.dart   |    4 +-
 mobile/lib/extensions/string_extensions.dart  |    4 +-
 mobile/lib/extensions/theme_extensions.dart   |    4 +-
 .../lib/extensions/translate_extensions.dart  |    3 +-
 .../entities/asset_face.entity.dart           |    7 +-
 .../infrastructure/entities/exif.entity.dart  |    3 +-
 .../entities/local_album.entity.dart          |    3 +-
 .../entities/local_album_asset.entity.dart    |    6 +-
 .../entities/memory.entity.dart               |    3 +-
 .../entities/memory_asset.entity.dart         |    6 +-
 .../entities/partner.entity.dart              |    6 +-
 .../entities/person.entity.dart               |    3 +-
 .../entities/remote_album.entity.dart         |   11 +-
 .../entities/remote_album_asset.entity.dart   |    6 +-
 .../entities/remote_album_user.entity.dart    |    6 +-
 .../entities/remote_asset.entity.dart         |    6 +-
 .../infrastructure/entities/stack.entity.dart |    3 +-
 .../entities/user_metadata.entity.dart        |    6 +-
 .../repositories/asset_face.repository.dart   |    5 +-
 .../repositories/backup.repository.dart       |   36 +-
 .../repositories/db.repository.dart           |    6 +-
 .../repositories/db.repository.steps.dart     |  764 +++-----
 .../repositories/device_asset.repository.dart |    3 +-
 .../repositories/exif.repository.dart         |    3 +-
 .../repositories/local_album.repository.dart  |   71 +-
 .../repositories/local_asset.repository.dart  |   11 +-
 .../repositories/log.repository.dart          |    6 +-
 .../repositories/memory.repository.dart       |    3 +-
 .../repositories/partner.repository.dart      |   21 +-
 .../repositories/person.repository.dart       |    3 +-
 .../repositories/remote_album.repository.dart |   19 +-
 .../repositories/remote_asset.repository.dart |   19 +-
 .../repositories/search_api.repository.dart   |   20 +-
 .../repositories/stack.repository.dart        |    3 +-
 .../repositories/store.repository.dart        |   19 +-
 .../repositories/sync_api.repository.dart     |    3 +-
 .../repositories/sync_stream.repository.dart  |   13 +-
 .../repositories/timeline.repository.dart     |   82 +-
 .../repositories/user.repository.dart         |    3 +-
 .../repositories/user_api.repository.dart     |    3 +-
 .../user_metadata.repository.dart             |    3 +-
 mobile/lib/main.dart                          |   13 +-
 .../lib/models/activities/activity.model.dart |    7 +-
 .../album_add_asset_response.model.dart       |    6 +-
 .../albums/album_viewer_page_state.model.dart |    8 +-
 .../asset_selection_page_result.model.dart    |    3 +-
 mobile/lib/models/asset_selection_state.dart  |    6 +-
 .../models/auth/auxilary_endpoint.model.dart  |    3 +-
 .../models/auth/biometric_status.model.dart   |    6 +-
 .../models/backup/available_album.model.dart  |    3 +-
 .../lib/models/backup/backup_state.model.dart |   26 +-
 .../backup/current_upload_asset.model.dart    |    6 +-
 .../backup/manual_upload_state.model.dart     |   12 +-
 .../backup/success_upload_asset.model.dart    |    7 +-
 .../lib/models/cast/cast_manager_state.dart   |    9 +-
 .../models/download/download_state.model.dart |   13 +-
 mobile/lib/models/map/map_marker.model.dart   |    3 +-
 mobile/lib/models/memories/memory.model.dart  |    4 +-
 .../search/search_curated_content.model.dart  |    3 +-
 .../models/search/search_filter.model.dart    |   25 +-
 .../search_result_page_state.model.dart       |    6 +-
 .../server_info/server_config.model.dart      |    3 +-
 .../server_info/server_disk_info.model.dart   |    5 +-
 .../server_info/server_features.model.dart    |    5 +-
 .../models/server_info/server_info.model.dart |    6 +-
 .../server_info/server_version.model.dart     |    5 +-
 .../models/shared_link/shared_link.model.dart |    4 +-
 .../upload/share_intent_attachment.model.dart |    3 +-
 ...additional_shared_user_selection.page.dart |    6 +-
 .../album/album_asset_selection.page.dart     |    6 +-
 mobile/lib/pages/album/album_date_range.dart  |   10 +-
 .../lib/pages/album/album_options.page.dart   |   35 +-
 mobile/lib/pages/album/album_viewer.dart      |   10 +-
 mobile/lib/pages/albums/albums.page.dart      |   45 +-
 .../lib/pages/backup/album_preview.page.dart  |    4 +-
 .../backup/backup_album_selection.page.dart   |   16 +-
 .../pages/backup/backup_controller.page.dart  |   27 +-
 .../lib/pages/backup/drift_backup.page.dart   |   17 +-
 .../drift_backup_album_selection.page.dart    |   56 +-
 .../backup/drift_upload_detail.page.dart      |   27 +-
 .../backup/failed_backup_status.page.dart     |    8 +-
 mobile/lib/pages/common/activities.page.dart  |   20 +-
 .../lib/pages/common/app_log_detail.page.dart |    6 +-
 .../pages/common/change_experience.page.dart  |    8 +-
 .../lib/pages/common/create_album.page.dart   |   20 +-
 mobile/lib/pages/common/download_panel.dart   |    6 +-
 .../lib/pages/common/gallery_viewer.page.dart |   16 +-
 .../lib/pages/common/large_leading_tile.dart  |    3 +-
 .../common/native_video_viewer.page.dart      |   43 +-
 mobile/lib/pages/common/settings.page.dart    |    3 +-
 .../lib/pages/common/splash_screen.page.dart  |    7 +-
 .../lib/pages/common/tab_controller.page.dart |   16 +-
 mobile/lib/pages/common/tab_shell.page.dart   |   20 +-
 mobile/lib/pages/editing/crop.page.dart       |    4 +-
 mobile/lib/pages/editing/edit.page.dart       |   11 +-
 mobile/lib/pages/editing/filter.page.dart     |   18 +-
 .../lib/pages/library/folder/folder.page.dart |   25 +-
 mobile/lib/pages/library/library.page.dart    |   10 +-
 .../lib/pages/library/local_albums.page.dart  |    3 +-
 .../pages/library/locked/pin_auth.page.dart   |   12 +-
 .../library/partner/drift_partner.page.dart   |    6 +-
 .../pages/library/partner/partner.page.dart   |    9 +-
 .../library/partner/partner_detail.page.dart  |    5 +-
 .../people/people_collection.page.dart        |   10 +-
 .../places/places_collection.page.dart        |   16 +-
 .../library/shared_link/shared_link.page.dart |    9 +-
 .../shared_link/shared_link_edit.page.dart    |   93 +-
 mobile/lib/pages/library/trash.page.dart      |   34 +-
 .../permission_onboarding.page.dart           |   14 +-
 mobile/lib/pages/photos/memory.page.dart      |   33 +-
 mobile/lib/pages/photos/photos.page.dart      |    8 +-
 mobile/lib/pages/search/all_people.page.dart  |    4 +-
 mobile/lib/pages/search/all_places.page.dart  |    3 +-
 mobile/lib/pages/search/map/map.page.dart     |   30 +-
 .../search/map/map_location_picker.page.dart  |   18 +-
 mobile/lib/pages/search/search.page.dart      |   52 +-
 .../pages/share_intent/share_intent.page.dart |   12 +-
 mobile/lib/platform/native_sync_api.g.dart    |   85 +-
 .../pages/dev/feat_in_development.page.dart   |    7 +-
 .../pages/dev/media_stat.page.dart            |   10 +-
 .../presentation/pages/drift_album.page.dart  |   18 +-
 .../pages/drift_archive.page.dart             |    3 +-
 .../drift_asset_selection_timeline.page.dart  |    3 +-
 .../pages/drift_create_album.page.dart        |   41 +-
 .../pages/drift_favorite.page.dart            |    3 +-
 .../pages/drift_library.page.dart             |   11 +-
 .../pages/drift_local_album.page.dart         |    3 +-
 .../pages/drift_locked_folder.page.dart       |   12 +-
 .../presentation/pages/drift_memory.page.dart |   33 +-
 .../pages/drift_partner_detail.page.dart      |    3 +-
 .../presentation/pages/drift_place.page.dart  |    6 +-
 .../pages/drift_place_detail.page.dart        |    3 +-
 .../pages/drift_recently_taken.page.dart      |    3 +-
 .../pages/drift_remote_album.page.dart        |   15 +-
 .../presentation/pages/drift_trash.page.dart  |    3 +-
 .../pages/drift_user_selection.page.dart      |   19 +-
 .../presentation/pages/drift_video.page.dart  |    3 +-
 .../pages/local_timeline.page.dart            |    4 +-
 .../pages/search/drift_search.page.dart       |   70 +-
 .../search/paginated_search.provider.dart     |    6 +-
 .../archive_action_button.widget.dart         |    4 +-
 .../base_action_button.widget.dart            |    6 +-
 .../cast_action_button.widget.dart            |    3 +-
 .../delete_local_action_button.widget.dart    |    4 +-
 ...delete_permanent_action_button.widget.dart |    7 +-
 .../delete_trash_action_button.widget.dart    |    7 +-
 .../download_action_button.widget.dart        |    3 +-
 .../edit_location_action_button.widget.dart   |    7 +-
 .../favorite_action_button.widget.dart        |    4 +-
 .../motion_photo_action_button.widget.dart    |    4 +-
 ...e_to_lock_folder_action_button.widget.dart |    7 +-
 ...emove_from_album_action_button.widget.dart |    8 +-
 ...from_lock_folder_action_button.widget.dart |    7 +-
 .../restore_trash_action_button.widget.dart   |    4 +-
 .../share_action_button.widget.dart           |    6 +-
 .../stack_action_button.widget.dart           |    7 +-
 .../trash_action_button.widget.dart           |    4 +-
 .../unarchive_action_button.widget.dart       |    4 +-
 .../unfavorite_action_button.widget.dart      |    4 +-
 .../unstack_action_button.widget.dart         |    4 +-
 .../upload_action_button.widget.dart          |    4 +-
 .../asset_viewer/asset_stack.provider.dart    |    7 +-
 .../asset_viewer/asset_stack.widget.dart      |    6 +-
 .../asset_viewer/asset_viewer.page.dart       |   43 +-
 .../asset_viewer/asset_viewer.state.dart      |    3 +-
 .../asset_viewer/bottom_bar.widget.dart       |   15 +-
 .../asset_viewer/bottom_sheet.widget.dart     |   26 +-
 .../bottom_sheet/location_details.widget.dart |   10 +-
 .../asset_viewer/top_app_bar.widget.dart      |   21 +-
 .../asset_viewer/video_viewer.widget.dart     |   38 +-
 .../video_viewer_controls.widget.dart         |   26 +-
 .../backup/backup_toggle_button.widget.dart   |   24 +-
 .../base_bottom_sheet.widget.dart             |    9 +-
 .../widgets/images/image_provider.dart        |    3 +-
 .../widgets/images/local_image_provider.dart  |   38 +-
 .../widgets/images/thumbnail.widget.dart      |    9 +-
 .../widgets/images/thumbnail_tile.widget.dart |   17 +-
 .../widgets/memory/memory_card.widget.dart    |    6 +-
 .../widgets/memory/memory_lane.widget.dart    |    3 +-
 .../widgets/partner_user_avatar.widget.dart   |    3 +-
 .../drift_album_option.widget.dart            |    6 +-
 .../widgets/timeline/fixed/row.dart           |    3 +-
 .../widgets/timeline/fixed/segment.model.dart |   14 +-
 .../timeline/fixed/segment_builder.dart       |    8 +-
 .../widgets/timeline/header.widget.dart       |   10 +-
 .../widgets/timeline/scrubber.widget.dart     |   41 +-
 .../widgets/timeline/segment.model.dart       |   13 +-
 .../widgets/timeline/timeline.state.dart      |    7 +-
 .../widgets/timeline/timeline.widget.dart     |  128 +-
 mobile/lib/providers/activity.provider.dart   |   16 +-
 .../providers/activity_service.provider.dart  |    3 +-
 .../activity_statistics.provider.dart         |    5 +-
 .../lib/providers/album/album.provider.dart   |   15 +-
 .../album/album_sort_by_options.provider.dart |   15 +-
 .../album/album_viewer.provider.dart          |    3 +-
 .../suggested_shared_users.provider.dart      |    3 +-
 .../providers/app_life_cycle.provider.dart    |   28 +-
 mobile/lib/providers/asset.provider.dart      |    6 +-
 .../asset_viewer/asset_people.provider.dart   |    4 +-
 .../asset_viewer/asset_stack.provider.dart    |    6 +-
 .../asset_viewer/download.provider.dart       |    6 +-
 .../is_motion_video_playing.provider.dart     |    3 +-
 .../render_list_status_provider.dart          |    3 +-
 .../share_intent_upload.provider.dart         |   22 +-
 .../video_player_controls_provider.dart       |   21 +-
 .../video_player_value_provider.dart          |    3 +-
 mobile/lib/providers/auth.provider.dart       |    6 +-
 .../lib/providers/backup/backup.provider.dart |   90 +-
 .../backup/backup_album.provider.dart         |   11 +-
 .../backup/backup_verification.provider.dart  |   10 +-
 .../backup/drift_backup.provider.dart         |    9 +-
 .../backup/error_backup_list.provider.dart    |    3 +-
 .../ios_background_settings.provider.dart     |   15 +-
 .../backup/manual_upload.provider.dart        |   50 +-
 mobile/lib/providers/folder.provider.dart     |   16 +-
 .../gallery_permission.provider.dart          |   18 +-
 .../providers/haptic_feedback.provider.dart   |   23 +-
 .../cache/thumbnail_image_cache_manager.dart  |    3 +-
 .../immich_local_thumbnail_provider.dart      |    9 +-
 .../image/immich_remote_image_provider.dart   |    3 +-
 .../immich_remote_thumbnail_provider.dart     |    3 +-
 .../infrastructure/action.provider.dart       |   17 +-
 .../infrastructure/album.provider.dart        |    6 +-
 .../asset_viewer/current_asset.provider.dart  |    8 +-
 .../current_album.provider.dart               |    8 +-
 .../infrastructure/exif.provider.dart         |    3 +-
 .../infrastructure/memory.provider.dart       |    3 +-
 .../infrastructure/partner.provider.dart      |   13 +-
 .../infrastructure/remote_album.provider.dart |   28 +-
 .../infrastructure/setting.provider.dart      |    6 +-
 .../infrastructure/store.provider.dart        |    3 +-
 .../infrastructure/timeline.provider.dart     |   10 +-
 .../infrastructure/user.provider.dart         |    9 +-
 mobile/lib/providers/local_auth.provider.dart |    6 +-
 .../providers/map/map_marker.provider.dart    |    3 +-
 .../lib/providers/map/map_state.provider.dart |   21 +-
 mobile/lib/providers/memory.provider.dart     |    3 +-
 .../notification_permission.provider.dart     |    7 +-
 mobile/lib/providers/oauth.provider.dart      |    3 +-
 mobile/lib/providers/partner.provider.dart    |    9 +-
 .../search/paginated_search.provider.dart     |    6 +-
 .../lib/providers/search/people.provider.dart |    3 +-
 .../search/search_page_state.provider.dart    |    9 +-
 .../providers/secure_storage.provider.dart    |    3 +-
 .../lib/providers/server_info.provider.dart   |   18 +-
 .../lib/providers/shared_link.provider.dart   |    4 +-
 .../lib/providers/sync_status.provider.dart   |    9 +-
 mobile/lib/providers/theme.provider.dart      |   26 +-
 mobile/lib/providers/timeline.provider.dart   |    9 +-
 .../timeline/multiselect.provider.dart        |   21 +-
 .../upload_profile_image.provider.dart        |   16 +-
 mobile/lib/providers/user.provider.dart       |    9 +-
 mobile/lib/providers/websocket.provider.dart  |   91 +-
 .../repositories/activity_api.repository.dart |   14 +-
 mobile/lib/repositories/album.repository.dart |   26 +-
 .../repositories/album_api.repository.dart    |   19 +-
 .../repositories/album_media.repository.dart  |   31 +-
 mobile/lib/repositories/asset.repository.dart |   55 +-
 .../repositories/asset_api.repository.dart    |    3 +-
 .../repositories/asset_media.repository.dart  |   14 +-
 mobile/lib/repositories/auth.repository.dart  |    3 +-
 .../lib/repositories/auth_api.repository.dart |   13 +-
 .../lib/repositories/backup.repository.dart   |   12 +-
 .../repositories/biometric.repository.dart    |    9 +-
 .../lib/repositories/database.repository.dart |    6 +-
 .../lib/repositories/download.repository.dart |    4 +-
 .../drift_album_api_repository.dart           |    9 +-
 mobile/lib/repositories/etag.repository.dart  |    6 +-
 .../repositories/file_media.repository.dart   |    9 +-
 mobile/lib/repositories/gcast.repository.dart |    3 +-
 .../local_files_manager.repository.dart       |    3 +-
 .../lib/repositories/partner.repository.dart  |   23 +-
 .../repositories/partner_api.repository.dart  |    4 +-
 .../secure_storage.repository.dart            |    3 +-
 .../lib/repositories/timeline.repository.dart |   31 +-
 .../lib/routing/app_navigation_observer.dart  |   23 +-
 .../routing/custom_transition_builders.dart   |    6 +-
 mobile/lib/routing/gallery_guard.dart         |    3 +-
 mobile/lib/routing/router.dart                |    3 +-
 mobile/lib/routing/router.gr.dart             |  117 +-
 mobile/lib/services/action.service.dart       |    3 +-
 mobile/lib/services/album.service.dart        |   42 +-
 mobile/lib/services/api.service.dart          |    6 +-
 mobile/lib/services/asset.service.dart        |   63 +-
 mobile/lib/services/background.service.dart   |   78 +-
 mobile/lib/services/backup.service.dart       |   47 +-
 .../services/backup_verification.service.dart |   10 +-
 mobile/lib/services/deep_link.service.dart    |    3 +-
 mobile/lib/services/download.service.dart     |   19 +-
 mobile/lib/services/drift_backup.service.dart |    6 +-
 mobile/lib/services/entity.service.dart       |   12 +-
 mobile/lib/services/etag.service.dart         |    3 +-
 mobile/lib/services/exif.service.dart         |    3 +-
 mobile/lib/services/folder.service.dart       |   25 +-
 mobile/lib/services/gcast.service.dart        |   21 +-
 .../services/local_files_manager.service.dart |    3 +-
 .../services/local_notification.service.dart  |   12 +-
 mobile/lib/services/memory.service.dart       |    6 +-
 mobile/lib/services/partner.service.dart      |    9 +-
 mobile/lib/services/person.service.dart       |    3 +-
 mobile/lib/services/search.service.dart       |    3 +-
 mobile/lib/services/share.service.dart        |    6 +-
 mobile/lib/services/shared_link.service.dart  |   10 +-
 mobile/lib/services/stack.service.dart        |    3 +-
 mobile/lib/services/sync.service.dart         |  108 +-
 mobile/lib/services/timeline.service.dart     |    3 +-
 mobile/lib/services/upload.service.dart       |   12 +-
 mobile/lib/theme/theme_data.dart              |    6 +-
 mobile/lib/utils/backup_progress.dart         |    3 +-
 .../lib/utils/cache/custom_image_cache.dart   |    9 +-
 mobile/lib/utils/color_filter_generator.dart  |    3 +-
 mobile/lib/utils/datetime_comparison.dart     |    3 +-
 mobile/lib/utils/debounce.dart                |    6 +-
 .../utils/draggable_scroll_controller.dart    |   11 +-
 mobile/lib/utils/hooks/timer_hook.dart        |    3 +-
 mobile/lib/utils/http_ssl_options.dart        |    6 +-
 mobile/lib/utils/immich_loading_overlay.dart  |    6 +-
 mobile/lib/utils/isolate.dart                 |    3 +-
 mobile/lib/utils/map_utils.dart               |    7 +-
 mobile/lib/utils/migration.dart               |   37 +-
 mobile/lib/utils/remote_album.utils.dart      |    3 +-
 mobile/lib/utils/selection_handlers.dart      |   26 +-
 mobile/lib/utils/throttle.dart                |    3 +-
 mobile/lib/utils/thumbnail_utils.dart         |    3 +-
 mobile/lib/utils/url_helper.dart              |    3 +-
 .../activities/activity_text_field.dart       |    7 +-
 .../lib/widgets/activities/activity_tile.dart |   13 +-
 .../album/add_to_album_sliverlist.dart        |   12 +-
 .../widgets/album/album_thumbnail_card.dart   |    4 +-
 .../album/album_thumbnail_listtile.dart       |   10 +-
 .../widgets/album/album_viewer_appbar.dart    |   31 +-
 .../album_viewer_editable_description.dart    |   14 +-
 .../album/album_viewer_editable_title.dart    |    3 +-
 .../album/remote_album_shared_user_icons.dart |    3 +-
 .../widgets/asset_grid/asset_drag_region.dart |   13 +-
 .../asset_grid/asset_grid_data_structure.dart |   59 +-
 .../asset_grid/control_bottom_app_bar.dart    |   42 +-
 .../asset_grid/draggable_scrollbar.dart       |   15 +-
 .../draggable_scrollbar_custom.dart           |   20 +-
 .../asset_grid/group_divider_title.dart       |    9 +-
 .../widgets/asset_grid/immich_asset_grid.dart |   15 +-
 .../asset_grid/immich_asset_grid_view.dart    |   96 +-
 .../widgets/asset_grid/multiselect_grid.dart  |   74 +-
 .../multiselect_grid_status_indicator.dart    |    6 +-
 .../widgets/asset_grid/thumbnail_image.dart   |   14 +-
 .../asset_viewer/advanced_bottom_sheet.dart   |    7 +-
 .../asset_viewer/animated_play_pause.dart     |    3 +-
 .../asset_viewer/bottom_gallery_bar.dart      |   37 +-
 .../lib/widgets/asset_viewer/cast_dialog.dart |   25 +-
 .../custom_video_player_controls.dart         |   20 +-
 .../detail_panel/camera_info.dart             |    5 +-
 .../detail_panel/detail_panel.dart            |    4 +-
 .../asset_viewer/detail_panel/file_info.dart  |    7 +-
 .../detail_panel/people_info.dart             |   27 +-
 .../widgets/asset_viewer/gallery_app_bar.dart |   21 +-
 .../asset_viewer/top_control_app_bar.dart     |   25 +-
 .../widgets/asset_viewer/video_position.dart  |   14 +-
 .../lib/widgets/backup/album_info_card.dart   |   23 +-
 .../widgets/backup/album_info_list_tile.dart  |   18 +-
 .../lib/widgets/backup/asset_info_table.dart  |    4 +-
 .../backup/drift_album_info_list_tile.dart    |   12 +-
 mobile/lib/widgets/backup/error_chip.dart     |    3 +-
 .../backup/icloud_download_progress_bar.dart  |    9 +-
 .../widgets/backup/ios_debug_info_tile.dart   |   12 +-
 .../widgets/backup/upload_progress_bar.dart   |    6 +-
 .../common/app_bar_dialog/app_bar_dialog.dart |   15 +-
 .../app_bar_dialog/app_bar_profile_info.dart  |    9 +-
 .../app_bar_dialog/app_bar_server_info.dart   |    6 +-
 .../lib/widgets/common/date_time_picker.dart  |   23 +-
 mobile/lib/widgets/common/drag_sheet.dart     |    3 +-
 .../widgets/common/dropdown_search_menu.dart  |   19 +-
 mobile/lib/widgets/common/immich_app_bar.dart |   11 +-
 mobile/lib/widgets/common/immich_image.dart   |    3 +-
 .../widgets/common/immich_sliver_app_bar.dart |   30 +-
 .../lib/widgets/common/immich_thumbnail.dart  |    3 +-
 .../lib/widgets/common/immich_title_text.dart |    4 +-
 .../lib/widgets/common/location_picker.dart   |    6 +-
 .../common/mesmerizing_sliver_app_bar.dart    |   37 +-
 .../common/remote_album_sliver_app_bar.dart   |   37 +-
 .../widgets/common/scaffold_error_body.dart   |    3 +-
 .../common/selection_sliver_app_bar.dart      |    3 +-
 .../widgets/common/thumbhash_placeholder.dart |    3 +-
 mobile/lib/widgets/common/user_avatar.dart    |    3 +-
 .../widgets/common/user_circle_avatar.dart    |    4 +-
 .../widgets/forms/change_password_form.dart   |   19 +-
 .../lib/widgets/forms/login/login_form.dart   |   46 +-
 .../widgets/forms/login/password_input.dart   |    4 +-
 .../forms/login/server_endpoint_input.dart    |    5 +-
 mobile/lib/widgets/forms/pin_input.dart       |    6 +-
 .../widgets/forms/pin_verification_form.dart  |    7 +-
 mobile/lib/widgets/map/map_app_bar.dart       |    5 +-
 mobile/lib/widgets/map/map_asset_grid.dart    |   33 +-
 mobile/lib/widgets/map/map_bottom_sheet.dart  |    7 +-
 .../map_settings/map_settings_list_tile.dart  |    3 +-
 .../map_settings_time_dropdown.dart           |    3 +-
 .../map/map_settings/map_theme_picker.dart    |    7 +-
 .../lib/widgets/map/map_settings_sheet.dart   |   23 +-
 .../lib/widgets/map/map_theme_override.dart   |   16 +-
 mobile/lib/widgets/map/map_thumbnail.dart     |   27 +-
 .../map/positioned_asset_marker_icon.dart     |    6 +-
 .../widgets/memories/memory_bottom_info.dart  |    3 +-
 mobile/lib/widgets/memories/memory_card.dart  |    6 +-
 .../lib/widgets/memories/memory_epilogue.dart |   11 +-
 .../memories/memory_progress_indicator.dart   |    4 +-
 mobile/lib/widgets/photo_view/photo_view.dart |   16 +-
 .../photo_view/photo_view_gallery.dart        |    3 +-
 .../src/controller/photo_view_controller.dart |    9 +-
 .../photo_view_controller_delegate.dart       |   29 +-
 .../photo_view_scalestate_controller.dart     |   15 +-
 .../photo_view/src/core/photo_view_core.dart  |   58 +-
 .../src/core/photo_view_gesture_detector.dart |   40 +-
 .../src/core/photo_view_hit_corners.dart      |    3 +-
 .../src/photo_view_computed_scale.dart        |    4 +-
 .../src/photo_view_default_widgets.dart       |    4 +-
 .../src/photo_view_scale_state.dart           |    4 +-
 .../src/utils/ignorable_change_notifier.dart  |    9 +-
 .../src/utils/photo_view_utils.dart           |    6 +-
 .../widgets/search/curated_places_row.dart    |    3 +-
 .../search/search_filter/location_picker.dart |    3 +-
 .../search/search_filter/people_picker.dart   |   12 +-
 .../search_filter/search_filter_chip.dart     |    3 +-
 .../widgets/search/thumbnail_with_info.dart   |    6 +-
 .../search/thumbnail_with_info_container.dart |    7 +-
 .../widgets/settings/advanced_settings.dart   |   25 +-
 .../asset_list_layout_settings.dart           |    3 +-
 .../asset_list_settings.dart                  |    3 +-
 .../video_viewer_settings.dart                |    3 +-
 .../backup_settings/background_settings.dart  |   87 +-
 .../backup_settings/backup_settings.dart      |   14 +-
 .../backup_settings/foreground_settings.dart  |    3 +-
 .../beta_sync_settings.dart                   |   13 +-
 .../beta_sync_settings/entity_count_tile.dart |    7 +-
 .../settings/beta_timeline_list_tile.dart     |   41 +-
 .../widgets/settings/language_settings.dart   |   25 +-
 .../networking_settings/endpoint_input.dart   |    6 +-
 .../external_network_preference.dart          |   13 +-
 .../local_network_preference.dart             |   19 +-
 .../networking_settings.dart                  |   18 +-
 .../settings/notification_setting.dart        |   24 +-
 .../preference_settings/haptic_setting.dart   |    6 +-
 .../primary_color_setting.dart                |   18 +-
 .../preference_settings/theme_setting.dart    |   15 +-
 .../settings/settings_button_list_tile.dart   |    3 +-
 .../lib/widgets/settings/settings_card.dart   |    4 +-
 .../settings/settings_switch_list_tile.dart   |    7 +-
 .../settings/ssl_client_cert_settings.dart    |   10 +-
 .../widgets/shared_link/shared_link_item.dart |   38 +-
 .../domain/services/hash_service_test.dart    |  106 +-
 .../domain/services/log_service_test.dart     |   14 +-
 .../domain/services/store_service_test.dart   |   15 +-
 .../services/sync_stream_service_test.dart    |   66 +-
 .../domain/services/user_service_test.dart    |   51 +-
 .../test/drift/main/generated/schema_v1.dart  | 1448 +++++----------
 .../test/drift/main/generated/schema_v2.dart  | 1448 +++++----------
 .../test/drift/main/generated/schema_v3.dart  | 1445 +++++----------
 .../test/drift/main/generated/schema_v4.dart  | 1563 ++++++-----------
 .../local_album_repository_test.dart          |    3 +-
 .../repositories/store_repository_test.dart   |    3 +-
 .../sync_api_repository_test.dart             |   15 +-
 .../test/infrastructure/repository.mock.dart  |    9 +-
 mobile/test/mock_http_override.dart           |   18 +-
 .../activity/activities_page_test.dart        |    3 +-
 .../test/modules/activity/activity_mocks.dart |    8 +-
 .../activity/activity_provider_test.dart      |   27 +-
 .../activity/activity_text_field_test.dart    |    6 +-
 .../modules/activity/activity_tile_test.dart  |   10 +-
 .../activity/dismissible_activity_test.dart   |    4 +-
 mobile/test/modules/album/album_mocks.dart    |    4 +-
 .../album_sort_by_options_provider_test.dart  |   16 +-
 .../asset_viewer/asset_viewer_mocks.dart      |    4 +-
 .../extensions/asset_extensions_test.dart     |   12 +-
 .../extensions/datetime_extensions_test.dart  |    9 +-
 mobile/test/modules/map/map_mocks.dart        |    4 +-
 .../modules/map/map_theme_override_test.dart  |   27 +-
 mobile/test/modules/shared/shared_mocks.dart  |    4 +-
 .../modules/shared/sync_service_test.dart     |   27 +-
 mobile/test/modules/utils/throttler_test.dart |    3 +-
 .../test/modules/utils/url_helper_test.dart   |    4 +-
 .../test/pages/search/search.page_test.dart   |    6 +-
 mobile/test/repository.mocks.dart             |    3 +-
 mobile/test/services/album.service_test.dart  |   35 +-
 mobile/test/services/asset.service_test.dart  |   18 +-
 mobile/test/services/auth.service_test.dart   |   57 +-
 mobile/test/services/entity.service_test.dart |   18 +-
 mobile/test/services/hash_service_test.dart   |   96 +-
 mobile/test/test_utils/medium_factory.dart    |    9 +-
 517 files changed, 4520 insertions(+), 9514 deletions(-)

diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index 4cb788f5fa..b5238cf854 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -98,7 +98,8 @@ jobs:
         run: dart analyze --fatal-infos
 
       - name: Run dart format
-        run: dart format lib/ --set-exit-if-changed
+        # Ignore generated files manually until https://github.com/dart-lang/dart_style/issues/864 is resolved
+        run: dart format --set-exit-if-changed $(find lib -name '*.dart' -not \( -name 'generated_plugin_registrant.dart' -o -name '*.g.dart' -o -name '*.drift.dart' \))
 
       - name: Run dart custom_lint
         run: dart run custom_lint
diff --git a/mobile/.vscode/settings.json b/mobile/.vscode/settings.json
index c1b3fc9ce3..eac0003e4b 100644
--- a/mobile/.vscode/settings.json
+++ b/mobile/.vscode/settings.json
@@ -1,5 +1,9 @@
 {
   "dart.flutterSdkPath": ".fvm/versions/3.32.6",
+  "dart.lineLength": 120,
+  "[dart]": {
+    "editor.rulers": [120],
+  },
   "search.exclude": {
     "**/.fvm": true
   },
diff --git a/mobile/analysis_options.yaml b/mobile/analysis_options.yaml
index 7a03b54a95..1b0b7170d2 100644
--- a/mobile/analysis_options.yaml
+++ b/mobile/analysis_options.yaml
@@ -9,6 +9,9 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
+formatter:  
+  page_width: 120
+
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`
diff --git a/mobile/lib/constants/colors.dart b/mobile/lib/constants/colors.dart
index ade878d6f6..1614a308e0 100644
--- a/mobile/lib/constants/colors.dart
+++ b/mobile/lib/constants/colors.dart
@@ -10,7 +10,7 @@ enum ImmichColorPreset {
   lime,
   green,
   cyan,
-  slateGray
+  slateGray,
 }
 
 const ImmichColorPreset defaultColorPreset = ImmichColorPreset.indigo;
diff --git a/mobile/lib/constants/locales.dart b/mobile/lib/constants/locales.dart
index b2d8df525b..601a83b563 100644
--- a/mobile/lib/constants/locales.dart
+++ b/mobile/lib/constants/locales.dart
@@ -7,10 +7,8 @@ const Map<String, Locale> locales = {
   'Arabic (ar)': Locale('ar'),
   'Bulgarian (bg)': Locale('bg'),
   'Catalan (ca)': Locale('ca'),
-  'Chinese Simplified (zh_CN)':
-      Locale.fromSubtags(languageCode: 'zh', scriptCode: 'SIMPLIFIED'),
-  'Chinese Traditional (zh_TW)':
-      Locale.fromSubtags(languageCode: 'zh', scriptCode: 'Hant'),
+  'Chinese Simplified (zh_CN)': Locale.fromSubtags(languageCode: 'zh', scriptCode: 'SIMPLIFIED'),
+  'Chinese Traditional (zh_TW)': Locale.fromSubtags(languageCode: 'zh', scriptCode: 'Hant'),
   'Croatian (hr)': Locale('hr'),
   'Czech (cs)': Locale('cs'),
   'Danish (da)': Locale('da'),
@@ -37,10 +35,8 @@ const Map<String, Locale> locales = {
   'Portuguese (pt)': Locale('pt'),
   'Romanian (ro)': Locale('ro'),
   'Russian (ru)': Locale('ru'),
-  'Serbian Cyrillic (sr_Cyrl)':
-      Locale.fromSubtags(languageCode: 'sr', scriptCode: 'Cyrl'),
-  'Serbian Latin (sr_Latn)':
-      Locale.fromSubtags(languageCode: 'sr', scriptCode: 'Latn'),
+  'Serbian Cyrillic (sr_Cyrl)': Locale.fromSubtags(languageCode: 'sr', scriptCode: 'Cyrl'),
+  'Serbian Latin (sr_Latn)': Locale.fromSubtags(languageCode: 'sr', scriptCode: 'Latn'),
   'Slovak (sk)': Locale('sk'),
   'Slovenian (sl)': Locale('sl'),
   'Spanish (es)': Locale('es'),
diff --git a/mobile/lib/domain/models/asset/base_asset.model.dart b/mobile/lib/domain/models/asset/base_asset.model.dart
index 356b64cffc..7cd4caab6a 100644
--- a/mobile/lib/domain/models/asset/base_asset.model.dart
+++ b/mobile/lib/domain/models/asset/base_asset.model.dart
@@ -53,10 +53,8 @@ sealed class BaseAsset {
     return const Duration();
   }
 
-  bool get hasRemote =>
-      storage == AssetState.remote || storage == AssetState.merged;
-  bool get hasLocal =>
-      storage == AssetState.local || storage == AssetState.merged;
+  bool get hasRemote => storage == AssetState.remote || storage == AssetState.merged;
+  bool get hasLocal => storage == AssetState.local || storage == AssetState.merged;
   bool get isLocalOnly => storage == AssetState.local;
   bool get isRemoteOnly => storage == AssetState.remote;
 
diff --git a/mobile/lib/domain/models/asset/local_asset.model.dart b/mobile/lib/domain/models/asset/local_asset.model.dart
index 3466a0f25b..9cd20acb0a 100644
--- a/mobile/lib/domain/models/asset/local_asset.model.dart
+++ b/mobile/lib/domain/models/asset/local_asset.model.dart
@@ -22,8 +22,7 @@ class LocalAsset extends BaseAsset {
   });
 
   @override
-  AssetState get storage =>
-      remoteId == null ? AssetState.local : AssetState.merged;
+  AssetState get storage => remoteId == null ? AssetState.local : AssetState.merged;
 
   @override
   String get heroTag => '${id}_${remoteId ?? checksum}';
@@ -54,8 +53,7 @@ class LocalAsset extends BaseAsset {
   }
 
   @override
-  int get hashCode =>
-      super.hashCode ^ id.hashCode ^ remoteId.hashCode ^ orientation.hashCode;
+  int get hashCode => super.hashCode ^ id.hashCode ^ remoteId.hashCode ^ orientation.hashCode;
 
   LocalAsset copyWith({
     String? id,
diff --git a/mobile/lib/domain/models/asset/remote_asset.model.dart b/mobile/lib/domain/models/asset/remote_asset.model.dart
index f96fa18a74..db3e53cd2e 100644
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -36,8 +36,7 @@ class RemoteAsset extends BaseAsset {
   });
 
   @override
-  AssetState get storage =>
-      localId == null ? AssetState.remote : AssetState.merged;
+  AssetState get storage => localId == null ? AssetState.remote : AssetState.merged;
 
   @override
   String get heroTag => '${localId ?? checksum}_$id';
diff --git a/mobile/lib/domain/models/device_asset.model.dart b/mobile/lib/domain/models/device_asset.model.dart
index 2ec56b0d80..b0949ccc96 100644
--- a/mobile/lib/domain/models/device_asset.model.dart
+++ b/mobile/lib/domain/models/device_asset.model.dart
@@ -15,9 +15,7 @@ class DeviceAsset {
   bool operator ==(covariant DeviceAsset other) {
     if (identical(this, other)) return true;
 
-    return other.assetId == assetId &&
-        other.hash == hash &&
-        other.modifiedTime == modifiedTime;
+    return other.assetId == assetId && other.hash == hash && other.modifiedTime == modifiedTime;
   }
 
   @override
diff --git a/mobile/lib/domain/models/exif.model.dart b/mobile/lib/domain/models/exif.model.dart
index b73aa4cae1..6e94c44650 100644
--- a/mobile/lib/domain/models/exif.model.dart
+++ b/mobile/lib/domain/models/exif.model.dart
@@ -25,8 +25,7 @@ class ExifInfo {
   final int? iso;
   final double? exposureSeconds;
 
-  bool get hasCoordinates =>
-      latitude != null && longitude != null && latitude != 0 && longitude != 0;
+  bool get hasCoordinates => latitude != null && longitude != null && latitude != 0 && longitude != 0;
 
   String get exposureTime {
     if (exposureSeconds == null) {
diff --git a/mobile/lib/domain/models/log.model.dart b/mobile/lib/domain/models/log.model.dart
index dffd1cccda..f58cae8063 100644
--- a/mobile/lib/domain/models/log.model.dart
+++ b/mobile/lib/domain/models/log.model.dart
@@ -43,12 +43,7 @@ class LogMessage {
 
   @override
   int get hashCode {
-    return message.hashCode ^
-        level.hashCode ^
-        createdAt.hashCode ^
-        logger.hashCode ^
-        error.hashCode ^
-        stack.hashCode;
+    return message.hashCode ^ level.hashCode ^ createdAt.hashCode ^ logger.hashCode ^ error.hashCode ^ stack.hashCode;
   }
 
   @override
diff --git a/mobile/lib/domain/models/memory.model.dart b/mobile/lib/domain/models/memory.model.dart
index 38d1c7ef7d..39a6d4518b 100644
--- a/mobile/lib/domain/models/memory.model.dart
+++ b/mobile/lib/domain/models/memory.model.dart
@@ -39,8 +39,7 @@ class MemoryData {
 
   String toJson() => json.encode(toMap());
 
-  factory MemoryData.fromJson(String source) =>
-      MemoryData.fromMap(json.decode(source) as Map<String, dynamic>);
+  factory MemoryData.fromJson(String source) => MemoryData.fromMap(json.decode(source) as Map<String, dynamic>);
 
   @override
   String toString() => 'MemoryData(year: $year)';
diff --git a/mobile/lib/domain/models/person.model.dart b/mobile/lib/domain/models/person.model.dart
index 2a6b31cb17..784bb564fe 100644
--- a/mobile/lib/domain/models/person.model.dart
+++ b/mobile/lib/domain/models/person.model.dart
@@ -55,22 +55,17 @@ class PersonDto {
   factory PersonDto.fromMap(Map<String, dynamic> map) {
     return PersonDto(
       id: map['id'] as String,
-      birthDate: map['birthDate'] != null
-          ? DateTime.fromMillisecondsSinceEpoch(map['birthDate'] as int)
-          : null,
+      birthDate: map['birthDate'] != null ? DateTime.fromMillisecondsSinceEpoch(map['birthDate'] as int) : null,
       isHidden: map['isHidden'] as bool,
       name: map['name'] as String,
       thumbnailPath: map['thumbnailPath'] as String,
-      updatedAt: map['updatedAt'] != null
-          ? DateTime.fromMillisecondsSinceEpoch(map['updatedAt'] as int)
-          : null,
+      updatedAt: map['updatedAt'] != null ? DateTime.fromMillisecondsSinceEpoch(map['updatedAt'] as int) : null,
     );
   }
 
   String toJson() => json.encode(toMap());
 
-  factory PersonDto.fromJson(String source) =>
-      PersonDto.fromMap(json.decode(source) as Map<String, dynamic>);
+  factory PersonDto.fromJson(String source) => PersonDto.fromMap(json.decode(source) as Map<String, dynamic>);
 
   @override
   bool operator ==(covariant PersonDto other) {
diff --git a/mobile/lib/domain/models/stack.model.dart b/mobile/lib/domain/models/stack.model.dart
index 6a449a1eb8..0db65d105b 100644
--- a/mobile/lib/domain/models/stack.model.dart
+++ b/mobile/lib/domain/models/stack.model.dart
@@ -54,11 +54,7 @@ class Stack {
 
   @override
   int get hashCode {
-    return id.hashCode ^
-        createdAt.hashCode ^
-        updatedAt.hashCode ^
-        ownerId.hashCode ^
-        primaryAssetId.hashCode;
+    return id.hashCode ^ createdAt.hashCode ^ updatedAt.hashCode ^ ownerId.hashCode ^ primaryAssetId.hashCode;
   }
 }
 
@@ -77,9 +73,7 @@ class StackResponse {
   bool operator ==(covariant StackResponse other) {
     if (identical(this, other)) return true;
 
-    return other.id == id &&
-        other.primaryAssetId == primaryAssetId &&
-        other.assetIds == assetIds;
+    return other.id == id && other.primaryAssetId == primaryAssetId && other.assetIds == assetIds;
   }
 
   @override
diff --git a/mobile/lib/domain/models/user.model.dart b/mobile/lib/domain/models/user.model.dart
index 6cafd8d149..9af8abadc2 100644
--- a/mobile/lib/domain/models/user.model.dart
+++ b/mobile/lib/domain/models/user.model.dart
@@ -175,16 +175,13 @@ class PartnerUserDto {
       email: map['email'] as String,
       name: map['name'] as String,
       inTimeline: map['inTimeline'] as bool,
-      profileImagePath: map['profileImagePath'] != null
-          ? map['profileImagePath'] as String
-          : null,
+      profileImagePath: map['profileImagePath'] != null ? map['profileImagePath'] as String : null,
     );
   }
 
   String toJson() => json.encode(toMap());
 
-  factory PartnerUserDto.fromJson(String source) =>
-      PartnerUserDto.fromMap(json.decode(source) as Map<String, dynamic>);
+  factory PartnerUserDto.fromJson(String source) => PartnerUserDto.fromMap(json.decode(source) as Map<String, dynamic>);
 
   @override
   String toString() {
@@ -204,10 +201,6 @@ class PartnerUserDto {
 
   @override
   int get hashCode {
-    return id.hashCode ^
-        email.hashCode ^
-        name.hashCode ^
-        inTimeline.hashCode ^
-        profileImagePath.hashCode;
+    return id.hashCode ^ email.hashCode ^ name.hashCode ^ inTimeline.hashCode ^ profileImagePath.hashCode;
   }
 }
diff --git a/mobile/lib/domain/models/user_metadata.model.dart b/mobile/lib/domain/models/user_metadata.model.dart
index c5c63cad5e..8b7ca1ffa9 100644
--- a/mobile/lib/domain/models/user_metadata.model.dart
+++ b/mobile/lib/domain/models/user_metadata.model.dart
@@ -24,8 +24,7 @@ enum AvatarColor {
   const AvatarColor(this.value);
 
   Color toColor({bool isDarkTheme = false}) => switch (this) {
-        AvatarColor.primary =>
-          isDarkTheme ? const Color(0xFFABCBFA) : const Color(0xFF4250AF),
+        AvatarColor.primary => isDarkTheme ? const Color(0xFFABCBFA) : const Color(0xFF4250AF),
         AvatarColor.pink => const Color.fromARGB(255, 244, 114, 182),
         AvatarColor.red => const Color.fromARGB(255, 239, 68, 68),
         AvatarColor.yellow => const Color.fromARGB(255, 234, 179, 8),
@@ -241,14 +240,11 @@ licenseKey: $licenseKey,
   bool operator ==(covariant License other) {
     if (identical(this, other)) return true;
 
-    return activatedAt == other.activatedAt &&
-        activationKey == other.activationKey &&
-        licenseKey == other.licenseKey;
+    return activatedAt == other.activatedAt && activationKey == other.activationKey && licenseKey == other.licenseKey;
   }
 
   @override
-  int get hashCode =>
-      activatedAt.hashCode ^ activationKey.hashCode ^ licenseKey.hashCode;
+  int get hashCode => activatedAt.hashCode ^ activationKey.hashCode ^ licenseKey.hashCode;
 }
 
 // Model for a user metadata stored in the server
@@ -310,10 +306,6 @@ license: ${license ?? "<NA>"},
 
   @override
   int get hashCode {
-    return userId.hashCode ^
-        key.hashCode ^
-        onboarding.hashCode ^
-        preferences.hashCode ^
-        license.hashCode;
+    return userId.hashCode ^ key.hashCode ^ onboarding.hashCode ^ preferences.hashCode ^ license.hashCode;
   }
 }
diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dart
index 995ed42dc8..26d6948468 100644
--- a/mobile/lib/domain/services/asset.service.dart
+++ b/mobile/lib/domain/services/asset.service.dart
@@ -19,9 +19,7 @@ class AssetService {
 
   Stream<BaseAsset?> watchAsset(BaseAsset asset) {
     final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;
-    return asset is LocalAsset
-        ? _localAssetRepository.watchAsset(id)
-        : _remoteAssetRepository.watchAsset(id);
+    return asset is LocalAsset ? _localAssetRepository.watchAsset(id) : _remoteAssetRepository.watchAsset(id);
   }
 
   Future<List<RemoteAsset>> getStack(RemoteAsset asset) async {
@@ -40,8 +38,7 @@ class AssetService {
       return null;
     }
 
-    final id =
-        asset is LocalAsset ? asset.remoteId! : (asset as RemoteAsset).id;
+    final id = asset is LocalAsset ? asset.remoteId! : (asset as RemoteAsset).id;
     return _remoteAssetRepository.getExif(id);
   }
 
@@ -56,8 +53,7 @@ class AssetService {
       width = exif?.width ?? asset.width?.toDouble();
       height = exif?.height ?? asset.height?.toDouble();
     } else if (asset is LocalAsset) {
-      isFlipped = _platform.isAndroid &&
-          (asset.orientation == 90 || asset.orientation == 270);
+      isFlipped = _platform.isAndroid && (asset.orientation == 90 || asset.orientation == 270);
       width = asset.width?.toDouble();
       height = asset.height?.toDouble();
     } else {
@@ -78,10 +74,7 @@ class AssetService {
   }
 
   Future<(int local, int remote)> getAssetCounts() async {
-    return (
-      await _localAssetRepository.getCount(),
-      await _remoteAssetRepository.getCount()
-    );
+    return (await _localAssetRepository.getCount(), await _remoteAssetRepository.getCount());
   }
 
   Future<int> getLocalHashedCount() {
diff --git a/mobile/lib/domain/services/hash.service.dart b/mobile/lib/domain/services/hash.service.dart
index d004041276..3bbb75b003 100644
--- a/mobile/lib/domain/services/hash.service.dart
+++ b/mobile/lib/domain/services/hash.service.dart
@@ -41,8 +41,7 @@ class HashService {
     );
 
     for (final album in localAlbums) {
-      final assetsToHash =
-          await _localAlbumRepository.getAssetsToHash(album.id);
+      final assetsToHash = await _localAlbumRepository.getAssetsToHash(album.id);
       if (assetsToHash.isNotEmpty) {
         await _hashAssets(assetsToHash);
       }
@@ -88,8 +87,7 @@ class HashService {
     _log.fine("Hashing ${toHash.length} files");
 
     final hashed = <LocalAsset>[];
-    final hashes =
-        await _nativeSyncApi.hashPaths(toHash.map((e) => e.path).toList());
+    final hashes = await _nativeSyncApi.hashPaths(toHash.map((e) => e.path).toList());
     assert(
       hashes.length == toHash.length,
       "Hashes length does not match toHash length: ${hashes.length} != ${toHash.length}",
diff --git a/mobile/lib/domain/services/local_sync.service.dart b/mobile/lib/domain/services/local_sync.service.dart
index 8d3b747b37..4204761054 100644
--- a/mobile/lib/domain/services/local_sync.service.dart
+++ b/mobile/lib/domain/services/local_sync.service.dart
@@ -66,8 +66,7 @@ class LocalSyncService {
         // On iOS, we need to full sync albums that are marked as cloud as the delta sync
         // does not include changes for cloud albums. If ignoreIcloudAssets is enabled,
         // remove the albums from the local database from the previous sync
-        final cloudAlbums =
-            deviceAlbums.where((a) => a.isCloud).toLocalAlbums();
+        final cloudAlbums = deviceAlbums.where((a) => a.isCloud).toLocalAlbums();
         for (final album in cloudAlbums) {
           final dbAlbum = dbAlbums.firstWhereOrNull((a) => a.id == album.id);
           if (dbAlbum == null) {
@@ -95,8 +94,7 @@ class LocalSyncService {
       final Stopwatch stopwatch = Stopwatch()..start();
 
       final deviceAlbums = await _nativeSyncApi.getAlbums();
-      final dbAlbums =
-          await _localAlbumRepository.getAll(sortBy: {SortLocalAlbumsBy.id});
+      final dbAlbums = await _localAlbumRepository.getAll(sortBy: {SortLocalAlbumsBy.id});
 
       await diffSortedLists(
         dbAlbums,
@@ -120,9 +118,7 @@ class LocalSyncService {
     try {
       _log.fine("Adding device album ${album.name}");
 
-      final assets = album.assetCount > 0
-          ? await _nativeSyncApi.getAssetsForAlbum(album.id)
-          : <PlatformAsset>[];
+      final assets = album.assetCount > 0 ? await _nativeSyncApi.getAssetsForAlbum(album.id) : <PlatformAsset>[];
 
       await _localAlbumRepository.upsert(
         album,
@@ -188,10 +184,8 @@ class LocalSyncService {
         return false;
       }
 
-      final updatedTime =
-          (dbAlbum.updatedAt.millisecondsSinceEpoch ~/ 1000) + 1;
-      final newAssetsCount =
-          await _nativeSyncApi.getAssetsCountSince(deviceAlbum.id, updatedTime);
+      final updatedTime = (dbAlbum.updatedAt.millisecondsSinceEpoch ~/ 1000) + 1;
+      final newAssetsCount = await _nativeSyncApi.getAssetsCountSince(deviceAlbum.id, updatedTime);
 
       // Early return if no new assets were found
       if (newAssetsCount == 0) {
@@ -230,13 +224,9 @@ class LocalSyncService {
   Future<bool> fullDiff(LocalAlbum dbAlbum, LocalAlbum deviceAlbum) async {
     try {
       final assetsInDevice = deviceAlbum.assetCount > 0
-          ? await _nativeSyncApi
-              .getAssetsForAlbum(deviceAlbum.id)
-              .then((a) => a.toLocalAssets())
-          : <LocalAsset>[];
-      final assetsInDb = dbAlbum.assetCount > 0
-          ? await _localAlbumRepository.getAssets(dbAlbum.id)
+          ? await _nativeSyncApi.getAssetsForAlbum(deviceAlbum.id).then((a) => a.toLocalAssets())
           : <LocalAsset>[];
+      final assetsInDb = dbAlbum.assetCount > 0 ? await _localAlbumRepository.getAssets(dbAlbum.id) : <LocalAsset>[];
 
       if (deviceAlbum.assetCount == 0) {
         _log.fine(
@@ -321,9 +311,7 @@ class LocalSyncService {
   }
 
   bool _albumsEqual(LocalAlbum a, LocalAlbum b) {
-    return a.name == b.name &&
-        a.assetCount == b.assetCount &&
-        a.updatedAt.isAtSameMomentAs(b.updatedAt);
+    return a.name == b.name && a.assetCount == b.assetCount && a.updatedAt.isAtSameMomentAs(b.updatedAt);
   }
 }
 
@@ -333,9 +321,7 @@ extension on Iterable<PlatformAlbum> {
       (e) => LocalAlbum(
         id: e.id,
         name: e.name,
-        updatedAt: e.updatedAt == null
-            ? DateTime.now()
-            : DateTime.fromMillisecondsSinceEpoch(e.updatedAt! * 1000),
+        updatedAt: e.updatedAt == null ? DateTime.now() : DateTime.fromMillisecondsSinceEpoch(e.updatedAt! * 1000),
         assetCount: e.assetCount,
       ),
     ).toList();
@@ -350,12 +336,8 @@ extension on Iterable<PlatformAsset> {
         name: e.name,
         checksum: null,
         type: AssetType.values.elementAtOrNull(e.type) ?? AssetType.other,
-        createdAt: e.createdAt == null
-            ? DateTime.now()
-            : DateTime.fromMillisecondsSinceEpoch(e.createdAt! * 1000),
-        updatedAt: e.updatedAt == null
-            ? DateTime.now()
-            : DateTime.fromMillisecondsSinceEpoch(e.updatedAt! * 1000),
+        createdAt: e.createdAt == null ? DateTime.now() : DateTime.fromMillisecondsSinceEpoch(e.createdAt! * 1000),
+        updatedAt: e.updatedAt == null ? DateTime.now() : DateTime.fromMillisecondsSinceEpoch(e.updatedAt! * 1000),
         width: e.width,
         height: e.height,
         durationInSeconds: e.durationInSeconds,
diff --git a/mobile/lib/domain/services/log.service.dart b/mobile/lib/domain/services/log.service.dart
index c52665f093..72fb4d9bf7 100644
--- a/mobile/lib/domain/services/log.service.dart
+++ b/mobile/lib/domain/services/log.service.dart
@@ -56,8 +56,7 @@ class LogService {
   }) async {
     final instance = LogService._(logRepository, storeRepository, shouldBuffer);
     await logRepository.truncate(limit: kLogTruncateLimit);
-    final level = await instance._storeRepository.tryGet(StoreKey.logLevel) ??
-        LogLevel.info.index;
+    final level = await instance._storeRepository.tryGet(StoreKey.logLevel) ?? LogLevel.info.index;
     Logger.root.level = Level.LEVELS.elementAtOrNull(level) ?? Level.INFO;
     return instance;
   }
@@ -146,9 +145,7 @@ class LoggerUnInitializedException implements Exception {
 
 /// Log levels according to dart logging [Level]
 extension LevelDomainToInfraExtension on Level {
-  LogLevel toLogLevel() =>
-      LogLevel.values.elementAtOrNull(Level.LEVELS.indexOf(this)) ??
-      LogLevel.info;
+  LogLevel toLogLevel() => LogLevel.values.elementAtOrNull(Level.LEVELS.indexOf(this)) ?? LogLevel.info;
 }
 
 extension on LogLevel {
diff --git a/mobile/lib/domain/services/partner.service.dart b/mobile/lib/domain/services/partner.service.dart
index 065560c4be..11299b9d6d 100644
--- a/mobile/lib/domain/services/partner.service.dart
+++ b/mobile/lib/domain/services/partner.service.dart
@@ -23,10 +23,8 @@ class DriftPartnerService {
   Future<List<PartnerUserDto>> getAvailablePartners(
     String currentUserId,
   ) async {
-    final otherUsers =
-        await _driftPartnerRepository.getAvailablePartners(currentUserId);
-    final currentPartners =
-        await _driftPartnerRepository.getSharedBy(currentUserId);
+    final otherUsers = await _driftPartnerRepository.getAvailablePartners(currentUserId);
+    final currentPartners = await _driftPartnerRepository.getSharedBy(currentUserId);
     final available = otherUsers.where((user) {
       return !currentPartners.any((partner) => partner.id == user.id);
     }).toList();
diff --git a/mobile/lib/domain/services/remote_album.service.dart b/mobile/lib/domain/services/remote_album.service.dart
index 0f36fac2b9..a30d6f410f 100644
--- a/mobile/lib/domain/services/remote_album.service.dart
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -44,8 +44,7 @@ class RemoteAlbumService {
       filtered = filtered
           .where(
             (album) =>
-                album.name.toLowerCase().contains(lowerQuery) ||
-                album.description.toLowerCase().contains(lowerQuery),
+                album.name.toLowerCase().contains(lowerQuery) || album.description.toLowerCase().contains(lowerQuery),
           )
           .toList();
     }
@@ -53,12 +52,10 @@ class RemoteAlbumService {
     if (userId != null) {
       switch (filterMode) {
         case QuickFilterMode.myAlbums:
-          filtered =
-              filtered.where((album) => album.ownerId == userId).toList();
+          filtered = filtered.where((album) => album.ownerId == userId).toList();
           break;
         case QuickFilterMode.sharedWithMe:
-          filtered =
-              filtered.where((album) => album.ownerId != userId).toList();
+          filtered = filtered.where((album) => album.ownerId != userId).toList();
           break;
         case QuickFilterMode.all:
           break;
diff --git a/mobile/lib/domain/services/setting.service.dart b/mobile/lib/domain/services/setting.service.dart
index 8f91e9c66b..99e07a2872 100644
--- a/mobile/lib/domain/services/setting.service.dart
+++ b/mobile/lib/domain/services/setting.service.dart
@@ -9,16 +9,11 @@ final AppSetting = SettingsService(storeService: StoreService.I);
 class SettingsService {
   final StoreService _storeService;
 
-  const SettingsService({required StoreService storeService})
-      : _storeService = storeService;
+  const SettingsService({required StoreService storeService}) : _storeService = storeService;
 
-  T get<T>(Setting<T> setting) =>
-      _storeService.get(setting.storeKey, setting.defaultValue);
+  T get<T>(Setting<T> setting) => _storeService.get(setting.storeKey, setting.defaultValue);
 
-  Future<void> set<T>(Setting<T> setting, T value) =>
-      _storeService.put(setting.storeKey, value);
+  Future<void> set<T>(Setting<T> setting, T value) => _storeService.put(setting.storeKey, value);
 
-  Stream<T> watch<T>(Setting<T> setting) => _storeService
-      .watch(setting.storeKey)
-      .map((v) => v ?? setting.defaultValue);
+  Stream<T> watch<T>(Setting<T> setting) => _storeService.watch(setting.storeKey).map((v) => v ?? setting.defaultValue);
 }
diff --git a/mobile/lib/domain/services/store.service.dart b/mobile/lib/domain/services/store.service.dart
index b1e991b348..bd839a18ec 100644
--- a/mobile/lib/domain/services/store.service.dart
+++ b/mobile/lib/domain/services/store.service.dart
@@ -12,8 +12,7 @@ class StoreService {
   final Map<int, Object?> _cache = {};
   late final StreamSubscription<StoreDto> _storeUpdateSubscription;
 
-  StoreService._({required IsarStoreRepository storeRepository})
-      : _storeRepository = storeRepository;
+  StoreService._({required IsarStoreRepository storeRepository}) : _storeRepository = storeRepository;
 
   // TODO: Temporary typedef to make minimal changes. Remove this and make the presentation layer access store through a provider
   static StoreService? _instance;
@@ -48,8 +47,7 @@ class StoreService {
     }
   }
 
-  StreamSubscription<StoreDto> _listenForChange() =>
-      _storeRepository.watchAll().listen((event) {
+  StreamSubscription<StoreDto> _listenForChange() => _storeRepository.watchAll().listen((event) {
         _cache[event.key.id] = event.value;
       });
 
diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dart
index 26335ad3cf..7e982558b7 100644
--- a/mobile/lib/domain/services/timeline.service.dart
+++ b/mobile/lib/domain/services/timeline.service.dart
@@ -34,14 +34,12 @@ class TimelineFactory {
         _settingsService = settingsService;
 
   GroupAssetsBy get groupBy {
-    final group =
-        GroupAssetsBy.values[_settingsService.get(Setting.groupAssetsBy)];
+    final group = GroupAssetsBy.values[_settingsService.get(Setting.groupAssetsBy)];
     // We do not support auto grouping in the new timeline yet, fallback to day grouping
     return group == GroupAssetsBy.auto ? GroupAssetsBy.day : group;
   }
 
-  TimelineService main(List<String> timelineUsers) =>
-      TimelineService(_timelineRepository.main(timelineUsers, groupBy));
+  TimelineService main(List<String> timelineUsers) => TimelineService(_timelineRepository.main(timelineUsers, groupBy));
 
   TimelineService localAlbum({required String albumId}) =>
       TimelineService(_timelineRepository.localAlbum(albumId, groupBy));
@@ -49,29 +47,21 @@ class TimelineFactory {
   TimelineService remoteAlbum({required String albumId}) =>
       TimelineService(_timelineRepository.remoteAlbum(albumId, groupBy));
 
-  TimelineService remoteAssets(String userId) =>
-      TimelineService(_timelineRepository.remote(userId, groupBy));
+  TimelineService remoteAssets(String userId) => TimelineService(_timelineRepository.remote(userId, groupBy));
 
-  TimelineService favorite(String userId) =>
-      TimelineService(_timelineRepository.favorite(userId, groupBy));
+  TimelineService favorite(String userId) => TimelineService(_timelineRepository.favorite(userId, groupBy));
 
-  TimelineService trash(String userId) =>
-      TimelineService(_timelineRepository.trash(userId, groupBy));
+  TimelineService trash(String userId) => TimelineService(_timelineRepository.trash(userId, groupBy));
 
-  TimelineService archive(String userId) =>
-      TimelineService(_timelineRepository.archived(userId, groupBy));
+  TimelineService archive(String userId) => TimelineService(_timelineRepository.archived(userId, groupBy));
 
-  TimelineService lockedFolder(String userId) =>
-      TimelineService(_timelineRepository.locked(userId, groupBy));
+  TimelineService lockedFolder(String userId) => TimelineService(_timelineRepository.locked(userId, groupBy));
 
-  TimelineService video(String userId) =>
-      TimelineService(_timelineRepository.video(userId, groupBy));
+  TimelineService video(String userId) => TimelineService(_timelineRepository.video(userId, groupBy));
 
-  TimelineService place(String place) =>
-      TimelineService(_timelineRepository.place(place, groupBy));
+  TimelineService place(String place) => TimelineService(_timelineRepository.place(place, groupBy));
 
-  TimelineService fromAssets(List<BaseAsset> assets) =>
-      TimelineService(_timelineRepository.fromAssets(assets));
+  TimelineService fromAssets(List<BaseAsset> assets) => TimelineService(_timelineRepository.fromAssets(assets));
 }
 
 class TimelineService {
@@ -98,8 +88,7 @@ class TimelineService {
         _bucketSource = bucketSource {
     _bucketSubscription = _bucketSource().listen((buckets) {
       _mutex.run(() async {
-        final totalAssets =
-            buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
+        final totalAssets = buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
 
         if (totalAssets == 0) {
           _bufferOffset = 0;
@@ -132,8 +121,7 @@ class TimelineService {
 
   Stream<List<Bucket>> Function() get watchBuckets => _bucketSource;
 
-  Future<List<BaseAsset>> loadAssets(int index, int count) =>
-      _mutex.run(() => _loadAssets(index, count));
+  Future<List<BaseAsset>> loadAssets(int index, int count) => _mutex.run(() => _loadAssets(index, count));
 
   Future<List<BaseAsset>> _loadAssets(int index, int count) async {
     if (hasRange(index, count)) {
@@ -182,11 +170,9 @@ class TimelineService {
   }
 
   // Pre-cache assets around the given index for asset viewer
-  Future<void> preCacheAssets(int index) =>
-      _mutex.run(() => _loadAssets(index, math.min(5, _totalAssets - index)));
+  Future<void> preCacheAssets(int index) => _mutex.run(() => _loadAssets(index, math.min(5, _totalAssets - index)));
 
-  BaseAsset getRandomAsset() =>
-      _buffer.elementAt(math.Random().nextInt(_buffer.length));
+  BaseAsset getRandomAsset() => _buffer.elementAt(math.Random().nextInt(_buffer.length));
 
   BaseAsset getAsset(int index) {
     if (!hasRange(index, 1)) {
diff --git a/mobile/lib/domain/utils/background_sync.dart b/mobile/lib/domain/utils/background_sync.dart
index af66dda7a9..1524c412f1 100644
--- a/mobile/lib/domain/utils/background_sync.dart
+++ b/mobile/lib/domain/utils/background_sync.dart
@@ -67,12 +67,10 @@ class BackgroundSyncManager {
     // captured by the closure passed to [runInIsolateGentle].
     _deviceAlbumSyncTask = full
         ? runInIsolateGentle(
-            computation: (ref) =>
-                ref.read(localSyncServiceProvider).sync(full: true),
+            computation: (ref) => ref.read(localSyncServiceProvider).sync(full: true),
           )
         : runInIsolateGentle(
-            computation: (ref) =>
-                ref.read(localSyncServiceProvider).sync(full: false),
+            computation: (ref) => ref.read(localSyncServiceProvider).sync(full: false),
           );
 
     return _deviceAlbumSyncTask!.whenComplete(() {
@@ -139,7 +137,5 @@ Cancelable<void> _handleWsAssetUploadReadyV1Batch(
   List<dynamic> batchData,
 ) =>
     runInIsolateGentle(
-      computation: (ref) => ref
-          .read(syncStreamServiceProvider)
-          .handleWsAssetUploadReadyV1Batch(batchData),
+      computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetUploadReadyV1Batch(batchData),
     );
diff --git a/mobile/lib/domain/utils/event_stream.dart b/mobile/lib/domain/utils/event_stream.dart
index e728ece58b..008ddef183 100644
--- a/mobile/lib/domain/utils/event_stream.dart
+++ b/mobile/lib/domain/utils/event_stream.dart
@@ -9,8 +9,7 @@ class EventStream {
 
   static final EventStream shared = EventStream._();
 
-  final StreamController<Event> _controller =
-      StreamController<Event>.broadcast();
+  final StreamController<Event> _controller = StreamController<Event>.broadcast();
 
   void emit(Event event) {
     _controller.add(event);
diff --git a/mobile/lib/entities/album.entity.dart b/mobile/lib/entities/album.entity.dart
index f6d5322752..a7cb612d6e 100644
--- a/mobile/lib/entities/album.entity.dart
+++ b/mobile/lib/entities/album.entity.dart
@@ -95,13 +95,11 @@ class Album {
   // accessible in an object freshly created (not loaded from DB)
 
   @ignore
-  Iterable<User> get remoteUsers => sharedUsers.isEmpty
-      ? (sharedUsers as IsarLinksCommon<User>).addedObjects
-      : sharedUsers;
+  Iterable<User> get remoteUsers =>
+      sharedUsers.isEmpty ? (sharedUsers as IsarLinksCommon<User>).addedObjects : sharedUsers;
 
   @ignore
-  Iterable<Asset> get remoteAssets =>
-      assets.isEmpty ? (assets as IsarLinksCommon<Asset>).addedObjects : assets;
+  Iterable<Asset> get remoteAssets => assets.isEmpty ? (assets as IsarLinksCommon<Asset>).addedObjects : assets;
 
   @override
   bool operator ==(other) {
@@ -164,15 +162,11 @@ class Album {
     a.remoteAssetCount = dto.assetCount;
     a.owner.value = await db.users.getById(dto.ownerId);
     if (dto.order != null) {
-      a.sortOrder =
-          dto.order == AssetOrder.asc ? SortOrder.asc : SortOrder.desc;
+      a.sortOrder = dto.order == AssetOrder.asc ? SortOrder.asc : SortOrder.desc;
     }
 
     if (dto.albumThumbnailAssetId != null) {
-      a.thumbnail.value = await db.assets
-          .where()
-          .remoteIdEqualTo(dto.albumThumbnailAssetId)
-          .findFirst();
+      a.thumbnail.value = await db.assets.where().remoteIdEqualTo(dto.albumThumbnailAssetId).findFirst();
     }
     if (dto.albumUsers.isNotEmpty) {
       final users = await db.users.getAllById(
@@ -181,16 +175,14 @@ class Album {
       a.sharedUsers.addAll(users.cast());
     }
     if (dto.assets.isNotEmpty) {
-      final assets =
-          await db.assets.getAllByRemoteId(dto.assets.map((e) => e.id));
+      final assets = await db.assets.getAllByRemoteId(dto.assets.map((e) => e.id));
       a.assets.addAll(assets);
     }
     return a;
   }
 
   @override
-  String toString() =>
-      'remoteId: $remoteId name: $name description: $description';
+  String toString() => 'remoteId: $remoteId name: $name description: $description';
 }
 
 extension AssetsHelper on IsarCollection<Album> {
diff --git a/mobile/lib/entities/asset.entity.dart b/mobile/lib/entities/asset.entity.dart
index d754b11dc5..f5c577a060 100644
--- a/mobile/lib/entities/asset.entity.dart
+++ b/mobile/lib/entities/asset.entity.dart
@@ -4,8 +4,7 @@ import 'dart:io';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/string_extensions.dart';
-import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
-    as entity;
+import 'package:immich_mobile/infrastructure/entities/exif.entity.dart' as entity;
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:immich_mobile/utils/hash.dart';
@@ -32,18 +31,14 @@ class Asset {
         width = remote.exifInfo?.exifImageWidth?.toInt(),
         livePhotoVideoId = remote.livePhotoVideoId,
         ownerId = fastHash(remote.ownerId),
-        exifInfo = remote.exifInfo == null
-            ? null
-            : ExifDtoConverter.fromDto(remote.exifInfo!),
+        exifInfo = remote.exifInfo == null ? null : ExifDtoConverter.fromDto(remote.exifInfo!),
         isFavorite = remote.isFavorite,
         isArchived = remote.isArchived,
         isTrashed = remote.isTrashed,
         isOffline = remote.isOffline,
         // workaround to nullify stackPrimaryAssetId for the parent asset until we refactor the mobile app
         // stack handling to properly handle it
-        stackPrimaryAssetId = remote.stack?.primaryAssetId == remote.id
-            ? null
-            : remote.stack?.primaryAssetId,
+        stackPrimaryAssetId = remote.stack?.primaryAssetId == remote.id ? null : remote.stack?.primaryAssetId,
         stackCount = remote.stack?.assetCount ?? 0,
         stackId = remote.stack?.id,
         thumbhash = remote.thumbhash,
@@ -108,8 +103,7 @@ class Asset {
       throw Exception('Asset $fileName has no local data');
     }
 
-    final updatedLocal =
-        _didUpdateLocal ? local : await local.obtainForNewProperties();
+    final updatedLocal = _didUpdateLocal ? local : await local.obtainForNewProperties();
     if (updatedLocal == null) {
       throw Exception('Could not fetch local data for $fileName');
     }
@@ -185,10 +179,7 @@ class Asset {
     final orientatedWidth = this.orientatedWidth;
     final orientatedHeight = this.orientatedHeight;
 
-    if (orientatedWidth != null &&
-        orientatedHeight != null &&
-        orientatedWidth > 0 &&
-        orientatedHeight > 0) {
+    if (orientatedWidth != null && orientatedHeight != null && orientatedWidth > 0 && orientatedHeight > 0) {
       return orientatedWidth.toDouble() / orientatedHeight.toDouble();
     }
 
@@ -389,8 +380,7 @@ class Asset {
           // workaround to nullify stackPrimaryAssetId for the parent asset until we refactor the mobile app
           // stack handling to properly handle it
           stackId: stackId,
-          stackPrimaryAssetId:
-              stackPrimaryAssetId == remoteId ? null : stackPrimaryAssetId,
+          stackPrimaryAssetId: stackPrimaryAssetId == remoteId ? null : stackPrimaryAssetId,
           stackCount: stackCount,
           isFavorite: isFavorite,
           isArchived: isArchived,
@@ -410,9 +400,7 @@ class Asset {
           // workaround to nullify stackPrimaryAssetId for the parent asset until we refactor the mobile app
           // stack handling to properly handle it
           stackId: a.stackId,
-          stackPrimaryAssetId: a.stackPrimaryAssetId == a.remoteId
-              ? null
-              : a.stackPrimaryAssetId,
+          stackPrimaryAssetId: a.stackPrimaryAssetId == a.remoteId ? null : a.stackPrimaryAssetId,
           stackCount: a.stackCount,
           // isFavorite + isArchived are not set by device-only assets
           isFavorite: a.isFavorite,
@@ -428,8 +416,7 @@ class Asset {
           localId: localId ?? a.localId,
           width: width ?? a.width,
           height: height ?? a.height,
-          exifInfo: exifInfo ??
-              a.exifInfo?.copyWith(assetId: id), // updated to use assetId
+          exifInfo: exifInfo ?? a.exifInfo?.copyWith(assetId: id), // updated to use assetId
         );
       }
     }
@@ -491,18 +478,15 @@ class Asset {
   Future<void> put(Isar db) async {
     await db.assets.put(this);
     if (exifInfo != null) {
-      await db.exifInfos
-          .put(entity.ExifInfo.fromDto(exifInfo!.copyWith(assetId: id)));
+      await db.exifInfos.put(entity.ExifInfo.fromDto(exifInfo!.copyWith(assetId: id)));
     }
   }
 
   static int compareById(Asset a, Asset b) => a.id.compareTo(b.id);
 
-  static int compareByLocalId(Asset a, Asset b) =>
-      compareToNullable(a.localId, b.localId);
+  static int compareByLocalId(Asset a, Asset b) => compareToNullable(a.localId, b.localId);
 
-  static int compareByChecksum(Asset a, Asset b) =>
-      a.checksum.compareTo(b.checksum);
+  static int compareByChecksum(Asset a, Asset b) => a.checksum.compareTo(b.checksum);
 
   static int compareByOwnerChecksum(Asset a, Asset b) {
     final int ownerIdOrder = a.ownerId.compareTo(b.ownerId);
@@ -589,16 +573,11 @@ enum AssetState {
 }
 
 extension AssetsHelper on IsarCollection<Asset> {
-  Future<int> deleteAllByRemoteId(Iterable<String> ids) =>
-      ids.isEmpty ? Future.value(0) : remote(ids).deleteAll();
-  Future<int> deleteAllByLocalId(Iterable<String> ids) =>
-      ids.isEmpty ? Future.value(0) : local(ids).deleteAll();
-  Future<List<Asset>> getAllByRemoteId(Iterable<String> ids) =>
-      ids.isEmpty ? Future.value([]) : remote(ids).findAll();
-  Future<List<Asset>> getAllByLocalId(Iterable<String> ids) =>
-      ids.isEmpty ? Future.value([]) : local(ids).findAll();
-  Future<Asset?> getByRemoteId(String id) =>
-      where().remoteIdEqualTo(id).findFirst();
+  Future<int> deleteAllByRemoteId(Iterable<String> ids) => ids.isEmpty ? Future.value(0) : remote(ids).deleteAll();
+  Future<int> deleteAllByLocalId(Iterable<String> ids) => ids.isEmpty ? Future.value(0) : local(ids).deleteAll();
+  Future<List<Asset>> getAllByRemoteId(Iterable<String> ids) => ids.isEmpty ? Future.value([]) : remote(ids).findAll();
+  Future<List<Asset>> getAllByLocalId(Iterable<String> ids) => ids.isEmpty ? Future.value([]) : local(ids).findAll();
+  Future<Asset?> getByRemoteId(String id) => where().remoteIdEqualTo(id).findFirst();
 
   QueryBuilder<Asset, Asset, QAfterWhereClause> remote(
     Iterable<String> ids,
diff --git a/mobile/lib/extensions/asyncvalue_extensions.dart b/mobile/lib/extensions/asyncvalue_extensions.dart
index 554c3a8a8a..c76d7e48d8 100644
--- a/mobile/lib/extensions/asyncvalue_extensions.dart
+++ b/mobile/lib/extensions/asyncvalue_extensions.dart
@@ -22,15 +22,13 @@ extension LogOnError<T> on AsyncValue<T> {
       }
 
       if (!skip) {
-        return onLoading?.call() ??
-            const Center(child: ImmichLoadingIndicator());
+        return onLoading?.call() ?? const Center(child: ImmichLoadingIndicator());
       }
     }
 
     if (hasError && !hasValue) {
       _asyncErrorLogger.severe('Could not load value', error, stackTrace);
-      return onError?.call(error, stackTrace) ??
-          ScaffoldErrorBody(errorMsg: error?.toString());
+      return onError?.call(error, stackTrace) ?? ScaffoldErrorBody(errorMsg: error?.toString());
     }
 
     return onData(requireValue);
diff --git a/mobile/lib/extensions/build_context_extensions.dart b/mobile/lib/extensions/build_context_extensions.dart
index 7bb194cdae..a624337954 100644
--- a/mobile/lib/extensions/build_context_extensions.dart
+++ b/mobile/lib/extensions/build_context_extensions.dart
@@ -60,6 +60,5 @@ extension ContextHelper on BuildContext {
   FocusScopeNode get focusScope => FocusScope.of(this);
 
   // Show SnackBars from the current context
-  void showSnackBar(SnackBar snackBar) =>
-      ScaffoldMessenger.of(this).showSnackBar(snackBar);
+  void showSnackBar(SnackBar snackBar) => ScaffoldMessenger.of(this).showSnackBar(snackBar);
 }
diff --git a/mobile/lib/extensions/datetime_extensions.dart b/mobile/lib/extensions/datetime_extensions.dart
index e23bf5210f..7e54980270 100644
--- a/mobile/lib/extensions/datetime_extensions.dart
+++ b/mobile/lib/extensions/datetime_extensions.dart
@@ -57,9 +57,7 @@ extension DateRangeFormatting on DateTime {
     final localeString = locale?.toString() ?? 'en_US';
 
     // Check if it's a single date (same day)
-    if (startDate.year == endDate.year &&
-        startDate.month == endDate.month &&
-        startDate.day == endDate.day) {
+    if (startDate.year == endDate.year && startDate.month == endDate.month && startDate.day == endDate.day) {
       if (startDate.year == currentYear) {
         // Single date of this year: "Aug 28"
         return DateFormat.MMMd(localeString).format(startDate);
diff --git a/mobile/lib/extensions/string_extensions.dart b/mobile/lib/extensions/string_extensions.dart
index 67411013ee..65660c04ef 100644
--- a/mobile/lib/extensions/string_extensions.dart
+++ b/mobile/lib/extensions/string_extensions.dart
@@ -12,9 +12,7 @@ extension DurationExtension on String {
   /// Parses and returns the string of format HH:MM:SS as a duration object else null
   Duration? toDuration() {
     try {
-      final parts = split(':')
-          .map((e) => double.parse(e).toInt())
-          .toList(growable: false);
+      final parts = split(':').map((e) => double.parse(e).toInt()).toList(growable: false);
       return Duration(hours: parts[0], minutes: parts[1], seconds: parts[2]);
     } catch (e) {
       return null;
diff --git a/mobile/lib/extensions/theme_extensions.dart b/mobile/lib/extensions/theme_extensions.dart
index b81e4476e0..6da8ac1fe6 100644
--- a/mobile/lib/extensions/theme_extensions.dart
+++ b/mobile/lib/extensions/theme_extensions.dart
@@ -2,9 +2,7 @@ import 'package:flutter/material.dart';
 
 extension ImmichColorSchemeExtensions on ColorScheme {
   bool get _isDarkMode => brightness == Brightness.dark;
-  Color get onSurfaceSecondary => _isDarkMode
-      ? onSurface.darken(amount: .3)
-      : onSurface.lighten(amount: .3);
+  Color get onSurfaceSecondary => _isDarkMode ? onSurface.darken(amount: .3) : onSurface.lighten(amount: .3);
 }
 
 extension ColorExtensions on Color {
diff --git a/mobile/lib/extensions/translate_extensions.dart b/mobile/lib/extensions/translate_extensions.dart
index 122830843d..d8a2810e79 100644
--- a/mobile/lib/extensions/translate_extensions.dart
+++ b/mobile/lib/extensions/translate_extensions.dart
@@ -40,8 +40,7 @@ String _translateHelper(
   try {
     final translatedMessage = key.tr(context: context);
     return args != null
-        ? MessageFormat(translatedMessage, locale: Intl.defaultLocale ?? 'en')
-            .format(args)
+        ? MessageFormat(translatedMessage, locale: Intl.defaultLocale ?? 'en').format(args)
         : translatedMessage;
   } catch (e) {
     debugPrint('Translation failed for key "$key". Error: $e');
diff --git a/mobile/lib/infrastructure/entities/asset_face.entity.dart b/mobile/lib/infrastructure/entities/asset_face.entity.dart
index c54e4e1848..5f793030c3 100644
--- a/mobile/lib/infrastructure/entities/asset_face.entity.dart
+++ b/mobile/lib/infrastructure/entities/asset_face.entity.dart
@@ -8,12 +8,9 @@ class AssetFaceEntity extends Table with DriftDefaultsMixin {
 
   TextColumn get id => text()();
 
-  TextColumn get assetId =>
-      text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
 
-  TextColumn get personId => text()
-      .nullable()
-      .references(PersonEntity, #id, onDelete: KeyAction.setNull)();
+  TextColumn get personId => text().nullable().references(PersonEntity, #id, onDelete: KeyAction.setNull)();
 
   IntColumn get imageWidth => integer()();
 
diff --git a/mobile/lib/infrastructure/entities/exif.entity.dart b/mobile/lib/infrastructure/entities/exif.entity.dart
index 2ec8f0023f..dae5486ab1 100644
--- a/mobile/lib/infrastructure/entities/exif.entity.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.dart
@@ -98,8 +98,7 @@ class ExifInfo {
 class RemoteExifEntity extends Table with DriftDefaultsMixin {
   const RemoteExifEntity();
 
-  TextColumn get assetId =>
-      text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
 
   TextColumn get city => text().nullable()();
 
diff --git a/mobile/lib/infrastructure/entities/local_album.entity.dart b/mobile/lib/infrastructure/entities/local_album.entity.dart
index 398c5d4e44..c796a12956 100644
--- a/mobile/lib/infrastructure/entities/local_album.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_album.entity.dart
@@ -9,8 +9,7 @@ class LocalAlbumEntity extends Table with DriftDefaultsMixin {
   TextColumn get name => text()();
   DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
   IntColumn get backupSelection => intEnum<BackupSelection>()();
-  BoolColumn get isIosSharedAlbum =>
-      boolean().withDefault(const Constant(false))();
+  BoolColumn get isIosSharedAlbum => boolean().withDefault(const Constant(false))();
 
   // Used for mark & sweep
   BoolColumn get marker_ => boolean().nullable()();
diff --git a/mobile/lib/infrastructure/entities/local_album_asset.entity.dart b/mobile/lib/infrastructure/entities/local_album_asset.entity.dart
index b64b9ec2fb..8de879a09d 100644
--- a/mobile/lib/infrastructure/entities/local_album_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_album_asset.entity.dart
@@ -6,11 +6,9 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 class LocalAlbumAssetEntity extends Table with DriftDefaultsMixin {
   const LocalAlbumAssetEntity();
 
-  TextColumn get assetId =>
-      text().references(LocalAssetEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get assetId => text().references(LocalAssetEntity, #id, onDelete: KeyAction.cascade)();
 
-  TextColumn get albumId =>
-      text().references(LocalAlbumEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get albumId => text().references(LocalAlbumEntity, #id, onDelete: KeyAction.cascade)();
 
   @override
   Set<Column> get primaryKey => {assetId, albumId};
diff --git a/mobile/lib/infrastructure/entities/memory.entity.dart b/mobile/lib/infrastructure/entities/memory.entity.dart
index 0e19802103..63dcfef5cc 100644
--- a/mobile/lib/infrastructure/entities/memory.entity.dart
+++ b/mobile/lib/infrastructure/entities/memory.entity.dart
@@ -14,8 +14,7 @@ class MemoryEntity extends Table with DriftDefaultsMixin {
 
   DateTimeColumn get deletedAt => dateTime().nullable()();
 
-  TextColumn get ownerId =>
-      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get ownerId => text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
 
   IntColumn get type => intEnum<MemoryTypeEnum>()();
 
diff --git a/mobile/lib/infrastructure/entities/memory_asset.entity.dart b/mobile/lib/infrastructure/entities/memory_asset.entity.dart
index c304b03724..5053afdfb3 100644
--- a/mobile/lib/infrastructure/entities/memory_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/memory_asset.entity.dart
@@ -6,11 +6,9 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 class MemoryAssetEntity extends Table with DriftDefaultsMixin {
   const MemoryAssetEntity();
 
-  TextColumn get assetId =>
-      text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
 
-  TextColumn get memoryId =>
-      text().references(MemoryEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get memoryId => text().references(MemoryEntity, #id, onDelete: KeyAction.cascade)();
 
   @override
   Set<Column> get primaryKey => {assetId, memoryId};
diff --git a/mobile/lib/infrastructure/entities/partner.entity.dart b/mobile/lib/infrastructure/entities/partner.entity.dart
index 8b51d93e6f..dbc675ee99 100644
--- a/mobile/lib/infrastructure/entities/partner.entity.dart
+++ b/mobile/lib/infrastructure/entities/partner.entity.dart
@@ -5,11 +5,9 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 class PartnerEntity extends Table with DriftDefaultsMixin {
   const PartnerEntity();
 
-  TextColumn get sharedById =>
-      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get sharedById => text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
 
-  TextColumn get sharedWithId =>
-      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get sharedWithId => text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
 
   BoolColumn get inTimeline => boolean().withDefault(const Constant(false))();
 
diff --git a/mobile/lib/infrastructure/entities/person.entity.dart b/mobile/lib/infrastructure/entities/person.entity.dart
index 75543baca3..f0878e00f8 100644
--- a/mobile/lib/infrastructure/entities/person.entity.dart
+++ b/mobile/lib/infrastructure/entities/person.entity.dart
@@ -11,8 +11,7 @@ class PersonEntity extends Table with DriftDefaultsMixin {
 
   DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
 
-  TextColumn get ownerId =>
-      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get ownerId => text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
 
   TextColumn get name => text()();
 
diff --git a/mobile/lib/infrastructure/entities/remote_album.entity.dart b/mobile/lib/infrastructure/entities/remote_album.entity.dart
index 377d67446f..74b00dd9ee 100644
--- a/mobile/lib/infrastructure/entities/remote_album.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_album.entity.dart
@@ -17,15 +17,12 @@ class RemoteAlbumEntity extends Table with DriftDefaultsMixin {
 
   DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
 
-  TextColumn get ownerId =>
-      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get ownerId => text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
 
-  TextColumn get thumbnailAssetId => text()
-      .references(RemoteAssetEntity, #id, onDelete: KeyAction.setNull)
-      .nullable()();
+  TextColumn get thumbnailAssetId =>
+      text().references(RemoteAssetEntity, #id, onDelete: KeyAction.setNull).nullable()();
 
-  BoolColumn get isActivityEnabled =>
-      boolean().withDefault(const Constant(true))();
+  BoolColumn get isActivityEnabled => boolean().withDefault(const Constant(true))();
 
   IntColumn get order => intEnum<AlbumAssetOrder>()();
 
diff --git a/mobile/lib/infrastructure/entities/remote_album_asset.entity.dart b/mobile/lib/infrastructure/entities/remote_album_asset.entity.dart
index 1dcc336ed8..e99f5364a4 100644
--- a/mobile/lib/infrastructure/entities/remote_album_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_album_asset.entity.dart
@@ -6,11 +6,9 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 class RemoteAlbumAssetEntity extends Table with DriftDefaultsMixin {
   const RemoteAlbumAssetEntity();
 
-  TextColumn get assetId =>
-      text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
 
-  TextColumn get albumId =>
-      text().references(RemoteAlbumEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get albumId => text().references(RemoteAlbumEntity, #id, onDelete: KeyAction.cascade)();
 
   @override
   Set<Column> get primaryKey => {assetId, albumId};
diff --git a/mobile/lib/infrastructure/entities/remote_album_user.entity.dart b/mobile/lib/infrastructure/entities/remote_album_user.entity.dart
index 4198fb7e46..9cb277f9d0 100644
--- a/mobile/lib/infrastructure/entities/remote_album_user.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_album_user.entity.dart
@@ -7,11 +7,9 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 class RemoteAlbumUserEntity extends Table with DriftDefaultsMixin {
   const RemoteAlbumUserEntity();
 
-  TextColumn get albumId =>
-      text().references(RemoteAlbumEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get albumId => text().references(RemoteAlbumEntity, #id, onDelete: KeyAction.cascade)();
 
-  TextColumn get userId =>
-      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get userId => text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
 
   IntColumn get role => intEnum<AlbumUserRole>()();
 
diff --git a/mobile/lib/infrastructure/entities/remote_asset.entity.dart b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
index 0b2896538e..cb14e2501d 100644
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
@@ -11,8 +11,7 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
   unique: true,
 )
 @TableIndex(name: 'idx_remote_asset_checksum', columns: {#checksum})
-class RemoteAssetEntity extends Table
-    with DriftDefaultsMixin, AssetEntityMixin {
+class RemoteAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
   const RemoteAssetEntity();
 
   TextColumn get id => text()();
@@ -21,8 +20,7 @@ class RemoteAssetEntity extends Table
 
   BoolColumn get isFavorite => boolean().withDefault(const Constant(false))();
 
-  TextColumn get ownerId =>
-      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get ownerId => text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
 
   DateTimeColumn get localDateTime => dateTime().nullable()();
 
diff --git a/mobile/lib/infrastructure/entities/stack.entity.dart b/mobile/lib/infrastructure/entities/stack.entity.dart
index b5da42832e..be50d7e330 100644
--- a/mobile/lib/infrastructure/entities/stack.entity.dart
+++ b/mobile/lib/infrastructure/entities/stack.entity.dart
@@ -11,8 +11,7 @@ class StackEntity extends Table with DriftDefaultsMixin {
 
   DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
 
-  TextColumn get ownerId =>
-      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get ownerId => text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
 
   TextColumn get primaryAssetId => text()();
 
diff --git a/mobile/lib/infrastructure/entities/user_metadata.entity.dart b/mobile/lib/infrastructure/entities/user_metadata.entity.dart
index f9a411e3de..ede3de3966 100644
--- a/mobile/lib/infrastructure/entities/user_metadata.entity.dart
+++ b/mobile/lib/infrastructure/entities/user_metadata.entity.dart
@@ -6,8 +6,7 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 class UserMetadataEntity extends Table with DriftDefaultsMixin {
   const UserMetadataEntity();
 
-  TextColumn get userId =>
-      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+  TextColumn get userId => text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
 
   IntColumn get key => intEnum<UserMetadataKey>()();
 
@@ -17,7 +16,6 @@ class UserMetadataEntity extends Table with DriftDefaultsMixin {
   Set<Column> get primaryKey => {userId, key};
 }
 
-final JsonTypeConverter2<Map<String, Object?>, Uint8List, Object?>
-    userMetadataConverter = TypeConverter.jsonb(
+final JsonTypeConverter2<Map<String, Object?>, Uint8List, Object?> userMetadataConverter = TypeConverter.jsonb(
   fromJson: (json) => json as Map<String, Object?>,
 );
diff --git a/mobile/lib/infrastructure/repositories/asset_face.repository.dart b/mobile/lib/infrastructure/repositories/asset_face.repository.dart
index a9ad753d84..7b3b97058b 100644
--- a/mobile/lib/infrastructure/repositories/asset_face.repository.dart
+++ b/mobile/lib/infrastructure/repositories/asset_face.repository.dart
@@ -8,10 +8,7 @@ class DriftAssetFaceRepository extends DriftDatabaseRepository {
   const DriftAssetFaceRepository(this._db) : super(_db);
 
   Future<List<AssetFace>> getAll() {
-    return _db.assetFaceEntity
-        .select()
-        .map((assetFace) => assetFace.toDto())
-        .get();
+    return _db.assetFaceEntity.select().map((assetFace) => assetFace.toDto()).get();
   }
 }
 
diff --git a/mobile/lib/infrastructure/repositories/backup.repository.dart b/mobile/lib/infrastructure/repositories/backup.repository.dart
index aed7118e5a..394bbfa299 100644
--- a/mobile/lib/infrastructure/repositories/backup.repository.dart
+++ b/mobile/lib/infrastructure/repositories/backup.repository.dart
@@ -25,8 +25,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
         ),
       ])
       ..where(
-        _db.localAlbumEntity.backupSelection
-            .equalsValue(BackupSelection.excluded),
+        _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.excluded),
       );
   }
 
@@ -41,10 +40,8 @@ class DriftBackupRepository extends DriftDatabaseRepository {
         ),
       ])
       ..where(
-        _db.localAlbumEntity.backupSelection
-                .equalsValue(BackupSelection.selected) &
-            _db.localAlbumAssetEntity.assetId
-                .isNotInQuery(_getExcludedSubquery()),
+        _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
+            _db.localAlbumAssetEntity.assetId.isNotInQuery(_getExcludedSubquery()),
       );
 
     return query.get().then((rows) => rows.length);
@@ -66,18 +63,14 @@ class DriftBackupRepository extends DriftDatabaseRepository {
         ),
         leftOuterJoin(
           _db.remoteAssetEntity,
-          _db.localAssetEntity.checksum
-              .equalsExp(_db.remoteAssetEntity.checksum),
+          _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
           useColumns: false,
         ),
       ])
       ..where(
-        _db.localAlbumEntity.backupSelection
-                .equalsValue(BackupSelection.selected) &
-            (_db.remoteAssetEntity.id.isNull() |
-                _db.remoteAssetEntity.ownerId.equals(userId).not()) &
-            _db.localAlbumAssetEntity.assetId
-                .isNotInQuery(_getExcludedSubquery()),
+        _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
+            (_db.remoteAssetEntity.id.isNull() | _db.remoteAssetEntity.ownerId.equals(userId).not()) &
+            _db.localAlbumAssetEntity.assetId.isNotInQuery(_getExcludedSubquery()),
       );
 
     return query.get().then((rows) => rows.length);
@@ -101,18 +94,15 @@ class DriftBackupRepository extends DriftDatabaseRepository {
         ),
         innerJoin(
           _db.remoteAssetEntity,
-          _db.localAssetEntity.checksum
-              .equalsExp(_db.remoteAssetEntity.checksum),
+          _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
           useColumns: false,
         ),
       ])
       ..where(
-        _db.localAlbumEntity.backupSelection
-                .equalsValue(BackupSelection.selected) &
+        _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
             _db.remoteAssetEntity.id.isNotNull() &
             _db.remoteAssetEntity.ownerId.equals(userId) &
-            _db.localAlbumAssetEntity.assetId
-                .isNotInQuery(_getExcludedSubquery()),
+            _db.localAlbumAssetEntity.assetId.isNotInQuery(_getExcludedSubquery()),
       );
 
     return query.get().then((rows) => rows.length);
@@ -122,8 +112,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
     final selectedAlbumIds = _db.localAlbumEntity.selectOnly(distinct: true)
       ..addColumns([_db.localAlbumEntity.id])
       ..where(
-        _db.localAlbumEntity.backupSelection
-            .equalsValue(BackupSelection.selected),
+        _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected),
       );
 
     final query = _db.localAssetEntity.select()
@@ -133,8 +122,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
               _db.localAlbumAssetEntity.selectOnly()
                 ..addColumns([_db.localAlbumAssetEntity.assetId])
                 ..where(
-                  _db.localAlbumAssetEntity.albumId
-                          .isInQuery(selectedAlbumIds) &
+                  _db.localAlbumAssetEntity.albumId.isInQuery(selectedAlbumIds) &
                       _db.localAlbumAssetEntity.assetId.equalsExp(lae.id),
                 ),
             ) &
diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/lib/infrastructure/repositories/db.repository.dart
index 5cbbb3b4f4..15fce4d649 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -107,8 +107,7 @@ class Drift extends $Drift implements IDatabaseRepository {
 
           if (kDebugMode) {
             // Fail if the migration broke foreign keys
-            final wrongFKs =
-                await customSelect('PRAGMA foreign_key_check').get();
+            final wrongFKs = await customSelect('PRAGMA foreign_key_check').get();
             assert(wrongFKs.isEmpty, '${wrongFKs.map((e) => e.data)}');
           }
 
@@ -127,6 +126,5 @@ class DriftDatabaseRepository implements IDatabaseRepository {
   const DriftDatabaseRepository(this._db);
 
   @override
-  Future<T> transaction<T>(Future<T> Function() callback) =>
-      _db.transaction(callback);
+  Future<T> transaction<T>(Future<T> Function() callback) => _db.transaction(callback);
 }
diff --git a/mobile/lib/infrastructure/repositories/db.repository.steps.dart b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
index 7f179fb5f0..57c90f731d 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -121,13 +121,12 @@ final class Schema2 extends i0.VersionedSchema {
         attachedDatabase: database,
       ),
       alias: null);
-  final i1.Index idxLocalAssetChecksum = i1.Index('idx_local_asset_checksum',
-      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
-  final i1.Index uQRemoteAssetOwnerChecksum = i1.Index(
-      'UQ_remote_asset_owner_checksum',
+  final i1.Index idxLocalAssetChecksum =
+      i1.Index('idx_local_asset_checksum', 'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  final i1.Index uQRemoteAssetOwnerChecksum = i1.Index('UQ_remote_asset_owner_checksum',
       'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
-  final i1.Index idxRemoteAssetChecksum = i1.Index('idx_remote_asset_checksum',
-      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  final i1.Index idxRemoteAssetChecksum =
+      i1.Index('idx_remote_asset_checksum', 'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
   late final Shape4 userMetadataEntity = Shape4(
       source: i0.VersionedTable(
         entityName: 'user_metadata_entity',
@@ -350,575 +349,376 @@ final class Schema2 extends i0.VersionedSchema {
 
 class Shape0 extends i0.VersionedTable {
   Shape0({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get name =>
-      columnsByName['name']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get isAdmin =>
-      columnsByName['is_admin']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<String> get email =>
-      columnsByName['email']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get profileImagePath =>
-      columnsByName['profile_image_path']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<DateTime> get updatedAt =>
-      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<int> get quotaSizeInBytes =>
-      columnsByName['quota_size_in_bytes']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get quotaUsageInBytes =>
-      columnsByName['quota_usage_in_bytes']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get id => columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name => columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isAdmin => columnsByName['is_admin']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get email => columnsByName['email']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get profileImagePath => columnsByName['profile_image_path']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get updatedAt => columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<int> get quotaSizeInBytes => columnsByName['quota_size_in_bytes']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get quotaUsageInBytes => columnsByName['quota_usage_in_bytes']! as i1.GeneratedColumn<int>;
 }
 
 i1.GeneratedColumn<String> _column_0(String aliasedName) =>
-    i1.GeneratedColumn<String>('id', aliasedName, false,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('id', aliasedName, false, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<String> _column_1(String aliasedName) =>
-    i1.GeneratedColumn<String>('name', aliasedName, false,
-        type: i1.DriftSqlType.string);
-i1.GeneratedColumn<bool> _column_2(String aliasedName) =>
-    i1.GeneratedColumn<bool>('is_admin', aliasedName, false,
-        type: i1.DriftSqlType.bool,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'CHECK ("is_admin" IN (0, 1))'),
-        defaultValue: const CustomExpression('0'));
+    i1.GeneratedColumn<String>('name', aliasedName, false, type: i1.DriftSqlType.string);
+i1.GeneratedColumn<bool> _column_2(String aliasedName) => i1.GeneratedColumn<bool>('is_admin', aliasedName, false,
+    type: i1.DriftSqlType.bool,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('CHECK ("is_admin" IN (0, 1))'),
+    defaultValue: const CustomExpression('0'));
 i1.GeneratedColumn<String> _column_3(String aliasedName) =>
-    i1.GeneratedColumn<String>('email', aliasedName, false,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('email', aliasedName, false, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<String> _column_4(String aliasedName) =>
-    i1.GeneratedColumn<String>('profile_image_path', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('profile_image_path', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<DateTime> _column_5(String aliasedName) =>
     i1.GeneratedColumn<DateTime>('updated_at', aliasedName, false,
-        type: i1.DriftSqlType.dateTime,
-        defaultValue: const CustomExpression('CURRENT_TIMESTAMP'));
+        type: i1.DriftSqlType.dateTime, defaultValue: const CustomExpression('CURRENT_TIMESTAMP'));
 i1.GeneratedColumn<int> _column_6(String aliasedName) =>
-    i1.GeneratedColumn<int>('quota_size_in_bytes', aliasedName, true,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('quota_size_in_bytes', aliasedName, true, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<int> _column_7(String aliasedName) =>
     i1.GeneratedColumn<int>('quota_usage_in_bytes', aliasedName, false,
         type: i1.DriftSqlType.int, defaultValue: const CustomExpression('0'));
 
 class Shape1 extends i0.VersionedTable {
   Shape1({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 checksum =>
-      columnsByName['checksum']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get isFavorite =>
-      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<String> get ownerId =>
-      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<DateTime> get localDateTime =>
-      columnsByName['local_date_time']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<String> get thumbHash =>
-      columnsByName['thumb_hash']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<DateTime> get deletedAt =>
-      columnsByName['deleted_at']! as i1.GeneratedColumn<DateTime>;
+  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 checksum => columnsByName['checksum']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isFavorite => columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get ownerId => columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get localDateTime => columnsByName['local_date_time']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<String> get thumbHash => columnsByName['thumb_hash']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get deletedAt => columnsByName['deleted_at']! as i1.GeneratedColumn<DateTime>;
   i1.GeneratedColumn<String> get livePhotoVideoId =>
       columnsByName['live_photo_video_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get visibility =>
-      columnsByName['visibility']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get stackId =>
-      columnsByName['stack_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get visibility => columnsByName['visibility']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get stackId => columnsByName['stack_id']! as i1.GeneratedColumn<String>;
 }
 
 i1.GeneratedColumn<int> _column_8(String aliasedName) =>
-    i1.GeneratedColumn<int>('type', aliasedName, false,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('type', aliasedName, false, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<DateTime> _column_9(String aliasedName) =>
     i1.GeneratedColumn<DateTime>('created_at', aliasedName, false,
-        type: i1.DriftSqlType.dateTime,
-        defaultValue: const CustomExpression('CURRENT_TIMESTAMP'));
+        type: i1.DriftSqlType.dateTime, defaultValue: const CustomExpression('CURRENT_TIMESTAMP'));
 i1.GeneratedColumn<int> _column_10(String aliasedName) =>
-    i1.GeneratedColumn<int>('width', aliasedName, true,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('width', aliasedName, true, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<int> _column_11(String aliasedName) =>
-    i1.GeneratedColumn<int>('height', aliasedName, true,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('height', aliasedName, true, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<int> _column_12(String aliasedName) =>
-    i1.GeneratedColumn<int>('duration_in_seconds', aliasedName, true,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('duration_in_seconds', aliasedName, true, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<String> _column_13(String aliasedName) =>
-    i1.GeneratedColumn<String>('checksum', aliasedName, false,
-        type: i1.DriftSqlType.string);
-i1.GeneratedColumn<bool> _column_14(String aliasedName) =>
-    i1.GeneratedColumn<bool>('is_favorite', aliasedName, false,
-        type: i1.DriftSqlType.bool,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'CHECK ("is_favorite" IN (0, 1))'),
-        defaultValue: const CustomExpression('0'));
-i1.GeneratedColumn<String> _column_15(String aliasedName) =>
-    i1.GeneratedColumn<String>('owner_id', aliasedName, false,
-        type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES user_entity (id) ON DELETE CASCADE'));
+    i1.GeneratedColumn<String>('checksum', aliasedName, false, type: i1.DriftSqlType.string);
+i1.GeneratedColumn<bool> _column_14(String aliasedName) => i1.GeneratedColumn<bool>('is_favorite', aliasedName, false,
+    type: i1.DriftSqlType.bool,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('CHECK ("is_favorite" IN (0, 1))'),
+    defaultValue: const CustomExpression('0'));
+i1.GeneratedColumn<String> _column_15(String aliasedName) => i1.GeneratedColumn<String>('owner_id', aliasedName, false,
+    type: i1.DriftSqlType.string,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('REFERENCES user_entity (id) ON DELETE CASCADE'));
 i1.GeneratedColumn<DateTime> _column_16(String aliasedName) =>
-    i1.GeneratedColumn<DateTime>('local_date_time', aliasedName, true,
-        type: i1.DriftSqlType.dateTime);
+    i1.GeneratedColumn<DateTime>('local_date_time', aliasedName, true, type: i1.DriftSqlType.dateTime);
 i1.GeneratedColumn<String> _column_17(String aliasedName) =>
-    i1.GeneratedColumn<String>('thumb_hash', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('thumb_hash', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<DateTime> _column_18(String aliasedName) =>
-    i1.GeneratedColumn<DateTime>('deleted_at', aliasedName, true,
-        type: i1.DriftSqlType.dateTime);
+    i1.GeneratedColumn<DateTime>('deleted_at', aliasedName, true, type: i1.DriftSqlType.dateTime);
 i1.GeneratedColumn<String> _column_19(String aliasedName) =>
-    i1.GeneratedColumn<String>('live_photo_video_id', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('live_photo_video_id', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<int> _column_20(String aliasedName) =>
-    i1.GeneratedColumn<int>('visibility', aliasedName, false,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('visibility', aliasedName, false, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<String> _column_21(String aliasedName) =>
-    i1.GeneratedColumn<String>('stack_id', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('stack_id', aliasedName, true, type: i1.DriftSqlType.string);
 
 class Shape2 extends i0.VersionedTable {
   Shape2({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 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> 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 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_22(String aliasedName) =>
-    i1.GeneratedColumn<String>('checksum', aliasedName, true,
-        type: i1.DriftSqlType.string);
-i1.GeneratedColumn<int> _column_23(String aliasedName) =>
-    i1.GeneratedColumn<int>('orientation', aliasedName, false,
-        type: i1.DriftSqlType.int, defaultValue: const CustomExpression('0'));
+    i1.GeneratedColumn<String>('checksum', aliasedName, true, type: i1.DriftSqlType.string);
+i1.GeneratedColumn<int> _column_23(String aliasedName) => i1.GeneratedColumn<int>('orientation', aliasedName, false,
+    type: i1.DriftSqlType.int, defaultValue: const CustomExpression('0'));
 
 class Shape3 extends i0.VersionedTable {
   Shape3({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  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<String> get ownerId =>
-      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get primaryAssetId =>
-      columnsByName['primary_asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get id => columnsByName['id']! as i1.GeneratedColumn<String>;
+  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<String> get ownerId => columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get primaryAssetId => columnsByName['primary_asset_id']! as i1.GeneratedColumn<String>;
 }
 
 i1.GeneratedColumn<String> _column_24(String aliasedName) =>
     i1.GeneratedColumn<String>('primary_asset_id', aliasedName, false,
         type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES remote_asset_entity (id)'));
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways('REFERENCES remote_asset_entity (id)'));
 
 class Shape4 extends i0.VersionedTable {
   Shape4({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get userId =>
-      columnsByName['user_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get key =>
-      columnsByName['key']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<i2.Uint8List> get value =>
-      columnsByName['value']! as i1.GeneratedColumn<i2.Uint8List>;
+  i1.GeneratedColumn<String> get userId => columnsByName['user_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get key => columnsByName['key']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<i2.Uint8List> get value => columnsByName['value']! as i1.GeneratedColumn<i2.Uint8List>;
 }
 
-i1.GeneratedColumn<String> _column_25(String aliasedName) =>
-    i1.GeneratedColumn<String>('user_id', aliasedName, false,
-        type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES user_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<String> _column_25(String aliasedName) => i1.GeneratedColumn<String>('user_id', aliasedName, false,
+    type: i1.DriftSqlType.string,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('REFERENCES user_entity (id) ON DELETE CASCADE'));
 i1.GeneratedColumn<int> _column_26(String aliasedName) =>
-    i1.GeneratedColumn<int>('key', aliasedName, false,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('key', aliasedName, false, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<i2.Uint8List> _column_27(String aliasedName) =>
-    i1.GeneratedColumn<i2.Uint8List>('value', aliasedName, false,
-        type: i1.DriftSqlType.blob);
+    i1.GeneratedColumn<i2.Uint8List>('value', aliasedName, false, type: i1.DriftSqlType.blob);
 
 class Shape5 extends i0.VersionedTable {
   Shape5({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get sharedById =>
-      columnsByName['shared_by_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get sharedWithId =>
-      columnsByName['shared_with_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get inTimeline =>
-      columnsByName['in_timeline']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get sharedById => columnsByName['shared_by_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get sharedWithId => columnsByName['shared_with_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get inTimeline => columnsByName['in_timeline']! as i1.GeneratedColumn<bool>;
 }
 
 i1.GeneratedColumn<String> _column_28(String aliasedName) =>
     i1.GeneratedColumn<String>('shared_by_id', aliasedName, false,
         type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES user_entity (id) ON DELETE CASCADE'));
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways('REFERENCES user_entity (id) ON DELETE CASCADE'));
 i1.GeneratedColumn<String> _column_29(String aliasedName) =>
     i1.GeneratedColumn<String>('shared_with_id', aliasedName, false,
         type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES user_entity (id) ON DELETE CASCADE'));
-i1.GeneratedColumn<bool> _column_30(String aliasedName) =>
-    i1.GeneratedColumn<bool>('in_timeline', aliasedName, false,
-        type: i1.DriftSqlType.bool,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'CHECK ("in_timeline" IN (0, 1))'),
-        defaultValue: const CustomExpression('0'));
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways('REFERENCES user_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<bool> _column_30(String aliasedName) => i1.GeneratedColumn<bool>('in_timeline', aliasedName, false,
+    type: i1.DriftSqlType.bool,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('CHECK ("in_timeline" IN (0, 1))'),
+    defaultValue: const CustomExpression('0'));
 
 class Shape6 extends i0.VersionedTable {
   Shape6({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get name =>
-      columnsByName['name']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<DateTime> get updatedAt =>
-      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<int> get backupSelection =>
-      columnsByName['backup_selection']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<bool> get isIosSharedAlbum =>
-      columnsByName['is_ios_shared_album']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<bool> get marker_ =>
-      columnsByName['marker']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get id => columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name => columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get updatedAt => columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<int> get backupSelection => columnsByName['backup_selection']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<bool> get isIosSharedAlbum => columnsByName['is_ios_shared_album']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<bool> get marker_ => columnsByName['marker']! as i1.GeneratedColumn<bool>;
 }
 
 i1.GeneratedColumn<int> _column_31(String aliasedName) =>
-    i1.GeneratedColumn<int>('backup_selection', aliasedName, false,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('backup_selection', aliasedName, false, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<bool> _column_32(String aliasedName) =>
     i1.GeneratedColumn<bool>('is_ios_shared_album', aliasedName, false,
         type: i1.DriftSqlType.bool,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'CHECK ("is_ios_shared_album" IN (0, 1))'),
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways('CHECK ("is_ios_shared_album" IN (0, 1))'),
         defaultValue: const CustomExpression('0'));
-i1.GeneratedColumn<bool> _column_33(String aliasedName) =>
-    i1.GeneratedColumn<bool>('marker', aliasedName, true,
-        type: i1.DriftSqlType.bool,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'CHECK ("marker" IN (0, 1))'));
+i1.GeneratedColumn<bool> _column_33(String aliasedName) => i1.GeneratedColumn<bool>('marker', aliasedName, true,
+    type: i1.DriftSqlType.bool,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('CHECK ("marker" IN (0, 1))'));
 
 class Shape7 extends i0.VersionedTable {
   Shape7({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get assetId =>
-      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get albumId =>
-      columnsByName['album_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get assetId => columnsByName['asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get albumId => columnsByName['album_id']! as i1.GeneratedColumn<String>;
 }
 
-i1.GeneratedColumn<String> _column_34(String aliasedName) =>
-    i1.GeneratedColumn<String>('asset_id', aliasedName, false,
-        type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES local_asset_entity (id) ON DELETE CASCADE'));
-i1.GeneratedColumn<String> _column_35(String aliasedName) =>
-    i1.GeneratedColumn<String>('album_id', aliasedName, false,
-        type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES local_album_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<String> _column_34(String aliasedName) => i1.GeneratedColumn<String>('asset_id', aliasedName, false,
+    type: i1.DriftSqlType.string,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('REFERENCES local_asset_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<String> _column_35(String aliasedName) => i1.GeneratedColumn<String>('album_id', aliasedName, false,
+    type: i1.DriftSqlType.string,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('REFERENCES local_album_entity (id) ON DELETE CASCADE'));
 
 class Shape8 extends i0.VersionedTable {
   Shape8({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get assetId =>
-      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get city =>
-      columnsByName['city']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get state =>
-      columnsByName['state']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get country =>
-      columnsByName['country']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get assetId => columnsByName['asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get city => columnsByName['city']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get state => columnsByName['state']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get country => columnsByName['country']! as i1.GeneratedColumn<String>;
   i1.GeneratedColumn<DateTime> get dateTimeOriginal =>
       columnsByName['date_time_original']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<String> get description =>
-      columnsByName['description']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get height =>
-      columnsByName['height']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get width =>
-      columnsByName['width']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get exposureTime =>
-      columnsByName['exposure_time']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<double> get fNumber =>
-      columnsByName['f_number']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<int> get fileSize =>
-      columnsByName['file_size']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<double> get focalLength =>
-      columnsByName['focal_length']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get latitude =>
-      columnsByName['latitude']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<double> get longitude =>
-      columnsByName['longitude']! as i1.GeneratedColumn<double>;
-  i1.GeneratedColumn<int> get iso =>
-      columnsByName['iso']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get make =>
-      columnsByName['make']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get model =>
-      columnsByName['model']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get lens =>
-      columnsByName['lens']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get orientation =>
-      columnsByName['orientation']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get timeZone =>
-      columnsByName['time_zone']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get rating =>
-      columnsByName['rating']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get projectionType =>
-      columnsByName['projection_type']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get description => columnsByName['description']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get height => columnsByName['height']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get width => columnsByName['width']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get exposureTime => columnsByName['exposure_time']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<double> get fNumber => columnsByName['f_number']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<int> get fileSize => columnsByName['file_size']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<double> get focalLength => columnsByName['focal_length']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get latitude => columnsByName['latitude']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<double> get longitude => columnsByName['longitude']! as i1.GeneratedColumn<double>;
+  i1.GeneratedColumn<int> get iso => columnsByName['iso']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get make => columnsByName['make']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get model => columnsByName['model']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get lens => columnsByName['lens']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get orientation => columnsByName['orientation']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get timeZone => columnsByName['time_zone']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get rating => columnsByName['rating']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get projectionType => columnsByName['projection_type']! as i1.GeneratedColumn<String>;
 }
 
-i1.GeneratedColumn<String> _column_36(String aliasedName) =>
-    i1.GeneratedColumn<String>('asset_id', aliasedName, false,
-        type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES remote_asset_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<String> _column_36(String aliasedName) => i1.GeneratedColumn<String>('asset_id', aliasedName, false,
+    type: i1.DriftSqlType.string,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('REFERENCES remote_asset_entity (id) ON DELETE CASCADE'));
 i1.GeneratedColumn<String> _column_37(String aliasedName) =>
-    i1.GeneratedColumn<String>('city', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('city', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<String> _column_38(String aliasedName) =>
-    i1.GeneratedColumn<String>('state', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('state', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<String> _column_39(String aliasedName) =>
-    i1.GeneratedColumn<String>('country', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('country', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<DateTime> _column_40(String aliasedName) =>
-    i1.GeneratedColumn<DateTime>('date_time_original', aliasedName, true,
-        type: i1.DriftSqlType.dateTime);
+    i1.GeneratedColumn<DateTime>('date_time_original', aliasedName, true, type: i1.DriftSqlType.dateTime);
 i1.GeneratedColumn<String> _column_41(String aliasedName) =>
-    i1.GeneratedColumn<String>('description', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('description', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<String> _column_42(String aliasedName) =>
-    i1.GeneratedColumn<String>('exposure_time', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('exposure_time', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<double> _column_43(String aliasedName) =>
-    i1.GeneratedColumn<double>('f_number', aliasedName, true,
-        type: i1.DriftSqlType.double);
+    i1.GeneratedColumn<double>('f_number', aliasedName, true, type: i1.DriftSqlType.double);
 i1.GeneratedColumn<int> _column_44(String aliasedName) =>
-    i1.GeneratedColumn<int>('file_size', aliasedName, true,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('file_size', aliasedName, true, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<double> _column_45(String aliasedName) =>
-    i1.GeneratedColumn<double>('focal_length', aliasedName, true,
-        type: i1.DriftSqlType.double);
+    i1.GeneratedColumn<double>('focal_length', aliasedName, true, type: i1.DriftSqlType.double);
 i1.GeneratedColumn<double> _column_46(String aliasedName) =>
-    i1.GeneratedColumn<double>('latitude', aliasedName, true,
-        type: i1.DriftSqlType.double);
+    i1.GeneratedColumn<double>('latitude', aliasedName, true, type: i1.DriftSqlType.double);
 i1.GeneratedColumn<double> _column_47(String aliasedName) =>
-    i1.GeneratedColumn<double>('longitude', aliasedName, true,
-        type: i1.DriftSqlType.double);
+    i1.GeneratedColumn<double>('longitude', aliasedName, true, type: i1.DriftSqlType.double);
 i1.GeneratedColumn<int> _column_48(String aliasedName) =>
-    i1.GeneratedColumn<int>('iso', aliasedName, true,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('iso', aliasedName, true, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<String> _column_49(String aliasedName) =>
-    i1.GeneratedColumn<String>('make', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('make', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<String> _column_50(String aliasedName) =>
-    i1.GeneratedColumn<String>('model', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('model', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<String> _column_51(String aliasedName) =>
-    i1.GeneratedColumn<String>('lens', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('lens', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<String> _column_52(String aliasedName) =>
-    i1.GeneratedColumn<String>('orientation', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('orientation', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<String> _column_53(String aliasedName) =>
-    i1.GeneratedColumn<String>('time_zone', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('time_zone', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<int> _column_54(String aliasedName) =>
-    i1.GeneratedColumn<int>('rating', aliasedName, true,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('rating', aliasedName, true, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<String> _column_55(String aliasedName) =>
-    i1.GeneratedColumn<String>('projection_type', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('projection_type', aliasedName, true, type: i1.DriftSqlType.string);
 
 class Shape9 extends i0.VersionedTable {
   Shape9({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get name =>
-      columnsByName['name']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get description =>
-      columnsByName['description']! as i1.GeneratedColumn<String>;
-  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<String> get ownerId =>
-      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get thumbnailAssetId =>
-      columnsByName['thumbnail_asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get isActivityEnabled =>
-      columnsByName['is_activity_enabled']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<int> get order =>
-      columnsByName['order']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get id => columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name => columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get description => columnsByName['description']! as i1.GeneratedColumn<String>;
+  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<String> get ownerId => columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get thumbnailAssetId => columnsByName['thumbnail_asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isActivityEnabled => columnsByName['is_activity_enabled']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<int> get order => columnsByName['order']! as i1.GeneratedColumn<int>;
 }
 
 i1.GeneratedColumn<String> _column_56(String aliasedName) =>
     i1.GeneratedColumn<String>('description', aliasedName, false,
-        type: i1.DriftSqlType.string,
-        defaultValue: const CustomExpression('\'\''));
+        type: i1.DriftSqlType.string, defaultValue: const CustomExpression('\'\''));
 i1.GeneratedColumn<String> _column_57(String aliasedName) =>
     i1.GeneratedColumn<String>('thumbnail_asset_id', aliasedName, true,
         type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES remote_asset_entity (id) ON DELETE SET NULL'));
+        defaultConstraints:
+            i1.GeneratedColumn.constraintIsAlways('REFERENCES remote_asset_entity (id) ON DELETE SET NULL'));
 i1.GeneratedColumn<bool> _column_58(String aliasedName) =>
     i1.GeneratedColumn<bool>('is_activity_enabled', aliasedName, false,
         type: i1.DriftSqlType.bool,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'CHECK ("is_activity_enabled" IN (0, 1))'),
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways('CHECK ("is_activity_enabled" IN (0, 1))'),
         defaultValue: const CustomExpression('1'));
 i1.GeneratedColumn<int> _column_59(String aliasedName) =>
-    i1.GeneratedColumn<int>('order', aliasedName, false,
-        type: i1.DriftSqlType.int);
-i1.GeneratedColumn<String> _column_60(String aliasedName) =>
-    i1.GeneratedColumn<String>('album_id', aliasedName, false,
-        type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
+    i1.GeneratedColumn<int>('order', aliasedName, false, type: i1.DriftSqlType.int);
+i1.GeneratedColumn<String> _column_60(String aliasedName) => i1.GeneratedColumn<String>('album_id', aliasedName, false,
+    type: i1.DriftSqlType.string,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
 
 class Shape10 extends i0.VersionedTable {
   Shape10({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get albumId =>
-      columnsByName['album_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get userId =>
-      columnsByName['user_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get role =>
-      columnsByName['role']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get albumId => columnsByName['album_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get userId => columnsByName['user_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get role => columnsByName['role']! as i1.GeneratedColumn<int>;
 }
 
 i1.GeneratedColumn<int> _column_61(String aliasedName) =>
-    i1.GeneratedColumn<int>('role', aliasedName, false,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('role', aliasedName, false, type: i1.DriftSqlType.int);
 
 class Shape11 extends i0.VersionedTable {
   Shape11({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  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<DateTime> get deletedAt =>
-      columnsByName['deleted_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<String> get ownerId =>
-      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get type =>
-      columnsByName['type']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get data =>
-      columnsByName['data']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get isSaved =>
-      columnsByName['is_saved']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<DateTime> get memoryAt =>
-      columnsByName['memory_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<DateTime> get seenAt =>
-      columnsByName['seen_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<DateTime> get showAt =>
-      columnsByName['show_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<DateTime> get hideAt =>
-      columnsByName['hide_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<String> get id => columnsByName['id']! as i1.GeneratedColumn<String>;
+  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<DateTime> get deletedAt => columnsByName['deleted_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<String> get ownerId => columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get type => columnsByName['type']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get data => columnsByName['data']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isSaved => columnsByName['is_saved']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<DateTime> get memoryAt => columnsByName['memory_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get seenAt => columnsByName['seen_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get showAt => columnsByName['show_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get hideAt => columnsByName['hide_at']! as i1.GeneratedColumn<DateTime>;
 }
 
 i1.GeneratedColumn<String> _column_62(String aliasedName) =>
-    i1.GeneratedColumn<String>('data', aliasedName, false,
-        type: i1.DriftSqlType.string);
-i1.GeneratedColumn<bool> _column_63(String aliasedName) =>
-    i1.GeneratedColumn<bool>('is_saved', aliasedName, false,
-        type: i1.DriftSqlType.bool,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'CHECK ("is_saved" IN (0, 1))'),
-        defaultValue: const CustomExpression('0'));
+    i1.GeneratedColumn<String>('data', aliasedName, false, type: i1.DriftSqlType.string);
+i1.GeneratedColumn<bool> _column_63(String aliasedName) => i1.GeneratedColumn<bool>('is_saved', aliasedName, false,
+    type: i1.DriftSqlType.bool,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('CHECK ("is_saved" IN (0, 1))'),
+    defaultValue: const CustomExpression('0'));
 i1.GeneratedColumn<DateTime> _column_64(String aliasedName) =>
-    i1.GeneratedColumn<DateTime>('memory_at', aliasedName, false,
-        type: i1.DriftSqlType.dateTime);
+    i1.GeneratedColumn<DateTime>('memory_at', aliasedName, false, type: i1.DriftSqlType.dateTime);
 i1.GeneratedColumn<DateTime> _column_65(String aliasedName) =>
-    i1.GeneratedColumn<DateTime>('seen_at', aliasedName, true,
-        type: i1.DriftSqlType.dateTime);
+    i1.GeneratedColumn<DateTime>('seen_at', aliasedName, true, type: i1.DriftSqlType.dateTime);
 i1.GeneratedColumn<DateTime> _column_66(String aliasedName) =>
-    i1.GeneratedColumn<DateTime>('show_at', aliasedName, true,
-        type: i1.DriftSqlType.dateTime);
+    i1.GeneratedColumn<DateTime>('show_at', aliasedName, true, type: i1.DriftSqlType.dateTime);
 i1.GeneratedColumn<DateTime> _column_67(String aliasedName) =>
-    i1.GeneratedColumn<DateTime>('hide_at', aliasedName, true,
-        type: i1.DriftSqlType.dateTime);
+    i1.GeneratedColumn<DateTime>('hide_at', aliasedName, true, type: i1.DriftSqlType.dateTime);
 
 class Shape12 extends i0.VersionedTable {
   Shape12({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get assetId =>
-      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get memoryId =>
-      columnsByName['memory_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get assetId => columnsByName['asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get memoryId => columnsByName['memory_id']! as i1.GeneratedColumn<String>;
 }
 
-i1.GeneratedColumn<String> _column_68(String aliasedName) =>
-    i1.GeneratedColumn<String>('memory_id', aliasedName, false,
-        type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES memory_entity (id) ON DELETE CASCADE'));
+i1.GeneratedColumn<String> _column_68(String aliasedName) => i1.GeneratedColumn<String>('memory_id', aliasedName, false,
+    type: i1.DriftSqlType.string,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('REFERENCES memory_entity (id) ON DELETE CASCADE'));
 
 class Shape13 extends i0.VersionedTable {
   Shape13({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  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<String> get ownerId =>
-      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get name =>
-      columnsByName['name']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get faceAssetId =>
-      columnsByName['face_asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get thumbnailPath =>
-      columnsByName['thumbnail_path']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get isFavorite =>
-      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<bool> get isHidden =>
-      columnsByName['is_hidden']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<String> get color =>
-      columnsByName['color']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<DateTime> get birthDate =>
-      columnsByName['birth_date']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<String> get id => columnsByName['id']! as i1.GeneratedColumn<String>;
+  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<String> get ownerId => columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name => columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get faceAssetId => columnsByName['face_asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get thumbnailPath => columnsByName['thumbnail_path']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isFavorite => columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<bool> get isHidden => columnsByName['is_hidden']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get color => columnsByName['color']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get birthDate => columnsByName['birth_date']! as i1.GeneratedColumn<DateTime>;
 }
 
 i1.GeneratedColumn<String> _column_69(String aliasedName) =>
-    i1.GeneratedColumn<String>('face_asset_id', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('face_asset_id', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<String> _column_70(String aliasedName) =>
-    i1.GeneratedColumn<String>('thumbnail_path', aliasedName, false,
-        type: i1.DriftSqlType.string);
-i1.GeneratedColumn<bool> _column_71(String aliasedName) =>
-    i1.GeneratedColumn<bool>('is_favorite', aliasedName, false,
-        type: i1.DriftSqlType.bool,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'CHECK ("is_favorite" IN (0, 1))'));
-i1.GeneratedColumn<bool> _column_72(String aliasedName) =>
-    i1.GeneratedColumn<bool>('is_hidden', aliasedName, false,
-        type: i1.DriftSqlType.bool,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'CHECK ("is_hidden" IN (0, 1))'));
+    i1.GeneratedColumn<String>('thumbnail_path', aliasedName, false, type: i1.DriftSqlType.string);
+i1.GeneratedColumn<bool> _column_71(String aliasedName) => i1.GeneratedColumn<bool>('is_favorite', aliasedName, false,
+    type: i1.DriftSqlType.bool,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('CHECK ("is_favorite" IN (0, 1))'));
+i1.GeneratedColumn<bool> _column_72(String aliasedName) => i1.GeneratedColumn<bool>('is_hidden', aliasedName, false,
+    type: i1.DriftSqlType.bool,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('CHECK ("is_hidden" IN (0, 1))'));
 i1.GeneratedColumn<String> _column_73(String aliasedName) =>
-    i1.GeneratedColumn<String>('color', aliasedName, true,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('color', aliasedName, true, type: i1.DriftSqlType.string);
 i1.GeneratedColumn<DateTime> _column_74(String aliasedName) =>
-    i1.GeneratedColumn<DateTime>('birth_date', aliasedName, true,
-        type: i1.DriftSqlType.dateTime);
+    i1.GeneratedColumn<DateTime>('birth_date', aliasedName, true, type: i1.DriftSqlType.dateTime);
 
 final class Schema3 extends i0.VersionedSchema {
   Schema3({required super.database}) : super(version: 3);
@@ -1036,13 +836,12 @@ final class Schema3 extends i0.VersionedSchema {
         attachedDatabase: database,
       ),
       alias: null);
-  final i1.Index idxLocalAssetChecksum = i1.Index('idx_local_asset_checksum',
-      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
-  final i1.Index uQRemoteAssetOwnerChecksum = i1.Index(
-      'UQ_remote_asset_owner_checksum',
+  final i1.Index idxLocalAssetChecksum =
+      i1.Index('idx_local_asset_checksum', 'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  final i1.Index uQRemoteAssetOwnerChecksum = i1.Index('UQ_remote_asset_owner_checksum',
       'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
-  final i1.Index idxRemoteAssetChecksum = i1.Index('idx_remote_asset_checksum',
-      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  final i1.Index idxRemoteAssetChecksum =
+      i1.Index('idx_remote_asset_checksum', 'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
   late final Shape4 userMetadataEntity = Shape4(
       source: i0.VersionedTable(
         entityName: 'user_metadata_entity',
@@ -1264,8 +1063,7 @@ final class Schema3 extends i0.VersionedSchema {
 }
 
 i1.GeneratedColumn<String> _column_75(String aliasedName) =>
-    i1.GeneratedColumn<String>('primary_asset_id', aliasedName, false,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('primary_asset_id', aliasedName, false, type: i1.DriftSqlType.string);
 
 final class Schema4 extends i0.VersionedSchema {
   Schema4({required super.database}) : super(version: 4);
@@ -1418,13 +1216,12 @@ final class Schema4 extends i0.VersionedSchema {
         attachedDatabase: database,
       ),
       alias: null);
-  final i1.Index idxLocalAssetChecksum = i1.Index('idx_local_asset_checksum',
-      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
-  final i1.Index uQRemoteAssetOwnerChecksum = i1.Index(
-      'UQ_remote_asset_owner_checksum',
+  final i1.Index idxLocalAssetChecksum =
+      i1.Index('idx_local_asset_checksum', 'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  final i1.Index uQRemoteAssetOwnerChecksum = i1.Index('UQ_remote_asset_owner_checksum',
       'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
-  final i1.Index idxRemoteAssetChecksum = i1.Index('idx_remote_asset_checksum',
-      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  final i1.Index idxRemoteAssetChecksum =
+      i1.Index('idx_remote_asset_checksum', 'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
   late final Shape4 userMetadataEntity = Shape4(
       source: i0.VersionedTable(
         entityName: 'user_metadata_entity',
@@ -1635,78 +1432,49 @@ final class Schema4 extends i0.VersionedSchema {
 
 class Shape14 extends i0.VersionedTable {
   Shape14({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  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<String> get ownerId =>
-      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get name =>
-      columnsByName['name']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get faceAssetId =>
-      columnsByName['face_asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get isFavorite =>
-      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<bool> get isHidden =>
-      columnsByName['is_hidden']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<String> get color =>
-      columnsByName['color']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<DateTime> get birthDate =>
-      columnsByName['birth_date']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<String> get id => columnsByName['id']! as i1.GeneratedColumn<String>;
+  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<String> get ownerId => columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name => columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get faceAssetId => columnsByName['face_asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isFavorite => columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<bool> get isHidden => columnsByName['is_hidden']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get color => columnsByName['color']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get birthDate => columnsByName['birth_date']! as i1.GeneratedColumn<DateTime>;
 }
 
 class Shape15 extends i0.VersionedTable {
   Shape15({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get assetId =>
-      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get personId =>
-      columnsByName['person_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get imageWidth =>
-      columnsByName['image_width']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get imageHeight =>
-      columnsByName['image_height']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get boundingBoxX1 =>
-      columnsByName['bounding_box_x1']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get boundingBoxY1 =>
-      columnsByName['bounding_box_y1']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get boundingBoxX2 =>
-      columnsByName['bounding_box_x2']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get boundingBoxY2 =>
-      columnsByName['bounding_box_y2']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get sourceType =>
-      columnsByName['source_type']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get id => columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get assetId => columnsByName['asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get personId => columnsByName['person_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get imageWidth => columnsByName['image_width']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get imageHeight => columnsByName['image_height']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxX1 => columnsByName['bounding_box_x1']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxY1 => columnsByName['bounding_box_y1']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxX2 => columnsByName['bounding_box_x2']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxY2 => columnsByName['bounding_box_y2']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get sourceType => columnsByName['source_type']! as i1.GeneratedColumn<String>;
 }
 
-i1.GeneratedColumn<String> _column_76(String aliasedName) =>
-    i1.GeneratedColumn<String>('person_id', aliasedName, true,
-        type: i1.DriftSqlType.string,
-        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
-            'REFERENCES person_entity (id) ON DELETE SET NULL'));
+i1.GeneratedColumn<String> _column_76(String aliasedName) => i1.GeneratedColumn<String>('person_id', aliasedName, true,
+    type: i1.DriftSqlType.string,
+    defaultConstraints: i1.GeneratedColumn.constraintIsAlways('REFERENCES person_entity (id) ON DELETE SET NULL'));
 i1.GeneratedColumn<int> _column_77(String aliasedName) =>
-    i1.GeneratedColumn<int>('image_width', aliasedName, false,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('image_width', aliasedName, false, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<int> _column_78(String aliasedName) =>
-    i1.GeneratedColumn<int>('image_height', aliasedName, false,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('image_height', aliasedName, false, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<int> _column_79(String aliasedName) =>
-    i1.GeneratedColumn<int>('bounding_box_x1', aliasedName, false,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('bounding_box_x1', aliasedName, false, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<int> _column_80(String aliasedName) =>
-    i1.GeneratedColumn<int>('bounding_box_y1', aliasedName, false,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('bounding_box_y1', aliasedName, false, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<int> _column_81(String aliasedName) =>
-    i1.GeneratedColumn<int>('bounding_box_x2', aliasedName, false,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('bounding_box_x2', aliasedName, false, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<int> _column_82(String aliasedName) =>
-    i1.GeneratedColumn<int>('bounding_box_y2', aliasedName, false,
-        type: i1.DriftSqlType.int);
+    i1.GeneratedColumn<int>('bounding_box_y2', aliasedName, false, type: i1.DriftSqlType.int);
 i1.GeneratedColumn<String> _column_83(String aliasedName) =>
-    i1.GeneratedColumn<String>('source_type', aliasedName, false,
-        type: i1.DriftSqlType.string);
+    i1.GeneratedColumn<String>('source_type', 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,
diff --git a/mobile/lib/infrastructure/repositories/device_asset.repository.dart b/mobile/lib/infrastructure/repositories/device_asset.repository.dart
index 4e72d4a7f6..73ee148ab3 100644
--- a/mobile/lib/infrastructure/repositories/device_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/device_asset.repository.dart
@@ -24,8 +24,7 @@ class IsarDeviceAssetRepository extends IsarDatabaseRepository {
 
   Future<bool> updateAll(List<DeviceAsset> assetHash) {
     return transaction(() async {
-      await _db.deviceAssetEntitys
-          .putAll(assetHash.map(DeviceAssetEntity.fromDto).toList());
+      await _db.deviceAssetEntitys.putAll(assetHash.map(DeviceAssetEntity.fromDto).toList());
       return true;
     });
   }
diff --git a/mobile/lib/infrastructure/repositories/exif.repository.dart b/mobile/lib/infrastructure/repositories/exif.repository.dart
index 0012e329ca..726e51b77d 100644
--- a/mobile/lib/infrastructure/repositories/exif.repository.dart
+++ b/mobile/lib/infrastructure/repositories/exif.repository.dart
@@ -1,6 +1,5 @@
 import 'package:immich_mobile/domain/models/exif.model.dart';
-import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
-    as entity;
+import 'package:immich_mobile/infrastructure/entities/exif.entity.dart' as entity;
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:isar/isar.dart';
 
diff --git a/mobile/lib/infrastructure/repositories/local_album.repository.dart b/mobile/lib/infrastructure/repositories/local_album.repository.dart
index 16c363b839..c1e5724b4c 100644
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -8,13 +8,7 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/utils/database.utils.dart';
 import 'package:platform/platform.dart';
 
-enum SortLocalAlbumsBy {
-  id,
-  backupSelection,
-  isIosSharedAlbum,
-  name,
-  assetCount
-}
+enum SortLocalAlbumsBy { id, backupSelection, isIosSharedAlbum, name, assetCount }
 
 class DriftLocalAlbumRepository extends DriftDatabaseRepository {
   final Drift _db;
@@ -43,12 +37,9 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
         orderings.add(
           switch (sort) {
             SortLocalAlbumsBy.id => OrderingTerm.asc(_db.localAlbumEntity.id),
-            SortLocalAlbumsBy.backupSelection =>
-              OrderingTerm.asc(_db.localAlbumEntity.backupSelection),
-            SortLocalAlbumsBy.isIosSharedAlbum =>
-              OrderingTerm.asc(_db.localAlbumEntity.isIosSharedAlbum),
-            SortLocalAlbumsBy.name =>
-              OrderingTerm.asc(_db.localAlbumEntity.name),
+            SortLocalAlbumsBy.backupSelection => OrderingTerm.asc(_db.localAlbumEntity.backupSelection),
+            SortLocalAlbumsBy.isIosSharedAlbum => OrderingTerm.asc(_db.localAlbumEntity.isIosSharedAlbum),
+            SortLocalAlbumsBy.name => OrderingTerm.asc(_db.localAlbumEntity.name),
             SortLocalAlbumsBy.assetCount => OrderingTerm.desc(assetCount),
           },
         );
@@ -58,9 +49,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
 
     return query
         .map(
-          (row) => row
-              .readTable(_db.localAlbumEntity)
-              .toDto(assetCount: row.read(assetCount) ?? 0),
+          (row) => row.readTable(_db.localAlbumEntity).toDto(assetCount: row.read(assetCount) ?? 0),
         )
         .get();
   }
@@ -69,15 +58,11 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
         // Remove all assets that are only in this particular album
         // We cannot remove all assets in the album because they might be in other albums in iOS
         // That is not the case on Android since asset <-> album has one:one mapping
-        final assetsToDelete = _platform.isIOS
-            ? await _getUniqueAssetsInAlbum(albumId)
-            : await getAssetIds(albumId);
+        final assetsToDelete = _platform.isIOS ? await _getUniqueAssetsInAlbum(albumId) : await getAssetIds(albumId);
         await _deleteAssets(assetsToDelete);
 
         // All the other assets that are still associated will be unlinked automatically on-cascade
-        await _db.managers.localAlbumEntity
-            .filter((a) => a.id.equals(albumId))
-            .delete();
+        await _db.managers.localAlbumEntity.filter((a) => a.id.equals(albumId)).delete();
       });
 
   Future<void> syncDeletes(
@@ -95,13 +80,11 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
         ..join([
           innerJoin(
             _db.localAlbumEntity,
-            _db.localAlbumAssetEntity.albumId
-                .equalsExp(_db.localAlbumEntity.id),
+            _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
           ),
         ]);
       subQuery.where(
-        _db.localAlbumEntity.id.equals(albumId) &
-            _db.localAlbumAssetEntity.assetId.isNotIn(assetIdsToKeep),
+        _db.localAlbumEntity.id.equals(albumId) & _db.localAlbumAssetEntity.assetId.isNotIn(assetIdsToKeep),
       );
       return localAsset.id.isInQuery(subQuery);
     });
@@ -122,8 +105,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
     );
 
     return _db.transaction(() async {
-      await _db.localAlbumEntity
-          .insertOne(companion, onConflict: DoUpdate((_) => companion));
+      await _db.localAlbumEntity.insertOne(companion, onConflict: DoUpdate((_) => companion));
       if (toUpsert.isNotEmpty) {
         await _upsertAssets(toUpsert);
         await _db.localAlbumAssetEntity.insertAll(
@@ -142,9 +124,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
 
   Future<void> updateAll(Iterable<LocalAlbum> albums) {
     return _db.transaction(() async {
-      await _db.localAlbumEntity
-          .update()
-          .write(const LocalAlbumEntityCompanion(marker_: Value(true)));
+      await _db.localAlbumEntity.update().write(const LocalAlbumEntityCompanion(marker_: Value(true)));
 
       await _db.batch((batch) {
         for (final album in albums) {
@@ -184,8 +164,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
             ..join([
               innerJoin(
                 _db.localAlbumEntity,
-                _db.localAlbumAssetEntity.albumId
-                    .equalsExp(_db.localAlbumEntity.id),
+                _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
               ),
             ]);
           subQuery.where(_db.localAlbumEntity.marker_.isNotNull());
@@ -209,18 +188,14 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
     )
       ..where(_db.localAlbumAssetEntity.albumId.equals(albumId))
       ..orderBy([OrderingTerm.asc(_db.localAssetEntity.id)]);
-    return query
-        .map((row) => row.readTable(_db.localAssetEntity).toDto())
-        .get();
+    return query.map((row) => row.readTable(_db.localAssetEntity).toDto()).get();
   }
 
   Future<List<String>> getAssetIds(String albumId) {
     final query = _db.localAlbumAssetEntity.selectOnly()
       ..addColumns([_db.localAlbumAssetEntity.assetId])
       ..where(_db.localAlbumAssetEntity.albumId.equals(albumId));
-    return query
-        .map((row) => row.read(_db.localAlbumAssetEntity.assetId)!)
-        .get();
+    return query.map((row) => row.read(_db.localAlbumAssetEntity.assetId)!).get();
   }
 
   Future<void> processDelta({
@@ -240,9 +215,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
         assetAlbums.cast<String, List<Object?>>().forEach((assetId, albumIds) {
           batch.deleteWhere(
             _db.localAlbumAssetEntity,
-            (f) =>
-                f.albumId.isNotIn(albumIds.cast<String?>().nonNulls) &
-                f.assetId.equals(assetId),
+            (f) => f.albumId.isNotIn(albumIds.cast<String?>().nonNulls) & f.assetId.equals(assetId),
           );
         });
       });
@@ -273,14 +246,11 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
       ],
     )
       ..where(
-        _db.localAlbumAssetEntity.albumId.equals(albumId) &
-            _db.localAssetEntity.checksum.isNull(),
+        _db.localAlbumAssetEntity.albumId.equals(albumId) & _db.localAssetEntity.checksum.isNull(),
       )
       ..orderBy([OrderingTerm.asc(_db.localAssetEntity.id)]);
 
-    return query
-        .map((row) => row.readTable(_db.localAssetEntity).toDto())
-        .get();
+    return query.map((row) => row.readTable(_db.localAssetEntity).toDto()).get();
   }
 
   Future<void> _upsertAssets(Iterable<LocalAsset> localAssets) {
@@ -364,8 +334,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
       ..addColumns([assetId])
       ..groupBy(
         [assetId],
-        having: _db.localAlbumAssetEntity.albumId.count().equals(1) &
-            _db.localAlbumAssetEntity.albumId.equals(albumId),
+        having: _db.localAlbumAssetEntity.albumId.count().equals(1) & _db.localAlbumAssetEntity.albumId.equals(albumId),
       );
 
     return query.map((row) => row.read(assetId)!).get();
@@ -392,9 +361,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
       ..orderBy([OrderingTerm.asc(_db.localAssetEntity.id)])
       ..limit(1);
 
-    final results = await query
-        .map((row) => row.readTable(_db.localAssetEntity).toDto())
-        .get();
+    final results = await query.map((row) => row.readTable(_db.localAssetEntity).toDto()).get();
 
     return results.isNotEmpty ? results.first : null;
   }
diff --git a/mobile/lib/infrastructure/repositories/local_asset.repository.dart b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
index bf1ec37615..17521e1cba 100644
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -10,9 +10,7 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
   const DriftLocalAssetRepository(this._db) : super(_db);
 
   Stream<LocalAsset?> watchAsset(String id) {
-    final query = _db.localAssetEntity
-        .select()
-        .addColumns([_db.remoteAssetEntity.id]).join([
+    final query = _db.localAssetEntity.select().addColumns([_db.remoteAssetEntity.id]).join([
       leftOuterJoin(
         _db.remoteAssetEntity,
         _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
@@ -58,8 +56,7 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
   }
 
   Future<LocalAsset?> getById(String id) {
-    final query = _db.localAssetEntity.select()
-      ..where((lae) => lae.id.equals(id));
+    final query = _db.localAssetEntity.select()..where((lae) => lae.id.equals(id));
 
     return query.map((row) => row.toDto()).getSingleOrNull();
   }
@@ -69,8 +66,6 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
   }
 
   Future<int> getHashedCount() {
-    return _db.managers.localAssetEntity
-        .filter((e) => e.checksum.isNull().not())
-        .count();
+    return _db.managers.localAssetEntity.filter((e) => e.checksum.isNull().not()).count();
   }
 }
diff --git a/mobile/lib/infrastructure/repositories/log.repository.dart b/mobile/lib/infrastructure/repositories/log.repository.dart
index 717900910a..7a909d90cb 100644
--- a/mobile/lib/infrastructure/repositories/log.repository.dart
+++ b/mobile/lib/infrastructure/repositories/log.repository.dart
@@ -13,8 +13,7 @@ class IsarLogRepository extends IsarDatabaseRepository {
   }
 
   Future<List<LogMessage>> getAll() async {
-    final logs =
-        await _db.loggerMessages.where().sortByCreatedAtDesc().findAll();
+    final logs = await _db.loggerMessages.where().sortByCreatedAtDesc().findAll();
     return logs.map((l) => l.toDto()).toList();
   }
 
@@ -28,8 +27,7 @@ class IsarLogRepository extends IsarDatabaseRepository {
 
   Future<bool> insertAll(Iterable<LogMessage> logs) async {
     await transaction(() async {
-      final logEntities =
-          logs.map((log) => LoggerMessage.fromDto(log)).toList();
+      final logEntities = logs.map((log) => LoggerMessage.fromDto(log)).toList();
       await _db.loggerMessages.putAll(logEntities);
     });
     return true;
diff --git a/mobile/lib/infrastructure/repositories/memory.repository.dart b/mobile/lib/infrastructure/repositories/memory.repository.dart
index 8582290c61..b964557952 100644
--- a/mobile/lib/infrastructure/repositories/memory.repository.dart
+++ b/mobile/lib/infrastructure/repositories/memory.repository.dart
@@ -22,8 +22,7 @@ class DriftMemoryRepository extends DriftDatabaseRepository {
         _db.remoteAssetEntity,
         _db.remoteAssetEntity.id.equalsExp(_db.memoryAssetEntity.assetId) &
             _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline),
+            _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline),
       ),
     ])
       ..where(_db.memoryEntity.ownerId.equals(ownerId))
diff --git a/mobile/lib/infrastructure/repositories/partner.repository.dart b/mobile/lib/infrastructure/repositories/partner.repository.dart
index b3b057b035..9e78b1b65a 100644
--- a/mobile/lib/infrastructure/repositories/partner.repository.dart
+++ b/mobile/lib/infrastructure/repositories/partner.repository.dart
@@ -32,8 +32,7 @@ class DriftPartnerRepository extends DriftDatabaseRepository {
 
   // Get users who we can share our library with
   Future<List<PartnerUserDto>> getAvailablePartners(String currentUserId) {
-    final query = _db.select(_db.userEntity)
-      ..where((row) => row.id.equals(currentUserId).not());
+    final query = _db.select(_db.userEntity)..where((row) => row.id.equals(currentUserId).not());
 
     return query.map((user) {
       return PartnerUserDto(
@@ -95,20 +94,15 @@ class DriftPartnerRepository extends DriftDatabaseRepository {
 
   Future<List<String>> getAllPartnerIds(String userId) async {
     // Get users who are sharing with me (sharedWithId = userId)
-    final sharingWithMeQuery = _db.select(_db.partnerEntity)
-      ..where((tbl) => tbl.sharedWithId.equals(userId));
-    final sharingWithMe =
-        await sharingWithMeQuery.map((row) => row.sharedById).get();
+    final sharingWithMeQuery = _db.select(_db.partnerEntity)..where((tbl) => tbl.sharedWithId.equals(userId));
+    final sharingWithMe = await sharingWithMeQuery.map((row) => row.sharedById).get();
 
     // Get users who I am sharing with (sharedById = userId)
-    final sharingWithThemQuery = _db.select(_db.partnerEntity)
-      ..where((tbl) => tbl.sharedById.equals(userId));
-    final sharingWithThem =
-        await sharingWithThemQuery.map((row) => row.sharedWithId).get();
+    final sharingWithThemQuery = _db.select(_db.partnerEntity)..where((tbl) => tbl.sharedById.equals(userId));
+    final sharingWithThem = await sharingWithThemQuery.map((row) => row.sharedWithId).get();
 
     // Combine both lists and remove duplicates
-    final allPartnerIds =
-        <String>{...sharingWithMe, ...sharingWithThem}.toList();
+    final allPartnerIds = <String>{...sharingWithMe, ...sharingWithThem}.toList();
     return allPartnerIds;
   }
 
@@ -120,8 +114,7 @@ class DriftPartnerRepository extends DriftDatabaseRepository {
       ),
     ])
       ..where(
-        _db.partnerEntity.sharedById.equals(partnerId) &
-            _db.partnerEntity.sharedWithId.equals(userId),
+        _db.partnerEntity.sharedById.equals(partnerId) & _db.partnerEntity.sharedWithId.equals(userId),
       );
 
     return query.map((row) {
diff --git a/mobile/lib/infrastructure/repositories/person.repository.dart b/mobile/lib/infrastructure/repositories/person.repository.dart
index fa336c5480..045fab4942 100644
--- a/mobile/lib/infrastructure/repositories/person.repository.dart
+++ b/mobile/lib/infrastructure/repositories/person.repository.dart
@@ -8,8 +8,7 @@ class DriftPersonRepository extends DriftDatabaseRepository {
   const DriftPersonRepository(this._db) : super(_db);
 
   Future<List<Person>> getAll(String userId) {
-    final query = _db.personEntity.select()
-      ..where((e) => e.ownerId.equals(userId));
+    final query = _db.personEntity.select()..where((e) => e.ownerId.equals(userId));
 
     return query.map((person) {
       return person.toDto();
diff --git a/mobile/lib/infrastructure/repositories/remote_album.repository.dart b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
index ca8dc2cfd5..2d7bbe2370 100644
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -50,8 +50,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
         orderings.add(
           switch (sort) {
             SortRemoteAlbumsBy.id => OrderingTerm.asc(_db.remoteAlbumEntity.id),
-            SortRemoteAlbumsBy.updatedAt =>
-              OrderingTerm.desc(_db.remoteAlbumEntity.updatedAt),
+            SortRemoteAlbumsBy.updatedAt => OrderingTerm.desc(_db.remoteAlbumEntity.updatedAt),
           },
         );
       }
@@ -137,8 +136,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
       ..join([
         innerJoin(
           _db.remoteAssetEntity,
-          _db.remoteAssetEntity.id
-              .equalsExp(_db.remoteAlbumAssetEntity.assetId),
+          _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId),
         ),
       ]);
 
@@ -150,9 +148,8 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
   }
 
   Future<List<UserDto>> getSharedUsers(String albumId) async {
-    final albumUserRows = await (_db.select(_db.remoteAlbumUserEntity)
-          ..where((row) => row.albumId.equals(albumId)))
-        .get();
+    final albumUserRows =
+        await (_db.select(_db.remoteAlbumUserEntity)..where((row) => row.albumId.equals(albumId))).get();
 
     if (albumUserRows.isEmpty) {
       return [];
@@ -166,9 +163,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
             id: user.id,
             email: user.email,
             name: user.name,
-            profileImagePath: user.profileImagePath?.isEmpty == true
-                ? null
-                : user.profileImagePath,
+            profileImagePath: user.profileImagePath?.isEmpty == true ? null : user.profileImagePath,
             isAdmin: user.isAdmin,
             updatedAt: user.updatedAt,
             quotaSizeInBytes: user.quotaSizeInBytes ?? 0,
@@ -191,9 +186,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
     ])
       ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId));
 
-    return query
-        .map((row) => row.readTable(_db.remoteAssetEntity).toDto())
-        .get();
+    return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
   }
 
   Future<int> addAssets(String albumId, List<String> assetIds) async {
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index c3b15efb83..af1249dc03 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -2,8 +2,7 @@ import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/domain/models/stack.model.dart';
-import 'package:immich_mobile/infrastructure/entities/exif.entity.dart'
-    hide ExifInfo;
+import 'package:immich_mobile/infrastructure/entities/exif.entity.dart' hide ExifInfo;
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
@@ -22,8 +21,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
         (row) =>
             _db.remoteAssetEntity.ownerId.equals(userId) &
             _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline),
+            _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline),
       )
       ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
       ..limit(10);
@@ -57,8 +55,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
 
     final query = _db.remoteAssetEntity.select()
       ..where(
-        (row) =>
-            row.stackId.equals(asset.stackId!) & row.id.equals(asset.id).not(),
+        (row) => row.stackId.equals(asset.stackId!) & row.id.equals(asset.id).not(),
       )
       ..orderBy([(row) => OrderingTerm.desc(row.createdAt)]);
 
@@ -74,16 +71,14 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
 
   Future<List<(String, String)>> getPlaces() {
     final asset = Subquery(
-      _db.remoteAssetEntity.select()
-        ..orderBy([(row) => OrderingTerm.desc(row.createdAt)]),
+      _db.remoteAssetEntity.select()..orderBy([(row) => OrderingTerm.desc(row.createdAt)]),
       "asset",
     );
 
     final query = asset.selectOnly().join([
       innerJoin(
         _db.remoteExifEntity,
-        _db.remoteExifEntity.assetId
-            .equalsExp(asset.ref(_db.remoteAssetEntity.id)),
+        _db.remoteExifEntity.assetId.equalsExp(asset.ref(_db.remoteAssetEntity.id)),
         useColumns: false,
       ),
     ])
@@ -94,9 +89,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
       ..where(
         _db.remoteExifEntity.city.isNotNull() &
             asset.ref(_db.remoteAssetEntity.deletedAt).isNull() &
-            asset
-                .ref(_db.remoteAssetEntity.visibility)
-                .equals(AssetVisibility.timeline.index),
+            asset.ref(_db.remoteAssetEntity.visibility).equals(AssetVisibility.timeline.index),
       )
       ..groupBy([_db.remoteExifEntity.city])
       ..orderBy([OrderingTerm.asc(_db.remoteExifEntity.city)]);
diff --git a/mobile/lib/infrastructure/repositories/search_api.repository.dart b/mobile/lib/infrastructure/repositories/search_api.repository.dart
index 55604b885c..441219a02f 100644
--- a/mobile/lib/infrastructure/repositories/search_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/search_api.repository.dart
@@ -1,5 +1,4 @@
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart'
-    hide AssetVisibility;
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart' hide AssetVisibility;
 import 'package:immich_mobile/infrastructure/repositories/api.repository.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:openapi/api.dart';
@@ -28,9 +27,7 @@ class SearchApiRepository extends ApiRepository {
           model: filter.camera.model,
           takenAfter: filter.date.takenAfter,
           takenBefore: filter.date.takenBefore,
-          visibility: filter.display.isArchive
-              ? AssetVisibility.archive
-              : AssetVisibility.timeline,
+          visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
           isFavorite: filter.display.isFavorite ? true : null,
           isNotInAlbum: filter.display.isNotInAlbum ? true : null,
           personIds: filter.people.map((e) => e.id).toList(),
@@ -43,23 +40,16 @@ class SearchApiRepository extends ApiRepository {
 
     return _api.searchAssets(
       MetadataSearchDto(
-        originalFileName: filter.filename != null && filter.filename!.isNotEmpty
-            ? filter.filename
-            : null,
+        originalFileName: filter.filename != null && filter.filename!.isNotEmpty ? filter.filename : null,
         country: filter.location.country,
-        description:
-            filter.description != null && filter.description!.isNotEmpty
-                ? filter.description
-                : null,
+        description: filter.description != null && filter.description!.isNotEmpty ? filter.description : null,
         state: filter.location.state,
         city: filter.location.city,
         make: filter.camera.make,
         model: filter.camera.model,
         takenAfter: filter.date.takenAfter,
         takenBefore: filter.date.takenBefore,
-        visibility: filter.display.isArchive
-            ? AssetVisibility.archive
-            : AssetVisibility.timeline,
+        visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
         isFavorite: filter.display.isFavorite ? true : null,
         isNotInAlbum: filter.display.isNotInAlbum ? true : null,
         personIds: filter.people.map((e) => e.id).toList(),
diff --git a/mobile/lib/infrastructure/repositories/stack.repository.dart b/mobile/lib/infrastructure/repositories/stack.repository.dart
index 7f97f3d9ae..cdac5fe4ad 100644
--- a/mobile/lib/infrastructure/repositories/stack.repository.dart
+++ b/mobile/lib/infrastructure/repositories/stack.repository.dart
@@ -8,8 +8,7 @@ class DriftStackRepository extends DriftDatabaseRepository {
   const DriftStackRepository(this._db) : super(_db);
 
   Future<List<Stack>> getAll(String userId) {
-    final query = _db.stackEntity.select()
-      ..where((e) => e.ownerId.equals(userId));
+    final query = _db.stackEntity.select()..where((e) => e.ownerId.equals(userId));
 
     return query.map((stack) {
       return stack.toDto();
diff --git a/mobile/lib/infrastructure/repositories/store.repository.dart b/mobile/lib/infrastructure/repositories/store.repository.dart
index 400c8ccf7d..990c2ad65d 100644
--- a/mobile/lib/infrastructure/repositories/store.repository.dart
+++ b/mobile/lib/infrastructure/repositories/store.repository.dart
@@ -63,23 +63,17 @@ class IsarStoreRepository extends IsarDatabaseRepository {
   }
 
   Future<StoreDto<Object>> _toUpdateEvent(StoreValue entity) async {
-    final key = StoreKey.values.firstWhere((e) => e.id == entity.id)
-        as StoreKey<Object>;
+    final key = StoreKey.values.firstWhere((e) => e.id == entity.id) as StoreKey<Object>;
     final value = await _toValue(key, entity);
     return StoreDto(key, value);
   }
 
-  Future<T?> _toValue<T>(StoreKey<T> key, StoreValue entity) async =>
-      switch (key.type) {
+  Future<T?> _toValue<T>(StoreKey<T> key, StoreValue entity) async => switch (key.type) {
         const (int) => entity.intValue,
         const (String) => entity.strValue,
         const (bool) => entity.intValue == 1,
-        const (DateTime) => entity.intValue == null
-            ? null
-            : DateTime.fromMillisecondsSinceEpoch(entity.intValue!),
-        const (UserDto) => entity.strValue == null
-            ? null
-            : await IsarUserRepository(_db).getByUserId(entity.strValue!),
+        const (DateTime) => entity.intValue == null ? null : DateTime.fromMillisecondsSinceEpoch(entity.intValue!),
+        const (UserDto) => entity.strValue == null ? null : await IsarUserRepository(_db).getByUserId(entity.strValue!),
         _ => null,
       } as T?;
 
@@ -101,10 +95,7 @@ class IsarStoreRepository extends IsarDatabaseRepository {
   }
 
   Future<List<StoreDto<Object>>> getAll() async {
-    final entities = await _db.storeValues
-        .filter()
-        .anyOf(validStoreKeys, (query, id) => query.idEqualTo(id))
-        .findAll();
+    final entities = await _db.storeValues.filter().anyOf(validStoreKeys, (query, id) => query.idEqualTo(id)).findAll();
     return Future.wait(entities.map((e) => _toUpdateEvent(e)).toList());
   }
 }
diff --git a/mobile/lib/infrastructure/repositories/sync_api.repository.dart b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
index e8be84effb..6727f19c64 100644
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -112,8 +112,7 @@ class SyncApiRepository {
       client.close();
     }
     stopwatch.stop();
-    _logger
-        .info("Remote Sync completed in ${stopwatch.elapsed.inMilliseconds}ms");
+    _logger.info("Remote Sync completed in ${stopwatch.elapsed.inMilliseconds}ms");
     DLog.log("Remote Sync completed in ${stopwatch.elapsed.inMilliseconds}ms");
   }
 
diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index 1cca903566..067f840174 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -31,8 +31,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
 
   Future<void> deleteUsersV1(Iterable<SyncUserDeleteV1> data) async {
     try {
-      await _db.userEntity
-          .deleteWhere((row) => row.id.isIn(data.map((e) => e.userId)));
+      await _db.userEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.userId)));
     } catch (error, stack) {
       _logger.severe('Error: SyncUserDeleteV1', error, stack);
       rethrow;
@@ -84,8 +83,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
     try {
       await _db.batch((batch) {
         for (final partner in data) {
-          final companion =
-              PartnerEntityCompanion(inTimeline: Value(partner.inTimeline));
+          final companion = PartnerEntityCompanion(inTimeline: Value(partner.inTimeline));
 
           batch.insert(
             _db.partnerEntity,
@@ -129,8 +127,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             type: Value(asset.type.toAssetType()),
             createdAt: Value.absentIfNull(asset.fileCreatedAt),
             updatedAt: Value.absentIfNull(asset.fileModifiedAt),
-            durationInSeconds:
-                Value(asset.duration?.toDuration()?.inSeconds ?? 0),
+            durationInSeconds: Value(asset.duration?.toDuration()?.inSeconds ?? 0),
             checksum: Value(asset.checksum),
             isFavorite: Value(asset.isFavorite),
             ownerId: Value(asset.ownerId),
@@ -662,9 +659,7 @@ extension on String {
 extension on String {
   Duration? toDuration() {
     try {
-      final parts = split(':')
-          .map((e) => double.parse(e).toInt())
-          .toList(growable: false);
+      final parts = split(':').map((e) => double.parse(e).toInt()).toList(growable: false);
 
       return Duration(hours: parts[0], minutes: parts[1], seconds: parts[2]);
     } catch (_) {
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index b1fc540bd8..772fb74f84 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -22,8 +22,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     final query = _db.partnerEntity.selectOnly()
       ..addColumns([_db.partnerEntity.sharedById])
       ..where(
-        _db.partnerEntity.inTimeline.equals(true) &
-            _db.partnerEntity.sharedWithId.equals(userId),
+        _db.partnerEntity.inTimeline.equals(true) & _db.partnerEntity.sharedWithId.equals(userId),
       );
 
     return query
@@ -173,8 +172,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         ),
         leftOuterJoin(
           _db.remoteAssetEntity,
-          _db.localAssetEntity.checksum
-              .equalsExp(_db.remoteAssetEntity.checksum),
+          _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
           useColumns: false,
         ),
       ],
@@ -219,10 +217,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       });
     }
 
-    return (_db.remoteAlbumEntity.select()
-          ..where((row) => row.id.equals(albumId)))
-        .watch()
-        .switchMap((albums) {
+    return (_db.remoteAlbumEntity.select()..where((row) => row.id.equals(albumId))).watch().switchMap((albums) {
       if (albums.isEmpty) {
         return Stream.value(<Bucket>[]);
       }
@@ -237,14 +232,12 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         ..join([
           innerJoin(
             _db.remoteAlbumAssetEntity,
-            _db.remoteAlbumAssetEntity.assetId
-                .equalsExp(_db.remoteAssetEntity.id),
+            _db.remoteAlbumAssetEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
             useColumns: false,
           ),
         ])
         ..where(
-          _db.remoteAssetEntity.deletedAt.isNull() &
-              _db.remoteAlbumAssetEntity.albumId.equals(albumId),
+          _db.remoteAssetEntity.deletedAt.isNull() & _db.remoteAlbumAssetEntity.albumId.equals(albumId),
         )
         ..groupBy([dateExp]);
 
@@ -270,9 +263,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     required int offset,
     required int count,
   }) async {
-    final albumData = await (_db.remoteAlbumEntity.select()
-          ..where((row) => row.id.equals(albumId)))
-        .getSingleOrNull();
+    final albumData = await (_db.remoteAlbumEntity.select()..where((row) => row.id.equals(albumId))).getSingleOrNull();
 
     // If album doesn't exist (was deleted), return empty list
     if (albumData == null) {
@@ -285,14 +276,12 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       [
         innerJoin(
           _db.remoteAlbumAssetEntity,
-          _db.remoteAlbumAssetEntity.assetId
-              .equalsExp(_db.remoteAssetEntity.id),
+          _db.remoteAlbumAssetEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
           useColumns: false,
         ),
       ],
     )..where(
-        _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAlbumAssetEntity.albumId.equals(albumId),
+        _db.remoteAssetEntity.deletedAt.isNull() & _db.remoteAlbumAssetEntity.albumId.equals(albumId),
       );
 
     if (isAscending) {
@@ -303,62 +292,44 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
 
     query.limit(count, offset: offset);
 
-    return query
-        .map((row) => row.readTable(_db.remoteAssetEntity).toDto())
-        .get();
+    return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
   }
 
   TimelineQuery fromAssets(List<BaseAsset> assets) => (
         bucketSource: () => Stream.value(_generateBuckets(assets.length)),
-        assetSource: (offset, count) =>
-            Future.value(assets.skip(offset).take(count).toList()),
+        assetSource: (offset, count) => Future.value(assets.skip(offset).take(count).toList()),
       );
 
-  TimelineQuery remote(String ownerId, GroupAssetsBy groupBy) =>
-      _remoteQueryBuilder(
+  TimelineQuery remote(String ownerId, GroupAssetsBy groupBy) => _remoteQueryBuilder(
         filter: (row) =>
-            row.deletedAt.isNull() &
-            row.visibility.equalsValue(AssetVisibility.timeline) &
-            row.ownerId.equals(ownerId),
+            row.deletedAt.isNull() & row.visibility.equalsValue(AssetVisibility.timeline) & row.ownerId.equals(ownerId),
         groupBy: groupBy,
       );
 
-  TimelineQuery favorite(String userId, GroupAssetsBy groupBy) =>
-      _remoteQueryBuilder(
-        filter: (row) =>
-            row.deletedAt.isNull() &
-            row.isFavorite.equals(true) &
-            row.ownerId.equals(userId),
+  TimelineQuery favorite(String userId, GroupAssetsBy groupBy) => _remoteQueryBuilder(
+        filter: (row) => row.deletedAt.isNull() & row.isFavorite.equals(true) & row.ownerId.equals(userId),
         groupBy: groupBy,
       );
 
-  TimelineQuery trash(String userId, GroupAssetsBy groupBy) =>
-      _remoteQueryBuilder(
+  TimelineQuery trash(String userId, GroupAssetsBy groupBy) => _remoteQueryBuilder(
         filter: (row) => row.deletedAt.isNotNull() & row.ownerId.equals(userId),
         groupBy: groupBy,
         joinLocal: true,
       );
 
-  TimelineQuery archived(String userId, GroupAssetsBy groupBy) =>
-      _remoteQueryBuilder(
+  TimelineQuery archived(String userId, GroupAssetsBy groupBy) => _remoteQueryBuilder(
         filter: (row) =>
-            row.deletedAt.isNull() &
-            row.ownerId.equals(userId) &
-            row.visibility.equalsValue(AssetVisibility.archive),
+            row.deletedAt.isNull() & row.ownerId.equals(userId) & row.visibility.equalsValue(AssetVisibility.archive),
         groupBy: groupBy,
       );
 
-  TimelineQuery locked(String userId, GroupAssetsBy groupBy) =>
-      _remoteQueryBuilder(
+  TimelineQuery locked(String userId, GroupAssetsBy groupBy) => _remoteQueryBuilder(
         filter: (row) =>
-            row.deletedAt.isNull() &
-            row.visibility.equalsValue(AssetVisibility.locked) &
-            row.ownerId.equals(userId),
+            row.deletedAt.isNull() & row.visibility.equalsValue(AssetVisibility.locked) & row.ownerId.equals(userId),
         groupBy: groupBy,
       );
 
-  TimelineQuery video(String userId, GroupAssetsBy groupBy) =>
-      _remoteQueryBuilder(
+  TimelineQuery video(String userId, GroupAssetsBy groupBy) => _remoteQueryBuilder(
         filter: (row) =>
             row.deletedAt.isNull() &
             row.type.equalsValue(AssetType.video) &
@@ -405,8 +376,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       ..where(
         _db.remoteExifEntity.city.equals(place) &
             _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline),
+            _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline),
       )
       ..groupBy([dateExp])
       ..orderBy([OrderingTerm.desc(dateExp)]);
@@ -434,15 +404,12 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     )
       ..where(
         _db.remoteAssetEntity.deletedAt.isNull() &
-            _db.remoteAssetEntity.visibility
-                .equalsValue(AssetVisibility.timeline) &
+            _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
             _db.remoteExifEntity.city.equals(place),
       )
       ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
       ..limit(count, offset: offset);
-    return query
-        .map((row) => row.readTable(_db.remoteAssetEntity).toDto())
-        .get();
+    return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
   }
 
   TimelineQuery _remoteQueryBuilder({
@@ -496,8 +463,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       final query = _db.remoteAssetEntity.select().join([
         leftOuterJoin(
           _db.localAssetEntity,
-          _db.remoteAssetEntity.checksum
-              .equalsExp(_db.localAssetEntity.checksum),
+          _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
           useColumns: false,
         ),
       ])
diff --git a/mobile/lib/infrastructure/repositories/user.repository.dart b/mobile/lib/infrastructure/repositories/user.repository.dart
index 4ccfccbdcc..2c6d721396 100644
--- a/mobile/lib/infrastructure/repositories/user.repository.dart
+++ b/mobile/lib/infrastructure/repositories/user.repository.dart
@@ -1,7 +1,6 @@
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
-    as entity;
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity;
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:isar/isar.dart';
 
diff --git a/mobile/lib/infrastructure/repositories/user_api.repository.dart b/mobile/lib/infrastructure/repositories/user_api.repository.dart
index e990b9d8d1..0ee3deb4b1 100644
--- a/mobile/lib/infrastructure/repositories/user_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/user_api.repository.dart
@@ -11,8 +11,7 @@ class UserApiRepository extends ApiRepository {
   const UserApiRepository(this._api);
 
   Future<UserDto?> getMyUser() async {
-    final (adminDto, preferenceDto) =
-        await (_api.getMyUser(), _api.getMyPreferences()).wait;
+    final (adminDto, preferenceDto) = await (_api.getMyUser(), _api.getMyPreferences()).wait;
     if (adminDto == null) return null;
 
     return UserConverter.fromAdminDto(adminDto, preferenceDto);
diff --git a/mobile/lib/infrastructure/repositories/user_metadata.repository.dart b/mobile/lib/infrastructure/repositories/user_metadata.repository.dart
index 19364afb43..81a4cd7945 100644
--- a/mobile/lib/infrastructure/repositories/user_metadata.repository.dart
+++ b/mobile/lib/infrastructure/repositories/user_metadata.repository.dart
@@ -8,8 +8,7 @@ class DriftUserMetadataRepository extends DriftDatabaseRepository {
   const DriftUserMetadataRepository(this._db) : super(_db);
 
   Future<List<UserMetadata>> getUserMetadata(String userId) {
-    final query = _db.userMetadataEntity.select()
-      ..where((e) => e.userId.equals(userId));
+    final query = _db.userMetadataEntity.select()..where((e) => e.userId.equals(userId));
 
     return query.map((userMetadata) {
       return userMetadata.toDto();
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index b62fb180e5..5f0c5d42db 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -126,8 +126,7 @@ class ImmichApp extends ConsumerStatefulWidget {
   ImmichAppState createState() => ImmichAppState();
 }
 
-class ImmichAppState extends ConsumerState<ImmichApp>
-    with WidgetsBindingObserver {
+class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserver {
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     switch (state) {
@@ -168,9 +167,7 @@ class ImmichAppState extends ConsumerState<ImmichApp>
       // Android 8 does not support transparent app bars
       final info = await DeviceInfoPlugin().androidInfo;
       if (info.version.sdkInt <= 26) {
-        overlayStyle = context.isDarkTheme
-            ? SystemUiOverlayStyle.dark
-            : SystemUiOverlayStyle.light;
+        overlayStyle = context.isDarkTheme ? SystemUiOverlayStyle.dark : SystemUiOverlayStyle.light;
       }
     }
     SystemChrome.setSystemUIOverlayStyle(overlayStyle);
@@ -222,8 +219,7 @@ class ImmichAppState extends ConsumerState<ImmichApp>
     final deepLinkHandler = ref.read(deepLinkServiceProvider);
     final currentRouteName = ref.read(currentRouteNameProvider.notifier).state;
 
-    final isColdStart =
-        currentRouteName == null || currentRouteName == SplashScreenRoute.name;
+    final isColdStart = currentRouteName == null || currentRouteName == SplashScreenRoute.name;
 
     if (deepLink.uri.scheme == "immich") {
       final proposedRoute = await deepLinkHandler.handleScheme(
@@ -299,8 +295,7 @@ class ImmichAppState extends ConsumerState<ImmichApp>
         ),
         routerConfig: router.config(
           deepLinkBuilder: _deepLinkBuilder,
-          navigatorObservers: () =>
-              [AppNavigationObserver(ref: ref), HeroController()],
+          navigatorObservers: () => [AppNavigationObserver(ref: ref), HeroController()],
         ),
       ),
     );
diff --git a/mobile/lib/models/activities/activity.model.dart b/mobile/lib/models/activities/activity.model.dart
index 17f70d5d62..38c2bef77a 100644
--- a/mobile/lib/models/activities/activity.model.dart
+++ b/mobile/lib/models/activities/activity.model.dart
@@ -56,12 +56,7 @@ class Activity {
 
   @override
   int get hashCode {
-    return id.hashCode ^
-        assetId.hashCode ^
-        comment.hashCode ^
-        createdAt.hashCode ^
-        type.hashCode ^
-        user.hashCode;
+    return id.hashCode ^ assetId.hashCode ^ comment.hashCode ^ createdAt.hashCode ^ type.hashCode ^ user.hashCode;
   }
 }
 
diff --git a/mobile/lib/models/albums/album_add_asset_response.model.dart b/mobile/lib/models/albums/album_add_asset_response.model.dart
index 26168c957c..fbc8a4d560 100644
--- a/mobile/lib/models/albums/album_add_asset_response.model.dart
+++ b/mobile/lib/models/albums/album_add_asset_response.model.dart
@@ -32,16 +32,14 @@ class AlbumAddAssetsResponse {
   String toJson() => json.encode(toMap());
 
   @override
-  String toString() =>
-      'AddAssetsResponse(alreadyInAlbum: $alreadyInAlbum, successfullyAdded: $successfullyAdded)';
+  String toString() => 'AddAssetsResponse(alreadyInAlbum: $alreadyInAlbum, successfullyAdded: $successfullyAdded)';
 
   @override
   bool operator ==(covariant AlbumAddAssetsResponse other) {
     if (identical(this, other)) return true;
     final listEquals = const DeepCollectionEquality().equals;
 
-    return listEquals(other.alreadyInAlbum, alreadyInAlbum) &&
-        other.successfullyAdded == successfullyAdded;
+    return listEquals(other.alreadyInAlbum, alreadyInAlbum) && other.successfullyAdded == successfullyAdded;
   }
 
   @override
diff --git a/mobile/lib/models/albums/album_viewer_page_state.model.dart b/mobile/lib/models/albums/album_viewer_page_state.model.dart
index 9fd5da1b28..823226b4a4 100644
--- a/mobile/lib/models/albums/album_viewer_page_state.model.dart
+++ b/mobile/lib/models/albums/album_viewer_page_state.model.dart
@@ -43,8 +43,7 @@ class AlbumViewerPageState {
 
   String toJson() => json.encode(toMap());
 
-  factory AlbumViewerPageState.fromJson(String source) =>
-      AlbumViewerPageState.fromMap(json.decode(source));
+  factory AlbumViewerPageState.fromJson(String source) => AlbumViewerPageState.fromMap(json.decode(source));
 
   @override
   String toString() =>
@@ -61,8 +60,5 @@ class AlbumViewerPageState {
   }
 
   @override
-  int get hashCode =>
-      isEditAlbum.hashCode ^
-      editTitleText.hashCode ^
-      editDescriptionText.hashCode;
+  int get hashCode => isEditAlbum.hashCode ^ editTitleText.hashCode ^ editDescriptionText.hashCode;
 }
diff --git a/mobile/lib/models/albums/asset_selection_page_result.model.dart b/mobile/lib/models/albums/asset_selection_page_result.model.dart
index 2a4daba64a..d921ac63ce 100644
--- a/mobile/lib/models/albums/asset_selection_page_result.model.dart
+++ b/mobile/lib/models/albums/asset_selection_page_result.model.dart
@@ -12,8 +12,7 @@ class AssetSelectionPageResult {
     if (identical(this, other)) return true;
     final setEquals = const DeepCollectionEquality().equals;
 
-    return other is AssetSelectionPageResult &&
-        setEquals(other.selectedAssets, selectedAssets);
+    return other is AssetSelectionPageResult && setEquals(other.selectedAssets, selectedAssets);
   }
 
   @override
diff --git a/mobile/lib/models/asset_selection_state.dart b/mobile/lib/models/asset_selection_state.dart
index b080dca003..c022ec3a3a 100644
--- a/mobile/lib/models/asset_selection_state.dart
+++ b/mobile/lib/models/asset_selection_state.dart
@@ -48,9 +48,5 @@ class AssetSelectionState {
   }
 
   @override
-  int get hashCode =>
-      hasRemote.hashCode ^
-      hasLocal.hashCode ^
-      hasMerged.hashCode ^
-      selectedCount.hashCode;
+  int get hashCode => hasRemote.hashCode ^ hasLocal.hashCode ^ hasMerged.hashCode ^ selectedCount.hashCode;
 }
diff --git a/mobile/lib/models/auth/auxilary_endpoint.model.dart b/mobile/lib/models/auth/auxilary_endpoint.model.dart
index f49d0f692c..e876097d61 100644
--- a/mobile/lib/models/auth/auxilary_endpoint.model.dart
+++ b/mobile/lib/models/auth/auxilary_endpoint.model.dart
@@ -97,8 +97,7 @@ class AuxCheckStatus {
 
   String toJson() => json.encode(toMap());
 
-  factory AuxCheckStatus.fromJson(String source) =>
-      AuxCheckStatus.fromMap(json.decode(source) as Map<String, dynamic>);
+  factory AuxCheckStatus.fromJson(String source) => AuxCheckStatus.fromMap(json.decode(source) as Map<String, dynamic>);
 
   @override
   String toString() => 'AuxCheckStatus(name: $name)';
diff --git a/mobile/lib/models/auth/biometric_status.model.dart b/mobile/lib/models/auth/biometric_status.model.dart
index 3057f06e9c..223b283279 100644
--- a/mobile/lib/models/auth/biometric_status.model.dart
+++ b/mobile/lib/models/auth/biometric_status.model.dart
@@ -11,8 +11,7 @@ class BiometricStatus {
   });
 
   @override
-  String toString() =>
-      'BiometricStatus(availableBiometrics: $availableBiometrics, canAuthenticate: $canAuthenticate)';
+  String toString() => 'BiometricStatus(availableBiometrics: $availableBiometrics, canAuthenticate: $canAuthenticate)';
 
   BiometricStatus copyWith({
     List<BiometricType>? availableBiometrics,
@@ -29,8 +28,7 @@ class BiometricStatus {
     if (identical(this, other)) return true;
     final listEquals = const DeepCollectionEquality().equals;
 
-    return listEquals(other.availableBiometrics, availableBiometrics) &&
-        other.canAuthenticate == canAuthenticate;
+    return listEquals(other.availableBiometrics, availableBiometrics) && other.canAuthenticate == canAuthenticate;
   }
 
   @override
diff --git a/mobile/lib/models/backup/available_album.model.dart b/mobile/lib/models/backup/available_album.model.dart
index e34d2b1abe..96a19cf60b 100644
--- a/mobile/lib/models/backup/available_album.model.dart
+++ b/mobile/lib/models/backup/available_album.model.dart
@@ -29,8 +29,7 @@ class AvailableAlbum {
   bool get isAll => album.isAll;
 
   @override
-  String toString() =>
-      'AvailableAlbum(albumEntity: $album, lastBackup: $lastBackup)';
+  String toString() => 'AvailableAlbum(albumEntity: $album, lastBackup: $lastBackup)';
 
   @override
   bool operator ==(Object other) {
diff --git a/mobile/lib/models/backup/backup_state.model.dart b/mobile/lib/models/backup/backup_state.model.dart
index d829f411fc..39554736dd 100644
--- a/mobile/lib/models/backup/backup_state.model.dart
+++ b/mobile/lib/models/backup/backup_state.model.dart
@@ -8,13 +8,7 @@ import 'package:immich_mobile/models/backup/available_album.model.dart';
 import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
 import 'package:immich_mobile/models/server_info/server_disk_info.model.dart';
 
-enum BackUpProgressEnum {
-  idle,
-  inProgress,
-  manualInProgress,
-  inBackground,
-  done
-}
+enum BackUpProgressEnum { idle, inProgress, manualInProgress, inBackground, done }
 
 class BackUpState {
   // enum
@@ -105,26 +99,21 @@ class BackUpState {
       progressInFileSize: progressInFileSize ?? this.progressInFileSize,
       progressInFileSpeed: progressInFileSpeed ?? this.progressInFileSpeed,
       progressInFileSpeeds: progressInFileSpeeds ?? this.progressInFileSpeeds,
-      progressInFileSpeedUpdateTime:
-          progressInFileSpeedUpdateTime ?? this.progressInFileSpeedUpdateTime,
-      progressInFileSpeedUpdateSentBytes: progressInFileSpeedUpdateSentBytes ??
-          this.progressInFileSpeedUpdateSentBytes,
-      iCloudDownloadProgress:
-          iCloudDownloadProgress ?? this.iCloudDownloadProgress,
+      progressInFileSpeedUpdateTime: progressInFileSpeedUpdateTime ?? this.progressInFileSpeedUpdateTime,
+      progressInFileSpeedUpdateSentBytes: progressInFileSpeedUpdateSentBytes ?? this.progressInFileSpeedUpdateSentBytes,
+      iCloudDownloadProgress: iCloudDownloadProgress ?? this.iCloudDownloadProgress,
       cancelToken: cancelToken ?? this.cancelToken,
       serverInfo: serverInfo ?? this.serverInfo,
       autoBackup: autoBackup ?? this.autoBackup,
       backgroundBackup: backgroundBackup ?? this.backgroundBackup,
       backupRequireWifi: backupRequireWifi ?? this.backupRequireWifi,
-      backupRequireCharging:
-          backupRequireCharging ?? this.backupRequireCharging,
+      backupRequireCharging: backupRequireCharging ?? this.backupRequireCharging,
       backupTriggerDelay: backupTriggerDelay ?? this.backupTriggerDelay,
       availableAlbums: availableAlbums ?? this.availableAlbums,
       selectedBackupAlbums: selectedBackupAlbums ?? this.selectedBackupAlbums,
       excludedBackupAlbums: excludedBackupAlbums ?? this.excludedBackupAlbums,
       allUniqueAssets: allUniqueAssets ?? this.allUniqueAssets,
-      selectedAlbumsBackupAssetsIds:
-          selectedAlbumsBackupAssetsIds ?? this.selectedAlbumsBackupAssetsIds,
+      selectedAlbumsBackupAssetsIds: selectedAlbumsBackupAssetsIds ?? this.selectedAlbumsBackupAssetsIds,
       currentUploadAsset: currentUploadAsset ?? this.currentUploadAsset,
     );
   }
@@ -146,8 +135,7 @@ class BackUpState {
         other.progressInFileSpeed == progressInFileSpeed &&
         collectionEquals(other.progressInFileSpeeds, progressInFileSpeeds) &&
         other.progressInFileSpeedUpdateTime == progressInFileSpeedUpdateTime &&
-        other.progressInFileSpeedUpdateSentBytes ==
-            progressInFileSpeedUpdateSentBytes &&
+        other.progressInFileSpeedUpdateSentBytes == progressInFileSpeedUpdateSentBytes &&
         other.iCloudDownloadProgress == iCloudDownloadProgress &&
         other.cancelToken == cancelToken &&
         other.serverInfo == serverInfo &&
diff --git a/mobile/lib/models/backup/current_upload_asset.model.dart b/mobile/lib/models/backup/current_upload_asset.model.dart
index edaac06987..2214897357 100644
--- a/mobile/lib/models/backup/current_upload_asset.model.dart
+++ b/mobile/lib/models/backup/current_upload_asset.model.dart
@@ -53,13 +53,11 @@ class CurrentUploadAsset {
   factory CurrentUploadAsset.fromMap(Map<String, dynamic> map) {
     return CurrentUploadAsset(
       id: map['id'] as String,
-      fileCreatedAt:
-          DateTime.fromMillisecondsSinceEpoch(map['fileCreatedAt'] as int),
+      fileCreatedAt: DateTime.fromMillisecondsSinceEpoch(map['fileCreatedAt'] as int),
       fileName: map['fileName'] as String,
       fileType: map['fileType'] as String,
       fileSize: map['fileSize'] as int,
-      iCloudAsset:
-          map['iCloudAsset'] != null ? map['iCloudAsset'] as bool : null,
+      iCloudAsset: map['iCloudAsset'] != null ? map['iCloudAsset'] as bool : null,
     );
   }
 
diff --git a/mobile/lib/models/backup/manual_upload_state.model.dart b/mobile/lib/models/backup/manual_upload_state.model.dart
index a2d84fbef3..7f797334de 100644
--- a/mobile/lib/models/backup/manual_upload_state.model.dart
+++ b/mobile/lib/models/backup/manual_upload_state.model.dart
@@ -56,17 +56,14 @@ class ManualUploadState {
       progressInFileSize: progressInFileSize ?? this.progressInFileSize,
       progressInFileSpeed: progressInFileSpeed ?? this.progressInFileSpeed,
       progressInFileSpeeds: progressInFileSpeeds ?? this.progressInFileSpeeds,
-      progressInFileSpeedUpdateTime:
-          progressInFileSpeedUpdateTime ?? this.progressInFileSpeedUpdateTime,
-      progressInFileSpeedUpdateSentBytes: progressInFileSpeedUpdateSentBytes ??
-          this.progressInFileSpeedUpdateSentBytes,
+      progressInFileSpeedUpdateTime: progressInFileSpeedUpdateTime ?? this.progressInFileSpeedUpdateTime,
+      progressInFileSpeedUpdateSentBytes: progressInFileSpeedUpdateSentBytes ?? this.progressInFileSpeedUpdateSentBytes,
       cancelToken: cancelToken ?? this.cancelToken,
       currentUploadAsset: currentUploadAsset ?? this.currentUploadAsset,
       totalAssetsToUpload: totalAssetsToUpload ?? this.totalAssetsToUpload,
       currentAssetIndex: currentAssetIndex ?? this.currentAssetIndex,
       successfulUploads: successfulUploads ?? this.successfulUploads,
-      showDetailedNotification:
-          showDetailedNotification ?? this.showDetailedNotification,
+      showDetailedNotification: showDetailedNotification ?? this.showDetailedNotification,
     );
   }
 
@@ -86,8 +83,7 @@ class ManualUploadState {
         other.progressInFileSpeed == progressInFileSpeed &&
         collectionEquals(other.progressInFileSpeeds, progressInFileSpeeds) &&
         other.progressInFileSpeedUpdateTime == progressInFileSpeedUpdateTime &&
-        other.progressInFileSpeedUpdateSentBytes ==
-            progressInFileSpeedUpdateSentBytes &&
+        other.progressInFileSpeedUpdateSentBytes == progressInFileSpeedUpdateSentBytes &&
         other.cancelToken == cancelToken &&
         other.currentUploadAsset == currentUploadAsset &&
         other.totalAssetsToUpload == totalAssetsToUpload &&
diff --git a/mobile/lib/models/backup/success_upload_asset.model.dart b/mobile/lib/models/backup/success_upload_asset.model.dart
index 2b39dde5ea..ca49450a31 100644
--- a/mobile/lib/models/backup/success_upload_asset.model.dart
+++ b/mobile/lib/models/backup/success_upload_asset.model.dart
@@ -31,12 +31,9 @@ class SuccessUploadAsset {
   bool operator ==(covariant SuccessUploadAsset other) {
     if (identical(this, other)) return true;
 
-    return other.candidate == candidate &&
-        other.remoteAssetId == remoteAssetId &&
-        other.isDuplicate == isDuplicate;
+    return other.candidate == candidate && other.remoteAssetId == remoteAssetId && other.isDuplicate == isDuplicate;
   }
 
   @override
-  int get hashCode =>
-      candidate.hashCode ^ remoteAssetId.hashCode ^ isDuplicate.hashCode;
+  int get hashCode => candidate.hashCode ^ remoteAssetId.hashCode ^ isDuplicate.hashCode;
 }
diff --git a/mobile/lib/models/cast/cast_manager_state.dart b/mobile/lib/models/cast/cast_manager_state.dart
index 703ceb4c47..c948921792 100644
--- a/mobile/lib/models/cast/cast_manager_state.dart
+++ b/mobile/lib/models/cast/cast_manager_state.dart
@@ -59,8 +59,7 @@ class CastManagerState {
 
   String toJson() => json.encode(toMap());
 
-  factory CastManagerState.fromJson(String source) =>
-      CastManagerState.fromMap(json.decode(source));
+  factory CastManagerState.fromJson(String source) => CastManagerState.fromMap(json.decode(source));
 
   @override
   String toString() =>
@@ -80,9 +79,5 @@ class CastManagerState {
 
   @override
   int get hashCode =>
-      isCasting.hashCode ^
-      receiverName.hashCode ^
-      castState.hashCode ^
-      currentTime.hashCode ^
-      duration.hashCode;
+      isCasting.hashCode ^ receiverName.hashCode ^ castState.hashCode ^ currentTime.hashCode ^ duration.hashCode;
 }
diff --git a/mobile/lib/models/download/download_state.model.dart b/mobile/lib/models/download/download_state.model.dart
index c032c73dcd..b2bd389bc2 100644
--- a/mobile/lib/models/download/download_state.model.dart
+++ b/mobile/lib/models/download/download_state.model.dart
@@ -46,20 +46,16 @@ class DownloadInfo {
 
   String toJson() => json.encode(toMap());
 
-  factory DownloadInfo.fromJson(String source) =>
-      DownloadInfo.fromMap(json.decode(source) as Map<String, dynamic>);
+  factory DownloadInfo.fromJson(String source) => DownloadInfo.fromMap(json.decode(source) as Map<String, dynamic>);
 
   @override
-  String toString() =>
-      'DownloadInfo(fileName: $fileName, progress: $progress, status: $status)';
+  String toString() => 'DownloadInfo(fileName: $fileName, progress: $progress, status: $status)';
 
   @override
   bool operator ==(covariant DownloadInfo other) {
     if (identical(this, other)) return true;
 
-    return other.fileName == fileName &&
-        other.progress == progress &&
-        other.status == status;
+    return other.fileName == fileName && other.progress == progress && other.status == status;
   }
 
   @override
@@ -104,6 +100,5 @@ class DownloadState {
   }
 
   @override
-  int get hashCode =>
-      downloadStatus.hashCode ^ taskProgress.hashCode ^ showProgress.hashCode;
+  int get hashCode => downloadStatus.hashCode ^ taskProgress.hashCode ^ showProgress.hashCode;
 }
diff --git a/mobile/lib/models/map/map_marker.model.dart b/mobile/lib/models/map/map_marker.model.dart
index 7ab925464a..781eae792f 100644
--- a/mobile/lib/models/map/map_marker.model.dart
+++ b/mobile/lib/models/map/map_marker.model.dart
@@ -24,8 +24,7 @@ class MapMarker {
         assetRemoteId = dto.id;
 
   @override
-  String toString() =>
-      'MapMarker(latLng: $latLng, assetRemoteId: $assetRemoteId)';
+  String toString() => 'MapMarker(latLng: $latLng, assetRemoteId: $assetRemoteId)';
 
   @override
   bool operator ==(covariant MapMarker other) {
diff --git a/mobile/lib/models/memories/memory.model.dart b/mobile/lib/models/memories/memory.model.dart
index c8451dda64..fb85d70b9e 100644
--- a/mobile/lib/models/memories/memory.model.dart
+++ b/mobile/lib/models/memories/memory.model.dart
@@ -30,9 +30,7 @@ class Memory {
     if (identical(this, other)) return true;
     final listEquals = const DeepCollectionEquality().equals;
 
-    return other is Memory &&
-        other.title == title &&
-        listEquals(other.assets, assets);
+    return other is Memory && other.title == title && listEquals(other.assets, assets);
   }
 
   @override
diff --git a/mobile/lib/models/search/search_curated_content.model.dart b/mobile/lib/models/search/search_curated_content.model.dart
index aff61097e2..7ecb5af45c 100644
--- a/mobile/lib/models/search/search_curated_content.model.dart
+++ b/mobile/lib/models/search/search_curated_content.model.dart
@@ -54,8 +54,7 @@ class SearchCuratedContent {
       SearchCuratedContent.fromMap(json.decode(source) as Map<String, dynamic>);
 
   @override
-  String toString() =>
-      'CuratedContent(label: $label, subtitle: $subtitle, id: $id)';
+  String toString() => 'CuratedContent(label: $label, subtitle: $subtitle, id: $id)';
 
   @override
   bool operator ==(covariant SearchCuratedContent other) {
diff --git a/mobile/lib/models/search/search_filter.model.dart b/mobile/lib/models/search/search_filter.model.dart
index efe6f923ad..1c2167faac 100644
--- a/mobile/lib/models/search/search_filter.model.dart
+++ b/mobile/lib/models/search/search_filter.model.dart
@@ -48,16 +48,13 @@ class SearchLocationFilter {
       SearchLocationFilter.fromMap(json.decode(source) as Map<String, dynamic>);
 
   @override
-  String toString() =>
-      'SearchLocationFilter(country: $country, state: $state, city: $city)';
+  String toString() => 'SearchLocationFilter(country: $country, state: $state, city: $city)';
 
   @override
   bool operator ==(covariant SearchLocationFilter other) {
     if (identical(this, other)) return true;
 
-    return other.country == country &&
-        other.state == state &&
-        other.city == city;
+    return other.country == country && other.state == state && other.city == city;
   }
 
   @override
@@ -142,12 +139,8 @@ class SearchDateFilter {
 
   factory SearchDateFilter.fromMap(Map<String, dynamic> map) {
     return SearchDateFilter(
-      takenBefore: map['takenBefore'] != null
-          ? DateTime.fromMillisecondsSinceEpoch(map['takenBefore'] as int)
-          : null,
-      takenAfter: map['takenAfter'] != null
-          ? DateTime.fromMillisecondsSinceEpoch(map['takenAfter'] as int)
-          : null,
+      takenBefore: map['takenBefore'] != null ? DateTime.fromMillisecondsSinceEpoch(map['takenBefore'] as int) : null,
+      takenAfter: map['takenAfter'] != null ? DateTime.fromMillisecondsSinceEpoch(map['takenAfter'] as int) : null,
     );
   }
 
@@ -157,8 +150,7 @@ class SearchDateFilter {
       SearchDateFilter.fromMap(json.decode(source) as Map<String, dynamic>);
 
   @override
-  String toString() =>
-      'SearchDateFilter(takenBefore: $takenBefore, takenAfter: $takenAfter)';
+  String toString() => 'SearchDateFilter(takenBefore: $takenBefore, takenAfter: $takenAfter)';
 
   @override
   bool operator ==(covariant SearchDateFilter other) {
@@ -222,14 +214,11 @@ class SearchDisplayFilters {
   bool operator ==(covariant SearchDisplayFilters other) {
     if (identical(this, other)) return true;
 
-    return other.isNotInAlbum == isNotInAlbum &&
-        other.isArchive == isArchive &&
-        other.isFavorite == isFavorite;
+    return other.isNotInAlbum == isNotInAlbum && other.isArchive == isArchive && other.isFavorite == isFavorite;
   }
 
   @override
-  int get hashCode =>
-      isNotInAlbum.hashCode ^ isArchive.hashCode ^ isFavorite.hashCode;
+  int get hashCode => isNotInAlbum.hashCode ^ isArchive.hashCode ^ isFavorite.hashCode;
 }
 
 class SearchFilter {
diff --git a/mobile/lib/models/search/search_result_page_state.model.dart b/mobile/lib/models/search/search_result_page_state.model.dart
index 2fd4dcbcd3..7c8a27b50c 100644
--- a/mobile/lib/models/search/search_result_page_state.model.dart
+++ b/mobile/lib/models/search/search_result_page_state.model.dart
@@ -52,10 +52,6 @@ class SearchResultPageState {
 
   @override
   int get hashCode {
-    return isLoading.hashCode ^
-        isSuccess.hashCode ^
-        isError.hashCode ^
-        isSmart.hashCode ^
-        searchResult.hashCode;
+    return isLoading.hashCode ^ isSuccess.hashCode ^ isError.hashCode ^ isSmart.hashCode ^ searchResult.hashCode;
   }
 }
diff --git a/mobile/lib/models/server_info/server_config.model.dart b/mobile/lib/models/server_info/server_config.model.dart
index f07ffde522..88c27443c4 100644
--- a/mobile/lib/models/server_info/server_config.model.dart
+++ b/mobile/lib/models/server_info/server_config.model.dart
@@ -50,6 +50,5 @@ class ServerConfig {
   }
 
   @override
-  int get hashCode =>
-      trashDays.hashCode ^ oauthButtonText.hashCode ^ externalDomain.hashCode;
+  int get hashCode => trashDays.hashCode ^ oauthButtonText.hashCode ^ externalDomain.hashCode;
 }
diff --git a/mobile/lib/models/server_info/server_disk_info.model.dart b/mobile/lib/models/server_info/server_disk_info.model.dart
index 01ce49beec..8248097ca5 100644
--- a/mobile/lib/models/server_info/server_disk_info.model.dart
+++ b/mobile/lib/models/server_info/server_disk_info.model.dart
@@ -51,9 +51,6 @@ class ServerDiskInfo {
 
   @override
   int get hashCode {
-    return diskAvailable.hashCode ^
-        diskSize.hashCode ^
-        diskUse.hashCode ^
-        diskUsagePercentage.hashCode;
+    return diskAvailable.hashCode ^ diskSize.hashCode ^ diskUse.hashCode ^ diskUsagePercentage.hashCode;
   }
 }
diff --git a/mobile/lib/models/server_info/server_features.model.dart b/mobile/lib/models/server_info/server_features.model.dart
index fee88869ed..7e537ebf34 100644
--- a/mobile/lib/models/server_info/server_features.model.dart
+++ b/mobile/lib/models/server_info/server_features.model.dart
@@ -50,9 +50,6 @@ class ServerFeatures {
 
   @override
   int get hashCode {
-    return trash.hashCode ^
-        map.hashCode ^
-        oauthEnabled.hashCode ^
-        passwordLogin.hashCode;
+    return trash.hashCode ^ map.hashCode ^ oauthEnabled.hashCode ^ passwordLogin.hashCode;
   }
 }
diff --git a/mobile/lib/models/server_info/server_info.model.dart b/mobile/lib/models/server_info/server_info.model.dart
index aafab56e4c..0fa80d45d8 100644
--- a/mobile/lib/models/server_info/server_info.model.dart
+++ b/mobile/lib/models/server_info/server_info.model.dart
@@ -41,10 +41,8 @@ class ServerInfo {
       serverConfig: serverConfig ?? this.serverConfig,
       serverDiskInfo: serverDiskInfo ?? this.serverDiskInfo,
       isVersionMismatch: isVersionMismatch ?? this.isVersionMismatch,
-      isNewReleaseAvailable:
-          isNewReleaseAvailable ?? this.isNewReleaseAvailable,
-      versionMismatchErrorMessage:
-          versionMismatchErrorMessage ?? this.versionMismatchErrorMessage,
+      isNewReleaseAvailable: isNewReleaseAvailable ?? this.isNewReleaseAvailable,
+      versionMismatchErrorMessage: versionMismatchErrorMessage ?? this.versionMismatchErrorMessage,
     );
   }
 
diff --git a/mobile/lib/models/server_info/server_version.model.dart b/mobile/lib/models/server_info/server_version.model.dart
index 1995edb98d..bd71536622 100644
--- a/mobile/lib/models/server_info/server_version.model.dart
+++ b/mobile/lib/models/server_info/server_version.model.dart
@@ -37,10 +37,7 @@ class ServerVersion {
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
 
-    return other is ServerVersion &&
-        other.major == major &&
-        other.minor == minor &&
-        other.patch == patch;
+    return other is ServerVersion && other.major == major && other.minor == minor && other.patch == patch;
   }
 
   @override
diff --git a/mobile/lib/models/shared_link/shared_link.model.dart b/mobile/lib/models/shared_link/shared_link.model.dart
index a107dd892a..135d191b20 100644
--- a/mobile/lib/models/shared_link/shared_link.model.dart
+++ b/mobile/lib/models/shared_link/shared_link.model.dart
@@ -66,9 +66,7 @@ class SharedLink {
         expiresAt = dto.expiresAt,
         key = dto.key,
         showMetadata = dto.showMetadata,
-        type = dto.type == SharedLinkType.ALBUM
-            ? SharedLinkSource.album
-            : SharedLinkSource.individual,
+        type = dto.type == SharedLinkType.ALBUM ? SharedLinkSource.album : SharedLinkSource.individual,
         title = dto.type == SharedLinkType.ALBUM
             ? dto.album?.albumName.toUpperCase() ?? "UNKNOWN SHARE"
             : "INDIVIDUAL SHARE",
diff --git a/mobile/lib/models/upload/share_intent_attachment.model.dart b/mobile/lib/models/upload/share_intent_attachment.model.dart
index 7e57cf94d2..61157f3674 100644
--- a/mobile/lib/models/upload/share_intent_attachment.model.dart
+++ b/mobile/lib/models/upload/share_intent_attachment.model.dart
@@ -90,8 +90,7 @@ class ShareIntentAttachment {
 
   String toJson() => json.encode(toMap());
 
-  factory ShareIntentAttachment.fromJson(String source) =>
-      ShareIntentAttachment.fromMap(
+  factory ShareIntentAttachment.fromJson(String source) => ShareIntentAttachment.fromMap(
         json.decode(source) as Map<String, dynamic>,
       );
 
diff --git a/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart b/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart
index 62406d2e3a..c0fc8c9364 100644
--- a/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart
+++ b/mobile/lib/pages/album/album_additional_shared_user_selection.page.dart
@@ -21,8 +21,7 @@ class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final AsyncValue<List<UserDto>> suggestedShareUsers =
-        ref.watch(otherUsersProvider);
+    final AsyncValue<List<UserDto>> suggestedShareUsers = ref.watch(otherUsersProvider);
     final sharedUsersList = useState<Set<UserDto>>({});
 
     addNewUsersHandler() {
@@ -138,8 +137,7 @@ class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget {
         ),
         actions: [
           TextButton(
-            onPressed:
-                sharedUsersList.value.isEmpty ? null : addNewUsersHandler,
+            onPressed: sharedUsersList.value.isEmpty ? null : addNewUsersHandler,
             child: const Text(
               "add",
               style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
diff --git a/mobile/lib/pages/album/album_asset_selection.page.dart b/mobile/lib/pages/album/album_asset_selection.page.dart
index 7b0ce8cdc4..e72ecb0712 100644
--- a/mobile/lib/pages/album/album_asset_selection.page.dart
+++ b/mobile/lib/pages/album/album_asset_selection.page.dart
@@ -65,10 +65,8 @@ class AlbumAssetSelectionPage extends HookConsumerWidget {
           if (selected.value.isNotEmpty || canDeselect)
             TextButton(
               onPressed: () {
-                var payload =
-                    AssetSelectionPageResult(selectedAssets: selected.value);
-                AutoRouter.of(context)
-                    .popForced<AssetSelectionPageResult>(payload);
+                var payload = AssetSelectionPageResult(selectedAssets: selected.value);
+                AutoRouter.of(context).popForced<AssetSelectionPageResult>(payload);
               },
               child: Text(
                 canDeselect ? "done" : "add",
diff --git a/mobile/lib/pages/album/album_date_range.dart b/mobile/lib/pages/album/album_date_range.dart
index 591be260f6..57d808f226 100644
--- a/mobile/lib/pages/album/album_date_range.dart
+++ b/mobile/lib/pages/album/album_date_range.dart
@@ -42,16 +42,12 @@ class AlbumDateRange extends ConsumerWidget {
 
   @pragma('vm:prefer-inline')
   String _getDateRangeText(DateTime startDate, DateTime endDate) {
-    if (startDate.day == endDate.day &&
-        startDate.month == endDate.month &&
-        startDate.year == endDate.year) {
+    if (startDate.day == endDate.day && startDate.month == endDate.month && startDate.year == endDate.year) {
       return DateFormat.yMMMd().format(startDate);
     }
 
-    final String startDateText = (startDate.year == endDate.year
-            ? DateFormat.MMMd()
-            : DateFormat.yMMMd())
-        .format(startDate);
+    final String startDateText =
+        (startDate.year == endDate.year ? DateFormat.MMMd() : DateFormat.yMMMd()).format(startDate);
     final String endDateText = DateFormat.yMMMd().format(endDate);
     return "$startDateText - $endDateText";
   }
diff --git a/mobile/lib/pages/album/album_options.page.dart b/mobile/lib/pages/album/album_options.page.dart
index f177686128..4c51093345 100644
--- a/mobile/lib/pages/album/album_options.page.dart
+++ b/mobile/lib/pages/album/album_options.page.dart
@@ -7,8 +7,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
-    as entity;
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity;
 import 'package:immich_mobile/providers/album/album.provider.dart';
 import 'package:immich_mobile/providers/album/current_album.provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
@@ -28,8 +27,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
       return const SizedBox();
     }
 
-    final sharedUsers =
-        useState(album.sharedUsers.map((u) => u.toDto()).toList());
+    final sharedUsers = useState(album.sharedUsers.map((u) => u.toDto()).toList());
     final owner = album.owner.value;
     final userId = ref.watch(authProvider).userId;
     final activityEnabled = useState(album.activityEnabled);
@@ -50,8 +48,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
       isProcessing.value = true;
 
       try {
-        final isSuccess =
-            await ref.read(albumProvider.notifier).leaveAlbum(album);
+        final isSuccess = await ref.read(albumProvider.notifier).leaveAlbum(album);
 
         if (isSuccess) {
           context.navigateTo(
@@ -99,8 +96,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
         actions = [
           ListTile(
             leading: const Icon(Icons.person_remove_rounded),
-            title: const Text("shared_album_section_people_action_remove_user")
-                .tr(),
+            title: const Text("shared_album_section_people_action_remove_user").tr(),
             onTap: () => removeUserFromAlbum(user),
           ),
         ];
@@ -126,9 +122,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
 
     buildOwnerInfo() {
       return ListTile(
-        leading: owner != null
-            ? UserCircleAvatar(user: owner.toDto())
-            : const SizedBox(),
+        leading: owner != null ? UserCircleAvatar(user: owner.toDto()) : const SizedBox(),
         title: Text(
           album.owner.value?.name ?? "",
           style: const TextStyle(
@@ -170,12 +164,8 @@ class AlbumOptionsPage extends HookConsumerWidget {
                 color: context.colorScheme.onSurfaceSecondary,
               ),
             ),
-            trailing: userId == user.id || isOwner
-                ? const Icon(Icons.more_horiz_rounded)
-                : const SizedBox(),
-            onTap: userId == user.id || isOwner
-                ? () => handleUserClick(user)
-                : null,
+            trailing: userId == user.id || isOwner ? const Icon(Icons.more_horiz_rounded) : const SizedBox(),
+            onTap: userId == user.id || isOwner ? () => handleUserClick(user) : null,
           );
         },
       );
@@ -204,20 +194,15 @@ class AlbumOptionsPage extends HookConsumerWidget {
               value: activityEnabled.value,
               onChanged: (bool value) async {
                 activityEnabled.value = value;
-                if (await ref
-                    .read(albumProvider.notifier)
-                    .setActivitystatus(album, value)) {
+                if (await ref.read(albumProvider.notifier).setActivitystatus(album, value)) {
                   album.activityEnabled = value;
                 }
               },
-              activeColor: activityEnabled.value
-                  ? context.primaryColor
-                  : context.themeData.disabledColor,
+              activeColor: activityEnabled.value ? context.primaryColor : context.themeData.disabledColor,
               dense: true,
               title: Text(
                 "comments_and_likes",
-                style: context.textTheme.titleMedium
-                    ?.copyWith(fontWeight: FontWeight.w500),
+                style: context.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w500),
               ).tr(),
               subtitle: Text(
                 "let_others_respond",
diff --git a/mobile/lib/pages/album/album_viewer.dart b/mobile/lib/pages/album/album_viewer.dart
index 2edf6082ac..6d9519f4ed 100644
--- a/mobile/lib/pages/album/album_viewer.dart
+++ b/mobile/lib/pages/album/album_viewer.dart
@@ -48,8 +48,7 @@ class AlbumViewer extends HookConsumerWidget {
     );
 
     Future<bool> onRemoveFromAlbumPressed(Iterable<Asset> assets) async {
-      final bool isSuccess =
-          await ref.read(albumProvider.notifier).removeAsset(album, assets);
+      final bool isSuccess = await ref.read(albumProvider.notifier).removeAsset(album, assets);
 
       if (!isSuccess) {
         ImmichToast.show(
@@ -65,8 +64,7 @@ class AlbumViewer extends HookConsumerWidget {
     /// Find out if the assets in album exist on the device
     /// If they exist, add to selected asset state to show they are already selected.
     void onAddPhotosPressed() async {
-      AssetSelectionPageResult? returnPayload =
-          await context.pushRoute<AssetSelectionPageResult?>(
+      AssetSelectionPageResult? returnPayload = await context.pushRoute<AssetSelectionPageResult?>(
         AlbumAssetSelectionRoute(
           existingAssets: album.assets,
           canDeselect: false,
@@ -77,9 +75,7 @@ class AlbumViewer extends HookConsumerWidget {
         // Check if there is new assets add
         isProcessing.value = true;
 
-        await ref
-            .watch(albumProvider.notifier)
-            .addAssets(album, returnPayload.selectedAssets);
+        await ref.watch(albumProvider.notifier).addAssets(album, returnPayload.selectedAssets);
 
         isProcessing.value = false;
       }
diff --git a/mobile/lib/pages/albums/albums.page.dart b/mobile/lib/pages/albums/albums.page.dart
index 3fc628afd3..aea4cfa2b8 100644
--- a/mobile/lib/pages/albums/albums.page.dart
+++ b/mobile/lib/pages/albums/albums.page.dart
@@ -26,8 +26,7 @@ class AlbumsPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final albums =
-        ref.watch(albumProvider).where((album) => album.isRemote).toList();
+    final albums = ref.watch(albumProvider).where((album) => album.isRemote).toList();
     final albumSortOption = ref.watch(albumSortByOptionsProvider);
     final albumSortIsReverse = ref.watch(albumSortOrderProvider);
     final sorted = albumSortOption.sortFn(albums, albumSortIsReverse);
@@ -131,8 +130,7 @@ class AlbumsPage extends HookConsumerWidget {
                       )
                     : null,
                 controller: searchController,
-                onChanged: (_) =>
-                    onSearch(searchController.text, filterMode.value),
+                onChanged: (_) => onSearch(searchController.text, filterMode.value),
                 focusNode: searchFocusNode,
                 onTapOutside: (_) => searchFocusNode.unfocus(),
               ),
@@ -180,9 +178,7 @@ class AlbumsPage extends HookConsumerWidget {
                 const SortButton(),
                 IconButton(
                   icon: Icon(
-                    isGrid.value
-                        ? Icons.view_list_outlined
-                        : Icons.grid_view_outlined,
+                    isGrid.value ? Icons.view_list_outlined : Icons.grid_view_outlined,
                     size: 24,
                   ),
                   onPressed: toggleViewMode,
@@ -196,8 +192,7 @@ class AlbumsPage extends HookConsumerWidget {
                   ? GridView.builder(
                       shrinkWrap: true,
                       physics: const ClampingScrollPhysics(),
-                      gridDelegate:
-                          const SliverGridDelegateWithMaxCrossAxisExtent(
+                      gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
                         maxCrossAxisExtent: 250,
                         mainAxisSpacing: 12,
                         crossAxisSpacing: 12,
@@ -244,10 +239,8 @@ class AlbumsPage extends HookConsumerWidget {
                                         },
                                       ) : 'owned'.t(context: context)}',
                                     overflow: TextOverflow.ellipsis,
-                                    style:
-                                        context.textTheme.bodyMedium?.copyWith(
-                                      color: context
-                                          .colorScheme.onSurfaceSecondary,
+                                    style: context.textTheme.bodyMedium?.copyWith(
+                                      color: context.colorScheme.onSurfaceSecondary,
                                     ),
                                   )
                                 : null,
@@ -316,9 +309,7 @@ class QuickFilterButton extends StatelessWidget {
       child: Text(
         label,
         style: TextStyle(
-          color: isSelected
-              ? context.colorScheme.onPrimary
-              : context.colorScheme.onSurface,
+          color: isSelected ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
           fontSize: 14,
         ),
       ),
@@ -356,28 +347,22 @@ class SortButton extends ConsumerWidget {
                   ? albumSortIsReverse
                       ? Icon(
                           Icons.keyboard_arrow_down,
-                          color: albumSortOption == mode
-                              ? context.colorScheme.onPrimary
-                              : context.colorScheme.onSurface,
+                          color:
+                              albumSortOption == mode ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
                         )
                       : Icon(
                           Icons.keyboard_arrow_up_rounded,
-                          color: albumSortOption == mode
-                              ? context.colorScheme.onPrimary
-                              : context.colorScheme.onSurface,
+                          color:
+                              albumSortOption == mode ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
                         )
                   : const Icon(Icons.abc, color: Colors.transparent),
               onPressed: () {
                 final selected = albumSortOption == mode;
                 // Switch direction
                 if (selected) {
-                  ref
-                      .read(albumSortOrderProvider.notifier)
-                      .changeSortDirection(!albumSortIsReverse);
+                  ref.read(albumSortOrderProvider.notifier).changeSortDirection(!albumSortIsReverse);
                 } else {
-                  ref
-                      .read(albumSortByOptionsProvider.notifier)
-                      .changeSortMode(mode);
+                  ref.read(albumSortByOptionsProvider.notifier).changeSortMode(mode);
                 }
               },
               style: ButtonStyle(
@@ -385,9 +370,7 @@ class SortButton extends ConsumerWidget {
                   const EdgeInsets.fromLTRB(16, 16, 32, 16),
                 ),
                 backgroundColor: WidgetStateProperty.all(
-                  albumSortOption == mode
-                      ? context.colorScheme.primary
-                      : Colors.transparent,
+                  albumSortOption == mode ? context.colorScheme.primary : Colors.transparent,
                 ),
                 shape: WidgetStateProperty.all(
                   const RoundedRectangleBorder(
diff --git a/mobile/lib/pages/backup/album_preview.page.dart b/mobile/lib/pages/backup/album_preview.page.dart
index b9fed41305..4cdc180973 100644
--- a/mobile/lib/pages/backup/album_preview.page.dart
+++ b/mobile/lib/pages/backup/album_preview.page.dart
@@ -19,9 +19,7 @@ class AlbumPreviewPage extends HookConsumerWidget {
     final assets = useState<List<Asset>>([]);
 
     getAssetsInAlbum() async {
-      assets.value = await ref
-          .read(albumMediaRepositoryProvider)
-          .getAssets(album.localId!);
+      assets.value = await ref.read(albumMediaRepositoryProvider).getAssets(album.localId!);
     }
 
     useEffect(
diff --git a/mobile/lib/pages/backup/backup_album_selection.page.dart b/mobile/lib/pages/backup/backup_album_selection.page.dart
index e51d259969..69e118cb78 100644
--- a/mobile/lib/pages/backup/backup_album_selection.page.dart
+++ b/mobile/lib/pages/backup/backup_album_selection.page.dart
@@ -19,8 +19,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final selectedBackupAlbums = ref.watch(backupProvider).selectedBackupAlbums;
     final excludedBackupAlbums = ref.watch(backupProvider).excludedBackupAlbums;
-    final enableSyncUploadAlbum =
-        useAppSettingsState(AppSettingsEnum.syncAlbums);
+    final enableSyncUploadAlbum = useAppSettingsState(AppSettingsEnum.syncAlbums);
     final isDarkTheme = context.isDarkTheme;
     final albums = ref.watch(backupProvider).availableAlbums;
 
@@ -85,8 +84,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
 
     buildSelectedAlbumNameChip() {
       return selectedBackupAlbums.map((album) {
-        void removeSelection() =>
-            ref.read(backupProvider.notifier).removeAlbumForBackup(album);
+        void removeSelection() => ref.read(backupProvider.notifier).removeAlbumForBackup(album);
 
         return Padding(
           padding: const EdgeInsets.only(right: 8.0),
@@ -117,9 +115,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
     buildExcludedAlbumNameChip() {
       return excludedBackupAlbums.map((album) {
         void removeSelection() {
-          ref
-              .watch(backupProvider.notifier)
-              .removeExcludedAlbumForBackup(album);
+          ref.watch(backupProvider.notifier).removeExcludedAlbumForBackup(album);
         }
 
         return GestureDetector(
@@ -215,11 +211,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
                   title: Text(
                     "backup_album_selection_page_albums_device".tr(
                       namedArgs: {
-                        'count': ref
-                            .watch(backupProvider)
-                            .availableAlbums
-                            .length
-                            .toString(),
+                        'count': ref.watch(backupProvider).availableAlbums.length.toString(),
                       },
                     ),
                     style: context.textTheme.titleSmall,
diff --git a/mobile/lib/pages/backup/backup_controller.page.dart b/mobile/lib/pages/backup/backup_controller.page.dart
index ca094437ac..76a772884e 100644
--- a/mobile/lib/pages/backup/backup_controller.page.dart
+++ b/mobile/lib/pages/backup/backup_controller.page.dart
@@ -30,11 +30,8 @@ class BackupControllerPage extends HookConsumerWidget {
     final hasAnyAlbum = backupState.selectedBackupAlbums.isNotEmpty;
     final didGetBackupInfo = useState(false);
 
-    bool hasExclusiveAccess =
-        backupState.backupProgress != BackUpProgressEnum.inBackground;
-    bool shouldBackup = backupState.allUniqueAssets.length -
-                    backupState.selectedAlbumsBackupAssetsIds.length ==
-                0 ||
+    bool hasExclusiveAccess = backupState.backupProgress != BackUpProgressEnum.inBackground;
+    bool shouldBackup = backupState.allUniqueAssets.length - backupState.selectedAlbumsBackupAssetsIds.length == 0 ||
             !hasExclusiveAccess
         ? false
         : true;
@@ -48,9 +45,7 @@ class BackupControllerPage extends HookConsumerWidget {
           ref.watch(iOSBackgroundSettingsProvider.notifier).refresh();
         }
 
-        ref
-            .watch(websocketProvider.notifier)
-            .stopListenToEvent('on_upload_success');
+        ref.watch(websocketProvider.notifier).stopListenToEvent('on_upload_success');
 
         return () {
           WakelockPlus.disable();
@@ -61,8 +56,7 @@ class BackupControllerPage extends HookConsumerWidget {
 
     useEffect(
       () {
-        if (backupState.backupProgress == BackUpProgressEnum.idle &&
-            !didGetBackupInfo.value) {
+        if (backupState.backupProgress == BackUpProgressEnum.idle && !didGetBackupInfo.value) {
           ref.watch(backupProvider.notifier).getBackupInfo();
           didGetBackupInfo.value = true;
         }
@@ -183,9 +177,7 @@ class BackupControllerPage extends HookConsumerWidget {
               onPressed: () async {
                 await context.pushRoute(const BackupAlbumSelectionRoute());
                 // waited until returning from selection
-                await ref
-                    .read(backupProvider.notifier)
-                    .backupAlbumSelectionDone();
+                await ref.read(backupProvider.notifier).backupAlbumSelectionDone();
                 // waited until backup albums are stored in DB
                 ref.read(albumProvider.notifier).refreshDeviceAlbums();
               },
@@ -203,8 +195,7 @@ class BackupControllerPage extends HookConsumerWidget {
 
     void startBackup() {
       ref.watch(errorBackupListProvider.notifier).empty();
-      if (ref.watch(backupProvider).backupProgress !=
-          BackUpProgressEnum.inBackground) {
+      if (ref.watch(backupProvider).backupProgress != BackUpProgressEnum.inBackground) {
         ref.watch(backupProvider.notifier).startBackupProcess();
       }
     }
@@ -216,8 +207,7 @@ class BackupControllerPage extends HookConsumerWidget {
         ),
         child: Container(
           child: backupState.backupProgress == BackUpProgressEnum.inProgress ||
-                  backupState.backupProgress ==
-                      BackUpProgressEnum.manualInProgress
+                  backupState.backupProgress == BackUpProgressEnum.manualInProgress
               ? ElevatedButton(
                   style: ElevatedButton.styleFrom(
                     foregroundColor: Colors.grey[50],
@@ -225,8 +215,7 @@ class BackupControllerPage extends HookConsumerWidget {
                     // padding: const EdgeInsets.all(14),
                   ),
                   onPressed: () {
-                    if (backupState.backupProgress ==
-                        BackUpProgressEnum.manualInProgress) {
+                    if (backupState.backupProgress == BackUpProgressEnum.manualInProgress) {
                       ref.read(manualUploadProvider.notifier).cancelBackup();
                     } else {
                       ref.read(backupProvider.notifier).cancelBackup();
diff --git a/mobile/lib/pages/backup/drift_backup.page.dart b/mobile/lib/pages/backup/drift_backup.page.dart
index 08b09250e1..0ebb68883f 100644
--- a/mobile/lib/pages/backup/drift_backup.page.dart
+++ b/mobile/lib/pages/backup/drift_backup.page.dart
@@ -39,9 +39,7 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
       return;
     }
 
-    await ref
-        .read(driftBackupProvider.notifier)
-        .getBackupStatus(currentUser.id);
+    await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
     await ref.read(driftBackupProvider.notifier).backup(currentUser.id);
   }
 
@@ -224,9 +222,7 @@ class _BackupAlbumSelectionCard extends ConsumerWidget {
             if (currentUser == null) {
               return;
             }
-            ref
-                .read(driftBackupProvider.notifier)
-                .getBackupStatus(currentUser.id);
+            ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
           },
           child: const Text(
             "select",
@@ -245,8 +241,7 @@ class _TotalCard extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final totalCount =
-        ref.watch(driftBackupProvider.select((p) => p.totalCount));
+    final totalCount = ref.watch(driftBackupProvider.select((p) => p.totalCount));
 
     return BackupInfoCard(
       title: "total".tr(),
@@ -261,8 +256,7 @@ class _BackupCard extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final backupCount =
-        ref.watch(driftBackupProvider.select((p) => p.backupCount));
+    final backupCount = ref.watch(driftBackupProvider.select((p) => p.backupCount));
 
     return BackupInfoCard(
       title: "backup_controller_page_backup".tr(),
@@ -277,8 +271,7 @@ class _RemainderCard extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final remainderCount =
-        ref.watch(driftBackupProvider.select((p) => p.remainderCount));
+    final remainderCount = ref.watch(driftBackupProvider.select((p) => p.remainderCount));
     return BackupInfoCard(
       title: "backup_controller_page_remainder".tr(),
       subtitle: "backup_controller_page_remainder_sub".tr(),
diff --git a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
index f0f3bedaab..8182798636 100644
--- a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
+++ b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
@@ -21,12 +21,10 @@ class DriftBackupAlbumSelectionPage extends ConsumerStatefulWidget {
   const DriftBackupAlbumSelectionPage({super.key});
 
   @override
-  ConsumerState<DriftBackupAlbumSelectionPage> createState() =>
-      _DriftBackupAlbumSelectionPageState();
+  ConsumerState<DriftBackupAlbumSelectionPage> createState() => _DriftBackupAlbumSelectionPageState();
 }
 
-class _DriftBackupAlbumSelectionPageState
-    extends ConsumerState<DriftBackupAlbumSelectionPage> {
+class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbumSelectionPage> {
   String _searchQuery = '';
   bool _isSearchMode = false;
   int _initialTotalAssetCount = 0;
@@ -42,13 +40,10 @@ class _DriftBackupAlbumSelectionPageState
     _searchController = TextEditingController();
     _searchFocusNode = FocusNode();
 
-    _enableSyncUploadAlbum.value = ref
-        .read(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.syncAlbums);
+    _enableSyncUploadAlbum.value = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
     ref.read(backupAlbumProvider.notifier).getAll();
 
-    _initialTotalAssetCount =
-        ref.read(driftBackupProvider.select((p) => p.totalCount));
+    _initialTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
   }
 
   @override
@@ -69,12 +64,8 @@ class _DriftBackupAlbumSelectionPageState
       return album.name.toLowerCase().contains(_searchQuery.toLowerCase());
     }).toList();
 
-    final selectedBackupAlbums = albums
-        .where((album) => album.backupSelection == BackupSelection.selected)
-        .toList();
-    final excludedBackupAlbums = albums
-        .where((album) => album.backupSelection == BackupSelection.excluded)
-        .toList();
+    final selectedBackupAlbums = albums.where((album) => album.backupSelection == BackupSelection.selected).toList();
+    final excludedBackupAlbums = albums.where((album) => album.backupSelection == BackupSelection.excluded).toList();
 
     handleSyncAlbumToggle(bool isEnable) async {
       if (isEnable) {
@@ -98,16 +89,11 @@ class _DriftBackupAlbumSelectionPageState
             return;
           }
 
-          await ref
-              .read(driftBackupProvider.notifier)
-              .getBackupStatus(currentUser.id);
-          final currentTotalAssetCount =
-              ref.read(driftBackupProvider.select((p) => p.totalCount));
+          await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
+          final currentTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
 
           if (currentTotalAssetCount != _initialTotalAssetCount) {
-            final isBackupEnabled = ref
-                .read(appSettingsServiceProvider)
-                .getSetting(AppSettingsEnum.enableBackup);
+            final isBackupEnabled = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
 
             if (!isBackupEnabled) {
               return;
@@ -132,8 +118,7 @@ class _DriftBackupAlbumSelectionPageState
                   autofocus: true,
                   controller: _searchController,
                   focusNode: _searchFocusNode,
-                  onChanged: (value) =>
-                      setState(() => _searchQuery = value.trim()),
+                  onChanged: (value) => setState(() => _searchQuery = value.trim()),
                 )
               : const Text(
                   "backup_album_selection_page_select_albums",
@@ -195,8 +180,7 @@ class _DriftBackupAlbumSelectionPageState
                   SettingsSwitchListTile(
                     valueNotifier: _enableSyncUploadAlbum,
                     title: "sync_albums".t(context: context),
-                    subtitle: "sync_upload_album_setting_subtitle"
-                        .t(context: context),
+                    subtitle: "sync_upload_album_setting_subtitle".t(context: context),
                     contentPadding: const EdgeInsets.symmetric(horizontal: 16),
                     titleStyle: context.textTheme.bodyLarge?.copyWith(
                       fontWeight: FontWeight.bold,
@@ -238,8 +222,7 @@ class _DriftBackupAlbumSelectionPageState
                           builder: (BuildContext context) {
                             return AlertDialog(
                               shape: const RoundedRectangleBorder(
-                                borderRadius:
-                                    BorderRadius.all(Radius.circular(10)),
+                                borderRadius: BorderRadius.all(Radius.circular(10)),
                               ),
                               elevation: 5,
                               title: Text(
@@ -428,8 +411,7 @@ class _SelectedAlbumNameChips extends ConsumerWidget {
                   ),
                 ),
                 backgroundColor: context.primaryColor,
-                deleteIconColor:
-                    context.isDarkTheme ? Colors.black : Colors.white,
+                deleteIconColor: context.isDarkTheme ? Colors.black : Colors.white,
                 deleteIcon: const Icon(
                   Icons.cancel_rounded,
                   size: 15,
@@ -504,9 +486,7 @@ class _SelectAllButton extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final canSelectAll = filteredAlbums
-        .where((album) => album.backupSelection != BackupSelection.selected)
-        .isNotEmpty;
+    final canSelectAll = filteredAlbums.where((album) => album.backupSelection != BackupSelection.selected).isNotEmpty;
 
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
@@ -518,9 +498,7 @@ class _SelectAllButton extends ConsumerWidget {
                   ? () {
                       for (final album in filteredAlbums) {
                         if (album.backupSelection != BackupSelection.selected) {
-                          ref
-                              .read(backupAlbumProvider.notifier)
-                              .selectAlbum(album);
+                          ref.read(backupAlbumProvider.notifier).selectAlbum(album);
                         }
                       }
                     }
@@ -544,9 +522,7 @@ class _SelectAllButton extends ConsumerWidget {
                   ? () {
                       for (final album in filteredAlbums) {
                         if (album.backupSelection == BackupSelection.selected) {
-                          ref
-                              .read(backupAlbumProvider.notifier)
-                              .deselectAlbum(album);
+                          ref.read(backupAlbumProvider.notifier).deselectAlbum(album);
                         }
                       }
                     }
diff --git a/mobile/lib/pages/backup/drift_upload_detail.page.dart b/mobile/lib/pages/backup/drift_upload_detail.page.dart
index 058bfa1aaf..62d6341fd1 100644
--- a/mobile/lib/pages/backup/drift_upload_detail.page.dart
+++ b/mobile/lib/pages/backup/drift_upload_detail.page.dart
@@ -27,9 +27,7 @@ class DriftUploadDetailPage extends ConsumerWidget {
         elevation: 0,
         scrolledUnderElevation: 1,
       ),
-      body: uploadItems.isEmpty
-          ? _buildEmptyState(context)
-          : _buildUploadList(uploadItems),
+      body: uploadItems.isEmpty ? _buildEmptyState(context) : _buildUploadList(uploadItems),
     );
   }
 
@@ -79,9 +77,7 @@ class DriftUploadDetailPage extends ConsumerWidget {
 
     return Card(
       elevation: 0,
-      color: item.isFailed != null
-          ? context.colorScheme.errorContainer
-          : context.colorScheme.surfaceContainer,
+      color: item.isFailed != null ? context.colorScheme.errorContainer : context.colorScheme.surfaceContainer,
       shape: RoundedRectangleBorder(
         borderRadius: const BorderRadius.all(
           Radius.circular(16),
@@ -119,8 +115,7 @@ class DriftUploadDetailPage extends ConsumerWidget {
                         Text(
                           'Tap for more details',
                           style: context.textTheme.bodySmall?.copyWith(
-                            color: context.colorScheme.onSurface
-                                .withValues(alpha: 0.6),
+                            color: context.colorScheme.onSurface.withValues(alpha: 0.6),
                           ),
                           maxLines: 1,
                           overflow: TextOverflow.ellipsis,
@@ -163,13 +158,10 @@ class DriftUploadDetailPage extends ConsumerWidget {
                 tween: Tween<double>(begin: 0.0, end: progress),
                 duration: const Duration(milliseconds: 300),
                 builder: (context, value, _) => CircularProgressIndicator(
-                  backgroundColor:
-                      context.colorScheme.outline.withValues(alpha: 0.2),
+                  backgroundColor: context.colorScheme.outline.withValues(alpha: 0.2),
                   strokeWidth: 3,
                   value: value,
-                  color: isCompleted
-                      ? context.colorScheme.primary
-                      : context.colorScheme.secondary,
+                  color: isCompleted ? context.colorScheme.primary : context.colorScheme.secondary,
                 ),
               ),
             ),
@@ -279,12 +271,10 @@ class FileDetailDialog extends ConsumerWidget {
                         height: 128,
                         decoration: BoxDecoration(
                           border: Border.all(
-                            color: context.colorScheme.outline
-                                .withValues(alpha: 0.2),
+                            color: context.colorScheme.outline.withValues(alpha: 0.2),
                             width: 1,
                           ),
-                          borderRadius:
-                              const BorderRadius.all(Radius.circular(12)),
+                          borderRadius: const BorderRadius.all(Radius.circular(12)),
                         ),
                         child: asset != null
                             ? Thumbnail(
@@ -314,8 +304,7 @@ class FileDetailDialog extends ConsumerWidget {
                         "File Size",
                         formatHumanReadableBytes(uploadStatus.fileSize, 2),
                       ),
-                      if (asset.width != null)
-                        _buildInfoRow(context, "Width", "${asset.width}px"),
+                      if (asset.width != null) _buildInfoRow(context, "Width", "${asset.width}px"),
                       if (asset.height != null)
                         _buildInfoRow(
                           context,
diff --git a/mobile/lib/pages/backup/failed_backup_status.page.dart b/mobile/lib/pages/backup/failed_backup_status.page.dart
index 167b0f2ebd..8d0faf2d22 100644
--- a/mobile/lib/pages/backup/failed_backup_status.page.dart
+++ b/mobile/lib/pages/backup/failed_backup_status.page.dart
@@ -97,9 +97,7 @@ class FailedBackupStatusPage extends HookConsumerWidget {
                                 ),
                                 style: TextStyle(
                                   fontWeight: FontWeight.w600,
-                                  color: context.isDarkTheme
-                                      ? Colors.white70
-                                      : Colors.grey[800],
+                                  color: context.isDarkTheme ? Colors.white70 : Colors.grey[800],
                                 ),
                               ),
                               Icon(
@@ -125,9 +123,7 @@ class FailedBackupStatusPage extends HookConsumerWidget {
                             errorAsset.errorMessage,
                             style: TextStyle(
                               fontWeight: FontWeight.w500,
-                              color: context.isDarkTheme
-                                  ? Colors.white70
-                                  : Colors.grey[800],
+                              color: context.isDarkTheme ? Colors.white70 : Colors.grey[800],
                             ),
                           ),
                         ],
diff --git a/mobile/lib/pages/common/activities.page.dart b/mobile/lib/pages/common/activities.page.dart
index 776ee9977b..203df2d503 100644
--- a/mobile/lib/pages/common/activities.page.dart
+++ b/mobile/lib/pages/common/activities.page.dart
@@ -27,10 +27,8 @@ class ActivitiesPage extends HookConsumerWidget {
     final asset = ref.watch(currentAssetProvider);
     final user = ref.watch(currentUserProvider);
 
-    final activityNotifier = ref
-        .read(albumActivityProvider(album.remoteId!, asset?.remoteId).notifier);
-    final activities =
-        ref.watch(albumActivityProvider(album.remoteId!, asset?.remoteId));
+    final activityNotifier = ref.read(albumActivityProvider(album.remoteId!, asset?.remoteId).notifier);
+    final activities = ref.watch(albumActivityProvider(album.remoteId!, asset?.remoteId));
 
     final listViewScrollController = useScrollController();
 
@@ -49,10 +47,7 @@ class ActivitiesPage extends HookConsumerWidget {
       body: activities.widgetWhen(
         onData: (data) {
           final liked = data.firstWhereOrNull(
-            (a) =>
-                a.type == ActivityType.like &&
-                a.user.id == user?.id &&
-                a.assetId == asset?.remoteId,
+            (a) => a.type == ActivityType.like && a.user.id == user?.id && a.assetId == asset?.remoteId,
           );
 
           return SafeArea(
@@ -71,18 +66,15 @@ class ActivitiesPage extends HookConsumerWidget {
                     }
 
                     final activity = data[index];
-                    final canDelete = activity.user.id == user?.id ||
-                        album.ownerId == user?.id;
+                    final canDelete = activity.user.id == user?.id || album.ownerId == user?.id;
 
                     return Padding(
                       padding: const EdgeInsets.all(5),
                       child: DismissibleActivity(
                         activity.id,
                         ActivityTile(activity),
-                        onDismiss: canDelete
-                            ? (activityId) async => await activityNotifier
-                                .removeActivity(activity.id)
-                            : null,
+                        onDismiss:
+                            canDelete ? (activityId) async => await activityNotifier.removeActivity(activity.id) : null,
                       ),
                     );
                   },
diff --git a/mobile/lib/pages/common/app_log_detail.page.dart b/mobile/lib/pages/common/app_log_detail.page.dart
index b88d6aeb3a..d8647ca8e2 100644
--- a/mobile/lib/pages/common/app_log_detail.page.dart
+++ b/mobile/lib/pages/common/app_log_detail.page.dart
@@ -130,10 +130,8 @@ class AppLogDetailPage extends HookConsumerWidget {
         child: ListView(
           children: [
             buildTextWithCopyButton("MESSAGE", logMessage.message),
-            if (logMessage.error != null)
-              buildTextWithCopyButton("DETAILS", logMessage.error.toString()),
-            if (logMessage.logger != null)
-              buildLogContext1(logMessage.logger.toString()),
+            if (logMessage.error != null) buildTextWithCopyButton("DETAILS", logMessage.error.toString()),
+            if (logMessage.logger != null) buildLogContext1(logMessage.logger.toString()),
             if (logMessage.stack != null)
               buildTextWithCopyButton(
                 "STACK TRACE",
diff --git a/mobile/lib/pages/common/change_experience.page.dart b/mobile/lib/pages/common/change_experience.page.dart
index 3cd545ea33..21464e39fa 100644
--- a/mobile/lib/pages/common/change_experience.page.dart
+++ b/mobile/lib/pages/common/change_experience.page.dart
@@ -61,9 +61,7 @@ class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
       ref.read(websocketProvider.notifier).stopListenToOldEvents();
       ref.read(websocketProvider.notifier).startListeningToBetaEvents();
 
-      final permission = await ref
-          .read(galleryPermissionNotifier.notifier)
-          .requestGalleryPermission();
+      final permission = await ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission();
 
       if (permission.isGranted) {
         await ref.read(backgroundSyncProvider).syncLocal(full: true);
@@ -138,9 +136,7 @@ class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
                       child: ElevatedButton(
                         onPressed: () {
                           context.replaceRoute(
-                            widget.switchingToBeta
-                                ? const TabShellRoute()
-                                : const TabControllerRoute(),
+                            widget.switchingToBeta ? const TabShellRoute() : const TabControllerRoute(),
                           );
                         },
                         child: const Text("Continue"),
diff --git a/mobile/lib/pages/common/create_album.page.dart b/mobile/lib/pages/common/create_album.page.dart
index faf1671a9e..02e1ea18d4 100644
--- a/mobile/lib/pages/common/create_album.page.dart
+++ b/mobile/lib/pages/common/create_album.page.dart
@@ -27,8 +27,7 @@ class CreateAlbumPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final albumTitleController =
-        useTextEditingController.fromValue(TextEditingValue.empty);
+    final albumTitleController = useTextEditingController.fromValue(TextEditingValue.empty);
     final albumTitleTextFieldFocusNode = useFocusNode();
     final albumDescriptionTextFieldFocusNode = useFocusNode();
     final isAlbumTitleTextFieldFocus = useState(false);
@@ -45,15 +44,12 @@ class CreateAlbumPage extends HookConsumerWidget {
       if (albumTitleController.text.isEmpty) {
         albumTitleController.text = 'create_album_page_untitled'.tr();
         isAlbumTitleEmpty.value = false;
-        ref
-            .watch(albumTitleProvider.notifier)
-            .setAlbumTitle('create_album_page_untitled'.tr());
+        ref.watch(albumTitleProvider.notifier).setAlbumTitle('create_album_page_untitled'.tr());
       }
     }
 
     onSelectPhotosButtonPressed() async {
-      AssetSelectionPageResult? selectedAsset =
-          await context.pushRoute<AssetSelectionPageResult?>(
+      AssetSelectionPageResult? selectedAsset = await context.pushRoute<AssetSelectionPageResult?>(
         AlbumAssetSelectionRoute(
           existingAssets: selectedAssets.value,
           canDeselect: true,
@@ -118,8 +114,7 @@ class CreateAlbumPage extends HookConsumerWidget {
             child: FilledButton.icon(
               style: FilledButton.styleFrom(
                 alignment: Alignment.centerLeft,
-                padding:
-                    const EdgeInsets.symmetric(vertical: 24, horizontal: 16),
+                padding: const EdgeInsets.symmetric(vertical: 24, horizontal: 16),
                 shape: const RoundedRectangleBorder(
                   borderRadius: BorderRadius.all(
                     Radius.circular(10),
@@ -230,15 +225,12 @@ class CreateAlbumPage extends HookConsumerWidget {
         ).tr(),
         actions: [
           TextButton(
-            onPressed:
-                albumTitleController.text.isNotEmpty ? createAlbum : null,
+            onPressed: albumTitleController.text.isNotEmpty ? createAlbum : null,
             child: Text(
               'create'.tr(),
               style: TextStyle(
                 fontWeight: FontWeight.bold,
-                color: albumTitleController.text.isNotEmpty
-                    ? context.primaryColor
-                    : context.themeData.disabledColor,
+                color: albumTitleController.text.isNotEmpty ? context.primaryColor : context.themeData.disabledColor,
               ),
             ),
           ),
diff --git a/mobile/lib/pages/common/download_panel.dart b/mobile/lib/pages/common/download_panel.dart
index cc543c9e4e..38212d5486 100644
--- a/mobile/lib/pages/common/download_panel.dart
+++ b/mobile/lib/pages/common/download_panel.dart
@@ -34,8 +34,7 @@ class DownloadPanel extends ConsumerWidget {
         duration: const Duration(milliseconds: 300),
         child: showProgress
             ? ConstrainedBox(
-                constraints:
-                    BoxConstraints.loose(Size(context.width - 32, 300)),
+                constraints: BoxConstraints.loose(Size(context.width - 32, 300)),
                 child: ListView.builder(
                   shrinkWrap: true,
                   itemCount: tasks.length,
@@ -122,8 +121,7 @@ class DownloadTaskTile extends StatelessWidget {
                     child: LinearProgressIndicator(
                       minHeight: 8.0,
                       value: progress,
-                      borderRadius:
-                          const BorderRadius.all(Radius.circular(10.0)),
+                      borderRadius: const BorderRadius.all(Radius.circular(10.0)),
                     ),
                   ),
                   const SizedBox(width: 8),
diff --git a/mobile/lib/pages/common/gallery_viewer.page.dart b/mobile/lib/pages/common/gallery_viewer.page.dart
index 539406365a..05389018da 100644
--- a/mobile/lib/pages/common/gallery_viewer.page.dart
+++ b/mobile/lib/pages/common/gallery_viewer.page.dart
@@ -267,8 +267,7 @@ class GalleryViewerPage extends HookConsumerWidget {
 
     PhotoViewGalleryPageOptions buildVideo(BuildContext context, Asset asset) {
       return PhotoViewGalleryPageOptions.customChild(
-        onDragStart: (_, details, __, ___) =>
-            localPosition.value = details.localPosition,
+        onDragStart: (_, details, __, ___) => localPosition.value = details.localPosition,
         onDragUpdate: (_, details, __) => handleSwipeUpDown(details),
         heroAttributes: _getHeroAttributes(asset),
         filterQuality: FilterQuality.high,
@@ -304,8 +303,7 @@ class GalleryViewerPage extends HookConsumerWidget {
 
       final stackId = newAsset.stackId;
       if (stackId != null && currentIndex.value == index) {
-        final stackElements =
-            ref.read(assetStackStateProvider(newAsset.stackId!));
+        final stackElements = ref.read(assetStackStateProvider(newAsset.stackId!));
         if (stackIndex.value < stackElements.length) {
           newAsset = stackElements.elementAt(stackIndex.value);
         }
@@ -319,8 +317,7 @@ class GalleryViewerPage extends HookConsumerWidget {
 
     return PopScope(
       // Change immersive mode back to normal "edgeToEdge" mode
-      onPopInvokedWithResult: (didPop, _) =>
-          SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge),
+      onPopInvokedWithResult: (didPop, _) => SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge),
       child: Scaffold(
         backgroundColor: Colors.black,
         body: Stack(
@@ -335,8 +332,7 @@ class GalleryViewerPage extends HookConsumerWidget {
 
                 if (asset.isImage && !ref.read(isPlayingMotionVideoProvider)) {
                   isZoomed.value = state != PhotoViewScaleState.initial;
-                  ref.read(showControlsProvider.notifier).show =
-                      !isZoomed.value;
+                  ref.read(showControlsProvider.notifier).show = !isZoomed.value;
                 }
               },
               gaplessPlayback: true,
@@ -454,9 +450,7 @@ class GalleryViewerPage extends HookConsumerWidget {
   @pragma('vm:prefer-inline')
   PhotoViewHeroAttributes _getHeroAttributes(Asset asset) {
     return PhotoViewHeroAttributes(
-      tag: asset.isInDb
-          ? asset.id + heroOffset
-          : '${asset.remoteId}-$heroOffset',
+      tag: asset.isInDb ? asset.id + heroOffset : '${asset.remoteId}-$heroOffset',
       transitionOnUserGestures: true,
     );
   }
diff --git a/mobile/lib/pages/common/large_leading_tile.dart b/mobile/lib/pages/common/large_leading_tile.dart
index 4f22a5f2b2..d36e296429 100644
--- a/mobile/lib/pages/common/large_leading_tile.dart
+++ b/mobile/lib/pages/common/large_leading_tile.dart
@@ -40,8 +40,7 @@ class LargeLeadingTile extends StatelessWidget {
       child: Container(
         decoration: BoxDecoration(
           color: selected
-              ? selectedTileColor ??
-                  Theme.of(context).primaryColor.withAlpha(30)
+              ? selectedTileColor ?? Theme.of(context).primaryColor.withAlpha(30)
               : tileColor ?? Colors.transparent,
           borderRadius: BorderRadius.circular(borderRadius),
         ),
diff --git a/mobile/lib/pages/common/native_video_viewer.page.dart b/mobile/lib/pages/common/native_video_viewer.page.dart
index 5c1dd8fc66..0dbaf6125c 100644
--- a/mobile/lib/pages/common/native_video_viewer.page.dart
+++ b/mobile/lib/pages/common/native_video_viewer.page.dart
@@ -87,11 +87,9 @@ class NativeVideoViewerPage extends HookConsumerWidget {
 
         // Use a network URL for the video player controller
         final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-        final isOriginalVideo = ref
-            .read(appSettingsServiceProvider)
-            .getSetting<bool>(AppSettingsEnum.loadOriginalVideo);
-        final String postfixUrl =
-            isOriginalVideo ? 'original' : 'video/playback';
+        final isOriginalVideo =
+            ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.loadOriginalVideo);
+        final String postfixUrl = isOriginalVideo ? 'original' : 'video/playback';
         final String videoUrl = asset.livePhotoVideoId != null
             ? '$serverEndpoint/assets/${asset.livePhotoVideoId}/$postfixUrl'
             : '$serverEndpoint/assets/${asset.remoteId}/$postfixUrl';
@@ -119,8 +117,7 @@ class NativeVideoViewerPage extends HookConsumerWidget {
         }
 
         try {
-          aspectRatio.value =
-              await ref.read(assetServiceProvider).getAspectRatio(asset);
+          aspectRatio.value = await ref.read(assetServiceProvider).getAspectRatio(asset);
         } catch (error) {
           log.severe(
             'Error getting aspect ratio for asset ${asset.fileName}: $error',
@@ -135,8 +132,7 @@ class NativeVideoViewerPage extends HookConsumerWidget {
       }
 
       final videoPlayback = ref.read(videoPlaybackValueProvider);
-      if ((isBuffering.value ||
-              videoPlayback.state == VideoPlaybackState.initializing) &&
+      if ((isBuffering.value || videoPlayback.state == VideoPlaybackState.initializing) &&
           videoPlayback.state != VideoPlaybackState.buffering) {
         ref.read(videoPlaybackValueProvider.notifier).value =
             videoPlayback.copyWith(state: VideoPlaybackState.buffering);
@@ -195,8 +191,7 @@ class NativeVideoViewerPage extends HookConsumerWidget {
         return;
       }
 
-      final videoPlayback =
-          VideoPlaybackValue.fromNativeController(videoController);
+      final videoPlayback = VideoPlaybackValue.fromNativeController(videoController);
       ref.read(videoPlaybackValueProvider.notifier).value = videoPlayback;
 
       isVideoReady.value = true;
@@ -215,8 +210,7 @@ class NativeVideoViewerPage extends HookConsumerWidget {
         return;
       }
 
-      final videoPlayback =
-          VideoPlaybackValue.fromNativeController(videoController);
+      final videoPlayback = VideoPlaybackValue.fromNativeController(videoController);
       if (videoPlayback.state == VideoPlaybackState.playing) {
         // Sync with the controls playing
         WakelockPlus.enable();
@@ -225,8 +219,7 @@ class NativeVideoViewerPage extends HookConsumerWidget {
         WakelockPlus.disable();
       }
 
-      ref.read(videoPlaybackValueProvider.notifier).status =
-          videoPlayback.state;
+      ref.read(videoPlaybackValueProvider.notifier).status = videoPlayback.state;
     }
 
     void onPlaybackPositionChanged() {
@@ -245,8 +238,7 @@ class NativeVideoViewerPage extends HookConsumerWidget {
         return;
       }
 
-      ref.read(videoPlaybackValueProvider.notifier).position =
-          Duration(seconds: playbackInfo.position);
+      ref.read(videoPlaybackValueProvider.notifier).position = Duration(seconds: playbackInfo.position);
 
       // Check if the video is buffering
       if (playbackInfo.status == PlaybackStatus.playing) {
@@ -265,18 +257,14 @@ class NativeVideoViewerPage extends HookConsumerWidget {
       }
 
       if (videoController.playbackInfo?.status == PlaybackStatus.stopped &&
-          !ref
-              .read(appSettingsServiceProvider)
-              .getSetting<bool>(AppSettingsEnum.loopVideo)) {
+          !ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.loopVideo)) {
         ref.read(isPlayingMotionVideoProvider.notifier).playing = false;
       }
     }
 
     void removeListeners(NativeVideoPlayerController controller) {
-      controller.onPlaybackPositionChanged
-          .removeListener(onPlaybackPositionChanged);
-      controller.onPlaybackStatusChanged
-          .removeListener(onPlaybackStatusChanged);
+      controller.onPlaybackPositionChanged.removeListener(onPlaybackPositionChanged);
+      controller.onPlaybackStatusChanged.removeListener(onPlaybackStatusChanged);
       controller.onPlaybackReady.removeListener(onPlaybackReady);
       controller.onPlaybackEnded.removeListener(onPlaybackEnded);
     }
@@ -301,9 +289,7 @@ class NativeVideoViewerPage extends HookConsumerWidget {
       nc.loadVideoSource(source).catchError((error) {
         log.severe('Error loading video source: $error');
       });
-      final loopVideo = ref
-          .read(appSettingsServiceProvider)
-          .getSetting<bool>(AppSettingsEnum.loopVideo);
+      final loopVideo = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.loopVideo);
       nc.setLoop(loopVideo);
 
       controller.value = nc;
@@ -397,8 +383,7 @@ class NativeVideoViewerPage extends HookConsumerWidget {
       children: [
         // This remains under the video to avoid flickering
         // For motion videos, this is the image portion of the asset
-        if (!isVideoReady.value || asset.isMotionPhoto)
-          Center(key: ValueKey(asset.id), child: image),
+        if (!isVideoReady.value || asset.isMotionPhoto) Center(key: ValueKey(asset.id), child: image),
         if (aspectRatio.value != null && !isCasting)
           Visibility.maintain(
             key: ValueKey(asset),
diff --git a/mobile/lib/pages/common/settings.page.dart b/mobile/lib/pages/common/settings.page.dart
index 439e5068a3..11ae053a68 100644
--- a/mobile/lib/pages/common/settings.page.dart
+++ b/mobile/lib/pages/common/settings.page.dart
@@ -129,8 +129,7 @@ class _TabletLayout extends HookWidget {
   const _TabletLayout();
   @override
   Widget build(BuildContext context) {
-    final selectedSection =
-        useState<SettingSection>(SettingSection.values.first);
+    final selectedSection = useState<SettingSection>(SettingSection.values.first);
 
     return Row(
       mainAxisAlignment: MainAxisAlignment.start,
diff --git a/mobile/lib/pages/common/splash_screen.page.dart b/mobile/lib/pages/common/splash_screen.page.dart
index 598e920651..a8af0df763 100644
--- a/mobile/lib/pages/common/splash_screen.page.dart
+++ b/mobile/lib/pages/common/splash_screen.page.dart
@@ -74,9 +74,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
 
     if (context.router.current.name == SplashScreenRoute.name) {
       context.replaceRoute(
-        Store.isBetaTimelineEnabled
-            ? const TabShellRoute()
-            : const TabControllerRoute(),
+        Store.isBetaTimelineEnabled ? const TabShellRoute() : const TabControllerRoute(),
       );
     }
 
@@ -84,8 +82,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
       return;
     }
 
-    final hasPermission =
-        await ref.read(galleryPermissionNotifier.notifier).hasPermission;
+    final hasPermission = await ref.read(galleryPermissionNotifier.notifier).hasPermission;
     if (hasPermission) {
       // Resume backup (if enable) then navigate
       ref.watch(backupProvider.notifier).resumeBackup();
diff --git a/mobile/lib/pages/common/tab_controller.page.dart b/mobile/lib/pages/common/tab_controller.page.dart
index e713b3f8da..676b1db11b 100644
--- a/mobile/lib/pages/common/tab_controller.page.dart
+++ b/mobile/lib/pages/common/tab_controller.page.dart
@@ -20,8 +20,7 @@ class TabControllerPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final isRefreshingAssets = ref.watch(assetProvider);
     final isRefreshingRemoteAlbums = ref.watch(isRefreshingRemoteAlbumProvider);
-    final isScreenLandscape =
-        MediaQuery.orientationOf(context) == Orientation.landscape;
+    final isScreenLandscape = MediaQuery.orientationOf(context) == Orientation.landscape;
 
     Widget buildIcon({required Widget icon, required bool isProcessing}) {
       if (!isProcessing) return icon;
@@ -118,8 +117,7 @@ class TabControllerPage extends HookConsumerWidget {
     Widget bottomNavigationBar(TabsRouter tabsRouter) {
       return NavigationBar(
         selectedIndex: tabsRouter.activeIndex,
-        onDestinationSelected: (index) =>
-            onNavigationSelected(tabsRouter, index),
+        onDestinationSelected: (index) => onNavigationSelected(tabsRouter, index),
         destinations: navigationDestinations,
       );
     }
@@ -135,8 +133,7 @@ class TabControllerPage extends HookConsumerWidget {
               ),
             )
             .toList(),
-        onDestinationSelected: (index) =>
-            onNavigationSelected(tabsRouter, index),
+        onDestinationSelected: (index) => onNavigationSelected(tabsRouter, index),
         selectedIndex: tabsRouter.activeIndex,
         labelType: NavigationRailLabelType.all,
         groupAlignment: 0.0,
@@ -160,8 +157,7 @@ class TabControllerPage extends HookConsumerWidget {
         final tabsRouter = AutoTabsRouter.of(context);
         return PopScope(
           canPop: tabsRouter.activeIndex == 0,
-          onPopInvokedWithResult: (didPop, _) =>
-              !didPop ? tabsRouter.setActiveIndex(0) : null,
+          onPopInvokedWithResult: (didPop, _) => !didPop ? tabsRouter.setActiveIndex(0) : null,
           child: Scaffold(
             resizeToAvoidBottomInset: false,
             body: isScreenLandscape
@@ -173,9 +169,7 @@ class TabControllerPage extends HookConsumerWidget {
                     ],
                   )
                 : child,
-            bottomNavigationBar: multiselectEnabled || isScreenLandscape
-                ? null
-                : bottomNavigationBar(tabsRouter),
+            bottomNavigationBar: multiselectEnabled || isScreenLandscape ? null : bottomNavigationBar(tabsRouter),
           ),
         );
       },
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index 418c8b9e39..5129f6b159 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -33,9 +33,7 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       ref.read(websocketProvider.notifier).connect();
 
-      final isEnableBackup = ref
-          .read(appSettingsServiceProvider)
-          .getSetting(AppSettingsEnum.enableBackup);
+      final isEnableBackup = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
 
       await runNewSync(ref, full: true).then((_) async {
         if (isEnableBackup) {
@@ -44,9 +42,7 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
             return;
           }
 
-          await ref
-              .read(driftBackupProvider.notifier)
-              .handleBackupResume(currentUser.id);
+          await ref.read(driftBackupProvider.notifier).handleBackupResume(currentUser.id);
         }
       });
     });
@@ -110,8 +106,7 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
               ),
             )
             .toList(),
-        onDestinationSelected: (index) =>
-            _onNavigationSelected(tabsRouter, index, ref),
+        onDestinationSelected: (index) => _onNavigationSelected(tabsRouter, index, ref),
         selectedIndex: tabsRouter.activeIndex,
         labelType: NavigationRailLabelType.all,
         groupAlignment: 0.0,
@@ -134,8 +129,7 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
         final tabsRouter = AutoTabsRouter.of(context);
         return PopScope(
           canPop: tabsRouter.activeIndex == 0,
-          onPopInvokedWithResult: (didPop, _) =>
-              !didPop ? tabsRouter.setActiveIndex(0) : null,
+          onPopInvokedWithResult: (didPop, _) => !didPop ? tabsRouter.setActiveIndex(0) : null,
           child: Scaffold(
             resizeToAvoidBottomInset: false,
             body: isScreenLandscape
@@ -191,8 +185,7 @@ class _BottomNavigationBar extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final isScreenLandscape = context.orientation == Orientation.landscape;
-    final isMultiselectEnabled =
-        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
+    final isMultiselectEnabled = ref.watch(multiSelectProvider.select((s) => s.isEnabled));
 
     if (isScreenLandscape || isMultiselectEnabled) {
       return const SizedBox.shrink();
@@ -200,8 +193,7 @@ class _BottomNavigationBar extends ConsumerWidget {
 
     return NavigationBar(
       selectedIndex: tabsRouter.activeIndex,
-      onDestinationSelected: (index) =>
-          _onNavigationSelected(tabsRouter, index, ref),
+      onDestinationSelected: (index) => _onNavigationSelected(tabsRouter, index, ref),
       destinations: destinations,
     );
   }
diff --git a/mobile/lib/pages/editing/crop.page.dart b/mobile/lib/pages/editing/crop.page.dart
index f7f459c770..97ef069e7b 100644
--- a/mobile/lib/pages/editing/crop.page.dart
+++ b/mobile/lib/pages/editing/crop.page.dart
@@ -187,9 +187,7 @@ class _AspectRatioButton extends StatelessWidget {
               '7:5' => Icons.crop_7_5_rounded,
               _ => Icons.crop_free_rounded,
             },
-            color: aspectRatio.value == ratio
-                ? context.primaryColor
-                : context.themeData.iconTheme.color,
+            color: aspectRatio.value == ratio ? context.primaryColor : context.themeData.iconTheme.color,
           ),
           onPressed: () {
             cropController.crop = const Rect.fromLTRB(0.1, 0.1, 0.9, 0.9);
diff --git a/mobile/lib/pages/editing/edit.page.dart b/mobile/lib/pages/editing/edit.page.dart
index d37941f4fe..70940e9552 100644
--- a/mobile/lib/pages/editing/edit.page.dart
+++ b/mobile/lib/pages/editing/edit.page.dart
@@ -40,9 +40,7 @@ class EditImagePage extends ConsumerWidget {
     image.image.resolve(const ImageConfiguration()).addListener(
           ImageStreamListener(
             (ImageInfo info, bool _) {
-              info.image
-                  .toByteData(format: ImageByteFormat.png)
-                  .then((byteData) {
+              info.image.toByteData(format: ImageByteFormat.png).then((byteData) {
                 if (byteData != null) {
                   completer.complete(byteData.buffer.asUint8List());
                 } else {
@@ -50,8 +48,7 @@ class EditImagePage extends ConsumerWidget {
                 }
               });
             },
-            onError: (exception, stackTrace) =>
-                completer.completeError(exception),
+            onError: (exception, stackTrace) => completer.completeError(exception),
           ),
         );
     return completer.future;
@@ -103,9 +100,7 @@ class EditImagePage extends ConsumerWidget {
         ),
         actions: <Widget>[
           TextButton(
-            onPressed: isEdited
-                ? () => _saveEditedImage(context, asset, image, ref)
-                : null,
+            onPressed: isEdited ? () => _saveEditedImage(context, asset, image, ref) : null,
             child: Text(
               "save_to_gallery".tr(),
               style: TextStyle(
diff --git a/mobile/lib/pages/editing/filter.page.dart b/mobile/lib/pages/editing/filter.page.dart
index 9af065489d..3dc8d28a94 100644
--- a/mobile/lib/pages/editing/filter.page.dart
+++ b/mobile/lib/pages/editing/filter.page.dart
@@ -34,18 +34,14 @@ class FilterImagePage extends HookWidget {
       ColorFilter filter,
     ) {
       final completer = Completer<ui.Image>();
-      final size =
-          Size(inputImage.width.toDouble(), inputImage.height.toDouble());
+      final size = Size(inputImage.width.toDouble(), inputImage.height.toDouble());
       final recorder = ui.PictureRecorder();
       final canvas = Canvas(recorder);
 
       final paint = Paint()..colorFilter = filter;
       canvas.drawImage(inputImage, Offset.zero, paint);
 
-      recorder
-          .endRecording()
-          .toImage(size.width.round(), size.height.round())
-          .then((image) {
+      recorder.endRecording().toImage(size.width.round(), size.height.round()).then((image) {
         completer.complete(image);
       });
 
@@ -67,8 +63,7 @@ class FilterImagePage extends HookWidget {
       final uiImage = await completer.future;
 
       final filteredUiImage = await createFilteredImage(uiImage, filter);
-      final byteData =
-          await filteredUiImage.toByteData(format: ui.ImageByteFormat.png);
+      final byteData = await filteredUiImage.toByteData(format: ui.ImageByteFormat.png);
       final pngBytes = byteData!.buffer.asUint8List();
 
       return Image.memory(pngBytes, fit: BoxFit.contain);
@@ -87,8 +82,7 @@ class FilterImagePage extends HookWidget {
               size: 24,
             ),
             onPressed: () async {
-              final filteredImage =
-                  await applyFilterAndConvert(colorFilter.value);
+              final filteredImage = await applyFilterAndConvert(colorFilter.value);
               context.pushRoute(
                 EditImageRoute(
                   asset: asset,
@@ -165,9 +159,7 @@ class _FilterButton extends StatelessWidget {
               borderRadius: const BorderRadius.all(
                 Radius.circular(10),
               ),
-              border: isSelected
-                  ? Border.all(color: context.primaryColor, width: 3)
-                  : null,
+              border: isSelected ? Border.all(color: context.primaryColor, width: 3) : null,
             ),
             child: ClipRRect(
               borderRadius: const BorderRadius.all(
diff --git a/mobile/lib/pages/library/folder/folder.page.dart b/mobile/lib/pages/library/folder/folder.page.dart
index 6ac7d60f9b..d089aace6e 100644
--- a/mobile/lib/pages/library/folder/folder.page.dart
+++ b/mobile/lib/pages/library/folder/folder.page.dart
@@ -21,9 +21,7 @@ RecursiveFolder? _findFolderInStructure(
   RecursiveFolder targetFolder,
 ) {
   for (final folder in rootFolder.subfolders) {
-    if (targetFolder.path == '/' &&
-        folder.path.isEmpty &&
-        folder.name == targetFolder.name) {
+    if (targetFolder.path == '/' && folder.path.isEmpty && folder.name == targetFolder.name) {
       return folder;
     }
 
@@ -54,9 +52,7 @@ class FolderPage extends HookConsumerWidget {
     useEffect(
       () {
         if (folder == null) {
-          ref
-              .read(folderStructureProvider.notifier)
-              .fetchFolders(sortOrder.value);
+          ref.read(folderStructureProvider.notifier).fetchFolders(sortOrder.value);
         }
         return null;
       },
@@ -67,8 +63,7 @@ class FolderPage extends HookConsumerWidget {
     useEffect(
       () {
         if (folder != null && folderState.hasValue) {
-          final updatedFolder =
-              _findFolderInStructure(folderState.value!, folder!);
+          final updatedFolder = _findFolderInStructure(folderState.value!, folder!);
           if (updatedFolder != null) {
             currentFolder.value = updatedFolder;
           }
@@ -79,8 +74,7 @@ class FolderPage extends HookConsumerWidget {
     );
 
     void onToggleSortOrder() {
-      final newOrder =
-          sortOrder.value == SortOrder.asc ? SortOrder.desc : SortOrder.asc;
+      final newOrder = sortOrder.value == SortOrder.asc ? SortOrder.desc : SortOrder.asc;
 
       ref.read(folderStructureProvider.notifier).fetchFolders(newOrder);
 
@@ -151,9 +145,7 @@ class FolderContent extends HookConsumerWidget {
     useEffect(
       () {
         if (folder == null) return;
-        ref
-            .read(folderRenderListProvider(folder!).notifier)
-            .fetchAssets(sortOrder);
+        ref.read(folderRenderListProvider(folder!).notifier).fetchAssets(sortOrder);
         return null;
       },
       [folder],
@@ -211,13 +203,10 @@ class FolderContent extends HookConsumerWidget {
                                 ),
                               )
                             : null,
-                        onTap: () =>
-                            context.pushRoute(FolderRoute(folder: subfolder)),
+                        onTap: () => context.pushRoute(FolderRoute(folder: subfolder)),
                       ),
                     ),
-                  if (!list.isEmpty &&
-                      list.allAssets != null &&
-                      list.allAssets!.isNotEmpty)
+                  if (!list.isEmpty && list.allAssets != null && list.allAssets!.isNotEmpty)
                     ...list.allAssets!.map(
                       (asset) => LargeLeadingTile(
                         onTap: () {
diff --git a/mobile/lib/pages/library/library.page.dart b/mobile/lib/pages/library/library.page.dart
index a9ef479e2c..f51817d067 100644
--- a/mobile/lib/pages/library/library.page.dart
+++ b/mobile/lib/pages/library/library.page.dart
@@ -25,8 +25,7 @@ class LibraryPage extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     context.locale;
-    final trashEnabled =
-        ref.watch(serverInfoProvider.select((v) => v.serverFeatures.trash));
+    final trashEnabled = ref.watch(serverInfoProvider.select((v) => v.serverFeatures.trash));
 
     return Scaffold(
       appBar: const ImmichAppBar(),
@@ -388,8 +387,7 @@ class PlacesCollectionCard extends StatelessWidget {
                 child: DecoratedBox(
                   decoration: BoxDecoration(
                     borderRadius: const BorderRadius.all(Radius.circular(20)),
-                    color:
-                        context.colorScheme.secondaryContainer.withAlpha(100),
+                    color: context.colorScheme.secondaryContainer.withAlpha(100),
                   ),
                   child: IgnorePointer(
                     child: MapThumbnail(
@@ -399,9 +397,7 @@ class PlacesCollectionCard extends StatelessWidget {
                         -157.91959,
                       ),
                       showAttribution: false,
-                      themeMode: context.isDarkTheme
-                          ? ThemeMode.dark
-                          : ThemeMode.light,
+                      themeMode: context.isDarkTheme ? ThemeMode.dark : ThemeMode.light,
                     ),
                   ),
                 ),
diff --git a/mobile/lib/pages/library/local_albums.page.dart b/mobile/lib/pages/library/local_albums.page.dart
index 9eceaca205..5c6091c76d 100644
--- a/mobile/lib/pages/library/local_albums.page.dart
+++ b/mobile/lib/pages/library/local_albums.page.dart
@@ -54,8 +54,7 @@ class LocalAlbumsPage extends HookConsumerWidget {
                   color: context.colorScheme.onSurfaceSecondary,
                 ),
               ),
-              onTap: () => context
-                  .pushRoute(AlbumViewerRoute(albumId: albums[index].id)),
+              onTap: () => context.pushRoute(AlbumViewerRoute(albumId: albums[index].id)),
             ),
           );
         },
diff --git a/mobile/lib/pages/library/locked/pin_auth.page.dart b/mobile/lib/pages/library/locked/pin_auth.page.dart
index 9bfd96ed74..abe2247927 100644
--- a/mobile/lib/pages/library/locked/pin_auth.page.dart
+++ b/mobile/lib/pages/library/locked/pin_auth.page.dart
@@ -23,11 +23,10 @@ class PinAuthPage extends HookConsumerWidget {
     final isBetaTimeline = Store.isBetaTimelineEnabled;
 
     Future<void> registerBiometric(String pinCode) async {
-      final isRegistered =
-          await ref.read(localAuthProvider.notifier).registerBiometric(
-                context,
-                pinCode,
-              );
+      final isRegistered = await ref.read(localAuthProvider.notifier).registerBiometric(
+            context,
+            pinCode,
+          );
 
       if (isRegistered) {
         context.showSnackBar(
@@ -101,8 +100,7 @@ class PinAuthPage extends HookConsumerWidget {
                           autoFocus: true,
                           onSuccess: (_) {
                             if (isBetaTimeline) {
-                              context
-                                  .replaceRoute(const DriftLockedFolderRoute());
+                              context.replaceRoute(const DriftLockedFolderRoute());
                             } else {
                               context.replaceRoute(const LockedRoute());
                             }
diff --git a/mobile/lib/pages/library/partner/drift_partner.page.dart b/mobile/lib/pages/library/partner/drift_partner.page.dart
index 04efbe066c..d65f2bc094 100644
--- a/mobile/lib/pages/library/partner/drift_partner.page.dart
+++ b/mobile/lib/pages/library/partner/drift_partner.page.dart
@@ -63,10 +63,8 @@ class DriftPartnerPage extends HookConsumerWidget {
         builder: (BuildContext context) {
           return ConfirmDialog(
             title: "stop_photo_sharing",
-            content: "partner_page_stop_sharing_content"
-                .tr(namedArgs: {'partner': partner.name}),
-            onOk: () =>
-                ref.read(partnerUsersProvider.notifier).removePartner(partner),
+            content: "partner_page_stop_sharing_content".tr(namedArgs: {'partner': partner.name}),
+            onOk: () => ref.read(partnerUsersProvider.notifier).removePartner(partner),
           );
         },
       );
diff --git a/mobile/lib/pages/library/partner/partner.page.dart b/mobile/lib/pages/library/partner/partner.page.dart
index 91b661e7ce..fb0dfe2ec3 100644
--- a/mobile/lib/pages/library/partner/partner.page.dart
+++ b/mobile/lib/pages/library/partner/partner.page.dart
@@ -53,8 +53,7 @@ class PartnerPage extends HookConsumerWidget {
         },
       );
       if (selectedUser != null) {
-        final ok =
-            await ref.read(partnerServiceProvider).addPartner(selectedUser);
+        final ok = await ref.read(partnerServiceProvider).addPartner(selectedUser);
         if (ok) {
           ref.invalidate(partnerSharedByProvider);
         } else {
@@ -73,8 +72,7 @@ class PartnerPage extends HookConsumerWidget {
         builder: (BuildContext context) {
           return ConfirmDialog(
             title: "stop_photo_sharing",
-            content: "partner_page_stop_sharing_content"
-                .tr(namedArgs: {'partner': u.name}),
+            content: "partner_page_stop_sharing_content".tr(namedArgs: {'partner': u.name}),
             onOk: () => ref.read(partnerServiceProvider).removePartner(u),
           );
         },
@@ -149,8 +147,7 @@ class PartnerPage extends HookConsumerWidget {
         centerTitle: false,
         actions: [
           IconButton(
-            onPressed:
-                availableUsers.whenOrNull(data: (data) => addNewUsersHandler),
+            onPressed: availableUsers.whenOrNull(data: (data) => addNewUsersHandler),
             icon: const Icon(Icons.person_add),
             tooltip: "add_partner".tr(),
           ),
diff --git a/mobile/lib/pages/library/partner/partner_detail.page.dart b/mobile/lib/pages/library/partner/partner_detail.page.dart
index 94e098b973..78af3f0939 100644
--- a/mobile/lib/pages/library/partner/partner_detail.page.dart
+++ b/mobile/lib/pages/library/partner/partner_detail.page.dart
@@ -38,9 +38,8 @@ class PartnerDetailPage extends HookConsumerWidget {
       if (toggleInProcess) return;
       toggleInProcess = true;
       try {
-        final ok = await ref
-            .read(partnerSharedWithProvider.notifier)
-            .updatePartner(partner, inTimeline: !inTimeline.value);
+        final ok =
+            await ref.read(partnerSharedWithProvider.notifier).updatePartner(partner, inTimeline: !inTimeline.value);
         if (ok) {
           inTimeline.value = !inTimeline.value;
           final action = inTimeline.value ? "shown on" : "hidden from";
diff --git a/mobile/lib/pages/library/people/people_collection.page.dart b/mobile/lib/pages/library/people/people_collection.page.dart
index b98e46aabe..837553ac40 100644
--- a/mobile/lib/pages/library/people/people_collection.page.dart
+++ b/mobile/lib/pages/library/people/people_collection.page.dart
@@ -66,9 +66,7 @@ class PeopleCollectionPage extends HookConsumerWidget {
               data: (people) {
                 if (search.value != null) {
                   people = people.where((person) {
-                    return person.name
-                        .toLowerCase()
-                        .contains(search.value!.toLowerCase());
+                    return person.name.toLowerCase().contains(search.value!.toLowerCase());
                   }).toList();
                 }
                 return GridView.builder(
@@ -107,8 +105,7 @@ class PeopleCollectionPage extends HookConsumerWidget {
                         ),
                         const SizedBox(height: 12),
                         GestureDetector(
-                          onTap: () =>
-                              showNameEditModel(person.id, person.name),
+                          onTap: () => showNameEditModel(person.id, person.name),
                           child: person.name.isEmpty
                               ? Text(
                                   'add_a_name'.tr(),
@@ -124,8 +121,7 @@ class PeopleCollectionPage extends HookConsumerWidget {
                                   child: Text(
                                     person.name,
                                     overflow: TextOverflow.ellipsis,
-                                    style:
-                                        context.textTheme.titleSmall?.copyWith(
+                                    style: context.textTheme.titleSmall?.copyWith(
                                       fontWeight: FontWeight.w500,
                                     ),
                                   ),
diff --git a/mobile/lib/pages/library/places/places_collection.page.dart b/mobile/lib/pages/library/places/places_collection.page.dart
index b98537d515..98bf372a96 100644
--- a/mobile/lib/pages/library/places/places_collection.page.dart
+++ b/mobile/lib/pages/library/places/places_collection.page.dart
@@ -59,8 +59,7 @@ class PlacesCollectionPage extends HookConsumerWidget {
                 height: 200,
                 width: context.width,
                 child: MapThumbnail(
-                  onTap: (_, __) => context
-                      .pushRoute(MapRoute(initialLocation: currentLocation)),
+                  onTap: (_, __) => context.pushRoute(MapRoute(initialLocation: currentLocation)),
                   zoom: 8,
                   centre: currentLocation ??
                       const LatLng(
@@ -68,8 +67,7 @@ class PlacesCollectionPage extends HookConsumerWidget {
                         -157.91959,
                       ),
                   showAttribution: false,
-                  themeMode:
-                      context.isDarkTheme ? ThemeMode.dark : ThemeMode.light,
+                  themeMode: context.isDarkTheme ? ThemeMode.dark : ThemeMode.light,
                 ),
               ),
             ),
@@ -77,9 +75,7 @@ class PlacesCollectionPage extends HookConsumerWidget {
             data: (places) {
               if (search.value != null) {
                 places = places.where((place) {
-                  return place.label
-                      .toLowerCase()
-                      .contains(search.value!.toLowerCase());
+                  return place.label.toLowerCase().contains(search.value!.toLowerCase());
                 }).toList();
               }
               return ListView.builder(
@@ -110,8 +106,7 @@ class PlaceTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final thumbnailUrl =
-        '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail';
+    final thumbnailUrl = '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail';
 
     void navigateToPlace() {
       context.pushRoute(
@@ -152,8 +147,7 @@ class PlaceTile extends StatelessWidget {
           fit: BoxFit.cover,
           imageUrl: thumbnailUrl,
           httpHeaders: ApiService.getRequestHeaders(),
-          errorWidget: (context, url, error) =>
-              const Icon(Icons.image_not_supported_outlined),
+          errorWidget: (context, url, error) => const Icon(Icons.image_not_supported_outlined),
         ),
       ),
     );
diff --git a/mobile/lib/pages/library/shared_link/shared_link.page.dart b/mobile/lib/pages/library/shared_link/shared_link.page.dart
index 8873e9b443..94af8f913b 100644
--- a/mobile/lib/pages/library/shared_link/shared_link.page.dart
+++ b/mobile/lib/pages/library/shared_link/shared_link.page.dart
@@ -58,8 +58,7 @@ class SharedLinkPage extends HookConsumerWidget {
               child: Icon(
                 Icons.link_off,
                 size: 100,
-                color:
-                    context.themeData.iconTheme.color?.withValues(alpha: 0.5),
+                color: context.themeData.iconTheme.color?.withValues(alpha: 0.5),
               ),
             ),
           ),
@@ -86,8 +85,7 @@ class SharedLinkPage extends HookConsumerWidget {
                 if (constraints.maxWidth > 600) {
                   // Two column
                   return GridView.builder(
-                    gridDelegate:
-                        const SliverGridDelegateWithFixedCrossAxisCount(
+                    gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
                       crossAxisCount: 2,
                       mainAxisExtent: 180,
                     ),
@@ -121,8 +119,7 @@ class SharedLinkPage extends HookConsumerWidget {
       body: SafeArea(
         child: sharedLinks.widgetWhen(
           onError: (error, stackTrace) => buildNoShares(),
-          onData: (links) =>
-              links.isNotEmpty ? buildSharesList(links) : buildNoShares(),
+          onData: (links) => links.isNotEmpty ? buildSharesList(links) : buildNoShares(),
         ),
       ),
     );
diff --git a/mobile/lib/pages/library/shared_link/shared_link_edit.page.dart b/mobile/lib/pages/library/shared_link/shared_link_edit.page.dart
index 6c18841089..c6db85a0fa 100644
--- a/mobile/lib/pages/library/shared_link/shared_link_edit.page.dart
+++ b/mobile/lib/pages/library/shared_link/shared_link_edit.page.dart
@@ -31,11 +31,9 @@ class SharedLinkEditPage extends HookConsumerWidget {
     const padding = 20.0;
     final themeData = context.themeData;
     final colorScheme = context.colorScheme;
-    final descriptionController =
-        useTextEditingController(text: existingLink?.description ?? "");
+    final descriptionController = useTextEditingController(text: existingLink?.description ?? "");
     final descriptionFocusNode = useFocusNode();
-    final passwordController =
-        useTextEditingController(text: existingLink?.password ?? "");
+    final passwordController = useTextEditingController(text: existingLink?.password ?? "");
     final showMetadata = useState(existingLink?.showMetadata ?? true);
     final allowDownload = useState(existingLink?.allowDownload ?? true);
     final allowUpload = useState(existingLink?.allowUpload ?? false);
@@ -155,15 +153,12 @@ class SharedLinkEditPage extends HookConsumerWidget {
     Widget buildShowMetaButton() {
       return SwitchListTile.adaptive(
         value: showMetadata.value,
-        onChanged: newShareLink.value.isEmpty
-            ? (value) => showMetadata.value = value
-            : null,
+        onChanged: newShareLink.value.isEmpty ? (value) => showMetadata.value = value : null,
         activeColor: colorScheme.primary,
         dense: true,
         title: Text(
           "show_metadata",
-          style: themeData.textTheme.labelLarge
-              ?.copyWith(fontWeight: FontWeight.bold),
+          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
         ).tr(),
       );
     }
@@ -171,15 +166,12 @@ class SharedLinkEditPage extends HookConsumerWidget {
     Widget buildAllowDownloadButton() {
       return SwitchListTile.adaptive(
         value: allowDownload.value,
-        onChanged: newShareLink.value.isEmpty
-            ? (value) => allowDownload.value = value
-            : null,
+        onChanged: newShareLink.value.isEmpty ? (value) => allowDownload.value = value : null,
         activeColor: colorScheme.primary,
         dense: true,
         title: Text(
           "allow_public_user_to_download",
-          style: themeData.textTheme.labelLarge
-              ?.copyWith(fontWeight: FontWeight.bold),
+          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
         ).tr(),
       );
     }
@@ -187,15 +179,12 @@ class SharedLinkEditPage extends HookConsumerWidget {
     Widget buildAllowUploadButton() {
       return SwitchListTile.adaptive(
         value: allowUpload.value,
-        onChanged: newShareLink.value.isEmpty
-            ? (value) => allowUpload.value = value
-            : null,
+        onChanged: newShareLink.value.isEmpty ? (value) => allowUpload.value = value : null,
         activeColor: colorScheme.primary,
         dense: true,
         title: Text(
           "allow_public_user_to_upload",
-          style: themeData.textTheme.labelLarge
-              ?.copyWith(fontWeight: FontWeight.bold),
+          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
         ).tr(),
       );
     }
@@ -203,15 +192,12 @@ class SharedLinkEditPage extends HookConsumerWidget {
     Widget buildEditExpiryButton() {
       return SwitchListTile.adaptive(
         value: editExpiry.value,
-        onChanged: newShareLink.value.isEmpty
-            ? (value) => editExpiry.value = value
-            : null,
+        onChanged: newShareLink.value.isEmpty ? (value) => editExpiry.value = value : null,
         activeColor: colorScheme.primary,
         dense: true,
         title: Text(
           "change_expiration_time",
-          style: themeData.textTheme.labelLarge
-              ?.copyWith(fontWeight: FontWeight.bold),
+          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
         ).tr(),
       );
     }
@@ -229,8 +215,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
         enableFilter: false,
         width: context.width - 40,
         initialSelection: expiryAfter.value,
-        enabled: newShareLink.value.isEmpty &&
-            (existingLink == null || editExpiry.value),
+        enabled: newShareLink.value.isEmpty && (existingLink == null || editExpiry.value),
         onSelected: (value) {
           expiryAfter.value = value!;
         },
@@ -241,8 +226,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
           ),
           DropdownMenuEntry(
             value: 30,
-            label: "shared_link_edit_expire_after_option_minutes"
-                .tr(namedArgs: {'count': "30"}),
+            label: "shared_link_edit_expire_after_option_minutes".tr(namedArgs: {'count': "30"}),
           ),
           DropdownMenuEntry(
             value: 60,
@@ -250,8 +234,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
           ),
           DropdownMenuEntry(
             value: 60 * 6,
-            label: "shared_link_edit_expire_after_option_hours"
-                .tr(namedArgs: {'count': "6"}),
+            label: "shared_link_edit_expire_after_option_hours".tr(namedArgs: {'count': "6"}),
           ),
           DropdownMenuEntry(
             value: 60 * 24,
@@ -259,23 +242,19 @@ class SharedLinkEditPage extends HookConsumerWidget {
           ),
           DropdownMenuEntry(
             value: 60 * 24 * 7,
-            label: "shared_link_edit_expire_after_option_days"
-                .tr(namedArgs: {'count': "7"}),
+            label: "shared_link_edit_expire_after_option_days".tr(namedArgs: {'count': "7"}),
           ),
           DropdownMenuEntry(
             value: 60 * 24 * 30,
-            label: "shared_link_edit_expire_after_option_days"
-                .tr(namedArgs: {'count': "30"}),
+            label: "shared_link_edit_expire_after_option_days".tr(namedArgs: {'count': "30"}),
           ),
           DropdownMenuEntry(
             value: 60 * 24 * 30 * 3,
-            label: "shared_link_edit_expire_after_option_months"
-                .tr(namedArgs: {'count': "3"}),
+            label: "shared_link_edit_expire_after_option_months".tr(namedArgs: {'count': "3"}),
           ),
           DropdownMenuEntry(
             value: 60 * 24 * 30 * 12,
-            label: "shared_link_edit_expire_after_option_year"
-                .tr(namedArgs: {'count': "1"}),
+            label: "shared_link_edit_expire_after_option_year".tr(namedArgs: {'count': "1"}),
           ),
         ],
       );
@@ -346,27 +325,21 @@ class SharedLinkEditPage extends HookConsumerWidget {
     }
 
     Future<void> handleNewLink() async {
-      final newLink =
-          await ref.read(sharedLinkServiceProvider).createSharedLink(
-                albumId: albumId,
-                assetIds: assetsList,
-                showMeta: showMetadata.value,
-                allowDownload: allowDownload.value,
-                allowUpload: allowUpload.value,
-                description: descriptionController.text.isEmpty
-                    ? null
-                    : descriptionController.text,
-                password: passwordController.text.isEmpty
-                    ? null
-                    : passwordController.text,
-                expiresAt: expiryAfter.value == 0 ? null : calculateExpiry(),
-              );
+      final newLink = await ref.read(sharedLinkServiceProvider).createSharedLink(
+            albumId: albumId,
+            assetIds: assetsList,
+            showMeta: showMetadata.value,
+            allowDownload: allowDownload.value,
+            allowUpload: allowUpload.value,
+            description: descriptionController.text.isEmpty ? null : descriptionController.text,
+            password: passwordController.text.isEmpty ? null : passwordController.text,
+            expiresAt: expiryAfter.value == 0 ? null : calculateExpiry(),
+          );
       ref.invalidate(sharedLinksStateProvider);
       final externalDomain = ref.read(
         serverInfoProvider.select((s) => s.serverConfig.externalDomain),
       );
-      var serverUrl =
-          externalDomain.isNotEmpty ? externalDomain : getServerUrl();
+      var serverUrl = externalDomain.isNotEmpty ? externalDomain : getServerUrl();
       if (serverUrl != null && !serverUrl.endsWith('/')) {
         serverUrl += '/';
       }
@@ -472,8 +445,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
               child: buildAllowDownloadButton(),
             ),
             Padding(
-              padding:
-                  const EdgeInsets.only(left: padding, right: 20, bottom: 20),
+              padding: const EdgeInsets.only(left: padding, right: 20, bottom: 20),
               child: buildAllowUploadButton(),
             ),
             if (existingLink != null)
@@ -502,12 +474,9 @@ class SharedLinkEditPage extends HookConsumerWidget {
                     bottom: padding,
                   ),
                   child: ElevatedButton(
-                    onPressed:
-                        existingLink != null ? handleEditLink : handleNewLink,
+                    onPressed: existingLink != null ? handleEditLink : handleNewLink,
                     child: Text(
-                      existingLink != null
-                          ? "shared_link_edit_submit_button"
-                          : "create_link",
+                      existingLink != null ? "shared_link_edit_submit_button" : "create_link",
                       style: const TextStyle(
                         fontSize: 14,
                         fontWeight: FontWeight.bold,
diff --git a/mobile/lib/pages/library/trash.page.dart b/mobile/lib/pages/library/trash.page.dart
index c645719974..9ffe7ae704 100644
--- a/mobile/lib/pages/library/trash.page.dart
+++ b/mobile/lib/pages/library/trash.page.dart
@@ -24,8 +24,7 @@ class TrashPage extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final trashRenderList = ref.watch(trashTimelineProvider);
-    final trashDays =
-        ref.watch(serverInfoProvider.select((v) => v.serverConfig.trashDays));
+    final trashDays = ref.watch(serverInfoProvider.select((v) => v.serverConfig.trashDays));
     final selectionEnabledHook = useState(false);
     final selection = useState(<Asset>{});
     final processing = useProcessingOverlay();
@@ -68,16 +67,13 @@ class TrashPage extends HookConsumerWidget {
       processing.value = true;
       try {
         if (selection.value.isNotEmpty) {
-          final isRemoved = await ref
-              .read(assetProvider.notifier)
-              .deleteAssets(selection.value, force: true);
+          final isRemoved = await ref.read(assetProvider.notifier).deleteAssets(selection.value, force: true);
 
           if (isRemoved) {
             if (context.mounted) {
               ImmichToast.show(
                 context: context,
-                msg: 'assets_deleted_permanently'
-                    .tr(namedArgs: {'count': "${selection.value.length}"}),
+                msg: 'assets_deleted_permanently'.tr(namedArgs: {'count': "${selection.value.length}"}),
                 gravity: ToastGravity.BOTTOM,
               );
             }
@@ -110,15 +106,12 @@ class TrashPage extends HookConsumerWidget {
       processing.value = true;
       try {
         if (selection.value.isNotEmpty) {
-          final result = await ref
-              .read(trashProvider.notifier)
-              .restoreAssets(selection.value);
+          final result = await ref.read(trashProvider.notifier).restoreAssets(selection.value);
 
           if (result && context.mounted) {
             ImmichToast.show(
               context: context,
-              msg: 'assets_restored_successfully'
-                  .tr(namedArgs: {'count': "${selection.value.length}"}),
+              msg: 'assets_restored_successfully'.tr(namedArgs: {'count': "${selection.value.length}"}),
               gravity: ToastGravity.BOTTOM,
             );
           }
@@ -131,9 +124,7 @@ class TrashPage extends HookConsumerWidget {
 
     String getAppBarTitle(String count) {
       if (selectionEnabledHook.value) {
-        return selection.value.isNotEmpty
-            ? "${selection.value.length}"
-            : "trash_page_select_assets_btn".tr();
+        return selection.value.isNotEmpty ? "${selection.value.length}" : "trash_page_select_assets_btn".tr();
       }
       return 'trash_page_title'.tr(namedArgs: {'count': count});
     }
@@ -147,9 +138,8 @@ class TrashPage extends HookConsumerWidget {
                   selectionEnabledHook.value = false;
                   selection.value = {};
                 },
-          icon: !selectionEnabledHook.value
-              ? const Icon(Icons.arrow_back_ios_rounded)
-              : const Icon(Icons.close_rounded),
+          icon:
+              !selectionEnabledHook.value ? const Icon(Icons.arrow_back_ios_rounded) : const Icon(Icons.close_rounded),
         ),
         centerTitle: !selectionEnabledHook.value,
         automaticallyImplyLeading: false,
@@ -192,9 +182,7 @@ class TrashPage extends HookConsumerWidget {
                       color: Colors.red[400],
                     ),
                     label: Text(
-                      selection.value.isEmpty
-                          ? 'trash_page_delete_all'.tr()
-                          : 'delete'.tr(),
+                      selection.value.isEmpty ? 'trash_page_delete_all'.tr() : 'delete'.tr(),
                       style: TextStyle(
                         fontSize: 14,
                         color: Colors.red[400],
@@ -212,9 +200,7 @@ class TrashPage extends HookConsumerWidget {
                       Icons.history_rounded,
                     ),
                     label: Text(
-                      selection.value.isEmpty
-                          ? 'trash_page_restore_all'.tr()
-                          : 'restore'.tr(),
+                      selection.value.isEmpty ? 'trash_page_restore_all'.tr() : 'restore'.tr(),
                       style: const TextStyle(
                         fontSize: 14,
                         fontWeight: FontWeight.bold,
diff --git a/mobile/lib/pages/onboarding/permission_onboarding.page.dart b/mobile/lib/pages/onboarding/permission_onboarding.page.dart
index b0a1b34b06..0233208585 100644
--- a/mobile/lib/pages/onboarding/permission_onboarding.page.dart
+++ b/mobile/lib/pages/onboarding/permission_onboarding.page.dart
@@ -33,10 +33,8 @@ class PermissionOnboardingPage extends HookConsumerWidget {
           ).tr(),
           const SizedBox(height: 18),
           ElevatedButton(
-            onPressed: () => ref
-                .read(galleryPermissionNotifier.notifier)
-                .requestGalleryPermission()
-                .then((permission) async {
+            onPressed: () =>
+                ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission().then((permission) async {
               if (permission.isGranted) {
                 // If permission is limited, we will show the limited
                 // permission page
@@ -139,12 +137,8 @@ class PermissionOnboardingPage extends HookConsumerWidget {
     final Widget child = switch (permission) {
       PermissionStatus.limited => buildPermissionLimited(),
       PermissionStatus.denied => buildRequestPermission(),
-      PermissionStatus.granted ||
-      PermissionStatus.provisional =>
-        buildPermissionGranted(),
-      PermissionStatus.restricted ||
-      PermissionStatus.permanentlyDenied =>
-        buildPermissionDenied()
+      PermissionStatus.granted || PermissionStatus.provisional => buildPermissionGranted(),
+      PermissionStatus.restricted || PermissionStatus.permanentlyDenied => buildPermissionDenied()
     };
 
     return Scaffold(
diff --git a/mobile/lib/pages/photos/memory.page.dart b/mobile/lib/pages/photos/memory.page.dart
index 211472f27a..4826e19f89 100644
--- a/mobile/lib/pages/photos/memory.page.dart
+++ b/mobile/lib/pages/photos/memory.page.dart
@@ -40,8 +40,7 @@ class MemoryPage extends HookConsumerWidget {
     final currentAsset = useState<Asset?>(null);
 
     /// The list of all of the asset page controllers
-    final memoryAssetPageControllers =
-        List.generate(memories.length, (i) => usePageController());
+    final memoryAssetPageControllers = List.generate(memories.length, (i) => usePageController());
 
     /// The main vertically scrolling page controller with each list of memories
     final memoryPageController = usePageController(initialPage: memoryIndex);
@@ -73,19 +72,16 @@ class MemoryPage extends HookConsumerWidget {
         // Wait for the next frame to ensure the page is built
         SchedulerBinding.instance.addPostFrameCallback((_) {
           final previousIndex = currentMemoryIndex.value - 1;
-          final previousMemoryController =
-              memoryAssetPageControllers[previousIndex];
+          final previousMemoryController = memoryAssetPageControllers[previousIndex];
 
           // Ensure the controller is attached
           if (previousMemoryController.hasClients) {
-            previousMemoryController
-                .jumpToPage(memories[previousIndex].assets.length - 1);
+            previousMemoryController.jumpToPage(memories[previousIndex].assets.length - 1);
           } else {
             // Wait for the next frame until it is attached
             SchedulerBinding.instance.addPostFrameCallback((_) {
               if (previousMemoryController.hasClients) {
-                previousMemoryController
-                    .jumpToPage(memories[previousIndex].assets.length - 1);
+                previousMemoryController.jumpToPage(memories[previousIndex].assets.length - 1);
               }
             });
           }
@@ -96,8 +92,7 @@ class MemoryPage extends HookConsumerWidget {
     toNextAsset(int currentAssetIndex) {
       if (currentAssetIndex + 1 < currentMemory.value.assets.length) {
         // Go to the next asset
-        PageController controller =
-            memoryAssetPageControllers[currentMemoryIndex.value];
+        PageController controller = memoryAssetPageControllers[currentMemoryIndex.value];
 
         controller.nextPage(
           curve: Curves.easeInOut,
@@ -112,8 +107,7 @@ class MemoryPage extends HookConsumerWidget {
     toPreviousAsset(int currentAssetIndex) {
       if (currentAssetIndex > 0) {
         // Go to the previous asset
-        PageController controller =
-            memoryAssetPageControllers[currentMemoryIndex.value];
+        PageController controller = memoryAssetPageControllers[currentMemoryIndex.value];
 
         controller.previousPage(
           curve: Curves.easeInOut,
@@ -126,8 +120,7 @@ class MemoryPage extends HookConsumerWidget {
     }
 
     updateProgressText() {
-      assetProgress.value =
-          "${currentAssetPage.value + 1}|${currentMemory.value.assets.length}";
+      assetProgress.value = "${currentAssetPage.value + 1}|${currentMemory.value.assets.length}";
     }
 
     /// Downloads and caches the image for the asset at this [currentMemory]'s index
@@ -180,8 +173,7 @@ class MemoryPage extends HookConsumerWidget {
 
     // Precache the next page right away if we are on the first page
     if (currentAssetPage.value == 0) {
-      Future.delayed(const Duration(milliseconds: 200))
-          .then((_) => precacheAsset(1));
+      Future.delayed(const Duration(milliseconds: 200)).then((_) => precacheAsset(1));
     }
 
     Future<void> onAssetChanged(int otherIndex) async {
@@ -212,12 +204,10 @@ class MemoryPage extends HookConsumerWidget {
         // maxScrollExtend contains the sum of horizontal pixels of all assets for depth = 1
         // or sum of vertical pixels of all memories for depth = 0
         if (notification is ScrollUpdateNotification) {
-          final isEpiloguePage =
-              (memoryPageController.page?.floor() ?? 0) >= memories.length;
+          final isEpiloguePage = (memoryPageController.page?.floor() ?? 0) >= memories.length;
 
           final offset = notification.metrics.pixels;
-          if (isEpiloguePage &&
-              (offset > notification.metrics.maxScrollExtent + 150)) {
+          if (isEpiloguePage && (offset > notification.metrics.maxScrollExtent + 150)) {
             context.maybePop();
             return true;
           }
@@ -358,8 +348,7 @@ class MemoryPage extends HookConsumerWidget {
                             ),
                           ),
                         ),
-                        if (currentAsset.value != null &&
-                            currentAsset.value!.isVideo)
+                        if (currentAsset.value != null && currentAsset.value!.isVideo)
                           Positioned(
                             bottom: 24,
                             right: 32,
diff --git a/mobile/lib/pages/photos/photos.page.dart b/mobile/lib/pages/photos/photos.page.dart
index 62ac96c8aa..2cc3c44e3a 100644
--- a/mobile/lib/pages/photos/photos.page.dart
+++ b/mobile/lib/pages/photos/photos.page.dart
@@ -106,9 +106,7 @@ class PhotosPage extends HookConsumerWidget {
     return Stack(
       children: [
         MultiselectGrid(
-          topWidget: (currentUser != null && currentUser.memoryEnabled)
-              ? const MemoryLane()
-              : const SizedBox(),
+          topWidget: (currentUser != null && currentUser.memoryEnabled) ? const MemoryLane() : const SizedBox(),
           renderListProvider: timelineUsers.length > 1
               ? multiUsersTimelineProvider(timelineUsers)
               : singleUserTimelineProvider(currentUser?.id),
@@ -120,9 +118,7 @@ class PhotosPage extends HookConsumerWidget {
         ),
         AnimatedPositioned(
           duration: const Duration(milliseconds: 300),
-          top: ref.watch(multiselectProvider)
-              ? -(kToolbarHeight + context.padding.top)
-              : 0,
+          top: ref.watch(multiselectProvider) ? -(kToolbarHeight + context.padding.top) : 0,
           left: 0,
           right: 0,
           child: Container(
diff --git a/mobile/lib/pages/search/all_people.page.dart b/mobile/lib/pages/search/all_people.page.dart
index 7e2a136721..6fcf07fbfa 100644
--- a/mobile/lib/pages/search/all_people.page.dart
+++ b/mobile/lib/pages/search/all_people.page.dart
@@ -28,9 +28,7 @@ class AllPeoplePage extends HookConsumerWidget {
       body: curatedPeople.widgetWhen(
         onData: (people) => ExploreGrid(
           isPeople: true,
-          curatedContent: people
-              .map((e) => SearchCuratedContent(label: e.name, id: e.id))
-              .toList(),
+          curatedContent: people.map((e) => SearchCuratedContent(label: e.name, id: e.id)).toList(),
         ),
       ),
     );
diff --git a/mobile/lib/pages/search/all_places.page.dart b/mobile/lib/pages/search/all_places.page.dart
index 92521d13cf..63908a5e2a 100644
--- a/mobile/lib/pages/search/all_places.page.dart
+++ b/mobile/lib/pages/search/all_places.page.dart
@@ -13,8 +13,7 @@ class AllPlacesPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    AsyncValue<List<SearchCuratedContent>> places =
-        ref.watch(getAllPlacesProvider);
+    AsyncValue<List<SearchCuratedContent>> places = ref.watch(getAllPlacesProvider);
 
     return Scaffold(
       appBar: AppBar(
diff --git a/mobile/lib/pages/search/map/map.page.dart b/mobile/lib/pages/search/map/map.page.dart
index 9f32b1877b..62df4a50af 100644
--- a/mobile/lib/pages/search/map/map.page.dart
+++ b/mobile/lib/pages/search/map/map.page.dart
@@ -48,8 +48,7 @@ class MapPage extends HookConsumerWidget {
     final layerDebouncer = useDebouncer(interval: const Duration(seconds: 1));
     final isLoading = useProcessingOverlay();
     final scrollController = useScrollController();
-    final markerDebouncer =
-        useDebouncer(interval: const Duration(milliseconds: 800));
+    final markerDebouncer = useDebouncer(interval: const Duration(milliseconds: 800));
     final selectedAssets = useValueNotifier<Set<Asset>>({});
     const mapZoomToAssetLevel = 12.0;
 
@@ -64,8 +63,7 @@ class MapPage extends HookConsumerWidget {
       final bounds = await mapController.value!.getVisibleRegion();
       final inBounds = markers.value
           .where(
-            (m) =>
-                bounds.contains(LatLng(m.latLng.latitude, m.latLng.longitude)),
+            (m) => bounds.contains(LatLng(m.latLng.latitude, m.latLng.longitude)),
           )
           .toList();
       // Notify bottom sheet to update asset grid only when there are new assets
@@ -101,8 +99,7 @@ class MapPage extends HookConsumerWidget {
 
     useEffect(
       () {
-        final currentAssetLink =
-            ref.read(currentAssetProvider.notifier).ref.keepAlive();
+        final currentAssetLink = ref.read(currentAssetProvider.notifier).ref.keepAlive();
 
         loadMarkers();
         return currentAssetLink.close;
@@ -128,8 +125,7 @@ class MapPage extends HookConsumerWidget {
       MapMarker marker, {
       bool shouldAnimate = true,
     }) async {
-      final assetPoint =
-          await mapController.value!.toScreenLocation(marker.latLng);
+      final assetPoint = await mapController.value!.toScreenLocation(marker.latLng);
       selectedMarker.value = _AssetMarkerMeta(
         point: assetPoint,
         marker: marker,
@@ -144,11 +140,9 @@ class MapPage extends HookConsumerWidget {
       if (mapController.value == null) {
         return;
       }
-      final latlngBound =
-          await mapController.value!.getBoundsFromPoint(point, 50);
+      final latlngBound = await mapController.value!.getBoundsFromPoint(point, 50);
       final marker = markersInBounds.value.firstWhereOrNull(
-        (m) =>
-            latlngBound.contains(LatLng(m.latLng.latitude, m.latLng.longitude)),
+        (m) => latlngBound.contains(LatLng(m.latLng.latitude, m.latLng.longitude)),
       );
 
       if (marker != null) {
@@ -211,16 +205,14 @@ class MapPage extends HookConsumerWidget {
     }
 
     void onBottomSheetScrolled(String assetRemoteId) {
-      final assetMarker = markersInBounds.value
-          .firstWhereOrNull((m) => m.assetRemoteId == assetRemoteId);
+      final assetMarker = markersInBounds.value.firstWhereOrNull((m) => m.assetRemoteId == assetRemoteId);
       if (assetMarker != null) {
         updateAssetMarkerPosition(assetMarker);
       }
     }
 
     void onZoomToAsset(String assetRemoteId) {
-      final assetMarker = markersInBounds.value
-          .firstWhereOrNull((m) => m.assetRemoteId == assetRemoteId);
+      final assetMarker = markersInBounds.value.firstWhereOrNull((m) => m.assetRemoteId == assetRemoteId);
       if (mapController.value != null && assetMarker != null) {
         // Offset the latitude a little to show the marker just above the viewports center
         final offset = context.isMobile ? 0.02 : 0;
@@ -236,8 +228,7 @@ class MapPage extends HookConsumerWidget {
     }
 
     void onZoomToLocation() async {
-      final (location, error) =
-          await MapUtils.checkPermAndGetLocation(context: context);
+      final (location, error) = await MapUtils.checkPermAndGetLocation(context: context);
       if (error != null) {
         if (error == LocationPermission.unableToDetermine && context.mounted) {
           ImmichToast.show(
@@ -360,8 +351,7 @@ class _AssetMarkerMeta {
   });
 
   @override
-  String toString() =>
-      '_AssetMarkerMeta(point: $point, marker: $marker, shouldAnimate: $shouldAnimate)';
+  String toString() => '_AssetMarkerMeta(point: $point, marker: $marker, shouldAnimate: $shouldAnimate)';
 }
 
 class _MapWithMarker extends StatelessWidget {
diff --git a/mobile/lib/pages/search/map/map_location_picker.page.dart b/mobile/lib/pages/search/map/map_location_picker.page.dart
index f27deae052..9b7bbd0cd8 100644
--- a/mobile/lib/pages/search/map/map_location_picker.page.dart
+++ b/mobile/lib/pages/search/map/map_location_picker.page.dart
@@ -35,8 +35,7 @@ class MapLocationPickerPage extends HookConsumerWidget {
       selectedLatLng.value = centre;
       controller.value?.animateCamera(CameraUpdate.newLatLng(centre));
       if (marker.value != null) {
-        await controller.value
-            ?.updateSymbol(marker.value!, SymbolOptions(geometry: centre));
+        await controller.value?.updateSymbol(marker.value!, SymbolOptions(geometry: centre));
       }
     }
 
@@ -45,15 +44,13 @@ class MapLocationPickerPage extends HookConsumerWidget {
     }
 
     Future<void> getCurrentLocation() async {
-      var (currentLocation, _) =
-          await MapUtils.checkPermAndGetLocation(context: context);
+      var (currentLocation, _) = await MapUtils.checkPermAndGetLocation(context: context);
 
       if (currentLocation == null) {
         return;
       }
 
-      var currentLatLng =
-          LatLng(currentLocation.latitude, currentLocation.longitude);
+      var currentLatLng = LatLng(currentLocation.latitude, currentLocation.longitude);
       selectedLatLng.value = currentLatLng;
       controller.value?.animateCamera(CameraUpdate.newLatLng(currentLatLng));
     }
@@ -75,11 +72,9 @@ class MapLocationPickerPage extends HookConsumerWidget {
                 ),
               ),
               child: MapLibreMap(
-                initialCameraPosition:
-                    CameraPosition(target: initialLatLng, zoom: 12),
+                initialCameraPosition: CameraPosition(target: initialLatLng, zoom: 12),
                 styleString: style,
-                onMapCreated: (mapController) =>
-                    controller.value = mapController,
+                onMapCreated: (mapController) => controller.value = mapController,
                 onStyleLoadedCallback: onStyleLoaded,
                 onMapClick: onMapClick,
                 dragEnabled: false,
@@ -165,8 +160,7 @@ class _BottomBar extends StatelessWidget {
               children: [
                 ElevatedButton(
                   onPressed: onUseLocation,
-                  child:
-                      const Text("map_location_picker_page_use_location").tr(),
+                  child: const Text("map_location_picker_page_use_location").tr(),
                 ),
                 ElevatedButton(
                   onPressed: onGetCurrentLocation,
diff --git a/mobile/lib/pages/search/search.page.dart b/mobile/lib/pages/search/search.page.dart
index 3e5c153f88..d9a20e8b4d 100644
--- a/mobile/lib/pages/search/search.page.dart
+++ b/mobile/lib/pages/search/search.page.dart
@@ -48,8 +48,7 @@ class SearchPage extends HookConsumerWidget {
               isFavorite: false,
             ),
         mediaType: prefilter?.mediaType ?? AssetType.other,
-        language:
-            "${context.locale.languageCode}-${context.locale.countryCode}",
+        language: "${context.locale.languageCode}-${context.locale.countryCode}",
       ),
     );
 
@@ -87,9 +86,7 @@ class SearchPage extends HookConsumerWidget {
 
       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.value);
 
       if (!hasResult) {
         context.showSnackBar(
@@ -103,9 +100,7 @@ class SearchPage extends HookConsumerWidget {
 
     loadMoreSearchResult() async {
       isSearching.value = true;
-      final hasResult = await ref
-          .watch(paginatedSearchProvider.notifier)
-          .search(filter.value);
+      final hasResult = await ref.watch(paginatedSearchProvider.notifier).search(filter.value);
 
       if (!hasResult) {
         context.showSnackBar(
@@ -416,8 +411,7 @@ class SearchPage extends HookConsumerWidget {
                 ),
               );
               if (value) {
-                filterText
-                    .add('search_filter_display_option_not_in_album'.tr());
+                filterText.add('search_filter_display_option_not_in_album'.tr());
               }
               break;
             case DisplayOption.archive:
@@ -563,9 +557,7 @@ class SearchPage extends HookConsumerWidget {
                       'search_by_context'.tr(),
                       style: context.textTheme.bodyLarge?.copyWith(
                         fontWeight: FontWeight.w500,
-                        color: textSearchType.value == TextSearchType.context
-                            ? context.colorScheme.primary
-                            : null,
+                        color: textSearchType.value == TextSearchType.context ? context.colorScheme.primary : null,
                       ),
                     ),
                     selectedColor: context.colorScheme.primary,
@@ -583,9 +575,7 @@ class SearchPage extends HookConsumerWidget {
                       'search_filter_filename'.tr(),
                       style: context.textTheme.bodyLarge?.copyWith(
                         fontWeight: FontWeight.w500,
-                        color: textSearchType.value == TextSearchType.filename
-                            ? context.colorScheme.primary
-                            : null,
+                        color: textSearchType.value == TextSearchType.filename ? context.colorScheme.primary : null,
                       ),
                     ),
                     selectedColor: context.colorScheme.primary,
@@ -603,15 +593,11 @@ class SearchPage extends HookConsumerWidget {
                       'search_by_description'.tr(),
                       style: context.textTheme.bodyLarge?.copyWith(
                         fontWeight: FontWeight.w500,
-                        color:
-                            textSearchType.value == TextSearchType.description
-                                ? context.colorScheme.primary
-                                : null,
+                        color: textSearchType.value == TextSearchType.description ? context.colorScheme.primary : null,
                       ),
                     ),
                     selectedColor: context.colorScheme.primary,
-                    selected:
-                        textSearchType.value == TextSearchType.description,
+                    selected: textSearchType.value == TextSearchType.description,
                   ),
                   onPressed: () {
                     textSearchType.value = TextSearchType.description;
@@ -645,9 +631,7 @@ class SearchPage extends HookConsumerWidget {
             hintText: searchHintText.value,
             key: const Key('search_text_field'),
             controller: textSearchController,
-            contentPadding: prefilter != null
-                ? const EdgeInsets.only(left: 24)
-                : const EdgeInsets.all(8),
+            contentPadding: prefilter != null ? const EdgeInsets.only(left: 24) : const EdgeInsets.all(8),
             prefixIcon: prefilter != null
                 ? null
                 : Icon(
@@ -744,17 +728,13 @@ class SearchResultGrid extends StatelessWidget {
         padding: const EdgeInsets.only(top: 8.0),
         child: NotificationListener<ScrollEndNotification>(
           onNotification: (notification) {
-            final isBottomSheetNotification = notification.context
-                    ?.findAncestorWidgetOfExactType<
-                        DraggableScrollableSheet>() !=
-                null;
+            final isBottomSheetNotification =
+                notification.context?.findAncestorWidgetOfExactType<DraggableScrollableSheet>() != null;
 
             final metrics = notification.metrics;
             final isVerticalScroll = metrics.axis == Axis.vertical;
 
-            if (metrics.pixels >= metrics.maxScrollExtent &&
-                isVerticalScroll &&
-                !isBottomSheetNotification) {
+            if (metrics.pixels >= metrics.maxScrollExtent && isVerticalScroll && !isBottomSheetNotification) {
               onScrollEnd();
             }
 
@@ -770,9 +750,7 @@ class SearchResultGrid extends StatelessWidget {
             dragScrollLabelEnabled: false,
             emptyIndicator: Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16.0),
-              child: !isSearching
-                  ? const SearchEmptyContent()
-                  : const SizedBox.shrink(),
+              child: !isSearching ? const SearchEmptyContent() : const SizedBox.shrink(),
             ),
           ),
         ),
@@ -794,9 +772,7 @@ class SearchEmptyContent extends StatelessWidget {
           const SizedBox(height: 40),
           Center(
             child: Image.asset(
-              context.isDarkTheme
-                  ? 'assets/polaroid-dark.png'
-                  : 'assets/polaroid-light.png',
+              context.isDarkTheme ? 'assets/polaroid-dark.png' : 'assets/polaroid-light.png',
               height: 125,
             ),
           ),
diff --git a/mobile/lib/pages/share_intent/share_intent.page.dart b/mobile/lib/pages/share_intent/share_intent.page.dart
index 299ffe5497..2b328b7ede 100644
--- a/mobile/lib/pages/share_intent/share_intent.page.dart
+++ b/mobile/lib/pages/share_intent/share_intent.page.dart
@@ -38,9 +38,7 @@ class ShareIntentPage extends HookConsumerWidget {
 
     void upload() async {
       for (final attachment in candidates) {
-        await ref
-            .read(shareIntentUploadProvider.notifier)
-            .upload(attachment.file);
+        await ref.read(shareIntentUploadProvider.notifier).upload(attachment.file);
       }
 
       isUploaded.value = true;
@@ -76,9 +74,7 @@ class ShareIntentPage extends HookConsumerWidget {
         leading: IconButton(
           onPressed: () {
             context.navigateTo(
-              Store.isBetaTimelineEnabled
-                  ? const TabShellRoute()
-                  : const TabControllerRoute(),
+              Store.isBetaTimelineEnabled ? const TabShellRoute() : const TabControllerRoute(),
             );
           },
           icon: const Icon(Icons.arrow_back),
@@ -170,9 +166,7 @@ class ShareIntentPage extends HookConsumerWidget {
             height: 48,
             child: ElevatedButton(
               onPressed: isUploaded.value ? null : upload,
-              child: isUploaded.value
-                  ? UploadingText(candidates: candidates)
-                  : const Text('upload').tr(),
+              child: isUploaded.value ? UploadingText(candidates: candidates) : const Text('upload').tr(),
             ),
           ),
         ),
diff --git a/mobile/lib/platform/native_sync_api.g.dart b/mobile/lib/platform/native_sync_api.g.dart
index 46599eb016..b4d1d91b69 100644
--- a/mobile/lib/platform/native_sync_api.g.dart
+++ b/mobile/lib/platform/native_sync_api.g.dart
@@ -17,15 +17,12 @@ PlatformException _createConnectionError(String channelName) {
 
 bool _deepEquals(Object? a, Object? b) {
   if (a is List && b is List) {
-    return a.length == b.length &&
-        a.indexed
-            .every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]));
+    return a.length == b.length && a.indexed.every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]));
   }
   if (a is Map && b is Map) {
     return a.length == b.length &&
         a.entries.every((MapEntry<Object?, Object?> entry) =>
-            (b as Map<Object?, Object?>).containsKey(entry.key) &&
-            _deepEquals(entry.value, b[entry.key]));
+            (b as Map<Object?, Object?>).containsKey(entry.key) && _deepEquals(entry.value, b[entry.key]));
   }
   return a == b;
 }
@@ -207,8 +204,7 @@ class SyncDelta {
       hasChanges: result[0]! as bool,
       updates: (result[1] as List<Object?>?)!.cast<PlatformAsset>(),
       deletes: (result[2] as List<Object?>?)!.cast<String>(),
-      assetAlbums:
-          (result[3] as Map<Object?, Object?>?)!.cast<String, List<String>>(),
+      assetAlbums: (result[3] as Map<Object?, Object?>?)!.cast<String, List<String>>(),
     );
   }
 
@@ -269,11 +265,9 @@ class NativeSyncApi {
   /// Constructor for [NativeSyncApi].  The [binaryMessenger] named argument is
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
-  NativeSyncApi(
-      {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
+  NativeSyncApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
       : pigeonVar_binaryMessenger = binaryMessenger,
-        pigeonVar_messageChannelSuffix =
-            messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
+        pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
   final BinaryMessenger? pigeonVar_binaryMessenger;
 
   static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
@@ -283,15 +277,13 @@ class NativeSyncApi {
   Future<bool> shouldFullSync() async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.shouldFullSync$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel =
-        BasicMessageChannel<Object?>(
+    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?>?;
+    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) {
@@ -313,15 +305,13 @@ class NativeSyncApi {
   Future<SyncDelta> getMediaChanges() async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getMediaChanges$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel =
-        BasicMessageChannel<Object?>(
+    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?>?;
+    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) {
@@ -343,15 +333,13 @@ class NativeSyncApi {
   Future<void> checkpointSync() async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.checkpointSync$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel =
-        BasicMessageChannel<Object?>(
+    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?>?;
+    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) {
@@ -368,15 +356,13 @@ class NativeSyncApi {
   Future<void> clearSyncCheckpoint() async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.clearSyncCheckpoint$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel =
-        BasicMessageChannel<Object?>(
+    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?>?;
+    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) {
@@ -393,16 +379,13 @@ class NativeSyncApi {
   Future<List<String>> getAssetIdsForAlbum(String albumId) async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetIdsForAlbum$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel =
-        BasicMessageChannel<Object?>(
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
       binaryMessenger: pigeonVar_binaryMessenger,
     );
-    final Future<Object?> pigeonVar_sendFuture =
-        pigeonVar_channel.send(<Object?>[albumId]);
-    final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_sendFuture as List<Object?>?;
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[albumId]);
+    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) {
@@ -424,15 +407,13 @@ class NativeSyncApi {
   Future<List<PlatformAlbum>> getAlbums() async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAlbums$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel =
-        BasicMessageChannel<Object?>(
+    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?>?;
+    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) {
@@ -454,16 +435,13 @@ class NativeSyncApi {
   Future<int> getAssetsCountSince(String albumId, int timestamp) async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetsCountSince$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel =
-        BasicMessageChannel<Object?>(
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
       binaryMessenger: pigeonVar_binaryMessenger,
     );
-    final Future<Object?> pigeonVar_sendFuture =
-        pigeonVar_channel.send(<Object?>[albumId, timestamp]);
-    final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_sendFuture as List<Object?>?;
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[albumId, timestamp]);
+    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) {
@@ -482,20 +460,16 @@ class NativeSyncApi {
     }
   }
 
-  Future<List<PlatformAsset>> getAssetsForAlbum(String albumId,
-      {int? updatedTimeCond}) async {
+  Future<List<PlatformAsset>> getAssetsForAlbum(String albumId, {int? updatedTimeCond}) async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetsForAlbum$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel =
-        BasicMessageChannel<Object?>(
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
       binaryMessenger: pigeonVar_binaryMessenger,
     );
-    final Future<Object?> pigeonVar_sendFuture =
-        pigeonVar_channel.send(<Object?>[albumId, updatedTimeCond]);
-    final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_sendFuture as List<Object?>?;
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[albumId, updatedTimeCond]);
+    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) {
@@ -517,16 +491,13 @@ class NativeSyncApi {
   Future<List<Uint8List?>> hashPaths(List<String> paths) async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.hashPaths$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel =
-        BasicMessageChannel<Object?>(
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
       binaryMessenger: pigeonVar_binaryMessenger,
     );
-    final Future<Object?> pigeonVar_sendFuture =
-        pigeonVar_channel.send(<Object?>[paths]);
-    final List<Object?>? pigeonVar_replyList =
-        await pigeonVar_sendFuture as List<Object?>?;
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[paths]);
+    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) {
diff --git a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
index 2334fc5227..439998065c 100644
--- a/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
+++ b/mobile/lib/presentation/pages/dev/feat_in_development.page.dart
@@ -31,8 +31,7 @@ final _features = [
         return Future.value();
       }
 
-      final assets =
-          await ref.read(remoteAssetRepositoryProvider).getSome(user.id);
+      final assets = await ref.read(remoteAssetRepositoryProvider).getSome(user.id);
 
       final selectedAssets = await ctx.pushRoute<Set<BaseAsset>>(
         DriftAssetSelectionTimelineRoute(
@@ -75,9 +74,7 @@ final _features = [
   _Feature(
     name: 'WAL Checkpoint',
     icon: Icons.save_rounded,
-    onTap: (_, ref) => ref
-        .read(driftProvider)
-        .customStatement("pragma wal_checkpoint(truncate)"),
+    onTap: (_, ref) => ref.read(driftProvider).customStatement("pragma wal_checkpoint(truncate)"),
   ),
   _Feature(
     name: '',
diff --git a/mobile/lib/presentation/pages/dev/media_stat.page.dart b/mobile/lib/presentation/pages/dev/media_stat.page.dart
index d1803498b4..70e93fd212 100644
--- a/mobile/lib/presentation/pages/dev/media_stat.page.dart
+++ b/mobile/lib/presentation/pages/dev/media_stat.page.dart
@@ -117,9 +117,8 @@ class LocalMediaSummaryPage extends StatelessWidget {
                   return SliverList.builder(
                     itemBuilder: (_, index) {
                       final album = albums[index];
-                      final countFuture = db.managers.localAlbumAssetEntity
-                          .filter((f) => f.albumId.id.equals(album.id))
-                          .count();
+                      final countFuture =
+                          db.managers.localAlbumAssetEntity.filter((f) => f.albumId.id.equals(album.id)).count();
                       return _Summary(
                         leading: const Icon(Icons.photo_album_rounded),
                         name: album.name,
@@ -226,9 +225,8 @@ class RemoteMediaSummaryPage extends StatelessWidget {
                   return SliverList.builder(
                     itemBuilder: (_, index) {
                       final album = albums[index];
-                      final countFuture = db.managers.remoteAlbumAssetEntity
-                          .filter((f) => f.albumId.id.equals(album.id))
-                          .count();
+                      final countFuture =
+                          db.managers.remoteAlbumAssetEntity.filter((f) => f.albumId.id.equals(album.id)).count();
                       return _Summary(
                         leading: const Icon(Icons.photo_album_rounded),
                         name: album.name,
diff --git a/mobile/lib/presentation/pages/drift_album.page.dart b/mobile/lib/presentation/pages/drift_album.page.dart
index c7dffbeaef..1f97bb6f45 100644
--- a/mobile/lib/presentation/pages/drift_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_album.page.dart
@@ -50,9 +50,7 @@ class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
 
   void onSearch(String searchTerm, QuickFilterMode sortMode) {
     final userId = ref.watch(currentUserProvider)?.id;
-    ref
-        .read(remoteAlbumProvider.notifier)
-        .searchAlbums(searchTerm, userId, sortMode);
+    ref.read(remoteAlbumProvider.notifier).searchAlbums(searchTerm, userId, sortMode);
   }
 
   Future<void> onRefresh() async {
@@ -88,8 +86,7 @@ class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
 
   @override
   Widget build(BuildContext context) {
-    final albums =
-        ref.watch(remoteAlbumProvider.select((s) => s.filteredAlbums));
+    final albums = ref.watch(remoteAlbumProvider.select((s) => s.filteredAlbums));
 
     final userId = ref.watch(currentUserProvider)?.id;
 
@@ -221,9 +218,7 @@ class _SortButtonState extends ConsumerState<_SortButton> {
                   const EdgeInsets.fromLTRB(16, 16, 32, 16),
                 ),
                 backgroundColor: WidgetStateProperty.all(
-                  albumSortOption == sortMode
-                      ? context.colorScheme.primary
-                      : Colors.transparent,
+                  albumSortOption == sortMode ? context.colorScheme.primary : Colors.transparent,
                 ),
                 shape: WidgetStateProperty.all(
                   const RoundedRectangleBorder(
@@ -436,9 +431,7 @@ class _QuickFilterButton extends StatelessWidget {
       child: Text(
         label,
         style: TextStyle(
-          color: isSelected
-              ? context.colorScheme.onPrimary
-              : context.colorScheme.onSurface,
+          color: isSelected ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
           fontSize: 14,
         ),
       ),
@@ -564,8 +557,7 @@ class _AlbumList extends ConsumerWidget {
                       child: Container(
                         decoration: BoxDecoration(
                           color: context.colorScheme.surfaceContainer,
-                          borderRadius:
-                              const BorderRadius.all(Radius.circular(16)),
+                          borderRadius: const BorderRadius.all(Radius.circular(16)),
                           border: Border.all(
                             color: context.colorScheme.outline.withAlpha(50),
                             width: 1,
diff --git a/mobile/lib/presentation/pages/drift_archive.page.dart b/mobile/lib/presentation/pages/drift_archive.page.dart
index 90b8dcb646..8a6f1607d0 100644
--- a/mobile/lib/presentation/pages/drift_archive.page.dart
+++ b/mobile/lib/presentation/pages/drift_archive.page.dart
@@ -23,8 +23,7 @@ class DriftArchivePage extends StatelessWidget {
               throw Exception('User must be logged in to access archive');
             }
 
-            final timelineService =
-                ref.watch(timelineFactoryProvider).archive(user.id);
+            final timelineService = ref.watch(timelineFactoryProvider).archive(user.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
diff --git a/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart b/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
index 7ac378e4f5..0e5631082b 100644
--- a/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
+++ b/mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart
@@ -37,8 +37,7 @@ class DriftAssetSelectionTimelinePage extends ConsumerWidget {
               );
             }
 
-            final timelineService =
-                ref.watch(timelineFactoryProvider).remoteAssets(user.id);
+            final timelineService = ref.watch(timelineFactoryProvider).remoteAssets(user.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
diff --git a/mobile/lib/presentation/pages/drift_create_album.page.dart b/mobile/lib/presentation/pages/drift_create_album.page.dart
index f6ba98f61c..ba7157b15d 100644
--- a/mobile/lib/presentation/pages/drift_create_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_create_album.page.dart
@@ -15,8 +15,7 @@ class DriftCreateAlbumPage extends ConsumerStatefulWidget {
   const DriftCreateAlbumPage({super.key});
 
   @override
-  ConsumerState<DriftCreateAlbumPage> createState() =>
-      _DriftCreateAlbumPageState();
+  ConsumerState<DriftCreateAlbumPage> createState() => _DriftCreateAlbumPageState();
 }
 
 class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
@@ -285,9 +284,7 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
               'create'.t(),
               style: TextStyle(
                 fontWeight: FontWeight.bold,
-                color: _canCreateAlbum
-                    ? context.primaryColor
-                    : context.themeData.disabledColor,
+                color: _canCreateAlbum ? context.primaryColor : context.themeData.disabledColor,
               ),
             ),
           ),
@@ -351,8 +348,7 @@ class _AlbumTitleTextFieldState extends State<_AlbumTitleTextField> {
       ),
       controller: widget.textController,
       onTap: () {
-        if (widget.textController.text ==
-            'create_album_page_untitled'.t(context: context)) {
+        if (widget.textController.text == 'create_album_page_untitled'.t(context: context)) {
           widget.textController.clear();
         }
       },
@@ -411,12 +407,10 @@ class _AlbumViewerEditableDescription extends StatefulWidget {
   final FocusNode focusNode;
 
   @override
-  State<_AlbumViewerEditableDescription> createState() =>
-      _AlbumViewerEditableDescriptionState();
+  State<_AlbumViewerEditableDescription> createState() => _AlbumViewerEditableDescriptionState();
 }
 
-class _AlbumViewerEditableDescriptionState
-    extends State<_AlbumViewerEditableDescription> {
+class _AlbumViewerEditableDescriptionState extends State<_AlbumViewerEditableDescription> {
   @override
   void initState() {
     super.initState();
@@ -458,19 +452,18 @@ class _AlbumViewerEditableDescriptionState
             horizontal: 12.0,
             vertical: 16.0,
           ),
-          suffixIcon:
-              widget.focusNode.hasFocus && widget.textController.text.isNotEmpty
-                  ? IconButton(
-                      onPressed: () {
-                        widget.textController.clear();
-                      },
-                      icon: Icon(
-                        Icons.cancel_rounded,
-                        color: context.primaryColor,
-                      ),
-                      splashRadius: 10.0,
-                    )
-                  : null,
+          suffixIcon: widget.focusNode.hasFocus && widget.textController.text.isNotEmpty
+              ? IconButton(
+                  onPressed: () {
+                    widget.textController.clear();
+                  },
+                  icon: Icon(
+                    Icons.cancel_rounded,
+                    color: context.primaryColor,
+                  ),
+                  splashRadius: 10.0,
+                )
+              : null,
           enabledBorder: OutlineInputBorder(
             borderSide: BorderSide(
               color: context.colorScheme.outline.withValues(alpha: 0.3),
diff --git a/mobile/lib/presentation/pages/drift_favorite.page.dart b/mobile/lib/presentation/pages/drift_favorite.page.dart
index 90a273f93b..5648fd7fac 100644
--- a/mobile/lib/presentation/pages/drift_favorite.page.dart
+++ b/mobile/lib/presentation/pages/drift_favorite.page.dart
@@ -23,8 +23,7 @@ class DriftFavoritePage extends StatelessWidget {
               throw Exception('User must be logged in to access favorite');
             }
 
-            final timelineService =
-                ref.watch(timelineFactoryProvider).favorite(user.id);
+            final timelineService = ref.watch(timelineFactoryProvider).favorite(user.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
diff --git a/mobile/lib/presentation/pages/drift_library.page.dart b/mobile/lib/presentation/pages/drift_library.page.dart
index eba0a5ea81..5cf47bc995 100644
--- a/mobile/lib/presentation/pages/drift_library.page.dart
+++ b/mobile/lib/presentation/pages/drift_library.page.dart
@@ -79,9 +79,7 @@ class _ActionButtonGrid extends ConsumerWidget {
                   onTap: () => context.pushRoute(const SharedLinkRoute()),
                   label: 'shared_links'.t(context: context),
                 ),
-                isTrashEnable
-                    ? const SizedBox(width: 8)
-                    : const SizedBox.shrink(),
+                isTrashEnable ? const SizedBox(width: 8) : const SizedBox.shrink(),
                 isTrashEnable
                     ? _ActionButton(
                         icon: Icons.delete_outline_rounded,
@@ -267,8 +265,7 @@ class _PlacesCollectionCard extends StatelessWidget {
                 child: DecoratedBox(
                   decoration: BoxDecoration(
                     borderRadius: const BorderRadius.all(Radius.circular(20)),
-                    color:
-                        context.colorScheme.secondaryContainer.withAlpha(100),
+                    color: context.colorScheme.secondaryContainer.withAlpha(100),
                   ),
                   child: IgnorePointer(
                     child: MapThumbnail(
@@ -278,9 +275,7 @@ class _PlacesCollectionCard extends StatelessWidget {
                         -157.91959,
                       ),
                       showAttribution: false,
-                      themeMode: context.isDarkTheme
-                          ? ThemeMode.dark
-                          : ThemeMode.light,
+                      themeMode: context.isDarkTheme ? ThemeMode.dark : ThemeMode.light,
                     ),
                   ),
                 ),
diff --git a/mobile/lib/presentation/pages/drift_local_album.page.dart b/mobile/lib/presentation/pages/drift_local_album.page.dart
index 0ad9abd2fa..7add23259e 100644
--- a/mobile/lib/presentation/pages/drift_local_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_local_album.page.dart
@@ -102,8 +102,7 @@ class _AlbumList extends ConsumerWidget {
                       color: context.colorScheme.onSurfaceSecondary,
                     ),
                   ),
-                  onTap: () =>
-                      context.pushRoute(LocalTimelineRoute(album: album)),
+                  onTap: () => context.pushRoute(LocalTimelineRoute(album: album)),
                 ),
               );
             },
diff --git a/mobile/lib/presentation/pages/drift_locked_folder.page.dart b/mobile/lib/presentation/pages/drift_locked_folder.page.dart
index e134b418e9..417e902de3 100644
--- a/mobile/lib/presentation/pages/drift_locked_folder.page.dart
+++ b/mobile/lib/presentation/pages/drift_locked_folder.page.dart
@@ -14,12 +14,10 @@ class DriftLockedFolderPage extends ConsumerStatefulWidget {
   const DriftLockedFolderPage({super.key});
 
   @override
-  ConsumerState<DriftLockedFolderPage> createState() =>
-      _DriftLockedFolderPageState();
+  ConsumerState<DriftLockedFolderPage> createState() => _DriftLockedFolderPageState();
 }
 
-class _DriftLockedFolderPageState extends ConsumerState<DriftLockedFolderPage>
-    with WidgetsBindingObserver {
+class _DriftLockedFolderPageState extends ConsumerState<DriftLockedFolderPage> with WidgetsBindingObserver {
   bool _showOverlay = false;
 
   @override
@@ -54,8 +52,7 @@ class _DriftLockedFolderPageState extends ConsumerState<DriftLockedFolderPage>
               throw Exception('User must be logged in to access locked folder');
             }
 
-            final timelineService =
-                ref.watch(timelineFactoryProvider).lockedFolder(user.id);
+            final timelineService = ref.watch(timelineFactoryProvider).lockedFolder(user.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
@@ -64,8 +61,7 @@ class _DriftLockedFolderPageState extends ConsumerState<DriftLockedFolderPage>
       child: _showOverlay
           ? const SizedBox()
           : PopScope(
-              onPopInvokedWithResult: (didPop, _) =>
-                  didPop ? ref.read(authProvider.notifier).lockPinCode() : null,
+              onPopInvokedWithResult: (didPop, _) => didPop ? ref.read(authProvider.notifier).lockPinCode() : null,
               child: Timeline(
                 appBar: MesmerizingSliverAppBar(
                   title: 'locked_folder'.t(context: context),
diff --git a/mobile/lib/presentation/pages/drift_memory.page.dart b/mobile/lib/presentation/pages/drift_memory.page.dart
index 7da2d1a4c7..c42feff0ea 100644
--- a/mobile/lib/presentation/pages/drift_memory.page.dart
+++ b/mobile/lib/presentation/pages/drift_memory.page.dart
@@ -40,8 +40,7 @@ class DriftMemoryPage extends HookConsumerWidget {
     final currentAsset = useState<RemoteAsset?>(null);
 
     /// The list of all of the asset page controllers
-    final memoryAssetPageControllers =
-        List.generate(memories.length, (i) => usePageController());
+    final memoryAssetPageControllers = List.generate(memories.length, (i) => usePageController());
 
     /// The main vertically scrolling page controller with each list of memories
     final memoryPageController = usePageController(initialPage: memoryIndex);
@@ -73,19 +72,16 @@ class DriftMemoryPage extends HookConsumerWidget {
         // Wait for the next frame to ensure the page is built
         SchedulerBinding.instance.addPostFrameCallback((_) {
           final previousIndex = currentMemoryIndex.value - 1;
-          final previousMemoryController =
-              memoryAssetPageControllers[previousIndex];
+          final previousMemoryController = memoryAssetPageControllers[previousIndex];
 
           // Ensure the controller is attached
           if (previousMemoryController.hasClients) {
-            previousMemoryController
-                .jumpToPage(memories[previousIndex].assets.length - 1);
+            previousMemoryController.jumpToPage(memories[previousIndex].assets.length - 1);
           } else {
             // Wait for the next frame until it is attached
             SchedulerBinding.instance.addPostFrameCallback((_) {
               if (previousMemoryController.hasClients) {
-                previousMemoryController
-                    .jumpToPage(memories[previousIndex].assets.length - 1);
+                previousMemoryController.jumpToPage(memories[previousIndex].assets.length - 1);
               }
             });
           }
@@ -96,8 +92,7 @@ class DriftMemoryPage extends HookConsumerWidget {
     toNextAsset(int currentAssetIndex) {
       if (currentAssetIndex + 1 < currentMemory.value.assets.length) {
         // Go to the next asset
-        PageController controller =
-            memoryAssetPageControllers[currentMemoryIndex.value];
+        PageController controller = memoryAssetPageControllers[currentMemoryIndex.value];
 
         controller.nextPage(
           curve: Curves.easeInOut,
@@ -112,8 +107,7 @@ class DriftMemoryPage extends HookConsumerWidget {
     toPreviousAsset(int currentAssetIndex) {
       if (currentAssetIndex > 0) {
         // Go to the previous asset
-        PageController controller =
-            memoryAssetPageControllers[currentMemoryIndex.value];
+        PageController controller = memoryAssetPageControllers[currentMemoryIndex.value];
 
         controller.previousPage(
           curve: Curves.easeInOut,
@@ -126,8 +120,7 @@ class DriftMemoryPage extends HookConsumerWidget {
     }
 
     updateProgressText() {
-      assetProgress.value =
-          "${currentAssetPage.value + 1}|${currentMemory.value.assets.length}";
+      assetProgress.value = "${currentAssetPage.value + 1}|${currentMemory.value.assets.length}";
     }
 
     /// Downloads and caches the image for the asset at this [currentMemory]'s index
@@ -179,8 +172,7 @@ class DriftMemoryPage extends HookConsumerWidget {
 
     // Precache the next page right away if we are on the first page
     if (currentAssetPage.value == 0) {
-      Future.delayed(const Duration(milliseconds: 200))
-          .then((_) => precacheAsset(1));
+      Future.delayed(const Duration(milliseconds: 200)).then((_) => precacheAsset(1));
     }
 
     Future<void> onAssetChanged(int otherIndex) async {
@@ -212,12 +204,10 @@ class DriftMemoryPage extends HookConsumerWidget {
         // maxScrollExtend contains the sum of horizontal pixels of all assets for depth = 1
         // or sum of vertical pixels of all memories for depth = 0
         if (notification is ScrollUpdateNotification) {
-          final isEpiloguePage =
-              (memoryPageController.page?.floor() ?? 0) >= memories.length;
+          final isEpiloguePage = (memoryPageController.page?.floor() ?? 0) >= memories.length;
 
           final offset = notification.metrics.pixels;
-          if (isEpiloguePage &&
-              (offset > notification.metrics.maxScrollExtent + 150)) {
+          if (isEpiloguePage && (offset > notification.metrics.maxScrollExtent + 150)) {
             context.maybePop();
             return true;
           }
@@ -366,8 +356,7 @@ class DriftMemoryPage extends HookConsumerWidget {
                             ),
                           ),
                         ),
-                        if (currentAsset.value != null &&
-                            currentAsset.value!.isVideo)
+                        if (currentAsset.value != null && currentAsset.value!.isVideo)
                           Positioned(
                             bottom: 24,
                             right: 32,
diff --git a/mobile/lib/presentation/pages/drift_partner_detail.page.dart b/mobile/lib/presentation/pages/drift_partner_detail.page.dart
index 6c77a480ea..3d9d28aeab 100644
--- a/mobile/lib/presentation/pages/drift_partner_detail.page.dart
+++ b/mobile/lib/presentation/pages/drift_partner_detail.page.dart
@@ -26,8 +26,7 @@ class DriftPartnerDetailPage extends StatelessWidget {
       overrides: [
         timelineServiceProvider.overrideWith(
           (ref) {
-            final timelineService =
-                ref.watch(timelineFactoryProvider).remoteAssets(partner.id);
+            final timelineService = ref.watch(timelineFactoryProvider).remoteAssets(partner.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
diff --git a/mobile/lib/presentation/pages/drift_place.page.dart b/mobile/lib/presentation/pages/drift_place.page.dart
index 5e5b932f60..3e0754f8b8 100644
--- a/mobile/lib/presentation/pages/drift_place.page.dart
+++ b/mobile/lib/presentation/pages/drift_place.page.dart
@@ -91,8 +91,7 @@ class _Map extends StatelessWidget {
                 width: context.width,
                 // TODO: migrate to DriftMapRoute after merging #19898
                 child: MapThumbnail(
-                  onTap: (_, __) => context
-                      .pushRoute(MapRoute(initialLocation: currentLocation)),
+                  onTap: (_, __) => context.pushRoute(MapRoute(initialLocation: currentLocation)),
                   zoom: 8,
                   centre: currentLocation ??
                       const LatLng(
@@ -100,8 +99,7 @@ class _Map extends StatelessWidget {
                         -157.91959,
                       ),
                   showAttribution: false,
-                  themeMode:
-                      context.isDarkTheme ? ThemeMode.dark : ThemeMode.light,
+                  themeMode: context.isDarkTheme ? ThemeMode.dark : ThemeMode.light,
                 ),
               ),
             ),
diff --git a/mobile/lib/presentation/pages/drift_place_detail.page.dart b/mobile/lib/presentation/pages/drift_place_detail.page.dart
index 9999d35297..d55725231f 100644
--- a/mobile/lib/presentation/pages/drift_place_detail.page.dart
+++ b/mobile/lib/presentation/pages/drift_place_detail.page.dart
@@ -20,8 +20,7 @@ class DriftPlaceDetailPage extends StatelessWidget {
       overrides: [
         timelineServiceProvider.overrideWith(
           (ref) {
-            final timelineService =
-                ref.watch(timelineFactoryProvider).place(place);
+            final timelineService = ref.watch(timelineFactoryProvider).place(place);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
diff --git a/mobile/lib/presentation/pages/drift_recently_taken.page.dart b/mobile/lib/presentation/pages/drift_recently_taken.page.dart
index df303e7b31..c99c36bd24 100644
--- a/mobile/lib/presentation/pages/drift_recently_taken.page.dart
+++ b/mobile/lib/presentation/pages/drift_recently_taken.page.dart
@@ -24,8 +24,7 @@ class DriftRecentlyTakenPage extends StatelessWidget {
               );
             }
 
-            final timelineService =
-                ref.watch(timelineFactoryProvider).remoteAssets(user.id);
+            final timelineService = ref.watch(timelineFactoryProvider).remoteAssets(user.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
diff --git a/mobile/lib/presentation/pages/drift_remote_album.page.dart b/mobile/lib/presentation/pages/drift_remote_album.page.dart
index 4d49cf3012..4173e262bc 100644
--- a/mobile/lib/presentation/pages/drift_remote_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_remote_album.page.dart
@@ -37,8 +37,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
   }
 
   Future<void> addAssets(BuildContext context) async {
-    final albumAssets =
-        await ref.read(remoteAlbumProvider.notifier).getAssets(widget.album.id);
+    final albumAssets = await ref.read(remoteAlbumProvider.notifier).getAssets(widget.album.id);
 
     final newAssets = await context.pushRoute<Set<BaseAsset>>(
       DriftAssetSelectionTimelineRoute(
@@ -82,9 +81,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
     }
 
     try {
-      await ref
-          .read(remoteAlbumProvider.notifier)
-          .addUsers(widget.album.id, newUsers);
+      await ref.read(remoteAlbumProvider.notifier).addUsers(widget.album.id, newUsers);
 
       if (newUsers.isNotEmpty) {
         ImmichToast.show(
@@ -157,9 +154,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
 
     if (confirmed == true) {
       try {
-        await ref
-            .read(remoteAlbumProvider.notifier)
-            .deleteAlbum(widget.album.id);
+        await ref.read(remoteAlbumProvider.notifier).deleteAlbum(widget.album.id);
 
         ImmichToast.show(
           context: context,
@@ -237,9 +232,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
       overrides: [
         timelineServiceProvider.overrideWith(
           (ref) {
-            final timelineService = ref
-                .watch(timelineFactoryProvider)
-                .remoteAlbum(albumId: widget.album.id);
+            final timelineService = ref.watch(timelineFactoryProvider).remoteAlbum(albumId: widget.album.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
diff --git a/mobile/lib/presentation/pages/drift_trash.page.dart b/mobile/lib/presentation/pages/drift_trash.page.dart
index 108a7e1cc9..61fc5e35f7 100644
--- a/mobile/lib/presentation/pages/drift_trash.page.dart
+++ b/mobile/lib/presentation/pages/drift_trash.page.dart
@@ -23,8 +23,7 @@ class DriftTrashPage extends StatelessWidget {
               throw Exception('User must be logged in to access trash');
             }
 
-            final timelineService =
-                ref.watch(timelineFactoryProvider).trash(user.id);
+            final timelineService = ref.watch(timelineFactoryProvider).trash(user.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
diff --git a/mobile/lib/presentation/pages/drift_user_selection.page.dart b/mobile/lib/presentation/pages/drift_user_selection.page.dart
index 6f5c4c3e2b..5aaa438a11 100644
--- a/mobile/lib/presentation/pages/drift_user_selection.page.dart
+++ b/mobile/lib/presentation/pages/drift_user_selection.page.dart
@@ -14,8 +14,7 @@ import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
 
 // TODO: Refactor this provider when we have user provider/service/repository pattern in place
-final driftUsersProvider =
-    FutureProvider.autoDispose<List<UserDto>>((ref) async {
+final driftUsersProvider = FutureProvider.autoDispose<List<UserDto>>((ref) async {
   final drift = ref.watch(driftProvider);
   final currentUser = ref.watch(currentUserProvider);
 
@@ -57,8 +56,7 @@ class DriftUserSelectionPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final AsyncValue<List<UserDto>> suggestedShareUsers =
-        ref.watch(driftUsersProvider);
+    final AsyncValue<List<UserDto>> suggestedShareUsers = ref.watch(driftUsersProvider);
     final sharedUsersList = useState<Set<UserDto>>({});
 
     addNewUsersHandler() {
@@ -174,8 +172,7 @@ class DriftUserSelectionPage extends HookConsumerWidget {
         ),
         actions: [
           TextButton(
-            onPressed:
-                sharedUsersList.value.isEmpty ? null : addNewUsersHandler,
+            onPressed: sharedUsersList.value.isEmpty ? null : addNewUsersHandler,
             child: const Text(
               "add",
               style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
@@ -186,16 +183,13 @@ class DriftUserSelectionPage extends HookConsumerWidget {
       body: suggestedShareUsers.widgetWhen(
         onData: (users) {
           // Get shared users for this album from the database
-          final sharedUsers =
-              ref.watch(remoteAlbumSharedUsersProvider(album.id));
+          final sharedUsers = ref.watch(remoteAlbumSharedUsersProvider(album.id));
 
           return sharedUsers.when(
             data: (albumSharedUsers) {
               // Filter out users that are already shared with this album and the owner
               final filteredUsers = users.where((user) {
-                return !albumSharedUsers
-                        .any((sharedUser) => sharedUser.id == user.id) &&
-                    user.id != album.ownerId;
+                return !albumSharedUsers.any((sharedUser) => sharedUser.id == user.id) && user.id != album.ownerId;
               }).toList();
 
               return buildUserList(filteredUsers);
@@ -203,8 +197,7 @@ class DriftUserSelectionPage extends HookConsumerWidget {
             loading: () => const Center(child: CircularProgressIndicator()),
             error: (error, stack) {
               // If we can't load shared users, just filter out the owner
-              final filteredUsers =
-                  users.where((user) => user.id != album.ownerId).toList();
+              final filteredUsers = users.where((user) => user.id != album.ownerId).toList();
               return buildUserList(filteredUsers);
             },
           );
diff --git a/mobile/lib/presentation/pages/drift_video.page.dart b/mobile/lib/presentation/pages/drift_video.page.dart
index 8c0e8e6911..94c5620f9a 100644
--- a/mobile/lib/presentation/pages/drift_video.page.dart
+++ b/mobile/lib/presentation/pages/drift_video.page.dart
@@ -22,8 +22,7 @@ class DriftVideoPage extends StatelessWidget {
               throw Exception('User must be logged in to video');
             }
 
-            final timelineService =
-                ref.watch(timelineFactoryProvider).video(user.id);
+            final timelineService = ref.watch(timelineFactoryProvider).video(user.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
diff --git a/mobile/lib/presentation/pages/local_timeline.page.dart b/mobile/lib/presentation/pages/local_timeline.page.dart
index fd4e44616b..d322b5d9d2 100644
--- a/mobile/lib/presentation/pages/local_timeline.page.dart
+++ b/mobile/lib/presentation/pages/local_timeline.page.dart
@@ -19,9 +19,7 @@ class LocalTimelinePage extends StatelessWidget {
       overrides: [
         timelineServiceProvider.overrideWith(
           (ref) {
-            final timelineService = ref
-                .watch(timelineFactoryProvider)
-                .localAlbum(albumId: album.id);
+            final timelineService = ref.watch(timelineFactoryProvider).localAlbum(albumId: album.id);
             ref.onDispose(timelineService.dispose);
             return timelineService;
           },
diff --git a/mobile/lib/presentation/pages/search/drift_search.page.dart b/mobile/lib/presentation/pages/search/drift_search.page.dart
index 7101a42b01..5174c118d8 100644
--- a/mobile/lib/presentation/pages/search/drift_search.page.dart
+++ b/mobile/lib/presentation/pages/search/drift_search.page.dart
@@ -36,8 +36,7 @@ class DriftSearchPage extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final textSearchType = useState<TextSearchType>(TextSearchType.context);
-    final searchHintText =
-        useState<String>('sunrise_on_the_beach'.t(context: context));
+    final searchHintText = useState<String>('sunrise_on_the_beach'.t(context: context));
     final textSearchController = useTextEditingController();
     final filter = useState<SearchFilter>(
       SearchFilter(
@@ -52,8 +51,7 @@ class DriftSearchPage extends HookConsumerWidget {
               isFavorite: false,
             ),
         mediaType: preFilter?.mediaType ?? AssetType.other,
-        language:
-            "${context.locale.languageCode}-${context.locale.countryCode}",
+        language: "${context.locale.languageCode}-${context.locale.countryCode}",
       ),
     );
 
@@ -91,9 +89,7 @@ class DriftSearchPage extends HookConsumerWidget {
 
       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.value);
 
       if (!hasResult) {
         context.showSnackBar(
@@ -107,9 +103,7 @@ class DriftSearchPage extends HookConsumerWidget {
 
     loadMoreSearchResult() async {
       isSearching.value = true;
-      final hasResult = await ref
-          .watch(paginatedSearchProvider.notifier)
-          .search(filter.value);
+      final hasResult = await ref.watch(paginatedSearchProvider.notifier).search(filter.value);
 
       if (!hasResult) {
         context.showSnackBar(
@@ -157,9 +151,7 @@ class DriftSearchPage extends HookConsumerWidget {
         );
 
         peopleCurrentFilterWidget.value = Text(
-          value
-              .map((e) => e.name != '' ? e.name : 'no_name'.t(context: context))
-              .join(', '),
+          value.map((e) => e.name != '' ? e.name : 'no_name'.t(context: context)).join(', '),
           style: context.textTheme.labelLarge,
         );
       }
@@ -424,8 +416,7 @@ class DriftSearchPage extends HookConsumerWidget {
               );
               if (value) {
                 filterText.add(
-                  'search_filter_display_option_not_in_album'
-                      .t(context: context),
+                  'search_filter_display_option_not_in_album'.t(context: context),
                 );
               }
               break;
@@ -572,9 +563,7 @@ class DriftSearchPage extends HookConsumerWidget {
                       'search_by_context'.t(context: context),
                       style: context.textTheme.bodyLarge?.copyWith(
                         fontWeight: FontWeight.w500,
-                        color: textSearchType.value == TextSearchType.context
-                            ? context.colorScheme.primary
-                            : null,
+                        color: textSearchType.value == TextSearchType.context ? context.colorScheme.primary : null,
                       ),
                     ),
                     selectedColor: context.colorScheme.primary,
@@ -582,8 +571,7 @@ class DriftSearchPage extends HookConsumerWidget {
                   ),
                   onPressed: () {
                     textSearchType.value = TextSearchType.context;
-                    searchHintText.value =
-                        'sunrise_on_the_beach'.t(context: context);
+                    searchHintText.value = 'sunrise_on_the_beach'.t(context: context);
                   },
                 ),
                 MenuItemButton(
@@ -593,9 +581,7 @@ class DriftSearchPage extends HookConsumerWidget {
                       'search_filter_filename'.t(context: context),
                       style: context.textTheme.bodyLarge?.copyWith(
                         fontWeight: FontWeight.w500,
-                        color: textSearchType.value == TextSearchType.filename
-                            ? context.colorScheme.primary
-                            : null,
+                        color: textSearchType.value == TextSearchType.filename ? context.colorScheme.primary : null,
                       ),
                     ),
                     selectedColor: context.colorScheme.primary,
@@ -603,8 +589,7 @@ class DriftSearchPage extends HookConsumerWidget {
                   ),
                   onPressed: () {
                     textSearchType.value = TextSearchType.filename;
-                    searchHintText.value =
-                        'file_name_or_extension'.t(context: context);
+                    searchHintText.value = 'file_name_or_extension'.t(context: context);
                   },
                 ),
                 MenuItemButton(
@@ -614,20 +599,15 @@ class DriftSearchPage extends HookConsumerWidget {
                       'search_by_description'.t(context: context),
                       style: context.textTheme.bodyLarge?.copyWith(
                         fontWeight: FontWeight.w500,
-                        color:
-                            textSearchType.value == TextSearchType.description
-                                ? context.colorScheme.primary
-                                : null,
+                        color: textSearchType.value == TextSearchType.description ? context.colorScheme.primary : null,
                       ),
                     ),
                     selectedColor: context.colorScheme.primary,
-                    selected:
-                        textSearchType.value == TextSearchType.description,
+                    selected: textSearchType.value == TextSearchType.description,
                   ),
                   onPressed: () {
                     textSearchType.value = TextSearchType.description;
-                    searchHintText.value =
-                        'search_by_description_example'.t(context: context);
+                    searchHintText.value = 'search_by_description_example'.t(context: context);
                   },
                 ),
               ],
@@ -657,9 +637,7 @@ class DriftSearchPage extends HookConsumerWidget {
             hintText: searchHintText.value,
             key: const Key('search_text_field'),
             controller: textSearchController,
-            contentPadding: preFilter != null
-                ? const EdgeInsets.only(left: 24)
-                : const EdgeInsets.all(8),
+            contentPadding: preFilter != null ? const EdgeInsets.only(left: 24) : const EdgeInsets.all(8),
             prefixIcon: preFilter != null
                 ? null
                 : Icon(
@@ -718,8 +696,7 @@ class DriftSearchPage extends HookConsumerWidget {
                     SearchFilterChip(
                       icon: Icons.display_settings_outlined,
                       onTap: showDisplayOptionPicker,
-                      label:
-                          'search_filter_display_options'.t(context: context),
+                      label: 'search_filter_display_options'.t(context: context),
                       currentFilter: displayOptionCurrentFilterWidget.value,
                     ),
                   ],
@@ -755,16 +732,13 @@ class _SearchResultGrid extends ConsumerWidget {
 
     return NotificationListener<ScrollEndNotification>(
       onNotification: (notification) {
-        final isBottomSheetNotification = notification.context
-                ?.findAncestorWidgetOfExactType<DraggableScrollableSheet>() !=
-            null;
+        final isBottomSheetNotification =
+            notification.context?.findAncestorWidgetOfExactType<DraggableScrollableSheet>() != null;
 
         final metrics = notification.metrics;
         final isVerticalScroll = metrics.axis == Axis.vertical;
 
-        if (metrics.pixels >= metrics.maxScrollExtent &&
-            isVerticalScroll &&
-            !isBottomSheetNotification) {
+        if (metrics.pixels >= metrics.maxScrollExtent && isVerticalScroll && !isBottomSheetNotification) {
           onScrollEnd();
         }
 
@@ -775,9 +749,7 @@ class _SearchResultGrid extends ConsumerWidget {
           overrides: [
             timelineServiceProvider.overrideWith(
               (ref) {
-                final timelineService = ref
-                    .watch(timelineFactoryProvider)
-                    .fromAssets(searchResult.assets);
+                final timelineService = ref.watch(timelineFactoryProvider).fromAssets(searchResult.assets);
                 ref.onDispose(timelineService.dispose);
                 return timelineService;
               },
@@ -806,9 +778,7 @@ class _SearchEmptyContent extends StatelessWidget {
           const SizedBox(height: 40),
           Center(
             child: Image.asset(
-              context.isDarkTheme
-                  ? 'assets/polaroid-dark.png'
-                  : 'assets/polaroid-light.png',
+              context.isDarkTheme ? 'assets/polaroid-dark.png' : 'assets/polaroid-light.png',
               height: 125,
             ),
           ),
diff --git a/mobile/lib/presentation/pages/search/paginated_search.provider.dart b/mobile/lib/presentation/pages/search/paginated_search.provider.dart
index 84635fd0b9..c93d002b95 100644
--- a/mobile/lib/presentation/pages/search/paginated_search.provider.dart
+++ b/mobile/lib/presentation/pages/search/paginated_search.provider.dart
@@ -4,16 +4,14 @@ import 'package:immich_mobile/domain/services/search.service.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/providers/infrastructure/search.provider.dart';
 
-final paginatedSearchProvider =
-    StateNotifierProvider<PaginatedSearchNotifier, SearchResult>(
+final paginatedSearchProvider = StateNotifierProvider<PaginatedSearchNotifier, SearchResult>(
   (ref) => PaginatedSearchNotifier(ref.watch(searchServiceProvider)),
 );
 
 class PaginatedSearchNotifier extends StateNotifier<SearchResult> {
   final SearchService _searchService;
 
-  PaginatedSearchNotifier(this._searchService)
-      : super(const SearchResult(assets: [], nextPage: 1));
+  PaginatedSearchNotifier(this._searchService) : super(const SearchResult(assets: [], nextPage: 1));
 
   Future<bool> search(SearchFilter filter) async {
     if (state.nextPage == null) {
diff --git a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
index 061e15e58a..f17bf553ce 100644
--- a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart
@@ -35,9 +35,7 @@ class ArchiveActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
index 2ad285326c..cc65571a40 100644
--- a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
@@ -25,12 +25,10 @@ class BaseActionButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final miniWidth =
-        minWidth ?? (context.isMobile ? context.width / 4.5 : 75.0);
+    final miniWidth = minWidth ?? (context.isMobile ? context.width / 4.5 : 75.0);
     final iconTheme = IconTheme.of(context);
     final iconSize = iconTheme.size ?? 24.0;
-    final iconColor =
-        this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;
+    final iconColor = this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;
     final textColor = context.themeData.textTheme.labelLarge?.color;
 
     if (menuItem) {
diff --git a/mobile/lib/presentation/widgets/action_buttons/cast_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/cast_action_button.widget.dart
index 2900d55834..c80dbaaf2d 100644
--- a/mobile/lib/presentation/widgets/action_buttons/cast_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/cast_action_button.widget.dart
@@ -17,8 +17,7 @@ class CastActionButton extends ConsumerWidget {
 
     return BaseActionButton(
       iconData: isCasting ? Icons.cast_connected_rounded : Icons.cast_rounded,
-      iconColor:
-          isCasting ? context.primaryColor : null, // null = default color
+      iconColor: isCasting ? context.primaryColor : null, // null = default color
       label: "cast".t(context: context),
       onPressed: () {
         showDialog(
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
index acd3738f7a..af14befe61 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
@@ -35,9 +35,7 @@ class DeleteLocalActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
index 7840e8a41d..1f8710b07f 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
@@ -20,8 +20,7 @@ class DeletePermanentActionButton extends ConsumerWidget {
       return;
     }
 
-    final result =
-        await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
+    final result = await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
     ref.read(multiSelectProvider.notifier).reset();
 
     if (source == ActionSource.viewer) {
@@ -36,9 +35,7 @@ class DeletePermanentActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
index 71cf5acb0a..6047eb90eb 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
@@ -17,8 +17,7 @@ class DeleteTrashActionButton extends ConsumerWidget {
       return;
     }
 
-    final result =
-        await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
+    final result = await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'assets_permanently_deleted_count'.t(
@@ -29,9 +28,7 @@ class DeleteTrashActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
index c6eda703a5..a6464308e2 100644
--- a/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/download_action_button.widget.dart
@@ -35,8 +35,7 @@ class DownloadActionButton extends ConsumerWidget {
     } else if (result.count > 0) {
       ImmichToast.show(
         context: context,
-        msg: 'download_action_prompt'
-            .t(context: context, args: {'count': result.count.toString()}),
+        msg: 'download_action_prompt'.t(context: context, args: {'count': result.count.toString()}),
         gravity: ToastGravity.BOTTOM,
         toastType: ToastType.success,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart
index c7279995ff..fc642483be 100644
--- a/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/edit_location_action_button.widget.dart
@@ -18,8 +18,7 @@ class EditLocationActionButton extends ConsumerWidget {
       return;
     }
 
-    final result =
-        await ref.read(actionProvider.notifier).editLocation(source, context);
+    final result = await ref.read(actionProvider.notifier).editLocation(source, context);
     if (result == null) {
       return;
     }
@@ -34,9 +33,7 @@ class EditLocationActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
index 39d059c2d1..c330a7bbb1 100644
--- a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart
@@ -39,9 +39,7 @@ class FavoriteActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart
index 47f797c166..696b9ff367 100644
--- a/mobile/lib/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart
@@ -14,9 +14,7 @@ class MotionPhotoActionButton extends ConsumerWidget {
     final isPlaying = ref.watch(isPlayingMotionVideoProvider);
 
     return BaseActionButton(
-      iconData: isPlaying
-          ? Icons.motion_photos_pause_outlined
-          : Icons.play_circle_outline_rounded,
+      iconData: isPlaying ? Icons.motion_photos_pause_outlined : Icons.play_circle_outline_rounded,
       label: "play_motion_photo".t(context: context),
       onPressed: ref.read(isPlayingMotionVideoProvider.notifier).toggle,
       menuItem: menuItem,
diff --git a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
index 6b3e32a2dc..0fde43b459 100644
--- a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart
@@ -20,8 +20,7 @@ class MoveToLockFolderActionButton extends ConsumerWidget {
       return;
     }
 
-    final result =
-        await ref.read(actionProvider.notifier).moveToLockFolder(source);
+    final result = await ref.read(actionProvider.notifier).moveToLockFolder(source);
     ref.read(multiSelectProvider.notifier).reset();
 
     if (source == ActionSource.viewer) {
@@ -36,9 +35,7 @@ class MoveToLockFolderActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
index 8228e27cc1..8857a1b2d9 100644
--- a/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart
@@ -23,9 +23,7 @@ class RemoveFromAlbumActionButton extends ConsumerWidget {
       return;
     }
 
-    final result = await ref
-        .read(actionProvider.notifier)
-        .removeFromAlbum(source, albumId);
+    final result = await ref.read(actionProvider.notifier).removeFromAlbum(source, albumId);
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'remove_from_album_action_prompt'.t(
@@ -36,9 +34,7 @@ class RemoveFromAlbumActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
index 20fb62013f..028abf5596 100644
--- a/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart
@@ -18,8 +18,7 @@ class RemoveFromLockFolderActionButton extends ConsumerWidget {
       return;
     }
 
-    final result =
-        await ref.read(actionProvider.notifier).removeFromLockFolder(source);
+    final result = await ref.read(actionProvider.notifier).removeFromLockFolder(source);
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'remove_from_lock_folder_action_prompt'.t(
@@ -30,9 +29,7 @@ class RemoveFromLockFolderActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart
index 6a3df94cbd..7cdc28e1e8 100644
--- a/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart
@@ -28,9 +28,7 @@ class RestoreTrashActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
index 1b1553dabc..546fbe408d 100644
--- a/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart
@@ -37,8 +37,7 @@ class ShareActionButton extends ConsumerWidget {
     } else if (result.count > 0) {
       ImmichToast.show(
         context: context,
-        msg: 'share_action_prompt'
-            .t(context: context, args: {'count': result.count.toString()}),
+        msg: 'share_action_prompt'.t(context: context, args: {'count': result.count.toString()}),
         gravity: ToastGravity.BOTTOM,
         toastType: ToastType.success,
       );
@@ -48,8 +47,7 @@ class ShareActionButton extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return BaseActionButton(
-      iconData:
-          Platform.isAndroid ? Icons.share_rounded : Icons.ios_share_rounded,
+      iconData: Platform.isAndroid ? Icons.share_rounded : Icons.ios_share_rounded,
       label: 'share'.t(context: context),
       onPressed: () => _onTap(context, ref),
     );
diff --git a/mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart
index 13782c0098..d448c5ce86 100644
--- a/mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart
@@ -24,8 +24,7 @@ class StackActionButton extends ConsumerWidget {
       throw Exception('User must be logged in to access stack action');
     }
 
-    final result =
-        await ref.read(actionProvider.notifier).stack(user.id, source);
+    final result = await ref.read(actionProvider.notifier).stack(user.id, source);
     ref.read(multiSelectProvider.notifier).reset();
 
     final successMessage = 'stack_action_prompt'.t(
@@ -36,9 +35,7 @@ class StackActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
index 2863c71d12..a6656e02a1 100644
--- a/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
@@ -35,9 +35,7 @@ class TrashActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
index e44500144c..d01a5cc47b 100644
--- a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart
@@ -29,9 +29,7 @@ class UnArchiveActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
index b465643796..a45bdfb06a 100644
--- a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart
@@ -39,9 +39,7 @@ class UnFavoriteActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/unstack_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unstack_action_button.widget.dart
index c2757043a3..bf96e6ea41 100644
--- a/mobile/lib/presentation/widgets/action_buttons/unstack_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/unstack_action_button.widget.dart
@@ -29,9 +29,7 @@ class UnStackActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart
index d67c952b1a..9e2fc9b309 100644
--- a/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart
@@ -28,9 +28,7 @@ class UploadActionButton extends ConsumerWidget {
     if (context.mounted) {
       ImmichToast.show(
         context: context,
-        msg: result.success
-            ? successMessage
-            : 'scaffold_body_error_occurred'.t(context: context),
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
         gravity: ToastGravity.BOTTOM,
         toastType: result.success ? ToastType.success : ToastType.error,
       );
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart
index 5b86258e72..e78c8ea8ad 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart
@@ -2,8 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 
-class StackChildrenNotifier
-    extends AutoDisposeFamilyAsyncNotifier<List<RemoteAsset>, BaseAsset?> {
+class StackChildrenNotifier extends AutoDisposeFamilyAsyncNotifier<List<RemoteAsset>, BaseAsset?> {
   @override
   Future<List<RemoteAsset>> build(BaseAsset? asset) async {
     if (asset == null || asset is! RemoteAsset || asset.stackId == null) {
@@ -14,7 +13,7 @@ class StackChildrenNotifier
   }
 }
 
-final stackChildrenNotifier = AsyncNotifierProvider.autoDispose
-    .family<StackChildrenNotifier, List<RemoteAsset>, BaseAsset?>(
+final stackChildrenNotifier =
+    AsyncNotifierProvider.autoDispose.family<StackChildrenNotifier, List<RemoteAsset>, BaseAsset?>(
   StackChildrenNotifier.new,
 );
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_stack.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_stack.widget.dart
index 8b3d0c6575..92f516157e 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_stack.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_stack.widget.dart
@@ -14,8 +14,7 @@ class AssetStackRow extends ConsumerWidget {
     int opacity = ref.watch(
       assetViewerProvider.select((state) => state.backgroundOpacity),
     );
-    final showControls =
-        ref.watch(assetViewerProvider.select((s) => s.showingControls));
+    final showControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
 
     if (!showControls) {
       opacity = 0;
@@ -68,8 +67,7 @@ class _StackList extends ConsumerWidget {
             child: Container(
               height: 60,
               width: 60,
-              decoration: index ==
-                      ref.watch(assetViewerProvider.select((s) => s.stackIndex))
+              decoration: index == ref.watch(assetViewerProvider.select((s) => s.stackIndex))
                   ? const BoxDecoration(
                       color: Colors.white,
                       borderRadius: BorderRadius.all(Radius.circular(6)),
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 34339c8ba3..20cf59b2e7 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -120,12 +120,10 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     super.dispose();
   }
 
-  bool get showingBottomSheet =>
-      ref.read(assetViewerProvider.select((s) => s.showingBottomSheet));
+  bool get showingBottomSheet => ref.read(assetViewerProvider.select((s) => s.showingBottomSheet));
 
   Color get backgroundColor {
-    final opacity =
-        ref.read(assetViewerProvider.select((s) => s.backgroundOpacity));
+    final opacity = ref.read(assetViewerProvider.select((s) => s.backgroundOpacity));
     return Colors.black.withAlpha(opacity);
   }
 
@@ -139,9 +137,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   // This is used to calculate the scale of the asset when the bottom sheet is showing.
   // It is a small increment to ensure that the asset is slightly zoomed in when the
   // bottom sheet is showing, which emulates the zoom effect.
-  double get _getScaleForBottomSheet =>
-      (viewController?.prevValue.scale ?? viewController?.value.scale ?? 1.0) +
-      0.01;
+  double get _getScaleForBottomSheet => (viewController?.prevValue.scale ?? viewController?.value.scale ?? 1.0) + 0.01;
 
   double _getVerticalOffsetForBottomSheet(double extent) =>
       (context.height * extent) - (context.height * _kBottomSheetMinimumExtent);
@@ -235,8 +231,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   void _onPageBuild(PhotoViewControllerBase controller) {
     viewController ??= controller;
     if (showingBottomSheet) {
-      final verticalOffset = (context.height * bottomSheetController.size) -
-          (context.height * _kBottomSheetMinimumExtent);
+      final verticalOffset =
+          (context.height * bottomSheetController.size) - (context.height * _kBottomSheetMinimumExtent);
       controller.position = Offset(0, -verticalOffset);
     }
   }
@@ -262,9 +258,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     viewController = controller;
     dragDownPosition = details.localPosition;
     initialPhotoViewState = controller.value;
-    final isZoomed =
-        scaleStateController.scaleState == PhotoViewScaleState.zoomedIn ||
-            scaleStateController.scaleState == PhotoViewScaleState.covering;
+    final isZoomed = scaleStateController.scaleState == PhotoViewScaleState.zoomedIn ||
+        scaleStateController.scaleState == PhotoViewScaleState.covering;
     if (!showingBottomSheet && isZoomed) {
       blockGestures = true;
     }
@@ -349,8 +344,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       updatedScale = initialPhotoViewState.scale! * (1.0 - scaleReduction);
     }
 
-    final backgroundOpacity =
-        (255 * (1.0 - (scaleReduction / dragRatio))).round();
+    final backgroundOpacity = (255 * (1.0 - (scaleReduction / dragRatio))).round();
 
     viewController?.updateMultiple(
       position: initialPhotoViewState.position + delta,
@@ -494,8 +488,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   }
 
   void _snapBottomSheet() {
-    if (bottomSheetController.size > _kBottomSheetSnapExtent ||
-        bottomSheetController.size < 0.4) {
+    if (bottomSheetController.size > _kBottomSheetSnapExtent || bottomSheetController.size < 0.4) {
       return;
     }
     isSnapping = true;
@@ -514,8 +507,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     BaseAsset asset = ref.read(timelineServiceProvider).getAsset(index);
     final stackChildren = ref.read(stackChildrenNotifier(asset)).valueOrNull;
     if (stackChildren != null && stackChildren.isNotEmpty) {
-      asset = stackChildren
-          .elementAt(ref.read(assetViewerProvider.select((s) => s.stackIndex)));
+      asset = stackChildren.elementAt(ref.read(assetViewerProvider.select((s) => s.stackIndex)));
     }
     return Container(
       width: double.infinity,
@@ -547,8 +539,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     BaseAsset asset = ref.read(timelineServiceProvider).getAsset(index);
     final stackChildren = ref.read(stackChildrenNotifier(asset)).valueOrNull;
     if (stackChildren != null && stackChildren.isNotEmpty) {
-      asset = stackChildren
-          .elementAt(ref.read(assetViewerProvider.select((s) => s.stackIndex)));
+      asset = stackChildren.elementAt(ref.read(assetViewerProvider.select((s) => s.stackIndex)));
     }
 
     final isPlayingMotionVideo = ref.read(isPlayingMotionVideoProvider);
@@ -564,8 +555,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     return PhotoViewGalleryPageOptions(
       key: ValueKey(asset.heroTag),
       imageProvider: getFullImageProvider(asset, size: size),
-      heroAttributes:
-          PhotoViewHeroAttributes(tag: '${asset.heroTag}_$heroOffset'),
+      heroAttributes: PhotoViewHeroAttributes(tag: '${asset.heroTag}_$heroOffset'),
       filterQuality: FilterQuality.high,
       tightMode: true,
       initialScale: PhotoViewComputedScale.contained * 0.999,
@@ -600,8 +590,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       onDragUpdate: _onDragUpdate,
       onDragEnd: _onDragEnd,
       onTapDown: _onTapDown,
-      heroAttributes:
-          PhotoViewHeroAttributes(tag: '${asset.heroTag}_$heroOffset'),
+      heroAttributes: PhotoViewHeroAttributes(tag: '${asset.heroTag}_$heroOffset'),
       filterQuality: FilterQuality.high,
       initialScale: PhotoViewComputedScale.contained * 0.99,
       maxScale: 1.0,
@@ -615,8 +604,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
           asset: asset,
           image: Image(
             key: ValueKey(asset),
-            image:
-                getFullImageProvider(asset, size: Size(ctx.width, ctx.height)),
+            image: getFullImageProvider(asset, size: Size(ctx.width, ctx.height)),
             fit: BoxFit.contain,
             height: ctx.height,
             width: ctx.width,
@@ -641,8 +629,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     ref.watch(isPlayingMotionVideoProvider);
 
     // Listen for casting changes and send initial asset to the cast provider
-    ref.listen(castProvider.select((value) => value.isCasting),
-        (_, isCasting) async {
+    ref.listen(castProvider.select((value) => value.isCasting), (_, isCasting) async {
       if (!isCasting) return;
 
       final asset = ref.read(currentAssetNotifier);
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
index e57a6ff7ca..32d5249bdc 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart
@@ -108,7 +108,6 @@ class AssetViewerStateNotifier extends AutoDisposeNotifier<AssetViewerState> {
   }
 }
 
-final assetViewerProvider =
-    AutoDisposeNotifierProvider<AssetViewerStateNotifier, AssetViewerState>(
+final assetViewerProvider = AutoDisposeNotifierProvider<AssetViewerStateNotifier, AssetViewerState>(
   AssetViewerStateNotifier.new,
 );
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
index 65bab5acb8..9ea2035930 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
@@ -29,8 +29,7 @@ class ViewerBottomBar extends ConsumerWidget {
     int opacity = ref.watch(
       assetViewerProvider.select((state) => state.backgroundOpacity),
     );
-    final showControls =
-        ref.watch(assetViewerProvider.select((s) => s.showingControls));
+    final showControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
 
     if (!showControls) {
       opacity = 0;
@@ -38,10 +37,8 @@ class ViewerBottomBar extends ConsumerWidget {
 
     final actions = <Widget>[
       const ShareActionButton(source: ActionSource.viewer),
-      if (asset.isLocalOnly)
-        const UploadActionButton(source: ActionSource.viewer),
-      if (asset.hasRemote && isOwner)
-        const ArchiveActionButton(source: ActionSource.viewer),
+      if (asset.isLocalOnly) const UploadActionButton(source: ActionSource.viewer),
+      if (asset.hasRemote && isOwner) const ArchiveActionButton(source: ActionSource.viewer),
     ];
 
     return IgnorePointer(
@@ -55,11 +52,9 @@ class ViewerBottomBar extends ConsumerWidget {
               ? const SizedBox.shrink()
               : Theme(
                   data: context.themeData.copyWith(
-                    iconTheme:
-                        const IconThemeData(size: 22, color: Colors.white),
+                    iconTheme: const IconThemeData(size: 22, color: Colors.white),
                     textTheme: context.themeData.textTheme.copyWith(
-                      labelLarge:
-                          context.themeData.textTheme.labelLarge?.copyWith(
+                      labelLarge: context.themeData.textTheme.labelLarge?.copyWith(
                         color: Colors.white,
                       ),
                     ),
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 9111469629..b6d24724b4 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -52,8 +52,7 @@ class AssetDetailBottomSheet extends ConsumerWidget {
       if (asset.hasRemote) ...[
         const ShareLinkActionButton(source: ActionSource.viewer),
         const ArchiveActionButton(source: ActionSource.viewer),
-        if (!asset.hasLocal)
-          const DownloadActionButton(source: ActionSource.viewer),
+        if (!asset.hasLocal) const DownloadActionButton(source: ActionSource.viewer),
         isTrashEnable
             ? const TrashActionButton(source: ActionSource.viewer)
             : const DeletePermanentActionButton(source: ActionSource.viewer),
@@ -100,18 +99,14 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
   String _getFileInfo(BaseAsset asset, ExifInfo? exifInfo) {
     final height = asset.height ?? exifInfo?.height;
     final width = asset.width ?? exifInfo?.width;
-    final resolution = (width != null && height != null)
-        ? "${width.toInt()} x ${height.toInt()}"
-        : null;
-    final fileSize =
-        exifInfo?.fileSize != null ? formatBytes(exifInfo!.fileSize!) : null;
+    final resolution = (width != null && height != null) ? "${width.toInt()} x ${height.toInt()}" : null;
+    final fileSize = exifInfo?.fileSize != null ? formatBytes(exifInfo!.fileSize!) : null;
 
     return switch ((fileSize, resolution)) {
       (null, null) => '',
       (String fileSize, null) => fileSize,
       (null, String resolution) => resolution,
-      (String fileSize, String resolution) =>
-        '$fileSize$_kSeparator$resolution',
+      (String fileSize, String resolution) => '$fileSize$_kSeparator$resolution',
     };
   }
 
@@ -133,17 +128,12 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
       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 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 [fNumber, exposureTime, focalLength, iso]
-        .where((spec) => spec != null && spec.isNotEmpty)
-        .join(_kSeparator);
+    return [fNumber, exposureTime, focalLength, iso].where((spec) => spec != null && spec.isNotEmpty).join(_kSeparator);
   }
 
   @override
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
index 855328ebde..f91dafb3ed 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/location_details.widget.dart
@@ -71,17 +71,13 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
     final hasCoordinates = exifInfo?.hasCoordinates ?? false;
 
     // Guard no lat/lng
-    if (!hasCoordinates ||
-        (asset != null && asset is LocalAsset && asset!.hasRemote)) {
+    if (!hasCoordinates || (asset != null && asset is LocalAsset && asset!.hasRemote)) {
       return const SizedBox.shrink();
     }
 
-    final remoteId = asset is LocalAsset
-        ? (asset as LocalAsset).remoteId
-        : (asset as RemoteAsset).id;
+    final remoteId = asset is LocalAsset ? (asset as LocalAsset).remoteId : (asset as RemoteAsset).id;
     final locationName = _getLocationName(exifInfo);
-    final coordinates =
-        "${exifInfo!.latitude!.toStringAsFixed(4)}, ${exifInfo!.longitude!.toStringAsFixed(4)}";
+    final coordinates = "${exifInfo!.latitude!.toStringAsFixed(4)}, ${exifInfo!.longitude!.toStringAsFixed(4)}";
 
     return Padding(
       padding: EdgeInsets.symmetric(
diff --git a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
index 4cdf9f2287..3f48a83bcb 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart
@@ -30,13 +30,11 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
     final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
     final isInLockedView = ref.watch(inLockedViewProvider);
 
-    final isShowingSheet = ref
-        .watch(assetViewerProvider.select((state) => state.showingBottomSheet));
+    final isShowingSheet = ref.watch(assetViewerProvider.select((state) => state.showingBottomSheet));
     int opacity = ref.watch(
       assetViewerProvider.select((state) => state.backgroundOpacity),
     );
-    final showControls =
-        ref.watch(assetViewerProvider.select((s) => s.showingControls));
+    final showControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
 
     if (!showControls) {
       opacity = 0;
@@ -45,8 +43,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
     final isCasting = ref.watch(
       castProvider.select((c) => c.isCasting),
     );
-    final websocketConnected =
-        ref.watch(websocketProvider.select((c) => c.isConnected));
+    final websocketConnected = ref.watch(websocketProvider.select((c) => c.isConnected));
 
     final actions = <Widget>[
       if (isCasting || (asset.hasRemote && websocketConnected))
@@ -78,8 +75,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
         opacity: opacity / 255,
         duration: Durations.short2,
         child: AppBar(
-          backgroundColor:
-              isShowingSheet ? Colors.transparent : Colors.black.withAlpha(125),
+          backgroundColor: isShowingSheet ? Colors.transparent : Colors.black.withAlpha(125),
           leading: const _AppBarBackButton(),
           iconTheme: const IconThemeData(size: 22, color: Colors.white),
           actionsIconTheme: const IconThemeData(size: 22, color: Colors.white),
@@ -117,12 +113,9 @@ class _AppBarBackButton extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final isShowingSheet = ref
-        .watch(assetViewerProvider.select((state) => state.showingBottomSheet));
-    final backgroundColor =
-        isShowingSheet && !context.isDarkTheme ? Colors.white : Colors.black;
-    final foregroundColor =
-        isShowingSheet && !context.isDarkTheme ? Colors.black : Colors.white;
+    final isShowingSheet = ref.watch(assetViewerProvider.select((state) => state.showingBottomSheet));
+    final backgroundColor = isShowingSheet && !context.isDarkTheme ? Colors.white : Colors.black;
+    final foregroundColor = isShowingSheet && !context.isDarkTheme ? Colors.black : Colors.white;
 
     return Padding(
       padding: const EdgeInsets.only(left: 12.0),
diff --git a/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
index 2accf465ed..f0d665b8ce 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
@@ -92,9 +92,7 @@ class NativeVideoViewer extends HookConsumerWidget {
 
       try {
         if (asset.hasLocal && asset.livePhotoVideoId == null) {
-          final id = asset is LocalAsset
-              ? (asset as LocalAsset).id
-              : (asset as RemoteAsset).localId!;
+          final id = asset is LocalAsset ? (asset as LocalAsset).id : (asset as RemoteAsset).localId!;
           final file = await const StorageRepository().getFileForAsset(id);
           if (file == null) {
             throw Exception('No file found for the video');
@@ -111,10 +109,8 @@ class NativeVideoViewer extends HookConsumerWidget {
 
         // Use a network URL for the video player controller
         final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-        final isOriginalVideo =
-            ref.read(settingsProvider).get<bool>(Setting.loadOriginalVideo);
-        final String postfixUrl =
-            isOriginalVideo ? 'original' : 'video/playback';
+        final isOriginalVideo = ref.read(settingsProvider).get<bool>(Setting.loadOriginalVideo);
+        final String postfixUrl = isOriginalVideo ? 'original' : 'video/playback';
         final String videoUrl = asset.livePhotoVideoId != null
             ? '$serverEndpoint/assets/${asset.livePhotoVideoId}/$postfixUrl'
             : '$serverEndpoint/assets/$remoteId/$postfixUrl';
@@ -142,8 +138,7 @@ class NativeVideoViewer extends HookConsumerWidget {
         }
 
         try {
-          aspectRatio.value =
-              await ref.read(assetServiceProvider).getAspectRatio(asset);
+          aspectRatio.value = await ref.read(assetServiceProvider).getAspectRatio(asset);
         } catch (error) {
           log.severe(
             'Error getting aspect ratio for asset ${asset.name}: $error',
@@ -159,8 +154,7 @@ class NativeVideoViewer extends HookConsumerWidget {
       }
 
       final videoPlayback = ref.read(videoPlaybackValueProvider);
-      if ((isBuffering.value ||
-              videoPlayback.state == VideoPlaybackState.initializing) &&
+      if ((isBuffering.value || videoPlayback.state == VideoPlaybackState.initializing) &&
           videoPlayback.state != VideoPlaybackState.buffering) {
         ref.read(videoPlaybackValueProvider.notifier).value =
             videoPlayback.copyWith(state: VideoPlaybackState.buffering);
@@ -219,8 +213,7 @@ class NativeVideoViewer extends HookConsumerWidget {
         return;
       }
 
-      final videoPlayback =
-          VideoPlaybackValue.fromNativeController(videoController);
+      final videoPlayback = VideoPlaybackValue.fromNativeController(videoController);
       ref.read(videoPlaybackValueProvider.notifier).value = videoPlayback;
 
       if (ref.read(assetViewerProvider.select((s) => s.showingBottomSheet))) {
@@ -241,8 +234,7 @@ class NativeVideoViewer extends HookConsumerWidget {
         return;
       }
 
-      final videoPlayback =
-          VideoPlaybackValue.fromNativeController(videoController);
+      final videoPlayback = VideoPlaybackValue.fromNativeController(videoController);
       if (videoPlayback.state == VideoPlaybackState.playing) {
         // Sync with the controls playing
         WakelockPlus.enable();
@@ -251,8 +243,7 @@ class NativeVideoViewer extends HookConsumerWidget {
         WakelockPlus.disable();
       }
 
-      ref.read(videoPlaybackValueProvider.notifier).status =
-          videoPlayback.state;
+      ref.read(videoPlaybackValueProvider.notifier).status = videoPlayback.state;
     }
 
     void onPlaybackPositionChanged() {
@@ -271,8 +262,7 @@ class NativeVideoViewer extends HookConsumerWidget {
         return;
       }
 
-      ref.read(videoPlaybackValueProvider.notifier).position =
-          Duration(seconds: playbackInfo.position);
+      ref.read(videoPlaybackValueProvider.notifier).position = Duration(seconds: playbackInfo.position);
 
       // Check if the video is buffering
       if (playbackInfo.status == PlaybackStatus.playing) {
@@ -296,10 +286,8 @@ class NativeVideoViewer extends HookConsumerWidget {
     }
 
     void removeListeners(NativeVideoPlayerController controller) {
-      controller.onPlaybackPositionChanged
-          .removeListener(onPlaybackPositionChanged);
-      controller.onPlaybackStatusChanged
-          .removeListener(onPlaybackStatusChanged);
+      controller.onPlaybackPositionChanged.removeListener(onPlaybackPositionChanged);
+      controller.onPlaybackStatusChanged.removeListener(onPlaybackStatusChanged);
       controller.onPlaybackReady.removeListener(onPlaybackReady);
       controller.onPlaybackEnded.removeListener(onPlaybackEnded);
     }
@@ -324,9 +312,7 @@ class NativeVideoViewer extends HookConsumerWidget {
       nc.loadVideoSource(source).catchError((error) {
         log.severe('Error loading video source: $error');
       });
-      final loopVideo = ref
-          .read(appSettingsServiceProvider)
-          .getSetting<bool>(AppSettingsEnum.loopVideo);
+      final loopVideo = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.loopVideo);
       nc.setLoop(!asset.isMotionPhoto && loopVideo);
 
       controller.value = nc;
diff --git a/mobile/lib/presentation/widgets/asset_viewer/video_viewer_controls.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/video_viewer_controls.widget.dart
index 883169ae83..1fc01bb8e5 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/video_viewer_controls.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/video_viewer_controls.widget.dart
@@ -23,15 +23,12 @@ class VideoViewerControls extends HookConsumerWidget {
     final assetIsVideo = ref.watch(
       currentAssetNotifier.select((asset) => asset != null && asset.isVideo),
     );
-    bool showControls =
-        ref.watch(assetViewerProvider.select((s) => s.showingControls));
-    final showBottomSheet =
-        ref.watch(assetViewerProvider.select((s) => s.showingBottomSheet));
+    bool showControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
+    final showBottomSheet = ref.watch(assetViewerProvider.select((s) => s.showingBottomSheet));
     if (showBottomSheet) {
       showControls = false;
     }
-    final VideoPlaybackState state =
-        ref.watch(videoPlaybackValueProvider.select((value) => value.state));
+    final VideoPlaybackState state = ref.watch(videoPlaybackValueProvider.select((value) => value.state));
 
     final cast = ref.watch(castProvider);
 
@@ -45,15 +42,12 @@ class VideoViewerControls extends HookConsumerWidget {
         final state = ref.read(videoPlaybackValueProvider).state;
 
         // Do not hide on paused
-        if (state != VideoPlaybackState.paused &&
-            state != VideoPlaybackState.completed &&
-            assetIsVideo) {
+        if (state != VideoPlaybackState.paused && state != VideoPlaybackState.completed && assetIsVideo) {
           ref.read(assetViewerProvider.notifier).setControls(false);
         }
       },
     );
-    final showBuffering =
-        state == VideoPlaybackState.buffering && !cast.isCasting;
+    final showBuffering = state == VideoPlaybackState.buffering && !cast.isCasting;
 
     /// Shows the controls and starts the timer to hide them
     void showControlsAndStartHideTimer() {
@@ -62,8 +56,7 @@ class VideoViewerControls extends HookConsumerWidget {
     }
 
     // When we change position, show or hide timer
-    ref.listen(videoPlayerControlsProvider.select((v) => v.position),
-        (previous, next) {
+    ref.listen(videoPlayerControlsProvider.select((v) => v.position), (previous, next) {
       showControlsAndStartHideTimer();
     });
 
@@ -111,14 +104,13 @@ class VideoViewerControls extends HookConsumerWidget {
               )
             else
               GestureDetector(
-                onTap: () =>
-                    ref.read(assetViewerProvider.notifier).setControls(false),
+                onTap: () => ref.read(assetViewerProvider.notifier).setControls(false),
                 child: CenterPlayButton(
                   backgroundColor: Colors.black54,
                   iconColor: Colors.white,
                   isFinished: state == VideoPlaybackState.completed,
-                  isPlaying: state == VideoPlaybackState.playing ||
-                      (cast.isCasting && cast.castState == CastState.playing),
+                  isPlaying:
+                      state == VideoPlaybackState.playing || (cast.isCasting && cast.castState == CastState.playing),
                   show: assetIsVideo && showControls,
                   onPressed: togglePlay,
                 ),
diff --git a/mobile/lib/presentation/widgets/backup/backup_toggle_button.widget.dart b/mobile/lib/presentation/widgets/backup/backup_toggle_button.widget.dart
index c817b9b4b6..520111070f 100644
--- a/mobile/lib/presentation/widgets/backup/backup_toggle_button.widget.dart
+++ b/mobile/lib/presentation/widgets/backup/backup_toggle_button.widget.dart
@@ -21,8 +21,7 @@ class BackupToggleButton extends ConsumerStatefulWidget {
   ConsumerState<BackupToggleButton> createState() => BackupToggleButtonState();
 }
 
-class BackupToggleButtonState extends ConsumerState<BackupToggleButton>
-    with SingleTickerProviderStateMixin {
+class BackupToggleButtonState extends ConsumerState<BackupToggleButton> with SingleTickerProviderStateMixin {
   late AnimationController _animationController;
   late Animation<double> _gradientAnimation;
   bool _isEnabled = false;
@@ -42,9 +41,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton>
       ),
     );
 
-    _isEnabled = ref
-        .read(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.enableBackup);
+    _isEnabled = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
   }
 
   @override
@@ -54,9 +51,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton>
   }
 
   Future<void> _onToggle(bool value) async {
-    await ref
-        .read(appSettingsServiceProvider)
-        .setSetting(AppSettingsEnum.enableBackup, value);
+    await ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.enableBackup, value);
 
     setState(() {
       _isEnabled = value;
@@ -141,8 +136,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton>
                 borderRadius: const BorderRadius.all(Radius.circular(20.5)),
                 onTap: () => isCanceling ? null : _onToggle(!_isEnabled),
                 child: Padding(
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
+                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
                   child: Row(
                     children: [
                       Container(
@@ -180,8 +174,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton>
                               children: [
                                 Text(
                                   "enable_backup".t(context: context),
-                                  style:
-                                      context.textTheme.titleMedium?.copyWith(
+                                  style: context.textTheme.titleMedium?.copyWith(
                                     fontWeight: FontWeight.w600,
                                     color: context.primaryColor,
                                   ),
@@ -214,9 +207,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton>
                                     height: 18,
                                     child: CircularProgressIndicator(
                                       strokeWidth: 2,
-                                      backgroundColor: context
-                                          .colorScheme.onSurface
-                                          .withValues(alpha: 0.2),
+                                      backgroundColor: context.colorScheme.onSurface.withValues(alpha: 0.2),
                                     ),
                                   ),
                                 ],
@@ -226,8 +217,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton>
                       ),
                       Switch.adaptive(
                         value: _isEnabled,
-                        onChanged: (value) =>
-                            isCanceling ? null : _onToggle(value),
+                        onChanged: (value) => isCanceling ? null : _onToggle(value),
                       ),
                     ],
                   ),
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 e172eec03b..b3e71567e0 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
@@ -31,12 +31,10 @@ class BaseBottomSheet extends ConsumerStatefulWidget {
   });
 
   @override
-  ConsumerState<BaseBottomSheet> createState() =>
-      _BaseDraggableScrollableSheetState();
+  ConsumerState<BaseBottomSheet> createState() => _BaseDraggableScrollableSheetState();
 }
 
-class _BaseDraggableScrollableSheetState
-    extends ConsumerState<BaseBottomSheet> {
+class _BaseDraggableScrollableSheetState extends ConsumerState<BaseBottomSheet> {
   late DraggableScrollableController _controller;
 
   @override
@@ -71,8 +69,7 @@ class _BaseDraggableScrollableSheetState
       shouldCloseOnMinExtent: widget.shouldCloseOnMinExtent,
       builder: (BuildContext context, ScrollController scrollController) {
         return Card(
-          color: widget.backgroundColor ??
-              context.colorScheme.surfaceContainerHigh,
+          color: widget.backgroundColor ?? context.colorScheme.surfaceContainerHigh,
           borderOnForeground: false,
           clipBehavior: Clip.antiAlias,
           elevation: 6.0,
diff --git a/mobile/lib/presentation/widgets/images/image_provider.dart b/mobile/lib/presentation/widgets/images/image_provider.dart
index 970bb581cf..e4effd0804 100644
--- a/mobile/lib/presentation/widgets/images/image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/image_provider.dart
@@ -71,5 +71,4 @@ ImageProvider getThumbnailImageProvider({
 }
 
 bool _shouldUseLocalAsset(BaseAsset asset) =>
-    asset.hasLocal &&
-    (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage));
+    asset.hasLocal && (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage));
diff --git a/mobile/lib/presentation/widgets/images/local_image_provider.dart b/mobile/lib/presentation/widgets/images/local_image_provider.dart
index 65311de48a..41bc19ba57 100644
--- a/mobile/lib/presentation/widgets/images/local_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/local_image_provider.dart
@@ -17,8 +17,7 @@ import 'package:immich_mobile/providers/image/exceptions/image_loading_exception
 import 'package:logging/logging.dart';
 
 class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
-  final AssetMediaRepository _assetMediaRepository =
-      const AssetMediaRepository();
+  final AssetMediaRepository _assetMediaRepository = const AssetMediaRepository();
   final CacheManager? cacheManager;
 
   final String id;
@@ -63,20 +62,17 @@ class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
     CacheManager cache,
     ImageDecoderCallback decode,
   ) async {
-    final cacheKey =
-        '${key.id}-${key.updatedAt}-${key.size.width}x${key.size.height}';
+    final cacheKey = '${key.id}-${key.updatedAt}-${key.size.width}x${key.size.height}';
 
     final fileFromCache = await cache.getFileFromCache(cacheKey);
     if (fileFromCache != null) {
       try {
-        final buffer =
-            await ImmutableBuffer.fromFilePath(fileFromCache.file.path);
+        final buffer = await ImmutableBuffer.fromFilePath(fileFromCache.file.path);
         return decode(buffer);
       } catch (_) {}
     }
 
-    final thumbnailBytes =
-        await _assetMediaRepository.getThumbnail(key.id, size: key.size);
+    final thumbnailBytes = await _assetMediaRepository.getThumbnail(key.id, size: key.size);
     if (thumbnailBytes == null) {
       PaintingBinding.instance.imageCache.evict(key);
       throw StateError(
@@ -103,8 +99,7 @@ class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
 }
 
 class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
-  final AssetMediaRepository _assetMediaRepository =
-      const AssetMediaRepository();
+  final AssetMediaRepository _assetMediaRepository = const AssetMediaRepository();
   final StorageRepository _storageRepository = const StorageRepository();
 
   final String id;
@@ -160,8 +155,7 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
           throw StateError('Unsupported asset type ${key.type}');
       }
     } catch (error, stack) {
-      Logger('ImmichLocalImageProvider')
-          .severe('Error loading local image ${key.name}', error, stack);
+      Logger('ImmichLocalImageProvider').severe('Error loading local image ${key.name}', error, stack);
       throw const ImageLoadingException(
         'Could not load image from local storage',
       );
@@ -172,8 +166,7 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
     LocalFullImageProvider key,
     ImageDecoderCallback decode,
   ) async {
-    final thumbBytes =
-        await _assetMediaRepository.getThumbnail(key.id, size: key.size);
+    final thumbBytes = await _assetMediaRepository.getThumbnail(key.id, size: key.size);
     if (thumbBytes == null) {
       return null;
     }
@@ -191,8 +184,7 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
     }
 
     final fileSize = await file.length();
-    final devicePixelRatio =
-        PlatformDispatcher.instance.views.first.devicePixelRatio;
+    final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
     final isLargeFile = fileSize > 20 * 1024 * 1024; // 20MB
     final isHEIC = file.path.toLowerCase().contains(RegExp(r'\.(heic|heif)$'));
     final isProgressive = isLargeFile || (isHEIC && !Platform.isIOS);
@@ -204,8 +196,7 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
           (key.size.width * progressiveMultiplier).clamp(256, 1024),
           (key.size.height * progressiveMultiplier).clamp(256, 1024),
         );
-        final mediumThumb =
-            await _assetMediaRepository.getThumbnail(key.id, size: size);
+        final mediumThumb = await _assetMediaRepository.getThumbnail(key.id, size: size);
         if (mediumThumb != null) {
           final mediumBuffer = await ImmutableBuffer.fromUint8List(mediumThumb);
           yield await decode(mediumBuffer);
@@ -221,8 +212,7 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
         (key.size.width * progressiveMultiplier).clamp(512, 2048),
         (key.size.height * progressiveMultiplier).clamp(512, 2048),
       );
-      final highThumb =
-          await _assetMediaRepository.getThumbnail(key.id, size: size);
+      final highThumb = await _assetMediaRepository.getThumbnail(key.id, size: size);
       if (highThumb != null) {
         final highBuffer = await ImmutableBuffer.fromUint8List(highThumb);
         yield await decode(highBuffer);
@@ -238,15 +228,11 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is LocalFullImageProvider) {
-      return id == other.id &&
-          size == other.size &&
-          type == other.type &&
-          name == other.name;
+      return id == other.id && size == other.size && type == other.type && name == other.name;
     }
     return false;
   }
 
   @override
-  int get hashCode =>
-      id.hashCode ^ size.hashCode ^ type.hashCode ^ name.hashCode;
+  int get hashCode => id.hashCode ^ size.hashCode ^ type.hashCode ^ name.hashCode;
 }
diff --git a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
index f54c32dac1..80f6af617c 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
@@ -26,10 +26,8 @@ class Thumbnail extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final thumbHash =
-        asset is RemoteAsset ? (asset as RemoteAsset).thumbHash : null;
-    final provider =
-        getThumbnailImageProvider(asset: asset, remoteId: remoteId, size: size);
+    final thumbHash = asset is RemoteAsset ? (asset as RemoteAsset).thumbHash : null;
+    final provider = getThumbnailImageProvider(asset: asset, remoteId: remoteId, size: size);
 
     return OctoImage.fromSet(
       image: provider,
@@ -72,8 +70,7 @@ OctoErrorBuilder _blurHashErrorBuilder(
   BoxFit? fit,
 }) =>
     (context, e, s) {
-      Logger("ImThumbnail")
-          .warning("Error loading thumbnail for ${asset?.name}", e, s);
+      Logger("ImThumbnail").warning("Error loading thumbnail for ${asset?.name}", e, s);
       provider?.evict();
       return Stack(
         alignment: Alignment.center,
diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index b059f5feaa..24a88c5d74 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -28,9 +28,8 @@ class ThumbnailTile extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final heroOffset = TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
 
-    final assetContainerColor = context.isDarkTheme
-        ? context.primaryColor.darken(amount: 0.4)
-        : context.primaryColor.lighten(amount: 0.75);
+    final assetContainerColor =
+        context.isDarkTheme ? context.primaryColor.darken(amount: 0.4) : context.primaryColor.lighten(amount: 0.75);
 
     final isSelected = ref.watch(
       multiSelectProvider.select(
@@ -53,8 +52,7 @@ class ThumbnailTile extends ConsumerWidget {
               )
             : const BoxDecoration();
 
-    final hasStack =
-        asset is RemoteAsset && (asset as RemoteAsset).stackId != null;
+    final hasStack = asset is RemoteAsset && (asset as RemoteAsset).stackId != null;
 
     return Stack(
       children: [
@@ -63,9 +61,8 @@ class ThumbnailTile extends ConsumerWidget {
           curve: Curves.decelerate,
           decoration: borderStyle,
           child: ClipRRect(
-            borderRadius: isSelected || lockSelection
-                ? const BorderRadius.all(Radius.circular(15.0))
-                : BorderRadius.zero,
+            borderRadius:
+                isSelected || lockSelection ? const BorderRadius.all(Radius.circular(15.0)) : BorderRadius.zero,
             child: Stack(
               children: [
                 Positioned.fill(
@@ -141,9 +138,7 @@ class ThumbnailTile extends ConsumerWidget {
               child: _SelectionIndicator(
                 isSelected: isSelected,
                 isLocked: lockSelection,
-                color: lockSelection
-                    ? context.colorScheme.surfaceContainerHighest
-                    : assetContainerColor,
+                color: lockSelection ? context.colorScheme.surfaceContainerHighest : assetContainerColor,
               ),
             ),
           ),
diff --git a/mobile/lib/presentation/widgets/memory/memory_card.widget.dart b/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
index 268bbc30c0..e69c848f45 100644
--- a/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
+++ b/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
@@ -46,11 +46,9 @@ class DriftMemoryCard extends StatelessWidget {
               BoxFit fit = BoxFit.contain;
               if (asset.width != null && asset.height != null) {
                 final aspectRatio = asset.width! / asset.height!;
-                final phoneAspectRatio =
-                    constraints.maxWidth / constraints.maxHeight;
+                final phoneAspectRatio = constraints.maxWidth / constraints.maxHeight;
                 // Look for a 25% difference in either direction
-                if (phoneAspectRatio * .75 < aspectRatio &&
-                    phoneAspectRatio * 1.25 > aspectRatio) {
+                if (phoneAspectRatio * .75 < aspectRatio && phoneAspectRatio * 1.25 > aspectRatio) {
                   // Cover to look nice if we have nearly the same aspect ratio
                   fit = BoxFit.cover;
                 }
diff --git a/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart b/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
index 403d8de061..4863b60aad 100644
--- a/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
+++ b/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
@@ -47,8 +47,7 @@ class DriftMemoryLane extends ConsumerWidget {
             ),
           );
         },
-        children:
-            memories.map((memory) => DriftMemoryCard(memory: memory)).toList(),
+        children: memories.map((memory) => DriftMemoryCard(memory: memory)).toList(),
       ),
     );
   }
diff --git a/mobile/lib/presentation/widgets/partner_user_avatar.widget.dart b/mobile/lib/presentation/widgets/partner_user_avatar.widget.dart
index 9be55cae67..8cdf1ed286 100644
--- a/mobile/lib/presentation/widgets/partner_user_avatar.widget.dart
+++ b/mobile/lib/presentation/widgets/partner_user_avatar.widget.dart
@@ -13,8 +13,7 @@ class PartnerUserAvatar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final url =
-        "${Store.get(StoreKey.serverEndpoint)}/users/${partner.id}/profile-image";
+    final url = "${Store.get(StoreKey.serverEndpoint)}/users/${partner.id}/profile-image";
     final nameFirstLetter = partner.name.isNotEmpty ? partner.name[0] : "";
     return CircleAvatar(
       radius: 16,
diff --git a/mobile/lib/presentation/widgets/remote_album/drift_album_option.widget.dart b/mobile/lib/presentation/widgets/remote_album/drift_album_option.widget.dart
index d32608a8b4..81989b263a 100644
--- a/mobile/lib/presentation/widgets/remote_album/drift_album_option.widget.dart
+++ b/mobile/lib/presentation/widgets/remote_album/drift_album_option.widget.dart
@@ -97,14 +97,12 @@ class DriftRemoteAlbumOption extends ConsumerWidget {
               ListTile(
                 leading: Icon(
                   Icons.delete,
-                  color:
-                      context.isDarkTheme ? Colors.red[400] : Colors.red[800],
+                  color: context.isDarkTheme ? Colors.red[400] : Colors.red[800],
                 ),
                 title: Text(
                   'delete_album'.t(context: context),
                   style: textStyle.copyWith(
-                    color:
-                        context.isDarkTheme ? Colors.red[400] : Colors.red[800],
+                    color: context.isDarkTheme ? Colors.red[400] : Colors.red[800],
                   ),
                 ),
                 onTap: onDeleteAlbum,
diff --git a/mobile/lib/presentation/widgets/timeline/fixed/row.dart b/mobile/lib/presentation/widgets/timeline/fixed/row.dart
index 1062c00740..24f3c97125 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/row.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/row.dart
@@ -90,8 +90,7 @@ class RenderFixedRow extends RenderBox
     }
   }
 
-  double get intrinsicWidth =>
-      dimension * childCount + spacing * (childCount - 1);
+  double get intrinsicWidth => dimension * childCount + spacing * (childCount - 1);
 
   @override
   double computeMinIntrinsicWidth(double height) => intrinsicWidth;
diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
index 7fff6d7d2d..ab1670f169 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -39,9 +39,7 @@ class FixedSegment extends Segment {
   @override
   double indexToLayoutOffset(int index) {
     final relativeIndex = index - gridIndex;
-    return relativeIndex < 0
-        ? startOffset
-        : gridOffset + (mainAxisExtend * relativeIndex);
+    return relativeIndex < 0 ? startOffset : gridOffset + (mainAxisExtend * relativeIndex);
   }
 
   @override
@@ -98,8 +96,7 @@ class _FixedSegmentRow extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final isScrubbing =
-        ref.watch(timelineStateProvider.select((s) => s.isScrubbing));
+    final isScrubbing = ref.watch(timelineStateProvider.select((s) => s.isScrubbing));
     final timelineService = ref.read(timelineServiceProvider);
 
     if (isScrubbing) {
@@ -215,11 +212,8 @@ class _AssetTileWidget extends ConsumerWidget {
 
     return RepaintBoundary(
       child: GestureDetector(
-        onTap: () => lockSelection
-            ? null
-            : _handleOnTap(context, ref, assetIndex, asset),
-        onLongPress: () =>
-            lockSelection ? null : _handleOnLongPress(ref, asset),
+        onTap: () => lockSelection ? null : _handleOnTap(context, ref, assetIndex, asset),
+        onLongPress: () => lockSelection ? null : _handleOnLongPress(ref, asset),
         child: ThumbnailTile(
           asset,
           lockSelection: lockSelection,
diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment_builder.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment_builder.dart
index 6e3af3fd3d..5e260a4e68 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment_builder.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment_builder.dart
@@ -37,17 +37,13 @@ class FixedSegmentBuilder extends SegmentBuilder {
         GroupAssetsBy.month => HeaderType.month,
         GroupAssetsBy.day ||
         GroupAssetsBy.auto =>
-          bucket is TimeBucket && bucket.date.month != previousDate?.month
-              ? HeaderType.monthAndDay
-              : HeaderType.day,
+          bucket is TimeBucket && bucket.date.month != previousDate?.month ? HeaderType.monthAndDay : HeaderType.day,
         GroupAssetsBy.none => HeaderType.none,
       };
       final headerExtent = SegmentBuilder.headerExtent(timelineHeader);
 
       final segmentStartOffset = startOffset;
-      startOffset += headerExtent +
-          (tileHeight * numberOfRows) +
-          spacing * (numberOfRows - 1);
+      startOffset += headerExtent + (tileHeight * numberOfRows) + spacing * (numberOfRows - 1);
       final segmentEndOffset = startOffset;
 
       segments.add(
diff --git a/mobile/lib/presentation/widgets/timeline/header.widget.dart b/mobile/lib/presentation/widgets/timeline/header.widget.dart
index c6c10c26c9..da48acd7db 100644
--- a/mobile/lib/presentation/widgets/timeline/header.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/header.widget.dart
@@ -43,10 +43,8 @@ class TimelineHeader extends StatelessWidget {
 
     final date = (bucket as TimeBucket).date;
 
-    final isMonthHeader =
-        header == HeaderType.month || header == HeaderType.monthAndDay;
-    final isDayHeader =
-        header == HeaderType.day || header == HeaderType.monthAndDay;
+    final isMonthHeader = header == HeaderType.month || header == HeaderType.monthAndDay;
+    final isDayHeader = header == HeaderType.day || header == HeaderType.monthAndDay;
 
     return Padding(
       padding: EdgeInsets.only(
@@ -111,9 +109,7 @@ class _BulkSelectIconButton extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     List<BaseAsset> bucketAssets;
     try {
-      bucketAssets = ref
-          .watch(timelineServiceProvider)
-          .getAssets(assetOffset, bucket.assetCount);
+      bucketAssets = ref.watch(timelineServiceProvider).getAssets(assetOffset, bucket.assetCount);
     } catch (e) {
       bucketAssets = <BaseAsset>[];
     }
diff --git a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
index 248fc6b579..6d23f169b7 100644
--- a/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/scrubber.widget.dart
@@ -58,15 +58,13 @@ List<_Segment> _buildSegments({
   DateTime? lastDate;
   double lastOffset = -offsetThreshold;
   for (final layoutSegment in layoutSegments) {
-    final scrollPercentage =
-        layoutSegment.startOffset / layoutSegments.last.endOffset;
+    final scrollPercentage = layoutSegment.startOffset / layoutSegments.last.endOffset;
     final startOffset = scrollPercentage * timelineHeight;
 
     final date = (layoutSegment.bucket as TimeBucket).date;
     final label = formatter.format(date);
 
-    final showSegment = lastOffset + offsetThreshold <= startOffset &&
-        (lastDate == null || date.year != lastDate.year);
+    final showSegment = lastOffset + offsetThreshold <= startOffset && (lastDate == null || date.year != lastDate.year);
 
     segments.add(
       _Segment(
@@ -85,8 +83,7 @@ List<_Segment> _buildSegments({
   return segments;
 }
 
-class ScrubberState extends ConsumerState<Scrubber>
-    with TickerProviderStateMixin {
+class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixin {
   double _thumbTopOffset = 0.0;
   bool _isDragging = false;
   List<_Segment> _segments = [];
@@ -98,17 +95,14 @@ class ScrubberState extends ConsumerState<Scrubber>
   late AnimationController _labelAnimationController;
   late Animation<double> _labelAnimation;
 
-  double get _scrubberHeight =>
-      widget.timelineHeight - widget.topPadding - widget.bottomPadding;
+  double get _scrubberHeight => widget.timelineHeight - widget.topPadding - widget.bottomPadding;
 
   late ScrollController _scrollController;
 
   double get _currentOffset {
     if (_scrollController.hasClients != true) return 0.0;
 
-    return _scrollController.offset *
-        _scrubberHeight /
-        _scrollController.position.maxScrollExtent;
+    return _scrollController.offset * _scrubberHeight / _scrollController.position.maxScrollExtent;
   }
 
   @override
@@ -148,8 +142,7 @@ class ScrubberState extends ConsumerState<Scrubber>
   void didUpdateWidget(covariant Scrubber oldWidget) {
     super.didUpdateWidget(oldWidget);
 
-    if (oldWidget.layoutSegments.lastOrNull?.endOffset !=
-        widget.layoutSegments.lastOrNull?.endOffset) {
+    if (oldWidget.layoutSegments.lastOrNull?.endOffset != widget.layoutSegments.lastOrNull?.endOffset) {
       _segments = _buildSegments(
         layoutSegments: widget.layoutSegments,
         timelineHeight: _scrubberHeight,
@@ -179,8 +172,7 @@ class ScrubberState extends ConsumerState<Scrubber>
       return false;
     }
 
-    if (notification is ScrollStartNotification ||
-        notification is ScrollUpdateNotification) {
+    if (notification is ScrollStartNotification || notification is ScrollUpdateNotification) {
       ref.read(timelineStateProvider.notifier).setScrolling(true);
     } else if (notification is ScrollEndNotification) {
       ref.read(timelineStateProvider.notifier).setScrolling(false);
@@ -287,8 +279,7 @@ class ScrubberState extends ConsumerState<Scrubber>
     return widget.layoutSegments.indexWhere(
       (layoutSegment) {
         final bucket = layoutSegment.bucket as TimeBucket;
-        return bucket.date.year == segment.date.year &&
-            bucket.date.month == segment.date.month;
+        return bucket.date.year == segment.date.year && bucket.date.month == segment.date.month;
       },
     );
   }
@@ -299,10 +290,7 @@ class ScrubberState extends ConsumerState<Scrubber>
     final viewportHeight = _scrollController.position.viewportDimension;
 
     final targetScrollOffset = layoutSegment.startOffset;
-    final centeredOffset = targetScrollOffset -
-        (viewportHeight / 4) +
-        100 +
-        (widget.monthSegmentSnappingOffset ?? 0.0);
+    final centeredOffset = targetScrollOffset - (viewportHeight / 4) + 100 + (widget.monthSegmentSnappingOffset ?? 0.0);
 
     _scrollController.jumpTo(centeredOffset.clamp(0.0, maxScrollExtent));
   }
@@ -354,8 +342,7 @@ class ScrubberState extends ConsumerState<Scrubber>
               isDragging: _isDragging,
             ),
           ),
-          if (_scrollController.hasClients &&
-              _scrollController.position.maxScrollExtent > 0)
+          if (_scrollController.hasClients && _scrollController.position.maxScrollExtent > 0)
             PositionedDirectional(
               top: _thumbTopOffset + widget.topPadding,
               end: 0,
@@ -492,9 +479,8 @@ class _Scrubber extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final backgroundColor = context.isDarkTheme
-        ? context.colorScheme.primary.darken(amount: .5)
-        : context.colorScheme.primary;
+    final backgroundColor =
+        context.isDarkTheme ? context.colorScheme.primary.darken(amount: .5) : context.colorScheme.primary;
 
     return _SlideFadeTransition(
       animation: thumbAnimation,
@@ -590,8 +576,7 @@ class _SlideFadeTransition extends StatelessWidget {
   Widget build(BuildContext context) {
     return AnimatedBuilder(
       animation: _animation,
-      builder: (context, child) =>
-          _animation.value == 0.0 ? const SizedBox() : child!,
+      builder: (context, child) => _animation.value == 0.0 ? const SizedBox() : child!,
       child: SlideTransition(
         position: Tween(
           begin: const Offset(0.3, 0.0),
diff --git a/mobile/lib/presentation/widgets/timeline/segment.model.dart b/mobile/lib/presentation/widgets/timeline/segment.model.dart
index 09d892f69a..6a20db4c98 100644
--- a/mobile/lib/presentation/widgets/timeline/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/segment.model.dart
@@ -42,8 +42,7 @@ abstract class Segment {
 
   bool containsIndex(int index) => firstIndex <= index && index <= lastIndex;
 
-  bool isWithinOffset(double offset) =>
-      startOffset <= offset && offset <= endOffset;
+  bool isWithinOffset(double offset) => startOffset <= offset && offset <= endOffset;
 
   int getMinChildIndexForScrollOffset(double scrollOffset);
   int getMaxChildIndexForScrollOffset(double scrollOffset);
@@ -88,13 +87,9 @@ abstract class Segment {
 }
 
 extension SegmentListExtension on List<Segment> {
-  bool equals(List<Segment> other) =>
-      length == other.length &&
-      lastOrNull?.endOffset == other.lastOrNull?.endOffset;
+  bool equals(List<Segment> other) => length == other.length && lastOrNull?.endOffset == other.lastOrNull?.endOffset;
 
-  Segment? findByIndex(int index) =>
-      firstWhereOrNull((s) => s.containsIndex(index));
+  Segment? findByIndex(int index) => firstWhereOrNull((s) => s.containsIndex(index));
 
-  Segment? findByOffset(double offset) =>
-      firstWhereOrNull((s) => s.isWithinOffset(offset)) ?? lastOrNull;
+  Segment? findByOffset(double offset) => firstWhereOrNull((s) => s.isWithinOffset(offset)) ?? lastOrNull;
 }
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.state.dart b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
index 6faa4da9f7..cdf79239d4 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.state.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.state.dart
@@ -105,9 +105,7 @@ final timelineSegmentProvider = StreamProvider.autoDispose<List<Segment>>(
     final availableTileWidth = args.maxWidth - (spacing * (columnCount - 1));
     final tileExtent = math.max(0, availableTileWidth) / columnCount;
 
-    final groupBy = args.groupBy ??
-        GroupAssetsBy
-            .values[ref.watch(settingsProvider).get(Setting.groupAssetsBy)];
+    final groupBy = args.groupBy ?? GroupAssetsBy.values[ref.watch(settingsProvider).get(Setting.groupAssetsBy)];
 
     final timelineService = ref.watch(timelineServiceProvider);
     yield* timelineService.watchBuckets().map((buckets) {
@@ -123,7 +121,6 @@ final timelineSegmentProvider = StreamProvider.autoDispose<List<Segment>>(
   dependencies: [timelineServiceProvider, timelineArgsProvider],
 );
 
-final timelineStateProvider =
-    NotifierProvider<TimelineStateNotifier, TimelineState>(
+final timelineStateProvider = NotifierProvider<TimelineStateNotifier, TimelineState>(
   TimelineStateNotifier.new,
 );
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 873908832b..69998fea54 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -101,8 +101,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   @override
   void initState() {
     super.initState();
-    _reloadSubscription =
-        EventStream.shared.listen<TimelineReloadEvent>((_) => setState(() {}));
+    _reloadSubscription = EventStream.shared.listen<TimelineReloadEvent>((_) => setState(() {}));
   }
 
   @override
@@ -115,8 +114,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   @override
   Widget build(BuildContext _) {
     final asyncSegments = ref.watch(timelineSegmentProvider);
-    final maxHeight =
-        ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
+    final maxHeight = ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
     final isSelectionMode = ref.watch(
       multiSelectProvider.select((s) => s.forceEnable),
     );
@@ -124,17 +122,11 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
     return asyncSegments.widgetWhen(
       onData: (segments) {
         final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
-        final double appBarExpandedHeight =
-            widget.appBar != null && widget.appBar is MesmerizingSliverAppBar
-                ? 200
-                : 0;
-        final topPadding = context.padding.top +
-            (widget.appBar == null ? 0 : kToolbarHeight) +
-            10;
+        final double appBarExpandedHeight = widget.appBar != null && widget.appBar is MesmerizingSliverAppBar ? 200 : 0;
+        final topPadding = context.padding.top + (widget.appBar == null ? 0 : kToolbarHeight) + 10;
 
         const scrubberBottomPadding = 100.0;
-        final bottomPadding = context.padding.bottom +
-            (widget.appBar == null ? 0 : scrubberBottomPadding);
+        final bottomPadding = context.padding.bottom + (widget.appBar == null ? 0 : scrubberBottomPadding);
 
         return PrimaryScrollController(
           controller: _scrollController,
@@ -145,16 +137,12 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                 timelineHeight: maxHeight,
                 topPadding: topPadding,
                 bottomPadding: bottomPadding,
-                monthSegmentSnappingOffset:
-                    widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
+                monthSegmentSnappingOffset: widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
                 child: CustomScrollView(
                   primary: true,
                   cacheExtent: maxHeight * 2,
                   slivers: [
-                    if (isSelectionMode)
-                      const SelectionSliverAppBar()
-                    else if (widget.appBar != null)
-                      widget.appBar!,
+                    if (isSelectionMode) const SelectionSliverAppBar() else if (widget.appBar != null) widget.appBar!,
                     if (widget.topSliverWidget != null) widget.topSliverWidget!,
                     _SliverSegmentedList(
                       segments: segments,
@@ -162,8 +150,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                         (ctx, index) {
                           if (index >= childCount) return null;
                           final segment = segments.findByIndex(index);
-                          return segment?.builder(ctx, index) ??
-                              const SizedBox.shrink();
+                          return segment?.builder(ctx, index) ?? const SizedBox.shrink();
                         },
                         childCount: childCount,
                         addAutomaticKeepAlives: false,
@@ -233,8 +220,7 @@ class _SliverSegmentedList extends SliverMultiBoxAdaptorWidget {
   }) : _segments = segments;
 
   @override
-  _RenderSliverTimelineBoxAdaptor createRenderObject(BuildContext context) =>
-      _RenderSliverTimelineBoxAdaptor(
+  _RenderSliverTimelineBoxAdaptor createRenderObject(BuildContext context) => _RenderSliverTimelineBoxAdaptor(
         childManager: context as SliverMultiBoxAdaptorElement,
         segments: _segments,
       );
@@ -266,17 +252,13 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
   }) : _segments = segments;
 
   int getMinChildIndexForScrollOffset(double offset) =>
-      _segments.findByOffset(offset)?.getMinChildIndexForScrollOffset(offset) ??
-      0;
+      _segments.findByOffset(offset)?.getMinChildIndexForScrollOffset(offset) ?? 0;
 
   int getMaxChildIndexForScrollOffset(double offset) =>
-      _segments.findByOffset(offset)?.getMaxChildIndexForScrollOffset(offset) ??
-      0;
+      _segments.findByOffset(offset)?.getMaxChildIndexForScrollOffset(offset) ?? 0;
 
   double indexToLayoutOffset(int index) =>
-      (_segments.findByIndex(index) ?? _segments.lastOrNull)
-          ?.indexToLayoutOffset(index) ??
-      0;
+      (_segments.findByIndex(index) ?? _segments.lastOrNull)?.indexToLayoutOffset(index) ?? 0;
 
   double estimateMaxScrollOffset() => _segments.lastOrNull?.endOffset ?? 0;
 
@@ -288,8 +270,7 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
     // Assume initially that we have enough children to fill the viewport/cache area.
     childManager.setDidUnderflow(false);
 
-    final double scrollOffset =
-        constraints.scrollOffset + constraints.cacheOrigin;
+    final double scrollOffset = constraints.scrollOffset + constraints.cacheOrigin;
     assert(scrollOffset >= 0.0);
 
     final double remainingExtent = constraints.remainingCacheExtent;
@@ -298,31 +279,26 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
     final double targetScrollOffset = scrollOffset + remainingExtent;
 
     // Find the index of the first child that should be visible or in the leading cache area.
-    final int firstRequiredChildIndex =
-        getMinChildIndexForScrollOffset(scrollOffset);
+    final int firstRequiredChildIndex = getMinChildIndexForScrollOffset(scrollOffset);
 
     // Find the index of the last child that should be visible or in the trailing cache area.
-    final int? lastRequiredChildIndex = targetScrollOffset.isFinite
-        ? getMaxChildIndexForScrollOffset(targetScrollOffset)
-        : null;
+    final int? lastRequiredChildIndex =
+        targetScrollOffset.isFinite ? getMaxChildIndexForScrollOffset(targetScrollOffset) : null;
 
     // Remove children that are no longer visible or within the cache area.
     if (firstChild == null) {
       collectGarbage(0, 0);
     } else {
-      final int leadingChildrenToRemove =
-          calculateLeadingGarbage(firstIndex: firstRequiredChildIndex);
-      final int trailingChildrenToRemove = lastRequiredChildIndex == null
-          ? 0
-          : calculateTrailingGarbage(lastIndex: lastRequiredChildIndex);
+      final int leadingChildrenToRemove = calculateLeadingGarbage(firstIndex: firstRequiredChildIndex);
+      final int trailingChildrenToRemove =
+          lastRequiredChildIndex == null ? 0 : calculateTrailingGarbage(lastIndex: lastRequiredChildIndex);
       collectGarbage(leadingChildrenToRemove, trailingChildrenToRemove);
     }
 
     // If there are currently no children laid out (e.g., initial load),
     // try to add the first child needed for the current scroll offset.
     if (firstChild == null) {
-      final double firstChildLayoutOffset =
-          indexToLayoutOffset(firstRequiredChildIndex);
+      final double firstChildLayoutOffset = indexToLayoutOffset(firstRequiredChildIndex);
       final bool childAdded = addInitialChild(
         index: firstRequiredChildIndex,
         layoutOffset: firstChildLayoutOffset,
@@ -330,8 +306,7 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
 
       if (!childAdded) {
         // There are either no children, or we are past the end of all our children.
-        final double max =
-            firstRequiredChildIndex <= 0 ? 0.0 : computeMaxScrollOffset();
+        final double max = firstRequiredChildIndex <= 0 ? 0.0 : computeMaxScrollOffset();
         geometry = SliverGeometry(scrollExtent: max, maxPaintExtent: max);
         childManager.didFinishLayout();
         return;
@@ -342,26 +317,20 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
     RenderBox? highestLaidOutChild;
     final childConstraints = constraints.asBoxConstraints();
 
-    for (int currentIndex = indexOf(firstChild!) - 1;
-        currentIndex >= firstRequiredChildIndex;
-        --currentIndex) {
-      final RenderBox? newLeadingChild =
-          insertAndLayoutLeadingChild(childConstraints);
+    for (int currentIndex = indexOf(firstChild!) - 1; currentIndex >= firstRequiredChildIndex; --currentIndex) {
+      final RenderBox? newLeadingChild = insertAndLayoutLeadingChild(childConstraints);
       if (newLeadingChild == null) {
         // If a child is missing where we expect one, it indicates
         // an inconsistency in offset that needs correction.
-        final Segment? segment =
-            _segments.findByIndex(currentIndex) ?? _segments.firstOrNull;
+        final Segment? segment = _segments.findByIndex(currentIndex) ?? _segments.firstOrNull;
         geometry = SliverGeometry(
           // Request a scroll correction based on where the missing child should have been.
-          scrollOffsetCorrection:
-              segment?.indexToLayoutOffset(currentIndex) ?? 0.0,
+          scrollOffsetCorrection: segment?.indexToLayoutOffset(currentIndex) ?? 0.0,
         );
         // Parent will re-layout everything.
         return;
       }
-      final childParentData =
-          newLeadingChild.parentData! as SliverMultiBoxAdaptorParentData;
+      final childParentData = newLeadingChild.parentData! as SliverMultiBoxAdaptorParentData;
       childParentData.layoutOffset = indexToLayoutOffset(currentIndex);
       assert(childParentData.index == currentIndex);
       highestLaidOutChild ??= newLeadingChild;
@@ -375,10 +344,8 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
     // The [firstChild] that existed at the start of performLayout is still the first one we need.
     if (highestLaidOutChild == null) {
       firstChild!.layout(childConstraints);
-      final childParentData =
-          firstChild!.parentData! as SliverMultiBoxAdaptorParentData;
-      childParentData.layoutOffset =
-          indexToLayoutOffset(firstRequiredChildIndex);
+      final childParentData = firstChild!.parentData! as SliverMultiBoxAdaptorParentData;
+      childParentData.layoutOffset = indexToLayoutOffset(firstRequiredChildIndex);
       highestLaidOutChild = firstChild;
     }
 
@@ -389,8 +356,7 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
     double calculatedMaxScrollOffset = double.infinity;
 
     for (int currentIndex = indexOf(mostRecentlyLaidOutChild!) + 1;
-        lastRequiredChildIndex == null ||
-            currentIndex <= lastRequiredChildIndex;
+        lastRequiredChildIndex == null || currentIndex <= lastRequiredChildIndex;
         ++currentIndex) {
       RenderBox? child = childAfter(mostRecentlyLaidOutChild!);
 
@@ -400,11 +366,8 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
           after: mostRecentlyLaidOutChild,
         );
         if (child == null) {
-          final Segment? segment =
-              _segments.findByIndex(currentIndex) ?? _segments.lastOrNull;
-          calculatedMaxScrollOffset =
-              segment?.indexToLayoutOffset(currentIndex) ??
-                  computeMaxScrollOffset();
+          final Segment? segment = _segments.findByIndex(currentIndex) ?? _segments.lastOrNull;
+          calculatedMaxScrollOffset = segment?.indexToLayoutOffset(currentIndex) ?? computeMaxScrollOffset();
           break;
         }
       } else {
@@ -412,28 +375,23 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
       }
 
       mostRecentlyLaidOutChild = child;
-      final childParentData = mostRecentlyLaidOutChild.parentData!
-          as SliverMultiBoxAdaptorParentData;
+      final childParentData = mostRecentlyLaidOutChild.parentData! as SliverMultiBoxAdaptorParentData;
       assert(childParentData.index == currentIndex);
       childParentData.layoutOffset = indexToLayoutOffset(currentIndex);
     }
 
     final int lastLaidOutChildIndex = indexOf(lastChild!);
-    final double leadingScrollOffset =
-        indexToLayoutOffset(firstRequiredChildIndex);
-    final double trailingScrollOffset =
-        indexToLayoutOffset(lastLaidOutChildIndex + 1);
+    final double leadingScrollOffset = indexToLayoutOffset(firstRequiredChildIndex);
+    final double trailingScrollOffset = indexToLayoutOffset(lastLaidOutChildIndex + 1);
 
     assert(
       firstRequiredChildIndex == 0 ||
-          (childScrollOffset(firstChild!) ?? -1.0) - scrollOffset <=
-              precisionErrorTolerance,
+          (childScrollOffset(firstChild!) ?? -1.0) - scrollOffset <= precisionErrorTolerance,
     );
     assert(debugAssertChildListIsNonEmptyAndContiguous());
     assert(indexOf(firstChild!) == firstRequiredChildIndex);
     assert(
-      lastRequiredChildIndex == null ||
-          lastLaidOutChildIndex <= lastRequiredChildIndex,
+      lastRequiredChildIndex == null || lastLaidOutChildIndex <= lastRequiredChildIndex,
     );
 
     calculatedMaxScrollOffset = math.min(
@@ -453,11 +411,9 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
       to: trailingScrollOffset,
     );
 
-    final double targetEndScrollOffsetForPaint =
-        constraints.scrollOffset + constraints.remainingPaintExtent;
-    final int? targetLastIndexForPaint = targetEndScrollOffsetForPaint.isFinite
-        ? getMaxChildIndexForScrollOffset(targetEndScrollOffsetForPaint)
-        : null;
+    final double targetEndScrollOffsetForPaint = constraints.scrollOffset + constraints.remainingPaintExtent;
+    final int? targetLastIndexForPaint =
+        targetEndScrollOffsetForPaint.isFinite ? getMaxChildIndexForScrollOffset(targetEndScrollOffsetForPaint) : null;
 
     final maxPaintExtent = math.max(paintExtent, calculatedMaxScrollOffset);
 
@@ -468,8 +424,7 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
       // Indicates if there's content scrolled off-screen.
       // This is true if the last child needed for painting is actually laid out,
       // or if the first child is partially visible.
-      hasVisualOverflow: (targetLastIndexForPaint != null &&
-              lastLaidOutChildIndex >= targetLastIndexForPaint) ||
+      hasVisualOverflow: (targetLastIndexForPaint != null && lastLaidOutChildIndex >= targetLastIndexForPaint) ||
           constraints.scrollOffset > 0.0,
       cacheExtent: cacheExtent,
     );
@@ -489,8 +444,7 @@ class _MultiSelectStatusButton extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final selectCount =
-        ref.watch(multiSelectProvider.select((s) => s.selectedAssets.length));
+    final selectCount = ref.watch(multiSelectProvider.select((s) => s.selectedAssets.length));
     return ElevatedButton.icon(
       onPressed: () => ref.read(multiSelectProvider.notifier).reset(),
       icon: Icon(
diff --git a/mobile/lib/providers/activity.provider.dart b/mobile/lib/providers/activity.provider.dart
index 0dcc99320b..38b8caaed9 100644
--- a/mobile/lib/providers/activity.provider.dart
+++ b/mobile/lib/providers/activity.provider.dart
@@ -11,9 +11,7 @@ part 'activity.provider.g.dart';
 class AlbumActivity extends _$AlbumActivity {
   @override
   Future<List<Activity>> build(String albumId, [String? assetId]) async {
-    return ref
-        .watch(activityServiceProvider)
-        .getAllActivities(albumId, assetId: assetId);
+    return ref.watch(activityServiceProvider).getAllActivities(albumId, assetId: assetId);
   }
 
   Future<void> removeActivity(String id) async {
@@ -24,17 +22,13 @@ class AlbumActivity extends _$AlbumActivity {
       state = AsyncData(activities);
       // Decrement activity count only for comments
       if (removedActivity.type == ActivityType.comment) {
-        ref
-            .watch(activityStatisticsProvider(albumId, assetId).notifier)
-            .removeActivity();
+        ref.watch(activityStatisticsProvider(albumId, assetId).notifier).removeActivity();
       }
     }
   }
 
   Future<void> addLike() async {
-    final activity = await ref
-        .watch(activityServiceProvider)
-        .addActivity(albumId, ActivityType.like, assetId: assetId);
+    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]);
@@ -52,9 +46,7 @@ class AlbumActivity extends _$AlbumActivity {
     if (activity.hasValue) {
       final activities = state.valueOrNull ?? [];
       state = AsyncData([...activities, activity.requireValue]);
-      ref
-          .watch(activityStatisticsProvider(albumId, assetId).notifier)
-          .addActivity();
+      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
       if (assetId != null) {
diff --git a/mobile/lib/providers/activity_service.provider.dart b/mobile/lib/providers/activity_service.provider.dart
index 2d63e55354..a7fd0715f8 100644
--- a/mobile/lib/providers/activity_service.provider.dart
+++ b/mobile/lib/providers/activity_service.provider.dart
@@ -6,5 +6,4 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'activity_service.provider.g.dart';
 
 @riverpod
-ActivityService activityService(Ref ref) =>
-    ActivityService(ref.watch(activityApiRepositoryProvider));
+ActivityService activityService(Ref ref) => ActivityService(ref.watch(activityApiRepositoryProvider));
diff --git a/mobile/lib/providers/activity_statistics.provider.dart b/mobile/lib/providers/activity_statistics.provider.dart
index c260a7a547..96d2633d1b 100644
--- a/mobile/lib/providers/activity_statistics.provider.dart
+++ b/mobile/lib/providers/activity_statistics.provider.dart
@@ -9,10 +9,7 @@ part 'activity_statistics.provider.g.dart';
 class ActivityStatistics extends _$ActivityStatistics {
   @override
   int build(String albumId, [String? assetId]) {
-    ref
-        .watch(activityServiceProvider)
-        .getStatistics(albumId, assetId: assetId)
-        .then((stats) => state = stats.comments);
+    ref.watch(activityServiceProvider).getStatistics(albumId, assetId: assetId).then((stats) => state = stats.comments);
     return 0;
   }
 
diff --git a/mobile/lib/providers/album/album.provider.dart b/mobile/lib/providers/album/album.provider.dart
index 39f5af7344..ae565d20d8 100644
--- a/mobile/lib/providers/album/album.provider.dart
+++ b/mobile/lib/providers/album/album.provider.dart
@@ -18,8 +18,7 @@ class AlbumNotifier extends StateNotifier<List<Album>> {
       }
     });
 
-    _streamSub =
-        albumService.watchRemoteAlbums().listen((data) => state = data);
+    _streamSub = albumService.watchRemoteAlbums().listen((data) => state = data);
   }
 
   final AlbumService albumService;
@@ -114,8 +113,7 @@ class AlbumNotifier extends StateNotifier<List<Album>> {
   }
 
   Future<Album?> toggleSortOrder(Album album) {
-    final order =
-        album.sortOrder == SortOrder.asc ? SortOrder.desc : SortOrder.asc;
+    final order = album.sortOrder == SortOrder.asc ? SortOrder.desc : SortOrder.asc;
 
     return albumService.updateSortOrder(album, order);
   }
@@ -127,16 +125,14 @@ class AlbumNotifier extends StateNotifier<List<Album>> {
   }
 }
 
-final albumProvider =
-    StateNotifierProvider.autoDispose<AlbumNotifier, List<Album>>((ref) {
+final albumProvider = StateNotifierProvider.autoDispose<AlbumNotifier, List<Album>>((ref) {
   return AlbumNotifier(
     ref.watch(albumServiceProvider),
     ref,
   );
 });
 
-final albumWatcher =
-    StreamProvider.autoDispose.family<Album, int>((ref, id) async* {
+final albumWatcher = StreamProvider.autoDispose.family<Album, int>((ref, id) async* {
   final albumService = ref.watch(albumServiceProvider);
 
   final album = await albumService.getAlbumById(id);
@@ -172,7 +168,6 @@ class LocalAlbumsNotifier extends StateNotifier<List<Album>> {
   }
 }
 
-final localAlbumsProvider =
-    StateNotifierProvider.autoDispose<LocalAlbumsNotifier, List<Album>>((ref) {
+final localAlbumsProvider = StateNotifierProvider.autoDispose<LocalAlbumsNotifier, List<Album>>((ref) {
   return LocalAlbumsNotifier(ref.watch(albumServiceProvider));
 });
diff --git a/mobile/lib/providers/album/album_sort_by_options.provider.dart b/mobile/lib/providers/album/album_sort_by_options.provider.dart
index c89cd43132..6e1669faef 100644
--- a/mobile/lib/providers/album/album_sort_by_options.provider.dart
+++ b/mobile/lib/providers/album/album_sort_by_options.provider.dart
@@ -31,8 +31,7 @@ class _AlbumSortHandlers {
 
   static const AlbumSortFn assetCount = _sortByAssetCount;
   static List<Album> _sortByAssetCount(List<Album> albums, bool isReverse) {
-    final sorted =
-        albums.sorted((a, b) => a.assetCount.compareTo(b.assetCount));
+    final sorted = albums.sorted((a, b) => a.assetCount.compareTo(b.assetCount));
     return (isReverse ? sorted.reversed : sorted).toList();
   }
 
@@ -104,9 +103,7 @@ enum AlbumSortMode {
 class AlbumSortByOptions extends _$AlbumSortByOptions {
   @override
   AlbumSortMode build() {
-    final sortOpt = ref
-        .watch(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.selectedAlbumSortOrder);
+    final sortOpt = ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.selectedAlbumSortOrder);
     return AlbumSortMode.values.firstWhere(
       (e) => e.storeIndex == sortOpt,
       orElse: () => AlbumSortMode.title,
@@ -126,15 +123,11 @@ class AlbumSortByOptions extends _$AlbumSortByOptions {
 class AlbumSortOrder extends _$AlbumSortOrder {
   @override
   bool build() {
-    return ref
-        .watch(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.selectedAlbumSortReverse);
+    return ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.selectedAlbumSortReverse);
   }
 
   void changeSortDirection(bool isReverse) {
     state = isReverse;
-    ref
-        .watch(appSettingsServiceProvider)
-        .setSetting(AppSettingsEnum.selectedAlbumSortReverse, isReverse);
+    ref.watch(appSettingsServiceProvider).setSetting(AppSettingsEnum.selectedAlbumSortReverse, isReverse);
   }
 }
diff --git a/mobile/lib/providers/album/album_viewer.provider.dart b/mobile/lib/providers/album/album_viewer.provider.dart
index d1290df298..afae154cd7 100644
--- a/mobile/lib/providers/album/album_viewer.provider.dart
+++ b/mobile/lib/providers/album/album_viewer.provider.dart
@@ -88,7 +88,6 @@ class AlbumViewerNotifier extends StateNotifier<AlbumViewerPageState> {
   }
 }
 
-final albumViewerProvider =
-    StateNotifierProvider<AlbumViewerNotifier, AlbumViewerPageState>((ref) {
+final albumViewerProvider = StateNotifierProvider<AlbumViewerNotifier, AlbumViewerPageState>((ref) {
   return AlbumViewerNotifier(ref);
 });
diff --git a/mobile/lib/providers/album/suggested_shared_users.provider.dart b/mobile/lib/providers/album/suggested_shared_users.provider.dart
index 3c8dcb6733..51146748c7 100644
--- a/mobile/lib/providers/album/suggested_shared_users.provider.dart
+++ b/mobile/lib/providers/album/suggested_shared_users.provider.dart
@@ -4,8 +4,7 @@ import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 
-final otherUsersProvider =
-    FutureProvider.autoDispose<List<UserDto>>((ref) async {
+final otherUsersProvider = FutureProvider.autoDispose<List<UserDto>>((ref) async {
   UserService userService = ref.watch(userServiceProvider);
   final currentUser = ref.watch(currentUserProvider);
 
diff --git a/mobile/lib/providers/app_life_cycle.provider.dart b/mobile/lib/providers/app_life_cycle.provider.dart
index 647ada4a64..07778ed2ed 100644
--- a/mobile/lib/providers/app_life_cycle.provider.dart
+++ b/mobile/lib/providers/app_life_cycle.provider.dart
@@ -58,8 +58,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
     // Needs to be logged in
     if (isAuthenticated) {
       // switch endpoint if needed
-      final endpoint =
-          await _ref.read(authProvider.notifier).setOpenApiServiceEndpoint();
+      final endpoint = await _ref.read(authProvider.notifier).setOpenApiServiceEndpoint();
       if (kDebugMode) {
         debugPrint("Using server URL: $endpoint");
       }
@@ -96,8 +95,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
         await Future.wait([
           backgroundManager.syncLocal().then(
             (_) {
-              Logger("AppLifeCycleNotifier")
-                  .fine("Hashing assets after syncLocal");
+              Logger("AppLifeCycleNotifier").fine("Hashing assets after syncLocal");
               // Check if app is still active before hashing
               if (state == AppLifeCycleEnum.resumed) {
                 backgroundManager.hashAssets();
@@ -106,9 +104,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
           ),
           backgroundManager.syncRemote(),
         ]).then((_) async {
-          final isEnableBackup = _ref
-              .read(appSettingsServiceProvider)
-              .getSetting(AppSettingsEnum.enableBackup);
+          final isEnableBackup = _ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
 
           if (isEnableBackup) {
             final currentUser = _ref.read(currentUserProvider);
@@ -116,9 +112,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
               return;
             }
 
-            await _ref
-                .read(driftBackupProvider.notifier)
-                .handleBackupResume(currentUser.id);
+            await _ref.read(driftBackupProvider.notifier).handleBackupResume(currentUser.id);
           }
         });
       } catch (e, stackTrace) {
@@ -132,13 +126,9 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
 
     _ref.read(websocketProvider.notifier).connect();
 
-    await _ref
-        .read(notificationPermissionProvider.notifier)
-        .getNotificationPermission();
+    await _ref.read(notificationPermissionProvider.notifier).getNotificationPermission();
 
-    await _ref
-        .read(galleryPermissionNotifier.notifier)
-        .getGalleryPermissionStatus();
+    await _ref.read(galleryPermissionNotifier.notifier).getGalleryPermissionStatus();
 
     if (!Store.isBetaTimelineEnabled) {
       await _ref.read(iOSBackgroundSettingsProvider.notifier).refresh();
@@ -159,8 +149,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
     if (_ref.read(authProvider).isAuthenticated) {
       if (!Store.isBetaTimelineEnabled) {
         // Do not cancel backup if manual upload is in progress
-        if (_ref.read(backupProvider.notifier).backupProgress !=
-            BackUpProgressEnum.manualInProgress) {
+        if (_ref.read(backupProvider.notifier).backupProgress != BackUpProgressEnum.manualInProgress) {
           _ref.read(backupProvider.notifier).cancelBackup();
         }
       }
@@ -213,7 +202,6 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
   }
 }
 
-final appStateProvider =
-    StateNotifierProvider<AppLifeCycleNotifier, AppLifeCycleEnum>((ref) {
+final appStateProvider = StateNotifierProvider<AppLifeCycleNotifier, AppLifeCycleEnum>((ref) {
   return AppLifeCycleNotifier(ref);
 });
diff --git a/mobile/lib/providers/asset.provider.dart b/mobile/lib/providers/asset.provider.dart
index 7fbacc3afb..5098dd2af4 100644
--- a/mobile/lib/providers/asset.provider.dart
+++ b/mobile/lib/providers/asset.provider.dart
@@ -182,8 +182,7 @@ class AssetNotifier extends StateNotifier<bool> {
   }
 }
 
-final assetDetailProvider =
-    StreamProvider.autoDispose.family<Asset, Asset>((ref, asset) async* {
+final assetDetailProvider = StreamProvider.autoDispose.family<Asset, Asset>((ref, asset) async* {
   final assetService = ref.watch(assetServiceProvider);
   yield await assetService.loadExif(asset);
 
@@ -194,8 +193,7 @@ final assetDetailProvider =
   }
 });
 
-final assetWatcher =
-    StreamProvider.autoDispose.family<Asset?, Asset>((ref, asset) {
+final assetWatcher = StreamProvider.autoDispose.family<Asset?, Asset>((ref, asset) {
   final assetService = ref.watch(assetServiceProvider);
   return assetService.watchAsset(asset.id, fireImmediately: true);
 });
diff --git a/mobile/lib/providers/asset_viewer/asset_people.provider.dart b/mobile/lib/providers/asset_viewer/asset_people.provider.dart
index b334ef193a..e2227920c7 100644
--- a/mobile/lib/providers/asset_viewer/asset_people.provider.dart
+++ b/mobile/lib/providers/asset_viewer/asset_people.provider.dart
@@ -17,9 +17,7 @@ class AssetPeopleNotifier extends _$AssetPeopleNotifier {
       return [];
     }
 
-    final list = await ref
-        .watch(assetServiceProvider)
-        .getRemotePeopleOfAsset(asset.remoteId!);
+    final list = await ref.watch(assetServiceProvider).getRemotePeopleOfAsset(asset.remoteId!);
     if (list == null) {
       return [];
     }
diff --git a/mobile/lib/providers/asset_viewer/asset_stack.provider.dart b/mobile/lib/providers/asset_viewer/asset_stack.provider.dart
index 9bbbfb49aa..8772e3d0cb 100644
--- a/mobile/lib/providers/asset_viewer/asset_stack.provider.dart
+++ b/mobile/lib/providers/asset_viewer/asset_stack.provider.dart
@@ -32,10 +32,8 @@ class AssetStackNotifier extends StateNotifier<List<Asset>> {
   }
 }
 
-final assetStackStateProvider = StateNotifierProvider.autoDispose
-    .family<AssetStackNotifier, List<Asset>, String>(
-  (ref, stackId) =>
-      AssetStackNotifier(ref.watch(assetServiceProvider), stackId),
+final assetStackStateProvider = StateNotifierProvider.autoDispose.family<AssetStackNotifier, List<Asset>, String>(
+  (ref, stackId) => AssetStackNotifier(ref.watch(assetServiceProvider), stackId),
 );
 
 @riverpod
diff --git a/mobile/lib/providers/asset_viewer/download.provider.dart b/mobile/lib/providers/asset_viewer/download.provider.dart
index 7f0d913a02..b35a4546bb 100644
--- a/mobile/lib/providers/asset_viewer/download.provider.dart
+++ b/mobile/lib/providers/asset_viewer/download.provider.dart
@@ -62,8 +62,7 @@ class DownloadStateNotifier extends StateNotifier<DownloadState> {
         if (update.task.metaData.isEmpty) {
           return;
         }
-        final livePhotosId =
-            LivePhotosMetadata.fromJson(update.task.metaData).id;
+        final livePhotosId = LivePhotosMetadata.fromJson(update.task.metaData).id;
         _downloadService.saveLivePhotos(update.task, livePhotosId);
         _onDownloadComplete(update.task.taskId);
         break;
@@ -191,8 +190,7 @@ class DownloadStateNotifier extends StateNotifier<DownloadState> {
   }
 }
 
-final downloadStateProvider =
-    StateNotifierProvider<DownloadStateNotifier, DownloadState>(
+final downloadStateProvider = StateNotifierProvider<DownloadStateNotifier, DownloadState>(
   ((ref) => DownloadStateNotifier(
         ref.watch(downloadServiceProvider),
         ref.watch(shareServiceProvider),
diff --git a/mobile/lib/providers/asset_viewer/is_motion_video_playing.provider.dart b/mobile/lib/providers/asset_viewer/is_motion_video_playing.provider.dart
index 4af061f954..08722dc896 100644
--- a/mobile/lib/providers/asset_viewer/is_motion_video_playing.provider.dart
+++ b/mobile/lib/providers/asset_viewer/is_motion_video_playing.provider.dart
@@ -1,8 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 /// Whether to display the video part of a motion photo
-final isPlayingMotionVideoProvider =
-    StateNotifierProvider<IsPlayingMotionVideo, bool>((ref) {
+final isPlayingMotionVideoProvider = StateNotifierProvider<IsPlayingMotionVideo, bool>((ref) {
   return IsPlayingMotionVideo(ref);
 });
 
diff --git a/mobile/lib/providers/asset_viewer/render_list_status_provider.dart b/mobile/lib/providers/asset_viewer/render_list_status_provider.dart
index 903007031e..189ac85452 100644
--- a/mobile/lib/providers/asset_viewer/render_list_status_provider.dart
+++ b/mobile/lib/providers/asset_viewer/render_list_status_provider.dart
@@ -2,8 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 enum RenderListStatusEnum { complete, empty, error, loading }
 
-final renderListStatusProvider =
-    StateNotifierProvider<RenderListStatus, RenderListStatusEnum>((ref) {
+final renderListStatusProvider = StateNotifierProvider<RenderListStatus, RenderListStatusEnum>((ref) {
   return RenderListStatus(ref);
 });
 
diff --git a/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart b/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
index 3c448b112f..2a5a6fe09c 100644
--- a/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
+++ b/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
@@ -9,8 +9,7 @@ import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/share_intent_service.dart';
 import 'package:immich_mobile/services/upload.service.dart';
 
-final shareIntentUploadProvider = StateNotifierProvider<
-    ShareIntentUploadStateNotifier, List<ShareIntentAttachment>>(
+final shareIntentUploadProvider = StateNotifierProvider<ShareIntentUploadStateNotifier, List<ShareIntentAttachment>>(
   ((ref) => ShareIntentUploadStateNotifier(
         ref.watch(appRouterProvider),
         ref.watch(uploadServiceProvider),
@@ -18,8 +17,7 @@ final shareIntentUploadProvider = StateNotifierProvider<
       )),
 );
 
-class ShareIntentUploadStateNotifier
-    extends StateNotifier<List<ShareIntentAttachment>> {
+class ShareIntentUploadStateNotifier extends StateNotifier<List<ShareIntentAttachment>> {
   final AppRouter router;
   final UploadService _uploadService;
   final ShareIntentService _shareIntentService;
@@ -53,8 +51,7 @@ class ShareIntentUploadStateNotifier
   }
 
   void removeAttachment(ShareIntentAttachment attachment) {
-    final updatedState =
-        state.where((element) => element != attachment).toList();
+    final updatedState = state.where((element) => element != attachment).toList();
     if (updatedState.length != state.length) {
       state = updatedState;
     }
@@ -87,27 +84,20 @@ class ShareIntentUploadStateNotifier
 
     state = [
       for (final attachment in state)
-        if (attachment.id == taskId.toInt())
-          attachment.copyWith(status: uploadStatus)
-        else
-          attachment,
+        if (attachment.id == taskId.toInt()) attachment.copyWith(status: uploadStatus) else attachment,
     ];
   }
 
   void _taskProgressCallback(TaskProgressUpdate update) {
     // Ignore if the task is canceled or completed
-    if (update.progress == downloadFailed ||
-        update.progress == downloadCompleted) {
+    if (update.progress == downloadFailed || update.progress == downloadCompleted) {
       return;
     }
 
     final taskId = update.task.taskId;
     state = [
       for (final attachment in state)
-        if (attachment.id == taskId.toInt())
-          attachment.copyWith(uploadProgress: update.progress)
-        else
-          attachment,
+        if (attachment.id == taskId.toInt()) attachment.copyWith(uploadProgress: update.progress) else attachment,
     ];
   }
 
diff --git a/mobile/lib/providers/asset_viewer/video_player_controls_provider.dart b/mobile/lib/providers/asset_viewer/video_player_controls_provider.dart
index 69be91480f..a758d97ad8 100644
--- a/mobile/lib/providers/asset_viewer/video_player_controls_provider.dart
+++ b/mobile/lib/providers/asset_viewer/video_player_controls_provider.dart
@@ -13,13 +13,11 @@ class VideoPlaybackControls {
   final bool restarted;
 }
 
-final videoPlayerControlsProvider =
-    StateNotifierProvider<VideoPlayerControls, VideoPlaybackControls>((ref) {
+final videoPlayerControlsProvider = StateNotifierProvider<VideoPlayerControls, VideoPlaybackControls>((ref) {
   return VideoPlayerControls(ref);
 });
 
-const videoPlayerControlsDefault =
-    VideoPlaybackControls(position: 0, pause: false);
+const videoPlayerControlsDefault = VideoPlaybackControls(position: 0, pause: false);
 
 class VideoPlayerControls extends StateNotifier<VideoPlaybackControls> {
   VideoPlayerControls(this.ref) : super(videoPlayerControlsDefault);
@@ -64,17 +62,14 @@ class VideoPlayerControls extends StateNotifier<VideoPlaybackControls> {
   }
 
   void togglePlay() {
-    state =
-        VideoPlaybackControls(position: state.position, pause: !state.pause);
+    state = VideoPlaybackControls(position: state.position, pause: !state.pause);
   }
 
   void restart() {
-    state =
-        const VideoPlaybackControls(position: 0, pause: false, restarted: true);
-    ref.read(videoPlaybackValueProvider.notifier).value =
-        ref.read(videoPlaybackValueProvider.notifier).value.copyWith(
-              state: VideoPlaybackState.playing,
-              position: Duration.zero,
-            );
+    state = const VideoPlaybackControls(position: 0, pause: false, restarted: true);
+    ref.read(videoPlaybackValueProvider.notifier).value = ref.read(videoPlaybackValueProvider.notifier).value.copyWith(
+          state: VideoPlaybackState.playing,
+          position: Duration.zero,
+        );
   }
 }
diff --git a/mobile/lib/providers/asset_viewer/video_player_value_provider.dart b/mobile/lib/providers/asset_viewer/video_player_value_provider.dart
index 1a3c54e9e9..55a381b02b 100644
--- a/mobile/lib/providers/asset_viewer/video_player_value_provider.dart
+++ b/mobile/lib/providers/asset_viewer/video_player_value_provider.dart
@@ -75,8 +75,7 @@ const VideoPlaybackValue videoPlaybackValueDefault = VideoPlaybackValue(
   volume: 0.0,
 );
 
-final videoPlaybackValueProvider =
-    StateNotifierProvider<VideoPlaybackValueState, VideoPlaybackValue>((ref) {
+final videoPlaybackValueProvider = StateNotifierProvider<VideoPlaybackValueState, VideoPlaybackValue>((ref) {
   return VideoPlaybackValueState(ref);
 });
 
diff --git a/mobile/lib/providers/auth.provider.dart b/mobile/lib/providers/auth.provider.dart
index 2d3de11257..4c43cb37e8 100644
--- a/mobile/lib/providers/auth.provider.dart
+++ b/mobile/lib/providers/auth.provider.dart
@@ -124,14 +124,12 @@ class AuthNotifier extends StateNotifier<AuthState> {
     );
 
     // Get the deviceid from the store if it exists, otherwise generate a new one
-    String deviceId =
-        Store.tryGet(StoreKey.deviceId) ?? await FlutterUdid.consistentUdid;
+    String deviceId = Store.tryGet(StoreKey.deviceId) ?? await FlutterUdid.consistentUdid;
 
     UserDto? user = _userService.tryGetMyUser();
 
     try {
-      final serverUser =
-          await _userService.refreshMyUser().timeout(_timeoutDuration);
+      final serverUser = await _userService.refreshMyUser().timeout(_timeoutDuration);
       if (serverUser == null) {
         _log.severe("Unable to get user information from the server.");
       } else {
diff --git a/mobile/lib/providers/backup/backup.provider.dart b/mobile/lib/providers/backup/backup.provider.dart
index 69246398ed..69290bcfc5 100644
--- a/mobile/lib/providers/backup/backup.provider.dart
+++ b/mobile/lib/providers/backup/backup.provider.dart
@@ -34,8 +34,7 @@ import 'package:logging/logging.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:photo_manager/photo_manager.dart' show PMProgressHandler;
 
-final backupProvider =
-    StateNotifierProvider<BackupNotifier, BackUpState>((ref) {
+final backupProvider = StateNotifierProvider<BackupNotifier, BackUpState>((ref) {
   return BackupNotifier(
     ref.watch(backupServiceProvider),
     ref.watch(serverInfoServiceProvider),
@@ -74,8 +73,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
             autoBackup: Store.get(StoreKey.autoBackup, false),
             backgroundBackup: Store.get(StoreKey.backgroundBackup, false),
             backupRequireWifi: Store.get(StoreKey.backupRequireWifi, true),
-            backupRequireCharging:
-                Store.get(StoreKey.backupRequireCharging, false),
+            backupRequireCharging: Store.get(StoreKey.backupRequireCharging, false),
             backupTriggerDelay: Store.get(StoreKey.backupTriggerDelay, 5000),
             serverInfo: const ServerDiskInfo(
               diskAvailable: "0",
@@ -124,16 +122,14 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       removeExcludedAlbumForBackup(album);
     }
 
-    state = state
-        .copyWith(selectedBackupAlbums: {...state.selectedBackupAlbums, album});
+    state = state.copyWith(selectedBackupAlbums: {...state.selectedBackupAlbums, album});
   }
 
   void addExcludedAlbumForBackup(AvailableAlbum album) {
     if (state.selectedBackupAlbums.contains(album)) {
       removeAlbumForBackup(album);
     }
-    state = state
-        .copyWith(excludedBackupAlbums: {...state.excludedBackupAlbums, album});
+    state = state.copyWith(excludedBackupAlbums: {...state.excludedBackupAlbums, album});
   }
 
   void removeAlbumForBackup(AvailableAlbum album) {
@@ -180,10 +176,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     required void Function() onBatteryInfo,
   }) async {
     assert(
-      enabled != null ||
-          requireWifi != null ||
-          requireCharging != null ||
-          triggerDelay != null,
+      enabled != null || requireWifi != null || requireCharging != null || triggerDelay != null,
     );
     final bool wasEnabled = state.backgroundBackup;
     final bool wasWifi = state.backupRequireWifi;
@@ -257,9 +250,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     for (Album album in albums) {
       AvailableAlbum availableAlbum = AvailableAlbum(
         album: album,
-        assetCount: await ref
-            .read(albumMediaRepositoryProvider)
-            .getAssetCount(album.localId!),
+        assetCount: await ref.read(albumMediaRepositoryProvider).getAssetCount(album.localId!),
       );
 
       availableAlbums.add(availableAlbum);
@@ -268,10 +259,8 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     }
     state = state.copyWith(availableAlbums: availableAlbums);
 
-    final List<BackupAlbum> excludedBackupAlbums =
-        await _backupAlbumService.getAllBySelection(BackupSelection.exclude);
-    final List<BackupAlbum> selectedBackupAlbums =
-        await _backupAlbumService.getAllBySelection(BackupSelection.select);
+    final List<BackupAlbum> excludedBackupAlbums = await _backupAlbumService.getAllBySelection(BackupSelection.exclude);
+    final List<BackupAlbum> selectedBackupAlbums = await _backupAlbumService.getAllBySelection(BackupSelection.select);
 
     final Set<AvailableAlbum> selectedAlbums = {};
     for (final BackupAlbum ba in selectedBackupAlbums) {
@@ -281,8 +270,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
         selectedAlbums.add(
           AvailableAlbum(
             album: albumAsset,
-            assetCount:
-                await _albumMediaRepository.getAssetCount(albumAsset.localId!),
+            assetCount: await _albumMediaRepository.getAssetCount(albumAsset.localId!),
             lastBackup: ba.lastBackup,
           ),
         );
@@ -299,9 +287,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
         excludedAlbums.add(
           AvailableAlbum(
             album: albumAsset,
-            assetCount: await ref
-                .read(albumMediaRepositoryProvider)
-                .getAssetCount(albumAsset.localId!),
+            assetCount: await ref.read(albumMediaRepositoryProvider).getAssetCount(albumAsset.localId!),
             lastBackup: ba.lastBackup,
           ),
         );
@@ -335,17 +321,13 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     final Set<BackupCandidate> assetsFromExcludedAlbums = {};
 
     for (final album in state.selectedBackupAlbums) {
-      final assetCount = await ref
-          .read(albumMediaRepositoryProvider)
-          .getAssetCount(album.album.localId!);
+      final assetCount = await ref.read(albumMediaRepositoryProvider).getAssetCount(album.album.localId!);
 
       if (assetCount == 0) {
         continue;
       }
 
-      final assets = await ref
-          .read(albumMediaRepositoryProvider)
-          .getAssets(album.album.localId!);
+      final assets = await ref.read(albumMediaRepositoryProvider).getAssets(album.album.localId!);
 
       // Add album's name to the asset info
       for (final asset in assets) {
@@ -370,17 +352,13 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     }
 
     for (final album in state.excludedBackupAlbums) {
-      final assetCount = await ref
-          .read(albumMediaRepositoryProvider)
-          .getAssetCount(album.album.localId!);
+      final assetCount = await ref.read(albumMediaRepositoryProvider).getAssetCount(album.album.localId!);
 
       if (assetCount == 0) {
         continue;
       }
 
-      final assets = await ref
-          .read(albumMediaRepositoryProvider)
-          .getAssets(album.album.localId!);
+      final assets = await ref.read(albumMediaRepositoryProvider).getAssets(album.album.localId!);
 
       for (final asset in assets) {
         assetsFromExcludedAlbums.add(
@@ -389,8 +367,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       }
     }
 
-    final Set<BackupCandidate> allUniqueAssets =
-        assetsFromSelectedAlbums.difference(assetsFromExcludedAlbums);
+    final Set<BackupCandidate> allUniqueAssets = assetsFromSelectedAlbums.difference(assetsFromExcludedAlbums);
 
     final allAssetsInDatabase = await _backupService.getDeviceBackupAsset();
 
@@ -399,11 +376,9 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     }
 
     // Find asset that were backup from selected albums
-    final Set<String> selectedAlbumsBackupAssets =
-        Set.from(allUniqueAssets.map((e) => e.asset.localId));
+    final Set<String> selectedAlbumsBackupAssets = Set.from(allUniqueAssets.map((e) => e.asset.localId));
 
-    selectedAlbumsBackupAssets
-        .removeWhere((assetId) => !allAssetsInDatabase.contains(assetId));
+    selectedAlbumsBackupAssets.removeWhere((assetId) => !allAssetsInDatabase.contains(assetId));
 
     // Remove duplicated asset from all unique assets
     allUniqueAssets.removeWhere(
@@ -459,8 +434,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     final candidates = selected.followedBy(excluded).toList();
     candidates.sortBy((e) => e.id);
 
-    final savedBackupAlbums =
-        await _backupAlbumService.getAll(sort: BackupAlbumSort.id);
+    final savedBackupAlbums = await _backupAlbumService.getAll(sort: BackupAlbumSort.id);
     final List<int> toDelete = [];
     final List<BackupAlbum> toUpsert = [];
 
@@ -469,8 +443,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       candidates,
       compare: (BackupAlbum a, BackupAlbum b) => a.id.compareTo(b.id),
       both: (BackupAlbum a, BackupAlbum b) {
-        b.lastBackup =
-            a.lastBackup.isAfter(b.lastBackup) ? a.lastBackup : b.lastBackup;
+        b.lastBackup = a.lastBackup.isAfter(b.lastBackup) ? a.lastBackup : b.lastBackup;
         toUpsert.add(b);
         return true;
       },
@@ -569,8 +542,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       state = state.copyWith(
         allUniqueAssets: state.allUniqueAssets
             .where(
-              (candidate) =>
-                  candidate.asset.localId != result.candidate.asset.localId,
+              (candidate) => candidate.asset.localId != result.candidate.asset.localId,
             )
             .toSet(),
       );
@@ -587,21 +559,13 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       );
     }
 
-    if (state.allUniqueAssets.length -
-            state.selectedAlbumsBackupAssetsIds.length ==
-        0) {
-      final latestAssetBackup = state.allUniqueAssets
-          .map((candidate) => candidate.asset.fileModifiedAt)
-          .reduce(
+    if (state.allUniqueAssets.length - state.selectedAlbumsBackupAssetsIds.length == 0) {
+      final latestAssetBackup = state.allUniqueAssets.map((candidate) => candidate.asset.fileModifiedAt).reduce(
             (v, e) => e.isAfter(v) ? e : v,
           );
       state = state.copyWith(
-        selectedBackupAlbums: state.selectedBackupAlbums
-            .map((e) => e.copyWith(lastBackup: latestAssetBackup))
-            .toSet(),
-        excludedBackupAlbums: state.excludedBackupAlbums
-            .map((e) => e.copyWith(lastBackup: latestAssetBackup))
-            .toSet(),
+        selectedBackupAlbums: state.selectedBackupAlbums.map((e) => e.copyWith(lastBackup: latestAssetBackup)).toSet(),
+        excludedBackupAlbums: state.excludedBackupAlbums.map((e) => e.copyWith(lastBackup: latestAssetBackup)).toSet(),
         backupProgress: BackUpProgressEnum.done,
         progressInPercentage: 0.0,
         progressInFileSize: "0 B / 0 B",
@@ -696,10 +660,8 @@ class BackupNotifier extends StateNotifier<BackUpState> {
   }
 
   Future<void> resumeBackup() async {
-    final List<BackupAlbum> selectedBackupAlbums =
-        await _backupAlbumService.getAllBySelection(BackupSelection.select);
-    final List<BackupAlbum> excludedBackupAlbums =
-        await _backupAlbumService.getAllBySelection(BackupSelection.exclude);
+    final List<BackupAlbum> selectedBackupAlbums = await _backupAlbumService.getAllBySelection(BackupSelection.select);
+    final List<BackupAlbum> excludedBackupAlbums = await _backupAlbumService.getAllBySelection(BackupSelection.exclude);
     Set<AvailableAlbum> selectedAlbums = state.selectedBackupAlbums;
     Set<AvailableAlbum> excludedAlbums = state.excludedBackupAlbums;
     if (selectedAlbums.isNotEmpty) {
diff --git a/mobile/lib/providers/backup/backup_album.provider.dart b/mobile/lib/providers/backup/backup_album.provider.dart
index 2915c7c216..1e5d424926 100644
--- a/mobile/lib/providers/backup/backup_album.provider.dart
+++ b/mobile/lib/providers/backup/backup_album.provider.dart
@@ -4,8 +4,7 @@ import 'package:immich_mobile/domain/services/local_album.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 
-final backupAlbumProvider =
-    StateNotifierProvider<BackupAlbumNotifier, List<LocalAlbum>>(
+final backupAlbumProvider = StateNotifierProvider<BackupAlbumNotifier, List<LocalAlbum>>(
   (ref) => BackupAlbumNotifier(
     ref.watch(localAlbumServiceProvider),
   ),
@@ -19,8 +18,7 @@ class BackupAlbumNotifier extends StateNotifier<List<LocalAlbum>> {
   final LocalAlbumService _localAlbumService;
 
   Future<void> getAll() async {
-    state =
-        await _localAlbumService.getAll(sortBy: {SortLocalAlbumsBy.assetCount});
+    state = await _localAlbumService.getAll(sortBy: {SortLocalAlbumsBy.assetCount});
   }
 
   Future<void> selectAlbum(LocalAlbum album) async {
@@ -42,9 +40,8 @@ class BackupAlbumNotifier extends StateNotifier<List<LocalAlbum>> {
 
     state = state
         .map(
-          (currentAlbum) => currentAlbum.id == album.id
-              ? currentAlbum.copyWith(backupSelection: BackupSelection.none)
-              : currentAlbum,
+          (currentAlbum) =>
+              currentAlbum.id == album.id ? currentAlbum.copyWith(backupSelection: BackupSelection.none) : currentAlbum,
         )
         .toList();
   }
diff --git a/mobile/lib/providers/backup/backup_verification.provider.dart b/mobile/lib/providers/backup/backup_verification.provider.dart
index 5881814320..c075d81d86 100644
--- a/mobile/lib/providers/backup/backup_verification.provider.dart
+++ b/mobile/lib/providers/backup/backup_verification.provider.dart
@@ -23,8 +23,7 @@ class BackupVerification extends _$BackupVerification {
       state = true;
       final backupState = ref.read(backupProvider);
 
-      if (backupState.allUniqueAssets.length >
-          backupState.selectedAlbumsBackupAssetsIds.length) {
+      if (backupState.allUniqueAssets.length > backupState.selectedAlbumsBackupAssetsIds.length) {
         if (context.mounted) {
           ImmichToast.show(
             context: context,
@@ -48,9 +47,7 @@ class BackupVerification extends _$BackupVerification {
       WakelockPlus.enable();
 
       const limit = 100;
-      final toDelete = await ref
-          .read(backupVerificationServiceProvider)
-          .findWronglyBackedUpAssets(limit: limit);
+      final toDelete = await ref.read(backupVerificationServiceProvider).findWronglyBackedUpAssets(limit: limit);
       if (toDelete.isEmpty) {
         if (context.mounted) {
           ImmichToast.show(
@@ -67,8 +64,7 @@ class BackupVerification extends _$BackupVerification {
               onOk: () => _performDeletion(context, toDelete),
               title: "Corrupt backups!",
               ok: "Delete",
-              content:
-                  "Found ${toDelete.length} (max $limit at once) corrupt asset backups. "
+              content: "Found ${toDelete.length} (max $limit at once) corrupt asset backups. "
                   "Run the check again to find more.\n"
                   "Do you want to delete the corrupt asset backups now?",
             ),
diff --git a/mobile/lib/providers/backup/drift_backup.provider.dart b/mobile/lib/providers/backup/drift_backup.provider.dart
index 45941639a0..42a4ae95f3 100644
--- a/mobile/lib/providers/backup/drift_backup.provider.dart
+++ b/mobile/lib/providers/backup/drift_backup.provider.dart
@@ -31,8 +31,7 @@ class EnqueueStatus {
   }
 
   @override
-  String toString() =>
-      'EnqueueStatus(enqueueCount: $enqueueCount, totalCount: $totalCount)';
+  String toString() => 'EnqueueStatus(enqueueCount: $enqueueCount, totalCount: $totalCount)';
 }
 
 class DriftUploadStatus {
@@ -198,8 +197,7 @@ class DriftBackupState {
   }
 }
 
-final driftBackupProvider =
-    StateNotifierProvider<ExpBackupNotifier, DriftBackupState>((ref) {
+final driftBackupProvider = StateNotifierProvider<ExpBackupNotifier, DriftBackupState>((ref) {
   return ExpBackupNotifier(
     ref.watch(driftBackupServiceProvider),
     ref.watch(uploadServiceProvider),
@@ -235,8 +233,7 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
   /// Remove upload item from state
   void _removeUploadItem(String taskId) {
     if (state.uploadItems.containsKey(taskId)) {
-      final updatedItems =
-          Map<String, DriftUploadStatus>.from(state.uploadItems);
+      final updatedItems = Map<String, DriftUploadStatus>.from(state.uploadItems);
       updatedItems.remove(taskId);
       state = state.copyWith(uploadItems: updatedItems);
     }
diff --git a/mobile/lib/providers/backup/error_backup_list.provider.dart b/mobile/lib/providers/backup/error_backup_list.provider.dart
index 22ff995905..db116e4bb9 100644
--- a/mobile/lib/providers/backup/error_backup_list.provider.dart
+++ b/mobile/lib/providers/backup/error_backup_list.provider.dart
@@ -17,7 +17,6 @@ class ErrorBackupListNotifier extends StateNotifier<Set<ErrorUploadAsset>> {
   }
 }
 
-final errorBackupListProvider =
-    StateNotifierProvider<ErrorBackupListNotifier, Set<ErrorUploadAsset>>(
+final errorBackupListProvider = StateNotifierProvider<ErrorBackupListNotifier, Set<ErrorUploadAsset>>(
   (ref) => ErrorBackupListNotifier(),
 );
diff --git a/mobile/lib/providers/backup/ios_background_settings.provider.dart b/mobile/lib/providers/backup/ios_background_settings.provider.dart
index d70e674845..98d55882cc 100644
--- a/mobile/lib/providers/backup/ios_background_settings.provider.dart
+++ b/mobile/lib/providers/backup/ios_background_settings.provider.dart
@@ -15,21 +15,17 @@ class IOSBackgroundSettings {
   });
 }
 
-class IOSBackgroundSettingsNotifier
-    extends StateNotifier<IOSBackgroundSettings?> {
+class IOSBackgroundSettingsNotifier extends StateNotifier<IOSBackgroundSettings?> {
   final BackgroundService _service;
   IOSBackgroundSettingsNotifier(this._service) : super(null);
 
   IOSBackgroundSettings? get settings => state;
 
   Future<IOSBackgroundSettings> refresh() async {
-    final lastFetchTime =
-        await _service.getIOSBackupLastRun(IosBackgroundTask.fetch);
-    final lastProcessingTime =
-        await _service.getIOSBackupLastRun(IosBackgroundTask.processing);
+    final lastFetchTime = await _service.getIOSBackupLastRun(IosBackgroundTask.fetch);
+    final lastProcessingTime = await _service.getIOSBackupLastRun(IosBackgroundTask.processing);
     int numberOfProcesses = await _service.getIOSBackupNumberOfProcesses();
-    final appRefreshEnabled =
-        await _service.getIOSBackgroundAppRefreshEnabled();
+    final appRefreshEnabled = await _service.getIOSBackgroundAppRefreshEnabled();
 
     // If this is enabled and there are no background processes,
     // the user just enabled app refresh in Settings.
@@ -53,7 +49,6 @@ class IOSBackgroundSettingsNotifier
   }
 }
 
-final iOSBackgroundSettingsProvider = StateNotifierProvider<
-    IOSBackgroundSettingsNotifier, IOSBackgroundSettings?>(
+final iOSBackgroundSettingsProvider = StateNotifierProvider<IOSBackgroundSettingsNotifier, IOSBackgroundSettings?>(
   (ref) => IOSBackgroundSettingsNotifier(ref.watch(backgroundServiceProvider)),
 );
diff --git a/mobile/lib/providers/backup/manual_upload.provider.dart b/mobile/lib/providers/backup/manual_upload.provider.dart
index 646a03cebc..b234a4ffe2 100644
--- a/mobile/lib/providers/backup/manual_upload.provider.dart
+++ b/mobile/lib/providers/backup/manual_upload.provider.dart
@@ -31,8 +31,7 @@ import 'package:logging/logging.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:photo_manager/photo_manager.dart' show PMProgressHandler;
 
-final manualUploadProvider =
-    StateNotifierProvider<ManualUploadNotifier, ManualUploadState>((ref) {
+final manualUploadProvider = StateNotifierProvider<ManualUploadNotifier, ManualUploadState>((ref) {
   return ManualUploadNotifier(
     ref.watch(localNotificationService),
     ref.watch(backupProvider.notifier),
@@ -82,8 +81,7 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
   String? _lastPrintedDetailTitle;
 
   static const notifyInterval = Duration(milliseconds: 500);
-  late final ThrottleProgressUpdate _throttledNotifiy =
-      ThrottleProgressUpdate(_updateProgress, notifyInterval);
+  late final ThrottleProgressUpdate _throttledNotifiy = ThrottleProgressUpdate(_updateProgress, notifyInterval);
   late final ThrottleProgressUpdate _throttledDetailNotify =
       ThrottleProgressUpdate(_updateDetailProgress, notifyInterval);
 
@@ -106,11 +104,9 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
   void _updateDetailProgress(String? title, int progress, int total) {
     // Guard against throttling calling this method after the upload is done
     if (_backupProvider.backupProgress == BackUpProgressEnum.manualInProgress) {
-      final String msg =
-          total > 0 ? humanReadableBytesProgress(progress, total) : "";
+      final String msg = total > 0 ? humanReadableBytesProgress(progress, total) : "";
       // only update if message actually differs (to stop many useless notification updates on large assets or slow connections)
-      if (msg != _lastPrintedDetailContent ||
-          title != _lastPrintedDetailTitle) {
+      if (msg != _lastPrintedDetailContent || title != _lastPrintedDetailTitle) {
         _lastPrintedDetailContent = msg;
         _lastPrintedDetailTitle = title;
         _localNotificationService.showOrUpdateManualUploadStatus(
@@ -184,9 +180,8 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
       _throttledNotifiy();
     }
     if (state.showDetailedNotification) {
-      _throttledDetailNotify.title =
-          "backup_background_service_current_upload_notification"
-              .tr(namedArgs: {'filename': currentUploadAsset.fileName});
+      _throttledDetailNotify.title = "backup_background_service_current_upload_notification"
+          .tr(namedArgs: {'filename': currentUploadAsset.fileName});
       _throttledDetailNotify.progress = 0;
       _throttledDetailNotify.total = 0;
     }
@@ -200,8 +195,7 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
       if (ref.read(galleryPermissionNotifier.notifier).hasPermission) {
         await ref.read(fileMediaRepositoryProvider).clearFileCache();
 
-        final allAssetsFromDevice =
-            allManualUploads.where((e) => e.isLocal && !e.isRemote).toList();
+        final allAssetsFromDevice = allManualUploads.where((e) => e.isLocal && !e.isRemote).toList();
 
         if (allAssetsFromDevice.length != allManualUploads.length) {
           _log.warning(
@@ -209,14 +203,11 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
           );
         }
 
-        final selectedBackupAlbums =
-            await _backupAlbumService.getAllBySelection(BackupSelection.select);
-        final excludedBackupAlbums = await _backupAlbumService
-            .getAllBySelection(BackupSelection.exclude);
+        final selectedBackupAlbums = await _backupAlbumService.getAllBySelection(BackupSelection.select);
+        final excludedBackupAlbums = await _backupAlbumService.getAllBySelection(BackupSelection.exclude);
 
         // Get candidates from selected albums and excluded albums
-        Set<BackupCandidate> candidates =
-            await _backupService.buildUploadCandidates(
+        Set<BackupCandidate> candidates = await _backupService.buildUploadCandidates(
           selectedBackupAlbums,
           excludedBackupAlbums,
           useTimeFilter: false,
@@ -260,13 +251,11 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
         }
 
         // Show detailed asset if enabled in settings or if a single asset is uploaded
-        bool showDetailedNotification =
-            ref.read(appSettingsServiceProvider).getSetting<bool>(
-                      AppSettingsEnum.backgroundBackupSingleProgress,
-                    ) ||
-                state.totalAssetsToUpload == 1;
-        state =
-            state.copyWith(showDetailedNotification: showDetailedNotification);
+        bool showDetailedNotification = ref.read(appSettingsServiceProvider).getSetting<bool>(
+                  AppSettingsEnum.backgroundBackupSingleProgress,
+                ) ||
+            state.totalAssetsToUpload == 1;
+        state = state.copyWith(showDetailedNotification: showDetailedNotification);
         final pmProgressHandler = Platform.isIOS ? PMProgressHandler() : null;
 
         final bool ok = await ref.read(backupServiceProvider).backupAsset(
@@ -297,8 +286,7 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
             presentBanner: true,
           );
           hasErrors = true;
-        } else if (state.successfulUploads == 0 ||
-            (!ok && !state.cancelToken.isCancelled)) {
+        } else if (state.successfulUploads == 0 || (!ok && !state.cancelToken.isCancelled)) {
           await _localNotificationService.showOrUpdateManualUploadStatus(
             "backup_manual_title".tr(),
             "failed".tr(),
@@ -334,8 +322,7 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
     final appState = ref.read(appStateProvider.notifier).getAppState();
     // The app is currently in background. Perform the necessary cleanups which
     // are on-hold for upload completion
-    if (appState != AppLifeCycleEnum.active &&
-        appState != AppLifeCycleEnum.resumed) {
+    if (appState != AppLifeCycleEnum.active && appState != AppLifeCycleEnum.resumed) {
       ref.read(backupProvider.notifier).cancelBackup();
     }
   }
@@ -364,8 +351,7 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
   ) async {
     // assumes the background service is currently running and
     // waits until it has stopped to start the backup.
-    final bool hasLock =
-        await ref.read(backgroundServiceProvider).acquireLock();
+    final bool hasLock = await ref.read(backgroundServiceProvider).acquireLock();
     if (!hasLock) {
       debugPrint("[uploadAssets] could not acquire lock, exiting");
       ImmichToast.show(
diff --git a/mobile/lib/providers/folder.provider.dart b/mobile/lib/providers/folder.provider.dart
index 810c2cea73..7f89679734 100644
--- a/mobile/lib/providers/folder.provider.dart
+++ b/mobile/lib/providers/folder.provider.dart
@@ -22,9 +22,7 @@ class FolderStructureNotifier extends StateNotifier<AsyncValue<RootFolder>> {
   }
 }
 
-final folderStructureProvider =
-    StateNotifierProvider<FolderStructureNotifier, AsyncValue<RootFolder>>(
-        (ref) {
+final folderStructureProvider = StateNotifierProvider<FolderStructureNotifier, AsyncValue<RootFolder>>((ref) {
   return FolderStructureNotifier(
     ref.watch(folderServiceProvider),
   );
@@ -35,14 +33,12 @@ class FolderRenderListNotifier extends StateNotifier<AsyncValue<RenderList>> {
   final RootFolder _folder;
   final Logger _log = Logger("FolderAssetsNotifier");
 
-  FolderRenderListNotifier(this._folderService, this._folder)
-      : super(const AsyncLoading());
+  FolderRenderListNotifier(this._folderService, this._folder) : super(const AsyncLoading());
 
   Future<void> fetchAssets(SortOrder order) async {
     try {
       final assets = await _folderService.getFolderAssets(_folder, order);
-      final renderList =
-          await RenderList.fromAssets(assets, GroupAssetsBy.none);
+      final renderList = await RenderList.fromAssets(assets, GroupAssetsBy.none);
       state = AsyncData(renderList);
     } catch (e, stack) {
       _log.severe("Failed to fetch folder assets", e, stack);
@@ -51,10 +47,8 @@ class FolderRenderListNotifier extends StateNotifier<AsyncValue<RenderList>> {
   }
 }
 
-final folderRenderListProvider = StateNotifierProvider.family<
-    FolderRenderListNotifier,
-    AsyncValue<RenderList>,
-    RootFolder>((ref, folder) {
+final folderRenderListProvider =
+    StateNotifierProvider.family<FolderRenderListNotifier, AsyncValue<RenderList>, RootFolder>((ref, folder) {
   return FolderRenderListNotifier(
     ref.watch(folderServiceProvider),
     folder,
diff --git a/mobile/lib/providers/gallery_permission.provider.dart b/mobile/lib/providers/gallery_permission.provider.dart
index 07d9cca591..3d8a6da941 100644
--- a/mobile/lib/providers/gallery_permission.provider.dart
+++ b/mobile/lib/providers/gallery_permission.provider.dart
@@ -5,8 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 class GalleryPermissionNotifier extends StateNotifier<PermissionStatus> {
-  GalleryPermissionNotifier()
-      : super(PermissionStatus.denied) // Denied is the initial state
+  GalleryPermissionNotifier() : super(PermissionStatus.denied) // Denied is the initial state
   {
     // Sets the initial state
     getGalleryPermissionStatus();
@@ -36,8 +35,7 @@ class GalleryPermissionNotifier extends StateNotifier<PermissionStatus> {
 
         // Return the joint result of those two permissions
         final PermissionStatus status;
-        if ((photos.isGranted && videos.isGranted) ||
-            (photos.isLimited && videos.isLimited)) {
+        if ((photos.isGranted && videos.isGranted) || (photos.isLimited && videos.isLimited)) {
           status = PermissionStatus.granted;
         } else if (photos.isDenied || videos.isDenied) {
           status = PermissionStatus.denied;
@@ -49,8 +47,7 @@ class GalleryPermissionNotifier extends StateNotifier<PermissionStatus> {
 
         result = status;
       }
-      if (result == PermissionStatus.granted &&
-          androidInfo.version.sdkInt >= 29) {
+      if (result == PermissionStatus.granted && androidInfo.version.sdkInt >= 29) {
         result = await Permission.accessMediaLocation.request();
       }
     } else {
@@ -80,8 +77,7 @@ class GalleryPermissionNotifier extends StateNotifier<PermissionStatus> {
 
         // Return the joint result of those two permissions
         final PermissionStatus status;
-        if ((photos.isGranted && videos.isGranted) ||
-            (photos.isLimited && videos.isLimited)) {
+        if ((photos.isGranted && videos.isGranted) || (photos.isLimited && videos.isLimited)) {
           status = PermissionStatus.granted;
         } else if (photos.isDenied || videos.isDenied) {
           status = PermissionStatus.denied;
@@ -93,8 +89,7 @@ class GalleryPermissionNotifier extends StateNotifier<PermissionStatus> {
 
         result = status;
       }
-      if (state == PermissionStatus.granted &&
-          androidInfo.version.sdkInt >= 29) {
+      if (state == PermissionStatus.granted && androidInfo.version.sdkInt >= 29) {
         result = await Permission.accessMediaLocation.status;
       }
     } else {
@@ -107,7 +102,6 @@ class GalleryPermissionNotifier extends StateNotifier<PermissionStatus> {
   }
 }
 
-final galleryPermissionNotifier =
-    StateNotifierProvider<GalleryPermissionNotifier, PermissionStatus>(
+final galleryPermissionNotifier = StateNotifierProvider<GalleryPermissionNotifier, PermissionStatus>(
   (ref) => GalleryPermissionNotifier(),
 );
diff --git a/mobile/lib/providers/haptic_feedback.provider.dart b/mobile/lib/providers/haptic_feedback.provider.dart
index ce8997c85c..711c6fa4e2 100644
--- a/mobile/lib/providers/haptic_feedback.provider.dart
+++ b/mobile/lib/providers/haptic_feedback.provider.dart
@@ -3,8 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 
-final hapticFeedbackProvider =
-    StateNotifierProvider<HapticNotifier, void>((ref) {
+final hapticFeedbackProvider = StateNotifierProvider<HapticNotifier, void>((ref) {
   return HapticNotifier(ref);
 });
 
@@ -15,41 +14,31 @@ class HapticNotifier extends StateNotifier<void> {
   HapticNotifier(this._ref) : super(null);
 
   selectionClick() {
-    if (_ref
-        .read(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.enableHapticFeedback)) {
+    if (_ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableHapticFeedback)) {
       HapticFeedback.selectionClick();
     }
   }
 
   lightImpact() {
-    if (_ref
-        .read(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.enableHapticFeedback)) {
+    if (_ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableHapticFeedback)) {
       HapticFeedback.lightImpact();
     }
   }
 
   mediumImpact() {
-    if (_ref
-        .read(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.enableHapticFeedback)) {
+    if (_ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableHapticFeedback)) {
       HapticFeedback.mediumImpact();
     }
   }
 
   heavyImpact() {
-    if (_ref
-        .read(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.enableHapticFeedback)) {
+    if (_ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableHapticFeedback)) {
       HapticFeedback.heavyImpact();
     }
   }
 
   vibrate() {
-    if (_ref
-        .read(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.enableHapticFeedback)) {
+    if (_ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableHapticFeedback)) {
       HapticFeedback.vibrate();
     }
   }
diff --git a/mobile/lib/providers/image/cache/thumbnail_image_cache_manager.dart b/mobile/lib/providers/image/cache/thumbnail_image_cache_manager.dart
index dd7ad35277..f8d4cda3e6 100644
--- a/mobile/lib/providers/image/cache/thumbnail_image_cache_manager.dart
+++ b/mobile/lib/providers/image/cache/thumbnail_image_cache_manager.dart
@@ -3,8 +3,7 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 /// The cache manager for thumbnail images [ImmichRemoteThumbnailProvider]
 class ThumbnailImageCacheManager extends CacheManager {
   static const key = 'thumbnailImageCacheKey';
-  static final ThumbnailImageCacheManager _instance =
-      ThumbnailImageCacheManager._();
+  static final ThumbnailImageCacheManager _instance = ThumbnailImageCacheManager._();
 
   factory ThumbnailImageCacheManager() {
     return _instance;
diff --git a/mobile/lib/providers/image/immich_local_thumbnail_provider.dart b/mobile/lib/providers/image/immich_local_thumbnail_provider.dart
index edcf8a9458..de69115444 100644
--- a/mobile/lib/providers/image/immich_local_thumbnail_provider.dart
+++ b/mobile/lib/providers/image/immich_local_thumbnail_provider.dart
@@ -13,8 +13,7 @@ import 'package:logging/logging.dart';
 
 /// The local image provider for an asset
 /// Only viable
-class ImmichLocalThumbnailProvider
-    extends ImageProvider<ImmichLocalThumbnailProvider> {
+class ImmichLocalThumbnailProvider extends ImageProvider<ImmichLocalThumbnailProvider> {
   final Asset asset;
   final int height;
   final int width;
@@ -60,13 +59,11 @@ class ImmichLocalThumbnailProvider
     CacheManager cache,
     ImageDecoderCallback decode,
   ) async* {
-    final cacheKey =
-        '$userId${assetData.localId}${assetData.checksum}$width$height';
+    final cacheKey = '$userId${assetData.localId}${assetData.checksum}$width$height';
     final fileFromCache = await cache.getFileFromCache(cacheKey);
     if (fileFromCache != null) {
       try {
-        final buffer =
-            await ui.ImmutableBuffer.fromFilePath(fileFromCache.file.path);
+        final buffer = await ui.ImmutableBuffer.fromFilePath(fileFromCache.file.path);
         final codec = await decode(buffer);
         yield codec;
         return;
diff --git a/mobile/lib/providers/image/immich_remote_image_provider.dart b/mobile/lib/providers/image/immich_remote_image_provider.dart
index fe0811583c..130b2202b4 100644
--- a/mobile/lib/providers/image/immich_remote_image_provider.dart
+++ b/mobile/lib/providers/image/immich_remote_image_provider.dart
@@ -15,8 +15,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 
 /// The remote image provider for full size remote images
-class ImmichRemoteImageProvider
-    extends ImageProvider<ImmichRemoteImageProvider> {
+class ImmichRemoteImageProvider extends ImageProvider<ImmichRemoteImageProvider> {
   /// The [Asset.remoteId] of the asset to fetch
   final String assetId;
 
diff --git a/mobile/lib/providers/image/immich_remote_thumbnail_provider.dart b/mobile/lib/providers/image/immich_remote_thumbnail_provider.dart
index 8533cb6f08..cb2a6270b4 100644
--- a/mobile/lib/providers/image/immich_remote_thumbnail_provider.dart
+++ b/mobile/lib/providers/image/immich_remote_thumbnail_provider.dart
@@ -13,8 +13,7 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 
 /// The remote image provider
-class ImmichRemoteThumbnailProvider
-    extends ImageProvider<ImmichRemoteThumbnailProvider> {
+class ImmichRemoteThumbnailProvider extends ImageProvider<ImmichRemoteThumbnailProvider> {
   /// The [Asset.remoteId] of the asset to fetch
   final String assetId;
 
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 3102511295..96c0c5eb18 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -26,8 +26,7 @@ class ActionResult {
   const ActionResult({required this.count, required this.success, this.error});
 
   @override
-  String toString() =>
-      'ActionResult(count: $count, success: $success, error: $error)';
+  String toString() => 'ActionResult(count: $count, success: $success, error: $error)';
 }
 
 class ActionNotifier extends Notifier<void> {
@@ -44,10 +43,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   List<String> _getRemoteIdsForSource(ActionSource source) {
-    return _getAssets(source)
-        .whereType<RemoteAsset>()
-        .toIds()
-        .toList(growable: false);
+    return _getAssets(source).whereType<RemoteAsset>().toIds().toList(growable: false);
   }
 
   List<String> _getLocalIdsForSource(ActionSource source) {
@@ -67,11 +63,7 @@ class ActionNotifier extends Notifier<void> {
 
   List<String> _getOwnedRemoteIdsForSource(ActionSource source) {
     final ownerId = ref.read(currentUserProvider)?.id;
-    return _getAssets(source)
-        .whereType<RemoteAsset>()
-        .ownedAssets(ownerId)
-        .toIds()
-        .toList(growable: false);
+    return _getAssets(source).whereType<RemoteAsset>().ownedAssets(ownerId).toIds().toList(growable: false);
   }
 
   List<RemoteAsset> _getOwnedRemoteAssetsForSource(ActionSource source) {
@@ -355,8 +347,7 @@ class ActionNotifier extends Notifier<void> {
   }
 
   Future<ActionResult> downloadAll(ActionSource source) async {
-    final assets =
-        _getAssets(source).whereType<RemoteAsset>().toList(growable: false);
+    final assets = _getAssets(source).whereType<RemoteAsset>().toList(growable: false);
 
     try {
       final didEnqueue = await _service.downloadAll(assets);
diff --git a/mobile/lib/providers/infrastructure/album.provider.dart b/mobile/lib/providers/infrastructure/album.provider.dart
index 4ec3453d16..4baead4b75 100644
--- a/mobile/lib/providers/infrastructure/album.provider.dart
+++ b/mobile/lib/providers/infrastructure/album.provider.dart
@@ -22,8 +22,7 @@ final localAlbumProvider = FutureProvider<List<LocalAlbum>>(
 );
 
 final localAlbumThumbnailProvider = FutureProvider.family<LocalAsset?, String>(
-  (ref, albumId) =>
-      LocalAlbumService(ref.watch(localAlbumRepository)).getThumbnail(albumId),
+  (ref, albumId) => LocalAlbumService(ref.watch(localAlbumRepository)).getThumbnail(albumId),
 );
 
 final remoteAlbumRepository = Provider<DriftRemoteAlbumRepository>(
@@ -38,8 +37,7 @@ final remoteAlbumServiceProvider = Provider<RemoteAlbumService>(
   dependencies: [remoteAlbumRepository],
 );
 
-final remoteAlbumProvider =
-    NotifierProvider<RemoteAlbumNotifier, RemoteAlbumState>(
+final remoteAlbumProvider = NotifierProvider<RemoteAlbumNotifier, RemoteAlbumState>(
   RemoteAlbumNotifier.new,
   dependencies: [remoteAlbumServiceProvider],
 );
diff --git a/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart b/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart
index 996d5d816f..66de676c08 100644
--- a/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart
+++ b/mobile/lib/providers/infrastructure/asset_viewer/current_asset.provider.dart
@@ -4,8 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 
-final currentAssetNotifier =
-    AutoDisposeNotifierProvider<CurrentAssetNotifier, BaseAsset?>(
+final currentAssetNotifier = AutoDisposeNotifierProvider<CurrentAssetNotifier, BaseAsset?>(
   CurrentAssetNotifier.new,
 );
 
@@ -20,10 +19,7 @@ class CurrentAssetNotifier extends AutoDisposeNotifier<BaseAsset?> {
     _keepAliveLink?.close();
     _assetSubscription?.cancel();
     state = asset;
-    _assetSubscription = ref
-        .watch(assetServiceProvider)
-        .watchAsset(asset)
-        .listen((updatedAsset) {
+    _assetSubscription = ref.watch(assetServiceProvider).watchAsset(asset).listen((updatedAsset) {
       if (updatedAsset != null) {
         state = updatedAsset;
       }
diff --git a/mobile/lib/providers/infrastructure/current_album.provider.dart b/mobile/lib/providers/infrastructure/current_album.provider.dart
index ece188ee15..5d6e0414b0 100644
--- a/mobile/lib/providers/infrastructure/current_album.provider.dart
+++ b/mobile/lib/providers/infrastructure/current_album.provider.dart
@@ -4,8 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 
-final currentRemoteAlbumProvider =
-    AutoDisposeNotifierProvider<CurrentAlbumNotifier, RemoteAlbum?>(
+final currentRemoteAlbumProvider = AutoDisposeNotifierProvider<CurrentAlbumNotifier, RemoteAlbum?>(
   CurrentAlbumNotifier.new,
 );
 
@@ -21,10 +20,7 @@ class CurrentAlbumNotifier extends AutoDisposeNotifier<RemoteAlbum?> {
     _assetSubscription?.cancel();
     state = album;
 
-    _assetSubscription = ref
-        .watch(remoteAlbumServiceProvider)
-        .watchAlbum(album.id)
-        .listen((updatedAlbum) {
+    _assetSubscription = ref.watch(remoteAlbumServiceProvider).watchAlbum(album.id).listen((updatedAlbum) {
       if (updatedAlbum != null) {
         state = updatedAlbum;
       }
diff --git a/mobile/lib/providers/infrastructure/exif.provider.dart b/mobile/lib/providers/infrastructure/exif.provider.dart
index 59ad632927..c126f6cac0 100644
--- a/mobile/lib/providers/infrastructure/exif.provider.dart
+++ b/mobile/lib/providers/infrastructure/exif.provider.dart
@@ -6,5 +6,4 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'exif.provider.g.dart';
 
 @Riverpod(keepAlive: true)
-IsarExifRepository exifRepository(Ref ref) =>
-    IsarExifRepository(ref.watch(isarProvider));
+IsarExifRepository exifRepository(Ref ref) => IsarExifRepository(ref.watch(isarProvider));
diff --git a/mobile/lib/providers/infrastructure/memory.provider.dart b/mobile/lib/providers/infrastructure/memory.provider.dart
index 0e58943f55..e5809a12b4 100644
--- a/mobile/lib/providers/infrastructure/memory.provider.dart
+++ b/mobile/lib/providers/infrastructure/memory.provider.dart
@@ -14,8 +14,7 @@ final driftMemoryServiceProvider = Provider<DriftMemoryService>(
   (ref) => DriftMemoryService(ref.watch(driftMemoryRepositoryProvider)),
 );
 
-final driftMemoryFutureProvider =
-    FutureProvider.autoDispose<List<DriftMemory>>((ref) async {
+final driftMemoryFutureProvider = FutureProvider.autoDispose<List<DriftMemory>>((ref) async {
   final user = ref.watch(currentUserProvider);
   if (user == null) {
     return [];
diff --git a/mobile/lib/providers/infrastructure/partner.provider.dart b/mobile/lib/providers/infrastructure/partner.provider.dart
index e1c7ebf960..f4ba4cc73a 100644
--- a/mobile/lib/providers/infrastructure/partner.provider.dart
+++ b/mobile/lib/providers/infrastructure/partner.provider.dart
@@ -59,20 +59,16 @@ class PartnerNotifier extends Notifier<List<PartnerUserDto>> {
   }
 }
 
-final driftAvailablePartnerProvider =
-    FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
+final driftAvailablePartnerProvider = FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
   final currentUser = ref.watch(currentUserProvider);
   if (currentUser == null) {
     return [];
   }
 
-  return ref
-      .watch(driftPartnerServiceProvider)
-      .getAvailablePartners(currentUser.id);
+  return ref.watch(driftPartnerServiceProvider).getAvailablePartners(currentUser.id);
 });
 
-final driftSharedByPartnerProvider =
-    FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
+final driftSharedByPartnerProvider = FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
   final currentUser = ref.watch(currentUserProvider);
   if (currentUser == null) {
     return [];
@@ -81,8 +77,7 @@ final driftSharedByPartnerProvider =
   return ref.watch(driftPartnerServiceProvider).getSharedBy(currentUser.id);
 });
 
-final driftSharedWithPartnerProvider =
-    FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
+final driftSharedWithPartnerProvider = FutureProvider.autoDispose<List<PartnerUserDto>>((ref) {
   final currentUser = ref.watch(currentUserProvider);
   if (currentUser == null) {
     return [];
diff --git a/mobile/lib/providers/infrastructure/remote_album.provider.dart b/mobile/lib/providers/infrastructure/remote_album.provider.dart
index 2ce10d7cbd..c6d9337b53 100644
--- a/mobile/lib/providers/infrastructure/remote_album.provider.dart
+++ b/mobile/lib/providers/infrastructure/remote_album.provider.dart
@@ -31,16 +31,14 @@ class RemoteAlbumState {
   }
 
   @override
-  String toString() =>
-      'RemoteAlbumState(albums: ${albums.length}, filteredAlbums: ${filteredAlbums.length})';
+  String toString() => 'RemoteAlbumState(albums: ${albums.length}, filteredAlbums: ${filteredAlbums.length})';
 
   @override
   bool operator ==(covariant RemoteAlbumState other) {
     if (identical(this, other)) return true;
     final listEquals = const DeepCollectionEquality().equals;
 
-    return listEquals(other.albums, albums) &&
-        listEquals(other.filteredAlbums, filteredAlbums);
+    return listEquals(other.albums, albums) && listEquals(other.filteredAlbums, filteredAlbums);
   }
 
   @override
@@ -101,8 +99,7 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
     RemoteAlbumSortMode sortMode, {
     bool isReverse = false,
   }) {
-    final sortedAlbums = _remoteAlbumService
-        .sortAlbums(state.filteredAlbums, sortMode, isReverse: isReverse);
+    final sortedAlbums = _remoteAlbumService.sortAlbums(state.filteredAlbums, sortMode, isReverse: isReverse);
     state = state.copyWith(filteredAlbums: sortedAlbums);
   }
 
@@ -169,12 +166,9 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
   }
 
   Future<RemoteAlbum?> toggleAlbumOrder(String albumId) async {
-    final currentAlbum =
-        state.albums.firstWhere((album) => album.id == albumId);
+    final currentAlbum = state.albums.firstWhere((album) => album.id == albumId);
 
-    final newOrder = currentAlbum.order == AlbumAssetOrder.asc
-        ? AlbumAssetOrder.desc
-        : AlbumAssetOrder.asc;
+    final newOrder = currentAlbum.order == AlbumAssetOrder.asc ? AlbumAssetOrder.desc : AlbumAssetOrder.asc;
 
     return updateAlbum(albumId, order: newOrder);
   }
@@ -182,10 +176,8 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
   Future<void> deleteAlbum(String albumId) async {
     await _remoteAlbumService.deleteAlbum(albumId);
 
-    final updatedAlbums =
-        state.albums.where((album) => album.id != albumId).toList();
-    final updatedFilteredAlbums =
-        state.filteredAlbums.where((album) => album.id != albumId).toList();
+    final updatedAlbums = state.albums.where((album) => album.id != albumId).toList();
+    final updatedFilteredAlbums = state.filteredAlbums.where((album) => album.id != albumId).toList();
 
     state = state.copyWith(
       albums: updatedAlbums,
@@ -212,16 +204,14 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
   }
 }
 
-final remoteAlbumDateRangeProvider =
-    FutureProvider.family<(DateTime, DateTime), String>(
+final remoteAlbumDateRangeProvider = FutureProvider.family<(DateTime, DateTime), String>(
   (ref, albumId) async {
     final service = ref.watch(remoteAlbumServiceProvider);
     return service.getDateRange(albumId);
   },
 );
 
-final remoteAlbumSharedUsersProvider =
-    FutureProvider.autoDispose.family<List<UserDto>, String>(
+final remoteAlbumSharedUsersProvider = FutureProvider.autoDispose.family<List<UserDto>, String>(
   (ref, albumId) async {
     final link = ref.keepAlive();
     ref.onDispose(() => link.close());
diff --git a/mobile/lib/providers/infrastructure/setting.provider.dart b/mobile/lib/providers/infrastructure/setting.provider.dart
index ad0af8282e..7d8be72cd0 100644
--- a/mobile/lib/providers/infrastructure/setting.provider.dart
+++ b/mobile/lib/providers/infrastructure/setting.provider.dart
@@ -5,8 +5,7 @@ import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
 
 class SettingsNotifier extends Notifier<SettingsService> {
   @override
-  SettingsService build() =>
-      SettingsService(storeService: ref.read(storeServiceProvider));
+  SettingsService build() => SettingsService(storeService: ref.read(storeServiceProvider));
 
   T get<T>(Setting<T> setting) => state.get(setting);
 
@@ -18,5 +17,4 @@ class SettingsNotifier extends Notifier<SettingsService> {
   Stream<T> watch<T>(Setting<T> setting) => state.watch(setting);
 }
 
-final settingsProvider =
-    NotifierProvider<SettingsNotifier, SettingsService>(SettingsNotifier.new);
+final settingsProvider = NotifierProvider<SettingsNotifier, SettingsService>(SettingsNotifier.new);
diff --git a/mobile/lib/providers/infrastructure/store.provider.dart b/mobile/lib/providers/infrastructure/store.provider.dart
index 6ae7ff987b..0bf42f3e8b 100644
--- a/mobile/lib/providers/infrastructure/store.provider.dart
+++ b/mobile/lib/providers/infrastructure/store.provider.dart
@@ -7,8 +7,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'store.provider.g.dart';
 
 @Riverpod(keepAlive: true)
-IsarStoreRepository storeRepository(Ref ref) =>
-    IsarStoreRepository(ref.watch(isarProvider));
+IsarStoreRepository storeRepository(Ref ref) => IsarStoreRepository(ref.watch(isarProvider));
 
 @Riverpod(keepAlive: true)
 StoreService storeService(Ref _) => StoreService.I;
diff --git a/mobile/lib/providers/infrastructure/timeline.provider.dart b/mobile/lib/providers/infrastructure/timeline.provider.dart
index bbc04349de..1f8c344f31 100644
--- a/mobile/lib/providers/infrastructure/timeline.provider.dart
+++ b/mobile/lib/providers/infrastructure/timeline.provider.dart
@@ -11,15 +11,13 @@ final timelineRepositoryProvider = Provider<DriftTimelineRepository>(
 );
 
 final timelineArgsProvider = Provider.autoDispose<TimelineArgs>(
-  (ref) =>
-      throw UnimplementedError('Will be overridden through a ProviderScope.'),
+  (ref) => throw UnimplementedError('Will be overridden through a ProviderScope.'),
 );
 
 final timelineServiceProvider = Provider<TimelineService>(
   (ref) {
     final timelineUsers = ref.watch(timelineUsersProvider).valueOrNull ?? [];
-    final timelineService =
-        ref.watch(timelineFactoryProvider).main(timelineUsers);
+    final timelineService = ref.watch(timelineFactoryProvider).main(timelineUsers);
     ref.onDispose(timelineService.dispose);
     return timelineService;
   },
@@ -42,8 +40,6 @@ final timelineUsersProvider = StreamProvider<List<String>>(
       return Stream.value([]);
     }
 
-    return ref
-        .watch(timelineRepositoryProvider)
-        .watchTimelineUserIds(currentUserId);
+    return ref.watch(timelineRepositoryProvider).watchTimelineUserIds(currentUserId);
   },
 );
diff --git a/mobile/lib/providers/infrastructure/user.provider.dart b/mobile/lib/providers/infrastructure/user.provider.dart
index d328f97600..cd62be2bec 100644
--- a/mobile/lib/providers/infrastructure/user.provider.dart
+++ b/mobile/lib/providers/infrastructure/user.provider.dart
@@ -15,12 +15,10 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'user.provider.g.dart';
 
 @Riverpod(keepAlive: true)
-IsarUserRepository userRepository(Ref ref) =>
-    IsarUserRepository(ref.watch(isarProvider));
+IsarUserRepository userRepository(Ref ref) => IsarUserRepository(ref.watch(isarProvider));
 
 @Riverpod(keepAlive: true)
-UserApiRepository userApiRepository(Ref ref) =>
-    UserApiRepository(ref.watch(apiServiceProvider).usersApi);
+UserApiRepository userApiRepository(Ref ref) => UserApiRepository(ref.watch(apiServiceProvider).usersApi);
 
 @Riverpod(keepAlive: true)
 UserService userService(Ref ref) => UserService(
@@ -41,7 +39,6 @@ final driftPartnerServiceProvider = Provider<DriftPartnerService>(
   ),
 );
 
-final partnerUsersProvider =
-    NotifierProvider<PartnerNotifier, List<PartnerUserDto>>(
+final partnerUsersProvider = NotifierProvider<PartnerNotifier, List<PartnerUserDto>>(
   PartnerNotifier.new,
 );
diff --git a/mobile/lib/providers/local_auth.provider.dart b/mobile/lib/providers/local_auth.provider.dart
index 6f7ca5eb71..56a5b2191b 100644
--- a/mobile/lib/providers/local_auth.provider.dart
+++ b/mobile/lib/providers/local_auth.provider.dart
@@ -9,8 +9,7 @@ import 'package:immich_mobile/services/local_auth.service.dart';
 import 'package:immich_mobile/services/secure_storage.service.dart';
 import 'package:logging/logging.dart';
 
-final localAuthProvider =
-    StateNotifierProvider<LocalAuthNotifier, BiometricStatus>((ref) {
+final localAuthProvider = StateNotifierProvider<LocalAuthNotifier, BiometricStatus>((ref) {
   return LocalAuthNotifier(
     ref.watch(localAuthServiceProvider),
     ref.watch(secureStorageServiceProvider),
@@ -39,8 +38,7 @@ class LocalAuthNotifier extends StateNotifier<BiometricStatus> {
   }
 
   Future<bool> registerBiometric(BuildContext context, String pinCode) async {
-    final isAuthenticated =
-        await authenticate(context, 'Authenticate to enable biometrics');
+    final isAuthenticated = await authenticate(context, 'Authenticate to enable biometrics');
 
     if (!isAuthenticated) {
       return false;
diff --git a/mobile/lib/providers/map/map_marker.provider.dart b/mobile/lib/providers/map/map_marker.provider.dart
index a0a11a0637..e107dd3602 100644
--- a/mobile/lib/providers/map/map_marker.provider.dart
+++ b/mobile/lib/providers/map/map_marker.provider.dart
@@ -16,8 +16,7 @@ Future<List<MapMarker>> mapMarkers(Ref ref) async {
   bool isWithPartners = mapState.withPartners;
 
   if (mapState.relativeTime != 0) {
-    fileCreatedAfter =
-        DateTime.now().subtract(Duration(days: mapState.relativeTime));
+    fileCreatedAfter = DateTime.now().subtract(Duration(days: mapState.relativeTime));
   }
 
   if (mapState.showFavoriteOnly) {
diff --git a/mobile/lib/providers/map/map_state.provider.dart b/mobile/lib/providers/map/map_state.provider.dart
index 189a23cd0a..4337654be0 100644
--- a/mobile/lib/providers/map/map_state.provider.dart
+++ b/mobile/lib/providers/map/map_state.provider.dart
@@ -13,22 +13,15 @@ class MapStateNotifier extends _$MapStateNotifier {
   MapState build() {
     final appSettingsProvider = ref.read(appSettingsServiceProvider);
 
-    final lightStyleUrl =
-        ref.read(serverInfoProvider).serverConfig.mapLightStyleUrl;
-    final darkStyleUrl =
-        ref.read(serverInfoProvider).serverConfig.mapDarkStyleUrl;
+    final lightStyleUrl = ref.read(serverInfoProvider).serverConfig.mapLightStyleUrl;
+    final darkStyleUrl = ref.read(serverInfoProvider).serverConfig.mapDarkStyleUrl;
 
     return MapState(
-      themeMode: ThemeMode.values[
-          appSettingsProvider.getSetting<int>(AppSettingsEnum.mapThemeMode)],
-      showFavoriteOnly: appSettingsProvider
-          .getSetting<bool>(AppSettingsEnum.mapShowFavoriteOnly),
-      includeArchived: appSettingsProvider
-          .getSetting<bool>(AppSettingsEnum.mapIncludeArchived),
-      withPartners:
-          appSettingsProvider.getSetting<bool>(AppSettingsEnum.mapwithPartners),
-      relativeTime:
-          appSettingsProvider.getSetting<int>(AppSettingsEnum.mapRelativeDate),
+      themeMode: ThemeMode.values[appSettingsProvider.getSetting<int>(AppSettingsEnum.mapThemeMode)],
+      showFavoriteOnly: appSettingsProvider.getSetting<bool>(AppSettingsEnum.mapShowFavoriteOnly),
+      includeArchived: appSettingsProvider.getSetting<bool>(AppSettingsEnum.mapIncludeArchived),
+      withPartners: appSettingsProvider.getSetting<bool>(AppSettingsEnum.mapwithPartners),
+      relativeTime: appSettingsProvider.getSetting<int>(AppSettingsEnum.mapRelativeDate),
       lightStyleFetched: AsyncData(lightStyleUrl),
       darkStyleFetched: AsyncData(darkStyleUrl),
     );
diff --git a/mobile/lib/providers/memory.provider.dart b/mobile/lib/providers/memory.provider.dart
index aed546002d..7fef3060cc 100644
--- a/mobile/lib/providers/memory.provider.dart
+++ b/mobile/lib/providers/memory.provider.dart
@@ -2,8 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/models/memories/memory.model.dart';
 import 'package:immich_mobile/services/memory.service.dart';
 
-final memoryFutureProvider =
-    FutureProvider.autoDispose<List<Memory>?>((ref) async {
+final memoryFutureProvider = FutureProvider.autoDispose<List<Memory>?>((ref) async {
   final service = ref.watch(memoryServiceProvider);
 
   return await service.getMemoryLane();
diff --git a/mobile/lib/providers/notification_permission.provider.dart b/mobile/lib/providers/notification_permission.provider.dart
index 608f35d63f..e293452390 100644
--- a/mobile/lib/providers/notification_permission.provider.dart
+++ b/mobile/lib/providers/notification_permission.provider.dart
@@ -6,9 +6,7 @@ import 'package:permission_handler/permission_handler.dart';
 class NotificationPermissionNotifier extends StateNotifier<PermissionStatus> {
   NotificationPermissionNotifier()
       : super(
-          Platform.isAndroid
-              ? PermissionStatus.granted
-              : PermissionStatus.restricted,
+          Platform.isAndroid ? PermissionStatus.granted : PermissionStatus.restricted,
         ) {
     // Sets the initial state
     getNotificationPermission().then((p) => state = p);
@@ -40,7 +38,6 @@ class NotificationPermissionNotifier extends StateNotifier<PermissionStatus> {
   }
 }
 
-final notificationPermissionProvider =
-    StateNotifierProvider<NotificationPermissionNotifier, PermissionStatus>(
+final notificationPermissionProvider = StateNotifierProvider<NotificationPermissionNotifier, PermissionStatus>(
   (ref) => NotificationPermissionNotifier(),
 );
diff --git a/mobile/lib/providers/oauth.provider.dart b/mobile/lib/providers/oauth.provider.dart
index d8d66122f7..14b3353943 100644
--- a/mobile/lib/providers/oauth.provider.dart
+++ b/mobile/lib/providers/oauth.provider.dart
@@ -2,5 +2,4 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/services/oauth.service.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 
-final oAuthServiceProvider =
-    Provider((ref) => OAuthService(ref.watch(apiServiceProvider)));
+final oAuthServiceProvider = Provider((ref) => OAuthService(ref.watch(apiServiceProvider)));
diff --git a/mobile/lib/providers/partner.provider.dart b/mobile/lib/providers/partner.provider.dart
index f210c7fe3f..37e07958d3 100644
--- a/mobile/lib/providers/partner.provider.dart
+++ b/mobile/lib/providers/partner.provider.dart
@@ -38,8 +38,7 @@ class PartnerSharedWithNotifier extends StateNotifier<List<UserDto>> {
   }
 }
 
-final partnerSharedWithProvider =
-    StateNotifierProvider<PartnerSharedWithNotifier, List<UserDto>>((ref) {
+final partnerSharedWithProvider = StateNotifierProvider<PartnerSharedWithNotifier, List<UserDto>>((ref) {
   return PartnerSharedWithNotifier(
     ref.watch(partnerServiceProvider),
   );
@@ -73,13 +72,11 @@ class PartnerSharedByNotifier extends StateNotifier<List<UserDto>> {
   }
 }
 
-final partnerSharedByProvider =
-    StateNotifierProvider<PartnerSharedByNotifier, List<UserDto>>((ref) {
+final partnerSharedByProvider = StateNotifierProvider<PartnerSharedByNotifier, List<UserDto>>((ref) {
   return PartnerSharedByNotifier(ref.watch(partnerServiceProvider));
 });
 
-final partnerAvailableProvider =
-    FutureProvider.autoDispose<List<UserDto>>((ref) async {
+final partnerAvailableProvider = FutureProvider.autoDispose<List<UserDto>>((ref) async {
   final otherUsers = await ref.watch(otherUsersProvider.future);
   final currentPartners = ref.watch(partnerSharedByProvider);
   final available = Set<UserDto>.of(otherUsers);
diff --git a/mobile/lib/providers/search/paginated_search.provider.dart b/mobile/lib/providers/search/paginated_search.provider.dart
index 65afb39b7c..dbeacb45c6 100644
--- a/mobile/lib/providers/search/paginated_search.provider.dart
+++ b/mobile/lib/providers/search/paginated_search.provider.dart
@@ -8,16 +8,14 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'paginated_search.provider.g.dart';
 
-final paginatedSearchProvider =
-    StateNotifierProvider<PaginatedSearchNotifier, SearchResult>(
+final paginatedSearchProvider = StateNotifierProvider<PaginatedSearchNotifier, SearchResult>(
   (ref) => PaginatedSearchNotifier(ref.watch(searchServiceProvider)),
 );
 
 class PaginatedSearchNotifier extends StateNotifier<SearchResult> {
   final SearchService _searchService;
 
-  PaginatedSearchNotifier(this._searchService)
-      : super(const SearchResult(assets: [], nextPage: 1));
+  PaginatedSearchNotifier(this._searchService) : super(const SearchResult(assets: [], nextPage: 1));
 
   Future<bool> search(SearchFilter filter) async {
     if (state.nextPage == null) {
diff --git a/mobile/lib/providers/search/people.provider.dart b/mobile/lib/providers/search/people.provider.dart
index f6ac9d1125..f0faabd35a 100644
--- a/mobile/lib/providers/search/people.provider.dart
+++ b/mobile/lib/providers/search/people.provider.dart
@@ -25,8 +25,7 @@ Future<RenderList> personAssets(Ref ref, String personId) async {
   final assets = await personService.getPersonAssets(personId);
 
   final settings = ref.read(appSettingsServiceProvider);
-  final groupBy =
-      GroupAssetsBy.values[settings.getSetting(AppSettingsEnum.groupAssetsBy)];
+  final groupBy = GroupAssetsBy.values[settings.getSetting(AppSettingsEnum.groupAssetsBy)];
   return await RenderList.fromAssets(assets, groupBy);
 }
 
diff --git a/mobile/lib/providers/search/search_page_state.provider.dart b/mobile/lib/providers/search/search_page_state.provider.dart
index d0e3720c0f..4bbceca383 100644
--- a/mobile/lib/providers/search/search_page_state.provider.dart
+++ b/mobile/lib/providers/search/search_page_state.provider.dart
@@ -3,8 +3,7 @@ import 'package:immich_mobile/models/search/search_curated_content.model.dart';
 
 import 'package:immich_mobile/services/search.service.dart';
 
-final getPreviewPlacesProvider =
-    FutureProvider.autoDispose<List<SearchCuratedContent>>((ref) async {
+final getPreviewPlacesProvider = FutureProvider.autoDispose<List<SearchCuratedContent>>((ref) async {
   final SearchService searchService = ref.watch(searchServiceProvider);
 
   final exploreData = await searchService.getExploreData();
@@ -13,8 +12,7 @@ final getPreviewPlacesProvider =
     return [];
   }
 
-  final locations =
-      exploreData.firstWhere((data) => data.fieldName == "exifInfo.city").items;
+  final locations = exploreData.firstWhere((data) => data.fieldName == "exifInfo.city").items;
 
   final curatedContent = locations
       .map(
@@ -28,8 +26,7 @@ final getPreviewPlacesProvider =
   return curatedContent;
 });
 
-final getAllPlacesProvider =
-    FutureProvider.autoDispose<List<SearchCuratedContent>>((ref) async {
+final getAllPlacesProvider = FutureProvider.autoDispose<List<SearchCuratedContent>>((ref) async {
   final SearchService searchService = ref.watch(searchServiceProvider);
 
   final assetPlaces = await searchService.getAllPlaces();
diff --git a/mobile/lib/providers/secure_storage.provider.dart b/mobile/lib/providers/secure_storage.provider.dart
index 0194e527e9..39813d1027 100644
--- a/mobile/lib/providers/secure_storage.provider.dart
+++ b/mobile/lib/providers/secure_storage.provider.dart
@@ -1,7 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-final secureStorageProvider =
-    StateNotifierProvider<SecureStorageProvider, void>((ref) {
+final secureStorageProvider = StateNotifierProvider<SecureStorageProvider, void>((ref) {
   return SecureStorageProvider();
 });
 
diff --git a/mobile/lib/providers/server_info.provider.dart b/mobile/lib/providers/server_info.provider.dart
index aabf6a5390..4a5e65878b 100644
--- a/mobile/lib/providers/server_info.provider.dart
+++ b/mobile/lib/providers/server_info.provider.dart
@@ -33,8 +33,7 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {
               trashDays: 30,
               oauthButtonText: '',
               externalDomain: '',
-              mapLightStyleUrl:
-                  'https://tiles.immich.cloud/v1/style/light.json',
+              mapLightStyleUrl: 'https://tiles.immich.cloud/v1/style/light.json',
               mapDarkStyleUrl: 'https://tiles.immich.cloud/v1/style/dark.json',
             ),
             serverDiskInfo: ServerDiskInfo(
@@ -90,8 +89,7 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {
     if (appVersion["major"]! > serverVersion.major) {
       state = state.copyWith(
         isVersionMismatch: true,
-        versionMismatchErrorMessage:
-            "profile_drawer_server_out_of_date_major".tr(),
+        versionMismatchErrorMessage: "profile_drawer_server_out_of_date_major".tr(),
       );
       return;
     }
@@ -99,8 +97,7 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {
     if (appVersion["major"]! < serverVersion.major) {
       state = state.copyWith(
         isVersionMismatch: true,
-        versionMismatchErrorMessage:
-            "profile_drawer_client_out_of_date_major".tr(),
+        versionMismatchErrorMessage: "profile_drawer_client_out_of_date_major".tr(),
       );
       return;
     }
@@ -108,8 +105,7 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {
     if (appVersion["minor"]! > serverVersion.minor) {
       state = state.copyWith(
         isVersionMismatch: true,
-        versionMismatchErrorMessage:
-            "profile_drawer_server_out_of_date_minor".tr(),
+        versionMismatchErrorMessage: "profile_drawer_server_out_of_date_minor".tr(),
       );
       return;
     }
@@ -117,8 +113,7 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {
     if (appVersion["minor"]! < serverVersion.minor) {
       state = state.copyWith(
         isVersionMismatch: true,
-        versionMismatchErrorMessage:
-            "profile_drawer_client_out_of_date_minor".tr(),
+        versionMismatchErrorMessage: "profile_drawer_client_out_of_date_minor".tr(),
       );
       return;
     }
@@ -179,7 +174,6 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {
   }
 }
 
-final serverInfoProvider =
-    StateNotifierProvider<ServerInfoNotifier, ServerInfo>((ref) {
+final serverInfoProvider = StateNotifierProvider<ServerInfoNotifier, ServerInfo>((ref) {
   return ServerInfoNotifier(ref.read(serverInfoServiceProvider));
 });
diff --git a/mobile/lib/providers/shared_link.provider.dart b/mobile/lib/providers/shared_link.provider.dart
index 29b628c765..32dfed51f2 100644
--- a/mobile/lib/providers/shared_link.provider.dart
+++ b/mobile/lib/providers/shared_link.provider.dart
@@ -20,9 +20,7 @@ class SharedLinksNotifier extends StateNotifier<AsyncValue<List<SharedLink>>> {
   }
 }
 
-final sharedLinksStateProvider =
-    StateNotifierProvider<SharedLinksNotifier, AsyncValue<List<SharedLink>>>(
-        (ref) {
+final sharedLinksStateProvider = StateNotifierProvider<SharedLinksNotifier, AsyncValue<List<SharedLink>>>((ref) {
   return SharedLinksNotifier(
     ref.watch(sharedLinkServiceProvider),
   );
diff --git a/mobile/lib/providers/sync_status.provider.dart b/mobile/lib/providers/sync_status.provider.dart
index 5640ad6c89..bf535f525d 100644
--- a/mobile/lib/providers/sync_status.provider.dart
+++ b/mobile/lib/providers/sync_status.provider.dart
@@ -92,8 +92,7 @@ class SyncStatusNotifier extends Notifier<SyncStatusState> {
 
   void startRemoteSync() => setRemoteSyncStatus(SyncStatus.syncing);
   void completeRemoteSync() => setRemoteSyncStatus(SyncStatus.success);
-  void errorRemoteSync(String error) =>
-      setRemoteSyncStatus(SyncStatus.error, error);
+  void errorRemoteSync(String error) => setRemoteSyncStatus(SyncStatus.error, error);
 
   ///
   /// Local Sync
@@ -108,8 +107,7 @@ class SyncStatusNotifier extends Notifier<SyncStatusState> {
 
   void startLocalSync() => setLocalSyncStatus(SyncStatus.syncing);
   void completeLocalSync() => setLocalSyncStatus(SyncStatus.success);
-  void errorLocalSync(String error) =>
-      setLocalSyncStatus(SyncStatus.error, error);
+  void errorLocalSync(String error) => setLocalSyncStatus(SyncStatus.error, error);
 
   ///
   /// Hash Job
@@ -127,7 +125,6 @@ class SyncStatusNotifier extends Notifier<SyncStatusState> {
   void errorHashJob(String error) => setHashJobStatus(SyncStatus.error, error);
 }
 
-final syncStatusProvider =
-    NotifierProvider<SyncStatusNotifier, SyncStatusState>(
+final syncStatusProvider = NotifierProvider<SyncStatusNotifier, SyncStatusState>(
   SyncStatusNotifier.new,
 );
diff --git a/mobile/lib/providers/theme.provider.dart b/mobile/lib/providers/theme.provider.dart
index 73623bd026..bdf3735f8e 100644
--- a/mobile/lib/providers/theme.provider.dart
+++ b/mobile/lib/providers/theme.provider.dart
@@ -9,9 +9,7 @@ import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 
 final immichThemeModeProvider = StateProvider<ThemeMode>((ref) {
-  final themeMode = ref
-      .watch(appSettingsServiceProvider)
-      .getSetting(AppSettingsEnum.themeMode);
+  final themeMode = ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.themeMode);
 
   debugPrint("Current themeMode $themeMode");
 
@@ -26,14 +24,12 @@ final immichThemeModeProvider = StateProvider<ThemeMode>((ref) {
 
 final immichThemePresetProvider = StateProvider<ImmichColorPreset>((ref) {
   final appSettingsProvider = ref.watch(appSettingsServiceProvider);
-  final primaryColorPreset =
-      appSettingsProvider.getSetting(AppSettingsEnum.primaryColor);
+  final primaryColorPreset = appSettingsProvider.getSetting(AppSettingsEnum.primaryColor);
 
   debugPrint("Current theme preset $primaryColorPreset");
 
   try {
-    return ImmichColorPreset.values
-        .firstWhere((e) => e.name == primaryColorPreset);
+    return ImmichColorPreset.values.firstWhere((e) => e.name == primaryColorPreset);
   } catch (e) {
     debugPrint(
       "Theme preset $primaryColorPreset not found. Applying default preset.",
@@ -47,15 +43,11 @@ final immichThemePresetProvider = StateProvider<ImmichColorPreset>((ref) {
 });
 
 final dynamicThemeSettingProvider = StateProvider<bool>((ref) {
-  return ref
-      .watch(appSettingsServiceProvider)
-      .getSetting(AppSettingsEnum.dynamicTheme);
+  return ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.dynamicTheme);
 });
 
 final colorfulInterfaceSettingProvider = StateProvider<bool>((ref) {
-  return ref
-      .watch(appSettingsServiceProvider)
-      .getSetting(AppSettingsEnum.colorfulInterface);
+  return ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.colorfulInterface);
 });
 
 // Provider for current selected theme
@@ -64,11 +56,7 @@ final immichThemeProvider = StateProvider<ImmichTheme>((ref) {
   final useSystemColor = ref.watch(dynamicThemeSettingProvider);
   final useColorfulInterface = ref.watch(colorfulInterfaceSettingProvider);
   final ImmichTheme? dynamicTheme = DynamicTheme.theme;
-  final currentTheme = (useSystemColor && dynamicTheme != null)
-      ? dynamicTheme
-      : primaryColorPreset.themeOfPreset;
+  final currentTheme = (useSystemColor && dynamicTheme != null) ? dynamicTheme : primaryColorPreset.themeOfPreset;
 
-  return useColorfulInterface
-      ? currentTheme
-      : decolorizeSurfaces(theme: currentTheme);
+  return useColorfulInterface ? currentTheme : decolorizeSurfaces(theme: currentTheme);
 });
diff --git a/mobile/lib/providers/timeline.provider.dart b/mobile/lib/providers/timeline.provider.dart
index b2c763cdfa..6faccff030 100644
--- a/mobile/lib/providers/timeline.provider.dart
+++ b/mobile/lib/providers/timeline.provider.dart
@@ -18,8 +18,7 @@ final singleUserTimelineProvider = StreamProvider.family<RenderList, String?>(
   dependencies: [localeProvider],
 );
 
-final multiUsersTimelineProvider =
-    StreamProvider.family<RenderList, List<String>>(
+final multiUsersTimelineProvider = StreamProvider.family<RenderList, List<String>>(
   (ref, userIds) {
     ref.watch(localeProvider);
     final timelineService = ref.watch(timelineServiceProvider);
@@ -28,8 +27,7 @@ final multiUsersTimelineProvider =
   dependencies: [localeProvider],
 );
 
-final albumTimelineProvider =
-    StreamProvider.autoDispose.family<RenderList, int>((ref, id) {
+final albumTimelineProvider = StreamProvider.autoDispose.family<RenderList, int>((ref, id) {
   final album = ref.watch(albumWatcher(id)).value;
   final timelineService = ref.watch(timelineServiceProvider);
 
@@ -65,8 +63,7 @@ final assetSelectionTimelineProvider = StreamProvider<RenderList>((ref) {
   return timelineService.watchAssetSelectionTimeline();
 });
 
-final assetsTimelineProvider =
-    FutureProvider.family<RenderList, List<Asset>>((ref, assets) {
+final assetsTimelineProvider = FutureProvider.family<RenderList, List<Asset>>((ref, assets) {
   final timelineService = ref.watch(timelineServiceProvider);
   return timelineService.getTimelineFromAssets(
     assets,
diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dart
index 9e0f690e7d..d980ad22b5 100644
--- a/mobile/lib/providers/timeline/multiselect.provider.dart
+++ b/mobile/lib/providers/timeline/multiselect.provider.dart
@@ -5,8 +5,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 
-final multiSelectProvider =
-    NotifierProvider<MultiSelectNotifier, MultiSelectState>(
+final multiSelectProvider = NotifierProvider<MultiSelectNotifier, MultiSelectState>(
   MultiSelectNotifier.new,
   dependencies: [timelineServiceProvider],
 );
@@ -26,9 +25,7 @@ class MultiSelectState {
 
   /// Cloud only
   bool get hasRemote => selectedAssets.any(
-        (asset) =>
-            asset.storage == AssetState.remote ||
-            asset.storage == AssetState.merged,
+        (asset) => asset.storage == AssetState.remote || asset.storage == AssetState.merged,
       );
 
   bool get hasLocal => selectedAssets.any(
@@ -46,8 +43,7 @@ class MultiSelectState {
   }) {
     return MultiSelectState(
       selectedAssets: selectedAssets ?? this.selectedAssets,
-      lockedSelectionAssets:
-          lockedSelectionAssets ?? this.lockedSelectionAssets,
+      lockedSelectionAssets: lockedSelectionAssets ?? this.lockedSelectionAssets,
       forceEnable: forceEnable ?? this.forceEnable,
     );
   }
@@ -67,10 +63,7 @@ class MultiSelectState {
   }
 
   @override
-  int get hashCode =>
-      selectedAssets.hashCode ^
-      lockedSelectionAssets.hashCode ^
-      forceEnable.hashCode;
+  int get hashCode => selectedAssets.hashCode ^ lockedSelectionAssets.hashCode ^ forceEnable.hashCode;
 }
 
 class MultiSelectNotifier extends Notifier<MultiSelectState> {
@@ -155,8 +148,7 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
     if (bucketAssets.isEmpty) return;
 
     // Check if all assets in this bucket are currently selected
-    final allSelected =
-        bucketAssets.every((asset) => state.selectedAssets.contains(asset));
+    final allSelected = bucketAssets.every((asset) => state.selectedAssets.contains(asset));
 
     final selectedAssets = state.selectedAssets.toSet();
 
@@ -180,8 +172,7 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
 
 final bucketSelectionProvider = Provider.family<bool, List<BaseAsset>>(
   (ref, bucketAssets) {
-    final selectedAssets =
-        ref.watch(multiSelectProvider.select((s) => s.selectedAssets));
+    final selectedAssets = ref.watch(multiSelectProvider.select((s) => s.selectedAssets));
 
     if (bucketAssets.isEmpty) return false;
 
diff --git a/mobile/lib/providers/upload_profile_image.provider.dart b/mobile/lib/providers/upload_profile_image.provider.dart
index fe13944ef6..0588b31b68 100644
--- a/mobile/lib/providers/upload_profile_image.provider.dart
+++ b/mobile/lib/providers/upload_profile_image.provider.dart
@@ -50,28 +50,23 @@ class UploadProfileImageState {
 
   String toJson() => json.encode(toMap());
 
-  factory UploadProfileImageState.fromJson(String source) =>
-      UploadProfileImageState.fromMap(json.decode(source));
+  factory UploadProfileImageState.fromJson(String source) => UploadProfileImageState.fromMap(json.decode(source));
 
   @override
-  String toString() =>
-      'UploadProfileImageState(status: $status, profileImagePath: $profileImagePath)';
+  String toString() => 'UploadProfileImageState(status: $status, profileImagePath: $profileImagePath)';
 
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
 
-    return other is UploadProfileImageState &&
-        other.status == status &&
-        other.profileImagePath == profileImagePath;
+    return other is UploadProfileImageState && other.status == status && other.profileImagePath == profileImagePath;
   }
 
   @override
   int get hashCode => status.hashCode ^ profileImagePath.hashCode;
 }
 
-class UploadProfileImageNotifier
-    extends StateNotifier<UploadProfileImageState> {
+class UploadProfileImageNotifier extends StateNotifier<UploadProfileImageState> {
   UploadProfileImageNotifier(this._userService)
       : super(
           const UploadProfileImageState(
@@ -104,7 +99,6 @@ class UploadProfileImageNotifier
   }
 }
 
-final uploadProfileImageProvider =
-    StateNotifierProvider<UploadProfileImageNotifier, UploadProfileImageState>(
+final uploadProfileImageProvider = StateNotifierProvider<UploadProfileImageNotifier, UploadProfileImageState>(
   ((ref) => UploadProfileImageNotifier(ref.watch(userServiceProvider))),
 );
diff --git a/mobile/lib/providers/user.provider.dart b/mobile/lib/providers/user.provider.dart
index 1a1c21554c..10dcb2aff5 100644
--- a/mobile/lib/providers/user.provider.dart
+++ b/mobile/lib/providers/user.provider.dart
@@ -10,8 +10,7 @@ import 'package:immich_mobile/services/timeline.service.dart';
 class CurrentUserProvider extends StateNotifier<UserDto?> {
   CurrentUserProvider(this._userService) : super(null) {
     state = _userService.tryGetMyUser();
-    streamSub =
-        _userService.watchMyUser().listen((user) => state = user ?? state);
+    streamSub = _userService.watchMyUser().listen((user) => state = user ?? state);
   }
 
   final UserService _userService;
@@ -30,8 +29,7 @@ class CurrentUserProvider extends StateNotifier<UserDto?> {
   }
 }
 
-final currentUserProvider =
-    StateNotifierProvider<CurrentUserProvider, UserDto?>((ref) {
+final currentUserProvider = StateNotifierProvider<CurrentUserProvider, UserDto?>((ref) {
   return CurrentUserProvider(ref.watch(userServiceProvider));
 });
 
@@ -56,7 +54,6 @@ class TimelineUserIdsProvider extends StateNotifier<List<String>> {
   }
 }
 
-final timelineUsersIdsProvider =
-    StateNotifierProvider<TimelineUserIdsProvider, List<String>>((ref) {
+final timelineUsersIdsProvider = StateNotifierProvider<TimelineUserIdsProvider, List<String>>((ref) {
   return TimelineUserIdsProvider(ref.watch(timelineServiceProvider));
 });
diff --git a/mobile/lib/providers/websocket.provider.dart b/mobile/lib/providers/websocket.provider.dart
index 2718738286..6c24cc0568 100644
--- a/mobile/lib/providers/websocket.provider.dart
+++ b/mobile/lib/providers/websocket.provider.dart
@@ -78,16 +78,13 @@ class WebsocketState {
   }
 
   @override
-  String toString() =>
-      'WebsocketState(socket: $socket, isConnected: $isConnected)';
+  String toString() => 'WebsocketState(socket: $socket, isConnected: $isConnected)';
 
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
 
-    return other is WebsocketState &&
-        other.socket == socket &&
-        other.isConnected == isConnected;
+    return other is WebsocketState && other.socket == socket && other.isConnected == isConnected;
   }
 
   @override
@@ -106,8 +103,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
 
   final _log = Logger('WebsocketNotifier');
   final Ref _ref;
-  final Debouncer _debounce =
-      Debouncer(interval: const Duration(milliseconds: 500));
+  final Debouncer _debounce = Debouncer(interval: const Duration(milliseconds: 500));
 
   final Debouncer _batchDebouncer = Debouncer(
     interval: const Duration(seconds: 5),
@@ -131,8 +127,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
         final endpoint = Uri.parse(Store.get(StoreKey.serverEndpoint));
         final headers = ApiService.getRequestHeaders();
         if (endpoint.userInfo.isNotEmpty) {
-          headers["Authorization"] =
-              "Basic ${base64.encode(utf8.encode(endpoint.userInfo))}";
+          headers["Authorization"] = "Basic ${base64.encode(utf8.encode(endpoint.userInfo))}";
         }
 
         debugPrint("Attempting to connect to websocket");
@@ -262,49 +257,34 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
   }
 
   Future<void> _handlePendingTrashes() async {
-    final trashChanges = state.pendingChanges
-        .where((c) => c.action == PendingAction.assetTrash)
-        .toList();
+    final trashChanges = state.pendingChanges.where((c) => c.action == PendingAction.assetTrash).toList();
     if (trashChanges.isNotEmpty) {
-      List<String> remoteIds = trashChanges
-          .expand((a) => (a.value as List).map((e) => e.toString()))
-          .toList();
+      List<String> remoteIds = trashChanges.expand((a) => (a.value as List).map((e) => e.toString())).toList();
 
       await _ref.read(syncServiceProvider).handleRemoteAssetRemoval(remoteIds);
       await _ref.read(assetProvider.notifier).getAllAsset();
 
       state = state.copyWith(
-        pendingChanges: state.pendingChanges
-            .whereNot((c) => trashChanges.contains(c))
-            .toList(),
+        pendingChanges: state.pendingChanges.whereNot((c) => trashChanges.contains(c)).toList(),
       );
     }
   }
 
   Future<void> _handlePendingDeletes() async {
-    final deleteChanges = state.pendingChanges
-        .where((c) => c.action == PendingAction.assetDelete)
-        .toList();
+    final deleteChanges = state.pendingChanges.where((c) => c.action == PendingAction.assetDelete).toList();
     if (deleteChanges.isNotEmpty) {
-      List<String> remoteIds =
-          deleteChanges.map((a) => a.value.toString()).toList();
+      List<String> remoteIds = deleteChanges.map((a) => a.value.toString()).toList();
       await _ref.read(syncServiceProvider).handleRemoteAssetRemoval(remoteIds);
       state = state.copyWith(
-        pendingChanges: state.pendingChanges
-            .whereNot((c) => deleteChanges.contains(c))
-            .toList(),
+        pendingChanges: state.pendingChanges.whereNot((c) => deleteChanges.contains(c)).toList(),
       );
     }
   }
 
   Future<void> _handlePendingUploaded() async {
-    final uploadedChanges = state.pendingChanges
-        .where((c) => c.action == PendingAction.assetUploaded)
-        .toList();
+    final uploadedChanges = state.pendingChanges.where((c) => c.action == PendingAction.assetUploaded).toList();
     if (uploadedChanges.isNotEmpty) {
-      List<AssetResponseDto?> remoteAssets = uploadedChanges
-          .map((a) => AssetResponseDto.fromJson(a.value))
-          .toList();
+      List<AssetResponseDto?> remoteAssets = uploadedChanges.map((a) => AssetResponseDto.fromJson(a.value)).toList();
       for (final dto in remoteAssets) {
         if (dto != null) {
           final newAsset = Asset.remote(dto);
@@ -312,27 +292,20 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
         }
       }
       state = state.copyWith(
-        pendingChanges: state.pendingChanges
-            .whereNot((c) => uploadedChanges.contains(c))
-            .toList(),
+        pendingChanges: state.pendingChanges.whereNot((c) => uploadedChanges.contains(c)).toList(),
       );
     }
   }
 
   Future<void> _handlingPendingHidden() async {
-    final hiddenChanges = state.pendingChanges
-        .where((c) => c.action == PendingAction.assetHidden)
-        .toList();
+    final hiddenChanges = state.pendingChanges.where((c) => c.action == PendingAction.assetHidden).toList();
     if (hiddenChanges.isNotEmpty) {
-      List<String> remoteIds =
-          hiddenChanges.map((a) => a.value.toString()).toList();
+      List<String> remoteIds = hiddenChanges.map((a) => a.value.toString()).toList();
       final db = _ref.watch(dbProvider);
       await db.writeTxn(() => db.assets.deleteAllByRemoteId(remoteIds));
 
       state = state.copyWith(
-        pendingChanges: state.pendingChanges
-            .whereNot((c) => hiddenChanges.contains(c))
-            .toList(),
+        pendingChanges: state.pendingChanges.whereNot((c) => hiddenChanges.contains(c)).toList(),
       );
     }
   }
@@ -354,18 +327,15 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     _ref.read(assetProvider.notifier).getAllAsset();
   }
 
-  void _handleOnUploadSuccess(dynamic data) =>
-      addPendingChange(PendingAction.assetUploaded, data);
+  void _handleOnUploadSuccess(dynamic data) => addPendingChange(PendingAction.assetUploaded, data);
 
-  void _handleOnAssetDelete(dynamic data) =>
-      addPendingChange(PendingAction.assetDelete, data);
+  void _handleOnAssetDelete(dynamic data) => addPendingChange(PendingAction.assetDelete, data);
 
   void _handleOnAssetTrash(dynamic data) {
     addPendingChange(PendingAction.assetTrash, data);
   }
 
-  void _handleOnAssetHidden(dynamic data) =>
-      addPendingChange(PendingAction.assetHidden, data);
+  void _handleOnAssetHidden(dynamic data) => addPendingChange(PendingAction.assetHidden, data);
 
   _handleReleaseUpdates(dynamic data) {
     // Json guard
@@ -374,27 +344,21 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     }
 
     final json = data.cast<String, dynamic>();
-    final serverVersionJson =
-        json.containsKey('serverVersion') ? json['serverVersion'] : null;
-    final releaseVersionJson =
-        json.containsKey('releaseVersion') ? json['releaseVersion'] : null;
+    final serverVersionJson = json.containsKey('serverVersion') ? json['serverVersion'] : null;
+    final releaseVersionJson = json.containsKey('releaseVersion') ? json['releaseVersion'] : null;
     if (serverVersionJson == null || releaseVersionJson == null) {
       return;
     }
 
-    final serverVersionDto =
-        ServerVersionResponseDto.fromJson(serverVersionJson);
-    final releaseVersionDto =
-        ServerVersionResponseDto.fromJson(releaseVersionJson);
+    final serverVersionDto = ServerVersionResponseDto.fromJson(serverVersionJson);
+    final releaseVersionDto = ServerVersionResponseDto.fromJson(releaseVersionJson);
     if (serverVersionDto == null || releaseVersionDto == null) {
       return;
     }
 
     final serverVersion = ServerVersion.fromDto(serverVersionDto);
     final releaseVersion = ServerVersion.fromDto(releaseVersionDto);
-    _ref
-        .read(serverInfoProvider.notifier)
-        .handleNewRelease(serverVersion, releaseVersion);
+    _ref.read(serverInfoProvider.notifier).handleNewRelease(serverVersion, releaseVersion);
   }
 
   void _handleSyncAssetUploadReady(dynamic data) {
@@ -409,9 +373,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
 
     try {
       unawaited(
-        _ref
-            .read(backgroundSyncProvider)
-            .syncWebsocketBatch(_batchedAssetUploadReady.toList()),
+        _ref.read(backgroundSyncProvider).syncWebsocketBatch(_batchedAssetUploadReady.toList()),
       );
     } catch (error) {
       _log.severe("Error processing batched AssetUploadReadyV1 events: $error");
@@ -421,7 +383,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
   }
 }
 
-final websocketProvider =
-    StateNotifierProvider<WebsocketNotifier, WebsocketState>((ref) {
+final websocketProvider = StateNotifierProvider<WebsocketNotifier, WebsocketState>((ref) {
   return WebsocketNotifier(ref);
 });
diff --git a/mobile/lib/repositories/activity_api.repository.dart b/mobile/lib/repositories/activity_api.repository.dart
index 1ee92b2e2f..36f380cba7 100644
--- a/mobile/lib/repositories/activity_api.repository.dart
+++ b/mobile/lib/repositories/activity_api.repository.dart
@@ -15,8 +15,7 @@ class ActivityApiRepository extends ApiRepository {
   ActivityApiRepository(this._api);
 
   Future<List<Activity>> getAll(String albumId, {String? assetId}) async {
-    final response =
-        await checkNull(_api.getActivities(albumId, assetId: assetId));
+    final response = await checkNull(_api.getActivities(albumId, assetId: assetId));
     return response.map(_toActivity).toList();
   }
 
@@ -28,9 +27,7 @@ class ActivityApiRepository extends ApiRepository {
   }) async {
     final dto = ActivityCreateDto(
       albumId: albumId,
-      type: type == ActivityType.comment
-          ? ReactionType.comment
-          : ReactionType.like,
+      type: type == ActivityType.comment ? ReactionType.comment : ReactionType.like,
       assetId: assetId,
       comment: comment,
     );
@@ -43,17 +40,14 @@ class ActivityApiRepository extends ApiRepository {
   }
 
   Future<ActivityStats> getStats(String albumId, {String? assetId}) async {
-    final response =
-        await checkNull(_api.getActivityStatistics(albumId, assetId: assetId));
+    final response = await checkNull(_api.getActivityStatistics(albumId, assetId: assetId));
     return ActivityStats(comments: response.comments);
   }
 
   static Activity _toActivity(ActivityResponseDto dto) => Activity(
         id: dto.id,
         createdAt: dto.createdAt,
-        type: dto.type == ReactionType.comment
-            ? ActivityType.comment
-            : ActivityType.like,
+        type: dto.type == ReactionType.comment ? ActivityType.comment : ActivityType.like,
         user: UserConverter.fromSimpleUserDto(dto.user),
         assetId: dto.assetId,
         comment: dto.comment,
diff --git a/mobile/lib/repositories/album.repository.dart b/mobile/lib/repositories/album.repository.dart
index 1d0349bb2a..c65dce325d 100644
--- a/mobile/lib/repositories/album.repository.dart
+++ b/mobile/lib/repositories/album.repository.dart
@@ -4,8 +4,7 @@ import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
-    as entity;
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity;
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/repositories/database.repository.dart';
@@ -14,8 +13,7 @@ import 'package:isar/isar.dart';
 
 enum AlbumSort { remoteId, localId }
 
-final albumRepositoryProvider =
-    Provider((ref) => AlbumRepository(ref.watch(dbProvider)));
+final albumRepositoryProvider = Provider((ref) => AlbumRepository(ref.watch(dbProvider)));
 
 class AlbumRepository extends DatabaseRepository {
   const AlbumRepository(super.db);
@@ -75,8 +73,7 @@ class AlbumRepository extends DatabaseRepository {
     } else {
       afterWhere = baseQuery.localIdIsNotNull();
     }
-    QueryBuilder<Album, Album, QAfterFilterCondition> filterQuery =
-        afterWhere.filter().noOp();
+    QueryBuilder<Album, Album, QAfterFilterCondition> filterQuery = afterWhere.filter().noOp();
     if (shared != null) {
       filterQuery = filterQuery.sharedEqualTo(true);
     }
@@ -101,34 +98,27 @@ class AlbumRepository extends DatabaseRepository {
         () => album.sharedUsers.update(unlink: users.map(entity.User.fromDto)),
       );
 
-  Future<void> addAssets(Album album, List<Asset> assets) =>
-      txn(() => album.assets.update(link: assets));
+  Future<void> addAssets(Album album, List<Asset> assets) => txn(() => album.assets.update(link: assets));
 
-  Future<void> removeAssets(Album album, List<Asset> assets) =>
-      txn(() => album.assets.update(unlink: assets));
+  Future<void> removeAssets(Album album, List<Asset> assets) => txn(() => album.assets.update(unlink: assets));
 
   Future<Album> recalculateMetadata(Album album) async {
     album.startDate = await album.assets.filter().fileCreatedAtProperty().min();
     album.endDate = await album.assets.filter().fileCreatedAtProperty().max();
-    album.lastModifiedAssetTimestamp =
-        await album.assets.filter().updatedAtProperty().max();
+    album.lastModifiedAssetTimestamp = await album.assets.filter().updatedAtProperty().max();
     return album;
   }
 
   Future<void> addUsers(Album album, List<UserDto> users) =>
       txn(() => album.sharedUsers.update(link: users.map(entity.User.fromDto)));
 
-  Future<void> deleteAllLocal() =>
-      txn(() => db.albums.where().localIdIsNotNull().deleteAll());
+  Future<void> deleteAllLocal() => txn(() => db.albums.where().localIdIsNotNull().deleteAll());
 
   Future<List<Album>> search(
     String searchTerm,
     QuickFilterMode filterMode,
   ) async {
-    var query = db.albums
-        .filter()
-        .nameContains(searchTerm, caseSensitive: false)
-        .remoteIdIsNotNull();
+    var query = db.albums.filter().nameContains(searchTerm, caseSensitive: false).remoteIdIsNotNull();
     final isarUserId = fastHash(Store.get(StoreKey.currentUser).id);
 
     switch (filterMode) {
diff --git a/mobile/lib/repositories/album_api.repository.dart b/mobile/lib/repositories/album_api.repository.dart
index 20365534c2..b5b7c72883 100644
--- a/mobile/lib/repositories/album_api.repository.dart
+++ b/mobile/lib/repositories/album_api.repository.dart
@@ -1,11 +1,9 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/album/album.model.dart'
-    show AlbumAssetOrder, RemoteAlbum;
+import 'package:immich_mobile/domain/models/album/album.model.dart' show AlbumAssetOrder, RemoteAlbum;
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
-    as entity;
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity;
 import 'package:immich_mobile/infrastructure/utils/user.converter.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/api.repository.dart';
@@ -150,8 +148,7 @@ class AlbumApiRepository extends ApiRepository {
   }
 
   Future<Album> addUsers(String albumId, Iterable<String> userIds) async {
-    final albumUsers =
-        userIds.map((userId) => AlbumUserAddDto(userId: userId)).toList();
+    final albumUsers = userIds.map((userId) => AlbumUserAddDto(userId: userId)).toList();
     final response = await checkNull(
       _api.addUsersToAlbum(
         albumId,
@@ -180,11 +177,9 @@ class AlbumApiRepository extends ApiRepository {
       sortOrder: dto.order == AssetOrder.asc ? SortOrder.asc : SortOrder.desc,
     );
     album.remoteAssetCount = dto.assetCount;
-    album.owner.value =
-        entity.User.fromDto(UserConverter.fromSimpleUserDto(dto.owner));
+    album.owner.value = entity.User.fromDto(UserConverter.fromSimpleUserDto(dto.owner));
     album.remoteThumbnailAssetId = dto.albumThumbnailAssetId;
-    final users = dto.albumUsers
-        .map((albumUser) => UserConverter.fromSimpleUserDto(albumUser.user));
+    final users = dto.albumUsers.map((albumUser) => UserConverter.fromSimpleUserDto(albumUser.user));
     album.sharedUsers.addAll(users.map(entity.User.fromDto));
     final assets = dto.assets.map(Asset.remote).toList();
     album.assets.addAll(assets);
@@ -202,9 +197,7 @@ class AlbumApiRepository extends ApiRepository {
       updatedAt: dto.updatedAt,
       thumbnailAssetId: dto.albumThumbnailAssetId,
       isActivityEnabled: dto.isActivityEnabled,
-      order: dto.order == AssetOrder.asc
-          ? AlbumAssetOrder.asc
-          : AlbumAssetOrder.desc,
+      order: dto.order == AssetOrder.asc ? AlbumAssetOrder.asc : AlbumAssetOrder.desc,
       assetCount: dto.assetCount,
       ownerName: dto.owner.name,
     );
diff --git a/mobile/lib/repositories/album_media.repository.dart b/mobile/lib/repositories/album_media.repository.dart
index 94f1d0581e..6e9dda173c 100644
--- a/mobile/lib/repositories/album_media.repository.dart
+++ b/mobile/lib/repositories/album_media.repository.dart
@@ -7,14 +7,12 @@ import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:photo_manager/photo_manager.dart' hide AssetType;
 
-final albumMediaRepositoryProvider =
-    Provider((ref) => const AlbumMediaRepository());
+final albumMediaRepositoryProvider = Provider((ref) => const AlbumMediaRepository());
 
 class AlbumMediaRepository {
   const AlbumMediaRepository();
 
-  bool get useCustomFilter =>
-      Store.get(StoreKey.photoManagerCustomFilter, true);
+  bool get useCustomFilter => Store.get(StoreKey.photoManagerCustomFilter, true);
 
   FilterOptionGroup? _getAlbumFilter({
     DateTimeCond? updateTimeCond,
@@ -34,8 +32,7 @@ class AlbumMediaRepository {
               ),
               containsPathModified: containsPathModified ?? false,
               createTimeCond: DateTimeCond.def().copyWith(ignore: true),
-              updateTimeCond:
-                  updateTimeCond ?? DateTimeCond.def().copyWith(ignore: true),
+              updateTimeCond: updateTimeCond ?? DateTimeCond.def().copyWith(ignore: true),
               orders: orderBy ?? [],
             )
           : null;
@@ -51,16 +48,13 @@ class AlbumMediaRepository {
   }
 
   Future<List<String>> getAssetIds(String albumId) async {
-    final album =
-        await AssetPathEntity.fromId(albumId, filterOption: _getAlbumFilter());
-    final List<AssetEntity> assets =
-        await album.getAssetListRange(start: 0, end: 0x7fffffffffffffff);
+    final album = await AssetPathEntity.fromId(albumId, filterOption: _getAlbumFilter());
+    final List<AssetEntity> assets = await album.getAssetListRange(start: 0, end: 0x7fffffffffffffff);
     return assets.map((e) => e.id).toList();
   }
 
   Future<int> getAssetCount(String albumId) async {
-    final album =
-        await AssetPathEntity.fromId(albumId, filterOption: _getAlbumFilter());
+    final album = await AssetPathEntity.fromId(albumId, filterOption: _getAlbumFilter());
     return album.assetCountAsync;
   }
 
@@ -81,14 +75,11 @@ class AlbumMediaRepository {
                 min: modifiedFrom ?? DateTime.utc(-271820),
                 max: modifiedUntil ?? DateTime.utc(275760),
               ),
-        orderBy: orderByModificationDate
-            ? [const OrderOption(type: OrderOptionType.updateDate)]
-            : [],
+        orderBy: orderByModificationDate ? [const OrderOption(type: OrderOptionType.updateDate)] : [],
       ),
     );
 
-    final List<AssetEntity> assets =
-        await onDevice.getAssetListRange(start: start, end: end);
+    final List<AssetEntity> assets = await onDevice.getAssetListRange(start: start, end: end);
     return assets.map(AssetMediaRepository.toAsset).toList().cast();
   }
 
@@ -103,10 +94,8 @@ class AlbumMediaRepository {
   static Album _toAlbum(AssetPathEntity assetPathEntity) {
     final Album album = Album(
       name: assetPathEntity.name,
-      createdAt:
-          assetPathEntity.lastModified?.toUtc() ?? DateTime.now().toUtc(),
-      modifiedAt:
-          assetPathEntity.lastModified?.toUtc() ?? DateTime.now().toUtc(),
+      createdAt: assetPathEntity.lastModified?.toUtc() ?? DateTime.now().toUtc(),
+      modifiedAt: assetPathEntity.lastModified?.toUtc() ?? DateTime.now().toUtc(),
       shared: false,
       activityEnabled: false,
     );
diff --git a/mobile/lib/repositories/asset.repository.dart b/mobile/lib/repositories/asset.repository.dart
index 1e3defae08..2b35364596 100644
--- a/mobile/lib/repositories/asset.repository.dart
+++ b/mobile/lib/repositories/asset.repository.dart
@@ -11,8 +11,7 @@ import 'package:isar/isar.dart';
 
 enum AssetSort { checksum, ownerIdChecksum }
 
-final assetRepositoryProvider =
-    Provider((ref) => AssetRepository(ref.watch(dbProvider)));
+final assetRepositoryProvider = Provider((ref) => AssetRepository(ref.watch(dbProvider)));
 
 class AssetRepository extends DatabaseRepository {
   const AssetRepository(super.db);
@@ -29,8 +28,7 @@ class AssetRepository extends DatabaseRepository {
     if (notOwnedBy.length == 1) {
       query = query.not().ownerIdEqualTo(isarUserIds.first);
     } else if (notOwnedBy.isNotEmpty) {
-      query =
-          query.not().anyOf(isarUserIds, (q, int id) => q.ownerIdEqualTo(id));
+      query = query.not().anyOf(isarUserIds, (q, int id) => q.ownerIdEqualTo(id));
     }
     if (ownerId != null) {
       query = query.ownerIdEqualTo(fastHash(ownerId));
@@ -44,8 +42,7 @@ class AssetRepository extends DatabaseRepository {
       };
     }
 
-    final QueryBuilder<Asset, Asset, QAfterSortBy> sortedQuery =
-        switch (sortBy) {
+    final QueryBuilder<Asset, Asset, QAfterSortBy> sortedQuery = switch (sortBy) {
       null => query.noOp(),
       AssetSort.checksum => query.sortByChecksum(),
       AssetSort.ownerIdChecksum => query.sortByOwnerId().thenByChecksum(),
@@ -93,31 +90,18 @@ class AssetRepository extends DatabaseRepository {
   }) {
     final baseQuery = db.assets.where();
     final isarUserIds = fastHash(ownerId);
-    final QueryBuilder<Asset, Asset, QAfterFilterCondition> filteredQuery =
-        switch (state) {
+    final QueryBuilder<Asset, Asset, QAfterFilterCondition> filteredQuery = switch (state) {
       null => baseQuery.ownerIdEqualToAnyChecksum(isarUserIds).noOp(),
-      AssetState.local => baseQuery
-          .remoteIdIsNull()
-          .filter()
-          .localIdIsNotNull()
-          .ownerIdEqualTo(isarUserIds),
-      AssetState.remote => baseQuery
-          .localIdIsNull()
-          .filter()
-          .remoteIdIsNotNull()
-          .ownerIdEqualTo(isarUserIds),
-      AssetState.merged => baseQuery
-          .ownerIdEqualToAnyChecksum(isarUserIds)
-          .filter()
-          .remoteIdIsNotNull()
-          .localIdIsNotNull(),
+      AssetState.local => baseQuery.remoteIdIsNull().filter().localIdIsNotNull().ownerIdEqualTo(isarUserIds),
+      AssetState.remote => baseQuery.localIdIsNull().filter().remoteIdIsNotNull().ownerIdEqualTo(isarUserIds),
+      AssetState.merged =>
+        baseQuery.ownerIdEqualToAnyChecksum(isarUserIds).filter().remoteIdIsNotNull().localIdIsNotNull(),
     };
 
     final QueryBuilder<Asset, Asset, QAfterSortBy> query = switch (sortBy) {
       null => filteredQuery.noOp(),
       AssetSort.checksum => filteredQuery.sortByChecksum(),
-      AssetSort.ownerIdChecksum =>
-        filteredQuery.sortByOwnerId().thenByChecksum(),
+      AssetSort.ownerIdChecksum => filteredQuery.sortByOwnerId().thenByChecksum(),
     };
 
     return limit == null ? query.findAll() : query.limit(limit).findAll();
@@ -135,15 +119,11 @@ class AssetRepository extends DatabaseRepository {
     int limit = 100,
   }) {
     final baseQuery = db.assets.where();
-    final QueryBuilder<Asset, Asset, QAfterFilterCondition> query =
-        switch (state) {
+    final QueryBuilder<Asset, Asset, QAfterFilterCondition> query = switch (state) {
       null => baseQuery.noOp(),
-      AssetState.local =>
-        baseQuery.remoteIdIsNull().filter().localIdIsNotNull(),
-      AssetState.remote =>
-        baseQuery.localIdIsNull().filter().remoteIdIsNotNull(),
-      AssetState.merged =>
-        baseQuery.localIdIsNotNull().filter().remoteIdIsNotNull(),
+      AssetState.local => baseQuery.remoteIdIsNull().filter().localIdIsNotNull(),
+      AssetState.remote => baseQuery.localIdIsNull().filter().remoteIdIsNotNull(),
+      AssetState.merged => baseQuery.localIdIsNotNull().filter().remoteIdIsNotNull(),
     };
     return _getMatchesImpl(query, fastHash(ownerId), assets, limit);
   }
@@ -154,12 +134,10 @@ class AssetRepository extends DatabaseRepository {
   }
 
   Future<void> upsertDuplicatedAssets(Iterable<String> duplicatedAssets) => txn(
-        () => db.duplicatedAssets
-            .putAll(duplicatedAssets.map(DuplicatedAsset.new).toList()),
+        () => db.duplicatedAssets.putAll(duplicatedAssets.map(DuplicatedAsset.new).toList()),
       );
 
-  Future<List<String>> getAllDuplicatedAssetIds() =>
-      db.duplicatedAssets.where().idProperty().findAll();
+  Future<List<String>> getAllDuplicatedAssetIds() => db.duplicatedAssets.where().idProperty().findAll();
 
   Future<Asset?> getByOwnerIdChecksum(int ownerId, String checksum) =>
       db.assets.getByOwnerIdChecksum(ownerId, checksum);
@@ -170,8 +148,7 @@ class AssetRepository extends DatabaseRepository {
   ) =>
       db.assets.getAllByOwnerIdChecksum(ownerIds, checksums);
 
-  Future<List<Asset>> getAllLocal() =>
-      db.assets.where().localIdIsNotNull().findAll();
+  Future<List<Asset>> getAllLocal() => db.assets.where().localIdIsNotNull().findAll();
 
   Future<void> deleteAllByRemoteId(List<String> ids, {AssetState? state}) =>
       txn(() => _getAllByRemoteIdImpl(ids, state).deleteAll());
diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dart
index 6d08b4f0d9..b85ebdea6b 100644
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -99,8 +99,7 @@ class AssetApiRepository extends ApiRepository {
   }
 
   Future<StackResponse> stack(List<String> ids) async {
-    final responseDto =
-        await checkNull(_stacksApi.createStack(StackCreateDto(assetIds: ids)));
+    final responseDto = await checkNull(_stacksApi.createStack(StackCreateDto(assetIds: ids)));
 
     return responseDto.toStack();
   }
diff --git a/mobile/lib/repositories/asset_media.repository.dart b/mobile/lib/repositories/asset_media.repository.dart
index 8708ce9cfd..1355890766 100644
--- a/mobile/lib/repositories/asset_media.repository.dart
+++ b/mobile/lib/repositories/asset_media.repository.dart
@@ -24,8 +24,7 @@ class AssetMediaRepository {
 
   const AssetMediaRepository(this._assetApiRepository);
 
-  Future<List<String>> deleteAll(List<String> ids) =>
-      PhotoManager.editor.deleteWithIds(ids);
+  Future<List<String>> deleteAll(List<String> ids) => PhotoManager.editor.deleteWithIds(ids);
 
   Future<asset_entity.Asset?> get(String id) async {
     final entity = await AssetEntity.fromId(id);
@@ -52,8 +51,7 @@ class AssetMediaRepository {
       asset.fileCreatedAt = asset.fileModifiedAt;
     }
     if (local.latitude != null) {
-      asset.exifInfo =
-          ExifInfo(latitude: local.latitude, longitude: local.longitude);
+      asset.exifInfo = ExifInfo(latitude: local.latitude, longitude: local.longitude);
     }
     asset.local = local;
     return asset;
@@ -82,9 +80,7 @@ class AssetMediaRepository {
               ? asset.localId
               : null;
       if (localId != null) {
-        File? f =
-            await AssetEntity(id: localId, width: 1, height: 1, typeInt: 0)
-                .originFile;
+        File? f = await AssetEntity(id: localId, width: 1, height: 1, typeInt: 0).originFile;
         downloadedXFiles.add(XFile(f!.path));
       } else if (asset is RemoteAsset) {
         final tempDir = await getTemporaryDirectory();
@@ -119,8 +115,6 @@ class AssetMediaRepository {
         _log.warning("Failed to delete temporary file: ${file.path}", e);
       }
     }
-    return result.status == ShareResultStatus.success
-        ? downloadedXFiles.length
-        : 0;
+    return result.status == ShareResultStatus.success ? downloadedXFiles.length : 0;
   }
 }
diff --git a/mobile/lib/repositories/auth.repository.dart b/mobile/lib/repositories/auth.repository.dart
index 1c51cedf96..9d7748254d 100644
--- a/mobile/lib/repositories/auth.repository.dart
+++ b/mobile/lib/repositories/auth.repository.dart
@@ -80,8 +80,7 @@ class AuthRepository extends DatabaseRepository {
     }
 
     final List<dynamic> jsonList = jsonDecode(jsonString);
-    final endpointList =
-        jsonList.map((e) => AuxilaryEndpoint.fromJson(e)).toList();
+    final endpointList = jsonList.map((e) => AuxilaryEndpoint.fromJson(e)).toList();
 
     return endpointList;
   }
diff --git a/mobile/lib/repositories/auth_api.repository.dart b/mobile/lib/repositories/auth_api.repository.dart
index 4b68867506..992be918f9 100644
--- a/mobile/lib/repositories/auth_api.repository.dart
+++ b/mobile/lib/repositories/auth_api.repository.dart
@@ -5,8 +5,7 @@ import 'package:immich_mobile/repositories/api.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:openapi/api.dart';
 
-final authApiRepositoryProvider =
-    Provider((ref) => AuthApiRepository(ref.watch(apiServiceProvider)));
+final authApiRepositoryProvider = Provider((ref) => AuthApiRepository(ref.watch(apiServiceProvider)));
 
 class AuthApiRepository extends ApiRepository {
   final ApiService _apiService;
@@ -35,9 +34,7 @@ class AuthApiRepository extends ApiRepository {
   }
 
   Future<void> logout() async {
-    await _apiService.authenticationApi
-        .logout()
-        .timeout(const Duration(seconds: 7));
+    await _apiService.authenticationApi.logout().timeout(const Duration(seconds: 7));
   }
 
   _mapLoginReponse(LoginResponseDto dto) {
@@ -54,8 +51,7 @@ class AuthApiRepository extends ApiRepository {
 
   Future<bool> unlockPinCode(String pinCode) async {
     try {
-      await _apiService.authenticationApi
-          .unlockAuthSession(SessionUnlockDto(pinCode: pinCode));
+      await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: pinCode));
       return true;
     } catch (_) {
       return false;
@@ -63,8 +59,7 @@ class AuthApiRepository extends ApiRepository {
   }
 
   Future<void> setupPinCode(String pinCode) {
-    return _apiService.authenticationApi
-        .setupPinCode(PinCodeSetupDto(pinCode: pinCode));
+    return _apiService.authenticationApi.setupPinCode(PinCodeSetupDto(pinCode: pinCode));
   }
 
   Future<void> lockPinCode() {
diff --git a/mobile/lib/repositories/backup.repository.dart b/mobile/lib/repositories/backup.repository.dart
index 05d2047add..6cee6a4427 100644
--- a/mobile/lib/repositories/backup.repository.dart
+++ b/mobile/lib/repositories/backup.repository.dart
@@ -6,16 +6,14 @@ import 'package:isar/isar.dart';
 
 enum BackupAlbumSort { id }
 
-final backupAlbumRepositoryProvider =
-    Provider((ref) => BackupAlbumRepository(ref.watch(dbProvider)));
+final backupAlbumRepositoryProvider = Provider((ref) => BackupAlbumRepository(ref.watch(dbProvider)));
 
 class BackupAlbumRepository extends DatabaseRepository {
   const BackupAlbumRepository(super.db);
 
   Future<List<BackupAlbum>> getAll({BackupAlbumSort? sort}) {
     final baseQuery = db.backupAlbums.where();
-    final QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> query =
-        switch (sort) {
+    final QueryBuilder<BackupAlbum, BackupAlbum, QAfterSortBy> query = switch (sort) {
       null => baseQuery.noOp(),
       BackupAlbumSort.id => baseQuery.sortById(),
     };
@@ -28,9 +26,7 @@ class BackupAlbumRepository extends DatabaseRepository {
   Future<List<BackupAlbum>> getAllBySelection(BackupSelection backup) =>
       db.backupAlbums.filter().selectionEqualTo(backup).findAll();
 
-  Future<void> deleteAll(List<int> ids) =>
-      txn(() => db.backupAlbums.deleteAll(ids));
+  Future<void> deleteAll(List<int> ids) => txn(() => db.backupAlbums.deleteAll(ids));
 
-  Future<void> updateAll(List<BackupAlbum> backupAlbums) =>
-      txn(() => db.backupAlbums.putAll(backupAlbums));
+  Future<void> updateAll(List<BackupAlbum> backupAlbums) => txn(() => db.backupAlbums.putAll(backupAlbums));
 }
diff --git a/mobile/lib/repositories/biometric.repository.dart b/mobile/lib/repositories/biometric.repository.dart
index 94540c8249..b185501d19 100644
--- a/mobile/lib/repositories/biometric.repository.dart
+++ b/mobile/lib/repositories/biometric.repository.dart
@@ -3,8 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/models/auth/biometric_status.model.dart';
 import 'package:local_auth/local_auth.dart';
 
-final biometricRepositoryProvider =
-    Provider((ref) => BiometricRepository(LocalAuthentication()));
+final biometricRepositoryProvider = Provider((ref) => BiometricRepository(LocalAuthentication()));
 
 class BiometricRepository {
   final LocalAuthentication _localAuth;
@@ -12,10 +11,8 @@ class BiometricRepository {
   const BiometricRepository(this._localAuth);
 
   Future<BiometricStatus> getStatus() async {
-    final bool canAuthenticateWithBiometrics =
-        await _localAuth.canCheckBiometrics;
-    final bool canAuthenticate =
-        canAuthenticateWithBiometrics || await _localAuth.isDeviceSupported();
+    final bool canAuthenticateWithBiometrics = await _localAuth.canCheckBiometrics;
+    final bool canAuthenticate = canAuthenticateWithBiometrics || await _localAuth.isDeviceSupported();
     final availableBiometric = await _localAuth.getAvailableBiometrics();
 
     return BiometricStatus(
diff --git a/mobile/lib/repositories/database.repository.dart b/mobile/lib/repositories/database.repository.dart
index c644dae668..71c15e1c40 100644
--- a/mobile/lib/repositories/database.repository.dart
+++ b/mobile/lib/repositories/database.repository.dart
@@ -11,12 +11,10 @@ abstract class DatabaseRepository implements IDatabaseRepository {
 
   bool get inTxn => Zone.current[_zoneTxn] != null;
 
-  Future<T> txn<T>(Future<T> Function() callback) =>
-      inTxn ? callback() : transaction(callback);
+  Future<T> txn<T>(Future<T> Function() callback) => inTxn ? callback() : transaction(callback);
 
   @override
-  Future<T> transaction<T>(Future<T> Function() callback) =>
-      db.writeTxn(callback);
+  Future<T> transaction<T>(Future<T> Function() callback) => db.writeTxn(callback);
 }
 
 extension Asd<T> on QueryBuilder<T, dynamic, dynamic> {
diff --git a/mobile/lib/repositories/download.repository.dart b/mobile/lib/repositories/download.repository.dart
index a1ad4ee3d9..5908e31786 100644
--- a/mobile/lib/repositories/download.repository.dart
+++ b/mobile/lib/repositories/download.repository.dart
@@ -122,9 +122,7 @@ class DownloadRepository {
         taskId: livePhotoVideoId,
         url: url,
         headers: headers,
-        filename: asset.name
-            .toUpperCase()
-            .replaceAll(RegExp(r"\.(JPG|HEIC)$"), '.MOV'),
+        filename: asset.name.toUpperCase().replaceAll(RegExp(r"\.(JPG|HEIC)$"), '.MOV'),
         updates: Updates.statusAndProgress,
         group: kDownloadGroupLivePhoto,
         metaData: json.encode(_dummyMetadata),
diff --git a/mobile/lib/repositories/drift_album_api_repository.dart b/mobile/lib/repositories/drift_album_api_repository.dart
index 26b55fbef6..f56cc9fbed 100644
--- a/mobile/lib/repositories/drift_album_api_repository.dart
+++ b/mobile/lib/repositories/drift_album_api_repository.dart
@@ -85,8 +85,7 @@ class DriftAlbumApiRepository extends ApiRepository {
   }) async {
     AssetOrder? apiOrder;
     if (order != null) {
-      apiOrder =
-          order == AlbumAssetOrder.asc ? AssetOrder.asc : AssetOrder.desc;
+      apiOrder = order == AlbumAssetOrder.asc ? AssetOrder.asc : AssetOrder.desc;
     }
 
     final responseDto = await checkNull(
@@ -113,8 +112,7 @@ class DriftAlbumApiRepository extends ApiRepository {
     String albumId,
     Iterable<String> userIds,
   ) async {
-    final albumUsers =
-        userIds.map((userId) => AlbumUserAddDto(userId: userId)).toList();
+    final albumUsers = userIds.map((userId) => AlbumUserAddDto(userId: userId)).toList();
     final response = await checkNull(
       _api.addUsersToAlbum(
         albumId,
@@ -136,8 +134,7 @@ extension on AlbumResponseDto {
       updatedAt: updatedAt,
       thumbnailAssetId: albumThumbnailAssetId,
       isActivityEnabled: isActivityEnabled,
-      order:
-          order == AssetOrder.asc ? AlbumAssetOrder.asc : AlbumAssetOrder.desc,
+      order: order == AssetOrder.asc ? AlbumAssetOrder.asc : AlbumAssetOrder.desc,
       assetCount: assetCount,
       ownerName: owner.name,
     );
diff --git a/mobile/lib/repositories/etag.repository.dart b/mobile/lib/repositories/etag.repository.dart
index b8382efdfc..768d95b95c 100644
--- a/mobile/lib/repositories/etag.repository.dart
+++ b/mobile/lib/repositories/etag.repository.dart
@@ -4,8 +4,7 @@ import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/repositories/database.repository.dart';
 import 'package:isar/isar.dart';
 
-final etagRepositoryProvider =
-    Provider((ref) => ETagRepository(ref.watch(dbProvider)));
+final etagRepositoryProvider = Provider((ref) => ETagRepository(ref.watch(dbProvider)));
 
 class ETagRepository extends DatabaseRepository {
   const ETagRepository(super.db);
@@ -16,8 +15,7 @@ class ETagRepository extends DatabaseRepository {
 
   Future<void> upsertAll(List<ETag> etags) => txn(() => db.eTags.putAll(etags));
 
-  Future<void> deleteByIds(List<String> ids) =>
-      txn(() => db.eTags.deleteAllById(ids));
+  Future<void> deleteByIds(List<String> ids) => txn(() => db.eTags.deleteAllById(ids));
 
   Future<ETag?> getById(String id) => db.eTags.getById(id);
 
diff --git a/mobile/lib/repositories/file_media.repository.dart b/mobile/lib/repositories/file_media.repository.dart
index 2bccb05210..86f99e07dd 100644
--- a/mobile/lib/repositories/file_media.repository.dart
+++ b/mobile/lib/repositories/file_media.repository.dart
@@ -6,8 +6,7 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:photo_manager/photo_manager.dart' hide AssetType;
 
-final fileMediaRepositoryProvider =
-    Provider((ref) => const FileMediaRepository());
+final fileMediaRepositoryProvider = Provider((ref) => const FileMediaRepository());
 
 class FileMediaRepository {
   const FileMediaRepository();
@@ -66,9 +65,7 @@ class FileMediaRepository {
 
   Future<void> clearFileCache() => PhotoManager.clearFileCache();
 
-  Future<void> enableBackgroundAccess() =>
-      PhotoManager.setIgnorePermissionCheck(true);
+  Future<void> enableBackgroundAccess() => PhotoManager.setIgnorePermissionCheck(true);
 
-  Future<void> requestExtendedPermissions() =>
-      PhotoManager.requestPermissionExtend();
+  Future<void> requestExtendedPermissions() => PhotoManager.requestPermissionExtend();
 }
diff --git a/mobile/lib/repositories/gcast.repository.dart b/mobile/lib/repositories/gcast.repository.dart
index 11c149ab37..f896de2ab0 100644
--- a/mobile/lib/repositories/gcast.repository.dart
+++ b/mobile/lib/repositories/gcast.repository.dart
@@ -69,7 +69,6 @@ class GCastRepository {
   }
 
   Future<List<CastDevice>> listDestinations() async {
-    return await CastDiscoveryService()
-        .search(timeout: const Duration(seconds: 3));
+    return await CastDiscoveryService().search(timeout: const Duration(seconds: 3));
   }
 }
diff --git a/mobile/lib/repositories/local_files_manager.repository.dart b/mobile/lib/repositories/local_files_manager.repository.dart
index 35c59acc2f..519d79b49b 100644
--- a/mobile/lib/repositories/local_files_manager.repository.dart
+++ b/mobile/lib/repositories/local_files_manager.repository.dart
@@ -2,8 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/services/local_files_manager.service.dart';
 
 final localFilesManagerRepositoryProvider = Provider(
-  (ref) =>
-      LocalFilesManagerRepository(ref.watch(localFileManagerServiceProvider)),
+  (ref) => LocalFilesManagerRepository(ref.watch(localFileManagerServiceProvider)),
 );
 
 class LocalFilesManagerRepository {
diff --git a/mobile/lib/repositories/partner.repository.dart b/mobile/lib/repositories/partner.repository.dart
index eb41391ba2..23b6fadebb 100644
--- a/mobile/lib/repositories/partner.repository.dart
+++ b/mobile/lib/repositories/partner.repository.dart
@@ -1,7 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
-    as entity;
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity;
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/repositories/database.repository.dart';
 import 'package:isar/isar.dart';
@@ -14,21 +13,11 @@ class PartnerRepository extends DatabaseRepository {
   const PartnerRepository(super.db);
 
   Future<List<UserDto>> getSharedBy() async {
-    return (await db.users
-            .filter()
-            .isPartnerSharedByEqualTo(true)
-            .sortById()
-            .findAll())
-        .map((u) => u.toDto())
-        .toList();
+    return (await db.users.filter().isPartnerSharedByEqualTo(true).sortById().findAll()).map((u) => u.toDto()).toList();
   }
 
   Future<List<UserDto>> getSharedWith() async {
-    return (await db.users
-            .filter()
-            .isPartnerSharedWithEqualTo(true)
-            .sortById()
-            .findAll())
+    return (await db.users.filter().isPartnerSharedWithEqualTo(true).sortById().findAll())
         .map((u) => u.toDto())
         .toList();
   }
@@ -39,11 +28,7 @@ class PartnerRepository extends DatabaseRepository {
   }
 
   Stream<List<UserDto>> watchSharedWith() {
-    return (db.users
-            .filter()
-            .isPartnerSharedWithEqualTo(true)
-            .sortById()
-            .watch())
+    return (db.users.filter().isPartnerSharedWithEqualTo(true).sortById().watch())
         .map((users) => users.map((u) => u.toDto()).toList());
   }
 }
diff --git a/mobile/lib/repositories/partner_api.repository.dart b/mobile/lib/repositories/partner_api.repository.dart
index 836a708e3a..00de1ea2f1 100644
--- a/mobile/lib/repositories/partner_api.repository.dart
+++ b/mobile/lib/repositories/partner_api.repository.dart
@@ -24,9 +24,7 @@ class PartnerApiRepository extends ApiRepository {
   Future<List<UserDto>> getAll(Direction direction) async {
     final response = await checkNull(
       _api.getPartners(
-        direction == Direction.sharedByMe
-            ? PartnerDirection.by
-            : PartnerDirection.with_,
+        direction == Direction.sharedByMe ? PartnerDirection.by : PartnerDirection.with_,
       ),
     );
     return response.map(UserConverter.fromPartnerDto).toList();
diff --git a/mobile/lib/repositories/secure_storage.repository.dart b/mobile/lib/repositories/secure_storage.repository.dart
index 5660258a2d..9ae643a587 100644
--- a/mobile/lib/repositories/secure_storage.repository.dart
+++ b/mobile/lib/repositories/secure_storage.repository.dart
@@ -1,8 +1,7 @@
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-final secureStorageRepositoryProvider =
-    Provider((ref) => const SecureStorageRepository(FlutterSecureStorage()));
+final secureStorageRepositoryProvider = Provider((ref) => const SecureStorageRepository(FlutterSecureStorage()));
 
 class SecureStorageRepository {
   final FlutterSecureStorage _secureStorage;
diff --git a/mobile/lib/repositories/timeline.repository.dart b/mobile/lib/repositories/timeline.repository.dart
index ea4cb63753..1579300bc6 100644
--- a/mobile/lib/repositories/timeline.repository.dart
+++ b/mobile/lib/repositories/timeline.repository.dart
@@ -9,30 +9,17 @@ import 'package:immich_mobile/utils/hash.dart';
 import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
 import 'package:isar/isar.dart';
 
-final timelineRepositoryProvider =
-    Provider((ref) => TimelineRepository(ref.watch(dbProvider)));
+final timelineRepositoryProvider = Provider((ref) => TimelineRepository(ref.watch(dbProvider)));
 
 class TimelineRepository extends DatabaseRepository {
   const TimelineRepository(super.db);
 
   Future<List<String>> getTimelineUserIds(String id) {
-    return db.users
-        .filter()
-        .inTimelineEqualTo(true)
-        .or()
-        .idEqualTo(id)
-        .idProperty()
-        .findAll();
+    return db.users.filter().inTimelineEqualTo(true).or().idEqualTo(id).idProperty().findAll();
   }
 
   Stream<List<String>> watchTimelineUsers(String id) {
-    return db.users
-        .filter()
-        .inTimelineEqualTo(true)
-        .or()
-        .idEqualTo(id)
-        .idProperty()
-        .watch();
+    return db.users.filter().inTimelineEqualTo(true).or().idEqualTo(id).idProperty().watch();
   }
 
   Stream<RenderList> watchArchiveTimeline(String userId) {
@@ -65,11 +52,7 @@ class TimelineRepository extends DatabaseRepository {
     Album album,
     GroupAssetsBy groupAssetByOption,
   ) {
-    final query = album.assets
-        .filter()
-        .isTrashedEqualTo(false)
-        .not()
-        .visibilityEqualTo(AssetVisibilityEnum.locked);
+    final query = album.assets.filter().isTrashedEqualTo(false).not().visibilityEqualTo(AssetVisibilityEnum.locked);
 
     final withSortedOption = switch (album.sortOrder) {
       SortOrder.asc => query.sortByFileCreatedAt(),
@@ -80,11 +63,7 @@ class TimelineRepository extends DatabaseRepository {
   }
 
   Stream<RenderList> watchTrashTimeline(String userId) {
-    final query = db.assets
-        .filter()
-        .ownerIdEqualTo(fastHash(userId))
-        .isTrashedEqualTo(true)
-        .sortByFileCreatedAtDesc();
+    final query = db.assets.filter().ownerIdEqualTo(fastHash(userId)).isTrashedEqualTo(true).sortByFileCreatedAtDesc();
 
     return _watchRenderList(query, GroupAssetsBy.none);
   }
diff --git a/mobile/lib/routing/app_navigation_observer.dart b/mobile/lib/routing/app_navigation_observer.dart
index 98560018ee..7e5d73cae8 100644
--- a/mobile/lib/routing/app_navigation_observer.dart
+++ b/mobile/lib/routing/app_navigation_observer.dart
@@ -27,24 +27,19 @@ class AppNavigationObserver extends AutoRouterObserver {
     _handleLockedViewState(route, previousRoute);
     _handleDriftLockedFolderState(route, previousRoute);
     Future(
-      () => ref.read(currentRouteNameProvider.notifier).state =
-          route.settings.name,
+      () => ref.read(currentRouteNameProvider.notifier).state = route.settings.name,
     );
   }
 
   _handleLockedViewState(Route route, Route? previousRoute) {
     final isInLockedView = ref.read(inLockedViewProvider);
     final isFromLockedViewToDetailView =
-        route.settings.name == GalleryViewerRoute.name &&
-            previousRoute?.settings.name == LockedRoute.name;
+        route.settings.name == GalleryViewerRoute.name && previousRoute?.settings.name == LockedRoute.name;
 
-    final isFromDetailViewToInfoPanelView = route.settings.name == null &&
-        previousRoute?.settings.name == GalleryViewerRoute.name &&
-        isInLockedView;
+    final isFromDetailViewToInfoPanelView =
+        route.settings.name == null && previousRoute?.settings.name == GalleryViewerRoute.name && isInLockedView;
 
-    if (route.settings.name == LockedRoute.name ||
-        isFromLockedViewToDetailView ||
-        isFromDetailViewToInfoPanelView) {
+    if (route.settings.name == LockedRoute.name || isFromLockedViewToDetailView || isFromDetailViewToInfoPanelView) {
       Future(
         () => ref.read(inLockedViewProvider.notifier).state = true,
       );
@@ -58,12 +53,10 @@ class AppNavigationObserver extends AutoRouterObserver {
   _handleDriftLockedFolderState(Route route, Route? previousRoute) {
     final isInLockedView = ref.read(inLockedViewProvider);
     final isFromLockedViewToDetailView =
-        route.settings.name == AssetViewerRoute.name &&
-            previousRoute?.settings.name == DriftLockedFolderRoute.name;
+        route.settings.name == AssetViewerRoute.name && previousRoute?.settings.name == DriftLockedFolderRoute.name;
 
-    final isFromDetailViewToInfoPanelView = route.settings.name == null &&
-        previousRoute?.settings.name == AssetViewerRoute.name &&
-        isInLockedView;
+    final isFromDetailViewToInfoPanelView =
+        route.settings.name == null && previousRoute?.settings.name == AssetViewerRoute.name && isInLockedView;
 
     if (route.settings.name == DriftLockedFolderRoute.name ||
         isFromLockedViewToDetailView ||
diff --git a/mobile/lib/routing/custom_transition_builders.dart b/mobile/lib/routing/custom_transition_builders.dart
index 610edd8185..d8412eb7cf 100644
--- a/mobile/lib/routing/custom_transition_builders.dart
+++ b/mobile/lib/routing/custom_transition_builders.dart
@@ -3,8 +3,7 @@ import 'package:flutter/material.dart';
 class CustomTransitionsBuilders {
   const CustomTransitionsBuilders._();
 
-  static const ZoomPageTransitionsBuilder zoomPageTransitionsBuilder =
-      ZoomPageTransitionsBuilder();
+  static const ZoomPageTransitionsBuilder zoomPageTransitionsBuilder = ZoomPageTransitionsBuilder();
 
   static const RouteTransitionsBuilder zoomedPage = _zoomedPage;
 
@@ -19,8 +18,7 @@ class CustomTransitionsBuilders {
       PageRouteBuilder(
         allowSnapshotting: true,
         fullscreenDialog: false,
-        pageBuilder: (context, animation, secondaryAnimation) =>
-            const SizedBox.shrink(),
+        pageBuilder: (context, animation, secondaryAnimation) => const SizedBox.shrink(),
       ),
       context,
       animation,
diff --git a/mobile/lib/routing/gallery_guard.dart b/mobile/lib/routing/gallery_guard.dart
index fcac142271..eace8257b6 100644
--- a/mobile/lib/routing/gallery_guard.dart
+++ b/mobile/lib/routing/gallery_guard.dart
@@ -7,8 +7,7 @@ class GalleryGuard extends AutoRouteGuard {
   @override
   void onNavigation(NavigationResolver resolver, StackRouter router) async {
     final newRouteName = resolver.route.name;
-    final currentTopRouteName =
-        router.stack.isNotEmpty ? router.stack.last.name : null;
+    final currentTopRouteName = router.stack.isNotEmpty ? router.stack.last.name : null;
 
     if (currentTopRouteName == newRouteName) {
       // Replace instead of pushing duplicate
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 5b3a92d4e2..a72558508c 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -139,8 +139,7 @@ class AppRouter extends RootStackRouter {
   ) {
     _authGuard = AuthGuard(apiService);
     _duplicateGuard = const DuplicateGuard();
-    _lockedGuard =
-        LockedGuard(apiService, secureStorageService, localAuthService);
+    _lockedGuard = LockedGuard(apiService, secureStorageService, localAuthService);
     _backupPermissionGuard = BackupPermissionGuard(galleryPermissionNotifier);
     _galleryGuard = const GalleryGuard();
   }
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index a59b15856f..1ca04c3a78 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -13,8 +13,7 @@ part of 'router.dart';
 /// generated route for
 /// [ActivitiesPage]
 class ActivitiesRoute extends PageRouteInfo<void> {
-  const ActivitiesRoute({List<PageRouteInfo>? children})
-      : super(ActivitiesRoute.name, initialChildren: children);
+  const ActivitiesRoute({List<PageRouteInfo>? children}) : super(ActivitiesRoute.name, initialChildren: children);
 
   static const String name = 'ActivitiesRoute';
 
@@ -28,8 +27,7 @@ class ActivitiesRoute extends PageRouteInfo<void> {
 
 /// generated route for
 /// [AlbumAdditionalSharedUserSelectionPage]
-class AlbumAdditionalSharedUserSelectionRoute
-    extends PageRouteInfo<AlbumAdditionalSharedUserSelectionRouteArgs> {
+class AlbumAdditionalSharedUserSelectionRoute extends PageRouteInfo<AlbumAdditionalSharedUserSelectionRouteArgs> {
   AlbumAdditionalSharedUserSelectionRoute({
     Key? key,
     required Album album,
@@ -75,8 +73,7 @@ class AlbumAdditionalSharedUserSelectionRouteArgs {
 
 /// generated route for
 /// [AlbumAssetSelectionPage]
-class AlbumAssetSelectionRoute
-    extends PageRouteInfo<AlbumAssetSelectionRouteArgs> {
+class AlbumAssetSelectionRoute extends PageRouteInfo<AlbumAssetSelectionRouteArgs> {
   AlbumAssetSelectionRoute({
     Key? key,
     required Set<Asset> existingAssets,
@@ -129,8 +126,7 @@ class AlbumAssetSelectionRouteArgs {
 /// generated route for
 /// [AlbumOptionsPage]
 class AlbumOptionsRoute extends PageRouteInfo<void> {
-  const AlbumOptionsRoute({List<PageRouteInfo>? children})
-      : super(AlbumOptionsRoute.name, initialChildren: children);
+  const AlbumOptionsRoute({List<PageRouteInfo>? children}) : super(AlbumOptionsRoute.name, initialChildren: children);
 
   static const String name = 'AlbumOptionsRoute';
 
@@ -181,8 +177,7 @@ class AlbumPreviewRouteArgs {
 
 /// generated route for
 /// [AlbumSharedUserSelectionPage]
-class AlbumSharedUserSelectionRoute
-    extends PageRouteInfo<AlbumSharedUserSelectionRouteArgs> {
+class AlbumSharedUserSelectionRoute extends PageRouteInfo<AlbumSharedUserSelectionRouteArgs> {
   AlbumSharedUserSelectionRoute({
     Key? key,
     required Set<Asset> assets,
@@ -257,8 +252,7 @@ class AlbumViewerRouteArgs {
 /// generated route for
 /// [AlbumsPage]
 class AlbumsRoute extends PageRouteInfo<void> {
-  const AlbumsRoute({List<PageRouteInfo>? children})
-      : super(AlbumsRoute.name, initialChildren: children);
+  const AlbumsRoute({List<PageRouteInfo>? children}) : super(AlbumsRoute.name, initialChildren: children);
 
   static const String name = 'AlbumsRoute';
 
@@ -289,8 +283,7 @@ class AllMotionPhotosRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [AllPeoplePage]
 class AllPeopleRoute extends PageRouteInfo<void> {
-  const AllPeopleRoute({List<PageRouteInfo>? children})
-      : super(AllPeopleRoute.name, initialChildren: children);
+  const AllPeopleRoute({List<PageRouteInfo>? children}) : super(AllPeopleRoute.name, initialChildren: children);
 
   static const String name = 'AllPeopleRoute';
 
@@ -305,8 +298,7 @@ class AllPeopleRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [AllPlacesPage]
 class AllPlacesRoute extends PageRouteInfo<void> {
-  const AllPlacesRoute({List<PageRouteInfo>? children})
-      : super(AllPlacesRoute.name, initialChildren: children);
+  const AllPlacesRoute({List<PageRouteInfo>? children}) : super(AllPlacesRoute.name, initialChildren: children);
 
   static const String name = 'AllPlacesRoute';
 
@@ -321,8 +313,7 @@ class AllPlacesRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [AllVideosPage]
 class AllVideosRoute extends PageRouteInfo<void> {
-  const AllVideosRoute({List<PageRouteInfo>? children})
-      : super(AllVideosRoute.name, initialChildren: children);
+  const AllVideosRoute({List<PageRouteInfo>? children}) : super(AllVideosRoute.name, initialChildren: children);
 
   static const String name = 'AllVideosRoute';
 
@@ -374,8 +365,7 @@ class AppLogDetailRouteArgs {
 /// generated route for
 /// [AppLogPage]
 class AppLogRoute extends PageRouteInfo<void> {
-  const AppLogRoute({List<PageRouteInfo>? children})
-      : super(AppLogRoute.name, initialChildren: children);
+  const AppLogRoute({List<PageRouteInfo>? children}) : super(AppLogRoute.name, initialChildren: children);
 
   static const String name = 'AppLogRoute';
 
@@ -390,8 +380,7 @@ class AppLogRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [ArchivePage]
 class ArchiveRoute extends PageRouteInfo<void> {
-  const ArchiveRoute({List<PageRouteInfo>? children})
-      : super(ArchiveRoute.name, initialChildren: children);
+  const ArchiveRoute({List<PageRouteInfo>? children}) : super(ArchiveRoute.name, initialChildren: children);
 
   static const String name = 'ArchiveRoute';
 
@@ -490,8 +479,7 @@ class BackupControllerRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [BackupOptionsPage]
 class BackupOptionsRoute extends PageRouteInfo<void> {
-  const BackupOptionsRoute({List<PageRouteInfo>? children})
-      : super(BackupOptionsRoute.name, initialChildren: children);
+  const BackupOptionsRoute({List<PageRouteInfo>? children}) : super(BackupOptionsRoute.name, initialChildren: children);
 
   static const String name = 'BackupOptionsRoute';
 
@@ -664,8 +652,7 @@ class CropImageRouteArgs {
 /// generated route for
 /// [DriftAlbumsPage]
 class DriftAlbumsRoute extends PageRouteInfo<void> {
-  const DriftAlbumsRoute({List<PageRouteInfo>? children})
-      : super(DriftAlbumsRoute.name, initialChildren: children);
+  const DriftAlbumsRoute({List<PageRouteInfo>? children}) : super(DriftAlbumsRoute.name, initialChildren: children);
 
   static const String name = 'DriftAlbumsRoute';
 
@@ -680,8 +667,7 @@ class DriftAlbumsRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [DriftArchivePage]
 class DriftArchiveRoute extends PageRouteInfo<void> {
-  const DriftArchiveRoute({List<PageRouteInfo>? children})
-      : super(DriftArchiveRoute.name, initialChildren: children);
+  const DriftArchiveRoute({List<PageRouteInfo>? children}) : super(DriftArchiveRoute.name, initialChildren: children);
 
   static const String name = 'DriftArchiveRoute';
 
@@ -695,8 +681,7 @@ class DriftArchiveRoute extends PageRouteInfo<void> {
 
 /// generated route for
 /// [DriftAssetSelectionTimelinePage]
-class DriftAssetSelectionTimelineRoute
-    extends PageRouteInfo<DriftAssetSelectionTimelineRouteArgs> {
+class DriftAssetSelectionTimelineRoute extends PageRouteInfo<DriftAssetSelectionTimelineRouteArgs> {
   DriftAssetSelectionTimelineRoute({
     Key? key,
     Set<BaseAsset> lockedSelectionAssets = const {},
@@ -761,8 +746,7 @@ class DriftBackupAlbumSelectionRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [DriftBackupPage]
 class DriftBackupRoute extends PageRouteInfo<void> {
-  const DriftBackupRoute({List<PageRouteInfo>? children})
-      : super(DriftBackupRoute.name, initialChildren: children);
+  const DriftBackupRoute({List<PageRouteInfo>? children}) : super(DriftBackupRoute.name, initialChildren: children);
 
   static const String name = 'DriftBackupRoute';
 
@@ -793,8 +777,7 @@ class DriftCreateAlbumRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [DriftFavoritePage]
 class DriftFavoriteRoute extends PageRouteInfo<void> {
-  const DriftFavoriteRoute({List<PageRouteInfo>? children})
-      : super(DriftFavoriteRoute.name, initialChildren: children);
+  const DriftFavoriteRoute({List<PageRouteInfo>? children}) : super(DriftFavoriteRoute.name, initialChildren: children);
 
   static const String name = 'DriftFavoriteRoute';
 
@@ -809,8 +792,7 @@ class DriftFavoriteRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [DriftLibraryPage]
 class DriftLibraryRoute extends PageRouteInfo<void> {
-  const DriftLibraryRoute({List<PageRouteInfo>? children})
-      : super(DriftLibraryRoute.name, initialChildren: children);
+  const DriftLibraryRoute({List<PageRouteInfo>? children}) : super(DriftLibraryRoute.name, initialChildren: children);
 
   static const String name = 'DriftLibraryRoute';
 
@@ -908,8 +890,7 @@ class DriftMemoryRouteArgs {
 
 /// generated route for
 /// [DriftPartnerDetailPage]
-class DriftPartnerDetailRoute
-    extends PageRouteInfo<DriftPartnerDetailRouteArgs> {
+class DriftPartnerDetailRoute extends PageRouteInfo<DriftPartnerDetailRouteArgs> {
   DriftPartnerDetailRoute({
     Key? key,
     required PartnerUserDto partner,
@@ -947,8 +928,7 @@ class DriftPartnerDetailRouteArgs {
 /// generated route for
 /// [DriftPartnerPage]
 class DriftPartnerRoute extends PageRouteInfo<void> {
-  const DriftPartnerRoute({List<PageRouteInfo>? children})
-      : super(DriftPartnerRoute.name, initialChildren: children);
+  const DriftPartnerRoute({List<PageRouteInfo>? children}) : super(DriftPartnerRoute.name, initialChildren: children);
 
   static const String name = 'DriftPartnerRoute';
 
@@ -1097,8 +1077,7 @@ class DriftSearchRouteArgs {
 /// generated route for
 /// [DriftTrashPage]
 class DriftTrashRoute extends PageRouteInfo<void> {
-  const DriftTrashRoute({List<PageRouteInfo>? children})
-      : super(DriftTrashRoute.name, initialChildren: children);
+  const DriftTrashRoute({List<PageRouteInfo>? children}) : super(DriftTrashRoute.name, initialChildren: children);
 
   static const String name = 'DriftTrashRoute';
 
@@ -1128,8 +1107,7 @@ class DriftUploadDetailRoute extends PageRouteInfo<void> {
 
 /// generated route for
 /// [DriftUserSelectionPage]
-class DriftUserSelectionRoute
-    extends PageRouteInfo<DriftUserSelectionRouteArgs> {
+class DriftUserSelectionRoute extends PageRouteInfo<DriftUserSelectionRouteArgs> {
   DriftUserSelectionRoute({
     Key? key,
     required RemoteAlbum album,
@@ -1167,8 +1145,7 @@ class DriftUserSelectionRouteArgs {
 /// generated route for
 /// [DriftVideoPage]
 class DriftVideoRoute extends PageRouteInfo<void> {
-  const DriftVideoRoute({List<PageRouteInfo>? children})
-      : super(DriftVideoRoute.name, initialChildren: children);
+  const DriftVideoRoute({List<PageRouteInfo>? children}) : super(DriftVideoRoute.name, initialChildren: children);
 
   static const String name = 'DriftVideoRoute';
 
@@ -1257,8 +1234,7 @@ class FailedBackupStatusRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [FavoritesPage]
 class FavoritesRoute extends PageRouteInfo<void> {
-  const FavoritesRoute({List<PageRouteInfo>? children})
-      : super(FavoritesRoute.name, initialChildren: children);
+  const FavoritesRoute({List<PageRouteInfo>? children}) : super(FavoritesRoute.name, initialChildren: children);
 
   static const String name = 'FavoritesRoute';
 
@@ -1273,8 +1249,7 @@ class FavoritesRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [FeatInDevPage]
 class FeatInDevRoute extends PageRouteInfo<void> {
-  const FeatInDevRoute({List<PageRouteInfo>? children})
-      : super(FeatInDevRoute.name, initialChildren: children);
+  const FeatInDevRoute({List<PageRouteInfo>? children}) : super(FeatInDevRoute.name, initialChildren: children);
 
   static const String name = 'FeatInDevRoute';
 
@@ -1456,8 +1431,7 @@ class HeaderSettingsRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [LibraryPage]
 class LibraryRoute extends PageRouteInfo<void> {
-  const LibraryRoute({List<PageRouteInfo>? children})
-      : super(LibraryRoute.name, initialChildren: children);
+  const LibraryRoute({List<PageRouteInfo>? children}) : super(LibraryRoute.name, initialChildren: children);
 
   static const String name = 'LibraryRoute';
 
@@ -1472,8 +1446,7 @@ class LibraryRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [LocalAlbumsPage]
 class LocalAlbumsRoute extends PageRouteInfo<void> {
-  const LocalAlbumsRoute({List<PageRouteInfo>? children})
-      : super(LocalAlbumsRoute.name, initialChildren: children);
+  const LocalAlbumsRoute({List<PageRouteInfo>? children}) : super(LocalAlbumsRoute.name, initialChildren: children);
 
   static const String name = 'LocalAlbumsRoute';
 
@@ -1541,8 +1514,7 @@ class LocalTimelineRouteArgs {
 /// generated route for
 /// [LockedPage]
 class LockedRoute extends PageRouteInfo<void> {
-  const LockedRoute({List<PageRouteInfo>? children})
-      : super(LockedRoute.name, initialChildren: children);
+  const LockedRoute({List<PageRouteInfo>? children}) : super(LockedRoute.name, initialChildren: children);
 
   static const String name = 'LockedRoute';
 
@@ -1557,8 +1529,7 @@ class LockedRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [LoginPage]
 class LoginRoute extends PageRouteInfo<void> {
-  const LoginRoute({List<PageRouteInfo>? children})
-      : super(LoginRoute.name, initialChildren: children);
+  const LoginRoute({List<PageRouteInfo>? children}) : super(LoginRoute.name, initialChildren: children);
 
   static const String name = 'LoginRoute';
 
@@ -1573,8 +1544,7 @@ class LoginRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [MainTimelinePage]
 class MainTimelineRoute extends PageRouteInfo<void> {
-  const MainTimelineRoute({List<PageRouteInfo>? children})
-      : super(MainTimelineRoute.name, initialChildren: children);
+  const MainTimelineRoute({List<PageRouteInfo>? children}) : super(MainTimelineRoute.name, initialChildren: children);
 
   static const String name = 'MainTimelineRoute';
 
@@ -1826,8 +1796,7 @@ class PartnerDetailRouteArgs {
 /// generated route for
 /// [PartnerPage]
 class PartnerRoute extends PageRouteInfo<void> {
-  const PartnerRoute({List<PageRouteInfo>? children})
-      : super(PartnerRoute.name, initialChildren: children);
+  const PartnerRoute({List<PageRouteInfo>? children}) : super(PartnerRoute.name, initialChildren: children);
 
   static const String name = 'PartnerRoute';
 
@@ -1926,8 +1895,7 @@ class PersonResultRouteArgs {
 /// generated route for
 /// [PhotosPage]
 class PhotosRoute extends PageRouteInfo<void> {
-  const PhotosRoute({List<PageRouteInfo>? children})
-      : super(PhotosRoute.name, initialChildren: children);
+  const PhotosRoute({List<PageRouteInfo>? children}) : super(PhotosRoute.name, initialChildren: children);
 
   static const String name = 'PhotosRoute';
 
@@ -2026,8 +1994,7 @@ class PlacesCollectionRouteArgs {
 /// generated route for
 /// [RecentlyTakenPage]
 class RecentlyTakenRoute extends PageRouteInfo<void> {
-  const RecentlyTakenRoute({List<PageRouteInfo>? children})
-      : super(RecentlyTakenRoute.name, initialChildren: children);
+  const RecentlyTakenRoute({List<PageRouteInfo>? children}) : super(RecentlyTakenRoute.name, initialChildren: children);
 
   static const String name = 'RecentlyTakenRoute';
 
@@ -2134,8 +2101,7 @@ class SearchRouteArgs {
 /// generated route for
 /// [SettingsPage]
 class SettingsRoute extends PageRouteInfo<void> {
-  const SettingsRoute({List<PageRouteInfo>? children})
-      : super(SettingsRoute.name, initialChildren: children);
+  const SettingsRoute({List<PageRouteInfo>? children}) : super(SettingsRoute.name, initialChildren: children);
 
   static const String name = 'SettingsRoute';
 
@@ -2284,8 +2250,7 @@ class SharedLinkEditRouteArgs {
 /// generated route for
 /// [SharedLinkPage]
 class SharedLinkRoute extends PageRouteInfo<void> {
-  const SharedLinkRoute({List<PageRouteInfo>? children})
-      : super(SharedLinkRoute.name, initialChildren: children);
+  const SharedLinkRoute({List<PageRouteInfo>? children}) : super(SharedLinkRoute.name, initialChildren: children);
 
   static const String name = 'SharedLinkRoute';
 
@@ -2300,8 +2265,7 @@ class SharedLinkRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [SplashScreenPage]
 class SplashScreenRoute extends PageRouteInfo<void> {
-  const SplashScreenRoute({List<PageRouteInfo>? children})
-      : super(SplashScreenRoute.name, initialChildren: children);
+  const SplashScreenRoute({List<PageRouteInfo>? children}) : super(SplashScreenRoute.name, initialChildren: children);
 
   static const String name = 'SplashScreenRoute';
 
@@ -2316,8 +2280,7 @@ class SplashScreenRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [TabControllerPage]
 class TabControllerRoute extends PageRouteInfo<void> {
-  const TabControllerRoute({List<PageRouteInfo>? children})
-      : super(TabControllerRoute.name, initialChildren: children);
+  const TabControllerRoute({List<PageRouteInfo>? children}) : super(TabControllerRoute.name, initialChildren: children);
 
   static const String name = 'TabControllerRoute';
 
@@ -2332,8 +2295,7 @@ class TabControllerRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [TabShellPage]
 class TabShellRoute extends PageRouteInfo<void> {
-  const TabShellRoute({List<PageRouteInfo>? children})
-      : super(TabShellRoute.name, initialChildren: children);
+  const TabShellRoute({List<PageRouteInfo>? children}) : super(TabShellRoute.name, initialChildren: children);
 
   static const String name = 'TabShellRoute';
 
@@ -2348,8 +2310,7 @@ class TabShellRoute extends PageRouteInfo<void> {
 /// generated route for
 /// [TrashPage]
 class TrashRoute extends PageRouteInfo<void> {
-  const TrashRoute({List<PageRouteInfo>? children})
-      : super(TrashRoute.name, initialChildren: children);
+  const TrashRoute({List<PageRouteInfo>? children}) : super(TrashRoute.name, initialChildren: children);
 
   static const String name = 'TrashRoute';
 
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index 63bc053a41..dde2b1cd54 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -192,8 +192,7 @@ class ActionService {
     final result = await _albumApiRepository.removeAssets(albumId, remoteIds);
 
     if (result.removed.isNotEmpty) {
-      removedCount =
-          await _remoteAlbumRepository.removeAssets(albumId, result.removed);
+      removedCount = await _remoteAlbumRepository.removeAssets(albumId, result.removed);
     }
 
     return removedCount;
diff --git a/mobile/lib/services/album.service.dart b/mobile/lib/services/album.service.dart
index 6733ec41b2..308b9acc44 100644
--- a/mobile/lib/services/album.service.dart
+++ b/mobile/lib/services/album.service.dart
@@ -11,8 +11,7 @@ import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.dart'
-    as entity;
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity;
 import 'package:immich_mobile/models/albums/album_add_asset_response.model.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -76,12 +75,8 @@ class AlbumService {
     bool changes = false;
     try {
       final (selectedIds, excludedIds, onDevice) = await (
-        _backupAlbumRepository
-            .getIdsBySelection(BackupSelection.select)
-            .then((value) => value.toSet()),
-        _backupAlbumRepository
-            .getIdsBySelection(BackupSelection.exclude)
-            .then((value) => value.toSet()),
+        _backupAlbumRepository.getIdsBySelection(BackupSelection.select).then((value) => value.toSet()),
+        _backupAlbumRepository.getIdsBySelection(BackupSelection.exclude).then((value) => value.toSet()),
         _albumMediaRepository.getAll()
       ).wait;
       _log.info("Found ${onDevice.length} device albums");
@@ -126,8 +121,7 @@ class AlbumService {
         onDevice.removeWhere((album) => !selectedIds.contains(album.localId));
         _log.info("'Recents' is not selected, keeping only selected albums");
       }
-      changes =
-          await _syncService.syncLocalAlbumAssetsToDb(onDevice, excludedAssets);
+      changes = await _syncService.syncLocalAlbumAssetsToDb(onDevice, excludedAssets);
       _log.info("Syncing completed. Changes: $changes");
     } finally {
       _localCompleter.complete(changes);
@@ -141,14 +135,10 @@ class AlbumService {
     Set<String> excludedAlbumIds,
   ) async {
     final Set<String> result = HashSet<String>();
-    for (final batchAlbums in albums
-        .where((album) => excludedAlbumIds.contains(album.localId))
-        .slices(5)) {
+    for (final batchAlbums in albums.where((album) => excludedAlbumIds.contains(album.localId)).slices(5)) {
       await batchAlbums
           .map(
-            (album) => _albumMediaRepository
-                .getAssetIds(album.localId!)
-                .then((assetIds) => result.addAll(assetIds)),
+            (album) => _albumMediaRepository.getAssetIds(album.localId!).then((assetIds) => result.addAll(assetIds)),
           )
           .wait;
     }
@@ -244,9 +234,8 @@ class AlbumService {
         assets.map((asset) => asset.remoteId!),
       );
 
-      final List<Asset> addedAssets = result.added
-          .map((id) => assets.firstWhere((asset) => asset.remoteId == id))
-          .toList();
+      final List<Asset> addedAssets =
+          result.added.map((id) => assets.firstWhere((asset) => asset.remoteId == id)).toList();
 
       await _updateAssets(album.id, add: addedAssets);
 
@@ -296,8 +285,7 @@ class AlbumService {
         await _albumApiRepository.delete(album.remoteId!);
       }
       if (album.shared) {
-        final foreignAssets =
-            await _assetRepository.getByAlbum(album, notOwnedBy: [userId]);
+        final foreignAssets = await _assetRepository.getByAlbum(album, notOwnedBy: [userId]);
         await _albumRepository.delete(album.id);
 
         final List<Album> albums = await _albumRepository.getAll(shared: true);
@@ -307,8 +295,7 @@ class AlbumService {
             await _assetRepository.getByAlbum(album, notOwnedBy: [userId]),
           );
         }
-        final List<int> idsToRemove =
-            _syncService.sharedAssetsToRemove(foreignAssets, existing);
+        final List<int> idsToRemove = _syncService.sharedAssetsToRemove(foreignAssets, existing);
         if (idsToRemove.isNotEmpty) {
           await _assetRepository.deleteByIds(idsToRemove);
         }
@@ -341,8 +328,7 @@ class AlbumService {
         album.remoteId!,
         assets.map((asset) => asset.remoteId!),
       );
-      final toRemove = result.removed
-          .map((id) => assets.firstWhere((asset) => asset.remoteId == id));
+      final toRemove = result.removed.map((id) => assets.firstWhere((asset) => asset.remoteId == id));
       await _updateAssets(album.id, remove: toRemove.toList());
       return true;
     } catch (e) {
@@ -379,8 +365,7 @@ class AlbumService {
     List<String> userIds,
   ) async {
     try {
-      final updatedAlbum =
-          await _albumApiRepository.addUsers(album.remoteId!, userIds);
+      final updatedAlbum = await _albumApiRepository.addUsers(album.remoteId!, userIds);
 
       album.sharedUsers.addAll(updatedAlbum.remoteUsers);
       album.shared = true;
@@ -503,8 +488,7 @@ class AlbumService {
 
   Future<Album?> updateSortOrder(Album album, SortOrder order) async {
     try {
-      final updateAlbum =
-          await _albumApiRepository.update(album.remoteId!, sortOrder: order);
+      final updateAlbum = await _albumApiRepository.update(album.remoteId!, sortOrder: order);
       album.sortOrder = updateAlbum.sortOrder;
 
       return _albumRepository.update(album);
diff --git a/mobile/lib/services/api.service.dart b/mobile/lib/services/api.service.dart
index fe007a2aab..b2e73c1b28 100644
--- a/mobile/lib/services/api.service.dart
+++ b/mobile/lib/services/api.service.dart
@@ -178,13 +178,11 @@ class ApiService implements Authentication {
 
     if (Platform.isIOS) {
       final iosInfo = await deviceInfoPlugin.iosInfo;
-      authenticationApi.apiClient
-          .addDefaultHeader('deviceModel', iosInfo.utsname.machine);
+      authenticationApi.apiClient.addDefaultHeader('deviceModel', iosInfo.utsname.machine);
       authenticationApi.apiClient.addDefaultHeader('deviceType', 'iOS');
     } else if (Platform.isAndroid) {
       final androidInfo = await deviceInfoPlugin.androidInfo;
-      authenticationApi.apiClient
-          .addDefaultHeader('deviceModel', androidInfo.model);
+      authenticationApi.apiClient.addDefaultHeader('deviceModel', androidInfo.model);
       authenticationApi.apiClient.addDefaultHeader('deviceType', 'Android');
     } else {
       authenticationApi.apiClient.addDefaultHeader('deviceModel', 'Unknown');
diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart
index cb7f59e3a9..e9318dd0bf 100644
--- a/mobile/lib/services/asset.service.dart
+++ b/mobile/lib/services/asset.service.dart
@@ -78,11 +78,8 @@ class AssetService {
   /// required. Returns `true` if there were any changes.
   Future<bool> refreshRemoteAssets() async {
     final syncedUserIds = await _etagRepository.getAllIds();
-    final List<UserDto> syncedUsers = syncedUserIds.isEmpty
-        ? []
-        : (await _isarUserRepository.getByUserIds(syncedUserIds))
-            .nonNulls
-            .toList();
+    final List<UserDto> syncedUsers =
+        syncedUserIds.isEmpty ? [] : (await _isarUserRepository.getByUserIds(syncedUserIds)).nonNulls.toList();
     final Stopwatch sw = Stopwatch()..start();
     final bool changes = await _syncService.syncRemoteAssetsToDb(
       users: syncedUsers,
@@ -94,8 +91,10 @@ class AssetService {
   }
 
   /// Returns `(null, null)` if changes are invalid -> requires full sync
-  Future<(List<Asset>? toUpsert, List<String>? toDelete)>
-      _getRemoteAssetChanges(List<UserDto> users, DateTime since) async {
+  Future<(List<Asset>? toUpsert, List<String>? toDelete)> _getRemoteAssetChanges(
+    List<UserDto> users,
+    DateTime since,
+  ) async {
     final dto = AssetDeltaSyncDto(
       updatedAfter: since,
       userIds: users.map((e) => e.id).toList(),
@@ -112,8 +111,7 @@ class AssetService {
     String remoteId,
   ) async {
     try {
-      final AssetResponseDto? dto =
-          await _apiService.assetsApi.getAssetInfo(remoteId);
+      final AssetResponseDto? dto = await _apiService.assetsApi.getAssetInfo(remoteId);
 
       return dto?.people;
     } catch (error, stack) {
@@ -142,8 +140,7 @@ class AssetService {
           userId: user.id,
         );
         log.fine("Requesting $chunkSize assets from $lastId");
-        final List<AssetResponseDto>? assets =
-            await _apiService.syncApi.getFullSyncForUser(dto);
+        final List<AssetResponseDto>? assets = await _apiService.syncApi.getFullSyncForUser(dto);
         if (assets == null) return null;
         log.fine(
           "Received ${assets.length} assets from ${assets.firstOrNull?.id} to ${assets.lastOrNull?.id}",
@@ -172,8 +169,7 @@ class AssetService {
           a.exifInfo = newExif;
           if (newExif != a.exifInfo) {
             if (a.isInDb) {
-              await _assetRepository
-                  .transaction(() => _assetRepository.update(a));
+              await _assetRepository.transaction(() => _assetRepository.update(a));
             } else {
               debugPrint("[loadExif] parameter Asset is not from DB!");
             }
@@ -230,16 +226,13 @@ class AssetService {
       await updateAssets(
         assets,
         UpdateAssetDto(
-          visibility:
-              isArchived ? AssetVisibility.archive : AssetVisibility.timeline,
+          visibility: isArchived ? AssetVisibility.archive : AssetVisibility.timeline,
         ),
       );
 
       for (var element in assets) {
         element.isArchived = isArchived;
-        element.visibility = isArchived
-            ? AssetVisibilityEnum.archive
-            : AssetVisibilityEnum.timeline;
+        element.visibility = isArchived ? AssetVisibilityEnum.archive : AssetVisibilityEnum.timeline;
       }
 
       await _syncService.upsertAssetsWithExif(assets);
@@ -263,8 +256,7 @@ class AssetService {
 
       for (var element in assets) {
         element.fileCreatedAt = DateTime.parse(updatedDt);
-        element.exifInfo = element.exifInfo
-            ?.copyWith(dateTimeOriginal: DateTime.parse(updatedDt));
+        element.exifInfo = element.exifInfo?.copyWith(dateTimeOriginal: DateTime.parse(updatedDt));
       }
 
       await _syncService.upsertAssetsWithExif(assets);
@@ -307,10 +299,8 @@ class AssetService {
 
   Future<void> syncUploadedAssetToAlbums() async {
     try {
-      final selectedAlbums =
-          await _backupRepository.getAllBySelection(BackupSelection.select);
-      final excludedAlbums =
-          await _backupRepository.getAllBySelection(BackupSelection.exclude);
+      final selectedAlbums = await _backupRepository.getAllBySelection(BackupSelection.select);
+      final excludedAlbums = await _backupRepository.getAllBySelection(BackupSelection.exclude);
 
       final candidates = await _backupService.buildUploadCandidates(
         selectedAlbums,
@@ -375,8 +365,7 @@ class AssetService {
       var exifInfo = await _exifInfoRepository.get(localExifId);
 
       if (exifInfo != null) {
-        await _exifInfoRepository
-            .update(exifInfo.copyWith(description: description));
+        await _exifInfoRepository.update(exifInfo.copyWith(description: description));
       }
     }
   }
@@ -429,22 +418,16 @@ class AssetService {
     // Delete files from local gallery
     final candidates = assets.where((asset) => asset.isLocal);
 
-    final deletedIds = await _assetMediaRepository
-        .deleteAll(candidates.map((asset) => asset.localId!).toList());
+    final deletedIds = await _assetMediaRepository.deleteAll(candidates.map((asset) => asset.localId!).toList());
 
     // Modify local database by removing the reference to the local assets
     if (deletedIds.isNotEmpty) {
       // Delete records from local database
-      final isarIds = assets
-          .where((asset) => asset.storage == AssetState.local)
-          .map((asset) => asset.id)
-          .toList();
+      final isarIds = assets.where((asset) => asset.storage == AssetState.local).map((asset) => asset.id).toList();
       await _assetRepository.deleteByIds(isarIds);
 
       // Modify Merged asset to be remote only
-      final updatedAssets = assets
-          .where((asset) => asset.storage == AssetState.merged)
-          .map((asset) {
+      final updatedAssets = assets.where((asset) => asset.storage == AssetState.merged).map((asset) {
         asset.localId = null;
         return asset;
       }).toList();
@@ -473,9 +456,7 @@ class AssetService {
 
     /// Update asset info bassed on the deletion type.
     final payload = shouldDeletePermanently
-        ? assets
-            .where((asset) => asset.storage == AssetState.merged)
-            .map((asset) {
+        ? assets.where((asset) => asset.storage == AssetState.merged).map((asset) {
             asset.remoteId = null;
             asset.visibility = AssetVisibilityEnum.timeline;
             return asset;
@@ -489,10 +470,8 @@ class AssetService {
       await _assetRepository.updateAll(payload.toList());
 
       if (shouldDeletePermanently) {
-        final remoteAssetIds = assets
-            .where((asset) => asset.storage == AssetState.remote)
-            .map((asset) => asset.id)
-            .toList();
+        final remoteAssetIds =
+            assets.where((asset) => asset.storage == AssetState.remote).map((asset) => asset.id).toList();
         await _assetRepository.deleteByIds(remoteAssetIds);
       }
     });
diff --git a/mobile/lib/services/background.service.dart b/mobile/lib/services/background.service.dart
index 97acf2941f..5302df49ce 100644
--- a/mobile/lib/services/background.service.dart
+++ b/mobile/lib/services/background.service.dart
@@ -39,10 +39,8 @@ final backgroundServiceProvider = Provider((ref) => BackgroundService());
 /// Background backup service
 class BackgroundService {
   static const String _portNameLock = "immichLock";
-  static const MethodChannel _foregroundChannel =
-      MethodChannel('immich/foregroundChannel');
-  static const MethodChannel _backgroundChannel =
-      MethodChannel('immich/backgroundChannel');
+  static const MethodChannel _foregroundChannel = MethodChannel('immich/foregroundChannel');
+  static const MethodChannel _backgroundChannel = MethodChannel('immich/backgroundChannel');
   static const notifyInterval = Duration(milliseconds: 400);
   bool _isBackgroundInitialized = false;
   CancellationToken? _cancellationToken;
@@ -56,8 +54,7 @@ class BackgroundService {
   int _assetsToUploadCount = 0;
   String _lastPrintedDetailContent = "";
   String? _lastPrintedDetailTitle;
-  late final ThrottleProgressUpdate _throttledNotifiy =
-      ThrottleProgressUpdate(_updateProgress, notifyInterval);
+  late final ThrottleProgressUpdate _throttledNotifiy = ThrottleProgressUpdate(_updateProgress, notifyInterval);
   late final ThrottleProgressUpdate _throttledDetailNotify =
       ThrottleProgressUpdate(_updateDetailProgress, notifyInterval);
 
@@ -74,10 +71,8 @@ class BackgroundService {
   Future<bool> enableService({bool immediate = false}) async {
     try {
       final callback = PluginUtilities.getCallbackHandle(_nativeEntry)!;
-      final String title =
-          "backup_background_service_default_notification".tr();
-      final bool ok = await _foregroundChannel
-          .invokeMethod('enable', [callback.toRawHandle(), title, immediate]);
+      final String title = "backup_background_service_default_notification".tr();
+      final bool ok = await _foregroundChannel.invokeMethod('enable', [callback.toRawHandle(), title, immediate]);
       return ok;
     } catch (error) {
       return false;
@@ -133,8 +128,7 @@ class BackgroundService {
       return true;
     }
     try {
-      return await _foregroundChannel
-          .invokeMethod('isIgnoringBatteryOptimizations');
+      return await _foregroundChannel.invokeMethod('isIgnoringBatteryOptimizations');
     } catch (error) {
       return false;
     }
@@ -183,8 +177,7 @@ class BackgroundService {
   }) async {
     try {
       if (_isBackgroundInitialized && _errorGracePeriodExceeded) {
-        return await _backgroundChannel
-            .invokeMethod('showError', [title, content, individualTag]);
+        return await _backgroundChannel.invokeMethod('showError', [title, content, individualTag]);
       }
     } catch (error) {
       debugPrint("[_showErrorNotification] failed to communicate with plugin");
@@ -240,8 +233,7 @@ class BackgroundService {
       final bs = tempRp.asBroadcastStream();
       while (_wantsLockTime == lockTime) {
         other.send(tempSp);
-        final dynamic answer = await bs.first
-            .timeout(const Duration(seconds: 3), onTimeout: () => null);
+        final dynamic answer = await bs.first.timeout(const Duration(seconds: 3), onTimeout: () => null);
         if (_wantsLockTime != lockTime) {
           break;
         }
@@ -257,8 +249,7 @@ class BackgroundService {
         } else if (answer == false) {
           // other isolate is still active
         }
-        final dynamic isFinished = await bs.first
-            .timeout(const Duration(seconds: 3), onTimeout: () => false);
+        final dynamic isFinished = await bs.first.timeout(const Duration(seconds: 3), onTimeout: () => false);
         if (isFinished == true) {
           break;
         }
@@ -358,9 +349,7 @@ class BackgroundService {
     );
 
     HttpSSLOptions.apply();
-    ref
-        .read(apiServiceProvider)
-        .setAccessToken(Store.get(StoreKey.accessToken));
+    ref.read(apiServiceProvider).setAccessToken(Store.get(StoreKey.accessToken));
     await ref.read(authServiceProvider).setOpenApiServiceEndpoint();
     if (kDebugMode) {
       debugPrint(
@@ -368,12 +357,8 @@ class BackgroundService {
       );
     }
 
-    final selectedAlbums = await ref
-        .read(backupAlbumRepositoryProvider)
-        .getAllBySelection(BackupSelection.select);
-    final excludedAlbums = await ref
-        .read(backupAlbumRepositoryProvider)
-        .getAllBySelection(BackupSelection.exclude);
+    final selectedAlbums = await ref.read(backupAlbumRepositoryProvider).getAllBySelection(BackupSelection.select);
+    final excludedAlbums = await ref.read(backupAlbumRepositoryProvider).getAllBySelection(BackupSelection.exclude);
     if (selectedAlbums.isEmpty) {
       return true;
     }
@@ -392,9 +377,7 @@ class BackgroundService {
         final backupAlbums = [...selectedAlbums, ...excludedAlbums];
         backupAlbums.sortBy((e) => e.id);
 
-        final dbAlbums = await ref
-            .read(backupAlbumRepositoryProvider)
-            .getAll(sort: BackupAlbumSort.id);
+        final dbAlbums = await ref.read(backupAlbumRepositoryProvider).getAll(sort: BackupAlbumSort.id);
         final List<int> toDelete = [];
         final List<BackupAlbum> toUpsert = [];
         // stores the most recent `lastBackup` per album but always keeps the `selection` from the most recent DB state
@@ -403,9 +386,7 @@ class BackgroundService {
           backupAlbums,
           compare: (BackupAlbum a, BackupAlbum b) => a.id.compareTo(b.id),
           both: (BackupAlbum a, BackupAlbum b) {
-            a.lastBackup = a.lastBackup.isAfter(b.lastBackup)
-                ? a.lastBackup
-                : b.lastBackup;
+            a.lastBackup = a.lastBackup.isAfter(b.lastBackup) ? a.lastBackup : b.lastBackup;
             toUpsert.add(a);
             return true;
           },
@@ -419,9 +400,7 @@ class BackgroundService {
         return false;
       }
       // Android should check for new assets added while performing backup
-    } while (Platform.isAndroid &&
-        true ==
-            await _backgroundChannel.invokeMethod<bool>("hasContentChanged"));
+    } while (Platform.isAndroid && true == await _backgroundChannel.invokeMethod<bool>("hasContentChanged"));
     return true;
   }
 
@@ -432,10 +411,8 @@ class BackgroundService {
     List<BackupAlbum> excludedAlbums,
   ) async {
     _errorGracePeriodExceeded = _isErrorGracePeriodExceeded(settingsService);
-    final bool notifyTotalProgress = settingsService
-        .getSetting<bool>(AppSettingsEnum.backgroundBackupTotalProgress);
-    final bool notifySingleProgress = settingsService
-        .getSetting<bool>(AppSettingsEnum.backgroundBackupSingleProgress);
+    final bool notifyTotalProgress = settingsService.getSetting<bool>(AppSettingsEnum.backgroundBackupTotalProgress);
+    final bool notifySingleProgress = settingsService.getSetting<bool>(AppSettingsEnum.backgroundBackupSingleProgress);
 
     if (_canceledBySystem) {
       return false;
@@ -489,10 +466,8 @@ class BackgroundService {
       onSuccess: (result) => _onAssetUploaded(
         shouldNotify: notifyTotalProgress,
       ),
-      onProgress: (bytes, totalBytes) =>
-          _onProgress(bytes, totalBytes, shouldNotify: notifySingleProgress),
-      onCurrentAsset: (asset) =>
-          _onSetCurrentBackupAsset(asset, shouldNotify: notifySingleProgress),
+      onProgress: (bytes, totalBytes) => _onProgress(bytes, totalBytes, shouldNotify: notifySingleProgress),
+      onCurrentAsset: (asset) => _onSetCurrentBackupAsset(asset, shouldNotify: notifySingleProgress),
       onError: _onBackupError,
       isBackground: true,
     );
@@ -527,8 +502,7 @@ class BackgroundService {
   }
 
   void _updateDetailProgress(String? title, int progress, int total) {
-    final String msg =
-        total > 0 ? humanReadableBytesProgress(progress, total) : "";
+    final String msg = total > 0 ? humanReadableBytesProgress(progress, total) : "";
     // only update if message actually differs (to stop many useless notification updates on large assets or slow connections)
     if (msg != _lastPrintedDetailContent || _lastPrintedDetailTitle != title) {
       _lastPrintedDetailContent = msg;
@@ -557,8 +531,8 @@ class BackgroundService {
 
   void _onBackupError(ErrorUploadAsset errorAssetInfo) {
     _showErrorNotification(
-      title: "backup_background_service_upload_failure_notification"
-          .tr(namedArgs: {'filename': errorAssetInfo.fileName}),
+      title:
+          "backup_background_service_upload_failure_notification".tr(namedArgs: {'filename': errorAssetInfo.fileName}),
       individualTag: errorAssetInfo.id,
     );
   }
@@ -571,16 +545,14 @@ class BackgroundService {
       return;
     }
 
-    _throttledDetailNotify.title =
-        "backup_background_service_current_upload_notification"
-            .tr(namedArgs: {'filename': currentUploadAsset.fileName});
+    _throttledDetailNotify.title = "backup_background_service_current_upload_notification"
+        .tr(namedArgs: {'filename': currentUploadAsset.fileName});
     _throttledDetailNotify.progress = 0;
     _throttledDetailNotify.total = 0;
   }
 
   bool _isErrorGracePeriodExceeded(AppSettingsService appSettingsService) {
-    final int value = appSettingsService
-        .getSetting(AppSettingsEnum.uploadErrorNotificationGracePeriod);
+    final int value = appSettingsService.getSetting(AppSettingsEnum.uploadErrorNotificationGracePeriod);
     if (value == 0) {
       return true;
     } else if (value == 5) {
diff --git a/mobile/lib/services/backup.service.dart b/mobile/lib/services/backup.service.dart
index 370b64398d..ea332dd1f9 100644
--- a/mobile/lib/services/backup.service.dart
+++ b/mobile/lib/services/backup.service.dart
@@ -74,8 +74,7 @@ class BackupService {
     }
   }
 
-  Future<void> _saveDuplicatedAssetIds(List<String> deviceAssetIds) =>
-      _assetRepository.transaction(
+  Future<void> _saveDuplicatedAssetIds(List<String> deviceAssetIds) => _assetRepository.transaction(
         () => _assetRepository.upsertDuplicatedAssets(deviceAssetIds),
       );
 
@@ -127,8 +126,7 @@ class BackupService {
         continue;
       }
 
-      if (useTimeFilter &&
-          localAlbum.modifiedAt.isBefore(backupAlbum.lastBackup)) {
+      if (useTimeFilter && localAlbum.modifiedAt.isBefore(backupAlbum.lastBackup)) {
         continue;
       }
       final List<Asset> assets;
@@ -189,8 +187,7 @@ class BackupService {
     final Set<String> existing = {};
     try {
       final String deviceId = Store.get(StoreKey.deviceId);
-      final CheckExistingAssetsResponseDto? duplicates =
-          await _apiService.assetsApi.checkExistingAssets(
+      final CheckExistingAssetsResponseDto? duplicates = await _apiService.assetsApi.checkExistingAssets(
         CheckExistingAssetsDto(
           deviceAssetIds: candidates.map((c) => c.asset.localId!).toList(),
           deviceId: deviceId,
@@ -215,8 +212,7 @@ class BackupService {
   }
 
   Future<bool> _checkPermissions() async {
-    if (Platform.isAndroid &&
-        !(await pm.Permission.accessMediaLocation.status).isGranted) {
+    if (Platform.isAndroid && !(await pm.Permission.accessMediaLocation.status).isGranted) {
       // double check that permission is granted here, to guard against
       // uploading corrupt assets without EXIF information
       _log.warning("Media location permission is not granted. "
@@ -255,8 +251,7 @@ class BackupService {
     required void Function(CurrentUploadAsset asset) onCurrentAsset,
     required void Function(ErrorUploadAsset error) onError,
   }) async {
-    final bool isIgnoreIcloudAssets =
-        _appSetting.getSetting(AppSettingsEnum.ignoreIcloudAssets);
+    final bool isIgnoreIcloudAssets = _appSetting.getSetting(AppSettingsEnum.ignoreIcloudAssets);
     final shouldSyncAlbums = _appSetting.getSetting(AppSettingsEnum.syncAlbums);
     final String deviceId = Store.get(StoreKey.deviceId);
     final String savedEndpoint = Store.get(StoreKey.serverEndpoint);
@@ -279,8 +274,7 @@ class BackupService {
       File? livePhotoFile;
 
       try {
-        final isAvailableLocally =
-            await asset.local!.isLocallyAvailable(isOrigin: true);
+        final isAvailableLocally = await asset.local!.isLocallyAvailable(isOrigin: true);
 
         // Handle getting files from iCloud
         if (!isAvailableLocally && Platform.isIOS) {
@@ -292,17 +286,14 @@ class BackupService {
           onCurrentAsset(
             CurrentUploadAsset(
               id: asset.localId!,
-              fileCreatedAt: asset.fileCreatedAt.year == 1970
-                  ? asset.fileModifiedAt
-                  : asset.fileCreatedAt,
+              fileCreatedAt: asset.fileCreatedAt.year == 1970 ? asset.fileModifiedAt : asset.fileCreatedAt,
               fileName: asset.fileName,
               fileType: _getAssetType(asset.type),
               iCloudAsset: true,
             ),
           );
 
-          file =
-              await asset.local!.loadFile(progressHandler: pmProgressHandler);
+          file = await asset.local!.loadFile(progressHandler: pmProgressHandler);
           if (asset.local!.isLivePhoto) {
             livePhotoFile = await asset.local!.loadFile(
               withSubtype: true,
@@ -310,18 +301,15 @@ class BackupService {
             );
           }
         } else {
-          file =
-              await asset.local!.originFile.timeout(const Duration(seconds: 5));
+          file = await asset.local!.originFile.timeout(const Duration(seconds: 5));
 
           if (asset.local!.isLivePhoto) {
-            livePhotoFile = await asset.local!.originFileWithSubtype
-                .timeout(const Duration(seconds: 5));
+            livePhotoFile = await asset.local!.originFileWithSubtype.timeout(const Duration(seconds: 5));
           }
         }
 
         if (file != null) {
-          String? originalFileName =
-              await _assetMediaRepository.getOriginalFilename(asset.localId!);
+          String? originalFileName = await _assetMediaRepository.getOriginalFilename(asset.localId!);
           originalFileName ??= asset.fileName;
 
           if (asset.local!.isLivePhoto) {
@@ -349,10 +337,8 @@ class BackupService {
           baseRequest.headers.addAll(ApiService.getRequestHeaders());
           baseRequest.fields['deviceAssetId'] = asset.localId!;
           baseRequest.fields['deviceId'] = deviceId;
-          baseRequest.fields['fileCreatedAt'] =
-              asset.fileCreatedAt.toUtc().toIso8601String();
-          baseRequest.fields['fileModifiedAt'] =
-              asset.fileModifiedAt.toUtc().toIso8601String();
+          baseRequest.fields['fileCreatedAt'] = asset.fileCreatedAt.toUtc().toIso8601String();
+          baseRequest.fields['fileModifiedAt'] = asset.fileModifiedAt.toUtc().toIso8601String();
           baseRequest.fields['isFavorite'] = asset.isFavorite.toString();
           baseRequest.fields['duration'] = asset.duration.toString();
           baseRequest.files.add(assetRawUploadData);
@@ -360,9 +346,7 @@ class BackupService {
           onCurrentAsset(
             CurrentUploadAsset(
               id: asset.localId!,
-              fileCreatedAt: asset.fileCreatedAt.year == 1970
-                  ? asset.fileModifiedAt
-                  : asset.fileCreatedAt,
+              fileCreatedAt: asset.fileCreatedAt.year == 1970 ? asset.fileModifiedAt : asset.fileCreatedAt,
               fileName: originalFileName,
               fileType: _getAssetType(asset.type),
               fileSize: file.lengthSync(),
@@ -389,8 +373,7 @@ class BackupService {
             cancellationToken: cancelToken,
           );
 
-          final responseBody =
-              jsonDecode(await response.stream.bytesToString());
+          final responseBody = jsonDecode(await response.stream.bytesToString());
 
           if (![200, 201].contains(response.statusCode)) {
             final error = responseBody;
diff --git a/mobile/lib/services/backup_verification.service.dart b/mobile/lib/services/backup_verification.service.dart
index 6d6884eb00..2f61a125ea 100644
--- a/mobile/lib/services/backup_verification.service.dart
+++ b/mobile/lib/services/backup_verification.service.dart
@@ -181,10 +181,8 @@ class BackupVerificationService {
 
           // for images: make sure they are pixel-wise identical
           // (skip first few KBs containing metadata)
-          final Uint64List localImage =
-              _fakeDecodeImg(await file.readAsBytes());
-          final res = await apiService.assetsApi
-              .downloadAssetWithHttpInfo(remote.remoteId!);
+          final Uint64List localImage = _fakeDecodeImg(await file.readAsBytes());
+          final res = await apiService.assetsApi.downloadAssetWithHttpInfo(remote.remoteId!);
           final Uint64List remoteImage = _fakeDecodeImg(res.bodyBytes);
 
           final eq = const ListEquality().equals(remoteImage, localImage);
@@ -198,9 +196,7 @@ class BackupVerificationService {
 
   static Uint64List _fakeDecodeImg(Uint8List bytes) {
     const headerLength = 131072; // assume header is at most 128 KB
-    final start = bytes.length < headerLength * 2
-        ? (bytes.length ~/ (4 * 8)) * 8
-        : headerLength;
+    final start = bytes.length < headerLength * 2 ? (bytes.length ~/ (4 * 8)) * 8 : headerLength;
     return bytes.buffer.asUint64List(start);
   }
 
diff --git a/mobile/lib/services/deep_link.service.dart b/mobile/lib/services/deep_link.service.dart
index e97a370967..caa20918c3 100644
--- a/mobile/lib/services/deep_link.service.dart
+++ b/mobile/lib/services/deep_link.service.dart
@@ -67,8 +67,7 @@ class DeepLinkService {
   ) async {
     final path = link.uri.path;
 
-    const uuidRegex =
-        r'[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}';
+    const uuidRegex = r'[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}';
     final assetRegex = RegExp('/photos/($uuidRegex)');
     final albumRegex = RegExp('/albums/($uuidRegex)');
 
diff --git a/mobile/lib/services/download.service.dart b/mobile/lib/services/download.service.dart
index fbd3f406fd..a540ca103f 100644
--- a/mobile/lib/services/download.service.dart
+++ b/mobile/lib/services/download.service.dart
@@ -35,8 +35,7 @@ class DownloadService {
   ) {
     _downloadRepository.onImageDownloadStatus = _onImageDownloadCallback;
     _downloadRepository.onVideoDownloadStatus = _onVideoDownloadCallback;
-    _downloadRepository.onLivePhotoDownloadStatus =
-        _onLivePhotoDownloadCallback;
+    _downloadRepository.onLivePhotoDownloadStatus = _onLivePhotoDownloadCallback;
     _downloadRepository.onTaskProgress = _onTaskProgressCallback;
   }
 
@@ -108,10 +107,8 @@ class DownloadService {
       return false;
     }
 
-    final imageRecord =
-        _findTaskRecord(records, livePhotosId, LivePhotosPart.image);
-    final videoRecord =
-        _findTaskRecord(records, livePhotosId, LivePhotosPart.video);
+    final imageRecord = _findTaskRecord(records, livePhotosId, LivePhotosPart.image);
+    final videoRecord = _findTaskRecord(records, livePhotosId, LivePhotosPart.video);
     final imageFilePath = await imageRecord.task.filePath();
     final videoFilePath = await videoRecord.task.filePath();
 
@@ -126,8 +123,7 @@ class DownloadService {
     } on PlatformException catch (error, stack) {
       // Handle saving MotionPhotos on iOS
       if (error.code == 'PHPhotosErrorDomain (-1)') {
-        final result = await _fileMediaRepository
-            .saveImageWithFile(imageFilePath, title: task.filename);
+        final result = await _fileMediaRepository.saveImageWithFile(imageFilePath, title: task.filename);
         return result != null;
       }
       _log.severe("Error saving live photo", error, stack);
@@ -158,8 +154,7 @@ class DownloadService {
   }
 
   Future<List<bool>> downloadAll(List<Asset> assets) async {
-    return await _downloadRepository
-        .downloadAll(assets.expand(_createDownloadTasks).toList());
+    return await _downloadRepository.downloadAll(assets.expand(_createDownloadTasks).toList());
   }
 
   Future<void> download(Asset asset) async {
@@ -181,9 +176,7 @@ class DownloadService {
         ),
         _buildDownloadTask(
           asset.livePhotoVideoId!,
-          asset.fileName
-              .toUpperCase()
-              .replaceAll(RegExp(r"\.(JPG|HEIC)$"), '.MOV'),
+          asset.fileName.toUpperCase().replaceAll(RegExp(r"\.(JPG|HEIC)$"), '.MOV'),
           group: kDownloadGroupLivePhoto,
           metadata: LivePhotosMetadata(
             part: LivePhotosPart.video,
diff --git a/mobile/lib/services/drift_backup.service.dart b/mobile/lib/services/drift_backup.service.dart
index ab878969a0..5aba1794f6 100644
--- a/mobile/lib/services/drift_backup.service.dart
+++ b/mobile/lib/services/drift_backup.service.dart
@@ -144,8 +144,7 @@ class DriftBackupService {
       }
       final response = jsonDecode(update.responseBody!);
 
-      final localAsset =
-          await _localAssetRepository.getById(metadata.localAssetId);
+      final localAsset = await _localAssetRepository.getById(metadata.localAssetId);
       if (localAsset == null) {
         return;
       }
@@ -313,6 +312,5 @@ class UploadTaskMetadata {
   }
 
   @override
-  int get hashCode =>
-      localAssetId.hashCode ^ isLivePhotos.hashCode ^ livePhotoVideoId.hashCode;
+  int get hashCode => localAssetId.hashCode ^ isLivePhotos.hashCode ^ livePhotoVideoId.hashCode;
 }
diff --git a/mobile/lib/services/entity.service.dart b/mobile/lib/services/entity.service.dart
index 8ffead40fa..468cc8f684 100644
--- a/mobile/lib/services/entity.service.dart
+++ b/mobile/lib/services/entity.service.dart
@@ -20,25 +20,21 @@ class EntityService {
       final user = await _isarUserRepository.getByUserId(ownerId);
       album.owner.value = user == null ? null : User.fromDto(user);
     }
-    final thumbnailAssetId =
-        album.remoteThumbnailAssetId ?? album.thumbnail.value?.remoteId;
+    final thumbnailAssetId = album.remoteThumbnailAssetId ?? album.thumbnail.value?.remoteId;
     if (thumbnailAssetId != null) {
       // set thumbnail with asset from database
-      album.thumbnail.value =
-          await _assetRepository.getByRemoteId(thumbnailAssetId);
+      album.thumbnail.value = await _assetRepository.getByRemoteId(thumbnailAssetId);
     }
     if (album.remoteUsers.isNotEmpty) {
       // replace all users with users from database
-      final users = await _isarUserRepository
-          .getByUserIds(album.remoteUsers.map((user) => user.id).toList());
+      final users = await _isarUserRepository.getByUserIds(album.remoteUsers.map((user) => user.id).toList());
       album.sharedUsers.clear();
       album.sharedUsers.addAll(users.nonNulls.map(User.fromDto));
       album.shared = true;
     }
     if (album.remoteAssets.isNotEmpty) {
       // replace all assets with assets from database
-      final assets = await _assetRepository
-          .getAllByRemoteId(album.remoteAssets.map((asset) => asset.remoteId!));
+      final assets = await _assetRepository.getAllByRemoteId(album.remoteAssets.map((asset) => asset.remoteId!));
       album.assets.clear();
       album.assets.addAll(assets);
     }
diff --git a/mobile/lib/services/etag.service.dart b/mobile/lib/services/etag.service.dart
index 4b6f2279ed..00eb83fcea 100644
--- a/mobile/lib/services/etag.service.dart
+++ b/mobile/lib/services/etag.service.dart
@@ -1,8 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/repositories/etag.repository.dart';
 
-final etagServiceProvider =
-    Provider((ref) => ETagService(ref.watch(etagRepositoryProvider)));
+final etagServiceProvider = Provider((ref) => ETagService(ref.watch(etagRepositoryProvider)));
 
 class ETagService {
   final ETagRepository _eTagRepository;
diff --git a/mobile/lib/services/exif.service.dart b/mobile/lib/services/exif.service.dart
index 4d21614ec5..57f793b21e 100644
--- a/mobile/lib/services/exif.service.dart
+++ b/mobile/lib/services/exif.service.dart
@@ -2,8 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/infrastructure/repositories/exif.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/exif.provider.dart';
 
-final exifServiceProvider =
-    Provider((ref) => ExifService(ref.watch(exifRepositoryProvider)));
+final exifServiceProvider = Provider((ref) => ExifService(ref.watch(exifRepositoryProvider)));
 
 class ExifService {
   final IsarExifRepository _exifInfoRepository;
diff --git a/mobile/lib/services/folder.service.dart b/mobile/lib/services/folder.service.dart
index 5b97b475b2..3f4936bb61 100644
--- a/mobile/lib/services/folder.service.dart
+++ b/mobile/lib/services/folder.service.dart
@@ -30,15 +30,13 @@ class FolderService {
         fullPath = '/$fullPath';
       }
 
-      List<String> segments = fullPath.split('/')
-        ..removeWhere((s) => s.isEmpty);
+      List<String> segments = fullPath.split('/')..removeWhere((s) => s.isEmpty);
 
       String currentPath = '';
 
       for (int i = 0; i < segments.length; i++) {
         String parentPath = currentPath.isEmpty ? '_root_' : currentPath;
-        currentPath =
-            i == 0 ? '/${segments[i]}' : '$currentPath/${segments[i]}';
+        currentPath = i == 0 ? '/${segments[i]}' : '$currentPath/${segments[i]}';
 
         if (!folderMap.containsKey(parentPath)) {
           folderMap[parentPath] = [];
@@ -54,26 +52,20 @@ class FolderService {
           );
           // Sort folders based on order parameter
           folderMap[parentPath]!.sort(
-            (a, b) => order == SortOrder.desc
-                ? b.name.compareTo(a.name)
-                : a.name.compareTo(b.name),
+            (a, b) => order == SortOrder.desc ? b.name.compareTo(a.name) : a.name.compareTo(b.name),
           );
         }
       }
     }
 
     void attachSubfolders(RecursiveFolder folder) {
-      String fullPath = folder.path.isEmpty
-          ? '/${folder.name}'
-          : '${folder.path}/${folder.name}';
+      String fullPath = folder.path.isEmpty ? '/${folder.name}' : '${folder.path}/${folder.name}';
 
       if (folderMap.containsKey(fullPath)) {
         folder.subfolders.addAll(folderMap[fullPath]!);
         // Sort subfolders based on order parameter
         folder.subfolders.sort(
-          (a, b) => order == SortOrder.desc
-              ? b.name.compareTo(a.name)
-              : a.name.compareTo(b.name),
+          (a, b) => order == SortOrder.desc ? b.name.compareTo(a.name) : a.name.compareTo(b.name),
         );
         for (var subfolder in folder.subfolders) {
           attachSubfolders(subfolder);
@@ -84,9 +76,7 @@ class FolderService {
     List<RecursiveFolder> rootSubfolders = folderMap['_root_'] ?? [];
     // Sort root subfolders based on order parameter
     rootSubfolders.sort(
-      (a, b) => order == SortOrder.desc
-          ? b.name.compareTo(a.name)
-          : a.name.compareTo(b.name),
+      (a, b) => order == SortOrder.desc ? b.name.compareTo(a.name) : a.name.compareTo(b.name),
     );
 
     for (var folder in rootSubfolders) {
@@ -105,8 +95,7 @@ class FolderService {
   ) async {
     try {
       if (folder is RecursiveFolder) {
-        String fullPath =
-            folder.path.isEmpty ? folder.name : '${folder.path}/${folder.name}';
+        String fullPath = folder.path.isEmpty ? folder.name : '${folder.path}/${folder.name}';
         fullPath = fullPath[0] == '/' ? fullPath.substring(1) : fullPath;
         var result = await _folderApiRepository.getAssetsForPath(fullPath);
 
diff --git a/mobile/lib/services/gcast.service.dart b/mobile/lib/services/gcast.service.dart
index 6d6646fe50..de9b8bbcb2 100644
--- a/mobile/lib/services/gcast.service.dart
+++ b/mobile/lib/services/gcast.service.dart
@@ -71,8 +71,7 @@ class GCastService {
   }
 
   void _handleMediaStatus(Map<String, dynamic> message) {
-    final statusList =
-        (message['status'] as List).whereType<Map<String, dynamic>>().toList();
+    final statusList = (message['status'] as List).whereType<Map<String, dynamic>>().toList();
 
     if (statusList.isEmpty) {
       return;
@@ -112,8 +111,7 @@ class GCastService {
     }
 
     if (status["currentTime"] != null) {
-      final currentTime =
-          Duration(milliseconds: (status["currentTime"] * 1000 ?? 0).toInt());
+      final currentTime = Duration(milliseconds: (status["currentTime"] * 1000 ?? 0).toInt());
       onCurrentTime?.call(currentTime);
     }
   }
@@ -150,8 +148,7 @@ class GCastService {
 
     // we want to make sure we have at least 10 seconds remaining in the session
     // this is to account for network latency and other delays when sending the request
-    final bufferedExpiration =
-        tokenExpiration.subtract(const Duration(seconds: 10));
+    final bufferedExpiration = tokenExpiration.subtract(const Duration(seconds: 10));
 
     return bufferedExpiration.isAfter(DateTime.now());
   }
@@ -181,8 +178,7 @@ class GCastService {
             type: AssetMediaSize.fullsize,
           );
 
-    final authenticatedURL =
-        "$unauthenticatedUrl&sessionKey=${sessionKey?.token}";
+    final authenticatedURL = "$unauthenticatedUrl&sessionKey=${sessionKey?.token}";
 
     // get image mime type
     final mimeType = await _assetApiRepository.getAssetMIMEType(asset.id);
@@ -210,8 +206,7 @@ class GCastService {
     _mediaStatusPollingTimer?.cancel();
 
     if (asset.isVideo) {
-      _mediaStatusPollingTimer =
-          Timer.periodic(const Duration(milliseconds: 500), (timer) {
+      _mediaStatusPollingTimer = Timer.periodic(const Duration(milliseconds: 500), (timer) {
         if (isConnected) {
           _gCastRepository.sendMessage(CastSession.kNamespaceMedia, {
             "type": "GET_STATUS",
@@ -264,11 +259,7 @@ class GCastService {
 
     return dests
         .map(
-      (device) => (
-        device.extras["fn"] ?? "Google Cast",
-        CastDestinationType.googleCast,
-        device
-      ),
+      (device) => (device.extras["fn"] ?? "Google Cast", CastDestinationType.googleCast, device),
     )
         .where((device) {
       final caString = device.$3.extras["ca"];
diff --git a/mobile/lib/services/local_files_manager.service.dart b/mobile/lib/services/local_files_manager.service.dart
index 6ba8b43fbf..ae935a131c 100644
--- a/mobile/lib/services/local_files_manager.service.dart
+++ b/mobile/lib/services/local_files_manager.service.dart
@@ -13,8 +13,7 @@ class LocalFilesManagerService {
 
   Future<bool> moveToTrash(List<String> mediaUrls) async {
     try {
-      return await _channel
-          .invokeMethod('moveToTrash', {'mediaUrls': mediaUrls});
+      return await _channel.invokeMethod('moveToTrash', {'mediaUrls': mediaUrls});
     } catch (e, s) {
       _logger.warning('Error moving file to trash', e, s);
       return false;
diff --git a/mobile/lib/services/local_notification.service.dart b/mobile/lib/services/local_notification.service.dart
index b47ee280b8..d67cc23616 100644
--- a/mobile/lib/services/local_notification.service.dart
+++ b/mobile/lib/services/local_notification.service.dart
@@ -13,8 +13,7 @@ final localNotificationService = Provider(
 );
 
 class LocalNotificationService {
-  final FlutterLocalNotificationsPlugin _localNotificationPlugin =
-      FlutterLocalNotificationsPlugin();
+  final FlutterLocalNotificationsPlugin _localNotificationPlugin = FlutterLocalNotificationsPlugin();
   final PermissionStatus _permissionStatus;
   final Ref ref;
 
@@ -29,17 +28,14 @@ class LocalNotificationService {
   static const cancelUploadActionID = 'cancel_upload';
 
   Future<void> setup() async {
-    const androidSetting =
-        AndroidInitializationSettings('@drawable/notification_icon');
+    const androidSetting = AndroidInitializationSettings('@drawable/notification_icon');
     const iosSetting = DarwinInitializationSettings();
 
-    const initSettings =
-        InitializationSettings(android: androidSetting, iOS: iosSetting);
+    const initSettings = InitializationSettings(android: androidSetting, iOS: iosSetting);
 
     await _localNotificationPlugin.initialize(
       initSettings,
-      onDidReceiveNotificationResponse:
-          _onDidReceiveForegroundNotificationResponse,
+      onDidReceiveNotificationResponse: _onDidReceiveForegroundNotificationResponse,
     );
   }
 
diff --git a/mobile/lib/services/memory.service.dart b/mobile/lib/services/memory.service.dart
index a44a5ad1bd..ca877e7c78 100644
--- a/mobile/lib/services/memory.service.dart
+++ b/mobile/lib/services/memory.service.dart
@@ -35,8 +35,7 @@ class MemoryService {
       List<Memory> memories = [];
 
       for (final memory in data) {
-        final dbAssets = await _assetRepository
-            .getAllByRemoteId(memory.assets.map((e) => e.id));
+        final dbAssets = await _assetRepository.getAllByRemoteId(memory.assets.map((e) => e.id));
         final yearsAgo = now.year - memory.data.year;
         if (dbAssets.isNotEmpty) {
           final String title = 'years_ago'.t(
@@ -67,8 +66,7 @@ class MemoryService {
       if (memoryResponse == null) {
         return null;
       }
-      final dbAssets = await _assetRepository
-          .getAllByRemoteId(memoryResponse.assets.map((e) => e.id));
+      final dbAssets = await _assetRepository.getAllByRemoteId(memoryResponse.assets.map((e) => e.id));
       if (dbAssets.isEmpty) {
         log.warning("No assets found for memory with ID: $id");
         return null;
diff --git a/mobile/lib/services/partner.service.dart b/mobile/lib/services/partner.service.dart
index ec210fd587..7b4f8a09b0 100644
--- a/mobile/lib/services/partner.service.dart
+++ b/mobile/lib/services/partner.service.dart
@@ -45,8 +45,7 @@ class PartnerService {
   Future<bool> removePartner(UserDto partner) async {
     try {
       await _partnerApiRepository.delete(partner.id);
-      await _isarUserRepository
-          .update(partner.copyWith(isPartnerSharedBy: false));
+      await _isarUserRepository.update(partner.copyWith(isPartnerSharedBy: false));
     } catch (e) {
       _log.warning("Failed to remove partner ${partner.id}", e);
       return false;
@@ -57,8 +56,7 @@ class PartnerService {
   Future<bool> addPartner(UserDto partner) async {
     try {
       await _partnerApiRepository.create(partner.id);
-      await _isarUserRepository
-          .update(partner.copyWith(isPartnerSharedBy: true));
+      await _isarUserRepository.update(partner.copyWith(isPartnerSharedBy: true));
       return true;
     } catch (e) {
       _log.warning("Failed to add partner ${partner.id}", e);
@@ -75,8 +73,7 @@ class PartnerService {
         partner.id,
         inTimeline: inTimeline,
       );
-      await _isarUserRepository
-          .update(partner.copyWith(inTimeline: dto.inTimeline));
+      await _isarUserRepository.update(partner.copyWith(inTimeline: dto.inTimeline));
       return true;
     } catch (e) {
       _log.warning("Failed to update partner ${partner.id}", e);
diff --git a/mobile/lib/services/person.service.dart b/mobile/lib/services/person.service.dart
index 08b18dfd10..a2f7203d37 100644
--- a/mobile/lib/services/person.service.dart
+++ b/mobile/lib/services/person.service.dart
@@ -40,8 +40,7 @@ class PersonService {
   Future<List<Asset>> getPersonAssets(String id) async {
     try {
       final assets = await _assetApiRepository.search(personIds: [id]);
-      return await _assetRepository
-          .getAllByRemoteId(assets.map((a) => a.remoteId!));
+      return await _assetRepository.getAllByRemoteId(assets.map((a) => a.remoteId!));
     } catch (error, stack) {
       _log.severe("Error while fetching person assets", error, stack);
     }
diff --git a/mobile/lib/services/search.service.dart b/mobile/lib/services/search.service.dart
index aa72a7908b..2aa39fcf80 100644
--- a/mobile/lib/services/search.service.dart
+++ b/mobile/lib/services/search.service.dart
@@ -61,8 +61,7 @@ class SearchService {
       }
 
       return SearchResult(
-        assets: await _assetRepository
-            .getAllByRemoteId(response.assets.items.map((e) => e.id)),
+        assets: await _assetRepository.getAllByRemoteId(response.assets.items.map((e) => e.id)),
         nextPage: response.assets.nextPage?.toInt(),
       );
     } catch (error, stackTrace) {
diff --git a/mobile/lib/services/share.service.dart b/mobile/lib/services/share.service.dart
index 77afa10fb6..fec8b76af0 100644
--- a/mobile/lib/services/share.service.dart
+++ b/mobile/lib/services/share.service.dart
@@ -10,8 +10,7 @@ import 'package:path_provider/path_provider.dart';
 import 'package:share_plus/share_plus.dart';
 import 'api.service.dart';
 
-final shareServiceProvider =
-    Provider((ref) => ShareService(ref.watch(apiServiceProvider)));
+final shareServiceProvider = Provider((ref) => ShareService(ref.watch(apiServiceProvider)));
 
 class ShareService {
   final ApiService _apiService;
@@ -37,8 +36,7 @@ class ShareService {
           final tempDir = await getTemporaryDirectory();
           final fileName = asset.fileName;
           final tempFile = await File('${tempDir.path}/$fileName').create();
-          final res = await _apiService.assetsApi
-              .downloadAssetWithHttpInfo(asset.remoteId!);
+          final res = await _apiService.assetsApi.downloadAssetWithHttpInfo(asset.remoteId!);
 
           if (res.statusCode != 200) {
             _log.severe(
diff --git a/mobile/lib/services/shared_link.service.dart b/mobile/lib/services/shared_link.service.dart
index a2b5ed9062..44923b39d7 100644
--- a/mobile/lib/services/shared_link.service.dart
+++ b/mobile/lib/services/shared_link.service.dart
@@ -18,9 +18,7 @@ class SharedLinkService {
   Future<AsyncValue<List<SharedLink>>> getAllSharedLinks() async {
     try {
       final list = await _apiService.sharedLinksApi.getAllSharedLinks();
-      return list != null
-          ? AsyncData(list.map(SharedLink.fromDto).toList())
-          : const AsyncData([]);
+      return list != null ? AsyncData(list.map(SharedLink.fromDto).toList()) : const AsyncData([]);
     } catch (e, stack) {
       _log.severe("Failed to fetch shared links", e, stack);
       return AsyncError(e, stack);
@@ -46,8 +44,7 @@ class SharedLinkService {
     DateTime? expiresAt,
   }) async {
     try {
-      final type =
-          albumId != null ? SharedLinkType.ALBUM : SharedLinkType.INDIVIDUAL;
+      final type = albumId != null ? SharedLinkType.ALBUM : SharedLinkType.INDIVIDUAL;
       SharedLinkCreateDto? dto;
       if (type == SharedLinkType.ALBUM) {
         dto = SharedLinkCreateDto(
@@ -74,8 +71,7 @@ class SharedLinkService {
       }
 
       if (dto != null) {
-        final responseDto =
-            await _apiService.sharedLinksApi.createSharedLink(dto);
+        final responseDto = await _apiService.sharedLinksApi.createSharedLink(dto);
         if (responseDto != null) {
           return SharedLink.fromDto(responseDto);
         }
diff --git a/mobile/lib/services/stack.service.dart b/mobile/lib/services/stack.service.dart
index e2ab6c804b..d46c0c0b99 100644
--- a/mobile/lib/services/stack.service.dart
+++ b/mobile/lib/services/stack.service.dart
@@ -60,8 +60,7 @@ class StackService {
 
         removeAssets.add(asset);
       }
-      await _assetRepository
-          .transaction(() => _assetRepository.updateAll(removeAssets));
+      await _assetRepository.transaction(() => _assetRepository.updateAll(removeAssets));
     } catch (error) {
       debugPrint("Error while deleting stack: $error");
     }
diff --git a/mobile/lib/services/sync.service.dart b/mobile/lib/services/sync.service.dart
index 5a95be2237..723dc9c34b 100644
--- a/mobile/lib/services/sync.service.dart
+++ b/mobile/lib/services/sync.service.dart
@@ -94,8 +94,7 @@ class SyncService {
 
   /// Syncs users from the server to the local database
   /// Returns `true`if there were any changes
-  Future<bool> syncUsersFromServer(List<UserDto> users) =>
-      _lock.run(() => _syncUsersFromServer(users));
+  Future<bool> syncUsersFromServer(List<UserDto> users) => _lock.run(() => _syncUsersFromServer(users));
 
   /// Syncs remote assets owned by the logged-in user to the DB
   /// Returns `true` if there were any changes
@@ -105,8 +104,7 @@ class SyncService {
       List<UserDto> users,
       DateTime since,
     ) getChangedAssets,
-    required FutureOr<List<Asset>?> Function(UserDto user, DateTime until)
-        loadAssets,
+    required FutureOr<List<Asset>?> Function(UserDto user, DateTime until) loadAssets,
   }) =>
       _lock.run(
         () async =>
@@ -139,18 +137,13 @@ class SyncService {
     }
     deleteCandidates.sort(Asset.compareById);
     existing.sort(Asset.compareById);
-    return _diffAssets(existing, deleteCandidates, compare: Asset.compareById)
-        .$3
-        .map((e) => e.id)
-        .toList();
+    return _diffAssets(existing, deleteCandidates, compare: Asset.compareById).$3.map((e) => e.id).toList();
   }
 
   /// Syncs a new asset to the db. Returns `true` if successful
-  Future<bool> syncNewAssetToDb(Asset newAsset) =>
-      _lock.run(() => _syncNewAssetToDb(newAsset));
+  Future<bool> syncNewAssetToDb(Asset newAsset) => _lock.run(() => _syncNewAssetToDb(newAsset));
 
-  Future<bool> removeAllLocalAlbumsAndAssets() =>
-      _lock.run(_removeAllLocalAlbumsAndAssets);
+  Future<bool> removeAllLocalAlbumsAndAssets() => _lock.run(_removeAllLocalAlbumsAndAssets);
 
   // private methods:
 
@@ -189,8 +182,7 @@ class SyncService {
 
   /// Syncs a new asset to the db. Returns `true` if successful
   Future<bool> _syncNewAssetToDb(Asset a) async {
-    final Asset? inDb =
-        await _assetRepository.getByOwnerIdChecksum(a.ownerId, a.checksum);
+    final Asset? inDb = await _assetRepository.getByOwnerIdChecksum(a.ownerId, a.checksum);
     if (inDb != null) {
       // unify local/remote assets by replacing the
       // local-only asset in the DB with a local&remote asset
@@ -214,8 +206,7 @@ class SyncService {
     ) getChangedAssets,
   ) async {
     final currentUser = _userService.getMyUser();
-    final DateTime? since =
-        (await _eTagRepository.get(currentUser.id))?.time?.toUtc();
+    final DateTime? since = (await _eTagRepository.get(currentUser.id))?.time?.toUtc();
     if (since == null) return null;
     final DateTime now = DateTime.now();
     final (toUpsert, toDelete) = await getChangedAssets(users, since);
@@ -244,13 +235,10 @@ class SyncService {
 
   Future<void> _moveToTrashMatchedAssets(Iterable<String> idsToDelete) async {
     final List<Asset> localAssets = await _assetRepository.getAllLocal();
-    final List<Asset> matchedAssets = localAssets
-        .where((asset) => idsToDelete.contains(asset.remoteId))
-        .toList();
+    final List<Asset> matchedAssets = localAssets.where((asset) => idsToDelete.contains(asset.remoteId)).toList();
 
     final mediaUrls = await Future.wait(
-      matchedAssets
-          .map((asset) => asset.local?.getMediaUrl() ?? Future.value(null)),
+      matchedAssets.map((asset) => asset.local?.getMediaUrl() ?? Future.value(null)),
     );
 
     await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
@@ -371,10 +359,8 @@ class SyncService {
     final bool changes = await diffSortedLists(
       remoteAlbums,
       dbAlbums,
-      compare: (remoteAlbum, dbAlbum) =>
-          remoteAlbum.remoteId!.compareTo(dbAlbum.remoteId!),
-      both: (remoteAlbum, dbAlbum) =>
-          _syncRemoteAlbum(remoteAlbum, dbAlbum, toDelete, existing),
+      compare: (remoteAlbum, dbAlbum) => remoteAlbum.remoteId!.compareTo(dbAlbum.remoteId!),
+      both: (remoteAlbum, dbAlbum) => _syncRemoteAlbum(remoteAlbum, dbAlbum, toDelete, existing),
       onlyFirst: (remoteAlbum) => _addAlbumFromServer(remoteAlbum, existing),
       onlySecond: (dbAlbum) => _removeAlbumFromDb(dbAlbum, toDelete),
     );
@@ -421,11 +407,9 @@ class SyncService {
     );
 
     // update shared users
-    final List<UserDto> sharedUsers =
-        album.sharedUsers.map((u) => u.toDto()).toList(growable: false);
+    final List<UserDto> sharedUsers = album.sharedUsers.map((u) => u.toDto()).toList(growable: false);
     sharedUsers.sort((a, b) => a.id.compareTo(b.id));
-    final List<UserDto> users = dto.remoteUsers.map((u) => u.toDto()).toList()
-      ..sort((a, b) => a.id.compareTo(b.id));
+    final List<UserDto> users = dto.remoteUsers.map((u) => u.toDto()).toList()..sort((a, b) => a.id.compareTo(b.id));
     final List<String> userIdsToAdd = [];
     final List<UserDto> usersToUnlink = [];
     diffSortedListsSync(
@@ -456,10 +440,8 @@ class SyncService {
     album.sortOrder = dto.sortOrder;
 
     final remoteThumbnailAssetId = dto.remoteThumbnailAssetId;
-    if (remoteThumbnailAssetId != null &&
-        album.thumbnail.value?.remoteId != remoteThumbnailAssetId) {
-      album.thumbnail.value =
-          await _assetRepository.getByRemoteId(remoteThumbnailAssetId);
+    if (remoteThumbnailAssetId != null && album.thumbnail.value?.remoteId != remoteThumbnailAssetId) {
+      album.thumbnail.value = await _assetRepository.getByRemoteId(remoteThumbnailAssetId);
     }
 
     // write & commit all changes to DB
@@ -480,8 +462,7 @@ class SyncService {
 
     if (album.shared || dto.shared) {
       final userId = (_userService.getMyUser()).id;
-      final foreign =
-          await _assetRepository.getByAlbum(album, notOwnedBy: [userId]);
+      final foreign = await _assetRepository.getByAlbum(album, notOwnedBy: [userId]);
       existing.addAll(foreign);
 
       // delete assets in DB unless they belong to this user or part of some other shared album
@@ -505,16 +486,14 @@ class SyncService {
     if (album.remoteAssetCount == album.remoteAssets.length) {
       // in case an album contains assets not yet present in local DB:
       // put missing album assets into local DB
-      final (existingInDb, updated) =
-          await _linkWithExistingFromDb(album.remoteAssets.toList());
+      final (existingInDb, updated) = await _linkWithExistingFromDb(album.remoteAssets.toList());
       existing.addAll(existingInDb);
       await upsertAssetsWithExif(updated);
 
       await _entityService.fillAlbumWithDatabaseEntities(album);
       await _albumRepository.create(album);
     } else {
-      _log.warning(
-          "Failed to add album from server: assetCount ${album.remoteAssetCount} != "
+      _log.warning("Failed to add album from server: assetCount ${album.remoteAssetCount} != "
           "asset array length ${album.remoteAssets.length} for album ${album.name}");
     }
   }
@@ -534,8 +513,7 @@ class SyncService {
     } else if (album.shared) {
       // delete assets in DB unless they belong to this user or are part of some other shared album or belong to a partner
       final userIds = (await _getAllAccessibleUsers()).map((user) => user.id);
-      final orphanedAssets =
-          await _assetRepository.getByAlbum(album, notOwnedBy: userIds);
+      final orphanedAssets = await _assetRepository.getByAlbum(album, notOwnedBy: userIds);
       deleteCandidates.addAll(orphanedAssets);
     }
     try {
@@ -553,8 +531,7 @@ class SyncService {
     Set<String>? excludedAssets,
   ]) async {
     onDevice.sort((a, b) => a.localId!.compareTo(b.localId!));
-    final inDb =
-        await _albumRepository.getAll(remote: false, sortBy: AlbumSort.localId);
+    final inDb = await _albumRepository.getAll(remote: false, sortBy: AlbumSort.localId);
     final List<Asset> deleteCandidates = [];
     final List<Asset> existing = [];
     final bool anyChanges = await diffSortedLists(
@@ -574,8 +551,7 @@ class SyncService {
     _log.fine(
       "Syncing all local albums almost done. Collected ${deleteCandidates.length} asset candidates to delete",
     );
-    final (toDelete, toUpdate) =
-        _handleAssetRemoval(deleteCandidates, existing, remote: false);
+    final (toDelete, toUpdate) = _handleAssetRemoval(deleteCandidates, existing, remote: false);
     _log.fine(
       "${toDelete.length} assets to delete, ${toUpdate.length} to update",
     );
@@ -610,9 +586,7 @@ class SyncService {
       return false;
     }
     _log.info("Local album ${deviceAlbum.name} has changed. Syncing...");
-    if (!forceRefresh &&
-        excludedAssets == null &&
-        await _syncDeviceAlbumFast(deviceAlbum, dbAlbum)) {
+    if (!forceRefresh && excludedAssets == null && await _syncDeviceAlbumFast(deviceAlbum, dbAlbum)) {
       _log.info("Fast synced local album ${deviceAlbum.name} to DB");
       return true;
     }
@@ -624,8 +598,7 @@ class SyncService {
     );
 
     assert(inDb.isSorted(Asset.compareByChecksum), "inDb not sorted!");
-    final int assetCountOnDevice =
-        await _albumMediaRepository.getAssetCount(deviceAlbum.localId!);
+    final int assetCountOnDevice = await _albumMediaRepository.getAssetCount(deviceAlbum.localId!);
     final List<Asset> onDevice = await _getHashedAssets(
       deviceAlbum,
       excludedAssets: excludedAssets,
@@ -643,9 +616,7 @@ class SyncService {
       _log.info(
         "Only excluded assets in local album ${deviceAlbum.name} changed. Stopping sync.",
       );
-      if (assetCountOnDevice !=
-          (await _eTagRepository.getById(deviceAlbum.eTagKeyAssetCount))
-              ?.assetCount) {
+      if (assetCountOnDevice != (await _eTagRepository.getById(deviceAlbum.eTagKeyAssetCount))?.assetCount) {
         await _eTagRepository.upsertAll([
           ETag(
             id: deviceAlbum.eTagKeyAssetCount,
@@ -667,8 +638,7 @@ class SyncService {
     dbAlbum.name = deviceAlbum.name;
     dbAlbum.description = deviceAlbum.description;
     dbAlbum.modifiedAt = deviceAlbum.modifiedAt;
-    if (dbAlbum.thumbnail.value != null &&
-        toDelete.contains(dbAlbum.thumbnail.value)) {
+    if (dbAlbum.thumbnail.value != null && toDelete.contains(dbAlbum.thumbnail.value)) {
       dbAlbum.thumbnail.value = null;
     }
     try {
@@ -702,12 +672,8 @@ class SyncService {
       );
       return false;
     }
-    final int totalOnDevice =
-        await _albumMediaRepository.getAssetCount(deviceAlbum.localId!);
-    final int lastKnownTotal =
-        (await _eTagRepository.getById(deviceAlbum.eTagKeyAssetCount))
-                ?.assetCount ??
-            0;
+    final int totalOnDevice = await _albumMediaRepository.getAssetCount(deviceAlbum.localId!);
+    final int lastKnownTotal = (await _eTagRepository.getById(deviceAlbum.eTagKeyAssetCount))?.assetCount ?? 0;
     if (totalOnDevice <= lastKnownTotal) {
       _log.info(
         "Local album ${deviceAlbum.name} totalOnDevice is less than lastKnownTotal. Skipping sync.",
@@ -776,8 +742,7 @@ class SyncService {
     album.thumbnail.value = thumb;
     try {
       await _albumRepository.create(album);
-      final int assetCount =
-          await _albumMediaRepository.getAssetCount(album.localId!);
+      final int assetCount = await _albumMediaRepository.getAssetCount(album.localId!);
       await _eTagRepository.upsertAll([
         ETag(id: album.eTagKeyAssetCount, assetCount: assetCount),
       ]);
@@ -913,9 +878,8 @@ class SyncService {
       modifiedFrom: modifiedFrom,
       modifiedUntil: modifiedUntil,
     );
-    final filtered = excludedAssets == null
-        ? entities
-        : entities.where((e) => !excludedAssets.contains(e.localId!)).toList();
+    final filtered =
+        excludedAssets == null ? entities : entities.where((e) => !excludedAssets.contains(e.localId!)).toList();
     return _hashService.hashAssets(filtered);
   }
 
@@ -942,15 +906,13 @@ class SyncService {
         deviceAlbum.description != dbAlbum.description ||
         !deviceAlbum.modifiedAt.isAtSameMomentAs(dbAlbum.modifiedAt) ||
         await _albumMediaRepository.getAssetCount(deviceAlbum.localId!) !=
-            (await _eTagRepository.getById(deviceAlbum.eTagKeyAssetCount))
-                ?.assetCount;
+            (await _eTagRepository.getById(deviceAlbum.eTagKeyAssetCount))?.assetCount;
   }
 
   Future<bool> _removeAllLocalAlbumsAndAssets() async {
     try {
       final assets = await _assetRepository.getAllLocal();
-      final (toDelete, toUpdate) =
-          _handleAssetRemoval(assets, [], remote: false);
+      final (toDelete, toUpdate) = _handleAssetRemoval(assets, [], remote: false);
       await _assetRepository.transaction(() async {
         await _assetRepository.deleteByIds(toDelete);
         await _assetRepository.updateAll(toUpdate);
@@ -971,10 +933,8 @@ class SyncService {
       _log.warning("Failed to fetch users", e);
       users = null;
     }
-    final List<UserDto> sharedBy =
-        await _partnerApiRepository.getAll(Direction.sharedByMe);
-    final List<UserDto> sharedWith =
-        await _partnerApiRepository.getAll(Direction.sharedWithMe);
+    final List<UserDto> sharedBy = await _partnerApiRepository.getAll(Direction.sharedByMe);
+    final List<UserDto> sharedWith = await _partnerApiRepository.getAll(Direction.sharedWithMe);
 
     if (users == null) {
       _log.warning("Failed to refresh users");
diff --git a/mobile/lib/services/timeline.service.dart b/mobile/lib/services/timeline.service.dart
index 47ad17fc25..1a4f9e2685 100644
--- a/mobile/lib/services/timeline.service.dart
+++ b/mobile/lib/services/timeline.service.dart
@@ -103,8 +103,7 @@ class TimelineService {
   }
 
   GroupAssetsBy _getGroupByOption() {
-    return GroupAssetsBy
-        .values[_appSettingsService.getSetting(AppSettingsEnum.groupAssetsBy)];
+    return GroupAssetsBy.values[_appSettingsService.getSetting(AppSettingsEnum.groupAssetsBy)];
   }
 
   Stream<RenderList> watchLockedTimelineProvider() async* {
diff --git a/mobile/lib/services/upload.service.dart b/mobile/lib/services/upload.service.dart
index b869624e52..398a402586 100644
--- a/mobile/lib/services/upload.service.dart
+++ b/mobile/lib/services/upload.service.dart
@@ -20,14 +20,11 @@ class UploadService {
   void Function(TaskStatusUpdate)? onUploadStatus;
   void Function(TaskProgressUpdate)? onTaskProgress;
 
-  final StreamController<TaskStatusUpdate> _taskStatusController =
-      StreamController<TaskStatusUpdate>.broadcast();
-  final StreamController<TaskProgressUpdate> _taskProgressController =
-      StreamController<TaskProgressUpdate>.broadcast();
+  final StreamController<TaskStatusUpdate> _taskStatusController = StreamController<TaskStatusUpdate>.broadcast();
+  final StreamController<TaskProgressUpdate> _taskProgressController = StreamController<TaskProgressUpdate>.broadcast();
 
   Stream<TaskStatusUpdate> get taskStatusStream => _taskStatusController.stream;
-  Stream<TaskProgressUpdate> get taskProgressStream =>
-      _taskProgressController.stream;
+  Stream<TaskProgressUpdate> get taskProgressStream => _taskProgressController.stream;
 
   UploadService(
     this._uploadRepository,
@@ -103,8 +100,7 @@ class UploadService {
     final headers = ApiService.getRequestHeaders();
     final deviceId = Store.get(StoreKey.deviceId);
 
-    final (baseDirectory, directory, filename) =
-        await Task.split(filePath: file.path);
+    final (baseDirectory, directory, filename) = await Task.split(filePath: file.path);
     final stats = await file.stat();
     final fileCreatedAt = stats.changed;
     final fileModifiedAt = stats.modified;
diff --git a/mobile/lib/theme/theme_data.dart b/mobile/lib/theme/theme_data.dart
index a351b09093..32695ef26e 100644
--- a/mobile/lib/theme/theme_data.dart
+++ b/mobile/lib/theme/theme_data.dart
@@ -45,8 +45,7 @@ ThemeData getThemeData({
         fontWeight: FontWeight.w600,
         fontSize: 18,
       ),
-      backgroundColor:
-          isDark ? colorScheme.surfaceContainer : colorScheme.surface,
+      backgroundColor: isDark ? colorScheme.surfaceContainer : colorScheme.surface,
       foregroundColor: colorScheme.primary,
       elevation: 0,
       scrolledUnderElevation: 0,
@@ -100,8 +99,7 @@ ThemeData getThemeData({
       ),
     ),
     navigationBarTheme: NavigationBarThemeData(
-      backgroundColor:
-          isDark ? colorScheme.surfaceContainer : colorScheme.surface,
+      backgroundColor: isDark ? colorScheme.surfaceContainer : colorScheme.surface,
       labelTextStyle: const WidgetStatePropertyAll(
         TextStyle(
           fontSize: 14,
diff --git a/mobile/lib/utils/backup_progress.dart b/mobile/lib/utils/backup_progress.dart
index 38cdeacdb2..3d2af2877e 100644
--- a/mobile/lib/utils/backup_progress.dart
+++ b/mobile/lib/utils/backup_progress.dart
@@ -50,8 +50,7 @@ String humanReadableBytesProgress(int bytes, int bytesTotal) {
 }
 
 class ThrottleProgressUpdate {
-  ThrottleProgressUpdate(this._fun, Duration interval)
-      : _interval = interval.inMicroseconds;
+  ThrottleProgressUpdate(this._fun, Duration interval) : _interval = interval.inMicroseconds;
   final void Function(String?, int, int) _fun;
   final int _interval;
   int _invokedAt = 0;
diff --git a/mobile/lib/utils/cache/custom_image_cache.dart b/mobile/lib/utils/cache/custom_image_cache.dart
index 8c70472765..6465a68222 100644
--- a/mobile/lib/utils/cache/custom_image_cache.dart
+++ b/mobile/lib/utils/cache/custom_image_cache.dart
@@ -60,15 +60,13 @@ final class CustomImageCache implements ImageCache {
   int get currentSizeBytes => _small.currentSizeBytes + _large.currentSizeBytes;
 
   @override
-  bool evict(Object key, {bool includeLive = true}) =>
-      _cacheForKey(key).evict(key, includeLive: includeLive);
+  bool evict(Object key, {bool includeLive = true}) => _cacheForKey(key).evict(key, includeLive: includeLive);
 
   @override
   int get liveImageCount => _small.liveImageCount + _large.liveImageCount;
 
   @override
-  int get pendingImageCount =>
-      _small.pendingImageCount + _large.pendingImageCount;
+  int get pendingImageCount => _small.pendingImageCount + _large.pendingImageCount;
 
   @override
   ImageStreamCompleter? putIfAbsent(
@@ -79,6 +77,5 @@ final class CustomImageCache implements ImageCache {
       _cacheForKey(key).putIfAbsent(key, loader, onError: onError);
 
   @override
-  ImageCacheStatus statusForKey(Object key) =>
-      _cacheForKey(key).statusForKey(key);
+  ImageCacheStatus statusForKey(Object key) => _cacheForKey(key).statusForKey(key);
 }
diff --git a/mobile/lib/utils/color_filter_generator.dart b/mobile/lib/utils/color_filter_generator.dart
index c155823264..d4217a9319 100644
--- a/mobile/lib/utils/color_filter_generator.dart
+++ b/mobile/lib/utils/color_filter_generator.dart
@@ -82,8 +82,7 @@ class _ColorFilterGenerator {
       ];
     }
 
-    double x =
-        ((1 + ((value > 0) ? ((3 * value) / 100) : (value / 100)))).toDouble();
+    double x = ((1 + ((value > 0) ? ((3 * value) / 100) : (value / 100)))).toDouble();
     double lumR = 0.3086;
     double lumG = 0.6094;
     double lumB = 0.082;
diff --git a/mobile/lib/utils/datetime_comparison.dart b/mobile/lib/utils/datetime_comparison.dart
index 8c53ea45ba..f8ddcfea11 100644
--- a/mobile/lib/utils/datetime_comparison.dart
+++ b/mobile/lib/utils/datetime_comparison.dart
@@ -1,3 +1,2 @@
 bool isAtSameMomentAs(DateTime? a, DateTime? b) =>
-    (a == null && b == null) ||
-    ((a != null && b != null) && a.isAtSameMomentAs(b));
+    (a == null && b == null) || ((a != null && b != null) && a.isAtSameMomentAs(b));
diff --git a/mobile/lib/utils/debounce.dart b/mobile/lib/utils/debounce.dart
index 78870151a6..e8d3e6fb24 100644
--- a/mobile/lib/utils/debounce.dart
+++ b/mobile/lib/utils/debounce.dart
@@ -19,8 +19,7 @@ class Debouncer {
 
     if (maxWaitTime != null &&
         // _actionFuture == null && // TODO: should this check be here?
-        (_lastActionTime == null ||
-            DateTime.now().difference(_lastActionTime!) > maxWaitTime!)) {
+        (_lastActionTime == null || DateTime.now().difference(_lastActionTime!) > maxWaitTime!)) {
       _callAndRest();
       return;
     }
@@ -60,8 +59,7 @@ class Debouncer {
     _actionFuture = null;
   }
 
-  bool get isActive =>
-      _actionFuture != null || (_timer != null && _timer!.isActive);
+  bool get isActive => _actionFuture != null || (_timer != null && _timer!.isActive);
 }
 
 /// Creates a [Debouncer] that will be disposed automatically. If no [interval] is provided, a
diff --git a/mobile/lib/utils/draggable_scroll_controller.dart b/mobile/lib/utils/draggable_scroll_controller.dart
index 1d22905d1f..cd7ae5b0e1 100644
--- a/mobile/lib/utils/draggable_scroll_controller.dart
+++ b/mobile/lib/utils/draggable_scroll_controller.dart
@@ -15,19 +15,18 @@ DraggableScrollableController useDraggableScrollController({
   );
 }
 
-class _DraggableScrollControllerHook
-    extends Hook<DraggableScrollableController> {
+class _DraggableScrollControllerHook extends Hook<DraggableScrollableController> {
   const _DraggableScrollControllerHook({
     super.keys,
   });
 
   @override
-  HookState<DraggableScrollableController, Hook<DraggableScrollableController>>
-      createState() => _DraggableScrollControllerHookState();
+  HookState<DraggableScrollableController, Hook<DraggableScrollableController>> createState() =>
+      _DraggableScrollControllerHookState();
 }
 
-class _DraggableScrollControllerHookState extends HookState<
-    DraggableScrollableController, _DraggableScrollControllerHook> {
+class _DraggableScrollControllerHookState
+    extends HookState<DraggableScrollableController, _DraggableScrollControllerHook> {
   late final controller = DraggableScrollableController();
 
   @override
diff --git a/mobile/lib/utils/hooks/timer_hook.dart b/mobile/lib/utils/hooks/timer_hook.dart
index a78fed42c3..577e46f5d4 100644
--- a/mobile/lib/utils/hooks/timer_hook.dart
+++ b/mobile/lib/utils/hooks/timer_hook.dart
@@ -23,8 +23,7 @@ class _TimerHook extends Hook<RestartableTimer> {
     required this.callback,
   });
   @override
-  HookState<RestartableTimer, Hook<RestartableTimer>> createState() =>
-      _TimerHookState();
+  HookState<RestartableTimer, Hook<RestartableTimer>> createState() => _TimerHookState();
 }
 
 class _TimerHookState extends HookState<RestartableTimer, _TimerHook> {
diff --git a/mobile/lib/utils/http_ssl_options.dart b/mobile/lib/utils/http_ssl_options.dart
index 24e51f1b30..eaf6e77e4a 100644
--- a/mobile/lib/utils/http_ssl_options.dart
+++ b/mobile/lib/utils/http_ssl_options.dart
@@ -12,8 +12,7 @@ class HttpSSLOptions {
 
   static void apply({bool applyNative = true}) {
     AppSettingsEnum setting = AppSettingsEnum.allowSelfSignedSSLCert;
-    bool allowSelfSignedSSLCert =
-        Store.get(setting.storeKey as StoreKey<bool>, setting.defaultValue);
+    bool allowSelfSignedSSLCert = Store.get(setting.storeKey as StoreKey<bool>, setting.defaultValue);
     _apply(allowSelfSignedSSLCert, applyNative: applyNative);
   }
 
@@ -29,8 +28,7 @@ class HttpSSLOptions {
 
     SSLClientCertStoreVal? clientCert = SSLClientCertStoreVal.load();
 
-    HttpOverrides.global =
-        HttpSSLCertOverride(allowSelfSignedSSLCert, serverHost, clientCert);
+    HttpOverrides.global = HttpSSLCertOverride(allowSelfSignedSSLCert, serverHost, clientCert);
 
     if (applyNative && Platform.isAndroid) {
       _channel.invokeMethod("apply", [
diff --git a/mobile/lib/utils/immich_loading_overlay.dart b/mobile/lib/utils/immich_loading_overlay.dart
index fcc47b1542..b44f78e0bd 100644
--- a/mobile/lib/utils/immich_loading_overlay.dart
+++ b/mobile/lib/utils/immich_loading_overlay.dart
@@ -7,8 +7,7 @@ final _loadingEntry = OverlayEntry(
   builder: (context) => SizedBox.square(
     dimension: double.infinity,
     child: DecoratedBox(
-      decoration:
-          BoxDecoration(color: context.colorScheme.surface.withAlpha(200)),
+      decoration: BoxDecoration(color: context.colorScheme.surface.withAlpha(200)),
       child: const Center(
         child: DelayedLoadingIndicator(
           delay: Duration(seconds: 1),
@@ -30,8 +29,7 @@ class _LoadingOverlay extends Hook<ValueNotifier<bool>> {
   _LoadingOverlayState createState() => _LoadingOverlayState();
 }
 
-class _LoadingOverlayState
-    extends HookState<ValueNotifier<bool>, _LoadingOverlay> {
+class _LoadingOverlayState extends HookState<ValueNotifier<bool>, _LoadingOverlay> {
   late final _isLoading = ValueNotifier(false)..addListener(_listener);
   OverlayEntry? _loadingOverlay;
 
diff --git a/mobile/lib/utils/isolate.dart b/mobile/lib/utils/isolate.dart
index a506aa4858..7f8e8510d3 100644
--- a/mobile/lib/utils/isolate.dart
+++ b/mobile/lib/utils/isolate.dart
@@ -17,8 +17,7 @@ class InvalidIsolateUsageException implements Exception {
   const InvalidIsolateUsageException();
 
   @override
-  String toString() =>
-      "IsolateHelper should only be used from the root isolate";
+  String toString() => "IsolateHelper should only be used from the root isolate";
 }
 
 // !! Should be used only from the root isolate
diff --git a/mobile/lib/utils/map_utils.dart b/mobile/lib/utils/map_utils.dart
index 39443fb225..3dd849a044 100644
--- a/mobile/lib/utils/map_utils.dart
+++ b/mobile/lib/utils/map_utils.dart
@@ -91,12 +91,9 @@ class MapUtils {
         }
       }
 
-      if (permission == LocationPermission.denied ||
-          permission == LocationPermission.deniedForever) {
+      if (permission == LocationPermission.denied || permission == LocationPermission.deniedForever) {
         // Open app settings only if you did not request for permission before
-        if (permission == LocationPermission.deniedForever &&
-            !shouldRequestPermission &&
-            !silent) {
+        if (permission == LocationPermission.deniedForever && !shouldRequestPermission && !silent) {
           await Geolocator.openAppSettings();
         }
         return (null, LocationPermission.deniedForever);
diff --git a/mobile/lib/utils/migration.dart b/mobile/lib/utils/migration.dart
index a95c376ac2..764c8351d4 100644
--- a/mobile/lib/utils/migration.dart
+++ b/mobile/lib/utils/migration.dart
@@ -11,8 +11,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/android_device_asset.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/entities/backup_album.entity.dart'
-    as isar_backup_album;
+import 'package:immich_mobile/entities/backup_album.entity.dart' as isar_backup_album;
 import 'package:immich_mobile/entities/etag.entity.dart';
 import 'package:immich_mobile/entities/ios_device_asset.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
@@ -44,8 +43,7 @@ Future<void> migrateDatabaseIfNeeded(Isar db) async {
       if (id != null) {
         await db.writeTxn(() async {
           final user = await db.users.get(id);
-          await db.storeValues
-              .put(StoreValue(StoreKey.currentUser.id, strValue: user?.id));
+          await db.storeValues.put(StoreValue(StoreKey.currentUser.id, strValue: user?.id));
         });
       }
     }
@@ -89,9 +87,7 @@ Future<void> _migrateDeviceAsset(Isar db) async {
       ? (await db.androidDeviceAssets.where().findAll())
           .map((a) => _DeviceAsset(assetId: a.id.toString(), hash: a.hash))
           .toList()
-      : (await db.iOSDeviceAssets.where().findAll())
-          .map((i) => _DeviceAsset(assetId: i.id, hash: i.hash))
-          .toList();
+      : (await db.iOSDeviceAssets.where().findAll()).map((i) => _DeviceAsset(assetId: i.id, hash: i.hash)).toList();
 
   final PermissionState ps = await PhotoManager.requestPermissionExtend();
   if (!ps.hasAccess) {
@@ -105,14 +101,10 @@ Future<void> _migrateDeviceAsset(Isar db) async {
   }
 
   List<_DeviceAsset> localAssets = [];
-  final List<AssetPathEntity> paths =
-      await PhotoManager.getAssetPathList(onlyAll: true);
+  final List<AssetPathEntity> paths = await PhotoManager.getAssetPathList(onlyAll: true);
 
   if (paths.isEmpty) {
-    localAssets = (await db.assets
-            .where()
-            .anyOf(ids, (query, id) => query.localIdEqualTo(id.assetId))
-            .findAll())
+    localAssets = (await db.assets.where().anyOf(ids, (query, id) => query.localIdEqualTo(id.assetId)).findAll())
         .map(
           (a) => _DeviceAsset(assetId: a.localId!, dateTime: a.fileModifiedAt),
         )
@@ -121,12 +113,9 @@ Future<void> _migrateDeviceAsset(Isar db) async {
     final AssetPathEntity albumWithAll = paths.first;
     final int assetCount = await albumWithAll.assetCountAsync;
 
-    final List<AssetEntity> allDeviceAssets =
-        await albumWithAll.getAssetListRange(start: 0, end: assetCount);
+    final List<AssetEntity> allDeviceAssets = await albumWithAll.getAssetListRange(start: 0, end: assetCount);
 
-    localAssets = allDeviceAssets
-        .map((a) => _DeviceAsset(assetId: a.id, dateTime: a.modifiedDateTime))
-        .toList();
+    localAssets = allDeviceAssets.map((a) => _DeviceAsset(assetId: a.id, dateTime: a.modifiedDateTime)).toList();
   }
 
   debugPrint("[MIGRATION] Device Asset Ids length - ${ids.length}");
@@ -205,8 +194,7 @@ Future<void> migrateBackupAlbumsToSqlite(
     // Recents is a virtual album on Android, and we don't have it with the new sync
     // If recents is selected previously, select all albums during migration except the excluded ones
     if (Platform.isAndroid) {
-      final recentAlbum =
-          isarBackupAlbums.firstWhereOrNull((album) => album.id == 'isAll');
+      final recentAlbum = isarBackupAlbums.firstWhereOrNull((album) => album.id == 'isAll');
       if (recentAlbum != null) {
         await drift.localAlbumEntity.update().write(
               const LocalAlbumEntityCompanion(
@@ -215,8 +203,7 @@ Future<void> migrateBackupAlbumsToSqlite(
             );
         final excluded = isarBackupAlbums
             .where(
-              (album) =>
-                  album.selection == isar_backup_album.BackupSelection.exclude,
+              (album) => album.selection == isar_backup_album.BackupSelection.exclude,
             )
             .map((album) => album.id)
             .toList();
@@ -243,10 +230,8 @@ Future<void> migrateBackupAlbumsToSqlite(
             backupSelection: Value(
               switch (album.selection) {
                 isar_backup_album.BackupSelection.none => BackupSelection.none,
-                isar_backup_album.BackupSelection.select =>
-                  BackupSelection.selected,
-                isar_backup_album.BackupSelection.exclude =>
-                  BackupSelection.excluded,
+                isar_backup_album.BackupSelection.select => BackupSelection.selected,
+                isar_backup_album.BackupSelection.exclude => BackupSelection.excluded,
               },
             ),
           ),
diff --git a/mobile/lib/utils/remote_album.utils.dart b/mobile/lib/utils/remote_album.utils.dart
index 04184ee367..af853e08d2 100644
--- a/mobile/lib/utils/remote_album.utils.dart
+++ b/mobile/lib/utils/remote_album.utils.dart
@@ -41,8 +41,7 @@ class _RemoteAlbumSortHandlers {
     List<RemoteAlbum> albums,
     bool isReverse,
   ) {
-    final sorted =
-        albums.sorted((a, b) => a.assetCount.compareTo(b.assetCount));
+    final sorted = albums.sorted((a, b) => a.assetCount.compareTo(b.assetCount));
     return (isReverse ? sorted.reversed : sorted).toList();
   }
 
diff --git a/mobile/lib/utils/selection_handlers.dart b/mobile/lib/utils/selection_handlers.dart
index a5466c83a2..633ce2463a 100644
--- a/mobile/lib/utils/selection_handlers.dart
+++ b/mobile/lib/utils/selection_handlers.dart
@@ -24,10 +24,7 @@ void handleShareAssets(
   showDialog(
     context: context,
     builder: (BuildContext buildContext) {
-      ref
-          .watch(shareServiceProvider)
-          .shareAssets(selection.toList(), context)
-          .then(
+      ref.watch(shareServiceProvider).shareAssets(selection.toList(), context).then(
         (bool status) {
           if (!status) {
             ImmichToast.show(
@@ -56,14 +53,10 @@ Future<void> handleArchiveAssets(
 }) async {
   if (selection.isNotEmpty) {
     shouldArchive ??= !selection.every((a) => a.isArchived);
-    await ref
-        .read(assetProvider.notifier)
-        .toggleArchive(selection, shouldArchive);
+    await ref.read(assetProvider.notifier).toggleArchive(selection, shouldArchive);
     final message = shouldArchive
-        ? 'moved_to_archive'
-            .t(context: context, args: {'count': selection.length})
-        : 'moved_to_library'
-            .t(context: context, args: {'count': selection.length});
+        ? 'moved_to_archive'.t(context: context, args: {'count': selection.length})
+        : 'moved_to_library'.t(context: context, args: {'count': selection.length});
     if (context.mounted) {
       ImmichToast.show(
         context: context,
@@ -83,9 +76,7 @@ Future<void> handleFavoriteAssets(
 }) async {
   if (selection.isNotEmpty) {
     shouldFavorite ??= !selection.every((a) => a.isFavorite);
-    await ref
-        .watch(assetProvider.notifier)
-        .toggleFavorite(selection, shouldFavorite);
+    await ref.watch(assetProvider.notifier).toggleFavorite(selection, shouldFavorite);
 
     final assetOrAssets = selection.length > 1 ? 'assets' : 'asset';
     final toastMessage = shouldFavorite
@@ -140,8 +131,7 @@ Future<void> handleEditLocation(
   if (selection.length == 1) {
     final asset = selection.first;
     final assetWithExif = await ref.watch(assetServiceProvider).loadExif(asset);
-    if (assetWithExif.exifInfo?.latitude != null &&
-        assetWithExif.exifInfo?.longitude != null) {
+    if (assetWithExif.exifInfo?.latitude != null && assetWithExif.exifInfo?.longitude != null) {
       initialLatLng = LatLng(
         assetWithExif.exifInfo!.latitude!,
         assetWithExif.exifInfo!.longitude!,
@@ -168,9 +158,7 @@ Future<void> handleSetAssetsVisibility(
   List<Asset> selection,
 ) async {
   if (selection.isNotEmpty) {
-    await ref
-        .watch(assetProvider.notifier)
-        .setLockedView(selection, visibility);
+    await ref.watch(assetProvider.notifier).setLockedView(selection, visibility);
 
     final assetOrAssets = selection.length > 1 ? 'assets' : 'asset';
     final toastMessage = visibility == AssetVisibilityEnum.locked
diff --git a/mobile/lib/utils/throttle.dart b/mobile/lib/utils/throttle.dart
index bc0dcf9e2f..c4427472d3 100644
--- a/mobile/lib/utils/throttle.dart
+++ b/mobile/lib/utils/throttle.dart
@@ -9,8 +9,7 @@ class Throttler {
   Throttler({required this.interval});
 
   T? run<T>(T Function() action) {
-    if (_lastActionTime == null ||
-        (DateTime.now().difference(_lastActionTime!) > interval)) {
+    if (_lastActionTime == null || (DateTime.now().difference(_lastActionTime!) > interval)) {
       final response = action();
       _lastActionTime = DateTime.now();
       return response;
diff --git a/mobile/lib/utils/thumbnail_utils.dart b/mobile/lib/utils/thumbnail_utils.dart
index 33dd916980..758305c8bc 100644
--- a/mobile/lib/utils/thumbnail_utils.dart
+++ b/mobile/lib/utils/thumbnail_utils.dart
@@ -12,8 +12,7 @@ String getAltText(
   if (exifInfo?.description != null && exifInfo!.description!.isNotEmpty) {
     return exifInfo.description!;
   }
-  final (template, args) =
-      getAltTextTemplate(exifInfo, fileCreatedAt, type, peopleNames);
+  final (template, args) = getAltTextTemplate(exifInfo, fileCreatedAt, type, peopleNames);
   return template.t(args: args);
 }
 
diff --git a/mobile/lib/utils/url_helper.dart b/mobile/lib/utils/url_helper.dart
index 187026b53c..ec65b4f7ee 100644
--- a/mobile/lib/utils/url_helper.dart
+++ b/mobile/lib/utils/url_helper.dart
@@ -4,8 +4,7 @@ import 'package:punycode/punycode.dart';
 
 String sanitizeUrl(String url) {
   // Add schema if none is set
-  final urlWithSchema =
-      url.trimLeft().startsWith(RegExp(r"https?://")) ? url : "https://$url";
+  final urlWithSchema = url.trimLeft().startsWith(RegExp(r"https?://")) ? url : "https://$url";
 
   // Remove trailing slash(es)
   return urlWithSchema.trimRight().replaceFirst(RegExp(r"/+$"), "");
diff --git a/mobile/lib/widgets/activities/activity_text_field.dart b/mobile/lib/widgets/activities/activity_text_field.dart
index ce4f1364a3..f111de5e53 100644
--- a/mobile/lib/widgets/activities/activity_text_field.dart
+++ b/mobile/lib/widgets/activities/activity_text_field.dart
@@ -24,8 +24,7 @@ class ActivityTextField extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final album = ref.watch(currentAlbumProvider)!;
     final asset = ref.watch(currentAssetProvider);
-    final activityNotifier = ref
-        .read(albumActivityProvider(album.remoteId!, asset?.remoteId).notifier);
+    final activityNotifier = ref.read(albumActivityProvider(album.remoteId!, asset?.remoteId).notifier);
     final user = ref.watch(currentUserProvider);
     final inputController = useTextEditingController();
     final inputFocusNode = useFocusNode();
@@ -88,9 +87,7 @@ class ActivityTextField extends HookConsumerWidget {
             ),
           ),
           suffixIconColor: liked ? Colors.red[700] : null,
-          hintText: !isEnabled
-              ? 'shared_album_activities_input_disable'.tr()
-              : 'say_something'.tr(),
+          hintText: !isEnabled ? 'shared_album_activities_input_disable'.tr() : 'say_something'.tr(),
           hintStyle: TextStyle(
             fontWeight: FontWeight.normal,
             fontSize: 14,
diff --git a/mobile/lib/widgets/activities/activity_tile.dart b/mobile/lib/widgets/activities/activity_tile.dart
index 2dd16b73cb..a2bc5135c6 100644
--- a/mobile/lib/widgets/activities/activity_tile.dart
+++ b/mobile/lib/widgets/activities/activity_tile.dart
@@ -38,11 +38,8 @@ class ActivityTile extends HookConsumerWidget {
         leftAlign: isLike || showAssetThumbnail,
       ),
       // No subtitle for like, so center title
-      titleAlignment:
-          !isLike ? ListTileTitleAlignment.top : ListTileTitleAlignment.center,
-      trailing: showAssetThumbnail
-          ? _ActivityAssetThumbnail(activity.assetId!)
-          : null,
+      titleAlignment: !isLike ? ListTileTitleAlignment.top : ListTileTitleAlignment.center,
+      trailing: showAssetThumbnail ? _ActivityAssetThumbnail(activity.assetId!) : null,
       subtitle: !isLike ? Text(activity.comment!) : null,
     );
   }
@@ -62,12 +59,10 @@ class _ActivityTitle extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final textColor = context.isDarkTheme ? Colors.white : Colors.black;
-    final textStyle = context.textTheme.bodyMedium
-        ?.copyWith(color: textColor.withValues(alpha: 0.6));
+    final textStyle = context.textTheme.bodyMedium?.copyWith(color: textColor.withValues(alpha: 0.6));
 
     return Row(
-      mainAxisAlignment:
-          leftAlign ? MainAxisAlignment.start : MainAxisAlignment.spaceBetween,
+      mainAxisAlignment: leftAlign ? MainAxisAlignment.start : MainAxisAlignment.spaceBetween,
       mainAxisSize: leftAlign ? MainAxisSize.min : MainAxisSize.max,
       children: [
         Text(
diff --git a/mobile/lib/widgets/album/add_to_album_sliverlist.dart b/mobile/lib/widgets/album/add_to_album_sliverlist.dart
index 3472e2179b..b0f2a0a49a 100644
--- a/mobile/lib/widgets/album/add_to_album_sliverlist.dart
+++ b/mobile/lib/widgets/album/add_to_album_sliverlist.dart
@@ -25,13 +25,11 @@ class AddToAlbumSliverList extends HookConsumerWidget {
     final albumSortMode = ref.watch(albumSortByOptionsProvider);
     final albumSortIsReverse = ref.watch(albumSortOrderProvider);
     final sortedAlbums = albumSortMode.sortFn(albums, albumSortIsReverse);
-    final sortedSharedAlbums =
-        albumSortMode.sortFn(sharedAlbums, albumSortIsReverse);
+    final sortedSharedAlbums = albumSortMode.sortFn(sharedAlbums, albumSortIsReverse);
 
     return SliverList(
-      delegate: SliverChildBuilderDelegate(
-          childCount: albums.length + (sharedAlbums.isEmpty ? 0 : 1),
-          (context, index) {
+      delegate:
+          SliverChildBuilderDelegate(childCount: albums.length + (sharedAlbums.isEmpty ? 0 : 1), (context, index) {
         // Build shared expander
         if (index == 0 && sortedSharedAlbums.isNotEmpty) {
           return Padding(
@@ -47,9 +45,7 @@ class AddToAlbumSliverList extends HookConsumerWidget {
                   itemCount: sortedSharedAlbums.length,
                   itemBuilder: (context, index) => AlbumThumbnailListTile(
                     album: sortedSharedAlbums[index],
-                    onTap: enabled
-                        ? () => onAddToAlbum(sortedSharedAlbums[index])
-                        : () {},
+                    onTap: enabled ? () => onAddToAlbum(sortedSharedAlbums[index]) : () {},
                   ),
                 ),
               ],
diff --git a/mobile/lib/widgets/album/album_thumbnail_card.dart b/mobile/lib/widgets/album/album_thumbnail_card.dart
index d78f391754..e8d0425d4e 100644
--- a/mobile/lib/widgets/album/album_thumbnail_card.dart
+++ b/mobile/lib/widgets/album/album_thumbnail_card.dart
@@ -109,9 +109,7 @@ class AlbumThumbnailCard extends ConsumerWidget {
                         borderRadius: const BorderRadius.all(
                           Radius.circular(20),
                         ),
-                        child: album.thumbnail.value == null
-                            ? buildEmptyThumbnail()
-                            : buildAlbumThumbnail(),
+                        child: album.thumbnail.value == null ? buildEmptyThumbnail() : buildAlbumThumbnail(),
                       ),
                     ),
                     if (showTitle) ...[
diff --git a/mobile/lib/widgets/album/album_thumbnail_listtile.dart b/mobile/lib/widgets/album/album_thumbnail_listtile.dart
index f35d4b7ede..8332cde889 100644
--- a/mobile/lib/widgets/album/album_thumbnail_listtile.dart
+++ b/mobile/lib/widgets/album/album_thumbnail_listtile.dart
@@ -50,10 +50,8 @@ class AlbumThumbnailListTile extends StatelessWidget {
           type: AssetMediaSize.thumbnail,
         ),
         httpHeaders: ApiService.getRequestHeaders(),
-        cacheKey:
-            getAlbumThumbNailCacheKey(album, type: AssetMediaSize.thumbnail),
-        errorWidget: (context, url, error) =>
-            const Icon(Icons.image_not_supported_outlined),
+        cacheKey: getAlbumThumbNailCacheKey(album, type: AssetMediaSize.thumbnail),
+        errorWidget: (context, url, error) => const Icon(Icons.image_not_supported_outlined),
       );
     }
 
@@ -70,9 +68,7 @@ class AlbumThumbnailListTile extends StatelessWidget {
           children: [
             ClipRRect(
               borderRadius: const BorderRadius.all(Radius.circular(8)),
-              child: album.thumbnail.value == null
-                  ? buildEmptyThumbnail()
-                  : buildAlbumThumbnail(),
+              child: album.thumbnail.value == null ? buildEmptyThumbnail() : buildAlbumThumbnail(),
             ),
             Expanded(
               child: Padding(
diff --git a/mobile/lib/widgets/album/album_viewer_appbar.dart b/mobile/lib/widgets/album/album_viewer_appbar.dart
index 14715e40a9..f13f1c3b21 100644
--- a/mobile/lib/widgets/album/album_viewer_appbar.dart
+++ b/mobile/lib/widgets/album/album_viewer_appbar.dart
@@ -12,8 +12,7 @@ import 'package:immich_mobile/providers/album/current_album.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
-class AlbumViewerAppbar extends HookConsumerWidget
-    implements PreferredSizeWidget {
+class AlbumViewerAppbar extends HookConsumerWidget implements PreferredSizeWidget {
   const AlbumViewerAppbar({
     super.key,
     required this.userId,
@@ -53,13 +52,10 @@ class AlbumViewerAppbar extends HookConsumerWidget
     final newAlbumDescription = albumViewer.editDescriptionText;
     final isEditAlbum = albumViewer.isEditAlbum;
 
-    final comments = album.shared
-        ? ref.watch(activityStatisticsProvider(album.remoteId!))
-        : 0;
+    final comments = album.shared ? ref.watch(activityStatisticsProvider(album.remoteId!)) : 0;
 
     deleteAlbum() async {
-      final bool success =
-          await ref.watch(albumProvider.notifier).deleteAlbum(album);
+      final bool success = await ref.watch(albumProvider.notifier).deleteAlbum(album);
 
       context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()]));
 
@@ -112,8 +108,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
     }
 
     void onLeaveAlbumPressed() async {
-      bool isSuccess =
-          await ref.watch(albumProvider.notifier).leaveAlbum(album);
+      bool isSuccess = await ref.watch(albumProvider.notifier).leaveAlbum(album);
 
       if (isSuccess) {
         context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()]));
@@ -152,8 +147,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
     }
 
     void onSortOrderToggled() async {
-      final updatedAlbum =
-          await ref.read(albumProvider.notifier).toggleSortOrder(album);
+      final updatedAlbum = await ref.read(albumProvider.notifier).toggleSortOrder(album);
 
       if (updatedAlbum == null) {
         ImmichToast.show(
@@ -241,8 +235,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
                 children: [
                   ...buildBottomSheetActions(),
                   if (onAddPhotos != null) ...commonActions,
-                  if (onAddPhotos != null && userId == album.ownerId)
-                    ...ownerActions,
+                  if (onAddPhotos != null && userId == album.ownerId) ...ownerActions,
                 ],
               ),
             ),
@@ -281,9 +274,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
         return IconButton(
           onPressed: () async {
             if (newAlbumTitle.isNotEmpty) {
-              bool isSuccess = await ref
-                  .watch(albumViewerProvider.notifier)
-                  .changeAlbumTitle(album, newAlbumTitle);
+              bool isSuccess = await ref.watch(albumViewerProvider.notifier).changeAlbumTitle(album, newAlbumTitle);
               if (!isSuccess) {
                 ImmichToast.show(
                   context: context,
@@ -294,9 +285,8 @@ class AlbumViewerAppbar extends HookConsumerWidget
               }
               titleFocusNode.unfocus();
             } else if (newAlbumDescription.isNotEmpty) {
-              bool isSuccessDescription = await ref
-                  .watch(albumViewerProvider.notifier)
-                  .changeAlbumDescription(album, newAlbumDescription);
+              bool isSuccessDescription =
+                  await ref.watch(albumViewerProvider.notifier).changeAlbumDescription(album, newAlbumDescription);
               if (!isSuccessDescription) {
                 ImmichToast.show(
                   context: context,
@@ -330,8 +320,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
       leading: buildLeadingButton(),
       centerTitle: false,
       actions: [
-        if (album.shared && (album.activityEnabled || comments != 0))
-          buildActivitiesButton(),
+        if (album.shared && (album.activityEnabled || comments != 0)) buildActivitiesButton(),
         if (album.isRemote) ...[
           IconButton(
             splashRadius: 25,
diff --git a/mobile/lib/widgets/album/album_viewer_editable_description.dart b/mobile/lib/widgets/album/album_viewer_editable_description.dart
index b82e7f3d83..94f41dc7fd 100644
--- a/mobile/lib/widgets/album/album_viewer_editable_description.dart
+++ b/mobile/lib/widgets/album/album_viewer_editable_description.dart
@@ -19,15 +19,13 @@ class AlbumViewerEditableDescription extends HookConsumerWidget {
     final albumViewerState = ref.watch(albumViewerProvider);
 
     final descriptionTextEditController = useTextEditingController(
-      text: albumViewerState.isEditAlbum &&
-              albumViewerState.editDescriptionText.isNotEmpty
+      text: albumViewerState.isEditAlbum && albumViewerState.editDescriptionText.isNotEmpty
           ? albumViewerState.editDescriptionText
           : albumDescription,
     );
 
     void onFocusModeChange() {
-      if (!descriptionFocusNode.hasFocus &&
-          descriptionTextEditController.text.isEmpty) {
+      if (!descriptionFocusNode.hasFocus && descriptionTextEditController.text.isEmpty) {
         ref.watch(albumViewerProvider.notifier).setEditDescriptionText("");
         descriptionTextEditController.text = "";
       }
@@ -49,9 +47,7 @@ class AlbumViewerEditableDescription extends HookConsumerWidget {
         onChanged: (value) {
           if (value.isEmpty) {
           } else {
-            ref
-                .watch(albumViewerProvider.notifier)
-                .setEditDescriptionText(value);
+            ref.watch(albumViewerProvider.notifier).setEditDescriptionText(value);
           }
         },
         focusNode: descriptionFocusNode,
@@ -62,9 +58,7 @@ class AlbumViewerEditableDescription extends HookConsumerWidget {
         onTap: () {
           context.focusScope.requestFocus(descriptionFocusNode);
 
-          ref
-              .watch(albumViewerProvider.notifier)
-              .setEditDescriptionText(albumDescription);
+          ref.watch(albumViewerProvider.notifier).setEditDescriptionText(albumDescription);
           ref.watch(albumViewerProvider.notifier).enableEditAlbum();
 
           if (descriptionTextEditController.text == '') {
diff --git a/mobile/lib/widgets/album/album_viewer_editable_title.dart b/mobile/lib/widgets/album/album_viewer_editable_title.dart
index 038c9a13d8..b64be09ff9 100644
--- a/mobile/lib/widgets/album/album_viewer_editable_title.dart
+++ b/mobile/lib/widgets/album/album_viewer_editable_title.dart
@@ -19,8 +19,7 @@ class AlbumViewerEditableTitle extends HookConsumerWidget {
     final albumViewerState = ref.watch(albumViewerProvider);
 
     final titleTextEditController = useTextEditingController(
-      text: albumViewerState.isEditAlbum &&
-              albumViewerState.editTitleText.isNotEmpty
+      text: albumViewerState.isEditAlbum && albumViewerState.editTitleText.isNotEmpty
           ? albumViewerState.editTitleText
           : albumName,
     );
diff --git a/mobile/lib/widgets/album/remote_album_shared_user_icons.dart b/mobile/lib/widgets/album/remote_album_shared_user_icons.dart
index dd1a64abe0..f7f3f62b32 100644
--- a/mobile/lib/widgets/album/remote_album_shared_user_icons.dart
+++ b/mobile/lib/widgets/album/remote_album_shared_user_icons.dart
@@ -16,8 +16,7 @@ class RemoteAlbumSharedUserIcons extends ConsumerWidget {
       return const SizedBox();
     }
 
-    final sharedUsersAsync =
-        ref.watch(remoteAlbumSharedUsersProvider(currentAlbum.id));
+    final sharedUsersAsync = ref.watch(remoteAlbumSharedUsersProvider(currentAlbum.id));
 
     return sharedUsersAsync.maybeWhen(
       data: (sharedUsers) {
diff --git a/mobile/lib/widgets/asset_grid/asset_drag_region.dart b/mobile/lib/widgets/asset_grid/asset_drag_region.dart
index 6335a1d64d..f27fae64e8 100644
--- a/mobile/lib/widgets/asset_grid/asset_drag_region.dart
+++ b/mobile/lib/widgets/asset_grid/asset_drag_region.dart
@@ -65,8 +65,7 @@ class _AssetDragRegionState extends State<AssetDragRegion> {
   Widget build(BuildContext context) {
     return RawGestureDetector(
       gestures: {
-        _CustomLongPressGestureRecognizer: GestureRecognizerFactoryWithHandlers<
-            _CustomLongPressGestureRecognizer>(
+        _CustomLongPressGestureRecognizer: GestureRecognizerFactoryWithHandlers<_CustomLongPressGestureRecognizer>(
           () => _CustomLongPressGestureRecognizer(),
           _registerCallbacks,
         ),
@@ -89,9 +88,7 @@ class _AssetDragRegionState extends State<AssetDragRegion> {
     final local = box.globalToLocal(position);
     if (!box.hitTest(hitTestResult, position: local)) return null;
 
-    return (hitTestResult.path
-            .firstWhereOrNull((hit) => hit.target is _AssetIndexProxy)
-            ?.target as _AssetIndexProxy?)
+    return (hitTestResult.path.firstWhereOrNull((hit) => hit.target is _AssetIndexProxy)?.target as _AssetIndexProxy?)
         ?.index;
   }
 
@@ -99,8 +96,7 @@ class _AssetDragRegionState extends State<AssetDragRegion> {
     /// Calculate widget height and scroll offset when long press starting instead of in [initState]
     /// or [didChangeDependencies] as the grid might still be rendering into view to get the actual size
     final height = context.size?.height;
-    if (height != null &&
-        (topScrollOffset == null || bottomScrollOffset == null)) {
+    if (height != null && (topScrollOffset == null || bottomScrollOffset == null)) {
       topScrollOffset = height * scrollOffset;
       bottomScrollOffset = height - topScrollOffset!;
     }
@@ -188,8 +184,7 @@ class AssetIndexWrapper extends SingleChildRenderObjectWidget {
     // ignore: library_private_types_in_public_api
     _AssetIndexProxy renderObject,
   ) {
-    renderObject.index =
-        AssetIndex(rowIndex: rowIndex, sectionIndex: sectionIndex);
+    renderObject.index = AssetIndex(rowIndex: rowIndex, sectionIndex: sectionIndex);
   }
 }
 
diff --git a/mobile/lib/widgets/asset_grid/asset_grid_data_structure.dart b/mobile/lib/widgets/asset_grid/asset_grid_data_structure.dart
index 6b94c04c4d..88b993a026 100644
--- a/mobile/lib/widgets/asset_grid/asset_grid_data_structure.dart
+++ b/mobile/lib/widgets/asset_grid/asset_grid_data_structure.dart
@@ -53,8 +53,7 @@ class RenderList {
   /// global offset of assets in [_buf]
   int _bufOffset = 0;
 
-  RenderList(this.elements, this.query, this.allAssets)
-      : totalAssets = allAssets?.length ?? query!.countSync();
+  RenderList(this.elements, this.query, this.allAssets) : totalAssets = allAssets?.length ?? query!.countSync();
 
   bool get isEmpty => totalAssets == 0;
 
@@ -90,9 +89,7 @@ class RenderList {
         // a tiny bit resulting in a another required load from the DB
         final start = max(
           0,
-          forward
-              ? offset - oppositeSize
-              : (len > batchSize ? offset : offset + count - len),
+          forward ? offset - oppositeSize : (len > batchSize ? offset : offset + count - len),
         );
         // load the calculated batch (start:start+len) from the DB and put it into the buffer
         _buf = query!.offset(start).limit(len).findAllSync();
@@ -156,9 +153,7 @@ class RenderList {
           : null;
 
       for (int i = 0; i < total; i += sectionSize) {
-        final date = assets != null
-            ? assets[i].fileCreatedAt
-            : await dateLoader?.getDate(i);
+        final date = assets != null ? assets[i].fileCreatedAt : await dateLoader?.getDate(i);
 
         final int count = i + sectionSize > total ? total - i : sectionSize;
         if (date == null) break;
@@ -175,11 +170,8 @@ class RenderList {
       return RenderList(elements, query, assets);
     }
 
-    final formatSameYear =
-        groupBy == GroupAssetsBy.month ? DateFormat.MMMM() : DateFormat.MMMEd();
-    final formatOtherYear = groupBy == GroupAssetsBy.month
-        ? DateFormat.yMMMM()
-        : DateFormat.yMMMEd();
+    final formatSameYear = groupBy == GroupAssetsBy.month ? DateFormat.MMMM() : DateFormat.MMMEd();
+    final formatOtherYear = groupBy == GroupAssetsBy.month ? DateFormat.yMMMM() : DateFormat.yMMMEd();
     final currentYear = DateTime.now().year;
     final formatMergedSameYear = DateFormat.MMMd();
     final formatMergedOtherYear = DateFormat.yMMMd();
@@ -193,16 +185,9 @@ class RenderList {
     int lastMonthIndex = 0;
 
     String formatDateRange(DateTime from, DateTime to) {
-      final startDate = (from.year == currentYear
-              ? formatMergedSameYear
-              : formatMergedOtherYear)
-          .format(from);
-      final endDate = (to.year == currentYear
-              ? formatMergedSameYear
-              : formatMergedOtherYear)
-          .format(to);
-      if (DateTime(from.year, from.month, from.day) ==
-          DateTime(to.year, to.month, to.day)) {
+      final startDate = (from.year == currentYear ? formatMergedSameYear : formatMergedOtherYear).format(from);
+      final endDate = (to.year == currentYear ? formatMergedSameYear : formatMergedOtherYear).format(to);
+      if (DateTime(from.year, from.month, from.day) == DateTime(to.year, to.month, to.day)) {
         // format range with time when both dates are on the same day
         final startTime = DateFormat.Hm().format(from);
         final endTime = DateFormat.Hm().format(to);
@@ -212,10 +197,7 @@ class RenderList {
     }
 
     void mergeMonth() {
-      if (last != null &&
-          groupBy == GroupAssetsBy.auto &&
-          monthCount <= 30 &&
-          elements.length > lastMonthIndex + 1) {
+      if (last != null && groupBy == GroupAssetsBy.auto && monthCount <= 30 && elements.length > lastMonthIndex + 1) {
         // merge all days into a single section
         assert(elements[lastMonthIndex].date.month == last.month);
         final e = elements[lastMonthIndex];
@@ -233,8 +215,7 @@ class RenderList {
     }
 
     void addElems(DateTime d, DateTime? prevDate) {
-      final bool newMonth =
-          last == null || last.year != d.year || last.month != d.month;
+      final bool newMonth = last == null || last.year != d.year || last.month != d.month;
       if (newMonth) {
         mergeMonth();
         lastMonthIndex = elements.length;
@@ -258,12 +239,8 @@ class RenderList {
             totalCount: groupBy == GroupAssetsBy.auto ? sectionCount : count,
             offset: lastOffset + j,
             title: j == 0
-                ? (d.year == currentYear
-                    ? formatSameYear.format(d)
-                    : formatOtherYear.format(d))
-                : (groupBy == GroupAssetsBy.auto
-                    ? formatDateRange(d, prevDate ?? d)
-                    : null),
+                ? (d.year == currentYear ? formatSameYear.format(d) : formatOtherYear.format(d))
+                : (groupBy == GroupAssetsBy.auto ? formatDateRange(d, prevDate ?? d) : null),
           ),
         );
       }
@@ -277,11 +254,7 @@ class RenderList {
       // TODO replace with groupBy once Isar supports such queries
       final dates = assets != null
           ? assets.map((a) => a.fileCreatedAt)
-          : await query!
-              .offset(offset)
-              .limit(pageSize)
-              .fileCreatedAtProperty()
-              .findAll();
+          : await query!.offset(offset).limit(pageSize).fileCreatedAtProperty().findAll();
       int i = 0;
       for (final date in dates) {
         final d = DateTime(
@@ -357,11 +330,7 @@ class DateBatchLoader {
   Future<void> _loadBatch(int targetIndex) async {
     final batchStart = (targetIndex ~/ batchSize) * batchSize;
 
-    _buffer = await query
-        .offset(batchStart)
-        .limit(batchSize)
-        .fileCreatedAtProperty()
-        .findAll();
+    _buffer = await query.offset(batchStart).limit(batchSize).fileCreatedAtProperty().findAll();
 
     _bufferStart = batchStart;
   }
diff --git a/mobile/lib/widgets/asset_grid/control_bottom_app_bar.dart b/mobile/lib/widgets/asset_grid/control_bottom_app_bar.dart
index 3283b90b21..e265162850 100644
--- a/mobile/lib/widgets/asset_grid/control_bottom_app_bar.dart
+++ b/mobile/lib/widgets/asset_grid/control_bottom_app_bar.dart
@@ -71,15 +71,11 @@ class ControlBottomAppBar extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final hasRemote =
-        selectionAssetState.hasRemote || selectionAssetState.hasMerged;
-    final hasLocal =
-        selectionAssetState.hasLocal || selectionAssetState.hasMerged;
-    final trashEnabled =
-        ref.watch(serverInfoProvider.select((v) => v.serverFeatures.trash));
+    final hasRemote = selectionAssetState.hasRemote || selectionAssetState.hasMerged;
+    final hasLocal = selectionAssetState.hasLocal || selectionAssetState.hasMerged;
+    final trashEnabled = ref.watch(serverInfoProvider.select((v) => v.serverFeatures.trash));
     final albums = ref.watch(albumProvider).where((a) => a.isRemote).toList();
-    final sharedAlbums =
-        ref.watch(albumProvider).where((a) => a.shared).toList();
+    final sharedAlbums = ref.watch(albumProvider).where((a) => a.shared).toList();
     const bottomPadding = 0.24;
     final scrollController = useDraggableScrollController();
     final isInLockedView = ref.watch(inLockedViewProvider);
@@ -132,9 +128,7 @@ class ControlBottomAppBar extends HookConsumerWidget {
     List<Widget> renderActionButtons() {
       return [
         ControlBoxButton(
-          iconData: Platform.isAndroid
-              ? Icons.share_rounded
-              : Icons.ios_share_rounded,
+          iconData: Platform.isAndroid ? Icons.share_rounded : Icons.ios_share_rounded,
           label: "share".tr(),
           onPressed: enabled ? () => onShare(true) : null,
         ),
@@ -146,16 +140,13 @@ class ControlBottomAppBar extends HookConsumerWidget {
           ),
         if (hasRemote && onArchive != null)
           ControlBoxButton(
-            iconData:
-                unarchive ? Icons.unarchive_outlined : Icons.archive_outlined,
+            iconData: unarchive ? Icons.unarchive_outlined : Icons.archive_outlined,
             label: (unarchive ? "unarchive" : "archive").tr(),
             onPressed: enabled ? onArchive : null,
           ),
         if (hasRemote && onFavorite != null)
           ControlBoxButton(
-            iconData: unfavorite
-                ? Icons.favorite_border_rounded
-                : Icons.favorite_rounded,
+            iconData: unfavorite ? Icons.favorite_border_rounded : Icons.favorite_rounded,
             label: (unfavorite ? "unfavorite" : "favorite").tr(),
             onPressed: enabled ? onFavorite : null,
           ),
@@ -174,11 +165,8 @@ class ControlBottomAppBar extends HookConsumerWidget {
             child: ControlBoxButton(
               iconData: Icons.delete_sweep_outlined,
               label: "delete".tr(),
-              onPressed: enabled
-                  ? () => handleRemoteDelete(!trashEnabled, onDelete!)
-                  : null,
-              onLongPressed:
-                  enabled ? () => showForceDeleteDialog(onDelete!) : null,
+              onPressed: enabled ? () => handleRemoteDelete(!trashEnabled, onDelete!) : null,
+              onLongPressed: enabled ? () => showForceDeleteDialog(onDelete!) : null,
             ),
           ),
         if (hasRemote && onDeleteServer != null && !isInLockedView)
@@ -264,18 +252,12 @@ class ControlBottomAppBar extends HookConsumerWidget {
           ConstrainedBox(
             constraints: const BoxConstraints(maxWidth: 100),
             child: ControlBoxButton(
-              iconData: isInLockedView
-                  ? Icons.lock_open_rounded
-                  : Icons.lock_outline_rounded,
-              label: isInLockedView
-                  ? "remove_from_locked_folder".tr()
-                  : "move_to_locked_folder".tr(),
+              iconData: isInLockedView ? Icons.lock_open_rounded : Icons.lock_outline_rounded,
+              label: isInLockedView ? "remove_from_locked_folder".tr() : "move_to_locked_folder".tr(),
               onPressed: enabled ? onToggleLocked : null,
             ),
           ),
-        if (!selectionAssetState.hasLocal &&
-            selectionAssetState.selectedCount > 1 &&
-            onStack != null)
+        if (!selectionAssetState.hasLocal && selectionAssetState.selectedCount > 1 && onStack != null)
           ConstrainedBox(
             constraints: const BoxConstraints(maxWidth: 90),
             child: ControlBoxButton(
diff --git a/mobile/lib/widgets/asset_grid/draggable_scrollbar.dart b/mobile/lib/widgets/asset_grid/draggable_scrollbar.dart
index 779da8add7..ffe8c54320 100644
--- a/mobile/lib/widgets/asset_grid/draggable_scrollbar.dart
+++ b/mobile/lib/widgets/asset_grid/draggable_scrollbar.dart
@@ -276,8 +276,7 @@ class ScrollLabel extends StatelessWidget {
   final Text child;
 
   final BoxConstraints? constraints;
-  static const BoxConstraints _defaultConstraints =
-      BoxConstraints.tightFor(width: 72.0, height: 28.0);
+  static const BoxConstraints _defaultConstraints = BoxConstraints.tightFor(width: 72.0, height: 28.0);
 
   const ScrollLabel({
     super.key,
@@ -308,8 +307,7 @@ class ScrollLabel extends StatelessWidget {
   }
 }
 
-class DraggableScrollbarState extends State<DraggableScrollbar>
-    with TickerProviderStateMixin {
+class DraggableScrollbarState extends State<DraggableScrollbar> with TickerProviderStateMixin {
   late double _barOffset;
   late double _viewOffset;
   late bool _isDragInProcess;
@@ -356,8 +354,7 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
     super.dispose();
   }
 
-  double get barMaxScrollExtent =>
-      context.size!.height - widget.heightScrollThumb;
+  double get barMaxScrollExtent => context.size!.height - widget.heightScrollThumb;
 
   double get barMinScrollExtent => 0;
 
@@ -447,8 +444,7 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
         }
       }
 
-      if (notification is ScrollUpdateNotification ||
-          notification is OverscrollNotification) {
+      if (notification is ScrollUpdateNotification || notification is OverscrollNotification) {
         if (_thumbAnimationController.status != AnimationStatus.forward) {
           _thumbAnimationController.forward();
         }
@@ -627,8 +623,7 @@ class SlideFadeTransition extends StatelessWidget {
   Widget build(BuildContext context) {
     return AnimatedBuilder(
       animation: animation,
-      builder: (context, child) =>
-          animation.value == 0.0 ? const SizedBox() : child!,
+      builder: (context, child) => animation.value == 0.0 ? const SizedBox() : child!,
       child: SlideTransition(
         position: Tween(
           begin: const Offset(0.3, 0.0),
diff --git a/mobile/lib/widgets/asset_grid/draggable_scrollbar_custom.dart b/mobile/lib/widgets/asset_grid/draggable_scrollbar_custom.dart
index 06954f4ff4..63fa3be763 100644
--- a/mobile/lib/widgets/asset_grid/draggable_scrollbar_custom.dart
+++ b/mobile/lib/widgets/asset_grid/draggable_scrollbar_custom.dart
@@ -169,8 +169,7 @@ class ScrollLabel extends StatelessWidget {
   final Text child;
 
   final BoxConstraints? constraints;
-  static const BoxConstraints _defaultConstraints =
-      BoxConstraints.tightFor(width: 72.0, height: 28.0);
+  static const BoxConstraints _defaultConstraints = BoxConstraints.tightFor(width: 72.0, height: 28.0);
 
   const ScrollLabel({
     super.key,
@@ -202,8 +201,7 @@ class ScrollLabel extends StatelessWidget {
   }
 }
 
-class DraggableScrollbarState extends State<DraggableScrollbar>
-    with TickerProviderStateMixin {
+class DraggableScrollbarState extends State<DraggableScrollbar> with TickerProviderStateMixin {
   late double _barOffset;
   late bool _isDragInProcess;
   late int _currentItem;
@@ -250,10 +248,7 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
     super.dispose();
   }
 
-  double get barMaxScrollExtent =>
-      (context.size?.height ?? 0) -
-      widget.heightScrollThumb -
-      (widget.heightOffset ?? 0);
+  double get barMaxScrollExtent => (context.size?.height ?? 0) - widget.heightScrollThumb - (widget.heightOffset ?? 0);
 
   double get barMinScrollExtent => 0;
 
@@ -317,8 +312,7 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
 
     setState(() {
       try {
-        int firstItemIndex =
-            widget.itemPositionsListener.itemPositions.value.first.index;
+        int firstItemIndex = widget.itemPositionsListener.itemPositions.value.first.index;
 
         if (notification is ScrollUpdateNotification) {
           _barOffset = (firstItemIndex / maxItemCount) * barMaxScrollExtent;
@@ -331,8 +325,7 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
           }
         }
 
-        if (notification is ScrollUpdateNotification ||
-            notification is OverscrollNotification) {
+        if (notification is ScrollUpdateNotification || notification is OverscrollNotification) {
           if (_thumbAnimationController.status != AnimationStatus.forward) {
             _thumbAnimationController.forward();
           }
@@ -536,8 +529,7 @@ class SlideFadeTransition extends StatelessWidget {
   Widget build(BuildContext context) {
     return AnimatedBuilder(
       animation: animation,
-      builder: (context, child) =>
-          animation.value == 0.0 ? const SizedBox() : child!,
+      builder: (context, child) => animation.value == 0.0 ? const SizedBox() : child!,
       child: SlideTransition(
         position: Tween(
           begin: const Offset(0.3, 0.0),
diff --git a/mobile/lib/widgets/asset_grid/group_divider_title.dart b/mobile/lib/widgets/asset_grid/group_divider_title.dart
index b9fe8e3c1d..81f9392d37 100644
--- a/mobile/lib/widgets/asset_grid/group_divider_title.dart
+++ b/mobile/lib/widgets/asset_grid/group_divider_title.dart
@@ -32,8 +32,7 @@ class GroupDividerTitle extends HookConsumerWidget {
 
     useEffect(
       () {
-        groupBy.value = GroupAssetsBy.values[
-            appSettingService.getSetting<int>(AppSettingsEnum.groupAssetsBy)];
+        groupBy.value = GroupAssetsBy.values[appSettingService.getSetting<int>(AppSettingsEnum.groupAssetsBy)];
         return null;
       },
       [],
@@ -75,14 +74,12 @@ class GroupDividerTitle extends HookConsumerWidget {
                 ? Icon(
                     Icons.check_circle_rounded,
                     color: context.primaryColor,
-                    semanticLabel:
-                        "unselect_all_in".tr(namedArgs: {"group": text}),
+                    semanticLabel: "unselect_all_in".tr(namedArgs: {"group": text}),
                   )
                 : Icon(
                     Icons.check_circle_outline_rounded,
                     color: context.colorScheme.onSurfaceSecondary,
-                    semanticLabel:
-                        "select_all_in".tr(namedArgs: {"group": text}),
+                    semanticLabel: "select_all_in".tr(namedArgs: {"group": text}),
                   ),
           ),
         ],
diff --git a/mobile/lib/widgets/asset_grid/immich_asset_grid.dart b/mobile/lib/widgets/asset_grid/immich_asset_grid.dart
index da4c47e466..112d8074ad 100644
--- a/mobile/lib/widgets/asset_grid/immich_asset_grid.dart
+++ b/mobile/lib/widgets/asset_grid/immich_asset_grid.dart
@@ -27,8 +27,7 @@ class ImmichAssetGrid extends HookConsumerWidget {
   final bool canDeselect;
   final bool? dynamicLayout;
   final bool showMultiSelectIndicator;
-  final void Function(Iterable<ItemPosition> itemPositions)?
-      visibleItemsListener;
+  final void Function(Iterable<ItemPosition> itemPositions)? visibleItemsListener;
   final Widget? topWidget;
   final bool shrinkWrap;
   final bool showDragScroll;
@@ -82,10 +81,8 @@ class ImmichAssetGrid extends HookConsumerWidget {
     Widget buildAssetGridView(RenderList renderList) {
       return RawGestureDetector(
         gestures: {
-          CustomScaleGestureRecognizer: GestureRecognizerFactoryWithHandlers<
-                  CustomScaleGestureRecognizer>(
-              () => CustomScaleGestureRecognizer(),
-              (CustomScaleGestureRecognizer scale) {
+          CustomScaleGestureRecognizer: GestureRecognizerFactoryWithHandlers<CustomScaleGestureRecognizer>(
+              () => CustomScaleGestureRecognizer(), (CustomScaleGestureRecognizer scale) {
             scale.onStart = (details) {
               baseScaleFactor.value = scaleFactor.value;
             };
@@ -106,15 +103,13 @@ class ImmichAssetGrid extends HookConsumerWidget {
           onRefresh: onRefresh,
           assetsPerRow: perRow.value,
           listener: listener,
-          showStorageIndicator: showStorageIndicator ??
-              settings.getSetting(AppSettingsEnum.storageIndicator),
+          showStorageIndicator: showStorageIndicator ?? settings.getSetting(AppSettingsEnum.storageIndicator),
           renderList: renderList,
           margin: margin,
           selectionActive: selectionActive,
           preselectedAssets: preselectedAssets,
           canDeselect: canDeselect,
-          dynamicLayout: dynamicLayout ??
-              settings.getSetting(AppSettingsEnum.dynamicLayout),
+          dynamicLayout: dynamicLayout ?? settings.getSetting(AppSettingsEnum.dynamicLayout),
           showMultiSelectIndicator: showMultiSelectIndicator,
           visibleItemsListener: visibleItemsListener,
           topWidget: topWidget,
diff --git a/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart b/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart
index 060898e270..ccea8307ae 100644
--- a/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart
+++ b/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart
@@ -51,8 +51,7 @@ class ImmichAssetGridView extends ConsumerStatefulWidget {
   final bool canDeselect;
   final bool dynamicLayout;
   final bool showMultiSelectIndicator;
-  final void Function(Iterable<ItemPosition> itemPositions)?
-      visibleItemsListener;
+  final void Function(Iterable<ItemPosition> itemPositions)? visibleItemsListener;
   final Widget? topWidget;
   final int heroOffset;
   final bool shrinkWrap;
@@ -90,24 +89,20 @@ class ImmichAssetGridView extends ConsumerStatefulWidget {
 
 class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
   final ItemScrollController _itemScrollController = ItemScrollController();
-  final ScrollOffsetController _scrollOffsetController =
-      ScrollOffsetController();
-  final ItemPositionsListener _itemPositionsListener =
-      ItemPositionsListener.create();
+  final ScrollOffsetController _scrollOffsetController = ScrollOffsetController();
+  final ItemPositionsListener _itemPositionsListener = ItemPositionsListener.create();
   late final KeepAliveLink currentAssetLink;
 
   /// The timestamp when the haptic feedback was last invoked
   int _hapticFeedbackTS = 0;
   DateTime? _prevItemTime;
   bool _scrolling = false;
-  final Set<Asset> _selectedAssets =
-      LinkedHashSet(equals: (a, b) => a.id == b.id, hashCode: (a) => a.id);
+  final Set<Asset> _selectedAssets = LinkedHashSet(equals: (a, b) => a.id == b.id, hashCode: (a) => a.id);
 
   bool _dragging = false;
   int? _dragAnchorAssetIndex;
   int? _dragAnchorSectionIndex;
-  final Set<Asset> _draggedAssets =
-      HashSet(equals: (a, b) => a.id == b.id, hashCode: (a) => a.id);
+  final Set<Asset> _draggedAssets = HashSet(equals: (a, b) => a.id == b.id, hashCode: (a) => a.id);
 
   ScrollPhysics? _scrollPhysics;
 
@@ -131,9 +126,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
 
   void _deselectAssets(List<Asset> assets) {
     final assetsToDeselect = assets.where(
-      (a) =>
-          widget.canDeselect ||
-          !(widget.preselectedAssets?.contains(a) ?? false),
+      (a) => widget.canDeselect || !(widget.preselectedAssets?.contains(a) ?? false),
     );
 
     setState(() {
@@ -152,9 +145,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
       _dragAnchorSectionIndex = null;
       _draggedAssets.clear();
       _dragging = false;
-      if (!widget.canDeselect &&
-          widget.preselectedAssets != null &&
-          widget.preselectedAssets!.isNotEmpty) {
+      if (!widget.canDeselect && widget.preselectedAssets != null && widget.preselectedAssets!.isNotEmpty) {
         _selectedAssets.addAll(widget.preselectedAssets!);
       }
       _callSelectionListener(false);
@@ -162,8 +153,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
   }
 
   bool _allAssetsSelected(List<Asset> assets) {
-    return widget.selectionActive &&
-        assets.firstWhereOrNull((e) => !_selectedAssets.contains(e)) == null;
+    return widget.selectionActive && assets.firstWhereOrNull((e) => !_selectedAssets.contains(e)) == null;
   }
 
   Future<void> _scrollToIndex(int index) async {
@@ -244,8 +234,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
   }
 
   Widget _buildAssetGrid() {
-    final useDragScrolling =
-        widget.showDragScroll && widget.renderList.totalAssets >= 20;
+    final useDragScrolling = widget.showDragScroll && widget.renderList.totalAssets >= 20;
 
     void dragScrolling(bool active) {
       if (active != _scrolling) {
@@ -256,9 +245,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
     }
 
     bool appBarOffset() {
-      return (ref.watch(tabProvider).index == 0 &&
-              ModalRoute.of(context)?.settings.name ==
-                  TabControllerRoute.name) ||
+      return (ref.watch(tabProvider).index == 0 && ModalRoute.of(context)?.settings.name == TabControllerRoute.name) ||
           (ModalRoute.of(context)?.settings.name == AlbumViewerRoute.name);
     }
 
@@ -272,8 +259,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
       physics: _scrollPhysics,
       itemScrollController: _itemScrollController,
       scrollOffsetController: _scrollOffsetController,
-      itemCount: widget.renderList.elements.length +
-          (widget.topWidget != null ? 1 : 0),
+      itemCount: widget.renderList.elements.length + (widget.topWidget != null ? 1 : 0),
       addRepaintBoundaries: true,
       shrinkWrap: widget.shrinkWrap,
     );
@@ -283,13 +269,10 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
             scrollStateListener: dragScrolling,
             itemPositionsListener: _itemPositionsListener,
             controller: _itemScrollController,
-            backgroundColor: context.isDarkTheme
-                ? context.colorScheme.primary.darken(amount: .5)
-                : context.colorScheme.primary,
+            backgroundColor:
+                context.isDarkTheme ? context.colorScheme.primary.darken(amount: .5) : context.colorScheme.primary,
             labelTextBuilder: widget.showLabel ? _labelBuilder : null,
-            padding: appBarOffset()
-                ? const EdgeInsets.only(top: 60)
-                : const EdgeInsets.only(),
+            padding: appBarOffset() ? const EdgeInsets.only(top: 60) : const EdgeInsets.only(),
             heightOffset: appBarOffset() ? 60 : 0,
             labelConstraints: const BoxConstraints(maxHeight: 28),
             scrollbarAnimationDuration: const Duration(milliseconds: 300),
@@ -323,10 +306,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
 
     // Search for the index of the exact date in the list
     var index = widget.renderList.elements.indexWhere(
-      (e) =>
-          e.date.year == date.year &&
-          e.date.month == date.month &&
-          e.date.day == date.day,
+      (e) => e.date.year == date.year && e.date.month == date.month && e.date.day == date.day,
     );
 
     // If the exact date is not found, the timeline is grouped by month,
@@ -343,8 +323,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
     } else {
       ImmichToast.show(
         context: context,
-        msg:
-            "The date (${DateFormat.yMd().format(date)}) could not be found in the timeline.",
+        msg: "The date (${DateFormat.yMd().format(date)}) could not be found in the timeline.",
         gravity: ToastGravity.BOTTOM,
         toastType: ToastType.error,
       );
@@ -417,8 +396,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
       // on startup.
       if (_prevItemTime == null) {
         _prevItemTime = date;
-      } else if (_prevItemTime?.year != date.year ||
-          _prevItemTime?.month != date.month) {
+      } else if (_prevItemTime?.year != date.year || _prevItemTime?.month != date.month) {
         _prevItemTime = date;
 
         final now = Timeline.now;
@@ -511,12 +489,10 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
     final selectedAssets = <Asset>{};
     var currentSectionIndex = startSectionIndex;
     while (currentSectionIndex < endSectionIndex) {
-      final section =
-          widget.renderList.elements.elementAtOrNull(currentSectionIndex);
+      final section = widget.renderList.elements.elementAtOrNull(currentSectionIndex);
       if (section == null) continue;
 
-      final sectionAssets =
-          widget.renderList.loadAssets(section.offset, section.count);
+      final sectionAssets = widget.renderList.loadAssets(section.offset, section.count);
 
       if (currentSectionIndex == startSectionIndex) {
         selectedAssets.addAll(
@@ -531,8 +507,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
 
     final section = widget.renderList.elements.elementAtOrNull(endSectionIndex);
     if (section != null) {
-      final sectionAssets =
-          widget.renderList.loadAssets(section.offset, section.count);
+      final sectionAssets = widget.renderList.loadAssets(section.offset, section.count);
       if (startSectionIndex == endSectionIndex) {
         selectedAssets.addAll(
           sectionAssets.slice(startSectionAssetIndex, endSectionAssetIndex + 1),
@@ -562,8 +537,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
           /// "add to album" button.
           ///
           /// `_selectedAssets` includes `preselectedAssets` on initialization.
-          if (_selectedAssets.length >
-              (widget.preselectedAssets?.length ?? 0)) {
+          if (_selectedAssets.length > (widget.preselectedAssets?.length ?? 0)) {
             /// `_deselectAll` only deselects the selected assets,
             /// doesn't affect the preselected ones.
             _deselectAll();
@@ -585,8 +559,7 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
             ),
             child: _buildAssetGrid(),
           ),
-          if (widget.showMultiSelectIndicator && widget.selectionActive)
-            _buildMultiSelectIndicator(),
+          if (widget.showMultiSelectIndicator && widget.selectionActive) _buildMultiSelectIndicator(),
         ],
       ),
     );
@@ -671,26 +644,20 @@ class _Section extends StatelessWidget {
   ) {
     return LayoutBuilder(
       builder: (context, constraints) {
-        final width = constraints.maxWidth / assetsPerRow -
-            margin * (assetsPerRow - 1) / assetsPerRow;
+        final width = constraints.maxWidth / assetsPerRow - margin * (assetsPerRow - 1) / assetsPerRow;
         final rows = (section.count + assetsPerRow - 1) ~/ assetsPerRow;
-        final List<Asset> assetsToRender = scrolling
-            ? []
-            : renderList.loadAssets(section.offset, section.count);
+        final List<Asset> assetsToRender = scrolling ? [] : renderList.loadAssets(section.offset, section.count);
         return Column(
           key: ValueKey(section.offset),
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            if (section.type == RenderAssetGridElementType.monthTitle)
-              _MonthTitle(date: section.date),
+            if (section.type == RenderAssetGridElementType.monthTitle) _MonthTitle(date: section.date),
             if (section.type == RenderAssetGridElementType.groupDividerTitle ||
                 section.type == RenderAssetGridElementType.monthTitle)
               _Title(
                 selectionActive: selectionActive,
                 title: section.title!,
-                assets: scrolling
-                    ? []
-                    : renderList.loadAssets(section.offset, section.totalCount),
+                assets: scrolling ? [] : renderList.loadAssets(section.offset, section.totalCount),
                 allAssetsSelected: allAssetsSelected,
                 selectAssets: selectAssets,
                 deselectAssets: deselectAssets,
@@ -699,9 +666,7 @@ class _Section extends StatelessWidget {
               scrolling
                   ? _PlaceholderRow(
                       key: ValueKey(i),
-                      number: i + 1 == rows
-                          ? section.count - i * assetsPerRow
-                          : assetsPerRow,
+                      number: i + 1 == rows ? section.count - i * assetsPerRow : assetsPerRow,
                       width: width,
                       height: width,
                       margin: margin,
@@ -747,9 +712,7 @@ class _MonthTitle extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final monthFormat = DateTime.now().year == date.year
-        ? DateFormat.MMMM()
-        : DateFormat.yMMMM();
+    final monthFormat = DateTime.now().year == date.year ? DateFormat.MMMM() : DateFormat.yMMMM();
     final String title = monthFormat.format(date);
     return Padding(
       key: Key("month-$title"),
@@ -844,8 +807,7 @@ class _AssetRow extends StatelessWidget {
     final widthDistribution = List.filled(assets.length, 1.0);
 
     if (dynamicLayout) {
-      final aspectRatios =
-          assets.map((e) => (e.width ?? 1) / (e.height ?? 1)).toList();
+      final aspectRatios = assets.map((e) => (e.width ?? 1) / (e.height ?? 1)).toList();
       final meanAspectRatio = aspectRatios.sum / assets.length;
 
       // 1: mean width
diff --git a/mobile/lib/widgets/asset_grid/multiselect_grid.dart b/mobile/lib/widgets/asset_grid/multiselect_grid.dart
index 98b1c6f601..a7c1290b30 100644
--- a/mobile/lib/widgets/asset_grid/multiselect_grid.dart
+++ b/mobile/lib/widgets/asset_grid/multiselect_grid.dart
@@ -65,11 +65,9 @@ class MultiselectGrid extends HookConsumerWidget {
   final bool unfavorite;
   final bool editEnabled;
   final Widget? emptyIndicator;
-  Widget buildDefaultLoadingIndicator() =>
-      const Center(child: CircularProgressIndicator());
+  Widget buildDefaultLoadingIndicator() => const Center(child: CircularProgressIndicator());
 
-  Widget buildEmptyIndicator() =>
-      emptyIndicator ?? Center(child: const Text("no_assets_to_show").tr());
+  Widget buildEmptyIndicator() => emptyIndicator ?? Center(child: const Text("no_assets_to_show").tr());
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -103,8 +101,7 @@ class MultiselectGrid extends HookConsumerWidget {
     ) {
       selectionEnabledHook.value = multiselect;
       selection.value = selectedAssets;
-      selectionAssetState.value =
-          AssetSelectionState.fromSelection(selectedAssets);
+      selectionAssetState.value = AssetSelectionState.fromSelection(selectedAssets);
     }
 
     errorBuilder(String? msg) => msg != null && msg.isNotEmpty
@@ -120,16 +117,13 @@ class MultiselectGrid extends HookConsumerWidget {
       String? ownerErrorMessage,
     }) {
       final assets = selection.value;
-      return assets
-          .remoteOnly(errorCallback: errorBuilder(localErrorMessage))
-          .ownedOnly(
+      return assets.remoteOnly(errorCallback: errorBuilder(localErrorMessage)).ownedOnly(
             currentUser,
             errorCallback: errorBuilder(ownerErrorMessage),
           );
     }
 
-    Iterable<Asset> remoteSelection({String? errorMessage}) =>
-        selection.value.remoteOnly(
+    Iterable<Asset> remoteSelection({String? errorMessage}) => selection.value.remoteOnly(
           errorCallback: errorBuilder(errorMessage),
         );
 
@@ -139,9 +133,7 @@ class MultiselectGrid extends HookConsumerWidget {
         // Share = Download + Send to OS specific share sheet
         handleShareAssets(ref, context, selection.value);
       } else {
-        final ids =
-            remoteSelection(errorMessage: "home_page_share_err_local".tr())
-                .map((e) => e.remoteId!);
+        final ids = remoteSelection(errorMessage: "home_page_share_err_local".tr()).map((e) => e.remoteId!);
         context.pushRoute(SharedLinkEditRoute(assetsList: ids.toList()));
       }
       processing.value = false;
@@ -187,18 +179,14 @@ class MultiselectGrid extends HookConsumerWidget {
               errorCallback: errorBuilder('home_page_delete_err_partner'.tr()),
             )
             .toList();
-        final isDeleted = await ref
-            .read(assetProvider.notifier)
-            .deleteAssets(toDelete, force: force);
+        final isDeleted = await ref.read(assetProvider.notifier).deleteAssets(toDelete, force: force);
 
         if (isDeleted) {
           ImmichToast.show(
             context: context,
             msg: force
-                ? 'assets_deleted_permanently'
-                    .tr(namedArgs: {'count': "${selection.value.length}"})
-                : 'assets_trashed'
-                    .tr(namedArgs: {'count': "${selection.value.length}"}),
+                ? 'assets_deleted_permanently'.tr(namedArgs: {'count': "${selection.value.length}"})
+                : 'assets_trashed'.tr(namedArgs: {'count': "${selection.value.length}"}),
             gravity: ToastGravity.BOTTOM,
           );
           selectionEnabledHook.value = false;
@@ -213,26 +201,20 @@ class MultiselectGrid extends HookConsumerWidget {
       try {
         final localAssets = selection.value.where((a) => a.isLocal).toList();
 
-        final toDelete = isMergedAsset
-            ? localAssets.where((e) => e.storage == AssetState.merged)
-            : localAssets;
+        final toDelete = isMergedAsset ? localAssets.where((e) => e.storage == AssetState.merged) : localAssets;
 
         if (toDelete.isEmpty) {
           return;
         }
 
-        final isDeleted = await ref
-            .read(assetProvider.notifier)
-            .deleteLocalAssets(toDelete.toList());
+        final isDeleted = await ref.read(assetProvider.notifier).deleteLocalAssets(toDelete.toList());
 
         if (isDeleted) {
-          final deletedCount =
-              localAssets.where((e) => !isMergedAsset || e.isRemote).length;
+          final deletedCount = localAssets.where((e) => !isMergedAsset || e.isRemote).length;
 
           ImmichToast.show(
             context: context,
-            msg: 'assets_removed_permanently_from_device'
-                .tr(namedArgs: {'count': "$deletedCount"}),
+            msg: 'assets_removed_permanently_from_device'.tr(namedArgs: {'count': "$deletedCount"}),
             gravity: ToastGravity.BOTTOM,
           );
 
@@ -248,9 +230,7 @@ class MultiselectGrid extends HookConsumerWidget {
       try {
         final toDownload = selection.value.toList();
 
-        final results = await ref
-            .read(downloadStateProvider.notifier)
-            .downloadAllAsset(toDownload);
+        final results = await ref.read(downloadStateProvider.notifier).downloadAllAsset(toDownload);
 
         final totalCount = toDownload.length;
         final successCount = results.where((e) => e).length;
@@ -290,19 +270,16 @@ class MultiselectGrid extends HookConsumerWidget {
           ownerErrorMessage: 'home_page_delete_err_partner'.tr(),
         ).toList();
 
-        final isDeleted =
-            await ref.read(assetProvider.notifier).deleteRemoteAssets(
-                  toDelete,
-                  shouldDeletePermanently: shouldDeletePermanently,
-                );
+        final isDeleted = await ref.read(assetProvider.notifier).deleteRemoteAssets(
+              toDelete,
+              shouldDeletePermanently: shouldDeletePermanently,
+            );
         if (isDeleted) {
           ImmichToast.show(
             context: context,
             msg: shouldDeletePermanently
-                ? 'assets_deleted_permanently_from_server'
-                    .tr(namedArgs: {'count': "${toDelete.length}"})
-                : 'assets_trashed_from_server'
-                    .tr(namedArgs: {'count': "${toDelete.length}"}),
+                ? 'assets_deleted_permanently_from_server'.tr(namedArgs: {'count': "${toDelete.length}"})
+                : 'assets_trashed_from_server'.tr(namedArgs: {'count': "${toDelete.length}"}),
             gravity: ToastGravity.BOTTOM,
           );
         }
@@ -379,9 +356,7 @@ class MultiselectGrid extends HookConsumerWidget {
         if (assets.isEmpty) {
           return;
         }
-        final result = await ref
-            .read(albumServiceProvider)
-            .createAlbumWithGeneratedName(assets);
+        final result = await ref.read(albumServiceProvider).createAlbumWithGeneratedName(assets);
 
         if (result != null) {
           ref.watch(albumProvider.notifier).refreshRemoteAlbums();
@@ -449,9 +424,7 @@ class MultiselectGrid extends HookConsumerWidget {
         );
         if (remoteAssets.isNotEmpty) {
           final isInLockedView = ref.read(inLockedViewProvider);
-          final visibility = isInLockedView
-              ? AssetVisibilityEnum.timeline
-              : AssetVisibilityEnum.locked;
+          final visibility = isInLockedView ? AssetVisibilityEnum.timeline : AssetVisibilityEnum.locked;
 
           await handleSetAssetsVisibility(
             ref,
@@ -489,8 +462,7 @@ class MultiselectGrid extends HookConsumerWidget {
       child: Stack(
         children: [
           ref.watch(renderListProvider).when(
-                data: (data) => data.isEmpty &&
-                        (buildLoadingIndicator != null || topWidget == null)
+                data: (data) => data.isEmpty && (buildLoadingIndicator != null || topWidget == null)
                     ? (buildLoadingIndicator ?? buildEmptyIndicator)()
                     : ImmichAssetGrid(
                         renderList: data,
diff --git a/mobile/lib/widgets/asset_grid/multiselect_grid_status_indicator.dart b/mobile/lib/widgets/asset_grid/multiselect_grid_status_indicator.dart
index b17029f2af..10a541cec3 100644
--- a/mobile/lib/widgets/asset_grid/multiselect_grid_status_indicator.dart
+++ b/mobile/lib/widgets/asset_grid/multiselect_grid_status_indicator.dart
@@ -25,10 +25,8 @@ class MultiselectGridStatusIndicator extends HookConsumerWidget {
               ),
             )
           : buildLoadingIndicator!(),
-      RenderListStatusEnum.empty =>
-        emptyIndicator ?? Center(child: const Text("no_assets_to_show").tr()),
-      RenderListStatusEnum.error =>
-        Center(child: const Text("error_loading_assets").tr()),
+      RenderListStatusEnum.empty => emptyIndicator ?? Center(child: const Text("no_assets_to_show").tr()),
+      RenderListStatusEnum.error => Center(child: const Text("error_loading_assets").tr()),
       RenderListStatusEnum.complete => const SizedBox()
     };
   }
diff --git a/mobile/lib/widgets/asset_grid/thumbnail_image.dart b/mobile/lib/widgets/asset_grid/thumbnail_image.dart
index 5b98c8a756..10815d00bb 100644
--- a/mobile/lib/widgets/asset_grid/thumbnail_image.dart
+++ b/mobile/lib/widgets/asset_grid/thumbnail_image.dart
@@ -41,9 +41,8 @@ class ThumbnailImage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final assetContainerColor = context.isDarkTheme
-        ? context.primaryColor.darken(amount: 0.6)
-        : context.primaryColor.lighten(amount: 0.8);
+    final assetContainerColor =
+        context.isDarkTheme ? context.primaryColor.darken(amount: 0.6) : context.primaryColor.lighten(amount: 0.8);
 
     return Stack(
       children: [
@@ -118,9 +117,8 @@ class _SelectedIcon extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final assetContainerColor = context.isDarkTheme
-        ? context.primaryColor.darken(amount: 0.6)
-        : context.primaryColor.lighten(amount: 0.8);
+    final assetContainerColor =
+        context.isDarkTheme ? context.primaryColor.darken(amount: 0.6) : context.primaryColor.lighten(amount: 0.8);
 
     return DecoratedBox(
       decoration: BoxDecoration(
@@ -322,9 +320,7 @@ class _ImageIcon extends StatelessWidget {
     }
 
     return DecoratedBox(
-      decoration: canDeselect
-          ? BoxDecoration(color: assetContainerColor)
-          : const BoxDecoration(color: Colors.grey),
+      decoration: canDeselect ? BoxDecoration(color: assetContainerColor) : const BoxDecoration(color: Colors.grey),
       child: ClipRRect(
         borderRadius: const BorderRadius.all(Radius.circular(15.0)),
         child: image,
diff --git a/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart b/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart
index f6a617bf1c..6fda361632 100644
--- a/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart
+++ b/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart
@@ -35,9 +35,7 @@ class AdvancedBottomSheet extends HookConsumerWidget {
                 const SizedBox(height: 32.0),
                 Container(
                   decoration: BoxDecoration(
-                    color: context.isDarkTheme
-                        ? Colors.grey[900]
-                        : Colors.grey[200],
+                    color: context.isDarkTheme ? Colors.grey[900] : Colors.grey[200],
                     borderRadius: const BorderRadius.all(
                       Radius.circular(15.0),
                     ),
@@ -66,8 +64,7 @@ class AdvancedBottomSheet extends HookConsumerWidget {
                                   SnackBar(
                                     content: Text(
                                       "Copied to clipboard",
-                                      style:
-                                          context.textTheme.bodyLarge?.copyWith(
+                                      style: context.textTheme.bodyLarge?.copyWith(
                                         color: context.primaryColor,
                                       ),
                                     ),
diff --git a/mobile/lib/widgets/asset_viewer/animated_play_pause.dart b/mobile/lib/widgets/asset_viewer/animated_play_pause.dart
index 7935567b8c..dd0d95b93b 100644
--- a/mobile/lib/widgets/asset_viewer/animated_play_pause.dart
+++ b/mobile/lib/widgets/asset_viewer/animated_play_pause.dart
@@ -17,8 +17,7 @@ class AnimatedPlayPause extends StatefulWidget {
   State<StatefulWidget> createState() => AnimatedPlayPauseState();
 }
 
-class AnimatedPlayPauseState extends State<AnimatedPlayPause>
-    with SingleTickerProviderStateMixin {
+class AnimatedPlayPauseState extends State<AnimatedPlayPause> with SingleTickerProviderStateMixin {
   late final animationController = AnimationController(
     vsync: this,
     value: widget.playing ? 1 : 0,
diff --git a/mobile/lib/widgets/asset_viewer/bottom_gallery_bar.dart b/mobile/lib/widgets/asset_viewer/bottom_gallery_bar.dart
index 59d97bf0c7..66392b4bb4 100644
--- a/mobile/lib/widgets/asset_viewer/bottom_gallery_bar.dart
+++ b/mobile/lib/widgets/asset_viewer/bottom_gallery_bar.dart
@@ -52,28 +52,21 @@ class BottomGalleryBar extends ConsumerWidget {
     if (asset == null) {
       return const SizedBox();
     }
-    final isOwner =
-        asset.ownerId == fastHash(ref.watch(currentUserProvider)?.id ?? '');
+    final isOwner = asset.ownerId == fastHash(ref.watch(currentUserProvider)?.id ?? '');
     final showControls = ref.watch(showControlsProvider);
     final stackId = asset.stackId;
 
-    final stackItems = showStack && stackId != null
-        ? ref.watch(assetStackStateProvider(stackId))
-        : <Asset>[];
+    final stackItems = showStack && stackId != null ? ref.watch(assetStackStateProvider(stackId)) : <Asset>[];
     bool isStackPrimaryAsset = asset.stackPrimaryAssetId == null;
     final navStack = AutoRouter.of(context).stackData;
-    final isTrashEnabled =
-        ref.watch(serverInfoProvider.select((v) => v.serverFeatures.trash));
-    final isFromTrash = isTrashEnabled &&
-        navStack.length > 2 &&
-        navStack.elementAt(navStack.length - 2).name == TrashRoute.name;
+    final isTrashEnabled = ref.watch(serverInfoProvider.select((v) => v.serverFeatures.trash));
+    final isFromTrash =
+        isTrashEnabled && navStack.length > 2 && navStack.elementAt(navStack.length - 2).name == TrashRoute.name;
     final isInAlbum = ref.watch(currentAlbumProvider)?.isRemote ?? false;
 
     void removeAssetFromStack() {
       if (stackIndex.value > 0 && showStack && stackId != null) {
-        ref
-            .read(assetStackStateProvider(stackId).notifier)
-            .removeChild(stackIndex.value - 1);
+        ref.read(assetStackStateProvider(stackId).notifier).removeChild(stackIndex.value - 1);
       }
     }
 
@@ -89,8 +82,7 @@ class BottomGalleryBar extends ConsumerWidget {
 
           // `assetIndex == totalAssets.value - 1` handle the case of removing the last asset
           // to not throw the error when the next preCache index is called
-          if (totalAssets.value == 1 ||
-              assetIndex.value == totalAssets.value - 1) {
+          if (totalAssets.value == 1 || assetIndex.value == totalAssets.value - 1) {
             // Handle only one asset
             context.maybePop();
           }
@@ -98,9 +90,7 @@ class BottomGalleryBar extends ConsumerWidget {
           totalAssets.value -= 1;
         }
         if (isDeleted) {
-          ref
-              .read(currentAssetProvider.notifier)
-              .set(renderList.loadAsset(assetIndex.value));
+          ref.read(currentAssetProvider.notifier).set(renderList.loadAsset(assetIndex.value));
         }
         return isDeleted;
       }
@@ -144,9 +134,7 @@ class BottomGalleryBar extends ConsumerWidget {
         return;
       }
 
-      await ref
-          .read(stackServiceProvider)
-          .deleteStack(asset.stackId!, stackItems);
+      await ref.read(stackServiceProvider).deleteStack(asset.stackId!, stackItems);
     }
 
     void showStackActionItems() {
@@ -240,8 +228,7 @@ class BottomGalleryBar extends ConsumerWidget {
 
     handleRemoveFromAlbum() async {
       final album = ref.read(currentAlbumProvider);
-      final bool isSuccess = album != null &&
-          await ref.read(albumProvider.notifier).removeAsset(album, [asset]);
+      final bool isSuccess = album != null && await ref.read(albumProvider.notifier).removeAsset(album, [asset]);
 
       if (isSuccess) {
         // Workaround for asset remaining in the gallery
@@ -373,9 +360,7 @@ class BottomGalleryBar extends ConsumerWidget {
                   unselectedItemColor: Colors.white,
                   showSelectedLabels: true,
                   showUnselectedLabels: true,
-                  items: albumActions
-                      .map((e) => e.keys.first)
-                      .toList(growable: false),
+                  items: albumActions.map((e) => e.keys.first).toList(growable: false),
                   onTap: (index) {
                     albumActions[index].values.first.call(index);
                   },
diff --git a/mobile/lib/widgets/asset_viewer/cast_dialog.dart b/mobile/lib/widgets/asset_viewer/cast_dialog.dart
index 9043ea4bea..a0373bcb6c 100644
--- a/mobile/lib/widgets/asset_viewer/cast_dialog.dart
+++ b/mobile/lib/widgets/asset_viewer/cast_dialog.dart
@@ -49,10 +49,8 @@ class CastDialog extends ConsumerWidget {
             }
 
             final devices = snapshot.data!;
-            final connected =
-                devices.where((d) => isCurrentDevice(d.$1)).toList();
-            final others =
-                devices.where((d) => !isCurrentDevice(d.$1)).toList();
+            final connected = devices.where((d) => isCurrentDevice(d.$1)).toList();
+            final others = devices.where((d) => !isCurrentDevice(d.$1)).toList();
 
             final List<dynamic> sectionedList = [];
 
@@ -85,25 +83,18 @@ class CastDialog extends ConsumerWidget {
                     ).tr(),
                   );
                 } else {
-                  final (deviceName, type, deviceObj) =
-                      item as (String, CastDestinationType, dynamic);
+                  final (deviceName, type, deviceObj) = item as (String, CastDestinationType, dynamic);
 
                   return ListTile(
                     title: Text(
                       deviceName,
                       style: TextStyle(
-                        color: isCurrentDevice(deviceName)
-                            ? context.colorScheme.primary
-                            : null,
+                        color: isCurrentDevice(deviceName) ? context.colorScheme.primary : null,
                       ),
                     ),
                     leading: Icon(
-                      type == CastDestinationType.googleCast
-                          ? Icons.cast
-                          : Icons.cast_connected,
-                      color: isCurrentDevice(deviceName)
-                          ? context.colorScheme.primary
-                          : null,
+                      type == CastDestinationType.googleCast ? Icons.cast : Icons.cast_connected,
+                      color: isCurrentDevice(deviceName) ? context.colorScheme.primary : null,
                     ),
                     trailing: isCurrentDevice(deviceName)
                         ? Icon(Icons.check, color: context.colorScheme.primary)
@@ -120,9 +111,7 @@ class CastDialog extends ConsumerWidget {
                       }
 
                       if (!isCurrentDevice(deviceName)) {
-                        ref
-                            .read(castProvider.notifier)
-                            .connect(type, deviceObj);
+                        ref.read(castProvider.notifier).connect(type, deviceObj);
                       }
                     },
                   );
diff --git a/mobile/lib/widgets/asset_viewer/custom_video_player_controls.dart b/mobile/lib/widgets/asset_viewer/custom_video_player_controls.dart
index 18565c8332..d70761f37d 100644
--- a/mobile/lib/widgets/asset_viewer/custom_video_player_controls.dart
+++ b/mobile/lib/widgets/asset_viewer/custom_video_player_controls.dart
@@ -24,8 +24,7 @@ class CustomVideoPlayerControls extends HookConsumerWidget {
       currentAssetProvider.select((asset) => asset != null && asset.isVideo),
     );
     final showControls = ref.watch(showControlsProvider);
-    final VideoPlaybackState state =
-        ref.watch(videoPlaybackValueProvider.select((value) => value.state));
+    final VideoPlaybackState state = ref.watch(videoPlaybackValueProvider.select((value) => value.state));
 
     final cast = ref.watch(castProvider);
 
@@ -39,15 +38,12 @@ class CustomVideoPlayerControls extends HookConsumerWidget {
         final state = ref.read(videoPlaybackValueProvider).state;
 
         // Do not hide on paused
-        if (state != VideoPlaybackState.paused &&
-            state != VideoPlaybackState.completed &&
-            assetIsVideo) {
+        if (state != VideoPlaybackState.paused && state != VideoPlaybackState.completed && assetIsVideo) {
           ref.read(showControlsProvider.notifier).show = false;
         }
       },
     );
-    final showBuffering =
-        state == VideoPlaybackState.buffering && !cast.isCasting;
+    final showBuffering = state == VideoPlaybackState.buffering && !cast.isCasting;
 
     /// Shows the controls and starts the timer to hide them
     void showControlsAndStartHideTimer() {
@@ -56,8 +52,7 @@ class CustomVideoPlayerControls extends HookConsumerWidget {
     }
 
     // When we change position, show or hide timer
-    ref.listen(videoPlayerControlsProvider.select((v) => v.position),
-        (previous, next) {
+    ref.listen(videoPlayerControlsProvider.select((v) => v.position), (previous, next) {
       showControlsAndStartHideTimer();
     });
 
@@ -105,14 +100,13 @@ class CustomVideoPlayerControls extends HookConsumerWidget {
               )
             else
               GestureDetector(
-                onTap: () =>
-                    ref.read(showControlsProvider.notifier).show = false,
+                onTap: () => ref.read(showControlsProvider.notifier).show = false,
                 child: CenterPlayButton(
                   backgroundColor: Colors.black54,
                   iconColor: Colors.white,
                   isFinished: state == VideoPlaybackState.completed,
-                  isPlaying: state == VideoPlaybackState.playing ||
-                      (cast.isCasting && cast.castState == CastState.playing),
+                  isPlaying:
+                      state == VideoPlaybackState.playing || (cast.isCasting && cast.castState == CastState.playing),
                   show: assetIsVideo && showControls,
                   onPressed: togglePlay,
                 ),
diff --git a/mobile/lib/widgets/asset_viewer/detail_panel/camera_info.dart b/mobile/lib/widgets/asset_viewer/detail_panel/camera_info.dart
index aec18c6a16..bd859b8ced 100644
--- a/mobile/lib/widgets/asset_viewer/detail_panel/camera_info.dart
+++ b/mobile/lib/widgets/asset_viewer/detail_panel/camera_info.dart
@@ -24,10 +24,7 @@ class CameraInfo extends StatelessWidget {
         "${exifInfo.make} ${exifInfo.model}",
         style: context.textTheme.labelLarge,
       ),
-      subtitle: exifInfo.f != null ||
-              exifInfo.exposureSeconds != null ||
-              exifInfo.mm != null ||
-              exifInfo.iso != null
+      subtitle: exifInfo.f != null || exifInfo.exposureSeconds != null || exifInfo.mm != null || exifInfo.iso != null
           ? Text(
               "ƒ/${exifInfo.fNumber}   ${exifInfo.exposureTime}   ${exifInfo.focalLength} mm   ISO ${exifInfo.iso ?? ''} ",
               style: context.textTheme.bodySmall,
diff --git a/mobile/lib/widgets/asset_viewer/detail_panel/detail_panel.dart b/mobile/lib/widgets/asset_viewer/detail_panel/detail_panel.dart
index 8ad2cdc687..97c9477c97 100644
--- a/mobile/lib/widgets/asset_viewer/detail_panel/detail_panel.dart
+++ b/mobile/lib/widgets/asset_viewer/detail_panel/detail_panel.dart
@@ -24,9 +24,7 @@ class DetailPanel extends HookConsumerWidget {
           child: Column(
             children: [
               AssetDateTime(asset: asset),
-              asset.isRemote
-                  ? DescriptionInput(asset: asset)
-                  : const SizedBox.shrink(),
+              asset.isRemote ? DescriptionInput(asset: asset) : const SizedBox.shrink(),
               PeopleInfo(asset: asset),
               AssetLocation(asset: asset),
               AssetDetails(asset: asset),
diff --git a/mobile/lib/widgets/asset_viewer/detail_panel/file_info.dart b/mobile/lib/widgets/asset_viewer/detail_panel/file_info.dart
index 4af9846cf6..486918c436 100644
--- a/mobile/lib/widgets/asset_viewer/detail_panel/file_info.dart
+++ b/mobile/lib/widgets/asset_viewer/detail_panel/file_info.dart
@@ -17,11 +17,8 @@ class FileInfo extends StatelessWidget {
 
     final height = asset.orientatedHeight ?? asset.height;
     final width = asset.orientatedWidth ?? asset.width;
-    String resolution =
-        height != null && width != null ? "$width x $height  " : "";
-    String fileSize = asset.exifInfo?.fileSize != null
-        ? formatBytes(asset.exifInfo!.fileSize!)
-        : "";
+    String resolution = height != null && width != null ? "$width x $height  " : "";
+    String fileSize = asset.exifInfo?.fileSize != null ? formatBytes(asset.exifInfo!.fileSize!) : "";
     String text = resolution + fileSize;
     final imgSizeString = text.isNotEmpty ? text : null;
 
diff --git a/mobile/lib/widgets/asset_viewer/detail_panel/people_info.dart b/mobile/lib/widgets/asset_viewer/detail_panel/people_info.dart
index cbb003bd72..a97a04a453 100644
--- a/mobile/lib/widgets/asset_viewer/detail_panel/people_info.dart
+++ b/mobile/lib/widgets/asset_viewer/detail_panel/people_info.dart
@@ -18,12 +18,8 @@ class PeopleInfo extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final peopleProvider =
-        ref.watch(assetPeopleNotifierProvider(asset).notifier);
-    final people = ref
-        .watch(assetPeopleNotifierProvider(asset))
-        .value
-        ?.where((p) => !p.isHidden);
+    final peopleProvider = ref.watch(assetPeopleNotifierProvider(asset).notifier);
+    final people = ref.watch(assetPeopleNotifierProvider(asset)).value?.where((p) => !p.isHidden);
 
     showPersonNameEditModel(
       String personId,
@@ -46,8 +42,7 @@ class PeopleInfo extends ConsumerWidget {
               (p) => SearchCuratedContent(
                 id: p.id,
                 label: p.name,
-                subtitle: p.birthDate != null &&
-                        p.birthDate!.isBefore(asset.fileCreatedAt)
+                subtitle: p.birthDate != null && p.birthDate!.isBefore(asset.fileCreatedAt)
                     ? _formatAge(p.birthDate!, asset.fileCreatedAt)
                     : null,
               ),
@@ -56,9 +51,7 @@ class PeopleInfo extends ConsumerWidget {
         [];
 
     return AnimatedCrossFade(
-      crossFadeState: (people?.isEmpty ?? true)
-          ? CrossFadeState.showFirst
-          : CrossFadeState.showSecond,
+      crossFadeState: (people?.isEmpty ?? true) ? CrossFadeState.showFirst : CrossFadeState.showSecond,
       duration: const Duration(milliseconds: 200),
       firstChild: Container(),
       secondChild: Padding(
@@ -109,22 +102,18 @@ class PeopleInfo extends ConsumerWidget {
     int ageInMonths = _calculateAgeInMonths(birthDate, referenceDate);
 
     if (ageInMonths <= 11) {
-      return "exif_bottom_sheet_person_age_months"
-          .tr(namedArgs: {'months': ageInMonths.toString()});
+      return "exif_bottom_sheet_person_age_months".tr(namedArgs: {'months': ageInMonths.toString()});
     } else if (ageInMonths > 12 && ageInMonths <= 23) {
-      return "exif_bottom_sheet_person_age_year_months"
-          .tr(namedArgs: {'months': (ageInMonths - 12).toString()});
+      return "exif_bottom_sheet_person_age_year_months".tr(namedArgs: {'months': (ageInMonths - 12).toString()});
     } else {
-      return "exif_bottom_sheet_person_age_years"
-          .tr(namedArgs: {'years': ageInYears.toString()});
+      return "exif_bottom_sheet_person_age_years".tr(namedArgs: {'years': ageInYears.toString()});
     }
   }
 
   int _calculateAge(DateTime birthDate, DateTime referenceDate) {
     int age = referenceDate.year - birthDate.year;
     if (referenceDate.month < birthDate.month ||
-        (referenceDate.month == birthDate.month &&
-            referenceDate.day < birthDate.day)) {
+        (referenceDate.month == birthDate.month && referenceDate.day < birthDate.day)) {
       age--;
     }
     return age;
diff --git a/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart b/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart
index f47e73ea78..1c24412259 100644
--- a/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart
+++ b/mobile/lib/widgets/asset_viewer/gallery_app_bar.dart
@@ -34,17 +34,12 @@ class GalleryAppBar extends ConsumerWidget {
       return const SizedBox();
     }
     final album = ref.watch(currentAlbumProvider);
-    final isOwner =
-        asset.ownerId == fastHash(ref.watch(currentUserProvider)?.id ?? '');
+    final isOwner = asset.ownerId == fastHash(ref.watch(currentUserProvider)?.id ?? '');
     final showControls = ref.watch(showControlsProvider);
 
-    final isPartner = ref
-        .watch(partnerSharedWithProvider)
-        .map((e) => fastHash(e.id))
-        .contains(asset.ownerId);
+    final isPartner = ref.watch(partnerSharedWithProvider).map((e) => fastHash(e.id)).contains(asset.ownerId);
 
-    toggleFavorite(Asset asset) =>
-        ref.read(assetProvider.notifier).toggleFavorite([asset]);
+    toggleFavorite(Asset asset) => ref.read(assetProvider.notifier).toggleFavorite([asset]);
 
     handleActivities() {
       if (album != null && album.shared && album.remoteId != null) {
@@ -53,8 +48,7 @@ class GalleryAppBar extends ConsumerWidget {
     }
 
     handleRestore(Asset asset) async {
-      final result =
-          await ref.read(trashProvider.notifier).restoreAssets([asset]);
+      final result = await ref.read(trashProvider.notifier).restoreAssets([asset]);
 
       if (result && context.mounted) {
         ImmichToast.show(
@@ -71,9 +65,7 @@ class GalleryAppBar extends ConsumerWidget {
         builder: (BuildContext _) {
           return UploadDialog(
             onUpload: () {
-              ref
-                  .read(manualUploadProvider.notifier)
-                  .uploadAssets(context, [asset]);
+              ref.read(manualUploadProvider.notifier).uploadAssets(context, [asset]);
             },
           );
         },
@@ -104,8 +96,7 @@ class GalleryAppBar extends ConsumerWidget {
     handleLocateAsset() async {
       // Go back to the gallery
       await context.maybePop();
-      await context
-          .navigateTo(const TabControllerRoute(children: [PhotosRoute()]));
+      await context.navigateTo(const TabControllerRoute(children: [PhotosRoute()]));
       ref.read(tabProvider.notifier).update((state) => state = TabEnum.home);
       // Scroll to the asset's date
       scrollToDateNotifierProvider.scrollToDate(asset.fileCreatedAt);
diff --git a/mobile/lib/widgets/asset_viewer/top_control_app_bar.dart b/mobile/lib/widgets/asset_viewer/top_control_app_bar.dart
index a868aff617..1d04115b7c 100644
--- a/mobile/lib/widgets/asset_viewer/top_control_app_bar.dart
+++ b/mobile/lib/widgets/asset_viewer/top_control_app_bar.dart
@@ -49,12 +49,9 @@ class TopControlAppBar extends HookConsumerWidget {
     final a = ref.watch(assetWatcher(asset)).value ?? asset;
     final album = ref.watch(currentAlbumProvider);
     final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
-    final websocketConnected =
-        ref.watch(websocketProvider.select((c) => c.isConnected));
+    final websocketConnected = ref.watch(websocketProvider.select((c) => c.isConnected));
 
-    final comments = album != null &&
-            album.remoteId != null &&
-            asset.remoteId != null
+    final comments = album != null && album.remoteId != null && asset.remoteId != null
         ? ref.watch(activityStatisticsProvider(album.remoteId!, asset.remoteId))
         : 0;
 
@@ -204,24 +201,14 @@ class TopControlAppBar extends HookConsumerWidget {
       shape: const Border(),
       actions: [
         if (asset.isRemote && isOwner) buildFavoriteButton(a),
-        if (isOwner &&
-            !isInHomePage &&
-            !(isInTrash ?? false) &&
-            !isInLockedView)
-          buildLocateButton(),
+        if (isOwner && !isInHomePage && !(isInTrash ?? false) && !isInLockedView) buildLocateButton(),
         if (asset.livePhotoVideoId != null) const MotionPhotoButton(),
         if (asset.isLocal && !asset.isRemote) buildUploadButton(),
         if (asset.isRemote && !asset.isLocal && isOwner) buildDownloadButton(),
-        if (asset.isRemote &&
-            (isOwner || isPartner) &&
-            !asset.isTrashed &&
-            !isInLockedView)
-          buildAddToAlbumButton(),
-        if (isCasting || (asset.isRemote && websocketConnected))
-          buildCastButton(),
+        if (asset.isRemote && (isOwner || isPartner) && !asset.isTrashed && !isInLockedView) buildAddToAlbumButton(),
+        if (isCasting || (asset.isRemote && websocketConnected)) buildCastButton(),
         if (asset.isTrashed) buildRestoreButton(),
-        if (album != null && album.shared && !isInLockedView)
-          buildActivitiesButton(),
+        if (album != null && album.shared && !isInLockedView) buildActivitiesButton(),
         buildMoreInfoButton(),
       ],
     );
diff --git a/mobile/lib/widgets/asset_viewer/video_position.dart b/mobile/lib/widgets/asset_viewer/video_position.dart
index 0e90669fe3..2bd2eb80bf 100644
--- a/mobile/lib/widgets/asset_viewer/video_position.dart
+++ b/mobile/lib/widgets/asset_viewer/video_position.dart
@@ -54,8 +54,7 @@ class VideoPosition extends HookConsumerWidget {
                       activeColor: Colors.white,
                       inactiveColor: whiteOpacity75,
                       onChangeStart: (value) {
-                        final state =
-                            ref.read(videoPlaybackValueProvider).state;
+                        final state = ref.read(videoPlaybackValueProvider).state;
                         wasPlaying.value = state != VideoPlaybackState.paused;
                         ref.read(videoPlayerControlsProvider.notifier).pause();
                       },
@@ -68,19 +67,14 @@ class VideoPosition extends HookConsumerWidget {
                         final seekToDuration = (duration * (value / 100.0));
 
                         if (isCasting) {
-                          ref
-                              .read(castProvider.notifier)
-                              .seekTo(seekToDuration);
+                          ref.read(castProvider.notifier).seekTo(seekToDuration);
                           return;
                         }
 
-                        ref
-                            .read(videoPlayerControlsProvider.notifier)
-                            .position = seekToDuration.inSeconds.toDouble();
+                        ref.read(videoPlayerControlsProvider.notifier).position = seekToDuration.inSeconds.toDouble();
 
                         // This immediately updates the slider position without waiting for the video to update
-                        ref.read(videoPlaybackValueProvider.notifier).position =
-                            seekToDuration;
+                        ref.read(videoPlaybackValueProvider.notifier).position = seekToDuration;
                       },
                     ),
                   ),
diff --git a/mobile/lib/widgets/backup/album_info_card.dart b/mobile/lib/widgets/backup/album_info_card.dart
index fa113c6291..696168a384 100644
--- a/mobile/lib/widgets/backup/album_info_card.dart
+++ b/mobile/lib/widgets/backup/album_info_card.dart
@@ -23,13 +23,9 @@ class AlbumInfoCard extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final bool isSelected =
-        ref.watch(backupProvider).selectedBackupAlbums.contains(album);
-    final bool isExcluded =
-        ref.watch(backupProvider).excludedBackupAlbums.contains(album);
-    final syncAlbum = ref
-        .watch(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.syncAlbums);
+    final bool isSelected = ref.watch(backupProvider).selectedBackupAlbums.contains(album);
+    final bool isExcluded = ref.watch(backupProvider).excludedBackupAlbums.contains(album);
+    final syncAlbum = ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
 
     final isDarkTheme = context.isDarkTheme;
 
@@ -37,10 +33,8 @@ class AlbumInfoCard extends HookConsumerWidget {
       context.primaryColor.withAlpha(100),
       BlendMode.darken,
     );
-    ColorFilter excludedFilter =
-        ColorFilter.mode(Colors.red.withAlpha(75), BlendMode.darken);
-    ColorFilter unselectedFilter =
-        const ColorFilter.mode(Colors.black, BlendMode.color);
+    ColorFilter excludedFilter = ColorFilter.mode(Colors.red.withAlpha(75), BlendMode.darken);
+    ColorFilter unselectedFilter = const ColorFilter.mode(Colors.black, BlendMode.color);
 
     buildSelectedTextBox() {
       if (isSelected) {
@@ -133,9 +127,7 @@ class AlbumInfoCard extends HookConsumerWidget {
             Radius.circular(12), // if you need this
           ),
           side: BorderSide(
-            color: isDarkTheme
-                ? const Color.fromARGB(255, 37, 35, 35)
-                : const Color(0xFFC9C9C9),
+            color: isDarkTheme ? const Color.fromARGB(255, 37, 35, 35) : const Color(0xFFC9C9C9),
             width: 1,
           ),
         ),
@@ -190,8 +182,7 @@ class AlbumInfoCard extends HookConsumerWidget {
                         Padding(
                           padding: const EdgeInsets.only(top: 2.0),
                           child: Text(
-                            album.assetCount.toString() +
-                                (album.isAll ? " (${'all'.tr()})" : ""),
+                            album.assetCount.toString() + (album.isAll ? " (${'all'.tr()})" : ""),
                             style: TextStyle(
                               fontSize: 12,
                               color: Colors.grey[600],
diff --git a/mobile/lib/widgets/backup/album_info_list_tile.dart b/mobile/lib/widgets/backup/album_info_list_tile.dart
index a263c004bd..7558b909bb 100644
--- a/mobile/lib/widgets/backup/album_info_list_tile.dart
+++ b/mobile/lib/widgets/backup/album_info_list_tile.dart
@@ -19,23 +19,15 @@ class AlbumInfoListTile extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final bool isSelected =
-        ref.watch(backupProvider).selectedBackupAlbums.contains(album);
-    final bool isExcluded =
-        ref.watch(backupProvider).excludedBackupAlbums.contains(album);
-    final syncAlbum = ref
-        .watch(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.syncAlbums);
+    final bool isSelected = ref.watch(backupProvider).selectedBackupAlbums.contains(album);
+    final bool isExcluded = ref.watch(backupProvider).excludedBackupAlbums.contains(album);
+    final syncAlbum = ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
 
     buildTileColor() {
       if (isSelected) {
-        return context.isDarkTheme
-            ? context.primaryColor.withAlpha(100)
-            : context.primaryColor.withAlpha(25);
+        return context.isDarkTheme ? context.primaryColor.withAlpha(100) : context.primaryColor.withAlpha(25);
       } else if (isExcluded) {
-        return context.isDarkTheme
-            ? Colors.red[300]?.withAlpha(150)
-            : Colors.red[100]?.withAlpha(150);
+        return context.isDarkTheme ? Colors.red[300]?.withAlpha(150) : Colors.red[100]?.withAlpha(150);
       } else {
         return Colors.transparent;
       }
diff --git a/mobile/lib/widgets/backup/asset_info_table.dart b/mobile/lib/widgets/backup/asset_info_table.dart
index 98bcc2b3da..a87832d3f1 100644
--- a/mobile/lib/widgets/backup/asset_info_table.dart
+++ b/mobile/lib/widgets/backup/asset_info_table.dart
@@ -82,9 +82,7 @@ class BackupAssetInfoTable extends ConsumerWidget {
                     ),
                   ).tr(
                     namedArgs: {
-                      'date': isUploadInProgress
-                          ? _getAssetCreationDate(asset)
-                          : "-",
+                      'date': isUploadInProgress ? _getAssetCreationDate(asset) : "-",
                     },
                   ),
                 ),
diff --git a/mobile/lib/widgets/backup/drift_album_info_list_tile.dart b/mobile/lib/widgets/backup/drift_album_info_list_tile.dart
index 42178c972e..25d5bfef28 100644
--- a/mobile/lib/widgets/backup/drift_album_info_list_tile.dart
+++ b/mobile/lib/widgets/backup/drift_album_info_list_tile.dart
@@ -22,19 +22,13 @@ class DriftAlbumInfoListTile extends HookConsumerWidget {
     final bool isSelected = album.backupSelection == BackupSelection.selected;
     final bool isExcluded = album.backupSelection == BackupSelection.excluded;
 
-    final syncAlbum = ref
-        .watch(appSettingsServiceProvider)
-        .getSetting(AppSettingsEnum.syncAlbums);
+    final syncAlbum = ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
 
     buildTileColor() {
       if (isSelected) {
-        return context.isDarkTheme
-            ? context.primaryColor.withAlpha(100)
-            : context.primaryColor.withAlpha(25);
+        return context.isDarkTheme ? context.primaryColor.withAlpha(100) : context.primaryColor.withAlpha(25);
       } else if (isExcluded) {
-        return context.isDarkTheme
-            ? Colors.red[300]?.withAlpha(150)
-            : Colors.red[100]?.withAlpha(150);
+        return context.isDarkTheme ? Colors.red[300]?.withAlpha(150) : Colors.red[100]?.withAlpha(150);
       } else {
         return Colors.transparent;
       }
diff --git a/mobile/lib/widgets/backup/error_chip.dart b/mobile/lib/widgets/backup/error_chip.dart
index 4df3e50f64..3c743a0903 100644
--- a/mobile/lib/widgets/backup/error_chip.dart
+++ b/mobile/lib/widgets/backup/error_chip.dart
@@ -11,8 +11,7 @@ class BackupErrorChip extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final hasErrors =
-        ref.watch(errorBackupListProvider.select((value) => value.isNotEmpty));
+    final hasErrors = ref.watch(errorBackupListProvider.select((value) => value.isNotEmpty));
     if (!hasErrors) {
       return const SizedBox();
     }
diff --git a/mobile/lib/widgets/backup/icloud_download_progress_bar.dart b/mobile/lib/widgets/backup/icloud_download_progress_bar.dart
index c61fb1a0d1..7d292112ea 100644
--- a/mobile/lib/widgets/backup/icloud_download_progress_bar.dart
+++ b/mobile/lib/widgets/backup/icloud_download_progress_bar.dart
@@ -17,20 +17,17 @@ class IcloudDownloadProgressBar extends ConsumerWidget {
 
     final isIcloudAsset = isManualUpload
         ? ref.watch(
-            manualUploadProvider
-                .select((value) => value.currentUploadAsset.isIcloudAsset),
+            manualUploadProvider.select((value) => value.currentUploadAsset.isIcloudAsset),
           )
         : ref.watch(
-            backupProvider
-                .select((value) => value.currentUploadAsset.isIcloudAsset),
+            backupProvider.select((value) => value.currentUploadAsset.isIcloudAsset),
           );
 
     if (!isIcloudAsset) {
       return const SizedBox();
     }
 
-    final iCloudDownloadProgress = ref
-        .watch(backupProvider.select((value) => value.iCloudDownloadProgress));
+    final iCloudDownloadProgress = ref.watch(backupProvider.select((value) => value.iCloudDownloadProgress));
 
     return Padding(
       padding: const EdgeInsets.only(top: 8.0),
diff --git a/mobile/lib/widgets/backup/ios_debug_info_tile.dart b/mobile/lib/widgets/backup/ios_debug_info_tile.dart
index de80b3bfd1..0f96e4cef6 100644
--- a/mobile/lib/widgets/backup/ios_debug_info_tile.dart
+++ b/mobile/lib/widgets/backup/ios_debug_info_tile.dart
@@ -24,8 +24,7 @@ class IosDebugInfoTile extends HookConsumerWidget {
     if (processes == 0) {
       title = 'ios_debug_info_no_processes_queued'.t(context: context);
     } else {
-      title = 'ios_debug_info_processes_queued'
-          .t(context: context, args: {'count': processes});
+      title = 'ios_debug_info_processes_queued'.t(context: context, args: {'count': processes});
     }
 
     final df = DateFormat.yMd().add_jm();
@@ -33,14 +32,11 @@ class IosDebugInfoTile extends HookConsumerWidget {
     if (fetch == null && processing == null) {
       subtitle = 'ios_debug_info_no_sync_yet'.t(context: context);
     } else if (fetch != null && processing == null) {
-      subtitle = 'ios_debug_info_fetch_ran_at'
-          .t(context: context, args: {'dateTime': df.format(fetch)});
+      subtitle = 'ios_debug_info_fetch_ran_at'.t(context: context, args: {'dateTime': df.format(fetch)});
     } else if (processing != null && fetch == null) {
-      subtitle = 'ios_debug_info_processing_ran_at'
-          .t(context: context, args: {'dateTime': df.format(processing)});
+      subtitle = 'ios_debug_info_processing_ran_at'.t(context: context, args: {'dateTime': df.format(processing)});
     } else {
-      final fetchOrProcessing =
-          fetch!.isAfter(processing!) ? fetch : processing;
+      final fetchOrProcessing = fetch!.isAfter(processing!) ? fetch : processing;
       subtitle = 'ios_debug_info_last_sync_at'.t(
         context: context,
         args: {'dateTime': df.format(fetchOrProcessing)},
diff --git a/mobile/lib/widgets/backup/upload_progress_bar.dart b/mobile/lib/widgets/backup/upload_progress_bar.dart
index 9281914d9c..b11a8562b9 100644
--- a/mobile/lib/widgets/backup/upload_progress_bar.dart
+++ b/mobile/lib/widgets/backup/upload_progress_bar.dart
@@ -18,12 +18,10 @@ class BackupUploadProgressBar extends ConsumerWidget {
 
     final isIcloudAsset = isManualUpload
         ? ref.watch(
-            manualUploadProvider
-                .select((value) => value.currentUploadAsset.isIcloudAsset),
+            manualUploadProvider.select((value) => value.currentUploadAsset.isIcloudAsset),
           )
         : ref.watch(
-            backupProvider
-                .select((value) => value.currentUploadAsset.isIcloudAsset),
+            backupProvider.select((value) => value.currentUploadAsset.isIcloudAsset),
           );
 
     final uploadProgress = isManualUpload
diff --git a/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart b/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart
index 388f202b6d..e0fa03ba01 100644
--- a/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart
+++ b/mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart
@@ -58,9 +58,7 @@ class ImmichAppBarDialog extends HookConsumerWidget {
           ),
           Center(
             child: Image.asset(
-              context.isDarkTheme
-                  ? 'assets/immich-text-dark.png'
-                  : 'assets/immich-text-light.png',
+              context.isDarkTheme ? 'assets/immich-text-dark.png' : 'assets/immich-text-light.png',
               height: 16,
             ),
           ),
@@ -131,10 +129,7 @@ class ImmichAppBarDialog extends HookConsumerWidget {
                 ok: "yes",
                 onOk: () async {
                   isLoggingOut.value = true;
-                  await ref
-                      .read(authProvider.notifier)
-                      .logout()
-                      .whenComplete(() => isLoggingOut.value = false);
+                  await ref.read(authProvider.notifier).logout().whenComplete(() => isLoggingOut.value = false);
 
                   ref.read(manualUploadProvider.notifier).cancelBackup();
                   ref.read(backupProvider.notifier).cancelBackup();
@@ -196,14 +191,12 @@ class ImmichAppBarDialog extends HookConsumerWidget {
                     child: LinearProgressIndicator(
                       minHeight: 10.0,
                       value: percentage,
-                      borderRadius:
-                          const BorderRadius.all(Radius.circular(10.0)),
+                      borderRadius: const BorderRadius.all(Radius.circular(10.0)),
                     ),
                   ),
                   Padding(
                     padding: const EdgeInsets.only(top: 12.0),
-                    child:
-                        const Text('backup_controller_page_storage_format').tr(
+                    child: const Text('backup_controller_page_storage_format').tr(
                       namedArgs: {
                         'used': usedDiskSpace,
                         'total': totalDiskSpace,
diff --git a/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart b/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart
index 0224ff030f..080c17e951 100644
--- a/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart
+++ b/mobile/lib/widgets/common/app_bar_dialog/app_bar_profile_info.dart
@@ -17,8 +17,7 @@ class AppBarProfileInfoBox extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final authState = ref.watch(authProvider);
-    final uploadProfileImageStatus =
-        ref.watch(uploadProfileImageProvider).status;
+    final uploadProfileImageStatus = ref.watch(uploadProfileImageProvider).status;
     final user = ref.watch(currentUserProvider);
 
     buildUserProfileImage() {
@@ -55,12 +54,10 @@ class AppBarProfileInfoBox extends HookConsumerWidget {
       );
 
       if (image != null) {
-        var success =
-            await ref.watch(uploadProfileImageProvider.notifier).upload(image);
+        var success = await ref.watch(uploadProfileImageProvider.notifier).upload(image);
 
         if (success) {
-          final profileImagePath =
-              ref.read(uploadProfileImageProvider).profileImagePath;
+          final profileImagePath = ref.read(uploadProfileImageProvider).profileImagePath;
           ref.watch(authProvider.notifier).updateUserProfileImagePath(
                 profileImagePath,
               );
diff --git a/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart b/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart
index a867a11e00..6b990c1c08 100644
--- a/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart
+++ b/mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart
@@ -173,12 +173,10 @@ class AppBarServerInfo extends HookConsumerWidget {
                         verticalOffset: 0,
                         decoration: BoxDecoration(
                           color: context.primaryColor.withValues(alpha: 0.9),
-                          borderRadius:
-                              const BorderRadius.all(Radius.circular(10)),
+                          borderRadius: const BorderRadius.all(Radius.circular(10)),
                         ),
                         textStyle: TextStyle(
-                          color:
-                              context.isDarkTheme ? Colors.black : Colors.white,
+                          color: context.isDarkTheme ? Colors.black : Colors.white,
                           fontWeight: FontWeight.bold,
                         ),
                         message: getServerUrl() ?? '--',
diff --git a/mobile/lib/widgets/common/date_time_picker.dart b/mobile/lib/widgets/common/date_time_picker.dart
index 064c4845fe..92d0b48684 100644
--- a/mobile/lib/widgets/common/date_time_picker.dart
+++ b/mobile/lib/widgets/common/date_time_picker.dart
@@ -73,10 +73,7 @@ class _DateTimePicker extends HookWidget {
 
   // returns a list of location<name> along with it's offset in duration
   List<_TimeZoneOffset> getAllTimeZones() {
-    return tz.timeZoneDatabase.locations.values
-        .map(_TimeZoneOffset.fromLocation)
-        .sorted()
-        .toList();
+    return tz.timeZoneDatabase.locations.values.map(_TimeZoneOffset.fromLocation).sorted().toList();
   }
 
   @override
@@ -125,11 +122,9 @@ class _DateTimePicker extends HookWidget {
     }
 
     void popWithDateTime() {
-      final formattedDateTime =
-          DateFormat("yyyy-MM-dd'T'HH:mm:ss").format(date.value);
-      final dtWithOffset = formattedDateTime +
-          Duration(milliseconds: tzOffset.value.offsetInMilliseconds)
-              .formatAsOffset();
+      final formattedDateTime = DateFormat("yyyy-MM-dd'T'HH:mm:ss").format(date.value);
+      final dtWithOffset =
+          formattedDateTime + Duration(milliseconds: tzOffset.value.offsetInMilliseconds).formatAsOffset();
       context.pop(dtWithOffset);
     }
 
@@ -245,19 +240,15 @@ class _TimeZoneOffset implements Comparable<_TimeZoneOffset> {
   }
 
   @override
-  String toString() =>
-      '_TimeZoneOffset(display: $display, location: $location)';
+  String toString() => '_TimeZoneOffset(display: $display, location: $location)';
 
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
 
-    return other is _TimeZoneOffset &&
-        other.display == display &&
-        other.offsetInMilliseconds == offsetInMilliseconds;
+    return other is _TimeZoneOffset && other.display == display && other.offsetInMilliseconds == offsetInMilliseconds;
   }
 
   @override
-  int get hashCode =>
-      display.hashCode ^ offsetInMilliseconds.hashCode ^ location.hashCode;
+  int get hashCode => display.hashCode ^ offsetInMilliseconds.hashCode ^ location.hashCode;
 }
diff --git a/mobile/lib/widgets/common/drag_sheet.dart b/mobile/lib/widgets/common/drag_sheet.dart
index a98e000e51..0e4651d819 100644
--- a/mobile/lib/widgets/common/drag_sheet.dart
+++ b/mobile/lib/widgets/common/drag_sheet.dart
@@ -33,8 +33,7 @@ class ControlBoxButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final minWidth =
-        context.isMobile ? MediaQuery.sizeOf(context).width / 4.5 : 75.0;
+    final minWidth = context.isMobile ? MediaQuery.sizeOf(context).width / 4.5 : 75.0;
 
     return MaterialButton(
       padding: const EdgeInsets.all(10),
diff --git a/mobile/lib/widgets/common/dropdown_search_menu.dart b/mobile/lib/widgets/common/dropdown_search_menu.dart
index cf954a8977..cde60b2afb 100644
--- a/mobile/lib/widgets/common/dropdown_search_menu.dart
+++ b/mobile/lib/widgets/common/dropdown_search_menu.dart
@@ -30,8 +30,7 @@ class DropdownSearchMenu<T> extends HookWidget {
   @override
   Widget build(BuildContext context) {
     final selectedItem = useState<DropdownMenuEntry<T>?>(
-      dropdownMenuEntries
-          .firstWhereOrNull((item) => item.value == initialSelection),
+      dropdownMenuEntries.firstWhereOrNull((item) => item.value == initialSelection),
     );
     final showTimeZoneDropdown = useState<bool>(false);
 
@@ -77,10 +76,7 @@ class DropdownSearchMenu<T> extends HookWidget {
         displayStringForOption: (option) => option.label,
         optionsBuilder: (textEditingValue) {
           return dropdownMenuEntries.where(
-            (item) => item.label
-                .toLowerCase()
-                .trim()
-                .contains(textEditingValue.text.toLowerCase().trim()),
+            (item) => item.label.toLowerCase().trim().contains(textEditingValue.text.toLowerCase().trim()),
           );
         },
         onSelected: (option) {
@@ -127,9 +123,7 @@ class DropdownSearchMenu<T> extends HookWidget {
                       onTap: () => onSelected(option),
                       child: Builder(
                         builder: (BuildContext context) {
-                          final bool highlight =
-                              AutocompleteHighlightedOption.of(context) ==
-                                  index;
+                          final bool highlight = AutocompleteHighlightedOption.of(context) == index;
                           if (highlight) {
                             SchedulerBinding.instance.addPostFrameCallback(
                               (Duration timeStamp) {
@@ -142,12 +136,7 @@ class DropdownSearchMenu<T> extends HookWidget {
                             );
                           }
                           return Container(
-                            color: highlight
-                                ? Theme.of(context)
-                                    .colorScheme
-                                    .onSurface
-                                    .withValues(alpha: 0.12)
-                                : null,
+                            color: highlight ? Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.12) : null,
                             padding: const EdgeInsets.all(16.0),
                             child: Text(
                               option.label,
diff --git a/mobile/lib/widgets/common/immich_app_bar.dart b/mobile/lib/widgets/common/immich_app_bar.dart
index dbf088c112..0d77e02aa5 100644
--- a/mobile/lib/widgets/common/immich_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_app_bar.dart
@@ -27,8 +27,7 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final BackUpState backupState = ref.watch(backupProvider);
-    final bool isEnableAutoBackup =
-        backupState.backgroundBackup || backupState.autoBackup;
+    final bool isEnableAutoBackup = backupState.backgroundBackup || backupState.autoBackup;
     final ServerInfo serverInfoState = ref.watch(serverInfoProvider);
     final user = ref.watch(currentUserProvider);
     final isDarkTheme = context.isDarkTheme;
@@ -57,9 +56,8 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {
           ),
           backgroundColor: Colors.transparent,
           alignment: Alignment.bottomRight,
-          isLabelVisible: serverInfoState.isVersionMismatch ||
-              ((user?.isAdmin ?? false) &&
-                  serverInfoState.isNewReleaseAvailable),
+          isLabelVisible:
+              serverInfoState.isVersionMismatch || ((user?.isAdmin ?? false) && serverInfoState.isNewReleaseAvailable),
           offset: const Offset(-2, -12),
           child: user == null
               ? const Icon(
@@ -92,8 +90,7 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {
               semanticsLabel: 'backup_controller_page_backup'.tr(),
             ),
           );
-        } else if (backupState.backupProgress !=
-                BackUpProgressEnum.inBackground &&
+        } else if (backupState.backupProgress != BackUpProgressEnum.inBackground &&
             backupState.backupProgress != BackUpProgressEnum.manualInProgress) {
           return Icon(
             Icons.check_outlined,
diff --git a/mobile/lib/widgets/common/immich_image.dart b/mobile/lib/widgets/common/immich_image.dart
index cbad9037c0..f51748edd6 100644
--- a/mobile/lib/widgets/common/immich_image.dart
+++ b/mobile/lib/widgets/common/immich_image.dart
@@ -59,8 +59,7 @@ class ImmichImage extends StatelessWidget {
 
   // Whether to use the local asset image provider or a remote one
   static bool useLocal(Asset asset) =>
-      !asset.isRemote ||
-      asset.isLocal && !Store.get(StoreKey.preferRemoteImage, false);
+      !asset.isRemote || asset.isLocal && !Store.get(StoreKey.preferRemoteImage, false);
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/widgets/common/immich_sliver_app_bar.dart b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
index 09c84e0c20..9f84b7cd7f 100644
--- a/mobile/lib/widgets/common/immich_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/immich_sliver_app_bar.dart
@@ -41,8 +41,7 @@ class ImmichSliverAppBar extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
-    final isMultiSelectEnabled =
-        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
+    final isMultiSelectEnabled = ref.watch(multiSelectProvider.select((s) => s.isEnabled));
 
     return SliverAnimatedOpacity(
       duration: Durations.medium1,
@@ -116,8 +115,7 @@ class _ImmichLogoWithText extends StatelessWidget {
             Builder(
               builder: (context) {
                 return Badge(
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 6, vertical: 4),
+                  padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4),
                   backgroundColor: context.primaryColor,
                   alignment: Alignment.centerRight,
                   offset: const Offset(16, -8),
@@ -180,8 +178,8 @@ class _ProfileIndicator extends ConsumerWidget {
         ),
         backgroundColor: Colors.transparent,
         alignment: Alignment.bottomRight,
-        isLabelVisible: serverInfoState.isVersionMismatch ||
-            ((user?.isAdmin ?? false) && serverInfoState.isNewReleaseAvailable),
+        isLabelVisible:
+            serverInfoState.isVersionMismatch || ((user?.isAdmin ?? false) && serverInfoState.isNewReleaseAvailable),
         offset: const Offset(-2, -12),
         child: user == null
             ? const Icon(
@@ -241,8 +239,7 @@ class _BackupIndicator extends ConsumerWidget {
 
   Widget? _getBackupBadgeIcon(BuildContext context, WidgetRef ref) {
     final BackUpState backupState = ref.watch(backupProvider);
-    final bool isEnableAutoBackup =
-        backupState.backgroundBackup || backupState.autoBackup;
+    final bool isEnableAutoBackup = backupState.backgroundBackup || backupState.autoBackup;
     final isDarkTheme = context.isDarkTheme;
     final iconColor = isDarkTheme ? Colors.white : Colors.black;
 
@@ -257,8 +254,7 @@ class _BackupIndicator extends ConsumerWidget {
             semanticsLabel: 'backup_controller_page_backup'.tr(),
           ),
         );
-      } else if (backupState.backupProgress !=
-              BackUpProgressEnum.inBackground &&
+      } else if (backupState.backupProgress != BackUpProgressEnum.inBackground &&
           backupState.backupProgress != BackUpProgressEnum.manualInProgress) {
         return Icon(
           Icons.check_outlined,
@@ -286,12 +282,10 @@ class _SyncStatusIndicator extends ConsumerStatefulWidget {
   const _SyncStatusIndicator();
 
   @override
-  ConsumerState<_SyncStatusIndicator> createState() =>
-      _SyncStatusIndicatorState();
+  ConsumerState<_SyncStatusIndicator> createState() => _SyncStatusIndicatorState();
 }
 
-class _SyncStatusIndicatorState extends ConsumerState<_SyncStatusIndicator>
-    with TickerProviderStateMixin {
+class _SyncStatusIndicatorState extends ConsumerState<_SyncStatusIndicator> with TickerProviderStateMixin {
   late AnimationController _rotationController;
   late AnimationController _dismissalController;
   late Animation<double> _rotationAnimation;
@@ -349,8 +343,7 @@ class _SyncStatusIndicatorState extends ConsumerState<_SyncStatusIndicator>
     }
 
     // Don't show anything if not syncing and dismissal animation is complete
-    if (!isSyncing &&
-        _dismissalController.status == AnimationStatus.completed) {
+    if (!isSyncing && _dismissalController.status == AnimationStatus.completed) {
       return const SizedBox.shrink();
     }
 
@@ -364,10 +357,7 @@ class _SyncStatusIndicatorState extends ConsumerState<_SyncStatusIndicator>
             child: Opacity(
               opacity: isSyncing ? 1.0 : _dismissalAnimation.value,
               child: Transform.rotate(
-                angle: _rotationAnimation.value *
-                    2 *
-                    3.14159 *
-                    -1, // Rotate counter-clockwise
+                angle: _rotationAnimation.value * 2 * 3.14159 * -1, // Rotate counter-clockwise
                 child: Icon(
                   Icons.sync,
                   size: 24,
diff --git a/mobile/lib/widgets/common/immich_thumbnail.dart b/mobile/lib/widgets/common/immich_thumbnail.dart
index 0918348f4c..5e3bb610d8 100644
--- a/mobile/lib/widgets/common/immich_thumbnail.dart
+++ b/mobile/lib/widgets/common/immich_thumbnail.dart
@@ -93,8 +93,7 @@ class ImmichThumbnail extends HookConsumerWidget {
     customErrorBuilder(BuildContext ctx, Object error, StackTrace? stackTrace) {
       thumbnailProviderInstance.evict();
 
-      final originalErrorWidgetBuilder =
-          blurHashErrorBuilder(blurhash, fit: fit);
+      final originalErrorWidgetBuilder = blurHashErrorBuilder(blurhash, fit: fit);
       return originalErrorWidgetBuilder(ctx, error, stackTrace);
     }
 
diff --git a/mobile/lib/widgets/common/immich_title_text.dart b/mobile/lib/widgets/common/immich_title_text.dart
index 711d0bf396..456ecdc9cf 100644
--- a/mobile/lib/widgets/common/immich_title_text.dart
+++ b/mobile/lib/widgets/common/immich_title_text.dart
@@ -15,9 +15,7 @@ class ImmichTitleText extends StatelessWidget {
   Widget build(BuildContext context) {
     return Image(
       image: AssetImage(
-        context.isDarkTheme
-            ? 'assets/immich-text-dark.png'
-            : 'assets/immich-text-light.png',
+        context.isDarkTheme ? 'assets/immich-text-dark.png' : 'assets/immich-text-light.png',
       ),
       width: fontSize * 4,
       filterQuality: FilterQuality.high,
diff --git a/mobile/lib/widgets/common/location_picker.dart b/mobile/lib/widgets/common/location_picker.dart
index 7bfdf296bb..81f8440836 100644
--- a/mobile/lib/widgets/common/location_picker.dart
+++ b/mobile/lib/widgets/common/location_picker.dart
@@ -56,8 +56,7 @@ class _LocationPicker extends HookWidget {
             ? _MapPicker(
                 key: ValueKey(latlng),
                 latlng: latlng,
-                onModeSwitch: () =>
-                    pickerMode.value = _LocationPickerMode.manual,
+                onModeSwitch: () => pickerMode.value = _LocationPickerMode.manual,
                 onMapTap: onMapTap,
               )
             : _ManualPicker(
@@ -141,8 +140,7 @@ class _ManualPickerInput extends HookWidget {
         errorText: isValid.value ? null : errorText.tr(),
       ),
       onEditingComplete: onEditingComplete,
-      keyboardType:
-          const TextInputType.numberWithOptions(decimal: true, signed: true),
+      keyboardType: const TextInputType.numberWithOptions(decimal: true, signed: true),
       inputFormatters: [LengthLimitingTextInputFormatter(8)],
       onTapOutside: (_) => focusNode.unfocus(),
     );
diff --git a/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
index eecc099a9e..2130a07866 100644
--- a/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart
@@ -23,12 +23,10 @@ class MesmerizingSliverAppBar extends ConsumerStatefulWidget {
   final String title;
   final IconData icon;
   @override
-  ConsumerState<MesmerizingSliverAppBar> createState() =>
-      _MesmerizingSliverAppBarState();
+  ConsumerState<MesmerizingSliverAppBar> createState() => _MesmerizingSliverAppBarState();
 }
 
-class _MesmerizingSliverAppBarState
-    extends ConsumerState<MesmerizingSliverAppBar> {
+class _MesmerizingSliverAppBarState extends ConsumerState<MesmerizingSliverAppBar> {
   double _scrollProgress = 0.0;
 
   double _calculateScrollProgress(FlexibleSpaceBarSettings? settings) {
@@ -41,14 +39,12 @@ class _MesmerizingSliverAppBarState
       return 1.0;
     }
 
-    return (1.0 - (settings.currentExtent - settings.minExtent) / deltaExtent)
-        .clamp(0.0, 1.0);
+    return (1.0 - (settings.currentExtent - settings.minExtent) / deltaExtent).clamp(0.0, 1.0);
   }
 
   @override
   Widget build(BuildContext context) {
-    final isMultiSelectEnabled =
-        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
+    final isMultiSelectEnabled = ref.watch(multiSelectProvider.select((s) => s.isEnabled));
 
     return isMultiSelectEnabled
         ? SliverToBoxAdapter(
@@ -65,9 +61,7 @@ class _MesmerizingSliverAppBarState
             elevation: 0,
             leading: IconButton(
               icon: Icon(
-                Platform.isIOS
-                    ? Icons.arrow_back_ios_new_rounded
-                    : Icons.arrow_back,
+                Platform.isIOS ? Icons.arrow_back_ios_new_rounded : Icons.arrow_back,
                 color: Color.lerp(
                   Colors.white,
                   context.primaryColor,
@@ -93,8 +87,7 @@ class _MesmerizingSliverAppBarState
             ),
             flexibleSpace: Builder(
               builder: (context) {
-                final settings = context.dependOnInheritedWidgetOfExactType<
-                    FlexibleSpaceBarSettings>();
+                final settings = context.dependOnInheritedWidgetOfExactType<FlexibleSpaceBarSettings>();
                 final scrollProgress = _calculateScrollProgress(settings);
 
                 // Update scroll progress for the leading button
@@ -145,12 +138,10 @@ class _ExpandedBackground extends ConsumerStatefulWidget {
   });
 
   @override
-  ConsumerState<_ExpandedBackground> createState() =>
-      _ExpandedBackgroundState();
+  ConsumerState<_ExpandedBackground> createState() => _ExpandedBackgroundState();
 }
 
-class _ExpandedBackgroundState extends ConsumerState<_ExpandedBackground>
-    with SingleTickerProviderStateMixin {
+class _ExpandedBackgroundState extends ConsumerState<_ExpandedBackground> with SingleTickerProviderStateMixin {
   late AnimationController _slideController;
   late Animation<Offset> _slideAnimation;
 
@@ -278,8 +269,7 @@ class _ItemCountTextState extends ConsumerState<_ItemCountText> {
   @override
   void initState() {
     super.initState();
-    _reloadSubscription =
-        EventStream.shared.listen<TimelineReloadEvent>((_) => setState(() {}));
+    _reloadSubscription = EventStream.shared.listen<TimelineReloadEvent>((_) => setState(() {}));
   }
 
   @override
@@ -328,8 +318,7 @@ class _RandomAssetBackground extends StatefulWidget {
   State<_RandomAssetBackground> createState() => _RandomAssetBackgroundState();
 }
 
-class _RandomAssetBackgroundState extends State<_RandomAssetBackground>
-    with TickerProviderStateMixin {
+class _RandomAssetBackgroundState extends State<_RandomAssetBackground> with TickerProviderStateMixin {
   late AnimationController _zoomController;
   late AnimationController _crossFadeController;
   late Animation<double> _zoomAnimation;
@@ -500,8 +489,7 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground>
                         alignment: Alignment.topRight,
                         image: getFullImageProvider(_currentAsset!),
                         fit: BoxFit.cover,
-                        frameBuilder:
-                            (context, child, frame, wasSynchronouslyLoaded) {
+                        frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
                           if (wasSynchronouslyLoaded || frame != null) {
                             return child;
                           }
@@ -532,8 +520,7 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground>
                         alignment: Alignment.topRight,
                         image: getFullImageProvider(_nextAsset!),
                         fit: BoxFit.cover,
-                        frameBuilder:
-                            (context, child, frame, wasSynchronouslyLoaded) {
+                        frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
                           if (wasSynchronouslyLoaded || frame != null) {
                             return child;
                           }
diff --git a/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart b/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart
index 41eed09d8c..6f26c87da7 100644
--- a/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart
@@ -35,12 +35,10 @@ class RemoteAlbumSliverAppBar extends ConsumerStatefulWidget {
   final void Function()? onEditTitle;
 
   @override
-  ConsumerState<RemoteAlbumSliverAppBar> createState() =>
-      _MesmerizingSliverAppBarState();
+  ConsumerState<RemoteAlbumSliverAppBar> createState() => _MesmerizingSliverAppBarState();
 }
 
-class _MesmerizingSliverAppBarState
-    extends ConsumerState<RemoteAlbumSliverAppBar> {
+class _MesmerizingSliverAppBarState extends ConsumerState<RemoteAlbumSliverAppBar> {
   double _scrollProgress = 0.0;
 
   double _calculateScrollProgress(FlexibleSpaceBarSettings? settings) {
@@ -53,14 +51,12 @@ class _MesmerizingSliverAppBarState
       return 1.0;
     }
 
-    return (1.0 - (settings.currentExtent - settings.minExtent) / deltaExtent)
-        .clamp(0.0, 1.0);
+    return (1.0 - (settings.currentExtent - settings.minExtent) / deltaExtent).clamp(0.0, 1.0);
   }
 
   @override
   Widget build(BuildContext context) {
-    final isMultiSelectEnabled =
-        ref.watch(multiSelectProvider.select((s) => s.isEnabled));
+    final isMultiSelectEnabled = ref.watch(multiSelectProvider.select((s) => s.isEnabled));
 
     final currentAlbum = ref.watch(currentRemoteAlbumProvider);
     if (currentAlbum == null) {
@@ -103,9 +99,7 @@ class _MesmerizingSliverAppBarState
             elevation: 0,
             leading: IconButton(
               icon: Icon(
-                Platform.isIOS
-                    ? Icons.arrow_back_ios_new_rounded
-                    : Icons.arrow_back,
+                Platform.isIOS ? Icons.arrow_back_ios_new_rounded : Icons.arrow_back,
                 color: actionIconColor,
                 shadows: actionIconShadows,
               ),
@@ -136,8 +130,7 @@ class _MesmerizingSliverAppBarState
             ],
             flexibleSpace: Builder(
               builder: (context) {
-                final settings = context.dependOnInheritedWidgetOfExactType<
-                    FlexibleSpaceBarSettings>();
+                final settings = context.dependOnInheritedWidgetOfExactType<FlexibleSpaceBarSettings>();
                 final scrollProgress = _calculateScrollProgress(settings);
 
                 // Update scroll progress for the leading button
@@ -188,12 +181,10 @@ class _ExpandedBackground extends ConsumerStatefulWidget {
   });
 
   @override
-  ConsumerState<_ExpandedBackground> createState() =>
-      _ExpandedBackgroundState();
+  ConsumerState<_ExpandedBackground> createState() => _ExpandedBackgroundState();
 }
 
-class _ExpandedBackgroundState extends ConsumerState<_ExpandedBackground>
-    with SingleTickerProviderStateMixin {
+class _ExpandedBackgroundState extends ConsumerState<_ExpandedBackground> with SingleTickerProviderStateMixin {
   late AnimationController _slideController;
   late Animation<Offset> _slideAnimation;
 
@@ -405,8 +396,7 @@ class _ItemCountTextState extends ConsumerState<_ItemCountText> {
   @override
   void initState() {
     super.initState();
-    _reloadSubscription =
-        EventStream.shared.listen<TimelineReloadEvent>((_) => setState(() {}));
+    _reloadSubscription = EventStream.shared.listen<TimelineReloadEvent>((_) => setState(() {}));
   }
 
   @override
@@ -453,8 +443,7 @@ class _RandomAssetBackground extends StatefulWidget {
   State<_RandomAssetBackground> createState() => _RandomAssetBackgroundState();
 }
 
-class _RandomAssetBackgroundState extends State<_RandomAssetBackground>
-    with TickerProviderStateMixin {
+class _RandomAssetBackgroundState extends State<_RandomAssetBackground> with TickerProviderStateMixin {
   late AnimationController _zoomController;
   late AnimationController _crossFadeController;
   late Animation<double> _zoomAnimation;
@@ -625,8 +614,7 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground>
                         alignment: Alignment.topRight,
                         image: getFullImageProvider(_currentAsset!),
                         fit: BoxFit.cover,
-                        frameBuilder:
-                            (context, child, frame, wasSynchronouslyLoaded) {
+                        frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
                           if (wasSynchronouslyLoaded || frame != null) {
                             return child;
                           }
@@ -657,8 +645,7 @@ class _RandomAssetBackgroundState extends State<_RandomAssetBackground>
                         alignment: Alignment.topRight,
                         image: getFullImageProvider(_nextAsset!),
                         fit: BoxFit.cover,
-                        frameBuilder:
-                            (context, child, frame, wasSynchronouslyLoaded) {
+                        frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
                           if (wasSynchronouslyLoaded || frame != null) {
                             return child;
                           }
diff --git a/mobile/lib/widgets/common/scaffold_error_body.dart b/mobile/lib/widgets/common/scaffold_error_body.dart
index 5011d229e7..f1d7685f73 100644
--- a/mobile/lib/widgets/common/scaffold_error_body.dart
+++ b/mobile/lib/widgets/common/scaffold_error_body.dart
@@ -27,8 +27,7 @@ class ScaffoldErrorBody extends StatelessWidget {
               child: Icon(
                 Icons.error_outline,
                 size: 100,
-                color:
-                    context.themeData.iconTheme.color?.withValues(alpha: 0.5),
+                color: context.themeData.iconTheme.color?.withValues(alpha: 0.5),
               ),
             ),
           ),
diff --git a/mobile/lib/widgets/common/selection_sliver_app_bar.dart b/mobile/lib/widgets/common/selection_sliver_app_bar.dart
index 2f06934bc0..4a6dbbf385 100644
--- a/mobile/lib/widgets/common/selection_sliver_app_bar.dart
+++ b/mobile/lib/widgets/common/selection_sliver_app_bar.dart
@@ -12,8 +12,7 @@ class SelectionSliverAppBar extends ConsumerStatefulWidget {
   });
 
   @override
-  ConsumerState<SelectionSliverAppBar> createState() =>
-      _SelectionSliverAppBarState();
+  ConsumerState<SelectionSliverAppBar> createState() => _SelectionSliverAppBarState();
 }
 
 class _SelectionSliverAppBarState extends ConsumerState<SelectionSliverAppBar> {
diff --git a/mobile/lib/widgets/common/thumbhash_placeholder.dart b/mobile/lib/widgets/common/thumbhash_placeholder.dart
index aa320f4230..f73aa869f7 100644
--- a/mobile/lib/widgets/common/thumbhash_placeholder.dart
+++ b/mobile/lib/widgets/common/thumbhash_placeholder.dart
@@ -13,8 +13,7 @@ OctoSet blurHashOrPlaceholder(
 }) {
   return OctoSet(
     placeholderBuilder: blurHashPlaceholderBuilder(blurhash, fit: fit),
-    errorBuilder:
-        blurHashErrorBuilder(blurhash, fit: fit, message: errorMessage),
+    errorBuilder: blurHashErrorBuilder(blurhash, fit: fit, message: errorMessage),
   );
 }
 
diff --git a/mobile/lib/widgets/common/user_avatar.dart b/mobile/lib/widgets/common/user_avatar.dart
index a5a6fa2bdd..ff0e39f371 100644
--- a/mobile/lib/widgets/common/user_avatar.dart
+++ b/mobile/lib/widgets/common/user_avatar.dart
@@ -7,8 +7,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/services/api.service.dart';
 
 Widget userAvatar(BuildContext context, UserDto u, {double? radius}) {
-  final url =
-      "${Store.get(StoreKey.serverEndpoint)}/users/${u.id}/profile-image";
+  final url = "${Store.get(StoreKey.serverEndpoint)}/users/${u.id}/profile-image";
   final nameFirstLetter = u.name.isNotEmpty ? u.name[0] : "";
   return CircleAvatar(
     radius: radius,
diff --git a/mobile/lib/widgets/common/user_circle_avatar.dart b/mobile/lib/widgets/common/user_circle_avatar.dart
index 479c30d6da..c1d34c4baa 100644
--- a/mobile/lib/widgets/common/user_circle_avatar.dart
+++ b/mobile/lib/widgets/common/user_circle_avatar.dart
@@ -34,9 +34,7 @@ class UserCircleAvatar extends ConsumerWidget {
       style: TextStyle(
         fontWeight: FontWeight.bold,
         fontSize: 12,
-        color: userAvatarColor.computeLuminance() > 0.5
-            ? Colors.black
-            : Colors.white,
+        color: userAvatarColor.computeLuminance() > 0.5 ? Colors.black : Colors.white,
       ),
       child: Text(user.name[0].toUpperCase()),
     );
diff --git a/mobile/lib/widgets/forms/change_password_form.dart b/mobile/lib/widgets/forms/change_password_form.dart
index 1c7eed7e5b..d5fdf570dd 100644
--- a/mobile/lib/widgets/forms/change_password_form.dart
+++ b/mobile/lib/widgets/forms/change_password_form.dart
@@ -17,10 +17,8 @@ class ChangePasswordForm extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final passwordController =
-        useTextEditingController.fromValue(TextEditingValue.empty);
-    final confirmPasswordController =
-        useTextEditingController.fromValue(TextEditingValue.empty);
+    final passwordController = useTextEditingController.fromValue(TextEditingValue.empty);
+    final confirmPasswordController = useTextEditingController.fromValue(TextEditingValue.empty);
     final authState = ref.watch(authProvider);
     final formKey = GlobalKey<FormState>();
 
@@ -72,20 +70,15 @@ class ChangePasswordForm extends HookConsumerWidget {
                       passwordController: passwordController,
                       onPressed: () async {
                         if (formKey.currentState!.validate()) {
-                          var isSuccess = await ref
-                              .read(authProvider.notifier)
-                              .changePassword(passwordController.value.text);
+                          var isSuccess =
+                              await ref.read(authProvider.notifier).changePassword(passwordController.value.text);
 
                           if (isSuccess) {
                             await ref.read(authProvider.notifier).logout();
 
-                            ref
-                                .read(manualUploadProvider.notifier)
-                                .cancelBackup();
+                            ref.read(manualUploadProvider.notifier).cancelBackup();
                             ref.read(backupProvider.notifier).cancelBackup();
-                            await ref
-                                .read(assetProvider.notifier)
-                                .clearAllAssets();
+                            await ref.read(assetProvider.notifier).clearAllAssets();
                             ref.read(websocketProvider.notifier).disconnect();
 
                             AutoRouter.of(context).back();
diff --git a/mobile/lib/widgets/forms/login/login_form.dart b/mobile/lib/widgets/forms/login/login_form.dart
index 24a73b2cbc..7ac070b912 100644
--- a/mobile/lib/widgets/forms/login/login_form.dart
+++ b/mobile/lib/widgets/forms/login/login_form.dart
@@ -43,12 +43,9 @@ class LoginForm extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final emailController =
-        useTextEditingController.fromValue(TextEditingValue.empty);
-    final passwordController =
-        useTextEditingController.fromValue(TextEditingValue.empty);
-    final serverEndpointController =
-        useTextEditingController.fromValue(TextEditingValue.empty);
+    final emailController = useTextEditingController.fromValue(TextEditingValue.empty);
+    final passwordController = useTextEditingController.fromValue(TextEditingValue.empty);
+    final serverEndpointController = useTextEditingController.fromValue(TextEditingValue.empty);
     final emailFocusNode = useFocusNode();
     final passwordFocusNode = useFocusNode();
     final serverEndpointFocusNode = useFocusNode();
@@ -102,8 +99,7 @@ class LoginForm extends HookConsumerWidget {
 
       try {
         isLoadingServer.value = true;
-        final endpoint =
-            await ref.read(authProvider.notifier).validateServerUrl(serverUrl);
+        final endpoint = await ref.read(authProvider.notifier).validateServerUrl(serverUrl);
 
         // Fetch and load server config and features
         await ref.read(serverInfoProvider.notifier).getServerInfo();
@@ -114,9 +110,7 @@ class LoginForm extends HookConsumerWidget {
 
         isOauthEnable.value = features.oauthEnabled;
         isPasswordLoginEnable.value = features.passwordLogin;
-        oAuthButtonLabel.value = config.oauthButtonText.isNotEmpty
-            ? config.oauthButtonText
-            : 'OAuth';
+        oAuthButtonLabel.value = config.oauthButtonText.isNotEmpty ? config.oauthButtonText : 'OAuth';
 
         serverEndpoint.value = endpoint;
       } on ApiException catch (e) {
@@ -196,9 +190,7 @@ class LoginForm extends HookConsumerWidget {
         } else {
           final isBeta = Store.isBetaTimelineEnabled;
           if (isBeta) {
-            await ref
-                .read(galleryPermissionNotifier.notifier)
-                .requestGalleryPermission();
+            await ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission();
             await runNewSync(ref);
             context.replaceRoute(const TabShellRoute());
             return;
@@ -218,8 +210,7 @@ class LoginForm extends HookConsumerWidget {
     }
 
     String generateRandomString(int length) {
-      const chars =
-          'AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz1234567890';
+      const chars = 'AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz1234567890';
       final random = Random.secure();
       return String.fromCharCodes(
         Iterable.generate(
@@ -308,9 +299,7 @@ class LoginForm extends HookConsumerWidget {
               ref.watch(backupProvider.notifier).resumeBackup();
             }
             if (isBeta) {
-              await ref
-                  .read(galleryPermissionNotifier.notifier)
-                  .requestGalleryPermission();
+              await ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission();
               await runNewSync(ref);
               context.replaceRoute(const TabShellRoute());
               return;
@@ -383,8 +372,7 @@ class LoginForm extends HookConsumerWidget {
                       ),
                     ),
                   ),
-                  onPressed:
-                      isLoadingServer.value ? null : getServerAuthSettings,
+                  onPressed: isLoadingServer.value ? null : getServerAuthSettings,
                   icon: const Icon(Icons.arrow_forward_rounded),
                   label: const Text(
                     'next',
@@ -412,14 +400,12 @@ class LoginForm extends HookConsumerWidget {
         child: Container(
           padding: const EdgeInsets.all(16),
           decoration: BoxDecoration(
-            color:
-                context.isDarkTheme ? Colors.red.shade700 : Colors.red.shade100,
+            color: context.isDarkTheme ? Colors.red.shade700 : Colors.red.shade100,
             borderRadius: const BorderRadius.all(
               Radius.circular(8),
             ),
             border: Border.all(
-              color:
-                  context.isDarkTheme ? Colors.red.shade900 : Colors.red[200]!,
+              color: context.isDarkTheme ? Colors.red.shade900 : Colors.red[200]!,
             ),
           ),
           child: Text(
@@ -465,8 +451,7 @@ class LoginForm extends HookConsumerWidget {
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
                       const SizedBox(height: 18),
-                      if (isPasswordLoginEnable.value)
-                        LoginButton(onPressed: login),
+                      if (isPasswordLoginEnable.value) LoginButton(onPressed: login),
                       if (isOauthEnable.value) ...[
                         if (isPasswordLoginEnable.value)
                           Padding(
@@ -474,9 +459,7 @@ class LoginForm extends HookConsumerWidget {
                               horizontal: 16.0,
                             ),
                             child: Divider(
-                              color: context.isDarkTheme
-                                  ? Colors.white
-                                  : Colors.black,
+                              color: context.isDarkTheme ? Colors.white : Colors.black,
                             ),
                           ),
                         OAuthLoginButton(
@@ -503,8 +486,7 @@ class LoginForm extends HookConsumerWidget {
       );
     }
 
-    final serverSelectionOrLogin =
-        serverEndpoint.value == null ? buildSelectServer() : buildLogin();
+    final serverSelectionOrLogin = serverEndpoint.value == null ? buildSelectServer() : buildLogin();
 
     return LayoutBuilder(
       builder: (context, constraints) {
diff --git a/mobile/lib/widgets/forms/login/password_input.dart b/mobile/lib/widgets/forms/login/password_input.dart
index 2d2c1923f7..074899bd57 100644
--- a/mobile/lib/widgets/forms/login/password_input.dart
+++ b/mobile/lib/widgets/forms/login/password_input.dart
@@ -33,9 +33,7 @@ class PasswordInput extends HookConsumerWidget {
         suffixIcon: IconButton(
           onPressed: () => isPasswordVisible.value = !isPasswordVisible.value,
           icon: Icon(
-            isPasswordVisible.value
-                ? Icons.visibility_off_sharp
-                : Icons.visibility_sharp,
+            isPasswordVisible.value ? Icons.visibility_off_sharp : Icons.visibility_sharp,
           ),
         ),
       ),
diff --git a/mobile/lib/widgets/forms/login/server_endpoint_input.dart b/mobile/lib/widgets/forms/login/server_endpoint_input.dart
index 37bcad9d82..cddf9e9985 100644
--- a/mobile/lib/widgets/forms/login/server_endpoint_input.dart
+++ b/mobile/lib/widgets/forms/login/server_endpoint_input.dart
@@ -18,10 +18,7 @@ class ServerEndpointInput extends StatelessWidget {
     if (url == null || url.isEmpty) return null;
 
     final parsedUrl = Uri.tryParse(sanitizeUrl(url));
-    if (parsedUrl == null ||
-        !parsedUrl.isAbsolute ||
-        !parsedUrl.scheme.startsWith("http") ||
-        parsedUrl.host.isEmpty) {
+    if (parsedUrl == null || !parsedUrl.isAbsolute || !parsedUrl.scheme.startsWith("http") || parsedUrl.host.isEmpty) {
       return 'login_form_err_invalid_url'.tr();
     }
 
diff --git a/mobile/lib/widgets/forms/pin_input.dart b/mobile/lib/widgets/forms/pin_input.dart
index 1588a65c60..6602946d7d 100644
--- a/mobile/lib/widgets/forms/pin_input.dart
+++ b/mobile/lib/widgets/forms/pin_input.dart
@@ -30,8 +30,7 @@ class PinInput extends StatelessWidget {
       final minimumPadding = 18.0;
       final gapWidth = 3.0;
       final screenWidth = context.width;
-      final pinWidth =
-          (screenWidth - (minimumPadding * 2) - (gapWidth * 5)) / (length ?? 6);
+      final pinWidth = (screenWidth - (minimumPadding * 2) - (gapWidth * 5)) / (length ?? 6);
 
       if (pinWidth > 60) {
         return const Size(60, 64);
@@ -62,8 +61,7 @@ class PinInput extends StatelessWidget {
         if (label != null) ...[
           Text(
             label!,
-            style: context.textTheme.displayLarge
-                ?.copyWith(color: context.colorScheme.onSurface.withAlpha(200)),
+            style: context.textTheme.displayLarge?.copyWith(color: context.colorScheme.onSurface.withAlpha(200)),
           ),
           const SizedBox(height: 4),
         ],
diff --git a/mobile/lib/widgets/forms/pin_verification_form.dart b/mobile/lib/widgets/forms/pin_verification_form.dart
index f4ebf4272f..8a3f0b55df 100644
--- a/mobile/lib/widgets/forms/pin_verification_form.dart
+++ b/mobile/lib/widgets/forms/pin_verification_form.dart
@@ -30,8 +30,7 @@ class PinVerificationForm extends HookConsumerWidget {
     final isVerified = useState(false);
 
     verifyPin(String pinCode) async {
-      final isUnlocked =
-          await ref.read(authProvider.notifier).unlockPinCode(pinCode);
+      final isUnlocked = await ref.read(authProvider.notifier).unlockPinCode(pinCode);
 
       if (isUnlocked) {
         isVerified.value = true;
@@ -58,9 +57,7 @@ class PinVerificationForm extends HookConsumerWidget {
                 : Icon(
                     icon ?? Icons.lock_outline_rounded,
                     size: 64,
-                    color: hasError.value
-                        ? context.colorScheme.error
-                        : context.primaryColor,
+                    color: hasError.value ? context.colorScheme.error : context.primaryColor,
                   ),
           ),
           const SizedBox(height: 36),
diff --git a/mobile/lib/widgets/map/map_app_bar.dart b/mobile/lib/widgets/map/map_app_bar.dart
index ccadd2ad15..2715386737 100644
--- a/mobile/lib/widgets/map/map_app_bar.dart
+++ b/mobile/lib/widgets/map/map_app_bar.dart
@@ -22,9 +22,8 @@ class MapAppBar extends HookWidget implements PreferredSizeWidget {
       padding: EdgeInsets.only(top: context.padding.top + 25),
       child: ValueListenableBuilder(
         valueListenable: selectedAssets,
-        builder: (ctx, value, child) => value.isNotEmpty
-            ? _SelectionRow(selectedAssets: selectedAssets)
-            : const _NonSelectionRow(),
+        builder: (ctx, value, child) =>
+            value.isNotEmpty ? _SelectionRow(selectedAssets: selectedAssets) : const _NonSelectionRow(),
       ),
     );
   }
diff --git a/mobile/lib/widgets/map/map_asset_grid.dart b/mobile/lib/widgets/map/map_asset_grid.dart
index c8c0816551..ce2a486fc5 100644
--- a/mobile/lib/widgets/map/map_asset_grid.dart
+++ b/mobile/lib/widgets/map/map_asset_grid.dart
@@ -44,8 +44,7 @@ class MapAssetGrid extends HookConsumerWidget {
     final cachedRenderList = useRef<RenderList?>(null);
     final lastRenderElementIndex = useRef<int?>(null);
     final assetInSheet = useValueNotifier<String?>(null);
-    final gridScrollThrottler =
-        useThrottler(interval: const Duration(milliseconds: 300));
+    final gridScrollThrottler = useThrottler(interval: const Duration(milliseconds: 300));
 
     // Add a cache for assets we've already loaded
     final assetCache = useRef<Map<String, Asset>>({});
@@ -67,8 +66,7 @@ class MapAssetGrid extends HookConsumerWidget {
 
         // Only fetch missing assets
         if (missingIds.isNotEmpty) {
-          final newAssets =
-              await ref.read(dbProvider).assets.getAllByRemoteId(missingIds);
+          final newAssets = await ref.read(dbProvider).assets.getAllByRemoteId(missingIds);
 
           // Add new assets to cache and current list
           for (final asset in newAssets) {
@@ -93,8 +91,7 @@ class MapAssetGrid extends HookConsumerWidget {
       final orderedPos = positions.sortedByField((p) => p.index);
       // Index of row where the items are mostly visible
       const partialOffset = 0.20;
-      final item = orderedPos
-          .firstWhereOrNull((p) => p.itemTrailingEdge > partialOffset);
+      final item = orderedPos.firstWhereOrNull((p) => p.itemTrailingEdge > partialOffset);
 
       // Guard no elements, reset state
       // Also fail fast when the sheet is just opened and the user is yet to scroll (i.e leading = 0)
@@ -103,8 +100,7 @@ class MapAssetGrid extends HookConsumerWidget {
         return;
       }
 
-      final renderElement =
-          cachedRenderList.value?.elements.elementAtOrNull(item.index);
+      final renderElement = cachedRenderList.value?.elements.elementAtOrNull(item.index);
       // Guard no render list or render element
       if (renderElement == null) {
         return;
@@ -128,13 +124,9 @@ class MapAssetGrid extends HookConsumerWidget {
           ((renderElement.totalCount / assetsPerRow) * assetsPerRow).floor();
 
       // trailing should never be above the totalOffset
-      final columnOffset =
-          (totalOffset - math.min(item.itemTrailingEdge, totalOffset)) ~/
-              edgeOffset;
+      final columnOffset = (totalOffset - math.min(item.itemTrailingEdge, totalOffset)) ~/ edgeOffset;
       final assetOffset = rowOffset + columnOffset;
-      final selectedAsset = cachedRenderList.value?.allAssets
-          ?.elementAtOrNull(assetOffset)
-          ?.remoteId;
+      final selectedAsset = cachedRenderList.value?.allAssets?.elementAtOrNull(assetOffset)?.remoteId;
 
       if (selectedAsset != null) {
         onGridAssetChanged?.call(selectedAsset);
@@ -154,9 +146,7 @@ class MapAssetGrid extends HookConsumerWidget {
               // Place it just below the drag handle
               heightFactor: 0.87,
               child: assetsInBounds.value.isNotEmpty
-                  ? ref
-                      .watch(assetsTimelineProvider(assetsInBounds.value))
-                      .when(
+                  ? ref.watch(assetsTimelineProvider(assetsInBounds.value)).when(
                         data: (renderList) {
                           // Cache render list here to use it back during visibleItemsListener
                           cachedRenderList.value = renderList;
@@ -170,8 +160,7 @@ class MapAssetGrid extends HookConsumerWidget {
                               showMultiSelectIndicator: false,
                               selectionActive: value.isNotEmpty,
                               listener: onAssetsSelected,
-                              visibleItemsListener: (pos) => gridScrollThrottler
-                                  .run(() => handleVisibleItems(pos)),
+                              visibleItemsListener: (pos) => gridScrollThrottler.run(() => handleVisibleItems(pos)),
                             ),
                           );
                         },
@@ -255,8 +244,7 @@ class _MapSheetDragRegion extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final assetsInBoundsText = assetsInBoundCount > 0
-        ? "map_assets_in_bounds"
-            .tr(namedArgs: {'count': assetsInBoundCount.toString()})
+        ? "map_assets_in_bounds".tr(namedArgs: {'count': assetsInBoundCount.toString()})
         : "map_no_assets_in_bounds".tr();
 
     return SingleChildScrollView(
@@ -287,8 +275,7 @@ class _MapSheetDragRegion extends StatelessWidget {
                     assetsInBoundsText,
                     style: TextStyle(
                       fontSize: 20,
-                      color: context.textTheme.displayLarge?.color
-                          ?.withValues(alpha: 0.75),
+                      color: context.textTheme.displayLarge?.color?.withValues(alpha: 0.75),
                       fontWeight: FontWeight.w500,
                     ),
                   ),
diff --git a/mobile/lib/widgets/map/map_bottom_sheet.dart b/mobile/lib/widgets/map/map_bottom_sheet.dart
index 0249ca70dc..d8c1cc638e 100644
--- a/mobile/lib/widgets/map/map_bottom_sheet.dart
+++ b/mobile/lib/widgets/map/map_bottom_sheet.dart
@@ -45,8 +45,7 @@ class MapBottomSheet extends HookConsumerWidget {
     useOnStreamChange<MapEvent>(mapEventStream, onData: handleMapEvents);
 
     bool onScrollNotification(DraggableScrollableNotification notification) {
-      isBottomSheetOpened.value =
-          notification.extent > (notification.maxExtent * 0.9);
+      isBottomSheetOpened.value = notification.extent > (notification.maxExtent * 0.9);
       bottomSheetOffset.value = notification.extent;
       // do not bubble
       return true;
@@ -70,9 +69,7 @@ class MapBottomSheet extends HookConsumerWidget {
               selectedAssets: selectedAssets,
               onAssetsSelected: onAssetsSelected,
               // Do not bother with the event if the bottom sheet is not user scrolled
-              onGridAssetChanged: (assetId) => isBottomSheetOpened.value
-                  ? onGridAssetChanged?.call(assetId)
-                  : null,
+              onGridAssetChanged: (assetId) => isBottomSheetOpened.value ? onGridAssetChanged?.call(assetId) : null,
               onZoomToAsset: onZoomToAsset,
             ),
           ),
diff --git a/mobile/lib/widgets/map/map_settings/map_settings_list_tile.dart b/mobile/lib/widgets/map/map_settings/map_settings_list_tile.dart
index 1abe64ce31..5c755d80be 100644
--- a/mobile/lib/widgets/map/map_settings/map_settings_list_tile.dart
+++ b/mobile/lib/widgets/map/map_settings/map_settings_list_tile.dart
@@ -21,8 +21,7 @@ class MapSettingsListTile extends StatelessWidget {
       activeColor: context.primaryColor,
       title: Text(
         title,
-        style:
-            context.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
+        style: context.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
       ).tr(),
       value: selected,
       onChanged: onChanged,
diff --git a/mobile/lib/widgets/map/map_settings/map_settings_time_dropdown.dart b/mobile/lib/widgets/map/map_settings/map_settings_time_dropdown.dart
index e23716af95..a627ff8f29 100644
--- a/mobile/lib/widgets/map/map_settings/map_settings_time_dropdown.dart
+++ b/mobile/lib/widgets/map/map_settings/map_settings_time_dropdown.dart
@@ -81,8 +81,7 @@ class MapTimeDropDown extends StatelessWidget {
                       ),
                     )
                     .inDays,
-                label: "map_settings_date_range_option_years"
-                    .tr(namedArgs: {'years': "3"}),
+                label: "map_settings_date_range_option_years".tr(namedArgs: {'years': "3"}),
               ),
             ],
           ),
diff --git a/mobile/lib/widgets/map/map_settings/map_theme_picker.dart b/mobile/lib/widgets/map/map_settings/map_theme_picker.dart
index 19298df076..747ae06a54 100644
--- a/mobile/lib/widgets/map/map_settings/map_theme_picker.dart
+++ b/mobile/lib/widgets/map/map_settings/map_theme_picker.dart
@@ -23,8 +23,7 @@ class MapThemePicker extends StatelessWidget {
           child: Center(
             child: Text(
               "map_settings_theme_settings",
-              style: context.textTheme.bodyMedium
-                  ?.copyWith(fontWeight: FontWeight.bold),
+              style: context.textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.bold),
             ).tr(),
           ),
         ),
@@ -79,9 +78,7 @@ class _BorderedMapThumbnail extends StatelessWidget {
             border: Border.fromBorderSide(
               BorderSide(
                 width: 4,
-                color: shouldHighlight
-                    ? context.colorScheme.onSurface
-                    : Colors.transparent,
+                color: shouldHighlight ? context.colorScheme.onSurface : Colors.transparent,
               ),
             ),
             borderRadius: const BorderRadius.all(Radius.circular(20)),
diff --git a/mobile/lib/widgets/map/map_settings_sheet.dart b/mobile/lib/widgets/map/map_settings_sheet.dart
index 78d8aec75f..644056d153 100644
--- a/mobile/lib/widgets/map/map_settings_sheet.dart
+++ b/mobile/lib/widgets/map/map_settings_sheet.dart
@@ -26,37 +26,30 @@ class MapSettingsSheet extends HookConsumerWidget {
             children: [
               MapThemePicker(
                 themeMode: mapState.themeMode,
-                onThemeChange: (mode) => ref
-                    .read(mapStateNotifierProvider.notifier)
-                    .switchTheme(mode),
+                onThemeChange: (mode) => ref.read(mapStateNotifierProvider.notifier).switchTheme(mode),
               ),
               const Divider(height: 30, thickness: 2),
               MapSettingsListTile(
                 title: "map_settings_only_show_favorites",
                 selected: mapState.showFavoriteOnly,
-                onChanged: (favoriteOnly) => ref
-                    .read(mapStateNotifierProvider.notifier)
-                    .switchFavoriteOnly(favoriteOnly),
+                onChanged: (favoriteOnly) =>
+                    ref.read(mapStateNotifierProvider.notifier).switchFavoriteOnly(favoriteOnly),
               ),
               MapSettingsListTile(
                 title: "map_settings_include_show_archived",
                 selected: mapState.includeArchived,
-                onChanged: (includeArchive) => ref
-                    .read(mapStateNotifierProvider.notifier)
-                    .switchIncludeArchived(includeArchive),
+                onChanged: (includeArchive) =>
+                    ref.read(mapStateNotifierProvider.notifier).switchIncludeArchived(includeArchive),
               ),
               MapSettingsListTile(
                 title: "map_settings_include_show_partners",
                 selected: mapState.withPartners,
-                onChanged: (withPartners) => ref
-                    .read(mapStateNotifierProvider.notifier)
-                    .switchWithPartners(withPartners),
+                onChanged: (withPartners) =>
+                    ref.read(mapStateNotifierProvider.notifier).switchWithPartners(withPartners),
               ),
               MapTimeDropDown(
                 relativeTime: mapState.relativeTime,
-                onTimeChange: (time) => ref
-                    .read(mapStateNotifierProvider.notifier)
-                    .setRelativeTime(time),
+                onTimeChange: (time) => ref.read(mapStateNotifierProvider.notifier).setRelativeTime(time),
               ),
               const SizedBox(height: 20),
             ],
diff --git a/mobile/lib/widgets/map/map_theme_override.dart b/mobile/lib/widgets/map/map_theme_override.dart
index 65425f9e78..3f9ae0f43f 100644
--- a/mobile/lib/widgets/map/map_theme_override.dart
+++ b/mobile/lib/widgets/map/map_theme_override.dart
@@ -18,25 +18,20 @@ class MapThemeOverride extends StatefulHookConsumerWidget {
   ConsumerState createState() => _MapThemeOverrideState();
 }
 
-class _MapThemeOverrideState extends ConsumerState<MapThemeOverride>
-    with WidgetsBindingObserver {
+class _MapThemeOverrideState extends ConsumerState<MapThemeOverride> with WidgetsBindingObserver {
   late ThemeMode _theme;
   bool _isDarkTheme = false;
 
-  bool get _isSystemDark =>
-      WidgetsBinding.instance.platformDispatcher.platformBrightness ==
-      Brightness.dark;
+  bool get _isSystemDark => WidgetsBinding.instance.platformDispatcher.platformBrightness == Brightness.dark;
 
   bool checkDarkTheme() {
-    return _theme == ThemeMode.dark ||
-        _theme == ThemeMode.system && _isSystemDark;
+    return _theme == ThemeMode.dark || _theme == ThemeMode.system && _isSystemDark;
   }
 
   @override
   void initState() {
     super.initState();
-    _theme = widget.themeMode ??
-        ref.read(mapStateNotifierProvider.select((v) => v.themeMode));
+    _theme = widget.themeMode ?? ref.read(mapStateNotifierProvider.select((v) => v.themeMode));
     setState(() {
       _isDarkTheme = checkDarkTheme();
     });
@@ -70,8 +65,7 @@ class _MapThemeOverrideState extends ConsumerState<MapThemeOverride>
 
   @override
   Widget build(BuildContext context) {
-    _theme = widget.themeMode ??
-        ref.watch(mapStateNotifierProvider.select((v) => v.themeMode));
+    _theme = widget.themeMode ?? ref.watch(mapStateNotifierProvider.select((v) => v.themeMode));
     var appTheme = ref.watch(immichThemeProvider);
     final locale = ref.watch(localeProvider);
 
diff --git a/mobile/lib/widgets/map/map_thumbnail.dart b/mobile/lib/widgets/map/map_thumbnail.dart
index 5be15f2d5f..0dc1ad3a4f 100644
--- a/mobile/lib/widgets/map/map_thumbnail.dart
+++ b/mobile/lib/widgets/map/map_thumbnail.dart
@@ -55,8 +55,7 @@ class MapThumbnail extends HookConsumerWidget {
         // The iOS impl returns wrong toScreenLocation without the delay
         Future.delayed(
           const Duration(milliseconds: 100),
-          () async =>
-              position.value = await mapController.toScreenLocation(centre),
+          () async => position.value = await mapController.toScreenLocation(centre),
         );
       }
       onCreated?.call(mapController);
@@ -81,8 +80,7 @@ class MapThumbnail extends HookConsumerWidget {
         duration: Durations.medium2,
         curve: Curves.easeOut,
         foregroundDecoration: BoxDecoration(
-          color: context.colorScheme.inverseSurface
-              .withAlpha(styleLoaded.value ? 0 : 200),
+          color: context.colorScheme.inverseSurface.withAlpha(styleLoaded.value ? 0 : 200),
           borderRadius: const BorderRadius.all(Radius.circular(15)),
         ),
         height: height,
@@ -94,8 +92,7 @@ class MapThumbnail extends HookConsumerWidget {
             children: [
               style.widgetWhen(
                 onData: (style) => MapLibreMap(
-                  initialCameraPosition:
-                      CameraPosition(target: offsettedCentre, zoom: zoom),
+                  initialCameraPosition: CameraPosition(target: offsettedCentre, zoom: zoom),
                   styleString: style,
                   onMapCreated: onMapCreated,
                   onStyleLoadedCallback: onStyleLoaded,
@@ -107,20 +104,18 @@ class MapThumbnail extends HookConsumerWidget {
                   scrollGesturesEnabled: false,
                   rotateGesturesEnabled: false,
                   myLocationEnabled: false,
-                  attributionButtonMargins:
-                      showAttribution == false ? const Point(-100, 0) : null,
+                  attributionButtonMargins: showAttribution == false ? const Point(-100, 0) : null,
                 ),
               ),
               ValueListenableBuilder(
                 valueListenable: position,
-                builder: (_, value, __) =>
-                    value != null && assetMarkerRemoteId != null
-                        ? PositionedAssetMarkerIcon(
-                            size: height / 2,
-                            point: value,
-                            assetRemoteId: assetMarkerRemoteId!,
-                          )
-                        : const SizedBox.shrink(),
+                builder: (_, value, __) => value != null && assetMarkerRemoteId != null
+                    ? PositionedAssetMarkerIcon(
+                        size: height / 2,
+                        point: value,
+                        assetRemoteId: assetMarkerRemoteId!,
+                      )
+                    : const SizedBox.shrink(),
               ),
             ],
           ),
diff --git a/mobile/lib/widgets/map/positioned_asset_marker_icon.dart b/mobile/lib/widgets/map/positioned_asset_marker_icon.dart
index 5ad49b42f8..6207a6ab56 100644
--- a/mobile/lib/widgets/map/positioned_asset_marker_icon.dart
+++ b/mobile/lib/widgets/map/positioned_asset_marker_icon.dart
@@ -89,8 +89,7 @@ class _AssetMarkerIcon extends StatelessWidget {
                     imageUrl,
                     cacheKey: cacheKey,
                     headers: ApiService.getRequestHeaders(),
-                    errorListener: (_) =>
-                        const Icon(Icons.image_not_supported_outlined),
+                    errorListener: (_) => const Icon(Icons.image_not_supported_outlined),
                   ),
                 ),
               ),
@@ -175,7 +174,6 @@ class _PinPainter extends CustomPainter {
 
   @override
   bool shouldRepaint(_PinPainter old) {
-    return old.primaryColor != primaryColor ||
-        old.secondaryColor != secondaryColor;
+    return old.primaryColor != primaryColor || old.secondaryColor != secondaryColor;
   }
 }
diff --git a/mobile/lib/widgets/memories/memory_bottom_info.dart b/mobile/lib/widgets/memories/memory_bottom_info.dart
index 6adf1d46b0..1797b5c1c3 100644
--- a/mobile/lib/widgets/memories/memory_bottom_info.dart
+++ b/mobile/lib/widgets/memories/memory_bottom_info.dart
@@ -44,8 +44,7 @@ class MemoryBottomInfo extends StatelessWidget {
           minWidth: 0,
           onPressed: () {
             context.maybePop();
-            scrollToDateNotifierProvider
-                .scrollToDate(memory.assets[0].fileCreatedAt);
+            scrollToDateNotifierProvider.scrollToDate(memory.assets[0].fileCreatedAt);
           },
           shape: const CircleBorder(),
           color: Colors.white.withValues(alpha: 0.2),
diff --git a/mobile/lib/widgets/memories/memory_card.dart b/mobile/lib/widgets/memories/memory_card.dart
index 31f4d5ed94..1faa114936 100644
--- a/mobile/lib/widgets/memories/memory_card.dart
+++ b/mobile/lib/widgets/memories/memory_card.dart
@@ -45,11 +45,9 @@ class MemoryCard extends StatelessWidget {
               BoxFit fit = BoxFit.contain;
               if (asset.width != null && asset.height != null) {
                 final aspectRatio = asset.width! / asset.height!;
-                final phoneAspectRatio =
-                    constraints.maxWidth / constraints.maxHeight;
+                final phoneAspectRatio = constraints.maxWidth / constraints.maxHeight;
                 // Look for a 25% difference in either direction
-                if (phoneAspectRatio * .75 < aspectRatio &&
-                    phoneAspectRatio * 1.25 > aspectRatio) {
+                if (phoneAspectRatio * .75 < aspectRatio && phoneAspectRatio * 1.25 > aspectRatio) {
                   // Cover to look nice if we have nearly the same aspect ratio
                   fit = BoxFit.cover;
                 }
diff --git a/mobile/lib/widgets/memories/memory_epilogue.dart b/mobile/lib/widgets/memories/memory_epilogue.dart
index 9796bee6b1..10349aa431 100644
--- a/mobile/lib/widgets/memories/memory_epilogue.dart
+++ b/mobile/lib/widgets/memories/memory_epilogue.dart
@@ -11,8 +11,7 @@ class MemoryEpilogue extends StatefulWidget {
   State<MemoryEpilogue> createState() => _MemoryEpilogueState();
 }
 
-class _MemoryEpilogueState extends State<MemoryEpilogue>
-    with TickerProviderStateMixin {
+class _MemoryEpilogueState extends State<MemoryEpilogue> with TickerProviderStateMixin {
   late final _animationController = AnimationController(
     vsync: this,
     duration: const Duration(
@@ -50,9 +49,7 @@ class _MemoryEpilogueState extends State<MemoryEpilogue>
               children: [
                 Icon(
                   Icons.check_circle_outline_sharp,
-                  color: context.isDarkTheme
-                      ? context.colorScheme.primary
-                      : context.colorScheme.inversePrimary,
+                  color: context.isDarkTheme ? context.colorScheme.primary : context.colorScheme.inversePrimary,
                   size: 64.0,
                 ),
                 const SizedBox(height: 16.0),
@@ -75,9 +72,7 @@ class _MemoryEpilogueState extends State<MemoryEpilogue>
                   child: Text(
                     "memories_start_over",
                     style: context.textTheme.displayMedium?.copyWith(
-                      color: context.isDarkTheme
-                          ? context.colorScheme.primary
-                          : context.colorScheme.inversePrimary,
+                      color: context.isDarkTheme ? context.colorScheme.primary : context.colorScheme.inversePrimary,
                     ),
                   ).tr(),
                 ),
diff --git a/mobile/lib/widgets/memories/memory_progress_indicator.dart b/mobile/lib/widgets/memories/memory_progress_indicator.dart
index 438816d99c..646846cd11 100644
--- a/mobile/lib/widgets/memories/memory_progress_indicator.dart
+++ b/mobile/lib/widgets/memories/memory_progress_indicator.dart
@@ -27,9 +27,7 @@ class MemoryProgressIndicator extends StatelessWidget {
                 value: value,
                 borderRadius: const BorderRadius.all(Radius.circular(10.0)),
                 backgroundColor: Colors.grey[800],
-                color: context.isDarkTheme
-                    ? context.colorScheme.primary
-                    : context.colorScheme.inversePrimary,
+                color: context.isDarkTheme ? context.colorScheme.primary : context.colorScheme.inversePrimary,
               ),
               Row(
                 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
diff --git a/mobile/lib/widgets/photo_view/photo_view.dart b/mobile/lib/widgets/photo_view/photo_view.dart
index 30e08748b8..0b769d559b 100644
--- a/mobile/lib/widgets/photo_view/photo_view.dart
+++ b/mobile/lib/widgets/photo_view/photo_view.dart
@@ -9,8 +9,7 @@ import 'package:immich_mobile/widgets/photo_view/src/utils/photo_view_hero_attri
 
 export 'src/controller/photo_view_controller.dart';
 export 'src/controller/photo_view_scalestate_controller.dart';
-export 'src/core/photo_view_gesture_detector.dart'
-    show PhotoViewGestureDetectorScope, PhotoViewPageViewScrollPhysics;
+export 'src/core/photo_view_gesture_detector.dart' show PhotoViewGestureDetectorScope, PhotoViewPageViewScrollPhysics;
 export 'src/photo_view_computed_scale.dart';
 export 'src/photo_view_scale_state.dart';
 export 'src/utils/photo_view_hero_attributes.dart';
@@ -461,8 +460,7 @@ class PhotoView extends StatefulWidget {
   }
 }
 
-class _PhotoViewState extends State<PhotoView>
-    with AutomaticKeepAliveClientMixin {
+class _PhotoViewState extends State<PhotoView> with AutomaticKeepAliveClientMixin {
   // image retrieval
 
   // controller
@@ -550,8 +548,7 @@ class _PhotoViewState extends State<PhotoView>
         BoxConstraints constraints,
       ) {
         final computedOuterSize = widget.customSize ?? constraints.biggest;
-        final backgroundDecoration = widget.backgroundDecoration ??
-            const BoxDecoration(color: Colors.black);
+        final backgroundDecoration = widget.backgroundDecoration ?? const BoxDecoration(color: Colors.black);
 
         return widget._isCustomChild
             ? CustomChildWrapper(
@@ -625,14 +622,11 @@ class _PhotoViewState extends State<PhotoView>
 }
 
 /// The default [ScaleStateCycle]
-PhotoViewScaleState defaultScaleStateCycle(PhotoViewScaleState actual) =>
-    switch (actual) {
+PhotoViewScaleState defaultScaleStateCycle(PhotoViewScaleState actual) => switch (actual) {
       PhotoViewScaleState.initial => PhotoViewScaleState.covering,
       PhotoViewScaleState.covering => PhotoViewScaleState.originalSize,
       PhotoViewScaleState.originalSize => PhotoViewScaleState.initial,
-      PhotoViewScaleState.zoomedIn ||
-      PhotoViewScaleState.zoomedOut =>
-        PhotoViewScaleState.initial,
+      PhotoViewScaleState.zoomedIn || PhotoViewScaleState.zoomedOut => PhotoViewScaleState.initial,
     };
 
 /// A type definition for a [Function] that receives the actual [PhotoViewScaleState] and returns the next one
diff --git a/mobile/lib/widgets/photo_view/photo_view_gallery.dart b/mobile/lib/widgets/photo_view/photo_view_gallery.dart
index 1cd4d4b217..3f8188f7e2 100644
--- a/mobile/lib/widgets/photo_view/photo_view_gallery.dart
+++ b/mobile/lib/widgets/photo_view/photo_view_gallery.dart
@@ -218,8 +218,7 @@ class PhotoViewGallery extends StatefulWidget {
 }
 
 class _PhotoViewGalleryState extends State<PhotoViewGallery> {
-  late final PageController _controller =
-      widget.pageController ?? PageController();
+  late final PageController _controller = widget.pageController ?? PageController();
   PhotoViewControllerCallback? _getController;
 
   void scaleStateChangedCallback(PhotoViewScaleState scaleState) {
diff --git a/mobile/lib/widgets/photo_view/src/controller/photo_view_controller.dart b/mobile/lib/widgets/photo_view/src/controller/photo_view_controller.dart
index 37d1c78de1..6a860695b2 100644
--- a/mobile/lib/widgets/photo_view/src/controller/photo_view_controller.dart
+++ b/mobile/lib/widgets/photo_view/src/controller/photo_view_controller.dart
@@ -106,11 +106,7 @@ class PhotoViewControllerValue {
           rotationFocusPoint == other.rotationFocusPoint;
 
   @override
-  int get hashCode =>
-      position.hashCode ^
-      scale.hashCode ^
-      rotation.hashCode ^
-      rotationFocusPoint.hashCode;
+  int get hashCode => position.hashCode ^ scale.hashCode ^ rotation.hashCode ^ rotationFocusPoint.hashCode;
 
   @override
   String toString() {
@@ -125,8 +121,7 @@ class PhotoViewControllerValue {
 ///
 /// For details of fields and methods, check [PhotoViewControllerBase].
 ///
-class PhotoViewController
-    implements PhotoViewControllerBase<PhotoViewControllerValue> {
+class PhotoViewController implements PhotoViewControllerBase<PhotoViewControllerValue> {
   PhotoViewController({
     Offset initialPosition = Offset.zero,
     double initialRotation = 0.0,
diff --git a/mobile/lib/widgets/photo_view/src/controller/photo_view_controller_delegate.dart b/mobile/lib/widgets/photo_view/src/controller/photo_view_controller_delegate.dart
index e2e668199a..d28577ea49 100644
--- a/mobile/lib/widgets/photo_view/src/controller/photo_view_controller_delegate.dart
+++ b/mobile/lib/widgets/photo_view/src/controller/photo_view_controller_delegate.dart
@@ -1,10 +1,6 @@
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart'
-    show
-        PhotoViewControllerBase,
-        PhotoViewScaleState,
-        PhotoViewScaleStateController,
-        ScaleStateCycle;
+    show PhotoViewControllerBase, PhotoViewScaleState, PhotoViewScaleStateController, ScaleStateCycle;
 import 'package:immich_mobile/widgets/photo_view/src/core/photo_view_core.dart';
 import 'package:immich_mobile/widgets/photo_view/src/utils/photo_view_utils.dart';
 
@@ -14,8 +10,7 @@ import 'package:immich_mobile/widgets/photo_view/src/utils/photo_view_utils.dart
 mixin PhotoViewControllerDelegate on State<PhotoViewCore> {
   PhotoViewControllerBase get controller => widget.controller;
 
-  PhotoViewScaleStateController get scaleStateController =>
-      widget.scaleStateController;
+  PhotoViewScaleStateController get scaleStateController => widget.scaleStateController;
 
   ScaleBoundaries get scaleBoundaries => widget.scaleBoundaries;
 
@@ -68,9 +63,7 @@ mixin PhotoViewControllerDelegate on State<PhotoViewCore> {
       return;
     }
     final PhotoViewScaleState newScaleState =
-        (scale > scaleBoundaries.initialScale)
-            ? PhotoViewScaleState.zoomedIn
-            : PhotoViewScaleState.zoomedOut;
+        (scale > scaleBoundaries.initialScale) ? PhotoViewScaleState.zoomedIn : PhotoViewScaleState.zoomedOut;
 
     scaleStateController.setInvisibly(newScaleState);
   }
@@ -79,8 +72,7 @@ mixin PhotoViewControllerDelegate on State<PhotoViewCore> {
 
   double get scale {
     // for figuring out initial scale
-    final needsRecalc = markNeedsScaleRecalc &&
-        !scaleStateController.scaleState.isScaleStateZooming;
+    final needsRecalc = markNeedsScaleRecalc && !scaleStateController.scaleState.isScaleStateZooming;
 
     final scaleExistsOnController = controller.scale != null;
     if (needsRecalc || !scaleExistsOnController) {
@@ -114,9 +106,8 @@ mixin PhotoViewControllerDelegate on State<PhotoViewCore> {
   PhotoViewScaleState getScaleStateFromNewScale(double newScale) {
     PhotoViewScaleState newScaleState = PhotoViewScaleState.initial;
     if (scale != scaleBoundaries.initialScale) {
-      newScaleState = (newScale > scaleBoundaries.initialScale)
-          ? PhotoViewScaleState.zoomedIn
-          : PhotoViewScaleState.zoomedOut;
+      newScaleState =
+          (newScale > scaleBoundaries.initialScale) ? PhotoViewScaleState.zoomedIn : PhotoViewScaleState.zoomedOut;
     }
     return newScaleState;
   }
@@ -124,17 +115,15 @@ mixin PhotoViewControllerDelegate on State<PhotoViewCore> {
   void updateScaleStateFromNewScale(double newScale) {
     PhotoViewScaleState newScaleState = PhotoViewScaleState.initial;
     if (scale != scaleBoundaries.initialScale) {
-      newScaleState = (newScale > scaleBoundaries.initialScale)
-          ? PhotoViewScaleState.zoomedIn
-          : PhotoViewScaleState.zoomedOut;
+      newScaleState =
+          (newScale > scaleBoundaries.initialScale) ? PhotoViewScaleState.zoomedIn : PhotoViewScaleState.zoomedOut;
     }
     scaleStateController.setInvisibly(newScaleState);
   }
 
   void nextScaleState() {
     final PhotoViewScaleState scaleState = scaleStateController.scaleState;
-    if (scaleState == PhotoViewScaleState.zoomedIn ||
-        scaleState == PhotoViewScaleState.zoomedOut) {
+    if (scaleState == PhotoViewScaleState.zoomedIn || scaleState == PhotoViewScaleState.zoomedOut) {
       scaleStateController.scaleState = scaleStateCycle(scaleState);
       return;
     }
diff --git a/mobile/lib/widgets/photo_view/src/controller/photo_view_scalestate_controller.dart b/mobile/lib/widgets/photo_view/src/controller/photo_view_scalestate_controller.dart
index dea8be1a0f..e96aff7780 100644
--- a/mobile/lib/widgets/photo_view/src/controller/photo_view_scalestate_controller.dart
+++ b/mobile/lib/widgets/photo_view/src/controller/photo_view_scalestate_controller.dart
@@ -20,17 +20,14 @@ typedef ScaleStateListener = void Function(double prevScale, double nextScale);
 ///
 class PhotoViewScaleStateController {
   late final IgnorableValueNotifier<PhotoViewScaleState> _scaleStateNotifier =
-      IgnorableValueNotifier(PhotoViewScaleState.initial)
-        ..addListener(_scaleStateChangeListener);
-  final StreamController<PhotoViewScaleState> _outputScaleStateCtrl =
-      StreamController<PhotoViewScaleState>.broadcast()
-        ..sink.add(PhotoViewScaleState.initial);
+      IgnorableValueNotifier(PhotoViewScaleState.initial)..addListener(_scaleStateChangeListener);
+  final StreamController<PhotoViewScaleState> _outputScaleStateCtrl = StreamController<PhotoViewScaleState>.broadcast()
+    ..sink.add(PhotoViewScaleState.initial);
 
   bool _hasZoomedOutManually = false;
 
   /// The output for state/value updates
-  Stream<PhotoViewScaleState> get outputScaleStateStream =>
-      _outputScaleStateCtrl.stream;
+  Stream<PhotoViewScaleState> get outputScaleStateStream => _outputScaleStateCtrl.stream;
 
   /// The state value before the last change or the initial state if the state has not been changed.
   PhotoViewScaleState prevScaleState = PhotoViewScaleState.initial;
@@ -62,9 +59,7 @@ class PhotoViewScaleStateController {
   bool get hasChanged => prevScaleState != scaleState;
 
   /// Check if is `zoomedIn` & `zoomedOut`
-  bool get isZooming =>
-      scaleState == PhotoViewScaleState.zoomedIn ||
-      scaleState == PhotoViewScaleState.zoomedOut;
+  bool get isZooming => scaleState == PhotoViewScaleState.zoomedIn || scaleState == PhotoViewScaleState.zoomedOut;
 
   /// Resets the state to the initial value;
   void reset() {
diff --git a/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart b/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart
index 6b6e5067c5..e1ec36862a 100644
--- a/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart
+++ b/mobile/lib/widgets/photo_view/src/core/photo_view_core.dart
@@ -122,10 +122,7 @@ class PhotoViewCore extends StatefulWidget {
 }
 
 class PhotoViewCoreState extends State<PhotoViewCore>
-    with
-        TickerProviderStateMixin,
-        PhotoViewControllerDelegate,
-        HitCornersDetector {
+    with TickerProviderStateMixin, PhotoViewControllerDelegate, HitCornersDetector {
   Offset? _normalizedPosition;
   double? _scaleBefore;
   double? _rotationBefore;
@@ -136,8 +133,8 @@ class PhotoViewCoreState extends State<PhotoViewCore>
   late final AnimationController _positionAnimationController;
   Animation<Offset>? _positionAnimation;
 
-  late final AnimationController _rotationAnimationController =
-      AnimationController(vsync: this)..addListener(handleRotationAnimation);
+  late final AnimationController _rotationAnimationController = AnimationController(vsync: this)
+    ..addListener(handleRotationAnimation);
   Animation<double>? _rotationAnimation;
 
   PhotoViewHeroAttributes? get heroAttributes => widget.heroAttributes;
@@ -166,8 +163,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
   }
 
   bool _shouldAllowPanRotate() => switch (scaleStateController.scaleState) {
-        PhotoViewScaleState.zoomedIn =>
-          scaleStateController.hasZoomedOutManually,
+        PhotoViewScaleState.zoomedIn => scaleStateController.hasZoomedOutManually,
         _ => true,
       };
 
@@ -182,8 +178,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
 
     updateMultiple(
       scale: newScale,
-      position:
-          panEnabled ? delta : clampPosition(position: delta * details.scale),
+      position: panEnabled ? delta : clampPosition(position: delta * details.scale),
       rotation: rotationEnabled ? _rotationBefore! + details.rotation : null,
       rotationFocusPoint: rotationEnabled ? details.focalPoint : null,
     );
@@ -266,8 +261,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
     if (!mounted) {
       return;
     }
-    _positionAnimation = Tween<Offset>(begin: from, end: to)
-        .animate(_positionAnimationController);
+    _positionAnimation = Tween<Offset>(begin: from, end: to).animate(_positionAnimationController);
     _positionAnimationController
       ..value = 0.0
       ..fling(velocity: 0.4);
@@ -277,8 +271,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
     if (!mounted) {
       return;
     }
-    _rotationAnimation = Tween<double>(begin: from, end: to)
-        .animate(_rotationAnimationController);
+    _rotationAnimation = Tween<double>(begin: from, end: to).animate(_rotationAnimationController);
     _rotationAnimationController
       ..value = 0.0
       ..fling(velocity: 0.4);
@@ -292,8 +285,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
 
   /// Check if scale is equal to initial after scale animation update
   void onAnimationStatusCompleted() {
-    if (scaleStateController.scaleState != PhotoViewScaleState.initial &&
-        scale == scaleBoundaries.initialScale) {
+    if (scaleStateController.scaleState != PhotoViewScaleState.initial && scale == scaleBoundaries.initialScale) {
       scaleStateController.setInvisibly(PhotoViewScaleState.initial);
     }
   }
@@ -326,8 +318,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
     _scaleAnimationController = AnimationController(vsync: this)
       ..addListener(handleScaleAnimation)
       ..addStatusListener(onAnimationStatus);
-    _positionAnimationController = AnimationController(vsync: this)
-      ..addListener(handlePositionAnimate);
+    _positionAnimationController = AnimationController(vsync: this)..addListener(handlePositionAnimate);
   }
 
   void animateOnScaleStateUpdate(double prevScale, double nextScale) {
@@ -389,9 +380,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
           );
 
           final child = Container(
-            constraints: widget.tightMode
-                ? BoxConstraints.tight(scaleBoundaries.childSize * scale)
-                : null,
+            constraints: widget.tightMode ? BoxConstraints.tight(scaleBoundaries.childSize * scale) : null,
             decoration: widget.backgroundDecoration ?? _defaultDecoration,
             child: Center(
               child: Transform(
@@ -421,8 +410,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
                     )
                 : null,
             onDragEnd: widget.onDragEnd != null
-                ? (details) =>
-                    widget.onDragEnd!(context, details, widget.controller.value)
+                ? (details) => widget.onDragEnd!(context, details, widget.controller.value)
                 : null,
             onDragUpdate: widget.onDragUpdate != null
                 ? (details) => widget.onDragUpdate!(
@@ -432,15 +420,10 @@ class PhotoViewCoreState extends State<PhotoViewCore>
                     )
                 : null,
             hitDetector: this,
-            onTapUp: widget.onTapUp != null
-                ? (details) => widget.onTapUp!(context, details, value)
-                : null,
-            onTapDown: widget.onTapDown != null
-                ? (details) => widget.onTapDown!(context, details, value)
-                : null,
-            onLongPressStart: widget.onLongPressStart != null
-                ? (details) => widget.onLongPressStart!(context, details, value)
-                : null,
+            onTapUp: widget.onTapUp != null ? (details) => widget.onTapUp!(context, details, value) : null,
+            onTapDown: widget.onTapDown != null ? (details) => widget.onTapDown!(context, details, value) : null,
+            onLongPressStart:
+                widget.onLongPressStart != null ? (details) => widget.onLongPressStart!(context, details, value) : null,
             child: child,
           );
         } else {
@@ -467,9 +450,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
     return widget.hasCustomChild
         ? widget.customChild!
         : Image(
-            key: widget.heroAttributes?.tag != null
-                ? ObjectKey(widget.heroAttributes!.tag)
-                : null,
+            key: widget.heroAttributes?.tag != null ? ObjectKey(widget.heroAttributes!.tag) : null,
             image: widget.imageProvider!,
             semanticLabel: widget.semanticLabel,
             gaplessPlayback: widget.gaplessPlayback ?? false,
@@ -507,9 +488,7 @@ class _CenterWithOriginalSizeDelegate extends SingleChildLayoutDelegate {
 
   @override
   BoxConstraints getConstraintsForChild(BoxConstraints constraints) {
-    return useImageScale
-        ? const BoxConstraints()
-        : BoxConstraints.tight(subjectSize);
+    return useImageScale ? const BoxConstraints() : BoxConstraints.tight(subjectSize);
   }
 
   @override
@@ -527,6 +506,5 @@ class _CenterWithOriginalSizeDelegate extends SingleChildLayoutDelegate {
           useImageScale == other.useImageScale;
 
   @override
-  int get hashCode =>
-      subjectSize.hashCode ^ basePosition.hashCode ^ useImageScale.hashCode;
+  int get hashCode => subjectSize.hashCode ^ basePosition.hashCode ^ useImageScale.hashCode;
 }
diff --git a/mobile/lib/widgets/photo_view/src/core/photo_view_gesture_detector.dart b/mobile/lib/widgets/photo_view/src/core/photo_view_gesture_detector.dart
index 93fd1526da..6f456713a9 100644
--- a/mobile/lib/widgets/photo_view/src/core/photo_view_gesture_detector.dart
+++ b/mobile/lib/widgets/photo_view/src/core/photo_view_gesture_detector.dart
@@ -53,12 +53,10 @@ class PhotoViewGestureDetector extends StatelessWidget {
     final Axis? axis = scope?.axis;
     final touchSlopFactor = scope?.touchSlopFactor ?? 2;
 
-    final Map<Type, GestureRecognizerFactory> gestures =
-        <Type, GestureRecognizerFactory>{};
+    final Map<Type, GestureRecognizerFactory> gestures = <Type, GestureRecognizerFactory>{};
 
     if (onTapDown != null || onTapUp != null) {
-      gestures[TapGestureRecognizer] =
-          GestureRecognizerFactoryWithHandlers<TapGestureRecognizer>(
+      gestures[TapGestureRecognizer] = GestureRecognizerFactoryWithHandlers<TapGestureRecognizer>(
         () => TapGestureRecognizer(debugOwner: this),
         (TapGestureRecognizer instance) {
           instance
@@ -69,8 +67,7 @@ class PhotoViewGestureDetector extends StatelessWidget {
     }
 
     if (onDragStart != null || onDragEnd != null || onDragUpdate != null) {
-      gestures[VerticalDragGestureRecognizer] =
-          GestureRecognizerFactoryWithHandlers<VerticalDragGestureRecognizer>(
+      gestures[VerticalDragGestureRecognizer] = GestureRecognizerFactoryWithHandlers<VerticalDragGestureRecognizer>(
         () => VerticalDragGestureRecognizer(debugOwner: this),
         (VerticalDragGestureRecognizer instance) {
           instance
@@ -81,16 +78,14 @@ class PhotoViewGestureDetector extends StatelessWidget {
       );
     }
 
-    gestures[DoubleTapGestureRecognizer] =
-        GestureRecognizerFactoryWithHandlers<DoubleTapGestureRecognizer>(
+    gestures[DoubleTapGestureRecognizer] = GestureRecognizerFactoryWithHandlers<DoubleTapGestureRecognizer>(
       () => DoubleTapGestureRecognizer(debugOwner: this),
       (DoubleTapGestureRecognizer instance) {
         instance.onDoubleTap = onDoubleTap;
       },
     );
 
-    gestures[PhotoViewGestureRecognizer] =
-        GestureRecognizerFactoryWithHandlers<PhotoViewGestureRecognizer>(
+    gestures[PhotoViewGestureRecognizer] = GestureRecognizerFactoryWithHandlers<PhotoViewGestureRecognizer>(
       () => PhotoViewGestureRecognizer(
         hitDetector: hitDetector,
         debugOwner: this,
@@ -107,10 +102,8 @@ class PhotoViewGestureDetector extends StatelessWidget {
       },
     );
 
-    gestures[LongPressGestureRecognizer] =
-        GestureRecognizerFactoryWithHandlers<LongPressGestureRecognizer>(
-            () => LongPressGestureRecognizer(debugOwner: this),
-            (LongPressGestureRecognizer instance) {
+    gestures[LongPressGestureRecognizer] = GestureRecognizerFactoryWithHandlers<LongPressGestureRecognizer>(
+        () => LongPressGestureRecognizer(debugOwner: this), (LongPressGestureRecognizer instance) {
       instance.onLongPressStart = onLongPressStart;
     });
 
@@ -198,16 +191,14 @@ class PhotoViewGestureRecognizer extends ScaleGestureRecognizer {
     for (final int pointer in _pointerLocations.keys) {
       focalPoint += _pointerLocations[pointer]!;
     }
-    _currentFocalPoint =
-        count > 0 ? focalPoint / count.toDouble() : Offset.zero;
+    _currentFocalPoint = count > 0 ? focalPoint / count.toDouble() : Offset.zero;
 
     // Span is the average deviation from focal point. Horizontal and vertical
     // spans are the average deviations from the focal point's horizontal and
     // vertical coordinates, respectively.
     double totalDeviation = 0.0;
     for (final int pointer in _pointerLocations.keys) {
-      totalDeviation +=
-          (_currentFocalPoint! - _pointerLocations[pointer]!).distance;
+      totalDeviation += (_currentFocalPoint! - _pointerLocations[pointer]!).distance;
     }
     _currentSpan = count > 0 ? totalDeviation / count : 0.0;
   }
@@ -219,15 +210,13 @@ class PhotoViewGestureRecognizer extends ScaleGestureRecognizer {
         : hitDetector!.shouldMove(move, Axis.horizontal);
     if (shouldMove || _pointerLocations.keys.length > 1) {
       final double spanDelta = (_currentSpan! - _initialSpan!).abs();
-      final double focalPointDelta =
-          (_currentFocalPoint! - _initialFocalPoint!).distance;
+      final double focalPointDelta = (_currentFocalPoint! - _initialFocalPoint!).distance;
       // warning: do not compare `focalPointDelta` to `kPanSlop`
       // `ScaleGestureRecognizer` uses `kPanSlop`, but `HorizontalDragGestureRecognizer` uses `kTouchSlop`
       // and PhotoView recognizer may compete with the `HorizontalDragGestureRecognizer` from a containing `PageView`
       // setting `touchSlopFactor` to 2 restores default `ScaleGestureRecognizer` behaviour as `kPanSlop = kTouchSlop * 2.0`
       // setting `touchSlopFactor` in [0, 1] will allow this recognizer to accept the gesture before the one from `PageView`
-      if (spanDelta > kScaleSlop ||
-          focalPointDelta > kTouchSlop * touchSlopFactor) {
+      if (spanDelta > kScaleSlop || focalPointDelta > kTouchSlop * touchSlopFactor) {
         acceptGesture(event.pointer);
       }
     }
@@ -260,8 +249,8 @@ class PhotoViewGestureDetectorScope extends InheritedWidget {
   });
 
   static PhotoViewGestureDetectorScope? of(BuildContext context) {
-    final PhotoViewGestureDetectorScope? scope = context
-        .dependOnInheritedWidgetOfExactType<PhotoViewGestureDetectorScope>();
+    final PhotoViewGestureDetectorScope? scope =
+        context.dependOnInheritedWidgetOfExactType<PhotoViewGestureDetectorScope>();
     return scope;
   }
 
@@ -275,8 +264,7 @@ class PhotoViewGestureDetectorScope extends InheritedWidget {
 
   @override
   bool updateShouldNotify(PhotoViewGestureDetectorScope oldWidget) {
-    return axis != oldWidget.axis &&
-        touchSlopFactor != oldWidget.touchSlopFactor;
+    return axis != oldWidget.axis && touchSlopFactor != oldWidget.touchSlopFactor;
   }
 }
 
diff --git a/mobile/lib/widgets/photo_view/src/core/photo_view_hit_corners.dart b/mobile/lib/widgets/photo_view/src/core/photo_view_hit_corners.dart
index 768e5d9cc7..b02b7feb68 100644
--- a/mobile/lib/widgets/photo_view/src/core/photo_view_hit_corners.dart
+++ b/mobile/lib/widgets/photo_view/src/core/photo_view_hit_corners.dart
@@ -35,8 +35,7 @@ mixin HitCornersDetector on PhotoViewControllerDelegate {
     if (!hitCorners.hasHitAny) {
       return true;
     }
-    final axisBlocked = hitCorners.hasHitBoth ||
-        (hitCorners.hasHitMax ? mainAxisMove > 0 : mainAxisMove < 0);
+    final axisBlocked = hitCorners.hasHitBoth || (hitCorners.hasHitMax ? mainAxisMove > 0 : mainAxisMove < 0);
     if (axisBlocked) {
       return false;
     }
diff --git a/mobile/lib/widgets/photo_view/src/photo_view_computed_scale.dart b/mobile/lib/widgets/photo_view/src/photo_view_computed_scale.dart
index a01db562c7..52bb8a0a50 100644
--- a/mobile/lib/widgets/photo_view/src/photo_view_computed_scale.dart
+++ b/mobile/lib/widgets/photo_view/src/photo_view_computed_scale.dart
@@ -27,9 +27,7 @@ class PhotoViewComputedScale {
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      other is PhotoViewComputedScale &&
-          runtimeType == other.runtimeType &&
-          _value == other._value;
+      other is PhotoViewComputedScale && runtimeType == other.runtimeType && _value == other._value;
 
   @override
   int get hashCode => _value.hashCode;
diff --git a/mobile/lib/widgets/photo_view/src/photo_view_default_widgets.dart b/mobile/lib/widgets/photo_view/src/photo_view_default_widgets.dart
index a843087bad..912fb5e839 100644
--- a/mobile/lib/widgets/photo_view/src/photo_view_default_widgets.dart
+++ b/mobile/lib/widgets/photo_view/src/photo_view_default_widgets.dart
@@ -29,9 +29,7 @@ class PhotoViewDefaultLoading extends StatelessWidget {
   Widget build(BuildContext context) {
     final expectedBytes = event?.expectedTotalBytes;
     final loadedBytes = event?.cumulativeBytesLoaded;
-    final value = loadedBytes != null && expectedBytes != null
-        ? loadedBytes / expectedBytes
-        : null;
+    final value = loadedBytes != null && expectedBytes != null ? loadedBytes / expectedBytes : null;
 
     return Center(
       child: SizedBox(
diff --git a/mobile/lib/widgets/photo_view/src/photo_view_scale_state.dart b/mobile/lib/widgets/photo_view/src/photo_view_scale_state.dart
index fc6d4db3f9..0d1d4715e8 100644
--- a/mobile/lib/widgets/photo_view/src/photo_view_scale_state.dart
+++ b/mobile/lib/widgets/photo_view/src/photo_view_scale_state.dart
@@ -6,7 +6,5 @@ enum PhotoViewScaleState {
   zoomedIn,
   zoomedOut;
 
-  bool get isScaleStateZooming =>
-      this == PhotoViewScaleState.zoomedIn ||
-      this == PhotoViewScaleState.zoomedOut;
+  bool get isScaleStateZooming => this == PhotoViewScaleState.zoomedIn || this == PhotoViewScaleState.zoomedOut;
 }
diff --git a/mobile/lib/widgets/photo_view/src/utils/ignorable_change_notifier.dart b/mobile/lib/widgets/photo_view/src/utils/ignorable_change_notifier.dart
index d061b7b76c..da213903f6 100644
--- a/mobile/lib/widgets/photo_view/src/utils/ignorable_change_notifier.dart
+++ b/mobile/lib/widgets/photo_view/src/utils/ignorable_change_notifier.dart
@@ -8,8 +8,7 @@ import 'package:flutter/foundation.dart';
 /// The common collection of listeners inherited from [ChangeNotifier] will be fired
 /// every time.
 class IgnorableChangeNotifier extends ChangeNotifier {
-  ObserverList<VoidCallback>? _ignorableListeners =
-      ObserverList<VoidCallback>();
+  ObserverList<VoidCallback>? _ignorableListeners = ObserverList<VoidCallback>();
 
   bool _debugAssertNotDisposed() {
     assert(() {
@@ -51,8 +50,7 @@ class IgnorableChangeNotifier extends ChangeNotifier {
   void notifyListeners() {
     super.notifyListeners();
     if (_ignorableListeners != null) {
-      final List<VoidCallback> localListeners =
-          List<VoidCallback>.from(_ignorableListeners!);
+      final List<VoidCallback> localListeners = List<VoidCallback>.from(_ignorableListeners!);
       for (VoidCallback listener in localListeners) {
         try {
           if (_ignorableListeners!.contains(listener)) {
@@ -80,8 +78,7 @@ class IgnorableChangeNotifier extends ChangeNotifier {
 
 /// Just like [ValueNotifier] except it extends [IgnorableChangeNotifier] which has
 /// listeners that wont fire when [updateIgnoring] is called.
-class IgnorableValueNotifier<T> extends IgnorableChangeNotifier
-    implements ValueListenable<T> {
+class IgnorableValueNotifier<T> extends IgnorableChangeNotifier implements ValueListenable<T> {
   IgnorableValueNotifier(this._value);
 
   @override
diff --git a/mobile/lib/widgets/photo_view/src/utils/photo_view_utils.dart b/mobile/lib/widgets/photo_view/src/utils/photo_view_utils.dart
index facd701725..1efdc50161 100644
--- a/mobile/lib/widgets/photo_view/src/utils/photo_view_utils.dart
+++ b/mobile/lib/widgets/photo_view/src/utils/photo_view_utils.dart
@@ -101,11 +101,7 @@ class ScaleBoundaries {
 
   @override
   int get hashCode =>
-      _minScale.hashCode ^
-      _maxScale.hashCode ^
-      _initialScale.hashCode ^
-      outerSize.hashCode ^
-      childSize.hashCode;
+      _minScale.hashCode ^ _maxScale.hashCode ^ _initialScale.hashCode ^ outerSize.hashCode ^ childSize.hashCode;
 }
 
 double _scaleForContained(Size size, Size childSize) {
diff --git a/mobile/lib/widgets/search/curated_places_row.dart b/mobile/lib/widgets/search/curated_places_row.dart
index 502b09bc4b..38092071d0 100644
--- a/mobile/lib/widgets/search/curated_places_row.dart
+++ b/mobile/lib/widgets/search/curated_places_row.dart
@@ -45,8 +45,7 @@ class CuratedPlacesRow extends StatelessWidget {
           }
           final actualIndex = index - actualContentIndex;
           final object = content[actualIndex];
-          final thumbnailRequestUrl =
-              '${Store.get(StoreKey.serverEndpoint)}/assets/${object.id}/thumbnail';
+          final thumbnailRequestUrl = '${Store.get(StoreKey.serverEndpoint)}/assets/${object.id}/thumbnail';
           return SizedBox.square(
             dimension: imageSize,
             child: ThumbnailWithInfo(
diff --git a/mobile/lib/widgets/search/search_filter/location_picker.dart b/mobile/lib/widgets/search/search_filter/location_picker.dart
index 499c1e6a50..eea4b52256 100644
--- a/mobile/lib/widgets/search/search_filter/location_picker.dart
+++ b/mobile/lib/widgets/search/search_filter/location_picker.dart
@@ -15,8 +15,7 @@ class LocationPicker extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final countryTextController =
-        useTextEditingController(text: filter?.country);
+    final countryTextController = useTextEditingController(text: filter?.country);
     final stateTextController = useTextEditingController(text: filter?.state);
     final cityTextController = useTextEditingController(text: filter?.city);
 
diff --git a/mobile/lib/widgets/search/search_filter/people_picker.dart b/mobile/lib/widgets/search/search_filter/people_picker.dart
index 05f699b44b..991664dd93 100644
--- a/mobile/lib/widgets/search/search_filter/people_picker.dart
+++ b/mobile/lib/widgets/search/search_filter/people_picker.dart
@@ -52,18 +52,14 @@ class PeoplePicker extends HookConsumerWidget {
                 shrinkWrap: true,
                 itemCount: people
                     .where(
-                      (person) => person.name
-                          .toLowerCase()
-                          .contains(searchQuery.value.toLowerCase()),
+                      (person) => person.name.toLowerCase().contains(searchQuery.value.toLowerCase()),
                     )
                     .length,
                 padding: const EdgeInsets.all(8),
                 itemBuilder: (context, index) {
                   final person = people
                       .where(
-                        (person) => person.name
-                            .toLowerCase()
-                            .contains(searchQuery.value.toLowerCase()),
+                        (person) => person.name.toLowerCase().contains(searchQuery.value.toLowerCase()),
                       )
                       .toList()[index];
                   final isSelected = selectedPeople.value.contains(person);
@@ -76,9 +72,7 @@ class PeoplePicker extends HookConsumerWidget {
                         style: context.textTheme.bodyLarge?.copyWith(
                           fontSize: 20,
                           fontWeight: FontWeight.w500,
-                          color: isSelected
-                              ? context.colorScheme.onPrimary
-                              : context.colorScheme.onSurface,
+                          color: isSelected ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
                         ),
                       ),
                       leading: SizedBox(
diff --git a/mobile/lib/widgets/search/search_filter/search_filter_chip.dart b/mobile/lib/widgets/search/search_filter/search_filter_chip.dart
index c1e628adeb..60d1366fbd 100644
--- a/mobile/lib/widgets/search/search_filter/search_filter_chip.dart
+++ b/mobile/lib/widgets/search/search_filter/search_filter_chip.dart
@@ -27,8 +27,7 @@ class SearchFilterChip extends StatelessWidget {
             side: BorderSide(color: context.colorScheme.secondaryContainer),
           ),
           child: Padding(
-            padding:
-                const EdgeInsets.symmetric(vertical: 2.0, horizontal: 14.0),
+            padding: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 14.0),
             child: Row(
               children: [
                 Icon(
diff --git a/mobile/lib/widgets/search/thumbnail_with_info.dart b/mobile/lib/widgets/search/thumbnail_with_info.dart
index 8722bf8db8..23bdbc915b 100644
--- a/mobile/lib/widgets/search/thumbnail_with_info.dart
+++ b/mobile/lib/widgets/search/thumbnail_with_info.dart
@@ -22,8 +22,7 @@ class ThumbnailWithInfo extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    var textAndIconColor =
-        context.isDarkTheme ? Colors.grey[100] : Colors.grey[700];
+    var textAndIconColor = context.isDarkTheme ? Colors.grey[100] : Colors.grey[700];
     return ThumbnailWithInfoContainer(
       onTap: onTap,
       borderRadius: borderRadius,
@@ -37,8 +36,7 @@ class ThumbnailWithInfo extends StatelessWidget {
                 fit: BoxFit.cover,
                 imageUrl: imageUrl!,
                 httpHeaders: ApiService.getRequestHeaders(),
-                errorWidget: (context, url, error) =>
-                    const Icon(Icons.image_not_supported_outlined),
+                errorWidget: (context, url, error) => const Icon(Icons.image_not_supported_outlined),
               ),
             )
           : Center(
diff --git a/mobile/lib/widgets/search/thumbnail_with_info_container.dart b/mobile/lib/widgets/search/thumbnail_with_info_container.dart
index 1f5f3c2d16..e29d9e780c 100644
--- a/mobile/lib/widgets/search/thumbnail_with_info_container.dart
+++ b/mobile/lib/widgets/search/thumbnail_with_info_container.dart
@@ -43,9 +43,7 @@ class ThumbnailWithInfoContainer extends StatelessWidget {
                 end: FractionalOffset.bottomCenter,
                 colors: [
                   Colors.transparent,
-                  label == ''
-                      ? Colors.black.withValues(alpha: 0.1)
-                      : Colors.black.withValues(alpha: 0.5),
+                  label == '' ? Colors.black.withValues(alpha: 0.1) : Colors.black.withValues(alpha: 0.5),
                 ],
                 stops: const [0.0, 1.0],
               ),
@@ -53,8 +51,7 @@ class ThumbnailWithInfoContainer extends StatelessWidget {
             child: child,
           ),
           Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 8) +
-                const EdgeInsets.only(bottom: 8),
+            padding: const EdgeInsets.symmetric(horizontal: 8) + const EdgeInsets.only(bottom: 8),
             child: Text(
               label,
               style: const TextStyle(
diff --git a/mobile/lib/widgets/settings/advanced_settings.dart b/mobile/lib/widgets/settings/advanced_settings.dart
index bd501ffcf7..3f569863de 100644
--- a/mobile/lib/widgets/settings/advanced_settings.dart
+++ b/mobile/lib/widgets/settings/advanced_settings.dart
@@ -25,23 +25,18 @@ class AdvancedSettings extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     bool isLoggedIn = ref.read(currentUserProvider) != null;
 
-    final advancedTroubleshooting =
-        useAppSettingsState(AppSettingsEnum.advancedTroubleshooting);
-    final manageLocalMediaAndroid =
-        useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
+    final advancedTroubleshooting = useAppSettingsState(AppSettingsEnum.advancedTroubleshooting);
+    final manageLocalMediaAndroid = useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
     final levelId = useAppSettingsState(AppSettingsEnum.logLevel);
     final preferRemote = useAppSettingsState(AppSettingsEnum.preferRemoteImage);
-    final allowSelfSignedSSLCert =
-        useAppSettingsState(AppSettingsEnum.allowSelfSignedSSLCert);
-    final useAlternatePMFilter =
-        useAppSettingsState(AppSettingsEnum.photoManagerCustomFilter);
+    final allowSelfSignedSSLCert = useAppSettingsState(AppSettingsEnum.allowSelfSignedSSLCert);
+    final useAlternatePMFilter = useAppSettingsState(AppSettingsEnum.photoManagerCustomFilter);
 
     final logLevel = Level.LEVELS[levelId.value].name;
 
     useValueChanged(
       levelId.value,
-      (_, __) =>
-          LogService.I.setLogLevel(Level.LEVELS[levelId.value].toLogLevel()),
+      (_, __) => LogService.I.setLogLevel(Level.LEVELS[levelId.value].toLogLevel()),
     );
 
     Future<bool> checkAndroidVersion() async {
@@ -72,9 +67,7 @@ class AdvancedSettings extends HookConsumerWidget {
               subtitle: "advanced_settings_sync_remote_deletions_subtitle".tr(),
               onChanged: (value) async {
                 if (value) {
-                  final result = await ref
-                      .read(localFilesManagerRepositoryProvider)
-                      .requestManageMediaPermission();
+                  final result = await ref.read(localFilesManagerRepositoryProvider).requestManageMediaPermission();
                   manageLocalMediaAndroid.value = result;
                 }
               },
@@ -85,8 +78,7 @@ class AdvancedSettings extends HookConsumerWidget {
         },
       ),
       SettingsSliderListTile(
-        text: "advanced_settings_log_level_title"
-            .tr(namedArgs: {'level': logLevel}),
+        text: "advanced_settings_log_level_title".tr(namedArgs: {'level': logLevel}),
         valueNotifier: levelId,
         maxValue: 8,
         minValue: 1,
@@ -111,8 +103,7 @@ class AdvancedSettings extends HookConsumerWidget {
       SettingsSwitchListTile(
         valueNotifier: useAlternatePMFilter,
         title: "advanced_settings_enable_alternate_media_filter_title".tr(),
-        subtitle:
-            "advanced_settings_enable_alternate_media_filter_subtitle".tr(),
+        subtitle: "advanced_settings_enable_alternate_media_filter_subtitle".tr(),
       ),
     ];
 
diff --git a/mobile/lib/widgets/settings/asset_list_settings/asset_list_layout_settings.dart b/mobile/lib/widgets/settings/asset_list_settings/asset_list_layout_settings.dart
index 72402c8d55..de8ae5c2b2 100644
--- a/mobile/lib/widgets/settings/asset_list_settings/asset_list_layout_settings.dart
+++ b/mobile/lib/widgets/settings/asset_list_settings/asset_list_layout_settings.dart
@@ -29,8 +29,7 @@ class LayoutSettings extends HookConsumerWidget {
         ),
         SettingsSliderListTile(
           valueNotifier: tilesPerRow,
-          text: 'theme_setting_asset_list_tiles_per_row_title'
-              .tr(namedArgs: {'count': "${tilesPerRow.value}"}),
+          text: 'theme_setting_asset_list_tiles_per_row_title'.tr(namedArgs: {'count': "${tilesPerRow.value}"}),
           label: "${tilesPerRow.value}",
           maxValue: 6,
           minValue: 2,
diff --git a/mobile/lib/widgets/settings/asset_list_settings/asset_list_settings.dart b/mobile/lib/widgets/settings/asset_list_settings/asset_list_settings.dart
index cd12ea3eb2..550e3b5165 100644
--- a/mobile/lib/widgets/settings/asset_list_settings/asset_list_settings.dart
+++ b/mobile/lib/widgets/settings/asset_list_settings/asset_list_settings.dart
@@ -16,8 +16,7 @@ class AssetListSettings extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final showStorageIndicator =
-        useAppSettingsState(AppSettingsEnum.storageIndicator);
+    final showStorageIndicator = useAppSettingsState(AppSettingsEnum.storageIndicator);
 
     final assetListSetting = [
       SettingsSwitchListTile(
diff --git a/mobile/lib/widgets/settings/asset_viewer_settings/video_viewer_settings.dart b/mobile/lib/widgets/settings/asset_viewer_settings/video_viewer_settings.dart
index 4534b6ee09..66f7e96943 100644
--- a/mobile/lib/widgets/settings/asset_viewer_settings/video_viewer_settings.dart
+++ b/mobile/lib/widgets/settings/asset_viewer_settings/video_viewer_settings.dart
@@ -15,8 +15,7 @@ class VideoViewerSettings extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final useLoopVideo = useAppSettingsState(AppSettingsEnum.loopVideo);
-    final useOriginalVideo =
-        useAppSettingsState(AppSettingsEnum.loadOriginalVideo);
+    final useOriginalVideo = useAppSettingsState(AppSettingsEnum.loadOriginalVideo);
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/mobile/lib/widgets/settings/backup_settings/background_settings.dart b/mobile/lib/widgets/settings/backup_settings/background_settings.dart
index 619a410545..5207969045 100644
--- a/mobile/lib/widgets/settings/backup_settings/background_settings.dart
+++ b/mobile/lib/widgets/settings/backup_settings/background_settings.dart
@@ -19,8 +19,7 @@ class BackgroundBackupSettings extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final isBackgroundEnabled =
-        ref.watch(backupProvider.select((s) => s.backgroundBackup));
+    final isBackgroundEnabled = ref.watch(backupProvider.select((s) => s.backgroundBackup));
     final iosSettings = ref.watch(iOSBackgroundSettingsProvider);
 
     void showErrorToUser(String msg) {
@@ -80,12 +79,11 @@ class BackgroundBackupSettings extends ConsumerWidget {
         title: 'backup_controller_page_background_is_off'.tr(),
         subtileText: 'backup_controller_page_background_description'.tr(),
         buttonText: 'backup_controller_page_background_turn_on'.tr(),
-        onButtonTap: () =>
-            ref.read(backupProvider.notifier).configureBackgroundBackup(
-                  enabled: true,
-                  onError: showErrorToUser,
-                  onBatteryInfo: showBatteryOptimizationInfoToUser,
-                ),
+        onButtonTap: () => ref.read(backupProvider.notifier).configureBackgroundBackup(
+              enabled: true,
+              onError: showErrorToUser,
+              onBatteryInfo: showBatteryOptimizationInfoToUser,
+            ),
       );
     }
 
@@ -96,10 +94,8 @@ class BackgroundBackupSettings extends ConsumerWidget {
             onError: showErrorToUser,
             onBatteryInfo: showBatteryOptimizationInfoToUser,
           ),
-        if (Platform.isIOS && iosSettings?.appRefreshEnabled != true)
-          const _IOSBackgroundRefreshDisabled(),
-        if (Platform.isIOS && iosSettings != null)
-          IosDebugInfoTile(settings: iosSettings),
+        if (Platform.isIOS && iosSettings?.appRefreshEnabled != true) const _IOSBackgroundRefreshDisabled(),
+        if (Platform.isIOS && iosSettings != null) IosDebugInfoTile(settings: iosSettings),
       ],
     );
   }
@@ -112,13 +108,9 @@ class _IOSBackgroundRefreshDisabled extends StatelessWidget {
   Widget build(BuildContext context) {
     return SettingsButtonListTile(
       icon: Icons.task_outlined,
-      title:
-          'backup_controller_page_background_app_refresh_disabled_title'.tr(),
-      subtileText:
-          'backup_controller_page_background_app_refresh_disabled_content'.tr(),
-      buttonText:
-          'backup_controller_page_background_app_refresh_enable_button_text'
-              .tr(),
+      title: 'backup_controller_page_background_app_refresh_disabled_title'.tr(),
+      subtileText: 'backup_controller_page_background_app_refresh_disabled_content'.tr(),
+      buttonText: 'backup_controller_page_background_app_refresh_enable_button_text'.tr(),
       onButtonTap: () => openAppSettings(),
     );
   }
@@ -135,8 +127,7 @@ class _BackgroundSettingsEnabled extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final isWifiRequired =
-        ref.watch(backupProvider.select((s) => s.backupRequireWifi));
+    final isWifiRequired = ref.watch(backupProvider.select((s) => s.backupRequireWifi));
     final isWifiRequiredNotifier = useValueNotifier(isWifiRequired);
     useValueChanged(
       isWifiRequired,
@@ -145,8 +136,7 @@ class _BackgroundSettingsEnabled extends HookConsumerWidget {
       ),
     );
 
-    final isChargingRequired =
-        ref.watch(backupProvider.select((s) => s.backupRequireCharging));
+    final isChargingRequired = ref.watch(backupProvider.select((s) => s.backupRequireCharging));
     final isChargingRequiredNotifier = useValueNotifier(isChargingRequired);
     useValueChanged(
       isChargingRequired,
@@ -162,22 +152,16 @@ class _BackgroundSettingsEnabled extends HookConsumerWidget {
           _ => 3,
         };
 
-    int backupDelayToMilliseconds(int v) =>
-        switch (v) { 0 => 5000, 1 => 30000, 2 => 120000, _ => 600000 };
+    int backupDelayToMilliseconds(int v) => switch (v) { 0 => 5000, 1 => 30000, 2 => 120000, _ => 600000 };
 
     String formatBackupDelaySliderValue(int v) => switch (v) {
-          0 => 'setting_notifications_notify_seconds'
-              .tr(namedArgs: {'count': '5'}),
-          1 => 'setting_notifications_notify_seconds'
-              .tr(namedArgs: {'count': '30'}),
-          2 => 'setting_notifications_notify_minutes'
-              .tr(namedArgs: {'count': '2'}),
-          _ => 'setting_notifications_notify_minutes'
-              .tr(namedArgs: {'count': '10'}),
+          0 => 'setting_notifications_notify_seconds'.tr(namedArgs: {'count': '5'}),
+          1 => 'setting_notifications_notify_seconds'.tr(namedArgs: {'count': '30'}),
+          2 => 'setting_notifications_notify_minutes'.tr(namedArgs: {'count': '2'}),
+          _ => 'setting_notifications_notify_minutes'.tr(namedArgs: {'count': '10'}),
         };
 
-    final backupTriggerDelay =
-        ref.watch(backupProvider.select((s) => s.backupTriggerDelay));
+    final backupTriggerDelay = ref.watch(backupProvider.select((s) => s.backupTriggerDelay));
     final triggerDelay = useState(backupDelayToSliderValue(backupTriggerDelay));
     useValueChanged(
       triggerDelay.value,
@@ -193,35 +177,32 @@ class _BackgroundSettingsEnabled extends HookConsumerWidget {
       iconColor: context.primaryColor,
       title: 'backup_controller_page_background_is_on'.tr(),
       buttonText: 'backup_controller_page_background_turn_off'.tr(),
-      onButtonTap: () =>
-          ref.read(backupProvider.notifier).configureBackgroundBackup(
-                enabled: false,
-                onError: onError,
-                onBatteryInfo: onBatteryInfo,
-              ),
+      onButtonTap: () => ref.read(backupProvider.notifier).configureBackgroundBackup(
+            enabled: false,
+            onError: onError,
+            onBatteryInfo: onBatteryInfo,
+          ),
       subtitle: Column(
         children: [
           SettingsSwitchListTile(
             valueNotifier: isWifiRequiredNotifier,
             title: 'backup_controller_page_background_wifi'.tr(),
             icon: Icons.wifi,
-            onChanged: (enabled) =>
-                ref.read(backupProvider.notifier).configureBackgroundBackup(
-                      requireWifi: enabled,
-                      onError: onError,
-                      onBatteryInfo: onBatteryInfo,
-                    ),
+            onChanged: (enabled) => ref.read(backupProvider.notifier).configureBackgroundBackup(
+                  requireWifi: enabled,
+                  onError: onError,
+                  onBatteryInfo: onBatteryInfo,
+                ),
           ),
           SettingsSwitchListTile(
             valueNotifier: isChargingRequiredNotifier,
             title: 'backup_controller_page_background_charging'.tr(),
             icon: Icons.charging_station,
-            onChanged: (enabled) =>
-                ref.read(backupProvider.notifier).configureBackgroundBackup(
-                      requireCharging: enabled,
-                      onError: onError,
-                      onBatteryInfo: onBatteryInfo,
-                    ),
+            onChanged: (enabled) => ref.read(backupProvider.notifier).configureBackgroundBackup(
+                  requireCharging: enabled,
+                  onError: onError,
+                  onBatteryInfo: onBatteryInfo,
+                ),
           ),
           if (Platform.isAndroid)
             SettingsSliderListTile(
diff --git a/mobile/lib/widgets/settings/backup_settings/backup_settings.dart b/mobile/lib/widgets/settings/backup_settings/backup_settings.dart
index 20f172cb28..59ea6f2105 100644
--- a/mobile/lib/widgets/settings/backup_settings/backup_settings.dart
+++ b/mobile/lib/widgets/settings/backup_settings/backup_settings.dart
@@ -21,10 +21,8 @@ class BackupSettings extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final ignoreIcloudAssets =
-        useAppSettingsState(AppSettingsEnum.ignoreIcloudAssets);
-    final isAdvancedTroubleshooting =
-        useAppSettingsState(AppSettingsEnum.advancedTroubleshooting);
+    final ignoreIcloudAssets = useAppSettingsState(AppSettingsEnum.ignoreIcloudAssets);
+    final isAdvancedTroubleshooting = useAppSettingsState(AppSettingsEnum.advancedTroubleshooting);
     final albumSync = useAppSettingsState(AppSettingsEnum.syncAlbums);
     final isCorruptCheckInProgress = ref.watch(backupVerificationProvider);
     final isAlbumSyncInProgress = useState(false);
@@ -63,14 +61,10 @@ class BackupSettings extends HookConsumerWidget {
                   ],
                 )
               : null,
-          subtileText: !isCorruptCheckInProgress
-              ? 'check_corrupt_asset_backup_description'.tr()
-              : null,
+          subtileText: !isCorruptCheckInProgress ? 'check_corrupt_asset_backup_description'.tr() : null,
           buttonText: 'check_corrupt_asset_backup_button'.tr(),
           onButtonTap: !isCorruptCheckInProgress
-              ? () => ref
-                  .read(backupVerificationProvider.notifier)
-                  .performBackupCheck(context)
+              ? () => ref.read(backupVerificationProvider.notifier).performBackupCheck(context)
               : null,
         ),
       if (albumSync.value)
diff --git a/mobile/lib/widgets/settings/backup_settings/foreground_settings.dart b/mobile/lib/widgets/settings/backup_settings/foreground_settings.dart
index fc3b32b203..a2ff00fe45 100644
--- a/mobile/lib/widgets/settings/backup_settings/foreground_settings.dart
+++ b/mobile/lib/widgets/settings/backup_settings/foreground_settings.dart
@@ -12,8 +12,7 @@ class ForegroundBackupSettings extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final isAutoBackup = ref.watch(backupProvider.select((s) => s.autoBackup));
 
-    void onButtonTap() =>
-        ref.read(backupProvider.notifier).setAutoBackup(!isAutoBackup);
+    void onButtonTap() => ref.read(backupProvider.notifier).setAutoBackup(!isAutoBackup);
 
     if (isAutoBackup) {
       return SettingsButtonListTile(
diff --git a/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart b/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
index e69717d3a4..85da49357b 100644
--- a/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
+++ b/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
@@ -68,8 +68,7 @@ class BetaSyncSettings extends HookConsumerWidget {
 
         // Refresh all stream queries
         database.notifyUpdates({
-          for (final table in database.allTables)
-            drift_db.TableUpdate.onTable(table),
+          for (final table in database.allTables) drift_db.TableUpdate.onTable(table),
         });
       });
     }
@@ -77,9 +76,7 @@ class BetaSyncSettings extends HookConsumerWidget {
     Future<void> exportDatabase() async {
       try {
         // WAL Checkpoint to ensure all changes are written to the database
-        await ref
-            .read(driftProvider)
-            .customStatement("pragma wal_checkpoint(truncate)");
+        await ref.read(driftProvider).customStatement("pragma wal_checkpoint(truncate)");
         final documentsDir = await getApplicationDocumentsDirectory();
         final dbFile = File(path.join(documentsDir.path, 'immich.sqlite'));
 
@@ -118,8 +115,7 @@ class BetaSyncSettings extends HookConsumerWidget {
         if (context.mounted) {
           context.scaffoldMessenger.showSnackBar(
             SnackBar(
-              content:
-                  Text("Database exported successfully".t(context: context)),
+              content: Text("Database exported successfully".t(context: context)),
             ),
           );
         }
@@ -127,8 +123,7 @@ class BetaSyncSettings extends HookConsumerWidget {
         if (context.mounted) {
           context.scaffoldMessenger.showSnackBar(
             SnackBar(
-              content:
-                  Text("Failed to export database: $e".t(context: context)),
+              content: Text("Failed to export database: $e".t(context: context)),
             ),
           );
         }
diff --git a/mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart b/mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart
index 1e140fbf2e..e2264cd85f 100644
--- a/mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart
+++ b/mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart
@@ -16,9 +16,7 @@ class EntitiyCountTile extends StatelessWidget {
 
   String zeroPadding(int number, int targetWidth) {
     final numStr = number.toString();
-    return numStr.length < targetWidth
-        ? "0" * (targetWidth - numStr.length)
-        : "";
+    return numStr.length < targetWidth ? "0" * (targetWidth - numStr.length) : "";
   }
 
   int calculateMaxDigits(double availableWidth) {
@@ -77,8 +75,7 @@ class EntitiyCountTile extends StatelessWidget {
                     TextSpan(
                       text: zeroPadding(count, maxDigits),
                       style: TextStyle(
-                        color: context.colorScheme.onSurfaceSecondary
-                            .withAlpha(75),
+                        color: context.colorScheme.onSurfaceSecondary.withAlpha(75),
                       ),
                     ),
                     TextSpan(
diff --git a/mobile/lib/widgets/settings/beta_timeline_list_tile.dart b/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
index 154ccb3552..f5f6d66898 100644
--- a/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
+++ b/mobile/lib/widgets/settings/beta_timeline_list_tile.dart
@@ -18,12 +18,10 @@ class BetaTimelineListTile extends ConsumerStatefulWidget {
   });
 
   @override
-  ConsumerState<BetaTimelineListTile> createState() =>
-      _BetaTimelineListTileState();
+  ConsumerState<BetaTimelineListTile> createState() => _BetaTimelineListTileState();
 }
 
-class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
-    with SingleTickerProviderStateMixin {
+class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile> with SingleTickerProviderStateMixin {
   late AnimationController _animationController;
   late Animation<double> _rotationAnimation;
   late Animation<double> _pulseAnimation;
@@ -69,14 +67,11 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
 
   @override
   Widget build(BuildContext context) {
-    final betaTimelineValue = ref
-        .watch(appSettingsServiceProvider)
-        .getSetting<bool>(AppSettingsEnum.betaTimeline);
+    final betaTimelineValue = ref.watch(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.betaTimeline);
     final serverInfo = ref.watch(serverInfoProvider);
     final auth = ref.watch(authProvider);
 
-    if (!auth.isAuthenticated ||
-        (serverInfo.serverVersion.minor < 136 && kReleaseMode)) {
+    if (!auth.isAuthenticated || (serverInfo.serverVersion.minor < 136 && kReleaseMode)) {
       return const SizedBox.shrink();
     }
 
@@ -88,9 +83,7 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
             context: context,
             builder: (context) {
               return AlertDialog(
-                title: value
-                    ? const Text("Enable Beta Timeline")
-                    : const Text("Disable Beta Timeline"),
+                title: value ? const Text("Enable Beta Timeline") : const Text("Disable Beta Timeline"),
                 content: value
                     ? const Text(
                         "Are you sure you want to enable the beta timeline?",
@@ -182,8 +175,7 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
                 borderRadius: const BorderRadius.all(Radius.circular(10.5)),
                 onTap: () => onSwitchChanged(!betaTimelineValue),
                 child: Padding(
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
+                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
                   child: Row(
                     children: [
                       Transform.scale(
@@ -218,10 +210,8 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
                                 Text(
-                                  "advanced_settings_beta_timeline_title"
-                                      .t(context: context),
-                                  style:
-                                      context.textTheme.titleMedium?.copyWith(
+                                  "advanced_settings_beta_timeline_title".t(context: context),
+                                  style: context.textTheme.titleMedium?.copyWith(
                                     fontWeight: FontWeight.w600,
                                   ),
                                 ),
@@ -237,17 +227,14 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
                                     ),
                                     gradient: LinearGradient(
                                       colors: [
-                                        context.primaryColor
-                                            .withValues(alpha: 0.8),
-                                        context.primaryColor
-                                            .withValues(alpha: 0.6),
+                                        context.primaryColor.withValues(alpha: 0.8),
+                                        context.primaryColor.withValues(alpha: 0.6),
                                       ],
                                     ),
                                   ),
                                   child: Text(
                                     'NEW',
-                                    style:
-                                        context.textTheme.labelSmall?.copyWith(
+                                    style: context.textTheme.labelSmall?.copyWith(
                                       color: Colors.white,
                                       fontWeight: FontWeight.bold,
                                       fontSize: 10,
@@ -259,11 +246,9 @@ class _BetaTimelineListTileState extends ConsumerState<BetaTimelineListTile>
                             ),
                             const SizedBox(height: 4),
                             Text(
-                              "advanced_settings_beta_timeline_subtitle"
-                                  .t(context: context),
+                              "advanced_settings_beta_timeline_subtitle".t(context: context),
                               style: context.textTheme.labelLarge?.copyWith(
-                                color: context.textTheme.labelLarge?.color
-                                    ?.withValues(alpha: 0.9),
+                                color: context.textTheme.labelLarge?.color?.withValues(alpha: 0.9),
                               ),
                               maxLines: 2,
                             ),
diff --git a/mobile/lib/widgets/settings/language_settings.dart b/mobile/lib/widgets/settings/language_settings.dart
index 4d41d5b19b..012c966b60 100644
--- a/mobile/lib/widgets/settings/language_settings.dart
+++ b/mobile/lib/widgets/settings/language_settings.dart
@@ -31,13 +31,11 @@ class LanguageSettings extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final localeEntries = useMemoized(() => locales.entries.toList(), const []);
     final currentLocale = context.locale;
-    final filteredLocaleEntries =
-        useState<List<MapEntry<String, Locale>>>(localeEntries);
+    final filteredLocaleEntries = useState<List<MapEntry<String, Locale>>>(localeEntries);
     final selectedLocale = useState<Locale>(currentLocale);
 
     final isLoading = useState<bool>(false);
-    final isButtonDisabled =
-        selectedLocale.value == currentLocale || isLoading.value;
+    final isButtonDisabled = selectedLocale.value == currentLocale || isLoading.value;
 
     final searchController = useTextEditingController();
     final searchFocusNode = useFocusNode();
@@ -51,8 +49,7 @@ class LanguageSettings extends HookConsumerWidget {
         } else {
           filteredLocaleEntries.value = localeEntries
               .where(
-                (entry) =>
-                    entry.key.toLowerCase().contains(searchTerm.toLowerCase()),
+                (entry) => entry.key.toLowerCase().contains(searchTerm.toLowerCase()),
               )
               .toList();
         }
@@ -94,12 +91,9 @@ class LanguageSettings extends HookConsumerWidget {
                     itemExtent: 64.0,
                     cacheExtent: 100,
                     itemBuilder: (context, index) {
-                      final countryName =
-                          filteredLocaleEntries.value[index].key;
-                      final localeValue =
-                          filteredLocaleEntries.value[index].value;
-                      final bool isSelected =
-                          selectedLocale.value == localeValue;
+                      final countryName = filteredLocaleEntries.value[index].key;
+                      final localeValue = filteredLocaleEntries.value[index].value;
+                      final bool isSelected = selectedLocale.value == localeValue;
 
                       return _LanguageItem(
                         key: ValueKey(localeValue.toString()),
@@ -285,8 +279,7 @@ class _LanguageItem extends StatelessWidget {
       ),
       child: DecoratedBox(
         decoration: BoxDecoration(
-          color:
-              context.colorScheme.surfaceContainerLowest.withValues(alpha: .6),
+          color: context.colorScheme.surfaceContainerLowest.withValues(alpha: .6),
           borderRadius: const BorderRadius.all(
             Radius.circular(16.0),
           ),
@@ -300,9 +293,7 @@ class _LanguageItem extends StatelessWidget {
             countryName,
             style: context.textTheme.titleSmall?.copyWith(
               fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
-              color: isSelected
-                  ? context.colorScheme.primary
-                  : context.colorScheme.onSurfaceVariant,
+              color: isSelected ? context.colorScheme.primary : context.colorScheme.onSurfaceVariant,
             ),
           ),
           trailing: isSelected
diff --git a/mobile/lib/widgets/settings/networking_settings/endpoint_input.dart b/mobile/lib/widgets/settings/networking_settings/endpoint_input.dart
index 6302f9422a..ec0069f2d1 100644
--- a/mobile/lib/widgets/settings/networking_settings/endpoint_input.dart
+++ b/mobile/lib/widgets/settings/networking_settings/endpoint_input.dart
@@ -61,8 +61,7 @@ class EndpointInputState extends ConsumerState<EndpointInput> {
     final url = controller.text;
     setState(() => auxCheckStatus = AuxCheckStatus.loading);
 
-    final isValid =
-        await ref.read(authProvider.notifier).validateAuxilaryServerUrl(url);
+    final isValid = await ref.read(authProvider.notifier).validateAuxilaryServerUrl(url);
 
     setState(() {
       if (mounted) {
@@ -140,8 +139,7 @@ class EndpointInputState extends ConsumerState<EndpointInput> {
             ),
             disabledBorder: OutlineInputBorder(
               borderSide: BorderSide(
-                color:
-                    context.isDarkTheme ? Colors.grey[900]! : Colors.grey[300]!,
+                color: context.isDarkTheme ? Colors.grey[900]! : Colors.grey[300]!,
               ),
               borderRadius: const BorderRadius.all(Radius.circular(16)),
             ),
diff --git a/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart b/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart
index d38ba06d76..d0c212adf5 100644
--- a/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart
+++ b/mobile/lib/widgets/settings/networking_settings/external_network_preference.dart
@@ -23,12 +23,9 @@ class ExternalNetworkPreference extends HookConsumerWidget {
     final canSave = useState(false);
 
     saveEndpointList() {
-      canSave.value =
-          entries.value.every((e) => e.status == AuxCheckStatus.valid);
+      canSave.value = entries.value.every((e) => e.status == AuxCheckStatus.valid);
 
-      final endpointList = entries.value
-          .where((url) => url.status == AuxCheckStatus.valid)
-          .toList();
+      final endpointList = entries.value.where((url) => url.status == AuxCheckStatus.valid).toList();
 
       final jsonString = jsonEncode(endpointList);
 
@@ -39,8 +36,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
     }
 
     updateValidationStatus(String url, int index, AuxCheckStatus status) {
-      entries.value[index] =
-          entries.value[index].copyWith(url: url, status: status);
+      entries.value[index] = entries.value[index].copyWith(url: url, status: status);
 
       saveEndpointList();
     }
@@ -90,8 +86,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
         }
 
         final List<dynamic> jsonList = jsonDecode(jsonString);
-        entries.value =
-            jsonList.map((e) => AuxilaryEndpoint.fromJson(e)).toList();
+        entries.value = jsonList.map((e) => AuxilaryEndpoint.fromJson(e)).toList();
         return null;
       },
       const [],
diff --git a/mobile/lib/widgets/settings/networking_settings/local_network_preference.dart b/mobile/lib/widgets/settings/networking_settings/local_network_preference.dart
index a50d216a9d..ac61019aaf 100644
--- a/mobile/lib/widgets/settings/networking_settings/local_network_preference.dart
+++ b/mobile/lib/widgets/settings/networking_settings/local_network_preference.dart
@@ -59,8 +59,7 @@ class LocalNetworkPreference extends HookConsumerWidget {
     useEffect(
       () {
         final wifiName = ref.read(authProvider.notifier).getSavedWifiName();
-        final localEndpoint =
-            ref.read(authProvider.notifier).getSavedLocalEndpoint();
+        final localEndpoint = ref.read(authProvider.notifier).getSavedLocalEndpoint();
 
         if (wifiName != null) {
           wifiNameText.value = wifiName;
@@ -131,8 +130,7 @@ class LocalNetworkPreference extends HookConsumerWidget {
         saveWifiName(wifiName);
       }
 
-      final serverEndpoint =
-          ref.read(authProvider.notifier).getServerEndpoint();
+      final serverEndpoint = ref.read(authProvider.notifier).getServerEndpoint();
 
       if (serverEndpoint != null) {
         saveLocalEndpoint(serverEndpoint);
@@ -194,10 +192,7 @@ class LocalNetworkPreference extends HookConsumerWidget {
                               wifiNameText.value,
                               style: context.textTheme.labelLarge?.copyWith(
                                 fontWeight: FontWeight.bold,
-                                color: enabled
-                                    ? context.primaryColor
-                                    : context.colorScheme.onSurface
-                                        .withAlpha(100),
+                                color: enabled ? context.primaryColor : context.colorScheme.onSurface.withAlpha(100),
                                 fontFamily: 'Inconsolata',
                               ),
                             ),
@@ -217,10 +212,7 @@ class LocalNetworkPreference extends HookConsumerWidget {
                               localEndpointText.value,
                               style: context.textTheme.labelLarge?.copyWith(
                                 fontWeight: FontWeight.bold,
-                                color: enabled
-                                    ? context.primaryColor
-                                    : context.colorScheme.onSurface
-                                        .withAlpha(100),
+                                color: enabled ? context.primaryColor : context.colorScheme.onSurface.withAlpha(100),
                                 fontFamily: 'Inconsolata',
                               ),
                             ),
@@ -238,8 +230,7 @@ class LocalNetworkPreference extends HookConsumerWidget {
                         height: 48,
                         child: OutlinedButton.icon(
                           icon: const Icon(Icons.wifi_find_rounded),
-                          label:
-                              Text('use_current_connection'.tr().toUpperCase()),
+                          label: Text('use_current_connection'.tr().toUpperCase()),
                           onPressed: enabled ? autofillCurrentNetwork : null,
                         ),
                       ),
diff --git a/mobile/lib/widgets/settings/networking_settings/networking_settings.dart b/mobile/lib/widgets/settings/networking_settings/networking_settings.dart
index 587a0ce6d3..24d62b2663 100644
--- a/mobile/lib/widgets/settings/networking_settings/networking_settings.dart
+++ b/mobile/lib/widgets/settings/networking_settings/networking_settings.dart
@@ -18,8 +18,7 @@ class NetworkingSettings extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final currentEndpoint = getServerUrl();
-    final featureEnabled =
-        useAppSettingsState(AppSettingsEnum.autoEndpointSwitching);
+    final featureEnabled = useAppSettingsState(AppSettingsEnum.autoEndpointSwitching);
 
     Future<void> checkWifiReadPermission() async {
       final [hasLocationInUse, hasLocationAlways] = await Future.wait([
@@ -39,9 +38,7 @@ class NetworkingSettings extends HookConsumerWidget {
               actions: [
                 TextButton(
                   onPressed: () async {
-                    final isGrant = await ref
-                        .read(networkProvider.notifier)
-                        .requestWifiReadPermission();
+                    final isGrant = await ref.read(networkProvider.notifier).requestWifiReadPermission();
 
                     Navigator.pop(context, isGrant);
                   },
@@ -63,9 +60,7 @@ class NetworkingSettings extends HookConsumerWidget {
               actions: [
                 TextButton(
                   onPressed: () async {
-                    final isGrant = await ref
-                        .read(networkProvider.notifier)
-                        .requestWifiReadBackgroundPermission();
+                    final isGrant = await ref.read(networkProvider.notifier).requestWifiReadBackgroundPermission();
 
                     Navigator.pop(context, isGrant);
                   },
@@ -77,8 +72,7 @@ class NetworkingSettings extends HookConsumerWidget {
         );
       }
 
-      if (isGrantLocationAlwaysPermission != null &&
-          !isGrantLocationAlwaysPermission) {
+      if (isGrantLocationAlwaysPermission != null && !isGrantLocationAlwaysPermission) {
         await ref.read(networkProvider.notifier).openSettings();
       }
     }
@@ -101,9 +95,7 @@ class NetworkingSettings extends HookConsumerWidget {
           padding: const EdgeInsets.only(top: 8, left: 16, bottom: 8),
           child: NetworkPreferenceTitle(
             title: "current_server_address".tr().toUpperCase(),
-            icon: (currentEndpoint?.startsWith('https') ?? false)
-                ? Icons.https_outlined
-                : Icons.http_outlined,
+            icon: (currentEndpoint?.startsWith('https') ?? false) ? Icons.https_outlined : Icons.http_outlined,
           ),
         ),
         Padding(
diff --git a/mobile/lib/widgets/settings/notification_setting.dart b/mobile/lib/widgets/settings/notification_setting.dart
index cf6745199e..f4e520f4df 100644
--- a/mobile/lib/widgets/settings/notification_setting.dart
+++ b/mobile/lib/widgets/settings/notification_setting.dart
@@ -20,12 +20,9 @@ class NotificationSetting extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final permissionService = ref.watch(notificationPermissionProvider);
 
-    final sliderValue =
-        useAppSettingsState(AppSettingsEnum.uploadErrorNotificationGracePeriod);
-    final totalProgressValue =
-        useAppSettingsState(AppSettingsEnum.backgroundBackupTotalProgress);
-    final singleProgressValue =
-        useAppSettingsState(AppSettingsEnum.backgroundBackupSingleProgress);
+    final sliderValue = useAppSettingsState(AppSettingsEnum.uploadErrorNotificationGracePeriod);
+    final totalProgressValue = useAppSettingsState(AppSettingsEnum.backgroundBackupTotalProgress);
+    final singleProgressValue = useAppSettingsState(AppSettingsEnum.backgroundBackupSingleProgress);
 
     final hasPermission = permissionService == PermissionStatus.granted;
 
@@ -55,8 +52,7 @@ class NotificationSetting extends HookConsumerWidget {
       );
     }
 
-    final String formattedValue =
-        _formatSliderValue(sliderValue.value.toDouble());
+    final String formattedValue = _formatSliderValue(sliderValue.value.toDouble());
 
     final notificationSettings = [
       if (!hasPermission)
@@ -65,10 +61,8 @@ class NotificationSetting extends HookConsumerWidget {
           title: 'notification_permission_list_tile_title'.tr(),
           subtileText: 'notification_permission_list_tile_content'.tr(),
           buttonText: 'notification_permission_list_tile_enable_button'.tr(),
-          onButtonTap: () => ref
-              .watch(notificationPermissionProvider.notifier)
-              .requestNotificationPermission()
-              .then((permission) {
+          onButtonTap: () =>
+              ref.watch(notificationPermissionProvider.notifier).requestNotificationPermission().then((permission) {
             if (permission == PermissionStatus.permanentlyDenied) {
               showPermissionsDialog();
             }
@@ -89,8 +83,7 @@ class NotificationSetting extends HookConsumerWidget {
       SettingsSliderListTile(
         enabled: hasPermission,
         valueNotifier: sliderValue,
-        text: 'setting_notifications_notify_failures_grace_period'
-            .tr(namedArgs: {'duration': formattedValue}),
+        text: 'setting_notifications_notify_failures_grace_period'.tr(namedArgs: {'duration': formattedValue}),
         maxValue: 5.0,
         noDivisons: 5,
         label: formattedValue,
@@ -105,8 +98,7 @@ String _formatSliderValue(double v) {
   if (v == 0.0) {
     return 'setting_notifications_notify_immediately'.tr();
   } else if (v == 1.0) {
-    return 'setting_notifications_notify_minutes'
-        .tr(namedArgs: {'count': '30'});
+    return 'setting_notifications_notify_minutes'.tr(namedArgs: {'count': '30'});
   } else if (v == 2.0) {
     return 'setting_notifications_notify_hours'.tr(namedArgs: {'count': '2'});
   } else if (v == 3.0) {
diff --git a/mobile/lib/widgets/settings/preference_settings/haptic_setting.dart b/mobile/lib/widgets/settings/preference_settings/haptic_setting.dart
index 90a123bfbd..fbd94b68d6 100644
--- a/mobile/lib/widgets/settings/preference_settings/haptic_setting.dart
+++ b/mobile/lib/widgets/settings/preference_settings/haptic_setting.dart
@@ -14,10 +14,8 @@ class HapticSetting extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final hapticFeedbackSetting =
-        useAppSettingsState(AppSettingsEnum.enableHapticFeedback);
-    final isHapticFeedbackEnabled =
-        useValueNotifier(hapticFeedbackSetting.value);
+    final hapticFeedbackSetting = useAppSettingsState(AppSettingsEnum.enableHapticFeedback);
+    final isHapticFeedbackEnabled = useValueNotifier(hapticFeedbackSetting.value);
 
     onHapticFeedbackChange(bool isEnabled) {
       hapticFeedbackSetting.value = isEnabled;
diff --git a/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart b/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart
index 011904c310..b4f70c5b9b 100644
--- a/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart
+++ b/mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart
@@ -20,18 +20,15 @@ class PrimaryColorSetting extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final themeProvider = ref.read(immichThemeProvider);
 
-    final primaryColorSetting =
-        useAppSettingsState(AppSettingsEnum.primaryColor);
-    final systemPrimaryColorSetting =
-        useAppSettingsState(AppSettingsEnum.dynamicTheme);
+    final primaryColorSetting = useAppSettingsState(AppSettingsEnum.primaryColor);
+    final systemPrimaryColorSetting = useAppSettingsState(AppSettingsEnum.dynamicTheme);
 
     final currentPreset = useValueNotifier(ref.read(immichThemePresetProvider));
     const tileSize = 55.0;
 
     useValueChanged(
       primaryColorSetting.value,
-      (_, __) => currentPreset.value = ImmichColorPreset.values
-          .firstWhere((e) => e.name == primaryColorSetting.value),
+      (_, __) => currentPreset.value = ImmichColorPreset.values.firstWhere((e) => e.name == primaryColorSetting.value),
     );
 
     void popBottomSheet() {
@@ -131,8 +128,7 @@ class PrimaryColorSetting extends HookConsumerWidget {
               padding: const EdgeInsets.symmetric(horizontal: 20),
               margin: const EdgeInsets.only(top: 10),
               child: SwitchListTile.adaptive(
-                contentPadding:
-                    const EdgeInsets.symmetric(vertical: 6, horizontal: 20),
+                contentPadding: const EdgeInsets.symmetric(vertical: 6, horizontal: 20),
                 dense: true,
                 activeColor: context.primaryColor,
                 tileColor: context.colorScheme.surfaceContainerHigh,
@@ -164,8 +160,7 @@ class PrimaryColorSetting extends HookConsumerWidget {
                     topColor: theme.light.primary,
                     bottomColor: theme.dark.primary,
                     tileSize: tileSize,
-                    showSelector: currentPreset.value == preset &&
-                        !systemPrimaryColorSetting.value,
+                    showSelector: currentPreset.value == preset && !systemPrimaryColorSetting.value,
                   ),
                 );
               }).toList(),
@@ -201,8 +196,7 @@ class PrimaryColorSetting extends HookConsumerWidget {
                 ),
                 Text(
                   "theme_setting_primary_color_subtitle".tr(),
-                  style: context.textTheme.bodyMedium
-                      ?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+                  style: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
                 ),
               ],
             ),
diff --git a/mobile/lib/widgets/settings/preference_settings/theme_setting.dart b/mobile/lib/widgets/settings/preference_settings/theme_setting.dart
index 0c68de4c52..6d5a50e730 100644
--- a/mobile/lib/widgets/settings/preference_settings/theme_setting.dart
+++ b/mobile/lib/widgets/settings/preference_settings/theme_setting.dart
@@ -20,13 +20,10 @@ class ThemeSetting extends HookConsumerWidget {
     final currentThemeString = useAppSettingsState(AppSettingsEnum.themeMode);
     final currentTheme = useValueNotifier(ref.read(immichThemeModeProvider));
     final isDarkTheme = useValueNotifier(currentTheme.value == ThemeMode.dark);
-    final isSystemTheme =
-        useValueNotifier(currentTheme.value == ThemeMode.system);
+    final isSystemTheme = useValueNotifier(currentTheme.value == ThemeMode.system);
 
-    final applyThemeToBackgroundSetting =
-        useAppSettingsState(AppSettingsEnum.colorfulInterface);
-    final applyThemeToBackgroundProvider =
-        useValueNotifier(ref.read(colorfulInterfaceSettingProvider));
+    final applyThemeToBackgroundSetting = useAppSettingsState(AppSettingsEnum.colorfulInterface);
+    final applyThemeToBackgroundProvider = useValueNotifier(ref.read(colorfulInterfaceSettingProvider));
 
     useValueChanged(
       currentThemeString.value,
@@ -39,8 +36,7 @@ class ThemeSetting extends HookConsumerWidget {
 
     useValueChanged(
       applyThemeToBackgroundSetting.value,
-      (_, __) => applyThemeToBackgroundProvider.value =
-          applyThemeToBackgroundSetting.value,
+      (_, __) => applyThemeToBackgroundProvider.value = applyThemeToBackgroundSetting.value,
     );
 
     void onThemeChange(bool isDark) {
@@ -74,8 +70,7 @@ class ThemeSetting extends HookConsumerWidget {
 
     void onSurfaceColorSettingChange(bool useColorfulInterface) {
       applyThemeToBackgroundSetting.value = useColorfulInterface;
-      ref.watch(colorfulInterfaceSettingProvider.notifier).state =
-          useColorfulInterface;
+      ref.watch(colorfulInterfaceSettingProvider.notifier).state = useColorfulInterface;
     }
 
     return Column(
diff --git a/mobile/lib/widgets/settings/settings_button_list_tile.dart b/mobile/lib/widgets/settings/settings_button_list_tile.dart
index c8bd8e4b58..602bbd75cf 100644
--- a/mobile/lib/widgets/settings/settings_button_list_tile.dart
+++ b/mobile/lib/widgets/settings/settings_button_list_tile.dart
@@ -50,8 +50,7 @@ class SettingsButtonListTile extends StatelessWidget {
             ),
           if (subtitle != null) subtitle!,
           const SizedBox(height: 6),
-          child ??
-              ElevatedButton(onPressed: onButtonTap, child: Text(buttonText)),
+          child ?? ElevatedButton(onPressed: onButtonTap, child: Text(buttonText)),
         ],
       ),
     );
diff --git a/mobile/lib/widgets/settings/settings_card.dart b/mobile/lib/widgets/settings/settings_card.dart
index 257c0ce2d6..523add9690 100644
--- a/mobile/lib/widgets/settings/settings_card.dart
+++ b/mobile/lib/widgets/settings/settings_card.dart
@@ -37,9 +37,7 @@ class SettingsCard extends StatelessWidget {
           leading: Container(
             decoration: BoxDecoration(
               borderRadius: const BorderRadius.all(Radius.circular(16)),
-              color: context.isDarkTheme
-                  ? Colors.black26
-                  : Colors.white.withAlpha(100),
+              color: context.isDarkTheme ? Colors.black26 : Colors.white.withAlpha(100),
             ),
             padding: const EdgeInsets.all(16.0),
             child: Icon(icon, color: context.primaryColor),
diff --git a/mobile/lib/widgets/settings/settings_switch_list_tile.dart b/mobile/lib/widgets/settings/settings_switch_list_tile.dart
index 8aa4ec0a60..456acd83cd 100644
--- a/mobile/lib/widgets/settings/settings_switch_list_tile.dart
+++ b/mobile/lib/widgets/settings/settings_switch_list_tile.dart
@@ -40,8 +40,7 @@ class SettingsSwitchListTile extends StatelessWidget {
       selectedTileColor: enabled ? null : context.themeData.disabledColor,
       value: valueNotifier.value,
       onChanged: onSwitchChanged,
-      activeColor:
-          enabled ? context.primaryColor : context.themeData.disabledColor,
+      activeColor: enabled ? context.primaryColor : context.themeData.disabledColor,
       dense: true,
       secondary: icon != null
           ? Icon(
@@ -63,9 +62,7 @@ class SettingsSwitchListTile extends StatelessWidget {
               subtitle!,
               style: subtitleStyle ??
                   context.textTheme.bodyMedium?.copyWith(
-                    color: enabled
-                        ? context.colorScheme.onSurfaceSecondary
-                        : context.themeData.disabledColor,
+                    color: enabled ? context.colorScheme.onSurfaceSecondary : context.themeData.disabledColor,
                   ),
             )
           : null,
diff --git a/mobile/lib/widgets/settings/ssl_client_cert_settings.dart b/mobile/lib/widgets/settings/ssl_client_cert_settings.dart
index 6fdbb156d9..f17fd67638 100644
--- a/mobile/lib/widgets/settings/ssl_client_cert_settings.dart
+++ b/mobile/lib/widgets/settings/ssl_client_cert_settings.dart
@@ -20,8 +20,7 @@ class SslClientCertSettings extends StatefulWidget {
 }
 
 class _SslClientCertSettingsState extends State<SslClientCertSettings> {
-  _SslClientCertSettingsState()
-      : isCertExist = SSLClientCertStoreVal.load() != null;
+  _SslClientCertSettingsState() : isCertExist = SSLClientCertStoreVal.load() != null;
 
   bool isCertExist;
 
@@ -62,9 +61,7 @@ class _SslClientCertSettingsState extends State<SslClientCertSettings> {
                 width: 15,
               ),
               ElevatedButton(
-                onPressed: widget.isLoggedIn || !isCertExist
-                    ? null
-                    : () => removeCert(context),
+                onPressed: widget.isLoggedIn || !isCertExist ? null : () => removeCert(context),
                 child: Text("remove".tr()),
               ),
             ],
@@ -127,8 +124,7 @@ class _SslClientCertSettingsState extends State<SslClientCertSettings> {
         ),
         actions: [
           TextButton(
-            onPressed: () =>
-                {ctx.pop(), storeCert(context, data, password.text)},
+            onPressed: () => {ctx.pop(), storeCert(context, data, password.text)},
             child: Text("client_cert_dialog_msg_confirm".tr()),
           ),
         ],
diff --git a/mobile/lib/widgets/shared_link/shared_link_item.dart b/mobile/lib/widgets/shared_link/shared_link_item.dart
index a9707eb0d3..82194d2c7c 100644
--- a/mobile/lib/widgets/shared_link/shared_link_item.dart
+++ b/mobile/lib/widgets/shared_link/shared_link_item.dart
@@ -45,17 +45,13 @@ class SharedLinkItem extends ConsumerWidget {
         if (difference.inHours % 24 > 12) {
           dayDifference += 1;
         }
-        expiresText = "shared_link_expires_days"
-            .tr(namedArgs: {'count': dayDifference.toString()});
+        expiresText = "shared_link_expires_days".tr(namedArgs: {'count': dayDifference.toString()});
       } else if (difference.inHours > 0) {
-        expiresText = "shared_link_expires_hours"
-            .tr(namedArgs: {'count': difference.inHours.toString()});
+        expiresText = "shared_link_expires_hours".tr(namedArgs: {'count': difference.inHours.toString()});
       } else if (difference.inMinutes > 0) {
-        expiresText = "shared_link_expires_minutes"
-            .tr(namedArgs: {'count': difference.inMinutes.toString()});
+        expiresText = "shared_link_expires_minutes".tr(namedArgs: {'count': difference.inMinutes.toString()});
       } else if (difference.inSeconds > 0) {
-        expiresText = "shared_link_expires_seconds"
-            .tr(namedArgs: {'count': difference.inSeconds.toString()});
+        expiresText = "shared_link_expires_seconds".tr(namedArgs: {'count': difference.inSeconds.toString()});
       }
     }
     return Text(
@@ -68,17 +64,14 @@ class SharedLinkItem extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final colorScheme = context.colorScheme;
     final isDarkMode = colorScheme.brightness == Brightness.dark;
-    final thumbnailUrl = sharedLink.thumbAssetId != null
-        ? getThumbnailUrlForRemoteId(sharedLink.thumbAssetId!)
-        : null;
+    final thumbnailUrl = sharedLink.thumbAssetId != null ? getThumbnailUrlForRemoteId(sharedLink.thumbAssetId!) : null;
     final imageSize = math.min(context.width / 4, 100.0);
 
     void copyShareLinkToClipboard() {
       final externalDomain = ref.read(
         serverInfoProvider.select((s) => s.serverConfig.externalDomain),
       );
-      var serverUrl =
-          externalDomain.isNotEmpty ? externalDomain : getServerUrl();
+      var serverUrl = externalDomain.isNotEmpty ? externalDomain : getServerUrl();
       if (serverUrl != null && !serverUrl.endsWith('/')) {
         serverUrl += '/';
       }
@@ -116,9 +109,7 @@ class SharedLinkItem extends ConsumerWidget {
           return ConfirmDialog(
             title: "delete_shared_link_dialog_title",
             content: "confirm_delete_shared_link",
-            onOk: () => ref
-                .read(sharedLinksStateProvider.notifier)
-                .deleteLink(sharedLink.id),
+            onOk: () => ref.read(sharedLinksStateProvider.notifier).deleteLink(sharedLink.id),
           );
         },
       );
@@ -181,8 +172,7 @@ class SharedLinkItem extends ConsumerWidget {
         children: [
           if (sharedLink.allowUpload) buildInfoChip("upload".tr()),
           if (sharedLink.allowDownload) buildInfoChip("download".tr()),
-          if (sharedLink.showMetadata)
-            buildInfoChip("shared_link_info_chip_metadata".tr()),
+          if (sharedLink.showMetadata) buildInfoChip("shared_link_info_chip_metadata".tr()),
         ],
       );
     }
@@ -197,8 +187,7 @@ class SharedLinkItem extends ConsumerWidget {
             iconSize: actionIconSize,
             icon: const Icon(Icons.delete_outline),
             style: const ButtonStyle(
-              tapTargetSize:
-                  MaterialTapTargetSize.shrinkWrap, // the '2023' part
+              tapTargetSize: MaterialTapTargetSize.shrinkWrap, // the '2023' part
             ),
             onPressed: deleteShareLink,
           ),
@@ -208,11 +197,9 @@ class SharedLinkItem extends ConsumerWidget {
             iconSize: actionIconSize,
             icon: const Icon(Icons.edit_outlined),
             style: const ButtonStyle(
-              tapTargetSize:
-                  MaterialTapTargetSize.shrinkWrap, // the '2023' part
+              tapTargetSize: MaterialTapTargetSize.shrinkWrap, // the '2023' part
             ),
-            onPressed: () => context
-                .pushRoute(SharedLinkEditRoute(existingLink: sharedLink)),
+            onPressed: () => context.pushRoute(SharedLinkEditRoute(existingLink: sharedLink)),
           ),
           IconButton(
             splashRadius: 25,
@@ -220,8 +207,7 @@ class SharedLinkItem extends ConsumerWidget {
             iconSize: actionIconSize,
             icon: const Icon(Icons.copy_outlined),
             style: const ButtonStyle(
-              tapTargetSize:
-                  MaterialTapTargetSize.shrinkWrap, // the '2023' part
+              tapTargetSize: MaterialTapTargetSize.shrinkWrap, // the '2023' part
             ),
             onPressed: copyShareLinkToClipboard,
           ),
diff --git a/mobile/test/domain/services/hash_service_test.dart b/mobile/test/domain/services/hash_service_test.dart
index b2ab803ac2..262766662b 100644
--- a/mobile/test/domain/services/hash_service_test.dart
+++ b/mobile/test/domain/services/hash_service_test.dart
@@ -50,8 +50,7 @@ void main() {
       when(() => mockAlbumRepo.getAll(sortBy: sortBy)).thenAnswer(
         (_) async => [LocalAlbumStub.recent.copyWith(assetCount: 0)],
       );
-      when(() => mockAlbumRepo.getAssetsToHash(LocalAlbumStub.recent.id))
-          .thenAnswer((_) async => []);
+      when(() => mockAlbumRepo.getAssetsToHash(LocalAlbumStub.recent.id)).thenAnswer((_) async => []);
 
       await sut.hashAssets();
 
@@ -64,12 +63,9 @@ void main() {
     test('skips assets without files', () async {
       final album = LocalAlbumStub.recent;
       final asset = LocalAssetStub.image1;
-      when(() => mockAlbumRepo.getAll(sortBy: sortBy))
-          .thenAnswer((_) async => [album]);
-      when(() => mockAlbumRepo.getAssetsToHash(album.id))
-          .thenAnswer((_) async => [asset]);
-      when(() => mockStorageRepo.getFileForAsset(asset.id))
-          .thenAnswer((_) async => null);
+      when(() => mockAlbumRepo.getAll(sortBy: sortBy)).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+      when(() => mockStorageRepo.getFileForAsset(asset.id)).thenAnswer((_) async => null);
 
       await sut.hashAssets();
 
@@ -85,12 +81,9 @@ void main() {
       when(() => mockFile.length()).thenAnswer((_) async => 1000);
       when(() => mockFile.path).thenReturn('image-path');
 
-      when(() => mockAlbumRepo.getAll(sortBy: sortBy))
-          .thenAnswer((_) async => [album]);
-      when(() => mockAlbumRepo.getAssetsToHash(album.id))
-          .thenAnswer((_) async => [asset]);
-      when(() => mockStorageRepo.getFileForAsset(asset.id))
-          .thenAnswer((_) async => mockFile);
+      when(() => mockAlbumRepo.getAll(sortBy: sortBy)).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+      when(() => mockStorageRepo.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
       when(() => mockNativeApi.hashPaths(['image-path'])).thenAnswer(
         (_) async => [hash],
       );
@@ -98,9 +91,7 @@ void main() {
       await sut.hashAssets();
 
       verify(() => mockNativeApi.hashPaths(['image-path'])).called(1);
-      final captured = verify(() => mockAssetRepo.updateHashes(captureAny()))
-          .captured
-          .first as List<LocalAsset>;
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
       expect(captured.length, 1);
       expect(captured[0].checksum, base64.encode(hash));
     });
@@ -112,21 +103,15 @@ void main() {
       when(() => mockFile.length()).thenAnswer((_) async => 1000);
       when(() => mockFile.path).thenReturn('image-path');
 
-      when(() => mockAlbumRepo.getAll(sortBy: sortBy))
-          .thenAnswer((_) async => [album]);
-      when(() => mockAlbumRepo.getAssetsToHash(album.id))
-          .thenAnswer((_) async => [asset]);
-      when(() => mockStorageRepo.getFileForAsset(asset.id))
-          .thenAnswer((_) async => mockFile);
-      when(() => mockNativeApi.hashPaths(['image-path']))
-          .thenAnswer((_) async => [null]);
+      when(() => mockAlbumRepo.getAll(sortBy: sortBy)).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+      when(() => mockStorageRepo.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
+      when(() => mockNativeApi.hashPaths(['image-path'])).thenAnswer((_) async => [null]);
       when(() => mockAssetRepo.updateHashes(any())).thenAnswer((_) async => {});
 
       await sut.hashAssets();
 
-      final captured = verify(() => mockAssetRepo.updateHashes(captureAny()))
-          .captured
-          .first as List<LocalAsset>;
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
       expect(captured.length, 0);
     });
 
@@ -137,23 +122,17 @@ void main() {
       when(() => mockFile.length()).thenAnswer((_) async => 1000);
       when(() => mockFile.path).thenReturn('image-path');
 
-      when(() => mockAlbumRepo.getAll(sortBy: sortBy))
-          .thenAnswer((_) async => [album]);
-      when(() => mockAlbumRepo.getAssetsToHash(album.id))
-          .thenAnswer((_) async => [asset]);
-      when(() => mockStorageRepo.getFileForAsset(asset.id))
-          .thenAnswer((_) async => mockFile);
+      when(() => mockAlbumRepo.getAll(sortBy: sortBy)).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+      when(() => mockStorageRepo.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
 
       final invalidHash = Uint8List.fromList([1, 2, 3]);
-      when(() => mockNativeApi.hashPaths(['image-path']))
-          .thenAnswer((_) async => [invalidHash]);
+      when(() => mockNativeApi.hashPaths(['image-path'])).thenAnswer((_) async => [invalidHash]);
       when(() => mockAssetRepo.updateHashes(any())).thenAnswer((_) async => {});
 
       await sut.hashAssets();
 
-      final captured = verify(() => mockAssetRepo.updateHashes(captureAny()))
-          .captured
-          .first as List<LocalAsset>;
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
       expect(captured.length, 0);
     });
 
@@ -176,18 +155,13 @@ void main() {
       when(() => mockFile2.length()).thenAnswer((_) async => 100);
       when(() => mockFile2.path).thenReturn('path-2');
 
-      when(() => mockAlbumRepo.getAll(sortBy: sortBy))
-          .thenAnswer((_) async => [album]);
-      when(() => mockAlbumRepo.getAssetsToHash(album.id))
-          .thenAnswer((_) async => [asset1, asset2]);
-      when(() => mockStorageRepo.getFileForAsset(asset1.id))
-          .thenAnswer((_) async => mockFile1);
-      when(() => mockStorageRepo.getFileForAsset(asset2.id))
-          .thenAnswer((_) async => mockFile2);
+      when(() => mockAlbumRepo.getAll(sortBy: sortBy)).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2]);
+      when(() => mockStorageRepo.getFileForAsset(asset1.id)).thenAnswer((_) async => mockFile1);
+      when(() => mockStorageRepo.getFileForAsset(asset2.id)).thenAnswer((_) async => mockFile2);
 
       final hash = Uint8List.fromList(List.generate(20, (i) => i));
-      when(() => mockNativeApi.hashPaths(any()))
-          .thenAnswer((_) async => [hash]);
+      when(() => mockNativeApi.hashPaths(any())).thenAnswer((_) async => [hash]);
       when(() => mockAssetRepo.updateHashes(any())).thenAnswer((_) async => {});
 
       await sut.hashAssets();
@@ -216,18 +190,13 @@ void main() {
       when(() => mockFile2.length()).thenAnswer((_) async => 100);
       when(() => mockFile2.path).thenReturn('path-2');
 
-      when(() => mockAlbumRepo.getAll(sortBy: sortBy))
-          .thenAnswer((_) async => [album]);
-      when(() => mockAlbumRepo.getAssetsToHash(album.id))
-          .thenAnswer((_) async => [asset1, asset2]);
-      when(() => mockStorageRepo.getFileForAsset(asset1.id))
-          .thenAnswer((_) async => mockFile1);
-      when(() => mockStorageRepo.getFileForAsset(asset2.id))
-          .thenAnswer((_) async => mockFile2);
+      when(() => mockAlbumRepo.getAll(sortBy: sortBy)).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2]);
+      when(() => mockStorageRepo.getFileForAsset(asset1.id)).thenAnswer((_) async => mockFile1);
+      when(() => mockStorageRepo.getFileForAsset(asset2.id)).thenAnswer((_) async => mockFile2);
 
       final hash = Uint8List.fromList(List.generate(20, (i) => i));
-      when(() => mockNativeApi.hashPaths(any()))
-          .thenAnswer((_) async => [hash]);
+      when(() => mockNativeApi.hashPaths(any())).thenAnswer((_) async => [hash]);
       when(() => mockAssetRepo.updateHashes(any())).thenAnswer((_) async => {});
 
       await sut.hashAssets();
@@ -248,25 +217,18 @@ void main() {
       when(() => mockFile2.length()).thenAnswer((_) async => 100);
       when(() => mockFile2.path).thenReturn('path-2');
 
-      when(() => mockAlbumRepo.getAll(sortBy: sortBy))
-          .thenAnswer((_) async => [album]);
-      when(() => mockAlbumRepo.getAssetsToHash(album.id))
-          .thenAnswer((_) async => [asset1, asset2]);
-      when(() => mockStorageRepo.getFileForAsset(asset1.id))
-          .thenAnswer((_) async => mockFile1);
-      when(() => mockStorageRepo.getFileForAsset(asset2.id))
-          .thenAnswer((_) async => mockFile2);
+      when(() => mockAlbumRepo.getAll(sortBy: sortBy)).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2]);
+      when(() => mockStorageRepo.getFileForAsset(asset1.id)).thenAnswer((_) async => mockFile1);
+      when(() => mockStorageRepo.getFileForAsset(asset2.id)).thenAnswer((_) async => mockFile2);
 
       final validHash = Uint8List.fromList(List.generate(20, (i) => i));
-      when(() => mockNativeApi.hashPaths(['path-1', 'path-2']))
-          .thenAnswer((_) async => [validHash, null]);
+      when(() => mockNativeApi.hashPaths(['path-1', 'path-2'])).thenAnswer((_) async => [validHash, null]);
       when(() => mockAssetRepo.updateHashes(any())).thenAnswer((_) async => {});
 
       await sut.hashAssets();
 
-      final captured = verify(() => mockAssetRepo.updateHashes(captureAny()))
-          .captured
-          .first as List<LocalAsset>;
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
       expect(captured.length, 1);
       expect(captured.first.id, asset1.id);
     });
diff --git a/mobile/test/domain/services/log_service_test.dart b/mobile/test/domain/services/log_service_test.dart
index 3efa717f97..ad35a018c8 100644
--- a/mobile/test/domain/services/log_service_test.dart
+++ b/mobile/test/domain/services/log_service_test.dart
@@ -37,10 +37,8 @@ void main() {
 
     registerFallbackValue(_kInfoLog);
 
-    when(() => mockLogRepo.truncate(limit: any(named: 'limit')))
-        .thenAnswer((_) async => {});
-    when(() => mockStoreRepo.tryGet<int>(StoreKey.logLevel))
-        .thenAnswer((_) async => LogLevel.fine.index);
+    when(() => mockLogRepo.truncate(limit: any(named: 'limit'))).thenAnswer((_) async => {});
+    when(() => mockStoreRepo.tryGet<int>(StoreKey.logLevel)).thenAnswer((_) async => LogLevel.fine.index);
     when(() => mockLogRepo.getAll()).thenAnswer((_) async => []);
     when(() => mockLogRepo.insert(any())).thenAnswer((_) async => true);
     when(() => mockLogRepo.insertAll(any())).thenAnswer((_) async => true);
@@ -57,10 +55,7 @@ void main() {
 
   group("Log Service Init:", () {
     test('Truncates the existing logs on init', () {
-      final limit =
-          verify(() => mockLogRepo.truncate(limit: captureAny(named: 'limit')))
-              .captured
-              .firstOrNull as int?;
+      final limit = verify(() => mockLogRepo.truncate(limit: captureAny(named: 'limit'))).captured.firstOrNull as int?;
       expect(limit, kLogTruncateLimit);
     });
 
@@ -72,8 +67,7 @@ void main() {
 
   group("Log Service Set Level:", () {
     setUp(() async {
-      when(() => mockStoreRepo.insert<int>(StoreKey.logLevel, any()))
-          .thenAnswer((_) async => true);
+      when(() => mockStoreRepo.insert<int>(StoreKey.logLevel, any())).thenAnswer((_) async => true);
       await sut.setLogLevel(LogLevel.shout);
     });
 
diff --git a/mobile/test/domain/services/store_service_test.dart b/mobile/test/domain/services/store_service_test.dart
index 7eab532ef3..c436a05454 100644
--- a/mobile/test/domain/services/store_service_test.dart
+++ b/mobile/test/domain/services/store_service_test.dart
@@ -86,8 +86,7 @@ void main() {
 
   group('Store Service put:', () {
     setUp(() {
-      when(() => mockStoreRepo.insert<String>(any<StoreKey<String>>(), any()))
-          .thenAnswer((_) async => true);
+      when(() => mockStoreRepo.insert<String>(any<StoreKey<String>>(), any())).thenAnswer((_) async => true);
     });
 
     test('Skip insert when value is not modified', () async {
@@ -101,8 +100,7 @@ void main() {
       final newAccessToken = _kAccessToken.toUpperCase();
       await sut.put(StoreKey.accessToken, newAccessToken);
       verify(
-        () =>
-            mockStoreRepo.insert<String>(StoreKey.accessToken, newAccessToken),
+        () => mockStoreRepo.insert<String>(StoreKey.accessToken, newAccessToken),
       ).called(1);
       expect(sut.tryGet(StoreKey.accessToken), newAccessToken);
     });
@@ -113,8 +111,7 @@ void main() {
 
     setUp(() {
       valueController = StreamController<String?>.broadcast();
-      when(() => mockStoreRepo.watch<String>(any<StoreKey<String>>()))
-          .thenAnswer((_) => valueController.stream);
+      when(() => mockStoreRepo.watch<String>(any<StoreKey<String>>())).thenAnswer((_) => valueController.stream);
     });
 
     tearDown(() async {
@@ -143,14 +140,12 @@ void main() {
 
   group('Store Service delete:', () {
     setUp(() {
-      when(() => mockStoreRepo.delete<String>(any<StoreKey<String>>()))
-          .thenAnswer((_) async => true);
+      when(() => mockStoreRepo.delete<String>(any<StoreKey<String>>())).thenAnswer((_) async => true);
     });
 
     test('Removes the value from the DB', () async {
       await sut.delete(StoreKey.accessToken);
-      verify(() => mockStoreRepo.delete<String>(StoreKey.accessToken))
-          .called(1);
+      verify(() => mockStoreRepo.delete<String>(StoreKey.accessToken)).called(1);
     });
 
     test('Removes the value from the cache', () async {
diff --git a/mobile/test/domain/services/sync_stream_service_test.dart b/mobile/test/domain/services/sync_stream_service_test.dart
index f9d9c4fbe4..49ac4467d0 100644
--- a/mobile/test/domain/services/sync_stream_service_test.dart
+++ b/mobile/test/domain/services/sync_stream_service_test.dart
@@ -42,53 +42,41 @@ void main() {
 
     when(() => mockAbortCallbackWrapper()).thenReturn(false);
 
-    when(() => mockSyncApiRepo.streamChanges(any()))
-        .thenAnswer((invocation) async {
+    when(() => mockSyncApiRepo.streamChanges(any())).thenAnswer((invocation) async {
       handleEventsCallback = invocation.positionalArguments.first;
     });
 
     when(() => mockSyncApiRepo.ack(any())).thenAnswer((_) async => {});
 
-    when(() => mockSyncStreamRepo.updateUsersV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.deleteUsersV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.updatePartnerV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.deletePartnerV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.updateAssetsV1(any()))
-        .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updateUsersV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deleteUsersV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updatePartnerV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deletePartnerV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updateAssetsV1(any())).thenAnswer(successHandler);
     when(
       () => mockSyncStreamRepo.updateAssetsV1(
         any(),
         debugLabel: any(named: 'debugLabel'),
       ),
     ).thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.deleteAssetsV1(any()))
-        .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deleteAssetsV1(any())).thenAnswer(successHandler);
     when(
       () => mockSyncStreamRepo.deleteAssetsV1(
         any(),
         debugLabel: any(named: 'debugLabel'),
       ),
     ).thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.updateAssetsExifV1(any()))
-        .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updateAssetsExifV1(any())).thenAnswer(successHandler);
     when(
       () => mockSyncStreamRepo.updateAssetsExifV1(
         any(),
         debugLabel: any(named: 'debugLabel'),
       ),
     ).thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.updateMemoriesV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.deleteMemoriesV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.updateMemoryAssetsV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.deleteMemoryAssetsV1(any()))
-        .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updateMemoriesV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deleteMemoriesV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updateMemoryAssetsV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deleteMemoryAssetsV1(any())).thenAnswer(successHandler);
     when(
       () => mockSyncStreamRepo.updateStacksV1(
         any(),
@@ -101,18 +89,12 @@ void main() {
         debugLabel: any(named: 'debugLabel'),
       ),
     ).thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.updateUserMetadatasV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.deleteUserMetadatasV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.updatePeopleV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.deletePeopleV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.updateAssetFacesV1(any()))
-        .thenAnswer(successHandler);
-    when(() => mockSyncStreamRepo.deleteAssetFacesV1(any()))
-        .thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updateUserMetadatasV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deleteUserMetadatasV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updatePeopleV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deletePeopleV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.updateAssetFacesV1(any())).thenAnswer(successHandler);
+    when(() => mockSyncStreamRepo.deleteAssetFacesV1(any())).thenAnswer(successHandler);
 
     sut = SyncStreamService(
       syncApiRepository: mockSyncApiRepo,
@@ -221,8 +203,7 @@ void main() {
 
         final processingCompleter = Completer<void>();
         bool handler1Started = false;
-        when(() => mockSyncStreamRepo.deleteUsersV1(any()))
-            .thenAnswer((_) async {
+        when(() => mockSyncStreamRepo.deleteUsersV1(any())).thenAnswer((_) async {
           handler1Started = true;
           return processingCompleter.future;
         });
@@ -241,8 +222,7 @@ void main() {
           SyncStreamStub.partnerDeleteV1,
         ];
 
-        final processingFuture =
-            handleEventsCallback(events, mockAbortCallbackWrapper.call);
+        final processingFuture = handleEventsCallback(events, mockAbortCallbackWrapper.call);
         await pumpEventQueue();
 
         expect(handler1Started, isTrue);
@@ -307,8 +287,7 @@ void main() {
     });
 
     test("handles memory sync failure gracefully", () async {
-      when(() => mockSyncStreamRepo.updateMemoriesV1(any()))
-          .thenThrow(Exception("Memory sync failed"));
+      when(() => mockSyncStreamRepo.updateMemoriesV1(any())).thenThrow(Exception("Memory sync failed"));
 
       final events = [
         SyncStreamStub.memoryV1,
@@ -339,8 +318,7 @@ void main() {
       verify(() => mockSyncApiRepo.ack(["6"])).called(1);
     });
 
-    test("processes memory create/update events with correct data types",
-        () async {
+    test("processes memory create/update events with correct data types", () async {
       final events = [SyncStreamStub.memoryV1];
 
       await simulateEvents(events);
diff --git a/mobile/test/domain/services/user_service_test.dart b/mobile/test/domain/services/user_service_test.dart
index 5cce565477..b26c243430 100644
--- a/mobile/test/domain/services/user_service_test.dart
+++ b/mobile/test/domain/services/user_service_test.dart
@@ -29,10 +29,8 @@ void main() {
     );
 
     registerFallbackValue(UserStub.admin);
-    when(() => mockStoreService.get(StoreKey.currentUser))
-        .thenReturn(UserStub.admin);
-    when(() => mockStoreService.tryGet(StoreKey.currentUser))
-        .thenReturn(UserStub.admin);
+    when(() => mockStoreService.get(StoreKey.currentUser)).thenReturn(UserStub.admin);
+    when(() => mockStoreService.tryGet(StoreKey.currentUser)).thenReturn(UserStub.admin);
   });
 
   group('getMyUser', () {
@@ -42,8 +40,7 @@ void main() {
     });
 
     test('should handle user not found scenario', () {
-      when(() => mockStoreService.get(StoreKey.currentUser))
-          .thenThrow(Exception('User not found'));
+      when(() => mockStoreService.get(StoreKey.currentUser)).thenThrow(Exception('User not found'));
 
       expect(() => sut.getMyUser(), throwsA(isA<Exception>()));
     });
@@ -56,8 +53,7 @@ void main() {
     });
 
     test('should return null if user not found', () {
-      when(() => mockStoreService.tryGet(StoreKey.currentUser))
-          .thenReturn(null);
+      when(() => mockStoreService.tryGet(StoreKey.currentUser)).thenReturn(null);
       final result = sut.tryGetMyUser();
       expect(result, isNull);
     });
@@ -65,15 +61,13 @@ void main() {
 
   group('watchMyUser', () {
     test('should return user stream from store', () {
-      when(() => mockStoreService.watch(StoreKey.currentUser))
-          .thenAnswer((_) => Stream.value(UserStub.admin));
+      when(() => mockStoreService.watch(StoreKey.currentUser)).thenAnswer((_) => Stream.value(UserStub.admin));
       final result = sut.watchMyUser();
       expect(result, emits(UserStub.admin));
     });
 
     test('should return an empty stream if user not found', () {
-      when(() => mockStoreService.watch(StoreKey.currentUser))
-          .thenAnswer((_) => const Stream.empty());
+      when(() => mockStoreService.watch(StoreKey.currentUser)).thenAnswer((_) => const Stream.empty());
       final result = sut.watchMyUser();
       expect(result, emitsInOrder([]));
     });
@@ -81,16 +75,12 @@ void main() {
 
   group('refreshMyUser', () {
     test('should return user from api and store it', () async {
-      when(() => mockUserApiRepo.getMyUser())
-          .thenAnswer((_) async => UserStub.admin);
-      when(() => mockStoreService.put(StoreKey.currentUser, UserStub.admin))
-          .thenAnswer((_) async => true);
-      when(() => mockUserRepo.update(UserStub.admin))
-          .thenAnswer((_) async => UserStub.admin);
+      when(() => mockUserApiRepo.getMyUser()).thenAnswer((_) async => UserStub.admin);
+      when(() => mockStoreService.put(StoreKey.currentUser, UserStub.admin)).thenAnswer((_) async => true);
+      when(() => mockUserRepo.update(UserStub.admin)).thenAnswer((_) async => UserStub.admin);
 
       final result = await sut.refreshMyUser();
-      verify(() => mockStoreService.put(StoreKey.currentUser, UserStub.admin))
-          .called(1);
+      verify(() => mockStoreService.put(StoreKey.currentUser, UserStub.admin)).called(1);
       verify(() => mockUserRepo.update(UserStub.admin)).called(1);
       expect(result, UserStub.admin);
     });
@@ -110,8 +100,7 @@ void main() {
   group('createProfileImage', () {
     test('should return profile image path', () async {
       const profileImagePath = 'profile.jpg';
-      final updatedUser =
-          UserStub.admin.copyWith(profileImagePath: profileImagePath);
+      final updatedUser = UserStub.admin.copyWith(profileImagePath: profileImagePath);
 
       when(
         () => mockUserApiRepo.createProfileImage(
@@ -119,24 +108,19 @@ void main() {
           data: Uint8List(0),
         ),
       ).thenAnswer((_) async => profileImagePath);
-      when(() => mockStoreService.put(StoreKey.currentUser, updatedUser))
-          .thenAnswer((_) async => true);
-      when(() => mockUserRepo.update(updatedUser))
-          .thenAnswer((_) async => UserStub.admin);
+      when(() => mockStoreService.put(StoreKey.currentUser, updatedUser)).thenAnswer((_) async => true);
+      when(() => mockUserRepo.update(updatedUser)).thenAnswer((_) async => UserStub.admin);
 
-      final result =
-          await sut.createProfileImage(profileImagePath, Uint8List(0));
+      final result = await sut.createProfileImage(profileImagePath, Uint8List(0));
 
-      verify(() => mockStoreService.put(StoreKey.currentUser, updatedUser))
-          .called(1);
+      verify(() => mockStoreService.put(StoreKey.currentUser, updatedUser)).called(1);
       verify(() => mockUserRepo.update(updatedUser)).called(1);
       expect(result, profileImagePath);
     });
 
     test('should return null if profile image creation fails', () async {
       const profileImagePath = 'profile.jpg';
-      final updatedUser =
-          UserStub.admin.copyWith(profileImagePath: profileImagePath);
+      final updatedUser = UserStub.admin.copyWith(profileImagePath: profileImagePath);
 
       when(
         () => mockUserApiRepo.createProfileImage(
@@ -145,8 +129,7 @@ void main() {
         ),
       ).thenThrow(Exception('Failed to create profile image'));
 
-      final result =
-          await sut.createProfileImage(profileImagePath, Uint8List(0));
+      final result = await sut.createProfileImage(profileImagePath, Uint8List(0));
       verifyNever(
         () => mockStoreService.put(StoreKey.currentUser, updatedUser),
       );
diff --git a/mobile/test/drift/main/generated/schema_v1.dart b/mobile/test/drift/main/generated/schema_v1.dart
index d7b88ea3cf..75f3bdee4c 100644
--- a/mobile/test/drift/main/generated/schema_v1.dart
+++ b/mobile/test/drift/main/generated/schema_v1.dart
@@ -8,49 +8,30 @@ class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
   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<bool> isAdmin = GeneratedColumn<bool>(
-      'is_admin', aliasedName, false,
+  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<bool> isAdmin = GeneratedColumn<bool>('is_admin', aliasedName, false,
       type: DriftSqlType.bool,
       requiredDuringInsert: false,
-      defaultConstraints:
-          GeneratedColumn.constraintIsAlways('CHECK ("is_admin" IN (0, 1))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_admin" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<String> email = GeneratedColumn<String>(
-      'email', aliasedName, false,
-      type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>(
-      'profile_image_path', aliasedName, true,
+  late final GeneratedColumn<String> email =
+      GeneratedColumn<String>('email', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true);
+  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>('profile_image_path', aliasedName, true,
       type: DriftSqlType.string, requiredDuringInsert: false);
-  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
-      'updated_at', aliasedName, false,
+  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> quotaSizeInBytes = GeneratedColumn<int>(
-      'quota_size_in_bytes', aliasedName, true,
+  late final GeneratedColumn<int> quotaSizeInBytes = GeneratedColumn<int>('quota_size_in_bytes', aliasedName, true,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  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<int> quotaUsageInBytes = GeneratedColumn<int>('quota_usage_in_bytes', aliasedName, false,
+      type: DriftSqlType.int, requiredDuringInsert: false, defaultValue: const CustomExpression('0'));
   @override
-  List<GeneratedColumn> get $columns => [
-        id,
-        name,
-        isAdmin,
-        email,
-        profileImagePath,
-        updatedAt,
-        quotaSizeInBytes,
-        quotaUsageInBytes
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, name, isAdmin, email, profileImagePath, updatedAt, quotaSizeInBytes, quotaUsageInBytes];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -62,22 +43,17 @@ class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
   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'])!,
-      isAdmin: attachedDatabase.typeMapping
-          .read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
-      email: attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}email'])!,
-      profileImagePath: attachedDatabase.typeMapping.read(
-          DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
-      updatedAt: attachedDatabase.typeMapping
-          .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
-      quotaSizeInBytes: attachedDatabase.typeMapping.read(
-          DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
-      quotaUsageInBytes: attachedDatabase.typeMapping.read(
-          DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
+      id: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}id'])!,
+      name: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}name'])!,
+      isAdmin: attachedDatabase.typeMapping.read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
+      email: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}email'])!,
+      profileImagePath:
+          attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
+      updatedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      quotaSizeInBytes:
+          attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
+      quotaUsageInBytes:
+          attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
     );
   }
 
@@ -128,8 +104,7 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
     return map;
   }
 
-  factory UserEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory UserEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return UserEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -171,13 +146,9 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
         name: name ?? this.name,
         isAdmin: isAdmin ?? this.isAdmin,
         email: email ?? this.email,
-        profileImagePath: profileImagePath.present
-            ? profileImagePath.value
-            : this.profileImagePath,
+        profileImagePath: profileImagePath.present ? profileImagePath.value : this.profileImagePath,
         updatedAt: updatedAt ?? this.updatedAt,
-        quotaSizeInBytes: quotaSizeInBytes.present
-            ? quotaSizeInBytes.value
-            : this.quotaSizeInBytes,
+        quotaSizeInBytes: quotaSizeInBytes.present ? quotaSizeInBytes.value : this.quotaSizeInBytes,
         quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
       );
   UserEntityData copyWithCompanion(UserEntityCompanion data) {
@@ -186,16 +157,10 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
       name: data.name.present ? data.name.value : this.name,
       isAdmin: data.isAdmin.present ? data.isAdmin.value : this.isAdmin,
       email: data.email.present ? data.email.value : this.email,
-      profileImagePath: data.profileImagePath.present
-          ? data.profileImagePath.value
-          : this.profileImagePath,
+      profileImagePath: data.profileImagePath.present ? data.profileImagePath.value : this.profileImagePath,
       updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
-      quotaSizeInBytes: data.quotaSizeInBytes.present
-          ? data.quotaSizeInBytes.value
-          : this.quotaSizeInBytes,
-      quotaUsageInBytes: data.quotaUsageInBytes.present
-          ? data.quotaUsageInBytes.value
-          : this.quotaUsageInBytes,
+      quotaSizeInBytes: data.quotaSizeInBytes.present ? data.quotaSizeInBytes.value : this.quotaSizeInBytes,
+      quotaUsageInBytes: data.quotaUsageInBytes.present ? data.quotaUsageInBytes.value : this.quotaUsageInBytes,
     );
   }
 
@@ -215,8 +180,8 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
   }
 
   @override
-  int get hashCode => Object.hash(id, name, isAdmin, email, profileImagePath,
-      updatedAt, quotaSizeInBytes, quotaUsageInBytes);
+  int get hashCode =>
+      Object.hash(id, name, isAdmin, email, profileImagePath, updatedAt, quotaSizeInBytes, quotaUsageInBytes);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -351,74 +316,55 @@ class UserEntityCompanion extends UpdateCompanion<UserEntityData> {
   }
 }
 
-class RemoteAssetEntity extends Table
-    with TableInfo<RemoteAssetEntity, RemoteAssetEntityData> {
+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,
+  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,
+  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,
+  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<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,
+  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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_favorite" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<String> ownerId = GeneratedColumn<String>(
-      'owner_id', aliasedName, 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<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,
+      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<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);
   @override
   List<GeneratedColumn> get $columns => [
         name,
@@ -450,40 +396,26 @@ class RemoteAssetEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -498,8 +430,7 @@ class RemoteAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAssetEntityData extends DataClass
-    implements Insertable<RemoteAssetEntityData> {
+class RemoteAssetEntityData extends DataClass implements Insertable<RemoteAssetEntityData> {
   final String name;
   final int type;
   final DateTime createdAt;
@@ -574,8 +505,7 @@ class RemoteAssetEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAssetEntityData(
       name: serializer.fromJson<String>(json['name']),
@@ -646,20 +576,15 @@ class RemoteAssetEntityData extends DataClass
         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,
+        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,
+        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,
+        livePhotoVideoId: livePhotoVideoId.present ? livePhotoVideoId.value : this.livePhotoVideoId,
         visibility: visibility ?? this.visibility,
         stackId: stackId.present ? stackId.value : this.stackId,
       );
@@ -671,24 +596,16 @@ class RemoteAssetEntityData extends DataClass
       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,
+      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,
+      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,
+      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,
+      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,
     );
   }
@@ -718,24 +635,8 @@ class RemoteAssetEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(
-      name,
-      type,
-      createdAt,
-      updatedAt,
-      width,
-      height,
-      durationInSeconds,
-      id,
-      checksum,
-      isFavorite,
-      ownerId,
-      localDateTime,
-      thumbHash,
-      deletedAt,
-      livePhotoVideoId,
-      visibility,
-      stackId);
+  int get hashCode => Object.hash(name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum,
+      isFavorite, ownerId, localDateTime, thumbHash, deletedAt, livePhotoVideoId, visibility, stackId);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -759,8 +660,7 @@ class RemoteAssetEntityData extends DataClass
           other.stackId == this.stackId);
 }
 
-class RemoteAssetEntityCompanion
-    extends UpdateCompanion<RemoteAssetEntityData> {
+class RemoteAssetEntityCompanion extends UpdateCompanion<RemoteAssetEntityData> {
   final Value<String> name;
   final Value<int> type;
   final Value<DateTime> createdAt;
@@ -982,69 +882,43 @@ class RemoteAssetEntityCompanion
   }
 }
 
-class LocalAssetEntity extends Table
-    with TableInfo<LocalAssetEntity, LocalAssetEntityData> {
+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,
+  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,
+  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,
+  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<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,
+  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,
+      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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum, isFavorite, orientation];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -1056,28 +930,18 @@ class LocalAssetEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -1092,8 +956,7 @@ class LocalAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAssetEntityData extends DataClass
-    implements Insertable<LocalAssetEntityData> {
+class LocalAssetEntityData extends DataClass implements Insertable<LocalAssetEntityData> {
   final String name;
   final int type;
   final DateTime createdAt;
@@ -1142,8 +1005,7 @@ class LocalAssetEntityData extends DataClass
     return map;
   }
 
-  factory LocalAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAssetEntityData(
       name: serializer.fromJson<String>(json['name']),
@@ -1196,9 +1058,7 @@ class LocalAssetEntityData extends DataClass
         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,
+        durationInSeconds: durationInSeconds.present ? durationInSeconds.value : this.durationInSeconds,
         id: id ?? this.id,
         checksum: checksum.present ? checksum.value : this.checksum,
         isFavorite: isFavorite ?? this.isFavorite,
@@ -1212,15 +1072,11 @@ class LocalAssetEntityData extends DataClass
       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,
+      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,
+      isFavorite: data.isFavorite.present ? data.isFavorite.value : this.isFavorite,
+      orientation: data.orientation.present ? data.orientation.value : this.orientation,
     );
   }
 
@@ -1243,8 +1099,8 @@ class LocalAssetEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(name, type, createdAt, updatedAt, width,
-      height, durationInSeconds, id, checksum, isFavorite, orientation);
+  int get hashCode => Object.hash(
+      name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum, isFavorite, orientation);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -1420,34 +1276,26 @@ class StackEntity extends Table with TableInfo<StackEntity, StackEntityData> {
   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,
+  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,
+  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,
+  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,
+      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,
-      defaultConstraints: GeneratedColumn.constraintIsAlways(
-          'REFERENCES remote_asset_entity (id)'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES remote_asset_entity (id)'));
   @override
-  List<GeneratedColumn> get $columns =>
-      [id, createdAt, updatedAt, ownerId, primaryAssetId];
+  List<GeneratedColumn> get $columns => [id, createdAt, updatedAt, ownerId, primaryAssetId];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -1459,16 +1307,12 @@ class StackEntity extends Table with TableInfo<StackEntity, StackEntityData> {
   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'])!,
+      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'])!,
     );
   }
 
@@ -1506,8 +1350,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
     return map;
   }
 
-  factory StackEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory StackEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return StackEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -1530,11 +1373,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
   }
 
   StackEntityData copyWith(
-          {String? id,
-          DateTime? createdAt,
-          DateTime? updatedAt,
-          String? ownerId,
-          String? primaryAssetId}) =>
+          {String? id, DateTime? createdAt, DateTime? updatedAt, String? ownerId, String? primaryAssetId}) =>
       StackEntityData(
         id: id ?? this.id,
         createdAt: createdAt ?? this.createdAt,
@@ -1548,9 +1387,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
       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,
+      primaryAssetId: data.primaryAssetId.present ? data.primaryAssetId.value : this.primaryAssetId,
     );
   }
 
@@ -1567,8 +1404,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
   }
 
   @override
-  int get hashCode =>
-      Object.hash(id, createdAt, updatedAt, ownerId, primaryAssetId);
+  int get hashCode => Object.hash(id, createdAt, updatedAt, ownerId, primaryAssetId);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -1667,24 +1503,19 @@ class StackEntityCompanion extends UpdateCompanion<StackEntityData> {
   }
 }
 
-class UserMetadataEntity extends Table
-    with TableInfo<UserMetadataEntity, UserMetadataEntityData> {
+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,
+  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);
+      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
@@ -1698,12 +1529,9 @@ class UserMetadataEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -1718,13 +1546,11 @@ class UserMetadataEntity extends Table
   bool get isStrict => true;
 }
 
-class UserMetadataEntityData extends DataClass
-    implements Insertable<UserMetadataEntityData> {
+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});
+  const UserMetadataEntityData({required this.userId, required this.key, required this.value});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -1734,8 +1560,7 @@ class UserMetadataEntityData extends DataClass
     return map;
   }
 
-  factory UserMetadataEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory UserMetadataEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return UserMetadataEntityData(
       userId: serializer.fromJson<String>(json['userId']),
@@ -1753,9 +1578,7 @@ class UserMetadataEntityData extends DataClass
     };
   }
 
-  UserMetadataEntityData copyWith(
-          {String? userId, int? key, Uint8List? value}) =>
-      UserMetadataEntityData(
+  UserMetadataEntityData copyWith({String? userId, int? key, Uint8List? value}) => UserMetadataEntityData(
         userId: userId ?? this.userId,
         key: key ?? this.key,
         value: value ?? this.value,
@@ -1789,8 +1612,7 @@ class UserMetadataEntityData extends DataClass
           $driftBlobEquality.equals(other.value, this.value));
 }
 
-class UserMetadataEntityCompanion
-    extends UpdateCompanion<UserMetadataEntityData> {
+class UserMetadataEntityCompanion extends UpdateCompanion<UserMetadataEntityData> {
   final Value<String> userId;
   final Value<int> key;
   final Value<Uint8List> value;
@@ -1818,8 +1640,7 @@ class UserMetadataEntityCompanion
     });
   }
 
-  UserMetadataEntityCompanion copyWith(
-      {Value<String>? userId, Value<int>? key, Value<Uint8List>? value}) {
+  UserMetadataEntityCompanion copyWith({Value<String>? userId, Value<int>? key, Value<Uint8List>? value}) {
     return UserMetadataEntityCompanion(
       userId: userId ?? this.userId,
       key: key ?? this.key,
@@ -1853,30 +1674,23 @@ class UserMetadataEntityCompanion
   }
 }
 
-class PartnerEntity extends Table
-    with TableInfo<PartnerEntity, PartnerEntityData> {
+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,
+  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,
+      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,
+      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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("in_timeline" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
   @override
   List<GeneratedColumn> get $columns => [sharedById, sharedWithId, inTimeline];
@@ -1891,12 +1705,9 @@ class PartnerEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -1911,15 +1722,11 @@ class PartnerEntity extends Table
   bool get isStrict => true;
 }
 
-class PartnerEntityData extends DataClass
-    implements Insertable<PartnerEntityData> {
+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});
+  const PartnerEntityData({required this.sharedById, required this.sharedWithId, required this.inTimeline});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -1929,8 +1736,7 @@ class PartnerEntityData extends DataClass
     return map;
   }
 
-  factory PartnerEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory PartnerEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return PartnerEntityData(
       sharedById: serializer.fromJson<String>(json['sharedById']),
@@ -1948,22 +1754,16 @@ class PartnerEntityData extends DataClass
     };
   }
 
-  PartnerEntityData copyWith(
-          {String? sharedById, String? sharedWithId, bool? inTimeline}) =>
-      PartnerEntityData(
+  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,
+      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,
     );
   }
 
@@ -2015,10 +1815,7 @@ class PartnerEntityCompanion extends UpdateCompanion<PartnerEntityData> {
     });
   }
 
-  PartnerEntityCompanion copyWith(
-      {Value<String>? sharedById,
-      Value<String>? sharedWithId,
-      Value<bool>? inTimeline}) {
+  PartnerEntityCompanion copyWith({Value<String>? sharedById, Value<String>? sharedWithId, Value<bool>? inTimeline}) {
     return PartnerEntityCompanion(
       sharedById: sharedById ?? this.sharedById,
       sharedWithId: sharedWithId ?? this.sharedWithId,
@@ -2052,42 +1849,32 @@ class PartnerEntityCompanion extends UpdateCompanion<PartnerEntityData> {
   }
 }
 
-class LocalAlbumEntity extends Table
-    with TableInfo<LocalAlbumEntity, LocalAlbumEntityData> {
+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,
+  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,
+  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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_ios_shared_album" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<bool> marker_ = GeneratedColumn<bool>(
-      'marker', aliasedName, true,
+  late final GeneratedColumn<bool> marker_ = GeneratedColumn<bool>('marker', aliasedName, true,
       type: DriftSqlType.bool,
       requiredDuringInsert: false,
-      defaultConstraints:
-          GeneratedColumn.constraintIsAlways('CHECK ("marker" IN (0, 1))'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("marker" IN (0, 1))'));
   @override
-  List<GeneratedColumn> get $columns =>
-      [id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_];
+  List<GeneratedColumn> get $columns => [id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -2099,18 +1886,13 @@ class LocalAlbumEntity extends Table
   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'])!,
-      marker_: attachedDatabase.typeMapping
-          .read(DriftSqlType.bool, data['${effectivePrefix}marker']),
+      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'])!,
+      marker_: attachedDatabase.typeMapping.read(DriftSqlType.bool, data['${effectivePrefix}marker']),
     );
   }
 
@@ -2125,8 +1907,7 @@ class LocalAlbumEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAlbumEntityData extends DataClass
-    implements Insertable<LocalAlbumEntityData> {
+class LocalAlbumEntityData extends DataClass implements Insertable<LocalAlbumEntityData> {
   final String id;
   final String name;
   final DateTime updatedAt;
@@ -2154,8 +1935,7 @@ class LocalAlbumEntityData extends DataClass
     return map;
   }
 
-  factory LocalAlbumEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAlbumEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAlbumEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -2199,12 +1979,8 @@ class LocalAlbumEntityData extends DataClass
       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,
+      backupSelection: data.backupSelection.present ? data.backupSelection.value : this.backupSelection,
+      isIosSharedAlbum: data.isIosSharedAlbum.present ? data.isIosSharedAlbum.value : this.isIosSharedAlbum,
       marker_: data.marker_.present ? data.marker_.value : this.marker_,
     );
   }
@@ -2223,8 +1999,7 @@ class LocalAlbumEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(
-      id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_);
+  int get hashCode => Object.hash(id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -2335,24 +2110,19 @@ class LocalAlbumEntityCompanion extends UpdateCompanion<LocalAlbumEntityData> {
   }
 }
 
-class LocalAlbumAssetEntity extends Table
-    with TableInfo<LocalAlbumAssetEntity, LocalAlbumAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES local_album_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, albumId];
   @override
@@ -2363,14 +2133,11 @@ class LocalAlbumAssetEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {assetId, albumId};
   @override
-  LocalAlbumAssetEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      albumId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}album_id'])!,
     );
   }
 
@@ -2385,12 +2152,10 @@ class LocalAlbumAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAlbumAssetEntityData extends DataClass
-    implements Insertable<LocalAlbumAssetEntityData> {
+class LocalAlbumAssetEntityData extends DataClass implements Insertable<LocalAlbumAssetEntityData> {
   final String assetId;
   final String albumId;
-  const LocalAlbumAssetEntityData(
-      {required this.assetId, required this.albumId});
+  const LocalAlbumAssetEntityData({required this.assetId, required this.albumId});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -2399,8 +2164,7 @@ class LocalAlbumAssetEntityData extends DataClass
     return map;
   }
 
-  factory LocalAlbumAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAlbumAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAlbumAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -2416,13 +2180,11 @@ class LocalAlbumAssetEntityData extends DataClass
     };
   }
 
-  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
-      LocalAlbumAssetEntityData(
+  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) => LocalAlbumAssetEntityData(
         assetId: assetId ?? this.assetId,
         albumId: albumId ?? this.albumId,
       );
-  LocalAlbumAssetEntityData copyWithCompanion(
-      LocalAlbumAssetEntityCompanion data) {
+  LocalAlbumAssetEntityData copyWithCompanion(LocalAlbumAssetEntityCompanion data) {
     return LocalAlbumAssetEntityData(
       assetId: data.assetId.present ? data.assetId.value : this.assetId,
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
@@ -2443,13 +2205,10 @@ class LocalAlbumAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is LocalAlbumAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.albumId == this.albumId);
+      (other is LocalAlbumAssetEntityData && other.assetId == this.assetId && other.albumId == this.albumId);
 }
 
-class LocalAlbumAssetEntityCompanion
-    extends UpdateCompanion<LocalAlbumAssetEntityData> {
+class LocalAlbumAssetEntityCompanion extends UpdateCompanion<LocalAlbumAssetEntityData> {
   final Value<String> assetId;
   final Value<String> albumId;
   const LocalAlbumAssetEntityCompanion({
@@ -2471,8 +2230,7 @@ class LocalAlbumAssetEntityCompanion
     });
   }
 
-  LocalAlbumAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? albumId}) {
+  LocalAlbumAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? albumId}) {
     return LocalAlbumAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       albumId: albumId ?? this.albumId,
@@ -2501,80 +2259,57 @@ class LocalAlbumAssetEntityCompanion
   }
 }
 
-class RemoteExifEntity extends Table
-    with TableInfo<RemoteExifEntity, RemoteExifEntityData> {
+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,
+  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,
+      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<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,
+  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<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,
+  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 => [
@@ -2612,50 +2347,29 @@ class RemoteExifEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -2670,8 +2384,7 @@ class RemoteExifEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteExifEntityData extends DataClass
-    implements Insertable<RemoteExifEntityData> {
+class RemoteExifEntityData extends DataClass implements Insertable<RemoteExifEntityData> {
   final String assetId;
   final String? city;
   final String? state;
@@ -2787,16 +2500,14 @@ class RemoteExifEntityData extends DataClass
     return map;
   }
 
-  factory RemoteExifEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  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']),
+      dateTimeOriginal: serializer.fromJson<DateTime?>(json['dateTimeOriginal']),
       description: serializer.fromJson<String?>(json['description']),
       height: serializer.fromJson<int?>(json['height']),
       width: serializer.fromJson<int?>(json['width']),
@@ -2873,14 +2584,11 @@ class RemoteExifEntityData extends DataClass
         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,
+        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,
+        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,
@@ -2893,8 +2601,7 @@ class RemoteExifEntityData extends DataClass
         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,
+        projectionType: projectionType.present ? projectionType.value : this.projectionType,
       );
   RemoteExifEntityData copyWithCompanion(RemoteExifEntityCompanion data) {
     return RemoteExifEntityData(
@@ -2902,33 +2609,24 @@ class RemoteExifEntityData extends DataClass
       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,
+      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,
+      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,
+      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,
+      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,
+      projectionType: data.projectionType.present ? data.projectionType.value : this.projectionType,
     );
   }
 
@@ -3286,67 +2984,43 @@ class RemoteExifEntityCompanion extends UpdateCompanion<RemoteExifEntityData> {
   }
 }
 
-class RemoteAlbumEntity extends Table
-    with TableInfo<RemoteAlbumEntity, RemoteAlbumEntityData> {
+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,
+  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,
+  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,
+  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,
+      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,
+      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))'),
+      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);
+  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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, name, description, createdAt, updatedAt, ownerId, thumbnailAssetId, isActivityEnabled, order];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -3358,24 +3032,17 @@ class RemoteAlbumEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -3390,8 +3057,7 @@ class RemoteAlbumEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumEntityData extends DataClass
-    implements Insertable<RemoteAlbumEntityData> {
+class RemoteAlbumEntityData extends DataClass implements Insertable<RemoteAlbumEntityData> {
   final String id;
   final String name;
   final String description;
@@ -3428,8 +3094,7 @@ class RemoteAlbumEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -3476,9 +3141,7 @@ class RemoteAlbumEntityData extends DataClass
         createdAt: createdAt ?? this.createdAt,
         updatedAt: updatedAt ?? this.updatedAt,
         ownerId: ownerId ?? this.ownerId,
-        thumbnailAssetId: thumbnailAssetId.present
-            ? thumbnailAssetId.value
-            : this.thumbnailAssetId,
+        thumbnailAssetId: thumbnailAssetId.present ? thumbnailAssetId.value : this.thumbnailAssetId,
         isActivityEnabled: isActivityEnabled ?? this.isActivityEnabled,
         order: order ?? this.order,
       );
@@ -3486,17 +3149,12 @@ class RemoteAlbumEntityData extends DataClass
     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,
+      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,
+      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,
     );
   }
@@ -3518,8 +3176,8 @@ class RemoteAlbumEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, name, description, createdAt, updatedAt,
-      ownerId, thumbnailAssetId, isActivityEnabled, order);
+  int get hashCode =>
+      Object.hash(id, name, description, createdAt, updatedAt, ownerId, thumbnailAssetId, isActivityEnabled, order);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -3535,8 +3193,7 @@ class RemoteAlbumEntityData extends DataClass
           other.order == this.order);
 }
 
-class RemoteAlbumEntityCompanion
-    extends UpdateCompanion<RemoteAlbumEntityData> {
+class RemoteAlbumEntityCompanion extends UpdateCompanion<RemoteAlbumEntityData> {
   final Value<String> id;
   final Value<String> name;
   final Value<String> description;
@@ -3668,24 +3325,19 @@ class RemoteAlbumEntityCompanion
   }
 }
 
-class RemoteAlbumAssetEntity extends Table
-    with TableInfo<RemoteAlbumAssetEntity, RemoteAlbumAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, albumId];
   @override
@@ -3696,14 +3348,11 @@ class RemoteAlbumAssetEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {assetId, albumId};
   @override
-  RemoteAlbumAssetEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      albumId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}album_id'])!,
     );
   }
 
@@ -3718,12 +3367,10 @@ class RemoteAlbumAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumAssetEntityData extends DataClass
-    implements Insertable<RemoteAlbumAssetEntityData> {
+class RemoteAlbumAssetEntityData extends DataClass implements Insertable<RemoteAlbumAssetEntityData> {
   final String assetId;
   final String albumId;
-  const RemoteAlbumAssetEntityData(
-      {required this.assetId, required this.albumId});
+  const RemoteAlbumAssetEntityData({required this.assetId, required this.albumId});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -3732,8 +3379,7 @@ class RemoteAlbumAssetEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -3749,13 +3395,11 @@ class RemoteAlbumAssetEntityData extends DataClass
     };
   }
 
-  RemoteAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
-      RemoteAlbumAssetEntityData(
+  RemoteAlbumAssetEntityData copyWith({String? assetId, String? albumId}) => RemoteAlbumAssetEntityData(
         assetId: assetId ?? this.assetId,
         albumId: albumId ?? this.albumId,
       );
-  RemoteAlbumAssetEntityData copyWithCompanion(
-      RemoteAlbumAssetEntityCompanion data) {
+  RemoteAlbumAssetEntityData copyWithCompanion(RemoteAlbumAssetEntityCompanion data) {
     return RemoteAlbumAssetEntityData(
       assetId: data.assetId.present ? data.assetId.value : this.assetId,
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
@@ -3776,13 +3420,10 @@ class RemoteAlbumAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is RemoteAlbumAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.albumId == this.albumId);
+      (other is RemoteAlbumAssetEntityData && other.assetId == this.assetId && other.albumId == this.albumId);
 }
 
-class RemoteAlbumAssetEntityCompanion
-    extends UpdateCompanion<RemoteAlbumAssetEntityData> {
+class RemoteAlbumAssetEntityCompanion extends UpdateCompanion<RemoteAlbumAssetEntityData> {
   final Value<String> assetId;
   final Value<String> albumId;
   const RemoteAlbumAssetEntityCompanion({
@@ -3804,8 +3445,7 @@ class RemoteAlbumAssetEntityCompanion
     });
   }
 
-  RemoteAlbumAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? albumId}) {
+  RemoteAlbumAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? albumId}) {
     return RemoteAlbumAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       albumId: albumId ?? this.albumId,
@@ -3834,27 +3474,21 @@ class RemoteAlbumAssetEntityCompanion
   }
 }
 
-class RemoteAlbumUserEntity extends Table
-    with TableInfo<RemoteAlbumUserEntity, RemoteAlbumUserEntityData> {
+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,
+  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,
+      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);
+      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
@@ -3865,16 +3499,12 @@ class RemoteAlbumUserEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {albumId, userId};
   @override
-  RemoteAlbumUserEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      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'])!,
     );
   }
 
@@ -3889,13 +3519,11 @@ class RemoteAlbumUserEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumUserEntityData extends DataClass
-    implements Insertable<RemoteAlbumUserEntityData> {
+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});
+  const RemoteAlbumUserEntityData({required this.albumId, required this.userId, required this.role});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -3905,8 +3533,7 @@ class RemoteAlbumUserEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumUserEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumUserEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumUserEntityData(
       albumId: serializer.fromJson<String>(json['albumId']),
@@ -3924,15 +3551,12 @@ class RemoteAlbumUserEntityData extends DataClass
     };
   }
 
-  RemoteAlbumUserEntityData copyWith(
-          {String? albumId, String? userId, int? role}) =>
-      RemoteAlbumUserEntityData(
+  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) {
+  RemoteAlbumUserEntityData copyWithCompanion(RemoteAlbumUserEntityCompanion data) {
     return RemoteAlbumUserEntityData(
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
       userId: data.userId.present ? data.userId.value : this.userId,
@@ -3961,8 +3585,7 @@ class RemoteAlbumUserEntityData extends DataClass
           other.role == this.role);
 }
 
-class RemoteAlbumUserEntityCompanion
-    extends UpdateCompanion<RemoteAlbumUserEntityData> {
+class RemoteAlbumUserEntityCompanion extends UpdateCompanion<RemoteAlbumUserEntityData> {
   final Value<String> albumId;
   final Value<String> userId;
   final Value<int> role;
@@ -3990,8 +3613,7 @@ class RemoteAlbumUserEntityCompanion
     });
   }
 
-  RemoteAlbumUserEntityCompanion copyWith(
-      {Value<String>? albumId, Value<String>? userId, Value<int>? role}) {
+  RemoteAlbumUserEntityCompanion copyWith({Value<String>? albumId, Value<String>? userId, Value<int>? role}) {
     return RemoteAlbumUserEntityCompanion(
       albumId: albumId ?? this.albumId,
       userId: userId ?? this.userId,
@@ -4025,74 +3647,47 @@ class RemoteAlbumUserEntityCompanion
   }
 }
 
-class MemoryEntity extends Table
-    with TableInfo<MemoryEntity, MemoryEntityData> {
+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,
+  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,
+  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,
+  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,
+  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,
+      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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_saved" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<DateTime> memoryAt = GeneratedColumn<DateTime>(
-      'memory_at', aliasedName, false,
+  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);
+  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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, createdAt, updatedAt, deletedAt, ownerId, type, data, isSaved, memoryAt, seenAt, showAt, hideAt];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -4104,30 +3699,18 @@ class MemoryEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -4142,8 +3725,7 @@ class MemoryEntity extends Table
   bool get isStrict => true;
 }
 
-class MemoryEntityData extends DataClass
-    implements Insertable<MemoryEntityData> {
+class MemoryEntityData extends DataClass implements Insertable<MemoryEntityData> {
   final String id;
   final DateTime createdAt;
   final DateTime updatedAt;
@@ -4195,8 +3777,7 @@ class MemoryEntityData extends DataClass
     return map;
   }
 
-  factory MemoryEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory MemoryEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return MemoryEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -4296,8 +3877,8 @@ class MemoryEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, createdAt, updatedAt, deletedAt, ownerId,
-      type, data, isSaved, memoryAt, seenAt, showAt, hideAt);
+  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) ||
@@ -4482,24 +4063,19 @@ class MemoryEntityCompanion extends UpdateCompanion<MemoryEntityData> {
   }
 }
 
-class MemoryAssetEntity extends Table
-    with TableInfo<MemoryAssetEntity, MemoryAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES memory_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, memoryId];
   @override
@@ -4513,10 +4089,8 @@ class MemoryAssetEntity extends Table
   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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      memoryId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}memory_id'])!,
     );
   }
 
@@ -4531,8 +4105,7 @@ class MemoryAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class MemoryAssetEntityData extends DataClass
-    implements Insertable<MemoryAssetEntityData> {
+class MemoryAssetEntityData extends DataClass implements Insertable<MemoryAssetEntityData> {
   final String assetId;
   final String memoryId;
   const MemoryAssetEntityData({required this.assetId, required this.memoryId});
@@ -4544,8 +4117,7 @@ class MemoryAssetEntityData extends DataClass
     return map;
   }
 
-  factory MemoryAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory MemoryAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return MemoryAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -4561,8 +4133,7 @@ class MemoryAssetEntityData extends DataClass
     };
   }
 
-  MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) =>
-      MemoryAssetEntityData(
+  MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) => MemoryAssetEntityData(
         assetId: assetId ?? this.assetId,
         memoryId: memoryId ?? this.memoryId,
       );
@@ -4587,13 +4158,10 @@ class MemoryAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is MemoryAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.memoryId == this.memoryId);
+      (other is MemoryAssetEntityData && other.assetId == this.assetId && other.memoryId == this.memoryId);
 }
 
-class MemoryAssetEntityCompanion
-    extends UpdateCompanion<MemoryAssetEntityData> {
+class MemoryAssetEntityCompanion extends UpdateCompanion<MemoryAssetEntityData> {
   final Value<String> assetId;
   final Value<String> memoryId;
   const MemoryAssetEntityCompanion({
@@ -4615,8 +4183,7 @@ class MemoryAssetEntityCompanion
     });
   }
 
-  MemoryAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? memoryId}) {
+  MemoryAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? memoryId}) {
     return MemoryAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       memoryId: memoryId ?? this.memoryId,
@@ -4645,72 +4212,46 @@ class MemoryAssetEntityCompanion
   }
 }
 
-class PersonEntity extends Table
-    with TableInfo<PersonEntity, PersonEntityData> {
+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,
+  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,
+  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,
+  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,
+      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<String> thumbnailPath = GeneratedColumn<String>(
-      'thumbnail_path', aliasedName, false,
+  late final GeneratedColumn<String> thumbnailPath = GeneratedColumn<String>('thumbnail_path', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<bool> isFavorite = GeneratedColumn<bool>(
-      'is_favorite', aliasedName, 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,
+      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,
+      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,
-        thumbnailPath,
-        isFavorite,
-        isHidden,
-        color,
-        birthDate
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, createdAt, updatedAt, ownerId, name, faceAssetId, thumbnailPath, isFavorite, isHidden, color, birthDate];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -4722,28 +4263,17 @@ class PersonEntity extends Table
   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']),
-      thumbnailPath: attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!,
-      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']),
+      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']),
+      thumbnailPath: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!,
+      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']),
     );
   }
 
@@ -4758,8 +4288,7 @@ class PersonEntity extends Table
   bool get isStrict => true;
 }
 
-class PersonEntityData extends DataClass
-    implements Insertable<PersonEntityData> {
+class PersonEntityData extends DataClass implements Insertable<PersonEntityData> {
   final String id;
   final DateTime createdAt;
   final DateTime updatedAt;
@@ -4806,8 +4335,7 @@ class PersonEntityData extends DataClass
     return map;
   }
 
-  factory PersonEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory PersonEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return PersonEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -4873,13 +4401,9 @@ class PersonEntityData extends DataClass
       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,
-      thumbnailPath: data.thumbnailPath.present
-          ? data.thumbnailPath.value
-          : this.thumbnailPath,
-      isFavorite:
-          data.isFavorite.present ? data.isFavorite.value : this.isFavorite,
+      faceAssetId: data.faceAssetId.present ? data.faceAssetId.value : this.faceAssetId,
+      thumbnailPath: data.thumbnailPath.present ? data.thumbnailPath.value : this.thumbnailPath,
+      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,
@@ -4905,8 +4429,8 @@ class PersonEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, createdAt, updatedAt, ownerId, name,
-      faceAssetId, thumbnailPath, isFavorite, isHidden, color, birthDate);
+  int get hashCode => Object.hash(
+      id, createdAt, updatedAt, ownerId, name, faceAssetId, thumbnailPath, isFavorite, isHidden, color, birthDate);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -5086,30 +4610,25 @@ class DatabaseAtV1 extends GeneratedDatabase {
   late final RemoteAssetEntity remoteAssetEntity = RemoteAssetEntity(this);
   late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
   late final StackEntity stackEntity = StackEntity(this);
-  late final Index idxLocalAssetChecksum = Index('idx_local_asset_checksum',
-      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
-  late final Index uQRemoteAssetOwnerChecksum = Index(
-      'UQ_remote_asset_owner_checksum',
+  late final Index idxLocalAssetChecksum =
+      Index('idx_local_asset_checksum', 'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  late final Index uQRemoteAssetOwnerChecksum = Index('UQ_remote_asset_owner_checksum',
       'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
-  late final Index idxRemoteAssetChecksum = Index('idx_remote_asset_checksum',
-      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  late final Index idxRemoteAssetChecksum =
+      Index('idx_remote_asset_checksum', 'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
   late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this);
   late final PartnerEntity partnerEntity = PartnerEntity(this);
   late final LocalAlbumEntity localAlbumEntity = LocalAlbumEntity(this);
-  late final LocalAlbumAssetEntity localAlbumAssetEntity =
-      LocalAlbumAssetEntity(this);
+  late final LocalAlbumAssetEntity localAlbumAssetEntity = LocalAlbumAssetEntity(this);
   late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this);
   late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(this);
-  late final RemoteAlbumAssetEntity remoteAlbumAssetEntity =
-      RemoteAlbumAssetEntity(this);
-  late final RemoteAlbumUserEntity remoteAlbumUserEntity =
-      RemoteAlbumUserEntity(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);
   @override
-  Iterable<TableInfo<Table, Object?>> get allTables =>
-      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  Iterable<TableInfo<Table, Object?>> get allTables => allSchemaEntities.whereType<TableInfo<Table, Object?>>();
   @override
   List<DatabaseSchemaEntity> get allSchemaEntities => [
         userEntity,
@@ -5134,6 +4653,5 @@ class DatabaseAtV1 extends GeneratedDatabase {
   @override
   int get schemaVersion => 1;
   @override
-  DriftDatabaseOptions get options =>
-      const DriftDatabaseOptions(storeDateTimeAsText: true);
+  DriftDatabaseOptions get options => const DriftDatabaseOptions(storeDateTimeAsText: true);
 }
diff --git a/mobile/test/drift/main/generated/schema_v2.dart b/mobile/test/drift/main/generated/schema_v2.dart
index e3edac3501..3d705e0454 100644
--- a/mobile/test/drift/main/generated/schema_v2.dart
+++ b/mobile/test/drift/main/generated/schema_v2.dart
@@ -8,49 +8,30 @@ class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
   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<bool> isAdmin = GeneratedColumn<bool>(
-      'is_admin', aliasedName, false,
+  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<bool> isAdmin = GeneratedColumn<bool>('is_admin', aliasedName, false,
       type: DriftSqlType.bool,
       requiredDuringInsert: false,
-      defaultConstraints:
-          GeneratedColumn.constraintIsAlways('CHECK ("is_admin" IN (0, 1))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_admin" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<String> email = GeneratedColumn<String>(
-      'email', aliasedName, false,
-      type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>(
-      'profile_image_path', aliasedName, true,
+  late final GeneratedColumn<String> email =
+      GeneratedColumn<String>('email', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true);
+  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>('profile_image_path', aliasedName, true,
       type: DriftSqlType.string, requiredDuringInsert: false);
-  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
-      'updated_at', aliasedName, false,
+  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> quotaSizeInBytes = GeneratedColumn<int>(
-      'quota_size_in_bytes', aliasedName, true,
+  late final GeneratedColumn<int> quotaSizeInBytes = GeneratedColumn<int>('quota_size_in_bytes', aliasedName, true,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  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<int> quotaUsageInBytes = GeneratedColumn<int>('quota_usage_in_bytes', aliasedName, false,
+      type: DriftSqlType.int, requiredDuringInsert: false, defaultValue: const CustomExpression('0'));
   @override
-  List<GeneratedColumn> get $columns => [
-        id,
-        name,
-        isAdmin,
-        email,
-        profileImagePath,
-        updatedAt,
-        quotaSizeInBytes,
-        quotaUsageInBytes
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, name, isAdmin, email, profileImagePath, updatedAt, quotaSizeInBytes, quotaUsageInBytes];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -62,22 +43,17 @@ class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
   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'])!,
-      isAdmin: attachedDatabase.typeMapping
-          .read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
-      email: attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}email'])!,
-      profileImagePath: attachedDatabase.typeMapping.read(
-          DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
-      updatedAt: attachedDatabase.typeMapping
-          .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
-      quotaSizeInBytes: attachedDatabase.typeMapping.read(
-          DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
-      quotaUsageInBytes: attachedDatabase.typeMapping.read(
-          DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
+      id: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}id'])!,
+      name: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}name'])!,
+      isAdmin: attachedDatabase.typeMapping.read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
+      email: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}email'])!,
+      profileImagePath:
+          attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
+      updatedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      quotaSizeInBytes:
+          attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
+      quotaUsageInBytes:
+          attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
     );
   }
 
@@ -128,8 +104,7 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
     return map;
   }
 
-  factory UserEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory UserEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return UserEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -171,13 +146,9 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
         name: name ?? this.name,
         isAdmin: isAdmin ?? this.isAdmin,
         email: email ?? this.email,
-        profileImagePath: profileImagePath.present
-            ? profileImagePath.value
-            : this.profileImagePath,
+        profileImagePath: profileImagePath.present ? profileImagePath.value : this.profileImagePath,
         updatedAt: updatedAt ?? this.updatedAt,
-        quotaSizeInBytes: quotaSizeInBytes.present
-            ? quotaSizeInBytes.value
-            : this.quotaSizeInBytes,
+        quotaSizeInBytes: quotaSizeInBytes.present ? quotaSizeInBytes.value : this.quotaSizeInBytes,
         quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
       );
   UserEntityData copyWithCompanion(UserEntityCompanion data) {
@@ -186,16 +157,10 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
       name: data.name.present ? data.name.value : this.name,
       isAdmin: data.isAdmin.present ? data.isAdmin.value : this.isAdmin,
       email: data.email.present ? data.email.value : this.email,
-      profileImagePath: data.profileImagePath.present
-          ? data.profileImagePath.value
-          : this.profileImagePath,
+      profileImagePath: data.profileImagePath.present ? data.profileImagePath.value : this.profileImagePath,
       updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
-      quotaSizeInBytes: data.quotaSizeInBytes.present
-          ? data.quotaSizeInBytes.value
-          : this.quotaSizeInBytes,
-      quotaUsageInBytes: data.quotaUsageInBytes.present
-          ? data.quotaUsageInBytes.value
-          : this.quotaUsageInBytes,
+      quotaSizeInBytes: data.quotaSizeInBytes.present ? data.quotaSizeInBytes.value : this.quotaSizeInBytes,
+      quotaUsageInBytes: data.quotaUsageInBytes.present ? data.quotaUsageInBytes.value : this.quotaUsageInBytes,
     );
   }
 
@@ -215,8 +180,8 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
   }
 
   @override
-  int get hashCode => Object.hash(id, name, isAdmin, email, profileImagePath,
-      updatedAt, quotaSizeInBytes, quotaUsageInBytes);
+  int get hashCode =>
+      Object.hash(id, name, isAdmin, email, profileImagePath, updatedAt, quotaSizeInBytes, quotaUsageInBytes);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -351,74 +316,55 @@ class UserEntityCompanion extends UpdateCompanion<UserEntityData> {
   }
 }
 
-class RemoteAssetEntity extends Table
-    with TableInfo<RemoteAssetEntity, RemoteAssetEntityData> {
+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,
+  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,
+  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,
+  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<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,
+  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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_favorite" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<String> ownerId = GeneratedColumn<String>(
-      'owner_id', aliasedName, 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<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,
+      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<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);
   @override
   List<GeneratedColumn> get $columns => [
         name,
@@ -450,40 +396,26 @@ class RemoteAssetEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -498,8 +430,7 @@ class RemoteAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAssetEntityData extends DataClass
-    implements Insertable<RemoteAssetEntityData> {
+class RemoteAssetEntityData extends DataClass implements Insertable<RemoteAssetEntityData> {
   final String name;
   final int type;
   final DateTime createdAt;
@@ -574,8 +505,7 @@ class RemoteAssetEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAssetEntityData(
       name: serializer.fromJson<String>(json['name']),
@@ -646,20 +576,15 @@ class RemoteAssetEntityData extends DataClass
         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,
+        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,
+        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,
+        livePhotoVideoId: livePhotoVideoId.present ? livePhotoVideoId.value : this.livePhotoVideoId,
         visibility: visibility ?? this.visibility,
         stackId: stackId.present ? stackId.value : this.stackId,
       );
@@ -671,24 +596,16 @@ class RemoteAssetEntityData extends DataClass
       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,
+      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,
+      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,
+      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,
+      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,
     );
   }
@@ -718,24 +635,8 @@ class RemoteAssetEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(
-      name,
-      type,
-      createdAt,
-      updatedAt,
-      width,
-      height,
-      durationInSeconds,
-      id,
-      checksum,
-      isFavorite,
-      ownerId,
-      localDateTime,
-      thumbHash,
-      deletedAt,
-      livePhotoVideoId,
-      visibility,
-      stackId);
+  int get hashCode => Object.hash(name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum,
+      isFavorite, ownerId, localDateTime, thumbHash, deletedAt, livePhotoVideoId, visibility, stackId);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -759,8 +660,7 @@ class RemoteAssetEntityData extends DataClass
           other.stackId == this.stackId);
 }
 
-class RemoteAssetEntityCompanion
-    extends UpdateCompanion<RemoteAssetEntityData> {
+class RemoteAssetEntityCompanion extends UpdateCompanion<RemoteAssetEntityData> {
   final Value<String> name;
   final Value<int> type;
   final Value<DateTime> createdAt;
@@ -982,69 +882,43 @@ class RemoteAssetEntityCompanion
   }
 }
 
-class LocalAssetEntity extends Table
-    with TableInfo<LocalAssetEntity, LocalAssetEntityData> {
+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,
+  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,
+  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,
+  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<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,
+  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,
+      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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum, isFavorite, orientation];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -1056,28 +930,18 @@ class LocalAssetEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -1092,8 +956,7 @@ class LocalAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAssetEntityData extends DataClass
-    implements Insertable<LocalAssetEntityData> {
+class LocalAssetEntityData extends DataClass implements Insertable<LocalAssetEntityData> {
   final String name;
   final int type;
   final DateTime createdAt;
@@ -1142,8 +1005,7 @@ class LocalAssetEntityData extends DataClass
     return map;
   }
 
-  factory LocalAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAssetEntityData(
       name: serializer.fromJson<String>(json['name']),
@@ -1196,9 +1058,7 @@ class LocalAssetEntityData extends DataClass
         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,
+        durationInSeconds: durationInSeconds.present ? durationInSeconds.value : this.durationInSeconds,
         id: id ?? this.id,
         checksum: checksum.present ? checksum.value : this.checksum,
         isFavorite: isFavorite ?? this.isFavorite,
@@ -1212,15 +1072,11 @@ class LocalAssetEntityData extends DataClass
       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,
+      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,
+      isFavorite: data.isFavorite.present ? data.isFavorite.value : this.isFavorite,
+      orientation: data.orientation.present ? data.orientation.value : this.orientation,
     );
   }
 
@@ -1243,8 +1099,8 @@ class LocalAssetEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(name, type, createdAt, updatedAt, width,
-      height, durationInSeconds, id, checksum, isFavorite, orientation);
+  int get hashCode => Object.hash(
+      name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum, isFavorite, orientation);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -1420,34 +1276,26 @@ class StackEntity extends Table with TableInfo<StackEntity, StackEntityData> {
   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,
+  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,
+  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,
+  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,
+      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,
-      defaultConstraints: GeneratedColumn.constraintIsAlways(
-          'REFERENCES remote_asset_entity (id)'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES remote_asset_entity (id)'));
   @override
-  List<GeneratedColumn> get $columns =>
-      [id, createdAt, updatedAt, ownerId, primaryAssetId];
+  List<GeneratedColumn> get $columns => [id, createdAt, updatedAt, ownerId, primaryAssetId];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -1459,16 +1307,12 @@ class StackEntity extends Table with TableInfo<StackEntity, StackEntityData> {
   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'])!,
+      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'])!,
     );
   }
 
@@ -1506,8 +1350,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
     return map;
   }
 
-  factory StackEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory StackEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return StackEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -1530,11 +1373,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
   }
 
   StackEntityData copyWith(
-          {String? id,
-          DateTime? createdAt,
-          DateTime? updatedAt,
-          String? ownerId,
-          String? primaryAssetId}) =>
+          {String? id, DateTime? createdAt, DateTime? updatedAt, String? ownerId, String? primaryAssetId}) =>
       StackEntityData(
         id: id ?? this.id,
         createdAt: createdAt ?? this.createdAt,
@@ -1548,9 +1387,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
       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,
+      primaryAssetId: data.primaryAssetId.present ? data.primaryAssetId.value : this.primaryAssetId,
     );
   }
 
@@ -1567,8 +1404,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
   }
 
   @override
-  int get hashCode =>
-      Object.hash(id, createdAt, updatedAt, ownerId, primaryAssetId);
+  int get hashCode => Object.hash(id, createdAt, updatedAt, ownerId, primaryAssetId);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -1667,24 +1503,19 @@ class StackEntityCompanion extends UpdateCompanion<StackEntityData> {
   }
 }
 
-class UserMetadataEntity extends Table
-    with TableInfo<UserMetadataEntity, UserMetadataEntityData> {
+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,
+  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);
+      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
@@ -1698,12 +1529,9 @@ class UserMetadataEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -1718,13 +1546,11 @@ class UserMetadataEntity extends Table
   bool get isStrict => true;
 }
 
-class UserMetadataEntityData extends DataClass
-    implements Insertable<UserMetadataEntityData> {
+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});
+  const UserMetadataEntityData({required this.userId, required this.key, required this.value});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -1734,8 +1560,7 @@ class UserMetadataEntityData extends DataClass
     return map;
   }
 
-  factory UserMetadataEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory UserMetadataEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return UserMetadataEntityData(
       userId: serializer.fromJson<String>(json['userId']),
@@ -1753,9 +1578,7 @@ class UserMetadataEntityData extends DataClass
     };
   }
 
-  UserMetadataEntityData copyWith(
-          {String? userId, int? key, Uint8List? value}) =>
-      UserMetadataEntityData(
+  UserMetadataEntityData copyWith({String? userId, int? key, Uint8List? value}) => UserMetadataEntityData(
         userId: userId ?? this.userId,
         key: key ?? this.key,
         value: value ?? this.value,
@@ -1789,8 +1612,7 @@ class UserMetadataEntityData extends DataClass
           $driftBlobEquality.equals(other.value, this.value));
 }
 
-class UserMetadataEntityCompanion
-    extends UpdateCompanion<UserMetadataEntityData> {
+class UserMetadataEntityCompanion extends UpdateCompanion<UserMetadataEntityData> {
   final Value<String> userId;
   final Value<int> key;
   final Value<Uint8List> value;
@@ -1818,8 +1640,7 @@ class UserMetadataEntityCompanion
     });
   }
 
-  UserMetadataEntityCompanion copyWith(
-      {Value<String>? userId, Value<int>? key, Value<Uint8List>? value}) {
+  UserMetadataEntityCompanion copyWith({Value<String>? userId, Value<int>? key, Value<Uint8List>? value}) {
     return UserMetadataEntityCompanion(
       userId: userId ?? this.userId,
       key: key ?? this.key,
@@ -1853,30 +1674,23 @@ class UserMetadataEntityCompanion
   }
 }
 
-class PartnerEntity extends Table
-    with TableInfo<PartnerEntity, PartnerEntityData> {
+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,
+  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,
+      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,
+      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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("in_timeline" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
   @override
   List<GeneratedColumn> get $columns => [sharedById, sharedWithId, inTimeline];
@@ -1891,12 +1705,9 @@ class PartnerEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -1911,15 +1722,11 @@ class PartnerEntity extends Table
   bool get isStrict => true;
 }
 
-class PartnerEntityData extends DataClass
-    implements Insertable<PartnerEntityData> {
+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});
+  const PartnerEntityData({required this.sharedById, required this.sharedWithId, required this.inTimeline});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -1929,8 +1736,7 @@ class PartnerEntityData extends DataClass
     return map;
   }
 
-  factory PartnerEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory PartnerEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return PartnerEntityData(
       sharedById: serializer.fromJson<String>(json['sharedById']),
@@ -1948,22 +1754,16 @@ class PartnerEntityData extends DataClass
     };
   }
 
-  PartnerEntityData copyWith(
-          {String? sharedById, String? sharedWithId, bool? inTimeline}) =>
-      PartnerEntityData(
+  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,
+      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,
     );
   }
 
@@ -2015,10 +1815,7 @@ class PartnerEntityCompanion extends UpdateCompanion<PartnerEntityData> {
     });
   }
 
-  PartnerEntityCompanion copyWith(
-      {Value<String>? sharedById,
-      Value<String>? sharedWithId,
-      Value<bool>? inTimeline}) {
+  PartnerEntityCompanion copyWith({Value<String>? sharedById, Value<String>? sharedWithId, Value<bool>? inTimeline}) {
     return PartnerEntityCompanion(
       sharedById: sharedById ?? this.sharedById,
       sharedWithId: sharedWithId ?? this.sharedWithId,
@@ -2052,42 +1849,32 @@ class PartnerEntityCompanion extends UpdateCompanion<PartnerEntityData> {
   }
 }
 
-class LocalAlbumEntity extends Table
-    with TableInfo<LocalAlbumEntity, LocalAlbumEntityData> {
+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,
+  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,
+  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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_ios_shared_album" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<bool> marker_ = GeneratedColumn<bool>(
-      'marker', aliasedName, true,
+  late final GeneratedColumn<bool> marker_ = GeneratedColumn<bool>('marker', aliasedName, true,
       type: DriftSqlType.bool,
       requiredDuringInsert: false,
-      defaultConstraints:
-          GeneratedColumn.constraintIsAlways('CHECK ("marker" IN (0, 1))'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("marker" IN (0, 1))'));
   @override
-  List<GeneratedColumn> get $columns =>
-      [id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_];
+  List<GeneratedColumn> get $columns => [id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -2099,18 +1886,13 @@ class LocalAlbumEntity extends Table
   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'])!,
-      marker_: attachedDatabase.typeMapping
-          .read(DriftSqlType.bool, data['${effectivePrefix}marker']),
+      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'])!,
+      marker_: attachedDatabase.typeMapping.read(DriftSqlType.bool, data['${effectivePrefix}marker']),
     );
   }
 
@@ -2125,8 +1907,7 @@ class LocalAlbumEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAlbumEntityData extends DataClass
-    implements Insertable<LocalAlbumEntityData> {
+class LocalAlbumEntityData extends DataClass implements Insertable<LocalAlbumEntityData> {
   final String id;
   final String name;
   final DateTime updatedAt;
@@ -2154,8 +1935,7 @@ class LocalAlbumEntityData extends DataClass
     return map;
   }
 
-  factory LocalAlbumEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAlbumEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAlbumEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -2199,12 +1979,8 @@ class LocalAlbumEntityData extends DataClass
       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,
+      backupSelection: data.backupSelection.present ? data.backupSelection.value : this.backupSelection,
+      isIosSharedAlbum: data.isIosSharedAlbum.present ? data.isIosSharedAlbum.value : this.isIosSharedAlbum,
       marker_: data.marker_.present ? data.marker_.value : this.marker_,
     );
   }
@@ -2223,8 +1999,7 @@ class LocalAlbumEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(
-      id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_);
+  int get hashCode => Object.hash(id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -2335,24 +2110,19 @@ class LocalAlbumEntityCompanion extends UpdateCompanion<LocalAlbumEntityData> {
   }
 }
 
-class LocalAlbumAssetEntity extends Table
-    with TableInfo<LocalAlbumAssetEntity, LocalAlbumAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES local_album_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, albumId];
   @override
@@ -2363,14 +2133,11 @@ class LocalAlbumAssetEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {assetId, albumId};
   @override
-  LocalAlbumAssetEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      albumId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}album_id'])!,
     );
   }
 
@@ -2385,12 +2152,10 @@ class LocalAlbumAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAlbumAssetEntityData extends DataClass
-    implements Insertable<LocalAlbumAssetEntityData> {
+class LocalAlbumAssetEntityData extends DataClass implements Insertable<LocalAlbumAssetEntityData> {
   final String assetId;
   final String albumId;
-  const LocalAlbumAssetEntityData(
-      {required this.assetId, required this.albumId});
+  const LocalAlbumAssetEntityData({required this.assetId, required this.albumId});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -2399,8 +2164,7 @@ class LocalAlbumAssetEntityData extends DataClass
     return map;
   }
 
-  factory LocalAlbumAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAlbumAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAlbumAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -2416,13 +2180,11 @@ class LocalAlbumAssetEntityData extends DataClass
     };
   }
 
-  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
-      LocalAlbumAssetEntityData(
+  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) => LocalAlbumAssetEntityData(
         assetId: assetId ?? this.assetId,
         albumId: albumId ?? this.albumId,
       );
-  LocalAlbumAssetEntityData copyWithCompanion(
-      LocalAlbumAssetEntityCompanion data) {
+  LocalAlbumAssetEntityData copyWithCompanion(LocalAlbumAssetEntityCompanion data) {
     return LocalAlbumAssetEntityData(
       assetId: data.assetId.present ? data.assetId.value : this.assetId,
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
@@ -2443,13 +2205,10 @@ class LocalAlbumAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is LocalAlbumAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.albumId == this.albumId);
+      (other is LocalAlbumAssetEntityData && other.assetId == this.assetId && other.albumId == this.albumId);
 }
 
-class LocalAlbumAssetEntityCompanion
-    extends UpdateCompanion<LocalAlbumAssetEntityData> {
+class LocalAlbumAssetEntityCompanion extends UpdateCompanion<LocalAlbumAssetEntityData> {
   final Value<String> assetId;
   final Value<String> albumId;
   const LocalAlbumAssetEntityCompanion({
@@ -2471,8 +2230,7 @@ class LocalAlbumAssetEntityCompanion
     });
   }
 
-  LocalAlbumAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? albumId}) {
+  LocalAlbumAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? albumId}) {
     return LocalAlbumAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       albumId: albumId ?? this.albumId,
@@ -2501,80 +2259,57 @@ class LocalAlbumAssetEntityCompanion
   }
 }
 
-class RemoteExifEntity extends Table
-    with TableInfo<RemoteExifEntity, RemoteExifEntityData> {
+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,
+  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,
+      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<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,
+  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<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,
+  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 => [
@@ -2612,50 +2347,29 @@ class RemoteExifEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -2670,8 +2384,7 @@ class RemoteExifEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteExifEntityData extends DataClass
-    implements Insertable<RemoteExifEntityData> {
+class RemoteExifEntityData extends DataClass implements Insertable<RemoteExifEntityData> {
   final String assetId;
   final String? city;
   final String? state;
@@ -2787,16 +2500,14 @@ class RemoteExifEntityData extends DataClass
     return map;
   }
 
-  factory RemoteExifEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  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']),
+      dateTimeOriginal: serializer.fromJson<DateTime?>(json['dateTimeOriginal']),
       description: serializer.fromJson<String?>(json['description']),
       height: serializer.fromJson<int?>(json['height']),
       width: serializer.fromJson<int?>(json['width']),
@@ -2873,14 +2584,11 @@ class RemoteExifEntityData extends DataClass
         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,
+        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,
+        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,
@@ -2893,8 +2601,7 @@ class RemoteExifEntityData extends DataClass
         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,
+        projectionType: projectionType.present ? projectionType.value : this.projectionType,
       );
   RemoteExifEntityData copyWithCompanion(RemoteExifEntityCompanion data) {
     return RemoteExifEntityData(
@@ -2902,33 +2609,24 @@ class RemoteExifEntityData extends DataClass
       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,
+      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,
+      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,
+      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,
+      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,
+      projectionType: data.projectionType.present ? data.projectionType.value : this.projectionType,
     );
   }
 
@@ -3286,67 +2984,43 @@ class RemoteExifEntityCompanion extends UpdateCompanion<RemoteExifEntityData> {
   }
 }
 
-class RemoteAlbumEntity extends Table
-    with TableInfo<RemoteAlbumEntity, RemoteAlbumEntityData> {
+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,
+  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,
+  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,
+  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,
+      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,
+      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))'),
+      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);
+  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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, name, description, createdAt, updatedAt, ownerId, thumbnailAssetId, isActivityEnabled, order];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -3358,24 +3032,17 @@ class RemoteAlbumEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -3390,8 +3057,7 @@ class RemoteAlbumEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumEntityData extends DataClass
-    implements Insertable<RemoteAlbumEntityData> {
+class RemoteAlbumEntityData extends DataClass implements Insertable<RemoteAlbumEntityData> {
   final String id;
   final String name;
   final String description;
@@ -3428,8 +3094,7 @@ class RemoteAlbumEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -3476,9 +3141,7 @@ class RemoteAlbumEntityData extends DataClass
         createdAt: createdAt ?? this.createdAt,
         updatedAt: updatedAt ?? this.updatedAt,
         ownerId: ownerId ?? this.ownerId,
-        thumbnailAssetId: thumbnailAssetId.present
-            ? thumbnailAssetId.value
-            : this.thumbnailAssetId,
+        thumbnailAssetId: thumbnailAssetId.present ? thumbnailAssetId.value : this.thumbnailAssetId,
         isActivityEnabled: isActivityEnabled ?? this.isActivityEnabled,
         order: order ?? this.order,
       );
@@ -3486,17 +3149,12 @@ class RemoteAlbumEntityData extends DataClass
     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,
+      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,
+      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,
     );
   }
@@ -3518,8 +3176,8 @@ class RemoteAlbumEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, name, description, createdAt, updatedAt,
-      ownerId, thumbnailAssetId, isActivityEnabled, order);
+  int get hashCode =>
+      Object.hash(id, name, description, createdAt, updatedAt, ownerId, thumbnailAssetId, isActivityEnabled, order);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -3535,8 +3193,7 @@ class RemoteAlbumEntityData extends DataClass
           other.order == this.order);
 }
 
-class RemoteAlbumEntityCompanion
-    extends UpdateCompanion<RemoteAlbumEntityData> {
+class RemoteAlbumEntityCompanion extends UpdateCompanion<RemoteAlbumEntityData> {
   final Value<String> id;
   final Value<String> name;
   final Value<String> description;
@@ -3668,24 +3325,19 @@ class RemoteAlbumEntityCompanion
   }
 }
 
-class RemoteAlbumAssetEntity extends Table
-    with TableInfo<RemoteAlbumAssetEntity, RemoteAlbumAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, albumId];
   @override
@@ -3696,14 +3348,11 @@ class RemoteAlbumAssetEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {assetId, albumId};
   @override
-  RemoteAlbumAssetEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      albumId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}album_id'])!,
     );
   }
 
@@ -3718,12 +3367,10 @@ class RemoteAlbumAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumAssetEntityData extends DataClass
-    implements Insertable<RemoteAlbumAssetEntityData> {
+class RemoteAlbumAssetEntityData extends DataClass implements Insertable<RemoteAlbumAssetEntityData> {
   final String assetId;
   final String albumId;
-  const RemoteAlbumAssetEntityData(
-      {required this.assetId, required this.albumId});
+  const RemoteAlbumAssetEntityData({required this.assetId, required this.albumId});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -3732,8 +3379,7 @@ class RemoteAlbumAssetEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -3749,13 +3395,11 @@ class RemoteAlbumAssetEntityData extends DataClass
     };
   }
 
-  RemoteAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
-      RemoteAlbumAssetEntityData(
+  RemoteAlbumAssetEntityData copyWith({String? assetId, String? albumId}) => RemoteAlbumAssetEntityData(
         assetId: assetId ?? this.assetId,
         albumId: albumId ?? this.albumId,
       );
-  RemoteAlbumAssetEntityData copyWithCompanion(
-      RemoteAlbumAssetEntityCompanion data) {
+  RemoteAlbumAssetEntityData copyWithCompanion(RemoteAlbumAssetEntityCompanion data) {
     return RemoteAlbumAssetEntityData(
       assetId: data.assetId.present ? data.assetId.value : this.assetId,
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
@@ -3776,13 +3420,10 @@ class RemoteAlbumAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is RemoteAlbumAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.albumId == this.albumId);
+      (other is RemoteAlbumAssetEntityData && other.assetId == this.assetId && other.albumId == this.albumId);
 }
 
-class RemoteAlbumAssetEntityCompanion
-    extends UpdateCompanion<RemoteAlbumAssetEntityData> {
+class RemoteAlbumAssetEntityCompanion extends UpdateCompanion<RemoteAlbumAssetEntityData> {
   final Value<String> assetId;
   final Value<String> albumId;
   const RemoteAlbumAssetEntityCompanion({
@@ -3804,8 +3445,7 @@ class RemoteAlbumAssetEntityCompanion
     });
   }
 
-  RemoteAlbumAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? albumId}) {
+  RemoteAlbumAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? albumId}) {
     return RemoteAlbumAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       albumId: albumId ?? this.albumId,
@@ -3834,27 +3474,21 @@ class RemoteAlbumAssetEntityCompanion
   }
 }
 
-class RemoteAlbumUserEntity extends Table
-    with TableInfo<RemoteAlbumUserEntity, RemoteAlbumUserEntityData> {
+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,
+  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,
+      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);
+      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
@@ -3865,16 +3499,12 @@ class RemoteAlbumUserEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {albumId, userId};
   @override
-  RemoteAlbumUserEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      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'])!,
     );
   }
 
@@ -3889,13 +3519,11 @@ class RemoteAlbumUserEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumUserEntityData extends DataClass
-    implements Insertable<RemoteAlbumUserEntityData> {
+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});
+  const RemoteAlbumUserEntityData({required this.albumId, required this.userId, required this.role});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -3905,8 +3533,7 @@ class RemoteAlbumUserEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumUserEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumUserEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumUserEntityData(
       albumId: serializer.fromJson<String>(json['albumId']),
@@ -3924,15 +3551,12 @@ class RemoteAlbumUserEntityData extends DataClass
     };
   }
 
-  RemoteAlbumUserEntityData copyWith(
-          {String? albumId, String? userId, int? role}) =>
-      RemoteAlbumUserEntityData(
+  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) {
+  RemoteAlbumUserEntityData copyWithCompanion(RemoteAlbumUserEntityCompanion data) {
     return RemoteAlbumUserEntityData(
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
       userId: data.userId.present ? data.userId.value : this.userId,
@@ -3961,8 +3585,7 @@ class RemoteAlbumUserEntityData extends DataClass
           other.role == this.role);
 }
 
-class RemoteAlbumUserEntityCompanion
-    extends UpdateCompanion<RemoteAlbumUserEntityData> {
+class RemoteAlbumUserEntityCompanion extends UpdateCompanion<RemoteAlbumUserEntityData> {
   final Value<String> albumId;
   final Value<String> userId;
   final Value<int> role;
@@ -3990,8 +3613,7 @@ class RemoteAlbumUserEntityCompanion
     });
   }
 
-  RemoteAlbumUserEntityCompanion copyWith(
-      {Value<String>? albumId, Value<String>? userId, Value<int>? role}) {
+  RemoteAlbumUserEntityCompanion copyWith({Value<String>? albumId, Value<String>? userId, Value<int>? role}) {
     return RemoteAlbumUserEntityCompanion(
       albumId: albumId ?? this.albumId,
       userId: userId ?? this.userId,
@@ -4025,74 +3647,47 @@ class RemoteAlbumUserEntityCompanion
   }
 }
 
-class MemoryEntity extends Table
-    with TableInfo<MemoryEntity, MemoryEntityData> {
+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,
+  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,
+  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,
+  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,
+  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,
+      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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_saved" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<DateTime> memoryAt = GeneratedColumn<DateTime>(
-      'memory_at', aliasedName, false,
+  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);
+  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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, createdAt, updatedAt, deletedAt, ownerId, type, data, isSaved, memoryAt, seenAt, showAt, hideAt];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -4104,30 +3699,18 @@ class MemoryEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -4142,8 +3725,7 @@ class MemoryEntity extends Table
   bool get isStrict => true;
 }
 
-class MemoryEntityData extends DataClass
-    implements Insertable<MemoryEntityData> {
+class MemoryEntityData extends DataClass implements Insertable<MemoryEntityData> {
   final String id;
   final DateTime createdAt;
   final DateTime updatedAt;
@@ -4195,8 +3777,7 @@ class MemoryEntityData extends DataClass
     return map;
   }
 
-  factory MemoryEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory MemoryEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return MemoryEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -4296,8 +3877,8 @@ class MemoryEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, createdAt, updatedAt, deletedAt, ownerId,
-      type, data, isSaved, memoryAt, seenAt, showAt, hideAt);
+  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) ||
@@ -4482,24 +4063,19 @@ class MemoryEntityCompanion extends UpdateCompanion<MemoryEntityData> {
   }
 }
 
-class MemoryAssetEntity extends Table
-    with TableInfo<MemoryAssetEntity, MemoryAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES memory_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, memoryId];
   @override
@@ -4513,10 +4089,8 @@ class MemoryAssetEntity extends Table
   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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      memoryId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}memory_id'])!,
     );
   }
 
@@ -4531,8 +4105,7 @@ class MemoryAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class MemoryAssetEntityData extends DataClass
-    implements Insertable<MemoryAssetEntityData> {
+class MemoryAssetEntityData extends DataClass implements Insertable<MemoryAssetEntityData> {
   final String assetId;
   final String memoryId;
   const MemoryAssetEntityData({required this.assetId, required this.memoryId});
@@ -4544,8 +4117,7 @@ class MemoryAssetEntityData extends DataClass
     return map;
   }
 
-  factory MemoryAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory MemoryAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return MemoryAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -4561,8 +4133,7 @@ class MemoryAssetEntityData extends DataClass
     };
   }
 
-  MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) =>
-      MemoryAssetEntityData(
+  MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) => MemoryAssetEntityData(
         assetId: assetId ?? this.assetId,
         memoryId: memoryId ?? this.memoryId,
       );
@@ -4587,13 +4158,10 @@ class MemoryAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is MemoryAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.memoryId == this.memoryId);
+      (other is MemoryAssetEntityData && other.assetId == this.assetId && other.memoryId == this.memoryId);
 }
 
-class MemoryAssetEntityCompanion
-    extends UpdateCompanion<MemoryAssetEntityData> {
+class MemoryAssetEntityCompanion extends UpdateCompanion<MemoryAssetEntityData> {
   final Value<String> assetId;
   final Value<String> memoryId;
   const MemoryAssetEntityCompanion({
@@ -4615,8 +4183,7 @@ class MemoryAssetEntityCompanion
     });
   }
 
-  MemoryAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? memoryId}) {
+  MemoryAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? memoryId}) {
     return MemoryAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       memoryId: memoryId ?? this.memoryId,
@@ -4645,72 +4212,46 @@ class MemoryAssetEntityCompanion
   }
 }
 
-class PersonEntity extends Table
-    with TableInfo<PersonEntity, PersonEntityData> {
+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,
+  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,
+  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,
+  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,
+      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<String> thumbnailPath = GeneratedColumn<String>(
-      'thumbnail_path', aliasedName, false,
+  late final GeneratedColumn<String> thumbnailPath = GeneratedColumn<String>('thumbnail_path', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<bool> isFavorite = GeneratedColumn<bool>(
-      'is_favorite', aliasedName, 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,
+      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,
+      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,
-        thumbnailPath,
-        isFavorite,
-        isHidden,
-        color,
-        birthDate
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, createdAt, updatedAt, ownerId, name, faceAssetId, thumbnailPath, isFavorite, isHidden, color, birthDate];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -4722,28 +4263,17 @@ class PersonEntity extends Table
   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']),
-      thumbnailPath: attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!,
-      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']),
+      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']),
+      thumbnailPath: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!,
+      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']),
     );
   }
 
@@ -4758,8 +4288,7 @@ class PersonEntity extends Table
   bool get isStrict => true;
 }
 
-class PersonEntityData extends DataClass
-    implements Insertable<PersonEntityData> {
+class PersonEntityData extends DataClass implements Insertable<PersonEntityData> {
   final String id;
   final DateTime createdAt;
   final DateTime updatedAt;
@@ -4806,8 +4335,7 @@ class PersonEntityData extends DataClass
     return map;
   }
 
-  factory PersonEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory PersonEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return PersonEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -4873,13 +4401,9 @@ class PersonEntityData extends DataClass
       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,
-      thumbnailPath: data.thumbnailPath.present
-          ? data.thumbnailPath.value
-          : this.thumbnailPath,
-      isFavorite:
-          data.isFavorite.present ? data.isFavorite.value : this.isFavorite,
+      faceAssetId: data.faceAssetId.present ? data.faceAssetId.value : this.faceAssetId,
+      thumbnailPath: data.thumbnailPath.present ? data.thumbnailPath.value : this.thumbnailPath,
+      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,
@@ -4905,8 +4429,8 @@ class PersonEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, createdAt, updatedAt, ownerId, name,
-      faceAssetId, thumbnailPath, isFavorite, isHidden, color, birthDate);
+  int get hashCode => Object.hash(
+      id, createdAt, updatedAt, ownerId, name, faceAssetId, thumbnailPath, isFavorite, isHidden, color, birthDate);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -5086,30 +4610,25 @@ class DatabaseAtV2 extends GeneratedDatabase {
   late final RemoteAssetEntity remoteAssetEntity = RemoteAssetEntity(this);
   late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
   late final StackEntity stackEntity = StackEntity(this);
-  late final Index idxLocalAssetChecksum = Index('idx_local_asset_checksum',
-      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
-  late final Index uQRemoteAssetOwnerChecksum = Index(
-      'UQ_remote_asset_owner_checksum',
+  late final Index idxLocalAssetChecksum =
+      Index('idx_local_asset_checksum', 'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  late final Index uQRemoteAssetOwnerChecksum = Index('UQ_remote_asset_owner_checksum',
       'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
-  late final Index idxRemoteAssetChecksum = Index('idx_remote_asset_checksum',
-      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  late final Index idxRemoteAssetChecksum =
+      Index('idx_remote_asset_checksum', 'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
   late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this);
   late final PartnerEntity partnerEntity = PartnerEntity(this);
   late final LocalAlbumEntity localAlbumEntity = LocalAlbumEntity(this);
-  late final LocalAlbumAssetEntity localAlbumAssetEntity =
-      LocalAlbumAssetEntity(this);
+  late final LocalAlbumAssetEntity localAlbumAssetEntity = LocalAlbumAssetEntity(this);
   late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this);
   late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(this);
-  late final RemoteAlbumAssetEntity remoteAlbumAssetEntity =
-      RemoteAlbumAssetEntity(this);
-  late final RemoteAlbumUserEntity remoteAlbumUserEntity =
-      RemoteAlbumUserEntity(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);
   @override
-  Iterable<TableInfo<Table, Object?>> get allTables =>
-      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  Iterable<TableInfo<Table, Object?>> get allTables => allSchemaEntities.whereType<TableInfo<Table, Object?>>();
   @override
   List<DatabaseSchemaEntity> get allSchemaEntities => [
         userEntity,
@@ -5134,6 +4653,5 @@ class DatabaseAtV2 extends GeneratedDatabase {
   @override
   int get schemaVersion => 2;
   @override
-  DriftDatabaseOptions get options =>
-      const DriftDatabaseOptions(storeDateTimeAsText: true);
+  DriftDatabaseOptions get options => const DriftDatabaseOptions(storeDateTimeAsText: true);
 }
diff --git a/mobile/test/drift/main/generated/schema_v3.dart b/mobile/test/drift/main/generated/schema_v3.dart
index 8f655b3f7d..711cf85253 100644
--- a/mobile/test/drift/main/generated/schema_v3.dart
+++ b/mobile/test/drift/main/generated/schema_v3.dart
@@ -8,49 +8,30 @@ class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
   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<bool> isAdmin = GeneratedColumn<bool>(
-      'is_admin', aliasedName, false,
+  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<bool> isAdmin = GeneratedColumn<bool>('is_admin', aliasedName, false,
       type: DriftSqlType.bool,
       requiredDuringInsert: false,
-      defaultConstraints:
-          GeneratedColumn.constraintIsAlways('CHECK ("is_admin" IN (0, 1))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_admin" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<String> email = GeneratedColumn<String>(
-      'email', aliasedName, false,
-      type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>(
-      'profile_image_path', aliasedName, true,
+  late final GeneratedColumn<String> email =
+      GeneratedColumn<String>('email', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true);
+  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>('profile_image_path', aliasedName, true,
       type: DriftSqlType.string, requiredDuringInsert: false);
-  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
-      'updated_at', aliasedName, false,
+  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> quotaSizeInBytes = GeneratedColumn<int>(
-      'quota_size_in_bytes', aliasedName, true,
+  late final GeneratedColumn<int> quotaSizeInBytes = GeneratedColumn<int>('quota_size_in_bytes', aliasedName, true,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  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<int> quotaUsageInBytes = GeneratedColumn<int>('quota_usage_in_bytes', aliasedName, false,
+      type: DriftSqlType.int, requiredDuringInsert: false, defaultValue: const CustomExpression('0'));
   @override
-  List<GeneratedColumn> get $columns => [
-        id,
-        name,
-        isAdmin,
-        email,
-        profileImagePath,
-        updatedAt,
-        quotaSizeInBytes,
-        quotaUsageInBytes
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, name, isAdmin, email, profileImagePath, updatedAt, quotaSizeInBytes, quotaUsageInBytes];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -62,22 +43,17 @@ class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
   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'])!,
-      isAdmin: attachedDatabase.typeMapping
-          .read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
-      email: attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}email'])!,
-      profileImagePath: attachedDatabase.typeMapping.read(
-          DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
-      updatedAt: attachedDatabase.typeMapping
-          .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
-      quotaSizeInBytes: attachedDatabase.typeMapping.read(
-          DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
-      quotaUsageInBytes: attachedDatabase.typeMapping.read(
-          DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
+      id: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}id'])!,
+      name: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}name'])!,
+      isAdmin: attachedDatabase.typeMapping.read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
+      email: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}email'])!,
+      profileImagePath:
+          attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
+      updatedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      quotaSizeInBytes:
+          attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
+      quotaUsageInBytes:
+          attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
     );
   }
 
@@ -128,8 +104,7 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
     return map;
   }
 
-  factory UserEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory UserEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return UserEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -171,13 +146,9 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
         name: name ?? this.name,
         isAdmin: isAdmin ?? this.isAdmin,
         email: email ?? this.email,
-        profileImagePath: profileImagePath.present
-            ? profileImagePath.value
-            : this.profileImagePath,
+        profileImagePath: profileImagePath.present ? profileImagePath.value : this.profileImagePath,
         updatedAt: updatedAt ?? this.updatedAt,
-        quotaSizeInBytes: quotaSizeInBytes.present
-            ? quotaSizeInBytes.value
-            : this.quotaSizeInBytes,
+        quotaSizeInBytes: quotaSizeInBytes.present ? quotaSizeInBytes.value : this.quotaSizeInBytes,
         quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
       );
   UserEntityData copyWithCompanion(UserEntityCompanion data) {
@@ -186,16 +157,10 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
       name: data.name.present ? data.name.value : this.name,
       isAdmin: data.isAdmin.present ? data.isAdmin.value : this.isAdmin,
       email: data.email.present ? data.email.value : this.email,
-      profileImagePath: data.profileImagePath.present
-          ? data.profileImagePath.value
-          : this.profileImagePath,
+      profileImagePath: data.profileImagePath.present ? data.profileImagePath.value : this.profileImagePath,
       updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
-      quotaSizeInBytes: data.quotaSizeInBytes.present
-          ? data.quotaSizeInBytes.value
-          : this.quotaSizeInBytes,
-      quotaUsageInBytes: data.quotaUsageInBytes.present
-          ? data.quotaUsageInBytes.value
-          : this.quotaUsageInBytes,
+      quotaSizeInBytes: data.quotaSizeInBytes.present ? data.quotaSizeInBytes.value : this.quotaSizeInBytes,
+      quotaUsageInBytes: data.quotaUsageInBytes.present ? data.quotaUsageInBytes.value : this.quotaUsageInBytes,
     );
   }
 
@@ -215,8 +180,8 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
   }
 
   @override
-  int get hashCode => Object.hash(id, name, isAdmin, email, profileImagePath,
-      updatedAt, quotaSizeInBytes, quotaUsageInBytes);
+  int get hashCode =>
+      Object.hash(id, name, isAdmin, email, profileImagePath, updatedAt, quotaSizeInBytes, quotaUsageInBytes);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -351,74 +316,55 @@ class UserEntityCompanion extends UpdateCompanion<UserEntityData> {
   }
 }
 
-class RemoteAssetEntity extends Table
-    with TableInfo<RemoteAssetEntity, RemoteAssetEntityData> {
+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,
+  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,
+  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,
+  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<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,
+  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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_favorite" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<String> ownerId = GeneratedColumn<String>(
-      'owner_id', aliasedName, 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<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,
+      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<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);
   @override
   List<GeneratedColumn> get $columns => [
         name,
@@ -450,40 +396,26 @@ class RemoteAssetEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -498,8 +430,7 @@ class RemoteAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAssetEntityData extends DataClass
-    implements Insertable<RemoteAssetEntityData> {
+class RemoteAssetEntityData extends DataClass implements Insertable<RemoteAssetEntityData> {
   final String name;
   final int type;
   final DateTime createdAt;
@@ -574,8 +505,7 @@ class RemoteAssetEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAssetEntityData(
       name: serializer.fromJson<String>(json['name']),
@@ -646,20 +576,15 @@ class RemoteAssetEntityData extends DataClass
         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,
+        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,
+        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,
+        livePhotoVideoId: livePhotoVideoId.present ? livePhotoVideoId.value : this.livePhotoVideoId,
         visibility: visibility ?? this.visibility,
         stackId: stackId.present ? stackId.value : this.stackId,
       );
@@ -671,24 +596,16 @@ class RemoteAssetEntityData extends DataClass
       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,
+      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,
+      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,
+      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,
+      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,
     );
   }
@@ -718,24 +635,8 @@ class RemoteAssetEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(
-      name,
-      type,
-      createdAt,
-      updatedAt,
-      width,
-      height,
-      durationInSeconds,
-      id,
-      checksum,
-      isFavorite,
-      ownerId,
-      localDateTime,
-      thumbHash,
-      deletedAt,
-      livePhotoVideoId,
-      visibility,
-      stackId);
+  int get hashCode => Object.hash(name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum,
+      isFavorite, ownerId, localDateTime, thumbHash, deletedAt, livePhotoVideoId, visibility, stackId);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -759,8 +660,7 @@ class RemoteAssetEntityData extends DataClass
           other.stackId == this.stackId);
 }
 
-class RemoteAssetEntityCompanion
-    extends UpdateCompanion<RemoteAssetEntityData> {
+class RemoteAssetEntityCompanion extends UpdateCompanion<RemoteAssetEntityData> {
   final Value<String> name;
   final Value<int> type;
   final Value<DateTime> createdAt;
@@ -982,69 +882,43 @@ class RemoteAssetEntityCompanion
   }
 }
 
-class LocalAssetEntity extends Table
-    with TableInfo<LocalAssetEntity, LocalAssetEntityData> {
+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,
+  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,
+  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,
+  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<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,
+  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,
+      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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum, isFavorite, orientation];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -1056,28 +930,18 @@ class LocalAssetEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -1092,8 +956,7 @@ class LocalAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAssetEntityData extends DataClass
-    implements Insertable<LocalAssetEntityData> {
+class LocalAssetEntityData extends DataClass implements Insertable<LocalAssetEntityData> {
   final String name;
   final int type;
   final DateTime createdAt;
@@ -1142,8 +1005,7 @@ class LocalAssetEntityData extends DataClass
     return map;
   }
 
-  factory LocalAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAssetEntityData(
       name: serializer.fromJson<String>(json['name']),
@@ -1196,9 +1058,7 @@ class LocalAssetEntityData extends DataClass
         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,
+        durationInSeconds: durationInSeconds.present ? durationInSeconds.value : this.durationInSeconds,
         id: id ?? this.id,
         checksum: checksum.present ? checksum.value : this.checksum,
         isFavorite: isFavorite ?? this.isFavorite,
@@ -1212,15 +1072,11 @@ class LocalAssetEntityData extends DataClass
       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,
+      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,
+      isFavorite: data.isFavorite.present ? data.isFavorite.value : this.isFavorite,
+      orientation: data.orientation.present ? data.orientation.value : this.orientation,
     );
   }
 
@@ -1243,8 +1099,8 @@ class LocalAssetEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(name, type, createdAt, updatedAt, width,
-      height, durationInSeconds, id, checksum, isFavorite, orientation);
+  int get hashCode => Object.hash(
+      name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum, isFavorite, orientation);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -1420,31 +1276,24 @@ class StackEntity extends Table with TableInfo<StackEntity, StackEntityData> {
   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,
+  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,
+  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,
+  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,
+      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];
+  List<GeneratedColumn> get $columns => [id, createdAt, updatedAt, ownerId, primaryAssetId];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -1456,16 +1305,12 @@ class StackEntity extends Table with TableInfo<StackEntity, StackEntityData> {
   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'])!,
+      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'])!,
     );
   }
 
@@ -1503,8 +1348,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
     return map;
   }
 
-  factory StackEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory StackEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return StackEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -1527,11 +1371,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
   }
 
   StackEntityData copyWith(
-          {String? id,
-          DateTime? createdAt,
-          DateTime? updatedAt,
-          String? ownerId,
-          String? primaryAssetId}) =>
+          {String? id, DateTime? createdAt, DateTime? updatedAt, String? ownerId, String? primaryAssetId}) =>
       StackEntityData(
         id: id ?? this.id,
         createdAt: createdAt ?? this.createdAt,
@@ -1545,9 +1385,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
       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,
+      primaryAssetId: data.primaryAssetId.present ? data.primaryAssetId.value : this.primaryAssetId,
     );
   }
 
@@ -1564,8 +1402,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
   }
 
   @override
-  int get hashCode =>
-      Object.hash(id, createdAt, updatedAt, ownerId, primaryAssetId);
+  int get hashCode => Object.hash(id, createdAt, updatedAt, ownerId, primaryAssetId);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -1664,24 +1501,19 @@ class StackEntityCompanion extends UpdateCompanion<StackEntityData> {
   }
 }
 
-class UserMetadataEntity extends Table
-    with TableInfo<UserMetadataEntity, UserMetadataEntityData> {
+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,
+  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);
+      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
@@ -1695,12 +1527,9 @@ class UserMetadataEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -1715,13 +1544,11 @@ class UserMetadataEntity extends Table
   bool get isStrict => true;
 }
 
-class UserMetadataEntityData extends DataClass
-    implements Insertable<UserMetadataEntityData> {
+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});
+  const UserMetadataEntityData({required this.userId, required this.key, required this.value});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -1731,8 +1558,7 @@ class UserMetadataEntityData extends DataClass
     return map;
   }
 
-  factory UserMetadataEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory UserMetadataEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return UserMetadataEntityData(
       userId: serializer.fromJson<String>(json['userId']),
@@ -1750,9 +1576,7 @@ class UserMetadataEntityData extends DataClass
     };
   }
 
-  UserMetadataEntityData copyWith(
-          {String? userId, int? key, Uint8List? value}) =>
-      UserMetadataEntityData(
+  UserMetadataEntityData copyWith({String? userId, int? key, Uint8List? value}) => UserMetadataEntityData(
         userId: userId ?? this.userId,
         key: key ?? this.key,
         value: value ?? this.value,
@@ -1786,8 +1610,7 @@ class UserMetadataEntityData extends DataClass
           $driftBlobEquality.equals(other.value, this.value));
 }
 
-class UserMetadataEntityCompanion
-    extends UpdateCompanion<UserMetadataEntityData> {
+class UserMetadataEntityCompanion extends UpdateCompanion<UserMetadataEntityData> {
   final Value<String> userId;
   final Value<int> key;
   final Value<Uint8List> value;
@@ -1815,8 +1638,7 @@ class UserMetadataEntityCompanion
     });
   }
 
-  UserMetadataEntityCompanion copyWith(
-      {Value<String>? userId, Value<int>? key, Value<Uint8List>? value}) {
+  UserMetadataEntityCompanion copyWith({Value<String>? userId, Value<int>? key, Value<Uint8List>? value}) {
     return UserMetadataEntityCompanion(
       userId: userId ?? this.userId,
       key: key ?? this.key,
@@ -1850,30 +1672,23 @@ class UserMetadataEntityCompanion
   }
 }
 
-class PartnerEntity extends Table
-    with TableInfo<PartnerEntity, PartnerEntityData> {
+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,
+  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,
+      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,
+      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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("in_timeline" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
   @override
   List<GeneratedColumn> get $columns => [sharedById, sharedWithId, inTimeline];
@@ -1888,12 +1703,9 @@ class PartnerEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -1908,15 +1720,11 @@ class PartnerEntity extends Table
   bool get isStrict => true;
 }
 
-class PartnerEntityData extends DataClass
-    implements Insertable<PartnerEntityData> {
+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});
+  const PartnerEntityData({required this.sharedById, required this.sharedWithId, required this.inTimeline});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -1926,8 +1734,7 @@ class PartnerEntityData extends DataClass
     return map;
   }
 
-  factory PartnerEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory PartnerEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return PartnerEntityData(
       sharedById: serializer.fromJson<String>(json['sharedById']),
@@ -1945,22 +1752,16 @@ class PartnerEntityData extends DataClass
     };
   }
 
-  PartnerEntityData copyWith(
-          {String? sharedById, String? sharedWithId, bool? inTimeline}) =>
-      PartnerEntityData(
+  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,
+      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,
     );
   }
 
@@ -2012,10 +1813,7 @@ class PartnerEntityCompanion extends UpdateCompanion<PartnerEntityData> {
     });
   }
 
-  PartnerEntityCompanion copyWith(
-      {Value<String>? sharedById,
-      Value<String>? sharedWithId,
-      Value<bool>? inTimeline}) {
+  PartnerEntityCompanion copyWith({Value<String>? sharedById, Value<String>? sharedWithId, Value<bool>? inTimeline}) {
     return PartnerEntityCompanion(
       sharedById: sharedById ?? this.sharedById,
       sharedWithId: sharedWithId ?? this.sharedWithId,
@@ -2049,42 +1847,32 @@ class PartnerEntityCompanion extends UpdateCompanion<PartnerEntityData> {
   }
 }
 
-class LocalAlbumEntity extends Table
-    with TableInfo<LocalAlbumEntity, LocalAlbumEntityData> {
+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,
+  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,
+  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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_ios_shared_album" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<bool> marker_ = GeneratedColumn<bool>(
-      'marker', aliasedName, true,
+  late final GeneratedColumn<bool> marker_ = GeneratedColumn<bool>('marker', aliasedName, true,
       type: DriftSqlType.bool,
       requiredDuringInsert: false,
-      defaultConstraints:
-          GeneratedColumn.constraintIsAlways('CHECK ("marker" IN (0, 1))'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("marker" IN (0, 1))'));
   @override
-  List<GeneratedColumn> get $columns =>
-      [id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_];
+  List<GeneratedColumn> get $columns => [id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -2096,18 +1884,13 @@ class LocalAlbumEntity extends Table
   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'])!,
-      marker_: attachedDatabase.typeMapping
-          .read(DriftSqlType.bool, data['${effectivePrefix}marker']),
+      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'])!,
+      marker_: attachedDatabase.typeMapping.read(DriftSqlType.bool, data['${effectivePrefix}marker']),
     );
   }
 
@@ -2122,8 +1905,7 @@ class LocalAlbumEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAlbumEntityData extends DataClass
-    implements Insertable<LocalAlbumEntityData> {
+class LocalAlbumEntityData extends DataClass implements Insertable<LocalAlbumEntityData> {
   final String id;
   final String name;
   final DateTime updatedAt;
@@ -2151,8 +1933,7 @@ class LocalAlbumEntityData extends DataClass
     return map;
   }
 
-  factory LocalAlbumEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAlbumEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAlbumEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -2196,12 +1977,8 @@ class LocalAlbumEntityData extends DataClass
       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,
+      backupSelection: data.backupSelection.present ? data.backupSelection.value : this.backupSelection,
+      isIosSharedAlbum: data.isIosSharedAlbum.present ? data.isIosSharedAlbum.value : this.isIosSharedAlbum,
       marker_: data.marker_.present ? data.marker_.value : this.marker_,
     );
   }
@@ -2220,8 +1997,7 @@ class LocalAlbumEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(
-      id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_);
+  int get hashCode => Object.hash(id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -2332,24 +2108,19 @@ class LocalAlbumEntityCompanion extends UpdateCompanion<LocalAlbumEntityData> {
   }
 }
 
-class LocalAlbumAssetEntity extends Table
-    with TableInfo<LocalAlbumAssetEntity, LocalAlbumAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES local_album_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, albumId];
   @override
@@ -2360,14 +2131,11 @@ class LocalAlbumAssetEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {assetId, albumId};
   @override
-  LocalAlbumAssetEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      albumId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}album_id'])!,
     );
   }
 
@@ -2382,12 +2150,10 @@ class LocalAlbumAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAlbumAssetEntityData extends DataClass
-    implements Insertable<LocalAlbumAssetEntityData> {
+class LocalAlbumAssetEntityData extends DataClass implements Insertable<LocalAlbumAssetEntityData> {
   final String assetId;
   final String albumId;
-  const LocalAlbumAssetEntityData(
-      {required this.assetId, required this.albumId});
+  const LocalAlbumAssetEntityData({required this.assetId, required this.albumId});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -2396,8 +2162,7 @@ class LocalAlbumAssetEntityData extends DataClass
     return map;
   }
 
-  factory LocalAlbumAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAlbumAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAlbumAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -2413,13 +2178,11 @@ class LocalAlbumAssetEntityData extends DataClass
     };
   }
 
-  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
-      LocalAlbumAssetEntityData(
+  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) => LocalAlbumAssetEntityData(
         assetId: assetId ?? this.assetId,
         albumId: albumId ?? this.albumId,
       );
-  LocalAlbumAssetEntityData copyWithCompanion(
-      LocalAlbumAssetEntityCompanion data) {
+  LocalAlbumAssetEntityData copyWithCompanion(LocalAlbumAssetEntityCompanion data) {
     return LocalAlbumAssetEntityData(
       assetId: data.assetId.present ? data.assetId.value : this.assetId,
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
@@ -2440,13 +2203,10 @@ class LocalAlbumAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is LocalAlbumAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.albumId == this.albumId);
+      (other is LocalAlbumAssetEntityData && other.assetId == this.assetId && other.albumId == this.albumId);
 }
 
-class LocalAlbumAssetEntityCompanion
-    extends UpdateCompanion<LocalAlbumAssetEntityData> {
+class LocalAlbumAssetEntityCompanion extends UpdateCompanion<LocalAlbumAssetEntityData> {
   final Value<String> assetId;
   final Value<String> albumId;
   const LocalAlbumAssetEntityCompanion({
@@ -2468,8 +2228,7 @@ class LocalAlbumAssetEntityCompanion
     });
   }
 
-  LocalAlbumAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? albumId}) {
+  LocalAlbumAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? albumId}) {
     return LocalAlbumAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       albumId: albumId ?? this.albumId,
@@ -2498,80 +2257,57 @@ class LocalAlbumAssetEntityCompanion
   }
 }
 
-class RemoteExifEntity extends Table
-    with TableInfo<RemoteExifEntity, RemoteExifEntityData> {
+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,
+  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,
+      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<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,
+  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<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,
+  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 => [
@@ -2609,50 +2345,29 @@ class RemoteExifEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -2667,8 +2382,7 @@ class RemoteExifEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteExifEntityData extends DataClass
-    implements Insertable<RemoteExifEntityData> {
+class RemoteExifEntityData extends DataClass implements Insertable<RemoteExifEntityData> {
   final String assetId;
   final String? city;
   final String? state;
@@ -2784,16 +2498,14 @@ class RemoteExifEntityData extends DataClass
     return map;
   }
 
-  factory RemoteExifEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  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']),
+      dateTimeOriginal: serializer.fromJson<DateTime?>(json['dateTimeOriginal']),
       description: serializer.fromJson<String?>(json['description']),
       height: serializer.fromJson<int?>(json['height']),
       width: serializer.fromJson<int?>(json['width']),
@@ -2870,14 +2582,11 @@ class RemoteExifEntityData extends DataClass
         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,
+        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,
+        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,
@@ -2890,8 +2599,7 @@ class RemoteExifEntityData extends DataClass
         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,
+        projectionType: projectionType.present ? projectionType.value : this.projectionType,
       );
   RemoteExifEntityData copyWithCompanion(RemoteExifEntityCompanion data) {
     return RemoteExifEntityData(
@@ -2899,33 +2607,24 @@ class RemoteExifEntityData extends DataClass
       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,
+      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,
+      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,
+      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,
+      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,
+      projectionType: data.projectionType.present ? data.projectionType.value : this.projectionType,
     );
   }
 
@@ -3283,67 +2982,43 @@ class RemoteExifEntityCompanion extends UpdateCompanion<RemoteExifEntityData> {
   }
 }
 
-class RemoteAlbumEntity extends Table
-    with TableInfo<RemoteAlbumEntity, RemoteAlbumEntityData> {
+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,
+  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,
+  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,
+  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,
+      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,
+      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))'),
+      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);
+  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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, name, description, createdAt, updatedAt, ownerId, thumbnailAssetId, isActivityEnabled, order];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -3355,24 +3030,17 @@ class RemoteAlbumEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -3387,8 +3055,7 @@ class RemoteAlbumEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumEntityData extends DataClass
-    implements Insertable<RemoteAlbumEntityData> {
+class RemoteAlbumEntityData extends DataClass implements Insertable<RemoteAlbumEntityData> {
   final String id;
   final String name;
   final String description;
@@ -3425,8 +3092,7 @@ class RemoteAlbumEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -3473,9 +3139,7 @@ class RemoteAlbumEntityData extends DataClass
         createdAt: createdAt ?? this.createdAt,
         updatedAt: updatedAt ?? this.updatedAt,
         ownerId: ownerId ?? this.ownerId,
-        thumbnailAssetId: thumbnailAssetId.present
-            ? thumbnailAssetId.value
-            : this.thumbnailAssetId,
+        thumbnailAssetId: thumbnailAssetId.present ? thumbnailAssetId.value : this.thumbnailAssetId,
         isActivityEnabled: isActivityEnabled ?? this.isActivityEnabled,
         order: order ?? this.order,
       );
@@ -3483,17 +3147,12 @@ class RemoteAlbumEntityData extends DataClass
     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,
+      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,
+      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,
     );
   }
@@ -3515,8 +3174,8 @@ class RemoteAlbumEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, name, description, createdAt, updatedAt,
-      ownerId, thumbnailAssetId, isActivityEnabled, order);
+  int get hashCode =>
+      Object.hash(id, name, description, createdAt, updatedAt, ownerId, thumbnailAssetId, isActivityEnabled, order);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -3532,8 +3191,7 @@ class RemoteAlbumEntityData extends DataClass
           other.order == this.order);
 }
 
-class RemoteAlbumEntityCompanion
-    extends UpdateCompanion<RemoteAlbumEntityData> {
+class RemoteAlbumEntityCompanion extends UpdateCompanion<RemoteAlbumEntityData> {
   final Value<String> id;
   final Value<String> name;
   final Value<String> description;
@@ -3665,24 +3323,19 @@ class RemoteAlbumEntityCompanion
   }
 }
 
-class RemoteAlbumAssetEntity extends Table
-    with TableInfo<RemoteAlbumAssetEntity, RemoteAlbumAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, albumId];
   @override
@@ -3693,14 +3346,11 @@ class RemoteAlbumAssetEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {assetId, albumId};
   @override
-  RemoteAlbumAssetEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      albumId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}album_id'])!,
     );
   }
 
@@ -3715,12 +3365,10 @@ class RemoteAlbumAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumAssetEntityData extends DataClass
-    implements Insertable<RemoteAlbumAssetEntityData> {
+class RemoteAlbumAssetEntityData extends DataClass implements Insertable<RemoteAlbumAssetEntityData> {
   final String assetId;
   final String albumId;
-  const RemoteAlbumAssetEntityData(
-      {required this.assetId, required this.albumId});
+  const RemoteAlbumAssetEntityData({required this.assetId, required this.albumId});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -3729,8 +3377,7 @@ class RemoteAlbumAssetEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -3746,13 +3393,11 @@ class RemoteAlbumAssetEntityData extends DataClass
     };
   }
 
-  RemoteAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
-      RemoteAlbumAssetEntityData(
+  RemoteAlbumAssetEntityData copyWith({String? assetId, String? albumId}) => RemoteAlbumAssetEntityData(
         assetId: assetId ?? this.assetId,
         albumId: albumId ?? this.albumId,
       );
-  RemoteAlbumAssetEntityData copyWithCompanion(
-      RemoteAlbumAssetEntityCompanion data) {
+  RemoteAlbumAssetEntityData copyWithCompanion(RemoteAlbumAssetEntityCompanion data) {
     return RemoteAlbumAssetEntityData(
       assetId: data.assetId.present ? data.assetId.value : this.assetId,
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
@@ -3773,13 +3418,10 @@ class RemoteAlbumAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is RemoteAlbumAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.albumId == this.albumId);
+      (other is RemoteAlbumAssetEntityData && other.assetId == this.assetId && other.albumId == this.albumId);
 }
 
-class RemoteAlbumAssetEntityCompanion
-    extends UpdateCompanion<RemoteAlbumAssetEntityData> {
+class RemoteAlbumAssetEntityCompanion extends UpdateCompanion<RemoteAlbumAssetEntityData> {
   final Value<String> assetId;
   final Value<String> albumId;
   const RemoteAlbumAssetEntityCompanion({
@@ -3801,8 +3443,7 @@ class RemoteAlbumAssetEntityCompanion
     });
   }
 
-  RemoteAlbumAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? albumId}) {
+  RemoteAlbumAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? albumId}) {
     return RemoteAlbumAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       albumId: albumId ?? this.albumId,
@@ -3831,27 +3472,21 @@ class RemoteAlbumAssetEntityCompanion
   }
 }
 
-class RemoteAlbumUserEntity extends Table
-    with TableInfo<RemoteAlbumUserEntity, RemoteAlbumUserEntityData> {
+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,
+  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,
+      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);
+      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
@@ -3862,16 +3497,12 @@ class RemoteAlbumUserEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {albumId, userId};
   @override
-  RemoteAlbumUserEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      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'])!,
     );
   }
 
@@ -3886,13 +3517,11 @@ class RemoteAlbumUserEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumUserEntityData extends DataClass
-    implements Insertable<RemoteAlbumUserEntityData> {
+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});
+  const RemoteAlbumUserEntityData({required this.albumId, required this.userId, required this.role});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -3902,8 +3531,7 @@ class RemoteAlbumUserEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumUserEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumUserEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumUserEntityData(
       albumId: serializer.fromJson<String>(json['albumId']),
@@ -3921,15 +3549,12 @@ class RemoteAlbumUserEntityData extends DataClass
     };
   }
 
-  RemoteAlbumUserEntityData copyWith(
-          {String? albumId, String? userId, int? role}) =>
-      RemoteAlbumUserEntityData(
+  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) {
+  RemoteAlbumUserEntityData copyWithCompanion(RemoteAlbumUserEntityCompanion data) {
     return RemoteAlbumUserEntityData(
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
       userId: data.userId.present ? data.userId.value : this.userId,
@@ -3958,8 +3583,7 @@ class RemoteAlbumUserEntityData extends DataClass
           other.role == this.role);
 }
 
-class RemoteAlbumUserEntityCompanion
-    extends UpdateCompanion<RemoteAlbumUserEntityData> {
+class RemoteAlbumUserEntityCompanion extends UpdateCompanion<RemoteAlbumUserEntityData> {
   final Value<String> albumId;
   final Value<String> userId;
   final Value<int> role;
@@ -3987,8 +3611,7 @@ class RemoteAlbumUserEntityCompanion
     });
   }
 
-  RemoteAlbumUserEntityCompanion copyWith(
-      {Value<String>? albumId, Value<String>? userId, Value<int>? role}) {
+  RemoteAlbumUserEntityCompanion copyWith({Value<String>? albumId, Value<String>? userId, Value<int>? role}) {
     return RemoteAlbumUserEntityCompanion(
       albumId: albumId ?? this.albumId,
       userId: userId ?? this.userId,
@@ -4022,74 +3645,47 @@ class RemoteAlbumUserEntityCompanion
   }
 }
 
-class MemoryEntity extends Table
-    with TableInfo<MemoryEntity, MemoryEntityData> {
+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,
+  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,
+  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,
+  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,
+  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,
+      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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_saved" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<DateTime> memoryAt = GeneratedColumn<DateTime>(
-      'memory_at', aliasedName, false,
+  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);
+  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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, createdAt, updatedAt, deletedAt, ownerId, type, data, isSaved, memoryAt, seenAt, showAt, hideAt];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -4101,30 +3697,18 @@ class MemoryEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -4139,8 +3723,7 @@ class MemoryEntity extends Table
   bool get isStrict => true;
 }
 
-class MemoryEntityData extends DataClass
-    implements Insertable<MemoryEntityData> {
+class MemoryEntityData extends DataClass implements Insertable<MemoryEntityData> {
   final String id;
   final DateTime createdAt;
   final DateTime updatedAt;
@@ -4192,8 +3775,7 @@ class MemoryEntityData extends DataClass
     return map;
   }
 
-  factory MemoryEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory MemoryEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return MemoryEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -4293,8 +3875,8 @@ class MemoryEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, createdAt, updatedAt, deletedAt, ownerId,
-      type, data, isSaved, memoryAt, seenAt, showAt, hideAt);
+  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) ||
@@ -4479,24 +4061,19 @@ class MemoryEntityCompanion extends UpdateCompanion<MemoryEntityData> {
   }
 }
 
-class MemoryAssetEntity extends Table
-    with TableInfo<MemoryAssetEntity, MemoryAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES memory_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, memoryId];
   @override
@@ -4510,10 +4087,8 @@ class MemoryAssetEntity extends Table
   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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      memoryId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}memory_id'])!,
     );
   }
 
@@ -4528,8 +4103,7 @@ class MemoryAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class MemoryAssetEntityData extends DataClass
-    implements Insertable<MemoryAssetEntityData> {
+class MemoryAssetEntityData extends DataClass implements Insertable<MemoryAssetEntityData> {
   final String assetId;
   final String memoryId;
   const MemoryAssetEntityData({required this.assetId, required this.memoryId});
@@ -4541,8 +4115,7 @@ class MemoryAssetEntityData extends DataClass
     return map;
   }
 
-  factory MemoryAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory MemoryAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return MemoryAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -4558,8 +4131,7 @@ class MemoryAssetEntityData extends DataClass
     };
   }
 
-  MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) =>
-      MemoryAssetEntityData(
+  MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) => MemoryAssetEntityData(
         assetId: assetId ?? this.assetId,
         memoryId: memoryId ?? this.memoryId,
       );
@@ -4584,13 +4156,10 @@ class MemoryAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is MemoryAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.memoryId == this.memoryId);
+      (other is MemoryAssetEntityData && other.assetId == this.assetId && other.memoryId == this.memoryId);
 }
 
-class MemoryAssetEntityCompanion
-    extends UpdateCompanion<MemoryAssetEntityData> {
+class MemoryAssetEntityCompanion extends UpdateCompanion<MemoryAssetEntityData> {
   final Value<String> assetId;
   final Value<String> memoryId;
   const MemoryAssetEntityCompanion({
@@ -4612,8 +4181,7 @@ class MemoryAssetEntityCompanion
     });
   }
 
-  MemoryAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? memoryId}) {
+  MemoryAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? memoryId}) {
     return MemoryAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       memoryId: memoryId ?? this.memoryId,
@@ -4642,72 +4210,46 @@ class MemoryAssetEntityCompanion
   }
 }
 
-class PersonEntity extends Table
-    with TableInfo<PersonEntity, PersonEntityData> {
+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,
+  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,
+  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,
+  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,
+      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<String> thumbnailPath = GeneratedColumn<String>(
-      'thumbnail_path', aliasedName, false,
+  late final GeneratedColumn<String> thumbnailPath = GeneratedColumn<String>('thumbnail_path', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<bool> isFavorite = GeneratedColumn<bool>(
-      'is_favorite', aliasedName, 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,
+      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,
+      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,
-        thumbnailPath,
-        isFavorite,
-        isHidden,
-        color,
-        birthDate
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, createdAt, updatedAt, ownerId, name, faceAssetId, thumbnailPath, isFavorite, isHidden, color, birthDate];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -4719,28 +4261,17 @@ class PersonEntity extends Table
   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']),
-      thumbnailPath: attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!,
-      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']),
+      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']),
+      thumbnailPath: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}thumbnail_path'])!,
+      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']),
     );
   }
 
@@ -4755,8 +4286,7 @@ class PersonEntity extends Table
   bool get isStrict => true;
 }
 
-class PersonEntityData extends DataClass
-    implements Insertable<PersonEntityData> {
+class PersonEntityData extends DataClass implements Insertable<PersonEntityData> {
   final String id;
   final DateTime createdAt;
   final DateTime updatedAt;
@@ -4803,8 +4333,7 @@ class PersonEntityData extends DataClass
     return map;
   }
 
-  factory PersonEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory PersonEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return PersonEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -4870,13 +4399,9 @@ class PersonEntityData extends DataClass
       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,
-      thumbnailPath: data.thumbnailPath.present
-          ? data.thumbnailPath.value
-          : this.thumbnailPath,
-      isFavorite:
-          data.isFavorite.present ? data.isFavorite.value : this.isFavorite,
+      faceAssetId: data.faceAssetId.present ? data.faceAssetId.value : this.faceAssetId,
+      thumbnailPath: data.thumbnailPath.present ? data.thumbnailPath.value : this.thumbnailPath,
+      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,
@@ -4902,8 +4427,8 @@ class PersonEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, createdAt, updatedAt, ownerId, name,
-      faceAssetId, thumbnailPath, isFavorite, isHidden, color, birthDate);
+  int get hashCode => Object.hash(
+      id, createdAt, updatedAt, ownerId, name, faceAssetId, thumbnailPath, isFavorite, isHidden, color, birthDate);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -5083,30 +4608,25 @@ class DatabaseAtV3 extends GeneratedDatabase {
   late final RemoteAssetEntity remoteAssetEntity = RemoteAssetEntity(this);
   late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
   late final StackEntity stackEntity = StackEntity(this);
-  late final Index idxLocalAssetChecksum = Index('idx_local_asset_checksum',
-      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
-  late final Index uQRemoteAssetOwnerChecksum = Index(
-      'UQ_remote_asset_owner_checksum',
+  late final Index idxLocalAssetChecksum =
+      Index('idx_local_asset_checksum', 'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  late final Index uQRemoteAssetOwnerChecksum = Index('UQ_remote_asset_owner_checksum',
       'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
-  late final Index idxRemoteAssetChecksum = Index('idx_remote_asset_checksum',
-      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  late final Index idxRemoteAssetChecksum =
+      Index('idx_remote_asset_checksum', 'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
   late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this);
   late final PartnerEntity partnerEntity = PartnerEntity(this);
   late final LocalAlbumEntity localAlbumEntity = LocalAlbumEntity(this);
-  late final LocalAlbumAssetEntity localAlbumAssetEntity =
-      LocalAlbumAssetEntity(this);
+  late final LocalAlbumAssetEntity localAlbumAssetEntity = LocalAlbumAssetEntity(this);
   late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this);
   late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(this);
-  late final RemoteAlbumAssetEntity remoteAlbumAssetEntity =
-      RemoteAlbumAssetEntity(this);
-  late final RemoteAlbumUserEntity remoteAlbumUserEntity =
-      RemoteAlbumUserEntity(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);
   @override
-  Iterable<TableInfo<Table, Object?>> get allTables =>
-      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  Iterable<TableInfo<Table, Object?>> get allTables => allSchemaEntities.whereType<TableInfo<Table, Object?>>();
   @override
   List<DatabaseSchemaEntity> get allSchemaEntities => [
         userEntity,
@@ -5131,6 +4651,5 @@ class DatabaseAtV3 extends GeneratedDatabase {
   @override
   int get schemaVersion => 3;
   @override
-  DriftDatabaseOptions get options =>
-      const DriftDatabaseOptions(storeDateTimeAsText: true);
+  DriftDatabaseOptions get options => const DriftDatabaseOptions(storeDateTimeAsText: true);
 }
diff --git a/mobile/test/drift/main/generated/schema_v4.dart b/mobile/test/drift/main/generated/schema_v4.dart
index 9cf72a098b..f54e5e9644 100644
--- a/mobile/test/drift/main/generated/schema_v4.dart
+++ b/mobile/test/drift/main/generated/schema_v4.dart
@@ -8,49 +8,30 @@ class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
   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<bool> isAdmin = GeneratedColumn<bool>(
-      'is_admin', aliasedName, false,
+  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<bool> isAdmin = GeneratedColumn<bool>('is_admin', aliasedName, false,
       type: DriftSqlType.bool,
       requiredDuringInsert: false,
-      defaultConstraints:
-          GeneratedColumn.constraintIsAlways('CHECK ("is_admin" IN (0, 1))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_admin" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<String> email = GeneratedColumn<String>(
-      'email', aliasedName, false,
-      type: DriftSqlType.string, requiredDuringInsert: true);
-  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>(
-      'profile_image_path', aliasedName, true,
+  late final GeneratedColumn<String> email =
+      GeneratedColumn<String>('email', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true);
+  late final GeneratedColumn<String> profileImagePath = GeneratedColumn<String>('profile_image_path', aliasedName, true,
       type: DriftSqlType.string, requiredDuringInsert: false);
-  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
-      'updated_at', aliasedName, false,
+  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> quotaSizeInBytes = GeneratedColumn<int>(
-      'quota_size_in_bytes', aliasedName, true,
+  late final GeneratedColumn<int> quotaSizeInBytes = GeneratedColumn<int>('quota_size_in_bytes', aliasedName, true,
       type: DriftSqlType.int, requiredDuringInsert: false);
-  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<int> quotaUsageInBytes = GeneratedColumn<int>('quota_usage_in_bytes', aliasedName, false,
+      type: DriftSqlType.int, requiredDuringInsert: false, defaultValue: const CustomExpression('0'));
   @override
-  List<GeneratedColumn> get $columns => [
-        id,
-        name,
-        isAdmin,
-        email,
-        profileImagePath,
-        updatedAt,
-        quotaSizeInBytes,
-        quotaUsageInBytes
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, name, isAdmin, email, profileImagePath, updatedAt, quotaSizeInBytes, quotaUsageInBytes];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -62,22 +43,17 @@ class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
   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'])!,
-      isAdmin: attachedDatabase.typeMapping
-          .read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
-      email: attachedDatabase.typeMapping
-          .read(DriftSqlType.string, data['${effectivePrefix}email'])!,
-      profileImagePath: attachedDatabase.typeMapping.read(
-          DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
-      updatedAt: attachedDatabase.typeMapping
-          .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
-      quotaSizeInBytes: attachedDatabase.typeMapping.read(
-          DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
-      quotaUsageInBytes: attachedDatabase.typeMapping.read(
-          DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
+      id: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}id'])!,
+      name: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}name'])!,
+      isAdmin: attachedDatabase.typeMapping.read(DriftSqlType.bool, data['${effectivePrefix}is_admin'])!,
+      email: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}email'])!,
+      profileImagePath:
+          attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}profile_image_path']),
+      updatedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      quotaSizeInBytes:
+          attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}quota_size_in_bytes']),
+      quotaUsageInBytes:
+          attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}quota_usage_in_bytes'])!,
     );
   }
 
@@ -128,8 +104,7 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
     return map;
   }
 
-  factory UserEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory UserEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return UserEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -171,13 +146,9 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
         name: name ?? this.name,
         isAdmin: isAdmin ?? this.isAdmin,
         email: email ?? this.email,
-        profileImagePath: profileImagePath.present
-            ? profileImagePath.value
-            : this.profileImagePath,
+        profileImagePath: profileImagePath.present ? profileImagePath.value : this.profileImagePath,
         updatedAt: updatedAt ?? this.updatedAt,
-        quotaSizeInBytes: quotaSizeInBytes.present
-            ? quotaSizeInBytes.value
-            : this.quotaSizeInBytes,
+        quotaSizeInBytes: quotaSizeInBytes.present ? quotaSizeInBytes.value : this.quotaSizeInBytes,
         quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
       );
   UserEntityData copyWithCompanion(UserEntityCompanion data) {
@@ -186,16 +157,10 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
       name: data.name.present ? data.name.value : this.name,
       isAdmin: data.isAdmin.present ? data.isAdmin.value : this.isAdmin,
       email: data.email.present ? data.email.value : this.email,
-      profileImagePath: data.profileImagePath.present
-          ? data.profileImagePath.value
-          : this.profileImagePath,
+      profileImagePath: data.profileImagePath.present ? data.profileImagePath.value : this.profileImagePath,
       updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
-      quotaSizeInBytes: data.quotaSizeInBytes.present
-          ? data.quotaSizeInBytes.value
-          : this.quotaSizeInBytes,
-      quotaUsageInBytes: data.quotaUsageInBytes.present
-          ? data.quotaUsageInBytes.value
-          : this.quotaUsageInBytes,
+      quotaSizeInBytes: data.quotaSizeInBytes.present ? data.quotaSizeInBytes.value : this.quotaSizeInBytes,
+      quotaUsageInBytes: data.quotaUsageInBytes.present ? data.quotaUsageInBytes.value : this.quotaUsageInBytes,
     );
   }
 
@@ -215,8 +180,8 @@ class UserEntityData extends DataClass implements Insertable<UserEntityData> {
   }
 
   @override
-  int get hashCode => Object.hash(id, name, isAdmin, email, profileImagePath,
-      updatedAt, quotaSizeInBytes, quotaUsageInBytes);
+  int get hashCode =>
+      Object.hash(id, name, isAdmin, email, profileImagePath, updatedAt, quotaSizeInBytes, quotaUsageInBytes);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -351,74 +316,55 @@ class UserEntityCompanion extends UpdateCompanion<UserEntityData> {
   }
 }
 
-class RemoteAssetEntity extends Table
-    with TableInfo<RemoteAssetEntity, RemoteAssetEntityData> {
+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,
+  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,
+  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,
+  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<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,
+  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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_favorite" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<String> ownerId = GeneratedColumn<String>(
-      'owner_id', aliasedName, 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<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,
+      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<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);
   @override
   List<GeneratedColumn> get $columns => [
         name,
@@ -450,40 +396,26 @@ class RemoteAssetEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -498,8 +430,7 @@ class RemoteAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAssetEntityData extends DataClass
-    implements Insertable<RemoteAssetEntityData> {
+class RemoteAssetEntityData extends DataClass implements Insertable<RemoteAssetEntityData> {
   final String name;
   final int type;
   final DateTime createdAt;
@@ -574,8 +505,7 @@ class RemoteAssetEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAssetEntityData(
       name: serializer.fromJson<String>(json['name']),
@@ -646,20 +576,15 @@ class RemoteAssetEntityData extends DataClass
         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,
+        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,
+        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,
+        livePhotoVideoId: livePhotoVideoId.present ? livePhotoVideoId.value : this.livePhotoVideoId,
         visibility: visibility ?? this.visibility,
         stackId: stackId.present ? stackId.value : this.stackId,
       );
@@ -671,24 +596,16 @@ class RemoteAssetEntityData extends DataClass
       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,
+      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,
+      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,
+      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,
+      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,
     );
   }
@@ -718,24 +635,8 @@ class RemoteAssetEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(
-      name,
-      type,
-      createdAt,
-      updatedAt,
-      width,
-      height,
-      durationInSeconds,
-      id,
-      checksum,
-      isFavorite,
-      ownerId,
-      localDateTime,
-      thumbHash,
-      deletedAt,
-      livePhotoVideoId,
-      visibility,
-      stackId);
+  int get hashCode => Object.hash(name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum,
+      isFavorite, ownerId, localDateTime, thumbHash, deletedAt, livePhotoVideoId, visibility, stackId);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -759,8 +660,7 @@ class RemoteAssetEntityData extends DataClass
           other.stackId == this.stackId);
 }
 
-class RemoteAssetEntityCompanion
-    extends UpdateCompanion<RemoteAssetEntityData> {
+class RemoteAssetEntityCompanion extends UpdateCompanion<RemoteAssetEntityData> {
   final Value<String> name;
   final Value<int> type;
   final Value<DateTime> createdAt;
@@ -987,31 +887,24 @@ class StackEntity extends Table with TableInfo<StackEntity, StackEntityData> {
   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,
+  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,
+  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,
+  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,
+      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];
+  List<GeneratedColumn> get $columns => [id, createdAt, updatedAt, ownerId, primaryAssetId];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -1023,16 +916,12 @@ class StackEntity extends Table with TableInfo<StackEntity, StackEntityData> {
   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'])!,
+      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'])!,
     );
   }
 
@@ -1070,8 +959,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
     return map;
   }
 
-  factory StackEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory StackEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return StackEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -1094,11 +982,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
   }
 
   StackEntityData copyWith(
-          {String? id,
-          DateTime? createdAt,
-          DateTime? updatedAt,
-          String? ownerId,
-          String? primaryAssetId}) =>
+          {String? id, DateTime? createdAt, DateTime? updatedAt, String? ownerId, String? primaryAssetId}) =>
       StackEntityData(
         id: id ?? this.id,
         createdAt: createdAt ?? this.createdAt,
@@ -1112,9 +996,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
       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,
+      primaryAssetId: data.primaryAssetId.present ? data.primaryAssetId.value : this.primaryAssetId,
     );
   }
 
@@ -1131,8 +1013,7 @@ class StackEntityData extends DataClass implements Insertable<StackEntityData> {
   }
 
   @override
-  int get hashCode =>
-      Object.hash(id, createdAt, updatedAt, ownerId, primaryAssetId);
+  int get hashCode => Object.hash(id, createdAt, updatedAt, ownerId, primaryAssetId);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -1231,69 +1112,43 @@ class StackEntityCompanion extends UpdateCompanion<StackEntityData> {
   }
 }
 
-class LocalAssetEntity extends Table
-    with TableInfo<LocalAssetEntity, LocalAssetEntityData> {
+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,
+  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,
+  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,
+  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<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,
+  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,
+      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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum, isFavorite, orientation];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -1305,28 +1160,18 @@ class LocalAssetEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -1341,8 +1186,7 @@ class LocalAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAssetEntityData extends DataClass
-    implements Insertable<LocalAssetEntityData> {
+class LocalAssetEntityData extends DataClass implements Insertable<LocalAssetEntityData> {
   final String name;
   final int type;
   final DateTime createdAt;
@@ -1391,8 +1235,7 @@ class LocalAssetEntityData extends DataClass
     return map;
   }
 
-  factory LocalAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAssetEntityData(
       name: serializer.fromJson<String>(json['name']),
@@ -1445,9 +1288,7 @@ class LocalAssetEntityData extends DataClass
         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,
+        durationInSeconds: durationInSeconds.present ? durationInSeconds.value : this.durationInSeconds,
         id: id ?? this.id,
         checksum: checksum.present ? checksum.value : this.checksum,
         isFavorite: isFavorite ?? this.isFavorite,
@@ -1461,15 +1302,11 @@ class LocalAssetEntityData extends DataClass
       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,
+      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,
+      isFavorite: data.isFavorite.present ? data.isFavorite.value : this.isFavorite,
+      orientation: data.orientation.present ? data.orientation.value : this.orientation,
     );
   }
 
@@ -1492,8 +1329,8 @@ class LocalAssetEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(name, type, createdAt, updatedAt, width,
-      height, durationInSeconds, id, checksum, isFavorite, orientation);
+  int get hashCode => Object.hash(
+      name, type, createdAt, updatedAt, width, height, durationInSeconds, id, checksum, isFavorite, orientation);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -1664,42 +1501,32 @@ class LocalAssetEntityCompanion extends UpdateCompanion<LocalAssetEntityData> {
   }
 }
 
-class LocalAlbumEntity extends Table
-    with TableInfo<LocalAlbumEntity, LocalAlbumEntityData> {
+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,
+  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,
+  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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_ios_shared_album" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<bool> marker_ = GeneratedColumn<bool>(
-      'marker', aliasedName, true,
+  late final GeneratedColumn<bool> marker_ = GeneratedColumn<bool>('marker', aliasedName, true,
       type: DriftSqlType.bool,
       requiredDuringInsert: false,
-      defaultConstraints:
-          GeneratedColumn.constraintIsAlways('CHECK ("marker" IN (0, 1))'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("marker" IN (0, 1))'));
   @override
-  List<GeneratedColumn> get $columns =>
-      [id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_];
+  List<GeneratedColumn> get $columns => [id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -1711,18 +1538,13 @@ class LocalAlbumEntity extends Table
   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'])!,
-      marker_: attachedDatabase.typeMapping
-          .read(DriftSqlType.bool, data['${effectivePrefix}marker']),
+      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'])!,
+      marker_: attachedDatabase.typeMapping.read(DriftSqlType.bool, data['${effectivePrefix}marker']),
     );
   }
 
@@ -1737,8 +1559,7 @@ class LocalAlbumEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAlbumEntityData extends DataClass
-    implements Insertable<LocalAlbumEntityData> {
+class LocalAlbumEntityData extends DataClass implements Insertable<LocalAlbumEntityData> {
   final String id;
   final String name;
   final DateTime updatedAt;
@@ -1766,8 +1587,7 @@ class LocalAlbumEntityData extends DataClass
     return map;
   }
 
-  factory LocalAlbumEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAlbumEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAlbumEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -1811,12 +1631,8 @@ class LocalAlbumEntityData extends DataClass
       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,
+      backupSelection: data.backupSelection.present ? data.backupSelection.value : this.backupSelection,
+      isIosSharedAlbum: data.isIosSharedAlbum.present ? data.isIosSharedAlbum.value : this.isIosSharedAlbum,
       marker_: data.marker_.present ? data.marker_.value : this.marker_,
     );
   }
@@ -1835,8 +1651,7 @@ class LocalAlbumEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(
-      id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_);
+  int get hashCode => Object.hash(id, name, updatedAt, backupSelection, isIosSharedAlbum, marker_);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -1947,24 +1762,19 @@ class LocalAlbumEntityCompanion extends UpdateCompanion<LocalAlbumEntityData> {
   }
 }
 
-class LocalAlbumAssetEntity extends Table
-    with TableInfo<LocalAlbumAssetEntity, LocalAlbumAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES local_album_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, albumId];
   @override
@@ -1975,14 +1785,11 @@ class LocalAlbumAssetEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {assetId, albumId};
   @override
-  LocalAlbumAssetEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      albumId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}album_id'])!,
     );
   }
 
@@ -1997,12 +1804,10 @@ class LocalAlbumAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class LocalAlbumAssetEntityData extends DataClass
-    implements Insertable<LocalAlbumAssetEntityData> {
+class LocalAlbumAssetEntityData extends DataClass implements Insertable<LocalAlbumAssetEntityData> {
   final String assetId;
   final String albumId;
-  const LocalAlbumAssetEntityData(
-      {required this.assetId, required this.albumId});
+  const LocalAlbumAssetEntityData({required this.assetId, required this.albumId});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -2011,8 +1816,7 @@ class LocalAlbumAssetEntityData extends DataClass
     return map;
   }
 
-  factory LocalAlbumAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory LocalAlbumAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return LocalAlbumAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -2028,13 +1832,11 @@ class LocalAlbumAssetEntityData extends DataClass
     };
   }
 
-  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
-      LocalAlbumAssetEntityData(
+  LocalAlbumAssetEntityData copyWith({String? assetId, String? albumId}) => LocalAlbumAssetEntityData(
         assetId: assetId ?? this.assetId,
         albumId: albumId ?? this.albumId,
       );
-  LocalAlbumAssetEntityData copyWithCompanion(
-      LocalAlbumAssetEntityCompanion data) {
+  LocalAlbumAssetEntityData copyWithCompanion(LocalAlbumAssetEntityCompanion data) {
     return LocalAlbumAssetEntityData(
       assetId: data.assetId.present ? data.assetId.value : this.assetId,
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
@@ -2055,13 +1857,10 @@ class LocalAlbumAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is LocalAlbumAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.albumId == this.albumId);
+      (other is LocalAlbumAssetEntityData && other.assetId == this.assetId && other.albumId == this.albumId);
 }
 
-class LocalAlbumAssetEntityCompanion
-    extends UpdateCompanion<LocalAlbumAssetEntityData> {
+class LocalAlbumAssetEntityCompanion extends UpdateCompanion<LocalAlbumAssetEntityData> {
   final Value<String> assetId;
   final Value<String> albumId;
   const LocalAlbumAssetEntityCompanion({
@@ -2083,8 +1882,7 @@ class LocalAlbumAssetEntityCompanion
     });
   }
 
-  LocalAlbumAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? albumId}) {
+  LocalAlbumAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? albumId}) {
     return LocalAlbumAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       albumId: albumId ?? this.albumId,
@@ -2113,24 +1911,19 @@ class LocalAlbumAssetEntityCompanion
   }
 }
 
-class UserMetadataEntity extends Table
-    with TableInfo<UserMetadataEntity, UserMetadataEntityData> {
+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,
+  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);
+      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
@@ -2144,12 +1937,9 @@ class UserMetadataEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -2164,13 +1954,11 @@ class UserMetadataEntity extends Table
   bool get isStrict => true;
 }
 
-class UserMetadataEntityData extends DataClass
-    implements Insertable<UserMetadataEntityData> {
+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});
+  const UserMetadataEntityData({required this.userId, required this.key, required this.value});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -2180,8 +1968,7 @@ class UserMetadataEntityData extends DataClass
     return map;
   }
 
-  factory UserMetadataEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory UserMetadataEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return UserMetadataEntityData(
       userId: serializer.fromJson<String>(json['userId']),
@@ -2199,9 +1986,7 @@ class UserMetadataEntityData extends DataClass
     };
   }
 
-  UserMetadataEntityData copyWith(
-          {String? userId, int? key, Uint8List? value}) =>
-      UserMetadataEntityData(
+  UserMetadataEntityData copyWith({String? userId, int? key, Uint8List? value}) => UserMetadataEntityData(
         userId: userId ?? this.userId,
         key: key ?? this.key,
         value: value ?? this.value,
@@ -2235,8 +2020,7 @@ class UserMetadataEntityData extends DataClass
           $driftBlobEquality.equals(other.value, this.value));
 }
 
-class UserMetadataEntityCompanion
-    extends UpdateCompanion<UserMetadataEntityData> {
+class UserMetadataEntityCompanion extends UpdateCompanion<UserMetadataEntityData> {
   final Value<String> userId;
   final Value<int> key;
   final Value<Uint8List> value;
@@ -2264,8 +2048,7 @@ class UserMetadataEntityCompanion
     });
   }
 
-  UserMetadataEntityCompanion copyWith(
-      {Value<String>? userId, Value<int>? key, Value<Uint8List>? value}) {
+  UserMetadataEntityCompanion copyWith({Value<String>? userId, Value<int>? key, Value<Uint8List>? value}) {
     return UserMetadataEntityCompanion(
       userId: userId ?? this.userId,
       key: key ?? this.key,
@@ -2299,30 +2082,23 @@ class UserMetadataEntityCompanion
   }
 }
 
-class PartnerEntity extends Table
-    with TableInfo<PartnerEntity, PartnerEntityData> {
+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,
+  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,
+      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,
+      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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("in_timeline" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
   @override
   List<GeneratedColumn> get $columns => [sharedById, sharedWithId, inTimeline];
@@ -2337,12 +2113,9 @@ class PartnerEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -2357,15 +2130,11 @@ class PartnerEntity extends Table
   bool get isStrict => true;
 }
 
-class PartnerEntityData extends DataClass
-    implements Insertable<PartnerEntityData> {
+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});
+  const PartnerEntityData({required this.sharedById, required this.sharedWithId, required this.inTimeline});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -2375,8 +2144,7 @@ class PartnerEntityData extends DataClass
     return map;
   }
 
-  factory PartnerEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory PartnerEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return PartnerEntityData(
       sharedById: serializer.fromJson<String>(json['sharedById']),
@@ -2394,22 +2162,16 @@ class PartnerEntityData extends DataClass
     };
   }
 
-  PartnerEntityData copyWith(
-          {String? sharedById, String? sharedWithId, bool? inTimeline}) =>
-      PartnerEntityData(
+  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,
+      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,
     );
   }
 
@@ -2461,10 +2223,7 @@ class PartnerEntityCompanion extends UpdateCompanion<PartnerEntityData> {
     });
   }
 
-  PartnerEntityCompanion copyWith(
-      {Value<String>? sharedById,
-      Value<String>? sharedWithId,
-      Value<bool>? inTimeline}) {
+  PartnerEntityCompanion copyWith({Value<String>? sharedById, Value<String>? sharedWithId, Value<bool>? inTimeline}) {
     return PartnerEntityCompanion(
       sharedById: sharedById ?? this.sharedById,
       sharedWithId: sharedWithId ?? this.sharedWithId,
@@ -2498,80 +2257,57 @@ class PartnerEntityCompanion extends UpdateCompanion<PartnerEntityData> {
   }
 }
 
-class RemoteExifEntity extends Table
-    with TableInfo<RemoteExifEntity, RemoteExifEntityData> {
+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,
+  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,
+      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<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,
+  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<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,
+  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 => [
@@ -2609,50 +2345,29 @@ class RemoteExifEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -2667,8 +2382,7 @@ class RemoteExifEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteExifEntityData extends DataClass
-    implements Insertable<RemoteExifEntityData> {
+class RemoteExifEntityData extends DataClass implements Insertable<RemoteExifEntityData> {
   final String assetId;
   final String? city;
   final String? state;
@@ -2784,16 +2498,14 @@ class RemoteExifEntityData extends DataClass
     return map;
   }
 
-  factory RemoteExifEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  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']),
+      dateTimeOriginal: serializer.fromJson<DateTime?>(json['dateTimeOriginal']),
       description: serializer.fromJson<String?>(json['description']),
       height: serializer.fromJson<int?>(json['height']),
       width: serializer.fromJson<int?>(json['width']),
@@ -2870,14 +2582,11 @@ class RemoteExifEntityData extends DataClass
         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,
+        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,
+        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,
@@ -2890,8 +2599,7 @@ class RemoteExifEntityData extends DataClass
         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,
+        projectionType: projectionType.present ? projectionType.value : this.projectionType,
       );
   RemoteExifEntityData copyWithCompanion(RemoteExifEntityCompanion data) {
     return RemoteExifEntityData(
@@ -2899,33 +2607,24 @@ class RemoteExifEntityData extends DataClass
       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,
+      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,
+      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,
+      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,
+      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,
+      projectionType: data.projectionType.present ? data.projectionType.value : this.projectionType,
     );
   }
 
@@ -3283,67 +2982,43 @@ class RemoteExifEntityCompanion extends UpdateCompanion<RemoteExifEntityData> {
   }
 }
 
-class RemoteAlbumEntity extends Table
-    with TableInfo<RemoteAlbumEntity, RemoteAlbumEntityData> {
+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,
+  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,
+  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,
+  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,
+      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,
+      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))'),
+      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);
+  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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, name, description, createdAt, updatedAt, ownerId, thumbnailAssetId, isActivityEnabled, order];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -3355,24 +3030,17 @@ class RemoteAlbumEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -3387,8 +3055,7 @@ class RemoteAlbumEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumEntityData extends DataClass
-    implements Insertable<RemoteAlbumEntityData> {
+class RemoteAlbumEntityData extends DataClass implements Insertable<RemoteAlbumEntityData> {
   final String id;
   final String name;
   final String description;
@@ -3425,8 +3092,7 @@ class RemoteAlbumEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -3473,9 +3139,7 @@ class RemoteAlbumEntityData extends DataClass
         createdAt: createdAt ?? this.createdAt,
         updatedAt: updatedAt ?? this.updatedAt,
         ownerId: ownerId ?? this.ownerId,
-        thumbnailAssetId: thumbnailAssetId.present
-            ? thumbnailAssetId.value
-            : this.thumbnailAssetId,
+        thumbnailAssetId: thumbnailAssetId.present ? thumbnailAssetId.value : this.thumbnailAssetId,
         isActivityEnabled: isActivityEnabled ?? this.isActivityEnabled,
         order: order ?? this.order,
       );
@@ -3483,17 +3147,12 @@ class RemoteAlbumEntityData extends DataClass
     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,
+      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,
+      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,
     );
   }
@@ -3515,8 +3174,8 @@ class RemoteAlbumEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, name, description, createdAt, updatedAt,
-      ownerId, thumbnailAssetId, isActivityEnabled, order);
+  int get hashCode =>
+      Object.hash(id, name, description, createdAt, updatedAt, ownerId, thumbnailAssetId, isActivityEnabled, order);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -3532,8 +3191,7 @@ class RemoteAlbumEntityData extends DataClass
           other.order == this.order);
 }
 
-class RemoteAlbumEntityCompanion
-    extends UpdateCompanion<RemoteAlbumEntityData> {
+class RemoteAlbumEntityCompanion extends UpdateCompanion<RemoteAlbumEntityData> {
   final Value<String> id;
   final Value<String> name;
   final Value<String> description;
@@ -3665,24 +3323,19 @@ class RemoteAlbumEntityCompanion
   }
 }
 
-class RemoteAlbumAssetEntity extends Table
-    with TableInfo<RemoteAlbumAssetEntity, RemoteAlbumAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, albumId];
   @override
@@ -3693,14 +3346,11 @@ class RemoteAlbumAssetEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {assetId, albumId};
   @override
-  RemoteAlbumAssetEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      albumId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}album_id'])!,
     );
   }
 
@@ -3715,12 +3365,10 @@ class RemoteAlbumAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumAssetEntityData extends DataClass
-    implements Insertable<RemoteAlbumAssetEntityData> {
+class RemoteAlbumAssetEntityData extends DataClass implements Insertable<RemoteAlbumAssetEntityData> {
   final String assetId;
   final String albumId;
-  const RemoteAlbumAssetEntityData(
-      {required this.assetId, required this.albumId});
+  const RemoteAlbumAssetEntityData({required this.assetId, required this.albumId});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -3729,8 +3377,7 @@ class RemoteAlbumAssetEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -3746,13 +3393,11 @@ class RemoteAlbumAssetEntityData extends DataClass
     };
   }
 
-  RemoteAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
-      RemoteAlbumAssetEntityData(
+  RemoteAlbumAssetEntityData copyWith({String? assetId, String? albumId}) => RemoteAlbumAssetEntityData(
         assetId: assetId ?? this.assetId,
         albumId: albumId ?? this.albumId,
       );
-  RemoteAlbumAssetEntityData copyWithCompanion(
-      RemoteAlbumAssetEntityCompanion data) {
+  RemoteAlbumAssetEntityData copyWithCompanion(RemoteAlbumAssetEntityCompanion data) {
     return RemoteAlbumAssetEntityData(
       assetId: data.assetId.present ? data.assetId.value : this.assetId,
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
@@ -3773,13 +3418,10 @@ class RemoteAlbumAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is RemoteAlbumAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.albumId == this.albumId);
+      (other is RemoteAlbumAssetEntityData && other.assetId == this.assetId && other.albumId == this.albumId);
 }
 
-class RemoteAlbumAssetEntityCompanion
-    extends UpdateCompanion<RemoteAlbumAssetEntityData> {
+class RemoteAlbumAssetEntityCompanion extends UpdateCompanion<RemoteAlbumAssetEntityData> {
   final Value<String> assetId;
   final Value<String> albumId;
   const RemoteAlbumAssetEntityCompanion({
@@ -3801,8 +3443,7 @@ class RemoteAlbumAssetEntityCompanion
     });
   }
 
-  RemoteAlbumAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? albumId}) {
+  RemoteAlbumAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? albumId}) {
     return RemoteAlbumAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       albumId: albumId ?? this.albumId,
@@ -3831,27 +3472,21 @@ class RemoteAlbumAssetEntityCompanion
   }
 }
 
-class RemoteAlbumUserEntity extends Table
-    with TableInfo<RemoteAlbumUserEntity, RemoteAlbumUserEntityData> {
+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,
+  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,
+      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);
+      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
@@ -3862,16 +3497,12 @@ class RemoteAlbumUserEntity extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => {albumId, userId};
   @override
-  RemoteAlbumUserEntityData map(Map<String, dynamic> data,
-      {String? tablePrefix}) {
+  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'])!,
+      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'])!,
     );
   }
 
@@ -3886,13 +3517,11 @@ class RemoteAlbumUserEntity extends Table
   bool get isStrict => true;
 }
 
-class RemoteAlbumUserEntityData extends DataClass
-    implements Insertable<RemoteAlbumUserEntityData> {
+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});
+  const RemoteAlbumUserEntityData({required this.albumId, required this.userId, required this.role});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -3902,8 +3531,7 @@ class RemoteAlbumUserEntityData extends DataClass
     return map;
   }
 
-  factory RemoteAlbumUserEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory RemoteAlbumUserEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return RemoteAlbumUserEntityData(
       albumId: serializer.fromJson<String>(json['albumId']),
@@ -3921,15 +3549,12 @@ class RemoteAlbumUserEntityData extends DataClass
     };
   }
 
-  RemoteAlbumUserEntityData copyWith(
-          {String? albumId, String? userId, int? role}) =>
-      RemoteAlbumUserEntityData(
+  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) {
+  RemoteAlbumUserEntityData copyWithCompanion(RemoteAlbumUserEntityCompanion data) {
     return RemoteAlbumUserEntityData(
       albumId: data.albumId.present ? data.albumId.value : this.albumId,
       userId: data.userId.present ? data.userId.value : this.userId,
@@ -3958,8 +3583,7 @@ class RemoteAlbumUserEntityData extends DataClass
           other.role == this.role);
 }
 
-class RemoteAlbumUserEntityCompanion
-    extends UpdateCompanion<RemoteAlbumUserEntityData> {
+class RemoteAlbumUserEntityCompanion extends UpdateCompanion<RemoteAlbumUserEntityData> {
   final Value<String> albumId;
   final Value<String> userId;
   final Value<int> role;
@@ -3987,8 +3611,7 @@ class RemoteAlbumUserEntityCompanion
     });
   }
 
-  RemoteAlbumUserEntityCompanion copyWith(
-      {Value<String>? albumId, Value<String>? userId, Value<int>? role}) {
+  RemoteAlbumUserEntityCompanion copyWith({Value<String>? albumId, Value<String>? userId, Value<int>? role}) {
     return RemoteAlbumUserEntityCompanion(
       albumId: albumId ?? this.albumId,
       userId: userId ?? this.userId,
@@ -4022,74 +3645,47 @@ class RemoteAlbumUserEntityCompanion
   }
 }
 
-class MemoryEntity extends Table
-    with TableInfo<MemoryEntity, MemoryEntityData> {
+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,
+  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,
+  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,
+  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,
+  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,
+      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))'),
+      defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("is_saved" IN (0, 1))'),
       defaultValue: const CustomExpression('0'));
-  late final GeneratedColumn<DateTime> memoryAt = GeneratedColumn<DateTime>(
-      'memory_at', aliasedName, false,
+  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);
+  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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, createdAt, updatedAt, deletedAt, ownerId, type, data, isSaved, memoryAt, seenAt, showAt, hideAt];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -4101,30 +3697,18 @@ class MemoryEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -4139,8 +3723,7 @@ class MemoryEntity extends Table
   bool get isStrict => true;
 }
 
-class MemoryEntityData extends DataClass
-    implements Insertable<MemoryEntityData> {
+class MemoryEntityData extends DataClass implements Insertable<MemoryEntityData> {
   final String id;
   final DateTime createdAt;
   final DateTime updatedAt;
@@ -4192,8 +3775,7 @@ class MemoryEntityData extends DataClass
     return map;
   }
 
-  factory MemoryEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory MemoryEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return MemoryEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -4293,8 +3875,8 @@ class MemoryEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, createdAt, updatedAt, deletedAt, ownerId,
-      type, data, isSaved, memoryAt, seenAt, showAt, hideAt);
+  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) ||
@@ -4479,24 +4061,19 @@ class MemoryEntityCompanion extends UpdateCompanion<MemoryEntityData> {
   }
 }
 
-class MemoryAssetEntity extends Table
-    with TableInfo<MemoryAssetEntity, MemoryAssetEntityData> {
+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,
+  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,
+      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'));
+      defaultConstraints: GeneratedColumn.constraintIsAlways('REFERENCES memory_entity (id) ON DELETE CASCADE'));
   @override
   List<GeneratedColumn> get $columns => [assetId, memoryId];
   @override
@@ -4510,10 +4087,8 @@ class MemoryAssetEntity extends Table
   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'])!,
+      assetId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      memoryId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}memory_id'])!,
     );
   }
 
@@ -4528,8 +4103,7 @@ class MemoryAssetEntity extends Table
   bool get isStrict => true;
 }
 
-class MemoryAssetEntityData extends DataClass
-    implements Insertable<MemoryAssetEntityData> {
+class MemoryAssetEntityData extends DataClass implements Insertable<MemoryAssetEntityData> {
   final String assetId;
   final String memoryId;
   const MemoryAssetEntityData({required this.assetId, required this.memoryId});
@@ -4541,8 +4115,7 @@ class MemoryAssetEntityData extends DataClass
     return map;
   }
 
-  factory MemoryAssetEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory MemoryAssetEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return MemoryAssetEntityData(
       assetId: serializer.fromJson<String>(json['assetId']),
@@ -4558,8 +4131,7 @@ class MemoryAssetEntityData extends DataClass
     };
   }
 
-  MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) =>
-      MemoryAssetEntityData(
+  MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) => MemoryAssetEntityData(
         assetId: assetId ?? this.assetId,
         memoryId: memoryId ?? this.memoryId,
       );
@@ -4584,13 +4156,10 @@ class MemoryAssetEntityData extends DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is MemoryAssetEntityData &&
-          other.assetId == this.assetId &&
-          other.memoryId == this.memoryId);
+      (other is MemoryAssetEntityData && other.assetId == this.assetId && other.memoryId == this.memoryId);
 }
 
-class MemoryAssetEntityCompanion
-    extends UpdateCompanion<MemoryAssetEntityData> {
+class MemoryAssetEntityCompanion extends UpdateCompanion<MemoryAssetEntityData> {
   final Value<String> assetId;
   final Value<String> memoryId;
   const MemoryAssetEntityCompanion({
@@ -4612,8 +4181,7 @@ class MemoryAssetEntityCompanion
     });
   }
 
-  MemoryAssetEntityCompanion copyWith(
-      {Value<String>? assetId, Value<String>? memoryId}) {
+  MemoryAssetEntityCompanion copyWith({Value<String>? assetId, Value<String>? memoryId}) {
     return MemoryAssetEntityCompanion(
       assetId: assetId ?? this.assetId,
       memoryId: memoryId ?? this.memoryId,
@@ -4642,68 +4210,44 @@ class MemoryAssetEntityCompanion
   }
 }
 
-class PersonEntity extends Table
-    with TableInfo<PersonEntity, PersonEntityData> {
+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,
+  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,
+  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,
+  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,
+      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,
+  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,
+      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,
+      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
-      ];
+  List<GeneratedColumn> get $columns =>
+      [id, createdAt, updatedAt, ownerId, name, faceAssetId, isFavorite, isHidden, color, birthDate];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -4715,26 +4259,16 @@ class PersonEntity extends Table
   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']),
+      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']),
     );
   }
 
@@ -4749,8 +4283,7 @@ class PersonEntity extends Table
   bool get isStrict => true;
 }
 
-class PersonEntityData extends DataClass
-    implements Insertable<PersonEntityData> {
+class PersonEntityData extends DataClass implements Insertable<PersonEntityData> {
   final String id;
   final DateTime createdAt;
   final DateTime updatedAt;
@@ -4794,8 +4327,7 @@ class PersonEntityData extends DataClass
     return map;
   }
 
-  factory PersonEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory PersonEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return PersonEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -4857,10 +4389,8 @@ class PersonEntityData extends DataClass
       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,
+      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,
@@ -4885,8 +4415,8 @@ class PersonEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(id, createdAt, updatedAt, ownerId, name,
-      faceAssetId, isFavorite, isHidden, color, birthDate);
+  int get hashCode =>
+      Object.hash(id, createdAt, updatedAt, ownerId, name, faceAssetId, isFavorite, isHidden, color, birthDate);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -5047,48 +4577,35 @@ class PersonEntityCompanion extends UpdateCompanion<PersonEntityData> {
   }
 }
 
-class AssetFaceEntity extends Table
-    with TableInfo<AssetFaceEntity, AssetFaceEntityData> {
+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,
+  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,
+      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);
+      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,
@@ -5113,26 +4630,16 @@ class AssetFaceEntity extends Table
   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'])!,
+      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'])!,
     );
   }
 
@@ -5147,8 +4654,7 @@ class AssetFaceEntity extends Table
   bool get isStrict => true;
 }
 
-class AssetFaceEntityData extends DataClass
-    implements Insertable<AssetFaceEntityData> {
+class AssetFaceEntityData extends DataClass implements Insertable<AssetFaceEntityData> {
   final String id;
   final String assetId;
   final String? personId;
@@ -5188,8 +4694,7 @@ class AssetFaceEntityData extends DataClass
     return map;
   }
 
-  factory AssetFaceEntityData.fromJson(Map<String, dynamic> json,
-      {ValueSerializer? serializer}) {
+  factory AssetFaceEntityData.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return AssetFaceEntityData(
       id: serializer.fromJson<String>(json['id']),
@@ -5249,24 +4754,13 @@ class AssetFaceEntityData extends DataClass
       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,
+      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,
     );
   }
 
@@ -5288,17 +4782,8 @@ class AssetFaceEntityData extends DataClass
   }
 
   @override
-  int get hashCode => Object.hash(
-      id,
-      assetId,
-      personId,
-      imageWidth,
-      imageHeight,
-      boundingBoxX1,
-      boundingBoxY1,
-      boundingBoxX2,
-      boundingBoxY2,
-      sourceType);
+  int get hashCode => Object.hash(id, assetId, personId, imageWidth, imageHeight, boundingBoxX1, boundingBoxY1,
+      boundingBoxX2, boundingBoxY2, sourceType);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -5470,30 +4955,25 @@ class DatabaseAtV4 extends GeneratedDatabase {
   late final StackEntity stackEntity = StackEntity(this);
   late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
   late final LocalAlbumEntity localAlbumEntity = LocalAlbumEntity(this);
-  late final LocalAlbumAssetEntity localAlbumAssetEntity =
-      LocalAlbumAssetEntity(this);
-  late final Index idxLocalAssetChecksum = Index('idx_local_asset_checksum',
-      'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
-  late final Index uQRemoteAssetOwnerChecksum = Index(
-      'UQ_remote_asset_owner_checksum',
+  late final LocalAlbumAssetEntity localAlbumAssetEntity = LocalAlbumAssetEntity(this);
+  late final Index idxLocalAssetChecksum =
+      Index('idx_local_asset_checksum', 'CREATE INDEX idx_local_asset_checksum ON local_asset_entity (checksum)');
+  late final Index uQRemoteAssetOwnerChecksum = Index('UQ_remote_asset_owner_checksum',
       'CREATE UNIQUE INDEX UQ_remote_asset_owner_checksum ON remote_asset_entity (checksum, owner_id)');
-  late final Index idxRemoteAssetChecksum = Index('idx_remote_asset_checksum',
-      'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
+  late final Index idxRemoteAssetChecksum =
+      Index('idx_remote_asset_checksum', 'CREATE INDEX idx_remote_asset_checksum ON remote_asset_entity (checksum)');
   late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this);
   late final PartnerEntity partnerEntity = PartnerEntity(this);
   late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this);
   late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(this);
-  late final RemoteAlbumAssetEntity remoteAlbumAssetEntity =
-      RemoteAlbumAssetEntity(this);
-  late final RemoteAlbumUserEntity remoteAlbumUserEntity =
-      RemoteAlbumUserEntity(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);
   @override
-  Iterable<TableInfo<Table, Object?>> get allTables =>
-      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  Iterable<TableInfo<Table, Object?>> get allTables => allSchemaEntities.whereType<TableInfo<Table, Object?>>();
   @override
   List<DatabaseSchemaEntity> get allSchemaEntities => [
         userEntity,
@@ -5519,6 +4999,5 @@ class DatabaseAtV4 extends GeneratedDatabase {
   @override
   int get schemaVersion => 4;
   @override
-  DriftDatabaseOptions get options =>
-      const DriftDatabaseOptions(storeDateTimeAsText: true);
+  DriftDatabaseOptions get options => const DriftDatabaseOptions(storeDateTimeAsText: true);
 }
diff --git a/mobile/test/infrastructure/repositories/local_album_repository_test.dart b/mobile/test/infrastructure/repositories/local_album_repository_test.dart
index bab25de52a..bb4292be07 100644
--- a/mobile/test/infrastructure/repositories/local_album_repository_test.dart
+++ b/mobile/test/infrastructure/repositories/local_album_repository_test.dart
@@ -23,8 +23,7 @@ void main() {
 
   group('getAll', () {
     test('sorts albums by backupSelection & isIosSharedAlbum', () async {
-      final localAlbumRepo =
-          mediumFactory.getRepository<DriftLocalAlbumRepository>();
+      final localAlbumRepo = mediumFactory.getRepository<DriftLocalAlbumRepository>();
       await localAlbumRepo.upsert(
         mediumFactory.localAlbum(
           id: '1',
diff --git a/mobile/test/infrastructure/repositories/store_repository_test.dart b/mobile/test/infrastructure/repositories/store_repository_test.dart
index ce13c1ecdd..6d75fbc765 100644
--- a/mobile/test/infrastructure/repositories/store_repository_test.dart
+++ b/mobile/test/infrastructure/repositories/store_repository_test.dart
@@ -66,8 +66,7 @@ void main() {
     });
 
     test('converts datetime', () async {
-      DateTime? backupFailedSince =
-          await sut.tryGet(StoreKey.backupFailedSince);
+      DateTime? backupFailedSince = await sut.tryGet(StoreKey.backupFailedSince);
       expect(backupFailedSince, isNull);
       await sut.insert(StoreKey.backupFailedSince, _kTestBackupFailed);
       backupFailedSince = await sut.tryGet(StoreKey.backupFailedSince);
diff --git a/mobile/test/infrastructure/repositories/sync_api_repository_test.dart b/mobile/test/infrastructure/repositories/sync_api_repository_test.dart
index 55b03a8116..3348cc7c04 100644
--- a/mobile/test/infrastructure/repositories/sync_api_repository_test.dart
+++ b/mobile/test/infrastructure/repositories/sync_api_repository_test.dart
@@ -39,23 +39,19 @@ void main() {
     mockSyncApi = MockSyncApi();
     mockHttpClient = MockHttpClient();
     mockStreamedResponse = MockStreamedResponse();
-    responseStreamController =
-        StreamController<List<int>>.broadcast(sync: true);
+    responseStreamController = StreamController<List<int>>.broadcast(sync: true);
 
     registerFallbackValue(FakeBaseRequest());
 
     when(() => mockApiService.apiClient).thenReturn(mockApiClient);
     when(() => mockApiService.syncApi).thenReturn(mockSyncApi);
     when(() => mockApiClient.basePath).thenReturn('http://demo.immich.app/api');
-    when(() => mockApiService.applyToParams(any(), any()))
-        .thenAnswer((_) async => {});
+    when(() => mockApiService.applyToParams(any(), any())).thenAnswer((_) async => {});
 
     // Mock HTTP client behavior
-    when(() => mockHttpClient.send(any()))
-        .thenAnswer((_) async => mockStreamedResponse);
+    when(() => mockHttpClient.send(any())).thenAnswer((_) async => mockStreamedResponse);
     when(() => mockStreamedResponse.statusCode).thenReturn(200);
-    when(() => mockStreamedResponse.stream)
-        .thenAnswer((_) => http.ByteStream(responseStreamController.stream));
+    when(() => mockStreamedResponse.stream).thenAnswer((_) => http.ByteStream(responseStreamController.stream));
     when(() => mockHttpClient.close()).thenAnswer((_) => {});
 
     sut = SyncApiRepository(mockApiService);
@@ -270,8 +266,7 @@ void main() {
   test('streamChanges throws ApiException on non-200 status code', () async {
     when(() => mockStreamedResponse.statusCode).thenReturn(401);
     final errorBodyController = StreamController<List<int>>(sync: true);
-    when(() => mockStreamedResponse.stream)
-        .thenAnswer((_) => http.ByteStream(errorBodyController.stream));
+    when(() => mockStreamedResponse.stream).thenAnswer((_) => http.ByteStream(errorBodyController.stream));
 
     int onDataCallCount = 0;
 
diff --git a/mobile/test/infrastructure/repository.mock.dart b/mobile/test/infrastructure/repository.mock.dart
index 1fde303863..ed20f177b7 100644
--- a/mobile/test/infrastructure/repository.mock.dart
+++ b/mobile/test/infrastructure/repository.mock.dart
@@ -16,16 +16,13 @@ class MockLogRepository extends Mock implements IsarLogRepository {}
 
 class MockIsarUserRepository extends Mock implements IsarUserRepository {}
 
-class MockDeviceAssetRepository extends Mock
-    implements IsarDeviceAssetRepository {}
+class MockDeviceAssetRepository extends Mock implements IsarDeviceAssetRepository {}
 
 class MockSyncStreamRepository extends Mock implements SyncStreamRepository {}
 
-class MockLocalAlbumRepository extends Mock
-    implements DriftLocalAlbumRepository {}
+class MockLocalAlbumRepository extends Mock implements DriftLocalAlbumRepository {}
 
-class MockLocalAssetRepository extends Mock
-    implements DriftLocalAssetRepository {}
+class MockLocalAssetRepository extends Mock implements DriftLocalAssetRepository {}
 
 class MockStorageRepository extends Mock implements StorageRepository {}
 
diff --git a/mobile/test/mock_http_override.dart b/mobile/test/mock_http_override.dart
index c25fb79b50..ae19d932c0 100644
--- a/mobile/test/mock_http_override.dart
+++ b/mobile/test/mock_http_override.dart
@@ -18,15 +18,12 @@ class MockHttpOverrides extends HttpOverrides {
 
     // Request mocks
     when(() => request.headers).thenAnswer((_) => headers);
-    when(() => request.close())
-        .thenAnswer((_) => Future<HttpClientResponse>.value(response));
+    when(() => request.close()).thenAnswer((_) => Future<HttpClientResponse>.value(response));
 
     // Response mocks
     when(() => response.statusCode).thenReturn(HttpStatus.ok);
-    when(() => response.compressionState)
-        .thenReturn(HttpClientResponseCompressionState.decompressed);
-    when(() => response.contentLength)
-        .thenAnswer((_) => kTransparentImage.length);
+    when(() => response.compressionState).thenReturn(HttpClientResponseCompressionState.decompressed);
+    when(() => response.contentLength).thenAnswer((_) => kTransparentImage.length);
     when(
       () => response.listen(
         captureAny(),
@@ -35,18 +32,15 @@ class MockHttpOverrides extends HttpOverrides {
         onError: captureAny(named: 'onError'),
       ),
     ).thenAnswer((invocation) {
-      final onData =
-          invocation.positionalArguments[0] as void Function(List<int>);
+      final onData = invocation.positionalArguments[0] as void Function(List<int>);
 
       final onDone = invocation.namedArguments[#onDone] as void Function();
 
-      final onError = invocation.namedArguments[#onError] as void
-          Function(Object, [StackTrace]);
+      final onError = invocation.namedArguments[#onError] as void Function(Object, [StackTrace]);
 
       final cancelOnError = invocation.namedArguments[#cancelOnError] as bool;
 
-      return Stream<List<int>>.fromIterable([kTransparentImage.toList()])
-          .listen(
+      return Stream<List<int>>.fromIterable([kTransparentImage.toList()]).listen(
         onData,
         onDone: onDone,
         onError: onError,
diff --git a/mobile/test/modules/activity/activities_page_test.dart b/mobile/test/modules/activity/activities_page_test.dart
index cf9238d205..c3279e9b58 100644
--- a/mobile/test/modules/activity/activities_page_test.dart
+++ b/mobile/test/modules/activity/activities_page_test.dart
@@ -198,8 +198,7 @@ void main() {
         );
         await tester.pumpAndSettle();
 
-        when(() => activityMock.addComment(any()))
-            .thenAnswer((_) => Future.value());
+        when(() => activityMock.addComment(any())).thenAnswer((_) => Future.value());
 
         final textField = find.byType(TextField);
         await tester.enterText(textField, 'Test comment');
diff --git a/mobile/test/modules/activity/activity_mocks.dart b/mobile/test/modules/activity/activity_mocks.dart
index 22fbafdbf3..c50810795e 100644
--- a/mobile/test/modules/activity/activity_mocks.dart
+++ b/mobile/test/modules/activity/activity_mocks.dart
@@ -6,9 +6,7 @@ import 'package:mocktail/mocktail.dart';
 
 class ActivityServiceMock extends Mock implements ActivityService {}
 
-class MockAlbumActivity extends AlbumActivityInternal
-    with Mock
-    implements AlbumActivity {
+class MockAlbumActivity extends AlbumActivityInternal with Mock implements AlbumActivity {
   List<Activity>? initActivities;
   MockAlbumActivity([this.initActivities]);
 
@@ -18,6 +16,4 @@ class MockAlbumActivity extends AlbumActivityInternal
   }
 }
 
-class ActivityStatisticsMock extends ActivityStatisticsInternal
-    with Mock
-    implements ActivityStatistics {}
+class ActivityStatisticsMock extends ActivityStatisticsInternal with Mock implements ActivityStatistics {}
diff --git a/mobile/test/modules/activity/activity_provider_test.dart b/mobile/test/modules/activity/activity_provider_test.dart
index a3b3e2466e..9bac84bab9 100644
--- a/mobile/test/modules/activity/activity_provider_test.dart
+++ b/mobile/test/modules/activity/activity_provider_test.dart
@@ -58,8 +58,7 @@ void main() {
     container = TestUtils.createContainer(
       overrides: [
         activityServiceProvider.overrideWith((ref) => activityMock),
-        activityStatisticsProvider('test-album', 'test-asset')
-            .overrideWith(() => activityStatisticsMock),
+        activityStatisticsProvider('test-album', 'test-asset').overrideWith(() => activityStatisticsMock),
       ],
     );
 
@@ -90,8 +89,7 @@ void main() {
                 [
                   isA<AsyncData<List<Activity>>>(),
                   predicate(
-                    (AsyncData<List<Activity>> ad) =>
-                        ad.requireValue.every((e) => _activities.contains(e)),
+                    (AsyncData<List<Activity>> ad) => ad.requireValue.every((e) => _activities.contains(e)),
                   ),
                 ],
               ),
@@ -172,8 +170,7 @@ void main() {
 
   group('removeActivity()', () {
     test('Like successfully removed', () async {
-      when(() => activityMock.removeActivity('3'))
-          .thenAnswer((_) async => true);
+      when(() => activityMock.removeActivity('3')).thenAnswer((_) async => true);
 
       await container.read(provider.notifier).removeActivity('3');
 
@@ -192,8 +189,7 @@ void main() {
     });
 
     test('Remove Like failed', () async {
-      when(() => activityMock.removeActivity('3'))
-          .thenAnswer((_) async => false);
+      when(() => activityMock.removeActivity('3')).thenAnswer((_) async => false);
 
       await container.read(provider.notifier).removeActivity('3');
 
@@ -206,8 +202,7 @@ void main() {
     });
 
     test('Comment successfully removed', () async {
-      when(() => activityMock.removeActivity('1'))
-          .thenAnswer((_) async => true);
+      when(() => activityMock.removeActivity('1')).thenAnswer((_) async => true);
 
       await container.read(provider.notifier).removeActivity('1');
 
@@ -229,10 +224,8 @@ void main() {
       container = TestUtils.createContainer(
         overrides: [
           activityServiceProvider.overrideWith((ref) => activityMock),
-          activityStatisticsProvider('test-album', 'test-asset')
-              .overrideWith(() => activityStatisticsMock),
-          activityStatisticsProvider('test-album')
-              .overrideWith(() => albumActivityStatisticsMock),
+          activityStatisticsProvider('test-album', 'test-asset').overrideWith(() => activityStatisticsMock),
+          activityStatisticsProvider('test-album').overrideWith(() => albumActivityStatisticsMock),
         ],
       );
     });
@@ -255,8 +248,7 @@ void main() {
           comment: 'Test-Comment',
         ),
       ).thenAnswer((_) async => AsyncData(comment));
-      when(() => activityStatisticsMock.build('test-album', 'test-asset'))
-          .thenReturn(4);
+      when(() => activityStatisticsMock.build('test-album', 'test-asset')).thenReturn(4);
       when(() => albumActivityStatisticsMock.build('test-album')).thenReturn(2);
 
       await container.read(provider.notifier).addComment('Test-Comment');
@@ -296,8 +288,7 @@ void main() {
         ),
       ).thenAnswer((_) async => AsyncData(comment));
       when(() => albumActivityStatisticsMock.build('test-album')).thenReturn(2);
-      when(() => activityMock.getAllActivities('test-album'))
-          .thenAnswer((_) async => [..._activities]);
+      when(() => activityMock.getAllActivities('test-album')).thenAnswer((_) async => [..._activities]);
 
       final albumProvider = albumActivityProvider('test-album');
       await container.read(albumProvider.notifier).addComment('Test-Comment');
diff --git a/mobile/test/modules/activity/activity_text_field_test.dart b/mobile/test/modules/activity/activity_text_field_test.dart
index a124af0db9..e74099cdcd 100644
--- a/mobile/test/modules/activity/activity_text_field_test.dart
+++ b/mobile/test/modules/activity/activity_text_field_test.dart
@@ -44,8 +44,7 @@ void main() {
     activityMock = MockAlbumActivity();
     overrides = [
       currentAlbumProvider.overrideWith(() => mockCurrentAlbumProvider),
-      albumActivityProvider(AlbumStub.twoAsset.remoteId!)
-          .overrideWith(() => activityMock),
+      albumActivityProvider(AlbumStub.twoAsset.remoteId!).overrideWith(() => activityMock),
     ];
   });
 
@@ -152,8 +151,7 @@ void main() {
       overrides: overrides,
     );
 
-    when(() => activityMock.removeActivity(any()))
-        .thenAnswer((_) => Future.value());
+    when(() => activityMock.removeActivity(any())).thenAnswer((_) => Future.value());
 
     final suffixIcon = find.byType(IconButton);
     await tester.tap(suffixIcon);
diff --git a/mobile/test/modules/activity/activity_tile_test.dart b/mobile/test/modules/activity/activity_tile_test.dart
index 22dd606540..fddbb6269c 100644
--- a/mobile/test/modules/activity/activity_tile_test.dart
+++ b/mobile/test/modules/activity/activity_tile_test.dart
@@ -57,8 +57,7 @@ void main() {
     expect(find.byType(ListTile), findsOneWidget);
   });
 
-  testWidgets('No trailing widget when activity assetId == null',
-      (tester) async {
+  testWidgets('No trailing widget when activity assetId == null', (tester) async {
     await tester.pumpConsumerWidget(
       ActivityTile(
         Activity(
@@ -75,9 +74,7 @@ void main() {
     expect(listTile.trailing, isNull);
   });
 
-  testWidgets(
-      'Asset Thumbanil as trailing widget when activity assetId != null',
-      (tester) async {
+  testWidgets('Asset Thumbanil as trailing widget when activity assetId != null', (tester) async {
     await tester.pumpConsumerWidget(
       ActivityTile(
         Activity(
@@ -176,8 +173,7 @@ void main() {
       user: UserStub.admin,
     );
 
-    testWidgets('Comment contains User Circle Avatar as leading',
-        (tester) async {
+    testWidgets('Comment contains User Circle Avatar as leading', (tester) async {
       await tester.pumpConsumerWidget(
         ActivityTile(activity),
         overrides: overrides,
diff --git a/mobile/test/modules/activity/dismissible_activity_test.dart b/mobile/test/modules/activity/dismissible_activity_test.dart
index 7bfa400a37..8cc81a69cf 100644
--- a/mobile/test/modules/activity/dismissible_activity_test.dart
+++ b/mobile/test/modules/activity/dismissible_activity_test.dart
@@ -55,9 +55,7 @@ void main() {
     expect(find.byType(ConfirmDialog), findsOneWidget);
   });
 
-  testWidgets(
-      'Ok action in ConfirmDialog should call onDismiss with activityId',
-      (tester) async {
+  testWidgets('Ok action in ConfirmDialog should call onDismiss with activityId', (tester) async {
     String? receivedActivityId;
     await tester.pumpConsumerWidget(
       DismissibleActivity(
diff --git a/mobile/test/modules/album/album_mocks.dart b/mobile/test/modules/album/album_mocks.dart
index 147d7b4221..7a1b76e0c7 100644
--- a/mobile/test/modules/album/album_mocks.dart
+++ b/mobile/test/modules/album/album_mocks.dart
@@ -2,9 +2,7 @@ import 'package:immich_mobile/providers/album/current_album.provider.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:mocktail/mocktail.dart';
 
-class MockCurrentAlbumProvider extends CurrentAlbum
-    with Mock
-    implements CurrentAlbumInternal {
+class MockCurrentAlbumProvider extends CurrentAlbum with Mock implements CurrentAlbumInternal {
   Album? initAlbum;
   MockCurrentAlbumProvider([this.initAlbum]);
 
diff --git a/mobile/test/modules/album/album_sort_by_options_provider_test.dart b/mobile/test/modules/album/album_sort_by_options_provider_test.dart
index df59f03c56..bf3163f00d 100644
--- a/mobile/test/modules/album/album_sort_by_options_provider_test.dart
+++ b/mobile/test/modules/album/album_sort_by_options_provider_test.dart
@@ -261,9 +261,7 @@ void main() {
     });
 
     test('Properly saves the correct store index of sort mode', () {
-      container
-          .read(albumSortByOptionsProvider.notifier)
-          .changeSortMode(AlbumSortMode.mostOldest);
+      container.read(albumSortByOptionsProvider.notifier).changeSortMode(AlbumSortMode.mostOldest);
 
       verify(
         () => settingsMock.setSetting(
@@ -286,14 +284,10 @@ void main() {
       );
 
       // Created -> Most Oldest
-      container
-          .read(albumSortByOptionsProvider.notifier)
-          .changeSortMode(AlbumSortMode.mostOldest);
+      container.read(albumSortByOptionsProvider.notifier).changeSortMode(AlbumSortMode.mostOldest);
 
       // Most Oldest -> Title
-      container
-          .read(albumSortByOptionsProvider.notifier)
-          .changeSortMode(AlbumSortMode.title);
+      container.read(albumSortByOptionsProvider.notifier).changeSortMode(AlbumSortMode.title);
 
       verifyInOrder([
         () => listener.call(null, AlbumSortMode.created),
@@ -368,9 +362,7 @@ void main() {
       container.read(albumSortOrderProvider.notifier).changeSortDirection(true);
 
       // true -> false
-      container
-          .read(albumSortOrderProvider.notifier)
-          .changeSortDirection(false);
+      container.read(albumSortOrderProvider.notifier).changeSortDirection(false);
 
       verifyInOrder([
         () => listener.call(null, false),
diff --git a/mobile/test/modules/asset_viewer/asset_viewer_mocks.dart b/mobile/test/modules/asset_viewer/asset_viewer_mocks.dart
index f81f5a9a19..89b06d3c09 100644
--- a/mobile/test/modules/asset_viewer/asset_viewer_mocks.dart
+++ b/mobile/test/modules/asset_viewer/asset_viewer_mocks.dart
@@ -2,9 +2,7 @@ import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:mocktail/mocktail.dart';
 
-class MockCurrentAssetProvider extends CurrentAssetInternal
-    with Mock
-    implements CurrentAsset {
+class MockCurrentAssetProvider extends CurrentAssetInternal with Mock implements CurrentAsset {
   Asset? initAsset;
   MockCurrentAssetProvider([this.initAsset]);
 
diff --git a/mobile/test/modules/extensions/asset_extensions_test.dart b/mobile/test/modules/extensions/asset_extensions_test.dart
index dd334c7b9d..a164b9ddce 100644
--- a/mobile/test/modules/extensions/asset_extensions_test.dart
+++ b/mobile/test/modules/extensions/asset_extensions_test.dart
@@ -76,8 +76,7 @@ void main() {
       expect(dateTimeInUTC.timeZoneOffset, tz);
     });
 
-    test('Returns dateTimeOriginal in UTC from exifInfo with invalid timezone',
-        () {
+    test('Returns dateTimeOriginal in UTC from exifInfo with invalid timezone', () {
       final createdAt = DateTime.parse("2023-01-27T14:00:00-0500");
       final dateTimeOriginal = DateTime.parse("2022-01-27T14:00:00+0530");
       final e = makeExif(
@@ -98,13 +97,11 @@ void main() {
       final createdAt = DateTime.parse("2023-01-27T14:00:00-0500");
       final dateTimeOriginal = DateTime.parse("2022-01-27T14:00:00+0530");
       const location = "Asia/Hong_Kong";
-      final e =
-          makeExif(dateTimeOriginal: dateTimeOriginal, timeZone: location);
+      final e = makeExif(dateTimeOriginal: dateTimeOriginal, timeZone: location);
       final a = makeAsset(id: '1', createdAt: createdAt, exifInfo: e);
       final (dt, tz) = a.getTZAdjustedTimeAndOffset();
 
-      final adjustedTime =
-          TZDateTime.from(dateTimeOriginal.toUtc(), getLocation(location));
+      final adjustedTime = TZDateTime.from(dateTimeOriginal.toUtc(), getLocation(location));
       expect(adjustedTime, dt);
       expect(adjustedTime.timeZoneOffset, tz);
     });
@@ -118,8 +115,7 @@ void main() {
       final (dt, tz) = a.getTZAdjustedTimeAndOffset();
 
       final location = getLocation("Asia/Hong_Kong");
-      final offsetFromLocation =
-          Duration(milliseconds: location.currentTimeZone.offset);
+      final offsetFromLocation = Duration(milliseconds: location.currentTimeZone.offset);
       final adjustedTime = dateTimeOriginal.toUtc().add(offsetFromLocation);
 
       // Adds the offset to the actual time and returns the offset separately
diff --git a/mobile/test/modules/extensions/datetime_extensions_test.dart b/mobile/test/modules/extensions/datetime_extensions_test.dart
index 412d946b1f..b1b1542fcd 100644
--- a/mobile/test/modules/extensions/datetime_extensions_test.dart
+++ b/mobile/test/modules/extensions/datetime_extensions_test.dart
@@ -25,24 +25,21 @@ void main() {
     test('returns date range format for this year', () {
       final startDate = DateTime(currentYear, 3, 23); // Mar 23
       final endDate = DateTime(currentYear, 5, 31); // May 31
-      final result =
-          DateRangeFormatting.formatDateRange(startDate, endDate, null);
+      final result = DateRangeFormatting.formatDateRange(startDate, endDate, null);
       expect(result, 'Mar 23 - May 31');
     });
 
     test('returns date range format for other year (same year)', () {
       final startDate = DateTime(2023, 8, 28); // Aug 28
       final endDate = DateTime(2023, 9, 30); // Sep 30
-      final result =
-          DateRangeFormatting.formatDateRange(startDate, endDate, null);
+      final result = DateRangeFormatting.formatDateRange(startDate, endDate, null);
       expect(result, 'Aug 28 - Sep 30, 2023');
     });
 
     test('returns date range format over multiple years', () {
       final startDate = DateTime(2021, 4, 17); // Apr 17, 2021
       final endDate = DateTime(2022, 4, 9); // Apr 9, 2022
-      final result =
-          DateRangeFormatting.formatDateRange(startDate, endDate, null);
+      final result = DateRangeFormatting.formatDateRange(startDate, endDate, null);
       expect(result, 'Apr 17, 2021 - Apr 9, 2022');
     });
   });
diff --git a/mobile/test/modules/map/map_mocks.dart b/mobile/test/modules/map/map_mocks.dart
index cb525b2d17..959cad3da6 100644
--- a/mobile/test/modules/map/map_mocks.dart
+++ b/mobile/test/modules/map/map_mocks.dart
@@ -3,9 +3,7 @@ import 'package:immich_mobile/models/map/map_state.model.dart';
 import 'package:immich_mobile/providers/map/map_state.provider.dart';
 import 'package:mocktail/mocktail.dart';
 
-class MockMapStateNotifier extends Notifier<MapState>
-    with Mock
-    implements MapStateNotifier {
+class MockMapStateNotifier extends Notifier<MapState> with Mock implements MapStateNotifier {
   final MapState initState;
 
   MockMapStateNotifier(this.initState);
diff --git a/mobile/test/modules/map/map_theme_override_test.dart b/mobile/test/modules/map/map_theme_override_test.dart
index 59f9b9e246..78fa6b0043 100644
--- a/mobile/test/modules/map/map_theme_override_test.dart
+++ b/mobile/test/modules/map/map_theme_override_test.dart
@@ -38,8 +38,7 @@ void main() {
     ];
   });
 
-  testWidgets("Return dark theme style when theme mode is dark",
-      (tester) async {
+  testWidgets("Return dark theme style when theme mode is dark", (tester) async {
     AsyncValue<String>? mapStyle;
     await tester.pumpConsumerWidget(
       MapThemeOverride(
@@ -51,8 +50,7 @@ void main() {
       overrides: overrides,
     );
 
-    mapStateNotifier.state =
-        mapState.copyWith(darkStyleFetched: const AsyncData("dark"));
+    mapStateNotifier.state = mapState.copyWith(darkStyleFetched: const AsyncData("dark"));
     await tester.pumpAndSettle();
     expect(mapStyle?.valueOrNull, "dark");
   });
@@ -76,8 +74,7 @@ void main() {
     expect(mapStyle?.hasError, isTrue);
   });
 
-  testWidgets("Return light theme style when theme mode is light",
-      (tester) async {
+  testWidgets("Return light theme style when theme mode is light", (tester) async {
     AsyncValue<String>? mapStyle;
     await tester.pumpConsumerWidget(
       MapThemeOverride(
@@ -110,8 +107,7 @@ void main() {
         overrides: overrides,
       );
 
-      tester.binding.platformDispatcher.platformBrightnessTestValue =
-          Brightness.dark;
+      tester.binding.platformDispatcher.platformBrightnessTestValue = Brightness.dark;
       mapStateNotifier.state = mapState.copyWith(
         themeMode: ThemeMode.system,
         darkStyleFetched: const AsyncData("dark"),
@@ -121,8 +117,7 @@ void main() {
       expect(mapStyle?.valueOrNull, "dark");
     });
 
-    testWidgets("Return light theme style when system is light",
-        (tester) async {
+    testWidgets("Return light theme style when system is light", (tester) async {
       AsyncValue<String>? mapStyle;
       await tester.pumpConsumerWidget(
         MapThemeOverride(
@@ -134,8 +129,7 @@ void main() {
         overrides: overrides,
       );
 
-      tester.binding.platformDispatcher.platformBrightnessTestValue =
-          Brightness.light;
+      tester.binding.platformDispatcher.platformBrightnessTestValue = Brightness.light;
       mapStateNotifier.state = mapState.copyWith(
         themeMode: ThemeMode.system,
         lightStyleFetched: const AsyncData("light"),
@@ -145,8 +139,7 @@ void main() {
       expect(mapStyle?.valueOrNull, "light");
     });
 
-    testWidgets("Switches style when system brightness changes",
-        (tester) async {
+    testWidgets("Switches style when system brightness changes", (tester) async {
       AsyncValue<String>? mapStyle;
       await tester.pumpConsumerWidget(
         MapThemeOverride(
@@ -158,8 +151,7 @@ void main() {
         overrides: overrides,
       );
 
-      tester.binding.platformDispatcher.platformBrightnessTestValue =
-          Brightness.light;
+      tester.binding.platformDispatcher.platformBrightnessTestValue = Brightness.light;
       mapStateNotifier.state = mapState.copyWith(
         themeMode: ThemeMode.system,
         lightStyleFetched: const AsyncData("light"),
@@ -168,8 +160,7 @@ void main() {
       await tester.pumpAndSettle();
       expect(mapStyle?.valueOrNull, "light");
 
-      tester.binding.platformDispatcher.platformBrightnessTestValue =
-          Brightness.dark;
+      tester.binding.platformDispatcher.platformBrightnessTestValue = Brightness.dark;
       await tester.pumpAndSettle();
       expect(mapStyle?.valueOrNull, "dark");
     });
diff --git a/mobile/test/modules/shared/shared_mocks.dart b/mobile/test/modules/shared/shared_mocks.dart
index f50fde7040..790bbbd815 100644
--- a/mobile/test/modules/shared/shared_mocks.dart
+++ b/mobile/test/modules/shared/shared_mocks.dart
@@ -3,9 +3,7 @@ import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:mocktail/mocktail.dart';
 
-class MockCurrentUserProvider extends StateNotifier<UserDto?>
-    with Mock
-    implements CurrentUserProvider {
+class MockCurrentUserProvider extends StateNotifier<UserDto?> with Mock implements CurrentUserProvider {
   MockCurrentUserProvider() : super(null);
 
   @override
diff --git a/mobile/test/modules/shared/sync_service_test.dart b/mobile/test/modules/shared/sync_service_test.dart
index a78f65af67..2858e6a9e7 100644
--- a/mobile/test/modules/shared/sync_service_test.dart
+++ b/mobile/test/modules/shared/sync_service_test.dart
@@ -57,14 +57,11 @@ void main() {
     final MockExifInfoRepository exifInfoRepository = MockExifInfoRepository();
     final MockIsarUserRepository userRepository = MockIsarUserRepository();
     final MockETagRepository eTagRepository = MockETagRepository();
-    final MockAlbumMediaRepository albumMediaRepository =
-        MockAlbumMediaRepository();
+    final MockAlbumMediaRepository albumMediaRepository = MockAlbumMediaRepository();
     final MockAlbumApiRepository albumApiRepository = MockAlbumApiRepository();
     final MockAppSettingService appSettingService = MockAppSettingService();
-    final MockLocalFilesManagerRepository localFilesManagerRepository =
-        MockLocalFilesManagerRepository();
-    final MockPartnerApiRepository partnerApiRepository =
-        MockPartnerApiRepository();
+    final MockLocalFilesManagerRepository localFilesManagerRepository = MockLocalFilesManagerRepository();
+    final MockPartnerApiRepository partnerApiRepository = MockPartnerApiRepository();
     final MockUserApiRepository userApiRepository = MockUserApiRepository();
     final MockPartnerRepository partnerRepository = MockPartnerRepository();
     final MockUserService userService = MockUserService();
@@ -115,13 +112,11 @@ void main() {
         userApiRepository,
       );
       when(() => userService.getMyUser()).thenReturn(owner);
-      when(() => eTagRepository.get(owner.id))
-          .thenAnswer((_) async => ETag(id: owner.id, time: DateTime.now()));
+      when(() => eTagRepository.get(owner.id)).thenAnswer((_) async => ETag(id: owner.id, time: DateTime.now()));
       when(() => eTagRepository.deleteByIds(["1"])).thenAnswer((_) async {});
       when(() => eTagRepository.upsertAll(any())).thenAnswer((_) async {});
       when(() => partnerRepository.getSharedWith()).thenAnswer((_) async => []);
-      when(() => userRepository.getAll(sortBy: SortUserBy.id))
-          .thenAnswer((_) async => [owner]);
+      when(() => userRepository.getAll(sortBy: SortUserBy.id)).thenAnswer((_) async => [owner]);
       when(() => userRepository.getAll()).thenAnswer((_) async => [owner]);
       when(
         () => assetRepository.getAll(
@@ -133,8 +128,7 @@ void main() {
           .thenAnswer((_) async => [initialAssets[3], null, null]);
       when(() => assetRepository.updateAll(any())).thenAnswer((_) async => []);
       when(() => assetRepository.deleteByIds(any())).thenAnswer((_) async {});
-      when(() => exifInfoRepository.updateAll(any()))
-          .thenAnswer((_) async => []);
+      when(() => exifInfoRepository.updateAll(any())).thenAnswer((_) async => []);
       when(() => assetRepository.transaction<void>(any())).thenAnswer(
         (call) => (call.positionalArguments.first as Function).call(),
       );
@@ -143,8 +137,7 @@ void main() {
       );
       when(() => userApiRepository.getAll()).thenAnswer((_) async => [owner]);
       registerFallbackValue(Direction.sharedByMe);
-      when(() => partnerApiRepository.getAll(any()))
-          .thenAnswer((_) async => []);
+      when(() => partnerApiRepository.getAll(any())).thenAnswer((_) async => []);
     });
     test('test inserting existing assets', () async {
       final List<Asset> remoteAssets = [
@@ -178,8 +171,7 @@ void main() {
       expect(c1, isTrue);
       final updatedAsset = initialAssets[3].updatedCopy(remoteAssets[3]);
       verify(
-        () => assetRepository
-            .updateAll([remoteAssets[4], remoteAssets[5], updatedAsset]),
+        () => assetRepository.updateAll([remoteAssets[4], remoteAssets[5], updatedAsset]),
       );
     });
 
@@ -244,8 +236,7 @@ void main() {
         return;
       });
       when(
-        () => assetRepository
-            .getAllByRemoteId(["2-1", "1-1"], state: AssetState.merged),
+        () => assetRepository.getAllByRemoteId(["2-1", "1-1"], state: AssetState.merged),
       ).thenAnswer((_) async => [initialAssets[2]]);
       when(() => assetRepository.getAllByOwnerIdChecksum(any(), any()))
           .thenAnswer((_) async => [initialAssets[0], null, null]); //afg
diff --git a/mobile/test/modules/utils/throttler_test.dart b/mobile/test/modules/utils/throttler_test.dart
index 76d8bd2ad7..ba5d542fe6 100644
--- a/mobile/test/modules/utils/throttler_test.dart
+++ b/mobile/test/modules/utils/throttler_test.dart
@@ -14,8 +14,7 @@ class _Counter {
 }
 
 void main() {
-  test('Executes the method immediately if no calls received previously',
-      () async {
+  test('Executes the method immediately if no calls received previously', () async {
     var counter = _Counter();
     final throttler = Throttler(interval: const Duration(milliseconds: 300));
     throttler.run(() => counter.increment());
diff --git a/mobile/test/modules/utils/url_helper_test.dart b/mobile/test/modules/utils/url_helper_test.dart
index 840ac91f1f..0e8a8e2aa0 100644
--- a/mobile/test/modules/utils/url_helper_test.dart
+++ b/mobile/test/modules/utils/url_helper_test.dart
@@ -28,9 +28,7 @@ void main() {
       expect(punycodeEncodeUrl(url), equals(expected));
     });
 
-    test(
-        'should encode multi-segment Unicode host with multiple non-ASCII segments',
-        () {
+    test('should encode multi-segment Unicode host with multiple non-ASCII segments', () {
       const url = 'https://bücher.münchen';
       const expected = 'https://xn--bcher-kva.xn--mnchen-3ya';
       expect(punycodeEncodeUrl(url), equals(expected));
diff --git a/mobile/test/pages/search/search.page_test.dart b/mobile/test/pages/search/search.page_test.dart
index fa7f037da5..1c1a410150 100644
--- a/mobile/test/pages/search/search.page_test.dart
+++ b/mobile/test/pages/search/search.page_test.dart
@@ -42,8 +42,7 @@ void main() {
     ];
   });
 
-  final emptyTextSearch = isA<MetadataSearchDto>()
-      .having((s) => s.originalFileName, 'originalFileName', null);
+  final emptyTextSearch = isA<MetadataSearchDto>().having((s) => s.originalFileName, 'originalFileName', null);
 
   testWidgets('contextual search with/without text', (tester) async {
     await tester.pumpConsumerWidget(
@@ -111,8 +110,7 @@ void main() {
 
     expect(
       captured.first,
-      isA<MetadataSearchDto>()
-          .having((s) => s.originalFileName, 'originalFileName', 'test'),
+      isA<MetadataSearchDto>().having((s) => s.originalFileName, 'originalFileName', 'test'),
     );
 
     await tester.enterText(searchField, '');
diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart
index 54a7e2d4a4..4b54ec4055 100644
--- a/mobile/test/repository.mocks.dart
+++ b/mobile/test/repository.mocks.dart
@@ -45,5 +45,4 @@ class MockPartnerRepository extends Mock implements PartnerRepository {}
 
 class MockPartnerApiRepository extends Mock implements PartnerApiRepository {}
 
-class MockLocalFilesManagerRepository extends Mock
-    implements LocalFilesManagerRepository {}
+class MockLocalFilesManagerRepository extends Mock implements LocalFilesManagerRepository {}
diff --git a/mobile/test/services/album.service_test.dart b/mobile/test/services/album.service_test.dart
index 443e37e75d..547b049593 100644
--- a/mobile/test/services/album.service_test.dart
+++ b/mobile/test/services/album.service_test.dart
@@ -54,28 +54,22 @@ void main() {
 
   group('refreshDeviceAlbums', () {
     test('empty selection with one album in db', () async {
-      when(() => backupRepository.getIdsBySelection(BackupSelection.exclude))
-          .thenAnswer((_) async => []);
-      when(() => backupRepository.getIdsBySelection(BackupSelection.select))
-          .thenAnswer((_) async => []);
+      when(() => backupRepository.getIdsBySelection(BackupSelection.exclude)).thenAnswer((_) async => []);
+      when(() => backupRepository.getIdsBySelection(BackupSelection.select)).thenAnswer((_) async => []);
       when(() => albumMediaRepository.getAll()).thenAnswer((_) async => []);
       when(() => albumRepository.count(local: true)).thenAnswer((_) async => 1);
-      when(() => syncService.removeAllLocalAlbumsAndAssets())
-          .thenAnswer((_) async => true);
+      when(() => syncService.removeAllLocalAlbumsAndAssets()).thenAnswer((_) async => true);
       final result = await sut.refreshDeviceAlbums();
       expect(result, false);
       verify(() => syncService.removeAllLocalAlbumsAndAssets());
     });
 
     test('one selected albums, two on device', () async {
-      when(() => backupRepository.getIdsBySelection(BackupSelection.exclude))
-          .thenAnswer((_) async => []);
+      when(() => backupRepository.getIdsBySelection(BackupSelection.exclude)).thenAnswer((_) async => []);
       when(() => backupRepository.getIdsBySelection(BackupSelection.select))
           .thenAnswer((_) async => [AlbumStub.oneAsset.localId!]);
-      when(() => albumMediaRepository.getAll())
-          .thenAnswer((_) async => [AlbumStub.oneAsset, AlbumStub.twoAsset]);
-      when(() => syncService.syncLocalAlbumAssetsToDb(any(), any()))
-          .thenAnswer((_) async => true);
+      when(() => albumMediaRepository.getAll()).thenAnswer((_) async => [AlbumStub.oneAsset, AlbumStub.twoAsset]);
+      when(() => syncService.syncLocalAlbumAssetsToDb(any(), any())).thenAnswer((_) async => true);
       final result = await sut.refreshDeviceAlbums();
       expect(result, true);
       verify(
@@ -88,10 +82,8 @@ void main() {
   group('refreshRemoteAlbums', () {
     test('is working', () async {
       when(() => syncService.getUsersFromServer()).thenAnswer((_) async => []);
-      when(() => syncService.syncUsersFromServer(any()))
-          .thenAnswer((_) async => true);
-      when(() => albumApiRepository.getAll(shared: true))
-          .thenAnswer((_) async => [AlbumStub.sharedWithUser]);
+      when(() => syncService.syncUsersFromServer(any())).thenAnswer((_) async => true);
+      when(() => albumApiRepository.getAll(shared: true)).thenAnswer((_) async => [AlbumStub.sharedWithUser]);
 
       when(() => albumApiRepository.getAll(shared: null))
           .thenAnswer((_) async => [AlbumStub.oneAsset, AlbumStub.twoAsset]);
@@ -142,8 +134,7 @@ void main() {
         () => albumRepository.create(AlbumStub.oneAsset),
       ).thenAnswer((_) async => AlbumStub.twoAsset);
 
-      final result =
-          await sut.createAlbum("name", [AssetStub.image1], [UserStub.user1]);
+      final result = await sut.createAlbum("name", [AssetStub.image1], [UserStub.user1]);
       expect(result, AlbumStub.twoAsset);
       verify(
         () => albumApiRepository.create(
@@ -163,10 +154,7 @@ void main() {
       when(
         () => albumApiRepository.addAssets(AlbumStub.oneAsset.remoteId!, any()),
       ).thenAnswer(
-        (_) async => (
-          added: [AssetStub.image2.remoteId!],
-          duplicates: [AssetStub.image1.remoteId!]
-        ),
+        (_) async => (added: [AssetStub.image2.remoteId!], duplicates: [AssetStub.image1.remoteId!]),
       );
       when(
         () => albumRepository.get(AlbumStub.oneAsset.id),
@@ -198,8 +186,7 @@ void main() {
   group('addAdditionalUserToAlbum', () {
     test('one added', () async {
       when(
-        () =>
-            albumApiRepository.addUsers(AlbumStub.emptyAlbum.remoteId!, any()),
+        () => albumApiRepository.addUsers(AlbumStub.emptyAlbum.remoteId!, any()),
       ).thenAnswer(
         (_) async => AlbumStub.sharedWithUser,
       );
diff --git a/mobile/test/services/asset.service_test.dart b/mobile/test/services/asset.service_test.dart
index 293e5ec76b..5077764f26 100644
--- a/mobile/test/services/asset.service_test.dart
+++ b/mobile/test/services/asset.service_test.dart
@@ -69,8 +69,7 @@ void main() {
     setUp(() {
       assetsApi = MockAssetsApi();
       when(() => apiService.assetsApi).thenReturn(assetsApi);
-      when(() => assetsApi.updateAssets(any()))
-          .thenAnswer((_) async => Future.value());
+      when(() => assetsApi.updateAssets(any())).thenAnswer((_) async => Future.value());
     });
 
     test("asset is updated with DateTime", () async {
@@ -79,11 +78,9 @@ void main() {
       await sut.changeDateTime(assets, dateTime.toIso8601String());
 
       verify(() => assetsApi.updateAssets(any())).called(1);
-      final upsertExifCallback =
-          verify(() => syncService.upsertAssetsWithExif(captureAny()));
+      final upsertExifCallback = verify(() => syncService.upsertAssetsWithExif(captureAny()));
       upsertExifCallback.called(1);
-      final receivedAssets =
-          upsertExifCallback.captured.firstOrNull as List<Object>? ?? [];
+      final receivedAssets = upsertExifCallback.captured.firstOrNull as List<Object>? ?? [];
       final receivedDatetime = receivedAssets.cast<Asset>().map(
             (a) => a.exifInfo?.dateTimeOriginal ?? DateTime(0),
           );
@@ -96,14 +93,11 @@ void main() {
       await sut.changeLocation(assets, latLng);
 
       verify(() => assetsApi.updateAssets(any())).called(1);
-      final upsertExifCallback =
-          verify(() => syncService.upsertAssetsWithExif(captureAny()));
+      final upsertExifCallback = verify(() => syncService.upsertAssetsWithExif(captureAny()));
       upsertExifCallback.called(1);
-      final receivedAssets =
-          upsertExifCallback.captured.firstOrNull as List<Object>? ?? [];
+      final receivedAssets = upsertExifCallback.captured.firstOrNull as List<Object>? ?? [];
       final receivedCoords = receivedAssets.cast<Asset>().map(
-            (a) =>
-                LatLng(a.exifInfo?.latitude ?? 0, a.exifInfo?.longitude ?? 0),
+            (a) => LatLng(a.exifInfo?.latitude ?? 0, a.exifInfo?.longitude ?? 0),
           );
       expect(receivedCoords.every((l) => l == latLng), isTrue);
     });
diff --git a/mobile/test/services/auth.service_test.dart b/mobile/test/services/auth.service_test.dart
index 46ad8bbc4c..3e9a02a2a5 100644
--- a/mobile/test/services/auth.service_test.dart
+++ b/mobile/test/services/auth.service_test.dart
@@ -58,8 +58,7 @@ void main() {
       const testUrl = 'http://ip:2283';
       const resolvedUrl = 'http://ip:2283/api';
 
-      when(() => apiService.resolveAndSetEndpoint(testUrl))
-          .thenAnswer((_) async => resolvedUrl);
+      when(() => apiService.resolveAndSetEndpoint(testUrl)).thenAnswer((_) async => resolvedUrl);
       when(() => apiService.setDeviceInfoHeader()).thenAnswer((_) async => {});
 
       final result = await sut.validateServerUrl(testUrl);
@@ -74,8 +73,7 @@ void main() {
       const testUrl = 'https://immich.domain.com';
       const resolvedUrl = 'https://immich.domain.com/api';
 
-      when(() => apiService.resolveAndSetEndpoint(testUrl))
-          .thenAnswer((_) async => resolvedUrl);
+      when(() => apiService.resolveAndSetEndpoint(testUrl)).thenAnswer((_) async => resolvedUrl);
       when(() => apiService.setDeviceInfoHeader()).thenAnswer((_) async => {});
 
       final result = await sut.validateServerUrl(testUrl);
@@ -89,8 +87,7 @@ void main() {
     test('Should throw error on invalid URL', () async {
       const testUrl = 'invalid-url';
 
-      when(() => apiService.resolveAndSetEndpoint(testUrl))
-          .thenThrow(Exception('Invalid URL'));
+      when(() => apiService.resolveAndSetEndpoint(testUrl)).thenThrow(Exception('Invalid URL'));
 
       expect(
         () async => await sut.validateServerUrl(testUrl),
@@ -104,8 +101,7 @@ void main() {
     test('Should throw error on unreachable server', () async {
       const testUrl = 'https://unreachable.server';
 
-      when(() => apiService.resolveAndSetEndpoint(testUrl))
-          .thenThrow(Exception('Server is not reachable'));
+      when(() => apiService.resolveAndSetEndpoint(testUrl)).thenThrow(Exception('Server is not reachable'));
 
       expect(
         () async => await sut.validateServerUrl(testUrl),
@@ -121,8 +117,7 @@ void main() {
     test('Should logout user', () async {
       when(() => authApiRepository.logout()).thenAnswer((_) async => {});
       when(() => backgroundSyncManager.cancel()).thenAnswer((_) async => {});
-      when(() => authRepository.clearLocalData())
-          .thenAnswer((_) => Future.value(null));
+      when(() => authRepository.clearLocalData()).thenAnswer((_) => Future.value(null));
 
       await sut.logout();
 
@@ -132,11 +127,9 @@ void main() {
     });
 
     test('Should clear local data even on server error', () async {
-      when(() => authApiRepository.logout())
-          .thenThrow(Exception('Server error'));
+      when(() => authApiRepository.logout()).thenThrow(Exception('Server error'));
       when(() => backgroundSyncManager.cancel()).thenAnswer((_) async => {});
-      when(() => authRepository.clearLocalData())
-          .thenAnswer((_) => Future.value(null));
+      when(() => authRepository.clearLocalData()).thenAnswer((_) => Future.value(null));
 
       await sut.logout();
 
@@ -148,13 +141,11 @@ void main() {
 
   group('setOpenApiServiceEndpoint', () {
     setUp(() {
-      when(() => networkService.getWifiName())
-          .thenAnswer((_) async => 'TestWifi');
+      when(() => networkService.getWifiName()).thenAnswer((_) async => 'TestWifi');
     });
 
     test('Should return null if auto endpoint switching is disabled', () async {
-      when(() => authRepository.getEndpointSwitchingFeature())
-          .thenReturn((false));
+      when(() => authRepository.getEndpointSwitchingFeature()).thenReturn((false));
 
       final result = await sut.setOpenApiServiceEndpoint();
 
@@ -166,8 +157,7 @@ void main() {
     test('Should set local connection if wifi name matches', () async {
       when(() => authRepository.getEndpointSwitchingFeature()).thenReturn(true);
       when(() => authRepository.getPreferredWifiName()).thenReturn('TestWifi');
-      when(() => authRepository.getLocalEndpoint())
-          .thenReturn('http://local.endpoint');
+      when(() => authRepository.getLocalEndpoint()).thenReturn('http://local.endpoint');
       when(() => apiService.resolveAndSetEndpoint('http://local.endpoint'))
           .thenAnswer((_) async => 'http://local.endpoint');
 
@@ -178,14 +168,12 @@ void main() {
       verify(() => networkService.getWifiName()).called(1);
       verify(() => authRepository.getPreferredWifiName()).called(1);
       verify(() => authRepository.getLocalEndpoint()).called(1);
-      verify(() => apiService.resolveAndSetEndpoint('http://local.endpoint'))
-          .called(1);
+      verify(() => apiService.resolveAndSetEndpoint('http://local.endpoint')).called(1);
     });
 
     test('Should set external endpoint if wifi name not matching', () async {
       when(() => authRepository.getEndpointSwitchingFeature()).thenReturn(true);
-      when(() => authRepository.getPreferredWifiName())
-          .thenReturn('DifferentWifi');
+      when(() => authRepository.getPreferredWifiName()).thenReturn('DifferentWifi');
       when(() => authRepository.getExternalEndpointList()).thenReturn([
         const AuxilaryEndpoint(
           url: 'https://external.endpoint',
@@ -208,11 +196,9 @@ void main() {
       ).called(1);
     });
 
-    test('Should set second external endpoint if the first throw any error',
-        () async {
+    test('Should set second external endpoint if the first throw any error', () async {
       when(() => authRepository.getEndpointSwitchingFeature()).thenReturn(true);
-      when(() => authRepository.getPreferredWifiName())
-          .thenReturn('DifferentWifi');
+      when(() => authRepository.getPreferredWifiName()).thenReturn('DifferentWifi');
       when(() => authRepository.getExternalEndpointList()).thenReturn([
         const AuxilaryEndpoint(
           url: 'https://external.endpoint',
@@ -243,11 +229,9 @@ void main() {
       ).called(1);
     });
 
-    test('Should set second external endpoint if the first throw ApiException',
-        () async {
+    test('Should set second external endpoint if the first throw ApiException', () async {
       when(() => authRepository.getEndpointSwitchingFeature()).thenReturn(true);
-      when(() => authRepository.getPreferredWifiName())
-          .thenReturn('DifferentWifi');
+      when(() => authRepository.getPreferredWifiName()).thenReturn('DifferentWifi');
       when(() => authRepository.getExternalEndpointList()).thenReturn([
         const AuxilaryEndpoint(
           url: 'https://external.endpoint',
@@ -281,8 +265,7 @@ void main() {
     test('Should handle error when setting local connection', () async {
       when(() => authRepository.getEndpointSwitchingFeature()).thenReturn(true);
       when(() => authRepository.getPreferredWifiName()).thenReturn('TestWifi');
-      when(() => authRepository.getLocalEndpoint())
-          .thenReturn('http://local.endpoint');
+      when(() => authRepository.getLocalEndpoint()).thenReturn('http://local.endpoint');
       when(() => apiService.resolveAndSetEndpoint('http://local.endpoint'))
           .thenThrow(Exception('Local endpoint error'));
 
@@ -293,14 +276,12 @@ void main() {
       verify(() => networkService.getWifiName()).called(1);
       verify(() => authRepository.getPreferredWifiName()).called(1);
       verify(() => authRepository.getLocalEndpoint()).called(1);
-      verify(() => apiService.resolveAndSetEndpoint('http://local.endpoint'))
-          .called(1);
+      verify(() => apiService.resolveAndSetEndpoint('http://local.endpoint')).called(1);
     });
 
     test('Should handle error when setting external connection', () async {
       when(() => authRepository.getEndpointSwitchingFeature()).thenReturn(true);
-      when(() => authRepository.getPreferredWifiName())
-          .thenReturn('DifferentWifi');
+      when(() => authRepository.getPreferredWifiName()).thenReturn('DifferentWifi');
       when(() => authRepository.getExternalEndpointList()).thenReturn([
         const AuxilaryEndpoint(
           url: 'https://external.endpoint',
diff --git a/mobile/test/services/entity.service_test.dart b/mobile/test/services/entity.service_test.dart
index 1642be7fb3..7aab7f9428 100644
--- a/mobile/test/services/entity.service_test.dart
+++ b/mobile/test/services/entity.service_test.dart
@@ -21,8 +21,7 @@ void main() {
   });
 
   group('fillAlbumWithDatabaseEntities', () {
-    test('remote album with owner, thumbnail, sharedUsers and assets',
-        () async {
+    test('remote album with owner, thumbnail, sharedUsers and assets', () async {
       final Album album = Album(
         name: "album-with-two-assets-and-two-users",
         localId: "album-with-two-assets-and-two-users-local",
@@ -41,19 +40,14 @@ void main() {
           [User.fromDto(UserStub.admin), User.fromDto(UserStub.admin)],
         );
 
-      when(() => userRepository.getByUserId(any()))
-          .thenAnswer((_) async => UserStub.admin);
-      when(() => userRepository.getByUserId(any()))
-          .thenAnswer((_) async => UserStub.admin);
+      when(() => userRepository.getByUserId(any())).thenAnswer((_) async => UserStub.admin);
+      when(() => userRepository.getByUserId(any())).thenAnswer((_) async => UserStub.admin);
 
-      when(() => assetRepository.getByRemoteId(AssetStub.image1.remoteId!))
-          .thenAnswer((_) async => AssetStub.image1);
+      when(() => assetRepository.getByRemoteId(AssetStub.image1.remoteId!)).thenAnswer((_) async => AssetStub.image1);
 
-      when(() => userRepository.getByUserIds(any()))
-          .thenAnswer((_) async => [UserStub.user1, UserStub.user2]);
+      when(() => userRepository.getByUserIds(any())).thenAnswer((_) async => [UserStub.user1, UserStub.user2]);
 
-      when(() => assetRepository.getAllByRemoteId(any()))
-          .thenAnswer((_) async => [AssetStub.image1, AssetStub.image2]);
+      when(() => assetRepository.getAllByRemoteId(any())).thenAnswer((_) async => [AssetStub.image1, AssetStub.image2]);
 
       await sut.fillAlbumWithDatabaseEntities(album);
       expect(album.owner.value?.toDto(), UserStub.admin);
diff --git a/mobile/test/services/hash_service_test.dart b/mobile/test/services/hash_service_test.dart
index 2ba9c356a0..5360e30341 100644
--- a/mobile/test/services/hash_service_test.dart
+++ b/mobile/test/services/hash_service_test.dart
@@ -36,27 +36,22 @@ void main() {
       backgroundService: mockBackgroundService,
     );
 
-    when(() => mockDeviceAssetRepository.transaction<Null>(any()))
-        .thenAnswer((_) async {
+    when(() => mockDeviceAssetRepository.transaction<Null>(any())).thenAnswer((_) async {
       final capturedCallback = verify(
         () => mockDeviceAssetRepository.transaction<Null>(captureAny()),
       ).captured;
       // Invoke the transaction callback
       await (capturedCallback.firstOrNull as Future<Null> Function()?)?.call();
     });
-    when(() => mockDeviceAssetRepository.updateAll(any()))
-        .thenAnswer((_) async => true);
-    when(() => mockDeviceAssetRepository.deleteIds(any()))
-        .thenAnswer((_) async => true);
+    when(() => mockDeviceAssetRepository.updateAll(any())).thenAnswer((_) async => true);
+    when(() => mockDeviceAssetRepository.deleteIds(any())).thenAnswer((_) async => true);
   });
 
   group("HashService: No DeviceAsset entry", () {
     test("hash successfully", () async {
-      final (mockAsset, file, deviceAsset, hash) =
-          await _createAssetMock(AssetStub.image1);
+      final (mockAsset, file, deviceAsset, hash) = await _createAssetMock(AssetStub.image1);
 
-      when(() => mockBackgroundService.digestFiles([file.path]))
-          .thenAnswer((_) async => [hash]);
+      when(() => mockBackgroundService.digestFiles([file.path])).thenAnswer((_) async => [hash]);
       // No DB entries for this asset
       when(
         () => mockDeviceAssetRepository.getByIds([AssetStub.image1.localId!]),
@@ -65,14 +60,12 @@ void main() {
       final result = await sut.hashAssets([mockAsset]);
 
       // Verify we stored the new hash in DB
-      when(() => mockDeviceAssetRepository.transaction<Null>(any()))
-          .thenAnswer((_) async {
+      when(() => mockDeviceAssetRepository.transaction<Null>(any())).thenAnswer((_) async {
         final capturedCallback = verify(
           () => mockDeviceAssetRepository.transaction<Null>(captureAny()),
         ).captured;
         // Invoke the transaction callback
-        await (capturedCallback.firstOrNull as Future<Null> Function()?)
-            ?.call();
+        await (capturedCallback.firstOrNull as Future<Null> Function()?)?.call();
         verify(
           () => mockDeviceAssetRepository.updateAll([
             deviceAsset.copyWith(modifiedTime: AssetStub.image1.fileModifiedAt),
@@ -115,25 +108,21 @@ void main() {
     });
 
     test("hashed successful when asset is modified", () async {
-      final (mockAsset, file, deviceAsset, hash) =
-          await _createAssetMock(AssetStub.image1);
+      final (mockAsset, file, deviceAsset, hash) = await _createAssetMock(AssetStub.image1);
 
-      when(() => mockBackgroundService.digestFiles([file.path]))
-          .thenAnswer((_) async => [hash]);
+      when(() => mockBackgroundService.digestFiles([file.path])).thenAnswer((_) async => [hash]);
       when(
         () => mockDeviceAssetRepository.getByIds([AssetStub.image1.localId!]),
       ).thenAnswer((_) async => [deviceAsset]);
 
       final result = await sut.hashAssets([mockAsset]);
 
-      when(() => mockDeviceAssetRepository.transaction<Null>(any()))
-          .thenAnswer((_) async {
+      when(() => mockDeviceAssetRepository.transaction<Null>(any())).thenAnswer((_) async {
         final capturedCallback = verify(
           () => mockDeviceAssetRepository.transaction<Null>(captureAny()),
         ).captured;
         // Invoke the transaction callback
-        await (capturedCallback.firstOrNull as Future<Null> Function()?)
-            ?.call();
+        await (capturedCallback.firstOrNull as Future<Null> Function()?)?.call();
         verify(
           () => mockDeviceAssetRepository.updateAll([
             deviceAsset.copyWith(modifiedTime: AssetStub.image1.fileModifiedAt),
@@ -157,11 +146,9 @@ void main() {
     late File file;
 
     setUp(() async {
-      (mockAsset, file, deviceAsset, hash) =
-          await _createAssetMock(AssetStub.image1);
+      (mockAsset, file, deviceAsset, hash) = await _createAssetMock(AssetStub.image1);
 
-      when(() => mockBackgroundService.digestFiles([file.path]))
-          .thenAnswer((_) async => [hash]);
+      when(() => mockBackgroundService.digestFiles([file.path])).thenAnswer((_) async => [hash]);
       when(
         () => mockDeviceAssetRepository.getByIds([AssetStub.image1.localId!]),
       ).thenAnswer((_) async => [deviceAsset]);
@@ -182,14 +169,12 @@ void main() {
     });
 
     test("cleanups DeviceAsset when hashing failed", () async {
-      when(() => mockDeviceAssetRepository.transaction<Null>(any()))
-          .thenAnswer((_) async {
+      when(() => mockDeviceAssetRepository.transaction<Null>(any())).thenAnswer((_) async {
         final capturedCallback = verify(
           () => mockDeviceAssetRepository.transaction<Null>(captureAny()),
         ).captured;
         // Invoke the transaction callback
-        await (capturedCallback.firstOrNull as Future<Null> Function()?)
-            ?.call();
+        await (capturedCallback.firstOrNull as Future<Null> Function()?)?.call();
 
         // Verify the callback inside the transaction because, doing it outside results
         // in a small delay before the callback is invoked, resulting in other LOCs getting executed
@@ -210,8 +195,7 @@ void main() {
         // and verify the results inside the transaction stub
         verify(() => mockDeviceAssetRepository.updateAll([])).called(1);
         verify(
-          () =>
-              mockDeviceAssetRepository.deleteIds([AssetStub.image1.localId!]),
+          () => mockDeviceAssetRepository.deleteIds([AssetStub.image1.localId!]),
         ).called(1);
       });
 
@@ -240,14 +224,11 @@ void main() {
       final (asset2, file2, deviceAsset2, hash2) = mock2;
       final (asset3, file3, deviceAsset3, hash3) = mock3;
 
-      when(() => mockDeviceAssetRepository.getByIds(any()))
-          .thenAnswer((_) async => []);
+      when(() => mockDeviceAssetRepository.getByIds(any())).thenAnswer((_) async => []);
 
       // Setup for multiple batch processing calls
-      when(() => mockBackgroundService.digestFiles([file1.path, file2.path]))
-          .thenAnswer((_) async => [hash1, hash2]);
-      when(() => mockBackgroundService.digestFiles([file3.path]))
-          .thenAnswer((_) async => [hash3]);
+      when(() => mockBackgroundService.digestFiles([file1.path, file2.path])).thenAnswer((_) async => [hash1, hash2]);
+      when(() => mockBackgroundService.digestFiles([file3.path])).thenAnswer((_) async => [hash3]);
 
       final size = await file1.length() + await file2.length();
 
@@ -259,8 +240,7 @@ void main() {
       final result = await sut.hashAssets([asset1, asset2, asset3]);
 
       // Verify multiple batch process calls
-      verify(() => mockBackgroundService.digestFiles([file1.path, file2.path]))
-          .called(1);
+      verify(() => mockBackgroundService.digestFiles([file1.path, file2.path])).called(1);
       verify(() => mockBackgroundService.digestFiles([file3.path])).called(1);
 
       expect(
@@ -285,15 +265,11 @@ void main() {
       final (asset2, file2, deviceAsset2, hash2) = mock2;
       final (asset3, file3, deviceAsset3, hash3) = mock3;
 
-      when(() => mockDeviceAssetRepository.getByIds(any()))
-          .thenAnswer((_) async => []);
+      when(() => mockDeviceAssetRepository.getByIds(any())).thenAnswer((_) async => []);
 
-      when(() => mockBackgroundService.digestFiles([file1.path]))
-          .thenAnswer((_) async => [hash1]);
-      when(() => mockBackgroundService.digestFiles([file2.path]))
-          .thenAnswer((_) async => [hash2]);
-      when(() => mockBackgroundService.digestFiles([file3.path]))
-          .thenAnswer((_) async => [hash3]);
+      when(() => mockBackgroundService.digestFiles([file1.path])).thenAnswer((_) async => [hash1]);
+      when(() => mockBackgroundService.digestFiles([file2.path])).thenAnswer((_) async => [hash2]);
+      when(() => mockBackgroundService.digestFiles([file3.path])).thenAnswer((_) async => [hash3]);
 
       sut = HashService(
         deviceAssetRepository: mockDeviceAssetRepository,
@@ -318,17 +294,12 @@ void main() {
     });
 
     test("HashService: Sort & Process different states", () async {
-      final (asset1, file1, deviceAsset1, hash1) =
-          await _createAssetMock(AssetStub.image1); // Will need rehashing
-      final (asset2, file2, deviceAsset2, hash2) =
-          await _createAssetMock(AssetStub.image2); // Will have matching hash
-      final (asset3, file3, deviceAsset3, hash3) =
-          await _createAssetMock(AssetStub.image3); // No DB entry
-      final asset4 =
-          AssetStub.image3.copyWith(localId: "image4"); // Cannot be hashed
+      final (asset1, file1, deviceAsset1, hash1) = await _createAssetMock(AssetStub.image1); // Will need rehashing
+      final (asset2, file2, deviceAsset2, hash2) = await _createAssetMock(AssetStub.image2); // Will have matching hash
+      final (asset3, file3, deviceAsset3, hash3) = await _createAssetMock(AssetStub.image3); // No DB entry
+      final asset4 = AssetStub.image3.copyWith(localId: "image4"); // Cannot be hashed
 
-      when(() => mockBackgroundService.digestFiles([file1.path, file3.path]))
-          .thenAnswer((_) async => [hash1, hash3]);
+      when(() => mockBackgroundService.digestFiles([file1.path, file3.path])).thenAnswer((_) async => [hash1, hash3]);
       // DB entries are not sorted and a dummy entry added
       when(
         () => mockDeviceAssetRepository.getByIds([
@@ -349,8 +320,7 @@ void main() {
       final result = await sut.hashAssets([asset1, asset2, asset3, asset4]);
 
       // Verify correct processing of all assets
-      verify(() => mockBackgroundService.digestFiles([file1.path, file3.path]))
-          .called(1);
+      verify(() => mockBackgroundService.digestFiles([file1.path, file3.path])).called(1);
       expect(result.length, 3);
       expect(result, [
         AssetStub.image2.copyWith(checksum: base64.encode(hash2)),
@@ -361,8 +331,7 @@ void main() {
 
     group("HashService: Edge cases", () {
       test("handles empty list of assets", () async {
-        when(() => mockDeviceAssetRepository.getByIds(any()))
-            .thenAnswer((_) async => []);
+        when(() => mockDeviceAssetRepository.getByIds(any())).thenAnswer((_) async => []);
 
         final result = await sut.hashAssets([]);
 
@@ -398,8 +367,7 @@ Future<(Asset, File, DeviceAsset, Uint8List)> _createAssetMock(
   Asset asset,
 ) async {
   final random = Random();
-  final hash =
-      Uint8List.fromList(List.generate(20, (i) => random.nextInt(255)));
+  final hash = Uint8List.fromList(List.generate(20, (i) => random.nextInt(255)));
   final mockAsset = MockAsset();
   final mockAssetEntity = MockAssetEntity();
   final fs = MemoryFileSystem();
diff --git a/mobile/test/test_utils/medium_factory.dart b/mobile/test/test_utils/medium_factory.dart
index 8dafc564c1..19ad7166c6 100644
--- a/mobile/test/test_utils/medium_factory.dart
+++ b/mobile/test/test_utils/medium_factory.dart
@@ -25,10 +25,8 @@ class MediumFactory {
       name: name ?? 'Asset ${random.nextInt(1000000)}',
       checksum: checksum ?? '${random.nextInt(1000000)}',
       type: type ?? AssetType.image,
-      createdAt: createdAt ??
-          DateTime.fromMillisecondsSinceEpoch(random.nextInt(1000000000)),
-      updatedAt: updatedAt ??
-          DateTime.fromMillisecondsSinceEpoch(random.nextInt(1000000000)),
+      createdAt: createdAt ?? DateTime.fromMillisecondsSinceEpoch(random.nextInt(1000000000)),
+      updatedAt: updatedAt ?? DateTime.fromMillisecondsSinceEpoch(random.nextInt(1000000000)),
     );
   }
 
@@ -45,8 +43,7 @@ class MediumFactory {
     return LocalAlbum(
       id: id ?? '${random.nextInt(1000000)}',
       name: name ?? 'Album ${random.nextInt(1000000)}',
-      updatedAt: updatedAt ??
-          DateTime.fromMillisecondsSinceEpoch(random.nextInt(1000000000)),
+      updatedAt: updatedAt ?? DateTime.fromMillisecondsSinceEpoch(random.nextInt(1000000000)),
       assetCount: assetCount ?? random.nextInt(100),
       backupSelection: backupSelection ?? BackupSelection.none,
       isIosSharedAlbum: isIosSharedAlbum ?? false,

From b4780e89af9cda3d6174c96045533f4784549228 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 25 Jul 2025 10:58:21 +0530
Subject: [PATCH 309/337] fix: add beta toggle in landscape mode (#20187)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/pages/common/settings.page.dart | 90 ++++++++++++++--------
 1 file changed, 58 insertions(+), 32 deletions(-)

diff --git a/mobile/lib/pages/common/settings.page.dart b/mobile/lib/pages/common/settings.page.dart
index 11ae053a68..1fdd994639 100644
--- a/mobile/lib/pages/common/settings.page.dart
+++ b/mobile/lib/pages/common/settings.page.dart
@@ -2,21 +2,27 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/settings/advanced_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_list_settings/asset_list_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_viewer_settings/asset_viewer_settings.dart';
 import 'package:immich_mobile/widgets/settings/backup_settings/backup_settings.dart';
+import 'package:immich_mobile/widgets/settings/beta_sync_settings/beta_sync_settings.dart';
 import 'package:immich_mobile/widgets/settings/beta_timeline_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/language_settings.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/networking_settings.dart';
 import 'package:immich_mobile/widgets/settings/notification_setting.dart';
 import 'package:immich_mobile/widgets/settings/preference_settings/preference_setting.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/widgets/settings/settings_card.dart';
 
 enum SettingSection {
+  beta(
+    'beta_sync',
+    Icons.sync_outlined,
+    "beta_sync_subtitle",
+  ),
   advanced(
     'advanced',
     Icons.build_outlined,
@@ -63,6 +69,7 @@ enum SettingSection {
   final IconData icon;
 
   Widget get widget => switch (this) {
+        SettingSection.beta => const _BetaLandscapeToggle(),
         SettingSection.advanced => const AdvancedSettings(),
         SettingSection.assetViewer => const AssetViewerSettings(),
         SettingSection.backup => const BackupSettings(),
@@ -98,29 +105,32 @@ class _MobileLayout extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final List<Widget> settings = SettingSection.values
-        .map(
-          (setting) => SettingsCard(
-            title: setting.title.tr(),
-            subtitle: setting.subtitle.tr(),
-            icon: setting.icon,
-            settingRoute: SettingsSubRoute(section: setting),
-          ),
+        .expand(
+          (setting) => setting == SettingSection.beta
+              ? [
+                  const BetaTimelineListTile(),
+                  if (Store.isBetaTimelineEnabled)
+                    SettingsCard(
+                      icon: Icons.sync_outlined,
+                      title: 'beta_sync'.tr(),
+                      subtitle: 'beta_sync_subtitle'.tr(),
+                      settingRoute: const BetaSyncSettingsRoute(),
+                    ),
+                ]
+              : [
+                  SettingsCard(
+                    title: setting.title.tr(),
+                    subtitle: setting.subtitle.tr(),
+                    icon: setting.icon,
+                    settingRoute: SettingsSubRoute(section: setting),
+                  ),
+                ],
         )
         .toList();
     return ListView(
       physics: const ClampingScrollPhysics(),
       padding: const EdgeInsets.only(top: 10.0, bottom: 56),
-      children: [
-        const BetaTimelineListTile(),
-        if (Store.isBetaTimelineEnabled)
-          SettingsCard(
-            icon: Icons.sync_outlined,
-            title: 'beta_sync'.tr(),
-            subtitle: 'beta_sync_subtitle'.tr(),
-            settingRoute: const BetaSyncSettingsRoute(),
-          ),
-        ...settings,
-      ],
+      children: [...settings],
     );
   }
 }
@@ -137,20 +147,20 @@ class _TabletLayout extends HookWidget {
         Expanded(
           flex: 2,
           child: CustomScrollView(
-            slivers: SettingSection.values
-                .map(
-                  (s) => SliverToBoxAdapter(
-                    child: ListTile(
-                      title: Text(s.title).tr(),
-                      leading: Icon(s.icon),
-                      selected: s.index == selectedSection.value.index,
-                      selectedColor: context.primaryColor,
-                      selectedTileColor: context.themeData.highlightColor,
-                      onTap: () => selectedSection.value = s,
-                    ),
+            slivers: [
+              ...SettingSection.values.map(
+                (s) => SliverToBoxAdapter(
+                  child: ListTile(
+                    title: Text(s.title).tr(),
+                    leading: Icon(s.icon),
+                    selected: s.index == selectedSection.value.index,
+                    selectedColor: context.primaryColor,
+                    selectedTileColor: context.themeData.highlightColor,
+                    onTap: () => selectedSection.value = s,
                   ),
-                )
-                .toList(),
+                ),
+              ),
+            ],
           ),
         ),
         const VerticalDivider(width: 1),
@@ -163,6 +173,22 @@ class _TabletLayout extends HookWidget {
   }
 }
 
+class _BetaLandscapeToggle extends HookWidget {
+  const _BetaLandscapeToggle();
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        const SizedBox(height: 100, child: BetaTimelineListTile()),
+        if (Store.isBetaTimelineEnabled)
+          const Expanded(child: BetaSyncSettings()),
+      ],
+    );
+  }
+}
+
 @RoutePage()
 class SettingsSubPage extends StatelessWidget {
   const SettingsSubPage(this.section, {super.key});

From de67d22bc0bc35a8c4b5df76c365ba762ca9841d Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <jeremyfleischman@gmail.com>
Date: Thu, 24 Jul 2025 22:28:33 -0700
Subject: [PATCH 310/337] fix: add missing `await`s when changing client
 certificate (#20189)

I ran into this while testing out
<https://github.com/immich-app/immich/pull/19830>. When I add, change,
or remove a client certificate under Immich's advanced settings, the
change wouldn't take effect until some mysterious point in the future.
For example:

1. Add a client certificate. It doesn't get used.
2. Remove certificate. *Now* the client certificate from step 1) is used.
3. Restart application. Now no client certificate is used.

This all boils down to some missing `await`s. The user would change the
cert, and we'd start asynchronously saving it to the store, and while
the save is still happening, [`HttpSSLOptions` pulls the "old" value out of
`SSLClientCertStoreVal`](https://github.com/immich-app/immich/blob/v1.136.0/mobile/lib/utils/http_ssl_options.dart#L30).

With the appropriate `await`s, this behaves much more sanely.
---
 mobile/lib/entities/store.entity.dart            | 12 ++++++------
 .../settings/ssl_client_cert_settings.dart       | 16 ++++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/mobile/lib/entities/store.entity.dart b/mobile/lib/entities/store.entity.dart
index c937697149..7b59e119d6 100644
--- a/mobile/lib/entities/store.entity.dart
+++ b/mobile/lib/entities/store.entity.dart
@@ -13,11 +13,11 @@ class SSLClientCertStoreVal {
 
   const SSLClientCertStoreVal(this.data, this.password);
 
-  void save() {
+  Future<void> save() async {
     final b64Str = base64Encode(data);
-    Store.put(StoreKey.sslClientCertData, b64Str);
+    await Store.put(StoreKey.sslClientCertData, b64Str);
     if (password != null) {
-      Store.put(StoreKey.sslClientPasswd, password!);
+      await Store.put(StoreKey.sslClientPasswd, password!);
     }
   }
 
@@ -31,8 +31,8 @@ class SSLClientCertStoreVal {
     return SSLClientCertStoreVal(certData, passwd);
   }
 
-  static void delete() {
-    Store.delete(StoreKey.sslClientCertData);
-    Store.delete(StoreKey.sslClientPasswd);
+  static Future<void> delete() async {
+    await Store.delete(StoreKey.sslClientCertData);
+    await Store.delete(StoreKey.sslClientPasswd);
   }
 }
diff --git a/mobile/lib/widgets/settings/ssl_client_cert_settings.dart b/mobile/lib/widgets/settings/ssl_client_cert_settings.dart
index f17fd67638..ae5b065294 100644
--- a/mobile/lib/widgets/settings/ssl_client_cert_settings.dart
+++ b/mobile/lib/widgets/settings/ssl_client_cert_settings.dart
@@ -61,7 +61,7 @@ class _SslClientCertSettingsState extends State<SslClientCertSettings> {
                 width: 15,
               ),
               ElevatedButton(
-                onPressed: widget.isLoggedIn || !isCertExist ? null : () => removeCert(context),
+                onPressed: widget.isLoggedIn || !isCertExist ? null : () async => await removeCert(context),
                 child: Text("remove".tr()),
               ),
             ],
@@ -86,7 +86,11 @@ class _SslClientCertSettingsState extends State<SslClientCertSettings> {
     );
   }
 
-  void storeCert(BuildContext context, Uint8List data, String? password) {
+  Future<void> storeCert(
+    BuildContext context,
+    Uint8List data,
+    String? password,
+  ) async {
     if (password != null && password.isEmpty) {
       password = null;
     }
@@ -100,7 +104,7 @@ class _SslClientCertSettingsState extends State<SslClientCertSettings> {
       showMessage(context, "client_cert_invalid_msg".tr());
       return;
     }
-    cert.save();
+    await cert.save();
     HttpSSLOptions.apply();
     setState(
       () => isCertExist = true,
@@ -124,7 +128,7 @@ class _SslClientCertSettingsState extends State<SslClientCertSettings> {
         ),
         actions: [
           TextButton(
-            onPressed: () => {ctx.pop(), storeCert(context, data, password.text)},
+            onPressed: () async => {ctx.pop(), await storeCert(context, data, password.text)},
             child: Text("client_cert_dialog_msg_confirm".tr()),
           ),
         ],
@@ -147,8 +151,8 @@ class _SslClientCertSettingsState extends State<SslClientCertSettings> {
     }
   }
 
-  void removeCert(BuildContext context) {
-    SSLClientCertStoreVal.delete();
+  Future<void> removeCert(BuildContext context) async {
+    await SSLClientCertStoreVal.delete();
     HttpSSLOptions.apply();
     setState(
       () => isCertExist = false,

From 06c78dfa91f057172c353e1190169d8b81b68f64 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Fri, 25 Jul 2025 01:10:33 -0500
Subject: [PATCH 311/337] feat: add to album on new beta timeline (#20119)

* feat: add to album on new beta timeline

* handle add album button

* tune

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 mobile/lib/pages/common/settings.page.dart    |   3 +-
 .../presentation/pages/drift_album.page.dart  | 682 +--------------
 .../widgets/album/album_selector.widget.dart  | 778 ++++++++++++++++++
 .../general_bottom_sheet.widget.dart          |  46 +-
 mobile/pubspec.lock                           |   8 +
 mobile/pubspec.yaml                           |   1 +
 6 files changed, 840 insertions(+), 678 deletions(-)
 create mode 100644 mobile/lib/presentation/widgets/album/album_selector.widget.dart

diff --git a/mobile/lib/pages/common/settings.page.dart b/mobile/lib/pages/common/settings.page.dart
index 1fdd994639..f5c42c9321 100644
--- a/mobile/lib/pages/common/settings.page.dart
+++ b/mobile/lib/pages/common/settings.page.dart
@@ -182,8 +182,7 @@ class _BetaLandscapeToggle extends HookWidget {
       mainAxisAlignment: MainAxisAlignment.start,
       children: [
         const SizedBox(height: 100, child: BetaTimelineListTile()),
-        if (Store.isBetaTimelineEnabled)
-          const Expanded(child: BetaSyncSettings()),
+        if (Store.isBetaTimelineEnabled) const Expanded(child: BetaSyncSettings()),
       ],
     );
   }
diff --git a/mobile/lib/presentation/pages/drift_album.page.dart b/mobile/lib/presentation/pages/drift_album.page.dart
index 1f97bb6f45..e22c63ac29 100644
--- a/mobile/lib/presentation/pages/drift_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_album.page.dart
@@ -1,24 +1,13 @@
 import 'dart:async';
-import 'dart:math';
 
 import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/album/album.model.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/models/albums/album_search.model.dart';
-import 'package:immich_mobile/pages/common/large_leading_tile.dart';
-import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/utils/remote_album.utils.dart';
 import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
-import 'package:immich_mobile/widgets/common/search_field.dart';
 
 @RoutePage()
 class DriftAlbumsPage extends ConsumerStatefulWidget {
@@ -29,67 +18,12 @@ class DriftAlbumsPage extends ConsumerStatefulWidget {
 }
 
 class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
-  bool isGrid = false;
-  final searchController = TextEditingController();
-  QuickFilterMode filterMode = QuickFilterMode.all;
-  final searchFocusNode = FocusNode();
-
-  @override
-  void initState() {
-    super.initState();
-
-    // Load albums when component mounts
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      ref.read(remoteAlbumProvider.notifier).refresh();
-    });
-
-    searchController.addListener(() {
-      onSearch(searchController.text, filterMode);
-    });
-  }
-
-  void onSearch(String searchTerm, QuickFilterMode sortMode) {
-    final userId = ref.watch(currentUserProvider)?.id;
-    ref.read(remoteAlbumProvider.notifier).searchAlbums(searchTerm, userId, sortMode);
-  }
-
   Future<void> onRefresh() async {
     await ref.read(remoteAlbumProvider.notifier).refresh();
   }
 
-  void toggleViewMode() {
-    setState(() {
-      isGrid = !isGrid;
-    });
-  }
-
-  void changeFilter(QuickFilterMode sortMode) {
-    setState(() {
-      filterMode = sortMode;
-    });
-  }
-
-  void clearSearch() {
-    setState(() {
-      filterMode = QuickFilterMode.all;
-      searchController.clear();
-      ref.read(remoteAlbumProvider.notifier).clearSearch();
-    });
-  }
-
-  @override
-  void dispose() {
-    searchController.dispose();
-    searchFocusNode.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
-    final albums = ref.watch(remoteAlbumProvider.select((s) => s.filteredAlbums));
-
-    final userId = ref.watch(currentUserProvider)?.id;
-
     return RefreshIndicator(
       onRefresh: onRefresh,
       edgeOffset: 100,
@@ -112,616 +46,16 @@ class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
             ],
             showUploadButton: false,
           ),
-          _SearchBar(
-            searchController: searchController,
-            searchFocusNode: searchFocusNode,
-            onSearch: onSearch,
-            filterMode: filterMode,
-            onClearSearch: clearSearch,
+          AlbumSelector(
+            onAlbumSelected: (album) {
+              ref.read(currentRemoteAlbumProvider.notifier).setAlbum(album);
+              context.router.push(
+                RemoteAlbumRoute(album: album),
+              );
+            },
           ),
-          _QuickFilterButtonRow(
-            filterMode: filterMode,
-            onChangeFilter: changeFilter,
-            onSearch: onSearch,
-            searchController: searchController,
-          ),
-          _QuickSortAndViewMode(
-            isGrid: isGrid,
-            onToggleViewMode: toggleViewMode,
-          ),
-          isGrid
-              ? _AlbumGrid(
-                  albums: albums,
-                  userId: userId,
-                )
-              : _AlbumList(
-                  albums: albums,
-                  userId: userId,
-                ),
         ],
       ),
     );
   }
 }
-
-class _SortButton extends ConsumerStatefulWidget {
-  const _SortButton();
-
-  @override
-  ConsumerState<_SortButton> createState() => _SortButtonState();
-}
-
-class _SortButtonState extends ConsumerState<_SortButton> {
-  RemoteAlbumSortMode albumSortOption = RemoteAlbumSortMode.lastModified;
-  bool albumSortIsReverse = true;
-
-  void onMenuTapped(RemoteAlbumSortMode sortMode) {
-    final selected = albumSortOption == sortMode;
-    // Switch direction
-    if (selected) {
-      setState(() {
-        albumSortIsReverse = !albumSortIsReverse;
-      });
-      ref.read(remoteAlbumProvider.notifier).sortFilteredAlbums(
-            sortMode,
-            isReverse: albumSortIsReverse,
-          );
-    } else {
-      setState(() {
-        albumSortOption = sortMode;
-      });
-      ref.read(remoteAlbumProvider.notifier).sortFilteredAlbums(
-            sortMode,
-            isReverse: albumSortIsReverse,
-          );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MenuAnchor(
-      style: MenuStyle(
-        elevation: const WidgetStatePropertyAll(1),
-        shape: WidgetStateProperty.all(
-          const RoundedRectangleBorder(
-            borderRadius: BorderRadius.all(
-              Radius.circular(24),
-            ),
-          ),
-        ),
-        padding: const WidgetStatePropertyAll(
-          EdgeInsets.all(4),
-        ),
-      ),
-      consumeOutsideTap: true,
-      menuChildren: RemoteAlbumSortMode.values
-          .map(
-            (sortMode) => MenuItemButton(
-              leadingIcon: albumSortOption == sortMode
-                  ? albumSortIsReverse
-                      ? Icon(
-                          Icons.keyboard_arrow_down,
-                          color: albumSortOption == sortMode
-                              ? context.colorScheme.onPrimary
-                              : context.colorScheme.onSurface,
-                        )
-                      : Icon(
-                          Icons.keyboard_arrow_up_rounded,
-                          color: albumSortOption == sortMode
-                              ? context.colorScheme.onPrimary
-                              : context.colorScheme.onSurface,
-                        )
-                  : const Icon(Icons.abc, color: Colors.transparent),
-              onPressed: () => onMenuTapped(sortMode),
-              style: ButtonStyle(
-                padding: WidgetStateProperty.all(
-                  const EdgeInsets.fromLTRB(16, 16, 32, 16),
-                ),
-                backgroundColor: WidgetStateProperty.all(
-                  albumSortOption == sortMode ? context.colorScheme.primary : Colors.transparent,
-                ),
-                shape: WidgetStateProperty.all(
-                  const RoundedRectangleBorder(
-                    borderRadius: BorderRadius.all(
-                      Radius.circular(24),
-                    ),
-                  ),
-                ),
-              ),
-              child: Text(
-                sortMode.key.t(context: context),
-                style: context.textTheme.titleSmall?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  color: albumSortOption == sortMode
-                      ? context.colorScheme.onPrimary
-                      : context.colorScheme.onSurface.withAlpha(185),
-                ),
-              ),
-            ),
-          )
-          .toList(),
-      builder: (context, controller, child) {
-        return GestureDetector(
-          onTap: () {
-            if (controller.isOpen) {
-              controller.close();
-            } else {
-              controller.open();
-            }
-          },
-          child: Row(
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(right: 5),
-                child: albumSortIsReverse
-                    ? const Icon(
-                        Icons.keyboard_arrow_down,
-                      )
-                    : const Icon(
-                        Icons.keyboard_arrow_up_rounded,
-                      ),
-              ),
-              Text(
-                albumSortOption.key.t(context: context),
-                style: context.textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.w500,
-                  color: context.colorScheme.onSurface.withAlpha(225),
-                ),
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-}
-
-class _SearchBar extends StatelessWidget {
-  const _SearchBar({
-    required this.searchController,
-    required this.searchFocusNode,
-    required this.onSearch,
-    required this.filterMode,
-    required this.onClearSearch,
-  });
-
-  final TextEditingController searchController;
-  final FocusNode searchFocusNode;
-  final void Function(String, QuickFilterMode) onSearch;
-  final QuickFilterMode filterMode;
-  final VoidCallback onClearSearch;
-
-  @override
-  Widget build(BuildContext context) {
-    return SliverPadding(
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
-      sliver: SliverToBoxAdapter(
-        child: Container(
-          decoration: BoxDecoration(
-            border: Border.all(
-              color: context.colorScheme.onSurface.withAlpha(0),
-              width: 0,
-            ),
-            borderRadius: const BorderRadius.all(
-              Radius.circular(24),
-            ),
-            gradient: LinearGradient(
-              colors: [
-                context.colorScheme.primary.withValues(alpha: 0.075),
-                context.colorScheme.primary.withValues(alpha: 0.09),
-                context.colorScheme.primary.withValues(alpha: 0.075),
-              ],
-              begin: Alignment.topLeft,
-              end: Alignment.bottomRight,
-              transform: const GradientRotation(0.5 * pi),
-            ),
-          ),
-          child: SearchField(
-            autofocus: false,
-            contentPadding: const EdgeInsets.all(16),
-            hintText: 'search_albums'.tr(),
-            prefixIcon: const Icon(Icons.search_rounded),
-            suffixIcon: searchController.text.isNotEmpty
-                ? IconButton(
-                    icon: const Icon(Icons.clear_rounded),
-                    onPressed: onClearSearch,
-                  )
-                : null,
-            controller: searchController,
-            onChanged: (_) => onSearch(searchController.text, filterMode),
-            focusNode: searchFocusNode,
-            onTapOutside: (_) => searchFocusNode.unfocus(),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _QuickFilterButtonRow extends StatelessWidget {
-  const _QuickFilterButtonRow({
-    required this.filterMode,
-    required this.onChangeFilter,
-    required this.onSearch,
-    required this.searchController,
-  });
-
-  final QuickFilterMode filterMode;
-  final void Function(QuickFilterMode) onChangeFilter;
-  final void Function(String, QuickFilterMode) onSearch;
-  final TextEditingController searchController;
-
-  @override
-  Widget build(BuildContext context) {
-    return SliverPadding(
-      padding: const EdgeInsets.symmetric(horizontal: 16),
-      sliver: SliverToBoxAdapter(
-        child: Wrap(
-          spacing: 4,
-          runSpacing: 4,
-          children: [
-            _QuickFilterButton(
-              label: 'all'.tr(),
-              isSelected: filterMode == QuickFilterMode.all,
-              onTap: () {
-                onChangeFilter(QuickFilterMode.all);
-                onSearch(searchController.text, QuickFilterMode.all);
-              },
-            ),
-            _QuickFilterButton(
-              label: 'shared_with_me'.tr(),
-              isSelected: filterMode == QuickFilterMode.sharedWithMe,
-              onTap: () {
-                onChangeFilter(QuickFilterMode.sharedWithMe);
-                onSearch(
-                  searchController.text,
-                  QuickFilterMode.sharedWithMe,
-                );
-              },
-            ),
-            _QuickFilterButton(
-              label: 'my_albums'.tr(),
-              isSelected: filterMode == QuickFilterMode.myAlbums,
-              onTap: () {
-                onChangeFilter(QuickFilterMode.myAlbums);
-                onSearch(
-                  searchController.text,
-                  QuickFilterMode.myAlbums,
-                );
-              },
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _QuickFilterButton extends StatelessWidget {
-  const _QuickFilterButton({
-    required this.isSelected,
-    required this.onTap,
-    required this.label,
-  });
-
-  final bool isSelected;
-  final VoidCallback onTap;
-  final String label;
-
-  @override
-  Widget build(BuildContext context) {
-    return TextButton(
-      onPressed: onTap,
-      style: ButtonStyle(
-        backgroundColor: WidgetStateProperty.all(
-          isSelected ? context.colorScheme.primary : Colors.transparent,
-        ),
-        shape: WidgetStateProperty.all(
-          RoundedRectangleBorder(
-            borderRadius: const BorderRadius.all(
-              Radius.circular(20),
-            ),
-            side: BorderSide(
-              color: context.colorScheme.onSurface.withAlpha(25),
-              width: 1,
-            ),
-          ),
-        ),
-      ),
-      child: Text(
-        label,
-        style: TextStyle(
-          color: isSelected ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
-          fontSize: 14,
-        ),
-      ),
-    );
-  }
-}
-
-class _QuickSortAndViewMode extends StatelessWidget {
-  const _QuickSortAndViewMode({
-    required this.isGrid,
-    required this.onToggleViewMode,
-  });
-
-  final bool isGrid;
-  final VoidCallback onToggleViewMode;
-
-  @override
-  Widget build(BuildContext context) {
-    return SliverPadding(
-      padding: const EdgeInsets.symmetric(horizontal: 16),
-      sliver: SliverToBoxAdapter(
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            const _SortButton(),
-            IconButton(
-              icon: Icon(
-                isGrid ? Icons.view_list_outlined : Icons.grid_view_outlined,
-                size: 24,
-              ),
-              onPressed: onToggleViewMode,
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _AlbumList extends ConsumerWidget {
-  const _AlbumList({
-    required this.albums,
-    required this.userId,
-  });
-
-  final List<RemoteAlbum> albums;
-  final String? userId;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    if (albums.isEmpty) {
-      return const SliverToBoxAdapter(
-        child: Center(
-          child: Padding(
-            padding: EdgeInsets.all(20.0),
-            child: Text('No albums found'),
-          ),
-        ),
-      );
-    }
-
-    return SliverPadding(
-      padding: const EdgeInsets.symmetric(horizontal: 16.0),
-      sliver: SliverList.builder(
-        itemBuilder: (_, index) {
-          final album = albums[index];
-
-          return Padding(
-            padding: const EdgeInsets.only(
-              bottom: 8.0,
-            ),
-            child: LargeLeadingTile(
-              title: Text(
-                album.name,
-                maxLines: 2,
-                overflow: TextOverflow.ellipsis,
-                style: context.textTheme.titleSmall?.copyWith(
-                  fontWeight: FontWeight.w600,
-                ),
-              ),
-              subtitle: Text(
-                '${'items_count'.t(
-                  context: context,
-                  args: {
-                    'count': album.assetCount,
-                  },
-                )} • ${album.ownerId != userId ? 'shared_by_user'.t(
-                    context: context,
-                    args: {
-                      'user': album.ownerName,
-                    },
-                  ) : 'owned'.t(context: context)}',
-                overflow: TextOverflow.ellipsis,
-                style: context.textTheme.bodyMedium?.copyWith(
-                  color: context.colorScheme.onSurfaceSecondary,
-                ),
-              ),
-              onTap: () {
-                ref.read(currentRemoteAlbumProvider.notifier).setAlbum(album);
-                context.router.push(
-                  RemoteAlbumRoute(album: album),
-                );
-              },
-              leadingPadding: const EdgeInsets.only(
-                right: 16,
-              ),
-              leading: album.thumbnailAssetId != null
-                  ? ClipRRect(
-                      borderRadius: const BorderRadius.all(
-                        Radius.circular(15),
-                      ),
-                      child: SizedBox(
-                        width: 80,
-                        height: 80,
-                        child: Thumbnail(
-                          remoteId: album.thumbnailAssetId,
-                        ),
-                      ),
-                    )
-                  : SizedBox(
-                      width: 80,
-                      height: 80,
-                      child: Container(
-                        decoration: BoxDecoration(
-                          color: context.colorScheme.surfaceContainer,
-                          borderRadius: const BorderRadius.all(Radius.circular(16)),
-                          border: Border.all(
-                            color: context.colorScheme.outline.withAlpha(50),
-                            width: 1,
-                          ),
-                        ),
-                        child: const Icon(
-                          Icons.photo_album_rounded,
-                          size: 24,
-                          color: Colors.grey,
-                        ),
-                      ),
-                    ),
-            ),
-          );
-        },
-        itemCount: albums.length,
-      ),
-    );
-  }
-}
-
-class _AlbumGrid extends StatelessWidget {
-  const _AlbumGrid({
-    required this.albums,
-    required this.userId,
-  });
-
-  final List<RemoteAlbum> albums;
-  final String? userId;
-
-  @override
-  Widget build(BuildContext context) {
-    if (albums.isEmpty) {
-      return const SliverToBoxAdapter(
-        child: Center(
-          child: Padding(
-            padding: EdgeInsets.all(20.0),
-            child: Text('No albums found'),
-          ),
-        ),
-      );
-    }
-
-    return SliverPadding(
-      padding: const EdgeInsets.symmetric(horizontal: 16.0),
-      sliver: SliverGrid(
-        gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-          maxCrossAxisExtent: 250,
-          mainAxisSpacing: 4,
-          crossAxisSpacing: 4,
-          childAspectRatio: .7,
-        ),
-        delegate: SliverChildBuilderDelegate(
-          (context, index) {
-            final album = albums[index];
-            return _GridAlbumCard(
-              album: album,
-              userId: userId,
-            );
-          },
-          childCount: albums.length,
-        ),
-      ),
-    );
-  }
-}
-
-class _GridAlbumCard extends ConsumerWidget {
-  const _GridAlbumCard({
-    required this.album,
-    required this.userId,
-  });
-
-  final RemoteAlbum album;
-  final String? userId;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return GestureDetector(
-      onTap: () {
-        ref.read(currentRemoteAlbumProvider.notifier).setAlbum(album);
-        context.router.push(
-          RemoteAlbumRoute(album: album),
-        );
-      },
-      child: Card(
-        elevation: 0,
-        color: context.colorScheme.surfaceBright,
-        shape: RoundedRectangleBorder(
-          borderRadius: const BorderRadius.all(
-            Radius.circular(16),
-          ),
-          side: BorderSide(
-            color: context.colorScheme.onSurface.withAlpha(25),
-            width: 1,
-          ),
-        ),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Expanded(
-              flex: 2,
-              child: ClipRRect(
-                borderRadius: const BorderRadius.vertical(
-                  top: Radius.circular(15),
-                ),
-                child: SizedBox(
-                  width: double.infinity,
-                  child: album.thumbnailAssetId != null
-                      ? Thumbnail(
-                          remoteId: album.thumbnailAssetId,
-                        )
-                      : Container(
-                          color: context.colorScheme.surfaceContainerHighest,
-                          child: const Icon(
-                            Icons.photo_album_rounded,
-                            size: 40,
-                            color: Colors.grey,
-                          ),
-                        ),
-                ),
-              ),
-            ),
-            Expanded(
-              flex: 1,
-              child: Padding(
-                padding: const EdgeInsets.all(12.0),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                  children: [
-                    Text(
-                      album.name,
-                      maxLines: 2,
-                      overflow: TextOverflow.ellipsis,
-                      style: context.textTheme.titleSmall?.copyWith(
-                        fontWeight: FontWeight.w600,
-                      ),
-                    ),
-                    Text(
-                      '${'items_count'.t(
-                        context: context,
-                        args: {
-                          'count': album.assetCount,
-                        },
-                      )} • ${album.ownerId != userId ? 'shared_by_user'.t(
-                          context: context,
-                          args: {
-                            'user': album.ownerName,
-                          },
-                        ) : 'owned'.t(context: context)}',
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                      style: context.textTheme.labelMedium?.copyWith(
-                        color: context.colorScheme.onSurfaceSecondary,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/mobile/lib/presentation/widgets/album/album_selector.widget.dart b/mobile/lib/presentation/widgets/album/album_selector.widget.dart
new file mode 100644
index 0000000000..5d9378ecaf
--- /dev/null
+++ b/mobile/lib/presentation/widgets/album/album_selector.widget.dart
@@ -0,0 +1,778 @@
+import 'dart:async';
+import 'dart:math';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/models/albums/album_search.model.dart';
+import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/remote_album.utils.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+import 'package:immich_mobile/widgets/common/search_field.dart';
+import 'package:sliver_tools/sliver_tools.dart';
+
+typedef AlbumSelectorCallback = void Function(RemoteAlbum album);
+
+class AlbumSelector extends ConsumerStatefulWidget {
+  final AlbumSelectorCallback onAlbumSelected;
+
+  const AlbumSelector({
+    super.key,
+    required this.onAlbumSelected,
+  });
+
+  @override
+  ConsumerState<AlbumSelector> createState() => _AlbumSelectorState();
+}
+
+class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
+  bool isGrid = false;
+  final searchController = TextEditingController();
+  QuickFilterMode filterMode = QuickFilterMode.all;
+  final searchFocusNode = FocusNode();
+
+  @override
+  void initState() {
+    super.initState();
+
+    // Load albums when component mounts
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      ref.read(remoteAlbumProvider.notifier).refresh();
+    });
+
+    searchController.addListener(() {
+      onSearch(searchController.text, filterMode);
+    });
+  }
+
+  void onSearch(String searchTerm, QuickFilterMode sortMode) {
+    final userId = ref.watch(currentUserProvider)?.id;
+    ref.read(remoteAlbumProvider.notifier).searchAlbums(searchTerm, userId, sortMode);
+  }
+
+  Future<void> onRefresh() async {
+    await ref.read(remoteAlbumProvider.notifier).refresh();
+  }
+
+  void toggleViewMode() {
+    setState(() {
+      isGrid = !isGrid;
+    });
+  }
+
+  void changeFilter(QuickFilterMode sortMode) {
+    setState(() {
+      filterMode = sortMode;
+    });
+  }
+
+  void clearSearch() {
+    setState(() {
+      filterMode = QuickFilterMode.all;
+      searchController.clear();
+      ref.read(remoteAlbumProvider.notifier).clearSearch();
+    });
+  }
+
+  @override
+  void dispose() {
+    searchController.dispose();
+    searchFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final albums = ref.watch(remoteAlbumProvider.select((s) => s.filteredAlbums));
+
+    final userId = ref.watch(currentUserProvider)?.id;
+
+    return MultiSliver(
+      children: [
+        _SearchBar(
+          searchController: searchController,
+          searchFocusNode: searchFocusNode,
+          onSearch: onSearch,
+          filterMode: filterMode,
+          onClearSearch: clearSearch,
+        ),
+        _QuickFilterButtonRow(
+          filterMode: filterMode,
+          onChangeFilter: changeFilter,
+          onSearch: onSearch,
+          searchController: searchController,
+        ),
+        _QuickSortAndViewMode(
+          isGrid: isGrid,
+          onToggleViewMode: toggleViewMode,
+        ),
+        isGrid
+            ? _AlbumGrid(
+                albums: albums,
+                userId: userId,
+                onAlbumSelected: widget.onAlbumSelected,
+              )
+            : _AlbumList(
+                albums: albums,
+                userId: userId,
+                onAlbumSelected: widget.onAlbumSelected,
+              ),
+      ],
+    );
+  }
+}
+
+class _SortButton extends ConsumerStatefulWidget {
+  const _SortButton();
+
+  @override
+  ConsumerState<_SortButton> createState() => _SortButtonState();
+}
+
+class _SortButtonState extends ConsumerState<_SortButton> {
+  RemoteAlbumSortMode albumSortOption = RemoteAlbumSortMode.lastModified;
+  bool albumSortIsReverse = true;
+
+  void onMenuTapped(RemoteAlbumSortMode sortMode) {
+    final selected = albumSortOption == sortMode;
+    // Switch direction
+    if (selected) {
+      setState(() {
+        albumSortIsReverse = !albumSortIsReverse;
+      });
+      ref.read(remoteAlbumProvider.notifier).sortFilteredAlbums(
+            sortMode,
+            isReverse: albumSortIsReverse,
+          );
+    } else {
+      setState(() {
+        albumSortOption = sortMode;
+      });
+      ref.read(remoteAlbumProvider.notifier).sortFilteredAlbums(
+            sortMode,
+            isReverse: albumSortIsReverse,
+          );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MenuAnchor(
+      style: MenuStyle(
+        elevation: const WidgetStatePropertyAll(1),
+        shape: WidgetStateProperty.all(
+          const RoundedRectangleBorder(
+            borderRadius: BorderRadius.all(
+              Radius.circular(24),
+            ),
+          ),
+        ),
+        padding: const WidgetStatePropertyAll(
+          EdgeInsets.all(4),
+        ),
+      ),
+      consumeOutsideTap: true,
+      menuChildren: RemoteAlbumSortMode.values
+          .map(
+            (sortMode) => MenuItemButton(
+              leadingIcon: albumSortOption == sortMode
+                  ? albumSortIsReverse
+                      ? Icon(
+                          Icons.keyboard_arrow_down,
+                          color: albumSortOption == sortMode
+                              ? context.colorScheme.onPrimary
+                              : context.colorScheme.onSurface,
+                        )
+                      : Icon(
+                          Icons.keyboard_arrow_up_rounded,
+                          color: albumSortOption == sortMode
+                              ? context.colorScheme.onPrimary
+                              : context.colorScheme.onSurface,
+                        )
+                  : const Icon(Icons.abc, color: Colors.transparent),
+              onPressed: () => onMenuTapped(sortMode),
+              style: ButtonStyle(
+                padding: WidgetStateProperty.all(
+                  const EdgeInsets.fromLTRB(16, 16, 32, 16),
+                ),
+                backgroundColor: WidgetStateProperty.all(
+                  albumSortOption == sortMode ? context.colorScheme.primary : Colors.transparent,
+                ),
+                shape: WidgetStateProperty.all(
+                  const RoundedRectangleBorder(
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(24),
+                    ),
+                  ),
+                ),
+              ),
+              child: Text(
+                sortMode.key.t(context: context),
+                style: context.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
+                  color: albumSortOption == sortMode
+                      ? context.colorScheme.onPrimary
+                      : context.colorScheme.onSurface.withAlpha(185),
+                ),
+              ),
+            ),
+          )
+          .toList(),
+      builder: (context, controller, child) {
+        return GestureDetector(
+          onTap: () {
+            if (controller.isOpen) {
+              controller.close();
+            } else {
+              controller.open();
+            }
+          },
+          child: Row(
+            children: [
+              Padding(
+                padding: const EdgeInsets.only(right: 5),
+                child: albumSortIsReverse
+                    ? const Icon(
+                        Icons.keyboard_arrow_down,
+                      )
+                    : const Icon(
+                        Icons.keyboard_arrow_up_rounded,
+                      ),
+              ),
+              Text(
+                albumSortOption.key.t(context: context),
+                style: context.textTheme.bodyLarge?.copyWith(
+                  fontWeight: FontWeight.w500,
+                  color: context.colorScheme.onSurface.withAlpha(225),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _SearchBar extends StatelessWidget {
+  const _SearchBar({
+    required this.searchController,
+    required this.searchFocusNode,
+    required this.onSearch,
+    required this.filterMode,
+    required this.onClearSearch,
+  });
+
+  final TextEditingController searchController;
+  final FocusNode searchFocusNode;
+  final void Function(String, QuickFilterMode) onSearch;
+  final QuickFilterMode filterMode;
+  final VoidCallback onClearSearch;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+      sliver: SliverToBoxAdapter(
+        child: Container(
+          decoration: BoxDecoration(
+            border: Border.all(
+              color: context.colorScheme.onSurface.withAlpha(0),
+              width: 0,
+            ),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(24),
+            ),
+            gradient: LinearGradient(
+              colors: [
+                context.colorScheme.primary.withValues(alpha: 0.075),
+                context.colorScheme.primary.withValues(alpha: 0.09),
+                context.colorScheme.primary.withValues(alpha: 0.075),
+              ],
+              begin: Alignment.topLeft,
+              end: Alignment.bottomRight,
+              transform: const GradientRotation(0.5 * pi),
+            ),
+          ),
+          child: SearchField(
+            autofocus: false,
+            contentPadding: const EdgeInsets.all(16),
+            hintText: 'search_albums'.tr(),
+            prefixIcon: const Icon(Icons.search_rounded),
+            suffixIcon: searchController.text.isNotEmpty
+                ? IconButton(
+                    icon: const Icon(Icons.clear_rounded),
+                    onPressed: onClearSearch,
+                  )
+                : null,
+            controller: searchController,
+            onChanged: (_) => onSearch(searchController.text, filterMode),
+            focusNode: searchFocusNode,
+            onTapOutside: (_) => searchFocusNode.unfocus(),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickFilterButtonRow extends StatelessWidget {
+  const _QuickFilterButtonRow({
+    required this.filterMode,
+    required this.onChangeFilter,
+    required this.onSearch,
+    required this.searchController,
+  });
+
+  final QuickFilterMode filterMode;
+  final void Function(QuickFilterMode) onChangeFilter;
+  final void Function(String, QuickFilterMode) onSearch;
+  final TextEditingController searchController;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      sliver: SliverToBoxAdapter(
+        child: Wrap(
+          spacing: 4,
+          runSpacing: 4,
+          children: [
+            _QuickFilterButton(
+              label: 'all'.tr(),
+              isSelected: filterMode == QuickFilterMode.all,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.all);
+                onSearch(searchController.text, QuickFilterMode.all);
+              },
+            ),
+            _QuickFilterButton(
+              label: 'shared_with_me'.tr(),
+              isSelected: filterMode == QuickFilterMode.sharedWithMe,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.sharedWithMe);
+                onSearch(
+                  searchController.text,
+                  QuickFilterMode.sharedWithMe,
+                );
+              },
+            ),
+            _QuickFilterButton(
+              label: 'my_albums'.tr(),
+              isSelected: filterMode == QuickFilterMode.myAlbums,
+              onTap: () {
+                onChangeFilter(QuickFilterMode.myAlbums);
+                onSearch(
+                  searchController.text,
+                  QuickFilterMode.myAlbums,
+                );
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickFilterButton extends StatelessWidget {
+  const _QuickFilterButton({
+    required this.isSelected,
+    required this.onTap,
+    required this.label,
+  });
+
+  final bool isSelected;
+  final VoidCallback onTap;
+  final String label;
+
+  @override
+  Widget build(BuildContext context) {
+    return TextButton(
+      onPressed: onTap,
+      style: ButtonStyle(
+        backgroundColor: WidgetStateProperty.all(
+          isSelected ? context.colorScheme.primary : Colors.transparent,
+        ),
+        shape: WidgetStateProperty.all(
+          RoundedRectangleBorder(
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
+            side: BorderSide(
+              color: context.colorScheme.onSurface.withAlpha(25),
+              width: 1,
+            ),
+          ),
+        ),
+      ),
+      child: Text(
+        label,
+        style: TextStyle(
+          color: isSelected ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
+          fontSize: 14,
+        ),
+      ),
+    );
+  }
+}
+
+class _QuickSortAndViewMode extends StatelessWidget {
+  const _QuickSortAndViewMode({
+    required this.isGrid,
+    required this.onToggleViewMode,
+  });
+
+  final bool isGrid;
+  final VoidCallback onToggleViewMode;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      sliver: SliverToBoxAdapter(
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            const _SortButton(),
+            IconButton(
+              icon: Icon(
+                isGrid ? Icons.view_list_outlined : Icons.grid_view_outlined,
+                size: 24,
+              ),
+              onPressed: onToggleViewMode,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _AlbumList extends ConsumerWidget {
+  const _AlbumList({
+    required this.albums,
+    required this.userId,
+    required this.onAlbumSelected,
+  });
+
+  final List<RemoteAlbum> albums;
+  final String? userId;
+  final AlbumSelectorCallback onAlbumSelected;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    if (albums.isEmpty) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: Text('No albums found'),
+          ),
+        ),
+      );
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0),
+      sliver: SliverList.builder(
+        itemBuilder: (_, index) {
+          final album = albums[index];
+
+          return Padding(
+            padding: const EdgeInsets.only(
+              bottom: 8.0,
+            ),
+            child: LargeLeadingTile(
+              title: Text(
+                album.name,
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+                style: context.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+              subtitle: Text(
+                '${'items_count'.t(
+                  context: context,
+                  args: {
+                    'count': album.assetCount,
+                  },
+                )} • ${album.ownerId != userId ? 'shared_by_user'.t(
+                    context: context,
+                    args: {
+                      'user': album.ownerName,
+                    },
+                  ) : 'owned'.t(context: context)}',
+                overflow: TextOverflow.ellipsis,
+                style: context.textTheme.bodyMedium?.copyWith(
+                  color: context.colorScheme.onSurfaceSecondary,
+                ),
+              ),
+              onTap: () => onAlbumSelected(album),
+              leadingPadding: const EdgeInsets.only(
+                right: 16,
+              ),
+              leading: album.thumbnailAssetId != null
+                  ? ClipRRect(
+                      borderRadius: const BorderRadius.all(
+                        Radius.circular(15),
+                      ),
+                      child: SizedBox(
+                        width: 80,
+                        height: 80,
+                        child: Thumbnail(
+                          remoteId: album.thumbnailAssetId,
+                        ),
+                      ),
+                    )
+                  : SizedBox(
+                      width: 80,
+                      height: 80,
+                      child: Container(
+                        decoration: BoxDecoration(
+                          color: context.colorScheme.surfaceContainer,
+                          borderRadius: const BorderRadius.all(Radius.circular(16)),
+                          border: Border.all(
+                            color: context.colorScheme.outline.withAlpha(50),
+                            width: 1,
+                          ),
+                        ),
+                        child: const Icon(
+                          Icons.photo_album_rounded,
+                          size: 24,
+                          color: Colors.grey,
+                        ),
+                      ),
+                    ),
+            ),
+          );
+        },
+        itemCount: albums.length,
+      ),
+    );
+  }
+}
+
+class _AlbumGrid extends StatelessWidget {
+  const _AlbumGrid({
+    required this.albums,
+    required this.userId,
+    required this.onAlbumSelected,
+  });
+
+  final List<RemoteAlbum> albums;
+  final String? userId;
+  final AlbumSelectorCallback onAlbumSelected;
+
+  @override
+  Widget build(BuildContext context) {
+    if (albums.isEmpty) {
+      return const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: Text('No albums found'),
+          ),
+        ),
+      );
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0),
+      sliver: SliverGrid(
+        gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+          maxCrossAxisExtent: 250,
+          mainAxisSpacing: 4,
+          crossAxisSpacing: 4,
+          childAspectRatio: .7,
+        ),
+        delegate: SliverChildBuilderDelegate(
+          (context, index) {
+            final album = albums[index];
+            return _GridAlbumCard(
+              album: album,
+              userId: userId,
+              onAlbumSelected: onAlbumSelected,
+            );
+          },
+          childCount: albums.length,
+        ),
+      ),
+    );
+  }
+}
+
+class _GridAlbumCard extends ConsumerWidget {
+  const _GridAlbumCard({
+    required this.album,
+    required this.userId,
+    required this.onAlbumSelected,
+  });
+
+  final RemoteAlbum album;
+  final String? userId;
+  final AlbumSelectorCallback onAlbumSelected;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return GestureDetector(
+      onTap: () => onAlbumSelected(album),
+      child: Card(
+        elevation: 0,
+        color: context.colorScheme.surfaceBright,
+        shape: RoundedRectangleBorder(
+          borderRadius: const BorderRadius.all(
+            Radius.circular(16),
+          ),
+          side: BorderSide(
+            color: context.colorScheme.onSurface.withAlpha(25),
+            width: 1,
+          ),
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Expanded(
+              flex: 2,
+              child: ClipRRect(
+                borderRadius: const BorderRadius.vertical(
+                  top: Radius.circular(15),
+                ),
+                child: SizedBox(
+                  width: double.infinity,
+                  child: album.thumbnailAssetId != null
+                      ? Thumbnail(
+                          remoteId: album.thumbnailAssetId,
+                        )
+                      : Container(
+                          color: context.colorScheme.surfaceContainerHighest,
+                          child: const Icon(
+                            Icons.photo_album_rounded,
+                            size: 40,
+                            color: Colors.grey,
+                          ),
+                        ),
+                ),
+              ),
+            ),
+            Expanded(
+              flex: 1,
+              child: Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    Text(
+                      album.name,
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                      style: context.textTheme.titleSmall?.copyWith(
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                    Text(
+                      '${'items_count'.t(
+                        context: context,
+                        args: {
+                          'count': album.assetCount,
+                        },
+                      )} • ${album.ownerId != userId ? 'shared_by_user'.t(
+                          context: context,
+                          args: {
+                            'user': album.ownerName,
+                          },
+                        ) : 'owned'.t(context: context)}',
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: context.textTheme.labelMedium?.copyWith(
+                        color: context.colorScheme.onSurfaceSecondary,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class AddToAlbumHeader extends ConsumerWidget {
+  const AddToAlbumHeader({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    Future<void> onCreateAlbum() async {
+      final newAlbum = await ref.read(remoteAlbumProvider.notifier).createAlbum(
+            title: "Untitled Album",
+            assetIds: ref.read(multiSelectProvider).selectedAssets.map((e) => (e as RemoteAsset).id).toList(),
+          );
+
+      if (newAlbum == null) {
+        ImmichToast.show(
+          context: context,
+          toastType: ToastType.error,
+          msg: 'errors.failed_to_create_album'.tr(),
+        );
+        return;
+      }
+
+      context.pushRoute(RemoteAlbumRoute(album: newAlbum));
+    }
+
+    return SliverPadding(
+      padding: const EdgeInsets.symmetric(
+        horizontal: 16,
+      ),
+      sliver: SliverToBoxAdapter(
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text(
+              "add_to_album",
+              style: context.textTheme.titleSmall,
+            ).tr(),
+            TextButton.icon(
+              style: TextButton.styleFrom(
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 8,
+                  vertical: 4,
+                ), // remove internal padding
+                minimumSize: const Size(0, 0), // allow shrinking
+                tapTargetSize: MaterialTapTargetSize.shrinkWrap, // remove extra height
+              ),
+              onPressed: onCreateAlbum,
+              icon: Icon(
+                Icons.add,
+                color: context.primaryColor,
+              ),
+              label: Text(
+                "common_create_new_album",
+                style: TextStyle(
+                  color: context.primaryColor,
+                  fontWeight: FontWeight.bold,
+                  fontSize: 14,
+                ),
+              ).tr(),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
index c148861b43..12f03a0b25 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -1,6 +1,9 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.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/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
@@ -14,9 +17,12 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_act
 import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class GeneralBottomSheet extends ConsumerWidget {
   const GeneralBottomSheet({super.key});
@@ -28,9 +34,39 @@ class GeneralBottomSheet extends ConsumerWidget {
       serverInfoProvider.select((state) => state.serverFeatures.trash),
     );
 
+    Future<void> addAssetsToAlbum(RemoteAlbum album) async {
+      final selectedAssets = multiselect.selectedAssets;
+      if (selectedAssets.isEmpty) {
+        return;
+      }
+
+      final addedCount = await ref.read(remoteAlbumProvider.notifier).addAssets(
+            album.id,
+            selectedAssets.map((e) => (e as RemoteAsset).id).toList(),
+          );
+
+      if (addedCount != selectedAssets.length) {
+        ImmichToast.show(
+          context: context,
+          msg: 'add_to_album_bottom_sheet_already_exists'.tr(
+            namedArgs: {"album": album.name},
+          ),
+        );
+      } else {
+        ImmichToast.show(
+          context: context,
+          msg: 'add_to_album_bottom_sheet_added'.tr(
+            namedArgs: {"album": album.name},
+          ),
+        );
+      }
+
+      ref.read(multiSelectProvider.notifier).reset();
+    }
+
     return BaseBottomSheet(
-      initialChildSize: 0.25,
-      maxChildSize: 0.4,
+      initialChildSize: 0.45,
+      maxChildSize: 0.85,
       shouldCloseOnMinExtent: false,
       actions: [
         const ShareActionButton(source: ActionSource.timeline),
@@ -59,6 +95,12 @@ class GeneralBottomSheet extends ConsumerWidget {
           const UploadActionButton(source: ActionSource.timeline),
         ],
       ],
+      slivers: [
+        const AddToAlbumHeader(),
+        AlbumSelector(
+          onAlbumSelected: addAssetsToAlbum,
+        ),
+      ],
     );
   }
 }
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 95aa866ea3..e4f4e83a17 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -1689,6 +1689,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  sliver_tools:
+    dependency: "direct main"
+    description:
+      name: sliver_tools
+      sha256: eae28220badfb9d0559207badcbbc9ad5331aac829a88cb0964d330d2a4636a6
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.12"
   socket_io_client:
     dependency: "direct main"
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index dcd078f65f..52b576054b 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -63,6 +63,7 @@ dependencies:
   scrollable_positioned_list: ^0.3.8
   share_handler: ^0.0.22
   share_plus: ^10.1.4
+  sliver_tools: ^0.2.12
   socket_io_client: ^2.0.3+1
   stream_transform: ^2.1.1
   thumbhash: 0.1.0+1

From b48406bd20fd2df0db31940fe5cefd19a9a84e4e Mon Sep 17 00:00:00 2001
From: Zack Pollard <zack@futo.org>
Date: Fri, 25 Jul 2025 12:57:31 +0100
Subject: [PATCH 312/337] fix: android backup album migration losing selection
 (#20220)

---
 mobile/lib/utils/migration.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/utils/migration.dart b/mobile/lib/utils/migration.dart
index 764c8351d4..7b61e5521d 100644
--- a/mobile/lib/utils/migration.dart
+++ b/mobile/lib/utils/migration.dart
@@ -218,8 +218,8 @@ Future<void> migrateBackupAlbumsToSqlite(
             );
           }
         });
+        return;
       }
-      return;
     }
 
     await drift.batch((batch) {

From 13281f853118f30c63e18b1a3741e4c69f825bba Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Fri, 25 Jul 2025 17:54:08 +0530
Subject: [PATCH 313/337] docs: more make commands and add mobile checks to
 pr-checklist (#20211)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .github/workflows/static_analysis.yml |  3 +--
 docs/docs/developer/pr-checklist.md   | 13 +++++++++++++
 mobile/makefile                       | 13 ++++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index b5238cf854..083e814bc0 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -98,8 +98,7 @@ jobs:
         run: dart analyze --fatal-infos
 
       - name: Run dart format
-        # Ignore generated files manually until https://github.com/dart-lang/dart_style/issues/864 is resolved
-        run: dart format --set-exit-if-changed $(find lib -name '*.dart' -not \( -name 'generated_plugin_registrant.dart' -o -name '*.g.dart' -o -name '*.drift.dart' \))
+        run: make format
 
       - name: Run dart custom_lint
         run: dart run custom_lint
diff --git a/docs/docs/developer/pr-checklist.md b/docs/docs/developer/pr-checklist.md
index 58581e669a..8fe3772b03 100644
--- a/docs/docs/developer/pr-checklist.md
+++ b/docs/docs/developer/pr-checklist.md
@@ -38,6 +38,19 @@ Run all server checks with `npm run check:all`
 You can use `npm run __:fix` to potentially correct some issues automatically for `npm run format` and `lint`.
 :::
 
+## Mobile Checks
+
+The following commands must be executed from within the mobile app directory of the codebase.
+
+- [ ] `make build` (auto-generate files using build_runner)
+- [ ] `make analyze` (static analysis via Dart Analyzer and DCM)
+- [ ] `make format` (formatting via Dart Formatter)
+- [ ] `make test` (unit tests)
+
+:::info Auto Fix
+You can use `dart fix --apply` and `dcm fix lib` to potentially correct some issues automatically for `make analyze`.
+:::
+
 ## OpenAPI
 
 The OpenAPI client libraries need to be regenerated whenever there are changes to the `immich-openapi-specs.json` file. Note that you should not modify this file directly as it is auto-generated. See [OpenAPI](/docs/developer/open-api.md) for more details.
diff --git a/mobile/makefile b/mobile/makefile
index fe259ca771..356649d5dd 100644
--- a/mobile/makefile
+++ b/mobile/makefile
@@ -1,4 +1,4 @@
-.PHONY: build watch create_app_icon create_splash build_release_android pigeon
+.PHONY: build watch create_app_icon create_splash build_release_android pigeon test analyze format
 
 build:
 	dart run build_runner build --delete-conflicting-outputs
@@ -29,3 +29,14 @@ translation:
 	dart run bin/generate_keys.dart
 	dart format lib/generated/codegen_loader.g.dart
 	dart format lib/generated/intl_keys.g.dart
+
+analyze:
+	dart analyze --fatal-infos
+	dcm analyze lib --fatal-style --fatal-warnings
+
+format:
+# Ignore generated files manually until https://github.com/dart-lang/dart_style/issues/864 is resolved
+	dart format --set-exit-if-changed $$(find lib -name '*.dart' -not \( -name 'generated_plugin_registrant.dart' -o -name '*.g.dart' -o -name '*.drift.dart' \))
+
+test:
+	flutter test

From edefed56aecba32eb824cd6d33f9607d79e301c7 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Fri, 25 Jul 2025 15:06:12 +0200
Subject: [PATCH 314/337] fix: optional number inputs (#20218)

---
 .../shared-components/settings/setting-input-field.spec.ts   | 2 +-
 .../shared-components/settings/setting-input-field.svelte    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/web/src/lib/components/shared-components/settings/setting-input-field.spec.ts b/web/src/lib/components/shared-components/settings/setting-input-field.spec.ts
index 80cb920074..a6b0140de4 100644
--- a/web/src/lib/components/shared-components/settings/setting-input-field.spec.ts
+++ b/web/src/lib/components/shared-components/settings/setting-input-field.spec.ts
@@ -46,6 +46,6 @@ describe('SettingInputField component', () => {
     expect(numberInput.value).toEqual('');
 
     await user.click(document.body);
-    expect(numberInput.value).toEqual('0');
+    expect(numberInput.value).toEqual('');
   });
 });
diff --git a/web/src/lib/components/shared-components/settings/setting-input-field.svelte b/web/src/lib/components/shared-components/settings/setting-input-field.svelte
index 87451667cd..bb0e2d8bef 100644
--- a/web/src/lib/components/shared-components/settings/setting-input-field.svelte
+++ b/web/src/lib/components/shared-components/settings/setting-input-field.svelte
@@ -49,6 +49,11 @@
     value = e.currentTarget.value;
 
     if (inputType === SettingInputFieldType.NUMBER) {
+      if (value === '' && !required) {
+        value = null;
+        return;
+      }
+
       let newValue = Number(value) || 0;
       if (newValue < min) {
         newValue = min;

From ed5759fe07ea2d37b7c23e2d4fa2d318e8aa3041 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 25 Jul 2025 09:56:25 -0500
Subject: [PATCH 315/337] fix: character width calculation (#20201)

---
 .../widgets/settings/beta_sync_settings/entity_count_tile.dart  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart b/mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart
index e2264cd85f..2441e7d1ca 100644
--- a/mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart
+++ b/mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart
@@ -21,7 +21,7 @@ class EntitiyCountTile extends StatelessWidget {
 
   int calculateMaxDigits(double availableWidth) {
     const double charWidth = 11.0;
-    return (availableWidth / charWidth).floor().clamp(1, 20);
+    return (availableWidth / charWidth).floor().clamp(1, 8);
   }
 
   @override

From 25e2d374902d5280e738346687201d4486109fee Mon Sep 17 00:00:00 2001
From: Daimolean <92239625+wuzihao051119@users.noreply.github.com>
Date: Fri, 25 Jul 2025 23:04:28 +0800
Subject: [PATCH 316/337] fix(server): use UserMetadataKey enum instead of
 string (#20209)

* fix(server): use UserMetadataKey enum instead of string

* fix: mobile
---
 .../repositories/sync_stream.repository.dart  | 12 +--
 mobile/openapi/README.md                      |  1 +
 mobile/openapi/lib/api.dart                   |  1 +
 mobile/openapi/lib/api_client.dart            |  2 +
 mobile/openapi/lib/api_helper.dart            |  3 +
 .../model/sync_user_metadata_delete_v1.dart   |  4 +-
 .../lib/model/sync_user_metadata_v1.dart      |  4 +-
 .../openapi/lib/model/user_metadata_key.dart  | 88 +++++++++++++++++++
 open-api/immich-openapi-specs.json            | 20 ++++-
 server/src/dtos/sync.dto.ts                   |  6 +-
 .../tables/user-metadata-audit.table.ts       |  3 +-
 11 files changed, 129 insertions(+), 15 deletions(-)
 create mode 100644 mobile/openapi/lib/model/user_metadata_key.dart

diff --git a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
index 067f840174..54bc01cfa2 100644
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -20,8 +20,8 @@ import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:logging/logging.dart';
-import 'package:openapi/api.dart' as api show AssetVisibility, AlbumUserRole;
-import 'package:openapi/api.dart' hide AssetVisibility, AlbumUserRole;
+import 'package:openapi/api.dart' as api show AssetVisibility, AlbumUserRole, UserMetadataKey;
+import 'package:openapi/api.dart' hide AssetVisibility, AlbumUserRole, UserMetadataKey;
 
 class SyncStreamRepository extends DriftDatabaseRepository {
   final Logger _logger = Logger('DriftSyncStreamRepository');
@@ -647,11 +647,11 @@ extension on api.AssetVisibility {
       };
 }
 
-extension on String {
+extension on api.UserMetadataKey {
   UserMetadataKey toUserMetadataKey() => switch (this) {
-        "onboarding" => UserMetadataKey.onboarding,
-        "preferences" => UserMetadataKey.preferences,
-        "license" => UserMetadataKey.license,
+        api.UserMetadataKey.onboarding => UserMetadataKey.onboarding,
+        api.UserMetadataKey.preferences => UserMetadataKey.preferences,
+        api.UserMetadataKey.license => UserMetadataKey.license,
         _ => throw Exception('Unknown UserMetadataKey value: $this'),
       };
 }
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 62c48bf292..3181b03a47 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -557,6 +557,7 @@ Class | Method | HTTP request | Description
  - [UserAdminUpdateDto](doc//UserAdminUpdateDto.md)
  - [UserAvatarColor](doc//UserAvatarColor.md)
  - [UserLicense](doc//UserLicense.md)
+ - [UserMetadataKey](doc//UserMetadataKey.md)
  - [UserPreferencesResponseDto](doc//UserPreferencesResponseDto.md)
  - [UserPreferencesUpdateDto](doc//UserPreferencesUpdateDto.md)
  - [UserResponseDto](doc//UserResponseDto.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index 8b8acc0042..8c1fa1a80a 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -338,6 +338,7 @@ part 'model/user_admin_response_dto.dart';
 part 'model/user_admin_update_dto.dart';
 part 'model/user_avatar_color.dart';
 part 'model/user_license.dart';
+part 'model/user_metadata_key.dart';
 part 'model/user_preferences_response_dto.dart';
 part 'model/user_preferences_update_dto.dart';
 part 'model/user_response_dto.dart';
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index d9cae66dd3..bd306cb216 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -732,6 +732,8 @@ class ApiClient {
           return UserAvatarColorTypeTransformer().decode(value);
         case 'UserLicense':
           return UserLicense.fromJson(value);
+        case 'UserMetadataKey':
+          return UserMetadataKeyTypeTransformer().decode(value);
         case 'UserPreferencesResponseDto':
           return UserPreferencesResponseDto.fromJson(value);
         case 'UserPreferencesUpdateDto':
diff --git a/mobile/openapi/lib/api_helper.dart b/mobile/openapi/lib/api_helper.dart
index 1618f4a670..098d32f4f4 100644
--- a/mobile/openapi/lib/api_helper.dart
+++ b/mobile/openapi/lib/api_helper.dart
@@ -151,6 +151,9 @@ String parameterToString(dynamic value) {
   if (value is UserAvatarColor) {
     return UserAvatarColorTypeTransformer().encode(value).toString();
   }
+  if (value is UserMetadataKey) {
+    return UserMetadataKeyTypeTransformer().encode(value).toString();
+  }
   if (value is UserStatus) {
     return UserStatusTypeTransformer().encode(value).toString();
   }
diff --git a/mobile/openapi/lib/model/sync_user_metadata_delete_v1.dart b/mobile/openapi/lib/model/sync_user_metadata_delete_v1.dart
index e9dd733295..f39acc617b 100644
--- a/mobile/openapi/lib/model/sync_user_metadata_delete_v1.dart
+++ b/mobile/openapi/lib/model/sync_user_metadata_delete_v1.dart
@@ -17,7 +17,7 @@ class SyncUserMetadataDeleteV1 {
     required this.userId,
   });
 
-  String key;
+  UserMetadataKey key;
 
   String userId;
 
@@ -51,7 +51,7 @@ class SyncUserMetadataDeleteV1 {
       final json = value.cast<String, dynamic>();
 
       return SyncUserMetadataDeleteV1(
-        key: mapValueOfType<String>(json, r'key')!,
+        key: UserMetadataKey.fromJson(json[r'key'])!,
         userId: mapValueOfType<String>(json, r'userId')!,
       );
     }
diff --git a/mobile/openapi/lib/model/sync_user_metadata_v1.dart b/mobile/openapi/lib/model/sync_user_metadata_v1.dart
index 0b060dc17c..cf39b6d960 100644
--- a/mobile/openapi/lib/model/sync_user_metadata_v1.dart
+++ b/mobile/openapi/lib/model/sync_user_metadata_v1.dart
@@ -18,7 +18,7 @@ class SyncUserMetadataV1 {
     required this.value,
   });
 
-  String key;
+  UserMetadataKey key;
 
   String userId;
 
@@ -57,7 +57,7 @@ class SyncUserMetadataV1 {
       final json = value.cast<String, dynamic>();
 
       return SyncUserMetadataV1(
-        key: mapValueOfType<String>(json, r'key')!,
+        key: UserMetadataKey.fromJson(json[r'key'])!,
         userId: mapValueOfType<String>(json, r'userId')!,
         value: mapValueOfType<Object>(json, r'value')!,
       );
diff --git a/mobile/openapi/lib/model/user_metadata_key.dart b/mobile/openapi/lib/model/user_metadata_key.dart
new file mode 100644
index 0000000000..845b5ae9bb
--- /dev/null
+++ b/mobile/openapi/lib/model/user_metadata_key.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 UserMetadataKey {
+  /// Instantiate a new enum with the provided [value].
+  const UserMetadataKey._(this.value);
+
+  /// The underlying value of this enum member.
+  final String value;
+
+  @override
+  String toString() => value;
+
+  String toJson() => value;
+
+  static const preferences = UserMetadataKey._(r'preferences');
+  static const license = UserMetadataKey._(r'license');
+  static const onboarding = UserMetadataKey._(r'onboarding');
+
+  /// List of all possible values in this [enum][UserMetadataKey].
+  static const values = <UserMetadataKey>[
+    preferences,
+    license,
+    onboarding,
+  ];
+
+  static UserMetadataKey? fromJson(dynamic value) => UserMetadataKeyTypeTransformer().decode(value);
+
+  static List<UserMetadataKey> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <UserMetadataKey>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = UserMetadataKey.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+}
+
+/// Transformation class that can [encode] an instance of [UserMetadataKey] to String,
+/// and [decode] dynamic data back to [UserMetadataKey].
+class UserMetadataKeyTypeTransformer {
+  factory UserMetadataKeyTypeTransformer() => _instance ??= const UserMetadataKeyTypeTransformer._();
+
+  const UserMetadataKeyTypeTransformer._();
+
+  String encode(UserMetadataKey data) => data.value;
+
+  /// Decodes a [dynamic value][data] to a UserMetadataKey.
+  ///
+  /// 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.
+  UserMetadataKey? decode(dynamic data, {bool allowNull = true}) {
+    if (data != null) {
+      switch (data) {
+        case r'preferences': return UserMetadataKey.preferences;
+        case r'license': return UserMetadataKey.license;
+        case r'onboarding': return UserMetadataKey.onboarding;
+        default:
+          if (!allowNull) {
+            throw ArgumentError('Unknown enum value to decode: $data');
+          }
+      }
+    }
+    return null;
+  }
+
+  /// Singleton [UserMetadataKeyTypeTransformer] instance.
+  static UserMetadataKeyTypeTransformer? _instance;
+}
+
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 53a91a4014..35f84ec25a 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -14403,7 +14403,11 @@
       "SyncUserMetadataDeleteV1": {
         "properties": {
           "key": {
-            "type": "string"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/UserMetadataKey"
+              }
+            ]
           },
           "userId": {
             "type": "string"
@@ -14418,7 +14422,11 @@
       "SyncUserMetadataV1": {
         "properties": {
           "key": {
-            "type": "string"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/UserMetadataKey"
+              }
+            ]
           },
           "userId": {
             "type": "string"
@@ -16132,6 +16140,14 @@
         ],
         "type": "object"
       },
+      "UserMetadataKey": {
+        "enum": [
+          "preferences",
+          "license",
+          "onboarding"
+        ],
+        "type": "string"
+      },
       "UserPreferencesResponseDto": {
         "properties": {
           "albums": {
diff --git a/server/src/dtos/sync.dto.ts b/server/src/dtos/sync.dto.ts
index 8614bd5776..92aea8f5e9 100644
--- a/server/src/dtos/sync.dto.ts
+++ b/server/src/dtos/sync.dto.ts
@@ -301,14 +301,16 @@ export class SyncAssetFaceDeleteV1 {
 @ExtraModel()
 export class SyncUserMetadataV1 {
   userId!: string;
-  key!: string;
+  @ValidateEnum({ enum: UserMetadataKey, name: 'UserMetadataKey' })
+  key!: UserMetadataKey;
   value!: UserMetadata[UserMetadataKey];
 }
 
 @ExtraModel()
 export class SyncUserMetadataDeleteV1 {
   userId!: string;
-  key!: string;
+  @ValidateEnum({ enum: UserMetadataKey, name: 'UserMetadataKey' })
+  key!: UserMetadataKey;
 }
 
 @ExtraModel()
diff --git a/server/src/schema/tables/user-metadata-audit.table.ts b/server/src/schema/tables/user-metadata-audit.table.ts
index de7d21c874..63f503ab85 100644
--- a/server/src/schema/tables/user-metadata-audit.table.ts
+++ b/server/src/schema/tables/user-metadata-audit.table.ts
@@ -1,4 +1,5 @@
 import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
+import { UserMetadataKey } from 'src/enum';
 import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
 
 @Table('user_metadata_audit')
@@ -10,7 +11,7 @@ export class UserMetadataAuditTable {
   userId!: string;
 
   @Column({ indexName: 'IDX_user_metadata_audit_key' })
-  key!: string;
+  key!: UserMetadataKey;
 
   @CreateDateColumn({ default: () => 'clock_timestamp()', indexName: 'IDX_user_metadata_audit_deleted_at' })
   deletedAt!: Generated<Timestamp>;

From e5ee1c8db6eba18bcfd9f6febefc4d6c5e09f6b9 Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <jeremyfleischman@gmail.com>
Date: Fri, 25 Jul 2025 08:05:40 -0700
Subject: [PATCH 317/337] chore: add missing 'make pigeon' instruction 
 (#20202)

* chore: fix typo 'make_build' -> 'make build'

* chore: add missing 'make pigeon' instruction

Turns out I was getting bit by forgetting to run `make pigeon`, which
also generates files. Perhaps it would be better to make it part of
`make build`?

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .github/workflows/static_analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index 083e814bc0..573c908526 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -90,7 +90,7 @@ jobs:
         env:
           CHANGED_FILES: ${{ steps.verify-changed-files.outputs.changed_files }}
         run: |
-          echo "ERROR: Generated files not up to date! Run make_build inside the mobile directory"
+          echo "ERROR: Generated files not up to date! Run 'make build' and 'make pigeon' inside the mobile directory"
           echo "Changed files: ${CHANGED_FILES}"
           exit 1
 

From 03a13828e1f4634c040b330649ba8d9100fb6c61 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 25 Jul 2025 10:09:32 -0500
Subject: [PATCH 318/337] chore: refactor upload service (#20130)

* chore: refactor upload service

* fix: cancel upload queue on logout (#20131)

* fix: cancel upload on logout

* fix: test

---------

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

---------

Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/main.dart                          |   2 +-
 .../lib/pages/backup/drift_backup.page.dart   |   2 +-
 .../drift_backup_album_selection.page.dart    |   2 +-
 .../share_intent_upload.provider.dart         |   4 +-
 mobile/lib/providers/auth.provider.dart       |   5 +
 .../backup/drift_backup.provider.dart         |  38 +-
 .../infrastructure/action.provider.dart       |   8 +-
 .../lib/repositories/upload.repository.dart   |  49 ++-
 mobile/lib/services/auth.service.dart         |  11 +-
 mobile/lib/services/drift_backup.service.dart | 316 ---------------
 mobile/lib/services/upload.service.dart       | 368 +++++++++++++++---
 mobile/test/domain/service.mock.dart          |   6 +
 mobile/test/services/auth.service_test.dart   |  22 +-
 13 files changed, 438 insertions(+), 395 deletions(-)
 delete mode 100644 mobile/lib/services/drift_backup.service.dart

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 5f0c5d42db..e52f298413 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -97,7 +97,7 @@ Future<void> initApp() async {
 
   await FileDownloader().configure(
     // maxConcurrent: 6, maxConcurrentByHost(server):6, maxConcurrentByGroup: 3
-    globalConfig: (Config.holdingQueue, (6, 6, 3)),
+    globalConfig: (Config.holdingQueue, (1000, 1000, 1000)),
   );
 
   await FileDownloader().trackTasksInGroup(
diff --git a/mobile/lib/pages/backup/drift_backup.page.dart b/mobile/lib/pages/backup/drift_backup.page.dart
index 0ebb68883f..f691eb576b 100644
--- a/mobile/lib/pages/backup/drift_backup.page.dart
+++ b/mobile/lib/pages/backup/drift_backup.page.dart
@@ -40,7 +40,7 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
     }
 
     await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-    await ref.read(driftBackupProvider.notifier).backup(currentUser.id);
+    await ref.read(driftBackupProvider.notifier).startBackup(currentUser.id);
   }
 
   Future<void> stopBackup() async {
diff --git a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
index 8182798636..047bd26a9e 100644
--- a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
+++ b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
@@ -101,7 +101,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
             final backupNotifier = ref.read(driftBackupProvider.notifier);
 
             backupNotifier.cancel().then((_) {
-              backupNotifier.backup(currentUser.id);
+              backupNotifier.startBackup(currentUser.id);
             });
           }
         }
diff --git a/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart b/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
index 2a5a6fe09c..16171146a1 100644
--- a/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
+++ b/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
@@ -27,8 +27,8 @@ class ShareIntentUploadStateNotifier extends StateNotifier<List<ShareIntentAttac
     this._uploadService,
     this._shareIntentService,
   ) : super([]) {
-    _uploadService.onUploadStatus = _updateUploadStatus;
-    _uploadService.onTaskProgress = _taskProgressCallback;
+    _uploadService.taskStatusStream.listen(_updateUploadStatus);
+    _uploadService.taskProgressStream.listen(_taskProgressCallback);
   }
 
   void init() {
diff --git a/mobile/lib/providers/auth.provider.dart b/mobile/lib/providers/auth.provider.dart
index 4c43cb37e8..b918eeb215 100644
--- a/mobile/lib/providers/auth.provider.dart
+++ b/mobile/lib/providers/auth.provider.dart
@@ -13,6 +13,7 @@ import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
 import 'package:immich_mobile/services/secure_storage.service.dart';
+import 'package:immich_mobile/services/upload.service.dart';
 import 'package:immich_mobile/services/widget.service.dart';
 import 'package:immich_mobile/utils/hash.dart';
 import 'package:logging/logging.dart';
@@ -23,6 +24,7 @@ final authProvider = StateNotifierProvider<AuthNotifier, AuthState>((ref) {
     ref.watch(authServiceProvider),
     ref.watch(apiServiceProvider),
     ref.watch(userServiceProvider),
+    ref.watch(uploadServiceProvider),
     ref.watch(secureStorageServiceProvider),
     ref.watch(widgetServiceProvider),
   );
@@ -32,6 +34,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
   final AuthService _authService;
   final ApiService _apiService;
   final UserService _userService;
+  final UploadService _uploadService;
   final SecureStorageService _secureStorageService;
   final WidgetService _widgetService;
   final _log = Logger("AuthenticationNotifier");
@@ -42,6 +45,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
     this._authService,
     this._apiService,
     this._userService,
+    this._uploadService,
     this._secureStorageService,
     this._widgetService,
   ) : super(
@@ -83,6 +87,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
       await _widgetService.clearCredentials();
 
       await _authService.logout();
+      await _uploadService.cancelBackup();
     } finally {
       await _cleanUp();
     }
diff --git a/mobile/lib/providers/backup/drift_backup.provider.dart b/mobile/lib/providers/backup/drift_backup.provider.dart
index 42a4ae95f3..d352869651 100644
--- a/mobile/lib/providers/backup/drift_backup.provider.dart
+++ b/mobile/lib/providers/backup/drift_backup.provider.dart
@@ -8,7 +8,6 @@ import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/services/drift_backup.service.dart';
 import 'package:immich_mobile/services/upload.service.dart';
 
 class EnqueueStatus {
@@ -199,14 +198,12 @@ class DriftBackupState {
 
 final driftBackupProvider = StateNotifierProvider<ExpBackupNotifier, DriftBackupState>((ref) {
   return ExpBackupNotifier(
-    ref.watch(driftBackupServiceProvider),
     ref.watch(uploadServiceProvider),
   );
 });
 
 class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
   ExpBackupNotifier(
-    this._backupService,
     this._uploadService,
   ) : super(
           const DriftBackupState(
@@ -225,7 +222,6 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
     }
   }
 
-  final DriftBackupService _backupService;
   final UploadService _uploadService;
   StreamSubscription<TaskStatusUpdate>? _statusSubscription;
   StreamSubscription<TaskProgressUpdate>? _progressSubscription;
@@ -328,9 +324,9 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
 
   Future<void> getBackupStatus(String userId) async {
     final [totalCount, backupCount, remainderCount] = await Future.wait([
-      _backupService.getTotalCount(),
-      _backupService.getBackupCount(userId),
-      _backupService.getRemainderCount(userId),
+      _uploadService.getBackupTotalCount(),
+      _uploadService.getBackupFinishedCount(userId),
+      _uploadService.getBackupRemainderCount(userId),
     ]);
 
     state = state.copyWith(
@@ -340,8 +336,8 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
     );
   }
 
-  Future<void> backup(String userId) {
-    return _backupService.backup(userId, _updateEnqueueCount);
+  Future<void> startBackup(String userId) {
+    return _uploadService.startBackup(userId, _updateEnqueueCount);
   }
 
   void _updateEnqueueCount(EnqueueStatus status) {
@@ -352,22 +348,22 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
   }
 
   Future<void> cancel() async {
+    debugPrint("Canceling backup tasks...");
     state = state.copyWith(
       enqueueCount: 0,
       enqueueTotalCount: 0,
       isCanceling: true,
     );
 
-    await _backupService.cancel();
+    final activeTaskCount = await _uploadService.cancelBackup();
 
-    // Check if there are any tasks left in the queue
-    final tasks = await FileDownloader().allTasks(group: kBackupGroup);
-
-    debugPrint("Tasks left to cancel: ${tasks.length}");
-
-    if (tasks.isNotEmpty) {
+    if (activeTaskCount > 0) {
+      debugPrint(
+        "$activeTaskCount tasks left, continuing to cancel...",
+      );
       await cancel();
     } else {
+      debugPrint("All tasks canceled successfully.");
       // Clear all upload items when cancellation is complete
       state = state.copyWith(
         isCanceling: false,
@@ -377,14 +373,18 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
   }
 
   Future<void> handleBackupResume(String userId) async {
-    final tasks = await FileDownloader().allTasks(group: kBackupGroup);
+    debugPrint("handleBackupResume");
+    final tasks = await _uploadService.getActiveTasks(kBackupGroup);
+    debugPrint("Found ${tasks.length} tasks");
+
     if (tasks.isEmpty) {
       // Start a new backup queue
-      await backup(userId);
+      debugPrint("Start a new backup queue");
+      await startBackup(userId);
     }
 
     debugPrint("Tasks to resume: ${tasks.length}");
-    await FileDownloader().start();
+    await _uploadService.resumeBackup();
   }
 
   @override
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 96c0c5eb18..899bd7858b 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -5,8 +5,8 @@ import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asse
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/action.service.dart';
-import 'package:immich_mobile/services/drift_backup.service.dart';
 import 'package:immich_mobile/services/timeline.service.dart';
+import 'package:immich_mobile/services/upload.service.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
@@ -32,14 +32,14 @@ class ActionResult {
 class ActionNotifier extends Notifier<void> {
   final Logger _logger = Logger('ActionNotifier');
   late ActionService _service;
-  late DriftBackupService _backupService;
+  late UploadService _uploadService;
 
   ActionNotifier() : super();
 
   @override
   void build() {
+    _uploadService = ref.watch(uploadServiceProvider);
     _service = ref.watch(actionServiceProvider);
-    _backupService = ref.watch(driftBackupServiceProvider);
   }
 
   List<String> _getRemoteIdsForSource(ActionSource source) {
@@ -366,7 +366,7 @@ class ActionNotifier extends Notifier<void> {
   Future<ActionResult> upload(ActionSource source) async {
     final assets = _getAssets(source).whereType<LocalAsset>().toList();
     try {
-      await _backupService.manualBackup(assets);
+      await _uploadService.manualBackup(assets);
       return ActionResult(count: assets.length, success: true);
     } catch (error, stack) {
       _logger.severe('Failed manually upload assets', error, stack);
diff --git a/mobile/lib/repositories/upload.repository.dart b/mobile/lib/repositories/upload.repository.dart
index 6d75313a24..ec093c5297 100644
--- a/mobile/lib/repositories/upload.repository.dart
+++ b/mobile/lib/repositories/upload.repository.dart
@@ -1,4 +1,5 @@
 import 'package:background_downloader/background_downloader.dart';
+import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 
@@ -6,7 +7,6 @@ final uploadRepositoryProvider = Provider((ref) => UploadRepository());
 
 class UploadRepository {
   void Function(TaskStatusUpdate)? onUploadStatus;
-
   void Function(TaskProgressUpdate)? onTaskProgress;
 
   UploadRepository() {
@@ -27,11 +27,11 @@ class UploadRepository {
     );
   }
 
-  void enqueueAll(List<UploadTask> tasks) {
+  void enqueueBackgroundAll(List<UploadTask> tasks) {
     FileDownloader().enqueueAll(tasks);
   }
 
-  Future<void> deleteAllTrackingRecords(String group) {
+  Future<void> deleteDatabaseRecords(String group) {
     return FileDownloader().database.deleteAllRecords(group: group);
   }
 
@@ -42,4 +42,47 @@ class UploadRepository {
   Future<int> reset(String group) {
     return FileDownloader().reset(group: group);
   }
+
+  /// Get a list of tasks that are ENQUEUED or RUNNING
+  Future<List<Task>> getActiveTasks(String group) {
+    return FileDownloader().allTasks(group: group);
+  }
+
+  Future<void> start() {
+    return FileDownloader().start();
+  }
+
+  Future<void> getUploadInfo() async {
+    final [enqueuedTasks, runningTasks, canceledTasks, waitingTasks, pausedTasks] = await Future.wait([
+      FileDownloader().database.allRecordsWithStatus(
+            TaskStatus.enqueued,
+            group: kBackupGroup,
+          ),
+      FileDownloader().database.allRecordsWithStatus(
+            TaskStatus.running,
+            group: kBackupGroup,
+          ),
+      FileDownloader().database.allRecordsWithStatus(
+            TaskStatus.canceled,
+            group: kBackupGroup,
+          ),
+      FileDownloader().database.allRecordsWithStatus(
+            TaskStatus.waitingToRetry,
+            group: kBackupGroup,
+          ),
+      FileDownloader().database.allRecordsWithStatus(
+            TaskStatus.paused,
+            group: kBackupGroup,
+          ),
+    ]);
+
+    debugPrint("""
+      Upload Info:
+      Enqueued: ${enqueuedTasks.length}
+      Running: ${runningTasks.length}
+      Canceled: ${canceledTasks.length}
+      Waiting: ${waitingTasks.length}
+      Paused: ${pausedTasks.length}
+    """);
+  }
 }
diff --git a/mobile/lib/services/auth.service.dart b/mobile/lib/services/auth.service.dart
index 0eec253ee1..e8c4c5e97e 100644
--- a/mobile/lib/services/auth.service.dart
+++ b/mobile/lib/services/auth.service.dart
@@ -8,10 +8,12 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/repositories/auth.repository.dart';
 import 'package:immich_mobile/repositories/auth_api.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/network.service.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
@@ -23,6 +25,7 @@ final authServiceProvider = Provider(
     ref.watch(apiServiceProvider),
     ref.watch(networkServiceProvider),
     ref.watch(backgroundSyncProvider),
+    ref.watch(appSettingsServiceProvider),
   ),
 );
 
@@ -32,7 +35,7 @@ class AuthService {
   final ApiService _apiService;
   final NetworkService _networkService;
   final BackgroundSyncManager _backgroundSyncManager;
-
+  final AppSettingsService _appSettingsService;
   final _log = Logger("AuthService");
 
   AuthService(
@@ -41,6 +44,7 @@ class AuthService {
     this._apiService,
     this._networkService,
     this._backgroundSyncManager,
+    this._appSettingsService,
   );
 
   /// Validates the provided server URL by resolving and setting the endpoint.
@@ -106,6 +110,11 @@ class AuthService {
       await clearLocalData().catchError((error, stackTrace) {
         _log.severe("Error clearing local data", error, stackTrace);
       });
+
+      await _appSettingsService.setSetting(
+        AppSettingsEnum.enableBackup,
+        false,
+      );
     }
   }
 
diff --git a/mobile/lib/services/drift_backup.service.dart b/mobile/lib/services/drift_backup.service.dart
deleted file mode 100644
index 5aba1794f6..0000000000
--- a/mobile/lib/services/drift_backup.service.dart
+++ /dev/null
@@ -1,316 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:background_downloader/background_downloader.dart';
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/backup.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/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
-import 'package:immich_mobile/services/upload.service.dart';
-import 'package:logging/logging.dart';
-import 'package:path/path.dart' as p;
-import 'package:riverpod_annotation/riverpod_annotation.dart';
-
-final driftBackupServiceProvider = Provider<DriftBackupService>(
-  (ref) => DriftBackupService(
-    ref.watch(backupRepositoryProvider),
-    ref.watch(storageRepositoryProvider),
-    ref.watch(uploadServiceProvider),
-    ref.watch(localAssetRepository),
-  ),
-);
-
-// TODO: Rename to UploadService after removing Isar
-class DriftBackupService {
-  DriftBackupService(
-    this._backupRepository,
-    this._storageRepository,
-    this._uploadService,
-    this._localAssetRepository,
-  ) {
-    _uploadService.taskStatusStream.listen(_handleTaskStatusUpdate);
-  }
-
-  final DriftBackupRepository _backupRepository;
-  final StorageRepository _storageRepository;
-  final DriftLocalAssetRepository _localAssetRepository;
-  final UploadService _uploadService;
-  final _log = Logger("DriftBackupService");
-
-  bool shouldCancel = false;
-
-  Future<int> getTotalCount() {
-    return _backupRepository.getTotalCount();
-  }
-
-  Future<int> getRemainderCount(String userId) {
-    return _backupRepository.getRemainderCount(userId);
-  }
-
-  Future<int> getBackupCount(String userId) {
-    return _backupRepository.getBackupCount(userId);
-  }
-
-  Future<void> manualBackup(List<LocalAsset> localAssets) async {
-    List<UploadTask> tasks = [];
-    for (final asset in localAssets) {
-      final task = await _getUploadTask(
-        asset,
-        group: kManualUploadGroup,
-        priority: 1, // High priority after upload motion photo part
-      );
-      if (task != null) {
-        tasks.add(task);
-      }
-    }
-
-    if (tasks.isNotEmpty) {
-      _uploadService.enqueueTasks(tasks);
-    }
-  }
-
-  Future<void> backup(
-    String userId,
-    void Function(EnqueueStatus status) onEnqueueTasks,
-  ) async {
-    shouldCancel = false;
-
-    final candidates = await _backupRepository.getCandidates(userId);
-    if (candidates.isEmpty) {
-      return;
-    }
-
-    const batchSize = 100;
-    int count = 0;
-    for (int i = 0; i < candidates.length; i += batchSize) {
-      if (shouldCancel) {
-        break;
-      }
-
-      final batch = candidates.skip(i).take(batchSize).toList();
-
-      List<UploadTask> tasks = [];
-      for (final asset in batch) {
-        final task = await _getUploadTask(asset);
-        if (task != null) {
-          tasks.add(task);
-        }
-      }
-
-      if (tasks.isNotEmpty && !shouldCancel) {
-        count += tasks.length;
-        _uploadService.enqueueTasks(tasks);
-
-        onEnqueueTasks(
-          EnqueueStatus(
-            enqueueCount: count,
-            totalCount: candidates.length,
-          ),
-        );
-      }
-    }
-  }
-
-  void _handleTaskStatusUpdate(TaskStatusUpdate update) {
-    switch (update.status) {
-      case TaskStatus.complete:
-        _handleLivePhoto(update);
-        break;
-
-      default:
-        break;
-    }
-  }
-
-  Future<void> _handleLivePhoto(TaskStatusUpdate update) async {
-    try {
-      if (update.task.metaData.isEmpty || update.task.metaData == '') {
-        return;
-      }
-
-      final metadata = UploadTaskMetadata.fromJson(update.task.metaData);
-      if (!metadata.isLivePhotos) {
-        return;
-      }
-
-      if (update.responseBody == null || update.responseBody!.isEmpty) {
-        return;
-      }
-      final response = jsonDecode(update.responseBody!);
-
-      final localAsset = await _localAssetRepository.getById(metadata.localAssetId);
-      if (localAsset == null) {
-        return;
-      }
-
-      final uploadTask = await _getLivePhotoUploadTask(
-        localAsset,
-        response['id'] as String,
-      );
-
-      if (uploadTask == null) {
-        return;
-      }
-
-      _uploadService.enqueueTasks([uploadTask]);
-    } catch (error, stackTrace) {
-      _log.severe("Error handling live photo upload task", error, stackTrace);
-      debugPrint("Error handling live photo upload task: $error $stackTrace");
-    }
-  }
-
-  Future<UploadTask?> _getUploadTask(
-    LocalAsset asset, {
-    String group = kBackupGroup,
-    int? priority,
-  }) async {
-    final entity = await _storageRepository.getAssetEntityForAsset(asset);
-    if (entity == null) {
-      return null;
-    }
-
-    File? file;
-
-    /// iOS LivePhoto has two files: a photo and a video.
-    /// They are uploaded separately, with video file being upload first, then returned with the assetId
-    /// The assetId is then used as a metadata for the photo file upload task.
-    ///
-    /// We implement two separate upload groups for this, the normal one for the video file
-    /// and the higher priority group for the photo file because the video file is already uploaded.
-    ///
-    /// The cancel operation will only cancel the video group (normal group), the photo group will not
-    /// be touched, as the video file is already uploaded.
-
-    if (entity.isLivePhoto) {
-      file = await _storageRepository.getMotionFileForAsset(asset);
-    } else {
-      file = await _storageRepository.getFileForAsset(asset.id);
-    }
-
-    if (file == null) {
-      return null;
-    }
-
-    final originalFileName = entity.isLivePhoto
-        ? p.setExtension(
-            asset.name,
-            p.extension(file.path),
-          )
-        : asset.name;
-
-    String metadata = UploadTaskMetadata(
-      localAssetId: asset.id,
-      isLivePhotos: entity.isLivePhoto,
-      livePhotoVideoId: '',
-    ).toJson();
-
-    return _uploadService.buildUploadTask(
-      file,
-      originalFileName: originalFileName,
-      deviceAssetId: asset.id,
-      metadata: metadata,
-      group: group,
-      priority: priority,
-    );
-  }
-
-  Future<UploadTask?> _getLivePhotoUploadTask(
-    LocalAsset asset,
-    String livePhotoVideoId,
-  ) async {
-    final entity = await _storageRepository.getAssetEntityForAsset(asset);
-    if (entity == null) {
-      return null;
-    }
-
-    final file = await _storageRepository.getFileForAsset(asset.id);
-    if (file == null) {
-      return null;
-    }
-
-    final fields = {
-      'livePhotoVideoId': livePhotoVideoId,
-    };
-
-    return _uploadService.buildUploadTask(
-      file,
-      originalFileName: asset.name,
-      deviceAssetId: asset.id,
-      fields: fields,
-      group: kBackupLivePhotoGroup,
-      priority: 0, // Highest priority to get upload immediately
-    );
-  }
-
-  Future<void> cancel() async {
-    shouldCancel = true;
-    await _uploadService.cancelAllForGroup(kBackupGroup);
-  }
-}
-
-class UploadTaskMetadata {
-  final String localAssetId;
-  final bool isLivePhotos;
-  final String livePhotoVideoId;
-
-  const UploadTaskMetadata({
-    required this.localAssetId,
-    required this.isLivePhotos,
-    required this.livePhotoVideoId,
-  });
-
-  UploadTaskMetadata copyWith({
-    String? localAssetId,
-    bool? isLivePhotos,
-    String? livePhotoVideoId,
-  }) {
-    return UploadTaskMetadata(
-      localAssetId: localAssetId ?? this.localAssetId,
-      isLivePhotos: isLivePhotos ?? this.isLivePhotos,
-      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'localAssetId': localAssetId,
-      'isLivePhotos': isLivePhotos,
-      'livePhotoVideoId': livePhotoVideoId,
-    };
-  }
-
-  factory UploadTaskMetadata.fromMap(Map<String, dynamic> map) {
-    return UploadTaskMetadata(
-      localAssetId: map['localAssetId'] as String,
-      isLivePhotos: map['isLivePhotos'] as bool,
-      livePhotoVideoId: map['livePhotoVideoId'] as String,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory UploadTaskMetadata.fromJson(String source) =>
-      UploadTaskMetadata.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() =>
-      'UploadTaskMetadata(localAssetId: $localAssetId, isLivePhotos: $isLivePhotos, livePhotoVideoId: $livePhotoVideoId)';
-
-  @override
-  bool operator ==(covariant UploadTaskMetadata other) {
-    if (identical(this, other)) return true;
-
-    return other.localAssetId == localAssetId &&
-        other.isLivePhotos == isLivePhotos &&
-        other.livePhotoVideoId == livePhotoVideoId;
-  }
-
-  @override
-  int get hashCode => localAssetId.hashCode ^ isLivePhotos.hashCode ^ livePhotoVideoId.hashCode;
-}
diff --git a/mobile/lib/services/upload.service.dart b/mobile/lib/services/upload.service.dart
index 398a402586..e8acf791a2 100644
--- a/mobile/lib/services/upload.service.dart
+++ b/mobile/lib/services/upload.service.dart
@@ -1,24 +1,51 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:background_downloader/background_downloader.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/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/infrastructure/repositories/backup.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/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:path/path.dart';
+import 'package:path/path.dart' as p;
 
 final uploadServiceProvider = Provider((ref) {
-  final service = UploadService(ref.watch(uploadRepositoryProvider));
+  final service = UploadService(
+    ref.watch(uploadRepositoryProvider),
+    ref.watch(backupRepositoryProvider),
+    ref.watch(storageRepositoryProvider),
+    ref.watch(localAssetRepository),
+  );
+
   ref.onDispose(service.dispose);
   return service;
 });
 
 class UploadService {
+  UploadService(
+    this._uploadRepository,
+    this._backupRepository,
+    this._storageRepository,
+    this._localAssetRepository,
+  ) {
+    _uploadRepository.onUploadStatus = _onUploadCallback;
+    _uploadRepository.onTaskProgress = _onTaskProgressCallback;
+  }
+
   final UploadRepository _uploadRepository;
-  void Function(TaskStatusUpdate)? onUploadStatus;
-  void Function(TaskProgressUpdate)? onTaskProgress;
+  final DriftBackupRepository _backupRepository;
+  final StorageRepository _storageRepository;
+  final DriftLocalAssetRepository _localAssetRepository;
 
   final StreamController<TaskStatusUpdate> _taskStatusController = StreamController<TaskStatusUpdate>.broadcast();
   final StreamController<TaskProgressUpdate> _taskProgressController = StreamController<TaskProgressUpdate>.broadcast();
@@ -26,25 +53,19 @@ class UploadService {
   Stream<TaskStatusUpdate> get taskStatusStream => _taskStatusController.stream;
   Stream<TaskProgressUpdate> get taskProgressStream => _taskProgressController.stream;
 
-  UploadService(
-    this._uploadRepository,
-  ) {
-    _uploadRepository.onUploadStatus = _onUploadCallback;
-    _uploadRepository.onTaskProgress = _onTaskProgressCallback;
-  }
+  bool shouldAbortQueuingTasks = false;
 
   void _onTaskProgressCallback(TaskProgressUpdate update) {
-    onTaskProgress?.call(update);
     if (!_taskProgressController.isClosed) {
       _taskProgressController.add(update);
     }
   }
 
   void _onUploadCallback(TaskStatusUpdate update) {
-    onUploadStatus?.call(update);
     if (!_taskStatusController.isClosed) {
       _taskStatusController.add(update);
     }
+    _handleTaskStatusUpdate(update);
   }
 
   void dispose() {
@@ -52,18 +73,234 @@ class UploadService {
     _taskProgressController.close();
   }
 
-  Future<bool> cancelUpload(String id) {
-    return FileDownloader().cancelTaskWithId(id);
-  }
-
-  Future<void> cancelAllForGroup(String group) async {
-    await _uploadRepository.cancelAll(group);
-    await _uploadRepository.reset(group);
-    await _uploadRepository.deleteAllTrackingRecords(group);
-  }
-
   void enqueueTasks(List<UploadTask> tasks) {
-    _uploadRepository.enqueueAll(tasks);
+    _uploadRepository.enqueueBackgroundAll(tasks);
+  }
+
+  Future<List<Task>> getActiveTasks(String group) {
+    return _uploadRepository.getActiveTasks(group);
+  }
+
+  Future<int> getBackupTotalCount() {
+    return _backupRepository.getTotalCount();
+  }
+
+  Future<int> getBackupRemainderCount(String userId) {
+    return _backupRepository.getRemainderCount(userId);
+  }
+
+  Future<int> getBackupFinishedCount(String userId) {
+    return _backupRepository.getBackupCount(userId);
+  }
+
+  Future<void> manualBackup(List<LocalAsset> localAssets) async {
+    List<UploadTask> tasks = [];
+    for (final asset in localAssets) {
+      final task = await _getUploadTask(
+        asset,
+        group: kManualUploadGroup,
+        priority: 1, // High priority after upload motion photo part
+      );
+      if (task != null) {
+        tasks.add(task);
+      }
+    }
+
+    if (tasks.isNotEmpty) {
+      enqueueTasks(tasks);
+    }
+  }
+
+  /// Find backup candidates
+  /// Build the upload tasks
+  /// Enqueue the tasks
+  Future<void> startBackup(
+    String userId,
+    void Function(EnqueueStatus status) onEnqueueTasks,
+  ) async {
+    shouldAbortQueuingTasks = false;
+
+    final candidates = await _backupRepository.getCandidates(userId);
+    if (candidates.isEmpty) {
+      return;
+    }
+
+    const batchSize = 100;
+    int count = 0;
+    for (int i = 0; i < candidates.length; i += batchSize) {
+      if (shouldAbortQueuingTasks) {
+        break;
+      }
+
+      final batch = candidates.skip(i).take(batchSize).toList();
+
+      List<UploadTask> tasks = [];
+      for (final asset in batch) {
+        final task = await _getUploadTask(asset);
+        if (task != null) {
+          tasks.add(task);
+        }
+      }
+
+      if (tasks.isNotEmpty && !shouldAbortQueuingTasks) {
+        count += tasks.length;
+        enqueueTasks(tasks);
+
+        onEnqueueTasks(
+          EnqueueStatus(
+            enqueueCount: count,
+            totalCount: candidates.length,
+          ),
+        );
+      }
+    }
+  }
+
+  /// Cancel all ongoing uploads and reset the upload queue
+  ///
+  /// Return the number of left over tasks in the queue
+  Future<int> cancelBackup() async {
+    shouldAbortQueuingTasks = true;
+
+    await _uploadRepository.reset(kBackupGroup);
+    await _uploadRepository.deleteDatabaseRecords(kBackupGroup);
+
+    final activeTasks = await _uploadRepository.getActiveTasks(kBackupGroup);
+    return activeTasks.length;
+  }
+
+  Future<void> resumeBackup() {
+    return _uploadRepository.start();
+  }
+
+  void _handleTaskStatusUpdate(TaskStatusUpdate update) {
+    switch (update.status) {
+      case TaskStatus.complete:
+        _handleLivePhoto(update);
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  Future<void> _handleLivePhoto(TaskStatusUpdate update) async {
+    try {
+      if (update.task.metaData.isEmpty || update.task.metaData == '') {
+        return;
+      }
+
+      final metadata = UploadTaskMetadata.fromJson(update.task.metaData);
+      if (!metadata.isLivePhotos) {
+        return;
+      }
+
+      if (update.responseBody == null || update.responseBody!.isEmpty) {
+        return;
+      }
+      final response = jsonDecode(update.responseBody!);
+
+      final localAsset = await _localAssetRepository.getById(metadata.localAssetId);
+      if (localAsset == null) {
+        return;
+      }
+
+      final uploadTask = await _getLivePhotoUploadTask(
+        localAsset,
+        response['id'] as String,
+      );
+
+      if (uploadTask == null) {
+        return;
+      }
+
+      enqueueTasks([uploadTask]);
+    } catch (error, stackTrace) {
+      debugPrint("Error handling live photo upload task: $error $stackTrace");
+    }
+  }
+
+  Future<UploadTask?> _getUploadTask(
+    LocalAsset asset, {
+    String group = kBackupGroup,
+    int? priority,
+  }) async {
+    final entity = await _storageRepository.getAssetEntityForAsset(asset);
+    if (entity == null) {
+      return null;
+    }
+
+    File? file;
+
+    /// iOS LivePhoto has two files: a photo and a video.
+    /// They are uploaded separately, with video file being upload first, then returned with the assetId
+    /// The assetId is then used as a metadata for the photo file upload task.
+    ///
+    /// We implement two separate upload groups for this, the normal one for the video file
+    /// and the higher priority group for the photo file because the video file is already uploaded.
+    ///
+    /// The cancel operation will only cancel the video group (normal group), the photo group will not
+    /// be touched, as the video file is already uploaded.
+
+    if (entity.isLivePhoto) {
+      file = await _storageRepository.getMotionFileForAsset(asset);
+    } else {
+      file = await _storageRepository.getFileForAsset(asset.id);
+    }
+
+    if (file == null) {
+      return null;
+    }
+
+    final originalFileName = entity.isLivePhoto
+        ? p.setExtension(
+            asset.name,
+            p.extension(file.path),
+          )
+        : asset.name;
+
+    String metadata = UploadTaskMetadata(
+      localAssetId: asset.id,
+      isLivePhotos: entity.isLivePhoto,
+      livePhotoVideoId: '',
+    ).toJson();
+
+    return buildUploadTask(
+      file,
+      originalFileName: originalFileName,
+      deviceAssetId: asset.id,
+      metadata: metadata,
+      group: group,
+      priority: priority,
+    );
+  }
+
+  Future<UploadTask?> _getLivePhotoUploadTask(
+    LocalAsset asset,
+    String livePhotoVideoId,
+  ) async {
+    final entity = await _storageRepository.getAssetEntityForAsset(asset);
+    if (entity == null) {
+      return null;
+    }
+
+    final file = await _storageRepository.getFileForAsset(asset.id);
+    if (file == null) {
+      return null;
+    }
+
+    final fields = {
+      'livePhotoVideoId': livePhotoVideoId,
+    };
+
+    return buildUploadTask(
+      file,
+      originalFileName: asset.name,
+      deviceAssetId: asset.id,
+      fields: fields,
+      group: kBackupLivePhotoGroup,
+      priority: 0, // Highest priority to get upload immediately
+    );
   }
 
   Future<UploadTask> buildUploadTask(
@@ -74,26 +311,6 @@ class UploadService {
     String? deviceAssetId,
     String? metadata,
     int? priority,
-  }) async {
-    return _buildTask(
-      deviceAssetId ?? hash(file.path).toString(),
-      file,
-      fields: fields,
-      originalFileName: originalFileName,
-      metadata: metadata,
-      group: group,
-      priority: priority,
-    );
-  }
-
-  Future<UploadTask> _buildTask(
-    String id,
-    File file, {
-    required String group,
-    Map<String, String>? fields,
-    String? originalFileName,
-    String? metadata,
-    int? priority,
   }) async {
     final serverEndpoint = Store.get(StoreKey.serverEndpoint);
     final url = Uri.parse('$serverEndpoint/assets').toString();
@@ -106,7 +323,7 @@ class UploadService {
     final fileModifiedAt = stats.modified;
     final fieldsMap = {
       'filename': originalFileName ?? filename,
-      'deviceAssetId': id,
+      'deviceAssetId': deviceAssetId ?? '',
       'deviceId': deviceId,
       'fileCreatedAt': fileCreatedAt.toUtc().toIso8601String(),
       'fileModifiedAt': fileModifiedAt.toUtc().toIso8601String(),
@@ -116,7 +333,7 @@ class UploadService {
     };
 
     return UploadTask(
-      taskId: id,
+      taskId: deviceAssetId,
       displayName: originalFileName ?? filename,
       httpRequestMethod: 'POST',
       url: url,
@@ -134,3 +351,64 @@ class UploadService {
     );
   }
 }
+
+class UploadTaskMetadata {
+  final String localAssetId;
+  final bool isLivePhotos;
+  final String livePhotoVideoId;
+
+  const UploadTaskMetadata({
+    required this.localAssetId,
+    required this.isLivePhotos,
+    required this.livePhotoVideoId,
+  });
+
+  UploadTaskMetadata copyWith({
+    String? localAssetId,
+    bool? isLivePhotos,
+    String? livePhotoVideoId,
+  }) {
+    return UploadTaskMetadata(
+      localAssetId: localAssetId ?? this.localAssetId,
+      isLivePhotos: isLivePhotos ?? this.isLivePhotos,
+      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'localAssetId': localAssetId,
+      'isLivePhotos': isLivePhotos,
+      'livePhotoVideoId': livePhotoVideoId,
+    };
+  }
+
+  factory UploadTaskMetadata.fromMap(Map<String, dynamic> map) {
+    return UploadTaskMetadata(
+      localAssetId: map['localAssetId'] as String,
+      isLivePhotos: map['isLivePhotos'] as bool,
+      livePhotoVideoId: map['livePhotoVideoId'] as String,
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory UploadTaskMetadata.fromJson(String source) =>
+      UploadTaskMetadata.fromMap(json.decode(source) as Map<String, dynamic>);
+
+  @override
+  String toString() =>
+      'UploadTaskMetadata(localAssetId: $localAssetId, isLivePhotos: $isLivePhotos, livePhotoVideoId: $livePhotoVideoId)';
+
+  @override
+  bool operator ==(covariant UploadTaskMetadata other) {
+    if (identical(this, other)) return true;
+
+    return other.localAssetId == localAssetId &&
+        other.isLivePhotos == isLivePhotos &&
+        other.livePhotoVideoId == livePhotoVideoId;
+  }
+
+  @override
+  int get hashCode => localAssetId.hashCode ^ isLivePhotos.hashCode ^ livePhotoVideoId.hashCode;
+}
diff --git a/mobile/test/domain/service.mock.dart b/mobile/test/domain/service.mock.dart
index f4c5a32a4b..8293faf125 100644
--- a/mobile/test/domain/service.mock.dart
+++ b/mobile/test/domain/service.mock.dart
@@ -2,6 +2,8 @@ import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/services/upload.service.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockStoreService extends Mock implements StoreService {}
@@ -11,3 +13,7 @@ class MockUserService extends Mock implements UserService {}
 class MockBackgroundSyncManager extends Mock implements BackgroundSyncManager {}
 
 class MockNativeSyncApi extends Mock implements NativeSyncApi {}
+
+class MockAppSettingsService extends Mock implements AppSettingsService {}
+
+class MockUploadService extends Mock implements UploadService {}
diff --git a/mobile/test/services/auth.service_test.dart b/mobile/test/services/auth.service_test.dart
index 3e9a02a2a5..c9b44fe28b 100644
--- a/mobile/test/services/auth.service_test.dart
+++ b/mobile/test/services/auth.service_test.dart
@@ -3,6 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
 import 'package:isar/isar.dart';
 import 'package:mocktail/mocktail.dart';
@@ -20,6 +21,8 @@ void main() {
   late MockApiService apiService;
   late MockNetworkService networkService;
   late MockBackgroundSyncManager backgroundSyncManager;
+  late MockUploadService uploadService;
+  late MockAppSettingService appSettingsService;
   late Isar db;
 
   setUp(() async {
@@ -28,6 +31,8 @@ void main() {
     apiService = MockApiService();
     networkService = MockNetworkService();
     backgroundSyncManager = MockBackgroundSyncManager();
+    uploadService = MockUploadService();
+    appSettingsService = MockAppSettingService();
 
     sut = AuthService(
       authApiRepository,
@@ -35,6 +40,7 @@ void main() {
       apiService,
       networkService,
       backgroundSyncManager,
+      appSettingsService,
     );
 
     registerFallbackValue(Uri());
@@ -118,7 +124,13 @@ void main() {
       when(() => authApiRepository.logout()).thenAnswer((_) async => {});
       when(() => backgroundSyncManager.cancel()).thenAnswer((_) async => {});
       when(() => authRepository.clearLocalData()).thenAnswer((_) => Future.value(null));
-
+      when(() => uploadService.cancelBackup()).thenAnswer((_) => Future.value(1));
+      when(
+        () => appSettingsService.setSetting(
+          AppSettingsEnum.enableBackup,
+          false,
+        ),
+      ).thenAnswer((_) => Future.value(null));
       await sut.logout();
 
       verify(() => authApiRepository.logout()).called(1);
@@ -130,7 +142,13 @@ void main() {
       when(() => authApiRepository.logout()).thenThrow(Exception('Server error'));
       when(() => backgroundSyncManager.cancel()).thenAnswer((_) async => {});
       when(() => authRepository.clearLocalData()).thenAnswer((_) => Future.value(null));
-
+      when(() => uploadService.cancelBackup()).thenAnswer((_) => Future.value(1));
+      when(
+        () => appSettingsService.setSetting(
+          AppSettingsEnum.enableBackup,
+          false,
+        ),
+      ).thenAnswer((_) => Future.value(null));
       await sut.logout();
 
       verify(() => authApiRepository.logout()).called(1);

From c63f805cb4d1774fa32d9cf47d3275267f9c6463 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Fri, 25 Jul 2025 10:10:01 -0500
Subject: [PATCH 319/337] fix: word wrapping on action buttons (#20231)

---
 .../widgets/action_buttons/base_action_button.widget.dart        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
index cc65571a40..9704c4b13b 100644
--- a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart
@@ -65,6 +65,7 @@ class BaseActionButton extends StatelessWidget {
               ),
               maxLines: 3,
               textAlign: TextAlign.center,
+              softWrap: true,
             ),
           ],
         ),

From 7f2e4f85f85f5e2728ad9fb8b735c7fd2e2d0c18 Mon Sep 17 00:00:00 2001
From: Zack Pollard <zack@futo.org>
Date: Fri, 25 Jul 2025 16:51:22 +0100
Subject: [PATCH 320/337] fix: lookup the primary key constraint name before
 dropping it (#20221)

---
 ...1752161055253-RenameGeodataPKConstraint.ts | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts b/server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts
index 57ce86704e..086b7c1273 100644
--- a/server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts
+++ b/server/src/schema/migrations/1752161055253-RenameGeodataPKConstraint.ts
@@ -1,9 +1,23 @@
 import { Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "geodata_places" DROP CONSTRAINT IF EXISTS "PK_c29918988912ef4036f3d7fbff4";`.execute(db);
-  await sql`ALTER TABLE "geodata_places" DROP CONSTRAINT IF EXISTS "geodata_places_pkey"`.execute(db);
-  await sql`ALTER TABLE "geodata_places" DROP CONSTRAINT IF EXISTS "geodata_places_tmp_pkey"`.execute(db);
+  await sql`
+    DO $$
+      DECLARE
+        constraint_name text;
+      BEGIN
+        SELECT con.conname
+        INTO constraint_name
+        FROM pg_catalog.pg_constraint con
+               JOIN pg_catalog.pg_class rel ON rel.oid = con.conrelid
+        WHERE rel.relname = 'geodata_places' AND con.contype = 'p';
+
+        IF constraint_name IS NOT NULL THEN
+          EXECUTE 'ALTER TABLE "geodata_places" DROP CONSTRAINT "' || constraint_name || '"';
+        END IF;
+      END;
+    $$;
+  `.execute(db);
   await sql`ALTER TABLE "geodata_places" ADD CONSTRAINT "geodata_places_pkey" PRIMARY KEY ("id");`.execute(db);
 }
 

From 2e0ee6ec056b55734c51f210b9fb197897843634 Mon Sep 17 00:00:00 2001
From: Zack Pollard <zack@futo.org>
Date: Fri, 25 Jul 2025 17:19:50 +0100
Subject: [PATCH 321/337] feat: don't wait for network on app startup (#20232)

---
 .../lib/pages/common/splash_screen.page.dart  | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/mobile/lib/pages/common/splash_screen.page.dart b/mobile/lib/pages/common/splash_screen.page.dart
index a8af0df763..47cd64f7f9 100644
--- a/mobile/lib/pages/common/splash_screen.page.dart
+++ b/mobile/lib/pages/common/splash_screen.page.dart
@@ -42,30 +42,22 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     final endpoint = Store.tryGet(StoreKey.serverEndpoint);
     final accessToken = Store.tryGet(StoreKey.accessToken);
 
-    bool isAuthSuccess = false;
-
     if (accessToken != null && serverUrl != null && endpoint != null) {
-      try {
-        isAuthSuccess = await ref.read(authProvider.notifier).saveAuthInfo(
-              accessToken: accessToken,
-            );
-      } catch (error, stackTrace) {
-        log.severe(
-          'Cannot set success login info',
-          error,
-          stackTrace,
-        );
-      }
+      ref.read(authProvider.notifier).saveAuthInfo(accessToken: accessToken).then(
+            (a) => {
+              log.info('Successfully updated auth info with access token: $accessToken'),
+            },
+            onError: (exception) => {
+              log.severe(
+                'Failed to update auth info with access token: $accessToken',
+              ),
+              ref.read(authProvider.notifier).logout(),
+              context.replaceRoute(const LoginRoute()),
+            },
+          );
     } else {
-      isAuthSuccess = false;
       log.severe(
-        'Missing authentication, server, or endpoint info from the local store',
-      );
-    }
-
-    if (!isAuthSuccess) {
-      log.severe(
-        'Unable to login using offline or online methods - Logging out completely',
+        'Missing crucial offline login info - Logging out completely',
       );
       ref.read(authProvider.notifier).logout();
       context.replaceRoute(const LoginRoute());

From f9292c9c96bb023e3e421c0a50182fffbea6d908 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Fri, 25 Jul 2025 12:02:49 -0500
Subject: [PATCH 322/337] fix(mobile): deep links when using the beta timeline
 (#20111)

* fix: deep links when using the beta timeline

* Update remote_asset.repository.dart

* Update mobile/lib/domain/services/asset.service.dart

Co-authored-by: Alex <alex.tran1502@gmail.com>

* return optional from album get

* do not include trashed assets in album asset count

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

* formatting

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>
Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
---
 mobile/lib/domain/services/asset.service.dart |   4 +
 .../lib/domain/services/memory.service.dart   |   4 +
 .../domain/services/remote_album.service.dart |   4 +
 .../repositories/memory.repository.dart       |  37 +++++
 .../repositories/remote_album.repository.dart |  35 +++++
 .../repositories/remote_asset.repository.dart |  27 ++++
 mobile/lib/services/deep_link.service.dart    | 136 +++++++++++++-----
 7 files changed, 212 insertions(+), 35 deletions(-)

diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dart
index 26d6948468..5006e2d45c 100644
--- a/mobile/lib/domain/services/asset.service.dart
+++ b/mobile/lib/domain/services/asset.service.dart
@@ -22,6 +22,10 @@ class AssetService {
     return asset is LocalAsset ? _localAssetRepository.watchAsset(id) : _remoteAssetRepository.watchAsset(id);
   }
 
+  Future<RemoteAsset?> getRemoteAsset(String id) {
+    return _remoteAssetRepository.get(id);
+  }
+
   Future<List<RemoteAsset>> getStack(RemoteAsset asset) async {
     if (asset.stackId == null) {
       return [];
diff --git a/mobile/lib/domain/services/memory.service.dart b/mobile/lib/domain/services/memory.service.dart
index 50ed1e0f75..ead613370f 100644
--- a/mobile/lib/domain/services/memory.service.dart
+++ b/mobile/lib/domain/services/memory.service.dart
@@ -13,6 +13,10 @@ class DriftMemoryService {
     return _repository.getAll(ownerId);
   }
 
+  Future<DriftMemory?> get(String memoryId) {
+    return _repository.get(memoryId);
+  }
+
   Future<int> getCount() {
     return _repository.getCount();
   }
diff --git a/mobile/lib/domain/services/remote_album.service.dart b/mobile/lib/domain/services/remote_album.service.dart
index a30d6f410f..6c3b2e32af 100644
--- a/mobile/lib/domain/services/remote_album.service.dart
+++ b/mobile/lib/domain/services/remote_album.service.dart
@@ -22,6 +22,10 @@ class RemoteAlbumService {
     return _repository.getAll();
   }
 
+  Future<RemoteAlbum?> get(String albumId) {
+    return _repository.get(albumId);
+  }
+
   List<RemoteAlbum> sortAlbums(
     List<RemoteAlbum> albums,
     RemoteAlbumSortMode sortMode, {
diff --git a/mobile/lib/infrastructure/repositories/memory.repository.dart b/mobile/lib/infrastructure/repositories/memory.repository.dart
index b964557952..3663b75bf3 100644
--- a/mobile/lib/infrastructure/repositories/memory.repository.dart
+++ b/mobile/lib/infrastructure/repositories/memory.repository.dart
@@ -58,6 +58,43 @@ class DriftMemoryRepository extends DriftDatabaseRepository {
     return memoriesMap.values.toList();
   }
 
+  Future<DriftMemory?> get(String memoryId) async {
+    final query = _db.select(_db.memoryEntity).join([
+      leftOuterJoin(
+        _db.memoryAssetEntity,
+        _db.memoryAssetEntity.memoryId.equalsExp(_db.memoryEntity.id),
+      ),
+      leftOuterJoin(
+        _db.remoteAssetEntity,
+        _db.remoteAssetEntity.id.equalsExp(_db.memoryAssetEntity.assetId) &
+            _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline),
+      ),
+    ])
+      ..where(_db.memoryEntity.id.equals(memoryId))
+      ..where(_db.memoryEntity.deletedAt.isNull())
+      ..orderBy([
+        OrderingTerm.desc(_db.memoryEntity.memoryAt),
+        OrderingTerm.asc(_db.remoteAssetEntity.createdAt),
+      ]);
+
+    final rows = await query.get();
+
+    if (rows.isEmpty) {
+      return null;
+    }
+
+    final memory = rows.first.readTable(_db.memoryEntity);
+    final assets = <RemoteAsset>[];
+
+    for (final row in rows) {
+      final asset = row.readTable(_db.remoteAssetEntity);
+      assets.add(asset.toDto());
+    }
+
+    return memory.toDto().copyWith(assets: assets);
+  }
+
   Future<int> getCount() {
     return _db.managers.memoryEntity.count();
   }
diff --git a/mobile/lib/infrastructure/repositories/remote_album.repository.dart b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
index 2d7bbe2370..f60caceb47 100644
--- a/mobile/lib/infrastructure/repositories/remote_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_album.repository.dart
@@ -67,6 +67,41 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
         .get();
   }
 
+  Future<RemoteAlbum?> get(String albumId) {
+    final assetCount = _db.remoteAlbumAssetEntity.assetId.count();
+
+    final query = _db.remoteAlbumEntity.select().join([
+      leftOuterJoin(
+        _db.remoteAlbumAssetEntity,
+        _db.remoteAlbumAssetEntity.albumId.equalsExp(_db.remoteAlbumEntity.id),
+        useColumns: false,
+      ),
+      leftOuterJoin(
+        _db.remoteAssetEntity,
+        _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId),
+        useColumns: false,
+      ),
+      leftOuterJoin(
+        _db.userEntity,
+        _db.userEntity.id.equalsExp(_db.remoteAlbumEntity.ownerId),
+        useColumns: false,
+      ),
+    ])
+      ..where(_db.remoteAlbumEntity.id.equals(albumId) & _db.remoteAssetEntity.deletedAt.isNull())
+      ..addColumns([assetCount])
+      ..addColumns([_db.userEntity.name])
+      ..groupBy([_db.remoteAlbumEntity.id]);
+
+    return query
+        .map(
+          (row) => row.readTable(_db.remoteAlbumEntity).toDto(
+                assetCount: row.read(assetCount) ?? 0,
+                ownerName: row.read(_db.userEntity.name)!,
+              ),
+        )
+        .getSingleOrNull();
+  }
+
   Future<void> create(
     RemoteAlbum album,
     List<String> assetIds,
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index af1249dc03..212b9b7f34 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -29,6 +29,33 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
     return query.map((row) => row.toDto()).get();
   }
 
+  SingleOrNullSelectable<RemoteAsset?> _assetSelectable(String id) {
+    final query = _db.remoteAssetEntity.select().addColumns([
+      _db.localAssetEntity.id,
+    ]).join([
+      leftOuterJoin(
+        _db.localAssetEntity,
+        _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
+        useColumns: false,
+      ),
+    ])
+      ..where(_db.remoteAssetEntity.id.equals(id))
+      ..limit(1);
+
+    return query.map((row) {
+      final asset = row.readTable(_db.remoteAssetEntity).toDto();
+      return asset.copyWith(localId: row.read(_db.localAssetEntity.id));
+    });
+  }
+
+  Stream<RemoteAsset?> watch(String id) {
+    return _assetSelectable(id).watchSingleOrNull();
+  }
+
+  Future<RemoteAsset?> get(String id) {
+    return _assetSelectable(id).getSingleOrNull();
+  }
+
   Stream<RemoteAsset?> watchAsset(String id) {
     final query = _db.remoteAssetEntity.select().addColumns([
       _db.localAssetEntity.id,
diff --git a/mobile/lib/services/deep_link.service.dart b/mobile/lib/services/deep_link.service.dart
index caa20918c3..c08eacd0e3 100644
--- a/mobile/lib/services/deep_link.service.dart
+++ b/mobile/lib/services/deep_link.service.dart
@@ -1,6 +1,16 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:immich_mobile/domain/services/asset.service.dart' as beta_asset_service;
+import 'package:immich_mobile/domain/services/memory.service.dart';
+import 'package:immich_mobile/domain/services/remote_album.service.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/providers/album/current_album.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart' as beta_asset_provider;
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/album.service.dart';
 import 'package:immich_mobile/services/asset.service.dart';
@@ -15,24 +25,53 @@ final deepLinkServiceProvider = Provider(
     ref.watch(albumServiceProvider),
     ref.watch(currentAssetProvider.notifier),
     ref.watch(currentAlbumProvider.notifier),
+    // Below is used for beta timeline
+    ref.watch(timelineFactoryProvider),
+    ref.watch(beta_asset_provider.assetServiceProvider),
+    ref.watch(currentRemoteAlbumProvider.notifier),
+    ref.watch(remoteAlbumServiceProvider),
+    ref.watch(driftMemoryServiceProvider),
   ),
 );
 
 class DeepLinkService {
+  /// TODO: Remove this when beta is default
   final MemoryService _memoryService;
   final AssetService _assetService;
   final AlbumService _albumService;
   final CurrentAsset _currentAsset;
   final CurrentAlbum _currentAlbum;
 
+  /// Used for beta timeline
+  final TimelineFactory _betaTimelineFactory;
+  final beta_asset_service.AssetService _betaAssetService;
+  final CurrentAlbumNotifier _betaCurrentAlbumNotifier;
+  final RemoteAlbumService _betaRemoteAlbumService;
+  final DriftMemoryService _betaMemoryServiceProvider;
+
   const DeepLinkService(
     this._memoryService,
     this._assetService,
     this._albumService,
     this._currentAsset,
     this._currentAlbum,
+    this._betaTimelineFactory,
+    this._betaAssetService,
+    this._betaCurrentAlbumNotifier,
+    this._betaRemoteAlbumService,
+    this._betaMemoryServiceProvider,
   );
 
+  DeepLink _handleColdStart(PageRouteInfo<dynamic> route, bool isColdStart) {
+    return DeepLink([
+      // we need something to segue back to if the app was cold started
+      // TODO: use MainTimelineRoute this when beta is default
+
+      if (isColdStart) (Store.isBetaTimelineEnabled) ? const MainTimelineRoute() : const PhotosRoute(),
+      route,
+    ]);
+  }
+
   Future<DeepLink> handleScheme(PlatformDeepLink link, bool isColdStart) async {
     // get everything after the scheme, since Uri cannot parse path
     final intent = link.uri.host;
@@ -54,11 +93,7 @@ class DeepLinkService {
       return DeepLink.none;
     }
 
-    return DeepLink([
-      // we need something to segue back to if the app was cold started
-      if (isColdStart) const PhotosRoute(),
-      deepLinkRoute,
-    ]);
+    return _handleColdStart(deepLinkRoute, isColdStart);
   }
 
   Future<DeepLink> handleMyImmichApp(
@@ -86,49 +121,80 @@ class DeepLinkService {
       return DeepLink.none;
     }
 
-    return DeepLink([
-      // we need something to segue back to if the app was cold started
-      if (isColdStart) const PhotosRoute(),
-      deepLinkRoute,
-    ]);
+    return _handleColdStart(deepLinkRoute, isColdStart);
   }
 
   Future<PageRouteInfo?> _buildMemoryDeepLink(String memoryId) async {
-    final memory = await _memoryService.getMemoryById(memoryId);
+    if (Store.isBetaTimelineEnabled) {
+      final memory = await _betaMemoryServiceProvider.get(memoryId);
 
-    if (memory == null) {
-      return null;
+      if (memory == null) {
+        return null;
+      }
+
+      return DriftMemoryRoute(memories: [memory], memoryIndex: 0);
+    } else {
+      // TODO: Remove this when beta is default
+      final memory = await _memoryService.getMemoryById(memoryId);
+
+      if (memory == null) {
+        return null;
+      }
+
+      return MemoryRoute(memories: [memory], memoryIndex: 0);
     }
-
-    return MemoryRoute(memories: [memory], memoryIndex: 0);
   }
 
   Future<PageRouteInfo?> _buildAssetDeepLink(String assetId) async {
-    final asset = await _assetService.getAssetByRemoteId(assetId);
-    if (asset == null) {
-      return null;
+    if (Store.isBetaTimelineEnabled) {
+      final asset = await _betaAssetService.getRemoteAsset(assetId);
+      if (asset == null) {
+        return null;
+      }
+
+      return AssetViewerRoute(
+        initialIndex: 0,
+        timelineService: _betaTimelineFactory.fromAssets([asset]),
+      );
+    } else {
+      // TODO: Remove this when beta is default
+      final asset = await _assetService.getAssetByRemoteId(assetId);
+      if (asset == null) {
+        return null;
+      }
+
+      _currentAsset.set(asset);
+      final renderList = await RenderList.fromAssets([asset], GroupAssetsBy.auto);
+
+      return GalleryViewerRoute(
+        renderList: renderList,
+        initialIndex: 0,
+        heroOffset: 0,
+        showStack: true,
+      );
     }
-
-    _currentAsset.set(asset);
-    final renderList = await RenderList.fromAssets([asset], GroupAssetsBy.auto);
-
-    return GalleryViewerRoute(
-      renderList: renderList,
-      initialIndex: 0,
-      heroOffset: 0,
-      showStack: true,
-    );
   }
 
   Future<PageRouteInfo?> _buildAlbumDeepLink(String albumId) async {
-    final album = await _albumService.getAlbumByRemoteId(albumId);
+    if (Store.isBetaTimelineEnabled) {
+      final album = await _betaRemoteAlbumService.get(albumId);
 
-    if (album == null) {
-      return null;
+      if (album == null) {
+        return null;
+      }
+
+      _betaCurrentAlbumNotifier.setAlbum(album);
+      return RemoteAlbumRoute(album: album);
+    } else {
+      // TODO: Remove this when beta is default
+      final album = await _albumService.getAlbumByRemoteId(albumId);
+
+      if (album == null) {
+        return null;
+      }
+
+      _currentAlbum.set(album);
+      return AlbumViewerRoute(albumId: album.id);
     }
-
-    _currentAlbum.set(album);
-
-    return AlbumViewerRoute(albumId: album.id);
   }
 }

From da80b69062e6e62540e479f589df449b22a187a2 Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Fri, 25 Jul 2025 12:24:19 -0500
Subject: [PATCH 323/337] fix(mobile): beta search page improvements (#20247)

search page improvements
---
 mobile/lib/presentation/pages/search/drift_search.page.dart   | 2 +-
 mobile/lib/presentation/widgets/timeline/timeline.widget.dart | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/presentation/pages/search/drift_search.page.dart b/mobile/lib/presentation/pages/search/drift_search.page.dart
index 5174c118d8..868f1ff298 100644
--- a/mobile/lib/presentation/pages/search/drift_search.page.dart
+++ b/mobile/lib/presentation/pages/search/drift_search.page.dart
@@ -652,7 +652,7 @@ class DriftSearchPage extends HookConsumerWidget {
       body: CustomScrollView(
         slivers: [
           SliverPadding(
-            padding: const EdgeInsets.only(top: 12.0),
+            padding: const EdgeInsets.only(top: 12.0, bottom: 4.0),
             sliver: SliverToBoxAdapter(
               child: SizedBox(
                 height: 50,
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 69998fea54..2439fd100b 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -49,6 +49,7 @@ class Timeline extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      resizeToAvoidBottomInset: false,
       body: LayoutBuilder(
         builder: (_, constraints) => ProviderScope(
           overrides: [

From 153bb70f6e2a506e2ea346cfd8022cbd3affdbea Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 25 Jul 2025 13:39:48 -0400
Subject: [PATCH 324/337] feat(web): api key permission search (#20248)

---
 .../lib/components/elements/search-bar.svelte |   6 +-
 .../user-api-key-grid.svelte                  |   2 +-
 web/src/lib/modals/ApiKeyModal.svelte         | 198 +++++-------------
 3 files changed, 58 insertions(+), 148 deletions(-)

diff --git a/web/src/lib/components/elements/search-bar.svelte b/web/src/lib/components/elements/search-bar.svelte
index 2440285704..dcf314f59d 100644
--- a/web/src/lib/components/elements/search-bar.svelte
+++ b/web/src/lib/components/elements/search-bar.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import type { SearchOptions } from '$lib/utils/dipatch';
-  import { mdiClose, mdiMagnify } from '@mdi/js';
-  import LoadingSpinner from '../shared-components/loading-spinner.svelte';
-  import { t } from 'svelte-i18n';
   import { IconButton } from '@immich/ui';
+  import { mdiClose, mdiMagnify } from '@mdi/js';
+  import { t } from 'svelte-i18n';
+  import LoadingSpinner from '../shared-components/loading-spinner.svelte';
 
   interface Props {
     name: string;
diff --git a/web/src/lib/components/user-settings-page/user-api-key-grid.svelte b/web/src/lib/components/user-settings-page/user-api-key-grid.svelte
index 78f383a141..0eeea40186 100644
--- a/web/src/lib/components/user-settings-page/user-api-key-grid.svelte
+++ b/web/src/lib/components/user-settings-page/user-api-key-grid.svelte
@@ -31,7 +31,7 @@
   };
 </script>
 
-<div class="mx-4 my-2 border bg-subtle dark:bg-black/30 dark:border-black p-4 rounded-2xl">
+<div class="border bg-subtle dark:bg-black/30 dark:border-black p-4 rounded-2xl">
   <div class="flex items-center gap-2">
     <Checkbox
       id="permission-{title}"
diff --git a/web/src/lib/modals/ApiKeyModal.svelte b/web/src/lib/modals/ApiKeyModal.svelte
index 55896c631d..e0e1197240 100644
--- a/web/src/lib/modals/ApiKeyModal.svelte
+++ b/web/src/lib/modals/ApiKeyModal.svelte
@@ -5,11 +5,17 @@
   } from '$lib/components/shared-components/notification/notification';
   import ApiKeyGrid from '$lib/components/user-settings-page/user-api-key-grid.svelte';
   import { Permission } from '@immich/sdk';
-  import { Button, Checkbox, HStack, Label, Modal, ModalBody, ModalFooter } from '@immich/ui';
-  import { mdiKeyVariant } from '@mdi/js';
+  import { Button, Checkbox, Field, HStack, IconButton, Input, Label, Modal, ModalBody, ModalFooter } from '@immich/ui';
+  import { mdiClose, mdiKeyVariant } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
-  import { SvelteMap } from 'svelte/reactivity';
+
+  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[] };
@@ -20,137 +26,26 @@
   }
 
   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: Map<string, Permission[]> = new SvelteMap();
+  const permissions: Record<string, Permission[]> = {};
+  for (const permission of Object.values(Permission)) {
+    if (permission === Permission.All) {
+      continue;
+    }
 
-  permissions.set('activity', [
-    Permission.ActivityCreate,
-    Permission.ActivityRead,
-    Permission.ActivityUpdate,
-    Permission.ActivityDelete,
-    Permission.ActivityStatistics,
-  ]);
+    const [group] = permission.split('.');
+    if (!permissions[group]) {
+      permissions[group] = [];
+    }
+    permissions[group].push(permission);
+  }
 
-  permissions.set('api_key', [
-    Permission.ApiKeyCreate,
-    Permission.ApiKeyRead,
-    Permission.ApiKeyUpdate,
-    Permission.ApiKeyDelete,
-  ]);
-
-  permissions.set('asset', [
-    Permission.AssetRead,
-    Permission.AssetUpdate,
-    Permission.AssetDelete,
-    Permission.AssetShare,
-    Permission.AssetView,
-    Permission.AssetDownload,
-    Permission.AssetUpload,
-  ]);
-
-  permissions.set('album', [
-    Permission.AlbumCreate,
-    Permission.AlbumRead,
-    Permission.AlbumUpdate,
-    Permission.AlbumDelete,
-    Permission.AlbumStatistics,
-
-    Permission.AlbumAddAsset,
-    Permission.AlbumRemoveAsset,
-    Permission.AlbumShare,
-    Permission.AlbumDownload,
-  ]);
-
-  permissions.set('auth_device', [Permission.AuthDeviceDelete]);
-
-  permissions.set('archive', [Permission.ArchiveRead]);
-
-  permissions.set('face', [Permission.FaceCreate, Permission.FaceRead, Permission.FaceUpdate, Permission.FaceDelete]);
-
-  permissions.set('library', [
-    Permission.LibraryCreate,
-    Permission.LibraryRead,
-    Permission.LibraryUpdate,
-    Permission.LibraryDelete,
-    Permission.LibraryStatistics,
-  ]);
-
-  permissions.set('timeline', [Permission.TimelineRead, Permission.TimelineDownload]);
-
-  permissions.set('memory', [
-    Permission.MemoryCreate,
-    Permission.MemoryRead,
-    Permission.MemoryUpdate,
-    Permission.MemoryDelete,
-  ]);
-
-  permissions.set('notification', [
-    Permission.NotificationCreate,
-    Permission.NotificationRead,
-    Permission.NotificationUpdate,
-    Permission.NotificationDelete,
-  ]);
-
-  permissions.set('partner', [
-    Permission.PartnerCreate,
-    Permission.PartnerRead,
-    Permission.PartnerUpdate,
-    Permission.PartnerDelete,
-  ]);
-
-  permissions.set('person', [
-    Permission.PersonCreate,
-    Permission.PersonRead,
-    Permission.PersonUpdate,
-    Permission.PersonDelete,
-    Permission.PersonStatistics,
-    Permission.PersonMerge,
-    Permission.PersonReassign,
-  ]);
-
-  permissions.set('session', [
-    Permission.SessionCreate,
-    Permission.SessionRead,
-    Permission.SessionUpdate,
-    Permission.SessionDelete,
-    Permission.SessionLock,
-  ]);
-
-  permissions.set('sharedLink', [
-    Permission.SharedLinkCreate,
-    Permission.SharedLinkRead,
-    Permission.SharedLinkUpdate,
-    Permission.SharedLinkDelete,
-  ]);
-
-  permissions.set('stack', [
-    Permission.StackCreate,
-    Permission.StackRead,
-    Permission.StackUpdate,
-    Permission.StackDelete,
-  ]);
-
-  permissions.set('systemConfig', [Permission.SystemConfigRead, Permission.SystemConfigUpdate]);
-
-  permissions.set('systemMetadata', [Permission.SystemMetadataRead, Permission.SystemMetadataUpdate]);
-
-  permissions.set('tag', [
-    Permission.TagCreate,
-    Permission.TagRead,
-    Permission.TagUpdate,
-    Permission.TagDelete,
-    Permission.TagAsset,
-  ]);
-
-  permissions.set('adminUser', [
-    Permission.AdminUserCreate,
-    Permission.AdminUserRead,
-    Permission.AdminUserUpdate,
-    Permission.AdminUserDelete,
-  ]);
+  let searchValue = $state('');
+  let filteredResults = $derived(Object.entries(permissions).filter(matches(searchValue)));
 
   const handleSelectItems = (permissions: Permission[]) => {
     selectedItems = Array.from(new Set([...selectedItems, ...permissions]));
@@ -177,9 +72,9 @@
       });
     } else {
       if (selectAllItems) {
-        onClose({ name: apiKey.name, permissions: [Permission.All] });
+        onClose({ name, permissions: [Permission.All] });
       } else {
-        onClose({ name: apiKey.name, permissions: selectedItems });
+        onClose({ name, permissions: selectedItems });
       }
     }
   };
@@ -200,22 +95,37 @@
   <ModalBody>
     <form {onsubmit} autocomplete="off" id="api-key-form">
       <div class="mb-4 flex flex-col gap-2">
-        <label class="immich-form-label" for="name">{$t('name')}</label>
-        <input class="immich-form-input" id="name" name="name" type="text" bind:value={apiKey.name} />
+        <Field label={$t('name')}>
+          <Input bind:value={name} />
+        </Field>
       </div>
-      <label class="immich-form-label" for="permission">{$t('permission')}</label>
-      <div class="flex items-center gap-2 m-4" id="permission">
-        <Checkbox
-          id="select-all-permissions"
-          size="tiny"
-          checked={selectAllItems}
-          onCheckedChange={handleSelectAllItems}
-        />
-        <Label label={$t('select_all')} for="select-all-permissions" />
+      <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>
-      {#each permissions as [title, subItems] (title)}
-        <ApiKeyGrid {title} {subItems} {selectedItems} {handleSelectItems} {handleDeselectItems} />
-      {/each}
     </form>
   </ModalBody>
 

From 0fdeac041753831ea0c9402ed8df8f58aef0fb28 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 25 Jul 2025 15:25:23 -0400
Subject: [PATCH 325/337] feat!: more permissions (#20250)

feat: more api key permissions
---
 e2e/src/api/specs/album.e2e-spec.ts           |   4 +-
 mobile/openapi/lib/model/permission.dart      | 162 ++++++++++++++++--
 open-api/immich-openapi-specs.json            |  54 +++++-
 open-api/typescript-sdk/src/fetch-client.ts   |  54 +++++-
 server/src/controllers/album.controller.ts    |  10 +-
 .../src/controllers/asset-media.controller.ts |  12 +-
 server/src/controllers/asset.controller.ts    |  14 +-
 server/src/controllers/auth.controller.ts     |  10 +-
 server/src/controllers/download.controller.ts |   5 +-
 .../src/controllers/duplicate.controller.ts   |   7 +-
 server/src/controllers/job.controller.ts      |   7 +-
 server/src/controllers/memory.controller.ts   |   6 +-
 server/src/controllers/search.controller.ts   |  19 +-
 server/src/controllers/server.controller.ts   |  27 +--
 server/src/controllers/sync.controller.ts     |   9 +-
 server/src/controllers/user.controller.ts     |  32 ++--
 server/src/enum.ts                            |  70 +++++++-
 .../1753464178233-RenameApiKeyPermissions.ts  |  22 +++
 server/src/services/album.service.ts          |   4 +-
 server/src/utils/access.ts                    |   6 +-
 20 files changed, 414 insertions(+), 120 deletions(-)
 create mode 100644 server/src/schema/migrations/1753464178233-RenameApiKeyPermissions.ts

diff --git a/e2e/src/api/specs/album.e2e-spec.ts b/e2e/src/api/specs/album.e2e-spec.ts
index eedf70dc58..af9b17cc13 100644
--- a/e2e/src/api/specs/album.e2e-spec.ts
+++ b/e2e/src/api/specs/album.e2e-spec.ts
@@ -470,7 +470,7 @@ describe('/albums', () => {
         .send({ ids: [asset.id] });
 
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Not found or no album.addAsset access'));
+      expect(body).toEqual(errorDto.badRequest('Not found or no albumAsset.create access'));
     });
 
     it('should add duplicate assets only once', async () => {
@@ -599,7 +599,7 @@ describe('/albums', () => {
         .send({ ids: [user1Asset1.id] });
 
       expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('Not found or no album.removeAsset access'));
+      expect(body).toEqual(errorDto.badRequest('Not found or no albumAsset.delete access'));
     });
 
     it('should remove duplicate assets only once', async () => {
diff --git a/mobile/openapi/lib/model/permission.dart b/mobile/openapi/lib/model/permission.dart
index a85b5002bf..ec67d81be4 100644
--- a/mobile/openapi/lib/model/permission.dart
+++ b/mobile/openapi/lib/model/permission.dart
@@ -36,25 +36,35 @@ class Permission {
   static const assetPeriodRead = Permission._(r'asset.read');
   static const assetPeriodUpdate = Permission._(r'asset.update');
   static const assetPeriodDelete = Permission._(r'asset.delete');
+  static const assetPeriodStatistics = Permission._(r'asset.statistics');
   static const assetPeriodShare = Permission._(r'asset.share');
   static const assetPeriodView = Permission._(r'asset.view');
   static const assetPeriodDownload = Permission._(r'asset.download');
   static const assetPeriodUpload = Permission._(r'asset.upload');
+  static const assetPeriodReplace = Permission._(r'asset.replace');
   static const albumPeriodCreate = Permission._(r'album.create');
   static const albumPeriodRead = Permission._(r'album.read');
   static const albumPeriodUpdate = Permission._(r'album.update');
   static const albumPeriodDelete = Permission._(r'album.delete');
   static const albumPeriodStatistics = Permission._(r'album.statistics');
-  static const albumPeriodAddAsset = Permission._(r'album.addAsset');
-  static const albumPeriodRemoveAsset = Permission._(r'album.removeAsset');
   static const albumPeriodShare = Permission._(r'album.share');
   static const albumPeriodDownload = Permission._(r'album.download');
+  static const albumAssetPeriodCreate = Permission._(r'albumAsset.create');
+  static const albumAssetPeriodDelete = Permission._(r'albumAsset.delete');
+  static const albumUserPeriodCreate = Permission._(r'albumUser.create');
+  static const albumUserPeriodUpdate = Permission._(r'albumUser.update');
+  static const albumUserPeriodDelete = Permission._(r'albumUser.delete');
+  static const authPeriodChangePassword = Permission._(r'auth.changePassword');
   static const authDevicePeriodDelete = Permission._(r'authDevice.delete');
   static const archivePeriodRead = Permission._(r'archive.read');
+  static const duplicatePeriodRead = Permission._(r'duplicate.read');
+  static const duplicatePeriodDelete = Permission._(r'duplicate.delete');
   static const facePeriodCreate = Permission._(r'face.create');
   static const facePeriodRead = Permission._(r'face.read');
   static const facePeriodUpdate = Permission._(r'face.update');
   static const facePeriodDelete = Permission._(r'face.delete');
+  static const jobPeriodCreate = Permission._(r'job.create');
+  static const jobPeriodRead = Permission._(r'job.read');
   static const libraryPeriodCreate = Permission._(r'library.create');
   static const libraryPeriodRead = Permission._(r'library.read');
   static const libraryPeriodUpdate = Permission._(r'library.update');
@@ -66,6 +76,9 @@ class Permission {
   static const memoryPeriodRead = Permission._(r'memory.read');
   static const memoryPeriodUpdate = Permission._(r'memory.update');
   static const memoryPeriodDelete = Permission._(r'memory.delete');
+  static const memoryPeriodStatistics = Permission._(r'memory.statistics');
+  static const memoryAssetPeriodCreate = Permission._(r'memoryAsset.create');
+  static const memoryAssetPeriodDelete = Permission._(r'memoryAsset.delete');
   static const notificationPeriodCreate = Permission._(r'notification.create');
   static const notificationPeriodRead = Permission._(r'notification.read');
   static const notificationPeriodUpdate = Permission._(r'notification.update');
@@ -81,6 +94,16 @@ class Permission {
   static const personPeriodStatistics = Permission._(r'person.statistics');
   static const personPeriodMerge = Permission._(r'person.merge');
   static const personPeriodReassign = Permission._(r'person.reassign');
+  static const pinCodePeriodCreate = Permission._(r'pinCode.create');
+  static const pinCodePeriodUpdate = Permission._(r'pinCode.update');
+  static const pinCodePeriodDelete = Permission._(r'pinCode.delete');
+  static const serverPeriodAbout = Permission._(r'server.about');
+  static const serverPeriodApkLinks = Permission._(r'server.apkLinks');
+  static const serverPeriodStorage = Permission._(r'server.storage');
+  static const serverPeriodStatistics = Permission._(r'server.statistics');
+  static const serverLicensePeriodRead = Permission._(r'serverLicense.read');
+  static const serverLicensePeriodUpdate = Permission._(r'serverLicense.update');
+  static const serverLicensePeriodDelete = Permission._(r'serverLicense.delete');
   static const sessionPeriodCreate = Permission._(r'session.create');
   static const sessionPeriodRead = Permission._(r'session.read');
   static const sessionPeriodUpdate = Permission._(r'session.update');
@@ -94,6 +117,10 @@ class Permission {
   static const stackPeriodRead = Permission._(r'stack.read');
   static const stackPeriodUpdate = Permission._(r'stack.update');
   static const stackPeriodDelete = Permission._(r'stack.delete');
+  static const syncPeriodStream = Permission._(r'sync.stream');
+  static const syncCheckpointPeriodRead = Permission._(r'syncCheckpoint.read');
+  static const syncCheckpointPeriodUpdate = Permission._(r'syncCheckpoint.update');
+  static const syncCheckpointPeriodDelete = Permission._(r'syncCheckpoint.delete');
   static const systemConfigPeriodRead = Permission._(r'systemConfig.read');
   static const systemConfigPeriodUpdate = Permission._(r'systemConfig.update');
   static const systemMetadataPeriodRead = Permission._(r'systemMetadata.read');
@@ -103,10 +130,25 @@ class Permission {
   static const tagPeriodUpdate = Permission._(r'tag.update');
   static const tagPeriodDelete = Permission._(r'tag.delete');
   static const tagPeriodAsset = Permission._(r'tag.asset');
-  static const adminPeriodUserPeriodCreate = Permission._(r'admin.user.create');
-  static const adminPeriodUserPeriodRead = Permission._(r'admin.user.read');
-  static const adminPeriodUserPeriodUpdate = Permission._(r'admin.user.update');
-  static const adminPeriodUserPeriodDelete = Permission._(r'admin.user.delete');
+  static const userPeriodRead = Permission._(r'user.read');
+  static const userPeriodUpdate = Permission._(r'user.update');
+  static const userLicensePeriodCreate = Permission._(r'userLicense.create');
+  static const userLicensePeriodRead = Permission._(r'userLicense.read');
+  static const userLicensePeriodUpdate = Permission._(r'userLicense.update');
+  static const userLicensePeriodDelete = Permission._(r'userLicense.delete');
+  static const userOnboardingPeriodRead = Permission._(r'userOnboarding.read');
+  static const userOnboardingPeriodUpdate = Permission._(r'userOnboarding.update');
+  static const userOnboardingPeriodDelete = Permission._(r'userOnboarding.delete');
+  static const userPreferencePeriodRead = Permission._(r'userPreference.read');
+  static const userPreferencePeriodUpdate = Permission._(r'userPreference.update');
+  static const userProfileImagePeriodCreate = Permission._(r'userProfileImage.create');
+  static const userProfileImagePeriodRead = Permission._(r'userProfileImage.read');
+  static const userProfileImagePeriodUpdate = Permission._(r'userProfileImage.update');
+  static const userProfileImagePeriodDelete = Permission._(r'userProfileImage.delete');
+  static const adminUserPeriodCreate = Permission._(r'adminUser.create');
+  static const adminUserPeriodRead = Permission._(r'adminUser.read');
+  static const adminUserPeriodUpdate = Permission._(r'adminUser.update');
+  static const adminUserPeriodDelete = Permission._(r'adminUser.delete');
 
   /// List of all possible values in this [enum][Permission].
   static const values = <Permission>[
@@ -123,25 +165,35 @@ class Permission {
     assetPeriodRead,
     assetPeriodUpdate,
     assetPeriodDelete,
+    assetPeriodStatistics,
     assetPeriodShare,
     assetPeriodView,
     assetPeriodDownload,
     assetPeriodUpload,
+    assetPeriodReplace,
     albumPeriodCreate,
     albumPeriodRead,
     albumPeriodUpdate,
     albumPeriodDelete,
     albumPeriodStatistics,
-    albumPeriodAddAsset,
-    albumPeriodRemoveAsset,
     albumPeriodShare,
     albumPeriodDownload,
+    albumAssetPeriodCreate,
+    albumAssetPeriodDelete,
+    albumUserPeriodCreate,
+    albumUserPeriodUpdate,
+    albumUserPeriodDelete,
+    authPeriodChangePassword,
     authDevicePeriodDelete,
     archivePeriodRead,
+    duplicatePeriodRead,
+    duplicatePeriodDelete,
     facePeriodCreate,
     facePeriodRead,
     facePeriodUpdate,
     facePeriodDelete,
+    jobPeriodCreate,
+    jobPeriodRead,
     libraryPeriodCreate,
     libraryPeriodRead,
     libraryPeriodUpdate,
@@ -153,6 +205,9 @@ class Permission {
     memoryPeriodRead,
     memoryPeriodUpdate,
     memoryPeriodDelete,
+    memoryPeriodStatistics,
+    memoryAssetPeriodCreate,
+    memoryAssetPeriodDelete,
     notificationPeriodCreate,
     notificationPeriodRead,
     notificationPeriodUpdate,
@@ -168,6 +223,16 @@ class Permission {
     personPeriodStatistics,
     personPeriodMerge,
     personPeriodReassign,
+    pinCodePeriodCreate,
+    pinCodePeriodUpdate,
+    pinCodePeriodDelete,
+    serverPeriodAbout,
+    serverPeriodApkLinks,
+    serverPeriodStorage,
+    serverPeriodStatistics,
+    serverLicensePeriodRead,
+    serverLicensePeriodUpdate,
+    serverLicensePeriodDelete,
     sessionPeriodCreate,
     sessionPeriodRead,
     sessionPeriodUpdate,
@@ -181,6 +246,10 @@ class Permission {
     stackPeriodRead,
     stackPeriodUpdate,
     stackPeriodDelete,
+    syncPeriodStream,
+    syncCheckpointPeriodRead,
+    syncCheckpointPeriodUpdate,
+    syncCheckpointPeriodDelete,
     systemConfigPeriodRead,
     systemConfigPeriodUpdate,
     systemMetadataPeriodRead,
@@ -190,10 +259,25 @@ class Permission {
     tagPeriodUpdate,
     tagPeriodDelete,
     tagPeriodAsset,
-    adminPeriodUserPeriodCreate,
-    adminPeriodUserPeriodRead,
-    adminPeriodUserPeriodUpdate,
-    adminPeriodUserPeriodDelete,
+    userPeriodRead,
+    userPeriodUpdate,
+    userLicensePeriodCreate,
+    userLicensePeriodRead,
+    userLicensePeriodUpdate,
+    userLicensePeriodDelete,
+    userOnboardingPeriodRead,
+    userOnboardingPeriodUpdate,
+    userOnboardingPeriodDelete,
+    userPreferencePeriodRead,
+    userPreferencePeriodUpdate,
+    userProfileImagePeriodCreate,
+    userProfileImagePeriodRead,
+    userProfileImagePeriodUpdate,
+    userProfileImagePeriodDelete,
+    adminUserPeriodCreate,
+    adminUserPeriodRead,
+    adminUserPeriodUpdate,
+    adminUserPeriodDelete,
   ];
 
   static Permission? fromJson(dynamic value) => PermissionTypeTransformer().decode(value);
@@ -245,25 +329,35 @@ class PermissionTypeTransformer {
         case r'asset.read': return Permission.assetPeriodRead;
         case r'asset.update': return Permission.assetPeriodUpdate;
         case r'asset.delete': return Permission.assetPeriodDelete;
+        case r'asset.statistics': return Permission.assetPeriodStatistics;
         case r'asset.share': return Permission.assetPeriodShare;
         case r'asset.view': return Permission.assetPeriodView;
         case r'asset.download': return Permission.assetPeriodDownload;
         case r'asset.upload': return Permission.assetPeriodUpload;
+        case r'asset.replace': return Permission.assetPeriodReplace;
         case r'album.create': return Permission.albumPeriodCreate;
         case r'album.read': return Permission.albumPeriodRead;
         case r'album.update': return Permission.albumPeriodUpdate;
         case r'album.delete': return Permission.albumPeriodDelete;
         case r'album.statistics': return Permission.albumPeriodStatistics;
-        case r'album.addAsset': return Permission.albumPeriodAddAsset;
-        case r'album.removeAsset': return Permission.albumPeriodRemoveAsset;
         case r'album.share': return Permission.albumPeriodShare;
         case r'album.download': return Permission.albumPeriodDownload;
+        case r'albumAsset.create': return Permission.albumAssetPeriodCreate;
+        case r'albumAsset.delete': return Permission.albumAssetPeriodDelete;
+        case r'albumUser.create': return Permission.albumUserPeriodCreate;
+        case r'albumUser.update': return Permission.albumUserPeriodUpdate;
+        case r'albumUser.delete': return Permission.albumUserPeriodDelete;
+        case r'auth.changePassword': return Permission.authPeriodChangePassword;
         case r'authDevice.delete': return Permission.authDevicePeriodDelete;
         case r'archive.read': return Permission.archivePeriodRead;
+        case r'duplicate.read': return Permission.duplicatePeriodRead;
+        case r'duplicate.delete': return Permission.duplicatePeriodDelete;
         case r'face.create': return Permission.facePeriodCreate;
         case r'face.read': return Permission.facePeriodRead;
         case r'face.update': return Permission.facePeriodUpdate;
         case r'face.delete': return Permission.facePeriodDelete;
+        case r'job.create': return Permission.jobPeriodCreate;
+        case r'job.read': return Permission.jobPeriodRead;
         case r'library.create': return Permission.libraryPeriodCreate;
         case r'library.read': return Permission.libraryPeriodRead;
         case r'library.update': return Permission.libraryPeriodUpdate;
@@ -275,6 +369,9 @@ class PermissionTypeTransformer {
         case r'memory.read': return Permission.memoryPeriodRead;
         case r'memory.update': return Permission.memoryPeriodUpdate;
         case r'memory.delete': return Permission.memoryPeriodDelete;
+        case r'memory.statistics': return Permission.memoryPeriodStatistics;
+        case r'memoryAsset.create': return Permission.memoryAssetPeriodCreate;
+        case r'memoryAsset.delete': return Permission.memoryAssetPeriodDelete;
         case r'notification.create': return Permission.notificationPeriodCreate;
         case r'notification.read': return Permission.notificationPeriodRead;
         case r'notification.update': return Permission.notificationPeriodUpdate;
@@ -290,6 +387,16 @@ class PermissionTypeTransformer {
         case r'person.statistics': return Permission.personPeriodStatistics;
         case r'person.merge': return Permission.personPeriodMerge;
         case r'person.reassign': return Permission.personPeriodReassign;
+        case r'pinCode.create': return Permission.pinCodePeriodCreate;
+        case r'pinCode.update': return Permission.pinCodePeriodUpdate;
+        case r'pinCode.delete': return Permission.pinCodePeriodDelete;
+        case r'server.about': return Permission.serverPeriodAbout;
+        case r'server.apkLinks': return Permission.serverPeriodApkLinks;
+        case r'server.storage': return Permission.serverPeriodStorage;
+        case r'server.statistics': return Permission.serverPeriodStatistics;
+        case r'serverLicense.read': return Permission.serverLicensePeriodRead;
+        case r'serverLicense.update': return Permission.serverLicensePeriodUpdate;
+        case r'serverLicense.delete': return Permission.serverLicensePeriodDelete;
         case r'session.create': return Permission.sessionPeriodCreate;
         case r'session.read': return Permission.sessionPeriodRead;
         case r'session.update': return Permission.sessionPeriodUpdate;
@@ -303,6 +410,10 @@ class PermissionTypeTransformer {
         case r'stack.read': return Permission.stackPeriodRead;
         case r'stack.update': return Permission.stackPeriodUpdate;
         case r'stack.delete': return Permission.stackPeriodDelete;
+        case r'sync.stream': return Permission.syncPeriodStream;
+        case r'syncCheckpoint.read': return Permission.syncCheckpointPeriodRead;
+        case r'syncCheckpoint.update': return Permission.syncCheckpointPeriodUpdate;
+        case r'syncCheckpoint.delete': return Permission.syncCheckpointPeriodDelete;
         case r'systemConfig.read': return Permission.systemConfigPeriodRead;
         case r'systemConfig.update': return Permission.systemConfigPeriodUpdate;
         case r'systemMetadata.read': return Permission.systemMetadataPeriodRead;
@@ -312,10 +423,25 @@ class PermissionTypeTransformer {
         case r'tag.update': return Permission.tagPeriodUpdate;
         case r'tag.delete': return Permission.tagPeriodDelete;
         case r'tag.asset': return Permission.tagPeriodAsset;
-        case r'admin.user.create': return Permission.adminPeriodUserPeriodCreate;
-        case r'admin.user.read': return Permission.adminPeriodUserPeriodRead;
-        case r'admin.user.update': return Permission.adminPeriodUserPeriodUpdate;
-        case r'admin.user.delete': return Permission.adminPeriodUserPeriodDelete;
+        case r'user.read': return Permission.userPeriodRead;
+        case r'user.update': return Permission.userPeriodUpdate;
+        case r'userLicense.create': return Permission.userLicensePeriodCreate;
+        case r'userLicense.read': return Permission.userLicensePeriodRead;
+        case r'userLicense.update': return Permission.userLicensePeriodUpdate;
+        case r'userLicense.delete': return Permission.userLicensePeriodDelete;
+        case r'userOnboarding.read': return Permission.userOnboardingPeriodRead;
+        case r'userOnboarding.update': return Permission.userOnboardingPeriodUpdate;
+        case r'userOnboarding.delete': return Permission.userOnboardingPeriodDelete;
+        case r'userPreference.read': return Permission.userPreferencePeriodRead;
+        case r'userPreference.update': return Permission.userPreferencePeriodUpdate;
+        case r'userProfileImage.create': return Permission.userProfileImagePeriodCreate;
+        case r'userProfileImage.read': return Permission.userProfileImagePeriodRead;
+        case r'userProfileImage.update': return Permission.userProfileImagePeriodUpdate;
+        case r'userProfileImage.delete': return Permission.userProfileImagePeriodDelete;
+        case r'adminUser.create': return Permission.adminUserPeriodCreate;
+        case r'adminUser.read': return Permission.adminUserPeriodRead;
+        case r'adminUser.update': return Permission.adminUserPeriodUpdate;
+        case r'adminUser.delete': return Permission.adminUserPeriodDelete;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 35f84ec25a..576592413d 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -11760,25 +11760,35 @@
           "asset.read",
           "asset.update",
           "asset.delete",
+          "asset.statistics",
           "asset.share",
           "asset.view",
           "asset.download",
           "asset.upload",
+          "asset.replace",
           "album.create",
           "album.read",
           "album.update",
           "album.delete",
           "album.statistics",
-          "album.addAsset",
-          "album.removeAsset",
           "album.share",
           "album.download",
+          "albumAsset.create",
+          "albumAsset.delete",
+          "albumUser.create",
+          "albumUser.update",
+          "albumUser.delete",
+          "auth.changePassword",
           "authDevice.delete",
           "archive.read",
+          "duplicate.read",
+          "duplicate.delete",
           "face.create",
           "face.read",
           "face.update",
           "face.delete",
+          "job.create",
+          "job.read",
           "library.create",
           "library.read",
           "library.update",
@@ -11790,6 +11800,9 @@
           "memory.read",
           "memory.update",
           "memory.delete",
+          "memory.statistics",
+          "memoryAsset.create",
+          "memoryAsset.delete",
           "notification.create",
           "notification.read",
           "notification.update",
@@ -11805,6 +11818,16 @@
           "person.statistics",
           "person.merge",
           "person.reassign",
+          "pinCode.create",
+          "pinCode.update",
+          "pinCode.delete",
+          "server.about",
+          "server.apkLinks",
+          "server.storage",
+          "server.statistics",
+          "serverLicense.read",
+          "serverLicense.update",
+          "serverLicense.delete",
           "session.create",
           "session.read",
           "session.update",
@@ -11818,6 +11841,10 @@
           "stack.read",
           "stack.update",
           "stack.delete",
+          "sync.stream",
+          "syncCheckpoint.read",
+          "syncCheckpoint.update",
+          "syncCheckpoint.delete",
           "systemConfig.read",
           "systemConfig.update",
           "systemMetadata.read",
@@ -11827,10 +11854,25 @@
           "tag.update",
           "tag.delete",
           "tag.asset",
-          "admin.user.create",
-          "admin.user.read",
-          "admin.user.update",
-          "admin.user.delete"
+          "user.read",
+          "user.update",
+          "userLicense.create",
+          "userLicense.read",
+          "userLicense.update",
+          "userLicense.delete",
+          "userOnboarding.read",
+          "userOnboarding.update",
+          "userOnboarding.delete",
+          "userPreference.read",
+          "userPreference.update",
+          "userProfileImage.create",
+          "userProfileImage.read",
+          "userProfileImage.update",
+          "userProfileImage.delete",
+          "adminUser.create",
+          "adminUser.read",
+          "adminUser.update",
+          "adminUser.delete"
         ],
         "type": "string"
       },
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 2918e00dd7..7c030d43c2 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -3947,25 +3947,35 @@ export enum Permission {
     AssetRead = "asset.read",
     AssetUpdate = "asset.update",
     AssetDelete = "asset.delete",
+    AssetStatistics = "asset.statistics",
     AssetShare = "asset.share",
     AssetView = "asset.view",
     AssetDownload = "asset.download",
     AssetUpload = "asset.upload",
+    AssetReplace = "asset.replace",
     AlbumCreate = "album.create",
     AlbumRead = "album.read",
     AlbumUpdate = "album.update",
     AlbumDelete = "album.delete",
     AlbumStatistics = "album.statistics",
-    AlbumAddAsset = "album.addAsset",
-    AlbumRemoveAsset = "album.removeAsset",
     AlbumShare = "album.share",
     AlbumDownload = "album.download",
+    AlbumAssetCreate = "albumAsset.create",
+    AlbumAssetDelete = "albumAsset.delete",
+    AlbumUserCreate = "albumUser.create",
+    AlbumUserUpdate = "albumUser.update",
+    AlbumUserDelete = "albumUser.delete",
+    AuthChangePassword = "auth.changePassword",
     AuthDeviceDelete = "authDevice.delete",
     ArchiveRead = "archive.read",
+    DuplicateRead = "duplicate.read",
+    DuplicateDelete = "duplicate.delete",
     FaceCreate = "face.create",
     FaceRead = "face.read",
     FaceUpdate = "face.update",
     FaceDelete = "face.delete",
+    JobCreate = "job.create",
+    JobRead = "job.read",
     LibraryCreate = "library.create",
     LibraryRead = "library.read",
     LibraryUpdate = "library.update",
@@ -3977,6 +3987,9 @@ export enum Permission {
     MemoryRead = "memory.read",
     MemoryUpdate = "memory.update",
     MemoryDelete = "memory.delete",
+    MemoryStatistics = "memory.statistics",
+    MemoryAssetCreate = "memoryAsset.create",
+    MemoryAssetDelete = "memoryAsset.delete",
     NotificationCreate = "notification.create",
     NotificationRead = "notification.read",
     NotificationUpdate = "notification.update",
@@ -3992,6 +4005,16 @@ export enum Permission {
     PersonStatistics = "person.statistics",
     PersonMerge = "person.merge",
     PersonReassign = "person.reassign",
+    PinCodeCreate = "pinCode.create",
+    PinCodeUpdate = "pinCode.update",
+    PinCodeDelete = "pinCode.delete",
+    ServerAbout = "server.about",
+    ServerApkLinks = "server.apkLinks",
+    ServerStorage = "server.storage",
+    ServerStatistics = "server.statistics",
+    ServerLicenseRead = "serverLicense.read",
+    ServerLicenseUpdate = "serverLicense.update",
+    ServerLicenseDelete = "serverLicense.delete",
     SessionCreate = "session.create",
     SessionRead = "session.read",
     SessionUpdate = "session.update",
@@ -4005,6 +4028,10 @@ export enum Permission {
     StackRead = "stack.read",
     StackUpdate = "stack.update",
     StackDelete = "stack.delete",
+    SyncStream = "sync.stream",
+    SyncCheckpointRead = "syncCheckpoint.read",
+    SyncCheckpointUpdate = "syncCheckpoint.update",
+    SyncCheckpointDelete = "syncCheckpoint.delete",
     SystemConfigRead = "systemConfig.read",
     SystemConfigUpdate = "systemConfig.update",
     SystemMetadataRead = "systemMetadata.read",
@@ -4014,10 +4041,25 @@ export enum Permission {
     TagUpdate = "tag.update",
     TagDelete = "tag.delete",
     TagAsset = "tag.asset",
-    AdminUserCreate = "admin.user.create",
-    AdminUserRead = "admin.user.read",
-    AdminUserUpdate = "admin.user.update",
-    AdminUserDelete = "admin.user.delete"
+    UserRead = "user.read",
+    UserUpdate = "user.update",
+    UserLicenseCreate = "userLicense.create",
+    UserLicenseRead = "userLicense.read",
+    UserLicenseUpdate = "userLicense.update",
+    UserLicenseDelete = "userLicense.delete",
+    UserOnboardingRead = "userOnboarding.read",
+    UserOnboardingUpdate = "userOnboarding.update",
+    UserOnboardingDelete = "userOnboarding.delete",
+    UserPreferenceRead = "userPreference.read",
+    UserPreferenceUpdate = "userPreference.update",
+    UserProfileImageCreate = "userProfileImage.create",
+    UserProfileImageRead = "userProfileImage.read",
+    UserProfileImageUpdate = "userProfileImage.update",
+    UserProfileImageDelete = "userProfileImage.delete",
+    AdminUserCreate = "adminUser.create",
+    AdminUserRead = "adminUser.read",
+    AdminUserUpdate = "adminUser.update",
+    AdminUserDelete = "adminUser.delete"
 }
 export enum AssetMediaStatus {
     Created = "created",
diff --git a/server/src/controllers/album.controller.ts b/server/src/controllers/album.controller.ts
index 2e6d1e7e43..36c5e0b13b 100644
--- a/server/src/controllers/album.controller.ts
+++ b/server/src/controllers/album.controller.ts
@@ -67,7 +67,7 @@ export class AlbumController {
   }
 
   @Put(':id/assets')
-  @Authenticated({ sharedLink: true })
+  @Authenticated({ permission: Permission.AlbumAssetCreate, sharedLink: true })
   addAssetsToAlbum(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -77,7 +77,7 @@ export class AlbumController {
   }
 
   @Delete(':id/assets')
-  @Authenticated()
+  @Authenticated({ permission: Permission.AlbumAssetDelete })
   removeAssetFromAlbum(
     @Auth() auth: AuthDto,
     @Body() dto: BulkIdsDto,
@@ -87,7 +87,7 @@ export class AlbumController {
   }
 
   @Put(':id/users')
-  @Authenticated()
+  @Authenticated({ permission: Permission.AlbumUserCreate })
   addUsersToAlbum(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -97,7 +97,7 @@ export class AlbumController {
   }
 
   @Put(':id/user/:userId')
-  @Authenticated()
+  @Authenticated({ permission: Permission.AlbumUserUpdate })
   updateAlbumUser(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -108,7 +108,7 @@ export class AlbumController {
   }
 
   @Delete(':id/user/:userId')
-  @Authenticated()
+  @Authenticated({ permission: Permission.AlbumUserDelete })
   removeUserFromAlbum(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
diff --git a/server/src/controllers/asset-media.controller.ts b/server/src/controllers/asset-media.controller.ts
index ea6c9602c8..8e83b77fb0 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, RouteKey } from 'src/enum';
+import { 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';
@@ -61,7 +61,7 @@ export class AssetMediaController {
     required: false,
   })
   @ApiBody({ description: 'Asset Upload Information', type: AssetMediaCreateDto })
-  @Authenticated({ sharedLink: true })
+  @Authenticated({ permission: Permission.AssetUpload, sharedLink: true })
   async uploadAsset(
     @Auth() auth: AuthDto,
     @UploadedFiles(new ParseFilePipe({ validators: [new FileNotEmptyValidator(['assetData'])] })) files: UploadFiles,
@@ -80,7 +80,7 @@ export class AssetMediaController {
 
   @Get(':id/original')
   @FileResponse()
-  @Authenticated({ sharedLink: true })
+  @Authenticated({ permission: Permission.AssetDownload, sharedLink: true })
   async downloadAsset(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -101,7 +101,7 @@ export class AssetMediaController {
     summary: 'replaceAsset',
     description: 'Replace the asset with new file, without changing its id',
   })
-  @Authenticated({ sharedLink: true })
+  @Authenticated({ permission: Permission.AssetReplace, sharedLink: true })
   async replaceAsset(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -120,7 +120,7 @@ export class AssetMediaController {
 
   @Get(':id/thumbnail')
   @FileResponse()
-  @Authenticated({ sharedLink: true })
+  @Authenticated({ permission: Permission.AssetView, sharedLink: true })
   async viewAsset(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -157,7 +157,7 @@ export class AssetMediaController {
 
   @Get(':id/video/playback')
   @FileResponse()
-  @Authenticated({ sharedLink: true })
+  @Authenticated({ permission: Permission.AssetView, sharedLink: true })
   async playAssetVideo(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
diff --git a/server/src/controllers/asset.controller.ts b/server/src/controllers/asset.controller.ts
index bb17daddf3..d23785a5ff 100644
--- a/server/src/controllers/asset.controller.ts
+++ b/server/src/controllers/asset.controller.ts
@@ -13,7 +13,7 @@ import {
   UpdateAssetDto,
 } from 'src/dtos/asset.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { RouteKey } from 'src/enum';
+import { 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';
@@ -24,7 +24,7 @@ export class AssetController {
   constructor(private service: AssetService) {}
 
   @Get('random')
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetRead })
   @EndpointLifecycle({ deprecatedAt: 'v1.116.0' })
   getRandom(@Auth() auth: AuthDto, @Query() dto: RandomAssetsDto): Promise<AssetResponseDto[]> {
     return this.service.getRandom(auth, dto.count ?? 1);
@@ -44,7 +44,7 @@ export class AssetController {
   }
 
   @Get('statistics')
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetStatistics })
   getAssetStatistics(@Auth() auth: AuthDto, @Query() dto: AssetStatsDto): Promise<AssetStatsResponseDto> {
     return this.service.getStatistics(auth, dto);
   }
@@ -58,26 +58,26 @@ export class AssetController {
 
   @Put()
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetUpdate })
   updateAssets(@Auth() auth: AuthDto, @Body() dto: AssetBulkUpdateDto): Promise<void> {
     return this.service.updateAll(auth, dto);
   }
 
   @Delete()
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetDelete })
   deleteAssets(@Auth() auth: AuthDto, @Body() dto: AssetBulkDeleteDto): Promise<void> {
     return this.service.deleteAll(auth, dto);
   }
 
   @Get(':id')
-  @Authenticated({ sharedLink: true })
+  @Authenticated({ permission: Permission.AssetRead, sharedLink: true })
   getAssetInfo(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<AssetResponseDto> {
     return this.service.get(auth, id) as Promise<AssetResponseDto>;
   }
 
   @Put(':id')
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetUpdate })
   updateAsset(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
diff --git a/server/src/controllers/auth.controller.ts b/server/src/controllers/auth.controller.ts
index 9bc5fd0fbb..30b0d662f2 100644
--- a/server/src/controllers/auth.controller.ts
+++ b/server/src/controllers/auth.controller.ts
@@ -16,7 +16,7 @@ import {
   ValidateAccessTokenResponseDto,
 } from 'src/dtos/auth.dto';
 import { UserAdminResponseDto } from 'src/dtos/user.dto';
-import { AuthType, ImmichCookie } from 'src/enum';
+import { 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';
@@ -57,7 +57,7 @@ export class AuthController {
 
   @Post('change-password')
   @HttpCode(HttpStatus.OK)
-  @Authenticated()
+  @Authenticated({ permission: Permission.AuthChangePassword })
   changePassword(@Auth() auth: AuthDto, @Body() dto: ChangePasswordDto): Promise<UserAdminResponseDto> {
     return this.service.changePassword(auth, dto);
   }
@@ -87,19 +87,19 @@ export class AuthController {
   }
 
   @Post('pin-code')
-  @Authenticated()
+  @Authenticated({ permission: Permission.PinCodeCreate })
   setupPinCode(@Auth() auth: AuthDto, @Body() dto: PinCodeSetupDto): Promise<void> {
     return this.service.setupPinCode(auth, dto);
   }
 
   @Put('pin-code')
-  @Authenticated()
+  @Authenticated({ permission: Permission.PinCodeUpdate })
   async changePinCode(@Auth() auth: AuthDto, @Body() dto: PinCodeChangeDto): Promise<void> {
     return this.service.changePinCode(auth, dto);
   }
 
   @Delete('pin-code')
-  @Authenticated()
+  @Authenticated({ permission: Permission.PinCodeDelete })
   async resetPinCode(@Auth() auth: AuthDto, @Body() dto: PinCodeResetDto): Promise<void> {
     return this.service.resetPinCode(auth, dto);
   }
diff --git a/server/src/controllers/download.controller.ts b/server/src/controllers/download.controller.ts
index 880e636dd1..4f5b18e585 100644
--- a/server/src/controllers/download.controller.ts
+++ b/server/src/controllers/download.controller.ts
@@ -3,6 +3,7 @@ import { 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 { Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';
 import { DownloadService } from 'src/services/download.service';
 import { asStreamableFile } from 'src/utils/file';
@@ -13,7 +14,7 @@ export class DownloadController {
   constructor(private service: DownloadService) {}
 
   @Post('info')
-  @Authenticated({ sharedLink: true })
+  @Authenticated({ permission: Permission.AssetDownload, sharedLink: true })
   getDownloadInfo(@Auth() auth: AuthDto, @Body() dto: DownloadInfoDto): Promise<DownloadResponseDto> {
     return this.service.getDownloadInfo(auth, dto);
   }
@@ -21,7 +22,7 @@ export class DownloadController {
   @Post('archive')
   @HttpCode(HttpStatus.OK)
   @FileResponse()
-  @Authenticated({ sharedLink: true })
+  @Authenticated({ permission: Permission.AssetDownload, sharedLink: true })
   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 f6b09e6e7a..da6fe4042d 100644
--- a/server/src/controllers/duplicate.controller.ts
+++ b/server/src/controllers/duplicate.controller.ts
@@ -3,6 +3,7 @@ import { 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 { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { DuplicateService } from 'src/services/duplicate.service';
 import { UUIDParamDto } from 'src/validation';
@@ -13,19 +14,19 @@ export class DuplicateController {
   constructor(private service: DuplicateService) {}
 
   @Get()
-  @Authenticated()
+  @Authenticated({ permission: Permission.DuplicateRead })
   getAssetDuplicates(@Auth() auth: AuthDto): Promise<DuplicateResponseDto[]> {
     return this.service.getDuplicates(auth);
   }
 
   @Delete()
-  @Authenticated()
+  @Authenticated({ permission: Permission.DuplicateDelete })
   deleteDuplicates(@Auth() auth: AuthDto, @Body() dto: BulkIdsDto): Promise<void> {
     return this.service.deleteAll(auth, dto);
   }
 
   @Delete(':id')
-  @Authenticated()
+  @Authenticated({ permission: Permission.DuplicateDelete })
   deleteDuplicate(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
diff --git a/server/src/controllers/job.controller.ts b/server/src/controllers/job.controller.ts
index 7da19e207f..e6b40e6810 100644
--- a/server/src/controllers/job.controller.ts
+++ b/server/src/controllers/job.controller.ts
@@ -1,6 +1,7 @@
 import { Body, Controller, Get, Param, Post, Put } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { AllJobStatusResponseDto, JobCommandDto, JobCreateDto, JobIdParamDto, JobStatusDto } from 'src/dtos/job.dto';
+import { Permission } from 'src/enum';
 import { Authenticated } from 'src/middleware/auth.guard';
 import { JobService } from 'src/services/job.service';
 
@@ -10,19 +11,19 @@ export class JobController {
   constructor(private service: JobService) {}
 
   @Get()
-  @Authenticated({ admin: true })
+  @Authenticated({ permission: Permission.JobRead, admin: true })
   getAllJobsStatus(): Promise<AllJobStatusResponseDto> {
     return this.service.getAllJobsStatus();
   }
 
   @Post()
-  @Authenticated({ admin: true })
+  @Authenticated({ permission: Permission.JobCreate, admin: true })
   createJob(@Body() dto: JobCreateDto): Promise<void> {
     return this.service.create(dto);
   }
 
   @Put(':id')
-  @Authenticated({ admin: true })
+  @Authenticated({ permission: Permission.JobCreate, admin: true })
   sendJobCommand(@Param() { id }: JobIdParamDto, @Body() dto: JobCommandDto): Promise<JobStatusDto> {
     return this.service.handleCommand(id, dto);
   }
diff --git a/server/src/controllers/memory.controller.ts b/server/src/controllers/memory.controller.ts
index a5bbbd7411..786f2af8a4 100644
--- a/server/src/controllers/memory.controller.ts
+++ b/server/src/controllers/memory.controller.ts
@@ -32,7 +32,7 @@ export class MemoryController {
   }
 
   @Get('statistics')
-  @Authenticated({ permission: Permission.MemoryRead })
+  @Authenticated({ permission: Permission.MemoryStatistics })
   memoriesStatistics(@Auth() auth: AuthDto, @Query() dto: MemorySearchDto): Promise<MemoryStatisticsResponseDto> {
     return this.service.statistics(auth, dto);
   }
@@ -61,7 +61,7 @@ export class MemoryController {
   }
 
   @Put(':id/assets')
-  @Authenticated()
+  @Authenticated({ permission: Permission.MemoryAssetCreate })
   addMemoryAssets(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -72,7 +72,7 @@ export class MemoryController {
 
   @Delete(':id/assets')
   @HttpCode(HttpStatus.OK)
-  @Authenticated()
+  @Authenticated({ permission: Permission.MemoryAssetDelete })
   removeMemoryAssets(
     @Auth() auth: AuthDto,
     @Body() dto: BulkIdsDto,
diff --git a/server/src/controllers/search.controller.ts b/server/src/controllers/search.controller.ts
index 9bda1fcada..fefa916fe7 100644
--- a/server/src/controllers/search.controller.ts
+++ b/server/src/controllers/search.controller.ts
@@ -16,6 +16,7 @@ import {
   SmartSearchDto,
   StatisticsSearchDto,
 } from 'src/dtos/search.dto';
+import { Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { SearchService } from 'src/services/search.service';
 
@@ -26,58 +27,58 @@ export class SearchController {
 
   @Post('metadata')
   @HttpCode(HttpStatus.OK)
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetRead })
   searchAssets(@Auth() auth: AuthDto, @Body() dto: MetadataSearchDto): Promise<SearchResponseDto> {
     return this.service.searchMetadata(auth, dto);
   }
 
   @Post('statistics')
   @HttpCode(HttpStatus.OK)
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetStatistics })
   searchAssetStatistics(@Auth() auth: AuthDto, @Body() dto: StatisticsSearchDto): Promise<SearchStatisticsResponseDto> {
     return this.service.searchStatistics(auth, dto);
   }
 
   @Post('random')
   @HttpCode(HttpStatus.OK)
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetRead })
   searchRandom(@Auth() auth: AuthDto, @Body() dto: RandomSearchDto): Promise<AssetResponseDto[]> {
     return this.service.searchRandom(auth, dto);
   }
 
   @Post('smart')
   @HttpCode(HttpStatus.OK)
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetRead })
   searchSmart(@Auth() auth: AuthDto, @Body() dto: SmartSearchDto): Promise<SearchResponseDto> {
     return this.service.searchSmart(auth, dto);
   }
 
   @Get('explore')
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetRead })
   getExploreData(@Auth() auth: AuthDto): Promise<SearchExploreResponseDto[]> {
     return this.service.getExploreData(auth);
   }
 
   @Get('person')
-  @Authenticated()
+  @Authenticated({ permission: Permission.PersonRead })
   searchPerson(@Auth() auth: AuthDto, @Query() dto: SearchPeopleDto): Promise<PersonResponseDto[]> {
     return this.service.searchPerson(auth, dto);
   }
 
   @Get('places')
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetRead })
   searchPlaces(@Query() dto: SearchPlacesDto): Promise<PlacesResponseDto[]> {
     return this.service.searchPlaces(dto);
   }
 
   @Get('cities')
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetRead })
   getAssetsByCity(@Auth() auth: AuthDto): Promise<AssetResponseDto[]> {
     return this.service.getAssetsByCity(auth);
   }
 
   @Get('suggestions')
-  @Authenticated()
+  @Authenticated({ permission: Permission.AssetRead })
   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 3544fce2a0..9a1004c280 100644
--- a/server/src/controllers/server.controller.ts
+++ b/server/src/controllers/server.controller.ts
@@ -15,6 +15,7 @@ import {
   ServerVersionResponseDto,
 } from 'src/dtos/server.dto';
 import { VersionCheckStateResponseDto } from 'src/dtos/system-metadata.dto';
+import { 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';
@@ -30,19 +31,19 @@ export class ServerController {
   ) {}
 
   @Get('about')
-  @Authenticated()
+  @Authenticated({ permission: Permission.ServerAbout })
   getAboutInfo(): Promise<ServerAboutResponseDto> {
     return this.service.getAboutInfo();
   }
 
   @Get('apk-links')
-  @Authenticated()
+  @Authenticated({ permission: Permission.ServerApkLinks })
   getApkLinks(): ServerApkLinksDto {
     return this.service.getApkLinks();
   }
 
   @Get('storage')
-  @Authenticated()
+  @Authenticated({ permission: Permission.ServerStorage })
   getStorage(): Promise<ServerStorageResponseDto> {
     return this.service.getStorage();
   }
@@ -78,7 +79,7 @@ export class ServerController {
   }
 
   @Get('statistics')
-  @Authenticated({ admin: true })
+  @Authenticated({ permission: Permission.ServerStatistics, admin: true })
   getServerStatistics(): Promise<ServerStatsResponseDto> {
     return this.service.getStatistics();
   }
@@ -88,25 +89,25 @@ export class ServerController {
     return this.service.getSupportedMediaTypes();
   }
 
+  @Get('license')
+  @Authenticated({ permission: Permission.ServerLicenseRead, admin: true })
+  @ApiNotFoundResponse()
+  getServerLicense(): Promise<LicenseResponseDto> {
+    return this.service.getLicense();
+  }
+
   @Put('license')
-  @Authenticated({ admin: true })
+  @Authenticated({ permission: Permission.ServerLicenseUpdate, admin: true })
   setServerLicense(@Body() license: LicenseKeyDto): Promise<LicenseResponseDto> {
     return this.service.setLicense(license);
   }
 
   @Delete('license')
-  @Authenticated({ admin: true })
+  @Authenticated({ permission: Permission.ServerLicenseDelete, admin: true })
   deleteServerLicense(): Promise<void> {
     return this.service.deleteLicense();
   }
 
-  @Get('license')
-  @Authenticated({ admin: true })
-  @ApiNotFoundResponse()
-  getServerLicense(): Promise<LicenseResponseDto> {
-    return this.service.getLicense();
-  }
-
   @Get('version-check')
   @Authenticated()
   getVersionCheck(): Promise<VersionCheckStateResponseDto> {
diff --git a/server/src/controllers/sync.controller.ts b/server/src/controllers/sync.controller.ts
index 0945810be7..a7b2b21a54 100644
--- a/server/src/controllers/sync.controller.ts
+++ b/server/src/controllers/sync.controller.ts
@@ -12,6 +12,7 @@ import {
   SyncAckSetDto,
   SyncStreamDto,
 } from 'src/dtos/sync.dto';
+import { 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';
@@ -41,7 +42,7 @@ export class SyncController {
   @Post('stream')
   @Header('Content-Type', 'application/jsonlines+json')
   @HttpCode(HttpStatus.OK)
-  @Authenticated()
+  @Authenticated({ permission: Permission.SyncStream })
   async getSyncStream(@Auth() auth: AuthDto, @Res() res: Response, @Body() dto: SyncStreamDto) {
     try {
       await this.service.stream(auth, res, dto);
@@ -52,21 +53,21 @@ export class SyncController {
   }
 
   @Get('ack')
-  @Authenticated()
+  @Authenticated({ permission: Permission.SyncCheckpointRead })
   getSyncAck(@Auth() auth: AuthDto): Promise<SyncAckDto[]> {
     return this.service.getAcks(auth);
   }
 
   @Post('ack')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated()
+  @Authenticated({ permission: Permission.SyncCheckpointUpdate })
   sendSyncAck(@Auth() auth: AuthDto, @Body() dto: SyncAckSetDto) {
     return this.service.setAcks(auth, dto);
   }
 
   @Delete('ack')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated()
+  @Authenticated({ permission: Permission.SyncCheckpointDelete })
   deleteSyncAck(@Auth() auth: AuthDto, @Body() dto: SyncAckDeleteDto) {
     return this.service.deleteAcks(auth, dto);
   }
diff --git a/server/src/controllers/user.controller.ts b/server/src/controllers/user.controller.ts
index 76d2cf4c5a..1b91e1a848 100644
--- a/server/src/controllers/user.controller.ts
+++ b/server/src/controllers/user.controller.ts
@@ -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 { RouteKey } from 'src/enum';
+import { 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';
@@ -38,31 +38,31 @@ export class UserController {
   ) {}
 
   @Get()
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserRead })
   searchUsers(@Auth() auth: AuthDto): Promise<UserResponseDto[]> {
     return this.service.search(auth);
   }
 
   @Get('me')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserRead })
   getMyUser(@Auth() auth: AuthDto): Promise<UserAdminResponseDto> {
     return this.service.getMe(auth);
   }
 
   @Put('me')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserUpdate })
   updateMyUser(@Auth() auth: AuthDto, @Body() dto: UserUpdateMeDto): Promise<UserAdminResponseDto> {
     return this.service.updateMe(auth, dto);
   }
 
   @Get('me/preferences')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserPreferenceRead })
   getMyPreferences(@Auth() auth: AuthDto): Promise<UserPreferencesResponseDto> {
     return this.service.getMyPreferences(auth);
   }
 
   @Put('me/preferences')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserPreferenceUpdate })
   updateMyPreferences(
     @Auth() auth: AuthDto,
     @Body() dto: UserPreferencesUpdateDto,
@@ -71,43 +71,43 @@ export class UserController {
   }
 
   @Get('me/license')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserLicenseRead })
   getUserLicense(@Auth() auth: AuthDto): Promise<LicenseResponseDto> {
     return this.service.getLicense(auth);
   }
 
   @Put('me/license')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserLicenseUpdate })
   async setUserLicense(@Auth() auth: AuthDto, @Body() license: LicenseKeyDto): Promise<LicenseResponseDto> {
     return this.service.setLicense(auth, license);
   }
 
   @Delete('me/license')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserLicenseDelete })
   async deleteUserLicense(@Auth() auth: AuthDto): Promise<void> {
     await this.service.deleteLicense(auth);
   }
 
   @Get('me/onboarding')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserOnboardingRead })
   getUserOnboarding(@Auth() auth: AuthDto): Promise<OnboardingResponseDto> {
     return this.service.getOnboarding(auth);
   }
 
   @Put('me/onboarding')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserOnboardingUpdate })
   async setUserOnboarding(@Auth() auth: AuthDto, @Body() Onboarding: OnboardingDto): Promise<OnboardingResponseDto> {
     return this.service.setOnboarding(auth, Onboarding);
   }
 
   @Delete('me/onboarding')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserOnboardingDelete })
   async deleteUserOnboarding(@Auth() auth: AuthDto): Promise<void> {
     await this.service.deleteOnboarding(auth);
   }
 
   @Get(':id')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserRead })
   getUser(@Param() { id }: UUIDParamDto): Promise<UserResponseDto> {
     return this.service.get(id);
   }
@@ -116,7 +116,7 @@ export class UserController {
   @ApiConsumes('multipart/form-data')
   @ApiBody({ description: 'A new avatar for the user', type: CreateProfileImageDto })
   @Post('profile-image')
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserProfileImageUpdate })
   createProfileImage(
     @Auth() auth: AuthDto,
     @UploadedFile() fileInfo: Express.Multer.File,
@@ -126,14 +126,14 @@ export class UserController {
 
   @Delete('profile-image')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserProfileImageDelete })
   deleteProfileImage(@Auth() auth: AuthDto): Promise<void> {
     return this.service.deleteProfileImage(auth);
   }
 
   @Get(':id/profile-image')
   @FileResponse()
-  @Authenticated()
+  @Authenticated({ permission: Permission.UserProfileImageRead })
   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/enum.ts b/server/src/enum.ts
index 75a96dfe67..70e94ed43f 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -87,31 +87,45 @@ export enum Permission {
   AssetRead = 'asset.read',
   AssetUpdate = 'asset.update',
   AssetDelete = 'asset.delete',
+  AssetStatistics = 'asset.statistics',
   AssetShare = 'asset.share',
   AssetView = 'asset.view',
   AssetDownload = 'asset.download',
   AssetUpload = 'asset.upload',
+  AssetReplace = 'asset.replace',
 
   AlbumCreate = 'album.create',
   AlbumRead = 'album.read',
   AlbumUpdate = 'album.update',
   AlbumDelete = 'album.delete',
   AlbumStatistics = 'album.statistics',
-
-  AlbumAddAsset = 'album.addAsset',
-  AlbumRemoveAsset = 'album.removeAsset',
   AlbumShare = 'album.share',
   AlbumDownload = 'album.download',
 
+  AlbumAssetCreate = 'albumAsset.create',
+  AlbumAssetDelete = 'albumAsset.delete',
+
+  AlbumUserCreate = 'albumUser.create',
+  AlbumUserUpdate = 'albumUser.update',
+  AlbumUserDelete = 'albumUser.delete',
+
+  AuthChangePassword = 'auth.changePassword',
+
   AuthDeviceDelete = 'authDevice.delete',
 
   ArchiveRead = 'archive.read',
 
+  DuplicateRead = 'duplicate.read',
+  DuplicateDelete = 'duplicate.delete',
+
   FaceCreate = 'face.create',
   FaceRead = 'face.read',
   FaceUpdate = 'face.update',
   FaceDelete = 'face.delete',
 
+  JobCreate = 'job.create',
+  JobRead = 'job.read',
+
   LibraryCreate = 'library.create',
   LibraryRead = 'library.read',
   LibraryUpdate = 'library.update',
@@ -125,6 +139,10 @@ export enum Permission {
   MemoryRead = 'memory.read',
   MemoryUpdate = 'memory.update',
   MemoryDelete = 'memory.delete',
+  MemoryStatistics = 'memory.statistics',
+
+  MemoryAssetCreate = 'memoryAsset.create',
+  MemoryAssetDelete = 'memoryAsset.delete',
 
   NotificationCreate = 'notification.create',
   NotificationRead = 'notification.read',
@@ -144,6 +162,19 @@ export enum Permission {
   PersonMerge = 'person.merge',
   PersonReassign = 'person.reassign',
 
+  PinCodeCreate = 'pinCode.create',
+  PinCodeUpdate = 'pinCode.update',
+  PinCodeDelete = 'pinCode.delete',
+
+  ServerAbout = 'server.about',
+  ServerApkLinks = 'server.apkLinks',
+  ServerStorage = 'server.storage',
+  ServerStatistics = 'server.statistics',
+
+  ServerLicenseRead = 'serverLicense.read',
+  ServerLicenseUpdate = 'serverLicense.update',
+  ServerLicenseDelete = 'serverLicense.delete',
+
   SessionCreate = 'session.create',
   SessionRead = 'session.read',
   SessionUpdate = 'session.update',
@@ -160,6 +191,11 @@ export enum Permission {
   StackUpdate = 'stack.update',
   StackDelete = 'stack.delete',
 
+  SyncStream = 'sync.stream',
+  SyncCheckpointRead = 'syncCheckpoint.read',
+  SyncCheckpointUpdate = 'syncCheckpoint.update',
+  SyncCheckpointDelete = 'syncCheckpoint.delete',
+
   SystemConfigRead = 'systemConfig.read',
   SystemConfigUpdate = 'systemConfig.update',
 
@@ -172,10 +208,30 @@ export enum Permission {
   TagDelete = 'tag.delete',
   TagAsset = 'tag.asset',
 
-  AdminUserCreate = 'admin.user.create',
-  AdminUserRead = 'admin.user.read',
-  AdminUserUpdate = 'admin.user.update',
-  AdminUserDelete = 'admin.user.delete',
+  UserRead = 'user.read',
+  UserUpdate = 'user.update',
+
+  UserLicenseCreate = 'userLicense.create',
+  UserLicenseRead = 'userLicense.read',
+  UserLicenseUpdate = 'userLicense.update',
+  UserLicenseDelete = 'userLicense.delete',
+
+  UserOnboardingRead = 'userOnboarding.read',
+  UserOnboardingUpdate = 'userOnboarding.update',
+  UserOnboardingDelete = 'userOnboarding.delete',
+
+  UserPreferenceRead = 'userPreference.read',
+  UserPreferenceUpdate = 'userPreference.update',
+
+  UserProfileImageCreate = 'userProfileImage.create',
+  UserProfileImageRead = 'userProfileImage.read',
+  UserProfileImageUpdate = 'userProfileImage.update',
+  UserProfileImageDelete = 'userProfileImage.delete',
+
+  AdminUserCreate = 'adminUser.create',
+  AdminUserRead = 'adminUser.read',
+  AdminUserUpdate = 'adminUser.update',
+  AdminUserDelete = 'adminUser.delete',
 }
 
 export enum SharedLinkType {
diff --git a/server/src/schema/migrations/1753464178233-RenameApiKeyPermissions.ts b/server/src/schema/migrations/1753464178233-RenameApiKeyPermissions.ts
new file mode 100644
index 0000000000..0293a96607
--- /dev/null
+++ b/server/src/schema/migrations/1753464178233-RenameApiKeyPermissions.ts
@@ -0,0 +1,22 @@
+import { Kysely, sql } from 'kysely';
+
+const items = [
+  { oldName: 'album.addAsset', newName: 'albumAsset.create' },
+  { oldName: 'album.removeAsset', newName: 'albumAsset.delete' },
+  { oldName: 'admin.user.create', newName: 'adminUser.create' },
+  { oldName: 'admin.user.read', newName: 'adminUser.read' },
+  { oldName: 'admin.user.update', newName: 'adminUser.update' },
+  { oldName: 'admin.user.delete', newName: 'adminUser.delete' },
+];
+
+export async function up(db: Kysely<any>): Promise<void> {
+  for (const { oldName, newName } of items) {
+    await sql`UPDATE "api_key" SET "permissions" = array_replace("permissions", ${oldName}, ${newName})`.execute(db);
+  }
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  for (const { oldName, newName } of items) {
+    await sql`UPDATE "api_key" SET "permissions" = array_replace("permissions", ${newName}, ${oldName})`.execute(db);
+  }
+}
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index e4f2a44bfd..90aefa6d72 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -158,7 +158,7 @@ export class AlbumService extends BaseService {
 
   async addAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {
     const album = await this.findOrFail(id, { withAssets: false });
-    await this.requireAccess({ auth, permission: Permission.AlbumAddAsset, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AlbumAssetCreate, ids: [id] });
 
     const results = await addAssets(
       auth,
@@ -187,7 +187,7 @@ export class AlbumService extends BaseService {
   }
 
   async removeAssets(auth: AuthDto, id: string, dto: BulkIdsDto): Promise<BulkIdResponseDto[]> {
-    await this.requireAccess({ auth, permission: Permission.AlbumRemoveAsset, ids: [id] });
+    await this.requireAccess({ auth, permission: Permission.AlbumAssetDelete, ids: [id] });
 
     const album = await this.findOrFail(id, { withAssets: false });
     const results = await removeAssets(
diff --git a/server/src/utils/access.ts b/server/src/utils/access.ts
index 08ff81e840..8427da6f1b 100644
--- a/server/src/utils/access.ts
+++ b/server/src/utils/access.ts
@@ -92,7 +92,7 @@ const checkSharedLinkAccess = async (
       return sharedLink.allowDownload ? await access.album.checkSharedLinkAccess(sharedLinkId, ids) : new Set();
     }
 
-    case Permission.AlbumAddAsset: {
+    case Permission.AlbumAssetCreate: {
       return sharedLink.allowUpload ? await access.album.checkSharedLinkAccess(sharedLinkId, ids) : new Set();
     }
 
@@ -163,7 +163,7 @@ const checkOtherAccess = async (access: AccessRepository, request: OtherAccessRe
       return setUnion(isOwner, isShared);
     }
 
-    case Permission.AlbumAddAsset: {
+    case Permission.AlbumAssetCreate: {
       const isOwner = await access.album.checkOwnerAccess(auth.user.id, ids);
       const isShared = await access.album.checkSharedAlbumAccess(
         auth.user.id,
@@ -195,7 +195,7 @@ const checkOtherAccess = async (access: AccessRepository, request: OtherAccessRe
       return setUnion(isOwner, isShared);
     }
 
-    case Permission.AlbumRemoveAsset: {
+    case Permission.AlbumAssetDelete: {
       const isOwner = await access.album.checkOwnerAccess(auth.user.id, ids);
       const isShared = await access.album.checkSharedAlbumAccess(
         auth.user.id,

From c6b25ef1116333569be1e4769766bc5205a34376 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Fri, 25 Jul 2025 15:25:36 -0400
Subject: [PATCH 326/337] feat: automatically detect media location changes
 (#20256)

---
 .../mobile/container-compose-overrides.yml     |  5 +++--
 .../server/container-compose-overrides.yml     |  5 +++--
 docker/docker-compose.dev.yml                  |  5 +++--
 docker/docker-compose.prod.yml                 |  4 +++-
 e2e/docker-compose.yml                         |  1 +
 server/src/repositories/database.repository.ts |  9 +++++++++
 server/src/services/storage.service.spec.ts    |  4 ++++
 server/src/services/storage.service.ts         | 18 +++++++++++++++++-
 8 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/mobile/container-compose-overrides.yml b/.devcontainer/mobile/container-compose-overrides.yml
index 0543f42317..9fc7486fea 100644
--- a/.devcontainer/mobile/container-compose-overrides.yml
+++ b/.devcontainer/mobile/container-compose-overrides.yml
@@ -4,6 +4,7 @@ services:
       target: dev-container-mobile
     environment:
       - IMMICH_SERVER_URL=http://127.0.0.1:2283/
+      - IMMICH_MEDIA_LOCATION=/data
     volumes: !override # bind mount host to /workspaces/immich
       - ..:/workspaces/immich
       - cli_node_modules:/workspaces/immich/cli/node_modules
@@ -11,8 +12,8 @@ services:
       - open_api_node_modules:/workspaces/immich/open-api/typescript-sdk/node_modules
       - server_node_modules:/workspaces/immich/server/node_modules
       - web_node_modules:/workspaces/immich/web/node_modules
-      - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload
-      - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/upload
+      - ${UPLOAD_LOCATION}/photos:/data
+      - ${UPLOAD_LOCATION}/photos/upload:/data/upload
       - /etc/localtime:/etc/localtime:ro
 
   database:
diff --git a/.devcontainer/server/container-compose-overrides.yml b/.devcontainer/server/container-compose-overrides.yml
index 24ac9734b1..951d763b4b 100644
--- a/.devcontainer/server/container-compose-overrides.yml
+++ b/.devcontainer/server/container-compose-overrides.yml
@@ -6,6 +6,7 @@ services:
     hostname: immich-dev
     environment:
       - IMMICH_SERVER_URL=http://127.0.0.1:2283/
+      - IMMICH_MEDIA_LOCATION=/data
     volumes: !override
       - ..:/workspaces/immich
       - cli_node_modules:/workspaces/immich/cli/node_modules
@@ -13,8 +14,8 @@ services:
       - open_api_node_modules:/workspaces/immich/open-api/typescript-sdk/node_modules
       - server_node_modules:/workspaces/immich/server/node_modules
       - web_node_modules:/workspaces/immich/web/node_modules
-      - ${UPLOAD_LOCATION:-upload1-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/usr/src/app/upload
-      - ${UPLOAD_LOCATION:-upload2-devcontainer-volume}${UPLOAD_LOCATION:+/photos/upload}:/usr/src/app/upload/upload
+      - ${UPLOAD_LOCATION:-upload1-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/data
+      - ${UPLOAD_LOCATION:-upload2-devcontainer-volume}${UPLOAD_LOCATION:+/photos/upload}:/data/upload
       - /etc/localtime:/etc/localtime:ro
 
   immich-web:
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 32ff115102..6db9623b1a 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -29,13 +29,14 @@ services:
     volumes:
       - ../server:/usr/src/app/server
       - ../open-api:/usr/src/app/open-api
-      - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload
-      - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/upload/upload
+      - ${UPLOAD_LOCATION}/photos:/data
+      - ${UPLOAD_LOCATION}/photos/upload:/data/upload
       - /usr/src/app/server/node_modules
       - /etc/localtime:/etc/localtime:ro
     env_file:
       - .env
     environment:
+      IMMICH_MEDIA_LOCATION: /data
       IMMICH_REPOSITORY: immich-app/immich
       IMMICH_REPOSITORY_URL: https://github.com/immich-app/immich
       IMMICH_SOURCE_REF: local
diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
index a025ff4cc5..fdeb6ef7a8 100644
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -19,8 +19,10 @@ services:
     build:
       context: ../
       dockerfile: server/Dockerfile
+    environment:
+      - IMMICH_MEDIA_LOCATION=/data
     volumes:
-      - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload
+      - ${UPLOAD_LOCATION}/photos:/data
       - /etc/localtime:/etc/localtime:ro
     env_file:
       - .env
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index ccb21e4587..ed57f423bd 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -22,6 +22,7 @@ services:
       - IMMICH_ENV=testing
       - IMMICH_PORT=2285
       - IMMICH_IGNORE_MOUNT_CHECK_ERRORS=true
+      - IMMICH_MEDIA_LOCATION=/data
     volumes:
       - ./test-assets:/test-assets
     extra_hosts:
diff --git a/server/src/repositories/database.repository.ts b/server/src/repositories/database.repository.ts
index 1f83630cfa..f334896ce1 100644
--- a/server/src/repositories/database.repository.ts
+++ b/server/src/repositories/database.repository.ts
@@ -437,6 +437,15 @@ export class DatabaseRepository {
   }
 
   async migrateFilePaths(sourceFolder: string, targetFolder: string): Promise<void> {
+    // remove trailing slashes
+    if (sourceFolder.endsWith('/')) {
+      sourceFolder = sourceFolder.slice(0, -1);
+    }
+
+    if (targetFolder.endsWith('/')) {
+      targetFolder = targetFolder.slice(0, -1);
+    }
+
     // escaping regex special characters with a backslash
     const sourceRegex = '^' + sourceFolder.replaceAll(/[-[\]{}()*+?.,\\^$|#\s]/g, String.raw`\$&`);
     const source = sql.raw(`'${sourceRegex}'`);
diff --git a/server/src/services/storage.service.spec.ts b/server/src/services/storage.service.spec.ts
index 567b78ac09..0303c11649 100644
--- a/server/src/services/storage.service.spec.ts
+++ b/server/src/services/storage.service.spec.ts
@@ -19,6 +19,7 @@ describe(StorageService.name, () => {
   describe('onBootstrap', () => {
     it('should enable mount folder checking', async () => {
       mocks.systemMetadata.get.mockResolvedValue(null);
+      mocks.asset.getFileSamples.mockResolvedValue([]);
 
       await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
@@ -75,6 +76,7 @@ describe(StorageService.name, () => {
           upload: true,
         },
       });
+      mocks.asset.getFileSamples.mockResolvedValue([]);
 
       await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
@@ -128,6 +130,7 @@ describe(StorageService.name, () => {
       error.code = 'EEXIST';
       mocks.systemMetadata.get.mockResolvedValue({ mountChecks: {} });
       mocks.storage.createFile.mockRejectedValue(error);
+      mocks.asset.getFileSamples.mockResolvedValue([]);
 
       await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
@@ -149,6 +152,7 @@ describe(StorageService.name, () => {
           storage: { ignoreMountCheckErrors: true },
         }),
       );
+      mocks.asset.getFileSamples.mockResolvedValue([]);
       mocks.storage.overwriteFile.mockRejectedValue(
         new Error("ENOENT: no such file or directory, open '/app/.immich'"),
       );
diff --git a/server/src/services/storage.service.ts b/server/src/services/storage.service.ts
index 632e0c1385..6c99194abd 100644
--- a/server/src/services/storage.service.ts
+++ b/server/src/services/storage.service.ts
@@ -65,10 +65,26 @@ export class StorageService extends BaseService {
     await this.databaseRepository.withLock(DatabaseLock.MediaLocation, async () => {
       const current = APP_MEDIA_LOCATION;
       const savedValue = await this.systemMetadataRepository.get(SystemMetadataKey.MediaLocation);
-      const previous = savedValue?.location || '';
+      let previous = savedValue?.location || '';
 
       if (previous !== current) {
         this.logger.log(`Media location changed (from=${previous}, to=${current})`);
+
+        const samples = await this.assetRepository.getFileSamples();
+        if (samples.length > 0) {
+          const originalPath = samples[0].originalPath;
+          if (!previous) {
+            previous = originalPath.startsWith('upload/') ? 'upload' : '/usr/src/app/upload';
+          }
+
+          if (previous && originalPath.startsWith(previous)) {
+            this.logger.warn(
+              `Detected a change to IMMICH_MEDIA_LOCATION, performing an automatic migration of file paths from ${previous} to ${current}, this may take awhile`,
+            );
+            await this.databaseRepository.migrateFilePaths(previous, current);
+          }
+        }
+
         await this.systemMetadataRepository.set(SystemMetadataKey.MediaLocation, { location: current });
       }
     });

From cb344cb0145cbee078265491b1167cf0d2b7d2cd Mon Sep 17 00:00:00 2001
From: Alexandre Garnier <zigarn@users.noreply.github.com>
Date: Sat, 26 Jul 2025 01:07:59 +0200
Subject: [PATCH 327/337] fix(mobile): distinguish backup settings title from
 'backup_controller_page_backup' translation entry (#20237)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Different translation in some languages like in French ('Sauvegarde' for title, otherwise 'Sauvegardé')
---
 i18n/en.json                               | 1 +
 mobile/lib/pages/common/settings.page.dart | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/i18n/en.json b/i18n/en.json
index f75af26611..5969881299 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -511,6 +511,7 @@
   "back_close_deselect": "Back, close, or deselect",
   "background_location_permission": "Background location permission",
   "background_location_permission_content": "In order to switch networks when running in the background, Immich must *always* have precise location access so the app can read the Wi-Fi network's name",
+  "backup": "Backup",
   "backup_album_selection_page_albums_device": "Albums on device ({count})",
   "backup_album_selection_page_albums_tap": "Tap to include, double tap to exclude",
   "backup_album_selection_page_assets_scatter": "Assets can scatter across multiple albums. Thus, albums can be included or excluded during the backup process.",
diff --git a/mobile/lib/pages/common/settings.page.dart b/mobile/lib/pages/common/settings.page.dart
index f5c42c9321..d18a7a1133 100644
--- a/mobile/lib/pages/common/settings.page.dart
+++ b/mobile/lib/pages/common/settings.page.dart
@@ -34,7 +34,7 @@ enum SettingSection {
     "asset_viewer_settings_subtitle",
   ),
   backup(
-    'backup_controller_page_backup',
+    'backup',
     Icons.cloud_upload_outlined,
     "backup_setting_subtitle",
   ),

From f2141de5bb2ce784274ea9e2d2d64f96842e45e5 Mon Sep 17 00:00:00 2001
From: beposec <46341010+beposec@users.noreply.github.com>
Date: Sat, 26 Jul 2025 13:29:42 +0200
Subject: [PATCH 328/337] fix(mobile): Fix a typo in SyncStreamService Logging
 (#20283)

Fix typo in logging
---
 mobile/lib/domain/services/sync_stream.service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index ca8295fc8f..a985008251 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -25,7 +25,7 @@ class SyncStreamService {
   bool get isCancelled => _cancelChecker?.call() ?? false;
 
   Future<void> sync() {
-    _logger.info("Remote sync request for userr");
+    _logger.info("Remote sync request for user");
     DLog.log("Remote sync request for user");
     // Start the sync stream and handle events
     return _syncApiRepository.streamChanges(_handleEvents);

From f9847bee519192e98efedfc6c123d73b79dd14c9 Mon Sep 17 00:00:00 2001
From: Yaros <thedj.launchpadder.dmx512@gmail.com>
Date: Sat, 26 Jul 2025 13:30:57 +0200
Subject: [PATCH 329/337] fix(mobile): places search not working in beta
 version (#20284)

fix(mobile): places search not working
---
 .../presentation/pages/drift_place.page.dart  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/mobile/lib/presentation/pages/drift_place.page.dart b/mobile/lib/presentation/pages/drift_place.page.dart
index 3e0754f8b8..969bfc70fd 100644
--- a/mobile/lib/presentation/pages/drift_place.page.dart
+++ b/mobile/lib/presentation/pages/drift_place.page.dart
@@ -22,12 +22,17 @@ class DriftPlacePage extends StatelessWidget {
     final ValueNotifier<String?> search = ValueNotifier(null);
 
     return Scaffold(
-      body: CustomScrollView(
-        slivers: [
-          _PlaceSliverAppBar(search: search),
-          _Map(search: search, currentLocation: currentLocation),
-          _PlaceList(search: search),
-        ],
+      body: ValueListenableBuilder(
+        valueListenable: search,
+        builder: (context, searchValue, child) {
+          return CustomScrollView(
+            slivers: [
+              _PlaceSliverAppBar(search: search),
+              _Map(search: search, currentLocation: currentLocation),
+              _PlaceList(search: search),
+            ],
+          );
+        },
       ),
     );
   }
@@ -104,7 +109,9 @@ class _Map extends StatelessWidget {
               ),
             ),
           )
-        : const SizedBox.shrink();
+        : const SliverToBoxAdapter(
+            child: SizedBox.shrink(),
+          );
   }
 }
 

From d0576697c3b0492e01edc4807673ebeddbba40d4 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Sat, 26 Jul 2025 19:28:48 +0530
Subject: [PATCH 330/337] chore: upgrade flutter to 3.32.8 (#20287)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/.fvmrc                | 2 +-
 mobile/.vscode/settings.json | 2 +-
 mobile/pubspec.lock          | 2 +-
 mobile/pubspec.yaml          | 2 +-
 server/Dockerfile            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mobile/.fvmrc b/mobile/.fvmrc
index 7d2a608dfa..3ca65ffc7c 100644
--- a/mobile/.fvmrc
+++ b/mobile/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.32.6"
+  "flutter": "3.32.8"
 }
\ No newline at end of file
diff --git a/mobile/.vscode/settings.json b/mobile/.vscode/settings.json
index eac0003e4b..9a9fb67ce3 100644
--- a/mobile/.vscode/settings.json
+++ b/mobile/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.32.6",
+  "dart.flutterSdkPath": ".fvm/versions/3.32.8",
   "dart.lineLength": 120,
   "[dart]": {
     "editor.rulers": [120],
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index e4f4e83a17..20154649ea 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -2163,4 +2163,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.7.0 <4.0.0"
-  flutter: ">=3.32.6"
+  flutter: ">=3.32.8"
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 52b576054b..cfec68689d 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -6,7 +6,7 @@ version: 1.136.0+3000
 
 environment:
   sdk: '>=3.3.0 <4.0.0'
-  flutter: 3.32.6
+  flutter: 3.32.8
 
 isar_version: &isar_version 3.1.8
 
diff --git a/server/Dockerfile b/server/Dockerfile
index e082d0e69e..9110d46f7d 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -51,7 +51,7 @@ RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
 # Flutter SDK
 # https://flutter.dev/docs/development/tools/sdk/releases?tab=linux
 ENV FLUTTER_CHANNEL="stable"
-ENV FLUTTER_VERSION="3.32.6"
+ENV FLUTTER_VERSION="3.32.8"
 ENV FLUTTER_HOME=/flutter
 ENV PATH=${PATH}:${FLUTTER_HOME}/bin
 

From e85655d34c140fed888ad5e420938fb45a6edcfc Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Sat, 26 Jul 2025 19:29:26 +0530
Subject: [PATCH 331/337] fix: no hero animation after tab change (#20285)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 .../widgets/asset_viewer/asset_viewer.page.dart           | 8 ++++++--
 .../widgets/images/thumbnail_tile.widget.dart             | 6 ++++--
 .../widgets/timeline/fixed/segment.model.dart             | 7 ++++++-
 mobile/lib/routing/router.gr.dart                         | 8 +++++++-
 4 files changed, 23 insertions(+), 6 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 20cf59b2e7..8fbc28f072 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -34,11 +34,13 @@ import 'package:platform/platform.dart';
 class AssetViewerPage extends StatelessWidget {
   final int initialIndex;
   final TimelineService timelineService;
+  final int? heroOffset;
 
   const AssetViewerPage({
     super.key,
     required this.initialIndex,
     required this.timelineService,
+    this.heroOffset,
   });
 
   @override
@@ -47,7 +49,7 @@ class AssetViewerPage extends StatelessWidget {
     // since the Timeline and AssetViewer are on different routes / Widget subtrees.
     return ProviderScope(
       overrides: [timelineServiceProvider.overrideWithValue(timelineService)],
-      child: AssetViewer(initialIndex: initialIndex),
+      child: AssetViewer(initialIndex: initialIndex, heroOffset: heroOffset),
     );
   }
 }
@@ -55,11 +57,13 @@ class AssetViewerPage extends StatelessWidget {
 class AssetViewer extends ConsumerStatefulWidget {
   final int initialIndex;
   final Platform? platform;
+  final int? heroOffset;
 
   const AssetViewer({
     super.key,
     required this.initialIndex,
     this.platform,
+    this.heroOffset,
   });
 
   @override
@@ -108,7 +112,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       _onAssetChanged(widget.initialIndex);
     });
     reloadSubscription = EventStream.shared.listen(_onEvent);
-    heroOffset = TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
+    heroOffset = widget.heroOffset ?? TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
   }
 
   @override
diff --git a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
index 24a88c5d74..ce4e50cbd5 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -15,6 +15,7 @@ class ThumbnailTile extends ConsumerWidget {
     this.fit = BoxFit.cover,
     this.showStorageIndicator = true,
     this.lockSelection = false,
+    this.heroOffset,
     super.key,
   });
 
@@ -23,10 +24,11 @@ class ThumbnailTile extends ConsumerWidget {
   final BoxFit fit;
   final bool showStorageIndicator;
   final bool lockSelection;
+  final int? heroOffset;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final heroOffset = TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
+    final heroIndex = heroOffset ?? TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
 
     final assetContainerColor =
         context.isDarkTheme ? context.primaryColor.darken(amount: 0.4) : context.primaryColor.lighten(amount: 0.75);
@@ -67,7 +69,7 @@ class ThumbnailTile extends ConsumerWidget {
               children: [
                 Positioned.fill(
                   child: Hero(
-                    tag: '${asset.heroTag}_$heroOffset',
+                    tag: '${asset.heroTag}_$heroIndex',
                     child: Thumbnail(
                       asset: asset,
                       fit: fit,
diff --git a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
index ab1670f169..88d113dcde 100644
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -162,6 +162,7 @@ class _AssetTileWidget extends ConsumerWidget {
     WidgetRef ref,
     int assetIndex,
     BaseAsset asset,
+    int? heroOffset,
   ) async {
     final multiSelectState = ref.read(multiSelectProvider);
 
@@ -174,6 +175,7 @@ class _AssetTileWidget extends ConsumerWidget {
         AssetViewerRoute(
           initialIndex: assetIndex,
           timelineService: ref.read(timelineServiceProvider),
+          heroOffset: heroOffset,
         ),
       );
     }
@@ -205,6 +207,8 @@ class _AssetTileWidget extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final heroOffset = TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
+
     final lockSelection = _getLockSelectionStatus(ref);
     final showStorageIndicator = ref.watch(
       timelineArgsProvider.select((args) => args.showStorageIndicator),
@@ -212,12 +216,13 @@ class _AssetTileWidget extends ConsumerWidget {
 
     return RepaintBoundary(
       child: GestureDetector(
-        onTap: () => lockSelection ? null : _handleOnTap(context, ref, assetIndex, asset),
+        onTap: () => lockSelection ? null : _handleOnTap(context, ref, assetIndex, asset, heroOffset),
         onLongPress: () => lockSelection ? null : _handleOnLongPress(ref, asset),
         child: ThumbnailTile(
           asset,
           lockSelection: lockSelection,
           showStorageIndicator: showStorageIndicator,
+          heroOffset: heroOffset,
         ),
       ),
     );
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 1ca04c3a78..6b7e479cff 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -399,6 +399,7 @@ class AssetViewerRoute extends PageRouteInfo<AssetViewerRouteArgs> {
     Key? key,
     required int initialIndex,
     required TimelineService timelineService,
+    int? heroOffset,
     List<PageRouteInfo>? children,
   }) : super(
           AssetViewerRoute.name,
@@ -406,6 +407,7 @@ class AssetViewerRoute extends PageRouteInfo<AssetViewerRouteArgs> {
             key: key,
             initialIndex: initialIndex,
             timelineService: timelineService,
+            heroOffset: heroOffset,
           ),
           initialChildren: children,
         );
@@ -420,6 +422,7 @@ class AssetViewerRoute extends PageRouteInfo<AssetViewerRouteArgs> {
         key: args.key,
         initialIndex: args.initialIndex,
         timelineService: args.timelineService,
+        heroOffset: args.heroOffset,
       );
     },
   );
@@ -430,6 +433,7 @@ class AssetViewerRouteArgs {
     this.key,
     required this.initialIndex,
     required this.timelineService,
+    this.heroOffset,
   });
 
   final Key? key;
@@ -438,9 +442,11 @@ class AssetViewerRouteArgs {
 
   final TimelineService timelineService;
 
+  final int? heroOffset;
+
   @override
   String toString() {
-    return 'AssetViewerRouteArgs{key: $key, initialIndex: $initialIndex, timelineService: $timelineService}';
+    return 'AssetViewerRouteArgs{key: $key, initialIndex: $initialIndex, timelineService: $timelineService, heroOffset: $heroOffset}';
   }
 }
 

From 9bbad4599037d88f0931d20b4092b45b0b3d5e09 Mon Sep 17 00:00:00 2001
From: Alexandre Garnier <zigarn@users.noreply.github.com>
Date: Sat, 26 Jul 2025 16:00:35 +0200
Subject: [PATCH 332/337] fix(mobile): remove unused translation and pluralize
 existing one for map photos count (#20282)

---
 i18n/en.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 5969881299..8f34299a97 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1234,8 +1234,7 @@
   "manage_your_devices": "Manage your logged-in devices",
   "manage_your_oauth_connection": "Manage your OAuth connection",
   "map": "Map",
-  "map_assets_in_bound": "{count} photo",
-  "map_assets_in_bounds": "{count} photos",
+  "map_assets_in_bounds": "{count, plural, one {# photo} other {# photos}}",
   "map_cannot_get_user_location": "Cannot get user's location",
   "map_location_dialog_yes": "Yes",
   "map_location_picker_page_use_location": "Use this location",

From 07cb2fb04e0ecc0a0c7d5afebfa03f140f18c0d1 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 26 Jul 2025 09:02:26 -0500
Subject: [PATCH 333/337] fix: remainder backup count (#20270)

---
 .../lib/infrastructure/repositories/backup.repository.dart   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/infrastructure/repositories/backup.repository.dart b/mobile/lib/infrastructure/repositories/backup.repository.dart
index 394bbfa299..aaba90de5f 100644
--- a/mobile/lib/infrastructure/repositories/backup.repository.dart
+++ b/mobile/lib/infrastructure/repositories/backup.repository.dart
@@ -63,13 +63,14 @@ class DriftBackupRepository extends DriftDatabaseRepository {
         ),
         leftOuterJoin(
           _db.remoteAssetEntity,
-          _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
+          _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum) &
+              _db.remoteAssetEntity.ownerId.equals(userId),
           useColumns: false,
         ),
       ])
       ..where(
         _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
-            (_db.remoteAssetEntity.id.isNull() | _db.remoteAssetEntity.ownerId.equals(userId).not()) &
+            _db.remoteAssetEntity.id.isNull() &
             _db.localAlbumAssetEntity.assetId.isNotInQuery(_getExcludedSubquery()),
       );
 

From b14c76820887c0385d5ab8bede4aac90014773d0 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 26 Jul 2025 11:42:24 -0500
Subject: [PATCH 334/337] fix: share to app upload (#20271)

---
 .../share_intent_upload.provider.dart         | 54 ++++++++++++++++++-
 .../lib/repositories/upload.repository.dart   |  4 +-
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart b/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
index 16171146a1..97730b5935 100644
--- a/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
+++ b/mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart
@@ -3,11 +3,15 @@ import 'dart:io';
 import 'package:background_downloader/background_downloader.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/models/upload/share_intent_attachment.model.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/share_intent_service.dart';
 import 'package:immich_mobile/services/upload.service.dart';
+import 'package:path/path.dart';
 
 final shareIntentUploadProvider = StateNotifierProvider<ShareIntentUploadStateNotifier, List<ShareIntentAttachment>>(
   ((ref) => ShareIntentUploadStateNotifier(
@@ -101,7 +105,53 @@ class ShareIntentUploadStateNotifier extends StateNotifier<List<ShareIntentAttac
     ];
   }
 
-  Future<void> upload(File file) {
-    return _uploadService.buildUploadTask(file, group: kManualUploadGroup);
+  Future<void> upload(File file) async {
+    final task = await _buildUploadTask(
+      hash(file.path).toString(),
+      file,
+    );
+
+    _uploadService.enqueueTasks([task]);
+  }
+
+  Future<UploadTask> _buildUploadTask(
+    String id,
+    File file, {
+    Map<String, String>? fields,
+  }) async {
+    final serverEndpoint = Store.get(StoreKey.serverEndpoint);
+    final url = Uri.parse('$serverEndpoint/assets').toString();
+    final headers = ApiService.getRequestHeaders();
+    final deviceId = Store.get(StoreKey.deviceId);
+
+    final (baseDirectory, directory, filename) = await Task.split(filePath: file.path);
+    final stats = await file.stat();
+    final fileCreatedAt = stats.changed;
+    final fileModifiedAt = stats.modified;
+
+    final fieldsMap = {
+      'filename': filename,
+      'deviceAssetId': id,
+      'deviceId': deviceId,
+      'fileCreatedAt': fileCreatedAt.toUtc().toIso8601String(),
+      'fileModifiedAt': fileModifiedAt.toUtc().toIso8601String(),
+      'isFavorite': 'false',
+      'duration': '0',
+      if (fields != null) ...fields,
+    };
+
+    return UploadTask(
+      taskId: id,
+      httpRequestMethod: 'POST',
+      url: url,
+      headers: headers,
+      filename: filename,
+      fields: fieldsMap,
+      baseDirectory: baseDirectory,
+      directory: directory,
+      fileField: 'assetData',
+      group: kManualUploadGroup,
+      updates: Updates.statusAndProgress,
+    );
   }
 }
diff --git a/mobile/lib/repositories/upload.repository.dart b/mobile/lib/repositories/upload.repository.dart
index ec093c5297..1510eb208f 100644
--- a/mobile/lib/repositories/upload.repository.dart
+++ b/mobile/lib/repositories/upload.repository.dart
@@ -22,8 +22,8 @@ class UploadRepository {
     );
     FileDownloader().registerCallbacks(
       group: kManualUploadGroup,
-      taskStatusCallback: (_) => {},
-      taskProgressCallback: (_) => {},
+      taskStatusCallback: (update) => onUploadStatus?.call(update),
+      taskProgressCallback: (update) => onTaskProgress?.call(update),
     );
   }
 

From 3a5d82f7905f98b08f5b14b8630be54f9d3c1cb2 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 26 Jul 2025 13:51:18 -0500
Subject: [PATCH 335/337] chore: delete action button (#20261)

---
 i18n/en.json                                  |  5 +-
 .../delete_action_button.widget.dart          | 85 +++++++++++++++++++
 .../delete_local_action_button.widget.dart    |  6 ++
 ...delete_permanent_action_button.widget.dart |  7 +-
 .../delete_trash_action_button.widget.dart    |  5 ++
 .../trash_action_button.widget.dart           |  3 +
 .../asset_viewer/bottom_bar.widget.dart       | 12 ++-
 .../asset_viewer/bottom_sheet.widget.dart     |  2 +
 .../general_bottom_sheet.widget.dart          |  2 +
 .../infrastructure/action.provider.dart       | 20 ++++-
 mobile/lib/services/action.service.dart       | 24 +++++-
 11 files changed, 162 insertions(+), 9 deletions(-)
 create mode 100644 mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart

diff --git a/i18n/en.json b/i18n/en.json
index 8f34299a97..cfc8ffccee 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -744,7 +744,8 @@
   "default_locale": "Default Locale",
   "default_locale_description": "Format dates and numbers based on your browser locale",
   "delete": "Delete",
-  "delete_action_prompt": "{count} deleted permanently",
+  "delete_action_confirmation_message": "Are you sure you want to delete this asset? This action will move the asset to the server's trash and will prompt if you want to delete it locally",
+  "delete_action_prompt": "{count} deleted",
   "delete_album": "Delete album",
   "delete_api_key_prompt": "Are you sure you want to delete this API key?",
   "delete_dialog_alert": "These items will be permanently deleted from Immich and from your device",
@@ -762,6 +763,8 @@
   "delete_local_dialog_ok_backed_up_only": "Delete Backed Up Only",
   "delete_local_dialog_ok_force": "Delete Anyway",
   "delete_others": "Delete others",
+  "delete_permanently": "Delete permanently",
+  "delete_permanently_action_prompt": "{count} deleted permanently",
   "delete_shared_link": "Delete shared link",
   "delete_shared_link_dialog_title": "Delete Shared Link",
   "delete_tag": "Delete tag",
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
new file mode 100644
index 0000000000..f910a2a9e2
--- /dev/null
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart
@@ -0,0 +1,85 @@
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.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/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+/// This delete action has the following behavior:
+/// - Set the deletedAt information, put the asset in the trash in the server
+/// which will be permanently deleted after the number of days configure by the admin
+/// - Prompt to delete the asset locally
+class DeleteActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool showConfirmation;
+  const DeleteActionButton({super.key, required this.source, this.showConfirmation = false});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    if (showConfirmation) {
+      final confirm = await showDialog<bool>(
+        context: context,
+        builder: (context) => AlertDialog(
+          title: Text('delete'.t(context: context)),
+          content: Text('delete_action_confirmation_message'.t(context: context)),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(false),
+              child: Text('cancel'.t(context: context)),
+            ),
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(true),
+              child: Text(
+                'confirm'.t(context: context),
+                style: TextStyle(
+                  color: context.colorScheme.error,
+                ),
+              ),
+            ),
+          ],
+        ),
+      );
+      if (confirm != true) return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).trashRemoteAndDeleteLocal(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
+
+    final successMessage = 'delete_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 110.0,
+      iconData: Icons.delete_sweep_outlined,
+      label: "delete".t(context: context),
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
index af14befe61..7a9465dfb6 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart
@@ -10,6 +10,8 @@ import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
+/// This delete action has the following behavior:
+/// - Prompt to delete the asset locally
 class DeleteLocalActionButton extends ConsumerWidget {
   final ActionSource source;
 
@@ -27,6 +29,10 @@ class DeleteLocalActionButton extends ConsumerWidget {
       EventStream.shared.emit(const ViewerReloadAssetEvent());
     }
 
+    if (result.count == 0) {
+      return;
+    }
+
     final successMessage = 'delete_local_action_prompt'.t(
       context: context,
       args: {'count': result.count.toString()},
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
index 1f8710b07f..4979df904c 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart
@@ -10,6 +10,9 @@ import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
+/// This delete action has the following behavior:
+/// - Delete permanently on the server
+/// - Prompt to delete the asset locally
 class DeletePermanentActionButton extends ConsumerWidget {
   final ActionSource source;
 
@@ -27,7 +30,7 @@ class DeletePermanentActionButton extends ConsumerWidget {
       EventStream.shared.emit(const ViewerReloadAssetEvent());
     }
 
-    final successMessage = 'delete_action_prompt'.t(
+    final successMessage = 'delete_permanently_action_prompt'.t(
       context: context,
       args: {'count': result.count.toString()},
     );
@@ -47,7 +50,7 @@ class DeletePermanentActionButton extends ConsumerWidget {
     return BaseActionButton(
       maxWidth: 110.0,
       iconData: Icons.delete_forever,
-      label: "delete_dialog_title".t(context: context),
+      label: "delete_permanently".t(context: context),
       onPressed: () => _onTap(context, ref),
     );
   }
diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
index 6047eb90eb..dafbdbc78e 100644
--- a/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart
@@ -7,6 +7,11 @@ import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
+/// This delete action has the following behavior:
+/// - Delete permanently on the server
+/// - Prompt to delete the asset locally
+///
+/// This action is used when the asset is selected in multi-selection mode in the trash page
 class DeleteTrashActionButton extends ConsumerWidget {
   final ActionSource source;
 
diff --git a/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
index a6656e02a1..d26bdfad04 100644
--- a/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart
@@ -10,6 +10,9 @@ import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
+/// This delete action has the following behavior:
+/// - Set the deletedAt information, put the asset in the trash in the server
+/// which will be permanently deleted after the number of days configure by the admin
 class TrashActionButton extends ConsumerWidget {
   final ActionSource source;
 
diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
index 9ea2035930..8c04fd5a85 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
@@ -4,6 +4,8 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
@@ -39,6 +41,14 @@ class ViewerBottomBar extends ConsumerWidget {
       const ShareActionButton(source: ActionSource.viewer),
       if (asset.isLocalOnly) const UploadActionButton(source: ActionSource.viewer),
       if (asset.hasRemote && isOwner) const ArchiveActionButton(source: ActionSource.viewer),
+      asset.isLocalOnly
+          ? const DeleteLocalActionButton(
+              source: ActionSource.viewer,
+            )
+          : const DeleteActionButton(
+              source: ActionSource.viewer,
+              showConfirmation: true,
+            ),
     ];
 
     return IgnorePointer(
@@ -60,7 +70,7 @@ class ViewerBottomBar extends ConsumerWidget {
                     ),
                   ),
                   child: Container(
-                    height: context.padding.bottom + (asset.isVideo ? 160 : 80),
+                    height: context.padding.bottom + (asset.isVideo ? 160 : 90),
                     color: Colors.black.withAlpha(125),
                     padding: EdgeInsets.only(bottom: context.padding.bottom),
                     child: Column(
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 b6d24724b4..e24bb3d7c0 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -7,6 +7,7 @@ import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
@@ -56,6 +57,7 @@ class AssetDetailBottomSheet extends ConsumerWidget {
         isTrashEnable
             ? const TrashActionButton(source: ActionSource.viewer)
             : const DeletePermanentActionButton(source: ActionSource.viewer),
+        const DeleteActionButton(source: ActionSource.viewer),
         const MoveToLockFolderActionButton(
           source: ActionSource.viewer,
         ),
diff --git a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
index 12f03a0b25..d338cfa833 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -5,6 +5,7 @@ import 'package:immich_mobile/constants/enums.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/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
@@ -80,6 +81,7 @@ class GeneralBottomSheet extends ConsumerWidget {
               : const DeletePermanentActionButton(
                   source: ActionSource.timeline,
                 ),
+          const DeleteActionButton(source: ActionSource.timeline),
           if (multiselect.hasLocal || multiselect.hasMerged) ...[
             const DeleteLocalActionButton(source: ActionSource.timeline),
           ],
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dart
index 899bd7858b..26de1b4dba 100644
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -230,6 +230,22 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
+  Future<ActionResult> trashRemoteAndDeleteLocal(ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    final localIds = _getLocalIdsForSource(source);
+    try {
+      await _service.trashRemoteAndDeleteLocal(ids, localIds);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to delete assets', error, stack);
+      return ActionResult(
+        count: ids.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
+
   Future<ActionResult> deleteRemoteAndLocal(ActionSource source) async {
     final ids = _getOwnedRemoteIdsForSource(source);
     final localIds = _getLocalIdsForSource(source);
@@ -249,8 +265,8 @@ class ActionNotifier extends Notifier<void> {
   Future<ActionResult> deleteLocal(ActionSource source) async {
     final ids = _getLocalIdsForSource(source);
     try {
-      await _service.deleteLocal(ids);
-      return ActionResult(count: ids.length, success: true);
+      final deletedCount = await _service.deleteLocal(ids);
+      return ActionResult(count: deletedCount, success: true);
     } catch (error, stack) {
       _logger.severe('Failed to delete assets', error, stack);
       return ActionResult(
diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dart
index dde2b1cd54..4ed80d9f90 100644
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -132,6 +132,19 @@ class ActionService {
     await _remoteAssetRepository.restoreTrash(ids);
   }
 
+  Future<void> trashRemoteAndDeleteLocal(List<String> remoteIds, List<String> localIds) async {
+    await _assetApiRepository.delete(remoteIds, false);
+    await _remoteAssetRepository.trash(remoteIds);
+
+    if (localIds.isNotEmpty) {
+      final deletedIds = await _assetMediaRepository.deleteAll(localIds);
+
+      if (deletedIds.isNotEmpty) {
+        await _localAssetRepository.delete(deletedIds);
+      }
+    }
+  }
+
   Future<void> deleteRemoteAndLocal(
     List<String> remoteIds,
     List<String> localIds,
@@ -148,9 +161,14 @@ class ActionService {
     }
   }
 
-  Future<void> deleteLocal(List<String> localIds) async {
-    await _assetMediaRepository.deleteAll(localIds);
-    await _localAssetRepository.delete(localIds);
+  Future<int> deleteLocal(List<String> localIds) async {
+    final deletedIds = await _assetMediaRepository.deleteAll(localIds);
+    if (deletedIds.isNotEmpty) {
+      await _localAssetRepository.delete(deletedIds);
+      return deletedIds.length;
+    }
+
+    return 0;
   }
 
   Future<bool> editLocation(

From 7c36cbaf0f6351ac30425647be216ad573af89fc Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Sun, 27 Jul 2025 00:28:27 +0530
Subject: [PATCH 336/337] fix: error on navigating back from backup selection
 page (#20299)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/pages/backup/drift_backup_album_selection.page.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
index 047bd26a9e..3f12328a06 100644
--- a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
+++ b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
@@ -83,7 +83,6 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
         if (didPop && !_hasPopped) {
           _hasPopped = true;
 
-          super.initState();
           final currentUser = ref.read(currentUserProvider);
           if (currentUser == null) {
             return;

From ebd644eedd6e128b57c60b9fc57f2afb2086f73c Mon Sep 17 00:00:00 2001
From: Matthew Momjian <50788000+mmomjian@users.noreply.github.com>
Date: Sat, 26 Jul 2025 18:38:12 -0400
Subject: [PATCH 337/337] fix(docs): update SQL queries with schema changes
 (#20297)

* sql queries with table changes

* fix linting
---
 docs/docs/guides/database-queries.md | 70 ++++++++++++++--------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/docs/docs/guides/database-queries.md b/docs/docs/guides/database-queries.md
index 209f673993..3ef538b1a0 100644
--- a/docs/docs/guides/database-queries.md
+++ b/docs/docs/guides/database-queries.md
@@ -17,22 +17,22 @@ The `"originalFileName"` column is the name of the file at time of upload, inclu
 :::
 
 ```sql title="Find by original filename"
-SELECT * FROM "assets" WHERE "originalFileName" = 'PXL_20230903_232542848.jpg';
-SELECT * FROM "assets" WHERE "originalFileName" LIKE 'PXL_%'; -- all files starting with PXL_
-SELECT * FROM "assets" WHERE "originalFileName" LIKE '%_2023_%'; -- all files with _2023_ in the middle
+SELECT * FROM "asset" WHERE "originalFileName" = 'PXL_20230903_232542848.jpg';
+SELECT * FROM "asset" WHERE "originalFileName" LIKE 'PXL_%'; -- all files starting with PXL_
+SELECT * FROM "asset" WHERE "originalFileName" LIKE '%_2023_%'; -- all files with _2023_ in the middle
 ```
 
 ```sql title="Find by path"
-SELECT * FROM "assets" WHERE "originalPath" = 'upload/library/admin/2023/2023-09-03/PXL_2023.jpg';
-SELECT * FROM "assets" WHERE "originalPath" LIKE 'upload/library/admin/2023/%';
+SELECT * FROM "asset" WHERE "originalPath" = 'upload/library/admin/2023/2023-09-03/PXL_2023.jpg';
+SELECT * FROM "asset" WHERE "originalPath" LIKE 'upload/library/admin/2023/%';
 ```
 
 ```sql title="Find by ID"
-SELECT * FROM "assets" WHERE "id" = '9f94e60f-65b6-47b7-ae44-a4df7b57f0e9';
+SELECT * FROM "asset" WHERE "id" = '9f94e60f-65b6-47b7-ae44-a4df7b57f0e9';
 ```
 
 ```sql title="Find by partial ID"
-SELECT * FROM "assets" WHERE "id"::text LIKE '%ab431d3a%';
+SELECT * FROM "asset" WHERE "id"::text LIKE '%ab431d3a%';
 ```
 
 :::note
@@ -40,60 +40,60 @@ You can calculate the checksum for a particular file by using the command `sha1s
 :::
 
 ```sql title="Find by checksum (SHA-1)"
-SELECT encode("checksum", 'hex') FROM "assets";
-SELECT * FROM "assets" WHERE "checksum" = decode('69de19c87658c4c15d9cacb9967b8e033bf74dd1', 'hex');
-SELECT * FROM "assets" WHERE "checksum" = '\x69de19c87658c4c15d9cacb9967b8e033bf74dd1'; -- alternate notation
+SELECT encode("checksum", 'hex') FROM "asset";
+SELECT * FROM "asset" WHERE "checksum" = decode('69de19c87658c4c15d9cacb9967b8e033bf74dd1', 'hex');
+SELECT * FROM "asset" WHERE "checksum" = '\x69de19c87658c4c15d9cacb9967b8e033bf74dd1'; -- alternate notation
 ```
 
 ```sql title="Find duplicate assets with identical checksum (SHA-1) (excluding trashed files)"
-SELECT T1."checksum", array_agg(T2."id") ids FROM "assets" T1
-  INNER JOIN "assets" T2 ON T1."checksum" = T2."checksum" AND T1."id" != T2."id" AND T2."deletedAt" IS NULL
+SELECT T1."checksum", array_agg(T2."id") ids FROM "asset" T1
+  INNER JOIN "asset" T2 ON T1."checksum" = T2."checksum" AND T1."id" != T2."id" AND T2."deletedAt" IS NULL
   WHERE T1."deletedAt" IS NULL GROUP BY T1."checksum";
 ```
 
 ```sql title="Live photos"
-SELECT * FROM "assets" WHERE "livePhotoVideoId" IS NOT NULL;
+SELECT * FROM "asset" WHERE "livePhotoVideoId" IS NOT NULL;
 ```
 
 ```sql title="By description"
-SELECT "assets".*, "exif"."description" FROM "exif"
-  JOIN "assets" ON "assets"."id" = "exif"."assetId"
-  WHERE TRIM("exif"."description") <> ''; -- all files with a description
-SELECT "assets".*, "exif"."description" FROM "exif"
-  JOIN "assets" ON "assets"."id" = "exif"."assetId"
-  WHERE "exif"."description" ILIKE '%string to match%'; -- search by string
+SELECT "asset".*, "asset_exif"."description" FROM "asset_exif"
+  JOIN "asset" ON "asset"."id" = "asset_exif"."assetId"
+  WHERE TRIM("asset_exif"."description") <> ''; -- all files with a description
+SELECT "asset".*, "asset_exif"."description" FROM "asset_exif"
+  JOIN "asset" ON "asset"."id" = "asset_exif"."assetId"
+  WHERE "asset_exif"."description" ILIKE '%string to match%'; -- search by string
 ```
 
 ```sql title="Without metadata"
-SELECT "assets".* FROM "exif"
-  LEFT JOIN "assets" ON "assets"."id" = "exif"."assetId"
-  WHERE "exif"."assetId" IS NULL;
+SELECT "asset".* FROM "asset_exif"
+  LEFT JOIN "asset" ON "asset"."id" = "asset_exif"."assetId"
+  WHERE "asset_exif"."assetId" IS NULL;
 ```
 
 ```sql title="size < 100,000 bytes, smallest to largest"
-SELECT * FROM "assets"
-  JOIN "exif" ON "assets"."id" = "exif"."assetId"
-  WHERE "exif"."fileSizeInByte" < 100000
-  ORDER BY "exif"."fileSizeInByte" ASC;
+SELECT * FROM "asset"
+  JOIN "asset_exif" ON "asset"."id" = "asset_exif"."assetId"
+  WHERE "asset_exif"."fileSizeInByte" < 100000
+  ORDER BY "asset_exif"."fileSizeInByte" ASC;
 ```
 
 ```sql title="Without thumbnails"
-SELECT * FROM "assets" WHERE "assets"."previewPath" IS NULL OR "assets"."thumbnailPath" IS NULL;
+SELECT * FROM "asset" WHERE "asset"."previewPath" IS NULL OR "asset"."thumbnailPath" IS NULL;
 ```
 
 ```sql title="By type"
-SELECT * FROM "assets" WHERE "assets"."type" = 'VIDEO';
-SELECT * FROM "assets" WHERE "assets"."type" = 'IMAGE';
+SELECT * FROM "asset" WHERE "asset"."type" = 'VIDEO';
+SELECT * FROM "asset" WHERE "asset"."type" = 'IMAGE';
 ```
 
 ```sql title="Count by type"
-SELECT "assets"."type", COUNT(*) FROM "assets" GROUP BY "assets"."type";
+SELECT "asset"."type", COUNT(1) FROM "asset" GROUP BY "asset"."type";
 ```
 
 ```sql title="Count by type (per user)"
-SELECT "users"."email", "assets"."type", COUNT(*) FROM "assets"
-  JOIN "users" ON "assets"."ownerId" = "users"."id"
-  GROUP BY "assets"."type", "users"."email" ORDER BY "users"."email";
+SELECT "user"."email", "asset"."type", COUNT(1) FROM "asset"
+  JOIN "user" ON "asset"."ownerId" = "user"."id"
+  GROUP BY "asset"."type", "user"."email" ORDER BY "user"."email";
 ```
 
 ```sql title="Failed file movements"
@@ -103,11 +103,11 @@ SELECT * FROM "move_history";
 ## Users
 
 ```sql title="List all users"
-SELECT * FROM "users";
+SELECT * FROM "user";
 ```
 
 ```sql title="Get owner info from asset ID"
-SELECT "users".* FROM "users" JOIN "assets" ON "users"."id" = "assets"."ownerId" WHERE "assets"."id" = 'fa310b01-2f26-4b7a-9042-d578226e021f';
+SELECT "user".* FROM "user" JOIN "asset" ON "user"."id" = "asset"."ownerId" WHERE "asset"."id" = 'fa310b01-2f26-4b7a-9042-d578226e021f';
 ```
 
 ## System Config